diff --git a/.golangci.yml b/.golangci.yml index 7fc563711e53d..628edc803ebbe 100644 --- a/.golangci.yml +++ b/.golangci.yml @@ -70,6 +70,7 @@ linters-settings: # TODO: Enable this and fix the alignment issues. disable: - fieldalignment + - loopclosure revive: # minimal confidence for issues, default is 0.8 diff --git a/cmd/configschema/go.mod b/cmd/configschema/go.mod index 988152b0a5877..6559409e21522 100644 --- a/cmd/configschema/go.mod +++ b/cmd/configschema/go.mod @@ -8,8 +8,9 @@ require ( github.com/open-telemetry/opentelemetry-collector-contrib v0.64.0 github.com/open-telemetry/opentelemetry-collector-contrib/receiver/redisreceiver v0.64.0 github.com/stretchr/testify v1.8.1 - go.opentelemetry.io/collector v0.64.2-0.20221115155901-1550938c18fd - go.opentelemetry.io/collector/receiver/otlpreceiver v0.64.2-0.20221115155901-1550938c18fd + go.opentelemetry.io/collector v0.64.2-0.20221117234814-4565692c50a7 + go.opentelemetry.io/collector/component v0.0.0-20221117234814-4565692c50a7 + go.opentelemetry.io/collector/receiver/otlpreceiver v0.64.2-0.20221117234814-4565692c50a7 golang.org/x/mod v0.6.0 golang.org/x/text v0.4.0 ) @@ -590,21 +591,24 @@ require ( go.mongodb.org/atlas v0.19.0 // indirect go.mongodb.org/mongo-driver v1.10.3 // indirect go.opencensus.io v0.24.0 // indirect - go.opentelemetry.io/collector/exporter/loggingexporter v0.64.2-0.20221115155901-1550938c18fd // indirect - go.opentelemetry.io/collector/exporter/otlpexporter v0.64.2-0.20221115155901-1550938c18fd // indirect - go.opentelemetry.io/collector/exporter/otlphttpexporter v0.64.2-0.20221115155901-1550938c18fd // indirect - go.opentelemetry.io/collector/extension/ballastextension v0.64.2-0.20221115155901-1550938c18fd // indirect - go.opentelemetry.io/collector/extension/zpagesextension v0.64.2-0.20221115155901-1550938c18fd // indirect - go.opentelemetry.io/collector/pdata v0.64.2-0.20221115155901-1550938c18fd // indirect - go.opentelemetry.io/collector/processor/batchprocessor v0.64.2-0.20221115155901-1550938c18fd // indirect - go.opentelemetry.io/collector/processor/memorylimiterprocessor v0.64.2-0.20221115155901-1550938c18fd // indirect - go.opentelemetry.io/collector/semconv v0.64.2-0.20221115155901-1550938c18fd // indirect + go.opentelemetry.io/collector/consumer v0.0.0-20221117234814-4565692c50a7 // indirect + go.opentelemetry.io/collector/exporter/loggingexporter v0.64.2-0.20221117234814-4565692c50a7 // indirect + go.opentelemetry.io/collector/exporter/otlpexporter v0.64.2-0.20221117234814-4565692c50a7 // indirect + go.opentelemetry.io/collector/exporter/otlphttpexporter v0.64.2-0.20221117234814-4565692c50a7 // indirect + go.opentelemetry.io/collector/extension/ballastextension v0.64.2-0.20221117234814-4565692c50a7 // indirect + go.opentelemetry.io/collector/extension/zpagesextension v0.64.2-0.20221117234814-4565692c50a7 // indirect + go.opentelemetry.io/collector/featuregate v0.0.0-20221117214536-6a117bfc3737 // indirect + go.opentelemetry.io/collector/pdata v0.64.2-0.20221117234814-4565692c50a7 // indirect + go.opentelemetry.io/collector/processor/batchprocessor v0.64.2-0.20221117234814-4565692c50a7 // indirect + go.opentelemetry.io/collector/processor/memorylimiterprocessor v0.64.2-0.20221117234814-4565692c50a7 // indirect + go.opentelemetry.io/collector/semconv v0.64.2-0.20221117234814-4565692c50a7 // indirect go.opentelemetry.io/contrib/instrumentation/google.golang.org/grpc/otelgrpc v0.36.4 // indirect go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.36.4 // indirect go.opentelemetry.io/contrib/zpages v0.36.4 // indirect go.opentelemetry.io/otel v1.11.1 // indirect go.opentelemetry.io/otel/metric v0.33.0 // indirect go.opentelemetry.io/otel/sdk v1.11.1 // indirect + go.opentelemetry.io/otel/sdk/metric v0.33.0 // indirect go.opentelemetry.io/otel/trace v1.11.1 // indirect go.uber.org/atomic v1.10.0 // indirect go.uber.org/goleak v1.2.0 // indirect diff --git a/cmd/configschema/go.sum b/cmd/configschema/go.sum index 9fe48a6708dcb..a33e36d5fa218 100644 --- a/cmd/configschema/go.sum +++ b/cmd/configschema/go.sum @@ -2344,37 +2344,45 @@ go.opencensus.io v0.24.0 h1:y73uSU6J157QMP2kn2r30vwW1A2W2WFwSCGnAVxeaD0= go.opencensus.io v0.24.0/go.mod h1:vNK8G9p7aAivkbmorf4v+7Hgx+Zs0yY+0fOtgBfjQKo= go.opentelemetry.io/collector v0.57.2/go.mod h1:9TwWyMRhbFNzaaGLtm/6poWNDJw+etvQMS6Fy+8/8Xs= go.opentelemetry.io/collector v0.64.1/go.mod h1:RxdEKzwxTEhBAgzC4wzyJEwSFgjWU73CHnLjKUKQDyo= -go.opentelemetry.io/collector v0.64.2-0.20221115155901-1550938c18fd h1:O+6HhE4Ivg8Jksp3dIXIEC4FIR0Ush4uORvG3UtHZWk= -go.opentelemetry.io/collector v0.64.2-0.20221115155901-1550938c18fd/go.mod h1:mmSrOcwe1vEYmChXUYuF6rzlrUL0rjEiPfa19Xxb41o= -go.opentelemetry.io/collector/exporter/loggingexporter v0.64.2-0.20221115155901-1550938c18fd h1:Rs+5jIRrgMFfK8RUHsx3dejMewFOFqRgebeT6nt4w4A= -go.opentelemetry.io/collector/exporter/loggingexporter v0.64.2-0.20221115155901-1550938c18fd/go.mod h1:AaS7Bnnu2e/rdiYCa6ko12TtHPxZmTvYyQEQ+yS++tU= -go.opentelemetry.io/collector/exporter/otlpexporter v0.64.2-0.20221115155901-1550938c18fd h1:Aba3DLnRML3J2567NIKeXwryvHGwckIkXkmrA/C/BzI= -go.opentelemetry.io/collector/exporter/otlpexporter v0.64.2-0.20221115155901-1550938c18fd/go.mod h1:5bfOtQfZ3XtaIGfavOrh8gHn+vvUZ2kB27dIrw6T1aY= -go.opentelemetry.io/collector/exporter/otlphttpexporter v0.64.2-0.20221115155901-1550938c18fd h1:ZOlxq1goa2gShVdLWdyUlk0V0qrM5zf3JckVFVDuijw= -go.opentelemetry.io/collector/exporter/otlphttpexporter v0.64.2-0.20221115155901-1550938c18fd/go.mod h1:MICUYztxRZgjILRc6Wj6fJK6n9KSiRNrRwRpybNy2i8= -go.opentelemetry.io/collector/extension/ballastextension v0.64.2-0.20221115155901-1550938c18fd h1:w5LzWafV1a0Fqfv7GkGwfRsdi1ZNZPVl08BZHI/LKt8= -go.opentelemetry.io/collector/extension/ballastextension v0.64.2-0.20221115155901-1550938c18fd/go.mod h1:Tv85DBH3y0OFkH8BN6pnRFPVHLmDphk2DDO6BgGPTp0= +go.opentelemetry.io/collector v0.64.2-0.20221117234814-4565692c50a7 h1:o/vMr2iyXzaeTb/KAldhMxAvRIfFPwtKfL5cKVKsSlU= +go.opentelemetry.io/collector v0.64.2-0.20221117234814-4565692c50a7/go.mod h1:PO8hayFFYvXDqELbXRVxwawR2HTdjN6mY4Qa3Se9xI8= +go.opentelemetry.io/collector/component v0.0.0-20221115212826-19db2f15c85c/go.mod h1:5+C/jgNQLM3Lkkys0UU+p2iOsGMs80kQ/DaZ1svo5cc= +go.opentelemetry.io/collector/component v0.0.0-20221117234814-4565692c50a7 h1:q9m1bGHhQFUakQX79lZpLmFSY9VLULNSs2jUG8MdJLA= +go.opentelemetry.io/collector/component v0.0.0-20221117234814-4565692c50a7/go.mod h1:Z7H1Oj826e4dtVxXmT6SiUr6S0EIevUJmkVpfQV+UOk= +go.opentelemetry.io/collector/consumer v0.0.0-20221116212002-2454cfb9ab7f/go.mod h1:npKt5UPhg8ZEtYqwN4R7VtWbzyAURVu3vfDikr3ycLM= +go.opentelemetry.io/collector/consumer v0.0.0-20221117234814-4565692c50a7 h1:FTy1JD9EJ7gq9SzlZoi2NkGcZ88+SwdiJav5uRcDEEY= +go.opentelemetry.io/collector/consumer v0.0.0-20221117234814-4565692c50a7/go.mod h1:86Elcw/LLrh90DprArogHMkBX3+UMu3tIgcVWF3mr6o= +go.opentelemetry.io/collector/exporter/loggingexporter v0.64.2-0.20221117234814-4565692c50a7 h1:d6+smWiqTczWSB6RgSOlicPHqhM2AdcTfpsDt5ocx8s= +go.opentelemetry.io/collector/exporter/loggingexporter v0.64.2-0.20221117234814-4565692c50a7/go.mod h1:Q1xXeHaKenGhOUJT/k6n0wh3rXQuk1qO1OHtx/1GEjA= +go.opentelemetry.io/collector/exporter/otlpexporter v0.64.2-0.20221117234814-4565692c50a7 h1:Pw+375oxebSKKDDQjOFSMFSfopmx6gARuqTmQD1njGY= +go.opentelemetry.io/collector/exporter/otlpexporter v0.64.2-0.20221117234814-4565692c50a7/go.mod h1:X6iHDUlspR3fJ3zvZskB+d9/PXaC/zYMbHrtfvk9yNk= +go.opentelemetry.io/collector/exporter/otlphttpexporter v0.64.2-0.20221117234814-4565692c50a7 h1:8ByTWg2YOwZqZpCwmWbPeuNjOC2k1QwMjAv0ESaFbqc= +go.opentelemetry.io/collector/exporter/otlphttpexporter v0.64.2-0.20221117234814-4565692c50a7/go.mod h1:21XZBi5i+LDa41a6BTH7YyUd3xTmf6DYnPNn3t9yTII= +go.opentelemetry.io/collector/extension/ballastextension v0.64.2-0.20221117234814-4565692c50a7 h1:eIazz94xNlOTrbMPzhnfIcqFvQTT0OW91H1AdYfbFqA= +go.opentelemetry.io/collector/extension/ballastextension v0.64.2-0.20221117234814-4565692c50a7/go.mod h1:3jV3YlZheaEai6+1gMxi92zehVd5owIa5oShiXiPgTA= go.opentelemetry.io/collector/extension/zpagesextension v0.64.1/go.mod h1:XenhQAUbOHgqNq5YQ/vQIcDHRcPUaDgZQxDC2qoI4Bc= -go.opentelemetry.io/collector/extension/zpagesextension v0.64.2-0.20221115155901-1550938c18fd h1:divtniDLhmbVre6mWhWZKrDps87WV7v2JUDe5d8wSCE= -go.opentelemetry.io/collector/extension/zpagesextension v0.64.2-0.20221115155901-1550938c18fd/go.mod h1:Lh4S28vozIfK/n2LJ7MhwyQBAJFzmb6FUVtlArX97ho= +go.opentelemetry.io/collector/extension/zpagesextension v0.64.2-0.20221117234814-4565692c50a7 h1:w7Oz8A/4pQHpvHsRTT6QC1QuxR4qpD0FlAK40koEQuU= +go.opentelemetry.io/collector/extension/zpagesextension v0.64.2-0.20221117234814-4565692c50a7/go.mod h1:MddgDwL0gsv0QilaxzMajrYXa+AdZED4tIsAnIMW2R0= +go.opentelemetry.io/collector/featuregate v0.0.0-20221117214536-6a117bfc3737 h1:7sXg6M9Fw6rFVlX+iaWOMz6DFXEiroUdQer5kWGixwM= +go.opentelemetry.io/collector/featuregate v0.0.0-20221117214536-6a117bfc3737/go.mod h1:tewuFKJYalWBU0bmNKg++MC1ipINXUr6szYzOw2p1GI= go.opentelemetry.io/collector/pdata v0.56.0/go.mod h1:mYcCREWiIJyHss0dbU+GSiz2tmGZ6u09vtfkKTciog4= go.opentelemetry.io/collector/pdata v0.57.2/go.mod h1:RU9I8lwBUxucwOsSYzHEcHi15M9QaX78hgQ2PRdSxV0= go.opentelemetry.io/collector/pdata v0.64.1/go.mod h1:IzvXUGQml2mrnvdb8zIlEW3qQs9oFLdD2hLwJdZ+pek= -go.opentelemetry.io/collector/pdata v0.64.2-0.20221115155901-1550938c18fd h1:GdVAbRiae5VDZe3Mn3FqzMxO/aI5UbJ4+dcviqClHy8= -go.opentelemetry.io/collector/pdata v0.64.2-0.20221115155901-1550938c18fd/go.mod h1:0vynPfW2ZN7DltpcCFgCmTtWMQkCjp2a3TNt82YTCLQ= +go.opentelemetry.io/collector/pdata v0.64.2-0.20221117234814-4565692c50a7 h1:IOFqfOu7fFxTgC7pvc2U7dk1/uFjwVQPK+CALiUvacI= +go.opentelemetry.io/collector/pdata v0.64.2-0.20221117234814-4565692c50a7/go.mod h1:0vynPfW2ZN7DltpcCFgCmTtWMQkCjp2a3TNt82YTCLQ= go.opentelemetry.io/collector/processor/batchprocessor v0.64.1/go.mod h1:qVl0+aYokPfiq5y+JVAvlII2rrUFBDEqqiDbTSnax78= -go.opentelemetry.io/collector/processor/batchprocessor v0.64.2-0.20221115155901-1550938c18fd h1:SSjP8V0UP2+oPZ3gL+Dk90KQcvHXvHp9V5h8IIpx0og= -go.opentelemetry.io/collector/processor/batchprocessor v0.64.2-0.20221115155901-1550938c18fd/go.mod h1:zyCnX0aTvBaZ3XLWSHZdTueP7WoXRjz8X6HiWgKqstM= -go.opentelemetry.io/collector/processor/memorylimiterprocessor v0.64.2-0.20221115155901-1550938c18fd h1:ZO4eSgxGxi8BohVcU6ixm/xjNBfCqqxbSQbKIK9KVtw= -go.opentelemetry.io/collector/processor/memorylimiterprocessor v0.64.2-0.20221115155901-1550938c18fd/go.mod h1:YYJUdzGlD0iN6KWTsTc+tAtRiOQNnJK9k7udr9Ic6l4= +go.opentelemetry.io/collector/processor/batchprocessor v0.64.2-0.20221117234814-4565692c50a7 h1:hGDq2T07j6qwwtQ2t6ZGU5tp/J2Dvu9mfY5qnnP5Ic8= +go.opentelemetry.io/collector/processor/batchprocessor v0.64.2-0.20221117234814-4565692c50a7/go.mod h1:b83iea2eDSAQkvd+2aSokaa6GRjSIsaR2zILziF/Ogc= +go.opentelemetry.io/collector/processor/memorylimiterprocessor v0.64.2-0.20221117234814-4565692c50a7 h1:M28BjryAkBY/tBp0CrPY+krc0x+6uJnmrkX7JQwA4Ns= +go.opentelemetry.io/collector/processor/memorylimiterprocessor v0.64.2-0.20221117234814-4565692c50a7/go.mod h1:81b812AB+nutOksY9LBYwhHtiqvqDjrih3PmrgY2wDg= go.opentelemetry.io/collector/receiver/otlpreceiver v0.64.1/go.mod h1:4rwNi9SeCKBP9XGLWNRFKPsWUV5NK4iqMvdj2WRMksQ= -go.opentelemetry.io/collector/receiver/otlpreceiver v0.64.2-0.20221115155901-1550938c18fd h1:hMuRptXpQYC9dk7x68LIFeVEpoE3oM+ddI6o13cS73Q= -go.opentelemetry.io/collector/receiver/otlpreceiver v0.64.2-0.20221115155901-1550938c18fd/go.mod h1:i80XzKLKheio/axok7WksVx/xmNGRadfmlzhWOWDnr4= +go.opentelemetry.io/collector/receiver/otlpreceiver v0.64.2-0.20221117234814-4565692c50a7 h1:n2zHwTL1xcJ1DtKrGUAXVT12hCN0b5tjVqQV974xCsA= +go.opentelemetry.io/collector/receiver/otlpreceiver v0.64.2-0.20221117234814-4565692c50a7/go.mod h1:CZy46KR3rC5HVHWouklB9oyg7SU9OIRmcKyw6+m+rCk= go.opentelemetry.io/collector/semconv v0.56.0/go.mod h1:EH1wbDvTyqKpKBBpoMIe0KQk2plCcFS66Mo17WtR7CQ= go.opentelemetry.io/collector/semconv v0.57.2/go.mod h1:84YnUjmm+nhGu4YTDLnHCbxnL74ooWpismPG79tFD7w= go.opentelemetry.io/collector/semconv v0.64.1/go.mod h1:5o9yhOa+ABt7g2E5JABDxGZ1PQPbtfxrKNbYn+LOTXU= -go.opentelemetry.io/collector/semconv v0.64.2-0.20221115155901-1550938c18fd h1:rMqcl2pwi8YtVrtOPK8tVh87W0bFBge4yqB9ypSsAJ4= -go.opentelemetry.io/collector/semconv v0.64.2-0.20221115155901-1550938c18fd/go.mod h1:5o9yhOa+ABt7g2E5JABDxGZ1PQPbtfxrKNbYn+LOTXU= +go.opentelemetry.io/collector/semconv v0.64.2-0.20221117234814-4565692c50a7 h1:cGXAVltDxXw9nj0Vr7vyZZTj0whdyO+GYs+xv0xHJ2A= +go.opentelemetry.io/collector/semconv v0.64.2-0.20221117234814-4565692c50a7/go.mod h1:5o9yhOa+ABt7g2E5JABDxGZ1PQPbtfxrKNbYn+LOTXU= go.opentelemetry.io/contrib/instrumentation/google.golang.org/grpc/otelgrpc v0.33.0/go.mod h1:y/SlJpJQPd2UzfBCj0E9Flk9FDCtTyqUmaCB41qFrWI= go.opentelemetry.io/contrib/instrumentation/google.golang.org/grpc/otelgrpc v0.36.4 h1:PRXhsszxTt5bbPriTjmaweWUsAnJYeWBhUMLRetUgBU= go.opentelemetry.io/contrib/instrumentation/google.golang.org/grpc/otelgrpc v0.36.4/go.mod h1:05eWWy6ZWzmpeImD3UowLTB3VjDMU1yxQ+ENuVWDM3c= diff --git a/cmd/mdatagen/go.mod b/cmd/mdatagen/go.mod index b3da160fd33d2..8aac9854dd382 100644 --- a/cmd/mdatagen/go.mod +++ b/cmd/mdatagen/go.mod @@ -7,8 +7,8 @@ require ( github.com/go-playground/universal-translator v0.18.0 github.com/go-playground/validator/v10 v10.11.1 github.com/stretchr/testify v1.8.1 - go.opentelemetry.io/collector v0.64.2-0.20221115155901-1550938c18fd - go.opentelemetry.io/collector/pdata v0.64.2-0.20221115155901-1550938c18fd + go.opentelemetry.io/collector v0.64.2-0.20221117234814-4565692c50a7 + go.opentelemetry.io/collector/pdata v0.64.2-0.20221117234814-4565692c50a7 ) require ( @@ -26,6 +26,7 @@ require ( github.com/modern-go/reflect2 v1.0.2 // indirect github.com/pelletier/go-toml v1.9.4 // indirect github.com/pmezard/go-difflib v1.0.0 // indirect + go.opentelemetry.io/collector/featuregate v0.0.0-20221117214536-6a117bfc3737 // indirect go.uber.org/atomic v1.10.0 // indirect go.uber.org/multierr v1.8.0 // indirect golang.org/x/crypto v0.0.0-20220507011949-2cf3adece122 // indirect diff --git a/cmd/mdatagen/go.sum b/cmd/mdatagen/go.sum index 507304afdc3fc..5a073e25b287f 100644 --- a/cmd/mdatagen/go.sum +++ b/cmd/mdatagen/go.sum @@ -276,10 +276,12 @@ github.com/yuin/goldmark v1.3.5/go.mod h1:mwnBkeHKe2W/ZEtQ+71ViKU8L12m81fl3OWwC1 go.etcd.io/etcd/api/v3 v3.5.4/go.mod h1:5GB2vv4A4AOn3yk7MftYGHkUfGtDHnEraIjym4dYz5A= go.etcd.io/etcd/client/pkg/v3 v3.5.4/go.mod h1:IJHfcCEKxYu1Os13ZdwCwIUTUVGYTSAM3YSwc9/Ac1g= go.etcd.io/etcd/client/v3 v3.5.4/go.mod h1:ZaRkVgBZC+L+dLCjTcF1hRXpgZXQPOvnA/Ak/gq3kiY= -go.opentelemetry.io/collector v0.64.2-0.20221115155901-1550938c18fd h1:O+6HhE4Ivg8Jksp3dIXIEC4FIR0Ush4uORvG3UtHZWk= -go.opentelemetry.io/collector v0.64.2-0.20221115155901-1550938c18fd/go.mod h1:mmSrOcwe1vEYmChXUYuF6rzlrUL0rjEiPfa19Xxb41o= -go.opentelemetry.io/collector/pdata v0.64.2-0.20221115155901-1550938c18fd h1:GdVAbRiae5VDZe3Mn3FqzMxO/aI5UbJ4+dcviqClHy8= -go.opentelemetry.io/collector/pdata v0.64.2-0.20221115155901-1550938c18fd/go.mod h1:0vynPfW2ZN7DltpcCFgCmTtWMQkCjp2a3TNt82YTCLQ= +go.opentelemetry.io/collector v0.64.2-0.20221117234814-4565692c50a7 h1:o/vMr2iyXzaeTb/KAldhMxAvRIfFPwtKfL5cKVKsSlU= +go.opentelemetry.io/collector v0.64.2-0.20221117234814-4565692c50a7/go.mod h1:PO8hayFFYvXDqELbXRVxwawR2HTdjN6mY4Qa3Se9xI8= +go.opentelemetry.io/collector/featuregate v0.0.0-20221117214536-6a117bfc3737 h1:7sXg6M9Fw6rFVlX+iaWOMz6DFXEiroUdQer5kWGixwM= +go.opentelemetry.io/collector/featuregate v0.0.0-20221117214536-6a117bfc3737/go.mod h1:tewuFKJYalWBU0bmNKg++MC1ipINXUr6szYzOw2p1GI= +go.opentelemetry.io/collector/pdata v0.64.2-0.20221117234814-4565692c50a7 h1:IOFqfOu7fFxTgC7pvc2U7dk1/uFjwVQPK+CALiUvacI= +go.opentelemetry.io/collector/pdata v0.64.2-0.20221117234814-4565692c50a7/go.mod h1:0vynPfW2ZN7DltpcCFgCmTtWMQkCjp2a3TNt82YTCLQ= go.opentelemetry.io/proto/otlp v0.7.0/go.mod h1:PqfVotwruBrMGOCsRd/89rSnXhoiJIqeYNgFYFoEGnI= go.uber.org/atomic v1.7.0/go.mod h1:fEN4uk6kAWBTFdckzkM89CLk9XfWZrxpCo0nPH17wJc= go.uber.org/atomic v1.10.0 h1:9qC72Qh0+3MqyJbAn8YU5xVq1frD8bn3JtD2oXtafVQ= diff --git a/confmap/provider/s3provider/go.mod b/confmap/provider/s3provider/go.mod index 6db2f423df523..a639e639ffd33 100644 --- a/confmap/provider/s3provider/go.mod +++ b/confmap/provider/s3provider/go.mod @@ -7,7 +7,7 @@ require ( github.com/aws/aws-sdk-go-v2/config v1.18.0 github.com/aws/aws-sdk-go-v2/service/s3 v1.19.0 github.com/stretchr/testify v1.8.1 - go.opentelemetry.io/collector v0.64.2-0.20221115155901-1550938c18fd + go.opentelemetry.io/collector v0.64.2-0.20221117234814-4565692c50a7 gopkg.in/yaml.v2 v2.4.0 ) @@ -31,6 +31,7 @@ require ( github.com/mitchellh/mapstructure v1.5.0 // indirect github.com/mitchellh/reflectwalk v1.0.2 // indirect github.com/pmezard/go-difflib v1.0.0 // indirect + go.opentelemetry.io/collector/featuregate v0.0.0-20221117214536-6a117bfc3737 // indirect go.uber.org/atomic v1.10.0 // indirect go.uber.org/multierr v1.8.0 // indirect gopkg.in/yaml.v3 v3.0.1 // indirect diff --git a/confmap/provider/s3provider/go.sum b/confmap/provider/s3provider/go.sum index bb572ce41d59c..e4b0ea418b145 100644 --- a/confmap/provider/s3provider/go.sum +++ b/confmap/provider/s3provider/go.sum @@ -280,8 +280,10 @@ github.com/yuin/goldmark v1.3.5/go.mod h1:mwnBkeHKe2W/ZEtQ+71ViKU8L12m81fl3OWwC1 go.etcd.io/etcd/api/v3 v3.5.4/go.mod h1:5GB2vv4A4AOn3yk7MftYGHkUfGtDHnEraIjym4dYz5A= go.etcd.io/etcd/client/pkg/v3 v3.5.4/go.mod h1:IJHfcCEKxYu1Os13ZdwCwIUTUVGYTSAM3YSwc9/Ac1g= go.etcd.io/etcd/client/v3 v3.5.4/go.mod h1:ZaRkVgBZC+L+dLCjTcF1hRXpgZXQPOvnA/Ak/gq3kiY= -go.opentelemetry.io/collector v0.64.2-0.20221115155901-1550938c18fd h1:O+6HhE4Ivg8Jksp3dIXIEC4FIR0Ush4uORvG3UtHZWk= -go.opentelemetry.io/collector v0.64.2-0.20221115155901-1550938c18fd/go.mod h1:mmSrOcwe1vEYmChXUYuF6rzlrUL0rjEiPfa19Xxb41o= +go.opentelemetry.io/collector v0.64.2-0.20221117234814-4565692c50a7 h1:o/vMr2iyXzaeTb/KAldhMxAvRIfFPwtKfL5cKVKsSlU= +go.opentelemetry.io/collector v0.64.2-0.20221117234814-4565692c50a7/go.mod h1:PO8hayFFYvXDqELbXRVxwawR2HTdjN6mY4Qa3Se9xI8= +go.opentelemetry.io/collector/featuregate v0.0.0-20221117214536-6a117bfc3737 h1:7sXg6M9Fw6rFVlX+iaWOMz6DFXEiroUdQer5kWGixwM= +go.opentelemetry.io/collector/featuregate v0.0.0-20221117214536-6a117bfc3737/go.mod h1:tewuFKJYalWBU0bmNKg++MC1ipINXUr6szYzOw2p1GI= go.uber.org/atomic v1.7.0/go.mod h1:fEN4uk6kAWBTFdckzkM89CLk9XfWZrxpCo0nPH17wJc= go.uber.org/atomic v1.10.0 h1:9qC72Qh0+3MqyJbAn8YU5xVq1frD8bn3JtD2oXtafVQ= go.uber.org/atomic v1.10.0/go.mod h1:LUxbIzbOniOlMKjJjyPfpl4v+PKK2cNJn91OQbhoJI0= diff --git a/exporter/alibabacloudlogserviceexporter/config_test.go b/exporter/alibabacloudlogserviceexporter/config_test.go index 89603910e573e..a2413ac2cfd7c 100644 --- a/exporter/alibabacloudlogserviceexporter/config_test.go +++ b/exporter/alibabacloudlogserviceexporter/config_test.go @@ -66,7 +66,7 @@ func TestLoadConfig(t *testing.T) { require.NoError(t, err) require.NoError(t, component.UnmarshalExporterConfig(sub, cfg)) - assert.NoError(t, cfg.Validate()) + assert.NoError(t, component.ValidateConfig(cfg)) assert.Equal(t, tt.expected, cfg) }) } diff --git a/exporter/alibabacloudlogserviceexporter/go.mod b/exporter/alibabacloudlogserviceexporter/go.mod index 4466b4da2deef..ce83781bd81df 100644 --- a/exporter/alibabacloudlogserviceexporter/go.mod +++ b/exporter/alibabacloudlogserviceexporter/go.mod @@ -7,9 +7,10 @@ require ( github.com/gogo/protobuf v1.3.2 github.com/open-telemetry/opentelemetry-collector-contrib/internal/coreinternal v0.64.0 github.com/stretchr/testify v1.8.1 - go.opentelemetry.io/collector v0.64.2-0.20221115155901-1550938c18fd - go.opentelemetry.io/collector/pdata v0.64.2-0.20221115155901-1550938c18fd - go.opentelemetry.io/collector/semconv v0.64.2-0.20221115155901-1550938c18fd + go.opentelemetry.io/collector v0.64.2-0.20221117234814-4565692c50a7 + go.opentelemetry.io/collector/component v0.0.0-20221117234814-4565692c50a7 + go.opentelemetry.io/collector/pdata v0.64.2-0.20221117234814-4565692c50a7 + go.opentelemetry.io/collector/semconv v0.64.2-0.20221117234814-4565692c50a7 go.uber.org/zap v1.23.0 ) @@ -31,6 +32,8 @@ require ( github.com/pkg/errors v0.9.1 // indirect github.com/pmezard/go-difflib v1.0.0 // indirect go.opencensus.io v0.24.0 // indirect + go.opentelemetry.io/collector/consumer v0.0.0-20221117234814-4565692c50a7 // indirect + go.opentelemetry.io/collector/featuregate v0.0.0-20221117214536-6a117bfc3737 // indirect go.opentelemetry.io/otel v1.11.1 // indirect go.opentelemetry.io/otel/metric v0.33.0 // indirect go.opentelemetry.io/otel/trace v1.11.1 // indirect diff --git a/exporter/alibabacloudlogserviceexporter/go.sum b/exporter/alibabacloudlogserviceexporter/go.sum index 537675eaef54e..12672aa033a44 100644 --- a/exporter/alibabacloudlogserviceexporter/go.sum +++ b/exporter/alibabacloudlogserviceexporter/go.sum @@ -420,12 +420,18 @@ go.opencensus.io v0.20.2/go.mod h1:6WKK9ahsWS3RSO+PY9ZHZUfv2irvY6gN279GOPZjmmk= go.opencensus.io v0.22.2/go.mod h1:yxeiOL68Rb0Xd1ddK5vPZ/oVn4vY4Ynel7k9FzqtOIw= go.opencensus.io v0.24.0 h1:y73uSU6J157QMP2kn2r30vwW1A2W2WFwSCGnAVxeaD0= go.opencensus.io v0.24.0/go.mod h1:vNK8G9p7aAivkbmorf4v+7Hgx+Zs0yY+0fOtgBfjQKo= -go.opentelemetry.io/collector v0.64.2-0.20221115155901-1550938c18fd h1:O+6HhE4Ivg8Jksp3dIXIEC4FIR0Ush4uORvG3UtHZWk= -go.opentelemetry.io/collector v0.64.2-0.20221115155901-1550938c18fd/go.mod h1:mmSrOcwe1vEYmChXUYuF6rzlrUL0rjEiPfa19Xxb41o= -go.opentelemetry.io/collector/pdata v0.64.2-0.20221115155901-1550938c18fd h1:GdVAbRiae5VDZe3Mn3FqzMxO/aI5UbJ4+dcviqClHy8= -go.opentelemetry.io/collector/pdata v0.64.2-0.20221115155901-1550938c18fd/go.mod h1:0vynPfW2ZN7DltpcCFgCmTtWMQkCjp2a3TNt82YTCLQ= -go.opentelemetry.io/collector/semconv v0.64.2-0.20221115155901-1550938c18fd h1:rMqcl2pwi8YtVrtOPK8tVh87W0bFBge4yqB9ypSsAJ4= -go.opentelemetry.io/collector/semconv v0.64.2-0.20221115155901-1550938c18fd/go.mod h1:5o9yhOa+ABt7g2E5JABDxGZ1PQPbtfxrKNbYn+LOTXU= +go.opentelemetry.io/collector v0.64.2-0.20221117234814-4565692c50a7 h1:o/vMr2iyXzaeTb/KAldhMxAvRIfFPwtKfL5cKVKsSlU= +go.opentelemetry.io/collector v0.64.2-0.20221117234814-4565692c50a7/go.mod h1:PO8hayFFYvXDqELbXRVxwawR2HTdjN6mY4Qa3Se9xI8= +go.opentelemetry.io/collector/component v0.0.0-20221117234814-4565692c50a7 h1:q9m1bGHhQFUakQX79lZpLmFSY9VLULNSs2jUG8MdJLA= +go.opentelemetry.io/collector/component v0.0.0-20221117234814-4565692c50a7/go.mod h1:Z7H1Oj826e4dtVxXmT6SiUr6S0EIevUJmkVpfQV+UOk= +go.opentelemetry.io/collector/consumer v0.0.0-20221117234814-4565692c50a7 h1:FTy1JD9EJ7gq9SzlZoi2NkGcZ88+SwdiJav5uRcDEEY= +go.opentelemetry.io/collector/consumer v0.0.0-20221117234814-4565692c50a7/go.mod h1:86Elcw/LLrh90DprArogHMkBX3+UMu3tIgcVWF3mr6o= +go.opentelemetry.io/collector/featuregate v0.0.0-20221117214536-6a117bfc3737 h1:7sXg6M9Fw6rFVlX+iaWOMz6DFXEiroUdQer5kWGixwM= +go.opentelemetry.io/collector/featuregate v0.0.0-20221117214536-6a117bfc3737/go.mod h1:tewuFKJYalWBU0bmNKg++MC1ipINXUr6szYzOw2p1GI= +go.opentelemetry.io/collector/pdata v0.64.2-0.20221117234814-4565692c50a7 h1:IOFqfOu7fFxTgC7pvc2U7dk1/uFjwVQPK+CALiUvacI= +go.opentelemetry.io/collector/pdata v0.64.2-0.20221117234814-4565692c50a7/go.mod h1:0vynPfW2ZN7DltpcCFgCmTtWMQkCjp2a3TNt82YTCLQ= +go.opentelemetry.io/collector/semconv v0.64.2-0.20221117234814-4565692c50a7 h1:cGXAVltDxXw9nj0Vr7vyZZTj0whdyO+GYs+xv0xHJ2A= +go.opentelemetry.io/collector/semconv v0.64.2-0.20221117234814-4565692c50a7/go.mod h1:5o9yhOa+ABt7g2E5JABDxGZ1PQPbtfxrKNbYn+LOTXU= go.opentelemetry.io/otel v1.11.1 h1:4WLLAmcfkmDk2ukNXJyq3/kiz/3UzCaYq6PskJsaou4= go.opentelemetry.io/otel v1.11.1/go.mod h1:1nNhXBbWSD0nsL38H6btgnFN2k4i0sNLHNNMZMSbUGE= go.opentelemetry.io/otel/exporters/prometheus v0.33.0 h1:xXhPj7SLKWU5/Zd4Hxmd+X1C4jdmvc0Xy+kvjFx2z60= diff --git a/exporter/awscloudwatchlogsexporter/config_test.go b/exporter/awscloudwatchlogsexporter/config_test.go index 58046a152ab83..ff232683dee0e 100644 --- a/exporter/awscloudwatchlogsexporter/config_test.go +++ b/exporter/awscloudwatchlogsexporter/config_test.go @@ -102,11 +102,11 @@ func TestLoadConfig(t *testing.T) { err = component.UnmarshalExporterConfig(sub, cfg) if tt.expected == nil { - err = multierr.Append(err, cfg.Validate()) + err = multierr.Append(err, component.ValidateConfig(cfg)) assert.ErrorContains(t, err, tt.errorMessage) return } - assert.NoError(t, cfg.Validate()) + assert.NoError(t, component.ValidateConfig(cfg)) assert.Equal(t, tt.expected, cfg) }) } @@ -126,7 +126,7 @@ func TestRetentionValidateCorrect(t *testing.T) { QueueSize: exporterhelper.NewDefaultQueueSettings().QueueSize, }, } - assert.NoError(t, cfg.Validate()) + assert.NoError(t, component.ValidateConfig(cfg)) } diff --git a/exporter/awscloudwatchlogsexporter/go.mod b/exporter/awscloudwatchlogsexporter/go.mod index 313538e0e0ed3..c3b5e7f0125d3 100644 --- a/exporter/awscloudwatchlogsexporter/go.mod +++ b/exporter/awscloudwatchlogsexporter/go.mod @@ -8,8 +8,10 @@ require ( github.com/open-telemetry/opentelemetry-collector-contrib/internal/aws/awsutil v0.64.0 github.com/open-telemetry/opentelemetry-collector-contrib/internal/aws/cwlogs v0.64.0 github.com/stretchr/testify v1.8.1 - go.opentelemetry.io/collector v0.64.2-0.20221115155901-1550938c18fd - go.opentelemetry.io/collector/pdata v0.64.2-0.20221115155901-1550938c18fd + go.opentelemetry.io/collector v0.64.2-0.20221117234814-4565692c50a7 + go.opentelemetry.io/collector/component v0.0.0-20221117234814-4565692c50a7 + go.opentelemetry.io/collector/consumer v0.0.0-20221117234814-4565692c50a7 + go.opentelemetry.io/collector/pdata v0.64.2-0.20221117234814-4565692c50a7 go.uber.org/multierr v1.8.0 go.uber.org/zap v1.23.0 ) @@ -31,6 +33,7 @@ require ( github.com/rogpeppe/go-internal v1.8.1 // indirect github.com/stretchr/objx v0.5.0 // indirect go.opencensus.io v0.24.0 // indirect + go.opentelemetry.io/collector/featuregate v0.0.0-20221117214536-6a117bfc3737 // indirect go.opentelemetry.io/otel v1.11.1 // indirect go.opentelemetry.io/otel/metric v0.33.0 // indirect go.opentelemetry.io/otel/trace v1.11.1 // indirect diff --git a/exporter/awscloudwatchlogsexporter/go.sum b/exporter/awscloudwatchlogsexporter/go.sum index b5251179c1fc8..245075b3be029 100644 --- a/exporter/awscloudwatchlogsexporter/go.sum +++ b/exporter/awscloudwatchlogsexporter/go.sum @@ -289,10 +289,16 @@ go.etcd.io/etcd/client/pkg/v3 v3.5.4/go.mod h1:IJHfcCEKxYu1Os13ZdwCwIUTUVGYTSAM3 go.etcd.io/etcd/client/v3 v3.5.4/go.mod h1:ZaRkVgBZC+L+dLCjTcF1hRXpgZXQPOvnA/Ak/gq3kiY= go.opencensus.io v0.24.0 h1:y73uSU6J157QMP2kn2r30vwW1A2W2WFwSCGnAVxeaD0= go.opencensus.io v0.24.0/go.mod h1:vNK8G9p7aAivkbmorf4v+7Hgx+Zs0yY+0fOtgBfjQKo= -go.opentelemetry.io/collector v0.64.2-0.20221115155901-1550938c18fd h1:O+6HhE4Ivg8Jksp3dIXIEC4FIR0Ush4uORvG3UtHZWk= -go.opentelemetry.io/collector v0.64.2-0.20221115155901-1550938c18fd/go.mod h1:mmSrOcwe1vEYmChXUYuF6rzlrUL0rjEiPfa19Xxb41o= -go.opentelemetry.io/collector/pdata v0.64.2-0.20221115155901-1550938c18fd h1:GdVAbRiae5VDZe3Mn3FqzMxO/aI5UbJ4+dcviqClHy8= -go.opentelemetry.io/collector/pdata v0.64.2-0.20221115155901-1550938c18fd/go.mod h1:0vynPfW2ZN7DltpcCFgCmTtWMQkCjp2a3TNt82YTCLQ= +go.opentelemetry.io/collector v0.64.2-0.20221117234814-4565692c50a7 h1:o/vMr2iyXzaeTb/KAldhMxAvRIfFPwtKfL5cKVKsSlU= +go.opentelemetry.io/collector v0.64.2-0.20221117234814-4565692c50a7/go.mod h1:PO8hayFFYvXDqELbXRVxwawR2HTdjN6mY4Qa3Se9xI8= +go.opentelemetry.io/collector/component v0.0.0-20221117234814-4565692c50a7 h1:q9m1bGHhQFUakQX79lZpLmFSY9VLULNSs2jUG8MdJLA= +go.opentelemetry.io/collector/component v0.0.0-20221117234814-4565692c50a7/go.mod h1:Z7H1Oj826e4dtVxXmT6SiUr6S0EIevUJmkVpfQV+UOk= +go.opentelemetry.io/collector/consumer v0.0.0-20221117234814-4565692c50a7 h1:FTy1JD9EJ7gq9SzlZoi2NkGcZ88+SwdiJav5uRcDEEY= +go.opentelemetry.io/collector/consumer v0.0.0-20221117234814-4565692c50a7/go.mod h1:86Elcw/LLrh90DprArogHMkBX3+UMu3tIgcVWF3mr6o= +go.opentelemetry.io/collector/featuregate v0.0.0-20221117214536-6a117bfc3737 h1:7sXg6M9Fw6rFVlX+iaWOMz6DFXEiroUdQer5kWGixwM= +go.opentelemetry.io/collector/featuregate v0.0.0-20221117214536-6a117bfc3737/go.mod h1:tewuFKJYalWBU0bmNKg++MC1ipINXUr6szYzOw2p1GI= +go.opentelemetry.io/collector/pdata v0.64.2-0.20221117234814-4565692c50a7 h1:IOFqfOu7fFxTgC7pvc2U7dk1/uFjwVQPK+CALiUvacI= +go.opentelemetry.io/collector/pdata v0.64.2-0.20221117234814-4565692c50a7/go.mod h1:0vynPfW2ZN7DltpcCFgCmTtWMQkCjp2a3TNt82YTCLQ= go.opentelemetry.io/otel v1.11.1 h1:4WLLAmcfkmDk2ukNXJyq3/kiz/3UzCaYq6PskJsaou4= go.opentelemetry.io/otel v1.11.1/go.mod h1:1nNhXBbWSD0nsL38H6btgnFN2k4i0sNLHNNMZMSbUGE= go.opentelemetry.io/otel/exporters/prometheus v0.33.0 h1:xXhPj7SLKWU5/Zd4Hxmd+X1C4jdmvc0Xy+kvjFx2z60= diff --git a/exporter/awsemfexporter/config_test.go b/exporter/awsemfexporter/config_test.go index c10bc37021484..f8a9fef0baab2 100644 --- a/exporter/awsemfexporter/config_test.go +++ b/exporter/awsemfexporter/config_test.go @@ -95,7 +95,7 @@ func TestLoadConfig(t *testing.T) { require.NoError(t, err) require.NoError(t, component.UnmarshalExporterConfig(sub, cfg)) - assert.NoError(t, cfg.Validate()) + assert.NoError(t, component.ValidateConfig(cfg)) assert.Equal(t, tt.expected, cfg) }) } @@ -119,7 +119,7 @@ func TestConfigValidate(t *testing.T) { MetricDescriptors: incorrectDescriptor, logger: zap.NewNop(), } - assert.NoError(t, cfg.Validate()) + assert.NoError(t, component.ValidateConfig(cfg)) assert.Equal(t, 2, len(cfg.MetricDescriptors)) assert.Equal(t, []MetricDescriptor{ @@ -140,7 +140,7 @@ func TestRetentionValidateCorrect(t *testing.T) { ResourceToTelemetrySettings: resourcetotelemetry.Settings{Enabled: true}, logger: zap.NewNop(), } - assert.NoError(t, cfg.Validate()) + assert.NoError(t, component.ValidateConfig(cfg)) } diff --git a/exporter/awsemfexporter/go.mod b/exporter/awsemfexporter/go.mod index 5d7ca2d5e5f3c..33ebcff3b0937 100644 --- a/exporter/awsemfexporter/go.mod +++ b/exporter/awsemfexporter/go.mod @@ -13,9 +13,11 @@ require ( github.com/open-telemetry/opentelemetry-collector-contrib/pkg/resourcetotelemetry v0.64.0 github.com/open-telemetry/opentelemetry-collector-contrib/pkg/translator/opencensus v0.64.0 github.com/stretchr/testify v1.8.1 - go.opentelemetry.io/collector v0.64.2-0.20221115155901-1550938c18fd - go.opentelemetry.io/collector/pdata v0.64.2-0.20221115155901-1550938c18fd - go.opentelemetry.io/collector/semconv v0.64.2-0.20221115155901-1550938c18fd + go.opentelemetry.io/collector v0.64.2-0.20221117234814-4565692c50a7 + go.opentelemetry.io/collector/component v0.0.0-20221117234814-4565692c50a7 + go.opentelemetry.io/collector/consumer v0.0.0-20221117234814-4565692c50a7 + go.opentelemetry.io/collector/pdata v0.64.2-0.20221117234814-4565692c50a7 + go.opentelemetry.io/collector/semconv v0.64.2-0.20221117234814-4565692c50a7 go.uber.org/zap v1.23.0 google.golang.org/protobuf v1.28.1 ) @@ -39,6 +41,7 @@ require ( github.com/rogpeppe/go-internal v1.8.1 // indirect github.com/stretchr/objx v0.5.0 // indirect go.opencensus.io v0.24.0 // indirect + go.opentelemetry.io/collector/featuregate v0.0.0-20221117214536-6a117bfc3737 // indirect go.opentelemetry.io/otel v1.11.1 // indirect go.opentelemetry.io/otel/metric v0.33.0 // indirect go.opentelemetry.io/otel/trace v1.11.1 // indirect diff --git a/exporter/awsemfexporter/go.sum b/exporter/awsemfexporter/go.sum index 82ca644ea958a..0d4b0c84dbd7f 100644 --- a/exporter/awsemfexporter/go.sum +++ b/exporter/awsemfexporter/go.sum @@ -288,12 +288,18 @@ go.etcd.io/etcd/client/pkg/v3 v3.5.4/go.mod h1:IJHfcCEKxYu1Os13ZdwCwIUTUVGYTSAM3 go.etcd.io/etcd/client/v3 v3.5.4/go.mod h1:ZaRkVgBZC+L+dLCjTcF1hRXpgZXQPOvnA/Ak/gq3kiY= go.opencensus.io v0.24.0 h1:y73uSU6J157QMP2kn2r30vwW1A2W2WFwSCGnAVxeaD0= go.opencensus.io v0.24.0/go.mod h1:vNK8G9p7aAivkbmorf4v+7Hgx+Zs0yY+0fOtgBfjQKo= -go.opentelemetry.io/collector v0.64.2-0.20221115155901-1550938c18fd h1:O+6HhE4Ivg8Jksp3dIXIEC4FIR0Ush4uORvG3UtHZWk= -go.opentelemetry.io/collector v0.64.2-0.20221115155901-1550938c18fd/go.mod h1:mmSrOcwe1vEYmChXUYuF6rzlrUL0rjEiPfa19Xxb41o= -go.opentelemetry.io/collector/pdata v0.64.2-0.20221115155901-1550938c18fd h1:GdVAbRiae5VDZe3Mn3FqzMxO/aI5UbJ4+dcviqClHy8= -go.opentelemetry.io/collector/pdata v0.64.2-0.20221115155901-1550938c18fd/go.mod h1:0vynPfW2ZN7DltpcCFgCmTtWMQkCjp2a3TNt82YTCLQ= -go.opentelemetry.io/collector/semconv v0.64.2-0.20221115155901-1550938c18fd h1:rMqcl2pwi8YtVrtOPK8tVh87W0bFBge4yqB9ypSsAJ4= -go.opentelemetry.io/collector/semconv v0.64.2-0.20221115155901-1550938c18fd/go.mod h1:5o9yhOa+ABt7g2E5JABDxGZ1PQPbtfxrKNbYn+LOTXU= +go.opentelemetry.io/collector v0.64.2-0.20221117234814-4565692c50a7 h1:o/vMr2iyXzaeTb/KAldhMxAvRIfFPwtKfL5cKVKsSlU= +go.opentelemetry.io/collector v0.64.2-0.20221117234814-4565692c50a7/go.mod h1:PO8hayFFYvXDqELbXRVxwawR2HTdjN6mY4Qa3Se9xI8= +go.opentelemetry.io/collector/component v0.0.0-20221117234814-4565692c50a7 h1:q9m1bGHhQFUakQX79lZpLmFSY9VLULNSs2jUG8MdJLA= +go.opentelemetry.io/collector/component v0.0.0-20221117234814-4565692c50a7/go.mod h1:Z7H1Oj826e4dtVxXmT6SiUr6S0EIevUJmkVpfQV+UOk= +go.opentelemetry.io/collector/consumer v0.0.0-20221117234814-4565692c50a7 h1:FTy1JD9EJ7gq9SzlZoi2NkGcZ88+SwdiJav5uRcDEEY= +go.opentelemetry.io/collector/consumer v0.0.0-20221117234814-4565692c50a7/go.mod h1:86Elcw/LLrh90DprArogHMkBX3+UMu3tIgcVWF3mr6o= +go.opentelemetry.io/collector/featuregate v0.0.0-20221117214536-6a117bfc3737 h1:7sXg6M9Fw6rFVlX+iaWOMz6DFXEiroUdQer5kWGixwM= +go.opentelemetry.io/collector/featuregate v0.0.0-20221117214536-6a117bfc3737/go.mod h1:tewuFKJYalWBU0bmNKg++MC1ipINXUr6szYzOw2p1GI= +go.opentelemetry.io/collector/pdata v0.64.2-0.20221117234814-4565692c50a7 h1:IOFqfOu7fFxTgC7pvc2U7dk1/uFjwVQPK+CALiUvacI= +go.opentelemetry.io/collector/pdata v0.64.2-0.20221117234814-4565692c50a7/go.mod h1:0vynPfW2ZN7DltpcCFgCmTtWMQkCjp2a3TNt82YTCLQ= +go.opentelemetry.io/collector/semconv v0.64.2-0.20221117234814-4565692c50a7 h1:cGXAVltDxXw9nj0Vr7vyZZTj0whdyO+GYs+xv0xHJ2A= +go.opentelemetry.io/collector/semconv v0.64.2-0.20221117234814-4565692c50a7/go.mod h1:5o9yhOa+ABt7g2E5JABDxGZ1PQPbtfxrKNbYn+LOTXU= go.opentelemetry.io/otel v1.11.1 h1:4WLLAmcfkmDk2ukNXJyq3/kiz/3UzCaYq6PskJsaou4= go.opentelemetry.io/otel v1.11.1/go.mod h1:1nNhXBbWSD0nsL38H6btgnFN2k4i0sNLHNNMZMSbUGE= go.opentelemetry.io/otel/exporters/prometheus v0.33.0 h1:xXhPj7SLKWU5/Zd4Hxmd+X1C4jdmvc0Xy+kvjFx2z60= diff --git a/exporter/awskinesisexporter/config_test.go b/exporter/awskinesisexporter/config_test.go index 249d6739a1fa5..101fa0d4d73c5 100644 --- a/exporter/awskinesisexporter/config_test.go +++ b/exporter/awskinesisexporter/config_test.go @@ -95,7 +95,7 @@ func TestLoadConfig(t *testing.T) { require.NoError(t, err) require.NoError(t, component.UnmarshalExporterConfig(sub, cfg)) - assert.NoError(t, cfg.Validate()) + assert.NoError(t, component.ValidateConfig(cfg)) assert.Equal(t, tt.expected, cfg) }) } diff --git a/exporter/awskinesisexporter/go.mod b/exporter/awskinesisexporter/go.mod index 010f62de48f03..2ece0aaeaf501 100644 --- a/exporter/awskinesisexporter/go.mod +++ b/exporter/awskinesisexporter/go.mod @@ -14,8 +14,10 @@ require ( github.com/open-telemetry/opentelemetry-collector-contrib/pkg/translator/jaeger v0.64.0 github.com/open-telemetry/opentelemetry-collector-contrib/pkg/translator/zipkin v0.64.0 github.com/stretchr/testify v1.8.1 - go.opentelemetry.io/collector v0.64.2-0.20221115155901-1550938c18fd - go.opentelemetry.io/collector/pdata v0.64.2-0.20221115155901-1550938c18fd + go.opentelemetry.io/collector v0.64.2-0.20221117234814-4565692c50a7 + go.opentelemetry.io/collector/component v0.0.0-20221117234814-4565692c50a7 + go.opentelemetry.io/collector/consumer v0.0.0-20221117234814-4565692c50a7 + go.opentelemetry.io/collector/pdata v0.64.2-0.20221117234814-4565692c50a7 go.uber.org/multierr v1.8.0 go.uber.org/zap v1.23.0 ) @@ -50,7 +52,8 @@ require ( github.com/uber/jaeger-client-go v2.30.0+incompatible // indirect github.com/uber/jaeger-lib v2.4.1+incompatible // indirect go.opencensus.io v0.24.0 // indirect - go.opentelemetry.io/collector/semconv v0.64.2-0.20221115155901-1550938c18fd // indirect + go.opentelemetry.io/collector/featuregate v0.0.0-20221117214536-6a117bfc3737 // indirect + go.opentelemetry.io/collector/semconv v0.64.2-0.20221117234814-4565692c50a7 // indirect go.opentelemetry.io/otel v1.11.1 // indirect go.opentelemetry.io/otel/metric v0.33.0 // indirect go.opentelemetry.io/otel/trace v1.11.1 // indirect diff --git a/exporter/awskinesisexporter/go.sum b/exporter/awskinesisexporter/go.sum index 040e750cef838..7a91abff21977 100644 --- a/exporter/awskinesisexporter/go.sum +++ b/exporter/awskinesisexporter/go.sum @@ -325,12 +325,18 @@ go.etcd.io/etcd/client/pkg/v3 v3.5.4/go.mod h1:IJHfcCEKxYu1Os13ZdwCwIUTUVGYTSAM3 go.etcd.io/etcd/client/v3 v3.5.4/go.mod h1:ZaRkVgBZC+L+dLCjTcF1hRXpgZXQPOvnA/Ak/gq3kiY= go.opencensus.io v0.24.0 h1:y73uSU6J157QMP2kn2r30vwW1A2W2WFwSCGnAVxeaD0= go.opencensus.io v0.24.0/go.mod h1:vNK8G9p7aAivkbmorf4v+7Hgx+Zs0yY+0fOtgBfjQKo= -go.opentelemetry.io/collector v0.64.2-0.20221115155901-1550938c18fd h1:O+6HhE4Ivg8Jksp3dIXIEC4FIR0Ush4uORvG3UtHZWk= -go.opentelemetry.io/collector v0.64.2-0.20221115155901-1550938c18fd/go.mod h1:mmSrOcwe1vEYmChXUYuF6rzlrUL0rjEiPfa19Xxb41o= -go.opentelemetry.io/collector/pdata v0.64.2-0.20221115155901-1550938c18fd h1:GdVAbRiae5VDZe3Mn3FqzMxO/aI5UbJ4+dcviqClHy8= -go.opentelemetry.io/collector/pdata v0.64.2-0.20221115155901-1550938c18fd/go.mod h1:0vynPfW2ZN7DltpcCFgCmTtWMQkCjp2a3TNt82YTCLQ= -go.opentelemetry.io/collector/semconv v0.64.2-0.20221115155901-1550938c18fd h1:rMqcl2pwi8YtVrtOPK8tVh87W0bFBge4yqB9ypSsAJ4= -go.opentelemetry.io/collector/semconv v0.64.2-0.20221115155901-1550938c18fd/go.mod h1:5o9yhOa+ABt7g2E5JABDxGZ1PQPbtfxrKNbYn+LOTXU= +go.opentelemetry.io/collector v0.64.2-0.20221117234814-4565692c50a7 h1:o/vMr2iyXzaeTb/KAldhMxAvRIfFPwtKfL5cKVKsSlU= +go.opentelemetry.io/collector v0.64.2-0.20221117234814-4565692c50a7/go.mod h1:PO8hayFFYvXDqELbXRVxwawR2HTdjN6mY4Qa3Se9xI8= +go.opentelemetry.io/collector/component v0.0.0-20221117234814-4565692c50a7 h1:q9m1bGHhQFUakQX79lZpLmFSY9VLULNSs2jUG8MdJLA= +go.opentelemetry.io/collector/component v0.0.0-20221117234814-4565692c50a7/go.mod h1:Z7H1Oj826e4dtVxXmT6SiUr6S0EIevUJmkVpfQV+UOk= +go.opentelemetry.io/collector/consumer v0.0.0-20221117234814-4565692c50a7 h1:FTy1JD9EJ7gq9SzlZoi2NkGcZ88+SwdiJav5uRcDEEY= +go.opentelemetry.io/collector/consumer v0.0.0-20221117234814-4565692c50a7/go.mod h1:86Elcw/LLrh90DprArogHMkBX3+UMu3tIgcVWF3mr6o= +go.opentelemetry.io/collector/featuregate v0.0.0-20221117214536-6a117bfc3737 h1:7sXg6M9Fw6rFVlX+iaWOMz6DFXEiroUdQer5kWGixwM= +go.opentelemetry.io/collector/featuregate v0.0.0-20221117214536-6a117bfc3737/go.mod h1:tewuFKJYalWBU0bmNKg++MC1ipINXUr6szYzOw2p1GI= +go.opentelemetry.io/collector/pdata v0.64.2-0.20221117234814-4565692c50a7 h1:IOFqfOu7fFxTgC7pvc2U7dk1/uFjwVQPK+CALiUvacI= +go.opentelemetry.io/collector/pdata v0.64.2-0.20221117234814-4565692c50a7/go.mod h1:0vynPfW2ZN7DltpcCFgCmTtWMQkCjp2a3TNt82YTCLQ= +go.opentelemetry.io/collector/semconv v0.64.2-0.20221117234814-4565692c50a7 h1:cGXAVltDxXw9nj0Vr7vyZZTj0whdyO+GYs+xv0xHJ2A= +go.opentelemetry.io/collector/semconv v0.64.2-0.20221117234814-4565692c50a7/go.mod h1:5o9yhOa+ABt7g2E5JABDxGZ1PQPbtfxrKNbYn+LOTXU= go.opentelemetry.io/otel v1.11.1 h1:4WLLAmcfkmDk2ukNXJyq3/kiz/3UzCaYq6PskJsaou4= go.opentelemetry.io/otel v1.11.1/go.mod h1:1nNhXBbWSD0nsL38H6btgnFN2k4i0sNLHNNMZMSbUGE= go.opentelemetry.io/otel/exporters/prometheus v0.33.0 h1:xXhPj7SLKWU5/Zd4Hxmd+X1C4jdmvc0Xy+kvjFx2z60= diff --git a/exporter/awsxrayexporter/config_test.go b/exporter/awsxrayexporter/config_test.go index 9d541a87ec9ae..881929b1cfd33 100644 --- a/exporter/awsxrayexporter/config_test.go +++ b/exporter/awsxrayexporter/config_test.go @@ -72,7 +72,7 @@ func TestLoadConfig(t *testing.T) { require.NoError(t, err) require.NoError(t, component.UnmarshalExporterConfig(sub, cfg)) - assert.NoError(t, cfg.Validate()) + assert.NoError(t, component.ValidateConfig(cfg)) assert.Equal(t, tt.expected, cfg) }) } diff --git a/exporter/awsxrayexporter/go.mod b/exporter/awsxrayexporter/go.mod index 59ec3ed638b16..09a5fb0b1182f 100644 --- a/exporter/awsxrayexporter/go.mod +++ b/exporter/awsxrayexporter/go.mod @@ -8,9 +8,11 @@ require ( github.com/open-telemetry/opentelemetry-collector-contrib/internal/aws/xray v0.64.0 github.com/open-telemetry/opentelemetry-collector-contrib/internal/coreinternal v0.0.0-00010101000000-000000000000 github.com/stretchr/testify v1.8.1 - go.opentelemetry.io/collector v0.64.2-0.20221115155901-1550938c18fd - go.opentelemetry.io/collector/pdata v0.64.2-0.20221115155901-1550938c18fd - go.opentelemetry.io/collector/semconv v0.64.2-0.20221115155901-1550938c18fd + go.opentelemetry.io/collector v0.64.2-0.20221117234814-4565692c50a7 + go.opentelemetry.io/collector/component v0.0.0-20221117234814-4565692c50a7 + go.opentelemetry.io/collector/consumer v0.0.0-20221117234814-4565692c50a7 + go.opentelemetry.io/collector/pdata v0.64.2-0.20221117234814-4565692c50a7 + go.opentelemetry.io/collector/semconv v0.64.2-0.20221117234814-4565692c50a7 go.uber.org/zap v1.23.0 ) @@ -30,6 +32,7 @@ require ( github.com/modern-go/reflect2 v1.0.2 // indirect github.com/pmezard/go-difflib v1.0.0 // indirect go.opencensus.io v0.24.0 // indirect + go.opentelemetry.io/collector/featuregate v0.0.0-20221117214536-6a117bfc3737 // indirect go.opentelemetry.io/otel v1.11.1 // indirect go.opentelemetry.io/otel/metric v0.33.0 // indirect go.opentelemetry.io/otel/trace v1.11.1 // indirect diff --git a/exporter/awsxrayexporter/go.sum b/exporter/awsxrayexporter/go.sum index 961928f7b85b4..83279e0739084 100644 --- a/exporter/awsxrayexporter/go.sum +++ b/exporter/awsxrayexporter/go.sum @@ -282,12 +282,18 @@ go.etcd.io/etcd/client/pkg/v3 v3.5.4/go.mod h1:IJHfcCEKxYu1Os13ZdwCwIUTUVGYTSAM3 go.etcd.io/etcd/client/v3 v3.5.4/go.mod h1:ZaRkVgBZC+L+dLCjTcF1hRXpgZXQPOvnA/Ak/gq3kiY= go.opencensus.io v0.24.0 h1:y73uSU6J157QMP2kn2r30vwW1A2W2WFwSCGnAVxeaD0= go.opencensus.io v0.24.0/go.mod h1:vNK8G9p7aAivkbmorf4v+7Hgx+Zs0yY+0fOtgBfjQKo= -go.opentelemetry.io/collector v0.64.2-0.20221115155901-1550938c18fd h1:O+6HhE4Ivg8Jksp3dIXIEC4FIR0Ush4uORvG3UtHZWk= -go.opentelemetry.io/collector v0.64.2-0.20221115155901-1550938c18fd/go.mod h1:mmSrOcwe1vEYmChXUYuF6rzlrUL0rjEiPfa19Xxb41o= -go.opentelemetry.io/collector/pdata v0.64.2-0.20221115155901-1550938c18fd h1:GdVAbRiae5VDZe3Mn3FqzMxO/aI5UbJ4+dcviqClHy8= -go.opentelemetry.io/collector/pdata v0.64.2-0.20221115155901-1550938c18fd/go.mod h1:0vynPfW2ZN7DltpcCFgCmTtWMQkCjp2a3TNt82YTCLQ= -go.opentelemetry.io/collector/semconv v0.64.2-0.20221115155901-1550938c18fd h1:rMqcl2pwi8YtVrtOPK8tVh87W0bFBge4yqB9ypSsAJ4= -go.opentelemetry.io/collector/semconv v0.64.2-0.20221115155901-1550938c18fd/go.mod h1:5o9yhOa+ABt7g2E5JABDxGZ1PQPbtfxrKNbYn+LOTXU= +go.opentelemetry.io/collector v0.64.2-0.20221117234814-4565692c50a7 h1:o/vMr2iyXzaeTb/KAldhMxAvRIfFPwtKfL5cKVKsSlU= +go.opentelemetry.io/collector v0.64.2-0.20221117234814-4565692c50a7/go.mod h1:PO8hayFFYvXDqELbXRVxwawR2HTdjN6mY4Qa3Se9xI8= +go.opentelemetry.io/collector/component v0.0.0-20221117234814-4565692c50a7 h1:q9m1bGHhQFUakQX79lZpLmFSY9VLULNSs2jUG8MdJLA= +go.opentelemetry.io/collector/component v0.0.0-20221117234814-4565692c50a7/go.mod h1:Z7H1Oj826e4dtVxXmT6SiUr6S0EIevUJmkVpfQV+UOk= +go.opentelemetry.io/collector/consumer v0.0.0-20221117234814-4565692c50a7 h1:FTy1JD9EJ7gq9SzlZoi2NkGcZ88+SwdiJav5uRcDEEY= +go.opentelemetry.io/collector/consumer v0.0.0-20221117234814-4565692c50a7/go.mod h1:86Elcw/LLrh90DprArogHMkBX3+UMu3tIgcVWF3mr6o= +go.opentelemetry.io/collector/featuregate v0.0.0-20221117214536-6a117bfc3737 h1:7sXg6M9Fw6rFVlX+iaWOMz6DFXEiroUdQer5kWGixwM= +go.opentelemetry.io/collector/featuregate v0.0.0-20221117214536-6a117bfc3737/go.mod h1:tewuFKJYalWBU0bmNKg++MC1ipINXUr6szYzOw2p1GI= +go.opentelemetry.io/collector/pdata v0.64.2-0.20221117234814-4565692c50a7 h1:IOFqfOu7fFxTgC7pvc2U7dk1/uFjwVQPK+CALiUvacI= +go.opentelemetry.io/collector/pdata v0.64.2-0.20221117234814-4565692c50a7/go.mod h1:0vynPfW2ZN7DltpcCFgCmTtWMQkCjp2a3TNt82YTCLQ= +go.opentelemetry.io/collector/semconv v0.64.2-0.20221117234814-4565692c50a7 h1:cGXAVltDxXw9nj0Vr7vyZZTj0whdyO+GYs+xv0xHJ2A= +go.opentelemetry.io/collector/semconv v0.64.2-0.20221117234814-4565692c50a7/go.mod h1:5o9yhOa+ABt7g2E5JABDxGZ1PQPbtfxrKNbYn+LOTXU= go.opentelemetry.io/otel v1.11.1 h1:4WLLAmcfkmDk2ukNXJyq3/kiz/3UzCaYq6PskJsaou4= go.opentelemetry.io/otel v1.11.1/go.mod h1:1nNhXBbWSD0nsL38H6btgnFN2k4i0sNLHNNMZMSbUGE= go.opentelemetry.io/otel/exporters/prometheus v0.33.0 h1:xXhPj7SLKWU5/Zd4Hxmd+X1C4jdmvc0Xy+kvjFx2z60= diff --git a/exporter/azuredataexplorerexporter/config_test.go b/exporter/azuredataexplorerexporter/config_test.go index 1b94a3b957162..521e7aa183120 100644 --- a/exporter/azuredataexplorerexporter/config_test.go +++ b/exporter/azuredataexplorerexporter/config_test.go @@ -71,10 +71,10 @@ func TestLoadConfig(t *testing.T) { require.NoError(t, component.UnmarshalExporterConfig(sub, cfg)) if tt.expected == nil { - assert.EqualError(t, cfg.Validate(), tt.errorMessage) + assert.EqualError(t, component.ValidateConfig(cfg), tt.errorMessage) return } - assert.NoError(t, cfg.Validate()) + assert.NoError(t, component.ValidateConfig(cfg)) assert.Equal(t, tt.expected, cfg) }) } diff --git a/exporter/azuredataexplorerexporter/go.mod b/exporter/azuredataexplorerexporter/go.mod index e1b8ed01fffa5..e4adfc692dd3d 100644 --- a/exporter/azuredataexplorerexporter/go.mod +++ b/exporter/azuredataexplorerexporter/go.mod @@ -8,8 +8,9 @@ require ( github.com/json-iterator/go v1.1.12 github.com/open-telemetry/opentelemetry-collector-contrib/internal/coreinternal v0.64.0 github.com/stretchr/testify v1.8.1 - go.opentelemetry.io/collector v0.64.2-0.20221115155901-1550938c18fd - go.opentelemetry.io/collector/pdata v0.64.2-0.20221115155901-1550938c18fd + go.opentelemetry.io/collector v0.64.2-0.20221117234814-4565692c50a7 + go.opentelemetry.io/collector/component v0.0.0-20221117234814-4565692c50a7 + go.opentelemetry.io/collector/pdata v0.64.2-0.20221117234814-4565692c50a7 go.uber.org/zap v1.23.0 ) @@ -47,6 +48,8 @@ require ( github.com/modern-go/reflect2 v1.0.2 // indirect github.com/pmezard/go-difflib v1.0.0 // indirect go.opencensus.io v0.24.0 // indirect + go.opentelemetry.io/collector/consumer v0.0.0-20221117234814-4565692c50a7 // indirect + go.opentelemetry.io/collector/featuregate v0.0.0-20221117214536-6a117bfc3737 // indirect go.opentelemetry.io/otel v1.11.1 // indirect go.opentelemetry.io/otel/metric v0.33.0 // indirect go.opentelemetry.io/otel/trace v1.11.1 // indirect diff --git a/exporter/azuredataexplorerexporter/go.sum b/exporter/azuredataexplorerexporter/go.sum index ea0f97cea723c..c47ba38759e22 100644 --- a/exporter/azuredataexplorerexporter/go.sum +++ b/exporter/azuredataexplorerexporter/go.sum @@ -328,10 +328,16 @@ go.etcd.io/etcd/client/pkg/v3 v3.5.4/go.mod h1:IJHfcCEKxYu1Os13ZdwCwIUTUVGYTSAM3 go.etcd.io/etcd/client/v3 v3.5.4/go.mod h1:ZaRkVgBZC+L+dLCjTcF1hRXpgZXQPOvnA/Ak/gq3kiY= go.opencensus.io v0.24.0 h1:y73uSU6J157QMP2kn2r30vwW1A2W2WFwSCGnAVxeaD0= go.opencensus.io v0.24.0/go.mod h1:vNK8G9p7aAivkbmorf4v+7Hgx+Zs0yY+0fOtgBfjQKo= -go.opentelemetry.io/collector v0.64.2-0.20221115155901-1550938c18fd h1:O+6HhE4Ivg8Jksp3dIXIEC4FIR0Ush4uORvG3UtHZWk= -go.opentelemetry.io/collector v0.64.2-0.20221115155901-1550938c18fd/go.mod h1:mmSrOcwe1vEYmChXUYuF6rzlrUL0rjEiPfa19Xxb41o= -go.opentelemetry.io/collector/pdata v0.64.2-0.20221115155901-1550938c18fd h1:GdVAbRiae5VDZe3Mn3FqzMxO/aI5UbJ4+dcviqClHy8= -go.opentelemetry.io/collector/pdata v0.64.2-0.20221115155901-1550938c18fd/go.mod h1:0vynPfW2ZN7DltpcCFgCmTtWMQkCjp2a3TNt82YTCLQ= +go.opentelemetry.io/collector v0.64.2-0.20221117234814-4565692c50a7 h1:o/vMr2iyXzaeTb/KAldhMxAvRIfFPwtKfL5cKVKsSlU= +go.opentelemetry.io/collector v0.64.2-0.20221117234814-4565692c50a7/go.mod h1:PO8hayFFYvXDqELbXRVxwawR2HTdjN6mY4Qa3Se9xI8= +go.opentelemetry.io/collector/component v0.0.0-20221117234814-4565692c50a7 h1:q9m1bGHhQFUakQX79lZpLmFSY9VLULNSs2jUG8MdJLA= +go.opentelemetry.io/collector/component v0.0.0-20221117234814-4565692c50a7/go.mod h1:Z7H1Oj826e4dtVxXmT6SiUr6S0EIevUJmkVpfQV+UOk= +go.opentelemetry.io/collector/consumer v0.0.0-20221117234814-4565692c50a7 h1:FTy1JD9EJ7gq9SzlZoi2NkGcZ88+SwdiJav5uRcDEEY= +go.opentelemetry.io/collector/consumer v0.0.0-20221117234814-4565692c50a7/go.mod h1:86Elcw/LLrh90DprArogHMkBX3+UMu3tIgcVWF3mr6o= +go.opentelemetry.io/collector/featuregate v0.0.0-20221117214536-6a117bfc3737 h1:7sXg6M9Fw6rFVlX+iaWOMz6DFXEiroUdQer5kWGixwM= +go.opentelemetry.io/collector/featuregate v0.0.0-20221117214536-6a117bfc3737/go.mod h1:tewuFKJYalWBU0bmNKg++MC1ipINXUr6szYzOw2p1GI= +go.opentelemetry.io/collector/pdata v0.64.2-0.20221117234814-4565692c50a7 h1:IOFqfOu7fFxTgC7pvc2U7dk1/uFjwVQPK+CALiUvacI= +go.opentelemetry.io/collector/pdata v0.64.2-0.20221117234814-4565692c50a7/go.mod h1:0vynPfW2ZN7DltpcCFgCmTtWMQkCjp2a3TNt82YTCLQ= go.opentelemetry.io/otel v1.11.1 h1:4WLLAmcfkmDk2ukNXJyq3/kiz/3UzCaYq6PskJsaou4= go.opentelemetry.io/otel v1.11.1/go.mod h1:1nNhXBbWSD0nsL38H6btgnFN2k4i0sNLHNNMZMSbUGE= go.opentelemetry.io/otel/exporters/prometheus v0.33.0 h1:xXhPj7SLKWU5/Zd4Hxmd+X1C4jdmvc0Xy+kvjFx2z60= diff --git a/exporter/azuremonitorexporter/config_test.go b/exporter/azuremonitorexporter/config_test.go index b8dff7c08d762..d8120cd7e11a1 100644 --- a/exporter/azuremonitorexporter/config_test.go +++ b/exporter/azuremonitorexporter/config_test.go @@ -62,7 +62,7 @@ func TestLoadConfig(t *testing.T) { require.NoError(t, err) require.NoError(t, component.UnmarshalExporterConfig(sub, cfg)) - assert.NoError(t, cfg.Validate()) + assert.NoError(t, component.ValidateConfig(cfg)) assert.Equal(t, tt.expected, cfg) }) } diff --git a/exporter/azuremonitorexporter/go.mod b/exporter/azuremonitorexporter/go.mod index 154ac0648f68e..d3bda79a5577e 100644 --- a/exporter/azuremonitorexporter/go.mod +++ b/exporter/azuremonitorexporter/go.mod @@ -6,9 +6,11 @@ require ( github.com/microsoft/ApplicationInsights-Go v0.4.4 github.com/open-telemetry/opentelemetry-collector-contrib/internal/coreinternal v0.64.0 github.com/stretchr/testify v1.8.1 - go.opentelemetry.io/collector v0.64.2-0.20221115155901-1550938c18fd - go.opentelemetry.io/collector/pdata v0.64.2-0.20221115155901-1550938c18fd - go.opentelemetry.io/collector/semconv v0.64.2-0.20221115155901-1550938c18fd + go.opentelemetry.io/collector v0.64.2-0.20221117234814-4565692c50a7 + go.opentelemetry.io/collector/component v0.0.0-20221117234814-4565692c50a7 + go.opentelemetry.io/collector/consumer v0.0.0-20221117234814-4565692c50a7 + go.opentelemetry.io/collector/pdata v0.64.2-0.20221117234814-4565692c50a7 + go.opentelemetry.io/collector/semconv v0.64.2-0.20221117234814-4565692c50a7 go.uber.org/zap v1.23.0 golang.org/x/net v0.0.0-20220624214902-1bab6f366d9e ) @@ -31,6 +33,7 @@ require ( github.com/pmezard/go-difflib v1.0.0 // indirect github.com/stretchr/objx v0.5.0 // indirect go.opencensus.io v0.24.0 // indirect + go.opentelemetry.io/collector/featuregate v0.0.0-20221117214536-6a117bfc3737 // indirect go.opentelemetry.io/otel v1.11.1 // indirect go.opentelemetry.io/otel/metric v0.33.0 // indirect go.opentelemetry.io/otel/trace v1.11.1 // indirect diff --git a/exporter/azuremonitorexporter/go.sum b/exporter/azuremonitorexporter/go.sum index d51655379a714..a92daa647f012 100644 --- a/exporter/azuremonitorexporter/go.sum +++ b/exporter/azuremonitorexporter/go.sum @@ -291,12 +291,18 @@ go.etcd.io/etcd/client/pkg/v3 v3.5.4/go.mod h1:IJHfcCEKxYu1Os13ZdwCwIUTUVGYTSAM3 go.etcd.io/etcd/client/v3 v3.5.4/go.mod h1:ZaRkVgBZC+L+dLCjTcF1hRXpgZXQPOvnA/Ak/gq3kiY= go.opencensus.io v0.24.0 h1:y73uSU6J157QMP2kn2r30vwW1A2W2WFwSCGnAVxeaD0= go.opencensus.io v0.24.0/go.mod h1:vNK8G9p7aAivkbmorf4v+7Hgx+Zs0yY+0fOtgBfjQKo= -go.opentelemetry.io/collector v0.64.2-0.20221115155901-1550938c18fd h1:O+6HhE4Ivg8Jksp3dIXIEC4FIR0Ush4uORvG3UtHZWk= -go.opentelemetry.io/collector v0.64.2-0.20221115155901-1550938c18fd/go.mod h1:mmSrOcwe1vEYmChXUYuF6rzlrUL0rjEiPfa19Xxb41o= -go.opentelemetry.io/collector/pdata v0.64.2-0.20221115155901-1550938c18fd h1:GdVAbRiae5VDZe3Mn3FqzMxO/aI5UbJ4+dcviqClHy8= -go.opentelemetry.io/collector/pdata v0.64.2-0.20221115155901-1550938c18fd/go.mod h1:0vynPfW2ZN7DltpcCFgCmTtWMQkCjp2a3TNt82YTCLQ= -go.opentelemetry.io/collector/semconv v0.64.2-0.20221115155901-1550938c18fd h1:rMqcl2pwi8YtVrtOPK8tVh87W0bFBge4yqB9ypSsAJ4= -go.opentelemetry.io/collector/semconv v0.64.2-0.20221115155901-1550938c18fd/go.mod h1:5o9yhOa+ABt7g2E5JABDxGZ1PQPbtfxrKNbYn+LOTXU= +go.opentelemetry.io/collector v0.64.2-0.20221117234814-4565692c50a7 h1:o/vMr2iyXzaeTb/KAldhMxAvRIfFPwtKfL5cKVKsSlU= +go.opentelemetry.io/collector v0.64.2-0.20221117234814-4565692c50a7/go.mod h1:PO8hayFFYvXDqELbXRVxwawR2HTdjN6mY4Qa3Se9xI8= +go.opentelemetry.io/collector/component v0.0.0-20221117234814-4565692c50a7 h1:q9m1bGHhQFUakQX79lZpLmFSY9VLULNSs2jUG8MdJLA= +go.opentelemetry.io/collector/component v0.0.0-20221117234814-4565692c50a7/go.mod h1:Z7H1Oj826e4dtVxXmT6SiUr6S0EIevUJmkVpfQV+UOk= +go.opentelemetry.io/collector/consumer v0.0.0-20221117234814-4565692c50a7 h1:FTy1JD9EJ7gq9SzlZoi2NkGcZ88+SwdiJav5uRcDEEY= +go.opentelemetry.io/collector/consumer v0.0.0-20221117234814-4565692c50a7/go.mod h1:86Elcw/LLrh90DprArogHMkBX3+UMu3tIgcVWF3mr6o= +go.opentelemetry.io/collector/featuregate v0.0.0-20221117214536-6a117bfc3737 h1:7sXg6M9Fw6rFVlX+iaWOMz6DFXEiroUdQer5kWGixwM= +go.opentelemetry.io/collector/featuregate v0.0.0-20221117214536-6a117bfc3737/go.mod h1:tewuFKJYalWBU0bmNKg++MC1ipINXUr6szYzOw2p1GI= +go.opentelemetry.io/collector/pdata v0.64.2-0.20221117234814-4565692c50a7 h1:IOFqfOu7fFxTgC7pvc2U7dk1/uFjwVQPK+CALiUvacI= +go.opentelemetry.io/collector/pdata v0.64.2-0.20221117234814-4565692c50a7/go.mod h1:0vynPfW2ZN7DltpcCFgCmTtWMQkCjp2a3TNt82YTCLQ= +go.opentelemetry.io/collector/semconv v0.64.2-0.20221117234814-4565692c50a7 h1:cGXAVltDxXw9nj0Vr7vyZZTj0whdyO+GYs+xv0xHJ2A= +go.opentelemetry.io/collector/semconv v0.64.2-0.20221117234814-4565692c50a7/go.mod h1:5o9yhOa+ABt7g2E5JABDxGZ1PQPbtfxrKNbYn+LOTXU= go.opentelemetry.io/otel v1.11.1 h1:4WLLAmcfkmDk2ukNXJyq3/kiz/3UzCaYq6PskJsaou4= go.opentelemetry.io/otel v1.11.1/go.mod h1:1nNhXBbWSD0nsL38H6btgnFN2k4i0sNLHNNMZMSbUGE= go.opentelemetry.io/otel/exporters/prometheus v0.33.0 h1:xXhPj7SLKWU5/Zd4Hxmd+X1C4jdmvc0Xy+kvjFx2z60= diff --git a/exporter/carbonexporter/config_test.go b/exporter/carbonexporter/config_test.go index 6d9e8a3a8f3af..107dc9d1ce877 100644 --- a/exporter/carbonexporter/config_test.go +++ b/exporter/carbonexporter/config_test.go @@ -61,7 +61,7 @@ func TestLoadConfig(t *testing.T) { require.NoError(t, err) require.NoError(t, component.UnmarshalExporterConfig(sub, cfg)) - assert.NoError(t, cfg.Validate()) + assert.NoError(t, component.ValidateConfig(cfg)) assert.Equal(t, tt.expected, cfg) }) } diff --git a/exporter/carbonexporter/go.mod b/exporter/carbonexporter/go.mod index db83aa4038e6b..4cce943c72ff3 100644 --- a/exporter/carbonexporter/go.mod +++ b/exporter/carbonexporter/go.mod @@ -5,9 +5,10 @@ go 1.18 require ( github.com/open-telemetry/opentelemetry-collector-contrib/internal/common v0.64.0 github.com/stretchr/testify v1.8.1 - go.opentelemetry.io/collector v0.64.2-0.20221115155901-1550938c18fd - go.opentelemetry.io/collector/pdata v0.64.2-0.20221115155901-1550938c18fd - go.opentelemetry.io/collector/semconv v0.64.2-0.20221115155901-1550938c18fd + go.opentelemetry.io/collector v0.64.2-0.20221117234814-4565692c50a7 + go.opentelemetry.io/collector/component v0.0.0-20221117234814-4565692c50a7 + go.opentelemetry.io/collector/pdata v0.64.2-0.20221117234814-4565692c50a7 + go.opentelemetry.io/collector/semconv v0.64.2-0.20221117234814-4565692c50a7 go.uber.org/atomic v1.10.0 ) @@ -27,6 +28,8 @@ require ( github.com/pelletier/go-toml v1.9.4 // indirect github.com/pmezard/go-difflib v1.0.0 // indirect go.opencensus.io v0.24.0 // indirect + go.opentelemetry.io/collector/consumer v0.0.0-20221117234814-4565692c50a7 // indirect + go.opentelemetry.io/collector/featuregate v0.0.0-20221117214536-6a117bfc3737 // indirect go.opentelemetry.io/otel v1.11.1 // indirect go.opentelemetry.io/otel/metric v0.33.0 // indirect go.opentelemetry.io/otel/trace v1.11.1 // indirect diff --git a/exporter/carbonexporter/go.sum b/exporter/carbonexporter/go.sum index b99a1e3de6dec..034b6f262ed2f 100644 --- a/exporter/carbonexporter/go.sum +++ b/exporter/carbonexporter/go.sum @@ -273,12 +273,18 @@ go.etcd.io/etcd/client/pkg/v3 v3.5.4/go.mod h1:IJHfcCEKxYu1Os13ZdwCwIUTUVGYTSAM3 go.etcd.io/etcd/client/v3 v3.5.4/go.mod h1:ZaRkVgBZC+L+dLCjTcF1hRXpgZXQPOvnA/Ak/gq3kiY= go.opencensus.io v0.24.0 h1:y73uSU6J157QMP2kn2r30vwW1A2W2WFwSCGnAVxeaD0= go.opencensus.io v0.24.0/go.mod h1:vNK8G9p7aAivkbmorf4v+7Hgx+Zs0yY+0fOtgBfjQKo= -go.opentelemetry.io/collector v0.64.2-0.20221115155901-1550938c18fd h1:O+6HhE4Ivg8Jksp3dIXIEC4FIR0Ush4uORvG3UtHZWk= -go.opentelemetry.io/collector v0.64.2-0.20221115155901-1550938c18fd/go.mod h1:mmSrOcwe1vEYmChXUYuF6rzlrUL0rjEiPfa19Xxb41o= -go.opentelemetry.io/collector/pdata v0.64.2-0.20221115155901-1550938c18fd h1:GdVAbRiae5VDZe3Mn3FqzMxO/aI5UbJ4+dcviqClHy8= -go.opentelemetry.io/collector/pdata v0.64.2-0.20221115155901-1550938c18fd/go.mod h1:0vynPfW2ZN7DltpcCFgCmTtWMQkCjp2a3TNt82YTCLQ= -go.opentelemetry.io/collector/semconv v0.64.2-0.20221115155901-1550938c18fd h1:rMqcl2pwi8YtVrtOPK8tVh87W0bFBge4yqB9ypSsAJ4= -go.opentelemetry.io/collector/semconv v0.64.2-0.20221115155901-1550938c18fd/go.mod h1:5o9yhOa+ABt7g2E5JABDxGZ1PQPbtfxrKNbYn+LOTXU= +go.opentelemetry.io/collector v0.64.2-0.20221117234814-4565692c50a7 h1:o/vMr2iyXzaeTb/KAldhMxAvRIfFPwtKfL5cKVKsSlU= +go.opentelemetry.io/collector v0.64.2-0.20221117234814-4565692c50a7/go.mod h1:PO8hayFFYvXDqELbXRVxwawR2HTdjN6mY4Qa3Se9xI8= +go.opentelemetry.io/collector/component v0.0.0-20221117234814-4565692c50a7 h1:q9m1bGHhQFUakQX79lZpLmFSY9VLULNSs2jUG8MdJLA= +go.opentelemetry.io/collector/component v0.0.0-20221117234814-4565692c50a7/go.mod h1:Z7H1Oj826e4dtVxXmT6SiUr6S0EIevUJmkVpfQV+UOk= +go.opentelemetry.io/collector/consumer v0.0.0-20221117234814-4565692c50a7 h1:FTy1JD9EJ7gq9SzlZoi2NkGcZ88+SwdiJav5uRcDEEY= +go.opentelemetry.io/collector/consumer v0.0.0-20221117234814-4565692c50a7/go.mod h1:86Elcw/LLrh90DprArogHMkBX3+UMu3tIgcVWF3mr6o= +go.opentelemetry.io/collector/featuregate v0.0.0-20221117214536-6a117bfc3737 h1:7sXg6M9Fw6rFVlX+iaWOMz6DFXEiroUdQer5kWGixwM= +go.opentelemetry.io/collector/featuregate v0.0.0-20221117214536-6a117bfc3737/go.mod h1:tewuFKJYalWBU0bmNKg++MC1ipINXUr6szYzOw2p1GI= +go.opentelemetry.io/collector/pdata v0.64.2-0.20221117234814-4565692c50a7 h1:IOFqfOu7fFxTgC7pvc2U7dk1/uFjwVQPK+CALiUvacI= +go.opentelemetry.io/collector/pdata v0.64.2-0.20221117234814-4565692c50a7/go.mod h1:0vynPfW2ZN7DltpcCFgCmTtWMQkCjp2a3TNt82YTCLQ= +go.opentelemetry.io/collector/semconv v0.64.2-0.20221117234814-4565692c50a7 h1:cGXAVltDxXw9nj0Vr7vyZZTj0whdyO+GYs+xv0xHJ2A= +go.opentelemetry.io/collector/semconv v0.64.2-0.20221117234814-4565692c50a7/go.mod h1:5o9yhOa+ABt7g2E5JABDxGZ1PQPbtfxrKNbYn+LOTXU= go.opentelemetry.io/otel v1.11.1 h1:4WLLAmcfkmDk2ukNXJyq3/kiz/3UzCaYq6PskJsaou4= go.opentelemetry.io/otel v1.11.1/go.mod h1:1nNhXBbWSD0nsL38H6btgnFN2k4i0sNLHNNMZMSbUGE= go.opentelemetry.io/otel/exporters/prometheus v0.33.0 h1:xXhPj7SLKWU5/Zd4Hxmd+X1C4jdmvc0Xy+kvjFx2z60= diff --git a/exporter/clickhouseexporter/config_test.go b/exporter/clickhouseexporter/config_test.go index 9c0d9742f18d9..bc5cbb868a6a6 100644 --- a/exporter/clickhouseexporter/config_test.go +++ b/exporter/clickhouseexporter/config_test.go @@ -80,7 +80,7 @@ func TestLoadConfig(t *testing.T) { require.NoError(t, err) require.NoError(t, component.UnmarshalExporterConfig(sub, cfg)) - assert.NoError(t, cfg.Validate()) + assert.NoError(t, component.ValidateConfig(cfg)) assert.Equal(t, tt.expected, cfg) }) } diff --git a/exporter/clickhouseexporter/go.mod b/exporter/clickhouseexporter/go.mod index 3ecc74fe98f4a..cc26971755d1c 100644 --- a/exporter/clickhouseexporter/go.mod +++ b/exporter/clickhouseexporter/go.mod @@ -6,9 +6,10 @@ require ( github.com/ClickHouse/clickhouse-go/v2 v2.3.0 github.com/open-telemetry/opentelemetry-collector-contrib/internal/coreinternal v0.64.0 github.com/stretchr/testify v1.8.1 - go.opentelemetry.io/collector v0.64.2-0.20221115155901-1550938c18fd - go.opentelemetry.io/collector/pdata v0.64.2-0.20221115155901-1550938c18fd - go.opentelemetry.io/collector/semconv v0.64.2-0.20221115155901-1550938c18fd + go.opentelemetry.io/collector v0.64.2-0.20221117234814-4565692c50a7 + go.opentelemetry.io/collector/component v0.0.0-20221117234814-4565692c50a7 + go.opentelemetry.io/collector/pdata v0.64.2-0.20221117234814-4565692c50a7 + go.opentelemetry.io/collector/semconv v0.64.2-0.20221117234814-4565692c50a7 go.uber.org/multierr v1.8.0 go.uber.org/zap v1.23.0 ) @@ -40,6 +41,8 @@ require ( github.com/segmentio/asm v1.2.0 // indirect github.com/shopspring/decimal v1.3.1 // indirect go.opencensus.io v0.24.0 // indirect + go.opentelemetry.io/collector/consumer v0.0.0-20221117234814-4565692c50a7 // indirect + go.opentelemetry.io/collector/featuregate v0.0.0-20221117214536-6a117bfc3737 // indirect go.opentelemetry.io/otel v1.11.1 // indirect go.opentelemetry.io/otel/metric v0.33.0 // indirect go.opentelemetry.io/otel/trace v1.11.1 // indirect diff --git a/exporter/clickhouseexporter/go.sum b/exporter/clickhouseexporter/go.sum index 807cb734aaf3f..1b6ee3c350a78 100644 --- a/exporter/clickhouseexporter/go.sum +++ b/exporter/clickhouseexporter/go.sum @@ -300,12 +300,18 @@ go.etcd.io/etcd/client/pkg/v3 v3.5.4/go.mod h1:IJHfcCEKxYu1Os13ZdwCwIUTUVGYTSAM3 go.etcd.io/etcd/client/v3 v3.5.4/go.mod h1:ZaRkVgBZC+L+dLCjTcF1hRXpgZXQPOvnA/Ak/gq3kiY= go.opencensus.io v0.24.0 h1:y73uSU6J157QMP2kn2r30vwW1A2W2WFwSCGnAVxeaD0= go.opencensus.io v0.24.0/go.mod h1:vNK8G9p7aAivkbmorf4v+7Hgx+Zs0yY+0fOtgBfjQKo= -go.opentelemetry.io/collector v0.64.2-0.20221115155901-1550938c18fd h1:O+6HhE4Ivg8Jksp3dIXIEC4FIR0Ush4uORvG3UtHZWk= -go.opentelemetry.io/collector v0.64.2-0.20221115155901-1550938c18fd/go.mod h1:mmSrOcwe1vEYmChXUYuF6rzlrUL0rjEiPfa19Xxb41o= -go.opentelemetry.io/collector/pdata v0.64.2-0.20221115155901-1550938c18fd h1:GdVAbRiae5VDZe3Mn3FqzMxO/aI5UbJ4+dcviqClHy8= -go.opentelemetry.io/collector/pdata v0.64.2-0.20221115155901-1550938c18fd/go.mod h1:0vynPfW2ZN7DltpcCFgCmTtWMQkCjp2a3TNt82YTCLQ= -go.opentelemetry.io/collector/semconv v0.64.2-0.20221115155901-1550938c18fd h1:rMqcl2pwi8YtVrtOPK8tVh87W0bFBge4yqB9ypSsAJ4= -go.opentelemetry.io/collector/semconv v0.64.2-0.20221115155901-1550938c18fd/go.mod h1:5o9yhOa+ABt7g2E5JABDxGZ1PQPbtfxrKNbYn+LOTXU= +go.opentelemetry.io/collector v0.64.2-0.20221117234814-4565692c50a7 h1:o/vMr2iyXzaeTb/KAldhMxAvRIfFPwtKfL5cKVKsSlU= +go.opentelemetry.io/collector v0.64.2-0.20221117234814-4565692c50a7/go.mod h1:PO8hayFFYvXDqELbXRVxwawR2HTdjN6mY4Qa3Se9xI8= +go.opentelemetry.io/collector/component v0.0.0-20221117234814-4565692c50a7 h1:q9m1bGHhQFUakQX79lZpLmFSY9VLULNSs2jUG8MdJLA= +go.opentelemetry.io/collector/component v0.0.0-20221117234814-4565692c50a7/go.mod h1:Z7H1Oj826e4dtVxXmT6SiUr6S0EIevUJmkVpfQV+UOk= +go.opentelemetry.io/collector/consumer v0.0.0-20221117234814-4565692c50a7 h1:FTy1JD9EJ7gq9SzlZoi2NkGcZ88+SwdiJav5uRcDEEY= +go.opentelemetry.io/collector/consumer v0.0.0-20221117234814-4565692c50a7/go.mod h1:86Elcw/LLrh90DprArogHMkBX3+UMu3tIgcVWF3mr6o= +go.opentelemetry.io/collector/featuregate v0.0.0-20221117214536-6a117bfc3737 h1:7sXg6M9Fw6rFVlX+iaWOMz6DFXEiroUdQer5kWGixwM= +go.opentelemetry.io/collector/featuregate v0.0.0-20221117214536-6a117bfc3737/go.mod h1:tewuFKJYalWBU0bmNKg++MC1ipINXUr6szYzOw2p1GI= +go.opentelemetry.io/collector/pdata v0.64.2-0.20221117234814-4565692c50a7 h1:IOFqfOu7fFxTgC7pvc2U7dk1/uFjwVQPK+CALiUvacI= +go.opentelemetry.io/collector/pdata v0.64.2-0.20221117234814-4565692c50a7/go.mod h1:0vynPfW2ZN7DltpcCFgCmTtWMQkCjp2a3TNt82YTCLQ= +go.opentelemetry.io/collector/semconv v0.64.2-0.20221117234814-4565692c50a7 h1:cGXAVltDxXw9nj0Vr7vyZZTj0whdyO+GYs+xv0xHJ2A= +go.opentelemetry.io/collector/semconv v0.64.2-0.20221117234814-4565692c50a7/go.mod h1:5o9yhOa+ABt7g2E5JABDxGZ1PQPbtfxrKNbYn+LOTXU= go.opentelemetry.io/otel v1.11.1 h1:4WLLAmcfkmDk2ukNXJyq3/kiz/3UzCaYq6PskJsaou4= go.opentelemetry.io/otel v1.11.1/go.mod h1:1nNhXBbWSD0nsL38H6btgnFN2k4i0sNLHNNMZMSbUGE= go.opentelemetry.io/otel/exporters/prometheus v0.33.0 h1:xXhPj7SLKWU5/Zd4Hxmd+X1C4jdmvc0Xy+kvjFx2z60= diff --git a/exporter/coralogixexporter/config_test.go b/exporter/coralogixexporter/config_test.go index 51d33c34d0653..592244f3986a6 100644 --- a/exporter/coralogixexporter/config_test.go +++ b/exporter/coralogixexporter/config_test.go @@ -166,7 +166,7 @@ func TestLoadConfig(t *testing.T) { require.NoError(t, err) require.NoError(t, component.UnmarshalExporterConfig(sub, cfg)) - assert.NoError(t, cfg.Validate()) + assert.NoError(t, component.ValidateConfig(cfg)) assert.Equal(t, tt.expected, cfg) }) } diff --git a/exporter/coralogixexporter/go.mod b/exporter/coralogixexporter/go.mod index f0c9c70d73a02..f47dfd0513aa9 100644 --- a/exporter/coralogixexporter/go.mod +++ b/exporter/coralogixexporter/go.mod @@ -7,8 +7,10 @@ require ( github.com/open-telemetry/opentelemetry-collector-contrib/internal/common v0.64.0 github.com/open-telemetry/opentelemetry-collector-contrib/pkg/translator/jaeger v0.64.0 github.com/stretchr/testify v1.8.1 - go.opentelemetry.io/collector v0.64.2-0.20221115155901-1550938c18fd - go.opentelemetry.io/collector/pdata v0.64.2-0.20221115155901-1550938c18fd + go.opentelemetry.io/collector v0.64.2-0.20221117234814-4565692c50a7 + go.opentelemetry.io/collector/component v0.0.0-20221117234814-4565692c50a7 + go.opentelemetry.io/collector/consumer v0.0.0-20221117234814-4565692c50a7 + go.opentelemetry.io/collector/pdata v0.64.2-0.20221117234814-4565692c50a7 go.uber.org/zap v1.23.0 google.golang.org/genproto v0.0.0-20221027153422-115e99e71e1c google.golang.org/grpc v1.50.1 @@ -41,7 +43,8 @@ require ( github.com/uber/jaeger-client-go v2.30.0+incompatible // indirect github.com/uber/jaeger-lib v2.4.1+incompatible // indirect go.opencensus.io v0.24.0 // indirect - go.opentelemetry.io/collector/semconv v0.64.2-0.20221115155901-1550938c18fd // indirect + go.opentelemetry.io/collector/featuregate v0.0.0-20221117214536-6a117bfc3737 // indirect + go.opentelemetry.io/collector/semconv v0.64.2-0.20221117234814-4565692c50a7 // indirect go.opentelemetry.io/contrib/instrumentation/google.golang.org/grpc/otelgrpc v0.36.4 // indirect go.opentelemetry.io/otel v1.11.1 // indirect go.opentelemetry.io/otel/metric v0.33.0 // indirect diff --git a/exporter/coralogixexporter/go.sum b/exporter/coralogixexporter/go.sum index 69f2e361ba4b2..176c1bba75601 100644 --- a/exporter/coralogixexporter/go.sum +++ b/exporter/coralogixexporter/go.sum @@ -315,12 +315,18 @@ go.etcd.io/etcd/client/pkg/v3 v3.5.4/go.mod h1:IJHfcCEKxYu1Os13ZdwCwIUTUVGYTSAM3 go.etcd.io/etcd/client/v3 v3.5.4/go.mod h1:ZaRkVgBZC+L+dLCjTcF1hRXpgZXQPOvnA/Ak/gq3kiY= go.opencensus.io v0.24.0 h1:y73uSU6J157QMP2kn2r30vwW1A2W2WFwSCGnAVxeaD0= go.opencensus.io v0.24.0/go.mod h1:vNK8G9p7aAivkbmorf4v+7Hgx+Zs0yY+0fOtgBfjQKo= -go.opentelemetry.io/collector v0.64.2-0.20221115155901-1550938c18fd h1:O+6HhE4Ivg8Jksp3dIXIEC4FIR0Ush4uORvG3UtHZWk= -go.opentelemetry.io/collector v0.64.2-0.20221115155901-1550938c18fd/go.mod h1:mmSrOcwe1vEYmChXUYuF6rzlrUL0rjEiPfa19Xxb41o= -go.opentelemetry.io/collector/pdata v0.64.2-0.20221115155901-1550938c18fd h1:GdVAbRiae5VDZe3Mn3FqzMxO/aI5UbJ4+dcviqClHy8= -go.opentelemetry.io/collector/pdata v0.64.2-0.20221115155901-1550938c18fd/go.mod h1:0vynPfW2ZN7DltpcCFgCmTtWMQkCjp2a3TNt82YTCLQ= -go.opentelemetry.io/collector/semconv v0.64.2-0.20221115155901-1550938c18fd h1:rMqcl2pwi8YtVrtOPK8tVh87W0bFBge4yqB9ypSsAJ4= -go.opentelemetry.io/collector/semconv v0.64.2-0.20221115155901-1550938c18fd/go.mod h1:5o9yhOa+ABt7g2E5JABDxGZ1PQPbtfxrKNbYn+LOTXU= +go.opentelemetry.io/collector v0.64.2-0.20221117234814-4565692c50a7 h1:o/vMr2iyXzaeTb/KAldhMxAvRIfFPwtKfL5cKVKsSlU= +go.opentelemetry.io/collector v0.64.2-0.20221117234814-4565692c50a7/go.mod h1:PO8hayFFYvXDqELbXRVxwawR2HTdjN6mY4Qa3Se9xI8= +go.opentelemetry.io/collector/component v0.0.0-20221117234814-4565692c50a7 h1:q9m1bGHhQFUakQX79lZpLmFSY9VLULNSs2jUG8MdJLA= +go.opentelemetry.io/collector/component v0.0.0-20221117234814-4565692c50a7/go.mod h1:Z7H1Oj826e4dtVxXmT6SiUr6S0EIevUJmkVpfQV+UOk= +go.opentelemetry.io/collector/consumer v0.0.0-20221117234814-4565692c50a7 h1:FTy1JD9EJ7gq9SzlZoi2NkGcZ88+SwdiJav5uRcDEEY= +go.opentelemetry.io/collector/consumer v0.0.0-20221117234814-4565692c50a7/go.mod h1:86Elcw/LLrh90DprArogHMkBX3+UMu3tIgcVWF3mr6o= +go.opentelemetry.io/collector/featuregate v0.0.0-20221117214536-6a117bfc3737 h1:7sXg6M9Fw6rFVlX+iaWOMz6DFXEiroUdQer5kWGixwM= +go.opentelemetry.io/collector/featuregate v0.0.0-20221117214536-6a117bfc3737/go.mod h1:tewuFKJYalWBU0bmNKg++MC1ipINXUr6szYzOw2p1GI= +go.opentelemetry.io/collector/pdata v0.64.2-0.20221117234814-4565692c50a7 h1:IOFqfOu7fFxTgC7pvc2U7dk1/uFjwVQPK+CALiUvacI= +go.opentelemetry.io/collector/pdata v0.64.2-0.20221117234814-4565692c50a7/go.mod h1:0vynPfW2ZN7DltpcCFgCmTtWMQkCjp2a3TNt82YTCLQ= +go.opentelemetry.io/collector/semconv v0.64.2-0.20221117234814-4565692c50a7 h1:cGXAVltDxXw9nj0Vr7vyZZTj0whdyO+GYs+xv0xHJ2A= +go.opentelemetry.io/collector/semconv v0.64.2-0.20221117234814-4565692c50a7/go.mod h1:5o9yhOa+ABt7g2E5JABDxGZ1PQPbtfxrKNbYn+LOTXU= go.opentelemetry.io/contrib/instrumentation/google.golang.org/grpc/otelgrpc v0.36.4 h1:PRXhsszxTt5bbPriTjmaweWUsAnJYeWBhUMLRetUgBU= go.opentelemetry.io/contrib/instrumentation/google.golang.org/grpc/otelgrpc v0.36.4/go.mod h1:05eWWy6ZWzmpeImD3UowLTB3VjDMU1yxQ+ENuVWDM3c= go.opentelemetry.io/otel v1.11.1 h1:4WLLAmcfkmDk2ukNXJyq3/kiz/3UzCaYq6PskJsaou4= diff --git a/exporter/datadogexporter/factory_test.go b/exporter/datadogexporter/factory_test.go index f43094f07491b..e24a0cdcbe9e7 100644 --- a/exporter/datadogexporter/factory_test.go +++ b/exporter/datadogexporter/factory_test.go @@ -264,7 +264,7 @@ func TestLoadConfig(t *testing.T) { require.NoError(t, err) require.NoError(t, component.UnmarshalExporterConfig(sub, cfg)) - assert.NoError(t, cfg.Validate()) + assert.NoError(t, component.ValidateConfig(cfg)) assert.Equal(t, tt.expected, cfg) }) } diff --git a/exporter/datadogexporter/go.mod b/exporter/datadogexporter/go.mod index 267c5761ff0d8..d3e9ddde2c852 100644 --- a/exporter/datadogexporter/go.mod +++ b/exporter/datadogexporter/go.mod @@ -23,11 +23,14 @@ require ( github.com/open-telemetry/opentelemetry-collector-contrib/receiver/hostmetricsreceiver v0.64.0 github.com/patrickmn/go-cache v2.1.0+incompatible github.com/stretchr/testify v1.8.1 - go.opentelemetry.io/collector v0.64.2-0.20221115155901-1550938c18fd - go.opentelemetry.io/collector/pdata v0.64.2-0.20221115155901-1550938c18fd - go.opentelemetry.io/collector/processor/batchprocessor v0.64.2-0.20221115155901-1550938c18fd - go.opentelemetry.io/collector/receiver/otlpreceiver v0.64.2-0.20221115155901-1550938c18fd - go.opentelemetry.io/collector/semconv v0.64.2-0.20221115155901-1550938c18fd + go.opentelemetry.io/collector v0.64.2-0.20221117234814-4565692c50a7 + go.opentelemetry.io/collector/component v0.0.0-20221117234814-4565692c50a7 + go.opentelemetry.io/collector/consumer v0.0.0-20221117234814-4565692c50a7 + go.opentelemetry.io/collector/featuregate v0.0.0-20221117214536-6a117bfc3737 + go.opentelemetry.io/collector/pdata v0.64.2-0.20221117234814-4565692c50a7 + go.opentelemetry.io/collector/processor/batchprocessor v0.64.2-0.20221117234814-4565692c50a7 + go.opentelemetry.io/collector/receiver/otlpreceiver v0.64.2-0.20221117234814-4565692c50a7 + go.opentelemetry.io/collector/semconv v0.64.2-0.20221117234814-4565692c50a7 go.uber.org/multierr v1.8.0 go.uber.org/zap v1.23.0 gopkg.in/yaml.v2 v2.4.0 diff --git a/exporter/datadogexporter/go.sum b/exporter/datadogexporter/go.sum index 68912326d4cd9..dbbeb5f41f342 100644 --- a/exporter/datadogexporter/go.sum +++ b/exporter/datadogexporter/go.sum @@ -706,17 +706,23 @@ go.opencensus.io v0.22.4/go.mod h1:yxeiOL68Rb0Xd1ddK5vPZ/oVn4vY4Ynel7k9FzqtOIw= go.opencensus.io v0.23.0/go.mod h1:XItmlyltB5F7CS4xOC1DcqMoFqwtC6OG2xF7mCv7P7E= go.opencensus.io v0.24.0 h1:y73uSU6J157QMP2kn2r30vwW1A2W2WFwSCGnAVxeaD0= go.opencensus.io v0.24.0/go.mod h1:vNK8G9p7aAivkbmorf4v+7Hgx+Zs0yY+0fOtgBfjQKo= -go.opentelemetry.io/collector v0.64.2-0.20221115155901-1550938c18fd h1:O+6HhE4Ivg8Jksp3dIXIEC4FIR0Ush4uORvG3UtHZWk= -go.opentelemetry.io/collector v0.64.2-0.20221115155901-1550938c18fd/go.mod h1:mmSrOcwe1vEYmChXUYuF6rzlrUL0rjEiPfa19Xxb41o= +go.opentelemetry.io/collector v0.64.2-0.20221117234814-4565692c50a7 h1:o/vMr2iyXzaeTb/KAldhMxAvRIfFPwtKfL5cKVKsSlU= +go.opentelemetry.io/collector v0.64.2-0.20221117234814-4565692c50a7/go.mod h1:PO8hayFFYvXDqELbXRVxwawR2HTdjN6mY4Qa3Se9xI8= +go.opentelemetry.io/collector/component v0.0.0-20221117234814-4565692c50a7 h1:q9m1bGHhQFUakQX79lZpLmFSY9VLULNSs2jUG8MdJLA= +go.opentelemetry.io/collector/component v0.0.0-20221117234814-4565692c50a7/go.mod h1:Z7H1Oj826e4dtVxXmT6SiUr6S0EIevUJmkVpfQV+UOk= +go.opentelemetry.io/collector/consumer v0.0.0-20221117234814-4565692c50a7 h1:FTy1JD9EJ7gq9SzlZoi2NkGcZ88+SwdiJav5uRcDEEY= +go.opentelemetry.io/collector/consumer v0.0.0-20221117234814-4565692c50a7/go.mod h1:86Elcw/LLrh90DprArogHMkBX3+UMu3tIgcVWF3mr6o= go.opentelemetry.io/collector/extension/zpagesextension v0.64.1 h1:2qTBtVigWNwPSpN9XR+WobC1idF2S8X/FIahFGCE1i4= -go.opentelemetry.io/collector/pdata v0.64.2-0.20221115155901-1550938c18fd h1:GdVAbRiae5VDZe3Mn3FqzMxO/aI5UbJ4+dcviqClHy8= -go.opentelemetry.io/collector/pdata v0.64.2-0.20221115155901-1550938c18fd/go.mod h1:0vynPfW2ZN7DltpcCFgCmTtWMQkCjp2a3TNt82YTCLQ= -go.opentelemetry.io/collector/processor/batchprocessor v0.64.2-0.20221115155901-1550938c18fd h1:SSjP8V0UP2+oPZ3gL+Dk90KQcvHXvHp9V5h8IIpx0og= -go.opentelemetry.io/collector/processor/batchprocessor v0.64.2-0.20221115155901-1550938c18fd/go.mod h1:zyCnX0aTvBaZ3XLWSHZdTueP7WoXRjz8X6HiWgKqstM= -go.opentelemetry.io/collector/receiver/otlpreceiver v0.64.2-0.20221115155901-1550938c18fd h1:hMuRptXpQYC9dk7x68LIFeVEpoE3oM+ddI6o13cS73Q= -go.opentelemetry.io/collector/receiver/otlpreceiver v0.64.2-0.20221115155901-1550938c18fd/go.mod h1:i80XzKLKheio/axok7WksVx/xmNGRadfmlzhWOWDnr4= -go.opentelemetry.io/collector/semconv v0.64.2-0.20221115155901-1550938c18fd h1:rMqcl2pwi8YtVrtOPK8tVh87W0bFBge4yqB9ypSsAJ4= -go.opentelemetry.io/collector/semconv v0.64.2-0.20221115155901-1550938c18fd/go.mod h1:5o9yhOa+ABt7g2E5JABDxGZ1PQPbtfxrKNbYn+LOTXU= +go.opentelemetry.io/collector/featuregate v0.0.0-20221117214536-6a117bfc3737 h1:7sXg6M9Fw6rFVlX+iaWOMz6DFXEiroUdQer5kWGixwM= +go.opentelemetry.io/collector/featuregate v0.0.0-20221117214536-6a117bfc3737/go.mod h1:tewuFKJYalWBU0bmNKg++MC1ipINXUr6szYzOw2p1GI= +go.opentelemetry.io/collector/pdata v0.64.2-0.20221117234814-4565692c50a7 h1:IOFqfOu7fFxTgC7pvc2U7dk1/uFjwVQPK+CALiUvacI= +go.opentelemetry.io/collector/pdata v0.64.2-0.20221117234814-4565692c50a7/go.mod h1:0vynPfW2ZN7DltpcCFgCmTtWMQkCjp2a3TNt82YTCLQ= +go.opentelemetry.io/collector/processor/batchprocessor v0.64.2-0.20221117234814-4565692c50a7 h1:hGDq2T07j6qwwtQ2t6ZGU5tp/J2Dvu9mfY5qnnP5Ic8= +go.opentelemetry.io/collector/processor/batchprocessor v0.64.2-0.20221117234814-4565692c50a7/go.mod h1:b83iea2eDSAQkvd+2aSokaa6GRjSIsaR2zILziF/Ogc= +go.opentelemetry.io/collector/receiver/otlpreceiver v0.64.2-0.20221117234814-4565692c50a7 h1:n2zHwTL1xcJ1DtKrGUAXVT12hCN0b5tjVqQV974xCsA= +go.opentelemetry.io/collector/receiver/otlpreceiver v0.64.2-0.20221117234814-4565692c50a7/go.mod h1:CZy46KR3rC5HVHWouklB9oyg7SU9OIRmcKyw6+m+rCk= +go.opentelemetry.io/collector/semconv v0.64.2-0.20221117234814-4565692c50a7 h1:cGXAVltDxXw9nj0Vr7vyZZTj0whdyO+GYs+xv0xHJ2A= +go.opentelemetry.io/collector/semconv v0.64.2-0.20221117234814-4565692c50a7/go.mod h1:5o9yhOa+ABt7g2E5JABDxGZ1PQPbtfxrKNbYn+LOTXU= go.opentelemetry.io/contrib/instrumentation/google.golang.org/grpc/otelgrpc v0.36.4 h1:PRXhsszxTt5bbPriTjmaweWUsAnJYeWBhUMLRetUgBU= go.opentelemetry.io/contrib/instrumentation/google.golang.org/grpc/otelgrpc v0.36.4/go.mod h1:05eWWy6ZWzmpeImD3UowLTB3VjDMU1yxQ+ENuVWDM3c= go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.36.4 h1:aUEBEdCa6iamGzg6fuYxDA8ThxvOG240mAvWDU+XLio= diff --git a/exporter/dynatraceexporter/factory_test.go b/exporter/dynatraceexporter/factory_test.go index 2eee28aa54d98..891da58ab16cb 100644 --- a/exporter/dynatraceexporter/factory_test.go +++ b/exporter/dynatraceexporter/factory_test.go @@ -146,11 +146,11 @@ func TestLoadConfig(t *testing.T) { require.NoError(t, component.UnmarshalExporterConfig(sub, cfg)) if tt.expected == nil { - assert.EqualError(t, cfg.Validate(), tt.errorMessage) + assert.EqualError(t, component.ValidateConfig(cfg), tt.errorMessage) return } - assert.NoError(t, cfg.Validate()) + assert.NoError(t, component.ValidateConfig(cfg)) assert.Equal(t, tt.expected, cfg) }) } diff --git a/exporter/dynatraceexporter/go.mod b/exporter/dynatraceexporter/go.mod index 9495fdba76312..4d9f426e4e8aa 100644 --- a/exporter/dynatraceexporter/go.mod +++ b/exporter/dynatraceexporter/go.mod @@ -7,8 +7,10 @@ require ( github.com/open-telemetry/opentelemetry-collector-contrib/internal/common v0.64.0 github.com/open-telemetry/opentelemetry-collector-contrib/pkg/resourcetotelemetry v0.64.0 github.com/stretchr/testify v1.8.1 - go.opentelemetry.io/collector v0.64.2-0.20221115155901-1550938c18fd - go.opentelemetry.io/collector/pdata v0.64.2-0.20221115155901-1550938c18fd + go.opentelemetry.io/collector v0.64.2-0.20221117234814-4565692c50a7 + go.opentelemetry.io/collector/component v0.0.0-20221117234814-4565692c50a7 + go.opentelemetry.io/collector/consumer v0.0.0-20221117234814-4565692c50a7 + go.opentelemetry.io/collector/pdata v0.64.2-0.20221117234814-4565692c50a7 go.uber.org/zap v1.23.0 ) @@ -33,6 +35,7 @@ require ( github.com/rogpeppe/go-internal v1.6.1 // indirect github.com/rs/cors v1.8.2 // indirect go.opencensus.io v0.24.0 // indirect + go.opentelemetry.io/collector/featuregate v0.0.0-20221117214536-6a117bfc3737 // indirect go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.36.4 // indirect go.opentelemetry.io/otel v1.11.1 // indirect go.opentelemetry.io/otel/metric v0.33.0 // indirect diff --git a/exporter/dynatraceexporter/go.sum b/exporter/dynatraceexporter/go.sum index 0dbd53a9720ae..b8053b1d0725e 100644 --- a/exporter/dynatraceexporter/go.sum +++ b/exporter/dynatraceexporter/go.sum @@ -286,10 +286,16 @@ go.etcd.io/etcd/client/pkg/v3 v3.5.4/go.mod h1:IJHfcCEKxYu1Os13ZdwCwIUTUVGYTSAM3 go.etcd.io/etcd/client/v3 v3.5.4/go.mod h1:ZaRkVgBZC+L+dLCjTcF1hRXpgZXQPOvnA/Ak/gq3kiY= go.opencensus.io v0.24.0 h1:y73uSU6J157QMP2kn2r30vwW1A2W2WFwSCGnAVxeaD0= go.opencensus.io v0.24.0/go.mod h1:vNK8G9p7aAivkbmorf4v+7Hgx+Zs0yY+0fOtgBfjQKo= -go.opentelemetry.io/collector v0.64.2-0.20221115155901-1550938c18fd h1:O+6HhE4Ivg8Jksp3dIXIEC4FIR0Ush4uORvG3UtHZWk= -go.opentelemetry.io/collector v0.64.2-0.20221115155901-1550938c18fd/go.mod h1:mmSrOcwe1vEYmChXUYuF6rzlrUL0rjEiPfa19Xxb41o= -go.opentelemetry.io/collector/pdata v0.64.2-0.20221115155901-1550938c18fd h1:GdVAbRiae5VDZe3Mn3FqzMxO/aI5UbJ4+dcviqClHy8= -go.opentelemetry.io/collector/pdata v0.64.2-0.20221115155901-1550938c18fd/go.mod h1:0vynPfW2ZN7DltpcCFgCmTtWMQkCjp2a3TNt82YTCLQ= +go.opentelemetry.io/collector v0.64.2-0.20221117234814-4565692c50a7 h1:o/vMr2iyXzaeTb/KAldhMxAvRIfFPwtKfL5cKVKsSlU= +go.opentelemetry.io/collector v0.64.2-0.20221117234814-4565692c50a7/go.mod h1:PO8hayFFYvXDqELbXRVxwawR2HTdjN6mY4Qa3Se9xI8= +go.opentelemetry.io/collector/component v0.0.0-20221117234814-4565692c50a7 h1:q9m1bGHhQFUakQX79lZpLmFSY9VLULNSs2jUG8MdJLA= +go.opentelemetry.io/collector/component v0.0.0-20221117234814-4565692c50a7/go.mod h1:Z7H1Oj826e4dtVxXmT6SiUr6S0EIevUJmkVpfQV+UOk= +go.opentelemetry.io/collector/consumer v0.0.0-20221117234814-4565692c50a7 h1:FTy1JD9EJ7gq9SzlZoi2NkGcZ88+SwdiJav5uRcDEEY= +go.opentelemetry.io/collector/consumer v0.0.0-20221117234814-4565692c50a7/go.mod h1:86Elcw/LLrh90DprArogHMkBX3+UMu3tIgcVWF3mr6o= +go.opentelemetry.io/collector/featuregate v0.0.0-20221117214536-6a117bfc3737 h1:7sXg6M9Fw6rFVlX+iaWOMz6DFXEiroUdQer5kWGixwM= +go.opentelemetry.io/collector/featuregate v0.0.0-20221117214536-6a117bfc3737/go.mod h1:tewuFKJYalWBU0bmNKg++MC1ipINXUr6szYzOw2p1GI= +go.opentelemetry.io/collector/pdata v0.64.2-0.20221117234814-4565692c50a7 h1:IOFqfOu7fFxTgC7pvc2U7dk1/uFjwVQPK+CALiUvacI= +go.opentelemetry.io/collector/pdata v0.64.2-0.20221117234814-4565692c50a7/go.mod h1:0vynPfW2ZN7DltpcCFgCmTtWMQkCjp2a3TNt82YTCLQ= go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.36.4 h1:aUEBEdCa6iamGzg6fuYxDA8ThxvOG240mAvWDU+XLio= go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.36.4/go.mod h1:l2MdsbKTocpPS5nQZscqTR9jd8u96VYZdcpF8Sye7mA= go.opentelemetry.io/otel v1.11.1 h1:4WLLAmcfkmDk2ukNXJyq3/kiz/3UzCaYq6PskJsaou4= diff --git a/exporter/elasticsearchexporter/config_test.go b/exporter/elasticsearchexporter/config_test.go index b35de87b7d4fc..82f3aea780cd6 100644 --- a/exporter/elasticsearchexporter/config_test.go +++ b/exporter/elasticsearchexporter/config_test.go @@ -183,7 +183,7 @@ func TestLoadConfig(t *testing.T) { require.NoError(t, err) require.NoError(t, component.UnmarshalExporterConfig(sub, cfg)) - assert.NoError(t, cfg.Validate()) + assert.NoError(t, component.ValidateConfig(cfg)) assert.Equal(t, tt.expected, cfg) }) } diff --git a/exporter/elasticsearchexporter/go.mod b/exporter/elasticsearchexporter/go.mod index 51d2c30a18503..bdf66e3f7b73d 100644 --- a/exporter/elasticsearchexporter/go.mod +++ b/exporter/elasticsearchexporter/go.mod @@ -9,8 +9,9 @@ require ( github.com/open-telemetry/opentelemetry-collector-contrib/internal/common v0.64.0 github.com/open-telemetry/opentelemetry-collector-contrib/internal/coreinternal v0.64.0 github.com/stretchr/testify v1.8.1 - go.opentelemetry.io/collector v0.64.2-0.20221115155901-1550938c18fd - go.opentelemetry.io/collector/pdata v0.64.2-0.20221115155901-1550938c18fd + go.opentelemetry.io/collector v0.64.2-0.20221117234814-4565692c50a7 + go.opentelemetry.io/collector/component v0.0.0-20221117234814-4565692c50a7 + go.opentelemetry.io/collector/pdata v0.64.2-0.20221117234814-4565692c50a7 go.uber.org/atomic v1.10.0 go.uber.org/multierr v1.8.0 go.uber.org/zap v1.23.0 @@ -33,6 +34,8 @@ require ( github.com/pmezard/go-difflib v1.0.0 // indirect github.com/rogpeppe/go-internal v1.8.1 // indirect go.opencensus.io v0.24.0 // indirect + go.opentelemetry.io/collector/consumer v0.0.0-20221117234814-4565692c50a7 // indirect + go.opentelemetry.io/collector/featuregate v0.0.0-20221117214536-6a117bfc3737 // indirect go.opentelemetry.io/otel v1.11.1 // indirect go.opentelemetry.io/otel/metric v0.33.0 // indirect go.opentelemetry.io/otel/trace v1.11.1 // indirect diff --git a/exporter/elasticsearchexporter/go.sum b/exporter/elasticsearchexporter/go.sum index 57310b0667b39..ffbeca2721608 100644 --- a/exporter/elasticsearchexporter/go.sum +++ b/exporter/elasticsearchexporter/go.sum @@ -285,10 +285,16 @@ go.etcd.io/etcd/client/pkg/v3 v3.5.4/go.mod h1:IJHfcCEKxYu1Os13ZdwCwIUTUVGYTSAM3 go.etcd.io/etcd/client/v3 v3.5.4/go.mod h1:ZaRkVgBZC+L+dLCjTcF1hRXpgZXQPOvnA/Ak/gq3kiY= go.opencensus.io v0.24.0 h1:y73uSU6J157QMP2kn2r30vwW1A2W2WFwSCGnAVxeaD0= go.opencensus.io v0.24.0/go.mod h1:vNK8G9p7aAivkbmorf4v+7Hgx+Zs0yY+0fOtgBfjQKo= -go.opentelemetry.io/collector v0.64.2-0.20221115155901-1550938c18fd h1:O+6HhE4Ivg8Jksp3dIXIEC4FIR0Ush4uORvG3UtHZWk= -go.opentelemetry.io/collector v0.64.2-0.20221115155901-1550938c18fd/go.mod h1:mmSrOcwe1vEYmChXUYuF6rzlrUL0rjEiPfa19Xxb41o= -go.opentelemetry.io/collector/pdata v0.64.2-0.20221115155901-1550938c18fd h1:GdVAbRiae5VDZe3Mn3FqzMxO/aI5UbJ4+dcviqClHy8= -go.opentelemetry.io/collector/pdata v0.64.2-0.20221115155901-1550938c18fd/go.mod h1:0vynPfW2ZN7DltpcCFgCmTtWMQkCjp2a3TNt82YTCLQ= +go.opentelemetry.io/collector v0.64.2-0.20221117234814-4565692c50a7 h1:o/vMr2iyXzaeTb/KAldhMxAvRIfFPwtKfL5cKVKsSlU= +go.opentelemetry.io/collector v0.64.2-0.20221117234814-4565692c50a7/go.mod h1:PO8hayFFYvXDqELbXRVxwawR2HTdjN6mY4Qa3Se9xI8= +go.opentelemetry.io/collector/component v0.0.0-20221117234814-4565692c50a7 h1:q9m1bGHhQFUakQX79lZpLmFSY9VLULNSs2jUG8MdJLA= +go.opentelemetry.io/collector/component v0.0.0-20221117234814-4565692c50a7/go.mod h1:Z7H1Oj826e4dtVxXmT6SiUr6S0EIevUJmkVpfQV+UOk= +go.opentelemetry.io/collector/consumer v0.0.0-20221117234814-4565692c50a7 h1:FTy1JD9EJ7gq9SzlZoi2NkGcZ88+SwdiJav5uRcDEEY= +go.opentelemetry.io/collector/consumer v0.0.0-20221117234814-4565692c50a7/go.mod h1:86Elcw/LLrh90DprArogHMkBX3+UMu3tIgcVWF3mr6o= +go.opentelemetry.io/collector/featuregate v0.0.0-20221117214536-6a117bfc3737 h1:7sXg6M9Fw6rFVlX+iaWOMz6DFXEiroUdQer5kWGixwM= +go.opentelemetry.io/collector/featuregate v0.0.0-20221117214536-6a117bfc3737/go.mod h1:tewuFKJYalWBU0bmNKg++MC1ipINXUr6szYzOw2p1GI= +go.opentelemetry.io/collector/pdata v0.64.2-0.20221117234814-4565692c50a7 h1:IOFqfOu7fFxTgC7pvc2U7dk1/uFjwVQPK+CALiUvacI= +go.opentelemetry.io/collector/pdata v0.64.2-0.20221117234814-4565692c50a7/go.mod h1:0vynPfW2ZN7DltpcCFgCmTtWMQkCjp2a3TNt82YTCLQ= go.opentelemetry.io/otel v1.11.1 h1:4WLLAmcfkmDk2ukNXJyq3/kiz/3UzCaYq6PskJsaou4= go.opentelemetry.io/otel v1.11.1/go.mod h1:1nNhXBbWSD0nsL38H6btgnFN2k4i0sNLHNNMZMSbUGE= go.opentelemetry.io/otel/exporters/prometheus v0.33.0 h1:xXhPj7SLKWU5/Zd4Hxmd+X1C4jdmvc0Xy+kvjFx2z60= diff --git a/exporter/f5cloudexporter/go.mod b/exporter/f5cloudexporter/go.mod index 35c1ad767c72a..d7cb3085c5299 100644 --- a/exporter/f5cloudexporter/go.mod +++ b/exporter/f5cloudexporter/go.mod @@ -5,8 +5,9 @@ go 1.18 require ( github.com/open-telemetry/opentelemetry-collector-contrib/internal/common v0.64.0 github.com/stretchr/testify v1.8.1 - go.opentelemetry.io/collector v0.64.2-0.20221115155901-1550938c18fd - go.opentelemetry.io/collector/exporter/otlphttpexporter v0.64.2-0.20221115155901-1550938c18fd + go.opentelemetry.io/collector v0.64.2-0.20221117234814-4565692c50a7 + go.opentelemetry.io/collector/component v0.0.0-20221117234814-4565692c50a7 + go.opentelemetry.io/collector/exporter/otlphttpexporter v0.64.2-0.20221117234814-4565692c50a7 golang.org/x/oauth2 v0.0.0-20221014153046-6fdb5e3db783 google.golang.org/api v0.103.0 ) @@ -39,8 +40,10 @@ require ( github.com/rogpeppe/go-internal v1.8.1 // indirect github.com/rs/cors v1.8.2 // indirect go.opencensus.io v0.24.0 // indirect - go.opentelemetry.io/collector/pdata v0.64.2-0.20221115155901-1550938c18fd // indirect - go.opentelemetry.io/collector/receiver/otlpreceiver v0.64.2-0.20221115155901-1550938c18fd // indirect + go.opentelemetry.io/collector/consumer v0.0.0-20221117234814-4565692c50a7 // indirect + go.opentelemetry.io/collector/featuregate v0.0.0-20221117214536-6a117bfc3737 // indirect + go.opentelemetry.io/collector/pdata v0.64.2-0.20221117234814-4565692c50a7 // indirect + go.opentelemetry.io/collector/receiver/otlpreceiver v0.64.2-0.20221117234814-4565692c50a7 // indirect go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.36.4 // indirect go.opentelemetry.io/otel v1.11.1 // indirect go.opentelemetry.io/otel/metric v0.33.0 // indirect diff --git a/exporter/f5cloudexporter/go.sum b/exporter/f5cloudexporter/go.sum index fce9b6e8716c2..35e2878cb175d 100644 --- a/exporter/f5cloudexporter/go.sum +++ b/exporter/f5cloudexporter/go.sum @@ -299,14 +299,20 @@ go.etcd.io/etcd/client/pkg/v3 v3.5.4/go.mod h1:IJHfcCEKxYu1Os13ZdwCwIUTUVGYTSAM3 go.etcd.io/etcd/client/v3 v3.5.4/go.mod h1:ZaRkVgBZC+L+dLCjTcF1hRXpgZXQPOvnA/Ak/gq3kiY= go.opencensus.io v0.24.0 h1:y73uSU6J157QMP2kn2r30vwW1A2W2WFwSCGnAVxeaD0= go.opencensus.io v0.24.0/go.mod h1:vNK8G9p7aAivkbmorf4v+7Hgx+Zs0yY+0fOtgBfjQKo= -go.opentelemetry.io/collector v0.64.2-0.20221115155901-1550938c18fd h1:O+6HhE4Ivg8Jksp3dIXIEC4FIR0Ush4uORvG3UtHZWk= -go.opentelemetry.io/collector v0.64.2-0.20221115155901-1550938c18fd/go.mod h1:mmSrOcwe1vEYmChXUYuF6rzlrUL0rjEiPfa19Xxb41o= -go.opentelemetry.io/collector/exporter/otlphttpexporter v0.64.2-0.20221115155901-1550938c18fd h1:ZOlxq1goa2gShVdLWdyUlk0V0qrM5zf3JckVFVDuijw= -go.opentelemetry.io/collector/exporter/otlphttpexporter v0.64.2-0.20221115155901-1550938c18fd/go.mod h1:MICUYztxRZgjILRc6Wj6fJK6n9KSiRNrRwRpybNy2i8= -go.opentelemetry.io/collector/pdata v0.64.2-0.20221115155901-1550938c18fd h1:GdVAbRiae5VDZe3Mn3FqzMxO/aI5UbJ4+dcviqClHy8= -go.opentelemetry.io/collector/pdata v0.64.2-0.20221115155901-1550938c18fd/go.mod h1:0vynPfW2ZN7DltpcCFgCmTtWMQkCjp2a3TNt82YTCLQ= -go.opentelemetry.io/collector/receiver/otlpreceiver v0.64.2-0.20221115155901-1550938c18fd h1:hMuRptXpQYC9dk7x68LIFeVEpoE3oM+ddI6o13cS73Q= -go.opentelemetry.io/collector/receiver/otlpreceiver v0.64.2-0.20221115155901-1550938c18fd/go.mod h1:i80XzKLKheio/axok7WksVx/xmNGRadfmlzhWOWDnr4= +go.opentelemetry.io/collector v0.64.2-0.20221117234814-4565692c50a7 h1:o/vMr2iyXzaeTb/KAldhMxAvRIfFPwtKfL5cKVKsSlU= +go.opentelemetry.io/collector v0.64.2-0.20221117234814-4565692c50a7/go.mod h1:PO8hayFFYvXDqELbXRVxwawR2HTdjN6mY4Qa3Se9xI8= +go.opentelemetry.io/collector/component v0.0.0-20221117234814-4565692c50a7 h1:q9m1bGHhQFUakQX79lZpLmFSY9VLULNSs2jUG8MdJLA= +go.opentelemetry.io/collector/component v0.0.0-20221117234814-4565692c50a7/go.mod h1:Z7H1Oj826e4dtVxXmT6SiUr6S0EIevUJmkVpfQV+UOk= +go.opentelemetry.io/collector/consumer v0.0.0-20221117234814-4565692c50a7 h1:FTy1JD9EJ7gq9SzlZoi2NkGcZ88+SwdiJav5uRcDEEY= +go.opentelemetry.io/collector/consumer v0.0.0-20221117234814-4565692c50a7/go.mod h1:86Elcw/LLrh90DprArogHMkBX3+UMu3tIgcVWF3mr6o= +go.opentelemetry.io/collector/exporter/otlphttpexporter v0.64.2-0.20221117234814-4565692c50a7 h1:8ByTWg2YOwZqZpCwmWbPeuNjOC2k1QwMjAv0ESaFbqc= +go.opentelemetry.io/collector/exporter/otlphttpexporter v0.64.2-0.20221117234814-4565692c50a7/go.mod h1:21XZBi5i+LDa41a6BTH7YyUd3xTmf6DYnPNn3t9yTII= +go.opentelemetry.io/collector/featuregate v0.0.0-20221117214536-6a117bfc3737 h1:7sXg6M9Fw6rFVlX+iaWOMz6DFXEiroUdQer5kWGixwM= +go.opentelemetry.io/collector/featuregate v0.0.0-20221117214536-6a117bfc3737/go.mod h1:tewuFKJYalWBU0bmNKg++MC1ipINXUr6szYzOw2p1GI= +go.opentelemetry.io/collector/pdata v0.64.2-0.20221117234814-4565692c50a7 h1:IOFqfOu7fFxTgC7pvc2U7dk1/uFjwVQPK+CALiUvacI= +go.opentelemetry.io/collector/pdata v0.64.2-0.20221117234814-4565692c50a7/go.mod h1:0vynPfW2ZN7DltpcCFgCmTtWMQkCjp2a3TNt82YTCLQ= +go.opentelemetry.io/collector/receiver/otlpreceiver v0.64.2-0.20221117234814-4565692c50a7 h1:n2zHwTL1xcJ1DtKrGUAXVT12hCN0b5tjVqQV974xCsA= +go.opentelemetry.io/collector/receiver/otlpreceiver v0.64.2-0.20221117234814-4565692c50a7/go.mod h1:CZy46KR3rC5HVHWouklB9oyg7SU9OIRmcKyw6+m+rCk= go.opentelemetry.io/contrib/instrumentation/google.golang.org/grpc/otelgrpc v0.36.4 h1:PRXhsszxTt5bbPriTjmaweWUsAnJYeWBhUMLRetUgBU= go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.36.4 h1:aUEBEdCa6iamGzg6fuYxDA8ThxvOG240mAvWDU+XLio= go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.36.4/go.mod h1:l2MdsbKTocpPS5nQZscqTR9jd8u96VYZdcpF8Sye7mA= diff --git a/exporter/fileexporter/config_test.go b/exporter/fileexporter/config_test.go index 1880ec750aa0e..1ad968695de0c 100644 --- a/exporter/fileexporter/config_test.go +++ b/exporter/fileexporter/config_test.go @@ -112,11 +112,11 @@ func TestLoadConfig(t *testing.T) { require.NoError(t, component.UnmarshalExporterConfig(sub, cfg)) if tt.expected == nil { - assert.EqualError(t, cfg.Validate(), tt.errorMessage) + assert.EqualError(t, component.ValidateConfig(cfg), tt.errorMessage) return } - assert.NoError(t, cfg.Validate()) + assert.NoError(t, component.ValidateConfig(cfg)) assert.Equal(t, tt.expected, cfg) }) } diff --git a/exporter/fileexporter/go.mod b/exporter/fileexporter/go.mod index 66b27384cee6a..d0c9ee05ad7a7 100644 --- a/exporter/fileexporter/go.mod +++ b/exporter/fileexporter/go.mod @@ -7,8 +7,10 @@ require ( github.com/open-telemetry/opentelemetry-collector-contrib/internal/coreinternal v0.64.0 github.com/open-telemetry/opentelemetry-collector-contrib/internal/sharedcomponent v0.64.0 github.com/stretchr/testify v1.8.1 - go.opentelemetry.io/collector v0.64.2-0.20221115155901-1550938c18fd - go.opentelemetry.io/collector/pdata v0.64.2-0.20221115155901-1550938c18fd + go.opentelemetry.io/collector v0.64.2-0.20221117234814-4565692c50a7 + go.opentelemetry.io/collector/component v0.0.0-20221117234814-4565692c50a7 + go.opentelemetry.io/collector/consumer v0.0.0-20221117234814-4565692c50a7 + go.opentelemetry.io/collector/pdata v0.64.2-0.20221117234814-4565692c50a7 gopkg.in/natefinch/lumberjack.v2 v2.0.0 ) @@ -27,6 +29,7 @@ require ( github.com/pmezard/go-difflib v1.0.0 // indirect github.com/rogpeppe/go-internal v1.8.0 // indirect go.opencensus.io v0.24.0 // indirect + go.opentelemetry.io/collector/featuregate v0.0.0-20221117214536-6a117bfc3737 // indirect go.opentelemetry.io/otel v1.11.1 // indirect go.opentelemetry.io/otel/metric v0.33.0 // indirect go.opentelemetry.io/otel/trace v1.11.1 // indirect diff --git a/exporter/fileexporter/go.sum b/exporter/fileexporter/go.sum index 4da3faebdaa21..96ce01a1d5d7d 100644 --- a/exporter/fileexporter/go.sum +++ b/exporter/fileexporter/go.sum @@ -277,10 +277,16 @@ go.etcd.io/etcd/client/pkg/v3 v3.5.4/go.mod h1:IJHfcCEKxYu1Os13ZdwCwIUTUVGYTSAM3 go.etcd.io/etcd/client/v3 v3.5.4/go.mod h1:ZaRkVgBZC+L+dLCjTcF1hRXpgZXQPOvnA/Ak/gq3kiY= go.opencensus.io v0.24.0 h1:y73uSU6J157QMP2kn2r30vwW1A2W2WFwSCGnAVxeaD0= go.opencensus.io v0.24.0/go.mod h1:vNK8G9p7aAivkbmorf4v+7Hgx+Zs0yY+0fOtgBfjQKo= -go.opentelemetry.io/collector v0.64.2-0.20221115155901-1550938c18fd h1:O+6HhE4Ivg8Jksp3dIXIEC4FIR0Ush4uORvG3UtHZWk= -go.opentelemetry.io/collector v0.64.2-0.20221115155901-1550938c18fd/go.mod h1:mmSrOcwe1vEYmChXUYuF6rzlrUL0rjEiPfa19Xxb41o= -go.opentelemetry.io/collector/pdata v0.64.2-0.20221115155901-1550938c18fd h1:GdVAbRiae5VDZe3Mn3FqzMxO/aI5UbJ4+dcviqClHy8= -go.opentelemetry.io/collector/pdata v0.64.2-0.20221115155901-1550938c18fd/go.mod h1:0vynPfW2ZN7DltpcCFgCmTtWMQkCjp2a3TNt82YTCLQ= +go.opentelemetry.io/collector v0.64.2-0.20221117234814-4565692c50a7 h1:o/vMr2iyXzaeTb/KAldhMxAvRIfFPwtKfL5cKVKsSlU= +go.opentelemetry.io/collector v0.64.2-0.20221117234814-4565692c50a7/go.mod h1:PO8hayFFYvXDqELbXRVxwawR2HTdjN6mY4Qa3Se9xI8= +go.opentelemetry.io/collector/component v0.0.0-20221117234814-4565692c50a7 h1:q9m1bGHhQFUakQX79lZpLmFSY9VLULNSs2jUG8MdJLA= +go.opentelemetry.io/collector/component v0.0.0-20221117234814-4565692c50a7/go.mod h1:Z7H1Oj826e4dtVxXmT6SiUr6S0EIevUJmkVpfQV+UOk= +go.opentelemetry.io/collector/consumer v0.0.0-20221117234814-4565692c50a7 h1:FTy1JD9EJ7gq9SzlZoi2NkGcZ88+SwdiJav5uRcDEEY= +go.opentelemetry.io/collector/consumer v0.0.0-20221117234814-4565692c50a7/go.mod h1:86Elcw/LLrh90DprArogHMkBX3+UMu3tIgcVWF3mr6o= +go.opentelemetry.io/collector/featuregate v0.0.0-20221117214536-6a117bfc3737 h1:7sXg6M9Fw6rFVlX+iaWOMz6DFXEiroUdQer5kWGixwM= +go.opentelemetry.io/collector/featuregate v0.0.0-20221117214536-6a117bfc3737/go.mod h1:tewuFKJYalWBU0bmNKg++MC1ipINXUr6szYzOw2p1GI= +go.opentelemetry.io/collector/pdata v0.64.2-0.20221117234814-4565692c50a7 h1:IOFqfOu7fFxTgC7pvc2U7dk1/uFjwVQPK+CALiUvacI= +go.opentelemetry.io/collector/pdata v0.64.2-0.20221117234814-4565692c50a7/go.mod h1:0vynPfW2ZN7DltpcCFgCmTtWMQkCjp2a3TNt82YTCLQ= go.opentelemetry.io/otel v1.11.1 h1:4WLLAmcfkmDk2ukNXJyq3/kiz/3UzCaYq6PskJsaou4= go.opentelemetry.io/otel v1.11.1/go.mod h1:1nNhXBbWSD0nsL38H6btgnFN2k4i0sNLHNNMZMSbUGE= go.opentelemetry.io/otel/exporters/prometheus v0.33.0 h1:xXhPj7SLKWU5/Zd4Hxmd+X1C4jdmvc0Xy+kvjFx2z60= diff --git a/exporter/googlecloudexporter/config.go b/exporter/googlecloudexporter/config.go index f784dca55af1d..a680d3279ac7a 100644 --- a/exporter/googlecloudexporter/config.go +++ b/exporter/googlecloudexporter/config.go @@ -34,9 +34,6 @@ type Config struct { } func (cfg *Config) Validate() error { - if err := cfg.ExporterSettings.Validate(); err != nil { - return fmt.Errorf("exporter settings are invalid :%w", err) - } if err := collector.ValidateConfig(cfg.Config); err != nil { return fmt.Errorf("googlecloud exporter settings are invalid :%w", err) } diff --git a/exporter/googlecloudexporter/go.mod b/exporter/googlecloudexporter/go.mod index 1241653f850d5..4d2d26d516fef 100644 --- a/exporter/googlecloudexporter/go.mod +++ b/exporter/googlecloudexporter/go.mod @@ -11,9 +11,11 @@ require ( github.com/open-telemetry/opentelemetry-collector-contrib/pkg/translator/opencensus v0.64.0 github.com/stretchr/testify v1.8.1 go.opencensus.io v0.24.0 - go.opentelemetry.io/collector v0.64.2-0.20221115155901-1550938c18fd - go.opentelemetry.io/collector/pdata v0.64.2-0.20221115155901-1550938c18fd - go.opentelemetry.io/collector/semconv v0.64.2-0.20221115155901-1550938c18fd + go.opentelemetry.io/collector v0.64.2-0.20221117234814-4565692c50a7 + go.opentelemetry.io/collector/component v0.0.0-20221117234814-4565692c50a7 + go.opentelemetry.io/collector/featuregate v0.0.0-20221117214536-6a117bfc3737 + go.opentelemetry.io/collector/pdata v0.64.2-0.20221117234814-4565692c50a7 + go.opentelemetry.io/collector/semconv v0.64.2-0.20221117234814-4565692c50a7 google.golang.org/api v0.103.0 google.golang.org/genproto v0.0.0-20221027153422-115e99e71e1c google.golang.org/grpc v1.50.1 @@ -74,7 +76,8 @@ require ( github.com/tklauser/go-sysconf v0.3.10 // indirect github.com/tklauser/numcpus v0.4.0 // indirect github.com/yusufpapurcu/wmi v1.2.2 // indirect - go.opentelemetry.io/collector/processor/batchprocessor v0.64.2-0.20221115155901-1550938c18fd // indirect + go.opentelemetry.io/collector/consumer v0.0.0-20221117234814-4565692c50a7 // indirect + go.opentelemetry.io/collector/processor/batchprocessor v0.64.2-0.20221117234814-4565692c50a7 // indirect go.opentelemetry.io/contrib/propagators/b3 v1.11.1 // indirect go.opentelemetry.io/otel v1.11.1 // indirect go.opentelemetry.io/otel/exporters/prometheus v0.33.0 // indirect diff --git a/exporter/googlecloudexporter/go.sum b/exporter/googlecloudexporter/go.sum index 011ed9f5a4063..cbed55805bbef 100644 --- a/exporter/googlecloudexporter/go.sum +++ b/exporter/googlecloudexporter/go.sum @@ -455,15 +455,21 @@ go.opencensus.io v0.22.5/go.mod h1:5pWMHQbX5EPX2/62yrJeAkowc+lfs/XD7Uxpq3pI6kk= go.opencensus.io v0.23.0/go.mod h1:XItmlyltB5F7CS4xOC1DcqMoFqwtC6OG2xF7mCv7P7E= go.opencensus.io v0.24.0 h1:y73uSU6J157QMP2kn2r30vwW1A2W2WFwSCGnAVxeaD0= go.opencensus.io v0.24.0/go.mod h1:vNK8G9p7aAivkbmorf4v+7Hgx+Zs0yY+0fOtgBfjQKo= -go.opentelemetry.io/collector v0.64.2-0.20221115155901-1550938c18fd h1:O+6HhE4Ivg8Jksp3dIXIEC4FIR0Ush4uORvG3UtHZWk= -go.opentelemetry.io/collector v0.64.2-0.20221115155901-1550938c18fd/go.mod h1:mmSrOcwe1vEYmChXUYuF6rzlrUL0rjEiPfa19Xxb41o= +go.opentelemetry.io/collector v0.64.2-0.20221117234814-4565692c50a7 h1:o/vMr2iyXzaeTb/KAldhMxAvRIfFPwtKfL5cKVKsSlU= +go.opentelemetry.io/collector v0.64.2-0.20221117234814-4565692c50a7/go.mod h1:PO8hayFFYvXDqELbXRVxwawR2HTdjN6mY4Qa3Se9xI8= +go.opentelemetry.io/collector/component v0.0.0-20221117234814-4565692c50a7 h1:q9m1bGHhQFUakQX79lZpLmFSY9VLULNSs2jUG8MdJLA= +go.opentelemetry.io/collector/component v0.0.0-20221117234814-4565692c50a7/go.mod h1:Z7H1Oj826e4dtVxXmT6SiUr6S0EIevUJmkVpfQV+UOk= +go.opentelemetry.io/collector/consumer v0.0.0-20221117234814-4565692c50a7 h1:FTy1JD9EJ7gq9SzlZoi2NkGcZ88+SwdiJav5uRcDEEY= +go.opentelemetry.io/collector/consumer v0.0.0-20221117234814-4565692c50a7/go.mod h1:86Elcw/LLrh90DprArogHMkBX3+UMu3tIgcVWF3mr6o= go.opentelemetry.io/collector/extension/zpagesextension v0.64.1 h1:2qTBtVigWNwPSpN9XR+WobC1idF2S8X/FIahFGCE1i4= -go.opentelemetry.io/collector/pdata v0.64.2-0.20221115155901-1550938c18fd h1:GdVAbRiae5VDZe3Mn3FqzMxO/aI5UbJ4+dcviqClHy8= -go.opentelemetry.io/collector/pdata v0.64.2-0.20221115155901-1550938c18fd/go.mod h1:0vynPfW2ZN7DltpcCFgCmTtWMQkCjp2a3TNt82YTCLQ= -go.opentelemetry.io/collector/processor/batchprocessor v0.64.2-0.20221115155901-1550938c18fd h1:SSjP8V0UP2+oPZ3gL+Dk90KQcvHXvHp9V5h8IIpx0og= -go.opentelemetry.io/collector/processor/batchprocessor v0.64.2-0.20221115155901-1550938c18fd/go.mod h1:zyCnX0aTvBaZ3XLWSHZdTueP7WoXRjz8X6HiWgKqstM= -go.opentelemetry.io/collector/semconv v0.64.2-0.20221115155901-1550938c18fd h1:rMqcl2pwi8YtVrtOPK8tVh87W0bFBge4yqB9ypSsAJ4= -go.opentelemetry.io/collector/semconv v0.64.2-0.20221115155901-1550938c18fd/go.mod h1:5o9yhOa+ABt7g2E5JABDxGZ1PQPbtfxrKNbYn+LOTXU= +go.opentelemetry.io/collector/featuregate v0.0.0-20221117214536-6a117bfc3737 h1:7sXg6M9Fw6rFVlX+iaWOMz6DFXEiroUdQer5kWGixwM= +go.opentelemetry.io/collector/featuregate v0.0.0-20221117214536-6a117bfc3737/go.mod h1:tewuFKJYalWBU0bmNKg++MC1ipINXUr6szYzOw2p1GI= +go.opentelemetry.io/collector/pdata v0.64.2-0.20221117234814-4565692c50a7 h1:IOFqfOu7fFxTgC7pvc2U7dk1/uFjwVQPK+CALiUvacI= +go.opentelemetry.io/collector/pdata v0.64.2-0.20221117234814-4565692c50a7/go.mod h1:0vynPfW2ZN7DltpcCFgCmTtWMQkCjp2a3TNt82YTCLQ= +go.opentelemetry.io/collector/processor/batchprocessor v0.64.2-0.20221117234814-4565692c50a7 h1:hGDq2T07j6qwwtQ2t6ZGU5tp/J2Dvu9mfY5qnnP5Ic8= +go.opentelemetry.io/collector/processor/batchprocessor v0.64.2-0.20221117234814-4565692c50a7/go.mod h1:b83iea2eDSAQkvd+2aSokaa6GRjSIsaR2zILziF/Ogc= +go.opentelemetry.io/collector/semconv v0.64.2-0.20221117234814-4565692c50a7 h1:cGXAVltDxXw9nj0Vr7vyZZTj0whdyO+GYs+xv0xHJ2A= +go.opentelemetry.io/collector/semconv v0.64.2-0.20221117234814-4565692c50a7/go.mod h1:5o9yhOa+ABt7g2E5JABDxGZ1PQPbtfxrKNbYn+LOTXU= go.opentelemetry.io/contrib/propagators/b3 v1.11.1 h1:icQ6ttRV+r/2fnU46BIo/g/mPu6Rs5Ug8Rtohe3KqzI= go.opentelemetry.io/contrib/propagators/b3 v1.11.1/go.mod h1:ECIveyMXgnl4gorxFcA7RYjJY/Ql9n20ubhbfDc3QfA= go.opentelemetry.io/contrib/zpages v0.36.4 h1:Z2VK5WsDhWs9VwZ1p0TM5RyusTOgAQfdMMDDQPRnlmY= diff --git a/exporter/googlecloudpubsubexporter/go.mod b/exporter/googlecloudpubsubexporter/go.mod index f8060ebe3f1ad..4b330a3c7dea9 100644 --- a/exporter/googlecloudpubsubexporter/go.mod +++ b/exporter/googlecloudpubsubexporter/go.mod @@ -6,8 +6,10 @@ require ( cloud.google.com/go/pubsub v1.26.0 github.com/google/uuid v1.3.0 github.com/stretchr/testify v1.8.1 - go.opentelemetry.io/collector v0.64.2-0.20221115155901-1550938c18fd - go.opentelemetry.io/collector/pdata v0.64.2-0.20221115155901-1550938c18fd + go.opentelemetry.io/collector v0.64.2-0.20221117234814-4565692c50a7 + go.opentelemetry.io/collector/component v0.0.0-20221117234814-4565692c50a7 + go.opentelemetry.io/collector/consumer v0.0.0-20221117234814-4565692c50a7 + go.opentelemetry.io/collector/pdata v0.64.2-0.20221117234814-4565692c50a7 go.uber.org/zap v1.23.0 google.golang.org/api v0.103.0 google.golang.org/genproto v0.0.0-20221027153422-115e99e71e1c @@ -39,6 +41,7 @@ require ( github.com/pelletier/go-toml v1.9.4 // indirect github.com/pmezard/go-difflib v1.0.0 // indirect go.opencensus.io v0.24.0 // indirect + go.opentelemetry.io/collector/featuregate v0.0.0-20221117214536-6a117bfc3737 // indirect go.opentelemetry.io/otel v1.11.1 // indirect go.opentelemetry.io/otel/metric v0.33.0 // indirect go.opentelemetry.io/otel/trace v1.11.1 // indirect diff --git a/exporter/googlecloudpubsubexporter/go.sum b/exporter/googlecloudpubsubexporter/go.sum index bf37191bc5a23..89f2c5fe78dcf 100644 --- a/exporter/googlecloudpubsubexporter/go.sum +++ b/exporter/googlecloudpubsubexporter/go.sum @@ -297,10 +297,16 @@ go.etcd.io/etcd/client/pkg/v3 v3.5.4/go.mod h1:IJHfcCEKxYu1Os13ZdwCwIUTUVGYTSAM3 go.etcd.io/etcd/client/v3 v3.5.4/go.mod h1:ZaRkVgBZC+L+dLCjTcF1hRXpgZXQPOvnA/Ak/gq3kiY= go.opencensus.io v0.24.0 h1:y73uSU6J157QMP2kn2r30vwW1A2W2WFwSCGnAVxeaD0= go.opencensus.io v0.24.0/go.mod h1:vNK8G9p7aAivkbmorf4v+7Hgx+Zs0yY+0fOtgBfjQKo= -go.opentelemetry.io/collector v0.64.2-0.20221115155901-1550938c18fd h1:O+6HhE4Ivg8Jksp3dIXIEC4FIR0Ush4uORvG3UtHZWk= -go.opentelemetry.io/collector v0.64.2-0.20221115155901-1550938c18fd/go.mod h1:mmSrOcwe1vEYmChXUYuF6rzlrUL0rjEiPfa19Xxb41o= -go.opentelemetry.io/collector/pdata v0.64.2-0.20221115155901-1550938c18fd h1:GdVAbRiae5VDZe3Mn3FqzMxO/aI5UbJ4+dcviqClHy8= -go.opentelemetry.io/collector/pdata v0.64.2-0.20221115155901-1550938c18fd/go.mod h1:0vynPfW2ZN7DltpcCFgCmTtWMQkCjp2a3TNt82YTCLQ= +go.opentelemetry.io/collector v0.64.2-0.20221117234814-4565692c50a7 h1:o/vMr2iyXzaeTb/KAldhMxAvRIfFPwtKfL5cKVKsSlU= +go.opentelemetry.io/collector v0.64.2-0.20221117234814-4565692c50a7/go.mod h1:PO8hayFFYvXDqELbXRVxwawR2HTdjN6mY4Qa3Se9xI8= +go.opentelemetry.io/collector/component v0.0.0-20221117234814-4565692c50a7 h1:q9m1bGHhQFUakQX79lZpLmFSY9VLULNSs2jUG8MdJLA= +go.opentelemetry.io/collector/component v0.0.0-20221117234814-4565692c50a7/go.mod h1:Z7H1Oj826e4dtVxXmT6SiUr6S0EIevUJmkVpfQV+UOk= +go.opentelemetry.io/collector/consumer v0.0.0-20221117234814-4565692c50a7 h1:FTy1JD9EJ7gq9SzlZoi2NkGcZ88+SwdiJav5uRcDEEY= +go.opentelemetry.io/collector/consumer v0.0.0-20221117234814-4565692c50a7/go.mod h1:86Elcw/LLrh90DprArogHMkBX3+UMu3tIgcVWF3mr6o= +go.opentelemetry.io/collector/featuregate v0.0.0-20221117214536-6a117bfc3737 h1:7sXg6M9Fw6rFVlX+iaWOMz6DFXEiroUdQer5kWGixwM= +go.opentelemetry.io/collector/featuregate v0.0.0-20221117214536-6a117bfc3737/go.mod h1:tewuFKJYalWBU0bmNKg++MC1ipINXUr6szYzOw2p1GI= +go.opentelemetry.io/collector/pdata v0.64.2-0.20221117234814-4565692c50a7 h1:IOFqfOu7fFxTgC7pvc2U7dk1/uFjwVQPK+CALiUvacI= +go.opentelemetry.io/collector/pdata v0.64.2-0.20221117234814-4565692c50a7/go.mod h1:0vynPfW2ZN7DltpcCFgCmTtWMQkCjp2a3TNt82YTCLQ= go.opentelemetry.io/otel v1.11.1 h1:4WLLAmcfkmDk2ukNXJyq3/kiz/3UzCaYq6PskJsaou4= go.opentelemetry.io/otel v1.11.1/go.mod h1:1nNhXBbWSD0nsL38H6btgnFN2k4i0sNLHNNMZMSbUGE= go.opentelemetry.io/otel/exporters/prometheus v0.33.0 h1:xXhPj7SLKWU5/Zd4Hxmd+X1C4jdmvc0Xy+kvjFx2z60= diff --git a/exporter/googlemanagedprometheusexporter/config.go b/exporter/googlemanagedprometheusexporter/config.go index d5cf71c659b51..9c4f6e086a156 100644 --- a/exporter/googlemanagedprometheusexporter/config.go +++ b/exporter/googlemanagedprometheusexporter/config.go @@ -71,9 +71,6 @@ func (c *GMPConfig) toCollectorConfig() collector.Config { } func (cfg *Config) Validate() error { - if err := cfg.ExporterSettings.Validate(); err != nil { - return fmt.Errorf("exporter settings are invalid :%w", err) - } if err := collector.ValidateConfig(cfg.toCollectorConfig()); err != nil { return fmt.Errorf("exporter settings are invalid :%w", err) } diff --git a/exporter/googlemanagedprometheusexporter/go.mod b/exporter/googlemanagedprometheusexporter/go.mod index 5ccd26b01c12a..24e8aa4a6dd4a 100644 --- a/exporter/googlemanagedprometheusexporter/go.mod +++ b/exporter/googlemanagedprometheusexporter/go.mod @@ -6,7 +6,8 @@ require ( github.com/GoogleCloudPlatform/opentelemetry-operations-go/exporter/collector v0.34.1 github.com/GoogleCloudPlatform/opentelemetry-operations-go/exporter/collector/googlemanagedprometheus v0.34.1 github.com/stretchr/testify v1.8.1 - go.opentelemetry.io/collector v0.64.2-0.20221115155901-1550938c18fd + go.opentelemetry.io/collector v0.64.2-0.20221117234814-4565692c50a7 + go.opentelemetry.io/collector/component v0.0.0-20221117234814-4565692c50a7 ) require ( @@ -60,9 +61,11 @@ require ( github.com/tklauser/numcpus v0.4.0 // indirect github.com/yusufpapurcu/wmi v1.2.2 // indirect go.opencensus.io v0.24.0 // indirect - go.opentelemetry.io/collector/pdata v0.64.2-0.20221115155901-1550938c18fd // indirect - go.opentelemetry.io/collector/processor/batchprocessor v0.64.2-0.20221115155901-1550938c18fd // indirect - go.opentelemetry.io/collector/semconv v0.64.2-0.20221115155901-1550938c18fd // indirect + go.opentelemetry.io/collector/consumer v0.0.0-20221117234814-4565692c50a7 // indirect + go.opentelemetry.io/collector/featuregate v0.0.0-20221117214536-6a117bfc3737 // indirect + go.opentelemetry.io/collector/pdata v0.64.2-0.20221117234814-4565692c50a7 // indirect + go.opentelemetry.io/collector/processor/batchprocessor v0.64.2-0.20221117234814-4565692c50a7 // indirect + go.opentelemetry.io/collector/semconv v0.64.2-0.20221117234814-4565692c50a7 // indirect go.opentelemetry.io/contrib/propagators/b3 v1.11.1 // indirect go.opentelemetry.io/otel v1.11.1 // indirect go.opentelemetry.io/otel/exporters/prometheus v0.33.0 // indirect diff --git a/exporter/googlemanagedprometheusexporter/go.sum b/exporter/googlemanagedprometheusexporter/go.sum index f30a5f1a936c4..5216b842aa64a 100644 --- a/exporter/googlemanagedprometheusexporter/go.sum +++ b/exporter/googlemanagedprometheusexporter/go.sum @@ -440,15 +440,21 @@ go.opencensus.io v0.22.5/go.mod h1:5pWMHQbX5EPX2/62yrJeAkowc+lfs/XD7Uxpq3pI6kk= go.opencensus.io v0.23.0/go.mod h1:XItmlyltB5F7CS4xOC1DcqMoFqwtC6OG2xF7mCv7P7E= go.opencensus.io v0.24.0 h1:y73uSU6J157QMP2kn2r30vwW1A2W2WFwSCGnAVxeaD0= go.opencensus.io v0.24.0/go.mod h1:vNK8G9p7aAivkbmorf4v+7Hgx+Zs0yY+0fOtgBfjQKo= -go.opentelemetry.io/collector v0.64.2-0.20221115155901-1550938c18fd h1:O+6HhE4Ivg8Jksp3dIXIEC4FIR0Ush4uORvG3UtHZWk= -go.opentelemetry.io/collector v0.64.2-0.20221115155901-1550938c18fd/go.mod h1:mmSrOcwe1vEYmChXUYuF6rzlrUL0rjEiPfa19Xxb41o= +go.opentelemetry.io/collector v0.64.2-0.20221117234814-4565692c50a7 h1:o/vMr2iyXzaeTb/KAldhMxAvRIfFPwtKfL5cKVKsSlU= +go.opentelemetry.io/collector v0.64.2-0.20221117234814-4565692c50a7/go.mod h1:PO8hayFFYvXDqELbXRVxwawR2HTdjN6mY4Qa3Se9xI8= +go.opentelemetry.io/collector/component v0.0.0-20221117234814-4565692c50a7 h1:q9m1bGHhQFUakQX79lZpLmFSY9VLULNSs2jUG8MdJLA= +go.opentelemetry.io/collector/component v0.0.0-20221117234814-4565692c50a7/go.mod h1:Z7H1Oj826e4dtVxXmT6SiUr6S0EIevUJmkVpfQV+UOk= +go.opentelemetry.io/collector/consumer v0.0.0-20221117234814-4565692c50a7 h1:FTy1JD9EJ7gq9SzlZoi2NkGcZ88+SwdiJav5uRcDEEY= +go.opentelemetry.io/collector/consumer v0.0.0-20221117234814-4565692c50a7/go.mod h1:86Elcw/LLrh90DprArogHMkBX3+UMu3tIgcVWF3mr6o= go.opentelemetry.io/collector/extension/zpagesextension v0.64.1 h1:2qTBtVigWNwPSpN9XR+WobC1idF2S8X/FIahFGCE1i4= -go.opentelemetry.io/collector/pdata v0.64.2-0.20221115155901-1550938c18fd h1:GdVAbRiae5VDZe3Mn3FqzMxO/aI5UbJ4+dcviqClHy8= -go.opentelemetry.io/collector/pdata v0.64.2-0.20221115155901-1550938c18fd/go.mod h1:0vynPfW2ZN7DltpcCFgCmTtWMQkCjp2a3TNt82YTCLQ= -go.opentelemetry.io/collector/processor/batchprocessor v0.64.2-0.20221115155901-1550938c18fd h1:SSjP8V0UP2+oPZ3gL+Dk90KQcvHXvHp9V5h8IIpx0og= -go.opentelemetry.io/collector/processor/batchprocessor v0.64.2-0.20221115155901-1550938c18fd/go.mod h1:zyCnX0aTvBaZ3XLWSHZdTueP7WoXRjz8X6HiWgKqstM= -go.opentelemetry.io/collector/semconv v0.64.2-0.20221115155901-1550938c18fd h1:rMqcl2pwi8YtVrtOPK8tVh87W0bFBge4yqB9ypSsAJ4= -go.opentelemetry.io/collector/semconv v0.64.2-0.20221115155901-1550938c18fd/go.mod h1:5o9yhOa+ABt7g2E5JABDxGZ1PQPbtfxrKNbYn+LOTXU= +go.opentelemetry.io/collector/featuregate v0.0.0-20221117214536-6a117bfc3737 h1:7sXg6M9Fw6rFVlX+iaWOMz6DFXEiroUdQer5kWGixwM= +go.opentelemetry.io/collector/featuregate v0.0.0-20221117214536-6a117bfc3737/go.mod h1:tewuFKJYalWBU0bmNKg++MC1ipINXUr6szYzOw2p1GI= +go.opentelemetry.io/collector/pdata v0.64.2-0.20221117234814-4565692c50a7 h1:IOFqfOu7fFxTgC7pvc2U7dk1/uFjwVQPK+CALiUvacI= +go.opentelemetry.io/collector/pdata v0.64.2-0.20221117234814-4565692c50a7/go.mod h1:0vynPfW2ZN7DltpcCFgCmTtWMQkCjp2a3TNt82YTCLQ= +go.opentelemetry.io/collector/processor/batchprocessor v0.64.2-0.20221117234814-4565692c50a7 h1:hGDq2T07j6qwwtQ2t6ZGU5tp/J2Dvu9mfY5qnnP5Ic8= +go.opentelemetry.io/collector/processor/batchprocessor v0.64.2-0.20221117234814-4565692c50a7/go.mod h1:b83iea2eDSAQkvd+2aSokaa6GRjSIsaR2zILziF/Ogc= +go.opentelemetry.io/collector/semconv v0.64.2-0.20221117234814-4565692c50a7 h1:cGXAVltDxXw9nj0Vr7vyZZTj0whdyO+GYs+xv0xHJ2A= +go.opentelemetry.io/collector/semconv v0.64.2-0.20221117234814-4565692c50a7/go.mod h1:5o9yhOa+ABt7g2E5JABDxGZ1PQPbtfxrKNbYn+LOTXU= go.opentelemetry.io/contrib/propagators/b3 v1.11.1 h1:icQ6ttRV+r/2fnU46BIo/g/mPu6Rs5Ug8Rtohe3KqzI= go.opentelemetry.io/contrib/propagators/b3 v1.11.1/go.mod h1:ECIveyMXgnl4gorxFcA7RYjJY/Ql9n20ubhbfDc3QfA= go.opentelemetry.io/contrib/zpages v0.36.4 h1:Z2VK5WsDhWs9VwZ1p0TM5RyusTOgAQfdMMDDQPRnlmY= diff --git a/exporter/humioexporter/config_test.go b/exporter/humioexporter/config_test.go index 2a4643ffe2c51..b64a04c005110 100644 --- a/exporter/humioexporter/config_test.go +++ b/exporter/humioexporter/config_test.go @@ -61,7 +61,7 @@ func TestLoadWithDefaults(t *testing.T) { func TestLoadInvalidCompression(t *testing.T) { // Act cfg, _ := loadExporterConfig(t, "invalid-compression.yaml", component.NewIDWithName(typeStr, "")) - err := cfg.Validate() + err := component.ValidateConfig(cfg) // Assert require.Error(t, err) assert.Contains(t, err.Error(), "the Content-Encoding header must") @@ -70,7 +70,7 @@ func TestLoadInvalidCompression(t *testing.T) { func TestLoadInvalidTagStrategy(t *testing.T) { // Act cfg, _ := loadExporterConfig(t, "invalid-tag.yaml", component.NewIDWithName(typeStr, "")) - err := cfg.Validate() + err := component.ValidateConfig(cfg) // Assert require.Error(t, err) diff --git a/exporter/humioexporter/go.mod b/exporter/humioexporter/go.mod index b344dfd306918..287c8de04c83c 100644 --- a/exporter/humioexporter/go.mod +++ b/exporter/humioexporter/go.mod @@ -5,9 +5,11 @@ go 1.18 require ( github.com/open-telemetry/opentelemetry-collector-contrib/internal/coreinternal v0.64.0 github.com/stretchr/testify v1.8.1 - go.opentelemetry.io/collector v0.64.2-0.20221115155901-1550938c18fd - go.opentelemetry.io/collector/pdata v0.64.2-0.20221115155901-1550938c18fd - go.opentelemetry.io/collector/semconv v0.64.2-0.20221115155901-1550938c18fd + go.opentelemetry.io/collector v0.64.2-0.20221117234814-4565692c50a7 + go.opentelemetry.io/collector/component v0.0.0-20221117234814-4565692c50a7 + go.opentelemetry.io/collector/consumer v0.0.0-20221117234814-4565692c50a7 + go.opentelemetry.io/collector/pdata v0.64.2-0.20221117234814-4565692c50a7 + go.opentelemetry.io/collector/semconv v0.64.2-0.20221117234814-4565692c50a7 ) require ( @@ -31,6 +33,7 @@ require ( github.com/pmezard/go-difflib v1.0.0 // indirect github.com/rs/cors v1.8.2 // indirect go.opencensus.io v0.24.0 // indirect + go.opentelemetry.io/collector/featuregate v0.0.0-20221117214536-6a117bfc3737 // indirect go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.36.4 // indirect go.opentelemetry.io/otel v1.11.1 // indirect go.opentelemetry.io/otel/metric v0.33.0 // indirect diff --git a/exporter/humioexporter/go.sum b/exporter/humioexporter/go.sum index 2471fff1be54c..76c1c8cc2fc2e 100644 --- a/exporter/humioexporter/go.sum +++ b/exporter/humioexporter/go.sum @@ -287,12 +287,18 @@ go.etcd.io/etcd/client/pkg/v3 v3.5.4/go.mod h1:IJHfcCEKxYu1Os13ZdwCwIUTUVGYTSAM3 go.etcd.io/etcd/client/v3 v3.5.4/go.mod h1:ZaRkVgBZC+L+dLCjTcF1hRXpgZXQPOvnA/Ak/gq3kiY= go.opencensus.io v0.24.0 h1:y73uSU6J157QMP2kn2r30vwW1A2W2WFwSCGnAVxeaD0= go.opencensus.io v0.24.0/go.mod h1:vNK8G9p7aAivkbmorf4v+7Hgx+Zs0yY+0fOtgBfjQKo= -go.opentelemetry.io/collector v0.64.2-0.20221115155901-1550938c18fd h1:O+6HhE4Ivg8Jksp3dIXIEC4FIR0Ush4uORvG3UtHZWk= -go.opentelemetry.io/collector v0.64.2-0.20221115155901-1550938c18fd/go.mod h1:mmSrOcwe1vEYmChXUYuF6rzlrUL0rjEiPfa19Xxb41o= -go.opentelemetry.io/collector/pdata v0.64.2-0.20221115155901-1550938c18fd h1:GdVAbRiae5VDZe3Mn3FqzMxO/aI5UbJ4+dcviqClHy8= -go.opentelemetry.io/collector/pdata v0.64.2-0.20221115155901-1550938c18fd/go.mod h1:0vynPfW2ZN7DltpcCFgCmTtWMQkCjp2a3TNt82YTCLQ= -go.opentelemetry.io/collector/semconv v0.64.2-0.20221115155901-1550938c18fd h1:rMqcl2pwi8YtVrtOPK8tVh87W0bFBge4yqB9ypSsAJ4= -go.opentelemetry.io/collector/semconv v0.64.2-0.20221115155901-1550938c18fd/go.mod h1:5o9yhOa+ABt7g2E5JABDxGZ1PQPbtfxrKNbYn+LOTXU= +go.opentelemetry.io/collector v0.64.2-0.20221117234814-4565692c50a7 h1:o/vMr2iyXzaeTb/KAldhMxAvRIfFPwtKfL5cKVKsSlU= +go.opentelemetry.io/collector v0.64.2-0.20221117234814-4565692c50a7/go.mod h1:PO8hayFFYvXDqELbXRVxwawR2HTdjN6mY4Qa3Se9xI8= +go.opentelemetry.io/collector/component v0.0.0-20221117234814-4565692c50a7 h1:q9m1bGHhQFUakQX79lZpLmFSY9VLULNSs2jUG8MdJLA= +go.opentelemetry.io/collector/component v0.0.0-20221117234814-4565692c50a7/go.mod h1:Z7H1Oj826e4dtVxXmT6SiUr6S0EIevUJmkVpfQV+UOk= +go.opentelemetry.io/collector/consumer v0.0.0-20221117234814-4565692c50a7 h1:FTy1JD9EJ7gq9SzlZoi2NkGcZ88+SwdiJav5uRcDEEY= +go.opentelemetry.io/collector/consumer v0.0.0-20221117234814-4565692c50a7/go.mod h1:86Elcw/LLrh90DprArogHMkBX3+UMu3tIgcVWF3mr6o= +go.opentelemetry.io/collector/featuregate v0.0.0-20221117214536-6a117bfc3737 h1:7sXg6M9Fw6rFVlX+iaWOMz6DFXEiroUdQer5kWGixwM= +go.opentelemetry.io/collector/featuregate v0.0.0-20221117214536-6a117bfc3737/go.mod h1:tewuFKJYalWBU0bmNKg++MC1ipINXUr6szYzOw2p1GI= +go.opentelemetry.io/collector/pdata v0.64.2-0.20221117234814-4565692c50a7 h1:IOFqfOu7fFxTgC7pvc2U7dk1/uFjwVQPK+CALiUvacI= +go.opentelemetry.io/collector/pdata v0.64.2-0.20221117234814-4565692c50a7/go.mod h1:0vynPfW2ZN7DltpcCFgCmTtWMQkCjp2a3TNt82YTCLQ= +go.opentelemetry.io/collector/semconv v0.64.2-0.20221117234814-4565692c50a7 h1:cGXAVltDxXw9nj0Vr7vyZZTj0whdyO+GYs+xv0xHJ2A= +go.opentelemetry.io/collector/semconv v0.64.2-0.20221117234814-4565692c50a7/go.mod h1:5o9yhOa+ABt7g2E5JABDxGZ1PQPbtfxrKNbYn+LOTXU= go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.36.4 h1:aUEBEdCa6iamGzg6fuYxDA8ThxvOG240mAvWDU+XLio= go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.36.4/go.mod h1:l2MdsbKTocpPS5nQZscqTR9jd8u96VYZdcpF8Sye7mA= go.opentelemetry.io/otel v1.11.1 h1:4WLLAmcfkmDk2ukNXJyq3/kiz/3UzCaYq6PskJsaou4= diff --git a/exporter/humioexporter/humio_client_test.go b/exporter/humioexporter/humio_client_test.go index ea5173aaca8e7..e4b9caf7a30b7 100644 --- a/exporter/humioexporter/humio_client_test.go +++ b/exporter/humioexporter/humio_client_test.go @@ -50,7 +50,7 @@ func makeClient(t *testing.T, host string, compression bool) exporterClient { IngestToken: "traces-token", }, } - err := cfg.Validate() + err := component.ValidateConfig(cfg) require.NoError(t, err) err = cfg.sanitize() diff --git a/exporter/influxdbexporter/config.go b/exporter/influxdbexporter/config.go index a8f3a1dc04805..ab1ee2ec580cc 100644 --- a/exporter/influxdbexporter/config.go +++ b/exporter/influxdbexporter/config.go @@ -15,8 +15,6 @@ package influxdbexporter // import "github.com/open-telemetry/opentelemetry-collector-contrib/exporter/influxdbexporter" import ( - "fmt" - "go.opentelemetry.io/collector/component" "go.opentelemetry.io/collector/config" "go.opentelemetry.io/collector/config/confighttp" @@ -52,8 +50,5 @@ type Config struct { } func (cfg *Config) Validate() error { - if err := cfg.ExporterSettings.Validate(); err != nil { - return fmt.Errorf("exporter settings are invalid :%w", err) - } return nil } diff --git a/exporter/influxdbexporter/config_test.go b/exporter/influxdbexporter/config_test.go index 4d54b52e16810..5874e429a2c0c 100644 --- a/exporter/influxdbexporter/config_test.go +++ b/exporter/influxdbexporter/config_test.go @@ -79,7 +79,7 @@ func TestLoadConfig(t *testing.T) { require.NoError(t, err) require.NoError(t, component.UnmarshalExporterConfig(sub, cfg)) - assert.NoError(t, cfg.Validate()) + assert.NoError(t, component.ValidateConfig(cfg)) assert.Equal(t, tt.expected, cfg) }) } diff --git a/exporter/influxdbexporter/go.mod b/exporter/influxdbexporter/go.mod index b66b34e8c06ee..cf07542406fb4 100644 --- a/exporter/influxdbexporter/go.mod +++ b/exporter/influxdbexporter/go.mod @@ -7,8 +7,10 @@ require ( github.com/influxdata/influxdb-observability/otel2influx v0.2.30 github.com/influxdata/line-protocol/v2 v2.2.1 github.com/stretchr/testify v1.8.1 - go.opentelemetry.io/collector v0.64.2-0.20221115155901-1550938c18fd - go.opentelemetry.io/collector/pdata v0.64.2-0.20221115155901-1550938c18fd + go.opentelemetry.io/collector v0.64.2-0.20221117234814-4565692c50a7 + go.opentelemetry.io/collector/component v0.0.0-20221117234814-4565692c50a7 + go.opentelemetry.io/collector/consumer v0.0.0-20221117234814-4565692c50a7 + go.opentelemetry.io/collector/pdata v0.64.2-0.20221117234814-4565692c50a7 go.uber.org/zap v1.23.0 ) @@ -35,6 +37,7 @@ require ( github.com/pmezard/go-difflib v1.0.0 // indirect github.com/rs/cors v1.8.2 // indirect go.opencensus.io v0.24.0 // indirect + go.opentelemetry.io/collector/featuregate v0.0.0-20221117214536-6a117bfc3737 // indirect go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.36.4 // indirect go.opentelemetry.io/otel v1.11.1 // indirect go.opentelemetry.io/otel/metric v0.33.0 // indirect diff --git a/exporter/influxdbexporter/go.sum b/exporter/influxdbexporter/go.sum index e641c9143f376..f317d04d39746 100644 --- a/exporter/influxdbexporter/go.sum +++ b/exporter/influxdbexporter/go.sum @@ -315,10 +315,16 @@ go.etcd.io/etcd/client/pkg/v3 v3.5.4/go.mod h1:IJHfcCEKxYu1Os13ZdwCwIUTUVGYTSAM3 go.etcd.io/etcd/client/v3 v3.5.4/go.mod h1:ZaRkVgBZC+L+dLCjTcF1hRXpgZXQPOvnA/Ak/gq3kiY= go.opencensus.io v0.24.0 h1:y73uSU6J157QMP2kn2r30vwW1A2W2WFwSCGnAVxeaD0= go.opencensus.io v0.24.0/go.mod h1:vNK8G9p7aAivkbmorf4v+7Hgx+Zs0yY+0fOtgBfjQKo= -go.opentelemetry.io/collector v0.64.2-0.20221115155901-1550938c18fd h1:O+6HhE4Ivg8Jksp3dIXIEC4FIR0Ush4uORvG3UtHZWk= -go.opentelemetry.io/collector v0.64.2-0.20221115155901-1550938c18fd/go.mod h1:mmSrOcwe1vEYmChXUYuF6rzlrUL0rjEiPfa19Xxb41o= -go.opentelemetry.io/collector/pdata v0.64.2-0.20221115155901-1550938c18fd h1:GdVAbRiae5VDZe3Mn3FqzMxO/aI5UbJ4+dcviqClHy8= -go.opentelemetry.io/collector/pdata v0.64.2-0.20221115155901-1550938c18fd/go.mod h1:0vynPfW2ZN7DltpcCFgCmTtWMQkCjp2a3TNt82YTCLQ= +go.opentelemetry.io/collector v0.64.2-0.20221117234814-4565692c50a7 h1:o/vMr2iyXzaeTb/KAldhMxAvRIfFPwtKfL5cKVKsSlU= +go.opentelemetry.io/collector v0.64.2-0.20221117234814-4565692c50a7/go.mod h1:PO8hayFFYvXDqELbXRVxwawR2HTdjN6mY4Qa3Se9xI8= +go.opentelemetry.io/collector/component v0.0.0-20221117234814-4565692c50a7 h1:q9m1bGHhQFUakQX79lZpLmFSY9VLULNSs2jUG8MdJLA= +go.opentelemetry.io/collector/component v0.0.0-20221117234814-4565692c50a7/go.mod h1:Z7H1Oj826e4dtVxXmT6SiUr6S0EIevUJmkVpfQV+UOk= +go.opentelemetry.io/collector/consumer v0.0.0-20221117234814-4565692c50a7 h1:FTy1JD9EJ7gq9SzlZoi2NkGcZ88+SwdiJav5uRcDEEY= +go.opentelemetry.io/collector/consumer v0.0.0-20221117234814-4565692c50a7/go.mod h1:86Elcw/LLrh90DprArogHMkBX3+UMu3tIgcVWF3mr6o= +go.opentelemetry.io/collector/featuregate v0.0.0-20221117214536-6a117bfc3737 h1:7sXg6M9Fw6rFVlX+iaWOMz6DFXEiroUdQer5kWGixwM= +go.opentelemetry.io/collector/featuregate v0.0.0-20221117214536-6a117bfc3737/go.mod h1:tewuFKJYalWBU0bmNKg++MC1ipINXUr6szYzOw2p1GI= +go.opentelemetry.io/collector/pdata v0.64.2-0.20221117234814-4565692c50a7 h1:IOFqfOu7fFxTgC7pvc2U7dk1/uFjwVQPK+CALiUvacI= +go.opentelemetry.io/collector/pdata v0.64.2-0.20221117234814-4565692c50a7/go.mod h1:0vynPfW2ZN7DltpcCFgCmTtWMQkCjp2a3TNt82YTCLQ= go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.36.4 h1:aUEBEdCa6iamGzg6fuYxDA8ThxvOG240mAvWDU+XLio= go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.36.4/go.mod h1:l2MdsbKTocpPS5nQZscqTR9jd8u96VYZdcpF8Sye7mA= go.opentelemetry.io/otel v1.11.1 h1:4WLLAmcfkmDk2ukNXJyq3/kiz/3UzCaYq6PskJsaou4= diff --git a/exporter/instanaexporter/factory_test.go b/exporter/instanaexporter/factory_test.go index d75bce59c8b44..608fc8f6bfd80 100644 --- a/exporter/instanaexporter/factory_test.go +++ b/exporter/instanaexporter/factory_test.go @@ -58,7 +58,7 @@ func TestLoadConfig(t *testing.T) { require.NoError(t, err) require.NoError(t, component.UnmarshalExporterConfig(sub, cfg)) - err = cfg.Validate() + err = component.ValidateConfig(cfg) require.NoError(t, err) assert.Equal(t, &Config{ @@ -80,7 +80,7 @@ func TestLoadConfig(t *testing.T) { require.NoError(t, err) require.NoError(t, component.UnmarshalExporterConfig(sub, cfg)) - err = cfg.Validate() + err = component.ValidateConfig(cfg) require.Error(t, err) }) @@ -90,7 +90,7 @@ func TestLoadConfig(t *testing.T) { require.NoError(t, err) require.NoError(t, component.UnmarshalExporterConfig(sub, cfg)) - err = cfg.Validate() + err = component.ValidateConfig(cfg) require.Error(t, err) }) } diff --git a/exporter/instanaexporter/go.mod b/exporter/instanaexporter/go.mod index bcf664e163f24..b58863a4c1e8d 100644 --- a/exporter/instanaexporter/go.mod +++ b/exporter/instanaexporter/go.mod @@ -5,9 +5,11 @@ go 1.18 require ( github.com/open-telemetry/opentelemetry-collector-contrib/internal/coreinternal v0.64.0 github.com/stretchr/testify v1.8.1 - go.opentelemetry.io/collector v0.64.2-0.20221115155901-1550938c18fd - go.opentelemetry.io/collector/pdata v0.64.2-0.20221115155901-1550938c18fd - go.opentelemetry.io/collector/semconv v0.64.2-0.20221115155901-1550938c18fd + go.opentelemetry.io/collector v0.64.2-0.20221117234814-4565692c50a7 + go.opentelemetry.io/collector/component v0.0.0-20221117234814-4565692c50a7 + go.opentelemetry.io/collector/consumer v0.0.0-20221117234814-4565692c50a7 + go.opentelemetry.io/collector/pdata v0.64.2-0.20221117234814-4565692c50a7 + go.opentelemetry.io/collector/semconv v0.64.2-0.20221117234814-4565692c50a7 go.uber.org/zap v1.23.0 ) @@ -31,6 +33,7 @@ require ( github.com/pmezard/go-difflib v1.0.0 // indirect github.com/rs/cors v1.8.2 // indirect go.opencensus.io v0.24.0 // indirect + go.opentelemetry.io/collector/featuregate v0.0.0-20221117214536-6a117bfc3737 // indirect go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.36.4 // indirect go.opentelemetry.io/otel v1.11.1 // indirect go.opentelemetry.io/otel/metric v0.33.0 // indirect diff --git a/exporter/instanaexporter/go.sum b/exporter/instanaexporter/go.sum index 77849789d22bb..decd63a294a1d 100644 --- a/exporter/instanaexporter/go.sum +++ b/exporter/instanaexporter/go.sum @@ -282,12 +282,18 @@ go.etcd.io/etcd/client/pkg/v3 v3.5.4/go.mod h1:IJHfcCEKxYu1Os13ZdwCwIUTUVGYTSAM3 go.etcd.io/etcd/client/v3 v3.5.4/go.mod h1:ZaRkVgBZC+L+dLCjTcF1hRXpgZXQPOvnA/Ak/gq3kiY= go.opencensus.io v0.24.0 h1:y73uSU6J157QMP2kn2r30vwW1A2W2WFwSCGnAVxeaD0= go.opencensus.io v0.24.0/go.mod h1:vNK8G9p7aAivkbmorf4v+7Hgx+Zs0yY+0fOtgBfjQKo= -go.opentelemetry.io/collector v0.64.2-0.20221115155901-1550938c18fd h1:O+6HhE4Ivg8Jksp3dIXIEC4FIR0Ush4uORvG3UtHZWk= -go.opentelemetry.io/collector v0.64.2-0.20221115155901-1550938c18fd/go.mod h1:mmSrOcwe1vEYmChXUYuF6rzlrUL0rjEiPfa19Xxb41o= -go.opentelemetry.io/collector/pdata v0.64.2-0.20221115155901-1550938c18fd h1:GdVAbRiae5VDZe3Mn3FqzMxO/aI5UbJ4+dcviqClHy8= -go.opentelemetry.io/collector/pdata v0.64.2-0.20221115155901-1550938c18fd/go.mod h1:0vynPfW2ZN7DltpcCFgCmTtWMQkCjp2a3TNt82YTCLQ= -go.opentelemetry.io/collector/semconv v0.64.2-0.20221115155901-1550938c18fd h1:rMqcl2pwi8YtVrtOPK8tVh87W0bFBge4yqB9ypSsAJ4= -go.opentelemetry.io/collector/semconv v0.64.2-0.20221115155901-1550938c18fd/go.mod h1:5o9yhOa+ABt7g2E5JABDxGZ1PQPbtfxrKNbYn+LOTXU= +go.opentelemetry.io/collector v0.64.2-0.20221117234814-4565692c50a7 h1:o/vMr2iyXzaeTb/KAldhMxAvRIfFPwtKfL5cKVKsSlU= +go.opentelemetry.io/collector v0.64.2-0.20221117234814-4565692c50a7/go.mod h1:PO8hayFFYvXDqELbXRVxwawR2HTdjN6mY4Qa3Se9xI8= +go.opentelemetry.io/collector/component v0.0.0-20221117234814-4565692c50a7 h1:q9m1bGHhQFUakQX79lZpLmFSY9VLULNSs2jUG8MdJLA= +go.opentelemetry.io/collector/component v0.0.0-20221117234814-4565692c50a7/go.mod h1:Z7H1Oj826e4dtVxXmT6SiUr6S0EIevUJmkVpfQV+UOk= +go.opentelemetry.io/collector/consumer v0.0.0-20221117234814-4565692c50a7 h1:FTy1JD9EJ7gq9SzlZoi2NkGcZ88+SwdiJav5uRcDEEY= +go.opentelemetry.io/collector/consumer v0.0.0-20221117234814-4565692c50a7/go.mod h1:86Elcw/LLrh90DprArogHMkBX3+UMu3tIgcVWF3mr6o= +go.opentelemetry.io/collector/featuregate v0.0.0-20221117214536-6a117bfc3737 h1:7sXg6M9Fw6rFVlX+iaWOMz6DFXEiroUdQer5kWGixwM= +go.opentelemetry.io/collector/featuregate v0.0.0-20221117214536-6a117bfc3737/go.mod h1:tewuFKJYalWBU0bmNKg++MC1ipINXUr6szYzOw2p1GI= +go.opentelemetry.io/collector/pdata v0.64.2-0.20221117234814-4565692c50a7 h1:IOFqfOu7fFxTgC7pvc2U7dk1/uFjwVQPK+CALiUvacI= +go.opentelemetry.io/collector/pdata v0.64.2-0.20221117234814-4565692c50a7/go.mod h1:0vynPfW2ZN7DltpcCFgCmTtWMQkCjp2a3TNt82YTCLQ= +go.opentelemetry.io/collector/semconv v0.64.2-0.20221117234814-4565692c50a7 h1:cGXAVltDxXw9nj0Vr7vyZZTj0whdyO+GYs+xv0xHJ2A= +go.opentelemetry.io/collector/semconv v0.64.2-0.20221117234814-4565692c50a7/go.mod h1:5o9yhOa+ABt7g2E5JABDxGZ1PQPbtfxrKNbYn+LOTXU= go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.36.4 h1:aUEBEdCa6iamGzg6fuYxDA8ThxvOG240mAvWDU+XLio= go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.36.4/go.mod h1:l2MdsbKTocpPS5nQZscqTR9jd8u96VYZdcpF8Sye7mA= go.opentelemetry.io/otel v1.11.1 h1:4WLLAmcfkmDk2ukNXJyq3/kiz/3UzCaYq6PskJsaou4= diff --git a/exporter/jaegerexporter/config_test.go b/exporter/jaegerexporter/config_test.go index d2aab27758de2..7f33e6a46fed9 100644 --- a/exporter/jaegerexporter/config_test.go +++ b/exporter/jaegerexporter/config_test.go @@ -78,7 +78,7 @@ func TestLoadConfig(t *testing.T) { require.NoError(t, err) require.NoError(t, component.UnmarshalExporterConfig(sub, cfg)) - assert.NoError(t, cfg.Validate()) + assert.NoError(t, component.ValidateConfig(cfg)) assert.Equal(t, tt.expected, cfg) }) } diff --git a/exporter/jaegerexporter/go.mod b/exporter/jaegerexporter/go.mod index d486a2d9f513f..e613a6037a5ab 100644 --- a/exporter/jaegerexporter/go.mod +++ b/exporter/jaegerexporter/go.mod @@ -8,8 +8,10 @@ require ( github.com/open-telemetry/opentelemetry-collector-contrib/pkg/translator/jaeger v0.64.0 github.com/stretchr/testify v1.8.1 go.opencensus.io v0.24.0 - go.opentelemetry.io/collector v0.64.2-0.20221115155901-1550938c18fd - go.opentelemetry.io/collector/pdata v0.64.2-0.20221115155901-1550938c18fd + go.opentelemetry.io/collector v0.64.2-0.20221117234814-4565692c50a7 + go.opentelemetry.io/collector/component v0.0.0-20221117234814-4565692c50a7 + go.opentelemetry.io/collector/consumer v0.0.0-20221117234814-4565692c50a7 + go.opentelemetry.io/collector/pdata v0.64.2-0.20221117234814-4565692c50a7 go.uber.org/zap v1.23.0 google.golang.org/grpc v1.50.1 ) @@ -38,7 +40,8 @@ require ( github.com/pmezard/go-difflib v1.0.0 // indirect github.com/uber/jaeger-client-go v2.30.0+incompatible // indirect github.com/uber/jaeger-lib v2.4.1+incompatible // indirect - go.opentelemetry.io/collector/semconv v0.64.2-0.20221115155901-1550938c18fd // indirect + go.opentelemetry.io/collector/featuregate v0.0.0-20221117214536-6a117bfc3737 // indirect + go.opentelemetry.io/collector/semconv v0.64.2-0.20221117234814-4565692c50a7 // indirect go.opentelemetry.io/contrib/instrumentation/google.golang.org/grpc/otelgrpc v0.36.4 // indirect go.opentelemetry.io/otel v1.11.1 // indirect go.opentelemetry.io/otel/metric v0.33.0 // indirect diff --git a/exporter/jaegerexporter/go.sum b/exporter/jaegerexporter/go.sum index 396c2718c65ee..4ec01457a2ab8 100644 --- a/exporter/jaegerexporter/go.sum +++ b/exporter/jaegerexporter/go.sum @@ -313,12 +313,18 @@ go.etcd.io/etcd/client/pkg/v3 v3.5.4/go.mod h1:IJHfcCEKxYu1Os13ZdwCwIUTUVGYTSAM3 go.etcd.io/etcd/client/v3 v3.5.4/go.mod h1:ZaRkVgBZC+L+dLCjTcF1hRXpgZXQPOvnA/Ak/gq3kiY= go.opencensus.io v0.24.0 h1:y73uSU6J157QMP2kn2r30vwW1A2W2WFwSCGnAVxeaD0= go.opencensus.io v0.24.0/go.mod h1:vNK8G9p7aAivkbmorf4v+7Hgx+Zs0yY+0fOtgBfjQKo= -go.opentelemetry.io/collector v0.64.2-0.20221115155901-1550938c18fd h1:O+6HhE4Ivg8Jksp3dIXIEC4FIR0Ush4uORvG3UtHZWk= -go.opentelemetry.io/collector v0.64.2-0.20221115155901-1550938c18fd/go.mod h1:mmSrOcwe1vEYmChXUYuF6rzlrUL0rjEiPfa19Xxb41o= -go.opentelemetry.io/collector/pdata v0.64.2-0.20221115155901-1550938c18fd h1:GdVAbRiae5VDZe3Mn3FqzMxO/aI5UbJ4+dcviqClHy8= -go.opentelemetry.io/collector/pdata v0.64.2-0.20221115155901-1550938c18fd/go.mod h1:0vynPfW2ZN7DltpcCFgCmTtWMQkCjp2a3TNt82YTCLQ= -go.opentelemetry.io/collector/semconv v0.64.2-0.20221115155901-1550938c18fd h1:rMqcl2pwi8YtVrtOPK8tVh87W0bFBge4yqB9ypSsAJ4= -go.opentelemetry.io/collector/semconv v0.64.2-0.20221115155901-1550938c18fd/go.mod h1:5o9yhOa+ABt7g2E5JABDxGZ1PQPbtfxrKNbYn+LOTXU= +go.opentelemetry.io/collector v0.64.2-0.20221117234814-4565692c50a7 h1:o/vMr2iyXzaeTb/KAldhMxAvRIfFPwtKfL5cKVKsSlU= +go.opentelemetry.io/collector v0.64.2-0.20221117234814-4565692c50a7/go.mod h1:PO8hayFFYvXDqELbXRVxwawR2HTdjN6mY4Qa3Se9xI8= +go.opentelemetry.io/collector/component v0.0.0-20221117234814-4565692c50a7 h1:q9m1bGHhQFUakQX79lZpLmFSY9VLULNSs2jUG8MdJLA= +go.opentelemetry.io/collector/component v0.0.0-20221117234814-4565692c50a7/go.mod h1:Z7H1Oj826e4dtVxXmT6SiUr6S0EIevUJmkVpfQV+UOk= +go.opentelemetry.io/collector/consumer v0.0.0-20221117234814-4565692c50a7 h1:FTy1JD9EJ7gq9SzlZoi2NkGcZ88+SwdiJav5uRcDEEY= +go.opentelemetry.io/collector/consumer v0.0.0-20221117234814-4565692c50a7/go.mod h1:86Elcw/LLrh90DprArogHMkBX3+UMu3tIgcVWF3mr6o= +go.opentelemetry.io/collector/featuregate v0.0.0-20221117214536-6a117bfc3737 h1:7sXg6M9Fw6rFVlX+iaWOMz6DFXEiroUdQer5kWGixwM= +go.opentelemetry.io/collector/featuregate v0.0.0-20221117214536-6a117bfc3737/go.mod h1:tewuFKJYalWBU0bmNKg++MC1ipINXUr6szYzOw2p1GI= +go.opentelemetry.io/collector/pdata v0.64.2-0.20221117234814-4565692c50a7 h1:IOFqfOu7fFxTgC7pvc2U7dk1/uFjwVQPK+CALiUvacI= +go.opentelemetry.io/collector/pdata v0.64.2-0.20221117234814-4565692c50a7/go.mod h1:0vynPfW2ZN7DltpcCFgCmTtWMQkCjp2a3TNt82YTCLQ= +go.opentelemetry.io/collector/semconv v0.64.2-0.20221117234814-4565692c50a7 h1:cGXAVltDxXw9nj0Vr7vyZZTj0whdyO+GYs+xv0xHJ2A= +go.opentelemetry.io/collector/semconv v0.64.2-0.20221117234814-4565692c50a7/go.mod h1:5o9yhOa+ABt7g2E5JABDxGZ1PQPbtfxrKNbYn+LOTXU= go.opentelemetry.io/contrib/instrumentation/google.golang.org/grpc/otelgrpc v0.36.4 h1:PRXhsszxTt5bbPriTjmaweWUsAnJYeWBhUMLRetUgBU= go.opentelemetry.io/contrib/instrumentation/google.golang.org/grpc/otelgrpc v0.36.4/go.mod h1:05eWWy6ZWzmpeImD3UowLTB3VjDMU1yxQ+ENuVWDM3c= go.opentelemetry.io/otel v1.11.1 h1:4WLLAmcfkmDk2ukNXJyq3/kiz/3UzCaYq6PskJsaou4= diff --git a/exporter/jaegerthrifthttpexporter/config_test.go b/exporter/jaegerthrifthttpexporter/config_test.go index 18f975ce96ac9..9bb0c28aca5ad 100644 --- a/exporter/jaegerthrifthttpexporter/config_test.go +++ b/exporter/jaegerthrifthttpexporter/config_test.go @@ -70,7 +70,7 @@ func TestLoadConfig(t *testing.T) { require.NoError(t, err) require.NoError(t, component.UnmarshalExporterConfig(sub, cfg)) - assert.NoError(t, cfg.Validate()) + assert.NoError(t, component.ValidateConfig(cfg)) assert.Equal(t, tt.expected, cfg) }) } diff --git a/exporter/jaegerthrifthttpexporter/go.mod b/exporter/jaegerthrifthttpexporter/go.mod index 8ed115533bb1d..99ee907eb60e9 100644 --- a/exporter/jaegerthrifthttpexporter/go.mod +++ b/exporter/jaegerthrifthttpexporter/go.mod @@ -7,8 +7,10 @@ require ( github.com/jaegertracing/jaeger v1.39.1-0.20221110195127-14c11365a856 github.com/open-telemetry/opentelemetry-collector-contrib/pkg/translator/jaeger v0.64.0 github.com/stretchr/testify v1.8.1 - go.opentelemetry.io/collector v0.64.2-0.20221115155901-1550938c18fd - go.opentelemetry.io/collector/pdata v0.64.2-0.20221115155901-1550938c18fd + go.opentelemetry.io/collector v0.64.2-0.20221117234814-4565692c50a7 + go.opentelemetry.io/collector/component v0.0.0-20221117234814-4565692c50a7 + go.opentelemetry.io/collector/consumer v0.0.0-20221117234814-4565692c50a7 + go.opentelemetry.io/collector/pdata v0.64.2-0.20221117234814-4565692c50a7 ) require ( @@ -36,7 +38,8 @@ require ( github.com/uber/jaeger-client-go v2.30.0+incompatible // indirect github.com/uber/jaeger-lib v2.4.1+incompatible // indirect go.opencensus.io v0.24.0 // indirect - go.opentelemetry.io/collector/semconv v0.64.2-0.20221115155901-1550938c18fd // indirect + go.opentelemetry.io/collector/featuregate v0.0.0-20221117214536-6a117bfc3737 // indirect + go.opentelemetry.io/collector/semconv v0.64.2-0.20221117234814-4565692c50a7 // indirect go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.36.4 // indirect go.opentelemetry.io/otel v1.11.1 // indirect go.opentelemetry.io/otel/metric v0.33.0 // indirect diff --git a/exporter/jaegerthrifthttpexporter/go.sum b/exporter/jaegerthrifthttpexporter/go.sum index 7e77a3e83667d..5cecdc7da114a 100644 --- a/exporter/jaegerthrifthttpexporter/go.sum +++ b/exporter/jaegerthrifthttpexporter/go.sum @@ -298,12 +298,18 @@ go.etcd.io/etcd/client/pkg/v3 v3.5.4/go.mod h1:IJHfcCEKxYu1Os13ZdwCwIUTUVGYTSAM3 go.etcd.io/etcd/client/v3 v3.5.4/go.mod h1:ZaRkVgBZC+L+dLCjTcF1hRXpgZXQPOvnA/Ak/gq3kiY= go.opencensus.io v0.24.0 h1:y73uSU6J157QMP2kn2r30vwW1A2W2WFwSCGnAVxeaD0= go.opencensus.io v0.24.0/go.mod h1:vNK8G9p7aAivkbmorf4v+7Hgx+Zs0yY+0fOtgBfjQKo= -go.opentelemetry.io/collector v0.64.2-0.20221115155901-1550938c18fd h1:O+6HhE4Ivg8Jksp3dIXIEC4FIR0Ush4uORvG3UtHZWk= -go.opentelemetry.io/collector v0.64.2-0.20221115155901-1550938c18fd/go.mod h1:mmSrOcwe1vEYmChXUYuF6rzlrUL0rjEiPfa19Xxb41o= -go.opentelemetry.io/collector/pdata v0.64.2-0.20221115155901-1550938c18fd h1:GdVAbRiae5VDZe3Mn3FqzMxO/aI5UbJ4+dcviqClHy8= -go.opentelemetry.io/collector/pdata v0.64.2-0.20221115155901-1550938c18fd/go.mod h1:0vynPfW2ZN7DltpcCFgCmTtWMQkCjp2a3TNt82YTCLQ= -go.opentelemetry.io/collector/semconv v0.64.2-0.20221115155901-1550938c18fd h1:rMqcl2pwi8YtVrtOPK8tVh87W0bFBge4yqB9ypSsAJ4= -go.opentelemetry.io/collector/semconv v0.64.2-0.20221115155901-1550938c18fd/go.mod h1:5o9yhOa+ABt7g2E5JABDxGZ1PQPbtfxrKNbYn+LOTXU= +go.opentelemetry.io/collector v0.64.2-0.20221117234814-4565692c50a7 h1:o/vMr2iyXzaeTb/KAldhMxAvRIfFPwtKfL5cKVKsSlU= +go.opentelemetry.io/collector v0.64.2-0.20221117234814-4565692c50a7/go.mod h1:PO8hayFFYvXDqELbXRVxwawR2HTdjN6mY4Qa3Se9xI8= +go.opentelemetry.io/collector/component v0.0.0-20221117234814-4565692c50a7 h1:q9m1bGHhQFUakQX79lZpLmFSY9VLULNSs2jUG8MdJLA= +go.opentelemetry.io/collector/component v0.0.0-20221117234814-4565692c50a7/go.mod h1:Z7H1Oj826e4dtVxXmT6SiUr6S0EIevUJmkVpfQV+UOk= +go.opentelemetry.io/collector/consumer v0.0.0-20221117234814-4565692c50a7 h1:FTy1JD9EJ7gq9SzlZoi2NkGcZ88+SwdiJav5uRcDEEY= +go.opentelemetry.io/collector/consumer v0.0.0-20221117234814-4565692c50a7/go.mod h1:86Elcw/LLrh90DprArogHMkBX3+UMu3tIgcVWF3mr6o= +go.opentelemetry.io/collector/featuregate v0.0.0-20221117214536-6a117bfc3737 h1:7sXg6M9Fw6rFVlX+iaWOMz6DFXEiroUdQer5kWGixwM= +go.opentelemetry.io/collector/featuregate v0.0.0-20221117214536-6a117bfc3737/go.mod h1:tewuFKJYalWBU0bmNKg++MC1ipINXUr6szYzOw2p1GI= +go.opentelemetry.io/collector/pdata v0.64.2-0.20221117234814-4565692c50a7 h1:IOFqfOu7fFxTgC7pvc2U7dk1/uFjwVQPK+CALiUvacI= +go.opentelemetry.io/collector/pdata v0.64.2-0.20221117234814-4565692c50a7/go.mod h1:0vynPfW2ZN7DltpcCFgCmTtWMQkCjp2a3TNt82YTCLQ= +go.opentelemetry.io/collector/semconv v0.64.2-0.20221117234814-4565692c50a7 h1:cGXAVltDxXw9nj0Vr7vyZZTj0whdyO+GYs+xv0xHJ2A= +go.opentelemetry.io/collector/semconv v0.64.2-0.20221117234814-4565692c50a7/go.mod h1:5o9yhOa+ABt7g2E5JABDxGZ1PQPbtfxrKNbYn+LOTXU= go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.36.4 h1:aUEBEdCa6iamGzg6fuYxDA8ThxvOG240mAvWDU+XLio= go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.36.4/go.mod h1:l2MdsbKTocpPS5nQZscqTR9jd8u96VYZdcpF8Sye7mA= go.opentelemetry.io/otel v1.11.1 h1:4WLLAmcfkmDk2ukNXJyq3/kiz/3UzCaYq6PskJsaou4= diff --git a/exporter/kafkaexporter/config_test.go b/exporter/kafkaexporter/config_test.go index 54c123a4c4256..4f6cf44d206b4 100644 --- a/exporter/kafkaexporter/config_test.go +++ b/exporter/kafkaexporter/config_test.go @@ -91,7 +91,7 @@ func TestLoadConfig(t *testing.T) { require.NoError(t, err) require.NoError(t, component.UnmarshalExporterConfig(sub, cfg)) - assert.NoError(t, cfg.Validate()) + assert.NoError(t, component.ValidateConfig(cfg)) assert.Equal(t, tt.expected, cfg) }) } diff --git a/exporter/kafkaexporter/go.mod b/exporter/kafkaexporter/go.mod index 3e1af2454be1f..1b8b3a40362af 100644 --- a/exporter/kafkaexporter/go.mod +++ b/exporter/kafkaexporter/go.mod @@ -11,9 +11,11 @@ require ( github.com/open-telemetry/opentelemetry-collector-contrib/pkg/translator/jaeger v0.64.0 github.com/stretchr/testify v1.8.1 github.com/xdg-go/scram v1.1.1 - go.opentelemetry.io/collector v0.64.2-0.20221115155901-1550938c18fd - go.opentelemetry.io/collector/pdata v0.64.2-0.20221115155901-1550938c18fd - go.opentelemetry.io/collector/semconv v0.64.2-0.20221115155901-1550938c18fd + go.opentelemetry.io/collector v0.64.2-0.20221117234814-4565692c50a7 + go.opentelemetry.io/collector/component v0.0.0-20221117234814-4565692c50a7 + go.opentelemetry.io/collector/consumer v0.0.0-20221117234814-4565692c50a7 + go.opentelemetry.io/collector/pdata v0.64.2-0.20221117234814-4565692c50a7 + go.opentelemetry.io/collector/semconv v0.64.2-0.20221117234814-4565692c50a7 go.uber.org/multierr v1.8.0 go.uber.org/zap v1.23.0 ) @@ -53,6 +55,7 @@ require ( github.com/xdg-go/pbkdf2 v1.0.0 // indirect github.com/xdg-go/stringprep v1.0.3 // indirect go.opencensus.io v0.24.0 // indirect + go.opentelemetry.io/collector/featuregate v0.0.0-20221117214536-6a117bfc3737 // indirect go.opentelemetry.io/otel v1.11.1 // indirect go.opentelemetry.io/otel/metric v0.33.0 // indirect go.opentelemetry.io/otel/trace v1.11.1 // indirect diff --git a/exporter/kafkaexporter/go.sum b/exporter/kafkaexporter/go.sum index e86a72feb7474..9cf1237ec0f80 100644 --- a/exporter/kafkaexporter/go.sum +++ b/exporter/kafkaexporter/go.sum @@ -334,12 +334,18 @@ go.etcd.io/etcd/client/pkg/v3 v3.5.4/go.mod h1:IJHfcCEKxYu1Os13ZdwCwIUTUVGYTSAM3 go.etcd.io/etcd/client/v3 v3.5.4/go.mod h1:ZaRkVgBZC+L+dLCjTcF1hRXpgZXQPOvnA/Ak/gq3kiY= go.opencensus.io v0.24.0 h1:y73uSU6J157QMP2kn2r30vwW1A2W2WFwSCGnAVxeaD0= go.opencensus.io v0.24.0/go.mod h1:vNK8G9p7aAivkbmorf4v+7Hgx+Zs0yY+0fOtgBfjQKo= -go.opentelemetry.io/collector v0.64.2-0.20221115155901-1550938c18fd h1:O+6HhE4Ivg8Jksp3dIXIEC4FIR0Ush4uORvG3UtHZWk= -go.opentelemetry.io/collector v0.64.2-0.20221115155901-1550938c18fd/go.mod h1:mmSrOcwe1vEYmChXUYuF6rzlrUL0rjEiPfa19Xxb41o= -go.opentelemetry.io/collector/pdata v0.64.2-0.20221115155901-1550938c18fd h1:GdVAbRiae5VDZe3Mn3FqzMxO/aI5UbJ4+dcviqClHy8= -go.opentelemetry.io/collector/pdata v0.64.2-0.20221115155901-1550938c18fd/go.mod h1:0vynPfW2ZN7DltpcCFgCmTtWMQkCjp2a3TNt82YTCLQ= -go.opentelemetry.io/collector/semconv v0.64.2-0.20221115155901-1550938c18fd h1:rMqcl2pwi8YtVrtOPK8tVh87W0bFBge4yqB9ypSsAJ4= -go.opentelemetry.io/collector/semconv v0.64.2-0.20221115155901-1550938c18fd/go.mod h1:5o9yhOa+ABt7g2E5JABDxGZ1PQPbtfxrKNbYn+LOTXU= +go.opentelemetry.io/collector v0.64.2-0.20221117234814-4565692c50a7 h1:o/vMr2iyXzaeTb/KAldhMxAvRIfFPwtKfL5cKVKsSlU= +go.opentelemetry.io/collector v0.64.2-0.20221117234814-4565692c50a7/go.mod h1:PO8hayFFYvXDqELbXRVxwawR2HTdjN6mY4Qa3Se9xI8= +go.opentelemetry.io/collector/component v0.0.0-20221117234814-4565692c50a7 h1:q9m1bGHhQFUakQX79lZpLmFSY9VLULNSs2jUG8MdJLA= +go.opentelemetry.io/collector/component v0.0.0-20221117234814-4565692c50a7/go.mod h1:Z7H1Oj826e4dtVxXmT6SiUr6S0EIevUJmkVpfQV+UOk= +go.opentelemetry.io/collector/consumer v0.0.0-20221117234814-4565692c50a7 h1:FTy1JD9EJ7gq9SzlZoi2NkGcZ88+SwdiJav5uRcDEEY= +go.opentelemetry.io/collector/consumer v0.0.0-20221117234814-4565692c50a7/go.mod h1:86Elcw/LLrh90DprArogHMkBX3+UMu3tIgcVWF3mr6o= +go.opentelemetry.io/collector/featuregate v0.0.0-20221117214536-6a117bfc3737 h1:7sXg6M9Fw6rFVlX+iaWOMz6DFXEiroUdQer5kWGixwM= +go.opentelemetry.io/collector/featuregate v0.0.0-20221117214536-6a117bfc3737/go.mod h1:tewuFKJYalWBU0bmNKg++MC1ipINXUr6szYzOw2p1GI= +go.opentelemetry.io/collector/pdata v0.64.2-0.20221117234814-4565692c50a7 h1:IOFqfOu7fFxTgC7pvc2U7dk1/uFjwVQPK+CALiUvacI= +go.opentelemetry.io/collector/pdata v0.64.2-0.20221117234814-4565692c50a7/go.mod h1:0vynPfW2ZN7DltpcCFgCmTtWMQkCjp2a3TNt82YTCLQ= +go.opentelemetry.io/collector/semconv v0.64.2-0.20221117234814-4565692c50a7 h1:cGXAVltDxXw9nj0Vr7vyZZTj0whdyO+GYs+xv0xHJ2A= +go.opentelemetry.io/collector/semconv v0.64.2-0.20221117234814-4565692c50a7/go.mod h1:5o9yhOa+ABt7g2E5JABDxGZ1PQPbtfxrKNbYn+LOTXU= go.opentelemetry.io/otel v1.11.1 h1:4WLLAmcfkmDk2ukNXJyq3/kiz/3UzCaYq6PskJsaou4= go.opentelemetry.io/otel v1.11.1/go.mod h1:1nNhXBbWSD0nsL38H6btgnFN2k4i0sNLHNNMZMSbUGE= go.opentelemetry.io/otel/exporters/prometheus v0.33.0 h1:xXhPj7SLKWU5/Zd4Hxmd+X1C4jdmvc0Xy+kvjFx2z60= diff --git a/exporter/loadbalancingexporter/go.mod b/exporter/loadbalancingexporter/go.mod index 21a60d8dbcef0..2c67f348c74da 100644 --- a/exporter/loadbalancingexporter/go.mod +++ b/exporter/loadbalancingexporter/go.mod @@ -6,10 +6,12 @@ require ( github.com/open-telemetry/opentelemetry-collector-contrib/pkg/batchpersignal v0.64.0 github.com/stretchr/testify v1.8.1 go.opencensus.io v0.24.0 - go.opentelemetry.io/collector v0.64.2-0.20221115155901-1550938c18fd - go.opentelemetry.io/collector/exporter/otlpexporter v0.64.2-0.20221115155901-1550938c18fd - go.opentelemetry.io/collector/pdata v0.64.2-0.20221115155901-1550938c18fd - go.opentelemetry.io/collector/semconv v0.64.2-0.20221115155901-1550938c18fd + go.opentelemetry.io/collector v0.64.2-0.20221117234814-4565692c50a7 + go.opentelemetry.io/collector/component v0.0.0-20221117234814-4565692c50a7 + go.opentelemetry.io/collector/consumer v0.0.0-20221117234814-4565692c50a7 + go.opentelemetry.io/collector/exporter/otlpexporter v0.64.2-0.20221117234814-4565692c50a7 + go.opentelemetry.io/collector/pdata v0.64.2-0.20221117234814-4565692c50a7 + go.opentelemetry.io/collector/semconv v0.64.2-0.20221117234814-4565692c50a7 go.uber.org/atomic v1.10.0 go.uber.org/multierr v1.8.0 go.uber.org/zap v1.23.0 @@ -59,7 +61,8 @@ require ( github.com/tklauser/go-sysconf v0.3.10 // indirect github.com/tklauser/numcpus v0.4.0 // indirect github.com/yusufpapurcu/wmi v1.2.2 // indirect - go.opentelemetry.io/collector/processor/batchprocessor v0.64.2-0.20221115155901-1550938c18fd // indirect + go.opentelemetry.io/collector/featuregate v0.0.0-20221117214536-6a117bfc3737 // indirect + go.opentelemetry.io/collector/processor/batchprocessor v0.64.2-0.20221117234814-4565692c50a7 // indirect go.opentelemetry.io/contrib/instrumentation/google.golang.org/grpc/otelgrpc v0.36.4 // indirect go.opentelemetry.io/contrib/propagators/b3 v1.11.1 // indirect go.opentelemetry.io/otel v1.11.1 // indirect diff --git a/exporter/loadbalancingexporter/go.sum b/exporter/loadbalancingexporter/go.sum index 8c7ce536054b6..11095139654da 100644 --- a/exporter/loadbalancingexporter/go.sum +++ b/exporter/loadbalancingexporter/go.sum @@ -418,17 +418,23 @@ go.opencensus.io v0.22.4/go.mod h1:yxeiOL68Rb0Xd1ddK5vPZ/oVn4vY4Ynel7k9FzqtOIw= go.opencensus.io v0.23.0/go.mod h1:XItmlyltB5F7CS4xOC1DcqMoFqwtC6OG2xF7mCv7P7E= go.opencensus.io v0.24.0 h1:y73uSU6J157QMP2kn2r30vwW1A2W2WFwSCGnAVxeaD0= go.opencensus.io v0.24.0/go.mod h1:vNK8G9p7aAivkbmorf4v+7Hgx+Zs0yY+0fOtgBfjQKo= -go.opentelemetry.io/collector v0.64.2-0.20221115155901-1550938c18fd h1:O+6HhE4Ivg8Jksp3dIXIEC4FIR0Ush4uORvG3UtHZWk= -go.opentelemetry.io/collector v0.64.2-0.20221115155901-1550938c18fd/go.mod h1:mmSrOcwe1vEYmChXUYuF6rzlrUL0rjEiPfa19Xxb41o= -go.opentelemetry.io/collector/exporter/otlpexporter v0.64.2-0.20221115155901-1550938c18fd h1:Aba3DLnRML3J2567NIKeXwryvHGwckIkXkmrA/C/BzI= -go.opentelemetry.io/collector/exporter/otlpexporter v0.64.2-0.20221115155901-1550938c18fd/go.mod h1:5bfOtQfZ3XtaIGfavOrh8gHn+vvUZ2kB27dIrw6T1aY= +go.opentelemetry.io/collector v0.64.2-0.20221117234814-4565692c50a7 h1:o/vMr2iyXzaeTb/KAldhMxAvRIfFPwtKfL5cKVKsSlU= +go.opentelemetry.io/collector v0.64.2-0.20221117234814-4565692c50a7/go.mod h1:PO8hayFFYvXDqELbXRVxwawR2HTdjN6mY4Qa3Se9xI8= +go.opentelemetry.io/collector/component v0.0.0-20221117234814-4565692c50a7 h1:q9m1bGHhQFUakQX79lZpLmFSY9VLULNSs2jUG8MdJLA= +go.opentelemetry.io/collector/component v0.0.0-20221117234814-4565692c50a7/go.mod h1:Z7H1Oj826e4dtVxXmT6SiUr6S0EIevUJmkVpfQV+UOk= +go.opentelemetry.io/collector/consumer v0.0.0-20221117234814-4565692c50a7 h1:FTy1JD9EJ7gq9SzlZoi2NkGcZ88+SwdiJav5uRcDEEY= +go.opentelemetry.io/collector/consumer v0.0.0-20221117234814-4565692c50a7/go.mod h1:86Elcw/LLrh90DprArogHMkBX3+UMu3tIgcVWF3mr6o= +go.opentelemetry.io/collector/exporter/otlpexporter v0.64.2-0.20221117234814-4565692c50a7 h1:Pw+375oxebSKKDDQjOFSMFSfopmx6gARuqTmQD1njGY= +go.opentelemetry.io/collector/exporter/otlpexporter v0.64.2-0.20221117234814-4565692c50a7/go.mod h1:X6iHDUlspR3fJ3zvZskB+d9/PXaC/zYMbHrtfvk9yNk= go.opentelemetry.io/collector/extension/zpagesextension v0.64.1 h1:2qTBtVigWNwPSpN9XR+WobC1idF2S8X/FIahFGCE1i4= -go.opentelemetry.io/collector/pdata v0.64.2-0.20221115155901-1550938c18fd h1:GdVAbRiae5VDZe3Mn3FqzMxO/aI5UbJ4+dcviqClHy8= -go.opentelemetry.io/collector/pdata v0.64.2-0.20221115155901-1550938c18fd/go.mod h1:0vynPfW2ZN7DltpcCFgCmTtWMQkCjp2a3TNt82YTCLQ= -go.opentelemetry.io/collector/processor/batchprocessor v0.64.2-0.20221115155901-1550938c18fd h1:SSjP8V0UP2+oPZ3gL+Dk90KQcvHXvHp9V5h8IIpx0og= -go.opentelemetry.io/collector/processor/batchprocessor v0.64.2-0.20221115155901-1550938c18fd/go.mod h1:zyCnX0aTvBaZ3XLWSHZdTueP7WoXRjz8X6HiWgKqstM= -go.opentelemetry.io/collector/semconv v0.64.2-0.20221115155901-1550938c18fd h1:rMqcl2pwi8YtVrtOPK8tVh87W0bFBge4yqB9ypSsAJ4= -go.opentelemetry.io/collector/semconv v0.64.2-0.20221115155901-1550938c18fd/go.mod h1:5o9yhOa+ABt7g2E5JABDxGZ1PQPbtfxrKNbYn+LOTXU= +go.opentelemetry.io/collector/featuregate v0.0.0-20221117214536-6a117bfc3737 h1:7sXg6M9Fw6rFVlX+iaWOMz6DFXEiroUdQer5kWGixwM= +go.opentelemetry.io/collector/featuregate v0.0.0-20221117214536-6a117bfc3737/go.mod h1:tewuFKJYalWBU0bmNKg++MC1ipINXUr6szYzOw2p1GI= +go.opentelemetry.io/collector/pdata v0.64.2-0.20221117234814-4565692c50a7 h1:IOFqfOu7fFxTgC7pvc2U7dk1/uFjwVQPK+CALiUvacI= +go.opentelemetry.io/collector/pdata v0.64.2-0.20221117234814-4565692c50a7/go.mod h1:0vynPfW2ZN7DltpcCFgCmTtWMQkCjp2a3TNt82YTCLQ= +go.opentelemetry.io/collector/processor/batchprocessor v0.64.2-0.20221117234814-4565692c50a7 h1:hGDq2T07j6qwwtQ2t6ZGU5tp/J2Dvu9mfY5qnnP5Ic8= +go.opentelemetry.io/collector/processor/batchprocessor v0.64.2-0.20221117234814-4565692c50a7/go.mod h1:b83iea2eDSAQkvd+2aSokaa6GRjSIsaR2zILziF/Ogc= +go.opentelemetry.io/collector/semconv v0.64.2-0.20221117234814-4565692c50a7 h1:cGXAVltDxXw9nj0Vr7vyZZTj0whdyO+GYs+xv0xHJ2A= +go.opentelemetry.io/collector/semconv v0.64.2-0.20221117234814-4565692c50a7/go.mod h1:5o9yhOa+ABt7g2E5JABDxGZ1PQPbtfxrKNbYn+LOTXU= go.opentelemetry.io/contrib/instrumentation/google.golang.org/grpc/otelgrpc v0.36.4 h1:PRXhsszxTt5bbPriTjmaweWUsAnJYeWBhUMLRetUgBU= go.opentelemetry.io/contrib/instrumentation/google.golang.org/grpc/otelgrpc v0.36.4/go.mod h1:05eWWy6ZWzmpeImD3UowLTB3VjDMU1yxQ+ENuVWDM3c= go.opentelemetry.io/contrib/propagators/b3 v1.11.1 h1:icQ6ttRV+r/2fnU46BIo/g/mPu6Rs5Ug8Rtohe3KqzI= diff --git a/exporter/loadbalancingexporter/loadbalancer_test.go b/exporter/loadbalancingexporter/loadbalancer_test.go index 16a92245d02b8..ad7af097e2b5d 100644 --- a/exporter/loadbalancingexporter/loadbalancer_test.go +++ b/exporter/loadbalancingexporter/loadbalancer_test.go @@ -241,7 +241,7 @@ func TestAddMissingExporters(t *testing.T) { _ component.ExporterConfig, ) (component.TracesExporter, error) { return newNopMockTracesExporter(), nil - }, component.StabilityLevelInDevelopment)) + }, component.StabilityLevelDevelopment)) fn := func(ctx context.Context, endpoint string) (component.Exporter, error) { oCfg := cfg.Protocol.OTLP oCfg.Endpoint = endpoint @@ -275,7 +275,7 @@ func TestFailedToAddMissingExporters(t *testing.T) { _ component.ExporterConfig, ) (component.TracesExporter, error) { return nil, expectedErr - }, component.StabilityLevelInDevelopment)) + }, component.StabilityLevelDevelopment)) fn := func(ctx context.Context, endpoint string) (component.Exporter, error) { oCfg := cfg.Protocol.OTLP oCfg.Endpoint = endpoint diff --git a/exporter/logzioexporter/go.mod b/exporter/logzioexporter/go.mod index a4e467a8daab8..1cdd69ed786fe 100644 --- a/exporter/logzioexporter/go.mod +++ b/exporter/logzioexporter/go.mod @@ -8,9 +8,11 @@ require ( github.com/open-telemetry/opentelemetry-collector-contrib/internal/coreinternal v0.64.0 github.com/open-telemetry/opentelemetry-collector-contrib/pkg/translator/jaeger v0.64.0 github.com/stretchr/testify v1.8.1 - go.opentelemetry.io/collector v0.64.2-0.20221115155901-1550938c18fd - go.opentelemetry.io/collector/pdata v0.64.2-0.20221115155901-1550938c18fd - go.opentelemetry.io/collector/semconv v0.64.2-0.20221115155901-1550938c18fd + go.opentelemetry.io/collector v0.64.2-0.20221117234814-4565692c50a7 + go.opentelemetry.io/collector/component v0.0.0-20221117234814-4565692c50a7 + go.opentelemetry.io/collector/consumer v0.0.0-20221117234814-4565692c50a7 + go.opentelemetry.io/collector/pdata v0.64.2-0.20221117234814-4565692c50a7 + go.opentelemetry.io/collector/semconv v0.64.2-0.20221117234814-4565692c50a7 go.uber.org/zap v1.23.0 google.golang.org/genproto v0.0.0-20221027153422-115e99e71e1c google.golang.org/protobuf v1.28.1 @@ -43,6 +45,7 @@ require ( github.com/uber/jaeger-client-go v2.30.0+incompatible // indirect github.com/uber/jaeger-lib v2.4.1+incompatible // indirect go.opencensus.io v0.24.0 // indirect + go.opentelemetry.io/collector/featuregate v0.0.0-20221117214536-6a117bfc3737 // indirect go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.36.4 // indirect go.opentelemetry.io/otel v1.11.1 // indirect go.opentelemetry.io/otel/metric v0.33.0 // indirect diff --git a/exporter/logzioexporter/go.sum b/exporter/logzioexporter/go.sum index fcb399baad28e..e13c19d5e5278 100644 --- a/exporter/logzioexporter/go.sum +++ b/exporter/logzioexporter/go.sum @@ -306,12 +306,18 @@ go.etcd.io/etcd/client/pkg/v3 v3.5.4/go.mod h1:IJHfcCEKxYu1Os13ZdwCwIUTUVGYTSAM3 go.etcd.io/etcd/client/v3 v3.5.4/go.mod h1:ZaRkVgBZC+L+dLCjTcF1hRXpgZXQPOvnA/Ak/gq3kiY= go.opencensus.io v0.24.0 h1:y73uSU6J157QMP2kn2r30vwW1A2W2WFwSCGnAVxeaD0= go.opencensus.io v0.24.0/go.mod h1:vNK8G9p7aAivkbmorf4v+7Hgx+Zs0yY+0fOtgBfjQKo= -go.opentelemetry.io/collector v0.64.2-0.20221115155901-1550938c18fd h1:O+6HhE4Ivg8Jksp3dIXIEC4FIR0Ush4uORvG3UtHZWk= -go.opentelemetry.io/collector v0.64.2-0.20221115155901-1550938c18fd/go.mod h1:mmSrOcwe1vEYmChXUYuF6rzlrUL0rjEiPfa19Xxb41o= -go.opentelemetry.io/collector/pdata v0.64.2-0.20221115155901-1550938c18fd h1:GdVAbRiae5VDZe3Mn3FqzMxO/aI5UbJ4+dcviqClHy8= -go.opentelemetry.io/collector/pdata v0.64.2-0.20221115155901-1550938c18fd/go.mod h1:0vynPfW2ZN7DltpcCFgCmTtWMQkCjp2a3TNt82YTCLQ= -go.opentelemetry.io/collector/semconv v0.64.2-0.20221115155901-1550938c18fd h1:rMqcl2pwi8YtVrtOPK8tVh87W0bFBge4yqB9ypSsAJ4= -go.opentelemetry.io/collector/semconv v0.64.2-0.20221115155901-1550938c18fd/go.mod h1:5o9yhOa+ABt7g2E5JABDxGZ1PQPbtfxrKNbYn+LOTXU= +go.opentelemetry.io/collector v0.64.2-0.20221117234814-4565692c50a7 h1:o/vMr2iyXzaeTb/KAldhMxAvRIfFPwtKfL5cKVKsSlU= +go.opentelemetry.io/collector v0.64.2-0.20221117234814-4565692c50a7/go.mod h1:PO8hayFFYvXDqELbXRVxwawR2HTdjN6mY4Qa3Se9xI8= +go.opentelemetry.io/collector/component v0.0.0-20221117234814-4565692c50a7 h1:q9m1bGHhQFUakQX79lZpLmFSY9VLULNSs2jUG8MdJLA= +go.opentelemetry.io/collector/component v0.0.0-20221117234814-4565692c50a7/go.mod h1:Z7H1Oj826e4dtVxXmT6SiUr6S0EIevUJmkVpfQV+UOk= +go.opentelemetry.io/collector/consumer v0.0.0-20221117234814-4565692c50a7 h1:FTy1JD9EJ7gq9SzlZoi2NkGcZ88+SwdiJav5uRcDEEY= +go.opentelemetry.io/collector/consumer v0.0.0-20221117234814-4565692c50a7/go.mod h1:86Elcw/LLrh90DprArogHMkBX3+UMu3tIgcVWF3mr6o= +go.opentelemetry.io/collector/featuregate v0.0.0-20221117214536-6a117bfc3737 h1:7sXg6M9Fw6rFVlX+iaWOMz6DFXEiroUdQer5kWGixwM= +go.opentelemetry.io/collector/featuregate v0.0.0-20221117214536-6a117bfc3737/go.mod h1:tewuFKJYalWBU0bmNKg++MC1ipINXUr6szYzOw2p1GI= +go.opentelemetry.io/collector/pdata v0.64.2-0.20221117234814-4565692c50a7 h1:IOFqfOu7fFxTgC7pvc2U7dk1/uFjwVQPK+CALiUvacI= +go.opentelemetry.io/collector/pdata v0.64.2-0.20221117234814-4565692c50a7/go.mod h1:0vynPfW2ZN7DltpcCFgCmTtWMQkCjp2a3TNt82YTCLQ= +go.opentelemetry.io/collector/semconv v0.64.2-0.20221117234814-4565692c50a7 h1:cGXAVltDxXw9nj0Vr7vyZZTj0whdyO+GYs+xv0xHJ2A= +go.opentelemetry.io/collector/semconv v0.64.2-0.20221117234814-4565692c50a7/go.mod h1:5o9yhOa+ABt7g2E5JABDxGZ1PQPbtfxrKNbYn+LOTXU= go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.36.4 h1:aUEBEdCa6iamGzg6fuYxDA8ThxvOG240mAvWDU+XLio= go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.36.4/go.mod h1:l2MdsbKTocpPS5nQZscqTR9jd8u96VYZdcpF8Sye7mA= go.opentelemetry.io/otel v1.11.1 h1:4WLLAmcfkmDk2ukNXJyq3/kiz/3UzCaYq6PskJsaou4= diff --git a/exporter/lokiexporter/config_test.go b/exporter/lokiexporter/config_test.go index d3aef8ed991ca..5cd22220f51eb 100644 --- a/exporter/lokiexporter/config_test.go +++ b/exporter/lokiexporter/config_test.go @@ -84,7 +84,7 @@ func TestLoadConfigNewExporter(t *testing.T) { require.NoError(t, err) require.NoError(t, component.UnmarshalExporterConfig(sub, cfg)) - assert.NoError(t, cfg.Validate()) + assert.NoError(t, component.ValidateConfig(cfg)) assert.Equal(t, tt.expected, cfg) }) } diff --git a/exporter/lokiexporter/go.mod b/exporter/lokiexporter/go.mod index 0e66cd5a159ae..b3c60a47ee2c1 100644 --- a/exporter/lokiexporter/go.mod +++ b/exporter/lokiexporter/go.mod @@ -11,9 +11,11 @@ require ( github.com/open-telemetry/opentelemetry-collector-contrib/pkg/translator/loki v0.64.0 github.com/prometheus/common v0.37.0 github.com/stretchr/testify v1.8.1 - go.opentelemetry.io/collector v0.64.2-0.20221115155901-1550938c18fd - go.opentelemetry.io/collector/pdata v0.64.2-0.20221115155901-1550938c18fd - go.opentelemetry.io/collector/semconv v0.64.2-0.20221115155901-1550938c18fd + go.opentelemetry.io/collector v0.64.2-0.20221117234814-4565692c50a7 + go.opentelemetry.io/collector/component v0.0.0-20221117234814-4565692c50a7 + go.opentelemetry.io/collector/consumer v0.0.0-20221117234814-4565692c50a7 + go.opentelemetry.io/collector/pdata v0.64.2-0.20221117234814-4565692c50a7 + go.opentelemetry.io/collector/semconv v0.64.2-0.20221117234814-4565692c50a7 go.uber.org/multierr v1.8.0 go.uber.org/zap v1.23.0 ) @@ -96,6 +98,7 @@ require ( go.etcd.io/etcd/client/pkg/v3 v3.5.4 // indirect go.etcd.io/etcd/client/v3 v3.5.4 // indirect go.opencensus.io v0.24.0 // indirect + go.opentelemetry.io/collector/featuregate v0.0.0-20221117214536-6a117bfc3737 // indirect go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.36.4 // indirect go.opentelemetry.io/otel v1.11.1 // indirect go.opentelemetry.io/otel/metric v0.33.0 // indirect diff --git a/exporter/lokiexporter/go.sum b/exporter/lokiexporter/go.sum index f150ea21181ea..91bf46725f374 100644 --- a/exporter/lokiexporter/go.sum +++ b/exporter/lokiexporter/go.sum @@ -1181,12 +1181,18 @@ go.opencensus.io v0.22.5/go.mod h1:5pWMHQbX5EPX2/62yrJeAkowc+lfs/XD7Uxpq3pI6kk= go.opencensus.io v0.23.0/go.mod h1:XItmlyltB5F7CS4xOC1DcqMoFqwtC6OG2xF7mCv7P7E= go.opencensus.io v0.24.0 h1:y73uSU6J157QMP2kn2r30vwW1A2W2WFwSCGnAVxeaD0= go.opencensus.io v0.24.0/go.mod h1:vNK8G9p7aAivkbmorf4v+7Hgx+Zs0yY+0fOtgBfjQKo= -go.opentelemetry.io/collector v0.64.2-0.20221115155901-1550938c18fd h1:O+6HhE4Ivg8Jksp3dIXIEC4FIR0Ush4uORvG3UtHZWk= -go.opentelemetry.io/collector v0.64.2-0.20221115155901-1550938c18fd/go.mod h1:mmSrOcwe1vEYmChXUYuF6rzlrUL0rjEiPfa19Xxb41o= -go.opentelemetry.io/collector/pdata v0.64.2-0.20221115155901-1550938c18fd h1:GdVAbRiae5VDZe3Mn3FqzMxO/aI5UbJ4+dcviqClHy8= -go.opentelemetry.io/collector/pdata v0.64.2-0.20221115155901-1550938c18fd/go.mod h1:0vynPfW2ZN7DltpcCFgCmTtWMQkCjp2a3TNt82YTCLQ= -go.opentelemetry.io/collector/semconv v0.64.2-0.20221115155901-1550938c18fd h1:rMqcl2pwi8YtVrtOPK8tVh87W0bFBge4yqB9ypSsAJ4= -go.opentelemetry.io/collector/semconv v0.64.2-0.20221115155901-1550938c18fd/go.mod h1:5o9yhOa+ABt7g2E5JABDxGZ1PQPbtfxrKNbYn+LOTXU= +go.opentelemetry.io/collector v0.64.2-0.20221117234814-4565692c50a7 h1:o/vMr2iyXzaeTb/KAldhMxAvRIfFPwtKfL5cKVKsSlU= +go.opentelemetry.io/collector v0.64.2-0.20221117234814-4565692c50a7/go.mod h1:PO8hayFFYvXDqELbXRVxwawR2HTdjN6mY4Qa3Se9xI8= +go.opentelemetry.io/collector/component v0.0.0-20221117234814-4565692c50a7 h1:q9m1bGHhQFUakQX79lZpLmFSY9VLULNSs2jUG8MdJLA= +go.opentelemetry.io/collector/component v0.0.0-20221117234814-4565692c50a7/go.mod h1:Z7H1Oj826e4dtVxXmT6SiUr6S0EIevUJmkVpfQV+UOk= +go.opentelemetry.io/collector/consumer v0.0.0-20221117234814-4565692c50a7 h1:FTy1JD9EJ7gq9SzlZoi2NkGcZ88+SwdiJav5uRcDEEY= +go.opentelemetry.io/collector/consumer v0.0.0-20221117234814-4565692c50a7/go.mod h1:86Elcw/LLrh90DprArogHMkBX3+UMu3tIgcVWF3mr6o= +go.opentelemetry.io/collector/featuregate v0.0.0-20221117214536-6a117bfc3737 h1:7sXg6M9Fw6rFVlX+iaWOMz6DFXEiroUdQer5kWGixwM= +go.opentelemetry.io/collector/featuregate v0.0.0-20221117214536-6a117bfc3737/go.mod h1:tewuFKJYalWBU0bmNKg++MC1ipINXUr6szYzOw2p1GI= +go.opentelemetry.io/collector/pdata v0.64.2-0.20221117234814-4565692c50a7 h1:IOFqfOu7fFxTgC7pvc2U7dk1/uFjwVQPK+CALiUvacI= +go.opentelemetry.io/collector/pdata v0.64.2-0.20221117234814-4565692c50a7/go.mod h1:0vynPfW2ZN7DltpcCFgCmTtWMQkCjp2a3TNt82YTCLQ= +go.opentelemetry.io/collector/semconv v0.64.2-0.20221117234814-4565692c50a7 h1:cGXAVltDxXw9nj0Vr7vyZZTj0whdyO+GYs+xv0xHJ2A= +go.opentelemetry.io/collector/semconv v0.64.2-0.20221117234814-4565692c50a7/go.mod h1:5o9yhOa+ABt7g2E5JABDxGZ1PQPbtfxrKNbYn+LOTXU= go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.29.0/go.mod h1:tLYsuf2v8fZreBVwp9gVMhefZlLFZaUiNVSq8QxXRII= go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.36.4 h1:aUEBEdCa6iamGzg6fuYxDA8ThxvOG240mAvWDU+XLio= go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.36.4/go.mod h1:l2MdsbKTocpPS5nQZscqTR9jd8u96VYZdcpF8Sye7mA= diff --git a/exporter/lokiexporter/legacy_config_test.go b/exporter/lokiexporter/legacy_config_test.go index d9d7a8fe6d8aa..60042ebd63c16 100644 --- a/exporter/lokiexporter/legacy_config_test.go +++ b/exporter/lokiexporter/legacy_config_test.go @@ -140,7 +140,7 @@ func TestLoadConfig(t *testing.T) { require.NoError(t, err) require.NoError(t, component.UnmarshalExporterConfig(sub, cfg)) - assert.NoError(t, cfg.Validate()) + assert.NoError(t, component.ValidateConfig(cfg)) assert.Equal(t, tt.expected, cfg) }) } @@ -316,7 +316,7 @@ func TestConfig_validate(t *testing.T) { cfg.Tenant = tt.fields.Tenant } - err := cfg.Validate() + err := component.ValidateConfig(cfg) if (err != nil) != tt.shouldError { t.Errorf("validate() error = %v, shouldError %v", err, tt.shouldError) return diff --git a/exporter/mezmoexporter/config_test.go b/exporter/mezmoexporter/config_test.go index b588217daed48..141e7990c6e3c 100644 --- a/exporter/mezmoexporter/config_test.go +++ b/exporter/mezmoexporter/config_test.go @@ -79,7 +79,7 @@ func TestLoadConfig(t *testing.T) { require.NoError(t, err) require.NoError(t, component.UnmarshalExporterConfig(sub, cfg)) - assert.NoError(t, cfg.Validate()) + assert.NoError(t, component.ValidateConfig(cfg)) assert.Equal(t, tt.expected, cfg) }) } diff --git a/exporter/mezmoexporter/go.mod b/exporter/mezmoexporter/go.mod index e5a5832957e84..5dd274cec4cdc 100644 --- a/exporter/mezmoexporter/go.mod +++ b/exporter/mezmoexporter/go.mod @@ -4,9 +4,10 @@ go 1.18 require ( github.com/stretchr/testify v1.8.1 - go.opentelemetry.io/collector v0.64.2-0.20221115155901-1550938c18fd - go.opentelemetry.io/collector/pdata v0.64.2-0.20221115155901-1550938c18fd - go.opentelemetry.io/collector/semconv v0.64.2-0.20221115155901-1550938c18fd + go.opentelemetry.io/collector v0.64.2-0.20221117234814-4565692c50a7 + go.opentelemetry.io/collector/component v0.0.0-20221117234814-4565692c50a7 + go.opentelemetry.io/collector/pdata v0.64.2-0.20221117234814-4565692c50a7 + go.opentelemetry.io/collector/semconv v0.64.2-0.20221117234814-4565692c50a7 go.uber.org/zap v1.23.0 ) @@ -30,6 +31,8 @@ require ( github.com/pmezard/go-difflib v1.0.0 // indirect github.com/rs/cors v1.8.2 // indirect go.opencensus.io v0.24.0 // indirect + go.opentelemetry.io/collector/consumer v0.0.0-20221117234814-4565692c50a7 // indirect + go.opentelemetry.io/collector/featuregate v0.0.0-20221117214536-6a117bfc3737 // indirect go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.36.4 // indirect go.opentelemetry.io/otel v1.11.1 // indirect go.opentelemetry.io/otel/metric v0.33.0 // indirect diff --git a/exporter/mezmoexporter/go.sum b/exporter/mezmoexporter/go.sum index 567e75a7a57e5..a1718891dcaf5 100644 --- a/exporter/mezmoexporter/go.sum +++ b/exporter/mezmoexporter/go.sum @@ -289,12 +289,18 @@ go.etcd.io/etcd/client/pkg/v3 v3.5.4/go.mod h1:IJHfcCEKxYu1Os13ZdwCwIUTUVGYTSAM3 go.etcd.io/etcd/client/v3 v3.5.4/go.mod h1:ZaRkVgBZC+L+dLCjTcF1hRXpgZXQPOvnA/Ak/gq3kiY= go.opencensus.io v0.24.0 h1:y73uSU6J157QMP2kn2r30vwW1A2W2WFwSCGnAVxeaD0= go.opencensus.io v0.24.0/go.mod h1:vNK8G9p7aAivkbmorf4v+7Hgx+Zs0yY+0fOtgBfjQKo= -go.opentelemetry.io/collector v0.64.2-0.20221115155901-1550938c18fd h1:O+6HhE4Ivg8Jksp3dIXIEC4FIR0Ush4uORvG3UtHZWk= -go.opentelemetry.io/collector v0.64.2-0.20221115155901-1550938c18fd/go.mod h1:mmSrOcwe1vEYmChXUYuF6rzlrUL0rjEiPfa19Xxb41o= -go.opentelemetry.io/collector/pdata v0.64.2-0.20221115155901-1550938c18fd h1:GdVAbRiae5VDZe3Mn3FqzMxO/aI5UbJ4+dcviqClHy8= -go.opentelemetry.io/collector/pdata v0.64.2-0.20221115155901-1550938c18fd/go.mod h1:0vynPfW2ZN7DltpcCFgCmTtWMQkCjp2a3TNt82YTCLQ= -go.opentelemetry.io/collector/semconv v0.64.2-0.20221115155901-1550938c18fd h1:rMqcl2pwi8YtVrtOPK8tVh87W0bFBge4yqB9ypSsAJ4= -go.opentelemetry.io/collector/semconv v0.64.2-0.20221115155901-1550938c18fd/go.mod h1:5o9yhOa+ABt7g2E5JABDxGZ1PQPbtfxrKNbYn+LOTXU= +go.opentelemetry.io/collector v0.64.2-0.20221117234814-4565692c50a7 h1:o/vMr2iyXzaeTb/KAldhMxAvRIfFPwtKfL5cKVKsSlU= +go.opentelemetry.io/collector v0.64.2-0.20221117234814-4565692c50a7/go.mod h1:PO8hayFFYvXDqELbXRVxwawR2HTdjN6mY4Qa3Se9xI8= +go.opentelemetry.io/collector/component v0.0.0-20221117234814-4565692c50a7 h1:q9m1bGHhQFUakQX79lZpLmFSY9VLULNSs2jUG8MdJLA= +go.opentelemetry.io/collector/component v0.0.0-20221117234814-4565692c50a7/go.mod h1:Z7H1Oj826e4dtVxXmT6SiUr6S0EIevUJmkVpfQV+UOk= +go.opentelemetry.io/collector/consumer v0.0.0-20221117234814-4565692c50a7 h1:FTy1JD9EJ7gq9SzlZoi2NkGcZ88+SwdiJav5uRcDEEY= +go.opentelemetry.io/collector/consumer v0.0.0-20221117234814-4565692c50a7/go.mod h1:86Elcw/LLrh90DprArogHMkBX3+UMu3tIgcVWF3mr6o= +go.opentelemetry.io/collector/featuregate v0.0.0-20221117214536-6a117bfc3737 h1:7sXg6M9Fw6rFVlX+iaWOMz6DFXEiroUdQer5kWGixwM= +go.opentelemetry.io/collector/featuregate v0.0.0-20221117214536-6a117bfc3737/go.mod h1:tewuFKJYalWBU0bmNKg++MC1ipINXUr6szYzOw2p1GI= +go.opentelemetry.io/collector/pdata v0.64.2-0.20221117234814-4565692c50a7 h1:IOFqfOu7fFxTgC7pvc2U7dk1/uFjwVQPK+CALiUvacI= +go.opentelemetry.io/collector/pdata v0.64.2-0.20221117234814-4565692c50a7/go.mod h1:0vynPfW2ZN7DltpcCFgCmTtWMQkCjp2a3TNt82YTCLQ= +go.opentelemetry.io/collector/semconv v0.64.2-0.20221117234814-4565692c50a7 h1:cGXAVltDxXw9nj0Vr7vyZZTj0whdyO+GYs+xv0xHJ2A= +go.opentelemetry.io/collector/semconv v0.64.2-0.20221117234814-4565692c50a7/go.mod h1:5o9yhOa+ABt7g2E5JABDxGZ1PQPbtfxrKNbYn+LOTXU= go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.36.4 h1:aUEBEdCa6iamGzg6fuYxDA8ThxvOG240mAvWDU+XLio= go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.36.4/go.mod h1:l2MdsbKTocpPS5nQZscqTR9jd8u96VYZdcpF8Sye7mA= go.opentelemetry.io/otel v1.11.1 h1:4WLLAmcfkmDk2ukNXJyq3/kiz/3UzCaYq6PskJsaou4= diff --git a/exporter/opencensusexporter/config_test.go b/exporter/opencensusexporter/config_test.go index ce1fe8e53f06e..bd6c1d8e44283 100644 --- a/exporter/opencensusexporter/config_test.go +++ b/exporter/opencensusexporter/config_test.go @@ -94,7 +94,7 @@ func TestLoadConfig(t *testing.T) { require.NoError(t, err) require.NoError(t, component.UnmarshalExporterConfig(sub, cfg)) - assert.NoError(t, cfg.Validate()) + assert.NoError(t, component.ValidateConfig(cfg)) assert.Equal(t, tt.expected, cfg) }) } diff --git a/exporter/opencensusexporter/go.mod b/exporter/opencensusexporter/go.mod index 6371059ff6098..7a5647797c213 100644 --- a/exporter/opencensusexporter/go.mod +++ b/exporter/opencensusexporter/go.mod @@ -9,8 +9,10 @@ require ( github.com/open-telemetry/opentelemetry-collector-contrib/pkg/translator/opencensus v0.64.0 github.com/open-telemetry/opentelemetry-collector-contrib/receiver/opencensusreceiver v0.64.0 github.com/stretchr/testify v1.8.1 - go.opentelemetry.io/collector v0.64.2-0.20221115155901-1550938c18fd - go.opentelemetry.io/collector/pdata v0.64.2-0.20221115155901-1550938c18fd + go.opentelemetry.io/collector v0.64.2-0.20221117234814-4565692c50a7 + go.opentelemetry.io/collector/component v0.0.0-20221117234814-4565692c50a7 + go.opentelemetry.io/collector/consumer v0.0.0-20221117234814-4565692c50a7 + go.opentelemetry.io/collector/pdata v0.64.2-0.20221117234814-4565692c50a7 google.golang.org/grpc v1.50.1 ) @@ -38,7 +40,8 @@ require ( github.com/rs/cors v1.8.2 // indirect github.com/soheilhy/cmux v0.1.5 // indirect go.opencensus.io v0.24.0 // indirect - go.opentelemetry.io/collector/semconv v0.64.2-0.20221115155901-1550938c18fd // indirect + go.opentelemetry.io/collector/featuregate v0.0.0-20221117214536-6a117bfc3737 // indirect + go.opentelemetry.io/collector/semconv v0.64.2-0.20221117234814-4565692c50a7 // indirect go.opentelemetry.io/contrib/instrumentation/google.golang.org/grpc/otelgrpc v0.36.4 // indirect go.opentelemetry.io/otel v1.11.1 // indirect go.opentelemetry.io/otel/metric v0.33.0 // indirect diff --git a/exporter/opencensusexporter/go.sum b/exporter/opencensusexporter/go.sum index ea6087e05d646..962ca4b6842c7 100644 --- a/exporter/opencensusexporter/go.sum +++ b/exporter/opencensusexporter/go.sum @@ -319,12 +319,18 @@ go.etcd.io/etcd/client/v3 v3.5.4/go.mod h1:ZaRkVgBZC+L+dLCjTcF1hRXpgZXQPOvnA/Ak/ go.opencensus.io v0.23.0/go.mod h1:XItmlyltB5F7CS4xOC1DcqMoFqwtC6OG2xF7mCv7P7E= go.opencensus.io v0.24.0 h1:y73uSU6J157QMP2kn2r30vwW1A2W2WFwSCGnAVxeaD0= go.opencensus.io v0.24.0/go.mod h1:vNK8G9p7aAivkbmorf4v+7Hgx+Zs0yY+0fOtgBfjQKo= -go.opentelemetry.io/collector v0.64.2-0.20221115155901-1550938c18fd h1:O+6HhE4Ivg8Jksp3dIXIEC4FIR0Ush4uORvG3UtHZWk= -go.opentelemetry.io/collector v0.64.2-0.20221115155901-1550938c18fd/go.mod h1:mmSrOcwe1vEYmChXUYuF6rzlrUL0rjEiPfa19Xxb41o= -go.opentelemetry.io/collector/pdata v0.64.2-0.20221115155901-1550938c18fd h1:GdVAbRiae5VDZe3Mn3FqzMxO/aI5UbJ4+dcviqClHy8= -go.opentelemetry.io/collector/pdata v0.64.2-0.20221115155901-1550938c18fd/go.mod h1:0vynPfW2ZN7DltpcCFgCmTtWMQkCjp2a3TNt82YTCLQ= -go.opentelemetry.io/collector/semconv v0.64.2-0.20221115155901-1550938c18fd h1:rMqcl2pwi8YtVrtOPK8tVh87W0bFBge4yqB9ypSsAJ4= -go.opentelemetry.io/collector/semconv v0.64.2-0.20221115155901-1550938c18fd/go.mod h1:5o9yhOa+ABt7g2E5JABDxGZ1PQPbtfxrKNbYn+LOTXU= +go.opentelemetry.io/collector v0.64.2-0.20221117234814-4565692c50a7 h1:o/vMr2iyXzaeTb/KAldhMxAvRIfFPwtKfL5cKVKsSlU= +go.opentelemetry.io/collector v0.64.2-0.20221117234814-4565692c50a7/go.mod h1:PO8hayFFYvXDqELbXRVxwawR2HTdjN6mY4Qa3Se9xI8= +go.opentelemetry.io/collector/component v0.0.0-20221117234814-4565692c50a7 h1:q9m1bGHhQFUakQX79lZpLmFSY9VLULNSs2jUG8MdJLA= +go.opentelemetry.io/collector/component v0.0.0-20221117234814-4565692c50a7/go.mod h1:Z7H1Oj826e4dtVxXmT6SiUr6S0EIevUJmkVpfQV+UOk= +go.opentelemetry.io/collector/consumer v0.0.0-20221117234814-4565692c50a7 h1:FTy1JD9EJ7gq9SzlZoi2NkGcZ88+SwdiJav5uRcDEEY= +go.opentelemetry.io/collector/consumer v0.0.0-20221117234814-4565692c50a7/go.mod h1:86Elcw/LLrh90DprArogHMkBX3+UMu3tIgcVWF3mr6o= +go.opentelemetry.io/collector/featuregate v0.0.0-20221117214536-6a117bfc3737 h1:7sXg6M9Fw6rFVlX+iaWOMz6DFXEiroUdQer5kWGixwM= +go.opentelemetry.io/collector/featuregate v0.0.0-20221117214536-6a117bfc3737/go.mod h1:tewuFKJYalWBU0bmNKg++MC1ipINXUr6szYzOw2p1GI= +go.opentelemetry.io/collector/pdata v0.64.2-0.20221117234814-4565692c50a7 h1:IOFqfOu7fFxTgC7pvc2U7dk1/uFjwVQPK+CALiUvacI= +go.opentelemetry.io/collector/pdata v0.64.2-0.20221117234814-4565692c50a7/go.mod h1:0vynPfW2ZN7DltpcCFgCmTtWMQkCjp2a3TNt82YTCLQ= +go.opentelemetry.io/collector/semconv v0.64.2-0.20221117234814-4565692c50a7 h1:cGXAVltDxXw9nj0Vr7vyZZTj0whdyO+GYs+xv0xHJ2A= +go.opentelemetry.io/collector/semconv v0.64.2-0.20221117234814-4565692c50a7/go.mod h1:5o9yhOa+ABt7g2E5JABDxGZ1PQPbtfxrKNbYn+LOTXU= go.opentelemetry.io/contrib/instrumentation/google.golang.org/grpc/otelgrpc v0.36.4 h1:PRXhsszxTt5bbPriTjmaweWUsAnJYeWBhUMLRetUgBU= go.opentelemetry.io/contrib/instrumentation/google.golang.org/grpc/otelgrpc v0.36.4/go.mod h1:05eWWy6ZWzmpeImD3UowLTB3VjDMU1yxQ+ENuVWDM3c= go.opentelemetry.io/otel v1.11.1 h1:4WLLAmcfkmDk2ukNXJyq3/kiz/3UzCaYq6PskJsaou4= diff --git a/exporter/parquetexporter/factory.go b/exporter/parquetexporter/factory.go index a3ebd4ec12e73..0e04579355570 100644 --- a/exporter/parquetexporter/factory.go +++ b/exporter/parquetexporter/factory.go @@ -26,7 +26,7 @@ const ( // The value of "type" key in configuration. typeStr = "parquet" // The stability level of the exporter. - stability = component.StabilityLevelInDevelopment + stability = component.StabilityLevelDevelopment ) type Config struct { diff --git a/exporter/parquetexporter/go.mod b/exporter/parquetexporter/go.mod index 65e05ce3ca6d2..0f6a02b260fb0 100644 --- a/exporter/parquetexporter/go.mod +++ b/exporter/parquetexporter/go.mod @@ -3,8 +3,9 @@ module github.com/open-telemetry/opentelemetry-collector-contrib/exporter/parque go 1.18 require ( - go.opentelemetry.io/collector v0.64.2-0.20221115155901-1550938c18fd - go.opentelemetry.io/collector/pdata v0.64.2-0.20221115155901-1550938c18fd + go.opentelemetry.io/collector v0.64.2-0.20221117234814-4565692c50a7 + go.opentelemetry.io/collector/component v0.0.0-20221117234814-4565692c50a7 + go.opentelemetry.io/collector/pdata v0.64.2-0.20221117234814-4565692c50a7 ) require ( @@ -21,6 +22,8 @@ require ( github.com/modern-go/reflect2 v1.0.2 // indirect github.com/pelletier/go-toml v1.9.4 // indirect go.opencensus.io v0.24.0 // indirect + go.opentelemetry.io/collector/consumer v0.0.0-20221117234814-4565692c50a7 // indirect + go.opentelemetry.io/collector/featuregate v0.0.0-20221117214536-6a117bfc3737 // indirect go.opentelemetry.io/otel v1.11.1 // indirect go.opentelemetry.io/otel/metric v0.33.0 // indirect go.opentelemetry.io/otel/trace v1.11.1 // indirect diff --git a/exporter/parquetexporter/go.sum b/exporter/parquetexporter/go.sum index cee521ef6f76d..059902e6007ea 100644 --- a/exporter/parquetexporter/go.sum +++ b/exporter/parquetexporter/go.sum @@ -278,10 +278,16 @@ go.etcd.io/etcd/client/pkg/v3 v3.5.4/go.mod h1:IJHfcCEKxYu1Os13ZdwCwIUTUVGYTSAM3 go.etcd.io/etcd/client/v3 v3.5.4/go.mod h1:ZaRkVgBZC+L+dLCjTcF1hRXpgZXQPOvnA/Ak/gq3kiY= go.opencensus.io v0.24.0 h1:y73uSU6J157QMP2kn2r30vwW1A2W2WFwSCGnAVxeaD0= go.opencensus.io v0.24.0/go.mod h1:vNK8G9p7aAivkbmorf4v+7Hgx+Zs0yY+0fOtgBfjQKo= -go.opentelemetry.io/collector v0.64.2-0.20221115155901-1550938c18fd h1:O+6HhE4Ivg8Jksp3dIXIEC4FIR0Ush4uORvG3UtHZWk= -go.opentelemetry.io/collector v0.64.2-0.20221115155901-1550938c18fd/go.mod h1:mmSrOcwe1vEYmChXUYuF6rzlrUL0rjEiPfa19Xxb41o= -go.opentelemetry.io/collector/pdata v0.64.2-0.20221115155901-1550938c18fd h1:GdVAbRiae5VDZe3Mn3FqzMxO/aI5UbJ4+dcviqClHy8= -go.opentelemetry.io/collector/pdata v0.64.2-0.20221115155901-1550938c18fd/go.mod h1:0vynPfW2ZN7DltpcCFgCmTtWMQkCjp2a3TNt82YTCLQ= +go.opentelemetry.io/collector v0.64.2-0.20221117234814-4565692c50a7 h1:o/vMr2iyXzaeTb/KAldhMxAvRIfFPwtKfL5cKVKsSlU= +go.opentelemetry.io/collector v0.64.2-0.20221117234814-4565692c50a7/go.mod h1:PO8hayFFYvXDqELbXRVxwawR2HTdjN6mY4Qa3Se9xI8= +go.opentelemetry.io/collector/component v0.0.0-20221117234814-4565692c50a7 h1:q9m1bGHhQFUakQX79lZpLmFSY9VLULNSs2jUG8MdJLA= +go.opentelemetry.io/collector/component v0.0.0-20221117234814-4565692c50a7/go.mod h1:Z7H1Oj826e4dtVxXmT6SiUr6S0EIevUJmkVpfQV+UOk= +go.opentelemetry.io/collector/consumer v0.0.0-20221117234814-4565692c50a7 h1:FTy1JD9EJ7gq9SzlZoi2NkGcZ88+SwdiJav5uRcDEEY= +go.opentelemetry.io/collector/consumer v0.0.0-20221117234814-4565692c50a7/go.mod h1:86Elcw/LLrh90DprArogHMkBX3+UMu3tIgcVWF3mr6o= +go.opentelemetry.io/collector/featuregate v0.0.0-20221117214536-6a117bfc3737 h1:7sXg6M9Fw6rFVlX+iaWOMz6DFXEiroUdQer5kWGixwM= +go.opentelemetry.io/collector/featuregate v0.0.0-20221117214536-6a117bfc3737/go.mod h1:tewuFKJYalWBU0bmNKg++MC1ipINXUr6szYzOw2p1GI= +go.opentelemetry.io/collector/pdata v0.64.2-0.20221117234814-4565692c50a7 h1:IOFqfOu7fFxTgC7pvc2U7dk1/uFjwVQPK+CALiUvacI= +go.opentelemetry.io/collector/pdata v0.64.2-0.20221117234814-4565692c50a7/go.mod h1:0vynPfW2ZN7DltpcCFgCmTtWMQkCjp2a3TNt82YTCLQ= go.opentelemetry.io/otel v1.11.1 h1:4WLLAmcfkmDk2ukNXJyq3/kiz/3UzCaYq6PskJsaou4= go.opentelemetry.io/otel v1.11.1/go.mod h1:1nNhXBbWSD0nsL38H6btgnFN2k4i0sNLHNNMZMSbUGE= go.opentelemetry.io/otel/exporters/prometheus v0.33.0 h1:xXhPj7SLKWU5/Zd4Hxmd+X1C4jdmvc0Xy+kvjFx2z60= diff --git a/exporter/prometheusexporter/config_test.go b/exporter/prometheusexporter/config_test.go index cfc51c1996ce6..fd3b8526f153c 100644 --- a/exporter/prometheusexporter/config_test.go +++ b/exporter/prometheusexporter/config_test.go @@ -76,7 +76,7 @@ func TestLoadConfig(t *testing.T) { require.NoError(t, err) require.NoError(t, component.UnmarshalExporterConfig(sub, cfg)) - assert.NoError(t, cfg.Validate()) + assert.NoError(t, component.ValidateConfig(cfg)) assert.Equal(t, tt.expected, cfg) }) } diff --git a/exporter/prometheusexporter/go.mod b/exporter/prometheusexporter/go.mod index f7caa405e3db7..c5b9dd98a6eaf 100644 --- a/exporter/prometheusexporter/go.mod +++ b/exporter/prometheusexporter/go.mod @@ -12,9 +12,11 @@ require ( github.com/prometheus/common v0.37.0 github.com/prometheus/prometheus v0.38.0 github.com/stretchr/testify v1.8.1 - go.opentelemetry.io/collector v0.64.2-0.20221115155901-1550938c18fd - go.opentelemetry.io/collector/pdata v0.64.2-0.20221115155901-1550938c18fd - go.opentelemetry.io/collector/semconv v0.64.2-0.20221115155901-1550938c18fd + go.opentelemetry.io/collector v0.64.2-0.20221117234814-4565692c50a7 + go.opentelemetry.io/collector/component v0.0.0-20221117234814-4565692c50a7 + go.opentelemetry.io/collector/consumer v0.0.0-20221117234814-4565692c50a7 + go.opentelemetry.io/collector/pdata v0.64.2-0.20221117234814-4565692c50a7 + go.opentelemetry.io/collector/semconv v0.64.2-0.20221117234814-4565692c50a7 go.uber.org/zap v1.23.0 gopkg.in/yaml.v2 v2.4.0 ) @@ -125,6 +127,7 @@ require ( github.com/spf13/pflag v1.0.5 // indirect github.com/vultr/govultr/v2 v2.17.2 // indirect go.opencensus.io v0.24.0 // indirect + go.opentelemetry.io/collector/featuregate v0.0.0-20221117214536-6a117bfc3737 // indirect go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.36.4 // indirect go.opentelemetry.io/otel v1.11.1 // indirect go.opentelemetry.io/otel/metric v0.33.0 // indirect diff --git a/exporter/prometheusexporter/go.sum b/exporter/prometheusexporter/go.sum index 9918e7f329fca..920cfd656bfae 100644 --- a/exporter/prometheusexporter/go.sum +++ b/exporter/prometheusexporter/go.sum @@ -623,13 +623,19 @@ go.opencensus.io v0.22.3/go.mod h1:yxeiOL68Rb0Xd1ddK5vPZ/oVn4vY4Ynel7k9FzqtOIw= go.opencensus.io v0.22.4/go.mod h1:yxeiOL68Rb0Xd1ddK5vPZ/oVn4vY4Ynel7k9FzqtOIw= go.opencensus.io v0.24.0 h1:y73uSU6J157QMP2kn2r30vwW1A2W2WFwSCGnAVxeaD0= go.opencensus.io v0.24.0/go.mod h1:vNK8G9p7aAivkbmorf4v+7Hgx+Zs0yY+0fOtgBfjQKo= -go.opentelemetry.io/collector v0.64.2-0.20221115155901-1550938c18fd h1:O+6HhE4Ivg8Jksp3dIXIEC4FIR0Ush4uORvG3UtHZWk= -go.opentelemetry.io/collector v0.64.2-0.20221115155901-1550938c18fd/go.mod h1:mmSrOcwe1vEYmChXUYuF6rzlrUL0rjEiPfa19Xxb41o= -go.opentelemetry.io/collector/pdata v0.64.2-0.20221115155901-1550938c18fd h1:GdVAbRiae5VDZe3Mn3FqzMxO/aI5UbJ4+dcviqClHy8= -go.opentelemetry.io/collector/pdata v0.64.2-0.20221115155901-1550938c18fd/go.mod h1:0vynPfW2ZN7DltpcCFgCmTtWMQkCjp2a3TNt82YTCLQ= -go.opentelemetry.io/collector/processor/batchprocessor v0.64.2-0.20221115155901-1550938c18fd h1:SSjP8V0UP2+oPZ3gL+Dk90KQcvHXvHp9V5h8IIpx0og= -go.opentelemetry.io/collector/semconv v0.64.2-0.20221115155901-1550938c18fd h1:rMqcl2pwi8YtVrtOPK8tVh87W0bFBge4yqB9ypSsAJ4= -go.opentelemetry.io/collector/semconv v0.64.2-0.20221115155901-1550938c18fd/go.mod h1:5o9yhOa+ABt7g2E5JABDxGZ1PQPbtfxrKNbYn+LOTXU= +go.opentelemetry.io/collector v0.64.2-0.20221117234814-4565692c50a7 h1:o/vMr2iyXzaeTb/KAldhMxAvRIfFPwtKfL5cKVKsSlU= +go.opentelemetry.io/collector v0.64.2-0.20221117234814-4565692c50a7/go.mod h1:PO8hayFFYvXDqELbXRVxwawR2HTdjN6mY4Qa3Se9xI8= +go.opentelemetry.io/collector/component v0.0.0-20221117234814-4565692c50a7 h1:q9m1bGHhQFUakQX79lZpLmFSY9VLULNSs2jUG8MdJLA= +go.opentelemetry.io/collector/component v0.0.0-20221117234814-4565692c50a7/go.mod h1:Z7H1Oj826e4dtVxXmT6SiUr6S0EIevUJmkVpfQV+UOk= +go.opentelemetry.io/collector/consumer v0.0.0-20221117234814-4565692c50a7 h1:FTy1JD9EJ7gq9SzlZoi2NkGcZ88+SwdiJav5uRcDEEY= +go.opentelemetry.io/collector/consumer v0.0.0-20221117234814-4565692c50a7/go.mod h1:86Elcw/LLrh90DprArogHMkBX3+UMu3tIgcVWF3mr6o= +go.opentelemetry.io/collector/featuregate v0.0.0-20221117214536-6a117bfc3737 h1:7sXg6M9Fw6rFVlX+iaWOMz6DFXEiroUdQer5kWGixwM= +go.opentelemetry.io/collector/featuregate v0.0.0-20221117214536-6a117bfc3737/go.mod h1:tewuFKJYalWBU0bmNKg++MC1ipINXUr6szYzOw2p1GI= +go.opentelemetry.io/collector/pdata v0.64.2-0.20221117234814-4565692c50a7 h1:IOFqfOu7fFxTgC7pvc2U7dk1/uFjwVQPK+CALiUvacI= +go.opentelemetry.io/collector/pdata v0.64.2-0.20221117234814-4565692c50a7/go.mod h1:0vynPfW2ZN7DltpcCFgCmTtWMQkCjp2a3TNt82YTCLQ= +go.opentelemetry.io/collector/processor/batchprocessor v0.64.2-0.20221117234814-4565692c50a7 h1:hGDq2T07j6qwwtQ2t6ZGU5tp/J2Dvu9mfY5qnnP5Ic8= +go.opentelemetry.io/collector/semconv v0.64.2-0.20221117234814-4565692c50a7 h1:cGXAVltDxXw9nj0Vr7vyZZTj0whdyO+GYs+xv0xHJ2A= +go.opentelemetry.io/collector/semconv v0.64.2-0.20221117234814-4565692c50a7/go.mod h1:5o9yhOa+ABt7g2E5JABDxGZ1PQPbtfxrKNbYn+LOTXU= go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.36.4 h1:aUEBEdCa6iamGzg6fuYxDA8ThxvOG240mAvWDU+XLio= go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.36.4/go.mod h1:l2MdsbKTocpPS5nQZscqTR9jd8u96VYZdcpF8Sye7mA= go.opentelemetry.io/contrib/propagators/b3 v1.11.1 h1:icQ6ttRV+r/2fnU46BIo/g/mPu6Rs5Ug8Rtohe3KqzI= diff --git a/exporter/prometheusremotewriteexporter/config_test.go b/exporter/prometheusremotewriteexporter/config_test.go index 56559447fbd58..60cc09629fbfa 100644 --- a/exporter/prometheusremotewriteexporter/config_test.go +++ b/exporter/prometheusremotewriteexporter/config_test.go @@ -105,10 +105,10 @@ func TestLoadConfig(t *testing.T) { require.NoError(t, component.UnmarshalExporterConfig(sub, cfg)) if tt.expected == nil { - assert.EqualError(t, cfg.Validate(), tt.errorMessage) + assert.EqualError(t, component.ValidateConfig(cfg), tt.errorMessage) return } - assert.NoError(t, cfg.Validate()) + assert.NoError(t, component.ValidateConfig(cfg)) assert.Equal(t, tt.expected, cfg) }) } diff --git a/exporter/prometheusremotewriteexporter/go.mod b/exporter/prometheusremotewriteexporter/go.mod index 2188b2f44708b..a26e5ef1ba584 100644 --- a/exporter/prometheusremotewriteexporter/go.mod +++ b/exporter/prometheusremotewriteexporter/go.mod @@ -13,8 +13,10 @@ require ( github.com/prometheus/prometheus v0.38.0 github.com/stretchr/testify v1.8.1 github.com/tidwall/wal v1.1.7 - go.opentelemetry.io/collector v0.64.2-0.20221115155901-1550938c18fd - go.opentelemetry.io/collector/pdata v0.64.2-0.20221115155901-1550938c18fd + go.opentelemetry.io/collector v0.64.2-0.20221117234814-4565692c50a7 + go.opentelemetry.io/collector/component v0.0.0-20221117234814-4565692c50a7 + go.opentelemetry.io/collector/consumer v0.0.0-20221117234814-4565692c50a7 + go.opentelemetry.io/collector/pdata v0.64.2-0.20221117234814-4565692c50a7 go.uber.org/atomic v1.10.0 go.uber.org/multierr v1.8.0 go.uber.org/zap v1.23.0 @@ -44,7 +46,8 @@ require ( github.com/tidwall/pretty v1.2.0 // indirect github.com/tidwall/tinylru v1.1.0 // indirect go.opencensus.io v0.24.0 // indirect - go.opentelemetry.io/collector/semconv v0.64.2-0.20221115155901-1550938c18fd // indirect + go.opentelemetry.io/collector/featuregate v0.0.0-20221117214536-6a117bfc3737 // indirect + go.opentelemetry.io/collector/semconv v0.64.2-0.20221117234814-4565692c50a7 // indirect go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.36.4 // indirect go.opentelemetry.io/otel v1.11.1 // indirect go.opentelemetry.io/otel/metric v0.33.0 // indirect diff --git a/exporter/prometheusremotewriteexporter/go.sum b/exporter/prometheusremotewriteexporter/go.sum index ccfb4d8e91bc9..5103934262fa2 100644 --- a/exporter/prometheusremotewriteexporter/go.sum +++ b/exporter/prometheusremotewriteexporter/go.sum @@ -380,12 +380,18 @@ go.opencensus.io v0.22.3/go.mod h1:yxeiOL68Rb0Xd1ddK5vPZ/oVn4vY4Ynel7k9FzqtOIw= go.opencensus.io v0.22.4/go.mod h1:yxeiOL68Rb0Xd1ddK5vPZ/oVn4vY4Ynel7k9FzqtOIw= go.opencensus.io v0.24.0 h1:y73uSU6J157QMP2kn2r30vwW1A2W2WFwSCGnAVxeaD0= go.opencensus.io v0.24.0/go.mod h1:vNK8G9p7aAivkbmorf4v+7Hgx+Zs0yY+0fOtgBfjQKo= -go.opentelemetry.io/collector v0.64.2-0.20221115155901-1550938c18fd h1:O+6HhE4Ivg8Jksp3dIXIEC4FIR0Ush4uORvG3UtHZWk= -go.opentelemetry.io/collector v0.64.2-0.20221115155901-1550938c18fd/go.mod h1:mmSrOcwe1vEYmChXUYuF6rzlrUL0rjEiPfa19Xxb41o= -go.opentelemetry.io/collector/pdata v0.64.2-0.20221115155901-1550938c18fd h1:GdVAbRiae5VDZe3Mn3FqzMxO/aI5UbJ4+dcviqClHy8= -go.opentelemetry.io/collector/pdata v0.64.2-0.20221115155901-1550938c18fd/go.mod h1:0vynPfW2ZN7DltpcCFgCmTtWMQkCjp2a3TNt82YTCLQ= -go.opentelemetry.io/collector/semconv v0.64.2-0.20221115155901-1550938c18fd h1:rMqcl2pwi8YtVrtOPK8tVh87W0bFBge4yqB9ypSsAJ4= -go.opentelemetry.io/collector/semconv v0.64.2-0.20221115155901-1550938c18fd/go.mod h1:5o9yhOa+ABt7g2E5JABDxGZ1PQPbtfxrKNbYn+LOTXU= +go.opentelemetry.io/collector v0.64.2-0.20221117234814-4565692c50a7 h1:o/vMr2iyXzaeTb/KAldhMxAvRIfFPwtKfL5cKVKsSlU= +go.opentelemetry.io/collector v0.64.2-0.20221117234814-4565692c50a7/go.mod h1:PO8hayFFYvXDqELbXRVxwawR2HTdjN6mY4Qa3Se9xI8= +go.opentelemetry.io/collector/component v0.0.0-20221117234814-4565692c50a7 h1:q9m1bGHhQFUakQX79lZpLmFSY9VLULNSs2jUG8MdJLA= +go.opentelemetry.io/collector/component v0.0.0-20221117234814-4565692c50a7/go.mod h1:Z7H1Oj826e4dtVxXmT6SiUr6S0EIevUJmkVpfQV+UOk= +go.opentelemetry.io/collector/consumer v0.0.0-20221117234814-4565692c50a7 h1:FTy1JD9EJ7gq9SzlZoi2NkGcZ88+SwdiJav5uRcDEEY= +go.opentelemetry.io/collector/consumer v0.0.0-20221117234814-4565692c50a7/go.mod h1:86Elcw/LLrh90DprArogHMkBX3+UMu3tIgcVWF3mr6o= +go.opentelemetry.io/collector/featuregate v0.0.0-20221117214536-6a117bfc3737 h1:7sXg6M9Fw6rFVlX+iaWOMz6DFXEiroUdQer5kWGixwM= +go.opentelemetry.io/collector/featuregate v0.0.0-20221117214536-6a117bfc3737/go.mod h1:tewuFKJYalWBU0bmNKg++MC1ipINXUr6szYzOw2p1GI= +go.opentelemetry.io/collector/pdata v0.64.2-0.20221117234814-4565692c50a7 h1:IOFqfOu7fFxTgC7pvc2U7dk1/uFjwVQPK+CALiUvacI= +go.opentelemetry.io/collector/pdata v0.64.2-0.20221117234814-4565692c50a7/go.mod h1:0vynPfW2ZN7DltpcCFgCmTtWMQkCjp2a3TNt82YTCLQ= +go.opentelemetry.io/collector/semconv v0.64.2-0.20221117234814-4565692c50a7 h1:cGXAVltDxXw9nj0Vr7vyZZTj0whdyO+GYs+xv0xHJ2A= +go.opentelemetry.io/collector/semconv v0.64.2-0.20221117234814-4565692c50a7/go.mod h1:5o9yhOa+ABt7g2E5JABDxGZ1PQPbtfxrKNbYn+LOTXU= go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.36.4 h1:aUEBEdCa6iamGzg6fuYxDA8ThxvOG240mAvWDU+XLio= go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.36.4/go.mod h1:l2MdsbKTocpPS5nQZscqTR9jd8u96VYZdcpF8Sye7mA= go.opentelemetry.io/otel v1.11.1 h1:4WLLAmcfkmDk2ukNXJyq3/kiz/3UzCaYq6PskJsaou4= diff --git a/exporter/pulsarexporter/config_test.go b/exporter/pulsarexporter/config_test.go index 09312a144745a..4a979d7efec57 100644 --- a/exporter/pulsarexporter/config_test.go +++ b/exporter/pulsarexporter/config_test.go @@ -74,7 +74,7 @@ func TestLoadConfig(t *testing.T) { require.NoError(t, err) require.NoError(t, component.UnmarshalExporterConfig(sub, cfg)) - assert.NoError(t, cfg.Validate()) + assert.NoError(t, component.ValidateConfig(cfg)) assert.Equal(t, tt.expected, cfg) }) } diff --git a/exporter/pulsarexporter/go.mod b/exporter/pulsarexporter/go.mod index 510ccb74b0fea..0eddb65ef4065 100644 --- a/exporter/pulsarexporter/go.mod +++ b/exporter/pulsarexporter/go.mod @@ -9,9 +9,11 @@ require ( github.com/open-telemetry/opentelemetry-collector-contrib/internal/coreinternal v0.64.0 github.com/open-telemetry/opentelemetry-collector-contrib/pkg/translator/jaeger v0.64.0 github.com/stretchr/testify v1.8.1 - go.opentelemetry.io/collector v0.64.2-0.20221115155901-1550938c18fd - go.opentelemetry.io/collector/pdata v0.64.2-0.20221115155901-1550938c18fd - go.opentelemetry.io/collector/semconv v0.64.2-0.20221115155901-1550938c18fd + go.opentelemetry.io/collector v0.64.2-0.20221117234814-4565692c50a7 + go.opentelemetry.io/collector/component v0.0.0-20221117234814-4565692c50a7 + go.opentelemetry.io/collector/consumer v0.0.0-20221117234814-4565692c50a7 + go.opentelemetry.io/collector/pdata v0.64.2-0.20221117234814-4565692c50a7 + go.opentelemetry.io/collector/semconv v0.64.2-0.20221117234814-4565692c50a7 go.uber.org/multierr v1.8.0 go.uber.org/zap v1.23.0 ) @@ -62,6 +64,7 @@ require ( github.com/uber/jaeger-client-go v2.30.0+incompatible // indirect github.com/uber/jaeger-lib v2.4.1+incompatible // indirect go.opencensus.io v0.24.0 // indirect + go.opentelemetry.io/collector/featuregate v0.0.0-20221117214536-6a117bfc3737 // indirect go.opentelemetry.io/otel v1.11.1 // indirect go.opentelemetry.io/otel/metric v0.33.0 // indirect go.opentelemetry.io/otel/trace v1.11.1 // indirect diff --git a/exporter/pulsarexporter/go.sum b/exporter/pulsarexporter/go.sum index 66031c329d96d..8db2380d978c3 100644 --- a/exporter/pulsarexporter/go.sum +++ b/exporter/pulsarexporter/go.sum @@ -496,12 +496,18 @@ go.opencensus.io v0.22.5/go.mod h1:5pWMHQbX5EPX2/62yrJeAkowc+lfs/XD7Uxpq3pI6kk= go.opencensus.io v0.23.0/go.mod h1:XItmlyltB5F7CS4xOC1DcqMoFqwtC6OG2xF7mCv7P7E= go.opencensus.io v0.24.0 h1:y73uSU6J157QMP2kn2r30vwW1A2W2WFwSCGnAVxeaD0= go.opencensus.io v0.24.0/go.mod h1:vNK8G9p7aAivkbmorf4v+7Hgx+Zs0yY+0fOtgBfjQKo= -go.opentelemetry.io/collector v0.64.2-0.20221115155901-1550938c18fd h1:O+6HhE4Ivg8Jksp3dIXIEC4FIR0Ush4uORvG3UtHZWk= -go.opentelemetry.io/collector v0.64.2-0.20221115155901-1550938c18fd/go.mod h1:mmSrOcwe1vEYmChXUYuF6rzlrUL0rjEiPfa19Xxb41o= -go.opentelemetry.io/collector/pdata v0.64.2-0.20221115155901-1550938c18fd h1:GdVAbRiae5VDZe3Mn3FqzMxO/aI5UbJ4+dcviqClHy8= -go.opentelemetry.io/collector/pdata v0.64.2-0.20221115155901-1550938c18fd/go.mod h1:0vynPfW2ZN7DltpcCFgCmTtWMQkCjp2a3TNt82YTCLQ= -go.opentelemetry.io/collector/semconv v0.64.2-0.20221115155901-1550938c18fd h1:rMqcl2pwi8YtVrtOPK8tVh87W0bFBge4yqB9ypSsAJ4= -go.opentelemetry.io/collector/semconv v0.64.2-0.20221115155901-1550938c18fd/go.mod h1:5o9yhOa+ABt7g2E5JABDxGZ1PQPbtfxrKNbYn+LOTXU= +go.opentelemetry.io/collector v0.64.2-0.20221117234814-4565692c50a7 h1:o/vMr2iyXzaeTb/KAldhMxAvRIfFPwtKfL5cKVKsSlU= +go.opentelemetry.io/collector v0.64.2-0.20221117234814-4565692c50a7/go.mod h1:PO8hayFFYvXDqELbXRVxwawR2HTdjN6mY4Qa3Se9xI8= +go.opentelemetry.io/collector/component v0.0.0-20221117234814-4565692c50a7 h1:q9m1bGHhQFUakQX79lZpLmFSY9VLULNSs2jUG8MdJLA= +go.opentelemetry.io/collector/component v0.0.0-20221117234814-4565692c50a7/go.mod h1:Z7H1Oj826e4dtVxXmT6SiUr6S0EIevUJmkVpfQV+UOk= +go.opentelemetry.io/collector/consumer v0.0.0-20221117234814-4565692c50a7 h1:FTy1JD9EJ7gq9SzlZoi2NkGcZ88+SwdiJav5uRcDEEY= +go.opentelemetry.io/collector/consumer v0.0.0-20221117234814-4565692c50a7/go.mod h1:86Elcw/LLrh90DprArogHMkBX3+UMu3tIgcVWF3mr6o= +go.opentelemetry.io/collector/featuregate v0.0.0-20221117214536-6a117bfc3737 h1:7sXg6M9Fw6rFVlX+iaWOMz6DFXEiroUdQer5kWGixwM= +go.opentelemetry.io/collector/featuregate v0.0.0-20221117214536-6a117bfc3737/go.mod h1:tewuFKJYalWBU0bmNKg++MC1ipINXUr6szYzOw2p1GI= +go.opentelemetry.io/collector/pdata v0.64.2-0.20221117234814-4565692c50a7 h1:IOFqfOu7fFxTgC7pvc2U7dk1/uFjwVQPK+CALiUvacI= +go.opentelemetry.io/collector/pdata v0.64.2-0.20221117234814-4565692c50a7/go.mod h1:0vynPfW2ZN7DltpcCFgCmTtWMQkCjp2a3TNt82YTCLQ= +go.opentelemetry.io/collector/semconv v0.64.2-0.20221117234814-4565692c50a7 h1:cGXAVltDxXw9nj0Vr7vyZZTj0whdyO+GYs+xv0xHJ2A= +go.opentelemetry.io/collector/semconv v0.64.2-0.20221117234814-4565692c50a7/go.mod h1:5o9yhOa+ABt7g2E5JABDxGZ1PQPbtfxrKNbYn+LOTXU= go.opentelemetry.io/otel v1.11.1 h1:4WLLAmcfkmDk2ukNXJyq3/kiz/3UzCaYq6PskJsaou4= go.opentelemetry.io/otel v1.11.1/go.mod h1:1nNhXBbWSD0nsL38H6btgnFN2k4i0sNLHNNMZMSbUGE= go.opentelemetry.io/otel/exporters/prometheus v0.33.0 h1:xXhPj7SLKWU5/Zd4Hxmd+X1C4jdmvc0Xy+kvjFx2z60= diff --git a/exporter/sapmexporter/config_test.go b/exporter/sapmexporter/config_test.go index c008a127fbd6c..e36602ad49c50 100644 --- a/exporter/sapmexporter/config_test.go +++ b/exporter/sapmexporter/config_test.go @@ -82,7 +82,7 @@ func TestLoadConfig(t *testing.T) { require.NoError(t, err) require.NoError(t, component.UnmarshalExporterConfig(sub, cfg)) - assert.NoError(t, cfg.Validate()) + assert.NoError(t, component.ValidateConfig(cfg)) assert.Equal(t, tt.expected, cfg) }) } diff --git a/exporter/sapmexporter/go.mod b/exporter/sapmexporter/go.mod index 449ad02d50075..c94f6bf96a401 100644 --- a/exporter/sapmexporter/go.mod +++ b/exporter/sapmexporter/go.mod @@ -9,8 +9,10 @@ require ( github.com/open-telemetry/opentelemetry-collector-contrib/pkg/translator/jaeger v0.64.0 github.com/signalfx/sapm-proto v0.12.0 github.com/stretchr/testify v1.8.1 - go.opentelemetry.io/collector v0.64.2-0.20221115155901-1550938c18fd - go.opentelemetry.io/collector/pdata v0.64.2-0.20221115155901-1550938c18fd + go.opentelemetry.io/collector v0.64.2-0.20221117234814-4565692c50a7 + go.opentelemetry.io/collector/component v0.0.0-20221117234814-4565692c50a7 + go.opentelemetry.io/collector/consumer v0.0.0-20221117234814-4565692c50a7 + go.opentelemetry.io/collector/pdata v0.64.2-0.20221117234814-4565692c50a7 go.uber.org/zap v1.23.0 ) @@ -36,7 +38,8 @@ require ( github.com/uber/jaeger-client-go v2.30.0+incompatible // indirect github.com/uber/jaeger-lib v2.4.1+incompatible // indirect go.opencensus.io v0.24.0 // indirect - go.opentelemetry.io/collector/semconv v0.64.2-0.20221115155901-1550938c18fd // indirect + go.opentelemetry.io/collector/featuregate v0.0.0-20221117214536-6a117bfc3737 // indirect + go.opentelemetry.io/collector/semconv v0.64.2-0.20221117234814-4565692c50a7 // indirect go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.36.4 // indirect go.opentelemetry.io/otel v1.11.1 // indirect go.opentelemetry.io/otel/metric v0.33.0 // indirect diff --git a/exporter/sapmexporter/go.sum b/exporter/sapmexporter/go.sum index edf5087fb712c..b81f81e8cb1f1 100644 --- a/exporter/sapmexporter/go.sum +++ b/exporter/sapmexporter/go.sum @@ -292,12 +292,18 @@ go.etcd.io/etcd/client/pkg/v3 v3.5.4/go.mod h1:IJHfcCEKxYu1Os13ZdwCwIUTUVGYTSAM3 go.etcd.io/etcd/client/v3 v3.5.4/go.mod h1:ZaRkVgBZC+L+dLCjTcF1hRXpgZXQPOvnA/Ak/gq3kiY= go.opencensus.io v0.24.0 h1:y73uSU6J157QMP2kn2r30vwW1A2W2WFwSCGnAVxeaD0= go.opencensus.io v0.24.0/go.mod h1:vNK8G9p7aAivkbmorf4v+7Hgx+Zs0yY+0fOtgBfjQKo= -go.opentelemetry.io/collector v0.64.2-0.20221115155901-1550938c18fd h1:O+6HhE4Ivg8Jksp3dIXIEC4FIR0Ush4uORvG3UtHZWk= -go.opentelemetry.io/collector v0.64.2-0.20221115155901-1550938c18fd/go.mod h1:mmSrOcwe1vEYmChXUYuF6rzlrUL0rjEiPfa19Xxb41o= -go.opentelemetry.io/collector/pdata v0.64.2-0.20221115155901-1550938c18fd h1:GdVAbRiae5VDZe3Mn3FqzMxO/aI5UbJ4+dcviqClHy8= -go.opentelemetry.io/collector/pdata v0.64.2-0.20221115155901-1550938c18fd/go.mod h1:0vynPfW2ZN7DltpcCFgCmTtWMQkCjp2a3TNt82YTCLQ= -go.opentelemetry.io/collector/semconv v0.64.2-0.20221115155901-1550938c18fd h1:rMqcl2pwi8YtVrtOPK8tVh87W0bFBge4yqB9ypSsAJ4= -go.opentelemetry.io/collector/semconv v0.64.2-0.20221115155901-1550938c18fd/go.mod h1:5o9yhOa+ABt7g2E5JABDxGZ1PQPbtfxrKNbYn+LOTXU= +go.opentelemetry.io/collector v0.64.2-0.20221117234814-4565692c50a7 h1:o/vMr2iyXzaeTb/KAldhMxAvRIfFPwtKfL5cKVKsSlU= +go.opentelemetry.io/collector v0.64.2-0.20221117234814-4565692c50a7/go.mod h1:PO8hayFFYvXDqELbXRVxwawR2HTdjN6mY4Qa3Se9xI8= +go.opentelemetry.io/collector/component v0.0.0-20221117234814-4565692c50a7 h1:q9m1bGHhQFUakQX79lZpLmFSY9VLULNSs2jUG8MdJLA= +go.opentelemetry.io/collector/component v0.0.0-20221117234814-4565692c50a7/go.mod h1:Z7H1Oj826e4dtVxXmT6SiUr6S0EIevUJmkVpfQV+UOk= +go.opentelemetry.io/collector/consumer v0.0.0-20221117234814-4565692c50a7 h1:FTy1JD9EJ7gq9SzlZoi2NkGcZ88+SwdiJav5uRcDEEY= +go.opentelemetry.io/collector/consumer v0.0.0-20221117234814-4565692c50a7/go.mod h1:86Elcw/LLrh90DprArogHMkBX3+UMu3tIgcVWF3mr6o= +go.opentelemetry.io/collector/featuregate v0.0.0-20221117214536-6a117bfc3737 h1:7sXg6M9Fw6rFVlX+iaWOMz6DFXEiroUdQer5kWGixwM= +go.opentelemetry.io/collector/featuregate v0.0.0-20221117214536-6a117bfc3737/go.mod h1:tewuFKJYalWBU0bmNKg++MC1ipINXUr6szYzOw2p1GI= +go.opentelemetry.io/collector/pdata v0.64.2-0.20221117234814-4565692c50a7 h1:IOFqfOu7fFxTgC7pvc2U7dk1/uFjwVQPK+CALiUvacI= +go.opentelemetry.io/collector/pdata v0.64.2-0.20221117234814-4565692c50a7/go.mod h1:0vynPfW2ZN7DltpcCFgCmTtWMQkCjp2a3TNt82YTCLQ= +go.opentelemetry.io/collector/semconv v0.64.2-0.20221117234814-4565692c50a7 h1:cGXAVltDxXw9nj0Vr7vyZZTj0whdyO+GYs+xv0xHJ2A= +go.opentelemetry.io/collector/semconv v0.64.2-0.20221117234814-4565692c50a7/go.mod h1:5o9yhOa+ABt7g2E5JABDxGZ1PQPbtfxrKNbYn+LOTXU= go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.36.4 h1:aUEBEdCa6iamGzg6fuYxDA8ThxvOG240mAvWDU+XLio= go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.36.4/go.mod h1:l2MdsbKTocpPS5nQZscqTR9jd8u96VYZdcpF8Sye7mA= go.opentelemetry.io/otel v1.11.1 h1:4WLLAmcfkmDk2ukNXJyq3/kiz/3UzCaYq6PskJsaou4= diff --git a/exporter/sentryexporter/config_test.go b/exporter/sentryexporter/config_test.go index 640c357ac1b23..e50e84b9fb5e9 100644 --- a/exporter/sentryexporter/config_test.go +++ b/exporter/sentryexporter/config_test.go @@ -57,7 +57,7 @@ func TestLoadConfig(t *testing.T) { require.NoError(t, err) require.NoError(t, component.UnmarshalExporterConfig(sub, cfg)) - assert.NoError(t, cfg.Validate()) + assert.NoError(t, component.ValidateConfig(cfg)) assert.Equal(t, tt.expected, cfg) }) } diff --git a/exporter/sentryexporter/go.mod b/exporter/sentryexporter/go.mod index 738754d76f3a6..a644a689b94b7 100644 --- a/exporter/sentryexporter/go.mod +++ b/exporter/sentryexporter/go.mod @@ -7,9 +7,10 @@ require ( github.com/google/go-cmp v0.5.9 github.com/open-telemetry/opentelemetry-collector-contrib/internal/coreinternal v0.64.0 github.com/stretchr/testify v1.8.1 - go.opentelemetry.io/collector v0.64.2-0.20221115155901-1550938c18fd - go.opentelemetry.io/collector/pdata v0.64.2-0.20221115155901-1550938c18fd - go.opentelemetry.io/collector/semconv v0.64.2-0.20221115155901-1550938c18fd + go.opentelemetry.io/collector v0.64.2-0.20221117234814-4565692c50a7 + go.opentelemetry.io/collector/component v0.0.0-20221117234814-4565692c50a7 + go.opentelemetry.io/collector/pdata v0.64.2-0.20221117234814-4565692c50a7 + go.opentelemetry.io/collector/semconv v0.64.2-0.20221117234814-4565692c50a7 ) require ( @@ -27,6 +28,8 @@ require ( github.com/modern-go/reflect2 v1.0.2 // indirect github.com/pmezard/go-difflib v1.0.0 // indirect go.opencensus.io v0.24.0 // indirect + go.opentelemetry.io/collector/consumer v0.0.0-20221117234814-4565692c50a7 // indirect + go.opentelemetry.io/collector/featuregate v0.0.0-20221117214536-6a117bfc3737 // indirect go.opentelemetry.io/otel v1.11.1 // indirect go.opentelemetry.io/otel/metric v0.33.0 // indirect go.opentelemetry.io/otel/trace v1.11.1 // indirect diff --git a/exporter/sentryexporter/go.sum b/exporter/sentryexporter/go.sum index 74e137edf76f5..96c2135d032f0 100644 --- a/exporter/sentryexporter/go.sum +++ b/exporter/sentryexporter/go.sum @@ -281,12 +281,18 @@ go.etcd.io/etcd/client/pkg/v3 v3.5.4/go.mod h1:IJHfcCEKxYu1Os13ZdwCwIUTUVGYTSAM3 go.etcd.io/etcd/client/v3 v3.5.4/go.mod h1:ZaRkVgBZC+L+dLCjTcF1hRXpgZXQPOvnA/Ak/gq3kiY= go.opencensus.io v0.24.0 h1:y73uSU6J157QMP2kn2r30vwW1A2W2WFwSCGnAVxeaD0= go.opencensus.io v0.24.0/go.mod h1:vNK8G9p7aAivkbmorf4v+7Hgx+Zs0yY+0fOtgBfjQKo= -go.opentelemetry.io/collector v0.64.2-0.20221115155901-1550938c18fd h1:O+6HhE4Ivg8Jksp3dIXIEC4FIR0Ush4uORvG3UtHZWk= -go.opentelemetry.io/collector v0.64.2-0.20221115155901-1550938c18fd/go.mod h1:mmSrOcwe1vEYmChXUYuF6rzlrUL0rjEiPfa19Xxb41o= -go.opentelemetry.io/collector/pdata v0.64.2-0.20221115155901-1550938c18fd h1:GdVAbRiae5VDZe3Mn3FqzMxO/aI5UbJ4+dcviqClHy8= -go.opentelemetry.io/collector/pdata v0.64.2-0.20221115155901-1550938c18fd/go.mod h1:0vynPfW2ZN7DltpcCFgCmTtWMQkCjp2a3TNt82YTCLQ= -go.opentelemetry.io/collector/semconv v0.64.2-0.20221115155901-1550938c18fd h1:rMqcl2pwi8YtVrtOPK8tVh87W0bFBge4yqB9ypSsAJ4= -go.opentelemetry.io/collector/semconv v0.64.2-0.20221115155901-1550938c18fd/go.mod h1:5o9yhOa+ABt7g2E5JABDxGZ1PQPbtfxrKNbYn+LOTXU= +go.opentelemetry.io/collector v0.64.2-0.20221117234814-4565692c50a7 h1:o/vMr2iyXzaeTb/KAldhMxAvRIfFPwtKfL5cKVKsSlU= +go.opentelemetry.io/collector v0.64.2-0.20221117234814-4565692c50a7/go.mod h1:PO8hayFFYvXDqELbXRVxwawR2HTdjN6mY4Qa3Se9xI8= +go.opentelemetry.io/collector/component v0.0.0-20221117234814-4565692c50a7 h1:q9m1bGHhQFUakQX79lZpLmFSY9VLULNSs2jUG8MdJLA= +go.opentelemetry.io/collector/component v0.0.0-20221117234814-4565692c50a7/go.mod h1:Z7H1Oj826e4dtVxXmT6SiUr6S0EIevUJmkVpfQV+UOk= +go.opentelemetry.io/collector/consumer v0.0.0-20221117234814-4565692c50a7 h1:FTy1JD9EJ7gq9SzlZoi2NkGcZ88+SwdiJav5uRcDEEY= +go.opentelemetry.io/collector/consumer v0.0.0-20221117234814-4565692c50a7/go.mod h1:86Elcw/LLrh90DprArogHMkBX3+UMu3tIgcVWF3mr6o= +go.opentelemetry.io/collector/featuregate v0.0.0-20221117214536-6a117bfc3737 h1:7sXg6M9Fw6rFVlX+iaWOMz6DFXEiroUdQer5kWGixwM= +go.opentelemetry.io/collector/featuregate v0.0.0-20221117214536-6a117bfc3737/go.mod h1:tewuFKJYalWBU0bmNKg++MC1ipINXUr6szYzOw2p1GI= +go.opentelemetry.io/collector/pdata v0.64.2-0.20221117234814-4565692c50a7 h1:IOFqfOu7fFxTgC7pvc2U7dk1/uFjwVQPK+CALiUvacI= +go.opentelemetry.io/collector/pdata v0.64.2-0.20221117234814-4565692c50a7/go.mod h1:0vynPfW2ZN7DltpcCFgCmTtWMQkCjp2a3TNt82YTCLQ= +go.opentelemetry.io/collector/semconv v0.64.2-0.20221117234814-4565692c50a7 h1:cGXAVltDxXw9nj0Vr7vyZZTj0whdyO+GYs+xv0xHJ2A= +go.opentelemetry.io/collector/semconv v0.64.2-0.20221117234814-4565692c50a7/go.mod h1:5o9yhOa+ABt7g2E5JABDxGZ1PQPbtfxrKNbYn+LOTXU= go.opentelemetry.io/otel v1.11.1 h1:4WLLAmcfkmDk2ukNXJyq3/kiz/3UzCaYq6PskJsaou4= go.opentelemetry.io/otel v1.11.1/go.mod h1:1nNhXBbWSD0nsL38H6btgnFN2k4i0sNLHNNMZMSbUGE= go.opentelemetry.io/otel/exporters/prometheus v0.33.0 h1:xXhPj7SLKWU5/Zd4Hxmd+X1C4jdmvc0Xy+kvjFx2z60= diff --git a/exporter/signalfxexporter/config_test.go b/exporter/signalfxexporter/config_test.go index 1b6c4bcb3f4e3..33319600bd7de 100644 --- a/exporter/signalfxexporter/config_test.go +++ b/exporter/signalfxexporter/config_test.go @@ -191,7 +191,7 @@ func TestLoadConfig(t *testing.T) { require.NoError(t, err) require.NoError(t, component.UnmarshalExporterConfig(sub, cfg)) - assert.NoError(t, cfg.Validate()) + assert.NoError(t, component.ValidateConfig(cfg)) assert.Equal(t, tt.expected, cfg) }) } diff --git a/exporter/signalfxexporter/go.mod b/exporter/signalfxexporter/go.mod index d60c3ecd3ef1a..d0f0eb10aa012 100644 --- a/exporter/signalfxexporter/go.mod +++ b/exporter/signalfxexporter/go.mod @@ -15,9 +15,11 @@ require ( github.com/signalfx/com_signalfx_metrics_protobuf v0.0.3 github.com/signalfx/signalfx-agent/pkg/apm v0.0.0-20220920175102-539ae8d8ba8e github.com/stretchr/testify v1.8.1 - go.opentelemetry.io/collector v0.64.2-0.20221115155901-1550938c18fd - go.opentelemetry.io/collector/pdata v0.64.2-0.20221115155901-1550938c18fd - go.opentelemetry.io/collector/semconv v0.64.2-0.20221115155901-1550938c18fd + go.opentelemetry.io/collector v0.64.2-0.20221117234814-4565692c50a7 + go.opentelemetry.io/collector/component v0.0.0-20221117234814-4565692c50a7 + go.opentelemetry.io/collector/consumer v0.0.0-20221117234814-4565692c50a7 + go.opentelemetry.io/collector/pdata v0.64.2-0.20221117234814-4565692c50a7 + go.opentelemetry.io/collector/semconv v0.64.2-0.20221117234814-4565692c50a7 go.uber.org/atomic v1.10.0 go.uber.org/multierr v1.8.0 go.uber.org/zap v1.23.0 @@ -61,6 +63,7 @@ require ( github.com/uber/jaeger-lib v2.4.1+incompatible // indirect github.com/yusufpapurcu/wmi v1.2.2 // indirect go.opencensus.io v0.24.0 // indirect + go.opentelemetry.io/collector/featuregate v0.0.0-20221117214536-6a117bfc3737 // indirect go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.36.4 // indirect go.opentelemetry.io/otel v1.11.1 // indirect go.opentelemetry.io/otel/metric v0.33.0 // indirect diff --git a/exporter/signalfxexporter/go.sum b/exporter/signalfxexporter/go.sum index 7e36c374fa976..b0695d8295926 100644 --- a/exporter/signalfxexporter/go.sum +++ b/exporter/signalfxexporter/go.sum @@ -1245,9 +1245,17 @@ go.opentelemetry.io/collector v0.52.0/go.mod h1:a9GvaOhyc0nVOUzqvdv5mxyWghCSso/W go.opentelemetry.io/collector v0.54.0/go.mod h1:FgNzyfb4sAGb5cqusB5znETJ8Pz4OQUBGbOeGIZ2rlQ= go.opentelemetry.io/collector v0.57.2/go.mod h1:9TwWyMRhbFNzaaGLtm/6poWNDJw+etvQMS6Fy+8/8Xs= go.opentelemetry.io/collector v0.64.1/go.mod h1:RxdEKzwxTEhBAgzC4wzyJEwSFgjWU73CHnLjKUKQDyo= -go.opentelemetry.io/collector v0.64.2-0.20221115155901-1550938c18fd h1:O+6HhE4Ivg8Jksp3dIXIEC4FIR0Ush4uORvG3UtHZWk= -go.opentelemetry.io/collector v0.64.2-0.20221115155901-1550938c18fd/go.mod h1:mmSrOcwe1vEYmChXUYuF6rzlrUL0rjEiPfa19Xxb41o= +go.opentelemetry.io/collector v0.64.2-0.20221117234814-4565692c50a7 h1:o/vMr2iyXzaeTb/KAldhMxAvRIfFPwtKfL5cKVKsSlU= +go.opentelemetry.io/collector v0.64.2-0.20221117234814-4565692c50a7/go.mod h1:PO8hayFFYvXDqELbXRVxwawR2HTdjN6mY4Qa3Se9xI8= +go.opentelemetry.io/collector/component v0.0.0-20221115212826-19db2f15c85c/go.mod h1:5+C/jgNQLM3Lkkys0UU+p2iOsGMs80kQ/DaZ1svo5cc= +go.opentelemetry.io/collector/component v0.0.0-20221117234814-4565692c50a7 h1:q9m1bGHhQFUakQX79lZpLmFSY9VLULNSs2jUG8MdJLA= +go.opentelemetry.io/collector/component v0.0.0-20221117234814-4565692c50a7/go.mod h1:Z7H1Oj826e4dtVxXmT6SiUr6S0EIevUJmkVpfQV+UOk= +go.opentelemetry.io/collector/consumer v0.0.0-20221116212002-2454cfb9ab7f/go.mod h1:npKt5UPhg8ZEtYqwN4R7VtWbzyAURVu3vfDikr3ycLM= +go.opentelemetry.io/collector/consumer v0.0.0-20221117234814-4565692c50a7 h1:FTy1JD9EJ7gq9SzlZoi2NkGcZ88+SwdiJav5uRcDEEY= +go.opentelemetry.io/collector/consumer v0.0.0-20221117234814-4565692c50a7/go.mod h1:86Elcw/LLrh90DprArogHMkBX3+UMu3tIgcVWF3mr6o= go.opentelemetry.io/collector/extension/zpagesextension v0.64.1/go.mod h1:XenhQAUbOHgqNq5YQ/vQIcDHRcPUaDgZQxDC2qoI4Bc= +go.opentelemetry.io/collector/featuregate v0.0.0-20221117214536-6a117bfc3737 h1:7sXg6M9Fw6rFVlX+iaWOMz6DFXEiroUdQer5kWGixwM= +go.opentelemetry.io/collector/featuregate v0.0.0-20221117214536-6a117bfc3737/go.mod h1:tewuFKJYalWBU0bmNKg++MC1ipINXUr6szYzOw2p1GI= go.opentelemetry.io/collector/model v0.49.0/go.mod h1:nOYQv9KoFPs6ihJwOi24qB209EOhS9HkwhGj54YiEAw= go.opentelemetry.io/collector/pdata v0.49.0/go.mod h1:YwmKuiFhNgtmhRdpi8Q8FAWPa0AwJTCSlssSsAtuRcY= go.opentelemetry.io/collector/pdata v0.52.0/go.mod h1:GJUTfTv8mlYpHRjcmHXVbvJr48EW/q/P/HuBvpXAE58= @@ -1255,16 +1263,16 @@ go.opentelemetry.io/collector/pdata v0.54.0/go.mod h1:1nSelv/YqGwdHHaIKNW9ZOHSMq go.opentelemetry.io/collector/pdata v0.56.0/go.mod h1:mYcCREWiIJyHss0dbU+GSiz2tmGZ6u09vtfkKTciog4= go.opentelemetry.io/collector/pdata v0.57.2/go.mod h1:RU9I8lwBUxucwOsSYzHEcHi15M9QaX78hgQ2PRdSxV0= go.opentelemetry.io/collector/pdata v0.64.1/go.mod h1:IzvXUGQml2mrnvdb8zIlEW3qQs9oFLdD2hLwJdZ+pek= -go.opentelemetry.io/collector/pdata v0.64.2-0.20221115155901-1550938c18fd h1:GdVAbRiae5VDZe3Mn3FqzMxO/aI5UbJ4+dcviqClHy8= -go.opentelemetry.io/collector/pdata v0.64.2-0.20221115155901-1550938c18fd/go.mod h1:0vynPfW2ZN7DltpcCFgCmTtWMQkCjp2a3TNt82YTCLQ= +go.opentelemetry.io/collector/pdata v0.64.2-0.20221117234814-4565692c50a7 h1:IOFqfOu7fFxTgC7pvc2U7dk1/uFjwVQPK+CALiUvacI= +go.opentelemetry.io/collector/pdata v0.64.2-0.20221117234814-4565692c50a7/go.mod h1:0vynPfW2ZN7DltpcCFgCmTtWMQkCjp2a3TNt82YTCLQ= go.opentelemetry.io/collector/processor/batchprocessor v0.64.1/go.mod h1:qVl0+aYokPfiq5y+JVAvlII2rrUFBDEqqiDbTSnax78= go.opentelemetry.io/collector/semconv v0.52.0/go.mod h1:SxK0rUnUP7YeDakexzbE/vhimTOHwE6m/4aKKd9e27Q= go.opentelemetry.io/collector/semconv v0.54.0/go.mod h1:HAGkPKNMhc4kEHevEqVIEtUuvsRQMIbUWBb8yBrqEwk= go.opentelemetry.io/collector/semconv v0.56.0/go.mod h1:EH1wbDvTyqKpKBBpoMIe0KQk2plCcFS66Mo17WtR7CQ= go.opentelemetry.io/collector/semconv v0.57.2/go.mod h1:84YnUjmm+nhGu4YTDLnHCbxnL74ooWpismPG79tFD7w= go.opentelemetry.io/collector/semconv v0.64.1/go.mod h1:5o9yhOa+ABt7g2E5JABDxGZ1PQPbtfxrKNbYn+LOTXU= -go.opentelemetry.io/collector/semconv v0.64.2-0.20221115155901-1550938c18fd h1:rMqcl2pwi8YtVrtOPK8tVh87W0bFBge4yqB9ypSsAJ4= -go.opentelemetry.io/collector/semconv v0.64.2-0.20221115155901-1550938c18fd/go.mod h1:5o9yhOa+ABt7g2E5JABDxGZ1PQPbtfxrKNbYn+LOTXU= +go.opentelemetry.io/collector/semconv v0.64.2-0.20221117234814-4565692c50a7 h1:cGXAVltDxXw9nj0Vr7vyZZTj0whdyO+GYs+xv0xHJ2A= +go.opentelemetry.io/collector/semconv v0.64.2-0.20221117234814-4565692c50a7/go.mod h1:5o9yhOa+ABt7g2E5JABDxGZ1PQPbtfxrKNbYn+LOTXU= go.opentelemetry.io/contrib/instrumentation/google.golang.org/grpc/otelgrpc v0.32.0/go.mod h1:J0dBVrt7dPS/lKJyQoW0xzQiUr4r2Ik1VwPjAUWnofI= go.opentelemetry.io/contrib/instrumentation/google.golang.org/grpc/otelgrpc v0.33.0/go.mod h1:y/SlJpJQPd2UzfBCj0E9Flk9FDCtTyqUmaCB41qFrWI= go.opentelemetry.io/contrib/instrumentation/google.golang.org/grpc/otelgrpc v0.36.4/go.mod h1:05eWWy6ZWzmpeImD3UowLTB3VjDMU1yxQ+ENuVWDM3c= diff --git a/exporter/skywalkingexporter/config_test.go b/exporter/skywalkingexporter/config_test.go index 7f9e50901a022..e79b151ad67f8 100644 --- a/exporter/skywalkingexporter/config_test.go +++ b/exporter/skywalkingexporter/config_test.go @@ -100,7 +100,7 @@ func TestLoadConfig(t *testing.T) { require.NoError(t, err) require.NoError(t, component.UnmarshalExporterConfig(sub, cfg)) - assert.NoError(t, cfg.Validate()) + assert.NoError(t, component.ValidateConfig(cfg)) assert.Equal(t, tt.expected, cfg) }) } diff --git a/exporter/skywalkingexporter/go.mod b/exporter/skywalkingexporter/go.mod index 7254fdb079c8e..90009a1c3b1e5 100644 --- a/exporter/skywalkingexporter/go.mod +++ b/exporter/skywalkingexporter/go.mod @@ -6,9 +6,11 @@ require ( github.com/open-telemetry/opentelemetry-collector-contrib/internal/common v0.64.0 github.com/open-telemetry/opentelemetry-collector-contrib/internal/coreinternal v0.64.0 github.com/stretchr/testify v1.8.1 - go.opentelemetry.io/collector v0.64.2-0.20221115155901-1550938c18fd - go.opentelemetry.io/collector/pdata v0.64.2-0.20221115155901-1550938c18fd - go.opentelemetry.io/collector/semconv v0.64.2-0.20221115155901-1550938c18fd + go.opentelemetry.io/collector v0.64.2-0.20221117234814-4565692c50a7 + go.opentelemetry.io/collector/component v0.0.0-20221117234814-4565692c50a7 + go.opentelemetry.io/collector/consumer v0.0.0-20221117234814-4565692c50a7 + go.opentelemetry.io/collector/pdata v0.64.2-0.20221117234814-4565692c50a7 + go.opentelemetry.io/collector/semconv v0.64.2-0.20221117234814-4565692c50a7 go.uber.org/atomic v1.10.0 google.golang.org/grpc v1.50.1 skywalking.apache.org/repo/goapi v0.0.0-20211122071111-ffc517fbfe21 @@ -34,6 +36,7 @@ require ( github.com/pmezard/go-difflib v1.0.0 // indirect github.com/rogpeppe/go-internal v1.8.0 // indirect go.opencensus.io v0.24.0 // indirect + go.opentelemetry.io/collector/featuregate v0.0.0-20221117214536-6a117bfc3737 // indirect go.opentelemetry.io/contrib/instrumentation/google.golang.org/grpc/otelgrpc v0.36.4 // indirect go.opentelemetry.io/otel v1.11.1 // indirect go.opentelemetry.io/otel/metric v0.33.0 // indirect diff --git a/exporter/skywalkingexporter/go.sum b/exporter/skywalkingexporter/go.sum index cede65502e8c9..7555c18553a35 100644 --- a/exporter/skywalkingexporter/go.sum +++ b/exporter/skywalkingexporter/go.sum @@ -303,12 +303,18 @@ go.etcd.io/etcd/client/pkg/v3 v3.5.4/go.mod h1:IJHfcCEKxYu1Os13ZdwCwIUTUVGYTSAM3 go.etcd.io/etcd/client/v3 v3.5.4/go.mod h1:ZaRkVgBZC+L+dLCjTcF1hRXpgZXQPOvnA/Ak/gq3kiY= go.opencensus.io v0.24.0 h1:y73uSU6J157QMP2kn2r30vwW1A2W2WFwSCGnAVxeaD0= go.opencensus.io v0.24.0/go.mod h1:vNK8G9p7aAivkbmorf4v+7Hgx+Zs0yY+0fOtgBfjQKo= -go.opentelemetry.io/collector v0.64.2-0.20221115155901-1550938c18fd h1:O+6HhE4Ivg8Jksp3dIXIEC4FIR0Ush4uORvG3UtHZWk= -go.opentelemetry.io/collector v0.64.2-0.20221115155901-1550938c18fd/go.mod h1:mmSrOcwe1vEYmChXUYuF6rzlrUL0rjEiPfa19Xxb41o= -go.opentelemetry.io/collector/pdata v0.64.2-0.20221115155901-1550938c18fd h1:GdVAbRiae5VDZe3Mn3FqzMxO/aI5UbJ4+dcviqClHy8= -go.opentelemetry.io/collector/pdata v0.64.2-0.20221115155901-1550938c18fd/go.mod h1:0vynPfW2ZN7DltpcCFgCmTtWMQkCjp2a3TNt82YTCLQ= -go.opentelemetry.io/collector/semconv v0.64.2-0.20221115155901-1550938c18fd h1:rMqcl2pwi8YtVrtOPK8tVh87W0bFBge4yqB9ypSsAJ4= -go.opentelemetry.io/collector/semconv v0.64.2-0.20221115155901-1550938c18fd/go.mod h1:5o9yhOa+ABt7g2E5JABDxGZ1PQPbtfxrKNbYn+LOTXU= +go.opentelemetry.io/collector v0.64.2-0.20221117234814-4565692c50a7 h1:o/vMr2iyXzaeTb/KAldhMxAvRIfFPwtKfL5cKVKsSlU= +go.opentelemetry.io/collector v0.64.2-0.20221117234814-4565692c50a7/go.mod h1:PO8hayFFYvXDqELbXRVxwawR2HTdjN6mY4Qa3Se9xI8= +go.opentelemetry.io/collector/component v0.0.0-20221117234814-4565692c50a7 h1:q9m1bGHhQFUakQX79lZpLmFSY9VLULNSs2jUG8MdJLA= +go.opentelemetry.io/collector/component v0.0.0-20221117234814-4565692c50a7/go.mod h1:Z7H1Oj826e4dtVxXmT6SiUr6S0EIevUJmkVpfQV+UOk= +go.opentelemetry.io/collector/consumer v0.0.0-20221117234814-4565692c50a7 h1:FTy1JD9EJ7gq9SzlZoi2NkGcZ88+SwdiJav5uRcDEEY= +go.opentelemetry.io/collector/consumer v0.0.0-20221117234814-4565692c50a7/go.mod h1:86Elcw/LLrh90DprArogHMkBX3+UMu3tIgcVWF3mr6o= +go.opentelemetry.io/collector/featuregate v0.0.0-20221117214536-6a117bfc3737 h1:7sXg6M9Fw6rFVlX+iaWOMz6DFXEiroUdQer5kWGixwM= +go.opentelemetry.io/collector/featuregate v0.0.0-20221117214536-6a117bfc3737/go.mod h1:tewuFKJYalWBU0bmNKg++MC1ipINXUr6szYzOw2p1GI= +go.opentelemetry.io/collector/pdata v0.64.2-0.20221117234814-4565692c50a7 h1:IOFqfOu7fFxTgC7pvc2U7dk1/uFjwVQPK+CALiUvacI= +go.opentelemetry.io/collector/pdata v0.64.2-0.20221117234814-4565692c50a7/go.mod h1:0vynPfW2ZN7DltpcCFgCmTtWMQkCjp2a3TNt82YTCLQ= +go.opentelemetry.io/collector/semconv v0.64.2-0.20221117234814-4565692c50a7 h1:cGXAVltDxXw9nj0Vr7vyZZTj0whdyO+GYs+xv0xHJ2A= +go.opentelemetry.io/collector/semconv v0.64.2-0.20221117234814-4565692c50a7/go.mod h1:5o9yhOa+ABt7g2E5JABDxGZ1PQPbtfxrKNbYn+LOTXU= go.opentelemetry.io/contrib/instrumentation/google.golang.org/grpc/otelgrpc v0.36.4 h1:PRXhsszxTt5bbPriTjmaweWUsAnJYeWBhUMLRetUgBU= go.opentelemetry.io/contrib/instrumentation/google.golang.org/grpc/otelgrpc v0.36.4/go.mod h1:05eWWy6ZWzmpeImD3UowLTB3VjDMU1yxQ+ENuVWDM3c= go.opentelemetry.io/otel v1.11.1 h1:4WLLAmcfkmDk2ukNXJyq3/kiz/3UzCaYq6PskJsaou4= diff --git a/exporter/splunkhecexporter/config_test.go b/exporter/splunkhecexporter/config_test.go index d751515016fef..a0783e14594dd 100644 --- a/exporter/splunkhecexporter/config_test.go +++ b/exporter/splunkhecexporter/config_test.go @@ -113,7 +113,7 @@ func TestLoadConfig(t *testing.T) { require.NoError(t, err) require.NoError(t, component.UnmarshalExporterConfig(sub, cfg)) - assert.NoError(t, cfg.Validate()) + assert.NoError(t, component.ValidateConfig(cfg)) assert.Equal(t, tt.expected, cfg) }) } diff --git a/exporter/splunkhecexporter/go.mod b/exporter/splunkhecexporter/go.mod index 9af4a195cd85c..a23212456bfc7 100644 --- a/exporter/splunkhecexporter/go.mod +++ b/exporter/splunkhecexporter/go.mod @@ -8,9 +8,11 @@ require ( github.com/open-telemetry/opentelemetry-collector-contrib/internal/splunk v0.64.0 github.com/open-telemetry/opentelemetry-collector-contrib/pkg/batchperresourceattr v0.64.0 github.com/stretchr/testify v1.8.1 - go.opentelemetry.io/collector v0.64.2-0.20221115155901-1550938c18fd - go.opentelemetry.io/collector/pdata v0.64.2-0.20221115155901-1550938c18fd - go.opentelemetry.io/collector/semconv v0.64.2-0.20221115155901-1550938c18fd + go.opentelemetry.io/collector v0.64.2-0.20221117234814-4565692c50a7 + go.opentelemetry.io/collector/component v0.0.0-20221117234814-4565692c50a7 + go.opentelemetry.io/collector/consumer v0.0.0-20221117234814-4565692c50a7 + go.opentelemetry.io/collector/pdata v0.64.2-0.20221117234814-4565692c50a7 + go.opentelemetry.io/collector/semconv v0.64.2-0.20221117234814-4565692c50a7 go.uber.org/multierr v1.8.0 go.uber.org/zap v1.23.0 ) @@ -31,6 +33,7 @@ require ( github.com/pmezard/go-difflib v1.0.0 // indirect github.com/rogpeppe/go-internal v1.8.1 // indirect go.opencensus.io v0.24.0 // indirect + go.opentelemetry.io/collector/featuregate v0.0.0-20221117214536-6a117bfc3737 // indirect go.opentelemetry.io/otel v1.11.1 // indirect go.opentelemetry.io/otel/metric v0.33.0 // indirect go.opentelemetry.io/otel/trace v1.11.1 // indirect diff --git a/exporter/splunkhecexporter/go.sum b/exporter/splunkhecexporter/go.sum index f9ed6d4417e15..721871926a48f 100644 --- a/exporter/splunkhecexporter/go.sum +++ b/exporter/splunkhecexporter/go.sum @@ -277,12 +277,18 @@ go.etcd.io/etcd/client/pkg/v3 v3.5.4/go.mod h1:IJHfcCEKxYu1Os13ZdwCwIUTUVGYTSAM3 go.etcd.io/etcd/client/v3 v3.5.4/go.mod h1:ZaRkVgBZC+L+dLCjTcF1hRXpgZXQPOvnA/Ak/gq3kiY= go.opencensus.io v0.24.0 h1:y73uSU6J157QMP2kn2r30vwW1A2W2WFwSCGnAVxeaD0= go.opencensus.io v0.24.0/go.mod h1:vNK8G9p7aAivkbmorf4v+7Hgx+Zs0yY+0fOtgBfjQKo= -go.opentelemetry.io/collector v0.64.2-0.20221115155901-1550938c18fd h1:O+6HhE4Ivg8Jksp3dIXIEC4FIR0Ush4uORvG3UtHZWk= -go.opentelemetry.io/collector v0.64.2-0.20221115155901-1550938c18fd/go.mod h1:mmSrOcwe1vEYmChXUYuF6rzlrUL0rjEiPfa19Xxb41o= -go.opentelemetry.io/collector/pdata v0.64.2-0.20221115155901-1550938c18fd h1:GdVAbRiae5VDZe3Mn3FqzMxO/aI5UbJ4+dcviqClHy8= -go.opentelemetry.io/collector/pdata v0.64.2-0.20221115155901-1550938c18fd/go.mod h1:0vynPfW2ZN7DltpcCFgCmTtWMQkCjp2a3TNt82YTCLQ= -go.opentelemetry.io/collector/semconv v0.64.2-0.20221115155901-1550938c18fd h1:rMqcl2pwi8YtVrtOPK8tVh87W0bFBge4yqB9ypSsAJ4= -go.opentelemetry.io/collector/semconv v0.64.2-0.20221115155901-1550938c18fd/go.mod h1:5o9yhOa+ABt7g2E5JABDxGZ1PQPbtfxrKNbYn+LOTXU= +go.opentelemetry.io/collector v0.64.2-0.20221117234814-4565692c50a7 h1:o/vMr2iyXzaeTb/KAldhMxAvRIfFPwtKfL5cKVKsSlU= +go.opentelemetry.io/collector v0.64.2-0.20221117234814-4565692c50a7/go.mod h1:PO8hayFFYvXDqELbXRVxwawR2HTdjN6mY4Qa3Se9xI8= +go.opentelemetry.io/collector/component v0.0.0-20221117234814-4565692c50a7 h1:q9m1bGHhQFUakQX79lZpLmFSY9VLULNSs2jUG8MdJLA= +go.opentelemetry.io/collector/component v0.0.0-20221117234814-4565692c50a7/go.mod h1:Z7H1Oj826e4dtVxXmT6SiUr6S0EIevUJmkVpfQV+UOk= +go.opentelemetry.io/collector/consumer v0.0.0-20221117234814-4565692c50a7 h1:FTy1JD9EJ7gq9SzlZoi2NkGcZ88+SwdiJav5uRcDEEY= +go.opentelemetry.io/collector/consumer v0.0.0-20221117234814-4565692c50a7/go.mod h1:86Elcw/LLrh90DprArogHMkBX3+UMu3tIgcVWF3mr6o= +go.opentelemetry.io/collector/featuregate v0.0.0-20221117214536-6a117bfc3737 h1:7sXg6M9Fw6rFVlX+iaWOMz6DFXEiroUdQer5kWGixwM= +go.opentelemetry.io/collector/featuregate v0.0.0-20221117214536-6a117bfc3737/go.mod h1:tewuFKJYalWBU0bmNKg++MC1ipINXUr6szYzOw2p1GI= +go.opentelemetry.io/collector/pdata v0.64.2-0.20221117234814-4565692c50a7 h1:IOFqfOu7fFxTgC7pvc2U7dk1/uFjwVQPK+CALiUvacI= +go.opentelemetry.io/collector/pdata v0.64.2-0.20221117234814-4565692c50a7/go.mod h1:0vynPfW2ZN7DltpcCFgCmTtWMQkCjp2a3TNt82YTCLQ= +go.opentelemetry.io/collector/semconv v0.64.2-0.20221117234814-4565692c50a7 h1:cGXAVltDxXw9nj0Vr7vyZZTj0whdyO+GYs+xv0xHJ2A= +go.opentelemetry.io/collector/semconv v0.64.2-0.20221117234814-4565692c50a7/go.mod h1:5o9yhOa+ABt7g2E5JABDxGZ1PQPbtfxrKNbYn+LOTXU= go.opentelemetry.io/otel v1.11.1 h1:4WLLAmcfkmDk2ukNXJyq3/kiz/3UzCaYq6PskJsaou4= go.opentelemetry.io/otel v1.11.1/go.mod h1:1nNhXBbWSD0nsL38H6btgnFN2k4i0sNLHNNMZMSbUGE= go.opentelemetry.io/otel/exporters/prometheus v0.33.0 h1:xXhPj7SLKWU5/Zd4Hxmd+X1C4jdmvc0Xy+kvjFx2z60= diff --git a/exporter/sumologicexporter/go.mod b/exporter/sumologicexporter/go.mod index 242ae6b15cd23..c901e7326854b 100644 --- a/exporter/sumologicexporter/go.mod +++ b/exporter/sumologicexporter/go.mod @@ -4,8 +4,10 @@ go 1.18 require ( github.com/stretchr/testify v1.8.1 - go.opentelemetry.io/collector v0.64.2-0.20221115155901-1550938c18fd - go.opentelemetry.io/collector/pdata v0.64.2-0.20221115155901-1550938c18fd + go.opentelemetry.io/collector v0.64.2-0.20221117234814-4565692c50a7 + go.opentelemetry.io/collector/component v0.0.0-20221117234814-4565692c50a7 + go.opentelemetry.io/collector/consumer v0.0.0-20221117234814-4565692c50a7 + go.opentelemetry.io/collector/pdata v0.64.2-0.20221117234814-4565692c50a7 go.uber.org/atomic v1.10.0 go.uber.org/multierr v1.8.0 ) @@ -33,6 +35,7 @@ require ( github.com/pmezard/go-difflib v1.0.0 // indirect github.com/rs/cors v1.8.2 // indirect go.opencensus.io v0.24.0 // indirect + go.opentelemetry.io/collector/featuregate v0.0.0-20221117214536-6a117bfc3737 // indirect go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.36.4 // indirect go.opentelemetry.io/otel v1.11.1 // indirect go.opentelemetry.io/otel/metric v0.33.0 // indirect diff --git a/exporter/sumologicexporter/go.sum b/exporter/sumologicexporter/go.sum index caaf44dd95c3d..d9313de58a01d 100644 --- a/exporter/sumologicexporter/go.sum +++ b/exporter/sumologicexporter/go.sum @@ -297,10 +297,16 @@ go.etcd.io/etcd/client/pkg/v3 v3.5.4/go.mod h1:IJHfcCEKxYu1Os13ZdwCwIUTUVGYTSAM3 go.etcd.io/etcd/client/v3 v3.5.4/go.mod h1:ZaRkVgBZC+L+dLCjTcF1hRXpgZXQPOvnA/Ak/gq3kiY= go.opencensus.io v0.24.0 h1:y73uSU6J157QMP2kn2r30vwW1A2W2WFwSCGnAVxeaD0= go.opencensus.io v0.24.0/go.mod h1:vNK8G9p7aAivkbmorf4v+7Hgx+Zs0yY+0fOtgBfjQKo= -go.opentelemetry.io/collector v0.64.2-0.20221115155901-1550938c18fd h1:O+6HhE4Ivg8Jksp3dIXIEC4FIR0Ush4uORvG3UtHZWk= -go.opentelemetry.io/collector v0.64.2-0.20221115155901-1550938c18fd/go.mod h1:mmSrOcwe1vEYmChXUYuF6rzlrUL0rjEiPfa19Xxb41o= -go.opentelemetry.io/collector/pdata v0.64.2-0.20221115155901-1550938c18fd h1:GdVAbRiae5VDZe3Mn3FqzMxO/aI5UbJ4+dcviqClHy8= -go.opentelemetry.io/collector/pdata v0.64.2-0.20221115155901-1550938c18fd/go.mod h1:0vynPfW2ZN7DltpcCFgCmTtWMQkCjp2a3TNt82YTCLQ= +go.opentelemetry.io/collector v0.64.2-0.20221117234814-4565692c50a7 h1:o/vMr2iyXzaeTb/KAldhMxAvRIfFPwtKfL5cKVKsSlU= +go.opentelemetry.io/collector v0.64.2-0.20221117234814-4565692c50a7/go.mod h1:PO8hayFFYvXDqELbXRVxwawR2HTdjN6mY4Qa3Se9xI8= +go.opentelemetry.io/collector/component v0.0.0-20221117234814-4565692c50a7 h1:q9m1bGHhQFUakQX79lZpLmFSY9VLULNSs2jUG8MdJLA= +go.opentelemetry.io/collector/component v0.0.0-20221117234814-4565692c50a7/go.mod h1:Z7H1Oj826e4dtVxXmT6SiUr6S0EIevUJmkVpfQV+UOk= +go.opentelemetry.io/collector/consumer v0.0.0-20221117234814-4565692c50a7 h1:FTy1JD9EJ7gq9SzlZoi2NkGcZ88+SwdiJav5uRcDEEY= +go.opentelemetry.io/collector/consumer v0.0.0-20221117234814-4565692c50a7/go.mod h1:86Elcw/LLrh90DprArogHMkBX3+UMu3tIgcVWF3mr6o= +go.opentelemetry.io/collector/featuregate v0.0.0-20221117214536-6a117bfc3737 h1:7sXg6M9Fw6rFVlX+iaWOMz6DFXEiroUdQer5kWGixwM= +go.opentelemetry.io/collector/featuregate v0.0.0-20221117214536-6a117bfc3737/go.mod h1:tewuFKJYalWBU0bmNKg++MC1ipINXUr6szYzOw2p1GI= +go.opentelemetry.io/collector/pdata v0.64.2-0.20221117234814-4565692c50a7 h1:IOFqfOu7fFxTgC7pvc2U7dk1/uFjwVQPK+CALiUvacI= +go.opentelemetry.io/collector/pdata v0.64.2-0.20221117234814-4565692c50a7/go.mod h1:0vynPfW2ZN7DltpcCFgCmTtWMQkCjp2a3TNt82YTCLQ= go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.36.4 h1:aUEBEdCa6iamGzg6fuYxDA8ThxvOG240mAvWDU+XLio= go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.36.4/go.mod h1:l2MdsbKTocpPS5nQZscqTR9jd8u96VYZdcpF8Sye7mA= go.opentelemetry.io/otel v1.11.1 h1:4WLLAmcfkmDk2ukNXJyq3/kiz/3UzCaYq6PskJsaou4= diff --git a/exporter/tanzuobservabilityexporter/go.mod b/exporter/tanzuobservabilityexporter/go.mod index 78ae869a11f67..d6bb95d1648b8 100644 --- a/exporter/tanzuobservabilityexporter/go.mod +++ b/exporter/tanzuobservabilityexporter/go.mod @@ -7,9 +7,10 @@ require ( github.com/open-telemetry/opentelemetry-collector-contrib/internal/coreinternal v0.64.0 github.com/stretchr/testify v1.8.1 github.com/wavefronthq/wavefront-sdk-go v0.10.4 - go.opentelemetry.io/collector v0.64.2-0.20221115155901-1550938c18fd - go.opentelemetry.io/collector/pdata v0.64.2-0.20221115155901-1550938c18fd - go.opentelemetry.io/collector/semconv v0.64.2-0.20221115155901-1550938c18fd + go.opentelemetry.io/collector v0.64.2-0.20221117234814-4565692c50a7 + go.opentelemetry.io/collector/component v0.0.0-20221117234814-4565692c50a7 + go.opentelemetry.io/collector/pdata v0.64.2-0.20221117234814-4565692c50a7 + go.opentelemetry.io/collector/semconv v0.64.2-0.20221117234814-4565692c50a7 go.uber.org/atomic v1.10.0 go.uber.org/multierr v1.8.0 go.uber.org/zap v1.23.0 @@ -59,7 +60,9 @@ require ( github.com/tklauser/numcpus v0.4.0 // indirect github.com/yusufpapurcu/wmi v1.2.2 // indirect go.opencensus.io v0.24.0 // indirect - go.opentelemetry.io/collector/processor/batchprocessor v0.64.2-0.20221115155901-1550938c18fd // indirect + go.opentelemetry.io/collector/consumer v0.0.0-20221117234814-4565692c50a7 // indirect + go.opentelemetry.io/collector/featuregate v0.0.0-20221117214536-6a117bfc3737 // indirect + go.opentelemetry.io/collector/processor/batchprocessor v0.64.2-0.20221117234814-4565692c50a7 // indirect go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.36.4 // indirect go.opentelemetry.io/contrib/propagators/b3 v1.11.1 // indirect go.opentelemetry.io/otel v1.11.1 // indirect diff --git a/exporter/tanzuobservabilityexporter/go.sum b/exporter/tanzuobservabilityexporter/go.sum index a327a623829b5..7a28ce0394b06 100644 --- a/exporter/tanzuobservabilityexporter/go.sum +++ b/exporter/tanzuobservabilityexporter/go.sum @@ -412,15 +412,21 @@ go.opencensus.io v0.22.4/go.mod h1:yxeiOL68Rb0Xd1ddK5vPZ/oVn4vY4Ynel7k9FzqtOIw= go.opencensus.io v0.23.0/go.mod h1:XItmlyltB5F7CS4xOC1DcqMoFqwtC6OG2xF7mCv7P7E= go.opencensus.io v0.24.0 h1:y73uSU6J157QMP2kn2r30vwW1A2W2WFwSCGnAVxeaD0= go.opencensus.io v0.24.0/go.mod h1:vNK8G9p7aAivkbmorf4v+7Hgx+Zs0yY+0fOtgBfjQKo= -go.opentelemetry.io/collector v0.64.2-0.20221115155901-1550938c18fd h1:O+6HhE4Ivg8Jksp3dIXIEC4FIR0Ush4uORvG3UtHZWk= -go.opentelemetry.io/collector v0.64.2-0.20221115155901-1550938c18fd/go.mod h1:mmSrOcwe1vEYmChXUYuF6rzlrUL0rjEiPfa19Xxb41o= +go.opentelemetry.io/collector v0.64.2-0.20221117234814-4565692c50a7 h1:o/vMr2iyXzaeTb/KAldhMxAvRIfFPwtKfL5cKVKsSlU= +go.opentelemetry.io/collector v0.64.2-0.20221117234814-4565692c50a7/go.mod h1:PO8hayFFYvXDqELbXRVxwawR2HTdjN6mY4Qa3Se9xI8= +go.opentelemetry.io/collector/component v0.0.0-20221117234814-4565692c50a7 h1:q9m1bGHhQFUakQX79lZpLmFSY9VLULNSs2jUG8MdJLA= +go.opentelemetry.io/collector/component v0.0.0-20221117234814-4565692c50a7/go.mod h1:Z7H1Oj826e4dtVxXmT6SiUr6S0EIevUJmkVpfQV+UOk= +go.opentelemetry.io/collector/consumer v0.0.0-20221117234814-4565692c50a7 h1:FTy1JD9EJ7gq9SzlZoi2NkGcZ88+SwdiJav5uRcDEEY= +go.opentelemetry.io/collector/consumer v0.0.0-20221117234814-4565692c50a7/go.mod h1:86Elcw/LLrh90DprArogHMkBX3+UMu3tIgcVWF3mr6o= go.opentelemetry.io/collector/extension/zpagesextension v0.64.1 h1:2qTBtVigWNwPSpN9XR+WobC1idF2S8X/FIahFGCE1i4= -go.opentelemetry.io/collector/pdata v0.64.2-0.20221115155901-1550938c18fd h1:GdVAbRiae5VDZe3Mn3FqzMxO/aI5UbJ4+dcviqClHy8= -go.opentelemetry.io/collector/pdata v0.64.2-0.20221115155901-1550938c18fd/go.mod h1:0vynPfW2ZN7DltpcCFgCmTtWMQkCjp2a3TNt82YTCLQ= -go.opentelemetry.io/collector/processor/batchprocessor v0.64.2-0.20221115155901-1550938c18fd h1:SSjP8V0UP2+oPZ3gL+Dk90KQcvHXvHp9V5h8IIpx0og= -go.opentelemetry.io/collector/processor/batchprocessor v0.64.2-0.20221115155901-1550938c18fd/go.mod h1:zyCnX0aTvBaZ3XLWSHZdTueP7WoXRjz8X6HiWgKqstM= -go.opentelemetry.io/collector/semconv v0.64.2-0.20221115155901-1550938c18fd h1:rMqcl2pwi8YtVrtOPK8tVh87W0bFBge4yqB9ypSsAJ4= -go.opentelemetry.io/collector/semconv v0.64.2-0.20221115155901-1550938c18fd/go.mod h1:5o9yhOa+ABt7g2E5JABDxGZ1PQPbtfxrKNbYn+LOTXU= +go.opentelemetry.io/collector/featuregate v0.0.0-20221117214536-6a117bfc3737 h1:7sXg6M9Fw6rFVlX+iaWOMz6DFXEiroUdQer5kWGixwM= +go.opentelemetry.io/collector/featuregate v0.0.0-20221117214536-6a117bfc3737/go.mod h1:tewuFKJYalWBU0bmNKg++MC1ipINXUr6szYzOw2p1GI= +go.opentelemetry.io/collector/pdata v0.64.2-0.20221117234814-4565692c50a7 h1:IOFqfOu7fFxTgC7pvc2U7dk1/uFjwVQPK+CALiUvacI= +go.opentelemetry.io/collector/pdata v0.64.2-0.20221117234814-4565692c50a7/go.mod h1:0vynPfW2ZN7DltpcCFgCmTtWMQkCjp2a3TNt82YTCLQ= +go.opentelemetry.io/collector/processor/batchprocessor v0.64.2-0.20221117234814-4565692c50a7 h1:hGDq2T07j6qwwtQ2t6ZGU5tp/J2Dvu9mfY5qnnP5Ic8= +go.opentelemetry.io/collector/processor/batchprocessor v0.64.2-0.20221117234814-4565692c50a7/go.mod h1:b83iea2eDSAQkvd+2aSokaa6GRjSIsaR2zILziF/Ogc= +go.opentelemetry.io/collector/semconv v0.64.2-0.20221117234814-4565692c50a7 h1:cGXAVltDxXw9nj0Vr7vyZZTj0whdyO+GYs+xv0xHJ2A= +go.opentelemetry.io/collector/semconv v0.64.2-0.20221117234814-4565692c50a7/go.mod h1:5o9yhOa+ABt7g2E5JABDxGZ1PQPbtfxrKNbYn+LOTXU= go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.36.4 h1:aUEBEdCa6iamGzg6fuYxDA8ThxvOG240mAvWDU+XLio= go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.36.4/go.mod h1:l2MdsbKTocpPS5nQZscqTR9jd8u96VYZdcpF8Sye7mA= go.opentelemetry.io/contrib/propagators/b3 v1.11.1 h1:icQ6ttRV+r/2fnU46BIo/g/mPu6Rs5Ug8Rtohe3KqzI= diff --git a/exporter/tencentcloudlogserviceexporter/config_test.go b/exporter/tencentcloudlogserviceexporter/config_test.go index 8fa71b058d19f..1872db12ecf09 100644 --- a/exporter/tencentcloudlogserviceexporter/config_test.go +++ b/exporter/tencentcloudlogserviceexporter/config_test.go @@ -57,7 +57,7 @@ func TestLoadConfig(t *testing.T) { require.NoError(t, err) require.NoError(t, component.UnmarshalExporterConfig(sub, cfg)) - assert.NoError(t, cfg.Validate()) + assert.NoError(t, component.ValidateConfig(cfg)) assert.Equal(t, tt.expected, cfg) }) } diff --git a/exporter/tencentcloudlogserviceexporter/go.mod b/exporter/tencentcloudlogserviceexporter/go.mod index aa432c38bba05..5212a6e52098c 100644 --- a/exporter/tencentcloudlogserviceexporter/go.mod +++ b/exporter/tencentcloudlogserviceexporter/go.mod @@ -7,9 +7,10 @@ require ( github.com/pierrec/lz4 v2.6.1+incompatible github.com/stretchr/testify v1.8.1 github.com/tencentcloud/tencentcloud-sdk-go/tencentcloud/common v1.0.532 - go.opentelemetry.io/collector v0.64.2-0.20221115155901-1550938c18fd - go.opentelemetry.io/collector/pdata v0.64.2-0.20221115155901-1550938c18fd - go.opentelemetry.io/collector/semconv v0.64.2-0.20221115155901-1550938c18fd + go.opentelemetry.io/collector v0.64.2-0.20221117234814-4565692c50a7 + go.opentelemetry.io/collector/component v0.0.0-20221117234814-4565692c50a7 + go.opentelemetry.io/collector/pdata v0.64.2-0.20221117234814-4565692c50a7 + go.opentelemetry.io/collector/semconv v0.64.2-0.20221117234814-4565692c50a7 go.uber.org/zap v1.23.0 google.golang.org/protobuf v1.28.1 ) @@ -29,6 +30,8 @@ require ( github.com/modern-go/reflect2 v1.0.2 // indirect github.com/pmezard/go-difflib v1.0.0 // indirect go.opencensus.io v0.24.0 // indirect + go.opentelemetry.io/collector/consumer v0.0.0-20221117234814-4565692c50a7 // indirect + go.opentelemetry.io/collector/featuregate v0.0.0-20221117214536-6a117bfc3737 // indirect go.opentelemetry.io/otel v1.11.1 // indirect go.opentelemetry.io/otel/metric v0.33.0 // indirect go.opentelemetry.io/otel/trace v1.11.1 // indirect diff --git a/exporter/tencentcloudlogserviceexporter/go.sum b/exporter/tencentcloudlogserviceexporter/go.sum index 42962d8b231fc..baa85ec05075a 100644 --- a/exporter/tencentcloudlogserviceexporter/go.sum +++ b/exporter/tencentcloudlogserviceexporter/go.sum @@ -282,12 +282,18 @@ go.etcd.io/etcd/client/pkg/v3 v3.5.4/go.mod h1:IJHfcCEKxYu1Os13ZdwCwIUTUVGYTSAM3 go.etcd.io/etcd/client/v3 v3.5.4/go.mod h1:ZaRkVgBZC+L+dLCjTcF1hRXpgZXQPOvnA/Ak/gq3kiY= go.opencensus.io v0.24.0 h1:y73uSU6J157QMP2kn2r30vwW1A2W2WFwSCGnAVxeaD0= go.opencensus.io v0.24.0/go.mod h1:vNK8G9p7aAivkbmorf4v+7Hgx+Zs0yY+0fOtgBfjQKo= -go.opentelemetry.io/collector v0.64.2-0.20221115155901-1550938c18fd h1:O+6HhE4Ivg8Jksp3dIXIEC4FIR0Ush4uORvG3UtHZWk= -go.opentelemetry.io/collector v0.64.2-0.20221115155901-1550938c18fd/go.mod h1:mmSrOcwe1vEYmChXUYuF6rzlrUL0rjEiPfa19Xxb41o= -go.opentelemetry.io/collector/pdata v0.64.2-0.20221115155901-1550938c18fd h1:GdVAbRiae5VDZe3Mn3FqzMxO/aI5UbJ4+dcviqClHy8= -go.opentelemetry.io/collector/pdata v0.64.2-0.20221115155901-1550938c18fd/go.mod h1:0vynPfW2ZN7DltpcCFgCmTtWMQkCjp2a3TNt82YTCLQ= -go.opentelemetry.io/collector/semconv v0.64.2-0.20221115155901-1550938c18fd h1:rMqcl2pwi8YtVrtOPK8tVh87W0bFBge4yqB9ypSsAJ4= -go.opentelemetry.io/collector/semconv v0.64.2-0.20221115155901-1550938c18fd/go.mod h1:5o9yhOa+ABt7g2E5JABDxGZ1PQPbtfxrKNbYn+LOTXU= +go.opentelemetry.io/collector v0.64.2-0.20221117234814-4565692c50a7 h1:o/vMr2iyXzaeTb/KAldhMxAvRIfFPwtKfL5cKVKsSlU= +go.opentelemetry.io/collector v0.64.2-0.20221117234814-4565692c50a7/go.mod h1:PO8hayFFYvXDqELbXRVxwawR2HTdjN6mY4Qa3Se9xI8= +go.opentelemetry.io/collector/component v0.0.0-20221117234814-4565692c50a7 h1:q9m1bGHhQFUakQX79lZpLmFSY9VLULNSs2jUG8MdJLA= +go.opentelemetry.io/collector/component v0.0.0-20221117234814-4565692c50a7/go.mod h1:Z7H1Oj826e4dtVxXmT6SiUr6S0EIevUJmkVpfQV+UOk= +go.opentelemetry.io/collector/consumer v0.0.0-20221117234814-4565692c50a7 h1:FTy1JD9EJ7gq9SzlZoi2NkGcZ88+SwdiJav5uRcDEEY= +go.opentelemetry.io/collector/consumer v0.0.0-20221117234814-4565692c50a7/go.mod h1:86Elcw/LLrh90DprArogHMkBX3+UMu3tIgcVWF3mr6o= +go.opentelemetry.io/collector/featuregate v0.0.0-20221117214536-6a117bfc3737 h1:7sXg6M9Fw6rFVlX+iaWOMz6DFXEiroUdQer5kWGixwM= +go.opentelemetry.io/collector/featuregate v0.0.0-20221117214536-6a117bfc3737/go.mod h1:tewuFKJYalWBU0bmNKg++MC1ipINXUr6szYzOw2p1GI= +go.opentelemetry.io/collector/pdata v0.64.2-0.20221117234814-4565692c50a7 h1:IOFqfOu7fFxTgC7pvc2U7dk1/uFjwVQPK+CALiUvacI= +go.opentelemetry.io/collector/pdata v0.64.2-0.20221117234814-4565692c50a7/go.mod h1:0vynPfW2ZN7DltpcCFgCmTtWMQkCjp2a3TNt82YTCLQ= +go.opentelemetry.io/collector/semconv v0.64.2-0.20221117234814-4565692c50a7 h1:cGXAVltDxXw9nj0Vr7vyZZTj0whdyO+GYs+xv0xHJ2A= +go.opentelemetry.io/collector/semconv v0.64.2-0.20221117234814-4565692c50a7/go.mod h1:5o9yhOa+ABt7g2E5JABDxGZ1PQPbtfxrKNbYn+LOTXU= go.opentelemetry.io/otel v1.11.1 h1:4WLLAmcfkmDk2ukNXJyq3/kiz/3UzCaYq6PskJsaou4= go.opentelemetry.io/otel v1.11.1/go.mod h1:1nNhXBbWSD0nsL38H6btgnFN2k4i0sNLHNNMZMSbUGE= go.opentelemetry.io/otel/exporters/prometheus v0.33.0 h1:xXhPj7SLKWU5/Zd4Hxmd+X1C4jdmvc0Xy+kvjFx2z60= diff --git a/exporter/zipkinexporter/config_test.go b/exporter/zipkinexporter/config_test.go index 8ff58c38e8cd7..d0b2ef2aa5f71 100644 --- a/exporter/zipkinexporter/config_test.go +++ b/exporter/zipkinexporter/config_test.go @@ -81,7 +81,7 @@ func TestLoadConfig(t *testing.T) { require.NoError(t, err) require.NoError(t, component.UnmarshalExporterConfig(sub, cfg)) - assert.NoError(t, cfg.Validate()) + assert.NoError(t, component.ValidateConfig(cfg)) assert.Equal(t, tt.expected, cfg) }) } diff --git a/exporter/zipkinexporter/go.mod b/exporter/zipkinexporter/go.mod index dc6078f33969e..a7923772769b5 100644 --- a/exporter/zipkinexporter/go.mod +++ b/exporter/zipkinexporter/go.mod @@ -8,8 +8,10 @@ require ( github.com/open-telemetry/opentelemetry-collector-contrib/receiver/zipkinreceiver v0.64.0 github.com/openzipkin/zipkin-go v0.4.1 github.com/stretchr/testify v1.8.1 - go.opentelemetry.io/collector v0.64.2-0.20221115155901-1550938c18fd - go.opentelemetry.io/collector/pdata v0.64.2-0.20221115155901-1550938c18fd + go.opentelemetry.io/collector v0.64.2-0.20221117234814-4565692c50a7 + go.opentelemetry.io/collector/component v0.0.0-20221117234814-4565692c50a7 + go.opentelemetry.io/collector/consumer v0.0.0-20221117234814-4565692c50a7 + go.opentelemetry.io/collector/pdata v0.64.2-0.20221117234814-4565692c50a7 ) require ( @@ -38,7 +40,8 @@ require ( github.com/uber/jaeger-client-go v2.30.0+incompatible // indirect github.com/uber/jaeger-lib v2.4.1+incompatible // indirect go.opencensus.io v0.24.0 // indirect - go.opentelemetry.io/collector/semconv v0.64.2-0.20221115155901-1550938c18fd // indirect + go.opentelemetry.io/collector/featuregate v0.0.0-20221117214536-6a117bfc3737 // indirect + go.opentelemetry.io/collector/semconv v0.64.2-0.20221117234814-4565692c50a7 // indirect go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.36.4 // indirect go.opentelemetry.io/otel v1.11.1 // indirect go.opentelemetry.io/otel/metric v0.33.0 // indirect diff --git a/exporter/zipkinexporter/go.sum b/exporter/zipkinexporter/go.sum index 23a4d1668ccaa..562191bd9779c 100644 --- a/exporter/zipkinexporter/go.sum +++ b/exporter/zipkinexporter/go.sum @@ -298,12 +298,18 @@ go.etcd.io/etcd/client/pkg/v3 v3.5.4/go.mod h1:IJHfcCEKxYu1Os13ZdwCwIUTUVGYTSAM3 go.etcd.io/etcd/client/v3 v3.5.4/go.mod h1:ZaRkVgBZC+L+dLCjTcF1hRXpgZXQPOvnA/Ak/gq3kiY= go.opencensus.io v0.24.0 h1:y73uSU6J157QMP2kn2r30vwW1A2W2WFwSCGnAVxeaD0= go.opencensus.io v0.24.0/go.mod h1:vNK8G9p7aAivkbmorf4v+7Hgx+Zs0yY+0fOtgBfjQKo= -go.opentelemetry.io/collector v0.64.2-0.20221115155901-1550938c18fd h1:O+6HhE4Ivg8Jksp3dIXIEC4FIR0Ush4uORvG3UtHZWk= -go.opentelemetry.io/collector v0.64.2-0.20221115155901-1550938c18fd/go.mod h1:mmSrOcwe1vEYmChXUYuF6rzlrUL0rjEiPfa19Xxb41o= -go.opentelemetry.io/collector/pdata v0.64.2-0.20221115155901-1550938c18fd h1:GdVAbRiae5VDZe3Mn3FqzMxO/aI5UbJ4+dcviqClHy8= -go.opentelemetry.io/collector/pdata v0.64.2-0.20221115155901-1550938c18fd/go.mod h1:0vynPfW2ZN7DltpcCFgCmTtWMQkCjp2a3TNt82YTCLQ= -go.opentelemetry.io/collector/semconv v0.64.2-0.20221115155901-1550938c18fd h1:rMqcl2pwi8YtVrtOPK8tVh87W0bFBge4yqB9ypSsAJ4= -go.opentelemetry.io/collector/semconv v0.64.2-0.20221115155901-1550938c18fd/go.mod h1:5o9yhOa+ABt7g2E5JABDxGZ1PQPbtfxrKNbYn+LOTXU= +go.opentelemetry.io/collector v0.64.2-0.20221117234814-4565692c50a7 h1:o/vMr2iyXzaeTb/KAldhMxAvRIfFPwtKfL5cKVKsSlU= +go.opentelemetry.io/collector v0.64.2-0.20221117234814-4565692c50a7/go.mod h1:PO8hayFFYvXDqELbXRVxwawR2HTdjN6mY4Qa3Se9xI8= +go.opentelemetry.io/collector/component v0.0.0-20221117234814-4565692c50a7 h1:q9m1bGHhQFUakQX79lZpLmFSY9VLULNSs2jUG8MdJLA= +go.opentelemetry.io/collector/component v0.0.0-20221117234814-4565692c50a7/go.mod h1:Z7H1Oj826e4dtVxXmT6SiUr6S0EIevUJmkVpfQV+UOk= +go.opentelemetry.io/collector/consumer v0.0.0-20221117234814-4565692c50a7 h1:FTy1JD9EJ7gq9SzlZoi2NkGcZ88+SwdiJav5uRcDEEY= +go.opentelemetry.io/collector/consumer v0.0.0-20221117234814-4565692c50a7/go.mod h1:86Elcw/LLrh90DprArogHMkBX3+UMu3tIgcVWF3mr6o= +go.opentelemetry.io/collector/featuregate v0.0.0-20221117214536-6a117bfc3737 h1:7sXg6M9Fw6rFVlX+iaWOMz6DFXEiroUdQer5kWGixwM= +go.opentelemetry.io/collector/featuregate v0.0.0-20221117214536-6a117bfc3737/go.mod h1:tewuFKJYalWBU0bmNKg++MC1ipINXUr6szYzOw2p1GI= +go.opentelemetry.io/collector/pdata v0.64.2-0.20221117234814-4565692c50a7 h1:IOFqfOu7fFxTgC7pvc2U7dk1/uFjwVQPK+CALiUvacI= +go.opentelemetry.io/collector/pdata v0.64.2-0.20221117234814-4565692c50a7/go.mod h1:0vynPfW2ZN7DltpcCFgCmTtWMQkCjp2a3TNt82YTCLQ= +go.opentelemetry.io/collector/semconv v0.64.2-0.20221117234814-4565692c50a7 h1:cGXAVltDxXw9nj0Vr7vyZZTj0whdyO+GYs+xv0xHJ2A= +go.opentelemetry.io/collector/semconv v0.64.2-0.20221117234814-4565692c50a7/go.mod h1:5o9yhOa+ABt7g2E5JABDxGZ1PQPbtfxrKNbYn+LOTXU= go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.36.4 h1:aUEBEdCa6iamGzg6fuYxDA8ThxvOG240mAvWDU+XLio= go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.36.4/go.mod h1:l2MdsbKTocpPS5nQZscqTR9jd8u96VYZdcpF8Sye7mA= go.opentelemetry.io/otel v1.11.1 h1:4WLLAmcfkmDk2ukNXJyq3/kiz/3UzCaYq6PskJsaou4= diff --git a/extension/asapauthextension/config_test.go b/extension/asapauthextension/config_test.go index ae7cc51366543..59615120133c6 100644 --- a/extension/asapauthextension/config_test.go +++ b/extension/asapauthextension/config_test.go @@ -81,10 +81,10 @@ func TestLoadConfig(t *testing.T) { require.NoError(t, err) require.NoError(t, component.UnmarshalExtensionConfig(sub, cfg)) if tt.expectedErr != nil { - assert.ErrorIs(t, cfg.Validate(), tt.expectedErr) + assert.ErrorIs(t, component.ValidateConfig(cfg), tt.expectedErr) return } - assert.NoError(t, cfg.Validate()) + assert.NoError(t, component.ValidateConfig(cfg)) assert.Equal(t, tt.expected, cfg) }) } diff --git a/extension/asapauthextension/go.mod b/extension/asapauthextension/go.mod index 00a84933bb5c9..3466b541955be 100644 --- a/extension/asapauthextension/go.mod +++ b/extension/asapauthextension/go.mod @@ -6,7 +6,8 @@ require ( bitbucket.org/atlassian/go-asap/v2 v2.6.0 github.com/SermoDigital/jose v0.9.2-0.20161205224733-f6df55f235c2 github.com/stretchr/testify v1.8.1 - go.opentelemetry.io/collector v0.64.2-0.20221115155901-1550938c18fd + go.opentelemetry.io/collector v0.64.2-0.20221117234814-4565692c50a7 + go.opentelemetry.io/collector/component v0.0.0-20221117234814-4565692c50a7 go.uber.org/multierr v1.8.0 google.golang.org/grpc v1.50.1 ) @@ -29,7 +30,9 @@ require ( github.com/pmezard/go-difflib v1.0.0 // indirect github.com/pquerna/cachecontrol v0.1.0 // indirect github.com/vincent-petithory/dataurl v1.0.0 // indirect - go.opentelemetry.io/collector/pdata v0.64.2-0.20221115155901-1550938c18fd // indirect + go.opentelemetry.io/collector/consumer v0.0.0-20221117234814-4565692c50a7 // indirect + go.opentelemetry.io/collector/featuregate v0.0.0-20221117214536-6a117bfc3737 // indirect + go.opentelemetry.io/collector/pdata v0.64.2-0.20221117234814-4565692c50a7 // indirect go.opentelemetry.io/otel v1.11.1 // indirect go.opentelemetry.io/otel/metric v0.33.0 // indirect go.opentelemetry.io/otel/trace v1.11.1 // indirect diff --git a/extension/asapauthextension/go.sum b/extension/asapauthextension/go.sum index bdc4e32d60dd9..1456984ae4913 100644 --- a/extension/asapauthextension/go.sum +++ b/extension/asapauthextension/go.sum @@ -276,10 +276,16 @@ github.com/yuin/goldmark v1.3.5/go.mod h1:mwnBkeHKe2W/ZEtQ+71ViKU8L12m81fl3OWwC1 go.etcd.io/etcd/api/v3 v3.5.4/go.mod h1:5GB2vv4A4AOn3yk7MftYGHkUfGtDHnEraIjym4dYz5A= go.etcd.io/etcd/client/pkg/v3 v3.5.4/go.mod h1:IJHfcCEKxYu1Os13ZdwCwIUTUVGYTSAM3YSwc9/Ac1g= go.etcd.io/etcd/client/v3 v3.5.4/go.mod h1:ZaRkVgBZC+L+dLCjTcF1hRXpgZXQPOvnA/Ak/gq3kiY= -go.opentelemetry.io/collector v0.64.2-0.20221115155901-1550938c18fd h1:O+6HhE4Ivg8Jksp3dIXIEC4FIR0Ush4uORvG3UtHZWk= -go.opentelemetry.io/collector v0.64.2-0.20221115155901-1550938c18fd/go.mod h1:mmSrOcwe1vEYmChXUYuF6rzlrUL0rjEiPfa19Xxb41o= -go.opentelemetry.io/collector/pdata v0.64.2-0.20221115155901-1550938c18fd h1:GdVAbRiae5VDZe3Mn3FqzMxO/aI5UbJ4+dcviqClHy8= -go.opentelemetry.io/collector/pdata v0.64.2-0.20221115155901-1550938c18fd/go.mod h1:0vynPfW2ZN7DltpcCFgCmTtWMQkCjp2a3TNt82YTCLQ= +go.opentelemetry.io/collector v0.64.2-0.20221117234814-4565692c50a7 h1:o/vMr2iyXzaeTb/KAldhMxAvRIfFPwtKfL5cKVKsSlU= +go.opentelemetry.io/collector v0.64.2-0.20221117234814-4565692c50a7/go.mod h1:PO8hayFFYvXDqELbXRVxwawR2HTdjN6mY4Qa3Se9xI8= +go.opentelemetry.io/collector/component v0.0.0-20221117234814-4565692c50a7 h1:q9m1bGHhQFUakQX79lZpLmFSY9VLULNSs2jUG8MdJLA= +go.opentelemetry.io/collector/component v0.0.0-20221117234814-4565692c50a7/go.mod h1:Z7H1Oj826e4dtVxXmT6SiUr6S0EIevUJmkVpfQV+UOk= +go.opentelemetry.io/collector/consumer v0.0.0-20221117234814-4565692c50a7 h1:FTy1JD9EJ7gq9SzlZoi2NkGcZ88+SwdiJav5uRcDEEY= +go.opentelemetry.io/collector/consumer v0.0.0-20221117234814-4565692c50a7/go.mod h1:86Elcw/LLrh90DprArogHMkBX3+UMu3tIgcVWF3mr6o= +go.opentelemetry.io/collector/featuregate v0.0.0-20221117214536-6a117bfc3737 h1:7sXg6M9Fw6rFVlX+iaWOMz6DFXEiroUdQer5kWGixwM= +go.opentelemetry.io/collector/featuregate v0.0.0-20221117214536-6a117bfc3737/go.mod h1:tewuFKJYalWBU0bmNKg++MC1ipINXUr6szYzOw2p1GI= +go.opentelemetry.io/collector/pdata v0.64.2-0.20221117234814-4565692c50a7 h1:IOFqfOu7fFxTgC7pvc2U7dk1/uFjwVQPK+CALiUvacI= +go.opentelemetry.io/collector/pdata v0.64.2-0.20221117234814-4565692c50a7/go.mod h1:0vynPfW2ZN7DltpcCFgCmTtWMQkCjp2a3TNt82YTCLQ= go.opentelemetry.io/otel v1.11.1 h1:4WLLAmcfkmDk2ukNXJyq3/kiz/3UzCaYq6PskJsaou4= go.opentelemetry.io/otel v1.11.1/go.mod h1:1nNhXBbWSD0nsL38H6btgnFN2k4i0sNLHNNMZMSbUGE= go.opentelemetry.io/otel/metric v0.33.0 h1:xQAyl7uGEYvrLAiV/09iTJlp1pZnQ9Wl793qbVvED1E= diff --git a/extension/awsproxy/config_test.go b/extension/awsproxy/config_test.go index 9a13fb9b073db..98b490e257b65 100644 --- a/extension/awsproxy/config_test.go +++ b/extension/awsproxy/config_test.go @@ -70,7 +70,7 @@ func TestLoadConfig(t *testing.T) { require.NoError(t, err) require.NoError(t, component.UnmarshalExtensionConfig(sub, cfg)) - assert.NoError(t, cfg.Validate()) + assert.NoError(t, component.ValidateConfig(cfg)) assert.Equal(t, tt.expected, cfg) }) } diff --git a/extension/awsproxy/go.mod b/extension/awsproxy/go.mod index afa30e50ab840..dbb54724e67dc 100644 --- a/extension/awsproxy/go.mod +++ b/extension/awsproxy/go.mod @@ -6,7 +6,8 @@ require ( github.com/open-telemetry/opentelemetry-collector-contrib/internal/aws/proxy v0.64.0 github.com/open-telemetry/opentelemetry-collector-contrib/internal/common v0.64.0 github.com/stretchr/testify v1.8.1 - go.opentelemetry.io/collector v0.64.2-0.20221115155901-1550938c18fd + go.opentelemetry.io/collector v0.64.2-0.20221117234814-4565692c50a7 + go.opentelemetry.io/collector/component v0.0.0-20221117234814-4565692c50a7 go.uber.org/zap v1.23.0 ) @@ -25,7 +26,9 @@ require ( github.com/modern-go/reflect2 v1.0.2 // indirect github.com/pmezard/go-difflib v1.0.0 // indirect github.com/rogpeppe/go-internal v1.8.0 // indirect - go.opentelemetry.io/collector/pdata v0.64.2-0.20221115155901-1550938c18fd // indirect + go.opentelemetry.io/collector/consumer v0.0.0-20221117234814-4565692c50a7 // indirect + go.opentelemetry.io/collector/featuregate v0.0.0-20221117214536-6a117bfc3737 // indirect + go.opentelemetry.io/collector/pdata v0.64.2-0.20221117234814-4565692c50a7 // indirect go.opentelemetry.io/otel v1.11.1 // indirect go.opentelemetry.io/otel/metric v0.33.0 // indirect go.opentelemetry.io/otel/trace v1.11.1 // indirect diff --git a/extension/awsproxy/go.sum b/extension/awsproxy/go.sum index 582e4e0d29e17..0e99abfbe5b58 100644 --- a/extension/awsproxy/go.sum +++ b/extension/awsproxy/go.sum @@ -265,10 +265,16 @@ github.com/yuin/goldmark v1.4.13/go.mod h1:6yULJ656Px+3vBD8DxQVa3kxgyrAnzto9xy5t go.etcd.io/etcd/api/v3 v3.5.4/go.mod h1:5GB2vv4A4AOn3yk7MftYGHkUfGtDHnEraIjym4dYz5A= go.etcd.io/etcd/client/pkg/v3 v3.5.4/go.mod h1:IJHfcCEKxYu1Os13ZdwCwIUTUVGYTSAM3YSwc9/Ac1g= go.etcd.io/etcd/client/v3 v3.5.4/go.mod h1:ZaRkVgBZC+L+dLCjTcF1hRXpgZXQPOvnA/Ak/gq3kiY= -go.opentelemetry.io/collector v0.64.2-0.20221115155901-1550938c18fd h1:O+6HhE4Ivg8Jksp3dIXIEC4FIR0Ush4uORvG3UtHZWk= -go.opentelemetry.io/collector v0.64.2-0.20221115155901-1550938c18fd/go.mod h1:mmSrOcwe1vEYmChXUYuF6rzlrUL0rjEiPfa19Xxb41o= -go.opentelemetry.io/collector/pdata v0.64.2-0.20221115155901-1550938c18fd h1:GdVAbRiae5VDZe3Mn3FqzMxO/aI5UbJ4+dcviqClHy8= -go.opentelemetry.io/collector/pdata v0.64.2-0.20221115155901-1550938c18fd/go.mod h1:0vynPfW2ZN7DltpcCFgCmTtWMQkCjp2a3TNt82YTCLQ= +go.opentelemetry.io/collector v0.64.2-0.20221117234814-4565692c50a7 h1:o/vMr2iyXzaeTb/KAldhMxAvRIfFPwtKfL5cKVKsSlU= +go.opentelemetry.io/collector v0.64.2-0.20221117234814-4565692c50a7/go.mod h1:PO8hayFFYvXDqELbXRVxwawR2HTdjN6mY4Qa3Se9xI8= +go.opentelemetry.io/collector/component v0.0.0-20221117234814-4565692c50a7 h1:q9m1bGHhQFUakQX79lZpLmFSY9VLULNSs2jUG8MdJLA= +go.opentelemetry.io/collector/component v0.0.0-20221117234814-4565692c50a7/go.mod h1:Z7H1Oj826e4dtVxXmT6SiUr6S0EIevUJmkVpfQV+UOk= +go.opentelemetry.io/collector/consumer v0.0.0-20221117234814-4565692c50a7 h1:FTy1JD9EJ7gq9SzlZoi2NkGcZ88+SwdiJav5uRcDEEY= +go.opentelemetry.io/collector/consumer v0.0.0-20221117234814-4565692c50a7/go.mod h1:86Elcw/LLrh90DprArogHMkBX3+UMu3tIgcVWF3mr6o= +go.opentelemetry.io/collector/featuregate v0.0.0-20221117214536-6a117bfc3737 h1:7sXg6M9Fw6rFVlX+iaWOMz6DFXEiroUdQer5kWGixwM= +go.opentelemetry.io/collector/featuregate v0.0.0-20221117214536-6a117bfc3737/go.mod h1:tewuFKJYalWBU0bmNKg++MC1ipINXUr6szYzOw2p1GI= +go.opentelemetry.io/collector/pdata v0.64.2-0.20221117234814-4565692c50a7 h1:IOFqfOu7fFxTgC7pvc2U7dk1/uFjwVQPK+CALiUvacI= +go.opentelemetry.io/collector/pdata v0.64.2-0.20221117234814-4565692c50a7/go.mod h1:0vynPfW2ZN7DltpcCFgCmTtWMQkCjp2a3TNt82YTCLQ= go.opentelemetry.io/otel v1.11.1 h1:4WLLAmcfkmDk2ukNXJyq3/kiz/3UzCaYq6PskJsaou4= go.opentelemetry.io/otel v1.11.1/go.mod h1:1nNhXBbWSD0nsL38H6btgnFN2k4i0sNLHNNMZMSbUGE= go.opentelemetry.io/otel/metric v0.33.0 h1:xQAyl7uGEYvrLAiV/09iTJlp1pZnQ9Wl793qbVvED1E= diff --git a/extension/basicauthextension/config_test.go b/extension/basicauthextension/config_test.go index 9c5d56942e9bd..a33e03705845d 100644 --- a/extension/basicauthextension/config_test.go +++ b/extension/basicauthextension/config_test.go @@ -71,10 +71,10 @@ func TestLoadConfig(t *testing.T) { require.NoError(t, err) require.NoError(t, component.UnmarshalExtensionConfig(sub, cfg)) if tt.expectedErr { - assert.Error(t, cfg.Validate()) + assert.Error(t, component.ValidateConfig(cfg)) return } - assert.NoError(t, cfg.Validate()) + assert.NoError(t, component.ValidateConfig(cfg)) assert.Equal(t, tt.expected, cfg) }) } diff --git a/extension/basicauthextension/go.mod b/extension/basicauthextension/go.mod index 5e1b0e07e42c7..7e1f4c287e3c3 100644 --- a/extension/basicauthextension/go.mod +++ b/extension/basicauthextension/go.mod @@ -5,7 +5,8 @@ go 1.18 require ( github.com/stretchr/testify v1.8.1 github.com/tg123/go-htpasswd v1.2.0 - go.opentelemetry.io/collector v0.64.2-0.20221115155901-1550938c18fd + go.opentelemetry.io/collector v0.64.2-0.20221117234814-4565692c50a7 + go.opentelemetry.io/collector/component v0.0.0-20221117234814-4565692c50a7 google.golang.org/grpc v1.50.1 ) @@ -25,7 +26,9 @@ require ( github.com/modern-go/reflect2 v1.0.2 // indirect github.com/pelletier/go-toml v1.9.4 // indirect github.com/pmezard/go-difflib v1.0.0 // indirect - go.opentelemetry.io/collector/pdata v0.64.2-0.20221115155901-1550938c18fd // indirect + go.opentelemetry.io/collector/consumer v0.0.0-20221117234814-4565692c50a7 // indirect + go.opentelemetry.io/collector/featuregate v0.0.0-20221117214536-6a117bfc3737 // indirect + go.opentelemetry.io/collector/pdata v0.64.2-0.20221117234814-4565692c50a7 // indirect go.opentelemetry.io/otel v1.11.1 // indirect go.opentelemetry.io/otel/metric v0.33.0 // indirect go.opentelemetry.io/otel/trace v1.11.1 // indirect diff --git a/extension/basicauthextension/go.sum b/extension/basicauthextension/go.sum index fd5e522067792..b96b1e525b21b 100644 --- a/extension/basicauthextension/go.sum +++ b/extension/basicauthextension/go.sum @@ -269,10 +269,16 @@ github.com/yuin/goldmark v1.3.5/go.mod h1:mwnBkeHKe2W/ZEtQ+71ViKU8L12m81fl3OWwC1 go.etcd.io/etcd/api/v3 v3.5.4/go.mod h1:5GB2vv4A4AOn3yk7MftYGHkUfGtDHnEraIjym4dYz5A= go.etcd.io/etcd/client/pkg/v3 v3.5.4/go.mod h1:IJHfcCEKxYu1Os13ZdwCwIUTUVGYTSAM3YSwc9/Ac1g= go.etcd.io/etcd/client/v3 v3.5.4/go.mod h1:ZaRkVgBZC+L+dLCjTcF1hRXpgZXQPOvnA/Ak/gq3kiY= -go.opentelemetry.io/collector v0.64.2-0.20221115155901-1550938c18fd h1:O+6HhE4Ivg8Jksp3dIXIEC4FIR0Ush4uORvG3UtHZWk= -go.opentelemetry.io/collector v0.64.2-0.20221115155901-1550938c18fd/go.mod h1:mmSrOcwe1vEYmChXUYuF6rzlrUL0rjEiPfa19Xxb41o= -go.opentelemetry.io/collector/pdata v0.64.2-0.20221115155901-1550938c18fd h1:GdVAbRiae5VDZe3Mn3FqzMxO/aI5UbJ4+dcviqClHy8= -go.opentelemetry.io/collector/pdata v0.64.2-0.20221115155901-1550938c18fd/go.mod h1:0vynPfW2ZN7DltpcCFgCmTtWMQkCjp2a3TNt82YTCLQ= +go.opentelemetry.io/collector v0.64.2-0.20221117234814-4565692c50a7 h1:o/vMr2iyXzaeTb/KAldhMxAvRIfFPwtKfL5cKVKsSlU= +go.opentelemetry.io/collector v0.64.2-0.20221117234814-4565692c50a7/go.mod h1:PO8hayFFYvXDqELbXRVxwawR2HTdjN6mY4Qa3Se9xI8= +go.opentelemetry.io/collector/component v0.0.0-20221117234814-4565692c50a7 h1:q9m1bGHhQFUakQX79lZpLmFSY9VLULNSs2jUG8MdJLA= +go.opentelemetry.io/collector/component v0.0.0-20221117234814-4565692c50a7/go.mod h1:Z7H1Oj826e4dtVxXmT6SiUr6S0EIevUJmkVpfQV+UOk= +go.opentelemetry.io/collector/consumer v0.0.0-20221117234814-4565692c50a7 h1:FTy1JD9EJ7gq9SzlZoi2NkGcZ88+SwdiJav5uRcDEEY= +go.opentelemetry.io/collector/consumer v0.0.0-20221117234814-4565692c50a7/go.mod h1:86Elcw/LLrh90DprArogHMkBX3+UMu3tIgcVWF3mr6o= +go.opentelemetry.io/collector/featuregate v0.0.0-20221117214536-6a117bfc3737 h1:7sXg6M9Fw6rFVlX+iaWOMz6DFXEiroUdQer5kWGixwM= +go.opentelemetry.io/collector/featuregate v0.0.0-20221117214536-6a117bfc3737/go.mod h1:tewuFKJYalWBU0bmNKg++MC1ipINXUr6szYzOw2p1GI= +go.opentelemetry.io/collector/pdata v0.64.2-0.20221117234814-4565692c50a7 h1:IOFqfOu7fFxTgC7pvc2U7dk1/uFjwVQPK+CALiUvacI= +go.opentelemetry.io/collector/pdata v0.64.2-0.20221117234814-4565692c50a7/go.mod h1:0vynPfW2ZN7DltpcCFgCmTtWMQkCjp2a3TNt82YTCLQ= go.opentelemetry.io/otel v1.11.1 h1:4WLLAmcfkmDk2ukNXJyq3/kiz/3UzCaYq6PskJsaou4= go.opentelemetry.io/otel v1.11.1/go.mod h1:1nNhXBbWSD0nsL38H6btgnFN2k4i0sNLHNNMZMSbUGE= go.opentelemetry.io/otel/metric v0.33.0 h1:xQAyl7uGEYvrLAiV/09iTJlp1pZnQ9Wl793qbVvED1E= diff --git a/extension/bearertokenauthextension/config_test.go b/extension/bearertokenauthextension/config_test.go index 347d48e36d133..903909054788a 100644 --- a/extension/bearertokenauthextension/config_test.go +++ b/extension/bearertokenauthextension/config_test.go @@ -64,10 +64,10 @@ func TestLoadConfig(t *testing.T) { require.NoError(t, err) require.NoError(t, component.UnmarshalExtensionConfig(sub, cfg)) if tt.expectedErr { - assert.Error(t, cfg.Validate()) + assert.Error(t, component.ValidateConfig(cfg)) return } - assert.NoError(t, cfg.Validate()) + assert.NoError(t, component.ValidateConfig(cfg)) assert.Equal(t, tt.expected, cfg) }) } diff --git a/extension/bearertokenauthextension/go.mod b/extension/bearertokenauthextension/go.mod index aab398cceb9e8..94c193255536f 100644 --- a/extension/bearertokenauthextension/go.mod +++ b/extension/bearertokenauthextension/go.mod @@ -5,7 +5,8 @@ go 1.18 require ( github.com/fsnotify/fsnotify v1.6.0 github.com/stretchr/testify v1.8.1 - go.opentelemetry.io/collector v0.64.2-0.20221115155901-1550938c18fd + go.opentelemetry.io/collector v0.64.2-0.20221117234814-4565692c50a7 + go.opentelemetry.io/collector/component v0.0.0-20221117234814-4565692c50a7 go.uber.org/zap v1.23.0 google.golang.org/grpc v1.50.1 ) @@ -25,7 +26,9 @@ require ( github.com/modern-go/reflect2 v1.0.2 // indirect github.com/pelletier/go-toml v1.9.4 // indirect github.com/pmezard/go-difflib v1.0.0 // indirect - go.opentelemetry.io/collector/pdata v0.64.2-0.20221115155901-1550938c18fd // indirect + go.opentelemetry.io/collector/consumer v0.0.0-20221117234814-4565692c50a7 // indirect + go.opentelemetry.io/collector/featuregate v0.0.0-20221117214536-6a117bfc3737 // indirect + go.opentelemetry.io/collector/pdata v0.64.2-0.20221117234814-4565692c50a7 // indirect go.opentelemetry.io/otel v1.11.1 // indirect go.opentelemetry.io/otel/metric v0.33.0 // indirect go.opentelemetry.io/otel/trace v1.11.1 // indirect diff --git a/extension/bearertokenauthextension/go.sum b/extension/bearertokenauthextension/go.sum index bb0af140d3e2a..219ee50206f3c 100644 --- a/extension/bearertokenauthextension/go.sum +++ b/extension/bearertokenauthextension/go.sum @@ -266,10 +266,16 @@ github.com/yuin/goldmark v1.3.5/go.mod h1:mwnBkeHKe2W/ZEtQ+71ViKU8L12m81fl3OWwC1 go.etcd.io/etcd/api/v3 v3.5.4/go.mod h1:5GB2vv4A4AOn3yk7MftYGHkUfGtDHnEraIjym4dYz5A= go.etcd.io/etcd/client/pkg/v3 v3.5.4/go.mod h1:IJHfcCEKxYu1Os13ZdwCwIUTUVGYTSAM3YSwc9/Ac1g= go.etcd.io/etcd/client/v3 v3.5.4/go.mod h1:ZaRkVgBZC+L+dLCjTcF1hRXpgZXQPOvnA/Ak/gq3kiY= -go.opentelemetry.io/collector v0.64.2-0.20221115155901-1550938c18fd h1:O+6HhE4Ivg8Jksp3dIXIEC4FIR0Ush4uORvG3UtHZWk= -go.opentelemetry.io/collector v0.64.2-0.20221115155901-1550938c18fd/go.mod h1:mmSrOcwe1vEYmChXUYuF6rzlrUL0rjEiPfa19Xxb41o= -go.opentelemetry.io/collector/pdata v0.64.2-0.20221115155901-1550938c18fd h1:GdVAbRiae5VDZe3Mn3FqzMxO/aI5UbJ4+dcviqClHy8= -go.opentelemetry.io/collector/pdata v0.64.2-0.20221115155901-1550938c18fd/go.mod h1:0vynPfW2ZN7DltpcCFgCmTtWMQkCjp2a3TNt82YTCLQ= +go.opentelemetry.io/collector v0.64.2-0.20221117234814-4565692c50a7 h1:o/vMr2iyXzaeTb/KAldhMxAvRIfFPwtKfL5cKVKsSlU= +go.opentelemetry.io/collector v0.64.2-0.20221117234814-4565692c50a7/go.mod h1:PO8hayFFYvXDqELbXRVxwawR2HTdjN6mY4Qa3Se9xI8= +go.opentelemetry.io/collector/component v0.0.0-20221117234814-4565692c50a7 h1:q9m1bGHhQFUakQX79lZpLmFSY9VLULNSs2jUG8MdJLA= +go.opentelemetry.io/collector/component v0.0.0-20221117234814-4565692c50a7/go.mod h1:Z7H1Oj826e4dtVxXmT6SiUr6S0EIevUJmkVpfQV+UOk= +go.opentelemetry.io/collector/consumer v0.0.0-20221117234814-4565692c50a7 h1:FTy1JD9EJ7gq9SzlZoi2NkGcZ88+SwdiJav5uRcDEEY= +go.opentelemetry.io/collector/consumer v0.0.0-20221117234814-4565692c50a7/go.mod h1:86Elcw/LLrh90DprArogHMkBX3+UMu3tIgcVWF3mr6o= +go.opentelemetry.io/collector/featuregate v0.0.0-20221117214536-6a117bfc3737 h1:7sXg6M9Fw6rFVlX+iaWOMz6DFXEiroUdQer5kWGixwM= +go.opentelemetry.io/collector/featuregate v0.0.0-20221117214536-6a117bfc3737/go.mod h1:tewuFKJYalWBU0bmNKg++MC1ipINXUr6szYzOw2p1GI= +go.opentelemetry.io/collector/pdata v0.64.2-0.20221117234814-4565692c50a7 h1:IOFqfOu7fFxTgC7pvc2U7dk1/uFjwVQPK+CALiUvacI= +go.opentelemetry.io/collector/pdata v0.64.2-0.20221117234814-4565692c50a7/go.mod h1:0vynPfW2ZN7DltpcCFgCmTtWMQkCjp2a3TNt82YTCLQ= go.opentelemetry.io/otel v1.11.1 h1:4WLLAmcfkmDk2ukNXJyq3/kiz/3UzCaYq6PskJsaou4= go.opentelemetry.io/otel v1.11.1/go.mod h1:1nNhXBbWSD0nsL38H6btgnFN2k4i0sNLHNNMZMSbUGE= go.opentelemetry.io/otel/metric v0.33.0 h1:xQAyl7uGEYvrLAiV/09iTJlp1pZnQ9Wl793qbVvED1E= diff --git a/extension/fluentbitextension/config_test.go b/extension/fluentbitextension/config_test.go index 7a8455d91cbe5..958054224e236 100644 --- a/extension/fluentbitextension/config_test.go +++ b/extension/fluentbitextension/config_test.go @@ -54,7 +54,7 @@ func TestLoadConfig(t *testing.T) { require.NoError(t, err) require.NoError(t, component.UnmarshalExtensionConfig(sub, cfg)) - assert.NoError(t, cfg.Validate()) + assert.NoError(t, component.ValidateConfig(cfg)) assert.Equal(t, tt.expected, cfg) }) } diff --git a/extension/fluentbitextension/go.mod b/extension/fluentbitextension/go.mod index e6423b7350243..4d61c693858ac 100644 --- a/extension/fluentbitextension/go.mod +++ b/extension/fluentbitextension/go.mod @@ -7,7 +7,8 @@ require ( github.com/davecgh/go-spew v1.1.1 github.com/shirou/gopsutil/v3 v3.22.10 github.com/stretchr/testify v1.8.1 - go.opentelemetry.io/collector v0.64.2-0.20221115155901-1550938c18fd + go.opentelemetry.io/collector v0.64.2-0.20221117234814-4565692c50a7 + go.opentelemetry.io/collector/component v0.0.0-20221117234814-4565692c50a7 go.uber.org/zap v1.23.0 ) @@ -31,7 +32,9 @@ require ( github.com/tklauser/go-sysconf v0.3.10 // indirect github.com/tklauser/numcpus v0.4.0 // indirect github.com/yusufpapurcu/wmi v1.2.2 // indirect - go.opentelemetry.io/collector/pdata v0.64.2-0.20221115155901-1550938c18fd // indirect + go.opentelemetry.io/collector/consumer v0.0.0-20221117234814-4565692c50a7 // indirect + go.opentelemetry.io/collector/featuregate v0.0.0-20221117214536-6a117bfc3737 // indirect + go.opentelemetry.io/collector/pdata v0.64.2-0.20221117234814-4565692c50a7 // indirect go.opentelemetry.io/otel v1.11.1 // indirect go.opentelemetry.io/otel/metric v0.33.0 // indirect go.opentelemetry.io/otel/trace v1.11.1 // indirect diff --git a/extension/fluentbitextension/go.sum b/extension/fluentbitextension/go.sum index 97f98214b7e53..2a417455a15d9 100644 --- a/extension/fluentbitextension/go.sum +++ b/extension/fluentbitextension/go.sum @@ -280,10 +280,16 @@ github.com/yusufpapurcu/wmi v1.2.2/go.mod h1:SBZ9tNy3G9/m5Oi98Zks0QjeHVDvuK0qfxQ go.etcd.io/etcd/api/v3 v3.5.4/go.mod h1:5GB2vv4A4AOn3yk7MftYGHkUfGtDHnEraIjym4dYz5A= go.etcd.io/etcd/client/pkg/v3 v3.5.4/go.mod h1:IJHfcCEKxYu1Os13ZdwCwIUTUVGYTSAM3YSwc9/Ac1g= go.etcd.io/etcd/client/v3 v3.5.4/go.mod h1:ZaRkVgBZC+L+dLCjTcF1hRXpgZXQPOvnA/Ak/gq3kiY= -go.opentelemetry.io/collector v0.64.2-0.20221115155901-1550938c18fd h1:O+6HhE4Ivg8Jksp3dIXIEC4FIR0Ush4uORvG3UtHZWk= -go.opentelemetry.io/collector v0.64.2-0.20221115155901-1550938c18fd/go.mod h1:mmSrOcwe1vEYmChXUYuF6rzlrUL0rjEiPfa19Xxb41o= -go.opentelemetry.io/collector/pdata v0.64.2-0.20221115155901-1550938c18fd h1:GdVAbRiae5VDZe3Mn3FqzMxO/aI5UbJ4+dcviqClHy8= -go.opentelemetry.io/collector/pdata v0.64.2-0.20221115155901-1550938c18fd/go.mod h1:0vynPfW2ZN7DltpcCFgCmTtWMQkCjp2a3TNt82YTCLQ= +go.opentelemetry.io/collector v0.64.2-0.20221117234814-4565692c50a7 h1:o/vMr2iyXzaeTb/KAldhMxAvRIfFPwtKfL5cKVKsSlU= +go.opentelemetry.io/collector v0.64.2-0.20221117234814-4565692c50a7/go.mod h1:PO8hayFFYvXDqELbXRVxwawR2HTdjN6mY4Qa3Se9xI8= +go.opentelemetry.io/collector/component v0.0.0-20221117234814-4565692c50a7 h1:q9m1bGHhQFUakQX79lZpLmFSY9VLULNSs2jUG8MdJLA= +go.opentelemetry.io/collector/component v0.0.0-20221117234814-4565692c50a7/go.mod h1:Z7H1Oj826e4dtVxXmT6SiUr6S0EIevUJmkVpfQV+UOk= +go.opentelemetry.io/collector/consumer v0.0.0-20221117234814-4565692c50a7 h1:FTy1JD9EJ7gq9SzlZoi2NkGcZ88+SwdiJav5uRcDEEY= +go.opentelemetry.io/collector/consumer v0.0.0-20221117234814-4565692c50a7/go.mod h1:86Elcw/LLrh90DprArogHMkBX3+UMu3tIgcVWF3mr6o= +go.opentelemetry.io/collector/featuregate v0.0.0-20221117214536-6a117bfc3737 h1:7sXg6M9Fw6rFVlX+iaWOMz6DFXEiroUdQer5kWGixwM= +go.opentelemetry.io/collector/featuregate v0.0.0-20221117214536-6a117bfc3737/go.mod h1:tewuFKJYalWBU0bmNKg++MC1ipINXUr6szYzOw2p1GI= +go.opentelemetry.io/collector/pdata v0.64.2-0.20221117234814-4565692c50a7 h1:IOFqfOu7fFxTgC7pvc2U7dk1/uFjwVQPK+CALiUvacI= +go.opentelemetry.io/collector/pdata v0.64.2-0.20221117234814-4565692c50a7/go.mod h1:0vynPfW2ZN7DltpcCFgCmTtWMQkCjp2a3TNt82YTCLQ= go.opentelemetry.io/otel v1.11.1 h1:4WLLAmcfkmDk2ukNXJyq3/kiz/3UzCaYq6PskJsaou4= go.opentelemetry.io/otel v1.11.1/go.mod h1:1nNhXBbWSD0nsL38H6btgnFN2k4i0sNLHNNMZMSbUGE= go.opentelemetry.io/otel/metric v0.33.0 h1:xQAyl7uGEYvrLAiV/09iTJlp1pZnQ9Wl793qbVvED1E= diff --git a/extension/headerssetterextension/factory.go b/extension/headerssetterextension/factory.go index 45ed2f4f39811..b5cdd9a150cb7 100644 --- a/extension/headerssetterextension/factory.go +++ b/extension/headerssetterextension/factory.go @@ -31,7 +31,7 @@ func NewFactory() component.ExtensionFactory { typeStr, createDefaultConfig, createExtension, - component.StabilityLevelInDevelopment, + component.StabilityLevelDevelopment, ) } diff --git a/extension/headerssetterextension/go.mod b/extension/headerssetterextension/go.mod index b444b11a199b0..eec076a14b3de 100644 --- a/extension/headerssetterextension/go.mod +++ b/extension/headerssetterextension/go.mod @@ -4,7 +4,8 @@ go 1.18 require ( github.com/stretchr/testify v1.8.1 - go.opentelemetry.io/collector v0.64.2-0.20221115155901-1550938c18fd + go.opentelemetry.io/collector v0.64.2-0.20221117234814-4565692c50a7 + go.opentelemetry.io/collector/component v0.0.0-20221117234814-4565692c50a7 google.golang.org/grpc v1.50.1 ) @@ -20,7 +21,9 @@ require ( github.com/modern-go/concurrent v0.0.0-20180306012644-bacd9c7ef1dd // indirect github.com/modern-go/reflect2 v1.0.2 // indirect github.com/pmezard/go-difflib v1.0.0 // indirect - go.opentelemetry.io/collector/pdata v0.64.2-0.20221115155901-1550938c18fd // indirect + go.opentelemetry.io/collector/consumer v0.0.0-20221117234814-4565692c50a7 // indirect + go.opentelemetry.io/collector/featuregate v0.0.0-20221117214536-6a117bfc3737 // indirect + go.opentelemetry.io/collector/pdata v0.64.2-0.20221117234814-4565692c50a7 // indirect go.opentelemetry.io/otel v1.11.1 // indirect go.opentelemetry.io/otel/metric v0.33.0 // indirect go.opentelemetry.io/otel/trace v1.11.1 // indirect diff --git a/extension/headerssetterextension/go.sum b/extension/headerssetterextension/go.sum index 966e61d8b31ba..a56acff9f4c86 100644 --- a/extension/headerssetterextension/go.sum +++ b/extension/headerssetterextension/go.sum @@ -257,10 +257,16 @@ github.com/yuin/goldmark v1.3.5/go.mod h1:mwnBkeHKe2W/ZEtQ+71ViKU8L12m81fl3OWwC1 go.etcd.io/etcd/api/v3 v3.5.4/go.mod h1:5GB2vv4A4AOn3yk7MftYGHkUfGtDHnEraIjym4dYz5A= go.etcd.io/etcd/client/pkg/v3 v3.5.4/go.mod h1:IJHfcCEKxYu1Os13ZdwCwIUTUVGYTSAM3YSwc9/Ac1g= go.etcd.io/etcd/client/v3 v3.5.4/go.mod h1:ZaRkVgBZC+L+dLCjTcF1hRXpgZXQPOvnA/Ak/gq3kiY= -go.opentelemetry.io/collector v0.64.2-0.20221115155901-1550938c18fd h1:O+6HhE4Ivg8Jksp3dIXIEC4FIR0Ush4uORvG3UtHZWk= -go.opentelemetry.io/collector v0.64.2-0.20221115155901-1550938c18fd/go.mod h1:mmSrOcwe1vEYmChXUYuF6rzlrUL0rjEiPfa19Xxb41o= -go.opentelemetry.io/collector/pdata v0.64.2-0.20221115155901-1550938c18fd h1:GdVAbRiae5VDZe3Mn3FqzMxO/aI5UbJ4+dcviqClHy8= -go.opentelemetry.io/collector/pdata v0.64.2-0.20221115155901-1550938c18fd/go.mod h1:0vynPfW2ZN7DltpcCFgCmTtWMQkCjp2a3TNt82YTCLQ= +go.opentelemetry.io/collector v0.64.2-0.20221117234814-4565692c50a7 h1:o/vMr2iyXzaeTb/KAldhMxAvRIfFPwtKfL5cKVKsSlU= +go.opentelemetry.io/collector v0.64.2-0.20221117234814-4565692c50a7/go.mod h1:PO8hayFFYvXDqELbXRVxwawR2HTdjN6mY4Qa3Se9xI8= +go.opentelemetry.io/collector/component v0.0.0-20221117234814-4565692c50a7 h1:q9m1bGHhQFUakQX79lZpLmFSY9VLULNSs2jUG8MdJLA= +go.opentelemetry.io/collector/component v0.0.0-20221117234814-4565692c50a7/go.mod h1:Z7H1Oj826e4dtVxXmT6SiUr6S0EIevUJmkVpfQV+UOk= +go.opentelemetry.io/collector/consumer v0.0.0-20221117234814-4565692c50a7 h1:FTy1JD9EJ7gq9SzlZoi2NkGcZ88+SwdiJav5uRcDEEY= +go.opentelemetry.io/collector/consumer v0.0.0-20221117234814-4565692c50a7/go.mod h1:86Elcw/LLrh90DprArogHMkBX3+UMu3tIgcVWF3mr6o= +go.opentelemetry.io/collector/featuregate v0.0.0-20221117214536-6a117bfc3737 h1:7sXg6M9Fw6rFVlX+iaWOMz6DFXEiroUdQer5kWGixwM= +go.opentelemetry.io/collector/featuregate v0.0.0-20221117214536-6a117bfc3737/go.mod h1:tewuFKJYalWBU0bmNKg++MC1ipINXUr6szYzOw2p1GI= +go.opentelemetry.io/collector/pdata v0.64.2-0.20221117234814-4565692c50a7 h1:IOFqfOu7fFxTgC7pvc2U7dk1/uFjwVQPK+CALiUvacI= +go.opentelemetry.io/collector/pdata v0.64.2-0.20221117234814-4565692c50a7/go.mod h1:0vynPfW2ZN7DltpcCFgCmTtWMQkCjp2a3TNt82YTCLQ= go.opentelemetry.io/otel v1.11.1 h1:4WLLAmcfkmDk2ukNXJyq3/kiz/3UzCaYq6PskJsaou4= go.opentelemetry.io/otel v1.11.1/go.mod h1:1nNhXBbWSD0nsL38H6btgnFN2k4i0sNLHNNMZMSbUGE= go.opentelemetry.io/otel/metric v0.33.0 h1:xQAyl7uGEYvrLAiV/09iTJlp1pZnQ9Wl793qbVvED1E= diff --git a/extension/healthcheckextension/config_test.go b/extension/healthcheckextension/config_test.go index 957cbd5999c7b..147011afa37fc 100644 --- a/extension/healthcheckextension/config_test.go +++ b/extension/healthcheckextension/config_test.go @@ -80,10 +80,10 @@ func TestLoadConfig(t *testing.T) { require.NoError(t, err) require.NoError(t, component.UnmarshalExtensionConfig(sub, cfg)) if tt.expectedErr != nil { - assert.ErrorIs(t, cfg.Validate(), tt.expectedErr) + assert.ErrorIs(t, component.ValidateConfig(cfg), tt.expectedErr) return } - assert.NoError(t, cfg.Validate()) + assert.NoError(t, component.ValidateConfig(cfg)) assert.Equal(t, tt.expected, cfg) }) } diff --git a/extension/healthcheckextension/go.mod b/extension/healthcheckextension/go.mod index b58ad73728983..3e850d151b858 100644 --- a/extension/healthcheckextension/go.mod +++ b/extension/healthcheckextension/go.mod @@ -7,7 +7,8 @@ require ( github.com/open-telemetry/opentelemetry-collector-contrib/internal/common v0.64.0 github.com/stretchr/testify v1.8.1 go.opencensus.io v0.24.0 - go.opentelemetry.io/collector v0.64.2-0.20221115155901-1550938c18fd + go.opentelemetry.io/collector v0.64.2-0.20221117234814-4565692c50a7 + go.opentelemetry.io/collector/component v0.0.0-20221117234814-4565692c50a7 go.uber.org/zap v1.23.0 ) @@ -29,7 +30,9 @@ require ( github.com/modern-go/reflect2 v1.0.2 // indirect github.com/pmezard/go-difflib v1.0.0 // indirect github.com/rs/cors v1.8.2 // indirect - go.opentelemetry.io/collector/pdata v0.64.2-0.20221115155901-1550938c18fd // indirect + go.opentelemetry.io/collector/consumer v0.0.0-20221117234814-4565692c50a7 // indirect + go.opentelemetry.io/collector/featuregate v0.0.0-20221117214536-6a117bfc3737 // indirect + go.opentelemetry.io/collector/pdata v0.64.2-0.20221117234814-4565692c50a7 // indirect go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.36.4 // indirect go.opentelemetry.io/otel v1.11.1 // indirect go.opentelemetry.io/otel/metric v0.33.0 // indirect diff --git a/extension/healthcheckextension/go.sum b/extension/healthcheckextension/go.sum index 235e1413dd4ed..c493cf3be33f5 100644 --- a/extension/healthcheckextension/go.sum +++ b/extension/healthcheckextension/go.sum @@ -272,10 +272,16 @@ go.etcd.io/etcd/client/pkg/v3 v3.5.4/go.mod h1:IJHfcCEKxYu1Os13ZdwCwIUTUVGYTSAM3 go.etcd.io/etcd/client/v3 v3.5.4/go.mod h1:ZaRkVgBZC+L+dLCjTcF1hRXpgZXQPOvnA/Ak/gq3kiY= go.opencensus.io v0.24.0 h1:y73uSU6J157QMP2kn2r30vwW1A2W2WFwSCGnAVxeaD0= go.opencensus.io v0.24.0/go.mod h1:vNK8G9p7aAivkbmorf4v+7Hgx+Zs0yY+0fOtgBfjQKo= -go.opentelemetry.io/collector v0.64.2-0.20221115155901-1550938c18fd h1:O+6HhE4Ivg8Jksp3dIXIEC4FIR0Ush4uORvG3UtHZWk= -go.opentelemetry.io/collector v0.64.2-0.20221115155901-1550938c18fd/go.mod h1:mmSrOcwe1vEYmChXUYuF6rzlrUL0rjEiPfa19Xxb41o= -go.opentelemetry.io/collector/pdata v0.64.2-0.20221115155901-1550938c18fd h1:GdVAbRiae5VDZe3Mn3FqzMxO/aI5UbJ4+dcviqClHy8= -go.opentelemetry.io/collector/pdata v0.64.2-0.20221115155901-1550938c18fd/go.mod h1:0vynPfW2ZN7DltpcCFgCmTtWMQkCjp2a3TNt82YTCLQ= +go.opentelemetry.io/collector v0.64.2-0.20221117234814-4565692c50a7 h1:o/vMr2iyXzaeTb/KAldhMxAvRIfFPwtKfL5cKVKsSlU= +go.opentelemetry.io/collector v0.64.2-0.20221117234814-4565692c50a7/go.mod h1:PO8hayFFYvXDqELbXRVxwawR2HTdjN6mY4Qa3Se9xI8= +go.opentelemetry.io/collector/component v0.0.0-20221117234814-4565692c50a7 h1:q9m1bGHhQFUakQX79lZpLmFSY9VLULNSs2jUG8MdJLA= +go.opentelemetry.io/collector/component v0.0.0-20221117234814-4565692c50a7/go.mod h1:Z7H1Oj826e4dtVxXmT6SiUr6S0EIevUJmkVpfQV+UOk= +go.opentelemetry.io/collector/consumer v0.0.0-20221117234814-4565692c50a7 h1:FTy1JD9EJ7gq9SzlZoi2NkGcZ88+SwdiJav5uRcDEEY= +go.opentelemetry.io/collector/consumer v0.0.0-20221117234814-4565692c50a7/go.mod h1:86Elcw/LLrh90DprArogHMkBX3+UMu3tIgcVWF3mr6o= +go.opentelemetry.io/collector/featuregate v0.0.0-20221117214536-6a117bfc3737 h1:7sXg6M9Fw6rFVlX+iaWOMz6DFXEiroUdQer5kWGixwM= +go.opentelemetry.io/collector/featuregate v0.0.0-20221117214536-6a117bfc3737/go.mod h1:tewuFKJYalWBU0bmNKg++MC1ipINXUr6szYzOw2p1GI= +go.opentelemetry.io/collector/pdata v0.64.2-0.20221117234814-4565692c50a7 h1:IOFqfOu7fFxTgC7pvc2U7dk1/uFjwVQPK+CALiUvacI= +go.opentelemetry.io/collector/pdata v0.64.2-0.20221117234814-4565692c50a7/go.mod h1:0vynPfW2ZN7DltpcCFgCmTtWMQkCjp2a3TNt82YTCLQ= go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.36.4 h1:aUEBEdCa6iamGzg6fuYxDA8ThxvOG240mAvWDU+XLio= go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.36.4/go.mod h1:l2MdsbKTocpPS5nQZscqTR9jd8u96VYZdcpF8Sye7mA= go.opentelemetry.io/otel v1.11.1 h1:4WLLAmcfkmDk2ukNXJyq3/kiz/3UzCaYq6PskJsaou4= diff --git a/extension/httpforwarder/config_test.go b/extension/httpforwarder/config_test.go index fb2e21fe33467..f02afab2d0d6e 100644 --- a/extension/httpforwarder/config_test.go +++ b/extension/httpforwarder/config_test.go @@ -64,7 +64,7 @@ func TestLoadConfig(t *testing.T) { sub, err := cm.Sub(tt.id.String()) require.NoError(t, err) require.NoError(t, component.UnmarshalExtensionConfig(sub, cfg)) - assert.NoError(t, cfg.Validate()) + assert.NoError(t, component.ValidateConfig(cfg)) assert.Equal(t, tt.expected, cfg) }) } diff --git a/extension/httpforwarder/go.mod b/extension/httpforwarder/go.mod index 591de599efa18..8e327c21150ce 100644 --- a/extension/httpforwarder/go.mod +++ b/extension/httpforwarder/go.mod @@ -5,7 +5,8 @@ go 1.18 require ( github.com/open-telemetry/opentelemetry-collector-contrib/internal/common v0.64.0 github.com/stretchr/testify v1.8.1 - go.opentelemetry.io/collector v0.64.2-0.20221115155901-1550938c18fd + go.opentelemetry.io/collector v0.64.2-0.20221117234814-4565692c50a7 + go.opentelemetry.io/collector/component v0.0.0-20221117234814-4565692c50a7 go.uber.org/zap v1.23.0 ) @@ -31,7 +32,9 @@ require ( github.com/pmezard/go-difflib v1.0.0 // indirect github.com/rogpeppe/go-internal v1.8.0 // indirect github.com/rs/cors v1.8.2 // indirect - go.opentelemetry.io/collector/pdata v0.64.2-0.20221115155901-1550938c18fd // indirect + go.opentelemetry.io/collector/consumer v0.0.0-20221117234814-4565692c50a7 // indirect + go.opentelemetry.io/collector/featuregate v0.0.0-20221117214536-6a117bfc3737 // indirect + go.opentelemetry.io/collector/pdata v0.64.2-0.20221117234814-4565692c50a7 // indirect go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.36.4 // indirect go.opentelemetry.io/otel v1.11.1 // indirect go.opentelemetry.io/otel/metric v0.33.0 // indirect diff --git a/extension/httpforwarder/go.sum b/extension/httpforwarder/go.sum index d381d39e45c06..d0f8d1f898e8f 100644 --- a/extension/httpforwarder/go.sum +++ b/extension/httpforwarder/go.sum @@ -279,10 +279,16 @@ github.com/yuin/goldmark v1.3.5/go.mod h1:mwnBkeHKe2W/ZEtQ+71ViKU8L12m81fl3OWwC1 go.etcd.io/etcd/api/v3 v3.5.4/go.mod h1:5GB2vv4A4AOn3yk7MftYGHkUfGtDHnEraIjym4dYz5A= go.etcd.io/etcd/client/pkg/v3 v3.5.4/go.mod h1:IJHfcCEKxYu1Os13ZdwCwIUTUVGYTSAM3YSwc9/Ac1g= go.etcd.io/etcd/client/v3 v3.5.4/go.mod h1:ZaRkVgBZC+L+dLCjTcF1hRXpgZXQPOvnA/Ak/gq3kiY= -go.opentelemetry.io/collector v0.64.2-0.20221115155901-1550938c18fd h1:O+6HhE4Ivg8Jksp3dIXIEC4FIR0Ush4uORvG3UtHZWk= -go.opentelemetry.io/collector v0.64.2-0.20221115155901-1550938c18fd/go.mod h1:mmSrOcwe1vEYmChXUYuF6rzlrUL0rjEiPfa19Xxb41o= -go.opentelemetry.io/collector/pdata v0.64.2-0.20221115155901-1550938c18fd h1:GdVAbRiae5VDZe3Mn3FqzMxO/aI5UbJ4+dcviqClHy8= -go.opentelemetry.io/collector/pdata v0.64.2-0.20221115155901-1550938c18fd/go.mod h1:0vynPfW2ZN7DltpcCFgCmTtWMQkCjp2a3TNt82YTCLQ= +go.opentelemetry.io/collector v0.64.2-0.20221117234814-4565692c50a7 h1:o/vMr2iyXzaeTb/KAldhMxAvRIfFPwtKfL5cKVKsSlU= +go.opentelemetry.io/collector v0.64.2-0.20221117234814-4565692c50a7/go.mod h1:PO8hayFFYvXDqELbXRVxwawR2HTdjN6mY4Qa3Se9xI8= +go.opentelemetry.io/collector/component v0.0.0-20221117234814-4565692c50a7 h1:q9m1bGHhQFUakQX79lZpLmFSY9VLULNSs2jUG8MdJLA= +go.opentelemetry.io/collector/component v0.0.0-20221117234814-4565692c50a7/go.mod h1:Z7H1Oj826e4dtVxXmT6SiUr6S0EIevUJmkVpfQV+UOk= +go.opentelemetry.io/collector/consumer v0.0.0-20221117234814-4565692c50a7 h1:FTy1JD9EJ7gq9SzlZoi2NkGcZ88+SwdiJav5uRcDEEY= +go.opentelemetry.io/collector/consumer v0.0.0-20221117234814-4565692c50a7/go.mod h1:86Elcw/LLrh90DprArogHMkBX3+UMu3tIgcVWF3mr6o= +go.opentelemetry.io/collector/featuregate v0.0.0-20221117214536-6a117bfc3737 h1:7sXg6M9Fw6rFVlX+iaWOMz6DFXEiroUdQer5kWGixwM= +go.opentelemetry.io/collector/featuregate v0.0.0-20221117214536-6a117bfc3737/go.mod h1:tewuFKJYalWBU0bmNKg++MC1ipINXUr6szYzOw2p1GI= +go.opentelemetry.io/collector/pdata v0.64.2-0.20221117234814-4565692c50a7 h1:IOFqfOu7fFxTgC7pvc2U7dk1/uFjwVQPK+CALiUvacI= +go.opentelemetry.io/collector/pdata v0.64.2-0.20221117234814-4565692c50a7/go.mod h1:0vynPfW2ZN7DltpcCFgCmTtWMQkCjp2a3TNt82YTCLQ= go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.36.4 h1:aUEBEdCa6iamGzg6fuYxDA8ThxvOG240mAvWDU+XLio= go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.36.4/go.mod h1:l2MdsbKTocpPS5nQZscqTR9jd8u96VYZdcpF8Sye7mA= go.opentelemetry.io/otel v1.11.1 h1:4WLLAmcfkmDk2ukNXJyq3/kiz/3UzCaYq6PskJsaou4= diff --git a/extension/jaegerremotesampling/config_test.go b/extension/jaegerremotesampling/config_test.go index 7e7e9720ecbdf..2c3d0ea315644 100644 --- a/extension/jaegerremotesampling/config_test.go +++ b/extension/jaegerremotesampling/config_test.go @@ -77,7 +77,7 @@ func TestLoadConfig(t *testing.T) { sub, err := cm.Sub(tt.id.String()) require.NoError(t, err) require.NoError(t, component.UnmarshalExtensionConfig(sub, cfg)) - assert.NoError(t, cfg.Validate()) + assert.NoError(t, component.ValidateConfig(cfg)) assert.Equal(t, tt.expected, cfg) }) } diff --git a/extension/jaegerremotesampling/go.mod b/extension/jaegerremotesampling/go.mod index df983e343f7f7..3acd8a9ae9e4b 100644 --- a/extension/jaegerremotesampling/go.mod +++ b/extension/jaegerremotesampling/go.mod @@ -5,7 +5,8 @@ go 1.18 require ( github.com/jaegertracing/jaeger v1.39.1-0.20221110195127-14c11365a856 github.com/stretchr/testify v1.8.1 - go.opentelemetry.io/collector v0.64.2-0.20221115155901-1550938c18fd + go.opentelemetry.io/collector v0.64.2-0.20221117234814-4565692c50a7 + go.opentelemetry.io/collector/component v0.0.0-20221117234814-4565692c50a7 go.uber.org/zap v1.23.0 google.golang.org/grpc v1.50.1 ) @@ -45,7 +46,9 @@ require ( github.com/subosito/gotenv v1.4.1 // indirect github.com/uber/jaeger-client-go v2.30.0+incompatible // indirect github.com/uber/jaeger-lib v2.4.1+incompatible // indirect - go.opentelemetry.io/collector/pdata v0.64.2-0.20221115155901-1550938c18fd // indirect + go.opentelemetry.io/collector/consumer v0.0.0-20221117234814-4565692c50a7 // indirect + go.opentelemetry.io/collector/featuregate v0.0.0-20221117214536-6a117bfc3737 // indirect + go.opentelemetry.io/collector/pdata v0.64.2-0.20221117234814-4565692c50a7 // indirect go.opentelemetry.io/contrib/instrumentation/google.golang.org/grpc/otelgrpc v0.36.4 // indirect go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.36.4 // indirect go.opentelemetry.io/otel v1.11.1 // indirect diff --git a/extension/jaegerremotesampling/go.sum b/extension/jaegerremotesampling/go.sum index 6f86012f3adb7..bab82380af08d 100644 --- a/extension/jaegerremotesampling/go.sum +++ b/extension/jaegerremotesampling/go.sum @@ -423,10 +423,16 @@ go.opencensus.io v0.22.3/go.mod h1:yxeiOL68Rb0Xd1ddK5vPZ/oVn4vY4Ynel7k9FzqtOIw= go.opencensus.io v0.22.4/go.mod h1:yxeiOL68Rb0Xd1ddK5vPZ/oVn4vY4Ynel7k9FzqtOIw= go.opencensus.io v0.22.5/go.mod h1:5pWMHQbX5EPX2/62yrJeAkowc+lfs/XD7Uxpq3pI6kk= go.opencensus.io v0.24.0 h1:y73uSU6J157QMP2kn2r30vwW1A2W2WFwSCGnAVxeaD0= -go.opentelemetry.io/collector v0.64.2-0.20221115155901-1550938c18fd h1:O+6HhE4Ivg8Jksp3dIXIEC4FIR0Ush4uORvG3UtHZWk= -go.opentelemetry.io/collector v0.64.2-0.20221115155901-1550938c18fd/go.mod h1:mmSrOcwe1vEYmChXUYuF6rzlrUL0rjEiPfa19Xxb41o= -go.opentelemetry.io/collector/pdata v0.64.2-0.20221115155901-1550938c18fd h1:GdVAbRiae5VDZe3Mn3FqzMxO/aI5UbJ4+dcviqClHy8= -go.opentelemetry.io/collector/pdata v0.64.2-0.20221115155901-1550938c18fd/go.mod h1:0vynPfW2ZN7DltpcCFgCmTtWMQkCjp2a3TNt82YTCLQ= +go.opentelemetry.io/collector v0.64.2-0.20221117234814-4565692c50a7 h1:o/vMr2iyXzaeTb/KAldhMxAvRIfFPwtKfL5cKVKsSlU= +go.opentelemetry.io/collector v0.64.2-0.20221117234814-4565692c50a7/go.mod h1:PO8hayFFYvXDqELbXRVxwawR2HTdjN6mY4Qa3Se9xI8= +go.opentelemetry.io/collector/component v0.0.0-20221117234814-4565692c50a7 h1:q9m1bGHhQFUakQX79lZpLmFSY9VLULNSs2jUG8MdJLA= +go.opentelemetry.io/collector/component v0.0.0-20221117234814-4565692c50a7/go.mod h1:Z7H1Oj826e4dtVxXmT6SiUr6S0EIevUJmkVpfQV+UOk= +go.opentelemetry.io/collector/consumer v0.0.0-20221117234814-4565692c50a7 h1:FTy1JD9EJ7gq9SzlZoi2NkGcZ88+SwdiJav5uRcDEEY= +go.opentelemetry.io/collector/consumer v0.0.0-20221117234814-4565692c50a7/go.mod h1:86Elcw/LLrh90DprArogHMkBX3+UMu3tIgcVWF3mr6o= +go.opentelemetry.io/collector/featuregate v0.0.0-20221117214536-6a117bfc3737 h1:7sXg6M9Fw6rFVlX+iaWOMz6DFXEiroUdQer5kWGixwM= +go.opentelemetry.io/collector/featuregate v0.0.0-20221117214536-6a117bfc3737/go.mod h1:tewuFKJYalWBU0bmNKg++MC1ipINXUr6szYzOw2p1GI= +go.opentelemetry.io/collector/pdata v0.64.2-0.20221117234814-4565692c50a7 h1:IOFqfOu7fFxTgC7pvc2U7dk1/uFjwVQPK+CALiUvacI= +go.opentelemetry.io/collector/pdata v0.64.2-0.20221117234814-4565692c50a7/go.mod h1:0vynPfW2ZN7DltpcCFgCmTtWMQkCjp2a3TNt82YTCLQ= go.opentelemetry.io/contrib/instrumentation/google.golang.org/grpc/otelgrpc v0.36.4 h1:PRXhsszxTt5bbPriTjmaweWUsAnJYeWBhUMLRetUgBU= go.opentelemetry.io/contrib/instrumentation/google.golang.org/grpc/otelgrpc v0.36.4/go.mod h1:05eWWy6ZWzmpeImD3UowLTB3VjDMU1yxQ+ENuVWDM3c= go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.36.4 h1:aUEBEdCa6iamGzg6fuYxDA8ThxvOG240mAvWDU+XLio= diff --git a/extension/oauth2clientauthextension/config_test.go b/extension/oauth2clientauthextension/config_test.go index 2334f31d8f005..370e79a4ed259 100644 --- a/extension/oauth2clientauthextension/config_test.go +++ b/extension/oauth2clientauthextension/config_test.go @@ -92,10 +92,10 @@ func TestLoadConfig(t *testing.T) { require.NoError(t, err) require.NoError(t, component.UnmarshalExtensionConfig(sub, cfg)) if tt.expectedErr != nil { - assert.ErrorIs(t, cfg.Validate(), tt.expectedErr) + assert.ErrorIs(t, component.ValidateConfig(cfg), tt.expectedErr) return } - assert.NoError(t, cfg.Validate()) + assert.NoError(t, component.ValidateConfig(cfg)) assert.Equal(t, tt.expected, cfg) }) } diff --git a/extension/oauth2clientauthextension/go.mod b/extension/oauth2clientauthextension/go.mod index abc5076592cf4..0743fae652ce8 100644 --- a/extension/oauth2clientauthextension/go.mod +++ b/extension/oauth2clientauthextension/go.mod @@ -4,7 +4,8 @@ go 1.18 require ( github.com/stretchr/testify v1.8.1 - go.opentelemetry.io/collector v0.64.2-0.20221115155901-1550938c18fd + go.opentelemetry.io/collector v0.64.2-0.20221117234814-4565692c50a7 + go.opentelemetry.io/collector/component v0.0.0-20221117234814-4565692c50a7 go.uber.org/multierr v1.8.0 go.uber.org/zap v1.23.0 golang.org/x/oauth2 v0.0.0-20220909003341-f21342109be1 @@ -33,7 +34,9 @@ require ( github.com/pelletier/go-toml v1.9.4 // indirect github.com/pmezard/go-difflib v1.0.0 // indirect github.com/rs/cors v1.8.2 // indirect - go.opentelemetry.io/collector/pdata v0.64.2-0.20221115155901-1550938c18fd // indirect + go.opentelemetry.io/collector/consumer v0.0.0-20221117234814-4565692c50a7 // indirect + go.opentelemetry.io/collector/featuregate v0.0.0-20221117214536-6a117bfc3737 // indirect + go.opentelemetry.io/collector/pdata v0.64.2-0.20221117234814-4565692c50a7 // indirect go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.36.4 // indirect go.opentelemetry.io/otel v1.11.1 // indirect go.opentelemetry.io/otel/metric v0.33.0 // indirect diff --git a/extension/oauth2clientauthextension/go.sum b/extension/oauth2clientauthextension/go.sum index 5d238d2a8616d..789dd33b3e1c8 100644 --- a/extension/oauth2clientauthextension/go.sum +++ b/extension/oauth2clientauthextension/go.sum @@ -274,10 +274,16 @@ github.com/yuin/goldmark v1.3.5/go.mod h1:mwnBkeHKe2W/ZEtQ+71ViKU8L12m81fl3OWwC1 go.etcd.io/etcd/api/v3 v3.5.4/go.mod h1:5GB2vv4A4AOn3yk7MftYGHkUfGtDHnEraIjym4dYz5A= go.etcd.io/etcd/client/pkg/v3 v3.5.4/go.mod h1:IJHfcCEKxYu1Os13ZdwCwIUTUVGYTSAM3YSwc9/Ac1g= go.etcd.io/etcd/client/v3 v3.5.4/go.mod h1:ZaRkVgBZC+L+dLCjTcF1hRXpgZXQPOvnA/Ak/gq3kiY= -go.opentelemetry.io/collector v0.64.2-0.20221115155901-1550938c18fd h1:O+6HhE4Ivg8Jksp3dIXIEC4FIR0Ush4uORvG3UtHZWk= -go.opentelemetry.io/collector v0.64.2-0.20221115155901-1550938c18fd/go.mod h1:mmSrOcwe1vEYmChXUYuF6rzlrUL0rjEiPfa19Xxb41o= -go.opentelemetry.io/collector/pdata v0.64.2-0.20221115155901-1550938c18fd h1:GdVAbRiae5VDZe3Mn3FqzMxO/aI5UbJ4+dcviqClHy8= -go.opentelemetry.io/collector/pdata v0.64.2-0.20221115155901-1550938c18fd/go.mod h1:0vynPfW2ZN7DltpcCFgCmTtWMQkCjp2a3TNt82YTCLQ= +go.opentelemetry.io/collector v0.64.2-0.20221117234814-4565692c50a7 h1:o/vMr2iyXzaeTb/KAldhMxAvRIfFPwtKfL5cKVKsSlU= +go.opentelemetry.io/collector v0.64.2-0.20221117234814-4565692c50a7/go.mod h1:PO8hayFFYvXDqELbXRVxwawR2HTdjN6mY4Qa3Se9xI8= +go.opentelemetry.io/collector/component v0.0.0-20221117234814-4565692c50a7 h1:q9m1bGHhQFUakQX79lZpLmFSY9VLULNSs2jUG8MdJLA= +go.opentelemetry.io/collector/component v0.0.0-20221117234814-4565692c50a7/go.mod h1:Z7H1Oj826e4dtVxXmT6SiUr6S0EIevUJmkVpfQV+UOk= +go.opentelemetry.io/collector/consumer v0.0.0-20221117234814-4565692c50a7 h1:FTy1JD9EJ7gq9SzlZoi2NkGcZ88+SwdiJav5uRcDEEY= +go.opentelemetry.io/collector/consumer v0.0.0-20221117234814-4565692c50a7/go.mod h1:86Elcw/LLrh90DprArogHMkBX3+UMu3tIgcVWF3mr6o= +go.opentelemetry.io/collector/featuregate v0.0.0-20221117214536-6a117bfc3737 h1:7sXg6M9Fw6rFVlX+iaWOMz6DFXEiroUdQer5kWGixwM= +go.opentelemetry.io/collector/featuregate v0.0.0-20221117214536-6a117bfc3737/go.mod h1:tewuFKJYalWBU0bmNKg++MC1ipINXUr6szYzOw2p1GI= +go.opentelemetry.io/collector/pdata v0.64.2-0.20221117234814-4565692c50a7 h1:IOFqfOu7fFxTgC7pvc2U7dk1/uFjwVQPK+CALiUvacI= +go.opentelemetry.io/collector/pdata v0.64.2-0.20221117234814-4565692c50a7/go.mod h1:0vynPfW2ZN7DltpcCFgCmTtWMQkCjp2a3TNt82YTCLQ= go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.36.4 h1:aUEBEdCa6iamGzg6fuYxDA8ThxvOG240mAvWDU+XLio= go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.36.4/go.mod h1:l2MdsbKTocpPS5nQZscqTR9jd8u96VYZdcpF8Sye7mA= go.opentelemetry.io/otel v1.11.1 h1:4WLLAmcfkmDk2ukNXJyq3/kiz/3UzCaYq6PskJsaou4= diff --git a/extension/observer/dockerobserver/config_test.go b/extension/observer/dockerobserver/config_test.go index 6b51ba2070652..4426f95bf0e64 100644 --- a/extension/observer/dockerobserver/config_test.go +++ b/extension/observer/dockerobserver/config_test.go @@ -55,7 +55,7 @@ func TestLoadConfig(t *testing.T) { for _, tt := range tests { t.Run(tt.id.String(), func(t *testing.T) { cfg := loadConfig(t, tt.id) - assert.NoError(t, cfg.Validate()) + assert.NoError(t, component.ValidateConfig(cfg)) assert.Equal(t, tt.expected, cfg) }) } @@ -63,19 +63,19 @@ func TestLoadConfig(t *testing.T) { func TestValidateConfig(t *testing.T) { cfg := &Config{} - assert.Equal(t, "endpoint must be specified", cfg.Validate().Error()) + assert.Equal(t, "endpoint must be specified", component.ValidateConfig(cfg).Error()) cfg = &Config{Endpoint: "someEndpoint"} - assert.Equal(t, "api_version must be at least 1.22", cfg.Validate().Error()) + assert.Equal(t, "api_version must be at least 1.22", component.ValidateConfig(cfg).Error()) cfg = &Config{Endpoint: "someEndpoint", DockerAPIVersion: 1.22} - assert.Equal(t, "timeout must be specified", cfg.Validate().Error()) + assert.Equal(t, "timeout must be specified", component.ValidateConfig(cfg).Error()) cfg = &Config{Endpoint: "someEndpoint", DockerAPIVersion: 1.22, Timeout: 5 * time.Minute} - assert.Equal(t, "cache_sync_interval must be specified", cfg.Validate().Error()) + assert.Equal(t, "cache_sync_interval must be specified", component.ValidateConfig(cfg).Error()) cfg = &Config{Endpoint: "someEndpoint", DockerAPIVersion: 1.22, Timeout: 5 * time.Minute, CacheSyncInterval: 5 * time.Minute} - assert.Nil(t, cfg.Validate()) + assert.Nil(t, component.ValidateConfig(cfg)) } func loadConfig(t testing.TB, id component.ID) *Config { diff --git a/extension/observer/dockerobserver/go.mod b/extension/observer/dockerobserver/go.mod index c3f00b9a14a45..1ba99ffdd3737 100644 --- a/extension/observer/dockerobserver/go.mod +++ b/extension/observer/dockerobserver/go.mod @@ -10,7 +10,8 @@ require ( github.com/open-telemetry/opentelemetry-collector-contrib/internal/docker v0.64.0 github.com/stretchr/testify v1.8.1 github.com/testcontainers/testcontainers-go v0.15.0 - go.opentelemetry.io/collector v0.64.2-0.20221115155901-1550938c18fd + go.opentelemetry.io/collector v0.64.2-0.20221117234814-4565692c50a7 + go.opentelemetry.io/collector/component v0.0.0-20221117234814-4565692c50a7 go.uber.org/zap v1.23.0 ) @@ -51,7 +52,9 @@ require ( github.com/pmezard/go-difflib v1.0.0 // indirect github.com/sirupsen/logrus v1.8.1 // indirect go.opencensus.io v0.24.0 // indirect - go.opentelemetry.io/collector/pdata v0.64.2-0.20221115155901-1550938c18fd // indirect + go.opentelemetry.io/collector/consumer v0.0.0-20221117234814-4565692c50a7 // indirect + go.opentelemetry.io/collector/featuregate v0.0.0-20221117214536-6a117bfc3737 // indirect + go.opentelemetry.io/collector/pdata v0.64.2-0.20221117234814-4565692c50a7 // indirect go.opentelemetry.io/otel v1.11.1 // indirect go.opentelemetry.io/otel/metric v0.33.0 // indirect go.opentelemetry.io/otel/trace v1.11.1 // indirect diff --git a/extension/observer/dockerobserver/go.sum b/extension/observer/dockerobserver/go.sum index e41f15fc3320b..af80c84982678 100644 --- a/extension/observer/dockerobserver/go.sum +++ b/extension/observer/dockerobserver/go.sum @@ -813,10 +813,16 @@ go.opencensus.io v0.22.2/go.mod h1:yxeiOL68Rb0Xd1ddK5vPZ/oVn4vY4Ynel7k9FzqtOIw= go.opencensus.io v0.22.3/go.mod h1:yxeiOL68Rb0Xd1ddK5vPZ/oVn4vY4Ynel7k9FzqtOIw= go.opencensus.io v0.24.0 h1:y73uSU6J157QMP2kn2r30vwW1A2W2WFwSCGnAVxeaD0= go.opencensus.io v0.24.0/go.mod h1:vNK8G9p7aAivkbmorf4v+7Hgx+Zs0yY+0fOtgBfjQKo= -go.opentelemetry.io/collector v0.64.2-0.20221115155901-1550938c18fd h1:O+6HhE4Ivg8Jksp3dIXIEC4FIR0Ush4uORvG3UtHZWk= -go.opentelemetry.io/collector v0.64.2-0.20221115155901-1550938c18fd/go.mod h1:mmSrOcwe1vEYmChXUYuF6rzlrUL0rjEiPfa19Xxb41o= -go.opentelemetry.io/collector/pdata v0.64.2-0.20221115155901-1550938c18fd h1:GdVAbRiae5VDZe3Mn3FqzMxO/aI5UbJ4+dcviqClHy8= -go.opentelemetry.io/collector/pdata v0.64.2-0.20221115155901-1550938c18fd/go.mod h1:0vynPfW2ZN7DltpcCFgCmTtWMQkCjp2a3TNt82YTCLQ= +go.opentelemetry.io/collector v0.64.2-0.20221117234814-4565692c50a7 h1:o/vMr2iyXzaeTb/KAldhMxAvRIfFPwtKfL5cKVKsSlU= +go.opentelemetry.io/collector v0.64.2-0.20221117234814-4565692c50a7/go.mod h1:PO8hayFFYvXDqELbXRVxwawR2HTdjN6mY4Qa3Se9xI8= +go.opentelemetry.io/collector/component v0.0.0-20221117234814-4565692c50a7 h1:q9m1bGHhQFUakQX79lZpLmFSY9VLULNSs2jUG8MdJLA= +go.opentelemetry.io/collector/component v0.0.0-20221117234814-4565692c50a7/go.mod h1:Z7H1Oj826e4dtVxXmT6SiUr6S0EIevUJmkVpfQV+UOk= +go.opentelemetry.io/collector/consumer v0.0.0-20221117234814-4565692c50a7 h1:FTy1JD9EJ7gq9SzlZoi2NkGcZ88+SwdiJav5uRcDEEY= +go.opentelemetry.io/collector/consumer v0.0.0-20221117234814-4565692c50a7/go.mod h1:86Elcw/LLrh90DprArogHMkBX3+UMu3tIgcVWF3mr6o= +go.opentelemetry.io/collector/featuregate v0.0.0-20221117214536-6a117bfc3737 h1:7sXg6M9Fw6rFVlX+iaWOMz6DFXEiroUdQer5kWGixwM= +go.opentelemetry.io/collector/featuregate v0.0.0-20221117214536-6a117bfc3737/go.mod h1:tewuFKJYalWBU0bmNKg++MC1ipINXUr6szYzOw2p1GI= +go.opentelemetry.io/collector/pdata v0.64.2-0.20221117234814-4565692c50a7 h1:IOFqfOu7fFxTgC7pvc2U7dk1/uFjwVQPK+CALiUvacI= +go.opentelemetry.io/collector/pdata v0.64.2-0.20221117234814-4565692c50a7/go.mod h1:0vynPfW2ZN7DltpcCFgCmTtWMQkCjp2a3TNt82YTCLQ= go.opentelemetry.io/otel v1.11.1 h1:4WLLAmcfkmDk2ukNXJyq3/kiz/3UzCaYq6PskJsaou4= go.opentelemetry.io/otel v1.11.1/go.mod h1:1nNhXBbWSD0nsL38H6btgnFN2k4i0sNLHNNMZMSbUGE= go.opentelemetry.io/otel/metric v0.33.0 h1:xQAyl7uGEYvrLAiV/09iTJlp1pZnQ9Wl793qbVvED1E= diff --git a/extension/observer/ecsobserver/config_test.go b/extension/observer/ecsobserver/config_test.go index 435434bb6aee7..90cb678e7677d 100644 --- a/extension/observer/ecsobserver/config_test.go +++ b/extension/observer/ecsobserver/config_test.go @@ -76,10 +76,10 @@ func TestLoadConfig(t *testing.T) { require.NoError(t, err) require.NoError(t, component.UnmarshalExtensionConfig(sub, cfg)) if tt.expectedErr { - assert.Error(t, cfg.Validate()) + assert.Error(t, component.ValidateConfig(cfg)) return } - assert.NoError(t, cfg.Validate()) + assert.NoError(t, component.ValidateConfig(cfg)) assert.Equal(t, tt.expected, cfg) }) } diff --git a/extension/observer/ecsobserver/go.mod b/extension/observer/ecsobserver/go.mod index c29c19cb3fadd..a9086cba5e4fd 100644 --- a/extension/observer/ecsobserver/go.mod +++ b/extension/observer/ecsobserver/go.mod @@ -6,7 +6,8 @@ require ( github.com/aws/aws-sdk-go v1.44.133 github.com/hashicorp/golang-lru v0.5.4 github.com/stretchr/testify v1.8.1 - go.opentelemetry.io/collector v0.64.2-0.20221115155901-1550938c18fd + go.opentelemetry.io/collector v0.64.2-0.20221117234814-4565692c50a7 + go.opentelemetry.io/collector/component v0.0.0-20221117234814-4565692c50a7 go.uber.org/multierr v1.8.0 go.uber.org/zap v1.23.0 gopkg.in/yaml.v2 v2.4.0 @@ -28,7 +29,9 @@ require ( github.com/modern-go/reflect2 v1.0.2 // indirect github.com/pelletier/go-toml v1.9.4 // indirect github.com/pmezard/go-difflib v1.0.0 // indirect - go.opentelemetry.io/collector/pdata v0.64.2-0.20221115155901-1550938c18fd // indirect + go.opentelemetry.io/collector/consumer v0.0.0-20221117234814-4565692c50a7 // indirect + go.opentelemetry.io/collector/featuregate v0.0.0-20221117214536-6a117bfc3737 // indirect + go.opentelemetry.io/collector/pdata v0.64.2-0.20221117234814-4565692c50a7 // indirect go.opentelemetry.io/otel v1.11.1 // indirect go.opentelemetry.io/otel/metric v0.33.0 // indirect go.opentelemetry.io/otel/trace v1.11.1 // indirect diff --git a/extension/observer/ecsobserver/go.sum b/extension/observer/ecsobserver/go.sum index b81d7f3ff4cf9..3933451ced79b 100644 --- a/extension/observer/ecsobserver/go.sum +++ b/extension/observer/ecsobserver/go.sum @@ -272,10 +272,16 @@ github.com/yuin/goldmark v1.4.13/go.mod h1:6yULJ656Px+3vBD8DxQVa3kxgyrAnzto9xy5t go.etcd.io/etcd/api/v3 v3.5.4/go.mod h1:5GB2vv4A4AOn3yk7MftYGHkUfGtDHnEraIjym4dYz5A= go.etcd.io/etcd/client/pkg/v3 v3.5.4/go.mod h1:IJHfcCEKxYu1Os13ZdwCwIUTUVGYTSAM3YSwc9/Ac1g= go.etcd.io/etcd/client/v3 v3.5.4/go.mod h1:ZaRkVgBZC+L+dLCjTcF1hRXpgZXQPOvnA/Ak/gq3kiY= -go.opentelemetry.io/collector v0.64.2-0.20221115155901-1550938c18fd h1:O+6HhE4Ivg8Jksp3dIXIEC4FIR0Ush4uORvG3UtHZWk= -go.opentelemetry.io/collector v0.64.2-0.20221115155901-1550938c18fd/go.mod h1:mmSrOcwe1vEYmChXUYuF6rzlrUL0rjEiPfa19Xxb41o= -go.opentelemetry.io/collector/pdata v0.64.2-0.20221115155901-1550938c18fd h1:GdVAbRiae5VDZe3Mn3FqzMxO/aI5UbJ4+dcviqClHy8= -go.opentelemetry.io/collector/pdata v0.64.2-0.20221115155901-1550938c18fd/go.mod h1:0vynPfW2ZN7DltpcCFgCmTtWMQkCjp2a3TNt82YTCLQ= +go.opentelemetry.io/collector v0.64.2-0.20221117234814-4565692c50a7 h1:o/vMr2iyXzaeTb/KAldhMxAvRIfFPwtKfL5cKVKsSlU= +go.opentelemetry.io/collector v0.64.2-0.20221117234814-4565692c50a7/go.mod h1:PO8hayFFYvXDqELbXRVxwawR2HTdjN6mY4Qa3Se9xI8= +go.opentelemetry.io/collector/component v0.0.0-20221117234814-4565692c50a7 h1:q9m1bGHhQFUakQX79lZpLmFSY9VLULNSs2jUG8MdJLA= +go.opentelemetry.io/collector/component v0.0.0-20221117234814-4565692c50a7/go.mod h1:Z7H1Oj826e4dtVxXmT6SiUr6S0EIevUJmkVpfQV+UOk= +go.opentelemetry.io/collector/consumer v0.0.0-20221117234814-4565692c50a7 h1:FTy1JD9EJ7gq9SzlZoi2NkGcZ88+SwdiJav5uRcDEEY= +go.opentelemetry.io/collector/consumer v0.0.0-20221117234814-4565692c50a7/go.mod h1:86Elcw/LLrh90DprArogHMkBX3+UMu3tIgcVWF3mr6o= +go.opentelemetry.io/collector/featuregate v0.0.0-20221117214536-6a117bfc3737 h1:7sXg6M9Fw6rFVlX+iaWOMz6DFXEiroUdQer5kWGixwM= +go.opentelemetry.io/collector/featuregate v0.0.0-20221117214536-6a117bfc3737/go.mod h1:tewuFKJYalWBU0bmNKg++MC1ipINXUr6szYzOw2p1GI= +go.opentelemetry.io/collector/pdata v0.64.2-0.20221117234814-4565692c50a7 h1:IOFqfOu7fFxTgC7pvc2U7dk1/uFjwVQPK+CALiUvacI= +go.opentelemetry.io/collector/pdata v0.64.2-0.20221117234814-4565692c50a7/go.mod h1:0vynPfW2ZN7DltpcCFgCmTtWMQkCjp2a3TNt82YTCLQ= go.opentelemetry.io/otel v1.11.1 h1:4WLLAmcfkmDk2ukNXJyq3/kiz/3UzCaYq6PskJsaou4= go.opentelemetry.io/otel v1.11.1/go.mod h1:1nNhXBbWSD0nsL38H6btgnFN2k4i0sNLHNNMZMSbUGE= go.opentelemetry.io/otel/metric v0.33.0 h1:xQAyl7uGEYvrLAiV/09iTJlp1pZnQ9Wl793qbVvED1E= diff --git a/extension/observer/ecstaskobserver/config_test.go b/extension/observer/ecstaskobserver/config_test.go index 59b8b00ac1dab..c6bd1b6eef5a7 100644 --- a/extension/observer/ecstaskobserver/config_test.go +++ b/extension/observer/ecstaskobserver/config_test.go @@ -73,10 +73,10 @@ func TestLoadConfig(t *testing.T) { require.NoError(t, err) require.NoError(t, component.UnmarshalExtensionConfig(sub, cfg)) if tt.expectedErr != "" { - assert.EqualError(t, cfg.Validate(), tt.expectedErr) + assert.EqualError(t, component.ValidateConfig(cfg), tt.expectedErr) return } - assert.NoError(t, cfg.Validate()) + assert.NoError(t, component.ValidateConfig(cfg)) assert.Equal(t, tt.expected, cfg) }) } diff --git a/extension/observer/ecstaskobserver/go.mod b/extension/observer/ecstaskobserver/go.mod index 77d423480f6f7..f4b65b1cd769e 100644 --- a/extension/observer/ecstaskobserver/go.mod +++ b/extension/observer/ecstaskobserver/go.mod @@ -7,7 +7,8 @@ require ( github.com/open-telemetry/opentelemetry-collector-contrib/internal/aws/ecsutil v0.64.0 github.com/open-telemetry/opentelemetry-collector-contrib/internal/common v0.64.0 github.com/stretchr/testify v1.8.1 - go.opentelemetry.io/collector v0.64.2-0.20221115155901-1550938c18fd + go.opentelemetry.io/collector v0.64.2-0.20221117234814-4565692c50a7 + go.opentelemetry.io/collector/component v0.0.0-20221117234814-4565692c50a7 go.uber.org/zap v1.23.0 ) @@ -29,7 +30,9 @@ require ( github.com/modern-go/reflect2 v1.0.2 // indirect github.com/pmezard/go-difflib v1.0.0 // indirect github.com/rs/cors v1.8.2 // indirect - go.opentelemetry.io/collector/pdata v0.64.2-0.20221115155901-1550938c18fd // indirect + go.opentelemetry.io/collector/consumer v0.0.0-20221117234814-4565692c50a7 // indirect + go.opentelemetry.io/collector/featuregate v0.0.0-20221117214536-6a117bfc3737 // indirect + go.opentelemetry.io/collector/pdata v0.64.2-0.20221117234814-4565692c50a7 // indirect go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.36.4 // indirect go.opentelemetry.io/otel v1.11.1 // indirect go.opentelemetry.io/otel/metric v0.33.0 // indirect diff --git a/extension/observer/ecstaskobserver/go.sum b/extension/observer/ecstaskobserver/go.sum index a4adcba4af834..4d73e31cfe6cd 100644 --- a/extension/observer/ecstaskobserver/go.sum +++ b/extension/observer/ecstaskobserver/go.sum @@ -272,10 +272,16 @@ github.com/yuin/goldmark v1.3.5/go.mod h1:mwnBkeHKe2W/ZEtQ+71ViKU8L12m81fl3OWwC1 go.etcd.io/etcd/api/v3 v3.5.4/go.mod h1:5GB2vv4A4AOn3yk7MftYGHkUfGtDHnEraIjym4dYz5A= go.etcd.io/etcd/client/pkg/v3 v3.5.4/go.mod h1:IJHfcCEKxYu1Os13ZdwCwIUTUVGYTSAM3YSwc9/Ac1g= go.etcd.io/etcd/client/v3 v3.5.4/go.mod h1:ZaRkVgBZC+L+dLCjTcF1hRXpgZXQPOvnA/Ak/gq3kiY= -go.opentelemetry.io/collector v0.64.2-0.20221115155901-1550938c18fd h1:O+6HhE4Ivg8Jksp3dIXIEC4FIR0Ush4uORvG3UtHZWk= -go.opentelemetry.io/collector v0.64.2-0.20221115155901-1550938c18fd/go.mod h1:mmSrOcwe1vEYmChXUYuF6rzlrUL0rjEiPfa19Xxb41o= -go.opentelemetry.io/collector/pdata v0.64.2-0.20221115155901-1550938c18fd h1:GdVAbRiae5VDZe3Mn3FqzMxO/aI5UbJ4+dcviqClHy8= -go.opentelemetry.io/collector/pdata v0.64.2-0.20221115155901-1550938c18fd/go.mod h1:0vynPfW2ZN7DltpcCFgCmTtWMQkCjp2a3TNt82YTCLQ= +go.opentelemetry.io/collector v0.64.2-0.20221117234814-4565692c50a7 h1:o/vMr2iyXzaeTb/KAldhMxAvRIfFPwtKfL5cKVKsSlU= +go.opentelemetry.io/collector v0.64.2-0.20221117234814-4565692c50a7/go.mod h1:PO8hayFFYvXDqELbXRVxwawR2HTdjN6mY4Qa3Se9xI8= +go.opentelemetry.io/collector/component v0.0.0-20221117234814-4565692c50a7 h1:q9m1bGHhQFUakQX79lZpLmFSY9VLULNSs2jUG8MdJLA= +go.opentelemetry.io/collector/component v0.0.0-20221117234814-4565692c50a7/go.mod h1:Z7H1Oj826e4dtVxXmT6SiUr6S0EIevUJmkVpfQV+UOk= +go.opentelemetry.io/collector/consumer v0.0.0-20221117234814-4565692c50a7 h1:FTy1JD9EJ7gq9SzlZoi2NkGcZ88+SwdiJav5uRcDEEY= +go.opentelemetry.io/collector/consumer v0.0.0-20221117234814-4565692c50a7/go.mod h1:86Elcw/LLrh90DprArogHMkBX3+UMu3tIgcVWF3mr6o= +go.opentelemetry.io/collector/featuregate v0.0.0-20221117214536-6a117bfc3737 h1:7sXg6M9Fw6rFVlX+iaWOMz6DFXEiroUdQer5kWGixwM= +go.opentelemetry.io/collector/featuregate v0.0.0-20221117214536-6a117bfc3737/go.mod h1:tewuFKJYalWBU0bmNKg++MC1ipINXUr6szYzOw2p1GI= +go.opentelemetry.io/collector/pdata v0.64.2-0.20221117234814-4565692c50a7 h1:IOFqfOu7fFxTgC7pvc2U7dk1/uFjwVQPK+CALiUvacI= +go.opentelemetry.io/collector/pdata v0.64.2-0.20221117234814-4565692c50a7/go.mod h1:0vynPfW2ZN7DltpcCFgCmTtWMQkCjp2a3TNt82YTCLQ= go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.36.4 h1:aUEBEdCa6iamGzg6fuYxDA8ThxvOG240mAvWDU+XLio= go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.36.4/go.mod h1:l2MdsbKTocpPS5nQZscqTR9jd8u96VYZdcpF8Sye7mA= go.opentelemetry.io/otel v1.11.1 h1:4WLLAmcfkmDk2ukNXJyq3/kiz/3UzCaYq6PskJsaou4= diff --git a/extension/observer/hostobserver/config_test.go b/extension/observer/hostobserver/config_test.go index 878cb41ca0478..7e4bda11d604d 100644 --- a/extension/observer/hostobserver/config_test.go +++ b/extension/observer/hostobserver/config_test.go @@ -55,7 +55,7 @@ func TestLoadConfig(t *testing.T) { require.NoError(t, err) require.NoError(t, component.UnmarshalExtensionConfig(sub, cfg)) - assert.NoError(t, cfg.Validate()) + assert.NoError(t, component.ValidateConfig(cfg)) assert.Equal(t, tt.expected, cfg) }) } diff --git a/extension/observer/hostobserver/go.mod b/extension/observer/hostobserver/go.mod index 810b5d2aa38b1..4c2075a217901 100644 --- a/extension/observer/hostobserver/go.mod +++ b/extension/observer/hostobserver/go.mod @@ -6,7 +6,8 @@ require ( github.com/open-telemetry/opentelemetry-collector-contrib/extension/observer v0.64.0 github.com/shirou/gopsutil/v3 v3.22.10 github.com/stretchr/testify v1.8.1 - go.opentelemetry.io/collector v0.64.2-0.20221115155901-1550938c18fd + go.opentelemetry.io/collector v0.64.2-0.20221117234814-4565692c50a7 + go.opentelemetry.io/collector/component v0.0.0-20221117234814-4565692c50a7 go.uber.org/zap v1.23.0 ) @@ -32,7 +33,9 @@ require ( github.com/tklauser/go-sysconf v0.3.10 // indirect github.com/tklauser/numcpus v0.4.0 // indirect github.com/yusufpapurcu/wmi v1.2.2 // indirect - go.opentelemetry.io/collector/pdata v0.64.2-0.20221115155901-1550938c18fd // indirect + go.opentelemetry.io/collector/consumer v0.0.0-20221117234814-4565692c50a7 // indirect + go.opentelemetry.io/collector/featuregate v0.0.0-20221117214536-6a117bfc3737 // indirect + go.opentelemetry.io/collector/pdata v0.64.2-0.20221117234814-4565692c50a7 // indirect go.opentelemetry.io/otel v1.11.1 // indirect go.opentelemetry.io/otel/metric v0.33.0 // indirect go.opentelemetry.io/otel/trace v1.11.1 // indirect diff --git a/extension/observer/hostobserver/go.sum b/extension/observer/hostobserver/go.sum index 5a67e3bb4f82a..c3a6d9b382f8a 100644 --- a/extension/observer/hostobserver/go.sum +++ b/extension/observer/hostobserver/go.sum @@ -282,10 +282,16 @@ github.com/yusufpapurcu/wmi v1.2.2/go.mod h1:SBZ9tNy3G9/m5Oi98Zks0QjeHVDvuK0qfxQ go.etcd.io/etcd/api/v3 v3.5.4/go.mod h1:5GB2vv4A4AOn3yk7MftYGHkUfGtDHnEraIjym4dYz5A= go.etcd.io/etcd/client/pkg/v3 v3.5.4/go.mod h1:IJHfcCEKxYu1Os13ZdwCwIUTUVGYTSAM3YSwc9/Ac1g= go.etcd.io/etcd/client/v3 v3.5.4/go.mod h1:ZaRkVgBZC+L+dLCjTcF1hRXpgZXQPOvnA/Ak/gq3kiY= -go.opentelemetry.io/collector v0.64.2-0.20221115155901-1550938c18fd h1:O+6HhE4Ivg8Jksp3dIXIEC4FIR0Ush4uORvG3UtHZWk= -go.opentelemetry.io/collector v0.64.2-0.20221115155901-1550938c18fd/go.mod h1:mmSrOcwe1vEYmChXUYuF6rzlrUL0rjEiPfa19Xxb41o= -go.opentelemetry.io/collector/pdata v0.64.2-0.20221115155901-1550938c18fd h1:GdVAbRiae5VDZe3Mn3FqzMxO/aI5UbJ4+dcviqClHy8= -go.opentelemetry.io/collector/pdata v0.64.2-0.20221115155901-1550938c18fd/go.mod h1:0vynPfW2ZN7DltpcCFgCmTtWMQkCjp2a3TNt82YTCLQ= +go.opentelemetry.io/collector v0.64.2-0.20221117234814-4565692c50a7 h1:o/vMr2iyXzaeTb/KAldhMxAvRIfFPwtKfL5cKVKsSlU= +go.opentelemetry.io/collector v0.64.2-0.20221117234814-4565692c50a7/go.mod h1:PO8hayFFYvXDqELbXRVxwawR2HTdjN6mY4Qa3Se9xI8= +go.opentelemetry.io/collector/component v0.0.0-20221117234814-4565692c50a7 h1:q9m1bGHhQFUakQX79lZpLmFSY9VLULNSs2jUG8MdJLA= +go.opentelemetry.io/collector/component v0.0.0-20221117234814-4565692c50a7/go.mod h1:Z7H1Oj826e4dtVxXmT6SiUr6S0EIevUJmkVpfQV+UOk= +go.opentelemetry.io/collector/consumer v0.0.0-20221117234814-4565692c50a7 h1:FTy1JD9EJ7gq9SzlZoi2NkGcZ88+SwdiJav5uRcDEEY= +go.opentelemetry.io/collector/consumer v0.0.0-20221117234814-4565692c50a7/go.mod h1:86Elcw/LLrh90DprArogHMkBX3+UMu3tIgcVWF3mr6o= +go.opentelemetry.io/collector/featuregate v0.0.0-20221117214536-6a117bfc3737 h1:7sXg6M9Fw6rFVlX+iaWOMz6DFXEiroUdQer5kWGixwM= +go.opentelemetry.io/collector/featuregate v0.0.0-20221117214536-6a117bfc3737/go.mod h1:tewuFKJYalWBU0bmNKg++MC1ipINXUr6szYzOw2p1GI= +go.opentelemetry.io/collector/pdata v0.64.2-0.20221117234814-4565692c50a7 h1:IOFqfOu7fFxTgC7pvc2U7dk1/uFjwVQPK+CALiUvacI= +go.opentelemetry.io/collector/pdata v0.64.2-0.20221117234814-4565692c50a7/go.mod h1:0vynPfW2ZN7DltpcCFgCmTtWMQkCjp2a3TNt82YTCLQ= go.opentelemetry.io/otel v1.11.1 h1:4WLLAmcfkmDk2ukNXJyq3/kiz/3UzCaYq6PskJsaou4= go.opentelemetry.io/otel v1.11.1/go.mod h1:1nNhXBbWSD0nsL38H6btgnFN2k4i0sNLHNNMZMSbUGE= go.opentelemetry.io/otel/metric v0.33.0 h1:xQAyl7uGEYvrLAiV/09iTJlp1pZnQ9Wl793qbVvED1E= diff --git a/extension/observer/k8sobserver/config_test.go b/extension/observer/k8sobserver/config_test.go index 43293d4f6243b..9fbb25d3d47f7 100644 --- a/extension/observer/k8sobserver/config_test.go +++ b/extension/observer/k8sobserver/config_test.go @@ -77,10 +77,10 @@ func TestLoadConfig(t *testing.T) { require.NoError(t, err) require.NoError(t, component.UnmarshalExtensionConfig(sub, cfg)) if tt.expectedErr != "" { - assert.EqualError(t, cfg.Validate(), tt.expectedErr) + assert.EqualError(t, component.ValidateConfig(cfg), tt.expectedErr) return } - assert.NoError(t, cfg.Validate()) + assert.NoError(t, component.ValidateConfig(cfg)) assert.Equal(t, tt.expected, cfg) }) } diff --git a/extension/observer/k8sobserver/go.mod b/extension/observer/k8sobserver/go.mod index 414905c7d5c56..c6284e8fb7304 100644 --- a/extension/observer/k8sobserver/go.mod +++ b/extension/observer/k8sobserver/go.mod @@ -6,7 +6,8 @@ require ( github.com/open-telemetry/opentelemetry-collector-contrib/extension/observer v0.64.0 github.com/open-telemetry/opentelemetry-collector-contrib/internal/k8sconfig v0.64.0 github.com/stretchr/testify v1.8.1 - go.opentelemetry.io/collector v0.64.2-0.20221115155901-1550938c18fd + go.opentelemetry.io/collector v0.64.2-0.20221117234814-4565692c50a7 + go.opentelemetry.io/collector/component v0.0.0-20221117234814-4565692c50a7 go.uber.org/zap v1.23.0 k8s.io/api v0.25.4 k8s.io/apimachinery v0.25.4 @@ -45,7 +46,9 @@ require ( github.com/pelletier/go-toml v1.9.4 // indirect github.com/pmezard/go-difflib v1.0.0 // indirect github.com/spf13/pflag v1.0.5 // indirect - go.opentelemetry.io/collector/pdata v0.64.2-0.20221115155901-1550938c18fd // indirect + go.opentelemetry.io/collector/consumer v0.0.0-20221117234814-4565692c50a7 // indirect + go.opentelemetry.io/collector/featuregate v0.0.0-20221117214536-6a117bfc3737 // indirect + go.opentelemetry.io/collector/pdata v0.64.2-0.20221117234814-4565692c50a7 // indirect go.opentelemetry.io/otel v1.11.1 // indirect go.opentelemetry.io/otel/metric v0.33.0 // indirect go.opentelemetry.io/otel/trace v1.11.1 // indirect diff --git a/extension/observer/k8sobserver/go.sum b/extension/observer/k8sobserver/go.sum index dc13b7ac3af71..b4009255fff10 100644 --- a/extension/observer/k8sobserver/go.sum +++ b/extension/observer/k8sobserver/go.sum @@ -432,10 +432,16 @@ go.opencensus.io v0.22.0/go.mod h1:+kGneAE2xo2IficOXnaByMWTGM9T73dGwxeWcUqIpI8= go.opencensus.io v0.22.2/go.mod h1:yxeiOL68Rb0Xd1ddK5vPZ/oVn4vY4Ynel7k9FzqtOIw= go.opencensus.io v0.22.3/go.mod h1:yxeiOL68Rb0Xd1ddK5vPZ/oVn4vY4Ynel7k9FzqtOIw= go.opencensus.io v0.22.4/go.mod h1:yxeiOL68Rb0Xd1ddK5vPZ/oVn4vY4Ynel7k9FzqtOIw= -go.opentelemetry.io/collector v0.64.2-0.20221115155901-1550938c18fd h1:O+6HhE4Ivg8Jksp3dIXIEC4FIR0Ush4uORvG3UtHZWk= -go.opentelemetry.io/collector v0.64.2-0.20221115155901-1550938c18fd/go.mod h1:mmSrOcwe1vEYmChXUYuF6rzlrUL0rjEiPfa19Xxb41o= -go.opentelemetry.io/collector/pdata v0.64.2-0.20221115155901-1550938c18fd h1:GdVAbRiae5VDZe3Mn3FqzMxO/aI5UbJ4+dcviqClHy8= -go.opentelemetry.io/collector/pdata v0.64.2-0.20221115155901-1550938c18fd/go.mod h1:0vynPfW2ZN7DltpcCFgCmTtWMQkCjp2a3TNt82YTCLQ= +go.opentelemetry.io/collector v0.64.2-0.20221117234814-4565692c50a7 h1:o/vMr2iyXzaeTb/KAldhMxAvRIfFPwtKfL5cKVKsSlU= +go.opentelemetry.io/collector v0.64.2-0.20221117234814-4565692c50a7/go.mod h1:PO8hayFFYvXDqELbXRVxwawR2HTdjN6mY4Qa3Se9xI8= +go.opentelemetry.io/collector/component v0.0.0-20221117234814-4565692c50a7 h1:q9m1bGHhQFUakQX79lZpLmFSY9VLULNSs2jUG8MdJLA= +go.opentelemetry.io/collector/component v0.0.0-20221117234814-4565692c50a7/go.mod h1:Z7H1Oj826e4dtVxXmT6SiUr6S0EIevUJmkVpfQV+UOk= +go.opentelemetry.io/collector/consumer v0.0.0-20221117234814-4565692c50a7 h1:FTy1JD9EJ7gq9SzlZoi2NkGcZ88+SwdiJav5uRcDEEY= +go.opentelemetry.io/collector/consumer v0.0.0-20221117234814-4565692c50a7/go.mod h1:86Elcw/LLrh90DprArogHMkBX3+UMu3tIgcVWF3mr6o= +go.opentelemetry.io/collector/featuregate v0.0.0-20221117214536-6a117bfc3737 h1:7sXg6M9Fw6rFVlX+iaWOMz6DFXEiroUdQer5kWGixwM= +go.opentelemetry.io/collector/featuregate v0.0.0-20221117214536-6a117bfc3737/go.mod h1:tewuFKJYalWBU0bmNKg++MC1ipINXUr6szYzOw2p1GI= +go.opentelemetry.io/collector/pdata v0.64.2-0.20221117234814-4565692c50a7 h1:IOFqfOu7fFxTgC7pvc2U7dk1/uFjwVQPK+CALiUvacI= +go.opentelemetry.io/collector/pdata v0.64.2-0.20221117234814-4565692c50a7/go.mod h1:0vynPfW2ZN7DltpcCFgCmTtWMQkCjp2a3TNt82YTCLQ= go.opentelemetry.io/otel v1.11.1 h1:4WLLAmcfkmDk2ukNXJyq3/kiz/3UzCaYq6PskJsaou4= go.opentelemetry.io/otel v1.11.1/go.mod h1:1nNhXBbWSD0nsL38H6btgnFN2k4i0sNLHNNMZMSbUGE= go.opentelemetry.io/otel/metric v0.33.0 h1:xQAyl7uGEYvrLAiV/09iTJlp1pZnQ9Wl793qbVvED1E= diff --git a/extension/oidcauthextension/go.mod b/extension/oidcauthextension/go.mod index 24f44e996edcb..c7114aec8ea90 100644 --- a/extension/oidcauthextension/go.mod +++ b/extension/oidcauthextension/go.mod @@ -5,7 +5,8 @@ go 1.18 require ( github.com/coreos/go-oidc v2.2.1+incompatible github.com/stretchr/testify v1.8.1 - go.opentelemetry.io/collector v0.64.2-0.20221115155901-1550938c18fd + go.opentelemetry.io/collector v0.64.2-0.20221117234814-4565692c50a7 + go.opentelemetry.io/collector/component v0.0.0-20221117234814-4565692c50a7 go.uber.org/zap v1.23.0 ) @@ -25,7 +26,9 @@ require ( github.com/pelletier/go-toml v1.9.4 // indirect github.com/pmezard/go-difflib v1.0.0 // indirect github.com/pquerna/cachecontrol v0.1.0 // indirect - go.opentelemetry.io/collector/pdata v0.64.2-0.20221115155901-1550938c18fd // indirect + go.opentelemetry.io/collector/consumer v0.0.0-20221117234814-4565692c50a7 // indirect + go.opentelemetry.io/collector/featuregate v0.0.0-20221117214536-6a117bfc3737 // indirect + go.opentelemetry.io/collector/pdata v0.64.2-0.20221117234814-4565692c50a7 // indirect go.opentelemetry.io/otel v1.11.1 // indirect go.opentelemetry.io/otel/metric v0.33.0 // indirect go.opentelemetry.io/otel/trace v1.11.1 // indirect diff --git a/extension/oidcauthextension/go.sum b/extension/oidcauthextension/go.sum index 88efd52fb717e..23a96e5fea057 100644 --- a/extension/oidcauthextension/go.sum +++ b/extension/oidcauthextension/go.sum @@ -345,10 +345,16 @@ go.opencensus.io v0.22.0/go.mod h1:+kGneAE2xo2IficOXnaByMWTGM9T73dGwxeWcUqIpI8= go.opencensus.io v0.22.2/go.mod h1:yxeiOL68Rb0Xd1ddK5vPZ/oVn4vY4Ynel7k9FzqtOIw= go.opencensus.io v0.22.3/go.mod h1:yxeiOL68Rb0Xd1ddK5vPZ/oVn4vY4Ynel7k9FzqtOIw= go.opencensus.io v0.22.4/go.mod h1:yxeiOL68Rb0Xd1ddK5vPZ/oVn4vY4Ynel7k9FzqtOIw= -go.opentelemetry.io/collector v0.64.2-0.20221115155901-1550938c18fd h1:O+6HhE4Ivg8Jksp3dIXIEC4FIR0Ush4uORvG3UtHZWk= -go.opentelemetry.io/collector v0.64.2-0.20221115155901-1550938c18fd/go.mod h1:mmSrOcwe1vEYmChXUYuF6rzlrUL0rjEiPfa19Xxb41o= -go.opentelemetry.io/collector/pdata v0.64.2-0.20221115155901-1550938c18fd h1:GdVAbRiae5VDZe3Mn3FqzMxO/aI5UbJ4+dcviqClHy8= -go.opentelemetry.io/collector/pdata v0.64.2-0.20221115155901-1550938c18fd/go.mod h1:0vynPfW2ZN7DltpcCFgCmTtWMQkCjp2a3TNt82YTCLQ= +go.opentelemetry.io/collector v0.64.2-0.20221117234814-4565692c50a7 h1:o/vMr2iyXzaeTb/KAldhMxAvRIfFPwtKfL5cKVKsSlU= +go.opentelemetry.io/collector v0.64.2-0.20221117234814-4565692c50a7/go.mod h1:PO8hayFFYvXDqELbXRVxwawR2HTdjN6mY4Qa3Se9xI8= +go.opentelemetry.io/collector/component v0.0.0-20221117234814-4565692c50a7 h1:q9m1bGHhQFUakQX79lZpLmFSY9VLULNSs2jUG8MdJLA= +go.opentelemetry.io/collector/component v0.0.0-20221117234814-4565692c50a7/go.mod h1:Z7H1Oj826e4dtVxXmT6SiUr6S0EIevUJmkVpfQV+UOk= +go.opentelemetry.io/collector/consumer v0.0.0-20221117234814-4565692c50a7 h1:FTy1JD9EJ7gq9SzlZoi2NkGcZ88+SwdiJav5uRcDEEY= +go.opentelemetry.io/collector/consumer v0.0.0-20221117234814-4565692c50a7/go.mod h1:86Elcw/LLrh90DprArogHMkBX3+UMu3tIgcVWF3mr6o= +go.opentelemetry.io/collector/featuregate v0.0.0-20221117214536-6a117bfc3737 h1:7sXg6M9Fw6rFVlX+iaWOMz6DFXEiroUdQer5kWGixwM= +go.opentelemetry.io/collector/featuregate v0.0.0-20221117214536-6a117bfc3737/go.mod h1:tewuFKJYalWBU0bmNKg++MC1ipINXUr6szYzOw2p1GI= +go.opentelemetry.io/collector/pdata v0.64.2-0.20221117234814-4565692c50a7 h1:IOFqfOu7fFxTgC7pvc2U7dk1/uFjwVQPK+CALiUvacI= +go.opentelemetry.io/collector/pdata v0.64.2-0.20221117234814-4565692c50a7/go.mod h1:0vynPfW2ZN7DltpcCFgCmTtWMQkCjp2a3TNt82YTCLQ= go.opentelemetry.io/otel v1.11.1 h1:4WLLAmcfkmDk2ukNXJyq3/kiz/3UzCaYq6PskJsaou4= go.opentelemetry.io/otel v1.11.1/go.mod h1:1nNhXBbWSD0nsL38H6btgnFN2k4i0sNLHNNMZMSbUGE= go.opentelemetry.io/otel/metric v0.33.0 h1:xQAyl7uGEYvrLAiV/09iTJlp1pZnQ9Wl793qbVvED1E= diff --git a/extension/pprofextension/config_test.go b/extension/pprofextension/config_test.go index c2112045a92d3..5f4d8c532e707 100644 --- a/extension/pprofextension/config_test.go +++ b/extension/pprofextension/config_test.go @@ -57,7 +57,7 @@ func TestLoadConfig(t *testing.T) { require.NoError(t, err) require.NoError(t, component.UnmarshalExtensionConfig(sub, cfg)) - assert.NoError(t, cfg.Validate()) + assert.NoError(t, component.ValidateConfig(cfg)) assert.Equal(t, tt.expected, cfg) }) } diff --git a/extension/pprofextension/go.mod b/extension/pprofextension/go.mod index 4ba69211884af..0f4bcfcacdbad 100644 --- a/extension/pprofextension/go.mod +++ b/extension/pprofextension/go.mod @@ -5,7 +5,8 @@ go 1.18 require ( github.com/open-telemetry/opentelemetry-collector-contrib/internal/common v0.64.0 github.com/stretchr/testify v1.8.1 - go.opentelemetry.io/collector v0.64.2-0.20221115155901-1550938c18fd + go.opentelemetry.io/collector v0.64.2-0.20221117234814-4565692c50a7 + go.opentelemetry.io/collector/component v0.0.0-20221117234814-4565692c50a7 go.uber.org/atomic v1.10.0 go.uber.org/zap v1.23.0 ) @@ -26,7 +27,9 @@ require ( github.com/pelletier/go-toml v1.9.4 // indirect github.com/pmezard/go-difflib v1.0.0 // indirect github.com/rogpeppe/go-internal v1.8.0 // indirect - go.opentelemetry.io/collector/pdata v0.64.2-0.20221115155901-1550938c18fd // indirect + go.opentelemetry.io/collector/consumer v0.0.0-20221117234814-4565692c50a7 // indirect + go.opentelemetry.io/collector/featuregate v0.0.0-20221117214536-6a117bfc3737 // indirect + go.opentelemetry.io/collector/pdata v0.64.2-0.20221117234814-4565692c50a7 // indirect go.opentelemetry.io/otel v1.11.1 // indirect go.opentelemetry.io/otel/metric v0.33.0 // indirect go.opentelemetry.io/otel/trace v1.11.1 // indirect diff --git a/extension/pprofextension/go.sum b/extension/pprofextension/go.sum index 39af8c55b3bec..8bbcef513b05a 100644 --- a/extension/pprofextension/go.sum +++ b/extension/pprofextension/go.sum @@ -266,10 +266,16 @@ github.com/yuin/goldmark v1.3.5/go.mod h1:mwnBkeHKe2W/ZEtQ+71ViKU8L12m81fl3OWwC1 go.etcd.io/etcd/api/v3 v3.5.4/go.mod h1:5GB2vv4A4AOn3yk7MftYGHkUfGtDHnEraIjym4dYz5A= go.etcd.io/etcd/client/pkg/v3 v3.5.4/go.mod h1:IJHfcCEKxYu1Os13ZdwCwIUTUVGYTSAM3YSwc9/Ac1g= go.etcd.io/etcd/client/v3 v3.5.4/go.mod h1:ZaRkVgBZC+L+dLCjTcF1hRXpgZXQPOvnA/Ak/gq3kiY= -go.opentelemetry.io/collector v0.64.2-0.20221115155901-1550938c18fd h1:O+6HhE4Ivg8Jksp3dIXIEC4FIR0Ush4uORvG3UtHZWk= -go.opentelemetry.io/collector v0.64.2-0.20221115155901-1550938c18fd/go.mod h1:mmSrOcwe1vEYmChXUYuF6rzlrUL0rjEiPfa19Xxb41o= -go.opentelemetry.io/collector/pdata v0.64.2-0.20221115155901-1550938c18fd h1:GdVAbRiae5VDZe3Mn3FqzMxO/aI5UbJ4+dcviqClHy8= -go.opentelemetry.io/collector/pdata v0.64.2-0.20221115155901-1550938c18fd/go.mod h1:0vynPfW2ZN7DltpcCFgCmTtWMQkCjp2a3TNt82YTCLQ= +go.opentelemetry.io/collector v0.64.2-0.20221117234814-4565692c50a7 h1:o/vMr2iyXzaeTb/KAldhMxAvRIfFPwtKfL5cKVKsSlU= +go.opentelemetry.io/collector v0.64.2-0.20221117234814-4565692c50a7/go.mod h1:PO8hayFFYvXDqELbXRVxwawR2HTdjN6mY4Qa3Se9xI8= +go.opentelemetry.io/collector/component v0.0.0-20221117234814-4565692c50a7 h1:q9m1bGHhQFUakQX79lZpLmFSY9VLULNSs2jUG8MdJLA= +go.opentelemetry.io/collector/component v0.0.0-20221117234814-4565692c50a7/go.mod h1:Z7H1Oj826e4dtVxXmT6SiUr6S0EIevUJmkVpfQV+UOk= +go.opentelemetry.io/collector/consumer v0.0.0-20221117234814-4565692c50a7 h1:FTy1JD9EJ7gq9SzlZoi2NkGcZ88+SwdiJav5uRcDEEY= +go.opentelemetry.io/collector/consumer v0.0.0-20221117234814-4565692c50a7/go.mod h1:86Elcw/LLrh90DprArogHMkBX3+UMu3tIgcVWF3mr6o= +go.opentelemetry.io/collector/featuregate v0.0.0-20221117214536-6a117bfc3737 h1:7sXg6M9Fw6rFVlX+iaWOMz6DFXEiroUdQer5kWGixwM= +go.opentelemetry.io/collector/featuregate v0.0.0-20221117214536-6a117bfc3737/go.mod h1:tewuFKJYalWBU0bmNKg++MC1ipINXUr6szYzOw2p1GI= +go.opentelemetry.io/collector/pdata v0.64.2-0.20221117234814-4565692c50a7 h1:IOFqfOu7fFxTgC7pvc2U7dk1/uFjwVQPK+CALiUvacI= +go.opentelemetry.io/collector/pdata v0.64.2-0.20221117234814-4565692c50a7/go.mod h1:0vynPfW2ZN7DltpcCFgCmTtWMQkCjp2a3TNt82YTCLQ= go.opentelemetry.io/otel v1.11.1 h1:4WLLAmcfkmDk2ukNXJyq3/kiz/3UzCaYq6PskJsaou4= go.opentelemetry.io/otel v1.11.1/go.mod h1:1nNhXBbWSD0nsL38H6btgnFN2k4i0sNLHNNMZMSbUGE= go.opentelemetry.io/otel/metric v0.33.0 h1:xQAyl7uGEYvrLAiV/09iTJlp1pZnQ9Wl793qbVvED1E= diff --git a/extension/sigv4authextension/config_test.go b/extension/sigv4authextension/config_test.go index 286b22159e3ea..9712a21c5c789 100644 --- a/extension/sigv4authextension/config_test.go +++ b/extension/sigv4authextension/config_test.go @@ -41,7 +41,7 @@ func TestLoadConfig(t *testing.T) { require.NoError(t, err) require.NoError(t, component.UnmarshalExtensionConfig(sub, cfg)) - assert.NoError(t, cfg.Validate()) + assert.NoError(t, component.ValidateConfig(cfg)) assert.Equal(t, &Config{ ExtensionSettings: config.NewExtensionSettings(component.NewID(typeStr)), Region: "region", @@ -63,5 +63,5 @@ func TestLoadConfigError(t *testing.T) { sub, err := cm.Sub(component.NewIDWithName(typeStr, "missing_credentials").String()) require.NoError(t, err) require.NoError(t, component.UnmarshalExtensionConfig(sub, cfg)) - assert.Error(t, cfg.Validate()) + assert.Error(t, component.ValidateConfig(cfg)) } diff --git a/extension/sigv4authextension/go.mod b/extension/sigv4authextension/go.mod index 9f7283b56eb7e..d3b9556308d82 100644 --- a/extension/sigv4authextension/go.mod +++ b/extension/sigv4authextension/go.mod @@ -8,7 +8,8 @@ require ( github.com/aws/aws-sdk-go-v2/credentials v1.13.0 github.com/aws/aws-sdk-go-v2/service/sts v1.17.2 github.com/stretchr/testify v1.8.1 - go.opentelemetry.io/collector v0.64.2-0.20221115155901-1550938c18fd + go.opentelemetry.io/collector v0.64.2-0.20221117234814-4565692c50a7 + go.opentelemetry.io/collector/component v0.0.0-20221117234814-4565692c50a7 go.uber.org/zap v1.23.0 google.golang.org/grpc v1.50.1 ) @@ -33,7 +34,9 @@ require ( github.com/modern-go/concurrent v0.0.0-20180306012644-bacd9c7ef1dd // indirect github.com/modern-go/reflect2 v1.0.2 // indirect github.com/pmezard/go-difflib v1.0.0 // indirect - go.opentelemetry.io/collector/pdata v0.64.2-0.20221115155901-1550938c18fd // indirect + go.opentelemetry.io/collector/consumer v0.0.0-20221117234814-4565692c50a7 // indirect + go.opentelemetry.io/collector/featuregate v0.0.0-20221117214536-6a117bfc3737 // indirect + go.opentelemetry.io/collector/pdata v0.64.2-0.20221117234814-4565692c50a7 // indirect go.opentelemetry.io/otel v1.11.1 // indirect go.opentelemetry.io/otel/metric v0.33.0 // indirect go.opentelemetry.io/otel/trace v1.11.1 // indirect diff --git a/extension/sigv4authextension/go.sum b/extension/sigv4authextension/go.sum index d6199fc9f84a0..83f24dd5170db 100644 --- a/extension/sigv4authextension/go.sum +++ b/extension/sigv4authextension/go.sum @@ -282,10 +282,16 @@ github.com/yuin/goldmark v1.3.5/go.mod h1:mwnBkeHKe2W/ZEtQ+71ViKU8L12m81fl3OWwC1 go.etcd.io/etcd/api/v3 v3.5.4/go.mod h1:5GB2vv4A4AOn3yk7MftYGHkUfGtDHnEraIjym4dYz5A= go.etcd.io/etcd/client/pkg/v3 v3.5.4/go.mod h1:IJHfcCEKxYu1Os13ZdwCwIUTUVGYTSAM3YSwc9/Ac1g= go.etcd.io/etcd/client/v3 v3.5.4/go.mod h1:ZaRkVgBZC+L+dLCjTcF1hRXpgZXQPOvnA/Ak/gq3kiY= -go.opentelemetry.io/collector v0.64.2-0.20221115155901-1550938c18fd h1:O+6HhE4Ivg8Jksp3dIXIEC4FIR0Ush4uORvG3UtHZWk= -go.opentelemetry.io/collector v0.64.2-0.20221115155901-1550938c18fd/go.mod h1:mmSrOcwe1vEYmChXUYuF6rzlrUL0rjEiPfa19Xxb41o= -go.opentelemetry.io/collector/pdata v0.64.2-0.20221115155901-1550938c18fd h1:GdVAbRiae5VDZe3Mn3FqzMxO/aI5UbJ4+dcviqClHy8= -go.opentelemetry.io/collector/pdata v0.64.2-0.20221115155901-1550938c18fd/go.mod h1:0vynPfW2ZN7DltpcCFgCmTtWMQkCjp2a3TNt82YTCLQ= +go.opentelemetry.io/collector v0.64.2-0.20221117234814-4565692c50a7 h1:o/vMr2iyXzaeTb/KAldhMxAvRIfFPwtKfL5cKVKsSlU= +go.opentelemetry.io/collector v0.64.2-0.20221117234814-4565692c50a7/go.mod h1:PO8hayFFYvXDqELbXRVxwawR2HTdjN6mY4Qa3Se9xI8= +go.opentelemetry.io/collector/component v0.0.0-20221117234814-4565692c50a7 h1:q9m1bGHhQFUakQX79lZpLmFSY9VLULNSs2jUG8MdJLA= +go.opentelemetry.io/collector/component v0.0.0-20221117234814-4565692c50a7/go.mod h1:Z7H1Oj826e4dtVxXmT6SiUr6S0EIevUJmkVpfQV+UOk= +go.opentelemetry.io/collector/consumer v0.0.0-20221117234814-4565692c50a7 h1:FTy1JD9EJ7gq9SzlZoi2NkGcZ88+SwdiJav5uRcDEEY= +go.opentelemetry.io/collector/consumer v0.0.0-20221117234814-4565692c50a7/go.mod h1:86Elcw/LLrh90DprArogHMkBX3+UMu3tIgcVWF3mr6o= +go.opentelemetry.io/collector/featuregate v0.0.0-20221117214536-6a117bfc3737 h1:7sXg6M9Fw6rFVlX+iaWOMz6DFXEiroUdQer5kWGixwM= +go.opentelemetry.io/collector/featuregate v0.0.0-20221117214536-6a117bfc3737/go.mod h1:tewuFKJYalWBU0bmNKg++MC1ipINXUr6szYzOw2p1GI= +go.opentelemetry.io/collector/pdata v0.64.2-0.20221117234814-4565692c50a7 h1:IOFqfOu7fFxTgC7pvc2U7dk1/uFjwVQPK+CALiUvacI= +go.opentelemetry.io/collector/pdata v0.64.2-0.20221117234814-4565692c50a7/go.mod h1:0vynPfW2ZN7DltpcCFgCmTtWMQkCjp2a3TNt82YTCLQ= go.opentelemetry.io/otel v1.11.1 h1:4WLLAmcfkmDk2ukNXJyq3/kiz/3UzCaYq6PskJsaou4= go.opentelemetry.io/otel v1.11.1/go.mod h1:1nNhXBbWSD0nsL38H6btgnFN2k4i0sNLHNNMZMSbUGE= go.opentelemetry.io/otel/metric v0.33.0 h1:xQAyl7uGEYvrLAiV/09iTJlp1pZnQ9Wl793qbVvED1E= diff --git a/extension/storage/filestorage/config_test.go b/extension/storage/filestorage/config_test.go index 0743d5374089b..fd25bc01ba850 100644 --- a/extension/storage/filestorage/config_test.go +++ b/extension/storage/filestorage/config_test.go @@ -71,7 +71,7 @@ func TestLoadConfig(t *testing.T) { require.NoError(t, err) require.NoError(t, component.UnmarshalExtensionConfig(sub, cfg)) - assert.NoError(t, cfg.Validate()) + assert.NoError(t, component.ValidateConfig(cfg)) assert.Equal(t, tt.expected, cfg) }) } @@ -82,7 +82,7 @@ func TestHandleNonExistingDirectoryWithAnError(t *testing.T) { cfg := f.CreateDefaultConfig().(*Config) cfg.Directory = "/not/a/dir" - err := cfg.Validate() + err := component.ValidateConfig(cfg) require.Error(t, err) require.True(t, strings.HasPrefix(err.Error(), "directory must exist: ")) } @@ -100,7 +100,7 @@ func TestHandleProvidingFilePathAsDirWithAnError(t *testing.T) { cfg.Directory = file.Name() - err = cfg.Validate() + err = component.ValidateConfig(cfg) require.Error(t, err) require.EqualError(t, err, file.Name()+" is not a directory") } diff --git a/extension/storage/go.mod b/extension/storage/go.mod index c362b0ef00713..8c6fc9f39b5b9 100644 --- a/extension/storage/go.mod +++ b/extension/storage/go.mod @@ -7,7 +7,8 @@ require ( github.com/mattn/go-sqlite3 v2.0.3+incompatible github.com/stretchr/testify v1.8.1 go.etcd.io/bbolt v1.3.6 - go.opentelemetry.io/collector v0.64.2-0.20221115155901-1550938c18fd + go.opentelemetry.io/collector v0.64.2-0.20221117234814-4565692c50a7 + go.opentelemetry.io/collector/component v0.0.0-20221117234814-4565692c50a7 go.uber.org/zap v1.23.0 ) @@ -33,7 +34,9 @@ require ( github.com/modern-go/reflect2 v1.0.2 // indirect github.com/pelletier/go-toml v1.9.4 // indirect github.com/pmezard/go-difflib v1.0.0 // indirect - go.opentelemetry.io/collector/pdata v0.64.2-0.20221115155901-1550938c18fd // indirect + go.opentelemetry.io/collector/consumer v0.0.0-20221117234814-4565692c50a7 // indirect + go.opentelemetry.io/collector/featuregate v0.0.0-20221117214536-6a117bfc3737 // indirect + go.opentelemetry.io/collector/pdata v0.64.2-0.20221117234814-4565692c50a7 // indirect go.opentelemetry.io/otel v1.11.1 // indirect go.opentelemetry.io/otel/metric v0.33.0 // indirect go.opentelemetry.io/otel/trace v1.11.1 // indirect diff --git a/extension/storage/go.sum b/extension/storage/go.sum index be6cee46a4ab1..8ac184a897d0f 100644 --- a/extension/storage/go.sum +++ b/extension/storage/go.sum @@ -347,10 +347,16 @@ go.etcd.io/bbolt v1.3.6/go.mod h1:qXsaaIqmgQH0T+OPdb99Bf+PKfBBQVAdyD6TY9G8XM4= go.etcd.io/etcd/api/v3 v3.5.4/go.mod h1:5GB2vv4A4AOn3yk7MftYGHkUfGtDHnEraIjym4dYz5A= go.etcd.io/etcd/client/pkg/v3 v3.5.4/go.mod h1:IJHfcCEKxYu1Os13ZdwCwIUTUVGYTSAM3YSwc9/Ac1g= go.etcd.io/etcd/client/v3 v3.5.4/go.mod h1:ZaRkVgBZC+L+dLCjTcF1hRXpgZXQPOvnA/Ak/gq3kiY= -go.opentelemetry.io/collector v0.64.2-0.20221115155901-1550938c18fd h1:O+6HhE4Ivg8Jksp3dIXIEC4FIR0Ush4uORvG3UtHZWk= -go.opentelemetry.io/collector v0.64.2-0.20221115155901-1550938c18fd/go.mod h1:mmSrOcwe1vEYmChXUYuF6rzlrUL0rjEiPfa19Xxb41o= -go.opentelemetry.io/collector/pdata v0.64.2-0.20221115155901-1550938c18fd h1:GdVAbRiae5VDZe3Mn3FqzMxO/aI5UbJ4+dcviqClHy8= -go.opentelemetry.io/collector/pdata v0.64.2-0.20221115155901-1550938c18fd/go.mod h1:0vynPfW2ZN7DltpcCFgCmTtWMQkCjp2a3TNt82YTCLQ= +go.opentelemetry.io/collector v0.64.2-0.20221117234814-4565692c50a7 h1:o/vMr2iyXzaeTb/KAldhMxAvRIfFPwtKfL5cKVKsSlU= +go.opentelemetry.io/collector v0.64.2-0.20221117234814-4565692c50a7/go.mod h1:PO8hayFFYvXDqELbXRVxwawR2HTdjN6mY4Qa3Se9xI8= +go.opentelemetry.io/collector/component v0.0.0-20221117234814-4565692c50a7 h1:q9m1bGHhQFUakQX79lZpLmFSY9VLULNSs2jUG8MdJLA= +go.opentelemetry.io/collector/component v0.0.0-20221117234814-4565692c50a7/go.mod h1:Z7H1Oj826e4dtVxXmT6SiUr6S0EIevUJmkVpfQV+UOk= +go.opentelemetry.io/collector/consumer v0.0.0-20221117234814-4565692c50a7 h1:FTy1JD9EJ7gq9SzlZoi2NkGcZ88+SwdiJav5uRcDEEY= +go.opentelemetry.io/collector/consumer v0.0.0-20221117234814-4565692c50a7/go.mod h1:86Elcw/LLrh90DprArogHMkBX3+UMu3tIgcVWF3mr6o= +go.opentelemetry.io/collector/featuregate v0.0.0-20221117214536-6a117bfc3737 h1:7sXg6M9Fw6rFVlX+iaWOMz6DFXEiroUdQer5kWGixwM= +go.opentelemetry.io/collector/featuregate v0.0.0-20221117214536-6a117bfc3737/go.mod h1:tewuFKJYalWBU0bmNKg++MC1ipINXUr6szYzOw2p1GI= +go.opentelemetry.io/collector/pdata v0.64.2-0.20221117234814-4565692c50a7 h1:IOFqfOu7fFxTgC7pvc2U7dk1/uFjwVQPK+CALiUvacI= +go.opentelemetry.io/collector/pdata v0.64.2-0.20221117234814-4565692c50a7/go.mod h1:0vynPfW2ZN7DltpcCFgCmTtWMQkCjp2a3TNt82YTCLQ= go.opentelemetry.io/otel v1.11.1 h1:4WLLAmcfkmDk2ukNXJyq3/kiz/3UzCaYq6PskJsaou4= go.opentelemetry.io/otel v1.11.1/go.mod h1:1nNhXBbWSD0nsL38H6btgnFN2k4i0sNLHNNMZMSbUGE= go.opentelemetry.io/otel/metric v0.33.0 h1:xQAyl7uGEYvrLAiV/09iTJlp1pZnQ9Wl793qbVvED1E= diff --git a/go.mod b/go.mod index daf9eeb8b1701..0ffadd83725c5 100644 --- a/go.mod +++ b/go.mod @@ -159,15 +159,17 @@ require ( github.com/open-telemetry/opentelemetry-collector-contrib/receiver/zookeeperreceiver v0.64.0 github.com/prometheus/prometheus v1.8.2-0.20220303173753-edfe657b5405 github.com/stretchr/testify v1.8.1 - go.opentelemetry.io/collector v0.64.2-0.20221115155901-1550938c18fd - go.opentelemetry.io/collector/exporter/loggingexporter v0.64.2-0.20221115155901-1550938c18fd - go.opentelemetry.io/collector/exporter/otlpexporter v0.64.2-0.20221115155901-1550938c18fd - go.opentelemetry.io/collector/exporter/otlphttpexporter v0.64.2-0.20221115155901-1550938c18fd - go.opentelemetry.io/collector/extension/ballastextension v0.64.2-0.20221115155901-1550938c18fd - go.opentelemetry.io/collector/extension/zpagesextension v0.64.2-0.20221115155901-1550938c18fd - go.opentelemetry.io/collector/processor/batchprocessor v0.64.2-0.20221115155901-1550938c18fd - go.opentelemetry.io/collector/processor/memorylimiterprocessor v0.64.2-0.20221115155901-1550938c18fd - go.opentelemetry.io/collector/receiver/otlpreceiver v0.64.2-0.20221115155901-1550938c18fd + go.opentelemetry.io/collector v0.64.2-0.20221117234814-4565692c50a7 + go.opentelemetry.io/collector/component v0.0.0-20221117234814-4565692c50a7 + go.opentelemetry.io/collector/consumer v0.0.0-20221117234814-4565692c50a7 + go.opentelemetry.io/collector/exporter/loggingexporter v0.64.2-0.20221117234814-4565692c50a7 + go.opentelemetry.io/collector/exporter/otlpexporter v0.64.2-0.20221117234814-4565692c50a7 + go.opentelemetry.io/collector/exporter/otlphttpexporter v0.64.2-0.20221117234814-4565692c50a7 + go.opentelemetry.io/collector/extension/ballastextension v0.64.2-0.20221117234814-4565692c50a7 + go.opentelemetry.io/collector/extension/zpagesextension v0.64.2-0.20221117234814-4565692c50a7 + go.opentelemetry.io/collector/processor/batchprocessor v0.64.2-0.20221117234814-4565692c50a7 + go.opentelemetry.io/collector/processor/memorylimiterprocessor v0.64.2-0.20221117234814-4565692c50a7 + go.opentelemetry.io/collector/receiver/otlpreceiver v0.64.2-0.20221117234814-4565692c50a7 go.uber.org/multierr v1.8.0 golang.org/x/sys v0.2.0 ) @@ -597,8 +599,9 @@ require ( go.mongodb.org/atlas v0.19.0 // indirect go.mongodb.org/mongo-driver v1.10.3 // indirect go.opencensus.io v0.24.0 // indirect - go.opentelemetry.io/collector/pdata v0.64.2-0.20221115155901-1550938c18fd // indirect - go.opentelemetry.io/collector/semconv v0.64.2-0.20221115155901-1550938c18fd // indirect + go.opentelemetry.io/collector/featuregate v0.0.0-20221117214536-6a117bfc3737 // indirect + go.opentelemetry.io/collector/pdata v0.64.2-0.20221117234814-4565692c50a7 // indirect + go.opentelemetry.io/collector/semconv v0.64.2-0.20221117234814-4565692c50a7 // indirect go.opentelemetry.io/contrib/instrumentation/google.golang.org/grpc/otelgrpc v0.36.4 // indirect go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.36.4 // indirect go.opentelemetry.io/contrib/propagators/b3 v1.11.1 // indirect diff --git a/go.sum b/go.sum index 7178441c4ff6a..474ce9d22594a 100644 --- a/go.sum +++ b/go.sum @@ -2341,37 +2341,45 @@ go.opencensus.io v0.24.0 h1:y73uSU6J157QMP2kn2r30vwW1A2W2WFwSCGnAVxeaD0= go.opencensus.io v0.24.0/go.mod h1:vNK8G9p7aAivkbmorf4v+7Hgx+Zs0yY+0fOtgBfjQKo= go.opentelemetry.io/collector v0.57.2/go.mod h1:9TwWyMRhbFNzaaGLtm/6poWNDJw+etvQMS6Fy+8/8Xs= go.opentelemetry.io/collector v0.64.1/go.mod h1:RxdEKzwxTEhBAgzC4wzyJEwSFgjWU73CHnLjKUKQDyo= -go.opentelemetry.io/collector v0.64.2-0.20221115155901-1550938c18fd h1:O+6HhE4Ivg8Jksp3dIXIEC4FIR0Ush4uORvG3UtHZWk= -go.opentelemetry.io/collector v0.64.2-0.20221115155901-1550938c18fd/go.mod h1:mmSrOcwe1vEYmChXUYuF6rzlrUL0rjEiPfa19Xxb41o= -go.opentelemetry.io/collector/exporter/loggingexporter v0.64.2-0.20221115155901-1550938c18fd h1:Rs+5jIRrgMFfK8RUHsx3dejMewFOFqRgebeT6nt4w4A= -go.opentelemetry.io/collector/exporter/loggingexporter v0.64.2-0.20221115155901-1550938c18fd/go.mod h1:AaS7Bnnu2e/rdiYCa6ko12TtHPxZmTvYyQEQ+yS++tU= -go.opentelemetry.io/collector/exporter/otlpexporter v0.64.2-0.20221115155901-1550938c18fd h1:Aba3DLnRML3J2567NIKeXwryvHGwckIkXkmrA/C/BzI= -go.opentelemetry.io/collector/exporter/otlpexporter v0.64.2-0.20221115155901-1550938c18fd/go.mod h1:5bfOtQfZ3XtaIGfavOrh8gHn+vvUZ2kB27dIrw6T1aY= -go.opentelemetry.io/collector/exporter/otlphttpexporter v0.64.2-0.20221115155901-1550938c18fd h1:ZOlxq1goa2gShVdLWdyUlk0V0qrM5zf3JckVFVDuijw= -go.opentelemetry.io/collector/exporter/otlphttpexporter v0.64.2-0.20221115155901-1550938c18fd/go.mod h1:MICUYztxRZgjILRc6Wj6fJK6n9KSiRNrRwRpybNy2i8= -go.opentelemetry.io/collector/extension/ballastextension v0.64.2-0.20221115155901-1550938c18fd h1:w5LzWafV1a0Fqfv7GkGwfRsdi1ZNZPVl08BZHI/LKt8= -go.opentelemetry.io/collector/extension/ballastextension v0.64.2-0.20221115155901-1550938c18fd/go.mod h1:Tv85DBH3y0OFkH8BN6pnRFPVHLmDphk2DDO6BgGPTp0= +go.opentelemetry.io/collector v0.64.2-0.20221117234814-4565692c50a7 h1:o/vMr2iyXzaeTb/KAldhMxAvRIfFPwtKfL5cKVKsSlU= +go.opentelemetry.io/collector v0.64.2-0.20221117234814-4565692c50a7/go.mod h1:PO8hayFFYvXDqELbXRVxwawR2HTdjN6mY4Qa3Se9xI8= +go.opentelemetry.io/collector/component v0.0.0-20221115212826-19db2f15c85c/go.mod h1:5+C/jgNQLM3Lkkys0UU+p2iOsGMs80kQ/DaZ1svo5cc= +go.opentelemetry.io/collector/component v0.0.0-20221117234814-4565692c50a7 h1:q9m1bGHhQFUakQX79lZpLmFSY9VLULNSs2jUG8MdJLA= +go.opentelemetry.io/collector/component v0.0.0-20221117234814-4565692c50a7/go.mod h1:Z7H1Oj826e4dtVxXmT6SiUr6S0EIevUJmkVpfQV+UOk= +go.opentelemetry.io/collector/consumer v0.0.0-20221116212002-2454cfb9ab7f/go.mod h1:npKt5UPhg8ZEtYqwN4R7VtWbzyAURVu3vfDikr3ycLM= +go.opentelemetry.io/collector/consumer v0.0.0-20221117234814-4565692c50a7 h1:FTy1JD9EJ7gq9SzlZoi2NkGcZ88+SwdiJav5uRcDEEY= +go.opentelemetry.io/collector/consumer v0.0.0-20221117234814-4565692c50a7/go.mod h1:86Elcw/LLrh90DprArogHMkBX3+UMu3tIgcVWF3mr6o= +go.opentelemetry.io/collector/exporter/loggingexporter v0.64.2-0.20221117234814-4565692c50a7 h1:d6+smWiqTczWSB6RgSOlicPHqhM2AdcTfpsDt5ocx8s= +go.opentelemetry.io/collector/exporter/loggingexporter v0.64.2-0.20221117234814-4565692c50a7/go.mod h1:Q1xXeHaKenGhOUJT/k6n0wh3rXQuk1qO1OHtx/1GEjA= +go.opentelemetry.io/collector/exporter/otlpexporter v0.64.2-0.20221117234814-4565692c50a7 h1:Pw+375oxebSKKDDQjOFSMFSfopmx6gARuqTmQD1njGY= +go.opentelemetry.io/collector/exporter/otlpexporter v0.64.2-0.20221117234814-4565692c50a7/go.mod h1:X6iHDUlspR3fJ3zvZskB+d9/PXaC/zYMbHrtfvk9yNk= +go.opentelemetry.io/collector/exporter/otlphttpexporter v0.64.2-0.20221117234814-4565692c50a7 h1:8ByTWg2YOwZqZpCwmWbPeuNjOC2k1QwMjAv0ESaFbqc= +go.opentelemetry.io/collector/exporter/otlphttpexporter v0.64.2-0.20221117234814-4565692c50a7/go.mod h1:21XZBi5i+LDa41a6BTH7YyUd3xTmf6DYnPNn3t9yTII= +go.opentelemetry.io/collector/extension/ballastextension v0.64.2-0.20221117234814-4565692c50a7 h1:eIazz94xNlOTrbMPzhnfIcqFvQTT0OW91H1AdYfbFqA= +go.opentelemetry.io/collector/extension/ballastextension v0.64.2-0.20221117234814-4565692c50a7/go.mod h1:3jV3YlZheaEai6+1gMxi92zehVd5owIa5oShiXiPgTA= go.opentelemetry.io/collector/extension/zpagesextension v0.64.1/go.mod h1:XenhQAUbOHgqNq5YQ/vQIcDHRcPUaDgZQxDC2qoI4Bc= -go.opentelemetry.io/collector/extension/zpagesextension v0.64.2-0.20221115155901-1550938c18fd h1:divtniDLhmbVre6mWhWZKrDps87WV7v2JUDe5d8wSCE= -go.opentelemetry.io/collector/extension/zpagesextension v0.64.2-0.20221115155901-1550938c18fd/go.mod h1:Lh4S28vozIfK/n2LJ7MhwyQBAJFzmb6FUVtlArX97ho= +go.opentelemetry.io/collector/extension/zpagesextension v0.64.2-0.20221117234814-4565692c50a7 h1:w7Oz8A/4pQHpvHsRTT6QC1QuxR4qpD0FlAK40koEQuU= +go.opentelemetry.io/collector/extension/zpagesextension v0.64.2-0.20221117234814-4565692c50a7/go.mod h1:MddgDwL0gsv0QilaxzMajrYXa+AdZED4tIsAnIMW2R0= +go.opentelemetry.io/collector/featuregate v0.0.0-20221117214536-6a117bfc3737 h1:7sXg6M9Fw6rFVlX+iaWOMz6DFXEiroUdQer5kWGixwM= +go.opentelemetry.io/collector/featuregate v0.0.0-20221117214536-6a117bfc3737/go.mod h1:tewuFKJYalWBU0bmNKg++MC1ipINXUr6szYzOw2p1GI= go.opentelemetry.io/collector/pdata v0.56.0/go.mod h1:mYcCREWiIJyHss0dbU+GSiz2tmGZ6u09vtfkKTciog4= go.opentelemetry.io/collector/pdata v0.57.2/go.mod h1:RU9I8lwBUxucwOsSYzHEcHi15M9QaX78hgQ2PRdSxV0= go.opentelemetry.io/collector/pdata v0.64.1/go.mod h1:IzvXUGQml2mrnvdb8zIlEW3qQs9oFLdD2hLwJdZ+pek= -go.opentelemetry.io/collector/pdata v0.64.2-0.20221115155901-1550938c18fd h1:GdVAbRiae5VDZe3Mn3FqzMxO/aI5UbJ4+dcviqClHy8= -go.opentelemetry.io/collector/pdata v0.64.2-0.20221115155901-1550938c18fd/go.mod h1:0vynPfW2ZN7DltpcCFgCmTtWMQkCjp2a3TNt82YTCLQ= +go.opentelemetry.io/collector/pdata v0.64.2-0.20221117234814-4565692c50a7 h1:IOFqfOu7fFxTgC7pvc2U7dk1/uFjwVQPK+CALiUvacI= +go.opentelemetry.io/collector/pdata v0.64.2-0.20221117234814-4565692c50a7/go.mod h1:0vynPfW2ZN7DltpcCFgCmTtWMQkCjp2a3TNt82YTCLQ= go.opentelemetry.io/collector/processor/batchprocessor v0.64.1/go.mod h1:qVl0+aYokPfiq5y+JVAvlII2rrUFBDEqqiDbTSnax78= -go.opentelemetry.io/collector/processor/batchprocessor v0.64.2-0.20221115155901-1550938c18fd h1:SSjP8V0UP2+oPZ3gL+Dk90KQcvHXvHp9V5h8IIpx0og= -go.opentelemetry.io/collector/processor/batchprocessor v0.64.2-0.20221115155901-1550938c18fd/go.mod h1:zyCnX0aTvBaZ3XLWSHZdTueP7WoXRjz8X6HiWgKqstM= -go.opentelemetry.io/collector/processor/memorylimiterprocessor v0.64.2-0.20221115155901-1550938c18fd h1:ZO4eSgxGxi8BohVcU6ixm/xjNBfCqqxbSQbKIK9KVtw= -go.opentelemetry.io/collector/processor/memorylimiterprocessor v0.64.2-0.20221115155901-1550938c18fd/go.mod h1:YYJUdzGlD0iN6KWTsTc+tAtRiOQNnJK9k7udr9Ic6l4= +go.opentelemetry.io/collector/processor/batchprocessor v0.64.2-0.20221117234814-4565692c50a7 h1:hGDq2T07j6qwwtQ2t6ZGU5tp/J2Dvu9mfY5qnnP5Ic8= +go.opentelemetry.io/collector/processor/batchprocessor v0.64.2-0.20221117234814-4565692c50a7/go.mod h1:b83iea2eDSAQkvd+2aSokaa6GRjSIsaR2zILziF/Ogc= +go.opentelemetry.io/collector/processor/memorylimiterprocessor v0.64.2-0.20221117234814-4565692c50a7 h1:M28BjryAkBY/tBp0CrPY+krc0x+6uJnmrkX7JQwA4Ns= +go.opentelemetry.io/collector/processor/memorylimiterprocessor v0.64.2-0.20221117234814-4565692c50a7/go.mod h1:81b812AB+nutOksY9LBYwhHtiqvqDjrih3PmrgY2wDg= go.opentelemetry.io/collector/receiver/otlpreceiver v0.64.1/go.mod h1:4rwNi9SeCKBP9XGLWNRFKPsWUV5NK4iqMvdj2WRMksQ= -go.opentelemetry.io/collector/receiver/otlpreceiver v0.64.2-0.20221115155901-1550938c18fd h1:hMuRptXpQYC9dk7x68LIFeVEpoE3oM+ddI6o13cS73Q= -go.opentelemetry.io/collector/receiver/otlpreceiver v0.64.2-0.20221115155901-1550938c18fd/go.mod h1:i80XzKLKheio/axok7WksVx/xmNGRadfmlzhWOWDnr4= +go.opentelemetry.io/collector/receiver/otlpreceiver v0.64.2-0.20221117234814-4565692c50a7 h1:n2zHwTL1xcJ1DtKrGUAXVT12hCN0b5tjVqQV974xCsA= +go.opentelemetry.io/collector/receiver/otlpreceiver v0.64.2-0.20221117234814-4565692c50a7/go.mod h1:CZy46KR3rC5HVHWouklB9oyg7SU9OIRmcKyw6+m+rCk= go.opentelemetry.io/collector/semconv v0.56.0/go.mod h1:EH1wbDvTyqKpKBBpoMIe0KQk2plCcFS66Mo17WtR7CQ= go.opentelemetry.io/collector/semconv v0.57.2/go.mod h1:84YnUjmm+nhGu4YTDLnHCbxnL74ooWpismPG79tFD7w= go.opentelemetry.io/collector/semconv v0.64.1/go.mod h1:5o9yhOa+ABt7g2E5JABDxGZ1PQPbtfxrKNbYn+LOTXU= -go.opentelemetry.io/collector/semconv v0.64.2-0.20221115155901-1550938c18fd h1:rMqcl2pwi8YtVrtOPK8tVh87W0bFBge4yqB9ypSsAJ4= -go.opentelemetry.io/collector/semconv v0.64.2-0.20221115155901-1550938c18fd/go.mod h1:5o9yhOa+ABt7g2E5JABDxGZ1PQPbtfxrKNbYn+LOTXU= +go.opentelemetry.io/collector/semconv v0.64.2-0.20221117234814-4565692c50a7 h1:cGXAVltDxXw9nj0Vr7vyZZTj0whdyO+GYs+xv0xHJ2A= +go.opentelemetry.io/collector/semconv v0.64.2-0.20221117234814-4565692c50a7/go.mod h1:5o9yhOa+ABt7g2E5JABDxGZ1PQPbtfxrKNbYn+LOTXU= go.opentelemetry.io/contrib/instrumentation/google.golang.org/grpc/otelgrpc v0.33.0/go.mod h1:y/SlJpJQPd2UzfBCj0E9Flk9FDCtTyqUmaCB41qFrWI= go.opentelemetry.io/contrib/instrumentation/google.golang.org/grpc/otelgrpc v0.36.4 h1:PRXhsszxTt5bbPriTjmaweWUsAnJYeWBhUMLRetUgBU= go.opentelemetry.io/contrib/instrumentation/google.golang.org/grpc/otelgrpc v0.36.4/go.mod h1:05eWWy6ZWzmpeImD3UowLTB3VjDMU1yxQ+ENuVWDM3c= diff --git a/internal/aws/containerinsight/go.mod b/internal/aws/containerinsight/go.mod index 6623aa238004b..786482e0ddc44 100644 --- a/internal/aws/containerinsight/go.mod +++ b/internal/aws/containerinsight/go.mod @@ -4,7 +4,7 @@ go 1.18 require ( github.com/stretchr/testify v1.8.1 - go.opentelemetry.io/collector/pdata v0.64.2-0.20221115155901-1550938c18fd + go.opentelemetry.io/collector/pdata v0.64.2-0.20221117234814-4565692c50a7 go.uber.org/zap v1.23.0 ) diff --git a/internal/aws/containerinsight/go.sum b/internal/aws/containerinsight/go.sum index 5980a06299e64..b317222215fab 100644 --- a/internal/aws/containerinsight/go.sum +++ b/internal/aws/containerinsight/go.sum @@ -54,8 +54,8 @@ github.com/stretchr/testify v1.8.1 h1:w7B6lhMri9wdJUVmEZPGGhZzrYTPvgJArz7wNPgYKs github.com/stretchr/testify v1.8.1/go.mod h1:w2LPCIKwWwSfY2zedu0+kehJoqGctiVI29o6fzry7u4= github.com/yuin/goldmark v1.1.27/go.mod h1:3hX8gzYuyVAZsxl0MRgGTJEmQBFcNTphYh9decYSb74= github.com/yuin/goldmark v1.2.1/go.mod h1:3hX8gzYuyVAZsxl0MRgGTJEmQBFcNTphYh9decYSb74= -go.opentelemetry.io/collector/pdata v0.64.2-0.20221115155901-1550938c18fd h1:GdVAbRiae5VDZe3Mn3FqzMxO/aI5UbJ4+dcviqClHy8= -go.opentelemetry.io/collector/pdata v0.64.2-0.20221115155901-1550938c18fd/go.mod h1:0vynPfW2ZN7DltpcCFgCmTtWMQkCjp2a3TNt82YTCLQ= +go.opentelemetry.io/collector/pdata v0.64.2-0.20221117234814-4565692c50a7 h1:IOFqfOu7fFxTgC7pvc2U7dk1/uFjwVQPK+CALiUvacI= +go.opentelemetry.io/collector/pdata v0.64.2-0.20221117234814-4565692c50a7/go.mod h1:0vynPfW2ZN7DltpcCFgCmTtWMQkCjp2a3TNt82YTCLQ= go.uber.org/atomic v1.7.0/go.mod h1:fEN4uk6kAWBTFdckzkM89CLk9XfWZrxpCo0nPH17wJc= go.uber.org/atomic v1.10.0 h1:9qC72Qh0+3MqyJbAn8YU5xVq1frD8bn3JtD2oXtafVQ= go.uber.org/atomic v1.10.0/go.mod h1:LUxbIzbOniOlMKjJjyPfpl4v+PKK2cNJn91OQbhoJI0= diff --git a/internal/aws/cwlogs/go.mod b/internal/aws/cwlogs/go.mod index 742b79dbb228b..d7d8ed9b451ac 100644 --- a/internal/aws/cwlogs/go.mod +++ b/internal/aws/cwlogs/go.mod @@ -5,7 +5,7 @@ go 1.18 require ( github.com/aws/aws-sdk-go v1.44.133 github.com/stretchr/testify v1.8.1 - go.opentelemetry.io/collector v0.64.2-0.20221115155901-1550938c18fd + go.opentelemetry.io/collector/component v0.0.0-20221117234814-4565692c50a7 go.uber.org/zap v1.23.0 ) @@ -26,7 +26,10 @@ require ( github.com/pelletier/go-toml v1.9.4 // indirect github.com/pmezard/go-difflib v1.0.0 // indirect github.com/stretchr/objx v0.5.0 // indirect - go.opentelemetry.io/collector/pdata v0.64.2-0.20221115155901-1550938c18fd // indirect + go.opentelemetry.io/collector v0.64.2-0.20221117234814-4565692c50a7 // indirect + go.opentelemetry.io/collector/consumer v0.0.0-20221117234814-4565692c50a7 // indirect + go.opentelemetry.io/collector/featuregate v0.0.0-20221117214536-6a117bfc3737 // indirect + go.opentelemetry.io/collector/pdata v0.64.2-0.20221117234814-4565692c50a7 // indirect go.opentelemetry.io/otel v1.11.1 // indirect go.opentelemetry.io/otel/metric v0.33.0 // indirect go.opentelemetry.io/otel/trace v1.11.1 // indirect diff --git a/internal/aws/cwlogs/go.sum b/internal/aws/cwlogs/go.sum index 3a78f5d19a4a6..cef53c3638cfe 100644 --- a/internal/aws/cwlogs/go.sum +++ b/internal/aws/cwlogs/go.sum @@ -271,10 +271,16 @@ github.com/yuin/goldmark v1.4.13/go.mod h1:6yULJ656Px+3vBD8DxQVa3kxgyrAnzto9xy5t go.etcd.io/etcd/api/v3 v3.5.4/go.mod h1:5GB2vv4A4AOn3yk7MftYGHkUfGtDHnEraIjym4dYz5A= go.etcd.io/etcd/client/pkg/v3 v3.5.4/go.mod h1:IJHfcCEKxYu1Os13ZdwCwIUTUVGYTSAM3YSwc9/Ac1g= go.etcd.io/etcd/client/v3 v3.5.4/go.mod h1:ZaRkVgBZC+L+dLCjTcF1hRXpgZXQPOvnA/Ak/gq3kiY= -go.opentelemetry.io/collector v0.64.2-0.20221115155901-1550938c18fd h1:O+6HhE4Ivg8Jksp3dIXIEC4FIR0Ush4uORvG3UtHZWk= -go.opentelemetry.io/collector v0.64.2-0.20221115155901-1550938c18fd/go.mod h1:mmSrOcwe1vEYmChXUYuF6rzlrUL0rjEiPfa19Xxb41o= -go.opentelemetry.io/collector/pdata v0.64.2-0.20221115155901-1550938c18fd h1:GdVAbRiae5VDZe3Mn3FqzMxO/aI5UbJ4+dcviqClHy8= -go.opentelemetry.io/collector/pdata v0.64.2-0.20221115155901-1550938c18fd/go.mod h1:0vynPfW2ZN7DltpcCFgCmTtWMQkCjp2a3TNt82YTCLQ= +go.opentelemetry.io/collector v0.64.2-0.20221117234814-4565692c50a7 h1:o/vMr2iyXzaeTb/KAldhMxAvRIfFPwtKfL5cKVKsSlU= +go.opentelemetry.io/collector v0.64.2-0.20221117234814-4565692c50a7/go.mod h1:PO8hayFFYvXDqELbXRVxwawR2HTdjN6mY4Qa3Se9xI8= +go.opentelemetry.io/collector/component v0.0.0-20221117234814-4565692c50a7 h1:q9m1bGHhQFUakQX79lZpLmFSY9VLULNSs2jUG8MdJLA= +go.opentelemetry.io/collector/component v0.0.0-20221117234814-4565692c50a7/go.mod h1:Z7H1Oj826e4dtVxXmT6SiUr6S0EIevUJmkVpfQV+UOk= +go.opentelemetry.io/collector/consumer v0.0.0-20221117234814-4565692c50a7 h1:FTy1JD9EJ7gq9SzlZoi2NkGcZ88+SwdiJav5uRcDEEY= +go.opentelemetry.io/collector/consumer v0.0.0-20221117234814-4565692c50a7/go.mod h1:86Elcw/LLrh90DprArogHMkBX3+UMu3tIgcVWF3mr6o= +go.opentelemetry.io/collector/featuregate v0.0.0-20221117214536-6a117bfc3737 h1:7sXg6M9Fw6rFVlX+iaWOMz6DFXEiroUdQer5kWGixwM= +go.opentelemetry.io/collector/featuregate v0.0.0-20221117214536-6a117bfc3737/go.mod h1:tewuFKJYalWBU0bmNKg++MC1ipINXUr6szYzOw2p1GI= +go.opentelemetry.io/collector/pdata v0.64.2-0.20221117234814-4565692c50a7 h1:IOFqfOu7fFxTgC7pvc2U7dk1/uFjwVQPK+CALiUvacI= +go.opentelemetry.io/collector/pdata v0.64.2-0.20221117234814-4565692c50a7/go.mod h1:0vynPfW2ZN7DltpcCFgCmTtWMQkCjp2a3TNt82YTCLQ= go.opentelemetry.io/otel v1.11.1 h1:4WLLAmcfkmDk2ukNXJyq3/kiz/3UzCaYq6PskJsaou4= go.opentelemetry.io/otel v1.11.1/go.mod h1:1nNhXBbWSD0nsL38H6btgnFN2k4i0sNLHNNMZMSbUGE= go.opentelemetry.io/otel/metric v0.33.0 h1:xQAyl7uGEYvrLAiV/09iTJlp1pZnQ9Wl793qbVvED1E= diff --git a/internal/aws/ecsutil/go.mod b/internal/aws/ecsutil/go.mod index a2c285cbd59fa..d9f0549a9d762 100644 --- a/internal/aws/ecsutil/go.mod +++ b/internal/aws/ecsutil/go.mod @@ -5,7 +5,8 @@ go 1.18 require ( github.com/open-telemetry/opentelemetry-collector-contrib/internal/common v0.64.0 github.com/stretchr/testify v1.8.1 - go.opentelemetry.io/collector v0.64.2-0.20221115155901-1550938c18fd + go.opentelemetry.io/collector v0.64.2-0.20221117234814-4565692c50a7 + go.opentelemetry.io/collector/component v0.0.0-20221117234814-4565692c50a7 go.uber.org/zap v1.23.0 ) @@ -31,7 +32,9 @@ require ( github.com/pmezard/go-difflib v1.0.0 // indirect github.com/rogpeppe/go-internal v1.8.0 // indirect github.com/rs/cors v1.8.2 // indirect - go.opentelemetry.io/collector/pdata v0.64.2-0.20221115155901-1550938c18fd // indirect + go.opentelemetry.io/collector/consumer v0.0.0-20221117234814-4565692c50a7 // indirect + go.opentelemetry.io/collector/featuregate v0.0.0-20221117214536-6a117bfc3737 // indirect + go.opentelemetry.io/collector/pdata v0.64.2-0.20221117234814-4565692c50a7 // indirect go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.36.4 // indirect go.opentelemetry.io/otel v1.11.1 // indirect go.opentelemetry.io/otel/metric v0.33.0 // indirect diff --git a/internal/aws/ecsutil/go.sum b/internal/aws/ecsutil/go.sum index d381d39e45c06..d0f8d1f898e8f 100644 --- a/internal/aws/ecsutil/go.sum +++ b/internal/aws/ecsutil/go.sum @@ -279,10 +279,16 @@ github.com/yuin/goldmark v1.3.5/go.mod h1:mwnBkeHKe2W/ZEtQ+71ViKU8L12m81fl3OWwC1 go.etcd.io/etcd/api/v3 v3.5.4/go.mod h1:5GB2vv4A4AOn3yk7MftYGHkUfGtDHnEraIjym4dYz5A= go.etcd.io/etcd/client/pkg/v3 v3.5.4/go.mod h1:IJHfcCEKxYu1Os13ZdwCwIUTUVGYTSAM3YSwc9/Ac1g= go.etcd.io/etcd/client/v3 v3.5.4/go.mod h1:ZaRkVgBZC+L+dLCjTcF1hRXpgZXQPOvnA/Ak/gq3kiY= -go.opentelemetry.io/collector v0.64.2-0.20221115155901-1550938c18fd h1:O+6HhE4Ivg8Jksp3dIXIEC4FIR0Ush4uORvG3UtHZWk= -go.opentelemetry.io/collector v0.64.2-0.20221115155901-1550938c18fd/go.mod h1:mmSrOcwe1vEYmChXUYuF6rzlrUL0rjEiPfa19Xxb41o= -go.opentelemetry.io/collector/pdata v0.64.2-0.20221115155901-1550938c18fd h1:GdVAbRiae5VDZe3Mn3FqzMxO/aI5UbJ4+dcviqClHy8= -go.opentelemetry.io/collector/pdata v0.64.2-0.20221115155901-1550938c18fd/go.mod h1:0vynPfW2ZN7DltpcCFgCmTtWMQkCjp2a3TNt82YTCLQ= +go.opentelemetry.io/collector v0.64.2-0.20221117234814-4565692c50a7 h1:o/vMr2iyXzaeTb/KAldhMxAvRIfFPwtKfL5cKVKsSlU= +go.opentelemetry.io/collector v0.64.2-0.20221117234814-4565692c50a7/go.mod h1:PO8hayFFYvXDqELbXRVxwawR2HTdjN6mY4Qa3Se9xI8= +go.opentelemetry.io/collector/component v0.0.0-20221117234814-4565692c50a7 h1:q9m1bGHhQFUakQX79lZpLmFSY9VLULNSs2jUG8MdJLA= +go.opentelemetry.io/collector/component v0.0.0-20221117234814-4565692c50a7/go.mod h1:Z7H1Oj826e4dtVxXmT6SiUr6S0EIevUJmkVpfQV+UOk= +go.opentelemetry.io/collector/consumer v0.0.0-20221117234814-4565692c50a7 h1:FTy1JD9EJ7gq9SzlZoi2NkGcZ88+SwdiJav5uRcDEEY= +go.opentelemetry.io/collector/consumer v0.0.0-20221117234814-4565692c50a7/go.mod h1:86Elcw/LLrh90DprArogHMkBX3+UMu3tIgcVWF3mr6o= +go.opentelemetry.io/collector/featuregate v0.0.0-20221117214536-6a117bfc3737 h1:7sXg6M9Fw6rFVlX+iaWOMz6DFXEiroUdQer5kWGixwM= +go.opentelemetry.io/collector/featuregate v0.0.0-20221117214536-6a117bfc3737/go.mod h1:tewuFKJYalWBU0bmNKg++MC1ipINXUr6szYzOw2p1GI= +go.opentelemetry.io/collector/pdata v0.64.2-0.20221117234814-4565692c50a7 h1:IOFqfOu7fFxTgC7pvc2U7dk1/uFjwVQPK+CALiUvacI= +go.opentelemetry.io/collector/pdata v0.64.2-0.20221117234814-4565692c50a7/go.mod h1:0vynPfW2ZN7DltpcCFgCmTtWMQkCjp2a3TNt82YTCLQ= go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.36.4 h1:aUEBEdCa6iamGzg6fuYxDA8ThxvOG240mAvWDU+XLio= go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.36.4/go.mod h1:l2MdsbKTocpPS5nQZscqTR9jd8u96VYZdcpF8Sye7mA= go.opentelemetry.io/otel v1.11.1 h1:4WLLAmcfkmDk2ukNXJyq3/kiz/3UzCaYq6PskJsaou4= diff --git a/internal/aws/proxy/go.mod b/internal/aws/proxy/go.mod index ecdf521dff3d4..40f915c2866cb 100644 --- a/internal/aws/proxy/go.mod +++ b/internal/aws/proxy/go.mod @@ -6,7 +6,7 @@ require ( github.com/aws/aws-sdk-go v1.44.133 github.com/open-telemetry/opentelemetry-collector-contrib/internal/common v0.64.0 github.com/stretchr/testify v1.8.1 - go.opentelemetry.io/collector v0.64.2-0.20221115155901-1550938c18fd + go.opentelemetry.io/collector v0.64.2-0.20221117234814-4565692c50a7 go.uber.org/zap v1.23.0 ) @@ -15,6 +15,7 @@ require ( github.com/jmespath/go-jmespath v0.4.0 // indirect github.com/kr/pretty v0.3.0 // indirect github.com/pmezard/go-difflib v1.0.0 // indirect + go.opentelemetry.io/collector/featuregate v0.0.0-20221117214536-6a117bfc3737 // indirect go.uber.org/atomic v1.10.0 // indirect go.uber.org/multierr v1.8.0 // indirect gopkg.in/yaml.v3 v3.0.1 // indirect diff --git a/internal/aws/proxy/go.sum b/internal/aws/proxy/go.sum index 15f7e617269a3..366a4979943d9 100644 --- a/internal/aws/proxy/go.sum +++ b/internal/aws/proxy/go.sum @@ -32,8 +32,10 @@ github.com/stretchr/testify v1.8.0/go.mod h1:yNjHg4UonilssWZ8iaSj1OCr/vHnekPRkoO github.com/stretchr/testify v1.8.1 h1:w7B6lhMri9wdJUVmEZPGGhZzrYTPvgJArz7wNPgYKsk= github.com/stretchr/testify v1.8.1/go.mod h1:w2LPCIKwWwSfY2zedu0+kehJoqGctiVI29o6fzry7u4= github.com/yuin/goldmark v1.4.13/go.mod h1:6yULJ656Px+3vBD8DxQVa3kxgyrAnzto9xy5taEt/CY= -go.opentelemetry.io/collector v0.64.2-0.20221115155901-1550938c18fd h1:O+6HhE4Ivg8Jksp3dIXIEC4FIR0Ush4uORvG3UtHZWk= -go.opentelemetry.io/collector v0.64.2-0.20221115155901-1550938c18fd/go.mod h1:mmSrOcwe1vEYmChXUYuF6rzlrUL0rjEiPfa19Xxb41o= +go.opentelemetry.io/collector v0.64.2-0.20221117234814-4565692c50a7 h1:o/vMr2iyXzaeTb/KAldhMxAvRIfFPwtKfL5cKVKsSlU= +go.opentelemetry.io/collector v0.64.2-0.20221117234814-4565692c50a7/go.mod h1:PO8hayFFYvXDqELbXRVxwawR2HTdjN6mY4Qa3Se9xI8= +go.opentelemetry.io/collector/featuregate v0.0.0-20221117214536-6a117bfc3737 h1:7sXg6M9Fw6rFVlX+iaWOMz6DFXEiroUdQer5kWGixwM= +go.opentelemetry.io/collector/featuregate v0.0.0-20221117214536-6a117bfc3737/go.mod h1:tewuFKJYalWBU0bmNKg++MC1ipINXUr6szYzOw2p1GI= go.uber.org/atomic v1.7.0/go.mod h1:fEN4uk6kAWBTFdckzkM89CLk9XfWZrxpCo0nPH17wJc= go.uber.org/atomic v1.10.0 h1:9qC72Qh0+3MqyJbAn8YU5xVq1frD8bn3JtD2oXtafVQ= go.uber.org/atomic v1.10.0/go.mod h1:LUxbIzbOniOlMKjJjyPfpl4v+PKK2cNJn91OQbhoJI0= diff --git a/internal/common/go.mod b/internal/common/go.mod index ed28736e45c7d..970f0587ea0e0 100644 --- a/internal/common/go.mod +++ b/internal/common/go.mod @@ -4,11 +4,12 @@ go 1.18 require ( github.com/stretchr/testify v1.8.1 - go.opentelemetry.io/collector v0.64.2-0.20221115155901-1550938c18fd + go.opentelemetry.io/collector/featuregate v0.0.0-20221117214536-6a117bfc3737 go.uber.org/zap v1.23.0 ) require ( + github.com/benbjohnson/clock v1.3.0 // indirect github.com/davecgh/go-spew v1.1.1 // indirect github.com/kr/text v0.2.0 // indirect github.com/pkg/errors v0.9.1 // indirect diff --git a/internal/common/go.sum b/internal/common/go.sum index e77815368b3f5..236e49fcbaa51 100644 --- a/internal/common/go.sum +++ b/internal/common/go.sum @@ -1,4 +1,5 @@ github.com/benbjohnson/clock v1.3.0 h1:ip6w0uFQkncKQ979AypyG0ER7mqUSBdKLOgAle/AT8A= +github.com/benbjohnson/clock v1.3.0/go.mod h1:J11/hYXuz8f4ySSvYwY0FKfm+ezbsZBKZxNJlLklBHA= github.com/creack/pty v1.1.9/go.mod h1:oKZEueFk5CKHvIhNR5MUki03XCEU+Q6VDXinZuGJ33E= github.com/davecgh/go-spew v1.1.0/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38= github.com/davecgh/go-spew v1.1.1 h1:vj9j/u1bqnvCEfJOwUhtlOARqs3+rkHYY13jYWTU97c= @@ -22,8 +23,8 @@ github.com/stretchr/testify v1.7.1/go.mod h1:6Fq8oRcR53rry900zMqJjRRixrwX3KX962/ github.com/stretchr/testify v1.8.0/go.mod h1:yNjHg4UonilssWZ8iaSj1OCr/vHnekPRkoO+kdMU+MU= github.com/stretchr/testify v1.8.1 h1:w7B6lhMri9wdJUVmEZPGGhZzrYTPvgJArz7wNPgYKsk= github.com/stretchr/testify v1.8.1/go.mod h1:w2LPCIKwWwSfY2zedu0+kehJoqGctiVI29o6fzry7u4= -go.opentelemetry.io/collector v0.64.2-0.20221115155901-1550938c18fd h1:O+6HhE4Ivg8Jksp3dIXIEC4FIR0Ush4uORvG3UtHZWk= -go.opentelemetry.io/collector v0.64.2-0.20221115155901-1550938c18fd/go.mod h1:mmSrOcwe1vEYmChXUYuF6rzlrUL0rjEiPfa19Xxb41o= +go.opentelemetry.io/collector/featuregate v0.0.0-20221117214536-6a117bfc3737 h1:7sXg6M9Fw6rFVlX+iaWOMz6DFXEiroUdQer5kWGixwM= +go.opentelemetry.io/collector/featuregate v0.0.0-20221117214536-6a117bfc3737/go.mod h1:tewuFKJYalWBU0bmNKg++MC1ipINXUr6szYzOw2p1GI= go.uber.org/atomic v1.7.0/go.mod h1:fEN4uk6kAWBTFdckzkM89CLk9XfWZrxpCo0nPH17wJc= go.uber.org/atomic v1.10.0 h1:9qC72Qh0+3MqyJbAn8YU5xVq1frD8bn3JtD2oXtafVQ= go.uber.org/atomic v1.10.0/go.mod h1:LUxbIzbOniOlMKjJjyPfpl4v+PKK2cNJn91OQbhoJI0= diff --git a/internal/coreinternal/go.mod b/internal/coreinternal/go.mod index b262bf433b166..0d531ad44d816 100644 --- a/internal/coreinternal/go.mod +++ b/internal/coreinternal/go.mod @@ -7,9 +7,9 @@ require ( github.com/golang/groupcache v0.0.0-20210331224755-41bb18bfe9da github.com/spf13/cast v1.5.0 github.com/stretchr/testify v1.8.1 - go.opentelemetry.io/collector v0.64.2-0.20221115155901-1550938c18fd - go.opentelemetry.io/collector/pdata v0.64.2-0.20221115155901-1550938c18fd - go.opentelemetry.io/collector/semconv v0.64.2-0.20221115155901-1550938c18fd + go.opentelemetry.io/collector v0.64.2-0.20221117234814-4565692c50a7 + go.opentelemetry.io/collector/pdata v0.64.2-0.20221117234814-4565692c50a7 + go.opentelemetry.io/collector/semconv v0.64.2-0.20221117234814-4565692c50a7 go.uber.org/zap v1.23.0 ) @@ -28,6 +28,7 @@ require ( github.com/modern-go/reflect2 v1.0.2 // indirect github.com/pelletier/go-toml v1.9.4 // indirect github.com/pmezard/go-difflib v1.0.0 // indirect + go.opentelemetry.io/collector/featuregate v0.0.0-20221117214536-6a117bfc3737 // indirect go.uber.org/atomic v1.10.0 // indirect go.uber.org/multierr v1.8.0 // indirect golang.org/x/net v0.0.0-20220624214902-1bab6f366d9e // indirect diff --git a/internal/coreinternal/go.sum b/internal/coreinternal/go.sum index 0a3c8efda3795..15e30bec65b2a 100644 --- a/internal/coreinternal/go.sum +++ b/internal/coreinternal/go.sum @@ -276,12 +276,15 @@ github.com/yuin/goldmark v1.3.5/go.mod h1:mwnBkeHKe2W/ZEtQ+71ViKU8L12m81fl3OWwC1 go.etcd.io/etcd/api/v3 v3.5.4/go.mod h1:5GB2vv4A4AOn3yk7MftYGHkUfGtDHnEraIjym4dYz5A= go.etcd.io/etcd/client/pkg/v3 v3.5.4/go.mod h1:IJHfcCEKxYu1Os13ZdwCwIUTUVGYTSAM3YSwc9/Ac1g= go.etcd.io/etcd/client/v3 v3.5.4/go.mod h1:ZaRkVgBZC+L+dLCjTcF1hRXpgZXQPOvnA/Ak/gq3kiY= -go.opentelemetry.io/collector v0.64.2-0.20221115155901-1550938c18fd h1:O+6HhE4Ivg8Jksp3dIXIEC4FIR0Ush4uORvG3UtHZWk= -go.opentelemetry.io/collector v0.64.2-0.20221115155901-1550938c18fd/go.mod h1:mmSrOcwe1vEYmChXUYuF6rzlrUL0rjEiPfa19Xxb41o= -go.opentelemetry.io/collector/pdata v0.64.2-0.20221115155901-1550938c18fd h1:GdVAbRiae5VDZe3Mn3FqzMxO/aI5UbJ4+dcviqClHy8= -go.opentelemetry.io/collector/pdata v0.64.2-0.20221115155901-1550938c18fd/go.mod h1:0vynPfW2ZN7DltpcCFgCmTtWMQkCjp2a3TNt82YTCLQ= -go.opentelemetry.io/collector/semconv v0.64.2-0.20221115155901-1550938c18fd h1:rMqcl2pwi8YtVrtOPK8tVh87W0bFBge4yqB9ypSsAJ4= -go.opentelemetry.io/collector/semconv v0.64.2-0.20221115155901-1550938c18fd/go.mod h1:5o9yhOa+ABt7g2E5JABDxGZ1PQPbtfxrKNbYn+LOTXU= +go.opentelemetry.io/collector v0.64.2-0.20221117234814-4565692c50a7 h1:o/vMr2iyXzaeTb/KAldhMxAvRIfFPwtKfL5cKVKsSlU= +go.opentelemetry.io/collector v0.64.2-0.20221117234814-4565692c50a7/go.mod h1:PO8hayFFYvXDqELbXRVxwawR2HTdjN6mY4Qa3Se9xI8= +go.opentelemetry.io/collector/consumer v0.0.0-20221116212002-2454cfb9ab7f h1:VZ/85eBeXwDqJ+6StwgCJDaMd58lZ/RjsteUFYhVLMk= +go.opentelemetry.io/collector/featuregate v0.0.0-20221117214536-6a117bfc3737 h1:7sXg6M9Fw6rFVlX+iaWOMz6DFXEiroUdQer5kWGixwM= +go.opentelemetry.io/collector/featuregate v0.0.0-20221117214536-6a117bfc3737/go.mod h1:tewuFKJYalWBU0bmNKg++MC1ipINXUr6szYzOw2p1GI= +go.opentelemetry.io/collector/pdata v0.64.2-0.20221117234814-4565692c50a7 h1:IOFqfOu7fFxTgC7pvc2U7dk1/uFjwVQPK+CALiUvacI= +go.opentelemetry.io/collector/pdata v0.64.2-0.20221117234814-4565692c50a7/go.mod h1:0vynPfW2ZN7DltpcCFgCmTtWMQkCjp2a3TNt82YTCLQ= +go.opentelemetry.io/collector/semconv v0.64.2-0.20221117234814-4565692c50a7 h1:cGXAVltDxXw9nj0Vr7vyZZTj0whdyO+GYs+xv0xHJ2A= +go.opentelemetry.io/collector/semconv v0.64.2-0.20221117234814-4565692c50a7/go.mod h1:5o9yhOa+ABt7g2E5JABDxGZ1PQPbtfxrKNbYn+LOTXU= go.uber.org/atomic v1.7.0/go.mod h1:fEN4uk6kAWBTFdckzkM89CLk9XfWZrxpCo0nPH17wJc= go.uber.org/atomic v1.10.0 h1:9qC72Qh0+3MqyJbAn8YU5xVq1frD8bn3JtD2oXtafVQ= go.uber.org/atomic v1.10.0/go.mod h1:LUxbIzbOniOlMKjJjyPfpl4v+PKK2cNJn91OQbhoJI0= diff --git a/internal/kubelet/go.mod b/internal/kubelet/go.mod index 97bcd27356499..eb61b384173e4 100644 --- a/internal/kubelet/go.mod +++ b/internal/kubelet/go.mod @@ -6,7 +6,7 @@ require ( github.com/open-telemetry/opentelemetry-collector-contrib/internal/common v0.64.0 github.com/open-telemetry/opentelemetry-collector-contrib/internal/k8sconfig v0.64.0 github.com/stretchr/testify v1.8.1 - go.opentelemetry.io/collector v0.64.2-0.20221115155901-1550938c18fd + go.opentelemetry.io/collector v0.64.2-0.20221117234814-4565692c50a7 go.uber.org/zap v1.23.0 ) diff --git a/internal/kubelet/go.sum b/internal/kubelet/go.sum index 70f350264d05b..90f7137d8ca86 100644 --- a/internal/kubelet/go.sum +++ b/internal/kubelet/go.sum @@ -252,8 +252,8 @@ go.opencensus.io v0.22.0/go.mod h1:+kGneAE2xo2IficOXnaByMWTGM9T73dGwxeWcUqIpI8= go.opencensus.io v0.22.2/go.mod h1:yxeiOL68Rb0Xd1ddK5vPZ/oVn4vY4Ynel7k9FzqtOIw= go.opencensus.io v0.22.3/go.mod h1:yxeiOL68Rb0Xd1ddK5vPZ/oVn4vY4Ynel7k9FzqtOIw= go.opencensus.io v0.22.4/go.mod h1:yxeiOL68Rb0Xd1ddK5vPZ/oVn4vY4Ynel7k9FzqtOIw= -go.opentelemetry.io/collector v0.64.2-0.20221115155901-1550938c18fd h1:O+6HhE4Ivg8Jksp3dIXIEC4FIR0Ush4uORvG3UtHZWk= -go.opentelemetry.io/collector v0.64.2-0.20221115155901-1550938c18fd/go.mod h1:mmSrOcwe1vEYmChXUYuF6rzlrUL0rjEiPfa19Xxb41o= +go.opentelemetry.io/collector v0.64.2-0.20221117234814-4565692c50a7 h1:o/vMr2iyXzaeTb/KAldhMxAvRIfFPwtKfL5cKVKsSlU= +go.opentelemetry.io/collector v0.64.2-0.20221117234814-4565692c50a7/go.mod h1:PO8hayFFYvXDqELbXRVxwawR2HTdjN6mY4Qa3Se9xI8= go.uber.org/atomic v1.7.0/go.mod h1:fEN4uk6kAWBTFdckzkM89CLk9XfWZrxpCo0nPH17wJc= go.uber.org/atomic v1.10.0 h1:9qC72Qh0+3MqyJbAn8YU5xVq1frD8bn3JtD2oXtafVQ= go.uber.org/atomic v1.10.0/go.mod h1:LUxbIzbOniOlMKjJjyPfpl4v+PKK2cNJn91OQbhoJI0= diff --git a/internal/scrapertest/README.md b/internal/scrapertest/README.md index b770e6492f195..000e7c03eb9a8 100644 --- a/internal/scrapertest/README.md +++ b/internal/scrapertest/README.md @@ -9,7 +9,7 @@ A scraper test typically looks something like this: ```go func TestScraper(t *testing.T) { cfg := createDefaultConfig().(*Config) - require.NoError(t, cfg.Validate()) + require.NoError(t, component.ValidateConfig(cfg)) scraper := newScraper(componenttest.NewNopReceiverCreateSettings(), cfg) @@ -43,7 +43,7 @@ When updating an existing test: ```go func TestScraper(t *testing.T) { cfg := createDefaultConfig().(*Config) - require.NoError(t, cfg.Validate()) + require.NoError(t, component.ValidateConfig(cfg)) scraper := newScraper(componenttest.NewNopReceiverCreateSettings(), cfg) diff --git a/internal/scrapertest/go.mod b/internal/scrapertest/go.mod index 4e1dd9e9f7961..3eb5e129d6d90 100644 --- a/internal/scrapertest/go.mod +++ b/internal/scrapertest/go.mod @@ -4,7 +4,7 @@ go 1.18 require ( github.com/stretchr/testify v1.8.1 - go.opentelemetry.io/collector/pdata v0.64.2-0.20221115155901-1550938c18fd + go.opentelemetry.io/collector/pdata v0.64.2-0.20221117234814-4565692c50a7 go.uber.org/multierr v1.8.0 ) diff --git a/internal/scrapertest/go.sum b/internal/scrapertest/go.sum index 93ee7926a7c84..b3a7d7803aaaa 100644 --- a/internal/scrapertest/go.sum +++ b/internal/scrapertest/go.sum @@ -61,8 +61,8 @@ github.com/stretchr/testify v1.8.1 h1:w7B6lhMri9wdJUVmEZPGGhZzrYTPvgJArz7wNPgYKs github.com/stretchr/testify v1.8.1/go.mod h1:w2LPCIKwWwSfY2zedu0+kehJoqGctiVI29o6fzry7u4= github.com/yuin/goldmark v1.1.27/go.mod h1:3hX8gzYuyVAZsxl0MRgGTJEmQBFcNTphYh9decYSb74= github.com/yuin/goldmark v1.2.1/go.mod h1:3hX8gzYuyVAZsxl0MRgGTJEmQBFcNTphYh9decYSb74= -go.opentelemetry.io/collector/pdata v0.64.2-0.20221115155901-1550938c18fd h1:GdVAbRiae5VDZe3Mn3FqzMxO/aI5UbJ4+dcviqClHy8= -go.opentelemetry.io/collector/pdata v0.64.2-0.20221115155901-1550938c18fd/go.mod h1:0vynPfW2ZN7DltpcCFgCmTtWMQkCjp2a3TNt82YTCLQ= +go.opentelemetry.io/collector/pdata v0.64.2-0.20221117234814-4565692c50a7 h1:IOFqfOu7fFxTgC7pvc2U7dk1/uFjwVQPK+CALiUvacI= +go.opentelemetry.io/collector/pdata v0.64.2-0.20221117234814-4565692c50a7/go.mod h1:0vynPfW2ZN7DltpcCFgCmTtWMQkCjp2a3TNt82YTCLQ= go.uber.org/atomic v1.7.0/go.mod h1:fEN4uk6kAWBTFdckzkM89CLk9XfWZrxpCo0nPH17wJc= go.uber.org/atomic v1.10.0 h1:9qC72Qh0+3MqyJbAn8YU5xVq1frD8bn3JtD2oXtafVQ= go.uber.org/atomic v1.10.0/go.mod h1:LUxbIzbOniOlMKjJjyPfpl4v+PKK2cNJn91OQbhoJI0= diff --git a/internal/sharedcomponent/go.mod b/internal/sharedcomponent/go.mod index 87aea1afb70a8..ade9163a70c92 100644 --- a/internal/sharedcomponent/go.mod +++ b/internal/sharedcomponent/go.mod @@ -4,7 +4,7 @@ go 1.18 require ( github.com/stretchr/testify v1.8.1 - go.opentelemetry.io/collector v0.64.2-0.20221115155901-1550938c18fd + go.opentelemetry.io/collector/component v0.0.0-20221117234814-4565692c50a7 ) require ( @@ -22,7 +22,10 @@ require ( github.com/modern-go/reflect2 v1.0.2 // indirect github.com/pelletier/go-toml v1.9.4 // indirect github.com/pmezard/go-difflib v1.0.0 // indirect - go.opentelemetry.io/collector/pdata v0.64.2-0.20221115155901-1550938c18fd // indirect + go.opentelemetry.io/collector v0.64.2-0.20221117234814-4565692c50a7 // indirect + go.opentelemetry.io/collector/consumer v0.0.0-20221117234814-4565692c50a7 // indirect + go.opentelemetry.io/collector/featuregate v0.0.0-20221117214536-6a117bfc3737 // indirect + go.opentelemetry.io/collector/pdata v0.64.2-0.20221117234814-4565692c50a7 // indirect go.opentelemetry.io/otel v1.11.1 // indirect go.opentelemetry.io/otel/metric v0.33.0 // indirect go.opentelemetry.io/otel/trace v1.11.1 // indirect diff --git a/internal/sharedcomponent/go.sum b/internal/sharedcomponent/go.sum index 83490edf8e6d4..3edb85baacc52 100644 --- a/internal/sharedcomponent/go.sum +++ b/internal/sharedcomponent/go.sum @@ -265,10 +265,16 @@ github.com/yuin/goldmark v1.3.5/go.mod h1:mwnBkeHKe2W/ZEtQ+71ViKU8L12m81fl3OWwC1 go.etcd.io/etcd/api/v3 v3.5.4/go.mod h1:5GB2vv4A4AOn3yk7MftYGHkUfGtDHnEraIjym4dYz5A= go.etcd.io/etcd/client/pkg/v3 v3.5.4/go.mod h1:IJHfcCEKxYu1Os13ZdwCwIUTUVGYTSAM3YSwc9/Ac1g= go.etcd.io/etcd/client/v3 v3.5.4/go.mod h1:ZaRkVgBZC+L+dLCjTcF1hRXpgZXQPOvnA/Ak/gq3kiY= -go.opentelemetry.io/collector v0.64.2-0.20221115155901-1550938c18fd h1:O+6HhE4Ivg8Jksp3dIXIEC4FIR0Ush4uORvG3UtHZWk= -go.opentelemetry.io/collector v0.64.2-0.20221115155901-1550938c18fd/go.mod h1:mmSrOcwe1vEYmChXUYuF6rzlrUL0rjEiPfa19Xxb41o= -go.opentelemetry.io/collector/pdata v0.64.2-0.20221115155901-1550938c18fd h1:GdVAbRiae5VDZe3Mn3FqzMxO/aI5UbJ4+dcviqClHy8= -go.opentelemetry.io/collector/pdata v0.64.2-0.20221115155901-1550938c18fd/go.mod h1:0vynPfW2ZN7DltpcCFgCmTtWMQkCjp2a3TNt82YTCLQ= +go.opentelemetry.io/collector v0.64.2-0.20221117234814-4565692c50a7 h1:o/vMr2iyXzaeTb/KAldhMxAvRIfFPwtKfL5cKVKsSlU= +go.opentelemetry.io/collector v0.64.2-0.20221117234814-4565692c50a7/go.mod h1:PO8hayFFYvXDqELbXRVxwawR2HTdjN6mY4Qa3Se9xI8= +go.opentelemetry.io/collector/component v0.0.0-20221117234814-4565692c50a7 h1:q9m1bGHhQFUakQX79lZpLmFSY9VLULNSs2jUG8MdJLA= +go.opentelemetry.io/collector/component v0.0.0-20221117234814-4565692c50a7/go.mod h1:Z7H1Oj826e4dtVxXmT6SiUr6S0EIevUJmkVpfQV+UOk= +go.opentelemetry.io/collector/consumer v0.0.0-20221117234814-4565692c50a7 h1:FTy1JD9EJ7gq9SzlZoi2NkGcZ88+SwdiJav5uRcDEEY= +go.opentelemetry.io/collector/consumer v0.0.0-20221117234814-4565692c50a7/go.mod h1:86Elcw/LLrh90DprArogHMkBX3+UMu3tIgcVWF3mr6o= +go.opentelemetry.io/collector/featuregate v0.0.0-20221117214536-6a117bfc3737 h1:7sXg6M9Fw6rFVlX+iaWOMz6DFXEiroUdQer5kWGixwM= +go.opentelemetry.io/collector/featuregate v0.0.0-20221117214536-6a117bfc3737/go.mod h1:tewuFKJYalWBU0bmNKg++MC1ipINXUr6szYzOw2p1GI= +go.opentelemetry.io/collector/pdata v0.64.2-0.20221117234814-4565692c50a7 h1:IOFqfOu7fFxTgC7pvc2U7dk1/uFjwVQPK+CALiUvacI= +go.opentelemetry.io/collector/pdata v0.64.2-0.20221117234814-4565692c50a7/go.mod h1:0vynPfW2ZN7DltpcCFgCmTtWMQkCjp2a3TNt82YTCLQ= go.opentelemetry.io/otel v1.11.1 h1:4WLLAmcfkmDk2ukNXJyq3/kiz/3UzCaYq6PskJsaou4= go.opentelemetry.io/otel v1.11.1/go.mod h1:1nNhXBbWSD0nsL38H6btgnFN2k4i0sNLHNNMZMSbUGE= go.opentelemetry.io/otel/metric v0.33.0 h1:xQAyl7uGEYvrLAiV/09iTJlp1pZnQ9Wl793qbVvED1E= diff --git a/internal/splunk/go.mod b/internal/splunk/go.mod index 3cd91df9edb03..e02208964a959 100644 --- a/internal/splunk/go.mod +++ b/internal/splunk/go.mod @@ -4,9 +4,10 @@ go 1.18 require ( github.com/stretchr/testify v1.8.1 - go.opentelemetry.io/collector v0.64.2-0.20221115155901-1550938c18fd - go.opentelemetry.io/collector/pdata v0.64.2-0.20221115155901-1550938c18fd - go.opentelemetry.io/collector/semconv v0.64.2-0.20221115155901-1550938c18fd + go.opentelemetry.io/collector v0.64.2-0.20221117234814-4565692c50a7 + go.opentelemetry.io/collector/consumer v0.0.0-20221117234814-4565692c50a7 + go.opentelemetry.io/collector/pdata v0.64.2-0.20221117234814-4565692c50a7 + go.opentelemetry.io/collector/semconv v0.64.2-0.20221117234814-4565692c50a7 go.uber.org/multierr v1.8.0 ) @@ -27,6 +28,8 @@ require ( github.com/pelletier/go-toml v1.9.4 // indirect github.com/pmezard/go-difflib v1.0.0 // indirect go.opencensus.io v0.24.0 // indirect + go.opentelemetry.io/collector/component v0.0.0-20221117234814-4565692c50a7 // indirect + go.opentelemetry.io/collector/featuregate v0.0.0-20221117214536-6a117bfc3737 // indirect go.opentelemetry.io/otel v1.11.1 // indirect go.opentelemetry.io/otel/metric v0.33.0 // indirect go.opentelemetry.io/otel/trace v1.11.1 // indirect diff --git a/internal/splunk/go.sum b/internal/splunk/go.sum index a140edfaa42e8..b41f310f861dc 100644 --- a/internal/splunk/go.sum +++ b/internal/splunk/go.sum @@ -286,12 +286,18 @@ go.etcd.io/etcd/client/pkg/v3 v3.5.4/go.mod h1:IJHfcCEKxYu1Os13ZdwCwIUTUVGYTSAM3 go.etcd.io/etcd/client/v3 v3.5.4/go.mod h1:ZaRkVgBZC+L+dLCjTcF1hRXpgZXQPOvnA/Ak/gq3kiY= go.opencensus.io v0.24.0 h1:y73uSU6J157QMP2kn2r30vwW1A2W2WFwSCGnAVxeaD0= go.opencensus.io v0.24.0/go.mod h1:vNK8G9p7aAivkbmorf4v+7Hgx+Zs0yY+0fOtgBfjQKo= -go.opentelemetry.io/collector v0.64.2-0.20221115155901-1550938c18fd h1:O+6HhE4Ivg8Jksp3dIXIEC4FIR0Ush4uORvG3UtHZWk= -go.opentelemetry.io/collector v0.64.2-0.20221115155901-1550938c18fd/go.mod h1:mmSrOcwe1vEYmChXUYuF6rzlrUL0rjEiPfa19Xxb41o= -go.opentelemetry.io/collector/pdata v0.64.2-0.20221115155901-1550938c18fd h1:GdVAbRiae5VDZe3Mn3FqzMxO/aI5UbJ4+dcviqClHy8= -go.opentelemetry.io/collector/pdata v0.64.2-0.20221115155901-1550938c18fd/go.mod h1:0vynPfW2ZN7DltpcCFgCmTtWMQkCjp2a3TNt82YTCLQ= -go.opentelemetry.io/collector/semconv v0.64.2-0.20221115155901-1550938c18fd h1:rMqcl2pwi8YtVrtOPK8tVh87W0bFBge4yqB9ypSsAJ4= -go.opentelemetry.io/collector/semconv v0.64.2-0.20221115155901-1550938c18fd/go.mod h1:5o9yhOa+ABt7g2E5JABDxGZ1PQPbtfxrKNbYn+LOTXU= +go.opentelemetry.io/collector v0.64.2-0.20221117234814-4565692c50a7 h1:o/vMr2iyXzaeTb/KAldhMxAvRIfFPwtKfL5cKVKsSlU= +go.opentelemetry.io/collector v0.64.2-0.20221117234814-4565692c50a7/go.mod h1:PO8hayFFYvXDqELbXRVxwawR2HTdjN6mY4Qa3Se9xI8= +go.opentelemetry.io/collector/component v0.0.0-20221117234814-4565692c50a7 h1:q9m1bGHhQFUakQX79lZpLmFSY9VLULNSs2jUG8MdJLA= +go.opentelemetry.io/collector/component v0.0.0-20221117234814-4565692c50a7/go.mod h1:Z7H1Oj826e4dtVxXmT6SiUr6S0EIevUJmkVpfQV+UOk= +go.opentelemetry.io/collector/consumer v0.0.0-20221117234814-4565692c50a7 h1:FTy1JD9EJ7gq9SzlZoi2NkGcZ88+SwdiJav5uRcDEEY= +go.opentelemetry.io/collector/consumer v0.0.0-20221117234814-4565692c50a7/go.mod h1:86Elcw/LLrh90DprArogHMkBX3+UMu3tIgcVWF3mr6o= +go.opentelemetry.io/collector/featuregate v0.0.0-20221117214536-6a117bfc3737 h1:7sXg6M9Fw6rFVlX+iaWOMz6DFXEiroUdQer5kWGixwM= +go.opentelemetry.io/collector/featuregate v0.0.0-20221117214536-6a117bfc3737/go.mod h1:tewuFKJYalWBU0bmNKg++MC1ipINXUr6szYzOw2p1GI= +go.opentelemetry.io/collector/pdata v0.64.2-0.20221117234814-4565692c50a7 h1:IOFqfOu7fFxTgC7pvc2U7dk1/uFjwVQPK+CALiUvacI= +go.opentelemetry.io/collector/pdata v0.64.2-0.20221117234814-4565692c50a7/go.mod h1:0vynPfW2ZN7DltpcCFgCmTtWMQkCjp2a3TNt82YTCLQ= +go.opentelemetry.io/collector/semconv v0.64.2-0.20221117234814-4565692c50a7 h1:cGXAVltDxXw9nj0Vr7vyZZTj0whdyO+GYs+xv0xHJ2A= +go.opentelemetry.io/collector/semconv v0.64.2-0.20221117234814-4565692c50a7/go.mod h1:5o9yhOa+ABt7g2E5JABDxGZ1PQPbtfxrKNbYn+LOTXU= go.opentelemetry.io/otel v1.11.1 h1:4WLLAmcfkmDk2ukNXJyq3/kiz/3UzCaYq6PskJsaou4= go.opentelemetry.io/otel v1.11.1/go.mod h1:1nNhXBbWSD0nsL38H6btgnFN2k4i0sNLHNNMZMSbUGE= go.opentelemetry.io/otel/exporters/prometheus v0.33.0 h1:xXhPj7SLKWU5/Zd4Hxmd+X1C4jdmvc0Xy+kvjFx2z60= diff --git a/pkg/batchperresourceattr/go.mod b/pkg/batchperresourceattr/go.mod index bcb5da4b4e250..bbb3110763976 100644 --- a/pkg/batchperresourceattr/go.mod +++ b/pkg/batchperresourceattr/go.mod @@ -4,8 +4,8 @@ go 1.18 require ( github.com/stretchr/testify v1.8.1 - go.opentelemetry.io/collector v0.64.2-0.20221115155901-1550938c18fd - go.opentelemetry.io/collector/pdata v0.64.2-0.20221115155901-1550938c18fd + go.opentelemetry.io/collector/consumer v0.0.0-20221117234814-4565692c50a7 + go.opentelemetry.io/collector/pdata v0.64.2-0.20221117234814-4565692c50a7 go.uber.org/multierr v1.8.0 ) @@ -18,6 +18,7 @@ require ( github.com/modern-go/concurrent v0.0.0-20180306012644-bacd9c7ef1dd // indirect github.com/modern-go/reflect2 v1.0.2 // indirect github.com/pmezard/go-difflib v1.0.0 // indirect + go.opentelemetry.io/collector v0.64.2-0.20221117234814-4565692c50a7 // indirect go.uber.org/atomic v1.10.0 // indirect golang.org/x/net v0.0.0-20220225172249-27dd8689420f // indirect golang.org/x/sys v0.2.0 // indirect diff --git a/pkg/batchperresourceattr/go.sum b/pkg/batchperresourceattr/go.sum index 6cc68f5b95b61..0964482f3f375 100644 --- a/pkg/batchperresourceattr/go.sum +++ b/pkg/batchperresourceattr/go.sum @@ -84,10 +84,12 @@ github.com/stretchr/testify v1.8.1 h1:w7B6lhMri9wdJUVmEZPGGhZzrYTPvgJArz7wNPgYKs github.com/stretchr/testify v1.8.1/go.mod h1:w2LPCIKwWwSfY2zedu0+kehJoqGctiVI29o6fzry7u4= github.com/yuin/goldmark v1.1.27/go.mod h1:3hX8gzYuyVAZsxl0MRgGTJEmQBFcNTphYh9decYSb74= github.com/yuin/goldmark v1.2.1/go.mod h1:3hX8gzYuyVAZsxl0MRgGTJEmQBFcNTphYh9decYSb74= -go.opentelemetry.io/collector v0.64.2-0.20221115155901-1550938c18fd h1:O+6HhE4Ivg8Jksp3dIXIEC4FIR0Ush4uORvG3UtHZWk= -go.opentelemetry.io/collector v0.64.2-0.20221115155901-1550938c18fd/go.mod h1:mmSrOcwe1vEYmChXUYuF6rzlrUL0rjEiPfa19Xxb41o= -go.opentelemetry.io/collector/pdata v0.64.2-0.20221115155901-1550938c18fd h1:GdVAbRiae5VDZe3Mn3FqzMxO/aI5UbJ4+dcviqClHy8= -go.opentelemetry.io/collector/pdata v0.64.2-0.20221115155901-1550938c18fd/go.mod h1:0vynPfW2ZN7DltpcCFgCmTtWMQkCjp2a3TNt82YTCLQ= +go.opentelemetry.io/collector v0.64.2-0.20221117234814-4565692c50a7 h1:o/vMr2iyXzaeTb/KAldhMxAvRIfFPwtKfL5cKVKsSlU= +go.opentelemetry.io/collector v0.64.2-0.20221117234814-4565692c50a7/go.mod h1:PO8hayFFYvXDqELbXRVxwawR2HTdjN6mY4Qa3Se9xI8= +go.opentelemetry.io/collector/consumer v0.0.0-20221117234814-4565692c50a7 h1:FTy1JD9EJ7gq9SzlZoi2NkGcZ88+SwdiJav5uRcDEEY= +go.opentelemetry.io/collector/consumer v0.0.0-20221117234814-4565692c50a7/go.mod h1:86Elcw/LLrh90DprArogHMkBX3+UMu3tIgcVWF3mr6o= +go.opentelemetry.io/collector/pdata v0.64.2-0.20221117234814-4565692c50a7 h1:IOFqfOu7fFxTgC7pvc2U7dk1/uFjwVQPK+CALiUvacI= +go.opentelemetry.io/collector/pdata v0.64.2-0.20221117234814-4565692c50a7/go.mod h1:0vynPfW2ZN7DltpcCFgCmTtWMQkCjp2a3TNt82YTCLQ= go.opentelemetry.io/proto/otlp v0.7.0/go.mod h1:PqfVotwruBrMGOCsRd/89rSnXhoiJIqeYNgFYFoEGnI= go.uber.org/atomic v1.7.0/go.mod h1:fEN4uk6kAWBTFdckzkM89CLk9XfWZrxpCo0nPH17wJc= go.uber.org/atomic v1.10.0 h1:9qC72Qh0+3MqyJbAn8YU5xVq1frD8bn3JtD2oXtafVQ= diff --git a/pkg/batchpersignal/go.mod b/pkg/batchpersignal/go.mod index 7bcb9ca98c676..179715f05b5ca 100644 --- a/pkg/batchpersignal/go.mod +++ b/pkg/batchpersignal/go.mod @@ -4,7 +4,7 @@ go 1.18 require ( github.com/stretchr/testify v1.8.1 - go.opentelemetry.io/collector/pdata v0.64.2-0.20221115155901-1550938c18fd + go.opentelemetry.io/collector/pdata v0.64.2-0.20221117234814-4565692c50a7 ) require ( diff --git a/pkg/batchpersignal/go.sum b/pkg/batchpersignal/go.sum index d2d668e7a3ed4..41adfff16b3a9 100644 --- a/pkg/batchpersignal/go.sum +++ b/pkg/batchpersignal/go.sum @@ -50,8 +50,8 @@ github.com/stretchr/testify v1.8.1 h1:w7B6lhMri9wdJUVmEZPGGhZzrYTPvgJArz7wNPgYKs github.com/stretchr/testify v1.8.1/go.mod h1:w2LPCIKwWwSfY2zedu0+kehJoqGctiVI29o6fzry7u4= github.com/yuin/goldmark v1.1.27/go.mod h1:3hX8gzYuyVAZsxl0MRgGTJEmQBFcNTphYh9decYSb74= github.com/yuin/goldmark v1.2.1/go.mod h1:3hX8gzYuyVAZsxl0MRgGTJEmQBFcNTphYh9decYSb74= -go.opentelemetry.io/collector/pdata v0.64.2-0.20221115155901-1550938c18fd h1:GdVAbRiae5VDZe3Mn3FqzMxO/aI5UbJ4+dcviqClHy8= -go.opentelemetry.io/collector/pdata v0.64.2-0.20221115155901-1550938c18fd/go.mod h1:0vynPfW2ZN7DltpcCFgCmTtWMQkCjp2a3TNt82YTCLQ= +go.opentelemetry.io/collector/pdata v0.64.2-0.20221117234814-4565692c50a7 h1:IOFqfOu7fFxTgC7pvc2U7dk1/uFjwVQPK+CALiUvacI= +go.opentelemetry.io/collector/pdata v0.64.2-0.20221117234814-4565692c50a7/go.mod h1:0vynPfW2ZN7DltpcCFgCmTtWMQkCjp2a3TNt82YTCLQ= golang.org/x/crypto v0.0.0-20190308221718-c2843e01d9a2/go.mod h1:djNgcEr1/C05ACkg1iLfiJU5Ep61QUkGW8qpdssI0+w= golang.org/x/crypto v0.0.0-20191011191535-87dc89f01550/go.mod h1:yigFU9vqHzYiE8UmvKecakEJjdnWj3jj499lnFckfCI= golang.org/x/crypto v0.0.0-20200622213623-75b288015ac9/go.mod h1:LzIPMQfyMNhhGPhUkYOs5KpL4U8rLKemX1yGLhDgUto= diff --git a/pkg/ottl/go.mod b/pkg/ottl/go.mod index 4aa6458825854..7ed1147deaefb 100644 --- a/pkg/ottl/go.mod +++ b/pkg/ottl/go.mod @@ -8,8 +8,8 @@ require ( github.com/iancoleman/strcase v0.2.0 github.com/open-telemetry/opentelemetry-collector-contrib/internal/coreinternal v0.0.0-00010101000000-000000000000 github.com/stretchr/testify v1.8.1 - go.opentelemetry.io/collector v0.64.2-0.20221115155901-1550938c18fd - go.opentelemetry.io/collector/pdata v0.64.2-0.20221115155901-1550938c18fd + go.opentelemetry.io/collector/component v0.0.0-20221117234814-4565692c50a7 + go.opentelemetry.io/collector/pdata v0.64.2-0.20221117234814-4565692c50a7 go.opentelemetry.io/otel/trace v1.11.1 go.uber.org/multierr v1.8.0 go.uber.org/zap v1.23.0 @@ -29,6 +29,9 @@ require ( github.com/modern-go/concurrent v0.0.0-20180306012644-bacd9c7ef1dd // indirect github.com/modern-go/reflect2 v1.0.2 // indirect github.com/pmezard/go-difflib v1.0.0 // indirect + go.opentelemetry.io/collector v0.64.2-0.20221117234814-4565692c50a7 // indirect + go.opentelemetry.io/collector/consumer v0.0.0-20221117234814-4565692c50a7 // indirect + go.opentelemetry.io/collector/featuregate v0.0.0-20221117214536-6a117bfc3737 // indirect go.opentelemetry.io/otel v1.11.1 // indirect go.opentelemetry.io/otel/metric v0.33.0 // indirect go.uber.org/atomic v1.10.0 // indirect diff --git a/pkg/ottl/go.sum b/pkg/ottl/go.sum index fb87c0ee6e786..0e5a1230a82ab 100644 --- a/pkg/ottl/go.sum +++ b/pkg/ottl/go.sum @@ -265,10 +265,16 @@ github.com/yuin/goldmark v1.3.5/go.mod h1:mwnBkeHKe2W/ZEtQ+71ViKU8L12m81fl3OWwC1 go.etcd.io/etcd/api/v3 v3.5.4/go.mod h1:5GB2vv4A4AOn3yk7MftYGHkUfGtDHnEraIjym4dYz5A= go.etcd.io/etcd/client/pkg/v3 v3.5.4/go.mod h1:IJHfcCEKxYu1Os13ZdwCwIUTUVGYTSAM3YSwc9/Ac1g= go.etcd.io/etcd/client/v3 v3.5.4/go.mod h1:ZaRkVgBZC+L+dLCjTcF1hRXpgZXQPOvnA/Ak/gq3kiY= -go.opentelemetry.io/collector v0.64.2-0.20221115155901-1550938c18fd h1:O+6HhE4Ivg8Jksp3dIXIEC4FIR0Ush4uORvG3UtHZWk= -go.opentelemetry.io/collector v0.64.2-0.20221115155901-1550938c18fd/go.mod h1:mmSrOcwe1vEYmChXUYuF6rzlrUL0rjEiPfa19Xxb41o= -go.opentelemetry.io/collector/pdata v0.64.2-0.20221115155901-1550938c18fd h1:GdVAbRiae5VDZe3Mn3FqzMxO/aI5UbJ4+dcviqClHy8= -go.opentelemetry.io/collector/pdata v0.64.2-0.20221115155901-1550938c18fd/go.mod h1:0vynPfW2ZN7DltpcCFgCmTtWMQkCjp2a3TNt82YTCLQ= +go.opentelemetry.io/collector v0.64.2-0.20221117234814-4565692c50a7 h1:o/vMr2iyXzaeTb/KAldhMxAvRIfFPwtKfL5cKVKsSlU= +go.opentelemetry.io/collector v0.64.2-0.20221117234814-4565692c50a7/go.mod h1:PO8hayFFYvXDqELbXRVxwawR2HTdjN6mY4Qa3Se9xI8= +go.opentelemetry.io/collector/component v0.0.0-20221117234814-4565692c50a7 h1:q9m1bGHhQFUakQX79lZpLmFSY9VLULNSs2jUG8MdJLA= +go.opentelemetry.io/collector/component v0.0.0-20221117234814-4565692c50a7/go.mod h1:Z7H1Oj826e4dtVxXmT6SiUr6S0EIevUJmkVpfQV+UOk= +go.opentelemetry.io/collector/consumer v0.0.0-20221117234814-4565692c50a7 h1:FTy1JD9EJ7gq9SzlZoi2NkGcZ88+SwdiJav5uRcDEEY= +go.opentelemetry.io/collector/consumer v0.0.0-20221117234814-4565692c50a7/go.mod h1:86Elcw/LLrh90DprArogHMkBX3+UMu3tIgcVWF3mr6o= +go.opentelemetry.io/collector/featuregate v0.0.0-20221117214536-6a117bfc3737 h1:7sXg6M9Fw6rFVlX+iaWOMz6DFXEiroUdQer5kWGixwM= +go.opentelemetry.io/collector/featuregate v0.0.0-20221117214536-6a117bfc3737/go.mod h1:tewuFKJYalWBU0bmNKg++MC1ipINXUr6szYzOw2p1GI= +go.opentelemetry.io/collector/pdata v0.64.2-0.20221117234814-4565692c50a7 h1:IOFqfOu7fFxTgC7pvc2U7dk1/uFjwVQPK+CALiUvacI= +go.opentelemetry.io/collector/pdata v0.64.2-0.20221117234814-4565692c50a7/go.mod h1:0vynPfW2ZN7DltpcCFgCmTtWMQkCjp2a3TNt82YTCLQ= go.opentelemetry.io/otel v1.11.1 h1:4WLLAmcfkmDk2ukNXJyq3/kiz/3UzCaYq6PskJsaou4= go.opentelemetry.io/otel v1.11.1/go.mod h1:1nNhXBbWSD0nsL38H6btgnFN2k4i0sNLHNNMZMSbUGE= go.opentelemetry.io/otel/metric v0.33.0 h1:xQAyl7uGEYvrLAiV/09iTJlp1pZnQ9Wl793qbVvED1E= diff --git a/pkg/resourcetotelemetry/go.mod b/pkg/resourcetotelemetry/go.mod index 9b45c257cc03f..a2bd96259561a 100644 --- a/pkg/resourcetotelemetry/go.mod +++ b/pkg/resourcetotelemetry/go.mod @@ -5,8 +5,9 @@ go 1.18 require ( github.com/open-telemetry/opentelemetry-collector-contrib/internal/coreinternal v0.64.0 github.com/stretchr/testify v1.8.1 - go.opentelemetry.io/collector v0.64.2-0.20221115155901-1550938c18fd - go.opentelemetry.io/collector/pdata v0.64.2-0.20221115155901-1550938c18fd + go.opentelemetry.io/collector/component v0.0.0-20221117234814-4565692c50a7 + go.opentelemetry.io/collector/consumer v0.0.0-20221117234814-4565692c50a7 + go.opentelemetry.io/collector/pdata v0.64.2-0.20221117234814-4565692c50a7 ) require ( @@ -22,6 +23,8 @@ require ( github.com/modern-go/concurrent v0.0.0-20180306012644-bacd9c7ef1dd // indirect github.com/modern-go/reflect2 v1.0.2 // indirect github.com/pmezard/go-difflib v1.0.0 // indirect + go.opentelemetry.io/collector v0.64.2-0.20221117234814-4565692c50a7 // indirect + go.opentelemetry.io/collector/featuregate v0.0.0-20221117214536-6a117bfc3737 // indirect go.opentelemetry.io/otel v1.11.1 // indirect go.opentelemetry.io/otel/metric v0.33.0 // indirect go.opentelemetry.io/otel/trace v1.11.1 // indirect diff --git a/pkg/resourcetotelemetry/go.sum b/pkg/resourcetotelemetry/go.sum index 321324d4f0027..28df332964a3e 100644 --- a/pkg/resourcetotelemetry/go.sum +++ b/pkg/resourcetotelemetry/go.sum @@ -256,10 +256,16 @@ github.com/yuin/goldmark v1.3.5/go.mod h1:mwnBkeHKe2W/ZEtQ+71ViKU8L12m81fl3OWwC1 go.etcd.io/etcd/api/v3 v3.5.4/go.mod h1:5GB2vv4A4AOn3yk7MftYGHkUfGtDHnEraIjym4dYz5A= go.etcd.io/etcd/client/pkg/v3 v3.5.4/go.mod h1:IJHfcCEKxYu1Os13ZdwCwIUTUVGYTSAM3YSwc9/Ac1g= go.etcd.io/etcd/client/v3 v3.5.4/go.mod h1:ZaRkVgBZC+L+dLCjTcF1hRXpgZXQPOvnA/Ak/gq3kiY= -go.opentelemetry.io/collector v0.64.2-0.20221115155901-1550938c18fd h1:O+6HhE4Ivg8Jksp3dIXIEC4FIR0Ush4uORvG3UtHZWk= -go.opentelemetry.io/collector v0.64.2-0.20221115155901-1550938c18fd/go.mod h1:mmSrOcwe1vEYmChXUYuF6rzlrUL0rjEiPfa19Xxb41o= -go.opentelemetry.io/collector/pdata v0.64.2-0.20221115155901-1550938c18fd h1:GdVAbRiae5VDZe3Mn3FqzMxO/aI5UbJ4+dcviqClHy8= -go.opentelemetry.io/collector/pdata v0.64.2-0.20221115155901-1550938c18fd/go.mod h1:0vynPfW2ZN7DltpcCFgCmTtWMQkCjp2a3TNt82YTCLQ= +go.opentelemetry.io/collector v0.64.2-0.20221117234814-4565692c50a7 h1:o/vMr2iyXzaeTb/KAldhMxAvRIfFPwtKfL5cKVKsSlU= +go.opentelemetry.io/collector v0.64.2-0.20221117234814-4565692c50a7/go.mod h1:PO8hayFFYvXDqELbXRVxwawR2HTdjN6mY4Qa3Se9xI8= +go.opentelemetry.io/collector/component v0.0.0-20221117234814-4565692c50a7 h1:q9m1bGHhQFUakQX79lZpLmFSY9VLULNSs2jUG8MdJLA= +go.opentelemetry.io/collector/component v0.0.0-20221117234814-4565692c50a7/go.mod h1:Z7H1Oj826e4dtVxXmT6SiUr6S0EIevUJmkVpfQV+UOk= +go.opentelemetry.io/collector/consumer v0.0.0-20221117234814-4565692c50a7 h1:FTy1JD9EJ7gq9SzlZoi2NkGcZ88+SwdiJav5uRcDEEY= +go.opentelemetry.io/collector/consumer v0.0.0-20221117234814-4565692c50a7/go.mod h1:86Elcw/LLrh90DprArogHMkBX3+UMu3tIgcVWF3mr6o= +go.opentelemetry.io/collector/featuregate v0.0.0-20221117214536-6a117bfc3737 h1:7sXg6M9Fw6rFVlX+iaWOMz6DFXEiroUdQer5kWGixwM= +go.opentelemetry.io/collector/featuregate v0.0.0-20221117214536-6a117bfc3737/go.mod h1:tewuFKJYalWBU0bmNKg++MC1ipINXUr6szYzOw2p1GI= +go.opentelemetry.io/collector/pdata v0.64.2-0.20221117234814-4565692c50a7 h1:IOFqfOu7fFxTgC7pvc2U7dk1/uFjwVQPK+CALiUvacI= +go.opentelemetry.io/collector/pdata v0.64.2-0.20221117234814-4565692c50a7/go.mod h1:0vynPfW2ZN7DltpcCFgCmTtWMQkCjp2a3TNt82YTCLQ= go.opentelemetry.io/otel v1.11.1 h1:4WLLAmcfkmDk2ukNXJyq3/kiz/3UzCaYq6PskJsaou4= go.opentelemetry.io/otel v1.11.1/go.mod h1:1nNhXBbWSD0nsL38H6btgnFN2k4i0sNLHNNMZMSbUGE= go.opentelemetry.io/otel/metric v0.33.0 h1:xQAyl7uGEYvrLAiV/09iTJlp1pZnQ9Wl793qbVvED1E= diff --git a/pkg/stanza/adapter/factory_test.go b/pkg/stanza/adapter/factory_test.go index 42f87e27ebb82..e449f0b8a6ec9 100644 --- a/pkg/stanza/adapter/factory_test.go +++ b/pkg/stanza/adapter/factory_test.go @@ -30,7 +30,7 @@ import ( func TestCreateReceiver(t *testing.T) { t.Run("Success", func(t *testing.T) { - factory := NewFactory(TestReceiverType{}, component.StabilityLevelInDevelopment) + factory := NewFactory(TestReceiverType{}, component.StabilityLevelDevelopment) cfg := factory.CreateDefaultConfig().(*TestConfig) cfg.Operators = []operator.Config{ { @@ -43,7 +43,7 @@ func TestCreateReceiver(t *testing.T) { }) t.Run("DecodeOperatorConfigsFailureMissingFields", func(t *testing.T) { - factory := NewFactory(TestReceiverType{}, component.StabilityLevelInDevelopment) + factory := NewFactory(TestReceiverType{}, component.StabilityLevelDevelopment) badCfg := factory.CreateDefaultConfig().(*TestConfig) badCfg.Operators = []operator.Config{ { diff --git a/pkg/stanza/adapter/receiver_test.go b/pkg/stanza/adapter/receiver_test.go index 7c32a4f1346c3..7db4c0175eab0 100644 --- a/pkg/stanza/adapter/receiver_test.go +++ b/pkg/stanza/adapter/receiver_test.go @@ -38,7 +38,7 @@ import ( func TestStart(t *testing.T) { mockConsumer := &consumertest.LogsSink{} - factory := NewFactory(TestReceiverType{}, component.StabilityLevelInDevelopment) + factory := NewFactory(TestReceiverType{}, component.StabilityLevelDevelopment) logsReceiver, err := factory.CreateLogsReceiver( context.Background(), @@ -67,7 +67,7 @@ func TestStart(t *testing.T) { func TestHandleStartError(t *testing.T) { mockConsumer := &consumertest.LogsSink{} - factory := NewFactory(TestReceiverType{}, component.StabilityLevelInDevelopment) + factory := NewFactory(TestReceiverType{}, component.StabilityLevelDevelopment) cfg := factory.CreateDefaultConfig().(*TestConfig) cfg.Input = NewUnstartableConfig() @@ -81,7 +81,7 @@ func TestHandleStartError(t *testing.T) { func TestHandleConsumeError(t *testing.T) { mockConsumer := &mockLogsRejecter{} - factory := NewFactory(TestReceiverType{}, component.StabilityLevelInDevelopment) + factory := NewFactory(TestReceiverType{}, component.StabilityLevelDevelopment) logsReceiver, err := factory.CreateLogsReceiver(context.Background(), componenttest.NewNopReceiverCreateSettings(), factory.CreateDefaultConfig(), mockConsumer) require.NoError(t, err, "receiver should successfully build") diff --git a/pkg/stanza/adapter/storage_test.go b/pkg/stanza/adapter/storage_test.go index 519e65c9c484c..90b67e0a48bd5 100644 --- a/pkg/stanza/adapter/storage_test.go +++ b/pkg/stanza/adapter/storage_test.go @@ -119,7 +119,7 @@ func createReceiver(t *testing.T, storageID component.ID) *receiver { TelemetrySettings: componenttest.NewNopTelemetrySettings(), } - factory := NewFactory(TestReceiverType{}, component.StabilityLevelInDevelopment) + factory := NewFactory(TestReceiverType{}, component.StabilityLevelDevelopment) logsReceiver, err := factory.CreateLogsReceiver( context.Background(), diff --git a/pkg/stanza/go.mod b/pkg/stanza/go.mod index 6b8793c9bbe2b..d59b928871375 100644 --- a/pkg/stanza/go.mod +++ b/pkg/stanza/go.mod @@ -12,8 +12,10 @@ require ( github.com/observiq/nanojack v0.0.0-20201106172433-343928847ebc github.com/open-telemetry/opentelemetry-collector-contrib/extension/storage v0.64.0 github.com/stretchr/testify v1.8.1 - go.opentelemetry.io/collector v0.64.2-0.20221115155901-1550938c18fd - go.opentelemetry.io/collector/pdata v0.64.2-0.20221115155901-1550938c18fd + go.opentelemetry.io/collector v0.64.2-0.20221117234814-4565692c50a7 + go.opentelemetry.io/collector/component v0.0.0-20221117234814-4565692c50a7 + go.opentelemetry.io/collector/consumer v0.0.0-20221117234814-4565692c50a7 + go.opentelemetry.io/collector/pdata v0.64.2-0.20221117234814-4565692c50a7 go.uber.org/atomic v1.10.0 go.uber.org/multierr v1.8.0 go.uber.org/zap v1.23.0 @@ -39,6 +41,7 @@ require ( github.com/rogpeppe/go-internal v1.6.1 // indirect github.com/stretchr/objx v0.5.0 // indirect go.opencensus.io v0.24.0 // indirect + go.opentelemetry.io/collector/featuregate v0.0.0-20221117214536-6a117bfc3737 // indirect go.opentelemetry.io/otel v1.11.1 // indirect go.opentelemetry.io/otel/metric v0.33.0 // indirect go.opentelemetry.io/otel/trace v1.11.1 // indirect diff --git a/pkg/stanza/go.sum b/pkg/stanza/go.sum index 3ae307ee8875b..75cecf75e3436 100644 --- a/pkg/stanza/go.sum +++ b/pkg/stanza/go.sum @@ -311,10 +311,16 @@ go.etcd.io/etcd/client/pkg/v3 v3.5.4/go.mod h1:IJHfcCEKxYu1Os13ZdwCwIUTUVGYTSAM3 go.etcd.io/etcd/client/v3 v3.5.4/go.mod h1:ZaRkVgBZC+L+dLCjTcF1hRXpgZXQPOvnA/Ak/gq3kiY= go.opencensus.io v0.24.0 h1:y73uSU6J157QMP2kn2r30vwW1A2W2WFwSCGnAVxeaD0= go.opencensus.io v0.24.0/go.mod h1:vNK8G9p7aAivkbmorf4v+7Hgx+Zs0yY+0fOtgBfjQKo= -go.opentelemetry.io/collector v0.64.2-0.20221115155901-1550938c18fd h1:O+6HhE4Ivg8Jksp3dIXIEC4FIR0Ush4uORvG3UtHZWk= -go.opentelemetry.io/collector v0.64.2-0.20221115155901-1550938c18fd/go.mod h1:mmSrOcwe1vEYmChXUYuF6rzlrUL0rjEiPfa19Xxb41o= -go.opentelemetry.io/collector/pdata v0.64.2-0.20221115155901-1550938c18fd h1:GdVAbRiae5VDZe3Mn3FqzMxO/aI5UbJ4+dcviqClHy8= -go.opentelemetry.io/collector/pdata v0.64.2-0.20221115155901-1550938c18fd/go.mod h1:0vynPfW2ZN7DltpcCFgCmTtWMQkCjp2a3TNt82YTCLQ= +go.opentelemetry.io/collector v0.64.2-0.20221117234814-4565692c50a7 h1:o/vMr2iyXzaeTb/KAldhMxAvRIfFPwtKfL5cKVKsSlU= +go.opentelemetry.io/collector v0.64.2-0.20221117234814-4565692c50a7/go.mod h1:PO8hayFFYvXDqELbXRVxwawR2HTdjN6mY4Qa3Se9xI8= +go.opentelemetry.io/collector/component v0.0.0-20221117234814-4565692c50a7 h1:q9m1bGHhQFUakQX79lZpLmFSY9VLULNSs2jUG8MdJLA= +go.opentelemetry.io/collector/component v0.0.0-20221117234814-4565692c50a7/go.mod h1:Z7H1Oj826e4dtVxXmT6SiUr6S0EIevUJmkVpfQV+UOk= +go.opentelemetry.io/collector/consumer v0.0.0-20221117234814-4565692c50a7 h1:FTy1JD9EJ7gq9SzlZoi2NkGcZ88+SwdiJav5uRcDEEY= +go.opentelemetry.io/collector/consumer v0.0.0-20221117234814-4565692c50a7/go.mod h1:86Elcw/LLrh90DprArogHMkBX3+UMu3tIgcVWF3mr6o= +go.opentelemetry.io/collector/featuregate v0.0.0-20221117214536-6a117bfc3737 h1:7sXg6M9Fw6rFVlX+iaWOMz6DFXEiroUdQer5kWGixwM= +go.opentelemetry.io/collector/featuregate v0.0.0-20221117214536-6a117bfc3737/go.mod h1:tewuFKJYalWBU0bmNKg++MC1ipINXUr6szYzOw2p1GI= +go.opentelemetry.io/collector/pdata v0.64.2-0.20221117234814-4565692c50a7 h1:IOFqfOu7fFxTgC7pvc2U7dk1/uFjwVQPK+CALiUvacI= +go.opentelemetry.io/collector/pdata v0.64.2-0.20221117234814-4565692c50a7/go.mod h1:0vynPfW2ZN7DltpcCFgCmTtWMQkCjp2a3TNt82YTCLQ= go.opentelemetry.io/otel v1.11.1 h1:4WLLAmcfkmDk2ukNXJyq3/kiz/3UzCaYq6PskJsaou4= go.opentelemetry.io/otel v1.11.1/go.mod h1:1nNhXBbWSD0nsL38H6btgnFN2k4i0sNLHNNMZMSbUGE= go.opentelemetry.io/otel/exporters/prometheus v0.33.0 h1:xXhPj7SLKWU5/Zd4Hxmd+X1C4jdmvc0Xy+kvjFx2z60= diff --git a/pkg/translator/jaeger/go.mod b/pkg/translator/jaeger/go.mod index 6278670b54851..8ed5f00245f52 100644 --- a/pkg/translator/jaeger/go.mod +++ b/pkg/translator/jaeger/go.mod @@ -6,8 +6,8 @@ require ( github.com/jaegertracing/jaeger v1.39.1-0.20221110195127-14c11365a856 github.com/open-telemetry/opentelemetry-collector-contrib/internal/coreinternal v0.64.0 github.com/stretchr/testify v1.8.1 - go.opentelemetry.io/collector/pdata v0.64.2-0.20221115155901-1550938c18fd - go.opentelemetry.io/collector/semconv v0.64.2-0.20221115155901-1550938c18fd + go.opentelemetry.io/collector/pdata v0.64.2-0.20221117234814-4565692c50a7 + go.opentelemetry.io/collector/semconv v0.64.2-0.20221117234814-4565692c50a7 ) require ( diff --git a/pkg/translator/jaeger/go.sum b/pkg/translator/jaeger/go.sum index 9290663b9b75e..b6c86da594e76 100644 --- a/pkg/translator/jaeger/go.sum +++ b/pkg/translator/jaeger/go.sum @@ -48,10 +48,10 @@ github.com/uber/jaeger-lib v2.4.1+incompatible h1:td4jdvLcExb4cBISKIpHuGoVXh+dVK github.com/uber/jaeger-lib v2.4.1+incompatible/go.mod h1:ComeNDZlWwrWnDv8aPp0Ba6+uUTzImX/AauajbLI56U= github.com/yuin/goldmark v1.1.27/go.mod h1:3hX8gzYuyVAZsxl0MRgGTJEmQBFcNTphYh9decYSb74= github.com/yuin/goldmark v1.2.1/go.mod h1:3hX8gzYuyVAZsxl0MRgGTJEmQBFcNTphYh9decYSb74= -go.opentelemetry.io/collector/pdata v0.64.2-0.20221115155901-1550938c18fd h1:GdVAbRiae5VDZe3Mn3FqzMxO/aI5UbJ4+dcviqClHy8= -go.opentelemetry.io/collector/pdata v0.64.2-0.20221115155901-1550938c18fd/go.mod h1:0vynPfW2ZN7DltpcCFgCmTtWMQkCjp2a3TNt82YTCLQ= -go.opentelemetry.io/collector/semconv v0.64.2-0.20221115155901-1550938c18fd h1:rMqcl2pwi8YtVrtOPK8tVh87W0bFBge4yqB9ypSsAJ4= -go.opentelemetry.io/collector/semconv v0.64.2-0.20221115155901-1550938c18fd/go.mod h1:5o9yhOa+ABt7g2E5JABDxGZ1PQPbtfxrKNbYn+LOTXU= +go.opentelemetry.io/collector/pdata v0.64.2-0.20221117234814-4565692c50a7 h1:IOFqfOu7fFxTgC7pvc2U7dk1/uFjwVQPK+CALiUvacI= +go.opentelemetry.io/collector/pdata v0.64.2-0.20221117234814-4565692c50a7/go.mod h1:0vynPfW2ZN7DltpcCFgCmTtWMQkCjp2a3TNt82YTCLQ= +go.opentelemetry.io/collector/semconv v0.64.2-0.20221117234814-4565692c50a7 h1:cGXAVltDxXw9nj0Vr7vyZZTj0whdyO+GYs+xv0xHJ2A= +go.opentelemetry.io/collector/semconv v0.64.2-0.20221117234814-4565692c50a7/go.mod h1:5o9yhOa+ABt7g2E5JABDxGZ1PQPbtfxrKNbYn+LOTXU= go.uber.org/atomic v1.7.0/go.mod h1:fEN4uk6kAWBTFdckzkM89CLk9XfWZrxpCo0nPH17wJc= go.uber.org/atomic v1.10.0 h1:9qC72Qh0+3MqyJbAn8YU5xVq1frD8bn3JtD2oXtafVQ= go.uber.org/atomic v1.10.0/go.mod h1:LUxbIzbOniOlMKjJjyPfpl4v+PKK2cNJn91OQbhoJI0= diff --git a/pkg/translator/loki/go.mod b/pkg/translator/loki/go.mod index a20d997551925..011587d68af65 100644 --- a/pkg/translator/loki/go.mod +++ b/pkg/translator/loki/go.mod @@ -8,7 +8,7 @@ require ( github.com/open-telemetry/opentelemetry-collector-contrib/internal/coreinternal v0.64.0 github.com/prometheus/common v0.37.0 github.com/stretchr/testify v1.8.1 - go.opentelemetry.io/collector/pdata v0.64.2-0.20221115155901-1550938c18fd + go.opentelemetry.io/collector/pdata v0.64.2-0.20221117234814-4565692c50a7 ) require ( diff --git a/pkg/translator/loki/go.sum b/pkg/translator/loki/go.sum index ca2188cbc276c..f742759192023 100644 --- a/pkg/translator/loki/go.sum +++ b/pkg/translator/loki/go.sum @@ -436,8 +436,8 @@ go.opencensus.io v0.22.0/go.mod h1:+kGneAE2xo2IficOXnaByMWTGM9T73dGwxeWcUqIpI8= go.opencensus.io v0.22.2/go.mod h1:yxeiOL68Rb0Xd1ddK5vPZ/oVn4vY4Ynel7k9FzqtOIw= go.opencensus.io v0.22.3/go.mod h1:yxeiOL68Rb0Xd1ddK5vPZ/oVn4vY4Ynel7k9FzqtOIw= go.opencensus.io v0.22.4/go.mod h1:yxeiOL68Rb0Xd1ddK5vPZ/oVn4vY4Ynel7k9FzqtOIw= -go.opentelemetry.io/collector/pdata v0.64.2-0.20221115155901-1550938c18fd h1:GdVAbRiae5VDZe3Mn3FqzMxO/aI5UbJ4+dcviqClHy8= -go.opentelemetry.io/collector/pdata v0.64.2-0.20221115155901-1550938c18fd/go.mod h1:0vynPfW2ZN7DltpcCFgCmTtWMQkCjp2a3TNt82YTCLQ= +go.opentelemetry.io/collector/pdata v0.64.2-0.20221117234814-4565692c50a7 h1:IOFqfOu7fFxTgC7pvc2U7dk1/uFjwVQPK+CALiUvacI= +go.opentelemetry.io/collector/pdata v0.64.2-0.20221117234814-4565692c50a7/go.mod h1:0vynPfW2ZN7DltpcCFgCmTtWMQkCjp2a3TNt82YTCLQ= go.uber.org/atomic v1.4.0/go.mod h1:gD2HeocX3+yG+ygLZcrzQJaqmWj9AIm7n08wl/qW/PE= go.uber.org/atomic v1.5.1/go.mod h1:sABNBOSYdrvTF6hTgEIbc7YasKWGhgEQZyfxyTvoXHQ= go.uber.org/atomic v1.7.0/go.mod h1:fEN4uk6kAWBTFdckzkM89CLk9XfWZrxpCo0nPH17wJc= diff --git a/pkg/translator/opencensus/go.mod b/pkg/translator/opencensus/go.mod index a13e42c0ef90d..61aa392174f60 100644 --- a/pkg/translator/opencensus/go.mod +++ b/pkg/translator/opencensus/go.mod @@ -9,8 +9,8 @@ require ( github.com/open-telemetry/opentelemetry-collector-contrib/internal/coreinternal v0.64.0 github.com/stretchr/testify v1.8.1 go.opencensus.io v0.24.0 - go.opentelemetry.io/collector/pdata v0.64.2-0.20221115155901-1550938c18fd - go.opentelemetry.io/collector/semconv v0.64.2-0.20221115155901-1550938c18fd + go.opentelemetry.io/collector/pdata v0.64.2-0.20221117234814-4565692c50a7 + go.opentelemetry.io/collector/semconv v0.64.2-0.20221117234814-4565692c50a7 google.golang.org/protobuf v1.28.1 ) diff --git a/pkg/translator/opencensus/go.sum b/pkg/translator/opencensus/go.sum index 3909bc27f0255..90ba2928d2162 100644 --- a/pkg/translator/opencensus/go.sum +++ b/pkg/translator/opencensus/go.sum @@ -73,10 +73,10 @@ github.com/yuin/goldmark v1.1.27/go.mod h1:3hX8gzYuyVAZsxl0MRgGTJEmQBFcNTphYh9de github.com/yuin/goldmark v1.2.1/go.mod h1:3hX8gzYuyVAZsxl0MRgGTJEmQBFcNTphYh9decYSb74= go.opencensus.io v0.24.0 h1:y73uSU6J157QMP2kn2r30vwW1A2W2WFwSCGnAVxeaD0= go.opencensus.io v0.24.0/go.mod h1:vNK8G9p7aAivkbmorf4v+7Hgx+Zs0yY+0fOtgBfjQKo= -go.opentelemetry.io/collector/pdata v0.64.2-0.20221115155901-1550938c18fd h1:GdVAbRiae5VDZe3Mn3FqzMxO/aI5UbJ4+dcviqClHy8= -go.opentelemetry.io/collector/pdata v0.64.2-0.20221115155901-1550938c18fd/go.mod h1:0vynPfW2ZN7DltpcCFgCmTtWMQkCjp2a3TNt82YTCLQ= -go.opentelemetry.io/collector/semconv v0.64.2-0.20221115155901-1550938c18fd h1:rMqcl2pwi8YtVrtOPK8tVh87W0bFBge4yqB9ypSsAJ4= -go.opentelemetry.io/collector/semconv v0.64.2-0.20221115155901-1550938c18fd/go.mod h1:5o9yhOa+ABt7g2E5JABDxGZ1PQPbtfxrKNbYn+LOTXU= +go.opentelemetry.io/collector/pdata v0.64.2-0.20221117234814-4565692c50a7 h1:IOFqfOu7fFxTgC7pvc2U7dk1/uFjwVQPK+CALiUvacI= +go.opentelemetry.io/collector/pdata v0.64.2-0.20221117234814-4565692c50a7/go.mod h1:0vynPfW2ZN7DltpcCFgCmTtWMQkCjp2a3TNt82YTCLQ= +go.opentelemetry.io/collector/semconv v0.64.2-0.20221117234814-4565692c50a7 h1:cGXAVltDxXw9nj0Vr7vyZZTj0whdyO+GYs+xv0xHJ2A= +go.opentelemetry.io/collector/semconv v0.64.2-0.20221117234814-4565692c50a7/go.mod h1:5o9yhOa+ABt7g2E5JABDxGZ1PQPbtfxrKNbYn+LOTXU= golang.org/x/crypto v0.0.0-20190308221718-c2843e01d9a2/go.mod h1:djNgcEr1/C05ACkg1iLfiJU5Ep61QUkGW8qpdssI0+w= golang.org/x/crypto v0.0.0-20191011191535-87dc89f01550/go.mod h1:yigFU9vqHzYiE8UmvKecakEJjdnWj3jj499lnFckfCI= golang.org/x/crypto v0.0.0-20200622213623-75b288015ac9/go.mod h1:LzIPMQfyMNhhGPhUkYOs5KpL4U8rLKemX1yGLhDgUto= diff --git a/pkg/translator/prometheus/go.mod b/pkg/translator/prometheus/go.mod index 793241963f561..c1816cbcc031c 100644 --- a/pkg/translator/prometheus/go.mod +++ b/pkg/translator/prometheus/go.mod @@ -5,8 +5,8 @@ go 1.18 require ( github.com/open-telemetry/opentelemetry-collector-contrib/internal/common v0.64.0 github.com/stretchr/testify v1.8.1 - go.opentelemetry.io/collector v0.64.2-0.20221115155901-1550938c18fd - go.opentelemetry.io/collector/pdata v0.64.2-0.20221115155901-1550938c18fd + go.opentelemetry.io/collector/featuregate v0.0.0-20221117214536-6a117bfc3737 + go.opentelemetry.io/collector/pdata v0.64.2-0.20221117234814-4565692c50a7 ) require ( diff --git a/pkg/translator/prometheus/go.sum b/pkg/translator/prometheus/go.sum index f160a6754b670..2e64033ec27ac 100644 --- a/pkg/translator/prometheus/go.sum +++ b/pkg/translator/prometheus/go.sum @@ -81,10 +81,10 @@ github.com/stretchr/testify v1.8.1 h1:w7B6lhMri9wdJUVmEZPGGhZzrYTPvgJArz7wNPgYKs github.com/stretchr/testify v1.8.1/go.mod h1:w2LPCIKwWwSfY2zedu0+kehJoqGctiVI29o6fzry7u4= github.com/yuin/goldmark v1.1.27/go.mod h1:3hX8gzYuyVAZsxl0MRgGTJEmQBFcNTphYh9decYSb74= github.com/yuin/goldmark v1.2.1/go.mod h1:3hX8gzYuyVAZsxl0MRgGTJEmQBFcNTphYh9decYSb74= -go.opentelemetry.io/collector v0.64.2-0.20221115155901-1550938c18fd h1:O+6HhE4Ivg8Jksp3dIXIEC4FIR0Ush4uORvG3UtHZWk= -go.opentelemetry.io/collector v0.64.2-0.20221115155901-1550938c18fd/go.mod h1:mmSrOcwe1vEYmChXUYuF6rzlrUL0rjEiPfa19Xxb41o= -go.opentelemetry.io/collector/pdata v0.64.2-0.20221115155901-1550938c18fd h1:GdVAbRiae5VDZe3Mn3FqzMxO/aI5UbJ4+dcviqClHy8= -go.opentelemetry.io/collector/pdata v0.64.2-0.20221115155901-1550938c18fd/go.mod h1:0vynPfW2ZN7DltpcCFgCmTtWMQkCjp2a3TNt82YTCLQ= +go.opentelemetry.io/collector/featuregate v0.0.0-20221117214536-6a117bfc3737 h1:7sXg6M9Fw6rFVlX+iaWOMz6DFXEiroUdQer5kWGixwM= +go.opentelemetry.io/collector/featuregate v0.0.0-20221117214536-6a117bfc3737/go.mod h1:tewuFKJYalWBU0bmNKg++MC1ipINXUr6szYzOw2p1GI= +go.opentelemetry.io/collector/pdata v0.64.2-0.20221117234814-4565692c50a7 h1:IOFqfOu7fFxTgC7pvc2U7dk1/uFjwVQPK+CALiUvacI= +go.opentelemetry.io/collector/pdata v0.64.2-0.20221117234814-4565692c50a7/go.mod h1:0vynPfW2ZN7DltpcCFgCmTtWMQkCjp2a3TNt82YTCLQ= go.opentelemetry.io/proto/otlp v0.7.0/go.mod h1:PqfVotwruBrMGOCsRd/89rSnXhoiJIqeYNgFYFoEGnI= golang.org/x/crypto v0.0.0-20190308221718-c2843e01d9a2/go.mod h1:djNgcEr1/C05ACkg1iLfiJU5Ep61QUkGW8qpdssI0+w= golang.org/x/crypto v0.0.0-20191011191535-87dc89f01550/go.mod h1:yigFU9vqHzYiE8UmvKecakEJjdnWj3jj499lnFckfCI= diff --git a/pkg/translator/prometheusremotewrite/go.mod b/pkg/translator/prometheusremotewrite/go.mod index 479e56c713ace..c0e174f1a622c 100644 --- a/pkg/translator/prometheusremotewrite/go.mod +++ b/pkg/translator/prometheusremotewrite/go.mod @@ -8,9 +8,9 @@ require ( github.com/prometheus/common v0.37.0 github.com/prometheus/prometheus v0.38.0 github.com/stretchr/testify v1.8.1 - go.opentelemetry.io/collector v0.64.2-0.20221115155901-1550938c18fd - go.opentelemetry.io/collector/pdata v0.64.2-0.20221115155901-1550938c18fd - go.opentelemetry.io/collector/semconv v0.64.2-0.20221115155901-1550938c18fd + go.opentelemetry.io/collector/consumer v0.0.0-20221117234814-4565692c50a7 + go.opentelemetry.io/collector/pdata v0.64.2-0.20221117234814-4565692c50a7 + go.opentelemetry.io/collector/semconv v0.64.2-0.20221117234814-4565692c50a7 go.uber.org/multierr v1.8.0 ) @@ -23,6 +23,7 @@ require ( github.com/modern-go/concurrent v0.0.0-20180306012644-bacd9c7ef1dd // indirect github.com/modern-go/reflect2 v1.0.2 // indirect github.com/pmezard/go-difflib v1.0.0 // indirect + go.opentelemetry.io/collector/featuregate v0.0.0-20221117214536-6a117bfc3737 // indirect go.uber.org/atomic v1.10.0 // indirect golang.org/x/net v0.0.0-20220809184613-07c6da5e1ced // indirect golang.org/x/sys v0.2.0 // indirect diff --git a/pkg/translator/prometheusremotewrite/go.sum b/pkg/translator/prometheusremotewrite/go.sum index dd72f855b24d9..04a9ad0e26c0a 100644 --- a/pkg/translator/prometheusremotewrite/go.sum +++ b/pkg/translator/prometheusremotewrite/go.sum @@ -211,12 +211,15 @@ go.opencensus.io v0.22.0/go.mod h1:+kGneAE2xo2IficOXnaByMWTGM9T73dGwxeWcUqIpI8= go.opencensus.io v0.22.2/go.mod h1:yxeiOL68Rb0Xd1ddK5vPZ/oVn4vY4Ynel7k9FzqtOIw= go.opencensus.io v0.22.3/go.mod h1:yxeiOL68Rb0Xd1ddK5vPZ/oVn4vY4Ynel7k9FzqtOIw= go.opencensus.io v0.22.4/go.mod h1:yxeiOL68Rb0Xd1ddK5vPZ/oVn4vY4Ynel7k9FzqtOIw= -go.opentelemetry.io/collector v0.64.2-0.20221115155901-1550938c18fd h1:O+6HhE4Ivg8Jksp3dIXIEC4FIR0Ush4uORvG3UtHZWk= -go.opentelemetry.io/collector v0.64.2-0.20221115155901-1550938c18fd/go.mod h1:mmSrOcwe1vEYmChXUYuF6rzlrUL0rjEiPfa19Xxb41o= -go.opentelemetry.io/collector/pdata v0.64.2-0.20221115155901-1550938c18fd h1:GdVAbRiae5VDZe3Mn3FqzMxO/aI5UbJ4+dcviqClHy8= -go.opentelemetry.io/collector/pdata v0.64.2-0.20221115155901-1550938c18fd/go.mod h1:0vynPfW2ZN7DltpcCFgCmTtWMQkCjp2a3TNt82YTCLQ= -go.opentelemetry.io/collector/semconv v0.64.2-0.20221115155901-1550938c18fd h1:rMqcl2pwi8YtVrtOPK8tVh87W0bFBge4yqB9ypSsAJ4= -go.opentelemetry.io/collector/semconv v0.64.2-0.20221115155901-1550938c18fd/go.mod h1:5o9yhOa+ABt7g2E5JABDxGZ1PQPbtfxrKNbYn+LOTXU= +go.opentelemetry.io/collector v0.64.2-0.20221117234814-4565692c50a7 h1:o/vMr2iyXzaeTb/KAldhMxAvRIfFPwtKfL5cKVKsSlU= +go.opentelemetry.io/collector/consumer v0.0.0-20221117234814-4565692c50a7 h1:FTy1JD9EJ7gq9SzlZoi2NkGcZ88+SwdiJav5uRcDEEY= +go.opentelemetry.io/collector/consumer v0.0.0-20221117234814-4565692c50a7/go.mod h1:86Elcw/LLrh90DprArogHMkBX3+UMu3tIgcVWF3mr6o= +go.opentelemetry.io/collector/featuregate v0.0.0-20221117214536-6a117bfc3737 h1:7sXg6M9Fw6rFVlX+iaWOMz6DFXEiroUdQer5kWGixwM= +go.opentelemetry.io/collector/featuregate v0.0.0-20221117214536-6a117bfc3737/go.mod h1:tewuFKJYalWBU0bmNKg++MC1ipINXUr6szYzOw2p1GI= +go.opentelemetry.io/collector/pdata v0.64.2-0.20221117234814-4565692c50a7 h1:IOFqfOu7fFxTgC7pvc2U7dk1/uFjwVQPK+CALiUvacI= +go.opentelemetry.io/collector/pdata v0.64.2-0.20221117234814-4565692c50a7/go.mod h1:0vynPfW2ZN7DltpcCFgCmTtWMQkCjp2a3TNt82YTCLQ= +go.opentelemetry.io/collector/semconv v0.64.2-0.20221117234814-4565692c50a7 h1:cGXAVltDxXw9nj0Vr7vyZZTj0whdyO+GYs+xv0xHJ2A= +go.opentelemetry.io/collector/semconv v0.64.2-0.20221117234814-4565692c50a7/go.mod h1:5o9yhOa+ABt7g2E5JABDxGZ1PQPbtfxrKNbYn+LOTXU= go.uber.org/atomic v1.7.0/go.mod h1:fEN4uk6kAWBTFdckzkM89CLk9XfWZrxpCo0nPH17wJc= go.uber.org/atomic v1.10.0 h1:9qC72Qh0+3MqyJbAn8YU5xVq1frD8bn3JtD2oXtafVQ= go.uber.org/atomic v1.10.0/go.mod h1:LUxbIzbOniOlMKjJjyPfpl4v+PKK2cNJn91OQbhoJI0= diff --git a/pkg/translator/signalfx/go.mod b/pkg/translator/signalfx/go.mod index 4a46fbc18027a..deda154f06ff3 100644 --- a/pkg/translator/signalfx/go.mod +++ b/pkg/translator/signalfx/go.mod @@ -6,7 +6,7 @@ require ( github.com/open-telemetry/opentelemetry-collector-contrib/internal/common v0.64.0 github.com/signalfx/com_signalfx_metrics_protobuf v0.0.3 github.com/stretchr/testify v1.8.1 - go.opentelemetry.io/collector/pdata v0.64.2-0.20221115155901-1550938c18fd + go.opentelemetry.io/collector/pdata v0.64.2-0.20221117234814-4565692c50a7 go.uber.org/multierr v1.8.0 ) diff --git a/pkg/translator/signalfx/go.sum b/pkg/translator/signalfx/go.sum index 07403aa9028b4..d8f083a0a38f0 100644 --- a/pkg/translator/signalfx/go.sum +++ b/pkg/translator/signalfx/go.sum @@ -59,8 +59,8 @@ github.com/stretchr/testify v1.8.1 h1:w7B6lhMri9wdJUVmEZPGGhZzrYTPvgJArz7wNPgYKs github.com/stretchr/testify v1.8.1/go.mod h1:w2LPCIKwWwSfY2zedu0+kehJoqGctiVI29o6fzry7u4= github.com/yuin/goldmark v1.1.27/go.mod h1:3hX8gzYuyVAZsxl0MRgGTJEmQBFcNTphYh9decYSb74= github.com/yuin/goldmark v1.2.1/go.mod h1:3hX8gzYuyVAZsxl0MRgGTJEmQBFcNTphYh9decYSb74= -go.opentelemetry.io/collector/pdata v0.64.2-0.20221115155901-1550938c18fd h1:GdVAbRiae5VDZe3Mn3FqzMxO/aI5UbJ4+dcviqClHy8= -go.opentelemetry.io/collector/pdata v0.64.2-0.20221115155901-1550938c18fd/go.mod h1:0vynPfW2ZN7DltpcCFgCmTtWMQkCjp2a3TNt82YTCLQ= +go.opentelemetry.io/collector/pdata v0.64.2-0.20221117234814-4565692c50a7 h1:IOFqfOu7fFxTgC7pvc2U7dk1/uFjwVQPK+CALiUvacI= +go.opentelemetry.io/collector/pdata v0.64.2-0.20221117234814-4565692c50a7/go.mod h1:0vynPfW2ZN7DltpcCFgCmTtWMQkCjp2a3TNt82YTCLQ= go.uber.org/atomic v1.7.0/go.mod h1:fEN4uk6kAWBTFdckzkM89CLk9XfWZrxpCo0nPH17wJc= go.uber.org/atomic v1.10.0 h1:9qC72Qh0+3MqyJbAn8YU5xVq1frD8bn3JtD2oXtafVQ= go.uber.org/atomic v1.10.0/go.mod h1:LUxbIzbOniOlMKjJjyPfpl4v+PKK2cNJn91OQbhoJI0= diff --git a/pkg/translator/zipkin/go.mod b/pkg/translator/zipkin/go.mod index c042d3acfc208..88cab9bd559bc 100644 --- a/pkg/translator/zipkin/go.mod +++ b/pkg/translator/zipkin/go.mod @@ -7,8 +7,8 @@ require ( github.com/open-telemetry/opentelemetry-collector-contrib/internal/coreinternal v0.64.0 github.com/openzipkin/zipkin-go v0.4.1 github.com/stretchr/testify v1.8.1 - go.opentelemetry.io/collector/pdata v0.64.2-0.20221115155901-1550938c18fd - go.opentelemetry.io/collector/semconv v0.64.2-0.20221115155901-1550938c18fd + go.opentelemetry.io/collector/pdata v0.64.2-0.20221117234814-4565692c50a7 + go.opentelemetry.io/collector/semconv v0.64.2-0.20221117234814-4565692c50a7 ) require ( diff --git a/pkg/translator/zipkin/go.sum b/pkg/translator/zipkin/go.sum index 720a65370dff1..33f6bf9a6f6da 100644 --- a/pkg/translator/zipkin/go.sum +++ b/pkg/translator/zipkin/go.sum @@ -50,10 +50,10 @@ github.com/uber/jaeger-lib v2.4.1+incompatible h1:td4jdvLcExb4cBISKIpHuGoVXh+dVK github.com/uber/jaeger-lib v2.4.1+incompatible/go.mod h1:ComeNDZlWwrWnDv8aPp0Ba6+uUTzImX/AauajbLI56U= github.com/yuin/goldmark v1.1.27/go.mod h1:3hX8gzYuyVAZsxl0MRgGTJEmQBFcNTphYh9decYSb74= github.com/yuin/goldmark v1.2.1/go.mod h1:3hX8gzYuyVAZsxl0MRgGTJEmQBFcNTphYh9decYSb74= -go.opentelemetry.io/collector/pdata v0.64.2-0.20221115155901-1550938c18fd h1:GdVAbRiae5VDZe3Mn3FqzMxO/aI5UbJ4+dcviqClHy8= -go.opentelemetry.io/collector/pdata v0.64.2-0.20221115155901-1550938c18fd/go.mod h1:0vynPfW2ZN7DltpcCFgCmTtWMQkCjp2a3TNt82YTCLQ= -go.opentelemetry.io/collector/semconv v0.64.2-0.20221115155901-1550938c18fd h1:rMqcl2pwi8YtVrtOPK8tVh87W0bFBge4yqB9ypSsAJ4= -go.opentelemetry.io/collector/semconv v0.64.2-0.20221115155901-1550938c18fd/go.mod h1:5o9yhOa+ABt7g2E5JABDxGZ1PQPbtfxrKNbYn+LOTXU= +go.opentelemetry.io/collector/pdata v0.64.2-0.20221117234814-4565692c50a7 h1:IOFqfOu7fFxTgC7pvc2U7dk1/uFjwVQPK+CALiUvacI= +go.opentelemetry.io/collector/pdata v0.64.2-0.20221117234814-4565692c50a7/go.mod h1:0vynPfW2ZN7DltpcCFgCmTtWMQkCjp2a3TNt82YTCLQ= +go.opentelemetry.io/collector/semconv v0.64.2-0.20221117234814-4565692c50a7 h1:cGXAVltDxXw9nj0Vr7vyZZTj0whdyO+GYs+xv0xHJ2A= +go.opentelemetry.io/collector/semconv v0.64.2-0.20221117234814-4565692c50a7/go.mod h1:5o9yhOa+ABt7g2E5JABDxGZ1PQPbtfxrKNbYn+LOTXU= go.uber.org/atomic v1.7.0/go.mod h1:fEN4uk6kAWBTFdckzkM89CLk9XfWZrxpCo0nPH17wJc= go.uber.org/atomic v1.10.0 h1:9qC72Qh0+3MqyJbAn8YU5xVq1frD8bn3JtD2oXtafVQ= go.uber.org/atomic v1.10.0/go.mod h1:LUxbIzbOniOlMKjJjyPfpl4v+PKK2cNJn91OQbhoJI0= diff --git a/processor/attributesprocessor/config_test.go b/processor/attributesprocessor/config_test.go index 64610423d4e0f..bc488b41a04b1 100644 --- a/processor/attributesprocessor/config_test.go +++ b/processor/attributesprocessor/config_test.go @@ -234,7 +234,7 @@ func TestLoadConfig(t *testing.T) { require.NoError(t, err) require.NoError(t, component.UnmarshalProcessorConfig(sub, cfg)) - assert.NoError(t, cfg.Validate()) + assert.NoError(t, component.ValidateConfig(cfg)) assert.Equal(t, tt.expected, cfg) }) } diff --git a/processor/attributesprocessor/go.mod b/processor/attributesprocessor/go.mod index e3c3f24350de6..fb60394354e24 100644 --- a/processor/attributesprocessor/go.mod +++ b/processor/attributesprocessor/go.mod @@ -5,9 +5,11 @@ go 1.18 require ( github.com/open-telemetry/opentelemetry-collector-contrib/internal/coreinternal v0.64.0 github.com/stretchr/testify v1.8.1 - go.opentelemetry.io/collector v0.64.2-0.20221115155901-1550938c18fd - go.opentelemetry.io/collector/pdata v0.64.2-0.20221115155901-1550938c18fd - go.opentelemetry.io/collector/semconv v0.64.2-0.20221115155901-1550938c18fd + go.opentelemetry.io/collector v0.64.2-0.20221117234814-4565692c50a7 + go.opentelemetry.io/collector/component v0.0.0-20221117234814-4565692c50a7 + go.opentelemetry.io/collector/consumer v0.0.0-20221117234814-4565692c50a7 + go.opentelemetry.io/collector/pdata v0.64.2-0.20221117234814-4565692c50a7 + go.opentelemetry.io/collector/semconv v0.64.2-0.20221117234814-4565692c50a7 go.uber.org/zap v1.23.0 ) @@ -27,6 +29,7 @@ require ( github.com/pmezard/go-difflib v1.0.0 // indirect github.com/spf13/cast v1.5.0 // indirect go.opencensus.io v0.24.0 // indirect + go.opentelemetry.io/collector/featuregate v0.0.0-20221117214536-6a117bfc3737 // indirect go.opentelemetry.io/otel v1.11.1 // indirect go.opentelemetry.io/otel/metric v0.33.0 // indirect go.opentelemetry.io/otel/trace v1.11.1 // indirect diff --git a/processor/attributesprocessor/go.sum b/processor/attributesprocessor/go.sum index 835793d99fe80..13853ced58b2e 100644 --- a/processor/attributesprocessor/go.sum +++ b/processor/attributesprocessor/go.sum @@ -276,12 +276,18 @@ go.etcd.io/etcd/client/pkg/v3 v3.5.4/go.mod h1:IJHfcCEKxYu1Os13ZdwCwIUTUVGYTSAM3 go.etcd.io/etcd/client/v3 v3.5.4/go.mod h1:ZaRkVgBZC+L+dLCjTcF1hRXpgZXQPOvnA/Ak/gq3kiY= go.opencensus.io v0.24.0 h1:y73uSU6J157QMP2kn2r30vwW1A2W2WFwSCGnAVxeaD0= go.opencensus.io v0.24.0/go.mod h1:vNK8G9p7aAivkbmorf4v+7Hgx+Zs0yY+0fOtgBfjQKo= -go.opentelemetry.io/collector v0.64.2-0.20221115155901-1550938c18fd h1:O+6HhE4Ivg8Jksp3dIXIEC4FIR0Ush4uORvG3UtHZWk= -go.opentelemetry.io/collector v0.64.2-0.20221115155901-1550938c18fd/go.mod h1:mmSrOcwe1vEYmChXUYuF6rzlrUL0rjEiPfa19Xxb41o= -go.opentelemetry.io/collector/pdata v0.64.2-0.20221115155901-1550938c18fd h1:GdVAbRiae5VDZe3Mn3FqzMxO/aI5UbJ4+dcviqClHy8= -go.opentelemetry.io/collector/pdata v0.64.2-0.20221115155901-1550938c18fd/go.mod h1:0vynPfW2ZN7DltpcCFgCmTtWMQkCjp2a3TNt82YTCLQ= -go.opentelemetry.io/collector/semconv v0.64.2-0.20221115155901-1550938c18fd h1:rMqcl2pwi8YtVrtOPK8tVh87W0bFBge4yqB9ypSsAJ4= -go.opentelemetry.io/collector/semconv v0.64.2-0.20221115155901-1550938c18fd/go.mod h1:5o9yhOa+ABt7g2E5JABDxGZ1PQPbtfxrKNbYn+LOTXU= +go.opentelemetry.io/collector v0.64.2-0.20221117234814-4565692c50a7 h1:o/vMr2iyXzaeTb/KAldhMxAvRIfFPwtKfL5cKVKsSlU= +go.opentelemetry.io/collector v0.64.2-0.20221117234814-4565692c50a7/go.mod h1:PO8hayFFYvXDqELbXRVxwawR2HTdjN6mY4Qa3Se9xI8= +go.opentelemetry.io/collector/component v0.0.0-20221117234814-4565692c50a7 h1:q9m1bGHhQFUakQX79lZpLmFSY9VLULNSs2jUG8MdJLA= +go.opentelemetry.io/collector/component v0.0.0-20221117234814-4565692c50a7/go.mod h1:Z7H1Oj826e4dtVxXmT6SiUr6S0EIevUJmkVpfQV+UOk= +go.opentelemetry.io/collector/consumer v0.0.0-20221117234814-4565692c50a7 h1:FTy1JD9EJ7gq9SzlZoi2NkGcZ88+SwdiJav5uRcDEEY= +go.opentelemetry.io/collector/consumer v0.0.0-20221117234814-4565692c50a7/go.mod h1:86Elcw/LLrh90DprArogHMkBX3+UMu3tIgcVWF3mr6o= +go.opentelemetry.io/collector/featuregate v0.0.0-20221117214536-6a117bfc3737 h1:7sXg6M9Fw6rFVlX+iaWOMz6DFXEiroUdQer5kWGixwM= +go.opentelemetry.io/collector/featuregate v0.0.0-20221117214536-6a117bfc3737/go.mod h1:tewuFKJYalWBU0bmNKg++MC1ipINXUr6szYzOw2p1GI= +go.opentelemetry.io/collector/pdata v0.64.2-0.20221117234814-4565692c50a7 h1:IOFqfOu7fFxTgC7pvc2U7dk1/uFjwVQPK+CALiUvacI= +go.opentelemetry.io/collector/pdata v0.64.2-0.20221117234814-4565692c50a7/go.mod h1:0vynPfW2ZN7DltpcCFgCmTtWMQkCjp2a3TNt82YTCLQ= +go.opentelemetry.io/collector/semconv v0.64.2-0.20221117234814-4565692c50a7 h1:cGXAVltDxXw9nj0Vr7vyZZTj0whdyO+GYs+xv0xHJ2A= +go.opentelemetry.io/collector/semconv v0.64.2-0.20221117234814-4565692c50a7/go.mod h1:5o9yhOa+ABt7g2E5JABDxGZ1PQPbtfxrKNbYn+LOTXU= go.opentelemetry.io/otel v1.11.1 h1:4WLLAmcfkmDk2ukNXJyq3/kiz/3UzCaYq6PskJsaou4= go.opentelemetry.io/otel v1.11.1/go.mod h1:1nNhXBbWSD0nsL38H6btgnFN2k4i0sNLHNNMZMSbUGE= go.opentelemetry.io/otel/metric v0.33.0 h1:xQAyl7uGEYvrLAiV/09iTJlp1pZnQ9Wl793qbVvED1E= diff --git a/processor/cumulativetodeltaprocessor/config_test.go b/processor/cumulativetodeltaprocessor/config_test.go index 12621d98ca264..6c7a64ace88c3 100644 --- a/processor/cumulativetodeltaprocessor/config_test.go +++ b/processor/cumulativetodeltaprocessor/config_test.go @@ -115,10 +115,10 @@ func TestLoadConfig(t *testing.T) { require.NoError(t, component.UnmarshalProcessorConfig(sub, cfg)) if tt.expected == nil { - assert.EqualError(t, cfg.Validate(), tt.errorMessage) + assert.EqualError(t, component.ValidateConfig(cfg), tt.errorMessage) return } - assert.NoError(t, cfg.Validate()) + assert.NoError(t, component.ValidateConfig(cfg)) assert.Equal(t, tt.expected, cfg) }) } diff --git a/processor/cumulativetodeltaprocessor/go.mod b/processor/cumulativetodeltaprocessor/go.mod index 4c6253142bba2..9ffcae86374ad 100644 --- a/processor/cumulativetodeltaprocessor/go.mod +++ b/processor/cumulativetodeltaprocessor/go.mod @@ -5,8 +5,11 @@ go 1.18 require ( github.com/open-telemetry/opentelemetry-collector-contrib/internal/coreinternal v0.64.0 github.com/stretchr/testify v1.8.1 - go.opentelemetry.io/collector v0.64.2-0.20221115155901-1550938c18fd - go.opentelemetry.io/collector/pdata v0.64.2-0.20221115155901-1550938c18fd + go.opentelemetry.io/collector v0.64.2-0.20221117234814-4565692c50a7 + go.opentelemetry.io/collector/component v0.0.0-20221117234814-4565692c50a7 + go.opentelemetry.io/collector/consumer v0.0.0-20221117234814-4565692c50a7 + go.opentelemetry.io/collector/featuregate v0.0.0-20221117214536-6a117bfc3737 + go.opentelemetry.io/collector/pdata v0.64.2-0.20221117234814-4565692c50a7 go.uber.org/atomic v1.10.0 go.uber.org/zap v1.23.0 ) diff --git a/processor/cumulativetodeltaprocessor/go.sum b/processor/cumulativetodeltaprocessor/go.sum index e91e01c9ed3aa..0e07b9a7a1583 100644 --- a/processor/cumulativetodeltaprocessor/go.sum +++ b/processor/cumulativetodeltaprocessor/go.sum @@ -262,10 +262,16 @@ go.etcd.io/etcd/client/pkg/v3 v3.5.4/go.mod h1:IJHfcCEKxYu1Os13ZdwCwIUTUVGYTSAM3 go.etcd.io/etcd/client/v3 v3.5.4/go.mod h1:ZaRkVgBZC+L+dLCjTcF1hRXpgZXQPOvnA/Ak/gq3kiY= go.opencensus.io v0.24.0 h1:y73uSU6J157QMP2kn2r30vwW1A2W2WFwSCGnAVxeaD0= go.opencensus.io v0.24.0/go.mod h1:vNK8G9p7aAivkbmorf4v+7Hgx+Zs0yY+0fOtgBfjQKo= -go.opentelemetry.io/collector v0.64.2-0.20221115155901-1550938c18fd h1:O+6HhE4Ivg8Jksp3dIXIEC4FIR0Ush4uORvG3UtHZWk= -go.opentelemetry.io/collector v0.64.2-0.20221115155901-1550938c18fd/go.mod h1:mmSrOcwe1vEYmChXUYuF6rzlrUL0rjEiPfa19Xxb41o= -go.opentelemetry.io/collector/pdata v0.64.2-0.20221115155901-1550938c18fd h1:GdVAbRiae5VDZe3Mn3FqzMxO/aI5UbJ4+dcviqClHy8= -go.opentelemetry.io/collector/pdata v0.64.2-0.20221115155901-1550938c18fd/go.mod h1:0vynPfW2ZN7DltpcCFgCmTtWMQkCjp2a3TNt82YTCLQ= +go.opentelemetry.io/collector v0.64.2-0.20221117234814-4565692c50a7 h1:o/vMr2iyXzaeTb/KAldhMxAvRIfFPwtKfL5cKVKsSlU= +go.opentelemetry.io/collector v0.64.2-0.20221117234814-4565692c50a7/go.mod h1:PO8hayFFYvXDqELbXRVxwawR2HTdjN6mY4Qa3Se9xI8= +go.opentelemetry.io/collector/component v0.0.0-20221117234814-4565692c50a7 h1:q9m1bGHhQFUakQX79lZpLmFSY9VLULNSs2jUG8MdJLA= +go.opentelemetry.io/collector/component v0.0.0-20221117234814-4565692c50a7/go.mod h1:Z7H1Oj826e4dtVxXmT6SiUr6S0EIevUJmkVpfQV+UOk= +go.opentelemetry.io/collector/consumer v0.0.0-20221117234814-4565692c50a7 h1:FTy1JD9EJ7gq9SzlZoi2NkGcZ88+SwdiJav5uRcDEEY= +go.opentelemetry.io/collector/consumer v0.0.0-20221117234814-4565692c50a7/go.mod h1:86Elcw/LLrh90DprArogHMkBX3+UMu3tIgcVWF3mr6o= +go.opentelemetry.io/collector/featuregate v0.0.0-20221117214536-6a117bfc3737 h1:7sXg6M9Fw6rFVlX+iaWOMz6DFXEiroUdQer5kWGixwM= +go.opentelemetry.io/collector/featuregate v0.0.0-20221117214536-6a117bfc3737/go.mod h1:tewuFKJYalWBU0bmNKg++MC1ipINXUr6szYzOw2p1GI= +go.opentelemetry.io/collector/pdata v0.64.2-0.20221117234814-4565692c50a7 h1:IOFqfOu7fFxTgC7pvc2U7dk1/uFjwVQPK+CALiUvacI= +go.opentelemetry.io/collector/pdata v0.64.2-0.20221117234814-4565692c50a7/go.mod h1:0vynPfW2ZN7DltpcCFgCmTtWMQkCjp2a3TNt82YTCLQ= go.opentelemetry.io/otel v1.11.1 h1:4WLLAmcfkmDk2ukNXJyq3/kiz/3UzCaYq6PskJsaou4= go.opentelemetry.io/otel v1.11.1/go.mod h1:1nNhXBbWSD0nsL38H6btgnFN2k4i0sNLHNNMZMSbUGE= go.opentelemetry.io/otel/metric v0.33.0 h1:xQAyl7uGEYvrLAiV/09iTJlp1pZnQ9Wl793qbVvED1E= diff --git a/processor/deltatorateprocessor/config_test.go b/processor/deltatorateprocessor/config_test.go index c5550703880a9..3478947151ef0 100644 --- a/processor/deltatorateprocessor/config_test.go +++ b/processor/deltatorateprocessor/config_test.go @@ -62,10 +62,10 @@ func TestLoadConfig(t *testing.T) { require.NoError(t, component.UnmarshalProcessorConfig(sub, cfg)) if tt.expected == nil { - assert.EqualError(t, cfg.Validate(), tt.errorMessage) + assert.EqualError(t, component.ValidateConfig(cfg), tt.errorMessage) return } - assert.NoError(t, cfg.Validate()) + assert.NoError(t, component.ValidateConfig(cfg)) assert.Equal(t, tt.expected, cfg) }) } diff --git a/processor/deltatorateprocessor/factory.go b/processor/deltatorateprocessor/factory.go index 79a23c0a10c79..0baef1433db36 100644 --- a/processor/deltatorateprocessor/factory.go +++ b/processor/deltatorateprocessor/factory.go @@ -28,7 +28,7 @@ const ( // The value of "type" key in configuration. typeStr = "deltatorate" // The stability level of the processor. - stability = component.StabilityLevelInDevelopment + stability = component.StabilityLevelDevelopment ) var processorCapabilities = consumer.Capabilities{MutatesData: true} diff --git a/processor/deltatorateprocessor/go.mod b/processor/deltatorateprocessor/go.mod index 3cb387afce2b4..7d3d4ae4e6064 100644 --- a/processor/deltatorateprocessor/go.mod +++ b/processor/deltatorateprocessor/go.mod @@ -4,8 +4,10 @@ go 1.18 require ( github.com/stretchr/testify v1.8.1 - go.opentelemetry.io/collector v0.64.2-0.20221115155901-1550938c18fd - go.opentelemetry.io/collector/pdata v0.64.2-0.20221115155901-1550938c18fd + go.opentelemetry.io/collector v0.64.2-0.20221117234814-4565692c50a7 + go.opentelemetry.io/collector/component v0.0.0-20221117234814-4565692c50a7 + go.opentelemetry.io/collector/consumer v0.0.0-20221117234814-4565692c50a7 + go.opentelemetry.io/collector/pdata v0.64.2-0.20221117234814-4565692c50a7 go.uber.org/zap v1.23.0 ) @@ -25,6 +27,7 @@ require ( github.com/pelletier/go-toml v1.9.4 // indirect github.com/pmezard/go-difflib v1.0.0 // indirect go.opencensus.io v0.24.0 // indirect + go.opentelemetry.io/collector/featuregate v0.0.0-20221117214536-6a117bfc3737 // indirect go.opentelemetry.io/otel v1.11.1 // indirect go.opentelemetry.io/otel/metric v0.33.0 // indirect go.opentelemetry.io/otel/trace v1.11.1 // indirect diff --git a/processor/deltatorateprocessor/go.sum b/processor/deltatorateprocessor/go.sum index 32ca46120a3d2..4b2d92bc7b4a4 100644 --- a/processor/deltatorateprocessor/go.sum +++ b/processor/deltatorateprocessor/go.sum @@ -270,10 +270,16 @@ go.etcd.io/etcd/client/pkg/v3 v3.5.4/go.mod h1:IJHfcCEKxYu1Os13ZdwCwIUTUVGYTSAM3 go.etcd.io/etcd/client/v3 v3.5.4/go.mod h1:ZaRkVgBZC+L+dLCjTcF1hRXpgZXQPOvnA/Ak/gq3kiY= go.opencensus.io v0.24.0 h1:y73uSU6J157QMP2kn2r30vwW1A2W2WFwSCGnAVxeaD0= go.opencensus.io v0.24.0/go.mod h1:vNK8G9p7aAivkbmorf4v+7Hgx+Zs0yY+0fOtgBfjQKo= -go.opentelemetry.io/collector v0.64.2-0.20221115155901-1550938c18fd h1:O+6HhE4Ivg8Jksp3dIXIEC4FIR0Ush4uORvG3UtHZWk= -go.opentelemetry.io/collector v0.64.2-0.20221115155901-1550938c18fd/go.mod h1:mmSrOcwe1vEYmChXUYuF6rzlrUL0rjEiPfa19Xxb41o= -go.opentelemetry.io/collector/pdata v0.64.2-0.20221115155901-1550938c18fd h1:GdVAbRiae5VDZe3Mn3FqzMxO/aI5UbJ4+dcviqClHy8= -go.opentelemetry.io/collector/pdata v0.64.2-0.20221115155901-1550938c18fd/go.mod h1:0vynPfW2ZN7DltpcCFgCmTtWMQkCjp2a3TNt82YTCLQ= +go.opentelemetry.io/collector v0.64.2-0.20221117234814-4565692c50a7 h1:o/vMr2iyXzaeTb/KAldhMxAvRIfFPwtKfL5cKVKsSlU= +go.opentelemetry.io/collector v0.64.2-0.20221117234814-4565692c50a7/go.mod h1:PO8hayFFYvXDqELbXRVxwawR2HTdjN6mY4Qa3Se9xI8= +go.opentelemetry.io/collector/component v0.0.0-20221117234814-4565692c50a7 h1:q9m1bGHhQFUakQX79lZpLmFSY9VLULNSs2jUG8MdJLA= +go.opentelemetry.io/collector/component v0.0.0-20221117234814-4565692c50a7/go.mod h1:Z7H1Oj826e4dtVxXmT6SiUr6S0EIevUJmkVpfQV+UOk= +go.opentelemetry.io/collector/consumer v0.0.0-20221117234814-4565692c50a7 h1:FTy1JD9EJ7gq9SzlZoi2NkGcZ88+SwdiJav5uRcDEEY= +go.opentelemetry.io/collector/consumer v0.0.0-20221117234814-4565692c50a7/go.mod h1:86Elcw/LLrh90DprArogHMkBX3+UMu3tIgcVWF3mr6o= +go.opentelemetry.io/collector/featuregate v0.0.0-20221117214536-6a117bfc3737 h1:7sXg6M9Fw6rFVlX+iaWOMz6DFXEiroUdQer5kWGixwM= +go.opentelemetry.io/collector/featuregate v0.0.0-20221117214536-6a117bfc3737/go.mod h1:tewuFKJYalWBU0bmNKg++MC1ipINXUr6szYzOw2p1GI= +go.opentelemetry.io/collector/pdata v0.64.2-0.20221117234814-4565692c50a7 h1:IOFqfOu7fFxTgC7pvc2U7dk1/uFjwVQPK+CALiUvacI= +go.opentelemetry.io/collector/pdata v0.64.2-0.20221117234814-4565692c50a7/go.mod h1:0vynPfW2ZN7DltpcCFgCmTtWMQkCjp2a3TNt82YTCLQ= go.opentelemetry.io/otel v1.11.1 h1:4WLLAmcfkmDk2ukNXJyq3/kiz/3UzCaYq6PskJsaou4= go.opentelemetry.io/otel v1.11.1/go.mod h1:1nNhXBbWSD0nsL38H6btgnFN2k4i0sNLHNNMZMSbUGE= go.opentelemetry.io/otel/metric v0.33.0 h1:xQAyl7uGEYvrLAiV/09iTJlp1pZnQ9Wl793qbVvED1E= diff --git a/processor/filterprocessor/config_test.go b/processor/filterprocessor/config_test.go index 5832b04bea816..dbc0402735031 100644 --- a/processor/filterprocessor/config_test.go +++ b/processor/filterprocessor/config_test.go @@ -100,7 +100,7 @@ func TestLoadingConfigStrict(t *testing.T) { require.NoError(t, err) require.NoError(t, component.UnmarshalProcessorConfig(sub, cfg)) - assert.NoError(t, cfg.Validate()) + assert.NoError(t, component.ValidateConfig(cfg)) assert.Equal(t, tt.expected, cfg) }) } @@ -183,7 +183,7 @@ func TestLoadingConfigStrictLogs(t *testing.T) { require.NoError(t, err) require.NoError(t, component.UnmarshalProcessorConfig(sub, cfg)) - assert.NoError(t, cfg.Validate()) + assert.NoError(t, component.ValidateConfig(cfg)) assert.Equal(t, tt.expected, cfg) }) } @@ -246,7 +246,7 @@ func TestLoadingConfigSeverityLogsStrict(t *testing.T) { require.NoError(t, err) require.NoError(t, component.UnmarshalProcessorConfig(sub, cfg)) - assert.NoError(t, cfg.Validate()) + assert.NoError(t, component.ValidateConfig(cfg)) assert.Equal(t, tt.expected, cfg) }) } @@ -308,7 +308,7 @@ func TestLoadingConfigSeverityLogsRegexp(t *testing.T) { require.NoError(t, err) require.NoError(t, component.UnmarshalProcessorConfig(sub, cfg)) - assert.NoError(t, cfg.Validate()) + assert.NoError(t, component.ValidateConfig(cfg)) assert.Equal(t, tt.expected, cfg) }) } @@ -371,7 +371,7 @@ func TestLoadingConfigBodyLogsStrict(t *testing.T) { require.NoError(t, err) require.NoError(t, component.UnmarshalProcessorConfig(sub, cfg)) - assert.NoError(t, cfg.Validate()) + assert.NoError(t, component.ValidateConfig(cfg)) assert.Equal(t, tt.expected, cfg) }) } @@ -434,7 +434,7 @@ func TestLoadingConfigBodyLogsRegexp(t *testing.T) { require.NoError(t, err) require.NoError(t, component.UnmarshalProcessorConfig(sub, cfg)) - assert.NoError(t, cfg.Validate()) + assert.NoError(t, component.ValidateConfig(cfg)) assert.Equal(t, tt.expected, cfg) }) } @@ -499,7 +499,7 @@ func TestLoadingConfigMinSeverityNumberLogs(t *testing.T) { require.NoError(t, err) require.NoError(t, component.UnmarshalProcessorConfig(sub, cfg)) - assert.NoError(t, cfg.Validate()) + assert.NoError(t, component.ValidateConfig(cfg)) assert.Equal(t, tt.expected, cfg) }) } @@ -588,7 +588,7 @@ func TestLoadingConfigRegexp(t *testing.T) { require.NoError(t, err) require.NoError(t, component.UnmarshalProcessorConfig(sub, cfg)) - assert.NoError(t, cfg.Validate()) + assert.NoError(t, component.ValidateConfig(cfg)) assert.Equal(t, tt.expected, cfg) }) } @@ -638,7 +638,7 @@ func TestLoadingSpans(t *testing.T) { require.NoError(t, err) require.NoError(t, component.UnmarshalProcessorConfig(sub, cfg)) - assert.NoError(t, cfg.Validate()) + assert.NoError(t, component.ValidateConfig(cfg)) assert.Equal(t, tt.expected, cfg) }) } @@ -723,7 +723,7 @@ func TestLoadingConfigExpr(t *testing.T) { require.NoError(t, err) require.NoError(t, component.UnmarshalProcessorConfig(sub, cfg)) - assert.NoError(t, cfg.Validate()) + assert.NoError(t, component.ValidateConfig(cfg)) assert.Equal(t, tt.expected, cfg) }) } diff --git a/processor/filterprocessor/go.mod b/processor/filterprocessor/go.mod index 1bb6d5aa4d6d9..6b2d8fc5457fd 100644 --- a/processor/filterprocessor/go.mod +++ b/processor/filterprocessor/go.mod @@ -5,8 +5,10 @@ go 1.18 require ( github.com/open-telemetry/opentelemetry-collector-contrib/internal/coreinternal v0.64.0 github.com/stretchr/testify v1.8.1 - go.opentelemetry.io/collector v0.64.2-0.20221115155901-1550938c18fd - go.opentelemetry.io/collector/pdata v0.64.2-0.20221115155901-1550938c18fd + go.opentelemetry.io/collector v0.64.2-0.20221117234814-4565692c50a7 + go.opentelemetry.io/collector/component v0.0.0-20221117234814-4565692c50a7 + go.opentelemetry.io/collector/consumer v0.0.0-20221117234814-4565692c50a7 + go.opentelemetry.io/collector/pdata v0.64.2-0.20221117234814-4565692c50a7 go.uber.org/multierr v1.8.0 go.uber.org/zap v1.23.0 ) @@ -27,7 +29,8 @@ require ( github.com/pmezard/go-difflib v1.0.0 // indirect github.com/spf13/cast v1.5.0 // indirect go.opencensus.io v0.24.0 // indirect - go.opentelemetry.io/collector/semconv v0.64.2-0.20221115155901-1550938c18fd // indirect + go.opentelemetry.io/collector/featuregate v0.0.0-20221117214536-6a117bfc3737 // indirect + go.opentelemetry.io/collector/semconv v0.64.2-0.20221117234814-4565692c50a7 // indirect go.opentelemetry.io/otel v1.11.1 // indirect go.opentelemetry.io/otel/metric v0.33.0 // indirect go.opentelemetry.io/otel/trace v1.11.1 // indirect diff --git a/processor/filterprocessor/go.sum b/processor/filterprocessor/go.sum index 835793d99fe80..13853ced58b2e 100644 --- a/processor/filterprocessor/go.sum +++ b/processor/filterprocessor/go.sum @@ -276,12 +276,18 @@ go.etcd.io/etcd/client/pkg/v3 v3.5.4/go.mod h1:IJHfcCEKxYu1Os13ZdwCwIUTUVGYTSAM3 go.etcd.io/etcd/client/v3 v3.5.4/go.mod h1:ZaRkVgBZC+L+dLCjTcF1hRXpgZXQPOvnA/Ak/gq3kiY= go.opencensus.io v0.24.0 h1:y73uSU6J157QMP2kn2r30vwW1A2W2WFwSCGnAVxeaD0= go.opencensus.io v0.24.0/go.mod h1:vNK8G9p7aAivkbmorf4v+7Hgx+Zs0yY+0fOtgBfjQKo= -go.opentelemetry.io/collector v0.64.2-0.20221115155901-1550938c18fd h1:O+6HhE4Ivg8Jksp3dIXIEC4FIR0Ush4uORvG3UtHZWk= -go.opentelemetry.io/collector v0.64.2-0.20221115155901-1550938c18fd/go.mod h1:mmSrOcwe1vEYmChXUYuF6rzlrUL0rjEiPfa19Xxb41o= -go.opentelemetry.io/collector/pdata v0.64.2-0.20221115155901-1550938c18fd h1:GdVAbRiae5VDZe3Mn3FqzMxO/aI5UbJ4+dcviqClHy8= -go.opentelemetry.io/collector/pdata v0.64.2-0.20221115155901-1550938c18fd/go.mod h1:0vynPfW2ZN7DltpcCFgCmTtWMQkCjp2a3TNt82YTCLQ= -go.opentelemetry.io/collector/semconv v0.64.2-0.20221115155901-1550938c18fd h1:rMqcl2pwi8YtVrtOPK8tVh87W0bFBge4yqB9ypSsAJ4= -go.opentelemetry.io/collector/semconv v0.64.2-0.20221115155901-1550938c18fd/go.mod h1:5o9yhOa+ABt7g2E5JABDxGZ1PQPbtfxrKNbYn+LOTXU= +go.opentelemetry.io/collector v0.64.2-0.20221117234814-4565692c50a7 h1:o/vMr2iyXzaeTb/KAldhMxAvRIfFPwtKfL5cKVKsSlU= +go.opentelemetry.io/collector v0.64.2-0.20221117234814-4565692c50a7/go.mod h1:PO8hayFFYvXDqELbXRVxwawR2HTdjN6mY4Qa3Se9xI8= +go.opentelemetry.io/collector/component v0.0.0-20221117234814-4565692c50a7 h1:q9m1bGHhQFUakQX79lZpLmFSY9VLULNSs2jUG8MdJLA= +go.opentelemetry.io/collector/component v0.0.0-20221117234814-4565692c50a7/go.mod h1:Z7H1Oj826e4dtVxXmT6SiUr6S0EIevUJmkVpfQV+UOk= +go.opentelemetry.io/collector/consumer v0.0.0-20221117234814-4565692c50a7 h1:FTy1JD9EJ7gq9SzlZoi2NkGcZ88+SwdiJav5uRcDEEY= +go.opentelemetry.io/collector/consumer v0.0.0-20221117234814-4565692c50a7/go.mod h1:86Elcw/LLrh90DprArogHMkBX3+UMu3tIgcVWF3mr6o= +go.opentelemetry.io/collector/featuregate v0.0.0-20221117214536-6a117bfc3737 h1:7sXg6M9Fw6rFVlX+iaWOMz6DFXEiroUdQer5kWGixwM= +go.opentelemetry.io/collector/featuregate v0.0.0-20221117214536-6a117bfc3737/go.mod h1:tewuFKJYalWBU0bmNKg++MC1ipINXUr6szYzOw2p1GI= +go.opentelemetry.io/collector/pdata v0.64.2-0.20221117234814-4565692c50a7 h1:IOFqfOu7fFxTgC7pvc2U7dk1/uFjwVQPK+CALiUvacI= +go.opentelemetry.io/collector/pdata v0.64.2-0.20221117234814-4565692c50a7/go.mod h1:0vynPfW2ZN7DltpcCFgCmTtWMQkCjp2a3TNt82YTCLQ= +go.opentelemetry.io/collector/semconv v0.64.2-0.20221117234814-4565692c50a7 h1:cGXAVltDxXw9nj0Vr7vyZZTj0whdyO+GYs+xv0xHJ2A= +go.opentelemetry.io/collector/semconv v0.64.2-0.20221117234814-4565692c50a7/go.mod h1:5o9yhOa+ABt7g2E5JABDxGZ1PQPbtfxrKNbYn+LOTXU= go.opentelemetry.io/otel v1.11.1 h1:4WLLAmcfkmDk2ukNXJyq3/kiz/3UzCaYq6PskJsaou4= go.opentelemetry.io/otel v1.11.1/go.mod h1:1nNhXBbWSD0nsL38H6btgnFN2k4i0sNLHNNMZMSbUGE= go.opentelemetry.io/otel/metric v0.33.0 h1:xQAyl7uGEYvrLAiV/09iTJlp1pZnQ9Wl793qbVvED1E= diff --git a/processor/groupbyattrsprocessor/config_test.go b/processor/groupbyattrsprocessor/config_test.go index 0aea4a00ad6e3..1ec8c1b9991e0 100644 --- a/processor/groupbyattrsprocessor/config_test.go +++ b/processor/groupbyattrsprocessor/config_test.go @@ -60,7 +60,7 @@ func TestLoadingConfig(t *testing.T) { require.NoError(t, err) require.NoError(t, component.UnmarshalProcessorConfig(sub, cfg)) - assert.NoError(t, cfg.Validate()) + assert.NoError(t, component.ValidateConfig(cfg)) assert.Equal(t, tt.expected, cfg) }) } diff --git a/processor/groupbyattrsprocessor/go.mod b/processor/groupbyattrsprocessor/go.mod index 55d3e1fb47ee6..8c9b60542fecc 100644 --- a/processor/groupbyattrsprocessor/go.mod +++ b/processor/groupbyattrsprocessor/go.mod @@ -5,8 +5,10 @@ go 1.18 require ( github.com/stretchr/testify v1.8.1 go.opencensus.io v0.24.0 - go.opentelemetry.io/collector v0.64.2-0.20221115155901-1550938c18fd - go.opentelemetry.io/collector/pdata v0.64.2-0.20221115155901-1550938c18fd + go.opentelemetry.io/collector v0.64.2-0.20221117234814-4565692c50a7 + go.opentelemetry.io/collector/component v0.0.0-20221117234814-4565692c50a7 + go.opentelemetry.io/collector/consumer v0.0.0-20221117234814-4565692c50a7 + go.opentelemetry.io/collector/pdata v0.64.2-0.20221117234814-4565692c50a7 go.uber.org/zap v1.23.0 ) @@ -25,6 +27,7 @@ require ( github.com/modern-go/reflect2 v1.0.2 // indirect github.com/pelletier/go-toml v1.9.4 // indirect github.com/pmezard/go-difflib v1.0.0 // indirect + go.opentelemetry.io/collector/featuregate v0.0.0-20221117214536-6a117bfc3737 // indirect go.opentelemetry.io/otel v1.11.1 // indirect go.opentelemetry.io/otel/metric v0.33.0 // indirect go.opentelemetry.io/otel/trace v1.11.1 // indirect diff --git a/processor/groupbyattrsprocessor/go.sum b/processor/groupbyattrsprocessor/go.sum index 2bf3cabe9c4c2..ed79f03d0ad85 100644 --- a/processor/groupbyattrsprocessor/go.sum +++ b/processor/groupbyattrsprocessor/go.sum @@ -284,10 +284,16 @@ go.etcd.io/etcd/client/pkg/v3 v3.5.4/go.mod h1:IJHfcCEKxYu1Os13ZdwCwIUTUVGYTSAM3 go.etcd.io/etcd/client/v3 v3.5.4/go.mod h1:ZaRkVgBZC+L+dLCjTcF1hRXpgZXQPOvnA/Ak/gq3kiY= go.opencensus.io v0.24.0 h1:y73uSU6J157QMP2kn2r30vwW1A2W2WFwSCGnAVxeaD0= go.opencensus.io v0.24.0/go.mod h1:vNK8G9p7aAivkbmorf4v+7Hgx+Zs0yY+0fOtgBfjQKo= -go.opentelemetry.io/collector v0.64.2-0.20221115155901-1550938c18fd h1:O+6HhE4Ivg8Jksp3dIXIEC4FIR0Ush4uORvG3UtHZWk= -go.opentelemetry.io/collector v0.64.2-0.20221115155901-1550938c18fd/go.mod h1:mmSrOcwe1vEYmChXUYuF6rzlrUL0rjEiPfa19Xxb41o= -go.opentelemetry.io/collector/pdata v0.64.2-0.20221115155901-1550938c18fd h1:GdVAbRiae5VDZe3Mn3FqzMxO/aI5UbJ4+dcviqClHy8= -go.opentelemetry.io/collector/pdata v0.64.2-0.20221115155901-1550938c18fd/go.mod h1:0vynPfW2ZN7DltpcCFgCmTtWMQkCjp2a3TNt82YTCLQ= +go.opentelemetry.io/collector v0.64.2-0.20221117234814-4565692c50a7 h1:o/vMr2iyXzaeTb/KAldhMxAvRIfFPwtKfL5cKVKsSlU= +go.opentelemetry.io/collector v0.64.2-0.20221117234814-4565692c50a7/go.mod h1:PO8hayFFYvXDqELbXRVxwawR2HTdjN6mY4Qa3Se9xI8= +go.opentelemetry.io/collector/component v0.0.0-20221117234814-4565692c50a7 h1:q9m1bGHhQFUakQX79lZpLmFSY9VLULNSs2jUG8MdJLA= +go.opentelemetry.io/collector/component v0.0.0-20221117234814-4565692c50a7/go.mod h1:Z7H1Oj826e4dtVxXmT6SiUr6S0EIevUJmkVpfQV+UOk= +go.opentelemetry.io/collector/consumer v0.0.0-20221117234814-4565692c50a7 h1:FTy1JD9EJ7gq9SzlZoi2NkGcZ88+SwdiJav5uRcDEEY= +go.opentelemetry.io/collector/consumer v0.0.0-20221117234814-4565692c50a7/go.mod h1:86Elcw/LLrh90DprArogHMkBX3+UMu3tIgcVWF3mr6o= +go.opentelemetry.io/collector/featuregate v0.0.0-20221117214536-6a117bfc3737 h1:7sXg6M9Fw6rFVlX+iaWOMz6DFXEiroUdQer5kWGixwM= +go.opentelemetry.io/collector/featuregate v0.0.0-20221117214536-6a117bfc3737/go.mod h1:tewuFKJYalWBU0bmNKg++MC1ipINXUr6szYzOw2p1GI= +go.opentelemetry.io/collector/pdata v0.64.2-0.20221117234814-4565692c50a7 h1:IOFqfOu7fFxTgC7pvc2U7dk1/uFjwVQPK+CALiUvacI= +go.opentelemetry.io/collector/pdata v0.64.2-0.20221117234814-4565692c50a7/go.mod h1:0vynPfW2ZN7DltpcCFgCmTtWMQkCjp2a3TNt82YTCLQ= go.opentelemetry.io/otel v1.11.1 h1:4WLLAmcfkmDk2ukNXJyq3/kiz/3UzCaYq6PskJsaou4= go.opentelemetry.io/otel v1.11.1/go.mod h1:1nNhXBbWSD0nsL38H6btgnFN2k4i0sNLHNNMZMSbUGE= go.opentelemetry.io/otel/exporters/prometheus v0.33.0 h1:xXhPj7SLKWU5/Zd4Hxmd+X1C4jdmvc0Xy+kvjFx2z60= diff --git a/processor/groupbytraceprocessor/go.mod b/processor/groupbytraceprocessor/go.mod index ee87d262c06da..74afe9d43e499 100644 --- a/processor/groupbytraceprocessor/go.mod +++ b/processor/groupbytraceprocessor/go.mod @@ -6,8 +6,10 @@ require ( github.com/open-telemetry/opentelemetry-collector-contrib/pkg/batchpersignal v0.64.0 github.com/stretchr/testify v1.8.1 go.opencensus.io v0.24.0 - go.opentelemetry.io/collector v0.64.2-0.20221115155901-1550938c18fd - go.opentelemetry.io/collector/pdata v0.64.2-0.20221115155901-1550938c18fd + go.opentelemetry.io/collector v0.64.2-0.20221117234814-4565692c50a7 + go.opentelemetry.io/collector/component v0.0.0-20221117234814-4565692c50a7 + go.opentelemetry.io/collector/consumer v0.0.0-20221117234814-4565692c50a7 + go.opentelemetry.io/collector/pdata v0.64.2-0.20221117234814-4565692c50a7 go.uber.org/atomic v1.10.0 go.uber.org/multierr v1.8.0 go.uber.org/zap v1.23.0 @@ -28,6 +30,7 @@ require ( github.com/modern-go/reflect2 v1.0.2 // indirect github.com/pelletier/go-toml v1.9.4 // indirect github.com/pmezard/go-difflib v1.0.0 // indirect + go.opentelemetry.io/collector/featuregate v0.0.0-20221117214536-6a117bfc3737 // indirect go.opentelemetry.io/otel v1.11.1 // indirect go.opentelemetry.io/otel/metric v0.33.0 // indirect go.opentelemetry.io/otel/trace v1.11.1 // indirect diff --git a/processor/groupbytraceprocessor/go.sum b/processor/groupbytraceprocessor/go.sum index 2bf3cabe9c4c2..ed79f03d0ad85 100644 --- a/processor/groupbytraceprocessor/go.sum +++ b/processor/groupbytraceprocessor/go.sum @@ -284,10 +284,16 @@ go.etcd.io/etcd/client/pkg/v3 v3.5.4/go.mod h1:IJHfcCEKxYu1Os13ZdwCwIUTUVGYTSAM3 go.etcd.io/etcd/client/v3 v3.5.4/go.mod h1:ZaRkVgBZC+L+dLCjTcF1hRXpgZXQPOvnA/Ak/gq3kiY= go.opencensus.io v0.24.0 h1:y73uSU6J157QMP2kn2r30vwW1A2W2WFwSCGnAVxeaD0= go.opencensus.io v0.24.0/go.mod h1:vNK8G9p7aAivkbmorf4v+7Hgx+Zs0yY+0fOtgBfjQKo= -go.opentelemetry.io/collector v0.64.2-0.20221115155901-1550938c18fd h1:O+6HhE4Ivg8Jksp3dIXIEC4FIR0Ush4uORvG3UtHZWk= -go.opentelemetry.io/collector v0.64.2-0.20221115155901-1550938c18fd/go.mod h1:mmSrOcwe1vEYmChXUYuF6rzlrUL0rjEiPfa19Xxb41o= -go.opentelemetry.io/collector/pdata v0.64.2-0.20221115155901-1550938c18fd h1:GdVAbRiae5VDZe3Mn3FqzMxO/aI5UbJ4+dcviqClHy8= -go.opentelemetry.io/collector/pdata v0.64.2-0.20221115155901-1550938c18fd/go.mod h1:0vynPfW2ZN7DltpcCFgCmTtWMQkCjp2a3TNt82YTCLQ= +go.opentelemetry.io/collector v0.64.2-0.20221117234814-4565692c50a7 h1:o/vMr2iyXzaeTb/KAldhMxAvRIfFPwtKfL5cKVKsSlU= +go.opentelemetry.io/collector v0.64.2-0.20221117234814-4565692c50a7/go.mod h1:PO8hayFFYvXDqELbXRVxwawR2HTdjN6mY4Qa3Se9xI8= +go.opentelemetry.io/collector/component v0.0.0-20221117234814-4565692c50a7 h1:q9m1bGHhQFUakQX79lZpLmFSY9VLULNSs2jUG8MdJLA= +go.opentelemetry.io/collector/component v0.0.0-20221117234814-4565692c50a7/go.mod h1:Z7H1Oj826e4dtVxXmT6SiUr6S0EIevUJmkVpfQV+UOk= +go.opentelemetry.io/collector/consumer v0.0.0-20221117234814-4565692c50a7 h1:FTy1JD9EJ7gq9SzlZoi2NkGcZ88+SwdiJav5uRcDEEY= +go.opentelemetry.io/collector/consumer v0.0.0-20221117234814-4565692c50a7/go.mod h1:86Elcw/LLrh90DprArogHMkBX3+UMu3tIgcVWF3mr6o= +go.opentelemetry.io/collector/featuregate v0.0.0-20221117214536-6a117bfc3737 h1:7sXg6M9Fw6rFVlX+iaWOMz6DFXEiroUdQer5kWGixwM= +go.opentelemetry.io/collector/featuregate v0.0.0-20221117214536-6a117bfc3737/go.mod h1:tewuFKJYalWBU0bmNKg++MC1ipINXUr6szYzOw2p1GI= +go.opentelemetry.io/collector/pdata v0.64.2-0.20221117234814-4565692c50a7 h1:IOFqfOu7fFxTgC7pvc2U7dk1/uFjwVQPK+CALiUvacI= +go.opentelemetry.io/collector/pdata v0.64.2-0.20221117234814-4565692c50a7/go.mod h1:0vynPfW2ZN7DltpcCFgCmTtWMQkCjp2a3TNt82YTCLQ= go.opentelemetry.io/otel v1.11.1 h1:4WLLAmcfkmDk2ukNXJyq3/kiz/3UzCaYq6PskJsaou4= go.opentelemetry.io/otel v1.11.1/go.mod h1:1nNhXBbWSD0nsL38H6btgnFN2k4i0sNLHNNMZMSbUGE= go.opentelemetry.io/otel/exporters/prometheus v0.33.0 h1:xXhPj7SLKWU5/Zd4Hxmd+X1C4jdmvc0Xy+kvjFx2z60= diff --git a/processor/k8sattributesprocessor/config_test.go b/processor/k8sattributesprocessor/config_test.go index d689b3d3eae17..89fafc94223bf 100644 --- a/processor/k8sattributesprocessor/config_test.go +++ b/processor/k8sattributesprocessor/config_test.go @@ -156,7 +156,7 @@ func TestLoadConfig(t *testing.T) { require.NoError(t, err) require.NoError(t, component.UnmarshalProcessorConfig(sub, cfg)) - assert.NoError(t, cfg.Validate()) + assert.NoError(t, component.ValidateConfig(cfg)) assert.Equal(t, tt.expected, cfg) }) } diff --git a/processor/k8sattributesprocessor/go.mod b/processor/k8sattributesprocessor/go.mod index c5a6d01710b52..1ab8895d611c4 100644 --- a/processor/k8sattributesprocessor/go.mod +++ b/processor/k8sattributesprocessor/go.mod @@ -6,9 +6,11 @@ require ( github.com/open-telemetry/opentelemetry-collector-contrib/internal/k8sconfig v0.64.0 github.com/stretchr/testify v1.8.1 go.opencensus.io v0.24.0 - go.opentelemetry.io/collector v0.64.2-0.20221115155901-1550938c18fd - go.opentelemetry.io/collector/pdata v0.64.2-0.20221115155901-1550938c18fd - go.opentelemetry.io/collector/semconv v0.64.2-0.20221115155901-1550938c18fd + go.opentelemetry.io/collector v0.64.2-0.20221117234814-4565692c50a7 + go.opentelemetry.io/collector/component v0.0.0-20221117234814-4565692c50a7 + go.opentelemetry.io/collector/consumer v0.0.0-20221117234814-4565692c50a7 + go.opentelemetry.io/collector/pdata v0.64.2-0.20221117234814-4565692c50a7 + go.opentelemetry.io/collector/semconv v0.64.2-0.20221117234814-4565692c50a7 go.uber.org/zap v1.23.0 k8s.io/api v0.25.4 k8s.io/apimachinery v0.25.4 @@ -50,6 +52,7 @@ require ( github.com/pkg/errors v0.9.1 // indirect github.com/pmezard/go-difflib v1.0.0 // indirect github.com/spf13/pflag v1.0.5 // indirect + go.opentelemetry.io/collector/featuregate v0.0.0-20221117214536-6a117bfc3737 // indirect go.opentelemetry.io/otel v1.11.1 // indirect go.opentelemetry.io/otel/metric v0.33.0 // indirect go.opentelemetry.io/otel/trace v1.11.1 // indirect diff --git a/processor/k8sattributesprocessor/go.sum b/processor/k8sattributesprocessor/go.sum index 51ebef0f86e04..cb08ab6a8c536 100644 --- a/processor/k8sattributesprocessor/go.sum +++ b/processor/k8sattributesprocessor/go.sum @@ -438,12 +438,18 @@ go.opencensus.io v0.22.3/go.mod h1:yxeiOL68Rb0Xd1ddK5vPZ/oVn4vY4Ynel7k9FzqtOIw= go.opencensus.io v0.22.4/go.mod h1:yxeiOL68Rb0Xd1ddK5vPZ/oVn4vY4Ynel7k9FzqtOIw= go.opencensus.io v0.24.0 h1:y73uSU6J157QMP2kn2r30vwW1A2W2WFwSCGnAVxeaD0= go.opencensus.io v0.24.0/go.mod h1:vNK8G9p7aAivkbmorf4v+7Hgx+Zs0yY+0fOtgBfjQKo= -go.opentelemetry.io/collector v0.64.2-0.20221115155901-1550938c18fd h1:O+6HhE4Ivg8Jksp3dIXIEC4FIR0Ush4uORvG3UtHZWk= -go.opentelemetry.io/collector v0.64.2-0.20221115155901-1550938c18fd/go.mod h1:mmSrOcwe1vEYmChXUYuF6rzlrUL0rjEiPfa19Xxb41o= -go.opentelemetry.io/collector/pdata v0.64.2-0.20221115155901-1550938c18fd h1:GdVAbRiae5VDZe3Mn3FqzMxO/aI5UbJ4+dcviqClHy8= -go.opentelemetry.io/collector/pdata v0.64.2-0.20221115155901-1550938c18fd/go.mod h1:0vynPfW2ZN7DltpcCFgCmTtWMQkCjp2a3TNt82YTCLQ= -go.opentelemetry.io/collector/semconv v0.64.2-0.20221115155901-1550938c18fd h1:rMqcl2pwi8YtVrtOPK8tVh87W0bFBge4yqB9ypSsAJ4= -go.opentelemetry.io/collector/semconv v0.64.2-0.20221115155901-1550938c18fd/go.mod h1:5o9yhOa+ABt7g2E5JABDxGZ1PQPbtfxrKNbYn+LOTXU= +go.opentelemetry.io/collector v0.64.2-0.20221117234814-4565692c50a7 h1:o/vMr2iyXzaeTb/KAldhMxAvRIfFPwtKfL5cKVKsSlU= +go.opentelemetry.io/collector v0.64.2-0.20221117234814-4565692c50a7/go.mod h1:PO8hayFFYvXDqELbXRVxwawR2HTdjN6mY4Qa3Se9xI8= +go.opentelemetry.io/collector/component v0.0.0-20221117234814-4565692c50a7 h1:q9m1bGHhQFUakQX79lZpLmFSY9VLULNSs2jUG8MdJLA= +go.opentelemetry.io/collector/component v0.0.0-20221117234814-4565692c50a7/go.mod h1:Z7H1Oj826e4dtVxXmT6SiUr6S0EIevUJmkVpfQV+UOk= +go.opentelemetry.io/collector/consumer v0.0.0-20221117234814-4565692c50a7 h1:FTy1JD9EJ7gq9SzlZoi2NkGcZ88+SwdiJav5uRcDEEY= +go.opentelemetry.io/collector/consumer v0.0.0-20221117234814-4565692c50a7/go.mod h1:86Elcw/LLrh90DprArogHMkBX3+UMu3tIgcVWF3mr6o= +go.opentelemetry.io/collector/featuregate v0.0.0-20221117214536-6a117bfc3737 h1:7sXg6M9Fw6rFVlX+iaWOMz6DFXEiroUdQer5kWGixwM= +go.opentelemetry.io/collector/featuregate v0.0.0-20221117214536-6a117bfc3737/go.mod h1:tewuFKJYalWBU0bmNKg++MC1ipINXUr6szYzOw2p1GI= +go.opentelemetry.io/collector/pdata v0.64.2-0.20221117234814-4565692c50a7 h1:IOFqfOu7fFxTgC7pvc2U7dk1/uFjwVQPK+CALiUvacI= +go.opentelemetry.io/collector/pdata v0.64.2-0.20221117234814-4565692c50a7/go.mod h1:0vynPfW2ZN7DltpcCFgCmTtWMQkCjp2a3TNt82YTCLQ= +go.opentelemetry.io/collector/semconv v0.64.2-0.20221117234814-4565692c50a7 h1:cGXAVltDxXw9nj0Vr7vyZZTj0whdyO+GYs+xv0xHJ2A= +go.opentelemetry.io/collector/semconv v0.64.2-0.20221117234814-4565692c50a7/go.mod h1:5o9yhOa+ABt7g2E5JABDxGZ1PQPbtfxrKNbYn+LOTXU= go.opentelemetry.io/otel v1.11.1 h1:4WLLAmcfkmDk2ukNXJyq3/kiz/3UzCaYq6PskJsaou4= go.opentelemetry.io/otel v1.11.1/go.mod h1:1nNhXBbWSD0nsL38H6btgnFN2k4i0sNLHNNMZMSbUGE= go.opentelemetry.io/otel/metric v0.33.0 h1:xQAyl7uGEYvrLAiV/09iTJlp1pZnQ9Wl793qbVvED1E= diff --git a/processor/logstransformprocessor/factory.go b/processor/logstransformprocessor/factory.go index b0a36ceb6e167..35c76925253df 100644 --- a/processor/logstransformprocessor/factory.go +++ b/processor/logstransformprocessor/factory.go @@ -31,7 +31,7 @@ const ( // The value of "type" key in configuration. typeStr = "logstransform" // The stability level of the processor. - stability = component.StabilityLevelInDevelopment + stability = component.StabilityLevelDevelopment ) var processorCapabilities = consumer.Capabilities{MutatesData: true} diff --git a/processor/logstransformprocessor/go.mod b/processor/logstransformprocessor/go.mod index 521d7b035560f..63c70abcffc71 100644 --- a/processor/logstransformprocessor/go.mod +++ b/processor/logstransformprocessor/go.mod @@ -6,8 +6,10 @@ require ( github.com/open-telemetry/opentelemetry-collector-contrib/internal/coreinternal v0.64.0 github.com/open-telemetry/opentelemetry-collector-contrib/pkg/stanza v0.64.0 github.com/stretchr/testify v1.8.1 - go.opentelemetry.io/collector v0.64.2-0.20221115155901-1550938c18fd - go.opentelemetry.io/collector/pdata v0.64.2-0.20221115155901-1550938c18fd + go.opentelemetry.io/collector v0.64.2-0.20221117234814-4565692c50a7 + go.opentelemetry.io/collector/component v0.0.0-20221117234814-4565692c50a7 + go.opentelemetry.io/collector/consumer v0.0.0-20221117234814-4565692c50a7 + go.opentelemetry.io/collector/pdata v0.64.2-0.20221117234814-4565692c50a7 go.uber.org/zap v1.23.0 ) @@ -28,6 +30,7 @@ require ( github.com/pmezard/go-difflib v1.0.0 // indirect github.com/rogpeppe/go-internal v1.8.1 // indirect go.opencensus.io v0.24.0 // indirect + go.opentelemetry.io/collector/featuregate v0.0.0-20221117214536-6a117bfc3737 // indirect go.opentelemetry.io/otel v1.11.1 // indirect go.opentelemetry.io/otel/metric v0.33.0 // indirect go.opentelemetry.io/otel/trace v1.11.1 // indirect diff --git a/processor/logstransformprocessor/go.sum b/processor/logstransformprocessor/go.sum index 358580d8f9976..99dfc077d2ff2 100644 --- a/processor/logstransformprocessor/go.sum +++ b/processor/logstransformprocessor/go.sum @@ -295,10 +295,16 @@ go.etcd.io/etcd/client/pkg/v3 v3.5.4/go.mod h1:IJHfcCEKxYu1Os13ZdwCwIUTUVGYTSAM3 go.etcd.io/etcd/client/v3 v3.5.4/go.mod h1:ZaRkVgBZC+L+dLCjTcF1hRXpgZXQPOvnA/Ak/gq3kiY= go.opencensus.io v0.24.0 h1:y73uSU6J157QMP2kn2r30vwW1A2W2WFwSCGnAVxeaD0= go.opencensus.io v0.24.0/go.mod h1:vNK8G9p7aAivkbmorf4v+7Hgx+Zs0yY+0fOtgBfjQKo= -go.opentelemetry.io/collector v0.64.2-0.20221115155901-1550938c18fd h1:O+6HhE4Ivg8Jksp3dIXIEC4FIR0Ush4uORvG3UtHZWk= -go.opentelemetry.io/collector v0.64.2-0.20221115155901-1550938c18fd/go.mod h1:mmSrOcwe1vEYmChXUYuF6rzlrUL0rjEiPfa19Xxb41o= -go.opentelemetry.io/collector/pdata v0.64.2-0.20221115155901-1550938c18fd h1:GdVAbRiae5VDZe3Mn3FqzMxO/aI5UbJ4+dcviqClHy8= -go.opentelemetry.io/collector/pdata v0.64.2-0.20221115155901-1550938c18fd/go.mod h1:0vynPfW2ZN7DltpcCFgCmTtWMQkCjp2a3TNt82YTCLQ= +go.opentelemetry.io/collector v0.64.2-0.20221117234814-4565692c50a7 h1:o/vMr2iyXzaeTb/KAldhMxAvRIfFPwtKfL5cKVKsSlU= +go.opentelemetry.io/collector v0.64.2-0.20221117234814-4565692c50a7/go.mod h1:PO8hayFFYvXDqELbXRVxwawR2HTdjN6mY4Qa3Se9xI8= +go.opentelemetry.io/collector/component v0.0.0-20221117234814-4565692c50a7 h1:q9m1bGHhQFUakQX79lZpLmFSY9VLULNSs2jUG8MdJLA= +go.opentelemetry.io/collector/component v0.0.0-20221117234814-4565692c50a7/go.mod h1:Z7H1Oj826e4dtVxXmT6SiUr6S0EIevUJmkVpfQV+UOk= +go.opentelemetry.io/collector/consumer v0.0.0-20221117234814-4565692c50a7 h1:FTy1JD9EJ7gq9SzlZoi2NkGcZ88+SwdiJav5uRcDEEY= +go.opentelemetry.io/collector/consumer v0.0.0-20221117234814-4565692c50a7/go.mod h1:86Elcw/LLrh90DprArogHMkBX3+UMu3tIgcVWF3mr6o= +go.opentelemetry.io/collector/featuregate v0.0.0-20221117214536-6a117bfc3737 h1:7sXg6M9Fw6rFVlX+iaWOMz6DFXEiroUdQer5kWGixwM= +go.opentelemetry.io/collector/featuregate v0.0.0-20221117214536-6a117bfc3737/go.mod h1:tewuFKJYalWBU0bmNKg++MC1ipINXUr6szYzOw2p1GI= +go.opentelemetry.io/collector/pdata v0.64.2-0.20221117234814-4565692c50a7 h1:IOFqfOu7fFxTgC7pvc2U7dk1/uFjwVQPK+CALiUvacI= +go.opentelemetry.io/collector/pdata v0.64.2-0.20221117234814-4565692c50a7/go.mod h1:0vynPfW2ZN7DltpcCFgCmTtWMQkCjp2a3TNt82YTCLQ= go.opentelemetry.io/otel v1.11.1 h1:4WLLAmcfkmDk2ukNXJyq3/kiz/3UzCaYq6PskJsaou4= go.opentelemetry.io/otel v1.11.1/go.mod h1:1nNhXBbWSD0nsL38H6btgnFN2k4i0sNLHNNMZMSbUGE= go.opentelemetry.io/otel/exporters/prometheus v0.33.0 h1:xXhPj7SLKWU5/Zd4Hxmd+X1C4jdmvc0Xy+kvjFx2z60= diff --git a/processor/metricsgenerationprocessor/config_test.go b/processor/metricsgenerationprocessor/config_test.go index 89a4eb020ce95..c0dab3ee7074a 100644 --- a/processor/metricsgenerationprocessor/config_test.go +++ b/processor/metricsgenerationprocessor/config_test.go @@ -100,10 +100,10 @@ func TestLoadConfig(t *testing.T) { require.NoError(t, component.UnmarshalProcessorConfig(sub, cfg)) if tt.expected == nil { - assert.EqualError(t, cfg.Validate(), tt.errorMessage) + assert.EqualError(t, component.ValidateConfig(cfg), tt.errorMessage) return } - assert.NoError(t, cfg.Validate()) + assert.NoError(t, component.ValidateConfig(cfg)) assert.Equal(t, tt.expected, cfg) }) } diff --git a/processor/metricsgenerationprocessor/factory.go b/processor/metricsgenerationprocessor/factory.go index e8139b796b2a5..065f02bfdb4b9 100644 --- a/processor/metricsgenerationprocessor/factory.go +++ b/processor/metricsgenerationprocessor/factory.go @@ -28,7 +28,7 @@ const ( // The value of "type" key in configuration. typeStr = "experimental_metricsgeneration" // The stability level of the processor. - stability = component.StabilityLevelInDevelopment + stability = component.StabilityLevelDevelopment ) var processorCapabilities = consumer.Capabilities{MutatesData: true} diff --git a/processor/metricsgenerationprocessor/go.mod b/processor/metricsgenerationprocessor/go.mod index 4cb957812caf5..479c20f6d6b9a 100644 --- a/processor/metricsgenerationprocessor/go.mod +++ b/processor/metricsgenerationprocessor/go.mod @@ -4,8 +4,10 @@ go 1.18 require ( github.com/stretchr/testify v1.8.1 - go.opentelemetry.io/collector v0.64.2-0.20221115155901-1550938c18fd - go.opentelemetry.io/collector/pdata v0.64.2-0.20221115155901-1550938c18fd + go.opentelemetry.io/collector v0.64.2-0.20221117234814-4565692c50a7 + go.opentelemetry.io/collector/component v0.0.0-20221117234814-4565692c50a7 + go.opentelemetry.io/collector/consumer v0.0.0-20221117234814-4565692c50a7 + go.opentelemetry.io/collector/pdata v0.64.2-0.20221117234814-4565692c50a7 go.uber.org/zap v1.23.0 ) @@ -25,6 +27,7 @@ require ( github.com/pelletier/go-toml v1.9.4 // indirect github.com/pmezard/go-difflib v1.0.0 // indirect go.opencensus.io v0.24.0 // indirect + go.opentelemetry.io/collector/featuregate v0.0.0-20221117214536-6a117bfc3737 // indirect go.opentelemetry.io/otel v1.11.1 // indirect go.opentelemetry.io/otel/metric v0.33.0 // indirect go.opentelemetry.io/otel/trace v1.11.1 // indirect diff --git a/processor/metricsgenerationprocessor/go.sum b/processor/metricsgenerationprocessor/go.sum index 32ca46120a3d2..4b2d92bc7b4a4 100644 --- a/processor/metricsgenerationprocessor/go.sum +++ b/processor/metricsgenerationprocessor/go.sum @@ -270,10 +270,16 @@ go.etcd.io/etcd/client/pkg/v3 v3.5.4/go.mod h1:IJHfcCEKxYu1Os13ZdwCwIUTUVGYTSAM3 go.etcd.io/etcd/client/v3 v3.5.4/go.mod h1:ZaRkVgBZC+L+dLCjTcF1hRXpgZXQPOvnA/Ak/gq3kiY= go.opencensus.io v0.24.0 h1:y73uSU6J157QMP2kn2r30vwW1A2W2WFwSCGnAVxeaD0= go.opencensus.io v0.24.0/go.mod h1:vNK8G9p7aAivkbmorf4v+7Hgx+Zs0yY+0fOtgBfjQKo= -go.opentelemetry.io/collector v0.64.2-0.20221115155901-1550938c18fd h1:O+6HhE4Ivg8Jksp3dIXIEC4FIR0Ush4uORvG3UtHZWk= -go.opentelemetry.io/collector v0.64.2-0.20221115155901-1550938c18fd/go.mod h1:mmSrOcwe1vEYmChXUYuF6rzlrUL0rjEiPfa19Xxb41o= -go.opentelemetry.io/collector/pdata v0.64.2-0.20221115155901-1550938c18fd h1:GdVAbRiae5VDZe3Mn3FqzMxO/aI5UbJ4+dcviqClHy8= -go.opentelemetry.io/collector/pdata v0.64.2-0.20221115155901-1550938c18fd/go.mod h1:0vynPfW2ZN7DltpcCFgCmTtWMQkCjp2a3TNt82YTCLQ= +go.opentelemetry.io/collector v0.64.2-0.20221117234814-4565692c50a7 h1:o/vMr2iyXzaeTb/KAldhMxAvRIfFPwtKfL5cKVKsSlU= +go.opentelemetry.io/collector v0.64.2-0.20221117234814-4565692c50a7/go.mod h1:PO8hayFFYvXDqELbXRVxwawR2HTdjN6mY4Qa3Se9xI8= +go.opentelemetry.io/collector/component v0.0.0-20221117234814-4565692c50a7 h1:q9m1bGHhQFUakQX79lZpLmFSY9VLULNSs2jUG8MdJLA= +go.opentelemetry.io/collector/component v0.0.0-20221117234814-4565692c50a7/go.mod h1:Z7H1Oj826e4dtVxXmT6SiUr6S0EIevUJmkVpfQV+UOk= +go.opentelemetry.io/collector/consumer v0.0.0-20221117234814-4565692c50a7 h1:FTy1JD9EJ7gq9SzlZoi2NkGcZ88+SwdiJav5uRcDEEY= +go.opentelemetry.io/collector/consumer v0.0.0-20221117234814-4565692c50a7/go.mod h1:86Elcw/LLrh90DprArogHMkBX3+UMu3tIgcVWF3mr6o= +go.opentelemetry.io/collector/featuregate v0.0.0-20221117214536-6a117bfc3737 h1:7sXg6M9Fw6rFVlX+iaWOMz6DFXEiroUdQer5kWGixwM= +go.opentelemetry.io/collector/featuregate v0.0.0-20221117214536-6a117bfc3737/go.mod h1:tewuFKJYalWBU0bmNKg++MC1ipINXUr6szYzOw2p1GI= +go.opentelemetry.io/collector/pdata v0.64.2-0.20221117234814-4565692c50a7 h1:IOFqfOu7fFxTgC7pvc2U7dk1/uFjwVQPK+CALiUvacI= +go.opentelemetry.io/collector/pdata v0.64.2-0.20221117234814-4565692c50a7/go.mod h1:0vynPfW2ZN7DltpcCFgCmTtWMQkCjp2a3TNt82YTCLQ= go.opentelemetry.io/otel v1.11.1 h1:4WLLAmcfkmDk2ukNXJyq3/kiz/3UzCaYq6PskJsaou4= go.opentelemetry.io/otel v1.11.1/go.mod h1:1nNhXBbWSD0nsL38H6btgnFN2k4i0sNLHNNMZMSbUGE= go.opentelemetry.io/otel/metric v0.33.0 h1:xQAyl7uGEYvrLAiV/09iTJlp1pZnQ9Wl793qbVvED1E= diff --git a/processor/metricstransformprocessor/config_test.go b/processor/metricstransformprocessor/config_test.go index 38f41f378fdc2..b07c686c88812 100644 --- a/processor/metricstransformprocessor/config_test.go +++ b/processor/metricstransformprocessor/config_test.go @@ -168,7 +168,7 @@ func TestLoadConfig(t *testing.T) { require.NoError(t, err) require.NoError(t, component.UnmarshalProcessorConfig(sub, cfg)) - assert.NoError(t, cfg.Validate()) + assert.NoError(t, component.ValidateConfig(cfg)) assert.Equal(t, tt.expected, cfg) }) } diff --git a/processor/metricstransformprocessor/go.mod b/processor/metricstransformprocessor/go.mod index 5345c5d449cae..f87400aaa31e7 100644 --- a/processor/metricstransformprocessor/go.mod +++ b/processor/metricstransformprocessor/go.mod @@ -5,8 +5,10 @@ go 1.18 require ( github.com/open-telemetry/opentelemetry-collector-contrib/internal/scrapertest v0.64.0 github.com/stretchr/testify v1.8.1 - go.opentelemetry.io/collector v0.64.2-0.20221115155901-1550938c18fd - go.opentelemetry.io/collector/pdata v0.64.2-0.20221115155901-1550938c18fd + go.opentelemetry.io/collector v0.64.2-0.20221117234814-4565692c50a7 + go.opentelemetry.io/collector/component v0.0.0-20221117234814-4565692c50a7 + go.opentelemetry.io/collector/consumer v0.0.0-20221117234814-4565692c50a7 + go.opentelemetry.io/collector/pdata v0.64.2-0.20221117234814-4565692c50a7 go.uber.org/zap v1.23.0 ) @@ -27,6 +29,7 @@ require ( github.com/pmezard/go-difflib v1.0.0 // indirect github.com/rogpeppe/go-internal v1.8.1 // indirect go.opencensus.io v0.24.0 // indirect + go.opentelemetry.io/collector/featuregate v0.0.0-20221117214536-6a117bfc3737 // indirect go.opentelemetry.io/otel v1.11.1 // indirect go.opentelemetry.io/otel/metric v0.33.0 // indirect go.opentelemetry.io/otel/trace v1.11.1 // indirect diff --git a/processor/metricstransformprocessor/go.sum b/processor/metricstransformprocessor/go.sum index c456628f1505d..4dc52b5967ef6 100644 --- a/processor/metricstransformprocessor/go.sum +++ b/processor/metricstransformprocessor/go.sum @@ -264,10 +264,16 @@ go.etcd.io/etcd/client/pkg/v3 v3.5.4/go.mod h1:IJHfcCEKxYu1Os13ZdwCwIUTUVGYTSAM3 go.etcd.io/etcd/client/v3 v3.5.4/go.mod h1:ZaRkVgBZC+L+dLCjTcF1hRXpgZXQPOvnA/Ak/gq3kiY= go.opencensus.io v0.24.0 h1:y73uSU6J157QMP2kn2r30vwW1A2W2WFwSCGnAVxeaD0= go.opencensus.io v0.24.0/go.mod h1:vNK8G9p7aAivkbmorf4v+7Hgx+Zs0yY+0fOtgBfjQKo= -go.opentelemetry.io/collector v0.64.2-0.20221115155901-1550938c18fd h1:O+6HhE4Ivg8Jksp3dIXIEC4FIR0Ush4uORvG3UtHZWk= -go.opentelemetry.io/collector v0.64.2-0.20221115155901-1550938c18fd/go.mod h1:mmSrOcwe1vEYmChXUYuF6rzlrUL0rjEiPfa19Xxb41o= -go.opentelemetry.io/collector/pdata v0.64.2-0.20221115155901-1550938c18fd h1:GdVAbRiae5VDZe3Mn3FqzMxO/aI5UbJ4+dcviqClHy8= -go.opentelemetry.io/collector/pdata v0.64.2-0.20221115155901-1550938c18fd/go.mod h1:0vynPfW2ZN7DltpcCFgCmTtWMQkCjp2a3TNt82YTCLQ= +go.opentelemetry.io/collector v0.64.2-0.20221117234814-4565692c50a7 h1:o/vMr2iyXzaeTb/KAldhMxAvRIfFPwtKfL5cKVKsSlU= +go.opentelemetry.io/collector v0.64.2-0.20221117234814-4565692c50a7/go.mod h1:PO8hayFFYvXDqELbXRVxwawR2HTdjN6mY4Qa3Se9xI8= +go.opentelemetry.io/collector/component v0.0.0-20221117234814-4565692c50a7 h1:q9m1bGHhQFUakQX79lZpLmFSY9VLULNSs2jUG8MdJLA= +go.opentelemetry.io/collector/component v0.0.0-20221117234814-4565692c50a7/go.mod h1:Z7H1Oj826e4dtVxXmT6SiUr6S0EIevUJmkVpfQV+UOk= +go.opentelemetry.io/collector/consumer v0.0.0-20221117234814-4565692c50a7 h1:FTy1JD9EJ7gq9SzlZoi2NkGcZ88+SwdiJav5uRcDEEY= +go.opentelemetry.io/collector/consumer v0.0.0-20221117234814-4565692c50a7/go.mod h1:86Elcw/LLrh90DprArogHMkBX3+UMu3tIgcVWF3mr6o= +go.opentelemetry.io/collector/featuregate v0.0.0-20221117214536-6a117bfc3737 h1:7sXg6M9Fw6rFVlX+iaWOMz6DFXEiroUdQer5kWGixwM= +go.opentelemetry.io/collector/featuregate v0.0.0-20221117214536-6a117bfc3737/go.mod h1:tewuFKJYalWBU0bmNKg++MC1ipINXUr6szYzOw2p1GI= +go.opentelemetry.io/collector/pdata v0.64.2-0.20221117234814-4565692c50a7 h1:IOFqfOu7fFxTgC7pvc2U7dk1/uFjwVQPK+CALiUvacI= +go.opentelemetry.io/collector/pdata v0.64.2-0.20221117234814-4565692c50a7/go.mod h1:0vynPfW2ZN7DltpcCFgCmTtWMQkCjp2a3TNt82YTCLQ= go.opentelemetry.io/otel v1.11.1 h1:4WLLAmcfkmDk2ukNXJyq3/kiz/3UzCaYq6PskJsaou4= go.opentelemetry.io/otel v1.11.1/go.mod h1:1nNhXBbWSD0nsL38H6btgnFN2k4i0sNLHNNMZMSbUGE= go.opentelemetry.io/otel/metric v0.33.0 h1:xQAyl7uGEYvrLAiV/09iTJlp1pZnQ9Wl793qbVvED1E= diff --git a/processor/probabilisticsamplerprocessor/config_test.go b/processor/probabilisticsamplerprocessor/config_test.go index 7e564f0c1aa8b..66ac88332e77e 100644 --- a/processor/probabilisticsamplerprocessor/config_test.go +++ b/processor/probabilisticsamplerprocessor/config_test.go @@ -58,7 +58,7 @@ func TestLoadConfig(t *testing.T) { require.NoError(t, err) require.NoError(t, component.UnmarshalProcessorConfig(sub, cfg)) - assert.NoError(t, cfg.Validate()) + assert.NoError(t, component.ValidateConfig(cfg)) assert.Equal(t, tt.expected, cfg) }) } diff --git a/processor/probabilisticsamplerprocessor/go.mod b/processor/probabilisticsamplerprocessor/go.mod index 9cdcdc1cfc200..3305fceee054f 100644 --- a/processor/probabilisticsamplerprocessor/go.mod +++ b/processor/probabilisticsamplerprocessor/go.mod @@ -6,9 +6,11 @@ require ( github.com/open-telemetry/opentelemetry-collector-contrib/internal/coreinternal v0.64.0 github.com/stretchr/testify v1.8.1 go.opencensus.io v0.24.0 - go.opentelemetry.io/collector v0.64.2-0.20221115155901-1550938c18fd - go.opentelemetry.io/collector/pdata v0.64.2-0.20221115155901-1550938c18fd - go.opentelemetry.io/collector/semconv v0.64.2-0.20221115155901-1550938c18fd + go.opentelemetry.io/collector v0.64.2-0.20221117234814-4565692c50a7 + go.opentelemetry.io/collector/component v0.0.0-20221117234814-4565692c50a7 + go.opentelemetry.io/collector/consumer v0.0.0-20221117234814-4565692c50a7 + go.opentelemetry.io/collector/pdata v0.64.2-0.20221117234814-4565692c50a7 + go.opentelemetry.io/collector/semconv v0.64.2-0.20221117234814-4565692c50a7 go.uber.org/zap v1.23.0 ) @@ -25,6 +27,7 @@ require ( github.com/modern-go/concurrent v0.0.0-20180306012644-bacd9c7ef1dd // indirect github.com/modern-go/reflect2 v1.0.2 // indirect github.com/pmezard/go-difflib v1.0.0 // indirect + go.opentelemetry.io/collector/featuregate v0.0.0-20221117214536-6a117bfc3737 // indirect go.opentelemetry.io/otel v1.11.1 // indirect go.opentelemetry.io/otel/metric v0.33.0 // indirect go.opentelemetry.io/otel/trace v1.11.1 // indirect diff --git a/processor/probabilisticsamplerprocessor/go.sum b/processor/probabilisticsamplerprocessor/go.sum index d95919ae7db3f..88881076c3096 100644 --- a/processor/probabilisticsamplerprocessor/go.sum +++ b/processor/probabilisticsamplerprocessor/go.sum @@ -274,12 +274,18 @@ go.etcd.io/etcd/client/pkg/v3 v3.5.4/go.mod h1:IJHfcCEKxYu1Os13ZdwCwIUTUVGYTSAM3 go.etcd.io/etcd/client/v3 v3.5.4/go.mod h1:ZaRkVgBZC+L+dLCjTcF1hRXpgZXQPOvnA/Ak/gq3kiY= go.opencensus.io v0.24.0 h1:y73uSU6J157QMP2kn2r30vwW1A2W2WFwSCGnAVxeaD0= go.opencensus.io v0.24.0/go.mod h1:vNK8G9p7aAivkbmorf4v+7Hgx+Zs0yY+0fOtgBfjQKo= -go.opentelemetry.io/collector v0.64.2-0.20221115155901-1550938c18fd h1:O+6HhE4Ivg8Jksp3dIXIEC4FIR0Ush4uORvG3UtHZWk= -go.opentelemetry.io/collector v0.64.2-0.20221115155901-1550938c18fd/go.mod h1:mmSrOcwe1vEYmChXUYuF6rzlrUL0rjEiPfa19Xxb41o= -go.opentelemetry.io/collector/pdata v0.64.2-0.20221115155901-1550938c18fd h1:GdVAbRiae5VDZe3Mn3FqzMxO/aI5UbJ4+dcviqClHy8= -go.opentelemetry.io/collector/pdata v0.64.2-0.20221115155901-1550938c18fd/go.mod h1:0vynPfW2ZN7DltpcCFgCmTtWMQkCjp2a3TNt82YTCLQ= -go.opentelemetry.io/collector/semconv v0.64.2-0.20221115155901-1550938c18fd h1:rMqcl2pwi8YtVrtOPK8tVh87W0bFBge4yqB9ypSsAJ4= -go.opentelemetry.io/collector/semconv v0.64.2-0.20221115155901-1550938c18fd/go.mod h1:5o9yhOa+ABt7g2E5JABDxGZ1PQPbtfxrKNbYn+LOTXU= +go.opentelemetry.io/collector v0.64.2-0.20221117234814-4565692c50a7 h1:o/vMr2iyXzaeTb/KAldhMxAvRIfFPwtKfL5cKVKsSlU= +go.opentelemetry.io/collector v0.64.2-0.20221117234814-4565692c50a7/go.mod h1:PO8hayFFYvXDqELbXRVxwawR2HTdjN6mY4Qa3Se9xI8= +go.opentelemetry.io/collector/component v0.0.0-20221117234814-4565692c50a7 h1:q9m1bGHhQFUakQX79lZpLmFSY9VLULNSs2jUG8MdJLA= +go.opentelemetry.io/collector/component v0.0.0-20221117234814-4565692c50a7/go.mod h1:Z7H1Oj826e4dtVxXmT6SiUr6S0EIevUJmkVpfQV+UOk= +go.opentelemetry.io/collector/consumer v0.0.0-20221117234814-4565692c50a7 h1:FTy1JD9EJ7gq9SzlZoi2NkGcZ88+SwdiJav5uRcDEEY= +go.opentelemetry.io/collector/consumer v0.0.0-20221117234814-4565692c50a7/go.mod h1:86Elcw/LLrh90DprArogHMkBX3+UMu3tIgcVWF3mr6o= +go.opentelemetry.io/collector/featuregate v0.0.0-20221117214536-6a117bfc3737 h1:7sXg6M9Fw6rFVlX+iaWOMz6DFXEiroUdQer5kWGixwM= +go.opentelemetry.io/collector/featuregate v0.0.0-20221117214536-6a117bfc3737/go.mod h1:tewuFKJYalWBU0bmNKg++MC1ipINXUr6szYzOw2p1GI= +go.opentelemetry.io/collector/pdata v0.64.2-0.20221117234814-4565692c50a7 h1:IOFqfOu7fFxTgC7pvc2U7dk1/uFjwVQPK+CALiUvacI= +go.opentelemetry.io/collector/pdata v0.64.2-0.20221117234814-4565692c50a7/go.mod h1:0vynPfW2ZN7DltpcCFgCmTtWMQkCjp2a3TNt82YTCLQ= +go.opentelemetry.io/collector/semconv v0.64.2-0.20221117234814-4565692c50a7 h1:cGXAVltDxXw9nj0Vr7vyZZTj0whdyO+GYs+xv0xHJ2A= +go.opentelemetry.io/collector/semconv v0.64.2-0.20221117234814-4565692c50a7/go.mod h1:5o9yhOa+ABt7g2E5JABDxGZ1PQPbtfxrKNbYn+LOTXU= go.opentelemetry.io/otel v1.11.1 h1:4WLLAmcfkmDk2ukNXJyq3/kiz/3UzCaYq6PskJsaou4= go.opentelemetry.io/otel v1.11.1/go.mod h1:1nNhXBbWSD0nsL38H6btgnFN2k4i0sNLHNNMZMSbUGE= go.opentelemetry.io/otel/exporters/prometheus v0.33.0 h1:xXhPj7SLKWU5/Zd4Hxmd+X1C4jdmvc0Xy+kvjFx2z60= diff --git a/processor/redactionprocessor/config_test.go b/processor/redactionprocessor/config_test.go index 3ea9d5d59ed72..b4a6eb0011db1 100644 --- a/processor/redactionprocessor/config_test.go +++ b/processor/redactionprocessor/config_test.go @@ -60,7 +60,7 @@ func TestLoadConfig(t *testing.T) { require.NoError(t, err) require.NoError(t, component.UnmarshalProcessorConfig(sub, cfg)) - assert.NoError(t, cfg.Validate()) + assert.NoError(t, component.ValidateConfig(cfg)) assert.Equal(t, tt.expected, cfg) }) } diff --git a/processor/redactionprocessor/go.mod b/processor/redactionprocessor/go.mod index 34dc281f621ad..d97baa3b9830d 100644 --- a/processor/redactionprocessor/go.mod +++ b/processor/redactionprocessor/go.mod @@ -4,8 +4,10 @@ go 1.18 require ( github.com/stretchr/testify v1.8.1 - go.opentelemetry.io/collector v0.64.2-0.20221115155901-1550938c18fd - go.opentelemetry.io/collector/pdata v0.64.2-0.20221115155901-1550938c18fd + go.opentelemetry.io/collector v0.64.2-0.20221117234814-4565692c50a7 + go.opentelemetry.io/collector/component v0.0.0-20221117234814-4565692c50a7 + go.opentelemetry.io/collector/consumer v0.0.0-20221117234814-4565692c50a7 + go.opentelemetry.io/collector/pdata v0.64.2-0.20221117234814-4565692c50a7 go.uber.org/zap v1.23.0 ) @@ -26,6 +28,7 @@ require ( github.com/pelletier/go-toml v1.9.4 // indirect github.com/pmezard/go-difflib v1.0.0 // indirect go.opencensus.io v0.24.0 // indirect + go.opentelemetry.io/collector/featuregate v0.0.0-20221117214536-6a117bfc3737 // indirect go.opentelemetry.io/otel v1.11.1 // indirect go.opentelemetry.io/otel/metric v0.33.0 // indirect go.opentelemetry.io/otel/trace v1.11.1 // indirect diff --git a/processor/redactionprocessor/go.sum b/processor/redactionprocessor/go.sum index a6cf46e291f65..a8533f781358d 100644 --- a/processor/redactionprocessor/go.sum +++ b/processor/redactionprocessor/go.sum @@ -271,10 +271,16 @@ go.etcd.io/etcd/client/pkg/v3 v3.5.4/go.mod h1:IJHfcCEKxYu1Os13ZdwCwIUTUVGYTSAM3 go.etcd.io/etcd/client/v3 v3.5.4/go.mod h1:ZaRkVgBZC+L+dLCjTcF1hRXpgZXQPOvnA/Ak/gq3kiY= go.opencensus.io v0.24.0 h1:y73uSU6J157QMP2kn2r30vwW1A2W2WFwSCGnAVxeaD0= go.opencensus.io v0.24.0/go.mod h1:vNK8G9p7aAivkbmorf4v+7Hgx+Zs0yY+0fOtgBfjQKo= -go.opentelemetry.io/collector v0.64.2-0.20221115155901-1550938c18fd h1:O+6HhE4Ivg8Jksp3dIXIEC4FIR0Ush4uORvG3UtHZWk= -go.opentelemetry.io/collector v0.64.2-0.20221115155901-1550938c18fd/go.mod h1:mmSrOcwe1vEYmChXUYuF6rzlrUL0rjEiPfa19Xxb41o= -go.opentelemetry.io/collector/pdata v0.64.2-0.20221115155901-1550938c18fd h1:GdVAbRiae5VDZe3Mn3FqzMxO/aI5UbJ4+dcviqClHy8= -go.opentelemetry.io/collector/pdata v0.64.2-0.20221115155901-1550938c18fd/go.mod h1:0vynPfW2ZN7DltpcCFgCmTtWMQkCjp2a3TNt82YTCLQ= +go.opentelemetry.io/collector v0.64.2-0.20221117234814-4565692c50a7 h1:o/vMr2iyXzaeTb/KAldhMxAvRIfFPwtKfL5cKVKsSlU= +go.opentelemetry.io/collector v0.64.2-0.20221117234814-4565692c50a7/go.mod h1:PO8hayFFYvXDqELbXRVxwawR2HTdjN6mY4Qa3Se9xI8= +go.opentelemetry.io/collector/component v0.0.0-20221117234814-4565692c50a7 h1:q9m1bGHhQFUakQX79lZpLmFSY9VLULNSs2jUG8MdJLA= +go.opentelemetry.io/collector/component v0.0.0-20221117234814-4565692c50a7/go.mod h1:Z7H1Oj826e4dtVxXmT6SiUr6S0EIevUJmkVpfQV+UOk= +go.opentelemetry.io/collector/consumer v0.0.0-20221117234814-4565692c50a7 h1:FTy1JD9EJ7gq9SzlZoi2NkGcZ88+SwdiJav5uRcDEEY= +go.opentelemetry.io/collector/consumer v0.0.0-20221117234814-4565692c50a7/go.mod h1:86Elcw/LLrh90DprArogHMkBX3+UMu3tIgcVWF3mr6o= +go.opentelemetry.io/collector/featuregate v0.0.0-20221117214536-6a117bfc3737 h1:7sXg6M9Fw6rFVlX+iaWOMz6DFXEiroUdQer5kWGixwM= +go.opentelemetry.io/collector/featuregate v0.0.0-20221117214536-6a117bfc3737/go.mod h1:tewuFKJYalWBU0bmNKg++MC1ipINXUr6szYzOw2p1GI= +go.opentelemetry.io/collector/pdata v0.64.2-0.20221117234814-4565692c50a7 h1:IOFqfOu7fFxTgC7pvc2U7dk1/uFjwVQPK+CALiUvacI= +go.opentelemetry.io/collector/pdata v0.64.2-0.20221117234814-4565692c50a7/go.mod h1:0vynPfW2ZN7DltpcCFgCmTtWMQkCjp2a3TNt82YTCLQ= go.opentelemetry.io/otel v1.11.1 h1:4WLLAmcfkmDk2ukNXJyq3/kiz/3UzCaYq6PskJsaou4= go.opentelemetry.io/otel v1.11.1/go.mod h1:1nNhXBbWSD0nsL38H6btgnFN2k4i0sNLHNNMZMSbUGE= go.opentelemetry.io/otel/metric v0.33.0 h1:xQAyl7uGEYvrLAiV/09iTJlp1pZnQ9Wl793qbVvED1E= diff --git a/processor/resourcedetectionprocessor/config_test.go b/processor/resourcedetectionprocessor/config_test.go index e32ef2da5cd21..3f4605129972a 100644 --- a/processor/resourcedetectionprocessor/config_test.go +++ b/processor/resourcedetectionprocessor/config_test.go @@ -98,10 +98,10 @@ func TestLoadConfig(t *testing.T) { require.NoError(t, component.UnmarshalProcessorConfig(sub, cfg)) if tt.expected == nil { - assert.EqualError(t, cfg.Validate(), tt.errorMessage) + assert.EqualError(t, component.ValidateConfig(cfg), tt.errorMessage) return } - assert.NoError(t, cfg.Validate()) + assert.NoError(t, component.ValidateConfig(cfg)) assert.Equal(t, tt.expected, cfg) }) } diff --git a/processor/resourcedetectionprocessor/go.mod b/processor/resourcedetectionprocessor/go.mod index 6488a643fbc89..42ee46a6bd922 100644 --- a/processor/resourcedetectionprocessor/go.mod +++ b/processor/resourcedetectionprocessor/go.mod @@ -12,9 +12,11 @@ require ( github.com/open-telemetry/opentelemetry-collector-contrib/internal/metadataproviders v0.64.0 github.com/open-telemetry/opentelemetry-collector-contrib/pkg/translator/opencensus v0.64.0 github.com/stretchr/testify v1.8.1 - go.opentelemetry.io/collector v0.64.2-0.20221115155901-1550938c18fd - go.opentelemetry.io/collector/pdata v0.64.2-0.20221115155901-1550938c18fd - go.opentelemetry.io/collector/semconv v0.64.2-0.20221115155901-1550938c18fd + go.opentelemetry.io/collector v0.64.2-0.20221117234814-4565692c50a7 + go.opentelemetry.io/collector/component v0.0.0-20221117234814-4565692c50a7 + go.opentelemetry.io/collector/consumer v0.0.0-20221117234814-4565692c50a7 + go.opentelemetry.io/collector/pdata v0.64.2-0.20221117234814-4565692c50a7 + go.opentelemetry.io/collector/semconv v0.64.2-0.20221117234814-4565692c50a7 go.uber.org/multierr v1.8.0 go.uber.org/zap v1.23.0 k8s.io/apimachinery v0.25.4 @@ -78,6 +80,7 @@ require ( github.com/sirupsen/logrus v1.8.1 // indirect github.com/stretchr/objx v0.5.0 // indirect go.opencensus.io v0.24.0 // indirect + go.opentelemetry.io/collector/featuregate v0.0.0-20221117214536-6a117bfc3737 // indirect go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.36.4 // indirect go.opentelemetry.io/otel v1.11.1 // indirect go.opentelemetry.io/otel/metric v0.33.0 // indirect diff --git a/processor/resourcedetectionprocessor/go.sum b/processor/resourcedetectionprocessor/go.sum index c64beeda55964..5a4c1dac0489f 100644 --- a/processor/resourcedetectionprocessor/go.sum +++ b/processor/resourcedetectionprocessor/go.sum @@ -399,12 +399,18 @@ go.etcd.io/etcd/client/pkg/v3 v3.5.4/go.mod h1:IJHfcCEKxYu1Os13ZdwCwIUTUVGYTSAM3 go.etcd.io/etcd/client/v3 v3.5.4/go.mod h1:ZaRkVgBZC+L+dLCjTcF1hRXpgZXQPOvnA/Ak/gq3kiY= go.opencensus.io v0.24.0 h1:y73uSU6J157QMP2kn2r30vwW1A2W2WFwSCGnAVxeaD0= go.opencensus.io v0.24.0/go.mod h1:vNK8G9p7aAivkbmorf4v+7Hgx+Zs0yY+0fOtgBfjQKo= -go.opentelemetry.io/collector v0.64.2-0.20221115155901-1550938c18fd h1:O+6HhE4Ivg8Jksp3dIXIEC4FIR0Ush4uORvG3UtHZWk= -go.opentelemetry.io/collector v0.64.2-0.20221115155901-1550938c18fd/go.mod h1:mmSrOcwe1vEYmChXUYuF6rzlrUL0rjEiPfa19Xxb41o= -go.opentelemetry.io/collector/pdata v0.64.2-0.20221115155901-1550938c18fd h1:GdVAbRiae5VDZe3Mn3FqzMxO/aI5UbJ4+dcviqClHy8= -go.opentelemetry.io/collector/pdata v0.64.2-0.20221115155901-1550938c18fd/go.mod h1:0vynPfW2ZN7DltpcCFgCmTtWMQkCjp2a3TNt82YTCLQ= -go.opentelemetry.io/collector/semconv v0.64.2-0.20221115155901-1550938c18fd h1:rMqcl2pwi8YtVrtOPK8tVh87W0bFBge4yqB9ypSsAJ4= -go.opentelemetry.io/collector/semconv v0.64.2-0.20221115155901-1550938c18fd/go.mod h1:5o9yhOa+ABt7g2E5JABDxGZ1PQPbtfxrKNbYn+LOTXU= +go.opentelemetry.io/collector v0.64.2-0.20221117234814-4565692c50a7 h1:o/vMr2iyXzaeTb/KAldhMxAvRIfFPwtKfL5cKVKsSlU= +go.opentelemetry.io/collector v0.64.2-0.20221117234814-4565692c50a7/go.mod h1:PO8hayFFYvXDqELbXRVxwawR2HTdjN6mY4Qa3Se9xI8= +go.opentelemetry.io/collector/component v0.0.0-20221117234814-4565692c50a7 h1:q9m1bGHhQFUakQX79lZpLmFSY9VLULNSs2jUG8MdJLA= +go.opentelemetry.io/collector/component v0.0.0-20221117234814-4565692c50a7/go.mod h1:Z7H1Oj826e4dtVxXmT6SiUr6S0EIevUJmkVpfQV+UOk= +go.opentelemetry.io/collector/consumer v0.0.0-20221117234814-4565692c50a7 h1:FTy1JD9EJ7gq9SzlZoi2NkGcZ88+SwdiJav5uRcDEEY= +go.opentelemetry.io/collector/consumer v0.0.0-20221117234814-4565692c50a7/go.mod h1:86Elcw/LLrh90DprArogHMkBX3+UMu3tIgcVWF3mr6o= +go.opentelemetry.io/collector/featuregate v0.0.0-20221117214536-6a117bfc3737 h1:7sXg6M9Fw6rFVlX+iaWOMz6DFXEiroUdQer5kWGixwM= +go.opentelemetry.io/collector/featuregate v0.0.0-20221117214536-6a117bfc3737/go.mod h1:tewuFKJYalWBU0bmNKg++MC1ipINXUr6szYzOw2p1GI= +go.opentelemetry.io/collector/pdata v0.64.2-0.20221117234814-4565692c50a7 h1:IOFqfOu7fFxTgC7pvc2U7dk1/uFjwVQPK+CALiUvacI= +go.opentelemetry.io/collector/pdata v0.64.2-0.20221117234814-4565692c50a7/go.mod h1:0vynPfW2ZN7DltpcCFgCmTtWMQkCjp2a3TNt82YTCLQ= +go.opentelemetry.io/collector/semconv v0.64.2-0.20221117234814-4565692c50a7 h1:cGXAVltDxXw9nj0Vr7vyZZTj0whdyO+GYs+xv0xHJ2A= +go.opentelemetry.io/collector/semconv v0.64.2-0.20221117234814-4565692c50a7/go.mod h1:5o9yhOa+ABt7g2E5JABDxGZ1PQPbtfxrKNbYn+LOTXU= go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.36.4 h1:aUEBEdCa6iamGzg6fuYxDA8ThxvOG240mAvWDU+XLio= go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.36.4/go.mod h1:l2MdsbKTocpPS5nQZscqTR9jd8u96VYZdcpF8Sye7mA= go.opentelemetry.io/otel v1.11.1 h1:4WLLAmcfkmDk2ukNXJyq3/kiz/3UzCaYq6PskJsaou4= diff --git a/processor/resourceprocessor/config_test.go b/processor/resourceprocessor/config_test.go index caaa231718f60..3d5059a2d14e2 100644 --- a/processor/resourceprocessor/config_test.go +++ b/processor/resourceprocessor/config_test.go @@ -63,7 +63,7 @@ func TestLoadConfig(t *testing.T) { require.NoError(t, err) require.NoError(t, component.UnmarshalProcessorConfig(sub, cfg)) - assert.NoError(t, cfg.Validate()) + assert.NoError(t, component.ValidateConfig(cfg)) assert.Equal(t, tt.expected, cfg) }) } diff --git a/processor/resourceprocessor/go.mod b/processor/resourceprocessor/go.mod index 3f2772889b60f..84f394e7e4aee 100644 --- a/processor/resourceprocessor/go.mod +++ b/processor/resourceprocessor/go.mod @@ -5,8 +5,10 @@ go 1.18 require ( github.com/open-telemetry/opentelemetry-collector-contrib/internal/coreinternal v0.64.0 github.com/stretchr/testify v1.8.1 - go.opentelemetry.io/collector v0.64.2-0.20221115155901-1550938c18fd - go.opentelemetry.io/collector/pdata v0.64.2-0.20221115155901-1550938c18fd + go.opentelemetry.io/collector v0.64.2-0.20221117234814-4565692c50a7 + go.opentelemetry.io/collector/component v0.0.0-20221117234814-4565692c50a7 + go.opentelemetry.io/collector/consumer v0.0.0-20221117234814-4565692c50a7 + go.opentelemetry.io/collector/pdata v0.64.2-0.20221117234814-4565692c50a7 go.uber.org/zap v1.23.0 ) @@ -24,6 +26,7 @@ require ( github.com/pmezard/go-difflib v1.0.0 // indirect github.com/spf13/cast v1.5.0 // indirect go.opencensus.io v0.24.0 // indirect + go.opentelemetry.io/collector/featuregate v0.0.0-20221117214536-6a117bfc3737 // indirect go.opentelemetry.io/otel v1.11.1 // indirect go.opentelemetry.io/otel/metric v0.33.0 // indirect go.opentelemetry.io/otel/trace v1.11.1 // indirect diff --git a/processor/resourceprocessor/go.sum b/processor/resourceprocessor/go.sum index c4d5ab0e458dd..8c3c77f0e098c 100644 --- a/processor/resourceprocessor/go.sum +++ b/processor/resourceprocessor/go.sum @@ -260,10 +260,16 @@ go.etcd.io/etcd/client/pkg/v3 v3.5.4/go.mod h1:IJHfcCEKxYu1Os13ZdwCwIUTUVGYTSAM3 go.etcd.io/etcd/client/v3 v3.5.4/go.mod h1:ZaRkVgBZC+L+dLCjTcF1hRXpgZXQPOvnA/Ak/gq3kiY= go.opencensus.io v0.24.0 h1:y73uSU6J157QMP2kn2r30vwW1A2W2WFwSCGnAVxeaD0= go.opencensus.io v0.24.0/go.mod h1:vNK8G9p7aAivkbmorf4v+7Hgx+Zs0yY+0fOtgBfjQKo= -go.opentelemetry.io/collector v0.64.2-0.20221115155901-1550938c18fd h1:O+6HhE4Ivg8Jksp3dIXIEC4FIR0Ush4uORvG3UtHZWk= -go.opentelemetry.io/collector v0.64.2-0.20221115155901-1550938c18fd/go.mod h1:mmSrOcwe1vEYmChXUYuF6rzlrUL0rjEiPfa19Xxb41o= -go.opentelemetry.io/collector/pdata v0.64.2-0.20221115155901-1550938c18fd h1:GdVAbRiae5VDZe3Mn3FqzMxO/aI5UbJ4+dcviqClHy8= -go.opentelemetry.io/collector/pdata v0.64.2-0.20221115155901-1550938c18fd/go.mod h1:0vynPfW2ZN7DltpcCFgCmTtWMQkCjp2a3TNt82YTCLQ= +go.opentelemetry.io/collector v0.64.2-0.20221117234814-4565692c50a7 h1:o/vMr2iyXzaeTb/KAldhMxAvRIfFPwtKfL5cKVKsSlU= +go.opentelemetry.io/collector v0.64.2-0.20221117234814-4565692c50a7/go.mod h1:PO8hayFFYvXDqELbXRVxwawR2HTdjN6mY4Qa3Se9xI8= +go.opentelemetry.io/collector/component v0.0.0-20221117234814-4565692c50a7 h1:q9m1bGHhQFUakQX79lZpLmFSY9VLULNSs2jUG8MdJLA= +go.opentelemetry.io/collector/component v0.0.0-20221117234814-4565692c50a7/go.mod h1:Z7H1Oj826e4dtVxXmT6SiUr6S0EIevUJmkVpfQV+UOk= +go.opentelemetry.io/collector/consumer v0.0.0-20221117234814-4565692c50a7 h1:FTy1JD9EJ7gq9SzlZoi2NkGcZ88+SwdiJav5uRcDEEY= +go.opentelemetry.io/collector/consumer v0.0.0-20221117234814-4565692c50a7/go.mod h1:86Elcw/LLrh90DprArogHMkBX3+UMu3tIgcVWF3mr6o= +go.opentelemetry.io/collector/featuregate v0.0.0-20221117214536-6a117bfc3737 h1:7sXg6M9Fw6rFVlX+iaWOMz6DFXEiroUdQer5kWGixwM= +go.opentelemetry.io/collector/featuregate v0.0.0-20221117214536-6a117bfc3737/go.mod h1:tewuFKJYalWBU0bmNKg++MC1ipINXUr6szYzOw2p1GI= +go.opentelemetry.io/collector/pdata v0.64.2-0.20221117234814-4565692c50a7 h1:IOFqfOu7fFxTgC7pvc2U7dk1/uFjwVQPK+CALiUvacI= +go.opentelemetry.io/collector/pdata v0.64.2-0.20221117234814-4565692c50a7/go.mod h1:0vynPfW2ZN7DltpcCFgCmTtWMQkCjp2a3TNt82YTCLQ= go.opentelemetry.io/otel v1.11.1 h1:4WLLAmcfkmDk2ukNXJyq3/kiz/3UzCaYq6PskJsaou4= go.opentelemetry.io/otel v1.11.1/go.mod h1:1nNhXBbWSD0nsL38H6btgnFN2k4i0sNLHNNMZMSbUGE= go.opentelemetry.io/otel/metric v0.33.0 h1:xQAyl7uGEYvrLAiV/09iTJlp1pZnQ9Wl793qbVvED1E= diff --git a/processor/routingprocessor/config_test.go b/processor/routingprocessor/config_test.go index aff3557c29b6a..727a6eb2e69dd 100644 --- a/processor/routingprocessor/config_test.go +++ b/processor/routingprocessor/config_test.go @@ -101,7 +101,7 @@ func TestLoadConfig(t *testing.T) { require.NoError(t, err) require.NoError(t, component.UnmarshalProcessorConfig(sub, cfg)) - assert.NoError(t, cfg.Validate()) + assert.NoError(t, component.ValidateConfig(cfg)) assert.Equal(t, tt.expected, cfg) }) } @@ -160,7 +160,7 @@ func TestValidateConfig(t *testing.T) { for _, tt := range tests { t.Run(tt.name, func(t *testing.T) { - assert.EqualError(t, tt.config.Validate(), tt.error) + assert.EqualError(t, component.ValidateConfig(tt.config), tt.error) }) } } diff --git a/processor/routingprocessor/factory_test.go b/processor/routingprocessor/factory_test.go index 8f81467a889ca..1ad3481938fb0 100644 --- a/processor/routingprocessor/factory_test.go +++ b/processor/routingprocessor/factory_test.go @@ -73,7 +73,7 @@ func TestProcessorGetsCreatedWithValidConfiguration(t *testing.T) { func TestFailOnEmptyConfiguration(t *testing.T) { cfg := NewFactory().CreateDefaultConfig() - assert.ErrorIs(t, cfg.Validate(), errNoTableItems) + assert.ErrorIs(t, component.ValidateConfig(cfg), errNoTableItems) } func TestProcessorFailsToBeCreatedWhenRouteHasNoExporters(t *testing.T) { @@ -88,7 +88,7 @@ func TestProcessorFailsToBeCreatedWhenRouteHasNoExporters(t *testing.T) { }, }, } - assert.ErrorIs(t, cfg.Validate(), errNoExporters) + assert.ErrorIs(t, component.ValidateConfig(cfg), errNoExporters) } func TestProcessorFailsToBeCreatedWhenNoRoutesExist(t *testing.T) { @@ -98,7 +98,7 @@ func TestProcessorFailsToBeCreatedWhenNoRoutesExist(t *testing.T) { FromAttribute: "X-Tenant", Table: []RoutingTableItem{}, } - assert.ErrorIs(t, cfg.Validate(), errNoTableItems) + assert.ErrorIs(t, component.ValidateConfig(cfg), errNoTableItems) } func TestProcessorFailsWithNoFromAttribute(t *testing.T) { @@ -112,7 +112,7 @@ func TestProcessorFailsWithNoFromAttribute(t *testing.T) { }, }, } - assert.ErrorIs(t, cfg.Validate(), errNoMissingFromAttribute) + assert.ErrorIs(t, component.ValidateConfig(cfg), errNoMissingFromAttribute) } func TestShouldNotFailWhenNextIsProcessor(t *testing.T) { diff --git a/processor/routingprocessor/go.mod b/processor/routingprocessor/go.mod index 3b6b0477501a1..821e0d647468d 100644 --- a/processor/routingprocessor/go.mod +++ b/processor/routingprocessor/go.mod @@ -5,9 +5,11 @@ go 1.18 require ( github.com/open-telemetry/opentelemetry-collector-contrib/pkg/ottl v0.64.0 github.com/stretchr/testify v1.8.1 - go.opentelemetry.io/collector v0.64.2-0.20221115155901-1550938c18fd - go.opentelemetry.io/collector/exporter/otlpexporter v0.64.2-0.20221115155901-1550938c18fd - go.opentelemetry.io/collector/pdata v0.64.2-0.20221115155901-1550938c18fd + go.opentelemetry.io/collector v0.64.2-0.20221117234814-4565692c50a7 + go.opentelemetry.io/collector/component v0.0.0-20221117234814-4565692c50a7 + go.opentelemetry.io/collector/consumer v0.0.0-20221117234814-4565692c50a7 + go.opentelemetry.io/collector/exporter/otlpexporter v0.64.2-0.20221117234814-4565692c50a7 + go.opentelemetry.io/collector/pdata v0.64.2-0.20221117234814-4565692c50a7 go.uber.org/multierr v1.8.0 go.uber.org/zap v1.23.0 google.golang.org/grpc v1.50.1 @@ -39,6 +41,7 @@ require ( github.com/pmezard/go-difflib v1.0.0 // indirect github.com/rogpeppe/go-internal v1.6.2 // indirect go.opencensus.io v0.24.0 // indirect + go.opentelemetry.io/collector/featuregate v0.0.0-20221117214536-6a117bfc3737 // indirect go.opentelemetry.io/contrib/instrumentation/google.golang.org/grpc/otelgrpc v0.36.4 // indirect go.opentelemetry.io/otel v1.11.1 // indirect go.opentelemetry.io/otel/metric v0.33.0 // indirect diff --git a/processor/routingprocessor/go.sum b/processor/routingprocessor/go.sum index 430d041344715..4ceb61364934f 100644 --- a/processor/routingprocessor/go.sum +++ b/processor/routingprocessor/go.sum @@ -307,12 +307,18 @@ go.etcd.io/etcd/client/pkg/v3 v3.5.4/go.mod h1:IJHfcCEKxYu1Os13ZdwCwIUTUVGYTSAM3 go.etcd.io/etcd/client/v3 v3.5.4/go.mod h1:ZaRkVgBZC+L+dLCjTcF1hRXpgZXQPOvnA/Ak/gq3kiY= go.opencensus.io v0.24.0 h1:y73uSU6J157QMP2kn2r30vwW1A2W2WFwSCGnAVxeaD0= go.opencensus.io v0.24.0/go.mod h1:vNK8G9p7aAivkbmorf4v+7Hgx+Zs0yY+0fOtgBfjQKo= -go.opentelemetry.io/collector v0.64.2-0.20221115155901-1550938c18fd h1:O+6HhE4Ivg8Jksp3dIXIEC4FIR0Ush4uORvG3UtHZWk= -go.opentelemetry.io/collector v0.64.2-0.20221115155901-1550938c18fd/go.mod h1:mmSrOcwe1vEYmChXUYuF6rzlrUL0rjEiPfa19Xxb41o= -go.opentelemetry.io/collector/exporter/otlpexporter v0.64.2-0.20221115155901-1550938c18fd h1:Aba3DLnRML3J2567NIKeXwryvHGwckIkXkmrA/C/BzI= -go.opentelemetry.io/collector/exporter/otlpexporter v0.64.2-0.20221115155901-1550938c18fd/go.mod h1:5bfOtQfZ3XtaIGfavOrh8gHn+vvUZ2kB27dIrw6T1aY= -go.opentelemetry.io/collector/pdata v0.64.2-0.20221115155901-1550938c18fd h1:GdVAbRiae5VDZe3Mn3FqzMxO/aI5UbJ4+dcviqClHy8= -go.opentelemetry.io/collector/pdata v0.64.2-0.20221115155901-1550938c18fd/go.mod h1:0vynPfW2ZN7DltpcCFgCmTtWMQkCjp2a3TNt82YTCLQ= +go.opentelemetry.io/collector v0.64.2-0.20221117234814-4565692c50a7 h1:o/vMr2iyXzaeTb/KAldhMxAvRIfFPwtKfL5cKVKsSlU= +go.opentelemetry.io/collector v0.64.2-0.20221117234814-4565692c50a7/go.mod h1:PO8hayFFYvXDqELbXRVxwawR2HTdjN6mY4Qa3Se9xI8= +go.opentelemetry.io/collector/component v0.0.0-20221117234814-4565692c50a7 h1:q9m1bGHhQFUakQX79lZpLmFSY9VLULNSs2jUG8MdJLA= +go.opentelemetry.io/collector/component v0.0.0-20221117234814-4565692c50a7/go.mod h1:Z7H1Oj826e4dtVxXmT6SiUr6S0EIevUJmkVpfQV+UOk= +go.opentelemetry.io/collector/consumer v0.0.0-20221117234814-4565692c50a7 h1:FTy1JD9EJ7gq9SzlZoi2NkGcZ88+SwdiJav5uRcDEEY= +go.opentelemetry.io/collector/consumer v0.0.0-20221117234814-4565692c50a7/go.mod h1:86Elcw/LLrh90DprArogHMkBX3+UMu3tIgcVWF3mr6o= +go.opentelemetry.io/collector/exporter/otlpexporter v0.64.2-0.20221117234814-4565692c50a7 h1:Pw+375oxebSKKDDQjOFSMFSfopmx6gARuqTmQD1njGY= +go.opentelemetry.io/collector/exporter/otlpexporter v0.64.2-0.20221117234814-4565692c50a7/go.mod h1:X6iHDUlspR3fJ3zvZskB+d9/PXaC/zYMbHrtfvk9yNk= +go.opentelemetry.io/collector/featuregate v0.0.0-20221117214536-6a117bfc3737 h1:7sXg6M9Fw6rFVlX+iaWOMz6DFXEiroUdQer5kWGixwM= +go.opentelemetry.io/collector/featuregate v0.0.0-20221117214536-6a117bfc3737/go.mod h1:tewuFKJYalWBU0bmNKg++MC1ipINXUr6szYzOw2p1GI= +go.opentelemetry.io/collector/pdata v0.64.2-0.20221117234814-4565692c50a7 h1:IOFqfOu7fFxTgC7pvc2U7dk1/uFjwVQPK+CALiUvacI= +go.opentelemetry.io/collector/pdata v0.64.2-0.20221117234814-4565692c50a7/go.mod h1:0vynPfW2ZN7DltpcCFgCmTtWMQkCjp2a3TNt82YTCLQ= go.opentelemetry.io/contrib/instrumentation/google.golang.org/grpc/otelgrpc v0.36.4 h1:PRXhsszxTt5bbPriTjmaweWUsAnJYeWBhUMLRetUgBU= go.opentelemetry.io/contrib/instrumentation/google.golang.org/grpc/otelgrpc v0.36.4/go.mod h1:05eWWy6ZWzmpeImD3UowLTB3VjDMU1yxQ+ENuVWDM3c= go.opentelemetry.io/otel v1.11.1 h1:4WLLAmcfkmDk2ukNXJyq3/kiz/3UzCaYq6PskJsaou4= diff --git a/processor/schemaprocessor/config_test.go b/processor/schemaprocessor/config_test.go index ed064b648915a..4e719b9df74dc 100644 --- a/processor/schemaprocessor/config_test.go +++ b/processor/schemaprocessor/config_test.go @@ -95,6 +95,6 @@ func TestConfigurationValidation(t *testing.T) { Targets: tc.target, } - assert.ErrorIs(t, cfg.Validate(), tc.expectError, tc.scenario) + assert.ErrorIs(t, component.ValidateConfig(cfg), tc.expectError, tc.scenario) } } diff --git a/processor/schemaprocessor/factory.go b/processor/schemaprocessor/factory.go index 52db60e1baf02..da9c7f70b4e6e 100644 --- a/processor/schemaprocessor/factory.go +++ b/processor/schemaprocessor/factory.go @@ -27,7 +27,7 @@ import ( const ( typeStr = "schema" // The stability level of the processor. - stability = component.StabilityLevelInDevelopment + stability = component.StabilityLevelDevelopment ) var processorCapabilities = consumer.Capabilities{MutatesData: true} diff --git a/processor/schemaprocessor/go.mod b/processor/schemaprocessor/go.mod index 2905d33efb886..8dee1c1df1882 100644 --- a/processor/schemaprocessor/go.mod +++ b/processor/schemaprocessor/go.mod @@ -4,8 +4,10 @@ go 1.18 require ( github.com/stretchr/testify v1.8.1 - go.opentelemetry.io/collector v0.64.2-0.20221115155901-1550938c18fd - go.opentelemetry.io/collector/pdata v0.64.2-0.20221115155901-1550938c18fd + go.opentelemetry.io/collector v0.64.2-0.20221117234814-4565692c50a7 + go.opentelemetry.io/collector/component v0.0.0-20221117234814-4565692c50a7 + go.opentelemetry.io/collector/consumer v0.0.0-20221117234814-4565692c50a7 + go.opentelemetry.io/collector/pdata v0.64.2-0.20221117234814-4565692c50a7 go.uber.org/zap v1.23.0 ) @@ -32,6 +34,7 @@ require ( github.com/pmezard/go-difflib v1.0.0 // indirect github.com/rs/cors v1.8.2 // indirect go.opencensus.io v0.24.0 // indirect + go.opentelemetry.io/collector/featuregate v0.0.0-20221117214536-6a117bfc3737 // indirect go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.36.4 // indirect go.opentelemetry.io/otel v1.11.1 // indirect go.opentelemetry.io/otel/metric v0.33.0 // indirect diff --git a/processor/schemaprocessor/go.sum b/processor/schemaprocessor/go.sum index b3f7908bf5835..6e89ef614fcb7 100644 --- a/processor/schemaprocessor/go.sum +++ b/processor/schemaprocessor/go.sum @@ -283,10 +283,16 @@ go.etcd.io/etcd/client/pkg/v3 v3.5.4/go.mod h1:IJHfcCEKxYu1Os13ZdwCwIUTUVGYTSAM3 go.etcd.io/etcd/client/v3 v3.5.4/go.mod h1:ZaRkVgBZC+L+dLCjTcF1hRXpgZXQPOvnA/Ak/gq3kiY= go.opencensus.io v0.24.0 h1:y73uSU6J157QMP2kn2r30vwW1A2W2WFwSCGnAVxeaD0= go.opencensus.io v0.24.0/go.mod h1:vNK8G9p7aAivkbmorf4v+7Hgx+Zs0yY+0fOtgBfjQKo= -go.opentelemetry.io/collector v0.64.2-0.20221115155901-1550938c18fd h1:O+6HhE4Ivg8Jksp3dIXIEC4FIR0Ush4uORvG3UtHZWk= -go.opentelemetry.io/collector v0.64.2-0.20221115155901-1550938c18fd/go.mod h1:mmSrOcwe1vEYmChXUYuF6rzlrUL0rjEiPfa19Xxb41o= -go.opentelemetry.io/collector/pdata v0.64.2-0.20221115155901-1550938c18fd h1:GdVAbRiae5VDZe3Mn3FqzMxO/aI5UbJ4+dcviqClHy8= -go.opentelemetry.io/collector/pdata v0.64.2-0.20221115155901-1550938c18fd/go.mod h1:0vynPfW2ZN7DltpcCFgCmTtWMQkCjp2a3TNt82YTCLQ= +go.opentelemetry.io/collector v0.64.2-0.20221117234814-4565692c50a7 h1:o/vMr2iyXzaeTb/KAldhMxAvRIfFPwtKfL5cKVKsSlU= +go.opentelemetry.io/collector v0.64.2-0.20221117234814-4565692c50a7/go.mod h1:PO8hayFFYvXDqELbXRVxwawR2HTdjN6mY4Qa3Se9xI8= +go.opentelemetry.io/collector/component v0.0.0-20221117234814-4565692c50a7 h1:q9m1bGHhQFUakQX79lZpLmFSY9VLULNSs2jUG8MdJLA= +go.opentelemetry.io/collector/component v0.0.0-20221117234814-4565692c50a7/go.mod h1:Z7H1Oj826e4dtVxXmT6SiUr6S0EIevUJmkVpfQV+UOk= +go.opentelemetry.io/collector/consumer v0.0.0-20221117234814-4565692c50a7 h1:FTy1JD9EJ7gq9SzlZoi2NkGcZ88+SwdiJav5uRcDEEY= +go.opentelemetry.io/collector/consumer v0.0.0-20221117234814-4565692c50a7/go.mod h1:86Elcw/LLrh90DprArogHMkBX3+UMu3tIgcVWF3mr6o= +go.opentelemetry.io/collector/featuregate v0.0.0-20221117214536-6a117bfc3737 h1:7sXg6M9Fw6rFVlX+iaWOMz6DFXEiroUdQer5kWGixwM= +go.opentelemetry.io/collector/featuregate v0.0.0-20221117214536-6a117bfc3737/go.mod h1:tewuFKJYalWBU0bmNKg++MC1ipINXUr6szYzOw2p1GI= +go.opentelemetry.io/collector/pdata v0.64.2-0.20221117234814-4565692c50a7 h1:IOFqfOu7fFxTgC7pvc2U7dk1/uFjwVQPK+CALiUvacI= +go.opentelemetry.io/collector/pdata v0.64.2-0.20221117234814-4565692c50a7/go.mod h1:0vynPfW2ZN7DltpcCFgCmTtWMQkCjp2a3TNt82YTCLQ= go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.36.4 h1:aUEBEdCa6iamGzg6fuYxDA8ThxvOG240mAvWDU+XLio= go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.36.4/go.mod h1:l2MdsbKTocpPS5nQZscqTR9jd8u96VYZdcpF8Sye7mA= go.opentelemetry.io/otel v1.11.1 h1:4WLLAmcfkmDk2ukNXJyq3/kiz/3UzCaYq6PskJsaou4= diff --git a/processor/servicegraphprocessor/go.mod b/processor/servicegraphprocessor/go.mod index 09eec13b14a80..32ae8bdc95cd6 100644 --- a/processor/servicegraphprocessor/go.mod +++ b/processor/servicegraphprocessor/go.mod @@ -5,10 +5,12 @@ go 1.18 require ( github.com/stretchr/testify v1.8.1 go.opencensus.io v0.24.0 - go.opentelemetry.io/collector v0.64.2-0.20221115155901-1550938c18fd - go.opentelemetry.io/collector/exporter/otlpexporter v0.64.2-0.20221115155901-1550938c18fd - go.opentelemetry.io/collector/pdata v0.64.2-0.20221115155901-1550938c18fd - go.opentelemetry.io/collector/semconv v0.64.2-0.20221115155901-1550938c18fd + go.opentelemetry.io/collector v0.64.2-0.20221117234814-4565692c50a7 + go.opentelemetry.io/collector/component v0.0.0-20221117234814-4565692c50a7 + go.opentelemetry.io/collector/consumer v0.0.0-20221117234814-4565692c50a7 + go.opentelemetry.io/collector/exporter/otlpexporter v0.64.2-0.20221117234814-4565692c50a7 + go.opentelemetry.io/collector/pdata v0.64.2-0.20221117234814-4565692c50a7 + go.opentelemetry.io/collector/semconv v0.64.2-0.20221117234814-4565692c50a7 go.uber.org/zap v1.23.0 ) @@ -58,7 +60,8 @@ require ( github.com/tklauser/go-sysconf v0.3.10 // indirect github.com/tklauser/numcpus v0.4.0 // indirect github.com/yusufpapurcu/wmi v1.2.2 // indirect - go.opentelemetry.io/collector/processor/batchprocessor v0.64.2-0.20221115155901-1550938c18fd // indirect + go.opentelemetry.io/collector/featuregate v0.0.0-20221117214536-6a117bfc3737 // indirect + go.opentelemetry.io/collector/processor/batchprocessor v0.64.2-0.20221117234814-4565692c50a7 // indirect go.opentelemetry.io/contrib/instrumentation/google.golang.org/grpc/otelgrpc v0.36.4 // indirect go.opentelemetry.io/contrib/propagators/b3 v1.11.1 // indirect go.opentelemetry.io/otel v1.11.1 // indirect diff --git a/processor/servicegraphprocessor/go.sum b/processor/servicegraphprocessor/go.sum index b740530cc6076..e658d9f58b9dd 100644 --- a/processor/servicegraphprocessor/go.sum +++ b/processor/servicegraphprocessor/go.sum @@ -421,17 +421,23 @@ go.opencensus.io v0.22.4/go.mod h1:yxeiOL68Rb0Xd1ddK5vPZ/oVn4vY4Ynel7k9FzqtOIw= go.opencensus.io v0.23.0/go.mod h1:XItmlyltB5F7CS4xOC1DcqMoFqwtC6OG2xF7mCv7P7E= go.opencensus.io v0.24.0 h1:y73uSU6J157QMP2kn2r30vwW1A2W2WFwSCGnAVxeaD0= go.opencensus.io v0.24.0/go.mod h1:vNK8G9p7aAivkbmorf4v+7Hgx+Zs0yY+0fOtgBfjQKo= -go.opentelemetry.io/collector v0.64.2-0.20221115155901-1550938c18fd h1:O+6HhE4Ivg8Jksp3dIXIEC4FIR0Ush4uORvG3UtHZWk= -go.opentelemetry.io/collector v0.64.2-0.20221115155901-1550938c18fd/go.mod h1:mmSrOcwe1vEYmChXUYuF6rzlrUL0rjEiPfa19Xxb41o= -go.opentelemetry.io/collector/exporter/otlpexporter v0.64.2-0.20221115155901-1550938c18fd h1:Aba3DLnRML3J2567NIKeXwryvHGwckIkXkmrA/C/BzI= -go.opentelemetry.io/collector/exporter/otlpexporter v0.64.2-0.20221115155901-1550938c18fd/go.mod h1:5bfOtQfZ3XtaIGfavOrh8gHn+vvUZ2kB27dIrw6T1aY= +go.opentelemetry.io/collector v0.64.2-0.20221117234814-4565692c50a7 h1:o/vMr2iyXzaeTb/KAldhMxAvRIfFPwtKfL5cKVKsSlU= +go.opentelemetry.io/collector v0.64.2-0.20221117234814-4565692c50a7/go.mod h1:PO8hayFFYvXDqELbXRVxwawR2HTdjN6mY4Qa3Se9xI8= +go.opentelemetry.io/collector/component v0.0.0-20221117234814-4565692c50a7 h1:q9m1bGHhQFUakQX79lZpLmFSY9VLULNSs2jUG8MdJLA= +go.opentelemetry.io/collector/component v0.0.0-20221117234814-4565692c50a7/go.mod h1:Z7H1Oj826e4dtVxXmT6SiUr6S0EIevUJmkVpfQV+UOk= +go.opentelemetry.io/collector/consumer v0.0.0-20221117234814-4565692c50a7 h1:FTy1JD9EJ7gq9SzlZoi2NkGcZ88+SwdiJav5uRcDEEY= +go.opentelemetry.io/collector/consumer v0.0.0-20221117234814-4565692c50a7/go.mod h1:86Elcw/LLrh90DprArogHMkBX3+UMu3tIgcVWF3mr6o= +go.opentelemetry.io/collector/exporter/otlpexporter v0.64.2-0.20221117234814-4565692c50a7 h1:Pw+375oxebSKKDDQjOFSMFSfopmx6gARuqTmQD1njGY= +go.opentelemetry.io/collector/exporter/otlpexporter v0.64.2-0.20221117234814-4565692c50a7/go.mod h1:X6iHDUlspR3fJ3zvZskB+d9/PXaC/zYMbHrtfvk9yNk= go.opentelemetry.io/collector/extension/zpagesextension v0.64.1 h1:2qTBtVigWNwPSpN9XR+WobC1idF2S8X/FIahFGCE1i4= -go.opentelemetry.io/collector/pdata v0.64.2-0.20221115155901-1550938c18fd h1:GdVAbRiae5VDZe3Mn3FqzMxO/aI5UbJ4+dcviqClHy8= -go.opentelemetry.io/collector/pdata v0.64.2-0.20221115155901-1550938c18fd/go.mod h1:0vynPfW2ZN7DltpcCFgCmTtWMQkCjp2a3TNt82YTCLQ= -go.opentelemetry.io/collector/processor/batchprocessor v0.64.2-0.20221115155901-1550938c18fd h1:SSjP8V0UP2+oPZ3gL+Dk90KQcvHXvHp9V5h8IIpx0og= -go.opentelemetry.io/collector/processor/batchprocessor v0.64.2-0.20221115155901-1550938c18fd/go.mod h1:zyCnX0aTvBaZ3XLWSHZdTueP7WoXRjz8X6HiWgKqstM= -go.opentelemetry.io/collector/semconv v0.64.2-0.20221115155901-1550938c18fd h1:rMqcl2pwi8YtVrtOPK8tVh87W0bFBge4yqB9ypSsAJ4= -go.opentelemetry.io/collector/semconv v0.64.2-0.20221115155901-1550938c18fd/go.mod h1:5o9yhOa+ABt7g2E5JABDxGZ1PQPbtfxrKNbYn+LOTXU= +go.opentelemetry.io/collector/featuregate v0.0.0-20221117214536-6a117bfc3737 h1:7sXg6M9Fw6rFVlX+iaWOMz6DFXEiroUdQer5kWGixwM= +go.opentelemetry.io/collector/featuregate v0.0.0-20221117214536-6a117bfc3737/go.mod h1:tewuFKJYalWBU0bmNKg++MC1ipINXUr6szYzOw2p1GI= +go.opentelemetry.io/collector/pdata v0.64.2-0.20221117234814-4565692c50a7 h1:IOFqfOu7fFxTgC7pvc2U7dk1/uFjwVQPK+CALiUvacI= +go.opentelemetry.io/collector/pdata v0.64.2-0.20221117234814-4565692c50a7/go.mod h1:0vynPfW2ZN7DltpcCFgCmTtWMQkCjp2a3TNt82YTCLQ= +go.opentelemetry.io/collector/processor/batchprocessor v0.64.2-0.20221117234814-4565692c50a7 h1:hGDq2T07j6qwwtQ2t6ZGU5tp/J2Dvu9mfY5qnnP5Ic8= +go.opentelemetry.io/collector/processor/batchprocessor v0.64.2-0.20221117234814-4565692c50a7/go.mod h1:b83iea2eDSAQkvd+2aSokaa6GRjSIsaR2zILziF/Ogc= +go.opentelemetry.io/collector/semconv v0.64.2-0.20221117234814-4565692c50a7 h1:cGXAVltDxXw9nj0Vr7vyZZTj0whdyO+GYs+xv0xHJ2A= +go.opentelemetry.io/collector/semconv v0.64.2-0.20221117234814-4565692c50a7/go.mod h1:5o9yhOa+ABt7g2E5JABDxGZ1PQPbtfxrKNbYn+LOTXU= go.opentelemetry.io/contrib/instrumentation/google.golang.org/grpc/otelgrpc v0.36.4 h1:PRXhsszxTt5bbPriTjmaweWUsAnJYeWBhUMLRetUgBU= go.opentelemetry.io/contrib/instrumentation/google.golang.org/grpc/otelgrpc v0.36.4/go.mod h1:05eWWy6ZWzmpeImD3UowLTB3VjDMU1yxQ+ENuVWDM3c= go.opentelemetry.io/contrib/propagators/b3 v1.11.1 h1:icQ6ttRV+r/2fnU46BIo/g/mPu6Rs5Ug8Rtohe3KqzI= diff --git a/processor/spanmetricsprocessor/factory.go b/processor/spanmetricsprocessor/factory.go index 17607ea7a1c43..f764c6700b574 100644 --- a/processor/spanmetricsprocessor/factory.go +++ b/processor/spanmetricsprocessor/factory.go @@ -27,7 +27,7 @@ const ( // The value of "type" key in configuration. typeStr = "spanmetrics" // The stability level of the processor. - stability = component.StabilityLevelInDevelopment + stability = component.StabilityLevelDevelopment ) // NewFactory creates a factory for the spanmetrics processor. diff --git a/processor/spanmetricsprocessor/go.mod b/processor/spanmetricsprocessor/go.mod index 9c225376e0f40..3243a5c0afa97 100644 --- a/processor/spanmetricsprocessor/go.mod +++ b/processor/spanmetricsprocessor/go.mod @@ -9,12 +9,15 @@ require ( github.com/open-telemetry/opentelemetry-collector-contrib/internal/coreinternal v0.64.0 github.com/open-telemetry/opentelemetry-collector-contrib/receiver/jaegerreceiver v0.64.0 github.com/stretchr/testify v1.8.1 - go.opentelemetry.io/collector v0.64.2-0.20221115155901-1550938c18fd - go.opentelemetry.io/collector/exporter/otlpexporter v0.64.2-0.20221115155901-1550938c18fd - go.opentelemetry.io/collector/pdata v0.64.2-0.20221115155901-1550938c18fd - go.opentelemetry.io/collector/processor/batchprocessor v0.64.2-0.20221115155901-1550938c18fd - go.opentelemetry.io/collector/receiver/otlpreceiver v0.64.2-0.20221115155901-1550938c18fd - go.opentelemetry.io/collector/semconv v0.64.2-0.20221115155901-1550938c18fd + go.opentelemetry.io/collector v0.64.2-0.20221117234814-4565692c50a7 + go.opentelemetry.io/collector/component v0.0.0-20221117234814-4565692c50a7 + go.opentelemetry.io/collector/consumer v0.0.0-20221117234814-4565692c50a7 + go.opentelemetry.io/collector/exporter/otlpexporter v0.64.2-0.20221117234814-4565692c50a7 + go.opentelemetry.io/collector/featuregate v0.0.0-20221117214536-6a117bfc3737 + go.opentelemetry.io/collector/pdata v0.64.2-0.20221117234814-4565692c50a7 + go.opentelemetry.io/collector/processor/batchprocessor v0.64.2-0.20221117234814-4565692c50a7 + go.opentelemetry.io/collector/receiver/otlpreceiver v0.64.2-0.20221117234814-4565692c50a7 + go.opentelemetry.io/collector/semconv v0.64.2-0.20221117234814-4565692c50a7 go.uber.org/multierr v1.8.0 go.uber.org/zap v1.23.0 google.golang.org/grpc v1.50.1 diff --git a/processor/spanmetricsprocessor/go.sum b/processor/spanmetricsprocessor/go.sum index 914f9ece0da26..0f6cd0a0d8c0a 100644 --- a/processor/spanmetricsprocessor/go.sum +++ b/processor/spanmetricsprocessor/go.sum @@ -615,19 +615,25 @@ go.opencensus.io v0.22.5/go.mod h1:5pWMHQbX5EPX2/62yrJeAkowc+lfs/XD7Uxpq3pI6kk= go.opencensus.io v0.23.0/go.mod h1:XItmlyltB5F7CS4xOC1DcqMoFqwtC6OG2xF7mCv7P7E= go.opencensus.io v0.24.0 h1:y73uSU6J157QMP2kn2r30vwW1A2W2WFwSCGnAVxeaD0= go.opencensus.io v0.24.0/go.mod h1:vNK8G9p7aAivkbmorf4v+7Hgx+Zs0yY+0fOtgBfjQKo= -go.opentelemetry.io/collector v0.64.2-0.20221115155901-1550938c18fd h1:O+6HhE4Ivg8Jksp3dIXIEC4FIR0Ush4uORvG3UtHZWk= -go.opentelemetry.io/collector v0.64.2-0.20221115155901-1550938c18fd/go.mod h1:mmSrOcwe1vEYmChXUYuF6rzlrUL0rjEiPfa19Xxb41o= -go.opentelemetry.io/collector/exporter/otlpexporter v0.64.2-0.20221115155901-1550938c18fd h1:Aba3DLnRML3J2567NIKeXwryvHGwckIkXkmrA/C/BzI= -go.opentelemetry.io/collector/exporter/otlpexporter v0.64.2-0.20221115155901-1550938c18fd/go.mod h1:5bfOtQfZ3XtaIGfavOrh8gHn+vvUZ2kB27dIrw6T1aY= +go.opentelemetry.io/collector v0.64.2-0.20221117234814-4565692c50a7 h1:o/vMr2iyXzaeTb/KAldhMxAvRIfFPwtKfL5cKVKsSlU= +go.opentelemetry.io/collector v0.64.2-0.20221117234814-4565692c50a7/go.mod h1:PO8hayFFYvXDqELbXRVxwawR2HTdjN6mY4Qa3Se9xI8= +go.opentelemetry.io/collector/component v0.0.0-20221117234814-4565692c50a7 h1:q9m1bGHhQFUakQX79lZpLmFSY9VLULNSs2jUG8MdJLA= +go.opentelemetry.io/collector/component v0.0.0-20221117234814-4565692c50a7/go.mod h1:Z7H1Oj826e4dtVxXmT6SiUr6S0EIevUJmkVpfQV+UOk= +go.opentelemetry.io/collector/consumer v0.0.0-20221117234814-4565692c50a7 h1:FTy1JD9EJ7gq9SzlZoi2NkGcZ88+SwdiJav5uRcDEEY= +go.opentelemetry.io/collector/consumer v0.0.0-20221117234814-4565692c50a7/go.mod h1:86Elcw/LLrh90DprArogHMkBX3+UMu3tIgcVWF3mr6o= +go.opentelemetry.io/collector/exporter/otlpexporter v0.64.2-0.20221117234814-4565692c50a7 h1:Pw+375oxebSKKDDQjOFSMFSfopmx6gARuqTmQD1njGY= +go.opentelemetry.io/collector/exporter/otlpexporter v0.64.2-0.20221117234814-4565692c50a7/go.mod h1:X6iHDUlspR3fJ3zvZskB+d9/PXaC/zYMbHrtfvk9yNk= go.opentelemetry.io/collector/extension/zpagesextension v0.64.1 h1:2qTBtVigWNwPSpN9XR+WobC1idF2S8X/FIahFGCE1i4= -go.opentelemetry.io/collector/pdata v0.64.2-0.20221115155901-1550938c18fd h1:GdVAbRiae5VDZe3Mn3FqzMxO/aI5UbJ4+dcviqClHy8= -go.opentelemetry.io/collector/pdata v0.64.2-0.20221115155901-1550938c18fd/go.mod h1:0vynPfW2ZN7DltpcCFgCmTtWMQkCjp2a3TNt82YTCLQ= -go.opentelemetry.io/collector/processor/batchprocessor v0.64.2-0.20221115155901-1550938c18fd h1:SSjP8V0UP2+oPZ3gL+Dk90KQcvHXvHp9V5h8IIpx0og= -go.opentelemetry.io/collector/processor/batchprocessor v0.64.2-0.20221115155901-1550938c18fd/go.mod h1:zyCnX0aTvBaZ3XLWSHZdTueP7WoXRjz8X6HiWgKqstM= -go.opentelemetry.io/collector/receiver/otlpreceiver v0.64.2-0.20221115155901-1550938c18fd h1:hMuRptXpQYC9dk7x68LIFeVEpoE3oM+ddI6o13cS73Q= -go.opentelemetry.io/collector/receiver/otlpreceiver v0.64.2-0.20221115155901-1550938c18fd/go.mod h1:i80XzKLKheio/axok7WksVx/xmNGRadfmlzhWOWDnr4= -go.opentelemetry.io/collector/semconv v0.64.2-0.20221115155901-1550938c18fd h1:rMqcl2pwi8YtVrtOPK8tVh87W0bFBge4yqB9ypSsAJ4= -go.opentelemetry.io/collector/semconv v0.64.2-0.20221115155901-1550938c18fd/go.mod h1:5o9yhOa+ABt7g2E5JABDxGZ1PQPbtfxrKNbYn+LOTXU= +go.opentelemetry.io/collector/featuregate v0.0.0-20221117214536-6a117bfc3737 h1:7sXg6M9Fw6rFVlX+iaWOMz6DFXEiroUdQer5kWGixwM= +go.opentelemetry.io/collector/featuregate v0.0.0-20221117214536-6a117bfc3737/go.mod h1:tewuFKJYalWBU0bmNKg++MC1ipINXUr6szYzOw2p1GI= +go.opentelemetry.io/collector/pdata v0.64.2-0.20221117234814-4565692c50a7 h1:IOFqfOu7fFxTgC7pvc2U7dk1/uFjwVQPK+CALiUvacI= +go.opentelemetry.io/collector/pdata v0.64.2-0.20221117234814-4565692c50a7/go.mod h1:0vynPfW2ZN7DltpcCFgCmTtWMQkCjp2a3TNt82YTCLQ= +go.opentelemetry.io/collector/processor/batchprocessor v0.64.2-0.20221117234814-4565692c50a7 h1:hGDq2T07j6qwwtQ2t6ZGU5tp/J2Dvu9mfY5qnnP5Ic8= +go.opentelemetry.io/collector/processor/batchprocessor v0.64.2-0.20221117234814-4565692c50a7/go.mod h1:b83iea2eDSAQkvd+2aSokaa6GRjSIsaR2zILziF/Ogc= +go.opentelemetry.io/collector/receiver/otlpreceiver v0.64.2-0.20221117234814-4565692c50a7 h1:n2zHwTL1xcJ1DtKrGUAXVT12hCN0b5tjVqQV974xCsA= +go.opentelemetry.io/collector/receiver/otlpreceiver v0.64.2-0.20221117234814-4565692c50a7/go.mod h1:CZy46KR3rC5HVHWouklB9oyg7SU9OIRmcKyw6+m+rCk= +go.opentelemetry.io/collector/semconv v0.64.2-0.20221117234814-4565692c50a7 h1:cGXAVltDxXw9nj0Vr7vyZZTj0whdyO+GYs+xv0xHJ2A= +go.opentelemetry.io/collector/semconv v0.64.2-0.20221117234814-4565692c50a7/go.mod h1:5o9yhOa+ABt7g2E5JABDxGZ1PQPbtfxrKNbYn+LOTXU= go.opentelemetry.io/contrib/instrumentation/google.golang.org/grpc/otelgrpc v0.36.4 h1:PRXhsszxTt5bbPriTjmaweWUsAnJYeWBhUMLRetUgBU= go.opentelemetry.io/contrib/instrumentation/google.golang.org/grpc/otelgrpc v0.36.4/go.mod h1:05eWWy6ZWzmpeImD3UowLTB3VjDMU1yxQ+ENuVWDM3c= go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.36.4 h1:aUEBEdCa6iamGzg6fuYxDA8ThxvOG240mAvWDU+XLio= diff --git a/processor/spanprocessor/config_test.go b/processor/spanprocessor/config_test.go index 3073b085b6b99..143ac7b12e47e 100644 --- a/processor/spanprocessor/config_test.go +++ b/processor/spanprocessor/config_test.go @@ -128,7 +128,7 @@ func TestLoadingConfig(t *testing.T) { require.NoError(t, err) require.NoError(t, component.UnmarshalProcessorConfig(sub, cfg)) - assert.NoError(t, cfg.Validate()) + assert.NoError(t, component.ValidateConfig(cfg)) assert.Equal(t, tt.expected, cfg) }) } diff --git a/processor/spanprocessor/go.mod b/processor/spanprocessor/go.mod index 208883e633b0a..9e222b3f64308 100644 --- a/processor/spanprocessor/go.mod +++ b/processor/spanprocessor/go.mod @@ -5,9 +5,11 @@ go 1.18 require ( github.com/open-telemetry/opentelemetry-collector-contrib/internal/coreinternal v0.64.0 github.com/stretchr/testify v1.8.1 - go.opentelemetry.io/collector v0.64.2-0.20221115155901-1550938c18fd - go.opentelemetry.io/collector/pdata v0.64.2-0.20221115155901-1550938c18fd - go.opentelemetry.io/collector/semconv v0.64.2-0.20221115155901-1550938c18fd + go.opentelemetry.io/collector v0.64.2-0.20221117234814-4565692c50a7 + go.opentelemetry.io/collector/component v0.0.0-20221117234814-4565692c50a7 + go.opentelemetry.io/collector/consumer v0.0.0-20221117234814-4565692c50a7 + go.opentelemetry.io/collector/pdata v0.64.2-0.20221117234814-4565692c50a7 + go.opentelemetry.io/collector/semconv v0.64.2-0.20221117234814-4565692c50a7 ) require ( @@ -25,6 +27,7 @@ require ( github.com/pmezard/go-difflib v1.0.0 // indirect github.com/spf13/cast v1.5.0 // indirect go.opencensus.io v0.24.0 // indirect + go.opentelemetry.io/collector/featuregate v0.0.0-20221117214536-6a117bfc3737 // indirect go.opentelemetry.io/otel v1.11.1 // indirect go.opentelemetry.io/otel/metric v0.33.0 // indirect go.opentelemetry.io/otel/trace v1.11.1 // indirect diff --git a/processor/spanprocessor/go.sum b/processor/spanprocessor/go.sum index 6c66b25dcd690..713aa48723c45 100644 --- a/processor/spanprocessor/go.sum +++ b/processor/spanprocessor/go.sum @@ -261,12 +261,18 @@ go.etcd.io/etcd/client/pkg/v3 v3.5.4/go.mod h1:IJHfcCEKxYu1Os13ZdwCwIUTUVGYTSAM3 go.etcd.io/etcd/client/v3 v3.5.4/go.mod h1:ZaRkVgBZC+L+dLCjTcF1hRXpgZXQPOvnA/Ak/gq3kiY= go.opencensus.io v0.24.0 h1:y73uSU6J157QMP2kn2r30vwW1A2W2WFwSCGnAVxeaD0= go.opencensus.io v0.24.0/go.mod h1:vNK8G9p7aAivkbmorf4v+7Hgx+Zs0yY+0fOtgBfjQKo= -go.opentelemetry.io/collector v0.64.2-0.20221115155901-1550938c18fd h1:O+6HhE4Ivg8Jksp3dIXIEC4FIR0Ush4uORvG3UtHZWk= -go.opentelemetry.io/collector v0.64.2-0.20221115155901-1550938c18fd/go.mod h1:mmSrOcwe1vEYmChXUYuF6rzlrUL0rjEiPfa19Xxb41o= -go.opentelemetry.io/collector/pdata v0.64.2-0.20221115155901-1550938c18fd h1:GdVAbRiae5VDZe3Mn3FqzMxO/aI5UbJ4+dcviqClHy8= -go.opentelemetry.io/collector/pdata v0.64.2-0.20221115155901-1550938c18fd/go.mod h1:0vynPfW2ZN7DltpcCFgCmTtWMQkCjp2a3TNt82YTCLQ= -go.opentelemetry.io/collector/semconv v0.64.2-0.20221115155901-1550938c18fd h1:rMqcl2pwi8YtVrtOPK8tVh87W0bFBge4yqB9ypSsAJ4= -go.opentelemetry.io/collector/semconv v0.64.2-0.20221115155901-1550938c18fd/go.mod h1:5o9yhOa+ABt7g2E5JABDxGZ1PQPbtfxrKNbYn+LOTXU= +go.opentelemetry.io/collector v0.64.2-0.20221117234814-4565692c50a7 h1:o/vMr2iyXzaeTb/KAldhMxAvRIfFPwtKfL5cKVKsSlU= +go.opentelemetry.io/collector v0.64.2-0.20221117234814-4565692c50a7/go.mod h1:PO8hayFFYvXDqELbXRVxwawR2HTdjN6mY4Qa3Se9xI8= +go.opentelemetry.io/collector/component v0.0.0-20221117234814-4565692c50a7 h1:q9m1bGHhQFUakQX79lZpLmFSY9VLULNSs2jUG8MdJLA= +go.opentelemetry.io/collector/component v0.0.0-20221117234814-4565692c50a7/go.mod h1:Z7H1Oj826e4dtVxXmT6SiUr6S0EIevUJmkVpfQV+UOk= +go.opentelemetry.io/collector/consumer v0.0.0-20221117234814-4565692c50a7 h1:FTy1JD9EJ7gq9SzlZoi2NkGcZ88+SwdiJav5uRcDEEY= +go.opentelemetry.io/collector/consumer v0.0.0-20221117234814-4565692c50a7/go.mod h1:86Elcw/LLrh90DprArogHMkBX3+UMu3tIgcVWF3mr6o= +go.opentelemetry.io/collector/featuregate v0.0.0-20221117214536-6a117bfc3737 h1:7sXg6M9Fw6rFVlX+iaWOMz6DFXEiroUdQer5kWGixwM= +go.opentelemetry.io/collector/featuregate v0.0.0-20221117214536-6a117bfc3737/go.mod h1:tewuFKJYalWBU0bmNKg++MC1ipINXUr6szYzOw2p1GI= +go.opentelemetry.io/collector/pdata v0.64.2-0.20221117234814-4565692c50a7 h1:IOFqfOu7fFxTgC7pvc2U7dk1/uFjwVQPK+CALiUvacI= +go.opentelemetry.io/collector/pdata v0.64.2-0.20221117234814-4565692c50a7/go.mod h1:0vynPfW2ZN7DltpcCFgCmTtWMQkCjp2a3TNt82YTCLQ= +go.opentelemetry.io/collector/semconv v0.64.2-0.20221117234814-4565692c50a7 h1:cGXAVltDxXw9nj0Vr7vyZZTj0whdyO+GYs+xv0xHJ2A= +go.opentelemetry.io/collector/semconv v0.64.2-0.20221117234814-4565692c50a7/go.mod h1:5o9yhOa+ABt7g2E5JABDxGZ1PQPbtfxrKNbYn+LOTXU= go.opentelemetry.io/otel v1.11.1 h1:4WLLAmcfkmDk2ukNXJyq3/kiz/3UzCaYq6PskJsaou4= go.opentelemetry.io/otel v1.11.1/go.mod h1:1nNhXBbWSD0nsL38H6btgnFN2k4i0sNLHNNMZMSbUGE= go.opentelemetry.io/otel/metric v0.33.0 h1:xQAyl7uGEYvrLAiV/09iTJlp1pZnQ9Wl793qbVvED1E= diff --git a/processor/tailsamplingprocessor/go.mod b/processor/tailsamplingprocessor/go.mod index 909c6f762ea75..803ee608acc6c 100644 --- a/processor/tailsamplingprocessor/go.mod +++ b/processor/tailsamplingprocessor/go.mod @@ -8,8 +8,10 @@ require ( github.com/open-telemetry/opentelemetry-collector-contrib/internal/coreinternal v0.64.0 github.com/stretchr/testify v1.8.1 go.opencensus.io v0.24.0 - go.opentelemetry.io/collector v0.64.2-0.20221115155901-1550938c18fd - go.opentelemetry.io/collector/pdata v0.64.2-0.20221115155901-1550938c18fd + go.opentelemetry.io/collector v0.64.2-0.20221117234814-4565692c50a7 + go.opentelemetry.io/collector/component v0.0.0-20221117234814-4565692c50a7 + go.opentelemetry.io/collector/consumer v0.0.0-20221117234814-4565692c50a7 + go.opentelemetry.io/collector/pdata v0.64.2-0.20221117234814-4565692c50a7 go.opentelemetry.io/otel/trace v1.11.1 go.uber.org/atomic v1.10.0 go.uber.org/goleak v1.2.0 @@ -29,6 +31,7 @@ require ( github.com/modern-go/concurrent v0.0.0-20180306012644-bacd9c7ef1dd // indirect github.com/modern-go/reflect2 v1.0.2 // indirect github.com/pmezard/go-difflib v1.0.0 // indirect + go.opentelemetry.io/collector/featuregate v0.0.0-20221117214536-6a117bfc3737 // indirect go.opentelemetry.io/otel v1.11.1 // indirect go.opentelemetry.io/otel/metric v0.33.0 // indirect go.uber.org/multierr v1.8.0 // indirect diff --git a/processor/tailsamplingprocessor/go.sum b/processor/tailsamplingprocessor/go.sum index c86a4d3e9f308..dc91576816ee8 100644 --- a/processor/tailsamplingprocessor/go.sum +++ b/processor/tailsamplingprocessor/go.sum @@ -274,10 +274,16 @@ go.etcd.io/etcd/client/pkg/v3 v3.5.4/go.mod h1:IJHfcCEKxYu1Os13ZdwCwIUTUVGYTSAM3 go.etcd.io/etcd/client/v3 v3.5.4/go.mod h1:ZaRkVgBZC+L+dLCjTcF1hRXpgZXQPOvnA/Ak/gq3kiY= go.opencensus.io v0.24.0 h1:y73uSU6J157QMP2kn2r30vwW1A2W2WFwSCGnAVxeaD0= go.opencensus.io v0.24.0/go.mod h1:vNK8G9p7aAivkbmorf4v+7Hgx+Zs0yY+0fOtgBfjQKo= -go.opentelemetry.io/collector v0.64.2-0.20221115155901-1550938c18fd h1:O+6HhE4Ivg8Jksp3dIXIEC4FIR0Ush4uORvG3UtHZWk= -go.opentelemetry.io/collector v0.64.2-0.20221115155901-1550938c18fd/go.mod h1:mmSrOcwe1vEYmChXUYuF6rzlrUL0rjEiPfa19Xxb41o= -go.opentelemetry.io/collector/pdata v0.64.2-0.20221115155901-1550938c18fd h1:GdVAbRiae5VDZe3Mn3FqzMxO/aI5UbJ4+dcviqClHy8= -go.opentelemetry.io/collector/pdata v0.64.2-0.20221115155901-1550938c18fd/go.mod h1:0vynPfW2ZN7DltpcCFgCmTtWMQkCjp2a3TNt82YTCLQ= +go.opentelemetry.io/collector v0.64.2-0.20221117234814-4565692c50a7 h1:o/vMr2iyXzaeTb/KAldhMxAvRIfFPwtKfL5cKVKsSlU= +go.opentelemetry.io/collector v0.64.2-0.20221117234814-4565692c50a7/go.mod h1:PO8hayFFYvXDqELbXRVxwawR2HTdjN6mY4Qa3Se9xI8= +go.opentelemetry.io/collector/component v0.0.0-20221117234814-4565692c50a7 h1:q9m1bGHhQFUakQX79lZpLmFSY9VLULNSs2jUG8MdJLA= +go.opentelemetry.io/collector/component v0.0.0-20221117234814-4565692c50a7/go.mod h1:Z7H1Oj826e4dtVxXmT6SiUr6S0EIevUJmkVpfQV+UOk= +go.opentelemetry.io/collector/consumer v0.0.0-20221117234814-4565692c50a7 h1:FTy1JD9EJ7gq9SzlZoi2NkGcZ88+SwdiJav5uRcDEEY= +go.opentelemetry.io/collector/consumer v0.0.0-20221117234814-4565692c50a7/go.mod h1:86Elcw/LLrh90DprArogHMkBX3+UMu3tIgcVWF3mr6o= +go.opentelemetry.io/collector/featuregate v0.0.0-20221117214536-6a117bfc3737 h1:7sXg6M9Fw6rFVlX+iaWOMz6DFXEiroUdQer5kWGixwM= +go.opentelemetry.io/collector/featuregate v0.0.0-20221117214536-6a117bfc3737/go.mod h1:tewuFKJYalWBU0bmNKg++MC1ipINXUr6szYzOw2p1GI= +go.opentelemetry.io/collector/pdata v0.64.2-0.20221117234814-4565692c50a7 h1:IOFqfOu7fFxTgC7pvc2U7dk1/uFjwVQPK+CALiUvacI= +go.opentelemetry.io/collector/pdata v0.64.2-0.20221117234814-4565692c50a7/go.mod h1:0vynPfW2ZN7DltpcCFgCmTtWMQkCjp2a3TNt82YTCLQ= go.opentelemetry.io/otel v1.11.1 h1:4WLLAmcfkmDk2ukNXJyq3/kiz/3UzCaYq6PskJsaou4= go.opentelemetry.io/otel v1.11.1/go.mod h1:1nNhXBbWSD0nsL38H6btgnFN2k4i0sNLHNNMZMSbUGE= go.opentelemetry.io/otel/exporters/prometheus v0.33.0 h1:xXhPj7SLKWU5/Zd4Hxmd+X1C4jdmvc0Xy+kvjFx2z60= diff --git a/processor/transformprocessor/config_test.go b/processor/transformprocessor/config_test.go index 9c9e4d592640f..24f37b426e857 100644 --- a/processor/transformprocessor/config_test.go +++ b/processor/transformprocessor/config_test.go @@ -167,10 +167,10 @@ func TestLoadConfig(t *testing.T) { assert.NoError(t, component.UnmarshalProcessorConfig(sub, cfg)) if tt.expected == nil { - assert.EqualError(t, cfg.Validate(), tt.errorMessage) + assert.EqualError(t, component.ValidateConfig(cfg), tt.errorMessage) return } - assert.NoError(t, cfg.Validate()) + assert.NoError(t, component.ValidateConfig(cfg)) assert.Equal(t, tt.expected, cfg) }) } diff --git a/processor/transformprocessor/factory_test.go b/processor/transformprocessor/factory_test.go index 7b6554be92013..eb16bd1a6d744 100644 --- a/processor/transformprocessor/factory_test.go +++ b/processor/transformprocessor/factory_test.go @@ -61,7 +61,7 @@ func TestFactory_CreateDefaultConfig(t *testing.T) { func TestFactoryCreateProcessor_Empty(t *testing.T) { factory := NewFactory() cfg := factory.CreateDefaultConfig() - err := cfg.Validate() + err := component.ValidateConfig(cfg) assert.NoError(t, err) } diff --git a/processor/transformprocessor/go.mod b/processor/transformprocessor/go.mod index 2907e5732812d..d45a0f38b129c 100644 --- a/processor/transformprocessor/go.mod +++ b/processor/transformprocessor/go.mod @@ -5,8 +5,10 @@ go 1.18 require ( github.com/open-telemetry/opentelemetry-collector-contrib/pkg/ottl v0.64.0 github.com/stretchr/testify v1.8.1 - go.opentelemetry.io/collector v0.64.2-0.20221115155901-1550938c18fd - go.opentelemetry.io/collector/pdata v0.64.2-0.20221115155901-1550938c18fd + go.opentelemetry.io/collector v0.64.2-0.20221117234814-4565692c50a7 + go.opentelemetry.io/collector/component v0.0.0-20221117234814-4565692c50a7 + go.opentelemetry.io/collector/consumer v0.0.0-20221117234814-4565692c50a7 + go.opentelemetry.io/collector/pdata v0.64.2-0.20221117234814-4565692c50a7 go.uber.org/zap v1.23.0 ) @@ -29,6 +31,7 @@ require ( github.com/pmezard/go-difflib v1.0.0 // indirect github.com/rogpeppe/go-internal v1.6.1 // indirect go.opencensus.io v0.24.0 // indirect + go.opentelemetry.io/collector/featuregate v0.0.0-20221117214536-6a117bfc3737 // indirect go.opentelemetry.io/otel v1.11.1 // indirect go.opentelemetry.io/otel/metric v0.33.0 // indirect go.opentelemetry.io/otel/trace v1.11.1 // indirect diff --git a/processor/transformprocessor/go.sum b/processor/transformprocessor/go.sum index 53dfe50871016..c35fdbb3682e1 100644 --- a/processor/transformprocessor/go.sum +++ b/processor/transformprocessor/go.sum @@ -269,10 +269,16 @@ go.etcd.io/etcd/client/pkg/v3 v3.5.4/go.mod h1:IJHfcCEKxYu1Os13ZdwCwIUTUVGYTSAM3 go.etcd.io/etcd/client/v3 v3.5.4/go.mod h1:ZaRkVgBZC+L+dLCjTcF1hRXpgZXQPOvnA/Ak/gq3kiY= go.opencensus.io v0.24.0 h1:y73uSU6J157QMP2kn2r30vwW1A2W2WFwSCGnAVxeaD0= go.opencensus.io v0.24.0/go.mod h1:vNK8G9p7aAivkbmorf4v+7Hgx+Zs0yY+0fOtgBfjQKo= -go.opentelemetry.io/collector v0.64.2-0.20221115155901-1550938c18fd h1:O+6HhE4Ivg8Jksp3dIXIEC4FIR0Ush4uORvG3UtHZWk= -go.opentelemetry.io/collector v0.64.2-0.20221115155901-1550938c18fd/go.mod h1:mmSrOcwe1vEYmChXUYuF6rzlrUL0rjEiPfa19Xxb41o= -go.opentelemetry.io/collector/pdata v0.64.2-0.20221115155901-1550938c18fd h1:GdVAbRiae5VDZe3Mn3FqzMxO/aI5UbJ4+dcviqClHy8= -go.opentelemetry.io/collector/pdata v0.64.2-0.20221115155901-1550938c18fd/go.mod h1:0vynPfW2ZN7DltpcCFgCmTtWMQkCjp2a3TNt82YTCLQ= +go.opentelemetry.io/collector v0.64.2-0.20221117234814-4565692c50a7 h1:o/vMr2iyXzaeTb/KAldhMxAvRIfFPwtKfL5cKVKsSlU= +go.opentelemetry.io/collector v0.64.2-0.20221117234814-4565692c50a7/go.mod h1:PO8hayFFYvXDqELbXRVxwawR2HTdjN6mY4Qa3Se9xI8= +go.opentelemetry.io/collector/component v0.0.0-20221117234814-4565692c50a7 h1:q9m1bGHhQFUakQX79lZpLmFSY9VLULNSs2jUG8MdJLA= +go.opentelemetry.io/collector/component v0.0.0-20221117234814-4565692c50a7/go.mod h1:Z7H1Oj826e4dtVxXmT6SiUr6S0EIevUJmkVpfQV+UOk= +go.opentelemetry.io/collector/consumer v0.0.0-20221117234814-4565692c50a7 h1:FTy1JD9EJ7gq9SzlZoi2NkGcZ88+SwdiJav5uRcDEEY= +go.opentelemetry.io/collector/consumer v0.0.0-20221117234814-4565692c50a7/go.mod h1:86Elcw/LLrh90DprArogHMkBX3+UMu3tIgcVWF3mr6o= +go.opentelemetry.io/collector/featuregate v0.0.0-20221117214536-6a117bfc3737 h1:7sXg6M9Fw6rFVlX+iaWOMz6DFXEiroUdQer5kWGixwM= +go.opentelemetry.io/collector/featuregate v0.0.0-20221117214536-6a117bfc3737/go.mod h1:tewuFKJYalWBU0bmNKg++MC1ipINXUr6szYzOw2p1GI= +go.opentelemetry.io/collector/pdata v0.64.2-0.20221117234814-4565692c50a7 h1:IOFqfOu7fFxTgC7pvc2U7dk1/uFjwVQPK+CALiUvacI= +go.opentelemetry.io/collector/pdata v0.64.2-0.20221117234814-4565692c50a7/go.mod h1:0vynPfW2ZN7DltpcCFgCmTtWMQkCjp2a3TNt82YTCLQ= go.opentelemetry.io/otel v1.11.1 h1:4WLLAmcfkmDk2ukNXJyq3/kiz/3UzCaYq6PskJsaou4= go.opentelemetry.io/otel v1.11.1/go.mod h1:1nNhXBbWSD0nsL38H6btgnFN2k4i0sNLHNNMZMSbUGE= go.opentelemetry.io/otel/metric v0.33.0 h1:xQAyl7uGEYvrLAiV/09iTJlp1pZnQ9Wl793qbVvED1E= diff --git a/receiver/activedirectorydsreceiver/config_test.go b/receiver/activedirectorydsreceiver/config_test.go index 0cb4f5ca1655f..493b0ec2fc37c 100644 --- a/receiver/activedirectorydsreceiver/config_test.go +++ b/receiver/activedirectorydsreceiver/config_test.go @@ -68,7 +68,7 @@ func TestLoadConfig(t *testing.T) { require.NoError(t, err) require.NoError(t, component.UnmarshalReceiverConfig(sub, cfg)) - assert.NoError(t, cfg.Validate()) + assert.NoError(t, component.ValidateConfig(cfg)) if diff := cmp.Diff(tt.expected, cfg, cmpopts.IgnoreUnexported(config.ReceiverSettings{}, metadata.MetricSettings{})); diff != "" { t.Errorf("Config mismatch (-expected +actual):\n%s", diff) } diff --git a/receiver/activedirectorydsreceiver/go.mod b/receiver/activedirectorydsreceiver/go.mod index 29a09e30bf87d..9c00c88f26626 100644 --- a/receiver/activedirectorydsreceiver/go.mod +++ b/receiver/activedirectorydsreceiver/go.mod @@ -7,8 +7,10 @@ require ( github.com/open-telemetry/opentelemetry-collector-contrib/internal/scrapertest v0.64.0 github.com/open-telemetry/opentelemetry-collector-contrib/pkg/winperfcounters v0.64.0 github.com/stretchr/testify v1.8.1 - go.opentelemetry.io/collector v0.64.2-0.20221115155901-1550938c18fd - go.opentelemetry.io/collector/pdata v0.64.2-0.20221115155901-1550938c18fd + go.opentelemetry.io/collector v0.64.2-0.20221117234814-4565692c50a7 + go.opentelemetry.io/collector/component v0.0.0-20221117234814-4565692c50a7 + go.opentelemetry.io/collector/consumer v0.0.0-20221117234814-4565692c50a7 + go.opentelemetry.io/collector/pdata v0.64.2-0.20221117234814-4565692c50a7 go.uber.org/multierr v1.8.0 ) @@ -26,6 +28,7 @@ require ( github.com/modern-go/reflect2 v1.0.2 // indirect github.com/pmezard/go-difflib v1.0.0 // indirect go.opencensus.io v0.24.0 // indirect + go.opentelemetry.io/collector/featuregate v0.0.0-20221117214536-6a117bfc3737 // indirect go.opentelemetry.io/otel v1.11.1 // indirect go.opentelemetry.io/otel/metric v0.33.0 // indirect go.opentelemetry.io/otel/trace v1.11.1 // indirect diff --git a/receiver/activedirectorydsreceiver/go.sum b/receiver/activedirectorydsreceiver/go.sum index 6ea4c78969a38..d026e1e7c7c6b 100644 --- a/receiver/activedirectorydsreceiver/go.sum +++ b/receiver/activedirectorydsreceiver/go.sum @@ -280,10 +280,16 @@ go.etcd.io/etcd/client/pkg/v3 v3.5.4/go.mod h1:IJHfcCEKxYu1Os13ZdwCwIUTUVGYTSAM3 go.etcd.io/etcd/client/v3 v3.5.4/go.mod h1:ZaRkVgBZC+L+dLCjTcF1hRXpgZXQPOvnA/Ak/gq3kiY= go.opencensus.io v0.24.0 h1:y73uSU6J157QMP2kn2r30vwW1A2W2WFwSCGnAVxeaD0= go.opencensus.io v0.24.0/go.mod h1:vNK8G9p7aAivkbmorf4v+7Hgx+Zs0yY+0fOtgBfjQKo= -go.opentelemetry.io/collector v0.64.2-0.20221115155901-1550938c18fd h1:O+6HhE4Ivg8Jksp3dIXIEC4FIR0Ush4uORvG3UtHZWk= -go.opentelemetry.io/collector v0.64.2-0.20221115155901-1550938c18fd/go.mod h1:mmSrOcwe1vEYmChXUYuF6rzlrUL0rjEiPfa19Xxb41o= -go.opentelemetry.io/collector/pdata v0.64.2-0.20221115155901-1550938c18fd h1:GdVAbRiae5VDZe3Mn3FqzMxO/aI5UbJ4+dcviqClHy8= -go.opentelemetry.io/collector/pdata v0.64.2-0.20221115155901-1550938c18fd/go.mod h1:0vynPfW2ZN7DltpcCFgCmTtWMQkCjp2a3TNt82YTCLQ= +go.opentelemetry.io/collector v0.64.2-0.20221117234814-4565692c50a7 h1:o/vMr2iyXzaeTb/KAldhMxAvRIfFPwtKfL5cKVKsSlU= +go.opentelemetry.io/collector v0.64.2-0.20221117234814-4565692c50a7/go.mod h1:PO8hayFFYvXDqELbXRVxwawR2HTdjN6mY4Qa3Se9xI8= +go.opentelemetry.io/collector/component v0.0.0-20221117234814-4565692c50a7 h1:q9m1bGHhQFUakQX79lZpLmFSY9VLULNSs2jUG8MdJLA= +go.opentelemetry.io/collector/component v0.0.0-20221117234814-4565692c50a7/go.mod h1:Z7H1Oj826e4dtVxXmT6SiUr6S0EIevUJmkVpfQV+UOk= +go.opentelemetry.io/collector/consumer v0.0.0-20221117234814-4565692c50a7 h1:FTy1JD9EJ7gq9SzlZoi2NkGcZ88+SwdiJav5uRcDEEY= +go.opentelemetry.io/collector/consumer v0.0.0-20221117234814-4565692c50a7/go.mod h1:86Elcw/LLrh90DprArogHMkBX3+UMu3tIgcVWF3mr6o= +go.opentelemetry.io/collector/featuregate v0.0.0-20221117214536-6a117bfc3737 h1:7sXg6M9Fw6rFVlX+iaWOMz6DFXEiroUdQer5kWGixwM= +go.opentelemetry.io/collector/featuregate v0.0.0-20221117214536-6a117bfc3737/go.mod h1:tewuFKJYalWBU0bmNKg++MC1ipINXUr6szYzOw2p1GI= +go.opentelemetry.io/collector/pdata v0.64.2-0.20221117234814-4565692c50a7 h1:IOFqfOu7fFxTgC7pvc2U7dk1/uFjwVQPK+CALiUvacI= +go.opentelemetry.io/collector/pdata v0.64.2-0.20221117234814-4565692c50a7/go.mod h1:0vynPfW2ZN7DltpcCFgCmTtWMQkCjp2a3TNt82YTCLQ= go.opentelemetry.io/otel v1.11.1 h1:4WLLAmcfkmDk2ukNXJyq3/kiz/3UzCaYq6PskJsaou4= go.opentelemetry.io/otel v1.11.1/go.mod h1:1nNhXBbWSD0nsL38H6btgnFN2k4i0sNLHNNMZMSbUGE= go.opentelemetry.io/otel/exporters/prometheus v0.33.0 h1:xXhPj7SLKWU5/Zd4Hxmd+X1C4jdmvc0Xy+kvjFx2z60= diff --git a/receiver/aerospikereceiver/go.mod b/receiver/aerospikereceiver/go.mod index 57e763d33b39a..9a1f42a1cbc52 100644 --- a/receiver/aerospikereceiver/go.mod +++ b/receiver/aerospikereceiver/go.mod @@ -7,8 +7,10 @@ require ( github.com/open-telemetry/opentelemetry-collector-contrib/internal/scrapertest v0.64.0 github.com/stretchr/testify v1.8.1 github.com/testcontainers/testcontainers-go v0.15.0 - go.opentelemetry.io/collector v0.64.2-0.20221115155901-1550938c18fd - go.opentelemetry.io/collector/pdata v0.64.2-0.20221115155901-1550938c18fd + go.opentelemetry.io/collector v0.64.2-0.20221117234814-4565692c50a7 + go.opentelemetry.io/collector/component v0.0.0-20221117234814-4565692c50a7 + go.opentelemetry.io/collector/consumer v0.0.0-20221117234814-4565692c50a7 + go.opentelemetry.io/collector/pdata v0.64.2-0.20221117234814-4565692c50a7 go.uber.org/multierr v1.8.0 go.uber.org/zap v1.23.0 ) @@ -50,6 +52,7 @@ require ( github.com/stretchr/objx v0.5.0 // indirect github.com/yuin/gopher-lua v0.0.0-20220504180219-658193537a64 // indirect go.opencensus.io v0.24.0 // indirect + go.opentelemetry.io/collector/featuregate v0.0.0-20221117214536-6a117bfc3737 // indirect go.opentelemetry.io/otel v1.11.1 // indirect go.opentelemetry.io/otel/metric v0.33.0 // indirect go.opentelemetry.io/otel/trace v1.11.1 // indirect diff --git a/receiver/aerospikereceiver/go.sum b/receiver/aerospikereceiver/go.sum index f087b3cbb8766..82d3ae527461e 100644 --- a/receiver/aerospikereceiver/go.sum +++ b/receiver/aerospikereceiver/go.sum @@ -834,10 +834,16 @@ go.opencensus.io v0.22.2/go.mod h1:yxeiOL68Rb0Xd1ddK5vPZ/oVn4vY4Ynel7k9FzqtOIw= go.opencensus.io v0.22.3/go.mod h1:yxeiOL68Rb0Xd1ddK5vPZ/oVn4vY4Ynel7k9FzqtOIw= go.opencensus.io v0.24.0 h1:y73uSU6J157QMP2kn2r30vwW1A2W2WFwSCGnAVxeaD0= go.opencensus.io v0.24.0/go.mod h1:vNK8G9p7aAivkbmorf4v+7Hgx+Zs0yY+0fOtgBfjQKo= -go.opentelemetry.io/collector v0.64.2-0.20221115155901-1550938c18fd h1:O+6HhE4Ivg8Jksp3dIXIEC4FIR0Ush4uORvG3UtHZWk= -go.opentelemetry.io/collector v0.64.2-0.20221115155901-1550938c18fd/go.mod h1:mmSrOcwe1vEYmChXUYuF6rzlrUL0rjEiPfa19Xxb41o= -go.opentelemetry.io/collector/pdata v0.64.2-0.20221115155901-1550938c18fd h1:GdVAbRiae5VDZe3Mn3FqzMxO/aI5UbJ4+dcviqClHy8= -go.opentelemetry.io/collector/pdata v0.64.2-0.20221115155901-1550938c18fd/go.mod h1:0vynPfW2ZN7DltpcCFgCmTtWMQkCjp2a3TNt82YTCLQ= +go.opentelemetry.io/collector v0.64.2-0.20221117234814-4565692c50a7 h1:o/vMr2iyXzaeTb/KAldhMxAvRIfFPwtKfL5cKVKsSlU= +go.opentelemetry.io/collector v0.64.2-0.20221117234814-4565692c50a7/go.mod h1:PO8hayFFYvXDqELbXRVxwawR2HTdjN6mY4Qa3Se9xI8= +go.opentelemetry.io/collector/component v0.0.0-20221117234814-4565692c50a7 h1:q9m1bGHhQFUakQX79lZpLmFSY9VLULNSs2jUG8MdJLA= +go.opentelemetry.io/collector/component v0.0.0-20221117234814-4565692c50a7/go.mod h1:Z7H1Oj826e4dtVxXmT6SiUr6S0EIevUJmkVpfQV+UOk= +go.opentelemetry.io/collector/consumer v0.0.0-20221117234814-4565692c50a7 h1:FTy1JD9EJ7gq9SzlZoi2NkGcZ88+SwdiJav5uRcDEEY= +go.opentelemetry.io/collector/consumer v0.0.0-20221117234814-4565692c50a7/go.mod h1:86Elcw/LLrh90DprArogHMkBX3+UMu3tIgcVWF3mr6o= +go.opentelemetry.io/collector/featuregate v0.0.0-20221117214536-6a117bfc3737 h1:7sXg6M9Fw6rFVlX+iaWOMz6DFXEiroUdQer5kWGixwM= +go.opentelemetry.io/collector/featuregate v0.0.0-20221117214536-6a117bfc3737/go.mod h1:tewuFKJYalWBU0bmNKg++MC1ipINXUr6szYzOw2p1GI= +go.opentelemetry.io/collector/pdata v0.64.2-0.20221117234814-4565692c50a7 h1:IOFqfOu7fFxTgC7pvc2U7dk1/uFjwVQPK+CALiUvacI= +go.opentelemetry.io/collector/pdata v0.64.2-0.20221117234814-4565692c50a7/go.mod h1:0vynPfW2ZN7DltpcCFgCmTtWMQkCjp2a3TNt82YTCLQ= go.opentelemetry.io/otel v1.11.1 h1:4WLLAmcfkmDk2ukNXJyq3/kiz/3UzCaYq6PskJsaou4= go.opentelemetry.io/otel v1.11.1/go.mod h1:1nNhXBbWSD0nsL38H6btgnFN2k4i0sNLHNNMZMSbUGE= go.opentelemetry.io/otel/exporters/prometheus v0.33.0 h1:xXhPj7SLKWU5/Zd4Hxmd+X1C4jdmvc0Xy+kvjFx2z60= diff --git a/receiver/apachereceiver/config_test.go b/receiver/apachereceiver/config_test.go index adab083c2659a..d9b8e75bb6432 100644 --- a/receiver/apachereceiver/config_test.go +++ b/receiver/apachereceiver/config_test.go @@ -80,7 +80,7 @@ func TestValidate(t *testing.T) { t.Run(tc.desc, func(t *testing.T) { cfg := NewFactory().CreateDefaultConfig().(*Config) cfg.Endpoint = tc.endpoint - err := cfg.Validate() + err := component.ValidateConfig(cfg) if tc.errExpected { require.EqualError(t, err, tc.errText) return diff --git a/receiver/apachereceiver/factory_test.go b/receiver/apachereceiver/factory_test.go index 8356b7630ef86..f1dbbc9d419c5 100644 --- a/receiver/apachereceiver/factory_test.go +++ b/receiver/apachereceiver/factory_test.go @@ -20,6 +20,7 @@ import ( "time" "github.com/stretchr/testify/require" + "go.opentelemetry.io/collector/component" "go.opentelemetry.io/collector/component/componenttest" "go.opentelemetry.io/collector/consumer/consumertest" "go.opentelemetry.io/collector/receiver/scraperhelper" @@ -33,8 +34,7 @@ func TestType(t *testing.T) { func TestValidConfig(t *testing.T) { factory := NewFactory() - err := factory.CreateDefaultConfig().Validate() - require.NoError(t, err) + require.NoError(t, component.ValidateConfig(factory.CreateDefaultConfig())) } func TestCreateMetricsReceiver(t *testing.T) { diff --git a/receiver/apachereceiver/go.mod b/receiver/apachereceiver/go.mod index 27e81602725c4..a3f6a4d3c8187 100644 --- a/receiver/apachereceiver/go.mod +++ b/receiver/apachereceiver/go.mod @@ -6,8 +6,11 @@ require ( github.com/open-telemetry/opentelemetry-collector-contrib/internal/scrapertest v0.64.0 github.com/stretchr/testify v1.8.1 github.com/testcontainers/testcontainers-go v0.15.0 - go.opentelemetry.io/collector v0.64.2-0.20221115155901-1550938c18fd - go.opentelemetry.io/collector/pdata v0.64.2-0.20221115155901-1550938c18fd + go.opentelemetry.io/collector v0.64.2-0.20221117234814-4565692c50a7 + go.opentelemetry.io/collector/component v0.0.0-20221117234814-4565692c50a7 + go.opentelemetry.io/collector/consumer v0.0.0-20221117234814-4565692c50a7 + go.opentelemetry.io/collector/featuregate v0.0.0-20221117214536-6a117bfc3737 + go.opentelemetry.io/collector/pdata v0.64.2-0.20221117234814-4565692c50a7 go.uber.org/zap v1.23.0 ) diff --git a/receiver/apachereceiver/go.sum b/receiver/apachereceiver/go.sum index 27db6feb149b1..9b8ca86d9d10d 100644 --- a/receiver/apachereceiver/go.sum +++ b/receiver/apachereceiver/go.sum @@ -828,10 +828,16 @@ go.opencensus.io v0.22.2/go.mod h1:yxeiOL68Rb0Xd1ddK5vPZ/oVn4vY4Ynel7k9FzqtOIw= go.opencensus.io v0.22.3/go.mod h1:yxeiOL68Rb0Xd1ddK5vPZ/oVn4vY4Ynel7k9FzqtOIw= go.opencensus.io v0.24.0 h1:y73uSU6J157QMP2kn2r30vwW1A2W2WFwSCGnAVxeaD0= go.opencensus.io v0.24.0/go.mod h1:vNK8G9p7aAivkbmorf4v+7Hgx+Zs0yY+0fOtgBfjQKo= -go.opentelemetry.io/collector v0.64.2-0.20221115155901-1550938c18fd h1:O+6HhE4Ivg8Jksp3dIXIEC4FIR0Ush4uORvG3UtHZWk= -go.opentelemetry.io/collector v0.64.2-0.20221115155901-1550938c18fd/go.mod h1:mmSrOcwe1vEYmChXUYuF6rzlrUL0rjEiPfa19Xxb41o= -go.opentelemetry.io/collector/pdata v0.64.2-0.20221115155901-1550938c18fd h1:GdVAbRiae5VDZe3Mn3FqzMxO/aI5UbJ4+dcviqClHy8= -go.opentelemetry.io/collector/pdata v0.64.2-0.20221115155901-1550938c18fd/go.mod h1:0vynPfW2ZN7DltpcCFgCmTtWMQkCjp2a3TNt82YTCLQ= +go.opentelemetry.io/collector v0.64.2-0.20221117234814-4565692c50a7 h1:o/vMr2iyXzaeTb/KAldhMxAvRIfFPwtKfL5cKVKsSlU= +go.opentelemetry.io/collector v0.64.2-0.20221117234814-4565692c50a7/go.mod h1:PO8hayFFYvXDqELbXRVxwawR2HTdjN6mY4Qa3Se9xI8= +go.opentelemetry.io/collector/component v0.0.0-20221117234814-4565692c50a7 h1:q9m1bGHhQFUakQX79lZpLmFSY9VLULNSs2jUG8MdJLA= +go.opentelemetry.io/collector/component v0.0.0-20221117234814-4565692c50a7/go.mod h1:Z7H1Oj826e4dtVxXmT6SiUr6S0EIevUJmkVpfQV+UOk= +go.opentelemetry.io/collector/consumer v0.0.0-20221117234814-4565692c50a7 h1:FTy1JD9EJ7gq9SzlZoi2NkGcZ88+SwdiJav5uRcDEEY= +go.opentelemetry.io/collector/consumer v0.0.0-20221117234814-4565692c50a7/go.mod h1:86Elcw/LLrh90DprArogHMkBX3+UMu3tIgcVWF3mr6o= +go.opentelemetry.io/collector/featuregate v0.0.0-20221117214536-6a117bfc3737 h1:7sXg6M9Fw6rFVlX+iaWOMz6DFXEiroUdQer5kWGixwM= +go.opentelemetry.io/collector/featuregate v0.0.0-20221117214536-6a117bfc3737/go.mod h1:tewuFKJYalWBU0bmNKg++MC1ipINXUr6szYzOw2p1GI= +go.opentelemetry.io/collector/pdata v0.64.2-0.20221117234814-4565692c50a7 h1:IOFqfOu7fFxTgC7pvc2U7dk1/uFjwVQPK+CALiUvacI= +go.opentelemetry.io/collector/pdata v0.64.2-0.20221117234814-4565692c50a7/go.mod h1:0vynPfW2ZN7DltpcCFgCmTtWMQkCjp2a3TNt82YTCLQ= go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.36.4 h1:aUEBEdCa6iamGzg6fuYxDA8ThxvOG240mAvWDU+XLio= go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.36.4/go.mod h1:l2MdsbKTocpPS5nQZscqTR9jd8u96VYZdcpF8Sye7mA= go.opentelemetry.io/otel v1.11.1 h1:4WLLAmcfkmDk2ukNXJyq3/kiz/3UzCaYq6PskJsaou4= diff --git a/receiver/apachereceiver/scraper_test.go b/receiver/apachereceiver/scraper_test.go index 8f1fe2df970c3..37847235f882b 100644 --- a/receiver/apachereceiver/scraper_test.go +++ b/receiver/apachereceiver/scraper_test.go @@ -25,6 +25,7 @@ import ( "testing" "github.com/stretchr/testify/require" + "go.opentelemetry.io/collector/component" "go.opentelemetry.io/collector/component/componenttest" "go.opentelemetry.io/collector/config/confighttp" "go.opentelemetry.io/collector/config/configtls" @@ -39,7 +40,7 @@ func TestScraper(t *testing.T) { apacheMock := newMockServer(t) cfg := createDefaultConfig().(*Config) cfg.Endpoint = fmt.Sprintf("%s%s", apacheMock.URL, "/server-status?auto") - require.NoError(t, cfg.Validate()) + require.NoError(t, component.ValidateConfig(cfg)) // Let this test check if it works with the feature enabled and the integration test will test the feature disabled. err := featuregate.GetRegistry().Apply(map[string]bool{EmitServerNameAsResourceAttribute: true, EmitPortAsResourceAttribute: true}) diff --git a/receiver/awscloudwatchreceiver/config.go b/receiver/awscloudwatchreceiver/config.go index 36eb0f5899555..a8c1160a87db9 100644 --- a/receiver/awscloudwatchreceiver/config.go +++ b/receiver/awscloudwatchreceiver/config.go @@ -89,7 +89,6 @@ func (c *Config) Validate() error { } var errs error - errs = multierr.Append(errs, c.ReceiverSettings.Validate()) errs = multierr.Append(errs, c.validateLogsConfig()) return errs } diff --git a/receiver/awscloudwatchreceiver/config_test.go b/receiver/awscloudwatchreceiver/config_test.go index b765d3c6d5efb..687c8ce2f3fab 100644 --- a/receiver/awscloudwatchreceiver/config_test.go +++ b/receiver/awscloudwatchreceiver/config_test.go @@ -277,7 +277,7 @@ func TestLoadConfig(t *testing.T) { require.NoError(t, err) require.NoError(t, component.UnmarshalReceiverConfig(loaded, cfg)) require.Equal(t, cfg, tc.expectedConfig) - require.NoError(t, cfg.Validate()) + require.NoError(t, component.ValidateConfig(cfg)) }) } } diff --git a/receiver/awscloudwatchreceiver/go.mod b/receiver/awscloudwatchreceiver/go.mod index acba6c2f63fe0..efb8f3446e51a 100644 --- a/receiver/awscloudwatchreceiver/go.mod +++ b/receiver/awscloudwatchreceiver/go.mod @@ -5,8 +5,10 @@ go 1.18 require ( github.com/aws/aws-sdk-go v1.44.133 github.com/stretchr/testify v1.8.1 - go.opentelemetry.io/collector v0.64.2-0.20221115155901-1550938c18fd - go.opentelemetry.io/collector/pdata v0.64.2-0.20221115155901-1550938c18fd + go.opentelemetry.io/collector v0.64.2-0.20221117234814-4565692c50a7 + go.opentelemetry.io/collector/component v0.0.0-20221117234814-4565692c50a7 + go.opentelemetry.io/collector/consumer v0.0.0-20221117234814-4565692c50a7 + go.opentelemetry.io/collector/pdata v0.64.2-0.20221117234814-4565692c50a7 go.uber.org/multierr v1.8.0 go.uber.org/zap v1.23.0 ) @@ -25,6 +27,7 @@ require ( github.com/modern-go/reflect2 v1.0.2 // indirect github.com/pmezard/go-difflib v1.0.0 // indirect github.com/stretchr/objx v0.5.0 // indirect + go.opentelemetry.io/collector/featuregate v0.0.0-20221117214536-6a117bfc3737 // indirect go.opentelemetry.io/otel v1.11.1 // indirect go.opentelemetry.io/otel/metric v0.33.0 // indirect go.opentelemetry.io/otel/trace v1.11.1 // indirect diff --git a/receiver/awscloudwatchreceiver/go.sum b/receiver/awscloudwatchreceiver/go.sum index e834fd811470a..b056848082044 100644 --- a/receiver/awscloudwatchreceiver/go.sum +++ b/receiver/awscloudwatchreceiver/go.sum @@ -263,10 +263,16 @@ github.com/yuin/goldmark v1.4.13/go.mod h1:6yULJ656Px+3vBD8DxQVa3kxgyrAnzto9xy5t go.etcd.io/etcd/api/v3 v3.5.4/go.mod h1:5GB2vv4A4AOn3yk7MftYGHkUfGtDHnEraIjym4dYz5A= go.etcd.io/etcd/client/pkg/v3 v3.5.4/go.mod h1:IJHfcCEKxYu1Os13ZdwCwIUTUVGYTSAM3YSwc9/Ac1g= go.etcd.io/etcd/client/v3 v3.5.4/go.mod h1:ZaRkVgBZC+L+dLCjTcF1hRXpgZXQPOvnA/Ak/gq3kiY= -go.opentelemetry.io/collector v0.64.2-0.20221115155901-1550938c18fd h1:O+6HhE4Ivg8Jksp3dIXIEC4FIR0Ush4uORvG3UtHZWk= -go.opentelemetry.io/collector v0.64.2-0.20221115155901-1550938c18fd/go.mod h1:mmSrOcwe1vEYmChXUYuF6rzlrUL0rjEiPfa19Xxb41o= -go.opentelemetry.io/collector/pdata v0.64.2-0.20221115155901-1550938c18fd h1:GdVAbRiae5VDZe3Mn3FqzMxO/aI5UbJ4+dcviqClHy8= -go.opentelemetry.io/collector/pdata v0.64.2-0.20221115155901-1550938c18fd/go.mod h1:0vynPfW2ZN7DltpcCFgCmTtWMQkCjp2a3TNt82YTCLQ= +go.opentelemetry.io/collector v0.64.2-0.20221117234814-4565692c50a7 h1:o/vMr2iyXzaeTb/KAldhMxAvRIfFPwtKfL5cKVKsSlU= +go.opentelemetry.io/collector v0.64.2-0.20221117234814-4565692c50a7/go.mod h1:PO8hayFFYvXDqELbXRVxwawR2HTdjN6mY4Qa3Se9xI8= +go.opentelemetry.io/collector/component v0.0.0-20221117234814-4565692c50a7 h1:q9m1bGHhQFUakQX79lZpLmFSY9VLULNSs2jUG8MdJLA= +go.opentelemetry.io/collector/component v0.0.0-20221117234814-4565692c50a7/go.mod h1:Z7H1Oj826e4dtVxXmT6SiUr6S0EIevUJmkVpfQV+UOk= +go.opentelemetry.io/collector/consumer v0.0.0-20221117234814-4565692c50a7 h1:FTy1JD9EJ7gq9SzlZoi2NkGcZ88+SwdiJav5uRcDEEY= +go.opentelemetry.io/collector/consumer v0.0.0-20221117234814-4565692c50a7/go.mod h1:86Elcw/LLrh90DprArogHMkBX3+UMu3tIgcVWF3mr6o= +go.opentelemetry.io/collector/featuregate v0.0.0-20221117214536-6a117bfc3737 h1:7sXg6M9Fw6rFVlX+iaWOMz6DFXEiroUdQer5kWGixwM= +go.opentelemetry.io/collector/featuregate v0.0.0-20221117214536-6a117bfc3737/go.mod h1:tewuFKJYalWBU0bmNKg++MC1ipINXUr6szYzOw2p1GI= +go.opentelemetry.io/collector/pdata v0.64.2-0.20221117234814-4565692c50a7 h1:IOFqfOu7fFxTgC7pvc2U7dk1/uFjwVQPK+CALiUvacI= +go.opentelemetry.io/collector/pdata v0.64.2-0.20221117234814-4565692c50a7/go.mod h1:0vynPfW2ZN7DltpcCFgCmTtWMQkCjp2a3TNt82YTCLQ= go.opentelemetry.io/otel v1.11.1 h1:4WLLAmcfkmDk2ukNXJyq3/kiz/3UzCaYq6PskJsaou4= go.opentelemetry.io/otel v1.11.1/go.mod h1:1nNhXBbWSD0nsL38H6btgnFN2k4i0sNLHNNMZMSbUGE= go.opentelemetry.io/otel/metric v0.33.0 h1:xQAyl7uGEYvrLAiV/09iTJlp1pZnQ9Wl793qbVvED1E= diff --git a/receiver/awscontainerinsightreceiver/config_test.go b/receiver/awscontainerinsightreceiver/config_test.go index 204094762a556..1808d2fba6ed6 100644 --- a/receiver/awscontainerinsightreceiver/config_test.go +++ b/receiver/awscontainerinsightreceiver/config_test.go @@ -61,7 +61,7 @@ func TestLoadConfig(t *testing.T) { require.NoError(t, err) require.NoError(t, component.UnmarshalReceiverConfig(sub, cfg)) - assert.NoError(t, cfg.Validate()) + assert.NoError(t, component.ValidateConfig(cfg)) assert.Equal(t, tt.expected, cfg) }) } diff --git a/receiver/awscontainerinsightreceiver/go.mod b/receiver/awscontainerinsightreceiver/go.mod index 6ea4771dc7d52..7eea172c9cc81 100644 --- a/receiver/awscontainerinsightreceiver/go.mod +++ b/receiver/awscontainerinsightreceiver/go.mod @@ -13,8 +13,10 @@ require ( github.com/open-telemetry/opentelemetry-collector-contrib/internal/kubelet v0.64.0 github.com/shirou/gopsutil/v3 v3.22.10 github.com/stretchr/testify v1.8.1 - go.opentelemetry.io/collector v0.64.2-0.20221115155901-1550938c18fd - go.opentelemetry.io/collector/pdata v0.64.2-0.20221115155901-1550938c18fd + go.opentelemetry.io/collector v0.64.2-0.20221117234814-4565692c50a7 + go.opentelemetry.io/collector/component v0.0.0-20221117234814-4565692c50a7 + go.opentelemetry.io/collector/consumer v0.0.0-20221117234814-4565692c50a7 + go.opentelemetry.io/collector/pdata v0.64.2-0.20221117234814-4565692c50a7 go.uber.org/zap v1.23.0 k8s.io/api v0.25.4 k8s.io/apimachinery v0.25.4 @@ -103,6 +105,7 @@ require ( github.com/vishvananda/netlink v1.1.1-0.20201029203352-d40f9887b852 // indirect github.com/vishvananda/netns v0.0.0-20200728191858-db3c7e526aae // indirect github.com/yusufpapurcu/wmi v1.2.2 // indirect + go.opentelemetry.io/collector/featuregate v0.0.0-20221117214536-6a117bfc3737 // indirect go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.36.4 // indirect go.opentelemetry.io/otel v1.11.1 // indirect go.opentelemetry.io/otel/metric v0.33.0 // indirect diff --git a/receiver/awscontainerinsightreceiver/go.sum b/receiver/awscontainerinsightreceiver/go.sum index 321a6c57bc1a2..99f2c1182c53b 100644 --- a/receiver/awscontainerinsightreceiver/go.sum +++ b/receiver/awscontainerinsightreceiver/go.sum @@ -569,10 +569,16 @@ go.opencensus.io v0.22.0/go.mod h1:+kGneAE2xo2IficOXnaByMWTGM9T73dGwxeWcUqIpI8= go.opencensus.io v0.22.2/go.mod h1:yxeiOL68Rb0Xd1ddK5vPZ/oVn4vY4Ynel7k9FzqtOIw= go.opencensus.io v0.22.3/go.mod h1:yxeiOL68Rb0Xd1ddK5vPZ/oVn4vY4Ynel7k9FzqtOIw= go.opencensus.io v0.22.4/go.mod h1:yxeiOL68Rb0Xd1ddK5vPZ/oVn4vY4Ynel7k9FzqtOIw= -go.opentelemetry.io/collector v0.64.2-0.20221115155901-1550938c18fd h1:O+6HhE4Ivg8Jksp3dIXIEC4FIR0Ush4uORvG3UtHZWk= -go.opentelemetry.io/collector v0.64.2-0.20221115155901-1550938c18fd/go.mod h1:mmSrOcwe1vEYmChXUYuF6rzlrUL0rjEiPfa19Xxb41o= -go.opentelemetry.io/collector/pdata v0.64.2-0.20221115155901-1550938c18fd h1:GdVAbRiae5VDZe3Mn3FqzMxO/aI5UbJ4+dcviqClHy8= -go.opentelemetry.io/collector/pdata v0.64.2-0.20221115155901-1550938c18fd/go.mod h1:0vynPfW2ZN7DltpcCFgCmTtWMQkCjp2a3TNt82YTCLQ= +go.opentelemetry.io/collector v0.64.2-0.20221117234814-4565692c50a7 h1:o/vMr2iyXzaeTb/KAldhMxAvRIfFPwtKfL5cKVKsSlU= +go.opentelemetry.io/collector v0.64.2-0.20221117234814-4565692c50a7/go.mod h1:PO8hayFFYvXDqELbXRVxwawR2HTdjN6mY4Qa3Se9xI8= +go.opentelemetry.io/collector/component v0.0.0-20221117234814-4565692c50a7 h1:q9m1bGHhQFUakQX79lZpLmFSY9VLULNSs2jUG8MdJLA= +go.opentelemetry.io/collector/component v0.0.0-20221117234814-4565692c50a7/go.mod h1:Z7H1Oj826e4dtVxXmT6SiUr6S0EIevUJmkVpfQV+UOk= +go.opentelemetry.io/collector/consumer v0.0.0-20221117234814-4565692c50a7 h1:FTy1JD9EJ7gq9SzlZoi2NkGcZ88+SwdiJav5uRcDEEY= +go.opentelemetry.io/collector/consumer v0.0.0-20221117234814-4565692c50a7/go.mod h1:86Elcw/LLrh90DprArogHMkBX3+UMu3tIgcVWF3mr6o= +go.opentelemetry.io/collector/featuregate v0.0.0-20221117214536-6a117bfc3737 h1:7sXg6M9Fw6rFVlX+iaWOMz6DFXEiroUdQer5kWGixwM= +go.opentelemetry.io/collector/featuregate v0.0.0-20221117214536-6a117bfc3737/go.mod h1:tewuFKJYalWBU0bmNKg++MC1ipINXUr6szYzOw2p1GI= +go.opentelemetry.io/collector/pdata v0.64.2-0.20221117234814-4565692c50a7 h1:IOFqfOu7fFxTgC7pvc2U7dk1/uFjwVQPK+CALiUvacI= +go.opentelemetry.io/collector/pdata v0.64.2-0.20221117234814-4565692c50a7/go.mod h1:0vynPfW2ZN7DltpcCFgCmTtWMQkCjp2a3TNt82YTCLQ= go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.36.4 h1:aUEBEdCa6iamGzg6fuYxDA8ThxvOG240mAvWDU+XLio= go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.36.4/go.mod h1:l2MdsbKTocpPS5nQZscqTR9jd8u96VYZdcpF8Sye7mA= go.opentelemetry.io/otel v1.11.1 h1:4WLLAmcfkmDk2ukNXJyq3/kiz/3UzCaYq6PskJsaou4= diff --git a/receiver/awsecscontainermetricsreceiver/config_test.go b/receiver/awsecscontainermetricsreceiver/config_test.go index fcaac9e6a0d56..64cdb005ba670 100644 --- a/receiver/awsecscontainermetricsreceiver/config_test.go +++ b/receiver/awsecscontainermetricsreceiver/config_test.go @@ -58,7 +58,7 @@ func TestLoadConfig(t *testing.T) { require.NoError(t, err) require.NoError(t, component.UnmarshalReceiverConfig(sub, cfg)) - assert.NoError(t, cfg.Validate()) + assert.NoError(t, component.ValidateConfig(cfg)) assert.Equal(t, tt.expected, cfg) }) } diff --git a/receiver/awsecscontainermetricsreceiver/go.mod b/receiver/awsecscontainermetricsreceiver/go.mod index b8f4dcc1bb41c..ea102f85230f0 100644 --- a/receiver/awsecscontainermetricsreceiver/go.mod +++ b/receiver/awsecscontainermetricsreceiver/go.mod @@ -6,9 +6,11 @@ require ( github.com/open-telemetry/opentelemetry-collector-contrib/internal/aws/ecsutil v0.64.0 github.com/open-telemetry/opentelemetry-collector-contrib/internal/common v0.64.0 github.com/stretchr/testify v1.8.1 - go.opentelemetry.io/collector v0.64.2-0.20221115155901-1550938c18fd - go.opentelemetry.io/collector/pdata v0.64.2-0.20221115155901-1550938c18fd - go.opentelemetry.io/collector/semconv v0.64.2-0.20221115155901-1550938c18fd + go.opentelemetry.io/collector v0.64.2-0.20221117234814-4565692c50a7 + go.opentelemetry.io/collector/component v0.0.0-20221117234814-4565692c50a7 + go.opentelemetry.io/collector/consumer v0.0.0-20221117234814-4565692c50a7 + go.opentelemetry.io/collector/pdata v0.64.2-0.20221117234814-4565692c50a7 + go.opentelemetry.io/collector/semconv v0.64.2-0.20221117234814-4565692c50a7 go.uber.org/zap v1.23.0 ) @@ -30,6 +32,7 @@ require ( github.com/modern-go/reflect2 v1.0.2 // indirect github.com/pmezard/go-difflib v1.0.0 // indirect github.com/rs/cors v1.8.2 // indirect + go.opentelemetry.io/collector/featuregate v0.0.0-20221117214536-6a117bfc3737 // indirect go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.36.4 // indirect go.opentelemetry.io/otel v1.11.1 // indirect go.opentelemetry.io/otel/metric v0.33.0 // indirect diff --git a/receiver/awsecscontainermetricsreceiver/go.sum b/receiver/awsecscontainermetricsreceiver/go.sum index 58d4f45c30b20..2982fb0560c34 100644 --- a/receiver/awsecscontainermetricsreceiver/go.sum +++ b/receiver/awsecscontainermetricsreceiver/go.sum @@ -271,12 +271,18 @@ github.com/yuin/goldmark v1.3.5/go.mod h1:mwnBkeHKe2W/ZEtQ+71ViKU8L12m81fl3OWwC1 go.etcd.io/etcd/api/v3 v3.5.4/go.mod h1:5GB2vv4A4AOn3yk7MftYGHkUfGtDHnEraIjym4dYz5A= go.etcd.io/etcd/client/pkg/v3 v3.5.4/go.mod h1:IJHfcCEKxYu1Os13ZdwCwIUTUVGYTSAM3YSwc9/Ac1g= go.etcd.io/etcd/client/v3 v3.5.4/go.mod h1:ZaRkVgBZC+L+dLCjTcF1hRXpgZXQPOvnA/Ak/gq3kiY= -go.opentelemetry.io/collector v0.64.2-0.20221115155901-1550938c18fd h1:O+6HhE4Ivg8Jksp3dIXIEC4FIR0Ush4uORvG3UtHZWk= -go.opentelemetry.io/collector v0.64.2-0.20221115155901-1550938c18fd/go.mod h1:mmSrOcwe1vEYmChXUYuF6rzlrUL0rjEiPfa19Xxb41o= -go.opentelemetry.io/collector/pdata v0.64.2-0.20221115155901-1550938c18fd h1:GdVAbRiae5VDZe3Mn3FqzMxO/aI5UbJ4+dcviqClHy8= -go.opentelemetry.io/collector/pdata v0.64.2-0.20221115155901-1550938c18fd/go.mod h1:0vynPfW2ZN7DltpcCFgCmTtWMQkCjp2a3TNt82YTCLQ= -go.opentelemetry.io/collector/semconv v0.64.2-0.20221115155901-1550938c18fd h1:rMqcl2pwi8YtVrtOPK8tVh87W0bFBge4yqB9ypSsAJ4= -go.opentelemetry.io/collector/semconv v0.64.2-0.20221115155901-1550938c18fd/go.mod h1:5o9yhOa+ABt7g2E5JABDxGZ1PQPbtfxrKNbYn+LOTXU= +go.opentelemetry.io/collector v0.64.2-0.20221117234814-4565692c50a7 h1:o/vMr2iyXzaeTb/KAldhMxAvRIfFPwtKfL5cKVKsSlU= +go.opentelemetry.io/collector v0.64.2-0.20221117234814-4565692c50a7/go.mod h1:PO8hayFFYvXDqELbXRVxwawR2HTdjN6mY4Qa3Se9xI8= +go.opentelemetry.io/collector/component v0.0.0-20221117234814-4565692c50a7 h1:q9m1bGHhQFUakQX79lZpLmFSY9VLULNSs2jUG8MdJLA= +go.opentelemetry.io/collector/component v0.0.0-20221117234814-4565692c50a7/go.mod h1:Z7H1Oj826e4dtVxXmT6SiUr6S0EIevUJmkVpfQV+UOk= +go.opentelemetry.io/collector/consumer v0.0.0-20221117234814-4565692c50a7 h1:FTy1JD9EJ7gq9SzlZoi2NkGcZ88+SwdiJav5uRcDEEY= +go.opentelemetry.io/collector/consumer v0.0.0-20221117234814-4565692c50a7/go.mod h1:86Elcw/LLrh90DprArogHMkBX3+UMu3tIgcVWF3mr6o= +go.opentelemetry.io/collector/featuregate v0.0.0-20221117214536-6a117bfc3737 h1:7sXg6M9Fw6rFVlX+iaWOMz6DFXEiroUdQer5kWGixwM= +go.opentelemetry.io/collector/featuregate v0.0.0-20221117214536-6a117bfc3737/go.mod h1:tewuFKJYalWBU0bmNKg++MC1ipINXUr6szYzOw2p1GI= +go.opentelemetry.io/collector/pdata v0.64.2-0.20221117234814-4565692c50a7 h1:IOFqfOu7fFxTgC7pvc2U7dk1/uFjwVQPK+CALiUvacI= +go.opentelemetry.io/collector/pdata v0.64.2-0.20221117234814-4565692c50a7/go.mod h1:0vynPfW2ZN7DltpcCFgCmTtWMQkCjp2a3TNt82YTCLQ= +go.opentelemetry.io/collector/semconv v0.64.2-0.20221117234814-4565692c50a7 h1:cGXAVltDxXw9nj0Vr7vyZZTj0whdyO+GYs+xv0xHJ2A= +go.opentelemetry.io/collector/semconv v0.64.2-0.20221117234814-4565692c50a7/go.mod h1:5o9yhOa+ABt7g2E5JABDxGZ1PQPbtfxrKNbYn+LOTXU= go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.36.4 h1:aUEBEdCa6iamGzg6fuYxDA8ThxvOG240mAvWDU+XLio= go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.36.4/go.mod h1:l2MdsbKTocpPS5nQZscqTR9jd8u96VYZdcpF8Sye7mA= go.opentelemetry.io/otel v1.11.1 h1:4WLLAmcfkmDk2ukNXJyq3/kiz/3UzCaYq6PskJsaou4= diff --git a/receiver/awsfirehosereceiver/config_test.go b/receiver/awsfirehosereceiver/config_test.go index 17774f7593047..c284710d378fd 100644 --- a/receiver/awsfirehosereceiver/config_test.go +++ b/receiver/awsfirehosereceiver/config_test.go @@ -38,7 +38,7 @@ func TestLoadConfig(t *testing.T) { require.NoError(t, err) require.NoError(t, component.UnmarshalReceiverConfig(sub, cfg)) - assert.NoError(t, cfg.Validate()) + assert.NoError(t, component.ValidateConfig(cfg)) require.Equal(t, &Config{ ReceiverSettings: config.NewReceiverSettings(component.NewID(typeStr)), diff --git a/receiver/awsfirehosereceiver/go.mod b/receiver/awsfirehosereceiver/go.mod index 2f30f9d3538d9..19dbb146bf0d0 100644 --- a/receiver/awsfirehosereceiver/go.mod +++ b/receiver/awsfirehosereceiver/go.mod @@ -4,9 +4,11 @@ go 1.18 require ( github.com/stretchr/testify v1.8.1 - go.opentelemetry.io/collector v0.64.2-0.20221115155901-1550938c18fd - go.opentelemetry.io/collector/pdata v0.64.2-0.20221115155901-1550938c18fd - go.opentelemetry.io/collector/semconv v0.64.2-0.20221115155901-1550938c18fd + go.opentelemetry.io/collector v0.64.2-0.20221117234814-4565692c50a7 + go.opentelemetry.io/collector/component v0.0.0-20221117234814-4565692c50a7 + go.opentelemetry.io/collector/consumer v0.0.0-20221117234814-4565692c50a7 + go.opentelemetry.io/collector/pdata v0.64.2-0.20221117234814-4565692c50a7 + go.opentelemetry.io/collector/semconv v0.64.2-0.20221117234814-4565692c50a7 go.uber.org/zap v1.23.0 ) @@ -31,6 +33,7 @@ require ( github.com/pelletier/go-toml v1.9.4 // indirect github.com/pmezard/go-difflib v1.0.0 // indirect github.com/rs/cors v1.8.2 // indirect + go.opentelemetry.io/collector/featuregate v0.0.0-20221117214536-6a117bfc3737 // indirect go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.36.4 // indirect go.opentelemetry.io/otel v1.11.1 // indirect go.opentelemetry.io/otel/metric v0.33.0 // indirect diff --git a/receiver/awsfirehosereceiver/go.sum b/receiver/awsfirehosereceiver/go.sum index 77afb7bf90839..a9d4ab3d50dfd 100644 --- a/receiver/awsfirehosereceiver/go.sum +++ b/receiver/awsfirehosereceiver/go.sum @@ -277,12 +277,18 @@ github.com/yuin/goldmark v1.3.5/go.mod h1:mwnBkeHKe2W/ZEtQ+71ViKU8L12m81fl3OWwC1 go.etcd.io/etcd/api/v3 v3.5.4/go.mod h1:5GB2vv4A4AOn3yk7MftYGHkUfGtDHnEraIjym4dYz5A= go.etcd.io/etcd/client/pkg/v3 v3.5.4/go.mod h1:IJHfcCEKxYu1Os13ZdwCwIUTUVGYTSAM3YSwc9/Ac1g= go.etcd.io/etcd/client/v3 v3.5.4/go.mod h1:ZaRkVgBZC+L+dLCjTcF1hRXpgZXQPOvnA/Ak/gq3kiY= -go.opentelemetry.io/collector v0.64.2-0.20221115155901-1550938c18fd h1:O+6HhE4Ivg8Jksp3dIXIEC4FIR0Ush4uORvG3UtHZWk= -go.opentelemetry.io/collector v0.64.2-0.20221115155901-1550938c18fd/go.mod h1:mmSrOcwe1vEYmChXUYuF6rzlrUL0rjEiPfa19Xxb41o= -go.opentelemetry.io/collector/pdata v0.64.2-0.20221115155901-1550938c18fd h1:GdVAbRiae5VDZe3Mn3FqzMxO/aI5UbJ4+dcviqClHy8= -go.opentelemetry.io/collector/pdata v0.64.2-0.20221115155901-1550938c18fd/go.mod h1:0vynPfW2ZN7DltpcCFgCmTtWMQkCjp2a3TNt82YTCLQ= -go.opentelemetry.io/collector/semconv v0.64.2-0.20221115155901-1550938c18fd h1:rMqcl2pwi8YtVrtOPK8tVh87W0bFBge4yqB9ypSsAJ4= -go.opentelemetry.io/collector/semconv v0.64.2-0.20221115155901-1550938c18fd/go.mod h1:5o9yhOa+ABt7g2E5JABDxGZ1PQPbtfxrKNbYn+LOTXU= +go.opentelemetry.io/collector v0.64.2-0.20221117234814-4565692c50a7 h1:o/vMr2iyXzaeTb/KAldhMxAvRIfFPwtKfL5cKVKsSlU= +go.opentelemetry.io/collector v0.64.2-0.20221117234814-4565692c50a7/go.mod h1:PO8hayFFYvXDqELbXRVxwawR2HTdjN6mY4Qa3Se9xI8= +go.opentelemetry.io/collector/component v0.0.0-20221117234814-4565692c50a7 h1:q9m1bGHhQFUakQX79lZpLmFSY9VLULNSs2jUG8MdJLA= +go.opentelemetry.io/collector/component v0.0.0-20221117234814-4565692c50a7/go.mod h1:Z7H1Oj826e4dtVxXmT6SiUr6S0EIevUJmkVpfQV+UOk= +go.opentelemetry.io/collector/consumer v0.0.0-20221117234814-4565692c50a7 h1:FTy1JD9EJ7gq9SzlZoi2NkGcZ88+SwdiJav5uRcDEEY= +go.opentelemetry.io/collector/consumer v0.0.0-20221117234814-4565692c50a7/go.mod h1:86Elcw/LLrh90DprArogHMkBX3+UMu3tIgcVWF3mr6o= +go.opentelemetry.io/collector/featuregate v0.0.0-20221117214536-6a117bfc3737 h1:7sXg6M9Fw6rFVlX+iaWOMz6DFXEiroUdQer5kWGixwM= +go.opentelemetry.io/collector/featuregate v0.0.0-20221117214536-6a117bfc3737/go.mod h1:tewuFKJYalWBU0bmNKg++MC1ipINXUr6szYzOw2p1GI= +go.opentelemetry.io/collector/pdata v0.64.2-0.20221117234814-4565692c50a7 h1:IOFqfOu7fFxTgC7pvc2U7dk1/uFjwVQPK+CALiUvacI= +go.opentelemetry.io/collector/pdata v0.64.2-0.20221117234814-4565692c50a7/go.mod h1:0vynPfW2ZN7DltpcCFgCmTtWMQkCjp2a3TNt82YTCLQ= +go.opentelemetry.io/collector/semconv v0.64.2-0.20221117234814-4565692c50a7 h1:cGXAVltDxXw9nj0Vr7vyZZTj0whdyO+GYs+xv0xHJ2A= +go.opentelemetry.io/collector/semconv v0.64.2-0.20221117234814-4565692c50a7/go.mod h1:5o9yhOa+ABt7g2E5JABDxGZ1PQPbtfxrKNbYn+LOTXU= go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.36.4 h1:aUEBEdCa6iamGzg6fuYxDA8ThxvOG240mAvWDU+XLio= go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.36.4/go.mod h1:l2MdsbKTocpPS5nQZscqTR9jd8u96VYZdcpF8Sye7mA= go.opentelemetry.io/otel v1.11.1 h1:4WLLAmcfkmDk2ukNXJyq3/kiz/3UzCaYq6PskJsaou4= diff --git a/receiver/awsxrayreceiver/config_test.go b/receiver/awsxrayreceiver/config_test.go index b3d749ccc9ea4..5cb840d340f4a 100644 --- a/receiver/awsxrayreceiver/config_test.go +++ b/receiver/awsxrayreceiver/config_test.go @@ -101,7 +101,7 @@ func TestLoadConfig(t *testing.T) { require.NoError(t, err) require.NoError(t, component.UnmarshalReceiverConfig(sub, cfg)) - assert.NoError(t, cfg.Validate()) + assert.NoError(t, component.ValidateConfig(cfg)) assert.Equal(t, tt.expected, cfg) }) } diff --git a/receiver/awsxrayreceiver/go.mod b/receiver/awsxrayreceiver/go.mod index af1d4a7695855..0d7c746fa43f0 100644 --- a/receiver/awsxrayreceiver/go.mod +++ b/receiver/awsxrayreceiver/go.mod @@ -10,9 +10,11 @@ require ( github.com/open-telemetry/opentelemetry-collector-contrib/internal/common v0.64.0 github.com/open-telemetry/opentelemetry-collector-contrib/internal/coreinternal v0.64.0 github.com/stretchr/testify v1.8.1 - go.opentelemetry.io/collector v0.64.2-0.20221115155901-1550938c18fd - go.opentelemetry.io/collector/pdata v0.64.2-0.20221115155901-1550938c18fd - go.opentelemetry.io/collector/semconv v0.64.2-0.20221115155901-1550938c18fd + go.opentelemetry.io/collector v0.64.2-0.20221117234814-4565692c50a7 + go.opentelemetry.io/collector/component v0.0.0-20221117234814-4565692c50a7 + go.opentelemetry.io/collector/consumer v0.0.0-20221117234814-4565692c50a7 + go.opentelemetry.io/collector/pdata v0.64.2-0.20221117234814-4565692c50a7 + go.opentelemetry.io/collector/semconv v0.64.2-0.20221117234814-4565692c50a7 go.uber.org/multierr v1.8.0 go.uber.org/zap v1.23.0 ) @@ -46,6 +48,7 @@ require ( github.com/prometheus/statsd_exporter v0.22.7 // indirect github.com/rogpeppe/go-internal v1.6.1 // indirect go.opencensus.io v0.24.0 // indirect + go.opentelemetry.io/collector/featuregate v0.0.0-20221117214536-6a117bfc3737 // indirect go.opentelemetry.io/otel v1.11.1 // indirect go.opentelemetry.io/otel/exporters/prometheus v0.33.0 // indirect go.opentelemetry.io/otel/metric v0.33.0 // indirect diff --git a/receiver/awsxrayreceiver/go.sum b/receiver/awsxrayreceiver/go.sum index 913ed88a10406..1caa2743eb3c2 100644 --- a/receiver/awsxrayreceiver/go.sum +++ b/receiver/awsxrayreceiver/go.sum @@ -378,12 +378,18 @@ go.opencensus.io v0.22.4/go.mod h1:yxeiOL68Rb0Xd1ddK5vPZ/oVn4vY4Ynel7k9FzqtOIw= go.opencensus.io v0.23.0/go.mod h1:XItmlyltB5F7CS4xOC1DcqMoFqwtC6OG2xF7mCv7P7E= go.opencensus.io v0.24.0 h1:y73uSU6J157QMP2kn2r30vwW1A2W2WFwSCGnAVxeaD0= go.opencensus.io v0.24.0/go.mod h1:vNK8G9p7aAivkbmorf4v+7Hgx+Zs0yY+0fOtgBfjQKo= -go.opentelemetry.io/collector v0.64.2-0.20221115155901-1550938c18fd h1:O+6HhE4Ivg8Jksp3dIXIEC4FIR0Ush4uORvG3UtHZWk= -go.opentelemetry.io/collector v0.64.2-0.20221115155901-1550938c18fd/go.mod h1:mmSrOcwe1vEYmChXUYuF6rzlrUL0rjEiPfa19Xxb41o= -go.opentelemetry.io/collector/pdata v0.64.2-0.20221115155901-1550938c18fd h1:GdVAbRiae5VDZe3Mn3FqzMxO/aI5UbJ4+dcviqClHy8= -go.opentelemetry.io/collector/pdata v0.64.2-0.20221115155901-1550938c18fd/go.mod h1:0vynPfW2ZN7DltpcCFgCmTtWMQkCjp2a3TNt82YTCLQ= -go.opentelemetry.io/collector/semconv v0.64.2-0.20221115155901-1550938c18fd h1:rMqcl2pwi8YtVrtOPK8tVh87W0bFBge4yqB9ypSsAJ4= -go.opentelemetry.io/collector/semconv v0.64.2-0.20221115155901-1550938c18fd/go.mod h1:5o9yhOa+ABt7g2E5JABDxGZ1PQPbtfxrKNbYn+LOTXU= +go.opentelemetry.io/collector v0.64.2-0.20221117234814-4565692c50a7 h1:o/vMr2iyXzaeTb/KAldhMxAvRIfFPwtKfL5cKVKsSlU= +go.opentelemetry.io/collector v0.64.2-0.20221117234814-4565692c50a7/go.mod h1:PO8hayFFYvXDqELbXRVxwawR2HTdjN6mY4Qa3Se9xI8= +go.opentelemetry.io/collector/component v0.0.0-20221117234814-4565692c50a7 h1:q9m1bGHhQFUakQX79lZpLmFSY9VLULNSs2jUG8MdJLA= +go.opentelemetry.io/collector/component v0.0.0-20221117234814-4565692c50a7/go.mod h1:Z7H1Oj826e4dtVxXmT6SiUr6S0EIevUJmkVpfQV+UOk= +go.opentelemetry.io/collector/consumer v0.0.0-20221117234814-4565692c50a7 h1:FTy1JD9EJ7gq9SzlZoi2NkGcZ88+SwdiJav5uRcDEEY= +go.opentelemetry.io/collector/consumer v0.0.0-20221117234814-4565692c50a7/go.mod h1:86Elcw/LLrh90DprArogHMkBX3+UMu3tIgcVWF3mr6o= +go.opentelemetry.io/collector/featuregate v0.0.0-20221117214536-6a117bfc3737 h1:7sXg6M9Fw6rFVlX+iaWOMz6DFXEiroUdQer5kWGixwM= +go.opentelemetry.io/collector/featuregate v0.0.0-20221117214536-6a117bfc3737/go.mod h1:tewuFKJYalWBU0bmNKg++MC1ipINXUr6szYzOw2p1GI= +go.opentelemetry.io/collector/pdata v0.64.2-0.20221117234814-4565692c50a7 h1:IOFqfOu7fFxTgC7pvc2U7dk1/uFjwVQPK+CALiUvacI= +go.opentelemetry.io/collector/pdata v0.64.2-0.20221117234814-4565692c50a7/go.mod h1:0vynPfW2ZN7DltpcCFgCmTtWMQkCjp2a3TNt82YTCLQ= +go.opentelemetry.io/collector/semconv v0.64.2-0.20221117234814-4565692c50a7 h1:cGXAVltDxXw9nj0Vr7vyZZTj0whdyO+GYs+xv0xHJ2A= +go.opentelemetry.io/collector/semconv v0.64.2-0.20221117234814-4565692c50a7/go.mod h1:5o9yhOa+ABt7g2E5JABDxGZ1PQPbtfxrKNbYn+LOTXU= go.opentelemetry.io/otel v1.11.1 h1:4WLLAmcfkmDk2ukNXJyq3/kiz/3UzCaYq6PskJsaou4= go.opentelemetry.io/otel v1.11.1/go.mod h1:1nNhXBbWSD0nsL38H6btgnFN2k4i0sNLHNNMZMSbUGE= go.opentelemetry.io/otel/exporters/prometheus v0.33.0 h1:xXhPj7SLKWU5/Zd4Hxmd+X1C4jdmvc0Xy+kvjFx2z60= diff --git a/receiver/azureblobreceiver/go.mod b/receiver/azureblobreceiver/go.mod index dca63f885ae6e..f8768ff14cd06 100644 --- a/receiver/azureblobreceiver/go.mod +++ b/receiver/azureblobreceiver/go.mod @@ -7,8 +7,10 @@ require ( github.com/Azure/azure-sdk-for-go/sdk/storage/azblob v0.3.0 github.com/open-telemetry/opentelemetry-collector-contrib/internal/sharedcomponent v0.64.0 github.com/stretchr/testify v1.8.1 - go.opentelemetry.io/collector v0.64.2-0.20221115155901-1550938c18fd - go.opentelemetry.io/collector/pdata v0.64.2-0.20221115155901-1550938c18fd + go.opentelemetry.io/collector v0.64.2-0.20221117234814-4565692c50a7 + go.opentelemetry.io/collector/component v0.0.0-20221117234814-4565692c50a7 + go.opentelemetry.io/collector/consumer v0.0.0-20221117234814-4565692c50a7 + go.opentelemetry.io/collector/pdata v0.64.2-0.20221117234814-4565692c50a7 go.uber.org/zap v1.23.0 ) @@ -70,8 +72,9 @@ require ( github.com/tklauser/numcpus v0.4.0 // indirect github.com/yusufpapurcu/wmi v1.2.2 // indirect go.opencensus.io v0.24.0 // indirect - go.opentelemetry.io/collector/processor/batchprocessor v0.64.2-0.20221115155901-1550938c18fd // indirect - go.opentelemetry.io/collector/semconv v0.64.2-0.20221115155901-1550938c18fd // indirect + go.opentelemetry.io/collector/featuregate v0.0.0-20221117214536-6a117bfc3737 // indirect + go.opentelemetry.io/collector/processor/batchprocessor v0.64.2-0.20221117234814-4565692c50a7 // indirect + go.opentelemetry.io/collector/semconv v0.64.2-0.20221117234814-4565692c50a7 // indirect go.opentelemetry.io/contrib/propagators/b3 v1.11.1 // indirect go.opentelemetry.io/otel v1.11.1 // indirect go.opentelemetry.io/otel/exporters/prometheus v0.33.0 // indirect diff --git a/receiver/azureblobreceiver/go.sum b/receiver/azureblobreceiver/go.sum index 2c7c3271e25dc..56fa61b799a51 100644 --- a/receiver/azureblobreceiver/go.sum +++ b/receiver/azureblobreceiver/go.sum @@ -483,15 +483,21 @@ go.opencensus.io v0.22.4/go.mod h1:yxeiOL68Rb0Xd1ddK5vPZ/oVn4vY4Ynel7k9FzqtOIw= go.opencensus.io v0.23.0/go.mod h1:XItmlyltB5F7CS4xOC1DcqMoFqwtC6OG2xF7mCv7P7E= go.opencensus.io v0.24.0 h1:y73uSU6J157QMP2kn2r30vwW1A2W2WFwSCGnAVxeaD0= go.opencensus.io v0.24.0/go.mod h1:vNK8G9p7aAivkbmorf4v+7Hgx+Zs0yY+0fOtgBfjQKo= -go.opentelemetry.io/collector v0.64.2-0.20221115155901-1550938c18fd h1:O+6HhE4Ivg8Jksp3dIXIEC4FIR0Ush4uORvG3UtHZWk= -go.opentelemetry.io/collector v0.64.2-0.20221115155901-1550938c18fd/go.mod h1:mmSrOcwe1vEYmChXUYuF6rzlrUL0rjEiPfa19Xxb41o= +go.opentelemetry.io/collector v0.64.2-0.20221117234814-4565692c50a7 h1:o/vMr2iyXzaeTb/KAldhMxAvRIfFPwtKfL5cKVKsSlU= +go.opentelemetry.io/collector v0.64.2-0.20221117234814-4565692c50a7/go.mod h1:PO8hayFFYvXDqELbXRVxwawR2HTdjN6mY4Qa3Se9xI8= +go.opentelemetry.io/collector/component v0.0.0-20221117234814-4565692c50a7 h1:q9m1bGHhQFUakQX79lZpLmFSY9VLULNSs2jUG8MdJLA= +go.opentelemetry.io/collector/component v0.0.0-20221117234814-4565692c50a7/go.mod h1:Z7H1Oj826e4dtVxXmT6SiUr6S0EIevUJmkVpfQV+UOk= +go.opentelemetry.io/collector/consumer v0.0.0-20221117234814-4565692c50a7 h1:FTy1JD9EJ7gq9SzlZoi2NkGcZ88+SwdiJav5uRcDEEY= +go.opentelemetry.io/collector/consumer v0.0.0-20221117234814-4565692c50a7/go.mod h1:86Elcw/LLrh90DprArogHMkBX3+UMu3tIgcVWF3mr6o= go.opentelemetry.io/collector/extension/zpagesextension v0.64.1 h1:2qTBtVigWNwPSpN9XR+WobC1idF2S8X/FIahFGCE1i4= -go.opentelemetry.io/collector/pdata v0.64.2-0.20221115155901-1550938c18fd h1:GdVAbRiae5VDZe3Mn3FqzMxO/aI5UbJ4+dcviqClHy8= -go.opentelemetry.io/collector/pdata v0.64.2-0.20221115155901-1550938c18fd/go.mod h1:0vynPfW2ZN7DltpcCFgCmTtWMQkCjp2a3TNt82YTCLQ= -go.opentelemetry.io/collector/processor/batchprocessor v0.64.2-0.20221115155901-1550938c18fd h1:SSjP8V0UP2+oPZ3gL+Dk90KQcvHXvHp9V5h8IIpx0og= -go.opentelemetry.io/collector/processor/batchprocessor v0.64.2-0.20221115155901-1550938c18fd/go.mod h1:zyCnX0aTvBaZ3XLWSHZdTueP7WoXRjz8X6HiWgKqstM= -go.opentelemetry.io/collector/semconv v0.64.2-0.20221115155901-1550938c18fd h1:rMqcl2pwi8YtVrtOPK8tVh87W0bFBge4yqB9ypSsAJ4= -go.opentelemetry.io/collector/semconv v0.64.2-0.20221115155901-1550938c18fd/go.mod h1:5o9yhOa+ABt7g2E5JABDxGZ1PQPbtfxrKNbYn+LOTXU= +go.opentelemetry.io/collector/featuregate v0.0.0-20221117214536-6a117bfc3737 h1:7sXg6M9Fw6rFVlX+iaWOMz6DFXEiroUdQer5kWGixwM= +go.opentelemetry.io/collector/featuregate v0.0.0-20221117214536-6a117bfc3737/go.mod h1:tewuFKJYalWBU0bmNKg++MC1ipINXUr6szYzOw2p1GI= +go.opentelemetry.io/collector/pdata v0.64.2-0.20221117234814-4565692c50a7 h1:IOFqfOu7fFxTgC7pvc2U7dk1/uFjwVQPK+CALiUvacI= +go.opentelemetry.io/collector/pdata v0.64.2-0.20221117234814-4565692c50a7/go.mod h1:0vynPfW2ZN7DltpcCFgCmTtWMQkCjp2a3TNt82YTCLQ= +go.opentelemetry.io/collector/processor/batchprocessor v0.64.2-0.20221117234814-4565692c50a7 h1:hGDq2T07j6qwwtQ2t6ZGU5tp/J2Dvu9mfY5qnnP5Ic8= +go.opentelemetry.io/collector/processor/batchprocessor v0.64.2-0.20221117234814-4565692c50a7/go.mod h1:b83iea2eDSAQkvd+2aSokaa6GRjSIsaR2zILziF/Ogc= +go.opentelemetry.io/collector/semconv v0.64.2-0.20221117234814-4565692c50a7 h1:cGXAVltDxXw9nj0Vr7vyZZTj0whdyO+GYs+xv0xHJ2A= +go.opentelemetry.io/collector/semconv v0.64.2-0.20221117234814-4565692c50a7/go.mod h1:5o9yhOa+ABt7g2E5JABDxGZ1PQPbtfxrKNbYn+LOTXU= go.opentelemetry.io/contrib/propagators/b3 v1.11.1 h1:icQ6ttRV+r/2fnU46BIo/g/mPu6Rs5Ug8Rtohe3KqzI= go.opentelemetry.io/contrib/propagators/b3 v1.11.1/go.mod h1:ECIveyMXgnl4gorxFcA7RYjJY/Ql9n20ubhbfDc3QfA= go.opentelemetry.io/contrib/zpages v0.36.4 h1:Z2VK5WsDhWs9VwZ1p0TM5RyusTOgAQfdMMDDQPRnlmY= diff --git a/receiver/azureeventhubreceiver/config_test.go b/receiver/azureeventhubreceiver/config_test.go index 1a6a13d80fef5..d461cb421b3cb 100644 --- a/receiver/azureeventhubreceiver/config_test.go +++ b/receiver/azureeventhubreceiver/config_test.go @@ -52,7 +52,7 @@ func TestLoadConfig(t *testing.T) { func TestMissingConnection(t *testing.T) { factory := NewFactory() cfg := factory.CreateDefaultConfig() - err := cfg.Validate() + err := component.ValidateConfig(cfg) assert.EqualError(t, err, "missing connection") } @@ -60,6 +60,6 @@ func TestInvalidConnectionString(t *testing.T) { factory := NewFactory() cfg := factory.CreateDefaultConfig() cfg.(*Config).Connection = "foo" - err := cfg.Validate() + err := component.ValidateConfig(cfg) assert.EqualError(t, err, "failed parsing connection string due to unmatched key value separated by '='") } diff --git a/receiver/azureeventhubreceiver/go.mod b/receiver/azureeventhubreceiver/go.mod index 9f27af547626f..236613b14922c 100644 --- a/receiver/azureeventhubreceiver/go.mod +++ b/receiver/azureeventhubreceiver/go.mod @@ -8,8 +8,10 @@ require ( github.com/json-iterator/go v1.1.12 github.com/open-telemetry/opentelemetry-collector-contrib/pkg/stanza v0.64.0 github.com/stretchr/testify v1.8.1 - go.opentelemetry.io/collector v0.64.2-0.20221115155901-1550938c18fd - go.opentelemetry.io/collector/pdata v0.64.2-0.20221115155901-1550938c18fd + go.opentelemetry.io/collector v0.64.2-0.20221117234814-4565692c50a7 + go.opentelemetry.io/collector/component v0.0.0-20221117234814-4565692c50a7 + go.opentelemetry.io/collector/consumer v0.0.0-20221117234814-4565692c50a7 + go.opentelemetry.io/collector/pdata v0.64.2-0.20221117234814-4565692c50a7 go.uber.org/zap v1.23.0 ) @@ -65,8 +67,9 @@ require ( github.com/tklauser/numcpus v0.4.0 // indirect github.com/yusufpapurcu/wmi v1.2.2 // indirect go.opencensus.io v0.24.0 // indirect - go.opentelemetry.io/collector/processor/batchprocessor v0.64.2-0.20221115155901-1550938c18fd // indirect - go.opentelemetry.io/collector/semconv v0.64.2-0.20221115155901-1550938c18fd // indirect + go.opentelemetry.io/collector/featuregate v0.0.0-20221117214536-6a117bfc3737 // indirect + go.opentelemetry.io/collector/processor/batchprocessor v0.64.2-0.20221117234814-4565692c50a7 // indirect + go.opentelemetry.io/collector/semconv v0.64.2-0.20221117234814-4565692c50a7 // indirect go.opentelemetry.io/contrib/propagators/b3 v1.11.1 // indirect go.opentelemetry.io/otel v1.11.1 // indirect go.opentelemetry.io/otel/exporters/prometheus v0.33.0 // indirect diff --git a/receiver/azureeventhubreceiver/go.sum b/receiver/azureeventhubreceiver/go.sum index ff63ccb9a023b..7228be7b8939e 100644 --- a/receiver/azureeventhubreceiver/go.sum +++ b/receiver/azureeventhubreceiver/go.sum @@ -484,15 +484,21 @@ go.opencensus.io v0.22.4/go.mod h1:yxeiOL68Rb0Xd1ddK5vPZ/oVn4vY4Ynel7k9FzqtOIw= go.opencensus.io v0.23.0/go.mod h1:XItmlyltB5F7CS4xOC1DcqMoFqwtC6OG2xF7mCv7P7E= go.opencensus.io v0.24.0 h1:y73uSU6J157QMP2kn2r30vwW1A2W2WFwSCGnAVxeaD0= go.opencensus.io v0.24.0/go.mod h1:vNK8G9p7aAivkbmorf4v+7Hgx+Zs0yY+0fOtgBfjQKo= -go.opentelemetry.io/collector v0.64.2-0.20221115155901-1550938c18fd h1:O+6HhE4Ivg8Jksp3dIXIEC4FIR0Ush4uORvG3UtHZWk= -go.opentelemetry.io/collector v0.64.2-0.20221115155901-1550938c18fd/go.mod h1:mmSrOcwe1vEYmChXUYuF6rzlrUL0rjEiPfa19Xxb41o= +go.opentelemetry.io/collector v0.64.2-0.20221117234814-4565692c50a7 h1:o/vMr2iyXzaeTb/KAldhMxAvRIfFPwtKfL5cKVKsSlU= +go.opentelemetry.io/collector v0.64.2-0.20221117234814-4565692c50a7/go.mod h1:PO8hayFFYvXDqELbXRVxwawR2HTdjN6mY4Qa3Se9xI8= +go.opentelemetry.io/collector/component v0.0.0-20221117234814-4565692c50a7 h1:q9m1bGHhQFUakQX79lZpLmFSY9VLULNSs2jUG8MdJLA= +go.opentelemetry.io/collector/component v0.0.0-20221117234814-4565692c50a7/go.mod h1:Z7H1Oj826e4dtVxXmT6SiUr6S0EIevUJmkVpfQV+UOk= +go.opentelemetry.io/collector/consumer v0.0.0-20221117234814-4565692c50a7 h1:FTy1JD9EJ7gq9SzlZoi2NkGcZ88+SwdiJav5uRcDEEY= +go.opentelemetry.io/collector/consumer v0.0.0-20221117234814-4565692c50a7/go.mod h1:86Elcw/LLrh90DprArogHMkBX3+UMu3tIgcVWF3mr6o= go.opentelemetry.io/collector/extension/zpagesextension v0.64.1 h1:2qTBtVigWNwPSpN9XR+WobC1idF2S8X/FIahFGCE1i4= -go.opentelemetry.io/collector/pdata v0.64.2-0.20221115155901-1550938c18fd h1:GdVAbRiae5VDZe3Mn3FqzMxO/aI5UbJ4+dcviqClHy8= -go.opentelemetry.io/collector/pdata v0.64.2-0.20221115155901-1550938c18fd/go.mod h1:0vynPfW2ZN7DltpcCFgCmTtWMQkCjp2a3TNt82YTCLQ= -go.opentelemetry.io/collector/processor/batchprocessor v0.64.2-0.20221115155901-1550938c18fd h1:SSjP8V0UP2+oPZ3gL+Dk90KQcvHXvHp9V5h8IIpx0og= -go.opentelemetry.io/collector/processor/batchprocessor v0.64.2-0.20221115155901-1550938c18fd/go.mod h1:zyCnX0aTvBaZ3XLWSHZdTueP7WoXRjz8X6HiWgKqstM= -go.opentelemetry.io/collector/semconv v0.64.2-0.20221115155901-1550938c18fd h1:rMqcl2pwi8YtVrtOPK8tVh87W0bFBge4yqB9ypSsAJ4= -go.opentelemetry.io/collector/semconv v0.64.2-0.20221115155901-1550938c18fd/go.mod h1:5o9yhOa+ABt7g2E5JABDxGZ1PQPbtfxrKNbYn+LOTXU= +go.opentelemetry.io/collector/featuregate v0.0.0-20221117214536-6a117bfc3737 h1:7sXg6M9Fw6rFVlX+iaWOMz6DFXEiroUdQer5kWGixwM= +go.opentelemetry.io/collector/featuregate v0.0.0-20221117214536-6a117bfc3737/go.mod h1:tewuFKJYalWBU0bmNKg++MC1ipINXUr6szYzOw2p1GI= +go.opentelemetry.io/collector/pdata v0.64.2-0.20221117234814-4565692c50a7 h1:IOFqfOu7fFxTgC7pvc2U7dk1/uFjwVQPK+CALiUvacI= +go.opentelemetry.io/collector/pdata v0.64.2-0.20221117234814-4565692c50a7/go.mod h1:0vynPfW2ZN7DltpcCFgCmTtWMQkCjp2a3TNt82YTCLQ= +go.opentelemetry.io/collector/processor/batchprocessor v0.64.2-0.20221117234814-4565692c50a7 h1:hGDq2T07j6qwwtQ2t6ZGU5tp/J2Dvu9mfY5qnnP5Ic8= +go.opentelemetry.io/collector/processor/batchprocessor v0.64.2-0.20221117234814-4565692c50a7/go.mod h1:b83iea2eDSAQkvd+2aSokaa6GRjSIsaR2zILziF/Ogc= +go.opentelemetry.io/collector/semconv v0.64.2-0.20221117234814-4565692c50a7 h1:cGXAVltDxXw9nj0Vr7vyZZTj0whdyO+GYs+xv0xHJ2A= +go.opentelemetry.io/collector/semconv v0.64.2-0.20221117234814-4565692c50a7/go.mod h1:5o9yhOa+ABt7g2E5JABDxGZ1PQPbtfxrKNbYn+LOTXU= go.opentelemetry.io/contrib/propagators/b3 v1.11.1 h1:icQ6ttRV+r/2fnU46BIo/g/mPu6Rs5Ug8Rtohe3KqzI= go.opentelemetry.io/contrib/propagators/b3 v1.11.1/go.mod h1:ECIveyMXgnl4gorxFcA7RYjJY/Ql9n20ubhbfDc3QfA= go.opentelemetry.io/contrib/zpages v0.36.4 h1:Z2VK5WsDhWs9VwZ1p0TM5RyusTOgAQfdMMDDQPRnlmY= diff --git a/receiver/bigipreceiver/go.mod b/receiver/bigipreceiver/go.mod index 3604fafbe93bc..cfd3a9693add7 100644 --- a/receiver/bigipreceiver/go.mod +++ b/receiver/bigipreceiver/go.mod @@ -5,8 +5,10 @@ go 1.18 require ( github.com/open-telemetry/opentelemetry-collector-contrib/internal/scrapertest v0.64.0 github.com/stretchr/testify v1.8.1 - go.opentelemetry.io/collector v0.64.2-0.20221115155901-1550938c18fd - go.opentelemetry.io/collector/pdata v0.64.2-0.20221115155901-1550938c18fd + go.opentelemetry.io/collector v0.64.2-0.20221117234814-4565692c50a7 + go.opentelemetry.io/collector/component v0.0.0-20221117234814-4565692c50a7 + go.opentelemetry.io/collector/consumer v0.0.0-20221117234814-4565692c50a7 + go.opentelemetry.io/collector/pdata v0.64.2-0.20221117234814-4565692c50a7 go.uber.org/multierr v1.8.0 go.uber.org/zap v1.23.0 ) @@ -33,6 +35,7 @@ require ( github.com/rs/cors v1.8.2 // indirect github.com/stretchr/objx v0.5.0 // indirect go.opencensus.io v0.24.0 // indirect + go.opentelemetry.io/collector/featuregate v0.0.0-20221117214536-6a117bfc3737 // indirect go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.36.4 // indirect go.opentelemetry.io/otel v1.11.1 // indirect go.opentelemetry.io/otel/metric v0.33.0 // indirect diff --git a/receiver/bigipreceiver/go.sum b/receiver/bigipreceiver/go.sum index 0cc39a64f41a7..ba3862010aba4 100644 --- a/receiver/bigipreceiver/go.sum +++ b/receiver/bigipreceiver/go.sum @@ -292,10 +292,16 @@ go.etcd.io/etcd/client/pkg/v3 v3.5.4/go.mod h1:IJHfcCEKxYu1Os13ZdwCwIUTUVGYTSAM3 go.etcd.io/etcd/client/v3 v3.5.4/go.mod h1:ZaRkVgBZC+L+dLCjTcF1hRXpgZXQPOvnA/Ak/gq3kiY= go.opencensus.io v0.24.0 h1:y73uSU6J157QMP2kn2r30vwW1A2W2WFwSCGnAVxeaD0= go.opencensus.io v0.24.0/go.mod h1:vNK8G9p7aAivkbmorf4v+7Hgx+Zs0yY+0fOtgBfjQKo= -go.opentelemetry.io/collector v0.64.2-0.20221115155901-1550938c18fd h1:O+6HhE4Ivg8Jksp3dIXIEC4FIR0Ush4uORvG3UtHZWk= -go.opentelemetry.io/collector v0.64.2-0.20221115155901-1550938c18fd/go.mod h1:mmSrOcwe1vEYmChXUYuF6rzlrUL0rjEiPfa19Xxb41o= -go.opentelemetry.io/collector/pdata v0.64.2-0.20221115155901-1550938c18fd h1:GdVAbRiae5VDZe3Mn3FqzMxO/aI5UbJ4+dcviqClHy8= -go.opentelemetry.io/collector/pdata v0.64.2-0.20221115155901-1550938c18fd/go.mod h1:0vynPfW2ZN7DltpcCFgCmTtWMQkCjp2a3TNt82YTCLQ= +go.opentelemetry.io/collector v0.64.2-0.20221117234814-4565692c50a7 h1:o/vMr2iyXzaeTb/KAldhMxAvRIfFPwtKfL5cKVKsSlU= +go.opentelemetry.io/collector v0.64.2-0.20221117234814-4565692c50a7/go.mod h1:PO8hayFFYvXDqELbXRVxwawR2HTdjN6mY4Qa3Se9xI8= +go.opentelemetry.io/collector/component v0.0.0-20221117234814-4565692c50a7 h1:q9m1bGHhQFUakQX79lZpLmFSY9VLULNSs2jUG8MdJLA= +go.opentelemetry.io/collector/component v0.0.0-20221117234814-4565692c50a7/go.mod h1:Z7H1Oj826e4dtVxXmT6SiUr6S0EIevUJmkVpfQV+UOk= +go.opentelemetry.io/collector/consumer v0.0.0-20221117234814-4565692c50a7 h1:FTy1JD9EJ7gq9SzlZoi2NkGcZ88+SwdiJav5uRcDEEY= +go.opentelemetry.io/collector/consumer v0.0.0-20221117234814-4565692c50a7/go.mod h1:86Elcw/LLrh90DprArogHMkBX3+UMu3tIgcVWF3mr6o= +go.opentelemetry.io/collector/featuregate v0.0.0-20221117214536-6a117bfc3737 h1:7sXg6M9Fw6rFVlX+iaWOMz6DFXEiroUdQer5kWGixwM= +go.opentelemetry.io/collector/featuregate v0.0.0-20221117214536-6a117bfc3737/go.mod h1:tewuFKJYalWBU0bmNKg++MC1ipINXUr6szYzOw2p1GI= +go.opentelemetry.io/collector/pdata v0.64.2-0.20221117234814-4565692c50a7 h1:IOFqfOu7fFxTgC7pvc2U7dk1/uFjwVQPK+CALiUvacI= +go.opentelemetry.io/collector/pdata v0.64.2-0.20221117234814-4565692c50a7/go.mod h1:0vynPfW2ZN7DltpcCFgCmTtWMQkCjp2a3TNt82YTCLQ= go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.36.4 h1:aUEBEdCa6iamGzg6fuYxDA8ThxvOG240mAvWDU+XLio= go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.36.4/go.mod h1:l2MdsbKTocpPS5nQZscqTR9jd8u96VYZdcpF8Sye7mA= go.opentelemetry.io/otel v1.11.1 h1:4WLLAmcfkmDk2ukNXJyq3/kiz/3UzCaYq6PskJsaou4= diff --git a/receiver/carbonreceiver/config_test.go b/receiver/carbonreceiver/config_test.go index 3dcd322987638..e91fc7e271c69 100644 --- a/receiver/carbonreceiver/config_test.go +++ b/receiver/carbonreceiver/config_test.go @@ -100,7 +100,7 @@ func TestLoadConfig(t *testing.T) { require.NoError(t, err) require.NoError(t, component.UnmarshalReceiverConfig(sub, cfg)) - assert.NoError(t, cfg.Validate()) + assert.NoError(t, component.ValidateConfig(cfg)) assert.Equal(t, tt.expected, cfg) }) } diff --git a/receiver/carbonreceiver/go.mod b/receiver/carbonreceiver/go.mod index 7f8cc4e35f9a1..df18c251359d5 100644 --- a/receiver/carbonreceiver/go.mod +++ b/receiver/carbonreceiver/go.mod @@ -8,7 +8,9 @@ require ( github.com/open-telemetry/opentelemetry-collector-contrib/pkg/translator/opencensus v0.64.0 github.com/stretchr/testify v1.8.1 go.opencensus.io v0.24.0 - go.opentelemetry.io/collector v0.64.2-0.20221115155901-1550938c18fd + go.opentelemetry.io/collector v0.64.2-0.20221117234814-4565692c50a7 + go.opentelemetry.io/collector/component v0.0.0-20221117234814-4565692c50a7 + go.opentelemetry.io/collector/consumer v0.0.0-20221117234814-4565692c50a7 go.uber.org/zap v1.23.0 google.golang.org/protobuf v1.28.1 ) @@ -40,8 +42,9 @@ require ( github.com/prometheus/common v0.37.0 // indirect github.com/prometheus/procfs v0.8.0 // indirect github.com/prometheus/statsd_exporter v0.22.7 // indirect - go.opentelemetry.io/collector/pdata v0.64.2-0.20221115155901-1550938c18fd // indirect - go.opentelemetry.io/collector/semconv v0.64.2-0.20221115155901-1550938c18fd // indirect + go.opentelemetry.io/collector/featuregate v0.0.0-20221117214536-6a117bfc3737 // indirect + go.opentelemetry.io/collector/pdata v0.64.2-0.20221117234814-4565692c50a7 // indirect + go.opentelemetry.io/collector/semconv v0.64.2-0.20221117234814-4565692c50a7 // indirect go.opentelemetry.io/otel v1.11.1 // indirect go.opentelemetry.io/otel/exporters/prometheus v0.33.0 // indirect go.opentelemetry.io/otel/metric v0.33.0 // indirect diff --git a/receiver/carbonreceiver/go.sum b/receiver/carbonreceiver/go.sum index bb6da329964bd..62d34df758626 100644 --- a/receiver/carbonreceiver/go.sum +++ b/receiver/carbonreceiver/go.sum @@ -373,12 +373,18 @@ go.opencensus.io v0.22.4/go.mod h1:yxeiOL68Rb0Xd1ddK5vPZ/oVn4vY4Ynel7k9FzqtOIw= go.opencensus.io v0.23.0/go.mod h1:XItmlyltB5F7CS4xOC1DcqMoFqwtC6OG2xF7mCv7P7E= go.opencensus.io v0.24.0 h1:y73uSU6J157QMP2kn2r30vwW1A2W2WFwSCGnAVxeaD0= go.opencensus.io v0.24.0/go.mod h1:vNK8G9p7aAivkbmorf4v+7Hgx+Zs0yY+0fOtgBfjQKo= -go.opentelemetry.io/collector v0.64.2-0.20221115155901-1550938c18fd h1:O+6HhE4Ivg8Jksp3dIXIEC4FIR0Ush4uORvG3UtHZWk= -go.opentelemetry.io/collector v0.64.2-0.20221115155901-1550938c18fd/go.mod h1:mmSrOcwe1vEYmChXUYuF6rzlrUL0rjEiPfa19Xxb41o= -go.opentelemetry.io/collector/pdata v0.64.2-0.20221115155901-1550938c18fd h1:GdVAbRiae5VDZe3Mn3FqzMxO/aI5UbJ4+dcviqClHy8= -go.opentelemetry.io/collector/pdata v0.64.2-0.20221115155901-1550938c18fd/go.mod h1:0vynPfW2ZN7DltpcCFgCmTtWMQkCjp2a3TNt82YTCLQ= -go.opentelemetry.io/collector/semconv v0.64.2-0.20221115155901-1550938c18fd h1:rMqcl2pwi8YtVrtOPK8tVh87W0bFBge4yqB9ypSsAJ4= -go.opentelemetry.io/collector/semconv v0.64.2-0.20221115155901-1550938c18fd/go.mod h1:5o9yhOa+ABt7g2E5JABDxGZ1PQPbtfxrKNbYn+LOTXU= +go.opentelemetry.io/collector v0.64.2-0.20221117234814-4565692c50a7 h1:o/vMr2iyXzaeTb/KAldhMxAvRIfFPwtKfL5cKVKsSlU= +go.opentelemetry.io/collector v0.64.2-0.20221117234814-4565692c50a7/go.mod h1:PO8hayFFYvXDqELbXRVxwawR2HTdjN6mY4Qa3Se9xI8= +go.opentelemetry.io/collector/component v0.0.0-20221117234814-4565692c50a7 h1:q9m1bGHhQFUakQX79lZpLmFSY9VLULNSs2jUG8MdJLA= +go.opentelemetry.io/collector/component v0.0.0-20221117234814-4565692c50a7/go.mod h1:Z7H1Oj826e4dtVxXmT6SiUr6S0EIevUJmkVpfQV+UOk= +go.opentelemetry.io/collector/consumer v0.0.0-20221117234814-4565692c50a7 h1:FTy1JD9EJ7gq9SzlZoi2NkGcZ88+SwdiJav5uRcDEEY= +go.opentelemetry.io/collector/consumer v0.0.0-20221117234814-4565692c50a7/go.mod h1:86Elcw/LLrh90DprArogHMkBX3+UMu3tIgcVWF3mr6o= +go.opentelemetry.io/collector/featuregate v0.0.0-20221117214536-6a117bfc3737 h1:7sXg6M9Fw6rFVlX+iaWOMz6DFXEiroUdQer5kWGixwM= +go.opentelemetry.io/collector/featuregate v0.0.0-20221117214536-6a117bfc3737/go.mod h1:tewuFKJYalWBU0bmNKg++MC1ipINXUr6szYzOw2p1GI= +go.opentelemetry.io/collector/pdata v0.64.2-0.20221117234814-4565692c50a7 h1:IOFqfOu7fFxTgC7pvc2U7dk1/uFjwVQPK+CALiUvacI= +go.opentelemetry.io/collector/pdata v0.64.2-0.20221117234814-4565692c50a7/go.mod h1:0vynPfW2ZN7DltpcCFgCmTtWMQkCjp2a3TNt82YTCLQ= +go.opentelemetry.io/collector/semconv v0.64.2-0.20221117234814-4565692c50a7 h1:cGXAVltDxXw9nj0Vr7vyZZTj0whdyO+GYs+xv0xHJ2A= +go.opentelemetry.io/collector/semconv v0.64.2-0.20221117234814-4565692c50a7/go.mod h1:5o9yhOa+ABt7g2E5JABDxGZ1PQPbtfxrKNbYn+LOTXU= go.opentelemetry.io/otel v1.11.1 h1:4WLLAmcfkmDk2ukNXJyq3/kiz/3UzCaYq6PskJsaou4= go.opentelemetry.io/otel v1.11.1/go.mod h1:1nNhXBbWSD0nsL38H6btgnFN2k4i0sNLHNNMZMSbUGE= go.opentelemetry.io/otel/exporters/prometheus v0.33.0 h1:xXhPj7SLKWU5/Zd4Hxmd+X1C4jdmvc0Xy+kvjFx2z60= diff --git a/receiver/chronyreceiver/go.mod b/receiver/chronyreceiver/go.mod index cd0a192a589ca..5c558dc26a9e5 100644 --- a/receiver/chronyreceiver/go.mod +++ b/receiver/chronyreceiver/go.mod @@ -6,8 +6,10 @@ require ( github.com/facebook/time v0.0.0-20220713225404-f7a0d7702d50 github.com/stretchr/testify v1.8.1 github.com/tilinna/clock v1.1.0 - go.opentelemetry.io/collector v0.64.2-0.20221115155901-1550938c18fd - go.opentelemetry.io/collector/pdata v0.64.2-0.20221115155901-1550938c18fd + go.opentelemetry.io/collector v0.64.2-0.20221117234814-4565692c50a7 + go.opentelemetry.io/collector/component v0.0.0-20221117234814-4565692c50a7 + go.opentelemetry.io/collector/consumer v0.0.0-20221117234814-4565692c50a7 + go.opentelemetry.io/collector/pdata v0.64.2-0.20221117234814-4565692c50a7 go.uber.org/multierr v1.8.0 ) @@ -27,6 +29,7 @@ require ( github.com/sirupsen/logrus v1.8.1 // indirect github.com/stretchr/objx v0.5.0 // indirect go.opencensus.io v0.24.0 // indirect + go.opentelemetry.io/collector/featuregate v0.0.0-20221117214536-6a117bfc3737 // indirect go.opentelemetry.io/otel v1.11.1 // indirect go.opentelemetry.io/otel/metric v0.33.0 // indirect go.opentelemetry.io/otel/trace v1.11.1 // indirect diff --git a/receiver/chronyreceiver/go.sum b/receiver/chronyreceiver/go.sum index e12856a3b3c1d..a7d6688865ee3 100644 --- a/receiver/chronyreceiver/go.sum +++ b/receiver/chronyreceiver/go.sum @@ -288,10 +288,16 @@ go.etcd.io/etcd/client/pkg/v3 v3.5.4/go.mod h1:IJHfcCEKxYu1Os13ZdwCwIUTUVGYTSAM3 go.etcd.io/etcd/client/v3 v3.5.4/go.mod h1:ZaRkVgBZC+L+dLCjTcF1hRXpgZXQPOvnA/Ak/gq3kiY= go.opencensus.io v0.24.0 h1:y73uSU6J157QMP2kn2r30vwW1A2W2WFwSCGnAVxeaD0= go.opencensus.io v0.24.0/go.mod h1:vNK8G9p7aAivkbmorf4v+7Hgx+Zs0yY+0fOtgBfjQKo= -go.opentelemetry.io/collector v0.64.2-0.20221115155901-1550938c18fd h1:O+6HhE4Ivg8Jksp3dIXIEC4FIR0Ush4uORvG3UtHZWk= -go.opentelemetry.io/collector v0.64.2-0.20221115155901-1550938c18fd/go.mod h1:mmSrOcwe1vEYmChXUYuF6rzlrUL0rjEiPfa19Xxb41o= -go.opentelemetry.io/collector/pdata v0.64.2-0.20221115155901-1550938c18fd h1:GdVAbRiae5VDZe3Mn3FqzMxO/aI5UbJ4+dcviqClHy8= -go.opentelemetry.io/collector/pdata v0.64.2-0.20221115155901-1550938c18fd/go.mod h1:0vynPfW2ZN7DltpcCFgCmTtWMQkCjp2a3TNt82YTCLQ= +go.opentelemetry.io/collector v0.64.2-0.20221117234814-4565692c50a7 h1:o/vMr2iyXzaeTb/KAldhMxAvRIfFPwtKfL5cKVKsSlU= +go.opentelemetry.io/collector v0.64.2-0.20221117234814-4565692c50a7/go.mod h1:PO8hayFFYvXDqELbXRVxwawR2HTdjN6mY4Qa3Se9xI8= +go.opentelemetry.io/collector/component v0.0.0-20221117234814-4565692c50a7 h1:q9m1bGHhQFUakQX79lZpLmFSY9VLULNSs2jUG8MdJLA= +go.opentelemetry.io/collector/component v0.0.0-20221117234814-4565692c50a7/go.mod h1:Z7H1Oj826e4dtVxXmT6SiUr6S0EIevUJmkVpfQV+UOk= +go.opentelemetry.io/collector/consumer v0.0.0-20221117234814-4565692c50a7 h1:FTy1JD9EJ7gq9SzlZoi2NkGcZ88+SwdiJav5uRcDEEY= +go.opentelemetry.io/collector/consumer v0.0.0-20221117234814-4565692c50a7/go.mod h1:86Elcw/LLrh90DprArogHMkBX3+UMu3tIgcVWF3mr6o= +go.opentelemetry.io/collector/featuregate v0.0.0-20221117214536-6a117bfc3737 h1:7sXg6M9Fw6rFVlX+iaWOMz6DFXEiroUdQer5kWGixwM= +go.opentelemetry.io/collector/featuregate v0.0.0-20221117214536-6a117bfc3737/go.mod h1:tewuFKJYalWBU0bmNKg++MC1ipINXUr6szYzOw2p1GI= +go.opentelemetry.io/collector/pdata v0.64.2-0.20221117234814-4565692c50a7 h1:IOFqfOu7fFxTgC7pvc2U7dk1/uFjwVQPK+CALiUvacI= +go.opentelemetry.io/collector/pdata v0.64.2-0.20221117234814-4565692c50a7/go.mod h1:0vynPfW2ZN7DltpcCFgCmTtWMQkCjp2a3TNt82YTCLQ= go.opentelemetry.io/otel v1.11.1 h1:4WLLAmcfkmDk2ukNXJyq3/kiz/3UzCaYq6PskJsaou4= go.opentelemetry.io/otel v1.11.1/go.mod h1:1nNhXBbWSD0nsL38H6btgnFN2k4i0sNLHNNMZMSbUGE= go.opentelemetry.io/otel/exporters/prometheus v0.33.0 h1:xXhPj7SLKWU5/Zd4Hxmd+X1C4jdmvc0Xy+kvjFx2z60= diff --git a/receiver/cloudfoundryreceiver/config_test.go b/receiver/cloudfoundryreceiver/config_test.go index 6d705b9fcdf41..38a19eb6a361f 100644 --- a/receiver/cloudfoundryreceiver/config_test.go +++ b/receiver/cloudfoundryreceiver/config_test.go @@ -85,10 +85,10 @@ func TestLoadConfig(t *testing.T) { require.NoError(t, component.UnmarshalReceiverConfig(sub, cfg)) if tt.expected == nil { - assert.EqualError(t, cfg.Validate(), tt.errorMessage) + assert.EqualError(t, component.ValidateConfig(cfg), tt.errorMessage) return } - assert.NoError(t, cfg.Validate()) + assert.NoError(t, component.ValidateConfig(cfg)) assert.Equal(t, tt.expected, cfg) }) } diff --git a/receiver/cloudfoundryreceiver/go.mod b/receiver/cloudfoundryreceiver/go.mod index 389c17ad62772..627e2fef5d3fc 100644 --- a/receiver/cloudfoundryreceiver/go.mod +++ b/receiver/cloudfoundryreceiver/go.mod @@ -6,8 +6,10 @@ require ( code.cloudfoundry.org/go-loggregator v7.4.0+incompatible github.com/cloudfoundry-incubator/uaago v0.0.0-20190307164349-8136b7bbe76e github.com/stretchr/testify v1.8.1 - go.opentelemetry.io/collector v0.64.2-0.20221115155901-1550938c18fd - go.opentelemetry.io/collector/pdata v0.64.2-0.20221115155901-1550938c18fd + go.opentelemetry.io/collector v0.64.2-0.20221117234814-4565692c50a7 + go.opentelemetry.io/collector/component v0.0.0-20221117234814-4565692c50a7 + go.opentelemetry.io/collector/consumer v0.0.0-20221117234814-4565692c50a7 + go.opentelemetry.io/collector/pdata v0.64.2-0.20221117234814-4565692c50a7 go.uber.org/zap v1.23.0 ) @@ -37,6 +39,7 @@ require ( github.com/pmezard/go-difflib v1.0.0 // indirect github.com/rs/cors v1.8.2 // indirect go.opencensus.io v0.24.0 // indirect + go.opentelemetry.io/collector/featuregate v0.0.0-20221117214536-6a117bfc3737 // indirect go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.36.4 // indirect go.opentelemetry.io/otel v1.11.1 // indirect go.opentelemetry.io/otel/metric v0.33.0 // indirect diff --git a/receiver/cloudfoundryreceiver/go.sum b/receiver/cloudfoundryreceiver/go.sum index 85bb6015b48dd..653c38558662a 100644 --- a/receiver/cloudfoundryreceiver/go.sum +++ b/receiver/cloudfoundryreceiver/go.sum @@ -320,10 +320,16 @@ go.etcd.io/etcd/client/pkg/v3 v3.5.4/go.mod h1:IJHfcCEKxYu1Os13ZdwCwIUTUVGYTSAM3 go.etcd.io/etcd/client/v3 v3.5.4/go.mod h1:ZaRkVgBZC+L+dLCjTcF1hRXpgZXQPOvnA/Ak/gq3kiY= go.opencensus.io v0.24.0 h1:y73uSU6J157QMP2kn2r30vwW1A2W2WFwSCGnAVxeaD0= go.opencensus.io v0.24.0/go.mod h1:vNK8G9p7aAivkbmorf4v+7Hgx+Zs0yY+0fOtgBfjQKo= -go.opentelemetry.io/collector v0.64.2-0.20221115155901-1550938c18fd h1:O+6HhE4Ivg8Jksp3dIXIEC4FIR0Ush4uORvG3UtHZWk= -go.opentelemetry.io/collector v0.64.2-0.20221115155901-1550938c18fd/go.mod h1:mmSrOcwe1vEYmChXUYuF6rzlrUL0rjEiPfa19Xxb41o= -go.opentelemetry.io/collector/pdata v0.64.2-0.20221115155901-1550938c18fd h1:GdVAbRiae5VDZe3Mn3FqzMxO/aI5UbJ4+dcviqClHy8= -go.opentelemetry.io/collector/pdata v0.64.2-0.20221115155901-1550938c18fd/go.mod h1:0vynPfW2ZN7DltpcCFgCmTtWMQkCjp2a3TNt82YTCLQ= +go.opentelemetry.io/collector v0.64.2-0.20221117234814-4565692c50a7 h1:o/vMr2iyXzaeTb/KAldhMxAvRIfFPwtKfL5cKVKsSlU= +go.opentelemetry.io/collector v0.64.2-0.20221117234814-4565692c50a7/go.mod h1:PO8hayFFYvXDqELbXRVxwawR2HTdjN6mY4Qa3Se9xI8= +go.opentelemetry.io/collector/component v0.0.0-20221117234814-4565692c50a7 h1:q9m1bGHhQFUakQX79lZpLmFSY9VLULNSs2jUG8MdJLA= +go.opentelemetry.io/collector/component v0.0.0-20221117234814-4565692c50a7/go.mod h1:Z7H1Oj826e4dtVxXmT6SiUr6S0EIevUJmkVpfQV+UOk= +go.opentelemetry.io/collector/consumer v0.0.0-20221117234814-4565692c50a7 h1:FTy1JD9EJ7gq9SzlZoi2NkGcZ88+SwdiJav5uRcDEEY= +go.opentelemetry.io/collector/consumer v0.0.0-20221117234814-4565692c50a7/go.mod h1:86Elcw/LLrh90DprArogHMkBX3+UMu3tIgcVWF3mr6o= +go.opentelemetry.io/collector/featuregate v0.0.0-20221117214536-6a117bfc3737 h1:7sXg6M9Fw6rFVlX+iaWOMz6DFXEiroUdQer5kWGixwM= +go.opentelemetry.io/collector/featuregate v0.0.0-20221117214536-6a117bfc3737/go.mod h1:tewuFKJYalWBU0bmNKg++MC1ipINXUr6szYzOw2p1GI= +go.opentelemetry.io/collector/pdata v0.64.2-0.20221117234814-4565692c50a7 h1:IOFqfOu7fFxTgC7pvc2U7dk1/uFjwVQPK+CALiUvacI= +go.opentelemetry.io/collector/pdata v0.64.2-0.20221117234814-4565692c50a7/go.mod h1:0vynPfW2ZN7DltpcCFgCmTtWMQkCjp2a3TNt82YTCLQ= go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.36.4 h1:aUEBEdCa6iamGzg6fuYxDA8ThxvOG240mAvWDU+XLio= go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.36.4/go.mod h1:l2MdsbKTocpPS5nQZscqTR9jd8u96VYZdcpF8Sye7mA= go.opentelemetry.io/otel v1.11.1 h1:4WLLAmcfkmDk2ukNXJyq3/kiz/3UzCaYq6PskJsaou4= diff --git a/receiver/collectdreceiver/config_test.go b/receiver/collectdreceiver/config_test.go index 869be94d6953a..6917cf5096868 100644 --- a/receiver/collectdreceiver/config_test.go +++ b/receiver/collectdreceiver/config_test.go @@ -64,7 +64,7 @@ func TestLoadConfig(t *testing.T) { require.NoError(t, err) require.NoError(t, component.UnmarshalReceiverConfig(sub, cfg)) - assert.NoError(t, cfg.Validate()) + assert.NoError(t, component.ValidateConfig(cfg)) assert.Equal(t, tt.expected, cfg) }) } diff --git a/receiver/collectdreceiver/go.mod b/receiver/collectdreceiver/go.mod index 97e386ed5ba34..0c3a4bf090d96 100644 --- a/receiver/collectdreceiver/go.mod +++ b/receiver/collectdreceiver/go.mod @@ -8,7 +8,9 @@ require ( github.com/open-telemetry/opentelemetry-collector-contrib/pkg/translator/opencensus v0.64.0 github.com/stretchr/testify v1.8.1 go.opencensus.io v0.24.0 - go.opentelemetry.io/collector v0.64.2-0.20221115155901-1550938c18fd + go.opentelemetry.io/collector v0.64.2-0.20221117234814-4565692c50a7 + go.opentelemetry.io/collector/component v0.0.0-20221117234814-4565692c50a7 + go.opentelemetry.io/collector/consumer v0.0.0-20221117234814-4565692c50a7 go.uber.org/zap v1.23.0 google.golang.org/protobuf v1.28.1 ) @@ -28,8 +30,9 @@ require ( github.com/modern-go/reflect2 v1.0.2 // indirect github.com/open-telemetry/opentelemetry-collector-contrib/internal/coreinternal v0.64.0 // indirect github.com/pmezard/go-difflib v1.0.0 // indirect - go.opentelemetry.io/collector/pdata v0.64.2-0.20221115155901-1550938c18fd // indirect - go.opentelemetry.io/collector/semconv v0.64.2-0.20221115155901-1550938c18fd // indirect + go.opentelemetry.io/collector/featuregate v0.0.0-20221117214536-6a117bfc3737 // indirect + go.opentelemetry.io/collector/pdata v0.64.2-0.20221117234814-4565692c50a7 // indirect + go.opentelemetry.io/collector/semconv v0.64.2-0.20221117234814-4565692c50a7 // indirect go.opentelemetry.io/otel v1.11.1 // indirect go.opentelemetry.io/otel/metric v0.33.0 // indirect go.opentelemetry.io/otel/trace v1.11.1 // indirect diff --git a/receiver/collectdreceiver/go.sum b/receiver/collectdreceiver/go.sum index be15df95b682d..fc51dd958e268 100644 --- a/receiver/collectdreceiver/go.sum +++ b/receiver/collectdreceiver/go.sum @@ -262,12 +262,18 @@ go.etcd.io/etcd/client/pkg/v3 v3.5.4/go.mod h1:IJHfcCEKxYu1Os13ZdwCwIUTUVGYTSAM3 go.etcd.io/etcd/client/v3 v3.5.4/go.mod h1:ZaRkVgBZC+L+dLCjTcF1hRXpgZXQPOvnA/Ak/gq3kiY= go.opencensus.io v0.24.0 h1:y73uSU6J157QMP2kn2r30vwW1A2W2WFwSCGnAVxeaD0= go.opencensus.io v0.24.0/go.mod h1:vNK8G9p7aAivkbmorf4v+7Hgx+Zs0yY+0fOtgBfjQKo= -go.opentelemetry.io/collector v0.64.2-0.20221115155901-1550938c18fd h1:O+6HhE4Ivg8Jksp3dIXIEC4FIR0Ush4uORvG3UtHZWk= -go.opentelemetry.io/collector v0.64.2-0.20221115155901-1550938c18fd/go.mod h1:mmSrOcwe1vEYmChXUYuF6rzlrUL0rjEiPfa19Xxb41o= -go.opentelemetry.io/collector/pdata v0.64.2-0.20221115155901-1550938c18fd h1:GdVAbRiae5VDZe3Mn3FqzMxO/aI5UbJ4+dcviqClHy8= -go.opentelemetry.io/collector/pdata v0.64.2-0.20221115155901-1550938c18fd/go.mod h1:0vynPfW2ZN7DltpcCFgCmTtWMQkCjp2a3TNt82YTCLQ= -go.opentelemetry.io/collector/semconv v0.64.2-0.20221115155901-1550938c18fd h1:rMqcl2pwi8YtVrtOPK8tVh87W0bFBge4yqB9ypSsAJ4= -go.opentelemetry.io/collector/semconv v0.64.2-0.20221115155901-1550938c18fd/go.mod h1:5o9yhOa+ABt7g2E5JABDxGZ1PQPbtfxrKNbYn+LOTXU= +go.opentelemetry.io/collector v0.64.2-0.20221117234814-4565692c50a7 h1:o/vMr2iyXzaeTb/KAldhMxAvRIfFPwtKfL5cKVKsSlU= +go.opentelemetry.io/collector v0.64.2-0.20221117234814-4565692c50a7/go.mod h1:PO8hayFFYvXDqELbXRVxwawR2HTdjN6mY4Qa3Se9xI8= +go.opentelemetry.io/collector/component v0.0.0-20221117234814-4565692c50a7 h1:q9m1bGHhQFUakQX79lZpLmFSY9VLULNSs2jUG8MdJLA= +go.opentelemetry.io/collector/component v0.0.0-20221117234814-4565692c50a7/go.mod h1:Z7H1Oj826e4dtVxXmT6SiUr6S0EIevUJmkVpfQV+UOk= +go.opentelemetry.io/collector/consumer v0.0.0-20221117234814-4565692c50a7 h1:FTy1JD9EJ7gq9SzlZoi2NkGcZ88+SwdiJav5uRcDEEY= +go.opentelemetry.io/collector/consumer v0.0.0-20221117234814-4565692c50a7/go.mod h1:86Elcw/LLrh90DprArogHMkBX3+UMu3tIgcVWF3mr6o= +go.opentelemetry.io/collector/featuregate v0.0.0-20221117214536-6a117bfc3737 h1:7sXg6M9Fw6rFVlX+iaWOMz6DFXEiroUdQer5kWGixwM= +go.opentelemetry.io/collector/featuregate v0.0.0-20221117214536-6a117bfc3737/go.mod h1:tewuFKJYalWBU0bmNKg++MC1ipINXUr6szYzOw2p1GI= +go.opentelemetry.io/collector/pdata v0.64.2-0.20221117234814-4565692c50a7 h1:IOFqfOu7fFxTgC7pvc2U7dk1/uFjwVQPK+CALiUvacI= +go.opentelemetry.io/collector/pdata v0.64.2-0.20221117234814-4565692c50a7/go.mod h1:0vynPfW2ZN7DltpcCFgCmTtWMQkCjp2a3TNt82YTCLQ= +go.opentelemetry.io/collector/semconv v0.64.2-0.20221117234814-4565692c50a7 h1:cGXAVltDxXw9nj0Vr7vyZZTj0whdyO+GYs+xv0xHJ2A= +go.opentelemetry.io/collector/semconv v0.64.2-0.20221117234814-4565692c50a7/go.mod h1:5o9yhOa+ABt7g2E5JABDxGZ1PQPbtfxrKNbYn+LOTXU= go.opentelemetry.io/otel v1.11.1 h1:4WLLAmcfkmDk2ukNXJyq3/kiz/3UzCaYq6PskJsaou4= go.opentelemetry.io/otel v1.11.1/go.mod h1:1nNhXBbWSD0nsL38H6btgnFN2k4i0sNLHNNMZMSbUGE= go.opentelemetry.io/otel/metric v0.33.0 h1:xQAyl7uGEYvrLAiV/09iTJlp1pZnQ9Wl793qbVvED1E= diff --git a/receiver/couchdbreceiver/factory_test.go b/receiver/couchdbreceiver/factory_test.go index 33e8fb5b50313..fcc157619191e 100644 --- a/receiver/couchdbreceiver/factory_test.go +++ b/receiver/couchdbreceiver/factory_test.go @@ -37,7 +37,7 @@ func TestValidConfig(t *testing.T) { cfg.Password = "otel" require.EqualValues(t, defaultEndpoint, cfg.Endpoint) - require.NoError(t, cfg.Validate()) + require.NoError(t, component.ValidateConfig(cfg)) } func TestCreateMetricsReceiver(t *testing.T) { diff --git a/receiver/couchdbreceiver/go.mod b/receiver/couchdbreceiver/go.mod index d7c27ff863a10..49cb0c9c92e50 100644 --- a/receiver/couchdbreceiver/go.mod +++ b/receiver/couchdbreceiver/go.mod @@ -5,8 +5,10 @@ go 1.18 require ( github.com/open-telemetry/opentelemetry-collector-contrib/internal/scrapertest v0.64.0 github.com/stretchr/testify v1.8.1 - go.opentelemetry.io/collector v0.64.2-0.20221115155901-1550938c18fd - go.opentelemetry.io/collector/pdata v0.64.2-0.20221115155901-1550938c18fd + go.opentelemetry.io/collector v0.64.2-0.20221117234814-4565692c50a7 + go.opentelemetry.io/collector/component v0.0.0-20221117234814-4565692c50a7 + go.opentelemetry.io/collector/consumer v0.0.0-20221117234814-4565692c50a7 + go.opentelemetry.io/collector/pdata v0.64.2-0.20221117234814-4565692c50a7 go.uber.org/multierr v1.8.0 go.uber.org/zap v1.23.0 ) @@ -35,6 +37,7 @@ require ( github.com/rs/cors v1.8.2 // indirect github.com/stretchr/objx v0.5.0 // indirect go.opencensus.io v0.24.0 // indirect + go.opentelemetry.io/collector/featuregate v0.0.0-20221117214536-6a117bfc3737 // indirect go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.36.4 // indirect go.opentelemetry.io/otel v1.11.1 // indirect go.opentelemetry.io/otel/metric v0.33.0 // indirect diff --git a/receiver/couchdbreceiver/go.sum b/receiver/couchdbreceiver/go.sum index a94098f137433..2385e421fd2d6 100644 --- a/receiver/couchdbreceiver/go.sum +++ b/receiver/couchdbreceiver/go.sum @@ -295,10 +295,16 @@ go.etcd.io/etcd/client/pkg/v3 v3.5.4/go.mod h1:IJHfcCEKxYu1Os13ZdwCwIUTUVGYTSAM3 go.etcd.io/etcd/client/v3 v3.5.4/go.mod h1:ZaRkVgBZC+L+dLCjTcF1hRXpgZXQPOvnA/Ak/gq3kiY= go.opencensus.io v0.24.0 h1:y73uSU6J157QMP2kn2r30vwW1A2W2WFwSCGnAVxeaD0= go.opencensus.io v0.24.0/go.mod h1:vNK8G9p7aAivkbmorf4v+7Hgx+Zs0yY+0fOtgBfjQKo= -go.opentelemetry.io/collector v0.64.2-0.20221115155901-1550938c18fd h1:O+6HhE4Ivg8Jksp3dIXIEC4FIR0Ush4uORvG3UtHZWk= -go.opentelemetry.io/collector v0.64.2-0.20221115155901-1550938c18fd/go.mod h1:mmSrOcwe1vEYmChXUYuF6rzlrUL0rjEiPfa19Xxb41o= -go.opentelemetry.io/collector/pdata v0.64.2-0.20221115155901-1550938c18fd h1:GdVAbRiae5VDZe3Mn3FqzMxO/aI5UbJ4+dcviqClHy8= -go.opentelemetry.io/collector/pdata v0.64.2-0.20221115155901-1550938c18fd/go.mod h1:0vynPfW2ZN7DltpcCFgCmTtWMQkCjp2a3TNt82YTCLQ= +go.opentelemetry.io/collector v0.64.2-0.20221117234814-4565692c50a7 h1:o/vMr2iyXzaeTb/KAldhMxAvRIfFPwtKfL5cKVKsSlU= +go.opentelemetry.io/collector v0.64.2-0.20221117234814-4565692c50a7/go.mod h1:PO8hayFFYvXDqELbXRVxwawR2HTdjN6mY4Qa3Se9xI8= +go.opentelemetry.io/collector/component v0.0.0-20221117234814-4565692c50a7 h1:q9m1bGHhQFUakQX79lZpLmFSY9VLULNSs2jUG8MdJLA= +go.opentelemetry.io/collector/component v0.0.0-20221117234814-4565692c50a7/go.mod h1:Z7H1Oj826e4dtVxXmT6SiUr6S0EIevUJmkVpfQV+UOk= +go.opentelemetry.io/collector/consumer v0.0.0-20221117234814-4565692c50a7 h1:FTy1JD9EJ7gq9SzlZoi2NkGcZ88+SwdiJav5uRcDEEY= +go.opentelemetry.io/collector/consumer v0.0.0-20221117234814-4565692c50a7/go.mod h1:86Elcw/LLrh90DprArogHMkBX3+UMu3tIgcVWF3mr6o= +go.opentelemetry.io/collector/featuregate v0.0.0-20221117214536-6a117bfc3737 h1:7sXg6M9Fw6rFVlX+iaWOMz6DFXEiroUdQer5kWGixwM= +go.opentelemetry.io/collector/featuregate v0.0.0-20221117214536-6a117bfc3737/go.mod h1:tewuFKJYalWBU0bmNKg++MC1ipINXUr6szYzOw2p1GI= +go.opentelemetry.io/collector/pdata v0.64.2-0.20221117234814-4565692c50a7 h1:IOFqfOu7fFxTgC7pvc2U7dk1/uFjwVQPK+CALiUvacI= +go.opentelemetry.io/collector/pdata v0.64.2-0.20221117234814-4565692c50a7/go.mod h1:0vynPfW2ZN7DltpcCFgCmTtWMQkCjp2a3TNt82YTCLQ= go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.36.4 h1:aUEBEdCa6iamGzg6fuYxDA8ThxvOG240mAvWDU+XLio= go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.36.4/go.mod h1:l2MdsbKTocpPS5nQZscqTR9jd8u96VYZdcpF8Sye7mA= go.opentelemetry.io/otel v1.11.1 h1:4WLLAmcfkmDk2ukNXJyq3/kiz/3UzCaYq6PskJsaou4= diff --git a/receiver/couchdbreceiver/scraper_test.go b/receiver/couchdbreceiver/scraper_test.go index f8dde1a2e8866..fd9dba474d5d6 100644 --- a/receiver/couchdbreceiver/scraper_test.go +++ b/receiver/couchdbreceiver/scraper_test.go @@ -26,6 +26,7 @@ import ( "github.com/stretchr/testify/assert" "github.com/stretchr/testify/mock" "github.com/stretchr/testify/require" + "go.opentelemetry.io/collector/component" "go.opentelemetry.io/collector/component/componenttest" "go.opentelemetry.io/collector/config/confighttp" "go.opentelemetry.io/collector/receiver/scrapererror" @@ -43,7 +44,7 @@ func TestScrape(t *testing.T) { cfg := f.CreateDefaultConfig().(*Config) cfg.Username = "otelu" cfg.Password = "otelp" - require.NoError(t, cfg.Validate()) + require.NoError(t, component.ValidateConfig(cfg)) t.Run("scrape from couchdb version 2.31", func(t *testing.T) { mockClient := new(MockClient) @@ -130,7 +131,7 @@ func TestStart(t *testing.T) { cfg := f.CreateDefaultConfig().(*Config) cfg.Username = "otelu" cfg.Password = "otelp" - require.NoError(t, cfg.Validate()) + require.NoError(t, component.ValidateConfig(cfg)) scraper := newCouchdbScraper(componenttest.NewNopReceiverCreateSettings(), cfg) err := scraper.start(context.Background(), componenttest.NewNopHost()) @@ -142,7 +143,7 @@ func TestStart(t *testing.T) { cfg.HTTPClientSettings.TLSSetting.CAFile = "/non/existent" cfg.Username = "otelu" cfg.Password = "otelp" - require.NoError(t, cfg.Validate()) + require.NoError(t, component.ValidateConfig(cfg)) scraper := newCouchdbScraper(componenttest.NewNopReceiverCreateSettings(), cfg) err := scraper.start(context.Background(), componenttest.NewNopHost()) diff --git a/receiver/dockerstatsreceiver/config_test.go b/receiver/dockerstatsreceiver/config_test.go index b91a18f15e91f..623b9ba2577c1 100644 --- a/receiver/dockerstatsreceiver/config_test.go +++ b/receiver/dockerstatsreceiver/config_test.go @@ -95,7 +95,7 @@ func TestLoadConfig(t *testing.T) { require.NoError(t, err) require.NoError(t, component.UnmarshalReceiverConfig(sub, cfg)) - assert.NoError(t, cfg.Validate()) + assert.NoError(t, component.ValidateConfig(cfg)) if diff := cmp.Diff(tt.expected, cfg, cmpopts.IgnoreUnexported(config.ReceiverSettings{}, metadata.MetricSettings{})); diff != "" { t.Errorf("Config mismatch (-expected +actual):\n%s", diff) } @@ -105,11 +105,11 @@ func TestLoadConfig(t *testing.T) { func TestValidateErrors(t *testing.T) { cfg := &Config{} - assert.Equal(t, "endpoint must be specified", cfg.Validate().Error()) + assert.Equal(t, "endpoint must be specified", component.ValidateConfig(cfg).Error()) cfg = &Config{Endpoint: "someEndpoint"} - assert.Equal(t, "collection_interval must be a positive duration", cfg.Validate().Error()) + assert.Equal(t, "collection_interval must be a positive duration", component.ValidateConfig(cfg).Error()) cfg = &Config{ScraperControllerSettings: scraperhelper.ScraperControllerSettings{CollectionInterval: 1 * time.Second}, Endpoint: "someEndpoint", DockerAPIVersion: 1.21} - assert.Equal(t, "api_version must be at least 1.22", cfg.Validate().Error()) + assert.Equal(t, "api_version must be at least 1.22", component.ValidateConfig(cfg).Error()) } diff --git a/receiver/dockerstatsreceiver/go.mod b/receiver/dockerstatsreceiver/go.mod index 64bea82478f9a..81bf205d3300c 100644 --- a/receiver/dockerstatsreceiver/go.mod +++ b/receiver/dockerstatsreceiver/go.mod @@ -9,9 +9,12 @@ require ( github.com/open-telemetry/opentelemetry-collector-contrib/internal/scrapertest v0.64.0 github.com/stretchr/testify v1.8.1 github.com/testcontainers/testcontainers-go v0.15.0 - go.opentelemetry.io/collector v0.64.2-0.20221115155901-1550938c18fd - go.opentelemetry.io/collector/pdata v0.64.2-0.20221115155901-1550938c18fd - go.opentelemetry.io/collector/semconv v0.64.2-0.20221115155901-1550938c18fd + go.opentelemetry.io/collector v0.64.2-0.20221117234814-4565692c50a7 + go.opentelemetry.io/collector/component v0.0.0-20221117234814-4565692c50a7 + go.opentelemetry.io/collector/consumer v0.0.0-20221117234814-4565692c50a7 + go.opentelemetry.io/collector/featuregate v0.0.0-20221117214536-6a117bfc3737 + go.opentelemetry.io/collector/pdata v0.64.2-0.20221117234814-4565692c50a7 + go.opentelemetry.io/collector/semconv v0.64.2-0.20221117234814-4565692c50a7 go.uber.org/multierr v1.8.0 go.uber.org/zap v1.23.0 ) diff --git a/receiver/dockerstatsreceiver/go.sum b/receiver/dockerstatsreceiver/go.sum index 2e5ffe2b02644..c68f7226dc01a 100644 --- a/receiver/dockerstatsreceiver/go.sum +++ b/receiver/dockerstatsreceiver/go.sum @@ -824,12 +824,18 @@ go.opencensus.io v0.22.2/go.mod h1:yxeiOL68Rb0Xd1ddK5vPZ/oVn4vY4Ynel7k9FzqtOIw= go.opencensus.io v0.22.3/go.mod h1:yxeiOL68Rb0Xd1ddK5vPZ/oVn4vY4Ynel7k9FzqtOIw= go.opencensus.io v0.24.0 h1:y73uSU6J157QMP2kn2r30vwW1A2W2WFwSCGnAVxeaD0= go.opencensus.io v0.24.0/go.mod h1:vNK8G9p7aAivkbmorf4v+7Hgx+Zs0yY+0fOtgBfjQKo= -go.opentelemetry.io/collector v0.64.2-0.20221115155901-1550938c18fd h1:O+6HhE4Ivg8Jksp3dIXIEC4FIR0Ush4uORvG3UtHZWk= -go.opentelemetry.io/collector v0.64.2-0.20221115155901-1550938c18fd/go.mod h1:mmSrOcwe1vEYmChXUYuF6rzlrUL0rjEiPfa19Xxb41o= -go.opentelemetry.io/collector/pdata v0.64.2-0.20221115155901-1550938c18fd h1:GdVAbRiae5VDZe3Mn3FqzMxO/aI5UbJ4+dcviqClHy8= -go.opentelemetry.io/collector/pdata v0.64.2-0.20221115155901-1550938c18fd/go.mod h1:0vynPfW2ZN7DltpcCFgCmTtWMQkCjp2a3TNt82YTCLQ= -go.opentelemetry.io/collector/semconv v0.64.2-0.20221115155901-1550938c18fd h1:rMqcl2pwi8YtVrtOPK8tVh87W0bFBge4yqB9ypSsAJ4= -go.opentelemetry.io/collector/semconv v0.64.2-0.20221115155901-1550938c18fd/go.mod h1:5o9yhOa+ABt7g2E5JABDxGZ1PQPbtfxrKNbYn+LOTXU= +go.opentelemetry.io/collector v0.64.2-0.20221117234814-4565692c50a7 h1:o/vMr2iyXzaeTb/KAldhMxAvRIfFPwtKfL5cKVKsSlU= +go.opentelemetry.io/collector v0.64.2-0.20221117234814-4565692c50a7/go.mod h1:PO8hayFFYvXDqELbXRVxwawR2HTdjN6mY4Qa3Se9xI8= +go.opentelemetry.io/collector/component v0.0.0-20221117234814-4565692c50a7 h1:q9m1bGHhQFUakQX79lZpLmFSY9VLULNSs2jUG8MdJLA= +go.opentelemetry.io/collector/component v0.0.0-20221117234814-4565692c50a7/go.mod h1:Z7H1Oj826e4dtVxXmT6SiUr6S0EIevUJmkVpfQV+UOk= +go.opentelemetry.io/collector/consumer v0.0.0-20221117234814-4565692c50a7 h1:FTy1JD9EJ7gq9SzlZoi2NkGcZ88+SwdiJav5uRcDEEY= +go.opentelemetry.io/collector/consumer v0.0.0-20221117234814-4565692c50a7/go.mod h1:86Elcw/LLrh90DprArogHMkBX3+UMu3tIgcVWF3mr6o= +go.opentelemetry.io/collector/featuregate v0.0.0-20221117214536-6a117bfc3737 h1:7sXg6M9Fw6rFVlX+iaWOMz6DFXEiroUdQer5kWGixwM= +go.opentelemetry.io/collector/featuregate v0.0.0-20221117214536-6a117bfc3737/go.mod h1:tewuFKJYalWBU0bmNKg++MC1ipINXUr6szYzOw2p1GI= +go.opentelemetry.io/collector/pdata v0.64.2-0.20221117234814-4565692c50a7 h1:IOFqfOu7fFxTgC7pvc2U7dk1/uFjwVQPK+CALiUvacI= +go.opentelemetry.io/collector/pdata v0.64.2-0.20221117234814-4565692c50a7/go.mod h1:0vynPfW2ZN7DltpcCFgCmTtWMQkCjp2a3TNt82YTCLQ= +go.opentelemetry.io/collector/semconv v0.64.2-0.20221117234814-4565692c50a7 h1:cGXAVltDxXw9nj0Vr7vyZZTj0whdyO+GYs+xv0xHJ2A= +go.opentelemetry.io/collector/semconv v0.64.2-0.20221117234814-4565692c50a7/go.mod h1:5o9yhOa+ABt7g2E5JABDxGZ1PQPbtfxrKNbYn+LOTXU= go.opentelemetry.io/otel v1.11.1 h1:4WLLAmcfkmDk2ukNXJyq3/kiz/3UzCaYq6PskJsaou4= go.opentelemetry.io/otel v1.11.1/go.mod h1:1nNhXBbWSD0nsL38H6btgnFN2k4i0sNLHNNMZMSbUGE= go.opentelemetry.io/otel/exporters/prometheus v0.33.0 h1:xXhPj7SLKWU5/Zd4Hxmd+X1C4jdmvc0Xy+kvjFx2z60= diff --git a/receiver/dotnetdiagnosticsreceiver/go.mod b/receiver/dotnetdiagnosticsreceiver/go.mod index 3f3093dd8ed04..11557cff200cf 100644 --- a/receiver/dotnetdiagnosticsreceiver/go.mod +++ b/receiver/dotnetdiagnosticsreceiver/go.mod @@ -4,8 +4,10 @@ go 1.18 require ( github.com/stretchr/testify v1.8.1 - go.opentelemetry.io/collector v0.64.2-0.20221115155901-1550938c18fd - go.opentelemetry.io/collector/pdata v0.64.2-0.20221115155901-1550938c18fd + go.opentelemetry.io/collector v0.64.2-0.20221117234814-4565692c50a7 + go.opentelemetry.io/collector/component v0.0.0-20221117234814-4565692c50a7 + go.opentelemetry.io/collector/consumer v0.0.0-20221117234814-4565692c50a7 + go.opentelemetry.io/collector/pdata v0.64.2-0.20221117234814-4565692c50a7 go.uber.org/zap v1.23.0 ) @@ -25,6 +27,7 @@ require ( github.com/pelletier/go-toml v1.9.4 // indirect github.com/pmezard/go-difflib v1.0.0 // indirect go.opencensus.io v0.24.0 // indirect + go.opentelemetry.io/collector/featuregate v0.0.0-20221117214536-6a117bfc3737 // indirect go.opentelemetry.io/otel v1.11.1 // indirect go.opentelemetry.io/otel/metric v0.33.0 // indirect go.opentelemetry.io/otel/trace v1.11.1 // indirect diff --git a/receiver/dotnetdiagnosticsreceiver/go.sum b/receiver/dotnetdiagnosticsreceiver/go.sum index 2bf3cabe9c4c2..ed79f03d0ad85 100644 --- a/receiver/dotnetdiagnosticsreceiver/go.sum +++ b/receiver/dotnetdiagnosticsreceiver/go.sum @@ -284,10 +284,16 @@ go.etcd.io/etcd/client/pkg/v3 v3.5.4/go.mod h1:IJHfcCEKxYu1Os13ZdwCwIUTUVGYTSAM3 go.etcd.io/etcd/client/v3 v3.5.4/go.mod h1:ZaRkVgBZC+L+dLCjTcF1hRXpgZXQPOvnA/Ak/gq3kiY= go.opencensus.io v0.24.0 h1:y73uSU6J157QMP2kn2r30vwW1A2W2WFwSCGnAVxeaD0= go.opencensus.io v0.24.0/go.mod h1:vNK8G9p7aAivkbmorf4v+7Hgx+Zs0yY+0fOtgBfjQKo= -go.opentelemetry.io/collector v0.64.2-0.20221115155901-1550938c18fd h1:O+6HhE4Ivg8Jksp3dIXIEC4FIR0Ush4uORvG3UtHZWk= -go.opentelemetry.io/collector v0.64.2-0.20221115155901-1550938c18fd/go.mod h1:mmSrOcwe1vEYmChXUYuF6rzlrUL0rjEiPfa19Xxb41o= -go.opentelemetry.io/collector/pdata v0.64.2-0.20221115155901-1550938c18fd h1:GdVAbRiae5VDZe3Mn3FqzMxO/aI5UbJ4+dcviqClHy8= -go.opentelemetry.io/collector/pdata v0.64.2-0.20221115155901-1550938c18fd/go.mod h1:0vynPfW2ZN7DltpcCFgCmTtWMQkCjp2a3TNt82YTCLQ= +go.opentelemetry.io/collector v0.64.2-0.20221117234814-4565692c50a7 h1:o/vMr2iyXzaeTb/KAldhMxAvRIfFPwtKfL5cKVKsSlU= +go.opentelemetry.io/collector v0.64.2-0.20221117234814-4565692c50a7/go.mod h1:PO8hayFFYvXDqELbXRVxwawR2HTdjN6mY4Qa3Se9xI8= +go.opentelemetry.io/collector/component v0.0.0-20221117234814-4565692c50a7 h1:q9m1bGHhQFUakQX79lZpLmFSY9VLULNSs2jUG8MdJLA= +go.opentelemetry.io/collector/component v0.0.0-20221117234814-4565692c50a7/go.mod h1:Z7H1Oj826e4dtVxXmT6SiUr6S0EIevUJmkVpfQV+UOk= +go.opentelemetry.io/collector/consumer v0.0.0-20221117234814-4565692c50a7 h1:FTy1JD9EJ7gq9SzlZoi2NkGcZ88+SwdiJav5uRcDEEY= +go.opentelemetry.io/collector/consumer v0.0.0-20221117234814-4565692c50a7/go.mod h1:86Elcw/LLrh90DprArogHMkBX3+UMu3tIgcVWF3mr6o= +go.opentelemetry.io/collector/featuregate v0.0.0-20221117214536-6a117bfc3737 h1:7sXg6M9Fw6rFVlX+iaWOMz6DFXEiroUdQer5kWGixwM= +go.opentelemetry.io/collector/featuregate v0.0.0-20221117214536-6a117bfc3737/go.mod h1:tewuFKJYalWBU0bmNKg++MC1ipINXUr6szYzOw2p1GI= +go.opentelemetry.io/collector/pdata v0.64.2-0.20221117234814-4565692c50a7 h1:IOFqfOu7fFxTgC7pvc2U7dk1/uFjwVQPK+CALiUvacI= +go.opentelemetry.io/collector/pdata v0.64.2-0.20221117234814-4565692c50a7/go.mod h1:0vynPfW2ZN7DltpcCFgCmTtWMQkCjp2a3TNt82YTCLQ= go.opentelemetry.io/otel v1.11.1 h1:4WLLAmcfkmDk2ukNXJyq3/kiz/3UzCaYq6PskJsaou4= go.opentelemetry.io/otel v1.11.1/go.mod h1:1nNhXBbWSD0nsL38H6btgnFN2k4i0sNLHNNMZMSbUGE= go.opentelemetry.io/otel/exporters/prometheus v0.33.0 h1:xXhPj7SLKWU5/Zd4Hxmd+X1C4jdmvc0Xy+kvjFx2z60= diff --git a/receiver/elasticsearchreceiver/config_test.go b/receiver/elasticsearchreceiver/config_test.go index 84743b15f8f07..857e5ae2c7a56 100644 --- a/receiver/elasticsearchreceiver/config_test.go +++ b/receiver/elasticsearchreceiver/config_test.go @@ -44,7 +44,7 @@ func TestValidateCredentials(t *testing.T) { cfg := NewFactory().CreateDefaultConfig().(*Config) cfg.Username = "user" - require.ErrorIs(t, cfg.Validate(), errPasswordNotSpecified) + require.ErrorIs(t, component.ValidateConfig(cfg), errPasswordNotSpecified) }, }, { @@ -54,7 +54,7 @@ func TestValidateCredentials(t *testing.T) { cfg := NewFactory().CreateDefaultConfig().(*Config) cfg.Password = "pass" - require.ErrorIs(t, cfg.Validate(), errUsernameNotSpecified) + require.ErrorIs(t, component.ValidateConfig(cfg), errUsernameNotSpecified) }, }, { @@ -65,7 +65,7 @@ func TestValidateCredentials(t *testing.T) { cfg := NewFactory().CreateDefaultConfig().(*Config) cfg.Username = "user" cfg.Password = "pass" - require.NoError(t, cfg.Validate()) + require.NoError(t, component.ValidateConfig(cfg)) }, }, { @@ -74,7 +74,7 @@ func TestValidateCredentials(t *testing.T) { t.Parallel() cfg := NewFactory().CreateDefaultConfig().(*Config) - require.NoError(t, cfg.Validate()) + require.NoError(t, component.ValidateConfig(cfg)) }, }, } @@ -135,7 +135,7 @@ func TestValidateEndpoint(t *testing.T) { cfg := NewFactory().CreateDefaultConfig().(*Config) cfg.Endpoint = testCase.rawURL - err := cfg.Validate() + err := component.ValidateConfig(cfg) switch { case testCase.expectedErr != nil: @@ -196,7 +196,7 @@ func TestLoadConfig(t *testing.T) { require.NoError(t, err) require.NoError(t, component.UnmarshalReceiverConfig(sub, cfg)) - assert.NoError(t, cfg.Validate()) + assert.NoError(t, component.ValidateConfig(cfg)) if diff := cmp.Diff(tt.expected, cfg, cmpopts.IgnoreUnexported(config.ReceiverSettings{}, metadata.MetricSettings{})); diff != "" { t.Errorf("Config mismatch (-expected +actual):\n%s", diff) } diff --git a/receiver/elasticsearchreceiver/go.mod b/receiver/elasticsearchreceiver/go.mod index 4e206f015a999..80bfb5c7bf12e 100644 --- a/receiver/elasticsearchreceiver/go.mod +++ b/receiver/elasticsearchreceiver/go.mod @@ -8,8 +8,11 @@ require ( github.com/open-telemetry/opentelemetry-collector-contrib/internal/scrapertest v0.64.0 github.com/stretchr/testify v1.8.1 github.com/testcontainers/testcontainers-go v0.15.0 - go.opentelemetry.io/collector v0.64.2-0.20221115155901-1550938c18fd - go.opentelemetry.io/collector/pdata v0.64.2-0.20221115155901-1550938c18fd + go.opentelemetry.io/collector v0.64.2-0.20221117234814-4565692c50a7 + go.opentelemetry.io/collector/component v0.0.0-20221117234814-4565692c50a7 + go.opentelemetry.io/collector/consumer v0.0.0-20221117234814-4565692c50a7 + go.opentelemetry.io/collector/featuregate v0.0.0-20221117214536-6a117bfc3737 + go.opentelemetry.io/collector/pdata v0.64.2-0.20221117234814-4565692c50a7 go.uber.org/multierr v1.8.0 go.uber.org/zap v1.23.0 ) diff --git a/receiver/elasticsearchreceiver/go.sum b/receiver/elasticsearchreceiver/go.sum index 840e2efc0ed82..8af84cee4eeb1 100644 --- a/receiver/elasticsearchreceiver/go.sum +++ b/receiver/elasticsearchreceiver/go.sum @@ -832,10 +832,16 @@ go.opencensus.io v0.22.2/go.mod h1:yxeiOL68Rb0Xd1ddK5vPZ/oVn4vY4Ynel7k9FzqtOIw= go.opencensus.io v0.22.3/go.mod h1:yxeiOL68Rb0Xd1ddK5vPZ/oVn4vY4Ynel7k9FzqtOIw= go.opencensus.io v0.24.0 h1:y73uSU6J157QMP2kn2r30vwW1A2W2WFwSCGnAVxeaD0= go.opencensus.io v0.24.0/go.mod h1:vNK8G9p7aAivkbmorf4v+7Hgx+Zs0yY+0fOtgBfjQKo= -go.opentelemetry.io/collector v0.64.2-0.20221115155901-1550938c18fd h1:O+6HhE4Ivg8Jksp3dIXIEC4FIR0Ush4uORvG3UtHZWk= -go.opentelemetry.io/collector v0.64.2-0.20221115155901-1550938c18fd/go.mod h1:mmSrOcwe1vEYmChXUYuF6rzlrUL0rjEiPfa19Xxb41o= -go.opentelemetry.io/collector/pdata v0.64.2-0.20221115155901-1550938c18fd h1:GdVAbRiae5VDZe3Mn3FqzMxO/aI5UbJ4+dcviqClHy8= -go.opentelemetry.io/collector/pdata v0.64.2-0.20221115155901-1550938c18fd/go.mod h1:0vynPfW2ZN7DltpcCFgCmTtWMQkCjp2a3TNt82YTCLQ= +go.opentelemetry.io/collector v0.64.2-0.20221117234814-4565692c50a7 h1:o/vMr2iyXzaeTb/KAldhMxAvRIfFPwtKfL5cKVKsSlU= +go.opentelemetry.io/collector v0.64.2-0.20221117234814-4565692c50a7/go.mod h1:PO8hayFFYvXDqELbXRVxwawR2HTdjN6mY4Qa3Se9xI8= +go.opentelemetry.io/collector/component v0.0.0-20221117234814-4565692c50a7 h1:q9m1bGHhQFUakQX79lZpLmFSY9VLULNSs2jUG8MdJLA= +go.opentelemetry.io/collector/component v0.0.0-20221117234814-4565692c50a7/go.mod h1:Z7H1Oj826e4dtVxXmT6SiUr6S0EIevUJmkVpfQV+UOk= +go.opentelemetry.io/collector/consumer v0.0.0-20221117234814-4565692c50a7 h1:FTy1JD9EJ7gq9SzlZoi2NkGcZ88+SwdiJav5uRcDEEY= +go.opentelemetry.io/collector/consumer v0.0.0-20221117234814-4565692c50a7/go.mod h1:86Elcw/LLrh90DprArogHMkBX3+UMu3tIgcVWF3mr6o= +go.opentelemetry.io/collector/featuregate v0.0.0-20221117214536-6a117bfc3737 h1:7sXg6M9Fw6rFVlX+iaWOMz6DFXEiroUdQer5kWGixwM= +go.opentelemetry.io/collector/featuregate v0.0.0-20221117214536-6a117bfc3737/go.mod h1:tewuFKJYalWBU0bmNKg++MC1ipINXUr6szYzOw2p1GI= +go.opentelemetry.io/collector/pdata v0.64.2-0.20221117234814-4565692c50a7 h1:IOFqfOu7fFxTgC7pvc2U7dk1/uFjwVQPK+CALiUvacI= +go.opentelemetry.io/collector/pdata v0.64.2-0.20221117234814-4565692c50a7/go.mod h1:0vynPfW2ZN7DltpcCFgCmTtWMQkCjp2a3TNt82YTCLQ= go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.36.4 h1:aUEBEdCa6iamGzg6fuYxDA8ThxvOG240mAvWDU+XLio= go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.36.4/go.mod h1:l2MdsbKTocpPS5nQZscqTR9jd8u96VYZdcpF8Sye7mA= go.opentelemetry.io/otel v1.11.1 h1:4WLLAmcfkmDk2ukNXJyq3/kiz/3UzCaYq6PskJsaou4= diff --git a/receiver/expvarreceiver/config_test.go b/receiver/expvarreceiver/config_test.go index da182be93c300..9960a6e32e86b 100644 --- a/receiver/expvarreceiver/config_test.go +++ b/receiver/expvarreceiver/config_test.go @@ -90,10 +90,10 @@ func TestLoadConfig(t *testing.T) { require.NoError(t, component.UnmarshalReceiverConfig(sub, cfg)) if tt.expected == nil { - assert.EqualError(t, cfg.Validate(), tt.errorMessage) + assert.EqualError(t, component.ValidateConfig(cfg), tt.errorMessage) return } - assert.NoError(t, cfg.Validate()) + assert.NoError(t, component.ValidateConfig(cfg)) if diff := cmp.Diff(tt.expected, cfg, cmpopts.IgnoreUnexported(config.ReceiverSettings{}, metadata.MetricSettings{})); diff != "" { t.Errorf("Config mismatch (-expected +actual):\n%s", diff) } diff --git a/receiver/expvarreceiver/go.mod b/receiver/expvarreceiver/go.mod index 3a759cb551070..1d3eeb26f96eb 100644 --- a/receiver/expvarreceiver/go.mod +++ b/receiver/expvarreceiver/go.mod @@ -6,8 +6,10 @@ require ( github.com/google/go-cmp v0.5.9 github.com/open-telemetry/opentelemetry-collector-contrib/internal/scrapertest v0.64.0 github.com/stretchr/testify v1.8.1 - go.opentelemetry.io/collector v0.64.2-0.20221115155901-1550938c18fd - go.opentelemetry.io/collector/pdata v0.64.2-0.20221115155901-1550938c18fd + go.opentelemetry.io/collector v0.64.2-0.20221117234814-4565692c50a7 + go.opentelemetry.io/collector/component v0.0.0-20221117234814-4565692c50a7 + go.opentelemetry.io/collector/consumer v0.0.0-20221117234814-4565692c50a7 + go.opentelemetry.io/collector/pdata v0.64.2-0.20221117234814-4565692c50a7 ) require ( @@ -30,6 +32,7 @@ require ( github.com/rogpeppe/go-internal v1.8.1 // indirect github.com/rs/cors v1.8.2 // indirect go.opencensus.io v0.24.0 // indirect + go.opentelemetry.io/collector/featuregate v0.0.0-20221117214536-6a117bfc3737 // indirect go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.36.4 // indirect go.opentelemetry.io/otel v1.11.1 // indirect go.opentelemetry.io/otel/metric v0.33.0 // indirect diff --git a/receiver/expvarreceiver/go.sum b/receiver/expvarreceiver/go.sum index cbfa50179ca3c..62f494025cae8 100644 --- a/receiver/expvarreceiver/go.sum +++ b/receiver/expvarreceiver/go.sum @@ -291,10 +291,16 @@ go.etcd.io/etcd/client/pkg/v3 v3.5.4/go.mod h1:IJHfcCEKxYu1Os13ZdwCwIUTUVGYTSAM3 go.etcd.io/etcd/client/v3 v3.5.4/go.mod h1:ZaRkVgBZC+L+dLCjTcF1hRXpgZXQPOvnA/Ak/gq3kiY= go.opencensus.io v0.24.0 h1:y73uSU6J157QMP2kn2r30vwW1A2W2WFwSCGnAVxeaD0= go.opencensus.io v0.24.0/go.mod h1:vNK8G9p7aAivkbmorf4v+7Hgx+Zs0yY+0fOtgBfjQKo= -go.opentelemetry.io/collector v0.64.2-0.20221115155901-1550938c18fd h1:O+6HhE4Ivg8Jksp3dIXIEC4FIR0Ush4uORvG3UtHZWk= -go.opentelemetry.io/collector v0.64.2-0.20221115155901-1550938c18fd/go.mod h1:mmSrOcwe1vEYmChXUYuF6rzlrUL0rjEiPfa19Xxb41o= -go.opentelemetry.io/collector/pdata v0.64.2-0.20221115155901-1550938c18fd h1:GdVAbRiae5VDZe3Mn3FqzMxO/aI5UbJ4+dcviqClHy8= -go.opentelemetry.io/collector/pdata v0.64.2-0.20221115155901-1550938c18fd/go.mod h1:0vynPfW2ZN7DltpcCFgCmTtWMQkCjp2a3TNt82YTCLQ= +go.opentelemetry.io/collector v0.64.2-0.20221117234814-4565692c50a7 h1:o/vMr2iyXzaeTb/KAldhMxAvRIfFPwtKfL5cKVKsSlU= +go.opentelemetry.io/collector v0.64.2-0.20221117234814-4565692c50a7/go.mod h1:PO8hayFFYvXDqELbXRVxwawR2HTdjN6mY4Qa3Se9xI8= +go.opentelemetry.io/collector/component v0.0.0-20221117234814-4565692c50a7 h1:q9m1bGHhQFUakQX79lZpLmFSY9VLULNSs2jUG8MdJLA= +go.opentelemetry.io/collector/component v0.0.0-20221117234814-4565692c50a7/go.mod h1:Z7H1Oj826e4dtVxXmT6SiUr6S0EIevUJmkVpfQV+UOk= +go.opentelemetry.io/collector/consumer v0.0.0-20221117234814-4565692c50a7 h1:FTy1JD9EJ7gq9SzlZoi2NkGcZ88+SwdiJav5uRcDEEY= +go.opentelemetry.io/collector/consumer v0.0.0-20221117234814-4565692c50a7/go.mod h1:86Elcw/LLrh90DprArogHMkBX3+UMu3tIgcVWF3mr6o= +go.opentelemetry.io/collector/featuregate v0.0.0-20221117214536-6a117bfc3737 h1:7sXg6M9Fw6rFVlX+iaWOMz6DFXEiroUdQer5kWGixwM= +go.opentelemetry.io/collector/featuregate v0.0.0-20221117214536-6a117bfc3737/go.mod h1:tewuFKJYalWBU0bmNKg++MC1ipINXUr6szYzOw2p1GI= +go.opentelemetry.io/collector/pdata v0.64.2-0.20221117234814-4565692c50a7 h1:IOFqfOu7fFxTgC7pvc2U7dk1/uFjwVQPK+CALiUvacI= +go.opentelemetry.io/collector/pdata v0.64.2-0.20221117234814-4565692c50a7/go.mod h1:0vynPfW2ZN7DltpcCFgCmTtWMQkCjp2a3TNt82YTCLQ= go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.36.4 h1:aUEBEdCa6iamGzg6fuYxDA8ThxvOG240mAvWDU+XLio= go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.36.4/go.mod h1:l2MdsbKTocpPS5nQZscqTR9jd8u96VYZdcpF8Sye7mA= go.opentelemetry.io/otel v1.11.1 h1:4WLLAmcfkmDk2ukNXJyq3/kiz/3UzCaYq6PskJsaou4= diff --git a/receiver/filelogreceiver/filelog_test.go b/receiver/filelogreceiver/filelog_test.go index fdef3ffe97bff..afb1f596260f5 100644 --- a/receiver/filelogreceiver/filelog_test.go +++ b/receiver/filelogreceiver/filelog_test.go @@ -62,7 +62,7 @@ func TestLoadConfig(t *testing.T) { require.NoError(t, err) require.NoError(t, component.UnmarshalReceiverConfig(sub, cfg)) - assert.NoError(t, cfg.Validate()) + assert.NoError(t, component.ValidateConfig(cfg)) assert.Equal(t, testdataConfigYaml(), cfg) } diff --git a/receiver/filelogreceiver/go.mod b/receiver/filelogreceiver/go.mod index 28ee789c9a85f..fc41b41391edd 100644 --- a/receiver/filelogreceiver/go.mod +++ b/receiver/filelogreceiver/go.mod @@ -7,8 +7,10 @@ require ( github.com/open-telemetry/opentelemetry-collector-contrib/extension/storage v0.64.0 github.com/open-telemetry/opentelemetry-collector-contrib/pkg/stanza v0.64.0 github.com/stretchr/testify v1.8.1 - go.opentelemetry.io/collector v0.64.2-0.20221115155901-1550938c18fd - go.opentelemetry.io/collector/pdata v0.64.2-0.20221115155901-1550938c18fd + go.opentelemetry.io/collector v0.64.2-0.20221117234814-4565692c50a7 + go.opentelemetry.io/collector/component v0.0.0-20221117234814-4565692c50a7 + go.opentelemetry.io/collector/consumer v0.0.0-20221117234814-4565692c50a7 + go.opentelemetry.io/collector/pdata v0.64.2-0.20221117234814-4565692c50a7 go.uber.org/zap v1.23.0 ) @@ -29,6 +31,7 @@ require ( github.com/pmezard/go-difflib v1.0.0 // indirect github.com/rogpeppe/go-internal v1.8.1 // indirect go.opencensus.io v0.24.0 // indirect + go.opentelemetry.io/collector/featuregate v0.0.0-20221117214536-6a117bfc3737 // indirect go.opentelemetry.io/otel v1.11.1 // indirect go.opentelemetry.io/otel/metric v0.33.0 // indirect go.opentelemetry.io/otel/trace v1.11.1 // indirect diff --git a/receiver/filelogreceiver/go.sum b/receiver/filelogreceiver/go.sum index f8b355fda0e4c..ac715d832ae8d 100644 --- a/receiver/filelogreceiver/go.sum +++ b/receiver/filelogreceiver/go.sum @@ -303,10 +303,16 @@ go.etcd.io/etcd/client/pkg/v3 v3.5.4/go.mod h1:IJHfcCEKxYu1Os13ZdwCwIUTUVGYTSAM3 go.etcd.io/etcd/client/v3 v3.5.4/go.mod h1:ZaRkVgBZC+L+dLCjTcF1hRXpgZXQPOvnA/Ak/gq3kiY= go.opencensus.io v0.24.0 h1:y73uSU6J157QMP2kn2r30vwW1A2W2WFwSCGnAVxeaD0= go.opencensus.io v0.24.0/go.mod h1:vNK8G9p7aAivkbmorf4v+7Hgx+Zs0yY+0fOtgBfjQKo= -go.opentelemetry.io/collector v0.64.2-0.20221115155901-1550938c18fd h1:O+6HhE4Ivg8Jksp3dIXIEC4FIR0Ush4uORvG3UtHZWk= -go.opentelemetry.io/collector v0.64.2-0.20221115155901-1550938c18fd/go.mod h1:mmSrOcwe1vEYmChXUYuF6rzlrUL0rjEiPfa19Xxb41o= -go.opentelemetry.io/collector/pdata v0.64.2-0.20221115155901-1550938c18fd h1:GdVAbRiae5VDZe3Mn3FqzMxO/aI5UbJ4+dcviqClHy8= -go.opentelemetry.io/collector/pdata v0.64.2-0.20221115155901-1550938c18fd/go.mod h1:0vynPfW2ZN7DltpcCFgCmTtWMQkCjp2a3TNt82YTCLQ= +go.opentelemetry.io/collector v0.64.2-0.20221117234814-4565692c50a7 h1:o/vMr2iyXzaeTb/KAldhMxAvRIfFPwtKfL5cKVKsSlU= +go.opentelemetry.io/collector v0.64.2-0.20221117234814-4565692c50a7/go.mod h1:PO8hayFFYvXDqELbXRVxwawR2HTdjN6mY4Qa3Se9xI8= +go.opentelemetry.io/collector/component v0.0.0-20221117234814-4565692c50a7 h1:q9m1bGHhQFUakQX79lZpLmFSY9VLULNSs2jUG8MdJLA= +go.opentelemetry.io/collector/component v0.0.0-20221117234814-4565692c50a7/go.mod h1:Z7H1Oj826e4dtVxXmT6SiUr6S0EIevUJmkVpfQV+UOk= +go.opentelemetry.io/collector/consumer v0.0.0-20221117234814-4565692c50a7 h1:FTy1JD9EJ7gq9SzlZoi2NkGcZ88+SwdiJav5uRcDEEY= +go.opentelemetry.io/collector/consumer v0.0.0-20221117234814-4565692c50a7/go.mod h1:86Elcw/LLrh90DprArogHMkBX3+UMu3tIgcVWF3mr6o= +go.opentelemetry.io/collector/featuregate v0.0.0-20221117214536-6a117bfc3737 h1:7sXg6M9Fw6rFVlX+iaWOMz6DFXEiroUdQer5kWGixwM= +go.opentelemetry.io/collector/featuregate v0.0.0-20221117214536-6a117bfc3737/go.mod h1:tewuFKJYalWBU0bmNKg++MC1ipINXUr6szYzOw2p1GI= +go.opentelemetry.io/collector/pdata v0.64.2-0.20221117234814-4565692c50a7 h1:IOFqfOu7fFxTgC7pvc2U7dk1/uFjwVQPK+CALiUvacI= +go.opentelemetry.io/collector/pdata v0.64.2-0.20221117234814-4565692c50a7/go.mod h1:0vynPfW2ZN7DltpcCFgCmTtWMQkCjp2a3TNt82YTCLQ= go.opentelemetry.io/otel v1.11.1 h1:4WLLAmcfkmDk2ukNXJyq3/kiz/3UzCaYq6PskJsaou4= go.opentelemetry.io/otel v1.11.1/go.mod h1:1nNhXBbWSD0nsL38H6btgnFN2k4i0sNLHNNMZMSbUGE= go.opentelemetry.io/otel/exporters/prometheus v0.33.0 h1:xXhPj7SLKWU5/Zd4Hxmd+X1C4jdmvc0Xy+kvjFx2z60= diff --git a/receiver/flinkmetricsreceiver/go.mod b/receiver/flinkmetricsreceiver/go.mod index 17381526cd005..af067de633548 100644 --- a/receiver/flinkmetricsreceiver/go.mod +++ b/receiver/flinkmetricsreceiver/go.mod @@ -6,8 +6,10 @@ require ( github.com/open-telemetry/opentelemetry-collector-contrib/internal/scrapertest v0.64.0 github.com/stretchr/testify v1.8.1 github.com/testcontainers/testcontainers-go v0.15.0 - go.opentelemetry.io/collector v0.64.2-0.20221115155901-1550938c18fd - go.opentelemetry.io/collector/pdata v0.64.2-0.20221115155901-1550938c18fd + go.opentelemetry.io/collector v0.64.2-0.20221117234814-4565692c50a7 + go.opentelemetry.io/collector/component v0.0.0-20221117234814-4565692c50a7 + go.opentelemetry.io/collector/consumer v0.0.0-20221117234814-4565692c50a7 + go.opentelemetry.io/collector/pdata v0.64.2-0.20221117234814-4565692c50a7 go.uber.org/zap v1.23.0 ) @@ -53,6 +55,7 @@ require ( github.com/sirupsen/logrus v1.8.1 // indirect github.com/stretchr/objx v0.5.0 // indirect go.opencensus.io v0.24.0 // indirect + go.opentelemetry.io/collector/featuregate v0.0.0-20221117214536-6a117bfc3737 // indirect go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.36.4 // indirect go.opentelemetry.io/otel v1.11.1 // indirect go.opentelemetry.io/otel/metric v0.33.0 // indirect diff --git a/receiver/flinkmetricsreceiver/go.sum b/receiver/flinkmetricsreceiver/go.sum index 44791d96bc293..3c8d45f247a2c 100644 --- a/receiver/flinkmetricsreceiver/go.sum +++ b/receiver/flinkmetricsreceiver/go.sum @@ -828,10 +828,16 @@ go.opencensus.io v0.22.2/go.mod h1:yxeiOL68Rb0Xd1ddK5vPZ/oVn4vY4Ynel7k9FzqtOIw= go.opencensus.io v0.22.3/go.mod h1:yxeiOL68Rb0Xd1ddK5vPZ/oVn4vY4Ynel7k9FzqtOIw= go.opencensus.io v0.24.0 h1:y73uSU6J157QMP2kn2r30vwW1A2W2WFwSCGnAVxeaD0= go.opencensus.io v0.24.0/go.mod h1:vNK8G9p7aAivkbmorf4v+7Hgx+Zs0yY+0fOtgBfjQKo= -go.opentelemetry.io/collector v0.64.2-0.20221115155901-1550938c18fd h1:O+6HhE4Ivg8Jksp3dIXIEC4FIR0Ush4uORvG3UtHZWk= -go.opentelemetry.io/collector v0.64.2-0.20221115155901-1550938c18fd/go.mod h1:mmSrOcwe1vEYmChXUYuF6rzlrUL0rjEiPfa19Xxb41o= -go.opentelemetry.io/collector/pdata v0.64.2-0.20221115155901-1550938c18fd h1:GdVAbRiae5VDZe3Mn3FqzMxO/aI5UbJ4+dcviqClHy8= -go.opentelemetry.io/collector/pdata v0.64.2-0.20221115155901-1550938c18fd/go.mod h1:0vynPfW2ZN7DltpcCFgCmTtWMQkCjp2a3TNt82YTCLQ= +go.opentelemetry.io/collector v0.64.2-0.20221117234814-4565692c50a7 h1:o/vMr2iyXzaeTb/KAldhMxAvRIfFPwtKfL5cKVKsSlU= +go.opentelemetry.io/collector v0.64.2-0.20221117234814-4565692c50a7/go.mod h1:PO8hayFFYvXDqELbXRVxwawR2HTdjN6mY4Qa3Se9xI8= +go.opentelemetry.io/collector/component v0.0.0-20221117234814-4565692c50a7 h1:q9m1bGHhQFUakQX79lZpLmFSY9VLULNSs2jUG8MdJLA= +go.opentelemetry.io/collector/component v0.0.0-20221117234814-4565692c50a7/go.mod h1:Z7H1Oj826e4dtVxXmT6SiUr6S0EIevUJmkVpfQV+UOk= +go.opentelemetry.io/collector/consumer v0.0.0-20221117234814-4565692c50a7 h1:FTy1JD9EJ7gq9SzlZoi2NkGcZ88+SwdiJav5uRcDEEY= +go.opentelemetry.io/collector/consumer v0.0.0-20221117234814-4565692c50a7/go.mod h1:86Elcw/LLrh90DprArogHMkBX3+UMu3tIgcVWF3mr6o= +go.opentelemetry.io/collector/featuregate v0.0.0-20221117214536-6a117bfc3737 h1:7sXg6M9Fw6rFVlX+iaWOMz6DFXEiroUdQer5kWGixwM= +go.opentelemetry.io/collector/featuregate v0.0.0-20221117214536-6a117bfc3737/go.mod h1:tewuFKJYalWBU0bmNKg++MC1ipINXUr6szYzOw2p1GI= +go.opentelemetry.io/collector/pdata v0.64.2-0.20221117234814-4565692c50a7 h1:IOFqfOu7fFxTgC7pvc2U7dk1/uFjwVQPK+CALiUvacI= +go.opentelemetry.io/collector/pdata v0.64.2-0.20221117234814-4565692c50a7/go.mod h1:0vynPfW2ZN7DltpcCFgCmTtWMQkCjp2a3TNt82YTCLQ= go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.36.4 h1:aUEBEdCa6iamGzg6fuYxDA8ThxvOG240mAvWDU+XLio= go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.36.4/go.mod h1:l2MdsbKTocpPS5nQZscqTR9jd8u96VYZdcpF8Sye7mA= go.opentelemetry.io/otel v1.11.1 h1:4WLLAmcfkmDk2ukNXJyq3/kiz/3UzCaYq6PskJsaou4= diff --git a/receiver/fluentforwardreceiver/config_test.go b/receiver/fluentforwardreceiver/config_test.go index cfdfd31ca648d..e983a4d2dc895 100644 --- a/receiver/fluentforwardreceiver/config_test.go +++ b/receiver/fluentforwardreceiver/config_test.go @@ -35,6 +35,6 @@ func TestLoadConfig(t *testing.T) { require.NoError(t, err) require.NoError(t, component.UnmarshalReceiverConfig(sub, cfg)) - assert.NoError(t, cfg.Validate()) + assert.NoError(t, component.ValidateConfig(cfg)) assert.Equal(t, factory.CreateDefaultConfig(), cfg) } diff --git a/receiver/fluentforwardreceiver/go.mod b/receiver/fluentforwardreceiver/go.mod index 75076c422d4a8..eee0c2233e8a9 100644 --- a/receiver/fluentforwardreceiver/go.mod +++ b/receiver/fluentforwardreceiver/go.mod @@ -6,8 +6,10 @@ require ( github.com/stretchr/testify v1.8.1 github.com/tinylib/msgp v1.1.6 go.opencensus.io v0.24.0 - go.opentelemetry.io/collector v0.64.2-0.20221115155901-1550938c18fd - go.opentelemetry.io/collector/pdata v0.64.2-0.20221115155901-1550938c18fd + go.opentelemetry.io/collector v0.64.2-0.20221117234814-4565692c50a7 + go.opentelemetry.io/collector/component v0.0.0-20221117234814-4565692c50a7 + go.opentelemetry.io/collector/consumer v0.0.0-20221117234814-4565692c50a7 + go.opentelemetry.io/collector/pdata v0.64.2-0.20221117234814-4565692c50a7 go.uber.org/zap v1.23.0 ) @@ -27,6 +29,7 @@ require ( github.com/pelletier/go-toml v1.9.4 // indirect github.com/philhofer/fwd v1.1.1 // indirect github.com/pmezard/go-difflib v1.0.0 // indirect + go.opentelemetry.io/collector/featuregate v0.0.0-20221117214536-6a117bfc3737 // indirect go.opentelemetry.io/otel v1.11.1 // indirect go.opentelemetry.io/otel/metric v0.33.0 // indirect go.opentelemetry.io/otel/trace v1.11.1 // indirect diff --git a/receiver/fluentforwardreceiver/go.sum b/receiver/fluentforwardreceiver/go.sum index 3d53ef0ce6f4a..77970640921a7 100644 --- a/receiver/fluentforwardreceiver/go.sum +++ b/receiver/fluentforwardreceiver/go.sum @@ -274,10 +274,16 @@ go.etcd.io/etcd/client/pkg/v3 v3.5.4/go.mod h1:IJHfcCEKxYu1Os13ZdwCwIUTUVGYTSAM3 go.etcd.io/etcd/client/v3 v3.5.4/go.mod h1:ZaRkVgBZC+L+dLCjTcF1hRXpgZXQPOvnA/Ak/gq3kiY= go.opencensus.io v0.24.0 h1:y73uSU6J157QMP2kn2r30vwW1A2W2WFwSCGnAVxeaD0= go.opencensus.io v0.24.0/go.mod h1:vNK8G9p7aAivkbmorf4v+7Hgx+Zs0yY+0fOtgBfjQKo= -go.opentelemetry.io/collector v0.64.2-0.20221115155901-1550938c18fd h1:O+6HhE4Ivg8Jksp3dIXIEC4FIR0Ush4uORvG3UtHZWk= -go.opentelemetry.io/collector v0.64.2-0.20221115155901-1550938c18fd/go.mod h1:mmSrOcwe1vEYmChXUYuF6rzlrUL0rjEiPfa19Xxb41o= -go.opentelemetry.io/collector/pdata v0.64.2-0.20221115155901-1550938c18fd h1:GdVAbRiae5VDZe3Mn3FqzMxO/aI5UbJ4+dcviqClHy8= -go.opentelemetry.io/collector/pdata v0.64.2-0.20221115155901-1550938c18fd/go.mod h1:0vynPfW2ZN7DltpcCFgCmTtWMQkCjp2a3TNt82YTCLQ= +go.opentelemetry.io/collector v0.64.2-0.20221117234814-4565692c50a7 h1:o/vMr2iyXzaeTb/KAldhMxAvRIfFPwtKfL5cKVKsSlU= +go.opentelemetry.io/collector v0.64.2-0.20221117234814-4565692c50a7/go.mod h1:PO8hayFFYvXDqELbXRVxwawR2HTdjN6mY4Qa3Se9xI8= +go.opentelemetry.io/collector/component v0.0.0-20221117234814-4565692c50a7 h1:q9m1bGHhQFUakQX79lZpLmFSY9VLULNSs2jUG8MdJLA= +go.opentelemetry.io/collector/component v0.0.0-20221117234814-4565692c50a7/go.mod h1:Z7H1Oj826e4dtVxXmT6SiUr6S0EIevUJmkVpfQV+UOk= +go.opentelemetry.io/collector/consumer v0.0.0-20221117234814-4565692c50a7 h1:FTy1JD9EJ7gq9SzlZoi2NkGcZ88+SwdiJav5uRcDEEY= +go.opentelemetry.io/collector/consumer v0.0.0-20221117234814-4565692c50a7/go.mod h1:86Elcw/LLrh90DprArogHMkBX3+UMu3tIgcVWF3mr6o= +go.opentelemetry.io/collector/featuregate v0.0.0-20221117214536-6a117bfc3737 h1:7sXg6M9Fw6rFVlX+iaWOMz6DFXEiroUdQer5kWGixwM= +go.opentelemetry.io/collector/featuregate v0.0.0-20221117214536-6a117bfc3737/go.mod h1:tewuFKJYalWBU0bmNKg++MC1ipINXUr6szYzOw2p1GI= +go.opentelemetry.io/collector/pdata v0.64.2-0.20221117234814-4565692c50a7 h1:IOFqfOu7fFxTgC7pvc2U7dk1/uFjwVQPK+CALiUvacI= +go.opentelemetry.io/collector/pdata v0.64.2-0.20221117234814-4565692c50a7/go.mod h1:0vynPfW2ZN7DltpcCFgCmTtWMQkCjp2a3TNt82YTCLQ= go.opentelemetry.io/otel v1.11.1 h1:4WLLAmcfkmDk2ukNXJyq3/kiz/3UzCaYq6PskJsaou4= go.opentelemetry.io/otel v1.11.1/go.mod h1:1nNhXBbWSD0nsL38H6btgnFN2k4i0sNLHNNMZMSbUGE= go.opentelemetry.io/otel/metric v0.33.0 h1:xQAyl7uGEYvrLAiV/09iTJlp1pZnQ9Wl793qbVvED1E= diff --git a/receiver/googlecloudpubsubreceiver/config_test.go b/receiver/googlecloudpubsubreceiver/config_test.go index 56978cc7e0ba0..41552befff9d6 100644 --- a/receiver/googlecloudpubsubreceiver/config_test.go +++ b/receiver/googlecloudpubsubreceiver/config_test.go @@ -66,7 +66,7 @@ func TestLoadConfig(t *testing.T) { require.NoError(t, err) require.NoError(t, component.UnmarshalReceiverConfig(sub, cfg)) - assert.NoError(t, cfg.Validate()) + assert.NoError(t, component.ValidateConfig(cfg)) assert.Equal(t, tt.expected, cfg) }) } diff --git a/receiver/googlecloudpubsubreceiver/go.mod b/receiver/googlecloudpubsubreceiver/go.mod index 23f35ae6b6853..6860f6dad6ccc 100644 --- a/receiver/googlecloudpubsubreceiver/go.mod +++ b/receiver/googlecloudpubsubreceiver/go.mod @@ -5,8 +5,10 @@ go 1.18 require ( cloud.google.com/go/pubsub v1.26.0 github.com/stretchr/testify v1.8.1 - go.opentelemetry.io/collector v0.64.2-0.20221115155901-1550938c18fd - go.opentelemetry.io/collector/pdata v0.64.2-0.20221115155901-1550938c18fd + go.opentelemetry.io/collector v0.64.2-0.20221117234814-4565692c50a7 + go.opentelemetry.io/collector/component v0.0.0-20221117234814-4565692c50a7 + go.opentelemetry.io/collector/consumer v0.0.0-20221117234814-4565692c50a7 + go.opentelemetry.io/collector/pdata v0.64.2-0.20221117234814-4565692c50a7 go.uber.org/atomic v1.10.0 go.uber.org/zap v1.23.0 google.golang.org/api v0.103.0 @@ -40,6 +42,7 @@ require ( github.com/pelletier/go-toml v1.9.4 // indirect github.com/pmezard/go-difflib v1.0.0 // indirect go.opencensus.io v0.24.0 // indirect + go.opentelemetry.io/collector/featuregate v0.0.0-20221117214536-6a117bfc3737 // indirect go.opentelemetry.io/otel v1.11.1 // indirect go.opentelemetry.io/otel/metric v0.33.0 // indirect go.opentelemetry.io/otel/trace v1.11.1 // indirect diff --git a/receiver/googlecloudpubsubreceiver/go.sum b/receiver/googlecloudpubsubreceiver/go.sum index ac341af509d9d..e0ae2de26626f 100644 --- a/receiver/googlecloudpubsubreceiver/go.sum +++ b/receiver/googlecloudpubsubreceiver/go.sum @@ -297,10 +297,16 @@ go.etcd.io/etcd/client/pkg/v3 v3.5.4/go.mod h1:IJHfcCEKxYu1Os13ZdwCwIUTUVGYTSAM3 go.etcd.io/etcd/client/v3 v3.5.4/go.mod h1:ZaRkVgBZC+L+dLCjTcF1hRXpgZXQPOvnA/Ak/gq3kiY= go.opencensus.io v0.24.0 h1:y73uSU6J157QMP2kn2r30vwW1A2W2WFwSCGnAVxeaD0= go.opencensus.io v0.24.0/go.mod h1:vNK8G9p7aAivkbmorf4v+7Hgx+Zs0yY+0fOtgBfjQKo= -go.opentelemetry.io/collector v0.64.2-0.20221115155901-1550938c18fd h1:O+6HhE4Ivg8Jksp3dIXIEC4FIR0Ush4uORvG3UtHZWk= -go.opentelemetry.io/collector v0.64.2-0.20221115155901-1550938c18fd/go.mod h1:mmSrOcwe1vEYmChXUYuF6rzlrUL0rjEiPfa19Xxb41o= -go.opentelemetry.io/collector/pdata v0.64.2-0.20221115155901-1550938c18fd h1:GdVAbRiae5VDZe3Mn3FqzMxO/aI5UbJ4+dcviqClHy8= -go.opentelemetry.io/collector/pdata v0.64.2-0.20221115155901-1550938c18fd/go.mod h1:0vynPfW2ZN7DltpcCFgCmTtWMQkCjp2a3TNt82YTCLQ= +go.opentelemetry.io/collector v0.64.2-0.20221117234814-4565692c50a7 h1:o/vMr2iyXzaeTb/KAldhMxAvRIfFPwtKfL5cKVKsSlU= +go.opentelemetry.io/collector v0.64.2-0.20221117234814-4565692c50a7/go.mod h1:PO8hayFFYvXDqELbXRVxwawR2HTdjN6mY4Qa3Se9xI8= +go.opentelemetry.io/collector/component v0.0.0-20221117234814-4565692c50a7 h1:q9m1bGHhQFUakQX79lZpLmFSY9VLULNSs2jUG8MdJLA= +go.opentelemetry.io/collector/component v0.0.0-20221117234814-4565692c50a7/go.mod h1:Z7H1Oj826e4dtVxXmT6SiUr6S0EIevUJmkVpfQV+UOk= +go.opentelemetry.io/collector/consumer v0.0.0-20221117234814-4565692c50a7 h1:FTy1JD9EJ7gq9SzlZoi2NkGcZ88+SwdiJav5uRcDEEY= +go.opentelemetry.io/collector/consumer v0.0.0-20221117234814-4565692c50a7/go.mod h1:86Elcw/LLrh90DprArogHMkBX3+UMu3tIgcVWF3mr6o= +go.opentelemetry.io/collector/featuregate v0.0.0-20221117214536-6a117bfc3737 h1:7sXg6M9Fw6rFVlX+iaWOMz6DFXEiroUdQer5kWGixwM= +go.opentelemetry.io/collector/featuregate v0.0.0-20221117214536-6a117bfc3737/go.mod h1:tewuFKJYalWBU0bmNKg++MC1ipINXUr6szYzOw2p1GI= +go.opentelemetry.io/collector/pdata v0.64.2-0.20221117234814-4565692c50a7 h1:IOFqfOu7fFxTgC7pvc2U7dk1/uFjwVQPK+CALiUvacI= +go.opentelemetry.io/collector/pdata v0.64.2-0.20221117234814-4565692c50a7/go.mod h1:0vynPfW2ZN7DltpcCFgCmTtWMQkCjp2a3TNt82YTCLQ= go.opentelemetry.io/otel v1.11.1 h1:4WLLAmcfkmDk2ukNXJyq3/kiz/3UzCaYq6PskJsaou4= go.opentelemetry.io/otel v1.11.1/go.mod h1:1nNhXBbWSD0nsL38H6btgnFN2k4i0sNLHNNMZMSbUGE= go.opentelemetry.io/otel/exporters/prometheus v0.33.0 h1:xXhPj7SLKWU5/Zd4Hxmd+X1C4jdmvc0Xy+kvjFx2z60= diff --git a/receiver/googlecloudspannerreceiver/config_test.go b/receiver/googlecloudspannerreceiver/config_test.go index b13195e892d0a..88348f0e5444e 100644 --- a/receiver/googlecloudspannerreceiver/config_test.go +++ b/receiver/googlecloudspannerreceiver/config_test.go @@ -194,7 +194,7 @@ func TestValidateConfig(t *testing.T) { Projects: testCase.projects, } - err := cfg.Validate() + err := component.ValidateConfig(cfg) if testCase.requireError { require.Error(t, err) diff --git a/receiver/googlecloudspannerreceiver/go.mod b/receiver/googlecloudspannerreceiver/go.mod index 9eda5aa7abb0b..46ed280102eb7 100644 --- a/receiver/googlecloudspannerreceiver/go.mod +++ b/receiver/googlecloudspannerreceiver/go.mod @@ -7,8 +7,10 @@ require ( github.com/ReneKroon/ttlcache/v2 v2.11.0 github.com/mitchellh/hashstructure v1.1.0 github.com/stretchr/testify v1.8.1 - go.opentelemetry.io/collector v0.64.2-0.20221115155901-1550938c18fd - go.opentelemetry.io/collector/pdata v0.64.2-0.20221115155901-1550938c18fd + go.opentelemetry.io/collector v0.64.2-0.20221117234814-4565692c50a7 + go.opentelemetry.io/collector/component v0.0.0-20221117234814-4565692c50a7 + go.opentelemetry.io/collector/consumer v0.0.0-20221117234814-4565692c50a7 + go.opentelemetry.io/collector/pdata v0.64.2-0.20221117234814-4565692c50a7 go.uber.org/zap v1.23.0 google.golang.org/api v0.103.0 google.golang.org/genproto v0.0.0-20221027153422-115e99e71e1c @@ -48,6 +50,7 @@ require ( github.com/pmezard/go-difflib v1.0.0 // indirect github.com/stretchr/objx v0.5.0 // indirect go.opencensus.io v0.24.0 // indirect + go.opentelemetry.io/collector/featuregate v0.0.0-20221117214536-6a117bfc3737 // indirect go.opentelemetry.io/otel v1.11.1 // indirect go.opentelemetry.io/otel/metric v0.33.0 // indirect go.opentelemetry.io/otel/trace v1.11.1 // indirect diff --git a/receiver/googlecloudspannerreceiver/go.sum b/receiver/googlecloudspannerreceiver/go.sum index 504a4d0b4ca06..2a4c1095b6d6d 100644 --- a/receiver/googlecloudspannerreceiver/go.sum +++ b/receiver/googlecloudspannerreceiver/go.sum @@ -321,10 +321,16 @@ go.etcd.io/etcd/client/pkg/v3 v3.5.4/go.mod h1:IJHfcCEKxYu1Os13ZdwCwIUTUVGYTSAM3 go.etcd.io/etcd/client/v3 v3.5.4/go.mod h1:ZaRkVgBZC+L+dLCjTcF1hRXpgZXQPOvnA/Ak/gq3kiY= go.opencensus.io v0.24.0 h1:y73uSU6J157QMP2kn2r30vwW1A2W2WFwSCGnAVxeaD0= go.opencensus.io v0.24.0/go.mod h1:vNK8G9p7aAivkbmorf4v+7Hgx+Zs0yY+0fOtgBfjQKo= -go.opentelemetry.io/collector v0.64.2-0.20221115155901-1550938c18fd h1:O+6HhE4Ivg8Jksp3dIXIEC4FIR0Ush4uORvG3UtHZWk= -go.opentelemetry.io/collector v0.64.2-0.20221115155901-1550938c18fd/go.mod h1:mmSrOcwe1vEYmChXUYuF6rzlrUL0rjEiPfa19Xxb41o= -go.opentelemetry.io/collector/pdata v0.64.2-0.20221115155901-1550938c18fd h1:GdVAbRiae5VDZe3Mn3FqzMxO/aI5UbJ4+dcviqClHy8= -go.opentelemetry.io/collector/pdata v0.64.2-0.20221115155901-1550938c18fd/go.mod h1:0vynPfW2ZN7DltpcCFgCmTtWMQkCjp2a3TNt82YTCLQ= +go.opentelemetry.io/collector v0.64.2-0.20221117234814-4565692c50a7 h1:o/vMr2iyXzaeTb/KAldhMxAvRIfFPwtKfL5cKVKsSlU= +go.opentelemetry.io/collector v0.64.2-0.20221117234814-4565692c50a7/go.mod h1:PO8hayFFYvXDqELbXRVxwawR2HTdjN6mY4Qa3Se9xI8= +go.opentelemetry.io/collector/component v0.0.0-20221117234814-4565692c50a7 h1:q9m1bGHhQFUakQX79lZpLmFSY9VLULNSs2jUG8MdJLA= +go.opentelemetry.io/collector/component v0.0.0-20221117234814-4565692c50a7/go.mod h1:Z7H1Oj826e4dtVxXmT6SiUr6S0EIevUJmkVpfQV+UOk= +go.opentelemetry.io/collector/consumer v0.0.0-20221117234814-4565692c50a7 h1:FTy1JD9EJ7gq9SzlZoi2NkGcZ88+SwdiJav5uRcDEEY= +go.opentelemetry.io/collector/consumer v0.0.0-20221117234814-4565692c50a7/go.mod h1:86Elcw/LLrh90DprArogHMkBX3+UMu3tIgcVWF3mr6o= +go.opentelemetry.io/collector/featuregate v0.0.0-20221117214536-6a117bfc3737 h1:7sXg6M9Fw6rFVlX+iaWOMz6DFXEiroUdQer5kWGixwM= +go.opentelemetry.io/collector/featuregate v0.0.0-20221117214536-6a117bfc3737/go.mod h1:tewuFKJYalWBU0bmNKg++MC1ipINXUr6szYzOw2p1GI= +go.opentelemetry.io/collector/pdata v0.64.2-0.20221117234814-4565692c50a7 h1:IOFqfOu7fFxTgC7pvc2U7dk1/uFjwVQPK+CALiUvacI= +go.opentelemetry.io/collector/pdata v0.64.2-0.20221117234814-4565692c50a7/go.mod h1:0vynPfW2ZN7DltpcCFgCmTtWMQkCjp2a3TNt82YTCLQ= go.opentelemetry.io/otel v1.11.1 h1:4WLLAmcfkmDk2ukNXJyq3/kiz/3UzCaYq6PskJsaou4= go.opentelemetry.io/otel v1.11.1/go.mod h1:1nNhXBbWSD0nsL38H6btgnFN2k4i0sNLHNNMZMSbUGE= go.opentelemetry.io/otel/exporters/prometheus v0.33.0 h1:xXhPj7SLKWU5/Zd4Hxmd+X1C4jdmvc0Xy+kvjFx2z60= diff --git a/receiver/hostmetricsreceiver/go.mod b/receiver/hostmetricsreceiver/go.mod index 788b72eb07320..f39e5ed1db3e0 100644 --- a/receiver/hostmetricsreceiver/go.mod +++ b/receiver/hostmetricsreceiver/go.mod @@ -7,9 +7,11 @@ require ( github.com/open-telemetry/opentelemetry-collector-contrib/internal/coreinternal v0.64.0 github.com/shirou/gopsutil/v3 v3.22.10 github.com/stretchr/testify v1.8.1 - go.opentelemetry.io/collector v0.64.2-0.20221115155901-1550938c18fd - go.opentelemetry.io/collector/pdata v0.64.2-0.20221115155901-1550938c18fd - go.opentelemetry.io/collector/semconv v0.64.2-0.20221115155901-1550938c18fd + go.opentelemetry.io/collector v0.64.2-0.20221117234814-4565692c50a7 + go.opentelemetry.io/collector/component v0.0.0-20221117234814-4565692c50a7 + go.opentelemetry.io/collector/consumer v0.0.0-20221117234814-4565692c50a7 + go.opentelemetry.io/collector/pdata v0.64.2-0.20221117234814-4565692c50a7 + go.opentelemetry.io/collector/semconv v0.64.2-0.20221117234814-4565692c50a7 go.uber.org/multierr v1.8.0 go.uber.org/zap v1.23.0 golang.org/x/sys v0.2.0 @@ -54,7 +56,8 @@ require ( github.com/tklauser/numcpus v0.4.0 // indirect github.com/yusufpapurcu/wmi v1.2.2 // indirect go.opencensus.io v0.24.0 // indirect - go.opentelemetry.io/collector/processor/batchprocessor v0.64.2-0.20221115155901-1550938c18fd // indirect + go.opentelemetry.io/collector/featuregate v0.0.0-20221117214536-6a117bfc3737 // indirect + go.opentelemetry.io/collector/processor/batchprocessor v0.64.2-0.20221117234814-4565692c50a7 // indirect go.opentelemetry.io/contrib/propagators/b3 v1.11.1 // indirect go.opentelemetry.io/otel v1.11.1 // indirect go.opentelemetry.io/otel/exporters/prometheus v0.33.0 // indirect diff --git a/receiver/hostmetricsreceiver/go.sum b/receiver/hostmetricsreceiver/go.sum index fe9ae24270ad1..a097fa179b89a 100644 --- a/receiver/hostmetricsreceiver/go.sum +++ b/receiver/hostmetricsreceiver/go.sum @@ -401,15 +401,21 @@ go.opencensus.io v0.22.4/go.mod h1:yxeiOL68Rb0Xd1ddK5vPZ/oVn4vY4Ynel7k9FzqtOIw= go.opencensus.io v0.23.0/go.mod h1:XItmlyltB5F7CS4xOC1DcqMoFqwtC6OG2xF7mCv7P7E= go.opencensus.io v0.24.0 h1:y73uSU6J157QMP2kn2r30vwW1A2W2WFwSCGnAVxeaD0= go.opencensus.io v0.24.0/go.mod h1:vNK8G9p7aAivkbmorf4v+7Hgx+Zs0yY+0fOtgBfjQKo= -go.opentelemetry.io/collector v0.64.2-0.20221115155901-1550938c18fd h1:O+6HhE4Ivg8Jksp3dIXIEC4FIR0Ush4uORvG3UtHZWk= -go.opentelemetry.io/collector v0.64.2-0.20221115155901-1550938c18fd/go.mod h1:mmSrOcwe1vEYmChXUYuF6rzlrUL0rjEiPfa19Xxb41o= +go.opentelemetry.io/collector v0.64.2-0.20221117234814-4565692c50a7 h1:o/vMr2iyXzaeTb/KAldhMxAvRIfFPwtKfL5cKVKsSlU= +go.opentelemetry.io/collector v0.64.2-0.20221117234814-4565692c50a7/go.mod h1:PO8hayFFYvXDqELbXRVxwawR2HTdjN6mY4Qa3Se9xI8= +go.opentelemetry.io/collector/component v0.0.0-20221117234814-4565692c50a7 h1:q9m1bGHhQFUakQX79lZpLmFSY9VLULNSs2jUG8MdJLA= +go.opentelemetry.io/collector/component v0.0.0-20221117234814-4565692c50a7/go.mod h1:Z7H1Oj826e4dtVxXmT6SiUr6S0EIevUJmkVpfQV+UOk= +go.opentelemetry.io/collector/consumer v0.0.0-20221117234814-4565692c50a7 h1:FTy1JD9EJ7gq9SzlZoi2NkGcZ88+SwdiJav5uRcDEEY= +go.opentelemetry.io/collector/consumer v0.0.0-20221117234814-4565692c50a7/go.mod h1:86Elcw/LLrh90DprArogHMkBX3+UMu3tIgcVWF3mr6o= go.opentelemetry.io/collector/extension/zpagesextension v0.64.1 h1:2qTBtVigWNwPSpN9XR+WobC1idF2S8X/FIahFGCE1i4= -go.opentelemetry.io/collector/pdata v0.64.2-0.20221115155901-1550938c18fd h1:GdVAbRiae5VDZe3Mn3FqzMxO/aI5UbJ4+dcviqClHy8= -go.opentelemetry.io/collector/pdata v0.64.2-0.20221115155901-1550938c18fd/go.mod h1:0vynPfW2ZN7DltpcCFgCmTtWMQkCjp2a3TNt82YTCLQ= -go.opentelemetry.io/collector/processor/batchprocessor v0.64.2-0.20221115155901-1550938c18fd h1:SSjP8V0UP2+oPZ3gL+Dk90KQcvHXvHp9V5h8IIpx0og= -go.opentelemetry.io/collector/processor/batchprocessor v0.64.2-0.20221115155901-1550938c18fd/go.mod h1:zyCnX0aTvBaZ3XLWSHZdTueP7WoXRjz8X6HiWgKqstM= -go.opentelemetry.io/collector/semconv v0.64.2-0.20221115155901-1550938c18fd h1:rMqcl2pwi8YtVrtOPK8tVh87W0bFBge4yqB9ypSsAJ4= -go.opentelemetry.io/collector/semconv v0.64.2-0.20221115155901-1550938c18fd/go.mod h1:5o9yhOa+ABt7g2E5JABDxGZ1PQPbtfxrKNbYn+LOTXU= +go.opentelemetry.io/collector/featuregate v0.0.0-20221117214536-6a117bfc3737 h1:7sXg6M9Fw6rFVlX+iaWOMz6DFXEiroUdQer5kWGixwM= +go.opentelemetry.io/collector/featuregate v0.0.0-20221117214536-6a117bfc3737/go.mod h1:tewuFKJYalWBU0bmNKg++MC1ipINXUr6szYzOw2p1GI= +go.opentelemetry.io/collector/pdata v0.64.2-0.20221117234814-4565692c50a7 h1:IOFqfOu7fFxTgC7pvc2U7dk1/uFjwVQPK+CALiUvacI= +go.opentelemetry.io/collector/pdata v0.64.2-0.20221117234814-4565692c50a7/go.mod h1:0vynPfW2ZN7DltpcCFgCmTtWMQkCjp2a3TNt82YTCLQ= +go.opentelemetry.io/collector/processor/batchprocessor v0.64.2-0.20221117234814-4565692c50a7 h1:hGDq2T07j6qwwtQ2t6ZGU5tp/J2Dvu9mfY5qnnP5Ic8= +go.opentelemetry.io/collector/processor/batchprocessor v0.64.2-0.20221117234814-4565692c50a7/go.mod h1:b83iea2eDSAQkvd+2aSokaa6GRjSIsaR2zILziF/Ogc= +go.opentelemetry.io/collector/semconv v0.64.2-0.20221117234814-4565692c50a7 h1:cGXAVltDxXw9nj0Vr7vyZZTj0whdyO+GYs+xv0xHJ2A= +go.opentelemetry.io/collector/semconv v0.64.2-0.20221117234814-4565692c50a7/go.mod h1:5o9yhOa+ABt7g2E5JABDxGZ1PQPbtfxrKNbYn+LOTXU= go.opentelemetry.io/contrib/propagators/b3 v1.11.1 h1:icQ6ttRV+r/2fnU46BIo/g/mPu6Rs5Ug8Rtohe3KqzI= go.opentelemetry.io/contrib/propagators/b3 v1.11.1/go.mod h1:ECIveyMXgnl4gorxFcA7RYjJY/Ql9n20ubhbfDc3QfA= go.opentelemetry.io/contrib/zpages v0.36.4 h1:Z2VK5WsDhWs9VwZ1p0TM5RyusTOgAQfdMMDDQPRnlmY= diff --git a/receiver/httpcheckreceiver/factory.go b/receiver/httpcheckreceiver/factory.go index d24ee7d9750e5..078dbe8d7e65a 100644 --- a/receiver/httpcheckreceiver/factory.go +++ b/receiver/httpcheckreceiver/factory.go @@ -30,7 +30,7 @@ import ( const ( typeStr = "httpcheck" - stability = component.StabilityLevelInDevelopment + stability = component.StabilityLevelDevelopment ) var errConfigNotHTTPCheck = errors.New("config was not a HTTP check receiver config") diff --git a/receiver/httpcheckreceiver/go.mod b/receiver/httpcheckreceiver/go.mod index 377aada766024..e081b59a50258 100644 --- a/receiver/httpcheckreceiver/go.mod +++ b/receiver/httpcheckreceiver/go.mod @@ -5,8 +5,10 @@ go 1.18 require ( github.com/open-telemetry/opentelemetry-collector-contrib/internal/scrapertest v0.64.0 github.com/stretchr/testify v1.8.1 - go.opentelemetry.io/collector v0.64.2-0.20221115155901-1550938c18fd - go.opentelemetry.io/collector/pdata v0.64.2-0.20221115155901-1550938c18fd + go.opentelemetry.io/collector v0.64.2-0.20221117234814-4565692c50a7 + go.opentelemetry.io/collector/component v0.0.0-20221117234814-4565692c50a7 + go.opentelemetry.io/collector/consumer v0.0.0-20221117234814-4565692c50a7 + go.opentelemetry.io/collector/pdata v0.64.2-0.20221117234814-4565692c50a7 go.uber.org/multierr v1.8.0 ) @@ -31,6 +33,7 @@ require ( github.com/rogpeppe/go-internal v1.8.1 // indirect github.com/rs/cors v1.8.2 // indirect go.opencensus.io v0.24.0 // indirect + go.opentelemetry.io/collector/featuregate v0.0.0-20221117214536-6a117bfc3737 // indirect go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.36.4 // indirect go.opentelemetry.io/otel v1.11.1 // indirect go.opentelemetry.io/otel/metric v0.33.0 // indirect diff --git a/receiver/httpcheckreceiver/go.sum b/receiver/httpcheckreceiver/go.sum index d944c2abb753f..5b58bf357e895 100644 --- a/receiver/httpcheckreceiver/go.sum +++ b/receiver/httpcheckreceiver/go.sum @@ -292,10 +292,16 @@ go.etcd.io/etcd/client/pkg/v3 v3.5.4/go.mod h1:IJHfcCEKxYu1Os13ZdwCwIUTUVGYTSAM3 go.etcd.io/etcd/client/v3 v3.5.4/go.mod h1:ZaRkVgBZC+L+dLCjTcF1hRXpgZXQPOvnA/Ak/gq3kiY= go.opencensus.io v0.24.0 h1:y73uSU6J157QMP2kn2r30vwW1A2W2WFwSCGnAVxeaD0= go.opencensus.io v0.24.0/go.mod h1:vNK8G9p7aAivkbmorf4v+7Hgx+Zs0yY+0fOtgBfjQKo= -go.opentelemetry.io/collector v0.64.2-0.20221115155901-1550938c18fd h1:O+6HhE4Ivg8Jksp3dIXIEC4FIR0Ush4uORvG3UtHZWk= -go.opentelemetry.io/collector v0.64.2-0.20221115155901-1550938c18fd/go.mod h1:mmSrOcwe1vEYmChXUYuF6rzlrUL0rjEiPfa19Xxb41o= -go.opentelemetry.io/collector/pdata v0.64.2-0.20221115155901-1550938c18fd h1:GdVAbRiae5VDZe3Mn3FqzMxO/aI5UbJ4+dcviqClHy8= -go.opentelemetry.io/collector/pdata v0.64.2-0.20221115155901-1550938c18fd/go.mod h1:0vynPfW2ZN7DltpcCFgCmTtWMQkCjp2a3TNt82YTCLQ= +go.opentelemetry.io/collector v0.64.2-0.20221117234814-4565692c50a7 h1:o/vMr2iyXzaeTb/KAldhMxAvRIfFPwtKfL5cKVKsSlU= +go.opentelemetry.io/collector v0.64.2-0.20221117234814-4565692c50a7/go.mod h1:PO8hayFFYvXDqELbXRVxwawR2HTdjN6mY4Qa3Se9xI8= +go.opentelemetry.io/collector/component v0.0.0-20221117234814-4565692c50a7 h1:q9m1bGHhQFUakQX79lZpLmFSY9VLULNSs2jUG8MdJLA= +go.opentelemetry.io/collector/component v0.0.0-20221117234814-4565692c50a7/go.mod h1:Z7H1Oj826e4dtVxXmT6SiUr6S0EIevUJmkVpfQV+UOk= +go.opentelemetry.io/collector/consumer v0.0.0-20221117234814-4565692c50a7 h1:FTy1JD9EJ7gq9SzlZoi2NkGcZ88+SwdiJav5uRcDEEY= +go.opentelemetry.io/collector/consumer v0.0.0-20221117234814-4565692c50a7/go.mod h1:86Elcw/LLrh90DprArogHMkBX3+UMu3tIgcVWF3mr6o= +go.opentelemetry.io/collector/featuregate v0.0.0-20221117214536-6a117bfc3737 h1:7sXg6M9Fw6rFVlX+iaWOMz6DFXEiroUdQer5kWGixwM= +go.opentelemetry.io/collector/featuregate v0.0.0-20221117214536-6a117bfc3737/go.mod h1:tewuFKJYalWBU0bmNKg++MC1ipINXUr6szYzOw2p1GI= +go.opentelemetry.io/collector/pdata v0.64.2-0.20221117234814-4565692c50a7 h1:IOFqfOu7fFxTgC7pvc2U7dk1/uFjwVQPK+CALiUvacI= +go.opentelemetry.io/collector/pdata v0.64.2-0.20221117234814-4565692c50a7/go.mod h1:0vynPfW2ZN7DltpcCFgCmTtWMQkCjp2a3TNt82YTCLQ= go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.36.4 h1:aUEBEdCa6iamGzg6fuYxDA8ThxvOG240mAvWDU+XLio= go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.36.4/go.mod h1:l2MdsbKTocpPS5nQZscqTR9jd8u96VYZdcpF8Sye7mA= go.opentelemetry.io/otel v1.11.1 h1:4WLLAmcfkmDk2ukNXJyq3/kiz/3UzCaYq6PskJsaou4= diff --git a/receiver/iisreceiver/go.mod b/receiver/iisreceiver/go.mod index 9c8b4a086cdbc..766de177e4cc7 100644 --- a/receiver/iisreceiver/go.mod +++ b/receiver/iisreceiver/go.mod @@ -6,8 +6,10 @@ require ( github.com/open-telemetry/opentelemetry-collector-contrib/internal/scrapertest v0.64.0 github.com/open-telemetry/opentelemetry-collector-contrib/pkg/winperfcounters v0.64.0 github.com/stretchr/testify v1.8.1 - go.opentelemetry.io/collector v0.64.2-0.20221115155901-1550938c18fd - go.opentelemetry.io/collector/pdata v0.64.2-0.20221115155901-1550938c18fd + go.opentelemetry.io/collector v0.64.2-0.20221117234814-4565692c50a7 + go.opentelemetry.io/collector/component v0.0.0-20221117234814-4565692c50a7 + go.opentelemetry.io/collector/consumer v0.0.0-20221117234814-4565692c50a7 + go.opentelemetry.io/collector/pdata v0.64.2-0.20221117234814-4565692c50a7 go.uber.org/multierr v1.8.0 go.uber.org/zap v1.23.0 ) @@ -26,6 +28,7 @@ require ( github.com/modern-go/reflect2 v1.0.2 // indirect github.com/pmezard/go-difflib v1.0.0 // indirect go.opencensus.io v0.24.0 // indirect + go.opentelemetry.io/collector/featuregate v0.0.0-20221117214536-6a117bfc3737 // indirect go.opentelemetry.io/otel v1.11.1 // indirect go.opentelemetry.io/otel/metric v0.33.0 // indirect go.opentelemetry.io/otel/trace v1.11.1 // indirect diff --git a/receiver/iisreceiver/go.sum b/receiver/iisreceiver/go.sum index ad938302b2fde..b1115d98780a6 100644 --- a/receiver/iisreceiver/go.sum +++ b/receiver/iisreceiver/go.sum @@ -279,10 +279,16 @@ go.etcd.io/etcd/client/pkg/v3 v3.5.4/go.mod h1:IJHfcCEKxYu1Os13ZdwCwIUTUVGYTSAM3 go.etcd.io/etcd/client/v3 v3.5.4/go.mod h1:ZaRkVgBZC+L+dLCjTcF1hRXpgZXQPOvnA/Ak/gq3kiY= go.opencensus.io v0.24.0 h1:y73uSU6J157QMP2kn2r30vwW1A2W2WFwSCGnAVxeaD0= go.opencensus.io v0.24.0/go.mod h1:vNK8G9p7aAivkbmorf4v+7Hgx+Zs0yY+0fOtgBfjQKo= -go.opentelemetry.io/collector v0.64.2-0.20221115155901-1550938c18fd h1:O+6HhE4Ivg8Jksp3dIXIEC4FIR0Ush4uORvG3UtHZWk= -go.opentelemetry.io/collector v0.64.2-0.20221115155901-1550938c18fd/go.mod h1:mmSrOcwe1vEYmChXUYuF6rzlrUL0rjEiPfa19Xxb41o= -go.opentelemetry.io/collector/pdata v0.64.2-0.20221115155901-1550938c18fd h1:GdVAbRiae5VDZe3Mn3FqzMxO/aI5UbJ4+dcviqClHy8= -go.opentelemetry.io/collector/pdata v0.64.2-0.20221115155901-1550938c18fd/go.mod h1:0vynPfW2ZN7DltpcCFgCmTtWMQkCjp2a3TNt82YTCLQ= +go.opentelemetry.io/collector v0.64.2-0.20221117234814-4565692c50a7 h1:o/vMr2iyXzaeTb/KAldhMxAvRIfFPwtKfL5cKVKsSlU= +go.opentelemetry.io/collector v0.64.2-0.20221117234814-4565692c50a7/go.mod h1:PO8hayFFYvXDqELbXRVxwawR2HTdjN6mY4Qa3Se9xI8= +go.opentelemetry.io/collector/component v0.0.0-20221117234814-4565692c50a7 h1:q9m1bGHhQFUakQX79lZpLmFSY9VLULNSs2jUG8MdJLA= +go.opentelemetry.io/collector/component v0.0.0-20221117234814-4565692c50a7/go.mod h1:Z7H1Oj826e4dtVxXmT6SiUr6S0EIevUJmkVpfQV+UOk= +go.opentelemetry.io/collector/consumer v0.0.0-20221117234814-4565692c50a7 h1:FTy1JD9EJ7gq9SzlZoi2NkGcZ88+SwdiJav5uRcDEEY= +go.opentelemetry.io/collector/consumer v0.0.0-20221117234814-4565692c50a7/go.mod h1:86Elcw/LLrh90DprArogHMkBX3+UMu3tIgcVWF3mr6o= +go.opentelemetry.io/collector/featuregate v0.0.0-20221117214536-6a117bfc3737 h1:7sXg6M9Fw6rFVlX+iaWOMz6DFXEiroUdQer5kWGixwM= +go.opentelemetry.io/collector/featuregate v0.0.0-20221117214536-6a117bfc3737/go.mod h1:tewuFKJYalWBU0bmNKg++MC1ipINXUr6szYzOw2p1GI= +go.opentelemetry.io/collector/pdata v0.64.2-0.20221117234814-4565692c50a7 h1:IOFqfOu7fFxTgC7pvc2U7dk1/uFjwVQPK+CALiUvacI= +go.opentelemetry.io/collector/pdata v0.64.2-0.20221117234814-4565692c50a7/go.mod h1:0vynPfW2ZN7DltpcCFgCmTtWMQkCjp2a3TNt82YTCLQ= go.opentelemetry.io/otel v1.11.1 h1:4WLLAmcfkmDk2ukNXJyq3/kiz/3UzCaYq6PskJsaou4= go.opentelemetry.io/otel v1.11.1/go.mod h1:1nNhXBbWSD0nsL38H6btgnFN2k4i0sNLHNNMZMSbUGE= go.opentelemetry.io/otel/exporters/prometheus v0.33.0 h1:xXhPj7SLKWU5/Zd4Hxmd+X1C4jdmvc0Xy+kvjFx2z60= diff --git a/receiver/influxdbreceiver/go.mod b/receiver/influxdbreceiver/go.mod index 754360acd998e..5c2978d69e3f7 100644 --- a/receiver/influxdbreceiver/go.mod +++ b/receiver/influxdbreceiver/go.mod @@ -7,7 +7,9 @@ require ( github.com/influxdata/influxdb-observability/influx2otel v0.2.30 github.com/influxdata/line-protocol/v2 v2.2.1 github.com/open-telemetry/opentelemetry-collector-contrib/internal/common v0.64.0 - go.opentelemetry.io/collector v0.64.2-0.20221115155901-1550938c18fd + go.opentelemetry.io/collector v0.64.2-0.20221117234814-4565692c50a7 + go.opentelemetry.io/collector/component v0.0.0-20221117234814-4565692c50a7 + go.opentelemetry.io/collector/consumer v0.0.0-20221117234814-4565692c50a7 go.uber.org/zap v1.23.0 ) @@ -30,7 +32,8 @@ require ( github.com/modern-go/reflect2 v1.0.2 // indirect github.com/pelletier/go-toml v1.9.4 // indirect github.com/rs/cors v1.8.2 // indirect - go.opentelemetry.io/collector/pdata v0.64.2-0.20221115155901-1550938c18fd // indirect + go.opentelemetry.io/collector/featuregate v0.0.0-20221117214536-6a117bfc3737 // indirect + go.opentelemetry.io/collector/pdata v0.64.2-0.20221117234814-4565692c50a7 // indirect go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.36.4 // indirect go.opentelemetry.io/otel v1.11.1 // indirect go.opentelemetry.io/otel/metric v0.33.0 // indirect diff --git a/receiver/influxdbreceiver/go.sum b/receiver/influxdbreceiver/go.sum index 5517de0766cdd..7cb87acc23884 100644 --- a/receiver/influxdbreceiver/go.sum +++ b/receiver/influxdbreceiver/go.sum @@ -291,10 +291,16 @@ github.com/yuin/goldmark v1.3.5/go.mod h1:mwnBkeHKe2W/ZEtQ+71ViKU8L12m81fl3OWwC1 go.etcd.io/etcd/api/v3 v3.5.4/go.mod h1:5GB2vv4A4AOn3yk7MftYGHkUfGtDHnEraIjym4dYz5A= go.etcd.io/etcd/client/pkg/v3 v3.5.4/go.mod h1:IJHfcCEKxYu1Os13ZdwCwIUTUVGYTSAM3YSwc9/Ac1g= go.etcd.io/etcd/client/v3 v3.5.4/go.mod h1:ZaRkVgBZC+L+dLCjTcF1hRXpgZXQPOvnA/Ak/gq3kiY= -go.opentelemetry.io/collector v0.64.2-0.20221115155901-1550938c18fd h1:O+6HhE4Ivg8Jksp3dIXIEC4FIR0Ush4uORvG3UtHZWk= -go.opentelemetry.io/collector v0.64.2-0.20221115155901-1550938c18fd/go.mod h1:mmSrOcwe1vEYmChXUYuF6rzlrUL0rjEiPfa19Xxb41o= -go.opentelemetry.io/collector/pdata v0.64.2-0.20221115155901-1550938c18fd h1:GdVAbRiae5VDZe3Mn3FqzMxO/aI5UbJ4+dcviqClHy8= -go.opentelemetry.io/collector/pdata v0.64.2-0.20221115155901-1550938c18fd/go.mod h1:0vynPfW2ZN7DltpcCFgCmTtWMQkCjp2a3TNt82YTCLQ= +go.opentelemetry.io/collector v0.64.2-0.20221117234814-4565692c50a7 h1:o/vMr2iyXzaeTb/KAldhMxAvRIfFPwtKfL5cKVKsSlU= +go.opentelemetry.io/collector v0.64.2-0.20221117234814-4565692c50a7/go.mod h1:PO8hayFFYvXDqELbXRVxwawR2HTdjN6mY4Qa3Se9xI8= +go.opentelemetry.io/collector/component v0.0.0-20221117234814-4565692c50a7 h1:q9m1bGHhQFUakQX79lZpLmFSY9VLULNSs2jUG8MdJLA= +go.opentelemetry.io/collector/component v0.0.0-20221117234814-4565692c50a7/go.mod h1:Z7H1Oj826e4dtVxXmT6SiUr6S0EIevUJmkVpfQV+UOk= +go.opentelemetry.io/collector/consumer v0.0.0-20221117234814-4565692c50a7 h1:FTy1JD9EJ7gq9SzlZoi2NkGcZ88+SwdiJav5uRcDEEY= +go.opentelemetry.io/collector/consumer v0.0.0-20221117234814-4565692c50a7/go.mod h1:86Elcw/LLrh90DprArogHMkBX3+UMu3tIgcVWF3mr6o= +go.opentelemetry.io/collector/featuregate v0.0.0-20221117214536-6a117bfc3737 h1:7sXg6M9Fw6rFVlX+iaWOMz6DFXEiroUdQer5kWGixwM= +go.opentelemetry.io/collector/featuregate v0.0.0-20221117214536-6a117bfc3737/go.mod h1:tewuFKJYalWBU0bmNKg++MC1ipINXUr6szYzOw2p1GI= +go.opentelemetry.io/collector/pdata v0.64.2-0.20221117234814-4565692c50a7 h1:IOFqfOu7fFxTgC7pvc2U7dk1/uFjwVQPK+CALiUvacI= +go.opentelemetry.io/collector/pdata v0.64.2-0.20221117234814-4565692c50a7/go.mod h1:0vynPfW2ZN7DltpcCFgCmTtWMQkCjp2a3TNt82YTCLQ= go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.36.4 h1:aUEBEdCa6iamGzg6fuYxDA8ThxvOG240mAvWDU+XLio= go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.36.4/go.mod h1:l2MdsbKTocpPS5nQZscqTR9jd8u96VYZdcpF8Sye7mA= go.opentelemetry.io/otel v1.11.1 h1:4WLLAmcfkmDk2ukNXJyq3/kiz/3UzCaYq6PskJsaou4= diff --git a/receiver/jaegerreceiver/config_test.go b/receiver/jaegerreceiver/config_test.go index c843fae8612fa..ebef2dcbda68e 100644 --- a/receiver/jaegerreceiver/config_test.go +++ b/receiver/jaegerreceiver/config_test.go @@ -160,7 +160,7 @@ func TestLoadConfig(t *testing.T) { require.NoError(t, err) require.NoError(t, component.UnmarshalReceiverConfig(sub, cfg)) - assert.NoError(t, cfg.Validate()) + assert.NoError(t, component.ValidateConfig(cfg)) assert.Equal(t, tt.expected, cfg) }) } @@ -297,7 +297,7 @@ func TestInvalidConfig(t *testing.T) { tC.apply(cfg) - err := cfg.Validate() + err := component.ValidateConfig(cfg) assert.Error(t, err, tC.err) }) diff --git a/receiver/jaegerreceiver/go.mod b/receiver/jaegerreceiver/go.mod index e6ec9601bf272..e19798484efbe 100644 --- a/receiver/jaegerreceiver/go.mod +++ b/receiver/jaegerreceiver/go.mod @@ -9,9 +9,11 @@ require ( github.com/open-telemetry/opentelemetry-collector-contrib/internal/common v0.64.0 github.com/open-telemetry/opentelemetry-collector-contrib/pkg/translator/jaeger v0.64.0 github.com/stretchr/testify v1.8.1 - go.opentelemetry.io/collector v0.64.2-0.20221115155901-1550938c18fd - go.opentelemetry.io/collector/pdata v0.64.2-0.20221115155901-1550938c18fd - go.opentelemetry.io/collector/semconv v0.64.2-0.20221115155901-1550938c18fd + go.opentelemetry.io/collector v0.64.2-0.20221117234814-4565692c50a7 + go.opentelemetry.io/collector/component v0.0.0-20221117234814-4565692c50a7 + go.opentelemetry.io/collector/consumer v0.0.0-20221117234814-4565692c50a7 + go.opentelemetry.io/collector/pdata v0.64.2-0.20221117234814-4565692c50a7 + go.opentelemetry.io/collector/semconv v0.64.2-0.20221117234814-4565692c50a7 go.uber.org/multierr v1.8.0 google.golang.org/grpc v1.50.1 ) @@ -65,7 +67,8 @@ require ( github.com/uber/jaeger-client-go v2.30.0+incompatible // indirect github.com/uber/jaeger-lib v2.4.1+incompatible // indirect go.opencensus.io v0.24.0 // indirect - go.opentelemetry.io/collector/receiver/otlpreceiver v0.64.2-0.20221115155901-1550938c18fd // indirect + go.opentelemetry.io/collector/featuregate v0.0.0-20221117214536-6a117bfc3737 // indirect + go.opentelemetry.io/collector/receiver/otlpreceiver v0.64.2-0.20221117234814-4565692c50a7 // indirect go.opentelemetry.io/contrib/instrumentation/google.golang.org/grpc/otelgrpc v0.36.4 // indirect go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.36.4 // indirect go.opentelemetry.io/otel v1.11.1 // indirect diff --git a/receiver/jaegerreceiver/go.sum b/receiver/jaegerreceiver/go.sum index 2b4b6836aa123..90922cbe45db0 100644 --- a/receiver/jaegerreceiver/go.sum +++ b/receiver/jaegerreceiver/go.sum @@ -450,14 +450,20 @@ go.opencensus.io v0.22.4/go.mod h1:yxeiOL68Rb0Xd1ddK5vPZ/oVn4vY4Ynel7k9FzqtOIw= go.opencensus.io v0.22.5/go.mod h1:5pWMHQbX5EPX2/62yrJeAkowc+lfs/XD7Uxpq3pI6kk= go.opencensus.io v0.24.0 h1:y73uSU6J157QMP2kn2r30vwW1A2W2WFwSCGnAVxeaD0= go.opencensus.io v0.24.0/go.mod h1:vNK8G9p7aAivkbmorf4v+7Hgx+Zs0yY+0fOtgBfjQKo= -go.opentelemetry.io/collector v0.64.2-0.20221115155901-1550938c18fd h1:O+6HhE4Ivg8Jksp3dIXIEC4FIR0Ush4uORvG3UtHZWk= -go.opentelemetry.io/collector v0.64.2-0.20221115155901-1550938c18fd/go.mod h1:mmSrOcwe1vEYmChXUYuF6rzlrUL0rjEiPfa19Xxb41o= -go.opentelemetry.io/collector/pdata v0.64.2-0.20221115155901-1550938c18fd h1:GdVAbRiae5VDZe3Mn3FqzMxO/aI5UbJ4+dcviqClHy8= -go.opentelemetry.io/collector/pdata v0.64.2-0.20221115155901-1550938c18fd/go.mod h1:0vynPfW2ZN7DltpcCFgCmTtWMQkCjp2a3TNt82YTCLQ= -go.opentelemetry.io/collector/receiver/otlpreceiver v0.64.2-0.20221115155901-1550938c18fd h1:hMuRptXpQYC9dk7x68LIFeVEpoE3oM+ddI6o13cS73Q= -go.opentelemetry.io/collector/receiver/otlpreceiver v0.64.2-0.20221115155901-1550938c18fd/go.mod h1:i80XzKLKheio/axok7WksVx/xmNGRadfmlzhWOWDnr4= -go.opentelemetry.io/collector/semconv v0.64.2-0.20221115155901-1550938c18fd h1:rMqcl2pwi8YtVrtOPK8tVh87W0bFBge4yqB9ypSsAJ4= -go.opentelemetry.io/collector/semconv v0.64.2-0.20221115155901-1550938c18fd/go.mod h1:5o9yhOa+ABt7g2E5JABDxGZ1PQPbtfxrKNbYn+LOTXU= +go.opentelemetry.io/collector v0.64.2-0.20221117234814-4565692c50a7 h1:o/vMr2iyXzaeTb/KAldhMxAvRIfFPwtKfL5cKVKsSlU= +go.opentelemetry.io/collector v0.64.2-0.20221117234814-4565692c50a7/go.mod h1:PO8hayFFYvXDqELbXRVxwawR2HTdjN6mY4Qa3Se9xI8= +go.opentelemetry.io/collector/component v0.0.0-20221117234814-4565692c50a7 h1:q9m1bGHhQFUakQX79lZpLmFSY9VLULNSs2jUG8MdJLA= +go.opentelemetry.io/collector/component v0.0.0-20221117234814-4565692c50a7/go.mod h1:Z7H1Oj826e4dtVxXmT6SiUr6S0EIevUJmkVpfQV+UOk= +go.opentelemetry.io/collector/consumer v0.0.0-20221117234814-4565692c50a7 h1:FTy1JD9EJ7gq9SzlZoi2NkGcZ88+SwdiJav5uRcDEEY= +go.opentelemetry.io/collector/consumer v0.0.0-20221117234814-4565692c50a7/go.mod h1:86Elcw/LLrh90DprArogHMkBX3+UMu3tIgcVWF3mr6o= +go.opentelemetry.io/collector/featuregate v0.0.0-20221117214536-6a117bfc3737 h1:7sXg6M9Fw6rFVlX+iaWOMz6DFXEiroUdQer5kWGixwM= +go.opentelemetry.io/collector/featuregate v0.0.0-20221117214536-6a117bfc3737/go.mod h1:tewuFKJYalWBU0bmNKg++MC1ipINXUr6szYzOw2p1GI= +go.opentelemetry.io/collector/pdata v0.64.2-0.20221117234814-4565692c50a7 h1:IOFqfOu7fFxTgC7pvc2U7dk1/uFjwVQPK+CALiUvacI= +go.opentelemetry.io/collector/pdata v0.64.2-0.20221117234814-4565692c50a7/go.mod h1:0vynPfW2ZN7DltpcCFgCmTtWMQkCjp2a3TNt82YTCLQ= +go.opentelemetry.io/collector/receiver/otlpreceiver v0.64.2-0.20221117234814-4565692c50a7 h1:n2zHwTL1xcJ1DtKrGUAXVT12hCN0b5tjVqQV974xCsA= +go.opentelemetry.io/collector/receiver/otlpreceiver v0.64.2-0.20221117234814-4565692c50a7/go.mod h1:CZy46KR3rC5HVHWouklB9oyg7SU9OIRmcKyw6+m+rCk= +go.opentelemetry.io/collector/semconv v0.64.2-0.20221117234814-4565692c50a7 h1:cGXAVltDxXw9nj0Vr7vyZZTj0whdyO+GYs+xv0xHJ2A= +go.opentelemetry.io/collector/semconv v0.64.2-0.20221117234814-4565692c50a7/go.mod h1:5o9yhOa+ABt7g2E5JABDxGZ1PQPbtfxrKNbYn+LOTXU= go.opentelemetry.io/contrib/instrumentation/google.golang.org/grpc/otelgrpc v0.36.4 h1:PRXhsszxTt5bbPriTjmaweWUsAnJYeWBhUMLRetUgBU= go.opentelemetry.io/contrib/instrumentation/google.golang.org/grpc/otelgrpc v0.36.4/go.mod h1:05eWWy6ZWzmpeImD3UowLTB3VjDMU1yxQ+ENuVWDM3c= go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.36.4 h1:aUEBEdCa6iamGzg6fuYxDA8ThxvOG240mAvWDU+XLio= diff --git a/receiver/jmxreceiver/config_test.go b/receiver/jmxreceiver/config_test.go index 5cb2689ee8652..f861392a2c378 100644 --- a/receiver/jmxreceiver/config_test.go +++ b/receiver/jmxreceiver/config_test.go @@ -236,7 +236,7 @@ func TestLoadConfig(t *testing.T) { assert.Equal(t, tt.expected, cfg) return } - assert.NoError(t, cfg.Validate()) + assert.NoError(t, component.ValidateConfig(cfg)) assert.Equal(t, tt.expected, cfg) }) } diff --git a/receiver/jmxreceiver/go.mod b/receiver/jmxreceiver/go.mod index 4b2d04d5668f8..d50d5e272d1e2 100644 --- a/receiver/jmxreceiver/go.mod +++ b/receiver/jmxreceiver/go.mod @@ -7,9 +7,11 @@ require ( github.com/shirou/gopsutil/v3 v3.22.10 github.com/stretchr/testify v1.8.1 github.com/testcontainers/testcontainers-go v0.15.0 - go.opentelemetry.io/collector v0.64.2-0.20221115155901-1550938c18fd - go.opentelemetry.io/collector/pdata v0.64.2-0.20221115155901-1550938c18fd - go.opentelemetry.io/collector/receiver/otlpreceiver v0.64.2-0.20221115155901-1550938c18fd + go.opentelemetry.io/collector v0.64.2-0.20221117234814-4565692c50a7 + go.opentelemetry.io/collector/component v0.0.0-20221117234814-4565692c50a7 + go.opentelemetry.io/collector/consumer v0.0.0-20221117234814-4565692c50a7 + go.opentelemetry.io/collector/pdata v0.64.2-0.20221117234814-4565692c50a7 + go.opentelemetry.io/collector/receiver/otlpreceiver v0.64.2-0.20221117234814-4565692c50a7 go.uber.org/atomic v1.10.0 go.uber.org/zap v1.23.0 ) @@ -64,6 +66,7 @@ require ( github.com/tklauser/numcpus v0.4.0 // indirect github.com/yusufpapurcu/wmi v1.2.2 // indirect go.opencensus.io v0.24.0 // indirect + go.opentelemetry.io/collector/featuregate v0.0.0-20221117214536-6a117bfc3737 // indirect go.opentelemetry.io/contrib/instrumentation/google.golang.org/grpc/otelgrpc v0.36.4 // indirect go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.36.4 // indirect go.opentelemetry.io/otel v1.11.1 // indirect diff --git a/receiver/jmxreceiver/go.sum b/receiver/jmxreceiver/go.sum index 9adc14771116a..121ea97100d88 100644 --- a/receiver/jmxreceiver/go.sum +++ b/receiver/jmxreceiver/go.sum @@ -853,12 +853,18 @@ go.opencensus.io v0.22.2/go.mod h1:yxeiOL68Rb0Xd1ddK5vPZ/oVn4vY4Ynel7k9FzqtOIw= go.opencensus.io v0.22.3/go.mod h1:yxeiOL68Rb0Xd1ddK5vPZ/oVn4vY4Ynel7k9FzqtOIw= go.opencensus.io v0.24.0 h1:y73uSU6J157QMP2kn2r30vwW1A2W2WFwSCGnAVxeaD0= go.opencensus.io v0.24.0/go.mod h1:vNK8G9p7aAivkbmorf4v+7Hgx+Zs0yY+0fOtgBfjQKo= -go.opentelemetry.io/collector v0.64.2-0.20221115155901-1550938c18fd h1:O+6HhE4Ivg8Jksp3dIXIEC4FIR0Ush4uORvG3UtHZWk= -go.opentelemetry.io/collector v0.64.2-0.20221115155901-1550938c18fd/go.mod h1:mmSrOcwe1vEYmChXUYuF6rzlrUL0rjEiPfa19Xxb41o= -go.opentelemetry.io/collector/pdata v0.64.2-0.20221115155901-1550938c18fd h1:GdVAbRiae5VDZe3Mn3FqzMxO/aI5UbJ4+dcviqClHy8= -go.opentelemetry.io/collector/pdata v0.64.2-0.20221115155901-1550938c18fd/go.mod h1:0vynPfW2ZN7DltpcCFgCmTtWMQkCjp2a3TNt82YTCLQ= -go.opentelemetry.io/collector/receiver/otlpreceiver v0.64.2-0.20221115155901-1550938c18fd h1:hMuRptXpQYC9dk7x68LIFeVEpoE3oM+ddI6o13cS73Q= -go.opentelemetry.io/collector/receiver/otlpreceiver v0.64.2-0.20221115155901-1550938c18fd/go.mod h1:i80XzKLKheio/axok7WksVx/xmNGRadfmlzhWOWDnr4= +go.opentelemetry.io/collector v0.64.2-0.20221117234814-4565692c50a7 h1:o/vMr2iyXzaeTb/KAldhMxAvRIfFPwtKfL5cKVKsSlU= +go.opentelemetry.io/collector v0.64.2-0.20221117234814-4565692c50a7/go.mod h1:PO8hayFFYvXDqELbXRVxwawR2HTdjN6mY4Qa3Se9xI8= +go.opentelemetry.io/collector/component v0.0.0-20221117234814-4565692c50a7 h1:q9m1bGHhQFUakQX79lZpLmFSY9VLULNSs2jUG8MdJLA= +go.opentelemetry.io/collector/component v0.0.0-20221117234814-4565692c50a7/go.mod h1:Z7H1Oj826e4dtVxXmT6SiUr6S0EIevUJmkVpfQV+UOk= +go.opentelemetry.io/collector/consumer v0.0.0-20221117234814-4565692c50a7 h1:FTy1JD9EJ7gq9SzlZoi2NkGcZ88+SwdiJav5uRcDEEY= +go.opentelemetry.io/collector/consumer v0.0.0-20221117234814-4565692c50a7/go.mod h1:86Elcw/LLrh90DprArogHMkBX3+UMu3tIgcVWF3mr6o= +go.opentelemetry.io/collector/featuregate v0.0.0-20221117214536-6a117bfc3737 h1:7sXg6M9Fw6rFVlX+iaWOMz6DFXEiroUdQer5kWGixwM= +go.opentelemetry.io/collector/featuregate v0.0.0-20221117214536-6a117bfc3737/go.mod h1:tewuFKJYalWBU0bmNKg++MC1ipINXUr6szYzOw2p1GI= +go.opentelemetry.io/collector/pdata v0.64.2-0.20221117234814-4565692c50a7 h1:IOFqfOu7fFxTgC7pvc2U7dk1/uFjwVQPK+CALiUvacI= +go.opentelemetry.io/collector/pdata v0.64.2-0.20221117234814-4565692c50a7/go.mod h1:0vynPfW2ZN7DltpcCFgCmTtWMQkCjp2a3TNt82YTCLQ= +go.opentelemetry.io/collector/receiver/otlpreceiver v0.64.2-0.20221117234814-4565692c50a7 h1:n2zHwTL1xcJ1DtKrGUAXVT12hCN0b5tjVqQV974xCsA= +go.opentelemetry.io/collector/receiver/otlpreceiver v0.64.2-0.20221117234814-4565692c50a7/go.mod h1:CZy46KR3rC5HVHWouklB9oyg7SU9OIRmcKyw6+m+rCk= go.opentelemetry.io/collector/semconv v0.64.1 h1:2Y52fp3BfQ/4MmubuUYRKzDui/gNxRWz1wpdYWexvC0= go.opentelemetry.io/contrib/instrumentation/google.golang.org/grpc/otelgrpc v0.36.4 h1:PRXhsszxTt5bbPriTjmaweWUsAnJYeWBhUMLRetUgBU= go.opentelemetry.io/contrib/instrumentation/google.golang.org/grpc/otelgrpc v0.36.4/go.mod h1:05eWWy6ZWzmpeImD3UowLTB3VjDMU1yxQ+ENuVWDM3c= diff --git a/receiver/journaldreceiver/go.mod b/receiver/journaldreceiver/go.mod index 4a2130b2835ed..da1ba42891024 100644 --- a/receiver/journaldreceiver/go.mod +++ b/receiver/journaldreceiver/go.mod @@ -5,7 +5,9 @@ go 1.18 require ( github.com/open-telemetry/opentelemetry-collector-contrib/pkg/stanza v0.64.0 github.com/stretchr/testify v1.8.1 - go.opentelemetry.io/collector v0.64.2-0.20221115155901-1550938c18fd + go.opentelemetry.io/collector v0.64.2-0.20221117234814-4565692c50a7 + go.opentelemetry.io/collector/component v0.0.0-20221117234814-4565692c50a7 + go.opentelemetry.io/collector/consumer v0.0.0-20221117234814-4565692c50a7 ) require ( @@ -27,7 +29,8 @@ require ( github.com/pmezard/go-difflib v1.0.0 // indirect github.com/rogpeppe/go-internal v1.8.1 // indirect go.opencensus.io v0.24.0 // indirect - go.opentelemetry.io/collector/pdata v0.64.2-0.20221115155901-1550938c18fd // indirect + go.opentelemetry.io/collector/featuregate v0.0.0-20221117214536-6a117bfc3737 // indirect + go.opentelemetry.io/collector/pdata v0.64.2-0.20221117234814-4565692c50a7 // indirect go.opentelemetry.io/otel v1.11.1 // indirect go.opentelemetry.io/otel/metric v0.33.0 // indirect go.opentelemetry.io/otel/trace v1.11.1 // indirect diff --git a/receiver/journaldreceiver/go.sum b/receiver/journaldreceiver/go.sum index c7db3b26a2d22..606d1559ada47 100644 --- a/receiver/journaldreceiver/go.sum +++ b/receiver/journaldreceiver/go.sum @@ -305,10 +305,16 @@ go.etcd.io/etcd/client/pkg/v3 v3.5.4/go.mod h1:IJHfcCEKxYu1Os13ZdwCwIUTUVGYTSAM3 go.etcd.io/etcd/client/v3 v3.5.4/go.mod h1:ZaRkVgBZC+L+dLCjTcF1hRXpgZXQPOvnA/Ak/gq3kiY= go.opencensus.io v0.24.0 h1:y73uSU6J157QMP2kn2r30vwW1A2W2WFwSCGnAVxeaD0= go.opencensus.io v0.24.0/go.mod h1:vNK8G9p7aAivkbmorf4v+7Hgx+Zs0yY+0fOtgBfjQKo= -go.opentelemetry.io/collector v0.64.2-0.20221115155901-1550938c18fd h1:O+6HhE4Ivg8Jksp3dIXIEC4FIR0Ush4uORvG3UtHZWk= -go.opentelemetry.io/collector v0.64.2-0.20221115155901-1550938c18fd/go.mod h1:mmSrOcwe1vEYmChXUYuF6rzlrUL0rjEiPfa19Xxb41o= -go.opentelemetry.io/collector/pdata v0.64.2-0.20221115155901-1550938c18fd h1:GdVAbRiae5VDZe3Mn3FqzMxO/aI5UbJ4+dcviqClHy8= -go.opentelemetry.io/collector/pdata v0.64.2-0.20221115155901-1550938c18fd/go.mod h1:0vynPfW2ZN7DltpcCFgCmTtWMQkCjp2a3TNt82YTCLQ= +go.opentelemetry.io/collector v0.64.2-0.20221117234814-4565692c50a7 h1:o/vMr2iyXzaeTb/KAldhMxAvRIfFPwtKfL5cKVKsSlU= +go.opentelemetry.io/collector v0.64.2-0.20221117234814-4565692c50a7/go.mod h1:PO8hayFFYvXDqELbXRVxwawR2HTdjN6mY4Qa3Se9xI8= +go.opentelemetry.io/collector/component v0.0.0-20221117234814-4565692c50a7 h1:q9m1bGHhQFUakQX79lZpLmFSY9VLULNSs2jUG8MdJLA= +go.opentelemetry.io/collector/component v0.0.0-20221117234814-4565692c50a7/go.mod h1:Z7H1Oj826e4dtVxXmT6SiUr6S0EIevUJmkVpfQV+UOk= +go.opentelemetry.io/collector/consumer v0.0.0-20221117234814-4565692c50a7 h1:FTy1JD9EJ7gq9SzlZoi2NkGcZ88+SwdiJav5uRcDEEY= +go.opentelemetry.io/collector/consumer v0.0.0-20221117234814-4565692c50a7/go.mod h1:86Elcw/LLrh90DprArogHMkBX3+UMu3tIgcVWF3mr6o= +go.opentelemetry.io/collector/featuregate v0.0.0-20221117214536-6a117bfc3737 h1:7sXg6M9Fw6rFVlX+iaWOMz6DFXEiroUdQer5kWGixwM= +go.opentelemetry.io/collector/featuregate v0.0.0-20221117214536-6a117bfc3737/go.mod h1:tewuFKJYalWBU0bmNKg++MC1ipINXUr6szYzOw2p1GI= +go.opentelemetry.io/collector/pdata v0.64.2-0.20221117234814-4565692c50a7 h1:IOFqfOu7fFxTgC7pvc2U7dk1/uFjwVQPK+CALiUvacI= +go.opentelemetry.io/collector/pdata v0.64.2-0.20221117234814-4565692c50a7/go.mod h1:0vynPfW2ZN7DltpcCFgCmTtWMQkCjp2a3TNt82YTCLQ= go.opentelemetry.io/otel v1.11.1 h1:4WLLAmcfkmDk2ukNXJyq3/kiz/3UzCaYq6PskJsaou4= go.opentelemetry.io/otel v1.11.1/go.mod h1:1nNhXBbWSD0nsL38H6btgnFN2k4i0sNLHNNMZMSbUGE= go.opentelemetry.io/otel/exporters/prometheus v0.33.0 h1:xXhPj7SLKWU5/Zd4Hxmd+X1C4jdmvc0Xy+kvjFx2z60= diff --git a/receiver/k8sclusterreceiver/config_test.go b/receiver/k8sclusterreceiver/config_test.go index 32602c546b019..50db5d7678bef 100644 --- a/receiver/k8sclusterreceiver/config_test.go +++ b/receiver/k8sclusterreceiver/config_test.go @@ -80,7 +80,7 @@ func TestLoadConfig(t *testing.T) { require.NoError(t, err) require.NoError(t, component.UnmarshalReceiverConfig(sub, cfg)) - assert.NoError(t, cfg.Validate()) + assert.NoError(t, component.ValidateConfig(cfg)) assert.Equal(t, tt.expected, cfg) }) } @@ -93,7 +93,7 @@ func TestInvalidConfig(t *testing.T) { Distribution: distributionKubernetes, CollectionInterval: 30 * time.Second, } - err := cfg.Validate() + err := component.ValidateConfig(cfg) assert.NotNil(t, err) assert.Equal(t, "invalid authType for kubernetes: ", err.Error()) @@ -103,7 +103,7 @@ func TestInvalidConfig(t *testing.T) { Distribution: "wrong", CollectionInterval: 30 * time.Second, } - err = cfg.Validate() + err = component.ValidateConfig(cfg) assert.NotNil(t, err) assert.Equal(t, "\"wrong\" is not a supported distribution. Must be one of: \"openshift\", \"kubernetes\"", err.Error()) } diff --git a/receiver/k8sclusterreceiver/go.mod b/receiver/k8sclusterreceiver/go.mod index 767c6f3dce23a..c907f808de903 100644 --- a/receiver/k8sclusterreceiver/go.mod +++ b/receiver/k8sclusterreceiver/go.mod @@ -12,9 +12,11 @@ require ( github.com/openshift/api v0.0.0-20210521075222-e273a339932a github.com/openshift/client-go v0.0.0-20210521082421-73d9475a9142 github.com/stretchr/testify v1.8.1 - go.opentelemetry.io/collector v0.64.2-0.20221115155901-1550938c18fd - go.opentelemetry.io/collector/pdata v0.64.2-0.20221115155901-1550938c18fd - go.opentelemetry.io/collector/semconv v0.64.2-0.20221115155901-1550938c18fd + go.opentelemetry.io/collector v0.64.2-0.20221117234814-4565692c50a7 + go.opentelemetry.io/collector/component v0.0.0-20221117234814-4565692c50a7 + go.opentelemetry.io/collector/consumer v0.0.0-20221117234814-4565692c50a7 + go.opentelemetry.io/collector/pdata v0.64.2-0.20221117234814-4565692c50a7 + go.opentelemetry.io/collector/semconv v0.64.2-0.20221117234814-4565692c50a7 go.uber.org/atomic v1.10.0 go.uber.org/zap v1.23.0 google.golang.org/protobuf v1.28.1 @@ -68,6 +70,7 @@ require ( github.com/prometheus/statsd_exporter v0.22.7 // indirect github.com/spf13/pflag v1.0.5 // indirect go.opencensus.io v0.24.0 // indirect + go.opentelemetry.io/collector/featuregate v0.0.0-20221117214536-6a117bfc3737 // indirect go.opentelemetry.io/otel v1.11.1 // indirect go.opentelemetry.io/otel/exporters/prometheus v0.33.0 // indirect go.opentelemetry.io/otel/metric v0.33.0 // indirect diff --git a/receiver/k8sclusterreceiver/go.sum b/receiver/k8sclusterreceiver/go.sum index 991c964e36691..11c8dce94e585 100644 --- a/receiver/k8sclusterreceiver/go.sum +++ b/receiver/k8sclusterreceiver/go.sum @@ -468,12 +468,18 @@ go.opencensus.io v0.22.4/go.mod h1:yxeiOL68Rb0Xd1ddK5vPZ/oVn4vY4Ynel7k9FzqtOIw= go.opencensus.io v0.23.0/go.mod h1:XItmlyltB5F7CS4xOC1DcqMoFqwtC6OG2xF7mCv7P7E= go.opencensus.io v0.24.0 h1:y73uSU6J157QMP2kn2r30vwW1A2W2WFwSCGnAVxeaD0= go.opencensus.io v0.24.0/go.mod h1:vNK8G9p7aAivkbmorf4v+7Hgx+Zs0yY+0fOtgBfjQKo= -go.opentelemetry.io/collector v0.64.2-0.20221115155901-1550938c18fd h1:O+6HhE4Ivg8Jksp3dIXIEC4FIR0Ush4uORvG3UtHZWk= -go.opentelemetry.io/collector v0.64.2-0.20221115155901-1550938c18fd/go.mod h1:mmSrOcwe1vEYmChXUYuF6rzlrUL0rjEiPfa19Xxb41o= -go.opentelemetry.io/collector/pdata v0.64.2-0.20221115155901-1550938c18fd h1:GdVAbRiae5VDZe3Mn3FqzMxO/aI5UbJ4+dcviqClHy8= -go.opentelemetry.io/collector/pdata v0.64.2-0.20221115155901-1550938c18fd/go.mod h1:0vynPfW2ZN7DltpcCFgCmTtWMQkCjp2a3TNt82YTCLQ= -go.opentelemetry.io/collector/semconv v0.64.2-0.20221115155901-1550938c18fd h1:rMqcl2pwi8YtVrtOPK8tVh87W0bFBge4yqB9ypSsAJ4= -go.opentelemetry.io/collector/semconv v0.64.2-0.20221115155901-1550938c18fd/go.mod h1:5o9yhOa+ABt7g2E5JABDxGZ1PQPbtfxrKNbYn+LOTXU= +go.opentelemetry.io/collector v0.64.2-0.20221117234814-4565692c50a7 h1:o/vMr2iyXzaeTb/KAldhMxAvRIfFPwtKfL5cKVKsSlU= +go.opentelemetry.io/collector v0.64.2-0.20221117234814-4565692c50a7/go.mod h1:PO8hayFFYvXDqELbXRVxwawR2HTdjN6mY4Qa3Se9xI8= +go.opentelemetry.io/collector/component v0.0.0-20221117234814-4565692c50a7 h1:q9m1bGHhQFUakQX79lZpLmFSY9VLULNSs2jUG8MdJLA= +go.opentelemetry.io/collector/component v0.0.0-20221117234814-4565692c50a7/go.mod h1:Z7H1Oj826e4dtVxXmT6SiUr6S0EIevUJmkVpfQV+UOk= +go.opentelemetry.io/collector/consumer v0.0.0-20221117234814-4565692c50a7 h1:FTy1JD9EJ7gq9SzlZoi2NkGcZ88+SwdiJav5uRcDEEY= +go.opentelemetry.io/collector/consumer v0.0.0-20221117234814-4565692c50a7/go.mod h1:86Elcw/LLrh90DprArogHMkBX3+UMu3tIgcVWF3mr6o= +go.opentelemetry.io/collector/featuregate v0.0.0-20221117214536-6a117bfc3737 h1:7sXg6M9Fw6rFVlX+iaWOMz6DFXEiroUdQer5kWGixwM= +go.opentelemetry.io/collector/featuregate v0.0.0-20221117214536-6a117bfc3737/go.mod h1:tewuFKJYalWBU0bmNKg++MC1ipINXUr6szYzOw2p1GI= +go.opentelemetry.io/collector/pdata v0.64.2-0.20221117234814-4565692c50a7 h1:IOFqfOu7fFxTgC7pvc2U7dk1/uFjwVQPK+CALiUvacI= +go.opentelemetry.io/collector/pdata v0.64.2-0.20221117234814-4565692c50a7/go.mod h1:0vynPfW2ZN7DltpcCFgCmTtWMQkCjp2a3TNt82YTCLQ= +go.opentelemetry.io/collector/semconv v0.64.2-0.20221117234814-4565692c50a7 h1:cGXAVltDxXw9nj0Vr7vyZZTj0whdyO+GYs+xv0xHJ2A= +go.opentelemetry.io/collector/semconv v0.64.2-0.20221117234814-4565692c50a7/go.mod h1:5o9yhOa+ABt7g2E5JABDxGZ1PQPbtfxrKNbYn+LOTXU= go.opentelemetry.io/otel v1.11.1 h1:4WLLAmcfkmDk2ukNXJyq3/kiz/3UzCaYq6PskJsaou4= go.opentelemetry.io/otel v1.11.1/go.mod h1:1nNhXBbWSD0nsL38H6btgnFN2k4i0sNLHNNMZMSbUGE= go.opentelemetry.io/otel/exporters/prometheus v0.33.0 h1:xXhPj7SLKWU5/Zd4Hxmd+X1C4jdmvc0Xy+kvjFx2z60= diff --git a/receiver/k8seventsreceiver/config.go b/receiver/k8seventsreceiver/config.go index d0c7e84c8b38e..4a010837e7388 100644 --- a/receiver/k8seventsreceiver/config.go +++ b/receiver/k8seventsreceiver/config.go @@ -34,9 +34,6 @@ type Config struct { } func (cfg *Config) Validate() error { - if err := cfg.ReceiverSettings.Validate(); err != nil { - return err - } return cfg.APIConfig.Validate() } diff --git a/receiver/k8seventsreceiver/config_test.go b/receiver/k8seventsreceiver/config_test.go index 81df799a91b4d..e262fe5762cb9 100644 --- a/receiver/k8seventsreceiver/config_test.go +++ b/receiver/k8seventsreceiver/config_test.go @@ -63,7 +63,7 @@ func TestLoadConfig(t *testing.T) { require.NoError(t, err) require.NoError(t, component.UnmarshalReceiverConfig(sub, cfg)) - assert.NoError(t, cfg.Validate()) + assert.NoError(t, component.ValidateConfig(cfg)) assert.Equal(t, tt.expected, cfg) }) } diff --git a/receiver/k8seventsreceiver/go.mod b/receiver/k8seventsreceiver/go.mod index b57cbb5d2ab1a..03e2dc7d4ff61 100644 --- a/receiver/k8seventsreceiver/go.mod +++ b/receiver/k8seventsreceiver/go.mod @@ -5,9 +5,11 @@ go 1.18 require ( github.com/open-telemetry/opentelemetry-collector-contrib/internal/k8sconfig v0.64.0 github.com/stretchr/testify v1.8.1 - go.opentelemetry.io/collector v0.64.2-0.20221115155901-1550938c18fd - go.opentelemetry.io/collector/pdata v0.64.2-0.20221115155901-1550938c18fd - go.opentelemetry.io/collector/semconv v0.64.2-0.20221115155901-1550938c18fd + go.opentelemetry.io/collector v0.64.2-0.20221117234814-4565692c50a7 + go.opentelemetry.io/collector/component v0.0.0-20221117234814-4565692c50a7 + go.opentelemetry.io/collector/consumer v0.0.0-20221117234814-4565692c50a7 + go.opentelemetry.io/collector/pdata v0.64.2-0.20221117234814-4565692c50a7 + go.opentelemetry.io/collector/semconv v0.64.2-0.20221117234814-4565692c50a7 go.uber.org/zap v1.23.0 k8s.io/api v0.25.4 k8s.io/apimachinery v0.25.4 @@ -49,6 +51,7 @@ require ( github.com/pmezard/go-difflib v1.0.0 // indirect github.com/spf13/pflag v1.0.5 // indirect go.opencensus.io v0.24.0 // indirect + go.opentelemetry.io/collector/featuregate v0.0.0-20221117214536-6a117bfc3737 // indirect go.opentelemetry.io/otel v1.11.1 // indirect go.opentelemetry.io/otel/metric v0.33.0 // indirect go.opentelemetry.io/otel/trace v1.11.1 // indirect diff --git a/receiver/k8seventsreceiver/go.sum b/receiver/k8seventsreceiver/go.sum index e245e0b69f858..8cebfb4ecc94a 100644 --- a/receiver/k8seventsreceiver/go.sum +++ b/receiver/k8seventsreceiver/go.sum @@ -450,12 +450,18 @@ go.opencensus.io v0.22.3/go.mod h1:yxeiOL68Rb0Xd1ddK5vPZ/oVn4vY4Ynel7k9FzqtOIw= go.opencensus.io v0.22.4/go.mod h1:yxeiOL68Rb0Xd1ddK5vPZ/oVn4vY4Ynel7k9FzqtOIw= go.opencensus.io v0.24.0 h1:y73uSU6J157QMP2kn2r30vwW1A2W2WFwSCGnAVxeaD0= go.opencensus.io v0.24.0/go.mod h1:vNK8G9p7aAivkbmorf4v+7Hgx+Zs0yY+0fOtgBfjQKo= -go.opentelemetry.io/collector v0.64.2-0.20221115155901-1550938c18fd h1:O+6HhE4Ivg8Jksp3dIXIEC4FIR0Ush4uORvG3UtHZWk= -go.opentelemetry.io/collector v0.64.2-0.20221115155901-1550938c18fd/go.mod h1:mmSrOcwe1vEYmChXUYuF6rzlrUL0rjEiPfa19Xxb41o= -go.opentelemetry.io/collector/pdata v0.64.2-0.20221115155901-1550938c18fd h1:GdVAbRiae5VDZe3Mn3FqzMxO/aI5UbJ4+dcviqClHy8= -go.opentelemetry.io/collector/pdata v0.64.2-0.20221115155901-1550938c18fd/go.mod h1:0vynPfW2ZN7DltpcCFgCmTtWMQkCjp2a3TNt82YTCLQ= -go.opentelemetry.io/collector/semconv v0.64.2-0.20221115155901-1550938c18fd h1:rMqcl2pwi8YtVrtOPK8tVh87W0bFBge4yqB9ypSsAJ4= -go.opentelemetry.io/collector/semconv v0.64.2-0.20221115155901-1550938c18fd/go.mod h1:5o9yhOa+ABt7g2E5JABDxGZ1PQPbtfxrKNbYn+LOTXU= +go.opentelemetry.io/collector v0.64.2-0.20221117234814-4565692c50a7 h1:o/vMr2iyXzaeTb/KAldhMxAvRIfFPwtKfL5cKVKsSlU= +go.opentelemetry.io/collector v0.64.2-0.20221117234814-4565692c50a7/go.mod h1:PO8hayFFYvXDqELbXRVxwawR2HTdjN6mY4Qa3Se9xI8= +go.opentelemetry.io/collector/component v0.0.0-20221117234814-4565692c50a7 h1:q9m1bGHhQFUakQX79lZpLmFSY9VLULNSs2jUG8MdJLA= +go.opentelemetry.io/collector/component v0.0.0-20221117234814-4565692c50a7/go.mod h1:Z7H1Oj826e4dtVxXmT6SiUr6S0EIevUJmkVpfQV+UOk= +go.opentelemetry.io/collector/consumer v0.0.0-20221117234814-4565692c50a7 h1:FTy1JD9EJ7gq9SzlZoi2NkGcZ88+SwdiJav5uRcDEEY= +go.opentelemetry.io/collector/consumer v0.0.0-20221117234814-4565692c50a7/go.mod h1:86Elcw/LLrh90DprArogHMkBX3+UMu3tIgcVWF3mr6o= +go.opentelemetry.io/collector/featuregate v0.0.0-20221117214536-6a117bfc3737 h1:7sXg6M9Fw6rFVlX+iaWOMz6DFXEiroUdQer5kWGixwM= +go.opentelemetry.io/collector/featuregate v0.0.0-20221117214536-6a117bfc3737/go.mod h1:tewuFKJYalWBU0bmNKg++MC1ipINXUr6szYzOw2p1GI= +go.opentelemetry.io/collector/pdata v0.64.2-0.20221117234814-4565692c50a7 h1:IOFqfOu7fFxTgC7pvc2U7dk1/uFjwVQPK+CALiUvacI= +go.opentelemetry.io/collector/pdata v0.64.2-0.20221117234814-4565692c50a7/go.mod h1:0vynPfW2ZN7DltpcCFgCmTtWMQkCjp2a3TNt82YTCLQ= +go.opentelemetry.io/collector/semconv v0.64.2-0.20221117234814-4565692c50a7 h1:cGXAVltDxXw9nj0Vr7vyZZTj0whdyO+GYs+xv0xHJ2A= +go.opentelemetry.io/collector/semconv v0.64.2-0.20221117234814-4565692c50a7/go.mod h1:5o9yhOa+ABt7g2E5JABDxGZ1PQPbtfxrKNbYn+LOTXU= go.opentelemetry.io/otel v1.11.1 h1:4WLLAmcfkmDk2ukNXJyq3/kiz/3UzCaYq6PskJsaou4= go.opentelemetry.io/otel v1.11.1/go.mod h1:1nNhXBbWSD0nsL38H6btgnFN2k4i0sNLHNNMZMSbUGE= go.opentelemetry.io/otel/exporters/prometheus v0.33.0 h1:xXhPj7SLKWU5/Zd4Hxmd+X1C4jdmvc0Xy+kvjFx2z60= diff --git a/receiver/k8sobjectsreceiver/config.go b/receiver/k8sobjectsreceiver/config.go index 94029c1bd112d..c4442eb920a16 100644 --- a/receiver/k8sobjectsreceiver/config.go +++ b/receiver/k8sobjectsreceiver/config.go @@ -100,7 +100,7 @@ func (c *Config) Validate() error { object.gvr = gvr } - return c.ReceiverSettings.Validate() + return nil } func (c *Config) getDiscoveryClient() (discovery.ServerResourcesInterface, error) { diff --git a/receiver/k8sobjectsreceiver/config_test.go b/receiver/k8sobjectsreceiver/config_test.go index b34728615e24a..55870e0edbf6e 100644 --- a/receiver/k8sobjectsreceiver/config_test.go +++ b/receiver/k8sobjectsreceiver/config_test.go @@ -40,12 +40,12 @@ func TestLoadConfig(t *testing.T) { require.NoError(t, component.UnmarshalReceiverConfig(sub, cfg)) require.NotNil(t, cfg) - err = cfg.Validate() + err = component.ValidateConfig(cfg) require.Error(t, err) cfg.makeDiscoveryClient = getMockDiscoveryClient - err = cfg.Validate() + err = component.ValidateConfig(cfg) require.NoError(t, err) expected := []*K8sObjectsConfig{ @@ -92,7 +92,7 @@ func TestValidConfigs(t *testing.T) { cfg.makeDiscoveryClient = getMockDiscoveryClient - err = cfg.Validate() + err = component.ValidateConfig(cfg) assert.ErrorContains(t, err, "resource fake_resource not found") } diff --git a/receiver/k8sobjectsreceiver/go.mod b/receiver/k8sobjectsreceiver/go.mod index bbcd3e7dd7621..0eaec908d6768 100644 --- a/receiver/k8sobjectsreceiver/go.mod +++ b/receiver/k8sobjectsreceiver/go.mod @@ -5,9 +5,11 @@ go 1.18 require ( github.com/open-telemetry/opentelemetry-collector-contrib/internal/k8sconfig v0.64.0 github.com/stretchr/testify v1.8.1 - go.opentelemetry.io/collector v0.64.2-0.20221115155901-1550938c18fd - go.opentelemetry.io/collector/pdata v0.64.2-0.20221115155901-1550938c18fd - go.opentelemetry.io/collector/semconv v0.64.2-0.20221115155901-1550938c18fd + go.opentelemetry.io/collector v0.64.2-0.20221117234814-4565692c50a7 + go.opentelemetry.io/collector/component v0.0.0-20221117234814-4565692c50a7 + go.opentelemetry.io/collector/consumer v0.0.0-20221117234814-4565692c50a7 + go.opentelemetry.io/collector/pdata v0.64.2-0.20221117234814-4565692c50a7 + go.opentelemetry.io/collector/semconv v0.64.2-0.20221117234814-4565692c50a7 go.uber.org/zap v1.23.0 k8s.io/apimachinery v0.25.4 k8s.io/client-go v0.25.4 @@ -44,6 +46,7 @@ require ( github.com/pmezard/go-difflib v1.0.0 // indirect github.com/spf13/pflag v1.0.5 // indirect go.opencensus.io v0.24.0 // indirect + go.opentelemetry.io/collector/featuregate v0.0.0-20221117214536-6a117bfc3737 // indirect go.opentelemetry.io/otel v1.11.1 // indirect go.opentelemetry.io/otel/metric v0.33.0 // indirect go.opentelemetry.io/otel/trace v1.11.1 // indirect diff --git a/receiver/k8sobjectsreceiver/go.sum b/receiver/k8sobjectsreceiver/go.sum index dec1731f34297..bc8f3e927b612 100644 --- a/receiver/k8sobjectsreceiver/go.sum +++ b/receiver/k8sobjectsreceiver/go.sum @@ -442,12 +442,18 @@ go.opencensus.io v0.22.3/go.mod h1:yxeiOL68Rb0Xd1ddK5vPZ/oVn4vY4Ynel7k9FzqtOIw= go.opencensus.io v0.22.4/go.mod h1:yxeiOL68Rb0Xd1ddK5vPZ/oVn4vY4Ynel7k9FzqtOIw= go.opencensus.io v0.24.0 h1:y73uSU6J157QMP2kn2r30vwW1A2W2WFwSCGnAVxeaD0= go.opencensus.io v0.24.0/go.mod h1:vNK8G9p7aAivkbmorf4v+7Hgx+Zs0yY+0fOtgBfjQKo= -go.opentelemetry.io/collector v0.64.2-0.20221115155901-1550938c18fd h1:O+6HhE4Ivg8Jksp3dIXIEC4FIR0Ush4uORvG3UtHZWk= -go.opentelemetry.io/collector v0.64.2-0.20221115155901-1550938c18fd/go.mod h1:mmSrOcwe1vEYmChXUYuF6rzlrUL0rjEiPfa19Xxb41o= -go.opentelemetry.io/collector/pdata v0.64.2-0.20221115155901-1550938c18fd h1:GdVAbRiae5VDZe3Mn3FqzMxO/aI5UbJ4+dcviqClHy8= -go.opentelemetry.io/collector/pdata v0.64.2-0.20221115155901-1550938c18fd/go.mod h1:0vynPfW2ZN7DltpcCFgCmTtWMQkCjp2a3TNt82YTCLQ= -go.opentelemetry.io/collector/semconv v0.64.2-0.20221115155901-1550938c18fd h1:rMqcl2pwi8YtVrtOPK8tVh87W0bFBge4yqB9ypSsAJ4= -go.opentelemetry.io/collector/semconv v0.64.2-0.20221115155901-1550938c18fd/go.mod h1:5o9yhOa+ABt7g2E5JABDxGZ1PQPbtfxrKNbYn+LOTXU= +go.opentelemetry.io/collector v0.64.2-0.20221117234814-4565692c50a7 h1:o/vMr2iyXzaeTb/KAldhMxAvRIfFPwtKfL5cKVKsSlU= +go.opentelemetry.io/collector v0.64.2-0.20221117234814-4565692c50a7/go.mod h1:PO8hayFFYvXDqELbXRVxwawR2HTdjN6mY4Qa3Se9xI8= +go.opentelemetry.io/collector/component v0.0.0-20221117234814-4565692c50a7 h1:q9m1bGHhQFUakQX79lZpLmFSY9VLULNSs2jUG8MdJLA= +go.opentelemetry.io/collector/component v0.0.0-20221117234814-4565692c50a7/go.mod h1:Z7H1Oj826e4dtVxXmT6SiUr6S0EIevUJmkVpfQV+UOk= +go.opentelemetry.io/collector/consumer v0.0.0-20221117234814-4565692c50a7 h1:FTy1JD9EJ7gq9SzlZoi2NkGcZ88+SwdiJav5uRcDEEY= +go.opentelemetry.io/collector/consumer v0.0.0-20221117234814-4565692c50a7/go.mod h1:86Elcw/LLrh90DprArogHMkBX3+UMu3tIgcVWF3mr6o= +go.opentelemetry.io/collector/featuregate v0.0.0-20221117214536-6a117bfc3737 h1:7sXg6M9Fw6rFVlX+iaWOMz6DFXEiroUdQer5kWGixwM= +go.opentelemetry.io/collector/featuregate v0.0.0-20221117214536-6a117bfc3737/go.mod h1:tewuFKJYalWBU0bmNKg++MC1ipINXUr6szYzOw2p1GI= +go.opentelemetry.io/collector/pdata v0.64.2-0.20221117234814-4565692c50a7 h1:IOFqfOu7fFxTgC7pvc2U7dk1/uFjwVQPK+CALiUvacI= +go.opentelemetry.io/collector/pdata v0.64.2-0.20221117234814-4565692c50a7/go.mod h1:0vynPfW2ZN7DltpcCFgCmTtWMQkCjp2a3TNt82YTCLQ= +go.opentelemetry.io/collector/semconv v0.64.2-0.20221117234814-4565692c50a7 h1:cGXAVltDxXw9nj0Vr7vyZZTj0whdyO+GYs+xv0xHJ2A= +go.opentelemetry.io/collector/semconv v0.64.2-0.20221117234814-4565692c50a7/go.mod h1:5o9yhOa+ABt7g2E5JABDxGZ1PQPbtfxrKNbYn+LOTXU= go.opentelemetry.io/otel v1.11.1 h1:4WLLAmcfkmDk2ukNXJyq3/kiz/3UzCaYq6PskJsaou4= go.opentelemetry.io/otel v1.11.1/go.mod h1:1nNhXBbWSD0nsL38H6btgnFN2k4i0sNLHNNMZMSbUGE= go.opentelemetry.io/otel/exporters/prometheus v0.33.0 h1:xXhPj7SLKWU5/Zd4Hxmd+X1C4jdmvc0Xy+kvjFx2z60= diff --git a/receiver/kafkametricsreceiver/go.mod b/receiver/kafkametricsreceiver/go.mod index 9ca50d47ce76a..d192a4a7c0d77 100644 --- a/receiver/kafkametricsreceiver/go.mod +++ b/receiver/kafkametricsreceiver/go.mod @@ -7,8 +7,10 @@ require ( github.com/open-telemetry/opentelemetry-collector-contrib/exporter/kafkaexporter v0.64.0 github.com/stretchr/testify v1.8.1 github.com/testcontainers/testcontainers-go v0.15.0 - go.opentelemetry.io/collector v0.64.2-0.20221115155901-1550938c18fd - go.opentelemetry.io/collector/pdata v0.64.2-0.20221115155901-1550938c18fd + go.opentelemetry.io/collector v0.64.2-0.20221117234814-4565692c50a7 + go.opentelemetry.io/collector/component v0.0.0-20221117234814-4565692c50a7 + go.opentelemetry.io/collector/consumer v0.0.0-20221117234814-4565692c50a7 + go.opentelemetry.io/collector/pdata v0.64.2-0.20221117234814-4565692c50a7 go.uber.org/multierr v1.8.0 go.uber.org/zap v1.23.0 ) @@ -76,7 +78,8 @@ require ( github.com/xdg-go/scram v1.1.1 // indirect github.com/xdg-go/stringprep v1.0.3 // indirect go.opencensus.io v0.24.0 // indirect - go.opentelemetry.io/collector/semconv v0.64.2-0.20221115155901-1550938c18fd // indirect + go.opentelemetry.io/collector/featuregate v0.0.0-20221117214536-6a117bfc3737 // indirect + go.opentelemetry.io/collector/semconv v0.64.2-0.20221117234814-4565692c50a7 // indirect go.opentelemetry.io/otel v1.11.1 // indirect go.opentelemetry.io/otel/metric v0.33.0 // indirect go.opentelemetry.io/otel/trace v1.11.1 // indirect diff --git a/receiver/kafkametricsreceiver/go.sum b/receiver/kafkametricsreceiver/go.sum index 226cd3345706f..848e15ceb249f 100644 --- a/receiver/kafkametricsreceiver/go.sum +++ b/receiver/kafkametricsreceiver/go.sum @@ -874,12 +874,18 @@ go.opencensus.io v0.22.2/go.mod h1:yxeiOL68Rb0Xd1ddK5vPZ/oVn4vY4Ynel7k9FzqtOIw= go.opencensus.io v0.22.3/go.mod h1:yxeiOL68Rb0Xd1ddK5vPZ/oVn4vY4Ynel7k9FzqtOIw= go.opencensus.io v0.24.0 h1:y73uSU6J157QMP2kn2r30vwW1A2W2WFwSCGnAVxeaD0= go.opencensus.io v0.24.0/go.mod h1:vNK8G9p7aAivkbmorf4v+7Hgx+Zs0yY+0fOtgBfjQKo= -go.opentelemetry.io/collector v0.64.2-0.20221115155901-1550938c18fd h1:O+6HhE4Ivg8Jksp3dIXIEC4FIR0Ush4uORvG3UtHZWk= -go.opentelemetry.io/collector v0.64.2-0.20221115155901-1550938c18fd/go.mod h1:mmSrOcwe1vEYmChXUYuF6rzlrUL0rjEiPfa19Xxb41o= -go.opentelemetry.io/collector/pdata v0.64.2-0.20221115155901-1550938c18fd h1:GdVAbRiae5VDZe3Mn3FqzMxO/aI5UbJ4+dcviqClHy8= -go.opentelemetry.io/collector/pdata v0.64.2-0.20221115155901-1550938c18fd/go.mod h1:0vynPfW2ZN7DltpcCFgCmTtWMQkCjp2a3TNt82YTCLQ= -go.opentelemetry.io/collector/semconv v0.64.2-0.20221115155901-1550938c18fd h1:rMqcl2pwi8YtVrtOPK8tVh87W0bFBge4yqB9ypSsAJ4= -go.opentelemetry.io/collector/semconv v0.64.2-0.20221115155901-1550938c18fd/go.mod h1:5o9yhOa+ABt7g2E5JABDxGZ1PQPbtfxrKNbYn+LOTXU= +go.opentelemetry.io/collector v0.64.2-0.20221117234814-4565692c50a7 h1:o/vMr2iyXzaeTb/KAldhMxAvRIfFPwtKfL5cKVKsSlU= +go.opentelemetry.io/collector v0.64.2-0.20221117234814-4565692c50a7/go.mod h1:PO8hayFFYvXDqELbXRVxwawR2HTdjN6mY4Qa3Se9xI8= +go.opentelemetry.io/collector/component v0.0.0-20221117234814-4565692c50a7 h1:q9m1bGHhQFUakQX79lZpLmFSY9VLULNSs2jUG8MdJLA= +go.opentelemetry.io/collector/component v0.0.0-20221117234814-4565692c50a7/go.mod h1:Z7H1Oj826e4dtVxXmT6SiUr6S0EIevUJmkVpfQV+UOk= +go.opentelemetry.io/collector/consumer v0.0.0-20221117234814-4565692c50a7 h1:FTy1JD9EJ7gq9SzlZoi2NkGcZ88+SwdiJav5uRcDEEY= +go.opentelemetry.io/collector/consumer v0.0.0-20221117234814-4565692c50a7/go.mod h1:86Elcw/LLrh90DprArogHMkBX3+UMu3tIgcVWF3mr6o= +go.opentelemetry.io/collector/featuregate v0.0.0-20221117214536-6a117bfc3737 h1:7sXg6M9Fw6rFVlX+iaWOMz6DFXEiroUdQer5kWGixwM= +go.opentelemetry.io/collector/featuregate v0.0.0-20221117214536-6a117bfc3737/go.mod h1:tewuFKJYalWBU0bmNKg++MC1ipINXUr6szYzOw2p1GI= +go.opentelemetry.io/collector/pdata v0.64.2-0.20221117234814-4565692c50a7 h1:IOFqfOu7fFxTgC7pvc2U7dk1/uFjwVQPK+CALiUvacI= +go.opentelemetry.io/collector/pdata v0.64.2-0.20221117234814-4565692c50a7/go.mod h1:0vynPfW2ZN7DltpcCFgCmTtWMQkCjp2a3TNt82YTCLQ= +go.opentelemetry.io/collector/semconv v0.64.2-0.20221117234814-4565692c50a7 h1:cGXAVltDxXw9nj0Vr7vyZZTj0whdyO+GYs+xv0xHJ2A= +go.opentelemetry.io/collector/semconv v0.64.2-0.20221117234814-4565692c50a7/go.mod h1:5o9yhOa+ABt7g2E5JABDxGZ1PQPbtfxrKNbYn+LOTXU= go.opentelemetry.io/otel v1.11.1 h1:4WLLAmcfkmDk2ukNXJyq3/kiz/3UzCaYq6PskJsaou4= go.opentelemetry.io/otel v1.11.1/go.mod h1:1nNhXBbWSD0nsL38H6btgnFN2k4i0sNLHNNMZMSbUGE= go.opentelemetry.io/otel/exporters/prometheus v0.33.0 h1:xXhPj7SLKWU5/Zd4Hxmd+X1C4jdmvc0Xy+kvjFx2z60= diff --git a/receiver/kafkareceiver/config_test.go b/receiver/kafkareceiver/config_test.go index 57dad42cb831e..66671e1f1f758 100644 --- a/receiver/kafkareceiver/config_test.go +++ b/receiver/kafkareceiver/config_test.go @@ -114,7 +114,7 @@ func TestLoadConfig(t *testing.T) { require.NoError(t, err) require.NoError(t, component.UnmarshalReceiverConfig(sub, cfg)) - assert.NoError(t, cfg.Validate()) + assert.NoError(t, component.ValidateConfig(cfg)) assert.Equal(t, tt.expected, cfg) }) } diff --git a/receiver/kafkareceiver/go.mod b/receiver/kafkareceiver/go.mod index 8ab3456b3be57..c7850a9d9565b 100644 --- a/receiver/kafkareceiver/go.mod +++ b/receiver/kafkareceiver/go.mod @@ -14,9 +14,11 @@ require ( github.com/openzipkin/zipkin-go v0.4.1 github.com/stretchr/testify v1.8.1 go.opencensus.io v0.24.0 - go.opentelemetry.io/collector v0.64.2-0.20221115155901-1550938c18fd - go.opentelemetry.io/collector/pdata v0.64.2-0.20221115155901-1550938c18fd - go.opentelemetry.io/collector/semconv v0.64.2-0.20221115155901-1550938c18fd + go.opentelemetry.io/collector v0.64.2-0.20221117234814-4565692c50a7 + go.opentelemetry.io/collector/component v0.0.0-20221117234814-4565692c50a7 + go.opentelemetry.io/collector/consumer v0.0.0-20221117234814-4565692c50a7 + go.opentelemetry.io/collector/pdata v0.64.2-0.20221117234814-4565692c50a7 + go.opentelemetry.io/collector/semconv v0.64.2-0.20221117234814-4565692c50a7 go.uber.org/zap v1.23.0 ) @@ -55,6 +57,7 @@ require ( github.com/xdg-go/pbkdf2 v1.0.0 // indirect github.com/xdg-go/scram v1.1.1 // indirect github.com/xdg-go/stringprep v1.0.3 // indirect + go.opentelemetry.io/collector/featuregate v0.0.0-20221117214536-6a117bfc3737 // indirect go.opentelemetry.io/otel v1.11.1 // indirect go.opentelemetry.io/otel/metric v0.33.0 // indirect go.opentelemetry.io/otel/trace v1.11.1 // indirect diff --git a/receiver/kafkareceiver/go.sum b/receiver/kafkareceiver/go.sum index d9d90b4c71e7c..2772df50344a5 100644 --- a/receiver/kafkareceiver/go.sum +++ b/receiver/kafkareceiver/go.sum @@ -337,12 +337,18 @@ go.etcd.io/etcd/client/pkg/v3 v3.5.4/go.mod h1:IJHfcCEKxYu1Os13ZdwCwIUTUVGYTSAM3 go.etcd.io/etcd/client/v3 v3.5.4/go.mod h1:ZaRkVgBZC+L+dLCjTcF1hRXpgZXQPOvnA/Ak/gq3kiY= go.opencensus.io v0.24.0 h1:y73uSU6J157QMP2kn2r30vwW1A2W2WFwSCGnAVxeaD0= go.opencensus.io v0.24.0/go.mod h1:vNK8G9p7aAivkbmorf4v+7Hgx+Zs0yY+0fOtgBfjQKo= -go.opentelemetry.io/collector v0.64.2-0.20221115155901-1550938c18fd h1:O+6HhE4Ivg8Jksp3dIXIEC4FIR0Ush4uORvG3UtHZWk= -go.opentelemetry.io/collector v0.64.2-0.20221115155901-1550938c18fd/go.mod h1:mmSrOcwe1vEYmChXUYuF6rzlrUL0rjEiPfa19Xxb41o= -go.opentelemetry.io/collector/pdata v0.64.2-0.20221115155901-1550938c18fd h1:GdVAbRiae5VDZe3Mn3FqzMxO/aI5UbJ4+dcviqClHy8= -go.opentelemetry.io/collector/pdata v0.64.2-0.20221115155901-1550938c18fd/go.mod h1:0vynPfW2ZN7DltpcCFgCmTtWMQkCjp2a3TNt82YTCLQ= -go.opentelemetry.io/collector/semconv v0.64.2-0.20221115155901-1550938c18fd h1:rMqcl2pwi8YtVrtOPK8tVh87W0bFBge4yqB9ypSsAJ4= -go.opentelemetry.io/collector/semconv v0.64.2-0.20221115155901-1550938c18fd/go.mod h1:5o9yhOa+ABt7g2E5JABDxGZ1PQPbtfxrKNbYn+LOTXU= +go.opentelemetry.io/collector v0.64.2-0.20221117234814-4565692c50a7 h1:o/vMr2iyXzaeTb/KAldhMxAvRIfFPwtKfL5cKVKsSlU= +go.opentelemetry.io/collector v0.64.2-0.20221117234814-4565692c50a7/go.mod h1:PO8hayFFYvXDqELbXRVxwawR2HTdjN6mY4Qa3Se9xI8= +go.opentelemetry.io/collector/component v0.0.0-20221117234814-4565692c50a7 h1:q9m1bGHhQFUakQX79lZpLmFSY9VLULNSs2jUG8MdJLA= +go.opentelemetry.io/collector/component v0.0.0-20221117234814-4565692c50a7/go.mod h1:Z7H1Oj826e4dtVxXmT6SiUr6S0EIevUJmkVpfQV+UOk= +go.opentelemetry.io/collector/consumer v0.0.0-20221117234814-4565692c50a7 h1:FTy1JD9EJ7gq9SzlZoi2NkGcZ88+SwdiJav5uRcDEEY= +go.opentelemetry.io/collector/consumer v0.0.0-20221117234814-4565692c50a7/go.mod h1:86Elcw/LLrh90DprArogHMkBX3+UMu3tIgcVWF3mr6o= +go.opentelemetry.io/collector/featuregate v0.0.0-20221117214536-6a117bfc3737 h1:7sXg6M9Fw6rFVlX+iaWOMz6DFXEiroUdQer5kWGixwM= +go.opentelemetry.io/collector/featuregate v0.0.0-20221117214536-6a117bfc3737/go.mod h1:tewuFKJYalWBU0bmNKg++MC1ipINXUr6szYzOw2p1GI= +go.opentelemetry.io/collector/pdata v0.64.2-0.20221117234814-4565692c50a7 h1:IOFqfOu7fFxTgC7pvc2U7dk1/uFjwVQPK+CALiUvacI= +go.opentelemetry.io/collector/pdata v0.64.2-0.20221117234814-4565692c50a7/go.mod h1:0vynPfW2ZN7DltpcCFgCmTtWMQkCjp2a3TNt82YTCLQ= +go.opentelemetry.io/collector/semconv v0.64.2-0.20221117234814-4565692c50a7 h1:cGXAVltDxXw9nj0Vr7vyZZTj0whdyO+GYs+xv0xHJ2A= +go.opentelemetry.io/collector/semconv v0.64.2-0.20221117234814-4565692c50a7/go.mod h1:5o9yhOa+ABt7g2E5JABDxGZ1PQPbtfxrKNbYn+LOTXU= go.opentelemetry.io/otel v1.11.1 h1:4WLLAmcfkmDk2ukNXJyq3/kiz/3UzCaYq6PskJsaou4= go.opentelemetry.io/otel v1.11.1/go.mod h1:1nNhXBbWSD0nsL38H6btgnFN2k4i0sNLHNNMZMSbUGE= go.opentelemetry.io/otel/exporters/prometheus v0.33.0 h1:xXhPj7SLKWU5/Zd4Hxmd+X1C4jdmvc0Xy+kvjFx2z60= diff --git a/receiver/kubeletstatsreceiver/config.go b/receiver/kubeletstatsreceiver/config.go index da58714daf337..abbb566ee660b 100644 --- a/receiver/kubeletstatsreceiver/config.go +++ b/receiver/kubeletstatsreceiver/config.go @@ -56,9 +56,6 @@ type Config struct { } func (cfg *Config) Validate() error { - if err := cfg.ReceiverSettings.Validate(); err != nil { - return err - } if cfg.K8sAPIConfig != nil { if err := cfg.K8sAPIConfig.Validate(); err != nil { return err diff --git a/receiver/kubeletstatsreceiver/config_test.go b/receiver/kubeletstatsreceiver/config_test.go index 0084b114d0a28..7b43f33511033 100644 --- a/receiver/kubeletstatsreceiver/config_test.go +++ b/receiver/kubeletstatsreceiver/config_test.go @@ -197,7 +197,7 @@ func TestLoadConfig(t *testing.T) { require.NoError(t, err) require.NoError(t, component.UnmarshalReceiverConfig(sub, cfg)) - assert.NoError(t, cfg.Validate()) + assert.NoError(t, component.ValidateConfig(cfg)) assert.Equal(t, tt.expected, cfg) }) } diff --git a/receiver/kubeletstatsreceiver/go.mod b/receiver/kubeletstatsreceiver/go.mod index 1ae8fb69544f1..d9c9dda6e7978 100644 --- a/receiver/kubeletstatsreceiver/go.mod +++ b/receiver/kubeletstatsreceiver/go.mod @@ -6,9 +6,11 @@ require ( github.com/open-telemetry/opentelemetry-collector-contrib/internal/k8sconfig v0.64.0 github.com/open-telemetry/opentelemetry-collector-contrib/internal/kubelet v0.64.0 github.com/stretchr/testify v1.8.1 - go.opentelemetry.io/collector v0.64.2-0.20221115155901-1550938c18fd - go.opentelemetry.io/collector/pdata v0.64.2-0.20221115155901-1550938c18fd - go.opentelemetry.io/collector/semconv v0.64.2-0.20221115155901-1550938c18fd + go.opentelemetry.io/collector v0.64.2-0.20221117234814-4565692c50a7 + go.opentelemetry.io/collector/component v0.0.0-20221117234814-4565692c50a7 + go.opentelemetry.io/collector/consumer v0.0.0-20221117234814-4565692c50a7 + go.opentelemetry.io/collector/pdata v0.64.2-0.20221117234814-4565692c50a7 + go.opentelemetry.io/collector/semconv v0.64.2-0.20221117234814-4565692c50a7 go.uber.org/zap v1.23.0 k8s.io/api v0.25.4 k8s.io/apimachinery v0.25.4 @@ -50,6 +52,7 @@ require ( github.com/rogpeppe/go-internal v1.6.1 // indirect github.com/spf13/pflag v1.0.5 // indirect go.opencensus.io v0.24.0 // indirect + go.opentelemetry.io/collector/featuregate v0.0.0-20221117214536-6a117bfc3737 // indirect go.opentelemetry.io/otel v1.11.1 // indirect go.opentelemetry.io/otel/metric v0.33.0 // indirect go.opentelemetry.io/otel/trace v1.11.1 // indirect diff --git a/receiver/kubeletstatsreceiver/go.sum b/receiver/kubeletstatsreceiver/go.sum index 7129a7761a567..cafbae03dcf11 100644 --- a/receiver/kubeletstatsreceiver/go.sum +++ b/receiver/kubeletstatsreceiver/go.sum @@ -444,12 +444,18 @@ go.opencensus.io v0.22.3/go.mod h1:yxeiOL68Rb0Xd1ddK5vPZ/oVn4vY4Ynel7k9FzqtOIw= go.opencensus.io v0.22.4/go.mod h1:yxeiOL68Rb0Xd1ddK5vPZ/oVn4vY4Ynel7k9FzqtOIw= go.opencensus.io v0.24.0 h1:y73uSU6J157QMP2kn2r30vwW1A2W2WFwSCGnAVxeaD0= go.opencensus.io v0.24.0/go.mod h1:vNK8G9p7aAivkbmorf4v+7Hgx+Zs0yY+0fOtgBfjQKo= -go.opentelemetry.io/collector v0.64.2-0.20221115155901-1550938c18fd h1:O+6HhE4Ivg8Jksp3dIXIEC4FIR0Ush4uORvG3UtHZWk= -go.opentelemetry.io/collector v0.64.2-0.20221115155901-1550938c18fd/go.mod h1:mmSrOcwe1vEYmChXUYuF6rzlrUL0rjEiPfa19Xxb41o= -go.opentelemetry.io/collector/pdata v0.64.2-0.20221115155901-1550938c18fd h1:GdVAbRiae5VDZe3Mn3FqzMxO/aI5UbJ4+dcviqClHy8= -go.opentelemetry.io/collector/pdata v0.64.2-0.20221115155901-1550938c18fd/go.mod h1:0vynPfW2ZN7DltpcCFgCmTtWMQkCjp2a3TNt82YTCLQ= -go.opentelemetry.io/collector/semconv v0.64.2-0.20221115155901-1550938c18fd h1:rMqcl2pwi8YtVrtOPK8tVh87W0bFBge4yqB9ypSsAJ4= -go.opentelemetry.io/collector/semconv v0.64.2-0.20221115155901-1550938c18fd/go.mod h1:5o9yhOa+ABt7g2E5JABDxGZ1PQPbtfxrKNbYn+LOTXU= +go.opentelemetry.io/collector v0.64.2-0.20221117234814-4565692c50a7 h1:o/vMr2iyXzaeTb/KAldhMxAvRIfFPwtKfL5cKVKsSlU= +go.opentelemetry.io/collector v0.64.2-0.20221117234814-4565692c50a7/go.mod h1:PO8hayFFYvXDqELbXRVxwawR2HTdjN6mY4Qa3Se9xI8= +go.opentelemetry.io/collector/component v0.0.0-20221117234814-4565692c50a7 h1:q9m1bGHhQFUakQX79lZpLmFSY9VLULNSs2jUG8MdJLA= +go.opentelemetry.io/collector/component v0.0.0-20221117234814-4565692c50a7/go.mod h1:Z7H1Oj826e4dtVxXmT6SiUr6S0EIevUJmkVpfQV+UOk= +go.opentelemetry.io/collector/consumer v0.0.0-20221117234814-4565692c50a7 h1:FTy1JD9EJ7gq9SzlZoi2NkGcZ88+SwdiJav5uRcDEEY= +go.opentelemetry.io/collector/consumer v0.0.0-20221117234814-4565692c50a7/go.mod h1:86Elcw/LLrh90DprArogHMkBX3+UMu3tIgcVWF3mr6o= +go.opentelemetry.io/collector/featuregate v0.0.0-20221117214536-6a117bfc3737 h1:7sXg6M9Fw6rFVlX+iaWOMz6DFXEiroUdQer5kWGixwM= +go.opentelemetry.io/collector/featuregate v0.0.0-20221117214536-6a117bfc3737/go.mod h1:tewuFKJYalWBU0bmNKg++MC1ipINXUr6szYzOw2p1GI= +go.opentelemetry.io/collector/pdata v0.64.2-0.20221117234814-4565692c50a7 h1:IOFqfOu7fFxTgC7pvc2U7dk1/uFjwVQPK+CALiUvacI= +go.opentelemetry.io/collector/pdata v0.64.2-0.20221117234814-4565692c50a7/go.mod h1:0vynPfW2ZN7DltpcCFgCmTtWMQkCjp2a3TNt82YTCLQ= +go.opentelemetry.io/collector/semconv v0.64.2-0.20221117234814-4565692c50a7 h1:cGXAVltDxXw9nj0Vr7vyZZTj0whdyO+GYs+xv0xHJ2A= +go.opentelemetry.io/collector/semconv v0.64.2-0.20221117234814-4565692c50a7/go.mod h1:5o9yhOa+ABt7g2E5JABDxGZ1PQPbtfxrKNbYn+LOTXU= go.opentelemetry.io/otel v1.11.1 h1:4WLLAmcfkmDk2ukNXJyq3/kiz/3UzCaYq6PskJsaou4= go.opentelemetry.io/otel v1.11.1/go.mod h1:1nNhXBbWSD0nsL38H6btgnFN2k4i0sNLHNNMZMSbUGE= go.opentelemetry.io/otel/exporters/prometheus v0.33.0 h1:xXhPj7SLKWU5/Zd4Hxmd+X1C4jdmvc0Xy+kvjFx2z60= diff --git a/receiver/memcachedreceiver/go.mod b/receiver/memcachedreceiver/go.mod index 6925be6af62e1..a1d4a38e1123c 100644 --- a/receiver/memcachedreceiver/go.mod +++ b/receiver/memcachedreceiver/go.mod @@ -7,8 +7,10 @@ require ( github.com/open-telemetry/opentelemetry-collector-contrib/internal/scrapertest v0.64.0 github.com/stretchr/testify v1.8.1 github.com/testcontainers/testcontainers-go v0.15.0 - go.opentelemetry.io/collector v0.64.2-0.20221115155901-1550938c18fd - go.opentelemetry.io/collector/pdata v0.64.2-0.20221115155901-1550938c18fd + go.opentelemetry.io/collector v0.64.2-0.20221117234814-4565692c50a7 + go.opentelemetry.io/collector/component v0.0.0-20221117234814-4565692c50a7 + go.opentelemetry.io/collector/consumer v0.0.0-20221117234814-4565692c50a7 + go.opentelemetry.io/collector/pdata v0.64.2-0.20221117234814-4565692c50a7 go.uber.org/zap v1.23.0 ) @@ -50,6 +52,7 @@ require ( github.com/rogpeppe/go-internal v1.6.1 // indirect github.com/sirupsen/logrus v1.8.1 // indirect go.opencensus.io v0.24.0 // indirect + go.opentelemetry.io/collector/featuregate v0.0.0-20221117214536-6a117bfc3737 // indirect go.opentelemetry.io/otel v1.11.1 // indirect go.opentelemetry.io/otel/metric v0.33.0 // indirect go.opentelemetry.io/otel/trace v1.11.1 // indirect diff --git a/receiver/memcachedreceiver/go.sum b/receiver/memcachedreceiver/go.sum index ebd0639b76889..acd6fdc62b2f3 100644 --- a/receiver/memcachedreceiver/go.sum +++ b/receiver/memcachedreceiver/go.sum @@ -823,10 +823,16 @@ go.opencensus.io v0.22.2/go.mod h1:yxeiOL68Rb0Xd1ddK5vPZ/oVn4vY4Ynel7k9FzqtOIw= go.opencensus.io v0.22.3/go.mod h1:yxeiOL68Rb0Xd1ddK5vPZ/oVn4vY4Ynel7k9FzqtOIw= go.opencensus.io v0.24.0 h1:y73uSU6J157QMP2kn2r30vwW1A2W2WFwSCGnAVxeaD0= go.opencensus.io v0.24.0/go.mod h1:vNK8G9p7aAivkbmorf4v+7Hgx+Zs0yY+0fOtgBfjQKo= -go.opentelemetry.io/collector v0.64.2-0.20221115155901-1550938c18fd h1:O+6HhE4Ivg8Jksp3dIXIEC4FIR0Ush4uORvG3UtHZWk= -go.opentelemetry.io/collector v0.64.2-0.20221115155901-1550938c18fd/go.mod h1:mmSrOcwe1vEYmChXUYuF6rzlrUL0rjEiPfa19Xxb41o= -go.opentelemetry.io/collector/pdata v0.64.2-0.20221115155901-1550938c18fd h1:GdVAbRiae5VDZe3Mn3FqzMxO/aI5UbJ4+dcviqClHy8= -go.opentelemetry.io/collector/pdata v0.64.2-0.20221115155901-1550938c18fd/go.mod h1:0vynPfW2ZN7DltpcCFgCmTtWMQkCjp2a3TNt82YTCLQ= +go.opentelemetry.io/collector v0.64.2-0.20221117234814-4565692c50a7 h1:o/vMr2iyXzaeTb/KAldhMxAvRIfFPwtKfL5cKVKsSlU= +go.opentelemetry.io/collector v0.64.2-0.20221117234814-4565692c50a7/go.mod h1:PO8hayFFYvXDqELbXRVxwawR2HTdjN6mY4Qa3Se9xI8= +go.opentelemetry.io/collector/component v0.0.0-20221117234814-4565692c50a7 h1:q9m1bGHhQFUakQX79lZpLmFSY9VLULNSs2jUG8MdJLA= +go.opentelemetry.io/collector/component v0.0.0-20221117234814-4565692c50a7/go.mod h1:Z7H1Oj826e4dtVxXmT6SiUr6S0EIevUJmkVpfQV+UOk= +go.opentelemetry.io/collector/consumer v0.0.0-20221117234814-4565692c50a7 h1:FTy1JD9EJ7gq9SzlZoi2NkGcZ88+SwdiJav5uRcDEEY= +go.opentelemetry.io/collector/consumer v0.0.0-20221117234814-4565692c50a7/go.mod h1:86Elcw/LLrh90DprArogHMkBX3+UMu3tIgcVWF3mr6o= +go.opentelemetry.io/collector/featuregate v0.0.0-20221117214536-6a117bfc3737 h1:7sXg6M9Fw6rFVlX+iaWOMz6DFXEiroUdQer5kWGixwM= +go.opentelemetry.io/collector/featuregate v0.0.0-20221117214536-6a117bfc3737/go.mod h1:tewuFKJYalWBU0bmNKg++MC1ipINXUr6szYzOw2p1GI= +go.opentelemetry.io/collector/pdata v0.64.2-0.20221117234814-4565692c50a7 h1:IOFqfOu7fFxTgC7pvc2U7dk1/uFjwVQPK+CALiUvacI= +go.opentelemetry.io/collector/pdata v0.64.2-0.20221117234814-4565692c50a7/go.mod h1:0vynPfW2ZN7DltpcCFgCmTtWMQkCjp2a3TNt82YTCLQ= go.opentelemetry.io/otel v1.11.1 h1:4WLLAmcfkmDk2ukNXJyq3/kiz/3UzCaYq6PskJsaou4= go.opentelemetry.io/otel v1.11.1/go.mod h1:1nNhXBbWSD0nsL38H6btgnFN2k4i0sNLHNNMZMSbUGE= go.opentelemetry.io/otel/exporters/prometheus v0.33.0 h1:xXhPj7SLKWU5/Zd4Hxmd+X1C4jdmvc0Xy+kvjFx2z60= diff --git a/receiver/mongodbatlasreceiver/config.go b/receiver/mongodbatlasreceiver/config.go index f8e7c212ca45a..385574c1e2f2b 100644 --- a/receiver/mongodbatlasreceiver/config.go +++ b/receiver/mongodbatlasreceiver/config.go @@ -107,7 +107,6 @@ var ( func (c *Config) Validate() error { var errs error - errs = multierr.Append(errs, c.ScraperControllerSettings.Validate()) errs = multierr.Append(errs, c.Alerts.validate()) errs = multierr.Append(errs, c.Logs.validate()) diff --git a/receiver/mongodbatlasreceiver/go.mod b/receiver/mongodbatlasreceiver/go.mod index a090a46b669f0..e9adb473148f2 100644 --- a/receiver/mongodbatlasreceiver/go.mod +++ b/receiver/mongodbatlasreceiver/go.mod @@ -9,8 +9,10 @@ require ( github.com/open-telemetry/opentelemetry-collector-contrib/pkg/stanza v0.64.0 github.com/stretchr/testify v1.8.1 go.mongodb.org/atlas v0.19.0 - go.opentelemetry.io/collector v0.64.2-0.20221115155901-1550938c18fd - go.opentelemetry.io/collector/pdata v0.64.2-0.20221115155901-1550938c18fd + go.opentelemetry.io/collector v0.64.2-0.20221117234814-4565692c50a7 + go.opentelemetry.io/collector/component v0.0.0-20221117234814-4565692c50a7 + go.opentelemetry.io/collector/consumer v0.0.0-20221117234814-4565692c50a7 + go.opentelemetry.io/collector/pdata v0.64.2-0.20221117234814-4565692c50a7 go.uber.org/multierr v1.8.0 go.uber.org/zap v1.23.0 ) @@ -37,6 +39,7 @@ require ( github.com/pmezard/go-difflib v1.0.0 // indirect github.com/stretchr/objx v0.5.0 // indirect go.opencensus.io v0.24.0 // indirect + go.opentelemetry.io/collector/featuregate v0.0.0-20221117214536-6a117bfc3737 // indirect go.opentelemetry.io/otel v1.11.1 // indirect go.opentelemetry.io/otel/metric v0.33.0 // indirect go.opentelemetry.io/otel/trace v1.11.1 // indirect diff --git a/receiver/mongodbatlasreceiver/go.sum b/receiver/mongodbatlasreceiver/go.sum index bb9a5e413d64b..7729255266c0c 100644 --- a/receiver/mongodbatlasreceiver/go.sum +++ b/receiver/mongodbatlasreceiver/go.sum @@ -315,10 +315,16 @@ go.mongodb.org/atlas v0.19.0 h1:gvezG9d0KsSDaExEdTtcGqZHRvvVazzuEcBUpBXxmlg= go.mongodb.org/atlas v0.19.0/go.mod h1:PFk1IGhiGjFXHGVspOK7i1U2nnPjK8wAjYwQf6FoVf4= go.opencensus.io v0.24.0 h1:y73uSU6J157QMP2kn2r30vwW1A2W2WFwSCGnAVxeaD0= go.opencensus.io v0.24.0/go.mod h1:vNK8G9p7aAivkbmorf4v+7Hgx+Zs0yY+0fOtgBfjQKo= -go.opentelemetry.io/collector v0.64.2-0.20221115155901-1550938c18fd h1:O+6HhE4Ivg8Jksp3dIXIEC4FIR0Ush4uORvG3UtHZWk= -go.opentelemetry.io/collector v0.64.2-0.20221115155901-1550938c18fd/go.mod h1:mmSrOcwe1vEYmChXUYuF6rzlrUL0rjEiPfa19Xxb41o= -go.opentelemetry.io/collector/pdata v0.64.2-0.20221115155901-1550938c18fd h1:GdVAbRiae5VDZe3Mn3FqzMxO/aI5UbJ4+dcviqClHy8= -go.opentelemetry.io/collector/pdata v0.64.2-0.20221115155901-1550938c18fd/go.mod h1:0vynPfW2ZN7DltpcCFgCmTtWMQkCjp2a3TNt82YTCLQ= +go.opentelemetry.io/collector v0.64.2-0.20221117234814-4565692c50a7 h1:o/vMr2iyXzaeTb/KAldhMxAvRIfFPwtKfL5cKVKsSlU= +go.opentelemetry.io/collector v0.64.2-0.20221117234814-4565692c50a7/go.mod h1:PO8hayFFYvXDqELbXRVxwawR2HTdjN6mY4Qa3Se9xI8= +go.opentelemetry.io/collector/component v0.0.0-20221117234814-4565692c50a7 h1:q9m1bGHhQFUakQX79lZpLmFSY9VLULNSs2jUG8MdJLA= +go.opentelemetry.io/collector/component v0.0.0-20221117234814-4565692c50a7/go.mod h1:Z7H1Oj826e4dtVxXmT6SiUr6S0EIevUJmkVpfQV+UOk= +go.opentelemetry.io/collector/consumer v0.0.0-20221117234814-4565692c50a7 h1:FTy1JD9EJ7gq9SzlZoi2NkGcZ88+SwdiJav5uRcDEEY= +go.opentelemetry.io/collector/consumer v0.0.0-20221117234814-4565692c50a7/go.mod h1:86Elcw/LLrh90DprArogHMkBX3+UMu3tIgcVWF3mr6o= +go.opentelemetry.io/collector/featuregate v0.0.0-20221117214536-6a117bfc3737 h1:7sXg6M9Fw6rFVlX+iaWOMz6DFXEiroUdQer5kWGixwM= +go.opentelemetry.io/collector/featuregate v0.0.0-20221117214536-6a117bfc3737/go.mod h1:tewuFKJYalWBU0bmNKg++MC1ipINXUr6szYzOw2p1GI= +go.opentelemetry.io/collector/pdata v0.64.2-0.20221117234814-4565692c50a7 h1:IOFqfOu7fFxTgC7pvc2U7dk1/uFjwVQPK+CALiUvacI= +go.opentelemetry.io/collector/pdata v0.64.2-0.20221117234814-4565692c50a7/go.mod h1:0vynPfW2ZN7DltpcCFgCmTtWMQkCjp2a3TNt82YTCLQ= go.opentelemetry.io/otel v1.11.1 h1:4WLLAmcfkmDk2ukNXJyq3/kiz/3UzCaYq6PskJsaou4= go.opentelemetry.io/otel v1.11.1/go.mod h1:1nNhXBbWSD0nsL38H6btgnFN2k4i0sNLHNNMZMSbUGE= go.opentelemetry.io/otel/exporters/prometheus v0.33.0 h1:xXhPj7SLKWU5/Zd4Hxmd+X1C4jdmvc0Xy+kvjFx2z60= diff --git a/receiver/mongodbreceiver/config_test.go b/receiver/mongodbreceiver/config_test.go index 18aadffbd4adf..c8dee7fb69ed2 100644 --- a/receiver/mongodbreceiver/config_test.go +++ b/receiver/mongodbreceiver/config_test.go @@ -91,12 +91,12 @@ func TestValidate(t *testing.T) { }) } - cfg := Config{ + cfg := &Config{ Username: tc.username, Password: tc.password, Hosts: hosts, } - err := cfg.Validate() + err := component.ValidateConfig(cfg) if tc.expected == nil { require.Nil(t, err) } else { @@ -137,7 +137,7 @@ func TestBadTLSConfigs(t *testing.T) { } for _, tc := range testCases { t.Run(tc.desc, func(t *testing.T) { - cfg := Config{ + cfg := &Config{ Username: "otel", Password: "pword", Hosts: []confignet.NetAddr{ @@ -147,7 +147,7 @@ func TestBadTLSConfigs(t *testing.T) { }, TLSClientSetting: tc.tlsConfig, } - err := cfg.Validate() + err := component.ValidateConfig(cfg) if tc.expectError { require.Error(t, err) } else { diff --git a/receiver/mongodbreceiver/factory_test.go b/receiver/mongodbreceiver/factory_test.go index 76739b3021acc..9633dbf3ce356 100644 --- a/receiver/mongodbreceiver/factory_test.go +++ b/receiver/mongodbreceiver/factory_test.go @@ -20,6 +20,7 @@ import ( "time" "github.com/stretchr/testify/require" + "go.opentelemetry.io/collector/component" "go.opentelemetry.io/collector/component/componenttest" "go.opentelemetry.io/collector/consumer/consumertest" "go.opentelemetry.io/collector/receiver/scraperhelper" @@ -33,8 +34,7 @@ func TestType(t *testing.T) { func TestValidConfig(t *testing.T) { factory := NewFactory() - err := factory.CreateDefaultConfig().Validate() - require.NoError(t, err) + require.NoError(t, component.ValidateConfig(factory.CreateDefaultConfig())) } func TestCreateMetricsReceiver(t *testing.T) { diff --git a/receiver/mongodbreceiver/go.mod b/receiver/mongodbreceiver/go.mod index eacc0cea2eed8..c717b717f5b5d 100644 --- a/receiver/mongodbreceiver/go.mod +++ b/receiver/mongodbreceiver/go.mod @@ -8,8 +8,10 @@ require ( github.com/stretchr/testify v1.8.1 github.com/testcontainers/testcontainers-go v0.15.0 go.mongodb.org/mongo-driver v1.10.3 - go.opentelemetry.io/collector v0.64.2-0.20221115155901-1550938c18fd - go.opentelemetry.io/collector/pdata v0.64.2-0.20221115155901-1550938c18fd + go.opentelemetry.io/collector v0.64.2-0.20221117234814-4565692c50a7 + go.opentelemetry.io/collector/component v0.0.0-20221117234814-4565692c50a7 + go.opentelemetry.io/collector/consumer v0.0.0-20221117234814-4565692c50a7 + go.opentelemetry.io/collector/pdata v0.64.2-0.20221117234814-4565692c50a7 go.uber.org/multierr v1.8.0 go.uber.org/zap v1.23.0 ) @@ -59,6 +61,7 @@ require ( github.com/xdg-go/stringprep v1.0.3 // indirect github.com/youmark/pkcs8 v0.0.0-20181117223130-1be2e3e5546d // indirect go.opencensus.io v0.24.0 // indirect + go.opentelemetry.io/collector/featuregate v0.0.0-20221117214536-6a117bfc3737 // indirect go.opentelemetry.io/otel v1.11.1 // indirect go.opentelemetry.io/otel/metric v0.33.0 // indirect go.opentelemetry.io/otel/trace v1.11.1 // indirect diff --git a/receiver/mongodbreceiver/go.sum b/receiver/mongodbreceiver/go.sum index f8bb974bba77b..8637b71d484c8 100644 --- a/receiver/mongodbreceiver/go.sum +++ b/receiver/mongodbreceiver/go.sum @@ -840,10 +840,16 @@ go.opencensus.io v0.22.2/go.mod h1:yxeiOL68Rb0Xd1ddK5vPZ/oVn4vY4Ynel7k9FzqtOIw= go.opencensus.io v0.22.3/go.mod h1:yxeiOL68Rb0Xd1ddK5vPZ/oVn4vY4Ynel7k9FzqtOIw= go.opencensus.io v0.24.0 h1:y73uSU6J157QMP2kn2r30vwW1A2W2WFwSCGnAVxeaD0= go.opencensus.io v0.24.0/go.mod h1:vNK8G9p7aAivkbmorf4v+7Hgx+Zs0yY+0fOtgBfjQKo= -go.opentelemetry.io/collector v0.64.2-0.20221115155901-1550938c18fd h1:O+6HhE4Ivg8Jksp3dIXIEC4FIR0Ush4uORvG3UtHZWk= -go.opentelemetry.io/collector v0.64.2-0.20221115155901-1550938c18fd/go.mod h1:mmSrOcwe1vEYmChXUYuF6rzlrUL0rjEiPfa19Xxb41o= -go.opentelemetry.io/collector/pdata v0.64.2-0.20221115155901-1550938c18fd h1:GdVAbRiae5VDZe3Mn3FqzMxO/aI5UbJ4+dcviqClHy8= -go.opentelemetry.io/collector/pdata v0.64.2-0.20221115155901-1550938c18fd/go.mod h1:0vynPfW2ZN7DltpcCFgCmTtWMQkCjp2a3TNt82YTCLQ= +go.opentelemetry.io/collector v0.64.2-0.20221117234814-4565692c50a7 h1:o/vMr2iyXzaeTb/KAldhMxAvRIfFPwtKfL5cKVKsSlU= +go.opentelemetry.io/collector v0.64.2-0.20221117234814-4565692c50a7/go.mod h1:PO8hayFFYvXDqELbXRVxwawR2HTdjN6mY4Qa3Se9xI8= +go.opentelemetry.io/collector/component v0.0.0-20221117234814-4565692c50a7 h1:q9m1bGHhQFUakQX79lZpLmFSY9VLULNSs2jUG8MdJLA= +go.opentelemetry.io/collector/component v0.0.0-20221117234814-4565692c50a7/go.mod h1:Z7H1Oj826e4dtVxXmT6SiUr6S0EIevUJmkVpfQV+UOk= +go.opentelemetry.io/collector/consumer v0.0.0-20221117234814-4565692c50a7 h1:FTy1JD9EJ7gq9SzlZoi2NkGcZ88+SwdiJav5uRcDEEY= +go.opentelemetry.io/collector/consumer v0.0.0-20221117234814-4565692c50a7/go.mod h1:86Elcw/LLrh90DprArogHMkBX3+UMu3tIgcVWF3mr6o= +go.opentelemetry.io/collector/featuregate v0.0.0-20221117214536-6a117bfc3737 h1:7sXg6M9Fw6rFVlX+iaWOMz6DFXEiroUdQer5kWGixwM= +go.opentelemetry.io/collector/featuregate v0.0.0-20221117214536-6a117bfc3737/go.mod h1:tewuFKJYalWBU0bmNKg++MC1ipINXUr6szYzOw2p1GI= +go.opentelemetry.io/collector/pdata v0.64.2-0.20221117234814-4565692c50a7 h1:IOFqfOu7fFxTgC7pvc2U7dk1/uFjwVQPK+CALiUvacI= +go.opentelemetry.io/collector/pdata v0.64.2-0.20221117234814-4565692c50a7/go.mod h1:0vynPfW2ZN7DltpcCFgCmTtWMQkCjp2a3TNt82YTCLQ= go.opentelemetry.io/otel v1.11.1 h1:4WLLAmcfkmDk2ukNXJyq3/kiz/3UzCaYq6PskJsaou4= go.opentelemetry.io/otel v1.11.1/go.mod h1:1nNhXBbWSD0nsL38H6btgnFN2k4i0sNLHNNMZMSbUGE= go.opentelemetry.io/otel/exporters/prometheus v0.33.0 h1:xXhPj7SLKWU5/Zd4Hxmd+X1C4jdmvc0Xy+kvjFx2z60= diff --git a/receiver/mysqlreceiver/factory_test.go b/receiver/mysqlreceiver/factory_test.go index 90cf6138b81ac..8e0e357acc01b 100644 --- a/receiver/mysqlreceiver/factory_test.go +++ b/receiver/mysqlreceiver/factory_test.go @@ -40,7 +40,7 @@ func TestValidConfig(t *testing.T) { cfg.Username = "otel" cfg.Password = "otel" cfg.Endpoint = "localhost:3306" - require.NoError(t, cfg.Validate()) + require.NoError(t, component.ValidateConfig(cfg)) } func TestCreateMetricsReceiver(t *testing.T) { diff --git a/receiver/mysqlreceiver/go.mod b/receiver/mysqlreceiver/go.mod index e395038c11676..0cbf1afaab284 100644 --- a/receiver/mysqlreceiver/go.mod +++ b/receiver/mysqlreceiver/go.mod @@ -7,8 +7,10 @@ require ( github.com/open-telemetry/opentelemetry-collector-contrib/internal/scrapertest v0.64.0 github.com/stretchr/testify v1.8.1 github.com/testcontainers/testcontainers-go v0.15.0 - go.opentelemetry.io/collector v0.64.2-0.20221115155901-1550938c18fd - go.opentelemetry.io/collector/pdata v0.64.2-0.20221115155901-1550938c18fd + go.opentelemetry.io/collector v0.64.2-0.20221117234814-4565692c50a7 + go.opentelemetry.io/collector/component v0.0.0-20221117234814-4565692c50a7 + go.opentelemetry.io/collector/consumer v0.0.0-20221117234814-4565692c50a7 + go.opentelemetry.io/collector/pdata v0.64.2-0.20221117234814-4565692c50a7 go.uber.org/zap v1.23.0 ) @@ -48,6 +50,7 @@ require ( github.com/pmezard/go-difflib v1.0.0 // indirect github.com/sirupsen/logrus v1.8.1 // indirect go.opencensus.io v0.24.0 // indirect + go.opentelemetry.io/collector/featuregate v0.0.0-20221117214536-6a117bfc3737 // indirect go.opentelemetry.io/otel v1.11.1 // indirect go.opentelemetry.io/otel/metric v0.33.0 // indirect go.opentelemetry.io/otel/trace v1.11.1 // indirect diff --git a/receiver/mysqlreceiver/go.sum b/receiver/mysqlreceiver/go.sum index 23c1ca32ee233..ea107c478580d 100644 --- a/receiver/mysqlreceiver/go.sum +++ b/receiver/mysqlreceiver/go.sum @@ -818,10 +818,16 @@ go.opencensus.io v0.22.2/go.mod h1:yxeiOL68Rb0Xd1ddK5vPZ/oVn4vY4Ynel7k9FzqtOIw= go.opencensus.io v0.22.3/go.mod h1:yxeiOL68Rb0Xd1ddK5vPZ/oVn4vY4Ynel7k9FzqtOIw= go.opencensus.io v0.24.0 h1:y73uSU6J157QMP2kn2r30vwW1A2W2WFwSCGnAVxeaD0= go.opencensus.io v0.24.0/go.mod h1:vNK8G9p7aAivkbmorf4v+7Hgx+Zs0yY+0fOtgBfjQKo= -go.opentelemetry.io/collector v0.64.2-0.20221115155901-1550938c18fd h1:O+6HhE4Ivg8Jksp3dIXIEC4FIR0Ush4uORvG3UtHZWk= -go.opentelemetry.io/collector v0.64.2-0.20221115155901-1550938c18fd/go.mod h1:mmSrOcwe1vEYmChXUYuF6rzlrUL0rjEiPfa19Xxb41o= -go.opentelemetry.io/collector/pdata v0.64.2-0.20221115155901-1550938c18fd h1:GdVAbRiae5VDZe3Mn3FqzMxO/aI5UbJ4+dcviqClHy8= -go.opentelemetry.io/collector/pdata v0.64.2-0.20221115155901-1550938c18fd/go.mod h1:0vynPfW2ZN7DltpcCFgCmTtWMQkCjp2a3TNt82YTCLQ= +go.opentelemetry.io/collector v0.64.2-0.20221117234814-4565692c50a7 h1:o/vMr2iyXzaeTb/KAldhMxAvRIfFPwtKfL5cKVKsSlU= +go.opentelemetry.io/collector v0.64.2-0.20221117234814-4565692c50a7/go.mod h1:PO8hayFFYvXDqELbXRVxwawR2HTdjN6mY4Qa3Se9xI8= +go.opentelemetry.io/collector/component v0.0.0-20221117234814-4565692c50a7 h1:q9m1bGHhQFUakQX79lZpLmFSY9VLULNSs2jUG8MdJLA= +go.opentelemetry.io/collector/component v0.0.0-20221117234814-4565692c50a7/go.mod h1:Z7H1Oj826e4dtVxXmT6SiUr6S0EIevUJmkVpfQV+UOk= +go.opentelemetry.io/collector/consumer v0.0.0-20221117234814-4565692c50a7 h1:FTy1JD9EJ7gq9SzlZoi2NkGcZ88+SwdiJav5uRcDEEY= +go.opentelemetry.io/collector/consumer v0.0.0-20221117234814-4565692c50a7/go.mod h1:86Elcw/LLrh90DprArogHMkBX3+UMu3tIgcVWF3mr6o= +go.opentelemetry.io/collector/featuregate v0.0.0-20221117214536-6a117bfc3737 h1:7sXg6M9Fw6rFVlX+iaWOMz6DFXEiroUdQer5kWGixwM= +go.opentelemetry.io/collector/featuregate v0.0.0-20221117214536-6a117bfc3737/go.mod h1:tewuFKJYalWBU0bmNKg++MC1ipINXUr6szYzOw2p1GI= +go.opentelemetry.io/collector/pdata v0.64.2-0.20221117234814-4565692c50a7 h1:IOFqfOu7fFxTgC7pvc2U7dk1/uFjwVQPK+CALiUvacI= +go.opentelemetry.io/collector/pdata v0.64.2-0.20221117234814-4565692c50a7/go.mod h1:0vynPfW2ZN7DltpcCFgCmTtWMQkCjp2a3TNt82YTCLQ= go.opentelemetry.io/otel v1.11.1 h1:4WLLAmcfkmDk2ukNXJyq3/kiz/3UzCaYq6PskJsaou4= go.opentelemetry.io/otel v1.11.1/go.mod h1:1nNhXBbWSD0nsL38H6btgnFN2k4i0sNLHNNMZMSbUGE= go.opentelemetry.io/otel/exporters/prometheus v0.33.0 h1:xXhPj7SLKWU5/Zd4Hxmd+X1C4jdmvc0Xy+kvjFx2z60= diff --git a/receiver/nginxreceiver/go.mod b/receiver/nginxreceiver/go.mod index 7e06a4a4488ee..6b1b34f63f1cc 100644 --- a/receiver/nginxreceiver/go.mod +++ b/receiver/nginxreceiver/go.mod @@ -7,8 +7,10 @@ require ( github.com/open-telemetry/opentelemetry-collector-contrib/internal/scrapertest v0.64.0 github.com/stretchr/testify v1.8.1 github.com/testcontainers/testcontainers-go v0.15.0 - go.opentelemetry.io/collector v0.64.2-0.20221115155901-1550938c18fd - go.opentelemetry.io/collector/pdata v0.64.2-0.20221115155901-1550938c18fd + go.opentelemetry.io/collector v0.64.2-0.20221117234814-4565692c50a7 + go.opentelemetry.io/collector/component v0.0.0-20221117234814-4565692c50a7 + go.opentelemetry.io/collector/consumer v0.0.0-20221117234814-4565692c50a7 + go.opentelemetry.io/collector/pdata v0.64.2-0.20221117234814-4565692c50a7 go.uber.org/zap v1.23.0 ) @@ -54,6 +56,7 @@ require ( github.com/rs/cors v1.8.2 // indirect github.com/sirupsen/logrus v1.8.1 // indirect go.opencensus.io v0.24.0 // indirect + go.opentelemetry.io/collector/featuregate v0.0.0-20221117214536-6a117bfc3737 // indirect go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.36.4 // indirect go.opentelemetry.io/otel v1.11.1 // indirect go.opentelemetry.io/otel/metric v0.33.0 // indirect diff --git a/receiver/nginxreceiver/go.sum b/receiver/nginxreceiver/go.sum index d49aac779da57..ea85bd0002cdb 100644 --- a/receiver/nginxreceiver/go.sum +++ b/receiver/nginxreceiver/go.sum @@ -835,10 +835,16 @@ go.opencensus.io v0.22.2/go.mod h1:yxeiOL68Rb0Xd1ddK5vPZ/oVn4vY4Ynel7k9FzqtOIw= go.opencensus.io v0.22.3/go.mod h1:yxeiOL68Rb0Xd1ddK5vPZ/oVn4vY4Ynel7k9FzqtOIw= go.opencensus.io v0.24.0 h1:y73uSU6J157QMP2kn2r30vwW1A2W2WFwSCGnAVxeaD0= go.opencensus.io v0.24.0/go.mod h1:vNK8G9p7aAivkbmorf4v+7Hgx+Zs0yY+0fOtgBfjQKo= -go.opentelemetry.io/collector v0.64.2-0.20221115155901-1550938c18fd h1:O+6HhE4Ivg8Jksp3dIXIEC4FIR0Ush4uORvG3UtHZWk= -go.opentelemetry.io/collector v0.64.2-0.20221115155901-1550938c18fd/go.mod h1:mmSrOcwe1vEYmChXUYuF6rzlrUL0rjEiPfa19Xxb41o= -go.opentelemetry.io/collector/pdata v0.64.2-0.20221115155901-1550938c18fd h1:GdVAbRiae5VDZe3Mn3FqzMxO/aI5UbJ4+dcviqClHy8= -go.opentelemetry.io/collector/pdata v0.64.2-0.20221115155901-1550938c18fd/go.mod h1:0vynPfW2ZN7DltpcCFgCmTtWMQkCjp2a3TNt82YTCLQ= +go.opentelemetry.io/collector v0.64.2-0.20221117234814-4565692c50a7 h1:o/vMr2iyXzaeTb/KAldhMxAvRIfFPwtKfL5cKVKsSlU= +go.opentelemetry.io/collector v0.64.2-0.20221117234814-4565692c50a7/go.mod h1:PO8hayFFYvXDqELbXRVxwawR2HTdjN6mY4Qa3Se9xI8= +go.opentelemetry.io/collector/component v0.0.0-20221117234814-4565692c50a7 h1:q9m1bGHhQFUakQX79lZpLmFSY9VLULNSs2jUG8MdJLA= +go.opentelemetry.io/collector/component v0.0.0-20221117234814-4565692c50a7/go.mod h1:Z7H1Oj826e4dtVxXmT6SiUr6S0EIevUJmkVpfQV+UOk= +go.opentelemetry.io/collector/consumer v0.0.0-20221117234814-4565692c50a7 h1:FTy1JD9EJ7gq9SzlZoi2NkGcZ88+SwdiJav5uRcDEEY= +go.opentelemetry.io/collector/consumer v0.0.0-20221117234814-4565692c50a7/go.mod h1:86Elcw/LLrh90DprArogHMkBX3+UMu3tIgcVWF3mr6o= +go.opentelemetry.io/collector/featuregate v0.0.0-20221117214536-6a117bfc3737 h1:7sXg6M9Fw6rFVlX+iaWOMz6DFXEiroUdQer5kWGixwM= +go.opentelemetry.io/collector/featuregate v0.0.0-20221117214536-6a117bfc3737/go.mod h1:tewuFKJYalWBU0bmNKg++MC1ipINXUr6szYzOw2p1GI= +go.opentelemetry.io/collector/pdata v0.64.2-0.20221117234814-4565692c50a7 h1:IOFqfOu7fFxTgC7pvc2U7dk1/uFjwVQPK+CALiUvacI= +go.opentelemetry.io/collector/pdata v0.64.2-0.20221117234814-4565692c50a7/go.mod h1:0vynPfW2ZN7DltpcCFgCmTtWMQkCjp2a3TNt82YTCLQ= go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.36.4 h1:aUEBEdCa6iamGzg6fuYxDA8ThxvOG240mAvWDU+XLio= go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.36.4/go.mod h1:l2MdsbKTocpPS5nQZscqTR9jd8u96VYZdcpF8Sye7mA= go.opentelemetry.io/otel v1.11.1 h1:4WLLAmcfkmDk2ukNXJyq3/kiz/3UzCaYq6PskJsaou4= diff --git a/receiver/nginxreceiver/scraper_test.go b/receiver/nginxreceiver/scraper_test.go index 41b2f43ff9ff9..3a30e851d40cb 100644 --- a/receiver/nginxreceiver/scraper_test.go +++ b/receiver/nginxreceiver/scraper_test.go @@ -23,6 +23,7 @@ import ( "testing" "github.com/stretchr/testify/require" + "go.opentelemetry.io/collector/component" "go.opentelemetry.io/collector/component/componenttest" "go.opentelemetry.io/collector/config/confighttp" "go.opentelemetry.io/collector/config/configtls" @@ -35,7 +36,7 @@ func TestScraper(t *testing.T) { nginxMock := newMockServer(t) cfg := createDefaultConfig().(*Config) cfg.Endpoint = nginxMock.URL + "/status" - require.NoError(t, cfg.Validate()) + require.NoError(t, component.ValidateConfig(cfg)) scraper := newNginxScraper(componenttest.NewNopReceiverCreateSettings(), cfg) diff --git a/receiver/nsxtreceiver/factory_test.go b/receiver/nsxtreceiver/factory_test.go index cfca9c5a9f69e..9930db0db4087 100644 --- a/receiver/nsxtreceiver/factory_test.go +++ b/receiver/nsxtreceiver/factory_test.go @@ -20,6 +20,7 @@ import ( "time" "github.com/stretchr/testify/require" + "go.opentelemetry.io/collector/component" "go.opentelemetry.io/collector/component/componenttest" "go.opentelemetry.io/collector/consumer/consumertest" "go.opentelemetry.io/collector/receiver/scraperhelper" @@ -33,7 +34,7 @@ func TestType(t *testing.T) { func TestDefaultConfig(t *testing.T) { factory := NewFactory() - err := factory.CreateDefaultConfig().Validate() + err := component.ValidateConfig(factory.CreateDefaultConfig()) // default does not endpoint require.ErrorContains(t, err, "no manager endpoint was specified") } diff --git a/receiver/nsxtreceiver/go.mod b/receiver/nsxtreceiver/go.mod index 97f15b9ff4a8d..1e795b4508b8b 100644 --- a/receiver/nsxtreceiver/go.mod +++ b/receiver/nsxtreceiver/go.mod @@ -6,8 +6,10 @@ require ( github.com/open-telemetry/opentelemetry-collector-contrib/internal/scrapertest v0.64.0 github.com/stretchr/testify v1.8.1 github.com/vmware/go-vmware-nsxt v0.0.0-20220328155605-f49a14c1ef5f - go.opentelemetry.io/collector v0.64.2-0.20221115155901-1550938c18fd - go.opentelemetry.io/collector/pdata v0.64.2-0.20221115155901-1550938c18fd + go.opentelemetry.io/collector v0.64.2-0.20221117234814-4565692c50a7 + go.opentelemetry.io/collector/component v0.0.0-20221117234814-4565692c50a7 + go.opentelemetry.io/collector/consumer v0.0.0-20221117234814-4565692c50a7 + go.opentelemetry.io/collector/pdata v0.64.2-0.20221117234814-4565692c50a7 go.uber.org/multierr v1.8.0 go.uber.org/zap v1.23.0 ) @@ -33,6 +35,7 @@ require ( github.com/rs/cors v1.8.2 // indirect github.com/stretchr/objx v0.5.0 // indirect go.opencensus.io v0.24.0 // indirect + go.opentelemetry.io/collector/featuregate v0.0.0-20221117214536-6a117bfc3737 // indirect go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.36.4 // indirect go.opentelemetry.io/otel v1.11.1 // indirect go.opentelemetry.io/otel/metric v0.33.0 // indirect diff --git a/receiver/nsxtreceiver/go.sum b/receiver/nsxtreceiver/go.sum index 99fc19ebe34c1..82a3b3e0c9560 100644 --- a/receiver/nsxtreceiver/go.sum +++ b/receiver/nsxtreceiver/go.sum @@ -293,10 +293,16 @@ go.etcd.io/etcd/client/pkg/v3 v3.5.4/go.mod h1:IJHfcCEKxYu1Os13ZdwCwIUTUVGYTSAM3 go.etcd.io/etcd/client/v3 v3.5.4/go.mod h1:ZaRkVgBZC+L+dLCjTcF1hRXpgZXQPOvnA/Ak/gq3kiY= go.opencensus.io v0.24.0 h1:y73uSU6J157QMP2kn2r30vwW1A2W2WFwSCGnAVxeaD0= go.opencensus.io v0.24.0/go.mod h1:vNK8G9p7aAivkbmorf4v+7Hgx+Zs0yY+0fOtgBfjQKo= -go.opentelemetry.io/collector v0.64.2-0.20221115155901-1550938c18fd h1:O+6HhE4Ivg8Jksp3dIXIEC4FIR0Ush4uORvG3UtHZWk= -go.opentelemetry.io/collector v0.64.2-0.20221115155901-1550938c18fd/go.mod h1:mmSrOcwe1vEYmChXUYuF6rzlrUL0rjEiPfa19Xxb41o= -go.opentelemetry.io/collector/pdata v0.64.2-0.20221115155901-1550938c18fd h1:GdVAbRiae5VDZe3Mn3FqzMxO/aI5UbJ4+dcviqClHy8= -go.opentelemetry.io/collector/pdata v0.64.2-0.20221115155901-1550938c18fd/go.mod h1:0vynPfW2ZN7DltpcCFgCmTtWMQkCjp2a3TNt82YTCLQ= +go.opentelemetry.io/collector v0.64.2-0.20221117234814-4565692c50a7 h1:o/vMr2iyXzaeTb/KAldhMxAvRIfFPwtKfL5cKVKsSlU= +go.opentelemetry.io/collector v0.64.2-0.20221117234814-4565692c50a7/go.mod h1:PO8hayFFYvXDqELbXRVxwawR2HTdjN6mY4Qa3Se9xI8= +go.opentelemetry.io/collector/component v0.0.0-20221117234814-4565692c50a7 h1:q9m1bGHhQFUakQX79lZpLmFSY9VLULNSs2jUG8MdJLA= +go.opentelemetry.io/collector/component v0.0.0-20221117234814-4565692c50a7/go.mod h1:Z7H1Oj826e4dtVxXmT6SiUr6S0EIevUJmkVpfQV+UOk= +go.opentelemetry.io/collector/consumer v0.0.0-20221117234814-4565692c50a7 h1:FTy1JD9EJ7gq9SzlZoi2NkGcZ88+SwdiJav5uRcDEEY= +go.opentelemetry.io/collector/consumer v0.0.0-20221117234814-4565692c50a7/go.mod h1:86Elcw/LLrh90DprArogHMkBX3+UMu3tIgcVWF3mr6o= +go.opentelemetry.io/collector/featuregate v0.0.0-20221117214536-6a117bfc3737 h1:7sXg6M9Fw6rFVlX+iaWOMz6DFXEiroUdQer5kWGixwM= +go.opentelemetry.io/collector/featuregate v0.0.0-20221117214536-6a117bfc3737/go.mod h1:tewuFKJYalWBU0bmNKg++MC1ipINXUr6szYzOw2p1GI= +go.opentelemetry.io/collector/pdata v0.64.2-0.20221117234814-4565692c50a7 h1:IOFqfOu7fFxTgC7pvc2U7dk1/uFjwVQPK+CALiUvacI= +go.opentelemetry.io/collector/pdata v0.64.2-0.20221117234814-4565692c50a7/go.mod h1:0vynPfW2ZN7DltpcCFgCmTtWMQkCjp2a3TNt82YTCLQ= go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.36.4 h1:aUEBEdCa6iamGzg6fuYxDA8ThxvOG240mAvWDU+XLio= go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.36.4/go.mod h1:l2MdsbKTocpPS5nQZscqTR9jd8u96VYZdcpF8Sye7mA= go.opentelemetry.io/otel v1.11.1 h1:4WLLAmcfkmDk2ukNXJyq3/kiz/3UzCaYq6PskJsaou4= diff --git a/receiver/opencensusreceiver/config_test.go b/receiver/opencensusreceiver/config_test.go index 43d8f3fc7455b..30f352d4580aa 100644 --- a/receiver/opencensusreceiver/config_test.go +++ b/receiver/opencensusreceiver/config_test.go @@ -156,7 +156,7 @@ func TestLoadConfig(t *testing.T) { require.NoError(t, err) require.NoError(t, component.UnmarshalReceiverConfig(sub, cfg)) - assert.NoError(t, cfg.Validate()) + assert.NoError(t, component.ValidateConfig(cfg)) assert.Equal(t, tt.expected, cfg) }) } diff --git a/receiver/opencensusreceiver/go.mod b/receiver/opencensusreceiver/go.mod index f4cd1f538e6aa..0b099d37d23d5 100644 --- a/receiver/opencensusreceiver/go.mod +++ b/receiver/opencensusreceiver/go.mod @@ -12,8 +12,10 @@ require ( github.com/rs/cors v1.8.2 github.com/soheilhy/cmux v0.1.5 github.com/stretchr/testify v1.8.1 - go.opentelemetry.io/collector v0.64.2-0.20221115155901-1550938c18fd - go.opentelemetry.io/collector/pdata v0.64.2-0.20221115155901-1550938c18fd + go.opentelemetry.io/collector v0.64.2-0.20221117234814-4565692c50a7 + go.opentelemetry.io/collector/component v0.0.0-20221117234814-4565692c50a7 + go.opentelemetry.io/collector/consumer v0.0.0-20221117234814-4565692c50a7 + go.opentelemetry.io/collector/pdata v0.64.2-0.20221117234814-4565692c50a7 go.opentelemetry.io/contrib/instrumentation/google.golang.org/grpc/otelgrpc v0.36.4 go.opentelemetry.io/otel v1.11.1 go.opentelemetry.io/otel/sdk v1.11.1 @@ -53,7 +55,8 @@ require ( github.com/prometheus/procfs v0.8.0 // indirect github.com/prometheus/statsd_exporter v0.22.7 // indirect go.opencensus.io v0.24.0 // indirect - go.opentelemetry.io/collector/semconv v0.64.2-0.20221115155901-1550938c18fd // indirect + go.opentelemetry.io/collector/featuregate v0.0.0-20221117214536-6a117bfc3737 // indirect + go.opentelemetry.io/collector/semconv v0.64.2-0.20221117234814-4565692c50a7 // indirect go.opentelemetry.io/otel/exporters/prometheus v0.33.0 // indirect go.opentelemetry.io/otel/metric v0.33.0 // indirect go.opentelemetry.io/otel/sdk/metric v0.33.0 // indirect diff --git a/receiver/opencensusreceiver/go.sum b/receiver/opencensusreceiver/go.sum index fd773d90f9653..e29b39ee48b63 100644 --- a/receiver/opencensusreceiver/go.sum +++ b/receiver/opencensusreceiver/go.sum @@ -400,12 +400,18 @@ go.opencensus.io v0.22.4/go.mod h1:yxeiOL68Rb0Xd1ddK5vPZ/oVn4vY4Ynel7k9FzqtOIw= go.opencensus.io v0.23.0/go.mod h1:XItmlyltB5F7CS4xOC1DcqMoFqwtC6OG2xF7mCv7P7E= go.opencensus.io v0.24.0 h1:y73uSU6J157QMP2kn2r30vwW1A2W2WFwSCGnAVxeaD0= go.opencensus.io v0.24.0/go.mod h1:vNK8G9p7aAivkbmorf4v+7Hgx+Zs0yY+0fOtgBfjQKo= -go.opentelemetry.io/collector v0.64.2-0.20221115155901-1550938c18fd h1:O+6HhE4Ivg8Jksp3dIXIEC4FIR0Ush4uORvG3UtHZWk= -go.opentelemetry.io/collector v0.64.2-0.20221115155901-1550938c18fd/go.mod h1:mmSrOcwe1vEYmChXUYuF6rzlrUL0rjEiPfa19Xxb41o= -go.opentelemetry.io/collector/pdata v0.64.2-0.20221115155901-1550938c18fd h1:GdVAbRiae5VDZe3Mn3FqzMxO/aI5UbJ4+dcviqClHy8= -go.opentelemetry.io/collector/pdata v0.64.2-0.20221115155901-1550938c18fd/go.mod h1:0vynPfW2ZN7DltpcCFgCmTtWMQkCjp2a3TNt82YTCLQ= -go.opentelemetry.io/collector/semconv v0.64.2-0.20221115155901-1550938c18fd h1:rMqcl2pwi8YtVrtOPK8tVh87W0bFBge4yqB9ypSsAJ4= -go.opentelemetry.io/collector/semconv v0.64.2-0.20221115155901-1550938c18fd/go.mod h1:5o9yhOa+ABt7g2E5JABDxGZ1PQPbtfxrKNbYn+LOTXU= +go.opentelemetry.io/collector v0.64.2-0.20221117234814-4565692c50a7 h1:o/vMr2iyXzaeTb/KAldhMxAvRIfFPwtKfL5cKVKsSlU= +go.opentelemetry.io/collector v0.64.2-0.20221117234814-4565692c50a7/go.mod h1:PO8hayFFYvXDqELbXRVxwawR2HTdjN6mY4Qa3Se9xI8= +go.opentelemetry.io/collector/component v0.0.0-20221117234814-4565692c50a7 h1:q9m1bGHhQFUakQX79lZpLmFSY9VLULNSs2jUG8MdJLA= +go.opentelemetry.io/collector/component v0.0.0-20221117234814-4565692c50a7/go.mod h1:Z7H1Oj826e4dtVxXmT6SiUr6S0EIevUJmkVpfQV+UOk= +go.opentelemetry.io/collector/consumer v0.0.0-20221117234814-4565692c50a7 h1:FTy1JD9EJ7gq9SzlZoi2NkGcZ88+SwdiJav5uRcDEEY= +go.opentelemetry.io/collector/consumer v0.0.0-20221117234814-4565692c50a7/go.mod h1:86Elcw/LLrh90DprArogHMkBX3+UMu3tIgcVWF3mr6o= +go.opentelemetry.io/collector/featuregate v0.0.0-20221117214536-6a117bfc3737 h1:7sXg6M9Fw6rFVlX+iaWOMz6DFXEiroUdQer5kWGixwM= +go.opentelemetry.io/collector/featuregate v0.0.0-20221117214536-6a117bfc3737/go.mod h1:tewuFKJYalWBU0bmNKg++MC1ipINXUr6szYzOw2p1GI= +go.opentelemetry.io/collector/pdata v0.64.2-0.20221117234814-4565692c50a7 h1:IOFqfOu7fFxTgC7pvc2U7dk1/uFjwVQPK+CALiUvacI= +go.opentelemetry.io/collector/pdata v0.64.2-0.20221117234814-4565692c50a7/go.mod h1:0vynPfW2ZN7DltpcCFgCmTtWMQkCjp2a3TNt82YTCLQ= +go.opentelemetry.io/collector/semconv v0.64.2-0.20221117234814-4565692c50a7 h1:cGXAVltDxXw9nj0Vr7vyZZTj0whdyO+GYs+xv0xHJ2A= +go.opentelemetry.io/collector/semconv v0.64.2-0.20221117234814-4565692c50a7/go.mod h1:5o9yhOa+ABt7g2E5JABDxGZ1PQPbtfxrKNbYn+LOTXU= go.opentelemetry.io/contrib/instrumentation/google.golang.org/grpc/otelgrpc v0.36.4 h1:PRXhsszxTt5bbPriTjmaweWUsAnJYeWBhUMLRetUgBU= go.opentelemetry.io/contrib/instrumentation/google.golang.org/grpc/otelgrpc v0.36.4/go.mod h1:05eWWy6ZWzmpeImD3UowLTB3VjDMU1yxQ+ENuVWDM3c= go.opentelemetry.io/otel v1.11.1 h1:4WLLAmcfkmDk2ukNXJyq3/kiz/3UzCaYq6PskJsaou4= diff --git a/receiver/oracledbreceiver/factory.go b/receiver/oracledbreceiver/factory.go index fbb1c94ae64ee..8dd910b564e15 100644 --- a/receiver/oracledbreceiver/factory.go +++ b/receiver/oracledbreceiver/factory.go @@ -24,7 +24,7 @@ import ( const ( typeStr = "oracledb" - stability = component.StabilityLevelInDevelopment + stability = component.StabilityLevelDevelopment ) // NewFactory creates a new Oracle receiver factory. diff --git a/receiver/oracledbreceiver/go.mod b/receiver/oracledbreceiver/go.mod index 372a976ecfadd..a9896b897dc73 100644 --- a/receiver/oracledbreceiver/go.mod +++ b/receiver/oracledbreceiver/go.mod @@ -3,8 +3,10 @@ module github.com/open-telemetry/opentelemetry-collector-contrib/receiver/oracle go 1.18 require ( - go.opentelemetry.io/collector v0.64.2-0.20221115155901-1550938c18fd - go.opentelemetry.io/collector/pdata v0.64.2-0.20221115155901-1550938c18fd + go.opentelemetry.io/collector v0.64.2-0.20221117234814-4565692c50a7 + go.opentelemetry.io/collector/component v0.0.0-20221117234814-4565692c50a7 + go.opentelemetry.io/collector/consumer v0.0.0-20221117234814-4565692c50a7 + go.opentelemetry.io/collector/pdata v0.64.2-0.20221117234814-4565692c50a7 ) require ( @@ -17,6 +19,7 @@ require ( github.com/mitchellh/reflectwalk v1.0.2 // indirect github.com/modern-go/concurrent v0.0.0-20180306012644-bacd9c7ef1dd // indirect github.com/modern-go/reflect2 v1.0.2 // indirect + go.opentelemetry.io/collector/featuregate v0.0.0-20221117214536-6a117bfc3737 // indirect go.opentelemetry.io/otel v1.11.1 // indirect go.opentelemetry.io/otel/metric v0.33.0 // indirect go.opentelemetry.io/otel/trace v1.11.1 // indirect diff --git a/receiver/oracledbreceiver/go.sum b/receiver/oracledbreceiver/go.sum index 9f29ae6d96a2f..50d439c5cf052 100644 --- a/receiver/oracledbreceiver/go.sum +++ b/receiver/oracledbreceiver/go.sum @@ -250,10 +250,16 @@ github.com/yuin/goldmark v1.3.5/go.mod h1:mwnBkeHKe2W/ZEtQ+71ViKU8L12m81fl3OWwC1 go.etcd.io/etcd/api/v3 v3.5.4/go.mod h1:5GB2vv4A4AOn3yk7MftYGHkUfGtDHnEraIjym4dYz5A= go.etcd.io/etcd/client/pkg/v3 v3.5.4/go.mod h1:IJHfcCEKxYu1Os13ZdwCwIUTUVGYTSAM3YSwc9/Ac1g= go.etcd.io/etcd/client/v3 v3.5.4/go.mod h1:ZaRkVgBZC+L+dLCjTcF1hRXpgZXQPOvnA/Ak/gq3kiY= -go.opentelemetry.io/collector v0.64.2-0.20221115155901-1550938c18fd h1:O+6HhE4Ivg8Jksp3dIXIEC4FIR0Ush4uORvG3UtHZWk= -go.opentelemetry.io/collector v0.64.2-0.20221115155901-1550938c18fd/go.mod h1:mmSrOcwe1vEYmChXUYuF6rzlrUL0rjEiPfa19Xxb41o= -go.opentelemetry.io/collector/pdata v0.64.2-0.20221115155901-1550938c18fd h1:GdVAbRiae5VDZe3Mn3FqzMxO/aI5UbJ4+dcviqClHy8= -go.opentelemetry.io/collector/pdata v0.64.2-0.20221115155901-1550938c18fd/go.mod h1:0vynPfW2ZN7DltpcCFgCmTtWMQkCjp2a3TNt82YTCLQ= +go.opentelemetry.io/collector v0.64.2-0.20221117234814-4565692c50a7 h1:o/vMr2iyXzaeTb/KAldhMxAvRIfFPwtKfL5cKVKsSlU= +go.opentelemetry.io/collector v0.64.2-0.20221117234814-4565692c50a7/go.mod h1:PO8hayFFYvXDqELbXRVxwawR2HTdjN6mY4Qa3Se9xI8= +go.opentelemetry.io/collector/component v0.0.0-20221117234814-4565692c50a7 h1:q9m1bGHhQFUakQX79lZpLmFSY9VLULNSs2jUG8MdJLA= +go.opentelemetry.io/collector/component v0.0.0-20221117234814-4565692c50a7/go.mod h1:Z7H1Oj826e4dtVxXmT6SiUr6S0EIevUJmkVpfQV+UOk= +go.opentelemetry.io/collector/consumer v0.0.0-20221117234814-4565692c50a7 h1:FTy1JD9EJ7gq9SzlZoi2NkGcZ88+SwdiJav5uRcDEEY= +go.opentelemetry.io/collector/consumer v0.0.0-20221117234814-4565692c50a7/go.mod h1:86Elcw/LLrh90DprArogHMkBX3+UMu3tIgcVWF3mr6o= +go.opentelemetry.io/collector/featuregate v0.0.0-20221117214536-6a117bfc3737 h1:7sXg6M9Fw6rFVlX+iaWOMz6DFXEiroUdQer5kWGixwM= +go.opentelemetry.io/collector/featuregate v0.0.0-20221117214536-6a117bfc3737/go.mod h1:tewuFKJYalWBU0bmNKg++MC1ipINXUr6szYzOw2p1GI= +go.opentelemetry.io/collector/pdata v0.64.2-0.20221117234814-4565692c50a7 h1:IOFqfOu7fFxTgC7pvc2U7dk1/uFjwVQPK+CALiUvacI= +go.opentelemetry.io/collector/pdata v0.64.2-0.20221117234814-4565692c50a7/go.mod h1:0vynPfW2ZN7DltpcCFgCmTtWMQkCjp2a3TNt82YTCLQ= go.opentelemetry.io/otel v1.11.1 h1:4WLLAmcfkmDk2ukNXJyq3/kiz/3UzCaYq6PskJsaou4= go.opentelemetry.io/otel v1.11.1/go.mod h1:1nNhXBbWSD0nsL38H6btgnFN2k4i0sNLHNNMZMSbUGE= go.opentelemetry.io/otel/metric v0.33.0 h1:xQAyl7uGEYvrLAiV/09iTJlp1pZnQ9Wl793qbVvED1E= diff --git a/receiver/otlpjsonfilereceiver/go.mod b/receiver/otlpjsonfilereceiver/go.mod index f97761da1ec0a..1fa6f857465a3 100644 --- a/receiver/otlpjsonfilereceiver/go.mod +++ b/receiver/otlpjsonfilereceiver/go.mod @@ -6,8 +6,10 @@ require ( github.com/open-telemetry/opentelemetry-collector-contrib/internal/coreinternal v0.64.0 github.com/open-telemetry/opentelemetry-collector-contrib/pkg/stanza v0.64.0 github.com/stretchr/testify v1.8.1 - go.opentelemetry.io/collector v0.64.2-0.20221115155901-1550938c18fd - go.opentelemetry.io/collector/pdata v0.64.2-0.20221115155901-1550938c18fd + go.opentelemetry.io/collector v0.64.2-0.20221117234814-4565692c50a7 + go.opentelemetry.io/collector/component v0.0.0-20221117234814-4565692c50a7 + go.opentelemetry.io/collector/consumer v0.0.0-20221117234814-4565692c50a7 + go.opentelemetry.io/collector/pdata v0.64.2-0.20221117234814-4565692c50a7 ) require ( @@ -27,6 +29,7 @@ require ( github.com/observiq/ctimefmt v1.0.0 // indirect github.com/pmezard/go-difflib v1.0.0 // indirect go.opencensus.io v0.24.0 // indirect + go.opentelemetry.io/collector/featuregate v0.0.0-20221117214536-6a117bfc3737 // indirect go.opentelemetry.io/otel v1.11.1 // indirect go.opentelemetry.io/otel/metric v0.33.0 // indirect go.opentelemetry.io/otel/trace v1.11.1 // indirect diff --git a/receiver/otlpjsonfilereceiver/go.sum b/receiver/otlpjsonfilereceiver/go.sum index ea4f641bd7f04..8678e073c8f8e 100644 --- a/receiver/otlpjsonfilereceiver/go.sum +++ b/receiver/otlpjsonfilereceiver/go.sum @@ -296,10 +296,16 @@ go.etcd.io/etcd/client/pkg/v3 v3.5.4/go.mod h1:IJHfcCEKxYu1Os13ZdwCwIUTUVGYTSAM3 go.etcd.io/etcd/client/v3 v3.5.4/go.mod h1:ZaRkVgBZC+L+dLCjTcF1hRXpgZXQPOvnA/Ak/gq3kiY= go.opencensus.io v0.24.0 h1:y73uSU6J157QMP2kn2r30vwW1A2W2WFwSCGnAVxeaD0= go.opencensus.io v0.24.0/go.mod h1:vNK8G9p7aAivkbmorf4v+7Hgx+Zs0yY+0fOtgBfjQKo= -go.opentelemetry.io/collector v0.64.2-0.20221115155901-1550938c18fd h1:O+6HhE4Ivg8Jksp3dIXIEC4FIR0Ush4uORvG3UtHZWk= -go.opentelemetry.io/collector v0.64.2-0.20221115155901-1550938c18fd/go.mod h1:mmSrOcwe1vEYmChXUYuF6rzlrUL0rjEiPfa19Xxb41o= -go.opentelemetry.io/collector/pdata v0.64.2-0.20221115155901-1550938c18fd h1:GdVAbRiae5VDZe3Mn3FqzMxO/aI5UbJ4+dcviqClHy8= -go.opentelemetry.io/collector/pdata v0.64.2-0.20221115155901-1550938c18fd/go.mod h1:0vynPfW2ZN7DltpcCFgCmTtWMQkCjp2a3TNt82YTCLQ= +go.opentelemetry.io/collector v0.64.2-0.20221117234814-4565692c50a7 h1:o/vMr2iyXzaeTb/KAldhMxAvRIfFPwtKfL5cKVKsSlU= +go.opentelemetry.io/collector v0.64.2-0.20221117234814-4565692c50a7/go.mod h1:PO8hayFFYvXDqELbXRVxwawR2HTdjN6mY4Qa3Se9xI8= +go.opentelemetry.io/collector/component v0.0.0-20221117234814-4565692c50a7 h1:q9m1bGHhQFUakQX79lZpLmFSY9VLULNSs2jUG8MdJLA= +go.opentelemetry.io/collector/component v0.0.0-20221117234814-4565692c50a7/go.mod h1:Z7H1Oj826e4dtVxXmT6SiUr6S0EIevUJmkVpfQV+UOk= +go.opentelemetry.io/collector/consumer v0.0.0-20221117234814-4565692c50a7 h1:FTy1JD9EJ7gq9SzlZoi2NkGcZ88+SwdiJav5uRcDEEY= +go.opentelemetry.io/collector/consumer v0.0.0-20221117234814-4565692c50a7/go.mod h1:86Elcw/LLrh90DprArogHMkBX3+UMu3tIgcVWF3mr6o= +go.opentelemetry.io/collector/featuregate v0.0.0-20221117214536-6a117bfc3737 h1:7sXg6M9Fw6rFVlX+iaWOMz6DFXEiroUdQer5kWGixwM= +go.opentelemetry.io/collector/featuregate v0.0.0-20221117214536-6a117bfc3737/go.mod h1:tewuFKJYalWBU0bmNKg++MC1ipINXUr6szYzOw2p1GI= +go.opentelemetry.io/collector/pdata v0.64.2-0.20221117234814-4565692c50a7 h1:IOFqfOu7fFxTgC7pvc2U7dk1/uFjwVQPK+CALiUvacI= +go.opentelemetry.io/collector/pdata v0.64.2-0.20221117234814-4565692c50a7/go.mod h1:0vynPfW2ZN7DltpcCFgCmTtWMQkCjp2a3TNt82YTCLQ= go.opentelemetry.io/otel v1.11.1 h1:4WLLAmcfkmDk2ukNXJyq3/kiz/3UzCaYq6PskJsaou4= go.opentelemetry.io/otel v1.11.1/go.mod h1:1nNhXBbWSD0nsL38H6btgnFN2k4i0sNLHNNMZMSbUGE= go.opentelemetry.io/otel/exporters/prometheus v0.33.0 h1:xXhPj7SLKWU5/Zd4Hxmd+X1C4jdmvc0Xy+kvjFx2z60= diff --git a/receiver/podmanreceiver/config_test.go b/receiver/podmanreceiver/config_test.go index 712542c861a60..422ea7c1538ea 100644 --- a/receiver/podmanreceiver/config_test.go +++ b/receiver/podmanreceiver/config_test.go @@ -73,7 +73,7 @@ func TestLoadConfig(t *testing.T) { require.NoError(t, err) require.NoError(t, component.UnmarshalReceiverConfig(sub, cfg)) - assert.NoError(t, cfg.Validate()) + assert.NoError(t, component.ValidateConfig(cfg)) assert.Equal(t, tt.expected, cfg) }) } diff --git a/receiver/podmanreceiver/factory.go b/receiver/podmanreceiver/factory.go index e5d1d449e80cc..de7ccfa545417 100644 --- a/receiver/podmanreceiver/factory.go +++ b/receiver/podmanreceiver/factory.go @@ -26,7 +26,7 @@ import ( const ( typeStr = "podman_stats" - stability = component.StabilityLevelInDevelopment + stability = component.StabilityLevelDevelopment defaultAPIVersion = "3.3.1" ) diff --git a/receiver/podmanreceiver/go.mod b/receiver/podmanreceiver/go.mod index 1c7049708d62c..c4feb058f2346 100644 --- a/receiver/podmanreceiver/go.mod +++ b/receiver/podmanreceiver/go.mod @@ -4,9 +4,11 @@ go 1.18 require ( github.com/stretchr/testify v1.8.1 - go.opentelemetry.io/collector v0.64.2-0.20221115155901-1550938c18fd - go.opentelemetry.io/collector/pdata v0.64.2-0.20221115155901-1550938c18fd - go.opentelemetry.io/collector/semconv v0.64.2-0.20221115155901-1550938c18fd + go.opentelemetry.io/collector v0.64.2-0.20221117234814-4565692c50a7 + go.opentelemetry.io/collector/component v0.0.0-20221117234814-4565692c50a7 + go.opentelemetry.io/collector/consumer v0.0.0-20221117234814-4565692c50a7 + go.opentelemetry.io/collector/pdata v0.64.2-0.20221117234814-4565692c50a7 + go.opentelemetry.io/collector/semconv v0.64.2-0.20221117234814-4565692c50a7 go.uber.org/multierr v1.8.0 go.uber.org/zap v1.23.0 golang.org/x/crypto v0.0.0-20220507011949-2cf3adece122 @@ -28,6 +30,7 @@ require ( github.com/pelletier/go-toml v1.9.4 // indirect github.com/pmezard/go-difflib v1.0.0 // indirect go.opencensus.io v0.24.0 // indirect + go.opentelemetry.io/collector/featuregate v0.0.0-20221117214536-6a117bfc3737 // indirect go.opentelemetry.io/otel v1.11.1 // indirect go.opentelemetry.io/otel/metric v0.33.0 // indirect go.opentelemetry.io/otel/trace v1.11.1 // indirect diff --git a/receiver/podmanreceiver/go.sum b/receiver/podmanreceiver/go.sum index dbc7187d95996..a426eb72409de 100644 --- a/receiver/podmanreceiver/go.sum +++ b/receiver/podmanreceiver/go.sum @@ -284,12 +284,18 @@ go.etcd.io/etcd/client/pkg/v3 v3.5.4/go.mod h1:IJHfcCEKxYu1Os13ZdwCwIUTUVGYTSAM3 go.etcd.io/etcd/client/v3 v3.5.4/go.mod h1:ZaRkVgBZC+L+dLCjTcF1hRXpgZXQPOvnA/Ak/gq3kiY= go.opencensus.io v0.24.0 h1:y73uSU6J157QMP2kn2r30vwW1A2W2WFwSCGnAVxeaD0= go.opencensus.io v0.24.0/go.mod h1:vNK8G9p7aAivkbmorf4v+7Hgx+Zs0yY+0fOtgBfjQKo= -go.opentelemetry.io/collector v0.64.2-0.20221115155901-1550938c18fd h1:O+6HhE4Ivg8Jksp3dIXIEC4FIR0Ush4uORvG3UtHZWk= -go.opentelemetry.io/collector v0.64.2-0.20221115155901-1550938c18fd/go.mod h1:mmSrOcwe1vEYmChXUYuF6rzlrUL0rjEiPfa19Xxb41o= -go.opentelemetry.io/collector/pdata v0.64.2-0.20221115155901-1550938c18fd h1:GdVAbRiae5VDZe3Mn3FqzMxO/aI5UbJ4+dcviqClHy8= -go.opentelemetry.io/collector/pdata v0.64.2-0.20221115155901-1550938c18fd/go.mod h1:0vynPfW2ZN7DltpcCFgCmTtWMQkCjp2a3TNt82YTCLQ= -go.opentelemetry.io/collector/semconv v0.64.2-0.20221115155901-1550938c18fd h1:rMqcl2pwi8YtVrtOPK8tVh87W0bFBge4yqB9ypSsAJ4= -go.opentelemetry.io/collector/semconv v0.64.2-0.20221115155901-1550938c18fd/go.mod h1:5o9yhOa+ABt7g2E5JABDxGZ1PQPbtfxrKNbYn+LOTXU= +go.opentelemetry.io/collector v0.64.2-0.20221117234814-4565692c50a7 h1:o/vMr2iyXzaeTb/KAldhMxAvRIfFPwtKfL5cKVKsSlU= +go.opentelemetry.io/collector v0.64.2-0.20221117234814-4565692c50a7/go.mod h1:PO8hayFFYvXDqELbXRVxwawR2HTdjN6mY4Qa3Se9xI8= +go.opentelemetry.io/collector/component v0.0.0-20221117234814-4565692c50a7 h1:q9m1bGHhQFUakQX79lZpLmFSY9VLULNSs2jUG8MdJLA= +go.opentelemetry.io/collector/component v0.0.0-20221117234814-4565692c50a7/go.mod h1:Z7H1Oj826e4dtVxXmT6SiUr6S0EIevUJmkVpfQV+UOk= +go.opentelemetry.io/collector/consumer v0.0.0-20221117234814-4565692c50a7 h1:FTy1JD9EJ7gq9SzlZoi2NkGcZ88+SwdiJav5uRcDEEY= +go.opentelemetry.io/collector/consumer v0.0.0-20221117234814-4565692c50a7/go.mod h1:86Elcw/LLrh90DprArogHMkBX3+UMu3tIgcVWF3mr6o= +go.opentelemetry.io/collector/featuregate v0.0.0-20221117214536-6a117bfc3737 h1:7sXg6M9Fw6rFVlX+iaWOMz6DFXEiroUdQer5kWGixwM= +go.opentelemetry.io/collector/featuregate v0.0.0-20221117214536-6a117bfc3737/go.mod h1:tewuFKJYalWBU0bmNKg++MC1ipINXUr6szYzOw2p1GI= +go.opentelemetry.io/collector/pdata v0.64.2-0.20221117234814-4565692c50a7 h1:IOFqfOu7fFxTgC7pvc2U7dk1/uFjwVQPK+CALiUvacI= +go.opentelemetry.io/collector/pdata v0.64.2-0.20221117234814-4565692c50a7/go.mod h1:0vynPfW2ZN7DltpcCFgCmTtWMQkCjp2a3TNt82YTCLQ= +go.opentelemetry.io/collector/semconv v0.64.2-0.20221117234814-4565692c50a7 h1:cGXAVltDxXw9nj0Vr7vyZZTj0whdyO+GYs+xv0xHJ2A= +go.opentelemetry.io/collector/semconv v0.64.2-0.20221117234814-4565692c50a7/go.mod h1:5o9yhOa+ABt7g2E5JABDxGZ1PQPbtfxrKNbYn+LOTXU= go.opentelemetry.io/otel v1.11.1 h1:4WLLAmcfkmDk2ukNXJyq3/kiz/3UzCaYq6PskJsaou4= go.opentelemetry.io/otel v1.11.1/go.mod h1:1nNhXBbWSD0nsL38H6btgnFN2k4i0sNLHNNMZMSbUGE= go.opentelemetry.io/otel/exporters/prometheus v0.33.0 h1:xXhPj7SLKWU5/Zd4Hxmd+X1C4jdmvc0Xy+kvjFx2z60= diff --git a/receiver/postgresqlreceiver/config_test.go b/receiver/postgresqlreceiver/config_test.go index 04d8aa1c8b96b..e8b217c43f0fb 100644 --- a/receiver/postgresqlreceiver/config_test.go +++ b/receiver/postgresqlreceiver/config_test.go @@ -111,7 +111,7 @@ func TestValidate(t *testing.T) { factory := NewFactory() cfg := factory.CreateDefaultConfig().(*Config) tC.defaultConfigModifier(cfg) - actual := cfg.Validate() + actual := component.ValidateConfig(cfg) require.Equal(t, tC.expected, actual) }) } diff --git a/receiver/postgresqlreceiver/factory_test.go b/receiver/postgresqlreceiver/factory_test.go index e05ae274d1ba6..c766e8fde75d9 100644 --- a/receiver/postgresqlreceiver/factory_test.go +++ b/receiver/postgresqlreceiver/factory_test.go @@ -38,7 +38,7 @@ func TestValidConfig(t *testing.T) { cfg := factory.CreateDefaultConfig().(*Config) cfg.Username = "otel" cfg.Password = "otel" - require.NoError(t, cfg.Validate()) + require.NoError(t, component.ValidateConfig(cfg)) } func TestCreateMetricsReceiver(t *testing.T) { diff --git a/receiver/postgresqlreceiver/go.mod b/receiver/postgresqlreceiver/go.mod index 2e7220f31bb6a..2a481e6f0a573 100644 --- a/receiver/postgresqlreceiver/go.mod +++ b/receiver/postgresqlreceiver/go.mod @@ -7,8 +7,11 @@ require ( github.com/open-telemetry/opentelemetry-collector-contrib/internal/scrapertest v0.64.0 github.com/stretchr/testify v1.8.1 github.com/testcontainers/testcontainers-go v0.15.0 - go.opentelemetry.io/collector v0.64.2-0.20221115155901-1550938c18fd - go.opentelemetry.io/collector/pdata v0.64.2-0.20221115155901-1550938c18fd + go.opentelemetry.io/collector v0.64.2-0.20221117234814-4565692c50a7 + go.opentelemetry.io/collector/component v0.0.0-20221117234814-4565692c50a7 + go.opentelemetry.io/collector/consumer v0.0.0-20221117234814-4565692c50a7 + go.opentelemetry.io/collector/featuregate v0.0.0-20221117214536-6a117bfc3737 + go.opentelemetry.io/collector/pdata v0.64.2-0.20221117234814-4565692c50a7 go.uber.org/multierr v1.8.0 go.uber.org/zap v1.23.0 ) diff --git a/receiver/postgresqlreceiver/go.sum b/receiver/postgresqlreceiver/go.sum index 4f0bcafcc6990..1fbfde8e5b2ed 100644 --- a/receiver/postgresqlreceiver/go.sum +++ b/receiver/postgresqlreceiver/go.sum @@ -820,10 +820,16 @@ go.opencensus.io v0.22.2/go.mod h1:yxeiOL68Rb0Xd1ddK5vPZ/oVn4vY4Ynel7k9FzqtOIw= go.opencensus.io v0.22.3/go.mod h1:yxeiOL68Rb0Xd1ddK5vPZ/oVn4vY4Ynel7k9FzqtOIw= go.opencensus.io v0.24.0 h1:y73uSU6J157QMP2kn2r30vwW1A2W2WFwSCGnAVxeaD0= go.opencensus.io v0.24.0/go.mod h1:vNK8G9p7aAivkbmorf4v+7Hgx+Zs0yY+0fOtgBfjQKo= -go.opentelemetry.io/collector v0.64.2-0.20221115155901-1550938c18fd h1:O+6HhE4Ivg8Jksp3dIXIEC4FIR0Ush4uORvG3UtHZWk= -go.opentelemetry.io/collector v0.64.2-0.20221115155901-1550938c18fd/go.mod h1:mmSrOcwe1vEYmChXUYuF6rzlrUL0rjEiPfa19Xxb41o= -go.opentelemetry.io/collector/pdata v0.64.2-0.20221115155901-1550938c18fd h1:GdVAbRiae5VDZe3Mn3FqzMxO/aI5UbJ4+dcviqClHy8= -go.opentelemetry.io/collector/pdata v0.64.2-0.20221115155901-1550938c18fd/go.mod h1:0vynPfW2ZN7DltpcCFgCmTtWMQkCjp2a3TNt82YTCLQ= +go.opentelemetry.io/collector v0.64.2-0.20221117234814-4565692c50a7 h1:o/vMr2iyXzaeTb/KAldhMxAvRIfFPwtKfL5cKVKsSlU= +go.opentelemetry.io/collector v0.64.2-0.20221117234814-4565692c50a7/go.mod h1:PO8hayFFYvXDqELbXRVxwawR2HTdjN6mY4Qa3Se9xI8= +go.opentelemetry.io/collector/component v0.0.0-20221117234814-4565692c50a7 h1:q9m1bGHhQFUakQX79lZpLmFSY9VLULNSs2jUG8MdJLA= +go.opentelemetry.io/collector/component v0.0.0-20221117234814-4565692c50a7/go.mod h1:Z7H1Oj826e4dtVxXmT6SiUr6S0EIevUJmkVpfQV+UOk= +go.opentelemetry.io/collector/consumer v0.0.0-20221117234814-4565692c50a7 h1:FTy1JD9EJ7gq9SzlZoi2NkGcZ88+SwdiJav5uRcDEEY= +go.opentelemetry.io/collector/consumer v0.0.0-20221117234814-4565692c50a7/go.mod h1:86Elcw/LLrh90DprArogHMkBX3+UMu3tIgcVWF3mr6o= +go.opentelemetry.io/collector/featuregate v0.0.0-20221117214536-6a117bfc3737 h1:7sXg6M9Fw6rFVlX+iaWOMz6DFXEiroUdQer5kWGixwM= +go.opentelemetry.io/collector/featuregate v0.0.0-20221117214536-6a117bfc3737/go.mod h1:tewuFKJYalWBU0bmNKg++MC1ipINXUr6szYzOw2p1GI= +go.opentelemetry.io/collector/pdata v0.64.2-0.20221117234814-4565692c50a7 h1:IOFqfOu7fFxTgC7pvc2U7dk1/uFjwVQPK+CALiUvacI= +go.opentelemetry.io/collector/pdata v0.64.2-0.20221117234814-4565692c50a7/go.mod h1:0vynPfW2ZN7DltpcCFgCmTtWMQkCjp2a3TNt82YTCLQ= go.opentelemetry.io/otel v1.11.1 h1:4WLLAmcfkmDk2ukNXJyq3/kiz/3UzCaYq6PskJsaou4= go.opentelemetry.io/otel v1.11.1/go.mod h1:1nNhXBbWSD0nsL38H6btgnFN2k4i0sNLHNNMZMSbUGE= go.opentelemetry.io/otel/exporters/prometheus v0.33.0 h1:xXhPj7SLKWU5/Zd4Hxmd+X1C4jdmvc0Xy+kvjFx2z60= diff --git a/receiver/prometheusexecreceiver/config_test.go b/receiver/prometheusexecreceiver/config_test.go index a5d7b9eaf9e81..dc86f5081a647 100644 --- a/receiver/prometheusexecreceiver/config_test.go +++ b/receiver/prometheusexecreceiver/config_test.go @@ -109,7 +109,7 @@ func TestLoadConfig(t *testing.T) { require.NoError(t, err) require.NoError(t, component.UnmarshalReceiverConfig(sub, cfg)) - assert.NoError(t, cfg.Validate()) + assert.NoError(t, component.ValidateConfig(cfg)) assert.Equal(t, tt.expected, cfg) }) } diff --git a/receiver/prometheusexecreceiver/go.mod b/receiver/prometheusexecreceiver/go.mod index d8cc9f6d34f13..5f1bc801db89c 100644 --- a/receiver/prometheusexecreceiver/go.mod +++ b/receiver/prometheusexecreceiver/go.mod @@ -9,8 +9,10 @@ require ( github.com/prometheus/common v0.37.0 github.com/prometheus/prometheus v0.38.0 github.com/stretchr/testify v1.8.1 - go.opentelemetry.io/collector v0.64.2-0.20221115155901-1550938c18fd - go.opentelemetry.io/collector/pdata v0.64.2-0.20221115155901-1550938c18fd + go.opentelemetry.io/collector v0.64.2-0.20221117234814-4565692c50a7 + go.opentelemetry.io/collector/component v0.0.0-20221117234814-4565692c50a7 + go.opentelemetry.io/collector/consumer v0.0.0-20221117234814-4565692c50a7 + go.opentelemetry.io/collector/pdata v0.64.2-0.20221117234814-4565692c50a7 go.uber.org/zap v1.23.0 ) @@ -116,7 +118,8 @@ require ( github.com/spf13/pflag v1.0.5 // indirect github.com/vultr/govultr/v2 v2.17.2 // indirect go.opencensus.io v0.24.0 // indirect - go.opentelemetry.io/collector/semconv v0.64.2-0.20221115155901-1550938c18fd // indirect + go.opentelemetry.io/collector/featuregate v0.0.0-20221117214536-6a117bfc3737 // indirect + go.opentelemetry.io/collector/semconv v0.64.2-0.20221117234814-4565692c50a7 // indirect go.opentelemetry.io/otel v1.11.1 // indirect go.opentelemetry.io/otel/metric v0.33.0 // indirect go.opentelemetry.io/otel/trace v1.11.1 // indirect diff --git a/receiver/prometheusexecreceiver/go.sum b/receiver/prometheusexecreceiver/go.sum index 24dfad574836a..b6c2131679b85 100644 --- a/receiver/prometheusexecreceiver/go.sum +++ b/receiver/prometheusexecreceiver/go.sum @@ -618,13 +618,19 @@ go.opencensus.io v0.22.3/go.mod h1:yxeiOL68Rb0Xd1ddK5vPZ/oVn4vY4Ynel7k9FzqtOIw= go.opencensus.io v0.22.4/go.mod h1:yxeiOL68Rb0Xd1ddK5vPZ/oVn4vY4Ynel7k9FzqtOIw= go.opencensus.io v0.24.0 h1:y73uSU6J157QMP2kn2r30vwW1A2W2WFwSCGnAVxeaD0= go.opencensus.io v0.24.0/go.mod h1:vNK8G9p7aAivkbmorf4v+7Hgx+Zs0yY+0fOtgBfjQKo= -go.opentelemetry.io/collector v0.64.2-0.20221115155901-1550938c18fd h1:O+6HhE4Ivg8Jksp3dIXIEC4FIR0Ush4uORvG3UtHZWk= -go.opentelemetry.io/collector v0.64.2-0.20221115155901-1550938c18fd/go.mod h1:mmSrOcwe1vEYmChXUYuF6rzlrUL0rjEiPfa19Xxb41o= -go.opentelemetry.io/collector/pdata v0.64.2-0.20221115155901-1550938c18fd h1:GdVAbRiae5VDZe3Mn3FqzMxO/aI5UbJ4+dcviqClHy8= -go.opentelemetry.io/collector/pdata v0.64.2-0.20221115155901-1550938c18fd/go.mod h1:0vynPfW2ZN7DltpcCFgCmTtWMQkCjp2a3TNt82YTCLQ= -go.opentelemetry.io/collector/processor/batchprocessor v0.64.2-0.20221115155901-1550938c18fd h1:SSjP8V0UP2+oPZ3gL+Dk90KQcvHXvHp9V5h8IIpx0og= -go.opentelemetry.io/collector/semconv v0.64.2-0.20221115155901-1550938c18fd h1:rMqcl2pwi8YtVrtOPK8tVh87W0bFBge4yqB9ypSsAJ4= -go.opentelemetry.io/collector/semconv v0.64.2-0.20221115155901-1550938c18fd/go.mod h1:5o9yhOa+ABt7g2E5JABDxGZ1PQPbtfxrKNbYn+LOTXU= +go.opentelemetry.io/collector v0.64.2-0.20221117234814-4565692c50a7 h1:o/vMr2iyXzaeTb/KAldhMxAvRIfFPwtKfL5cKVKsSlU= +go.opentelemetry.io/collector v0.64.2-0.20221117234814-4565692c50a7/go.mod h1:PO8hayFFYvXDqELbXRVxwawR2HTdjN6mY4Qa3Se9xI8= +go.opentelemetry.io/collector/component v0.0.0-20221117234814-4565692c50a7 h1:q9m1bGHhQFUakQX79lZpLmFSY9VLULNSs2jUG8MdJLA= +go.opentelemetry.io/collector/component v0.0.0-20221117234814-4565692c50a7/go.mod h1:Z7H1Oj826e4dtVxXmT6SiUr6S0EIevUJmkVpfQV+UOk= +go.opentelemetry.io/collector/consumer v0.0.0-20221117234814-4565692c50a7 h1:FTy1JD9EJ7gq9SzlZoi2NkGcZ88+SwdiJav5uRcDEEY= +go.opentelemetry.io/collector/consumer v0.0.0-20221117234814-4565692c50a7/go.mod h1:86Elcw/LLrh90DprArogHMkBX3+UMu3tIgcVWF3mr6o= +go.opentelemetry.io/collector/featuregate v0.0.0-20221117214536-6a117bfc3737 h1:7sXg6M9Fw6rFVlX+iaWOMz6DFXEiroUdQer5kWGixwM= +go.opentelemetry.io/collector/featuregate v0.0.0-20221117214536-6a117bfc3737/go.mod h1:tewuFKJYalWBU0bmNKg++MC1ipINXUr6szYzOw2p1GI= +go.opentelemetry.io/collector/pdata v0.64.2-0.20221117234814-4565692c50a7 h1:IOFqfOu7fFxTgC7pvc2U7dk1/uFjwVQPK+CALiUvacI= +go.opentelemetry.io/collector/pdata v0.64.2-0.20221117234814-4565692c50a7/go.mod h1:0vynPfW2ZN7DltpcCFgCmTtWMQkCjp2a3TNt82YTCLQ= +go.opentelemetry.io/collector/processor/batchprocessor v0.64.2-0.20221117234814-4565692c50a7 h1:hGDq2T07j6qwwtQ2t6ZGU5tp/J2Dvu9mfY5qnnP5Ic8= +go.opentelemetry.io/collector/semconv v0.64.2-0.20221117234814-4565692c50a7 h1:cGXAVltDxXw9nj0Vr7vyZZTj0whdyO+GYs+xv0xHJ2A= +go.opentelemetry.io/collector/semconv v0.64.2-0.20221117234814-4565692c50a7/go.mod h1:5o9yhOa+ABt7g2E5JABDxGZ1PQPbtfxrKNbYn+LOTXU= go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.36.4 h1:aUEBEdCa6iamGzg6fuYxDA8ThxvOG240mAvWDU+XLio= go.opentelemetry.io/contrib/propagators/b3 v1.11.1 h1:icQ6ttRV+r/2fnU46BIo/g/mPu6Rs5Ug8Rtohe3KqzI= go.opentelemetry.io/otel v1.11.1 h1:4WLLAmcfkmDk2ukNXJyq3/kiz/3UzCaYq6PskJsaou4= diff --git a/receiver/prometheusreceiver/config_test.go b/receiver/prometheusreceiver/config_test.go index 14528aec93ec2..2885c05232935 100644 --- a/receiver/prometheusreceiver/config_test.go +++ b/receiver/prometheusreceiver/config_test.go @@ -138,7 +138,7 @@ func TestLoadConfigFailsOnRenameDisallowed(t *testing.T) { sub, err := cm.Sub(component.NewIDWithName(typeStr, "").String()) require.NoError(t, err) require.NoError(t, component.UnmarshalReceiverConfig(sub, cfg)) - assert.Error(t, cfg.Validate()) + assert.Error(t, component.ValidateConfig(cfg)) } @@ -152,7 +152,7 @@ func TestRejectUnsupportedPrometheusFeatures(t *testing.T) { require.NoError(t, err) require.NoError(t, component.UnmarshalReceiverConfig(sub, cfg)) - err = cfg.Validate() + err = component.ValidateConfig(cfg) require.NotNil(t, err, "Expected a non-nil error") wantErrMsg := `unsupported features: @@ -177,7 +177,7 @@ func TestNonExistentAuthCredentialsFile(t *testing.T) { require.NoError(t, err) require.NoError(t, component.UnmarshalReceiverConfig(sub, cfg)) - err = cfg.Validate() + err = component.ValidateConfig(cfg) require.NotNil(t, err, "Expected a non-nil error") wantErrMsg := `error checking authorization credentials file "/nonexistentauthcredentialsfile"` @@ -196,7 +196,7 @@ func TestTLSConfigNonExistentCertFile(t *testing.T) { require.NoError(t, err) require.NoError(t, component.UnmarshalReceiverConfig(sub, cfg)) - err = cfg.Validate() + err = component.ValidateConfig(cfg) require.NotNil(t, err, "Expected a non-nil error") wantErrMsg := `error checking client cert file "/nonexistentcertfile"` @@ -215,7 +215,7 @@ func TestTLSConfigNonExistentKeyFile(t *testing.T) { require.NoError(t, err) require.NoError(t, component.UnmarshalReceiverConfig(sub, cfg)) - err = cfg.Validate() + err = component.ValidateConfig(cfg) require.NotNil(t, err, "Expected a non-nil error") wantErrMsg := `error checking client key file "/nonexistentkeyfile"` @@ -234,7 +234,7 @@ func TestTLSConfigCertFileWithoutKeyFile(t *testing.T) { require.NoError(t, err) require.NoError(t, component.UnmarshalReceiverConfig(sub, cfg)) - err = cfg.Validate() + err = component.ValidateConfig(cfg) require.NotNil(t, err, "Expected a non-nil error") wantErrMsg := `client cert file "./testdata/dummy-tls-cert-file" specified without client key file` @@ -253,7 +253,7 @@ func TestTLSConfigKeyFileWithoutCertFile(t *testing.T) { require.NoError(t, err) require.NoError(t, component.UnmarshalReceiverConfig(sub, cfg)) - err = cfg.Validate() + err = component.ValidateConfig(cfg) require.NotNil(t, err, "Expected a non-nil error") wantErrMsg := `client key file "./testdata/dummy-tls-key-file" specified without client cert file` @@ -272,7 +272,7 @@ func TestKubernetesSDConfigWithoutKeyFile(t *testing.T) { require.NoError(t, err) require.NoError(t, component.UnmarshalReceiverConfig(sub, cfg)) - err = cfg.Validate() + err = component.ValidateConfig(cfg) require.NotNil(t, err, "Expected a non-nil error") wantErrMsg := `client cert file "./testdata/dummy-tls-cert-file" specified without client key file` @@ -291,7 +291,7 @@ func TestFileSDConfigJsonNilTargetGroup(t *testing.T) { require.NoError(t, err) require.NoError(t, component.UnmarshalReceiverConfig(sub, cfg)) - err = cfg.Validate() + err = component.ValidateConfig(cfg) require.NotNil(t, err, "Expected a non-nil error") wantErrMsg := `checking SD file "./testdata/sd-config-with-null-target-group.json": nil target group item found (index 1)` @@ -310,7 +310,7 @@ func TestFileSDConfigYamlNilTargetGroup(t *testing.T) { require.NoError(t, err) require.NoError(t, component.UnmarshalReceiverConfig(sub, cfg)) - err = cfg.Validate() + err = component.ValidateConfig(cfg) require.NotNil(t, err, "Expected a non-nil error") wantErrMsg := `checking SD file "./testdata/sd-config-with-null-target-group.yaml": nil target group item found (index 1)` diff --git a/receiver/prometheusreceiver/go.mod b/receiver/prometheusreceiver/go.mod index 3c50f5ab5733e..dbc8f22ec76b7 100644 --- a/receiver/prometheusreceiver/go.mod +++ b/receiver/prometheusreceiver/go.mod @@ -11,10 +11,12 @@ require ( github.com/prometheus/common v0.37.0 github.com/prometheus/prometheus v0.38.0 github.com/stretchr/testify v1.8.1 - go.opentelemetry.io/collector v0.64.2-0.20221115155901-1550938c18fd - go.opentelemetry.io/collector/pdata v0.64.2-0.20221115155901-1550938c18fd - go.opentelemetry.io/collector/processor/batchprocessor v0.64.2-0.20221115155901-1550938c18fd - go.opentelemetry.io/collector/semconv v0.64.2-0.20221115155901-1550938c18fd + go.opentelemetry.io/collector v0.64.2-0.20221117234814-4565692c50a7 + go.opentelemetry.io/collector/component v0.0.0-20221117234814-4565692c50a7 + go.opentelemetry.io/collector/consumer v0.0.0-20221117234814-4565692c50a7 + go.opentelemetry.io/collector/pdata v0.64.2-0.20221117234814-4565692c50a7 + go.opentelemetry.io/collector/processor/batchprocessor v0.64.2-0.20221117234814-4565692c50a7 + go.opentelemetry.io/collector/semconv v0.64.2-0.20221117234814-4565692c50a7 go.uber.org/atomic v1.10.0 go.uber.org/zap v1.23.0 google.golang.org/protobuf v1.28.1 @@ -146,6 +148,7 @@ require ( github.com/vultr/govultr/v2 v2.17.2 // indirect github.com/yusufpapurcu/wmi v1.2.2 // indirect go.opencensus.io v0.24.0 // indirect + go.opentelemetry.io/collector/featuregate v0.0.0-20221117214536-6a117bfc3737 // indirect go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.36.4 // indirect go.opentelemetry.io/contrib/propagators/b3 v1.11.1 // indirect go.opentelemetry.io/otel v1.11.1 // indirect diff --git a/receiver/prometheusreceiver/go.sum b/receiver/prometheusreceiver/go.sum index 4be1b5508d9fe..ac856326348d8 100644 --- a/receiver/prometheusreceiver/go.sum +++ b/receiver/prometheusreceiver/go.sum @@ -649,15 +649,21 @@ go.opencensus.io v0.22.4/go.mod h1:yxeiOL68Rb0Xd1ddK5vPZ/oVn4vY4Ynel7k9FzqtOIw= go.opencensus.io v0.23.0/go.mod h1:XItmlyltB5F7CS4xOC1DcqMoFqwtC6OG2xF7mCv7P7E= go.opencensus.io v0.24.0 h1:y73uSU6J157QMP2kn2r30vwW1A2W2WFwSCGnAVxeaD0= go.opencensus.io v0.24.0/go.mod h1:vNK8G9p7aAivkbmorf4v+7Hgx+Zs0yY+0fOtgBfjQKo= -go.opentelemetry.io/collector v0.64.2-0.20221115155901-1550938c18fd h1:O+6HhE4Ivg8Jksp3dIXIEC4FIR0Ush4uORvG3UtHZWk= -go.opentelemetry.io/collector v0.64.2-0.20221115155901-1550938c18fd/go.mod h1:mmSrOcwe1vEYmChXUYuF6rzlrUL0rjEiPfa19Xxb41o= +go.opentelemetry.io/collector v0.64.2-0.20221117234814-4565692c50a7 h1:o/vMr2iyXzaeTb/KAldhMxAvRIfFPwtKfL5cKVKsSlU= +go.opentelemetry.io/collector v0.64.2-0.20221117234814-4565692c50a7/go.mod h1:PO8hayFFYvXDqELbXRVxwawR2HTdjN6mY4Qa3Se9xI8= +go.opentelemetry.io/collector/component v0.0.0-20221117234814-4565692c50a7 h1:q9m1bGHhQFUakQX79lZpLmFSY9VLULNSs2jUG8MdJLA= +go.opentelemetry.io/collector/component v0.0.0-20221117234814-4565692c50a7/go.mod h1:Z7H1Oj826e4dtVxXmT6SiUr6S0EIevUJmkVpfQV+UOk= +go.opentelemetry.io/collector/consumer v0.0.0-20221117234814-4565692c50a7 h1:FTy1JD9EJ7gq9SzlZoi2NkGcZ88+SwdiJav5uRcDEEY= +go.opentelemetry.io/collector/consumer v0.0.0-20221117234814-4565692c50a7/go.mod h1:86Elcw/LLrh90DprArogHMkBX3+UMu3tIgcVWF3mr6o= go.opentelemetry.io/collector/extension/zpagesextension v0.64.1 h1:2qTBtVigWNwPSpN9XR+WobC1idF2S8X/FIahFGCE1i4= -go.opentelemetry.io/collector/pdata v0.64.2-0.20221115155901-1550938c18fd h1:GdVAbRiae5VDZe3Mn3FqzMxO/aI5UbJ4+dcviqClHy8= -go.opentelemetry.io/collector/pdata v0.64.2-0.20221115155901-1550938c18fd/go.mod h1:0vynPfW2ZN7DltpcCFgCmTtWMQkCjp2a3TNt82YTCLQ= -go.opentelemetry.io/collector/processor/batchprocessor v0.64.2-0.20221115155901-1550938c18fd h1:SSjP8V0UP2+oPZ3gL+Dk90KQcvHXvHp9V5h8IIpx0og= -go.opentelemetry.io/collector/processor/batchprocessor v0.64.2-0.20221115155901-1550938c18fd/go.mod h1:zyCnX0aTvBaZ3XLWSHZdTueP7WoXRjz8X6HiWgKqstM= -go.opentelemetry.io/collector/semconv v0.64.2-0.20221115155901-1550938c18fd h1:rMqcl2pwi8YtVrtOPK8tVh87W0bFBge4yqB9ypSsAJ4= -go.opentelemetry.io/collector/semconv v0.64.2-0.20221115155901-1550938c18fd/go.mod h1:5o9yhOa+ABt7g2E5JABDxGZ1PQPbtfxrKNbYn+LOTXU= +go.opentelemetry.io/collector/featuregate v0.0.0-20221117214536-6a117bfc3737 h1:7sXg6M9Fw6rFVlX+iaWOMz6DFXEiroUdQer5kWGixwM= +go.opentelemetry.io/collector/featuregate v0.0.0-20221117214536-6a117bfc3737/go.mod h1:tewuFKJYalWBU0bmNKg++MC1ipINXUr6szYzOw2p1GI= +go.opentelemetry.io/collector/pdata v0.64.2-0.20221117234814-4565692c50a7 h1:IOFqfOu7fFxTgC7pvc2U7dk1/uFjwVQPK+CALiUvacI= +go.opentelemetry.io/collector/pdata v0.64.2-0.20221117234814-4565692c50a7/go.mod h1:0vynPfW2ZN7DltpcCFgCmTtWMQkCjp2a3TNt82YTCLQ= +go.opentelemetry.io/collector/processor/batchprocessor v0.64.2-0.20221117234814-4565692c50a7 h1:hGDq2T07j6qwwtQ2t6ZGU5tp/J2Dvu9mfY5qnnP5Ic8= +go.opentelemetry.io/collector/processor/batchprocessor v0.64.2-0.20221117234814-4565692c50a7/go.mod h1:b83iea2eDSAQkvd+2aSokaa6GRjSIsaR2zILziF/Ogc= +go.opentelemetry.io/collector/semconv v0.64.2-0.20221117234814-4565692c50a7 h1:cGXAVltDxXw9nj0Vr7vyZZTj0whdyO+GYs+xv0xHJ2A= +go.opentelemetry.io/collector/semconv v0.64.2-0.20221117234814-4565692c50a7/go.mod h1:5o9yhOa+ABt7g2E5JABDxGZ1PQPbtfxrKNbYn+LOTXU= go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.36.4 h1:aUEBEdCa6iamGzg6fuYxDA8ThxvOG240mAvWDU+XLio= go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.36.4/go.mod h1:l2MdsbKTocpPS5nQZscqTR9jd8u96VYZdcpF8Sye7mA= go.opentelemetry.io/contrib/propagators/b3 v1.11.1 h1:icQ6ttRV+r/2fnU46BIo/g/mPu6Rs5Ug8Rtohe3KqzI= diff --git a/receiver/pulsarreceiver/go.mod b/receiver/pulsarreceiver/go.mod index e780bd1de63f3..c2caf4b7a8813 100644 --- a/receiver/pulsarreceiver/go.mod +++ b/receiver/pulsarreceiver/go.mod @@ -11,9 +11,11 @@ require ( github.com/open-telemetry/opentelemetry-collector-contrib/pkg/translator/zipkin v0.64.0 github.com/openzipkin/zipkin-go v0.4.1 github.com/stretchr/testify v1.8.1 - go.opentelemetry.io/collector v0.64.2-0.20221115155901-1550938c18fd - go.opentelemetry.io/collector/pdata v0.64.2-0.20221115155901-1550938c18fd - go.opentelemetry.io/collector/semconv v0.64.2-0.20221115155901-1550938c18fd + go.opentelemetry.io/collector v0.64.2-0.20221117234814-4565692c50a7 + go.opentelemetry.io/collector/component v0.0.0-20221117234814-4565692c50a7 + go.opentelemetry.io/collector/consumer v0.0.0-20221117234814-4565692c50a7 + go.opentelemetry.io/collector/pdata v0.64.2-0.20221117234814-4565692c50a7 + go.opentelemetry.io/collector/semconv v0.64.2-0.20221117234814-4565692c50a7 go.uber.org/zap v1.23.0 ) @@ -60,6 +62,7 @@ require ( github.com/spaolacci/murmur3 v1.1.0 // indirect github.com/uber/jaeger-client-go v2.30.0+incompatible // indirect github.com/uber/jaeger-lib v2.4.1+incompatible // indirect + go.opentelemetry.io/collector/featuregate v0.0.0-20221117214536-6a117bfc3737 // indirect go.opentelemetry.io/otel v1.11.1 // indirect go.opentelemetry.io/otel/metric v0.33.0 // indirect go.opentelemetry.io/otel/trace v1.11.1 // indirect diff --git a/receiver/pulsarreceiver/go.sum b/receiver/pulsarreceiver/go.sum index 8e0f03a0d34e9..331aa16ef8e77 100644 --- a/receiver/pulsarreceiver/go.sum +++ b/receiver/pulsarreceiver/go.sum @@ -486,12 +486,18 @@ go.opencensus.io v0.22.3/go.mod h1:yxeiOL68Rb0Xd1ddK5vPZ/oVn4vY4Ynel7k9FzqtOIw= go.opencensus.io v0.22.4/go.mod h1:yxeiOL68Rb0Xd1ddK5vPZ/oVn4vY4Ynel7k9FzqtOIw= go.opencensus.io v0.22.5/go.mod h1:5pWMHQbX5EPX2/62yrJeAkowc+lfs/XD7Uxpq3pI6kk= go.opencensus.io v0.23.0/go.mod h1:XItmlyltB5F7CS4xOC1DcqMoFqwtC6OG2xF7mCv7P7E= -go.opentelemetry.io/collector v0.64.2-0.20221115155901-1550938c18fd h1:O+6HhE4Ivg8Jksp3dIXIEC4FIR0Ush4uORvG3UtHZWk= -go.opentelemetry.io/collector v0.64.2-0.20221115155901-1550938c18fd/go.mod h1:mmSrOcwe1vEYmChXUYuF6rzlrUL0rjEiPfa19Xxb41o= -go.opentelemetry.io/collector/pdata v0.64.2-0.20221115155901-1550938c18fd h1:GdVAbRiae5VDZe3Mn3FqzMxO/aI5UbJ4+dcviqClHy8= -go.opentelemetry.io/collector/pdata v0.64.2-0.20221115155901-1550938c18fd/go.mod h1:0vynPfW2ZN7DltpcCFgCmTtWMQkCjp2a3TNt82YTCLQ= -go.opentelemetry.io/collector/semconv v0.64.2-0.20221115155901-1550938c18fd h1:rMqcl2pwi8YtVrtOPK8tVh87W0bFBge4yqB9ypSsAJ4= -go.opentelemetry.io/collector/semconv v0.64.2-0.20221115155901-1550938c18fd/go.mod h1:5o9yhOa+ABt7g2E5JABDxGZ1PQPbtfxrKNbYn+LOTXU= +go.opentelemetry.io/collector v0.64.2-0.20221117234814-4565692c50a7 h1:o/vMr2iyXzaeTb/KAldhMxAvRIfFPwtKfL5cKVKsSlU= +go.opentelemetry.io/collector v0.64.2-0.20221117234814-4565692c50a7/go.mod h1:PO8hayFFYvXDqELbXRVxwawR2HTdjN6mY4Qa3Se9xI8= +go.opentelemetry.io/collector/component v0.0.0-20221117234814-4565692c50a7 h1:q9m1bGHhQFUakQX79lZpLmFSY9VLULNSs2jUG8MdJLA= +go.opentelemetry.io/collector/component v0.0.0-20221117234814-4565692c50a7/go.mod h1:Z7H1Oj826e4dtVxXmT6SiUr6S0EIevUJmkVpfQV+UOk= +go.opentelemetry.io/collector/consumer v0.0.0-20221117234814-4565692c50a7 h1:FTy1JD9EJ7gq9SzlZoi2NkGcZ88+SwdiJav5uRcDEEY= +go.opentelemetry.io/collector/consumer v0.0.0-20221117234814-4565692c50a7/go.mod h1:86Elcw/LLrh90DprArogHMkBX3+UMu3tIgcVWF3mr6o= +go.opentelemetry.io/collector/featuregate v0.0.0-20221117214536-6a117bfc3737 h1:7sXg6M9Fw6rFVlX+iaWOMz6DFXEiroUdQer5kWGixwM= +go.opentelemetry.io/collector/featuregate v0.0.0-20221117214536-6a117bfc3737/go.mod h1:tewuFKJYalWBU0bmNKg++MC1ipINXUr6szYzOw2p1GI= +go.opentelemetry.io/collector/pdata v0.64.2-0.20221117234814-4565692c50a7 h1:IOFqfOu7fFxTgC7pvc2U7dk1/uFjwVQPK+CALiUvacI= +go.opentelemetry.io/collector/pdata v0.64.2-0.20221117234814-4565692c50a7/go.mod h1:0vynPfW2ZN7DltpcCFgCmTtWMQkCjp2a3TNt82YTCLQ= +go.opentelemetry.io/collector/semconv v0.64.2-0.20221117234814-4565692c50a7 h1:cGXAVltDxXw9nj0Vr7vyZZTj0whdyO+GYs+xv0xHJ2A= +go.opentelemetry.io/collector/semconv v0.64.2-0.20221117234814-4565692c50a7/go.mod h1:5o9yhOa+ABt7g2E5JABDxGZ1PQPbtfxrKNbYn+LOTXU= go.opentelemetry.io/otel v1.11.1 h1:4WLLAmcfkmDk2ukNXJyq3/kiz/3UzCaYq6PskJsaou4= go.opentelemetry.io/otel v1.11.1/go.mod h1:1nNhXBbWSD0nsL38H6btgnFN2k4i0sNLHNNMZMSbUGE= go.opentelemetry.io/otel/metric v0.33.0 h1:xQAyl7uGEYvrLAiV/09iTJlp1pZnQ9Wl793qbVvED1E= diff --git a/receiver/rabbitmqreceiver/go.mod b/receiver/rabbitmqreceiver/go.mod index dfdefc562ccdc..40b525d0ce045 100644 --- a/receiver/rabbitmqreceiver/go.mod +++ b/receiver/rabbitmqreceiver/go.mod @@ -6,8 +6,10 @@ require ( github.com/open-telemetry/opentelemetry-collector-contrib/internal/scrapertest v0.64.0 github.com/stretchr/testify v1.8.1 github.com/testcontainers/testcontainers-go v0.15.0 - go.opentelemetry.io/collector v0.64.2-0.20221115155901-1550938c18fd - go.opentelemetry.io/collector/pdata v0.64.2-0.20221115155901-1550938c18fd + go.opentelemetry.io/collector v0.64.2-0.20221117234814-4565692c50a7 + go.opentelemetry.io/collector/component v0.0.0-20221117234814-4565692c50a7 + go.opentelemetry.io/collector/consumer v0.0.0-20221117234814-4565692c50a7 + go.opentelemetry.io/collector/pdata v0.64.2-0.20221117234814-4565692c50a7 go.uber.org/multierr v1.8.0 go.uber.org/zap v1.23.0 ) @@ -55,6 +57,7 @@ require ( github.com/sirupsen/logrus v1.8.1 // indirect github.com/stretchr/objx v0.5.0 // indirect go.opencensus.io v0.24.0 // indirect + go.opentelemetry.io/collector/featuregate v0.0.0-20221117214536-6a117bfc3737 // indirect go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.36.4 // indirect go.opentelemetry.io/otel v1.11.1 // indirect go.opentelemetry.io/otel/metric v0.33.0 // indirect diff --git a/receiver/rabbitmqreceiver/go.sum b/receiver/rabbitmqreceiver/go.sum index 9ba19bc9dd94d..ed4c4fdacdda3 100644 --- a/receiver/rabbitmqreceiver/go.sum +++ b/receiver/rabbitmqreceiver/go.sum @@ -829,10 +829,16 @@ go.opencensus.io v0.22.2/go.mod h1:yxeiOL68Rb0Xd1ddK5vPZ/oVn4vY4Ynel7k9FzqtOIw= go.opencensus.io v0.22.3/go.mod h1:yxeiOL68Rb0Xd1ddK5vPZ/oVn4vY4Ynel7k9FzqtOIw= go.opencensus.io v0.24.0 h1:y73uSU6J157QMP2kn2r30vwW1A2W2WFwSCGnAVxeaD0= go.opencensus.io v0.24.0/go.mod h1:vNK8G9p7aAivkbmorf4v+7Hgx+Zs0yY+0fOtgBfjQKo= -go.opentelemetry.io/collector v0.64.2-0.20221115155901-1550938c18fd h1:O+6HhE4Ivg8Jksp3dIXIEC4FIR0Ush4uORvG3UtHZWk= -go.opentelemetry.io/collector v0.64.2-0.20221115155901-1550938c18fd/go.mod h1:mmSrOcwe1vEYmChXUYuF6rzlrUL0rjEiPfa19Xxb41o= -go.opentelemetry.io/collector/pdata v0.64.2-0.20221115155901-1550938c18fd h1:GdVAbRiae5VDZe3Mn3FqzMxO/aI5UbJ4+dcviqClHy8= -go.opentelemetry.io/collector/pdata v0.64.2-0.20221115155901-1550938c18fd/go.mod h1:0vynPfW2ZN7DltpcCFgCmTtWMQkCjp2a3TNt82YTCLQ= +go.opentelemetry.io/collector v0.64.2-0.20221117234814-4565692c50a7 h1:o/vMr2iyXzaeTb/KAldhMxAvRIfFPwtKfL5cKVKsSlU= +go.opentelemetry.io/collector v0.64.2-0.20221117234814-4565692c50a7/go.mod h1:PO8hayFFYvXDqELbXRVxwawR2HTdjN6mY4Qa3Se9xI8= +go.opentelemetry.io/collector/component v0.0.0-20221117234814-4565692c50a7 h1:q9m1bGHhQFUakQX79lZpLmFSY9VLULNSs2jUG8MdJLA= +go.opentelemetry.io/collector/component v0.0.0-20221117234814-4565692c50a7/go.mod h1:Z7H1Oj826e4dtVxXmT6SiUr6S0EIevUJmkVpfQV+UOk= +go.opentelemetry.io/collector/consumer v0.0.0-20221117234814-4565692c50a7 h1:FTy1JD9EJ7gq9SzlZoi2NkGcZ88+SwdiJav5uRcDEEY= +go.opentelemetry.io/collector/consumer v0.0.0-20221117234814-4565692c50a7/go.mod h1:86Elcw/LLrh90DprArogHMkBX3+UMu3tIgcVWF3mr6o= +go.opentelemetry.io/collector/featuregate v0.0.0-20221117214536-6a117bfc3737 h1:7sXg6M9Fw6rFVlX+iaWOMz6DFXEiroUdQer5kWGixwM= +go.opentelemetry.io/collector/featuregate v0.0.0-20221117214536-6a117bfc3737/go.mod h1:tewuFKJYalWBU0bmNKg++MC1ipINXUr6szYzOw2p1GI= +go.opentelemetry.io/collector/pdata v0.64.2-0.20221117234814-4565692c50a7 h1:IOFqfOu7fFxTgC7pvc2U7dk1/uFjwVQPK+CALiUvacI= +go.opentelemetry.io/collector/pdata v0.64.2-0.20221117234814-4565692c50a7/go.mod h1:0vynPfW2ZN7DltpcCFgCmTtWMQkCjp2a3TNt82YTCLQ= go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.36.4 h1:aUEBEdCa6iamGzg6fuYxDA8ThxvOG240mAvWDU+XLio= go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.36.4/go.mod h1:l2MdsbKTocpPS5nQZscqTR9jd8u96VYZdcpF8Sye7mA= go.opentelemetry.io/otel v1.11.1 h1:4WLLAmcfkmDk2ukNXJyq3/kiz/3UzCaYq6PskJsaou4= diff --git a/receiver/receivercreator/config_test.go b/receiver/receivercreator/config_test.go index e313126ac0921..e088060b799da 100644 --- a/receiver/receivercreator/config_test.go +++ b/receiver/receivercreator/config_test.go @@ -124,7 +124,7 @@ func TestLoadConfig(t *testing.T) { require.NoError(t, err) require.NoError(t, component.UnmarshalReceiverConfig(sub, cfg)) - assert.NoError(t, cfg.Validate()) + assert.NoError(t, component.ValidateConfig(cfg)) assert.Equal(t, tt.expected, cfg) }) } diff --git a/receiver/receivercreator/go.mod b/receiver/receivercreator/go.mod index df429786382aa..cdab6992f76d9 100644 --- a/receiver/receivercreator/go.mod +++ b/receiver/receivercreator/go.mod @@ -9,9 +9,11 @@ require ( github.com/open-telemetry/opentelemetry-collector-contrib/pkg/translator/opencensus v0.64.0 github.com/spf13/cast v1.5.0 github.com/stretchr/testify v1.8.1 - go.opentelemetry.io/collector v0.64.2-0.20221115155901-1550938c18fd - go.opentelemetry.io/collector/pdata v0.64.2-0.20221115155901-1550938c18fd - go.opentelemetry.io/collector/semconv v0.64.2-0.20221115155901-1550938c18fd + go.opentelemetry.io/collector v0.64.2-0.20221117234814-4565692c50a7 + go.opentelemetry.io/collector/component v0.0.0-20221117234814-4565692c50a7 + go.opentelemetry.io/collector/consumer v0.0.0-20221117234814-4565692c50a7 + go.opentelemetry.io/collector/pdata v0.64.2-0.20221117234814-4565692c50a7 + go.opentelemetry.io/collector/semconv v0.64.2-0.20221117234814-4565692c50a7 go.uber.org/multierr v1.8.0 go.uber.org/zap v1.23.0 ) @@ -56,7 +58,8 @@ require ( github.com/tklauser/numcpus v0.4.0 // indirect github.com/yusufpapurcu/wmi v1.2.2 // indirect go.opencensus.io v0.24.0 // indirect - go.opentelemetry.io/collector/processor/batchprocessor v0.64.2-0.20221115155901-1550938c18fd // indirect + go.opentelemetry.io/collector/featuregate v0.0.0-20221117214536-6a117bfc3737 // indirect + go.opentelemetry.io/collector/processor/batchprocessor v0.64.2-0.20221117234814-4565692c50a7 // indirect go.opentelemetry.io/contrib/propagators/b3 v1.11.1 // indirect go.opentelemetry.io/otel v1.11.1 // indirect go.opentelemetry.io/otel/exporters/prometheus v0.33.0 // indirect diff --git a/receiver/receivercreator/go.sum b/receiver/receivercreator/go.sum index ccf69ca001284..9a5dc5805fb19 100644 --- a/receiver/receivercreator/go.sum +++ b/receiver/receivercreator/go.sum @@ -416,15 +416,21 @@ go.opencensus.io v0.22.4/go.mod h1:yxeiOL68Rb0Xd1ddK5vPZ/oVn4vY4Ynel7k9FzqtOIw= go.opencensus.io v0.23.0/go.mod h1:XItmlyltB5F7CS4xOC1DcqMoFqwtC6OG2xF7mCv7P7E= go.opencensus.io v0.24.0 h1:y73uSU6J157QMP2kn2r30vwW1A2W2WFwSCGnAVxeaD0= go.opencensus.io v0.24.0/go.mod h1:vNK8G9p7aAivkbmorf4v+7Hgx+Zs0yY+0fOtgBfjQKo= -go.opentelemetry.io/collector v0.64.2-0.20221115155901-1550938c18fd h1:O+6HhE4Ivg8Jksp3dIXIEC4FIR0Ush4uORvG3UtHZWk= -go.opentelemetry.io/collector v0.64.2-0.20221115155901-1550938c18fd/go.mod h1:mmSrOcwe1vEYmChXUYuF6rzlrUL0rjEiPfa19Xxb41o= +go.opentelemetry.io/collector v0.64.2-0.20221117234814-4565692c50a7 h1:o/vMr2iyXzaeTb/KAldhMxAvRIfFPwtKfL5cKVKsSlU= +go.opentelemetry.io/collector v0.64.2-0.20221117234814-4565692c50a7/go.mod h1:PO8hayFFYvXDqELbXRVxwawR2HTdjN6mY4Qa3Se9xI8= +go.opentelemetry.io/collector/component v0.0.0-20221117234814-4565692c50a7 h1:q9m1bGHhQFUakQX79lZpLmFSY9VLULNSs2jUG8MdJLA= +go.opentelemetry.io/collector/component v0.0.0-20221117234814-4565692c50a7/go.mod h1:Z7H1Oj826e4dtVxXmT6SiUr6S0EIevUJmkVpfQV+UOk= +go.opentelemetry.io/collector/consumer v0.0.0-20221117234814-4565692c50a7 h1:FTy1JD9EJ7gq9SzlZoi2NkGcZ88+SwdiJav5uRcDEEY= +go.opentelemetry.io/collector/consumer v0.0.0-20221117234814-4565692c50a7/go.mod h1:86Elcw/LLrh90DprArogHMkBX3+UMu3tIgcVWF3mr6o= go.opentelemetry.io/collector/extension/zpagesextension v0.64.1 h1:2qTBtVigWNwPSpN9XR+WobC1idF2S8X/FIahFGCE1i4= -go.opentelemetry.io/collector/pdata v0.64.2-0.20221115155901-1550938c18fd h1:GdVAbRiae5VDZe3Mn3FqzMxO/aI5UbJ4+dcviqClHy8= -go.opentelemetry.io/collector/pdata v0.64.2-0.20221115155901-1550938c18fd/go.mod h1:0vynPfW2ZN7DltpcCFgCmTtWMQkCjp2a3TNt82YTCLQ= -go.opentelemetry.io/collector/processor/batchprocessor v0.64.2-0.20221115155901-1550938c18fd h1:SSjP8V0UP2+oPZ3gL+Dk90KQcvHXvHp9V5h8IIpx0og= -go.opentelemetry.io/collector/processor/batchprocessor v0.64.2-0.20221115155901-1550938c18fd/go.mod h1:zyCnX0aTvBaZ3XLWSHZdTueP7WoXRjz8X6HiWgKqstM= -go.opentelemetry.io/collector/semconv v0.64.2-0.20221115155901-1550938c18fd h1:rMqcl2pwi8YtVrtOPK8tVh87W0bFBge4yqB9ypSsAJ4= -go.opentelemetry.io/collector/semconv v0.64.2-0.20221115155901-1550938c18fd/go.mod h1:5o9yhOa+ABt7g2E5JABDxGZ1PQPbtfxrKNbYn+LOTXU= +go.opentelemetry.io/collector/featuregate v0.0.0-20221117214536-6a117bfc3737 h1:7sXg6M9Fw6rFVlX+iaWOMz6DFXEiroUdQer5kWGixwM= +go.opentelemetry.io/collector/featuregate v0.0.0-20221117214536-6a117bfc3737/go.mod h1:tewuFKJYalWBU0bmNKg++MC1ipINXUr6szYzOw2p1GI= +go.opentelemetry.io/collector/pdata v0.64.2-0.20221117234814-4565692c50a7 h1:IOFqfOu7fFxTgC7pvc2U7dk1/uFjwVQPK+CALiUvacI= +go.opentelemetry.io/collector/pdata v0.64.2-0.20221117234814-4565692c50a7/go.mod h1:0vynPfW2ZN7DltpcCFgCmTtWMQkCjp2a3TNt82YTCLQ= +go.opentelemetry.io/collector/processor/batchprocessor v0.64.2-0.20221117234814-4565692c50a7 h1:hGDq2T07j6qwwtQ2t6ZGU5tp/J2Dvu9mfY5qnnP5Ic8= +go.opentelemetry.io/collector/processor/batchprocessor v0.64.2-0.20221117234814-4565692c50a7/go.mod h1:b83iea2eDSAQkvd+2aSokaa6GRjSIsaR2zILziF/Ogc= +go.opentelemetry.io/collector/semconv v0.64.2-0.20221117234814-4565692c50a7 h1:cGXAVltDxXw9nj0Vr7vyZZTj0whdyO+GYs+xv0xHJ2A= +go.opentelemetry.io/collector/semconv v0.64.2-0.20221117234814-4565692c50a7/go.mod h1:5o9yhOa+ABt7g2E5JABDxGZ1PQPbtfxrKNbYn+LOTXU= go.opentelemetry.io/contrib/propagators/b3 v1.11.1 h1:icQ6ttRV+r/2fnU46BIo/g/mPu6Rs5Ug8Rtohe3KqzI= go.opentelemetry.io/contrib/propagators/b3 v1.11.1/go.mod h1:ECIveyMXgnl4gorxFcA7RYjJY/Ql9n20ubhbfDc3QfA= go.opentelemetry.io/contrib/zpages v0.36.4 h1:Z2VK5WsDhWs9VwZ1p0TM5RyusTOgAQfdMMDDQPRnlmY= diff --git a/receiver/redisreceiver/go.mod b/receiver/redisreceiver/go.mod index 7bc7055cde4ee..f18288483f95e 100644 --- a/receiver/redisreceiver/go.mod +++ b/receiver/redisreceiver/go.mod @@ -6,8 +6,10 @@ require ( github.com/go-redis/redis/v7 v7.4.1 github.com/stretchr/testify v1.8.1 github.com/testcontainers/testcontainers-go v0.15.0 - go.opentelemetry.io/collector v0.64.2-0.20221115155901-1550938c18fd - go.opentelemetry.io/collector/pdata v0.64.2-0.20221115155901-1550938c18fd + go.opentelemetry.io/collector v0.64.2-0.20221117234814-4565692c50a7 + go.opentelemetry.io/collector/component v0.0.0-20221117234814-4565692c50a7 + go.opentelemetry.io/collector/consumer v0.0.0-20221117234814-4565692c50a7 + go.opentelemetry.io/collector/pdata v0.64.2-0.20221117234814-4565692c50a7 go.uber.org/zap v1.23.0 ) @@ -50,6 +52,7 @@ require ( github.com/pmezard/go-difflib v1.0.0 // indirect github.com/sirupsen/logrus v1.8.1 // indirect go.opencensus.io v0.24.0 // indirect + go.opentelemetry.io/collector/featuregate v0.0.0-20221117214536-6a117bfc3737 // indirect go.opentelemetry.io/otel v1.11.1 // indirect go.opentelemetry.io/otel/metric v0.33.0 // indirect go.opentelemetry.io/otel/trace v1.11.1 // indirect diff --git a/receiver/redisreceiver/go.sum b/receiver/redisreceiver/go.sum index d5a8032fb91f3..e0b8a7d781e3b 100644 --- a/receiver/redisreceiver/go.sum +++ b/receiver/redisreceiver/go.sum @@ -829,10 +829,16 @@ go.opencensus.io v0.22.2/go.mod h1:yxeiOL68Rb0Xd1ddK5vPZ/oVn4vY4Ynel7k9FzqtOIw= go.opencensus.io v0.22.3/go.mod h1:yxeiOL68Rb0Xd1ddK5vPZ/oVn4vY4Ynel7k9FzqtOIw= go.opencensus.io v0.24.0 h1:y73uSU6J157QMP2kn2r30vwW1A2W2WFwSCGnAVxeaD0= go.opencensus.io v0.24.0/go.mod h1:vNK8G9p7aAivkbmorf4v+7Hgx+Zs0yY+0fOtgBfjQKo= -go.opentelemetry.io/collector v0.64.2-0.20221115155901-1550938c18fd h1:O+6HhE4Ivg8Jksp3dIXIEC4FIR0Ush4uORvG3UtHZWk= -go.opentelemetry.io/collector v0.64.2-0.20221115155901-1550938c18fd/go.mod h1:mmSrOcwe1vEYmChXUYuF6rzlrUL0rjEiPfa19Xxb41o= -go.opentelemetry.io/collector/pdata v0.64.2-0.20221115155901-1550938c18fd h1:GdVAbRiae5VDZe3Mn3FqzMxO/aI5UbJ4+dcviqClHy8= -go.opentelemetry.io/collector/pdata v0.64.2-0.20221115155901-1550938c18fd/go.mod h1:0vynPfW2ZN7DltpcCFgCmTtWMQkCjp2a3TNt82YTCLQ= +go.opentelemetry.io/collector v0.64.2-0.20221117234814-4565692c50a7 h1:o/vMr2iyXzaeTb/KAldhMxAvRIfFPwtKfL5cKVKsSlU= +go.opentelemetry.io/collector v0.64.2-0.20221117234814-4565692c50a7/go.mod h1:PO8hayFFYvXDqELbXRVxwawR2HTdjN6mY4Qa3Se9xI8= +go.opentelemetry.io/collector/component v0.0.0-20221117234814-4565692c50a7 h1:q9m1bGHhQFUakQX79lZpLmFSY9VLULNSs2jUG8MdJLA= +go.opentelemetry.io/collector/component v0.0.0-20221117234814-4565692c50a7/go.mod h1:Z7H1Oj826e4dtVxXmT6SiUr6S0EIevUJmkVpfQV+UOk= +go.opentelemetry.io/collector/consumer v0.0.0-20221117234814-4565692c50a7 h1:FTy1JD9EJ7gq9SzlZoi2NkGcZ88+SwdiJav5uRcDEEY= +go.opentelemetry.io/collector/consumer v0.0.0-20221117234814-4565692c50a7/go.mod h1:86Elcw/LLrh90DprArogHMkBX3+UMu3tIgcVWF3mr6o= +go.opentelemetry.io/collector/featuregate v0.0.0-20221117214536-6a117bfc3737 h1:7sXg6M9Fw6rFVlX+iaWOMz6DFXEiroUdQer5kWGixwM= +go.opentelemetry.io/collector/featuregate v0.0.0-20221117214536-6a117bfc3737/go.mod h1:tewuFKJYalWBU0bmNKg++MC1ipINXUr6szYzOw2p1GI= +go.opentelemetry.io/collector/pdata v0.64.2-0.20221117234814-4565692c50a7 h1:IOFqfOu7fFxTgC7pvc2U7dk1/uFjwVQPK+CALiUvacI= +go.opentelemetry.io/collector/pdata v0.64.2-0.20221117234814-4565692c50a7/go.mod h1:0vynPfW2ZN7DltpcCFgCmTtWMQkCjp2a3TNt82YTCLQ= go.opentelemetry.io/otel v1.11.1 h1:4WLLAmcfkmDk2ukNXJyq3/kiz/3UzCaYq6PskJsaou4= go.opentelemetry.io/otel v1.11.1/go.mod h1:1nNhXBbWSD0nsL38H6btgnFN2k4i0sNLHNNMZMSbUGE= go.opentelemetry.io/otel/exporters/prometheus v0.33.0 h1:xXhPj7SLKWU5/Zd4Hxmd+X1C4jdmvc0Xy+kvjFx2z60= diff --git a/receiver/riakreceiver/go.mod b/receiver/riakreceiver/go.mod index dd8fcb0d5df7d..54b18adcf4a2a 100644 --- a/receiver/riakreceiver/go.mod +++ b/receiver/riakreceiver/go.mod @@ -6,8 +6,10 @@ require ( github.com/open-telemetry/opentelemetry-collector-contrib/internal/scrapertest v0.64.0 github.com/stretchr/testify v1.8.1 github.com/testcontainers/testcontainers-go v0.15.0 - go.opentelemetry.io/collector v0.64.2-0.20221115155901-1550938c18fd - go.opentelemetry.io/collector/pdata v0.64.2-0.20221115155901-1550938c18fd + go.opentelemetry.io/collector v0.64.2-0.20221117234814-4565692c50a7 + go.opentelemetry.io/collector/component v0.0.0-20221117234814-4565692c50a7 + go.opentelemetry.io/collector/consumer v0.0.0-20221117234814-4565692c50a7 + go.opentelemetry.io/collector/pdata v0.64.2-0.20221117234814-4565692c50a7 go.uber.org/multierr v1.8.0 go.uber.org/zap v1.23.0 ) @@ -55,6 +57,7 @@ require ( github.com/sirupsen/logrus v1.8.1 // indirect github.com/stretchr/objx v0.5.0 // indirect go.opencensus.io v0.24.0 // indirect + go.opentelemetry.io/collector/featuregate v0.0.0-20221117214536-6a117bfc3737 // indirect go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.36.4 // indirect go.opentelemetry.io/otel v1.11.1 // indirect go.opentelemetry.io/otel/metric v0.33.0 // indirect diff --git a/receiver/riakreceiver/go.sum b/receiver/riakreceiver/go.sum index 9ba19bc9dd94d..ed4c4fdacdda3 100644 --- a/receiver/riakreceiver/go.sum +++ b/receiver/riakreceiver/go.sum @@ -829,10 +829,16 @@ go.opencensus.io v0.22.2/go.mod h1:yxeiOL68Rb0Xd1ddK5vPZ/oVn4vY4Ynel7k9FzqtOIw= go.opencensus.io v0.22.3/go.mod h1:yxeiOL68Rb0Xd1ddK5vPZ/oVn4vY4Ynel7k9FzqtOIw= go.opencensus.io v0.24.0 h1:y73uSU6J157QMP2kn2r30vwW1A2W2WFwSCGnAVxeaD0= go.opencensus.io v0.24.0/go.mod h1:vNK8G9p7aAivkbmorf4v+7Hgx+Zs0yY+0fOtgBfjQKo= -go.opentelemetry.io/collector v0.64.2-0.20221115155901-1550938c18fd h1:O+6HhE4Ivg8Jksp3dIXIEC4FIR0Ush4uORvG3UtHZWk= -go.opentelemetry.io/collector v0.64.2-0.20221115155901-1550938c18fd/go.mod h1:mmSrOcwe1vEYmChXUYuF6rzlrUL0rjEiPfa19Xxb41o= -go.opentelemetry.io/collector/pdata v0.64.2-0.20221115155901-1550938c18fd h1:GdVAbRiae5VDZe3Mn3FqzMxO/aI5UbJ4+dcviqClHy8= -go.opentelemetry.io/collector/pdata v0.64.2-0.20221115155901-1550938c18fd/go.mod h1:0vynPfW2ZN7DltpcCFgCmTtWMQkCjp2a3TNt82YTCLQ= +go.opentelemetry.io/collector v0.64.2-0.20221117234814-4565692c50a7 h1:o/vMr2iyXzaeTb/KAldhMxAvRIfFPwtKfL5cKVKsSlU= +go.opentelemetry.io/collector v0.64.2-0.20221117234814-4565692c50a7/go.mod h1:PO8hayFFYvXDqELbXRVxwawR2HTdjN6mY4Qa3Se9xI8= +go.opentelemetry.io/collector/component v0.0.0-20221117234814-4565692c50a7 h1:q9m1bGHhQFUakQX79lZpLmFSY9VLULNSs2jUG8MdJLA= +go.opentelemetry.io/collector/component v0.0.0-20221117234814-4565692c50a7/go.mod h1:Z7H1Oj826e4dtVxXmT6SiUr6S0EIevUJmkVpfQV+UOk= +go.opentelemetry.io/collector/consumer v0.0.0-20221117234814-4565692c50a7 h1:FTy1JD9EJ7gq9SzlZoi2NkGcZ88+SwdiJav5uRcDEEY= +go.opentelemetry.io/collector/consumer v0.0.0-20221117234814-4565692c50a7/go.mod h1:86Elcw/LLrh90DprArogHMkBX3+UMu3tIgcVWF3mr6o= +go.opentelemetry.io/collector/featuregate v0.0.0-20221117214536-6a117bfc3737 h1:7sXg6M9Fw6rFVlX+iaWOMz6DFXEiroUdQer5kWGixwM= +go.opentelemetry.io/collector/featuregate v0.0.0-20221117214536-6a117bfc3737/go.mod h1:tewuFKJYalWBU0bmNKg++MC1ipINXUr6szYzOw2p1GI= +go.opentelemetry.io/collector/pdata v0.64.2-0.20221117234814-4565692c50a7 h1:IOFqfOu7fFxTgC7pvc2U7dk1/uFjwVQPK+CALiUvacI= +go.opentelemetry.io/collector/pdata v0.64.2-0.20221117234814-4565692c50a7/go.mod h1:0vynPfW2ZN7DltpcCFgCmTtWMQkCjp2a3TNt82YTCLQ= go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.36.4 h1:aUEBEdCa6iamGzg6fuYxDA8ThxvOG240mAvWDU+XLio= go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.36.4/go.mod h1:l2MdsbKTocpPS5nQZscqTR9jd8u96VYZdcpF8Sye7mA= go.opentelemetry.io/otel v1.11.1 h1:4WLLAmcfkmDk2ukNXJyq3/kiz/3UzCaYq6PskJsaou4= diff --git a/receiver/saphanareceiver/config_test.go b/receiver/saphanareceiver/config_test.go index 32fd99d512bfa..43d9fba8905fc 100644 --- a/receiver/saphanareceiver/config_test.go +++ b/receiver/saphanareceiver/config_test.go @@ -77,7 +77,7 @@ func TestValidate(t *testing.T) { factory := NewFactory() cfg := factory.CreateDefaultConfig().(*Config) tC.defaultConfigModifier(cfg) - actual := cfg.Validate() + actual := component.ValidateConfig(cfg) require.Equal(t, tC.expected, actual) }) } diff --git a/receiver/saphanareceiver/factory.go b/receiver/saphanareceiver/factory.go index e403ad80c4c49..c4a314137ef32 100644 --- a/receiver/saphanareceiver/factory.go +++ b/receiver/saphanareceiver/factory.go @@ -30,7 +30,7 @@ import ( const ( typeStr = "saphana" - stability = component.StabilityLevelInDevelopment + stability = component.StabilityLevelDevelopment defaultEndpoint = "localhost:33015" ) diff --git a/receiver/saphanareceiver/factory_test.go b/receiver/saphanareceiver/factory_test.go index 7fe15e0f6603d..30aa54b558193 100644 --- a/receiver/saphanareceiver/factory_test.go +++ b/receiver/saphanareceiver/factory_test.go @@ -38,7 +38,7 @@ func TestValidConfig(t *testing.T) { cfg := factory.CreateDefaultConfig().(*Config) cfg.Username = "otel" cfg.Password = "otel" - require.NoError(t, cfg.Validate()) + require.NoError(t, component.ValidateConfig(cfg)) } func TestCreateMetricsReceiver(t *testing.T) { diff --git a/receiver/saphanareceiver/go.mod b/receiver/saphanareceiver/go.mod index 59d1ae49226b2..deeaa2167202b 100644 --- a/receiver/saphanareceiver/go.mod +++ b/receiver/saphanareceiver/go.mod @@ -7,8 +7,10 @@ require ( github.com/google/go-cmp v0.5.9 github.com/open-telemetry/opentelemetry-collector-contrib/internal/scrapertest v0.64.0 github.com/stretchr/testify v1.8.1 - go.opentelemetry.io/collector v0.64.2-0.20221115155901-1550938c18fd - go.opentelemetry.io/collector/pdata v0.64.2-0.20221115155901-1550938c18fd + go.opentelemetry.io/collector v0.64.2-0.20221117234814-4565692c50a7 + go.opentelemetry.io/collector/component v0.0.0-20221117234814-4565692c50a7 + go.opentelemetry.io/collector/consumer v0.0.0-20221117234814-4565692c50a7 + go.opentelemetry.io/collector/pdata v0.64.2-0.20221117234814-4565692c50a7 go.uber.org/multierr v1.8.0 ) @@ -30,6 +32,7 @@ require ( github.com/rogpeppe/go-internal v1.6.1 // indirect github.com/stretchr/objx v0.5.0 // indirect go.opencensus.io v0.24.0 // indirect + go.opentelemetry.io/collector/featuregate v0.0.0-20221117214536-6a117bfc3737 // indirect go.opentelemetry.io/otel v1.11.1 // indirect go.opentelemetry.io/otel/metric v0.33.0 // indirect go.opentelemetry.io/otel/trace v1.11.1 // indirect diff --git a/receiver/saphanareceiver/go.sum b/receiver/saphanareceiver/go.sum index d343f92503bcb..26abaabf38efc 100644 --- a/receiver/saphanareceiver/go.sum +++ b/receiver/saphanareceiver/go.sum @@ -286,10 +286,16 @@ go.etcd.io/etcd/client/pkg/v3 v3.5.4/go.mod h1:IJHfcCEKxYu1Os13ZdwCwIUTUVGYTSAM3 go.etcd.io/etcd/client/v3 v3.5.4/go.mod h1:ZaRkVgBZC+L+dLCjTcF1hRXpgZXQPOvnA/Ak/gq3kiY= go.opencensus.io v0.24.0 h1:y73uSU6J157QMP2kn2r30vwW1A2W2WFwSCGnAVxeaD0= go.opencensus.io v0.24.0/go.mod h1:vNK8G9p7aAivkbmorf4v+7Hgx+Zs0yY+0fOtgBfjQKo= -go.opentelemetry.io/collector v0.64.2-0.20221115155901-1550938c18fd h1:O+6HhE4Ivg8Jksp3dIXIEC4FIR0Ush4uORvG3UtHZWk= -go.opentelemetry.io/collector v0.64.2-0.20221115155901-1550938c18fd/go.mod h1:mmSrOcwe1vEYmChXUYuF6rzlrUL0rjEiPfa19Xxb41o= -go.opentelemetry.io/collector/pdata v0.64.2-0.20221115155901-1550938c18fd h1:GdVAbRiae5VDZe3Mn3FqzMxO/aI5UbJ4+dcviqClHy8= -go.opentelemetry.io/collector/pdata v0.64.2-0.20221115155901-1550938c18fd/go.mod h1:0vynPfW2ZN7DltpcCFgCmTtWMQkCjp2a3TNt82YTCLQ= +go.opentelemetry.io/collector v0.64.2-0.20221117234814-4565692c50a7 h1:o/vMr2iyXzaeTb/KAldhMxAvRIfFPwtKfL5cKVKsSlU= +go.opentelemetry.io/collector v0.64.2-0.20221117234814-4565692c50a7/go.mod h1:PO8hayFFYvXDqELbXRVxwawR2HTdjN6mY4Qa3Se9xI8= +go.opentelemetry.io/collector/component v0.0.0-20221117234814-4565692c50a7 h1:q9m1bGHhQFUakQX79lZpLmFSY9VLULNSs2jUG8MdJLA= +go.opentelemetry.io/collector/component v0.0.0-20221117234814-4565692c50a7/go.mod h1:Z7H1Oj826e4dtVxXmT6SiUr6S0EIevUJmkVpfQV+UOk= +go.opentelemetry.io/collector/consumer v0.0.0-20221117234814-4565692c50a7 h1:FTy1JD9EJ7gq9SzlZoi2NkGcZ88+SwdiJav5uRcDEEY= +go.opentelemetry.io/collector/consumer v0.0.0-20221117234814-4565692c50a7/go.mod h1:86Elcw/LLrh90DprArogHMkBX3+UMu3tIgcVWF3mr6o= +go.opentelemetry.io/collector/featuregate v0.0.0-20221117214536-6a117bfc3737 h1:7sXg6M9Fw6rFVlX+iaWOMz6DFXEiroUdQer5kWGixwM= +go.opentelemetry.io/collector/featuregate v0.0.0-20221117214536-6a117bfc3737/go.mod h1:tewuFKJYalWBU0bmNKg++MC1ipINXUr6szYzOw2p1GI= +go.opentelemetry.io/collector/pdata v0.64.2-0.20221117234814-4565692c50a7 h1:IOFqfOu7fFxTgC7pvc2U7dk1/uFjwVQPK+CALiUvacI= +go.opentelemetry.io/collector/pdata v0.64.2-0.20221117234814-4565692c50a7/go.mod h1:0vynPfW2ZN7DltpcCFgCmTtWMQkCjp2a3TNt82YTCLQ= go.opentelemetry.io/otel v1.11.1 h1:4WLLAmcfkmDk2ukNXJyq3/kiz/3UzCaYq6PskJsaou4= go.opentelemetry.io/otel v1.11.1/go.mod h1:1nNhXBbWSD0nsL38H6btgnFN2k4i0sNLHNNMZMSbUGE= go.opentelemetry.io/otel/exporters/prometheus v0.33.0 h1:xXhPj7SLKWU5/Zd4Hxmd+X1C4jdmvc0Xy+kvjFx2z60= diff --git a/receiver/sapmreceiver/config_test.go b/receiver/sapmreceiver/config_test.go index cf3da3f49bf1f..8d573de01041e 100644 --- a/receiver/sapmreceiver/config_test.go +++ b/receiver/sapmreceiver/config_test.go @@ -90,7 +90,7 @@ func TestLoadConfig(t *testing.T) { require.NoError(t, err) require.NoError(t, component.UnmarshalReceiverConfig(sub, cfg)) - assert.NoError(t, cfg.Validate()) + assert.NoError(t, component.ValidateConfig(cfg)) assert.Equal(t, tt.expected, cfg) }) } diff --git a/receiver/sapmreceiver/go.mod b/receiver/sapmreceiver/go.mod index 8e35ffafeacd2..1b65dc1c876da 100644 --- a/receiver/sapmreceiver/go.mod +++ b/receiver/sapmreceiver/go.mod @@ -10,9 +10,11 @@ require ( github.com/open-telemetry/opentelemetry-collector-contrib/pkg/translator/jaeger v0.64.0 github.com/signalfx/sapm-proto v0.12.0 github.com/stretchr/testify v1.8.1 - go.opentelemetry.io/collector v0.64.2-0.20221115155901-1550938c18fd - go.opentelemetry.io/collector/pdata v0.64.2-0.20221115155901-1550938c18fd - go.opentelemetry.io/collector/semconv v0.64.2-0.20221115155901-1550938c18fd + go.opentelemetry.io/collector v0.64.2-0.20221117234814-4565692c50a7 + go.opentelemetry.io/collector/component v0.0.0-20221117234814-4565692c50a7 + go.opentelemetry.io/collector/consumer v0.0.0-20221117234814-4565692c50a7 + go.opentelemetry.io/collector/pdata v0.64.2-0.20221117234814-4565692c50a7 + go.opentelemetry.io/collector/semconv v0.64.2-0.20221117234814-4565692c50a7 ) require ( @@ -40,6 +42,7 @@ require ( github.com/uber/jaeger-client-go v2.30.0+incompatible // indirect github.com/uber/jaeger-lib v2.4.1+incompatible // indirect go.opencensus.io v0.24.0 // indirect + go.opentelemetry.io/collector/featuregate v0.0.0-20221117214536-6a117bfc3737 // indirect go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.36.4 // indirect go.opentelemetry.io/otel v1.11.1 // indirect go.opentelemetry.io/otel/metric v0.33.0 // indirect diff --git a/receiver/sapmreceiver/go.sum b/receiver/sapmreceiver/go.sum index 13c66d3e581b4..e204aff789d44 100644 --- a/receiver/sapmreceiver/go.sum +++ b/receiver/sapmreceiver/go.sum @@ -300,12 +300,18 @@ go.etcd.io/etcd/client/pkg/v3 v3.5.4/go.mod h1:IJHfcCEKxYu1Os13ZdwCwIUTUVGYTSAM3 go.etcd.io/etcd/client/v3 v3.5.4/go.mod h1:ZaRkVgBZC+L+dLCjTcF1hRXpgZXQPOvnA/Ak/gq3kiY= go.opencensus.io v0.24.0 h1:y73uSU6J157QMP2kn2r30vwW1A2W2WFwSCGnAVxeaD0= go.opencensus.io v0.24.0/go.mod h1:vNK8G9p7aAivkbmorf4v+7Hgx+Zs0yY+0fOtgBfjQKo= -go.opentelemetry.io/collector v0.64.2-0.20221115155901-1550938c18fd h1:O+6HhE4Ivg8Jksp3dIXIEC4FIR0Ush4uORvG3UtHZWk= -go.opentelemetry.io/collector v0.64.2-0.20221115155901-1550938c18fd/go.mod h1:mmSrOcwe1vEYmChXUYuF6rzlrUL0rjEiPfa19Xxb41o= -go.opentelemetry.io/collector/pdata v0.64.2-0.20221115155901-1550938c18fd h1:GdVAbRiae5VDZe3Mn3FqzMxO/aI5UbJ4+dcviqClHy8= -go.opentelemetry.io/collector/pdata v0.64.2-0.20221115155901-1550938c18fd/go.mod h1:0vynPfW2ZN7DltpcCFgCmTtWMQkCjp2a3TNt82YTCLQ= -go.opentelemetry.io/collector/semconv v0.64.2-0.20221115155901-1550938c18fd h1:rMqcl2pwi8YtVrtOPK8tVh87W0bFBge4yqB9ypSsAJ4= -go.opentelemetry.io/collector/semconv v0.64.2-0.20221115155901-1550938c18fd/go.mod h1:5o9yhOa+ABt7g2E5JABDxGZ1PQPbtfxrKNbYn+LOTXU= +go.opentelemetry.io/collector v0.64.2-0.20221117234814-4565692c50a7 h1:o/vMr2iyXzaeTb/KAldhMxAvRIfFPwtKfL5cKVKsSlU= +go.opentelemetry.io/collector v0.64.2-0.20221117234814-4565692c50a7/go.mod h1:PO8hayFFYvXDqELbXRVxwawR2HTdjN6mY4Qa3Se9xI8= +go.opentelemetry.io/collector/component v0.0.0-20221117234814-4565692c50a7 h1:q9m1bGHhQFUakQX79lZpLmFSY9VLULNSs2jUG8MdJLA= +go.opentelemetry.io/collector/component v0.0.0-20221117234814-4565692c50a7/go.mod h1:Z7H1Oj826e4dtVxXmT6SiUr6S0EIevUJmkVpfQV+UOk= +go.opentelemetry.io/collector/consumer v0.0.0-20221117234814-4565692c50a7 h1:FTy1JD9EJ7gq9SzlZoi2NkGcZ88+SwdiJav5uRcDEEY= +go.opentelemetry.io/collector/consumer v0.0.0-20221117234814-4565692c50a7/go.mod h1:86Elcw/LLrh90DprArogHMkBX3+UMu3tIgcVWF3mr6o= +go.opentelemetry.io/collector/featuregate v0.0.0-20221117214536-6a117bfc3737 h1:7sXg6M9Fw6rFVlX+iaWOMz6DFXEiroUdQer5kWGixwM= +go.opentelemetry.io/collector/featuregate v0.0.0-20221117214536-6a117bfc3737/go.mod h1:tewuFKJYalWBU0bmNKg++MC1ipINXUr6szYzOw2p1GI= +go.opentelemetry.io/collector/pdata v0.64.2-0.20221117234814-4565692c50a7 h1:IOFqfOu7fFxTgC7pvc2U7dk1/uFjwVQPK+CALiUvacI= +go.opentelemetry.io/collector/pdata v0.64.2-0.20221117234814-4565692c50a7/go.mod h1:0vynPfW2ZN7DltpcCFgCmTtWMQkCjp2a3TNt82YTCLQ= +go.opentelemetry.io/collector/semconv v0.64.2-0.20221117234814-4565692c50a7 h1:cGXAVltDxXw9nj0Vr7vyZZTj0whdyO+GYs+xv0xHJ2A= +go.opentelemetry.io/collector/semconv v0.64.2-0.20221117234814-4565692c50a7/go.mod h1:5o9yhOa+ABt7g2E5JABDxGZ1PQPbtfxrKNbYn+LOTXU= go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.36.4 h1:aUEBEdCa6iamGzg6fuYxDA8ThxvOG240mAvWDU+XLio= go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.36.4/go.mod h1:l2MdsbKTocpPS5nQZscqTR9jd8u96VYZdcpF8Sye7mA= go.opentelemetry.io/otel v1.11.1 h1:4WLLAmcfkmDk2ukNXJyq3/kiz/3UzCaYq6PskJsaou4= diff --git a/receiver/signalfxreceiver/config_test.go b/receiver/signalfxreceiver/config_test.go index a2725daa13605..6da28dd55271e 100644 --- a/receiver/signalfxreceiver/config_test.go +++ b/receiver/signalfxreceiver/config_test.go @@ -84,7 +84,7 @@ func TestLoadConfig(t *testing.T) { require.NoError(t, err) require.NoError(t, component.UnmarshalReceiverConfig(sub, cfg)) - assert.NoError(t, cfg.Validate()) + assert.NoError(t, component.ValidateConfig(cfg)) assert.Equal(t, tt.expected, cfg) }) } diff --git a/receiver/signalfxreceiver/go.mod b/receiver/signalfxreceiver/go.mod index aa9f0166104a8..6fc15f29b1dec 100644 --- a/receiver/signalfxreceiver/go.mod +++ b/receiver/signalfxreceiver/go.mod @@ -11,9 +11,11 @@ require ( github.com/signalfx/com_signalfx_metrics_protobuf v0.0.3 github.com/stretchr/testify v1.8.1 go.opencensus.io v0.24.0 - go.opentelemetry.io/collector v0.64.2-0.20221115155901-1550938c18fd - go.opentelemetry.io/collector/pdata v0.64.2-0.20221115155901-1550938c18fd - go.opentelemetry.io/collector/semconv v0.64.2-0.20221115155901-1550938c18fd + go.opentelemetry.io/collector v0.64.2-0.20221117234814-4565692c50a7 + go.opentelemetry.io/collector/component v0.0.0-20221117234814-4565692c50a7 + go.opentelemetry.io/collector/consumer v0.0.0-20221117234814-4565692c50a7 + go.opentelemetry.io/collector/pdata v0.64.2-0.20221117234814-4565692c50a7 + go.opentelemetry.io/collector/semconv v0.64.2-0.20221117234814-4565692c50a7 go.uber.org/zap v1.23.0 ) @@ -60,6 +62,7 @@ require ( github.com/uber/jaeger-client-go v2.30.0+incompatible // indirect github.com/uber/jaeger-lib v2.4.1+incompatible // indirect github.com/yusufpapurcu/wmi v1.2.2 // indirect + go.opentelemetry.io/collector/featuregate v0.0.0-20221117214536-6a117bfc3737 // indirect go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.36.4 // indirect go.opentelemetry.io/otel v1.11.1 // indirect go.opentelemetry.io/otel/metric v0.33.0 // indirect diff --git a/receiver/signalfxreceiver/go.sum b/receiver/signalfxreceiver/go.sum index 9795e01cc450b..5286cc477d225 100644 --- a/receiver/signalfxreceiver/go.sum +++ b/receiver/signalfxreceiver/go.sum @@ -1246,9 +1246,17 @@ go.opentelemetry.io/collector v0.52.0/go.mod h1:a9GvaOhyc0nVOUzqvdv5mxyWghCSso/W go.opentelemetry.io/collector v0.54.0/go.mod h1:FgNzyfb4sAGb5cqusB5znETJ8Pz4OQUBGbOeGIZ2rlQ= go.opentelemetry.io/collector v0.57.2/go.mod h1:9TwWyMRhbFNzaaGLtm/6poWNDJw+etvQMS6Fy+8/8Xs= go.opentelemetry.io/collector v0.64.1/go.mod h1:RxdEKzwxTEhBAgzC4wzyJEwSFgjWU73CHnLjKUKQDyo= -go.opentelemetry.io/collector v0.64.2-0.20221115155901-1550938c18fd h1:O+6HhE4Ivg8Jksp3dIXIEC4FIR0Ush4uORvG3UtHZWk= -go.opentelemetry.io/collector v0.64.2-0.20221115155901-1550938c18fd/go.mod h1:mmSrOcwe1vEYmChXUYuF6rzlrUL0rjEiPfa19Xxb41o= +go.opentelemetry.io/collector v0.64.2-0.20221117234814-4565692c50a7 h1:o/vMr2iyXzaeTb/KAldhMxAvRIfFPwtKfL5cKVKsSlU= +go.opentelemetry.io/collector v0.64.2-0.20221117234814-4565692c50a7/go.mod h1:PO8hayFFYvXDqELbXRVxwawR2HTdjN6mY4Qa3Se9xI8= +go.opentelemetry.io/collector/component v0.0.0-20221115212826-19db2f15c85c/go.mod h1:5+C/jgNQLM3Lkkys0UU+p2iOsGMs80kQ/DaZ1svo5cc= +go.opentelemetry.io/collector/component v0.0.0-20221117234814-4565692c50a7 h1:q9m1bGHhQFUakQX79lZpLmFSY9VLULNSs2jUG8MdJLA= +go.opentelemetry.io/collector/component v0.0.0-20221117234814-4565692c50a7/go.mod h1:Z7H1Oj826e4dtVxXmT6SiUr6S0EIevUJmkVpfQV+UOk= +go.opentelemetry.io/collector/consumer v0.0.0-20221116212002-2454cfb9ab7f/go.mod h1:npKt5UPhg8ZEtYqwN4R7VtWbzyAURVu3vfDikr3ycLM= +go.opentelemetry.io/collector/consumer v0.0.0-20221117234814-4565692c50a7 h1:FTy1JD9EJ7gq9SzlZoi2NkGcZ88+SwdiJav5uRcDEEY= +go.opentelemetry.io/collector/consumer v0.0.0-20221117234814-4565692c50a7/go.mod h1:86Elcw/LLrh90DprArogHMkBX3+UMu3tIgcVWF3mr6o= go.opentelemetry.io/collector/extension/zpagesextension v0.64.1/go.mod h1:XenhQAUbOHgqNq5YQ/vQIcDHRcPUaDgZQxDC2qoI4Bc= +go.opentelemetry.io/collector/featuregate v0.0.0-20221117214536-6a117bfc3737 h1:7sXg6M9Fw6rFVlX+iaWOMz6DFXEiroUdQer5kWGixwM= +go.opentelemetry.io/collector/featuregate v0.0.0-20221117214536-6a117bfc3737/go.mod h1:tewuFKJYalWBU0bmNKg++MC1ipINXUr6szYzOw2p1GI= go.opentelemetry.io/collector/model v0.49.0/go.mod h1:nOYQv9KoFPs6ihJwOi24qB209EOhS9HkwhGj54YiEAw= go.opentelemetry.io/collector/pdata v0.49.0/go.mod h1:YwmKuiFhNgtmhRdpi8Q8FAWPa0AwJTCSlssSsAtuRcY= go.opentelemetry.io/collector/pdata v0.52.0/go.mod h1:GJUTfTv8mlYpHRjcmHXVbvJr48EW/q/P/HuBvpXAE58= @@ -1256,16 +1264,16 @@ go.opentelemetry.io/collector/pdata v0.54.0/go.mod h1:1nSelv/YqGwdHHaIKNW9ZOHSMq go.opentelemetry.io/collector/pdata v0.56.0/go.mod h1:mYcCREWiIJyHss0dbU+GSiz2tmGZ6u09vtfkKTciog4= go.opentelemetry.io/collector/pdata v0.57.2/go.mod h1:RU9I8lwBUxucwOsSYzHEcHi15M9QaX78hgQ2PRdSxV0= go.opentelemetry.io/collector/pdata v0.64.1/go.mod h1:IzvXUGQml2mrnvdb8zIlEW3qQs9oFLdD2hLwJdZ+pek= -go.opentelemetry.io/collector/pdata v0.64.2-0.20221115155901-1550938c18fd h1:GdVAbRiae5VDZe3Mn3FqzMxO/aI5UbJ4+dcviqClHy8= -go.opentelemetry.io/collector/pdata v0.64.2-0.20221115155901-1550938c18fd/go.mod h1:0vynPfW2ZN7DltpcCFgCmTtWMQkCjp2a3TNt82YTCLQ= +go.opentelemetry.io/collector/pdata v0.64.2-0.20221117234814-4565692c50a7 h1:IOFqfOu7fFxTgC7pvc2U7dk1/uFjwVQPK+CALiUvacI= +go.opentelemetry.io/collector/pdata v0.64.2-0.20221117234814-4565692c50a7/go.mod h1:0vynPfW2ZN7DltpcCFgCmTtWMQkCjp2a3TNt82YTCLQ= go.opentelemetry.io/collector/processor/batchprocessor v0.64.1/go.mod h1:qVl0+aYokPfiq5y+JVAvlII2rrUFBDEqqiDbTSnax78= go.opentelemetry.io/collector/semconv v0.52.0/go.mod h1:SxK0rUnUP7YeDakexzbE/vhimTOHwE6m/4aKKd9e27Q= go.opentelemetry.io/collector/semconv v0.54.0/go.mod h1:HAGkPKNMhc4kEHevEqVIEtUuvsRQMIbUWBb8yBrqEwk= go.opentelemetry.io/collector/semconv v0.56.0/go.mod h1:EH1wbDvTyqKpKBBpoMIe0KQk2plCcFS66Mo17WtR7CQ= go.opentelemetry.io/collector/semconv v0.57.2/go.mod h1:84YnUjmm+nhGu4YTDLnHCbxnL74ooWpismPG79tFD7w= go.opentelemetry.io/collector/semconv v0.64.1/go.mod h1:5o9yhOa+ABt7g2E5JABDxGZ1PQPbtfxrKNbYn+LOTXU= -go.opentelemetry.io/collector/semconv v0.64.2-0.20221115155901-1550938c18fd h1:rMqcl2pwi8YtVrtOPK8tVh87W0bFBge4yqB9ypSsAJ4= -go.opentelemetry.io/collector/semconv v0.64.2-0.20221115155901-1550938c18fd/go.mod h1:5o9yhOa+ABt7g2E5JABDxGZ1PQPbtfxrKNbYn+LOTXU= +go.opentelemetry.io/collector/semconv v0.64.2-0.20221117234814-4565692c50a7 h1:cGXAVltDxXw9nj0Vr7vyZZTj0whdyO+GYs+xv0xHJ2A= +go.opentelemetry.io/collector/semconv v0.64.2-0.20221117234814-4565692c50a7/go.mod h1:5o9yhOa+ABt7g2E5JABDxGZ1PQPbtfxrKNbYn+LOTXU= go.opentelemetry.io/contrib/instrumentation/google.golang.org/grpc/otelgrpc v0.32.0/go.mod h1:J0dBVrt7dPS/lKJyQoW0xzQiUr4r2Ik1VwPjAUWnofI= go.opentelemetry.io/contrib/instrumentation/google.golang.org/grpc/otelgrpc v0.33.0/go.mod h1:y/SlJpJQPd2UzfBCj0E9Flk9FDCtTyqUmaCB41qFrWI= go.opentelemetry.io/contrib/instrumentation/google.golang.org/grpc/otelgrpc v0.36.4/go.mod h1:05eWWy6ZWzmpeImD3UowLTB3VjDMU1yxQ+ENuVWDM3c= diff --git a/receiver/simpleprometheusreceiver/config_test.go b/receiver/simpleprometheusreceiver/config_test.go index b7c29044b600d..78bfef7970eeb 100644 --- a/receiver/simpleprometheusreceiver/config_test.go +++ b/receiver/simpleprometheusreceiver/config_test.go @@ -100,7 +100,7 @@ func TestLoadConfig(t *testing.T) { require.NoError(t, err) require.NoError(t, component.UnmarshalReceiverConfig(sub, cfg)) - assert.NoError(t, cfg.Validate()) + assert.NoError(t, component.ValidateConfig(cfg)) assert.Equal(t, tt.expected, cfg) }) } diff --git a/receiver/simpleprometheusreceiver/go.mod b/receiver/simpleprometheusreceiver/go.mod index 2098f42924e5f..d6ba427bec61e 100644 --- a/receiver/simpleprometheusreceiver/go.mod +++ b/receiver/simpleprometheusreceiver/go.mod @@ -7,7 +7,9 @@ require ( github.com/prometheus/common v0.37.0 github.com/prometheus/prometheus v0.38.0 github.com/stretchr/testify v1.8.1 - go.opentelemetry.io/collector v0.64.2-0.20221115155901-1550938c18fd + go.opentelemetry.io/collector v0.64.2-0.20221117234814-4565692c50a7 + go.opentelemetry.io/collector/component v0.0.0-20221117234814-4565692c50a7 + go.opentelemetry.io/collector/consumer v0.0.0-20221117234814-4565692c50a7 k8s.io/client-go v0.25.4 ) @@ -118,8 +120,9 @@ require ( github.com/spf13/pflag v1.0.5 // indirect github.com/vultr/govultr/v2 v2.17.2 // indirect go.opencensus.io v0.24.0 // indirect - go.opentelemetry.io/collector/pdata v0.64.2-0.20221115155901-1550938c18fd // indirect - go.opentelemetry.io/collector/semconv v0.64.2-0.20221115155901-1550938c18fd // indirect + go.opentelemetry.io/collector/featuregate v0.0.0-20221117214536-6a117bfc3737 // indirect + go.opentelemetry.io/collector/pdata v0.64.2-0.20221117234814-4565692c50a7 // indirect + go.opentelemetry.io/collector/semconv v0.64.2-0.20221117234814-4565692c50a7 // indirect go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.36.4 // indirect go.opentelemetry.io/otel v1.11.1 // indirect go.opentelemetry.io/otel/metric v0.33.0 // indirect diff --git a/receiver/simpleprometheusreceiver/go.sum b/receiver/simpleprometheusreceiver/go.sum index 8d821844672bd..e4004c82544c4 100644 --- a/receiver/simpleprometheusreceiver/go.sum +++ b/receiver/simpleprometheusreceiver/go.sum @@ -622,13 +622,19 @@ go.opencensus.io v0.22.3/go.mod h1:yxeiOL68Rb0Xd1ddK5vPZ/oVn4vY4Ynel7k9FzqtOIw= go.opencensus.io v0.22.4/go.mod h1:yxeiOL68Rb0Xd1ddK5vPZ/oVn4vY4Ynel7k9FzqtOIw= go.opencensus.io v0.24.0 h1:y73uSU6J157QMP2kn2r30vwW1A2W2WFwSCGnAVxeaD0= go.opencensus.io v0.24.0/go.mod h1:vNK8G9p7aAivkbmorf4v+7Hgx+Zs0yY+0fOtgBfjQKo= -go.opentelemetry.io/collector v0.64.2-0.20221115155901-1550938c18fd h1:O+6HhE4Ivg8Jksp3dIXIEC4FIR0Ush4uORvG3UtHZWk= -go.opentelemetry.io/collector v0.64.2-0.20221115155901-1550938c18fd/go.mod h1:mmSrOcwe1vEYmChXUYuF6rzlrUL0rjEiPfa19Xxb41o= -go.opentelemetry.io/collector/pdata v0.64.2-0.20221115155901-1550938c18fd h1:GdVAbRiae5VDZe3Mn3FqzMxO/aI5UbJ4+dcviqClHy8= -go.opentelemetry.io/collector/pdata v0.64.2-0.20221115155901-1550938c18fd/go.mod h1:0vynPfW2ZN7DltpcCFgCmTtWMQkCjp2a3TNt82YTCLQ= -go.opentelemetry.io/collector/processor/batchprocessor v0.64.2-0.20221115155901-1550938c18fd h1:SSjP8V0UP2+oPZ3gL+Dk90KQcvHXvHp9V5h8IIpx0og= -go.opentelemetry.io/collector/semconv v0.64.2-0.20221115155901-1550938c18fd h1:rMqcl2pwi8YtVrtOPK8tVh87W0bFBge4yqB9ypSsAJ4= -go.opentelemetry.io/collector/semconv v0.64.2-0.20221115155901-1550938c18fd/go.mod h1:5o9yhOa+ABt7g2E5JABDxGZ1PQPbtfxrKNbYn+LOTXU= +go.opentelemetry.io/collector v0.64.2-0.20221117234814-4565692c50a7 h1:o/vMr2iyXzaeTb/KAldhMxAvRIfFPwtKfL5cKVKsSlU= +go.opentelemetry.io/collector v0.64.2-0.20221117234814-4565692c50a7/go.mod h1:PO8hayFFYvXDqELbXRVxwawR2HTdjN6mY4Qa3Se9xI8= +go.opentelemetry.io/collector/component v0.0.0-20221117234814-4565692c50a7 h1:q9m1bGHhQFUakQX79lZpLmFSY9VLULNSs2jUG8MdJLA= +go.opentelemetry.io/collector/component v0.0.0-20221117234814-4565692c50a7/go.mod h1:Z7H1Oj826e4dtVxXmT6SiUr6S0EIevUJmkVpfQV+UOk= +go.opentelemetry.io/collector/consumer v0.0.0-20221117234814-4565692c50a7 h1:FTy1JD9EJ7gq9SzlZoi2NkGcZ88+SwdiJav5uRcDEEY= +go.opentelemetry.io/collector/consumer v0.0.0-20221117234814-4565692c50a7/go.mod h1:86Elcw/LLrh90DprArogHMkBX3+UMu3tIgcVWF3mr6o= +go.opentelemetry.io/collector/featuregate v0.0.0-20221117214536-6a117bfc3737 h1:7sXg6M9Fw6rFVlX+iaWOMz6DFXEiroUdQer5kWGixwM= +go.opentelemetry.io/collector/featuregate v0.0.0-20221117214536-6a117bfc3737/go.mod h1:tewuFKJYalWBU0bmNKg++MC1ipINXUr6szYzOw2p1GI= +go.opentelemetry.io/collector/pdata v0.64.2-0.20221117234814-4565692c50a7 h1:IOFqfOu7fFxTgC7pvc2U7dk1/uFjwVQPK+CALiUvacI= +go.opentelemetry.io/collector/pdata v0.64.2-0.20221117234814-4565692c50a7/go.mod h1:0vynPfW2ZN7DltpcCFgCmTtWMQkCjp2a3TNt82YTCLQ= +go.opentelemetry.io/collector/processor/batchprocessor v0.64.2-0.20221117234814-4565692c50a7 h1:hGDq2T07j6qwwtQ2t6ZGU5tp/J2Dvu9mfY5qnnP5Ic8= +go.opentelemetry.io/collector/semconv v0.64.2-0.20221117234814-4565692c50a7 h1:cGXAVltDxXw9nj0Vr7vyZZTj0whdyO+GYs+xv0xHJ2A= +go.opentelemetry.io/collector/semconv v0.64.2-0.20221117234814-4565692c50a7/go.mod h1:5o9yhOa+ABt7g2E5JABDxGZ1PQPbtfxrKNbYn+LOTXU= go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.36.4 h1:aUEBEdCa6iamGzg6fuYxDA8ThxvOG240mAvWDU+XLio= go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.36.4/go.mod h1:l2MdsbKTocpPS5nQZscqTR9jd8u96VYZdcpF8Sye7mA= go.opentelemetry.io/contrib/propagators/b3 v1.11.1 h1:icQ6ttRV+r/2fnU46BIo/g/mPu6Rs5Ug8Rtohe3KqzI= diff --git a/receiver/skywalkingreceiver/config_test.go b/receiver/skywalkingreceiver/config_test.go index 4815751374530..c002cc331bea6 100644 --- a/receiver/skywalkingreceiver/config_test.go +++ b/receiver/skywalkingreceiver/config_test.go @@ -78,7 +78,7 @@ func TestLoadConfig(t *testing.T) { require.NoError(t, err) require.NoError(t, component.UnmarshalReceiverConfig(sub, cfg)) - assert.NoError(t, cfg.Validate()) + assert.NoError(t, component.ValidateConfig(cfg)) assert.Equal(t, tt.expected, cfg) }) } diff --git a/receiver/skywalkingreceiver/go.mod b/receiver/skywalkingreceiver/go.mod index a287ae80a24b5..ac39ee6ae3035 100644 --- a/receiver/skywalkingreceiver/go.mod +++ b/receiver/skywalkingreceiver/go.mod @@ -6,9 +6,11 @@ require ( github.com/google/uuid v1.3.0 github.com/gorilla/mux v1.8.0 github.com/stretchr/testify v1.8.1 - go.opentelemetry.io/collector v0.64.2-0.20221115155901-1550938c18fd - go.opentelemetry.io/collector/pdata v0.64.2-0.20221115155901-1550938c18fd - go.opentelemetry.io/collector/semconv v0.64.2-0.20221115155901-1550938c18fd + go.opentelemetry.io/collector v0.64.2-0.20221117234814-4565692c50a7 + go.opentelemetry.io/collector/component v0.0.0-20221117234814-4565692c50a7 + go.opentelemetry.io/collector/consumer v0.0.0-20221117234814-4565692c50a7 + go.opentelemetry.io/collector/pdata v0.64.2-0.20221117234814-4565692c50a7 + go.opentelemetry.io/collector/semconv v0.64.2-0.20221117234814-4565692c50a7 go.uber.org/multierr v1.8.0 google.golang.org/grpc v1.50.1 google.golang.org/protobuf v1.28.1 @@ -38,6 +40,7 @@ require ( github.com/pmezard/go-difflib v1.0.0 // indirect github.com/rs/cors v1.8.2 // indirect go.opencensus.io v0.24.0 // indirect + go.opentelemetry.io/collector/featuregate v0.0.0-20221117214536-6a117bfc3737 // indirect go.opentelemetry.io/contrib/instrumentation/google.golang.org/grpc/otelgrpc v0.36.4 // indirect go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.36.4 // indirect go.opentelemetry.io/otel v1.11.1 // indirect diff --git a/receiver/skywalkingreceiver/go.sum b/receiver/skywalkingreceiver/go.sum index 6967b9ee106f5..e221b6f32b5f8 100644 --- a/receiver/skywalkingreceiver/go.sum +++ b/receiver/skywalkingreceiver/go.sum @@ -418,12 +418,18 @@ go.opencensus.io v0.22.5/go.mod h1:5pWMHQbX5EPX2/62yrJeAkowc+lfs/XD7Uxpq3pI6kk= go.opencensus.io v0.23.0/go.mod h1:XItmlyltB5F7CS4xOC1DcqMoFqwtC6OG2xF7mCv7P7E= go.opencensus.io v0.24.0 h1:y73uSU6J157QMP2kn2r30vwW1A2W2WFwSCGnAVxeaD0= go.opencensus.io v0.24.0/go.mod h1:vNK8G9p7aAivkbmorf4v+7Hgx+Zs0yY+0fOtgBfjQKo= -go.opentelemetry.io/collector v0.64.2-0.20221115155901-1550938c18fd h1:O+6HhE4Ivg8Jksp3dIXIEC4FIR0Ush4uORvG3UtHZWk= -go.opentelemetry.io/collector v0.64.2-0.20221115155901-1550938c18fd/go.mod h1:mmSrOcwe1vEYmChXUYuF6rzlrUL0rjEiPfa19Xxb41o= -go.opentelemetry.io/collector/pdata v0.64.2-0.20221115155901-1550938c18fd h1:GdVAbRiae5VDZe3Mn3FqzMxO/aI5UbJ4+dcviqClHy8= -go.opentelemetry.io/collector/pdata v0.64.2-0.20221115155901-1550938c18fd/go.mod h1:0vynPfW2ZN7DltpcCFgCmTtWMQkCjp2a3TNt82YTCLQ= -go.opentelemetry.io/collector/semconv v0.64.2-0.20221115155901-1550938c18fd h1:rMqcl2pwi8YtVrtOPK8tVh87W0bFBge4yqB9ypSsAJ4= -go.opentelemetry.io/collector/semconv v0.64.2-0.20221115155901-1550938c18fd/go.mod h1:5o9yhOa+ABt7g2E5JABDxGZ1PQPbtfxrKNbYn+LOTXU= +go.opentelemetry.io/collector v0.64.2-0.20221117234814-4565692c50a7 h1:o/vMr2iyXzaeTb/KAldhMxAvRIfFPwtKfL5cKVKsSlU= +go.opentelemetry.io/collector v0.64.2-0.20221117234814-4565692c50a7/go.mod h1:PO8hayFFYvXDqELbXRVxwawR2HTdjN6mY4Qa3Se9xI8= +go.opentelemetry.io/collector/component v0.0.0-20221117234814-4565692c50a7 h1:q9m1bGHhQFUakQX79lZpLmFSY9VLULNSs2jUG8MdJLA= +go.opentelemetry.io/collector/component v0.0.0-20221117234814-4565692c50a7/go.mod h1:Z7H1Oj826e4dtVxXmT6SiUr6S0EIevUJmkVpfQV+UOk= +go.opentelemetry.io/collector/consumer v0.0.0-20221117234814-4565692c50a7 h1:FTy1JD9EJ7gq9SzlZoi2NkGcZ88+SwdiJav5uRcDEEY= +go.opentelemetry.io/collector/consumer v0.0.0-20221117234814-4565692c50a7/go.mod h1:86Elcw/LLrh90DprArogHMkBX3+UMu3tIgcVWF3mr6o= +go.opentelemetry.io/collector/featuregate v0.0.0-20221117214536-6a117bfc3737 h1:7sXg6M9Fw6rFVlX+iaWOMz6DFXEiroUdQer5kWGixwM= +go.opentelemetry.io/collector/featuregate v0.0.0-20221117214536-6a117bfc3737/go.mod h1:tewuFKJYalWBU0bmNKg++MC1ipINXUr6szYzOw2p1GI= +go.opentelemetry.io/collector/pdata v0.64.2-0.20221117234814-4565692c50a7 h1:IOFqfOu7fFxTgC7pvc2U7dk1/uFjwVQPK+CALiUvacI= +go.opentelemetry.io/collector/pdata v0.64.2-0.20221117234814-4565692c50a7/go.mod h1:0vynPfW2ZN7DltpcCFgCmTtWMQkCjp2a3TNt82YTCLQ= +go.opentelemetry.io/collector/semconv v0.64.2-0.20221117234814-4565692c50a7 h1:cGXAVltDxXw9nj0Vr7vyZZTj0whdyO+GYs+xv0xHJ2A= +go.opentelemetry.io/collector/semconv v0.64.2-0.20221117234814-4565692c50a7/go.mod h1:5o9yhOa+ABt7g2E5JABDxGZ1PQPbtfxrKNbYn+LOTXU= go.opentelemetry.io/contrib/instrumentation/google.golang.org/grpc/otelgrpc v0.36.4 h1:PRXhsszxTt5bbPriTjmaweWUsAnJYeWBhUMLRetUgBU= go.opentelemetry.io/contrib/instrumentation/google.golang.org/grpc/otelgrpc v0.36.4/go.mod h1:05eWWy6ZWzmpeImD3UowLTB3VjDMU1yxQ+ENuVWDM3c= go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.36.4 h1:aUEBEdCa6iamGzg6fuYxDA8ThxvOG240mAvWDU+XLio= diff --git a/receiver/snmpreceiver/config_test.go b/receiver/snmpreceiver/config_test.go index f664a5962835b..4ca4df4daeb0c 100644 --- a/receiver/snmpreceiver/config_test.go +++ b/receiver/snmpreceiver/config_test.go @@ -264,9 +264,9 @@ func TestLoadConfigConnectionConfigs(t *testing.T) { cfg := factory.CreateDefaultConfig() require.NoError(t, component.UnmarshalReceiverConfig(sub, cfg)) if test.expectedErr == "" { - require.NoError(t, cfg.Validate()) + require.NoError(t, component.ValidateConfig(cfg)) } else { - require.ErrorContains(t, cfg.Validate(), test.expectedErr) + require.ErrorContains(t, component.ValidateConfig(cfg), test.expectedErr) } require.Equal(t, test.expectedCfg, cfg) @@ -848,9 +848,9 @@ func TestLoadConfigMetricConfigs(t *testing.T) { cfg := factory.CreateDefaultConfig() require.NoError(t, component.UnmarshalReceiverConfig(sub, cfg)) if test.expectedErr == "" { - require.NoError(t, cfg.Validate()) + require.NoError(t, component.ValidateConfig(cfg)) } else { - require.ErrorContains(t, cfg.Validate(), test.expectedErr) + require.ErrorContains(t, component.ValidateConfig(cfg), test.expectedErr) } require.Equal(t, test.expectedCfg, cfg) diff --git a/receiver/snmpreceiver/factory.go b/receiver/snmpreceiver/factory.go index 25eefd9c3277a..38c5c45a2ddf2 100644 --- a/receiver/snmpreceiver/factory.go +++ b/receiver/snmpreceiver/factory.go @@ -29,7 +29,7 @@ import ( const ( typeStr = "snmp" - stability = component.StabilityLevelInDevelopment + stability = component.StabilityLevelDevelopment ) var errConfigNotSNMP = errors.New("config was not a SNMP receiver config") @@ -118,5 +118,5 @@ func addMissingConfigDefaults(cfg *Config) error { } } - return cfg.Validate() + return component.ValidateConfig(cfg) } diff --git a/receiver/snmpreceiver/go.mod b/receiver/snmpreceiver/go.mod index 9560e62cc4014..6e3fa13e1e2bb 100644 --- a/receiver/snmpreceiver/go.mod +++ b/receiver/snmpreceiver/go.mod @@ -7,8 +7,10 @@ require ( github.com/open-telemetry/opentelemetry-collector-contrib/internal/scrapertest v0.64.0 github.com/stretchr/testify v1.8.1 github.com/testcontainers/testcontainers-go v0.15.0 - go.opentelemetry.io/collector v0.64.2-0.20221115155901-1550938c18fd - go.opentelemetry.io/collector/pdata v0.64.2-0.20221115155901-1550938c18fd + go.opentelemetry.io/collector v0.64.2-0.20221117234814-4565692c50a7 + go.opentelemetry.io/collector/component v0.0.0-20221117234814-4565692c50a7 + go.opentelemetry.io/collector/consumer v0.0.0-20221117234814-4565692c50a7 + go.opentelemetry.io/collector/pdata v0.64.2-0.20221117234814-4565692c50a7 go.uber.org/multierr v1.8.0 go.uber.org/zap v1.23.0 ) @@ -72,8 +74,9 @@ require ( github.com/tklauser/numcpus v0.4.0 // indirect github.com/yusufpapurcu/wmi v1.2.2 // indirect go.opencensus.io v0.24.0 // indirect - go.opentelemetry.io/collector/processor/batchprocessor v0.64.2-0.20221115155901-1550938c18fd // indirect - go.opentelemetry.io/collector/semconv v0.64.2-0.20221115155901-1550938c18fd // indirect + go.opentelemetry.io/collector/featuregate v0.0.0-20221117214536-6a117bfc3737 // indirect + go.opentelemetry.io/collector/processor/batchprocessor v0.64.2-0.20221117234814-4565692c50a7 // indirect + go.opentelemetry.io/collector/semconv v0.64.2-0.20221117234814-4565692c50a7 // indirect go.opentelemetry.io/contrib/propagators/b3 v1.11.1 // indirect go.opentelemetry.io/otel v1.11.1 // indirect go.opentelemetry.io/otel/exporters/prometheus v0.33.0 // indirect diff --git a/receiver/snmpreceiver/go.sum b/receiver/snmpreceiver/go.sum index bc1de0573a6e9..626c08bfb93d6 100644 --- a/receiver/snmpreceiver/go.sum +++ b/receiver/snmpreceiver/go.sum @@ -879,15 +879,21 @@ go.opencensus.io v0.22.4/go.mod h1:yxeiOL68Rb0Xd1ddK5vPZ/oVn4vY4Ynel7k9FzqtOIw= go.opencensus.io v0.23.0/go.mod h1:XItmlyltB5F7CS4xOC1DcqMoFqwtC6OG2xF7mCv7P7E= go.opencensus.io v0.24.0 h1:y73uSU6J157QMP2kn2r30vwW1A2W2WFwSCGnAVxeaD0= go.opencensus.io v0.24.0/go.mod h1:vNK8G9p7aAivkbmorf4v+7Hgx+Zs0yY+0fOtgBfjQKo= -go.opentelemetry.io/collector v0.64.2-0.20221115155901-1550938c18fd h1:O+6HhE4Ivg8Jksp3dIXIEC4FIR0Ush4uORvG3UtHZWk= -go.opentelemetry.io/collector v0.64.2-0.20221115155901-1550938c18fd/go.mod h1:mmSrOcwe1vEYmChXUYuF6rzlrUL0rjEiPfa19Xxb41o= +go.opentelemetry.io/collector v0.64.2-0.20221117234814-4565692c50a7 h1:o/vMr2iyXzaeTb/KAldhMxAvRIfFPwtKfL5cKVKsSlU= +go.opentelemetry.io/collector v0.64.2-0.20221117234814-4565692c50a7/go.mod h1:PO8hayFFYvXDqELbXRVxwawR2HTdjN6mY4Qa3Se9xI8= +go.opentelemetry.io/collector/component v0.0.0-20221117234814-4565692c50a7 h1:q9m1bGHhQFUakQX79lZpLmFSY9VLULNSs2jUG8MdJLA= +go.opentelemetry.io/collector/component v0.0.0-20221117234814-4565692c50a7/go.mod h1:Z7H1Oj826e4dtVxXmT6SiUr6S0EIevUJmkVpfQV+UOk= +go.opentelemetry.io/collector/consumer v0.0.0-20221117234814-4565692c50a7 h1:FTy1JD9EJ7gq9SzlZoi2NkGcZ88+SwdiJav5uRcDEEY= +go.opentelemetry.io/collector/consumer v0.0.0-20221117234814-4565692c50a7/go.mod h1:86Elcw/LLrh90DprArogHMkBX3+UMu3tIgcVWF3mr6o= go.opentelemetry.io/collector/extension/zpagesextension v0.64.1 h1:2qTBtVigWNwPSpN9XR+WobC1idF2S8X/FIahFGCE1i4= -go.opentelemetry.io/collector/pdata v0.64.2-0.20221115155901-1550938c18fd h1:GdVAbRiae5VDZe3Mn3FqzMxO/aI5UbJ4+dcviqClHy8= -go.opentelemetry.io/collector/pdata v0.64.2-0.20221115155901-1550938c18fd/go.mod h1:0vynPfW2ZN7DltpcCFgCmTtWMQkCjp2a3TNt82YTCLQ= -go.opentelemetry.io/collector/processor/batchprocessor v0.64.2-0.20221115155901-1550938c18fd h1:SSjP8V0UP2+oPZ3gL+Dk90KQcvHXvHp9V5h8IIpx0og= -go.opentelemetry.io/collector/processor/batchprocessor v0.64.2-0.20221115155901-1550938c18fd/go.mod h1:zyCnX0aTvBaZ3XLWSHZdTueP7WoXRjz8X6HiWgKqstM= -go.opentelemetry.io/collector/semconv v0.64.2-0.20221115155901-1550938c18fd h1:rMqcl2pwi8YtVrtOPK8tVh87W0bFBge4yqB9ypSsAJ4= -go.opentelemetry.io/collector/semconv v0.64.2-0.20221115155901-1550938c18fd/go.mod h1:5o9yhOa+ABt7g2E5JABDxGZ1PQPbtfxrKNbYn+LOTXU= +go.opentelemetry.io/collector/featuregate v0.0.0-20221117214536-6a117bfc3737 h1:7sXg6M9Fw6rFVlX+iaWOMz6DFXEiroUdQer5kWGixwM= +go.opentelemetry.io/collector/featuregate v0.0.0-20221117214536-6a117bfc3737/go.mod h1:tewuFKJYalWBU0bmNKg++MC1ipINXUr6szYzOw2p1GI= +go.opentelemetry.io/collector/pdata v0.64.2-0.20221117234814-4565692c50a7 h1:IOFqfOu7fFxTgC7pvc2U7dk1/uFjwVQPK+CALiUvacI= +go.opentelemetry.io/collector/pdata v0.64.2-0.20221117234814-4565692c50a7/go.mod h1:0vynPfW2ZN7DltpcCFgCmTtWMQkCjp2a3TNt82YTCLQ= +go.opentelemetry.io/collector/processor/batchprocessor v0.64.2-0.20221117234814-4565692c50a7 h1:hGDq2T07j6qwwtQ2t6ZGU5tp/J2Dvu9mfY5qnnP5Ic8= +go.opentelemetry.io/collector/processor/batchprocessor v0.64.2-0.20221117234814-4565692c50a7/go.mod h1:b83iea2eDSAQkvd+2aSokaa6GRjSIsaR2zILziF/Ogc= +go.opentelemetry.io/collector/semconv v0.64.2-0.20221117234814-4565692c50a7 h1:cGXAVltDxXw9nj0Vr7vyZZTj0whdyO+GYs+xv0xHJ2A= +go.opentelemetry.io/collector/semconv v0.64.2-0.20221117234814-4565692c50a7/go.mod h1:5o9yhOa+ABt7g2E5JABDxGZ1PQPbtfxrKNbYn+LOTXU= go.opentelemetry.io/contrib/propagators/b3 v1.11.1 h1:icQ6ttRV+r/2fnU46BIo/g/mPu6Rs5Ug8Rtohe3KqzI= go.opentelemetry.io/contrib/propagators/b3 v1.11.1/go.mod h1:ECIveyMXgnl4gorxFcA7RYjJY/Ql9n20ubhbfDc3QfA= go.opentelemetry.io/contrib/zpages v0.36.4 h1:Z2VK5WsDhWs9VwZ1p0TM5RyusTOgAQfdMMDDQPRnlmY= diff --git a/receiver/solacereceiver/config_test.go b/receiver/solacereceiver/config_test.go index 4b70d4ff65e74..a608bcdfecb8b 100644 --- a/receiver/solacereceiver/config_test.go +++ b/receiver/solacereceiver/config_test.go @@ -76,10 +76,10 @@ func TestLoadConfig(t *testing.T) { require.NoError(t, component.UnmarshalReceiverConfig(sub, cfg)) if tt.expectedErr != nil { - assert.ErrorIs(t, cfg.Validate(), tt.expectedErr) + assert.ErrorIs(t, component.ValidateConfig(cfg), tt.expectedErr) return } - assert.NoError(t, cfg.Validate()) + assert.NoError(t, component.ValidateConfig(cfg)) assert.Equal(t, tt.expected, cfg) }) } @@ -88,14 +88,14 @@ func TestLoadConfig(t *testing.T) { func TestConfigValidateMissingAuth(t *testing.T) { cfg := createDefaultConfig().(*Config) cfg.Queue = "someQueue" - err := cfg.Validate() + err := component.ValidateConfig(cfg) assert.Equal(t, errMissingAuthDetails, err) } func TestConfigValidateMissingQueue(t *testing.T) { cfg := createDefaultConfig().(*Config) cfg.Auth.PlainText = &SaslPlainTextConfig{"Username", "Password"} - err := cfg.Validate() + err := component.ValidateConfig(cfg) assert.Equal(t, errMissingQueueName, err) } @@ -120,7 +120,7 @@ func TestConfigValidateSuccess(t *testing.T) { cfg := createDefaultConfig().(*Config) cfg.Queue = "someQueue" configure(cfg) - err := cfg.Validate() + err := component.ValidateConfig(cfg) assert.NoError(t, err) }) } diff --git a/receiver/solacereceiver/factory.go b/receiver/solacereceiver/factory.go index c75883f0416ae..973b6b99827a6 100644 --- a/receiver/solacereceiver/factory.go +++ b/receiver/solacereceiver/factory.go @@ -26,7 +26,7 @@ import ( const ( componentType component.Type = "solace" // The stability level of the receiver. - stability = component.StabilityLevelInDevelopment + stability = component.StabilityLevelDevelopment // default value for max unaked messages defaultMaxUnaked uint32 = 1000 diff --git a/receiver/solacereceiver/go.mod b/receiver/solacereceiver/go.mod index 41e45cc3b4675..4fd622878e1b1 100644 --- a/receiver/solacereceiver/go.mod +++ b/receiver/solacereceiver/go.mod @@ -20,8 +20,10 @@ require ( github.com/Azure/go-amqp v0.17.5 github.com/stretchr/testify v1.8.1 go.opencensus.io v0.24.0 - go.opentelemetry.io/collector v0.64.2-0.20221115155901-1550938c18fd - go.opentelemetry.io/collector/pdata v0.64.2-0.20221115155901-1550938c18fd + go.opentelemetry.io/collector v0.64.2-0.20221117234814-4565692c50a7 + go.opentelemetry.io/collector/component v0.0.0-20221117234814-4565692c50a7 + go.opentelemetry.io/collector/consumer v0.0.0-20221117234814-4565692c50a7 + go.opentelemetry.io/collector/pdata v0.64.2-0.20221117234814-4565692c50a7 go.uber.org/atomic v1.10.0 go.uber.org/zap v1.23.0 google.golang.org/protobuf v1.28.1 @@ -41,6 +43,7 @@ require ( github.com/modern-go/reflect2 v1.0.2 // indirect github.com/pelletier/go-toml v1.9.3 // indirect github.com/pmezard/go-difflib v1.0.0 // indirect + go.opentelemetry.io/collector/featuregate v0.0.0-20221117214536-6a117bfc3737 // indirect go.opentelemetry.io/otel v1.11.1 // indirect go.opentelemetry.io/otel/metric v0.33.0 // indirect go.opentelemetry.io/otel/trace v1.11.1 // indirect diff --git a/receiver/solacereceiver/go.sum b/receiver/solacereceiver/go.sum index 3aa7b514c5797..c0d4373875be6 100644 --- a/receiver/solacereceiver/go.sum +++ b/receiver/solacereceiver/go.sum @@ -273,10 +273,16 @@ go.etcd.io/etcd/client/pkg/v3 v3.5.4/go.mod h1:IJHfcCEKxYu1Os13ZdwCwIUTUVGYTSAM3 go.etcd.io/etcd/client/v3 v3.5.4/go.mod h1:ZaRkVgBZC+L+dLCjTcF1hRXpgZXQPOvnA/Ak/gq3kiY= go.opencensus.io v0.24.0 h1:y73uSU6J157QMP2kn2r30vwW1A2W2WFwSCGnAVxeaD0= go.opencensus.io v0.24.0/go.mod h1:vNK8G9p7aAivkbmorf4v+7Hgx+Zs0yY+0fOtgBfjQKo= -go.opentelemetry.io/collector v0.64.2-0.20221115155901-1550938c18fd h1:O+6HhE4Ivg8Jksp3dIXIEC4FIR0Ush4uORvG3UtHZWk= -go.opentelemetry.io/collector v0.64.2-0.20221115155901-1550938c18fd/go.mod h1:mmSrOcwe1vEYmChXUYuF6rzlrUL0rjEiPfa19Xxb41o= -go.opentelemetry.io/collector/pdata v0.64.2-0.20221115155901-1550938c18fd h1:GdVAbRiae5VDZe3Mn3FqzMxO/aI5UbJ4+dcviqClHy8= -go.opentelemetry.io/collector/pdata v0.64.2-0.20221115155901-1550938c18fd/go.mod h1:0vynPfW2ZN7DltpcCFgCmTtWMQkCjp2a3TNt82YTCLQ= +go.opentelemetry.io/collector v0.64.2-0.20221117234814-4565692c50a7 h1:o/vMr2iyXzaeTb/KAldhMxAvRIfFPwtKfL5cKVKsSlU= +go.opentelemetry.io/collector v0.64.2-0.20221117234814-4565692c50a7/go.mod h1:PO8hayFFYvXDqELbXRVxwawR2HTdjN6mY4Qa3Se9xI8= +go.opentelemetry.io/collector/component v0.0.0-20221117234814-4565692c50a7 h1:q9m1bGHhQFUakQX79lZpLmFSY9VLULNSs2jUG8MdJLA= +go.opentelemetry.io/collector/component v0.0.0-20221117234814-4565692c50a7/go.mod h1:Z7H1Oj826e4dtVxXmT6SiUr6S0EIevUJmkVpfQV+UOk= +go.opentelemetry.io/collector/consumer v0.0.0-20221117234814-4565692c50a7 h1:FTy1JD9EJ7gq9SzlZoi2NkGcZ88+SwdiJav5uRcDEEY= +go.opentelemetry.io/collector/consumer v0.0.0-20221117234814-4565692c50a7/go.mod h1:86Elcw/LLrh90DprArogHMkBX3+UMu3tIgcVWF3mr6o= +go.opentelemetry.io/collector/featuregate v0.0.0-20221117214536-6a117bfc3737 h1:7sXg6M9Fw6rFVlX+iaWOMz6DFXEiroUdQer5kWGixwM= +go.opentelemetry.io/collector/featuregate v0.0.0-20221117214536-6a117bfc3737/go.mod h1:tewuFKJYalWBU0bmNKg++MC1ipINXUr6szYzOw2p1GI= +go.opentelemetry.io/collector/pdata v0.64.2-0.20221117234814-4565692c50a7 h1:IOFqfOu7fFxTgC7pvc2U7dk1/uFjwVQPK+CALiUvacI= +go.opentelemetry.io/collector/pdata v0.64.2-0.20221117234814-4565692c50a7/go.mod h1:0vynPfW2ZN7DltpcCFgCmTtWMQkCjp2a3TNt82YTCLQ= go.opentelemetry.io/otel v1.11.1 h1:4WLLAmcfkmDk2ukNXJyq3/kiz/3UzCaYq6PskJsaou4= go.opentelemetry.io/otel v1.11.1/go.mod h1:1nNhXBbWSD0nsL38H6btgnFN2k4i0sNLHNNMZMSbUGE= go.opentelemetry.io/otel/metric v0.33.0 h1:xQAyl7uGEYvrLAiV/09iTJlp1pZnQ9Wl793qbVvED1E= diff --git a/receiver/splunkhecreceiver/config_test.go b/receiver/splunkhecreceiver/config_test.go index 631d8d90ae6f5..c939b4ea37671 100644 --- a/receiver/splunkhecreceiver/config_test.go +++ b/receiver/splunkhecreceiver/config_test.go @@ -98,7 +98,7 @@ func TestLoadConfig(t *testing.T) { require.NoError(t, err) require.NoError(t, component.UnmarshalReceiverConfig(sub, cfg)) - assert.NoError(t, cfg.Validate()) + assert.NoError(t, component.ValidateConfig(cfg)) assert.Equal(t, tt.expected, cfg) }) } diff --git a/receiver/splunkhecreceiver/go.mod b/receiver/splunkhecreceiver/go.mod index a78b0a21dcacc..14c52d983e9d4 100644 --- a/receiver/splunkhecreceiver/go.mod +++ b/receiver/splunkhecreceiver/go.mod @@ -9,9 +9,11 @@ require ( github.com/open-telemetry/opentelemetry-collector-contrib/internal/common v0.64.0 github.com/open-telemetry/opentelemetry-collector-contrib/internal/splunk v0.64.0 github.com/stretchr/testify v1.8.1 - go.opentelemetry.io/collector v0.64.2-0.20221115155901-1550938c18fd - go.opentelemetry.io/collector/pdata v0.64.2-0.20221115155901-1550938c18fd - go.opentelemetry.io/collector/semconv v0.64.2-0.20221115155901-1550938c18fd + go.opentelemetry.io/collector v0.64.2-0.20221117234814-4565692c50a7 + go.opentelemetry.io/collector/component v0.0.0-20221117234814-4565692c50a7 + go.opentelemetry.io/collector/consumer v0.0.0-20221117234814-4565692c50a7 + go.opentelemetry.io/collector/pdata v0.64.2-0.20221117234814-4565692c50a7 + go.opentelemetry.io/collector/semconv v0.64.2-0.20221117234814-4565692c50a7 go.uber.org/zap v1.23.0 ) @@ -36,6 +38,7 @@ require ( github.com/pmezard/go-difflib v1.0.0 // indirect github.com/rs/cors v1.8.2 // indirect go.opencensus.io v0.24.0 // indirect + go.opentelemetry.io/collector/featuregate v0.0.0-20221117214536-6a117bfc3737 // indirect go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.36.4 // indirect go.opentelemetry.io/otel v1.11.1 // indirect go.opentelemetry.io/otel/metric v0.33.0 // indirect diff --git a/receiver/splunkhecreceiver/go.sum b/receiver/splunkhecreceiver/go.sum index 197330ae3e11d..ec7d7d5b6847b 100644 --- a/receiver/splunkhecreceiver/go.sum +++ b/receiver/splunkhecreceiver/go.sum @@ -285,12 +285,18 @@ go.etcd.io/etcd/client/pkg/v3 v3.5.4/go.mod h1:IJHfcCEKxYu1Os13ZdwCwIUTUVGYTSAM3 go.etcd.io/etcd/client/v3 v3.5.4/go.mod h1:ZaRkVgBZC+L+dLCjTcF1hRXpgZXQPOvnA/Ak/gq3kiY= go.opencensus.io v0.24.0 h1:y73uSU6J157QMP2kn2r30vwW1A2W2WFwSCGnAVxeaD0= go.opencensus.io v0.24.0/go.mod h1:vNK8G9p7aAivkbmorf4v+7Hgx+Zs0yY+0fOtgBfjQKo= -go.opentelemetry.io/collector v0.64.2-0.20221115155901-1550938c18fd h1:O+6HhE4Ivg8Jksp3dIXIEC4FIR0Ush4uORvG3UtHZWk= -go.opentelemetry.io/collector v0.64.2-0.20221115155901-1550938c18fd/go.mod h1:mmSrOcwe1vEYmChXUYuF6rzlrUL0rjEiPfa19Xxb41o= -go.opentelemetry.io/collector/pdata v0.64.2-0.20221115155901-1550938c18fd h1:GdVAbRiae5VDZe3Mn3FqzMxO/aI5UbJ4+dcviqClHy8= -go.opentelemetry.io/collector/pdata v0.64.2-0.20221115155901-1550938c18fd/go.mod h1:0vynPfW2ZN7DltpcCFgCmTtWMQkCjp2a3TNt82YTCLQ= -go.opentelemetry.io/collector/semconv v0.64.2-0.20221115155901-1550938c18fd h1:rMqcl2pwi8YtVrtOPK8tVh87W0bFBge4yqB9ypSsAJ4= -go.opentelemetry.io/collector/semconv v0.64.2-0.20221115155901-1550938c18fd/go.mod h1:5o9yhOa+ABt7g2E5JABDxGZ1PQPbtfxrKNbYn+LOTXU= +go.opentelemetry.io/collector v0.64.2-0.20221117234814-4565692c50a7 h1:o/vMr2iyXzaeTb/KAldhMxAvRIfFPwtKfL5cKVKsSlU= +go.opentelemetry.io/collector v0.64.2-0.20221117234814-4565692c50a7/go.mod h1:PO8hayFFYvXDqELbXRVxwawR2HTdjN6mY4Qa3Se9xI8= +go.opentelemetry.io/collector/component v0.0.0-20221117234814-4565692c50a7 h1:q9m1bGHhQFUakQX79lZpLmFSY9VLULNSs2jUG8MdJLA= +go.opentelemetry.io/collector/component v0.0.0-20221117234814-4565692c50a7/go.mod h1:Z7H1Oj826e4dtVxXmT6SiUr6S0EIevUJmkVpfQV+UOk= +go.opentelemetry.io/collector/consumer v0.0.0-20221117234814-4565692c50a7 h1:FTy1JD9EJ7gq9SzlZoi2NkGcZ88+SwdiJav5uRcDEEY= +go.opentelemetry.io/collector/consumer v0.0.0-20221117234814-4565692c50a7/go.mod h1:86Elcw/LLrh90DprArogHMkBX3+UMu3tIgcVWF3mr6o= +go.opentelemetry.io/collector/featuregate v0.0.0-20221117214536-6a117bfc3737 h1:7sXg6M9Fw6rFVlX+iaWOMz6DFXEiroUdQer5kWGixwM= +go.opentelemetry.io/collector/featuregate v0.0.0-20221117214536-6a117bfc3737/go.mod h1:tewuFKJYalWBU0bmNKg++MC1ipINXUr6szYzOw2p1GI= +go.opentelemetry.io/collector/pdata v0.64.2-0.20221117234814-4565692c50a7 h1:IOFqfOu7fFxTgC7pvc2U7dk1/uFjwVQPK+CALiUvacI= +go.opentelemetry.io/collector/pdata v0.64.2-0.20221117234814-4565692c50a7/go.mod h1:0vynPfW2ZN7DltpcCFgCmTtWMQkCjp2a3TNt82YTCLQ= +go.opentelemetry.io/collector/semconv v0.64.2-0.20221117234814-4565692c50a7 h1:cGXAVltDxXw9nj0Vr7vyZZTj0whdyO+GYs+xv0xHJ2A= +go.opentelemetry.io/collector/semconv v0.64.2-0.20221117234814-4565692c50a7/go.mod h1:5o9yhOa+ABt7g2E5JABDxGZ1PQPbtfxrKNbYn+LOTXU= go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.36.4 h1:aUEBEdCa6iamGzg6fuYxDA8ThxvOG240mAvWDU+XLio= go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.36.4/go.mod h1:l2MdsbKTocpPS5nQZscqTR9jd8u96VYZdcpF8Sye7mA= go.opentelemetry.io/otel v1.11.1 h1:4WLLAmcfkmDk2ukNXJyq3/kiz/3UzCaYq6PskJsaou4= diff --git a/receiver/sqlqueryreceiver/config_test.go b/receiver/sqlqueryreceiver/config_test.go index 7fe806dfe2735..2bf9be2fe6751 100644 --- a/receiver/sqlqueryreceiver/config_test.go +++ b/receiver/sqlqueryreceiver/config_test.go @@ -135,10 +135,10 @@ func TestLoadConfig(t *testing.T) { require.NoError(t, component.UnmarshalReceiverConfig(sub, cfg)) if tt.expected == nil { - assert.ErrorContains(t, cfg.Validate(), tt.errorMessage) + assert.ErrorContains(t, component.ValidateConfig(cfg), tt.errorMessage) return } - assert.NoError(t, cfg.Validate()) + assert.NoError(t, component.ValidateConfig(cfg)) assert.Equal(t, tt.expected, cfg) }) } @@ -160,7 +160,7 @@ func TestConfig_Validate_Multierr(t *testing.T) { require.NoError(t, err) require.NoError(t, component.UnmarshalReceiverConfig(sub, cfg)) - err = cfg.Validate() + err = component.ValidateConfig(cfg) assert.ErrorContains(t, err, "invalid metric config with metric_name 'my.metric'") assert.ErrorContains(t, err, "metric config has unsupported value_type: 'xint'") diff --git a/receiver/sqlqueryreceiver/go.mod b/receiver/sqlqueryreceiver/go.mod index f19f4adee5ce1..de4d8e39ec27c 100644 --- a/receiver/sqlqueryreceiver/go.mod +++ b/receiver/sqlqueryreceiver/go.mod @@ -12,8 +12,10 @@ require ( github.com/snowflakedb/gosnowflake v1.6.13 github.com/stretchr/testify v1.8.1 github.com/testcontainers/testcontainers-go v0.15.0 - go.opentelemetry.io/collector v0.64.2-0.20221115155901-1550938c18fd - go.opentelemetry.io/collector/pdata v0.64.2-0.20221115155901-1550938c18fd + go.opentelemetry.io/collector v0.64.2-0.20221117234814-4565692c50a7 + go.opentelemetry.io/collector/component v0.0.0-20221117234814-4565692c50a7 + go.opentelemetry.io/collector/consumer v0.0.0-20221117234814-4565692c50a7 + go.opentelemetry.io/collector/pdata v0.64.2-0.20221117234814-4565692c50a7 go.uber.org/multierr v1.8.0 go.uber.org/zap v1.23.0 ) @@ -79,6 +81,7 @@ require ( github.com/rogpeppe/go-internal v1.8.1 // indirect github.com/sirupsen/logrus v1.8.1 // indirect go.opencensus.io v0.24.0 // indirect + go.opentelemetry.io/collector/featuregate v0.0.0-20221117214536-6a117bfc3737 // indirect go.opentelemetry.io/otel v1.11.1 // indirect go.opentelemetry.io/otel/metric v0.33.0 // indirect go.opentelemetry.io/otel/trace v1.11.1 // indirect diff --git a/receiver/sqlqueryreceiver/go.sum b/receiver/sqlqueryreceiver/go.sum index a95847c40f8c2..8694d24b07490 100644 --- a/receiver/sqlqueryreceiver/go.sum +++ b/receiver/sqlqueryreceiver/go.sum @@ -936,10 +936,16 @@ go.opencensus.io v0.22.2/go.mod h1:yxeiOL68Rb0Xd1ddK5vPZ/oVn4vY4Ynel7k9FzqtOIw= go.opencensus.io v0.22.3/go.mod h1:yxeiOL68Rb0Xd1ddK5vPZ/oVn4vY4Ynel7k9FzqtOIw= go.opencensus.io v0.24.0 h1:y73uSU6J157QMP2kn2r30vwW1A2W2WFwSCGnAVxeaD0= go.opencensus.io v0.24.0/go.mod h1:vNK8G9p7aAivkbmorf4v+7Hgx+Zs0yY+0fOtgBfjQKo= -go.opentelemetry.io/collector v0.64.2-0.20221115155901-1550938c18fd h1:O+6HhE4Ivg8Jksp3dIXIEC4FIR0Ush4uORvG3UtHZWk= -go.opentelemetry.io/collector v0.64.2-0.20221115155901-1550938c18fd/go.mod h1:mmSrOcwe1vEYmChXUYuF6rzlrUL0rjEiPfa19Xxb41o= -go.opentelemetry.io/collector/pdata v0.64.2-0.20221115155901-1550938c18fd h1:GdVAbRiae5VDZe3Mn3FqzMxO/aI5UbJ4+dcviqClHy8= -go.opentelemetry.io/collector/pdata v0.64.2-0.20221115155901-1550938c18fd/go.mod h1:0vynPfW2ZN7DltpcCFgCmTtWMQkCjp2a3TNt82YTCLQ= +go.opentelemetry.io/collector v0.64.2-0.20221117234814-4565692c50a7 h1:o/vMr2iyXzaeTb/KAldhMxAvRIfFPwtKfL5cKVKsSlU= +go.opentelemetry.io/collector v0.64.2-0.20221117234814-4565692c50a7/go.mod h1:PO8hayFFYvXDqELbXRVxwawR2HTdjN6mY4Qa3Se9xI8= +go.opentelemetry.io/collector/component v0.0.0-20221117234814-4565692c50a7 h1:q9m1bGHhQFUakQX79lZpLmFSY9VLULNSs2jUG8MdJLA= +go.opentelemetry.io/collector/component v0.0.0-20221117234814-4565692c50a7/go.mod h1:Z7H1Oj826e4dtVxXmT6SiUr6S0EIevUJmkVpfQV+UOk= +go.opentelemetry.io/collector/consumer v0.0.0-20221117234814-4565692c50a7 h1:FTy1JD9EJ7gq9SzlZoi2NkGcZ88+SwdiJav5uRcDEEY= +go.opentelemetry.io/collector/consumer v0.0.0-20221117234814-4565692c50a7/go.mod h1:86Elcw/LLrh90DprArogHMkBX3+UMu3tIgcVWF3mr6o= +go.opentelemetry.io/collector/featuregate v0.0.0-20221117214536-6a117bfc3737 h1:7sXg6M9Fw6rFVlX+iaWOMz6DFXEiroUdQer5kWGixwM= +go.opentelemetry.io/collector/featuregate v0.0.0-20221117214536-6a117bfc3737/go.mod h1:tewuFKJYalWBU0bmNKg++MC1ipINXUr6szYzOw2p1GI= +go.opentelemetry.io/collector/pdata v0.64.2-0.20221117234814-4565692c50a7 h1:IOFqfOu7fFxTgC7pvc2U7dk1/uFjwVQPK+CALiUvacI= +go.opentelemetry.io/collector/pdata v0.64.2-0.20221117234814-4565692c50a7/go.mod h1:0vynPfW2ZN7DltpcCFgCmTtWMQkCjp2a3TNt82YTCLQ= go.opentelemetry.io/otel v1.11.1 h1:4WLLAmcfkmDk2ukNXJyq3/kiz/3UzCaYq6PskJsaou4= go.opentelemetry.io/otel v1.11.1/go.mod h1:1nNhXBbWSD0nsL38H6btgnFN2k4i0sNLHNNMZMSbUGE= go.opentelemetry.io/otel/exporters/prometheus v0.33.0 h1:xXhPj7SLKWU5/Zd4Hxmd+X1C4jdmvc0Xy+kvjFx2z60= diff --git a/receiver/sqlserverreceiver/config_test.go b/receiver/sqlserverreceiver/config_test.go index e77b68322739b..f180956a1f760 100644 --- a/receiver/sqlserverreceiver/config_test.go +++ b/receiver/sqlserverreceiver/config_test.go @@ -48,8 +48,7 @@ func TestValidate(t *testing.T) { for _, tc := range testCases { t.Run(tc.desc, func(t *testing.T) { - actualErr := tc.cfg.Validate() - require.NoError(t, actualErr) + require.NoError(t, component.ValidateConfig(tc.cfg)) }) } } @@ -64,6 +63,6 @@ func TestLoadConfig(t *testing.T) { require.NoError(t, err) require.NoError(t, component.UnmarshalReceiverConfig(sub, cfg)) - assert.NoError(t, cfg.Validate()) + assert.NoError(t, component.ValidateConfig(cfg)) assert.Equal(t, factory.CreateDefaultConfig(), cfg) } diff --git a/receiver/sqlserverreceiver/factory.go b/receiver/sqlserverreceiver/factory.go index 209ef984017a0..8dbaf01dd3f38 100644 --- a/receiver/sqlserverreceiver/factory.go +++ b/receiver/sqlserverreceiver/factory.go @@ -26,7 +26,7 @@ import ( const ( typeStr = "sqlserver" - stability = component.StabilityLevelInDevelopment + stability = component.StabilityLevelDevelopment ) // NewFactory creates a factory for SQL Server receiver. diff --git a/receiver/sqlserverreceiver/go.mod b/receiver/sqlserverreceiver/go.mod index 221e30fa9c16c..65e9e2a65088c 100644 --- a/receiver/sqlserverreceiver/go.mod +++ b/receiver/sqlserverreceiver/go.mod @@ -6,8 +6,10 @@ require ( github.com/open-telemetry/opentelemetry-collector-contrib/internal/scrapertest v0.64.0 github.com/open-telemetry/opentelemetry-collector-contrib/pkg/winperfcounters v0.64.0 github.com/stretchr/testify v1.8.1 - go.opentelemetry.io/collector v0.64.2-0.20221115155901-1550938c18fd - go.opentelemetry.io/collector/pdata v0.64.2-0.20221115155901-1550938c18fd + go.opentelemetry.io/collector v0.64.2-0.20221117234814-4565692c50a7 + go.opentelemetry.io/collector/component v0.0.0-20221117234814-4565692c50a7 + go.opentelemetry.io/collector/consumer v0.0.0-20221117234814-4565692c50a7 + go.opentelemetry.io/collector/pdata v0.64.2-0.20221117234814-4565692c50a7 go.uber.org/multierr v1.8.0 go.uber.org/zap v1.23.0 ) @@ -30,6 +32,7 @@ require ( github.com/rogpeppe/go-internal v1.8.1 // indirect github.com/stretchr/objx v0.5.0 // indirect go.opencensus.io v0.24.0 // indirect + go.opentelemetry.io/collector/featuregate v0.0.0-20221117214536-6a117bfc3737 // indirect go.opentelemetry.io/otel v1.11.1 // indirect go.opentelemetry.io/otel/metric v0.33.0 // indirect go.opentelemetry.io/otel/trace v1.11.1 // indirect diff --git a/receiver/sqlserverreceiver/go.sum b/receiver/sqlserverreceiver/go.sum index c64fb126e2518..0bf1422986752 100644 --- a/receiver/sqlserverreceiver/go.sum +++ b/receiver/sqlserverreceiver/go.sum @@ -284,10 +284,16 @@ go.etcd.io/etcd/client/pkg/v3 v3.5.4/go.mod h1:IJHfcCEKxYu1Os13ZdwCwIUTUVGYTSAM3 go.etcd.io/etcd/client/v3 v3.5.4/go.mod h1:ZaRkVgBZC+L+dLCjTcF1hRXpgZXQPOvnA/Ak/gq3kiY= go.opencensus.io v0.24.0 h1:y73uSU6J157QMP2kn2r30vwW1A2W2WFwSCGnAVxeaD0= go.opencensus.io v0.24.0/go.mod h1:vNK8G9p7aAivkbmorf4v+7Hgx+Zs0yY+0fOtgBfjQKo= -go.opentelemetry.io/collector v0.64.2-0.20221115155901-1550938c18fd h1:O+6HhE4Ivg8Jksp3dIXIEC4FIR0Ush4uORvG3UtHZWk= -go.opentelemetry.io/collector v0.64.2-0.20221115155901-1550938c18fd/go.mod h1:mmSrOcwe1vEYmChXUYuF6rzlrUL0rjEiPfa19Xxb41o= -go.opentelemetry.io/collector/pdata v0.64.2-0.20221115155901-1550938c18fd h1:GdVAbRiae5VDZe3Mn3FqzMxO/aI5UbJ4+dcviqClHy8= -go.opentelemetry.io/collector/pdata v0.64.2-0.20221115155901-1550938c18fd/go.mod h1:0vynPfW2ZN7DltpcCFgCmTtWMQkCjp2a3TNt82YTCLQ= +go.opentelemetry.io/collector v0.64.2-0.20221117234814-4565692c50a7 h1:o/vMr2iyXzaeTb/KAldhMxAvRIfFPwtKfL5cKVKsSlU= +go.opentelemetry.io/collector v0.64.2-0.20221117234814-4565692c50a7/go.mod h1:PO8hayFFYvXDqELbXRVxwawR2HTdjN6mY4Qa3Se9xI8= +go.opentelemetry.io/collector/component v0.0.0-20221117234814-4565692c50a7 h1:q9m1bGHhQFUakQX79lZpLmFSY9VLULNSs2jUG8MdJLA= +go.opentelemetry.io/collector/component v0.0.0-20221117234814-4565692c50a7/go.mod h1:Z7H1Oj826e4dtVxXmT6SiUr6S0EIevUJmkVpfQV+UOk= +go.opentelemetry.io/collector/consumer v0.0.0-20221117234814-4565692c50a7 h1:FTy1JD9EJ7gq9SzlZoi2NkGcZ88+SwdiJav5uRcDEEY= +go.opentelemetry.io/collector/consumer v0.0.0-20221117234814-4565692c50a7/go.mod h1:86Elcw/LLrh90DprArogHMkBX3+UMu3tIgcVWF3mr6o= +go.opentelemetry.io/collector/featuregate v0.0.0-20221117214536-6a117bfc3737 h1:7sXg6M9Fw6rFVlX+iaWOMz6DFXEiroUdQer5kWGixwM= +go.opentelemetry.io/collector/featuregate v0.0.0-20221117214536-6a117bfc3737/go.mod h1:tewuFKJYalWBU0bmNKg++MC1ipINXUr6szYzOw2p1GI= +go.opentelemetry.io/collector/pdata v0.64.2-0.20221117234814-4565692c50a7 h1:IOFqfOu7fFxTgC7pvc2U7dk1/uFjwVQPK+CALiUvacI= +go.opentelemetry.io/collector/pdata v0.64.2-0.20221117234814-4565692c50a7/go.mod h1:0vynPfW2ZN7DltpcCFgCmTtWMQkCjp2a3TNt82YTCLQ= go.opentelemetry.io/otel v1.11.1 h1:4WLLAmcfkmDk2ukNXJyq3/kiz/3UzCaYq6PskJsaou4= go.opentelemetry.io/otel v1.11.1/go.mod h1:1nNhXBbWSD0nsL38H6btgnFN2k4i0sNLHNNMZMSbUGE= go.opentelemetry.io/otel/exporters/prometheus v0.33.0 h1:xXhPj7SLKWU5/Zd4Hxmd+X1C4jdmvc0Xy+kvjFx2z60= diff --git a/receiver/statsdreceiver/config_test.go b/receiver/statsdreceiver/config_test.go index b70b4be9ae619..b59fd6daf6beb 100644 --- a/receiver/statsdreceiver/config_test.go +++ b/receiver/statsdreceiver/config_test.go @@ -79,7 +79,7 @@ func TestLoadConfig(t *testing.T) { require.NoError(t, err) require.NoError(t, component.UnmarshalReceiverConfig(sub, cfg)) - assert.NoError(t, cfg.Validate()) + assert.NoError(t, component.ValidateConfig(cfg)) assert.Equal(t, tt.expected, cfg) }) } diff --git a/receiver/statsdreceiver/go.mod b/receiver/statsdreceiver/go.mod index 002746be26189..0c60222cdb2b2 100644 --- a/receiver/statsdreceiver/go.mod +++ b/receiver/statsdreceiver/go.mod @@ -8,8 +8,10 @@ require ( github.com/open-telemetry/opentelemetry-collector-contrib/internal/coreinternal v0.64.0 github.com/stretchr/testify v1.8.1 go.opencensus.io v0.24.0 - go.opentelemetry.io/collector v0.64.2-0.20221115155901-1550938c18fd - go.opentelemetry.io/collector/pdata v0.64.2-0.20221115155901-1550938c18fd + go.opentelemetry.io/collector v0.64.2-0.20221117234814-4565692c50a7 + go.opentelemetry.io/collector/component v0.0.0-20221117234814-4565692c50a7 + go.opentelemetry.io/collector/consumer v0.0.0-20221117234814-4565692c50a7 + go.opentelemetry.io/collector/pdata v0.64.2-0.20221117234814-4565692c50a7 go.opentelemetry.io/otel v1.11.1 go.uber.org/multierr v1.8.0 go.uber.org/zap v1.23.0 @@ -43,6 +45,7 @@ require ( github.com/prometheus/common v0.37.0 // indirect github.com/prometheus/procfs v0.8.0 // indirect github.com/prometheus/statsd_exporter v0.22.7 // indirect + go.opentelemetry.io/collector/featuregate v0.0.0-20221117214536-6a117bfc3737 // indirect go.opentelemetry.io/otel/exporters/prometheus v0.33.0 // indirect go.opentelemetry.io/otel/metric v0.33.0 // indirect go.opentelemetry.io/otel/sdk v1.11.1 // indirect diff --git a/receiver/statsdreceiver/go.sum b/receiver/statsdreceiver/go.sum index b514eed5c3ad8..3b1e0a5a05d46 100644 --- a/receiver/statsdreceiver/go.sum +++ b/receiver/statsdreceiver/go.sum @@ -376,11 +376,17 @@ go.opencensus.io v0.22.4/go.mod h1:yxeiOL68Rb0Xd1ddK5vPZ/oVn4vY4Ynel7k9FzqtOIw= go.opencensus.io v0.23.0/go.mod h1:XItmlyltB5F7CS4xOC1DcqMoFqwtC6OG2xF7mCv7P7E= go.opencensus.io v0.24.0 h1:y73uSU6J157QMP2kn2r30vwW1A2W2WFwSCGnAVxeaD0= go.opencensus.io v0.24.0/go.mod h1:vNK8G9p7aAivkbmorf4v+7Hgx+Zs0yY+0fOtgBfjQKo= -go.opentelemetry.io/collector v0.64.2-0.20221115155901-1550938c18fd h1:O+6HhE4Ivg8Jksp3dIXIEC4FIR0Ush4uORvG3UtHZWk= -go.opentelemetry.io/collector v0.64.2-0.20221115155901-1550938c18fd/go.mod h1:mmSrOcwe1vEYmChXUYuF6rzlrUL0rjEiPfa19Xxb41o= -go.opentelemetry.io/collector/pdata v0.64.2-0.20221115155901-1550938c18fd h1:GdVAbRiae5VDZe3Mn3FqzMxO/aI5UbJ4+dcviqClHy8= -go.opentelemetry.io/collector/pdata v0.64.2-0.20221115155901-1550938c18fd/go.mod h1:0vynPfW2ZN7DltpcCFgCmTtWMQkCjp2a3TNt82YTCLQ= -go.opentelemetry.io/collector/semconv v0.64.2-0.20221115155901-1550938c18fd h1:rMqcl2pwi8YtVrtOPK8tVh87W0bFBge4yqB9ypSsAJ4= +go.opentelemetry.io/collector v0.64.2-0.20221117234814-4565692c50a7 h1:o/vMr2iyXzaeTb/KAldhMxAvRIfFPwtKfL5cKVKsSlU= +go.opentelemetry.io/collector v0.64.2-0.20221117234814-4565692c50a7/go.mod h1:PO8hayFFYvXDqELbXRVxwawR2HTdjN6mY4Qa3Se9xI8= +go.opentelemetry.io/collector/component v0.0.0-20221117234814-4565692c50a7 h1:q9m1bGHhQFUakQX79lZpLmFSY9VLULNSs2jUG8MdJLA= +go.opentelemetry.io/collector/component v0.0.0-20221117234814-4565692c50a7/go.mod h1:Z7H1Oj826e4dtVxXmT6SiUr6S0EIevUJmkVpfQV+UOk= +go.opentelemetry.io/collector/consumer v0.0.0-20221117234814-4565692c50a7 h1:FTy1JD9EJ7gq9SzlZoi2NkGcZ88+SwdiJav5uRcDEEY= +go.opentelemetry.io/collector/consumer v0.0.0-20221117234814-4565692c50a7/go.mod h1:86Elcw/LLrh90DprArogHMkBX3+UMu3tIgcVWF3mr6o= +go.opentelemetry.io/collector/featuregate v0.0.0-20221117214536-6a117bfc3737 h1:7sXg6M9Fw6rFVlX+iaWOMz6DFXEiroUdQer5kWGixwM= +go.opentelemetry.io/collector/featuregate v0.0.0-20221117214536-6a117bfc3737/go.mod h1:tewuFKJYalWBU0bmNKg++MC1ipINXUr6szYzOw2p1GI= +go.opentelemetry.io/collector/pdata v0.64.2-0.20221117234814-4565692c50a7 h1:IOFqfOu7fFxTgC7pvc2U7dk1/uFjwVQPK+CALiUvacI= +go.opentelemetry.io/collector/pdata v0.64.2-0.20221117234814-4565692c50a7/go.mod h1:0vynPfW2ZN7DltpcCFgCmTtWMQkCjp2a3TNt82YTCLQ= +go.opentelemetry.io/collector/semconv v0.64.2-0.20221117234814-4565692c50a7 h1:cGXAVltDxXw9nj0Vr7vyZZTj0whdyO+GYs+xv0xHJ2A= go.opentelemetry.io/otel v1.11.1 h1:4WLLAmcfkmDk2ukNXJyq3/kiz/3UzCaYq6PskJsaou4= go.opentelemetry.io/otel v1.11.1/go.mod h1:1nNhXBbWSD0nsL38H6btgnFN2k4i0sNLHNNMZMSbUGE= go.opentelemetry.io/otel/exporters/prometheus v0.33.0 h1:xXhPj7SLKWU5/Zd4Hxmd+X1C4jdmvc0Xy+kvjFx2z60= diff --git a/receiver/syslogreceiver/go.mod b/receiver/syslogreceiver/go.mod index c43cfc1022caa..aa9a25257aa19 100644 --- a/receiver/syslogreceiver/go.mod +++ b/receiver/syslogreceiver/go.mod @@ -5,8 +5,10 @@ go 1.18 require ( github.com/open-telemetry/opentelemetry-collector-contrib/pkg/stanza v0.64.0 github.com/stretchr/testify v1.8.1 - go.opentelemetry.io/collector v0.64.2-0.20221115155901-1550938c18fd - go.opentelemetry.io/collector/pdata v0.64.2-0.20221115155901-1550938c18fd + go.opentelemetry.io/collector v0.64.2-0.20221117234814-4565692c50a7 + go.opentelemetry.io/collector/component v0.0.0-20221117234814-4565692c50a7 + go.opentelemetry.io/collector/consumer v0.0.0-20221117234814-4565692c50a7 + go.opentelemetry.io/collector/pdata v0.64.2-0.20221117234814-4565692c50a7 ) require ( @@ -31,6 +33,7 @@ require ( github.com/pmezard/go-difflib v1.0.0 // indirect github.com/rogpeppe/go-internal v1.8.1 // indirect go.opencensus.io v0.24.0 // indirect + go.opentelemetry.io/collector/featuregate v0.0.0-20221117214536-6a117bfc3737 // indirect go.opentelemetry.io/otel v1.11.1 // indirect go.opentelemetry.io/otel/metric v0.33.0 // indirect go.opentelemetry.io/otel/trace v1.11.1 // indirect diff --git a/receiver/syslogreceiver/go.sum b/receiver/syslogreceiver/go.sum index 9c49f826cf057..e17139ee77f4a 100644 --- a/receiver/syslogreceiver/go.sum +++ b/receiver/syslogreceiver/go.sum @@ -310,10 +310,16 @@ go.etcd.io/etcd/client/pkg/v3 v3.5.4/go.mod h1:IJHfcCEKxYu1Os13ZdwCwIUTUVGYTSAM3 go.etcd.io/etcd/client/v3 v3.5.4/go.mod h1:ZaRkVgBZC+L+dLCjTcF1hRXpgZXQPOvnA/Ak/gq3kiY= go.opencensus.io v0.24.0 h1:y73uSU6J157QMP2kn2r30vwW1A2W2WFwSCGnAVxeaD0= go.opencensus.io v0.24.0/go.mod h1:vNK8G9p7aAivkbmorf4v+7Hgx+Zs0yY+0fOtgBfjQKo= -go.opentelemetry.io/collector v0.64.2-0.20221115155901-1550938c18fd h1:O+6HhE4Ivg8Jksp3dIXIEC4FIR0Ush4uORvG3UtHZWk= -go.opentelemetry.io/collector v0.64.2-0.20221115155901-1550938c18fd/go.mod h1:mmSrOcwe1vEYmChXUYuF6rzlrUL0rjEiPfa19Xxb41o= -go.opentelemetry.io/collector/pdata v0.64.2-0.20221115155901-1550938c18fd h1:GdVAbRiae5VDZe3Mn3FqzMxO/aI5UbJ4+dcviqClHy8= -go.opentelemetry.io/collector/pdata v0.64.2-0.20221115155901-1550938c18fd/go.mod h1:0vynPfW2ZN7DltpcCFgCmTtWMQkCjp2a3TNt82YTCLQ= +go.opentelemetry.io/collector v0.64.2-0.20221117234814-4565692c50a7 h1:o/vMr2iyXzaeTb/KAldhMxAvRIfFPwtKfL5cKVKsSlU= +go.opentelemetry.io/collector v0.64.2-0.20221117234814-4565692c50a7/go.mod h1:PO8hayFFYvXDqELbXRVxwawR2HTdjN6mY4Qa3Se9xI8= +go.opentelemetry.io/collector/component v0.0.0-20221117234814-4565692c50a7 h1:q9m1bGHhQFUakQX79lZpLmFSY9VLULNSs2jUG8MdJLA= +go.opentelemetry.io/collector/component v0.0.0-20221117234814-4565692c50a7/go.mod h1:Z7H1Oj826e4dtVxXmT6SiUr6S0EIevUJmkVpfQV+UOk= +go.opentelemetry.io/collector/consumer v0.0.0-20221117234814-4565692c50a7 h1:FTy1JD9EJ7gq9SzlZoi2NkGcZ88+SwdiJav5uRcDEEY= +go.opentelemetry.io/collector/consumer v0.0.0-20221117234814-4565692c50a7/go.mod h1:86Elcw/LLrh90DprArogHMkBX3+UMu3tIgcVWF3mr6o= +go.opentelemetry.io/collector/featuregate v0.0.0-20221117214536-6a117bfc3737 h1:7sXg6M9Fw6rFVlX+iaWOMz6DFXEiroUdQer5kWGixwM= +go.opentelemetry.io/collector/featuregate v0.0.0-20221117214536-6a117bfc3737/go.mod h1:tewuFKJYalWBU0bmNKg++MC1ipINXUr6szYzOw2p1GI= +go.opentelemetry.io/collector/pdata v0.64.2-0.20221117234814-4565692c50a7 h1:IOFqfOu7fFxTgC7pvc2U7dk1/uFjwVQPK+CALiUvacI= +go.opentelemetry.io/collector/pdata v0.64.2-0.20221117234814-4565692c50a7/go.mod h1:0vynPfW2ZN7DltpcCFgCmTtWMQkCjp2a3TNt82YTCLQ= go.opentelemetry.io/otel v1.11.1 h1:4WLLAmcfkmDk2ukNXJyq3/kiz/3UzCaYq6PskJsaou4= go.opentelemetry.io/otel v1.11.1/go.mod h1:1nNhXBbWSD0nsL38H6btgnFN2k4i0sNLHNNMZMSbUGE= go.opentelemetry.io/otel/exporters/prometheus v0.33.0 h1:xXhPj7SLKWU5/Zd4Hxmd+X1C4jdmvc0Xy+kvjFx2z60= diff --git a/receiver/syslogreceiver/syslog_test.go b/receiver/syslogreceiver/syslog_test.go index 583614a50a5da..af6c34553a81c 100644 --- a/receiver/syslogreceiver/syslog_test.go +++ b/receiver/syslogreceiver/syslog_test.go @@ -98,7 +98,7 @@ func TestLoadConfig(t *testing.T) { require.NoError(t, err) require.NoError(t, component.UnmarshalReceiverConfig(sub, cfg)) - assert.NoError(t, cfg.Validate()) + assert.NoError(t, component.ValidateConfig(cfg)) assert.Equal(t, testdataConfigYaml(), cfg) } diff --git a/receiver/tcplogreceiver/go.mod b/receiver/tcplogreceiver/go.mod index 7527929f8196a..d8edbba89df1e 100644 --- a/receiver/tcplogreceiver/go.mod +++ b/receiver/tcplogreceiver/go.mod @@ -5,7 +5,9 @@ go 1.18 require ( github.com/open-telemetry/opentelemetry-collector-contrib/pkg/stanza v0.64.0 github.com/stretchr/testify v1.8.1 - go.opentelemetry.io/collector v0.64.2-0.20221115155901-1550938c18fd + go.opentelemetry.io/collector v0.64.2-0.20221117234814-4565692c50a7 + go.opentelemetry.io/collector/component v0.0.0-20221117234814-4565692c50a7 + go.opentelemetry.io/collector/consumer v0.0.0-20221117234814-4565692c50a7 ) require ( @@ -28,7 +30,8 @@ require ( github.com/pmezard/go-difflib v1.0.0 // indirect github.com/rogpeppe/go-internal v1.8.1 // indirect go.opencensus.io v0.24.0 // indirect - go.opentelemetry.io/collector/pdata v0.64.2-0.20221115155901-1550938c18fd // indirect + go.opentelemetry.io/collector/featuregate v0.0.0-20221117214536-6a117bfc3737 // indirect + go.opentelemetry.io/collector/pdata v0.64.2-0.20221117234814-4565692c50a7 // indirect go.opentelemetry.io/otel v1.11.1 // indirect go.opentelemetry.io/otel/metric v0.33.0 // indirect go.opentelemetry.io/otel/trace v1.11.1 // indirect diff --git a/receiver/tcplogreceiver/go.sum b/receiver/tcplogreceiver/go.sum index 1750b072fba0c..024ad06724e54 100644 --- a/receiver/tcplogreceiver/go.sum +++ b/receiver/tcplogreceiver/go.sum @@ -306,10 +306,16 @@ go.etcd.io/etcd/client/pkg/v3 v3.5.4/go.mod h1:IJHfcCEKxYu1Os13ZdwCwIUTUVGYTSAM3 go.etcd.io/etcd/client/v3 v3.5.4/go.mod h1:ZaRkVgBZC+L+dLCjTcF1hRXpgZXQPOvnA/Ak/gq3kiY= go.opencensus.io v0.24.0 h1:y73uSU6J157QMP2kn2r30vwW1A2W2WFwSCGnAVxeaD0= go.opencensus.io v0.24.0/go.mod h1:vNK8G9p7aAivkbmorf4v+7Hgx+Zs0yY+0fOtgBfjQKo= -go.opentelemetry.io/collector v0.64.2-0.20221115155901-1550938c18fd h1:O+6HhE4Ivg8Jksp3dIXIEC4FIR0Ush4uORvG3UtHZWk= -go.opentelemetry.io/collector v0.64.2-0.20221115155901-1550938c18fd/go.mod h1:mmSrOcwe1vEYmChXUYuF6rzlrUL0rjEiPfa19Xxb41o= -go.opentelemetry.io/collector/pdata v0.64.2-0.20221115155901-1550938c18fd h1:GdVAbRiae5VDZe3Mn3FqzMxO/aI5UbJ4+dcviqClHy8= -go.opentelemetry.io/collector/pdata v0.64.2-0.20221115155901-1550938c18fd/go.mod h1:0vynPfW2ZN7DltpcCFgCmTtWMQkCjp2a3TNt82YTCLQ= +go.opentelemetry.io/collector v0.64.2-0.20221117234814-4565692c50a7 h1:o/vMr2iyXzaeTb/KAldhMxAvRIfFPwtKfL5cKVKsSlU= +go.opentelemetry.io/collector v0.64.2-0.20221117234814-4565692c50a7/go.mod h1:PO8hayFFYvXDqELbXRVxwawR2HTdjN6mY4Qa3Se9xI8= +go.opentelemetry.io/collector/component v0.0.0-20221117234814-4565692c50a7 h1:q9m1bGHhQFUakQX79lZpLmFSY9VLULNSs2jUG8MdJLA= +go.opentelemetry.io/collector/component v0.0.0-20221117234814-4565692c50a7/go.mod h1:Z7H1Oj826e4dtVxXmT6SiUr6S0EIevUJmkVpfQV+UOk= +go.opentelemetry.io/collector/consumer v0.0.0-20221117234814-4565692c50a7 h1:FTy1JD9EJ7gq9SzlZoi2NkGcZ88+SwdiJav5uRcDEEY= +go.opentelemetry.io/collector/consumer v0.0.0-20221117234814-4565692c50a7/go.mod h1:86Elcw/LLrh90DprArogHMkBX3+UMu3tIgcVWF3mr6o= +go.opentelemetry.io/collector/featuregate v0.0.0-20221117214536-6a117bfc3737 h1:7sXg6M9Fw6rFVlX+iaWOMz6DFXEiroUdQer5kWGixwM= +go.opentelemetry.io/collector/featuregate v0.0.0-20221117214536-6a117bfc3737/go.mod h1:tewuFKJYalWBU0bmNKg++MC1ipINXUr6szYzOw2p1GI= +go.opentelemetry.io/collector/pdata v0.64.2-0.20221117234814-4565692c50a7 h1:IOFqfOu7fFxTgC7pvc2U7dk1/uFjwVQPK+CALiUvacI= +go.opentelemetry.io/collector/pdata v0.64.2-0.20221117234814-4565692c50a7/go.mod h1:0vynPfW2ZN7DltpcCFgCmTtWMQkCjp2a3TNt82YTCLQ= go.opentelemetry.io/otel v1.11.1 h1:4WLLAmcfkmDk2ukNXJyq3/kiz/3UzCaYq6PskJsaou4= go.opentelemetry.io/otel v1.11.1/go.mod h1:1nNhXBbWSD0nsL38H6btgnFN2k4i0sNLHNNMZMSbUGE= go.opentelemetry.io/otel/exporters/prometheus v0.33.0 h1:xXhPj7SLKWU5/Zd4Hxmd+X1C4jdmvc0Xy+kvjFx2z60= diff --git a/receiver/tcplogreceiver/tcp_test.go b/receiver/tcplogreceiver/tcp_test.go index d35d93663f62d..7ed5584ca83be 100644 --- a/receiver/tcplogreceiver/tcp_test.go +++ b/receiver/tcplogreceiver/tcp_test.go @@ -84,7 +84,7 @@ func TestLoadConfig(t *testing.T) { require.NoError(t, err) require.NoError(t, component.UnmarshalReceiverConfig(sub, cfg)) - assert.NoError(t, cfg.Validate()) + assert.NoError(t, component.ValidateConfig(cfg)) assert.Equal(t, testdataConfigYaml(), cfg) } diff --git a/receiver/udplogreceiver/go.mod b/receiver/udplogreceiver/go.mod index ddea0e1ccf14c..4845dd52f5157 100644 --- a/receiver/udplogreceiver/go.mod +++ b/receiver/udplogreceiver/go.mod @@ -5,7 +5,9 @@ go 1.18 require ( github.com/open-telemetry/opentelemetry-collector-contrib/pkg/stanza v0.64.0 github.com/stretchr/testify v1.8.1 - go.opentelemetry.io/collector v0.64.2-0.20221115155901-1550938c18fd + go.opentelemetry.io/collector v0.64.2-0.20221117234814-4565692c50a7 + go.opentelemetry.io/collector/component v0.0.0-20221117234814-4565692c50a7 + go.opentelemetry.io/collector/consumer v0.0.0-20221117234814-4565692c50a7 ) require ( @@ -27,7 +29,8 @@ require ( github.com/pmezard/go-difflib v1.0.0 // indirect github.com/rogpeppe/go-internal v1.8.1 // indirect go.opencensus.io v0.24.0 // indirect - go.opentelemetry.io/collector/pdata v0.64.2-0.20221115155901-1550938c18fd // indirect + go.opentelemetry.io/collector/featuregate v0.0.0-20221117214536-6a117bfc3737 // indirect + go.opentelemetry.io/collector/pdata v0.64.2-0.20221117234814-4565692c50a7 // indirect go.opentelemetry.io/otel v1.11.1 // indirect go.opentelemetry.io/otel/metric v0.33.0 // indirect go.opentelemetry.io/otel/trace v1.11.1 // indirect diff --git a/receiver/udplogreceiver/go.sum b/receiver/udplogreceiver/go.sum index c7db3b26a2d22..606d1559ada47 100644 --- a/receiver/udplogreceiver/go.sum +++ b/receiver/udplogreceiver/go.sum @@ -305,10 +305,16 @@ go.etcd.io/etcd/client/pkg/v3 v3.5.4/go.mod h1:IJHfcCEKxYu1Os13ZdwCwIUTUVGYTSAM3 go.etcd.io/etcd/client/v3 v3.5.4/go.mod h1:ZaRkVgBZC+L+dLCjTcF1hRXpgZXQPOvnA/Ak/gq3kiY= go.opencensus.io v0.24.0 h1:y73uSU6J157QMP2kn2r30vwW1A2W2WFwSCGnAVxeaD0= go.opencensus.io v0.24.0/go.mod h1:vNK8G9p7aAivkbmorf4v+7Hgx+Zs0yY+0fOtgBfjQKo= -go.opentelemetry.io/collector v0.64.2-0.20221115155901-1550938c18fd h1:O+6HhE4Ivg8Jksp3dIXIEC4FIR0Ush4uORvG3UtHZWk= -go.opentelemetry.io/collector v0.64.2-0.20221115155901-1550938c18fd/go.mod h1:mmSrOcwe1vEYmChXUYuF6rzlrUL0rjEiPfa19Xxb41o= -go.opentelemetry.io/collector/pdata v0.64.2-0.20221115155901-1550938c18fd h1:GdVAbRiae5VDZe3Mn3FqzMxO/aI5UbJ4+dcviqClHy8= -go.opentelemetry.io/collector/pdata v0.64.2-0.20221115155901-1550938c18fd/go.mod h1:0vynPfW2ZN7DltpcCFgCmTtWMQkCjp2a3TNt82YTCLQ= +go.opentelemetry.io/collector v0.64.2-0.20221117234814-4565692c50a7 h1:o/vMr2iyXzaeTb/KAldhMxAvRIfFPwtKfL5cKVKsSlU= +go.opentelemetry.io/collector v0.64.2-0.20221117234814-4565692c50a7/go.mod h1:PO8hayFFYvXDqELbXRVxwawR2HTdjN6mY4Qa3Se9xI8= +go.opentelemetry.io/collector/component v0.0.0-20221117234814-4565692c50a7 h1:q9m1bGHhQFUakQX79lZpLmFSY9VLULNSs2jUG8MdJLA= +go.opentelemetry.io/collector/component v0.0.0-20221117234814-4565692c50a7/go.mod h1:Z7H1Oj826e4dtVxXmT6SiUr6S0EIevUJmkVpfQV+UOk= +go.opentelemetry.io/collector/consumer v0.0.0-20221117234814-4565692c50a7 h1:FTy1JD9EJ7gq9SzlZoi2NkGcZ88+SwdiJav5uRcDEEY= +go.opentelemetry.io/collector/consumer v0.0.0-20221117234814-4565692c50a7/go.mod h1:86Elcw/LLrh90DprArogHMkBX3+UMu3tIgcVWF3mr6o= +go.opentelemetry.io/collector/featuregate v0.0.0-20221117214536-6a117bfc3737 h1:7sXg6M9Fw6rFVlX+iaWOMz6DFXEiroUdQer5kWGixwM= +go.opentelemetry.io/collector/featuregate v0.0.0-20221117214536-6a117bfc3737/go.mod h1:tewuFKJYalWBU0bmNKg++MC1ipINXUr6szYzOw2p1GI= +go.opentelemetry.io/collector/pdata v0.64.2-0.20221117234814-4565692c50a7 h1:IOFqfOu7fFxTgC7pvc2U7dk1/uFjwVQPK+CALiUvacI= +go.opentelemetry.io/collector/pdata v0.64.2-0.20221117234814-4565692c50a7/go.mod h1:0vynPfW2ZN7DltpcCFgCmTtWMQkCjp2a3TNt82YTCLQ= go.opentelemetry.io/otel v1.11.1 h1:4WLLAmcfkmDk2ukNXJyq3/kiz/3UzCaYq6PskJsaou4= go.opentelemetry.io/otel v1.11.1/go.mod h1:1nNhXBbWSD0nsL38H6btgnFN2k4i0sNLHNNMZMSbUGE= go.opentelemetry.io/otel/exporters/prometheus v0.33.0 h1:xXhPj7SLKWU5/Zd4Hxmd+X1C4jdmvc0Xy+kvjFx2z60= diff --git a/receiver/udplogreceiver/udp_test.go b/receiver/udplogreceiver/udp_test.go index 5534c66da5ffe..60b4e40f1de39 100644 --- a/receiver/udplogreceiver/udp_test.go +++ b/receiver/udplogreceiver/udp_test.go @@ -88,7 +88,7 @@ func TestLoadConfig(t *testing.T) { require.NoError(t, err) require.NoError(t, component.UnmarshalReceiverConfig(sub, cfg)) - assert.NoError(t, cfg.Validate()) + assert.NoError(t, component.ValidateConfig(cfg)) assert.Equal(t, testdataConfigYaml(), cfg) } diff --git a/receiver/vcenterreceiver/go.mod b/receiver/vcenterreceiver/go.mod index 64a4cc10ceaa2..4e9a615cd278f 100644 --- a/receiver/vcenterreceiver/go.mod +++ b/receiver/vcenterreceiver/go.mod @@ -8,8 +8,10 @@ require ( github.com/open-telemetry/opentelemetry-collector-contrib/internal/scrapertest v0.64.0 github.com/stretchr/testify v1.8.1 github.com/vmware/govmomi v0.29.0 - go.opentelemetry.io/collector v0.64.2-0.20221115155901-1550938c18fd - go.opentelemetry.io/collector/pdata v0.64.2-0.20221115155901-1550938c18fd + go.opentelemetry.io/collector v0.64.2-0.20221117234814-4565692c50a7 + go.opentelemetry.io/collector/component v0.0.0-20221117234814-4565692c50a7 + go.opentelemetry.io/collector/consumer v0.0.0-20221117234814-4565692c50a7 + go.opentelemetry.io/collector/pdata v0.64.2-0.20221117234814-4565692c50a7 go.uber.org/multierr v1.8.0 go.uber.org/zap v1.23.0 ) @@ -32,6 +34,7 @@ require ( github.com/pmezard/go-difflib v1.0.0 // indirect github.com/rogpeppe/go-internal v1.8.0 // indirect go.opencensus.io v0.24.0 // indirect + go.opentelemetry.io/collector/featuregate v0.0.0-20221117214536-6a117bfc3737 // indirect go.opentelemetry.io/otel v1.11.1 // indirect go.opentelemetry.io/otel/metric v0.33.0 // indirect go.opentelemetry.io/otel/trace v1.11.1 // indirect diff --git a/receiver/vcenterreceiver/go.sum b/receiver/vcenterreceiver/go.sum index 00c1efc38624b..87eb3a99c26fa 100644 --- a/receiver/vcenterreceiver/go.sum +++ b/receiver/vcenterreceiver/go.sum @@ -291,10 +291,16 @@ go.etcd.io/etcd/client/pkg/v3 v3.5.4/go.mod h1:IJHfcCEKxYu1Os13ZdwCwIUTUVGYTSAM3 go.etcd.io/etcd/client/v3 v3.5.4/go.mod h1:ZaRkVgBZC+L+dLCjTcF1hRXpgZXQPOvnA/Ak/gq3kiY= go.opencensus.io v0.24.0 h1:y73uSU6J157QMP2kn2r30vwW1A2W2WFwSCGnAVxeaD0= go.opencensus.io v0.24.0/go.mod h1:vNK8G9p7aAivkbmorf4v+7Hgx+Zs0yY+0fOtgBfjQKo= -go.opentelemetry.io/collector v0.64.2-0.20221115155901-1550938c18fd h1:O+6HhE4Ivg8Jksp3dIXIEC4FIR0Ush4uORvG3UtHZWk= -go.opentelemetry.io/collector v0.64.2-0.20221115155901-1550938c18fd/go.mod h1:mmSrOcwe1vEYmChXUYuF6rzlrUL0rjEiPfa19Xxb41o= -go.opentelemetry.io/collector/pdata v0.64.2-0.20221115155901-1550938c18fd h1:GdVAbRiae5VDZe3Mn3FqzMxO/aI5UbJ4+dcviqClHy8= -go.opentelemetry.io/collector/pdata v0.64.2-0.20221115155901-1550938c18fd/go.mod h1:0vynPfW2ZN7DltpcCFgCmTtWMQkCjp2a3TNt82YTCLQ= +go.opentelemetry.io/collector v0.64.2-0.20221117234814-4565692c50a7 h1:o/vMr2iyXzaeTb/KAldhMxAvRIfFPwtKfL5cKVKsSlU= +go.opentelemetry.io/collector v0.64.2-0.20221117234814-4565692c50a7/go.mod h1:PO8hayFFYvXDqELbXRVxwawR2HTdjN6mY4Qa3Se9xI8= +go.opentelemetry.io/collector/component v0.0.0-20221117234814-4565692c50a7 h1:q9m1bGHhQFUakQX79lZpLmFSY9VLULNSs2jUG8MdJLA= +go.opentelemetry.io/collector/component v0.0.0-20221117234814-4565692c50a7/go.mod h1:Z7H1Oj826e4dtVxXmT6SiUr6S0EIevUJmkVpfQV+UOk= +go.opentelemetry.io/collector/consumer v0.0.0-20221117234814-4565692c50a7 h1:FTy1JD9EJ7gq9SzlZoi2NkGcZ88+SwdiJav5uRcDEEY= +go.opentelemetry.io/collector/consumer v0.0.0-20221117234814-4565692c50a7/go.mod h1:86Elcw/LLrh90DprArogHMkBX3+UMu3tIgcVWF3mr6o= +go.opentelemetry.io/collector/featuregate v0.0.0-20221117214536-6a117bfc3737 h1:7sXg6M9Fw6rFVlX+iaWOMz6DFXEiroUdQer5kWGixwM= +go.opentelemetry.io/collector/featuregate v0.0.0-20221117214536-6a117bfc3737/go.mod h1:tewuFKJYalWBU0bmNKg++MC1ipINXUr6szYzOw2p1GI= +go.opentelemetry.io/collector/pdata v0.64.2-0.20221117234814-4565692c50a7 h1:IOFqfOu7fFxTgC7pvc2U7dk1/uFjwVQPK+CALiUvacI= +go.opentelemetry.io/collector/pdata v0.64.2-0.20221117234814-4565692c50a7/go.mod h1:0vynPfW2ZN7DltpcCFgCmTtWMQkCjp2a3TNt82YTCLQ= go.opentelemetry.io/otel v1.11.1 h1:4WLLAmcfkmDk2ukNXJyq3/kiz/3UzCaYq6PskJsaou4= go.opentelemetry.io/otel v1.11.1/go.mod h1:1nNhXBbWSD0nsL38H6btgnFN2k4i0sNLHNNMZMSbUGE= go.opentelemetry.io/otel/exporters/prometheus v0.33.0 h1:xXhPj7SLKWU5/Zd4Hxmd+X1C4jdmvc0Xy+kvjFx2z60= diff --git a/receiver/wavefrontreceiver/config_test.go b/receiver/wavefrontreceiver/config_test.go index 8e6adc35afa45..e4cc9765de8e4 100644 --- a/receiver/wavefrontreceiver/config_test.go +++ b/receiver/wavefrontreceiver/config_test.go @@ -63,7 +63,7 @@ func TestLoadConfig(t *testing.T) { require.NoError(t, err) require.NoError(t, component.UnmarshalReceiverConfig(sub, cfg)) - assert.NoError(t, cfg.Validate()) + assert.NoError(t, component.ValidateConfig(cfg)) assert.Equal(t, tt.expected, cfg) }) } diff --git a/receiver/wavefrontreceiver/go.mod b/receiver/wavefrontreceiver/go.mod index 52d6eedb42ee7..eb369ece804c7 100644 --- a/receiver/wavefrontreceiver/go.mod +++ b/receiver/wavefrontreceiver/go.mod @@ -9,7 +9,9 @@ require ( github.com/open-telemetry/opentelemetry-collector-contrib/receiver/carbonreceiver v0.64.0 github.com/open-telemetry/opentelemetry-collector-contrib/receiver/collectdreceiver v0.64.0 github.com/stretchr/testify v1.8.1 - go.opentelemetry.io/collector v0.64.2-0.20221115155901-1550938c18fd + go.opentelemetry.io/collector v0.64.2-0.20221117234814-4565692c50a7 + go.opentelemetry.io/collector/component v0.0.0-20221117234814-4565692c50a7 + go.opentelemetry.io/collector/consumer v0.0.0-20221117234814-4565692c50a7 google.golang.org/protobuf v1.28.1 ) @@ -28,8 +30,9 @@ require ( github.com/open-telemetry/opentelemetry-collector-contrib/internal/coreinternal v0.64.0 // indirect github.com/pmezard/go-difflib v1.0.0 // indirect go.opencensus.io v0.24.0 // indirect - go.opentelemetry.io/collector/pdata v0.64.2-0.20221115155901-1550938c18fd // indirect - go.opentelemetry.io/collector/semconv v0.64.2-0.20221115155901-1550938c18fd // indirect + go.opentelemetry.io/collector/featuregate v0.0.0-20221117214536-6a117bfc3737 // indirect + go.opentelemetry.io/collector/pdata v0.64.2-0.20221117234814-4565692c50a7 // indirect + go.opentelemetry.io/collector/semconv v0.64.2-0.20221117234814-4565692c50a7 // indirect go.opentelemetry.io/otel v1.11.1 // indirect go.opentelemetry.io/otel/metric v0.33.0 // indirect go.opentelemetry.io/otel/trace v1.11.1 // indirect diff --git a/receiver/wavefrontreceiver/go.sum b/receiver/wavefrontreceiver/go.sum index e53305bf701e8..618336cae3697 100644 --- a/receiver/wavefrontreceiver/go.sum +++ b/receiver/wavefrontreceiver/go.sum @@ -274,12 +274,18 @@ go.etcd.io/etcd/client/pkg/v3 v3.5.4/go.mod h1:IJHfcCEKxYu1Os13ZdwCwIUTUVGYTSAM3 go.etcd.io/etcd/client/v3 v3.5.4/go.mod h1:ZaRkVgBZC+L+dLCjTcF1hRXpgZXQPOvnA/Ak/gq3kiY= go.opencensus.io v0.24.0 h1:y73uSU6J157QMP2kn2r30vwW1A2W2WFwSCGnAVxeaD0= go.opencensus.io v0.24.0/go.mod h1:vNK8G9p7aAivkbmorf4v+7Hgx+Zs0yY+0fOtgBfjQKo= -go.opentelemetry.io/collector v0.64.2-0.20221115155901-1550938c18fd h1:O+6HhE4Ivg8Jksp3dIXIEC4FIR0Ush4uORvG3UtHZWk= -go.opentelemetry.io/collector v0.64.2-0.20221115155901-1550938c18fd/go.mod h1:mmSrOcwe1vEYmChXUYuF6rzlrUL0rjEiPfa19Xxb41o= -go.opentelemetry.io/collector/pdata v0.64.2-0.20221115155901-1550938c18fd h1:GdVAbRiae5VDZe3Mn3FqzMxO/aI5UbJ4+dcviqClHy8= -go.opentelemetry.io/collector/pdata v0.64.2-0.20221115155901-1550938c18fd/go.mod h1:0vynPfW2ZN7DltpcCFgCmTtWMQkCjp2a3TNt82YTCLQ= -go.opentelemetry.io/collector/semconv v0.64.2-0.20221115155901-1550938c18fd h1:rMqcl2pwi8YtVrtOPK8tVh87W0bFBge4yqB9ypSsAJ4= -go.opentelemetry.io/collector/semconv v0.64.2-0.20221115155901-1550938c18fd/go.mod h1:5o9yhOa+ABt7g2E5JABDxGZ1PQPbtfxrKNbYn+LOTXU= +go.opentelemetry.io/collector v0.64.2-0.20221117234814-4565692c50a7 h1:o/vMr2iyXzaeTb/KAldhMxAvRIfFPwtKfL5cKVKsSlU= +go.opentelemetry.io/collector v0.64.2-0.20221117234814-4565692c50a7/go.mod h1:PO8hayFFYvXDqELbXRVxwawR2HTdjN6mY4Qa3Se9xI8= +go.opentelemetry.io/collector/component v0.0.0-20221117234814-4565692c50a7 h1:q9m1bGHhQFUakQX79lZpLmFSY9VLULNSs2jUG8MdJLA= +go.opentelemetry.io/collector/component v0.0.0-20221117234814-4565692c50a7/go.mod h1:Z7H1Oj826e4dtVxXmT6SiUr6S0EIevUJmkVpfQV+UOk= +go.opentelemetry.io/collector/consumer v0.0.0-20221117234814-4565692c50a7 h1:FTy1JD9EJ7gq9SzlZoi2NkGcZ88+SwdiJav5uRcDEEY= +go.opentelemetry.io/collector/consumer v0.0.0-20221117234814-4565692c50a7/go.mod h1:86Elcw/LLrh90DprArogHMkBX3+UMu3tIgcVWF3mr6o= +go.opentelemetry.io/collector/featuregate v0.0.0-20221117214536-6a117bfc3737 h1:7sXg6M9Fw6rFVlX+iaWOMz6DFXEiroUdQer5kWGixwM= +go.opentelemetry.io/collector/featuregate v0.0.0-20221117214536-6a117bfc3737/go.mod h1:tewuFKJYalWBU0bmNKg++MC1ipINXUr6szYzOw2p1GI= +go.opentelemetry.io/collector/pdata v0.64.2-0.20221117234814-4565692c50a7 h1:IOFqfOu7fFxTgC7pvc2U7dk1/uFjwVQPK+CALiUvacI= +go.opentelemetry.io/collector/pdata v0.64.2-0.20221117234814-4565692c50a7/go.mod h1:0vynPfW2ZN7DltpcCFgCmTtWMQkCjp2a3TNt82YTCLQ= +go.opentelemetry.io/collector/semconv v0.64.2-0.20221117234814-4565692c50a7 h1:cGXAVltDxXw9nj0Vr7vyZZTj0whdyO+GYs+xv0xHJ2A= +go.opentelemetry.io/collector/semconv v0.64.2-0.20221117234814-4565692c50a7/go.mod h1:5o9yhOa+ABt7g2E5JABDxGZ1PQPbtfxrKNbYn+LOTXU= go.opentelemetry.io/otel v1.11.1 h1:4WLLAmcfkmDk2ukNXJyq3/kiz/3UzCaYq6PskJsaou4= go.opentelemetry.io/otel v1.11.1/go.mod h1:1nNhXBbWSD0nsL38H6btgnFN2k4i0sNLHNNMZMSbUGE= go.opentelemetry.io/otel/exporters/prometheus v0.33.0 h1:xXhPj7SLKWU5/Zd4Hxmd+X1C4jdmvc0Xy+kvjFx2z60= diff --git a/receiver/windowseventlogreceiver/go.mod b/receiver/windowseventlogreceiver/go.mod index aa5f2f2c1ec34..e619fcc442342 100644 --- a/receiver/windowseventlogreceiver/go.mod +++ b/receiver/windowseventlogreceiver/go.mod @@ -5,7 +5,9 @@ go 1.18 require ( github.com/open-telemetry/opentelemetry-collector-contrib/pkg/stanza v0.64.0 github.com/stretchr/testify v1.8.1 - go.opentelemetry.io/collector v0.64.2-0.20221115155901-1550938c18fd + go.opentelemetry.io/collector v0.64.2-0.20221117234814-4565692c50a7 + go.opentelemetry.io/collector/component v0.0.0-20221117234814-4565692c50a7 + go.opentelemetry.io/collector/consumer v0.0.0-20221117234814-4565692c50a7 golang.org/x/sys v0.2.0 ) @@ -28,7 +30,8 @@ require ( github.com/pmezard/go-difflib v1.0.0 // indirect github.com/rogpeppe/go-internal v1.8.1 // indirect go.opencensus.io v0.24.0 // indirect - go.opentelemetry.io/collector/pdata v0.64.2-0.20221115155901-1550938c18fd // indirect + go.opentelemetry.io/collector/featuregate v0.0.0-20221117214536-6a117bfc3737 // indirect + go.opentelemetry.io/collector/pdata v0.64.2-0.20221117234814-4565692c50a7 // indirect go.opentelemetry.io/otel v1.11.1 // indirect go.opentelemetry.io/otel/metric v0.33.0 // indirect go.opentelemetry.io/otel/trace v1.11.1 // indirect diff --git a/receiver/windowseventlogreceiver/go.sum b/receiver/windowseventlogreceiver/go.sum index 7978ef506e5fe..21cfb5ce619ee 100644 --- a/receiver/windowseventlogreceiver/go.sum +++ b/receiver/windowseventlogreceiver/go.sum @@ -304,10 +304,16 @@ go.etcd.io/etcd/client/pkg/v3 v3.5.4/go.mod h1:IJHfcCEKxYu1Os13ZdwCwIUTUVGYTSAM3 go.etcd.io/etcd/client/v3 v3.5.4/go.mod h1:ZaRkVgBZC+L+dLCjTcF1hRXpgZXQPOvnA/Ak/gq3kiY= go.opencensus.io v0.24.0 h1:y73uSU6J157QMP2kn2r30vwW1A2W2WFwSCGnAVxeaD0= go.opencensus.io v0.24.0/go.mod h1:vNK8G9p7aAivkbmorf4v+7Hgx+Zs0yY+0fOtgBfjQKo= -go.opentelemetry.io/collector v0.64.2-0.20221115155901-1550938c18fd h1:O+6HhE4Ivg8Jksp3dIXIEC4FIR0Ush4uORvG3UtHZWk= -go.opentelemetry.io/collector v0.64.2-0.20221115155901-1550938c18fd/go.mod h1:mmSrOcwe1vEYmChXUYuF6rzlrUL0rjEiPfa19Xxb41o= -go.opentelemetry.io/collector/pdata v0.64.2-0.20221115155901-1550938c18fd h1:GdVAbRiae5VDZe3Mn3FqzMxO/aI5UbJ4+dcviqClHy8= -go.opentelemetry.io/collector/pdata v0.64.2-0.20221115155901-1550938c18fd/go.mod h1:0vynPfW2ZN7DltpcCFgCmTtWMQkCjp2a3TNt82YTCLQ= +go.opentelemetry.io/collector v0.64.2-0.20221117234814-4565692c50a7 h1:o/vMr2iyXzaeTb/KAldhMxAvRIfFPwtKfL5cKVKsSlU= +go.opentelemetry.io/collector v0.64.2-0.20221117234814-4565692c50a7/go.mod h1:PO8hayFFYvXDqELbXRVxwawR2HTdjN6mY4Qa3Se9xI8= +go.opentelemetry.io/collector/component v0.0.0-20221117234814-4565692c50a7 h1:q9m1bGHhQFUakQX79lZpLmFSY9VLULNSs2jUG8MdJLA= +go.opentelemetry.io/collector/component v0.0.0-20221117234814-4565692c50a7/go.mod h1:Z7H1Oj826e4dtVxXmT6SiUr6S0EIevUJmkVpfQV+UOk= +go.opentelemetry.io/collector/consumer v0.0.0-20221117234814-4565692c50a7 h1:FTy1JD9EJ7gq9SzlZoi2NkGcZ88+SwdiJav5uRcDEEY= +go.opentelemetry.io/collector/consumer v0.0.0-20221117234814-4565692c50a7/go.mod h1:86Elcw/LLrh90DprArogHMkBX3+UMu3tIgcVWF3mr6o= +go.opentelemetry.io/collector/featuregate v0.0.0-20221117214536-6a117bfc3737 h1:7sXg6M9Fw6rFVlX+iaWOMz6DFXEiroUdQer5kWGixwM= +go.opentelemetry.io/collector/featuregate v0.0.0-20221117214536-6a117bfc3737/go.mod h1:tewuFKJYalWBU0bmNKg++MC1ipINXUr6szYzOw2p1GI= +go.opentelemetry.io/collector/pdata v0.64.2-0.20221117234814-4565692c50a7 h1:IOFqfOu7fFxTgC7pvc2U7dk1/uFjwVQPK+CALiUvacI= +go.opentelemetry.io/collector/pdata v0.64.2-0.20221117234814-4565692c50a7/go.mod h1:0vynPfW2ZN7DltpcCFgCmTtWMQkCjp2a3TNt82YTCLQ= go.opentelemetry.io/otel v1.11.1 h1:4WLLAmcfkmDk2ukNXJyq3/kiz/3UzCaYq6PskJsaou4= go.opentelemetry.io/otel v1.11.1/go.mod h1:1nNhXBbWSD0nsL38H6btgnFN2k4i0sNLHNNMZMSbUGE= go.opentelemetry.io/otel/exporters/prometheus v0.33.0 h1:xXhPj7SLKWU5/Zd4Hxmd+X1C4jdmvc0Xy+kvjFx2z60= diff --git a/receiver/windowsperfcountersreceiver/config_test.go b/receiver/windowsperfcountersreceiver/config_test.go index a978a91a528af..ec32ac77fcd7d 100644 --- a/receiver/windowsperfcountersreceiver/config_test.go +++ b/receiver/windowsperfcountersreceiver/config_test.go @@ -232,10 +232,10 @@ func TestLoadConfig(t *testing.T) { require.NoError(t, component.UnmarshalReceiverConfig(sub, cfg)) if tt.expectedErr != "" { - assert.Equal(t, cfg.Validate().Error(), tt.expectedErr) + assert.Equal(t, component.ValidateConfig(cfg).Error(), tt.expectedErr) return } - assert.NoError(t, cfg.Validate()) + assert.NoError(t, component.ValidateConfig(cfg)) assert.Equal(t, tt.expected, cfg) }) } diff --git a/receiver/windowsperfcountersreceiver/factory_test.go b/receiver/windowsperfcountersreceiver/factory_test.go index c336cc0a48f58..155894a181107 100644 --- a/receiver/windowsperfcountersreceiver/factory_test.go +++ b/receiver/windowsperfcountersreceiver/factory_test.go @@ -48,7 +48,7 @@ func TestCreateDefaultConfig(t *testing.T) { }, } - assert.NoError(t, cfg.Validate()) + assert.NoError(t, component.ValidateConfig(cfg)) } func TestCreateTracesReceiver(t *testing.T) { diff --git a/receiver/windowsperfcountersreceiver/go.mod b/receiver/windowsperfcountersreceiver/go.mod index a9e773560836e..ee423e4b2a1da 100644 --- a/receiver/windowsperfcountersreceiver/go.mod +++ b/receiver/windowsperfcountersreceiver/go.mod @@ -6,8 +6,10 @@ require ( github.com/open-telemetry/opentelemetry-collector-contrib/internal/scrapertest v0.64.0 github.com/open-telemetry/opentelemetry-collector-contrib/pkg/winperfcounters v0.64.0 github.com/stretchr/testify v1.8.1 - go.opentelemetry.io/collector v0.64.2-0.20221115155901-1550938c18fd - go.opentelemetry.io/collector/pdata v0.64.2-0.20221115155901-1550938c18fd + go.opentelemetry.io/collector v0.64.2-0.20221117234814-4565692c50a7 + go.opentelemetry.io/collector/component v0.0.0-20221117234814-4565692c50a7 + go.opentelemetry.io/collector/consumer v0.0.0-20221117234814-4565692c50a7 + go.opentelemetry.io/collector/pdata v0.64.2-0.20221117234814-4565692c50a7 go.uber.org/multierr v1.8.0 go.uber.org/zap v1.23.0 ) @@ -28,6 +30,7 @@ require ( github.com/pelletier/go-toml v1.9.4 // indirect github.com/pmezard/go-difflib v1.0.0 // indirect go.opencensus.io v0.24.0 // indirect + go.opentelemetry.io/collector/featuregate v0.0.0-20221117214536-6a117bfc3737 // indirect go.opentelemetry.io/otel v1.11.1 // indirect go.opentelemetry.io/otel/metric v0.33.0 // indirect go.opentelemetry.io/otel/trace v1.11.1 // indirect diff --git a/receiver/windowsperfcountersreceiver/go.sum b/receiver/windowsperfcountersreceiver/go.sum index 42d35d924f967..f3eed14b6d86a 100644 --- a/receiver/windowsperfcountersreceiver/go.sum +++ b/receiver/windowsperfcountersreceiver/go.sum @@ -281,10 +281,16 @@ go.etcd.io/etcd/client/pkg/v3 v3.5.4/go.mod h1:IJHfcCEKxYu1Os13ZdwCwIUTUVGYTSAM3 go.etcd.io/etcd/client/v3 v3.5.4/go.mod h1:ZaRkVgBZC+L+dLCjTcF1hRXpgZXQPOvnA/Ak/gq3kiY= go.opencensus.io v0.24.0 h1:y73uSU6J157QMP2kn2r30vwW1A2W2WFwSCGnAVxeaD0= go.opencensus.io v0.24.0/go.mod h1:vNK8G9p7aAivkbmorf4v+7Hgx+Zs0yY+0fOtgBfjQKo= -go.opentelemetry.io/collector v0.64.2-0.20221115155901-1550938c18fd h1:O+6HhE4Ivg8Jksp3dIXIEC4FIR0Ush4uORvG3UtHZWk= -go.opentelemetry.io/collector v0.64.2-0.20221115155901-1550938c18fd/go.mod h1:mmSrOcwe1vEYmChXUYuF6rzlrUL0rjEiPfa19Xxb41o= -go.opentelemetry.io/collector/pdata v0.64.2-0.20221115155901-1550938c18fd h1:GdVAbRiae5VDZe3Mn3FqzMxO/aI5UbJ4+dcviqClHy8= -go.opentelemetry.io/collector/pdata v0.64.2-0.20221115155901-1550938c18fd/go.mod h1:0vynPfW2ZN7DltpcCFgCmTtWMQkCjp2a3TNt82YTCLQ= +go.opentelemetry.io/collector v0.64.2-0.20221117234814-4565692c50a7 h1:o/vMr2iyXzaeTb/KAldhMxAvRIfFPwtKfL5cKVKsSlU= +go.opentelemetry.io/collector v0.64.2-0.20221117234814-4565692c50a7/go.mod h1:PO8hayFFYvXDqELbXRVxwawR2HTdjN6mY4Qa3Se9xI8= +go.opentelemetry.io/collector/component v0.0.0-20221117234814-4565692c50a7 h1:q9m1bGHhQFUakQX79lZpLmFSY9VLULNSs2jUG8MdJLA= +go.opentelemetry.io/collector/component v0.0.0-20221117234814-4565692c50a7/go.mod h1:Z7H1Oj826e4dtVxXmT6SiUr6S0EIevUJmkVpfQV+UOk= +go.opentelemetry.io/collector/consumer v0.0.0-20221117234814-4565692c50a7 h1:FTy1JD9EJ7gq9SzlZoi2NkGcZ88+SwdiJav5uRcDEEY= +go.opentelemetry.io/collector/consumer v0.0.0-20221117234814-4565692c50a7/go.mod h1:86Elcw/LLrh90DprArogHMkBX3+UMu3tIgcVWF3mr6o= +go.opentelemetry.io/collector/featuregate v0.0.0-20221117214536-6a117bfc3737 h1:7sXg6M9Fw6rFVlX+iaWOMz6DFXEiroUdQer5kWGixwM= +go.opentelemetry.io/collector/featuregate v0.0.0-20221117214536-6a117bfc3737/go.mod h1:tewuFKJYalWBU0bmNKg++MC1ipINXUr6szYzOw2p1GI= +go.opentelemetry.io/collector/pdata v0.64.2-0.20221117234814-4565692c50a7 h1:IOFqfOu7fFxTgC7pvc2U7dk1/uFjwVQPK+CALiUvacI= +go.opentelemetry.io/collector/pdata v0.64.2-0.20221117234814-4565692c50a7/go.mod h1:0vynPfW2ZN7DltpcCFgCmTtWMQkCjp2a3TNt82YTCLQ= go.opentelemetry.io/otel v1.11.1 h1:4WLLAmcfkmDk2ukNXJyq3/kiz/3UzCaYq6PskJsaou4= go.opentelemetry.io/otel v1.11.1/go.mod h1:1nNhXBbWSD0nsL38H6btgnFN2k4i0sNLHNNMZMSbUGE= go.opentelemetry.io/otel/exporters/prometheus v0.33.0 h1:xXhPj7SLKWU5/Zd4Hxmd+X1C4jdmvc0Xy+kvjFx2z60= diff --git a/receiver/zipkinreceiver/config_test.go b/receiver/zipkinreceiver/config_test.go index 5f4c39bcd2094..2105a9fde9896 100644 --- a/receiver/zipkinreceiver/config_test.go +++ b/receiver/zipkinreceiver/config_test.go @@ -71,7 +71,7 @@ func TestLoadConfig(t *testing.T) { require.NoError(t, err) require.NoError(t, component.UnmarshalReceiverConfig(sub, cfg)) - assert.NoError(t, cfg.Validate()) + assert.NoError(t, component.ValidateConfig(cfg)) assert.Equal(t, tt.expected, cfg) }) } diff --git a/receiver/zipkinreceiver/go.mod b/receiver/zipkinreceiver/go.mod index a22e578ea7224..02c1aaf195649 100644 --- a/receiver/zipkinreceiver/go.mod +++ b/receiver/zipkinreceiver/go.mod @@ -8,9 +8,11 @@ require ( github.com/open-telemetry/opentelemetry-collector-contrib/pkg/translator/zipkin v0.64.0 github.com/openzipkin/zipkin-go v0.4.1 github.com/stretchr/testify v1.8.1 - go.opentelemetry.io/collector v0.64.2-0.20221115155901-1550938c18fd - go.opentelemetry.io/collector/pdata v0.64.2-0.20221115155901-1550938c18fd - go.opentelemetry.io/collector/semconv v0.64.2-0.20221115155901-1550938c18fd + go.opentelemetry.io/collector v0.64.2-0.20221117234814-4565692c50a7 + go.opentelemetry.io/collector/component v0.0.0-20221117234814-4565692c50a7 + go.opentelemetry.io/collector/consumer v0.0.0-20221117234814-4565692c50a7 + go.opentelemetry.io/collector/pdata v0.64.2-0.20221117234814-4565692c50a7 + go.opentelemetry.io/collector/semconv v0.64.2-0.20221117234814-4565692c50a7 google.golang.org/protobuf v1.28.1 ) @@ -37,6 +39,7 @@ require ( github.com/uber/jaeger-client-go v2.30.0+incompatible // indirect github.com/uber/jaeger-lib v2.4.1+incompatible // indirect go.opencensus.io v0.24.0 // indirect + go.opentelemetry.io/collector/featuregate v0.0.0-20221117214536-6a117bfc3737 // indirect go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.36.4 // indirect go.opentelemetry.io/otel v1.11.1 // indirect go.opentelemetry.io/otel/metric v0.33.0 // indirect diff --git a/receiver/zipkinreceiver/go.sum b/receiver/zipkinreceiver/go.sum index 45f0df240e74a..d6eb43ac0365b 100644 --- a/receiver/zipkinreceiver/go.sum +++ b/receiver/zipkinreceiver/go.sum @@ -296,12 +296,18 @@ go.etcd.io/etcd/client/pkg/v3 v3.5.4/go.mod h1:IJHfcCEKxYu1Os13ZdwCwIUTUVGYTSAM3 go.etcd.io/etcd/client/v3 v3.5.4/go.mod h1:ZaRkVgBZC+L+dLCjTcF1hRXpgZXQPOvnA/Ak/gq3kiY= go.opencensus.io v0.24.0 h1:y73uSU6J157QMP2kn2r30vwW1A2W2WFwSCGnAVxeaD0= go.opencensus.io v0.24.0/go.mod h1:vNK8G9p7aAivkbmorf4v+7Hgx+Zs0yY+0fOtgBfjQKo= -go.opentelemetry.io/collector v0.64.2-0.20221115155901-1550938c18fd h1:O+6HhE4Ivg8Jksp3dIXIEC4FIR0Ush4uORvG3UtHZWk= -go.opentelemetry.io/collector v0.64.2-0.20221115155901-1550938c18fd/go.mod h1:mmSrOcwe1vEYmChXUYuF6rzlrUL0rjEiPfa19Xxb41o= -go.opentelemetry.io/collector/pdata v0.64.2-0.20221115155901-1550938c18fd h1:GdVAbRiae5VDZe3Mn3FqzMxO/aI5UbJ4+dcviqClHy8= -go.opentelemetry.io/collector/pdata v0.64.2-0.20221115155901-1550938c18fd/go.mod h1:0vynPfW2ZN7DltpcCFgCmTtWMQkCjp2a3TNt82YTCLQ= -go.opentelemetry.io/collector/semconv v0.64.2-0.20221115155901-1550938c18fd h1:rMqcl2pwi8YtVrtOPK8tVh87W0bFBge4yqB9ypSsAJ4= -go.opentelemetry.io/collector/semconv v0.64.2-0.20221115155901-1550938c18fd/go.mod h1:5o9yhOa+ABt7g2E5JABDxGZ1PQPbtfxrKNbYn+LOTXU= +go.opentelemetry.io/collector v0.64.2-0.20221117234814-4565692c50a7 h1:o/vMr2iyXzaeTb/KAldhMxAvRIfFPwtKfL5cKVKsSlU= +go.opentelemetry.io/collector v0.64.2-0.20221117234814-4565692c50a7/go.mod h1:PO8hayFFYvXDqELbXRVxwawR2HTdjN6mY4Qa3Se9xI8= +go.opentelemetry.io/collector/component v0.0.0-20221117234814-4565692c50a7 h1:q9m1bGHhQFUakQX79lZpLmFSY9VLULNSs2jUG8MdJLA= +go.opentelemetry.io/collector/component v0.0.0-20221117234814-4565692c50a7/go.mod h1:Z7H1Oj826e4dtVxXmT6SiUr6S0EIevUJmkVpfQV+UOk= +go.opentelemetry.io/collector/consumer v0.0.0-20221117234814-4565692c50a7 h1:FTy1JD9EJ7gq9SzlZoi2NkGcZ88+SwdiJav5uRcDEEY= +go.opentelemetry.io/collector/consumer v0.0.0-20221117234814-4565692c50a7/go.mod h1:86Elcw/LLrh90DprArogHMkBX3+UMu3tIgcVWF3mr6o= +go.opentelemetry.io/collector/featuregate v0.0.0-20221117214536-6a117bfc3737 h1:7sXg6M9Fw6rFVlX+iaWOMz6DFXEiroUdQer5kWGixwM= +go.opentelemetry.io/collector/featuregate v0.0.0-20221117214536-6a117bfc3737/go.mod h1:tewuFKJYalWBU0bmNKg++MC1ipINXUr6szYzOw2p1GI= +go.opentelemetry.io/collector/pdata v0.64.2-0.20221117234814-4565692c50a7 h1:IOFqfOu7fFxTgC7pvc2U7dk1/uFjwVQPK+CALiUvacI= +go.opentelemetry.io/collector/pdata v0.64.2-0.20221117234814-4565692c50a7/go.mod h1:0vynPfW2ZN7DltpcCFgCmTtWMQkCjp2a3TNt82YTCLQ= +go.opentelemetry.io/collector/semconv v0.64.2-0.20221117234814-4565692c50a7 h1:cGXAVltDxXw9nj0Vr7vyZZTj0whdyO+GYs+xv0xHJ2A= +go.opentelemetry.io/collector/semconv v0.64.2-0.20221117234814-4565692c50a7/go.mod h1:5o9yhOa+ABt7g2E5JABDxGZ1PQPbtfxrKNbYn+LOTXU= go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.36.4 h1:aUEBEdCa6iamGzg6fuYxDA8ThxvOG240mAvWDU+XLio= go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.36.4/go.mod h1:l2MdsbKTocpPS5nQZscqTR9jd8u96VYZdcpF8Sye7mA= go.opentelemetry.io/otel v1.11.1 h1:4WLLAmcfkmDk2ukNXJyq3/kiz/3UzCaYq6PskJsaou4= diff --git a/receiver/zookeeperreceiver/factory.go b/receiver/zookeeperreceiver/factory.go index 416766416c1a7..dc6923b899069 100644 --- a/receiver/zookeeperreceiver/factory.go +++ b/receiver/zookeeperreceiver/factory.go @@ -29,7 +29,7 @@ import ( const ( typeStr = "zookeeper" - stability = component.StabilityLevelInDevelopment + stability = component.StabilityLevelDevelopment defaultCollectionInterval = 10 * time.Second defaultTimeout = 10 * time.Second diff --git a/receiver/zookeeperreceiver/go.mod b/receiver/zookeeperreceiver/go.mod index f397a4252dc14..994b949e733e2 100644 --- a/receiver/zookeeperreceiver/go.mod +++ b/receiver/zookeeperreceiver/go.mod @@ -7,8 +7,10 @@ require ( github.com/open-telemetry/opentelemetry-collector-contrib/internal/scrapertest v0.64.0 github.com/stretchr/testify v1.8.1 github.com/testcontainers/testcontainers-go v0.15.0 - go.opentelemetry.io/collector v0.64.2-0.20221115155901-1550938c18fd - go.opentelemetry.io/collector/pdata v0.64.2-0.20221115155901-1550938c18fd + go.opentelemetry.io/collector v0.64.2-0.20221117234814-4565692c50a7 + go.opentelemetry.io/collector/component v0.0.0-20221117234814-4565692c50a7 + go.opentelemetry.io/collector/consumer v0.0.0-20221117234814-4565692c50a7 + go.opentelemetry.io/collector/pdata v0.64.2-0.20221117234814-4565692c50a7 go.uber.org/zap v1.23.0 ) @@ -50,6 +52,7 @@ require ( github.com/rogpeppe/go-internal v1.6.1 // indirect github.com/sirupsen/logrus v1.8.1 // indirect go.opencensus.io v0.24.0 // indirect + go.opentelemetry.io/collector/featuregate v0.0.0-20221117214536-6a117bfc3737 // indirect go.opentelemetry.io/otel v1.11.1 // indirect go.opentelemetry.io/otel/metric v0.33.0 // indirect go.opentelemetry.io/otel/trace v1.11.1 // indirect diff --git a/receiver/zookeeperreceiver/go.sum b/receiver/zookeeperreceiver/go.sum index 0333f4589e10a..067c920dbcc3b 100644 --- a/receiver/zookeeperreceiver/go.sum +++ b/receiver/zookeeperreceiver/go.sum @@ -821,10 +821,16 @@ go.opencensus.io v0.22.2/go.mod h1:yxeiOL68Rb0Xd1ddK5vPZ/oVn4vY4Ynel7k9FzqtOIw= go.opencensus.io v0.22.3/go.mod h1:yxeiOL68Rb0Xd1ddK5vPZ/oVn4vY4Ynel7k9FzqtOIw= go.opencensus.io v0.24.0 h1:y73uSU6J157QMP2kn2r30vwW1A2W2WFwSCGnAVxeaD0= go.opencensus.io v0.24.0/go.mod h1:vNK8G9p7aAivkbmorf4v+7Hgx+Zs0yY+0fOtgBfjQKo= -go.opentelemetry.io/collector v0.64.2-0.20221115155901-1550938c18fd h1:O+6HhE4Ivg8Jksp3dIXIEC4FIR0Ush4uORvG3UtHZWk= -go.opentelemetry.io/collector v0.64.2-0.20221115155901-1550938c18fd/go.mod h1:mmSrOcwe1vEYmChXUYuF6rzlrUL0rjEiPfa19Xxb41o= -go.opentelemetry.io/collector/pdata v0.64.2-0.20221115155901-1550938c18fd h1:GdVAbRiae5VDZe3Mn3FqzMxO/aI5UbJ4+dcviqClHy8= -go.opentelemetry.io/collector/pdata v0.64.2-0.20221115155901-1550938c18fd/go.mod h1:0vynPfW2ZN7DltpcCFgCmTtWMQkCjp2a3TNt82YTCLQ= +go.opentelemetry.io/collector v0.64.2-0.20221117234814-4565692c50a7 h1:o/vMr2iyXzaeTb/KAldhMxAvRIfFPwtKfL5cKVKsSlU= +go.opentelemetry.io/collector v0.64.2-0.20221117234814-4565692c50a7/go.mod h1:PO8hayFFYvXDqELbXRVxwawR2HTdjN6mY4Qa3Se9xI8= +go.opentelemetry.io/collector/component v0.0.0-20221117234814-4565692c50a7 h1:q9m1bGHhQFUakQX79lZpLmFSY9VLULNSs2jUG8MdJLA= +go.opentelemetry.io/collector/component v0.0.0-20221117234814-4565692c50a7/go.mod h1:Z7H1Oj826e4dtVxXmT6SiUr6S0EIevUJmkVpfQV+UOk= +go.opentelemetry.io/collector/consumer v0.0.0-20221117234814-4565692c50a7 h1:FTy1JD9EJ7gq9SzlZoi2NkGcZ88+SwdiJav5uRcDEEY= +go.opentelemetry.io/collector/consumer v0.0.0-20221117234814-4565692c50a7/go.mod h1:86Elcw/LLrh90DprArogHMkBX3+UMu3tIgcVWF3mr6o= +go.opentelemetry.io/collector/featuregate v0.0.0-20221117214536-6a117bfc3737 h1:7sXg6M9Fw6rFVlX+iaWOMz6DFXEiroUdQer5kWGixwM= +go.opentelemetry.io/collector/featuregate v0.0.0-20221117214536-6a117bfc3737/go.mod h1:tewuFKJYalWBU0bmNKg++MC1ipINXUr6szYzOw2p1GI= +go.opentelemetry.io/collector/pdata v0.64.2-0.20221117234814-4565692c50a7 h1:IOFqfOu7fFxTgC7pvc2U7dk1/uFjwVQPK+CALiUvacI= +go.opentelemetry.io/collector/pdata v0.64.2-0.20221117234814-4565692c50a7/go.mod h1:0vynPfW2ZN7DltpcCFgCmTtWMQkCjp2a3TNt82YTCLQ= go.opentelemetry.io/otel v1.11.1 h1:4WLLAmcfkmDk2ukNXJyq3/kiz/3UzCaYq6PskJsaou4= go.opentelemetry.io/otel v1.11.1/go.mod h1:1nNhXBbWSD0nsL38H6btgnFN2k4i0sNLHNNMZMSbUGE= go.opentelemetry.io/otel/exporters/prometheus v0.33.0 h1:xXhPj7SLKWU5/Zd4Hxmd+X1C4jdmvc0Xy+kvjFx2z60= diff --git a/testbed/go.mod b/testbed/go.mod index 9dce995f18e9b..587d7acc8defc 100644 --- a/testbed/go.mod +++ b/testbed/go.mod @@ -27,17 +27,19 @@ require ( github.com/prometheus/prometheus v0.38.0 github.com/shirou/gopsutil/v3 v3.22.10 github.com/stretchr/testify v1.8.1 - go.opentelemetry.io/collector v0.64.2-0.20221115155901-1550938c18fd - go.opentelemetry.io/collector/exporter/loggingexporter v0.64.2-0.20221115155901-1550938c18fd - go.opentelemetry.io/collector/exporter/otlpexporter v0.64.2-0.20221115155901-1550938c18fd - go.opentelemetry.io/collector/exporter/otlphttpexporter v0.64.2-0.20221115155901-1550938c18fd - go.opentelemetry.io/collector/extension/ballastextension v0.64.2-0.20221115155901-1550938c18fd - go.opentelemetry.io/collector/extension/zpagesextension v0.64.2-0.20221115155901-1550938c18fd - go.opentelemetry.io/collector/pdata v0.64.2-0.20221115155901-1550938c18fd - go.opentelemetry.io/collector/processor/batchprocessor v0.64.2-0.20221115155901-1550938c18fd - go.opentelemetry.io/collector/processor/memorylimiterprocessor v0.64.2-0.20221115155901-1550938c18fd - go.opentelemetry.io/collector/receiver/otlpreceiver v0.64.2-0.20221115155901-1550938c18fd - go.opentelemetry.io/collector/semconv v0.64.2-0.20221115155901-1550938c18fd + go.opentelemetry.io/collector v0.64.2-0.20221117234814-4565692c50a7 + go.opentelemetry.io/collector/component v0.0.0-20221117234814-4565692c50a7 + go.opentelemetry.io/collector/consumer v0.0.0-20221117234814-4565692c50a7 + go.opentelemetry.io/collector/exporter/loggingexporter v0.64.2-0.20221117234814-4565692c50a7 + go.opentelemetry.io/collector/exporter/otlpexporter v0.64.2-0.20221117234814-4565692c50a7 + go.opentelemetry.io/collector/exporter/otlphttpexporter v0.64.2-0.20221117234814-4565692c50a7 + go.opentelemetry.io/collector/extension/ballastextension v0.64.2-0.20221117234814-4565692c50a7 + go.opentelemetry.io/collector/extension/zpagesextension v0.64.2-0.20221117234814-4565692c50a7 + go.opentelemetry.io/collector/pdata v0.64.2-0.20221117234814-4565692c50a7 + go.opentelemetry.io/collector/processor/batchprocessor v0.64.2-0.20221117234814-4565692c50a7 + go.opentelemetry.io/collector/processor/memorylimiterprocessor v0.64.2-0.20221117234814-4565692c50a7 + go.opentelemetry.io/collector/receiver/otlpreceiver v0.64.2-0.20221117234814-4565692c50a7 + go.opentelemetry.io/collector/semconv v0.64.2-0.20221117234814-4565692c50a7 go.uber.org/atomic v1.10.0 go.uber.org/multierr v1.8.0 go.uber.org/zap v1.23.0 @@ -203,6 +205,7 @@ require ( github.com/vultr/govultr/v2 v2.17.2 // indirect github.com/yusufpapurcu/wmi v1.2.2 // indirect go.opencensus.io v0.24.0 // indirect + go.opentelemetry.io/collector/featuregate v0.0.0-20221117214536-6a117bfc3737 // indirect go.opentelemetry.io/contrib/instrumentation/google.golang.org/grpc/otelgrpc v0.36.4 // indirect go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.36.4 // indirect go.opentelemetry.io/contrib/propagators/b3 v1.11.1 // indirect diff --git a/testbed/go.sum b/testbed/go.sum index 2876a760749a1..89785f4517841 100644 --- a/testbed/go.sum +++ b/testbed/go.sum @@ -1651,37 +1651,45 @@ go.opencensus.io v0.24.0 h1:y73uSU6J157QMP2kn2r30vwW1A2W2WFwSCGnAVxeaD0= go.opencensus.io v0.24.0/go.mod h1:vNK8G9p7aAivkbmorf4v+7Hgx+Zs0yY+0fOtgBfjQKo= go.opentelemetry.io/collector v0.57.2/go.mod h1:9TwWyMRhbFNzaaGLtm/6poWNDJw+etvQMS6Fy+8/8Xs= go.opentelemetry.io/collector v0.64.1/go.mod h1:RxdEKzwxTEhBAgzC4wzyJEwSFgjWU73CHnLjKUKQDyo= -go.opentelemetry.io/collector v0.64.2-0.20221115155901-1550938c18fd h1:O+6HhE4Ivg8Jksp3dIXIEC4FIR0Ush4uORvG3UtHZWk= -go.opentelemetry.io/collector v0.64.2-0.20221115155901-1550938c18fd/go.mod h1:mmSrOcwe1vEYmChXUYuF6rzlrUL0rjEiPfa19Xxb41o= -go.opentelemetry.io/collector/exporter/loggingexporter v0.64.2-0.20221115155901-1550938c18fd h1:Rs+5jIRrgMFfK8RUHsx3dejMewFOFqRgebeT6nt4w4A= -go.opentelemetry.io/collector/exporter/loggingexporter v0.64.2-0.20221115155901-1550938c18fd/go.mod h1:AaS7Bnnu2e/rdiYCa6ko12TtHPxZmTvYyQEQ+yS++tU= -go.opentelemetry.io/collector/exporter/otlpexporter v0.64.2-0.20221115155901-1550938c18fd h1:Aba3DLnRML3J2567NIKeXwryvHGwckIkXkmrA/C/BzI= -go.opentelemetry.io/collector/exporter/otlpexporter v0.64.2-0.20221115155901-1550938c18fd/go.mod h1:5bfOtQfZ3XtaIGfavOrh8gHn+vvUZ2kB27dIrw6T1aY= -go.opentelemetry.io/collector/exporter/otlphttpexporter v0.64.2-0.20221115155901-1550938c18fd h1:ZOlxq1goa2gShVdLWdyUlk0V0qrM5zf3JckVFVDuijw= -go.opentelemetry.io/collector/exporter/otlphttpexporter v0.64.2-0.20221115155901-1550938c18fd/go.mod h1:MICUYztxRZgjILRc6Wj6fJK6n9KSiRNrRwRpybNy2i8= -go.opentelemetry.io/collector/extension/ballastextension v0.64.2-0.20221115155901-1550938c18fd h1:w5LzWafV1a0Fqfv7GkGwfRsdi1ZNZPVl08BZHI/LKt8= -go.opentelemetry.io/collector/extension/ballastextension v0.64.2-0.20221115155901-1550938c18fd/go.mod h1:Tv85DBH3y0OFkH8BN6pnRFPVHLmDphk2DDO6BgGPTp0= +go.opentelemetry.io/collector v0.64.2-0.20221117234814-4565692c50a7 h1:o/vMr2iyXzaeTb/KAldhMxAvRIfFPwtKfL5cKVKsSlU= +go.opentelemetry.io/collector v0.64.2-0.20221117234814-4565692c50a7/go.mod h1:PO8hayFFYvXDqELbXRVxwawR2HTdjN6mY4Qa3Se9xI8= +go.opentelemetry.io/collector/component v0.0.0-20221115212826-19db2f15c85c/go.mod h1:5+C/jgNQLM3Lkkys0UU+p2iOsGMs80kQ/DaZ1svo5cc= +go.opentelemetry.io/collector/component v0.0.0-20221117234814-4565692c50a7 h1:q9m1bGHhQFUakQX79lZpLmFSY9VLULNSs2jUG8MdJLA= +go.opentelemetry.io/collector/component v0.0.0-20221117234814-4565692c50a7/go.mod h1:Z7H1Oj826e4dtVxXmT6SiUr6S0EIevUJmkVpfQV+UOk= +go.opentelemetry.io/collector/consumer v0.0.0-20221116212002-2454cfb9ab7f/go.mod h1:npKt5UPhg8ZEtYqwN4R7VtWbzyAURVu3vfDikr3ycLM= +go.opentelemetry.io/collector/consumer v0.0.0-20221117234814-4565692c50a7 h1:FTy1JD9EJ7gq9SzlZoi2NkGcZ88+SwdiJav5uRcDEEY= +go.opentelemetry.io/collector/consumer v0.0.0-20221117234814-4565692c50a7/go.mod h1:86Elcw/LLrh90DprArogHMkBX3+UMu3tIgcVWF3mr6o= +go.opentelemetry.io/collector/exporter/loggingexporter v0.64.2-0.20221117234814-4565692c50a7 h1:d6+smWiqTczWSB6RgSOlicPHqhM2AdcTfpsDt5ocx8s= +go.opentelemetry.io/collector/exporter/loggingexporter v0.64.2-0.20221117234814-4565692c50a7/go.mod h1:Q1xXeHaKenGhOUJT/k6n0wh3rXQuk1qO1OHtx/1GEjA= +go.opentelemetry.io/collector/exporter/otlpexporter v0.64.2-0.20221117234814-4565692c50a7 h1:Pw+375oxebSKKDDQjOFSMFSfopmx6gARuqTmQD1njGY= +go.opentelemetry.io/collector/exporter/otlpexporter v0.64.2-0.20221117234814-4565692c50a7/go.mod h1:X6iHDUlspR3fJ3zvZskB+d9/PXaC/zYMbHrtfvk9yNk= +go.opentelemetry.io/collector/exporter/otlphttpexporter v0.64.2-0.20221117234814-4565692c50a7 h1:8ByTWg2YOwZqZpCwmWbPeuNjOC2k1QwMjAv0ESaFbqc= +go.opentelemetry.io/collector/exporter/otlphttpexporter v0.64.2-0.20221117234814-4565692c50a7/go.mod h1:21XZBi5i+LDa41a6BTH7YyUd3xTmf6DYnPNn3t9yTII= +go.opentelemetry.io/collector/extension/ballastextension v0.64.2-0.20221117234814-4565692c50a7 h1:eIazz94xNlOTrbMPzhnfIcqFvQTT0OW91H1AdYfbFqA= +go.opentelemetry.io/collector/extension/ballastextension v0.64.2-0.20221117234814-4565692c50a7/go.mod h1:3jV3YlZheaEai6+1gMxi92zehVd5owIa5oShiXiPgTA= go.opentelemetry.io/collector/extension/zpagesextension v0.64.1/go.mod h1:XenhQAUbOHgqNq5YQ/vQIcDHRcPUaDgZQxDC2qoI4Bc= -go.opentelemetry.io/collector/extension/zpagesextension v0.64.2-0.20221115155901-1550938c18fd h1:divtniDLhmbVre6mWhWZKrDps87WV7v2JUDe5d8wSCE= -go.opentelemetry.io/collector/extension/zpagesextension v0.64.2-0.20221115155901-1550938c18fd/go.mod h1:Lh4S28vozIfK/n2LJ7MhwyQBAJFzmb6FUVtlArX97ho= +go.opentelemetry.io/collector/extension/zpagesextension v0.64.2-0.20221117234814-4565692c50a7 h1:w7Oz8A/4pQHpvHsRTT6QC1QuxR4qpD0FlAK40koEQuU= +go.opentelemetry.io/collector/extension/zpagesextension v0.64.2-0.20221117234814-4565692c50a7/go.mod h1:MddgDwL0gsv0QilaxzMajrYXa+AdZED4tIsAnIMW2R0= +go.opentelemetry.io/collector/featuregate v0.0.0-20221117214536-6a117bfc3737 h1:7sXg6M9Fw6rFVlX+iaWOMz6DFXEiroUdQer5kWGixwM= +go.opentelemetry.io/collector/featuregate v0.0.0-20221117214536-6a117bfc3737/go.mod h1:tewuFKJYalWBU0bmNKg++MC1ipINXUr6szYzOw2p1GI= go.opentelemetry.io/collector/pdata v0.56.0/go.mod h1:mYcCREWiIJyHss0dbU+GSiz2tmGZ6u09vtfkKTciog4= go.opentelemetry.io/collector/pdata v0.57.2/go.mod h1:RU9I8lwBUxucwOsSYzHEcHi15M9QaX78hgQ2PRdSxV0= go.opentelemetry.io/collector/pdata v0.64.1/go.mod h1:IzvXUGQml2mrnvdb8zIlEW3qQs9oFLdD2hLwJdZ+pek= -go.opentelemetry.io/collector/pdata v0.64.2-0.20221115155901-1550938c18fd h1:GdVAbRiae5VDZe3Mn3FqzMxO/aI5UbJ4+dcviqClHy8= -go.opentelemetry.io/collector/pdata v0.64.2-0.20221115155901-1550938c18fd/go.mod h1:0vynPfW2ZN7DltpcCFgCmTtWMQkCjp2a3TNt82YTCLQ= +go.opentelemetry.io/collector/pdata v0.64.2-0.20221117234814-4565692c50a7 h1:IOFqfOu7fFxTgC7pvc2U7dk1/uFjwVQPK+CALiUvacI= +go.opentelemetry.io/collector/pdata v0.64.2-0.20221117234814-4565692c50a7/go.mod h1:0vynPfW2ZN7DltpcCFgCmTtWMQkCjp2a3TNt82YTCLQ= go.opentelemetry.io/collector/processor/batchprocessor v0.64.1/go.mod h1:qVl0+aYokPfiq5y+JVAvlII2rrUFBDEqqiDbTSnax78= -go.opentelemetry.io/collector/processor/batchprocessor v0.64.2-0.20221115155901-1550938c18fd h1:SSjP8V0UP2+oPZ3gL+Dk90KQcvHXvHp9V5h8IIpx0og= -go.opentelemetry.io/collector/processor/batchprocessor v0.64.2-0.20221115155901-1550938c18fd/go.mod h1:zyCnX0aTvBaZ3XLWSHZdTueP7WoXRjz8X6HiWgKqstM= -go.opentelemetry.io/collector/processor/memorylimiterprocessor v0.64.2-0.20221115155901-1550938c18fd h1:ZO4eSgxGxi8BohVcU6ixm/xjNBfCqqxbSQbKIK9KVtw= -go.opentelemetry.io/collector/processor/memorylimiterprocessor v0.64.2-0.20221115155901-1550938c18fd/go.mod h1:YYJUdzGlD0iN6KWTsTc+tAtRiOQNnJK9k7udr9Ic6l4= +go.opentelemetry.io/collector/processor/batchprocessor v0.64.2-0.20221117234814-4565692c50a7 h1:hGDq2T07j6qwwtQ2t6ZGU5tp/J2Dvu9mfY5qnnP5Ic8= +go.opentelemetry.io/collector/processor/batchprocessor v0.64.2-0.20221117234814-4565692c50a7/go.mod h1:b83iea2eDSAQkvd+2aSokaa6GRjSIsaR2zILziF/Ogc= +go.opentelemetry.io/collector/processor/memorylimiterprocessor v0.64.2-0.20221117234814-4565692c50a7 h1:M28BjryAkBY/tBp0CrPY+krc0x+6uJnmrkX7JQwA4Ns= +go.opentelemetry.io/collector/processor/memorylimiterprocessor v0.64.2-0.20221117234814-4565692c50a7/go.mod h1:81b812AB+nutOksY9LBYwhHtiqvqDjrih3PmrgY2wDg= go.opentelemetry.io/collector/receiver/otlpreceiver v0.64.1/go.mod h1:4rwNi9SeCKBP9XGLWNRFKPsWUV5NK4iqMvdj2WRMksQ= -go.opentelemetry.io/collector/receiver/otlpreceiver v0.64.2-0.20221115155901-1550938c18fd h1:hMuRptXpQYC9dk7x68LIFeVEpoE3oM+ddI6o13cS73Q= -go.opentelemetry.io/collector/receiver/otlpreceiver v0.64.2-0.20221115155901-1550938c18fd/go.mod h1:i80XzKLKheio/axok7WksVx/xmNGRadfmlzhWOWDnr4= +go.opentelemetry.io/collector/receiver/otlpreceiver v0.64.2-0.20221117234814-4565692c50a7 h1:n2zHwTL1xcJ1DtKrGUAXVT12hCN0b5tjVqQV974xCsA= +go.opentelemetry.io/collector/receiver/otlpreceiver v0.64.2-0.20221117234814-4565692c50a7/go.mod h1:CZy46KR3rC5HVHWouklB9oyg7SU9OIRmcKyw6+m+rCk= go.opentelemetry.io/collector/semconv v0.56.0/go.mod h1:EH1wbDvTyqKpKBBpoMIe0KQk2plCcFS66Mo17WtR7CQ= go.opentelemetry.io/collector/semconv v0.57.2/go.mod h1:84YnUjmm+nhGu4YTDLnHCbxnL74ooWpismPG79tFD7w= go.opentelemetry.io/collector/semconv v0.64.1/go.mod h1:5o9yhOa+ABt7g2E5JABDxGZ1PQPbtfxrKNbYn+LOTXU= -go.opentelemetry.io/collector/semconv v0.64.2-0.20221115155901-1550938c18fd h1:rMqcl2pwi8YtVrtOPK8tVh87W0bFBge4yqB9ypSsAJ4= -go.opentelemetry.io/collector/semconv v0.64.2-0.20221115155901-1550938c18fd/go.mod h1:5o9yhOa+ABt7g2E5JABDxGZ1PQPbtfxrKNbYn+LOTXU= +go.opentelemetry.io/collector/semconv v0.64.2-0.20221117234814-4565692c50a7 h1:cGXAVltDxXw9nj0Vr7vyZZTj0whdyO+GYs+xv0xHJ2A= +go.opentelemetry.io/collector/semconv v0.64.2-0.20221117234814-4565692c50a7/go.mod h1:5o9yhOa+ABt7g2E5JABDxGZ1PQPbtfxrKNbYn+LOTXU= go.opentelemetry.io/contrib/instrumentation/google.golang.org/grpc/otelgrpc v0.33.0/go.mod h1:y/SlJpJQPd2UzfBCj0E9Flk9FDCtTyqUmaCB41qFrWI= go.opentelemetry.io/contrib/instrumentation/google.golang.org/grpc/otelgrpc v0.36.4 h1:PRXhsszxTt5bbPriTjmaweWUsAnJYeWBhUMLRetUgBU= go.opentelemetry.io/contrib/instrumentation/google.golang.org/grpc/otelgrpc v0.36.4/go.mod h1:05eWWy6ZWzmpeImD3UowLTB3VjDMU1yxQ+ENuVWDM3c= diff --git a/testbed/mockdatareceivers/mockawsxrayreceiver/factory.go b/testbed/mockdatareceivers/mockawsxrayreceiver/factory.go index 38eff4125a7d5..67d23fe74ee1b 100644 --- a/testbed/mockdatareceivers/mockawsxrayreceiver/factory.go +++ b/testbed/mockdatareceivers/mockawsxrayreceiver/factory.go @@ -28,7 +28,7 @@ const ( // The value of "type" key in configuration. typeStr = "mock_receiver" // stability level of test component - stability = component.StabilityLevelInDevelopment + stability = component.StabilityLevelDevelopment // Default endpoints to bind to. defaultEndpoint = ":7276" diff --git a/testbed/mockdatareceivers/mockawsxrayreceiver/go.mod b/testbed/mockdatareceivers/mockawsxrayreceiver/go.mod index 45c121e14610f..4b7800033f2a8 100644 --- a/testbed/mockdatareceivers/mockawsxrayreceiver/go.mod +++ b/testbed/mockdatareceivers/mockawsxrayreceiver/go.mod @@ -4,8 +4,10 @@ go 1.18 require ( github.com/gorilla/mux v1.8.0 - go.opentelemetry.io/collector v0.64.2-0.20221115155901-1550938c18fd - go.opentelemetry.io/collector/pdata v0.64.2-0.20221115155901-1550938c18fd + go.opentelemetry.io/collector v0.64.2-0.20221117234814-4565692c50a7 + go.opentelemetry.io/collector/component v0.0.0-20221117234814-4565692c50a7 + go.opentelemetry.io/collector/consumer v0.0.0-20221117234814-4565692c50a7 + go.opentelemetry.io/collector/pdata v0.64.2-0.20221117234814-4565692c50a7 go.uber.org/zap v1.23.0 ) @@ -22,6 +24,7 @@ require ( github.com/modern-go/reflect2 v1.0.2 // indirect github.com/pelletier/go-toml v1.9.4 // indirect go.opencensus.io v0.24.0 // indirect + go.opentelemetry.io/collector/featuregate v0.0.0-20221117214536-6a117bfc3737 // indirect go.opentelemetry.io/otel v1.11.1 // indirect go.opentelemetry.io/otel/metric v0.33.0 // indirect go.opentelemetry.io/otel/trace v1.11.1 // indirect diff --git a/testbed/mockdatareceivers/mockawsxrayreceiver/go.sum b/testbed/mockdatareceivers/mockawsxrayreceiver/go.sum index 90510e48c6b8e..bc9523281535a 100644 --- a/testbed/mockdatareceivers/mockawsxrayreceiver/go.sum +++ b/testbed/mockdatareceivers/mockawsxrayreceiver/go.sum @@ -278,10 +278,16 @@ go.etcd.io/etcd/client/pkg/v3 v3.5.4/go.mod h1:IJHfcCEKxYu1Os13ZdwCwIUTUVGYTSAM3 go.etcd.io/etcd/client/v3 v3.5.4/go.mod h1:ZaRkVgBZC+L+dLCjTcF1hRXpgZXQPOvnA/Ak/gq3kiY= go.opencensus.io v0.24.0 h1:y73uSU6J157QMP2kn2r30vwW1A2W2WFwSCGnAVxeaD0= go.opencensus.io v0.24.0/go.mod h1:vNK8G9p7aAivkbmorf4v+7Hgx+Zs0yY+0fOtgBfjQKo= -go.opentelemetry.io/collector v0.64.2-0.20221115155901-1550938c18fd h1:O+6HhE4Ivg8Jksp3dIXIEC4FIR0Ush4uORvG3UtHZWk= -go.opentelemetry.io/collector v0.64.2-0.20221115155901-1550938c18fd/go.mod h1:mmSrOcwe1vEYmChXUYuF6rzlrUL0rjEiPfa19Xxb41o= -go.opentelemetry.io/collector/pdata v0.64.2-0.20221115155901-1550938c18fd h1:GdVAbRiae5VDZe3Mn3FqzMxO/aI5UbJ4+dcviqClHy8= -go.opentelemetry.io/collector/pdata v0.64.2-0.20221115155901-1550938c18fd/go.mod h1:0vynPfW2ZN7DltpcCFgCmTtWMQkCjp2a3TNt82YTCLQ= +go.opentelemetry.io/collector v0.64.2-0.20221117234814-4565692c50a7 h1:o/vMr2iyXzaeTb/KAldhMxAvRIfFPwtKfL5cKVKsSlU= +go.opentelemetry.io/collector v0.64.2-0.20221117234814-4565692c50a7/go.mod h1:PO8hayFFYvXDqELbXRVxwawR2HTdjN6mY4Qa3Se9xI8= +go.opentelemetry.io/collector/component v0.0.0-20221117234814-4565692c50a7 h1:q9m1bGHhQFUakQX79lZpLmFSY9VLULNSs2jUG8MdJLA= +go.opentelemetry.io/collector/component v0.0.0-20221117234814-4565692c50a7/go.mod h1:Z7H1Oj826e4dtVxXmT6SiUr6S0EIevUJmkVpfQV+UOk= +go.opentelemetry.io/collector/consumer v0.0.0-20221117234814-4565692c50a7 h1:FTy1JD9EJ7gq9SzlZoi2NkGcZ88+SwdiJav5uRcDEEY= +go.opentelemetry.io/collector/consumer v0.0.0-20221117234814-4565692c50a7/go.mod h1:86Elcw/LLrh90DprArogHMkBX3+UMu3tIgcVWF3mr6o= +go.opentelemetry.io/collector/featuregate v0.0.0-20221117214536-6a117bfc3737 h1:7sXg6M9Fw6rFVlX+iaWOMz6DFXEiroUdQer5kWGixwM= +go.opentelemetry.io/collector/featuregate v0.0.0-20221117214536-6a117bfc3737/go.mod h1:tewuFKJYalWBU0bmNKg++MC1ipINXUr6szYzOw2p1GI= +go.opentelemetry.io/collector/pdata v0.64.2-0.20221117234814-4565692c50a7 h1:IOFqfOu7fFxTgC7pvc2U7dk1/uFjwVQPK+CALiUvacI= +go.opentelemetry.io/collector/pdata v0.64.2-0.20221117234814-4565692c50a7/go.mod h1:0vynPfW2ZN7DltpcCFgCmTtWMQkCjp2a3TNt82YTCLQ= go.opentelemetry.io/otel v1.11.1 h1:4WLLAmcfkmDk2ukNXJyq3/kiz/3UzCaYq6PskJsaou4= go.opentelemetry.io/otel v1.11.1/go.mod h1:1nNhXBbWSD0nsL38H6btgnFN2k4i0sNLHNNMZMSbUGE= go.opentelemetry.io/otel/exporters/prometheus v0.33.0 h1:xXhPj7SLKWU5/Zd4Hxmd+X1C4jdmvc0Xy+kvjFx2z60=