diff --git a/cmd/configschema/configs.go b/cmd/configschema/configs.go index e2006509cebb..d6c29993cbf0 100644 --- a/cmd/configschema/configs.go +++ b/cmd/configschema/configs.go @@ -18,7 +18,6 @@ import ( "fmt" "go.opentelemetry.io/collector/component" - "go.opentelemetry.io/collector/config" ) const ( @@ -34,7 +33,7 @@ type CfgInfo struct { // the name of the component group, e.g. "receiver" Group string // the component type, e.g. "otlpreceiver.Config" - Type config.Type + Type component.Type // an instance of the component's configuration struct CfgInstance interface{} } @@ -78,7 +77,7 @@ func GetAllCfgInfos(components component.Factories) []CfgInfo { // config for the component specified by the passed-in componentType and // componentName. func GetCfgInfo(components component.Factories, componentType, componentName string) (CfgInfo, error) { - t := config.Type(componentName) + t := component.Type(componentName) switch componentType { case receiver: f := components.Receivers[t] diff --git a/cmd/configschema/go.mod b/cmd/configschema/go.mod index 069fbb5c73d4..46362afcb425 100644 --- a/cmd/configschema/go.mod +++ b/cmd/configschema/go.mod @@ -8,8 +8,8 @@ require ( github.com/open-telemetry/opentelemetry-collector-contrib v0.63.0 github.com/open-telemetry/opentelemetry-collector-contrib/receiver/redisreceiver v0.63.0 github.com/stretchr/testify v1.8.1 - go.opentelemetry.io/collector v0.63.2-0.20221104003159-6b27644724d8 - go.opentelemetry.io/collector/receiver/otlpreceiver v0.63.1 + go.opentelemetry.io/collector v0.63.2-0.20221108014805-0b08d5316426 + go.opentelemetry.io/collector/receiver/otlpreceiver v0.63.2-0.20221108014805-0b08d5316426 golang.org/x/mod v0.6.0 golang.org/x/text v0.4.0 ) @@ -322,10 +322,10 @@ require ( github.com/open-telemetry/opentelemetry-collector-contrib/exporter/carbonexporter v0.63.0 // indirect github.com/open-telemetry/opentelemetry-collector-contrib/exporter/clickhouseexporter v0.63.0 // indirect github.com/open-telemetry/opentelemetry-collector-contrib/exporter/coralogixexporter v0.63.0 // indirect - github.com/open-telemetry/opentelemetry-collector-contrib/exporter/datadogexporter v0.0.0-00010101000000-000000000000 // indirect + github.com/open-telemetry/opentelemetry-collector-contrib/exporter/datadogexporter v0.63.0 // indirect github.com/open-telemetry/opentelemetry-collector-contrib/exporter/dynatraceexporter v0.63.0 // indirect github.com/open-telemetry/opentelemetry-collector-contrib/exporter/elasticsearchexporter v0.63.0 // indirect - github.com/open-telemetry/opentelemetry-collector-contrib/exporter/f5cloudexporter v0.0.0-00010101000000-000000000000 // indirect + github.com/open-telemetry/opentelemetry-collector-contrib/exporter/f5cloudexporter v0.63.0 // indirect github.com/open-telemetry/opentelemetry-collector-contrib/exporter/fileexporter v0.63.0 // indirect github.com/open-telemetry/opentelemetry-collector-contrib/exporter/googlecloudexporter v0.63.0 // indirect github.com/open-telemetry/opentelemetry-collector-contrib/exporter/googlecloudpubsubexporter v0.63.0 // indirect @@ -415,7 +415,7 @@ require ( github.com/open-telemetry/opentelemetry-collector-contrib/processor/resourceprocessor v0.63.0 // indirect github.com/open-telemetry/opentelemetry-collector-contrib/processor/routingprocessor v0.63.0 // indirect github.com/open-telemetry/opentelemetry-collector-contrib/processor/servicegraphprocessor v0.63.0 // indirect - github.com/open-telemetry/opentelemetry-collector-contrib/processor/spanmetricsprocessor v0.0.0-00010101000000-000000000000 // indirect + github.com/open-telemetry/opentelemetry-collector-contrib/processor/spanmetricsprocessor v0.63.0 // indirect github.com/open-telemetry/opentelemetry-collector-contrib/processor/spanprocessor v0.63.0 // indirect github.com/open-telemetry/opentelemetry-collector-contrib/processor/tailsamplingprocessor v0.63.0 // indirect github.com/open-telemetry/opentelemetry-collector-contrib/processor/transformprocessor v0.63.0 // indirect @@ -448,7 +448,7 @@ require ( github.com/open-telemetry/opentelemetry-collector-contrib/receiver/iisreceiver v0.63.0 // indirect github.com/open-telemetry/opentelemetry-collector-contrib/receiver/influxdbreceiver v0.63.0 // indirect github.com/open-telemetry/opentelemetry-collector-contrib/receiver/jaegerreceiver v0.63.0 // indirect - github.com/open-telemetry/opentelemetry-collector-contrib/receiver/jmxreceiver v0.0.0-00010101000000-000000000000 // indirect + github.com/open-telemetry/opentelemetry-collector-contrib/receiver/jmxreceiver v0.63.0 // indirect github.com/open-telemetry/opentelemetry-collector-contrib/receiver/journaldreceiver v0.63.0 // indirect github.com/open-telemetry/opentelemetry-collector-contrib/receiver/k8sclusterreceiver v0.63.0 // indirect github.com/open-telemetry/opentelemetry-collector-contrib/receiver/k8seventsreceiver v0.63.0 // indirect @@ -517,7 +517,7 @@ require ( github.com/pmezard/go-difflib v1.0.0 // indirect github.com/power-devops/perfstat v0.0.0-20220216144756-c35f1ee13d7c // indirect github.com/pquerna/cachecontrol v0.1.0 // indirect - github.com/prometheus/client_golang v1.13.1-0.20221013115219-dcea97eee2b3 // indirect + github.com/prometheus/client_golang v1.13.1 // indirect github.com/prometheus/client_model v0.3.0 // indirect github.com/prometheus/common v0.37.0 // indirect github.com/prometheus/common/sigv4 v0.1.0 // indirect @@ -589,16 +589,16 @@ require ( go.etcd.io/etcd/client/v3 v3.5.4 // indirect go.mongodb.org/atlas v0.18.0 // indirect go.mongodb.org/mongo-driver v1.10.3 // indirect - go.opencensus.io v0.23.0 // indirect - go.opentelemetry.io/collector/exporter/loggingexporter v0.63.2-0.20221104003159-6b27644724d8 // indirect - go.opentelemetry.io/collector/exporter/otlpexporter v0.63.2-0.20221104003159-6b27644724d8 // indirect - go.opentelemetry.io/collector/exporter/otlphttpexporter v0.63.2-0.20221104003159-6b27644724d8 // indirect + go.opencensus.io v0.24.0 // indirect + go.opentelemetry.io/collector/exporter/loggingexporter v0.63.2-0.20221108014805-0b08d5316426 // indirect + go.opentelemetry.io/collector/exporter/otlpexporter v0.63.2-0.20221108014805-0b08d5316426 // indirect + go.opentelemetry.io/collector/exporter/otlphttpexporter v0.63.2-0.20221108014805-0b08d5316426 // indirect go.opentelemetry.io/collector/extension/ballastextension v0.0.0-20221103164255-2ed41215f324 // indirect go.opentelemetry.io/collector/extension/zpagesextension v0.0.0-20221102221454-bfc45c16c979 // indirect - go.opentelemetry.io/collector/pdata v0.63.2-0.20221104003159-6b27644724d8 // indirect - go.opentelemetry.io/collector/processor/batchprocessor v0.0.0-20221104003159-6b27644724d8 // indirect + go.opentelemetry.io/collector/pdata v0.63.2-0.20221108014805-0b08d5316426 // indirect + go.opentelemetry.io/collector/processor/batchprocessor v0.0.0-20221108014805-0b08d5316426 // indirect go.opentelemetry.io/collector/processor/memorylimiterprocessor v0.0.0-20221103164255-2ed41215f324 // indirect - go.opentelemetry.io/collector/semconv v0.63.2-0.20221104003159-6b27644724d8 // indirect + go.opentelemetry.io/collector/semconv v0.63.2-0.20221108014805-0b08d5316426 // 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 @@ -1032,4 +1032,4 @@ exclude github.com/docker/distribution v2.8.0+incompatible // at the time of this inclusion, v0.38.0 was the latest version available (also tagged as v2.38.0) replace github.com/prometheus/prometheus => github.com/prometheus/prometheus v0.38.0 -replace go.opentelemetry.io/collector/receiver/otlpreceiver => go.opentelemetry.io/collector/receiver/otlpreceiver v0.0.0-20221101161158-df8deb48186b +replace go.opentelemetry.io/collector/receiver/otlpreceiver => go.opentelemetry.io/collector/receiver/otlpreceiver v0.0.0-20221108014805-0b08d5316426 diff --git a/cmd/configschema/go.sum b/cmd/configschema/go.sum index 49441d983b32..e323d1c6443a 100644 --- a/cmd/configschema/go.sum +++ b/cmd/configschema/go.sum @@ -1727,8 +1727,8 @@ github.com/prometheus/client_golang v1.11.1/go.mod h1:Z6t4BnS23TR94PD6BsDNk8yVqr github.com/prometheus/client_golang v1.12.1/go.mod h1:3Z9XVyYiZYEO+YQWt3RD2R3jrbd179Rt297l4aS6nDY= github.com/prometheus/client_golang v1.12.2/go.mod h1:3Z9XVyYiZYEO+YQWt3RD2R3jrbd179Rt297l4aS6nDY= github.com/prometheus/client_golang v1.13.0/go.mod h1:vTeo+zgvILHsnnj/39Ou/1fPN5nJFOEMgftOUOmlvYQ= -github.com/prometheus/client_golang v1.13.1-0.20221013115219-dcea97eee2b3 h1:T49ADLrYOgiyTHKx/N7tUxcglkLEt7xzDoQRqJNTzKg= -github.com/prometheus/client_golang v1.13.1-0.20221013115219-dcea97eee2b3/go.mod h1:vTeo+zgvILHsnnj/39Ou/1fPN5nJFOEMgftOUOmlvYQ= +github.com/prometheus/client_golang v1.13.1 h1:3gMjIY2+/hzmqhtUC/aQNYldJA6DtH3CgQvwS+02K1c= +github.com/prometheus/client_golang v1.13.1/go.mod h1:vTeo+zgvILHsnnj/39Ou/1fPN5nJFOEMgftOUOmlvYQ= github.com/prometheus/client_model v0.0.0-20180712105110-5c3871d89910/go.mod h1:MbSGuTsp3dbXC40dX6PRTWyKYBIrTGTE9sqQNg2J8bo= github.com/prometheus/client_model v0.0.0-20190115171406-56726106282f/go.mod h1:MbSGuTsp3dbXC40dX6PRTWyKYBIrTGTE9sqQNg2J8bo= github.com/prometheus/client_model v0.0.0-20190129233127-fd36f4220a90/go.mod h1:xMI15A0UPsDsEKsMN9yxemIoYk6Tm2C1GtYGdfGttqA= @@ -2112,19 +2112,20 @@ 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.opencensus.io v0.22.5/go.mod h1:5pWMHQbX5EPX2/62yrJeAkowc+lfs/XD7Uxpq3pI6kk= -go.opencensus.io v0.23.0 h1:gqCw0LfLxScz8irSi8exQc7fyQ0fKQU/qnC/X8+V/1M= 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.57.2/go.mod h1:9TwWyMRhbFNzaaGLtm/6poWNDJw+etvQMS6Fy+8/8Xs= go.opentelemetry.io/collector v0.63.0/go.mod h1:/wnGBrLyrQ804Eh7jZAPh4xJVa9xwbDbGfKQXLil3yM= go.opentelemetry.io/collector v0.63.1/go.mod h1:FZC9Px2N5CRiOG1VWH4XvkDeFx+Bu5tO8+gaqDSfXAA= -go.opentelemetry.io/collector v0.63.2-0.20221104003159-6b27644724d8 h1:rOT5HzXXfSISc6FiH012zH2/EFjp37UXfjEqj5BpkWQ= -go.opentelemetry.io/collector v0.63.2-0.20221104003159-6b27644724d8/go.mod h1:JVmeZXugK4ondC6KQgrHTHWiF4JttpG5k6dWPMt62+k= -go.opentelemetry.io/collector/exporter/loggingexporter v0.63.2-0.20221104003159-6b27644724d8 h1:8eJDjaRFnt94NKdArrgi9I/kJYqZjRxUrnfjaZyBeQA= -go.opentelemetry.io/collector/exporter/loggingexporter v0.63.2-0.20221104003159-6b27644724d8/go.mod h1:/gESyMRxKKNCrPZCRw/3eBhtByYxPCiPfoR/aniFaMA= -go.opentelemetry.io/collector/exporter/otlpexporter v0.63.2-0.20221104003159-6b27644724d8 h1:LH4Xta7BzlK9kJwpYqdUApjHsv2rU+zivpTE8Iu7KJM= -go.opentelemetry.io/collector/exporter/otlpexporter v0.63.2-0.20221104003159-6b27644724d8/go.mod h1:t1QwWfBfdEsI80R28T9PeVFGm8f32ZGLdY+CAEfr2LI= -go.opentelemetry.io/collector/exporter/otlphttpexporter v0.63.2-0.20221104003159-6b27644724d8 h1:iKgw0o6MV+NaVafXaE4JcZRWDjboqLrcsY6hZyy6ns8= -go.opentelemetry.io/collector/exporter/otlphttpexporter v0.63.2-0.20221104003159-6b27644724d8/go.mod h1:ejN1zRqJtIoKnOYdx31LXVDpQ7TsSvVbUx50eQVCVcA= +go.opentelemetry.io/collector v0.63.2-0.20221108014805-0b08d5316426 h1:z/wLTMh7/vNxcFUDa5uG7/IPE3tYx6pzCWPV41ghyV8= +go.opentelemetry.io/collector v0.63.2-0.20221108014805-0b08d5316426/go.mod h1:+Zb70q0Rq17dA9FcHTiTjW6g96lvJ8kAZ0c+eWNkAv0= +go.opentelemetry.io/collector/exporter/loggingexporter v0.63.2-0.20221108014805-0b08d5316426 h1:DmxLLUbQQu4chu1xU4rytprZLO1gocMXn5QxlG6GrO0= +go.opentelemetry.io/collector/exporter/loggingexporter v0.63.2-0.20221108014805-0b08d5316426/go.mod h1:W2E/sdTLclh6LqFIkeg66VxlIMweCmcwAlxzzYuULkw= +go.opentelemetry.io/collector/exporter/otlpexporter v0.63.2-0.20221108014805-0b08d5316426 h1:zPTV1p+QFGd2e7f4DEwkujkeezTBGkurl2wrM9QZ3Dc= +go.opentelemetry.io/collector/exporter/otlpexporter v0.63.2-0.20221108014805-0b08d5316426/go.mod h1:ZdasRXXeeuXukj6gfIb4VJw3W5N4+fhMagKE1TEMOxM= +go.opentelemetry.io/collector/exporter/otlphttpexporter v0.63.2-0.20221108014805-0b08d5316426 h1:1xUhrje+DsP7lj6Oiesd6BpsZYMjNg2Ua3GMIaX9OHo= +go.opentelemetry.io/collector/exporter/otlphttpexporter v0.63.2-0.20221108014805-0b08d5316426/go.mod h1:/r5XMUNlCvz1o6q9WQB2OhiAmUPRiXJSFsCURTBNA2Y= go.opentelemetry.io/collector/extension/ballastextension v0.0.0-20221103164255-2ed41215f324 h1:pXYdlcrEGWCDtQBWv+XIjNrDqvBIUOcw7ekhN4vUTQo= go.opentelemetry.io/collector/extension/ballastextension v0.0.0-20221103164255-2ed41215f324/go.mod h1:x79DldeotQtNkVz3MCxWUXpaXwZJqksyvaW0l0Uttic= go.opentelemetry.io/collector/extension/zpagesextension v0.0.0-20221102221454-bfc45c16c979 h1:YW7BL8ftoJ7k+EtnMICw1KWASLuSDIhbF7SjjgWMCl4= @@ -2133,21 +2134,21 @@ go.opentelemetry.io/collector/pdata v0.56.0/go.mod h1:mYcCREWiIJyHss0dbU+GSiz2tm go.opentelemetry.io/collector/pdata v0.57.2/go.mod h1:RU9I8lwBUxucwOsSYzHEcHi15M9QaX78hgQ2PRdSxV0= go.opentelemetry.io/collector/pdata v0.63.0/go.mod h1:IzvXUGQml2mrnvdb8zIlEW3qQs9oFLdD2hLwJdZ+pek= go.opentelemetry.io/collector/pdata v0.63.1/go.mod h1:IzvXUGQml2mrnvdb8zIlEW3qQs9oFLdD2hLwJdZ+pek= -go.opentelemetry.io/collector/pdata v0.63.2-0.20221104003159-6b27644724d8 h1:7xeTQjfsOm9eogQeIxjSEhlik9qsbBGsnmkQHfyKaRE= -go.opentelemetry.io/collector/pdata v0.63.2-0.20221104003159-6b27644724d8/go.mod h1:IzvXUGQml2mrnvdb8zIlEW3qQs9oFLdD2hLwJdZ+pek= +go.opentelemetry.io/collector/pdata v0.63.2-0.20221108014805-0b08d5316426 h1:wKDpgP0Tx/gWI2SgDGAY1OTSeihhDivbbRqFR79IGTc= +go.opentelemetry.io/collector/pdata v0.63.2-0.20221108014805-0b08d5316426/go.mod h1:IzvXUGQml2mrnvdb8zIlEW3qQs9oFLdD2hLwJdZ+pek= go.opentelemetry.io/collector/processor/batchprocessor v0.0.0-20221103161931-a167b006e8c0/go.mod h1:WBv1Nayi8p12K0vxLxTkHpRGr79JXYT3TXL2X0B/PRU= -go.opentelemetry.io/collector/processor/batchprocessor v0.0.0-20221104003159-6b27644724d8 h1:jgN7o3WfR8x++rjMcVM1VN6OJi4ytlGANXbwd73BPXo= -go.opentelemetry.io/collector/processor/batchprocessor v0.0.0-20221104003159-6b27644724d8/go.mod h1:WBv1Nayi8p12K0vxLxTkHpRGr79JXYT3TXL2X0B/PRU= +go.opentelemetry.io/collector/processor/batchprocessor v0.0.0-20221108014805-0b08d5316426 h1:7f0NVsVGYT8pxAyk0qBBa8ZQf7athr/mfQ6QltGywN0= +go.opentelemetry.io/collector/processor/batchprocessor v0.0.0-20221108014805-0b08d5316426/go.mod h1:gpd5Q/3HlROMGYhnmwlFpUhcz8Xy80sokEcKs7c7zzE= go.opentelemetry.io/collector/processor/memorylimiterprocessor v0.0.0-20221103164255-2ed41215f324 h1:kskVPWYC7QhffnYezcq66fCMNVL2eUMybzSYEMlv0yQ= go.opentelemetry.io/collector/processor/memorylimiterprocessor v0.0.0-20221103164255-2ed41215f324/go.mod h1:EnZwZH5MPkSDrUTLPZ8SaePpvmugL6J4fk66ikM0pu8= -go.opentelemetry.io/collector/receiver/otlpreceiver v0.0.0-20221101161158-df8deb48186b h1:no9i2NWBheMrzP0uNdOgmPkp4nGsb/bUCEDwFDwMlfQ= -go.opentelemetry.io/collector/receiver/otlpreceiver v0.0.0-20221101161158-df8deb48186b/go.mod h1:C8qTtCEPf/V/7SC1clotABlD5h/MhSbGxh7cZzkazeM= +go.opentelemetry.io/collector/receiver/otlpreceiver v0.0.0-20221108014805-0b08d5316426 h1:6cosCaS91068I8El0q8TJkv3V5lRzAfH2Wuja/5ydIo= +go.opentelemetry.io/collector/receiver/otlpreceiver v0.0.0-20221108014805-0b08d5316426/go.mod h1:+sGF2/LgOFWN1QClgdzg2NYCY9dYyPO4W4NAfxdODto= 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.63.0/go.mod h1:5o9yhOa+ABt7g2E5JABDxGZ1PQPbtfxrKNbYn+LOTXU= go.opentelemetry.io/collector/semconv v0.63.1/go.mod h1:5o9yhOa+ABt7g2E5JABDxGZ1PQPbtfxrKNbYn+LOTXU= -go.opentelemetry.io/collector/semconv v0.63.2-0.20221104003159-6b27644724d8 h1:jm0sNPyqo6S165QjQYMBHB2nK50wlJbMYM03Yr3Eo2k= -go.opentelemetry.io/collector/semconv v0.63.2-0.20221104003159-6b27644724d8/go.mod h1:5o9yhOa+ABt7g2E5JABDxGZ1PQPbtfxrKNbYn+LOTXU= +go.opentelemetry.io/collector/semconv v0.63.2-0.20221108014805-0b08d5316426 h1:pqIl7OC531J6i9ttBCj3zLmZI/BSF4q323YpK0GgKGk= +go.opentelemetry.io/collector/semconv v0.63.2-0.20221108014805-0b08d5316426/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 c20b0d50cbd1..8c036df4f17d 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.63.2-0.20221104003159-6b27644724d8 - go.opentelemetry.io/collector/pdata v0.63.2-0.20221104003159-6b27644724d8 + go.opentelemetry.io/collector v0.63.2-0.20221108014805-0b08d5316426 + go.opentelemetry.io/collector/pdata v0.63.2-0.20221108014805-0b08d5316426 ) require ( diff --git a/cmd/mdatagen/go.sum b/cmd/mdatagen/go.sum index 6028b846ce49..c1791c22810b 100644 --- a/cmd/mdatagen/go.sum +++ b/cmd/mdatagen/go.sum @@ -276,10 +276,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.63.2-0.20221104003159-6b27644724d8 h1:rOT5HzXXfSISc6FiH012zH2/EFjp37UXfjEqj5BpkWQ= -go.opentelemetry.io/collector v0.63.2-0.20221104003159-6b27644724d8/go.mod h1:JVmeZXugK4ondC6KQgrHTHWiF4JttpG5k6dWPMt62+k= -go.opentelemetry.io/collector/pdata v0.63.2-0.20221104003159-6b27644724d8 h1:7xeTQjfsOm9eogQeIxjSEhlik9qsbBGsnmkQHfyKaRE= -go.opentelemetry.io/collector/pdata v0.63.2-0.20221104003159-6b27644724d8/go.mod h1:IzvXUGQml2mrnvdb8zIlEW3qQs9oFLdD2hLwJdZ+pek= +go.opentelemetry.io/collector v0.63.2-0.20221108014805-0b08d5316426 h1:z/wLTMh7/vNxcFUDa5uG7/IPE3tYx6pzCWPV41ghyV8= +go.opentelemetry.io/collector v0.63.2-0.20221108014805-0b08d5316426/go.mod h1:+Zb70q0Rq17dA9FcHTiTjW6g96lvJ8kAZ0c+eWNkAv0= +go.opentelemetry.io/collector/pdata v0.63.2-0.20221108014805-0b08d5316426 h1:wKDpgP0Tx/gWI2SgDGAY1OTSeihhDivbbRqFR79IGTc= +go.opentelemetry.io/collector/pdata v0.63.2-0.20221108014805-0b08d5316426/go.mod h1:IzvXUGQml2mrnvdb8zIlEW3qQs9oFLdD2hLwJdZ+pek= 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 d4fd6a1a9456..5fe52660af6c 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.17.10 github.com/aws/aws-sdk-go-v2/service/s3 v1.19.0 github.com/stretchr/testify v1.8.1 - go.opentelemetry.io/collector v0.63.2-0.20221104003159-6b27644724d8 + go.opentelemetry.io/collector v0.63.2-0.20221108014805-0b08d5316426 gopkg.in/yaml.v2 v2.4.0 ) diff --git a/confmap/provider/s3provider/go.sum b/confmap/provider/s3provider/go.sum index b92149e5b54c..5fd0de9f9c9d 100644 --- a/confmap/provider/s3provider/go.sum +++ b/confmap/provider/s3provider/go.sum @@ -280,8 +280,8 @@ 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.63.2-0.20221104003159-6b27644724d8 h1:rOT5HzXXfSISc6FiH012zH2/EFjp37UXfjEqj5BpkWQ= -go.opentelemetry.io/collector v0.63.2-0.20221104003159-6b27644724d8/go.mod h1:JVmeZXugK4ondC6KQgrHTHWiF4JttpG5k6dWPMt62+k= +go.opentelemetry.io/collector v0.63.2-0.20221108014805-0b08d5316426 h1:z/wLTMh7/vNxcFUDa5uG7/IPE3tYx6pzCWPV41ghyV8= +go.opentelemetry.io/collector v0.63.2-0.20221108014805-0b08d5316426/go.mod h1:+Zb70q0Rq17dA9FcHTiTjW6g96lvJ8kAZ0c+eWNkAv0= 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 eeeba2fe32e8..89603910e573 100644 --- a/exporter/alibabacloudlogserviceexporter/config_test.go +++ b/exporter/alibabacloudlogserviceexporter/config_test.go @@ -20,6 +20,7 @@ import ( "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" + "go.opentelemetry.io/collector/component" "go.opentelemetry.io/collector/config" "go.opentelemetry.io/collector/confmap/confmaptest" ) @@ -35,18 +36,18 @@ func TestLoadConfig(t *testing.T) { defaultCfg.Endpoint = "cn-hangzhou.log.aliyuncs.com" tests := []struct { - id config.ComponentID - expected config.Exporter + id component.ID + expected component.ExporterConfig }{ { - id: config.NewComponentIDWithName(typeStr, ""), + id: component.NewIDWithName(typeStr, ""), expected: defaultCfg, }, { - id: config.NewComponentIDWithName(typeStr, "2"), + id: component.NewIDWithName(typeStr, "2"), expected: &Config{ - ExporterSettings: config.NewExporterSettings(config.NewComponentID(typeStr)), + ExporterSettings: config.NewExporterSettings(component.NewID(typeStr)), Endpoint: "cn-hangzhou.log.aliyuncs.com", Project: "demo-project", Logstore: "demo-logstore", @@ -63,7 +64,7 @@ func TestLoadConfig(t *testing.T) { sub, err := cm.Sub(tt.id.String()) require.NoError(t, err) - require.NoError(t, config.UnmarshalExporter(sub, cfg)) + require.NoError(t, component.UnmarshalExporterConfig(sub, cfg)) assert.NoError(t, cfg.Validate()) assert.Equal(t, tt.expected, cfg) diff --git a/exporter/alibabacloudlogserviceexporter/factory.go b/exporter/alibabacloudlogserviceexporter/factory.go index 31a287830509..b5da27d6f580 100644 --- a/exporter/alibabacloudlogserviceexporter/factory.go +++ b/exporter/alibabacloudlogserviceexporter/factory.go @@ -39,16 +39,16 @@ func NewFactory() component.ExporterFactory { } // CreateDefaultConfig creates the default configuration for exporter. -func createDefaultConfig() config.Exporter { +func createDefaultConfig() component.ExporterConfig { return &Config{ - ExporterSettings: config.NewExporterSettings(config.NewComponentID(typeStr)), + ExporterSettings: config.NewExporterSettings(component.NewID(typeStr)), } } func createTracesExporter( _ context.Context, set component.ExporterCreateSettings, - cfg config.Exporter, + cfg component.ExporterConfig, ) (component.TracesExporter, error) { return newTracesExporter(set, cfg) } @@ -56,7 +56,7 @@ func createTracesExporter( func createMetricsExporter( _ context.Context, set component.ExporterCreateSettings, - cfg config.Exporter, + cfg component.ExporterConfig, ) (exp component.MetricsExporter, err error) { return newMetricsExporter(set, cfg) } @@ -64,7 +64,7 @@ func createMetricsExporter( func createLogsExporter( _ context.Context, set component.ExporterCreateSettings, - cfg config.Exporter, + cfg component.ExporterConfig, ) (exp component.LogsExporter, err error) { return newLogsExporter(set, cfg) } diff --git a/exporter/alibabacloudlogserviceexporter/go.mod b/exporter/alibabacloudlogserviceexporter/go.mod index 709d53eede3c..2355962cd685 100644 --- a/exporter/alibabacloudlogserviceexporter/go.mod +++ b/exporter/alibabacloudlogserviceexporter/go.mod @@ -7,9 +7,9 @@ require ( github.com/gogo/protobuf v1.3.2 github.com/open-telemetry/opentelemetry-collector-contrib/internal/coreinternal v0.63.0 github.com/stretchr/testify v1.8.1 - go.opentelemetry.io/collector v0.63.2-0.20221104003159-6b27644724d8 - go.opentelemetry.io/collector/pdata v0.63.2-0.20221104003159-6b27644724d8 - go.opentelemetry.io/collector/semconv v0.63.2-0.20221104003159-6b27644724d8 + go.opentelemetry.io/collector v0.63.2-0.20221108014805-0b08d5316426 + go.opentelemetry.io/collector/pdata v0.63.2-0.20221108014805-0b08d5316426 + go.opentelemetry.io/collector/semconv v0.63.2-0.20221108014805-0b08d5316426 go.uber.org/zap v1.23.0 ) @@ -30,7 +30,7 @@ require ( github.com/pierrec/lz4 v2.6.0+incompatible // indirect github.com/pkg/errors v0.9.1 // indirect github.com/pmezard/go-difflib v1.0.0 // indirect - go.opencensus.io v0.23.0 // indirect + go.opencensus.io v0.24.0 // 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 d3e5e8c8023f..255d8ba38f0b 100644 --- a/exporter/alibabacloudlogserviceexporter/go.sum +++ b/exporter/alibabacloudlogserviceexporter/go.sum @@ -342,7 +342,7 @@ github.com/prometheus/client_golang v1.0.0/go.mod h1:db9x61etRT2tGnBNRi70OPL5Fsn github.com/prometheus/client_golang v1.3.0/go.mod h1:hJaj2vgQTGQmVCsAACORcieXFeDPbaTKGT+JTgUa3og= github.com/prometheus/client_golang v1.7.1/go.mod h1:PY5Wy2awLA44sXw4AOSfFBetzPP4j5+D6mVACh+pe2M= github.com/prometheus/client_golang v1.11.1/go.mod h1:Z6t4BnS23TR94PD6BsDNk8yVqroYurpAkEiz0P2BEV0= -github.com/prometheus/client_golang v1.13.0 h1:b71QUfeo5M8gq2+evJdTPfZhYMAU0uKPkyPJ7TPsloU= +github.com/prometheus/client_golang v1.13.1 h1:3gMjIY2+/hzmqhtUC/aQNYldJA6DtH3CgQvwS+02K1c= github.com/prometheus/client_model v0.0.0-20180712105110-5c3871d89910/go.mod h1:MbSGuTsp3dbXC40dX6PRTWyKYBIrTGTE9sqQNg2J8bo= github.com/prometheus/client_model v0.0.0-20190115171406-56726106282f/go.mod h1:MbSGuTsp3dbXC40dX6PRTWyKYBIrTGTE9sqQNg2J8bo= github.com/prometheus/client_model v0.0.0-20190129233127-fd36f4220a90/go.mod h1:xMI15A0UPsDsEKsMN9yxemIoYk6Tm2C1GtYGdfGttqA= @@ -398,7 +398,6 @@ github.com/stretchr/testify v1.2.2/go.mod h1:a8OnRcib4nhh0OaRAV+Yts87kKdq0PP7pXf github.com/stretchr/testify v1.3.0/go.mod h1:M5WIy9Dh21IEIfnGCwXGc5bZfKNJtfHm1UVUgZn+9EI= github.com/stretchr/testify v1.4.0/go.mod h1:j7eGeouHqKxXV5pUuKE4zz7dFj8WfuZ+81PSLYec5m4= github.com/stretchr/testify v1.5.1/go.mod h1:5W2xD1RspED5o8YsWQXVCued0rvSQ+mT+I5cxcmMvtA= -github.com/stretchr/testify v1.6.1/go.mod h1:6Fq8oRcR53rry900zMqJjRRixrwX3KX962/h/Wwjteg= github.com/stretchr/testify v1.7.0/go.mod h1:6Fq8oRcR53rry900zMqJjRRixrwX3KX962/h/Wwjteg= github.com/stretchr/testify v1.7.1/go.mod h1:6Fq8oRcR53rry900zMqJjRRixrwX3KX962/h/Wwjteg= github.com/stretchr/testify v1.8.0/go.mod h1:yNjHg4UonilssWZ8iaSj1OCr/vHnekPRkoO+kdMU+MU= @@ -419,14 +418,14 @@ go.etcd.io/etcd/client/v3 v3.5.4/go.mod h1:ZaRkVgBZC+L+dLCjTcF1hRXpgZXQPOvnA/Ak/ go.opencensus.io v0.20.1/go.mod h1:6WKK9ahsWS3RSO+PY9ZHZUfv2irvY6gN279GOPZjmmk= 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.23.0 h1:gqCw0LfLxScz8irSi8exQc7fyQ0fKQU/qnC/X8+V/1M= -go.opencensus.io v0.23.0/go.mod h1:XItmlyltB5F7CS4xOC1DcqMoFqwtC6OG2xF7mCv7P7E= -go.opentelemetry.io/collector v0.63.2-0.20221104003159-6b27644724d8 h1:rOT5HzXXfSISc6FiH012zH2/EFjp37UXfjEqj5BpkWQ= -go.opentelemetry.io/collector v0.63.2-0.20221104003159-6b27644724d8/go.mod h1:JVmeZXugK4ondC6KQgrHTHWiF4JttpG5k6dWPMt62+k= -go.opentelemetry.io/collector/pdata v0.63.2-0.20221104003159-6b27644724d8 h1:7xeTQjfsOm9eogQeIxjSEhlik9qsbBGsnmkQHfyKaRE= -go.opentelemetry.io/collector/pdata v0.63.2-0.20221104003159-6b27644724d8/go.mod h1:IzvXUGQml2mrnvdb8zIlEW3qQs9oFLdD2hLwJdZ+pek= -go.opentelemetry.io/collector/semconv v0.63.2-0.20221104003159-6b27644724d8 h1:jm0sNPyqo6S165QjQYMBHB2nK50wlJbMYM03Yr3Eo2k= -go.opentelemetry.io/collector/semconv v0.63.2-0.20221104003159-6b27644724d8/go.mod h1:5o9yhOa+ABt7g2E5JABDxGZ1PQPbtfxrKNbYn+LOTXU= +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.63.2-0.20221108014805-0b08d5316426 h1:z/wLTMh7/vNxcFUDa5uG7/IPE3tYx6pzCWPV41ghyV8= +go.opentelemetry.io/collector v0.63.2-0.20221108014805-0b08d5316426/go.mod h1:+Zb70q0Rq17dA9FcHTiTjW6g96lvJ8kAZ0c+eWNkAv0= +go.opentelemetry.io/collector/pdata v0.63.2-0.20221108014805-0b08d5316426 h1:wKDpgP0Tx/gWI2SgDGAY1OTSeihhDivbbRqFR79IGTc= +go.opentelemetry.io/collector/pdata v0.63.2-0.20221108014805-0b08d5316426/go.mod h1:IzvXUGQml2mrnvdb8zIlEW3qQs9oFLdD2hLwJdZ+pek= +go.opentelemetry.io/collector/semconv v0.63.2-0.20221108014805-0b08d5316426 h1:pqIl7OC531J6i9ttBCj3zLmZI/BSF4q323YpK0GgKGk= +go.opentelemetry.io/collector/semconv v0.63.2-0.20221108014805-0b08d5316426/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/alibabacloudlogserviceexporter/logs_exporter.go b/exporter/alibabacloudlogserviceexporter/logs_exporter.go index 55a52bf0bd6b..a31dcb18011b 100644 --- a/exporter/alibabacloudlogserviceexporter/logs_exporter.go +++ b/exporter/alibabacloudlogserviceexporter/logs_exporter.go @@ -18,14 +18,13 @@ import ( "context" "go.opentelemetry.io/collector/component" - "go.opentelemetry.io/collector/config" "go.opentelemetry.io/collector/exporter/exporterhelper" "go.opentelemetry.io/collector/pdata/plog" "go.uber.org/zap" ) // newLogsExporter return a new LogService logs exporter. -func newLogsExporter(set component.ExporterCreateSettings, cfg config.Exporter) (component.LogsExporter, error) { +func newLogsExporter(set component.ExporterCreateSettings, cfg component.ExporterConfig) (component.LogsExporter, error) { l := &logServiceLogsSender{ logger: set.Logger, diff --git a/exporter/alibabacloudlogserviceexporter/logs_exporter_test.go b/exporter/alibabacloudlogserviceexporter/logs_exporter_test.go index 17dd7f3d3d22..1cb7f0e52b89 100644 --- a/exporter/alibabacloudlogserviceexporter/logs_exporter_test.go +++ b/exporter/alibabacloudlogserviceexporter/logs_exporter_test.go @@ -22,6 +22,7 @@ import ( "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" + "go.opentelemetry.io/collector/component" "go.opentelemetry.io/collector/component/componenttest" "go.opentelemetry.io/collector/config" "go.opentelemetry.io/collector/pdata/pcommon" @@ -53,7 +54,7 @@ func createSimpleLogData(numberOfLogs int) plog.Logs { func TestNewLogsExporter(t *testing.T) { got, err := newLogsExporter(componenttest.NewNopExporterCreateSettings(), &Config{ - ExporterSettings: config.NewExporterSettings(config.NewComponentID(typeStr)), + ExporterSettings: config.NewExporterSettings(component.NewID(typeStr)), Endpoint: "us-west-1.log.aliyuncs.com", Project: "demo-project", Logstore: "demo-logstore", @@ -69,7 +70,7 @@ func TestNewLogsExporter(t *testing.T) { func TestSTSTokenExporter(t *testing.T) { got, err := newLogsExporter(componenttest.NewNopExporterCreateSettings(), &Config{ - ExporterSettings: config.NewExporterSettings(config.NewComponentID(typeStr)), + ExporterSettings: config.NewExporterSettings(component.NewID(typeStr)), Endpoint: "us-west-1.log.aliyuncs.com", Project: "demo-project", Logstore: "demo-logstore", diff --git a/exporter/alibabacloudlogserviceexporter/metrics_exporter.go b/exporter/alibabacloudlogserviceexporter/metrics_exporter.go index 4431089faa24..5bd2ad76b4d1 100644 --- a/exporter/alibabacloudlogserviceexporter/metrics_exporter.go +++ b/exporter/alibabacloudlogserviceexporter/metrics_exporter.go @@ -18,14 +18,13 @@ import ( "context" "go.opentelemetry.io/collector/component" - "go.opentelemetry.io/collector/config" "go.opentelemetry.io/collector/exporter/exporterhelper" "go.opentelemetry.io/collector/pdata/pmetric" "go.uber.org/zap" ) // newMetricsExporter return a new LogSerice metrics exporter. -func newMetricsExporter(set component.ExporterCreateSettings, cfg config.Exporter) (component.MetricsExporter, error) { +func newMetricsExporter(set component.ExporterCreateSettings, cfg component.ExporterConfig) (component.MetricsExporter, error) { l := &logServiceMetricsSender{ logger: set.Logger, diff --git a/exporter/alibabacloudlogserviceexporter/metrics_exporter_test.go b/exporter/alibabacloudlogserviceexporter/metrics_exporter_test.go index a70e17a60d8d..26e2508f88d5 100644 --- a/exporter/alibabacloudlogserviceexporter/metrics_exporter_test.go +++ b/exporter/alibabacloudlogserviceexporter/metrics_exporter_test.go @@ -20,6 +20,7 @@ import ( "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" + "go.opentelemetry.io/collector/component" "go.opentelemetry.io/collector/component/componenttest" "go.opentelemetry.io/collector/config" @@ -28,7 +29,7 @@ import ( func TestNewMetricsExporter(t *testing.T) { got, err := newMetricsExporter(componenttest.NewNopExporterCreateSettings(), &Config{ - ExporterSettings: config.NewExporterSettings(config.NewComponentID(typeStr)), + ExporterSettings: config.NewExporterSettings(component.NewID(typeStr)), Endpoint: "us-west-1.log.aliyuncs.com", Project: "demo-project", Logstore: "demo-logstore", diff --git a/exporter/alibabacloudlogserviceexporter/trace_exporter.go b/exporter/alibabacloudlogserviceexporter/trace_exporter.go index 34332acf8434..75570fb2de29 100644 --- a/exporter/alibabacloudlogserviceexporter/trace_exporter.go +++ b/exporter/alibabacloudlogserviceexporter/trace_exporter.go @@ -18,14 +18,13 @@ import ( "context" "go.opentelemetry.io/collector/component" - "go.opentelemetry.io/collector/config" "go.opentelemetry.io/collector/exporter/exporterhelper" "go.opentelemetry.io/collector/pdata/ptrace" "go.uber.org/zap" ) // newTracesExporter return a new LogSerice trace exporter. -func newTracesExporter(set component.ExporterCreateSettings, cfg config.Exporter) (component.TracesExporter, error) { +func newTracesExporter(set component.ExporterCreateSettings, cfg component.ExporterConfig) (component.TracesExporter, error) { l := &logServiceTraceSender{ logger: set.Logger, diff --git a/exporter/alibabacloudlogserviceexporter/trace_exporter_test.go b/exporter/alibabacloudlogserviceexporter/trace_exporter_test.go index 1f0eb89d49bb..ae6a18dc4306 100644 --- a/exporter/alibabacloudlogserviceexporter/trace_exporter_test.go +++ b/exporter/alibabacloudlogserviceexporter/trace_exporter_test.go @@ -20,6 +20,7 @@ import ( "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" + "go.opentelemetry.io/collector/component" "go.opentelemetry.io/collector/component/componenttest" "go.opentelemetry.io/collector/config" "go.opentelemetry.io/collector/pdata/ptrace" @@ -28,7 +29,7 @@ import ( func TestNewTracesExporter(t *testing.T) { got, err := newTracesExporter(componenttest.NewNopExporterCreateSettings(), &Config{ - ExporterSettings: config.NewExporterSettings(config.NewComponentID(typeStr)), + ExporterSettings: config.NewExporterSettings(component.NewID(typeStr)), Endpoint: "cn-hangzhou.log.aliyuncs.com", Project: "demo-project", Logstore: "demo-logstore", diff --git a/exporter/awscloudwatchlogsexporter/config.go b/exporter/awscloudwatchlogsexporter/config.go index 5942134e61fd..0adc8a9f1d55 100644 --- a/exporter/awscloudwatchlogsexporter/config.go +++ b/exporter/awscloudwatchlogsexporter/config.go @@ -17,6 +17,7 @@ package awscloudwatchlogsexporter // import "github.com/open-telemetry/opentelem import ( "errors" + "go.opentelemetry.io/collector/component" "go.opentelemetry.io/collector/config" "go.opentelemetry.io/collector/exporter/exporterhelper" "go.uber.org/zap" @@ -62,7 +63,7 @@ type QueueSettings struct { QueueSize int `mapstructure:"queue_size"` } -var _ config.Exporter = (*Config)(nil) +var _ component.ExporterConfig = (*Config)(nil) // Validate config func (config *Config) Validate() error { diff --git a/exporter/awscloudwatchlogsexporter/config_test.go b/exporter/awscloudwatchlogsexporter/config_test.go index f2677eecf559..58046a152ab8 100644 --- a/exporter/awscloudwatchlogsexporter/config_test.go +++ b/exporter/awscloudwatchlogsexporter/config_test.go @@ -20,6 +20,7 @@ import ( "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" + "go.opentelemetry.io/collector/component" "go.opentelemetry.io/collector/config" "go.opentelemetry.io/collector/confmap/confmaptest" "go.opentelemetry.io/collector/exporter/exporterhelper" @@ -37,14 +38,14 @@ func TestLoadConfig(t *testing.T) { defaultRetrySettings := exporterhelper.NewDefaultRetrySettings() tests := []struct { - id config.ComponentID - expected config.Exporter + id component.ID + expected component.ExporterConfig errorMessage string }{ { - id: config.NewComponentIDWithName(typeStr, "e1-defaults"), + id: component.NewIDWithName(typeStr, "e1-defaults"), expected: &Config{ - ExporterSettings: config.NewExporterSettings(config.NewComponentID(typeStr)), + ExporterSettings: config.NewExporterSettings(component.NewID(typeStr)), RetrySettings: defaultRetrySettings, LogGroupName: "test-1", LogStreamName: "testing", @@ -56,9 +57,9 @@ func TestLoadConfig(t *testing.T) { }, }, { - id: config.NewComponentIDWithName(typeStr, "e2-no-retries-short-queue"), + id: component.NewIDWithName(typeStr, "e2-no-retries-short-queue"), expected: &Config{ - ExporterSettings: config.NewExporterSettings(config.NewComponentID(typeStr)), + ExporterSettings: config.NewExporterSettings(component.NewID(typeStr)), RetrySettings: exporterhelper.RetrySettings{ Enabled: false, InitialInterval: defaultRetrySettings.InitialInterval, @@ -74,19 +75,19 @@ func TestLoadConfig(t *testing.T) { }, }, { - id: config.NewComponentIDWithName(typeStr, "invalid_queue_size"), + id: component.NewIDWithName(typeStr, "invalid_queue_size"), errorMessage: "'sending_queue.queue_size' must be 1 or greater", }, { - id: config.NewComponentIDWithName(typeStr, "invalid_required_field_stream"), + id: component.NewIDWithName(typeStr, "invalid_required_field_stream"), errorMessage: "'log_stream_name' must be set", }, { - id: config.NewComponentIDWithName(typeStr, "invalid_required_field_group"), + id: component.NewIDWithName(typeStr, "invalid_required_field_group"), errorMessage: "'log_group_name' must be set", }, { - id: config.NewComponentIDWithName(typeStr, "invalid_queue_setting"), + id: component.NewIDWithName(typeStr, "invalid_queue_setting"), errorMessage: `'sending_queue' has invalid keys: enabled, num_consumers`, }, } @@ -98,7 +99,7 @@ func TestLoadConfig(t *testing.T) { sub, err := cm.Sub(tt.id.String()) require.NoError(t, err) - err = config.UnmarshalExporter(sub, cfg) + err = component.UnmarshalExporterConfig(sub, cfg) if tt.expected == nil { err = multierr.Append(err, cfg.Validate()) @@ -114,7 +115,7 @@ func TestLoadConfig(t *testing.T) { func TestRetentionValidateCorrect(t *testing.T) { defaultRetrySettings := exporterhelper.NewDefaultRetrySettings() cfg := &Config{ - ExporterSettings: config.NewExporterSettings(config.NewComponentIDWithName(typeStr, "1")), + ExporterSettings: config.NewExporterSettings(component.NewIDWithName(typeStr, "1")), RetrySettings: defaultRetrySettings, LogGroupName: "test-1", LogStreamName: "testing", @@ -132,7 +133,7 @@ func TestRetentionValidateCorrect(t *testing.T) { func TestRetentionValidateWrong(t *testing.T) { defaultRetrySettings := exporterhelper.NewDefaultRetrySettings() wrongcfg := &Config{ - ExporterSettings: config.NewExporterSettings(config.NewComponentIDWithName(typeStr, "2")), + ExporterSettings: config.NewExporterSettings(component.NewIDWithName(typeStr, "2")), RetrySettings: defaultRetrySettings, LogGroupName: "test-1", LogStreamName: "testing", diff --git a/exporter/awscloudwatchlogsexporter/exporter.go b/exporter/awscloudwatchlogsexporter/exporter.go index ee14afab7c16..ad97567e72b0 100644 --- a/exporter/awscloudwatchlogsexporter/exporter.go +++ b/exporter/awscloudwatchlogsexporter/exporter.go @@ -24,7 +24,6 @@ import ( "github.com/aws/aws-sdk-go/service/cloudwatchlogs" "github.com/google/uuid" "go.opentelemetry.io/collector/component" - "go.opentelemetry.io/collector/config" "go.opentelemetry.io/collector/consumer" "go.opentelemetry.io/collector/exporter/exporterhelper" "go.opentelemetry.io/collector/pdata/pcommon" @@ -78,7 +77,7 @@ func newCwLogsPusher(expConfig *Config, params component.ExporterCreateSettings) return logsExporter, nil } -func newCwLogsExporter(config config.Exporter, params component.ExporterCreateSettings) (component.LogsExporter, error) { +func newCwLogsExporter(config component.ExporterConfig, params component.ExporterCreateSettings) (component.LogsExporter, error) { expConfig := config.(*Config) logsExporter, err := newCwLogsPusher(expConfig, params) if err != nil { diff --git a/exporter/awscloudwatchlogsexporter/factory.go b/exporter/awscloudwatchlogsexporter/factory.go index f2cd4c49d95f..9622f4076a34 100644 --- a/exporter/awscloudwatchlogsexporter/factory.go +++ b/exporter/awscloudwatchlogsexporter/factory.go @@ -40,9 +40,9 @@ func NewFactory() component.ExporterFactory { component.WithLogsExporter(createLogsExporter, stability)) } -func createDefaultConfig() config.Exporter { +func createDefaultConfig() component.ExporterConfig { return &Config{ - ExporterSettings: config.NewExporterSettings(config.NewComponentID(typeStr)), + ExporterSettings: config.NewExporterSettings(component.NewID(typeStr)), RetrySettings: exporterhelper.NewDefaultRetrySettings(), AWSSessionSettings: awsutil.CreateDefaultSessionConfig(), QueueSettings: QueueSettings{ @@ -51,7 +51,7 @@ func createDefaultConfig() config.Exporter { } } -func createLogsExporter(_ context.Context, params component.ExporterCreateSettings, config config.Exporter) (component.LogsExporter, error) { +func createLogsExporter(_ context.Context, params component.ExporterCreateSettings, config component.ExporterConfig) (component.LogsExporter, error) { expConfig, ok := config.(*Config) if !ok { return nil, errors.New("invalid configuration type; can't cast to awscloudwatchlogsexporter.Config") diff --git a/exporter/awscloudwatchlogsexporter/factory_test.go b/exporter/awscloudwatchlogsexporter/factory_test.go index 20964b3aa94b..fa3d4d4b22b2 100644 --- a/exporter/awscloudwatchlogsexporter/factory_test.go +++ b/exporter/awscloudwatchlogsexporter/factory_test.go @@ -18,6 +18,7 @@ import ( "testing" "github.com/stretchr/testify/assert" + "go.opentelemetry.io/collector/component" "go.opentelemetry.io/collector/config" "go.opentelemetry.io/collector/exporter/exporterhelper" @@ -26,7 +27,7 @@ import ( func TestDefaultConfig_exporterSettings(t *testing.T) { want := &Config{ - ExporterSettings: config.NewExporterSettings(config.NewComponentID(typeStr)), + ExporterSettings: config.NewExporterSettings(component.NewID(typeStr)), RetrySettings: exporterhelper.NewDefaultRetrySettings(), AWSSessionSettings: awsutil.CreateDefaultSessionConfig(), QueueSettings: QueueSettings{ diff --git a/exporter/awscloudwatchlogsexporter/go.mod b/exporter/awscloudwatchlogsexporter/go.mod index 1d5104cf6218..40d1b301365c 100644 --- a/exporter/awscloudwatchlogsexporter/go.mod +++ b/exporter/awscloudwatchlogsexporter/go.mod @@ -8,8 +8,8 @@ require ( github.com/open-telemetry/opentelemetry-collector-contrib/internal/aws/awsutil v0.63.0 github.com/open-telemetry/opentelemetry-collector-contrib/internal/aws/cwlogs v0.63.0 github.com/stretchr/testify v1.8.1 - go.opentelemetry.io/collector v0.63.2-0.20221104003159-6b27644724d8 - go.opentelemetry.io/collector/pdata v0.63.2-0.20221104003159-6b27644724d8 + go.opentelemetry.io/collector v0.63.2-0.20221108014805-0b08d5316426 + go.opentelemetry.io/collector/pdata v0.63.2-0.20221108014805-0b08d5316426 go.uber.org/multierr v1.8.0 go.uber.org/zap v1.23.0 ) @@ -30,7 +30,7 @@ require ( github.com/pmezard/go-difflib v1.0.0 // indirect github.com/rogpeppe/go-internal v1.8.1 // indirect github.com/stretchr/objx v0.5.0 // indirect - go.opencensus.io v0.23.0 // indirect + go.opencensus.io v0.24.0 // 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 64a9b9e9ead3..c4eef0083fb3 100644 --- a/exporter/awscloudwatchlogsexporter/go.sum +++ b/exporter/awscloudwatchlogsexporter/go.sum @@ -236,7 +236,7 @@ github.com/prometheus/client_golang v0.9.1/go.mod h1:7SWBe2y4D6OKWSNQJUaRYU/AaXP github.com/prometheus/client_golang v1.0.0/go.mod h1:db9x61etRT2tGnBNRi70OPL5FsnadC4Ky3P0J6CfImo= github.com/prometheus/client_golang v1.7.1/go.mod h1:PY5Wy2awLA44sXw4AOSfFBetzPP4j5+D6mVACh+pe2M= github.com/prometheus/client_golang v1.11.1/go.mod h1:Z6t4BnS23TR94PD6BsDNk8yVqroYurpAkEiz0P2BEV0= -github.com/prometheus/client_golang v1.13.0 h1:b71QUfeo5M8gq2+evJdTPfZhYMAU0uKPkyPJ7TPsloU= +github.com/prometheus/client_golang v1.13.1 h1:3gMjIY2+/hzmqhtUC/aQNYldJA6DtH3CgQvwS+02K1c= github.com/prometheus/client_model v0.0.0-20180712105110-5c3871d89910/go.mod h1:MbSGuTsp3dbXC40dX6PRTWyKYBIrTGTE9sqQNg2J8bo= github.com/prometheus/client_model v0.0.0-20190129233127-fd36f4220a90/go.mod h1:xMI15A0UPsDsEKsMN9yxemIoYk6Tm2C1GtYGdfGttqA= github.com/prometheus/client_model v0.0.0-20190812154241-14fe0d1b01d4/go.mod h1:xMI15A0UPsDsEKsMN9yxemIoYk6Tm2C1GtYGdfGttqA= @@ -275,7 +275,6 @@ github.com/stretchr/testify v1.2.2/go.mod h1:a8OnRcib4nhh0OaRAV+Yts87kKdq0PP7pXf github.com/stretchr/testify v1.3.0/go.mod h1:M5WIy9Dh21IEIfnGCwXGc5bZfKNJtfHm1UVUgZn+9EI= github.com/stretchr/testify v1.4.0/go.mod h1:j7eGeouHqKxXV5pUuKE4zz7dFj8WfuZ+81PSLYec5m4= github.com/stretchr/testify v1.5.1/go.mod h1:5W2xD1RspED5o8YsWQXVCued0rvSQ+mT+I5cxcmMvtA= -github.com/stretchr/testify v1.6.1/go.mod h1:6Fq8oRcR53rry900zMqJjRRixrwX3KX962/h/Wwjteg= github.com/stretchr/testify v1.7.0/go.mod h1:6Fq8oRcR53rry900zMqJjRRixrwX3KX962/h/Wwjteg= github.com/stretchr/testify v1.7.1/go.mod h1:6Fq8oRcR53rry900zMqJjRRixrwX3KX962/h/Wwjteg= github.com/stretchr/testify v1.8.0/go.mod h1:yNjHg4UonilssWZ8iaSj1OCr/vHnekPRkoO+kdMU+MU= @@ -287,12 +286,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.opencensus.io v0.23.0 h1:gqCw0LfLxScz8irSi8exQc7fyQ0fKQU/qnC/X8+V/1M= -go.opencensus.io v0.23.0/go.mod h1:XItmlyltB5F7CS4xOC1DcqMoFqwtC6OG2xF7mCv7P7E= -go.opentelemetry.io/collector v0.63.2-0.20221104003159-6b27644724d8 h1:rOT5HzXXfSISc6FiH012zH2/EFjp37UXfjEqj5BpkWQ= -go.opentelemetry.io/collector v0.63.2-0.20221104003159-6b27644724d8/go.mod h1:JVmeZXugK4ondC6KQgrHTHWiF4JttpG5k6dWPMt62+k= -go.opentelemetry.io/collector/pdata v0.63.2-0.20221104003159-6b27644724d8 h1:7xeTQjfsOm9eogQeIxjSEhlik9qsbBGsnmkQHfyKaRE= -go.opentelemetry.io/collector/pdata v0.63.2-0.20221104003159-6b27644724d8/go.mod h1:IzvXUGQml2mrnvdb8zIlEW3qQs9oFLdD2hLwJdZ+pek= +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.63.2-0.20221108014805-0b08d5316426 h1:z/wLTMh7/vNxcFUDa5uG7/IPE3tYx6pzCWPV41ghyV8= +go.opentelemetry.io/collector v0.63.2-0.20221108014805-0b08d5316426/go.mod h1:+Zb70q0Rq17dA9FcHTiTjW6g96lvJ8kAZ0c+eWNkAv0= +go.opentelemetry.io/collector/pdata v0.63.2-0.20221108014805-0b08d5316426 h1:wKDpgP0Tx/gWI2SgDGAY1OTSeihhDivbbRqFR79IGTc= +go.opentelemetry.io/collector/pdata v0.63.2-0.20221108014805-0b08d5316426/go.mod h1:IzvXUGQml2mrnvdb8zIlEW3qQs9oFLdD2hLwJdZ+pek= 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 c8e0fcd8cd76..c10bc3702148 100644 --- a/exporter/awsemfexporter/config_test.go +++ b/exporter/awsemfexporter/config_test.go @@ -20,6 +20,7 @@ import ( "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" + "go.opentelemetry.io/collector/component" "go.opentelemetry.io/collector/config" "go.opentelemetry.io/collector/confmap/confmaptest" "go.uber.org/zap" @@ -35,17 +36,17 @@ func TestLoadConfig(t *testing.T) { require.NoError(t, err) tests := []struct { - id config.ComponentID - expected config.Exporter + id component.ID + expected component.ExporterConfig }{ { - id: config.NewComponentIDWithName(typeStr, ""), + id: component.NewIDWithName(typeStr, ""), expected: createDefaultConfig(), }, { - id: config.NewComponentIDWithName(typeStr, "1"), + id: component.NewIDWithName(typeStr, "1"), expected: &Config{ - ExporterSettings: config.NewExporterSettings(config.NewComponentID(typeStr)), + ExporterSettings: config.NewExporterSettings(component.NewID(typeStr)), AWSSessionSettings: awsutil.AWSSessionSettings{ NumberOfWorkers: 8, Endpoint: "", @@ -63,9 +64,9 @@ func TestLoadConfig(t *testing.T) { }, }, { - id: config.NewComponentIDWithName(typeStr, "resource_attr_to_label"), + id: component.NewIDWithName(typeStr, "resource_attr_to_label"), expected: &Config{ - ExporterSettings: config.NewExporterSettings(config.NewComponentID(typeStr)), + ExporterSettings: config.NewExporterSettings(component.NewID(typeStr)), AWSSessionSettings: awsutil.AWSSessionSettings{ NumberOfWorkers: 8, Endpoint: "", @@ -92,7 +93,7 @@ func TestLoadConfig(t *testing.T) { sub, err := cm.Sub(tt.id.String()) require.NoError(t, err) - require.NoError(t, config.UnmarshalExporter(sub, cfg)) + require.NoError(t, component.UnmarshalExporterConfig(sub, cfg)) assert.NoError(t, cfg.Validate()) assert.Equal(t, tt.expected, cfg) @@ -108,7 +109,7 @@ func TestConfigValidate(t *testing.T) { {unit: "Megabytes", metricName: "memory_usage"}, } cfg := &Config{ - ExporterSettings: config.NewExporterSettings(config.NewComponentIDWithName(typeStr, "1")), + ExporterSettings: config.NewExporterSettings(component.NewIDWithName(typeStr, "1")), AWSSessionSettings: awsutil.AWSSessionSettings{ RequestTimeoutSeconds: 30, MaxRetries: 1, @@ -129,7 +130,7 @@ func TestConfigValidate(t *testing.T) { func TestRetentionValidateCorrect(t *testing.T) { cfg := &Config{ - ExporterSettings: config.NewExporterSettings(config.NewComponentIDWithName(typeStr, "1")), + ExporterSettings: config.NewExporterSettings(component.NewIDWithName(typeStr, "1")), AWSSessionSettings: awsutil.AWSSessionSettings{ RequestTimeoutSeconds: 30, MaxRetries: 1, @@ -145,7 +146,7 @@ func TestRetentionValidateCorrect(t *testing.T) { func TestRetentionValidateWrong(t *testing.T) { wrongcfg := &Config{ - ExporterSettings: config.NewExporterSettings(config.NewComponentIDWithName(typeStr, "2")), + ExporterSettings: config.NewExporterSettings(component.NewIDWithName(typeStr, "2")), AWSSessionSettings: awsutil.AWSSessionSettings{ RequestTimeoutSeconds: 30, MaxRetries: 1, diff --git a/exporter/awsemfexporter/emf_exporter.go b/exporter/awsemfexporter/emf_exporter.go index b33eca88cc2e..9ebc12cb9398 100644 --- a/exporter/awsemfexporter/emf_exporter.go +++ b/exporter/awsemfexporter/emf_exporter.go @@ -25,7 +25,6 @@ import ( "github.com/aws/aws-sdk-go/aws/awserr" "github.com/google/uuid" "go.opentelemetry.io/collector/component" - "go.opentelemetry.io/collector/config" "go.opentelemetry.io/collector/consumer" "go.opentelemetry.io/collector/consumer/consumererror" "go.opentelemetry.io/collector/exporter/exporterhelper" @@ -48,7 +47,7 @@ type emfExporter struct { // Each (log group, log stream) keeps a separate pusher because of each (log group, log stream) requires separate stream token. groupStreamToPusherMap map[string]map[string]cwlogs.Pusher svcStructuredLog *cwlogs.Client - config config.Exporter + config component.ExporterConfig logger *zap.Logger metricTranslator metricTranslator @@ -60,7 +59,7 @@ type emfExporter struct { // newEmfPusher func creates an EMF Exporter instance with data push callback func func newEmfPusher( - config config.Exporter, + config component.ExporterConfig, params component.ExporterCreateSettings, ) (component.MetricsExporter, error) { if config == nil { @@ -96,7 +95,7 @@ func newEmfPusher( // newEmfExporter creates a new exporter using exporterhelper func newEmfExporter( - config config.Exporter, + config component.ExporterConfig, set component.ExporterCreateSettings, ) (component.MetricsExporter, error) { exp, err := newEmfPusher(config, set) diff --git a/exporter/awsemfexporter/factory.go b/exporter/awsemfexporter/factory.go index e29c8bf3a79c..9a86567bd1be 100644 --- a/exporter/awsemfexporter/factory.go +++ b/exporter/awsemfexporter/factory.go @@ -39,9 +39,9 @@ func NewFactory() component.ExporterFactory { } // CreateDefaultConfig creates the default configuration for exporter. -func createDefaultConfig() config.Exporter { +func createDefaultConfig() component.ExporterConfig { return &Config{ - ExporterSettings: config.NewExporterSettings(config.NewComponentID(typeStr)), + ExporterSettings: config.NewExporterSettings(component.NewID(typeStr)), AWSSessionSettings: awsutil.CreateDefaultSessionConfig(), LogGroupName: "", LogStreamName: "", @@ -55,7 +55,7 @@ func createDefaultConfig() config.Exporter { // createMetricsExporter creates a metrics exporter based on this config. func createMetricsExporter(_ context.Context, params component.ExporterCreateSettings, - config config.Exporter) (component.MetricsExporter, error) { + config component.ExporterConfig) (component.MetricsExporter, error) { expCfg := config.(*Config) diff --git a/exporter/awsemfexporter/factory_test.go b/exporter/awsemfexporter/factory_test.go index 4712b55ed156..4e80dcf46137 100644 --- a/exporter/awsemfexporter/factory_test.go +++ b/exporter/awsemfexporter/factory_test.go @@ -21,9 +21,8 @@ import ( "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" + "go.opentelemetry.io/collector/component" "go.opentelemetry.io/collector/component/componenttest" - "go.opentelemetry.io/collector/config" - "go.opentelemetry.io/collector/config/configtest" "go.opentelemetry.io/collector/confmap/confmaptest" ) @@ -31,7 +30,7 @@ func TestCreateDefaultConfig(t *testing.T) { factory := NewFactory() cfg := factory.CreateDefaultConfig() assert.NotNil(t, cfg, "failed to create default config") - assert.NoError(t, configtest.CheckConfigStruct(cfg)) + assert.NoError(t, componenttest.CheckConfigStruct(cfg)) } func TestCreateTracesExporter(t *testing.T) { @@ -40,9 +39,9 @@ func TestCreateTracesExporter(t *testing.T) { factory := NewFactory() cfg := factory.CreateDefaultConfig() - sub, err := cm.Sub(config.NewComponentIDWithName(typeStr, "1").String()) + sub, err := cm.Sub(component.NewIDWithName(typeStr, "1").String()) require.NoError(t, err) - require.NoError(t, config.UnmarshalExporter(sub, cfg)) + require.NoError(t, component.UnmarshalExporterConfig(sub, cfg)) ctx := context.Background() exporter, err := factory.CreateTracesExporter(ctx, componenttest.NewNopExporterCreateSettings(), cfg) @@ -56,9 +55,9 @@ func TestCreateMetricsExporter(t *testing.T) { factory := NewFactory() cfg := factory.CreateDefaultConfig() - sub, err := cm.Sub(config.NewComponentIDWithName(typeStr, "1").String()) + sub, err := cm.Sub(component.NewIDWithName(typeStr, "1").String()) require.NoError(t, err) - require.NoError(t, config.UnmarshalExporter(sub, cfg)) + require.NoError(t, component.UnmarshalExporterConfig(sub, cfg)) ctx := context.Background() exporter, err := factory.CreateMetricsExporter(ctx, componenttest.NewNopExporterCreateSettings(), cfg) diff --git a/exporter/awsemfexporter/go.mod b/exporter/awsemfexporter/go.mod index 8f2c2fb832d7..cc8983bb9d1d 100644 --- a/exporter/awsemfexporter/go.mod +++ b/exporter/awsemfexporter/go.mod @@ -13,9 +13,9 @@ require ( github.com/open-telemetry/opentelemetry-collector-contrib/pkg/resourcetotelemetry v0.63.0 github.com/open-telemetry/opentelemetry-collector-contrib/pkg/translator/opencensus v0.63.0 github.com/stretchr/testify v1.8.1 - go.opentelemetry.io/collector v0.63.2-0.20221104003159-6b27644724d8 - go.opentelemetry.io/collector/pdata v0.63.2-0.20221104003159-6b27644724d8 - go.opentelemetry.io/collector/semconv v0.63.2-0.20221104003159-6b27644724d8 + go.opentelemetry.io/collector v0.63.2-0.20221108014805-0b08d5316426 + go.opentelemetry.io/collector/pdata v0.63.2-0.20221108014805-0b08d5316426 + go.opentelemetry.io/collector/semconv v0.63.2-0.20221108014805-0b08d5316426 go.uber.org/zap v1.23.0 google.golang.org/protobuf v1.28.1 ) @@ -38,7 +38,7 @@ require ( github.com/pmezard/go-difflib v1.0.0 // indirect github.com/rogpeppe/go-internal v1.8.1 // indirect github.com/stretchr/objx v0.5.0 // indirect - go.opencensus.io v0.23.0 // indirect + go.opencensus.io v0.24.0 // 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 f87423bae4fa..f7c2b99068d5 100644 --- a/exporter/awsemfexporter/go.sum +++ b/exporter/awsemfexporter/go.sum @@ -236,7 +236,7 @@ github.com/prometheus/client_golang v0.9.1/go.mod h1:7SWBe2y4D6OKWSNQJUaRYU/AaXP github.com/prometheus/client_golang v1.0.0/go.mod h1:db9x61etRT2tGnBNRi70OPL5FsnadC4Ky3P0J6CfImo= github.com/prometheus/client_golang v1.7.1/go.mod h1:PY5Wy2awLA44sXw4AOSfFBetzPP4j5+D6mVACh+pe2M= github.com/prometheus/client_golang v1.11.1/go.mod h1:Z6t4BnS23TR94PD6BsDNk8yVqroYurpAkEiz0P2BEV0= -github.com/prometheus/client_golang v1.13.0 h1:b71QUfeo5M8gq2+evJdTPfZhYMAU0uKPkyPJ7TPsloU= +github.com/prometheus/client_golang v1.13.1 h1:3gMjIY2+/hzmqhtUC/aQNYldJA6DtH3CgQvwS+02K1c= github.com/prometheus/client_model v0.0.0-20180712105110-5c3871d89910/go.mod h1:MbSGuTsp3dbXC40dX6PRTWyKYBIrTGTE9sqQNg2J8bo= github.com/prometheus/client_model v0.0.0-20190129233127-fd36f4220a90/go.mod h1:xMI15A0UPsDsEKsMN9yxemIoYk6Tm2C1GtYGdfGttqA= github.com/prometheus/client_model v0.0.0-20190812154241-14fe0d1b01d4/go.mod h1:xMI15A0UPsDsEKsMN9yxemIoYk6Tm2C1GtYGdfGttqA= @@ -274,7 +274,6 @@ github.com/stretchr/testify v1.2.2/go.mod h1:a8OnRcib4nhh0OaRAV+Yts87kKdq0PP7pXf github.com/stretchr/testify v1.3.0/go.mod h1:M5WIy9Dh21IEIfnGCwXGc5bZfKNJtfHm1UVUgZn+9EI= github.com/stretchr/testify v1.4.0/go.mod h1:j7eGeouHqKxXV5pUuKE4zz7dFj8WfuZ+81PSLYec5m4= github.com/stretchr/testify v1.5.1/go.mod h1:5W2xD1RspED5o8YsWQXVCued0rvSQ+mT+I5cxcmMvtA= -github.com/stretchr/testify v1.6.1/go.mod h1:6Fq8oRcR53rry900zMqJjRRixrwX3KX962/h/Wwjteg= github.com/stretchr/testify v1.7.0/go.mod h1:6Fq8oRcR53rry900zMqJjRRixrwX3KX962/h/Wwjteg= github.com/stretchr/testify v1.7.1/go.mod h1:6Fq8oRcR53rry900zMqJjRRixrwX3KX962/h/Wwjteg= github.com/stretchr/testify v1.8.0/go.mod h1:yNjHg4UonilssWZ8iaSj1OCr/vHnekPRkoO+kdMU+MU= @@ -286,14 +285,14 @@ 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.opencensus.io v0.23.0 h1:gqCw0LfLxScz8irSi8exQc7fyQ0fKQU/qnC/X8+V/1M= -go.opencensus.io v0.23.0/go.mod h1:XItmlyltB5F7CS4xOC1DcqMoFqwtC6OG2xF7mCv7P7E= -go.opentelemetry.io/collector v0.63.2-0.20221104003159-6b27644724d8 h1:rOT5HzXXfSISc6FiH012zH2/EFjp37UXfjEqj5BpkWQ= -go.opentelemetry.io/collector v0.63.2-0.20221104003159-6b27644724d8/go.mod h1:JVmeZXugK4ondC6KQgrHTHWiF4JttpG5k6dWPMt62+k= -go.opentelemetry.io/collector/pdata v0.63.2-0.20221104003159-6b27644724d8 h1:7xeTQjfsOm9eogQeIxjSEhlik9qsbBGsnmkQHfyKaRE= -go.opentelemetry.io/collector/pdata v0.63.2-0.20221104003159-6b27644724d8/go.mod h1:IzvXUGQml2mrnvdb8zIlEW3qQs9oFLdD2hLwJdZ+pek= -go.opentelemetry.io/collector/semconv v0.63.2-0.20221104003159-6b27644724d8 h1:jm0sNPyqo6S165QjQYMBHB2nK50wlJbMYM03Yr3Eo2k= -go.opentelemetry.io/collector/semconv v0.63.2-0.20221104003159-6b27644724d8/go.mod h1:5o9yhOa+ABt7g2E5JABDxGZ1PQPbtfxrKNbYn+LOTXU= +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.63.2-0.20221108014805-0b08d5316426 h1:z/wLTMh7/vNxcFUDa5uG7/IPE3tYx6pzCWPV41ghyV8= +go.opentelemetry.io/collector v0.63.2-0.20221108014805-0b08d5316426/go.mod h1:+Zb70q0Rq17dA9FcHTiTjW6g96lvJ8kAZ0c+eWNkAv0= +go.opentelemetry.io/collector/pdata v0.63.2-0.20221108014805-0b08d5316426 h1:wKDpgP0Tx/gWI2SgDGAY1OTSeihhDivbbRqFR79IGTc= +go.opentelemetry.io/collector/pdata v0.63.2-0.20221108014805-0b08d5316426/go.mod h1:IzvXUGQml2mrnvdb8zIlEW3qQs9oFLdD2hLwJdZ+pek= +go.opentelemetry.io/collector/semconv v0.63.2-0.20221108014805-0b08d5316426 h1:pqIl7OC531J6i9ttBCj3zLmZI/BSF4q323YpK0GgKGk= +go.opentelemetry.io/collector/semconv v0.63.2-0.20221108014805-0b08d5316426/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.go b/exporter/awskinesisexporter/config.go index f1c9c9ecc941..7fe0f23275b9 100644 --- a/exporter/awskinesisexporter/config.go +++ b/exporter/awskinesisexporter/config.go @@ -17,6 +17,7 @@ package awskinesisexporter // import "github.com/open-telemetry/opentelemetry-co import ( "fmt" + "go.opentelemetry.io/collector/component" "go.opentelemetry.io/collector/config" "go.opentelemetry.io/collector/exporter/exporterhelper" ) @@ -56,4 +57,4 @@ func (cfg *Config) Validate() error { return nil } -var _ config.Exporter = (*Config)(nil) +var _ component.ExporterConfig = (*Config)(nil) diff --git a/exporter/awskinesisexporter/config_test.go b/exporter/awskinesisexporter/config_test.go index 24e689a1b150..249d6739a1fa 100644 --- a/exporter/awskinesisexporter/config_test.go +++ b/exporter/awskinesisexporter/config_test.go @@ -21,8 +21,9 @@ import ( "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" + "go.opentelemetry.io/collector/component" + "go.opentelemetry.io/collector/component/componenttest" "go.opentelemetry.io/collector/config" - "go.opentelemetry.io/collector/config/configtest" "go.opentelemetry.io/collector/confmap/confmaptest" "go.opentelemetry.io/collector/exporter/exporterhelper" @@ -36,13 +37,13 @@ func TestLoadConfig(t *testing.T) { require.NoError(t, err) tests := []struct { - id config.ComponentID - expected config.Exporter + id component.ID + expected component.ExporterConfig }{ { - id: config.NewComponentIDWithName(typeStr, "default"), + id: component.NewIDWithName(typeStr, "default"), expected: &Config{ - ExporterSettings: config.NewExporterSettings(config.NewComponentID(typeStr)), + ExporterSettings: config.NewExporterSettings(component.NewID(typeStr)), QueueSettings: exporterhelper.NewDefaultQueueSettings(), RetrySettings: exporterhelper.NewDefaultRetrySettings(), TimeoutSettings: exporterhelper.NewDefaultTimeoutSettings(), @@ -58,9 +59,9 @@ func TestLoadConfig(t *testing.T) { }, }, { - id: config.NewComponentIDWithName(typeStr, ""), + id: component.NewIDWithName(typeStr, ""), expected: &Config{ - ExporterSettings: config.NewExporterSettings(config.NewComponentID(typeStr)), + ExporterSettings: config.NewExporterSettings(component.NewID(typeStr)), RetrySettings: exporterhelper.RetrySettings{ Enabled: false, MaxInterval: 30 * time.Second, @@ -92,7 +93,7 @@ func TestLoadConfig(t *testing.T) { sub, err := cm.Sub(tt.id.String()) require.NoError(t, err) - require.NoError(t, config.UnmarshalExporter(sub, cfg)) + require.NoError(t, component.UnmarshalExporterConfig(sub, cfg)) assert.NoError(t, cfg.Validate()) assert.Equal(t, tt.expected, cfg) @@ -102,5 +103,5 @@ func TestLoadConfig(t *testing.T) { func TestConfigCheck(t *testing.T) { cfg := (NewFactory()).CreateDefaultConfig() - assert.NoError(t, configtest.CheckConfigStruct(cfg)) + assert.NoError(t, componenttest.CheckConfigStruct(cfg)) } diff --git a/exporter/awskinesisexporter/exporter.go b/exporter/awskinesisexporter/exporter.go index 67fb5b490120..29d48bd014b1 100644 --- a/exporter/awskinesisexporter/exporter.go +++ b/exporter/awskinesisexporter/exporter.go @@ -23,7 +23,6 @@ import ( "github.com/aws/aws-sdk-go-v2/service/kinesis" "github.com/aws/aws-sdk-go-v2/service/sts" "go.opentelemetry.io/collector/component" - "go.opentelemetry.io/collector/config" "go.opentelemetry.io/collector/consumer" "go.opentelemetry.io/collector/pdata/plog" "go.opentelemetry.io/collector/pdata/pmetric" @@ -47,7 +46,7 @@ var ( _ component.LogsExporter = (*Exporter)(nil) ) -func createExporter(ctx context.Context, c config.Exporter, log *zap.Logger) (*Exporter, error) { +func createExporter(ctx context.Context, c component.ExporterConfig, log *zap.Logger) (*Exporter, error) { conf, ok := c.(*Config) if !ok || conf == nil { return nil, errors.New("incorrect config provided") diff --git a/exporter/awskinesisexporter/factory.go b/exporter/awskinesisexporter/factory.go index 48c2092bd86a..6cbeceed3b30 100644 --- a/exporter/awskinesisexporter/factory.go +++ b/exporter/awskinesisexporter/factory.go @@ -45,9 +45,9 @@ func NewFactory() component.ExporterFactory { ) } -func createDefaultConfig() config.Exporter { +func createDefaultConfig() component.ExporterConfig { return &Config{ - ExporterSettings: config.NewExporterSettings(config.NewComponentID(typeStr)), + ExporterSettings: config.NewExporterSettings(component.NewID(typeStr)), TimeoutSettings: exporterhelper.NewDefaultTimeoutSettings(), RetrySettings: exporterhelper.NewDefaultRetrySettings(), QueueSettings: exporterhelper.NewDefaultQueueSettings(), @@ -63,7 +63,7 @@ func createDefaultConfig() config.Exporter { } } -func NewTracesExporter(ctx context.Context, params component.ExporterCreateSettings, conf config.Exporter) (component.TracesExporter, error) { +func NewTracesExporter(ctx context.Context, params component.ExporterCreateSettings, conf component.ExporterConfig) (component.TracesExporter, error) { exp, err := createExporter(ctx, conf, params.Logger) if err != nil { return nil, err @@ -80,7 +80,7 @@ func NewTracesExporter(ctx context.Context, params component.ExporterCreateSetti ) } -func NewMetricsExporter(ctx context.Context, params component.ExporterCreateSettings, conf config.Exporter) (component.MetricsExporter, error) { +func NewMetricsExporter(ctx context.Context, params component.ExporterCreateSettings, conf component.ExporterConfig) (component.MetricsExporter, error) { exp, err := createExporter(ctx, conf, params.Logger) if err != nil { return nil, err @@ -97,7 +97,7 @@ func NewMetricsExporter(ctx context.Context, params component.ExporterCreateSett ) } -func NewLogsExporter(ctx context.Context, params component.ExporterCreateSettings, conf config.Exporter) (component.LogsExporter, error) { +func NewLogsExporter(ctx context.Context, params component.ExporterCreateSettings, conf component.ExporterConfig) (component.LogsExporter, error) { exp, err := createExporter(ctx, conf, params.Logger) if err != nil { return nil, err diff --git a/exporter/awskinesisexporter/go.mod b/exporter/awskinesisexporter/go.mod index 722508f6614a..caf0dc07bb1d 100644 --- a/exporter/awskinesisexporter/go.mod +++ b/exporter/awskinesisexporter/go.mod @@ -14,8 +14,8 @@ require ( github.com/open-telemetry/opentelemetry-collector-contrib/pkg/translator/jaeger v0.63.0 github.com/open-telemetry/opentelemetry-collector-contrib/pkg/translator/zipkin v0.63.0 github.com/stretchr/testify v1.8.1 - go.opentelemetry.io/collector v0.63.2-0.20221104003159-6b27644724d8 - go.opentelemetry.io/collector/pdata v0.63.2-0.20221104003159-6b27644724d8 + go.opentelemetry.io/collector v0.63.2-0.20221108014805-0b08d5316426 + go.opentelemetry.io/collector/pdata v0.63.2-0.20221108014805-0b08d5316426 go.uber.org/multierr v1.8.0 go.uber.org/zap v1.23.0 ) @@ -49,8 +49,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.opencensus.io v0.23.0 // indirect - go.opentelemetry.io/collector/semconv v0.63.2-0.20221104003159-6b27644724d8 // indirect + go.opencensus.io v0.24.0 // indirect + go.opentelemetry.io/collector/semconv v0.63.2-0.20221108014805-0b08d5316426 // 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 089c052e63f4..791b8779e486 100644 --- a/exporter/awskinesisexporter/go.sum +++ b/exporter/awskinesisexporter/go.sum @@ -271,7 +271,7 @@ github.com/prometheus/client_golang v0.9.1/go.mod h1:7SWBe2y4D6OKWSNQJUaRYU/AaXP github.com/prometheus/client_golang v1.0.0/go.mod h1:db9x61etRT2tGnBNRi70OPL5FsnadC4Ky3P0J6CfImo= github.com/prometheus/client_golang v1.7.1/go.mod h1:PY5Wy2awLA44sXw4AOSfFBetzPP4j5+D6mVACh+pe2M= github.com/prometheus/client_golang v1.11.1/go.mod h1:Z6t4BnS23TR94PD6BsDNk8yVqroYurpAkEiz0P2BEV0= -github.com/prometheus/client_golang v1.13.0 h1:b71QUfeo5M8gq2+evJdTPfZhYMAU0uKPkyPJ7TPsloU= +github.com/prometheus/client_golang v1.13.1 h1:3gMjIY2+/hzmqhtUC/aQNYldJA6DtH3CgQvwS+02K1c= github.com/prometheus/client_model v0.0.0-20180712105110-5c3871d89910/go.mod h1:MbSGuTsp3dbXC40dX6PRTWyKYBIrTGTE9sqQNg2J8bo= github.com/prometheus/client_model v0.0.0-20190129233127-fd36f4220a90/go.mod h1:xMI15A0UPsDsEKsMN9yxemIoYk6Tm2C1GtYGdfGttqA= github.com/prometheus/client_model v0.0.0-20190812154241-14fe0d1b01d4/go.mod h1:xMI15A0UPsDsEKsMN9yxemIoYk6Tm2C1GtYGdfGttqA= @@ -308,7 +308,6 @@ github.com/stretchr/testify v1.2.2/go.mod h1:a8OnRcib4nhh0OaRAV+Yts87kKdq0PP7pXf github.com/stretchr/testify v1.3.0/go.mod h1:M5WIy9Dh21IEIfnGCwXGc5bZfKNJtfHm1UVUgZn+9EI= github.com/stretchr/testify v1.4.0/go.mod h1:j7eGeouHqKxXV5pUuKE4zz7dFj8WfuZ+81PSLYec5m4= github.com/stretchr/testify v1.5.1/go.mod h1:5W2xD1RspED5o8YsWQXVCued0rvSQ+mT+I5cxcmMvtA= -github.com/stretchr/testify v1.6.1/go.mod h1:6Fq8oRcR53rry900zMqJjRRixrwX3KX962/h/Wwjteg= github.com/stretchr/testify v1.7.0/go.mod h1:6Fq8oRcR53rry900zMqJjRRixrwX3KX962/h/Wwjteg= github.com/stretchr/testify v1.7.1/go.mod h1:6Fq8oRcR53rry900zMqJjRRixrwX3KX962/h/Wwjteg= github.com/stretchr/testify v1.8.0/go.mod h1:yNjHg4UonilssWZ8iaSj1OCr/vHnekPRkoO+kdMU+MU= @@ -324,14 +323,14 @@ 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.opencensus.io v0.23.0 h1:gqCw0LfLxScz8irSi8exQc7fyQ0fKQU/qnC/X8+V/1M= -go.opencensus.io v0.23.0/go.mod h1:XItmlyltB5F7CS4xOC1DcqMoFqwtC6OG2xF7mCv7P7E= -go.opentelemetry.io/collector v0.63.2-0.20221104003159-6b27644724d8 h1:rOT5HzXXfSISc6FiH012zH2/EFjp37UXfjEqj5BpkWQ= -go.opentelemetry.io/collector v0.63.2-0.20221104003159-6b27644724d8/go.mod h1:JVmeZXugK4ondC6KQgrHTHWiF4JttpG5k6dWPMt62+k= -go.opentelemetry.io/collector/pdata v0.63.2-0.20221104003159-6b27644724d8 h1:7xeTQjfsOm9eogQeIxjSEhlik9qsbBGsnmkQHfyKaRE= -go.opentelemetry.io/collector/pdata v0.63.2-0.20221104003159-6b27644724d8/go.mod h1:IzvXUGQml2mrnvdb8zIlEW3qQs9oFLdD2hLwJdZ+pek= -go.opentelemetry.io/collector/semconv v0.63.2-0.20221104003159-6b27644724d8 h1:jm0sNPyqo6S165QjQYMBHB2nK50wlJbMYM03Yr3Eo2k= -go.opentelemetry.io/collector/semconv v0.63.2-0.20221104003159-6b27644724d8/go.mod h1:5o9yhOa+ABt7g2E5JABDxGZ1PQPbtfxrKNbYn+LOTXU= +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.63.2-0.20221108014805-0b08d5316426 h1:z/wLTMh7/vNxcFUDa5uG7/IPE3tYx6pzCWPV41ghyV8= +go.opentelemetry.io/collector v0.63.2-0.20221108014805-0b08d5316426/go.mod h1:+Zb70q0Rq17dA9FcHTiTjW6g96lvJ8kAZ0c+eWNkAv0= +go.opentelemetry.io/collector/pdata v0.63.2-0.20221108014805-0b08d5316426 h1:wKDpgP0Tx/gWI2SgDGAY1OTSeihhDivbbRqFR79IGTc= +go.opentelemetry.io/collector/pdata v0.63.2-0.20221108014805-0b08d5316426/go.mod h1:IzvXUGQml2mrnvdb8zIlEW3qQs9oFLdD2hLwJdZ+pek= +go.opentelemetry.io/collector/semconv v0.63.2-0.20221108014805-0b08d5316426 h1:pqIl7OC531J6i9ttBCj3zLmZI/BSF4q323YpK0GgKGk= +go.opentelemetry.io/collector/semconv v0.63.2-0.20221108014805-0b08d5316426/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/awsxray.go b/exporter/awsxrayexporter/awsxray.go index 6247acf695d0..8caffeb89aec 100644 --- a/exporter/awsxrayexporter/awsxray.go +++ b/exporter/awsxrayexporter/awsxray.go @@ -21,7 +21,6 @@ import ( "github.com/aws/aws-sdk-go/aws/awserr" "github.com/aws/aws-sdk-go/service/xray" "go.opentelemetry.io/collector/component" - "go.opentelemetry.io/collector/config" "go.opentelemetry.io/collector/consumer/consumererror" "go.opentelemetry.io/collector/exporter/exporterhelper" "go.opentelemetry.io/collector/pdata/ptrace" @@ -38,7 +37,7 @@ const ( // newTracesExporter creates an component.TracesExporter that converts to an X-Ray PutTraceSegments // request and then posts the request to the configured region's X-Ray endpoint. func newTracesExporter( - config config.Exporter, set component.ExporterCreateSettings, cn awsutil.ConnAttr) (component.TracesExporter, error) { + config component.ExporterConfig, set component.ExporterCreateSettings, cn awsutil.ConnAttr) (component.TracesExporter, error) { typeLog := zap.String("type", string(config.ID().Type())) nameLog := zap.String("name", config.ID().String()) logger := set.Logger @@ -87,7 +86,7 @@ func newTracesExporter( ) } -func extractResourceSpans(config config.Exporter, logger *zap.Logger, td ptrace.Traces) []*string { +func extractResourceSpans(config component.ExporterConfig, logger *zap.Logger, td ptrace.Traces) []*string { documents := make([]*string, 0, td.SpanCount()) for i := 0; i < td.ResourceSpans().Len(); i++ { rspans := td.ResourceSpans().At(i) diff --git a/exporter/awsxrayexporter/awsxray_test.go b/exporter/awsxrayexporter/awsxray_test.go index 22c8421bde97..efff67f673e9 100644 --- a/exporter/awsxrayexporter/awsxray_test.go +++ b/exporter/awsxrayexporter/awsxray_test.go @@ -25,7 +25,6 @@ import ( "github.com/stretchr/testify/assert" "go.opentelemetry.io/collector/component" "go.opentelemetry.io/collector/component/componenttest" - "go.opentelemetry.io/collector/config" "go.opentelemetry.io/collector/pdata/pcommon" "go.opentelemetry.io/collector/pdata/ptrace" conventions "go.opentelemetry.io/collector/semconv/v1.6.1" @@ -95,7 +94,7 @@ func initializeTracesExporter(t testing.TB) component.TracesExporter { return traceExporter } -func generateConfig(t testing.TB) config.Exporter { +func generateConfig(t testing.TB) component.ExporterConfig { t.Setenv("AWS_ACCESS_KEY_ID", "AKIASSWVJUY4PZXXXXXX") t.Setenv("AWS_SECRET_ACCESS_KEY", "XYrudg2H87u+ADAAq19Wqx3D41a09RsTXXXXXXXX") t.Setenv("AWS_DEFAULT_REGION", "us-east-1") diff --git a/exporter/awsxrayexporter/config_test.go b/exporter/awsxrayexporter/config_test.go index 41a39f2aeafd..9d541a87ec9a 100644 --- a/exporter/awsxrayexporter/config_test.go +++ b/exporter/awsxrayexporter/config_test.go @@ -20,6 +20,7 @@ import ( "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" + "go.opentelemetry.io/collector/component" "go.opentelemetry.io/collector/config" "go.opentelemetry.io/collector/confmap/confmaptest" @@ -33,17 +34,17 @@ func TestLoadConfig(t *testing.T) { require.NoError(t, err) tests := []struct { - id config.ComponentID - expected config.Exporter + id component.ID + expected component.ExporterConfig }{ { - id: config.NewComponentIDWithName(typeStr, ""), + id: component.NewIDWithName(typeStr, ""), expected: createDefaultConfig(), }, { - id: config.NewComponentIDWithName(typeStr, "customname"), + id: component.NewIDWithName(typeStr, "customname"), expected: &Config{ - ExporterSettings: config.NewExporterSettings(config.NewComponentID(typeStr)), + ExporterSettings: config.NewExporterSettings(component.NewID(typeStr)), AWSSessionSettings: awsutil.AWSSessionSettings{ NumberOfWorkers: 8, Endpoint: "", @@ -69,7 +70,7 @@ func TestLoadConfig(t *testing.T) { sub, err := cm.Sub(tt.id.String()) require.NoError(t, err) - require.NoError(t, config.UnmarshalExporter(sub, cfg)) + require.NoError(t, component.UnmarshalExporterConfig(sub, cfg)) assert.NoError(t, cfg.Validate()) assert.Equal(t, tt.expected, cfg) diff --git a/exporter/awsxrayexporter/factory.go b/exporter/awsxrayexporter/factory.go index 21c7167aed2a..cb48cd527abd 100644 --- a/exporter/awsxrayexporter/factory.go +++ b/exporter/awsxrayexporter/factory.go @@ -38,9 +38,9 @@ func NewFactory() component.ExporterFactory { component.WithTracesExporter(createTracesExporter, stability)) } -func createDefaultConfig() config.Exporter { +func createDefaultConfig() component.ExporterConfig { return &Config{ - ExporterSettings: config.NewExporterSettings(config.NewComponentID(typeStr)), + ExporterSettings: config.NewExporterSettings(component.NewID(typeStr)), AWSSessionSettings: awsutil.CreateDefaultSessionConfig(), } } @@ -48,7 +48,7 @@ func createDefaultConfig() config.Exporter { func createTracesExporter( _ context.Context, params component.ExporterCreateSettings, - cfg config.Exporter, + cfg component.ExporterConfig, ) (component.TracesExporter, error) { eCfg := cfg.(*Config) return newTracesExporter(eCfg, params, &awsutil.Conn{}) diff --git a/exporter/awsxrayexporter/factory_test.go b/exporter/awsxrayexporter/factory_test.go index 83bd78be27c7..2c1487410357 100644 --- a/exporter/awsxrayexporter/factory_test.go +++ b/exporter/awsxrayexporter/factory_test.go @@ -21,9 +21,9 @@ import ( "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" + "go.opentelemetry.io/collector/component" "go.opentelemetry.io/collector/component/componenttest" "go.opentelemetry.io/collector/config" - "go.opentelemetry.io/collector/config/configtest" "go.opentelemetry.io/collector/confmap/confmaptest" "github.com/open-telemetry/opentelemetry-collector-contrib/internal/aws/awsutil" @@ -33,7 +33,7 @@ func TestCreateDefaultConfig(t *testing.T) { factory := NewFactory() cfg := factory.CreateDefaultConfig() assert.Equal(t, cfg, &Config{ - ExporterSettings: config.NewExporterSettings(config.NewComponentID(typeStr)), + ExporterSettings: config.NewExporterSettings(component.NewID(typeStr)), AWSSessionSettings: awsutil.AWSSessionSettings{ NumberOfWorkers: 8, Endpoint: "", @@ -47,7 +47,7 @@ func TestCreateDefaultConfig(t *testing.T) { RoleARN: "", }, }, "failed to create default config") - assert.NoError(t, configtest.CheckConfigStruct(cfg)) + assert.NoError(t, componenttest.CheckConfigStruct(cfg)) } func TestCreateTracesExporter(t *testing.T) { @@ -56,9 +56,9 @@ func TestCreateTracesExporter(t *testing.T) { factory := NewFactory() cfg := factory.CreateDefaultConfig() - sub, err := cm.Sub(config.NewComponentIDWithName(typeStr, "customname").String()) + sub, err := cm.Sub(component.NewIDWithName(typeStr, "customname").String()) require.NoError(t, err) - require.NoError(t, config.UnmarshalExporter(sub, cfg)) + require.NoError(t, component.UnmarshalExporterConfig(sub, cfg)) ctx := context.Background() exporter, err := factory.CreateTracesExporter(ctx, componenttest.NewNopExporterCreateSettings(), cfg) @@ -72,9 +72,9 @@ func TestCreateMetricsExporter(t *testing.T) { factory := NewFactory() cfg := factory.CreateDefaultConfig() - sub, err := cm.Sub(config.NewComponentIDWithName(typeStr, "customname").String()) + sub, err := cm.Sub(component.NewIDWithName(typeStr, "customname").String()) require.NoError(t, err) - require.NoError(t, config.UnmarshalExporter(sub, cfg)) + require.NoError(t, component.UnmarshalExporterConfig(sub, cfg)) ctx := context.Background() exporter, err := factory.CreateMetricsExporter(ctx, componenttest.NewNopExporterCreateSettings(), cfg) diff --git a/exporter/awsxrayexporter/go.mod b/exporter/awsxrayexporter/go.mod index c348bc0f3cef..841024343b81 100644 --- a/exporter/awsxrayexporter/go.mod +++ b/exporter/awsxrayexporter/go.mod @@ -7,9 +7,9 @@ require ( github.com/open-telemetry/opentelemetry-collector-contrib/internal/aws/awsutil v0.63.0 github.com/open-telemetry/opentelemetry-collector-contrib/internal/aws/xray v0.63.0 github.com/stretchr/testify v1.8.1 - go.opentelemetry.io/collector v0.63.2-0.20221104003159-6b27644724d8 - go.opentelemetry.io/collector/pdata v0.63.2-0.20221104003159-6b27644724d8 - go.opentelemetry.io/collector/semconv v0.63.2-0.20221104003159-6b27644724d8 + go.opentelemetry.io/collector v0.63.2-0.20221108014805-0b08d5316426 + go.opentelemetry.io/collector/pdata v0.63.2-0.20221108014805-0b08d5316426 + go.opentelemetry.io/collector/semconv v0.63.2-0.20221108014805-0b08d5316426 go.uber.org/zap v1.23.0 ) @@ -30,7 +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.opencensus.io v0.23.0 // indirect + go.opencensus.io v0.24.0 // 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 bd78596ef982..ca97efd0239a 100644 --- a/exporter/awsxrayexporter/go.sum +++ b/exporter/awsxrayexporter/go.sum @@ -238,7 +238,7 @@ github.com/prometheus/client_golang v0.9.1/go.mod h1:7SWBe2y4D6OKWSNQJUaRYU/AaXP github.com/prometheus/client_golang v1.0.0/go.mod h1:db9x61etRT2tGnBNRi70OPL5FsnadC4Ky3P0J6CfImo= github.com/prometheus/client_golang v1.7.1/go.mod h1:PY5Wy2awLA44sXw4AOSfFBetzPP4j5+D6mVACh+pe2M= github.com/prometheus/client_golang v1.11.1/go.mod h1:Z6t4BnS23TR94PD6BsDNk8yVqroYurpAkEiz0P2BEV0= -github.com/prometheus/client_golang v1.13.0 h1:b71QUfeo5M8gq2+evJdTPfZhYMAU0uKPkyPJ7TPsloU= +github.com/prometheus/client_golang v1.13.1 h1:3gMjIY2+/hzmqhtUC/aQNYldJA6DtH3CgQvwS+02K1c= github.com/prometheus/client_model v0.0.0-20180712105110-5c3871d89910/go.mod h1:MbSGuTsp3dbXC40dX6PRTWyKYBIrTGTE9sqQNg2J8bo= github.com/prometheus/client_model v0.0.0-20190129233127-fd36f4220a90/go.mod h1:xMI15A0UPsDsEKsMN9yxemIoYk6Tm2C1GtYGdfGttqA= github.com/prometheus/client_model v0.0.0-20190812154241-14fe0d1b01d4/go.mod h1:xMI15A0UPsDsEKsMN9yxemIoYk6Tm2C1GtYGdfGttqA= @@ -277,7 +277,6 @@ github.com/stretchr/testify v1.2.2/go.mod h1:a8OnRcib4nhh0OaRAV+Yts87kKdq0PP7pXf github.com/stretchr/testify v1.3.0/go.mod h1:M5WIy9Dh21IEIfnGCwXGc5bZfKNJtfHm1UVUgZn+9EI= github.com/stretchr/testify v1.4.0/go.mod h1:j7eGeouHqKxXV5pUuKE4zz7dFj8WfuZ+81PSLYec5m4= github.com/stretchr/testify v1.5.1/go.mod h1:5W2xD1RspED5o8YsWQXVCued0rvSQ+mT+I5cxcmMvtA= -github.com/stretchr/testify v1.6.1/go.mod h1:6Fq8oRcR53rry900zMqJjRRixrwX3KX962/h/Wwjteg= github.com/stretchr/testify v1.7.0/go.mod h1:6Fq8oRcR53rry900zMqJjRRixrwX3KX962/h/Wwjteg= github.com/stretchr/testify v1.7.1/go.mod h1:6Fq8oRcR53rry900zMqJjRRixrwX3KX962/h/Wwjteg= github.com/stretchr/testify v1.8.0/go.mod h1:yNjHg4UonilssWZ8iaSj1OCr/vHnekPRkoO+kdMU+MU= @@ -289,14 +288,14 @@ 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.opencensus.io v0.23.0 h1:gqCw0LfLxScz8irSi8exQc7fyQ0fKQU/qnC/X8+V/1M= -go.opencensus.io v0.23.0/go.mod h1:XItmlyltB5F7CS4xOC1DcqMoFqwtC6OG2xF7mCv7P7E= -go.opentelemetry.io/collector v0.63.2-0.20221104003159-6b27644724d8 h1:rOT5HzXXfSISc6FiH012zH2/EFjp37UXfjEqj5BpkWQ= -go.opentelemetry.io/collector v0.63.2-0.20221104003159-6b27644724d8/go.mod h1:JVmeZXugK4ondC6KQgrHTHWiF4JttpG5k6dWPMt62+k= -go.opentelemetry.io/collector/pdata v0.63.2-0.20221104003159-6b27644724d8 h1:7xeTQjfsOm9eogQeIxjSEhlik9qsbBGsnmkQHfyKaRE= -go.opentelemetry.io/collector/pdata v0.63.2-0.20221104003159-6b27644724d8/go.mod h1:IzvXUGQml2mrnvdb8zIlEW3qQs9oFLdD2hLwJdZ+pek= -go.opentelemetry.io/collector/semconv v0.63.2-0.20221104003159-6b27644724d8 h1:jm0sNPyqo6S165QjQYMBHB2nK50wlJbMYM03Yr3Eo2k= -go.opentelemetry.io/collector/semconv v0.63.2-0.20221104003159-6b27644724d8/go.mod h1:5o9yhOa+ABt7g2E5JABDxGZ1PQPbtfxrKNbYn+LOTXU= +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.63.2-0.20221108014805-0b08d5316426 h1:z/wLTMh7/vNxcFUDa5uG7/IPE3tYx6pzCWPV41ghyV8= +go.opentelemetry.io/collector v0.63.2-0.20221108014805-0b08d5316426/go.mod h1:+Zb70q0Rq17dA9FcHTiTjW6g96lvJ8kAZ0c+eWNkAv0= +go.opentelemetry.io/collector/pdata v0.63.2-0.20221108014805-0b08d5316426 h1:wKDpgP0Tx/gWI2SgDGAY1OTSeihhDivbbRqFR79IGTc= +go.opentelemetry.io/collector/pdata v0.63.2-0.20221108014805-0b08d5316426/go.mod h1:IzvXUGQml2mrnvdb8zIlEW3qQs9oFLdD2hLwJdZ+pek= +go.opentelemetry.io/collector/semconv v0.63.2-0.20221108014805-0b08d5316426 h1:pqIl7OC531J6i9ttBCj3zLmZI/BSF4q323YpK0GgKGk= +go.opentelemetry.io/collector/semconv v0.63.2-0.20221108014805-0b08d5316426/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 83f90515a58e..1b94a3b95716 100644 --- a/exporter/azuredataexplorerexporter/config_test.go +++ b/exporter/azuredataexplorerexporter/config_test.go @@ -20,6 +20,7 @@ import ( "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" + "go.opentelemetry.io/collector/component" "go.opentelemetry.io/collector/config" "go.opentelemetry.io/collector/confmap/confmaptest" ) @@ -31,14 +32,14 @@ func TestLoadConfig(t *testing.T) { require.NoError(t, err) tests := []struct { - id config.ComponentID - expected config.Exporter + id component.ID + expected component.ExporterConfig errorMessage string }{ { - id: config.NewComponentIDWithName(typeStr, ""), + id: component.NewIDWithName(typeStr, ""), expected: &Config{ - ExporterSettings: config.NewExporterSettings(config.NewComponentID(typeStr)), + ExporterSettings: config.NewExporterSettings(component.NewID(typeStr)), ClusterURI: "https://CLUSTER.kusto.windows.net", ApplicationID: "f80da32c-108c-415c-a19e-643f461a677a", ApplicationKey: "xx-xx-xx-xx", @@ -51,11 +52,11 @@ func TestLoadConfig(t *testing.T) { }, }, { - id: config.NewComponentIDWithName(typeStr, "2"), + id: component.NewIDWithName(typeStr, "2"), errorMessage: `mandatory configurations "cluster_uri" ,"application_id" , "application_key" and "tenant_id" are missing or empty `, }, { - id: config.NewComponentIDWithName(typeStr, "3"), + id: component.NewIDWithName(typeStr, "3"), errorMessage: `unsupported configuration for ingestion_type. Accepted types [managed, queued] Provided [streaming]`, }, } @@ -67,7 +68,7 @@ func TestLoadConfig(t *testing.T) { sub, err := cm.Sub(tt.id.String()) require.NoError(t, err) - require.NoError(t, config.UnmarshalExporter(sub, cfg)) + require.NoError(t, component.UnmarshalExporterConfig(sub, cfg)) if tt.expected == nil { assert.EqualError(t, cfg.Validate(), tt.errorMessage) diff --git a/exporter/azuredataexplorerexporter/factory.go b/exporter/azuredataexplorerexporter/factory.go index 887e964dd52f..3ca70cdd6913 100644 --- a/exporter/azuredataexplorerexporter/factory.go +++ b/exporter/azuredataexplorerexporter/factory.go @@ -52,9 +52,9 @@ func NewFactory() component.ExporterFactory { } // Create default configurations -func createDefaultConfig() config.Exporter { +func createDefaultConfig() component.ExporterConfig { return &Config{ - ExporterSettings: config.NewExporterSettings(config.NewComponentID(typeStr)), + ExporterSettings: config.NewExporterSettings(component.NewID(typeStr)), Database: otelDb, MetricTable: defaultMetricTable, LogTable: defaultLogTable, @@ -66,7 +66,7 @@ func createDefaultConfig() config.Exporter { func createMetricsExporter( ctx context.Context, set component.ExporterCreateSettings, - config config.Exporter, + config component.ExporterConfig, ) (component.MetricsExporter, error) { if config == nil { return nil, errors.New("nil config") @@ -99,7 +99,7 @@ func createMetricsExporter( func createTracesExporter( ctx context.Context, set component.ExporterCreateSettings, - config config.Exporter, + config component.ExporterConfig, ) (component.TracesExporter, error) { adxCfg := config.(*Config) setDefaultIngestionType(adxCfg, set.Logger) @@ -129,7 +129,7 @@ func createTracesExporter( func createLogsExporter( ctx context.Context, set component.ExporterCreateSettings, - config config.Exporter, + config component.ExporterConfig, ) (exp component.LogsExporter, err error) { adxCfg := config.(*Config) setDefaultIngestionType(adxCfg, set.Logger) diff --git a/exporter/azuredataexplorerexporter/factory_test.go b/exporter/azuredataexplorerexporter/factory_test.go index eb34df798702..d2895e30a31e 100644 --- a/exporter/azuredataexplorerexporter/factory_test.go +++ b/exporter/azuredataexplorerexporter/factory_test.go @@ -21,9 +21,8 @@ import ( "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" + "go.opentelemetry.io/collector/component" "go.opentelemetry.io/collector/component/componenttest" - "go.opentelemetry.io/collector/config" - "go.opentelemetry.io/collector/config/configtest" "go.opentelemetry.io/collector/confmap/confmaptest" ) @@ -35,9 +34,9 @@ func TestCreateMetricsExporter(t *testing.T) { factory := NewFactory() cfg := factory.CreateDefaultConfig() - sub, err := cm.Sub(config.NewComponentIDWithName(typeStr, "").String()) + sub, err := cm.Sub(component.NewIDWithName(typeStr, "").String()) require.NoError(t, err) - require.NoError(t, config.UnmarshalExporter(sub, cfg)) + require.NoError(t, component.UnmarshalExporterConfig(sub, cfg)) params := componenttest.NewNopExporterCreateSettings() exporter, err := factory.CreateMetricsExporter(context.Background(), params, cfg) @@ -53,9 +52,9 @@ func TestCreateMetricsExporterWhenIngestEmpty(t *testing.T) { factory := NewFactory() cfg := factory.CreateDefaultConfig() - sub, err := cm.Sub(config.NewComponentIDWithName(typeStr, "2").String()) + sub, err := cm.Sub(component.NewIDWithName(typeStr, "2").String()) require.NoError(t, err) - require.NoError(t, config.UnmarshalExporter(sub, cfg)) + require.NoError(t, component.UnmarshalExporterConfig(sub, cfg)) params := componenttest.NewNopExporterCreateSettings() // Load the #3 which has empty @@ -69,7 +68,7 @@ func TestCreateMetricsExporterWhenIngestEmpty(t *testing.T) { func TestCreateDefaultConfig(t *testing.T) { cfg := createDefaultConfig().(*Config) assert.NotNil(t, cfg, "failed to create default config") - assert.NoError(t, configtest.CheckConfigStruct(cfg)) + assert.NoError(t, componenttest.CheckConfigStruct(cfg)) assert.Equal(t, otelDb, cfg.Database) assert.Equal(t, queuedIngestTest, cfg.IngestionType) } @@ -82,9 +81,9 @@ func TestCreateLogsExporter(t *testing.T) { factory := NewFactory() cfg := factory.CreateDefaultConfig() - sub, err := cm.Sub(config.NewComponentIDWithName(typeStr, "").String()) + sub, err := cm.Sub(component.NewIDWithName(typeStr, "").String()) require.NoError(t, err) - require.NoError(t, config.UnmarshalExporter(sub, cfg)) + require.NoError(t, component.UnmarshalExporterConfig(sub, cfg)) params := componenttest.NewNopExporterCreateSettings() exporter, err := factory.CreateLogsExporter(context.Background(), params, cfg) @@ -100,9 +99,9 @@ func TestCreateLogsExporterWhenIngestEmpty(t *testing.T) { factory := NewFactory() cfg := factory.CreateDefaultConfig() - sub, err := cm.Sub(config.NewComponentIDWithName(typeStr, "2").String()) + sub, err := cm.Sub(component.NewIDWithName(typeStr, "2").String()) require.NoError(t, err) - require.NoError(t, config.UnmarshalExporter(sub, cfg)) + require.NoError(t, component.UnmarshalExporterConfig(sub, cfg)) params := componenttest.NewNopExporterCreateSettings() // Load the #3 which has empty @@ -121,9 +120,9 @@ func TestCreateTracesExporter(t *testing.T) { factory := NewFactory() cfg := factory.CreateDefaultConfig() - sub, err := cm.Sub(config.NewComponentIDWithName(typeStr, "").String()) + sub, err := cm.Sub(component.NewIDWithName(typeStr, "").String()) require.NoError(t, err) - require.NoError(t, config.UnmarshalExporter(sub, cfg)) + require.NoError(t, component.UnmarshalExporterConfig(sub, cfg)) params := componenttest.NewNopExporterCreateSettings() exporter, err := factory.CreateTracesExporter(context.Background(), params, cfg) @@ -139,9 +138,9 @@ func TestCreateTracesExporterWhenIngestEmpty(t *testing.T) { factory := NewFactory() cfg := factory.CreateDefaultConfig() - sub, err := cm.Sub(config.NewComponentIDWithName(typeStr, "2").String()) + sub, err := cm.Sub(component.NewIDWithName(typeStr, "2").String()) require.NoError(t, err) - require.NoError(t, config.UnmarshalExporter(sub, cfg)) + require.NoError(t, component.UnmarshalExporterConfig(sub, cfg)) params := componenttest.NewNopExporterCreateSettings() // Load the #3 which has empty diff --git a/exporter/azuredataexplorerexporter/go.mod b/exporter/azuredataexplorerexporter/go.mod index 5d504669a215..0e82a9d6d0bd 100644 --- a/exporter/azuredataexplorerexporter/go.mod +++ b/exporter/azuredataexplorerexporter/go.mod @@ -6,10 +6,10 @@ require ( github.com/Azure/azure-kusto-go v0.8.1 github.com/Azure/go-autorest/autorest/azure/auth v0.5.11 github.com/json-iterator/go v1.1.12 - github.com/open-telemetry/opentelemetry-collector-contrib/internal/coreinternal v0.0.0-00010101000000-000000000000 + github.com/open-telemetry/opentelemetry-collector-contrib/internal/coreinternal v0.63.0 github.com/stretchr/testify v1.8.1 - go.opentelemetry.io/collector v0.63.2-0.20221104003159-6b27644724d8 - go.opentelemetry.io/collector/pdata v0.63.2-0.20221104003159-6b27644724d8 + go.opentelemetry.io/collector v0.63.2-0.20221108014805-0b08d5316426 + go.opentelemetry.io/collector/pdata v0.63.2-0.20221108014805-0b08d5316426 go.uber.org/zap v1.23.0 ) @@ -46,7 +46,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.opencensus.io v0.23.0 // indirect + go.opencensus.io v0.24.0 // 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 654581e56edb..9b1d91a42b08 100644 --- a/exporter/azuredataexplorerexporter/go.sum +++ b/exporter/azuredataexplorerexporter/go.sum @@ -280,7 +280,7 @@ github.com/prometheus/client_golang v0.9.1/go.mod h1:7SWBe2y4D6OKWSNQJUaRYU/AaXP github.com/prometheus/client_golang v1.0.0/go.mod h1:db9x61etRT2tGnBNRi70OPL5FsnadC4Ky3P0J6CfImo= github.com/prometheus/client_golang v1.7.1/go.mod h1:PY5Wy2awLA44sXw4AOSfFBetzPP4j5+D6mVACh+pe2M= github.com/prometheus/client_golang v1.11.1/go.mod h1:Z6t4BnS23TR94PD6BsDNk8yVqroYurpAkEiz0P2BEV0= -github.com/prometheus/client_golang v1.13.0 h1:b71QUfeo5M8gq2+evJdTPfZhYMAU0uKPkyPJ7TPsloU= +github.com/prometheus/client_golang v1.13.1 h1:3gMjIY2+/hzmqhtUC/aQNYldJA6DtH3CgQvwS+02K1c= github.com/prometheus/client_model v0.0.0-20180712105110-5c3871d89910/go.mod h1:MbSGuTsp3dbXC40dX6PRTWyKYBIrTGTE9sqQNg2J8bo= github.com/prometheus/client_model v0.0.0-20190129233127-fd36f4220a90/go.mod h1:xMI15A0UPsDsEKsMN9yxemIoYk6Tm2C1GtYGdfGttqA= github.com/prometheus/client_model v0.0.0-20190812154241-14fe0d1b01d4/go.mod h1:xMI15A0UPsDsEKsMN9yxemIoYk6Tm2C1GtYGdfGttqA= @@ -315,7 +315,6 @@ github.com/stretchr/testify v1.2.2/go.mod h1:a8OnRcib4nhh0OaRAV+Yts87kKdq0PP7pXf github.com/stretchr/testify v1.3.0/go.mod h1:M5WIy9Dh21IEIfnGCwXGc5bZfKNJtfHm1UVUgZn+9EI= github.com/stretchr/testify v1.4.0/go.mod h1:j7eGeouHqKxXV5pUuKE4zz7dFj8WfuZ+81PSLYec5m4= github.com/stretchr/testify v1.5.1/go.mod h1:5W2xD1RspED5o8YsWQXVCued0rvSQ+mT+I5cxcmMvtA= -github.com/stretchr/testify v1.6.1/go.mod h1:6Fq8oRcR53rry900zMqJjRRixrwX3KX962/h/Wwjteg= github.com/stretchr/testify v1.7.0/go.mod h1:6Fq8oRcR53rry900zMqJjRRixrwX3KX962/h/Wwjteg= github.com/stretchr/testify v1.7.1/go.mod h1:6Fq8oRcR53rry900zMqJjRRixrwX3KX962/h/Wwjteg= github.com/stretchr/testify v1.8.0/go.mod h1:yNjHg4UonilssWZ8iaSj1OCr/vHnekPRkoO+kdMU+MU= @@ -327,12 +326,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.opencensus.io v0.23.0 h1:gqCw0LfLxScz8irSi8exQc7fyQ0fKQU/qnC/X8+V/1M= -go.opencensus.io v0.23.0/go.mod h1:XItmlyltB5F7CS4xOC1DcqMoFqwtC6OG2xF7mCv7P7E= -go.opentelemetry.io/collector v0.63.2-0.20221104003159-6b27644724d8 h1:rOT5HzXXfSISc6FiH012zH2/EFjp37UXfjEqj5BpkWQ= -go.opentelemetry.io/collector v0.63.2-0.20221104003159-6b27644724d8/go.mod h1:JVmeZXugK4ondC6KQgrHTHWiF4JttpG5k6dWPMt62+k= -go.opentelemetry.io/collector/pdata v0.63.2-0.20221104003159-6b27644724d8 h1:7xeTQjfsOm9eogQeIxjSEhlik9qsbBGsnmkQHfyKaRE= -go.opentelemetry.io/collector/pdata v0.63.2-0.20221104003159-6b27644724d8/go.mod h1:IzvXUGQml2mrnvdb8zIlEW3qQs9oFLdD2hLwJdZ+pek= +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.63.2-0.20221108014805-0b08d5316426 h1:z/wLTMh7/vNxcFUDa5uG7/IPE3tYx6pzCWPV41ghyV8= +go.opentelemetry.io/collector v0.63.2-0.20221108014805-0b08d5316426/go.mod h1:+Zb70q0Rq17dA9FcHTiTjW6g96lvJ8kAZ0c+eWNkAv0= +go.opentelemetry.io/collector/pdata v0.63.2-0.20221108014805-0b08d5316426 h1:wKDpgP0Tx/gWI2SgDGAY1OTSeihhDivbbRqFR79IGTc= +go.opentelemetry.io/collector/pdata v0.63.2-0.20221108014805-0b08d5316426/go.mod h1:IzvXUGQml2mrnvdb8zIlEW3qQs9oFLdD2hLwJdZ+pek= 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 b68059637131..b8dff7c08d76 100644 --- a/exporter/azuremonitorexporter/config_test.go +++ b/exporter/azuremonitorexporter/config_test.go @@ -21,6 +21,7 @@ import ( "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" + "go.opentelemetry.io/collector/component" "go.opentelemetry.io/collector/config" "go.opentelemetry.io/collector/confmap/confmaptest" ) @@ -32,18 +33,18 @@ func TestLoadConfig(t *testing.T) { require.NoError(t, err) tests := []struct { - id config.ComponentID - expected config.Exporter + id component.ID + expected component.ExporterConfig }{ { - id: config.NewComponentIDWithName(typeStr, ""), + id: component.NewIDWithName(typeStr, ""), expected: createDefaultConfig(), }, { - id: config.NewComponentIDWithName(typeStr, "2"), + id: component.NewIDWithName(typeStr, "2"), expected: &Config{ - ExporterSettings: config.NewExporterSettings(config.NewComponentID(typeStr)), + ExporterSettings: config.NewExporterSettings(component.NewID(typeStr)), Endpoint: defaultEndpoint, InstrumentationKey: "abcdefg", MaxBatchSize: 100, @@ -59,7 +60,7 @@ func TestLoadConfig(t *testing.T) { sub, err := cm.Sub(tt.id.String()) require.NoError(t, err) - require.NoError(t, config.UnmarshalExporter(sub, cfg)) + require.NoError(t, component.UnmarshalExporterConfig(sub, cfg)) assert.NoError(t, cfg.Validate()) assert.Equal(t, tt.expected, cfg) diff --git a/exporter/azuremonitorexporter/factory.go b/exporter/azuremonitorexporter/factory.go index 87f186acb59a..688fba7dacd3 100644 --- a/exporter/azuremonitorexporter/factory.go +++ b/exporter/azuremonitorexporter/factory.go @@ -52,9 +52,9 @@ type factory struct { tChannel transportChannel } -func createDefaultConfig() config.Exporter { +func createDefaultConfig() component.ExporterConfig { return &Config{ - ExporterSettings: config.NewExporterSettings(config.NewComponentID(typeStr)), + ExporterSettings: config.NewExporterSettings(component.NewID(typeStr)), Endpoint: defaultEndpoint, MaxBatchSize: 1024, MaxBatchInterval: 10 * time.Second, @@ -64,7 +64,7 @@ func createDefaultConfig() config.Exporter { func (f *factory) createTracesExporter( ctx context.Context, set component.ExporterCreateSettings, - cfg config.Exporter, + cfg component.ExporterConfig, ) (component.TracesExporter, error) { exporterConfig, ok := cfg.(*Config) @@ -79,7 +79,7 @@ func (f *factory) createTracesExporter( func (f *factory) createLogsExporter( ctx context.Context, set component.ExporterCreateSettings, - cfg config.Exporter, + cfg component.ExporterConfig, ) (component.LogsExporter, error) { exporterConfig, ok := cfg.(*Config) diff --git a/exporter/azuremonitorexporter/go.mod b/exporter/azuremonitorexporter/go.mod index a0fd420e0dac..6e0dab57f9e3 100644 --- a/exporter/azuremonitorexporter/go.mod +++ b/exporter/azuremonitorexporter/go.mod @@ -4,11 +4,11 @@ go 1.18 require ( github.com/microsoft/ApplicationInsights-Go v0.4.4 - github.com/open-telemetry/opentelemetry-collector-contrib/internal/coreinternal v0.0.0-00010101000000-000000000000 + github.com/open-telemetry/opentelemetry-collector-contrib/internal/coreinternal v0.63.0 github.com/stretchr/testify v1.8.1 - go.opentelemetry.io/collector v0.63.2-0.20221104003159-6b27644724d8 - go.opentelemetry.io/collector/pdata v0.63.2-0.20221104003159-6b27644724d8 - go.opentelemetry.io/collector/semconv v0.63.2-0.20221104003159-6b27644724d8 + go.opentelemetry.io/collector v0.63.2-0.20221108014805-0b08d5316426 + go.opentelemetry.io/collector/pdata v0.63.2-0.20221108014805-0b08d5316426 + go.opentelemetry.io/collector/semconv v0.63.2-0.20221108014805-0b08d5316426 go.uber.org/zap v1.23.0 golang.org/x/net v0.0.0-20220624214902-1bab6f366d9e ) @@ -30,7 +30,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.opencensus.io v0.23.0 // indirect + go.opencensus.io v0.24.0 // 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 6dc09b20c554..5b029cbafcac 100644 --- a/exporter/azuremonitorexporter/go.sum +++ b/exporter/azuremonitorexporter/go.sum @@ -239,7 +239,7 @@ github.com/prometheus/client_golang v0.9.1/go.mod h1:7SWBe2y4D6OKWSNQJUaRYU/AaXP github.com/prometheus/client_golang v1.0.0/go.mod h1:db9x61etRT2tGnBNRi70OPL5FsnadC4Ky3P0J6CfImo= github.com/prometheus/client_golang v1.7.1/go.mod h1:PY5Wy2awLA44sXw4AOSfFBetzPP4j5+D6mVACh+pe2M= github.com/prometheus/client_golang v1.11.1/go.mod h1:Z6t4BnS23TR94PD6BsDNk8yVqroYurpAkEiz0P2BEV0= -github.com/prometheus/client_golang v1.13.0 h1:b71QUfeo5M8gq2+evJdTPfZhYMAU0uKPkyPJ7TPsloU= +github.com/prometheus/client_golang v1.13.1 h1:3gMjIY2+/hzmqhtUC/aQNYldJA6DtH3CgQvwS+02K1c= github.com/prometheus/client_model v0.0.0-20180712105110-5c3871d89910/go.mod h1:MbSGuTsp3dbXC40dX6PRTWyKYBIrTGTE9sqQNg2J8bo= github.com/prometheus/client_model v0.0.0-20190129233127-fd36f4220a90/go.mod h1:xMI15A0UPsDsEKsMN9yxemIoYk6Tm2C1GtYGdfGttqA= github.com/prometheus/client_model v0.0.0-20190812154241-14fe0d1b01d4/go.mod h1:xMI15A0UPsDsEKsMN9yxemIoYk6Tm2C1GtYGdfGttqA= @@ -277,7 +277,6 @@ github.com/stretchr/testify v1.2.2/go.mod h1:a8OnRcib4nhh0OaRAV+Yts87kKdq0PP7pXf github.com/stretchr/testify v1.3.0/go.mod h1:M5WIy9Dh21IEIfnGCwXGc5bZfKNJtfHm1UVUgZn+9EI= github.com/stretchr/testify v1.4.0/go.mod h1:j7eGeouHqKxXV5pUuKE4zz7dFj8WfuZ+81PSLYec5m4= github.com/stretchr/testify v1.5.1/go.mod h1:5W2xD1RspED5o8YsWQXVCued0rvSQ+mT+I5cxcmMvtA= -github.com/stretchr/testify v1.6.1/go.mod h1:6Fq8oRcR53rry900zMqJjRRixrwX3KX962/h/Wwjteg= github.com/stretchr/testify v1.7.0/go.mod h1:6Fq8oRcR53rry900zMqJjRRixrwX3KX962/h/Wwjteg= github.com/stretchr/testify v1.7.1/go.mod h1:6Fq8oRcR53rry900zMqJjRRixrwX3KX962/h/Wwjteg= github.com/stretchr/testify v1.8.0/go.mod h1:yNjHg4UonilssWZ8iaSj1OCr/vHnekPRkoO+kdMU+MU= @@ -290,14 +289,14 @@ 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.opencensus.io v0.23.0 h1:gqCw0LfLxScz8irSi8exQc7fyQ0fKQU/qnC/X8+V/1M= -go.opencensus.io v0.23.0/go.mod h1:XItmlyltB5F7CS4xOC1DcqMoFqwtC6OG2xF7mCv7P7E= -go.opentelemetry.io/collector v0.63.2-0.20221104003159-6b27644724d8 h1:rOT5HzXXfSISc6FiH012zH2/EFjp37UXfjEqj5BpkWQ= -go.opentelemetry.io/collector v0.63.2-0.20221104003159-6b27644724d8/go.mod h1:JVmeZXugK4ondC6KQgrHTHWiF4JttpG5k6dWPMt62+k= -go.opentelemetry.io/collector/pdata v0.63.2-0.20221104003159-6b27644724d8 h1:7xeTQjfsOm9eogQeIxjSEhlik9qsbBGsnmkQHfyKaRE= -go.opentelemetry.io/collector/pdata v0.63.2-0.20221104003159-6b27644724d8/go.mod h1:IzvXUGQml2mrnvdb8zIlEW3qQs9oFLdD2hLwJdZ+pek= -go.opentelemetry.io/collector/semconv v0.63.2-0.20221104003159-6b27644724d8 h1:jm0sNPyqo6S165QjQYMBHB2nK50wlJbMYM03Yr3Eo2k= -go.opentelemetry.io/collector/semconv v0.63.2-0.20221104003159-6b27644724d8/go.mod h1:5o9yhOa+ABt7g2E5JABDxGZ1PQPbtfxrKNbYn+LOTXU= +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.63.2-0.20221108014805-0b08d5316426 h1:z/wLTMh7/vNxcFUDa5uG7/IPE3tYx6pzCWPV41ghyV8= +go.opentelemetry.io/collector v0.63.2-0.20221108014805-0b08d5316426/go.mod h1:+Zb70q0Rq17dA9FcHTiTjW6g96lvJ8kAZ0c+eWNkAv0= +go.opentelemetry.io/collector/pdata v0.63.2-0.20221108014805-0b08d5316426 h1:wKDpgP0Tx/gWI2SgDGAY1OTSeihhDivbbRqFR79IGTc= +go.opentelemetry.io/collector/pdata v0.63.2-0.20221108014805-0b08d5316426/go.mod h1:IzvXUGQml2mrnvdb8zIlEW3qQs9oFLdD2hLwJdZ+pek= +go.opentelemetry.io/collector/semconv v0.63.2-0.20221108014805-0b08d5316426 h1:pqIl7OC531J6i9ttBCj3zLmZI/BSF4q323YpK0GgKGk= +go.opentelemetry.io/collector/semconv v0.63.2-0.20221108014805-0b08d5316426/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 55d0793b620c..6d9e8a3a8f3a 100644 --- a/exporter/carbonexporter/config_test.go +++ b/exporter/carbonexporter/config_test.go @@ -21,6 +21,7 @@ import ( "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" + "go.opentelemetry.io/collector/component" "go.opentelemetry.io/collector/config" "go.opentelemetry.io/collector/confmap/confmaptest" ) @@ -32,19 +33,19 @@ func TestLoadConfig(t *testing.T) { require.NoError(t, err) tests := []struct { - id config.ComponentID - expected config.Exporter + id component.ID + expected component.ExporterConfig errorMessage string }{ { - id: config.NewComponentIDWithName(typeStr, ""), + id: component.NewIDWithName(typeStr, ""), expected: createDefaultConfig(), }, { - id: config.NewComponentIDWithName(typeStr, "allsettings"), + id: component.NewIDWithName(typeStr, "allsettings"), expected: &Config{ - ExporterSettings: config.NewExporterSettings(config.NewComponentID(typeStr)), + ExporterSettings: config.NewExporterSettings(component.NewID(typeStr)), Endpoint: "localhost:8080", Timeout: 10 * time.Second, }, @@ -58,7 +59,7 @@ func TestLoadConfig(t *testing.T) { sub, err := cm.Sub(tt.id.String()) require.NoError(t, err) - require.NoError(t, config.UnmarshalExporter(sub, cfg)) + require.NoError(t, component.UnmarshalExporterConfig(sub, cfg)) assert.NoError(t, cfg.Validate()) assert.Equal(t, tt.expected, cfg) diff --git a/exporter/carbonexporter/exporter_test.go b/exporter/carbonexporter/exporter_test.go index f8b6f8140d77..88c59d971473 100644 --- a/exporter/carbonexporter/exporter_test.go +++ b/exporter/carbonexporter/exporter_test.go @@ -29,6 +29,7 @@ import ( "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" + "go.opentelemetry.io/collector/component" "go.opentelemetry.io/collector/component/componenttest" "go.opentelemetry.io/collector/config" "go.opentelemetry.io/collector/pdata/pcommon" @@ -52,7 +53,7 @@ func TestNew(t *testing.T) { { name: "invalid_tcp_addr", config: &Config{ - ExporterSettings: config.NewExporterSettings(config.NewComponentID(typeStr)), + ExporterSettings: config.NewExporterSettings(component.NewID(typeStr)), Endpoint: "http://localhost:2003", }, wantErr: true, @@ -60,7 +61,7 @@ func TestNew(t *testing.T) { { name: "invalid_timeout", config: &Config{ - ExporterSettings: config.NewExporterSettings(config.NewComponentID(typeStr)), + ExporterSettings: config.NewExporterSettings(component.NewID(typeStr)), Timeout: -5 * time.Second, }, wantErr: true, diff --git a/exporter/carbonexporter/factory.go b/exporter/carbonexporter/factory.go index 7e5470641065..1d79dd0eb7b3 100644 --- a/exporter/carbonexporter/factory.go +++ b/exporter/carbonexporter/factory.go @@ -36,9 +36,9 @@ func NewFactory() component.ExporterFactory { component.WithMetricsExporter(createMetricsExporter, stability)) } -func createDefaultConfig() config.Exporter { +func createDefaultConfig() component.ExporterConfig { return &Config{ - ExporterSettings: config.NewExporterSettings(config.NewComponentID(typeStr)), + ExporterSettings: config.NewExporterSettings(component.NewID(typeStr)), Endpoint: DefaultEndpoint, Timeout: DefaultSendTimeout, } @@ -47,7 +47,7 @@ func createDefaultConfig() config.Exporter { func createMetricsExporter( _ context.Context, params component.ExporterCreateSettings, - config config.Exporter, + config component.ExporterConfig, ) (component.MetricsExporter, error) { exp, err := newCarbonExporter(config.(*Config), params) diff --git a/exporter/carbonexporter/factory_test.go b/exporter/carbonexporter/factory_test.go index cb1e223c7994..b3cd083149c5 100644 --- a/exporter/carbonexporter/factory_test.go +++ b/exporter/carbonexporter/factory_test.go @@ -21,13 +21,12 @@ import ( "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" "go.opentelemetry.io/collector/component/componenttest" - "go.opentelemetry.io/collector/config/configtest" ) func TestCreateDefaultConfig(t *testing.T) { cfg := createDefaultConfig() assert.NotNil(t, cfg, "failed to create default config") - assert.NoError(t, configtest.CheckConfigStruct(cfg)) + assert.NoError(t, componenttest.CheckConfigStruct(cfg)) } func TestCreateMetricsExporter(t *testing.T) { diff --git a/exporter/carbonexporter/go.mod b/exporter/carbonexporter/go.mod index 835c7ae15686..169b41d936f3 100644 --- a/exporter/carbonexporter/go.mod +++ b/exporter/carbonexporter/go.mod @@ -5,9 +5,9 @@ go 1.18 require ( github.com/open-telemetry/opentelemetry-collector-contrib/internal/common v0.63.0 github.com/stretchr/testify v1.8.1 - go.opentelemetry.io/collector v0.63.2-0.20221104003159-6b27644724d8 - go.opentelemetry.io/collector/pdata v0.63.2-0.20221104003159-6b27644724d8 - go.opentelemetry.io/collector/semconv v0.63.2-0.20221104003159-6b27644724d8 + go.opentelemetry.io/collector v0.63.2-0.20221108014805-0b08d5316426 + go.opentelemetry.io/collector/pdata v0.63.2-0.20221108014805-0b08d5316426 + go.opentelemetry.io/collector/semconv v0.63.2-0.20221108014805-0b08d5316426 go.uber.org/atomic v1.10.0 ) @@ -26,7 +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.opencensus.io v0.23.0 // indirect + go.opencensus.io v0.24.0 // 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 1c6bfd74649a..bf826e268a34 100644 --- a/exporter/carbonexporter/go.sum +++ b/exporter/carbonexporter/go.sum @@ -225,7 +225,7 @@ github.com/prometheus/client_golang v0.9.1/go.mod h1:7SWBe2y4D6OKWSNQJUaRYU/AaXP github.com/prometheus/client_golang v1.0.0/go.mod h1:db9x61etRT2tGnBNRi70OPL5FsnadC4Ky3P0J6CfImo= github.com/prometheus/client_golang v1.7.1/go.mod h1:PY5Wy2awLA44sXw4AOSfFBetzPP4j5+D6mVACh+pe2M= github.com/prometheus/client_golang v1.11.1/go.mod h1:Z6t4BnS23TR94PD6BsDNk8yVqroYurpAkEiz0P2BEV0= -github.com/prometheus/client_golang v1.13.0 h1:b71QUfeo5M8gq2+evJdTPfZhYMAU0uKPkyPJ7TPsloU= +github.com/prometheus/client_golang v1.13.1 h1:3gMjIY2+/hzmqhtUC/aQNYldJA6DtH3CgQvwS+02K1c= github.com/prometheus/client_model v0.0.0-20180712105110-5c3871d89910/go.mod h1:MbSGuTsp3dbXC40dX6PRTWyKYBIrTGTE9sqQNg2J8bo= github.com/prometheus/client_model v0.0.0-20190129233127-fd36f4220a90/go.mod h1:xMI15A0UPsDsEKsMN9yxemIoYk6Tm2C1GtYGdfGttqA= github.com/prometheus/client_model v0.0.0-20190812154241-14fe0d1b01d4/go.mod h1:xMI15A0UPsDsEKsMN9yxemIoYk6Tm2C1GtYGdfGttqA= @@ -260,7 +260,6 @@ github.com/stretchr/testify v1.2.2/go.mod h1:a8OnRcib4nhh0OaRAV+Yts87kKdq0PP7pXf github.com/stretchr/testify v1.3.0/go.mod h1:M5WIy9Dh21IEIfnGCwXGc5bZfKNJtfHm1UVUgZn+9EI= github.com/stretchr/testify v1.4.0/go.mod h1:j7eGeouHqKxXV5pUuKE4zz7dFj8WfuZ+81PSLYec5m4= github.com/stretchr/testify v1.5.1/go.mod h1:5W2xD1RspED5o8YsWQXVCued0rvSQ+mT+I5cxcmMvtA= -github.com/stretchr/testify v1.6.1/go.mod h1:6Fq8oRcR53rry900zMqJjRRixrwX3KX962/h/Wwjteg= github.com/stretchr/testify v1.7.0/go.mod h1:6Fq8oRcR53rry900zMqJjRRixrwX3KX962/h/Wwjteg= github.com/stretchr/testify v1.7.1/go.mod h1:6Fq8oRcR53rry900zMqJjRRixrwX3KX962/h/Wwjteg= github.com/stretchr/testify v1.8.0/go.mod h1:yNjHg4UonilssWZ8iaSj1OCr/vHnekPRkoO+kdMU+MU= @@ -272,14 +271,14 @@ 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.opencensus.io v0.23.0 h1:gqCw0LfLxScz8irSi8exQc7fyQ0fKQU/qnC/X8+V/1M= -go.opencensus.io v0.23.0/go.mod h1:XItmlyltB5F7CS4xOC1DcqMoFqwtC6OG2xF7mCv7P7E= -go.opentelemetry.io/collector v0.63.2-0.20221104003159-6b27644724d8 h1:rOT5HzXXfSISc6FiH012zH2/EFjp37UXfjEqj5BpkWQ= -go.opentelemetry.io/collector v0.63.2-0.20221104003159-6b27644724d8/go.mod h1:JVmeZXugK4ondC6KQgrHTHWiF4JttpG5k6dWPMt62+k= -go.opentelemetry.io/collector/pdata v0.63.2-0.20221104003159-6b27644724d8 h1:7xeTQjfsOm9eogQeIxjSEhlik9qsbBGsnmkQHfyKaRE= -go.opentelemetry.io/collector/pdata v0.63.2-0.20221104003159-6b27644724d8/go.mod h1:IzvXUGQml2mrnvdb8zIlEW3qQs9oFLdD2hLwJdZ+pek= -go.opentelemetry.io/collector/semconv v0.63.2-0.20221104003159-6b27644724d8 h1:jm0sNPyqo6S165QjQYMBHB2nK50wlJbMYM03Yr3Eo2k= -go.opentelemetry.io/collector/semconv v0.63.2-0.20221104003159-6b27644724d8/go.mod h1:5o9yhOa+ABt7g2E5JABDxGZ1PQPbtfxrKNbYn+LOTXU= +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.63.2-0.20221108014805-0b08d5316426 h1:z/wLTMh7/vNxcFUDa5uG7/IPE3tYx6pzCWPV41ghyV8= +go.opentelemetry.io/collector v0.63.2-0.20221108014805-0b08d5316426/go.mod h1:+Zb70q0Rq17dA9FcHTiTjW6g96lvJ8kAZ0c+eWNkAv0= +go.opentelemetry.io/collector/pdata v0.63.2-0.20221108014805-0b08d5316426 h1:wKDpgP0Tx/gWI2SgDGAY1OTSeihhDivbbRqFR79IGTc= +go.opentelemetry.io/collector/pdata v0.63.2-0.20221108014805-0b08d5316426/go.mod h1:IzvXUGQml2mrnvdb8zIlEW3qQs9oFLdD2hLwJdZ+pek= +go.opentelemetry.io/collector/semconv v0.63.2-0.20221108014805-0b08d5316426 h1:pqIl7OC531J6i9ttBCj3zLmZI/BSF4q323YpK0GgKGk= +go.opentelemetry.io/collector/semconv v0.63.2-0.20221108014805-0b08d5316426/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 311b47606d9e..9c0d9742f18d 100644 --- a/exporter/clickhouseexporter/config_test.go +++ b/exporter/clickhouseexporter/config_test.go @@ -21,6 +21,7 @@ import ( "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" + "go.opentelemetry.io/collector/component" "go.opentelemetry.io/collector/config" "go.opentelemetry.io/collector/confmap/confmaptest" "go.opentelemetry.io/collector/exporter/exporterhelper" @@ -38,18 +39,18 @@ func TestLoadConfig(t *testing.T) { defaultCfg.(*Config).DSN = defaultDSN tests := []struct { - id config.ComponentID - expected config.Exporter + id component.ID + expected component.ExporterConfig }{ { - id: config.NewComponentIDWithName(typeStr, ""), + id: component.NewIDWithName(typeStr, ""), expected: defaultCfg, }, { - id: config.NewComponentIDWithName(typeStr, "full"), + id: component.NewIDWithName(typeStr, "full"), expected: &Config{ - ExporterSettings: config.NewExporterSettings(config.NewComponentID(typeStr)), + ExporterSettings: config.NewExporterSettings(component.NewID(typeStr)), DSN: defaultDSN, TTLDays: 3, LogsTableName: "otel_logs", @@ -77,7 +78,7 @@ func TestLoadConfig(t *testing.T) { sub, err := cm.Sub(tt.id.String()) require.NoError(t, err) - require.NoError(t, config.UnmarshalExporter(sub, cfg)) + require.NoError(t, component.UnmarshalExporterConfig(sub, cfg)) assert.NoError(t, cfg.Validate()) assert.Equal(t, tt.expected, cfg) diff --git a/exporter/clickhouseexporter/factory.go b/exporter/clickhouseexporter/factory.go index b4d48867efc2..cb038f37154e 100644 --- a/exporter/clickhouseexporter/factory.go +++ b/exporter/clickhouseexporter/factory.go @@ -40,9 +40,9 @@ func NewFactory() component.ExporterFactory { ) } -func createDefaultConfig() config.Exporter { +func createDefaultConfig() component.ExporterConfig { return &Config{ - ExporterSettings: config.NewExporterSettings(config.NewComponentID(typeStr)), + ExporterSettings: config.NewExporterSettings(component.NewID(typeStr)), TimeoutSettings: exporterhelper.NewDefaultTimeoutSettings(), QueueSettings: QueueSettings{QueueSize: exporterhelper.NewDefaultQueueSettings().QueueSize}, RetrySettings: exporterhelper.NewDefaultRetrySettings(), @@ -57,7 +57,7 @@ func createDefaultConfig() config.Exporter { func createLogsExporter( ctx context.Context, set component.ExporterCreateSettings, - cfg config.Exporter, + cfg component.ExporterConfig, ) (component.LogsExporter, error) { c := cfg.(*Config) exporter, err := newLogsExporter(set.Logger, c) @@ -82,7 +82,7 @@ func createLogsExporter( func createTracesExporter( ctx context.Context, set component.ExporterCreateSettings, - cfg config.Exporter, + cfg component.ExporterConfig, ) (component.TracesExporter, error) { c := cfg.(*Config) exporter, err := newTracesExporter(set.Logger, c) diff --git a/exporter/clickhouseexporter/factory_test.go b/exporter/clickhouseexporter/factory_test.go index 9107e749460e..df24df44c8fc 100644 --- a/exporter/clickhouseexporter/factory_test.go +++ b/exporter/clickhouseexporter/factory_test.go @@ -21,14 +21,13 @@ import ( "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" "go.opentelemetry.io/collector/component/componenttest" - "go.opentelemetry.io/collector/config/configtest" ) func TestCreateDefaultConfig(t *testing.T) { factory := NewFactory() cfg := factory.CreateDefaultConfig() assert.NotNil(t, cfg, "failed to create default config") - assert.NoError(t, configtest.CheckConfigStruct(cfg)) + assert.NoError(t, componenttest.CheckConfigStruct(cfg)) } func TestFactory_CreateLogsExporter(t *testing.T) { diff --git a/exporter/clickhouseexporter/go.mod b/exporter/clickhouseexporter/go.mod index e7e05b26177f..2a786b384e3a 100644 --- a/exporter/clickhouseexporter/go.mod +++ b/exporter/clickhouseexporter/go.mod @@ -3,7 +3,7 @@ module github.com/open-telemetry/opentelemetry-collector-contrib/exporter/clickh go 1.18 require ( - go.opentelemetry.io/collector v0.63.2-0.20221104003159-6b27644724d8 + go.opentelemetry.io/collector v0.63.2-0.20221108014805-0b08d5316426 go.uber.org/zap v1.23.0 ) @@ -12,10 +12,10 @@ require go.uber.org/multierr v1.8.0 require ( github.com/ClickHouse/clickhouse-go/v2 v2.3.0 - github.com/open-telemetry/opentelemetry-collector-contrib/internal/coreinternal v0.0.0-00010101000000-000000000000 + github.com/open-telemetry/opentelemetry-collector-contrib/internal/coreinternal v0.63.0 github.com/stretchr/testify v1.8.1 - go.opentelemetry.io/collector/pdata v0.63.2-0.20221104003159-6b27644724d8 - go.opentelemetry.io/collector/semconv v0.63.2-0.20221104003159-6b27644724d8 + go.opentelemetry.io/collector/pdata v0.63.2-0.20221108014805-0b08d5316426 + go.opentelemetry.io/collector/semconv v0.63.2-0.20221108014805-0b08d5316426 ) require ( @@ -44,7 +44,7 @@ require ( github.com/pmezard/go-difflib v1.0.0 // indirect github.com/segmentio/asm v1.2.0 // indirect github.com/shopspring/decimal v1.3.1 // indirect - go.opencensus.io v0.23.0 // indirect + go.opencensus.io v0.24.0 // 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 ec36689e35ea..13d0b99961a0 100644 --- a/exporter/clickhouseexporter/go.sum +++ b/exporter/clickhouseexporter/go.sum @@ -246,7 +246,7 @@ github.com/prometheus/client_golang v0.9.1/go.mod h1:7SWBe2y4D6OKWSNQJUaRYU/AaXP github.com/prometheus/client_golang v1.0.0/go.mod h1:db9x61etRT2tGnBNRi70OPL5FsnadC4Ky3P0J6CfImo= github.com/prometheus/client_golang v1.7.1/go.mod h1:PY5Wy2awLA44sXw4AOSfFBetzPP4j5+D6mVACh+pe2M= github.com/prometheus/client_golang v1.11.1/go.mod h1:Z6t4BnS23TR94PD6BsDNk8yVqroYurpAkEiz0P2BEV0= -github.com/prometheus/client_golang v1.13.0 h1:b71QUfeo5M8gq2+evJdTPfZhYMAU0uKPkyPJ7TPsloU= +github.com/prometheus/client_golang v1.13.1 h1:3gMjIY2+/hzmqhtUC/aQNYldJA6DtH3CgQvwS+02K1c= github.com/prometheus/client_model v0.0.0-20180712105110-5c3871d89910/go.mod h1:MbSGuTsp3dbXC40dX6PRTWyKYBIrTGTE9sqQNg2J8bo= github.com/prometheus/client_model v0.0.0-20190129233127-fd36f4220a90/go.mod h1:xMI15A0UPsDsEKsMN9yxemIoYk6Tm2C1GtYGdfGttqA= github.com/prometheus/client_model v0.0.0-20190812154241-14fe0d1b01d4/go.mod h1:xMI15A0UPsDsEKsMN9yxemIoYk6Tm2C1GtYGdfGttqA= @@ -287,7 +287,6 @@ github.com/stretchr/testify v1.2.2/go.mod h1:a8OnRcib4nhh0OaRAV+Yts87kKdq0PP7pXf github.com/stretchr/testify v1.3.0/go.mod h1:M5WIy9Dh21IEIfnGCwXGc5bZfKNJtfHm1UVUgZn+9EI= github.com/stretchr/testify v1.4.0/go.mod h1:j7eGeouHqKxXV5pUuKE4zz7dFj8WfuZ+81PSLYec5m4= github.com/stretchr/testify v1.5.1/go.mod h1:5W2xD1RspED5o8YsWQXVCued0rvSQ+mT+I5cxcmMvtA= -github.com/stretchr/testify v1.6.1/go.mod h1:6Fq8oRcR53rry900zMqJjRRixrwX3KX962/h/Wwjteg= github.com/stretchr/testify v1.7.0/go.mod h1:6Fq8oRcR53rry900zMqJjRRixrwX3KX962/h/Wwjteg= github.com/stretchr/testify v1.7.1/go.mod h1:6Fq8oRcR53rry900zMqJjRRixrwX3KX962/h/Wwjteg= github.com/stretchr/testify v1.8.0/go.mod h1:yNjHg4UonilssWZ8iaSj1OCr/vHnekPRkoO+kdMU+MU= @@ -299,14 +298,14 @@ 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.opencensus.io v0.23.0 h1:gqCw0LfLxScz8irSi8exQc7fyQ0fKQU/qnC/X8+V/1M= -go.opencensus.io v0.23.0/go.mod h1:XItmlyltB5F7CS4xOC1DcqMoFqwtC6OG2xF7mCv7P7E= -go.opentelemetry.io/collector v0.63.2-0.20221104003159-6b27644724d8 h1:rOT5HzXXfSISc6FiH012zH2/EFjp37UXfjEqj5BpkWQ= -go.opentelemetry.io/collector v0.63.2-0.20221104003159-6b27644724d8/go.mod h1:JVmeZXugK4ondC6KQgrHTHWiF4JttpG5k6dWPMt62+k= -go.opentelemetry.io/collector/pdata v0.63.2-0.20221104003159-6b27644724d8 h1:7xeTQjfsOm9eogQeIxjSEhlik9qsbBGsnmkQHfyKaRE= -go.opentelemetry.io/collector/pdata v0.63.2-0.20221104003159-6b27644724d8/go.mod h1:IzvXUGQml2mrnvdb8zIlEW3qQs9oFLdD2hLwJdZ+pek= -go.opentelemetry.io/collector/semconv v0.63.2-0.20221104003159-6b27644724d8 h1:jm0sNPyqo6S165QjQYMBHB2nK50wlJbMYM03Yr3Eo2k= -go.opentelemetry.io/collector/semconv v0.63.2-0.20221104003159-6b27644724d8/go.mod h1:5o9yhOa+ABt7g2E5JABDxGZ1PQPbtfxrKNbYn+LOTXU= +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.63.2-0.20221108014805-0b08d5316426 h1:z/wLTMh7/vNxcFUDa5uG7/IPE3tYx6pzCWPV41ghyV8= +go.opentelemetry.io/collector v0.63.2-0.20221108014805-0b08d5316426/go.mod h1:+Zb70q0Rq17dA9FcHTiTjW6g96lvJ8kAZ0c+eWNkAv0= +go.opentelemetry.io/collector/pdata v0.63.2-0.20221108014805-0b08d5316426 h1:wKDpgP0Tx/gWI2SgDGAY1OTSeihhDivbbRqFR79IGTc= +go.opentelemetry.io/collector/pdata v0.63.2-0.20221108014805-0b08d5316426/go.mod h1:IzvXUGQml2mrnvdb8zIlEW3qQs9oFLdD2hLwJdZ+pek= +go.opentelemetry.io/collector/semconv v0.63.2-0.20221108014805-0b08d5316426 h1:pqIl7OC531J6i9ttBCj3zLmZI/BSF4q323YpK0GgKGk= +go.opentelemetry.io/collector/semconv v0.63.2-0.20221108014805-0b08d5316426/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 6691b50016fa..51d33c34d065 100644 --- a/exporter/coralogixexporter/config_test.go +++ b/exporter/coralogixexporter/config_test.go @@ -21,6 +21,7 @@ import ( "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" + "go.opentelemetry.io/collector/component" "go.opentelemetry.io/collector/component/componenttest" "go.opentelemetry.io/collector/config" "go.opentelemetry.io/collector/config/configgrpc" @@ -37,13 +38,13 @@ func TestLoadConfig(t *testing.T) { require.NoError(t, err) tests := []struct { - id config.ComponentID - expected config.Exporter + id component.ID + expected component.ExporterConfig }{ { - id: config.NewComponentIDWithName(typeStr, ""), + id: component.NewIDWithName(typeStr, ""), expected: &Config{ - ExporterSettings: config.NewExporterSettings(config.NewComponentID(typeStr)), + ExporterSettings: config.NewExporterSettings(component.NewID(typeStr)), QueueSettings: exporterhelper.NewDefaultQueueSettings(), RetrySettings: exporterhelper.NewDefaultRetrySettings(), PrivateKey: "xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx", @@ -97,9 +98,9 @@ func TestLoadConfig(t *testing.T) { }, }, { - id: config.NewComponentIDWithName(typeStr, "all"), + id: component.NewIDWithName(typeStr, "all"), expected: &Config{ - ExporterSettings: config.NewExporterSettings(config.NewComponentID(typeStr)), + ExporterSettings: config.NewExporterSettings(component.NewID(typeStr)), QueueSettings: exporterhelper.NewDefaultQueueSettings(), RetrySettings: exporterhelper.NewDefaultRetrySettings(), PrivateKey: "xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx", @@ -163,7 +164,7 @@ func TestLoadConfig(t *testing.T) { sub, err := cm.Sub(tt.id.String()) require.NoError(t, err) - require.NoError(t, config.UnmarshalExporter(sub, cfg)) + require.NoError(t, component.UnmarshalExporterConfig(sub, cfg)) assert.NoError(t, cfg.Validate()) assert.Equal(t, tt.expected, cfg) @@ -177,9 +178,9 @@ func TestTraceExporter(t *testing.T) { factory := NewFactory() cfg := factory.CreateDefaultConfig() - sub, err := cm.Sub(config.NewComponentIDWithName(typeStr, "").String()) + sub, err := cm.Sub(component.NewIDWithName(typeStr, "").String()) require.NoError(t, err) - require.NoError(t, config.UnmarshalExporter(sub, cfg)) + require.NoError(t, component.UnmarshalExporterConfig(sub, cfg)) params := componenttest.NewNopExporterCreateSettings() te, err := newTracesExporter(cfg, params) @@ -194,9 +195,9 @@ func TestJaegerBasedTraceExporter(t *testing.T) { factory := NewFactory() cfg := factory.CreateDefaultConfig() - sub, err := cm.Sub(config.NewComponentIDWithName(typeStr, "trace").String()) + sub, err := cm.Sub(component.NewIDWithName(typeStr, "trace").String()) require.NoError(t, err) - require.NoError(t, config.UnmarshalExporter(sub, cfg)) + require.NoError(t, component.UnmarshalExporterConfig(sub, cfg)) params := componenttest.NewNopExporterCreateSettings() te, err := newCoralogixExporter(cfg.(*Config), params) diff --git a/exporter/coralogixexporter/factory.go b/exporter/coralogixexporter/factory.go index 80c7b83d1853..40b4081ade18 100644 --- a/exporter/coralogixexporter/factory.go +++ b/exporter/coralogixexporter/factory.go @@ -36,9 +36,9 @@ func NewFactory() component.ExporterFactory { ) } -func createDefaultConfig() config.Exporter { +func createDefaultConfig() component.ExporterConfig { return &Config{ - ExporterSettings: config.NewExporterSettings(config.NewComponentID(typeStr)), + ExporterSettings: config.NewExporterSettings(component.NewID(typeStr)), QueueSettings: exporterhelper.NewDefaultQueueSettings(), RetrySettings: exporterhelper.NewDefaultRetrySettings(), TimeoutSettings: exporterhelper.NewDefaultTimeoutSettings(), @@ -63,7 +63,7 @@ func createDefaultConfig() config.Exporter { } } -func createTraceExporter(ctx context.Context, set component.ExporterCreateSettings, config config.Exporter) (component.TracesExporter, error) { +func createTraceExporter(ctx context.Context, set component.ExporterCreateSettings, config component.ExporterConfig) (component.TracesExporter, error) { cfg := config.(*Config) // Use deprecated jaeger endpoint if it's not empty @@ -109,7 +109,7 @@ func createTraceExporter(ctx context.Context, set component.ExporterCreateSettin func createMetricsExporter( ctx context.Context, set component.ExporterCreateSettings, - cfg config.Exporter, + cfg component.ExporterConfig, ) (component.MetricsExporter, error) { oce, err := newMetricsExporter(cfg, set) if err != nil { @@ -133,7 +133,7 @@ func createMetricsExporter( func createLogsExporter( ctx context.Context, set component.ExporterCreateSettings, - cfg config.Exporter, + cfg component.ExporterConfig, ) (component.LogsExporter, error) { oce, err := newLogsExporter(cfg, set) if err != nil { diff --git a/exporter/coralogixexporter/factory_test.go b/exporter/coralogixexporter/factory_test.go index ab3472ee5994..cb84c29d7660 100644 --- a/exporter/coralogixexporter/factory_test.go +++ b/exporter/coralogixexporter/factory_test.go @@ -21,11 +21,11 @@ import ( "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" + "go.opentelemetry.io/collector/component" "go.opentelemetry.io/collector/component/componenttest" "go.opentelemetry.io/collector/config" "go.opentelemetry.io/collector/config/configcompression" "go.opentelemetry.io/collector/config/configgrpc" - "go.opentelemetry.io/collector/config/configtest" "go.opentelemetry.io/collector/config/configtls" "go.opentelemetry.io/collector/exporter/exporterhelper" @@ -36,7 +36,7 @@ func TestCreateDefaultConfig(t *testing.T) { factory := NewFactory() cfg := factory.CreateDefaultConfig() assert.NotNil(t, cfg, "failed to create default config") - assert.NoError(t, configtest.CheckConfigStruct(cfg)) + assert.NoError(t, componenttest.CheckConfigStruct(cfg)) ocfg, ok := factory.CreateDefaultConfig().(*Config) assert.True(t, ok) assert.Equal(t, ocfg.RetrySettings, exporterhelper.NewDefaultRetrySettings()) @@ -77,7 +77,7 @@ func TestCreateTracesExporter(t *testing.T) { { name: "UseSecure", config: Config{ - ExporterSettings: config.NewExporterSettings(config.NewComponentID(typeStr)), + ExporterSettings: config.NewExporterSettings(component.NewID(typeStr)), Traces: configgrpc.GRPCClientSettings{ Endpoint: endpoint, TLSSetting: configtls.TLSClientSetting{ @@ -89,7 +89,7 @@ func TestCreateTracesExporter(t *testing.T) { { name: "Keepalive", config: Config{ - ExporterSettings: config.NewExporterSettings(config.NewComponentID(typeStr)), + ExporterSettings: config.NewExporterSettings(component.NewID(typeStr)), Traces: configgrpc.GRPCClientSettings{ Endpoint: endpoint, Keepalive: &configgrpc.KeepaliveClientConfig{ @@ -103,7 +103,7 @@ func TestCreateTracesExporter(t *testing.T) { { name: "NoneCompression", config: Config{ - ExporterSettings: config.NewExporterSettings(config.NewComponentID(typeStr)), + ExporterSettings: config.NewExporterSettings(component.NewID(typeStr)), Traces: configgrpc.GRPCClientSettings{ Endpoint: endpoint, Compression: "none", @@ -113,7 +113,7 @@ func TestCreateTracesExporter(t *testing.T) { { name: "GzipCompression", config: Config{ - ExporterSettings: config.NewExporterSettings(config.NewComponentID(typeStr)), + ExporterSettings: config.NewExporterSettings(component.NewID(typeStr)), Traces: configgrpc.GRPCClientSettings{ Endpoint: endpoint, Compression: configcompression.Gzip, @@ -141,7 +141,7 @@ func TestCreateTracesExporter(t *testing.T) { { name: "Headers", config: Config{ - ExporterSettings: config.NewExporterSettings(config.NewComponentID(typeStr)), + ExporterSettings: config.NewExporterSettings(component.NewID(typeStr)), Traces: configgrpc.GRPCClientSettings{ Endpoint: endpoint, Headers: map[string]string{ @@ -154,7 +154,7 @@ func TestCreateTracesExporter(t *testing.T) { { name: "NumConsumers", config: Config{ - ExporterSettings: config.NewExporterSettings(config.NewComponentID(typeStr)), + ExporterSettings: config.NewExporterSettings(component.NewID(typeStr)), Traces: configgrpc.GRPCClientSettings{ Endpoint: endpoint, }, @@ -163,7 +163,7 @@ func TestCreateTracesExporter(t *testing.T) { { name: "CertPemFileError", config: Config{ - ExporterSettings: config.NewExporterSettings(config.NewComponentID(typeStr)), + ExporterSettings: config.NewExporterSettings(component.NewID(typeStr)), Traces: configgrpc.GRPCClientSettings{ Endpoint: endpoint, TLSSetting: configtls.TLSClientSetting{ diff --git a/exporter/coralogixexporter/go.mod b/exporter/coralogixexporter/go.mod index 99d78ef13c3c..377d863ba130 100644 --- a/exporter/coralogixexporter/go.mod +++ b/exporter/coralogixexporter/go.mod @@ -4,14 +4,14 @@ go 1.18 require ( github.com/stretchr/testify v1.8.1 - go.opentelemetry.io/collector v0.63.2-0.20221104003159-6b27644724d8 + go.opentelemetry.io/collector v0.63.2-0.20221108014805-0b08d5316426 ) require ( github.com/coralogix/opentelemetry-cx-protobuf-api/coralogixpb v0.0.0-20211201100428-d2a5d0ecf53e github.com/open-telemetry/opentelemetry-collector-contrib/internal/common v0.63.0 github.com/open-telemetry/opentelemetry-collector-contrib/pkg/translator/jaeger v0.63.0 - go.opentelemetry.io/collector/pdata v0.63.2-0.20221104003159-6b27644724d8 + go.opentelemetry.io/collector/pdata v0.63.2-0.20221108014805-0b08d5316426 go.uber.org/zap v1.23.0 google.golang.org/genproto v0.0.0-20220822174746-9e6da59bd2fc google.golang.org/grpc v1.50.1 @@ -42,8 +42,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.opencensus.io v0.23.0 // indirect - go.opentelemetry.io/collector/semconv v0.63.2-0.20221104003159-6b27644724d8 // indirect + go.opencensus.io v0.24.0 // indirect + go.opentelemetry.io/collector/semconv v0.63.2-0.20221108014805-0b08d5316426 // 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 875cc2a15c39..601691cd1476 100644 --- a/exporter/coralogixexporter/go.sum +++ b/exporter/coralogixexporter/go.sum @@ -257,7 +257,7 @@ github.com/prometheus/client_golang v0.9.1/go.mod h1:7SWBe2y4D6OKWSNQJUaRYU/AaXP github.com/prometheus/client_golang v1.0.0/go.mod h1:db9x61etRT2tGnBNRi70OPL5FsnadC4Ky3P0J6CfImo= github.com/prometheus/client_golang v1.7.1/go.mod h1:PY5Wy2awLA44sXw4AOSfFBetzPP4j5+D6mVACh+pe2M= github.com/prometheus/client_golang v1.11.1/go.mod h1:Z6t4BnS23TR94PD6BsDNk8yVqroYurpAkEiz0P2BEV0= -github.com/prometheus/client_golang v1.13.0 h1:b71QUfeo5M8gq2+evJdTPfZhYMAU0uKPkyPJ7TPsloU= +github.com/prometheus/client_golang v1.13.1 h1:3gMjIY2+/hzmqhtUC/aQNYldJA6DtH3CgQvwS+02K1c= github.com/prometheus/client_model v0.0.0-20180712105110-5c3871d89910/go.mod h1:MbSGuTsp3dbXC40dX6PRTWyKYBIrTGTE9sqQNg2J8bo= github.com/prometheus/client_model v0.0.0-20190129233127-fd36f4220a90/go.mod h1:xMI15A0UPsDsEKsMN9yxemIoYk6Tm2C1GtYGdfGttqA= github.com/prometheus/client_model v0.0.0-20190812154241-14fe0d1b01d4/go.mod h1:xMI15A0UPsDsEKsMN9yxemIoYk6Tm2C1GtYGdfGttqA= @@ -295,7 +295,6 @@ github.com/stretchr/testify v1.2.2/go.mod h1:a8OnRcib4nhh0OaRAV+Yts87kKdq0PP7pXf github.com/stretchr/testify v1.3.0/go.mod h1:M5WIy9Dh21IEIfnGCwXGc5bZfKNJtfHm1UVUgZn+9EI= github.com/stretchr/testify v1.4.0/go.mod h1:j7eGeouHqKxXV5pUuKE4zz7dFj8WfuZ+81PSLYec5m4= github.com/stretchr/testify v1.5.1/go.mod h1:5W2xD1RspED5o8YsWQXVCued0rvSQ+mT+I5cxcmMvtA= -github.com/stretchr/testify v1.6.1/go.mod h1:6Fq8oRcR53rry900zMqJjRRixrwX3KX962/h/Wwjteg= github.com/stretchr/testify v1.7.0/go.mod h1:6Fq8oRcR53rry900zMqJjRRixrwX3KX962/h/Wwjteg= github.com/stretchr/testify v1.7.1/go.mod h1:6Fq8oRcR53rry900zMqJjRRixrwX3KX962/h/Wwjteg= github.com/stretchr/testify v1.8.0/go.mod h1:yNjHg4UonilssWZ8iaSj1OCr/vHnekPRkoO+kdMU+MU= @@ -311,14 +310,14 @@ 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.opencensus.io v0.23.0 h1:gqCw0LfLxScz8irSi8exQc7fyQ0fKQU/qnC/X8+V/1M= -go.opencensus.io v0.23.0/go.mod h1:XItmlyltB5F7CS4xOC1DcqMoFqwtC6OG2xF7mCv7P7E= -go.opentelemetry.io/collector v0.63.2-0.20221104003159-6b27644724d8 h1:rOT5HzXXfSISc6FiH012zH2/EFjp37UXfjEqj5BpkWQ= -go.opentelemetry.io/collector v0.63.2-0.20221104003159-6b27644724d8/go.mod h1:JVmeZXugK4ondC6KQgrHTHWiF4JttpG5k6dWPMt62+k= -go.opentelemetry.io/collector/pdata v0.63.2-0.20221104003159-6b27644724d8 h1:7xeTQjfsOm9eogQeIxjSEhlik9qsbBGsnmkQHfyKaRE= -go.opentelemetry.io/collector/pdata v0.63.2-0.20221104003159-6b27644724d8/go.mod h1:IzvXUGQml2mrnvdb8zIlEW3qQs9oFLdD2hLwJdZ+pek= -go.opentelemetry.io/collector/semconv v0.63.2-0.20221104003159-6b27644724d8 h1:jm0sNPyqo6S165QjQYMBHB2nK50wlJbMYM03Yr3Eo2k= -go.opentelemetry.io/collector/semconv v0.63.2-0.20221104003159-6b27644724d8/go.mod h1:5o9yhOa+ABt7g2E5JABDxGZ1PQPbtfxrKNbYn+LOTXU= +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.63.2-0.20221108014805-0b08d5316426 h1:z/wLTMh7/vNxcFUDa5uG7/IPE3tYx6pzCWPV41ghyV8= +go.opentelemetry.io/collector v0.63.2-0.20221108014805-0b08d5316426/go.mod h1:+Zb70q0Rq17dA9FcHTiTjW6g96lvJ8kAZ0c+eWNkAv0= +go.opentelemetry.io/collector/pdata v0.63.2-0.20221108014805-0b08d5316426 h1:wKDpgP0Tx/gWI2SgDGAY1OTSeihhDivbbRqFR79IGTc= +go.opentelemetry.io/collector/pdata v0.63.2-0.20221108014805-0b08d5316426/go.mod h1:IzvXUGQml2mrnvdb8zIlEW3qQs9oFLdD2hLwJdZ+pek= +go.opentelemetry.io/collector/semconv v0.63.2-0.20221108014805-0b08d5316426 h1:pqIl7OC531J6i9ttBCj3zLmZI/BSF4q323YpK0GgKGk= +go.opentelemetry.io/collector/semconv v0.63.2-0.20221108014805-0b08d5316426/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/coralogixexporter/logs_client.go b/exporter/coralogixexporter/logs_client.go index 63b57dd7d32c..b80d6ecb36cb 100644 --- a/exporter/coralogixexporter/logs_client.go +++ b/exporter/coralogixexporter/logs_client.go @@ -21,14 +21,13 @@ import ( "runtime" "go.opentelemetry.io/collector/component" - "go.opentelemetry.io/collector/config" "go.opentelemetry.io/collector/pdata/plog" "go.opentelemetry.io/collector/pdata/plog/plogotlp" "google.golang.org/grpc" "google.golang.org/grpc/metadata" ) -func newLogsExporter(cfg config.Exporter, set component.ExporterCreateSettings) (*logsExporter, error) { +func newLogsExporter(cfg component.ExporterConfig, set component.ExporterCreateSettings) (*logsExporter, error) { oCfg := cfg.(*Config) if oCfg.Logs.Endpoint == "" || oCfg.Logs.Endpoint == "https://" || oCfg.Logs.Endpoint == "http://" { diff --git a/exporter/coralogixexporter/metrics_client.go b/exporter/coralogixexporter/metrics_client.go index cef63732af5f..3abc26a17199 100644 --- a/exporter/coralogixexporter/metrics_client.go +++ b/exporter/coralogixexporter/metrics_client.go @@ -22,7 +22,6 @@ import ( "time" "go.opentelemetry.io/collector/component" - "go.opentelemetry.io/collector/config" "go.opentelemetry.io/collector/consumer/consumererror" "go.opentelemetry.io/collector/exporter/exporterhelper" "go.opentelemetry.io/collector/pdata/pmetric" @@ -34,7 +33,7 @@ import ( "google.golang.org/grpc/status" ) -func newMetricsExporter(cfg config.Exporter, set component.ExporterCreateSettings) (*exporter, error) { +func newMetricsExporter(cfg component.ExporterConfig, set component.ExporterCreateSettings) (*exporter, error) { oCfg := cfg.(*Config) if oCfg.Metrics.Endpoint == "" || oCfg.Metrics.Endpoint == "https://" || oCfg.Metrics.Endpoint == "http://" { diff --git a/exporter/coralogixexporter/traces_client.go b/exporter/coralogixexporter/traces_client.go index cd8f349a4e2e..082031504cd6 100644 --- a/exporter/coralogixexporter/traces_client.go +++ b/exporter/coralogixexporter/traces_client.go @@ -21,7 +21,6 @@ import ( "runtime" "go.opentelemetry.io/collector/component" - "go.opentelemetry.io/collector/config" "go.opentelemetry.io/collector/pdata/ptrace" "go.opentelemetry.io/collector/pdata/ptrace/ptraceotlp" "google.golang.org/grpc" @@ -42,7 +41,7 @@ type tracesExporter struct { userAgent string } -func newTracesExporter(cfg config.Exporter, set component.ExporterCreateSettings) (*tracesExporter, error) { +func newTracesExporter(cfg component.ExporterConfig, set component.ExporterCreateSettings) (*tracesExporter, error) { oCfg, ok := cfg.(*Config) if !ok { return nil, fmt.Errorf("invalid config exporter, expect type: %T, got: %T", &Config{}, cfg) diff --git a/exporter/datadogexporter/config.go b/exporter/datadogexporter/config.go index 3f8544981561..2b6092bc7bce 100644 --- a/exporter/datadogexporter/config.go +++ b/exporter/datadogexporter/config.go @@ -21,6 +21,7 @@ import ( "regexp" "strings" + "go.opentelemetry.io/collector/component" "go.opentelemetry.io/collector/config" "go.opentelemetry.io/collector/config/confignet" "go.opentelemetry.io/collector/confmap" @@ -362,9 +363,9 @@ type Config struct { OnlyMetadata bool `mapstructure:"only_metadata"` } -var _ config.Exporter = (*Config)(nil) +var _ component.ExporterConfig = (*Config)(nil) -// Validate the configuration for errors. This is required by config.Exporter. +// Validate the configuration for errors. This is required by component.ExporterConfig. func (c *Config) Validate() error { if c.OnlyMetadata && (!c.HostMetadata.Enabled || c.HostMetadata.HostnameSource != HostnameSourceFirstResource) { return errNoMetadata diff --git a/exporter/datadogexporter/factory.go b/exporter/datadogexporter/factory.go index 6848d405a89a..e40d7c2b95cb 100644 --- a/exporter/datadogexporter/factory.go +++ b/exporter/datadogexporter/factory.go @@ -81,14 +81,14 @@ func defaulttimeoutSettings() exporterhelper.TimeoutSettings { } // createDefaultConfig creates the default exporter configuration -func (f *factory) createDefaultConfig() config.Exporter { +func (f *factory) createDefaultConfig() component.ExporterConfig { hostnameSource := HostnameSourceFirstResource if f.registry.IsEnabled(metadata.HostnamePreviewFeatureGate) { hostnameSource = HostnameSourceConfigOrSystem } return &Config{ - ExporterSettings: config.NewExporterSettings(config.NewComponentID(typeStr)), + ExporterSettings: config.NewExporterSettings(component.NewID(typeStr)), TimeoutSettings: defaulttimeoutSettings(), RetrySettings: exporterhelper.NewDefaultRetrySettings(), QueueSettings: exporterhelper.NewDefaultQueueSettings(), @@ -140,7 +140,7 @@ func (f *factory) createDefaultConfig() config.Exporter { // checkAndCastConfig checks the configuration type and its warnings, and casts it to // the Datadog Config struct. -func checkAndCastConfig(c config.Exporter) *Config { +func checkAndCastConfig(c component.ExporterConfig) *Config { cfg, ok := c.(*Config) if !ok { panic("programming error: config structure is not of type *datadogexporter.Config") @@ -152,7 +152,7 @@ func checkAndCastConfig(c config.Exporter) *Config { func (f *factory) createMetricsExporter( ctx context.Context, set component.ExporterCreateSettings, - c config.Exporter, + c component.ExporterConfig, ) (component.MetricsExporter, error) { cfg := checkAndCastConfig(c) @@ -212,7 +212,7 @@ func (f *factory) createMetricsExporter( func (f *factory) createTracesExporter( ctx context.Context, set component.ExporterCreateSettings, - c config.Exporter, + c component.ExporterConfig, ) (component.TracesExporter, error) { cfg := checkAndCastConfig(c) @@ -275,7 +275,7 @@ func (f *factory) createTracesExporter( func (f *factory) createLogsExporter( ctx context.Context, set component.ExporterCreateSettings, - c config.Exporter, + c component.ExporterConfig, ) (component.LogsExporter, error) { cfg := checkAndCastConfig(c) diff --git a/exporter/datadogexporter/factory_test.go b/exporter/datadogexporter/factory_test.go index 839cdad6a924..f43094f07491 100644 --- a/exporter/datadogexporter/factory_test.go +++ b/exporter/datadogexporter/factory_test.go @@ -22,10 +22,10 @@ import ( "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" + "go.opentelemetry.io/collector/component" "go.opentelemetry.io/collector/component/componenttest" "go.opentelemetry.io/collector/config" "go.opentelemetry.io/collector/config/confignet" - "go.opentelemetry.io/collector/config/configtest" "go.opentelemetry.io/collector/confmap/confmaptest" "go.opentelemetry.io/collector/exporter/exporterhelper" "go.opentelemetry.io/collector/pdata/ptrace" @@ -40,7 +40,7 @@ func TestCreateDefaultConfig(t *testing.T) { cfg := factory.CreateDefaultConfig() assert.Equal(t, &Config{ - ExporterSettings: config.NewExporterSettings(config.NewComponentID(typeStr)), + ExporterSettings: config.NewExporterSettings(component.NewID(typeStr)), TimeoutSettings: defaulttimeoutSettings(), RetrySettings: exporterhelper.NewDefaultRetrySettings(), QueueSettings: exporterhelper.NewDefaultQueueSettings(), @@ -85,7 +85,7 @@ func TestCreateDefaultConfig(t *testing.T) { OnlyMetadata: false, }, cfg, "failed to create default config") - assert.NoError(t, configtest.CheckConfigStruct(cfg)) + assert.NoError(t, componenttest.CheckConfigStruct(cfg)) } func TestLoadConfig(t *testing.T) { @@ -95,13 +95,13 @@ func TestLoadConfig(t *testing.T) { require.NoError(t, err) tests := []struct { - id config.ComponentID - expected config.Exporter + id component.ID + expected component.ExporterConfig }{ { - id: config.NewComponentIDWithName(typeStr, "default"), + id: component.NewIDWithName(typeStr, "default"), expected: &Config{ - ExporterSettings: config.NewExporterSettings(config.NewComponentID(typeStr)), + ExporterSettings: config.NewExporterSettings(component.NewID(typeStr)), TimeoutSettings: defaulttimeoutSettings(), RetrySettings: exporterhelper.NewDefaultRetrySettings(), QueueSettings: exporterhelper.NewDefaultQueueSettings(), @@ -147,9 +147,9 @@ func TestLoadConfig(t *testing.T) { }, }, { - id: config.NewComponentIDWithName(typeStr, "api"), + id: component.NewIDWithName(typeStr, "api"), expected: &Config{ - ExporterSettings: config.NewExporterSettings(config.NewComponentID(typeStr)), + ExporterSettings: config.NewExporterSettings(component.NewID(typeStr)), TimeoutSettings: defaulttimeoutSettings(), RetrySettings: exporterhelper.NewDefaultRetrySettings(), QueueSettings: exporterhelper.NewDefaultQueueSettings(), @@ -201,9 +201,9 @@ func TestLoadConfig(t *testing.T) { }, }, { - id: config.NewComponentIDWithName(typeStr, "api2"), + id: component.NewIDWithName(typeStr, "api2"), expected: &Config{ - ExporterSettings: config.NewExporterSettings(config.NewComponentID(typeStr)), + ExporterSettings: config.NewExporterSettings(component.NewID(typeStr)), TimeoutSettings: defaulttimeoutSettings(), RetrySettings: exporterhelper.NewDefaultRetrySettings(), QueueSettings: exporterhelper.NewDefaultQueueSettings(), @@ -262,7 +262,7 @@ func TestLoadConfig(t *testing.T) { sub, err := cm.Sub(tt.id.String()) require.NoError(t, err) - require.NoError(t, config.UnmarshalExporter(sub, cfg)) + require.NoError(t, component.UnmarshalExporterConfig(sub, cfg)) assert.NoError(t, cfg.Validate()) assert.Equal(t, tt.expected, cfg) @@ -351,12 +351,12 @@ func TestOverrideEndpoints(t *testing.T) { for _, testInstance := range tests { t.Run(testInstance.componentID, func(t *testing.T) { cfg := factory.CreateDefaultConfig() - sub, err := cm.Sub(config.NewComponentIDWithName(typeStr, testInstance.componentID).String()) + sub, err := cm.Sub(component.NewIDWithName(typeStr, testInstance.componentID).String()) require.NoError(t, err) - require.NoError(t, config.UnmarshalExporter(sub, cfg)) + require.NoError(t, component.UnmarshalExporterConfig(sub, cfg)) componentCfg, ok := cfg.(*Config) - require.True(t, ok, "config.Exporter is not a Datadog exporter config (wrong ID?)") + require.True(t, ok, "component.ExporterConfig is not a Datadog exporter config (wrong ID?)") assert.Equal(t, testInstance.expectedSite, componentCfg.API.Site) assert.Equal(t, testInstance.expectedMetricsEndpoint, componentCfg.Metrics.Endpoint) assert.Equal(t, testInstance.expectedTracesEndpoint, componentCfg.Traces.Endpoint) @@ -374,9 +374,9 @@ func TestCreateAPIMetricsExporter(t *testing.T) { factory := NewFactory() cfg := factory.CreateDefaultConfig() - sub, err := cm.Sub(config.NewComponentIDWithName(typeStr, "api").String()) + sub, err := cm.Sub(component.NewIDWithName(typeStr, "api").String()) require.NoError(t, err) - require.NoError(t, config.UnmarshalExporter(sub, cfg)) + require.NoError(t, component.UnmarshalExporterConfig(sub, cfg)) c := cfg.(*Config) c.Metrics.TCPAddr.Endpoint = server.URL @@ -402,9 +402,9 @@ func TestCreateAPIExporterFailOnInvalidKey(t *testing.T) { factory := NewFactory() cfg := factory.CreateDefaultConfig() - sub, err := cm.Sub(config.NewComponentIDWithName(typeStr, "api").String()) + sub, err := cm.Sub(component.NewIDWithName(typeStr, "api").String()) require.NoError(t, err) - require.NoError(t, config.UnmarshalExporter(sub, cfg)) + require.NoError(t, component.UnmarshalExporterConfig(sub, cfg)) // Use the mock server for API key validation c := cfg.(*Config) @@ -477,9 +477,9 @@ func TestCreateAPILogsExporter(t *testing.T) { factory := NewFactory() cfg := factory.CreateDefaultConfig() - sub, err := cm.Sub(config.NewComponentIDWithName(typeStr, "api").String()) + sub, err := cm.Sub(component.NewIDWithName(typeStr, "api").String()) require.NoError(t, err) - require.NoError(t, config.UnmarshalExporter(sub, cfg)) + require.NoError(t, component.UnmarshalExporterConfig(sub, cfg)) c := cfg.(*Config) c.Metrics.TCPAddr.Endpoint = server.URL @@ -508,7 +508,7 @@ func TestOnlyMetadata(t *testing.T) { ctx := context.Background() cfg := &Config{ - ExporterSettings: config.NewExporterSettings(config.NewComponentID(typeStr)), + ExporterSettings: config.NewExporterSettings(component.NewID(typeStr)), TimeoutSettings: defaulttimeoutSettings(), RetrySettings: exporterhelper.NewDefaultRetrySettings(), QueueSettings: exporterhelper.NewDefaultQueueSettings(), diff --git a/exporter/datadogexporter/go.mod b/exporter/datadogexporter/go.mod index 088ad11c33aa..816f739cfdb2 100644 --- a/exporter/datadogexporter/go.mod +++ b/exporter/datadogexporter/go.mod @@ -23,11 +23,11 @@ require ( github.com/open-telemetry/opentelemetry-collector-contrib/receiver/hostmetricsreceiver v0.63.0 github.com/patrickmn/go-cache v2.1.0+incompatible github.com/stretchr/testify v1.8.1 - go.opentelemetry.io/collector v0.63.2-0.20221104003159-6b27644724d8 - go.opentelemetry.io/collector/pdata v0.63.2-0.20221104003159-6b27644724d8 - go.opentelemetry.io/collector/processor/batchprocessor v0.0.0-20221104003159-6b27644724d8 - go.opentelemetry.io/collector/receiver/otlpreceiver v0.0.0-20221103164255-2ed41215f324 - go.opentelemetry.io/collector/semconv v0.63.2-0.20221104003159-6b27644724d8 + go.opentelemetry.io/collector v0.63.2-0.20221108014805-0b08d5316426 + go.opentelemetry.io/collector/pdata v0.63.2-0.20221108014805-0b08d5316426 + go.opentelemetry.io/collector/processor/batchprocessor v0.0.0-20221108014805-0b08d5316426 + go.opentelemetry.io/collector/receiver/otlpreceiver v0.0.0-20221108014805-0b08d5316426 + go.opentelemetry.io/collector/semconv v0.63.2-0.20221108014805-0b08d5316426 go.uber.org/multierr v1.8.0 go.uber.org/zap v1.23.0 gopkg.in/yaml.v2 v2.4.0 @@ -131,7 +131,7 @@ require ( github.com/pkg/errors v0.9.1 // indirect github.com/pmezard/go-difflib v1.0.0 // indirect github.com/power-devops/perfstat v0.0.0-20220216144756-c35f1ee13d7c // indirect - github.com/prometheus/client_golang v1.13.0 // indirect + github.com/prometheus/client_golang v1.13.1 // indirect github.com/prometheus/client_model v0.3.0 // indirect github.com/prometheus/common v0.37.0 // indirect github.com/prometheus/procfs v0.8.0 // indirect @@ -149,7 +149,7 @@ require ( github.com/tklauser/numcpus v0.5.0 // indirect github.com/yusufpapurcu/wmi v1.2.2 // indirect github.com/zorkian/go-datadog-api v2.30.0+incompatible // indirect - go.opencensus.io v0.23.0 // indirect + go.opencensus.io v0.24.0 // 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/exporter/datadogexporter/go.sum b/exporter/datadogexporter/go.sum index 237e82b7bbb9..f434276332c6 100644 --- a/exporter/datadogexporter/go.sum +++ b/exporter/datadogexporter/go.sum @@ -587,8 +587,9 @@ github.com/prometheus/client_golang v1.11.0/go.mod h1:Z6t4BnS23TR94PD6BsDNk8yVqr github.com/prometheus/client_golang v1.11.1/go.mod h1:Z6t4BnS23TR94PD6BsDNk8yVqroYurpAkEiz0P2BEV0= github.com/prometheus/client_golang v1.12.1/go.mod h1:3Z9XVyYiZYEO+YQWt3RD2R3jrbd179Rt297l4aS6nDY= github.com/prometheus/client_golang v1.12.2/go.mod h1:3Z9XVyYiZYEO+YQWt3RD2R3jrbd179Rt297l4aS6nDY= -github.com/prometheus/client_golang v1.13.0 h1:b71QUfeo5M8gq2+evJdTPfZhYMAU0uKPkyPJ7TPsloU= github.com/prometheus/client_golang v1.13.0/go.mod h1:vTeo+zgvILHsnnj/39Ou/1fPN5nJFOEMgftOUOmlvYQ= +github.com/prometheus/client_golang v1.13.1 h1:3gMjIY2+/hzmqhtUC/aQNYldJA6DtH3CgQvwS+02K1c= +github.com/prometheus/client_golang v1.13.1/go.mod h1:vTeo+zgvILHsnnj/39Ou/1fPN5nJFOEMgftOUOmlvYQ= github.com/prometheus/client_model v0.0.0-20180712105110-5c3871d89910/go.mod h1:MbSGuTsp3dbXC40dX6PRTWyKYBIrTGTE9sqQNg2J8bo= github.com/prometheus/client_model v0.0.0-20190129233127-fd36f4220a90/go.mod h1:xMI15A0UPsDsEKsMN9yxemIoYk6Tm2C1GtYGdfGttqA= github.com/prometheus/client_model v0.0.0-20190812154241-14fe0d1b01d4/go.mod h1:xMI15A0UPsDsEKsMN9yxemIoYk6Tm2C1GtYGdfGttqA= @@ -700,19 +701,20 @@ 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.opencensus.io v0.23.0 h1:gqCw0LfLxScz8irSi8exQc7fyQ0fKQU/qnC/X8+V/1M= go.opencensus.io v0.23.0/go.mod h1:XItmlyltB5F7CS4xOC1DcqMoFqwtC6OG2xF7mCv7P7E= -go.opentelemetry.io/collector v0.63.2-0.20221104003159-6b27644724d8 h1:rOT5HzXXfSISc6FiH012zH2/EFjp37UXfjEqj5BpkWQ= -go.opentelemetry.io/collector v0.63.2-0.20221104003159-6b27644724d8/go.mod h1:JVmeZXugK4ondC6KQgrHTHWiF4JttpG5k6dWPMt62+k= +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.63.2-0.20221108014805-0b08d5316426 h1:z/wLTMh7/vNxcFUDa5uG7/IPE3tYx6pzCWPV41ghyV8= +go.opentelemetry.io/collector v0.63.2-0.20221108014805-0b08d5316426/go.mod h1:+Zb70q0Rq17dA9FcHTiTjW6g96lvJ8kAZ0c+eWNkAv0= go.opentelemetry.io/collector/extension/zpagesextension v0.0.0-20221102221454-bfc45c16c979 h1:YW7BL8ftoJ7k+EtnMICw1KWASLuSDIhbF7SjjgWMCl4= -go.opentelemetry.io/collector/pdata v0.63.2-0.20221104003159-6b27644724d8 h1:7xeTQjfsOm9eogQeIxjSEhlik9qsbBGsnmkQHfyKaRE= -go.opentelemetry.io/collector/pdata v0.63.2-0.20221104003159-6b27644724d8/go.mod h1:IzvXUGQml2mrnvdb8zIlEW3qQs9oFLdD2hLwJdZ+pek= -go.opentelemetry.io/collector/processor/batchprocessor v0.0.0-20221104003159-6b27644724d8 h1:jgN7o3WfR8x++rjMcVM1VN6OJi4ytlGANXbwd73BPXo= -go.opentelemetry.io/collector/processor/batchprocessor v0.0.0-20221104003159-6b27644724d8/go.mod h1:WBv1Nayi8p12K0vxLxTkHpRGr79JXYT3TXL2X0B/PRU= -go.opentelemetry.io/collector/receiver/otlpreceiver v0.0.0-20221103164255-2ed41215f324 h1:aibmxR+Sxpk1EUFA35CDMgcDdgBSG5B6Xr55j1puuys= -go.opentelemetry.io/collector/receiver/otlpreceiver v0.0.0-20221103164255-2ed41215f324/go.mod h1:POjN0P6ae987Q5v5p/MbSVXwatmBaw7jtdMCtU/sxLk= -go.opentelemetry.io/collector/semconv v0.63.2-0.20221104003159-6b27644724d8 h1:jm0sNPyqo6S165QjQYMBHB2nK50wlJbMYM03Yr3Eo2k= -go.opentelemetry.io/collector/semconv v0.63.2-0.20221104003159-6b27644724d8/go.mod h1:5o9yhOa+ABt7g2E5JABDxGZ1PQPbtfxrKNbYn+LOTXU= +go.opentelemetry.io/collector/pdata v0.63.2-0.20221108014805-0b08d5316426 h1:wKDpgP0Tx/gWI2SgDGAY1OTSeihhDivbbRqFR79IGTc= +go.opentelemetry.io/collector/pdata v0.63.2-0.20221108014805-0b08d5316426/go.mod h1:IzvXUGQml2mrnvdb8zIlEW3qQs9oFLdD2hLwJdZ+pek= +go.opentelemetry.io/collector/processor/batchprocessor v0.0.0-20221108014805-0b08d5316426 h1:7f0NVsVGYT8pxAyk0qBBa8ZQf7athr/mfQ6QltGywN0= +go.opentelemetry.io/collector/processor/batchprocessor v0.0.0-20221108014805-0b08d5316426/go.mod h1:gpd5Q/3HlROMGYhnmwlFpUhcz8Xy80sokEcKs7c7zzE= +go.opentelemetry.io/collector/receiver/otlpreceiver v0.0.0-20221108014805-0b08d5316426 h1:6cosCaS91068I8El0q8TJkv3V5lRzAfH2Wuja/5ydIo= +go.opentelemetry.io/collector/receiver/otlpreceiver v0.0.0-20221108014805-0b08d5316426/go.mod h1:+sGF2/LgOFWN1QClgdzg2NYCY9dYyPO4W4NAfxdODto= +go.opentelemetry.io/collector/semconv v0.63.2-0.20221108014805-0b08d5316426 h1:pqIl7OC531J6i9ttBCj3zLmZI/BSF4q323YpK0GgKGk= +go.opentelemetry.io/collector/semconv v0.63.2-0.20221108014805-0b08d5316426/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/datadogexporter/traces_exporter_test.go b/exporter/datadogexporter/traces_exporter_test.go index 90147c63fe7f..9646e53133e0 100644 --- a/exporter/datadogexporter/traces_exporter_test.go +++ b/exporter/datadogexporter/traces_exporter_test.go @@ -29,6 +29,7 @@ import ( tracelog "github.com/DataDog/datadog-agent/pkg/trace/log" "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" + "go.opentelemetry.io/collector/component" "go.opentelemetry.io/collector/component/componenttest" "go.opentelemetry.io/collector/config" "go.opentelemetry.io/collector/config/confignet" @@ -131,7 +132,7 @@ func TestTracesSource(t *testing.T) { defer tracesServer.Close() cfg := Config{ - ExporterSettings: config.NewExporterSettings(config.NewComponentID(typeStr)), + ExporterSettings: config.NewExporterSettings(component.NewID(typeStr)), API: APIConfig{ Key: "aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa", }, @@ -233,7 +234,7 @@ func TestTraceExporter(t *testing.T) { defer server.Close() cfg := Config{ - ExporterSettings: config.NewExporterSettings(config.NewComponentID(typeStr)), + ExporterSettings: config.NewExporterSettings(component.NewID(typeStr)), API: APIConfig{ Key: "aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa", }, diff --git a/exporter/dynatraceexporter/factory.go b/exporter/dynatraceexporter/factory.go index 02d950d8136a..8dbd1b752c4f 100644 --- a/exporter/dynatraceexporter/factory.go +++ b/exporter/dynatraceexporter/factory.go @@ -43,9 +43,9 @@ func NewFactory() component.ExporterFactory { } // createDefaultConfig creates the default exporter configuration -func createDefaultConfig() config.Exporter { +func createDefaultConfig() component.ExporterConfig { return &dtconfig.Config{ - ExporterSettings: config.NewExporterSettings(config.NewComponentID(typeStr)), + ExporterSettings: config.NewExporterSettings(component.NewID(typeStr)), RetrySettings: exporterhelper.NewDefaultRetrySettings(), QueueSettings: exporterhelper.NewDefaultQueueSettings(), ResourceToTelemetrySettings: resourcetotelemetry.Settings{ @@ -64,7 +64,7 @@ func createDefaultConfig() config.Exporter { func createMetricsExporter( ctx context.Context, set component.ExporterCreateSettings, - c config.Exporter, + c component.ExporterConfig, ) (component.MetricsExporter, error) { cfg := c.(*dtconfig.Config) diff --git a/exporter/dynatraceexporter/factory_test.go b/exporter/dynatraceexporter/factory_test.go index 2a36d7c3945c..2eee28aa54d9 100644 --- a/exporter/dynatraceexporter/factory_test.go +++ b/exporter/dynatraceexporter/factory_test.go @@ -21,9 +21,10 @@ import ( "github.com/dynatrace-oss/dynatrace-metric-utils-go/metric/apiconstants" "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" + "go.opentelemetry.io/collector/component" + "go.opentelemetry.io/collector/component/componenttest" "go.opentelemetry.io/collector/config" "go.opentelemetry.io/collector/config/confighttp" - "go.opentelemetry.io/collector/config/configtest" "go.opentelemetry.io/collector/confmap/confmaptest" "go.opentelemetry.io/collector/exporter/exporterhelper" @@ -37,7 +38,7 @@ func TestCreateDefaultConfig(t *testing.T) { cfg := factory.CreateDefaultConfig() assert.Equal(t, &dtconfig.Config{ - ExporterSettings: config.NewExporterSettings(config.NewComponentID(typeStr)), + ExporterSettings: config.NewExporterSettings(component.NewID(typeStr)), RetrySettings: exporterhelper.NewDefaultRetrySettings(), QueueSettings: exporterhelper.NewDefaultQueueSettings(), ResourceToTelemetrySettings: resourcetotelemetry.Settings{ @@ -48,7 +49,7 @@ func TestCreateDefaultConfig(t *testing.T) { DefaultDimensions: make(map[string]string), }, cfg, "failed to create default config") - assert.NoError(t, configtest.CheckConfigStruct(cfg)) + assert.NoError(t, componenttest.CheckConfigStruct(cfg)) } func TestLoadConfig(t *testing.T) { @@ -58,14 +59,14 @@ func TestLoadConfig(t *testing.T) { require.NoError(t, err) tests := []struct { - id config.ComponentID - expected config.Exporter + id component.ID + expected component.ExporterConfig errorMessage string }{ { - id: config.NewComponentIDWithName(typeStr, "defaults"), + id: component.NewIDWithName(typeStr, "defaults"), expected: &dtconfig.Config{ - ExporterSettings: config.NewExporterSettings(config.NewComponentID(typeStr)), + ExporterSettings: config.NewExporterSettings(component.NewID(typeStr)), RetrySettings: exporterhelper.NewDefaultRetrySettings(), QueueSettings: exporterhelper.NewDefaultQueueSettings(), @@ -80,9 +81,9 @@ func TestLoadConfig(t *testing.T) { }, }, { - id: config.NewComponentIDWithName(typeStr, "valid"), + id: component.NewIDWithName(typeStr, "valid"), expected: &dtconfig.Config{ - ExporterSettings: config.NewExporterSettings(config.NewComponentID(typeStr)), + ExporterSettings: config.NewExporterSettings(component.NewID(typeStr)), RetrySettings: exporterhelper.NewDefaultRetrySettings(), QueueSettings: exporterhelper.NewDefaultQueueSettings(), @@ -104,9 +105,9 @@ func TestLoadConfig(t *testing.T) { }, }, { - id: config.NewComponentIDWithName(typeStr, "valid_tags"), + id: component.NewIDWithName(typeStr, "valid_tags"), expected: &dtconfig.Config{ - ExporterSettings: config.NewExporterSettings(config.NewComponentID(typeStr)), + ExporterSettings: config.NewExporterSettings(component.NewID(typeStr)), RetrySettings: exporterhelper.NewDefaultRetrySettings(), QueueSettings: exporterhelper.NewDefaultQueueSettings(), @@ -126,11 +127,11 @@ func TestLoadConfig(t *testing.T) { }, }, { - id: config.NewComponentIDWithName(typeStr, "bad_endpoint"), + id: component.NewIDWithName(typeStr, "bad_endpoint"), errorMessage: "endpoint must start with https:// or http://", }, { - id: config.NewComponentIDWithName(typeStr, "missing_token"), + id: component.NewIDWithName(typeStr, "missing_token"), errorMessage: "api_token is required if Endpoint is provided", }, } @@ -142,7 +143,7 @@ func TestLoadConfig(t *testing.T) { sub, err := cm.Sub(tt.id.String()) require.NoError(t, err) - require.NoError(t, config.UnmarshalExporter(sub, cfg)) + require.NoError(t, component.UnmarshalExporterConfig(sub, cfg)) if tt.expected == nil { assert.EqualError(t, cfg.Validate(), tt.errorMessage) diff --git a/exporter/dynatraceexporter/go.mod b/exporter/dynatraceexporter/go.mod index 48e7026851b2..3e25b8c48382 100644 --- a/exporter/dynatraceexporter/go.mod +++ b/exporter/dynatraceexporter/go.mod @@ -7,8 +7,8 @@ require ( github.com/open-telemetry/opentelemetry-collector-contrib/internal/common v0.63.0 github.com/open-telemetry/opentelemetry-collector-contrib/pkg/resourcetotelemetry v0.63.0 github.com/stretchr/testify v1.8.1 - go.opentelemetry.io/collector v0.63.2-0.20221104003159-6b27644724d8 - go.opentelemetry.io/collector/pdata v0.63.2-0.20221104003159-6b27644724d8 + go.opentelemetry.io/collector v0.63.2-0.20221108014805-0b08d5316426 + go.opentelemetry.io/collector/pdata v0.63.2-0.20221108014805-0b08d5316426 go.uber.org/zap v1.23.0 ) @@ -32,7 +32,7 @@ require ( github.com/pmezard/go-difflib v1.0.0 // indirect github.com/rogpeppe/go-internal v1.6.1 // indirect github.com/rs/cors v1.8.2 // indirect - go.opencensus.io v0.23.0 // indirect + go.opencensus.io v0.24.0 // 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 2cc55fc529da..8a73942c46aa 100644 --- a/exporter/dynatraceexporter/go.sum +++ b/exporter/dynatraceexporter/go.sum @@ -234,7 +234,7 @@ github.com/prometheus/client_golang v0.9.1/go.mod h1:7SWBe2y4D6OKWSNQJUaRYU/AaXP github.com/prometheus/client_golang v1.0.0/go.mod h1:db9x61etRT2tGnBNRi70OPL5FsnadC4Ky3P0J6CfImo= github.com/prometheus/client_golang v1.7.1/go.mod h1:PY5Wy2awLA44sXw4AOSfFBetzPP4j5+D6mVACh+pe2M= github.com/prometheus/client_golang v1.11.1/go.mod h1:Z6t4BnS23TR94PD6BsDNk8yVqroYurpAkEiz0P2BEV0= -github.com/prometheus/client_golang v1.13.0 h1:b71QUfeo5M8gq2+evJdTPfZhYMAU0uKPkyPJ7TPsloU= +github.com/prometheus/client_golang v1.13.1 h1:3gMjIY2+/hzmqhtUC/aQNYldJA6DtH3CgQvwS+02K1c= github.com/prometheus/client_model v0.0.0-20180712105110-5c3871d89910/go.mod h1:MbSGuTsp3dbXC40dX6PRTWyKYBIrTGTE9sqQNg2J8bo= github.com/prometheus/client_model v0.0.0-20190129233127-fd36f4220a90/go.mod h1:xMI15A0UPsDsEKsMN9yxemIoYk6Tm2C1GtYGdfGttqA= github.com/prometheus/client_model v0.0.0-20190812154241-14fe0d1b01d4/go.mod h1:xMI15A0UPsDsEKsMN9yxemIoYk6Tm2C1GtYGdfGttqA= @@ -273,7 +273,6 @@ github.com/stretchr/testify v1.2.2/go.mod h1:a8OnRcib4nhh0OaRAV+Yts87kKdq0PP7pXf github.com/stretchr/testify v1.3.0/go.mod h1:M5WIy9Dh21IEIfnGCwXGc5bZfKNJtfHm1UVUgZn+9EI= github.com/stretchr/testify v1.4.0/go.mod h1:j7eGeouHqKxXV5pUuKE4zz7dFj8WfuZ+81PSLYec5m4= github.com/stretchr/testify v1.5.1/go.mod h1:5W2xD1RspED5o8YsWQXVCued0rvSQ+mT+I5cxcmMvtA= -github.com/stretchr/testify v1.6.1/go.mod h1:6Fq8oRcR53rry900zMqJjRRixrwX3KX962/h/Wwjteg= github.com/stretchr/testify v1.7.0/go.mod h1:6Fq8oRcR53rry900zMqJjRRixrwX3KX962/h/Wwjteg= github.com/stretchr/testify v1.7.1/go.mod h1:6Fq8oRcR53rry900zMqJjRRixrwX3KX962/h/Wwjteg= github.com/stretchr/testify v1.8.0/go.mod h1:yNjHg4UonilssWZ8iaSj1OCr/vHnekPRkoO+kdMU+MU= @@ -285,12 +284,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.opencensus.io v0.23.0 h1:gqCw0LfLxScz8irSi8exQc7fyQ0fKQU/qnC/X8+V/1M= -go.opencensus.io v0.23.0/go.mod h1:XItmlyltB5F7CS4xOC1DcqMoFqwtC6OG2xF7mCv7P7E= -go.opentelemetry.io/collector v0.63.2-0.20221104003159-6b27644724d8 h1:rOT5HzXXfSISc6FiH012zH2/EFjp37UXfjEqj5BpkWQ= -go.opentelemetry.io/collector v0.63.2-0.20221104003159-6b27644724d8/go.mod h1:JVmeZXugK4ondC6KQgrHTHWiF4JttpG5k6dWPMt62+k= -go.opentelemetry.io/collector/pdata v0.63.2-0.20221104003159-6b27644724d8 h1:7xeTQjfsOm9eogQeIxjSEhlik9qsbBGsnmkQHfyKaRE= -go.opentelemetry.io/collector/pdata v0.63.2-0.20221104003159-6b27644724d8/go.mod h1:IzvXUGQml2mrnvdb8zIlEW3qQs9oFLdD2hLwJdZ+pek= +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.63.2-0.20221108014805-0b08d5316426 h1:z/wLTMh7/vNxcFUDa5uG7/IPE3tYx6pzCWPV41ghyV8= +go.opentelemetry.io/collector v0.63.2-0.20221108014805-0b08d5316426/go.mod h1:+Zb70q0Rq17dA9FcHTiTjW6g96lvJ8kAZ0c+eWNkAv0= +go.opentelemetry.io/collector/pdata v0.63.2-0.20221108014805-0b08d5316426 h1:wKDpgP0Tx/gWI2SgDGAY1OTSeihhDivbbRqFR79IGTc= +go.opentelemetry.io/collector/pdata v0.63.2-0.20221108014805-0b08d5316426/go.mod h1:IzvXUGQml2mrnvdb8zIlEW3qQs9oFLdD2hLwJdZ+pek= 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 1ae93122c3dd..b35de87b7d4f 100644 --- a/exporter/elasticsearchexporter/config_test.go +++ b/exporter/elasticsearchexporter/config_test.go @@ -21,6 +21,7 @@ import ( "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" + "go.opentelemetry.io/collector/component" "go.opentelemetry.io/collector/config" "go.opentelemetry.io/collector/confmap/confmaptest" ) @@ -31,12 +32,12 @@ func TestLoad_DeprecatedIndexConfigOption(t *testing.T) { factory := NewFactory() cfg := factory.CreateDefaultConfig() - sub, err := cm.Sub(config.NewComponentIDWithName(typeStr, "log").String()) + sub, err := cm.Sub(component.NewIDWithName(typeStr, "log").String()) require.NoError(t, err) - require.NoError(t, config.UnmarshalExporter(sub, cfg)) + require.NoError(t, component.UnmarshalExporterConfig(sub, cfg)) assert.Equal(t, cfg, &Config{ - ExporterSettings: config.NewExporterSettings(config.NewComponentID(typeStr)), + ExporterSettings: config.NewExporterSettings(component.NewID(typeStr)), Endpoints: []string{"http://localhost:9200"}, CloudID: "TRNMxjXlNJEt", Index: "my_log_index", @@ -84,17 +85,17 @@ func TestLoadConfig(t *testing.T) { defaultCfg.(*Config).Endpoints = []string{"https://elastic.example.com:9200"} tests := []struct { - id config.ComponentID - expected config.Exporter + id component.ID + expected component.ExporterConfig }{ { - id: config.NewComponentIDWithName(typeStr, ""), + id: component.NewIDWithName(typeStr, ""), expected: defaultCfg, }, { - id: config.NewComponentIDWithName(typeStr, "trace"), + id: component.NewIDWithName(typeStr, "trace"), expected: &Config{ - ExporterSettings: config.NewExporterSettings(config.NewComponentID(typeStr)), + ExporterSettings: config.NewExporterSettings(component.NewID(typeStr)), Endpoints: []string{"https://elastic.example.com:9200"}, CloudID: "TRNMxjXlNJEt", Index: "", @@ -132,9 +133,9 @@ func TestLoadConfig(t *testing.T) { }, }, { - id: config.NewComponentIDWithName(typeStr, "log"), + id: component.NewIDWithName(typeStr, "log"), expected: &Config{ - ExporterSettings: config.NewExporterSettings(config.NewComponentID(typeStr)), + ExporterSettings: config.NewExporterSettings(component.NewID(typeStr)), Endpoints: []string{"http://localhost:9200"}, CloudID: "TRNMxjXlNJEt", Index: "", @@ -180,7 +181,7 @@ func TestLoadConfig(t *testing.T) { sub, err := cm.Sub(tt.id.String()) require.NoError(t, err) - require.NoError(t, config.UnmarshalExporter(sub, cfg)) + require.NoError(t, component.UnmarshalExporterConfig(sub, cfg)) assert.NoError(t, cfg.Validate()) assert.Equal(t, tt.expected, cfg) diff --git a/exporter/elasticsearchexporter/factory.go b/exporter/elasticsearchexporter/factory.go index dfb19e17a835..e32bc85e8f64 100644 --- a/exporter/elasticsearchexporter/factory.go +++ b/exporter/elasticsearchexporter/factory.go @@ -43,9 +43,9 @@ func NewFactory() component.ExporterFactory { ) } -func createDefaultConfig() config.Exporter { +func createDefaultConfig() component.ExporterConfig { return &Config{ - ExporterSettings: config.NewExporterSettings(config.NewComponentID(typeStr)), + ExporterSettings: config.NewExporterSettings(component.NewID(typeStr)), HTTPClientSettings: HTTPClientSettings{ Timeout: 90 * time.Second, }, @@ -72,7 +72,7 @@ func createDefaultConfig() config.Exporter { func createLogsExporter( ctx context.Context, set component.ExporterCreateSettings, - cfg config.Exporter, + cfg component.ExporterConfig, ) (component.LogsExporter, error) { if cfg.(*Config).Index != "" { set.Logger.Warn("index option are deprecated and replaced with logs_index and traces_index.") @@ -94,7 +94,7 @@ func createLogsExporter( func createTracesExporter(ctx context.Context, set component.ExporterCreateSettings, - cfg config.Exporter) (component.TracesExporter, error) { + cfg component.ExporterConfig) (component.TracesExporter, error) { exporter, err := newTracesExporter(set.Logger, cfg.(*Config)) if err != nil { diff --git a/exporter/elasticsearchexporter/factory_test.go b/exporter/elasticsearchexporter/factory_test.go index 4ae1c86fcb30..9bd40e290ccc 100644 --- a/exporter/elasticsearchexporter/factory_test.go +++ b/exporter/elasticsearchexporter/factory_test.go @@ -21,14 +21,13 @@ import ( "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" "go.opentelemetry.io/collector/component/componenttest" - "go.opentelemetry.io/collector/config/configtest" ) func TestCreateDefaultConfig(t *testing.T) { factory := NewFactory() cfg := factory.CreateDefaultConfig() assert.NotNil(t, cfg, "failed to create default config") - assert.NoError(t, configtest.CheckConfigStruct(cfg)) + assert.NoError(t, componenttest.CheckConfigStruct(cfg)) } func TestFactory_CreateLogsExporter(t *testing.T) { diff --git a/exporter/elasticsearchexporter/go.mod b/exporter/elasticsearchexporter/go.mod index babe505b0527..026c64505f3a 100644 --- a/exporter/elasticsearchexporter/go.mod +++ b/exporter/elasticsearchexporter/go.mod @@ -7,10 +7,10 @@ require ( github.com/elastic/go-elasticsearch/v8 v8.4.0 github.com/elastic/go-structform v0.0.10 github.com/open-telemetry/opentelemetry-collector-contrib/internal/common v0.63.0 - github.com/open-telemetry/opentelemetry-collector-contrib/internal/coreinternal v0.0.0-00010101000000-000000000000 + github.com/open-telemetry/opentelemetry-collector-contrib/internal/coreinternal v0.63.0 github.com/stretchr/testify v1.8.1 - go.opentelemetry.io/collector v0.63.2-0.20221104003159-6b27644724d8 - go.opentelemetry.io/collector/pdata v0.63.2-0.20221104003159-6b27644724d8 + go.opentelemetry.io/collector v0.63.2-0.20221108014805-0b08d5316426 + go.opentelemetry.io/collector/pdata v0.63.2-0.20221108014805-0b08d5316426 go.uber.org/atomic v1.10.0 go.uber.org/multierr v1.8.0 go.uber.org/zap v1.23.0 @@ -33,7 +33,7 @@ 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.1 // indirect - go.opencensus.io v0.23.0 // indirect + go.opencensus.io v0.24.0 // 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 7548acc044c0..4b5192832ce8 100644 --- a/exporter/elasticsearchexporter/go.sum +++ b/exporter/elasticsearchexporter/go.sum @@ -234,7 +234,7 @@ github.com/prometheus/client_golang v0.9.1/go.mod h1:7SWBe2y4D6OKWSNQJUaRYU/AaXP github.com/prometheus/client_golang v1.0.0/go.mod h1:db9x61etRT2tGnBNRi70OPL5FsnadC4Ky3P0J6CfImo= github.com/prometheus/client_golang v1.7.1/go.mod h1:PY5Wy2awLA44sXw4AOSfFBetzPP4j5+D6mVACh+pe2M= github.com/prometheus/client_golang v1.11.1/go.mod h1:Z6t4BnS23TR94PD6BsDNk8yVqroYurpAkEiz0P2BEV0= -github.com/prometheus/client_golang v1.13.0 h1:b71QUfeo5M8gq2+evJdTPfZhYMAU0uKPkyPJ7TPsloU= +github.com/prometheus/client_golang v1.13.1 h1:3gMjIY2+/hzmqhtUC/aQNYldJA6DtH3CgQvwS+02K1c= github.com/prometheus/client_model v0.0.0-20180712105110-5c3871d89910/go.mod h1:MbSGuTsp3dbXC40dX6PRTWyKYBIrTGTE9sqQNg2J8bo= github.com/prometheus/client_model v0.0.0-20190129233127-fd36f4220a90/go.mod h1:xMI15A0UPsDsEKsMN9yxemIoYk6Tm2C1GtYGdfGttqA= github.com/prometheus/client_model v0.0.0-20190812154241-14fe0d1b01d4/go.mod h1:xMI15A0UPsDsEKsMN9yxemIoYk6Tm2C1GtYGdfGttqA= @@ -272,7 +272,6 @@ github.com/stretchr/testify v1.2.2/go.mod h1:a8OnRcib4nhh0OaRAV+Yts87kKdq0PP7pXf github.com/stretchr/testify v1.3.0/go.mod h1:M5WIy9Dh21IEIfnGCwXGc5bZfKNJtfHm1UVUgZn+9EI= github.com/stretchr/testify v1.4.0/go.mod h1:j7eGeouHqKxXV5pUuKE4zz7dFj8WfuZ+81PSLYec5m4= github.com/stretchr/testify v1.5.1/go.mod h1:5W2xD1RspED5o8YsWQXVCued0rvSQ+mT+I5cxcmMvtA= -github.com/stretchr/testify v1.6.1/go.mod h1:6Fq8oRcR53rry900zMqJjRRixrwX3KX962/h/Wwjteg= github.com/stretchr/testify v1.7.0/go.mod h1:6Fq8oRcR53rry900zMqJjRRixrwX3KX962/h/Wwjteg= github.com/stretchr/testify v1.7.1/go.mod h1:6Fq8oRcR53rry900zMqJjRRixrwX3KX962/h/Wwjteg= github.com/stretchr/testify v1.8.0/go.mod h1:yNjHg4UonilssWZ8iaSj1OCr/vHnekPRkoO+kdMU+MU= @@ -284,12 +283,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.opencensus.io v0.23.0 h1:gqCw0LfLxScz8irSi8exQc7fyQ0fKQU/qnC/X8+V/1M= -go.opencensus.io v0.23.0/go.mod h1:XItmlyltB5F7CS4xOC1DcqMoFqwtC6OG2xF7mCv7P7E= -go.opentelemetry.io/collector v0.63.2-0.20221104003159-6b27644724d8 h1:rOT5HzXXfSISc6FiH012zH2/EFjp37UXfjEqj5BpkWQ= -go.opentelemetry.io/collector v0.63.2-0.20221104003159-6b27644724d8/go.mod h1:JVmeZXugK4ondC6KQgrHTHWiF4JttpG5k6dWPMt62+k= -go.opentelemetry.io/collector/pdata v0.63.2-0.20221104003159-6b27644724d8 h1:7xeTQjfsOm9eogQeIxjSEhlik9qsbBGsnmkQHfyKaRE= -go.opentelemetry.io/collector/pdata v0.63.2-0.20221104003159-6b27644724d8/go.mod h1:IzvXUGQml2mrnvdb8zIlEW3qQs9oFLdD2hLwJdZ+pek= +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.63.2-0.20221108014805-0b08d5316426 h1:z/wLTMh7/vNxcFUDa5uG7/IPE3tYx6pzCWPV41ghyV8= +go.opentelemetry.io/collector v0.63.2-0.20221108014805-0b08d5316426/go.mod h1:+Zb70q0Rq17dA9FcHTiTjW6g96lvJ8kAZ0c+eWNkAv0= +go.opentelemetry.io/collector/pdata v0.63.2-0.20221108014805-0b08d5316426 h1:wKDpgP0Tx/gWI2SgDGAY1OTSeihhDivbbRqFR79IGTc= +go.opentelemetry.io/collector/pdata v0.63.2-0.20221108014805-0b08d5316426/go.mod h1:IzvXUGQml2mrnvdb8zIlEW3qQs9oFLdD2hLwJdZ+pek= 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/config_test.go b/exporter/f5cloudexporter/config_test.go index 3fdf128ab6c2..f62a8a0184d3 100644 --- a/exporter/f5cloudexporter/config_test.go +++ b/exporter/f5cloudexporter/config_test.go @@ -21,6 +21,7 @@ import ( "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" + "go.opentelemetry.io/collector/component" "go.opentelemetry.io/collector/config" "go.opentelemetry.io/collector/config/confighttp" "go.opentelemetry.io/collector/confmap/confmaptest" @@ -34,14 +35,14 @@ func TestLoadConfig(t *testing.T) { factory := NewFactory() cfg := factory.CreateDefaultConfig() - sub, err := cm.Sub(config.NewComponentIDWithName(typeStr, "allsettings").String()) + sub, err := cm.Sub(component.NewIDWithName(typeStr, "allsettings").String()) require.NoError(t, err) - require.NoError(t, config.UnmarshalExporter(sub, cfg)) + require.NoError(t, component.UnmarshalExporterConfig(sub, cfg)) actualCfg := cfg.(*Config) expectedCfg := &Config{ Config: otlphttp.Config{ - ExporterSettings: config.NewExporterSettings(config.NewComponentIDWithName(typeStr, "")), + ExporterSettings: config.NewExporterSettings(component.NewIDWithName(typeStr, "")), RetrySettings: exporterhelper.RetrySettings{ Enabled: true, InitialInterval: 10 * time.Second, @@ -143,7 +144,7 @@ func TestConfig_sanitize(t *testing.T) { t.Run(tt.name, func(t *testing.T) { factory := NewFactory() cfg := factory.CreateDefaultConfig().(*Config) - cfg.ExporterSettings = config.NewExporterSettings(config.NewComponentID(typeStr)) + cfg.ExporterSettings = config.NewExporterSettings(component.NewID(typeStr)) cfg.Endpoint = tt.fields.Endpoint cfg.Source = tt.fields.Source cfg.AuthConfig = AuthConfig{ diff --git a/exporter/f5cloudexporter/factory.go b/exporter/f5cloudexporter/factory.go index 59ae424ec3cd..ef71f2c01959 100644 --- a/exporter/f5cloudexporter/factory.go +++ b/exporter/f5cloudexporter/factory.go @@ -44,14 +44,14 @@ func NewFactoryWithTokenSourceGetter(tsg TokenSourceGetter) component.ExporterFa return &f5cloudFactory{ExporterFactory: otlphttp.NewFactory(), getTokenSource: tsg} } -func (f *f5cloudFactory) Type() config.Type { +func (f *f5cloudFactory) Type() component.Type { return typeStr } func (f *f5cloudFactory) CreateMetricsExporter( ctx context.Context, params component.ExporterCreateSettings, - config config.Exporter) (component.MetricsExporter, error) { + config component.ExporterConfig) (component.MetricsExporter, error) { cfg := config.(*Config) @@ -67,7 +67,7 @@ func (f *f5cloudFactory) CreateMetricsExporter( func (f *f5cloudFactory) CreateTracesExporter( ctx context.Context, params component.ExporterCreateSettings, - config config.Exporter) (component.TracesExporter, error) { + config component.ExporterConfig) (component.TracesExporter, error) { cfg := config.(*Config) @@ -83,7 +83,7 @@ func (f *f5cloudFactory) CreateTracesExporter( func (f *f5cloudFactory) CreateLogsExporter( ctx context.Context, params component.ExporterCreateSettings, - config config.Exporter) (component.LogsExporter, error) { + config component.ExporterConfig) (component.LogsExporter, error) { cfg := config.(*Config) @@ -96,7 +96,7 @@ func (f *f5cloudFactory) CreateLogsExporter( return f.ExporterFactory.CreateLogsExporter(ctx, params, &cfg.Config) } -func (f *f5cloudFactory) CreateDefaultConfig() config.Exporter { +func (f *f5cloudFactory) CreateDefaultConfig() component.ExporterConfig { cfg := &Config{ Config: *f.ExporterFactory.CreateDefaultConfig().(*otlphttp.Config), AuthConfig: AuthConfig{ @@ -105,7 +105,7 @@ func (f *f5cloudFactory) CreateDefaultConfig() config.Exporter { }, } - cfg.ExporterSettings = config.NewExporterSettings(config.NewComponentID(typeStr)) + cfg.ExporterSettings = config.NewExporterSettings(component.NewID(typeStr)) cfg.Headers["User-Agent"] = "opentelemetry-collector-contrib {{version}}" diff --git a/exporter/f5cloudexporter/factory_test.go b/exporter/f5cloudexporter/factory_test.go index ab9bb5d7b4ff..d7f8309056c6 100644 --- a/exporter/f5cloudexporter/factory_test.go +++ b/exporter/f5cloudexporter/factory_test.go @@ -23,8 +23,6 @@ import ( "github.com/stretchr/testify/require" "go.opentelemetry.io/collector/component" "go.opentelemetry.io/collector/component/componenttest" - "go.opentelemetry.io/collector/config" - "go.opentelemetry.io/collector/config/configtest" "golang.org/x/oauth2" "github.com/open-telemetry/opentelemetry-collector-contrib/internal/common/testutil" @@ -32,14 +30,14 @@ import ( func TestFactory_TestType(t *testing.T) { f := NewFactory() - assert.Equal(t, f.Type(), config.Type(typeStr)) + assert.Equal(t, f.Type(), component.Type(typeStr)) } func TestFactory_CreateDefaultConfig(t *testing.T) { factory := NewFactory() cfg := factory.CreateDefaultConfig() assert.NotNil(t, cfg, "failed to create default config") - assert.NoError(t, configtest.CheckConfigStruct(cfg)) + assert.NoError(t, componenttest.CheckConfigStruct(cfg)) ocfg, ok := factory.CreateDefaultConfig().(*Config) assert.True(t, ok) assert.Equal(t, ocfg.HTTPClientSettings.Endpoint, "") diff --git a/exporter/f5cloudexporter/go.mod b/exporter/f5cloudexporter/go.mod index 769e2f6e9dd4..839133ec5ab9 100644 --- a/exporter/f5cloudexporter/go.mod +++ b/exporter/f5cloudexporter/go.mod @@ -5,8 +5,8 @@ go 1.18 require ( github.com/open-telemetry/opentelemetry-collector-contrib/internal/common v0.63.0 github.com/stretchr/testify v1.8.1 - go.opentelemetry.io/collector v0.63.2-0.20221104003159-6b27644724d8 - go.opentelemetry.io/collector/exporter/otlphttpexporter v0.63.2-0.20221104003159-6b27644724d8 + go.opentelemetry.io/collector v0.63.2-0.20221108014805-0b08d5316426 + go.opentelemetry.io/collector/exporter/otlphttpexporter v0.63.2-0.20221108014805-0b08d5316426 golang.org/x/oauth2 v0.0.0-20221014153046-6fdb5e3db783 google.golang.org/api v0.102.0 ) @@ -38,8 +38,8 @@ require ( github.com/pmezard/go-difflib v1.0.0 // indirect github.com/rogpeppe/go-internal v1.8.1 // indirect github.com/rs/cors v1.8.2 // indirect - go.opencensus.io v0.23.0 // indirect - go.opentelemetry.io/collector/pdata v0.63.2-0.20221104003159-6b27644724d8 // indirect + go.opencensus.io v0.24.0 // indirect + go.opentelemetry.io/collector/pdata v0.63.2-0.20221108014805-0b08d5316426 // 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 @@ -59,4 +59,4 @@ require ( replace github.com/open-telemetry/opentelemetry-collector-contrib/internal/common => ../../internal/common -replace go.opentelemetry.io/collector/receiver/otlpreceiver => go.opentelemetry.io/collector/receiver/otlpreceiver v0.0.0-20221101161158-df8deb48186b +replace go.opentelemetry.io/collector/receiver/otlpreceiver => go.opentelemetry.io/collector/receiver/otlpreceiver v0.0.0-20221108014805-0b08d5316426 diff --git a/exporter/f5cloudexporter/go.sum b/exporter/f5cloudexporter/go.sum index ad85ce3d4fd3..016e4e4e2ba6 100644 --- a/exporter/f5cloudexporter/go.sum +++ b/exporter/f5cloudexporter/go.sum @@ -246,7 +246,7 @@ github.com/prometheus/client_golang v0.9.1/go.mod h1:7SWBe2y4D6OKWSNQJUaRYU/AaXP github.com/prometheus/client_golang v1.0.0/go.mod h1:db9x61etRT2tGnBNRi70OPL5FsnadC4Ky3P0J6CfImo= github.com/prometheus/client_golang v1.7.1/go.mod h1:PY5Wy2awLA44sXw4AOSfFBetzPP4j5+D6mVACh+pe2M= github.com/prometheus/client_golang v1.11.1/go.mod h1:Z6t4BnS23TR94PD6BsDNk8yVqroYurpAkEiz0P2BEV0= -github.com/prometheus/client_golang v1.13.0 h1:b71QUfeo5M8gq2+evJdTPfZhYMAU0uKPkyPJ7TPsloU= +github.com/prometheus/client_golang v1.13.1 h1:3gMjIY2+/hzmqhtUC/aQNYldJA6DtH3CgQvwS+02K1c= github.com/prometheus/client_model v0.0.0-20180712105110-5c3871d89910/go.mod h1:MbSGuTsp3dbXC40dX6PRTWyKYBIrTGTE9sqQNg2J8bo= github.com/prometheus/client_model v0.0.0-20190129233127-fd36f4220a90/go.mod h1:xMI15A0UPsDsEKsMN9yxemIoYk6Tm2C1GtYGdfGttqA= github.com/prometheus/client_model v0.0.0-20190812154241-14fe0d1b01d4/go.mod h1:xMI15A0UPsDsEKsMN9yxemIoYk6Tm2C1GtYGdfGttqA= @@ -286,7 +286,6 @@ github.com/stretchr/testify v1.2.2/go.mod h1:a8OnRcib4nhh0OaRAV+Yts87kKdq0PP7pXf github.com/stretchr/testify v1.3.0/go.mod h1:M5WIy9Dh21IEIfnGCwXGc5bZfKNJtfHm1UVUgZn+9EI= github.com/stretchr/testify v1.4.0/go.mod h1:j7eGeouHqKxXV5pUuKE4zz7dFj8WfuZ+81PSLYec5m4= github.com/stretchr/testify v1.5.1/go.mod h1:5W2xD1RspED5o8YsWQXVCued0rvSQ+mT+I5cxcmMvtA= -github.com/stretchr/testify v1.6.1/go.mod h1:6Fq8oRcR53rry900zMqJjRRixrwX3KX962/h/Wwjteg= github.com/stretchr/testify v1.7.0/go.mod h1:6Fq8oRcR53rry900zMqJjRRixrwX3KX962/h/Wwjteg= github.com/stretchr/testify v1.7.1/go.mod h1:6Fq8oRcR53rry900zMqJjRRixrwX3KX962/h/Wwjteg= github.com/stretchr/testify v1.8.0/go.mod h1:yNjHg4UonilssWZ8iaSj1OCr/vHnekPRkoO+kdMU+MU= @@ -298,15 +297,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.opencensus.io v0.23.0 h1:gqCw0LfLxScz8irSi8exQc7fyQ0fKQU/qnC/X8+V/1M= -go.opencensus.io v0.23.0/go.mod h1:XItmlyltB5F7CS4xOC1DcqMoFqwtC6OG2xF7mCv7P7E= -go.opentelemetry.io/collector v0.63.2-0.20221104003159-6b27644724d8 h1:rOT5HzXXfSISc6FiH012zH2/EFjp37UXfjEqj5BpkWQ= -go.opentelemetry.io/collector v0.63.2-0.20221104003159-6b27644724d8/go.mod h1:JVmeZXugK4ondC6KQgrHTHWiF4JttpG5k6dWPMt62+k= -go.opentelemetry.io/collector/exporter/otlphttpexporter v0.63.2-0.20221104003159-6b27644724d8 h1:iKgw0o6MV+NaVafXaE4JcZRWDjboqLrcsY6hZyy6ns8= -go.opentelemetry.io/collector/exporter/otlphttpexporter v0.63.2-0.20221104003159-6b27644724d8/go.mod h1:ejN1zRqJtIoKnOYdx31LXVDpQ7TsSvVbUx50eQVCVcA= -go.opentelemetry.io/collector/pdata v0.63.2-0.20221104003159-6b27644724d8 h1:7xeTQjfsOm9eogQeIxjSEhlik9qsbBGsnmkQHfyKaRE= -go.opentelemetry.io/collector/pdata v0.63.2-0.20221104003159-6b27644724d8/go.mod h1:IzvXUGQml2mrnvdb8zIlEW3qQs9oFLdD2hLwJdZ+pek= -go.opentelemetry.io/collector/receiver/otlpreceiver v0.0.0-20221101161158-df8deb48186b h1:no9i2NWBheMrzP0uNdOgmPkp4nGsb/bUCEDwFDwMlfQ= +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.63.2-0.20221108014805-0b08d5316426 h1:z/wLTMh7/vNxcFUDa5uG7/IPE3tYx6pzCWPV41ghyV8= +go.opentelemetry.io/collector v0.63.2-0.20221108014805-0b08d5316426/go.mod h1:+Zb70q0Rq17dA9FcHTiTjW6g96lvJ8kAZ0c+eWNkAv0= +go.opentelemetry.io/collector/exporter/otlphttpexporter v0.63.2-0.20221108014805-0b08d5316426 h1:1xUhrje+DsP7lj6Oiesd6BpsZYMjNg2Ua3GMIaX9OHo= +go.opentelemetry.io/collector/exporter/otlphttpexporter v0.63.2-0.20221108014805-0b08d5316426/go.mod h1:/r5XMUNlCvz1o6q9WQB2OhiAmUPRiXJSFsCURTBNA2Y= +go.opentelemetry.io/collector/pdata v0.63.2-0.20221108014805-0b08d5316426 h1:wKDpgP0Tx/gWI2SgDGAY1OTSeihhDivbbRqFR79IGTc= +go.opentelemetry.io/collector/pdata v0.63.2-0.20221108014805-0b08d5316426/go.mod h1:IzvXUGQml2mrnvdb8zIlEW3qQs9oFLdD2hLwJdZ+pek= +go.opentelemetry.io/collector/receiver/otlpreceiver v0.0.0-20221108014805-0b08d5316426 h1:6cosCaS91068I8El0q8TJkv3V5lRzAfH2Wuja/5ydIo= 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.go b/exporter/fileexporter/config.go index 6c9e093d29ea..b2642c5ab912 100644 --- a/exporter/fileexporter/config.go +++ b/exporter/fileexporter/config.go @@ -17,6 +17,7 @@ package fileexporter // import "github.com/open-telemetry/opentelemetry-collecto import ( "errors" + "go.opentelemetry.io/collector/component" "go.opentelemetry.io/collector/config" "go.opentelemetry.io/collector/confmap" ) @@ -70,7 +71,7 @@ type Rotation struct { LocalTime bool `mapstructure:"localtime"` } -var _ config.Exporter = (*Config)(nil) +var _ component.ExporterConfig = (*Config)(nil) // Validate checks if the exporter configuration is valid func (cfg *Config) Validate() error { diff --git a/exporter/fileexporter/config_test.go b/exporter/fileexporter/config_test.go index 72f0b034dfeb..1880ec750aa0 100644 --- a/exporter/fileexporter/config_test.go +++ b/exporter/fileexporter/config_test.go @@ -20,6 +20,7 @@ import ( "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" + "go.opentelemetry.io/collector/component" "go.opentelemetry.io/collector/config" "go.opentelemetry.io/collector/confmap/confmaptest" ) @@ -31,14 +32,14 @@ func TestLoadConfig(t *testing.T) { require.NoError(t, err) tests := []struct { - id config.ComponentID - expected config.Exporter + id component.ID + expected component.ExporterConfig errorMessage string }{ { - id: config.NewComponentIDWithName(typeStr, "2"), + id: component.NewIDWithName(typeStr, "2"), expected: &Config{ - ExporterSettings: config.NewExporterSettings(config.NewComponentID(typeStr)), + ExporterSettings: config.NewExporterSettings(component.NewID(typeStr)), Path: "./filename.json", Rotation: &Rotation{ MaxMegabytes: 10, @@ -50,9 +51,9 @@ func TestLoadConfig(t *testing.T) { }, }, { - id: config.NewComponentIDWithName(typeStr, "3"), + id: component.NewIDWithName(typeStr, "3"), expected: &Config{ - ExporterSettings: config.NewExporterSettings(config.NewComponentID(typeStr)), + ExporterSettings: config.NewExporterSettings(component.NewID(typeStr)), Path: "./filename", Rotation: &Rotation{ MaxMegabytes: 10, @@ -65,9 +66,9 @@ func TestLoadConfig(t *testing.T) { }, }, { - id: config.NewComponentIDWithName(typeStr, "rotation_with_default_settings"), + id: component.NewIDWithName(typeStr, "rotation_with_default_settings"), expected: &Config{ - ExporterSettings: config.NewExporterSettings(config.NewComponentID(typeStr)), + ExporterSettings: config.NewExporterSettings(component.NewID(typeStr)), Path: "./foo", FormatType: formatTypeJSON, Rotation: &Rotation{ @@ -76,9 +77,9 @@ func TestLoadConfig(t *testing.T) { }, }, { - id: config.NewComponentIDWithName(typeStr, "rotation_with_custom_settings"), + id: component.NewIDWithName(typeStr, "rotation_with_custom_settings"), expected: &Config{ - ExporterSettings: config.NewExporterSettings(config.NewComponentID(typeStr)), + ExporterSettings: config.NewExporterSettings(component.NewID(typeStr)), Path: "./foo", Rotation: &Rotation{ MaxMegabytes: 1234, @@ -88,15 +89,15 @@ func TestLoadConfig(t *testing.T) { }, }, { - id: config.NewComponentIDWithName(typeStr, "compression_error"), + id: component.NewIDWithName(typeStr, "compression_error"), errorMessage: "compression is not supported", }, { - id: config.NewComponentIDWithName(typeStr, "format_error"), + id: component.NewIDWithName(typeStr, "format_error"), errorMessage: "format type is not supported", }, { - id: config.NewComponentIDWithName(typeStr, ""), + id: component.NewIDWithName(typeStr, ""), errorMessage: "path must be non-empty", }, } @@ -108,7 +109,7 @@ func TestLoadConfig(t *testing.T) { sub, err := cm.Sub(tt.id.String()) require.NoError(t, err) - require.NoError(t, config.UnmarshalExporter(sub, cfg)) + require.NoError(t, component.UnmarshalExporterConfig(sub, cfg)) if tt.expected == nil { assert.EqualError(t, cfg.Validate(), tt.errorMessage) diff --git a/exporter/fileexporter/factory.go b/exporter/fileexporter/factory.go index 352805da0e93..3807305ee227 100644 --- a/exporter/fileexporter/factory.go +++ b/exporter/fileexporter/factory.go @@ -54,9 +54,9 @@ func NewFactory() component.ExporterFactory { component.WithLogsExporter(createLogsExporter, stability)) } -func createDefaultConfig() config.Exporter { +func createDefaultConfig() component.ExporterConfig { return &Config{ - ExporterSettings: config.NewExporterSettings(config.NewComponentID(typeStr)), + ExporterSettings: config.NewExporterSettings(component.NewID(typeStr)), FormatType: formatTypeJSON, Rotation: &Rotation{MaxBackups: defaultMaxBackups}, } @@ -65,7 +65,7 @@ func createDefaultConfig() config.Exporter { func createTracesExporter( ctx context.Context, set component.ExporterCreateSettings, - cfg config.Exporter, + cfg component.ExporterConfig, ) (component.TracesExporter, error) { conf := cfg.(*Config) writer, err := buildFileWriter(conf) @@ -96,7 +96,7 @@ func createTracesExporter( func createMetricsExporter( ctx context.Context, set component.ExporterCreateSettings, - cfg config.Exporter, + cfg component.ExporterConfig, ) (component.MetricsExporter, error) { conf := cfg.(*Config) writer, err := buildFileWriter(conf) @@ -127,7 +127,7 @@ func createMetricsExporter( func createLogsExporter( ctx context.Context, set component.ExporterCreateSettings, - cfg config.Exporter, + cfg component.ExporterConfig, ) (component.LogsExporter, error) { conf := cfg.(*Config) writer, err := buildFileWriter(conf) diff --git a/exporter/fileexporter/factory_test.go b/exporter/fileexporter/factory_test.go index 3b775afac788..d45b429544b7 100644 --- a/exporter/fileexporter/factory_test.go +++ b/exporter/fileexporter/factory_test.go @@ -22,21 +22,21 @@ import ( "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" + "go.opentelemetry.io/collector/component" "go.opentelemetry.io/collector/component/componenttest" "go.opentelemetry.io/collector/config" - "go.opentelemetry.io/collector/config/configtest" "gopkg.in/natefinch/lumberjack.v2" ) func TestCreateDefaultConfig(t *testing.T) { cfg := createDefaultConfig() assert.NotNil(t, cfg, "failed to create default config") - assert.NoError(t, configtest.CheckConfigStruct(cfg)) + assert.NoError(t, componenttest.CheckConfigStruct(cfg)) } func TestCreateMetricsExporterError(t *testing.T) { cfg := &Config{ - ExporterSettings: config.NewExporterSettings(config.NewComponentID(typeStr)), + ExporterSettings: config.NewExporterSettings(component.NewID(typeStr)), FormatType: formatTypeJSON, } _, err := createMetricsExporter( @@ -48,7 +48,7 @@ func TestCreateMetricsExporterError(t *testing.T) { func TestCreateMetricsExporter(t *testing.T) { cfg := &Config{ - ExporterSettings: config.NewExporterSettings(config.NewComponentID(typeStr)), + ExporterSettings: config.NewExporterSettings(component.NewID(typeStr)), FormatType: formatTypeJSON, Path: tempFileName(t), } @@ -62,7 +62,7 @@ func TestCreateMetricsExporter(t *testing.T) { func TestCreateTracesExporter(t *testing.T) { cfg := &Config{ - ExporterSettings: config.NewExporterSettings(config.NewComponentID(typeStr)), + ExporterSettings: config.NewExporterSettings(component.NewID(typeStr)), FormatType: formatTypeJSON, Path: tempFileName(t), } @@ -76,7 +76,7 @@ func TestCreateTracesExporter(t *testing.T) { func TestCreateTracesExporterError(t *testing.T) { cfg := &Config{ - ExporterSettings: config.NewExporterSettings(config.NewComponentID(typeStr)), + ExporterSettings: config.NewExporterSettings(component.NewID(typeStr)), FormatType: formatTypeJSON, } _, err := createTracesExporter( @@ -88,7 +88,7 @@ func TestCreateTracesExporterError(t *testing.T) { func TestCreateLogsExporter(t *testing.T) { cfg := &Config{ - ExporterSettings: config.NewExporterSettings(config.NewComponentID(typeStr)), + ExporterSettings: config.NewExporterSettings(component.NewID(typeStr)), FormatType: formatTypeJSON, Path: tempFileName(t), } @@ -102,7 +102,7 @@ func TestCreateLogsExporter(t *testing.T) { func TestCreateLogsExporterError(t *testing.T) { cfg := &Config{ - ExporterSettings: config.NewExporterSettings(config.NewComponentID(typeStr)), + ExporterSettings: config.NewExporterSettings(component.NewID(typeStr)), FormatType: formatTypeJSON, } _, err := createLogsExporter( diff --git a/exporter/fileexporter/go.mod b/exporter/fileexporter/go.mod index 0e4475503139..c725d4ff328c 100644 --- a/exporter/fileexporter/go.mod +++ b/exporter/fileexporter/go.mod @@ -7,8 +7,8 @@ require ( github.com/open-telemetry/opentelemetry-collector-contrib/internal/coreinternal v0.63.0 github.com/open-telemetry/opentelemetry-collector-contrib/internal/sharedcomponent v0.63.0 github.com/stretchr/testify v1.8.1 - go.opentelemetry.io/collector v0.63.2-0.20221104003159-6b27644724d8 - go.opentelemetry.io/collector/pdata v0.63.2-0.20221104003159-6b27644724d8 + go.opentelemetry.io/collector v0.63.2-0.20221108014805-0b08d5316426 + go.opentelemetry.io/collector/pdata v0.63.2-0.20221108014805-0b08d5316426 gopkg.in/natefinch/lumberjack.v2 v2.0.0 ) @@ -26,7 +26,7 @@ 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.opencensus.io v0.23.0 // indirect + go.opencensus.io v0.24.0 // 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 19b1f793d812..bac9a0397d8d 100644 --- a/exporter/fileexporter/go.sum +++ b/exporter/fileexporter/go.sum @@ -227,7 +227,7 @@ github.com/prometheus/client_golang v0.9.1/go.mod h1:7SWBe2y4D6OKWSNQJUaRYU/AaXP github.com/prometheus/client_golang v1.0.0/go.mod h1:db9x61etRT2tGnBNRi70OPL5FsnadC4Ky3P0J6CfImo= github.com/prometheus/client_golang v1.7.1/go.mod h1:PY5Wy2awLA44sXw4AOSfFBetzPP4j5+D6mVACh+pe2M= github.com/prometheus/client_golang v1.11.1/go.mod h1:Z6t4BnS23TR94PD6BsDNk8yVqroYurpAkEiz0P2BEV0= -github.com/prometheus/client_golang v1.13.0 h1:b71QUfeo5M8gq2+evJdTPfZhYMAU0uKPkyPJ7TPsloU= +github.com/prometheus/client_golang v1.13.1 h1:3gMjIY2+/hzmqhtUC/aQNYldJA6DtH3CgQvwS+02K1c= github.com/prometheus/client_model v0.0.0-20180712105110-5c3871d89910/go.mod h1:MbSGuTsp3dbXC40dX6PRTWyKYBIrTGTE9sqQNg2J8bo= github.com/prometheus/client_model v0.0.0-20190129233127-fd36f4220a90/go.mod h1:xMI15A0UPsDsEKsMN9yxemIoYk6Tm2C1GtYGdfGttqA= github.com/prometheus/client_model v0.0.0-20190812154241-14fe0d1b01d4/go.mod h1:xMI15A0UPsDsEKsMN9yxemIoYk6Tm2C1GtYGdfGttqA= @@ -264,7 +264,6 @@ github.com/stretchr/testify v1.2.2/go.mod h1:a8OnRcib4nhh0OaRAV+Yts87kKdq0PP7pXf github.com/stretchr/testify v1.3.0/go.mod h1:M5WIy9Dh21IEIfnGCwXGc5bZfKNJtfHm1UVUgZn+9EI= github.com/stretchr/testify v1.4.0/go.mod h1:j7eGeouHqKxXV5pUuKE4zz7dFj8WfuZ+81PSLYec5m4= github.com/stretchr/testify v1.5.1/go.mod h1:5W2xD1RspED5o8YsWQXVCued0rvSQ+mT+I5cxcmMvtA= -github.com/stretchr/testify v1.6.1/go.mod h1:6Fq8oRcR53rry900zMqJjRRixrwX3KX962/h/Wwjteg= github.com/stretchr/testify v1.7.0/go.mod h1:6Fq8oRcR53rry900zMqJjRRixrwX3KX962/h/Wwjteg= github.com/stretchr/testify v1.7.1/go.mod h1:6Fq8oRcR53rry900zMqJjRRixrwX3KX962/h/Wwjteg= github.com/stretchr/testify v1.8.0/go.mod h1:yNjHg4UonilssWZ8iaSj1OCr/vHnekPRkoO+kdMU+MU= @@ -276,12 +275,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.opencensus.io v0.23.0 h1:gqCw0LfLxScz8irSi8exQc7fyQ0fKQU/qnC/X8+V/1M= -go.opencensus.io v0.23.0/go.mod h1:XItmlyltB5F7CS4xOC1DcqMoFqwtC6OG2xF7mCv7P7E= -go.opentelemetry.io/collector v0.63.2-0.20221104003159-6b27644724d8 h1:rOT5HzXXfSISc6FiH012zH2/EFjp37UXfjEqj5BpkWQ= -go.opentelemetry.io/collector v0.63.2-0.20221104003159-6b27644724d8/go.mod h1:JVmeZXugK4ondC6KQgrHTHWiF4JttpG5k6dWPMt62+k= -go.opentelemetry.io/collector/pdata v0.63.2-0.20221104003159-6b27644724d8 h1:7xeTQjfsOm9eogQeIxjSEhlik9qsbBGsnmkQHfyKaRE= -go.opentelemetry.io/collector/pdata v0.63.2-0.20221104003159-6b27644724d8/go.mod h1:IzvXUGQml2mrnvdb8zIlEW3qQs9oFLdD2hLwJdZ+pek= +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.63.2-0.20221108014805-0b08d5316426 h1:z/wLTMh7/vNxcFUDa5uG7/IPE3tYx6pzCWPV41ghyV8= +go.opentelemetry.io/collector v0.63.2-0.20221108014805-0b08d5316426/go.mod h1:+Zb70q0Rq17dA9FcHTiTjW6g96lvJ8kAZ0c+eWNkAv0= +go.opentelemetry.io/collector/pdata v0.63.2-0.20221108014805-0b08d5316426 h1:wKDpgP0Tx/gWI2SgDGAY1OTSeihhDivbbRqFR79IGTc= +go.opentelemetry.io/collector/pdata v0.63.2-0.20221108014805-0b08d5316426/go.mod h1:IzvXUGQml2mrnvdb8zIlEW3qQs9oFLdD2hLwJdZ+pek= 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_test.go b/exporter/googlecloudexporter/config_test.go index 07dd9f45053b..6850cb0a6db7 100644 --- a/exporter/googlecloudexporter/config_test.go +++ b/exporter/googlecloudexporter/config_test.go @@ -22,6 +22,7 @@ import ( "github.com/GoogleCloudPlatform/opentelemetry-operations-go/exporter/collector" "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" + "go.opentelemetry.io/collector/component" "go.opentelemetry.io/collector/config" "go.opentelemetry.io/collector/confmap/confmaptest" "go.opentelemetry.io/collector/exporter/exporterhelper" @@ -45,19 +46,19 @@ func TestLoadConfig(t *testing.T) { factory := NewFactory() cfg := factory.CreateDefaultConfig() - sub, err := cm.Sub(config.NewComponentIDWithName(typeStr, "").String()) + sub, err := cm.Sub(component.NewIDWithName(typeStr, "").String()) require.NoError(t, err) - require.NoError(t, config.UnmarshalExporter(sub, cfg)) + require.NoError(t, component.UnmarshalExporterConfig(sub, cfg)) assert.Equal(t, sanitize(cfg.(*Config)), sanitize(factory.CreateDefaultConfig().(*Config))) - sub, err = cm.Sub(config.NewComponentIDWithName(typeStr, "customname").String()) + sub, err = cm.Sub(component.NewIDWithName(typeStr, "customname").String()) require.NoError(t, err) - require.NoError(t, config.UnmarshalExporter(sub, cfg)) + require.NoError(t, component.UnmarshalExporterConfig(sub, cfg)) assert.Equal(t, sanitize(cfg.(*Config)), &Config{ - ExporterSettings: config.NewExporterSettings(config.NewComponentID(typeStr)), + ExporterSettings: config.NewExporterSettings(component.NewID(typeStr)), TimeoutSettings: exporterhelper.TimeoutSettings{ Timeout: 20 * time.Second, }, diff --git a/exporter/googlecloudexporter/factory.go b/exporter/googlecloudexporter/factory.go index 99e09e70a3a2..19ed38f76849 100644 --- a/exporter/googlecloudexporter/factory.go +++ b/exporter/googlecloudexporter/factory.go @@ -54,10 +54,10 @@ func NewFactory() component.ExporterFactory { } // createDefaultConfig creates the default configuration for exporter. -func createDefaultConfig() config.Exporter { +func createDefaultConfig() component.ExporterConfig { if !featuregate.GetRegistry().IsEnabled(pdataExporterFeatureGate) { return &LegacyConfig{ - ExporterSettings: config.NewExporterSettings(config.NewComponentID(typeStr)), + ExporterSettings: config.NewExporterSettings(component.NewID(typeStr)), TimeoutSettings: exporterhelper.TimeoutSettings{Timeout: defaultTimeout}, RetrySettings: exporterhelper.NewDefaultRetrySettings(), QueueSettings: exporterhelper.NewDefaultQueueSettings(), @@ -65,7 +65,7 @@ func createDefaultConfig() config.Exporter { } } return &Config{ - ExporterSettings: config.NewExporterSettings(config.NewComponentID(typeStr)), + ExporterSettings: config.NewExporterSettings(component.NewID(typeStr)), TimeoutSettings: exporterhelper.TimeoutSettings{Timeout: defaultTimeout}, RetrySettings: exporterhelper.NewDefaultRetrySettings(), QueueSettings: exporterhelper.NewDefaultQueueSettings(), @@ -76,7 +76,7 @@ func createDefaultConfig() config.Exporter { func createLogsExporter( ctx context.Context, params component.ExporterCreateSettings, - cfg config.Exporter) (component.LogsExporter, error) { + cfg component.ExporterConfig) (component.LogsExporter, error) { var eCfg *Config if !featuregate.GetRegistry().IsEnabled(pdataExporterFeatureGate) { eCfg = toNewConfig(cfg.(*LegacyConfig)) @@ -104,7 +104,7 @@ func createLogsExporter( func createTracesExporter( ctx context.Context, params component.ExporterCreateSettings, - cfg config.Exporter) (component.TracesExporter, error) { + cfg component.ExporterConfig) (component.TracesExporter, error) { var eCfg *Config if !featuregate.GetRegistry().IsEnabled(pdataExporterFeatureGate) { eCfg = toNewConfig(cfg.(*LegacyConfig)) @@ -132,7 +132,7 @@ func createTracesExporter( func createMetricsExporter( ctx context.Context, params component.ExporterCreateSettings, - cfg config.Exporter) (component.MetricsExporter, error) { + cfg component.ExporterConfig) (component.MetricsExporter, error) { if !featuregate.GetRegistry().IsEnabled(pdataExporterFeatureGate) { eCfg := cfg.(*LegacyConfig) return newLegacyGoogleCloudMetricsExporter(eCfg, params) diff --git a/exporter/googlecloudexporter/factory_test.go b/exporter/googlecloudexporter/factory_test.go index 62c164f4bbd4..46fd82287b1a 100644 --- a/exporter/googlecloudexporter/factory_test.go +++ b/exporter/googlecloudexporter/factory_test.go @@ -21,14 +21,13 @@ import ( "github.com/stretchr/testify/assert" "go.opentelemetry.io/collector/component/componenttest" - "go.opentelemetry.io/collector/config/configtest" ) func TestCreateDefaultConfig(t *testing.T) { factory := NewFactory() cfg := factory.CreateDefaultConfig() assert.NotNil(t, cfg, "failed to create default config") - assert.NoError(t, configtest.CheckConfigStruct(cfg)) + assert.NoError(t, componenttest.CheckConfigStruct(cfg)) } func TestCreateExporter(t *testing.T) { diff --git a/exporter/googlecloudexporter/go.mod b/exporter/googlecloudexporter/go.mod index 196b79a39986..6b1a4e38c01e 100644 --- a/exporter/googlecloudexporter/go.mod +++ b/exporter/googlecloudexporter/go.mod @@ -9,10 +9,10 @@ require ( github.com/open-telemetry/opentelemetry-collector-contrib/internal/coreinternal v0.63.0 github.com/open-telemetry/opentelemetry-collector-contrib/pkg/translator/opencensus v0.63.0 github.com/stretchr/testify v1.8.1 - go.opencensus.io v0.23.0 - go.opentelemetry.io/collector v0.63.2-0.20221104003159-6b27644724d8 - go.opentelemetry.io/collector/pdata v0.63.2-0.20221104003159-6b27644724d8 - go.opentelemetry.io/collector/semconv v0.63.2-0.20221104003159-6b27644724d8 + go.opencensus.io v0.24.0 + go.opentelemetry.io/collector v0.63.2-0.20221108014805-0b08d5316426 + go.opentelemetry.io/collector/pdata v0.63.2-0.20221108014805-0b08d5316426 + go.opentelemetry.io/collector/semconv v0.63.2-0.20221108014805-0b08d5316426 google.golang.org/api v0.102.0 google.golang.org/genproto v0.0.0-20221024183307-1bc688fe9f3e google.golang.org/grpc v1.50.1 @@ -60,7 +60,7 @@ require ( github.com/modern-go/reflect2 v1.0.2 // indirect github.com/pmezard/go-difflib v1.0.0 // indirect github.com/power-devops/perfstat v0.0.0-20210106213030-5aafc221ea8c // indirect - github.com/prometheus/client_golang v1.13.0 // indirect + github.com/prometheus/client_golang v1.13.1 // indirect github.com/prometheus/client_model v0.3.0 // indirect github.com/prometheus/common v0.37.0 // indirect github.com/prometheus/procfs v0.8.0 // indirect diff --git a/exporter/googlecloudexporter/go.sum b/exporter/googlecloudexporter/go.sum index 7a590e0e6600..86e4aff4a6af 100644 --- a/exporter/googlecloudexporter/go.sum +++ b/exporter/googlecloudexporter/go.sum @@ -399,8 +399,9 @@ github.com/prometheus/client_golang v1.11.0/go.mod h1:Z6t4BnS23TR94PD6BsDNk8yVqr github.com/prometheus/client_golang v1.11.1/go.mod h1:Z6t4BnS23TR94PD6BsDNk8yVqroYurpAkEiz0P2BEV0= github.com/prometheus/client_golang v1.12.1/go.mod h1:3Z9XVyYiZYEO+YQWt3RD2R3jrbd179Rt297l4aS6nDY= github.com/prometheus/client_golang v1.12.2/go.mod h1:3Z9XVyYiZYEO+YQWt3RD2R3jrbd179Rt297l4aS6nDY= -github.com/prometheus/client_golang v1.13.0 h1:b71QUfeo5M8gq2+evJdTPfZhYMAU0uKPkyPJ7TPsloU= github.com/prometheus/client_golang v1.13.0/go.mod h1:vTeo+zgvILHsnnj/39Ou/1fPN5nJFOEMgftOUOmlvYQ= +github.com/prometheus/client_golang v1.13.1 h1:3gMjIY2+/hzmqhtUC/aQNYldJA6DtH3CgQvwS+02K1c= +github.com/prometheus/client_golang v1.13.1/go.mod h1:vTeo+zgvILHsnnj/39Ou/1fPN5nJFOEMgftOUOmlvYQ= github.com/prometheus/client_model v0.0.0-20180712105110-5c3871d89910/go.mod h1:MbSGuTsp3dbXC40dX6PRTWyKYBIrTGTE9sqQNg2J8bo= github.com/prometheus/client_model v0.0.0-20190129233127-fd36f4220a90/go.mod h1:xMI15A0UPsDsEKsMN9yxemIoYk6Tm2C1GtYGdfGttqA= github.com/prometheus/client_model v0.0.0-20190812154241-14fe0d1b01d4/go.mod h1:xMI15A0UPsDsEKsMN9yxemIoYk6Tm2C1GtYGdfGttqA= @@ -480,17 +481,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.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 h1:gqCw0LfLxScz8irSi8exQc7fyQ0fKQU/qnC/X8+V/1M= go.opencensus.io v0.23.0/go.mod h1:XItmlyltB5F7CS4xOC1DcqMoFqwtC6OG2xF7mCv7P7E= -go.opentelemetry.io/collector v0.63.2-0.20221104003159-6b27644724d8 h1:rOT5HzXXfSISc6FiH012zH2/EFjp37UXfjEqj5BpkWQ= -go.opentelemetry.io/collector v0.63.2-0.20221104003159-6b27644724d8/go.mod h1:JVmeZXugK4ondC6KQgrHTHWiF4JttpG5k6dWPMt62+k= +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.63.2-0.20221108014805-0b08d5316426 h1:z/wLTMh7/vNxcFUDa5uG7/IPE3tYx6pzCWPV41ghyV8= +go.opentelemetry.io/collector v0.63.2-0.20221108014805-0b08d5316426/go.mod h1:+Zb70q0Rq17dA9FcHTiTjW6g96lvJ8kAZ0c+eWNkAv0= go.opentelemetry.io/collector/extension/zpagesextension v0.0.0-20221102221454-bfc45c16c979 h1:YW7BL8ftoJ7k+EtnMICw1KWASLuSDIhbF7SjjgWMCl4= -go.opentelemetry.io/collector/pdata v0.63.2-0.20221104003159-6b27644724d8 h1:7xeTQjfsOm9eogQeIxjSEhlik9qsbBGsnmkQHfyKaRE= -go.opentelemetry.io/collector/pdata v0.63.2-0.20221104003159-6b27644724d8/go.mod h1:IzvXUGQml2mrnvdb8zIlEW3qQs9oFLdD2hLwJdZ+pek= +go.opentelemetry.io/collector/pdata v0.63.2-0.20221108014805-0b08d5316426 h1:wKDpgP0Tx/gWI2SgDGAY1OTSeihhDivbbRqFR79IGTc= +go.opentelemetry.io/collector/pdata v0.63.2-0.20221108014805-0b08d5316426/go.mod h1:IzvXUGQml2mrnvdb8zIlEW3qQs9oFLdD2hLwJdZ+pek= go.opentelemetry.io/collector/processor/batchprocessor v0.0.0-20221103161931-a167b006e8c0 h1:MybyhzAzHIb85NOg5yHQixODm6fq6kJnOTl6xb7GxFc= go.opentelemetry.io/collector/processor/batchprocessor v0.0.0-20221103161931-a167b006e8c0/go.mod h1:WBv1Nayi8p12K0vxLxTkHpRGr79JXYT3TXL2X0B/PRU= -go.opentelemetry.io/collector/semconv v0.63.2-0.20221104003159-6b27644724d8 h1:jm0sNPyqo6S165QjQYMBHB2nK50wlJbMYM03Yr3Eo2k= -go.opentelemetry.io/collector/semconv v0.63.2-0.20221104003159-6b27644724d8/go.mod h1:5o9yhOa+ABt7g2E5JABDxGZ1PQPbtfxrKNbYn+LOTXU= +go.opentelemetry.io/collector/semconv v0.63.2-0.20221108014805-0b08d5316426 h1:pqIl7OC531J6i9ttBCj3zLmZI/BSF4q323YpK0GgKGk= +go.opentelemetry.io/collector/semconv v0.63.2-0.20221108014805-0b08d5316426/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/googlecloudexporter/legacyconfig_test.go b/exporter/googlecloudexporter/legacyconfig_test.go index 37aa4842deb2..524efcfc4586 100644 --- a/exporter/googlecloudexporter/legacyconfig_test.go +++ b/exporter/googlecloudexporter/legacyconfig_test.go @@ -20,6 +20,7 @@ import ( "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" + "go.opentelemetry.io/collector/component" "go.opentelemetry.io/collector/component/componenttest" "go.opentelemetry.io/collector/config" "go.opentelemetry.io/collector/exporter/exporterhelper" @@ -36,12 +37,12 @@ func TestLoadLegacyConfig(t *testing.T) { require.NoError(t, err) require.NotNil(t, cfg) assert.Equal(t, len(cfg.Exporters), 2) - r0 := cfg.Exporters[config.NewComponentID(typeStr)] + r0 := cfg.Exporters[component.NewID(typeStr)] assert.Equal(t, r0, factory.CreateDefaultConfig()) - r1 := cfg.Exporters[config.NewComponentIDWithName(typeStr, "customname")].(*LegacyConfig) + r1 := cfg.Exporters[component.NewIDWithName(typeStr, "customname")].(*LegacyConfig) assert.Equal(t, r1, &LegacyConfig{ - ExporterSettings: config.NewExporterSettings(config.NewComponentIDWithName(typeStr, "customname")), + ExporterSettings: config.NewExporterSettings(component.NewIDWithName(typeStr, "customname")), ProjectID: "my-project", UserAgent: "opentelemetry-collector-contrib {{version}}", Endpoint: "test-endpoint", diff --git a/exporter/googlecloudexporter/legacymetrics_test.go b/exporter/googlecloudexporter/legacymetrics_test.go index b53cd775c829..18e2fa6a70ff 100644 --- a/exporter/googlecloudexporter/legacymetrics_test.go +++ b/exporter/googlecloudexporter/legacymetrics_test.go @@ -101,7 +101,7 @@ func TestGoogleCloudMetricExport(t *testing.T) { } sde, err := newLegacyGoogleCloudMetricsExporter(&LegacyConfig{ - ExporterSettings: config.NewExporterSettings(config.NewComponentID(typeStr)), + ExporterSettings: config.NewExporterSettings(component.NewID(typeStr)), ProjectID: "idk", Endpoint: "127.0.0.1:8080", UserAgent: "MyAgent {{version}}", diff --git a/exporter/googlecloudpubsubexporter/config_test.go b/exporter/googlecloudpubsubexporter/config_test.go index ae00fbec3294..4cd5e3271ef5 100644 --- a/exporter/googlecloudpubsubexporter/config_test.go +++ b/exporter/googlecloudpubsubexporter/config_test.go @@ -21,7 +21,7 @@ import ( "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" - "go.opentelemetry.io/collector/config" + "go.opentelemetry.io/collector/component" "go.opentelemetry.io/collector/confmap/confmaptest" "go.opentelemetry.io/collector/exporter/exporterhelper" ) @@ -32,16 +32,16 @@ func TestLoadConfig(t *testing.T) { factory := NewFactory() cfg := factory.CreateDefaultConfig() - sub, err := cm.Sub(config.NewComponentIDWithName(typeStr, "").String()) + sub, err := cm.Sub(component.NewIDWithName(typeStr, "").String()) require.NoError(t, err) - require.NoError(t, config.UnmarshalExporter(sub, cfg)) + require.NoError(t, component.UnmarshalExporterConfig(sub, cfg)) defaultConfig := factory.CreateDefaultConfig().(*Config) assert.Equal(t, cfg, defaultConfig) - sub, err = cm.Sub(config.NewComponentIDWithName(typeStr, "customname").String()) + sub, err = cm.Sub(component.NewIDWithName(typeStr, "customname").String()) require.NoError(t, err) - require.NoError(t, config.UnmarshalExporter(sub, cfg)) + require.NoError(t, component.UnmarshalExporterConfig(sub, cfg)) customConfig := factory.CreateDefaultConfig().(*Config) diff --git a/exporter/googlecloudpubsubexporter/factory.go b/exporter/googlecloudpubsubexporter/factory.go index 9e5d24512217..8c891ea77ce3 100644 --- a/exporter/googlecloudpubsubexporter/factory.go +++ b/exporter/googlecloudpubsubexporter/factory.go @@ -81,9 +81,9 @@ func ensureExporter(params component.ExporterCreateSettings, pCfg *Config) *pubs } // createDefaultConfig creates the default configuration for exporter. -func createDefaultConfig() config.Exporter { +func createDefaultConfig() component.ExporterConfig { return &Config{ - ExporterSettings: config.NewExporterSettings(config.NewComponentID(typeStr)), + ExporterSettings: config.NewExporterSettings(component.NewID(typeStr)), UserAgent: "opentelemetry-collector-contrib {{version}}", TimeoutSettings: exporterhelper.TimeoutSettings{Timeout: defaultTimeout}, Watermark: WatermarkConfig{ @@ -96,7 +96,7 @@ func createDefaultConfig() config.Exporter { func createTracesExporter( ctx context.Context, set component.ExporterCreateSettings, - cfg config.Exporter) (component.TracesExporter, error) { + cfg component.ExporterConfig) (component.TracesExporter, error) { pCfg := cfg.(*Config) pubsubExporter := ensureExporter(set, pCfg) @@ -118,7 +118,7 @@ func createTracesExporter( func createMetricsExporter( ctx context.Context, set component.ExporterCreateSettings, - cfg config.Exporter) (component.MetricsExporter, error) { + cfg component.ExporterConfig) (component.MetricsExporter, error) { pCfg := cfg.(*Config) pubsubExporter := ensureExporter(set, pCfg) @@ -139,7 +139,7 @@ func createMetricsExporter( func createLogsExporter( ctx context.Context, set component.ExporterCreateSettings, - cfg config.Exporter) (component.LogsExporter, error) { + cfg component.ExporterConfig) (component.LogsExporter, error) { pCfg := cfg.(*Config) pubsubExporter := ensureExporter(set, pCfg) diff --git a/exporter/googlecloudpubsubexporter/factory_test.go b/exporter/googlecloudpubsubexporter/factory_test.go index a059856a0477..028f7d22f745 100644 --- a/exporter/googlecloudpubsubexporter/factory_test.go +++ b/exporter/googlecloudpubsubexporter/factory_test.go @@ -19,21 +19,20 @@ import ( "testing" "github.com/stretchr/testify/assert" + "go.opentelemetry.io/collector/component" "go.opentelemetry.io/collector/component/componenttest" - "go.opentelemetry.io/collector/config" - "go.opentelemetry.io/collector/config/configtest" ) func TestCreateDefaultConfig(t *testing.T) { factory := NewFactory() cfg := factory.CreateDefaultConfig() assert.NotNil(t, cfg, "failed to create default config") - assert.NoError(t, configtest.CheckConfigStruct(cfg)) + assert.NoError(t, componenttest.CheckConfigStruct(cfg)) } func TestType(t *testing.T) { factory := NewFactory() - assert.Equal(t, config.Type(typeStr), factory.Type()) + assert.Equal(t, component.Type(typeStr), factory.Type()) } func TestCreateTracesExporter(t *testing.T) { diff --git a/exporter/googlecloudpubsubexporter/go.mod b/exporter/googlecloudpubsubexporter/go.mod index 4b726720d466..4c52654bd1e1 100644 --- a/exporter/googlecloudpubsubexporter/go.mod +++ b/exporter/googlecloudpubsubexporter/go.mod @@ -6,8 +6,8 @@ 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.63.2-0.20221104003159-6b27644724d8 - go.opentelemetry.io/collector/pdata v0.63.2-0.20221104003159-6b27644724d8 + go.opentelemetry.io/collector v0.63.2-0.20221108014805-0b08d5316426 + go.opentelemetry.io/collector/pdata v0.63.2-0.20221108014805-0b08d5316426 go.uber.org/zap v1.23.0 google.golang.org/api v0.102.0 google.golang.org/genproto v0.0.0-20221024183307-1bc688fe9f3e @@ -38,7 +38,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.opencensus.io v0.23.0 // indirect + go.opencensus.io v0.24.0 // 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 bd23c215a031..d53e43167f0a 100644 --- a/exporter/googlecloudpubsubexporter/go.sum +++ b/exporter/googlecloudpubsubexporter/go.sum @@ -246,7 +246,7 @@ github.com/prometheus/client_golang v0.9.1/go.mod h1:7SWBe2y4D6OKWSNQJUaRYU/AaXP github.com/prometheus/client_golang v1.0.0/go.mod h1:db9x61etRT2tGnBNRi70OPL5FsnadC4Ky3P0J6CfImo= github.com/prometheus/client_golang v1.7.1/go.mod h1:PY5Wy2awLA44sXw4AOSfFBetzPP4j5+D6mVACh+pe2M= github.com/prometheus/client_golang v1.11.1/go.mod h1:Z6t4BnS23TR94PD6BsDNk8yVqroYurpAkEiz0P2BEV0= -github.com/prometheus/client_golang v1.13.0 h1:b71QUfeo5M8gq2+evJdTPfZhYMAU0uKPkyPJ7TPsloU= +github.com/prometheus/client_golang v1.13.1 h1:3gMjIY2+/hzmqhtUC/aQNYldJA6DtH3CgQvwS+02K1c= github.com/prometheus/client_model v0.0.0-20180712105110-5c3871d89910/go.mod h1:MbSGuTsp3dbXC40dX6PRTWyKYBIrTGTE9sqQNg2J8bo= github.com/prometheus/client_model v0.0.0-20190129233127-fd36f4220a90/go.mod h1:xMI15A0UPsDsEKsMN9yxemIoYk6Tm2C1GtYGdfGttqA= github.com/prometheus/client_model v0.0.0-20190812154241-14fe0d1b01d4/go.mod h1:xMI15A0UPsDsEKsMN9yxemIoYk6Tm2C1GtYGdfGttqA= @@ -283,7 +283,6 @@ github.com/stretchr/testify v1.2.2/go.mod h1:a8OnRcib4nhh0OaRAV+Yts87kKdq0PP7pXf github.com/stretchr/testify v1.3.0/go.mod h1:M5WIy9Dh21IEIfnGCwXGc5bZfKNJtfHm1UVUgZn+9EI= github.com/stretchr/testify v1.4.0/go.mod h1:j7eGeouHqKxXV5pUuKE4zz7dFj8WfuZ+81PSLYec5m4= github.com/stretchr/testify v1.5.1/go.mod h1:5W2xD1RspED5o8YsWQXVCued0rvSQ+mT+I5cxcmMvtA= -github.com/stretchr/testify v1.6.1/go.mod h1:6Fq8oRcR53rry900zMqJjRRixrwX3KX962/h/Wwjteg= github.com/stretchr/testify v1.7.0/go.mod h1:6Fq8oRcR53rry900zMqJjRRixrwX3KX962/h/Wwjteg= github.com/stretchr/testify v1.7.1/go.mod h1:6Fq8oRcR53rry900zMqJjRRixrwX3KX962/h/Wwjteg= github.com/stretchr/testify v1.8.0/go.mod h1:yNjHg4UonilssWZ8iaSj1OCr/vHnekPRkoO+kdMU+MU= @@ -295,12 +294,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.opencensus.io v0.23.0 h1:gqCw0LfLxScz8irSi8exQc7fyQ0fKQU/qnC/X8+V/1M= -go.opencensus.io v0.23.0/go.mod h1:XItmlyltB5F7CS4xOC1DcqMoFqwtC6OG2xF7mCv7P7E= -go.opentelemetry.io/collector v0.63.2-0.20221104003159-6b27644724d8 h1:rOT5HzXXfSISc6FiH012zH2/EFjp37UXfjEqj5BpkWQ= -go.opentelemetry.io/collector v0.63.2-0.20221104003159-6b27644724d8/go.mod h1:JVmeZXugK4ondC6KQgrHTHWiF4JttpG5k6dWPMt62+k= -go.opentelemetry.io/collector/pdata v0.63.2-0.20221104003159-6b27644724d8 h1:7xeTQjfsOm9eogQeIxjSEhlik9qsbBGsnmkQHfyKaRE= -go.opentelemetry.io/collector/pdata v0.63.2-0.20221104003159-6b27644724d8/go.mod h1:IzvXUGQml2mrnvdb8zIlEW3qQs9oFLdD2hLwJdZ+pek= +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.63.2-0.20221108014805-0b08d5316426 h1:z/wLTMh7/vNxcFUDa5uG7/IPE3tYx6pzCWPV41ghyV8= +go.opentelemetry.io/collector v0.63.2-0.20221108014805-0b08d5316426/go.mod h1:+Zb70q0Rq17dA9FcHTiTjW6g96lvJ8kAZ0c+eWNkAv0= +go.opentelemetry.io/collector/pdata v0.63.2-0.20221108014805-0b08d5316426 h1:wKDpgP0Tx/gWI2SgDGAY1OTSeihhDivbbRqFR79IGTc= +go.opentelemetry.io/collector/pdata v0.63.2-0.20221108014805-0b08d5316426/go.mod h1:IzvXUGQml2mrnvdb8zIlEW3qQs9oFLdD2hLwJdZ+pek= 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_test.go b/exporter/googlemanagedprometheusexporter/config_test.go index 26ef3055df99..cacb9ba9d6a1 100644 --- a/exporter/googlemanagedprometheusexporter/config_test.go +++ b/exporter/googlemanagedprometheusexporter/config_test.go @@ -21,6 +21,7 @@ import ( "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" + "go.opentelemetry.io/collector/component" "go.opentelemetry.io/collector/component/componenttest" "go.opentelemetry.io/collector/config" "go.opentelemetry.io/collector/exporter/exporterhelper" @@ -40,13 +41,13 @@ func TestLoadConfig(t *testing.T) { assert.Equal(t, len(cfg.Exporters), 3) - r0 := cfg.Exporters[config.NewComponentID(typeStr)].(*Config) + r0 := cfg.Exporters[component.NewID(typeStr)].(*Config) assert.Equal(t, r0, factory.CreateDefaultConfig().(*Config)) - r1 := cfg.Exporters[config.NewComponentIDWithName(typeStr, "customname")].(*Config) + r1 := cfg.Exporters[component.NewIDWithName(typeStr, "customname")].(*Config) assert.Equal(t, r1, &Config{ - ExporterSettings: config.NewExporterSettings(config.NewComponentIDWithName(typeStr, "customname")), + ExporterSettings: config.NewExporterSettings(component.NewIDWithName(typeStr, "customname")), TimeoutSettings: exporterhelper.TimeoutSettings{ Timeout: 20 * time.Second, }, @@ -67,9 +68,9 @@ func TestLoadConfig(t *testing.T) { }, }) - r2 := cfg.Exporters[config.NewComponentIDWithName(typeStr, "customprefix")].(*Config) + r2 := cfg.Exporters[component.NewIDWithName(typeStr, "customprefix")].(*Config) r2Expected := factory.CreateDefaultConfig().(*Config) - r2Expected.ExporterSettings = config.NewExporterSettings(config.NewComponentIDWithName(typeStr, "customprefix")) + r2Expected.ExporterSettings = config.NewExporterSettings(component.NewIDWithName(typeStr, "customprefix")) r2Expected.GMPConfig.MetricConfig.Prefix = "my-metric-domain.com" assert.Equal(t, r2, r2Expected) } diff --git a/exporter/googlemanagedprometheusexporter/factory.go b/exporter/googlemanagedprometheusexporter/factory.go index 94492b3656d2..148a7734aa7e 100644 --- a/exporter/googlemanagedprometheusexporter/factory.go +++ b/exporter/googlemanagedprometheusexporter/factory.go @@ -42,9 +42,9 @@ func NewFactory() component.ExporterFactory { } // createDefaultConfig creates the default configuration for exporter. -func createDefaultConfig() config.Exporter { +func createDefaultConfig() component.ExporterConfig { return &Config{ - ExporterSettings: config.NewExporterSettings(config.NewComponentID(typeStr)), + ExporterSettings: config.NewExporterSettings(component.NewID(typeStr)), TimeoutSettings: exporterhelper.TimeoutSettings{Timeout: defaultTimeout}, RetrySettings: exporterhelper.NewDefaultRetrySettings(), QueueSettings: exporterhelper.NewDefaultQueueSettings(), @@ -55,7 +55,7 @@ func createDefaultConfig() config.Exporter { func createMetricsExporter( ctx context.Context, params component.ExporterCreateSettings, - cfg config.Exporter) (component.MetricsExporter, error) { + cfg component.ExporterConfig) (component.MetricsExporter, error) { eCfg := cfg.(*Config) mExp, err := collector.NewGoogleCloudMetricsExporter(ctx, eCfg.GMPConfig.toCollectorConfig(), params.TelemetrySettings.Logger, params.BuildInfo.Version, eCfg.Timeout) if err != nil { diff --git a/exporter/googlemanagedprometheusexporter/factory_test.go b/exporter/googlemanagedprometheusexporter/factory_test.go index 254b2ba6a7cd..d528d89d0bbb 100644 --- a/exporter/googlemanagedprometheusexporter/factory_test.go +++ b/exporter/googlemanagedprometheusexporter/factory_test.go @@ -21,14 +21,13 @@ import ( "github.com/stretchr/testify/assert" "go.opentelemetry.io/collector/component/componenttest" - "go.opentelemetry.io/collector/config/configtest" ) func TestCreateDefaultConfig(t *testing.T) { factory := NewFactory() cfg := factory.CreateDefaultConfig() assert.NotNil(t, cfg, "failed to create default config") - assert.NoError(t, configtest.CheckConfigStruct(cfg)) + assert.NoError(t, componenttest.CheckConfigStruct(cfg)) } func TestCreateExporter(t *testing.T) { diff --git a/exporter/googlemanagedprometheusexporter/go.mod b/exporter/googlemanagedprometheusexporter/go.mod index fddb03513dc6..433a45d00e6b 100644 --- a/exporter/googlemanagedprometheusexporter/go.mod +++ b/exporter/googlemanagedprometheusexporter/go.mod @@ -6,7 +6,7 @@ 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.63.2-0.20221104003159-6b27644724d8 + go.opentelemetry.io/collector v0.63.2-0.20221108014805-0b08d5316426 ) require ( @@ -47,7 +47,7 @@ require ( github.com/modern-go/reflect2 v1.0.2 // indirect github.com/pmezard/go-difflib v1.0.0 // indirect github.com/power-devops/perfstat v0.0.0-20210106213030-5aafc221ea8c // indirect - github.com/prometheus/client_golang v1.13.0 // indirect + github.com/prometheus/client_golang v1.13.1 // indirect github.com/prometheus/client_model v0.3.0 // indirect github.com/prometheus/common v0.37.0 // indirect github.com/prometheus/procfs v0.8.0 // indirect @@ -58,10 +58,10 @@ 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.opencensus.io v0.23.0 // indirect - go.opentelemetry.io/collector/pdata v0.63.2-0.20221104003159-6b27644724d8 // indirect + go.opencensus.io v0.24.0 // indirect + go.opentelemetry.io/collector/pdata v0.63.2-0.20221108014805-0b08d5316426 // indirect go.opentelemetry.io/collector/processor/batchprocessor v0.0.0-20221103161931-a167b006e8c0 // indirect - go.opentelemetry.io/collector/semconv v0.63.2-0.20221104003159-6b27644724d8 // indirect + go.opentelemetry.io/collector/semconv v0.63.2-0.20221108014805-0b08d5316426 // 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 3b4f0e18aafe..2e69512b3d71 100644 --- a/exporter/googlemanagedprometheusexporter/go.sum +++ b/exporter/googlemanagedprometheusexporter/go.sum @@ -385,8 +385,9 @@ github.com/prometheus/client_golang v1.11.0/go.mod h1:Z6t4BnS23TR94PD6BsDNk8yVqr github.com/prometheus/client_golang v1.11.1/go.mod h1:Z6t4BnS23TR94PD6BsDNk8yVqroYurpAkEiz0P2BEV0= github.com/prometheus/client_golang v1.12.1/go.mod h1:3Z9XVyYiZYEO+YQWt3RD2R3jrbd179Rt297l4aS6nDY= github.com/prometheus/client_golang v1.12.2/go.mod h1:3Z9XVyYiZYEO+YQWt3RD2R3jrbd179Rt297l4aS6nDY= -github.com/prometheus/client_golang v1.13.0 h1:b71QUfeo5M8gq2+evJdTPfZhYMAU0uKPkyPJ7TPsloU= github.com/prometheus/client_golang v1.13.0/go.mod h1:vTeo+zgvILHsnnj/39Ou/1fPN5nJFOEMgftOUOmlvYQ= +github.com/prometheus/client_golang v1.13.1 h1:3gMjIY2+/hzmqhtUC/aQNYldJA6DtH3CgQvwS+02K1c= +github.com/prometheus/client_golang v1.13.1/go.mod h1:vTeo+zgvILHsnnj/39Ou/1fPN5nJFOEMgftOUOmlvYQ= github.com/prometheus/client_model v0.0.0-20180712105110-5c3871d89910/go.mod h1:MbSGuTsp3dbXC40dX6PRTWyKYBIrTGTE9sqQNg2J8bo= github.com/prometheus/client_model v0.0.0-20190129233127-fd36f4220a90/go.mod h1:xMI15A0UPsDsEKsMN9yxemIoYk6Tm2C1GtYGdfGttqA= github.com/prometheus/client_model v0.0.0-20190812154241-14fe0d1b01d4/go.mod h1:xMI15A0UPsDsEKsMN9yxemIoYk6Tm2C1GtYGdfGttqA= @@ -463,17 +464,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.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 h1:gqCw0LfLxScz8irSi8exQc7fyQ0fKQU/qnC/X8+V/1M= go.opencensus.io v0.23.0/go.mod h1:XItmlyltB5F7CS4xOC1DcqMoFqwtC6OG2xF7mCv7P7E= -go.opentelemetry.io/collector v0.63.2-0.20221104003159-6b27644724d8 h1:rOT5HzXXfSISc6FiH012zH2/EFjp37UXfjEqj5BpkWQ= -go.opentelemetry.io/collector v0.63.2-0.20221104003159-6b27644724d8/go.mod h1:JVmeZXugK4ondC6KQgrHTHWiF4JttpG5k6dWPMt62+k= +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.63.2-0.20221108014805-0b08d5316426 h1:z/wLTMh7/vNxcFUDa5uG7/IPE3tYx6pzCWPV41ghyV8= +go.opentelemetry.io/collector v0.63.2-0.20221108014805-0b08d5316426/go.mod h1:+Zb70q0Rq17dA9FcHTiTjW6g96lvJ8kAZ0c+eWNkAv0= go.opentelemetry.io/collector/extension/zpagesextension v0.0.0-20221102221454-bfc45c16c979 h1:YW7BL8ftoJ7k+EtnMICw1KWASLuSDIhbF7SjjgWMCl4= -go.opentelemetry.io/collector/pdata v0.63.2-0.20221104003159-6b27644724d8 h1:7xeTQjfsOm9eogQeIxjSEhlik9qsbBGsnmkQHfyKaRE= -go.opentelemetry.io/collector/pdata v0.63.2-0.20221104003159-6b27644724d8/go.mod h1:IzvXUGQml2mrnvdb8zIlEW3qQs9oFLdD2hLwJdZ+pek= +go.opentelemetry.io/collector/pdata v0.63.2-0.20221108014805-0b08d5316426 h1:wKDpgP0Tx/gWI2SgDGAY1OTSeihhDivbbRqFR79IGTc= +go.opentelemetry.io/collector/pdata v0.63.2-0.20221108014805-0b08d5316426/go.mod h1:IzvXUGQml2mrnvdb8zIlEW3qQs9oFLdD2hLwJdZ+pek= go.opentelemetry.io/collector/processor/batchprocessor v0.0.0-20221103161931-a167b006e8c0 h1:MybyhzAzHIb85NOg5yHQixODm6fq6kJnOTl6xb7GxFc= go.opentelemetry.io/collector/processor/batchprocessor v0.0.0-20221103161931-a167b006e8c0/go.mod h1:WBv1Nayi8p12K0vxLxTkHpRGr79JXYT3TXL2X0B/PRU= -go.opentelemetry.io/collector/semconv v0.63.2-0.20221104003159-6b27644724d8 h1:jm0sNPyqo6S165QjQYMBHB2nK50wlJbMYM03Yr3Eo2k= -go.opentelemetry.io/collector/semconv v0.63.2-0.20221104003159-6b27644724d8/go.mod h1:5o9yhOa+ABt7g2E5JABDxGZ1PQPbtfxrKNbYn+LOTXU= +go.opentelemetry.io/collector/semconv v0.63.2-0.20221108014805-0b08d5316426 h1:pqIl7OC531J6i9ttBCj3zLmZI/BSF4q323YpK0GgKGk= +go.opentelemetry.io/collector/semconv v0.63.2-0.20221108014805-0b08d5316426/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 56c750f10ec1..2a4643ffe2c5 100644 --- a/exporter/humioexporter/config_test.go +++ b/exporter/humioexporter/config_test.go @@ -22,6 +22,7 @@ import ( "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" + "go.opentelemetry.io/collector/component" "go.opentelemetry.io/collector/config" "go.opentelemetry.io/collector/config/confighttp" "go.opentelemetry.io/collector/config/configtls" @@ -30,7 +31,7 @@ import ( ) // Helper method to handle boilerplate of loading exporter configuration from file -func loadExporterConfig(t *testing.T, file string, id config.ComponentID) (config.Exporter, *Config) { +func loadExporterConfig(t *testing.T, file string, id component.ID) (component.ExporterConfig, *Config) { // Initialize exporter factory cm, err := confmaptest.LoadConf(filepath.Join("testdata", file)) require.NoError(t, err) @@ -39,7 +40,7 @@ func loadExporterConfig(t *testing.T, file string, id config.ComponentID) (confi sub, err := cm.Sub(id.String()) require.NoError(t, err) - require.NoError(t, config.UnmarshalExporter(sub, cfg)) + require.NoError(t, component.UnmarshalExporterConfig(sub, cfg)) def := factory.CreateDefaultConfig().(*Config) require.NotNil(t, def) @@ -49,7 +50,7 @@ func loadExporterConfig(t *testing.T, file string, id config.ComponentID) (confi func TestLoadWithDefaults(t *testing.T) { // Arrange / Act - actual, expected := loadExporterConfig(t, "config.yaml", config.NewComponentIDWithName(typeStr, "")) + actual, expected := loadExporterConfig(t, "config.yaml", component.NewIDWithName(typeStr, "")) expected.Traces.IngestToken = "00000000-0000-0000-0000-0000000000000" expected.Endpoint = "https://cloud.humio.com/" @@ -59,7 +60,7 @@ func TestLoadWithDefaults(t *testing.T) { func TestLoadInvalidCompression(t *testing.T) { // Act - cfg, _ := loadExporterConfig(t, "invalid-compression.yaml", config.NewComponentIDWithName(typeStr, "")) + cfg, _ := loadExporterConfig(t, "invalid-compression.yaml", component.NewIDWithName(typeStr, "")) err := cfg.Validate() // Assert require.Error(t, err) @@ -68,7 +69,7 @@ func TestLoadInvalidCompression(t *testing.T) { func TestLoadInvalidTagStrategy(t *testing.T) { // Act - cfg, _ := loadExporterConfig(t, "invalid-tag.yaml", config.NewComponentIDWithName(typeStr, "")) + cfg, _ := loadExporterConfig(t, "invalid-tag.yaml", component.NewIDWithName(typeStr, "")) err := cfg.Validate() // Assert @@ -79,7 +80,7 @@ func TestLoadInvalidTagStrategy(t *testing.T) { func TestLoadAllSettings(t *testing.T) { // Arrange expected := &Config{ - ExporterSettings: config.NewExporterSettings(config.NewComponentID(typeStr)), + ExporterSettings: config.NewExporterSettings(component.NewID(typeStr)), QueueSettings: exporterhelper.QueueSettings{ Enabled: false, @@ -124,7 +125,7 @@ func TestLoadAllSettings(t *testing.T) { } // Act - actual, _ := loadExporterConfig(t, "config.yaml", config.NewComponentIDWithName(typeStr, "allsettings")) + actual, _ := loadExporterConfig(t, "config.yaml", component.NewIDWithName(typeStr, "allsettings")) // Assert assert.Equal(t, expected, actual) @@ -140,7 +141,7 @@ func TestValidate(t *testing.T) { { desc: "Valid minimal configuration", cfg: &Config{ - ExporterSettings: config.NewExporterSettings(config.NewComponentID(typeStr)), + ExporterSettings: config.NewExporterSettings(component.NewID(typeStr)), Tag: TagNone, HTTPClientSettings: confighttp.HTTPClientSettings{ Endpoint: "http://localhost:8080", @@ -151,7 +152,7 @@ func TestValidate(t *testing.T) { { desc: "Valid custom headers", cfg: &Config{ - ExporterSettings: config.NewExporterSettings(config.NewComponentID(typeStr)), + ExporterSettings: config.NewExporterSettings(component.NewID(typeStr)), Tag: TagNone, HTTPClientSettings: confighttp.HTTPClientSettings{ Endpoint: "http://localhost:8080", @@ -167,7 +168,7 @@ func TestValidate(t *testing.T) { { desc: "Valid compression disabled", cfg: &Config{ - ExporterSettings: config.NewExporterSettings(config.NewComponentID(typeStr)), + ExporterSettings: config.NewExporterSettings(component.NewID(typeStr)), DisableCompression: true, Tag: TagNone, HTTPClientSettings: confighttp.HTTPClientSettings{ @@ -179,7 +180,7 @@ func TestValidate(t *testing.T) { { desc: "Missing endpoint", cfg: &Config{ - ExporterSettings: config.NewExporterSettings(config.NewComponentID(typeStr)), + ExporterSettings: config.NewExporterSettings(component.NewID(typeStr)), Tag: TagNone, HTTPClientSettings: confighttp.HTTPClientSettings{ Endpoint: "", @@ -190,7 +191,7 @@ func TestValidate(t *testing.T) { { desc: "Override tag strategy", cfg: &Config{ - ExporterSettings: config.NewExporterSettings(config.NewComponentID(typeStr)), + ExporterSettings: config.NewExporterSettings(component.NewID(typeStr)), Tag: TagServiceName, HTTPClientSettings: confighttp.HTTPClientSettings{ Endpoint: "e", @@ -201,7 +202,7 @@ func TestValidate(t *testing.T) { { desc: "Unix time", cfg: &Config{ - ExporterSettings: config.NewExporterSettings(config.NewComponentID(typeStr)), + ExporterSettings: config.NewExporterSettings(component.NewID(typeStr)), Tag: TagNone, HTTPClientSettings: confighttp.HTTPClientSettings{ Endpoint: "e", @@ -215,7 +216,7 @@ func TestValidate(t *testing.T) { { desc: "Error creating URLs", cfg: &Config{ - ExporterSettings: config.NewExporterSettings(config.NewComponentID(typeStr)), + ExporterSettings: config.NewExporterSettings(component.NewID(typeStr)), Tag: TagNone, HTTPClientSettings: confighttp.HTTPClientSettings{ Endpoint: "\n\t", @@ -226,7 +227,7 @@ func TestValidate(t *testing.T) { { desc: "Invalid Content-Type header", cfg: &Config{ - ExporterSettings: config.NewExporterSettings(config.NewComponentID(typeStr)), + ExporterSettings: config.NewExporterSettings(component.NewID(typeStr)), Tag: TagNone, HTTPClientSettings: confighttp.HTTPClientSettings{ Endpoint: "e", @@ -240,7 +241,7 @@ func TestValidate(t *testing.T) { { desc: "User-provided Authorization header", cfg: &Config{ - ExporterSettings: config.NewExporterSettings(config.NewComponentID(typeStr)), + ExporterSettings: config.NewExporterSettings(component.NewID(typeStr)), Tag: TagNone, HTTPClientSettings: confighttp.HTTPClientSettings{ Endpoint: "e", @@ -254,7 +255,7 @@ func TestValidate(t *testing.T) { { desc: "Invalid content encoding", cfg: &Config{ - ExporterSettings: config.NewExporterSettings(config.NewComponentID(typeStr)), + ExporterSettings: config.NewExporterSettings(component.NewID(typeStr)), Tag: TagNone, HTTPClientSettings: confighttp.HTTPClientSettings{ Endpoint: "e", @@ -268,7 +269,7 @@ func TestValidate(t *testing.T) { { desc: "Content encoding without compression", cfg: &Config{ - ExporterSettings: config.NewExporterSettings(config.NewComponentID(typeStr)), + ExporterSettings: config.NewExporterSettings(component.NewID(typeStr)), DisableCompression: true, Tag: TagNone, HTTPClientSettings: confighttp.HTTPClientSettings{ @@ -295,7 +296,7 @@ func TestValidate(t *testing.T) { func TestSanitizeValid(t *testing.T) { // Arrange cfg := &Config{ - ExporterSettings: config.NewExporterSettings(config.NewComponentID(typeStr)), + ExporterSettings: config.NewExporterSettings(component.NewID(typeStr)), HTTPClientSettings: confighttp.HTTPClientSettings{ Endpoint: "http://localhost:8080", }, @@ -324,7 +325,7 @@ func TestSanitizeValid(t *testing.T) { func TestSanitizeCustomHeaders(t *testing.T) { // Arrange cfg := &Config{ - ExporterSettings: config.NewExporterSettings(config.NewComponentID(typeStr)), + ExporterSettings: config.NewExporterSettings(component.NewID(typeStr)), HTTPClientSettings: confighttp.HTTPClientSettings{ Endpoint: "http://localhost:8080", Headers: map[string]string{ @@ -350,7 +351,7 @@ func TestSanitizeCustomHeaders(t *testing.T) { func TestSanitizeNoCompression(t *testing.T) { // Arrange cfg := &Config{ - ExporterSettings: config.NewExporterSettings(config.NewComponentID(typeStr)), + ExporterSettings: config.NewExporterSettings(component.NewID(typeStr)), DisableCompression: true, HTTPClientSettings: confighttp.HTTPClientSettings{ Endpoint: "http://localhost:8080", diff --git a/exporter/humioexporter/factory.go b/exporter/humioexporter/factory.go index 39d7a2b427dc..ddf0eed91021 100644 --- a/exporter/humioexporter/factory.go +++ b/exporter/humioexporter/factory.go @@ -41,9 +41,9 @@ func NewFactory() component.ExporterFactory { } // Provides a struct with default values for all relevant configuration settings -func createDefaultConfig() config.Exporter { +func createDefaultConfig() component.ExporterConfig { return &Config{ - ExporterSettings: config.NewExporterSettings(config.NewComponentID(typeStr)), + ExporterSettings: config.NewExporterSettings(component.NewID(typeStr)), // Default settings inherited from exporter helper QueueSettings: exporterhelper.NewDefaultQueueSettings(), @@ -66,7 +66,7 @@ func createDefaultConfig() config.Exporter { func createTracesExporter( ctx context.Context, set component.ExporterCreateSettings, - config config.Exporter, + config component.ExporterConfig, ) (component.TracesExporter, error) { if config == nil { return nil, errors.New("missing config") diff --git a/exporter/humioexporter/factory_test.go b/exporter/humioexporter/factory_test.go index 5e81007fbdfc..bd6c62971f62 100644 --- a/exporter/humioexporter/factory_test.go +++ b/exporter/humioexporter/factory_test.go @@ -42,14 +42,14 @@ func TestCreateTracesExporter(t *testing.T) { factory := newHumioFactory(t) testCases := []struct { desc string - cfg config.Exporter + cfg component.ExporterConfig wantErrorOnCreate bool wantErrorOnStart bool }{ { desc: "Valid trace configuration", cfg: &Config{ - ExporterSettings: config.NewExporterSettings(config.NewComponentID(typeStr)), + ExporterSettings: config.NewExporterSettings(component.NewID(typeStr)), Tag: TagNone, HTTPClientSettings: confighttp.HTTPClientSettings{ Endpoint: "http://localhost:8080", @@ -63,7 +63,7 @@ func TestCreateTracesExporter(t *testing.T) { { desc: "Unsanitizable trace configuration", cfg: &Config{ - ExporterSettings: config.NewExporterSettings(config.NewComponentID(typeStr)), + ExporterSettings: config.NewExporterSettings(component.NewID(typeStr)), Tag: TagNone, HTTPClientSettings: confighttp.HTTPClientSettings{ Endpoint: "\n", @@ -74,7 +74,7 @@ func TestCreateTracesExporter(t *testing.T) { { desc: "Missing ingest token", cfg: &Config{ - ExporterSettings: config.NewExporterSettings(config.NewComponentID(typeStr)), + ExporterSettings: config.NewExporterSettings(component.NewID(typeStr)), Tag: TagNone, HTTPClientSettings: confighttp.HTTPClientSettings{ Endpoint: "http://localhost:8080", @@ -85,7 +85,7 @@ func TestCreateTracesExporter(t *testing.T) { { desc: "Invalid client configuration", cfg: &Config{ - ExporterSettings: config.NewExporterSettings(config.NewComponentID(typeStr)), + ExporterSettings: config.NewExporterSettings(component.NewID(typeStr)), Tag: TagNone, HTTPClientSettings: confighttp.HTTPClientSettings{ Endpoint: "http://localhost:8080", diff --git a/exporter/humioexporter/go.mod b/exporter/humioexporter/go.mod index 40363aeb09f4..483cf677ed39 100644 --- a/exporter/humioexporter/go.mod +++ b/exporter/humioexporter/go.mod @@ -3,11 +3,11 @@ module github.com/open-telemetry/opentelemetry-collector-contrib/exporter/humioe go 1.18 require ( - github.com/open-telemetry/opentelemetry-collector-contrib/internal/coreinternal v0.0.0-00010101000000-000000000000 + github.com/open-telemetry/opentelemetry-collector-contrib/internal/coreinternal v0.63.0 github.com/stretchr/testify v1.8.1 - go.opentelemetry.io/collector v0.63.2-0.20221104003159-6b27644724d8 - go.opentelemetry.io/collector/pdata v0.63.2-0.20221104003159-6b27644724d8 - go.opentelemetry.io/collector/semconv v0.63.2-0.20221104003159-6b27644724d8 + go.opentelemetry.io/collector v0.63.2-0.20221108014805-0b08d5316426 + go.opentelemetry.io/collector/pdata v0.63.2-0.20221108014805-0b08d5316426 + go.opentelemetry.io/collector/semconv v0.63.2-0.20221108014805-0b08d5316426 ) @@ -31,7 +31,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.opencensus.io v0.23.0 // indirect + go.opencensus.io v0.24.0 // 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 a5097f46e4b4..cf8a71058db1 100644 --- a/exporter/humioexporter/go.sum +++ b/exporter/humioexporter/go.sum @@ -235,7 +235,7 @@ github.com/prometheus/client_golang v0.9.1/go.mod h1:7SWBe2y4D6OKWSNQJUaRYU/AaXP github.com/prometheus/client_golang v1.0.0/go.mod h1:db9x61etRT2tGnBNRi70OPL5FsnadC4Ky3P0J6CfImo= github.com/prometheus/client_golang v1.7.1/go.mod h1:PY5Wy2awLA44sXw4AOSfFBetzPP4j5+D6mVACh+pe2M= github.com/prometheus/client_golang v1.11.1/go.mod h1:Z6t4BnS23TR94PD6BsDNk8yVqroYurpAkEiz0P2BEV0= -github.com/prometheus/client_golang v1.13.0 h1:b71QUfeo5M8gq2+evJdTPfZhYMAU0uKPkyPJ7TPsloU= +github.com/prometheus/client_golang v1.13.1 h1:3gMjIY2+/hzmqhtUC/aQNYldJA6DtH3CgQvwS+02K1c= github.com/prometheus/client_model v0.0.0-20180712105110-5c3871d89910/go.mod h1:MbSGuTsp3dbXC40dX6PRTWyKYBIrTGTE9sqQNg2J8bo= github.com/prometheus/client_model v0.0.0-20190129233127-fd36f4220a90/go.mod h1:xMI15A0UPsDsEKsMN9yxemIoYk6Tm2C1GtYGdfGttqA= github.com/prometheus/client_model v0.0.0-20190812154241-14fe0d1b01d4/go.mod h1:xMI15A0UPsDsEKsMN9yxemIoYk6Tm2C1GtYGdfGttqA= @@ -274,7 +274,6 @@ github.com/stretchr/testify v1.2.2/go.mod h1:a8OnRcib4nhh0OaRAV+Yts87kKdq0PP7pXf github.com/stretchr/testify v1.3.0/go.mod h1:M5WIy9Dh21IEIfnGCwXGc5bZfKNJtfHm1UVUgZn+9EI= github.com/stretchr/testify v1.4.0/go.mod h1:j7eGeouHqKxXV5pUuKE4zz7dFj8WfuZ+81PSLYec5m4= github.com/stretchr/testify v1.5.1/go.mod h1:5W2xD1RspED5o8YsWQXVCued0rvSQ+mT+I5cxcmMvtA= -github.com/stretchr/testify v1.6.1/go.mod h1:6Fq8oRcR53rry900zMqJjRRixrwX3KX962/h/Wwjteg= github.com/stretchr/testify v1.7.0/go.mod h1:6Fq8oRcR53rry900zMqJjRRixrwX3KX962/h/Wwjteg= github.com/stretchr/testify v1.7.1/go.mod h1:6Fq8oRcR53rry900zMqJjRRixrwX3KX962/h/Wwjteg= github.com/stretchr/testify v1.8.0/go.mod h1:yNjHg4UonilssWZ8iaSj1OCr/vHnekPRkoO+kdMU+MU= @@ -286,14 +285,14 @@ 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.opencensus.io v0.23.0 h1:gqCw0LfLxScz8irSi8exQc7fyQ0fKQU/qnC/X8+V/1M= -go.opencensus.io v0.23.0/go.mod h1:XItmlyltB5F7CS4xOC1DcqMoFqwtC6OG2xF7mCv7P7E= -go.opentelemetry.io/collector v0.63.2-0.20221104003159-6b27644724d8 h1:rOT5HzXXfSISc6FiH012zH2/EFjp37UXfjEqj5BpkWQ= -go.opentelemetry.io/collector v0.63.2-0.20221104003159-6b27644724d8/go.mod h1:JVmeZXugK4ondC6KQgrHTHWiF4JttpG5k6dWPMt62+k= -go.opentelemetry.io/collector/pdata v0.63.2-0.20221104003159-6b27644724d8 h1:7xeTQjfsOm9eogQeIxjSEhlik9qsbBGsnmkQHfyKaRE= -go.opentelemetry.io/collector/pdata v0.63.2-0.20221104003159-6b27644724d8/go.mod h1:IzvXUGQml2mrnvdb8zIlEW3qQs9oFLdD2hLwJdZ+pek= -go.opentelemetry.io/collector/semconv v0.63.2-0.20221104003159-6b27644724d8 h1:jm0sNPyqo6S165QjQYMBHB2nK50wlJbMYM03Yr3Eo2k= -go.opentelemetry.io/collector/semconv v0.63.2-0.20221104003159-6b27644724d8/go.mod h1:5o9yhOa+ABt7g2E5JABDxGZ1PQPbtfxrKNbYn+LOTXU= +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.63.2-0.20221108014805-0b08d5316426 h1:z/wLTMh7/vNxcFUDa5uG7/IPE3tYx6pzCWPV41ghyV8= +go.opentelemetry.io/collector v0.63.2-0.20221108014805-0b08d5316426/go.mod h1:+Zb70q0Rq17dA9FcHTiTjW6g96lvJ8kAZ0c+eWNkAv0= +go.opentelemetry.io/collector/pdata v0.63.2-0.20221108014805-0b08d5316426 h1:wKDpgP0Tx/gWI2SgDGAY1OTSeihhDivbbRqFR79IGTc= +go.opentelemetry.io/collector/pdata v0.63.2-0.20221108014805-0b08d5316426/go.mod h1:IzvXUGQml2mrnvdb8zIlEW3qQs9oFLdD2hLwJdZ+pek= +go.opentelemetry.io/collector/semconv v0.63.2-0.20221108014805-0b08d5316426 h1:pqIl7OC531J6i9ttBCj3zLmZI/BSF4q323YpK0GgKGk= +go.opentelemetry.io/collector/semconv v0.63.2-0.20221108014805-0b08d5316426/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 fbec136547f8..ea5173aaca8e 100644 --- a/exporter/humioexporter/humio_client_test.go +++ b/exporter/humioexporter/humio_client_test.go @@ -28,6 +28,7 @@ import ( "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" + "go.opentelemetry.io/collector/component" "go.opentelemetry.io/collector/component/componenttest" "go.opentelemetry.io/collector/config" "go.opentelemetry.io/collector/config/confighttp" @@ -36,7 +37,7 @@ import ( func makeClient(t *testing.T, host string, compression bool) exporterClient { cfg := &Config{ - ExporterSettings: config.NewExporterSettings(config.NewComponentID(typeStr)), + ExporterSettings: config.NewExporterSettings(component.NewID(typeStr)), DisableCompression: !compression, Tag: TagNone, HTTPClientSettings: confighttp.HTTPClientSettings{ diff --git a/exporter/influxdbexporter/config_test.go b/exporter/influxdbexporter/config_test.go index 995aa85909bf..4d54b52e1681 100644 --- a/exporter/influxdbexporter/config_test.go +++ b/exporter/influxdbexporter/config_test.go @@ -21,6 +21,7 @@ import ( "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" + "go.opentelemetry.io/collector/component" "go.opentelemetry.io/collector/config" "go.opentelemetry.io/collector/config/confighttp" "go.opentelemetry.io/collector/confmap/confmaptest" @@ -34,17 +35,17 @@ func TestLoadConfig(t *testing.T) { require.NoError(t, err) tests := []struct { - id config.ComponentID - expected config.Exporter + id component.ID + expected component.ExporterConfig }{ { - id: config.NewComponentIDWithName(typeStr, ""), + id: component.NewIDWithName(typeStr, ""), expected: createDefaultConfig(), }, { - id: config.NewComponentIDWithName(typeStr, "withsettings"), + id: component.NewIDWithName(typeStr, "withsettings"), expected: &Config{ - ExporterSettings: config.NewExporterSettings(config.NewComponentID(typeStr)), + ExporterSettings: config.NewExporterSettings(component.NewID(typeStr)), HTTPClientSettings: confighttp.HTTPClientSettings{ Endpoint: "http://localhost:8080", Timeout: 500 * time.Millisecond, @@ -76,7 +77,7 @@ func TestLoadConfig(t *testing.T) { sub, err := cm.Sub(tt.id.String()) require.NoError(t, err) - require.NoError(t, config.UnmarshalExporter(sub, cfg)) + require.NoError(t, component.UnmarshalExporterConfig(sub, cfg)) assert.NoError(t, cfg.Validate()) assert.Equal(t, tt.expected, cfg) diff --git a/exporter/influxdbexporter/factory.go b/exporter/influxdbexporter/factory.go index d92f9c42afc8..70d3c6b7c30f 100644 --- a/exporter/influxdbexporter/factory.go +++ b/exporter/influxdbexporter/factory.go @@ -35,7 +35,7 @@ func NewFactory() component.ExporterFactory { ) } -func createTraceExporter(ctx context.Context, set component.ExporterCreateSettings, config config.Exporter) (component.TracesExporter, error) { +func createTraceExporter(ctx context.Context, set component.ExporterCreateSettings, config component.ExporterConfig) (component.TracesExporter, error) { cfg := config.(*Config) exporter := newTracesExporter(cfg, set) @@ -51,7 +51,7 @@ func createTraceExporter(ctx context.Context, set component.ExporterCreateSettin ) } -func createMetricsExporter(ctx context.Context, set component.ExporterCreateSettings, config config.Exporter) (component.MetricsExporter, error) { +func createMetricsExporter(ctx context.Context, set component.ExporterCreateSettings, config component.ExporterConfig) (component.MetricsExporter, error) { cfg := config.(*Config) exporter, err := newMetricsExporter(cfg, set) @@ -70,7 +70,7 @@ func createMetricsExporter(ctx context.Context, set component.ExporterCreateSett ) } -func createLogsExporter(ctx context.Context, set component.ExporterCreateSettings, config config.Exporter) (component.LogsExporter, error) { +func createLogsExporter(ctx context.Context, set component.ExporterCreateSettings, config component.ExporterConfig) (component.LogsExporter, error) { cfg := config.(*Config) exporter := newLogsExporter(cfg, set) @@ -86,9 +86,9 @@ func createLogsExporter(ctx context.Context, set component.ExporterCreateSetting ) } -func createDefaultConfig() config.Exporter { +func createDefaultConfig() component.ExporterConfig { return &Config{ - ExporterSettings: config.NewExporterSettings(config.NewComponentID(typeStr)), + ExporterSettings: config.NewExporterSettings(component.NewID(typeStr)), HTTPClientSettings: confighttp.HTTPClientSettings{ Timeout: 5 * time.Second, Headers: map[string]string{ diff --git a/exporter/influxdbexporter/go.mod b/exporter/influxdbexporter/go.mod index 2ec641d49dd3..c5f8302e97bb 100644 --- a/exporter/influxdbexporter/go.mod +++ b/exporter/influxdbexporter/go.mod @@ -7,8 +7,8 @@ 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.63.2-0.20221104003159-6b27644724d8 - go.opentelemetry.io/collector/pdata v0.63.2-0.20221104003159-6b27644724d8 + go.opentelemetry.io/collector v0.63.2-0.20221108014805-0b08d5316426 + go.opentelemetry.io/collector/pdata v0.63.2-0.20221108014805-0b08d5316426 go.uber.org/zap v1.23.0 ) @@ -35,7 +35,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.opencensus.io v0.23.0 // indirect + go.opencensus.io v0.24.0 // 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 3c366836d798..6e34bb8ae4d5 100644 --- a/exporter/influxdbexporter/go.sum +++ b/exporter/influxdbexporter/go.sum @@ -262,7 +262,7 @@ github.com/prometheus/client_golang v0.9.1/go.mod h1:7SWBe2y4D6OKWSNQJUaRYU/AaXP github.com/prometheus/client_golang v1.0.0/go.mod h1:db9x61etRT2tGnBNRi70OPL5FsnadC4Ky3P0J6CfImo= github.com/prometheus/client_golang v1.7.1/go.mod h1:PY5Wy2awLA44sXw4AOSfFBetzPP4j5+D6mVACh+pe2M= github.com/prometheus/client_golang v1.11.1/go.mod h1:Z6t4BnS23TR94PD6BsDNk8yVqroYurpAkEiz0P2BEV0= -github.com/prometheus/client_golang v1.13.0 h1:b71QUfeo5M8gq2+evJdTPfZhYMAU0uKPkyPJ7TPsloU= +github.com/prometheus/client_golang v1.13.1 h1:3gMjIY2+/hzmqhtUC/aQNYldJA6DtH3CgQvwS+02K1c= github.com/prometheus/client_model v0.0.0-20180712105110-5c3871d89910/go.mod h1:MbSGuTsp3dbXC40dX6PRTWyKYBIrTGTE9sqQNg2J8bo= github.com/prometheus/client_model v0.0.0-20190129233127-fd36f4220a90/go.mod h1:xMI15A0UPsDsEKsMN9yxemIoYk6Tm2C1GtYGdfGttqA= github.com/prometheus/client_model v0.0.0-20190812154241-14fe0d1b01d4/go.mod h1:xMI15A0UPsDsEKsMN9yxemIoYk6Tm2C1GtYGdfGttqA= @@ -302,7 +302,6 @@ github.com/stretchr/testify v1.2.2/go.mod h1:a8OnRcib4nhh0OaRAV+Yts87kKdq0PP7pXf github.com/stretchr/testify v1.3.0/go.mod h1:M5WIy9Dh21IEIfnGCwXGc5bZfKNJtfHm1UVUgZn+9EI= github.com/stretchr/testify v1.4.0/go.mod h1:j7eGeouHqKxXV5pUuKE4zz7dFj8WfuZ+81PSLYec5m4= github.com/stretchr/testify v1.5.1/go.mod h1:5W2xD1RspED5o8YsWQXVCued0rvSQ+mT+I5cxcmMvtA= -github.com/stretchr/testify v1.6.1/go.mod h1:6Fq8oRcR53rry900zMqJjRRixrwX3KX962/h/Wwjteg= github.com/stretchr/testify v1.7.0/go.mod h1:6Fq8oRcR53rry900zMqJjRRixrwX3KX962/h/Wwjteg= github.com/stretchr/testify v1.7.1/go.mod h1:6Fq8oRcR53rry900zMqJjRRixrwX3KX962/h/Wwjteg= github.com/stretchr/testify v1.8.0/go.mod h1:yNjHg4UonilssWZ8iaSj1OCr/vHnekPRkoO+kdMU+MU= @@ -314,12 +313,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.opencensus.io v0.23.0 h1:gqCw0LfLxScz8irSi8exQc7fyQ0fKQU/qnC/X8+V/1M= -go.opencensus.io v0.23.0/go.mod h1:XItmlyltB5F7CS4xOC1DcqMoFqwtC6OG2xF7mCv7P7E= -go.opentelemetry.io/collector v0.63.2-0.20221104003159-6b27644724d8 h1:rOT5HzXXfSISc6FiH012zH2/EFjp37UXfjEqj5BpkWQ= -go.opentelemetry.io/collector v0.63.2-0.20221104003159-6b27644724d8/go.mod h1:JVmeZXugK4ondC6KQgrHTHWiF4JttpG5k6dWPMt62+k= -go.opentelemetry.io/collector/pdata v0.63.2-0.20221104003159-6b27644724d8 h1:7xeTQjfsOm9eogQeIxjSEhlik9qsbBGsnmkQHfyKaRE= -go.opentelemetry.io/collector/pdata v0.63.2-0.20221104003159-6b27644724d8/go.mod h1:IzvXUGQml2mrnvdb8zIlEW3qQs9oFLdD2hLwJdZ+pek= +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.63.2-0.20221108014805-0b08d5316426 h1:z/wLTMh7/vNxcFUDa5uG7/IPE3tYx6pzCWPV41ghyV8= +go.opentelemetry.io/collector v0.63.2-0.20221108014805-0b08d5316426/go.mod h1:+Zb70q0Rq17dA9FcHTiTjW6g96lvJ8kAZ0c+eWNkAv0= +go.opentelemetry.io/collector/pdata v0.63.2-0.20221108014805-0b08d5316426 h1:wKDpgP0Tx/gWI2SgDGAY1OTSeihhDivbbRqFR79IGTc= +go.opentelemetry.io/collector/pdata v0.63.2-0.20221108014805-0b08d5316426/go.mod h1:IzvXUGQml2mrnvdb8zIlEW3qQs9oFLdD2hLwJdZ+pek= 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/config.go b/exporter/instanaexporter/config.go index 73f6d5f8f616..c9cfbfebd335 100644 --- a/exporter/instanaexporter/config.go +++ b/exporter/instanaexporter/config.go @@ -19,6 +19,7 @@ import ( "net/url" "strings" + "go.opentelemetry.io/collector/component" "go.opentelemetry.io/collector/config" "go.opentelemetry.io/collector/config/confighttp" ) @@ -34,7 +35,7 @@ type Config struct { confighttp.HTTPClientSettings `mapstructure:",squash"` } -var _ config.Exporter = (*Config)(nil) +var _ component.ExporterConfig = (*Config)(nil) // Validate checks if the exporter configuration is valid func (cfg *Config) Validate() error { diff --git a/exporter/instanaexporter/exporter.go b/exporter/instanaexporter/exporter.go index 61cfe777e0b6..89f941f50263 100644 --- a/exporter/instanaexporter/exporter.go +++ b/exporter/instanaexporter/exporter.go @@ -23,7 +23,6 @@ import ( "strings" "go.opentelemetry.io/collector/component" - "go.opentelemetry.io/collector/config" "go.opentelemetry.io/collector/consumer/consumererror" "go.opentelemetry.io/collector/pdata/ptrace" "go.uber.org/zap" @@ -94,7 +93,7 @@ func (e *instanaExporter) pushConvertedTraces(ctx context.Context, td ptrace.Tra return e.export(ctx, e.config.Endpoint, headers, req) } -func newInstanaExporter(cfg config.Exporter, set component.ExporterCreateSettings) *instanaExporter { +func newInstanaExporter(cfg component.ExporterConfig, set component.ExporterCreateSettings) *instanaExporter { iCfg := cfg.(*Config) userAgent := fmt.Sprintf("%s/%s (%s/%s)", set.BuildInfo.Description, set.BuildInfo.Version, runtime.GOOS, runtime.GOARCH) return &instanaExporter{ diff --git a/exporter/instanaexporter/exporter_test.go b/exporter/instanaexporter/exporter_test.go index 858abd0dbfdf..adb78f874596 100644 --- a/exporter/instanaexporter/exporter_test.go +++ b/exporter/instanaexporter/exporter_test.go @@ -21,6 +21,7 @@ import ( "testing" "github.com/stretchr/testify/assert" + "go.opentelemetry.io/collector/component" "go.opentelemetry.io/collector/component/componenttest" "go.opentelemetry.io/collector/config" "go.opentelemetry.io/collector/config/confighttp" @@ -37,7 +38,7 @@ func TestPushConvertedTraces(t *testing.T) { AgentKey: "key11", HTTPClientSettings: confighttp.HTTPClientSettings{Endpoint: traceServer.URL}, Endpoint: traceServer.URL, - ExporterSettings: config.NewExporterSettings(config.NewComponentIDWithName(typeStr, "valid")), + ExporterSettings: config.NewExporterSettings(component.NewIDWithName(typeStr, "valid")), } instanaExporter := newInstanaExporter(&cfg, componenttest.NewNopExporterCreateSettings()) diff --git a/exporter/instanaexporter/factory.go b/exporter/instanaexporter/factory.go index 165499b2ce79..f1ce2395e0a6 100644 --- a/exporter/instanaexporter/factory.go +++ b/exporter/instanaexporter/factory.go @@ -42,9 +42,9 @@ func NewFactory() component.ExporterFactory { } // createDefaultConfig creates the default exporter configuration -func createDefaultConfig() config.Exporter { +func createDefaultConfig() component.ExporterConfig { return &Config{ - ExporterSettings: config.NewExporterSettings(config.NewComponentID(typeStr)), + ExporterSettings: config.NewExporterSettings(component.NewID(typeStr)), HTTPClientSettings: confighttp.HTTPClientSettings{ Endpoint: "", Timeout: 30 * time.Second, @@ -55,7 +55,7 @@ func createDefaultConfig() config.Exporter { } // createTracesExporter creates a trace exporter based on this configuration -func createTracesExporter(ctx context.Context, set component.ExporterCreateSettings, config config.Exporter) (component.TracesExporter, error) { +func createTracesExporter(ctx context.Context, set component.ExporterCreateSettings, config component.ExporterConfig) (component.TracesExporter, error) { cfg := config.(*Config) ctx, cancel := context.WithCancel(ctx) diff --git a/exporter/instanaexporter/factory_test.go b/exporter/instanaexporter/factory_test.go index 73a6e16d5976..d75bce59c8b4 100644 --- a/exporter/instanaexporter/factory_test.go +++ b/exporter/instanaexporter/factory_test.go @@ -21,9 +21,10 @@ import ( "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" + "go.opentelemetry.io/collector/component" + "go.opentelemetry.io/collector/component/componenttest" "go.opentelemetry.io/collector/config" "go.opentelemetry.io/collector/config/confighttp" - "go.opentelemetry.io/collector/config/configtest" "go.opentelemetry.io/collector/confmap/confmaptest" ) @@ -33,7 +34,7 @@ func TestCreateDefaultConfig(t *testing.T) { cfg := factory.CreateDefaultConfig() assert.Equal(t, &Config{ - ExporterSettings: config.NewExporterSettings(config.NewComponentID(typeStr)), + ExporterSettings: config.NewExporterSettings(component.NewID(typeStr)), HTTPClientSettings: confighttp.HTTPClientSettings{ Endpoint: "", Timeout: 30 * time.Second, @@ -42,7 +43,7 @@ func TestCreateDefaultConfig(t *testing.T) { }, }, cfg, "failed to create default config") - assert.NoError(t, configtest.CheckConfigStruct(cfg)) + assert.NoError(t, componenttest.CheckConfigStruct(cfg)) } // TestLoadConfig tests that the configuration is loaded correctly @@ -53,15 +54,15 @@ func TestLoadConfig(t *testing.T) { t.Run("valid config", func(t *testing.T) { cfg := factory.CreateDefaultConfig() - sub, err := cm.Sub(config.NewComponentIDWithName(typeStr, "valid").String()) + sub, err := cm.Sub(component.NewIDWithName(typeStr, "valid").String()) require.NoError(t, err) - require.NoError(t, config.UnmarshalExporter(sub, cfg)) + require.NoError(t, component.UnmarshalExporterConfig(sub, cfg)) err = cfg.Validate() require.NoError(t, err) assert.Equal(t, &Config{ - ExporterSettings: config.NewExporterSettings(config.NewComponentID(typeStr)), + ExporterSettings: config.NewExporterSettings(component.NewID(typeStr)), HTTPClientSettings: confighttp.HTTPClientSettings{ Endpoint: "http://example.com/api/", Timeout: 30 * time.Second, @@ -75,9 +76,9 @@ func TestLoadConfig(t *testing.T) { t.Run("bad endpoint", func(t *testing.T) { cfg := factory.CreateDefaultConfig() - sub, err := cm.Sub(config.NewComponentIDWithName(typeStr, "bad_endpoint").String()) + sub, err := cm.Sub(component.NewIDWithName(typeStr, "bad_endpoint").String()) require.NoError(t, err) - require.NoError(t, config.UnmarshalExporter(sub, cfg)) + require.NoError(t, component.UnmarshalExporterConfig(sub, cfg)) err = cfg.Validate() require.Error(t, err) @@ -85,9 +86,9 @@ func TestLoadConfig(t *testing.T) { t.Run("missing agent key", func(t *testing.T) { cfg := factory.CreateDefaultConfig() - sub, err := cm.Sub(config.NewComponentIDWithName(typeStr, "missing_agent_key").String()) + sub, err := cm.Sub(component.NewIDWithName(typeStr, "missing_agent_key").String()) require.NoError(t, err) - require.NoError(t, config.UnmarshalExporter(sub, cfg)) + require.NoError(t, component.UnmarshalExporterConfig(sub, cfg)) err = cfg.Validate() require.Error(t, err) diff --git a/exporter/instanaexporter/go.mod b/exporter/instanaexporter/go.mod index 47a6a5104855..204e17581344 100644 --- a/exporter/instanaexporter/go.mod +++ b/exporter/instanaexporter/go.mod @@ -3,11 +3,11 @@ module github.com/open-telemetry/opentelemetry-collector-contrib/exporter/instan go 1.18 require ( - github.com/open-telemetry/opentelemetry-collector-contrib/internal/coreinternal v0.0.0-00010101000000-000000000000 + github.com/open-telemetry/opentelemetry-collector-contrib/internal/coreinternal v0.63.0 github.com/stretchr/testify v1.8.1 - go.opentelemetry.io/collector v0.63.2-0.20221104003159-6b27644724d8 - go.opentelemetry.io/collector/pdata v0.63.2-0.20221104003159-6b27644724d8 - go.opentelemetry.io/collector/semconv v0.63.2-0.20221104003159-6b27644724d8 + go.opentelemetry.io/collector v0.63.2-0.20221108014805-0b08d5316426 + go.opentelemetry.io/collector/pdata v0.63.2-0.20221108014805-0b08d5316426 + go.opentelemetry.io/collector/semconv v0.63.2-0.20221108014805-0b08d5316426 go.uber.org/zap v1.23.0 ) @@ -30,7 +30,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.opencensus.io v0.23.0 // indirect + go.opencensus.io v0.24.0 // 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 e68e6d8ade75..c57fde6a2f35 100644 --- a/exporter/instanaexporter/go.sum +++ b/exporter/instanaexporter/go.sum @@ -232,7 +232,7 @@ github.com/prometheus/client_golang v0.9.1/go.mod h1:7SWBe2y4D6OKWSNQJUaRYU/AaXP github.com/prometheus/client_golang v1.0.0/go.mod h1:db9x61etRT2tGnBNRi70OPL5FsnadC4Ky3P0J6CfImo= github.com/prometheus/client_golang v1.7.1/go.mod h1:PY5Wy2awLA44sXw4AOSfFBetzPP4j5+D6mVACh+pe2M= github.com/prometheus/client_golang v1.11.1/go.mod h1:Z6t4BnS23TR94PD6BsDNk8yVqroYurpAkEiz0P2BEV0= -github.com/prometheus/client_golang v1.13.0 h1:b71QUfeo5M8gq2+evJdTPfZhYMAU0uKPkyPJ7TPsloU= +github.com/prometheus/client_golang v1.13.1 h1:3gMjIY2+/hzmqhtUC/aQNYldJA6DtH3CgQvwS+02K1c= github.com/prometheus/client_model v0.0.0-20180712105110-5c3871d89910/go.mod h1:MbSGuTsp3dbXC40dX6PRTWyKYBIrTGTE9sqQNg2J8bo= github.com/prometheus/client_model v0.0.0-20190129233127-fd36f4220a90/go.mod h1:xMI15A0UPsDsEKsMN9yxemIoYk6Tm2C1GtYGdfGttqA= github.com/prometheus/client_model v0.0.0-20190812154241-14fe0d1b01d4/go.mod h1:xMI15A0UPsDsEKsMN9yxemIoYk6Tm2C1GtYGdfGttqA= @@ -269,7 +269,6 @@ github.com/stretchr/testify v1.2.2/go.mod h1:a8OnRcib4nhh0OaRAV+Yts87kKdq0PP7pXf github.com/stretchr/testify v1.3.0/go.mod h1:M5WIy9Dh21IEIfnGCwXGc5bZfKNJtfHm1UVUgZn+9EI= github.com/stretchr/testify v1.4.0/go.mod h1:j7eGeouHqKxXV5pUuKE4zz7dFj8WfuZ+81PSLYec5m4= github.com/stretchr/testify v1.5.1/go.mod h1:5W2xD1RspED5o8YsWQXVCued0rvSQ+mT+I5cxcmMvtA= -github.com/stretchr/testify v1.6.1/go.mod h1:6Fq8oRcR53rry900zMqJjRRixrwX3KX962/h/Wwjteg= github.com/stretchr/testify v1.7.0/go.mod h1:6Fq8oRcR53rry900zMqJjRRixrwX3KX962/h/Wwjteg= github.com/stretchr/testify v1.7.1/go.mod h1:6Fq8oRcR53rry900zMqJjRRixrwX3KX962/h/Wwjteg= github.com/stretchr/testify v1.8.0/go.mod h1:yNjHg4UonilssWZ8iaSj1OCr/vHnekPRkoO+kdMU+MU= @@ -281,14 +280,14 @@ 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.opencensus.io v0.23.0 h1:gqCw0LfLxScz8irSi8exQc7fyQ0fKQU/qnC/X8+V/1M= -go.opencensus.io v0.23.0/go.mod h1:XItmlyltB5F7CS4xOC1DcqMoFqwtC6OG2xF7mCv7P7E= -go.opentelemetry.io/collector v0.63.2-0.20221104003159-6b27644724d8 h1:rOT5HzXXfSISc6FiH012zH2/EFjp37UXfjEqj5BpkWQ= -go.opentelemetry.io/collector v0.63.2-0.20221104003159-6b27644724d8/go.mod h1:JVmeZXugK4ondC6KQgrHTHWiF4JttpG5k6dWPMt62+k= -go.opentelemetry.io/collector/pdata v0.63.2-0.20221104003159-6b27644724d8 h1:7xeTQjfsOm9eogQeIxjSEhlik9qsbBGsnmkQHfyKaRE= -go.opentelemetry.io/collector/pdata v0.63.2-0.20221104003159-6b27644724d8/go.mod h1:IzvXUGQml2mrnvdb8zIlEW3qQs9oFLdD2hLwJdZ+pek= -go.opentelemetry.io/collector/semconv v0.63.2-0.20221104003159-6b27644724d8 h1:jm0sNPyqo6S165QjQYMBHB2nK50wlJbMYM03Yr3Eo2k= -go.opentelemetry.io/collector/semconv v0.63.2-0.20221104003159-6b27644724d8/go.mod h1:5o9yhOa+ABt7g2E5JABDxGZ1PQPbtfxrKNbYn+LOTXU= +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.63.2-0.20221108014805-0b08d5316426 h1:z/wLTMh7/vNxcFUDa5uG7/IPE3tYx6pzCWPV41ghyV8= +go.opentelemetry.io/collector v0.63.2-0.20221108014805-0b08d5316426/go.mod h1:+Zb70q0Rq17dA9FcHTiTjW6g96lvJ8kAZ0c+eWNkAv0= +go.opentelemetry.io/collector/pdata v0.63.2-0.20221108014805-0b08d5316426 h1:wKDpgP0Tx/gWI2SgDGAY1OTSeihhDivbbRqFR79IGTc= +go.opentelemetry.io/collector/pdata v0.63.2-0.20221108014805-0b08d5316426/go.mod h1:IzvXUGQml2mrnvdb8zIlEW3qQs9oFLdD2hLwJdZ+pek= +go.opentelemetry.io/collector/semconv v0.63.2-0.20221108014805-0b08d5316426 h1:pqIl7OC531J6i9ttBCj3zLmZI/BSF4q323YpK0GgKGk= +go.opentelemetry.io/collector/semconv v0.63.2-0.20221108014805-0b08d5316426/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.go b/exporter/jaegerexporter/config.go index ef25f8696db0..7d86197d4418 100644 --- a/exporter/jaegerexporter/config.go +++ b/exporter/jaegerexporter/config.go @@ -15,6 +15,7 @@ package jaegerexporter // import "github.com/open-telemetry/opentelemetry-collector-contrib/exporter/jaegerexporter" import ( + "go.opentelemetry.io/collector/component" "go.opentelemetry.io/collector/config" "go.opentelemetry.io/collector/config/configgrpc" "go.opentelemetry.io/collector/exporter/exporterhelper" @@ -30,7 +31,7 @@ type Config struct { configgrpc.GRPCClientSettings `mapstructure:",squash"` // squash ensures fields are correctly decoded in embedded struct. } -var _ config.Exporter = (*Config)(nil) +var _ component.ExporterConfig = (*Config)(nil) // Validate checks if the exporter configuration is valid func (cfg *Config) Validate() error { diff --git a/exporter/jaegerexporter/config_test.go b/exporter/jaegerexporter/config_test.go index 06c38e05aa20..d2aab27758de 100644 --- a/exporter/jaegerexporter/config_test.go +++ b/exporter/jaegerexporter/config_test.go @@ -21,6 +21,7 @@ import ( "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" + "go.opentelemetry.io/collector/component" "go.opentelemetry.io/collector/config" "go.opentelemetry.io/collector/config/configgrpc" "go.opentelemetry.io/collector/confmap/confmaptest" @@ -34,17 +35,17 @@ func TestLoadConfig(t *testing.T) { require.NoError(t, err) tests := []struct { - id config.ComponentID - expected config.Exporter + id component.ID + expected component.ExporterConfig }{ { - id: config.NewComponentIDWithName(typeStr, ""), + id: component.NewIDWithName(typeStr, ""), expected: createDefaultConfig(), }, { - id: config.NewComponentIDWithName(typeStr, "2"), + id: component.NewIDWithName(typeStr, "2"), expected: &Config{ - ExporterSettings: config.NewExporterSettings(config.NewComponentID(typeStr)), + ExporterSettings: config.NewExporterSettings(component.NewID(typeStr)), TimeoutSettings: exporterhelper.TimeoutSettings{ Timeout: 10 * time.Second, }, @@ -75,7 +76,7 @@ func TestLoadConfig(t *testing.T) { sub, err := cm.Sub(tt.id.String()) require.NoError(t, err) - require.NoError(t, config.UnmarshalExporter(sub, cfg)) + require.NoError(t, component.UnmarshalExporterConfig(sub, cfg)) assert.NoError(t, cfg.Validate()) assert.Equal(t, tt.expected, cfg) diff --git a/exporter/jaegerexporter/exporter_test.go b/exporter/jaegerexporter/exporter_test.go index f020a3d13024..b328c5492b2d 100644 --- a/exporter/jaegerexporter/exporter_test.go +++ b/exporter/jaegerexporter/exporter_test.go @@ -26,6 +26,7 @@ import ( "github.com/jaegertracing/jaeger/proto-gen/api_v2" "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" + "go.opentelemetry.io/collector/component" "go.opentelemetry.io/collector/component/componenttest" "go.opentelemetry.io/collector/config" "go.opentelemetry.io/collector/config/configgrpc" @@ -48,7 +49,7 @@ func TestNew(t *testing.T) { { name: "createExporter", config: Config{ - ExporterSettings: config.NewExporterSettings(config.NewComponentID(typeStr)), + ExporterSettings: config.NewExporterSettings(component.NewID(typeStr)), GRPCClientSettings: configgrpc.GRPCClientSettings{ Headers: nil, Endpoint: "foo.bar", @@ -63,7 +64,7 @@ func TestNew(t *testing.T) { { name: "createExporterWithHeaders", config: Config{ - ExporterSettings: config.NewExporterSettings(config.NewComponentID(typeStr)), + ExporterSettings: config.NewExporterSettings(component.NewID(typeStr)), GRPCClientSettings: configgrpc.GRPCClientSettings{ Headers: map[string]string{"extra-header": "header-value"}, Endpoint: "foo.bar", @@ -75,7 +76,7 @@ func TestNew(t *testing.T) { { name: "createBasicSecureExporter", config: Config{ - ExporterSettings: config.NewExporterSettings(config.NewComponentID(typeStr)), + ExporterSettings: config.NewExporterSettings(component.NewID(typeStr)), GRPCClientSettings: configgrpc.GRPCClientSettings{ Headers: nil, Endpoint: "foo.bar", @@ -87,7 +88,7 @@ func TestNew(t *testing.T) { { name: "createSecureExporterWithClientTLS", config: Config{ - ExporterSettings: config.NewExporterSettings(config.NewComponentID(typeStr)), + ExporterSettings: config.NewExporterSettings(component.NewID(typeStr)), GRPCClientSettings: configgrpc.GRPCClientSettings{ Headers: nil, Endpoint: "foo.bar", @@ -105,7 +106,7 @@ func TestNew(t *testing.T) { { name: "createSecureExporterWithKeepAlive", config: Config{ - ExporterSettings: config.NewExporterSettings(config.NewComponentID(typeStr)), + ExporterSettings: config.NewExporterSettings(component.NewID(typeStr)), GRPCClientSettings: configgrpc.GRPCClientSettings{ Headers: nil, Endpoint: "foo.bar", @@ -128,7 +129,7 @@ func TestNew(t *testing.T) { { name: "createSecureExporterWithMissingFile", config: Config{ - ExporterSettings: config.NewExporterSettings(config.NewComponentID(typeStr)), + ExporterSettings: config.NewExporterSettings(component.NewID(typeStr)), GRPCClientSettings: configgrpc.GRPCClientSettings{ Headers: nil, Endpoint: "foo.bar", diff --git a/exporter/jaegerexporter/factory.go b/exporter/jaegerexporter/factory.go index 031372624df4..4d4e47a1e0be 100644 --- a/exporter/jaegerexporter/factory.go +++ b/exporter/jaegerexporter/factory.go @@ -39,9 +39,9 @@ func NewFactory() component.ExporterFactory { component.WithTracesExporter(createTracesExporter, stability)) } -func createDefaultConfig() config.Exporter { +func createDefaultConfig() component.ExporterConfig { return &Config{ - ExporterSettings: config.NewExporterSettings(config.NewComponentID(typeStr)), + ExporterSettings: config.NewExporterSettings(component.NewID(typeStr)), TimeoutSettings: exporterhelper.NewDefaultTimeoutSettings(), RetrySettings: exporterhelper.NewDefaultRetrySettings(), QueueSettings: exporterhelper.NewDefaultQueueSettings(), @@ -55,7 +55,7 @@ func createDefaultConfig() config.Exporter { func createTracesExporter( _ context.Context, set component.ExporterCreateSettings, - config config.Exporter, + config component.ExporterConfig, ) (component.TracesExporter, error) { expCfg := config.(*Config) diff --git a/exporter/jaegerexporter/factory_test.go b/exporter/jaegerexporter/factory_test.go index 40f55083101b..43ae57be5130 100644 --- a/exporter/jaegerexporter/factory_test.go +++ b/exporter/jaegerexporter/factory_test.go @@ -21,14 +21,13 @@ import ( "github.com/stretchr/testify/assert" "go.opentelemetry.io/collector/component" "go.opentelemetry.io/collector/component/componenttest" - "go.opentelemetry.io/collector/config/configtest" ) func TestCreateDefaultConfig(t *testing.T) { factory := NewFactory() cfg := factory.CreateDefaultConfig() assert.NotNil(t, cfg, "failed to create default config") - assert.NoError(t, configtest.CheckConfigStruct(cfg)) + assert.NoError(t, componenttest.CheckConfigStruct(cfg)) } func TestCreateMetricsExporter(t *testing.T) { diff --git a/exporter/jaegerexporter/go.mod b/exporter/jaegerexporter/go.mod index a8c5e28d877b..6a43c35bfc47 100644 --- a/exporter/jaegerexporter/go.mod +++ b/exporter/jaegerexporter/go.mod @@ -7,9 +7,9 @@ require ( github.com/open-telemetry/opentelemetry-collector-contrib/internal/coreinternal v0.63.0 github.com/open-telemetry/opentelemetry-collector-contrib/pkg/translator/jaeger v0.63.0 github.com/stretchr/testify v1.8.1 - go.opencensus.io v0.23.0 - go.opentelemetry.io/collector v0.63.2-0.20221104003159-6b27644724d8 - go.opentelemetry.io/collector/pdata v0.63.2-0.20221104003159-6b27644724d8 + go.opencensus.io v0.24.0 + go.opentelemetry.io/collector v0.63.2-0.20221108014805-0b08d5316426 + go.opentelemetry.io/collector/pdata v0.63.2-0.20221108014805-0b08d5316426 go.uber.org/zap v1.23.0 google.golang.org/grpc v1.50.1 ) @@ -37,7 +37,7 @@ 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.63.2-0.20221104003159-6b27644724d8 // indirect + go.opentelemetry.io/collector/semconv v0.63.2-0.20221108014805-0b08d5316426 // 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 4dca95a73d1c..da0199456826 100644 --- a/exporter/jaegerexporter/go.sum +++ b/exporter/jaegerexporter/go.sum @@ -255,7 +255,7 @@ github.com/prometheus/client_golang v0.9.1/go.mod h1:7SWBe2y4D6OKWSNQJUaRYU/AaXP github.com/prometheus/client_golang v1.0.0/go.mod h1:db9x61etRT2tGnBNRi70OPL5FsnadC4Ky3P0J6CfImo= github.com/prometheus/client_golang v1.7.1/go.mod h1:PY5Wy2awLA44sXw4AOSfFBetzPP4j5+D6mVACh+pe2M= github.com/prometheus/client_golang v1.11.1/go.mod h1:Z6t4BnS23TR94PD6BsDNk8yVqroYurpAkEiz0P2BEV0= -github.com/prometheus/client_golang v1.13.0 h1:b71QUfeo5M8gq2+evJdTPfZhYMAU0uKPkyPJ7TPsloU= +github.com/prometheus/client_golang v1.13.1 h1:3gMjIY2+/hzmqhtUC/aQNYldJA6DtH3CgQvwS+02K1c= github.com/prometheus/client_model v0.0.0-20180712105110-5c3871d89910/go.mod h1:MbSGuTsp3dbXC40dX6PRTWyKYBIrTGTE9sqQNg2J8bo= github.com/prometheus/client_model v0.0.0-20190129233127-fd36f4220a90/go.mod h1:xMI15A0UPsDsEKsMN9yxemIoYk6Tm2C1GtYGdfGttqA= github.com/prometheus/client_model v0.0.0-20190812154241-14fe0d1b01d4/go.mod h1:xMI15A0UPsDsEKsMN9yxemIoYk6Tm2C1GtYGdfGttqA= @@ -293,7 +293,6 @@ github.com/stretchr/testify v1.2.2/go.mod h1:a8OnRcib4nhh0OaRAV+Yts87kKdq0PP7pXf github.com/stretchr/testify v1.3.0/go.mod h1:M5WIy9Dh21IEIfnGCwXGc5bZfKNJtfHm1UVUgZn+9EI= github.com/stretchr/testify v1.4.0/go.mod h1:j7eGeouHqKxXV5pUuKE4zz7dFj8WfuZ+81PSLYec5m4= github.com/stretchr/testify v1.5.1/go.mod h1:5W2xD1RspED5o8YsWQXVCued0rvSQ+mT+I5cxcmMvtA= -github.com/stretchr/testify v1.6.1/go.mod h1:6Fq8oRcR53rry900zMqJjRRixrwX3KX962/h/Wwjteg= github.com/stretchr/testify v1.7.0/go.mod h1:6Fq8oRcR53rry900zMqJjRRixrwX3KX962/h/Wwjteg= github.com/stretchr/testify v1.7.1/go.mod h1:6Fq8oRcR53rry900zMqJjRRixrwX3KX962/h/Wwjteg= github.com/stretchr/testify v1.8.0/go.mod h1:yNjHg4UonilssWZ8iaSj1OCr/vHnekPRkoO+kdMU+MU= @@ -309,14 +308,14 @@ 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.opencensus.io v0.23.0 h1:gqCw0LfLxScz8irSi8exQc7fyQ0fKQU/qnC/X8+V/1M= -go.opencensus.io v0.23.0/go.mod h1:XItmlyltB5F7CS4xOC1DcqMoFqwtC6OG2xF7mCv7P7E= -go.opentelemetry.io/collector v0.63.2-0.20221104003159-6b27644724d8 h1:rOT5HzXXfSISc6FiH012zH2/EFjp37UXfjEqj5BpkWQ= -go.opentelemetry.io/collector v0.63.2-0.20221104003159-6b27644724d8/go.mod h1:JVmeZXugK4ondC6KQgrHTHWiF4JttpG5k6dWPMt62+k= -go.opentelemetry.io/collector/pdata v0.63.2-0.20221104003159-6b27644724d8 h1:7xeTQjfsOm9eogQeIxjSEhlik9qsbBGsnmkQHfyKaRE= -go.opentelemetry.io/collector/pdata v0.63.2-0.20221104003159-6b27644724d8/go.mod h1:IzvXUGQml2mrnvdb8zIlEW3qQs9oFLdD2hLwJdZ+pek= -go.opentelemetry.io/collector/semconv v0.63.2-0.20221104003159-6b27644724d8 h1:jm0sNPyqo6S165QjQYMBHB2nK50wlJbMYM03Yr3Eo2k= -go.opentelemetry.io/collector/semconv v0.63.2-0.20221104003159-6b27644724d8/go.mod h1:5o9yhOa+ABt7g2E5JABDxGZ1PQPbtfxrKNbYn+LOTXU= +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.63.2-0.20221108014805-0b08d5316426 h1:z/wLTMh7/vNxcFUDa5uG7/IPE3tYx6pzCWPV41ghyV8= +go.opentelemetry.io/collector v0.63.2-0.20221108014805-0b08d5316426/go.mod h1:+Zb70q0Rq17dA9FcHTiTjW6g96lvJ8kAZ0c+eWNkAv0= +go.opentelemetry.io/collector/pdata v0.63.2-0.20221108014805-0b08d5316426 h1:wKDpgP0Tx/gWI2SgDGAY1OTSeihhDivbbRqFR79IGTc= +go.opentelemetry.io/collector/pdata v0.63.2-0.20221108014805-0b08d5316426/go.mod h1:IzvXUGQml2mrnvdb8zIlEW3qQs9oFLdD2hLwJdZ+pek= +go.opentelemetry.io/collector/semconv v0.63.2-0.20221108014805-0b08d5316426 h1:pqIl7OC531J6i9ttBCj3zLmZI/BSF4q323YpK0GgKGk= +go.opentelemetry.io/collector/semconv v0.63.2-0.20221108014805-0b08d5316426/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.go b/exporter/jaegerthrifthttpexporter/config.go index 4f58c64e9bc3..5455c60c7cd5 100644 --- a/exporter/jaegerthrifthttpexporter/config.go +++ b/exporter/jaegerthrifthttpexporter/config.go @@ -15,6 +15,7 @@ package jaegerthrifthttpexporter // import "github.com/open-telemetry/opentelemetry-collector-contrib/exporter/jaegerthrifthttpexporter" import ( + "go.opentelemetry.io/collector/component" "go.opentelemetry.io/collector/config" "go.opentelemetry.io/collector/config/confighttp" ) @@ -25,7 +26,7 @@ type Config struct { confighttp.HTTPClientSettings `mapstructure:",squash"` // squash ensures fields are correctly decoded in embedded struct. } -var _ config.Exporter = (*Config)(nil) +var _ component.ExporterConfig = (*Config)(nil) // Validate checks if the exporter configuration is valid func (cfg *Config) Validate() error { diff --git a/exporter/jaegerthrifthttpexporter/config_test.go b/exporter/jaegerthrifthttpexporter/config_test.go index abd8455c1193..18f975ce96ac 100644 --- a/exporter/jaegerthrifthttpexporter/config_test.go +++ b/exporter/jaegerthrifthttpexporter/config_test.go @@ -21,6 +21,7 @@ import ( "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" + "go.opentelemetry.io/collector/component" "go.opentelemetry.io/collector/config" "go.opentelemetry.io/collector/config/confighttp" "go.opentelemetry.io/collector/confmap/confmaptest" @@ -37,17 +38,17 @@ func TestLoadConfig(t *testing.T) { defaultCfg.Endpoint = "http://jaeger.example:14268/api/traces" tests := []struct { - id config.ComponentID - expected config.Exporter + id component.ID + expected component.ExporterConfig }{ { - id: config.NewComponentIDWithName(typeStr, ""), + id: component.NewIDWithName(typeStr, ""), expected: defaultCfg, }, { - id: config.NewComponentIDWithName(typeStr, "2"), + id: component.NewIDWithName(typeStr, "2"), expected: &Config{ - ExporterSettings: config.NewExporterSettings(config.NewComponentID(typeStr)), + ExporterSettings: config.NewExporterSettings(component.NewID(typeStr)), HTTPClientSettings: confighttp.HTTPClientSettings{ Endpoint: "http://jaeger.example.com/api/traces", Headers: map[string]string{ @@ -67,7 +68,7 @@ func TestLoadConfig(t *testing.T) { sub, err := cm.Sub(tt.id.String()) require.NoError(t, err) - require.NoError(t, config.UnmarshalExporter(sub, cfg)) + require.NoError(t, component.UnmarshalExporterConfig(sub, cfg)) assert.NoError(t, cfg.Validate()) assert.Equal(t, tt.expected, cfg) diff --git a/exporter/jaegerthrifthttpexporter/exporter_test.go b/exporter/jaegerthrifthttpexporter/exporter_test.go index 654ac7088bee..128ec9826dd2 100644 --- a/exporter/jaegerthrifthttpexporter/exporter_test.go +++ b/exporter/jaegerthrifthttpexporter/exporter_test.go @@ -21,6 +21,7 @@ import ( "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" + "go.opentelemetry.io/collector/component" "go.opentelemetry.io/collector/component/componenttest" "go.opentelemetry.io/collector/config" "go.opentelemetry.io/collector/config/confighttp" @@ -31,7 +32,7 @@ const testHTTPAddress = "http://a.example.com:123/at/some/path" func TestNew(t *testing.T) { config := Config{ - ExporterSettings: config.NewExporterSettings(config.NewComponentID(typeStr)), + ExporterSettings: config.NewExporterSettings(component.NewID(typeStr)), HTTPClientSettings: confighttp.HTTPClientSettings{ Endpoint: testHTTPAddress, Headers: map[string]string{"test": "test"}, diff --git a/exporter/jaegerthrifthttpexporter/factory.go b/exporter/jaegerthrifthttpexporter/factory.go index 5920b46c57e6..9deb9bc89cd3 100644 --- a/exporter/jaegerthrifthttpexporter/factory.go +++ b/exporter/jaegerthrifthttpexporter/factory.go @@ -40,9 +40,9 @@ func NewFactory() component.ExporterFactory { component.WithTracesExporter(createTracesExporter, stability)) } -func createDefaultConfig() config.Exporter { +func createDefaultConfig() component.ExporterConfig { return &Config{ - ExporterSettings: config.NewExporterSettings(config.NewComponentID(typeStr)), + ExporterSettings: config.NewExporterSettings(component.NewID(typeStr)), HTTPClientSettings: confighttp.HTTPClientSettings{ Timeout: exporterhelper.NewDefaultTimeoutSettings().Timeout, }, @@ -52,7 +52,7 @@ func createDefaultConfig() config.Exporter { func createTracesExporter( _ context.Context, set component.ExporterCreateSettings, - config config.Exporter, + config component.ExporterConfig, ) (component.TracesExporter, error) { expCfg := config.(*Config) diff --git a/exporter/jaegerthrifthttpexporter/factory_test.go b/exporter/jaegerthrifthttpexporter/factory_test.go index 590a40c0d84b..2765b17fc586 100644 --- a/exporter/jaegerthrifthttpexporter/factory_test.go +++ b/exporter/jaegerthrifthttpexporter/factory_test.go @@ -20,16 +20,16 @@ import ( "time" "github.com/stretchr/testify/assert" + "go.opentelemetry.io/collector/component" "go.opentelemetry.io/collector/component/componenttest" "go.opentelemetry.io/collector/config" "go.opentelemetry.io/collector/config/confighttp" - "go.opentelemetry.io/collector/config/configtest" ) func TestCreateDefaultConfig(t *testing.T) { cfg := createDefaultConfig() assert.NotNil(t, cfg, "failed to create default config") - assert.NoError(t, configtest.CheckConfigStruct(cfg)) + assert.NoError(t, componenttest.CheckConfigStruct(cfg)) } func TestCreateInstanceViaFactory(t *testing.T) { @@ -55,7 +55,7 @@ func TestCreateInstanceViaFactory(t *testing.T) { func TestFactory_CreateTracesExporter(t *testing.T) { config := &Config{ - ExporterSettings: config.NewExporterSettings(config.NewComponentID(typeStr)), + ExporterSettings: config.NewExporterSettings(component.NewID(typeStr)), HTTPClientSettings: confighttp.HTTPClientSettings{ Endpoint: "http://jaeger.example.com/api/traces", Headers: map[string]string{ @@ -81,14 +81,14 @@ func TestFactory_CreateTracesExporterFails(t *testing.T) { { name: "empty_url", config: &Config{ - ExporterSettings: config.NewExporterSettings(config.NewComponentID(typeStr)), + ExporterSettings: config.NewExporterSettings(component.NewID(typeStr)), }, errorMessage: "\"jaeger_thrift\" config requires a valid \"endpoint\": parse \"\": empty url", }, { name: "invalid_url", config: &Config{ - ExporterSettings: config.NewExporterSettings(config.NewComponentID(typeStr)), + ExporterSettings: config.NewExporterSettings(component.NewID(typeStr)), HTTPClientSettings: confighttp.HTTPClientSettings{ Endpoint: ".example:123", }, @@ -98,7 +98,7 @@ func TestFactory_CreateTracesExporterFails(t *testing.T) { { name: "negative_duration", config: &Config{ - ExporterSettings: config.NewExporterSettings(config.NewComponentID(typeStr)), + ExporterSettings: config.NewExporterSettings(component.NewID(typeStr)), HTTPClientSettings: confighttp.HTTPClientSettings{ Endpoint: "example.com:123", Timeout: -2 * time.Second, diff --git a/exporter/jaegerthrifthttpexporter/go.mod b/exporter/jaegerthrifthttpexporter/go.mod index 639763a48da5..3fcced718c7e 100644 --- a/exporter/jaegerthrifthttpexporter/go.mod +++ b/exporter/jaegerthrifthttpexporter/go.mod @@ -7,8 +7,8 @@ require ( github.com/jaegertracing/jaeger v1.39.0 github.com/open-telemetry/opentelemetry-collector-contrib/pkg/translator/jaeger v0.63.0 github.com/stretchr/testify v1.8.1 - go.opentelemetry.io/collector v0.63.2-0.20221104003159-6b27644724d8 - go.opentelemetry.io/collector/pdata v0.63.2-0.20221104003159-6b27644724d8 + go.opentelemetry.io/collector v0.63.2-0.20221108014805-0b08d5316426 + go.opentelemetry.io/collector/pdata v0.63.2-0.20221108014805-0b08d5316426 ) require ( @@ -35,8 +35,8 @@ require ( github.com/rs/cors v1.8.2 // indirect 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.23.0 // indirect - go.opentelemetry.io/collector/semconv v0.63.2-0.20221104003159-6b27644724d8 // indirect + go.opencensus.io v0.24.0 // indirect + go.opentelemetry.io/collector/semconv v0.63.2-0.20221108014805-0b08d5316426 // 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 28b4fd66c1ed..bc63609b41e0 100644 --- a/exporter/jaegerthrifthttpexporter/go.sum +++ b/exporter/jaegerthrifthttpexporter/go.sum @@ -242,7 +242,7 @@ github.com/prometheus/client_golang v0.9.1/go.mod h1:7SWBe2y4D6OKWSNQJUaRYU/AaXP github.com/prometheus/client_golang v1.0.0/go.mod h1:db9x61etRT2tGnBNRi70OPL5FsnadC4Ky3P0J6CfImo= github.com/prometheus/client_golang v1.7.1/go.mod h1:PY5Wy2awLA44sXw4AOSfFBetzPP4j5+D6mVACh+pe2M= github.com/prometheus/client_golang v1.11.1/go.mod h1:Z6t4BnS23TR94PD6BsDNk8yVqroYurpAkEiz0P2BEV0= -github.com/prometheus/client_golang v1.13.0 h1:b71QUfeo5M8gq2+evJdTPfZhYMAU0uKPkyPJ7TPsloU= +github.com/prometheus/client_golang v1.13.1 h1:3gMjIY2+/hzmqhtUC/aQNYldJA6DtH3CgQvwS+02K1c= github.com/prometheus/client_model v0.0.0-20180712105110-5c3871d89910/go.mod h1:MbSGuTsp3dbXC40dX6PRTWyKYBIrTGTE9sqQNg2J8bo= github.com/prometheus/client_model v0.0.0-20190129233127-fd36f4220a90/go.mod h1:xMI15A0UPsDsEKsMN9yxemIoYk6Tm2C1GtYGdfGttqA= github.com/prometheus/client_model v0.0.0-20190812154241-14fe0d1b01d4/go.mod h1:xMI15A0UPsDsEKsMN9yxemIoYk6Tm2C1GtYGdfGttqA= @@ -281,7 +281,6 @@ github.com/stretchr/testify v1.2.2/go.mod h1:a8OnRcib4nhh0OaRAV+Yts87kKdq0PP7pXf github.com/stretchr/testify v1.3.0/go.mod h1:M5WIy9Dh21IEIfnGCwXGc5bZfKNJtfHm1UVUgZn+9EI= github.com/stretchr/testify v1.4.0/go.mod h1:j7eGeouHqKxXV5pUuKE4zz7dFj8WfuZ+81PSLYec5m4= github.com/stretchr/testify v1.5.1/go.mod h1:5W2xD1RspED5o8YsWQXVCued0rvSQ+mT+I5cxcmMvtA= -github.com/stretchr/testify v1.6.1/go.mod h1:6Fq8oRcR53rry900zMqJjRRixrwX3KX962/h/Wwjteg= github.com/stretchr/testify v1.7.0/go.mod h1:6Fq8oRcR53rry900zMqJjRRixrwX3KX962/h/Wwjteg= github.com/stretchr/testify v1.7.1/go.mod h1:6Fq8oRcR53rry900zMqJjRRixrwX3KX962/h/Wwjteg= github.com/stretchr/testify v1.8.0/go.mod h1:yNjHg4UonilssWZ8iaSj1OCr/vHnekPRkoO+kdMU+MU= @@ -297,14 +296,14 @@ 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.opencensus.io v0.23.0 h1:gqCw0LfLxScz8irSi8exQc7fyQ0fKQU/qnC/X8+V/1M= -go.opencensus.io v0.23.0/go.mod h1:XItmlyltB5F7CS4xOC1DcqMoFqwtC6OG2xF7mCv7P7E= -go.opentelemetry.io/collector v0.63.2-0.20221104003159-6b27644724d8 h1:rOT5HzXXfSISc6FiH012zH2/EFjp37UXfjEqj5BpkWQ= -go.opentelemetry.io/collector v0.63.2-0.20221104003159-6b27644724d8/go.mod h1:JVmeZXugK4ondC6KQgrHTHWiF4JttpG5k6dWPMt62+k= -go.opentelemetry.io/collector/pdata v0.63.2-0.20221104003159-6b27644724d8 h1:7xeTQjfsOm9eogQeIxjSEhlik9qsbBGsnmkQHfyKaRE= -go.opentelemetry.io/collector/pdata v0.63.2-0.20221104003159-6b27644724d8/go.mod h1:IzvXUGQml2mrnvdb8zIlEW3qQs9oFLdD2hLwJdZ+pek= -go.opentelemetry.io/collector/semconv v0.63.2-0.20221104003159-6b27644724d8 h1:jm0sNPyqo6S165QjQYMBHB2nK50wlJbMYM03Yr3Eo2k= -go.opentelemetry.io/collector/semconv v0.63.2-0.20221104003159-6b27644724d8/go.mod h1:5o9yhOa+ABt7g2E5JABDxGZ1PQPbtfxrKNbYn+LOTXU= +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.63.2-0.20221108014805-0b08d5316426 h1:z/wLTMh7/vNxcFUDa5uG7/IPE3tYx6pzCWPV41ghyV8= +go.opentelemetry.io/collector v0.63.2-0.20221108014805-0b08d5316426/go.mod h1:+Zb70q0Rq17dA9FcHTiTjW6g96lvJ8kAZ0c+eWNkAv0= +go.opentelemetry.io/collector/pdata v0.63.2-0.20221108014805-0b08d5316426 h1:wKDpgP0Tx/gWI2SgDGAY1OTSeihhDivbbRqFR79IGTc= +go.opentelemetry.io/collector/pdata v0.63.2-0.20221108014805-0b08d5316426/go.mod h1:IzvXUGQml2mrnvdb8zIlEW3qQs9oFLdD2hLwJdZ+pek= +go.opentelemetry.io/collector/semconv v0.63.2-0.20221108014805-0b08d5316426 h1:pqIl7OC531J6i9ttBCj3zLmZI/BSF4q323YpK0GgKGk= +go.opentelemetry.io/collector/semconv v0.63.2-0.20221108014805-0b08d5316426/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.go b/exporter/kafkaexporter/config.go index 9d043a0922fe..594fada19421 100644 --- a/exporter/kafkaexporter/config.go +++ b/exporter/kafkaexporter/config.go @@ -19,6 +19,7 @@ import ( "time" "github.com/Shopify/sarama" + "go.opentelemetry.io/collector/component" "go.opentelemetry.io/collector/config" "go.opentelemetry.io/collector/exporter/exporterhelper" ) @@ -99,7 +100,7 @@ type MetadataRetry struct { Backoff time.Duration `mapstructure:"backoff"` } -var _ config.Exporter = (*Config)(nil) +var _ component.ExporterConfig = (*Config)(nil) // Validate checks if the exporter configuration is valid func (cfg *Config) Validate() error { diff --git a/exporter/kafkaexporter/config_test.go b/exporter/kafkaexporter/config_test.go index a6f60bb769ba..54c123a4c425 100644 --- a/exporter/kafkaexporter/config_test.go +++ b/exporter/kafkaexporter/config_test.go @@ -23,6 +23,7 @@ import ( "github.com/Shopify/sarama" "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" + "go.opentelemetry.io/collector/component" "go.opentelemetry.io/collector/config" "go.opentelemetry.io/collector/confmap/confmaptest" "go.opentelemetry.io/collector/exporter/exporterhelper" @@ -35,13 +36,13 @@ func TestLoadConfig(t *testing.T) { require.NoError(t, err) tests := []struct { - id config.ComponentID - expected config.Exporter + id component.ID + expected component.ExporterConfig }{ { - id: config.NewComponentIDWithName(typeStr, ""), + id: component.NewIDWithName(typeStr, ""), expected: &Config{ - ExporterSettings: config.NewExporterSettings(config.NewComponentID(typeStr)), + ExporterSettings: config.NewExporterSettings(component.NewID(typeStr)), TimeoutSettings: exporterhelper.TimeoutSettings{ Timeout: 10 * time.Second, }, @@ -88,7 +89,7 @@ func TestLoadConfig(t *testing.T) { sub, err := cm.Sub(tt.id.String()) require.NoError(t, err) - require.NoError(t, config.UnmarshalExporter(sub, cfg)) + require.NoError(t, component.UnmarshalExporterConfig(sub, cfg)) assert.NoError(t, cfg.Validate()) assert.Equal(t, tt.expected, cfg) diff --git a/exporter/kafkaexporter/factory.go b/exporter/kafkaexporter/factory.go index 747aea29cf33..5b9bf06afac1 100644 --- a/exporter/kafkaexporter/factory.go +++ b/exporter/kafkaexporter/factory.go @@ -81,9 +81,9 @@ func NewFactory(options ...FactoryOption) component.ExporterFactory { ) } -func createDefaultConfig() config.Exporter { +func createDefaultConfig() component.ExporterConfig { return &Config{ - ExporterSettings: config.NewExporterSettings(config.NewComponentID(typeStr)), + ExporterSettings: config.NewExporterSettings(component.NewID(typeStr)), TimeoutSettings: exporterhelper.NewDefaultTimeoutSettings(), RetrySettings: exporterhelper.NewDefaultRetrySettings(), QueueSettings: exporterhelper.NewDefaultQueueSettings(), @@ -116,7 +116,7 @@ type kafkaExporterFactory struct { func (f *kafkaExporterFactory) createTracesExporter( ctx context.Context, set component.ExporterCreateSettings, - cfg config.Exporter, + cfg component.ExporterConfig, ) (component.TracesExporter, error) { oCfg := *(cfg.(*Config)) // Clone the config if oCfg.Topic == "" { @@ -146,7 +146,7 @@ func (f *kafkaExporterFactory) createTracesExporter( func (f *kafkaExporterFactory) createMetricsExporter( ctx context.Context, set component.ExporterCreateSettings, - cfg config.Exporter, + cfg component.ExporterConfig, ) (component.MetricsExporter, error) { oCfg := *(cfg.(*Config)) // Clone the config if oCfg.Topic == "" { @@ -176,7 +176,7 @@ func (f *kafkaExporterFactory) createMetricsExporter( func (f *kafkaExporterFactory) createLogsExporter( ctx context.Context, set component.ExporterCreateSettings, - cfg config.Exporter, + cfg component.ExporterConfig, ) (component.LogsExporter, error) { oCfg := *(cfg.(*Config)) // Clone the config if oCfg.Topic == "" { diff --git a/exporter/kafkaexporter/factory_test.go b/exporter/kafkaexporter/factory_test.go index 8d178fe7e52e..fbf940d711dc 100644 --- a/exporter/kafkaexporter/factory_test.go +++ b/exporter/kafkaexporter/factory_test.go @@ -23,14 +23,13 @@ import ( "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" "go.opentelemetry.io/collector/component/componenttest" - "go.opentelemetry.io/collector/config/configtest" "go.opentelemetry.io/collector/pdata/ptrace" ) func TestCreateDefaultConfig(t *testing.T) { cfg := createDefaultConfig().(*Config) assert.NotNil(t, cfg, "failed to create default config") - assert.NoError(t, configtest.CheckConfigStruct(cfg)) + assert.NoError(t, componenttest.CheckConfigStruct(cfg)) assert.Equal(t, []string{defaultBroker}, cfg.Brokers) assert.Equal(t, "", cfg.Topic) } diff --git a/exporter/kafkaexporter/go.mod b/exporter/kafkaexporter/go.mod index 265515bda05a..0a33053f15b7 100644 --- a/exporter/kafkaexporter/go.mod +++ b/exporter/kafkaexporter/go.mod @@ -11,9 +11,9 @@ require ( github.com/open-telemetry/opentelemetry-collector-contrib/pkg/translator/jaeger v0.63.0 github.com/stretchr/testify v1.8.1 github.com/xdg-go/scram v1.1.1 - go.opentelemetry.io/collector v0.63.2-0.20221104003159-6b27644724d8 - go.opentelemetry.io/collector/pdata v0.63.2-0.20221104003159-6b27644724d8 - go.opentelemetry.io/collector/semconv v0.63.2-0.20221104003159-6b27644724d8 + go.opentelemetry.io/collector v0.63.2-0.20221108014805-0b08d5316426 + go.opentelemetry.io/collector/pdata v0.63.2-0.20221108014805-0b08d5316426 + go.opentelemetry.io/collector/semconv v0.63.2-0.20221108014805-0b08d5316426 go.uber.org/multierr v1.8.0 go.uber.org/zap v1.23.0 ) @@ -52,7 +52,7 @@ require ( github.com/uber/jaeger-lib v2.4.1+incompatible // indirect github.com/xdg-go/pbkdf2 v1.0.0 // indirect github.com/xdg-go/stringprep v1.0.3 // indirect - go.opencensus.io v0.23.0 // indirect + go.opencensus.io v0.24.0 // 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 8e51ba779d63..457d2dd54b83 100644 --- a/exporter/kafkaexporter/go.sum +++ b/exporter/kafkaexporter/go.sum @@ -271,7 +271,7 @@ github.com/prometheus/client_golang v0.9.1/go.mod h1:7SWBe2y4D6OKWSNQJUaRYU/AaXP github.com/prometheus/client_golang v1.0.0/go.mod h1:db9x61etRT2tGnBNRi70OPL5FsnadC4Ky3P0J6CfImo= github.com/prometheus/client_golang v1.7.1/go.mod h1:PY5Wy2awLA44sXw4AOSfFBetzPP4j5+D6mVACh+pe2M= github.com/prometheus/client_golang v1.11.1/go.mod h1:Z6t4BnS23TR94PD6BsDNk8yVqroYurpAkEiz0P2BEV0= -github.com/prometheus/client_golang v1.13.0 h1:b71QUfeo5M8gq2+evJdTPfZhYMAU0uKPkyPJ7TPsloU= +github.com/prometheus/client_golang v1.13.1 h1:3gMjIY2+/hzmqhtUC/aQNYldJA6DtH3CgQvwS+02K1c= github.com/prometheus/client_model v0.0.0-20180712105110-5c3871d89910/go.mod h1:MbSGuTsp3dbXC40dX6PRTWyKYBIrTGTE9sqQNg2J8bo= github.com/prometheus/client_model v0.0.0-20190129233127-fd36f4220a90/go.mod h1:xMI15A0UPsDsEKsMN9yxemIoYk6Tm2C1GtYGdfGttqA= github.com/prometheus/client_model v0.0.0-20190812154241-14fe0d1b01d4/go.mod h1:xMI15A0UPsDsEKsMN9yxemIoYk6Tm2C1GtYGdfGttqA= @@ -310,7 +310,6 @@ github.com/stretchr/testify v1.2.2/go.mod h1:a8OnRcib4nhh0OaRAV+Yts87kKdq0PP7pXf github.com/stretchr/testify v1.3.0/go.mod h1:M5WIy9Dh21IEIfnGCwXGc5bZfKNJtfHm1UVUgZn+9EI= github.com/stretchr/testify v1.4.0/go.mod h1:j7eGeouHqKxXV5pUuKE4zz7dFj8WfuZ+81PSLYec5m4= github.com/stretchr/testify v1.5.1/go.mod h1:5W2xD1RspED5o8YsWQXVCued0rvSQ+mT+I5cxcmMvtA= -github.com/stretchr/testify v1.6.1/go.mod h1:6Fq8oRcR53rry900zMqJjRRixrwX3KX962/h/Wwjteg= github.com/stretchr/testify v1.7.0/go.mod h1:6Fq8oRcR53rry900zMqJjRRixrwX3KX962/h/Wwjteg= github.com/stretchr/testify v1.7.1/go.mod h1:6Fq8oRcR53rry900zMqJjRRixrwX3KX962/h/Wwjteg= github.com/stretchr/testify v1.8.0/go.mod h1:yNjHg4UonilssWZ8iaSj1OCr/vHnekPRkoO+kdMU+MU= @@ -332,14 +331,14 @@ 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.opencensus.io v0.23.0 h1:gqCw0LfLxScz8irSi8exQc7fyQ0fKQU/qnC/X8+V/1M= -go.opencensus.io v0.23.0/go.mod h1:XItmlyltB5F7CS4xOC1DcqMoFqwtC6OG2xF7mCv7P7E= -go.opentelemetry.io/collector v0.63.2-0.20221104003159-6b27644724d8 h1:rOT5HzXXfSISc6FiH012zH2/EFjp37UXfjEqj5BpkWQ= -go.opentelemetry.io/collector v0.63.2-0.20221104003159-6b27644724d8/go.mod h1:JVmeZXugK4ondC6KQgrHTHWiF4JttpG5k6dWPMt62+k= -go.opentelemetry.io/collector/pdata v0.63.2-0.20221104003159-6b27644724d8 h1:7xeTQjfsOm9eogQeIxjSEhlik9qsbBGsnmkQHfyKaRE= -go.opentelemetry.io/collector/pdata v0.63.2-0.20221104003159-6b27644724d8/go.mod h1:IzvXUGQml2mrnvdb8zIlEW3qQs9oFLdD2hLwJdZ+pek= -go.opentelemetry.io/collector/semconv v0.63.2-0.20221104003159-6b27644724d8 h1:jm0sNPyqo6S165QjQYMBHB2nK50wlJbMYM03Yr3Eo2k= -go.opentelemetry.io/collector/semconv v0.63.2-0.20221104003159-6b27644724d8/go.mod h1:5o9yhOa+ABt7g2E5JABDxGZ1PQPbtfxrKNbYn+LOTXU= +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.63.2-0.20221108014805-0b08d5316426 h1:z/wLTMh7/vNxcFUDa5uG7/IPE3tYx6pzCWPV41ghyV8= +go.opentelemetry.io/collector v0.63.2-0.20221108014805-0b08d5316426/go.mod h1:+Zb70q0Rq17dA9FcHTiTjW6g96lvJ8kAZ0c+eWNkAv0= +go.opentelemetry.io/collector/pdata v0.63.2-0.20221108014805-0b08d5316426 h1:wKDpgP0Tx/gWI2SgDGAY1OTSeihhDivbbRqFR79IGTc= +go.opentelemetry.io/collector/pdata v0.63.2-0.20221108014805-0b08d5316426/go.mod h1:IzvXUGQml2mrnvdb8zIlEW3qQs9oFLdD2hLwJdZ+pek= +go.opentelemetry.io/collector/semconv v0.63.2-0.20221108014805-0b08d5316426 h1:pqIl7OC531J6i9ttBCj3zLmZI/BSF4q323YpK0GgKGk= +go.opentelemetry.io/collector/semconv v0.63.2-0.20221108014805-0b08d5316426/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/config_test.go b/exporter/loadbalancingexporter/config_test.go index cdb99d082e5d..edf50b965791 100644 --- a/exporter/loadbalancingexporter/config_test.go +++ b/exporter/loadbalancingexporter/config_test.go @@ -19,7 +19,7 @@ import ( "testing" "github.com/stretchr/testify/require" - "go.opentelemetry.io/collector/config" + "go.opentelemetry.io/collector/component" "go.opentelemetry.io/collector/confmap/confmaptest" ) @@ -29,8 +29,8 @@ func TestLoadConfig(t *testing.T) { factory := NewFactory() cfg := factory.CreateDefaultConfig() - sub, err := cm.Sub(config.NewComponentIDWithName(typeStr, "").String()) + sub, err := cm.Sub(component.NewIDWithName(typeStr, "").String()) require.NoError(t, err) - require.NoError(t, config.UnmarshalExporter(sub, cfg)) + require.NoError(t, component.UnmarshalExporterConfig(sub, cfg)) require.NotNil(t, cfg) } diff --git a/exporter/loadbalancingexporter/factory.go b/exporter/loadbalancingexporter/factory.go index f3d80a7e82c2..56cf29498c5d 100644 --- a/exporter/loadbalancingexporter/factory.go +++ b/exporter/loadbalancingexporter/factory.go @@ -42,22 +42,22 @@ func NewFactory() component.ExporterFactory { ) } -func createDefaultConfig() config.Exporter { +func createDefaultConfig() component.ExporterConfig { otlpFactory := otlpexporter.NewFactory() otlpDefaultCfg := otlpFactory.CreateDefaultConfig().(*otlpexporter.Config) return &Config{ - ExporterSettings: config.NewExporterSettings(config.NewComponentID(typeStr)), + ExporterSettings: config.NewExporterSettings(component.NewID(typeStr)), Protocol: Protocol{ OTLP: *otlpDefaultCfg, }, } } -func createTracesExporter(_ context.Context, params component.ExporterCreateSettings, cfg config.Exporter) (component.TracesExporter, error) { +func createTracesExporter(_ context.Context, params component.ExporterCreateSettings, cfg component.ExporterConfig) (component.TracesExporter, error) { return newTracesExporter(params, cfg) } -func createLogsExporter(_ context.Context, params component.ExporterCreateSettings, cfg config.Exporter) (component.LogsExporter, error) { +func createLogsExporter(_ context.Context, params component.ExporterCreateSettings, cfg component.ExporterConfig) (component.LogsExporter, error) { return newLogsExporter(params, cfg) } diff --git a/exporter/loadbalancingexporter/factory_test.go b/exporter/loadbalancingexporter/factory_test.go index 8e70f86be389..18b5a92b248d 100644 --- a/exporter/loadbalancingexporter/factory_test.go +++ b/exporter/loadbalancingexporter/factory_test.go @@ -19,6 +19,7 @@ import ( "testing" "github.com/stretchr/testify/assert" + "go.opentelemetry.io/collector/component" "go.opentelemetry.io/collector/component/componenttest" "go.opentelemetry.io/collector/config" ) @@ -28,7 +29,7 @@ func TestTracesExporterGetsCreatedWithValidConfiguration(t *testing.T) { factory := NewFactory() creationParams := componenttest.NewNopExporterCreateSettings() cfg := &Config{ - ExporterSettings: config.NewExporterSettings(config.NewComponentID(typeStr)), + ExporterSettings: config.NewExporterSettings(component.NewID(typeStr)), Resolver: ResolverSettings{ Static: &StaticResolver{Hostnames: []string{"endpoint-1"}}, }, @@ -47,7 +48,7 @@ func TestLogExporterGetsCreatedWithValidConfiguration(t *testing.T) { factory := NewFactory() creationParams := componenttest.NewNopExporterCreateSettings() cfg := &Config{ - ExporterSettings: config.NewExporterSettings(config.NewComponentID(typeStr)), + ExporterSettings: config.NewExporterSettings(component.NewID(typeStr)), Resolver: ResolverSettings{ Static: &StaticResolver{Hostnames: []string{"endpoint-1"}}, }, diff --git a/exporter/loadbalancingexporter/go.mod b/exporter/loadbalancingexporter/go.mod index a8533c2dd823..969b726be519 100644 --- a/exporter/loadbalancingexporter/go.mod +++ b/exporter/loadbalancingexporter/go.mod @@ -5,11 +5,11 @@ go 1.18 require ( github.com/open-telemetry/opentelemetry-collector-contrib/pkg/batchpersignal v0.63.0 github.com/stretchr/testify v1.8.1 - go.opencensus.io v0.23.0 - go.opentelemetry.io/collector v0.63.2-0.20221104003159-6b27644724d8 - go.opentelemetry.io/collector/exporter/otlpexporter v0.63.2-0.20221104003159-6b27644724d8 - go.opentelemetry.io/collector/pdata v0.63.2-0.20221104003159-6b27644724d8 - go.opentelemetry.io/collector/semconv v0.63.2-0.20221104003159-6b27644724d8 + go.opencensus.io v0.24.0 + go.opentelemetry.io/collector v0.63.2-0.20221108014805-0b08d5316426 + go.opentelemetry.io/collector/exporter/otlpexporter v0.63.2-0.20221108014805-0b08d5316426 + go.opentelemetry.io/collector/pdata v0.63.2-0.20221108014805-0b08d5316426 + go.opentelemetry.io/collector/semconv v0.63.2-0.20221108014805-0b08d5316426 go.uber.org/atomic v1.10.0 go.uber.org/multierr v1.8.0 go.uber.org/zap v1.23.0 @@ -48,7 +48,7 @@ require ( github.com/pelletier/go-toml v1.9.4 // indirect github.com/pmezard/go-difflib v1.0.0 // indirect github.com/power-devops/perfstat v0.0.0-20210106213030-5aafc221ea8c // indirect - github.com/prometheus/client_golang v1.13.0 // indirect + github.com/prometheus/client_golang v1.13.1 // indirect github.com/prometheus/client_model v0.3.0 // indirect github.com/prometheus/common v0.37.0 // indirect github.com/prometheus/procfs v0.8.0 // indirect diff --git a/exporter/loadbalancingexporter/go.sum b/exporter/loadbalancingexporter/go.sum index 2d4cf1a8445f..70e07b021e53 100644 --- a/exporter/loadbalancingexporter/go.sum +++ b/exporter/loadbalancingexporter/go.sum @@ -337,8 +337,9 @@ github.com/prometheus/client_golang v1.11.0/go.mod h1:Z6t4BnS23TR94PD6BsDNk8yVqr github.com/prometheus/client_golang v1.11.1/go.mod h1:Z6t4BnS23TR94PD6BsDNk8yVqroYurpAkEiz0P2BEV0= github.com/prometheus/client_golang v1.12.1/go.mod h1:3Z9XVyYiZYEO+YQWt3RD2R3jrbd179Rt297l4aS6nDY= github.com/prometheus/client_golang v1.12.2/go.mod h1:3Z9XVyYiZYEO+YQWt3RD2R3jrbd179Rt297l4aS6nDY= -github.com/prometheus/client_golang v1.13.0 h1:b71QUfeo5M8gq2+evJdTPfZhYMAU0uKPkyPJ7TPsloU= github.com/prometheus/client_golang v1.13.0/go.mod h1:vTeo+zgvILHsnnj/39Ou/1fPN5nJFOEMgftOUOmlvYQ= +github.com/prometheus/client_golang v1.13.1 h1:3gMjIY2+/hzmqhtUC/aQNYldJA6DtH3CgQvwS+02K1c= +github.com/prometheus/client_golang v1.13.1/go.mod h1:vTeo+zgvILHsnnj/39Ou/1fPN5nJFOEMgftOUOmlvYQ= github.com/prometheus/client_model v0.0.0-20180712105110-5c3871d89910/go.mod h1:MbSGuTsp3dbXC40dX6PRTWyKYBIrTGTE9sqQNg2J8bo= github.com/prometheus/client_model v0.0.0-20190129233127-fd36f4220a90/go.mod h1:xMI15A0UPsDsEKsMN9yxemIoYk6Tm2C1GtYGdfGttqA= github.com/prometheus/client_model v0.0.0-20190812154241-14fe0d1b01d4/go.mod h1:xMI15A0UPsDsEKsMN9yxemIoYk6Tm2C1GtYGdfGttqA= @@ -414,19 +415,20 @@ 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.opencensus.io v0.23.0 h1:gqCw0LfLxScz8irSi8exQc7fyQ0fKQU/qnC/X8+V/1M= go.opencensus.io v0.23.0/go.mod h1:XItmlyltB5F7CS4xOC1DcqMoFqwtC6OG2xF7mCv7P7E= -go.opentelemetry.io/collector v0.63.2-0.20221104003159-6b27644724d8 h1:rOT5HzXXfSISc6FiH012zH2/EFjp37UXfjEqj5BpkWQ= -go.opentelemetry.io/collector v0.63.2-0.20221104003159-6b27644724d8/go.mod h1:JVmeZXugK4ondC6KQgrHTHWiF4JttpG5k6dWPMt62+k= -go.opentelemetry.io/collector/exporter/otlpexporter v0.63.2-0.20221104003159-6b27644724d8 h1:LH4Xta7BzlK9kJwpYqdUApjHsv2rU+zivpTE8Iu7KJM= -go.opentelemetry.io/collector/exporter/otlpexporter v0.63.2-0.20221104003159-6b27644724d8/go.mod h1:t1QwWfBfdEsI80R28T9PeVFGm8f32ZGLdY+CAEfr2LI= +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.63.2-0.20221108014805-0b08d5316426 h1:z/wLTMh7/vNxcFUDa5uG7/IPE3tYx6pzCWPV41ghyV8= +go.opentelemetry.io/collector v0.63.2-0.20221108014805-0b08d5316426/go.mod h1:+Zb70q0Rq17dA9FcHTiTjW6g96lvJ8kAZ0c+eWNkAv0= +go.opentelemetry.io/collector/exporter/otlpexporter v0.63.2-0.20221108014805-0b08d5316426 h1:zPTV1p+QFGd2e7f4DEwkujkeezTBGkurl2wrM9QZ3Dc= +go.opentelemetry.io/collector/exporter/otlpexporter v0.63.2-0.20221108014805-0b08d5316426/go.mod h1:ZdasRXXeeuXukj6gfIb4VJw3W5N4+fhMagKE1TEMOxM= go.opentelemetry.io/collector/extension/zpagesextension v0.0.0-20221102221454-bfc45c16c979 h1:YW7BL8ftoJ7k+EtnMICw1KWASLuSDIhbF7SjjgWMCl4= -go.opentelemetry.io/collector/pdata v0.63.2-0.20221104003159-6b27644724d8 h1:7xeTQjfsOm9eogQeIxjSEhlik9qsbBGsnmkQHfyKaRE= -go.opentelemetry.io/collector/pdata v0.63.2-0.20221104003159-6b27644724d8/go.mod h1:IzvXUGQml2mrnvdb8zIlEW3qQs9oFLdD2hLwJdZ+pek= +go.opentelemetry.io/collector/pdata v0.63.2-0.20221108014805-0b08d5316426 h1:wKDpgP0Tx/gWI2SgDGAY1OTSeihhDivbbRqFR79IGTc= +go.opentelemetry.io/collector/pdata v0.63.2-0.20221108014805-0b08d5316426/go.mod h1:IzvXUGQml2mrnvdb8zIlEW3qQs9oFLdD2hLwJdZ+pek= go.opentelemetry.io/collector/processor/batchprocessor v0.0.0-20221103161931-a167b006e8c0 h1:MybyhzAzHIb85NOg5yHQixODm6fq6kJnOTl6xb7GxFc= go.opentelemetry.io/collector/processor/batchprocessor v0.0.0-20221103161931-a167b006e8c0/go.mod h1:WBv1Nayi8p12K0vxLxTkHpRGr79JXYT3TXL2X0B/PRU= -go.opentelemetry.io/collector/semconv v0.63.2-0.20221104003159-6b27644724d8 h1:jm0sNPyqo6S165QjQYMBHB2nK50wlJbMYM03Yr3Eo2k= -go.opentelemetry.io/collector/semconv v0.63.2-0.20221104003159-6b27644724d8/go.mod h1:5o9yhOa+ABt7g2E5JABDxGZ1PQPbtfxrKNbYn+LOTXU= +go.opentelemetry.io/collector/semconv v0.63.2-0.20221108014805-0b08d5316426 h1:pqIl7OC531J6i9ttBCj3zLmZI/BSF4q323YpK0GgKGk= +go.opentelemetry.io/collector/semconv v0.63.2-0.20221108014805-0b08d5316426/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.go b/exporter/loadbalancingexporter/loadbalancer.go index d2c16bbab07c..91f320236eaa 100644 --- a/exporter/loadbalancingexporter/loadbalancer.go +++ b/exporter/loadbalancingexporter/loadbalancer.go @@ -22,7 +22,6 @@ import ( "sync" "go.opentelemetry.io/collector/component" - "go.opentelemetry.io/collector/config" "go.uber.org/zap" ) @@ -60,7 +59,7 @@ type loadBalancerImp struct { } // Create new load balancer -func newLoadBalancer(params component.ExporterCreateSettings, cfg config.Exporter, factory componentFactory) (*loadBalancerImp, error) { +func newLoadBalancer(params component.ExporterCreateSettings, cfg component.ExporterConfig, factory componentFactory) (*loadBalancerImp, error) { oCfg := cfg.(*Config) if oCfg.Resolver.DNS != nil && oCfg.Resolver.Static != nil { diff --git a/exporter/loadbalancingexporter/loadbalancer_test.go b/exporter/loadbalancingexporter/loadbalancer_test.go index df780f54b0de..16a92245d02b 100644 --- a/exporter/loadbalancingexporter/loadbalancer_test.go +++ b/exporter/loadbalancingexporter/loadbalancer_test.go @@ -23,7 +23,6 @@ import ( "github.com/stretchr/testify/require" "go.opentelemetry.io/collector/component" "go.opentelemetry.io/collector/component/componenttest" - "go.opentelemetry.io/collector/config" "go.opentelemetry.io/collector/exporter/otlpexporter" ) @@ -234,12 +233,12 @@ func TestRemoveExtraExporters(t *testing.T) { func TestAddMissingExporters(t *testing.T) { // prepare cfg := simpleConfig() - exporterFactory := component.NewExporterFactory("otlp", func() config.Exporter { + exporterFactory := component.NewExporterFactory("otlp", func() component.ExporterConfig { return &otlpexporter.Config{} }, component.WithTracesExporter(func( _ context.Context, _ component.ExporterCreateSettings, - _ config.Exporter, + _ component.ExporterConfig, ) (component.TracesExporter, error) { return newNopMockTracesExporter(), nil }, component.StabilityLevelInDevelopment)) @@ -268,12 +267,12 @@ func TestFailedToAddMissingExporters(t *testing.T) { // prepare cfg := simpleConfig() expectedErr := errors.New("some expected error") - exporterFactory := component.NewExporterFactory("otlp", func() config.Exporter { + exporterFactory := component.NewExporterFactory("otlp", func() component.ExporterConfig { return &otlpexporter.Config{} }, component.WithTracesExporter(func( _ context.Context, _ component.ExporterCreateSettings, - _ config.Exporter, + _ component.ExporterConfig, ) (component.TracesExporter, error) { return nil, expectedErr }, component.StabilityLevelInDevelopment)) diff --git a/exporter/loadbalancingexporter/log_exporter.go b/exporter/loadbalancingexporter/log_exporter.go index 8c8cd5b89e76..7bac1c1b8db8 100644 --- a/exporter/loadbalancingexporter/log_exporter.go +++ b/exporter/loadbalancingexporter/log_exporter.go @@ -24,7 +24,6 @@ import ( "go.opencensus.io/stats" "go.opencensus.io/tag" "go.opentelemetry.io/collector/component" - "go.opentelemetry.io/collector/config" "go.opentelemetry.io/collector/consumer" "go.opentelemetry.io/collector/exporter/otlpexporter" "go.opentelemetry.io/collector/pdata/pcommon" @@ -44,7 +43,7 @@ type logExporterImp struct { } // Create new logs exporter -func newLogsExporter(params component.ExporterCreateSettings, cfg config.Exporter) (*logExporterImp, error) { +func newLogsExporter(params component.ExporterCreateSettings, cfg component.ExporterConfig) (*logExporterImp, error) { exporterFactory := otlpexporter.NewFactory() lb, err := newLoadBalancer(params, cfg, func(ctx context.Context, endpoint string) (component.Exporter, error) { diff --git a/exporter/loadbalancingexporter/log_exporter_test.go b/exporter/loadbalancingexporter/log_exporter_test.go index 28dc12ecdacc..6ddd18b090db 100644 --- a/exporter/loadbalancingexporter/log_exporter_test.go +++ b/exporter/loadbalancingexporter/log_exporter_test.go @@ -50,7 +50,7 @@ func TestNewLogsExporter(t *testing.T) { { "empty", &Config{ - ExporterSettings: config.NewExporterSettings(config.NewComponentID(typeStr)), + ExporterSettings: config.NewExporterSettings(component.NewID(typeStr)), }, errNoResolver, }, @@ -352,7 +352,7 @@ func TestRollingUpdatesWhenConsumeLogs(t *testing.T) { res.resInterval = 10 * time.Millisecond cfg := &Config{ - ExporterSettings: config.NewExporterSettings(config.NewComponentID(typeStr)), + ExporterSettings: config.NewExporterSettings(component.NewID(typeStr)), Resolver: ResolverSettings{ DNS: &DNSResolver{Hostname: "service-1", Port: ""}, }, diff --git a/exporter/loadbalancingexporter/trace_exporter.go b/exporter/loadbalancingexporter/trace_exporter.go index f4e355dbf4de..d3b1e0a6de5d 100644 --- a/exporter/loadbalancingexporter/trace_exporter.go +++ b/exporter/loadbalancingexporter/trace_exporter.go @@ -44,7 +44,7 @@ type traceExporterImp struct { } // Create new traces exporter -func newTracesExporter(params component.ExporterCreateSettings, cfg config.Exporter) (*traceExporterImp, error) { +func newTracesExporter(params component.ExporterCreateSettings, cfg component.ExporterConfig) (*traceExporterImp, error) { exporterFactory := otlpexporter.NewFactory() lb, err := newLoadBalancer(params, cfg, func(ctx context.Context, endpoint string) (component.Exporter, error) { @@ -69,7 +69,7 @@ func newTracesExporter(params component.ExporterCreateSettings, cfg config.Expor func buildExporterConfig(cfg *Config, endpoint string) otlpexporter.Config { oCfg := cfg.Protocol.OTLP - oCfg.ExporterSettings = config.NewExporterSettings(config.NewComponentID("otlp")) + oCfg.ExporterSettings = config.NewExporterSettings(component.NewID("otlp")) oCfg.Endpoint = endpoint return oCfg } diff --git a/exporter/loadbalancingexporter/trace_exporter_test.go b/exporter/loadbalancingexporter/trace_exporter_test.go index d0b8258a46ed..3484708915a8 100644 --- a/exporter/loadbalancingexporter/trace_exporter_test.go +++ b/exporter/loadbalancingexporter/trace_exporter_test.go @@ -309,7 +309,7 @@ func TestBuildExporterConfig(t *testing.T) { require.NoError(t, err) require.NotNil(t, cfg) - c := cfg.Exporters[config.NewComponentID(typeStr)] + c := cfg.Exporters[component.NewID(typeStr)] require.NotNil(t, c) // test @@ -452,7 +452,7 @@ func TestRollingUpdatesWhenConsumeTraces(t *testing.T) { res.resInterval = 10 * time.Millisecond cfg := &Config{ - ExporterSettings: config.NewExporterSettings(config.NewComponentID(typeStr)), + ExporterSettings: config.NewExporterSettings(component.NewID(typeStr)), Resolver: ResolverSettings{ DNS: &DNSResolver{Hostname: "service-1", Port: ""}, }, @@ -585,7 +585,7 @@ func appendSimpleTraceWithID(dest ptrace.ResourceSpans, id pcommon.TraceID) { func simpleConfig() *Config { return &Config{ - ExporterSettings: config.NewExporterSettings(config.NewComponentID(typeStr)), + ExporterSettings: config.NewExporterSettings(component.NewID(typeStr)), Resolver: ResolverSettings{ Static: &StaticResolver{Hostnames: []string{"endpoint-1"}}, }, @@ -594,7 +594,7 @@ func simpleConfig() *Config { func serviceBasedRoutingConfig() *Config { return &Config{ - ExporterSettings: config.NewExporterSettings(config.NewComponentID(typeStr)), + ExporterSettings: config.NewExporterSettings(component.NewID(typeStr)), Resolver: ResolverSettings{ Static: &StaticResolver{Hostnames: []string{"endpoint-1"}}, }, diff --git a/exporter/logzioexporter/config_test.go b/exporter/logzioexporter/config_test.go index 39886f0263a6..160bc98330d7 100644 --- a/exporter/logzioexporter/config_test.go +++ b/exporter/logzioexporter/config_test.go @@ -21,6 +21,7 @@ import ( "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" + "go.opentelemetry.io/collector/component" "go.opentelemetry.io/collector/component/componenttest" "go.opentelemetry.io/collector/config" "go.opentelemetry.io/collector/config/configcompression" @@ -35,12 +36,12 @@ func TestLoadConfig(t *testing.T) { factory := NewFactory() cfg := factory.CreateDefaultConfig() - sub, err := cm.Sub(config.NewComponentIDWithName(typeStr, "2").String()) + sub, err := cm.Sub(component.NewIDWithName(typeStr, "2").String()) require.NoError(t, err) - require.NoError(t, config.UnmarshalExporter(sub, cfg)) + require.NoError(t, component.UnmarshalExporterConfig(sub, cfg)) expected := &Config{ - ExporterSettings: config.NewExporterSettings(config.NewComponentID(typeStr)), + ExporterSettings: config.NewExporterSettings(component.NewID(typeStr)), Token: "token", Region: "eu", } @@ -66,12 +67,12 @@ func TestDefaultLoadConfig(t *testing.T) { factory := NewFactory() cfg := factory.CreateDefaultConfig() - sub, err := cm.Sub(config.NewComponentIDWithName(typeStr, "2").String()) + sub, err := cm.Sub(component.NewIDWithName(typeStr, "2").String()) require.NoError(t, err) - require.NoError(t, config.UnmarshalExporter(sub, cfg)) + require.NoError(t, component.UnmarshalExporterConfig(sub, cfg)) expected := &Config{ - ExporterSettings: config.NewExporterSettings(config.NewComponentID(typeStr)), + ExporterSettings: config.NewExporterSettings(component.NewID(typeStr)), Token: "logzioTESTtoken", } expected.RetrySettings = exporterhelper.NewDefaultRetrySettings() @@ -91,7 +92,7 @@ func TestDefaultLoadConfig(t *testing.T) { func TestCheckAndWarnDeprecatedOptions(t *testing.T) { // Config with legacy options actualCfg := &Config{ - ExporterSettings: config.NewExporterSettings(config.NewComponentIDWithName(typeStr, "2")), + ExporterSettings: config.NewExporterSettings(component.NewIDWithName(typeStr, "2")), QueueSettings: exporterhelper.NewDefaultQueueSettings(), RetrySettings: exporterhelper.NewDefaultRetrySettings(), Token: "logzioTESTtoken", @@ -116,7 +117,7 @@ func TestCheckAndWarnDeprecatedOptions(t *testing.T) { actualCfg.checkAndWarnDeprecatedOptions(&logger) expected := &Config{ - ExporterSettings: config.NewExporterSettings(config.NewComponentIDWithName(typeStr, "2")), + ExporterSettings: config.NewExporterSettings(component.NewIDWithName(typeStr, "2")), Token: "logzioTESTtoken", CustomEndpoint: "https://api.example.com", QueueMaxLength: 10, diff --git a/exporter/logzioexporter/exporter_test.go b/exporter/logzioexporter/exporter_test.go index 0979fd35a8de..8e023363b17f 100644 --- a/exporter/logzioexporter/exporter_test.go +++ b/exporter/logzioexporter/exporter_test.go @@ -29,6 +29,7 @@ import ( "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" + "go.opentelemetry.io/collector/component" "go.opentelemetry.io/collector/component/componenttest" "go.opentelemetry.io/collector/config" "go.opentelemetry.io/collector/config/configcompression" @@ -203,7 +204,7 @@ func TestExportErrors(tester *testing.T) { cfg := &Config{ Region: "", Token: "token", - ExporterSettings: config.NewExporterSettings(config.NewComponentID(typeStr)), + ExporterSettings: config.NewExporterSettings(component.NewID(typeStr)), HTTPClientSettings: confighttp.HTTPClientSettings{ Endpoint: server.URL, }, @@ -267,7 +268,7 @@ func TestPushTraceData(tester *testing.T) { rw.WriteHeader(http.StatusOK) })) cfg := Config{ - ExporterSettings: config.NewExporterSettings(config.NewComponentID(typeStr)), + ExporterSettings: config.NewExporterSettings(component.NewID(typeStr)), Token: "token", Region: "", HTTPClientSettings: confighttp.HTTPClientSettings{ @@ -301,7 +302,7 @@ func TestPushLogsData(tester *testing.T) { rw.WriteHeader(http.StatusOK) })) cfg := Config{ - ExporterSettings: config.NewExporterSettings(config.NewComponentID(typeStr)), + ExporterSettings: config.NewExporterSettings(component.NewID(typeStr)), Token: "token", Region: "", HTTPClientSettings: confighttp.HTTPClientSettings{ diff --git a/exporter/logzioexporter/factory.go b/exporter/logzioexporter/factory.go index 9f23e0dc4c44..653814a83dff 100644 --- a/exporter/logzioexporter/factory.go +++ b/exporter/logzioexporter/factory.go @@ -44,11 +44,11 @@ func NewFactory() component.ExporterFactory { } -func createDefaultConfig() config.Exporter { +func createDefaultConfig() component.ExporterConfig { return &Config{ Region: "", Token: "", - ExporterSettings: config.NewExporterSettings(config.NewComponentID(typeStr)), + ExporterSettings: config.NewExporterSettings(component.NewID(typeStr)), RetrySettings: exporterhelper.NewDefaultRetrySettings(), QueueSettings: exporterhelper.NewDefaultQueueSettings(), HTTPClientSettings: confighttp.HTTPClientSettings{ @@ -101,12 +101,12 @@ func generateEndpoint(cfg *Config) (string, error) { } } -func createTracesExporter(_ context.Context, params component.ExporterCreateSettings, cfg config.Exporter) (component.TracesExporter, error) { +func createTracesExporter(_ context.Context, params component.ExporterCreateSettings, cfg component.ExporterConfig) (component.TracesExporter, error) { exporterConfig := cfg.(*Config) return newLogzioTracesExporter(exporterConfig, params) } -func createLogsExporter(_ context.Context, params component.ExporterCreateSettings, cfg config.Exporter) (component.LogsExporter, error) { +func createLogsExporter(_ context.Context, params component.ExporterCreateSettings, cfg component.ExporterConfig) (component.LogsExporter, error) { exporterConfig := cfg.(*Config) return newLogzioLogsExporter(exporterConfig, params) } diff --git a/exporter/logzioexporter/factory_test.go b/exporter/logzioexporter/factory_test.go index a42a3fa41a52..965e1bcdf399 100644 --- a/exporter/logzioexporter/factory_test.go +++ b/exporter/logzioexporter/factory_test.go @@ -21,17 +21,17 @@ import ( "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" + "go.opentelemetry.io/collector/component" "go.opentelemetry.io/collector/component/componenttest" "go.opentelemetry.io/collector/config" "go.opentelemetry.io/collector/config/confighttp" - "go.opentelemetry.io/collector/config/configtest" "go.opentelemetry.io/collector/confmap/confmaptest" ) func TestCreateDefaultConfig(t *testing.T) { cfg := createDefaultConfig() assert.NotNil(t, cfg, "failed to create default config") - assert.NoError(t, configtest.CheckConfigStruct(cfg)) + assert.NoError(t, componenttest.CheckConfigStruct(cfg)) } func TestCreateTracesExporter(t *testing.T) { @@ -41,9 +41,9 @@ func TestCreateTracesExporter(t *testing.T) { factory := NewFactory() cfg := factory.CreateDefaultConfig() - sub, err := cm.Sub(config.NewComponentIDWithName(typeStr, "2").String()) + sub, err := cm.Sub(component.NewIDWithName(typeStr, "2").String()) require.NoError(t, err) - require.NoError(t, config.UnmarshalExporter(sub, cfg)) + require.NoError(t, component.UnmarshalExporterConfig(sub, cfg)) params := componenttest.NewNopExporterCreateSettings() exporter, err := factory.CreateTracesExporter(context.Background(), params, cfg) @@ -72,7 +72,7 @@ func TestGenerateUrl(t *testing.T) { cfg := &Config{ Region: test.region, Token: "token", - ExporterSettings: config.NewExporterSettings(config.NewComponentID(typeStr)), + ExporterSettings: config.NewExporterSettings(component.NewID(typeStr)), HTTPClientSettings: confighttp.HTTPClientSettings{ Endpoint: test.endpoint, }, diff --git a/exporter/logzioexporter/go.mod b/exporter/logzioexporter/go.mod index 8ba9286d79cd..99b486358e97 100644 --- a/exporter/logzioexporter/go.mod +++ b/exporter/logzioexporter/go.mod @@ -8,9 +8,9 @@ require ( github.com/open-telemetry/opentelemetry-collector-contrib/internal/coreinternal v0.63.0 github.com/open-telemetry/opentelemetry-collector-contrib/pkg/translator/jaeger v0.63.0 github.com/stretchr/testify v1.8.1 - go.opentelemetry.io/collector v0.63.2-0.20221104003159-6b27644724d8 - go.opentelemetry.io/collector/pdata v0.63.2-0.20221104003159-6b27644724d8 - go.opentelemetry.io/collector/semconv v0.63.2-0.20221104003159-6b27644724d8 + go.opentelemetry.io/collector v0.63.2-0.20221108014805-0b08d5316426 + go.opentelemetry.io/collector/pdata v0.63.2-0.20221108014805-0b08d5316426 + go.opentelemetry.io/collector/semconv v0.63.2-0.20221108014805-0b08d5316426 go.uber.org/zap v1.23.0 google.golang.org/genproto v0.0.0-20220822174746-9e6da59bd2fc google.golang.org/protobuf v1.28.1 @@ -42,7 +42,7 @@ require ( github.com/rs/cors v1.8.2 // indirect 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.23.0 // indirect + go.opencensus.io v0.24.0 // 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 2c75d15d04a7..9835e7232e30 100644 --- a/exporter/logzioexporter/go.sum +++ b/exporter/logzioexporter/go.sum @@ -249,7 +249,7 @@ github.com/prometheus/client_golang v0.9.1/go.mod h1:7SWBe2y4D6OKWSNQJUaRYU/AaXP github.com/prometheus/client_golang v1.0.0/go.mod h1:db9x61etRT2tGnBNRi70OPL5FsnadC4Ky3P0J6CfImo= github.com/prometheus/client_golang v1.7.1/go.mod h1:PY5Wy2awLA44sXw4AOSfFBetzPP4j5+D6mVACh+pe2M= github.com/prometheus/client_golang v1.11.1/go.mod h1:Z6t4BnS23TR94PD6BsDNk8yVqroYurpAkEiz0P2BEV0= -github.com/prometheus/client_golang v1.13.0 h1:b71QUfeo5M8gq2+evJdTPfZhYMAU0uKPkyPJ7TPsloU= +github.com/prometheus/client_golang v1.13.1 h1:3gMjIY2+/hzmqhtUC/aQNYldJA6DtH3CgQvwS+02K1c= github.com/prometheus/client_model v0.0.0-20180712105110-5c3871d89910/go.mod h1:MbSGuTsp3dbXC40dX6PRTWyKYBIrTGTE9sqQNg2J8bo= github.com/prometheus/client_model v0.0.0-20190129233127-fd36f4220a90/go.mod h1:xMI15A0UPsDsEKsMN9yxemIoYk6Tm2C1GtYGdfGttqA= github.com/prometheus/client_model v0.0.0-20190812154241-14fe0d1b01d4/go.mod h1:xMI15A0UPsDsEKsMN9yxemIoYk6Tm2C1GtYGdfGttqA= @@ -288,7 +288,6 @@ github.com/stretchr/testify v1.2.2/go.mod h1:a8OnRcib4nhh0OaRAV+Yts87kKdq0PP7pXf github.com/stretchr/testify v1.3.0/go.mod h1:M5WIy9Dh21IEIfnGCwXGc5bZfKNJtfHm1UVUgZn+9EI= github.com/stretchr/testify v1.4.0/go.mod h1:j7eGeouHqKxXV5pUuKE4zz7dFj8WfuZ+81PSLYec5m4= github.com/stretchr/testify v1.5.1/go.mod h1:5W2xD1RspED5o8YsWQXVCued0rvSQ+mT+I5cxcmMvtA= -github.com/stretchr/testify v1.6.1/go.mod h1:6Fq8oRcR53rry900zMqJjRRixrwX3KX962/h/Wwjteg= github.com/stretchr/testify v1.7.0/go.mod h1:6Fq8oRcR53rry900zMqJjRRixrwX3KX962/h/Wwjteg= github.com/stretchr/testify v1.7.1/go.mod h1:6Fq8oRcR53rry900zMqJjRRixrwX3KX962/h/Wwjteg= github.com/stretchr/testify v1.7.2/go.mod h1:R6va5+xMeoiuVRoj+gSkQ7d3FALtqAAGI1FQKckRals= @@ -305,14 +304,14 @@ 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.opencensus.io v0.23.0 h1:gqCw0LfLxScz8irSi8exQc7fyQ0fKQU/qnC/X8+V/1M= -go.opencensus.io v0.23.0/go.mod h1:XItmlyltB5F7CS4xOC1DcqMoFqwtC6OG2xF7mCv7P7E= -go.opentelemetry.io/collector v0.63.2-0.20221104003159-6b27644724d8 h1:rOT5HzXXfSISc6FiH012zH2/EFjp37UXfjEqj5BpkWQ= -go.opentelemetry.io/collector v0.63.2-0.20221104003159-6b27644724d8/go.mod h1:JVmeZXugK4ondC6KQgrHTHWiF4JttpG5k6dWPMt62+k= -go.opentelemetry.io/collector/pdata v0.63.2-0.20221104003159-6b27644724d8 h1:7xeTQjfsOm9eogQeIxjSEhlik9qsbBGsnmkQHfyKaRE= -go.opentelemetry.io/collector/pdata v0.63.2-0.20221104003159-6b27644724d8/go.mod h1:IzvXUGQml2mrnvdb8zIlEW3qQs9oFLdD2hLwJdZ+pek= -go.opentelemetry.io/collector/semconv v0.63.2-0.20221104003159-6b27644724d8 h1:jm0sNPyqo6S165QjQYMBHB2nK50wlJbMYM03Yr3Eo2k= -go.opentelemetry.io/collector/semconv v0.63.2-0.20221104003159-6b27644724d8/go.mod h1:5o9yhOa+ABt7g2E5JABDxGZ1PQPbtfxrKNbYn+LOTXU= +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.63.2-0.20221108014805-0b08d5316426 h1:z/wLTMh7/vNxcFUDa5uG7/IPE3tYx6pzCWPV41ghyV8= +go.opentelemetry.io/collector v0.63.2-0.20221108014805-0b08d5316426/go.mod h1:+Zb70q0Rq17dA9FcHTiTjW6g96lvJ8kAZ0c+eWNkAv0= +go.opentelemetry.io/collector/pdata v0.63.2-0.20221108014805-0b08d5316426 h1:wKDpgP0Tx/gWI2SgDGAY1OTSeihhDivbbRqFR79IGTc= +go.opentelemetry.io/collector/pdata v0.63.2-0.20221108014805-0b08d5316426/go.mod h1:IzvXUGQml2mrnvdb8zIlEW3qQs9oFLdD2hLwJdZ+pek= +go.opentelemetry.io/collector/semconv v0.63.2-0.20221108014805-0b08d5316426 h1:pqIl7OC531J6i9ttBCj3zLmZI/BSF4q323YpK0GgKGk= +go.opentelemetry.io/collector/semconv v0.63.2-0.20221108014805-0b08d5316426/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/logzioexporter/jsonlog_test.go b/exporter/logzioexporter/jsonlog_test.go index 28278a2f03c1..9ae05333b7a0 100644 --- a/exporter/logzioexporter/jsonlog_test.go +++ b/exporter/logzioexporter/jsonlog_test.go @@ -25,6 +25,7 @@ import ( "github.com/hashicorp/go-hclog" "github.com/stretchr/testify/require" + "go.opentelemetry.io/collector/component" "go.opentelemetry.io/collector/component/componenttest" "go.opentelemetry.io/collector/config" "go.opentelemetry.io/collector/config/configcompression" @@ -98,7 +99,7 @@ func TestSetTimeStamp(t *testing.T) { cfg := &Config{ Region: "us", Token: "token", - ExporterSettings: config.NewExporterSettings(config.NewComponentID(typeStr)), + ExporterSettings: config.NewExporterSettings(component.NewID(typeStr)), HTTPClientSettings: confighttp.HTTPClientSettings{ Endpoint: server.URL, Compression: configcompression.Gzip, diff --git a/exporter/lokiexporter/config_test.go b/exporter/lokiexporter/config_test.go index 120b32bae382..d3aef8ed991c 100644 --- a/exporter/lokiexporter/config_test.go +++ b/exporter/lokiexporter/config_test.go @@ -21,6 +21,7 @@ import ( "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" + "go.opentelemetry.io/collector/component" "go.opentelemetry.io/collector/config" "go.opentelemetry.io/collector/config/confighttp" "go.opentelemetry.io/collector/config/configtls" @@ -35,13 +36,13 @@ func TestLoadConfigNewExporter(t *testing.T) { require.NoError(t, err) tests := []struct { - id config.ComponentID - expected config.Exporter + id component.ID + expected component.ExporterConfig }{ { - id: config.NewComponentIDWithName(typeStr, "allsettings"), + id: component.NewIDWithName(typeStr, "allsettings"), expected: &Config{ - ExporterSettings: config.NewExporterSettings(config.NewComponentID(typeStr)), + ExporterSettings: config.NewExporterSettings(component.NewID(typeStr)), HTTPClientSettings: confighttp.HTTPClientSettings{ Headers: map[string]string{ "X-Custom-Header": "loki_rocks", @@ -81,7 +82,7 @@ func TestLoadConfigNewExporter(t *testing.T) { sub, err := cm.Sub(tt.id.String()) require.NoError(t, err) - require.NoError(t, config.UnmarshalExporter(sub, cfg)) + require.NoError(t, component.UnmarshalExporterConfig(sub, cfg)) assert.NoError(t, cfg.Validate()) assert.Equal(t, tt.expected, cfg) diff --git a/exporter/lokiexporter/factory.go b/exporter/lokiexporter/factory.go index 27e5e8788189..0b63c445814d 100644 --- a/exporter/lokiexporter/factory.go +++ b/exporter/lokiexporter/factory.go @@ -18,7 +18,6 @@ import ( "context" "go.opentelemetry.io/collector/component" - "go.opentelemetry.io/collector/config" ) const ( @@ -36,7 +35,7 @@ func NewFactory() component.ExporterFactory { ) } -func createLogsExporter(ctx context.Context, set component.ExporterCreateSettings, config config.Exporter) (component.LogsExporter, error) { +func createLogsExporter(ctx context.Context, set component.ExporterCreateSettings, config component.ExporterConfig) (component.LogsExporter, error) { expCfg := config.(*Config) // this should go away once the legacy code is removed, as the config validation happens during the loading diff --git a/exporter/lokiexporter/factory_deprecated.go b/exporter/lokiexporter/factory_deprecated.go index 3ab46bfa6eb6..9b715b90f72d 100644 --- a/exporter/lokiexporter/factory_deprecated.go +++ b/exporter/lokiexporter/factory_deprecated.go @@ -24,9 +24,9 @@ import ( "go.opentelemetry.io/collector/exporter/exporterhelper" ) -func createDefaultLegacyConfig() config.Exporter { +func createDefaultLegacyConfig() component.ExporterConfig { return &Config{ - ExporterSettings: config.NewExporterSettings(config.NewComponentID(typeStr)), + ExporterSettings: config.NewExporterSettings(component.NewID(typeStr)), HTTPClientSettings: confighttp.HTTPClientSettings{ Endpoint: "", Timeout: 30 * time.Second, diff --git a/exporter/lokiexporter/go.mod b/exporter/lokiexporter/go.mod index 66ea36e0acae..60171fdf12c4 100644 --- a/exporter/lokiexporter/go.mod +++ b/exporter/lokiexporter/go.mod @@ -10,9 +10,9 @@ require ( github.com/open-telemetry/opentelemetry-collector-contrib/pkg/translator/loki v0.63.0 github.com/prometheus/common v0.37.0 github.com/stretchr/testify v1.8.1 - go.opentelemetry.io/collector v0.63.2-0.20221104003159-6b27644724d8 - go.opentelemetry.io/collector/pdata v0.63.2-0.20221104003159-6b27644724d8 - go.opentelemetry.io/collector/semconv v0.63.2-0.20221104003159-6b27644724d8 + go.opentelemetry.io/collector v0.63.2-0.20221108014805-0b08d5316426 + go.opentelemetry.io/collector/pdata v0.63.2-0.20221108014805-0b08d5316426 + go.opentelemetry.io/collector/semconv v0.63.2-0.20221108014805-0b08d5316426 go.uber.org/multierr v1.8.0 go.uber.org/zap v1.23.0 ) @@ -77,7 +77,7 @@ require ( github.com/pelletier/go-toml v1.9.4 // indirect github.com/pkg/errors v0.9.1 // indirect github.com/pmezard/go-difflib v1.0.0 // indirect - github.com/prometheus/client_golang v1.13.0 // indirect + github.com/prometheus/client_golang v1.13.1 // indirect github.com/prometheus/client_model v0.3.0 // indirect github.com/prometheus/exporter-toolkit v0.7.1 // indirect github.com/prometheus/procfs v0.8.0 // indirect @@ -95,7 +95,7 @@ require ( go.etcd.io/etcd/api/v3 v3.5.4 // indirect 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.23.0 // indirect + go.opencensus.io v0.24.0 // 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 028a702e7562..5cfcef05ee36 100644 --- a/exporter/lokiexporter/go.sum +++ b/exporter/lokiexporter/go.sum @@ -973,8 +973,8 @@ github.com/prometheus/client_golang v1.7.1/go.mod h1:PY5Wy2awLA44sXw4AOSfFBetzPP github.com/prometheus/client_golang v1.11.0/go.mod h1:Z6t4BnS23TR94PD6BsDNk8yVqroYurpAkEiz0P2BEV0= github.com/prometheus/client_golang v1.11.1/go.mod h1:Z6t4BnS23TR94PD6BsDNk8yVqroYurpAkEiz0P2BEV0= github.com/prometheus/client_golang v1.12.1/go.mod h1:3Z9XVyYiZYEO+YQWt3RD2R3jrbd179Rt297l4aS6nDY= -github.com/prometheus/client_golang v1.13.0 h1:b71QUfeo5M8gq2+evJdTPfZhYMAU0uKPkyPJ7TPsloU= -github.com/prometheus/client_golang v1.13.0/go.mod h1:vTeo+zgvILHsnnj/39Ou/1fPN5nJFOEMgftOUOmlvYQ= +github.com/prometheus/client_golang v1.13.1 h1:3gMjIY2+/hzmqhtUC/aQNYldJA6DtH3CgQvwS+02K1c= +github.com/prometheus/client_golang v1.13.1/go.mod h1:vTeo+zgvILHsnnj/39Ou/1fPN5nJFOEMgftOUOmlvYQ= github.com/prometheus/client_model v0.0.0-20171117100541-99fa1f4be8e5/go.mod h1:MbSGuTsp3dbXC40dX6PRTWyKYBIrTGTE9sqQNg2J8bo= github.com/prometheus/client_model v0.0.0-20180712105110-5c3871d89910/go.mod h1:MbSGuTsp3dbXC40dX6PRTWyKYBIrTGTE9sqQNg2J8bo= github.com/prometheus/client_model v0.0.0-20190129233127-fd36f4220a90/go.mod h1:xMI15A0UPsDsEKsMN9yxemIoYk6Tm2C1GtYGdfGttqA= @@ -1179,14 +1179,15 @@ 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.opencensus.io v0.22.5/go.mod h1:5pWMHQbX5EPX2/62yrJeAkowc+lfs/XD7Uxpq3pI6kk= -go.opencensus.io v0.23.0 h1:gqCw0LfLxScz8irSi8exQc7fyQ0fKQU/qnC/X8+V/1M= go.opencensus.io v0.23.0/go.mod h1:XItmlyltB5F7CS4xOC1DcqMoFqwtC6OG2xF7mCv7P7E= -go.opentelemetry.io/collector v0.63.2-0.20221104003159-6b27644724d8 h1:rOT5HzXXfSISc6FiH012zH2/EFjp37UXfjEqj5BpkWQ= -go.opentelemetry.io/collector v0.63.2-0.20221104003159-6b27644724d8/go.mod h1:JVmeZXugK4ondC6KQgrHTHWiF4JttpG5k6dWPMt62+k= -go.opentelemetry.io/collector/pdata v0.63.2-0.20221104003159-6b27644724d8 h1:7xeTQjfsOm9eogQeIxjSEhlik9qsbBGsnmkQHfyKaRE= -go.opentelemetry.io/collector/pdata v0.63.2-0.20221104003159-6b27644724d8/go.mod h1:IzvXUGQml2mrnvdb8zIlEW3qQs9oFLdD2hLwJdZ+pek= -go.opentelemetry.io/collector/semconv v0.63.2-0.20221104003159-6b27644724d8 h1:jm0sNPyqo6S165QjQYMBHB2nK50wlJbMYM03Yr3Eo2k= -go.opentelemetry.io/collector/semconv v0.63.2-0.20221104003159-6b27644724d8/go.mod h1:5o9yhOa+ABt7g2E5JABDxGZ1PQPbtfxrKNbYn+LOTXU= +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.63.2-0.20221108014805-0b08d5316426 h1:z/wLTMh7/vNxcFUDa5uG7/IPE3tYx6pzCWPV41ghyV8= +go.opentelemetry.io/collector v0.63.2-0.20221108014805-0b08d5316426/go.mod h1:+Zb70q0Rq17dA9FcHTiTjW6g96lvJ8kAZ0c+eWNkAv0= +go.opentelemetry.io/collector/pdata v0.63.2-0.20221108014805-0b08d5316426 h1:wKDpgP0Tx/gWI2SgDGAY1OTSeihhDivbbRqFR79IGTc= +go.opentelemetry.io/collector/pdata v0.63.2-0.20221108014805-0b08d5316426/go.mod h1:IzvXUGQml2mrnvdb8zIlEW3qQs9oFLdD2hLwJdZ+pek= +go.opentelemetry.io/collector/semconv v0.63.2-0.20221108014805-0b08d5316426 h1:pqIl7OC531J6i9ttBCj3zLmZI/BSF4q323YpK0GgKGk= +go.opentelemetry.io/collector/semconv v0.63.2-0.20221108014805-0b08d5316426/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 4807c1f2d3cd..d9d7a8fe6d8a 100644 --- a/exporter/lokiexporter/legacy_config_test.go +++ b/exporter/lokiexporter/legacy_config_test.go @@ -22,6 +22,7 @@ import ( "github.com/prometheus/common/model" "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" + "go.opentelemetry.io/collector/component" "go.opentelemetry.io/collector/config" "go.opentelemetry.io/collector/config/confighttp" "go.opentelemetry.io/collector/config/configtls" @@ -37,13 +38,13 @@ func TestLoadConfig(t *testing.T) { require.NoError(t, err) tests := []struct { - id config.ComponentID - expected config.Exporter + id component.ID + expected component.ExporterConfig }{ { - id: config.NewComponentIDWithName(typeStr, "allsettings"), + id: component.NewIDWithName(typeStr, "allsettings"), expected: &Config{ - ExporterSettings: config.NewExporterSettings(config.NewComponentID(typeStr)), + ExporterSettings: config.NewExporterSettings(component.NewID(typeStr)), HTTPClientSettings: confighttp.HTTPClientSettings{ Headers: map[string]string{ "X-Custom-Header": "loki_rocks", @@ -90,9 +91,9 @@ func TestLoadConfig(t *testing.T) { }, }, { - id: config.NewComponentIDWithName(typeStr, "json"), + id: component.NewIDWithName(typeStr, "json"), expected: &Config{ - ExporterSettings: config.NewExporterSettings(config.NewComponentID(typeStr)), + ExporterSettings: config.NewExporterSettings(component.NewID(typeStr)), HTTPClientSettings: confighttp.HTTPClientSettings{ Headers: map[string]string{}, Endpoint: "https://loki:3100/loki/api/v1/push", @@ -137,7 +138,7 @@ func TestLoadConfig(t *testing.T) { sub, err := cm.Sub(tt.id.String()) require.NoError(t, err) - require.NoError(t, config.UnmarshalExporter(sub, cfg)) + require.NoError(t, component.UnmarshalExporterConfig(sub, cfg)) assert.NoError(t, cfg.Validate()) assert.Equal(t, tt.expected, cfg) @@ -303,7 +304,7 @@ func TestConfig_validate(t *testing.T) { t.Run(tt.name, func(t *testing.T) { factory := NewFactory() cfg := factory.CreateDefaultConfig().(*Config) - cfg.ExporterSettings = config.NewExporterSettings(config.NewComponentID(typeStr)) + cfg.ExporterSettings = config.NewExporterSettings(component.NewID(typeStr)) cfg.Endpoint = tt.fields.Endpoint cfg.Labels = tt.fields.Labels diff --git a/exporter/lokiexporter/legacy_factory_test.go b/exporter/lokiexporter/legacy_factory_test.go index 9d4f43fd02b6..267acbb527fe 100644 --- a/exporter/lokiexporter/legacy_factory_test.go +++ b/exporter/lokiexporter/legacy_factory_test.go @@ -22,10 +22,10 @@ import ( "time" "github.com/stretchr/testify/assert" + "go.opentelemetry.io/collector/component" "go.opentelemetry.io/collector/component/componenttest" "go.opentelemetry.io/collector/config" "go.opentelemetry.io/collector/config/confighttp" - "go.opentelemetry.io/collector/config/configtest" "github.com/open-telemetry/opentelemetry-collector-contrib/internal/common/testutil" ) @@ -34,7 +34,7 @@ func TestFactory_CreateDefaultConfig(t *testing.T) { factory := NewFactory() cfg := factory.CreateDefaultConfig() assert.NotNil(t, cfg, "failed to create default config") - assert.NoError(t, configtest.CheckConfigStruct(cfg)) + assert.NoError(t, componenttest.CheckConfigStruct(cfg)) ocfg, ok := factory.CreateDefaultConfig().(*Config) assert.True(t, ok) assert.Equal(t, "", ocfg.HTTPClientSettings.Endpoint) @@ -59,7 +59,7 @@ func TestFactory_CreateLogsExporter(t *testing.T) { { name: "with valid config", config: Config{ - ExporterSettings: config.NewExporterSettings(config.NewComponentID(typeStr)), + ExporterSettings: config.NewExporterSettings(component.NewID(typeStr)), HTTPClientSettings: confighttp.HTTPClientSettings{ Endpoint: "http://" + testutil.GetAvailableLocalAddress(t), }, @@ -73,7 +73,7 @@ func TestFactory_CreateLogsExporter(t *testing.T) { { name: "with invalid config", config: Config{ - ExporterSettings: config.NewExporterSettings(config.NewComponentID(typeStr)), + ExporterSettings: config.NewExporterSettings(component.NewID(typeStr)), HTTPClientSettings: confighttp.HTTPClientSettings{ Endpoint: "", }, @@ -83,7 +83,7 @@ func TestFactory_CreateLogsExporter(t *testing.T) { { name: "with forced bad configuration (for coverage)", config: Config{ - ExporterSettings: config.NewExporterSettings(config.NewComponentID(typeStr)), + ExporterSettings: config.NewExporterSettings(component.NewID(typeStr)), HTTPClientSettings: confighttp.HTTPClientSettings{ Endpoint: "", CustomRoundTripper: func(next http.RoundTripper) (http.RoundTripper, error) { diff --git a/exporter/mezmoexporter/config_test.go b/exporter/mezmoexporter/config_test.go index 91735aa99f0e..b588217daed4 100644 --- a/exporter/mezmoexporter/config_test.go +++ b/exporter/mezmoexporter/config_test.go @@ -21,6 +21,7 @@ import ( "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" + "go.opentelemetry.io/collector/component" "go.opentelemetry.io/collector/config" "go.opentelemetry.io/collector/config/confighttp" "go.opentelemetry.io/collector/confmap/confmaptest" @@ -38,17 +39,17 @@ func TestLoadConfig(t *testing.T) { defaultCfg.IngestKey = "00000000000000000000000000000000" tests := []struct { - id config.ComponentID - expected config.Exporter + id component.ID + expected component.ExporterConfig }{ { - id: config.NewComponentIDWithName(typeStr, ""), + id: component.NewIDWithName(typeStr, ""), expected: defaultCfg, }, { - id: config.NewComponentIDWithName(typeStr, "allsettings"), + id: component.NewIDWithName(typeStr, "allsettings"), expected: &Config{ - ExporterSettings: config.NewExporterSettings(config.NewComponentID(typeStr)), + ExporterSettings: config.NewExporterSettings(component.NewID(typeStr)), HTTPClientSettings: confighttp.HTTPClientSettings{ Timeout: 5 * time.Second, }, @@ -76,7 +77,7 @@ func TestLoadConfig(t *testing.T) { sub, err := cm.Sub(tt.id.String()) require.NoError(t, err) - require.NoError(t, config.UnmarshalExporter(sub, cfg)) + require.NoError(t, component.UnmarshalExporterConfig(sub, cfg)) assert.NoError(t, cfg.Validate()) assert.Equal(t, tt.expected, cfg) diff --git a/exporter/mezmoexporter/factory.go b/exporter/mezmoexporter/factory.go index ccffc737b1b2..ba5bf133b2a8 100644 --- a/exporter/mezmoexporter/factory.go +++ b/exporter/mezmoexporter/factory.go @@ -39,9 +39,9 @@ func NewFactory() component.ExporterFactory { } // Create a default Memzo config -func createDefaultConfig() config.Exporter { +func createDefaultConfig() component.ExporterConfig { return &Config{ - ExporterSettings: config.NewExporterSettings(config.NewComponentID(typeStr)), + ExporterSettings: config.NewExporterSettings(component.NewID(typeStr)), HTTPClientSettings: createDefaultHTTPClientSettings(), RetrySettings: exporterhelper.NewDefaultRetrySettings(), QueueSettings: exporterhelper.NewDefaultQueueSettings(), @@ -50,7 +50,7 @@ func createDefaultConfig() config.Exporter { } // Create a log exporter for exporting to Mezmo -func createLogsExporter(ctx context.Context, settings component.ExporterCreateSettings, exporterConfig config.Exporter) (component.LogsExporter, error) { +func createLogsExporter(ctx context.Context, settings component.ExporterCreateSettings, exporterConfig component.ExporterConfig) (component.LogsExporter, error) { log := settings.Logger if exporterConfig == nil { diff --git a/exporter/mezmoexporter/factory_test.go b/exporter/mezmoexporter/factory_test.go index 3ebc695a15dc..8b97404083b6 100644 --- a/exporter/mezmoexporter/factory_test.go +++ b/exporter/mezmoexporter/factory_test.go @@ -20,17 +20,17 @@ import ( "time" "github.com/stretchr/testify/assert" + "go.opentelemetry.io/collector/component" "go.opentelemetry.io/collector/component/componenttest" "go.opentelemetry.io/collector/config" "go.opentelemetry.io/collector/config/confighttp" - "go.opentelemetry.io/collector/config/configtest" "go.opentelemetry.io/collector/exporter/exporterhelper" ) func TestType(t *testing.T) { factory := NewFactory() pType := factory.Type() - assert.Equal(t, pType, config.Type(typeStr)) + assert.Equal(t, pType, component.Type(typeStr)) } func TestCreateDefaultConfig(t *testing.T) { @@ -38,7 +38,7 @@ func TestCreateDefaultConfig(t *testing.T) { cfg := factory.CreateDefaultConfig() assert.Equal(t, cfg, &Config{ - ExporterSettings: config.NewExporterSettings(config.NewComponentID(typeStr)), + ExporterSettings: config.NewExporterSettings(component.NewID(typeStr)), IngestURL: defaultIngestURL, IngestKey: "", @@ -48,7 +48,7 @@ func TestCreateDefaultConfig(t *testing.T) { RetrySettings: exporterhelper.NewDefaultRetrySettings(), QueueSettings: exporterhelper.NewDefaultQueueSettings(), }) - assert.NoError(t, configtest.CheckConfigStruct(cfg)) + assert.NoError(t, componenttest.CheckConfigStruct(cfg)) } func TestIngestUrlMustConform(t *testing.T) { diff --git a/exporter/mezmoexporter/go.mod b/exporter/mezmoexporter/go.mod index a492f54dc83e..afd1f3d1b74f 100644 --- a/exporter/mezmoexporter/go.mod +++ b/exporter/mezmoexporter/go.mod @@ -4,9 +4,9 @@ go 1.18 require ( github.com/stretchr/testify v1.8.1 - go.opentelemetry.io/collector v0.63.2-0.20221104003159-6b27644724d8 - go.opentelemetry.io/collector/pdata v0.63.2-0.20221104003159-6b27644724d8 - go.opentelemetry.io/collector/semconv v0.63.2-0.20221104003159-6b27644724d8 + go.opentelemetry.io/collector v0.63.2-0.20221108014805-0b08d5316426 + go.opentelemetry.io/collector/pdata v0.63.2-0.20221108014805-0b08d5316426 + go.opentelemetry.io/collector/semconv v0.63.2-0.20221108014805-0b08d5316426 go.uber.org/zap v1.23.0 ) @@ -29,7 +29,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.opencensus.io v0.23.0 // indirect + go.opencensus.io v0.24.0 // 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 7a4fc5408fed..d5db3b87b8ac 100644 --- a/exporter/mezmoexporter/go.sum +++ b/exporter/mezmoexporter/go.sum @@ -238,7 +238,7 @@ github.com/prometheus/client_golang v0.9.1/go.mod h1:7SWBe2y4D6OKWSNQJUaRYU/AaXP github.com/prometheus/client_golang v1.0.0/go.mod h1:db9x61etRT2tGnBNRi70OPL5FsnadC4Ky3P0J6CfImo= github.com/prometheus/client_golang v1.7.1/go.mod h1:PY5Wy2awLA44sXw4AOSfFBetzPP4j5+D6mVACh+pe2M= github.com/prometheus/client_golang v1.11.1/go.mod h1:Z6t4BnS23TR94PD6BsDNk8yVqroYurpAkEiz0P2BEV0= -github.com/prometheus/client_golang v1.13.0 h1:b71QUfeo5M8gq2+evJdTPfZhYMAU0uKPkyPJ7TPsloU= +github.com/prometheus/client_golang v1.13.1 h1:3gMjIY2+/hzmqhtUC/aQNYldJA6DtH3CgQvwS+02K1c= github.com/prometheus/client_model v0.0.0-20180712105110-5c3871d89910/go.mod h1:MbSGuTsp3dbXC40dX6PRTWyKYBIrTGTE9sqQNg2J8bo= github.com/prometheus/client_model v0.0.0-20190129233127-fd36f4220a90/go.mod h1:xMI15A0UPsDsEKsMN9yxemIoYk6Tm2C1GtYGdfGttqA= github.com/prometheus/client_model v0.0.0-20190812154241-14fe0d1b01d4/go.mod h1:xMI15A0UPsDsEKsMN9yxemIoYk6Tm2C1GtYGdfGttqA= @@ -276,7 +276,6 @@ github.com/stretchr/testify v1.2.2/go.mod h1:a8OnRcib4nhh0OaRAV+Yts87kKdq0PP7pXf github.com/stretchr/testify v1.3.0/go.mod h1:M5WIy9Dh21IEIfnGCwXGc5bZfKNJtfHm1UVUgZn+9EI= github.com/stretchr/testify v1.4.0/go.mod h1:j7eGeouHqKxXV5pUuKE4zz7dFj8WfuZ+81PSLYec5m4= github.com/stretchr/testify v1.5.1/go.mod h1:5W2xD1RspED5o8YsWQXVCued0rvSQ+mT+I5cxcmMvtA= -github.com/stretchr/testify v1.6.1/go.mod h1:6Fq8oRcR53rry900zMqJjRRixrwX3KX962/h/Wwjteg= github.com/stretchr/testify v1.7.0/go.mod h1:6Fq8oRcR53rry900zMqJjRRixrwX3KX962/h/Wwjteg= github.com/stretchr/testify v1.7.1/go.mod h1:6Fq8oRcR53rry900zMqJjRRixrwX3KX962/h/Wwjteg= github.com/stretchr/testify v1.8.0/go.mod h1:yNjHg4UonilssWZ8iaSj1OCr/vHnekPRkoO+kdMU+MU= @@ -288,14 +287,14 @@ 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.opencensus.io v0.23.0 h1:gqCw0LfLxScz8irSi8exQc7fyQ0fKQU/qnC/X8+V/1M= -go.opencensus.io v0.23.0/go.mod h1:XItmlyltB5F7CS4xOC1DcqMoFqwtC6OG2xF7mCv7P7E= -go.opentelemetry.io/collector v0.63.2-0.20221104003159-6b27644724d8 h1:rOT5HzXXfSISc6FiH012zH2/EFjp37UXfjEqj5BpkWQ= -go.opentelemetry.io/collector v0.63.2-0.20221104003159-6b27644724d8/go.mod h1:JVmeZXugK4ondC6KQgrHTHWiF4JttpG5k6dWPMt62+k= -go.opentelemetry.io/collector/pdata v0.63.2-0.20221104003159-6b27644724d8 h1:7xeTQjfsOm9eogQeIxjSEhlik9qsbBGsnmkQHfyKaRE= -go.opentelemetry.io/collector/pdata v0.63.2-0.20221104003159-6b27644724d8/go.mod h1:IzvXUGQml2mrnvdb8zIlEW3qQs9oFLdD2hLwJdZ+pek= -go.opentelemetry.io/collector/semconv v0.63.2-0.20221104003159-6b27644724d8 h1:jm0sNPyqo6S165QjQYMBHB2nK50wlJbMYM03Yr3Eo2k= -go.opentelemetry.io/collector/semconv v0.63.2-0.20221104003159-6b27644724d8/go.mod h1:5o9yhOa+ABt7g2E5JABDxGZ1PQPbtfxrKNbYn+LOTXU= +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.63.2-0.20221108014805-0b08d5316426 h1:z/wLTMh7/vNxcFUDa5uG7/IPE3tYx6pzCWPV41ghyV8= +go.opentelemetry.io/collector v0.63.2-0.20221108014805-0b08d5316426/go.mod h1:+Zb70q0Rq17dA9FcHTiTjW6g96lvJ8kAZ0c+eWNkAv0= +go.opentelemetry.io/collector/pdata v0.63.2-0.20221108014805-0b08d5316426 h1:wKDpgP0Tx/gWI2SgDGAY1OTSeihhDivbbRqFR79IGTc= +go.opentelemetry.io/collector/pdata v0.63.2-0.20221108014805-0b08d5316426/go.mod h1:IzvXUGQml2mrnvdb8zIlEW3qQs9oFLdD2hLwJdZ+pek= +go.opentelemetry.io/collector/semconv v0.63.2-0.20221108014805-0b08d5316426 h1:pqIl7OC531J6i9ttBCj3zLmZI/BSF4q323YpK0GgKGk= +go.opentelemetry.io/collector/semconv v0.63.2-0.20221108014805-0b08d5316426/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.go b/exporter/opencensusexporter/config.go index c91747632b00..b5000b2ac813 100644 --- a/exporter/opencensusexporter/config.go +++ b/exporter/opencensusexporter/config.go @@ -15,6 +15,7 @@ package opencensusexporter // import "github.com/open-telemetry/opentelemetry-collector-contrib/exporter/opencensusexporter" import ( + "go.opentelemetry.io/collector/component" "go.opentelemetry.io/collector/config" "go.opentelemetry.io/collector/config/configgrpc" "go.opentelemetry.io/collector/exporter/exporterhelper" @@ -31,7 +32,7 @@ type Config struct { NumWorkers int `mapstructure:"num_workers"` } -var _ config.Exporter = (*Config)(nil) +var _ component.ExporterConfig = (*Config)(nil) // Validate checks if the exporter configuration is valid func (cfg *Config) Validate() error { diff --git a/exporter/opencensusexporter/config_test.go b/exporter/opencensusexporter/config_test.go index 63c2ee05afad..ce1fe8e53f06 100644 --- a/exporter/opencensusexporter/config_test.go +++ b/exporter/opencensusexporter/config_test.go @@ -21,6 +21,7 @@ import ( "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" + "go.opentelemetry.io/collector/component" "go.opentelemetry.io/collector/config" "go.opentelemetry.io/collector/config/configgrpc" "go.opentelemetry.io/collector/config/configtls" @@ -35,17 +36,17 @@ func TestLoadConfig(t *testing.T) { require.NoError(t, err) tests := []struct { - id config.ComponentID - expected config.Exporter + id component.ID + expected component.ExporterConfig }{ { - id: config.NewComponentIDWithName(typeStr, ""), + id: component.NewIDWithName(typeStr, ""), expected: createDefaultConfig(), }, { - id: config.NewComponentIDWithName(typeStr, "2"), + id: component.NewIDWithName(typeStr, "2"), expected: &Config{ - ExporterSettings: config.NewExporterSettings(config.NewComponentID(typeStr)), + ExporterSettings: config.NewExporterSettings(component.NewID(typeStr)), RetrySettings: exporterhelper.RetrySettings{ Enabled: true, InitialInterval: 10 * time.Second, @@ -91,7 +92,7 @@ func TestLoadConfig(t *testing.T) { sub, err := cm.Sub(tt.id.String()) require.NoError(t, err) - require.NoError(t, config.UnmarshalExporter(sub, cfg)) + require.NoError(t, component.UnmarshalExporterConfig(sub, cfg)) assert.NoError(t, cfg.Validate()) assert.Equal(t, tt.expected, cfg) diff --git a/exporter/opencensusexporter/factory.go b/exporter/opencensusexporter/factory.go index 667201e55dd5..5419b93c5f62 100644 --- a/exporter/opencensusexporter/factory.go +++ b/exporter/opencensusexporter/factory.go @@ -40,9 +40,9 @@ func NewFactory() component.ExporterFactory { component.WithMetricsExporter(createMetricsExporter, stability)) } -func createDefaultConfig() config.Exporter { +func createDefaultConfig() component.ExporterConfig { return &Config{ - ExporterSettings: config.NewExporterSettings(config.NewComponentID(typeStr)), + ExporterSettings: config.NewExporterSettings(component.NewID(typeStr)), GRPCClientSettings: configgrpc.GRPCClientSettings{ Headers: map[string]string{}, // We almost read 0 bytes, so no need to tune ReadBufferSize. @@ -52,7 +52,7 @@ func createDefaultConfig() config.Exporter { } } -func createTracesExporter(ctx context.Context, set component.ExporterCreateSettings, cfg config.Exporter) (component.TracesExporter, error) { +func createTracesExporter(ctx context.Context, set component.ExporterCreateSettings, cfg component.ExporterConfig) (component.TracesExporter, error) { oCfg := cfg.(*Config) oce, err := newTracesExporter(ctx, oCfg, set.TelemetrySettings) if err != nil { @@ -71,7 +71,7 @@ func createTracesExporter(ctx context.Context, set component.ExporterCreateSetti exporterhelper.WithShutdown(oce.shutdown)) } -func createMetricsExporter(ctx context.Context, set component.ExporterCreateSettings, cfg config.Exporter) (component.MetricsExporter, error) { +func createMetricsExporter(ctx context.Context, set component.ExporterCreateSettings, cfg component.ExporterConfig) (component.MetricsExporter, error) { oCfg := cfg.(*Config) oce, err := newMetricsExporter(ctx, oCfg, set.TelemetrySettings) if err != nil { diff --git a/exporter/opencensusexporter/factory_test.go b/exporter/opencensusexporter/factory_test.go index 53f082504124..9d4c636aa1f0 100644 --- a/exporter/opencensusexporter/factory_test.go +++ b/exporter/opencensusexporter/factory_test.go @@ -25,7 +25,6 @@ import ( "go.opentelemetry.io/collector/component/componenttest" "go.opentelemetry.io/collector/config" "go.opentelemetry.io/collector/config/configgrpc" - "go.opentelemetry.io/collector/config/configtest" "go.opentelemetry.io/collector/config/configtls" "github.com/open-telemetry/opentelemetry-collector-contrib/internal/common/testutil" @@ -34,7 +33,7 @@ import ( func TestCreateDefaultConfig(t *testing.T) { cfg := createDefaultConfig() assert.NotNil(t, cfg, "failed to create default config") - assert.NoError(t, configtest.CheckConfigStruct(cfg)) + assert.NoError(t, componenttest.CheckConfigStruct(cfg)) } func TestCreateTracesExporter(t *testing.T) { @@ -48,7 +47,7 @@ func TestCreateTracesExporter(t *testing.T) { { name: "NoEndpoint", config: Config{ - ExporterSettings: config.NewExporterSettings(config.NewComponentID(typeStr)), + ExporterSettings: config.NewExporterSettings(component.NewID(typeStr)), GRPCClientSettings: configgrpc.GRPCClientSettings{ Endpoint: "", }, @@ -59,7 +58,7 @@ func TestCreateTracesExporter(t *testing.T) { { name: "ZeroNumWorkers", config: Config{ - ExporterSettings: config.NewExporterSettings(config.NewComponentID(typeStr)), + ExporterSettings: config.NewExporterSettings(component.NewID(typeStr)), GRPCClientSettings: configgrpc.GRPCClientSettings{ Endpoint: endpoint, TLSSetting: configtls.TLSClientSetting{ @@ -73,7 +72,7 @@ func TestCreateTracesExporter(t *testing.T) { { name: "UseSecure", config: Config{ - ExporterSettings: config.NewExporterSettings(config.NewComponentID(typeStr)), + ExporterSettings: config.NewExporterSettings(component.NewID(typeStr)), GRPCClientSettings: configgrpc.GRPCClientSettings{ Endpoint: endpoint, TLSSetting: configtls.TLSClientSetting{ @@ -86,7 +85,7 @@ func TestCreateTracesExporter(t *testing.T) { { name: "Keepalive", config: Config{ - ExporterSettings: config.NewExporterSettings(config.NewComponentID(typeStr)), + ExporterSettings: config.NewExporterSettings(component.NewID(typeStr)), GRPCClientSettings: configgrpc.GRPCClientSettings{ Endpoint: endpoint, Keepalive: &configgrpc.KeepaliveClientConfig{ @@ -101,7 +100,7 @@ func TestCreateTracesExporter(t *testing.T) { { name: "Compression", config: Config{ - ExporterSettings: config.NewExporterSettings(config.NewComponentID(typeStr)), + ExporterSettings: config.NewExporterSettings(component.NewID(typeStr)), GRPCClientSettings: configgrpc.GRPCClientSettings{ Endpoint: endpoint, Compression: "gzip", @@ -112,7 +111,7 @@ func TestCreateTracesExporter(t *testing.T) { { name: "Headers", config: Config{ - ExporterSettings: config.NewExporterSettings(config.NewComponentID(typeStr)), + ExporterSettings: config.NewExporterSettings(component.NewID(typeStr)), GRPCClientSettings: configgrpc.GRPCClientSettings{ Endpoint: endpoint, Headers: map[string]string{ @@ -126,7 +125,7 @@ func TestCreateTracesExporter(t *testing.T) { { name: "CompressionError", config: Config{ - ExporterSettings: config.NewExporterSettings(config.NewComponentID(typeStr)), + ExporterSettings: config.NewExporterSettings(component.NewID(typeStr)), GRPCClientSettings: configgrpc.GRPCClientSettings{ Endpoint: endpoint, Compression: "unknown compression", @@ -139,7 +138,7 @@ func TestCreateTracesExporter(t *testing.T) { { name: "CaCert", config: Config{ - ExporterSettings: config.NewExporterSettings(config.NewComponentID(typeStr)), + ExporterSettings: config.NewExporterSettings(component.NewID(typeStr)), GRPCClientSettings: configgrpc.GRPCClientSettings{ Endpoint: endpoint, TLSSetting: configtls.TLSClientSetting{ @@ -154,7 +153,7 @@ func TestCreateTracesExporter(t *testing.T) { { name: "CertPemFileError", config: Config{ - ExporterSettings: config.NewExporterSettings(config.NewComponentID(typeStr)), + ExporterSettings: config.NewExporterSettings(component.NewID(typeStr)), GRPCClientSettings: configgrpc.GRPCClientSettings{ Endpoint: endpoint, TLSSetting: configtls.TLSClientSetting{ diff --git a/exporter/opencensusexporter/go.mod b/exporter/opencensusexporter/go.mod index c1a869bb7187..b510572439c2 100644 --- a/exporter/opencensusexporter/go.mod +++ b/exporter/opencensusexporter/go.mod @@ -9,8 +9,8 @@ require ( github.com/open-telemetry/opentelemetry-collector-contrib/pkg/translator/opencensus v0.63.0 github.com/open-telemetry/opentelemetry-collector-contrib/receiver/opencensusreceiver v0.63.0 github.com/stretchr/testify v1.8.1 - go.opentelemetry.io/collector v0.63.2-0.20221104003159-6b27644724d8 - go.opentelemetry.io/collector/pdata v0.63.2-0.20221104003159-6b27644724d8 + go.opentelemetry.io/collector v0.63.2-0.20221108014805-0b08d5316426 + go.opentelemetry.io/collector/pdata v0.63.2-0.20221108014805-0b08d5316426 google.golang.org/grpc v1.50.1 ) @@ -37,8 +37,8 @@ require ( github.com/pmezard/go-difflib v1.0.0 // indirect github.com/rs/cors v1.8.2 // indirect github.com/soheilhy/cmux v0.1.5 // indirect - go.opencensus.io v0.23.0 // indirect - go.opentelemetry.io/collector/semconv v0.63.2-0.20221104003159-6b27644724d8 // indirect + go.opencensus.io v0.24.0 // indirect + go.opentelemetry.io/collector/semconv v0.63.2-0.20221108014805-0b08d5316426 // 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 1eadb281d799..58d9c8834bb0 100644 --- a/exporter/opencensusexporter/go.sum +++ b/exporter/opencensusexporter/go.sum @@ -262,7 +262,7 @@ github.com/prometheus/client_golang v0.9.1/go.mod h1:7SWBe2y4D6OKWSNQJUaRYU/AaXP github.com/prometheus/client_golang v1.0.0/go.mod h1:db9x61etRT2tGnBNRi70OPL5FsnadC4Ky3P0J6CfImo= github.com/prometheus/client_golang v1.7.1/go.mod h1:PY5Wy2awLA44sXw4AOSfFBetzPP4j5+D6mVACh+pe2M= github.com/prometheus/client_golang v1.11.1/go.mod h1:Z6t4BnS23TR94PD6BsDNk8yVqroYurpAkEiz0P2BEV0= -github.com/prometheus/client_golang v1.13.0 h1:b71QUfeo5M8gq2+evJdTPfZhYMAU0uKPkyPJ7TPsloU= +github.com/prometheus/client_golang v1.13.1 h1:3gMjIY2+/hzmqhtUC/aQNYldJA6DtH3CgQvwS+02K1c= github.com/prometheus/client_model v0.0.0-20180712105110-5c3871d89910/go.mod h1:MbSGuTsp3dbXC40dX6PRTWyKYBIrTGTE9sqQNg2J8bo= github.com/prometheus/client_model v0.0.0-20190129233127-fd36f4220a90/go.mod h1:xMI15A0UPsDsEKsMN9yxemIoYk6Tm2C1GtYGdfGttqA= github.com/prometheus/client_model v0.0.0-20190812154241-14fe0d1b01d4/go.mod h1:xMI15A0UPsDsEKsMN9yxemIoYk6Tm2C1GtYGdfGttqA= @@ -316,14 +316,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.opencensus.io v0.23.0 h1:gqCw0LfLxScz8irSi8exQc7fyQ0fKQU/qnC/X8+V/1M= go.opencensus.io v0.23.0/go.mod h1:XItmlyltB5F7CS4xOC1DcqMoFqwtC6OG2xF7mCv7P7E= -go.opentelemetry.io/collector v0.63.2-0.20221104003159-6b27644724d8 h1:rOT5HzXXfSISc6FiH012zH2/EFjp37UXfjEqj5BpkWQ= -go.opentelemetry.io/collector v0.63.2-0.20221104003159-6b27644724d8/go.mod h1:JVmeZXugK4ondC6KQgrHTHWiF4JttpG5k6dWPMt62+k= -go.opentelemetry.io/collector/pdata v0.63.2-0.20221104003159-6b27644724d8 h1:7xeTQjfsOm9eogQeIxjSEhlik9qsbBGsnmkQHfyKaRE= -go.opentelemetry.io/collector/pdata v0.63.2-0.20221104003159-6b27644724d8/go.mod h1:IzvXUGQml2mrnvdb8zIlEW3qQs9oFLdD2hLwJdZ+pek= -go.opentelemetry.io/collector/semconv v0.63.2-0.20221104003159-6b27644724d8 h1:jm0sNPyqo6S165QjQYMBHB2nK50wlJbMYM03Yr3Eo2k= -go.opentelemetry.io/collector/semconv v0.63.2-0.20221104003159-6b27644724d8/go.mod h1:5o9yhOa+ABt7g2E5JABDxGZ1PQPbtfxrKNbYn+LOTXU= +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.63.2-0.20221108014805-0b08d5316426 h1:z/wLTMh7/vNxcFUDa5uG7/IPE3tYx6pzCWPV41ghyV8= +go.opentelemetry.io/collector v0.63.2-0.20221108014805-0b08d5316426/go.mod h1:+Zb70q0Rq17dA9FcHTiTjW6g96lvJ8kAZ0c+eWNkAv0= +go.opentelemetry.io/collector/pdata v0.63.2-0.20221108014805-0b08d5316426 h1:wKDpgP0Tx/gWI2SgDGAY1OTSeihhDivbbRqFR79IGTc= +go.opentelemetry.io/collector/pdata v0.63.2-0.20221108014805-0b08d5316426/go.mod h1:IzvXUGQml2mrnvdb8zIlEW3qQs9oFLdD2hLwJdZ+pek= +go.opentelemetry.io/collector/semconv v0.63.2-0.20221108014805-0b08d5316426 h1:pqIl7OC531J6i9ttBCj3zLmZI/BSF4q323YpK0GgKGk= +go.opentelemetry.io/collector/semconv v0.63.2-0.20221108014805-0b08d5316426/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 b764d8310899..a3ebd4ec12e7 100644 --- a/exporter/parquetexporter/factory.go +++ b/exporter/parquetexporter/factory.go @@ -44,16 +44,16 @@ func NewFactory() component.ExporterFactory { component.WithLogsExporter(createLogsExporter, stability)) } -func createDefaultConfig() config.Exporter { +func createDefaultConfig() component.ExporterConfig { return &Config{ - ExporterSettings: config.NewExporterSettings(config.NewComponentID(typeStr)), + ExporterSettings: config.NewExporterSettings(component.NewID(typeStr)), } } func createTracesExporter( ctx context.Context, set component.ExporterCreateSettings, - cfg config.Exporter, + cfg component.ExporterConfig, ) (component.TracesExporter, error) { fe := &parquetExporter{path: cfg.(*Config).Path} return exporterhelper.NewTracesExporter( @@ -69,7 +69,7 @@ func createTracesExporter( func createMetricsExporter( ctx context.Context, set component.ExporterCreateSettings, - cfg config.Exporter, + cfg component.ExporterConfig, ) (component.MetricsExporter, error) { fe := &parquetExporter{path: cfg.(*Config).Path} return exporterhelper.NewMetricsExporter( @@ -85,7 +85,7 @@ func createMetricsExporter( func createLogsExporter( ctx context.Context, set component.ExporterCreateSettings, - cfg config.Exporter, + cfg component.ExporterConfig, ) (component.LogsExporter, error) { fe := &parquetExporter{path: cfg.(*Config).Path} return exporterhelper.NewLogsExporter( diff --git a/exporter/parquetexporter/go.mod b/exporter/parquetexporter/go.mod index f632b25dff5d..17cb7e6c6faa 100644 --- a/exporter/parquetexporter/go.mod +++ b/exporter/parquetexporter/go.mod @@ -3,8 +3,8 @@ module github.com/open-telemetry/opentelemetry-collector-contrib/exporter/parque go 1.18 require ( - go.opentelemetry.io/collector v0.63.2-0.20221104003159-6b27644724d8 - go.opentelemetry.io/collector/pdata v0.63.2-0.20221104003159-6b27644724d8 + go.opentelemetry.io/collector v0.63.2-0.20221108014805-0b08d5316426 + go.opentelemetry.io/collector/pdata v0.63.2-0.20221108014805-0b08d5316426 ) require ( @@ -20,7 +20,7 @@ require ( github.com/modern-go/concurrent v0.0.0-20180306012644-bacd9c7ef1dd // indirect github.com/modern-go/reflect2 v1.0.2 // indirect github.com/pelletier/go-toml v1.9.4 // indirect - go.opencensus.io v0.23.0 // indirect + go.opencensus.io v0.24.0 // 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 e45c6c0d074f..2ea9db0b4581 100644 --- a/exporter/parquetexporter/go.sum +++ b/exporter/parquetexporter/go.sum @@ -229,7 +229,7 @@ github.com/prometheus/client_golang v0.9.1/go.mod h1:7SWBe2y4D6OKWSNQJUaRYU/AaXP github.com/prometheus/client_golang v1.0.0/go.mod h1:db9x61etRT2tGnBNRi70OPL5FsnadC4Ky3P0J6CfImo= github.com/prometheus/client_golang v1.7.1/go.mod h1:PY5Wy2awLA44sXw4AOSfFBetzPP4j5+D6mVACh+pe2M= github.com/prometheus/client_golang v1.11.1/go.mod h1:Z6t4BnS23TR94PD6BsDNk8yVqroYurpAkEiz0P2BEV0= -github.com/prometheus/client_golang v1.13.0 h1:b71QUfeo5M8gq2+evJdTPfZhYMAU0uKPkyPJ7TPsloU= +github.com/prometheus/client_golang v1.13.1 h1:3gMjIY2+/hzmqhtUC/aQNYldJA6DtH3CgQvwS+02K1c= github.com/prometheus/client_model v0.0.0-20180712105110-5c3871d89910/go.mod h1:MbSGuTsp3dbXC40dX6PRTWyKYBIrTGTE9sqQNg2J8bo= github.com/prometheus/client_model v0.0.0-20190129233127-fd36f4220a90/go.mod h1:xMI15A0UPsDsEKsMN9yxemIoYk6Tm2C1GtYGdfGttqA= github.com/prometheus/client_model v0.0.0-20190812154241-14fe0d1b01d4/go.mod h1:xMI15A0UPsDsEKsMN9yxemIoYk6Tm2C1GtYGdfGttqA= @@ -259,25 +259,29 @@ github.com/spf13/pflag v1.0.5 h1:iy+VFUOCP1a+8yFto/drg2CJ5u0yRoB7fZw3DKv/JXA= github.com/spf13/pflag v1.0.5/go.mod h1:McXfInJRrz4CZXVZOBLb0bTZqETkiAhM9Iw0y3An2Bg= github.com/stretchr/objx v0.1.0/go.mod h1:HFkY916IF+rwdDfMAkV7OtwuqBVzrE8GR6GFx+wExME= github.com/stretchr/objx v0.1.1/go.mod h1:HFkY916IF+rwdDfMAkV7OtwuqBVzrE8GR6GFx+wExME= +github.com/stretchr/objx v0.4.0/go.mod h1:YvHI0jy2hoMjB+UWwv71VJQ9isScKT/TqJzVSSt89Yw= +github.com/stretchr/objx v0.5.0/go.mod h1:Yh+to48EsGEfYuaHDzXPcE3xhTkx73EhmCGUpEOglKo= github.com/stretchr/testify v1.2.2/go.mod h1:a8OnRcib4nhh0OaRAV+Yts87kKdq0PP7pXfy6kDkUVs= github.com/stretchr/testify v1.3.0/go.mod h1:M5WIy9Dh21IEIfnGCwXGc5bZfKNJtfHm1UVUgZn+9EI= github.com/stretchr/testify v1.4.0/go.mod h1:j7eGeouHqKxXV5pUuKE4zz7dFj8WfuZ+81PSLYec5m4= github.com/stretchr/testify v1.5.1/go.mod h1:5W2xD1RspED5o8YsWQXVCued0rvSQ+mT+I5cxcmMvtA= -github.com/stretchr/testify v1.6.1/go.mod h1:6Fq8oRcR53rry900zMqJjRRixrwX3KX962/h/Wwjteg= github.com/stretchr/testify v1.7.0/go.mod h1:6Fq8oRcR53rry900zMqJjRRixrwX3KX962/h/Wwjteg= +github.com/stretchr/testify v1.7.1/go.mod h1:6Fq8oRcR53rry900zMqJjRRixrwX3KX962/h/Wwjteg= +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= github.com/yuin/goldmark v1.1.27/go.mod h1:3hX8gzYuyVAZsxl0MRgGTJEmQBFcNTphYh9decYSb74= github.com/yuin/goldmark v1.2.1/go.mod h1:3hX8gzYuyVAZsxl0MRgGTJEmQBFcNTphYh9decYSb74= github.com/yuin/goldmark v1.3.5/go.mod h1:mwnBkeHKe2W/ZEtQ+71ViKU8L12m81fl3OWwC1Zlc8k= 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.opencensus.io v0.23.0 h1:gqCw0LfLxScz8irSi8exQc7fyQ0fKQU/qnC/X8+V/1M= -go.opencensus.io v0.23.0/go.mod h1:XItmlyltB5F7CS4xOC1DcqMoFqwtC6OG2xF7mCv7P7E= -go.opentelemetry.io/collector v0.63.2-0.20221104003159-6b27644724d8 h1:rOT5HzXXfSISc6FiH012zH2/EFjp37UXfjEqj5BpkWQ= -go.opentelemetry.io/collector v0.63.2-0.20221104003159-6b27644724d8/go.mod h1:JVmeZXugK4ondC6KQgrHTHWiF4JttpG5k6dWPMt62+k= -go.opentelemetry.io/collector/pdata v0.63.2-0.20221104003159-6b27644724d8 h1:7xeTQjfsOm9eogQeIxjSEhlik9qsbBGsnmkQHfyKaRE= -go.opentelemetry.io/collector/pdata v0.63.2-0.20221104003159-6b27644724d8/go.mod h1:IzvXUGQml2mrnvdb8zIlEW3qQs9oFLdD2hLwJdZ+pek= +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.63.2-0.20221108014805-0b08d5316426 h1:z/wLTMh7/vNxcFUDa5uG7/IPE3tYx6pzCWPV41ghyV8= +go.opentelemetry.io/collector v0.63.2-0.20221108014805-0b08d5316426/go.mod h1:+Zb70q0Rq17dA9FcHTiTjW6g96lvJ8kAZ0c+eWNkAv0= +go.opentelemetry.io/collector/pdata v0.63.2-0.20221108014805-0b08d5316426 h1:wKDpgP0Tx/gWI2SgDGAY1OTSeihhDivbbRqFR79IGTc= +go.opentelemetry.io/collector/pdata v0.63.2-0.20221108014805-0b08d5316426/go.mod h1:IzvXUGQml2mrnvdb8zIlEW3qQs9oFLdD2hLwJdZ+pek= 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.go b/exporter/prometheusexporter/config.go index bb4bf3777267..a70d5dff16fb 100644 --- a/exporter/prometheusexporter/config.go +++ b/exporter/prometheusexporter/config.go @@ -18,6 +18,7 @@ import ( "time" "github.com/prometheus/client_golang/prometheus" + "go.opentelemetry.io/collector/component" "go.opentelemetry.io/collector/config" "go.opentelemetry.io/collector/config/confighttp" @@ -48,7 +49,7 @@ type Config struct { EnableOpenMetrics bool `mapstructure:"enable_open_metrics"` } -var _ config.Exporter = (*Config)(nil) +var _ component.ExporterConfig = (*Config)(nil) // Validate checks if the exporter configuration is valid func (cfg *Config) Validate() error { diff --git a/exporter/prometheusexporter/config_test.go b/exporter/prometheusexporter/config_test.go index b7579ce971e0..cfc51c1996ce 100644 --- a/exporter/prometheusexporter/config_test.go +++ b/exporter/prometheusexporter/config_test.go @@ -21,6 +21,7 @@ import ( "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" + "go.opentelemetry.io/collector/component" "go.opentelemetry.io/collector/config" "go.opentelemetry.io/collector/config/confighttp" "go.opentelemetry.io/collector/config/configtls" @@ -34,17 +35,17 @@ func TestLoadConfig(t *testing.T) { require.NoError(t, err) tests := []struct { - id config.ComponentID - expected config.Exporter + id component.ID + expected component.ExporterConfig }{ { - id: config.NewComponentIDWithName(typeStr, ""), + id: component.NewIDWithName(typeStr, ""), expected: createDefaultConfig(), }, { - id: config.NewComponentIDWithName(typeStr, "2"), + id: component.NewIDWithName(typeStr, "2"), expected: &Config{ - ExporterSettings: config.NewExporterSettings(config.NewComponentID(typeStr)), + ExporterSettings: config.NewExporterSettings(component.NewID(typeStr)), HTTPServerSettings: confighttp.HTTPServerSettings{ Endpoint: "1.2.3.4:1234", TLSSetting: &configtls.TLSServerSetting{ @@ -73,7 +74,7 @@ func TestLoadConfig(t *testing.T) { sub, err := cm.Sub(tt.id.String()) require.NoError(t, err) - require.NoError(t, config.UnmarshalExporter(sub, cfg)) + require.NoError(t, component.UnmarshalExporterConfig(sub, cfg)) assert.NoError(t, cfg.Validate()) assert.Equal(t, tt.expected, cfg) diff --git a/exporter/prometheusexporter/end_to_end_test.go b/exporter/prometheusexporter/end_to_end_test.go index 24485a6123b1..fb64401f3874 100644 --- a/exporter/prometheusexporter/end_to_end_test.go +++ b/exporter/prometheusexporter/end_to_end_test.go @@ -29,6 +29,7 @@ import ( promconfig "github.com/prometheus/prometheus/config" "github.com/stretchr/testify/require" + "go.opentelemetry.io/collector/component" "go.opentelemetry.io/collector/component/componenttest" "go.opentelemetry.io/collector/config" "go.opentelemetry.io/collector/config/confighttp" @@ -68,7 +69,7 @@ func TestEndToEndSummarySupport(t *testing.T) { // 2. Create the Prometheus metrics exporter that'll receive and verify the metrics produced. exporterCfg := &Config{ - ExporterSettings: config.NewExporterSettings(config.NewComponentID(typeStr)), + ExporterSettings: config.NewExporterSettings(component.NewID(typeStr)), Namespace: "test", HTTPServerSettings: confighttp.HTTPServerSettings{ Endpoint: ":8787", @@ -109,7 +110,7 @@ func TestEndToEndSummarySupport(t *testing.T) { receiverCreateSet := componenttest.NewNopReceiverCreateSettings() rcvCfg := &prometheusreceiver.Config{ PrometheusConfig: receiverConfig, - ReceiverSettings: config.NewReceiverSettings(config.NewComponentID("prometheus")), + ReceiverSettings: config.NewReceiverSettings(component.NewID("prometheus")), } // 3.5 Create the Prometheus receiver and pass in the previously created Prometheus exporter. prometheusReceiver, err := receiverFactory.CreateMetricsReceiver(ctx, receiverCreateSet, rcvCfg, exporter) diff --git a/exporter/prometheusexporter/factory.go b/exporter/prometheusexporter/factory.go index 76c2ea726c28..5d74a3c66740 100644 --- a/exporter/prometheusexporter/factory.go +++ b/exporter/prometheusexporter/factory.go @@ -41,9 +41,9 @@ func NewFactory() component.ExporterFactory { component.WithMetricsExporter(createMetricsExporter, stability)) } -func createDefaultConfig() config.Exporter { +func createDefaultConfig() component.ExporterConfig { return &Config{ - ExporterSettings: config.NewExporterSettings(config.NewComponentID(typeStr)), + ExporterSettings: config.NewExporterSettings(component.NewID(typeStr)), ConstLabels: map[string]string{}, SendTimestamps: false, MetricExpiration: time.Minute * 5, @@ -54,7 +54,7 @@ func createDefaultConfig() config.Exporter { func createMetricsExporter( ctx context.Context, set component.ExporterCreateSettings, - cfg config.Exporter, + cfg component.ExporterConfig, ) (component.MetricsExporter, error) { pcfg := cfg.(*Config) diff --git a/exporter/prometheusexporter/factory_test.go b/exporter/prometheusexporter/factory_test.go index 101da0acaead..9b20d1db38d6 100644 --- a/exporter/prometheusexporter/factory_test.go +++ b/exporter/prometheusexporter/factory_test.go @@ -21,13 +21,12 @@ import ( "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" "go.opentelemetry.io/collector/component/componenttest" - "go.opentelemetry.io/collector/config/configtest" ) func TestCreateDefaultConfig(t *testing.T) { cfg := createDefaultConfig() assert.NotNil(t, cfg, "failed to create default config") - assert.NoError(t, configtest.CheckConfigStruct(cfg)) + assert.NoError(t, componenttest.CheckConfigStruct(cfg)) } func TestCreateMetricsExporter(t *testing.T) { diff --git a/exporter/prometheusexporter/go.mod b/exporter/prometheusexporter/go.mod index bfa65495ca99..285d29962716 100644 --- a/exporter/prometheusexporter/go.mod +++ b/exporter/prometheusexporter/go.mod @@ -7,14 +7,14 @@ require ( github.com/open-telemetry/opentelemetry-collector-contrib/pkg/resourcetotelemetry v0.63.0 github.com/open-telemetry/opentelemetry-collector-contrib/pkg/translator/prometheus v0.63.0 github.com/open-telemetry/opentelemetry-collector-contrib/receiver/prometheusreceiver v0.63.0 - github.com/prometheus/client_golang v1.13.1-0.20221013115219-dcea97eee2b3 + github.com/prometheus/client_golang v1.13.1 github.com/prometheus/client_model v0.3.0 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.63.2-0.20221104003159-6b27644724d8 - go.opentelemetry.io/collector/pdata v0.63.2-0.20221104003159-6b27644724d8 - go.opentelemetry.io/collector/semconv v0.63.2-0.20221104003159-6b27644724d8 + go.opentelemetry.io/collector v0.63.2-0.20221108014805-0b08d5316426 + go.opentelemetry.io/collector/pdata v0.63.2-0.20221108014805-0b08d5316426 + go.opentelemetry.io/collector/semconv v0.63.2-0.20221108014805-0b08d5316426 go.uber.org/zap v1.23.0 gopkg.in/yaml.v2 v2.4.0 ) @@ -124,7 +124,7 @@ require ( github.com/sirupsen/logrus v1.8.1 // indirect github.com/spf13/pflag v1.0.5 // indirect github.com/vultr/govultr/v2 v2.17.2 // indirect - go.opencensus.io v0.23.0 // indirect + go.opencensus.io v0.24.0 // 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 45bb9721a3e2..75d53ada26a1 100644 --- a/exporter/prometheusexporter/go.sum +++ b/exporter/prometheusexporter/go.sum @@ -521,8 +521,8 @@ github.com/prometheus/client_golang v1.7.1/go.mod h1:PY5Wy2awLA44sXw4AOSfFBetzPP github.com/prometheus/client_golang v1.11.0/go.mod h1:Z6t4BnS23TR94PD6BsDNk8yVqroYurpAkEiz0P2BEV0= github.com/prometheus/client_golang v1.11.1/go.mod h1:Z6t4BnS23TR94PD6BsDNk8yVqroYurpAkEiz0P2BEV0= github.com/prometheus/client_golang v1.12.1/go.mod h1:3Z9XVyYiZYEO+YQWt3RD2R3jrbd179Rt297l4aS6nDY= -github.com/prometheus/client_golang v1.13.1-0.20221013115219-dcea97eee2b3 h1:T49ADLrYOgiyTHKx/N7tUxcglkLEt7xzDoQRqJNTzKg= -github.com/prometheus/client_golang v1.13.1-0.20221013115219-dcea97eee2b3/go.mod h1:vTeo+zgvILHsnnj/39Ou/1fPN5nJFOEMgftOUOmlvYQ= +github.com/prometheus/client_golang v1.13.1 h1:3gMjIY2+/hzmqhtUC/aQNYldJA6DtH3CgQvwS+02K1c= +github.com/prometheus/client_golang v1.13.1/go.mod h1:vTeo+zgvILHsnnj/39Ou/1fPN5nJFOEMgftOUOmlvYQ= github.com/prometheus/client_model v0.0.0-20180712105110-5c3871d89910/go.mod h1:MbSGuTsp3dbXC40dX6PRTWyKYBIrTGTE9sqQNg2J8bo= github.com/prometheus/client_model v0.0.0-20190129233127-fd36f4220a90/go.mod h1:xMI15A0UPsDsEKsMN9yxemIoYk6Tm2C1GtYGdfGttqA= github.com/prometheus/client_model v0.0.0-20190812154241-14fe0d1b01d4/go.mod h1:xMI15A0UPsDsEKsMN9yxemIoYk6Tm2C1GtYGdfGttqA= @@ -618,15 +618,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.opencensus.io v0.23.0 h1:gqCw0LfLxScz8irSi8exQc7fyQ0fKQU/qnC/X8+V/1M= -go.opencensus.io v0.23.0/go.mod h1:XItmlyltB5F7CS4xOC1DcqMoFqwtC6OG2xF7mCv7P7E= -go.opentelemetry.io/collector v0.63.2-0.20221104003159-6b27644724d8 h1:rOT5HzXXfSISc6FiH012zH2/EFjp37UXfjEqj5BpkWQ= -go.opentelemetry.io/collector v0.63.2-0.20221104003159-6b27644724d8/go.mod h1:JVmeZXugK4ondC6KQgrHTHWiF4JttpG5k6dWPMt62+k= -go.opentelemetry.io/collector/pdata v0.63.2-0.20221104003159-6b27644724d8 h1:7xeTQjfsOm9eogQeIxjSEhlik9qsbBGsnmkQHfyKaRE= -go.opentelemetry.io/collector/pdata v0.63.2-0.20221104003159-6b27644724d8/go.mod h1:IzvXUGQml2mrnvdb8zIlEW3qQs9oFLdD2hLwJdZ+pek= -go.opentelemetry.io/collector/processor/batchprocessor v0.0.0-20221104003159-6b27644724d8 h1:jgN7o3WfR8x++rjMcVM1VN6OJi4ytlGANXbwd73BPXo= -go.opentelemetry.io/collector/semconv v0.63.2-0.20221104003159-6b27644724d8 h1:jm0sNPyqo6S165QjQYMBHB2nK50wlJbMYM03Yr3Eo2k= -go.opentelemetry.io/collector/semconv v0.63.2-0.20221104003159-6b27644724d8/go.mod h1:5o9yhOa+ABt7g2E5JABDxGZ1PQPbtfxrKNbYn+LOTXU= +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.63.2-0.20221108014805-0b08d5316426 h1:z/wLTMh7/vNxcFUDa5uG7/IPE3tYx6pzCWPV41ghyV8= +go.opentelemetry.io/collector v0.63.2-0.20221108014805-0b08d5316426/go.mod h1:+Zb70q0Rq17dA9FcHTiTjW6g96lvJ8kAZ0c+eWNkAv0= +go.opentelemetry.io/collector/pdata v0.63.2-0.20221108014805-0b08d5316426 h1:wKDpgP0Tx/gWI2SgDGAY1OTSeihhDivbbRqFR79IGTc= +go.opentelemetry.io/collector/pdata v0.63.2-0.20221108014805-0b08d5316426/go.mod h1:IzvXUGQml2mrnvdb8zIlEW3qQs9oFLdD2hLwJdZ+pek= +go.opentelemetry.io/collector/processor/batchprocessor v0.0.0-20221108014805-0b08d5316426 h1:7f0NVsVGYT8pxAyk0qBBa8ZQf7athr/mfQ6QltGywN0= +go.opentelemetry.io/collector/semconv v0.63.2-0.20221108014805-0b08d5316426 h1:pqIl7OC531J6i9ttBCj3zLmZI/BSF4q323YpK0GgKGk= +go.opentelemetry.io/collector/semconv v0.63.2-0.20221108014805-0b08d5316426/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/prometheusexporter/prometheus_test.go b/exporter/prometheusexporter/prometheus_test.go index 072df6df1af6..619d06df78fe 100644 --- a/exporter/prometheusexporter/prometheus_test.go +++ b/exporter/prometheusexporter/prometheus_test.go @@ -25,6 +25,7 @@ import ( "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" + "go.opentelemetry.io/collector/component" "go.opentelemetry.io/collector/component/componenttest" "go.opentelemetry.io/collector/config" "go.opentelemetry.io/collector/config/confighttp" @@ -45,7 +46,7 @@ func TestPrometheusExporter(t *testing.T) { }{ { config: &Config{ - ExporterSettings: config.NewExporterSettings(config.NewComponentID(typeStr)), + ExporterSettings: config.NewExporterSettings(component.NewID(typeStr)), Namespace: "test", ConstLabels: map[string]string{ "foo0": "bar0", @@ -60,7 +61,7 @@ func TestPrometheusExporter(t *testing.T) { }, { config: &Config{ - ExporterSettings: config.NewExporterSettings(config.NewComponentID(typeStr)), + ExporterSettings: config.NewExporterSettings(component.NewID(typeStr)), HTTPServerSettings: confighttp.HTTPServerSettings{ Endpoint: ":88999", }, @@ -69,7 +70,7 @@ func TestPrometheusExporter(t *testing.T) { }, { config: &Config{ - ExporterSettings: config.NewExporterSettings(config.NewComponentID(typeStr)), + ExporterSettings: config.NewExporterSettings(component.NewID(typeStr)), }, wantErr: "expecting a non-blank address to run the Prometheus metrics handler", }, @@ -107,7 +108,7 @@ func TestPrometheusExporter(t *testing.T) { func TestPrometheusExporter_WithTLS(t *testing.T) { cfg := &Config{ - ExporterSettings: config.NewExporterSettings(config.NewComponentID(typeStr)), + ExporterSettings: config.NewExporterSettings(component.NewID(typeStr)), Namespace: "test", ConstLabels: map[string]string{ "foo2": "bar2", @@ -193,7 +194,7 @@ func TestPrometheusExporter_WithTLS(t *testing.T) { // See: https://github.com/open-telemetry/opentelemetry-collector-contrib/issues/4986 func TestPrometheusExporter_endToEndMultipleTargets(t *testing.T) { cfg := &Config{ - ExporterSettings: config.NewExporterSettings(config.NewComponentID(typeStr)), + ExporterSettings: config.NewExporterSettings(component.NewID(typeStr)), Namespace: "test", ConstLabels: map[string]string{ "foo1": "bar1", @@ -276,7 +277,7 @@ func TestPrometheusExporter_endToEndMultipleTargets(t *testing.T) { func TestPrometheusExporter_endToEnd(t *testing.T) { cfg := &Config{ - ExporterSettings: config.NewExporterSettings(config.NewComponentID(typeStr)), + ExporterSettings: config.NewExporterSettings(component.NewID(typeStr)), Namespace: "test", ConstLabels: map[string]string{ "foo1": "bar1", @@ -353,7 +354,7 @@ func TestPrometheusExporter_endToEnd(t *testing.T) { func TestPrometheusExporter_endToEndWithTimestamps(t *testing.T) { cfg := &Config{ - ExporterSettings: config.NewExporterSettings(config.NewComponentID(typeStr)), + ExporterSettings: config.NewExporterSettings(component.NewID(typeStr)), Namespace: "test", ConstLabels: map[string]string{ "foo2": "bar2", @@ -431,7 +432,7 @@ func TestPrometheusExporter_endToEndWithTimestamps(t *testing.T) { func TestPrometheusExporter_endToEndWithResource(t *testing.T) { cfg := &Config{ - ExporterSettings: config.NewExporterSettings(config.NewComponentID(typeStr)), + ExporterSettings: config.NewExporterSettings(component.NewID(typeStr)), Namespace: "test", ConstLabels: map[string]string{ "foo2": "bar2", diff --git a/exporter/prometheusremotewriteexporter/config.go b/exporter/prometheusremotewriteexporter/config.go index 161b3f10326f..578d024b6a1c 100644 --- a/exporter/prometheusremotewriteexporter/config.go +++ b/exporter/prometheusremotewriteexporter/config.go @@ -17,6 +17,7 @@ package prometheusremotewriteexporter // import "github.com/open-telemetry/opent import ( "fmt" + "go.opentelemetry.io/collector/component" "go.opentelemetry.io/collector/config" "go.opentelemetry.io/collector/config/confighttp" "go.opentelemetry.io/collector/exporter/exporterhelper" @@ -75,7 +76,7 @@ type RemoteWriteQueue struct { // TODO(jbd): Add capacity, max_samples_per_send to QueueConfig. -var _ config.Exporter = (*Config)(nil) +var _ component.ExporterConfig = (*Config)(nil) // Validate checks if the exporter configuration is valid func (cfg *Config) Validate() error { diff --git a/exporter/prometheusremotewriteexporter/config_test.go b/exporter/prometheusremotewriteexporter/config_test.go index ff2660fb2e13..56559447fbd5 100644 --- a/exporter/prometheusremotewriteexporter/config_test.go +++ b/exporter/prometheusremotewriteexporter/config_test.go @@ -21,6 +21,7 @@ import ( "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" + "go.opentelemetry.io/collector/component" "go.opentelemetry.io/collector/config" "go.opentelemetry.io/collector/config/confighttp" "go.opentelemetry.io/collector/config/configtls" @@ -37,18 +38,18 @@ func TestLoadConfig(t *testing.T) { require.NoError(t, err) tests := []struct { - id config.ComponentID - expected config.Exporter + id component.ID + expected component.ExporterConfig errorMessage string }{ { - id: config.NewComponentIDWithName(typeStr, ""), + id: component.NewIDWithName(typeStr, ""), expected: createDefaultConfig(), }, { - id: config.NewComponentIDWithName(typeStr, "2"), + id: component.NewIDWithName(typeStr, "2"), expected: &Config{ - ExporterSettings: config.NewExporterSettings(config.NewComponentID(typeStr)), + ExporterSettings: config.NewExporterSettings(component.NewID(typeStr)), TimeoutSettings: exporterhelper.NewDefaultTimeoutSettings(), RetrySettings: exporterhelper.RetrySettings{ Enabled: true, @@ -85,11 +86,11 @@ func TestLoadConfig(t *testing.T) { }, }, { - id: config.NewComponentIDWithName(typeStr, "negative_queue_size"), + id: component.NewIDWithName(typeStr, "negative_queue_size"), errorMessage: "remote write queue size can't be negative", }, { - id: config.NewComponentIDWithName(typeStr, "negative_num_consumers"), + id: component.NewIDWithName(typeStr, "negative_num_consumers"), errorMessage: "remote write consumer number can't be negative", }, } @@ -101,7 +102,7 @@ func TestLoadConfig(t *testing.T) { sub, err := cm.Sub(tt.id.String()) require.NoError(t, err) - require.NoError(t, config.UnmarshalExporter(sub, cfg)) + require.NoError(t, component.UnmarshalExporterConfig(sub, cfg)) if tt.expected == nil { assert.EqualError(t, cfg.Validate(), tt.errorMessage) @@ -119,9 +120,9 @@ func TestDisabledQueue(t *testing.T) { factory := NewFactory() cfg := factory.CreateDefaultConfig() - sub, err := cm.Sub(config.NewComponentIDWithName(typeStr, "disabled_queue").String()) + sub, err := cm.Sub(component.NewIDWithName(typeStr, "disabled_queue").String()) require.NoError(t, err) - require.NoError(t, config.UnmarshalExporter(sub, cfg)) + require.NoError(t, component.UnmarshalExporterConfig(sub, cfg)) assert.False(t, cfg.(*Config).RemoteWriteQueue.Enabled) } @@ -132,9 +133,9 @@ func TestDisabledTargetInfo(t *testing.T) { factory := NewFactory() cfg := factory.CreateDefaultConfig() - sub, err := cm.Sub(config.NewComponentIDWithName(typeStr, "disabled_target_info").String()) + sub, err := cm.Sub(component.NewIDWithName(typeStr, "disabled_target_info").String()) require.NoError(t, err) - require.NoError(t, config.UnmarshalExporter(sub, cfg)) + require.NoError(t, component.UnmarshalExporterConfig(sub, cfg)) assert.False(t, cfg.(*Config).TargetInfo.Enabled) } diff --git a/exporter/prometheusremotewriteexporter/exporter_test.go b/exporter/prometheusremotewriteexporter/exporter_test.go index 9729989d0eec..14ab9a5565bc 100644 --- a/exporter/prometheusremotewriteexporter/exporter_test.go +++ b/exporter/prometheusremotewriteexporter/exporter_test.go @@ -44,7 +44,7 @@ import ( // Test_NewPRWExporter checks that a new exporter instance with non-nil fields is initialized func Test_NewPRWExporter(t *testing.T) { cfg := &Config{ - ExporterSettings: config.NewExporterSettings(config.NewComponentID(typeStr)), + ExporterSettings: config.NewExporterSettings(component.NewID(typeStr)), TimeoutSettings: exporterhelper.TimeoutSettings{}, RetrySettings: exporterhelper.RetrySettings{}, Namespace: "", @@ -139,7 +139,7 @@ func Test_NewPRWExporter(t *testing.T) { // Test_Start checks if the client is properly created as expected. func Test_Start(t *testing.T) { cfg := &Config{ - ExporterSettings: config.NewExporterSettings(config.NewComponentID(typeStr)), + ExporterSettings: config.NewExporterSettings(component.NewID(typeStr)), TimeoutSettings: exporterhelper.TimeoutSettings{}, RetrySettings: exporterhelper.RetrySettings{}, Namespace: "", @@ -642,7 +642,7 @@ func Test_PushMetrics(t *testing.T) { defer server.Close() cfg := &Config{ - ExporterSettings: config.NewExporterSettings(config.NewComponentID(typeStr)), + ExporterSettings: config.NewExporterSettings(component.NewID(typeStr)), Namespace: "", HTTPClientSettings: confighttp.HTTPClientSettings{ Endpoint: server.URL, @@ -826,7 +826,7 @@ func TestWALOnExporterRoundTrip(t *testing.T) { // exporter and export some time series! tempDir := t.TempDir() cfg := &Config{ - ExporterSettings: config.NewExporterSettings(config.NewComponentID(typeStr)), + ExporterSettings: config.NewExporterSettings(component.NewID(typeStr)), Namespace: "test_ns", HTTPClientSettings: confighttp.HTTPClientSettings{ Endpoint: prweServer.URL, diff --git a/exporter/prometheusremotewriteexporter/factory.go b/exporter/prometheusremotewriteexporter/factory.go index c01620644b14..c56e3cfef175 100644 --- a/exporter/prometheusremotewriteexporter/factory.go +++ b/exporter/prometheusremotewriteexporter/factory.go @@ -43,7 +43,7 @@ func NewFactory() component.ExporterFactory { } func createMetricsExporter(ctx context.Context, set component.ExporterCreateSettings, - cfg config.Exporter) (component.MetricsExporter, error) { + cfg component.ExporterConfig) (component.MetricsExporter, error) { prwCfg, ok := cfg.(*Config) if !ok { @@ -82,9 +82,9 @@ func createMetricsExporter(ctx context.Context, set component.ExporterCreateSett return resourcetotelemetry.WrapMetricsExporter(prwCfg.ResourceToTelemetrySettings, exporter), nil } -func createDefaultConfig() config.Exporter { +func createDefaultConfig() component.ExporterConfig { return &Config{ - ExporterSettings: config.NewExporterSettings(config.NewComponentID(typeStr)), + ExporterSettings: config.NewExporterSettings(component.NewID(typeStr)), Namespace: "", ExternalLabels: map[string]string{}, TimeoutSettings: exporterhelper.NewDefaultTimeoutSettings(), diff --git a/exporter/prometheusremotewriteexporter/factory_test.go b/exporter/prometheusremotewriteexporter/factory_test.go index 649bb67689fa..36dfb2845e52 100644 --- a/exporter/prometheusremotewriteexporter/factory_test.go +++ b/exporter/prometheusremotewriteexporter/factory_test.go @@ -21,9 +21,7 @@ import ( "github.com/stretchr/testify/assert" "go.opentelemetry.io/collector/component" "go.opentelemetry.io/collector/component/componenttest" - "go.opentelemetry.io/collector/config" "go.opentelemetry.io/collector/config/confighttp" - "go.opentelemetry.io/collector/config/configtest" "go.opentelemetry.io/collector/config/configtls" ) @@ -31,7 +29,7 @@ import ( func Test_createDefaultConfig(t *testing.T) { cfg := createDefaultConfig() assert.NotNil(t, cfg, "failed to create default config") - assert.NoError(t, configtest.CheckConfigStruct(cfg)) + assert.NoError(t, componenttest.CheckConfigStruct(cfg)) } // Tests whether or not a correct Metrics Exporter from the default Config parameters @@ -51,7 +49,7 @@ func Test_createMetricsExporter(t *testing.T) { } tests := []struct { name string - cfg config.Exporter + cfg component.ExporterConfig set component.ExporterCreateSettings returnErrorOnCreate bool returnErrorOnStart bool diff --git a/exporter/prometheusremotewriteexporter/go.mod b/exporter/prometheusremotewriteexporter/go.mod index c043bbae1949..88fc5c72bf16 100644 --- a/exporter/prometheusremotewriteexporter/go.mod +++ b/exporter/prometheusremotewriteexporter/go.mod @@ -13,8 +13,8 @@ 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.63.2-0.20221104003159-6b27644724d8 - go.opentelemetry.io/collector/pdata v0.63.2-0.20221104003159-6b27644724d8 + go.opentelemetry.io/collector v0.63.2-0.20221108014805-0b08d5316426 + go.opentelemetry.io/collector/pdata v0.63.2-0.20221108014805-0b08d5316426 go.uber.org/atomic v1.10.0 go.uber.org/multierr v1.8.0 go.uber.org/zap v1.23.0 @@ -43,8 +43,8 @@ require ( github.com/tidwall/match v1.1.1 // indirect github.com/tidwall/pretty v1.2.0 // indirect github.com/tidwall/tinylru v1.1.0 // indirect - go.opencensus.io v0.23.0 // indirect - go.opentelemetry.io/collector/semconv v0.63.2-0.20221104003159-6b27644724d8 // indirect + go.opencensus.io v0.24.0 // indirect + go.opentelemetry.io/collector/semconv v0.63.2-0.20221108014805-0b08d5316426 // 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 ccdeb98150ce..1503850ab8f5 100644 --- a/exporter/prometheusremotewriteexporter/go.sum +++ b/exporter/prometheusremotewriteexporter/go.sum @@ -305,7 +305,7 @@ github.com/prometheus/client_golang v1.7.1/go.mod h1:PY5Wy2awLA44sXw4AOSfFBetzPP github.com/prometheus/client_golang v1.11.0/go.mod h1:Z6t4BnS23TR94PD6BsDNk8yVqroYurpAkEiz0P2BEV0= github.com/prometheus/client_golang v1.11.1/go.mod h1:Z6t4BnS23TR94PD6BsDNk8yVqroYurpAkEiz0P2BEV0= github.com/prometheus/client_golang v1.12.1/go.mod h1:3Z9XVyYiZYEO+YQWt3RD2R3jrbd179Rt297l4aS6nDY= -github.com/prometheus/client_golang v1.13.0 h1:b71QUfeo5M8gq2+evJdTPfZhYMAU0uKPkyPJ7TPsloU= +github.com/prometheus/client_golang v1.13.1 h1:3gMjIY2+/hzmqhtUC/aQNYldJA6DtH3CgQvwS+02K1c= github.com/prometheus/client_model v0.0.0-20180712105110-5c3871d89910/go.mod h1:MbSGuTsp3dbXC40dX6PRTWyKYBIrTGTE9sqQNg2J8bo= github.com/prometheus/client_model v0.0.0-20190129233127-fd36f4220a90/go.mod h1:xMI15A0UPsDsEKsMN9yxemIoYk6Tm2C1GtYGdfGttqA= github.com/prometheus/client_model v0.0.0-20190812154241-14fe0d1b01d4/go.mod h1:xMI15A0UPsDsEKsMN9yxemIoYk6Tm2C1GtYGdfGttqA= @@ -350,7 +350,6 @@ github.com/stretchr/testify v1.2.2/go.mod h1:a8OnRcib4nhh0OaRAV+Yts87kKdq0PP7pXf github.com/stretchr/testify v1.3.0/go.mod h1:M5WIy9Dh21IEIfnGCwXGc5bZfKNJtfHm1UVUgZn+9EI= github.com/stretchr/testify v1.4.0/go.mod h1:j7eGeouHqKxXV5pUuKE4zz7dFj8WfuZ+81PSLYec5m4= github.com/stretchr/testify v1.5.1/go.mod h1:5W2xD1RspED5o8YsWQXVCued0rvSQ+mT+I5cxcmMvtA= -github.com/stretchr/testify v1.6.1/go.mod h1:6Fq8oRcR53rry900zMqJjRRixrwX3KX962/h/Wwjteg= github.com/stretchr/testify v1.7.0/go.mod h1:6Fq8oRcR53rry900zMqJjRRixrwX3KX962/h/Wwjteg= github.com/stretchr/testify v1.7.1/go.mod h1:6Fq8oRcR53rry900zMqJjRRixrwX3KX962/h/Wwjteg= github.com/stretchr/testify v1.8.0/go.mod h1:yNjHg4UonilssWZ8iaSj1OCr/vHnekPRkoO+kdMU+MU= @@ -379,14 +378,14 @@ 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.opencensus.io v0.23.0 h1:gqCw0LfLxScz8irSi8exQc7fyQ0fKQU/qnC/X8+V/1M= -go.opencensus.io v0.23.0/go.mod h1:XItmlyltB5F7CS4xOC1DcqMoFqwtC6OG2xF7mCv7P7E= -go.opentelemetry.io/collector v0.63.2-0.20221104003159-6b27644724d8 h1:rOT5HzXXfSISc6FiH012zH2/EFjp37UXfjEqj5BpkWQ= -go.opentelemetry.io/collector v0.63.2-0.20221104003159-6b27644724d8/go.mod h1:JVmeZXugK4ondC6KQgrHTHWiF4JttpG5k6dWPMt62+k= -go.opentelemetry.io/collector/pdata v0.63.2-0.20221104003159-6b27644724d8 h1:7xeTQjfsOm9eogQeIxjSEhlik9qsbBGsnmkQHfyKaRE= -go.opentelemetry.io/collector/pdata v0.63.2-0.20221104003159-6b27644724d8/go.mod h1:IzvXUGQml2mrnvdb8zIlEW3qQs9oFLdD2hLwJdZ+pek= -go.opentelemetry.io/collector/semconv v0.63.2-0.20221104003159-6b27644724d8 h1:jm0sNPyqo6S165QjQYMBHB2nK50wlJbMYM03Yr3Eo2k= -go.opentelemetry.io/collector/semconv v0.63.2-0.20221104003159-6b27644724d8/go.mod h1:5o9yhOa+ABt7g2E5JABDxGZ1PQPbtfxrKNbYn+LOTXU= +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.63.2-0.20221108014805-0b08d5316426 h1:z/wLTMh7/vNxcFUDa5uG7/IPE3tYx6pzCWPV41ghyV8= +go.opentelemetry.io/collector v0.63.2-0.20221108014805-0b08d5316426/go.mod h1:+Zb70q0Rq17dA9FcHTiTjW6g96lvJ8kAZ0c+eWNkAv0= +go.opentelemetry.io/collector/pdata v0.63.2-0.20221108014805-0b08d5316426 h1:wKDpgP0Tx/gWI2SgDGAY1OTSeihhDivbbRqFR79IGTc= +go.opentelemetry.io/collector/pdata v0.63.2-0.20221108014805-0b08d5316426/go.mod h1:IzvXUGQml2mrnvdb8zIlEW3qQs9oFLdD2hLwJdZ+pek= +go.opentelemetry.io/collector/semconv v0.63.2-0.20221108014805-0b08d5316426 h1:pqIl7OC531J6i9ttBCj3zLmZI/BSF4q323YpK0GgKGk= +go.opentelemetry.io/collector/semconv v0.63.2-0.20221108014805-0b08d5316426/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.go b/exporter/pulsarexporter/config.go index 16617291d53c..9be494c42323 100644 --- a/exporter/pulsarexporter/config.go +++ b/exporter/pulsarexporter/config.go @@ -16,6 +16,7 @@ package pulsarexporter // import "github.com/open-telemetry/opentelemetry-collec import ( "github.com/apache/pulsar-client-go/pulsar" + "go.opentelemetry.io/collector/component" "go.opentelemetry.io/collector/config" "go.opentelemetry.io/collector/exporter/exporterhelper" ) @@ -73,7 +74,7 @@ type OAuth2 struct { Audience string `mapstructure:"audience"` } -var _ config.Exporter = (*Config)(nil) +var _ component.ExporterConfig = (*Config)(nil) // Validate checks if the exporter configuration is valid func (cfg *Config) Validate() error { diff --git a/exporter/pulsarexporter/config_test.go b/exporter/pulsarexporter/config_test.go index 4882cc5b5bf0..09312a144745 100644 --- a/exporter/pulsarexporter/config_test.go +++ b/exporter/pulsarexporter/config_test.go @@ -22,6 +22,7 @@ import ( "github.com/apache/pulsar-client-go/pulsar" "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" + "go.opentelemetry.io/collector/component" "go.opentelemetry.io/collector/config" "go.opentelemetry.io/collector/confmap/confmaptest" "go.opentelemetry.io/collector/exporter/exporterhelper" @@ -34,13 +35,13 @@ func TestLoadConfig(t *testing.T) { require.NoError(t, err) tests := []struct { - id config.ComponentID - expected config.Exporter + id component.ID + expected component.ExporterConfig }{ { - id: config.NewComponentIDWithName(typeStr, ""), + id: component.NewIDWithName(typeStr, ""), expected: &Config{ - ExporterSettings: config.NewExporterSettings(config.NewComponentID(typeStr)), + ExporterSettings: config.NewExporterSettings(component.NewID(typeStr)), TimeoutSettings: exporterhelper.TimeoutSettings{ Timeout: 20 * time.Second, }, @@ -71,7 +72,7 @@ func TestLoadConfig(t *testing.T) { sub, err := cm.Sub(tt.id.String()) require.NoError(t, err) - require.NoError(t, config.UnmarshalExporter(sub, cfg)) + require.NoError(t, component.UnmarshalExporterConfig(sub, cfg)) assert.NoError(t, cfg.Validate()) assert.Equal(t, tt.expected, cfg) @@ -85,9 +86,9 @@ func TestClientOptions(t *testing.T) { factory := NewFactory() cfg := factory.CreateDefaultConfig() - sub, err := cm.Sub(config.NewComponentIDWithName(typeStr, "").String()) + sub, err := cm.Sub(component.NewIDWithName(typeStr, "").String()) require.NoError(t, err) - require.NoError(t, config.UnmarshalExporter(sub, cfg)) + require.NoError(t, component.UnmarshalExporterConfig(sub, cfg)) options := cfg.(*Config).clientOptions() diff --git a/exporter/pulsarexporter/factory.go b/exporter/pulsarexporter/factory.go index 2baf4b3afc37..53be99e5f8e0 100644 --- a/exporter/pulsarexporter/factory.go +++ b/exporter/pulsarexporter/factory.go @@ -66,9 +66,9 @@ func NewFactory(options ...FactoryOption) component.ExporterFactory { ) } -func createDefaultConfig() config.Exporter { +func createDefaultConfig() component.ExporterConfig { return &Config{ - ExporterSettings: config.NewExporterSettings(config.NewComponentID(typeStr)), + ExporterSettings: config.NewExporterSettings(component.NewID(typeStr)), TimeoutSettings: exporterhelper.NewDefaultTimeoutSettings(), RetrySettings: exporterhelper.NewDefaultRetrySettings(), QueueSettings: exporterhelper.NewDefaultQueueSettings(), @@ -89,7 +89,7 @@ type pulsarExporterFactory struct { func (f *pulsarExporterFactory) createTracesExporter( ctx context.Context, set component.ExporterCreateSettings, - cfg config.Exporter, + cfg component.ExporterConfig, ) (component.TracesExporter, error) { oCfg := *(cfg.(*Config)) if oCfg.Topic == "" { @@ -119,7 +119,7 @@ func (f *pulsarExporterFactory) createTracesExporter( func (f *pulsarExporterFactory) createMetricsExporter( ctx context.Context, set component.ExporterCreateSettings, - cfg config.Exporter, + cfg component.ExporterConfig, ) (component.MetricsExporter, error) { oCfg := *(cfg.(*Config)) if oCfg.Topic == "" { @@ -149,7 +149,7 @@ func (f *pulsarExporterFactory) createMetricsExporter( func (f *pulsarExporterFactory) createLogsExporter( ctx context.Context, set component.ExporterCreateSettings, - cfg config.Exporter, + cfg component.ExporterConfig, ) (component.LogsExporter, error) { oCfg := *(cfg.(*Config)) if oCfg.Topic == "" { diff --git a/exporter/pulsarexporter/factory_test.go b/exporter/pulsarexporter/factory_test.go index 489932f20907..8437a9e54651 100644 --- a/exporter/pulsarexporter/factory_test.go +++ b/exporter/pulsarexporter/factory_test.go @@ -20,6 +20,7 @@ import ( "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" + "go.opentelemetry.io/collector/component" "go.opentelemetry.io/collector/component/componenttest" "go.opentelemetry.io/collector/config" "go.opentelemetry.io/collector/exporter/exporterhelper" @@ -28,7 +29,7 @@ import ( func Test_createDefaultConfig(t *testing.T) { cfg := createDefaultConfig() assert.Equal(t, cfg, &Config{ - ExporterSettings: config.NewExporterSettings(config.NewComponentID(typeStr)), + ExporterSettings: config.NewExporterSettings(component.NewID(typeStr)), TimeoutSettings: exporterhelper.NewDefaultTimeoutSettings(), RetrySettings: exporterhelper.NewDefaultRetrySettings(), QueueSettings: exporterhelper.NewDefaultQueueSettings(), diff --git a/exporter/pulsarexporter/go.mod b/exporter/pulsarexporter/go.mod index 25ca2e37b8f0..1a8ae69b2787 100644 --- a/exporter/pulsarexporter/go.mod +++ b/exporter/pulsarexporter/go.mod @@ -9,9 +9,9 @@ require ( github.com/open-telemetry/opentelemetry-collector-contrib/internal/coreinternal v0.63.0 github.com/open-telemetry/opentelemetry-collector-contrib/pkg/translator/jaeger v0.63.0 github.com/stretchr/testify v1.8.1 - go.opentelemetry.io/collector v0.63.2-0.20221104003159-6b27644724d8 - go.opentelemetry.io/collector/pdata v0.63.2-0.20221104003159-6b27644724d8 - go.opentelemetry.io/collector/semconv v0.63.2-0.20221104003159-6b27644724d8 + go.opentelemetry.io/collector v0.63.2-0.20221108014805-0b08d5316426 + go.opentelemetry.io/collector/pdata v0.63.2-0.20221108014805-0b08d5316426 + go.opentelemetry.io/collector/semconv v0.63.2-0.20221108014805-0b08d5316426 go.uber.org/multierr v1.8.0 go.uber.org/zap v1.23.0 ) @@ -53,7 +53,7 @@ require ( github.com/pierrec/lz4 v2.6.1+incompatible // indirect github.com/pkg/errors v0.9.1 // indirect github.com/pmezard/go-difflib v1.0.0 // indirect - github.com/prometheus/client_golang v1.13.0 // indirect + github.com/prometheus/client_golang v1.13.1 // indirect github.com/prometheus/client_model v0.3.0 // indirect github.com/prometheus/common v0.37.0 // indirect github.com/prometheus/procfs v0.8.0 // indirect @@ -61,7 +61,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.opencensus.io v0.23.0 // indirect + go.opencensus.io v0.24.0 // 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 2fb2d83a45de..1650dfd9e37d 100644 --- a/exporter/pulsarexporter/go.sum +++ b/exporter/pulsarexporter/go.sum @@ -406,8 +406,8 @@ github.com/prometheus/client_golang v1.7.1/go.mod h1:PY5Wy2awLA44sXw4AOSfFBetzPP github.com/prometheus/client_golang v1.11.0/go.mod h1:Z6t4BnS23TR94PD6BsDNk8yVqroYurpAkEiz0P2BEV0= github.com/prometheus/client_golang v1.11.1/go.mod h1:Z6t4BnS23TR94PD6BsDNk8yVqroYurpAkEiz0P2BEV0= github.com/prometheus/client_golang v1.12.1/go.mod h1:3Z9XVyYiZYEO+YQWt3RD2R3jrbd179Rt297l4aS6nDY= -github.com/prometheus/client_golang v1.13.0 h1:b71QUfeo5M8gq2+evJdTPfZhYMAU0uKPkyPJ7TPsloU= -github.com/prometheus/client_golang v1.13.0/go.mod h1:vTeo+zgvILHsnnj/39Ou/1fPN5nJFOEMgftOUOmlvYQ= +github.com/prometheus/client_golang v1.13.1 h1:3gMjIY2+/hzmqhtUC/aQNYldJA6DtH3CgQvwS+02K1c= +github.com/prometheus/client_golang v1.13.1/go.mod h1:vTeo+zgvILHsnnj/39Ou/1fPN5nJFOEMgftOUOmlvYQ= github.com/prometheus/client_model v0.0.0-20180712105110-5c3871d89910/go.mod h1:MbSGuTsp3dbXC40dX6PRTWyKYBIrTGTE9sqQNg2J8bo= github.com/prometheus/client_model v0.0.0-20190129233127-fd36f4220a90/go.mod h1:xMI15A0UPsDsEKsMN9yxemIoYk6Tm2C1GtYGdfGttqA= github.com/prometheus/client_model v0.0.0-20190812154241-14fe0d1b01d4/go.mod h1:xMI15A0UPsDsEKsMN9yxemIoYk6Tm2C1GtYGdfGttqA= @@ -493,14 +493,15 @@ 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.opencensus.io v0.22.5/go.mod h1:5pWMHQbX5EPX2/62yrJeAkowc+lfs/XD7Uxpq3pI6kk= -go.opencensus.io v0.23.0 h1:gqCw0LfLxScz8irSi8exQc7fyQ0fKQU/qnC/X8+V/1M= go.opencensus.io v0.23.0/go.mod h1:XItmlyltB5F7CS4xOC1DcqMoFqwtC6OG2xF7mCv7P7E= -go.opentelemetry.io/collector v0.63.2-0.20221104003159-6b27644724d8 h1:rOT5HzXXfSISc6FiH012zH2/EFjp37UXfjEqj5BpkWQ= -go.opentelemetry.io/collector v0.63.2-0.20221104003159-6b27644724d8/go.mod h1:JVmeZXugK4ondC6KQgrHTHWiF4JttpG5k6dWPMt62+k= -go.opentelemetry.io/collector/pdata v0.63.2-0.20221104003159-6b27644724d8 h1:7xeTQjfsOm9eogQeIxjSEhlik9qsbBGsnmkQHfyKaRE= -go.opentelemetry.io/collector/pdata v0.63.2-0.20221104003159-6b27644724d8/go.mod h1:IzvXUGQml2mrnvdb8zIlEW3qQs9oFLdD2hLwJdZ+pek= -go.opentelemetry.io/collector/semconv v0.63.2-0.20221104003159-6b27644724d8 h1:jm0sNPyqo6S165QjQYMBHB2nK50wlJbMYM03Yr3Eo2k= -go.opentelemetry.io/collector/semconv v0.63.2-0.20221104003159-6b27644724d8/go.mod h1:5o9yhOa+ABt7g2E5JABDxGZ1PQPbtfxrKNbYn+LOTXU= +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.63.2-0.20221108014805-0b08d5316426 h1:z/wLTMh7/vNxcFUDa5uG7/IPE3tYx6pzCWPV41ghyV8= +go.opentelemetry.io/collector v0.63.2-0.20221108014805-0b08d5316426/go.mod h1:+Zb70q0Rq17dA9FcHTiTjW6g96lvJ8kAZ0c+eWNkAv0= +go.opentelemetry.io/collector/pdata v0.63.2-0.20221108014805-0b08d5316426 h1:wKDpgP0Tx/gWI2SgDGAY1OTSeihhDivbbRqFR79IGTc= +go.opentelemetry.io/collector/pdata v0.63.2-0.20221108014805-0b08d5316426/go.mod h1:IzvXUGQml2mrnvdb8zIlEW3qQs9oFLdD2hLwJdZ+pek= +go.opentelemetry.io/collector/semconv v0.63.2-0.20221108014805-0b08d5316426 h1:pqIl7OC531J6i9ttBCj3zLmZI/BSF4q323YpK0GgKGk= +go.opentelemetry.io/collector/semconv v0.63.2-0.20221108014805-0b08d5316426/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 e4d9e7ff2fbd..c008a127fbd6 100644 --- a/exporter/sapmexporter/config_test.go +++ b/exporter/sapmexporter/config_test.go @@ -21,6 +21,7 @@ import ( "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" + "go.opentelemetry.io/collector/component" "go.opentelemetry.io/collector/config" "go.opentelemetry.io/collector/confmap/confmaptest" "go.opentelemetry.io/collector/exporter/exporterhelper" @@ -35,17 +36,17 @@ func TestLoadConfig(t *testing.T) { require.NoError(t, err) tests := []struct { - id config.ComponentID - expected config.Exporter + id component.ID + expected component.ExporterConfig }{ { - id: config.NewComponentIDWithName(typeStr, ""), + id: component.NewIDWithName(typeStr, ""), expected: createDefaultConfig(), }, { - id: config.NewComponentIDWithName(typeStr, "customname"), + id: component.NewIDWithName(typeStr, "customname"), expected: &Config{ - ExporterSettings: config.NewExporterSettings(config.NewComponentID(typeStr)), + ExporterSettings: config.NewExporterSettings(component.NewID(typeStr)), Endpoint: "test-endpoint", AccessToken: "abcd1234", NumWorkers: 3, @@ -79,7 +80,7 @@ func TestLoadConfig(t *testing.T) { sub, err := cm.Sub(tt.id.String()) require.NoError(t, err) - require.NoError(t, config.UnmarshalExporter(sub, cfg)) + require.NoError(t, component.UnmarshalExporterConfig(sub, cfg)) assert.NoError(t, cfg.Validate()) assert.Equal(t, tt.expected, cfg) diff --git a/exporter/sapmexporter/exporter_test.go b/exporter/sapmexporter/exporter_test.go index f18a67480a9f..34792b8369fc 100644 --- a/exporter/sapmexporter/exporter_test.go +++ b/exporter/sapmexporter/exporter_test.go @@ -26,6 +26,7 @@ import ( "github.com/jaegertracing/jaeger/model" "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" + "go.opentelemetry.io/collector/component" "go.opentelemetry.io/collector/component/componenttest" "go.opentelemetry.io/collector/config" "go.opentelemetry.io/collector/pdata/ptrace" @@ -36,7 +37,7 @@ import ( func TestCreateTracesExporter(t *testing.T) { cfg := &Config{ - ExporterSettings: config.NewExporterSettings(config.NewComponentIDWithName(typeStr, "customname")), + ExporterSettings: config.NewExporterSettings(component.NewIDWithName(typeStr, "customname")), Endpoint: "test-endpoint", AccessToken: "abcd1234", NumWorkers: 3, diff --git a/exporter/sapmexporter/factory.go b/exporter/sapmexporter/factory.go index 7d0854de4d47..fdb3319d4e83 100644 --- a/exporter/sapmexporter/factory.go +++ b/exporter/sapmexporter/factory.go @@ -39,9 +39,9 @@ func NewFactory() component.ExporterFactory { component.WithTracesExporter(createTracesExporter, stability)) } -func createDefaultConfig() config.Exporter { +func createDefaultConfig() component.ExporterConfig { return &Config{ - ExporterSettings: config.NewExporterSettings(config.NewComponentID(typeStr)), + ExporterSettings: config.NewExporterSettings(component.NewID(typeStr)), NumWorkers: defaultNumWorkers, AccessTokenPassthroughConfig: splunk.AccessTokenPassthroughConfig{ AccessTokenPassthrough: true, @@ -55,7 +55,7 @@ func createDefaultConfig() config.Exporter { func createTracesExporter( _ context.Context, params component.ExporterCreateSettings, - cfg config.Exporter, + cfg component.ExporterConfig, ) (component.TracesExporter, error) { eCfg := cfg.(*Config) return newSAPMTracesExporter(eCfg, params) diff --git a/exporter/sapmexporter/factory_test.go b/exporter/sapmexporter/factory_test.go index 0f4af486de2f..cb67c8f63fe4 100644 --- a/exporter/sapmexporter/factory_test.go +++ b/exporter/sapmexporter/factory_test.go @@ -20,14 +20,13 @@ import ( "github.com/stretchr/testify/assert" "go.opentelemetry.io/collector/component/componenttest" - "go.opentelemetry.io/collector/config/configtest" ) func TestCreateDefaultConfig(t *testing.T) { factory := NewFactory() cfg := factory.CreateDefaultConfig() assert.NotNil(t, cfg, "failed to create default config") - assert.NoError(t, configtest.CheckConfigStruct(cfg)) + assert.NoError(t, componenttest.CheckConfigStruct(cfg)) } func TestCreateExporter(t *testing.T) { diff --git a/exporter/sapmexporter/go.mod b/exporter/sapmexporter/go.mod index b2f9d9130b1d..b55e4a65e6d8 100644 --- a/exporter/sapmexporter/go.mod +++ b/exporter/sapmexporter/go.mod @@ -9,8 +9,8 @@ require ( github.com/open-telemetry/opentelemetry-collector-contrib/pkg/translator/jaeger v0.63.0 github.com/signalfx/sapm-proto v0.12.0 github.com/stretchr/testify v1.8.1 - go.opentelemetry.io/collector v0.63.2-0.20221104003159-6b27644724d8 - go.opentelemetry.io/collector/pdata v0.63.2-0.20221104003159-6b27644724d8 + go.opentelemetry.io/collector v0.63.2-0.20221108014805-0b08d5316426 + go.opentelemetry.io/collector/pdata v0.63.2-0.20221108014805-0b08d5316426 go.uber.org/zap v1.23.0 ) @@ -35,8 +35,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.opencensus.io v0.23.0 // indirect - go.opentelemetry.io/collector/semconv v0.63.2-0.20221104003159-6b27644724d8 // indirect + go.opencensus.io v0.24.0 // indirect + go.opentelemetry.io/collector/semconv v0.63.2-0.20221108014805-0b08d5316426 // 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 8bb5460a2124..7cc01f727f37 100644 --- a/exporter/sapmexporter/go.sum +++ b/exporter/sapmexporter/go.sum @@ -236,7 +236,7 @@ github.com/prometheus/client_golang v0.9.1/go.mod h1:7SWBe2y4D6OKWSNQJUaRYU/AaXP github.com/prometheus/client_golang v1.0.0/go.mod h1:db9x61etRT2tGnBNRi70OPL5FsnadC4Ky3P0J6CfImo= github.com/prometheus/client_golang v1.7.1/go.mod h1:PY5Wy2awLA44sXw4AOSfFBetzPP4j5+D6mVACh+pe2M= github.com/prometheus/client_golang v1.11.1/go.mod h1:Z6t4BnS23TR94PD6BsDNk8yVqroYurpAkEiz0P2BEV0= -github.com/prometheus/client_golang v1.13.0 h1:b71QUfeo5M8gq2+evJdTPfZhYMAU0uKPkyPJ7TPsloU= +github.com/prometheus/client_golang v1.13.1 h1:3gMjIY2+/hzmqhtUC/aQNYldJA6DtH3CgQvwS+02K1c= github.com/prometheus/client_model v0.0.0-20180712105110-5c3871d89910/go.mod h1:MbSGuTsp3dbXC40dX6PRTWyKYBIrTGTE9sqQNg2J8bo= github.com/prometheus/client_model v0.0.0-20190129233127-fd36f4220a90/go.mod h1:xMI15A0UPsDsEKsMN9yxemIoYk6Tm2C1GtYGdfGttqA= github.com/prometheus/client_model v0.0.0-20190812154241-14fe0d1b01d4/go.mod h1:xMI15A0UPsDsEKsMN9yxemIoYk6Tm2C1GtYGdfGttqA= @@ -275,7 +275,6 @@ github.com/stretchr/testify v1.2.2/go.mod h1:a8OnRcib4nhh0OaRAV+Yts87kKdq0PP7pXf github.com/stretchr/testify v1.3.0/go.mod h1:M5WIy9Dh21IEIfnGCwXGc5bZfKNJtfHm1UVUgZn+9EI= github.com/stretchr/testify v1.4.0/go.mod h1:j7eGeouHqKxXV5pUuKE4zz7dFj8WfuZ+81PSLYec5m4= github.com/stretchr/testify v1.5.1/go.mod h1:5W2xD1RspED5o8YsWQXVCued0rvSQ+mT+I5cxcmMvtA= -github.com/stretchr/testify v1.6.1/go.mod h1:6Fq8oRcR53rry900zMqJjRRixrwX3KX962/h/Wwjteg= github.com/stretchr/testify v1.7.0/go.mod h1:6Fq8oRcR53rry900zMqJjRRixrwX3KX962/h/Wwjteg= github.com/stretchr/testify v1.7.1/go.mod h1:6Fq8oRcR53rry900zMqJjRRixrwX3KX962/h/Wwjteg= github.com/stretchr/testify v1.8.0/go.mod h1:yNjHg4UonilssWZ8iaSj1OCr/vHnekPRkoO+kdMU+MU= @@ -291,14 +290,14 @@ 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.opencensus.io v0.23.0 h1:gqCw0LfLxScz8irSi8exQc7fyQ0fKQU/qnC/X8+V/1M= -go.opencensus.io v0.23.0/go.mod h1:XItmlyltB5F7CS4xOC1DcqMoFqwtC6OG2xF7mCv7P7E= -go.opentelemetry.io/collector v0.63.2-0.20221104003159-6b27644724d8 h1:rOT5HzXXfSISc6FiH012zH2/EFjp37UXfjEqj5BpkWQ= -go.opentelemetry.io/collector v0.63.2-0.20221104003159-6b27644724d8/go.mod h1:JVmeZXugK4ondC6KQgrHTHWiF4JttpG5k6dWPMt62+k= -go.opentelemetry.io/collector/pdata v0.63.2-0.20221104003159-6b27644724d8 h1:7xeTQjfsOm9eogQeIxjSEhlik9qsbBGsnmkQHfyKaRE= -go.opentelemetry.io/collector/pdata v0.63.2-0.20221104003159-6b27644724d8/go.mod h1:IzvXUGQml2mrnvdb8zIlEW3qQs9oFLdD2hLwJdZ+pek= -go.opentelemetry.io/collector/semconv v0.63.2-0.20221104003159-6b27644724d8 h1:jm0sNPyqo6S165QjQYMBHB2nK50wlJbMYM03Yr3Eo2k= -go.opentelemetry.io/collector/semconv v0.63.2-0.20221104003159-6b27644724d8/go.mod h1:5o9yhOa+ABt7g2E5JABDxGZ1PQPbtfxrKNbYn+LOTXU= +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.63.2-0.20221108014805-0b08d5316426 h1:z/wLTMh7/vNxcFUDa5uG7/IPE3tYx6pzCWPV41ghyV8= +go.opentelemetry.io/collector v0.63.2-0.20221108014805-0b08d5316426/go.mod h1:+Zb70q0Rq17dA9FcHTiTjW6g96lvJ8kAZ0c+eWNkAv0= +go.opentelemetry.io/collector/pdata v0.63.2-0.20221108014805-0b08d5316426 h1:wKDpgP0Tx/gWI2SgDGAY1OTSeihhDivbbRqFR79IGTc= +go.opentelemetry.io/collector/pdata v0.63.2-0.20221108014805-0b08d5316426/go.mod h1:IzvXUGQml2mrnvdb8zIlEW3qQs9oFLdD2hLwJdZ+pek= +go.opentelemetry.io/collector/semconv v0.63.2-0.20221108014805-0b08d5316426 h1:pqIl7OC531J6i9ttBCj3zLmZI/BSF4q323YpK0GgKGk= +go.opentelemetry.io/collector/semconv v0.63.2-0.20221108014805-0b08d5316426/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 679193d6c3ef..640c357ac1b2 100644 --- a/exporter/sentryexporter/config_test.go +++ b/exporter/sentryexporter/config_test.go @@ -20,6 +20,7 @@ import ( "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" + "go.opentelemetry.io/collector/component" "go.opentelemetry.io/collector/config" "go.opentelemetry.io/collector/confmap/confmaptest" ) @@ -31,17 +32,17 @@ func TestLoadConfig(t *testing.T) { require.NoError(t, err) tests := []struct { - id config.ComponentID - expected config.Exporter + id component.ID + expected component.ExporterConfig }{ { - id: config.NewComponentIDWithName(typeStr, ""), + id: component.NewIDWithName(typeStr, ""), expected: createDefaultConfig(), }, { - id: config.NewComponentIDWithName(typeStr, "2"), + id: component.NewIDWithName(typeStr, "2"), expected: &Config{ - ExporterSettings: config.NewExporterSettings(config.NewComponentID(typeStr)), + ExporterSettings: config.NewExporterSettings(component.NewID(typeStr)), DSN: "https://key@host/path/42", }, }, @@ -54,7 +55,7 @@ func TestLoadConfig(t *testing.T) { sub, err := cm.Sub(tt.id.String()) require.NoError(t, err) - require.NoError(t, config.UnmarshalExporter(sub, cfg)) + require.NoError(t, component.UnmarshalExporterConfig(sub, cfg)) assert.NoError(t, cfg.Validate()) assert.Equal(t, tt.expected, cfg) diff --git a/exporter/sentryexporter/factory.go b/exporter/sentryexporter/factory.go index 82c7bd8b74c7..24212f0a465f 100644 --- a/exporter/sentryexporter/factory.go +++ b/exporter/sentryexporter/factory.go @@ -37,16 +37,16 @@ func NewFactory() component.ExporterFactory { ) } -func createDefaultConfig() config.Exporter { +func createDefaultConfig() component.ExporterConfig { return &Config{ - ExporterSettings: config.NewExporterSettings(config.NewComponentID(typeStr)), + ExporterSettings: config.NewExporterSettings(component.NewID(typeStr)), } } func createTracesExporter( _ context.Context, params component.ExporterCreateSettings, - config config.Exporter, + config component.ExporterConfig, ) (component.TracesExporter, error) { sentryConfig, ok := config.(*Config) if !ok { diff --git a/exporter/sentryexporter/factory_test.go b/exporter/sentryexporter/factory_test.go index 525bb963199f..c5bff786ff8b 100644 --- a/exporter/sentryexporter/factory_test.go +++ b/exporter/sentryexporter/factory_test.go @@ -20,14 +20,13 @@ import ( "github.com/stretchr/testify/assert" "go.opentelemetry.io/collector/component/componenttest" - "go.opentelemetry.io/collector/config/configtest" ) func TestCreateDefaultConfig(t *testing.T) { factory := NewFactory() cfg := factory.CreateDefaultConfig() assert.NotNil(t, cfg, "failed to create default config") - assert.NoError(t, configtest.CheckConfigStruct(cfg)) + assert.NoError(t, componenttest.CheckConfigStruct(cfg)) } func TestCreateExporter(t *testing.T) { diff --git a/exporter/sentryexporter/go.mod b/exporter/sentryexporter/go.mod index b43c6c4028ce..92a9195f7c66 100644 --- a/exporter/sentryexporter/go.mod +++ b/exporter/sentryexporter/go.mod @@ -5,11 +5,11 @@ go 1.18 require ( github.com/getsentry/sentry-go v0.14.0 github.com/google/go-cmp v0.5.9 - github.com/open-telemetry/opentelemetry-collector-contrib/internal/coreinternal v0.0.0-00010101000000-000000000000 + github.com/open-telemetry/opentelemetry-collector-contrib/internal/coreinternal v0.63.0 github.com/stretchr/testify v1.8.1 - go.opentelemetry.io/collector v0.63.2-0.20221104003159-6b27644724d8 - go.opentelemetry.io/collector/pdata v0.63.2-0.20221104003159-6b27644724d8 - go.opentelemetry.io/collector/semconv v0.63.2-0.20221104003159-6b27644724d8 + go.opentelemetry.io/collector v0.63.2-0.20221108014805-0b08d5316426 + go.opentelemetry.io/collector/pdata v0.63.2-0.20221108014805-0b08d5316426 + go.opentelemetry.io/collector/semconv v0.63.2-0.20221108014805-0b08d5316426 ) require ( @@ -26,7 +26,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.opencensus.io v0.23.0 // indirect + go.opencensus.io v0.24.0 // 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 6e418676dece..a6774d3a46fa 100644 --- a/exporter/sentryexporter/go.sum +++ b/exporter/sentryexporter/go.sum @@ -231,7 +231,7 @@ github.com/prometheus/client_golang v0.9.1/go.mod h1:7SWBe2y4D6OKWSNQJUaRYU/AaXP github.com/prometheus/client_golang v1.0.0/go.mod h1:db9x61etRT2tGnBNRi70OPL5FsnadC4Ky3P0J6CfImo= github.com/prometheus/client_golang v1.7.1/go.mod h1:PY5Wy2awLA44sXw4AOSfFBetzPP4j5+D6mVACh+pe2M= github.com/prometheus/client_golang v1.11.1/go.mod h1:Z6t4BnS23TR94PD6BsDNk8yVqroYurpAkEiz0P2BEV0= -github.com/prometheus/client_golang v1.13.0 h1:b71QUfeo5M8gq2+evJdTPfZhYMAU0uKPkyPJ7TPsloU= +github.com/prometheus/client_golang v1.13.1 h1:3gMjIY2+/hzmqhtUC/aQNYldJA6DtH3CgQvwS+02K1c= github.com/prometheus/client_model v0.0.0-20180712105110-5c3871d89910/go.mod h1:MbSGuTsp3dbXC40dX6PRTWyKYBIrTGTE9sqQNg2J8bo= github.com/prometheus/client_model v0.0.0-20190129233127-fd36f4220a90/go.mod h1:xMI15A0UPsDsEKsMN9yxemIoYk6Tm2C1GtYGdfGttqA= github.com/prometheus/client_model v0.0.0-20190812154241-14fe0d1b01d4/go.mod h1:xMI15A0UPsDsEKsMN9yxemIoYk6Tm2C1GtYGdfGttqA= @@ -268,7 +268,6 @@ github.com/stretchr/testify v1.2.2/go.mod h1:a8OnRcib4nhh0OaRAV+Yts87kKdq0PP7pXf github.com/stretchr/testify v1.3.0/go.mod h1:M5WIy9Dh21IEIfnGCwXGc5bZfKNJtfHm1UVUgZn+9EI= github.com/stretchr/testify v1.4.0/go.mod h1:j7eGeouHqKxXV5pUuKE4zz7dFj8WfuZ+81PSLYec5m4= github.com/stretchr/testify v1.5.1/go.mod h1:5W2xD1RspED5o8YsWQXVCued0rvSQ+mT+I5cxcmMvtA= -github.com/stretchr/testify v1.6.1/go.mod h1:6Fq8oRcR53rry900zMqJjRRixrwX3KX962/h/Wwjteg= github.com/stretchr/testify v1.7.0/go.mod h1:6Fq8oRcR53rry900zMqJjRRixrwX3KX962/h/Wwjteg= github.com/stretchr/testify v1.7.1/go.mod h1:6Fq8oRcR53rry900zMqJjRRixrwX3KX962/h/Wwjteg= github.com/stretchr/testify v1.8.0/go.mod h1:yNjHg4UonilssWZ8iaSj1OCr/vHnekPRkoO+kdMU+MU= @@ -280,14 +279,14 @@ 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.opencensus.io v0.23.0 h1:gqCw0LfLxScz8irSi8exQc7fyQ0fKQU/qnC/X8+V/1M= -go.opencensus.io v0.23.0/go.mod h1:XItmlyltB5F7CS4xOC1DcqMoFqwtC6OG2xF7mCv7P7E= -go.opentelemetry.io/collector v0.63.2-0.20221104003159-6b27644724d8 h1:rOT5HzXXfSISc6FiH012zH2/EFjp37UXfjEqj5BpkWQ= -go.opentelemetry.io/collector v0.63.2-0.20221104003159-6b27644724d8/go.mod h1:JVmeZXugK4ondC6KQgrHTHWiF4JttpG5k6dWPMt62+k= -go.opentelemetry.io/collector/pdata v0.63.2-0.20221104003159-6b27644724d8 h1:7xeTQjfsOm9eogQeIxjSEhlik9qsbBGsnmkQHfyKaRE= -go.opentelemetry.io/collector/pdata v0.63.2-0.20221104003159-6b27644724d8/go.mod h1:IzvXUGQml2mrnvdb8zIlEW3qQs9oFLdD2hLwJdZ+pek= -go.opentelemetry.io/collector/semconv v0.63.2-0.20221104003159-6b27644724d8 h1:jm0sNPyqo6S165QjQYMBHB2nK50wlJbMYM03Yr3Eo2k= -go.opentelemetry.io/collector/semconv v0.63.2-0.20221104003159-6b27644724d8/go.mod h1:5o9yhOa+ABt7g2E5JABDxGZ1PQPbtfxrKNbYn+LOTXU= +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.63.2-0.20221108014805-0b08d5316426 h1:z/wLTMh7/vNxcFUDa5uG7/IPE3tYx6pzCWPV41ghyV8= +go.opentelemetry.io/collector v0.63.2-0.20221108014805-0b08d5316426/go.mod h1:+Zb70q0Rq17dA9FcHTiTjW6g96lvJ8kAZ0c+eWNkAv0= +go.opentelemetry.io/collector/pdata v0.63.2-0.20221108014805-0b08d5316426 h1:wKDpgP0Tx/gWI2SgDGAY1OTSeihhDivbbRqFR79IGTc= +go.opentelemetry.io/collector/pdata v0.63.2-0.20221108014805-0b08d5316426/go.mod h1:IzvXUGQml2mrnvdb8zIlEW3qQs9oFLdD2hLwJdZ+pek= +go.opentelemetry.io/collector/semconv v0.63.2-0.20221108014805-0b08d5316426 h1:pqIl7OC531J6i9ttBCj3zLmZI/BSF4q323YpK0GgKGk= +go.opentelemetry.io/collector/semconv v0.63.2-0.20221108014805-0b08d5316426/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 0fbd9df10e75..1b6c4bcb3f4e 100644 --- a/exporter/signalfxexporter/config_test.go +++ b/exporter/signalfxexporter/config_test.go @@ -23,6 +23,7 @@ import ( apmcorrelation "github.com/signalfx/signalfx-agent/pkg/apm/correlations" "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" + "go.opentelemetry.io/collector/component" "go.opentelemetry.io/collector/config" "go.opentelemetry.io/collector/config/confighttp" "go.opentelemetry.io/collector/confmap/confmaptest" @@ -48,17 +49,17 @@ func TestLoadConfig(t *testing.T) { defaultCfg.TranslationRules = defaultTranslationRules tests := []struct { - id config.ComponentID - expected config.Exporter + id component.ID + expected component.ExporterConfig }{ { - id: config.NewComponentIDWithName(typeStr, ""), + id: component.NewIDWithName(typeStr, ""), expected: defaultCfg, }, { - id: config.NewComponentIDWithName(typeStr, "allsettings"), + id: component.NewIDWithName(typeStr, "allsettings"), expected: &Config{ - ExporterSettings: config.NewExporterSettings(config.NewComponentID(typeStr)), + ExporterSettings: config.NewExporterSettings(component.NewID(typeStr)), AccessToken: "testToken", Realm: "us1", MaxConnections: 70, @@ -188,7 +189,7 @@ func TestLoadConfig(t *testing.T) { sub, err := cm.Sub(tt.id.String()) require.NoError(t, err) - require.NoError(t, config.UnmarshalExporter(sub, cfg)) + require.NoError(t, component.UnmarshalExporterConfig(sub, cfg)) assert.NoError(t, cfg.Validate()) assert.Equal(t, tt.expected, cfg) @@ -320,7 +321,7 @@ func TestConfig_getOptionsFromConfig(t *testing.T) { for _, tt := range tests { t.Run(tt.name, func(t *testing.T) { cfg := &Config{ - ExporterSettings: config.NewExporterSettings(config.NewComponentID(typeStr)), + ExporterSettings: config.NewExporterSettings(component.NewID(typeStr)), AccessToken: tt.fields.AccessToken, Realm: tt.fields.Realm, IngestURL: tt.fields.IngestURL, diff --git a/exporter/signalfxexporter/exporter_test.go b/exporter/signalfxexporter/exporter_test.go index 0639844bc89f..16581fbecd72 100644 --- a/exporter/signalfxexporter/exporter_test.go +++ b/exporter/signalfxexporter/exporter_test.go @@ -33,6 +33,7 @@ import ( sfxpb "github.com/signalfx/com_signalfx_metrics_protobuf/model" "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" + "go.opentelemetry.io/collector/component" "go.opentelemetry.io/collector/component/componenttest" "go.opentelemetry.io/collector/config" "go.opentelemetry.io/collector/consumer/consumererror" @@ -64,7 +65,7 @@ func TestNew(t *testing.T) { { name: "bad config fails", config: &Config{ - ExporterSettings: config.NewExporterSettings(config.NewComponentID(typeStr)), + ExporterSettings: config.NewExporterSettings(component.NewID(typeStr)), APIURL: "abc", }, wantErr: true, @@ -72,7 +73,7 @@ func TestNew(t *testing.T) { { name: "fails to create metrics converter", config: &Config{ - ExporterSettings: config.NewExporterSettings(config.NewComponentID(typeStr)), + ExporterSettings: config.NewExporterSettings(component.NewID(typeStr)), AccessToken: "test", Realm: "realm", ExcludeMetrics: []dpfilters.MetricFilter{{}}, @@ -82,7 +83,7 @@ func TestNew(t *testing.T) { { name: "successfully create exporter", config: &Config{ - ExporterSettings: config.NewExporterSettings(config.NewComponentID(typeStr)), + ExporterSettings: config.NewExporterSettings(component.NewID(typeStr)), AccessToken: "someToken", Realm: "xyz", TimeoutSettings: exporterhelper.TimeoutSettings{Timeout: 1 * time.Second}, @@ -92,7 +93,7 @@ func TestNew(t *testing.T) { { name: "create exporter with host metadata syncer", config: &Config{ - ExporterSettings: config.NewExporterSettings(config.NewComponentID(typeStr)), + ExporterSettings: config.NewExporterSettings(component.NewID(typeStr)), AccessToken: "someToken", Realm: "xyz", TimeoutSettings: exporterhelper.TimeoutSettings{Timeout: 1 * time.Second}, @@ -449,7 +450,7 @@ func TestNewEventExporter(t *testing.T) { assert.Nil(t, got) cfg := &Config{ - ExporterSettings: config.NewExporterSettings(config.NewComponentID(typeStr)), + ExporterSettings: config.NewExporterSettings(component.NewID(typeStr)), AccessToken: "someToken", IngestURL: "asdf://:%", TimeoutSettings: exporterhelper.TimeoutSettings{Timeout: 1 * time.Second}, diff --git a/exporter/signalfxexporter/factory.go b/exporter/signalfxexporter/factory.go index 12da537ac92b..3de4e65dbcff 100644 --- a/exporter/signalfxexporter/factory.go +++ b/exporter/signalfxexporter/factory.go @@ -54,9 +54,9 @@ func NewFactory() component.ExporterFactory { ) } -func createDefaultConfig() config.Exporter { +func createDefaultConfig() component.ExporterConfig { return &Config{ - ExporterSettings: config.NewExporterSettings(config.NewComponentID(typeStr)), + ExporterSettings: config.NewExporterSettings(component.NewID(typeStr)), TimeoutSettings: exporterhelper.TimeoutSettings{Timeout: defaultHTTPTimeout}, RetrySettings: exporterhelper.NewDefaultRetrySettings(), QueueSettings: exporterhelper.NewDefaultQueueSettings(), @@ -73,7 +73,7 @@ func createDefaultConfig() config.Exporter { func createTracesExporter( ctx context.Context, set component.ExporterCreateSettings, - eCfg config.Exporter, + eCfg component.ExporterConfig, ) (component.TracesExporter, error) { cfg := eCfg.(*Config) corrCfg := cfg.Correlation @@ -103,7 +103,7 @@ func createTracesExporter( func createMetricsExporter( ctx context.Context, set component.ExporterCreateSettings, - config config.Exporter, + config component.ExporterConfig, ) (component.MetricsExporter, error) { cfg := config.(*Config) @@ -186,7 +186,7 @@ func loadConfig(bytes []byte) (Config, error) { func createLogsExporter( ctx context.Context, set component.ExporterCreateSettings, - cfg config.Exporter, + cfg component.ExporterConfig, ) (component.LogsExporter, error) { expCfg := cfg.(*Config) diff --git a/exporter/signalfxexporter/factory_test.go b/exporter/signalfxexporter/factory_test.go index 9eb6e21d850a..43871aaa244a 100644 --- a/exporter/signalfxexporter/factory_test.go +++ b/exporter/signalfxexporter/factory_test.go @@ -26,9 +26,9 @@ import ( sfxpb "github.com/signalfx/com_signalfx_metrics_protobuf/model" "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" + "go.opentelemetry.io/collector/component" "go.opentelemetry.io/collector/component/componenttest" "go.opentelemetry.io/collector/config" - "go.opentelemetry.io/collector/config/configtest" "go.opentelemetry.io/collector/exporter/exporterhelper" "go.opentelemetry.io/collector/pdata/pcommon" "go.opentelemetry.io/collector/pdata/pmetric" @@ -41,7 +41,7 @@ import ( func TestCreateDefaultConfig(t *testing.T) { cfg := createDefaultConfig() assert.NotNil(t, cfg, "failed to create default config") - assert.NoError(t, configtest.CheckConfigStruct(cfg)) + assert.NoError(t, componenttest.CheckConfigStruct(cfg)) } func TestCreateMetricsExporter(t *testing.T) { @@ -111,7 +111,7 @@ func TestCreateInstanceViaFactory(t *testing.T) { func TestCreateMetricsExporter_CustomConfig(t *testing.T) { config := &Config{ - ExporterSettings: config.NewExporterSettings(config.NewComponentID(typeStr)), + ExporterSettings: config.NewExporterSettings(component.NewID(typeStr)), AccessToken: "testToken", Realm: "us1", Headers: map[string]string{ @@ -135,7 +135,7 @@ func TestFactory_CreateMetricsExporterFails(t *testing.T) { { name: "negative_duration", config: &Config{ - ExporterSettings: config.NewExporterSettings(config.NewComponentID(typeStr)), + ExporterSettings: config.NewExporterSettings(component.NewID(typeStr)), AccessToken: "testToken", Realm: "lab", TimeoutSettings: exporterhelper.TimeoutSettings{Timeout: -2 * time.Second}, @@ -145,7 +145,7 @@ func TestFactory_CreateMetricsExporterFails(t *testing.T) { { name: "empty_realm_and_urls", config: &Config{ - ExporterSettings: config.NewExporterSettings(config.NewComponentID(typeStr)), + ExporterSettings: config.NewExporterSettings(component.NewID(typeStr)), AccessToken: "testToken", }, errorMessage: "failed to process \"signalfx\" config: requires a non-empty \"realm\"," + @@ -154,7 +154,7 @@ func TestFactory_CreateMetricsExporterFails(t *testing.T) { { name: "empty_realm_and_api_url", config: &Config{ - ExporterSettings: config.NewExporterSettings(config.NewComponentID(typeStr)), + ExporterSettings: config.NewExporterSettings(component.NewID(typeStr)), AccessToken: "testToken", IngestURL: "http://localhost:123", }, @@ -164,7 +164,7 @@ func TestFactory_CreateMetricsExporterFails(t *testing.T) { { name: "negative_MaxConnections", config: &Config{ - ExporterSettings: config.NewExporterSettings(config.NewComponentID(typeStr)), + ExporterSettings: config.NewExporterSettings(component.NewID(typeStr)), AccessToken: "testToken", Realm: "lab", IngestURL: "http://localhost:123", @@ -263,7 +263,7 @@ func TestDefaultTranslationRules(t *testing.T) { func TestCreateMetricsExporterWithDefaultExcludeMetrics(t *testing.T) { config := &Config{ - ExporterSettings: config.NewExporterSettings(config.NewComponentID(typeStr)), + ExporterSettings: config.NewExporterSettings(component.NewID(typeStr)), AccessToken: "testToken", Realm: "us1", } @@ -278,7 +278,7 @@ func TestCreateMetricsExporterWithDefaultExcludeMetrics(t *testing.T) { func TestCreateMetricsExporterWithExcludeMetrics(t *testing.T) { config := &Config{ - ExporterSettings: config.NewExporterSettings(config.NewComponentID(typeStr)), + ExporterSettings: config.NewExporterSettings(component.NewID(typeStr)), AccessToken: "testToken", Realm: "us1", ExcludeMetrics: []dpfilters.MetricFilter{ @@ -298,7 +298,7 @@ func TestCreateMetricsExporterWithExcludeMetrics(t *testing.T) { func TestCreateMetricsExporterWithEmptyExcludeMetrics(t *testing.T) { config := &Config{ - ExporterSettings: config.NewExporterSettings(config.NewComponentID(typeStr)), + ExporterSettings: config.NewExporterSettings(component.NewID(typeStr)), AccessToken: "testToken", Realm: "us1", ExcludeMetrics: []dpfilters.MetricFilter{}, diff --git a/exporter/signalfxexporter/go.mod b/exporter/signalfxexporter/go.mod index e581a5218c8a..66459592bc1f 100644 --- a/exporter/signalfxexporter/go.mod +++ b/exporter/signalfxexporter/go.mod @@ -15,9 +15,9 @@ 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.63.2-0.20221104003159-6b27644724d8 - go.opentelemetry.io/collector/pdata v0.63.2-0.20221104003159-6b27644724d8 - go.opentelemetry.io/collector/semconv v0.63.2-0.20221104003159-6b27644724d8 + go.opentelemetry.io/collector v0.63.2-0.20221108014805-0b08d5316426 + go.opentelemetry.io/collector/pdata v0.63.2-0.20221108014805-0b08d5316426 + go.opentelemetry.io/collector/semconv v0.63.2-0.20221108014805-0b08d5316426 go.uber.org/atomic v1.10.0 go.uber.org/multierr v1.8.0 go.uber.org/zap v1.23.0 @@ -60,7 +60,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.opencensus.io v0.23.0 // indirect + go.opencensus.io v0.24.0 // 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 2f224e35a300..204089c5731d 100644 --- a/exporter/signalfxexporter/go.sum +++ b/exporter/signalfxexporter/go.sum @@ -973,8 +973,9 @@ github.com/prometheus/client_golang v1.11.0/go.mod h1:Z6t4BnS23TR94PD6BsDNk8yVqr github.com/prometheus/client_golang v1.11.1/go.mod h1:Z6t4BnS23TR94PD6BsDNk8yVqroYurpAkEiz0P2BEV0= github.com/prometheus/client_golang v1.12.1/go.mod h1:3Z9XVyYiZYEO+YQWt3RD2R3jrbd179Rt297l4aS6nDY= github.com/prometheus/client_golang v1.12.2/go.mod h1:3Z9XVyYiZYEO+YQWt3RD2R3jrbd179Rt297l4aS6nDY= -github.com/prometheus/client_golang v1.13.0 h1:b71QUfeo5M8gq2+evJdTPfZhYMAU0uKPkyPJ7TPsloU= github.com/prometheus/client_golang v1.13.0/go.mod h1:vTeo+zgvILHsnnj/39Ou/1fPN5nJFOEMgftOUOmlvYQ= +github.com/prometheus/client_golang v1.13.1 h1:3gMjIY2+/hzmqhtUC/aQNYldJA6DtH3CgQvwS+02K1c= +github.com/prometheus/client_golang v1.13.1/go.mod h1:vTeo+zgvILHsnnj/39Ou/1fPN5nJFOEMgftOUOmlvYQ= github.com/prometheus/client_model v0.0.0-20180712105110-5c3871d89910/go.mod h1:MbSGuTsp3dbXC40dX6PRTWyKYBIrTGTE9sqQNg2J8bo= github.com/prometheus/client_model v0.0.0-20190115171406-56726106282f/go.mod h1:MbSGuTsp3dbXC40dX6PRTWyKYBIrTGTE9sqQNg2J8bo= github.com/prometheus/client_model v0.0.0-20190129233127-fd36f4220a90/go.mod h1:xMI15A0UPsDsEKsMN9yxemIoYk6Tm2C1GtYGdfGttqA= @@ -1238,14 +1239,15 @@ 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.opencensus.io v0.22.5/go.mod h1:5pWMHQbX5EPX2/62yrJeAkowc+lfs/XD7Uxpq3pI6kk= -go.opencensus.io v0.23.0 h1:gqCw0LfLxScz8irSi8exQc7fyQ0fKQU/qnC/X8+V/1M= 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.52.0/go.mod h1:a9GvaOhyc0nVOUzqvdv5mxyWghCSso/WRO2GgRl4I1g= 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.63.1/go.mod h1:FZC9Px2N5CRiOG1VWH4XvkDeFx+Bu5tO8+gaqDSfXAA= -go.opentelemetry.io/collector v0.63.2-0.20221104003159-6b27644724d8 h1:rOT5HzXXfSISc6FiH012zH2/EFjp37UXfjEqj5BpkWQ= -go.opentelemetry.io/collector v0.63.2-0.20221104003159-6b27644724d8/go.mod h1:JVmeZXugK4ondC6KQgrHTHWiF4JttpG5k6dWPMt62+k= +go.opentelemetry.io/collector v0.63.2-0.20221108014805-0b08d5316426 h1:z/wLTMh7/vNxcFUDa5uG7/IPE3tYx6pzCWPV41ghyV8= +go.opentelemetry.io/collector v0.63.2-0.20221108014805-0b08d5316426/go.mod h1:+Zb70q0Rq17dA9FcHTiTjW6g96lvJ8kAZ0c+eWNkAv0= go.opentelemetry.io/collector/extension/zpagesextension v0.0.0-20221102221454-bfc45c16c979/go.mod h1:9/RxW3avsU7dJMDktR52UVj3oDP9P0skGQCHqpRsMoE= go.opentelemetry.io/collector/model v0.49.0/go.mod h1:nOYQv9KoFPs6ihJwOi24qB209EOhS9HkwhGj54YiEAw= go.opentelemetry.io/collector/pdata v0.49.0/go.mod h1:YwmKuiFhNgtmhRdpi8Q8FAWPa0AwJTCSlssSsAtuRcY= @@ -1254,16 +1256,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.63.1/go.mod h1:IzvXUGQml2mrnvdb8zIlEW3qQs9oFLdD2hLwJdZ+pek= -go.opentelemetry.io/collector/pdata v0.63.2-0.20221104003159-6b27644724d8 h1:7xeTQjfsOm9eogQeIxjSEhlik9qsbBGsnmkQHfyKaRE= -go.opentelemetry.io/collector/pdata v0.63.2-0.20221104003159-6b27644724d8/go.mod h1:IzvXUGQml2mrnvdb8zIlEW3qQs9oFLdD2hLwJdZ+pek= +go.opentelemetry.io/collector/pdata v0.63.2-0.20221108014805-0b08d5316426 h1:wKDpgP0Tx/gWI2SgDGAY1OTSeihhDivbbRqFR79IGTc= +go.opentelemetry.io/collector/pdata v0.63.2-0.20221108014805-0b08d5316426/go.mod h1:IzvXUGQml2mrnvdb8zIlEW3qQs9oFLdD2hLwJdZ+pek= go.opentelemetry.io/collector/processor/batchprocessor v0.0.0-20221103161931-a167b006e8c0/go.mod h1:WBv1Nayi8p12K0vxLxTkHpRGr79JXYT3TXL2X0B/PRU= 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.63.1/go.mod h1:5o9yhOa+ABt7g2E5JABDxGZ1PQPbtfxrKNbYn+LOTXU= -go.opentelemetry.io/collector/semconv v0.63.2-0.20221104003159-6b27644724d8 h1:jm0sNPyqo6S165QjQYMBHB2nK50wlJbMYM03Yr3Eo2k= -go.opentelemetry.io/collector/semconv v0.63.2-0.20221104003159-6b27644724d8/go.mod h1:5o9yhOa+ABt7g2E5JABDxGZ1PQPbtfxrKNbYn+LOTXU= +go.opentelemetry.io/collector/semconv v0.63.2-0.20221108014805-0b08d5316426 h1:pqIl7OC531J6i9ttBCj3zLmZI/BSF4q323YpK0GgKGk= +go.opentelemetry.io/collector/semconv v0.63.2-0.20221108014805-0b08d5316426/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.go b/exporter/skywalkingexporter/config.go index 048e7f830587..cb8333e90d23 100644 --- a/exporter/skywalkingexporter/config.go +++ b/exporter/skywalkingexporter/config.go @@ -17,6 +17,7 @@ package skywalkingexporter // import "github.com/open-telemetry/opentelemetry-co import ( "errors" + "go.opentelemetry.io/collector/component" "go.opentelemetry.io/collector/config" "go.opentelemetry.io/collector/config/configgrpc" "go.opentelemetry.io/collector/exporter/exporterhelper" @@ -34,7 +35,7 @@ type Config struct { NumStreams int `mapstructure:"num_streams"` } -var _ config.Exporter = (*Config)(nil) +var _ component.ExporterConfig = (*Config)(nil) // Validate checks if the exporter configuration is valid func (cfg *Config) Validate() error { diff --git a/exporter/skywalkingexporter/config_test.go b/exporter/skywalkingexporter/config_test.go index b1598ca558a1..7f9e50901a02 100644 --- a/exporter/skywalkingexporter/config_test.go +++ b/exporter/skywalkingexporter/config_test.go @@ -21,6 +21,7 @@ import ( "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" + "go.opentelemetry.io/collector/component" "go.opentelemetry.io/collector/config" "go.opentelemetry.io/collector/config/configgrpc" "go.opentelemetry.io/collector/config/configtls" @@ -38,17 +39,17 @@ func TestLoadConfig(t *testing.T) { defaultCfg.Endpoint = "1.2.3.4:11800" tests := []struct { - id config.ComponentID - expected config.Exporter + id component.ID + expected component.ExporterConfig }{ { - id: config.NewComponentIDWithName(typeStr, ""), + id: component.NewIDWithName(typeStr, ""), expected: defaultCfg, }, { - id: config.NewComponentIDWithName(typeStr, "2"), + id: component.NewIDWithName(typeStr, "2"), expected: &Config{ - ExporterSettings: config.NewExporterSettings(config.NewComponentID(typeStr)), + ExporterSettings: config.NewExporterSettings(component.NewID(typeStr)), RetrySettings: exporterhelper.RetrySettings{ Enabled: true, InitialInterval: 10 * time.Second, @@ -97,7 +98,7 @@ func TestLoadConfig(t *testing.T) { sub, err := cm.Sub(tt.id.String()) require.NoError(t, err) - require.NoError(t, config.UnmarshalExporter(sub, cfg)) + require.NoError(t, component.UnmarshalExporterConfig(sub, cfg)) assert.NoError(t, cfg.Validate()) assert.Equal(t, tt.expected, cfg) @@ -107,7 +108,7 @@ func TestLoadConfig(t *testing.T) { func TestValidate(t *testing.T) { c1 := &Config{ - ExporterSettings: config.NewExporterSettings(config.NewComponentID(typeStr)), + ExporterSettings: config.NewExporterSettings(component.NewID(typeStr)), GRPCClientSettings: configgrpc.GRPCClientSettings{ Endpoint: "", }, @@ -116,7 +117,7 @@ func TestValidate(t *testing.T) { err := c1.Validate() assert.Error(t, err) c2 := &Config{ - ExporterSettings: config.NewExporterSettings(config.NewComponentID(typeStr)), + ExporterSettings: config.NewExporterSettings(component.NewID(typeStr)), GRPCClientSettings: configgrpc.GRPCClientSettings{ Endpoint: "", }, diff --git a/exporter/skywalkingexporter/factory.go b/exporter/skywalkingexporter/factory.go index f7bcc9b96d2a..b48c810bc30a 100644 --- a/exporter/skywalkingexporter/factory.go +++ b/exporter/skywalkingexporter/factory.go @@ -40,9 +40,9 @@ func NewFactory() component.ExporterFactory { component.WithMetricsExporter(createMetricsExporter, stability)) } -func createDefaultConfig() config.Exporter { +func createDefaultConfig() component.ExporterConfig { return &Config{ - ExporterSettings: config.NewExporterSettings(config.NewComponentID(typeStr)), + ExporterSettings: config.NewExporterSettings(component.NewID(typeStr)), RetrySettings: exporterhelper.NewDefaultRetrySettings(), QueueSettings: exporterhelper.NewDefaultQueueSettings(), TimeoutSettings: exporterhelper.NewDefaultTimeoutSettings(), @@ -58,7 +58,7 @@ func createDefaultConfig() config.Exporter { func createLogsExporter( ctx context.Context, set component.ExporterCreateSettings, - cfg config.Exporter, + cfg component.ExporterConfig, ) (component.LogsExporter, error) { oCfg := cfg.(*Config) oce := newLogsExporter(ctx, oCfg, set.TelemetrySettings) @@ -76,7 +76,7 @@ func createLogsExporter( ) } -func createMetricsExporter(ctx context.Context, set component.ExporterCreateSettings, cfg config.Exporter) (component.MetricsExporter, error) { +func createMetricsExporter(ctx context.Context, set component.ExporterCreateSettings, cfg component.ExporterConfig) (component.MetricsExporter, error) { oCfg := cfg.(*Config) oce := newMetricsExporter(ctx, oCfg, set.TelemetrySettings) return exporterhelper.NewMetricsExporter( diff --git a/exporter/skywalkingexporter/factory_test.go b/exporter/skywalkingexporter/factory_test.go index 49fe7c7aa1f3..5a994a817362 100644 --- a/exporter/skywalkingexporter/factory_test.go +++ b/exporter/skywalkingexporter/factory_test.go @@ -25,7 +25,6 @@ import ( "go.opentelemetry.io/collector/component/componenttest" "go.opentelemetry.io/collector/config" "go.opentelemetry.io/collector/config/configgrpc" - "go.opentelemetry.io/collector/config/configtest" "go.opentelemetry.io/collector/config/configtls" "github.com/open-telemetry/opentelemetry-collector-contrib/internal/common/testutil" @@ -34,7 +33,7 @@ import ( func TestCreateDefaultConfig(t *testing.T) { cfg := createDefaultConfig() assert.NotNil(t, cfg, "failed to create default config") - assert.NoError(t, configtest.CheckConfigStruct(cfg)) + assert.NoError(t, componenttest.CheckConfigStruct(cfg)) } func TestCreateTracesExporter(t *testing.T) { @@ -48,7 +47,7 @@ func TestCreateTracesExporter(t *testing.T) { { name: "UseSecure", config: Config{ - ExporterSettings: config.NewExporterSettings(config.NewComponentID(typeStr)), + ExporterSettings: config.NewExporterSettings(component.NewID(typeStr)), GRPCClientSettings: configgrpc.GRPCClientSettings{ Endpoint: endpoint, TLSSetting: configtls.TLSClientSetting{ @@ -61,7 +60,7 @@ func TestCreateTracesExporter(t *testing.T) { { name: "Keepalive", config: Config{ - ExporterSettings: config.NewExporterSettings(config.NewComponentID(typeStr)), + ExporterSettings: config.NewExporterSettings(component.NewID(typeStr)), GRPCClientSettings: configgrpc.GRPCClientSettings{ Endpoint: endpoint, Keepalive: &configgrpc.KeepaliveClientConfig{ @@ -76,7 +75,7 @@ func TestCreateTracesExporter(t *testing.T) { { name: "Compression", config: Config{ - ExporterSettings: config.NewExporterSettings(config.NewComponentID(typeStr)), + ExporterSettings: config.NewExporterSettings(component.NewID(typeStr)), GRPCClientSettings: configgrpc.GRPCClientSettings{ Endpoint: endpoint, Compression: "gzip", @@ -87,7 +86,7 @@ func TestCreateTracesExporter(t *testing.T) { { name: "Headers", config: Config{ - ExporterSettings: config.NewExporterSettings(config.NewComponentID(typeStr)), + ExporterSettings: config.NewExporterSettings(component.NewID(typeStr)), GRPCClientSettings: configgrpc.GRPCClientSettings{ Endpoint: endpoint, Headers: map[string]string{ @@ -101,7 +100,7 @@ func TestCreateTracesExporter(t *testing.T) { { name: "CompressionError", config: Config{ - ExporterSettings: config.NewExporterSettings(config.NewComponentID(typeStr)), + ExporterSettings: config.NewExporterSettings(component.NewID(typeStr)), GRPCClientSettings: configgrpc.GRPCClientSettings{ Endpoint: endpoint, Compression: "unknown compression", @@ -114,7 +113,7 @@ func TestCreateTracesExporter(t *testing.T) { { name: "CaCert", config: Config{ - ExporterSettings: config.NewExporterSettings(config.NewComponentID(typeStr)), + ExporterSettings: config.NewExporterSettings(component.NewID(typeStr)), GRPCClientSettings: configgrpc.GRPCClientSettings{ Endpoint: endpoint, TLSSetting: configtls.TLSClientSetting{ @@ -130,7 +129,7 @@ func TestCreateTracesExporter(t *testing.T) { { name: "CertPemFileError", config: Config{ - ExporterSettings: config.NewExporterSettings(config.NewComponentID(typeStr)), + ExporterSettings: config.NewExporterSettings(component.NewID(typeStr)), GRPCClientSettings: configgrpc.GRPCClientSettings{ Endpoint: endpoint, TLSSetting: configtls.TLSClientSetting{ diff --git a/exporter/skywalkingexporter/go.mod b/exporter/skywalkingexporter/go.mod index 10961eb3bf51..f666f557078a 100644 --- a/exporter/skywalkingexporter/go.mod +++ b/exporter/skywalkingexporter/go.mod @@ -6,9 +6,9 @@ require ( github.com/open-telemetry/opentelemetry-collector-contrib/internal/common v0.63.0 github.com/open-telemetry/opentelemetry-collector-contrib/internal/coreinternal v0.63.0 github.com/stretchr/testify v1.8.1 - go.opentelemetry.io/collector v0.63.2-0.20221104003159-6b27644724d8 - go.opentelemetry.io/collector/pdata v0.63.2-0.20221104003159-6b27644724d8 - go.opentelemetry.io/collector/semconv v0.63.2-0.20221104003159-6b27644724d8 + go.opentelemetry.io/collector v0.63.2-0.20221108014805-0b08d5316426 + go.opentelemetry.io/collector/pdata v0.63.2-0.20221108014805-0b08d5316426 + go.opentelemetry.io/collector/semconv v0.63.2-0.20221108014805-0b08d5316426 go.uber.org/atomic v1.10.0 google.golang.org/grpc v1.50.1 skywalking.apache.org/repo/goapi v0.0.0-20211122071111-ffc517fbfe21 @@ -33,7 +33,7 @@ require ( github.com/mostynb/go-grpc-compression v1.1.17 // indirect github.com/pmezard/go-difflib v1.0.0 // indirect github.com/rogpeppe/go-internal v1.8.0 // indirect - go.opencensus.io v0.23.0 // indirect + go.opencensus.io v0.24.0 // 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 f250b1d627f0..849b62e264c0 100644 --- a/exporter/skywalkingexporter/go.sum +++ b/exporter/skywalkingexporter/go.sum @@ -251,7 +251,7 @@ github.com/prometheus/client_golang v0.9.1/go.mod h1:7SWBe2y4D6OKWSNQJUaRYU/AaXP github.com/prometheus/client_golang v1.0.0/go.mod h1:db9x61etRT2tGnBNRi70OPL5FsnadC4Ky3P0J6CfImo= github.com/prometheus/client_golang v1.7.1/go.mod h1:PY5Wy2awLA44sXw4AOSfFBetzPP4j5+D6mVACh+pe2M= github.com/prometheus/client_golang v1.11.1/go.mod h1:Z6t4BnS23TR94PD6BsDNk8yVqroYurpAkEiz0P2BEV0= -github.com/prometheus/client_golang v1.13.0 h1:b71QUfeo5M8gq2+evJdTPfZhYMAU0uKPkyPJ7TPsloU= +github.com/prometheus/client_golang v1.13.1 h1:3gMjIY2+/hzmqhtUC/aQNYldJA6DtH3CgQvwS+02K1c= github.com/prometheus/client_model v0.0.0-20180712105110-5c3871d89910/go.mod h1:MbSGuTsp3dbXC40dX6PRTWyKYBIrTGTE9sqQNg2J8bo= github.com/prometheus/client_model v0.0.0-20190129233127-fd36f4220a90/go.mod h1:xMI15A0UPsDsEKsMN9yxemIoYk6Tm2C1GtYGdfGttqA= github.com/prometheus/client_model v0.0.0-20190812154241-14fe0d1b01d4/go.mod h1:xMI15A0UPsDsEKsMN9yxemIoYk6Tm2C1GtYGdfGttqA= @@ -290,7 +290,6 @@ github.com/stretchr/testify v1.2.2/go.mod h1:a8OnRcib4nhh0OaRAV+Yts87kKdq0PP7pXf github.com/stretchr/testify v1.3.0/go.mod h1:M5WIy9Dh21IEIfnGCwXGc5bZfKNJtfHm1UVUgZn+9EI= github.com/stretchr/testify v1.4.0/go.mod h1:j7eGeouHqKxXV5pUuKE4zz7dFj8WfuZ+81PSLYec5m4= github.com/stretchr/testify v1.5.1/go.mod h1:5W2xD1RspED5o8YsWQXVCued0rvSQ+mT+I5cxcmMvtA= -github.com/stretchr/testify v1.6.1/go.mod h1:6Fq8oRcR53rry900zMqJjRRixrwX3KX962/h/Wwjteg= github.com/stretchr/testify v1.7.0/go.mod h1:6Fq8oRcR53rry900zMqJjRRixrwX3KX962/h/Wwjteg= github.com/stretchr/testify v1.7.1/go.mod h1:6Fq8oRcR53rry900zMqJjRRixrwX3KX962/h/Wwjteg= github.com/stretchr/testify v1.8.0/go.mod h1:yNjHg4UonilssWZ8iaSj1OCr/vHnekPRkoO+kdMU+MU= @@ -302,14 +301,14 @@ 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.opencensus.io v0.23.0 h1:gqCw0LfLxScz8irSi8exQc7fyQ0fKQU/qnC/X8+V/1M= -go.opencensus.io v0.23.0/go.mod h1:XItmlyltB5F7CS4xOC1DcqMoFqwtC6OG2xF7mCv7P7E= -go.opentelemetry.io/collector v0.63.2-0.20221104003159-6b27644724d8 h1:rOT5HzXXfSISc6FiH012zH2/EFjp37UXfjEqj5BpkWQ= -go.opentelemetry.io/collector v0.63.2-0.20221104003159-6b27644724d8/go.mod h1:JVmeZXugK4ondC6KQgrHTHWiF4JttpG5k6dWPMt62+k= -go.opentelemetry.io/collector/pdata v0.63.2-0.20221104003159-6b27644724d8 h1:7xeTQjfsOm9eogQeIxjSEhlik9qsbBGsnmkQHfyKaRE= -go.opentelemetry.io/collector/pdata v0.63.2-0.20221104003159-6b27644724d8/go.mod h1:IzvXUGQml2mrnvdb8zIlEW3qQs9oFLdD2hLwJdZ+pek= -go.opentelemetry.io/collector/semconv v0.63.2-0.20221104003159-6b27644724d8 h1:jm0sNPyqo6S165QjQYMBHB2nK50wlJbMYM03Yr3Eo2k= -go.opentelemetry.io/collector/semconv v0.63.2-0.20221104003159-6b27644724d8/go.mod h1:5o9yhOa+ABt7g2E5JABDxGZ1PQPbtfxrKNbYn+LOTXU= +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.63.2-0.20221108014805-0b08d5316426 h1:z/wLTMh7/vNxcFUDa5uG7/IPE3tYx6pzCWPV41ghyV8= +go.opentelemetry.io/collector v0.63.2-0.20221108014805-0b08d5316426/go.mod h1:+Zb70q0Rq17dA9FcHTiTjW6g96lvJ8kAZ0c+eWNkAv0= +go.opentelemetry.io/collector/pdata v0.63.2-0.20221108014805-0b08d5316426 h1:wKDpgP0Tx/gWI2SgDGAY1OTSeihhDivbbRqFR79IGTc= +go.opentelemetry.io/collector/pdata v0.63.2-0.20221108014805-0b08d5316426/go.mod h1:IzvXUGQml2mrnvdb8zIlEW3qQs9oFLdD2hLwJdZ+pek= +go.opentelemetry.io/collector/semconv v0.63.2-0.20221108014805-0b08d5316426 h1:pqIl7OC531J6i9ttBCj3zLmZI/BSF4q323YpK0GgKGk= +go.opentelemetry.io/collector/semconv v0.63.2-0.20221108014805-0b08d5316426/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/skywalkingexporter/skywalking_benchmark_test.go b/exporter/skywalkingexporter/skywalking_benchmark_test.go index 02abdf1eca37..82150e7ac92b 100644 --- a/exporter/skywalkingexporter/skywalking_benchmark_test.go +++ b/exporter/skywalkingexporter/skywalking_benchmark_test.go @@ -25,6 +25,7 @@ import ( "time" "github.com/stretchr/testify/assert" + "go.opentelemetry.io/collector/component" "go.opentelemetry.io/collector/component/componenttest" "go.opentelemetry.io/collector/config" "go.opentelemetry.io/collector/config/configgrpc" @@ -132,7 +133,7 @@ func doInit(numStream int, t *testing.T) (*swExporter, *grpc.Server, *mockLogHan server, addr, m := initializeGRPC(grpc.MaxConcurrentStreams(100)) tt := &Config{ NumStreams: numStream, - ExporterSettings: config.NewExporterSettings(config.NewComponentID(typeStr)), + ExporterSettings: config.NewExporterSettings(component.NewID(typeStr)), QueueSettings: exporterhelper.QueueSettings{ Enabled: true, NumConsumers: 1, diff --git a/exporter/skywalkingexporter/skywalking_test.go b/exporter/skywalkingexporter/skywalking_test.go index 2308eedf7986..e3651bc90a53 100644 --- a/exporter/skywalkingexporter/skywalking_test.go +++ b/exporter/skywalkingexporter/skywalking_test.go @@ -24,6 +24,7 @@ import ( "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" + "go.opentelemetry.io/collector/component" "go.opentelemetry.io/collector/component/componenttest" "go.opentelemetry.io/collector/config" "go.opentelemetry.io/collector/config/configgrpc" @@ -42,7 +43,7 @@ func TestSwExporter(t *testing.T) { server, addr, handler := initializeGRPCTestServer(t, grpc.MaxConcurrentStreams(10)) tt := &Config{ NumStreams: 10, - ExporterSettings: config.NewExporterSettings(config.NewComponentID(typeStr)), + ExporterSettings: config.NewExporterSettings(component.NewID(typeStr)), GRPCClientSettings: configgrpc.GRPCClientSettings{ Endpoint: addr.String(), TLSSetting: configtls.TLSClientSetting{ @@ -116,7 +117,7 @@ func TestSwExporter(t *testing.T) { server, addr, handler2 := initializeGRPCTestServerMetric(t, grpc.MaxConcurrentStreams(10)) tt = &Config{ NumStreams: 10, - ExporterSettings: config.NewExporterSettings(config.NewComponentID(typeStr)), + ExporterSettings: config.NewExporterSettings(component.NewID(typeStr)), GRPCClientSettings: configgrpc.GRPCClientSettings{ Endpoint: addr.String(), TLSSetting: configtls.TLSClientSetting{ diff --git a/exporter/splunkhecexporter/config_test.go b/exporter/splunkhecexporter/config_test.go index bec876d8cc81..d751515016fe 100644 --- a/exporter/splunkhecexporter/config_test.go +++ b/exporter/splunkhecexporter/config_test.go @@ -22,6 +22,7 @@ import ( "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" + "go.opentelemetry.io/collector/component" "go.opentelemetry.io/collector/config" "go.opentelemetry.io/collector/config/configtls" "go.opentelemetry.io/collector/confmap/confmaptest" @@ -42,17 +43,17 @@ func TestLoadConfig(t *testing.T) { defaultCfg.Endpoint = "https://splunk:8088/services/collector" tests := []struct { - id config.ComponentID - expected config.Exporter + id component.ID + expected component.ExporterConfig }{ { - id: config.NewComponentIDWithName(typeStr, ""), + id: component.NewIDWithName(typeStr, ""), expected: defaultCfg, }, { - id: config.NewComponentIDWithName(typeStr, "allsettings"), + id: component.NewIDWithName(typeStr, "allsettings"), expected: &Config{ - ExporterSettings: config.NewExporterSettings(config.NewComponentID(typeStr)), + ExporterSettings: config.NewExporterSettings(component.NewID(typeStr)), Token: "00000000-0000-0000-0000-0000000000000", Endpoint: "https://splunk:8088/services/collector", Source: "otel", @@ -110,7 +111,7 @@ func TestLoadConfig(t *testing.T) { sub, err := cm.Sub(tt.id.String()) require.NoError(t, err) - require.NoError(t, config.UnmarshalExporter(sub, cfg)) + require.NoError(t, component.UnmarshalExporterConfig(sub, cfg)) assert.NoError(t, cfg.Validate()) assert.Equal(t, tt.expected, cfg) diff --git a/exporter/splunkhecexporter/factory.go b/exporter/splunkhecexporter/factory.go index 4e95f6cc1b7e..397f4214c07c 100644 --- a/exporter/splunkhecexporter/factory.go +++ b/exporter/splunkhecexporter/factory.go @@ -60,11 +60,11 @@ func NewFactory() component.ExporterFactory { component.WithLogsExporter(createLogsExporter, stability)) } -func createDefaultConfig() config.Exporter { +func createDefaultConfig() component.ExporterConfig { return &Config{ LogDataEnabled: true, ProfilingDataEnabled: true, - ExporterSettings: config.NewExporterSettings(config.NewComponentID(typeStr)), + ExporterSettings: config.NewExporterSettings(component.NewID(typeStr)), TimeoutSettings: exporterhelper.TimeoutSettings{ Timeout: defaultHTTPTimeout, }, @@ -92,7 +92,7 @@ func createDefaultConfig() config.Exporter { func createTracesExporter( ctx context.Context, set component.ExporterCreateSettings, - config config.Exporter, + config component.ExporterConfig, ) (component.TracesExporter, error) { if config == nil { return nil, errors.New("nil config") @@ -120,7 +120,7 @@ func createTracesExporter( func createMetricsExporter( ctx context.Context, set component.ExporterCreateSettings, - config config.Exporter, + config component.ExporterConfig, ) (component.MetricsExporter, error) { if config == nil { return nil, errors.New("nil config") @@ -159,7 +159,7 @@ func createMetricsExporter( func createLogsExporter( ctx context.Context, set component.ExporterCreateSettings, - config config.Exporter, + config component.ExporterConfig, ) (exporter component.LogsExporter, err error) { if config == nil { return nil, errors.New("nil config") diff --git a/exporter/splunkhecexporter/factory_test.go b/exporter/splunkhecexporter/factory_test.go index 2a64072c611d..b1bae405e9e0 100644 --- a/exporter/splunkhecexporter/factory_test.go +++ b/exporter/splunkhecexporter/factory_test.go @@ -20,15 +20,15 @@ import ( "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" + "go.opentelemetry.io/collector/component" "go.opentelemetry.io/collector/component/componenttest" "go.opentelemetry.io/collector/config" - "go.opentelemetry.io/collector/config/configtest" ) func TestCreateDefaultConfig(t *testing.T) { cfg := createDefaultConfig() assert.NotNil(t, cfg, "failed to create default config") - assert.NoError(t, configtest.CheckConfigStruct(cfg)) + assert.NoError(t, componenttest.CheckConfigStruct(cfg)) } func TestCreateMetricsExporter(t *testing.T) { @@ -122,7 +122,7 @@ func TestCreateInstanceViaFactory(t *testing.T) { func TestFactory_CreateMetricsExporter(t *testing.T) { config := &Config{ - ExporterSettings: config.NewExporterSettings(config.NewComponentID(typeStr)), + ExporterSettings: config.NewExporterSettings(component.NewID(typeStr)), Token: "testToken", Endpoint: "https://example.com:8000", } @@ -142,7 +142,7 @@ func TestFactory_CreateMetricsExporterFails(t *testing.T) { { name: "empty_endpoint", config: &Config{ - ExporterSettings: config.NewExporterSettings(config.NewComponentID(typeStr)), + ExporterSettings: config.NewExporterSettings(component.NewID(typeStr)), Token: "token", }, errorMessage: "failed to process \"splunk_hec\" config: requires a non-empty \"endpoint\"", @@ -150,7 +150,7 @@ func TestFactory_CreateMetricsExporterFails(t *testing.T) { { name: "empty_token", config: &Config{ - ExporterSettings: config.NewExporterSettings(config.NewComponentID(typeStr)), + ExporterSettings: config.NewExporterSettings(component.NewID(typeStr)), Endpoint: "https://example.com:8000", }, errorMessage: "failed to process \"splunk_hec\" config: requires a non-empty \"token\"", diff --git a/exporter/splunkhecexporter/go.mod b/exporter/splunkhecexporter/go.mod index 4bb4ce0cf0de..43c4cebca066 100644 --- a/exporter/splunkhecexporter/go.mod +++ b/exporter/splunkhecexporter/go.mod @@ -4,13 +4,13 @@ go 1.18 require ( github.com/json-iterator/go v1.1.12 - github.com/open-telemetry/opentelemetry-collector-contrib/internal/coreinternal v0.0.0-00010101000000-000000000000 + github.com/open-telemetry/opentelemetry-collector-contrib/internal/coreinternal v0.63.0 github.com/open-telemetry/opentelemetry-collector-contrib/internal/splunk v0.63.0 github.com/open-telemetry/opentelemetry-collector-contrib/pkg/batchperresourceattr v0.63.0 github.com/stretchr/testify v1.8.1 - go.opentelemetry.io/collector v0.63.2-0.20221104003159-6b27644724d8 - go.opentelemetry.io/collector/pdata v0.63.2-0.20221104003159-6b27644724d8 - go.opentelemetry.io/collector/semconv v0.63.2-0.20221104003159-6b27644724d8 + go.opentelemetry.io/collector v0.63.2-0.20221108014805-0b08d5316426 + go.opentelemetry.io/collector/pdata v0.63.2-0.20221108014805-0b08d5316426 + go.opentelemetry.io/collector/semconv v0.63.2-0.20221108014805-0b08d5316426 go.uber.org/multierr v1.8.0 go.uber.org/zap v1.23.0 ) @@ -30,7 +30,7 @@ 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.1 // indirect - go.opencensus.io v0.23.0 // indirect + go.opencensus.io v0.24.0 // 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 6050e8080e18..0354afc83ff9 100644 --- a/exporter/splunkhecexporter/go.sum +++ b/exporter/splunkhecexporter/go.sum @@ -227,7 +227,7 @@ github.com/prometheus/client_golang v0.9.1/go.mod h1:7SWBe2y4D6OKWSNQJUaRYU/AaXP github.com/prometheus/client_golang v1.0.0/go.mod h1:db9x61etRT2tGnBNRi70OPL5FsnadC4Ky3P0J6CfImo= github.com/prometheus/client_golang v1.7.1/go.mod h1:PY5Wy2awLA44sXw4AOSfFBetzPP4j5+D6mVACh+pe2M= github.com/prometheus/client_golang v1.11.1/go.mod h1:Z6t4BnS23TR94PD6BsDNk8yVqroYurpAkEiz0P2BEV0= -github.com/prometheus/client_golang v1.13.0 h1:b71QUfeo5M8gq2+evJdTPfZhYMAU0uKPkyPJ7TPsloU= +github.com/prometheus/client_golang v1.13.1 h1:3gMjIY2+/hzmqhtUC/aQNYldJA6DtH3CgQvwS+02K1c= github.com/prometheus/client_model v0.0.0-20180712105110-5c3871d89910/go.mod h1:MbSGuTsp3dbXC40dX6PRTWyKYBIrTGTE9sqQNg2J8bo= github.com/prometheus/client_model v0.0.0-20190129233127-fd36f4220a90/go.mod h1:xMI15A0UPsDsEKsMN9yxemIoYk6Tm2C1GtYGdfGttqA= github.com/prometheus/client_model v0.0.0-20190812154241-14fe0d1b01d4/go.mod h1:xMI15A0UPsDsEKsMN9yxemIoYk6Tm2C1GtYGdfGttqA= @@ -264,7 +264,6 @@ github.com/stretchr/testify v1.2.2/go.mod h1:a8OnRcib4nhh0OaRAV+Yts87kKdq0PP7pXf github.com/stretchr/testify v1.3.0/go.mod h1:M5WIy9Dh21IEIfnGCwXGc5bZfKNJtfHm1UVUgZn+9EI= github.com/stretchr/testify v1.4.0/go.mod h1:j7eGeouHqKxXV5pUuKE4zz7dFj8WfuZ+81PSLYec5m4= github.com/stretchr/testify v1.5.1/go.mod h1:5W2xD1RspED5o8YsWQXVCued0rvSQ+mT+I5cxcmMvtA= -github.com/stretchr/testify v1.6.1/go.mod h1:6Fq8oRcR53rry900zMqJjRRixrwX3KX962/h/Wwjteg= github.com/stretchr/testify v1.7.0/go.mod h1:6Fq8oRcR53rry900zMqJjRRixrwX3KX962/h/Wwjteg= github.com/stretchr/testify v1.7.1/go.mod h1:6Fq8oRcR53rry900zMqJjRRixrwX3KX962/h/Wwjteg= github.com/stretchr/testify v1.8.0/go.mod h1:yNjHg4UonilssWZ8iaSj1OCr/vHnekPRkoO+kdMU+MU= @@ -276,14 +275,14 @@ 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.opencensus.io v0.23.0 h1:gqCw0LfLxScz8irSi8exQc7fyQ0fKQU/qnC/X8+V/1M= -go.opencensus.io v0.23.0/go.mod h1:XItmlyltB5F7CS4xOC1DcqMoFqwtC6OG2xF7mCv7P7E= -go.opentelemetry.io/collector v0.63.2-0.20221104003159-6b27644724d8 h1:rOT5HzXXfSISc6FiH012zH2/EFjp37UXfjEqj5BpkWQ= -go.opentelemetry.io/collector v0.63.2-0.20221104003159-6b27644724d8/go.mod h1:JVmeZXugK4ondC6KQgrHTHWiF4JttpG5k6dWPMt62+k= -go.opentelemetry.io/collector/pdata v0.63.2-0.20221104003159-6b27644724d8 h1:7xeTQjfsOm9eogQeIxjSEhlik9qsbBGsnmkQHfyKaRE= -go.opentelemetry.io/collector/pdata v0.63.2-0.20221104003159-6b27644724d8/go.mod h1:IzvXUGQml2mrnvdb8zIlEW3qQs9oFLdD2hLwJdZ+pek= -go.opentelemetry.io/collector/semconv v0.63.2-0.20221104003159-6b27644724d8 h1:jm0sNPyqo6S165QjQYMBHB2nK50wlJbMYM03Yr3Eo2k= -go.opentelemetry.io/collector/semconv v0.63.2-0.20221104003159-6b27644724d8/go.mod h1:5o9yhOa+ABt7g2E5JABDxGZ1PQPbtfxrKNbYn+LOTXU= +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.63.2-0.20221108014805-0b08d5316426 h1:z/wLTMh7/vNxcFUDa5uG7/IPE3tYx6pzCWPV41ghyV8= +go.opentelemetry.io/collector v0.63.2-0.20221108014805-0b08d5316426/go.mod h1:+Zb70q0Rq17dA9FcHTiTjW6g96lvJ8kAZ0c+eWNkAv0= +go.opentelemetry.io/collector/pdata v0.63.2-0.20221108014805-0b08d5316426 h1:wKDpgP0Tx/gWI2SgDGAY1OTSeihhDivbbRqFR79IGTc= +go.opentelemetry.io/collector/pdata v0.63.2-0.20221108014805-0b08d5316426/go.mod h1:IzvXUGQml2mrnvdb8zIlEW3qQs9oFLdD2hLwJdZ+pek= +go.opentelemetry.io/collector/semconv v0.63.2-0.20221108014805-0b08d5316426 h1:pqIl7OC531J6i9ttBCj3zLmZI/BSF4q323YpK0GgKGk= +go.opentelemetry.io/collector/semconv v0.63.2-0.20221108014805-0b08d5316426/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/factory.go b/exporter/sumologicexporter/factory.go index b4418bd3caf3..167f7111b556 100644 --- a/exporter/sumologicexporter/factory.go +++ b/exporter/sumologicexporter/factory.go @@ -40,12 +40,12 @@ func NewFactory() component.ExporterFactory { ) } -func createDefaultConfig() config.Exporter { +func createDefaultConfig() component.ExporterConfig { qs := exporterhelper.NewDefaultQueueSettings() qs.Enabled = false return &Config{ - ExporterSettings: config.NewExporterSettings(config.NewComponentID(typeStr)), + ExporterSettings: config.NewExporterSettings(component.NewID(typeStr)), CompressEncoding: DefaultCompressEncoding, MaxRequestBodySize: DefaultMaxRequestBodySize, @@ -66,7 +66,7 @@ func createDefaultConfig() config.Exporter { func createLogsExporter( _ context.Context, params component.ExporterCreateSettings, - cfg config.Exporter, + cfg component.ExporterConfig, ) (component.LogsExporter, error) { exp, err := newLogsExporter(cfg.(*Config), params) if err != nil { @@ -79,7 +79,7 @@ func createLogsExporter( func createMetricsExporter( _ context.Context, params component.ExporterCreateSettings, - cfg config.Exporter, + cfg component.ExporterConfig, ) (component.MetricsExporter, error) { exp, err := newMetricsExporter(cfg.(*Config), params) if err != nil { diff --git a/exporter/sumologicexporter/factory_test.go b/exporter/sumologicexporter/factory_test.go index 297ff65516ca..70121c8172e1 100644 --- a/exporter/sumologicexporter/factory_test.go +++ b/exporter/sumologicexporter/factory_test.go @@ -19,16 +19,17 @@ import ( "time" "github.com/stretchr/testify/assert" + "go.opentelemetry.io/collector/component" + "go.opentelemetry.io/collector/component/componenttest" "go.opentelemetry.io/collector/config" "go.opentelemetry.io/collector/config/confighttp" - "go.opentelemetry.io/collector/config/configtest" "go.opentelemetry.io/collector/exporter/exporterhelper" ) func TestType(t *testing.T) { factory := NewFactory() pType := factory.Type() - assert.Equal(t, pType, config.Type("sumologic")) + assert.Equal(t, pType, component.Type("sumologic")) } func TestCreateDefaultConfig(t *testing.T) { @@ -38,7 +39,7 @@ func TestCreateDefaultConfig(t *testing.T) { qs.Enabled = false assert.Equal(t, cfg, &Config{ - ExporterSettings: config.NewExporterSettings(config.NewComponentID(typeStr)), + ExporterSettings: config.NewExporterSettings(component.NewID(typeStr)), CompressEncoding: "gzip", MaxRequestBodySize: 1_048_576, LogFormat: "json", @@ -55,5 +56,5 @@ func TestCreateDefaultConfig(t *testing.T) { RetrySettings: exporterhelper.NewDefaultRetrySettings(), QueueSettings: qs, }) - assert.NoError(t, configtest.CheckConfigStruct(cfg)) + assert.NoError(t, componenttest.CheckConfigStruct(cfg)) } diff --git a/exporter/sumologicexporter/go.mod b/exporter/sumologicexporter/go.mod index 5d0b7aca0604..533f5371eb14 100644 --- a/exporter/sumologicexporter/go.mod +++ b/exporter/sumologicexporter/go.mod @@ -4,8 +4,8 @@ go 1.18 require ( github.com/stretchr/testify v1.8.1 - go.opentelemetry.io/collector v0.63.2-0.20221104003159-6b27644724d8 - go.opentelemetry.io/collector/pdata v0.63.2-0.20221104003159-6b27644724d8 + go.opentelemetry.io/collector v0.63.2-0.20221108014805-0b08d5316426 + go.opentelemetry.io/collector/pdata v0.63.2-0.20221108014805-0b08d5316426 go.uber.org/atomic v1.10.0 go.uber.org/multierr v1.8.0 ) @@ -32,7 +32,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.opencensus.io v0.23.0 // indirect + go.opencensus.io v0.24.0 // 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 389cbb9f4437..ef581e3b63d3 100644 --- a/exporter/sumologicexporter/go.sum +++ b/exporter/sumologicexporter/go.sum @@ -244,7 +244,7 @@ github.com/prometheus/client_golang v0.9.1/go.mod h1:7SWBe2y4D6OKWSNQJUaRYU/AaXP github.com/prometheus/client_golang v1.0.0/go.mod h1:db9x61etRT2tGnBNRi70OPL5FsnadC4Ky3P0J6CfImo= github.com/prometheus/client_golang v1.7.1/go.mod h1:PY5Wy2awLA44sXw4AOSfFBetzPP4j5+D6mVACh+pe2M= github.com/prometheus/client_golang v1.11.1/go.mod h1:Z6t4BnS23TR94PD6BsDNk8yVqroYurpAkEiz0P2BEV0= -github.com/prometheus/client_golang v1.13.0 h1:b71QUfeo5M8gq2+evJdTPfZhYMAU0uKPkyPJ7TPsloU= +github.com/prometheus/client_golang v1.13.1 h1:3gMjIY2+/hzmqhtUC/aQNYldJA6DtH3CgQvwS+02K1c= github.com/prometheus/client_model v0.0.0-20180712105110-5c3871d89910/go.mod h1:MbSGuTsp3dbXC40dX6PRTWyKYBIrTGTE9sqQNg2J8bo= github.com/prometheus/client_model v0.0.0-20190129233127-fd36f4220a90/go.mod h1:xMI15A0UPsDsEKsMN9yxemIoYk6Tm2C1GtYGdfGttqA= github.com/prometheus/client_model v0.0.0-20190812154241-14fe0d1b01d4/go.mod h1:xMI15A0UPsDsEKsMN9yxemIoYk6Tm2C1GtYGdfGttqA= @@ -284,7 +284,6 @@ github.com/stretchr/testify v1.2.2/go.mod h1:a8OnRcib4nhh0OaRAV+Yts87kKdq0PP7pXf github.com/stretchr/testify v1.3.0/go.mod h1:M5WIy9Dh21IEIfnGCwXGc5bZfKNJtfHm1UVUgZn+9EI= github.com/stretchr/testify v1.4.0/go.mod h1:j7eGeouHqKxXV5pUuKE4zz7dFj8WfuZ+81PSLYec5m4= github.com/stretchr/testify v1.5.1/go.mod h1:5W2xD1RspED5o8YsWQXVCued0rvSQ+mT+I5cxcmMvtA= -github.com/stretchr/testify v1.6.1/go.mod h1:6Fq8oRcR53rry900zMqJjRRixrwX3KX962/h/Wwjteg= github.com/stretchr/testify v1.7.0/go.mod h1:6Fq8oRcR53rry900zMqJjRRixrwX3KX962/h/Wwjteg= github.com/stretchr/testify v1.7.1/go.mod h1:6Fq8oRcR53rry900zMqJjRRixrwX3KX962/h/Wwjteg= github.com/stretchr/testify v1.8.0/go.mod h1:yNjHg4UonilssWZ8iaSj1OCr/vHnekPRkoO+kdMU+MU= @@ -296,12 +295,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.opencensus.io v0.23.0 h1:gqCw0LfLxScz8irSi8exQc7fyQ0fKQU/qnC/X8+V/1M= -go.opencensus.io v0.23.0/go.mod h1:XItmlyltB5F7CS4xOC1DcqMoFqwtC6OG2xF7mCv7P7E= -go.opentelemetry.io/collector v0.63.2-0.20221104003159-6b27644724d8 h1:rOT5HzXXfSISc6FiH012zH2/EFjp37UXfjEqj5BpkWQ= -go.opentelemetry.io/collector v0.63.2-0.20221104003159-6b27644724d8/go.mod h1:JVmeZXugK4ondC6KQgrHTHWiF4JttpG5k6dWPMt62+k= -go.opentelemetry.io/collector/pdata v0.63.2-0.20221104003159-6b27644724d8 h1:7xeTQjfsOm9eogQeIxjSEhlik9qsbBGsnmkQHfyKaRE= -go.opentelemetry.io/collector/pdata v0.63.2-0.20221104003159-6b27644724d8/go.mod h1:IzvXUGQml2mrnvdb8zIlEW3qQs9oFLdD2hLwJdZ+pek= +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.63.2-0.20221108014805-0b08d5316426 h1:z/wLTMh7/vNxcFUDa5uG7/IPE3tYx6pzCWPV41ghyV8= +go.opentelemetry.io/collector v0.63.2-0.20221108014805-0b08d5316426/go.mod h1:+Zb70q0Rq17dA9FcHTiTjW6g96lvJ8kAZ0c+eWNkAv0= +go.opentelemetry.io/collector/pdata v0.63.2-0.20221108014805-0b08d5316426 h1:wKDpgP0Tx/gWI2SgDGAY1OTSeihhDivbbRqFR79IGTc= +go.opentelemetry.io/collector/pdata v0.63.2-0.20221108014805-0b08d5316426/go.mod h1:IzvXUGQml2mrnvdb8zIlEW3qQs9oFLdD2hLwJdZ+pek= 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/config_test.go b/exporter/tanzuobservabilityexporter/config_test.go index 52646a1ad739..7ee99e7e9fde 100644 --- a/exporter/tanzuobservabilityexporter/config_test.go +++ b/exporter/tanzuobservabilityexporter/config_test.go @@ -21,6 +21,7 @@ import ( "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" + "go.opentelemetry.io/collector/component" "go.opentelemetry.io/collector/config" "go.opentelemetry.io/collector/config/confighttp" "go.opentelemetry.io/collector/confmap/confmaptest" @@ -35,12 +36,12 @@ func TestLoadConfig(t *testing.T) { factory := NewFactory() cfg := factory.CreateDefaultConfig() - sub, err := cm.Sub(config.NewComponentIDWithName(exporterType, "").String()) + sub, err := cm.Sub(component.NewIDWithName(exporterType, "").String()) require.NoError(t, err) - require.NoError(t, config.UnmarshalExporter(sub, cfg)) + require.NoError(t, component.UnmarshalExporterConfig(sub, cfg)) expected := &Config{ - ExporterSettings: config.NewExporterSettings(config.NewComponentID("tanzuobservability")), + ExporterSettings: config.NewExporterSettings(component.NewID("tanzuobservability")), Traces: TracesConfig{ HTTPClientSettings: confighttp.HTTPClientSettings{Endpoint: "http://localhost:40001"}, }, diff --git a/exporter/tanzuobservabilityexporter/exporter.go b/exporter/tanzuobservabilityexporter/exporter.go index 300bf6e2359c..d7fa1d46bb92 100644 --- a/exporter/tanzuobservabilityexporter/exporter.go +++ b/exporter/tanzuobservabilityexporter/exporter.go @@ -22,7 +22,6 @@ import ( "github.com/google/uuid" "github.com/wavefronthq/wavefront-sdk-go/senders" "go.opentelemetry.io/collector/component" - "go.opentelemetry.io/collector/config" "go.opentelemetry.io/collector/pdata/ptrace" "go.uber.org/multierr" "go.uber.org/zap" @@ -62,7 +61,7 @@ type tracesExporter struct { logger *zap.Logger } -func newTracesExporter(settings component.ExporterCreateSettings, c config.Exporter) (*tracesExporter, error) { +func newTracesExporter(settings component.ExporterCreateSettings, c component.ExporterConfig) (*tracesExporter, error) { cfg, ok := c.(*Config) if !ok { return nil, fmt.Errorf("invalid config: %#v", c) diff --git a/exporter/tanzuobservabilityexporter/factory.go b/exporter/tanzuobservabilityexporter/factory.go index bf5fecda5ddb..a2422bcb6f82 100644 --- a/exporter/tanzuobservabilityexporter/factory.go +++ b/exporter/tanzuobservabilityexporter/factory.go @@ -41,9 +41,9 @@ func NewFactory() component.ExporterFactory { ) } -func createDefaultConfig() config.Exporter { +func createDefaultConfig() component.ExporterConfig { return &Config{ - ExporterSettings: config.NewExporterSettings(config.NewComponentID(exporterType)), + ExporterSettings: config.NewExporterSettings(component.NewID(exporterType)), QueueSettings: exporterhelper.NewDefaultQueueSettings(), RetrySettings: exporterhelper.NewDefaultRetrySettings(), } @@ -54,7 +54,7 @@ func createDefaultConfig() config.Exporter { func createTracesExporter( ctx context.Context, set component.ExporterCreateSettings, - cfg config.Exporter, + cfg component.ExporterConfig, ) (component.TracesExporter, error) { exp, err := newTracesExporter(set, cfg) if err != nil { @@ -77,7 +77,7 @@ func createTracesExporter( func createMetricsExporter( ctx context.Context, set component.ExporterCreateSettings, - cfg config.Exporter, + cfg component.ExporterConfig, ) (component.MetricsExporter, error) { exp, err := newMetricsExporter(set, cfg, createMetricsConsumer) if err != nil { diff --git a/exporter/tanzuobservabilityexporter/factory_test.go b/exporter/tanzuobservabilityexporter/factory_test.go index e5a35332c6b1..a6544d1d7ca8 100644 --- a/exporter/tanzuobservabilityexporter/factory_test.go +++ b/exporter/tanzuobservabilityexporter/factory_test.go @@ -21,13 +21,12 @@ import ( "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" "go.opentelemetry.io/collector/component/componenttest" - "go.opentelemetry.io/collector/config/configtest" ) func TestCreateDefaultConfig(t *testing.T) { cfg := createDefaultConfig() assert.NotNil(t, cfg, "failed to create default config") - require.NoError(t, configtest.CheckConfigStruct(cfg)) + require.NoError(t, componenttest.CheckConfigStruct(cfg)) actual, ok := cfg.(*Config) require.True(t, ok, "invalid Config: %#v", cfg) diff --git a/exporter/tanzuobservabilityexporter/go.mod b/exporter/tanzuobservabilityexporter/go.mod index 2cac6d221060..eda8d9fbecfb 100644 --- a/exporter/tanzuobservabilityexporter/go.mod +++ b/exporter/tanzuobservabilityexporter/go.mod @@ -8,9 +8,9 @@ require ( github.com/open-telemetry/opentelemetry-collector-contrib/pkg/resourcetotelemetry v0.63.0 github.com/stretchr/testify v1.8.1 github.com/wavefronthq/wavefront-sdk-go v0.10.4 - go.opentelemetry.io/collector v0.63.2-0.20221104003159-6b27644724d8 - go.opentelemetry.io/collector/pdata v0.63.2-0.20221104003159-6b27644724d8 - go.opentelemetry.io/collector/semconv v0.63.2-0.20221104003159-6b27644724d8 + go.opentelemetry.io/collector v0.63.2-0.20221108014805-0b08d5316426 + go.opentelemetry.io/collector/pdata v0.63.2-0.20221108014805-0b08d5316426 + go.opentelemetry.io/collector/semconv v0.63.2-0.20221108014805-0b08d5316426 go.uber.org/atomic v1.10.0 go.uber.org/multierr v1.8.0 go.uber.org/zap v1.23.0 @@ -38,7 +38,7 @@ require ( github.com/pmezard/go-difflib v1.0.0 // indirect github.com/rogpeppe/go-internal v1.6.1 // indirect github.com/rs/cors v1.8.2 // indirect - go.opencensus.io v0.23.0 // indirect + go.opencensus.io v0.24.0 // 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/tanzuobservabilityexporter/go.sum b/exporter/tanzuobservabilityexporter/go.sum index 3af126e6c5ed..fe1c91471871 100644 --- a/exporter/tanzuobservabilityexporter/go.sum +++ b/exporter/tanzuobservabilityexporter/go.sum @@ -239,7 +239,7 @@ github.com/prometheus/client_golang v0.9.1/go.mod h1:7SWBe2y4D6OKWSNQJUaRYU/AaXP github.com/prometheus/client_golang v1.0.0/go.mod h1:db9x61etRT2tGnBNRi70OPL5FsnadC4Ky3P0J6CfImo= github.com/prometheus/client_golang v1.7.1/go.mod h1:PY5Wy2awLA44sXw4AOSfFBetzPP4j5+D6mVACh+pe2M= github.com/prometheus/client_golang v1.11.1/go.mod h1:Z6t4BnS23TR94PD6BsDNk8yVqroYurpAkEiz0P2BEV0= -github.com/prometheus/client_golang v1.13.0 h1:b71QUfeo5M8gq2+evJdTPfZhYMAU0uKPkyPJ7TPsloU= +github.com/prometheus/client_golang v1.13.1 h1:3gMjIY2+/hzmqhtUC/aQNYldJA6DtH3CgQvwS+02K1c= github.com/prometheus/client_model v0.0.0-20180712105110-5c3871d89910/go.mod h1:MbSGuTsp3dbXC40dX6PRTWyKYBIrTGTE9sqQNg2J8bo= github.com/prometheus/client_model v0.0.0-20190129233127-fd36f4220a90/go.mod h1:xMI15A0UPsDsEKsMN9yxemIoYk6Tm2C1GtYGdfGttqA= github.com/prometheus/client_model v0.0.0-20190812154241-14fe0d1b01d4/go.mod h1:xMI15A0UPsDsEKsMN9yxemIoYk6Tm2C1GtYGdfGttqA= @@ -278,7 +278,6 @@ github.com/stretchr/testify v1.2.2/go.mod h1:a8OnRcib4nhh0OaRAV+Yts87kKdq0PP7pXf github.com/stretchr/testify v1.3.0/go.mod h1:M5WIy9Dh21IEIfnGCwXGc5bZfKNJtfHm1UVUgZn+9EI= github.com/stretchr/testify v1.4.0/go.mod h1:j7eGeouHqKxXV5pUuKE4zz7dFj8WfuZ+81PSLYec5m4= github.com/stretchr/testify v1.5.1/go.mod h1:5W2xD1RspED5o8YsWQXVCued0rvSQ+mT+I5cxcmMvtA= -github.com/stretchr/testify v1.6.1/go.mod h1:6Fq8oRcR53rry900zMqJjRRixrwX3KX962/h/Wwjteg= github.com/stretchr/testify v1.7.0/go.mod h1:6Fq8oRcR53rry900zMqJjRRixrwX3KX962/h/Wwjteg= github.com/stretchr/testify v1.7.1/go.mod h1:6Fq8oRcR53rry900zMqJjRRixrwX3KX962/h/Wwjteg= github.com/stretchr/testify v1.8.0/go.mod h1:yNjHg4UonilssWZ8iaSj1OCr/vHnekPRkoO+kdMU+MU= @@ -292,14 +291,14 @@ 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.opencensus.io v0.23.0 h1:gqCw0LfLxScz8irSi8exQc7fyQ0fKQU/qnC/X8+V/1M= -go.opencensus.io v0.23.0/go.mod h1:XItmlyltB5F7CS4xOC1DcqMoFqwtC6OG2xF7mCv7P7E= -go.opentelemetry.io/collector v0.63.2-0.20221104003159-6b27644724d8 h1:rOT5HzXXfSISc6FiH012zH2/EFjp37UXfjEqj5BpkWQ= -go.opentelemetry.io/collector v0.63.2-0.20221104003159-6b27644724d8/go.mod h1:JVmeZXugK4ondC6KQgrHTHWiF4JttpG5k6dWPMt62+k= -go.opentelemetry.io/collector/pdata v0.63.2-0.20221104003159-6b27644724d8 h1:7xeTQjfsOm9eogQeIxjSEhlik9qsbBGsnmkQHfyKaRE= -go.opentelemetry.io/collector/pdata v0.63.2-0.20221104003159-6b27644724d8/go.mod h1:IzvXUGQml2mrnvdb8zIlEW3qQs9oFLdD2hLwJdZ+pek= -go.opentelemetry.io/collector/semconv v0.63.2-0.20221104003159-6b27644724d8 h1:jm0sNPyqo6S165QjQYMBHB2nK50wlJbMYM03Yr3Eo2k= -go.opentelemetry.io/collector/semconv v0.63.2-0.20221104003159-6b27644724d8/go.mod h1:5o9yhOa+ABt7g2E5JABDxGZ1PQPbtfxrKNbYn+LOTXU= +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.63.2-0.20221108014805-0b08d5316426 h1:z/wLTMh7/vNxcFUDa5uG7/IPE3tYx6pzCWPV41ghyV8= +go.opentelemetry.io/collector v0.63.2-0.20221108014805-0b08d5316426/go.mod h1:+Zb70q0Rq17dA9FcHTiTjW6g96lvJ8kAZ0c+eWNkAv0= +go.opentelemetry.io/collector/pdata v0.63.2-0.20221108014805-0b08d5316426 h1:wKDpgP0Tx/gWI2SgDGAY1OTSeihhDivbbRqFR79IGTc= +go.opentelemetry.io/collector/pdata v0.63.2-0.20221108014805-0b08d5316426/go.mod h1:IzvXUGQml2mrnvdb8zIlEW3qQs9oFLdD2hLwJdZ+pek= +go.opentelemetry.io/collector/semconv v0.63.2-0.20221108014805-0b08d5316426 h1:pqIl7OC531J6i9ttBCj3zLmZI/BSF4q323YpK0GgKGk= +go.opentelemetry.io/collector/semconv v0.63.2-0.20221108014805-0b08d5316426/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/tanzuobservabilityexporter/metrics_exporter.go b/exporter/tanzuobservabilityexporter/metrics_exporter.go index e4a9890b149d..dd7765d6069a 100644 --- a/exporter/tanzuobservabilityexporter/metrics_exporter.go +++ b/exporter/tanzuobservabilityexporter/metrics_exporter.go @@ -20,7 +20,6 @@ import ( "github.com/wavefronthq/wavefront-sdk-go/senders" "go.opentelemetry.io/collector/component" - "go.opentelemetry.io/collector/config" "go.opentelemetry.io/collector/pdata/pmetric" ) @@ -53,7 +52,7 @@ func createMetricsConsumer(endpoint string, settings component.TelemetrySettings type metricsConsumerCreator func(endpoint string, settings component.TelemetrySettings, otelVersion string) ( *metricsConsumer, error) -func newMetricsExporter(settings component.ExporterCreateSettings, c config.Exporter, creator metricsConsumerCreator) (*metricsExporter, error) { +func newMetricsExporter(settings component.ExporterCreateSettings, c component.ExporterConfig, creator metricsConsumerCreator) (*metricsExporter, error) { cfg, ok := c.(*Config) if !ok { return nil, fmt.Errorf("invalid config: %#v", c) diff --git a/exporter/tencentcloudlogserviceexporter/config.go b/exporter/tencentcloudlogserviceexporter/config.go index 1051def9b53a..553fb9fdc905 100644 --- a/exporter/tencentcloudlogserviceexporter/config.go +++ b/exporter/tencentcloudlogserviceexporter/config.go @@ -17,6 +17,7 @@ package tencentcloudlogserviceexporter // import "github.com/open-telemetry/open import ( "errors" + "go.opentelemetry.io/collector/component" "go.opentelemetry.io/collector/config" ) @@ -37,7 +38,7 @@ type Config struct { SecretKey string `mapstructure:"secret_key"` } -var _ config.Exporter = (*Config)(nil) +var _ component.ExporterConfig = (*Config)(nil) // Validate checks if the exporter configuration is valid func (cfg *Config) Validate() error { diff --git a/exporter/tencentcloudlogserviceexporter/config_test.go b/exporter/tencentcloudlogserviceexporter/config_test.go index f2107c96b4ff..8fa71b058d19 100644 --- a/exporter/tencentcloudlogserviceexporter/config_test.go +++ b/exporter/tencentcloudlogserviceexporter/config_test.go @@ -20,6 +20,7 @@ import ( "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" + "go.opentelemetry.io/collector/component" "go.opentelemetry.io/collector/config" "go.opentelemetry.io/collector/confmap/confmaptest" ) @@ -31,13 +32,13 @@ func TestLoadConfig(t *testing.T) { require.NoError(t, err) tests := []struct { - id config.ComponentID - expected config.Exporter + id component.ID + expected component.ExporterConfig }{ { - id: config.NewComponentIDWithName(typeStr, "2"), + id: component.NewIDWithName(typeStr, "2"), expected: &Config{ - ExporterSettings: config.NewExporterSettings(config.NewComponentID(typeStr)), + ExporterSettings: config.NewExporterSettings(component.NewID(typeStr)), Region: "ap-beijing", LogSet: "demo-logset", Topic: "demo-topic", @@ -54,7 +55,7 @@ func TestLoadConfig(t *testing.T) { sub, err := cm.Sub(tt.id.String()) require.NoError(t, err) - require.NoError(t, config.UnmarshalExporter(sub, cfg)) + require.NoError(t, component.UnmarshalExporterConfig(sub, cfg)) assert.NoError(t, cfg.Validate()) assert.Equal(t, tt.expected, cfg) diff --git a/exporter/tencentcloudlogserviceexporter/factory.go b/exporter/tencentcloudlogserviceexporter/factory.go index 0783dd84ccc1..0282b1035298 100644 --- a/exporter/tencentcloudlogserviceexporter/factory.go +++ b/exporter/tencentcloudlogserviceexporter/factory.go @@ -37,16 +37,16 @@ func NewFactory() component.ExporterFactory { } // CreateDefaultConfig creates the default configuration for exporter. -func createDefaultConfig() config.Exporter { +func createDefaultConfig() component.ExporterConfig { return &Config{ - ExporterSettings: config.NewExporterSettings(config.NewComponentID(typeStr)), + ExporterSettings: config.NewExporterSettings(component.NewID(typeStr)), } } func createLogsExporter( _ context.Context, set component.ExporterCreateSettings, - cfg config.Exporter, + cfg component.ExporterConfig, ) (exp component.LogsExporter, err error) { return newLogsExporter(set, cfg) } diff --git a/exporter/tencentcloudlogserviceexporter/go.mod b/exporter/tencentcloudlogserviceexporter/go.mod index 4709c89ee684..8c8508ff38bf 100644 --- a/exporter/tencentcloudlogserviceexporter/go.mod +++ b/exporter/tencentcloudlogserviceexporter/go.mod @@ -6,13 +6,13 @@ 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.526 - go.opentelemetry.io/collector v0.63.2-0.20221104003159-6b27644724d8 + go.opentelemetry.io/collector v0.63.2-0.20221108014805-0b08d5316426 go.uber.org/zap v1.23.0 ) require ( - go.opentelemetry.io/collector/pdata v0.63.2-0.20221104003159-6b27644724d8 - go.opentelemetry.io/collector/semconv v0.63.2-0.20221104003159-6b27644724d8 + go.opentelemetry.io/collector/pdata v0.63.2-0.20221108014805-0b08d5316426 + go.opentelemetry.io/collector/semconv v0.63.2-0.20221108014805-0b08d5316426 google.golang.org/protobuf v1.28.1 ) @@ -32,7 +32,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.opencensus.io v0.23.0 // indirect + go.opencensus.io v0.24.0 // 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 1548761a5464..c0dbc09d5e08 100644 --- a/exporter/tencentcloudlogserviceexporter/go.sum +++ b/exporter/tencentcloudlogserviceexporter/go.sum @@ -239,7 +239,7 @@ github.com/prometheus/client_golang v0.9.1/go.mod h1:7SWBe2y4D6OKWSNQJUaRYU/AaXP github.com/prometheus/client_golang v1.0.0/go.mod h1:db9x61etRT2tGnBNRi70OPL5FsnadC4Ky3P0J6CfImo= github.com/prometheus/client_golang v1.7.1/go.mod h1:PY5Wy2awLA44sXw4AOSfFBetzPP4j5+D6mVACh+pe2M= github.com/prometheus/client_golang v1.11.1/go.mod h1:Z6t4BnS23TR94PD6BsDNk8yVqroYurpAkEiz0P2BEV0= -github.com/prometheus/client_golang v1.13.0 h1:b71QUfeo5M8gq2+evJdTPfZhYMAU0uKPkyPJ7TPsloU= +github.com/prometheus/client_golang v1.13.1 h1:3gMjIY2+/hzmqhtUC/aQNYldJA6DtH3CgQvwS+02K1c= github.com/prometheus/client_model v0.0.0-20180712105110-5c3871d89910/go.mod h1:MbSGuTsp3dbXC40dX6PRTWyKYBIrTGTE9sqQNg2J8bo= github.com/prometheus/client_model v0.0.0-20190129233127-fd36f4220a90/go.mod h1:xMI15A0UPsDsEKsMN9yxemIoYk6Tm2C1GtYGdfGttqA= github.com/prometheus/client_model v0.0.0-20190812154241-14fe0d1b01d4/go.mod h1:xMI15A0UPsDsEKsMN9yxemIoYk6Tm2C1GtYGdfGttqA= @@ -277,7 +277,6 @@ github.com/stretchr/testify v1.2.2/go.mod h1:a8OnRcib4nhh0OaRAV+Yts87kKdq0PP7pXf github.com/stretchr/testify v1.3.0/go.mod h1:M5WIy9Dh21IEIfnGCwXGc5bZfKNJtfHm1UVUgZn+9EI= github.com/stretchr/testify v1.4.0/go.mod h1:j7eGeouHqKxXV5pUuKE4zz7dFj8WfuZ+81PSLYec5m4= github.com/stretchr/testify v1.5.1/go.mod h1:5W2xD1RspED5o8YsWQXVCued0rvSQ+mT+I5cxcmMvtA= -github.com/stretchr/testify v1.6.1/go.mod h1:6Fq8oRcR53rry900zMqJjRRixrwX3KX962/h/Wwjteg= github.com/stretchr/testify v1.7.0/go.mod h1:6Fq8oRcR53rry900zMqJjRRixrwX3KX962/h/Wwjteg= github.com/stretchr/testify v1.7.1/go.mod h1:6Fq8oRcR53rry900zMqJjRRixrwX3KX962/h/Wwjteg= github.com/stretchr/testify v1.8.0/go.mod h1:yNjHg4UonilssWZ8iaSj1OCr/vHnekPRkoO+kdMU+MU= @@ -291,14 +290,14 @@ 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.opencensus.io v0.23.0 h1:gqCw0LfLxScz8irSi8exQc7fyQ0fKQU/qnC/X8+V/1M= -go.opencensus.io v0.23.0/go.mod h1:XItmlyltB5F7CS4xOC1DcqMoFqwtC6OG2xF7mCv7P7E= -go.opentelemetry.io/collector v0.63.2-0.20221104003159-6b27644724d8 h1:rOT5HzXXfSISc6FiH012zH2/EFjp37UXfjEqj5BpkWQ= -go.opentelemetry.io/collector v0.63.2-0.20221104003159-6b27644724d8/go.mod h1:JVmeZXugK4ondC6KQgrHTHWiF4JttpG5k6dWPMt62+k= -go.opentelemetry.io/collector/pdata v0.63.2-0.20221104003159-6b27644724d8 h1:7xeTQjfsOm9eogQeIxjSEhlik9qsbBGsnmkQHfyKaRE= -go.opentelemetry.io/collector/pdata v0.63.2-0.20221104003159-6b27644724d8/go.mod h1:IzvXUGQml2mrnvdb8zIlEW3qQs9oFLdD2hLwJdZ+pek= -go.opentelemetry.io/collector/semconv v0.63.2-0.20221104003159-6b27644724d8 h1:jm0sNPyqo6S165QjQYMBHB2nK50wlJbMYM03Yr3Eo2k= -go.opentelemetry.io/collector/semconv v0.63.2-0.20221104003159-6b27644724d8/go.mod h1:5o9yhOa+ABt7g2E5JABDxGZ1PQPbtfxrKNbYn+LOTXU= +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.63.2-0.20221108014805-0b08d5316426 h1:z/wLTMh7/vNxcFUDa5uG7/IPE3tYx6pzCWPV41ghyV8= +go.opentelemetry.io/collector v0.63.2-0.20221108014805-0b08d5316426/go.mod h1:+Zb70q0Rq17dA9FcHTiTjW6g96lvJ8kAZ0c+eWNkAv0= +go.opentelemetry.io/collector/pdata v0.63.2-0.20221108014805-0b08d5316426 h1:wKDpgP0Tx/gWI2SgDGAY1OTSeihhDivbbRqFR79IGTc= +go.opentelemetry.io/collector/pdata v0.63.2-0.20221108014805-0b08d5316426/go.mod h1:IzvXUGQml2mrnvdb8zIlEW3qQs9oFLdD2hLwJdZ+pek= +go.opentelemetry.io/collector/semconv v0.63.2-0.20221108014805-0b08d5316426 h1:pqIl7OC531J6i9ttBCj3zLmZI/BSF4q323YpK0GgKGk= +go.opentelemetry.io/collector/semconv v0.63.2-0.20221108014805-0b08d5316426/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/tencentcloudlogserviceexporter/logs_exporter.go b/exporter/tencentcloudlogserviceexporter/logs_exporter.go index 9e55db44caff..08d7da964a7e 100644 --- a/exporter/tencentcloudlogserviceexporter/logs_exporter.go +++ b/exporter/tencentcloudlogserviceexporter/logs_exporter.go @@ -18,14 +18,13 @@ import ( "context" "go.opentelemetry.io/collector/component" - "go.opentelemetry.io/collector/config" "go.opentelemetry.io/collector/exporter/exporterhelper" "go.opentelemetry.io/collector/pdata/plog" "go.uber.org/zap" ) // newLogsExporter return a new LogService logs exporter. -func newLogsExporter(set component.ExporterCreateSettings, cfg config.Exporter) (component.LogsExporter, error) { +func newLogsExporter(set component.ExporterCreateSettings, cfg component.ExporterConfig) (component.LogsExporter, error) { l := &logServiceLogsSender{ logger: set.Logger, } diff --git a/exporter/tencentcloudlogserviceexporter/logs_exporter_test.go b/exporter/tencentcloudlogserviceexporter/logs_exporter_test.go index 74633f3ebd33..85bd9c2fb15f 100644 --- a/exporter/tencentcloudlogserviceexporter/logs_exporter_test.go +++ b/exporter/tencentcloudlogserviceexporter/logs_exporter_test.go @@ -21,6 +21,7 @@ import ( "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" + "go.opentelemetry.io/collector/component" "go.opentelemetry.io/collector/component/componenttest" "go.opentelemetry.io/collector/config" "go.opentelemetry.io/collector/pdata/pcommon" @@ -52,7 +53,7 @@ func createSimpleLogData(numberOfLogs int) plog.Logs { func TestNewLogsExporter(t *testing.T) { got, err := newLogsExporter(componenttest.NewNopExporterCreateSettings(), &Config{ - ExporterSettings: config.NewExporterSettings(config.NewComponentID(typeStr)), + ExporterSettings: config.NewExporterSettings(component.NewID(typeStr)), Region: "ap-beijing", LogSet: "demo-logset", Topic: "demo-topic", diff --git a/exporter/zipkinexporter/config.go b/exporter/zipkinexporter/config.go index 0c5a0d2a0fd4..988b2b9f9610 100644 --- a/exporter/zipkinexporter/config.go +++ b/exporter/zipkinexporter/config.go @@ -15,6 +15,7 @@ package zipkinexporter // import "github.com/open-telemetry/opentelemetry-collector-contrib/exporter/zipkinexporter" import ( + "go.opentelemetry.io/collector/component" "go.opentelemetry.io/collector/config" "go.opentelemetry.io/collector/config/confighttp" "go.opentelemetry.io/collector/exporter/exporterhelper" @@ -35,7 +36,7 @@ type Config struct { DefaultServiceName string `mapstructure:"default_service_name"` } -var _ config.Exporter = (*Config)(nil) +var _ component.ExporterConfig = (*Config)(nil) // Validate checks if the exporter configuration is valid func (cfg *Config) Validate() error { diff --git a/exporter/zipkinexporter/config_test.go b/exporter/zipkinexporter/config_test.go index b4b50c0ade5f..8ff58c38e8cd 100644 --- a/exporter/zipkinexporter/config_test.go +++ b/exporter/zipkinexporter/config_test.go @@ -21,6 +21,7 @@ import ( "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" + "go.opentelemetry.io/collector/component" "go.opentelemetry.io/collector/config" "go.opentelemetry.io/collector/config/confighttp" "go.opentelemetry.io/collector/confmap/confmaptest" @@ -38,17 +39,17 @@ func TestLoadConfig(t *testing.T) { defaultCfg.Endpoint = "http://some.location.org:9411/api/v2/spans" tests := []struct { - id config.ComponentID - expected config.Exporter + id component.ID + expected component.ExporterConfig }{ { - id: config.NewComponentIDWithName(typeStr, ""), + id: component.NewIDWithName(typeStr, ""), expected: defaultCfg, }, { - id: config.NewComponentIDWithName(typeStr, "2"), + id: component.NewIDWithName(typeStr, "2"), expected: &Config{ - ExporterSettings: config.NewExporterSettings(config.NewComponentID(typeStr)), + ExporterSettings: config.NewExporterSettings(component.NewID(typeStr)), RetrySettings: exporterhelper.RetrySettings{ Enabled: true, InitialInterval: 10 * time.Second, @@ -78,7 +79,7 @@ func TestLoadConfig(t *testing.T) { sub, err := cm.Sub(tt.id.String()) require.NoError(t, err) - require.NoError(t, config.UnmarshalExporter(sub, cfg)) + require.NoError(t, component.UnmarshalExporterConfig(sub, cfg)) assert.NoError(t, cfg.Validate()) assert.Equal(t, tt.expected, cfg) diff --git a/exporter/zipkinexporter/factory.go b/exporter/zipkinexporter/factory.go index 9eaacb99da97..71e7f7ee324a 100644 --- a/exporter/zipkinexporter/factory.go +++ b/exporter/zipkinexporter/factory.go @@ -46,9 +46,9 @@ func NewFactory() component.ExporterFactory { component.WithTracesExporter(createTracesExporter, stability)) } -func createDefaultConfig() config.Exporter { +func createDefaultConfig() component.ExporterConfig { return &Config{ - ExporterSettings: config.NewExporterSettings(config.NewComponentID(typeStr)), + ExporterSettings: config.NewExporterSettings(component.NewID(typeStr)), RetrySettings: exporterhelper.NewDefaultRetrySettings(), QueueSettings: exporterhelper.NewDefaultQueueSettings(), HTTPClientSettings: confighttp.HTTPClientSettings{ @@ -64,7 +64,7 @@ func createDefaultConfig() config.Exporter { func createTracesExporter( ctx context.Context, set component.ExporterCreateSettings, - cfg config.Exporter, + cfg component.ExporterConfig, ) (component.TracesExporter, error) { zc := cfg.(*Config) diff --git a/exporter/zipkinexporter/factory_test.go b/exporter/zipkinexporter/factory_test.go index bac5cd70ec9a..9d4581f61299 100644 --- a/exporter/zipkinexporter/factory_test.go +++ b/exporter/zipkinexporter/factory_test.go @@ -20,13 +20,12 @@ import ( "github.com/stretchr/testify/assert" "go.opentelemetry.io/collector/component/componenttest" - "go.opentelemetry.io/collector/config/configtest" ) func TestCreateDefaultConfig(t *testing.T) { cfg := createDefaultConfig() assert.NotNil(t, cfg, "failed to create default config") - assert.NoError(t, configtest.CheckConfigStruct(cfg)) + assert.NoError(t, componenttest.CheckConfigStruct(cfg)) } func TestCreateInstanceViaFactory(t *testing.T) { diff --git a/exporter/zipkinexporter/go.mod b/exporter/zipkinexporter/go.mod index 0ffc4cce339b..f6ec42b72e78 100644 --- a/exporter/zipkinexporter/go.mod +++ b/exporter/zipkinexporter/go.mod @@ -8,8 +8,8 @@ require ( github.com/open-telemetry/opentelemetry-collector-contrib/receiver/zipkinreceiver v0.63.0 github.com/openzipkin/zipkin-go v0.4.1 github.com/stretchr/testify v1.8.1 - go.opentelemetry.io/collector v0.63.2-0.20221104003159-6b27644724d8 - go.opentelemetry.io/collector/pdata v0.63.2-0.20221104003159-6b27644724d8 + go.opentelemetry.io/collector v0.63.2-0.20221108014805-0b08d5316426 + go.opentelemetry.io/collector/pdata v0.63.2-0.20221108014805-0b08d5316426 ) require ( @@ -37,8 +37,8 @@ require ( github.com/rs/cors v1.8.2 // indirect 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.23.0 // indirect - go.opentelemetry.io/collector/semconv v0.63.2-0.20221104003159-6b27644724d8 // indirect + go.opencensus.io v0.24.0 // indirect + go.opentelemetry.io/collector/semconv v0.63.2-0.20221108014805-0b08d5316426 // 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 25f96e453ba2..efb9b01750a5 100644 --- a/exporter/zipkinexporter/go.sum +++ b/exporter/zipkinexporter/go.sum @@ -242,7 +242,7 @@ github.com/prometheus/client_golang v0.9.1/go.mod h1:7SWBe2y4D6OKWSNQJUaRYU/AaXP github.com/prometheus/client_golang v1.0.0/go.mod h1:db9x61etRT2tGnBNRi70OPL5FsnadC4Ky3P0J6CfImo= github.com/prometheus/client_golang v1.7.1/go.mod h1:PY5Wy2awLA44sXw4AOSfFBetzPP4j5+D6mVACh+pe2M= github.com/prometheus/client_golang v1.11.1/go.mod h1:Z6t4BnS23TR94PD6BsDNk8yVqroYurpAkEiz0P2BEV0= -github.com/prometheus/client_golang v1.13.0 h1:b71QUfeo5M8gq2+evJdTPfZhYMAU0uKPkyPJ7TPsloU= +github.com/prometheus/client_golang v1.13.1 h1:3gMjIY2+/hzmqhtUC/aQNYldJA6DtH3CgQvwS+02K1c= github.com/prometheus/client_model v0.0.0-20180712105110-5c3871d89910/go.mod h1:MbSGuTsp3dbXC40dX6PRTWyKYBIrTGTE9sqQNg2J8bo= github.com/prometheus/client_model v0.0.0-20190129233127-fd36f4220a90/go.mod h1:xMI15A0UPsDsEKsMN9yxemIoYk6Tm2C1GtYGdfGttqA= github.com/prometheus/client_model v0.0.0-20190812154241-14fe0d1b01d4/go.mod h1:xMI15A0UPsDsEKsMN9yxemIoYk6Tm2C1GtYGdfGttqA= @@ -281,7 +281,6 @@ github.com/stretchr/testify v1.2.2/go.mod h1:a8OnRcib4nhh0OaRAV+Yts87kKdq0PP7pXf github.com/stretchr/testify v1.3.0/go.mod h1:M5WIy9Dh21IEIfnGCwXGc5bZfKNJtfHm1UVUgZn+9EI= github.com/stretchr/testify v1.4.0/go.mod h1:j7eGeouHqKxXV5pUuKE4zz7dFj8WfuZ+81PSLYec5m4= github.com/stretchr/testify v1.5.1/go.mod h1:5W2xD1RspED5o8YsWQXVCued0rvSQ+mT+I5cxcmMvtA= -github.com/stretchr/testify v1.6.1/go.mod h1:6Fq8oRcR53rry900zMqJjRRixrwX3KX962/h/Wwjteg= github.com/stretchr/testify v1.7.0/go.mod h1:6Fq8oRcR53rry900zMqJjRRixrwX3KX962/h/Wwjteg= github.com/stretchr/testify v1.7.1/go.mod h1:6Fq8oRcR53rry900zMqJjRRixrwX3KX962/h/Wwjteg= github.com/stretchr/testify v1.8.0/go.mod h1:yNjHg4UonilssWZ8iaSj1OCr/vHnekPRkoO+kdMU+MU= @@ -297,14 +296,14 @@ 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.opencensus.io v0.23.0 h1:gqCw0LfLxScz8irSi8exQc7fyQ0fKQU/qnC/X8+V/1M= -go.opencensus.io v0.23.0/go.mod h1:XItmlyltB5F7CS4xOC1DcqMoFqwtC6OG2xF7mCv7P7E= -go.opentelemetry.io/collector v0.63.2-0.20221104003159-6b27644724d8 h1:rOT5HzXXfSISc6FiH012zH2/EFjp37UXfjEqj5BpkWQ= -go.opentelemetry.io/collector v0.63.2-0.20221104003159-6b27644724d8/go.mod h1:JVmeZXugK4ondC6KQgrHTHWiF4JttpG5k6dWPMt62+k= -go.opentelemetry.io/collector/pdata v0.63.2-0.20221104003159-6b27644724d8 h1:7xeTQjfsOm9eogQeIxjSEhlik9qsbBGsnmkQHfyKaRE= -go.opentelemetry.io/collector/pdata v0.63.2-0.20221104003159-6b27644724d8/go.mod h1:IzvXUGQml2mrnvdb8zIlEW3qQs9oFLdD2hLwJdZ+pek= -go.opentelemetry.io/collector/semconv v0.63.2-0.20221104003159-6b27644724d8 h1:jm0sNPyqo6S165QjQYMBHB2nK50wlJbMYM03Yr3Eo2k= -go.opentelemetry.io/collector/semconv v0.63.2-0.20221104003159-6b27644724d8/go.mod h1:5o9yhOa+ABt7g2E5JABDxGZ1PQPbtfxrKNbYn+LOTXU= +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.63.2-0.20221108014805-0b08d5316426 h1:z/wLTMh7/vNxcFUDa5uG7/IPE3tYx6pzCWPV41ghyV8= +go.opentelemetry.io/collector v0.63.2-0.20221108014805-0b08d5316426/go.mod h1:+Zb70q0Rq17dA9FcHTiTjW6g96lvJ8kAZ0c+eWNkAv0= +go.opentelemetry.io/collector/pdata v0.63.2-0.20221108014805-0b08d5316426 h1:wKDpgP0Tx/gWI2SgDGAY1OTSeihhDivbbRqFR79IGTc= +go.opentelemetry.io/collector/pdata v0.63.2-0.20221108014805-0b08d5316426/go.mod h1:IzvXUGQml2mrnvdb8zIlEW3qQs9oFLdD2hLwJdZ+pek= +go.opentelemetry.io/collector/semconv v0.63.2-0.20221108014805-0b08d5316426 h1:pqIl7OC531J6i9ttBCj3zLmZI/BSF4q323YpK0GgKGk= +go.opentelemetry.io/collector/semconv v0.63.2-0.20221108014805-0b08d5316426/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/zipkinexporter/zipkin_test.go b/exporter/zipkinexporter/zipkin_test.go index 9659e13f92d8..3b653899243a 100644 --- a/exporter/zipkinexporter/zipkin_test.go +++ b/exporter/zipkinexporter/zipkin_test.go @@ -29,6 +29,7 @@ import ( zipkinreporter "github.com/openzipkin/zipkin-go/reporter" "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" + "go.opentelemetry.io/collector/component" "go.opentelemetry.io/collector/component/componenttest" "go.opentelemetry.io/collector/config" "go.opentelemetry.io/collector/config/confighttp" @@ -76,7 +77,7 @@ func TestZipkinExporter_roundtripJSON(t *testing.T) { // Run the Zipkin receiver to "receive spans upload from a client application" addr := testutil.GetAvailableLocalAddress(t) recvCfg := &zipkinreceiver.Config{ - ReceiverSettings: config.NewReceiverSettings(config.NewComponentIDWithName("zipkin", "receiver")), + ReceiverSettings: config.NewReceiverSettings(component.NewIDWithName("zipkin", "receiver")), HTTPServerSettings: confighttp.HTTPServerSettings{ Endpoint: addr, }, @@ -325,7 +326,7 @@ func TestZipkinExporter_roundtripProto(t *testing.T) { // Run the Zipkin receiver to "receive spans upload from a client application" addr := testutil.GetAvailableLocalAddress(t) recvCfg := &zipkinreceiver.Config{ - ReceiverSettings: config.NewReceiverSettings(config.NewComponentIDWithName("zipkin", "receiver")), + ReceiverSettings: config.NewReceiverSettings(component.NewIDWithName("zipkin", "receiver")), HTTPServerSettings: confighttp.HTTPServerSettings{ Endpoint: addr, }, diff --git a/extension/asapauthextension/config_test.go b/extension/asapauthextension/config_test.go index 8ae829db6a70..ae7cc5136654 100644 --- a/extension/asapauthextension/config_test.go +++ b/extension/asapauthextension/config_test.go @@ -21,6 +21,7 @@ import ( "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" + "go.opentelemetry.io/collector/component" "go.opentelemetry.io/collector/config" "go.opentelemetry.io/collector/confmap/confmaptest" ) @@ -38,14 +39,14 @@ func TestLoadConfig(t *testing.T) { t.Parallel() tests := []struct { - id config.ComponentID - expected config.Extension + id component.ID + expected component.ExtensionConfig expectedErr error }{ { - id: config.NewComponentID(typeStr), + id: component.NewID(typeStr), expected: &Config{ - ExtensionSettings: config.NewExtensionSettings(config.NewComponentID(typeStr)), + ExtensionSettings: config.NewExtensionSettings(component.NewID(typeStr)), TTL: 60 * time.Second, Audience: []string{"test_service1", "test_service2"}, Issuer: "test_issuer", @@ -54,19 +55,19 @@ func TestLoadConfig(t *testing.T) { }, }, { - id: config.NewComponentIDWithName(typeStr, "missingkeyid"), + id: component.NewIDWithName(typeStr, "missingkeyid"), expectedErr: errNoKeyIDProvided, }, { - id: config.NewComponentIDWithName(typeStr, "missingissuer"), + id: component.NewIDWithName(typeStr, "missingissuer"), expectedErr: errNoIssuerProvided, }, { - id: config.NewComponentIDWithName(typeStr, "missingaudience"), + id: component.NewIDWithName(typeStr, "missingaudience"), expectedErr: errNoAudienceProvided, }, { - id: config.NewComponentIDWithName(typeStr, "missingpk"), + id: component.NewIDWithName(typeStr, "missingpk"), expectedErr: errNoPrivateKeyProvided, }, } @@ -78,7 +79,7 @@ func TestLoadConfig(t *testing.T) { cfg := factory.CreateDefaultConfig() sub, err := cm.Sub(tt.id.String()) require.NoError(t, err) - require.NoError(t, config.UnmarshalExtension(sub, cfg)) + require.NoError(t, component.UnmarshalExtensionConfig(sub, cfg)) if tt.expectedErr != nil { assert.ErrorIs(t, cfg.Validate(), tt.expectedErr) return diff --git a/extension/asapauthextension/factory.go b/extension/asapauthextension/factory.go index 3f0df5f2a33c..4034064f3b47 100644 --- a/extension/asapauthextension/factory.go +++ b/extension/asapauthextension/factory.go @@ -36,12 +36,12 @@ func NewFactory() component.ExtensionFactory { ) } -func createExtension(_ context.Context, _ component.ExtensionCreateSettings, cfg config.Extension) (component.Extension, error) { +func createExtension(_ context.Context, _ component.ExtensionCreateSettings, cfg component.ExtensionConfig) (component.Extension, error) { return createASAPClientAuthenticator(cfg.(*Config)) } -func createDefaultConfig() config.Extension { +func createDefaultConfig() component.ExtensionConfig { return &Config{ - ExtensionSettings: config.NewExtensionSettings(config.NewComponentID(typeStr)), + ExtensionSettings: config.NewExtensionSettings(component.NewID(typeStr)), } } diff --git a/extension/asapauthextension/factory_test.go b/extension/asapauthextension/factory_test.go index f871f31da951..e32898afb8f7 100644 --- a/extension/asapauthextension/factory_test.go +++ b/extension/asapauthextension/factory_test.go @@ -19,15 +19,15 @@ import ( "testing" "github.com/stretchr/testify/assert" + "go.opentelemetry.io/collector/component" "go.opentelemetry.io/collector/component/componenttest" "go.opentelemetry.io/collector/config" - "go.opentelemetry.io/collector/config/configtest" ) func TestCreateDefaultConfig(t *testing.T) { // prepare and test expected := &Config{ - ExtensionSettings: config.NewExtensionSettings(config.NewComponentID(typeStr)), + ExtensionSettings: config.NewExtensionSettings(component.NewID(typeStr)), } // test @@ -35,7 +35,7 @@ func TestCreateDefaultConfig(t *testing.T) { // verify assert.Equal(t, expected, cfg) - assert.NoError(t, configtest.CheckConfigStruct(cfg)) + assert.NoError(t, componenttest.CheckConfigStruct(cfg)) } func TestNewFactory(t *testing.T) { diff --git a/extension/asapauthextension/go.mod b/extension/asapauthextension/go.mod index 0715e122c42a..fe3b7918b576 100644 --- a/extension/asapauthextension/go.mod +++ b/extension/asapauthextension/go.mod @@ -6,7 +6,7 @@ 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.63.2-0.20221104003159-6b27644724d8 + go.opentelemetry.io/collector v0.63.2-0.20221108014805-0b08d5316426 go.uber.org/multierr v1.8.0 google.golang.org/grpc v1.50.1 ) @@ -29,7 +29,7 @@ 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.63.2-0.20221104003159-6b27644724d8 // indirect + go.opentelemetry.io/collector/pdata v0.63.2-0.20221108014805-0b08d5316426 // 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 5900456b3716..d04debdac26b 100644 --- a/extension/asapauthextension/go.sum +++ b/extension/asapauthextension/go.sum @@ -276,10 +276,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.63.2-0.20221104003159-6b27644724d8 h1:rOT5HzXXfSISc6FiH012zH2/EFjp37UXfjEqj5BpkWQ= -go.opentelemetry.io/collector v0.63.2-0.20221104003159-6b27644724d8/go.mod h1:JVmeZXugK4ondC6KQgrHTHWiF4JttpG5k6dWPMt62+k= -go.opentelemetry.io/collector/pdata v0.63.2-0.20221104003159-6b27644724d8 h1:7xeTQjfsOm9eogQeIxjSEhlik9qsbBGsnmkQHfyKaRE= -go.opentelemetry.io/collector/pdata v0.63.2-0.20221104003159-6b27644724d8/go.mod h1:IzvXUGQml2mrnvdb8zIlEW3qQs9oFLdD2hLwJdZ+pek= +go.opentelemetry.io/collector v0.63.2-0.20221108014805-0b08d5316426 h1:z/wLTMh7/vNxcFUDa5uG7/IPE3tYx6pzCWPV41ghyV8= +go.opentelemetry.io/collector v0.63.2-0.20221108014805-0b08d5316426/go.mod h1:+Zb70q0Rq17dA9FcHTiTjW6g96lvJ8kAZ0c+eWNkAv0= +go.opentelemetry.io/collector/pdata v0.63.2-0.20221108014805-0b08d5316426 h1:wKDpgP0Tx/gWI2SgDGAY1OTSeihhDivbbRqFR79IGTc= +go.opentelemetry.io/collector/pdata v0.63.2-0.20221108014805-0b08d5316426/go.mod h1:IzvXUGQml2mrnvdb8zIlEW3qQs9oFLdD2hLwJdZ+pek= 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 a5e9f9258af7..9a13fb9b073d 100644 --- a/extension/awsproxy/config_test.go +++ b/extension/awsproxy/config_test.go @@ -20,6 +20,7 @@ import ( "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" + "go.opentelemetry.io/collector/component" "go.opentelemetry.io/collector/config" "go.opentelemetry.io/collector/config/confignet" "go.opentelemetry.io/collector/config/configtls" @@ -32,17 +33,17 @@ func TestLoadConfig(t *testing.T) { t.Parallel() tests := []struct { - id config.ComponentID - expected config.Extension + id component.ID + expected component.ExtensionConfig }{ { - id: config.NewComponentID(typeStr), + id: component.NewID(typeStr), expected: NewFactory().CreateDefaultConfig(), }, { - id: config.NewComponentIDWithName(typeStr, "1"), + id: component.NewIDWithName(typeStr, "1"), expected: &Config{ - ExtensionSettings: config.NewExtensionSettings(config.NewComponentID(typeStr)), + ExtensionSettings: config.NewExtensionSettings(component.NewID(typeStr)), ProxyConfig: proxy.Config{ TCPAddr: confignet.TCPAddr{ Endpoint: "0.0.0.0:1234", @@ -67,7 +68,7 @@ func TestLoadConfig(t *testing.T) { cfg := factory.CreateDefaultConfig() sub, err := cm.Sub(tt.id.String()) require.NoError(t, err) - require.NoError(t, config.UnmarshalExtension(sub, cfg)) + require.NoError(t, component.UnmarshalExtensionConfig(sub, cfg)) assert.NoError(t, cfg.Validate()) assert.Equal(t, tt.expected, cfg) diff --git a/extension/awsproxy/factory.go b/extension/awsproxy/factory.go index 64c67505c88e..63e8f181bfaa 100644 --- a/extension/awsproxy/factory.go +++ b/extension/awsproxy/factory.go @@ -42,9 +42,9 @@ func NewFactory() component.ExtensionFactory { ) } -func createDefaultConfig() config.Extension { +func createDefaultConfig() component.ExtensionConfig { return &Config{ - ExtensionSettings: config.NewExtensionSettings(config.NewComponentID(typeStr)), + ExtensionSettings: config.NewExtensionSettings(component.NewID(typeStr)), ProxyConfig: proxy.Config{ TCPAddr: confignet.TCPAddr{ Endpoint: defaultEndpoint, @@ -56,6 +56,6 @@ func createDefaultConfig() config.Extension { } } -func createExtension(_ context.Context, params component.ExtensionCreateSettings, cfg config.Extension) (component.Extension, error) { +func createExtension(_ context.Context, params component.ExtensionCreateSettings, cfg component.ExtensionConfig) (component.Extension, error) { return newXrayProxy(cfg.(*Config), params.Logger) } diff --git a/extension/awsproxy/factory_test.go b/extension/awsproxy/factory_test.go index c9a5163fe217..8ceada900bfd 100644 --- a/extension/awsproxy/factory_test.go +++ b/extension/awsproxy/factory_test.go @@ -29,7 +29,6 @@ import ( "go.opentelemetry.io/collector/component/componenttest" "go.opentelemetry.io/collector/config" "go.opentelemetry.io/collector/config/confignet" - "go.opentelemetry.io/collector/config/configtest" "github.com/open-telemetry/opentelemetry-collector-contrib/internal/aws/proxy" "github.com/open-telemetry/opentelemetry-collector-contrib/internal/common/testutil" @@ -38,7 +37,7 @@ import ( func TestFactory_CreateDefaultConfig(t *testing.T) { cfg := createDefaultConfig() assert.Equal(t, &Config{ - ExtensionSettings: config.NewExtensionSettings(config.NewComponentID(typeStr)), + ExtensionSettings: config.NewExtensionSettings(component.NewID(typeStr)), ProxyConfig: proxy.Config{ TCPAddr: confignet.TCPAddr{ Endpoint: defaultEndpoint, @@ -46,7 +45,7 @@ func TestFactory_CreateDefaultConfig(t *testing.T) { }, }, cfg) - assert.NoError(t, configtest.CheckConfigStruct(cfg)) + assert.NoError(t, componenttest.CheckConfigStruct(cfg)) } func TestFactory_CreateExtension(t *testing.T) { diff --git a/extension/awsproxy/go.mod b/extension/awsproxy/go.mod index b6c3dbe61962..fc96a0be245c 100644 --- a/extension/awsproxy/go.mod +++ b/extension/awsproxy/go.mod @@ -6,7 +6,7 @@ require ( github.com/open-telemetry/opentelemetry-collector-contrib/internal/aws/proxy v0.63.0 github.com/open-telemetry/opentelemetry-collector-contrib/internal/common v0.63.0 github.com/stretchr/testify v1.8.1 - go.opentelemetry.io/collector v0.63.2-0.20221104003159-6b27644724d8 + go.opentelemetry.io/collector v0.63.2-0.20221108014805-0b08d5316426 go.uber.org/zap v1.23.0 ) @@ -25,7 +25,7 @@ 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.63.2-0.20221104003159-6b27644724d8 // indirect + go.opentelemetry.io/collector/pdata v0.63.2-0.20221108014805-0b08d5316426 // 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 3749e13548db..bcc171491090 100644 --- a/extension/awsproxy/go.sum +++ b/extension/awsproxy/go.sum @@ -264,10 +264,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.63.2-0.20221104003159-6b27644724d8 h1:rOT5HzXXfSISc6FiH012zH2/EFjp37UXfjEqj5BpkWQ= -go.opentelemetry.io/collector v0.63.2-0.20221104003159-6b27644724d8/go.mod h1:JVmeZXugK4ondC6KQgrHTHWiF4JttpG5k6dWPMt62+k= -go.opentelemetry.io/collector/pdata v0.63.2-0.20221104003159-6b27644724d8 h1:7xeTQjfsOm9eogQeIxjSEhlik9qsbBGsnmkQHfyKaRE= -go.opentelemetry.io/collector/pdata v0.63.2-0.20221104003159-6b27644724d8/go.mod h1:IzvXUGQml2mrnvdb8zIlEW3qQs9oFLdD2hLwJdZ+pek= +go.opentelemetry.io/collector v0.63.2-0.20221108014805-0b08d5316426 h1:z/wLTMh7/vNxcFUDa5uG7/IPE3tYx6pzCWPV41ghyV8= +go.opentelemetry.io/collector v0.63.2-0.20221108014805-0b08d5316426/go.mod h1:+Zb70q0Rq17dA9FcHTiTjW6g96lvJ8kAZ0c+eWNkAv0= +go.opentelemetry.io/collector/pdata v0.63.2-0.20221108014805-0b08d5316426 h1:wKDpgP0Tx/gWI2SgDGAY1OTSeihhDivbbRqFR79IGTc= +go.opentelemetry.io/collector/pdata v0.63.2-0.20221108014805-0b08d5316426/go.mod h1:IzvXUGQml2mrnvdb8zIlEW3qQs9oFLdD2hLwJdZ+pek= 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 01a132836966..9c5d56942e9b 100644 --- a/extension/basicauthextension/config_test.go +++ b/extension/basicauthextension/config_test.go @@ -20,6 +20,7 @@ import ( "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" + "go.opentelemetry.io/collector/component" "go.opentelemetry.io/collector/config" "go.opentelemetry.io/collector/confmap/confmaptest" ) @@ -28,27 +29,27 @@ func TestLoadConfig(t *testing.T) { t.Parallel() tests := []struct { - id config.ComponentID - expected config.Extension + id component.ID + expected component.ExtensionConfig expectedErr bool }{ { - id: config.NewComponentID(typeStr), + id: component.NewID(typeStr), expectedErr: true, }, { - id: config.NewComponentIDWithName(typeStr, "server"), + id: component.NewIDWithName(typeStr, "server"), expected: &Config{ - ExtensionSettings: config.NewExtensionSettings(config.NewComponentID(typeStr)), + ExtensionSettings: config.NewExtensionSettings(component.NewID(typeStr)), Htpasswd: &HtpasswdSettings{ Inline: "username1:password1\nusername2:password2\n", }, }, }, { - id: config.NewComponentIDWithName(typeStr, "client"), + id: component.NewIDWithName(typeStr, "client"), expected: &Config{ - ExtensionSettings: config.NewExtensionSettings(config.NewComponentID(typeStr)), + ExtensionSettings: config.NewExtensionSettings(component.NewID(typeStr)), ClientAuth: &ClientAuthSettings{ Username: "username", Password: "password", @@ -56,7 +57,7 @@ func TestLoadConfig(t *testing.T) { }, }, { - id: config.NewComponentIDWithName(typeStr, "both"), + id: component.NewIDWithName(typeStr, "both"), expectedErr: true, }, } @@ -68,7 +69,7 @@ func TestLoadConfig(t *testing.T) { cfg := factory.CreateDefaultConfig() sub, err := cm.Sub(tt.id.String()) require.NoError(t, err) - require.NoError(t, config.UnmarshalExtension(sub, cfg)) + require.NoError(t, component.UnmarshalExtensionConfig(sub, cfg)) if tt.expectedErr { assert.Error(t, cfg.Validate()) return diff --git a/extension/basicauthextension/factory.go b/extension/basicauthextension/factory.go index 8b63a4d88e03..bed825b915c4 100644 --- a/extension/basicauthextension/factory.go +++ b/extension/basicauthextension/factory.go @@ -35,13 +35,13 @@ func NewFactory() component.ExtensionFactory { ) } -func createDefaultConfig() config.Extension { +func createDefaultConfig() component.ExtensionConfig { return &Config{ - ExtensionSettings: config.NewExtensionSettings(config.NewComponentID(typeStr)), + ExtensionSettings: config.NewExtensionSettings(component.NewID(typeStr)), } } -func createExtension(_ context.Context, _ component.ExtensionCreateSettings, cfg config.Extension) (component.Extension, error) { +func createExtension(_ context.Context, _ component.ExtensionCreateSettings, cfg component.ExtensionConfig) (component.Extension, error) { // check if config is a server auth(Htpasswd should be set) if cfg.(*Config).Htpasswd != nil { return newServerAuthExtension(cfg.(*Config)) diff --git a/extension/basicauthextension/factory_test.go b/extension/basicauthextension/factory_test.go index 733c9aaca625..158709c68b39 100644 --- a/extension/basicauthextension/factory_test.go +++ b/extension/basicauthextension/factory_test.go @@ -19,18 +19,18 @@ import ( "testing" "github.com/stretchr/testify/assert" + "go.opentelemetry.io/collector/component" "go.opentelemetry.io/collector/component/componenttest" "go.opentelemetry.io/collector/config" - "go.opentelemetry.io/collector/config/configtest" ) func TestCreateDefaultConfig(t *testing.T) { expected := &Config{ - ExtensionSettings: config.NewExtensionSettings(config.NewComponentID(typeStr)), + ExtensionSettings: config.NewExtensionSettings(component.NewID(typeStr)), } actual := createDefaultConfig() assert.Equal(t, expected, createDefaultConfig()) - assert.NoError(t, configtest.CheckConfigStruct(actual)) + assert.NoError(t, componenttest.CheckConfigStruct(actual)) } func TestCreateExtension_DefaultConfig(t *testing.T) { @@ -43,7 +43,7 @@ func TestCreateExtension_DefaultConfig(t *testing.T) { func TestCreateExtension_ValidConfig(t *testing.T) { cfg := &Config{ - ExtensionSettings: config.NewExtensionSettings(config.NewComponentID(typeStr)), + ExtensionSettings: config.NewExtensionSettings(component.NewID(typeStr)), Htpasswd: &HtpasswdSettings{ Inline: "username:password", }, @@ -57,5 +57,5 @@ func TestCreateExtension_ValidConfig(t *testing.T) { func TestNewFactory(t *testing.T) { f := NewFactory() assert.NotNil(t, f) - assert.Equal(t, f.Type(), config.Type(typeStr)) + assert.Equal(t, f.Type(), component.Type(typeStr)) } diff --git a/extension/basicauthextension/go.mod b/extension/basicauthextension/go.mod index 03b9aa026061..b3dddf15e34a 100644 --- a/extension/basicauthextension/go.mod +++ b/extension/basicauthextension/go.mod @@ -5,7 +5,7 @@ go 1.18 require ( github.com/stretchr/testify v1.8.1 github.com/tg123/go-htpasswd v1.2.0 - go.opentelemetry.io/collector v0.63.2-0.20221104003159-6b27644724d8 + go.opentelemetry.io/collector v0.63.2-0.20221108014805-0b08d5316426 google.golang.org/grpc v1.50.1 ) @@ -25,7 +25,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/pdata v0.63.2-0.20221104003159-6b27644724d8 // indirect + go.opentelemetry.io/collector/pdata v0.63.2-0.20221108014805-0b08d5316426 // 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 3a8f3f8a92e2..822ea33d1ea7 100644 --- a/extension/basicauthextension/go.sum +++ b/extension/basicauthextension/go.sum @@ -269,10 +269,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.63.2-0.20221104003159-6b27644724d8 h1:rOT5HzXXfSISc6FiH012zH2/EFjp37UXfjEqj5BpkWQ= -go.opentelemetry.io/collector v0.63.2-0.20221104003159-6b27644724d8/go.mod h1:JVmeZXugK4ondC6KQgrHTHWiF4JttpG5k6dWPMt62+k= -go.opentelemetry.io/collector/pdata v0.63.2-0.20221104003159-6b27644724d8 h1:7xeTQjfsOm9eogQeIxjSEhlik9qsbBGsnmkQHfyKaRE= -go.opentelemetry.io/collector/pdata v0.63.2-0.20221104003159-6b27644724d8/go.mod h1:IzvXUGQml2mrnvdb8zIlEW3qQs9oFLdD2hLwJdZ+pek= +go.opentelemetry.io/collector v0.63.2-0.20221108014805-0b08d5316426 h1:z/wLTMh7/vNxcFUDa5uG7/IPE3tYx6pzCWPV41ghyV8= +go.opentelemetry.io/collector v0.63.2-0.20221108014805-0b08d5316426/go.mod h1:+Zb70q0Rq17dA9FcHTiTjW6g96lvJ8kAZ0c+eWNkAv0= +go.opentelemetry.io/collector/pdata v0.63.2-0.20221108014805-0b08d5316426 h1:wKDpgP0Tx/gWI2SgDGAY1OTSeihhDivbbRqFR79IGTc= +go.opentelemetry.io/collector/pdata v0.63.2-0.20221108014805-0b08d5316426/go.mod h1:IzvXUGQml2mrnvdb8zIlEW3qQs9oFLdD2hLwJdZ+pek= 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.go b/extension/bearertokenauthextension/config.go index a01d2d769820..67085723501a 100644 --- a/extension/bearertokenauthextension/config.go +++ b/extension/bearertokenauthextension/config.go @@ -17,6 +17,7 @@ package bearertokenauthextension // import "github.com/open-telemetry/openteleme import ( "errors" + "go.opentelemetry.io/collector/component" "go.opentelemetry.io/collector/config" ) @@ -34,7 +35,7 @@ type Config struct { Filename string `mapstructure:"filename,omitempty"` } -var _ config.Extension = (*Config)(nil) +var _ component.ExtensionConfig = (*Config)(nil) var errNoTokenProvided = errors.New("no bearer token provided") // Validate checks if the extension configuration is valid diff --git a/extension/bearertokenauthextension/config_test.go b/extension/bearertokenauthextension/config_test.go index 54fefab40a75..347d48e36d13 100644 --- a/extension/bearertokenauthextension/config_test.go +++ b/extension/bearertokenauthextension/config_test.go @@ -20,6 +20,7 @@ import ( "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" + "go.opentelemetry.io/collector/component" "go.opentelemetry.io/collector/config" "go.opentelemetry.io/collector/confmap/confmaptest" ) @@ -28,26 +29,26 @@ func TestLoadConfig(t *testing.T) { t.Parallel() tests := []struct { - id config.ComponentID - expected config.Extension + id component.ID + expected component.ExtensionConfig expectedErr bool }{ { - id: config.NewComponentID(typeStr), + id: component.NewID(typeStr), expectedErr: true, }, { - id: config.NewComponentIDWithName(typeStr, "sometoken"), + id: component.NewIDWithName(typeStr, "sometoken"), expected: &Config{ - ExtensionSettings: config.NewExtensionSettings(config.NewComponentID(typeStr)), + ExtensionSettings: config.NewExtensionSettings(component.NewID(typeStr)), Scheme: defaultScheme, BearerToken: "sometoken", }, }, { - id: config.NewComponentIDWithName(typeStr, "withscheme"), + id: component.NewIDWithName(typeStr, "withscheme"), expected: &Config{ - ExtensionSettings: config.NewExtensionSettings(config.NewComponentID(typeStr)), + ExtensionSettings: config.NewExtensionSettings(component.NewID(typeStr)), Scheme: "MyScheme", BearerToken: "my-token", }, @@ -61,7 +62,7 @@ func TestLoadConfig(t *testing.T) { cfg := factory.CreateDefaultConfig() sub, err := cm.Sub(tt.id.String()) require.NoError(t, err) - require.NoError(t, config.UnmarshalExtension(sub, cfg)) + require.NoError(t, component.UnmarshalExtensionConfig(sub, cfg)) if tt.expectedErr { assert.Error(t, cfg.Validate()) return diff --git a/extension/bearertokenauthextension/factory.go b/extension/bearertokenauthextension/factory.go index 54802ccdd74f..4be5739d530d 100644 --- a/extension/bearertokenauthextension/factory.go +++ b/extension/bearertokenauthextension/factory.go @@ -38,13 +38,13 @@ func NewFactory() component.ExtensionFactory { ) } -func createDefaultConfig() config.Extension { +func createDefaultConfig() component.ExtensionConfig { return &Config{ - ExtensionSettings: config.NewExtensionSettings(config.NewComponentID(typeStr)), + ExtensionSettings: config.NewExtensionSettings(component.NewID(typeStr)), Scheme: defaultScheme, } } -func createExtension(_ context.Context, set component.ExtensionCreateSettings, cfg config.Extension) (component.Extension, error) { +func createExtension(_ context.Context, set component.ExtensionCreateSettings, cfg component.ExtensionConfig) (component.Extension, error) { return newBearerTokenAuth(cfg.(*Config), set.Logger), nil } diff --git a/extension/bearertokenauthextension/factory_test.go b/extension/bearertokenauthextension/factory_test.go index 77f89888b18b..bcd68b557dd1 100644 --- a/extension/bearertokenauthextension/factory_test.go +++ b/extension/bearertokenauthextension/factory_test.go @@ -20,15 +20,15 @@ import ( "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" + "go.opentelemetry.io/collector/component" "go.opentelemetry.io/collector/component/componenttest" "go.opentelemetry.io/collector/config" - "go.opentelemetry.io/collector/config/configtest" ) func TestFactory_CreateDefaultConfig(t *testing.T) { cfg := createDefaultConfig() - assert.Equal(t, &Config{ExtensionSettings: config.NewExtensionSettings(config.NewComponentID(typeStr)), Scheme: defaultScheme}, cfg) - assert.NoError(t, configtest.CheckConfigStruct(cfg)) + assert.Equal(t, &Config{ExtensionSettings: config.NewExtensionSettings(component.NewID(typeStr)), Scheme: defaultScheme}, cfg) + assert.NoError(t, componenttest.CheckConfigStruct(cfg)) } func TestFactory_CreateExtension(t *testing.T) { diff --git a/extension/bearertokenauthextension/go.mod b/extension/bearertokenauthextension/go.mod index 65b97831506a..3311188ee4ee 100644 --- a/extension/bearertokenauthextension/go.mod +++ b/extension/bearertokenauthextension/go.mod @@ -5,7 +5,7 @@ go 1.18 require ( github.com/fsnotify/fsnotify v1.6.0 github.com/stretchr/testify v1.8.1 - go.opentelemetry.io/collector v0.63.2-0.20221104003159-6b27644724d8 + go.opentelemetry.io/collector v0.63.2-0.20221108014805-0b08d5316426 go.uber.org/zap v1.23.0 google.golang.org/grpc v1.50.1 ) @@ -25,7 +25,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/pdata v0.63.2-0.20221104003159-6b27644724d8 // indirect + go.opentelemetry.io/collector/pdata v0.63.2-0.20221108014805-0b08d5316426 // 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 00c088545191..c6957d0b71b6 100644 --- a/extension/bearertokenauthextension/go.sum +++ b/extension/bearertokenauthextension/go.sum @@ -266,10 +266,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.63.2-0.20221104003159-6b27644724d8 h1:rOT5HzXXfSISc6FiH012zH2/EFjp37UXfjEqj5BpkWQ= -go.opentelemetry.io/collector v0.63.2-0.20221104003159-6b27644724d8/go.mod h1:JVmeZXugK4ondC6KQgrHTHWiF4JttpG5k6dWPMt62+k= -go.opentelemetry.io/collector/pdata v0.63.2-0.20221104003159-6b27644724d8 h1:7xeTQjfsOm9eogQeIxjSEhlik9qsbBGsnmkQHfyKaRE= -go.opentelemetry.io/collector/pdata v0.63.2-0.20221104003159-6b27644724d8/go.mod h1:IzvXUGQml2mrnvdb8zIlEW3qQs9oFLdD2hLwJdZ+pek= +go.opentelemetry.io/collector v0.63.2-0.20221108014805-0b08d5316426 h1:z/wLTMh7/vNxcFUDa5uG7/IPE3tYx6pzCWPV41ghyV8= +go.opentelemetry.io/collector v0.63.2-0.20221108014805-0b08d5316426/go.mod h1:+Zb70q0Rq17dA9FcHTiTjW6g96lvJ8kAZ0c+eWNkAv0= +go.opentelemetry.io/collector/pdata v0.63.2-0.20221108014805-0b08d5316426 h1:wKDpgP0Tx/gWI2SgDGAY1OTSeihhDivbbRqFR79IGTc= +go.opentelemetry.io/collector/pdata v0.63.2-0.20221108014805-0b08d5316426/go.mod h1:IzvXUGQml2mrnvdb8zIlEW3qQs9oFLdD2hLwJdZ+pek= 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 8fcbcff41e3d..7a8455d91cbe 100644 --- a/extension/fluentbitextension/config_test.go +++ b/extension/fluentbitextension/config_test.go @@ -20,6 +20,7 @@ import ( "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" + "go.opentelemetry.io/collector/component" "go.opentelemetry.io/collector/config" "go.opentelemetry.io/collector/confmap/confmaptest" ) @@ -28,17 +29,17 @@ func TestLoadConfig(t *testing.T) { t.Parallel() tests := []struct { - id config.ComponentID - expected config.Extension + id component.ID + expected component.ExtensionConfig }{ { - id: config.NewComponentID(typeStr), + id: component.NewID(typeStr), expected: NewFactory().CreateDefaultConfig(), }, { - id: config.NewComponentIDWithName(typeStr, "1"), + id: component.NewIDWithName(typeStr, "1"), expected: &Config{ - ExtensionSettings: config.NewExtensionSettings(config.NewComponentID(typeStr)), + ExtensionSettings: config.NewExtensionSettings(component.NewID(typeStr)), ExecutablePath: "/usr/local/bin/fluent-bit", }, }, @@ -51,7 +52,7 @@ func TestLoadConfig(t *testing.T) { cfg := factory.CreateDefaultConfig() sub, err := cm.Sub(tt.id.String()) require.NoError(t, err) - require.NoError(t, config.UnmarshalExtension(sub, cfg)) + require.NoError(t, component.UnmarshalExtensionConfig(sub, cfg)) assert.NoError(t, cfg.Validate()) assert.Equal(t, tt.expected, cfg) diff --git a/extension/fluentbitextension/factory.go b/extension/fluentbitextension/factory.go index 47fda5fc6391..31b794235edb 100644 --- a/extension/fluentbitextension/factory.go +++ b/extension/fluentbitextension/factory.go @@ -40,9 +40,9 @@ func NewFactory() component.ExtensionFactory { ) } -func createDefaultConfig() config.Extension { +func createDefaultConfig() component.ExtensionConfig { return &Config{ - ExtensionSettings: config.NewExtensionSettings(config.NewComponentID(typeStr)), + ExtensionSettings: config.NewExtensionSettings(component.NewID(typeStr)), } } @@ -52,7 +52,7 @@ func logDeprecation(logger *zap.Logger) { }) } -func createExtension(_ context.Context, params component.ExtensionCreateSettings, cfg config.Extension) (component.Extension, error) { +func createExtension(_ context.Context, params component.ExtensionCreateSettings, cfg component.ExtensionConfig) (component.Extension, error) { logDeprecation(params.Logger) config := cfg.(*Config) return newProcessManager(config, params.Logger), nil diff --git a/extension/fluentbitextension/factory_test.go b/extension/fluentbitextension/factory_test.go index 06dc2f4ccf89..40f42a358a61 100644 --- a/extension/fluentbitextension/factory_test.go +++ b/extension/fluentbitextension/factory_test.go @@ -20,18 +20,18 @@ import ( "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" + "go.opentelemetry.io/collector/component" "go.opentelemetry.io/collector/component/componenttest" "go.opentelemetry.io/collector/config" - "go.opentelemetry.io/collector/config/configtest" ) func TestFactory_CreateDefaultConfig(t *testing.T) { cfg := createDefaultConfig() assert.Equal(t, &Config{ - ExtensionSettings: config.NewExtensionSettings(config.NewComponentID(typeStr)), + ExtensionSettings: config.NewExtensionSettings(component.NewID(typeStr)), }, cfg) - assert.NoError(t, configtest.CheckConfigStruct(cfg)) + assert.NoError(t, componenttest.CheckConfigStruct(cfg)) ext, err := createExtension(context.Background(), componenttest.NewNopExtensionCreateSettings(), cfg) require.NoError(t, err) require.NotNil(t, ext) diff --git a/extension/fluentbitextension/go.mod b/extension/fluentbitextension/go.mod index 468771213c48..971d375755c3 100644 --- a/extension/fluentbitextension/go.mod +++ b/extension/fluentbitextension/go.mod @@ -7,7 +7,7 @@ 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.63.2-0.20221104003159-6b27644724d8 + go.opentelemetry.io/collector v0.63.2-0.20221108014805-0b08d5316426 go.uber.org/zap v1.23.0 ) @@ -32,7 +32,7 @@ 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.63.2-0.20221104003159-6b27644724d8 // indirect + go.opentelemetry.io/collector/pdata v0.63.2-0.20221108014805-0b08d5316426 // 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 16fc13bfd674..1f3785b37755 100644 --- a/extension/fluentbitextension/go.sum +++ b/extension/fluentbitextension/go.sum @@ -280,10 +280,10 @@ 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.63.2-0.20221104003159-6b27644724d8 h1:rOT5HzXXfSISc6FiH012zH2/EFjp37UXfjEqj5BpkWQ= -go.opentelemetry.io/collector v0.63.2-0.20221104003159-6b27644724d8/go.mod h1:JVmeZXugK4ondC6KQgrHTHWiF4JttpG5k6dWPMt62+k= -go.opentelemetry.io/collector/pdata v0.63.2-0.20221104003159-6b27644724d8 h1:7xeTQjfsOm9eogQeIxjSEhlik9qsbBGsnmkQHfyKaRE= -go.opentelemetry.io/collector/pdata v0.63.2-0.20221104003159-6b27644724d8/go.mod h1:IzvXUGQml2mrnvdb8zIlEW3qQs9oFLdD2hLwJdZ+pek= +go.opentelemetry.io/collector v0.63.2-0.20221108014805-0b08d5316426 h1:z/wLTMh7/vNxcFUDa5uG7/IPE3tYx6pzCWPV41ghyV8= +go.opentelemetry.io/collector v0.63.2-0.20221108014805-0b08d5316426/go.mod h1:+Zb70q0Rq17dA9FcHTiTjW6g96lvJ8kAZ0c+eWNkAv0= +go.opentelemetry.io/collector/pdata v0.63.2-0.20221108014805-0b08d5316426 h1:wKDpgP0Tx/gWI2SgDGAY1OTSeihhDivbbRqFR79IGTc= +go.opentelemetry.io/collector/pdata v0.63.2-0.20221108014805-0b08d5316426/go.mod h1:IzvXUGQml2mrnvdb8zIlEW3qQs9oFLdD2hLwJdZ+pek= 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/config_test.go b/extension/headerssetterextension/config_test.go index 267d7b6794d0..aae874c42a60 100644 --- a/extension/headerssetterextension/config_test.go +++ b/extension/headerssetterextension/config_test.go @@ -20,6 +20,7 @@ import ( "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" + "go.opentelemetry.io/collector/component" "go.opentelemetry.io/collector/config" "go.opentelemetry.io/collector/confmap/confmaptest" ) @@ -28,17 +29,17 @@ func TestLoadConfig(t *testing.T) { t.Parallel() tests := []struct { - id config.ComponentID - expected config.Extension + id component.ID + expected component.ExtensionConfig }{ { - id: config.NewComponentID(typeStr), + id: component.NewID(typeStr), expected: NewFactory().CreateDefaultConfig(), }, { - id: config.NewComponentIDWithName(typeStr, "1"), + id: component.NewIDWithName(typeStr, "1"), expected: &Config{ - ExtensionSettings: config.NewExtensionSettings(config.NewComponentID(typeStr)), + ExtensionSettings: config.NewExtensionSettings(component.NewID(typeStr)), HeadersConfig: []HeaderConfig{ { Key: stringp("X-Scope-OrgID"), @@ -62,7 +63,7 @@ func TestLoadConfig(t *testing.T) { cfg := factory.CreateDefaultConfig() sub, err := cm.Sub(tt.id.String()) require.NoError(t, err) - require.NoError(t, config.UnmarshalExtension(sub, cfg)) + require.NoError(t, component.UnmarshalExtensionConfig(sub, cfg)) assert.Equal(t, tt.expected, cfg) }) } diff --git a/extension/headerssetterextension/factory.go b/extension/headerssetterextension/factory.go index 5b9fa5817bd8..45ed2f4f3981 100644 --- a/extension/headerssetterextension/factory.go +++ b/extension/headerssetterextension/factory.go @@ -35,16 +35,16 @@ func NewFactory() component.ExtensionFactory { ) } -func createDefaultConfig() config.Extension { +func createDefaultConfig() component.ExtensionConfig { return &Config{ - ExtensionSettings: config.NewExtensionSettings(config.NewComponentID(typeStr)), + ExtensionSettings: config.NewExtensionSettings(component.NewID(typeStr)), } } func createExtension( _ context.Context, _ component.ExtensionCreateSettings, - cfg config.Extension, + cfg component.ExtensionConfig, ) (component.Extension, error) { return newHeadersSetterExtension(cfg.(*Config)) } diff --git a/extension/headerssetterextension/factory_test.go b/extension/headerssetterextension/factory_test.go index c627ff18f5a4..e77794bcd541 100644 --- a/extension/headerssetterextension/factory_test.go +++ b/extension/headerssetterextension/factory_test.go @@ -19,20 +19,20 @@ import ( "testing" "github.com/stretchr/testify/assert" + "go.opentelemetry.io/collector/component" "go.opentelemetry.io/collector/component/componenttest" "go.opentelemetry.io/collector/config" - "go.opentelemetry.io/collector/config/configtest" ) func TestCreateDefaultConfig(t *testing.T) { expected := &Config{ - ExtensionSettings: config.NewExtensionSettings(config.NewComponentID(typeStr)), + ExtensionSettings: config.NewExtensionSettings(component.NewID(typeStr)), } cfg := createDefaultConfig() assert.Equal(t, expected, cfg) - assert.NoError(t, configtest.CheckConfigStruct(cfg)) + assert.NoError(t, componenttest.CheckConfigStruct(cfg)) } func TestCreateExtension(t *testing.T) { diff --git a/extension/headerssetterextension/go.mod b/extension/headerssetterextension/go.mod index e7de7a8fb8f7..16ab75c348fc 100644 --- a/extension/headerssetterextension/go.mod +++ b/extension/headerssetterextension/go.mod @@ -4,7 +4,7 @@ go 1.18 require ( github.com/stretchr/testify v1.8.1 - go.opentelemetry.io/collector v0.63.2-0.20221104003159-6b27644724d8 + go.opentelemetry.io/collector v0.63.2-0.20221108014805-0b08d5316426 google.golang.org/grpc v1.50.1 ) @@ -20,7 +20,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/pdata v0.63.2-0.20221104003159-6b27644724d8 // indirect + go.opentelemetry.io/collector/pdata v0.63.2-0.20221108014805-0b08d5316426 // 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 a6f30e86d258..f387b1033123 100644 --- a/extension/headerssetterextension/go.sum +++ b/extension/headerssetterextension/go.sum @@ -257,10 +257,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.63.2-0.20221104003159-6b27644724d8 h1:rOT5HzXXfSISc6FiH012zH2/EFjp37UXfjEqj5BpkWQ= -go.opentelemetry.io/collector v0.63.2-0.20221104003159-6b27644724d8/go.mod h1:JVmeZXugK4ondC6KQgrHTHWiF4JttpG5k6dWPMt62+k= -go.opentelemetry.io/collector/pdata v0.63.2-0.20221104003159-6b27644724d8 h1:7xeTQjfsOm9eogQeIxjSEhlik9qsbBGsnmkQHfyKaRE= -go.opentelemetry.io/collector/pdata v0.63.2-0.20221104003159-6b27644724d8/go.mod h1:IzvXUGQml2mrnvdb8zIlEW3qQs9oFLdD2hLwJdZ+pek= +go.opentelemetry.io/collector v0.63.2-0.20221108014805-0b08d5316426 h1:z/wLTMh7/vNxcFUDa5uG7/IPE3tYx6pzCWPV41ghyV8= +go.opentelemetry.io/collector v0.63.2-0.20221108014805-0b08d5316426/go.mod h1:+Zb70q0Rq17dA9FcHTiTjW6g96lvJ8kAZ0c+eWNkAv0= +go.opentelemetry.io/collector/pdata v0.63.2-0.20221108014805-0b08d5316426 h1:wKDpgP0Tx/gWI2SgDGAY1OTSeihhDivbbRqFR79IGTc= +go.opentelemetry.io/collector/pdata v0.63.2-0.20221108014805-0b08d5316426/go.mod h1:IzvXUGQml2mrnvdb8zIlEW3qQs9oFLdD2hLwJdZ+pek= 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.go b/extension/healthcheckextension/config.go index 64031bd36107..2acd9f23081b 100644 --- a/extension/healthcheckextension/config.go +++ b/extension/healthcheckextension/config.go @@ -19,6 +19,7 @@ import ( "strings" "time" + "go.opentelemetry.io/collector/component" "go.opentelemetry.io/collector/config" "go.opentelemetry.io/collector/config/confighttp" ) @@ -37,7 +38,7 @@ type Config struct { CheckCollectorPipeline checkCollectorPipelineSettings `mapstructure:"check_collector_pipeline"` } -var _ config.Extension = (*Config)(nil) +var _ component.ExtensionConfig = (*Config)(nil) var ( errNoEndpointProvided = errors.New("bad config: endpoint must be specified") errInvalidExporterFailureThresholdProvided = errors.New("bad config: exporter_failure_threshold expects a positive number") diff --git a/extension/healthcheckextension/config_test.go b/extension/healthcheckextension/config_test.go index 998898c6053d..957cbd5999c7 100644 --- a/extension/healthcheckextension/config_test.go +++ b/extension/healthcheckextension/config_test.go @@ -20,6 +20,7 @@ import ( "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" + "go.opentelemetry.io/collector/component" "go.opentelemetry.io/collector/config" "go.opentelemetry.io/collector/config/confighttp" "go.opentelemetry.io/collector/config/configtls" @@ -30,18 +31,18 @@ func TestLoadConfig(t *testing.T) { t.Parallel() tests := []struct { - id config.ComponentID - expected config.Extension + id component.ID + expected component.ExtensionConfig expectedErr error }{ { - id: config.NewComponentID(typeStr), + id: component.NewID(typeStr), expected: NewFactory().CreateDefaultConfig(), }, { - id: config.NewComponentIDWithName(typeStr, "1"), + id: component.NewIDWithName(typeStr, "1"), expected: &Config{ - ExtensionSettings: config.NewExtensionSettings(config.NewComponentID(typeStr)), + ExtensionSettings: config.NewExtensionSettings(component.NewID(typeStr)), HTTPServerSettings: confighttp.HTTPServerSettings{ Endpoint: "localhost:13", TLSSetting: &configtls.TLSServerSetting{ @@ -57,15 +58,15 @@ func TestLoadConfig(t *testing.T) { }, }, { - id: config.NewComponentIDWithName(typeStr, "missingendpoint"), + id: component.NewIDWithName(typeStr, "missingendpoint"), expectedErr: errNoEndpointProvided, }, { - id: config.NewComponentIDWithName(typeStr, "invalidthreshold"), + id: component.NewIDWithName(typeStr, "invalidthreshold"), expectedErr: errInvalidExporterFailureThresholdProvided, }, { - id: config.NewComponentIDWithName(typeStr, "invalidpath"), + id: component.NewIDWithName(typeStr, "invalidpath"), expectedErr: errInvalidPath, }, } @@ -77,7 +78,7 @@ func TestLoadConfig(t *testing.T) { cfg := factory.CreateDefaultConfig() sub, err := cm.Sub(tt.id.String()) require.NoError(t, err) - require.NoError(t, config.UnmarshalExtension(sub, cfg)) + require.NoError(t, component.UnmarshalExtensionConfig(sub, cfg)) if tt.expectedErr != nil { assert.ErrorIs(t, cfg.Validate(), tt.expectedErr) return diff --git a/extension/healthcheckextension/factory.go b/extension/healthcheckextension/factory.go index 5f785b52ab87..cd5f24552139 100644 --- a/extension/healthcheckextension/factory.go +++ b/extension/healthcheckextension/factory.go @@ -41,9 +41,9 @@ func NewFactory() component.ExtensionFactory { ) } -func createDefaultConfig() config.Extension { +func createDefaultConfig() component.ExtensionConfig { return &Config{ - ExtensionSettings: config.NewExtensionSettings(config.NewComponentID(typeStr)), + ExtensionSettings: config.NewExtensionSettings(component.NewID(typeStr)), HTTPServerSettings: confighttp.HTTPServerSettings{ Endpoint: defaultEndpoint, }, @@ -52,7 +52,7 @@ func createDefaultConfig() config.Extension { } } -func createExtension(_ context.Context, set component.ExtensionCreateSettings, cfg config.Extension) (component.Extension, error) { +func createExtension(_ context.Context, set component.ExtensionCreateSettings, cfg component.ExtensionConfig) (component.Extension, error) { config := cfg.(*Config) return newServer(*config, set.TelemetrySettings), nil diff --git a/extension/healthcheckextension/factory_test.go b/extension/healthcheckextension/factory_test.go index b83c6771b2c7..6293294605ab 100644 --- a/extension/healthcheckextension/factory_test.go +++ b/extension/healthcheckextension/factory_test.go @@ -20,10 +20,10 @@ import ( "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" + "go.opentelemetry.io/collector/component" "go.opentelemetry.io/collector/component/componenttest" "go.opentelemetry.io/collector/config" "go.opentelemetry.io/collector/config/confighttp" - "go.opentelemetry.io/collector/config/configtest" "github.com/open-telemetry/opentelemetry-collector-contrib/internal/common/testutil" ) @@ -31,7 +31,7 @@ import ( func TestFactory_CreateDefaultConfig(t *testing.T) { cfg := createDefaultConfig() assert.Equal(t, &Config{ - ExtensionSettings: config.NewExtensionSettings(config.NewComponentID(typeStr)), + ExtensionSettings: config.NewExtensionSettings(component.NewID(typeStr)), HTTPServerSettings: confighttp.HTTPServerSettings{ Endpoint: defaultEndpoint, }, @@ -39,7 +39,7 @@ func TestFactory_CreateDefaultConfig(t *testing.T) { Path: "/", }, cfg) - assert.NoError(t, configtest.CheckConfigStruct(cfg)) + assert.NoError(t, componenttest.CheckConfigStruct(cfg)) ext, err := createExtension(context.Background(), componenttest.NewNopExtensionCreateSettings(), cfg) require.NoError(t, err) require.NotNil(t, ext) diff --git a/extension/healthcheckextension/go.mod b/extension/healthcheckextension/go.mod index 36206f78dd19..4cb94ba4af9a 100644 --- a/extension/healthcheckextension/go.mod +++ b/extension/healthcheckextension/go.mod @@ -6,8 +6,8 @@ require ( github.com/jaegertracing/jaeger v1.39.0 github.com/open-telemetry/opentelemetry-collector-contrib/internal/common v0.63.0 github.com/stretchr/testify v1.8.1 - go.opencensus.io v0.23.0 - go.opentelemetry.io/collector v0.63.2-0.20221104003159-6b27644724d8 + go.opencensus.io v0.24.0 + go.opentelemetry.io/collector v0.63.2-0.20221108014805-0b08d5316426 go.uber.org/zap v1.23.0 ) @@ -30,7 +30,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/pdata v0.63.2-0.20221104003159-6b27644724d8 // indirect + go.opentelemetry.io/collector/pdata v0.63.2-0.20221108014805-0b08d5316426 // 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 5711d43ff879..1c0a3ae298d1 100644 --- a/extension/healthcheckextension/go.sum +++ b/extension/healthcheckextension/go.sum @@ -259,7 +259,6 @@ github.com/stretchr/testify v1.2.2/go.mod h1:a8OnRcib4nhh0OaRAV+Yts87kKdq0PP7pXf github.com/stretchr/testify v1.3.0/go.mod h1:M5WIy9Dh21IEIfnGCwXGc5bZfKNJtfHm1UVUgZn+9EI= github.com/stretchr/testify v1.4.0/go.mod h1:j7eGeouHqKxXV5pUuKE4zz7dFj8WfuZ+81PSLYec5m4= github.com/stretchr/testify v1.5.1/go.mod h1:5W2xD1RspED5o8YsWQXVCued0rvSQ+mT+I5cxcmMvtA= -github.com/stretchr/testify v1.6.1/go.mod h1:6Fq8oRcR53rry900zMqJjRRixrwX3KX962/h/Wwjteg= github.com/stretchr/testify v1.7.0/go.mod h1:6Fq8oRcR53rry900zMqJjRRixrwX3KX962/h/Wwjteg= github.com/stretchr/testify v1.7.1/go.mod h1:6Fq8oRcR53rry900zMqJjRRixrwX3KX962/h/Wwjteg= github.com/stretchr/testify v1.8.0/go.mod h1:yNjHg4UonilssWZ8iaSj1OCr/vHnekPRkoO+kdMU+MU= @@ -271,12 +270,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.opencensus.io v0.23.0 h1:gqCw0LfLxScz8irSi8exQc7fyQ0fKQU/qnC/X8+V/1M= -go.opencensus.io v0.23.0/go.mod h1:XItmlyltB5F7CS4xOC1DcqMoFqwtC6OG2xF7mCv7P7E= -go.opentelemetry.io/collector v0.63.2-0.20221104003159-6b27644724d8 h1:rOT5HzXXfSISc6FiH012zH2/EFjp37UXfjEqj5BpkWQ= -go.opentelemetry.io/collector v0.63.2-0.20221104003159-6b27644724d8/go.mod h1:JVmeZXugK4ondC6KQgrHTHWiF4JttpG5k6dWPMt62+k= -go.opentelemetry.io/collector/pdata v0.63.2-0.20221104003159-6b27644724d8 h1:7xeTQjfsOm9eogQeIxjSEhlik9qsbBGsnmkQHfyKaRE= -go.opentelemetry.io/collector/pdata v0.63.2-0.20221104003159-6b27644724d8/go.mod h1:IzvXUGQml2mrnvdb8zIlEW3qQs9oFLdD2hLwJdZ+pek= +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.63.2-0.20221108014805-0b08d5316426 h1:z/wLTMh7/vNxcFUDa5uG7/IPE3tYx6pzCWPV41ghyV8= +go.opentelemetry.io/collector v0.63.2-0.20221108014805-0b08d5316426/go.mod h1:+Zb70q0Rq17dA9FcHTiTjW6g96lvJ8kAZ0c+eWNkAv0= +go.opentelemetry.io/collector/pdata v0.63.2-0.20221108014805-0b08d5316426 h1:wKDpgP0Tx/gWI2SgDGAY1OTSeihhDivbbRqFR79IGTc= +go.opentelemetry.io/collector/pdata v0.63.2-0.20221108014805-0b08d5316426/go.mod h1:IzvXUGQml2mrnvdb8zIlEW3qQs9oFLdD2hLwJdZ+pek= 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 aa4ce687e9cb..fb2e21fe3346 100644 --- a/extension/httpforwarder/config_test.go +++ b/extension/httpforwarder/config_test.go @@ -21,6 +21,7 @@ import ( "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" + "go.opentelemetry.io/collector/component" "go.opentelemetry.io/collector/config" "go.opentelemetry.io/collector/config/confighttp" "go.opentelemetry.io/collector/confmap/confmaptest" @@ -30,17 +31,17 @@ func TestLoadConfig(t *testing.T) { t.Parallel() tests := []struct { - id config.ComponentID - expected config.Extension + id component.ID + expected component.ExtensionConfig }{ { - id: config.NewComponentID(typeStr), + id: component.NewID(typeStr), expected: NewFactory().CreateDefaultConfig(), }, { - id: config.NewComponentIDWithName(typeStr, "1"), + id: component.NewIDWithName(typeStr, "1"), expected: &Config{ - ExtensionSettings: config.NewExtensionSettings(config.NewComponentID(typeStr)), + ExtensionSettings: config.NewExtensionSettings(component.NewID(typeStr)), Ingress: confighttp.HTTPServerSettings{ Endpoint: "http://localhost:7070", }, @@ -62,7 +63,7 @@ func TestLoadConfig(t *testing.T) { cfg := factory.CreateDefaultConfig() sub, err := cm.Sub(tt.id.String()) require.NoError(t, err) - require.NoError(t, config.UnmarshalExtension(sub, cfg)) + require.NoError(t, component.UnmarshalExtensionConfig(sub, cfg)) assert.NoError(t, cfg.Validate()) assert.Equal(t, tt.expected, cfg) }) diff --git a/extension/httpforwarder/factory.go b/extension/httpforwarder/factory.go index 4b74275aeb9b..8b67759a1b89 100644 --- a/extension/httpforwarder/factory.go +++ b/extension/httpforwarder/factory.go @@ -25,7 +25,7 @@ import ( const ( // The value of extension "type" in configuration. - typeStr config.Type = "http_forwarder" + typeStr component.Type = "http_forwarder" // Default endpoints to bind to. defaultEndpoint = ":6060" @@ -40,9 +40,9 @@ func NewFactory() component.ExtensionFactory { component.StabilityLevelUnmaintained) } -func createDefaultConfig() config.Extension { +func createDefaultConfig() component.ExtensionConfig { return &Config{ - ExtensionSettings: config.NewExtensionSettings(config.NewComponentID(typeStr)), + ExtensionSettings: config.NewExtensionSettings(component.NewID(typeStr)), Ingress: confighttp.HTTPServerSettings{ Endpoint: defaultEndpoint, }, @@ -55,7 +55,7 @@ func createDefaultConfig() config.Extension { func createExtension( _ context.Context, params component.ExtensionCreateSettings, - cfg config.Extension, + cfg component.ExtensionConfig, ) (component.Extension, error) { return newHTTPForwarder(cfg.(*Config), params.TelemetrySettings) } diff --git a/extension/httpforwarder/factory_test.go b/extension/httpforwarder/factory_test.go index 72d6a7df63ce..12d777095977 100644 --- a/extension/httpforwarder/factory_test.go +++ b/extension/httpforwarder/factory_test.go @@ -21,18 +21,18 @@ import ( "time" "github.com/stretchr/testify/require" + "go.opentelemetry.io/collector/component" "go.opentelemetry.io/collector/component/componenttest" - "go.opentelemetry.io/collector/config" "go.opentelemetry.io/collector/config/confighttp" ) func TestFactory(t *testing.T) { f := NewFactory() expectType := "http_forwarder" - require.Equal(t, config.Type(expectType), f.Type()) + require.Equal(t, component.Type(expectType), f.Type()) cfg := f.CreateDefaultConfig().(*Config) - require.Equal(t, config.NewComponentID(typeStr), cfg.ID()) + require.Equal(t, component.NewID(typeStr), cfg.ID()) require.Equal(t, ":6060", cfg.Ingress.Endpoint) require.Equal(t, 10*time.Second, cfg.Egress.Timeout) diff --git a/extension/httpforwarder/go.mod b/extension/httpforwarder/go.mod index af8cae8b9eb1..282511a8ed4d 100644 --- a/extension/httpforwarder/go.mod +++ b/extension/httpforwarder/go.mod @@ -5,7 +5,7 @@ go 1.18 require ( github.com/open-telemetry/opentelemetry-collector-contrib/internal/common v0.63.0 github.com/stretchr/testify v1.8.1 - go.opentelemetry.io/collector v0.63.2-0.20221104003159-6b27644724d8 + go.opentelemetry.io/collector v0.63.2-0.20221108014805-0b08d5316426 go.uber.org/zap v1.23.0 ) @@ -32,7 +32,7 @@ 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.63.2-0.20221104003159-6b27644724d8 // indirect + go.opentelemetry.io/collector/pdata v0.63.2-0.20221108014805-0b08d5316426 // 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 8a5031daf4d7..f12da0f08ec9 100644 --- a/extension/httpforwarder/go.sum +++ b/extension/httpforwarder/go.sum @@ -279,10 +279,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.63.2-0.20221104003159-6b27644724d8 h1:rOT5HzXXfSISc6FiH012zH2/EFjp37UXfjEqj5BpkWQ= -go.opentelemetry.io/collector v0.63.2-0.20221104003159-6b27644724d8/go.mod h1:JVmeZXugK4ondC6KQgrHTHWiF4JttpG5k6dWPMt62+k= -go.opentelemetry.io/collector/pdata v0.63.2-0.20221104003159-6b27644724d8 h1:7xeTQjfsOm9eogQeIxjSEhlik9qsbBGsnmkQHfyKaRE= -go.opentelemetry.io/collector/pdata v0.63.2-0.20221104003159-6b27644724d8/go.mod h1:IzvXUGQml2mrnvdb8zIlEW3qQs9oFLdD2hLwJdZ+pek= +go.opentelemetry.io/collector v0.63.2-0.20221108014805-0b08d5316426 h1:z/wLTMh7/vNxcFUDa5uG7/IPE3tYx6pzCWPV41ghyV8= +go.opentelemetry.io/collector v0.63.2-0.20221108014805-0b08d5316426/go.mod h1:+Zb70q0Rq17dA9FcHTiTjW6g96lvJ8kAZ0c+eWNkAv0= +go.opentelemetry.io/collector/pdata v0.63.2-0.20221108014805-0b08d5316426 h1:wKDpgP0Tx/gWI2SgDGAY1OTSeihhDivbbRqFR79IGTc= +go.opentelemetry.io/collector/pdata v0.63.2-0.20221108014805-0b08d5316426/go.mod h1:IzvXUGQml2mrnvdb8zIlEW3qQs9oFLdD2hLwJdZ+pek= 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.go b/extension/jaegerremotesampling/config.go index 5c2a31504af1..cfff8bd5709b 100644 --- a/extension/jaegerremotesampling/config.go +++ b/extension/jaegerremotesampling/config.go @@ -18,6 +18,7 @@ import ( "errors" "time" + "go.opentelemetry.io/collector/component" "go.opentelemetry.io/collector/config" "go.opentelemetry.io/collector/config/configgrpc" "go.opentelemetry.io/collector/config/confighttp" @@ -51,7 +52,7 @@ type Source struct { ReloadInterval time.Duration `mapstructure:"reload_interval"` } -var _ config.Extension = (*Config)(nil) +var _ component.ExtensionConfig = (*Config)(nil) // Validate checks if the extension configuration is valid func (cfg *Config) Validate() error { diff --git a/extension/jaegerremotesampling/config_test.go b/extension/jaegerremotesampling/config_test.go index affd601cebf1..7e7e9720ecbd 100644 --- a/extension/jaegerremotesampling/config_test.go +++ b/extension/jaegerremotesampling/config_test.go @@ -21,6 +21,7 @@ import ( "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" + "go.opentelemetry.io/collector/component" "go.opentelemetry.io/collector/config" "go.opentelemetry.io/collector/config/configgrpc" "go.opentelemetry.io/collector/config/confighttp" @@ -32,13 +33,13 @@ func TestLoadConfig(t *testing.T) { t.Parallel() tests := []struct { - id config.ComponentID - expected config.Extension + id component.ID + expected component.ExtensionConfig }{ { - id: config.NewComponentID(typeStr), + id: component.NewID(typeStr), expected: &Config{ - ExtensionSettings: config.NewExtensionSettings(config.NewComponentID(typeStr)), + ExtensionSettings: config.NewExtensionSettings(component.NewID(typeStr)), HTTPServerSettings: &confighttp.HTTPServerSettings{Endpoint: ":5778"}, GRPCServerSettings: &configgrpc.GRPCServerSettings{NetAddr: confignet.NetAddr{ Endpoint: ":14250", @@ -52,9 +53,9 @@ func TestLoadConfig(t *testing.T) { }, }, { - id: config.NewComponentIDWithName(typeStr, "1"), + id: component.NewIDWithName(typeStr, "1"), expected: &Config{ - ExtensionSettings: config.NewExtensionSettings(config.NewComponentID(typeStr)), + ExtensionSettings: config.NewExtensionSettings(component.NewID(typeStr)), HTTPServerSettings: &confighttp.HTTPServerSettings{Endpoint: ":5778"}, GRPCServerSettings: &configgrpc.GRPCServerSettings{NetAddr: confignet.NetAddr{ Endpoint: ":14250", @@ -75,7 +76,7 @@ func TestLoadConfig(t *testing.T) { cfg := factory.CreateDefaultConfig() sub, err := cm.Sub(tt.id.String()) require.NoError(t, err) - require.NoError(t, config.UnmarshalExtension(sub, cfg)) + require.NoError(t, component.UnmarshalExtensionConfig(sub, cfg)) assert.NoError(t, cfg.Validate()) assert.Equal(t, tt.expected, cfg) }) diff --git a/extension/jaegerremotesampling/factory.go b/extension/jaegerremotesampling/factory.go index 3588409d09ae..59fa7492b1eb 100644 --- a/extension/jaegerremotesampling/factory.go +++ b/extension/jaegerremotesampling/factory.go @@ -39,9 +39,9 @@ func NewFactory() component.ExtensionFactory { ) } -func createDefaultConfig() config.Extension { +func createDefaultConfig() component.ExtensionConfig { return &Config{ - ExtensionSettings: config.NewExtensionSettings(config.NewComponentID(typeStr)), + ExtensionSettings: config.NewExtensionSettings(component.NewID(typeStr)), HTTPServerSettings: &confighttp.HTTPServerSettings{ Endpoint: ":5778", }, @@ -55,6 +55,6 @@ func createDefaultConfig() config.Extension { } } -func createExtension(_ context.Context, set component.ExtensionCreateSettings, cfg config.Extension) (component.Extension, error) { +func createExtension(_ context.Context, set component.ExtensionCreateSettings, cfg component.ExtensionConfig) (component.Extension, error) { return newExtension(cfg.(*Config), set.TelemetrySettings), nil } diff --git a/extension/jaegerremotesampling/factory_test.go b/extension/jaegerremotesampling/factory_test.go index e9aadd4e45af..b7e98d32df3a 100644 --- a/extension/jaegerremotesampling/factory_test.go +++ b/extension/jaegerremotesampling/factory_test.go @@ -19,18 +19,18 @@ import ( "testing" "github.com/stretchr/testify/assert" + "go.opentelemetry.io/collector/component" "go.opentelemetry.io/collector/component/componenttest" "go.opentelemetry.io/collector/config" "go.opentelemetry.io/collector/config/configgrpc" "go.opentelemetry.io/collector/config/confighttp" "go.opentelemetry.io/collector/config/confignet" - "go.opentelemetry.io/collector/config/configtest" ) func TestCreateDefaultConfig(t *testing.T) { // prepare and test expected := &Config{ - ExtensionSettings: config.NewExtensionSettings(config.NewComponentID(typeStr)), + ExtensionSettings: config.NewExtensionSettings(component.NewID(typeStr)), HTTPServerSettings: &confighttp.HTTPServerSettings{Endpoint: ":5778"}, GRPCServerSettings: &configgrpc.GRPCServerSettings{NetAddr: confignet.NetAddr{ Endpoint: ":14250", @@ -43,7 +43,7 @@ func TestCreateDefaultConfig(t *testing.T) { // verify assert.Equal(t, expected, cfg) - assert.NoError(t, configtest.CheckConfigStruct(cfg)) + assert.NoError(t, componenttest.CheckConfigStruct(cfg)) } func TestCreateExtension(t *testing.T) { diff --git a/extension/jaegerremotesampling/go.mod b/extension/jaegerremotesampling/go.mod index 1adb76fdc4fe..efe2e8c445c3 100644 --- a/extension/jaegerremotesampling/go.mod +++ b/extension/jaegerremotesampling/go.mod @@ -5,7 +5,7 @@ go 1.18 require ( github.com/jaegertracing/jaeger v1.39.0 github.com/stretchr/testify v1.8.1 - go.opentelemetry.io/collector v0.63.2-0.20221104003159-6b27644724d8 + go.opentelemetry.io/collector v0.63.2-0.20221108014805-0b08d5316426 go.uber.org/zap v1.23.0 google.golang.org/grpc v1.50.1 ) @@ -45,7 +45,7 @@ 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.63.2-0.20221104003159-6b27644724d8 // indirect + go.opentelemetry.io/collector/pdata v0.63.2-0.20221108014805-0b08d5316426 // 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 6201ab7316ac..e52ccb1b0123 100644 --- a/extension/jaegerremotesampling/go.sum +++ b/extension/jaegerremotesampling/go.sum @@ -346,7 +346,7 @@ github.com/prometheus/client_golang v0.9.1/go.mod h1:7SWBe2y4D6OKWSNQJUaRYU/AaXP github.com/prometheus/client_golang v1.0.0/go.mod h1:db9x61etRT2tGnBNRi70OPL5FsnadC4Ky3P0J6CfImo= github.com/prometheus/client_golang v1.7.1/go.mod h1:PY5Wy2awLA44sXw4AOSfFBetzPP4j5+D6mVACh+pe2M= github.com/prometheus/client_golang v1.11.1/go.mod h1:Z6t4BnS23TR94PD6BsDNk8yVqroYurpAkEiz0P2BEV0= -github.com/prometheus/client_golang v1.13.0 h1:b71QUfeo5M8gq2+evJdTPfZhYMAU0uKPkyPJ7TPsloU= +github.com/prometheus/client_golang v1.13.1 h1:3gMjIY2+/hzmqhtUC/aQNYldJA6DtH3CgQvwS+02K1c= github.com/prometheus/client_model v0.0.0-20180712105110-5c3871d89910/go.mod h1:MbSGuTsp3dbXC40dX6PRTWyKYBIrTGTE9sqQNg2J8bo= github.com/prometheus/client_model v0.0.0-20190129233127-fd36f4220a90/go.mod h1:xMI15A0UPsDsEKsMN9yxemIoYk6Tm2C1GtYGdfGttqA= github.com/prometheus/client_model v0.0.0-20190812154241-14fe0d1b01d4/go.mod h1:xMI15A0UPsDsEKsMN9yxemIoYk6Tm2C1GtYGdfGttqA= @@ -421,11 +421,11 @@ 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.opencensus.io v0.22.5/go.mod h1:5pWMHQbX5EPX2/62yrJeAkowc+lfs/XD7Uxpq3pI6kk= -go.opencensus.io v0.23.0 h1:gqCw0LfLxScz8irSi8exQc7fyQ0fKQU/qnC/X8+V/1M= -go.opentelemetry.io/collector v0.63.2-0.20221104003159-6b27644724d8 h1:rOT5HzXXfSISc6FiH012zH2/EFjp37UXfjEqj5BpkWQ= -go.opentelemetry.io/collector v0.63.2-0.20221104003159-6b27644724d8/go.mod h1:JVmeZXugK4ondC6KQgrHTHWiF4JttpG5k6dWPMt62+k= -go.opentelemetry.io/collector/pdata v0.63.2-0.20221104003159-6b27644724d8 h1:7xeTQjfsOm9eogQeIxjSEhlik9qsbBGsnmkQHfyKaRE= -go.opentelemetry.io/collector/pdata v0.63.2-0.20221104003159-6b27644724d8/go.mod h1:IzvXUGQml2mrnvdb8zIlEW3qQs9oFLdD2hLwJdZ+pek= +go.opencensus.io v0.24.0 h1:y73uSU6J157QMP2kn2r30vwW1A2W2WFwSCGnAVxeaD0= +go.opentelemetry.io/collector v0.63.2-0.20221108014805-0b08d5316426 h1:z/wLTMh7/vNxcFUDa5uG7/IPE3tYx6pzCWPV41ghyV8= +go.opentelemetry.io/collector v0.63.2-0.20221108014805-0b08d5316426/go.mod h1:+Zb70q0Rq17dA9FcHTiTjW6g96lvJ8kAZ0c+eWNkAv0= +go.opentelemetry.io/collector/pdata v0.63.2-0.20221108014805-0b08d5316426 h1:wKDpgP0Tx/gWI2SgDGAY1OTSeihhDivbbRqFR79IGTc= +go.opentelemetry.io/collector/pdata v0.63.2-0.20221108014805-0b08d5316426/go.mod h1:IzvXUGQml2mrnvdb8zIlEW3qQs9oFLdD2hLwJdZ+pek= 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.go b/extension/oauth2clientauthextension/config.go index 541f5b914efb..f1db49aa7ff4 100644 --- a/extension/oauth2clientauthextension/config.go +++ b/extension/oauth2clientauthextension/config.go @@ -19,6 +19,7 @@ import ( "net/url" "time" + "go.opentelemetry.io/collector/component" "go.opentelemetry.io/collector/config" "go.opentelemetry.io/collector/config/configtls" ) @@ -61,7 +62,7 @@ type Config struct { Timeout time.Duration `mapstructure:"timeout,omitempty"` } -var _ config.Extension = (*Config)(nil) +var _ component.ExtensionConfig = (*Config)(nil) // Validate checks if the extension configuration is valid func (cfg *Config) Validate() error { diff --git a/extension/oauth2clientauthextension/config_test.go b/extension/oauth2clientauthextension/config_test.go index d3aea6c7d48e..2334f31d8f00 100644 --- a/extension/oauth2clientauthextension/config_test.go +++ b/extension/oauth2clientauthextension/config_test.go @@ -22,6 +22,7 @@ import ( "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" + "go.opentelemetry.io/collector/component" "go.opentelemetry.io/collector/config" "go.opentelemetry.io/collector/config/configtls" "go.opentelemetry.io/collector/confmap/confmaptest" @@ -31,14 +32,14 @@ func TestLoadConfig(t *testing.T) { t.Parallel() tests := []struct { - id config.ComponentID - expected config.Extension + id component.ID + expected component.ExtensionConfig expectedErr error }{ { - id: config.NewComponentID(typeStr), + id: component.NewID(typeStr), expected: &Config{ - ExtensionSettings: config.NewExtensionSettings(config.NewComponentID(typeStr)), + ExtensionSettings: config.NewExtensionSettings(component.NewID(typeStr)), ClientSecret: "someclientsecret", ClientID: "someclientid", EndpointParams: url.Values{"audience": []string{"someaudience"}}, @@ -48,9 +49,9 @@ func TestLoadConfig(t *testing.T) { }, }, { - id: config.NewComponentIDWithName(typeStr, "withtls"), + id: component.NewIDWithName(typeStr, "withtls"), expected: &Config{ - ExtensionSettings: config.NewExtensionSettings(config.NewComponentID(typeStr)), + ExtensionSettings: config.NewExtensionSettings(component.NewID(typeStr)), ClientSecret: "someclientsecret2", ClientID: "someclientid2", Scopes: []string{"api.metrics"}, @@ -69,15 +70,15 @@ func TestLoadConfig(t *testing.T) { }, }, { - id: config.NewComponentIDWithName(typeStr, "missingurl"), + id: component.NewIDWithName(typeStr, "missingurl"), expectedErr: errNoTokenURLProvided, }, { - id: config.NewComponentIDWithName(typeStr, "missingid"), + id: component.NewIDWithName(typeStr, "missingid"), expectedErr: errNoClientIDProvided, }, { - id: config.NewComponentIDWithName(typeStr, "missingsecret"), + id: component.NewIDWithName(typeStr, "missingsecret"), expectedErr: errNoClientSecretProvided, }, } @@ -89,7 +90,7 @@ func TestLoadConfig(t *testing.T) { cfg := factory.CreateDefaultConfig() sub, err := cm.Sub(tt.id.String()) require.NoError(t, err) - require.NoError(t, config.UnmarshalExtension(sub, cfg)) + require.NoError(t, component.UnmarshalExtensionConfig(sub, cfg)) if tt.expectedErr != nil { assert.ErrorIs(t, cfg.Validate(), tt.expectedErr) return diff --git a/extension/oauth2clientauthextension/factory.go b/extension/oauth2clientauthextension/factory.go index 56b088537a5e..57dd012c2b73 100644 --- a/extension/oauth2clientauthextension/factory.go +++ b/extension/oauth2clientauthextension/factory.go @@ -37,13 +37,13 @@ func NewFactory() component.ExtensionFactory { ) } -func createDefaultConfig() config.Extension { +func createDefaultConfig() component.ExtensionConfig { return &Config{ - ExtensionSettings: config.NewExtensionSettings(config.NewComponentID(typeStr)), + ExtensionSettings: config.NewExtensionSettings(component.NewID(typeStr)), } } -func createExtension(_ context.Context, set component.ExtensionCreateSettings, cfg config.Extension) (component.Extension, error) { +func createExtension(_ context.Context, set component.ExtensionCreateSettings, cfg component.ExtensionConfig) (component.Extension, error) { ca, err := newClientAuthenticator(cfg.(*Config), set.Logger) if err != nil { return nil, err diff --git a/extension/oauth2clientauthextension/factory_test.go b/extension/oauth2clientauthextension/factory_test.go index 7dc98a3e8809..2e983e0e965f 100644 --- a/extension/oauth2clientauthextension/factory_test.go +++ b/extension/oauth2clientauthextension/factory_test.go @@ -19,15 +19,15 @@ import ( "testing" "github.com/stretchr/testify/assert" + "go.opentelemetry.io/collector/component" "go.opentelemetry.io/collector/component/componenttest" "go.opentelemetry.io/collector/config" - "go.opentelemetry.io/collector/config/configtest" ) func TestCreateDefaultConfig(t *testing.T) { // prepare and test expected := &Config{ - ExtensionSettings: config.NewExtensionSettings(config.NewComponentID(typeStr)), + ExtensionSettings: config.NewExtensionSettings(component.NewID(typeStr)), } // test @@ -35,7 +35,7 @@ func TestCreateDefaultConfig(t *testing.T) { // verify assert.Equal(t, expected, cfg) - assert.NoError(t, configtest.CheckConfigStruct(cfg)) + assert.NoError(t, componenttest.CheckConfigStruct(cfg)) } func TestCreateExtension(t *testing.T) { diff --git a/extension/oauth2clientauthextension/go.mod b/extension/oauth2clientauthextension/go.mod index 86943c213c1c..e24f4b45704b 100644 --- a/extension/oauth2clientauthextension/go.mod +++ b/extension/oauth2clientauthextension/go.mod @@ -4,7 +4,7 @@ go 1.18 require ( github.com/stretchr/testify v1.8.1 - go.opentelemetry.io/collector v0.63.2-0.20221104003159-6b27644724d8 + go.opentelemetry.io/collector v0.63.2-0.20221108014805-0b08d5316426 go.uber.org/zap v1.23.0 golang.org/x/oauth2 v0.0.0-20220909003341-f21342109be1 google.golang.org/grpc v1.50.1 @@ -32,7 +32,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/pdata v0.63.2-0.20221104003159-6b27644724d8 // indirect + go.opentelemetry.io/collector/pdata v0.63.2-0.20221108014805-0b08d5316426 // 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 764bb482ee68..0812cd101642 100644 --- a/extension/oauth2clientauthextension/go.sum +++ b/extension/oauth2clientauthextension/go.sum @@ -274,10 +274,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.63.2-0.20221104003159-6b27644724d8 h1:rOT5HzXXfSISc6FiH012zH2/EFjp37UXfjEqj5BpkWQ= -go.opentelemetry.io/collector v0.63.2-0.20221104003159-6b27644724d8/go.mod h1:JVmeZXugK4ondC6KQgrHTHWiF4JttpG5k6dWPMt62+k= -go.opentelemetry.io/collector/pdata v0.63.2-0.20221104003159-6b27644724d8 h1:7xeTQjfsOm9eogQeIxjSEhlik9qsbBGsnmkQHfyKaRE= -go.opentelemetry.io/collector/pdata v0.63.2-0.20221104003159-6b27644724d8/go.mod h1:IzvXUGQml2mrnvdb8zIlEW3qQs9oFLdD2hLwJdZ+pek= +go.opentelemetry.io/collector v0.63.2-0.20221108014805-0b08d5316426 h1:z/wLTMh7/vNxcFUDa5uG7/IPE3tYx6pzCWPV41ghyV8= +go.opentelemetry.io/collector v0.63.2-0.20221108014805-0b08d5316426/go.mod h1:+Zb70q0Rq17dA9FcHTiTjW6g96lvJ8kAZ0c+eWNkAv0= +go.opentelemetry.io/collector/pdata v0.63.2-0.20221108014805-0b08d5316426 h1:wKDpgP0Tx/gWI2SgDGAY1OTSeihhDivbbRqFR79IGTc= +go.opentelemetry.io/collector/pdata v0.63.2-0.20221108014805-0b08d5316426/go.mod h1:IzvXUGQml2mrnvdb8zIlEW3qQs9oFLdD2hLwJdZ+pek= 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 f9f9294fe099..6b51ba207065 100644 --- a/extension/observer/dockerobserver/config_test.go +++ b/extension/observer/dockerobserver/config_test.go @@ -21,6 +21,7 @@ import ( "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" + "go.opentelemetry.io/collector/component" "go.opentelemetry.io/collector/config" "go.opentelemetry.io/collector/confmap/confmaptest" ) @@ -29,17 +30,17 @@ func TestLoadConfig(t *testing.T) { t.Parallel() tests := []struct { - id config.ComponentID - expected config.Extension + id component.ID + expected component.ExtensionConfig }{ { - id: config.NewComponentID(typeStr), + id: component.NewID(typeStr), expected: NewFactory().CreateDefaultConfig(), }, { - id: config.NewComponentIDWithName(typeStr, "all_settings"), + id: component.NewIDWithName(typeStr, "all_settings"), expected: &Config{ - ExtensionSettings: config.NewExtensionSettings(config.NewComponentID(typeStr)), + ExtensionSettings: config.NewExtensionSettings(component.NewID(typeStr)), Endpoint: "unix:///var/run/docker.sock", CacheSyncInterval: 5 * time.Minute, Timeout: 20 * time.Second, @@ -77,14 +78,14 @@ func TestValidateConfig(t *testing.T) { assert.Nil(t, cfg.Validate()) } -func loadConfig(t testing.TB, id config.ComponentID) *Config { +func loadConfig(t testing.TB, id component.ID) *Config { cm, err := confmaptest.LoadConf(filepath.Join("testdata", "config.yaml")) require.NoError(t, err) factory := NewFactory() cfg := factory.CreateDefaultConfig() sub, err := cm.Sub(id.String()) require.NoError(t, err) - require.NoError(t, config.UnmarshalExtension(sub, cfg)) + require.NoError(t, component.UnmarshalExtensionConfig(sub, cfg)) return cfg.(*Config) } diff --git a/extension/observer/dockerobserver/extension_test.go b/extension/observer/dockerobserver/extension_test.go index 94eb1729ed9e..d9bec5d48e4d 100644 --- a/extension/observer/dockerobserver/extension_test.go +++ b/extension/observer/dockerobserver/extension_test.go @@ -22,7 +22,7 @@ import ( dtypes "github.com/docker/docker/api/types" "github.com/stretchr/testify/require" - "go.opentelemetry.io/collector/config" + "go.opentelemetry.io/collector/component" "go.uber.org/zap" "github.com/open-telemetry/opentelemetry-collector-contrib/extension/observer" @@ -104,7 +104,7 @@ func TestCollectEndpointsDefaultConfig(t *testing.T) { } func TestCollectEndpointsAllConfigSettings(t *testing.T) { - extAllSettings := loadConfig(t, config.NewComponentIDWithName(typeStr, "all_settings")) + extAllSettings := loadConfig(t, component.NewIDWithName(typeStr, "all_settings")) ext, err := newObserver(zap.NewNop(), extAllSettings) require.NoError(t, err) require.NotNil(t, ext) @@ -141,7 +141,7 @@ func TestCollectEndpointsAllConfigSettings(t *testing.T) { } func TestCollectEndpointsUseHostnameIfPresent(t *testing.T) { - extUseHostname := loadConfig(t, config.NewComponentIDWithName(typeStr, "use_hostname_if_present")) + extUseHostname := loadConfig(t, component.NewIDWithName(typeStr, "use_hostname_if_present")) ext, err := newObserver(zap.NewNop(), extUseHostname) require.NoError(t, err) require.NotNil(t, ext) @@ -178,7 +178,7 @@ func TestCollectEndpointsUseHostnameIfPresent(t *testing.T) { } func TestCollectEndpointsUseHostBindings(t *testing.T) { - extHostBindings := loadConfig(t, config.NewComponentIDWithName(typeStr, "use_host_bindings")) + extHostBindings := loadConfig(t, component.NewIDWithName(typeStr, "use_host_bindings")) ext, err := newObserver(zap.NewNop(), extHostBindings) require.NoError(t, err) require.NotNil(t, ext) @@ -215,7 +215,7 @@ func TestCollectEndpointsUseHostBindings(t *testing.T) { } func TestCollectEndpointsIgnoreNonHostBindings(t *testing.T) { - extIgnoreHostBindings := loadConfig(t, config.NewComponentIDWithName(typeStr, "ignore_non_host_bindings")) + extIgnoreHostBindings := loadConfig(t, component.NewIDWithName(typeStr, "ignore_non_host_bindings")) ext, err := newObserver(zap.NewNop(), extIgnoreHostBindings) require.NoError(t, err) require.NotNil(t, ext) diff --git a/extension/observer/dockerobserver/factory.go b/extension/observer/dockerobserver/factory.go index 1dc7fb2c49c2..96d38d0459a4 100644 --- a/extension/observer/dockerobserver/factory.go +++ b/extension/observer/dockerobserver/factory.go @@ -24,7 +24,7 @@ import ( const ( // The value of extension "type" in configuration. - typeStr config.Type = "docker_observer" + typeStr component.Type = "docker_observer" ) // NewFactory should be called to create a factory with default values. @@ -37,9 +37,9 @@ func NewFactory() component.ExtensionFactory { ) } -func createDefaultConfig() config.Extension { +func createDefaultConfig() component.ExtensionConfig { return &Config{ - ExtensionSettings: config.NewExtensionSettings(config.NewComponentID(typeStr)), + ExtensionSettings: config.NewExtensionSettings(component.NewID(typeStr)), Endpoint: "unix:///var/run/docker.sock", Timeout: 5 * time.Second, CacheSyncInterval: 60 * time.Minute, @@ -50,7 +50,7 @@ func createDefaultConfig() config.Extension { func createExtension( _ context.Context, settings component.ExtensionCreateSettings, - cfg config.Extension, + cfg component.ExtensionConfig, ) (component.Extension, error) { config := cfg.(*Config) return newObserver(settings.Logger, config) diff --git a/extension/observer/dockerobserver/factory_test.go b/extension/observer/dockerobserver/factory_test.go index 5ede5bc27ba1..d5e5c3983087 100644 --- a/extension/observer/dockerobserver/factory_test.go +++ b/extension/observer/dockerobserver/factory_test.go @@ -19,13 +19,13 @@ import ( "testing" "github.com/stretchr/testify/require" + "go.opentelemetry.io/collector/component" "go.opentelemetry.io/collector/component/componenttest" "go.opentelemetry.io/collector/config" - "go.opentelemetry.io/collector/config/configtest" ) func TestValidConfig(t *testing.T) { - err := configtest.CheckConfigStruct(createDefaultConfig()) + err := componenttest.CheckConfigStruct(createDefaultConfig()) require.NoError(t, err) } @@ -34,7 +34,7 @@ func TestCreateExtension(t *testing.T) { context.Background(), componenttest.NewNopExtensionCreateSettings(), &Config{ - ExtensionSettings: config.NewExtensionSettings(config.NewComponentID(typeStr)), + ExtensionSettings: config.NewExtensionSettings(component.NewID(typeStr)), }, ) require.NoError(t, err) diff --git a/extension/observer/dockerobserver/go.mod b/extension/observer/dockerobserver/go.mod index b4ac164027d8..ff3c6d82f8a1 100644 --- a/extension/observer/dockerobserver/go.mod +++ b/extension/observer/dockerobserver/go.mod @@ -10,7 +10,7 @@ require ( github.com/open-telemetry/opentelemetry-collector-contrib/internal/containertest v0.63.0 github.com/open-telemetry/opentelemetry-collector-contrib/internal/docker v0.63.0 github.com/stretchr/testify v1.8.1 - go.opentelemetry.io/collector v0.63.2-0.20221104003159-6b27644724d8 + go.opentelemetry.io/collector v0.63.2-0.20221108014805-0b08d5316426 go.uber.org/zap v1.23.0 ) @@ -40,7 +40,7 @@ require ( github.com/pkg/errors v0.9.1 // indirect github.com/pmezard/go-difflib v1.0.0 // indirect github.com/sirupsen/logrus v1.8.1 // indirect - go.opentelemetry.io/collector/pdata v0.63.2-0.20221104003159-6b27644724d8 // indirect + go.opentelemetry.io/collector/pdata v0.63.2-0.20221108014805-0b08d5316426 // 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 daf89314caf7..af02dbbd3f8a 100644 --- a/extension/observer/dockerobserver/go.sum +++ b/extension/observer/dockerobserver/go.sum @@ -292,10 +292,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.63.2-0.20221104003159-6b27644724d8 h1:rOT5HzXXfSISc6FiH012zH2/EFjp37UXfjEqj5BpkWQ= -go.opentelemetry.io/collector v0.63.2-0.20221104003159-6b27644724d8/go.mod h1:JVmeZXugK4ondC6KQgrHTHWiF4JttpG5k6dWPMt62+k= -go.opentelemetry.io/collector/pdata v0.63.2-0.20221104003159-6b27644724d8 h1:7xeTQjfsOm9eogQeIxjSEhlik9qsbBGsnmkQHfyKaRE= -go.opentelemetry.io/collector/pdata v0.63.2-0.20221104003159-6b27644724d8/go.mod h1:IzvXUGQml2mrnvdb8zIlEW3qQs9oFLdD2hLwJdZ+pek= +go.opentelemetry.io/collector v0.63.2-0.20221108014805-0b08d5316426 h1:z/wLTMh7/vNxcFUDa5uG7/IPE3tYx6pzCWPV41ghyV8= +go.opentelemetry.io/collector v0.63.2-0.20221108014805-0b08d5316426/go.mod h1:+Zb70q0Rq17dA9FcHTiTjW6g96lvJ8kAZ0c+eWNkAv0= +go.opentelemetry.io/collector/pdata v0.63.2-0.20221108014805-0b08d5316426 h1:wKDpgP0Tx/gWI2SgDGAY1OTSeihhDivbbRqFR79IGTc= +go.opentelemetry.io/collector/pdata v0.63.2-0.20221108014805-0b08d5316426/go.mod h1:IzvXUGQml2mrnvdb8zIlEW3qQs9oFLdD2hLwJdZ+pek= 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.go b/extension/observer/ecsobserver/config.go index 27c87bc00d6a..46bb487c86cf 100644 --- a/extension/observer/ecsobserver/config.go +++ b/extension/observer/ecsobserver/config.go @@ -19,6 +19,7 @@ import ( "os" "time" + "go.opentelemetry.io/collector/component" "go.opentelemetry.io/collector/config" ) @@ -82,7 +83,7 @@ func (c *Config) Validate() error { // DefaultConfig only applies docker label func DefaultConfig() Config { return Config{ - ExtensionSettings: config.NewExtensionSettings(config.NewComponentID(typeStr)), + ExtensionSettings: config.NewExtensionSettings(component.NewID(typeStr)), ClusterName: "default", ClusterRegion: os.Getenv(awsRegionEnvKey), ResultFile: "/etc/ecs_sd_targets.yaml", @@ -100,7 +101,7 @@ func DefaultConfig() Config { // It can be used to validate if the struct tags like mapstructure, yaml are working properly. func exampleConfig() *Config { return &Config{ - ExtensionSettings: config.NewExtensionSettings(config.NewComponentID(typeStr)), + ExtensionSettings: config.NewExtensionSettings(component.NewID(typeStr)), ClusterName: "ecs-sd-test-1", ClusterRegion: "us-west-2", ResultFile: "/etc/ecs_sd_targets.yaml", diff --git a/extension/observer/ecsobserver/config_test.go b/extension/observer/ecsobserver/config_test.go index 99c553cf21ab..435434bb6aee 100644 --- a/extension/observer/ecsobserver/config_test.go +++ b/extension/observer/ecsobserver/config_test.go @@ -20,7 +20,7 @@ import ( "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" - "go.opentelemetry.io/collector/config" + "go.opentelemetry.io/collector/component" "go.opentelemetry.io/collector/confmap/confmaptest" ) @@ -28,17 +28,17 @@ func TestLoadConfig(t *testing.T) { t.Parallel() tests := []struct { - id config.ComponentID - expected config.Extension + id component.ID + expected component.ExtensionConfig expectedErr bool }{ { - id: config.NewComponentID(typeStr), + id: component.NewID(typeStr), expected: NewFactory().CreateDefaultConfig(), }, { - id: config.NewComponentIDWithName(typeStr, "1"), - expected: func() config.Extension { + id: component.NewIDWithName(typeStr, "1"), + expected: func() component.ExtensionConfig { cfg := DefaultConfig() cfg.ClusterRegion = "us-west-2" cfg.JobLabelName = "my_prometheus_job" @@ -46,12 +46,12 @@ func TestLoadConfig(t *testing.T) { }(), }, { - id: config.NewComponentIDWithName(typeStr, "2"), + id: component.NewIDWithName(typeStr, "2"), expected: exampleConfig(), }, { - id: config.NewComponentIDWithName(typeStr, "3"), - expected: func() config.Extension { + id: component.NewIDWithName(typeStr, "3"), + expected: func() component.ExtensionConfig { cfg := DefaultConfig() cfg.DockerLabels = []DockerLabelConfig{ { @@ -62,7 +62,7 @@ func TestLoadConfig(t *testing.T) { }(), }, { - id: config.NewComponentIDWithName(typeStr, "invalid"), + id: component.NewIDWithName(typeStr, "invalid"), expectedErr: true, }, } @@ -74,7 +74,7 @@ func TestLoadConfig(t *testing.T) { cfg := factory.CreateDefaultConfig() sub, err := cm.Sub(tt.id.String()) require.NoError(t, err) - require.NoError(t, config.UnmarshalExtension(sub, cfg)) + require.NoError(t, component.UnmarshalExtensionConfig(sub, cfg)) if tt.expectedErr { assert.Error(t, cfg.Validate()) return diff --git a/extension/observer/ecsobserver/factory.go b/extension/observer/ecsobserver/factory.go index f3739e0eee2b..5d53e505c03e 100644 --- a/extension/observer/ecsobserver/factory.go +++ b/extension/observer/ecsobserver/factory.go @@ -19,11 +19,10 @@ import ( "fmt" "go.opentelemetry.io/collector/component" - "go.opentelemetry.io/collector/config" ) const ( - typeStr config.Type = "ecs_observer" + typeStr component.Type = "ecs_observer" ) // NewFactory creates a factory for ECSObserver extension. @@ -36,12 +35,12 @@ func NewFactory() component.ExtensionFactory { ) } -func createDefaultConfig() config.Extension { +func createDefaultConfig() component.ExtensionConfig { cfg := DefaultConfig() return &cfg } -func createExtension(ctx context.Context, params component.ExtensionCreateSettings, cfg config.Extension) (component.Extension, error) { +func createExtension(ctx context.Context, params component.ExtensionCreateSettings, cfg component.ExtensionConfig) (component.Extension, error) { sdCfg := cfg.(*Config) fetcher, err := newTaskFetcherFromConfig(*sdCfg, params.Logger) if err != nil { diff --git a/extension/observer/ecsobserver/go.mod b/extension/observer/ecsobserver/go.mod index 42ad94186907..b9c121eddcbe 100644 --- a/extension/observer/ecsobserver/go.mod +++ b/extension/observer/ecsobserver/go.mod @@ -6,7 +6,7 @@ require ( github.com/aws/aws-sdk-go v1.44.127 github.com/hashicorp/golang-lru v0.5.4 github.com/stretchr/testify v1.8.1 - go.opentelemetry.io/collector v0.63.2-0.20221104003159-6b27644724d8 + go.opentelemetry.io/collector v0.63.2-0.20221108014805-0b08d5316426 go.uber.org/multierr v1.8.0 go.uber.org/zap v1.23.0 gopkg.in/yaml.v2 v2.4.0 @@ -28,7 +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/pdata v0.63.2-0.20221104003159-6b27644724d8 // indirect + go.opentelemetry.io/collector/pdata v0.63.2-0.20221108014805-0b08d5316426 // 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 51f751486668..fd28e5fdf370 100644 --- a/extension/observer/ecsobserver/go.sum +++ b/extension/observer/ecsobserver/go.sum @@ -271,10 +271,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.63.2-0.20221104003159-6b27644724d8 h1:rOT5HzXXfSISc6FiH012zH2/EFjp37UXfjEqj5BpkWQ= -go.opentelemetry.io/collector v0.63.2-0.20221104003159-6b27644724d8/go.mod h1:JVmeZXugK4ondC6KQgrHTHWiF4JttpG5k6dWPMt62+k= -go.opentelemetry.io/collector/pdata v0.63.2-0.20221104003159-6b27644724d8 h1:7xeTQjfsOm9eogQeIxjSEhlik9qsbBGsnmkQHfyKaRE= -go.opentelemetry.io/collector/pdata v0.63.2-0.20221104003159-6b27644724d8/go.mod h1:IzvXUGQml2mrnvdb8zIlEW3qQs9oFLdD2hLwJdZ+pek= +go.opentelemetry.io/collector v0.63.2-0.20221108014805-0b08d5316426 h1:z/wLTMh7/vNxcFUDa5uG7/IPE3tYx6pzCWPV41ghyV8= +go.opentelemetry.io/collector v0.63.2-0.20221108014805-0b08d5316426/go.mod h1:+Zb70q0Rq17dA9FcHTiTjW6g96lvJ8kAZ0c+eWNkAv0= +go.opentelemetry.io/collector/pdata v0.63.2-0.20221108014805-0b08d5316426 h1:wKDpgP0Tx/gWI2SgDGAY1OTSeihhDivbbRqFR79IGTc= +go.opentelemetry.io/collector/pdata v0.63.2-0.20221108014805-0b08d5316426/go.mod h1:IzvXUGQml2mrnvdb8zIlEW3qQs9oFLdD2hLwJdZ+pek= 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.go b/extension/observer/ecstaskobserver/config.go index 44298f1b7dcd..2ca9cc98b3f0 100644 --- a/extension/observer/ecstaskobserver/config.go +++ b/extension/observer/ecstaskobserver/config.go @@ -19,6 +19,7 @@ import ( "net/url" "time" + "go.opentelemetry.io/collector/component" "go.opentelemetry.io/collector/config" "go.opentelemetry.io/collector/config/confighttp" ) @@ -53,7 +54,7 @@ func (c Config) Validate() error { func defaultConfig() Config { return Config{ - ExtensionSettings: config.NewExtensionSettings(config.NewComponentID(typeStr)), + ExtensionSettings: config.NewExtensionSettings(component.NewID(typeStr)), RefreshInterval: defaultRefreshInterval, PortLabels: []string{defaultPortLabel}, } diff --git a/extension/observer/ecstaskobserver/config_test.go b/extension/observer/ecstaskobserver/config_test.go index 7b581632f086..59b8b00ac1da 100644 --- a/extension/observer/ecstaskobserver/config_test.go +++ b/extension/observer/ecstaskobserver/config_test.go @@ -21,6 +21,7 @@ import ( "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" + "go.opentelemetry.io/collector/component" "go.opentelemetry.io/collector/config" "go.opentelemetry.io/collector/config/confighttp" "go.opentelemetry.io/collector/confmap/confmaptest" @@ -30,18 +31,18 @@ func TestLoadConfig(t *testing.T) { t.Parallel() tests := []struct { - id config.ComponentID - expected config.Extension + id component.ID + expected component.ExtensionConfig expectedErr string }{ { - id: config.NewComponentID(typeStr), + id: component.NewID(typeStr), expected: NewFactory().CreateDefaultConfig(), }, { - id: config.NewComponentIDWithName(typeStr, "with-endpoint"), + id: component.NewIDWithName(typeStr, "with-endpoint"), expected: &Config{ - ExtensionSettings: config.NewExtensionSettings(config.NewComponentID(typeStr)), + ExtensionSettings: config.NewExtensionSettings(component.NewID(typeStr)), HTTPClientSettings: confighttp.HTTPClientSettings{ Endpoint: "http://a.valid.url:1234/path", }, @@ -50,15 +51,15 @@ func TestLoadConfig(t *testing.T) { }, }, { - id: config.NewComponentIDWithName(typeStr, "with-port-labels"), + id: component.NewIDWithName(typeStr, "with-port-labels"), expected: &Config{ - ExtensionSettings: config.NewExtensionSettings(config.NewComponentID(typeStr)), + ExtensionSettings: config.NewExtensionSettings(component.NewID(typeStr)), PortLabels: []string{"A_PORT_LABEL", "ANOTHER_PORT_LABEL"}, RefreshInterval: 30 * time.Second, }, }, { - id: config.NewComponentIDWithName(typeStr, "invalid"), + id: component.NewIDWithName(typeStr, "invalid"), expectedErr: `failed to parse ecs task metadata endpoint "_:invalid": parse "_:invalid": first path segment in URL cannot contain colon`, }, } @@ -70,7 +71,7 @@ func TestLoadConfig(t *testing.T) { cfg := factory.CreateDefaultConfig() sub, err := cm.Sub(tt.id.String()) require.NoError(t, err) - require.NoError(t, config.UnmarshalExtension(sub, cfg)) + require.NoError(t, component.UnmarshalExtensionConfig(sub, cfg)) if tt.expectedErr != "" { assert.EqualError(t, cfg.Validate(), tt.expectedErr) return diff --git a/extension/observer/ecstaskobserver/factory.go b/extension/observer/ecstaskobserver/factory.go index 228e12a5cd44..46a524490226 100644 --- a/extension/observer/ecstaskobserver/factory.go +++ b/extension/observer/ecstaskobserver/factory.go @@ -20,14 +20,13 @@ import ( "net/url" "go.opentelemetry.io/collector/component" - "go.opentelemetry.io/collector/config" "github.com/open-telemetry/opentelemetry-collector-contrib/extension/observer" "github.com/open-telemetry/opentelemetry-collector-contrib/internal/aws/ecsutil" ) const ( - typeStr config.Type = "ecs_task_observer" + typeStr component.Type = "ecs_task_observer" ) // NewFactory creates a factory for ECSTaskObserver extension. @@ -40,7 +39,7 @@ func NewFactory() component.ExtensionFactory { ) } -func createDefaultConfig() config.Extension { +func createDefaultConfig() component.ExtensionConfig { cfg := defaultConfig() return &cfg } @@ -53,7 +52,7 @@ type extension struct { func createExtension( _ context.Context, params component.ExtensionCreateSettings, - cfg config.Extension, + cfg component.ExtensionConfig, ) (component.Extension, error) { obsCfg := cfg.(*Config) diff --git a/extension/observer/ecstaskobserver/go.mod b/extension/observer/ecstaskobserver/go.mod index 400a686ef064..821123eb8b0d 100644 --- a/extension/observer/ecstaskobserver/go.mod +++ b/extension/observer/ecstaskobserver/go.mod @@ -7,7 +7,7 @@ require ( github.com/open-telemetry/opentelemetry-collector-contrib/internal/aws/ecsutil v0.63.0 github.com/open-telemetry/opentelemetry-collector-contrib/internal/common v0.63.0 github.com/stretchr/testify v1.8.1 - go.opentelemetry.io/collector v0.63.2-0.20221104003159-6b27644724d8 + go.opentelemetry.io/collector v0.63.2-0.20221108014805-0b08d5316426 go.uber.org/zap v1.23.0 ) @@ -29,7 +29,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/pdata v0.63.2-0.20221104003159-6b27644724d8 // indirect + go.opentelemetry.io/collector/pdata v0.63.2-0.20221108014805-0b08d5316426 // 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 23f70efd8dc3..2b93a4490341 100644 --- a/extension/observer/ecstaskobserver/go.sum +++ b/extension/observer/ecstaskobserver/go.sum @@ -272,10 +272,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.63.2-0.20221104003159-6b27644724d8 h1:rOT5HzXXfSISc6FiH012zH2/EFjp37UXfjEqj5BpkWQ= -go.opentelemetry.io/collector v0.63.2-0.20221104003159-6b27644724d8/go.mod h1:JVmeZXugK4ondC6KQgrHTHWiF4JttpG5k6dWPMt62+k= -go.opentelemetry.io/collector/pdata v0.63.2-0.20221104003159-6b27644724d8 h1:7xeTQjfsOm9eogQeIxjSEhlik9qsbBGsnmkQHfyKaRE= -go.opentelemetry.io/collector/pdata v0.63.2-0.20221104003159-6b27644724d8/go.mod h1:IzvXUGQml2mrnvdb8zIlEW3qQs9oFLdD2hLwJdZ+pek= +go.opentelemetry.io/collector v0.63.2-0.20221108014805-0b08d5316426 h1:z/wLTMh7/vNxcFUDa5uG7/IPE3tYx6pzCWPV41ghyV8= +go.opentelemetry.io/collector v0.63.2-0.20221108014805-0b08d5316426/go.mod h1:+Zb70q0Rq17dA9FcHTiTjW6g96lvJ8kAZ0c+eWNkAv0= +go.opentelemetry.io/collector/pdata v0.63.2-0.20221108014805-0b08d5316426 h1:wKDpgP0Tx/gWI2SgDGAY1OTSeihhDivbbRqFR79IGTc= +go.opentelemetry.io/collector/pdata v0.63.2-0.20221108014805-0b08d5316426/go.mod h1:IzvXUGQml2mrnvdb8zIlEW3qQs9oFLdD2hLwJdZ+pek= 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 8f989eb7fe6b..878cb41ca047 100644 --- a/extension/observer/hostobserver/config_test.go +++ b/extension/observer/hostobserver/config_test.go @@ -21,6 +21,7 @@ import ( "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" + "go.opentelemetry.io/collector/component" "go.opentelemetry.io/collector/config" "go.opentelemetry.io/collector/confmap/confmaptest" ) @@ -29,17 +30,17 @@ func TestLoadConfig(t *testing.T) { t.Parallel() tests := []struct { - id config.ComponentID - expected config.Extension + id component.ID + expected component.ExtensionConfig }{ { - id: config.NewComponentID(typeStr), + id: component.NewID(typeStr), expected: NewFactory().CreateDefaultConfig(), }, { - id: config.NewComponentIDWithName(typeStr, "all_settings"), + id: component.NewIDWithName(typeStr, "all_settings"), expected: &Config{ - ExtensionSettings: config.NewExtensionSettings(config.NewComponentID(typeStr)), + ExtensionSettings: config.NewExtensionSettings(component.NewID(typeStr)), RefreshInterval: 20 * time.Second, }, }, @@ -52,7 +53,7 @@ func TestLoadConfig(t *testing.T) { cfg := factory.CreateDefaultConfig() sub, err := cm.Sub(tt.id.String()) require.NoError(t, err) - require.NoError(t, config.UnmarshalExtension(sub, cfg)) + require.NoError(t, component.UnmarshalExtensionConfig(sub, cfg)) assert.NoError(t, cfg.Validate()) assert.Equal(t, tt.expected, cfg) diff --git a/extension/observer/hostobserver/factory.go b/extension/observer/hostobserver/factory.go index cc5f3e3b4da6..e5426b1de42f 100644 --- a/extension/observer/hostobserver/factory.go +++ b/extension/observer/hostobserver/factory.go @@ -24,7 +24,7 @@ import ( const ( // The value of extension "type" in configuration. - typeStr config.Type = "host_observer" + typeStr component.Type = "host_observer" defaultCollectionInterval = 10 ) @@ -39,9 +39,9 @@ func NewFactory() component.ExtensionFactory { ) } -func createDefaultConfig() config.Extension { +func createDefaultConfig() component.ExtensionConfig { return &Config{ - ExtensionSettings: config.NewExtensionSettings(config.NewComponentID(typeStr)), + ExtensionSettings: config.NewExtensionSettings(component.NewID(typeStr)), RefreshInterval: defaultCollectionInterval * time.Second, } } @@ -49,7 +49,7 @@ func createDefaultConfig() config.Extension { func createExtension( _ context.Context, params component.ExtensionCreateSettings, - cfg config.Extension, + cfg component.ExtensionConfig, ) (component.Extension, error) { config := cfg.(*Config) return newObserver(params.Logger, config) diff --git a/extension/observer/hostobserver/factory_test.go b/extension/observer/hostobserver/factory_test.go index b8ca94ebf7b6..345137c14cf3 100644 --- a/extension/observer/hostobserver/factory_test.go +++ b/extension/observer/hostobserver/factory_test.go @@ -19,13 +19,13 @@ import ( "testing" "github.com/stretchr/testify/require" + "go.opentelemetry.io/collector/component" "go.opentelemetry.io/collector/component/componenttest" "go.opentelemetry.io/collector/config" - "go.opentelemetry.io/collector/config/configtest" ) func TestValidConfig(t *testing.T) { - err := configtest.CheckConfigStruct(createDefaultConfig()) + err := componenttest.CheckConfigStruct(createDefaultConfig()) require.NoError(t, err) } @@ -34,7 +34,7 @@ func TestCreateMetricsReceiver(t *testing.T) { context.Background(), componenttest.NewNopExtensionCreateSettings(), &Config{ - ExtensionSettings: config.NewExtensionSettings(config.NewComponentID(typeStr)), + ExtensionSettings: config.NewExtensionSettings(component.NewID(typeStr)), }, ) require.NoError(t, err) diff --git a/extension/observer/hostobserver/go.mod b/extension/observer/hostobserver/go.mod index cb7a46d8a08c..4745fd789b72 100644 --- a/extension/observer/hostobserver/go.mod +++ b/extension/observer/hostobserver/go.mod @@ -6,7 +6,7 @@ require ( github.com/open-telemetry/opentelemetry-collector-contrib/extension/observer v0.63.0 github.com/shirou/gopsutil/v3 v3.22.10 github.com/stretchr/testify v1.8.1 - go.opentelemetry.io/collector v0.63.2-0.20221104003159-6b27644724d8 + go.opentelemetry.io/collector v0.63.2-0.20221108014805-0b08d5316426 go.uber.org/zap v1.23.0 ) @@ -33,7 +33,7 @@ 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.63.2-0.20221104003159-6b27644724d8 // indirect + go.opentelemetry.io/collector/pdata v0.63.2-0.20221108014805-0b08d5316426 // 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 185cd4f87563..cf5522fe7314 100644 --- a/extension/observer/hostobserver/go.sum +++ b/extension/observer/hostobserver/go.sum @@ -282,10 +282,10 @@ 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.63.2-0.20221104003159-6b27644724d8 h1:rOT5HzXXfSISc6FiH012zH2/EFjp37UXfjEqj5BpkWQ= -go.opentelemetry.io/collector v0.63.2-0.20221104003159-6b27644724d8/go.mod h1:JVmeZXugK4ondC6KQgrHTHWiF4JttpG5k6dWPMt62+k= -go.opentelemetry.io/collector/pdata v0.63.2-0.20221104003159-6b27644724d8 h1:7xeTQjfsOm9eogQeIxjSEhlik9qsbBGsnmkQHfyKaRE= -go.opentelemetry.io/collector/pdata v0.63.2-0.20221104003159-6b27644724d8/go.mod h1:IzvXUGQml2mrnvdb8zIlEW3qQs9oFLdD2hLwJdZ+pek= +go.opentelemetry.io/collector v0.63.2-0.20221108014805-0b08d5316426 h1:z/wLTMh7/vNxcFUDa5uG7/IPE3tYx6pzCWPV41ghyV8= +go.opentelemetry.io/collector v0.63.2-0.20221108014805-0b08d5316426/go.mod h1:+Zb70q0Rq17dA9FcHTiTjW6g96lvJ8kAZ0c+eWNkAv0= +go.opentelemetry.io/collector/pdata v0.63.2-0.20221108014805-0b08d5316426 h1:wKDpgP0Tx/gWI2SgDGAY1OTSeihhDivbbRqFR79IGTc= +go.opentelemetry.io/collector/pdata v0.63.2-0.20221108014805-0b08d5316426/go.mod h1:IzvXUGQml2mrnvdb8zIlEW3qQs9oFLdD2hLwJdZ+pek= 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 04bcf3f70240..43293d4f6243 100644 --- a/extension/observer/k8sobserver/config_test.go +++ b/extension/observer/k8sobserver/config_test.go @@ -20,6 +20,7 @@ import ( "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" + "go.opentelemetry.io/collector/component" "go.opentelemetry.io/collector/config" "go.opentelemetry.io/collector/confmap/confmaptest" @@ -30,27 +31,27 @@ func TestLoadConfig(t *testing.T) { t.Parallel() tests := []struct { - id config.ComponentID - expected config.Extension + id component.ID + expected component.ExtensionConfig expectedErr string }{ { - id: config.NewComponentID(typeStr), + id: component.NewID(typeStr), expected: NewFactory().CreateDefaultConfig(), }, { - id: config.NewComponentIDWithName(typeStr, "own-node-only"), + id: component.NewIDWithName(typeStr, "own-node-only"), expected: &Config{ - ExtensionSettings: config.NewExtensionSettings(config.NewComponentID(typeStr)), + ExtensionSettings: config.NewExtensionSettings(component.NewID(typeStr)), Node: "node-1", APIConfig: k8sconfig.APIConfig{AuthType: k8sconfig.AuthTypeKubeConfig}, ObservePods: true, }, }, { - id: config.NewComponentIDWithName(typeStr, "observe-all"), + id: component.NewIDWithName(typeStr, "observe-all"), expected: &Config{ - ExtensionSettings: config.NewExtensionSettings(config.NewComponentID(typeStr)), + ExtensionSettings: config.NewExtensionSettings(component.NewID(typeStr)), Node: "", APIConfig: k8sconfig.APIConfig{AuthType: k8sconfig.AuthTypeNone}, ObservePods: true, @@ -58,11 +59,11 @@ func TestLoadConfig(t *testing.T) { }, }, { - id: config.NewComponentIDWithName(typeStr, "invalid_auth"), + id: component.NewIDWithName(typeStr, "invalid_auth"), expectedErr: "invalid authType for kubernetes: not a real auth type", }, { - id: config.NewComponentIDWithName(typeStr, "invalid_no_observing"), + id: component.NewIDWithName(typeStr, "invalid_no_observing"), expectedErr: "one of observe_pods and observe_nodes must be true", }, } @@ -74,7 +75,7 @@ func TestLoadConfig(t *testing.T) { cfg := factory.CreateDefaultConfig() sub, err := cm.Sub(tt.id.String()) require.NoError(t, err) - require.NoError(t, config.UnmarshalExtension(sub, cfg)) + require.NoError(t, component.UnmarshalExtensionConfig(sub, cfg)) if tt.expectedErr != "" { assert.EqualError(t, cfg.Validate(), tt.expectedErr) return diff --git a/extension/observer/k8sobserver/factory.go b/extension/observer/k8sobserver/factory.go index 72887ced82e9..9006774f3501 100644 --- a/extension/observer/k8sobserver/factory.go +++ b/extension/observer/k8sobserver/factory.go @@ -25,7 +25,7 @@ import ( const ( // The value of extension "type" in configuration. - typeStr config.Type = "k8s_observer" + typeStr component.Type = "k8s_observer" ) // NewFactory should be called to create a factory with default values. @@ -39,9 +39,9 @@ func NewFactory() component.ExtensionFactory { } // CreateDefaultConfig creates the default configuration for the extension. -func createDefaultConfig() config.Extension { +func createDefaultConfig() component.ExtensionConfig { return &Config{ - ExtensionSettings: config.NewExtensionSettings(config.NewComponentID(typeStr)), + ExtensionSettings: config.NewExtensionSettings(component.NewID(typeStr)), APIConfig: k8sconfig.APIConfig{AuthType: k8sconfig.AuthTypeServiceAccount}, ObservePods: true, ObserveNodes: false, @@ -52,7 +52,7 @@ func createDefaultConfig() config.Extension { func createExtension( ctx context.Context, params component.ExtensionCreateSettings, - cfg config.Extension, + cfg component.ExtensionConfig, ) (component.Extension, error) { return newObserver(cfg.(*Config), params.TelemetrySettings) } diff --git a/extension/observer/k8sobserver/factory_test.go b/extension/observer/k8sobserver/factory_test.go index c2cd9254baf9..f08879af1f18 100644 --- a/extension/observer/k8sobserver/factory_test.go +++ b/extension/observer/k8sobserver/factory_test.go @@ -20,9 +20,9 @@ import ( "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" + "go.opentelemetry.io/collector/component" "go.opentelemetry.io/collector/component/componenttest" "go.opentelemetry.io/collector/config" - "go.opentelemetry.io/collector/config/configtest" "github.com/open-telemetry/opentelemetry-collector-contrib/internal/k8sconfig" ) @@ -30,9 +30,9 @@ import ( func TestFactory_CreateDefaultConfig(t *testing.T) { factory := NewFactory() cfg := factory.CreateDefaultConfig().(*Config) - assert.Equal(t, cfg.ExtensionSettings, config.NewExtensionSettings(config.NewComponentID(typeStr))) + assert.Equal(t, cfg.ExtensionSettings, config.NewExtensionSettings(component.NewID(typeStr))) assert.Equal(t, cfg.APIConfig, k8sconfig.APIConfig{AuthType: k8sconfig.AuthTypeServiceAccount}) - assert.NoError(t, configtest.CheckConfigStruct(cfg)) + assert.NoError(t, componenttest.CheckConfigStruct(cfg)) } func TestFactory_CreateExtension(t *testing.T) { diff --git a/extension/observer/k8sobserver/go.mod b/extension/observer/k8sobserver/go.mod index 62d67c2f3b93..79d6cc40f1cf 100644 --- a/extension/observer/k8sobserver/go.mod +++ b/extension/observer/k8sobserver/go.mod @@ -6,7 +6,7 @@ require ( github.com/open-telemetry/opentelemetry-collector-contrib/extension/observer v0.63.0 github.com/open-telemetry/opentelemetry-collector-contrib/internal/k8sconfig v0.63.0 github.com/stretchr/testify v1.8.1 - go.opentelemetry.io/collector v0.63.2-0.20221104003159-6b27644724d8 + go.opentelemetry.io/collector v0.63.2-0.20221108014805-0b08d5316426 go.uber.org/zap v1.23.0 k8s.io/api v0.25.3 k8s.io/apimachinery v0.25.3 @@ -45,7 +45,7 @@ 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.63.2-0.20221104003159-6b27644724d8 // indirect + go.opentelemetry.io/collector/pdata v0.63.2-0.20221108014805-0b08d5316426 // 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 df7b3082b9d5..585cdabc2dcf 100644 --- a/extension/observer/k8sobserver/go.sum +++ b/extension/observer/k8sobserver/go.sum @@ -432,10 +432,10 @@ 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.63.2-0.20221104003159-6b27644724d8 h1:rOT5HzXXfSISc6FiH012zH2/EFjp37UXfjEqj5BpkWQ= -go.opentelemetry.io/collector v0.63.2-0.20221104003159-6b27644724d8/go.mod h1:JVmeZXugK4ondC6KQgrHTHWiF4JttpG5k6dWPMt62+k= -go.opentelemetry.io/collector/pdata v0.63.2-0.20221104003159-6b27644724d8 h1:7xeTQjfsOm9eogQeIxjSEhlik9qsbBGsnmkQHfyKaRE= -go.opentelemetry.io/collector/pdata v0.63.2-0.20221104003159-6b27644724d8/go.mod h1:IzvXUGQml2mrnvdb8zIlEW3qQs9oFLdD2hLwJdZ+pek= +go.opentelemetry.io/collector v0.63.2-0.20221108014805-0b08d5316426 h1:z/wLTMh7/vNxcFUDa5uG7/IPE3tYx6pzCWPV41ghyV8= +go.opentelemetry.io/collector v0.63.2-0.20221108014805-0b08d5316426/go.mod h1:+Zb70q0Rq17dA9FcHTiTjW6g96lvJ8kAZ0c+eWNkAv0= +go.opentelemetry.io/collector/pdata v0.63.2-0.20221108014805-0b08d5316426 h1:wKDpgP0Tx/gWI2SgDGAY1OTSeihhDivbbRqFR79IGTc= +go.opentelemetry.io/collector/pdata v0.63.2-0.20221108014805-0b08d5316426/go.mod h1:IzvXUGQml2mrnvdb8zIlEW3qQs9oFLdD2hLwJdZ+pek= 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/factory.go b/extension/oidcauthextension/factory.go index c070ad3c5b18..380bbbd90686 100644 --- a/extension/oidcauthextension/factory.go +++ b/extension/oidcauthextension/factory.go @@ -38,13 +38,13 @@ func NewFactory() component.ExtensionFactory { ) } -func createDefaultConfig() config.Extension { +func createDefaultConfig() component.ExtensionConfig { return &Config{ - ExtensionSettings: config.NewExtensionSettings(config.NewComponentID(typeStr)), + ExtensionSettings: config.NewExtensionSettings(component.NewID(typeStr)), Attribute: defaultAttribute, } } -func createExtension(_ context.Context, set component.ExtensionCreateSettings, cfg config.Extension) (component.Extension, error) { +func createExtension(_ context.Context, set component.ExtensionCreateSettings, cfg component.ExtensionConfig) (component.Extension, error) { return newExtension(cfg.(*Config), set.Logger) } diff --git a/extension/oidcauthextension/factory_test.go b/extension/oidcauthextension/factory_test.go index 4974b0024683..484a0f7bdbea 100644 --- a/extension/oidcauthextension/factory_test.go +++ b/extension/oidcauthextension/factory_test.go @@ -19,15 +19,15 @@ import ( "testing" "github.com/stretchr/testify/assert" + "go.opentelemetry.io/collector/component" "go.opentelemetry.io/collector/component/componenttest" "go.opentelemetry.io/collector/config" - "go.opentelemetry.io/collector/config/configtest" ) func TestCreateDefaultConfig(t *testing.T) { // prepare and test expected := &Config{ - ExtensionSettings: config.NewExtensionSettings(config.NewComponentID(typeStr)), + ExtensionSettings: config.NewExtensionSettings(component.NewID(typeStr)), Attribute: defaultAttribute, } @@ -36,7 +36,7 @@ func TestCreateDefaultConfig(t *testing.T) { // verify assert.Equal(t, expected, cfg) - assert.NoError(t, configtest.CheckConfigStruct(cfg)) + assert.NoError(t, componenttest.CheckConfigStruct(cfg)) } func TestCreateExtension(t *testing.T) { diff --git a/extension/oidcauthextension/go.mod b/extension/oidcauthextension/go.mod index 26eb292c2522..03293425f40a 100644 --- a/extension/oidcauthextension/go.mod +++ b/extension/oidcauthextension/go.mod @@ -5,7 +5,7 @@ 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.63.2-0.20221104003159-6b27644724d8 + go.opentelemetry.io/collector v0.63.2-0.20221108014805-0b08d5316426 go.uber.org/zap v1.23.0 ) @@ -25,7 +25,7 @@ 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.63.2-0.20221104003159-6b27644724d8 // indirect + go.opentelemetry.io/collector/pdata v0.63.2-0.20221108014805-0b08d5316426 // 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 963b7c2bfb9e..eb4b6c39fb5e 100644 --- a/extension/oidcauthextension/go.sum +++ b/extension/oidcauthextension/go.sum @@ -345,10 +345,10 @@ 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.63.2-0.20221104003159-6b27644724d8 h1:rOT5HzXXfSISc6FiH012zH2/EFjp37UXfjEqj5BpkWQ= -go.opentelemetry.io/collector v0.63.2-0.20221104003159-6b27644724d8/go.mod h1:JVmeZXugK4ondC6KQgrHTHWiF4JttpG5k6dWPMt62+k= -go.opentelemetry.io/collector/pdata v0.63.2-0.20221104003159-6b27644724d8 h1:7xeTQjfsOm9eogQeIxjSEhlik9qsbBGsnmkQHfyKaRE= -go.opentelemetry.io/collector/pdata v0.63.2-0.20221104003159-6b27644724d8/go.mod h1:IzvXUGQml2mrnvdb8zIlEW3qQs9oFLdD2hLwJdZ+pek= +go.opentelemetry.io/collector v0.63.2-0.20221108014805-0b08d5316426 h1:z/wLTMh7/vNxcFUDa5uG7/IPE3tYx6pzCWPV41ghyV8= +go.opentelemetry.io/collector v0.63.2-0.20221108014805-0b08d5316426/go.mod h1:+Zb70q0Rq17dA9FcHTiTjW6g96lvJ8kAZ0c+eWNkAv0= +go.opentelemetry.io/collector/pdata v0.63.2-0.20221108014805-0b08d5316426 h1:wKDpgP0Tx/gWI2SgDGAY1OTSeihhDivbbRqFR79IGTc= +go.opentelemetry.io/collector/pdata v0.63.2-0.20221108014805-0b08d5316426/go.mod h1:IzvXUGQml2mrnvdb8zIlEW3qQs9oFLdD2hLwJdZ+pek= 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.go b/extension/pprofextension/config.go index bdbf5e618f36..e742d00880d3 100644 --- a/extension/pprofextension/config.go +++ b/extension/pprofextension/config.go @@ -15,6 +15,7 @@ package pprofextension // import "github.com/open-telemetry/opentelemetry-collector-contrib/extension/pprofextension" import ( + "go.opentelemetry.io/collector/component" "go.opentelemetry.io/collector/config" "go.opentelemetry.io/collector/config/confignet" ) @@ -43,7 +44,7 @@ type Config struct { SaveToFile string `mapstructure:"save_to_file"` } -var _ config.Extension = (*Config)(nil) +var _ component.ExtensionConfig = (*Config)(nil) // Validate checks if the extension configuration is valid func (cfg *Config) Validate() error { diff --git a/extension/pprofextension/config_test.go b/extension/pprofextension/config_test.go index fa78f6186b2f..c2112045a92d 100644 --- a/extension/pprofextension/config_test.go +++ b/extension/pprofextension/config_test.go @@ -20,6 +20,7 @@ import ( "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" + "go.opentelemetry.io/collector/component" "go.opentelemetry.io/collector/config" "go.opentelemetry.io/collector/config/confignet" "go.opentelemetry.io/collector/confmap/confmaptest" @@ -29,17 +30,17 @@ func TestLoadConfig(t *testing.T) { t.Parallel() tests := []struct { - id config.ComponentID - expected config.Extension + id component.ID + expected component.ExtensionConfig }{ { - id: config.NewComponentID(typeStr), + id: component.NewID(typeStr), expected: NewFactory().CreateDefaultConfig(), }, { - id: config.NewComponentIDWithName(typeStr, "1"), + id: component.NewIDWithName(typeStr, "1"), expected: &Config{ - ExtensionSettings: config.NewExtensionSettings(config.NewComponentID(typeStr)), + ExtensionSettings: config.NewExtensionSettings(component.NewID(typeStr)), TCPAddr: confignet.TCPAddr{Endpoint: "127.0.0.1:1777"}, BlockProfileFraction: 3, MutexProfileFraction: 5, @@ -54,7 +55,7 @@ func TestLoadConfig(t *testing.T) { cfg := factory.CreateDefaultConfig() sub, err := cm.Sub(tt.id.String()) require.NoError(t, err) - require.NoError(t, config.UnmarshalExtension(sub, cfg)) + require.NoError(t, component.UnmarshalExtensionConfig(sub, cfg)) assert.NoError(t, cfg.Validate()) assert.Equal(t, tt.expected, cfg) diff --git a/extension/pprofextension/factory.go b/extension/pprofextension/factory.go index f24d657d2020..a68330008f7e 100644 --- a/extension/pprofextension/factory.go +++ b/extension/pprofextension/factory.go @@ -40,16 +40,16 @@ func NewFactory() component.ExtensionFactory { ) } -func createDefaultConfig() config.Extension { +func createDefaultConfig() component.ExtensionConfig { return &Config{ - ExtensionSettings: config.NewExtensionSettings(config.NewComponentID(typeStr)), + ExtensionSettings: config.NewExtensionSettings(component.NewID(typeStr)), TCPAddr: confignet.TCPAddr{ Endpoint: defaultEndpoint, }, } } -func createExtension(_ context.Context, set component.ExtensionCreateSettings, cfg config.Extension) (component.Extension, error) { +func createExtension(_ context.Context, set component.ExtensionCreateSettings, cfg component.ExtensionConfig) (component.Extension, error) { config := cfg.(*Config) if config.TCPAddr.Endpoint == "" { return nil, errors.New("\"endpoint\" is required when using the \"pprof\" extension") diff --git a/extension/pprofextension/factory_test.go b/extension/pprofextension/factory_test.go index afb36117cd45..b0cc2fcbe9dc 100644 --- a/extension/pprofextension/factory_test.go +++ b/extension/pprofextension/factory_test.go @@ -20,10 +20,10 @@ import ( "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" + "go.opentelemetry.io/collector/component" "go.opentelemetry.io/collector/component/componenttest" "go.opentelemetry.io/collector/config" "go.opentelemetry.io/collector/config/confignet" - "go.opentelemetry.io/collector/config/configtest" "github.com/open-telemetry/opentelemetry-collector-contrib/internal/common/testutil" ) @@ -31,12 +31,12 @@ import ( func TestFactory_CreateDefaultConfig(t *testing.T) { cfg := createDefaultConfig() assert.Equal(t, &Config{ - ExtensionSettings: config.NewExtensionSettings(config.NewComponentID(typeStr)), + ExtensionSettings: config.NewExtensionSettings(component.NewID(typeStr)), TCPAddr: confignet.TCPAddr{Endpoint: defaultEndpoint}, }, cfg) - assert.NoError(t, configtest.CheckConfigStruct(cfg)) + assert.NoError(t, componenttest.CheckConfigStruct(cfg)) ext, err := createExtension(context.Background(), componenttest.NewNopExtensionCreateSettings(), cfg) require.NoError(t, err) require.NotNil(t, ext) diff --git a/extension/pprofextension/go.mod b/extension/pprofextension/go.mod index 95be9c10e2ed..21de52bb94f1 100644 --- a/extension/pprofextension/go.mod +++ b/extension/pprofextension/go.mod @@ -5,7 +5,7 @@ go 1.18 require ( github.com/open-telemetry/opentelemetry-collector-contrib/internal/common v0.63.0 github.com/stretchr/testify v1.8.1 - go.opentelemetry.io/collector v0.63.2-0.20221104003159-6b27644724d8 + go.opentelemetry.io/collector v0.63.2-0.20221108014805-0b08d5316426 go.uber.org/atomic v1.10.0 go.uber.org/zap v1.23.0 ) @@ -26,7 +26,7 @@ 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.63.2-0.20221104003159-6b27644724d8 // indirect + go.opentelemetry.io/collector/pdata v0.63.2-0.20221108014805-0b08d5316426 // 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 a0446424dea9..43d538689c2e 100644 --- a/extension/pprofextension/go.sum +++ b/extension/pprofextension/go.sum @@ -266,10 +266,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.63.2-0.20221104003159-6b27644724d8 h1:rOT5HzXXfSISc6FiH012zH2/EFjp37UXfjEqj5BpkWQ= -go.opentelemetry.io/collector v0.63.2-0.20221104003159-6b27644724d8/go.mod h1:JVmeZXugK4ondC6KQgrHTHWiF4JttpG5k6dWPMt62+k= -go.opentelemetry.io/collector/pdata v0.63.2-0.20221104003159-6b27644724d8 h1:7xeTQjfsOm9eogQeIxjSEhlik9qsbBGsnmkQHfyKaRE= -go.opentelemetry.io/collector/pdata v0.63.2-0.20221104003159-6b27644724d8/go.mod h1:IzvXUGQml2mrnvdb8zIlEW3qQs9oFLdD2hLwJdZ+pek= +go.opentelemetry.io/collector v0.63.2-0.20221108014805-0b08d5316426 h1:z/wLTMh7/vNxcFUDa5uG7/IPE3tYx6pzCWPV41ghyV8= +go.opentelemetry.io/collector v0.63.2-0.20221108014805-0b08d5316426/go.mod h1:+Zb70q0Rq17dA9FcHTiTjW6g96lvJ8kAZ0c+eWNkAv0= +go.opentelemetry.io/collector/pdata v0.63.2-0.20221108014805-0b08d5316426 h1:wKDpgP0Tx/gWI2SgDGAY1OTSeihhDivbbRqFR79IGTc= +go.opentelemetry.io/collector/pdata v0.63.2-0.20221108014805-0b08d5316426/go.mod h1:IzvXUGQml2mrnvdb8zIlEW3qQs9oFLdD2hLwJdZ+pek= 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.go b/extension/sigv4authextension/config.go index 859dfee770c3..0c10f79db62e 100644 --- a/extension/sigv4authextension/config.go +++ b/extension/sigv4authextension/config.go @@ -18,6 +18,7 @@ import ( "fmt" "github.com/aws/aws-sdk-go-v2/aws" + "go.opentelemetry.io/collector/component" "go.opentelemetry.io/collector/config" ) @@ -37,8 +38,8 @@ type AssumeRole struct { STSRegion string `mapstructure:"sts_region,omitempty"` } -// compile time check that the Config struct satisfies the config.Extension interface -var _ config.Extension = (*Config)(nil) +// compile time check that the Config struct satisfies the component.ExtensionConfig interface +var _ component.ExtensionConfig = (*Config)(nil) // Validate checks that the configuration is valid. // We aim to catch most errors here to ensure that we diff --git a/extension/sigv4authextension/config_test.go b/extension/sigv4authextension/config_test.go index 2cad156d984e..286b22159e3e 100644 --- a/extension/sigv4authextension/config_test.go +++ b/extension/sigv4authextension/config_test.go @@ -21,6 +21,7 @@ import ( "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" + "go.opentelemetry.io/collector/component" "go.opentelemetry.io/collector/config" "go.opentelemetry.io/collector/confmap/confmaptest" ) @@ -36,13 +37,13 @@ func TestLoadConfig(t *testing.T) { require.NoError(t, err) factory := NewFactory() cfg := factory.CreateDefaultConfig() - sub, err := cm.Sub(config.NewComponentID(typeStr).String()) + sub, err := cm.Sub(component.NewID(typeStr).String()) require.NoError(t, err) - require.NoError(t, config.UnmarshalExtension(sub, cfg)) + require.NoError(t, component.UnmarshalExtensionConfig(sub, cfg)) assert.NoError(t, cfg.Validate()) assert.Equal(t, &Config{ - ExtensionSettings: config.NewExtensionSettings(config.NewComponentID(typeStr)), + ExtensionSettings: config.NewExtensionSettings(component.NewID(typeStr)), Region: "region", Service: "service", AssumeRole: AssumeRole{ @@ -59,8 +60,8 @@ func TestLoadConfigError(t *testing.T) { require.NoError(t, err) factory := NewFactory() cfg := factory.CreateDefaultConfig() - sub, err := cm.Sub(config.NewComponentIDWithName(typeStr, "missing_credentials").String()) + sub, err := cm.Sub(component.NewIDWithName(typeStr, "missing_credentials").String()) require.NoError(t, err) - require.NoError(t, config.UnmarshalExtension(sub, cfg)) + require.NoError(t, component.UnmarshalExtensionConfig(sub, cfg)) assert.Error(t, cfg.Validate()) } diff --git a/extension/sigv4authextension/design.md b/extension/sigv4authextension/design.md index c54c37c1b363..1de6ae887dbd 100644 --- a/extension/sigv4authextension/design.md +++ b/extension/sigv4authextension/design.md @@ -41,7 +41,7 @@ type Config struct { ``` -* [config.ExtensionSettings](https://github.com/open-telemetry/opentelemetry-collector/blob/main/config/extension.go#L32) is a struct needed to needed to satisfy the [config.Extension](https://github.com/open-telemetry/opentelemetry-collector/blob/main/config/extension.go#L19) interface +* [component.ExtensionConfigSettings](https://github.com/open-telemetry/opentelemetry-collector/blob/main/config/extension.go#L32) is a struct needed to needed to satisfy the [component.ExtensionConfig](https://github.com/open-telemetry/opentelemetry-collector/blob/main/config/extension.go#L19) interface * `Region` is the AWS region for AWS Sigv4. This is an optional field. * Note that an attempt will be made to obtain a valid region from the endpoint of the service you are exporting to * `Service` is the AWS service for AWS Sigv4. This is an optional field. @@ -368,9 +368,9 @@ func NewFactory() component.ExtensionFactory { ```go -func createDefaultConfig() config.Extension { +func createDefaultConfig() component.ExtensionConfig { return &Config{ - ExtensionSettings: config.NewExtensionSettings(config.NewComponentID("sigv4auth")), + ExtensionSettings: config.NewExtensionSettings(component.NewID("sigv4auth")), } } ``` @@ -380,7 +380,7 @@ func createDefaultConfig() config.Extension { ```go -func createExtension(_ context.Context, set component.ExtensionCreateSettings, cfg config.Extension) (component.Extension, error) { +func createExtension(_ context.Context, set component.ExtensionCreateSettings, cfg component.ExtensionConfig) (component.Extension, error) { awsSDKInfo := fmt.Sprintf("%s/%s", aws.SDKName, aws.SDKVersion) return newSigv4Extension(cfg.(*Config), awsSDKInfo, set.Logger) } diff --git a/extension/sigv4authextension/factory.go b/extension/sigv4authextension/factory.go index 5a67aba6a543..54102b7435f3 100644 --- a/extension/sigv4authextension/factory.go +++ b/extension/sigv4authextension/factory.go @@ -35,14 +35,14 @@ func NewFactory() component.ExtensionFactory { // createDefaultConfig() creates a Config struct with default values. // We only set the ID here. -func createDefaultConfig() config.Extension { +func createDefaultConfig() component.ExtensionConfig { return &Config{ - ExtensionSettings: config.NewExtensionSettings(config.NewComponentID(typeStr)), + ExtensionSettings: config.NewExtensionSettings(component.NewID(typeStr)), } } // createExtension() calls newSigv4Extension() in extension.go to create the extension. -func createExtension(_ context.Context, set component.ExtensionCreateSettings, cfg config.Extension) (component.Extension, error) { +func createExtension(_ context.Context, set component.ExtensionCreateSettings, cfg component.ExtensionConfig) (component.Extension, error) { awsSDKInfo := fmt.Sprintf("%s/%s", aws.SDKName, aws.SDKVersion) return newSigv4Extension(cfg.(*Config), awsSDKInfo, set.Logger), nil } diff --git a/extension/sigv4authextension/factory_test.go b/extension/sigv4authextension/factory_test.go index c21b3f022c72..7b0321174053 100644 --- a/extension/sigv4authextension/factory_test.go +++ b/extension/sigv4authextension/factory_test.go @@ -19,9 +19,9 @@ import ( "testing" "github.com/stretchr/testify/assert" + "go.opentelemetry.io/collector/component" "go.opentelemetry.io/collector/component/componenttest" "go.opentelemetry.io/collector/config" - "go.opentelemetry.io/collector/config/configtest" ) func TestNewFactory(t *testing.T) { @@ -37,14 +37,14 @@ func TestNewFactory(t *testing.T) { } func TestCreateDefaultConfig(t *testing.T) { - expectedExtensionSettings := config.NewExtensionSettings(config.NewComponentID(typeStr)) + expectedExtensionSettings := config.NewExtensionSettings(component.NewID(typeStr)) expectedComponentID := expectedExtensionSettings.ID() cfg := createDefaultConfig().(*Config) assert.Equal(t, expectedExtensionSettings, cfg.ExtensionSettings) assert.Equal(t, expectedComponentID, cfg.ExtensionSettings.ID()) - assert.NoError(t, configtest.CheckConfigStruct(cfg)) + assert.NoError(t, componenttest.CheckConfigStruct(cfg)) } func TestCreateExtension(t *testing.T) { diff --git a/extension/sigv4authextension/go.mod b/extension/sigv4authextension/go.mod index 38aa710bcee0..604ec51e5b36 100644 --- a/extension/sigv4authextension/go.mod +++ b/extension/sigv4authextension/go.mod @@ -8,7 +8,7 @@ require ( github.com/aws/aws-sdk-go-v2/credentials v1.12.23 github.com/aws/aws-sdk-go-v2/service/sts v1.17.1 github.com/stretchr/testify v1.8.1 - go.opentelemetry.io/collector v0.63.2-0.20221104003159-6b27644724d8 + go.opentelemetry.io/collector v0.63.2-0.20221108014805-0b08d5316426 go.uber.org/zap v1.23.0 google.golang.org/grpc v1.50.1 ) @@ -33,7 +33,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/pdata v0.63.2-0.20221104003159-6b27644724d8 // indirect + go.opentelemetry.io/collector/pdata v0.63.2-0.20221108014805-0b08d5316426 // 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 c14c5bcc8e4b..d4a1ecac4d97 100644 --- a/extension/sigv4authextension/go.sum +++ b/extension/sigv4authextension/go.sum @@ -282,10 +282,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.63.2-0.20221104003159-6b27644724d8 h1:rOT5HzXXfSISc6FiH012zH2/EFjp37UXfjEqj5BpkWQ= -go.opentelemetry.io/collector v0.63.2-0.20221104003159-6b27644724d8/go.mod h1:JVmeZXugK4ondC6KQgrHTHWiF4JttpG5k6dWPMt62+k= -go.opentelemetry.io/collector/pdata v0.63.2-0.20221104003159-6b27644724d8 h1:7xeTQjfsOm9eogQeIxjSEhlik9qsbBGsnmkQHfyKaRE= -go.opentelemetry.io/collector/pdata v0.63.2-0.20221104003159-6b27644724d8/go.mod h1:IzvXUGQml2mrnvdb8zIlEW3qQs9oFLdD2hLwJdZ+pek= +go.opentelemetry.io/collector v0.63.2-0.20221108014805-0b08d5316426 h1:z/wLTMh7/vNxcFUDa5uG7/IPE3tYx6pzCWPV41ghyV8= +go.opentelemetry.io/collector v0.63.2-0.20221108014805-0b08d5316426/go.mod h1:+Zb70q0Rq17dA9FcHTiTjW6g96lvJ8kAZ0c+eWNkAv0= +go.opentelemetry.io/collector/pdata v0.63.2-0.20221108014805-0b08d5316426 h1:wKDpgP0Tx/gWI2SgDGAY1OTSeihhDivbbRqFR79IGTc= +go.opentelemetry.io/collector/pdata v0.63.2-0.20221108014805-0b08d5316426/go.mod h1:IzvXUGQml2mrnvdb8zIlEW3qQs9oFLdD2hLwJdZ+pek= 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/dbstorage/extension.go b/extension/storage/dbstorage/extension.go index a9ad319e3b32..3081cd9b14b8 100644 --- a/extension/storage/dbstorage/extension.go +++ b/extension/storage/dbstorage/extension.go @@ -21,7 +21,6 @@ import ( "strings" "go.opentelemetry.io/collector/component" - "go.opentelemetry.io/collector/config" "go.opentelemetry.io/collector/extension/experimental/storage" "go.uber.org/zap" ) @@ -64,7 +63,7 @@ func (ds *databaseStorage) Shutdown(context.Context) error { } // GetClient returns a storage client for an individual component -func (ds *databaseStorage) GetClient(ctx context.Context, kind component.Kind, ent config.ComponentID, name string) (storage.Client, error) { +func (ds *databaseStorage) GetClient(ctx context.Context, kind component.Kind, ent component.ID, name string) (storage.Client, error) { var fullName string if name == "" { fullName = fmt.Sprintf("%s_%s_%s", kindString(kind), ent.Type(), ent.Name()) diff --git a/extension/storage/dbstorage/extension_test.go b/extension/storage/dbstorage/extension_test.go index 3a969af777d1..05e10a95fd9e 100644 --- a/extension/storage/dbstorage/extension_test.go +++ b/extension/storage/dbstorage/extension_test.go @@ -28,7 +28,6 @@ import ( "github.com/stretchr/testify/require" "go.opentelemetry.io/collector/component" "go.opentelemetry.io/collector/component/componenttest" - "go.opentelemetry.io/collector/config" "go.opentelemetry.io/collector/extension/experimental/storage" ) @@ -44,7 +43,7 @@ func TestExtensionIntegrity(t *testing.T) { type mockComponent struct { kind component.Kind - name config.ComponentID + name component.ID } components := []mockComponent{ @@ -59,14 +58,14 @@ func TestExtensionIntegrity(t *testing.T) { } // Make a client for each component - clients := make(map[config.ComponentID]storage.Client) + clients := make(map[component.ID]storage.Client) for _, c := range components { client, err := se.GetClient(ctx, c.kind, c.name, "") require.NoError(t, err) clients[c.name] = client } - thrashClient := func(wg *sync.WaitGroup, n config.ComponentID, c storage.Client) { + thrashClient := func(wg *sync.WaitGroup, n component.ID, c storage.Client) { // keys and values keys := []string{"a", "b", "c", "d", "e"} myBytes := []byte(n.Name()) @@ -127,6 +126,6 @@ func newTestExtension(t *testing.T) storage.Extension { return se } -func newTestEntity(name string) config.ComponentID { - return config.NewComponentIDWithName("nop", name) +func newTestEntity(name string) component.ID { + return component.NewIDWithName("nop", name) } diff --git a/extension/storage/dbstorage/factory.go b/extension/storage/dbstorage/factory.go index 6dbfa4c6089e..e6e32c36284f 100644 --- a/extension/storage/dbstorage/factory.go +++ b/extension/storage/dbstorage/factory.go @@ -22,7 +22,7 @@ import ( ) // The value of extension "type" in configuration. -const typeStr config.Type = "db_storage" +const typeStr component.Type = "db_storage" // NewFactory creates a factory for DBStorage extension. func NewFactory() component.ExtensionFactory { @@ -34,16 +34,16 @@ func NewFactory() component.ExtensionFactory { ) } -func createDefaultConfig() config.Extension { +func createDefaultConfig() component.ExtensionConfig { return &Config{ - ExtensionSettings: config.NewExtensionSettings(config.NewComponentID(typeStr)), + ExtensionSettings: config.NewExtensionSettings(component.NewID(typeStr)), } } func createExtension( _ context.Context, params component.ExtensionCreateSettings, - cfg config.Extension, + cfg component.ExtensionConfig, ) (component.Extension, error) { return newDBStorage(params.Logger, cfg.(*Config)) } diff --git a/extension/storage/filestorage/config_test.go b/extension/storage/filestorage/config_test.go index 1dbb226c6de4..0743d5374089 100644 --- a/extension/storage/filestorage/config_test.go +++ b/extension/storage/filestorage/config_test.go @@ -23,6 +23,7 @@ import ( "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" + "go.opentelemetry.io/collector/component" "go.opentelemetry.io/collector/config" "go.opentelemetry.io/collector/confmap/confmaptest" ) @@ -31,21 +32,21 @@ func TestLoadConfig(t *testing.T) { t.Parallel() tests := []struct { - id config.ComponentID - expected config.Extension + id component.ID + expected component.ExtensionConfig }{ { - id: config.NewComponentID(typeStr), - expected: func() config.Extension { + id: component.NewID(typeStr), + expected: func() component.ExtensionConfig { ret := NewFactory().CreateDefaultConfig() ret.(*Config).Directory = "." return ret }(), }, { - id: config.NewComponentIDWithName(typeStr, "all_settings"), + id: component.NewIDWithName(typeStr, "all_settings"), expected: &Config{ - ExtensionSettings: config.NewExtensionSettings(config.NewComponentID(typeStr)), + ExtensionSettings: config.NewExtensionSettings(component.NewID(typeStr)), Directory: ".", Compaction: &CompactionConfig{ Directory: ".", @@ -68,7 +69,7 @@ func TestLoadConfig(t *testing.T) { cfg := factory.CreateDefaultConfig() sub, err := cm.Sub(tt.id.String()) require.NoError(t, err) - require.NoError(t, config.UnmarshalExtension(sub, cfg)) + require.NoError(t, component.UnmarshalExtensionConfig(sub, cfg)) assert.NoError(t, cfg.Validate()) assert.Equal(t, tt.expected, cfg) diff --git a/extension/storage/filestorage/extension.go b/extension/storage/filestorage/extension.go index c45998c817f8..9c2c054751b6 100644 --- a/extension/storage/filestorage/extension.go +++ b/extension/storage/filestorage/extension.go @@ -20,7 +20,6 @@ import ( "path/filepath" "go.opentelemetry.io/collector/component" - "go.opentelemetry.io/collector/config" "go.opentelemetry.io/collector/extension/experimental/storage" "go.uber.org/zap" ) @@ -53,7 +52,7 @@ func (lfs *localFileStorage) Shutdown(context.Context) error { } // GetClient returns a storage client for an individual component -func (lfs *localFileStorage) GetClient(ctx context.Context, kind component.Kind, ent config.ComponentID, name string) (storage.Client, error) { +func (lfs *localFileStorage) GetClient(ctx context.Context, kind component.Kind, ent component.ID, name string) (storage.Client, error) { var rawName string if name == "" { rawName = fmt.Sprintf("%s_%s_%s", kindString(kind), ent.Type(), ent.Name()) diff --git a/extension/storage/filestorage/extension_test.go b/extension/storage/filestorage/extension_test.go index 68fa6ecbf031..bd9ac83c4996 100644 --- a/extension/storage/filestorage/extension_test.go +++ b/extension/storage/filestorage/extension_test.go @@ -25,7 +25,6 @@ import ( "github.com/stretchr/testify/require" "go.opentelemetry.io/collector/component" "go.opentelemetry.io/collector/component/componenttest" - "go.opentelemetry.io/collector/config" "go.opentelemetry.io/collector/extension/experimental/storage" ) @@ -35,7 +34,7 @@ func TestExtensionIntegrity(t *testing.T) { type mockComponent struct { kind component.Kind - name config.ComponentID + name component.ID } components := []mockComponent{ @@ -50,7 +49,7 @@ func TestExtensionIntegrity(t *testing.T) { } // Make a client for each component - clients := make(map[config.ComponentID]storage.Client) + clients := make(map[component.ID]storage.Client) for _, c := range components { client, err := se.GetClient(ctx, c.kind, c.name, "") require.NoError(t, err) @@ -61,7 +60,7 @@ func TestExtensionIntegrity(t *testing.T) { clients[c.name] = client } - thrashClient := func(wg *sync.WaitGroup, n config.ComponentID, c storage.Client) { + thrashClient := func(wg *sync.WaitGroup, n component.ID, c storage.Client) { // keys and values keys := []string{"a", "b", "c", "d", "e"} myBytes := []byte(n.Name()) @@ -241,8 +240,8 @@ func newTestExtension(t *testing.T) storage.Extension { return se } -func newTestEntity(name string) config.ComponentID { - return config.NewComponentIDWithName("nop", name) +func newTestEntity(name string) component.ID { + return component.NewIDWithName("nop", name) } func TestCompaction(t *testing.T) { diff --git a/extension/storage/filestorage/factory.go b/extension/storage/filestorage/factory.go index 0976d8eb5de9..de72437201b1 100644 --- a/extension/storage/filestorage/factory.go +++ b/extension/storage/filestorage/factory.go @@ -23,7 +23,7 @@ import ( ) // The value of extension "type" in configuration. -const typeStr config.Type = "file_storage" +const typeStr component.Type = "file_storage" const ( // use default bbolt value @@ -44,9 +44,9 @@ func NewFactory() component.ExtensionFactory { ) } -func createDefaultConfig() config.Extension { +func createDefaultConfig() component.ExtensionConfig { return &Config{ - ExtensionSettings: config.NewExtensionSettings(config.NewComponentID(typeStr)), + ExtensionSettings: config.NewExtensionSettings(component.NewID(typeStr)), Directory: getDefaultDirectory(), Compaction: &CompactionConfig{ Directory: getDefaultDirectory(), @@ -64,7 +64,7 @@ func createDefaultConfig() config.Extension { func createExtension( _ context.Context, params component.ExtensionCreateSettings, - cfg config.Extension, + cfg component.ExtensionConfig, ) (component.Extension, error) { return newLocalFileStorage(params.Logger, cfg.(*Config)) } diff --git a/extension/storage/filestorage/factory_test.go b/extension/storage/filestorage/factory_test.go index d41e51118f04..edd104a4a0e1 100644 --- a/extension/storage/filestorage/factory_test.go +++ b/extension/storage/filestorage/factory_test.go @@ -24,8 +24,8 @@ import ( "time" "github.com/stretchr/testify/require" + "go.opentelemetry.io/collector/component" "go.opentelemetry.io/collector/component/componenttest" - "go.opentelemetry.io/collector/config" ) func TestFactory(t *testing.T) { @@ -33,7 +33,7 @@ func TestFactory(t *testing.T) { require.Equal(t, typeStr, f.Type()) cfg := f.CreateDefaultConfig().(*Config) - require.Equal(t, config.NewComponentID(typeStr), cfg.ID()) + require.Equal(t, component.NewID(typeStr), cfg.ID()) if runtime.GOOS != "windows" { require.Equal(t, "/var/lib/otelcol/file_storage", cfg.Directory) diff --git a/extension/storage/go.mod b/extension/storage/go.mod index 4c7160197081..8b8b9a8b2c4b 100644 --- a/extension/storage/go.mod +++ b/extension/storage/go.mod @@ -5,7 +5,7 @@ go 1.18 require ( github.com/stretchr/testify v1.8.1 go.etcd.io/bbolt v1.3.6 - go.opentelemetry.io/collector v0.63.2-0.20221104003159-6b27644724d8 + go.opentelemetry.io/collector v0.63.2-0.20221108014805-0b08d5316426 go.uber.org/zap v1.23.0 ) @@ -37,7 +37,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/pdata v0.63.2-0.20221104003159-6b27644724d8 // indirect + go.opentelemetry.io/collector/pdata v0.63.2-0.20221108014805-0b08d5316426 // 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 f9b436e0709c..3f0d1d2f369d 100644 --- a/extension/storage/go.sum +++ b/extension/storage/go.sum @@ -347,10 +347,10 @@ 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.63.2-0.20221104003159-6b27644724d8 h1:rOT5HzXXfSISc6FiH012zH2/EFjp37UXfjEqj5BpkWQ= -go.opentelemetry.io/collector v0.63.2-0.20221104003159-6b27644724d8/go.mod h1:JVmeZXugK4ondC6KQgrHTHWiF4JttpG5k6dWPMt62+k= -go.opentelemetry.io/collector/pdata v0.63.2-0.20221104003159-6b27644724d8 h1:7xeTQjfsOm9eogQeIxjSEhlik9qsbBGsnmkQHfyKaRE= -go.opentelemetry.io/collector/pdata v0.63.2-0.20221104003159-6b27644724d8/go.mod h1:IzvXUGQml2mrnvdb8zIlEW3qQs9oFLdD2hLwJdZ+pek= +go.opentelemetry.io/collector v0.63.2-0.20221108014805-0b08d5316426 h1:z/wLTMh7/vNxcFUDa5uG7/IPE3tYx6pzCWPV41ghyV8= +go.opentelemetry.io/collector v0.63.2-0.20221108014805-0b08d5316426/go.mod h1:+Zb70q0Rq17dA9FcHTiTjW6g96lvJ8kAZ0c+eWNkAv0= +go.opentelemetry.io/collector/pdata v0.63.2-0.20221108014805-0b08d5316426 h1:wKDpgP0Tx/gWI2SgDGAY1OTSeihhDivbbRqFR79IGTc= +go.opentelemetry.io/collector/pdata v0.63.2-0.20221108014805-0b08d5316426/go.mod h1:IzvXUGQml2mrnvdb8zIlEW3qQs9oFLdD2hLwJdZ+pek= 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/storagetest/client.go b/extension/storage/storagetest/client.go index 52a0ff41add8..77a2d8894f81 100644 --- a/extension/storage/storagetest/client.go +++ b/extension/storage/storagetest/client.go @@ -24,7 +24,6 @@ import ( "sync" "go.opentelemetry.io/collector/component" - "go.opentelemetry.io/collector/config" "go.opentelemetry.io/collector/extension/experimental/storage" ) @@ -37,7 +36,7 @@ type TestClient struct { cacheMux sync.Mutex kind component.Kind - id config.ComponentID + id component.ID name string storageFile string @@ -47,7 +46,7 @@ type TestClient struct { // NewInMemoryClient creates a storage.Client that functions as a map[string][]byte // This is useful for tests that do not involve collector restart behavior. -func NewInMemoryClient(kind component.Kind, id config.ComponentID, name string) *TestClient { +func NewInMemoryClient(kind component.Kind, id component.ID, name string) *TestClient { return &TestClient{ cache: make(map[string][]byte), kind: kind, @@ -59,7 +58,7 @@ func NewInMemoryClient(kind component.Kind, id config.ComponentID, name string) // NewFileBackedClient creates a storage.Client that will load previous // storage contents upon creation and save storage contents when closed. // It also has metadata which may be used to validate test expectations. -func NewFileBackedClient(kind component.Kind, id config.ComponentID, name string, storageDir string) *TestClient { +func NewFileBackedClient(kind component.Kind, id component.ID, name string, storageDir string) *TestClient { client := NewInMemoryClient(kind, id, name) client.storageFile = filepath.Join(storageDir, fmt.Sprintf("%d_%s_%s_%s", kind, id.Type(), id.Name(), name)) @@ -156,16 +155,18 @@ func (p *TestClient) Close(_ context.Context) error { const clientCreatorID = "client_creator_id" -func setCreatorID(ctx context.Context, client storage.Client, creatorID config.ComponentID) error { +func setCreatorID(ctx context.Context, client storage.Client, creatorID component.ID) error { return client.Set(ctx, clientCreatorID, []byte(creatorID.String())) } -// CreatorID is the config.ComponentID of the extension that created the component -func CreatorID(ctx context.Context, client storage.Client) (config.ComponentID, error) { +// CreatorID is the component.ID of the extension that created the component +func CreatorID(ctx context.Context, client storage.Client) (component.ID, error) { idBytes, err := client.Get(ctx, clientCreatorID) if err != nil || idBytes == nil { - return config.ComponentID{}, err + return component.ID{}, err } - return config.NewComponentIDFromString(string(idBytes)) + id := component.ID{} + err = id.UnmarshalText(idBytes) + return id, err } diff --git a/extension/storage/storagetest/extension.go b/extension/storage/storagetest/extension.go index 16c29ae5dad8..872790590902 100644 --- a/extension/storage/storagetest/extension.go +++ b/extension/storage/storagetest/extension.go @@ -22,7 +22,7 @@ import ( "go.opentelemetry.io/collector/extension/experimental/storage" ) -var testStorageType config.Type = "test_storage" +var testStorageType component.Type = "test_storage" // TestStorage is an in memory storage extension designed for testing type TestStorage struct { @@ -33,8 +33,8 @@ type TestStorage struct { // Ensure this storage extension implements the appropriate interface var _ storage.Extension = (*TestStorage)(nil) -func NewStorageID(name string) config.ComponentID { - return config.NewComponentIDWithName(testStorageType, name) +func NewStorageID(name string) component.ID { + return component.NewIDWithName(testStorageType, name) } // NewInMemoryStorageExtension creates a TestStorage extension @@ -67,7 +67,7 @@ func (s *TestStorage) Shutdown(ctx context.Context) error { } // GetClient returns a storage client for an individual component -func (s *TestStorage) GetClient(ctx context.Context, kind component.Kind, ent config.ComponentID, name string) (storage.Client, error) { +func (s *TestStorage) GetClient(ctx context.Context, kind component.Kind, ent component.ID, name string) (storage.Client, error) { var client *TestClient if s.storageDir == "" { client = NewInMemoryClient(kind, ent, name) @@ -77,7 +77,7 @@ func (s *TestStorage) GetClient(ctx context.Context, kind component.Kind, ent co return client, setCreatorID(ctx, client, s.ID()) } -var nonStorageType config.Type = "non_storage" +var nonStorageType component.Type = "non_storage" // NonStorage is useful for testing expected behaviors that involve // non-storage extensions @@ -88,8 +88,8 @@ type NonStorage struct { // Ensure this extension implements the appropriate interface var _ component.Extension = (*NonStorage)(nil) -func NewNonStorageID(name string) config.ComponentID { - return config.NewComponentIDWithName(nonStorageType, name) +func NewNonStorageID(name string) component.ID { + return component.NewIDWithName(nonStorageType, name) } // NewNonStorageExtension creates a NonStorage extension diff --git a/extension/storage/storagetest/extension_test.go b/extension/storage/storagetest/extension_test.go index 9703e59e0441..c644c77a98b1 100644 --- a/extension/storage/storagetest/extension_test.go +++ b/extension/storage/storagetest/extension_test.go @@ -21,7 +21,6 @@ import ( "github.com/stretchr/testify/require" "go.opentelemetry.io/collector/component" "go.opentelemetry.io/collector/component/componenttest" - "go.opentelemetry.io/collector/config" "go.opentelemetry.io/collector/extension/experimental/storage" ) @@ -33,14 +32,14 @@ func TestID(t *testing.T) { func TestInMemoryLifecycle(t *testing.T) { ext := NewInMemoryStorageExtension("test") - require.Equal(t, config.NewComponentIDWithName(testStorageType, "test"), ext.ID()) + require.Equal(t, component.NewIDWithName(testStorageType, "test"), ext.ID()) runExtensionLifecycle(t, ext, false) } func TestFileBackedLifecycle(t *testing.T) { dir := t.TempDir() ext := NewFileBackedStorageExtension("test", dir) - require.Equal(t, config.NewComponentIDWithName(testStorageType, "test"), ext.ID()) + require.Equal(t, component.NewIDWithName(testStorageType, "test"), ext.ID()) runExtensionLifecycle(t, ext, true) } @@ -48,7 +47,7 @@ func runExtensionLifecycle(t *testing.T, ext *TestStorage, expectPersistence boo ctx := context.Background() require.NoError(t, ext.Start(ctx, componenttest.NewNopHost())) - clientOne, err := ext.GetClient(ctx, component.KindProcessor, config.NewComponentID("foo"), "client_one") + clientOne, err := ext.GetClient(ctx, component.KindProcessor, component.NewID("foo"), "client_one") require.NoError(t, err) creatorID, err := CreatorID(ctx, clientOne) @@ -77,7 +76,7 @@ func runExtensionLifecycle(t *testing.T, ext *TestStorage, expectPersistence boo require.NoError(t, clientOne.Close(ctx)) // Create new client to test persistence - clientTwo, err := ext.GetClient(ctx, component.KindProcessor, config.NewComponentID("foo"), "client_one") + clientTwo, err := ext.GetClient(ctx, component.KindProcessor, component.NewID("foo"), "client_one") require.NoError(t, err) creatorID, err = CreatorID(ctx, clientTwo) diff --git a/extension/storage/storagetest/host.go b/extension/storage/storagetest/host.go index ce845e8a6103..284871294579 100644 --- a/extension/storage/storagetest/host.go +++ b/extension/storage/storagetest/host.go @@ -17,22 +17,21 @@ package storagetest // import "github.com/open-telemetry/opentelemetry-collector import ( "go.opentelemetry.io/collector/component" "go.opentelemetry.io/collector/component/componenttest" - "go.opentelemetry.io/collector/config" ) type StorageHost struct { component.Host - extensions map[config.ComponentID]component.Extension + extensions map[component.ID]component.Extension } func NewStorageHost() *StorageHost { return &StorageHost{ Host: componenttest.NewNopHost(), - extensions: make(map[config.ComponentID]component.Extension), + extensions: make(map[component.ID]component.Extension), } } -func (h *StorageHost) WithExtension(id config.ComponentID, ext component.Extension) *StorageHost { +func (h *StorageHost) WithExtension(id component.ID, ext component.Extension) *StorageHost { h.extensions[id] = ext return h } @@ -55,6 +54,6 @@ func (h *StorageHost) WithNonStorageExtension(name string) *StorageHost { return h } -func (h *StorageHost) GetExtensions() map[config.ComponentID]component.Extension { +func (h *StorageHost) GetExtensions() map[component.ID]component.Extension { return h.extensions } diff --git a/extension/storage/storagetest/host_test.go b/extension/storage/storagetest/host_test.go index c1392795c198..e18328c940d7 100644 --- a/extension/storage/storagetest/host_test.go +++ b/extension/storage/storagetest/host_test.go @@ -18,7 +18,7 @@ import ( "testing" "github.com/stretchr/testify/require" - "go.opentelemetry.io/collector/config" + "go.opentelemetry.io/collector/component" ) func TestStorageHostWithNone(t *testing.T) { @@ -26,7 +26,7 @@ func TestStorageHostWithNone(t *testing.T) { } func TestStorageHostWithOne(t *testing.T) { - storageID := config.NewComponentIDWithName(testStorageType, "one") + storageID := component.NewIDWithName(testStorageType, "one") host := NewStorageHost().WithInMemoryStorageExtension("one") @@ -42,8 +42,8 @@ func TestStorageHostWithOne(t *testing.T) { } func TestStorageHostWithTwo(t *testing.T) { - storageOneID := config.NewComponentIDWithName(testStorageType, "one") - storageTwoID := config.NewComponentIDWithName(testStorageType, "two") + storageOneID := component.NewIDWithName(testStorageType, "one") + storageTwoID := component.NewIDWithName(testStorageType, "two") host := NewStorageHost(). WithInMemoryStorageExtension("one"). @@ -68,9 +68,9 @@ func TestStorageHostWithTwo(t *testing.T) { } func TestStorageHostWithMixed(t *testing.T) { - storageOneID := config.NewComponentIDWithName(testStorageType, "one") - storageTwoID := config.NewComponentIDWithName(testStorageType, "two") - nonStorageID := config.NewComponentIDWithName(nonStorageType, "non-storage") + storageOneID := component.NewIDWithName(testStorageType, "one") + storageTwoID := component.NewIDWithName(testStorageType, "two") + nonStorageID := component.NewIDWithName(nonStorageType, "non-storage") host := NewStorageHost(). WithInMemoryStorageExtension("one"). diff --git a/go.mod b/go.mod index b95ae007bfbb..10646a10048f 100644 --- a/go.mod +++ b/go.mod @@ -13,10 +13,10 @@ require ( github.com/open-telemetry/opentelemetry-collector-contrib/exporter/carbonexporter v0.63.0 github.com/open-telemetry/opentelemetry-collector-contrib/exporter/clickhouseexporter v0.63.0 github.com/open-telemetry/opentelemetry-collector-contrib/exporter/coralogixexporter v0.63.0 - github.com/open-telemetry/opentelemetry-collector-contrib/exporter/datadogexporter v0.0.0-00010101000000-000000000000 + github.com/open-telemetry/opentelemetry-collector-contrib/exporter/datadogexporter v0.63.0 github.com/open-telemetry/opentelemetry-collector-contrib/exporter/dynatraceexporter v0.63.0 github.com/open-telemetry/opentelemetry-collector-contrib/exporter/elasticsearchexporter v0.63.0 - github.com/open-telemetry/opentelemetry-collector-contrib/exporter/f5cloudexporter v0.0.0-00010101000000-000000000000 + github.com/open-telemetry/opentelemetry-collector-contrib/exporter/f5cloudexporter v0.63.0 github.com/open-telemetry/opentelemetry-collector-contrib/exporter/fileexporter v0.63.0 github.com/open-telemetry/opentelemetry-collector-contrib/exporter/googlecloudexporter v0.63.0 github.com/open-telemetry/opentelemetry-collector-contrib/exporter/googlecloudpubsubexporter v0.63.0 @@ -78,7 +78,7 @@ require ( github.com/open-telemetry/opentelemetry-collector-contrib/processor/resourceprocessor v0.63.0 github.com/open-telemetry/opentelemetry-collector-contrib/processor/routingprocessor v0.63.0 github.com/open-telemetry/opentelemetry-collector-contrib/processor/servicegraphprocessor v0.63.0 - github.com/open-telemetry/opentelemetry-collector-contrib/processor/spanmetricsprocessor v0.0.0-00010101000000-000000000000 + github.com/open-telemetry/opentelemetry-collector-contrib/processor/spanmetricsprocessor v0.63.0 github.com/open-telemetry/opentelemetry-collector-contrib/processor/spanprocessor v0.63.0 github.com/open-telemetry/opentelemetry-collector-contrib/processor/tailsamplingprocessor v0.63.0 github.com/open-telemetry/opentelemetry-collector-contrib/processor/transformprocessor v0.63.0 @@ -111,7 +111,7 @@ require ( github.com/open-telemetry/opentelemetry-collector-contrib/receiver/iisreceiver v0.63.0 github.com/open-telemetry/opentelemetry-collector-contrib/receiver/influxdbreceiver v0.63.0 github.com/open-telemetry/opentelemetry-collector-contrib/receiver/jaegerreceiver v0.63.0 - github.com/open-telemetry/opentelemetry-collector-contrib/receiver/jmxreceiver v0.0.0-00010101000000-000000000000 + github.com/open-telemetry/opentelemetry-collector-contrib/receiver/jmxreceiver v0.63.0 github.com/open-telemetry/opentelemetry-collector-contrib/receiver/journaldreceiver v0.63.0 github.com/open-telemetry/opentelemetry-collector-contrib/receiver/k8sclusterreceiver v0.63.0 github.com/open-telemetry/opentelemetry-collector-contrib/receiver/k8seventsreceiver v0.63.0 @@ -159,13 +159,13 @@ require ( github.com/open-telemetry/opentelemetry-collector-contrib/receiver/zookeeperreceiver v0.63.0 github.com/prometheus/prometheus v1.8.2-0.20220303173753-edfe657b5405 github.com/stretchr/testify v1.8.1 - go.opentelemetry.io/collector v0.63.2-0.20221104003159-6b27644724d8 - go.opentelemetry.io/collector/exporter/loggingexporter v0.63.2-0.20221104003159-6b27644724d8 - go.opentelemetry.io/collector/exporter/otlpexporter v0.63.2-0.20221104003159-6b27644724d8 - go.opentelemetry.io/collector/exporter/otlphttpexporter v0.63.2-0.20221104003159-6b27644724d8 + go.opentelemetry.io/collector v0.63.2-0.20221108014805-0b08d5316426 + go.opentelemetry.io/collector/exporter/loggingexporter v0.63.2-0.20221108014805-0b08d5316426 + go.opentelemetry.io/collector/exporter/otlpexporter v0.63.2-0.20221108014805-0b08d5316426 + go.opentelemetry.io/collector/exporter/otlphttpexporter v0.63.2-0.20221108014805-0b08d5316426 go.opentelemetry.io/collector/extension/ballastextension v0.0.0-20221103164255-2ed41215f324 go.opentelemetry.io/collector/extension/zpagesextension v0.0.0-20221102221454-bfc45c16c979 - go.opentelemetry.io/collector/processor/batchprocessor v0.0.0-20221104003159-6b27644724d8 + go.opentelemetry.io/collector/processor/batchprocessor v0.0.0-20221108014805-0b08d5316426 go.opentelemetry.io/collector/processor/memorylimiterprocessor v0.0.0-20221103164255-2ed41215f324 go.opentelemetry.io/collector/receiver/otlpreceiver v0.63.1 go.uber.org/multierr v1.8.0 @@ -524,7 +524,7 @@ require ( github.com/pmezard/go-difflib v1.0.0 // indirect github.com/power-devops/perfstat v0.0.0-20220216144756-c35f1ee13d7c // indirect github.com/pquerna/cachecontrol v0.1.0 // indirect - github.com/prometheus/client_golang v1.13.1-0.20221013115219-dcea97eee2b3 // indirect + github.com/prometheus/client_golang v1.13.1 // indirect github.com/prometheus/client_model v0.3.0 // indirect github.com/prometheus/common v0.37.0 // indirect github.com/prometheus/common/sigv4 v0.1.0 // indirect @@ -596,9 +596,9 @@ require ( go.etcd.io/etcd/client/v3 v3.5.4 // indirect go.mongodb.org/atlas v0.18.0 // indirect go.mongodb.org/mongo-driver v1.10.3 // indirect - go.opencensus.io v0.23.0 // indirect - go.opentelemetry.io/collector/pdata v0.63.2-0.20221104003159-6b27644724d8 // indirect - go.opentelemetry.io/collector/semconv v0.63.2-0.20221104003159-6b27644724d8 // indirect + go.opencensus.io v0.24.0 // indirect + go.opentelemetry.io/collector/pdata v0.63.2-0.20221108014805-0b08d5316426 // indirect + go.opentelemetry.io/collector/semconv v0.63.2-0.20221108014805-0b08d5316426 // 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 @@ -1040,4 +1040,4 @@ exclude github.com/docker/distribution v2.8.0+incompatible // at the time of this inclusion, v0.38.0 was the latest version available (also tagged as v2.38.0) replace github.com/prometheus/prometheus => github.com/prometheus/prometheus v0.38.0 -replace go.opentelemetry.io/collector/receiver/otlpreceiver => go.opentelemetry.io/collector/receiver/otlpreceiver v0.0.0-20221101161158-df8deb48186b +replace go.opentelemetry.io/collector/receiver/otlpreceiver => go.opentelemetry.io/collector/receiver/otlpreceiver v0.0.0-20221108014805-0b08d5316426 diff --git a/go.sum b/go.sum index 68170956d586..770052d99618 100644 --- a/go.sum +++ b/go.sum @@ -1724,8 +1724,8 @@ github.com/prometheus/client_golang v1.11.1/go.mod h1:Z6t4BnS23TR94PD6BsDNk8yVqr github.com/prometheus/client_golang v1.12.1/go.mod h1:3Z9XVyYiZYEO+YQWt3RD2R3jrbd179Rt297l4aS6nDY= github.com/prometheus/client_golang v1.12.2/go.mod h1:3Z9XVyYiZYEO+YQWt3RD2R3jrbd179Rt297l4aS6nDY= github.com/prometheus/client_golang v1.13.0/go.mod h1:vTeo+zgvILHsnnj/39Ou/1fPN5nJFOEMgftOUOmlvYQ= -github.com/prometheus/client_golang v1.13.1-0.20221013115219-dcea97eee2b3 h1:T49ADLrYOgiyTHKx/N7tUxcglkLEt7xzDoQRqJNTzKg= -github.com/prometheus/client_golang v1.13.1-0.20221013115219-dcea97eee2b3/go.mod h1:vTeo+zgvILHsnnj/39Ou/1fPN5nJFOEMgftOUOmlvYQ= +github.com/prometheus/client_golang v1.13.1 h1:3gMjIY2+/hzmqhtUC/aQNYldJA6DtH3CgQvwS+02K1c= +github.com/prometheus/client_golang v1.13.1/go.mod h1:vTeo+zgvILHsnnj/39Ou/1fPN5nJFOEMgftOUOmlvYQ= github.com/prometheus/client_model v0.0.0-20180712105110-5c3871d89910/go.mod h1:MbSGuTsp3dbXC40dX6PRTWyKYBIrTGTE9sqQNg2J8bo= github.com/prometheus/client_model v0.0.0-20190115171406-56726106282f/go.mod h1:MbSGuTsp3dbXC40dX6PRTWyKYBIrTGTE9sqQNg2J8bo= github.com/prometheus/client_model v0.0.0-20190129233127-fd36f4220a90/go.mod h1:xMI15A0UPsDsEKsMN9yxemIoYk6Tm2C1GtYGdfGttqA= @@ -2109,19 +2109,20 @@ 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.opencensus.io v0.22.5/go.mod h1:5pWMHQbX5EPX2/62yrJeAkowc+lfs/XD7Uxpq3pI6kk= -go.opencensus.io v0.23.0 h1:gqCw0LfLxScz8irSi8exQc7fyQ0fKQU/qnC/X8+V/1M= 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.57.2/go.mod h1:9TwWyMRhbFNzaaGLtm/6poWNDJw+etvQMS6Fy+8/8Xs= go.opentelemetry.io/collector v0.63.0/go.mod h1:/wnGBrLyrQ804Eh7jZAPh4xJVa9xwbDbGfKQXLil3yM= go.opentelemetry.io/collector v0.63.1/go.mod h1:FZC9Px2N5CRiOG1VWH4XvkDeFx+Bu5tO8+gaqDSfXAA= -go.opentelemetry.io/collector v0.63.2-0.20221104003159-6b27644724d8 h1:rOT5HzXXfSISc6FiH012zH2/EFjp37UXfjEqj5BpkWQ= -go.opentelemetry.io/collector v0.63.2-0.20221104003159-6b27644724d8/go.mod h1:JVmeZXugK4ondC6KQgrHTHWiF4JttpG5k6dWPMt62+k= -go.opentelemetry.io/collector/exporter/loggingexporter v0.63.2-0.20221104003159-6b27644724d8 h1:8eJDjaRFnt94NKdArrgi9I/kJYqZjRxUrnfjaZyBeQA= -go.opentelemetry.io/collector/exporter/loggingexporter v0.63.2-0.20221104003159-6b27644724d8/go.mod h1:/gESyMRxKKNCrPZCRw/3eBhtByYxPCiPfoR/aniFaMA= -go.opentelemetry.io/collector/exporter/otlpexporter v0.63.2-0.20221104003159-6b27644724d8 h1:LH4Xta7BzlK9kJwpYqdUApjHsv2rU+zivpTE8Iu7KJM= -go.opentelemetry.io/collector/exporter/otlpexporter v0.63.2-0.20221104003159-6b27644724d8/go.mod h1:t1QwWfBfdEsI80R28T9PeVFGm8f32ZGLdY+CAEfr2LI= -go.opentelemetry.io/collector/exporter/otlphttpexporter v0.63.2-0.20221104003159-6b27644724d8 h1:iKgw0o6MV+NaVafXaE4JcZRWDjboqLrcsY6hZyy6ns8= -go.opentelemetry.io/collector/exporter/otlphttpexporter v0.63.2-0.20221104003159-6b27644724d8/go.mod h1:ejN1zRqJtIoKnOYdx31LXVDpQ7TsSvVbUx50eQVCVcA= +go.opentelemetry.io/collector v0.63.2-0.20221108014805-0b08d5316426 h1:z/wLTMh7/vNxcFUDa5uG7/IPE3tYx6pzCWPV41ghyV8= +go.opentelemetry.io/collector v0.63.2-0.20221108014805-0b08d5316426/go.mod h1:+Zb70q0Rq17dA9FcHTiTjW6g96lvJ8kAZ0c+eWNkAv0= +go.opentelemetry.io/collector/exporter/loggingexporter v0.63.2-0.20221108014805-0b08d5316426 h1:DmxLLUbQQu4chu1xU4rytprZLO1gocMXn5QxlG6GrO0= +go.opentelemetry.io/collector/exporter/loggingexporter v0.63.2-0.20221108014805-0b08d5316426/go.mod h1:W2E/sdTLclh6LqFIkeg66VxlIMweCmcwAlxzzYuULkw= +go.opentelemetry.io/collector/exporter/otlpexporter v0.63.2-0.20221108014805-0b08d5316426 h1:zPTV1p+QFGd2e7f4DEwkujkeezTBGkurl2wrM9QZ3Dc= +go.opentelemetry.io/collector/exporter/otlpexporter v0.63.2-0.20221108014805-0b08d5316426/go.mod h1:ZdasRXXeeuXukj6gfIb4VJw3W5N4+fhMagKE1TEMOxM= +go.opentelemetry.io/collector/exporter/otlphttpexporter v0.63.2-0.20221108014805-0b08d5316426 h1:1xUhrje+DsP7lj6Oiesd6BpsZYMjNg2Ua3GMIaX9OHo= +go.opentelemetry.io/collector/exporter/otlphttpexporter v0.63.2-0.20221108014805-0b08d5316426/go.mod h1:/r5XMUNlCvz1o6q9WQB2OhiAmUPRiXJSFsCURTBNA2Y= go.opentelemetry.io/collector/extension/ballastextension v0.0.0-20221103164255-2ed41215f324 h1:pXYdlcrEGWCDtQBWv+XIjNrDqvBIUOcw7ekhN4vUTQo= go.opentelemetry.io/collector/extension/ballastextension v0.0.0-20221103164255-2ed41215f324/go.mod h1:x79DldeotQtNkVz3MCxWUXpaXwZJqksyvaW0l0Uttic= go.opentelemetry.io/collector/extension/zpagesextension v0.0.0-20221102221454-bfc45c16c979 h1:YW7BL8ftoJ7k+EtnMICw1KWASLuSDIhbF7SjjgWMCl4= @@ -2130,21 +2131,21 @@ go.opentelemetry.io/collector/pdata v0.56.0/go.mod h1:mYcCREWiIJyHss0dbU+GSiz2tm go.opentelemetry.io/collector/pdata v0.57.2/go.mod h1:RU9I8lwBUxucwOsSYzHEcHi15M9QaX78hgQ2PRdSxV0= go.opentelemetry.io/collector/pdata v0.63.0/go.mod h1:IzvXUGQml2mrnvdb8zIlEW3qQs9oFLdD2hLwJdZ+pek= go.opentelemetry.io/collector/pdata v0.63.1/go.mod h1:IzvXUGQml2mrnvdb8zIlEW3qQs9oFLdD2hLwJdZ+pek= -go.opentelemetry.io/collector/pdata v0.63.2-0.20221104003159-6b27644724d8 h1:7xeTQjfsOm9eogQeIxjSEhlik9qsbBGsnmkQHfyKaRE= -go.opentelemetry.io/collector/pdata v0.63.2-0.20221104003159-6b27644724d8/go.mod h1:IzvXUGQml2mrnvdb8zIlEW3qQs9oFLdD2hLwJdZ+pek= +go.opentelemetry.io/collector/pdata v0.63.2-0.20221108014805-0b08d5316426 h1:wKDpgP0Tx/gWI2SgDGAY1OTSeihhDivbbRqFR79IGTc= +go.opentelemetry.io/collector/pdata v0.63.2-0.20221108014805-0b08d5316426/go.mod h1:IzvXUGQml2mrnvdb8zIlEW3qQs9oFLdD2hLwJdZ+pek= go.opentelemetry.io/collector/processor/batchprocessor v0.0.0-20221103161931-a167b006e8c0/go.mod h1:WBv1Nayi8p12K0vxLxTkHpRGr79JXYT3TXL2X0B/PRU= -go.opentelemetry.io/collector/processor/batchprocessor v0.0.0-20221104003159-6b27644724d8 h1:jgN7o3WfR8x++rjMcVM1VN6OJi4ytlGANXbwd73BPXo= -go.opentelemetry.io/collector/processor/batchprocessor v0.0.0-20221104003159-6b27644724d8/go.mod h1:WBv1Nayi8p12K0vxLxTkHpRGr79JXYT3TXL2X0B/PRU= +go.opentelemetry.io/collector/processor/batchprocessor v0.0.0-20221108014805-0b08d5316426 h1:7f0NVsVGYT8pxAyk0qBBa8ZQf7athr/mfQ6QltGywN0= +go.opentelemetry.io/collector/processor/batchprocessor v0.0.0-20221108014805-0b08d5316426/go.mod h1:gpd5Q/3HlROMGYhnmwlFpUhcz8Xy80sokEcKs7c7zzE= go.opentelemetry.io/collector/processor/memorylimiterprocessor v0.0.0-20221103164255-2ed41215f324 h1:kskVPWYC7QhffnYezcq66fCMNVL2eUMybzSYEMlv0yQ= go.opentelemetry.io/collector/processor/memorylimiterprocessor v0.0.0-20221103164255-2ed41215f324/go.mod h1:EnZwZH5MPkSDrUTLPZ8SaePpvmugL6J4fk66ikM0pu8= -go.opentelemetry.io/collector/receiver/otlpreceiver v0.0.0-20221101161158-df8deb48186b h1:no9i2NWBheMrzP0uNdOgmPkp4nGsb/bUCEDwFDwMlfQ= -go.opentelemetry.io/collector/receiver/otlpreceiver v0.0.0-20221101161158-df8deb48186b/go.mod h1:C8qTtCEPf/V/7SC1clotABlD5h/MhSbGxh7cZzkazeM= +go.opentelemetry.io/collector/receiver/otlpreceiver v0.0.0-20221108014805-0b08d5316426 h1:6cosCaS91068I8El0q8TJkv3V5lRzAfH2Wuja/5ydIo= +go.opentelemetry.io/collector/receiver/otlpreceiver v0.0.0-20221108014805-0b08d5316426/go.mod h1:+sGF2/LgOFWN1QClgdzg2NYCY9dYyPO4W4NAfxdODto= 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.63.0/go.mod h1:5o9yhOa+ABt7g2E5JABDxGZ1PQPbtfxrKNbYn+LOTXU= go.opentelemetry.io/collector/semconv v0.63.1/go.mod h1:5o9yhOa+ABt7g2E5JABDxGZ1PQPbtfxrKNbYn+LOTXU= -go.opentelemetry.io/collector/semconv v0.63.2-0.20221104003159-6b27644724d8 h1:jm0sNPyqo6S165QjQYMBHB2nK50wlJbMYM03Yr3Eo2k= -go.opentelemetry.io/collector/semconv v0.63.2-0.20221104003159-6b27644724d8/go.mod h1:5o9yhOa+ABt7g2E5JABDxGZ1PQPbtfxrKNbYn+LOTXU= +go.opentelemetry.io/collector/semconv v0.63.2-0.20221108014805-0b08d5316426 h1:pqIl7OC531J6i9ttBCj3zLmZI/BSF4q323YpK0GgKGk= +go.opentelemetry.io/collector/semconv v0.63.2-0.20221108014805-0b08d5316426/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 c9bab258b1b0..de716af28ca9 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.63.2-0.20221104003159-6b27644724d8 + go.opentelemetry.io/collector/pdata v0.63.2-0.20221108014805-0b08d5316426 go.uber.org/zap v1.23.0 ) diff --git a/internal/aws/containerinsight/go.sum b/internal/aws/containerinsight/go.sum index 87a7c4e14c09..d0bc37751cfa 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.63.2-0.20221104003159-6b27644724d8 h1:7xeTQjfsOm9eogQeIxjSEhlik9qsbBGsnmkQHfyKaRE= -go.opentelemetry.io/collector/pdata v0.63.2-0.20221104003159-6b27644724d8/go.mod h1:IzvXUGQml2mrnvdb8zIlEW3qQs9oFLdD2hLwJdZ+pek= +go.opentelemetry.io/collector/pdata v0.63.2-0.20221108014805-0b08d5316426 h1:wKDpgP0Tx/gWI2SgDGAY1OTSeihhDivbbRqFR79IGTc= +go.opentelemetry.io/collector/pdata v0.63.2-0.20221108014805-0b08d5316426/go.mod h1:IzvXUGQml2mrnvdb8zIlEW3qQs9oFLdD2hLwJdZ+pek= 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 7c63cbc7ef39..b668f9338db1 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.127 github.com/stretchr/testify v1.8.1 - go.opentelemetry.io/collector v0.63.2-0.20221104003159-6b27644724d8 + go.opentelemetry.io/collector v0.63.2-0.20221108014805-0b08d5316426 go.uber.org/zap v1.23.0 ) @@ -26,7 +26,7 @@ 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.63.2-0.20221104003159-6b27644724d8 // indirect + go.opentelemetry.io/collector/pdata v0.63.2-0.20221108014805-0b08d5316426 // 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 e88b6fb58087..435ae0087307 100644 --- a/internal/aws/cwlogs/go.sum +++ b/internal/aws/cwlogs/go.sum @@ -270,10 +270,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.63.2-0.20221104003159-6b27644724d8 h1:rOT5HzXXfSISc6FiH012zH2/EFjp37UXfjEqj5BpkWQ= -go.opentelemetry.io/collector v0.63.2-0.20221104003159-6b27644724d8/go.mod h1:JVmeZXugK4ondC6KQgrHTHWiF4JttpG5k6dWPMt62+k= -go.opentelemetry.io/collector/pdata v0.63.2-0.20221104003159-6b27644724d8 h1:7xeTQjfsOm9eogQeIxjSEhlik9qsbBGsnmkQHfyKaRE= -go.opentelemetry.io/collector/pdata v0.63.2-0.20221104003159-6b27644724d8/go.mod h1:IzvXUGQml2mrnvdb8zIlEW3qQs9oFLdD2hLwJdZ+pek= +go.opentelemetry.io/collector v0.63.2-0.20221108014805-0b08d5316426 h1:z/wLTMh7/vNxcFUDa5uG7/IPE3tYx6pzCWPV41ghyV8= +go.opentelemetry.io/collector v0.63.2-0.20221108014805-0b08d5316426/go.mod h1:+Zb70q0Rq17dA9FcHTiTjW6g96lvJ8kAZ0c+eWNkAv0= +go.opentelemetry.io/collector/pdata v0.63.2-0.20221108014805-0b08d5316426 h1:wKDpgP0Tx/gWI2SgDGAY1OTSeihhDivbbRqFR79IGTc= +go.opentelemetry.io/collector/pdata v0.63.2-0.20221108014805-0b08d5316426/go.mod h1:IzvXUGQml2mrnvdb8zIlEW3qQs9oFLdD2hLwJdZ+pek= 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 29c5130a82e3..616ba46d1fc0 100644 --- a/internal/aws/ecsutil/go.mod +++ b/internal/aws/ecsutil/go.mod @@ -5,7 +5,7 @@ go 1.18 require ( github.com/open-telemetry/opentelemetry-collector-contrib/internal/common v0.63.0 github.com/stretchr/testify v1.8.1 - go.opentelemetry.io/collector v0.63.2-0.20221104003159-6b27644724d8 + go.opentelemetry.io/collector v0.63.2-0.20221108014805-0b08d5316426 go.uber.org/zap v1.23.0 ) @@ -31,7 +31,7 @@ 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.63.2-0.20221104003159-6b27644724d8 // indirect + go.opentelemetry.io/collector/pdata v0.63.2-0.20221108014805-0b08d5316426 // 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 8a5031daf4d7..f12da0f08ec9 100644 --- a/internal/aws/ecsutil/go.sum +++ b/internal/aws/ecsutil/go.sum @@ -279,10 +279,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.63.2-0.20221104003159-6b27644724d8 h1:rOT5HzXXfSISc6FiH012zH2/EFjp37UXfjEqj5BpkWQ= -go.opentelemetry.io/collector v0.63.2-0.20221104003159-6b27644724d8/go.mod h1:JVmeZXugK4ondC6KQgrHTHWiF4JttpG5k6dWPMt62+k= -go.opentelemetry.io/collector/pdata v0.63.2-0.20221104003159-6b27644724d8 h1:7xeTQjfsOm9eogQeIxjSEhlik9qsbBGsnmkQHfyKaRE= -go.opentelemetry.io/collector/pdata v0.63.2-0.20221104003159-6b27644724d8/go.mod h1:IzvXUGQml2mrnvdb8zIlEW3qQs9oFLdD2hLwJdZ+pek= +go.opentelemetry.io/collector v0.63.2-0.20221108014805-0b08d5316426 h1:z/wLTMh7/vNxcFUDa5uG7/IPE3tYx6pzCWPV41ghyV8= +go.opentelemetry.io/collector v0.63.2-0.20221108014805-0b08d5316426/go.mod h1:+Zb70q0Rq17dA9FcHTiTjW6g96lvJ8kAZ0c+eWNkAv0= +go.opentelemetry.io/collector/pdata v0.63.2-0.20221108014805-0b08d5316426 h1:wKDpgP0Tx/gWI2SgDGAY1OTSeihhDivbbRqFR79IGTc= +go.opentelemetry.io/collector/pdata v0.63.2-0.20221108014805-0b08d5316426/go.mod h1:IzvXUGQml2mrnvdb8zIlEW3qQs9oFLdD2hLwJdZ+pek= 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/ecsutil/rest_client.go b/internal/aws/ecsutil/rest_client.go index 049201b06a32..5f0793f8117b 100644 --- a/internal/aws/ecsutil/rest_client.go +++ b/internal/aws/ecsutil/rest_client.go @@ -18,7 +18,6 @@ import ( "net/url" "go.opentelemetry.io/collector/component" - "go.opentelemetry.io/collector/config" "go.opentelemetry.io/collector/config/confighttp" ) @@ -37,8 +36,8 @@ type nopHost struct { component.Host } -func (nh *nopHost) GetExtensions() map[config.ComponentID]component.Extension { - return map[config.ComponentID]component.Extension{} +func (nh *nopHost) GetExtensions() map[component.ID]component.Extension { + return map[component.ID]component.Extension{} } // RestClient is swappable for testing. diff --git a/internal/aws/proxy/go.mod b/internal/aws/proxy/go.mod index 902ca2d2e2d0..0b9b76cd779c 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.127 github.com/open-telemetry/opentelemetry-collector-contrib/internal/common v0.63.0 github.com/stretchr/testify v1.8.1 - go.opentelemetry.io/collector v0.63.2-0.20221104003159-6b27644724d8 + go.opentelemetry.io/collector v0.63.2-0.20221108014805-0b08d5316426 go.uber.org/zap v1.23.0 ) diff --git a/internal/aws/proxy/go.sum b/internal/aws/proxy/go.sum index 2b62d85c9393..9766db2f6c6e 100644 --- a/internal/aws/proxy/go.sum +++ b/internal/aws/proxy/go.sum @@ -31,8 +31,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.63.2-0.20221104003159-6b27644724d8 h1:rOT5HzXXfSISc6FiH012zH2/EFjp37UXfjEqj5BpkWQ= -go.opentelemetry.io/collector v0.63.2-0.20221104003159-6b27644724d8/go.mod h1:JVmeZXugK4ondC6KQgrHTHWiF4JttpG5k6dWPMt62+k= +go.opentelemetry.io/collector v0.63.2-0.20221108014805-0b08d5316426 h1:z/wLTMh7/vNxcFUDa5uG7/IPE3tYx6pzCWPV41ghyV8= +go.opentelemetry.io/collector v0.63.2-0.20221108014805-0b08d5316426/go.mod h1:+Zb70q0Rq17dA9FcHTiTjW6g96lvJ8kAZ0c+eWNkAv0= 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 401f22ee25ba..587135870567 100644 --- a/internal/common/go.mod +++ b/internal/common/go.mod @@ -4,7 +4,7 @@ go 1.18 require ( github.com/stretchr/testify v1.8.1 - go.opentelemetry.io/collector v0.63.2-0.20221104003159-6b27644724d8 + go.opentelemetry.io/collector v0.63.2-0.20221108014805-0b08d5316426 go.uber.org/zap v1.23.0 ) diff --git a/internal/common/go.sum b/internal/common/go.sum index 691b42be094a..927435ccaf32 100644 --- a/internal/common/go.sum +++ b/internal/common/go.sum @@ -22,8 +22,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.63.2-0.20221104003159-6b27644724d8 h1:rOT5HzXXfSISc6FiH012zH2/EFjp37UXfjEqj5BpkWQ= -go.opentelemetry.io/collector v0.63.2-0.20221104003159-6b27644724d8/go.mod h1:JVmeZXugK4ondC6KQgrHTHWiF4JttpG5k6dWPMt62+k= +go.opentelemetry.io/collector v0.63.2-0.20221108014805-0b08d5316426 h1:z/wLTMh7/vNxcFUDa5uG7/IPE3tYx6pzCWPV41ghyV8= +go.opentelemetry.io/collector v0.63.2-0.20221108014805-0b08d5316426/go.mod h1:+Zb70q0Rq17dA9FcHTiTjW6g96lvJ8kAZ0c+eWNkAv0= 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/components/components_test.go b/internal/components/components_test.go index 1adadca08845..4b0b892827b3 100644 --- a/internal/components/components_test.go +++ b/internal/components/components_test.go @@ -22,7 +22,7 @@ import ( "testing" "github.com/stretchr/testify/assert" - "go.opentelemetry.io/collector/config" + "go.opentelemetry.io/collector/component" ) func TestDefaultComponents(t *testing.T) { @@ -32,24 +32,24 @@ func TestDefaultComponents(t *testing.T) { exts := factories.Extensions for k, v := range exts { assert.Equal(t, k, v.Type()) - assert.Equal(t, config.NewComponentID(k), v.CreateDefaultConfig().ID()) + assert.Equal(t, component.NewID(k), v.CreateDefaultConfig().ID()) } recvs := factories.Receivers for k, v := range recvs { assert.Equal(t, k, v.Type()) - assert.Equal(t, config.NewComponentID(k), v.CreateDefaultConfig().ID()) + assert.Equal(t, component.NewID(k), v.CreateDefaultConfig().ID()) } procs := factories.Processors for k, v := range procs { assert.Equal(t, k, v.Type()) - assert.Equal(t, config.NewComponentID(k), v.CreateDefaultConfig().ID()) + assert.Equal(t, component.NewID(k), v.CreateDefaultConfig().ID()) } exps := factories.Exporters for k, v := range exps { assert.Equal(t, k, v.Type()) - assert.Equal(t, config.NewComponentID(k), v.CreateDefaultConfig().ID()) + assert.Equal(t, component.NewID(k), v.CreateDefaultConfig().ID()) } } diff --git a/internal/components/exporters_test.go b/internal/components/exporters_test.go index 5cecc05b8013..20a14f88844d 100644 --- a/internal/components/exporters_test.go +++ b/internal/components/exporters_test.go @@ -29,7 +29,6 @@ import ( "github.com/stretchr/testify/require" "go.opentelemetry.io/collector/component" "go.opentelemetry.io/collector/component/componenttest" - "go.opentelemetry.io/collector/config" "go.opentelemetry.io/collector/config/configgrpc" "go.opentelemetry.io/collector/exporter/otlpexporter" "go.opentelemetry.io/collector/exporter/otlphttpexporter" @@ -83,13 +82,13 @@ func TestDefaultExporters(t *testing.T) { endpoint := testutil.GetAvailableLocalAddress(t) tests := []struct { - exporter config.Type + exporter component.Type getConfigFn getExporterConfigFn skipLifecycle bool }{ { exporter: "file", - getConfigFn: func() config.Exporter { + getConfigFn: func() component.ExporterConfig { cfg := expFactories["file"].CreateDefaultConfig().(*fileexporter.Config) cfg.Path = filepath.Join(t.TempDir(), "random.file") return cfg @@ -97,7 +96,7 @@ func TestDefaultExporters(t *testing.T) { }, { exporter: "jaeger", - getConfigFn: func() config.Exporter { + getConfigFn: func() component.ExporterConfig { cfg := expFactories["jaeger"].CreateDefaultConfig().(*jaegerexporter.Config) cfg.Endpoint = endpoint return cfg @@ -105,7 +104,7 @@ func TestDefaultExporters(t *testing.T) { }, { exporter: "jaeger_thrift", - getConfigFn: func() config.Exporter { + getConfigFn: func() component.ExporterConfig { cfg := expFactories["jaeger_thrift"].CreateDefaultConfig().(*jaegerthrifthttpexporter.Config) cfg.Endpoint = "http://" + endpoint return cfg @@ -113,7 +112,7 @@ func TestDefaultExporters(t *testing.T) { }, { exporter: "kafka", - getConfigFn: func() config.Exporter { + getConfigFn: func() component.ExporterConfig { cfg := expFactories["kafka"].CreateDefaultConfig().(*kafkaexporter.Config) cfg.Brokers = []string{"invalid:9092"} // this disables contacting the broker so we can successfully create the exporter @@ -127,7 +126,7 @@ func TestDefaultExporters(t *testing.T) { }, { exporter: "opencensus", - getConfigFn: func() config.Exporter { + getConfigFn: func() component.ExporterConfig { cfg := expFactories["opencensus"].CreateDefaultConfig().(*opencensusexporter.Config) cfg.GRPCClientSettings = configgrpc.GRPCClientSettings{ Endpoint: endpoint, @@ -137,7 +136,7 @@ func TestDefaultExporters(t *testing.T) { }, { exporter: "otlp", - getConfigFn: func() config.Exporter { + getConfigFn: func() component.ExporterConfig { cfg := expFactories["otlp"].CreateDefaultConfig().(*otlpexporter.Config) cfg.GRPCClientSettings = configgrpc.GRPCClientSettings{ Endpoint: endpoint, @@ -147,7 +146,7 @@ func TestDefaultExporters(t *testing.T) { }, { exporter: "otlphttp", - getConfigFn: func() config.Exporter { + getConfigFn: func() component.ExporterConfig { cfg := expFactories["otlphttp"].CreateDefaultConfig().(*otlphttpexporter.Config) cfg.Endpoint = "http://" + endpoint return cfg @@ -155,7 +154,7 @@ func TestDefaultExporters(t *testing.T) { }, { exporter: "parquet", - getConfigFn: func() config.Exporter { + getConfigFn: func() component.ExporterConfig { cfg := expFactories["parquet"].CreateDefaultConfig().(*parquetexporter.Config) cfg.Path = t.TempDir() return cfg @@ -163,7 +162,7 @@ func TestDefaultExporters(t *testing.T) { }, { exporter: "prometheus", - getConfigFn: func() config.Exporter { + getConfigFn: func() component.ExporterConfig { cfg := expFactories["prometheus"].CreateDefaultConfig().(*prometheusexporter.Config) cfg.Endpoint = endpoint return cfg @@ -174,7 +173,7 @@ func TestDefaultExporters(t *testing.T) { }, { exporter: "pulsar", - getConfigFn: func() config.Exporter { + getConfigFn: func() component.ExporterConfig { cfg := expFactories["pulsar"].CreateDefaultConfig().(*pulsarexporter.Config) cfg.Endpoint = "unknown:6650" return cfg @@ -182,7 +181,7 @@ func TestDefaultExporters(t *testing.T) { }, { exporter: "sapm", - getConfigFn: func() config.Exporter { + getConfigFn: func() component.ExporterConfig { cfg := expFactories["sapm"].CreateDefaultConfig().(*sapmexporter.Config) cfg.Endpoint = "http://" + endpoint return cfg @@ -190,7 +189,7 @@ func TestDefaultExporters(t *testing.T) { }, { exporter: "signalfx", - getConfigFn: func() config.Exporter { + getConfigFn: func() component.ExporterConfig { cfg := expFactories["signalfx"].CreateDefaultConfig().(*signalfxexporter.Config) cfg.AccessToken = "my_fake_token" cfg.IngestURL = "http://" + endpoint @@ -200,7 +199,7 @@ func TestDefaultExporters(t *testing.T) { }, { exporter: "splunk_hec", - getConfigFn: func() config.Exporter { + getConfigFn: func() component.ExporterConfig { cfg := expFactories["splunk_hec"].CreateDefaultConfig().(*splunkhecexporter.Config) cfg.Token = "my_fake_token" cfg.Endpoint = "http://" + endpoint @@ -209,7 +208,7 @@ func TestDefaultExporters(t *testing.T) { }, { exporter: "zipkin", - getConfigFn: func() config.Exporter { + getConfigFn: func() component.ExporterConfig { cfg := expFactories["zipkin"].CreateDefaultConfig().(*zipkinexporter.Config) cfg.Endpoint = endpoint return cfg @@ -217,7 +216,7 @@ func TestDefaultExporters(t *testing.T) { }, { exporter: "awskinesis", - getConfigFn: func() config.Exporter { + getConfigFn: func() component.ExporterConfig { cfg := expFactories["awskinesis"].CreateDefaultConfig().(*awskinesisexporter.Config) cfg.AWS.KinesisEndpoint = endpoint return cfg @@ -225,7 +224,7 @@ func TestDefaultExporters(t *testing.T) { }, { exporter: "alibabacloud_logservice", - getConfigFn: func() config.Exporter { + getConfigFn: func() component.ExporterConfig { cfg := expFactories["alibabacloud_logservice"].CreateDefaultConfig().(*alibabacloudlogserviceexporter.Config) cfg.Endpoint = "http://" + endpoint cfg.Project = "otel-testing" @@ -235,7 +234,7 @@ func TestDefaultExporters(t *testing.T) { }, { exporter: "awscloudwatch", - getConfigFn: func() config.Exporter { + getConfigFn: func() component.ExporterConfig { cfg := expFactories["awscloudwatch"].CreateDefaultConfig().(*awscloudwatchlogsexporter.Config) cfg.Endpoint = "http://" + endpoint cfg.Region = "local" @@ -244,7 +243,7 @@ func TestDefaultExporters(t *testing.T) { }, { exporter: "awsemf", - getConfigFn: func() config.Exporter { + getConfigFn: func() component.ExporterConfig { cfg := expFactories["awsemf"].CreateDefaultConfig().(*awsemfexporter.Config) cfg.Endpoint = "http://" + endpoint cfg.Region = "local" @@ -253,7 +252,7 @@ func TestDefaultExporters(t *testing.T) { }, { exporter: "awsxray", - getConfigFn: func() config.Exporter { + getConfigFn: func() component.ExporterConfig { cfg := expFactories["awsxray"].CreateDefaultConfig().(*awsxrayexporter.Config) cfg.Endpoint = "http://" + endpoint cfg.Region = "local" @@ -262,7 +261,7 @@ func TestDefaultExporters(t *testing.T) { }, { exporter: "azuredataexplorer", - getConfigFn: func() config.Exporter { + getConfigFn: func() component.ExporterConfig { cfg := expFactories["azuredataexplorer"].CreateDefaultConfig().(*azuredataexplorerexporter.Config) cfg.ClusterURI = "http://" + endpoint cfg.ApplicationID = "otel-app-id" @@ -273,7 +272,7 @@ func TestDefaultExporters(t *testing.T) { }, { exporter: "azuremonitor", - getConfigFn: func() config.Exporter { + getConfigFn: func() component.ExporterConfig { cfg := expFactories["azuremonitor"].CreateDefaultConfig().(*azuremonitorexporter.Config) cfg.Endpoint = "http://" + endpoint @@ -282,7 +281,7 @@ func TestDefaultExporters(t *testing.T) { }, { exporter: "carbon", - getConfigFn: func() config.Exporter { + getConfigFn: func() component.ExporterConfig { cfg := expFactories["carbon"].CreateDefaultConfig().(*carbonexporter.Config) cfg.Endpoint = "http://" + endpoint return cfg @@ -290,7 +289,7 @@ func TestDefaultExporters(t *testing.T) { }, { exporter: "clickhouse", - getConfigFn: func() config.Exporter { + getConfigFn: func() component.ExporterConfig { cfg := expFactories["clickhouse"].CreateDefaultConfig().(*clickhouseexporter.Config) cfg.DSN = "clickhouse://" + endpoint return cfg @@ -298,7 +297,7 @@ func TestDefaultExporters(t *testing.T) { }, { exporter: "coralogix", - getConfigFn: func() config.Exporter { + getConfigFn: func() component.ExporterConfig { cfg := expFactories["coralogix"].CreateDefaultConfig().(*coralogixexporter.Config) cfg.Traces.Endpoint = endpoint return cfg @@ -306,7 +305,7 @@ func TestDefaultExporters(t *testing.T) { }, { exporter: "datadog", - getConfigFn: func() config.Exporter { + getConfigFn: func() component.ExporterConfig { cfg := expFactories["datadog"].CreateDefaultConfig().(*datadogexporter.Config) cfg.API.Key = "cutedogsgotoheaven" return cfg @@ -314,7 +313,7 @@ func TestDefaultExporters(t *testing.T) { }, { exporter: "dynatrace", - getConfigFn: func() config.Exporter { + getConfigFn: func() component.ExporterConfig { cfg := expFactories["dynatrace"].CreateDefaultConfig().(*dtconf.Config) cfg.Endpoint = "http://" + endpoint cfg.APIToken = "dynamictracing" @@ -323,7 +322,7 @@ func TestDefaultExporters(t *testing.T) { }, { exporter: "elasticsearch", - getConfigFn: func() config.Exporter { + getConfigFn: func() component.ExporterConfig { cfg := expFactories["elasticsearch"].CreateDefaultConfig().(*elasticsearchexporter.Config) cfg.Endpoints = []string{"http://" + endpoint} return cfg @@ -331,7 +330,7 @@ func TestDefaultExporters(t *testing.T) { }, { exporter: "f5cloud", - getConfigFn: func() config.Exporter { + getConfigFn: func() component.ExporterConfig { cfg := expFactories["f5cloud"].CreateDefaultConfig().(*f5cloudexporter.Config) cfg.Endpoint = "http://" + endpoint cfg.Source = "magic-source" @@ -353,7 +352,7 @@ func TestDefaultExporters(t *testing.T) { }, { exporter: "humio", - getConfigFn: func() config.Exporter { + getConfigFn: func() component.ExporterConfig { cfg := expFactories["humio"].CreateDefaultConfig().(*humioexporter.Config) cfg.Endpoint = "http://" + endpoint return cfg @@ -361,7 +360,7 @@ func TestDefaultExporters(t *testing.T) { }, { exporter: "influxdb", - getConfigFn: func() config.Exporter { + getConfigFn: func() component.ExporterConfig { cfg := expFactories["influxdb"].CreateDefaultConfig().(*influxdbexporter.Config) cfg.Endpoint = "http://" + endpoint return cfg @@ -369,7 +368,7 @@ func TestDefaultExporters(t *testing.T) { }, { exporter: "instana", - getConfigFn: func() config.Exporter { + getConfigFn: func() component.ExporterConfig { cfg := expFactories["instana"].CreateDefaultConfig().(*instanaexporter.Config) cfg.Endpoint = "http://" + endpoint cfg.AgentKey = "Key1" @@ -378,14 +377,14 @@ func TestDefaultExporters(t *testing.T) { }, { exporter: "loadbalancing", - getConfigFn: func() config.Exporter { + getConfigFn: func() component.ExporterConfig { cfg := expFactories["loadbalancing"].CreateDefaultConfig().(*loadbalancingexporter.Config) return cfg }, }, { exporter: "logzio", - getConfigFn: func() config.Exporter { + getConfigFn: func() component.ExporterConfig { cfg := expFactories["logzio"].CreateDefaultConfig().(*logzioexporter.Config) cfg.Endpoint = "http://" + endpoint return cfg @@ -393,7 +392,7 @@ func TestDefaultExporters(t *testing.T) { }, { exporter: "loki", - getConfigFn: func() config.Exporter { + getConfigFn: func() component.ExporterConfig { cfg := expFactories["loki"].CreateDefaultConfig().(*lokiexporter.Config) cfg.Endpoint = "http://" + endpoint return cfg @@ -401,7 +400,7 @@ func TestDefaultExporters(t *testing.T) { }, { exporter: "mezmo", - getConfigFn: func() config.Exporter { + getConfigFn: func() component.ExporterConfig { cfg := expFactories["mezmo"].CreateDefaultConfig().(*mezmoexporter.Config) cfg.Endpoint = "http://" + endpoint return cfg @@ -409,21 +408,21 @@ func TestDefaultExporters(t *testing.T) { }, { exporter: "sentry", - getConfigFn: func() config.Exporter { + getConfigFn: func() component.ExporterConfig { cfg := expFactories["sentry"].CreateDefaultConfig().(*sentryexporter.Config) return cfg }, }, { exporter: "skywalking", - getConfigFn: func() config.Exporter { + getConfigFn: func() component.ExporterConfig { cfg := expFactories["skywalking"].CreateDefaultConfig().(*skywalkingexporter.Config) return cfg }, }, { exporter: "sumologic", - getConfigFn: func() config.Exporter { + getConfigFn: func() component.ExporterConfig { cfg := expFactories["sumologic"].CreateDefaultConfig().(*sumologicexporter.Config) cfg.Endpoint = "http://" + endpoint @@ -432,7 +431,7 @@ func TestDefaultExporters(t *testing.T) { }, { exporter: "tanzuobservability", - getConfigFn: func() config.Exporter { + getConfigFn: func() component.ExporterConfig { cfg := expFactories["tanzuobservability"].CreateDefaultConfig().(*tanzuobservabilityexporter.Config) cfg.Traces.Endpoint = "http://" + endpoint return cfg @@ -440,7 +439,7 @@ func TestDefaultExporters(t *testing.T) { }, { exporter: "tencentcloud_logservice", - getConfigFn: func() config.Exporter { + getConfigFn: func() component.ExporterConfig { cfg := expFactories["tencentcloud_logservice"].CreateDefaultConfig().(*tencentcloudlogserviceexporter.Config) return cfg @@ -456,7 +455,7 @@ func TestDefaultExporters(t *testing.T) { factory, ok := expFactories[tt.exporter] require.True(t, ok) assert.Equal(t, tt.exporter, factory.Type()) - assert.Equal(t, config.NewComponentID(tt.exporter), factory.CreateDefaultConfig().ID()) + assert.Equal(t, component.NewID(tt.exporter), factory.CreateDefaultConfig().ID()) if tt.skipLifecycle { t.Skip("Skipping lifecycle test", tt.exporter) @@ -471,7 +470,7 @@ func TestDefaultExporters(t *testing.T) { // GetExporterConfigFn is used customize the configuration passed to the verification. // This is used to change ports or provide values required but not provided by the // default configuration. -type getExporterConfigFn func() config.Exporter +type getExporterConfigFn func() component.ExporterConfig // verifyExporterLifecycle is used to test if an exporter type can handle the typical // lifecycle of a component. The getConfigFn parameter only need to be specified if @@ -512,23 +511,23 @@ func verifyExporterLifecycle(t *testing.T, factory component.ExporterFactory, ge type createExporterFn func( ctx context.Context, set component.ExporterCreateSettings, - cfg config.Exporter, + cfg component.ExporterConfig, ) (component.Exporter, error) func wrapCreateLogsExp(factory component.ExporterFactory) createExporterFn { - return func(ctx context.Context, set component.ExporterCreateSettings, cfg config.Exporter) (component.Exporter, error) { + return func(ctx context.Context, set component.ExporterCreateSettings, cfg component.ExporterConfig) (component.Exporter, error) { return factory.CreateLogsExporter(ctx, set, cfg) } } func wrapCreateTracesExp(factory component.ExporterFactory) createExporterFn { - return func(ctx context.Context, set component.ExporterCreateSettings, cfg config.Exporter) (component.Exporter, error) { + return func(ctx context.Context, set component.ExporterCreateSettings, cfg component.ExporterConfig) (component.Exporter, error) { return factory.CreateTracesExporter(ctx, set, cfg) } } func wrapCreateMetricsExp(factory component.ExporterFactory) createExporterFn { - return func(ctx context.Context, set component.ExporterCreateSettings, cfg config.Exporter) (component.Exporter, error) { + return func(ctx context.Context, set component.ExporterCreateSettings, cfg component.ExporterConfig) (component.Exporter, error) { return factory.CreateMetricsExporter(ctx, set, cfg) } } diff --git a/internal/components/extensions_test.go b/internal/components/extensions_test.go index 09a2a4b760b2..8ba3d837714a 100644 --- a/internal/components/extensions_test.go +++ b/internal/components/extensions_test.go @@ -29,7 +29,6 @@ import ( "github.com/stretchr/testify/require" "go.opentelemetry.io/collector/component" "go.opentelemetry.io/collector/component/componenttest" - "go.opentelemetry.io/collector/config" "go.opentelemetry.io/collector/extension/ballastextension" "go.opentelemetry.io/collector/extension/zpagesextension" @@ -58,13 +57,13 @@ func TestDefaultExtensions(t *testing.T) { endpoint := testutil.GetAvailableLocalAddress(t) tests := []struct { - extension config.Type + extension component.Type getConfigFn getExtensionConfigFn skipLifecycle bool }{ { extension: "health_check", - getConfigFn: func() config.Extension { + getConfigFn: func() component.ExtensionConfig { cfg := extFactories["health_check"].CreateDefaultConfig().(*healthcheckextension.Config) cfg.Endpoint = endpoint return cfg @@ -72,7 +71,7 @@ func TestDefaultExtensions(t *testing.T) { }, { extension: "pprof", - getConfigFn: func() config.Extension { + getConfigFn: func() component.ExtensionConfig { cfg := extFactories["pprof"].CreateDefaultConfig().(*pprofextension.Config) cfg.TCPAddr.Endpoint = endpoint return cfg @@ -80,14 +79,14 @@ func TestDefaultExtensions(t *testing.T) { }, { extension: "sigv4auth", - getConfigFn: func() config.Extension { + getConfigFn: func() component.ExtensionConfig { cfg := extFactories["sigv4auth"].CreateDefaultConfig().(*sigv4authextension.Config) return cfg }, }, { extension: "zpages", - getConfigFn: func() config.Extension { + getConfigFn: func() component.ExtensionConfig { cfg := extFactories["zpages"].CreateDefaultConfig().(*zpagesextension.Config) cfg.TCPAddr.Endpoint = endpoint return cfg @@ -95,7 +94,7 @@ func TestDefaultExtensions(t *testing.T) { }, { extension: "basicauth", - getConfigFn: func() config.Extension { + getConfigFn: func() component.ExtensionConfig { cfg := extFactories["basicauth"].CreateDefaultConfig().(*basicauthextension.Config) // No need to clean up, t.TempDir will be deleted entirely. fileName := filepath.Join(t.TempDir(), "random.file") @@ -110,7 +109,7 @@ func TestDefaultExtensions(t *testing.T) { }, { extension: "bearertokenauth", - getConfigFn: func() config.Extension { + getConfigFn: func() component.ExtensionConfig { cfg := extFactories["bearertokenauth"].CreateDefaultConfig().(*bearertokenauthextension.Config) cfg.BearerToken = "sometoken" return cfg @@ -118,14 +117,14 @@ func TestDefaultExtensions(t *testing.T) { }, { extension: "memory_ballast", - getConfigFn: func() config.Extension { + getConfigFn: func() component.ExtensionConfig { cfg := extFactories["memory_ballast"].CreateDefaultConfig().(*ballastextension.Config) return cfg }, }, { extension: "asapclient", - getConfigFn: func() config.Extension { + getConfigFn: func() component.ExtensionConfig { cfg := extFactories["asapclient"].CreateDefaultConfig().(*asapauthextension.Config) cfg.KeyID = "test_issuer/test_kid" cfg.Issuer = "test_issuer" @@ -143,7 +142,7 @@ func TestDefaultExtensions(t *testing.T) { }, { extension: "ecs_task_observer", - getConfigFn: func() config.Extension { + getConfigFn: func() component.ExtensionConfig { cfg := extFactories["ecs_task_observer"].CreateDefaultConfig().(*ecstaskobserver.Config) cfg.Endpoint = "http://localhost" return cfg @@ -155,7 +154,7 @@ func TestDefaultExtensions(t *testing.T) { }, { extension: "fluentbit", - getConfigFn: func() config.Extension { + getConfigFn: func() component.ExtensionConfig { cfg := extFactories["fluentbit"].CreateDefaultConfig().(*fluentbitextension.Config) cfg.TCPEndpoint = "http://" + endpoint return cfg @@ -163,7 +162,7 @@ func TestDefaultExtensions(t *testing.T) { }, { extension: "http_forwarder", - getConfigFn: func() config.Extension { + getConfigFn: func() component.ExtensionConfig { cfg := extFactories["http_forwarder"].CreateDefaultConfig().(*httpforwarder.Config) cfg.Egress.Endpoint = "http://" + endpoint cfg.Ingress.Endpoint = testutil.GetAvailableLocalAddress(t) @@ -172,7 +171,7 @@ func TestDefaultExtensions(t *testing.T) { }, { extension: "oauth2client", - getConfigFn: func() config.Extension { + getConfigFn: func() component.ExtensionConfig { cfg := extFactories["oauth2client"].CreateDefaultConfig().(*oauth2clientauthextension.Config) cfg.ClientID = "otel-extension" cfg.ClientSecret = "testsarehard" @@ -186,7 +185,7 @@ func TestDefaultExtensions(t *testing.T) { }, { extension: "db_storage", - getConfigFn: func() config.Extension { + getConfigFn: func() component.ExtensionConfig { cfg := extFactories["db_storage"].CreateDefaultConfig().(*dbstorage.Config) cfg.DriverName = "sqlite3" cfg.DataSource = filepath.Join(t.TempDir(), "foo.db") @@ -195,7 +194,7 @@ func TestDefaultExtensions(t *testing.T) { }, { extension: "file_storage", - getConfigFn: func() config.Extension { + getConfigFn: func() component.ExtensionConfig { cfg := extFactories["file_storage"].CreateDefaultConfig().(*filestorage.Config) cfg.Directory = t.TempDir() return cfg @@ -203,7 +202,7 @@ func TestDefaultExtensions(t *testing.T) { }, { extension: "host_observer", - getConfigFn: func() config.Extension { + getConfigFn: func() component.ExtensionConfig { cfg := extFactories["host_observer"].CreateDefaultConfig().(*hostobserver.Config) return cfg }, @@ -214,7 +213,7 @@ func TestDefaultExtensions(t *testing.T) { }, { extension: "headers_setter", - getConfigFn: func() config.Extension { + getConfigFn: func() component.ExtensionConfig { cfg := extFactories["headers_setter"].CreateDefaultConfig().(*headerssetterextension.Config) return cfg }, @@ -227,7 +226,7 @@ func TestDefaultExtensions(t *testing.T) { factory, ok := extFactories[tt.extension] require.True(t, ok) assert.Equal(t, tt.extension, factory.Type()) - assert.Equal(t, config.NewComponentID(tt.extension), factory.CreateDefaultConfig().ID()) + assert.Equal(t, component.NewID(tt.extension), factory.CreateDefaultConfig().ID()) if tt.skipLifecycle { t.Skip("Skipping lifecycle test for ", tt.extension) @@ -242,7 +241,7 @@ func TestDefaultExtensions(t *testing.T) { // getExtensionConfigFn is used customize the configuration passed to the verification. // This is used to change ports or provide values required but not provided by the // default configuration. -type getExtensionConfigFn func() config.Extension +type getExtensionConfigFn func() component.ExtensionConfig // verifyExtensionLifecycle is used to test if an extension type can handle the typical // lifecycle of a component. The getConfigFn parameter only need to be specified if diff --git a/internal/components/processors_test.go b/internal/components/processors_test.go index fed62c22208c..9f276329b1b8 100644 --- a/internal/components/processors_test.go +++ b/internal/components/processors_test.go @@ -28,7 +28,6 @@ import ( "github.com/stretchr/testify/require" "go.opentelemetry.io/collector/component" "go.opentelemetry.io/collector/component/componenttest" - "go.opentelemetry.io/collector/config" "go.opentelemetry.io/collector/consumer/consumertest" "go.opentelemetry.io/collector/processor/memorylimiterprocessor" @@ -45,13 +44,13 @@ func TestDefaultProcessors(t *testing.T) { procFactories := allFactories.Processors tests := []struct { - processor config.Type + processor component.Type getConfigFn getProcessorConfigFn skipLifecycle bool }{ { processor: "attributes", - getConfigFn: func() config.Processor { + getConfigFn: func() component.ProcessorConfig { cfg := procFactories["attributes"].CreateDefaultConfig().(*attributesprocessor.Config) cfg.Actions = []attraction.ActionKeyValue{ {Key: "attribute1", Action: attraction.INSERT, Value: 123}, @@ -80,7 +79,7 @@ func TestDefaultProcessors(t *testing.T) { }, { processor: "memory_limiter", - getConfigFn: func() config.Processor { + getConfigFn: func() component.ProcessorConfig { cfg := procFactories["memory_limiter"].CreateDefaultConfig().(*memorylimiterprocessor.Config) cfg.CheckInterval = 100 * time.Millisecond cfg.MemoryLimitMiB = 1024 * 1024 @@ -101,7 +100,7 @@ func TestDefaultProcessors(t *testing.T) { }, { processor: "resource", - getConfigFn: func() config.Processor { + getConfigFn: func() component.ProcessorConfig { cfg := procFactories["resource"].CreateDefaultConfig().(*resourceprocessor.Config) cfg.AttributesActions = []attraction.ActionKeyValue{ {Key: "attribute1", Action: attraction.INSERT, Value: 123}, @@ -115,7 +114,7 @@ func TestDefaultProcessors(t *testing.T) { }, { processor: "span", - getConfigFn: func() config.Processor { + getConfigFn: func() component.ProcessorConfig { cfg := procFactories["span"].CreateDefaultConfig().(*spanprocessor.Config) cfg.Rename.FromAttributes = []string{"test-key"} return cfg @@ -146,7 +145,7 @@ func TestDefaultProcessors(t *testing.T) { factory, ok := procFactories[tt.processor] require.True(t, ok) assert.Equal(t, tt.processor, factory.Type()) - assert.EqualValues(t, config.NewComponentID(tt.processor), factory.CreateDefaultConfig().ID()) + assert.EqualValues(t, component.NewID(tt.processor), factory.CreateDefaultConfig().ID()) if tt.skipLifecycle { t.Skip("Skipping lifecycle processor check for:", tt.processor) @@ -160,7 +159,7 @@ func TestDefaultProcessors(t *testing.T) { // getProcessorConfigFn is used customize the configuration passed to the verification. // This is used to change ports or provide values required but not provided by the // default configuration. -type getProcessorConfigFn func() config.Processor +type getProcessorConfigFn func() component.ProcessorConfig // verifyProcessorLifecycle is used to test if an processor type can handle the typical // lifecycle of a component. The getConfigFn parameter only need to be specified if @@ -199,23 +198,23 @@ func verifyProcessorLifecycle(t *testing.T, factory component.ProcessorFactory, type createProcessorFn func( ctx context.Context, set component.ProcessorCreateSettings, - cfg config.Processor, + cfg component.ProcessorConfig, ) (component.Processor, error) func wrapCreateLogsProc(factory component.ProcessorFactory) createProcessorFn { - return func(ctx context.Context, set component.ProcessorCreateSettings, cfg config.Processor) (component.Processor, error) { + return func(ctx context.Context, set component.ProcessorCreateSettings, cfg component.ProcessorConfig) (component.Processor, error) { return factory.CreateLogsProcessor(ctx, set, cfg, consumertest.NewNop()) } } func wrapCreateMetricsProc(factory component.ProcessorFactory) createProcessorFn { - return func(ctx context.Context, set component.ProcessorCreateSettings, cfg config.Processor) (component.Processor, error) { + return func(ctx context.Context, set component.ProcessorCreateSettings, cfg component.ProcessorConfig) (component.Processor, error) { return factory.CreateMetricsProcessor(ctx, set, cfg, consumertest.NewNop()) } } func wrapCreateTracesProc(factory component.ProcessorFactory) createProcessorFn { - return func(ctx context.Context, set component.ProcessorCreateSettings, cfg config.Processor) (component.Processor, error) { + return func(ctx context.Context, set component.ProcessorCreateSettings, cfg component.ProcessorConfig) (component.Processor, error) { return factory.CreateTracesProcessor(ctx, set, cfg, consumertest.NewNop()) } } diff --git a/internal/components/receivers_test.go b/internal/components/receivers_test.go index e2bb68e309f5..e3e39f47cdb8 100644 --- a/internal/components/receivers_test.go +++ b/internal/components/receivers_test.go @@ -32,7 +32,6 @@ import ( "github.com/stretchr/testify/require" "go.opentelemetry.io/collector/component" "go.opentelemetry.io/collector/component/componenttest" - "go.opentelemetry.io/collector/config" "go.opentelemetry.io/collector/consumer/consumertest" tcpop "github.com/open-telemetry/opentelemetry-collector-contrib/pkg/stanza/operator/input/tcp" @@ -57,7 +56,7 @@ func TestDefaultReceivers(t *testing.T) { rcvrFactories := allFactories.Receivers tests := []struct { - receiver config.Type + receiver component.Type skipLifecyle bool getConfigFn getReceiverConfigFn }{ @@ -73,7 +72,7 @@ func TestDefaultReceivers(t *testing.T) { }, { receiver: "awscloudwatch", - getConfigFn: func() config.Receiver { + getConfigFn: func() component.ReceiverConfig { cfg := rcvrFactories["awscloudwatch"].CreateDefaultConfig().(*awscloudwatchreceiver.Config) cfg.Region = "us-west-2" cfg.Logs.Groups = awscloudwatchreceiver.GroupConfig{AutodiscoverConfig: nil} @@ -98,7 +97,7 @@ func TestDefaultReceivers(t *testing.T) { }, { receiver: "azureeventhub", - getConfigFn: func() config.Receiver { + getConfigFn: func() component.ReceiverConfig { cfg := rcvrFactories["azureeventhub"].CreateDefaultConfig().(*azureeventhubreceiver.Config) cfg.Connection = "Endpoint=sb://example.com/;SharedAccessKeyName=RootManageSharedAccessKey;SharedAccessKey=superSecret1234=;EntityPath=hubName" return cfg @@ -110,7 +109,7 @@ func TestDefaultReceivers(t *testing.T) { }, { receiver: "carbon", - getConfigFn: func() config.Receiver { + getConfigFn: func() component.ReceiverConfig { cfg := rcvrFactories["carbon"].CreateDefaultConfig().(*carbonreceiver.Config) cfg.Endpoint = "0.0.0.0:0" return cfg @@ -123,7 +122,7 @@ func TestDefaultReceivers(t *testing.T) { }, { receiver: "chrony", - getConfigFn: func() config.Receiver { + getConfigFn: func() component.ReceiverConfig { cfg := rcvrFactories["chrony"].CreateDefaultConfig().(*chronyreceiver.Config) cfg.Endpoint = "udp://localhost:323" return cfg @@ -151,7 +150,7 @@ func TestDefaultReceivers(t *testing.T) { }, { receiver: "filelog", - getConfigFn: func() config.Receiver { + getConfigFn: func() component.ReceiverConfig { cfg := rcvrFactories["filelog"].CreateDefaultConfig().(*filelogreceiver.FileLogConfig) cfg.InputConfig.Include = []string{filepath.Join(t.TempDir(), "*")} return cfg @@ -226,7 +225,7 @@ func TestDefaultReceivers(t *testing.T) { { receiver: "mongodbatlas", // MongoDB Atlas needs unique config IDs - getConfigFn: func() config.Receiver { + getConfigFn: func() component.ReceiverConfig { cfg := rcvrFactories["mongodbatlas"].CreateDefaultConfig().(*mongodbatlasreceiver.Config) cfg.SetIDName(strconv.Itoa(int(time.Now().UnixNano()))) cfg.Logs.Enabled = true @@ -254,7 +253,7 @@ func TestDefaultReceivers(t *testing.T) { }, { receiver: "otlpjsonfile", - getConfigFn: func() config.Receiver { + getConfigFn: func() component.ReceiverConfig { cfg := rcvrFactories["otlpjsonfile"].CreateDefaultConfig().(*otlpjsonfilereceiver.Config) cfg.Include = []string{"/tmp/*.log"} return cfg @@ -269,7 +268,7 @@ func TestDefaultReceivers(t *testing.T) { }, { receiver: "prometheus", - getConfigFn: func() config.Receiver { + getConfigFn: func() component.ReceiverConfig { cfg := rcvrFactories["prometheus"].CreateDefaultConfig().(*prometheusreceiver.Config) cfg.PrometheusConfig = &promconfig.Config{ ScrapeConfigs: []*promconfig.ScrapeConfig{ @@ -316,7 +315,7 @@ func TestDefaultReceivers(t *testing.T) { }, { receiver: "snmp", - getConfigFn: func() config.Receiver { + getConfigFn: func() component.ReceiverConfig { cfg := rcvrFactories["snmp"].CreateDefaultConfig().(*snmpreceiver.Config) cfg.Metrics = map[string]*snmpreceiver.MetricConfig{ "m1": { @@ -363,7 +362,7 @@ func TestDefaultReceivers(t *testing.T) { }, { receiver: "syslog", - getConfigFn: func() config.Receiver { + getConfigFn: func() component.ReceiverConfig { cfg := rcvrFactories["syslog"].CreateDefaultConfig().(*syslogreceiver.SysLogConfig) cfg.InputConfig.TCP = &tcpop.NewConfig().BaseConfig cfg.InputConfig.TCP.ListenAddress = "0.0.0.0:0" @@ -373,7 +372,7 @@ func TestDefaultReceivers(t *testing.T) { }, { receiver: "tcplog", - getConfigFn: func() config.Receiver { + getConfigFn: func() component.ReceiverConfig { cfg := rcvrFactories["tcplog"].CreateDefaultConfig().(*tcplogreceiver.TCPLogConfig) cfg.InputConfig.ListenAddress = "0.0.0.0:0" return cfg @@ -381,7 +380,7 @@ func TestDefaultReceivers(t *testing.T) { }, { receiver: "udplog", - getConfigFn: func() config.Receiver { + getConfigFn: func() component.ReceiverConfig { cfg := rcvrFactories["udplog"].CreateDefaultConfig().(*udplogreceiver.UDPLogConfig) cfg.InputConfig.ListenAddress = "0.0.0.0:0" return cfg @@ -402,7 +401,7 @@ func TestDefaultReceivers(t *testing.T) { factory, ok := rcvrFactories[tt.receiver] require.True(t, ok) assert.Equal(t, tt.receiver, factory.Type()) - assert.Equal(t, config.NewComponentID(tt.receiver), factory.CreateDefaultConfig().ID()) + assert.Equal(t, component.NewID(tt.receiver), factory.CreateDefaultConfig().ID()) if tt.skipLifecyle { t.Skip("Skipping lifecycle test", tt.receiver) @@ -417,7 +416,7 @@ func TestDefaultReceivers(t *testing.T) { // getReceiverConfigFn is used customize the configuration passed to the verification. // This is used to change ports or provide values required but not provided by the // default configuration. -type getReceiverConfigFn func() config.Receiver +type getReceiverConfigFn func() component.ReceiverConfig // verifyReceiverLifecycle is used to test if a receiver type can handle the typical // lifecycle of a component. The getConfigFn parameter only need to be specified if @@ -457,23 +456,23 @@ func verifyReceiverLifecycle(t *testing.T, factory component.ReceiverFactory, ge type createReceiverFn func( ctx context.Context, set component.ReceiverCreateSettings, - cfg config.Receiver, + cfg component.ReceiverConfig, ) (component.Receiver, error) func wrapCreateLogsRcvr(factory component.ReceiverFactory) createReceiverFn { - return func(ctx context.Context, set component.ReceiverCreateSettings, cfg config.Receiver) (component.Receiver, error) { + return func(ctx context.Context, set component.ReceiverCreateSettings, cfg component.ReceiverConfig) (component.Receiver, error) { return factory.CreateLogsReceiver(ctx, set, cfg, consumertest.NewNop()) } } func wrapCreateMetricsRcvr(factory component.ReceiverFactory) createReceiverFn { - return func(ctx context.Context, set component.ReceiverCreateSettings, cfg config.Receiver) (component.Receiver, error) { + return func(ctx context.Context, set component.ReceiverCreateSettings, cfg component.ReceiverConfig) (component.Receiver, error) { return factory.CreateMetricsReceiver(ctx, set, cfg, consumertest.NewNop()) } } func wrapCreateTracesRcvr(factory component.ReceiverFactory) createReceiverFn { - return func(ctx context.Context, set component.ReceiverCreateSettings, cfg config.Receiver) (component.Receiver, error) { + return func(ctx context.Context, set component.ReceiverCreateSettings, cfg component.ReceiverConfig) (component.Receiver, error) { return factory.CreateTracesReceiver(ctx, set, cfg, consumertest.NewNop()) } } diff --git a/internal/coreinternal/go.mod b/internal/coreinternal/go.mod index e03dbb83f08d..744966e4d4f1 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.63.2-0.20221104003159-6b27644724d8 - go.opentelemetry.io/collector/pdata v0.63.2-0.20221104003159-6b27644724d8 - go.opentelemetry.io/collector/semconv v0.63.2-0.20221104003159-6b27644724d8 + go.opentelemetry.io/collector v0.63.2-0.20221108014805-0b08d5316426 + go.opentelemetry.io/collector/pdata v0.63.2-0.20221108014805-0b08d5316426 + go.opentelemetry.io/collector/semconv v0.63.2-0.20221108014805-0b08d5316426 go.uber.org/zap v1.23.0 ) diff --git a/internal/coreinternal/go.sum b/internal/coreinternal/go.sum index 5ba193448eab..5df4412f59c5 100644 --- a/internal/coreinternal/go.sum +++ b/internal/coreinternal/go.sum @@ -276,12 +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.63.2-0.20221104003159-6b27644724d8 h1:rOT5HzXXfSISc6FiH012zH2/EFjp37UXfjEqj5BpkWQ= -go.opentelemetry.io/collector v0.63.2-0.20221104003159-6b27644724d8/go.mod h1:JVmeZXugK4ondC6KQgrHTHWiF4JttpG5k6dWPMt62+k= -go.opentelemetry.io/collector/pdata v0.63.2-0.20221104003159-6b27644724d8 h1:7xeTQjfsOm9eogQeIxjSEhlik9qsbBGsnmkQHfyKaRE= -go.opentelemetry.io/collector/pdata v0.63.2-0.20221104003159-6b27644724d8/go.mod h1:IzvXUGQml2mrnvdb8zIlEW3qQs9oFLdD2hLwJdZ+pek= -go.opentelemetry.io/collector/semconv v0.63.2-0.20221104003159-6b27644724d8 h1:jm0sNPyqo6S165QjQYMBHB2nK50wlJbMYM03Yr3Eo2k= -go.opentelemetry.io/collector/semconv v0.63.2-0.20221104003159-6b27644724d8/go.mod h1:5o9yhOa+ABt7g2E5JABDxGZ1PQPbtfxrKNbYn+LOTXU= +go.opentelemetry.io/collector v0.63.2-0.20221108014805-0b08d5316426 h1:z/wLTMh7/vNxcFUDa5uG7/IPE3tYx6pzCWPV41ghyV8= +go.opentelemetry.io/collector v0.63.2-0.20221108014805-0b08d5316426/go.mod h1:+Zb70q0Rq17dA9FcHTiTjW6g96lvJ8kAZ0c+eWNkAv0= +go.opentelemetry.io/collector/pdata v0.63.2-0.20221108014805-0b08d5316426 h1:wKDpgP0Tx/gWI2SgDGAY1OTSeihhDivbbRqFR79IGTc= +go.opentelemetry.io/collector/pdata v0.63.2-0.20221108014805-0b08d5316426/go.mod h1:IzvXUGQml2mrnvdb8zIlEW3qQs9oFLdD2hLwJdZ+pek= +go.opentelemetry.io/collector/semconv v0.63.2-0.20221108014805-0b08d5316426 h1:pqIl7OC531J6i9ttBCj3zLmZI/BSF4q323YpK0GgKGk= +go.opentelemetry.io/collector/semconv v0.63.2-0.20221108014805-0b08d5316426/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 caed7fbacf6b..08fc9a22bea0 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.63.0 github.com/open-telemetry/opentelemetry-collector-contrib/internal/k8sconfig v0.63.0 github.com/stretchr/testify v1.8.1 - go.opentelemetry.io/collector v0.63.2-0.20221104003159-6b27644724d8 + go.opentelemetry.io/collector v0.63.2-0.20221108014805-0b08d5316426 go.uber.org/zap v1.23.0 ) diff --git a/internal/kubelet/go.sum b/internal/kubelet/go.sum index 6faa7951055a..68ab55da2777 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.63.2-0.20221104003159-6b27644724d8 h1:rOT5HzXXfSISc6FiH012zH2/EFjp37UXfjEqj5BpkWQ= -go.opentelemetry.io/collector v0.63.2-0.20221104003159-6b27644724d8/go.mod h1:JVmeZXugK4ondC6KQgrHTHWiF4JttpG5k6dWPMt62+k= +go.opentelemetry.io/collector v0.63.2-0.20221108014805-0b08d5316426 h1:z/wLTMh7/vNxcFUDa5uG7/IPE3tYx6pzCWPV41ghyV8= +go.opentelemetry.io/collector v0.63.2-0.20221108014805-0b08d5316426/go.mod h1:+Zb70q0Rq17dA9FcHTiTjW6g96lvJ8kAZ0c+eWNkAv0= 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/go.mod b/internal/scrapertest/go.mod index 8d3935baf764..1e75dd9b7fd3 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.63.2-0.20221104003159-6b27644724d8 + go.opentelemetry.io/collector/pdata v0.63.2-0.20221108014805-0b08d5316426 go.uber.org/multierr v1.8.0 ) diff --git a/internal/scrapertest/go.sum b/internal/scrapertest/go.sum index 99fcd696856e..34466446ed75 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.63.2-0.20221104003159-6b27644724d8 h1:7xeTQjfsOm9eogQeIxjSEhlik9qsbBGsnmkQHfyKaRE= -go.opentelemetry.io/collector/pdata v0.63.2-0.20221104003159-6b27644724d8/go.mod h1:IzvXUGQml2mrnvdb8zIlEW3qQs9oFLdD2hLwJdZ+pek= +go.opentelemetry.io/collector/pdata v0.63.2-0.20221108014805-0b08d5316426 h1:wKDpgP0Tx/gWI2SgDGAY1OTSeihhDivbbRqFR79IGTc= +go.opentelemetry.io/collector/pdata v0.63.2-0.20221108014805-0b08d5316426/go.mod h1:IzvXUGQml2mrnvdb8zIlEW3qQs9oFLdD2hLwJdZ+pek= 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 eb50cf04ba4c..14a139a48ad6 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.63.2-0.20221104003159-6b27644724d8 + go.opentelemetry.io/collector v0.63.2-0.20221108014805-0b08d5316426 ) require ( @@ -22,7 +22,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/pdata v0.63.2-0.20221104003159-6b27644724d8 // indirect + go.opentelemetry.io/collector/pdata v0.63.2-0.20221108014805-0b08d5316426 // 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 b6615265e5af..3c5087135da1 100644 --- a/internal/sharedcomponent/go.sum +++ b/internal/sharedcomponent/go.sum @@ -265,10 +265,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.63.2-0.20221104003159-6b27644724d8 h1:rOT5HzXXfSISc6FiH012zH2/EFjp37UXfjEqj5BpkWQ= -go.opentelemetry.io/collector v0.63.2-0.20221104003159-6b27644724d8/go.mod h1:JVmeZXugK4ondC6KQgrHTHWiF4JttpG5k6dWPMt62+k= -go.opentelemetry.io/collector/pdata v0.63.2-0.20221104003159-6b27644724d8 h1:7xeTQjfsOm9eogQeIxjSEhlik9qsbBGsnmkQHfyKaRE= -go.opentelemetry.io/collector/pdata v0.63.2-0.20221104003159-6b27644724d8/go.mod h1:IzvXUGQml2mrnvdb8zIlEW3qQs9oFLdD2hLwJdZ+pek= +go.opentelemetry.io/collector v0.63.2-0.20221108014805-0b08d5316426 h1:z/wLTMh7/vNxcFUDa5uG7/IPE3tYx6pzCWPV41ghyV8= +go.opentelemetry.io/collector v0.63.2-0.20221108014805-0b08d5316426/go.mod h1:+Zb70q0Rq17dA9FcHTiTjW6g96lvJ8kAZ0c+eWNkAv0= +go.opentelemetry.io/collector/pdata v0.63.2-0.20221108014805-0b08d5316426 h1:wKDpgP0Tx/gWI2SgDGAY1OTSeihhDivbbRqFR79IGTc= +go.opentelemetry.io/collector/pdata v0.63.2-0.20221108014805-0b08d5316426/go.mod h1:IzvXUGQml2mrnvdb8zIlEW3qQs9oFLdD2hLwJdZ+pek= 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/sharedcomponent/sharedcomponent_test.go b/internal/sharedcomponent/sharedcomponent_test.go index 2e93e9b3425f..f0d59c868691 100644 --- a/internal/sharedcomponent/sharedcomponent_test.go +++ b/internal/sharedcomponent/sharedcomponent_test.go @@ -22,10 +22,9 @@ import ( "github.com/stretchr/testify/assert" "go.opentelemetry.io/collector/component" "go.opentelemetry.io/collector/component/componenttest" - "go.opentelemetry.io/collector/config" ) -var id = config.NewComponentID("test") +var id = component.NewID("test") func TestNewSharedComponents(t *testing.T) { comps := NewSharedComponents() diff --git a/internal/splunk/go.mod b/internal/splunk/go.mod index 3045d7c05594..7574a327ca5f 100644 --- a/internal/splunk/go.mod +++ b/internal/splunk/go.mod @@ -4,9 +4,9 @@ go 1.18 require ( github.com/stretchr/testify v1.8.1 - go.opentelemetry.io/collector v0.63.2-0.20221104003159-6b27644724d8 - go.opentelemetry.io/collector/pdata v0.63.2-0.20221104003159-6b27644724d8 - go.opentelemetry.io/collector/semconv v0.63.2-0.20221104003159-6b27644724d8 + go.opentelemetry.io/collector v0.63.2-0.20221108014805-0b08d5316426 + go.opentelemetry.io/collector/pdata v0.63.2-0.20221108014805-0b08d5316426 + go.opentelemetry.io/collector/semconv v0.63.2-0.20221108014805-0b08d5316426 go.uber.org/multierr v1.8.0 ) @@ -26,7 +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.opencensus.io v0.23.0 // indirect + go.opencensus.io v0.24.0 // 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 50e9d880c448..56c42862978f 100644 --- a/internal/splunk/go.sum +++ b/internal/splunk/go.sum @@ -235,7 +235,7 @@ github.com/prometheus/client_golang v0.9.1/go.mod h1:7SWBe2y4D6OKWSNQJUaRYU/AaXP github.com/prometheus/client_golang v1.0.0/go.mod h1:db9x61etRT2tGnBNRi70OPL5FsnadC4Ky3P0J6CfImo= github.com/prometheus/client_golang v1.7.1/go.mod h1:PY5Wy2awLA44sXw4AOSfFBetzPP4j5+D6mVACh+pe2M= github.com/prometheus/client_golang v1.11.1/go.mod h1:Z6t4BnS23TR94PD6BsDNk8yVqroYurpAkEiz0P2BEV0= -github.com/prometheus/client_golang v1.13.0 h1:b71QUfeo5M8gq2+evJdTPfZhYMAU0uKPkyPJ7TPsloU= +github.com/prometheus/client_golang v1.13.1 h1:3gMjIY2+/hzmqhtUC/aQNYldJA6DtH3CgQvwS+02K1c= github.com/prometheus/client_model v0.0.0-20180712105110-5c3871d89910/go.mod h1:MbSGuTsp3dbXC40dX6PRTWyKYBIrTGTE9sqQNg2J8bo= github.com/prometheus/client_model v0.0.0-20190129233127-fd36f4220a90/go.mod h1:xMI15A0UPsDsEKsMN9yxemIoYk6Tm2C1GtYGdfGttqA= github.com/prometheus/client_model v0.0.0-20190812154241-14fe0d1b01d4/go.mod h1:xMI15A0UPsDsEKsMN9yxemIoYk6Tm2C1GtYGdfGttqA= @@ -273,7 +273,6 @@ github.com/stretchr/testify v1.2.2/go.mod h1:a8OnRcib4nhh0OaRAV+Yts87kKdq0PP7pXf github.com/stretchr/testify v1.3.0/go.mod h1:M5WIy9Dh21IEIfnGCwXGc5bZfKNJtfHm1UVUgZn+9EI= github.com/stretchr/testify v1.4.0/go.mod h1:j7eGeouHqKxXV5pUuKE4zz7dFj8WfuZ+81PSLYec5m4= github.com/stretchr/testify v1.5.1/go.mod h1:5W2xD1RspED5o8YsWQXVCued0rvSQ+mT+I5cxcmMvtA= -github.com/stretchr/testify v1.6.1/go.mod h1:6Fq8oRcR53rry900zMqJjRRixrwX3KX962/h/Wwjteg= github.com/stretchr/testify v1.7.0/go.mod h1:6Fq8oRcR53rry900zMqJjRRixrwX3KX962/h/Wwjteg= github.com/stretchr/testify v1.7.1/go.mod h1:6Fq8oRcR53rry900zMqJjRRixrwX3KX962/h/Wwjteg= github.com/stretchr/testify v1.8.0/go.mod h1:yNjHg4UonilssWZ8iaSj1OCr/vHnekPRkoO+kdMU+MU= @@ -285,14 +284,14 @@ 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.opencensus.io v0.23.0 h1:gqCw0LfLxScz8irSi8exQc7fyQ0fKQU/qnC/X8+V/1M= -go.opencensus.io v0.23.0/go.mod h1:XItmlyltB5F7CS4xOC1DcqMoFqwtC6OG2xF7mCv7P7E= -go.opentelemetry.io/collector v0.63.2-0.20221104003159-6b27644724d8 h1:rOT5HzXXfSISc6FiH012zH2/EFjp37UXfjEqj5BpkWQ= -go.opentelemetry.io/collector v0.63.2-0.20221104003159-6b27644724d8/go.mod h1:JVmeZXugK4ondC6KQgrHTHWiF4JttpG5k6dWPMt62+k= -go.opentelemetry.io/collector/pdata v0.63.2-0.20221104003159-6b27644724d8 h1:7xeTQjfsOm9eogQeIxjSEhlik9qsbBGsnmkQHfyKaRE= -go.opentelemetry.io/collector/pdata v0.63.2-0.20221104003159-6b27644724d8/go.mod h1:IzvXUGQml2mrnvdb8zIlEW3qQs9oFLdD2hLwJdZ+pek= -go.opentelemetry.io/collector/semconv v0.63.2-0.20221104003159-6b27644724d8 h1:jm0sNPyqo6S165QjQYMBHB2nK50wlJbMYM03Yr3Eo2k= -go.opentelemetry.io/collector/semconv v0.63.2-0.20221104003159-6b27644724d8/go.mod h1:5o9yhOa+ABt7g2E5JABDxGZ1PQPbtfxrKNbYn+LOTXU= +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.63.2-0.20221108014805-0b08d5316426 h1:z/wLTMh7/vNxcFUDa5uG7/IPE3tYx6pzCWPV41ghyV8= +go.opentelemetry.io/collector v0.63.2-0.20221108014805-0b08d5316426/go.mod h1:+Zb70q0Rq17dA9FcHTiTjW6g96lvJ8kAZ0c+eWNkAv0= +go.opentelemetry.io/collector/pdata v0.63.2-0.20221108014805-0b08d5316426 h1:wKDpgP0Tx/gWI2SgDGAY1OTSeihhDivbbRqFR79IGTc= +go.opentelemetry.io/collector/pdata v0.63.2-0.20221108014805-0b08d5316426/go.mod h1:IzvXUGQml2mrnvdb8zIlEW3qQs9oFLdD2hLwJdZ+pek= +go.opentelemetry.io/collector/semconv v0.63.2-0.20221108014805-0b08d5316426 h1:pqIl7OC531J6i9ttBCj3zLmZI/BSF4q323YpK0GgKGk= +go.opentelemetry.io/collector/semconv v0.63.2-0.20221108014805-0b08d5316426/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 6e41f437e44f..5c22c2508525 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.63.2-0.20221104003159-6b27644724d8 - go.opentelemetry.io/collector/pdata v0.63.2-0.20221104003159-6b27644724d8 + go.opentelemetry.io/collector v0.63.2-0.20221108014805-0b08d5316426 + go.opentelemetry.io/collector/pdata v0.63.2-0.20221108014805-0b08d5316426 go.uber.org/multierr v1.8.0 ) diff --git a/pkg/batchperresourceattr/go.sum b/pkg/batchperresourceattr/go.sum index 8eae66e18947..01743b6c65b8 100644 --- a/pkg/batchperresourceattr/go.sum +++ b/pkg/batchperresourceattr/go.sum @@ -84,10 +84,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.63.2-0.20221104003159-6b27644724d8 h1:rOT5HzXXfSISc6FiH012zH2/EFjp37UXfjEqj5BpkWQ= -go.opentelemetry.io/collector v0.63.2-0.20221104003159-6b27644724d8/go.mod h1:JVmeZXugK4ondC6KQgrHTHWiF4JttpG5k6dWPMt62+k= -go.opentelemetry.io/collector/pdata v0.63.2-0.20221104003159-6b27644724d8 h1:7xeTQjfsOm9eogQeIxjSEhlik9qsbBGsnmkQHfyKaRE= -go.opentelemetry.io/collector/pdata v0.63.2-0.20221104003159-6b27644724d8/go.mod h1:IzvXUGQml2mrnvdb8zIlEW3qQs9oFLdD2hLwJdZ+pek= +go.opentelemetry.io/collector v0.63.2-0.20221108014805-0b08d5316426 h1:z/wLTMh7/vNxcFUDa5uG7/IPE3tYx6pzCWPV41ghyV8= +go.opentelemetry.io/collector v0.63.2-0.20221108014805-0b08d5316426/go.mod h1:+Zb70q0Rq17dA9FcHTiTjW6g96lvJ8kAZ0c+eWNkAv0= +go.opentelemetry.io/collector/pdata v0.63.2-0.20221108014805-0b08d5316426 h1:wKDpgP0Tx/gWI2SgDGAY1OTSeihhDivbbRqFR79IGTc= +go.opentelemetry.io/collector/pdata v0.63.2-0.20221108014805-0b08d5316426/go.mod h1:IzvXUGQml2mrnvdb8zIlEW3qQs9oFLdD2hLwJdZ+pek= 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 bb0409b5a4f9..634565bf28b1 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.63.2-0.20221104003159-6b27644724d8 + go.opentelemetry.io/collector/pdata v0.63.2-0.20221108014805-0b08d5316426 ) require ( diff --git a/pkg/batchpersignal/go.sum b/pkg/batchpersignal/go.sum index 922e3eed908b..524722c76b8d 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.63.2-0.20221104003159-6b27644724d8 h1:7xeTQjfsOm9eogQeIxjSEhlik9qsbBGsnmkQHfyKaRE= -go.opentelemetry.io/collector/pdata v0.63.2-0.20221104003159-6b27644724d8/go.mod h1:IzvXUGQml2mrnvdb8zIlEW3qQs9oFLdD2hLwJdZ+pek= +go.opentelemetry.io/collector/pdata v0.63.2-0.20221108014805-0b08d5316426 h1:wKDpgP0Tx/gWI2SgDGAY1OTSeihhDivbbRqFR79IGTc= +go.opentelemetry.io/collector/pdata v0.63.2-0.20221108014805-0b08d5316426/go.mod h1:IzvXUGQml2mrnvdb8zIlEW3qQs9oFLdD2hLwJdZ+pek= 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 dfb87987c186..67d1648c2d0c 100644 --- a/pkg/ottl/go.mod +++ b/pkg/ottl/go.mod @@ -6,8 +6,8 @@ require ( github.com/alecthomas/participle/v2 v2.0.0-beta.5 github.com/gobwas/glob v0.2.3 github.com/stretchr/testify v1.8.1 - go.opentelemetry.io/collector v0.63.2-0.20221104003159-6b27644724d8 - go.opentelemetry.io/collector/pdata v0.63.2-0.20221104003159-6b27644724d8 + go.opentelemetry.io/collector v0.63.2-0.20221108014805-0b08d5316426 + go.opentelemetry.io/collector/pdata v0.63.2-0.20221108014805-0b08d5316426 go.opentelemetry.io/otel/trace v1.11.1 go.uber.org/multierr v1.8.0 go.uber.org/zap v1.23.0 diff --git a/pkg/ottl/go.sum b/pkg/ottl/go.sum index 1857eab24195..5db03c2e303b 100644 --- a/pkg/ottl/go.sum +++ b/pkg/ottl/go.sum @@ -270,10 +270,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.63.2-0.20221104003159-6b27644724d8 h1:rOT5HzXXfSISc6FiH012zH2/EFjp37UXfjEqj5BpkWQ= -go.opentelemetry.io/collector v0.63.2-0.20221104003159-6b27644724d8/go.mod h1:JVmeZXugK4ondC6KQgrHTHWiF4JttpG5k6dWPMt62+k= -go.opentelemetry.io/collector/pdata v0.63.2-0.20221104003159-6b27644724d8 h1:7xeTQjfsOm9eogQeIxjSEhlik9qsbBGsnmkQHfyKaRE= -go.opentelemetry.io/collector/pdata v0.63.2-0.20221104003159-6b27644724d8/go.mod h1:IzvXUGQml2mrnvdb8zIlEW3qQs9oFLdD2hLwJdZ+pek= +go.opentelemetry.io/collector v0.63.2-0.20221108014805-0b08d5316426 h1:z/wLTMh7/vNxcFUDa5uG7/IPE3tYx6pzCWPV41ghyV8= +go.opentelemetry.io/collector v0.63.2-0.20221108014805-0b08d5316426/go.mod h1:+Zb70q0Rq17dA9FcHTiTjW6g96lvJ8kAZ0c+eWNkAv0= +go.opentelemetry.io/collector/pdata v0.63.2-0.20221108014805-0b08d5316426 h1:wKDpgP0Tx/gWI2SgDGAY1OTSeihhDivbbRqFR79IGTc= +go.opentelemetry.io/collector/pdata v0.63.2-0.20221108014805-0b08d5316426/go.mod h1:IzvXUGQml2mrnvdb8zIlEW3qQs9oFLdD2hLwJdZ+pek= 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 c95626b5e44b..1f80fff22ea1 100644 --- a/pkg/resourcetotelemetry/go.mod +++ b/pkg/resourcetotelemetry/go.mod @@ -5,8 +5,8 @@ go 1.18 require ( github.com/open-telemetry/opentelemetry-collector-contrib/internal/coreinternal v0.63.0 github.com/stretchr/testify v1.8.1 - go.opentelemetry.io/collector v0.63.2-0.20221104003159-6b27644724d8 - go.opentelemetry.io/collector/pdata v0.63.2-0.20221104003159-6b27644724d8 + go.opentelemetry.io/collector v0.63.2-0.20221108014805-0b08d5316426 + go.opentelemetry.io/collector/pdata v0.63.2-0.20221108014805-0b08d5316426 ) require ( diff --git a/pkg/resourcetotelemetry/go.sum b/pkg/resourcetotelemetry/go.sum index 3bd0c64a2c29..c56616f5755c 100644 --- a/pkg/resourcetotelemetry/go.sum +++ b/pkg/resourcetotelemetry/go.sum @@ -256,10 +256,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.63.2-0.20221104003159-6b27644724d8 h1:rOT5HzXXfSISc6FiH012zH2/EFjp37UXfjEqj5BpkWQ= -go.opentelemetry.io/collector v0.63.2-0.20221104003159-6b27644724d8/go.mod h1:JVmeZXugK4ondC6KQgrHTHWiF4JttpG5k6dWPMt62+k= -go.opentelemetry.io/collector/pdata v0.63.2-0.20221104003159-6b27644724d8 h1:7xeTQjfsOm9eogQeIxjSEhlik9qsbBGsnmkQHfyKaRE= -go.opentelemetry.io/collector/pdata v0.63.2-0.20221104003159-6b27644724d8/go.mod h1:IzvXUGQml2mrnvdb8zIlEW3qQs9oFLdD2hLwJdZ+pek= +go.opentelemetry.io/collector v0.63.2-0.20221108014805-0b08d5316426 h1:z/wLTMh7/vNxcFUDa5uG7/IPE3tYx6pzCWPV41ghyV8= +go.opentelemetry.io/collector v0.63.2-0.20221108014805-0b08d5316426/go.mod h1:+Zb70q0Rq17dA9FcHTiTjW6g96lvJ8kAZ0c+eWNkAv0= +go.opentelemetry.io/collector/pdata v0.63.2-0.20221108014805-0b08d5316426 h1:wKDpgP0Tx/gWI2SgDGAY1OTSeihhDivbbRqFR79IGTc= +go.opentelemetry.io/collector/pdata v0.63.2-0.20221108014805-0b08d5316426/go.mod h1:IzvXUGQml2mrnvdb8zIlEW3qQs9oFLdD2hLwJdZ+pek= 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/config.go b/pkg/stanza/adapter/config.go index 4c7b268a4725..b2ca644337e4 100644 --- a/pkg/stanza/adapter/config.go +++ b/pkg/stanza/adapter/config.go @@ -15,6 +15,7 @@ package adapter // import "github.com/open-telemetry/opentelemetry-collector-contrib/pkg/stanza/adapter" import ( + "go.opentelemetry.io/collector/component" "go.opentelemetry.io/collector/config" "github.com/open-telemetry/opentelemetry-collector-contrib/pkg/stanza/operator" @@ -23,6 +24,6 @@ import ( // BaseConfig is the common configuration of a stanza-based receiver type BaseConfig struct { config.ReceiverSettings `mapstructure:",squash"` - Operators []operator.Config `mapstructure:"operators"` - StorageID *config.ComponentID `mapstructure:"storage"` + Operators []operator.Config `mapstructure:"operators"` + StorageID *component.ID `mapstructure:"storage"` } diff --git a/pkg/stanza/adapter/factory.go b/pkg/stanza/adapter/factory.go index 292d25f0e1ce..6aeee1dccf35 100644 --- a/pkg/stanza/adapter/factory.go +++ b/pkg/stanza/adapter/factory.go @@ -18,7 +18,6 @@ import ( "context" "go.opentelemetry.io/collector/component" - "go.opentelemetry.io/collector/config" "go.opentelemetry.io/collector/consumer" "go.opentelemetry.io/collector/obsreport" @@ -28,10 +27,10 @@ import ( // LogReceiverType is the interface used by stanza-based log receivers type LogReceiverType interface { - Type() config.Type - CreateDefaultConfig() config.Receiver - BaseConfig(config.Receiver) BaseConfig - InputConfig(config.Receiver) operator.Config + Type() component.Type + CreateDefaultConfig() component.ReceiverConfig + BaseConfig(component.ReceiverConfig) BaseConfig + InputConfig(component.ReceiverConfig) operator.Config } // NewFactory creates a factory for a Stanza-based receiver @@ -47,7 +46,7 @@ func createLogsReceiver(logReceiverType LogReceiverType) component.CreateLogsRec return func( ctx context.Context, params component.ReceiverCreateSettings, - cfg config.Receiver, + cfg component.ReceiverConfig, nextConsumer consumer.Logs, ) (component.LogsReceiver, error) { inputCfg := logReceiverType.InputConfig(cfg) diff --git a/pkg/stanza/adapter/integration_test.go b/pkg/stanza/adapter/integration_test.go index 6f9ae22d3582..8a67e178da1d 100644 --- a/pkg/stanza/adapter/integration_test.go +++ b/pkg/stanza/adapter/integration_test.go @@ -20,8 +20,8 @@ import ( "time" "github.com/stretchr/testify/require" + "go.opentelemetry.io/collector/component" "go.opentelemetry.io/collector/component/componenttest" - "go.opentelemetry.io/collector/config" "go.opentelemetry.io/collector/consumer" "go.opentelemetry.io/collector/consumer/consumertest" "go.opentelemetry.io/collector/obsreport" @@ -46,9 +46,9 @@ func createNoopReceiver(nextConsumer consumer.Logs) (*receiver, error) { return nil, err } - receiverID, _ := config.NewComponentIDFromString("test") + receiverID := component.NewID("test") return &receiver{ - id: config.NewComponentID("testReceiver"), + id: component.NewID("testReceiver"), pipe: pipe, emitter: emitter, consumer: nextConsumer, diff --git a/pkg/stanza/adapter/mocks_test.go b/pkg/stanza/adapter/mocks_test.go index 03c3e29d5a9c..f4ce80683e6b 100644 --- a/pkg/stanza/adapter/mocks_test.go +++ b/pkg/stanza/adapter/mocks_test.go @@ -18,6 +18,7 @@ import ( "context" "errors" + "go.opentelemetry.io/collector/component" "go.opentelemetry.io/collector/config" "go.opentelemetry.io/collector/consumer/consumertest" "go.opentelemetry.io/collector/pdata/plog" @@ -86,24 +87,24 @@ type TestConfig struct { } type TestReceiverType struct{} -func (f TestReceiverType) Type() config.Type { +func (f TestReceiverType) Type() component.Type { return testType } -func (f TestReceiverType) CreateDefaultConfig() config.Receiver { +func (f TestReceiverType) CreateDefaultConfig() component.ReceiverConfig { return &TestConfig{ BaseConfig: BaseConfig{ - ReceiverSettings: config.NewReceiverSettings(config.NewComponentID(testType)), + ReceiverSettings: config.NewReceiverSettings(component.NewID(testType)), Operators: []operator.Config{}, }, Input: operator.NewConfig(noop.NewConfig()), } } -func (f TestReceiverType) BaseConfig(cfg config.Receiver) BaseConfig { +func (f TestReceiverType) BaseConfig(cfg component.ReceiverConfig) BaseConfig { return cfg.(*TestConfig).BaseConfig } -func (f TestReceiverType) InputConfig(cfg config.Receiver) operator.Config { +func (f TestReceiverType) InputConfig(cfg component.ReceiverConfig) operator.Config { return cfg.(*TestConfig).Input } diff --git a/pkg/stanza/adapter/receiver.go b/pkg/stanza/adapter/receiver.go index fef561394b15..e088be389609 100644 --- a/pkg/stanza/adapter/receiver.go +++ b/pkg/stanza/adapter/receiver.go @@ -20,7 +20,6 @@ import ( "sync" "go.opentelemetry.io/collector/component" - "go.opentelemetry.io/collector/config" "go.opentelemetry.io/collector/consumer" "go.opentelemetry.io/collector/extension/experimental/storage" "go.opentelemetry.io/collector/obsreport" @@ -31,7 +30,7 @@ import ( ) type receiver struct { - id config.ComponentID + id component.ID wg sync.WaitGroup cancel context.CancelFunc @@ -42,7 +41,7 @@ type receiver struct { logger *zap.Logger obsrecv *obsreport.Receiver - storageID *config.ComponentID + storageID *component.ID storageClient storage.Client } diff --git a/pkg/stanza/adapter/receiver_test.go b/pkg/stanza/adapter/receiver_test.go index d5c0eb314af8..7c32a4f1346c 100644 --- a/pkg/stanza/adapter/receiver_test.go +++ b/pkg/stanza/adapter/receiver_test.go @@ -25,7 +25,6 @@ import ( "github.com/stretchr/testify/require" "go.opentelemetry.io/collector/component" "go.opentelemetry.io/collector/component/componenttest" - "go.opentelemetry.io/collector/config" "go.opentelemetry.io/collector/consumer/consumertest" "go.uber.org/zap" "gopkg.in/yaml.v2" @@ -137,7 +136,7 @@ func BenchmarkReadLine(b *testing.B) { storageClient := storagetest.NewInMemoryClient( component.KindReceiver, - config.NewComponentID("foolog"), + component.NewID("foolog"), "test", ) @@ -202,7 +201,7 @@ func BenchmarkParseAndMap(b *testing.B) { storageClient := storagetest.NewInMemoryClient( component.KindReceiver, - config.NewComponentID("foolog"), + component.NewID("foolog"), "test", ) diff --git a/pkg/stanza/adapter/storage.go b/pkg/stanza/adapter/storage.go index 9ca978f082ef..6a58806400a6 100644 --- a/pkg/stanza/adapter/storage.go +++ b/pkg/stanza/adapter/storage.go @@ -19,11 +19,10 @@ import ( "fmt" "go.opentelemetry.io/collector/component" - "go.opentelemetry.io/collector/config" "go.opentelemetry.io/collector/extension/experimental/storage" ) -func GetStorageClient(ctx context.Context, host component.Host, storageID *config.ComponentID, componentID config.ComponentID) (storage.Client, error) { +func GetStorageClient(ctx context.Context, host component.Host, storageID *component.ID, componentID component.ID) (storage.Client, error) { if storageID == nil { return storage.NewNopClient(), nil } diff --git a/pkg/stanza/adapter/storage_test.go b/pkg/stanza/adapter/storage_test.go index 5832cb1b6dd1..914cde2abb89 100644 --- a/pkg/stanza/adapter/storage_test.go +++ b/pkg/stanza/adapter/storage_test.go @@ -21,7 +21,6 @@ import ( "github.com/stretchr/testify/require" "go.opentelemetry.io/collector/component" "go.opentelemetry.io/collector/component/componenttest" - "go.opentelemetry.io/collector/config" "go.opentelemetry.io/collector/consumer/consumertest" "github.com/open-telemetry/opentelemetry-collector-contrib/extension/storage/storagetest" @@ -95,7 +94,7 @@ func TestFindCorrectStorageExtension(t *testing.T) { } func TestFailOnMissingStorageExtension(t *testing.T) { - id := config.NewComponentIDWithName("test", "missing") + id := component.NewIDWithName("test", "missing") r := createReceiver(t, id) err := r.Start(context.Background(), storagetest.NewStorageHost()) require.Error(t, err) @@ -114,7 +113,7 @@ func TestFailOnNonStorageExtension(t *testing.T) { require.Equal(t, "storage client: non-storage extension 'non_storage/non' found", err.Error()) } -func createReceiver(t *testing.T, storageID config.ComponentID) *receiver { +func createReceiver(t *testing.T, storageID component.ID) *receiver { params := component.ReceiverCreateSettings{ TelemetrySettings: componenttest.NewNopTelemetrySettings(), } diff --git a/pkg/stanza/go.mod b/pkg/stanza/go.mod index df2688d0b6cb..85b890f26480 100644 --- a/pkg/stanza/go.mod +++ b/pkg/stanza/go.mod @@ -11,7 +11,7 @@ require ( github.com/observiq/ctimefmt v1.0.0 github.com/observiq/nanojack v0.0.0-20201106172433-343928847ebc github.com/stretchr/testify v1.8.1 - go.opentelemetry.io/collector v0.63.2-0.20221104003159-6b27644724d8 + go.opentelemetry.io/collector v0.63.2-0.20221108014805-0b08d5316426 go.uber.org/zap v1.23.0 golang.org/x/exp v0.0.0-20200331195152-e8c3332aa8e5 // indirect golang.org/x/sys v0.0.0-20220919091848-fb04ddd9f9c8 @@ -23,7 +23,7 @@ require ( require ( github.com/influxdata/go-syslog/v3 v3.0.1-0.20210608084020-ac565dc76ba6 github.com/open-telemetry/opentelemetry-collector-contrib/extension/storage v0.63.0 - go.opentelemetry.io/collector/pdata v0.63.2-0.20221104003159-6b27644724d8 + go.opentelemetry.io/collector/pdata v0.63.2-0.20221108014805-0b08d5316426 go.uber.org/atomic v1.10.0 go.uber.org/multierr v1.8.0 ) @@ -42,7 +42,7 @@ require ( github.com/pmezard/go-difflib v1.0.0 // indirect github.com/rogpeppe/go-internal v1.6.1 // indirect github.com/stretchr/objx v0.5.0 // indirect - go.opencensus.io v0.23.0 // indirect + go.opencensus.io v0.24.0 // 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 40c29dbdebb3..8ab3114c32a7 100644 --- a/pkg/stanza/go.sum +++ b/pkg/stanza/go.sum @@ -254,7 +254,7 @@ github.com/prometheus/client_golang v0.9.1/go.mod h1:7SWBe2y4D6OKWSNQJUaRYU/AaXP github.com/prometheus/client_golang v1.0.0/go.mod h1:db9x61etRT2tGnBNRi70OPL5FsnadC4Ky3P0J6CfImo= github.com/prometheus/client_golang v1.7.1/go.mod h1:PY5Wy2awLA44sXw4AOSfFBetzPP4j5+D6mVACh+pe2M= github.com/prometheus/client_golang v1.11.1/go.mod h1:Z6t4BnS23TR94PD6BsDNk8yVqroYurpAkEiz0P2BEV0= -github.com/prometheus/client_golang v1.13.0 h1:b71QUfeo5M8gq2+evJdTPfZhYMAU0uKPkyPJ7TPsloU= +github.com/prometheus/client_golang v1.13.1 h1:3gMjIY2+/hzmqhtUC/aQNYldJA6DtH3CgQvwS+02K1c= github.com/prometheus/client_model v0.0.0-20180712105110-5c3871d89910/go.mod h1:MbSGuTsp3dbXC40dX6PRTWyKYBIrTGTE9sqQNg2J8bo= github.com/prometheus/client_model v0.0.0-20190129233127-fd36f4220a90/go.mod h1:xMI15A0UPsDsEKsMN9yxemIoYk6Tm2C1GtYGdfGttqA= github.com/prometheus/client_model v0.0.0-20190812154241-14fe0d1b01d4/go.mod h1:xMI15A0UPsDsEKsMN9yxemIoYk6Tm2C1GtYGdfGttqA= @@ -309,12 +309,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.opencensus.io v0.23.0 h1:gqCw0LfLxScz8irSi8exQc7fyQ0fKQU/qnC/X8+V/1M= -go.opencensus.io v0.23.0/go.mod h1:XItmlyltB5F7CS4xOC1DcqMoFqwtC6OG2xF7mCv7P7E= -go.opentelemetry.io/collector v0.63.2-0.20221104003159-6b27644724d8 h1:rOT5HzXXfSISc6FiH012zH2/EFjp37UXfjEqj5BpkWQ= -go.opentelemetry.io/collector v0.63.2-0.20221104003159-6b27644724d8/go.mod h1:JVmeZXugK4ondC6KQgrHTHWiF4JttpG5k6dWPMt62+k= -go.opentelemetry.io/collector/pdata v0.63.2-0.20221104003159-6b27644724d8 h1:7xeTQjfsOm9eogQeIxjSEhlik9qsbBGsnmkQHfyKaRE= -go.opentelemetry.io/collector/pdata v0.63.2-0.20221104003159-6b27644724d8/go.mod h1:IzvXUGQml2mrnvdb8zIlEW3qQs9oFLdD2hLwJdZ+pek= +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.63.2-0.20221108014805-0b08d5316426 h1:z/wLTMh7/vNxcFUDa5uG7/IPE3tYx6pzCWPV41ghyV8= +go.opentelemetry.io/collector v0.63.2-0.20221108014805-0b08d5316426/go.mod h1:+Zb70q0Rq17dA9FcHTiTjW6g96lvJ8kAZ0c+eWNkAv0= +go.opentelemetry.io/collector/pdata v0.63.2-0.20221108014805-0b08d5316426 h1:wKDpgP0Tx/gWI2SgDGAY1OTSeihhDivbbRqFR79IGTc= +go.opentelemetry.io/collector/pdata v0.63.2-0.20221108014805-0b08d5316426/go.mod h1:IzvXUGQml2mrnvdb8zIlEW3qQs9oFLdD2hLwJdZ+pek= 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/stanza/operator/operatortest/confmap.go b/pkg/stanza/operator/operatortest/confmap.go index f9eb7071be5a..188108b9a06e 100644 --- a/pkg/stanza/operator/operatortest/confmap.go +++ b/pkg/stanza/operator/operatortest/confmap.go @@ -19,6 +19,7 @@ import ( "testing" "github.com/stretchr/testify/require" + "go.opentelemetry.io/collector/component" "go.opentelemetry.io/collector/config" "go.opentelemetry.io/collector/confmap" "go.opentelemetry.io/collector/confmap/confmaptest" @@ -52,7 +53,7 @@ func (c ConfigUnmarshalTests) Run(t *testing.T) { require.NotZero(t, len(testConfMap.AllKeys()), fmt.Sprintf("config not found: '%s'", tc.Name)) cfg := newAnyOpConfig(c.DefaultConfig) - err = config.UnmarshalReceiver(testConfMap, cfg) + err = component.UnmarshalReceiverConfig(testConfMap, cfg) if tc.ExpectErr { require.Error(t, err) @@ -71,7 +72,7 @@ type anyOpConfig struct { func newAnyOpConfig(opCfg operator.Builder) *anyOpConfig { return &anyOpConfig{ - ReceiverSettings: config.NewReceiverSettings(config.NewComponentID("any_op")), + ReceiverSettings: config.NewReceiverSettings(component.NewID("any_op")), Operator: operator.Config{Builder: opCfg}, } } diff --git a/pkg/translator/jaeger/go.mod b/pkg/translator/jaeger/go.mod index d882b403dc94..bd1495b2958e 100644 --- a/pkg/translator/jaeger/go.mod +++ b/pkg/translator/jaeger/go.mod @@ -6,8 +6,8 @@ require ( github.com/jaegertracing/jaeger v1.39.0 github.com/open-telemetry/opentelemetry-collector-contrib/internal/coreinternal v0.63.0 github.com/stretchr/testify v1.8.1 - go.opentelemetry.io/collector/pdata v0.63.2-0.20221104003159-6b27644724d8 - go.opentelemetry.io/collector/semconv v0.63.2-0.20221104003159-6b27644724d8 + go.opentelemetry.io/collector/pdata v0.63.2-0.20221108014805-0b08d5316426 + go.opentelemetry.io/collector/semconv v0.63.2-0.20221108014805-0b08d5316426 ) require ( diff --git a/pkg/translator/jaeger/go.sum b/pkg/translator/jaeger/go.sum index ee92610aab6c..b656ac17b322 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.63.2-0.20221104003159-6b27644724d8 h1:7xeTQjfsOm9eogQeIxjSEhlik9qsbBGsnmkQHfyKaRE= -go.opentelemetry.io/collector/pdata v0.63.2-0.20221104003159-6b27644724d8/go.mod h1:IzvXUGQml2mrnvdb8zIlEW3qQs9oFLdD2hLwJdZ+pek= -go.opentelemetry.io/collector/semconv v0.63.2-0.20221104003159-6b27644724d8 h1:jm0sNPyqo6S165QjQYMBHB2nK50wlJbMYM03Yr3Eo2k= -go.opentelemetry.io/collector/semconv v0.63.2-0.20221104003159-6b27644724d8/go.mod h1:5o9yhOa+ABt7g2E5JABDxGZ1PQPbtfxrKNbYn+LOTXU= +go.opentelemetry.io/collector/pdata v0.63.2-0.20221108014805-0b08d5316426 h1:wKDpgP0Tx/gWI2SgDGAY1OTSeihhDivbbRqFR79IGTc= +go.opentelemetry.io/collector/pdata v0.63.2-0.20221108014805-0b08d5316426/go.mod h1:IzvXUGQml2mrnvdb8zIlEW3qQs9oFLdD2hLwJdZ+pek= +go.opentelemetry.io/collector/semconv v0.63.2-0.20221108014805-0b08d5316426 h1:pqIl7OC531J6i9ttBCj3zLmZI/BSF4q323YpK0GgKGk= +go.opentelemetry.io/collector/semconv v0.63.2-0.20221108014805-0b08d5316426/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 b13f25e861f8..b247b9011085 100644 --- a/pkg/translator/loki/go.mod +++ b/pkg/translator/loki/go.mod @@ -7,7 +7,7 @@ require ( github.com/grafana/loki v1.6.2-0.20220718071907-6bd05c9a4399 github.com/prometheus/common v0.37.0 github.com/stretchr/testify v1.8.1 - go.opentelemetry.io/collector/pdata v0.63.2-0.20221104003159-6b27644724d8 + go.opentelemetry.io/collector/pdata v0.63.2-0.20221108014805-0b08d5316426 ) require ( diff --git a/pkg/translator/loki/go.sum b/pkg/translator/loki/go.sum index 288ea3ea32bd..bd610e86a578 100644 --- a/pkg/translator/loki/go.sum +++ b/pkg/translator/loki/go.sum @@ -437,8 +437,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.63.2-0.20221104003159-6b27644724d8 h1:7xeTQjfsOm9eogQeIxjSEhlik9qsbBGsnmkQHfyKaRE= -go.opentelemetry.io/collector/pdata v0.63.2-0.20221104003159-6b27644724d8/go.mod h1:IzvXUGQml2mrnvdb8zIlEW3qQs9oFLdD2hLwJdZ+pek= +go.opentelemetry.io/collector/pdata v0.63.2-0.20221108014805-0b08d5316426 h1:wKDpgP0Tx/gWI2SgDGAY1OTSeihhDivbbRqFR79IGTc= +go.opentelemetry.io/collector/pdata v0.63.2-0.20221108014805-0b08d5316426/go.mod h1:IzvXUGQml2mrnvdb8zIlEW3qQs9oFLdD2hLwJdZ+pek= 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 96c9f3789987..c1e6fc8802a0 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.63.0 github.com/stretchr/testify v1.8.1 go.opencensus.io v0.23.0 - go.opentelemetry.io/collector/pdata v0.63.2-0.20221104003159-6b27644724d8 - go.opentelemetry.io/collector/semconv v0.63.2-0.20221104003159-6b27644724d8 + go.opentelemetry.io/collector/pdata v0.63.2-0.20221108014805-0b08d5316426 + go.opentelemetry.io/collector/semconv v0.63.2-0.20221108014805-0b08d5316426 google.golang.org/protobuf v1.28.1 ) diff --git a/pkg/translator/opencensus/go.sum b/pkg/translator/opencensus/go.sum index bcb48bd0dadb..b1f2f22b465d 100644 --- a/pkg/translator/opencensus/go.sum +++ b/pkg/translator/opencensus/go.sum @@ -74,10 +74,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.23.0 h1:gqCw0LfLxScz8irSi8exQc7fyQ0fKQU/qnC/X8+V/1M= go.opencensus.io v0.23.0/go.mod h1:XItmlyltB5F7CS4xOC1DcqMoFqwtC6OG2xF7mCv7P7E= -go.opentelemetry.io/collector/pdata v0.63.2-0.20221104003159-6b27644724d8 h1:7xeTQjfsOm9eogQeIxjSEhlik9qsbBGsnmkQHfyKaRE= -go.opentelemetry.io/collector/pdata v0.63.2-0.20221104003159-6b27644724d8/go.mod h1:IzvXUGQml2mrnvdb8zIlEW3qQs9oFLdD2hLwJdZ+pek= -go.opentelemetry.io/collector/semconv v0.63.2-0.20221104003159-6b27644724d8 h1:jm0sNPyqo6S165QjQYMBHB2nK50wlJbMYM03Yr3Eo2k= -go.opentelemetry.io/collector/semconv v0.63.2-0.20221104003159-6b27644724d8/go.mod h1:5o9yhOa+ABt7g2E5JABDxGZ1PQPbtfxrKNbYn+LOTXU= +go.opentelemetry.io/collector/pdata v0.63.2-0.20221108014805-0b08d5316426 h1:wKDpgP0Tx/gWI2SgDGAY1OTSeihhDivbbRqFR79IGTc= +go.opentelemetry.io/collector/pdata v0.63.2-0.20221108014805-0b08d5316426/go.mod h1:IzvXUGQml2mrnvdb8zIlEW3qQs9oFLdD2hLwJdZ+pek= +go.opentelemetry.io/collector/semconv v0.63.2-0.20221108014805-0b08d5316426 h1:pqIl7OC531J6i9ttBCj3zLmZI/BSF4q323YpK0GgKGk= +go.opentelemetry.io/collector/semconv v0.63.2-0.20221108014805-0b08d5316426/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 eae0f02385bd..6e70d9358259 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.63.0 github.com/stretchr/testify v1.8.1 - go.opentelemetry.io/collector v0.63.2-0.20221104003159-6b27644724d8 - go.opentelemetry.io/collector/pdata v0.63.2-0.20221104003159-6b27644724d8 + go.opentelemetry.io/collector v0.63.2-0.20221108014805-0b08d5316426 + go.opentelemetry.io/collector/pdata v0.63.2-0.20221108014805-0b08d5316426 ) require ( diff --git a/pkg/translator/prometheus/go.sum b/pkg/translator/prometheus/go.sum index 20325b39f001..ffe7c431b2d7 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.63.2-0.20221104003159-6b27644724d8 h1:rOT5HzXXfSISc6FiH012zH2/EFjp37UXfjEqj5BpkWQ= -go.opentelemetry.io/collector v0.63.2-0.20221104003159-6b27644724d8/go.mod h1:JVmeZXugK4ondC6KQgrHTHWiF4JttpG5k6dWPMt62+k= -go.opentelemetry.io/collector/pdata v0.63.2-0.20221104003159-6b27644724d8 h1:7xeTQjfsOm9eogQeIxjSEhlik9qsbBGsnmkQHfyKaRE= -go.opentelemetry.io/collector/pdata v0.63.2-0.20221104003159-6b27644724d8/go.mod h1:IzvXUGQml2mrnvdb8zIlEW3qQs9oFLdD2hLwJdZ+pek= +go.opentelemetry.io/collector v0.63.2-0.20221108014805-0b08d5316426 h1:z/wLTMh7/vNxcFUDa5uG7/IPE3tYx6pzCWPV41ghyV8= +go.opentelemetry.io/collector v0.63.2-0.20221108014805-0b08d5316426/go.mod h1:+Zb70q0Rq17dA9FcHTiTjW6g96lvJ8kAZ0c+eWNkAv0= +go.opentelemetry.io/collector/pdata v0.63.2-0.20221108014805-0b08d5316426 h1:wKDpgP0Tx/gWI2SgDGAY1OTSeihhDivbbRqFR79IGTc= +go.opentelemetry.io/collector/pdata v0.63.2-0.20221108014805-0b08d5316426/go.mod h1:IzvXUGQml2mrnvdb8zIlEW3qQs9oFLdD2hLwJdZ+pek= 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 528fceda9620..e123911e0864 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.63.2-0.20221104003159-6b27644724d8 - go.opentelemetry.io/collector/pdata v0.63.2-0.20221104003159-6b27644724d8 - go.opentelemetry.io/collector/semconv v0.63.2-0.20221104003159-6b27644724d8 + go.opentelemetry.io/collector v0.63.2-0.20221108014805-0b08d5316426 + go.opentelemetry.io/collector/pdata v0.63.2-0.20221108014805-0b08d5316426 + go.opentelemetry.io/collector/semconv v0.63.2-0.20221108014805-0b08d5316426 go.uber.org/multierr v1.8.0 ) diff --git a/pkg/translator/prometheusremotewrite/go.sum b/pkg/translator/prometheusremotewrite/go.sum index e2fb3bdb8227..b5f0077155b6 100644 --- a/pkg/translator/prometheusremotewrite/go.sum +++ b/pkg/translator/prometheusremotewrite/go.sum @@ -211,12 +211,12 @@ 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.63.2-0.20221104003159-6b27644724d8 h1:rOT5HzXXfSISc6FiH012zH2/EFjp37UXfjEqj5BpkWQ= -go.opentelemetry.io/collector v0.63.2-0.20221104003159-6b27644724d8/go.mod h1:JVmeZXugK4ondC6KQgrHTHWiF4JttpG5k6dWPMt62+k= -go.opentelemetry.io/collector/pdata v0.63.2-0.20221104003159-6b27644724d8 h1:7xeTQjfsOm9eogQeIxjSEhlik9qsbBGsnmkQHfyKaRE= -go.opentelemetry.io/collector/pdata v0.63.2-0.20221104003159-6b27644724d8/go.mod h1:IzvXUGQml2mrnvdb8zIlEW3qQs9oFLdD2hLwJdZ+pek= -go.opentelemetry.io/collector/semconv v0.63.2-0.20221104003159-6b27644724d8 h1:jm0sNPyqo6S165QjQYMBHB2nK50wlJbMYM03Yr3Eo2k= -go.opentelemetry.io/collector/semconv v0.63.2-0.20221104003159-6b27644724d8/go.mod h1:5o9yhOa+ABt7g2E5JABDxGZ1PQPbtfxrKNbYn+LOTXU= +go.opentelemetry.io/collector v0.63.2-0.20221108014805-0b08d5316426 h1:z/wLTMh7/vNxcFUDa5uG7/IPE3tYx6pzCWPV41ghyV8= +go.opentelemetry.io/collector v0.63.2-0.20221108014805-0b08d5316426/go.mod h1:+Zb70q0Rq17dA9FcHTiTjW6g96lvJ8kAZ0c+eWNkAv0= +go.opentelemetry.io/collector/pdata v0.63.2-0.20221108014805-0b08d5316426 h1:wKDpgP0Tx/gWI2SgDGAY1OTSeihhDivbbRqFR79IGTc= +go.opentelemetry.io/collector/pdata v0.63.2-0.20221108014805-0b08d5316426/go.mod h1:IzvXUGQml2mrnvdb8zIlEW3qQs9oFLdD2hLwJdZ+pek= +go.opentelemetry.io/collector/semconv v0.63.2-0.20221108014805-0b08d5316426 h1:pqIl7OC531J6i9ttBCj3zLmZI/BSF4q323YpK0GgKGk= +go.opentelemetry.io/collector/semconv v0.63.2-0.20221108014805-0b08d5316426/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 938732408535..7af0fa2f627a 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.63.0 github.com/signalfx/com_signalfx_metrics_protobuf v0.0.3 github.com/stretchr/testify v1.8.1 - go.opentelemetry.io/collector/pdata v0.63.2-0.20221104003159-6b27644724d8 + go.opentelemetry.io/collector/pdata v0.63.2-0.20221108014805-0b08d5316426 go.uber.org/multierr v1.8.0 ) diff --git a/pkg/translator/signalfx/go.sum b/pkg/translator/signalfx/go.sum index 8b9ad3743ce8..b2302fcb5d4d 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.63.2-0.20221104003159-6b27644724d8 h1:7xeTQjfsOm9eogQeIxjSEhlik9qsbBGsnmkQHfyKaRE= -go.opentelemetry.io/collector/pdata v0.63.2-0.20221104003159-6b27644724d8/go.mod h1:IzvXUGQml2mrnvdb8zIlEW3qQs9oFLdD2hLwJdZ+pek= +go.opentelemetry.io/collector/pdata v0.63.2-0.20221108014805-0b08d5316426 h1:wKDpgP0Tx/gWI2SgDGAY1OTSeihhDivbbRqFR79IGTc= +go.opentelemetry.io/collector/pdata v0.63.2-0.20221108014805-0b08d5316426/go.mod h1:IzvXUGQml2mrnvdb8zIlEW3qQs9oFLdD2hLwJdZ+pek= 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 15694e6b2852..20f06bf3b8da 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.63.0 github.com/openzipkin/zipkin-go v0.4.1 github.com/stretchr/testify v1.8.1 - go.opentelemetry.io/collector/pdata v0.63.2-0.20221104003159-6b27644724d8 - go.opentelemetry.io/collector/semconv v0.63.2-0.20221104003159-6b27644724d8 + go.opentelemetry.io/collector/pdata v0.63.2-0.20221108014805-0b08d5316426 + go.opentelemetry.io/collector/semconv v0.63.2-0.20221108014805-0b08d5316426 ) require ( diff --git a/pkg/translator/zipkin/go.sum b/pkg/translator/zipkin/go.sum index 386f471e05b7..585da106296a 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.63.2-0.20221104003159-6b27644724d8 h1:7xeTQjfsOm9eogQeIxjSEhlik9qsbBGsnmkQHfyKaRE= -go.opentelemetry.io/collector/pdata v0.63.2-0.20221104003159-6b27644724d8/go.mod h1:IzvXUGQml2mrnvdb8zIlEW3qQs9oFLdD2hLwJdZ+pek= -go.opentelemetry.io/collector/semconv v0.63.2-0.20221104003159-6b27644724d8 h1:jm0sNPyqo6S165QjQYMBHB2nK50wlJbMYM03Yr3Eo2k= -go.opentelemetry.io/collector/semconv v0.63.2-0.20221104003159-6b27644724d8/go.mod h1:5o9yhOa+ABt7g2E5JABDxGZ1PQPbtfxrKNbYn+LOTXU= +go.opentelemetry.io/collector/pdata v0.63.2-0.20221108014805-0b08d5316426 h1:wKDpgP0Tx/gWI2SgDGAY1OTSeihhDivbbRqFR79IGTc= +go.opentelemetry.io/collector/pdata v0.63.2-0.20221108014805-0b08d5316426/go.mod h1:IzvXUGQml2mrnvdb8zIlEW3qQs9oFLdD2hLwJdZ+pek= +go.opentelemetry.io/collector/semconv v0.63.2-0.20221108014805-0b08d5316426 h1:pqIl7OC531J6i9ttBCj3zLmZI/BSF4q323YpK0GgKGk= +go.opentelemetry.io/collector/semconv v0.63.2-0.20221108014805-0b08d5316426/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.go b/processor/attributesprocessor/config.go index 012a6702ed0e..147b5bd97789 100644 --- a/processor/attributesprocessor/config.go +++ b/processor/attributesprocessor/config.go @@ -15,6 +15,7 @@ package attributesprocessor // import "github.com/open-telemetry/opentelemetry-collector-contrib/processor/attributesprocessor" import ( + "go.opentelemetry.io/collector/component" "go.opentelemetry.io/collector/config" "github.com/open-telemetry/opentelemetry-collector-contrib/internal/coreinternal/attraction" @@ -39,7 +40,7 @@ type Config struct { attraction.Settings `mapstructure:",squash"` } -var _ config.Processor = (*Config)(nil) +var _ component.ProcessorConfig = (*Config)(nil) // Validate checks if the processor configuration is valid func (cfg *Config) Validate() error { diff --git a/processor/attributesprocessor/config_test.go b/processor/attributesprocessor/config_test.go index a95291fe630e..64610423d4e0 100644 --- a/processor/attributesprocessor/config_test.go +++ b/processor/attributesprocessor/config_test.go @@ -20,6 +20,7 @@ import ( "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" + "go.opentelemetry.io/collector/component" "go.opentelemetry.io/collector/config" "go.opentelemetry.io/collector/confmap/confmaptest" @@ -32,13 +33,13 @@ func TestLoadConfig(t *testing.T) { t.Parallel() tests := []struct { - id config.ComponentID - expected config.Processor + id component.ID + expected component.ProcessorConfig }{ { - id: config.NewComponentIDWithName(typeStr, "insert"), + id: component.NewIDWithName(typeStr, "insert"), expected: &Config{ - ProcessorSettings: config.NewProcessorSettings(config.NewComponentID(typeStr)), + ProcessorSettings: config.NewProcessorSettings(component.NewID(typeStr)), Settings: attraction.Settings{ Actions: []attraction.ActionKeyValue{ {Key: "attribute1", Value: 123, Action: attraction.INSERT}, @@ -48,9 +49,9 @@ func TestLoadConfig(t *testing.T) { }, }, { - id: config.NewComponentIDWithName(typeStr, "update"), + id: component.NewIDWithName(typeStr, "update"), expected: &Config{ - ProcessorSettings: config.NewProcessorSettings(config.NewComponentID(typeStr)), + ProcessorSettings: config.NewProcessorSettings(component.NewID(typeStr)), Settings: attraction.Settings{ Actions: []attraction.ActionKeyValue{ {Key: "boo", FromAttribute: "foo", Action: attraction.UPDATE}, @@ -60,9 +61,9 @@ func TestLoadConfig(t *testing.T) { }, }, { - id: config.NewComponentIDWithName(typeStr, "upsert"), + id: component.NewIDWithName(typeStr, "upsert"), expected: &Config{ - ProcessorSettings: config.NewProcessorSettings(config.NewComponentID(typeStr)), + ProcessorSettings: config.NewProcessorSettings(component.NewID(typeStr)), Settings: attraction.Settings{ Actions: []attraction.ActionKeyValue{ {Key: "region", Value: "planet-earth", Action: attraction.UPSERT}, @@ -72,9 +73,9 @@ func TestLoadConfig(t *testing.T) { }, }, { - id: config.NewComponentIDWithName(typeStr, "delete"), + id: component.NewIDWithName(typeStr, "delete"), expected: &Config{ - ProcessorSettings: config.NewProcessorSettings(config.NewComponentID(typeStr)), + ProcessorSettings: config.NewProcessorSettings(component.NewID(typeStr)), Settings: attraction.Settings{ Actions: []attraction.ActionKeyValue{ {Key: "credit_card", Action: attraction.DELETE}, @@ -84,9 +85,9 @@ func TestLoadConfig(t *testing.T) { }, }, { - id: config.NewComponentIDWithName(typeStr, "hash"), + id: component.NewIDWithName(typeStr, "hash"), expected: &Config{ - ProcessorSettings: config.NewProcessorSettings(config.NewComponentID(typeStr)), + ProcessorSettings: config.NewProcessorSettings(component.NewID(typeStr)), Settings: attraction.Settings{ Actions: []attraction.ActionKeyValue{ {Key: "user.email", Action: attraction.HASH}, @@ -95,9 +96,9 @@ func TestLoadConfig(t *testing.T) { }, }, { - id: config.NewComponentIDWithName(typeStr, "excludemulti"), + id: component.NewIDWithName(typeStr, "excludemulti"), expected: &Config{ - ProcessorSettings: config.NewProcessorSettings(config.NewComponentID(typeStr)), + ProcessorSettings: config.NewProcessorSettings(component.NewID(typeStr)), MatchConfig: filterconfig.MatchConfig{ Exclude: &filterconfig.MatchProperties{ Config: *createConfig(filterset.Strict), @@ -117,9 +118,9 @@ func TestLoadConfig(t *testing.T) { }, }, { - id: config.NewComponentIDWithName(typeStr, "includeservices"), + id: component.NewIDWithName(typeStr, "includeservices"), expected: &Config{ - ProcessorSettings: config.NewProcessorSettings(config.NewComponentID(typeStr)), + ProcessorSettings: config.NewProcessorSettings(component.NewID(typeStr)), MatchConfig: filterconfig.MatchConfig{ Include: &filterconfig.MatchProperties{ Config: *createConfig(filterset.Regexp), @@ -135,9 +136,9 @@ func TestLoadConfig(t *testing.T) { }, }, { - id: config.NewComponentIDWithName(typeStr, "selectiveprocessing"), + id: component.NewIDWithName(typeStr, "selectiveprocessing"), expected: &Config{ - ProcessorSettings: config.NewProcessorSettings(config.NewComponentID(typeStr)), + ProcessorSettings: config.NewProcessorSettings(component.NewID(typeStr)), MatchConfig: filterconfig.MatchConfig{ Include: &filterconfig.MatchProperties{ Config: *createConfig(filterset.Strict), @@ -159,9 +160,9 @@ func TestLoadConfig(t *testing.T) { }, }, { - id: config.NewComponentIDWithName(typeStr, "complex"), + id: component.NewIDWithName(typeStr, "complex"), expected: &Config{ - ProcessorSettings: config.NewProcessorSettings(config.NewComponentID(typeStr)), + ProcessorSettings: config.NewProcessorSettings(component.NewID(typeStr)), Settings: attraction.Settings{ Actions: []attraction.ActionKeyValue{ {Key: "operation", Value: "default", Action: attraction.INSERT}, @@ -172,9 +173,9 @@ func TestLoadConfig(t *testing.T) { }, }, { - id: config.NewComponentIDWithName(typeStr, "example"), + id: component.NewIDWithName(typeStr, "example"), expected: &Config{ - ProcessorSettings: config.NewProcessorSettings(config.NewComponentID(typeStr)), + ProcessorSettings: config.NewProcessorSettings(component.NewID(typeStr)), Settings: attraction.Settings{ Actions: []attraction.ActionKeyValue{ {Key: "db.table", Action: attraction.DELETE}, @@ -187,9 +188,9 @@ func TestLoadConfig(t *testing.T) { }, }, { - id: config.NewComponentIDWithName(typeStr, "regexp"), + id: component.NewIDWithName(typeStr, "regexp"), expected: &Config{ - ProcessorSettings: config.NewProcessorSettings(config.NewComponentID(typeStr)), + ProcessorSettings: config.NewProcessorSettings(component.NewID(typeStr)), MatchConfig: filterconfig.MatchConfig{ Include: &filterconfig.MatchProperties{ Config: *createConfig(filterset.Regexp), @@ -209,9 +210,9 @@ func TestLoadConfig(t *testing.T) { }, }, { - id: config.NewComponentIDWithName(typeStr, "convert"), + id: component.NewIDWithName(typeStr, "convert"), expected: &Config{ - ProcessorSettings: config.NewProcessorSettings(config.NewComponentID(typeStr)), + ProcessorSettings: config.NewProcessorSettings(component.NewID(typeStr)), Settings: attraction.Settings{ Actions: []attraction.ActionKeyValue{ {Key: "http.status_code", Action: attraction.CONVERT, ConvertedType: "int"}, @@ -231,7 +232,7 @@ func TestLoadConfig(t *testing.T) { sub, err := cm.Sub(tt.id.String()) require.NoError(t, err) - require.NoError(t, config.UnmarshalProcessor(sub, cfg)) + require.NoError(t, component.UnmarshalProcessorConfig(sub, cfg)) assert.NoError(t, cfg.Validate()) assert.Equal(t, tt.expected, cfg) diff --git a/processor/attributesprocessor/factory.go b/processor/attributesprocessor/factory.go index 9fe70c7cf5ba..68415e2a2d6b 100644 --- a/processor/attributesprocessor/factory.go +++ b/processor/attributesprocessor/factory.go @@ -49,16 +49,16 @@ func NewFactory() component.ProcessorFactory { } // Note: This isn't a valid configuration because the processor would do no work. -func createDefaultConfig() config.Processor { +func createDefaultConfig() component.ProcessorConfig { return &Config{ - ProcessorSettings: config.NewProcessorSettings(config.NewComponentID(typeStr)), + ProcessorSettings: config.NewProcessorSettings(component.NewID(typeStr)), } } func createTracesProcessor( ctx context.Context, set component.ProcessorCreateSettings, - cfg config.Processor, + cfg component.ProcessorConfig, nextConsumer consumer.Traces, ) (component.TracesProcessor, error) { oCfg := cfg.(*Config) @@ -90,7 +90,7 @@ func createTracesProcessor( func createLogsProcessor( ctx context.Context, set component.ProcessorCreateSettings, - cfg config.Processor, + cfg component.ProcessorConfig, nextConsumer consumer.Logs, ) (component.LogsProcessor, error) { oCfg := cfg.(*Config) @@ -123,7 +123,7 @@ func createLogsProcessor( func createMetricsProcessor( ctx context.Context, set component.ProcessorCreateSettings, - cfg config.Processor, + cfg component.ProcessorConfig, nextConsumer consumer.Metrics, ) (component.MetricsProcessor, error) { diff --git a/processor/attributesprocessor/factory_test.go b/processor/attributesprocessor/factory_test.go index aed3e128172c..267e6498e8e5 100644 --- a/processor/attributesprocessor/factory_test.go +++ b/processor/attributesprocessor/factory_test.go @@ -20,9 +20,9 @@ import ( "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" + "go.opentelemetry.io/collector/component" "go.opentelemetry.io/collector/component/componenttest" "go.opentelemetry.io/collector/config" - "go.opentelemetry.io/collector/config/configtest" "go.opentelemetry.io/collector/consumer/consumertest" "github.com/open-telemetry/opentelemetry-collector-contrib/internal/coreinternal/attraction" @@ -30,16 +30,16 @@ import ( func TestFactory_Type(t *testing.T) { factory := NewFactory() - assert.Equal(t, factory.Type(), config.Type(typeStr)) + assert.Equal(t, factory.Type(), component.Type(typeStr)) } func TestFactory_CreateDefaultConfig(t *testing.T) { factory := NewFactory() cfg := factory.CreateDefaultConfig() assert.Equal(t, cfg, &Config{ - ProcessorSettings: config.NewProcessorSettings(config.NewComponentID(typeStr)), + ProcessorSettings: config.NewProcessorSettings(component.NewID(typeStr)), }) - assert.NoError(t, configtest.CheckConfigStruct(cfg)) + assert.NoError(t, componenttest.CheckConfigStruct(cfg)) } func TestFactoryCreateTracesProcessor_EmptyActions(t *testing.T) { diff --git a/processor/attributesprocessor/go.mod b/processor/attributesprocessor/go.mod index cf6f589f984a..791941168190 100644 --- a/processor/attributesprocessor/go.mod +++ b/processor/attributesprocessor/go.mod @@ -5,9 +5,9 @@ go 1.18 require ( github.com/open-telemetry/opentelemetry-collector-contrib/internal/coreinternal v0.63.0 github.com/stretchr/testify v1.8.1 - go.opentelemetry.io/collector v0.63.2-0.20221104003159-6b27644724d8 - go.opentelemetry.io/collector/pdata v0.63.2-0.20221104003159-6b27644724d8 - go.opentelemetry.io/collector/semconv v0.63.2-0.20221104003159-6b27644724d8 + go.opentelemetry.io/collector v0.63.2-0.20221108014805-0b08d5316426 + go.opentelemetry.io/collector/pdata v0.63.2-0.20221108014805-0b08d5316426 + go.opentelemetry.io/collector/semconv v0.63.2-0.20221108014805-0b08d5316426 go.uber.org/zap v1.23.0 ) @@ -26,7 +26,7 @@ require ( github.com/modern-go/reflect2 v1.0.2 // indirect github.com/pmezard/go-difflib v1.0.0 // indirect github.com/spf13/cast v1.5.0 // indirect - go.opencensus.io v0.23.0 // indirect + go.opencensus.io v0.24.0 // 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 fb4671f6d094..174734f9bede 100644 --- a/processor/attributesprocessor/go.sum +++ b/processor/attributesprocessor/go.sum @@ -263,7 +263,6 @@ github.com/stretchr/testify v1.2.2/go.mod h1:a8OnRcib4nhh0OaRAV+Yts87kKdq0PP7pXf github.com/stretchr/testify v1.3.0/go.mod h1:M5WIy9Dh21IEIfnGCwXGc5bZfKNJtfHm1UVUgZn+9EI= github.com/stretchr/testify v1.4.0/go.mod h1:j7eGeouHqKxXV5pUuKE4zz7dFj8WfuZ+81PSLYec5m4= github.com/stretchr/testify v1.5.1/go.mod h1:5W2xD1RspED5o8YsWQXVCued0rvSQ+mT+I5cxcmMvtA= -github.com/stretchr/testify v1.6.1/go.mod h1:6Fq8oRcR53rry900zMqJjRRixrwX3KX962/h/Wwjteg= github.com/stretchr/testify v1.7.0/go.mod h1:6Fq8oRcR53rry900zMqJjRRixrwX3KX962/h/Wwjteg= github.com/stretchr/testify v1.7.1/go.mod h1:6Fq8oRcR53rry900zMqJjRRixrwX3KX962/h/Wwjteg= github.com/stretchr/testify v1.8.0/go.mod h1:yNjHg4UonilssWZ8iaSj1OCr/vHnekPRkoO+kdMU+MU= @@ -275,14 +274,14 @@ 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.opencensus.io v0.23.0 h1:gqCw0LfLxScz8irSi8exQc7fyQ0fKQU/qnC/X8+V/1M= -go.opencensus.io v0.23.0/go.mod h1:XItmlyltB5F7CS4xOC1DcqMoFqwtC6OG2xF7mCv7P7E= -go.opentelemetry.io/collector v0.63.2-0.20221104003159-6b27644724d8 h1:rOT5HzXXfSISc6FiH012zH2/EFjp37UXfjEqj5BpkWQ= -go.opentelemetry.io/collector v0.63.2-0.20221104003159-6b27644724d8/go.mod h1:JVmeZXugK4ondC6KQgrHTHWiF4JttpG5k6dWPMt62+k= -go.opentelemetry.io/collector/pdata v0.63.2-0.20221104003159-6b27644724d8 h1:7xeTQjfsOm9eogQeIxjSEhlik9qsbBGsnmkQHfyKaRE= -go.opentelemetry.io/collector/pdata v0.63.2-0.20221104003159-6b27644724d8/go.mod h1:IzvXUGQml2mrnvdb8zIlEW3qQs9oFLdD2hLwJdZ+pek= -go.opentelemetry.io/collector/semconv v0.63.2-0.20221104003159-6b27644724d8 h1:jm0sNPyqo6S165QjQYMBHB2nK50wlJbMYM03Yr3Eo2k= -go.opentelemetry.io/collector/semconv v0.63.2-0.20221104003159-6b27644724d8/go.mod h1:5o9yhOa+ABt7g2E5JABDxGZ1PQPbtfxrKNbYn+LOTXU= +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.63.2-0.20221108014805-0b08d5316426 h1:z/wLTMh7/vNxcFUDa5uG7/IPE3tYx6pzCWPV41ghyV8= +go.opentelemetry.io/collector v0.63.2-0.20221108014805-0b08d5316426/go.mod h1:+Zb70q0Rq17dA9FcHTiTjW6g96lvJ8kAZ0c+eWNkAv0= +go.opentelemetry.io/collector/pdata v0.63.2-0.20221108014805-0b08d5316426 h1:wKDpgP0Tx/gWI2SgDGAY1OTSeihhDivbbRqFR79IGTc= +go.opentelemetry.io/collector/pdata v0.63.2-0.20221108014805-0b08d5316426/go.mod h1:IzvXUGQml2mrnvdb8zIlEW3qQs9oFLdD2hLwJdZ+pek= +go.opentelemetry.io/collector/semconv v0.63.2-0.20221108014805-0b08d5316426 h1:pqIl7OC531J6i9ttBCj3zLmZI/BSF4q323YpK0GgKGk= +go.opentelemetry.io/collector/semconv v0.63.2-0.20221108014805-0b08d5316426/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.go b/processor/cumulativetodeltaprocessor/config.go index 9e767460f934..44f804a228be 100644 --- a/processor/cumulativetodeltaprocessor/config.go +++ b/processor/cumulativetodeltaprocessor/config.go @@ -18,6 +18,7 @@ import ( "fmt" "time" + "go.opentelemetry.io/collector/component" "go.opentelemetry.io/collector/config" "github.com/open-telemetry/opentelemetry-collector-contrib/internal/coreinternal/processor/filterset" @@ -44,7 +45,7 @@ type MatchMetrics struct { Metrics []string `mapstructure:"metrics"` } -var _ config.Processor = (*Config)(nil) +var _ component.ProcessorConfig = (*Config)(nil) // Validate checks whether the input configuration has all of the required fields for the processor. // An error is returned if there are any invalid inputs. diff --git a/processor/cumulativetodeltaprocessor/config_test.go b/processor/cumulativetodeltaprocessor/config_test.go index 76d90d6830cf..12621d98ca26 100644 --- a/processor/cumulativetodeltaprocessor/config_test.go +++ b/processor/cumulativetodeltaprocessor/config_test.go @@ -21,6 +21,7 @@ import ( "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" + "go.opentelemetry.io/collector/component" "go.opentelemetry.io/collector/config" "go.opentelemetry.io/collector/confmap/confmaptest" @@ -31,14 +32,14 @@ func TestLoadConfig(t *testing.T) { t.Parallel() tests := []struct { - id config.ComponentID - expected config.Processor + id component.ID + expected component.ProcessorConfig errorMessage string }{ { - id: config.NewComponentIDWithName(typeStr, ""), + id: component.NewIDWithName(typeStr, ""), expected: &Config{ - ProcessorSettings: config.NewProcessorSettings(config.NewComponentID(typeStr)), + ProcessorSettings: config.NewProcessorSettings(component.NewID(typeStr)), Include: MatchMetrics{ Metrics: []string{ "metric1", @@ -63,13 +64,13 @@ func TestLoadConfig(t *testing.T) { }, }, { - id: config.NewComponentIDWithName(typeStr, "empty"), + id: component.NewIDWithName(typeStr, "empty"), expected: createDefaultConfig(), }, { - id: config.NewComponentIDWithName(typeStr, "regexp"), + id: component.NewIDWithName(typeStr, "regexp"), expected: &Config{ - ProcessorSettings: config.NewProcessorSettings(config.NewComponentID(typeStr)), + ProcessorSettings: config.NewProcessorSettings(component.NewID(typeStr)), Include: MatchMetrics{ Metrics: []string{ "a*", @@ -92,11 +93,11 @@ func TestLoadConfig(t *testing.T) { }, }, { - id: config.NewComponentIDWithName(typeStr, "missing_match_type"), + id: component.NewIDWithName(typeStr, "missing_match_type"), errorMessage: "match_type must be set if metrics are supplied", }, { - id: config.NewComponentIDWithName(typeStr, "missing_name"), + id: component.NewIDWithName(typeStr, "missing_name"), errorMessage: "metrics must be supplied if match_type is set", }, } @@ -111,7 +112,7 @@ func TestLoadConfig(t *testing.T) { sub, err := cm.Sub(tt.id.String()) require.NoError(t, err) - require.NoError(t, config.UnmarshalProcessor(sub, cfg)) + require.NoError(t, component.UnmarshalProcessorConfig(sub, cfg)) if tt.expected == nil { assert.EqualError(t, cfg.Validate(), tt.errorMessage) diff --git a/processor/cumulativetodeltaprocessor/factory.go b/processor/cumulativetodeltaprocessor/factory.go index aa849dff8115..addf91a5239c 100644 --- a/processor/cumulativetodeltaprocessor/factory.go +++ b/processor/cumulativetodeltaprocessor/factory.go @@ -41,16 +41,16 @@ func NewFactory() component.ProcessorFactory { component.WithMetricsProcessor(createMetricsProcessor, stability)) } -func createDefaultConfig() config.Processor { +func createDefaultConfig() component.ProcessorConfig { return &Config{ - ProcessorSettings: config.NewProcessorSettings(config.NewComponentID(typeStr)), + ProcessorSettings: config.NewProcessorSettings(component.NewID(typeStr)), } } func createMetricsProcessor( ctx context.Context, set component.ProcessorCreateSettings, - cfg config.Processor, + cfg component.ProcessorConfig, nextConsumer consumer.Metrics, ) (component.MetricsProcessor, error) { processorConfig, ok := cfg.(*Config) diff --git a/processor/cumulativetodeltaprocessor/factory_test.go b/processor/cumulativetodeltaprocessor/factory_test.go index 4cea2d7fec4d..6bc723c3f9c7 100644 --- a/processor/cumulativetodeltaprocessor/factory_test.go +++ b/processor/cumulativetodeltaprocessor/factory_test.go @@ -21,9 +21,9 @@ import ( "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" + "go.opentelemetry.io/collector/component" "go.opentelemetry.io/collector/component/componenttest" "go.opentelemetry.io/collector/config" - "go.opentelemetry.io/collector/config/configtest" "go.opentelemetry.io/collector/confmap/confmaptest" "go.opentelemetry.io/collector/consumer/consumertest" ) @@ -31,16 +31,16 @@ import ( func TestType(t *testing.T) { factory := NewFactory() pType := factory.Type() - assert.Equal(t, pType, config.Type("cumulativetodelta")) + assert.Equal(t, pType, component.Type("cumulativetodelta")) } func TestCreateDefaultConfig(t *testing.T) { factory := NewFactory() cfg := factory.CreateDefaultConfig() assert.Equal(t, cfg, &Config{ - ProcessorSettings: config.NewProcessorSettings(config.NewComponentID(typeStr)), + ProcessorSettings: config.NewProcessorSettings(component.NewID(typeStr)), }) - assert.NoError(t, configtest.CheckConfigStruct(cfg)) + assert.NoError(t, componenttest.CheckConfigStruct(cfg)) } func TestCreateProcessors(t *testing.T) { @@ -57,7 +57,7 @@ func TestCreateProcessors(t *testing.T) { sub, err := cm.Sub(k) require.NoError(t, err) - require.NoError(t, config.UnmarshalProcessor(sub, cfg)) + require.NoError(t, component.UnmarshalProcessorConfig(sub, cfg)) tp, tErr := factory.CreateTracesProcessor( context.Background(), diff --git a/processor/cumulativetodeltaprocessor/go.mod b/processor/cumulativetodeltaprocessor/go.mod index f9d6eb63cfd0..323b31e61a19 100644 --- a/processor/cumulativetodeltaprocessor/go.mod +++ b/processor/cumulativetodeltaprocessor/go.mod @@ -5,8 +5,8 @@ go 1.18 require ( github.com/open-telemetry/opentelemetry-collector-contrib/internal/coreinternal v0.63.0 github.com/stretchr/testify v1.8.1 - go.opentelemetry.io/collector v0.63.2-0.20221104003159-6b27644724d8 - go.opentelemetry.io/collector/pdata v0.63.2-0.20221104003159-6b27644724d8 + go.opentelemetry.io/collector v0.63.2-0.20221108014805-0b08d5316426 + go.opentelemetry.io/collector/pdata v0.63.2-0.20221108014805-0b08d5316426 go.uber.org/atomic v1.10.0 go.uber.org/zap v1.23.0 @@ -26,7 +26,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.opencensus.io v0.23.0 // indirect + go.opencensus.io v0.24.0 // 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/cumulativetodeltaprocessor/go.sum b/processor/cumulativetodeltaprocessor/go.sum index 1bdfa40e68d4..fadc87b2b050 100644 --- a/processor/cumulativetodeltaprocessor/go.sum +++ b/processor/cumulativetodeltaprocessor/go.sum @@ -249,7 +249,6 @@ github.com/stretchr/testify v1.2.2/go.mod h1:a8OnRcib4nhh0OaRAV+Yts87kKdq0PP7pXf github.com/stretchr/testify v1.3.0/go.mod h1:M5WIy9Dh21IEIfnGCwXGc5bZfKNJtfHm1UVUgZn+9EI= github.com/stretchr/testify v1.4.0/go.mod h1:j7eGeouHqKxXV5pUuKE4zz7dFj8WfuZ+81PSLYec5m4= github.com/stretchr/testify v1.5.1/go.mod h1:5W2xD1RspED5o8YsWQXVCued0rvSQ+mT+I5cxcmMvtA= -github.com/stretchr/testify v1.6.1/go.mod h1:6Fq8oRcR53rry900zMqJjRRixrwX3KX962/h/Wwjteg= github.com/stretchr/testify v1.7.0/go.mod h1:6Fq8oRcR53rry900zMqJjRRixrwX3KX962/h/Wwjteg= github.com/stretchr/testify v1.7.1/go.mod h1:6Fq8oRcR53rry900zMqJjRRixrwX3KX962/h/Wwjteg= github.com/stretchr/testify v1.8.0/go.mod h1:yNjHg4UonilssWZ8iaSj1OCr/vHnekPRkoO+kdMU+MU= @@ -261,12 +260,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.opencensus.io v0.23.0 h1:gqCw0LfLxScz8irSi8exQc7fyQ0fKQU/qnC/X8+V/1M= -go.opencensus.io v0.23.0/go.mod h1:XItmlyltB5F7CS4xOC1DcqMoFqwtC6OG2xF7mCv7P7E= -go.opentelemetry.io/collector v0.63.2-0.20221104003159-6b27644724d8 h1:rOT5HzXXfSISc6FiH012zH2/EFjp37UXfjEqj5BpkWQ= -go.opentelemetry.io/collector v0.63.2-0.20221104003159-6b27644724d8/go.mod h1:JVmeZXugK4ondC6KQgrHTHWiF4JttpG5k6dWPMt62+k= -go.opentelemetry.io/collector/pdata v0.63.2-0.20221104003159-6b27644724d8 h1:7xeTQjfsOm9eogQeIxjSEhlik9qsbBGsnmkQHfyKaRE= -go.opentelemetry.io/collector/pdata v0.63.2-0.20221104003159-6b27644724d8/go.mod h1:IzvXUGQml2mrnvdb8zIlEW3qQs9oFLdD2hLwJdZ+pek= +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.63.2-0.20221108014805-0b08d5316426 h1:z/wLTMh7/vNxcFUDa5uG7/IPE3tYx6pzCWPV41ghyV8= +go.opentelemetry.io/collector v0.63.2-0.20221108014805-0b08d5316426/go.mod h1:+Zb70q0Rq17dA9FcHTiTjW6g96lvJ8kAZ0c+eWNkAv0= +go.opentelemetry.io/collector/pdata v0.63.2-0.20221108014805-0b08d5316426 h1:wKDpgP0Tx/gWI2SgDGAY1OTSeihhDivbbRqFR79IGTc= +go.opentelemetry.io/collector/pdata v0.63.2-0.20221108014805-0b08d5316426/go.mod h1:IzvXUGQml2mrnvdb8zIlEW3qQs9oFLdD2hLwJdZ+pek= 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/processor_test.go b/processor/cumulativetodeltaprocessor/processor_test.go index b8ffa48e1520..86ed9061b54b 100644 --- a/processor/cumulativetodeltaprocessor/processor_test.go +++ b/processor/cumulativetodeltaprocessor/processor_test.go @@ -283,7 +283,7 @@ func TestCumulativeToDeltaProcessor(t *testing.T) { // next stores the results of the filter metric processor next := new(consumertest.MetricsSink) cfg := &Config{ - ProcessorSettings: config.NewProcessorSettings(config.NewComponentID(typeStr)), + ProcessorSettings: config.NewProcessorSettings(component.NewID(typeStr)), Include: test.include, Exclude: test.exclude, } diff --git a/processor/deltatorateprocessor/config_test.go b/processor/deltatorateprocessor/config_test.go index 5a4ff66949ab..c5550703880a 100644 --- a/processor/deltatorateprocessor/config_test.go +++ b/processor/deltatorateprocessor/config_test.go @@ -20,6 +20,7 @@ import ( "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" + "go.opentelemetry.io/collector/component" "go.opentelemetry.io/collector/config" "go.opentelemetry.io/collector/confmap/confmaptest" ) @@ -28,14 +29,14 @@ func TestLoadConfig(t *testing.T) { t.Parallel() tests := []struct { - id config.ComponentID - expected config.Processor + id component.ID + expected component.ProcessorConfig errorMessage string }{ { - id: config.NewComponentIDWithName(typeStr, ""), + id: component.NewIDWithName(typeStr, ""), expected: &Config{ - ProcessorSettings: config.NewProcessorSettings(config.NewComponentID(typeStr)), + ProcessorSettings: config.NewProcessorSettings(component.NewID(typeStr)), Metrics: []string{ "metric1", "metric2", @@ -43,7 +44,7 @@ func TestLoadConfig(t *testing.T) { }, }, { - id: config.NewComponentIDWithName(typeStr, "missing_name"), + id: component.NewIDWithName(typeStr, "missing_name"), errorMessage: "metric names are missing", }, } @@ -58,7 +59,7 @@ func TestLoadConfig(t *testing.T) { sub, err := cm.Sub(tt.id.String()) require.NoError(t, err) - require.NoError(t, config.UnmarshalProcessor(sub, cfg)) + require.NoError(t, component.UnmarshalProcessorConfig(sub, cfg)) if tt.expected == nil { assert.EqualError(t, cfg.Validate(), tt.errorMessage) diff --git a/processor/deltatorateprocessor/factory.go b/processor/deltatorateprocessor/factory.go index 76c5223f5937..79a23c0a10c7 100644 --- a/processor/deltatorateprocessor/factory.go +++ b/processor/deltatorateprocessor/factory.go @@ -41,16 +41,16 @@ func NewFactory() component.ProcessorFactory { component.WithMetricsProcessor(createMetricsProcessor, stability)) } -func createDefaultConfig() config.Processor { +func createDefaultConfig() component.ProcessorConfig { return &Config{ - ProcessorSettings: config.NewProcessorSettings(config.NewComponentID(typeStr)), + ProcessorSettings: config.NewProcessorSettings(component.NewID(typeStr)), } } func createMetricsProcessor( ctx context.Context, set component.ProcessorCreateSettings, - cfg config.Processor, + cfg component.ProcessorConfig, nextConsumer consumer.Metrics, ) (component.MetricsProcessor, error) { processorConfig, ok := cfg.(*Config) diff --git a/processor/deltatorateprocessor/factory_test.go b/processor/deltatorateprocessor/factory_test.go index e3f719145086..55d0e60f2742 100644 --- a/processor/deltatorateprocessor/factory_test.go +++ b/processor/deltatorateprocessor/factory_test.go @@ -21,9 +21,9 @@ import ( "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" + "go.opentelemetry.io/collector/component" "go.opentelemetry.io/collector/component/componenttest" "go.opentelemetry.io/collector/config" - "go.opentelemetry.io/collector/config/configtest" "go.opentelemetry.io/collector/confmap/confmaptest" "go.opentelemetry.io/collector/consumer/consumertest" ) @@ -31,16 +31,16 @@ import ( func TestType(t *testing.T) { factory := NewFactory() pType := factory.Type() - assert.Equal(t, pType, config.Type("deltatorate")) + assert.Equal(t, pType, component.Type("deltatorate")) } func TestCreateDefaultConfig(t *testing.T) { factory := NewFactory() cfg := factory.CreateDefaultConfig() assert.Equal(t, cfg, &Config{ - ProcessorSettings: config.NewProcessorSettings(config.NewComponentID(typeStr)), + ProcessorSettings: config.NewProcessorSettings(component.NewID(typeStr)), }) - assert.NoError(t, configtest.CheckConfigStruct(cfg)) + assert.NoError(t, componenttest.CheckConfigStruct(cfg)) } func TestCreateProcessors(t *testing.T) { @@ -57,7 +57,7 @@ func TestCreateProcessors(t *testing.T) { sub, err := cm.Sub(k) require.NoError(t, err) - require.NoError(t, config.UnmarshalProcessor(sub, cfg)) + require.NoError(t, component.UnmarshalProcessorConfig(sub, cfg)) tp, tErr := factory.CreateTracesProcessor( context.Background(), diff --git a/processor/deltatorateprocessor/go.mod b/processor/deltatorateprocessor/go.mod index 3d8687a1ff83..aca827e39e06 100644 --- a/processor/deltatorateprocessor/go.mod +++ b/processor/deltatorateprocessor/go.mod @@ -4,8 +4,8 @@ go 1.18 require ( github.com/stretchr/testify v1.8.1 - go.opentelemetry.io/collector v0.63.2-0.20221104003159-6b27644724d8 - go.opentelemetry.io/collector/pdata v0.63.2-0.20221104003159-6b27644724d8 + go.opentelemetry.io/collector v0.63.2-0.20221108014805-0b08d5316426 + go.opentelemetry.io/collector/pdata v0.63.2-0.20221108014805-0b08d5316426 go.uber.org/zap v1.23.0 ) @@ -25,7 +25,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.opencensus.io v0.23.0 // indirect + go.opencensus.io v0.24.0 // 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 bb7fd0bf3a89..bb05dc8e1712 100644 --- a/processor/deltatorateprocessor/go.sum +++ b/processor/deltatorateprocessor/go.sum @@ -257,7 +257,6 @@ github.com/stretchr/testify v1.2.2/go.mod h1:a8OnRcib4nhh0OaRAV+Yts87kKdq0PP7pXf github.com/stretchr/testify v1.3.0/go.mod h1:M5WIy9Dh21IEIfnGCwXGc5bZfKNJtfHm1UVUgZn+9EI= github.com/stretchr/testify v1.4.0/go.mod h1:j7eGeouHqKxXV5pUuKE4zz7dFj8WfuZ+81PSLYec5m4= github.com/stretchr/testify v1.5.1/go.mod h1:5W2xD1RspED5o8YsWQXVCued0rvSQ+mT+I5cxcmMvtA= -github.com/stretchr/testify v1.6.1/go.mod h1:6Fq8oRcR53rry900zMqJjRRixrwX3KX962/h/Wwjteg= github.com/stretchr/testify v1.7.0/go.mod h1:6Fq8oRcR53rry900zMqJjRRixrwX3KX962/h/Wwjteg= github.com/stretchr/testify v1.7.1/go.mod h1:6Fq8oRcR53rry900zMqJjRRixrwX3KX962/h/Wwjteg= github.com/stretchr/testify v1.8.0/go.mod h1:yNjHg4UonilssWZ8iaSj1OCr/vHnekPRkoO+kdMU+MU= @@ -269,12 +268,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.opencensus.io v0.23.0 h1:gqCw0LfLxScz8irSi8exQc7fyQ0fKQU/qnC/X8+V/1M= -go.opencensus.io v0.23.0/go.mod h1:XItmlyltB5F7CS4xOC1DcqMoFqwtC6OG2xF7mCv7P7E= -go.opentelemetry.io/collector v0.63.2-0.20221104003159-6b27644724d8 h1:rOT5HzXXfSISc6FiH012zH2/EFjp37UXfjEqj5BpkWQ= -go.opentelemetry.io/collector v0.63.2-0.20221104003159-6b27644724d8/go.mod h1:JVmeZXugK4ondC6KQgrHTHWiF4JttpG5k6dWPMt62+k= -go.opentelemetry.io/collector/pdata v0.63.2-0.20221104003159-6b27644724d8 h1:7xeTQjfsOm9eogQeIxjSEhlik9qsbBGsnmkQHfyKaRE= -go.opentelemetry.io/collector/pdata v0.63.2-0.20221104003159-6b27644724d8/go.mod h1:IzvXUGQml2mrnvdb8zIlEW3qQs9oFLdD2hLwJdZ+pek= +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.63.2-0.20221108014805-0b08d5316426 h1:z/wLTMh7/vNxcFUDa5uG7/IPE3tYx6pzCWPV41ghyV8= +go.opentelemetry.io/collector v0.63.2-0.20221108014805-0b08d5316426/go.mod h1:+Zb70q0Rq17dA9FcHTiTjW6g96lvJ8kAZ0c+eWNkAv0= +go.opentelemetry.io/collector/pdata v0.63.2-0.20221108014805-0b08d5316426 h1:wKDpgP0Tx/gWI2SgDGAY1OTSeihhDivbbRqFR79IGTc= +go.opentelemetry.io/collector/pdata v0.63.2-0.20221108014805-0b08d5316426/go.mod h1:IzvXUGQml2mrnvdb8zIlEW3qQs9oFLdD2hLwJdZ+pek= 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/processor_test.go b/processor/deltatorateprocessor/processor_test.go index 522b602b409b..e91457452d7b 100644 --- a/processor/deltatorateprocessor/processor_test.go +++ b/processor/deltatorateprocessor/processor_test.go @@ -21,6 +21,7 @@ import ( "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" + "go.opentelemetry.io/collector/component" "go.opentelemetry.io/collector/component/componenttest" "go.opentelemetry.io/collector/config" "go.opentelemetry.io/collector/consumer/consumertest" @@ -128,7 +129,7 @@ func TestCumulativeToDeltaProcessor(t *testing.T) { // next stores the results of the filter metric processor next := new(consumertest.MetricsSink) cfg := &Config{ - ProcessorSettings: config.NewProcessorSettings(config.NewComponentID(typeStr)), + ProcessorSettings: config.NewProcessorSettings(component.NewID(typeStr)), Metrics: test.metrics, } factory := NewFactory() diff --git a/processor/filterprocessor/config.go b/processor/filterprocessor/config.go index 8522c255a78e..74ba6a6efef6 100644 --- a/processor/filterprocessor/config.go +++ b/processor/filterprocessor/config.go @@ -19,6 +19,7 @@ import ( "fmt" "strings" + "go.opentelemetry.io/collector/component" "go.opentelemetry.io/collector/config" "go.opentelemetry.io/collector/pdata/plog" "go.uber.org/multierr" @@ -249,7 +250,7 @@ func (lmp LogSeverityNumberMatchProperties) validate() error { return lmp.Min.validate() } -var _ config.Processor = (*Config)(nil) +var _ component.ProcessorConfig = (*Config)(nil) // Validate checks if the processor configuration is valid func (cfg *Config) Validate() error { diff --git a/processor/filterprocessor/config_test.go b/processor/filterprocessor/config_test.go index 73613dcde75b..5832b04bea81 100644 --- a/processor/filterprocessor/config_test.go +++ b/processor/filterprocessor/config_test.go @@ -20,6 +20,7 @@ import ( "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" + "go.opentelemetry.io/collector/component" "go.opentelemetry.io/collector/config" "go.opentelemetry.io/collector/confmap/confmaptest" "go.opentelemetry.io/collector/pdata/plog" @@ -46,13 +47,13 @@ func TestLoadingConfigStrict(t *testing.T) { require.NoError(t, err) tests := []struct { - id config.ComponentID + id component.ID expected *Config }{ { - id: config.NewComponentIDWithName("filter", "empty"), + id: component.NewIDWithName("filter", "empty"), expected: &Config{ - ProcessorSettings: config.NewProcessorSettings(config.NewComponentID(typeStr)), + ProcessorSettings: config.NewProcessorSettings(component.NewID(typeStr)), Metrics: MetricFilters{ Include: &filtermetric.MatchProperties{ MatchType: filtermetric.Strict, @@ -60,25 +61,25 @@ func TestLoadingConfigStrict(t *testing.T) { }, }, }, { - id: config.NewComponentIDWithName("filter", "include"), + id: component.NewIDWithName("filter", "include"), expected: &Config{ - ProcessorSettings: config.NewProcessorSettings(config.NewComponentID(typeStr)), + ProcessorSettings: config.NewProcessorSettings(component.NewID(typeStr)), Metrics: MetricFilters{ Include: testDataMetricProperties, }, }, }, { - id: config.NewComponentIDWithName("filter", "exclude"), + id: component.NewIDWithName("filter", "exclude"), expected: &Config{ - ProcessorSettings: config.NewProcessorSettings(config.NewComponentID(typeStr)), + ProcessorSettings: config.NewProcessorSettings(component.NewID(typeStr)), Metrics: MetricFilters{ Exclude: testDataMetricProperties, }, }, }, { - id: config.NewComponentIDWithName("filter", "includeexclude"), + id: component.NewIDWithName("filter", "includeexclude"), expected: &Config{ - ProcessorSettings: config.NewProcessorSettings(config.NewComponentID(typeStr)), + ProcessorSettings: config.NewProcessorSettings(component.NewID(typeStr)), Metrics: MetricFilters{ Include: testDataMetricProperties, Exclude: &filtermetric.MatchProperties{ @@ -97,7 +98,7 @@ func TestLoadingConfigStrict(t *testing.T) { sub, err := cm.Sub(tt.id.String()) require.NoError(t, err) - require.NoError(t, config.UnmarshalProcessor(sub, cfg)) + require.NoError(t, component.UnmarshalProcessorConfig(sub, cfg)) assert.NoError(t, cfg.Validate()) assert.Equal(t, tt.expected, cfg) @@ -132,13 +133,13 @@ func TestLoadingConfigStrictLogs(t *testing.T) { require.NoError(t, err) tests := []struct { - id config.ComponentID + id component.ID expected *Config }{ { - id: config.NewComponentIDWithName("filter", "empty"), + id: component.NewIDWithName("filter", "empty"), expected: &Config{ - ProcessorSettings: config.NewProcessorSettings(config.NewComponentID(typeStr)), + ProcessorSettings: config.NewProcessorSettings(component.NewID(typeStr)), Logs: LogFilters{ Include: &LogMatchProperties{ LogMatchType: Strict, @@ -146,25 +147,25 @@ func TestLoadingConfigStrictLogs(t *testing.T) { }, }, }, { - id: config.NewComponentIDWithName("filter", "include"), + id: component.NewIDWithName("filter", "include"), expected: &Config{ - ProcessorSettings: config.NewProcessorSettings(config.NewComponentID(typeStr)), + ProcessorSettings: config.NewProcessorSettings(component.NewID(typeStr)), Logs: LogFilters{ Include: testDataLogPropertiesInclude, }, }, }, { - id: config.NewComponentIDWithName("filter", "exclude"), + id: component.NewIDWithName("filter", "exclude"), expected: &Config{ - ProcessorSettings: config.NewProcessorSettings(config.NewComponentID(typeStr)), + ProcessorSettings: config.NewProcessorSettings(component.NewID(typeStr)), Logs: LogFilters{ Exclude: testDataLogPropertiesExclude, }, }, }, { - id: config.NewComponentIDWithName("filter", "includeexclude"), + id: component.NewIDWithName("filter", "includeexclude"), expected: &Config{ - ProcessorSettings: config.NewProcessorSettings(config.NewComponentID(typeStr)), + ProcessorSettings: config.NewProcessorSettings(component.NewID(typeStr)), Logs: LogFilters{ Include: testDataLogPropertiesInclude, Exclude: testDataLogPropertiesExclude, @@ -180,7 +181,7 @@ func TestLoadingConfigStrictLogs(t *testing.T) { sub, err := cm.Sub(tt.id.String()) require.NoError(t, err) - require.NoError(t, config.UnmarshalProcessor(sub, cfg)) + require.NoError(t, component.UnmarshalProcessorConfig(sub, cfg)) assert.NoError(t, cfg.Validate()) assert.Equal(t, tt.expected, cfg) @@ -205,29 +206,29 @@ func TestLoadingConfigSeverityLogsStrict(t *testing.T) { require.NoError(t, err) tests := []struct { - id config.ComponentID + id component.ID expected *Config }{ { - id: config.NewComponentIDWithName("filter", "include"), + id: component.NewIDWithName("filter", "include"), expected: &Config{ - ProcessorSettings: config.NewProcessorSettings(config.NewComponentID(typeStr)), + ProcessorSettings: config.NewProcessorSettings(component.NewID(typeStr)), Logs: LogFilters{ Include: testDataLogPropertiesInclude, }, }, }, { - id: config.NewComponentIDWithName("filter", "exclude"), + id: component.NewIDWithName("filter", "exclude"), expected: &Config{ - ProcessorSettings: config.NewProcessorSettings(config.NewComponentID(typeStr)), + ProcessorSettings: config.NewProcessorSettings(component.NewID(typeStr)), Logs: LogFilters{ Exclude: testDataLogPropertiesExclude, }, }, }, { - id: config.NewComponentIDWithName("filter", "includeexclude"), + id: component.NewIDWithName("filter", "includeexclude"), expected: &Config{ - ProcessorSettings: config.NewProcessorSettings(config.NewComponentID(typeStr)), + ProcessorSettings: config.NewProcessorSettings(component.NewID(typeStr)), Logs: LogFilters{ Include: testDataLogPropertiesInclude, Exclude: testDataLogPropertiesExclude, @@ -243,7 +244,7 @@ func TestLoadingConfigSeverityLogsStrict(t *testing.T) { sub, err := cm.Sub(tt.id.String()) require.NoError(t, err) - require.NoError(t, config.UnmarshalProcessor(sub, cfg)) + require.NoError(t, component.UnmarshalProcessorConfig(sub, cfg)) assert.NoError(t, cfg.Validate()) assert.Equal(t, tt.expected, cfg) @@ -267,29 +268,29 @@ func TestLoadingConfigSeverityLogsRegexp(t *testing.T) { require.NoError(t, err) tests := []struct { - id config.ComponentID + id component.ID expected *Config }{ { - id: config.NewComponentIDWithName("filter", "include"), + id: component.NewIDWithName("filter", "include"), expected: &Config{ - ProcessorSettings: config.NewProcessorSettings(config.NewComponentID(typeStr)), + ProcessorSettings: config.NewProcessorSettings(component.NewID(typeStr)), Logs: LogFilters{ Include: testDataLogPropertiesInclude, }, }, }, { - id: config.NewComponentIDWithName("filter", "exclude"), + id: component.NewIDWithName("filter", "exclude"), expected: &Config{ - ProcessorSettings: config.NewProcessorSettings(config.NewComponentID(typeStr)), + ProcessorSettings: config.NewProcessorSettings(component.NewID(typeStr)), Logs: LogFilters{ Exclude: testDataLogPropertiesExclude, }, }, }, { - id: config.NewComponentIDWithName("filter", "includeexclude"), + id: component.NewIDWithName("filter", "includeexclude"), expected: &Config{ - ProcessorSettings: config.NewProcessorSettings(config.NewComponentID(typeStr)), + ProcessorSettings: config.NewProcessorSettings(component.NewID(typeStr)), Logs: LogFilters{ Include: testDataLogPropertiesInclude, Exclude: testDataLogPropertiesExclude, @@ -305,7 +306,7 @@ func TestLoadingConfigSeverityLogsRegexp(t *testing.T) { sub, err := cm.Sub(tt.id.String()) require.NoError(t, err) - require.NoError(t, config.UnmarshalProcessor(sub, cfg)) + require.NoError(t, component.UnmarshalProcessorConfig(sub, cfg)) assert.NoError(t, cfg.Validate()) assert.Equal(t, tt.expected, cfg) @@ -330,29 +331,29 @@ func TestLoadingConfigBodyLogsStrict(t *testing.T) { require.NoError(t, err) tests := []struct { - id config.ComponentID + id component.ID expected *Config }{ { - id: config.NewComponentIDWithName("filter", "include"), + id: component.NewIDWithName("filter", "include"), expected: &Config{ - ProcessorSettings: config.NewProcessorSettings(config.NewComponentID(typeStr)), + ProcessorSettings: config.NewProcessorSettings(component.NewID(typeStr)), Logs: LogFilters{ Include: testDataLogPropertiesInclude, }, }, }, { - id: config.NewComponentIDWithName("filter", "exclude"), + id: component.NewIDWithName("filter", "exclude"), expected: &Config{ - ProcessorSettings: config.NewProcessorSettings(config.NewComponentID(typeStr)), + ProcessorSettings: config.NewProcessorSettings(component.NewID(typeStr)), Logs: LogFilters{ Exclude: testDataLogPropertiesExclude, }, }, }, { - id: config.NewComponentIDWithName("filter", "includeexclude"), + id: component.NewIDWithName("filter", "includeexclude"), expected: &Config{ - ProcessorSettings: config.NewProcessorSettings(config.NewComponentID(typeStr)), + ProcessorSettings: config.NewProcessorSettings(component.NewID(typeStr)), Logs: LogFilters{ Include: testDataLogPropertiesInclude, Exclude: testDataLogPropertiesExclude, @@ -368,7 +369,7 @@ func TestLoadingConfigBodyLogsStrict(t *testing.T) { sub, err := cm.Sub(tt.id.String()) require.NoError(t, err) - require.NoError(t, config.UnmarshalProcessor(sub, cfg)) + require.NoError(t, component.UnmarshalProcessorConfig(sub, cfg)) assert.NoError(t, cfg.Validate()) assert.Equal(t, tt.expected, cfg) @@ -393,29 +394,29 @@ func TestLoadingConfigBodyLogsRegexp(t *testing.T) { require.NoError(t, err) tests := []struct { - id config.ComponentID + id component.ID expected *Config }{ { - id: config.NewComponentIDWithName("filter", "include"), + id: component.NewIDWithName("filter", "include"), expected: &Config{ - ProcessorSettings: config.NewProcessorSettings(config.NewComponentID(typeStr)), + ProcessorSettings: config.NewProcessorSettings(component.NewID(typeStr)), Logs: LogFilters{ Include: testDataLogPropertiesInclude, }, }, }, { - id: config.NewComponentIDWithName("filter", "exclude"), + id: component.NewIDWithName("filter", "exclude"), expected: &Config{ - ProcessorSettings: config.NewProcessorSettings(config.NewComponentID(typeStr)), + ProcessorSettings: config.NewProcessorSettings(component.NewID(typeStr)), Logs: LogFilters{ Exclude: testDataLogPropertiesExclude, }, }, }, { - id: config.NewComponentIDWithName("filter", "includeexclude"), + id: component.NewIDWithName("filter", "includeexclude"), expected: &Config{ - ProcessorSettings: config.NewProcessorSettings(config.NewComponentID(typeStr)), + ProcessorSettings: config.NewProcessorSettings(component.NewID(typeStr)), Logs: LogFilters{ Include: testDataLogPropertiesInclude, Exclude: testDataLogPropertiesExclude, @@ -431,7 +432,7 @@ func TestLoadingConfigBodyLogsRegexp(t *testing.T) { sub, err := cm.Sub(tt.id.String()) require.NoError(t, err) - require.NoError(t, config.UnmarshalProcessor(sub, cfg)) + require.NoError(t, component.UnmarshalProcessorConfig(sub, cfg)) assert.NoError(t, cfg.Validate()) assert.Equal(t, tt.expected, cfg) @@ -458,29 +459,29 @@ func TestLoadingConfigMinSeverityNumberLogs(t *testing.T) { require.NoError(t, err) tests := []struct { - id config.ComponentID + id component.ID expected *Config }{ { - id: config.NewComponentIDWithName("filter", "include"), + id: component.NewIDWithName("filter", "include"), expected: &Config{ - ProcessorSettings: config.NewProcessorSettings(config.NewComponentID(typeStr)), + ProcessorSettings: config.NewProcessorSettings(component.NewID(typeStr)), Logs: LogFilters{ Include: testDataLogPropertiesInclude, }, }, }, { - id: config.NewComponentIDWithName("filter", "exclude"), + id: component.NewIDWithName("filter", "exclude"), expected: &Config{ - ProcessorSettings: config.NewProcessorSettings(config.NewComponentID(typeStr)), + ProcessorSettings: config.NewProcessorSettings(component.NewID(typeStr)), Logs: LogFilters{ Exclude: testDataLogPropertiesExclude, }, }, }, { - id: config.NewComponentIDWithName("filter", "includeexclude"), + id: component.NewIDWithName("filter", "includeexclude"), expected: &Config{ - ProcessorSettings: config.NewProcessorSettings(config.NewComponentID(typeStr)), + ProcessorSettings: config.NewProcessorSettings(component.NewID(typeStr)), Logs: LogFilters{ Include: testDataLogPropertiesInclude, Exclude: testDataLogPropertiesExclude, @@ -496,7 +497,7 @@ func TestLoadingConfigMinSeverityNumberLogs(t *testing.T) { sub, err := cm.Sub(tt.id.String()) require.NoError(t, err) - require.NoError(t, config.UnmarshalProcessor(sub, cfg)) + require.NoError(t, component.UnmarshalProcessorConfig(sub, cfg)) assert.NoError(t, cfg.Validate()) assert.Equal(t, tt.expected, cfg) @@ -527,29 +528,29 @@ func TestLoadingConfigRegexp(t *testing.T) { require.NoError(t, err) tests := []struct { - id config.ComponentID - expected config.Processor + id component.ID + expected component.ProcessorConfig }{ { - id: config.NewComponentIDWithName("filter", "include"), + id: component.NewIDWithName("filter", "include"), expected: &Config{ - ProcessorSettings: config.NewProcessorSettings(config.NewComponentID(typeStr)), + ProcessorSettings: config.NewProcessorSettings(component.NewID(typeStr)), Metrics: MetricFilters{ Include: testDataMetricProperties, }, }, }, { - id: config.NewComponentIDWithName("filter", "exclude"), + id: component.NewIDWithName("filter", "exclude"), expected: &Config{ - ProcessorSettings: config.NewProcessorSettings(config.NewComponentID(typeStr)), + ProcessorSettings: config.NewProcessorSettings(component.NewID(typeStr)), Metrics: MetricFilters{ Exclude: testDataMetricProperties, }, }, }, { - id: config.NewComponentIDWithName("filter", "unlimitedcache"), + id: component.NewIDWithName("filter", "unlimitedcache"), expected: &Config{ - ProcessorSettings: config.NewProcessorSettings(config.NewComponentID(typeStr)), + ProcessorSettings: config.NewProcessorSettings(component.NewID(typeStr)), Metrics: MetricFilters{ Include: &filtermetric.MatchProperties{ MatchType: filtermetric.Regexp, @@ -561,9 +562,9 @@ func TestLoadingConfigRegexp(t *testing.T) { }, }, }, { - id: config.NewComponentIDWithName("filter", "limitedcache"), + id: component.NewIDWithName("filter", "limitedcache"), expected: &Config{ - ProcessorSettings: config.NewProcessorSettings(config.NewComponentID(typeStr)), + ProcessorSettings: config.NewProcessorSettings(component.NewID(typeStr)), Metrics: MetricFilters{ Exclude: &filtermetric.MatchProperties{ MatchType: filtermetric.Regexp, @@ -585,7 +586,7 @@ func TestLoadingConfigRegexp(t *testing.T) { sub, err := cm.Sub(tt.id.String()) require.NoError(t, err) - require.NoError(t, config.UnmarshalProcessor(sub, cfg)) + require.NoError(t, component.UnmarshalProcessorConfig(sub, cfg)) assert.NoError(t, cfg.Validate()) assert.Equal(t, tt.expected, cfg) @@ -598,13 +599,13 @@ func TestLoadingSpans(t *testing.T) { require.NoError(t, err) tests := []struct { - id config.ComponentID - expected config.Processor + id component.ID + expected component.ProcessorConfig }{ { - id: config.NewComponentIDWithName("filter", "spans"), + id: component.NewIDWithName("filter", "spans"), expected: &Config{ - ProcessorSettings: config.NewProcessorSettings(config.NewComponentID(typeStr)), + ProcessorSettings: config.NewProcessorSettings(component.NewID(typeStr)), Spans: SpanFilters{ Include: &filterconfig.MatchProperties{ Config: filterset.Config{ @@ -635,7 +636,7 @@ func TestLoadingSpans(t *testing.T) { sub, err := cm.Sub(tt.id.String()) require.NoError(t, err) - require.NoError(t, config.UnmarshalProcessor(sub, cfg)) + require.NoError(t, component.UnmarshalProcessorConfig(sub, cfg)) assert.NoError(t, cfg.Validate()) assert.Equal(t, tt.expected, cfg) @@ -648,13 +649,13 @@ func TestLoadingConfigExpr(t *testing.T) { require.NoError(t, err) tests := []struct { - id config.ComponentID - expected config.Processor + id component.ID + expected component.ProcessorConfig }{ { - id: config.NewComponentIDWithName("filter", "empty"), + id: component.NewIDWithName("filter", "empty"), expected: &Config{ - ProcessorSettings: config.NewProcessorSettings(config.NewComponentID(typeStr)), + ProcessorSettings: config.NewProcessorSettings(component.NewID(typeStr)), Metrics: MetricFilters{ Include: &filtermetric.MatchProperties{ MatchType: filtermetric.Expr, @@ -663,9 +664,9 @@ func TestLoadingConfigExpr(t *testing.T) { }, }, { - id: config.NewComponentIDWithName("filter", "include"), + id: component.NewIDWithName("filter", "include"), expected: &Config{ - ProcessorSettings: config.NewProcessorSettings(config.NewComponentID(typeStr)), + ProcessorSettings: config.NewProcessorSettings(component.NewID(typeStr)), Metrics: MetricFilters{ Include: &filtermetric.MatchProperties{ MatchType: filtermetric.Expr, @@ -678,9 +679,9 @@ func TestLoadingConfigExpr(t *testing.T) { }, }, { - id: config.NewComponentIDWithName("filter", "exclude"), + id: component.NewIDWithName("filter", "exclude"), expected: &Config{ - ProcessorSettings: config.NewProcessorSettings(config.NewComponentID(typeStr)), + ProcessorSettings: config.NewProcessorSettings(component.NewID(typeStr)), Metrics: MetricFilters{ Exclude: &filtermetric.MatchProperties{ MatchType: filtermetric.Expr, @@ -693,9 +694,9 @@ func TestLoadingConfigExpr(t *testing.T) { }, }, { - id: config.NewComponentIDWithName("filter", "includeexclude"), + id: component.NewIDWithName("filter", "includeexclude"), expected: &Config{ - ProcessorSettings: config.NewProcessorSettings(config.NewComponentID(typeStr)), + ProcessorSettings: config.NewProcessorSettings(component.NewID(typeStr)), Metrics: MetricFilters{ Include: &filtermetric.MatchProperties{ MatchType: filtermetric.Expr, @@ -720,7 +721,7 @@ func TestLoadingConfigExpr(t *testing.T) { sub, err := cm.Sub(tt.id.String()) require.NoError(t, err) - require.NoError(t, config.UnmarshalProcessor(sub, cfg)) + require.NoError(t, component.UnmarshalProcessorConfig(sub, cfg)) assert.NoError(t, cfg.Validate()) assert.Equal(t, tt.expected, cfg) diff --git a/processor/filterprocessor/expr_test.go b/processor/filterprocessor/expr_test.go index 6c20b2cf4dbb..c774a9f6ce7c 100644 --- a/processor/filterprocessor/expr_test.go +++ b/processor/filterprocessor/expr_test.go @@ -22,7 +22,6 @@ import ( "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" "go.opentelemetry.io/collector/component" - "go.opentelemetry.io/collector/config" "go.opentelemetry.io/collector/consumer/consumertest" "go.opentelemetry.io/collector/pdata/pcommon" "go.opentelemetry.io/collector/pdata/pmetric" @@ -157,7 +156,7 @@ func testProcessor(t *testing.T, include []string, exclude []string) (component. return proc, next, logs } -func exprConfig(factory component.ProcessorFactory, include []string, exclude []string) config.Processor { +func exprConfig(factory component.ProcessorFactory, include []string, exclude []string) component.ProcessorConfig { cfg := factory.CreateDefaultConfig() pCfg := cfg.(*Config) pCfg.Metrics = MetricFilters{} diff --git a/processor/filterprocessor/factory.go b/processor/filterprocessor/factory.go index 188d87d24de4..6d98d2dff057 100644 --- a/processor/filterprocessor/factory.go +++ b/processor/filterprocessor/factory.go @@ -43,16 +43,16 @@ func NewFactory() component.ProcessorFactory { ) } -func createDefaultConfig() config.Processor { +func createDefaultConfig() component.ProcessorConfig { return &Config{ - ProcessorSettings: config.NewProcessorSettings(config.NewComponentID(typeStr)), + ProcessorSettings: config.NewProcessorSettings(component.NewID(typeStr)), } } func createMetricsProcessor( ctx context.Context, set component.ProcessorCreateSettings, - cfg config.Processor, + cfg component.ProcessorConfig, nextConsumer consumer.Metrics, ) (component.MetricsProcessor, error) { fp, err := newFilterMetricProcessor(set.Logger, cfg.(*Config)) @@ -71,7 +71,7 @@ func createMetricsProcessor( func createLogsProcessor( ctx context.Context, set component.ProcessorCreateSettings, - cfg config.Processor, + cfg component.ProcessorConfig, nextConsumer consumer.Logs, ) (component.LogsProcessor, error) { fp, err := newFilterLogsProcessor(set.Logger, cfg.(*Config)) @@ -90,7 +90,7 @@ func createLogsProcessor( func createTracesProcessor( ctx context.Context, set component.ProcessorCreateSettings, - cfg config.Processor, + cfg component.ProcessorConfig, nextConsumer consumer.Traces, ) (component.TracesProcessor, error) { fp, err := newFilterSpansProcessor(set.Logger, cfg.(*Config)) diff --git a/processor/filterprocessor/factory_test.go b/processor/filterprocessor/factory_test.go index 699b2ea45ed1..ea175f1e1370 100644 --- a/processor/filterprocessor/factory_test.go +++ b/processor/filterprocessor/factory_test.go @@ -22,9 +22,9 @@ import ( "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" + "go.opentelemetry.io/collector/component" "go.opentelemetry.io/collector/component/componenttest" "go.opentelemetry.io/collector/config" - "go.opentelemetry.io/collector/config/configtest" "go.opentelemetry.io/collector/confmap/confmaptest" "go.opentelemetry.io/collector/consumer/consumertest" ) @@ -33,16 +33,16 @@ func TestType(t *testing.T) { factory := NewFactory() pType := factory.Type() - assert.Equal(t, pType, config.Type("filter")) + assert.Equal(t, pType, component.Type("filter")) } func TestCreateDefaultConfig(t *testing.T) { factory := NewFactory() cfg := factory.CreateDefaultConfig() assert.Equal(t, cfg, &Config{ - ProcessorSettings: config.NewProcessorSettings(config.NewComponentID(typeStr)), + ProcessorSettings: config.NewProcessorSettings(component.NewID(typeStr)), }) - assert.NoError(t, configtest.CheckConfigStruct(cfg)) + assert.NoError(t, componenttest.CheckConfigStruct(cfg)) } func TestCreateProcessors(t *testing.T) { @@ -94,7 +94,7 @@ func TestCreateProcessors(t *testing.T) { sub, err := cm.Sub(k) require.NoError(t, err) - require.NoError(t, config.UnmarshalProcessor(sub, cfg)) + require.NoError(t, component.UnmarshalProcessorConfig(sub, cfg)) tp, tErr := factory.CreateTracesProcessor( context.Background(), diff --git a/processor/filterprocessor/filter_processor_logs_test.go b/processor/filterprocessor/filter_processor_logs_test.go index 532f3efe7227..7f187ccb7a6d 100644 --- a/processor/filterprocessor/filter_processor_logs_test.go +++ b/processor/filterprocessor/filter_processor_logs_test.go @@ -20,6 +20,7 @@ import ( "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" + "go.opentelemetry.io/collector/component" "go.opentelemetry.io/collector/component/componenttest" "go.opentelemetry.io/collector/config" "go.opentelemetry.io/collector/consumer/consumertest" @@ -580,7 +581,7 @@ func TestFilterLogProcessor(t *testing.T) { // next stores the results of the filter log processor next := new(consumertest.LogsSink) cfg := &Config{ - ProcessorSettings: config.NewProcessorSettings(config.NewComponentID(typeStr)), + ProcessorSettings: config.NewProcessorSettings(component.NewID(typeStr)), Logs: LogFilters{ Include: test.inc, Exclude: test.exc, diff --git a/processor/filterprocessor/filter_processor_test.go b/processor/filterprocessor/filter_processor_test.go index d83746a2e547..c3202a7b007e 100644 --- a/processor/filterprocessor/filter_processor_test.go +++ b/processor/filterprocessor/filter_processor_test.go @@ -22,6 +22,7 @@ import ( "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" + "go.opentelemetry.io/collector/component" "go.opentelemetry.io/collector/component/componenttest" "go.opentelemetry.io/collector/config" "go.opentelemetry.io/collector/consumer/consumertest" @@ -335,7 +336,7 @@ func TestFilterMetricProcessor(t *testing.T) { // next stores the results of the filter metric processor next := new(consumertest.MetricsSink) cfg := &Config{ - ProcessorSettings: config.NewProcessorSettings(config.NewComponentID(typeStr)), + ProcessorSettings: config.NewProcessorSettings(component.NewID(typeStr)), Metrics: MetricFilters{ Include: test.inc, Exclude: test.exc, diff --git a/processor/filterprocessor/filter_processor_traces_test.go b/processor/filterprocessor/filter_processor_traces_test.go index 08a6ec9bd05a..878e6bc0373c 100644 --- a/processor/filterprocessor/filter_processor_traces_test.go +++ b/processor/filterprocessor/filter_processor_traces_test.go @@ -19,6 +19,7 @@ import ( "testing" "github.com/stretchr/testify/require" + "go.opentelemetry.io/collector/component" "go.opentelemetry.io/collector/component/componenttest" "go.opentelemetry.io/collector/config" "go.opentelemetry.io/collector/consumer/consumertest" @@ -129,7 +130,7 @@ func TestFilterTraceProcessor(t *testing.T) { ctx := context.Background() next := new(consumertest.TracesSink) cfg := &Config{ - ProcessorSettings: config.NewProcessorSettings(config.NewComponentID(typeStr)), + ProcessorSettings: config.NewProcessorSettings(component.NewID(typeStr)), Spans: SpanFilters{ Include: test.inc, Exclude: test.exc, diff --git a/processor/filterprocessor/go.mod b/processor/filterprocessor/go.mod index edad2157f188..f3b9afc01901 100644 --- a/processor/filterprocessor/go.mod +++ b/processor/filterprocessor/go.mod @@ -5,8 +5,8 @@ go 1.18 require ( github.com/open-telemetry/opentelemetry-collector-contrib/internal/coreinternal v0.63.0 github.com/stretchr/testify v1.8.1 - go.opentelemetry.io/collector v0.63.2-0.20221104003159-6b27644724d8 - go.opentelemetry.io/collector/pdata v0.63.2-0.20221104003159-6b27644724d8 + go.opentelemetry.io/collector v0.63.2-0.20221108014805-0b08d5316426 + go.opentelemetry.io/collector/pdata v0.63.2-0.20221108014805-0b08d5316426 go.uber.org/multierr v1.8.0 go.uber.org/zap v1.23.0 ) @@ -26,8 +26,8 @@ require ( github.com/modern-go/reflect2 v1.0.2 // indirect github.com/pmezard/go-difflib v1.0.0 // indirect github.com/spf13/cast v1.5.0 // indirect - go.opencensus.io v0.23.0 // indirect - go.opentelemetry.io/collector/semconv v0.63.2-0.20221104003159-6b27644724d8 // indirect + go.opencensus.io v0.24.0 // indirect + go.opentelemetry.io/collector/semconv v0.63.2-0.20221108014805-0b08d5316426 // 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 fb4671f6d094..174734f9bede 100644 --- a/processor/filterprocessor/go.sum +++ b/processor/filterprocessor/go.sum @@ -263,7 +263,6 @@ github.com/stretchr/testify v1.2.2/go.mod h1:a8OnRcib4nhh0OaRAV+Yts87kKdq0PP7pXf github.com/stretchr/testify v1.3.0/go.mod h1:M5WIy9Dh21IEIfnGCwXGc5bZfKNJtfHm1UVUgZn+9EI= github.com/stretchr/testify v1.4.0/go.mod h1:j7eGeouHqKxXV5pUuKE4zz7dFj8WfuZ+81PSLYec5m4= github.com/stretchr/testify v1.5.1/go.mod h1:5W2xD1RspED5o8YsWQXVCued0rvSQ+mT+I5cxcmMvtA= -github.com/stretchr/testify v1.6.1/go.mod h1:6Fq8oRcR53rry900zMqJjRRixrwX3KX962/h/Wwjteg= github.com/stretchr/testify v1.7.0/go.mod h1:6Fq8oRcR53rry900zMqJjRRixrwX3KX962/h/Wwjteg= github.com/stretchr/testify v1.7.1/go.mod h1:6Fq8oRcR53rry900zMqJjRRixrwX3KX962/h/Wwjteg= github.com/stretchr/testify v1.8.0/go.mod h1:yNjHg4UonilssWZ8iaSj1OCr/vHnekPRkoO+kdMU+MU= @@ -275,14 +274,14 @@ 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.opencensus.io v0.23.0 h1:gqCw0LfLxScz8irSi8exQc7fyQ0fKQU/qnC/X8+V/1M= -go.opencensus.io v0.23.0/go.mod h1:XItmlyltB5F7CS4xOC1DcqMoFqwtC6OG2xF7mCv7P7E= -go.opentelemetry.io/collector v0.63.2-0.20221104003159-6b27644724d8 h1:rOT5HzXXfSISc6FiH012zH2/EFjp37UXfjEqj5BpkWQ= -go.opentelemetry.io/collector v0.63.2-0.20221104003159-6b27644724d8/go.mod h1:JVmeZXugK4ondC6KQgrHTHWiF4JttpG5k6dWPMt62+k= -go.opentelemetry.io/collector/pdata v0.63.2-0.20221104003159-6b27644724d8 h1:7xeTQjfsOm9eogQeIxjSEhlik9qsbBGsnmkQHfyKaRE= -go.opentelemetry.io/collector/pdata v0.63.2-0.20221104003159-6b27644724d8/go.mod h1:IzvXUGQml2mrnvdb8zIlEW3qQs9oFLdD2hLwJdZ+pek= -go.opentelemetry.io/collector/semconv v0.63.2-0.20221104003159-6b27644724d8 h1:jm0sNPyqo6S165QjQYMBHB2nK50wlJbMYM03Yr3Eo2k= -go.opentelemetry.io/collector/semconv v0.63.2-0.20221104003159-6b27644724d8/go.mod h1:5o9yhOa+ABt7g2E5JABDxGZ1PQPbtfxrKNbYn+LOTXU= +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.63.2-0.20221108014805-0b08d5316426 h1:z/wLTMh7/vNxcFUDa5uG7/IPE3tYx6pzCWPV41ghyV8= +go.opentelemetry.io/collector v0.63.2-0.20221108014805-0b08d5316426/go.mod h1:+Zb70q0Rq17dA9FcHTiTjW6g96lvJ8kAZ0c+eWNkAv0= +go.opentelemetry.io/collector/pdata v0.63.2-0.20221108014805-0b08d5316426 h1:wKDpgP0Tx/gWI2SgDGAY1OTSeihhDivbbRqFR79IGTc= +go.opentelemetry.io/collector/pdata v0.63.2-0.20221108014805-0b08d5316426/go.mod h1:IzvXUGQml2mrnvdb8zIlEW3qQs9oFLdD2hLwJdZ+pek= +go.opentelemetry.io/collector/semconv v0.63.2-0.20221108014805-0b08d5316426 h1:pqIl7OC531J6i9ttBCj3zLmZI/BSF4q323YpK0GgKGk= +go.opentelemetry.io/collector/semconv v0.63.2-0.20221108014805-0b08d5316426/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 dd49fbdb4210..0aea4a00ad6e 100644 --- a/processor/groupbyattrsprocessor/config_test.go +++ b/processor/groupbyattrsprocessor/config_test.go @@ -20,6 +20,7 @@ import ( "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" + "go.opentelemetry.io/collector/component" "go.opentelemetry.io/collector/config" "go.opentelemetry.io/collector/confmap/confmaptest" ) @@ -28,20 +29,20 @@ func TestLoadingConfig(t *testing.T) { t.Parallel() tests := []struct { - id config.ComponentID - expected config.Processor + id component.ID + expected component.ProcessorConfig }{ { - id: config.NewComponentIDWithName(typeStr, "grouping"), + id: component.NewIDWithName(typeStr, "grouping"), expected: &Config{ - ProcessorSettings: config.NewProcessorSettings(config.NewComponentID(typeStr)), + ProcessorSettings: config.NewProcessorSettings(component.NewID(typeStr)), GroupByKeys: []string{"key1", "key2"}, }, }, { - id: config.NewComponentIDWithName(typeStr, "compaction"), + id: component.NewIDWithName(typeStr, "compaction"), expected: &Config{ - ProcessorSettings: config.NewProcessorSettings(config.NewComponentID(typeStr)), + ProcessorSettings: config.NewProcessorSettings(component.NewID(typeStr)), GroupByKeys: []string{}, }, }, @@ -57,7 +58,7 @@ func TestLoadingConfig(t *testing.T) { sub, err := cm.Sub(tt.id.String()) require.NoError(t, err) - require.NoError(t, config.UnmarshalProcessor(sub, cfg)) + require.NoError(t, component.UnmarshalProcessorConfig(sub, cfg)) assert.NoError(t, cfg.Validate()) assert.Equal(t, tt.expected, cfg) diff --git a/processor/groupbyattrsprocessor/factory.go b/processor/groupbyattrsprocessor/factory.go index dd6ff7eadeff..57d0e5764405 100644 --- a/processor/groupbyattrsprocessor/factory.go +++ b/processor/groupbyattrsprocessor/factory.go @@ -28,7 +28,7 @@ import ( const ( // typeStr is the value of "type" for this processor in the configuration. - typeStr config.Type = "groupbyattrs" + typeStr component.Type = "groupbyattrs" // The stability level of the processor. stability = component.StabilityLevelBeta ) @@ -55,9 +55,9 @@ func NewFactory() component.ProcessorFactory { } // createDefaultConfig creates the default configuration for the processor. -func createDefaultConfig() config.Processor { +func createDefaultConfig() component.ProcessorConfig { return &Config{ - ProcessorSettings: config.NewProcessorSettings(config.NewComponentID(typeStr)), + ProcessorSettings: config.NewProcessorSettings(component.NewID(typeStr)), GroupByKeys: []string{}, } } @@ -85,7 +85,7 @@ func createGroupByAttrsProcessor(logger *zap.Logger, attributes []string) *group func createTracesProcessor( ctx context.Context, set component.ProcessorCreateSettings, - cfg config.Processor, + cfg component.ProcessorConfig, nextConsumer consumer.Traces) (component.TracesProcessor, error) { oCfg := cfg.(*Config) @@ -104,7 +104,7 @@ func createTracesProcessor( func createLogsProcessor( ctx context.Context, set component.ProcessorCreateSettings, - cfg config.Processor, + cfg component.ProcessorConfig, nextConsumer consumer.Logs) (component.LogsProcessor, error) { oCfg := cfg.(*Config) @@ -123,7 +123,7 @@ func createLogsProcessor( func createMetricsProcessor( ctx context.Context, set component.ProcessorCreateSettings, - cfg config.Processor, + cfg component.ProcessorConfig, nextConsumer consumer.Metrics) (component.MetricsProcessor, error) { oCfg := cfg.(*Config) diff --git a/processor/groupbyattrsprocessor/factory_test.go b/processor/groupbyattrsprocessor/factory_test.go index 728119ec4b50..e9e9eb9abf18 100644 --- a/processor/groupbyattrsprocessor/factory_test.go +++ b/processor/groupbyattrsprocessor/factory_test.go @@ -19,6 +19,7 @@ import ( "testing" "github.com/stretchr/testify/assert" + "go.opentelemetry.io/collector/component" "go.opentelemetry.io/collector/component/componenttest" "go.opentelemetry.io/collector/config" "go.opentelemetry.io/collector/consumer/consumertest" @@ -32,7 +33,7 @@ func TestDefaultConfiguration(t *testing.T) { func TestCreateTestProcessor(t *testing.T) { cfg := &Config{ - ProcessorSettings: config.NewProcessorSettings(config.NewComponentID(typeStr)), + ProcessorSettings: config.NewProcessorSettings(component.NewID(typeStr)), GroupByKeys: []string{"foo"}, } diff --git a/processor/groupbyattrsprocessor/go.mod b/processor/groupbyattrsprocessor/go.mod index 3289564b416e..e1d96b3a7953 100644 --- a/processor/groupbyattrsprocessor/go.mod +++ b/processor/groupbyattrsprocessor/go.mod @@ -4,9 +4,9 @@ go 1.18 require ( github.com/stretchr/testify v1.8.1 - go.opencensus.io v0.23.0 - go.opentelemetry.io/collector v0.63.2-0.20221104003159-6b27644724d8 - go.opentelemetry.io/collector/pdata v0.63.2-0.20221104003159-6b27644724d8 + go.opencensus.io v0.24.0 + go.opentelemetry.io/collector v0.63.2-0.20221108014805-0b08d5316426 + go.opentelemetry.io/collector/pdata v0.63.2-0.20221108014805-0b08d5316426 go.uber.org/zap v1.23.0 ) diff --git a/processor/groupbyattrsprocessor/go.sum b/processor/groupbyattrsprocessor/go.sum index 9599123522de..51178ceaf3ac 100644 --- a/processor/groupbyattrsprocessor/go.sum +++ b/processor/groupbyattrsprocessor/go.sum @@ -233,7 +233,7 @@ github.com/prometheus/client_golang v0.9.1/go.mod h1:7SWBe2y4D6OKWSNQJUaRYU/AaXP github.com/prometheus/client_golang v1.0.0/go.mod h1:db9x61etRT2tGnBNRi70OPL5FsnadC4Ky3P0J6CfImo= github.com/prometheus/client_golang v1.7.1/go.mod h1:PY5Wy2awLA44sXw4AOSfFBetzPP4j5+D6mVACh+pe2M= github.com/prometheus/client_golang v1.11.1/go.mod h1:Z6t4BnS23TR94PD6BsDNk8yVqroYurpAkEiz0P2BEV0= -github.com/prometheus/client_golang v1.13.0 h1:b71QUfeo5M8gq2+evJdTPfZhYMAU0uKPkyPJ7TPsloU= +github.com/prometheus/client_golang v1.13.1 h1:3gMjIY2+/hzmqhtUC/aQNYldJA6DtH3CgQvwS+02K1c= github.com/prometheus/client_model v0.0.0-20180712105110-5c3871d89910/go.mod h1:MbSGuTsp3dbXC40dX6PRTWyKYBIrTGTE9sqQNg2J8bo= github.com/prometheus/client_model v0.0.0-20190129233127-fd36f4220a90/go.mod h1:xMI15A0UPsDsEKsMN9yxemIoYk6Tm2C1GtYGdfGttqA= github.com/prometheus/client_model v0.0.0-20190812154241-14fe0d1b01d4/go.mod h1:xMI15A0UPsDsEKsMN9yxemIoYk6Tm2C1GtYGdfGttqA= @@ -271,7 +271,6 @@ github.com/stretchr/testify v1.2.2/go.mod h1:a8OnRcib4nhh0OaRAV+Yts87kKdq0PP7pXf github.com/stretchr/testify v1.3.0/go.mod h1:M5WIy9Dh21IEIfnGCwXGc5bZfKNJtfHm1UVUgZn+9EI= github.com/stretchr/testify v1.4.0/go.mod h1:j7eGeouHqKxXV5pUuKE4zz7dFj8WfuZ+81PSLYec5m4= github.com/stretchr/testify v1.5.1/go.mod h1:5W2xD1RspED5o8YsWQXVCued0rvSQ+mT+I5cxcmMvtA= -github.com/stretchr/testify v1.6.1/go.mod h1:6Fq8oRcR53rry900zMqJjRRixrwX3KX962/h/Wwjteg= github.com/stretchr/testify v1.7.0/go.mod h1:6Fq8oRcR53rry900zMqJjRRixrwX3KX962/h/Wwjteg= github.com/stretchr/testify v1.7.1/go.mod h1:6Fq8oRcR53rry900zMqJjRRixrwX3KX962/h/Wwjteg= github.com/stretchr/testify v1.8.0/go.mod h1:yNjHg4UonilssWZ8iaSj1OCr/vHnekPRkoO+kdMU+MU= @@ -283,12 +282,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.opencensus.io v0.23.0 h1:gqCw0LfLxScz8irSi8exQc7fyQ0fKQU/qnC/X8+V/1M= -go.opencensus.io v0.23.0/go.mod h1:XItmlyltB5F7CS4xOC1DcqMoFqwtC6OG2xF7mCv7P7E= -go.opentelemetry.io/collector v0.63.2-0.20221104003159-6b27644724d8 h1:rOT5HzXXfSISc6FiH012zH2/EFjp37UXfjEqj5BpkWQ= -go.opentelemetry.io/collector v0.63.2-0.20221104003159-6b27644724d8/go.mod h1:JVmeZXugK4ondC6KQgrHTHWiF4JttpG5k6dWPMt62+k= -go.opentelemetry.io/collector/pdata v0.63.2-0.20221104003159-6b27644724d8 h1:7xeTQjfsOm9eogQeIxjSEhlik9qsbBGsnmkQHfyKaRE= -go.opentelemetry.io/collector/pdata v0.63.2-0.20221104003159-6b27644724d8/go.mod h1:IzvXUGQml2mrnvdb8zIlEW3qQs9oFLdD2hLwJdZ+pek= +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.63.2-0.20221108014805-0b08d5316426 h1:z/wLTMh7/vNxcFUDa5uG7/IPE3tYx6pzCWPV41ghyV8= +go.opentelemetry.io/collector v0.63.2-0.20221108014805-0b08d5316426/go.mod h1:+Zb70q0Rq17dA9FcHTiTjW6g96lvJ8kAZ0c+eWNkAv0= +go.opentelemetry.io/collector/pdata v0.63.2-0.20221108014805-0b08d5316426 h1:wKDpgP0Tx/gWI2SgDGAY1OTSeihhDivbbRqFR79IGTc= +go.opentelemetry.io/collector/pdata v0.63.2-0.20221108014805-0b08d5316426/go.mod h1:IzvXUGQml2mrnvdb8zIlEW3qQs9oFLdD2hLwJdZ+pek= 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/factory.go b/processor/groupbytraceprocessor/factory.go index c265a7a4e893..d8eb3ea388fa 100644 --- a/processor/groupbytraceprocessor/factory.go +++ b/processor/groupbytraceprocessor/factory.go @@ -27,7 +27,7 @@ import ( const ( // typeStr is the value of "type" for this processor in the configuration. - typeStr config.Type = "groupbytrace" + typeStr component.Type = "groupbytrace" // The stability level of the processor. stability = component.StabilityLevelBeta @@ -55,9 +55,9 @@ func NewFactory() component.ProcessorFactory { } // createDefaultConfig creates the default configuration for the processor. -func createDefaultConfig() config.Processor { +func createDefaultConfig() component.ProcessorConfig { return &Config{ - ProcessorSettings: config.NewProcessorSettings(config.NewComponentID(typeStr)), + ProcessorSettings: config.NewProcessorSettings(component.NewID(typeStr)), NumTraces: defaultNumTraces, NumWorkers: defaultNumWorkers, WaitDuration: defaultWaitDuration, @@ -72,7 +72,7 @@ func createDefaultConfig() config.Processor { func createTracesProcessor( _ context.Context, params component.ProcessorCreateSettings, - cfg config.Processor, + cfg component.ProcessorConfig, nextConsumer consumer.Traces) (component.TracesProcessor, error) { oCfg := cfg.(*Config) diff --git a/processor/groupbytraceprocessor/go.mod b/processor/groupbytraceprocessor/go.mod index fe192c42359a..9add65513c4b 100644 --- a/processor/groupbytraceprocessor/go.mod +++ b/processor/groupbytraceprocessor/go.mod @@ -5,9 +5,9 @@ go 1.18 require ( github.com/open-telemetry/opentelemetry-collector-contrib/pkg/batchpersignal v0.63.0 github.com/stretchr/testify v1.8.1 - go.opencensus.io v0.23.0 - go.opentelemetry.io/collector v0.63.2-0.20221104003159-6b27644724d8 - go.opentelemetry.io/collector/pdata v0.63.2-0.20221104003159-6b27644724d8 + go.opencensus.io v0.24.0 + go.opentelemetry.io/collector v0.63.2-0.20221108014805-0b08d5316426 + go.opentelemetry.io/collector/pdata v0.63.2-0.20221108014805-0b08d5316426 go.uber.org/atomic v1.10.0 go.uber.org/multierr v1.8.0 go.uber.org/zap v1.23.0 diff --git a/processor/groupbytraceprocessor/go.sum b/processor/groupbytraceprocessor/go.sum index 9599123522de..51178ceaf3ac 100644 --- a/processor/groupbytraceprocessor/go.sum +++ b/processor/groupbytraceprocessor/go.sum @@ -233,7 +233,7 @@ github.com/prometheus/client_golang v0.9.1/go.mod h1:7SWBe2y4D6OKWSNQJUaRYU/AaXP github.com/prometheus/client_golang v1.0.0/go.mod h1:db9x61etRT2tGnBNRi70OPL5FsnadC4Ky3P0J6CfImo= github.com/prometheus/client_golang v1.7.1/go.mod h1:PY5Wy2awLA44sXw4AOSfFBetzPP4j5+D6mVACh+pe2M= github.com/prometheus/client_golang v1.11.1/go.mod h1:Z6t4BnS23TR94PD6BsDNk8yVqroYurpAkEiz0P2BEV0= -github.com/prometheus/client_golang v1.13.0 h1:b71QUfeo5M8gq2+evJdTPfZhYMAU0uKPkyPJ7TPsloU= +github.com/prometheus/client_golang v1.13.1 h1:3gMjIY2+/hzmqhtUC/aQNYldJA6DtH3CgQvwS+02K1c= github.com/prometheus/client_model v0.0.0-20180712105110-5c3871d89910/go.mod h1:MbSGuTsp3dbXC40dX6PRTWyKYBIrTGTE9sqQNg2J8bo= github.com/prometheus/client_model v0.0.0-20190129233127-fd36f4220a90/go.mod h1:xMI15A0UPsDsEKsMN9yxemIoYk6Tm2C1GtYGdfGttqA= github.com/prometheus/client_model v0.0.0-20190812154241-14fe0d1b01d4/go.mod h1:xMI15A0UPsDsEKsMN9yxemIoYk6Tm2C1GtYGdfGttqA= @@ -271,7 +271,6 @@ github.com/stretchr/testify v1.2.2/go.mod h1:a8OnRcib4nhh0OaRAV+Yts87kKdq0PP7pXf github.com/stretchr/testify v1.3.0/go.mod h1:M5WIy9Dh21IEIfnGCwXGc5bZfKNJtfHm1UVUgZn+9EI= github.com/stretchr/testify v1.4.0/go.mod h1:j7eGeouHqKxXV5pUuKE4zz7dFj8WfuZ+81PSLYec5m4= github.com/stretchr/testify v1.5.1/go.mod h1:5W2xD1RspED5o8YsWQXVCued0rvSQ+mT+I5cxcmMvtA= -github.com/stretchr/testify v1.6.1/go.mod h1:6Fq8oRcR53rry900zMqJjRRixrwX3KX962/h/Wwjteg= github.com/stretchr/testify v1.7.0/go.mod h1:6Fq8oRcR53rry900zMqJjRRixrwX3KX962/h/Wwjteg= github.com/stretchr/testify v1.7.1/go.mod h1:6Fq8oRcR53rry900zMqJjRRixrwX3KX962/h/Wwjteg= github.com/stretchr/testify v1.8.0/go.mod h1:yNjHg4UonilssWZ8iaSj1OCr/vHnekPRkoO+kdMU+MU= @@ -283,12 +282,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.opencensus.io v0.23.0 h1:gqCw0LfLxScz8irSi8exQc7fyQ0fKQU/qnC/X8+V/1M= -go.opencensus.io v0.23.0/go.mod h1:XItmlyltB5F7CS4xOC1DcqMoFqwtC6OG2xF7mCv7P7E= -go.opentelemetry.io/collector v0.63.2-0.20221104003159-6b27644724d8 h1:rOT5HzXXfSISc6FiH012zH2/EFjp37UXfjEqj5BpkWQ= -go.opentelemetry.io/collector v0.63.2-0.20221104003159-6b27644724d8/go.mod h1:JVmeZXugK4ondC6KQgrHTHWiF4JttpG5k6dWPMt62+k= -go.opentelemetry.io/collector/pdata v0.63.2-0.20221104003159-6b27644724d8 h1:7xeTQjfsOm9eogQeIxjSEhlik9qsbBGsnmkQHfyKaRE= -go.opentelemetry.io/collector/pdata v0.63.2-0.20221104003159-6b27644724d8/go.mod h1:IzvXUGQml2mrnvdb8zIlEW3qQs9oFLdD2hLwJdZ+pek= +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.63.2-0.20221108014805-0b08d5316426 h1:z/wLTMh7/vNxcFUDa5uG7/IPE3tYx6pzCWPV41ghyV8= +go.opentelemetry.io/collector v0.63.2-0.20221108014805-0b08d5316426/go.mod h1:+Zb70q0Rq17dA9FcHTiTjW6g96lvJ8kAZ0c+eWNkAv0= +go.opentelemetry.io/collector/pdata v0.63.2-0.20221108014805-0b08d5316426 h1:wKDpgP0Tx/gWI2SgDGAY1OTSeihhDivbbRqFR79IGTc= +go.opentelemetry.io/collector/pdata v0.63.2-0.20221108014805-0b08d5316426/go.mod h1:IzvXUGQml2mrnvdb8zIlEW3qQs9oFLdD2hLwJdZ+pek= 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 3e7a0973ef1f..d689b3d3eae1 100644 --- a/processor/k8sattributesprocessor/config_test.go +++ b/processor/k8sattributesprocessor/config_test.go @@ -20,6 +20,7 @@ import ( "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" + "go.opentelemetry.io/collector/component" "go.opentelemetry.io/collector/config" "go.opentelemetry.io/collector/confmap/confmaptest" @@ -31,21 +32,21 @@ func TestLoadConfig(t *testing.T) { t.Parallel() tests := []struct { - id config.ComponentID - expected config.Processor + id component.ID + expected component.ProcessorConfig }{ { - id: config.NewComponentID(typeStr), + id: component.NewID(typeStr), expected: &Config{ - ProcessorSettings: config.NewProcessorSettings(config.NewComponentID(typeStr)), + ProcessorSettings: config.NewProcessorSettings(component.NewID(typeStr)), APIConfig: k8sconfig.APIConfig{AuthType: k8sconfig.AuthTypeServiceAccount}, Exclude: ExcludeConfig{Pods: []ExcludePodConfig{{Name: "jaeger-agent"}, {Name: "jaeger-collector"}}}, }, }, { - id: config.NewComponentIDWithName(typeStr, "2"), + id: component.NewIDWithName(typeStr, "2"), expected: &Config{ - ProcessorSettings: config.NewProcessorSettings(config.NewComponentID(typeStr)), + ProcessorSettings: config.NewProcessorSettings(component.NewID(typeStr)), APIConfig: k8sconfig.APIConfig{AuthType: k8sconfig.AuthTypeKubeConfig}, Passthrough: false, Extract: ExtractConfig{ @@ -120,9 +121,9 @@ func TestLoadConfig(t *testing.T) { }, }, { - id: config.NewComponentIDWithName(typeStr, "3"), + id: component.NewIDWithName(typeStr, "3"), expected: &Config{ - ProcessorSettings: config.NewProcessorSettings(config.NewComponentID(typeStr)), + ProcessorSettings: config.NewProcessorSettings(component.NewID(typeStr)), APIConfig: k8sconfig.APIConfig{AuthType: k8sconfig.AuthTypeKubeConfig}, Passthrough: false, Extract: ExtractConfig{ @@ -153,7 +154,7 @@ func TestLoadConfig(t *testing.T) { sub, err := cm.Sub(tt.id.String()) require.NoError(t, err) - require.NoError(t, config.UnmarshalProcessor(sub, cfg)) + require.NoError(t, component.UnmarshalProcessorConfig(sub, cfg)) assert.NoError(t, cfg.Validate()) assert.Equal(t, tt.expected, cfg) diff --git a/processor/k8sattributesprocessor/factory.go b/processor/k8sattributesprocessor/factory.go index c7063b6cc9d3..de4a5bc60e5c 100644 --- a/processor/k8sattributesprocessor/factory.go +++ b/processor/k8sattributesprocessor/factory.go @@ -51,9 +51,9 @@ func NewFactory() component.ProcessorFactory { ) } -func createDefaultConfig() config.Processor { +func createDefaultConfig() component.ProcessorConfig { return &Config{ - ProcessorSettings: config.NewProcessorSettings(config.NewComponentID(typeStr)), + ProcessorSettings: config.NewProcessorSettings(component.NewID(typeStr)), APIConfig: k8sconfig.APIConfig{AuthType: k8sconfig.AuthTypeServiceAccount}, Exclude: defaultExcludes, } @@ -62,7 +62,7 @@ func createDefaultConfig() config.Processor { func createTracesProcessor( ctx context.Context, params component.ProcessorCreateSettings, - cfg config.Processor, + cfg component.ProcessorConfig, next consumer.Traces, ) (component.TracesProcessor, error) { return createTracesProcessorWithOptions(ctx, params, cfg, next) @@ -71,7 +71,7 @@ func createTracesProcessor( func createLogsProcessor( ctx context.Context, params component.ProcessorCreateSettings, - cfg config.Processor, + cfg component.ProcessorConfig, nextLogsConsumer consumer.Logs, ) (component.LogsProcessor, error) { return createLogsProcessorWithOptions(ctx, params, cfg, nextLogsConsumer) @@ -80,7 +80,7 @@ func createLogsProcessor( func createMetricsProcessor( ctx context.Context, params component.ProcessorCreateSettings, - cfg config.Processor, + cfg component.ProcessorConfig, nextMetricsConsumer consumer.Metrics, ) (component.MetricsProcessor, error) { return createMetricsProcessorWithOptions(ctx, params, cfg, nextMetricsConsumer) @@ -89,7 +89,7 @@ func createMetricsProcessor( func createTracesProcessorWithOptions( ctx context.Context, set component.ProcessorCreateSettings, - cfg config.Processor, + cfg component.ProcessorConfig, next consumer.Traces, options ...option, ) (component.TracesProcessor, error) { @@ -112,7 +112,7 @@ func createTracesProcessorWithOptions( func createMetricsProcessorWithOptions( ctx context.Context, set component.ProcessorCreateSettings, - cfg config.Processor, + cfg component.ProcessorConfig, nextMetricsConsumer consumer.Metrics, options ...option, ) (component.MetricsProcessor, error) { @@ -135,7 +135,7 @@ func createMetricsProcessorWithOptions( func createLogsProcessorWithOptions( ctx context.Context, set component.ProcessorCreateSettings, - cfg config.Processor, + cfg component.ProcessorConfig, nextLogsConsumer consumer.Logs, options ...option, ) (component.LogsProcessor, error) { @@ -157,7 +157,7 @@ func createLogsProcessorWithOptions( func createKubernetesProcessor( params component.ProcessorCreateSettings, - cfg config.Processor, + cfg component.ProcessorConfig, options ...option, ) (*kubernetesprocessor, error) { kp := &kubernetesprocessor{logger: params.Logger} @@ -189,7 +189,7 @@ func createKubernetesProcessor( return kp, nil } -func createProcessorOpts(cfg config.Processor) []option { +func createProcessorOpts(cfg component.ProcessorConfig) []option { oCfg := cfg.(*Config) var opts []option if oCfg.Passthrough { @@ -215,7 +215,7 @@ func createProcessorOpts(cfg config.Processor) []option { return opts } -func warnDeprecatedMetadataConfig(logger *zap.Logger, cfg config.Processor) { +func warnDeprecatedMetadataConfig(logger *zap.Logger, cfg component.ProcessorConfig) { oCfg := cfg.(*Config) for _, field := range oCfg.Extract.Metadata { var oldName, newName string @@ -250,7 +250,7 @@ func warnDeprecatedMetadataConfig(logger *zap.Logger, cfg config.Processor) { } -func errWrongKeyConfig(cfg config.Processor) error { +func errWrongKeyConfig(cfg component.ProcessorConfig) error { oCfg := cfg.(*Config) for _, r := range append(oCfg.Extract.Labels, oCfg.Extract.Annotations...) { @@ -262,7 +262,7 @@ func errWrongKeyConfig(cfg config.Processor) error { return nil } -func warnDeprecatedPodAssociationConfig(logger *zap.Logger, cfg config.Processor) { +func warnDeprecatedPodAssociationConfig(logger *zap.Logger, cfg component.ProcessorConfig) { oCfg := cfg.(*Config) deprecated := "" actual := "" diff --git a/processor/k8sattributesprocessor/factory_test.go b/processor/k8sattributesprocessor/factory_test.go index bbe14ab59475..bb1d02a81782 100644 --- a/processor/k8sattributesprocessor/factory_test.go +++ b/processor/k8sattributesprocessor/factory_test.go @@ -20,7 +20,6 @@ import ( "github.com/stretchr/testify/assert" "go.opentelemetry.io/collector/component/componenttest" - "go.opentelemetry.io/collector/config/configtest" "go.opentelemetry.io/collector/consumer/consumertest" ) @@ -28,7 +27,7 @@ func TestCreateDefaultConfig(t *testing.T) { factory := NewFactory() cfg := factory.CreateDefaultConfig() assert.NotNil(t, cfg, "failed to create default config") - assert.NoError(t, configtest.CheckConfigStruct(cfg)) + assert.NoError(t, componenttest.CheckConfigStruct(cfg)) } func TestCreateProcessor(t *testing.T) { diff --git a/processor/k8sattributesprocessor/go.mod b/processor/k8sattributesprocessor/go.mod index e83f3e162ebd..26111d47d3b5 100644 --- a/processor/k8sattributesprocessor/go.mod +++ b/processor/k8sattributesprocessor/go.mod @@ -5,10 +5,10 @@ go 1.18 require ( github.com/open-telemetry/opentelemetry-collector-contrib/internal/k8sconfig v0.63.0 github.com/stretchr/testify v1.8.1 - go.opencensus.io v0.23.0 - go.opentelemetry.io/collector v0.63.2-0.20221104003159-6b27644724d8 - go.opentelemetry.io/collector/pdata v0.63.2-0.20221104003159-6b27644724d8 - go.opentelemetry.io/collector/semconv v0.63.2-0.20221104003159-6b27644724d8 + go.opencensus.io v0.24.0 + go.opentelemetry.io/collector v0.63.2-0.20221108014805-0b08d5316426 + go.opentelemetry.io/collector/pdata v0.63.2-0.20221108014805-0b08d5316426 + go.opentelemetry.io/collector/semconv v0.63.2-0.20221108014805-0b08d5316426 go.uber.org/zap v1.23.0 k8s.io/api v0.25.3 k8s.io/apimachinery v0.25.3 diff --git a/processor/k8sattributesprocessor/go.sum b/processor/k8sattributesprocessor/go.sum index 844b83df80fd..8dbd399dcbba 100644 --- a/processor/k8sattributesprocessor/go.sum +++ b/processor/k8sattributesprocessor/go.sum @@ -436,14 +436,14 @@ 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.opencensus.io v0.23.0 h1:gqCw0LfLxScz8irSi8exQc7fyQ0fKQU/qnC/X8+V/1M= -go.opencensus.io v0.23.0/go.mod h1:XItmlyltB5F7CS4xOC1DcqMoFqwtC6OG2xF7mCv7P7E= -go.opentelemetry.io/collector v0.63.2-0.20221104003159-6b27644724d8 h1:rOT5HzXXfSISc6FiH012zH2/EFjp37UXfjEqj5BpkWQ= -go.opentelemetry.io/collector v0.63.2-0.20221104003159-6b27644724d8/go.mod h1:JVmeZXugK4ondC6KQgrHTHWiF4JttpG5k6dWPMt62+k= -go.opentelemetry.io/collector/pdata v0.63.2-0.20221104003159-6b27644724d8 h1:7xeTQjfsOm9eogQeIxjSEhlik9qsbBGsnmkQHfyKaRE= -go.opentelemetry.io/collector/pdata v0.63.2-0.20221104003159-6b27644724d8/go.mod h1:IzvXUGQml2mrnvdb8zIlEW3qQs9oFLdD2hLwJdZ+pek= -go.opentelemetry.io/collector/semconv v0.63.2-0.20221104003159-6b27644724d8 h1:jm0sNPyqo6S165QjQYMBHB2nK50wlJbMYM03Yr3Eo2k= -go.opentelemetry.io/collector/semconv v0.63.2-0.20221104003159-6b27644724d8/go.mod h1:5o9yhOa+ABt7g2E5JABDxGZ1PQPbtfxrKNbYn+LOTXU= +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.63.2-0.20221108014805-0b08d5316426 h1:z/wLTMh7/vNxcFUDa5uG7/IPE3tYx6pzCWPV41ghyV8= +go.opentelemetry.io/collector v0.63.2-0.20221108014805-0b08d5316426/go.mod h1:+Zb70q0Rq17dA9FcHTiTjW6g96lvJ8kAZ0c+eWNkAv0= +go.opentelemetry.io/collector/pdata v0.63.2-0.20221108014805-0b08d5316426 h1:wKDpgP0Tx/gWI2SgDGAY1OTSeihhDivbbRqFR79IGTc= +go.opentelemetry.io/collector/pdata v0.63.2-0.20221108014805-0b08d5316426/go.mod h1:IzvXUGQml2mrnvdb8zIlEW3qQs9oFLdD2hLwJdZ+pek= +go.opentelemetry.io/collector/semconv v0.63.2-0.20221108014805-0b08d5316426 h1:pqIl7OC531J6i9ttBCj3zLmZI/BSF4q323YpK0GgKGk= +go.opentelemetry.io/collector/semconv v0.63.2-0.20221108014805-0b08d5316426/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/k8sattributesprocessor/processor_test.go b/processor/k8sattributesprocessor/processor_test.go index c5a2a6c243d0..b6ca49e076c2 100644 --- a/processor/k8sattributesprocessor/processor_test.go +++ b/processor/k8sattributesprocessor/processor_test.go @@ -26,7 +26,6 @@ import ( "go.opentelemetry.io/collector/client" "go.opentelemetry.io/collector/component" "go.opentelemetry.io/collector/component/componenttest" - "go.opentelemetry.io/collector/config" "go.opentelemetry.io/collector/consumer" "go.opentelemetry.io/collector/consumer/consumertest" "go.opentelemetry.io/collector/pdata/pcommon" @@ -52,7 +51,7 @@ func newPodIdentifier(from string, name string, value string) kube.PodIdentifier } } -func newTracesProcessor(cfg config.Processor, next consumer.Traces, options ...option) (component.TracesProcessor, error) { +func newTracesProcessor(cfg component.ProcessorConfig, next consumer.Traces, options ...option) (component.TracesProcessor, error) { opts := options opts = append(opts, withKubeClientProvider(newFakeClient)) return createTracesProcessorWithOptions( @@ -64,7 +63,7 @@ func newTracesProcessor(cfg config.Processor, next consumer.Traces, options ...o ) } -func newMetricsProcessor(cfg config.Processor, nextMetricsConsumer consumer.Metrics, options ...option) (component.MetricsProcessor, error) { +func newMetricsProcessor(cfg component.ProcessorConfig, nextMetricsConsumer consumer.Metrics, options ...option) (component.MetricsProcessor, error) { opts := options opts = append(opts, withKubeClientProvider(newFakeClient)) return createMetricsProcessorWithOptions( @@ -76,7 +75,7 @@ func newMetricsProcessor(cfg config.Processor, nextMetricsConsumer consumer.Metr ) } -func newLogsProcessor(cfg config.Processor, nextLogsConsumer consumer.Logs, options ...option) (component.LogsProcessor, error) { +func newLogsProcessor(cfg component.ProcessorConfig, nextLogsConsumer consumer.Logs, options ...option) (component.LogsProcessor, error) { opts := options opts = append(opts, withKubeClientProvider(newFakeClient)) return createLogsProcessorWithOptions( @@ -121,7 +120,7 @@ type multiTest struct { func newMultiTest( t *testing.T, - cfg config.Processor, + cfg component.ProcessorConfig, errFunc func(err error), options ...option, ) *multiTest { diff --git a/processor/logstransformprocessor/config.go b/processor/logstransformprocessor/config.go index 00cbe3376d11..182ffe4e643e 100644 --- a/processor/logstransformprocessor/config.go +++ b/processor/logstransformprocessor/config.go @@ -17,6 +17,7 @@ package logstransformprocessor // import "github.com/open-telemetry/opentelemetr import ( "errors" + "go.opentelemetry.io/collector/component" "go.opentelemetry.io/collector/config" "github.com/open-telemetry/opentelemetry-collector-contrib/pkg/stanza/adapter" @@ -28,7 +29,7 @@ type Config struct { adapter.BaseConfig `mapstructure:",squash"` } -var _ config.Processor = (*Config)(nil) +var _ component.ProcessorConfig = (*Config)(nil) // Validate checks if the processor configuration is valid func (cfg *Config) Validate() error { diff --git a/processor/logstransformprocessor/config_test.go b/processor/logstransformprocessor/config_test.go index 51a9ec76af14..b0320878c9dc 100644 --- a/processor/logstransformprocessor/config_test.go +++ b/processor/logstransformprocessor/config_test.go @@ -20,6 +20,7 @@ import ( "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" + "go.opentelemetry.io/collector/component" "go.opentelemetry.io/collector/config" "go.opentelemetry.io/collector/confmap/confmaptest" @@ -35,9 +36,9 @@ func TestLoadConfig(t *testing.T) { require.NoError(t, err) factory := NewFactory() cfg := factory.CreateDefaultConfig() - assert.NoError(t, config.UnmarshalProcessor(cm, cfg)) + assert.NoError(t, component.UnmarshalProcessorConfig(cm, cfg)) assert.Equal(t, &Config{ - ProcessorSettings: config.NewProcessorSettings(config.NewComponentID(typeStr)), + ProcessorSettings: config.NewProcessorSettings(component.NewID(typeStr)), BaseConfig: adapter.BaseConfig{ ReceiverSettings: config.ReceiverSettings{}, Operators: []operator.Config{ diff --git a/processor/logstransformprocessor/factory.go b/processor/logstransformprocessor/factory.go index f2c6b48fc94f..b0a36ceb6e16 100644 --- a/processor/logstransformprocessor/factory.go +++ b/processor/logstransformprocessor/factory.go @@ -45,9 +45,9 @@ func NewFactory() component.ProcessorFactory { } // Note: This isn't a valid configuration because the processor would do no work. -func createDefaultConfig() config.Processor { +func createDefaultConfig() component.ProcessorConfig { return &Config{ - ProcessorSettings: config.NewProcessorSettings(config.NewComponentID(typeStr)), + ProcessorSettings: config.NewProcessorSettings(component.NewID(typeStr)), BaseConfig: adapter.BaseConfig{ Operators: []operator.Config{}, }, @@ -57,7 +57,7 @@ func createDefaultConfig() config.Processor { func createLogsProcessor( ctx context.Context, set component.ProcessorCreateSettings, - cfg config.Processor, + cfg component.ProcessorConfig, nextConsumer consumer.Logs) (component.LogsProcessor, error) { pCfg, ok := cfg.(*Config) if !ok { diff --git a/processor/logstransformprocessor/factory_test.go b/processor/logstransformprocessor/factory_test.go index 6fe87b8cc6bc..a777f3a8a398 100644 --- a/processor/logstransformprocessor/factory_test.go +++ b/processor/logstransformprocessor/factory_test.go @@ -19,9 +19,9 @@ import ( "testing" "github.com/stretchr/testify/assert" + "go.opentelemetry.io/collector/component" "go.opentelemetry.io/collector/component/componenttest" "go.opentelemetry.io/collector/config" - "go.opentelemetry.io/collector/config/configtest" "go.opentelemetry.io/collector/consumer/consumertest" "github.com/open-telemetry/opentelemetry-collector-contrib/pkg/stanza/adapter" @@ -34,14 +34,14 @@ import ( func TestCreateDefaultConfig(t *testing.T) { factory := NewFactory() cfg := factory.CreateDefaultConfig() - assert.NoError(t, configtest.CheckConfigStruct(cfg)) + assert.NoError(t, componenttest.CheckConfigStruct(cfg)) assert.NotNil(t, cfg) } func TestCreateProcessor(t *testing.T) { factory := NewFactory() cfg := &Config{ - ProcessorSettings: config.NewProcessorSettings(config.NewComponentID(typeStr)), + ProcessorSettings: config.NewProcessorSettings(component.NewID(typeStr)), BaseConfig: adapter.BaseConfig{ Operators: []operator.Config{ { @@ -72,7 +72,7 @@ func TestCreateProcessor(t *testing.T) { func TestInvalidOperators(t *testing.T) { factory := NewFactory() cfg := &Config{ - ProcessorSettings: config.NewProcessorSettings(config.NewComponentID(typeStr)), + ProcessorSettings: config.NewProcessorSettings(component.NewID(typeStr)), BaseConfig: adapter.BaseConfig{ Operators: []operator.Config{ { diff --git a/processor/logstransformprocessor/go.mod b/processor/logstransformprocessor/go.mod index 801099e79b0c..a442bca795ea 100644 --- a/processor/logstransformprocessor/go.mod +++ b/processor/logstransformprocessor/go.mod @@ -6,8 +6,8 @@ require ( github.com/open-telemetry/opentelemetry-collector-contrib/internal/coreinternal v0.63.0 github.com/open-telemetry/opentelemetry-collector-contrib/pkg/stanza v0.63.0 github.com/stretchr/testify v1.8.1 - go.opentelemetry.io/collector v0.63.2-0.20221104003159-6b27644724d8 - go.opentelemetry.io/collector/pdata v0.63.2-0.20221104003159-6b27644724d8 + go.opentelemetry.io/collector v0.63.2-0.20221108014805-0b08d5316426 + go.opentelemetry.io/collector/pdata v0.63.2-0.20221108014805-0b08d5316426 go.uber.org/zap v1.23.0 ) @@ -27,7 +27,7 @@ require ( github.com/observiq/ctimefmt v1.0.0 // indirect github.com/pmezard/go-difflib v1.0.0 // indirect github.com/rogpeppe/go-internal v1.8.1 // indirect - go.opencensus.io v0.23.0 // indirect + go.opencensus.io v0.24.0 // 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 338adaefd19a..bd8873ec99b8 100644 --- a/processor/logstransformprocessor/go.sum +++ b/processor/logstransformprocessor/go.sum @@ -239,7 +239,7 @@ github.com/prometheus/client_golang v0.9.1/go.mod h1:7SWBe2y4D6OKWSNQJUaRYU/AaXP github.com/prometheus/client_golang v1.0.0/go.mod h1:db9x61etRT2tGnBNRi70OPL5FsnadC4Ky3P0J6CfImo= github.com/prometheus/client_golang v1.7.1/go.mod h1:PY5Wy2awLA44sXw4AOSfFBetzPP4j5+D6mVACh+pe2M= github.com/prometheus/client_golang v1.11.1/go.mod h1:Z6t4BnS23TR94PD6BsDNk8yVqroYurpAkEiz0P2BEV0= -github.com/prometheus/client_golang v1.13.0 h1:b71QUfeo5M8gq2+evJdTPfZhYMAU0uKPkyPJ7TPsloU= +github.com/prometheus/client_golang v1.13.1 h1:3gMjIY2+/hzmqhtUC/aQNYldJA6DtH3CgQvwS+02K1c= github.com/prometheus/client_model v0.0.0-20180712105110-5c3871d89910/go.mod h1:MbSGuTsp3dbXC40dX6PRTWyKYBIrTGTE9sqQNg2J8bo= github.com/prometheus/client_model v0.0.0-20190129233127-fd36f4220a90/go.mod h1:xMI15A0UPsDsEKsMN9yxemIoYk6Tm2C1GtYGdfGttqA= github.com/prometheus/client_model v0.0.0-20190812154241-14fe0d1b01d4/go.mod h1:xMI15A0UPsDsEKsMN9yxemIoYk6Tm2C1GtYGdfGttqA= @@ -282,7 +282,6 @@ github.com/stretchr/testify v1.2.2/go.mod h1:a8OnRcib4nhh0OaRAV+Yts87kKdq0PP7pXf github.com/stretchr/testify v1.3.0/go.mod h1:M5WIy9Dh21IEIfnGCwXGc5bZfKNJtfHm1UVUgZn+9EI= github.com/stretchr/testify v1.4.0/go.mod h1:j7eGeouHqKxXV5pUuKE4zz7dFj8WfuZ+81PSLYec5m4= github.com/stretchr/testify v1.5.1/go.mod h1:5W2xD1RspED5o8YsWQXVCued0rvSQ+mT+I5cxcmMvtA= -github.com/stretchr/testify v1.6.1/go.mod h1:6Fq8oRcR53rry900zMqJjRRixrwX3KX962/h/Wwjteg= github.com/stretchr/testify v1.7.0/go.mod h1:6Fq8oRcR53rry900zMqJjRRixrwX3KX962/h/Wwjteg= github.com/stretchr/testify v1.7.1/go.mod h1:6Fq8oRcR53rry900zMqJjRRixrwX3KX962/h/Wwjteg= github.com/stretchr/testify v1.8.0/go.mod h1:yNjHg4UonilssWZ8iaSj1OCr/vHnekPRkoO+kdMU+MU= @@ -294,12 +293,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.opencensus.io v0.23.0 h1:gqCw0LfLxScz8irSi8exQc7fyQ0fKQU/qnC/X8+V/1M= -go.opencensus.io v0.23.0/go.mod h1:XItmlyltB5F7CS4xOC1DcqMoFqwtC6OG2xF7mCv7P7E= -go.opentelemetry.io/collector v0.63.2-0.20221104003159-6b27644724d8 h1:rOT5HzXXfSISc6FiH012zH2/EFjp37UXfjEqj5BpkWQ= -go.opentelemetry.io/collector v0.63.2-0.20221104003159-6b27644724d8/go.mod h1:JVmeZXugK4ondC6KQgrHTHWiF4JttpG5k6dWPMt62+k= -go.opentelemetry.io/collector/pdata v0.63.2-0.20221104003159-6b27644724d8 h1:7xeTQjfsOm9eogQeIxjSEhlik9qsbBGsnmkQHfyKaRE= -go.opentelemetry.io/collector/pdata v0.63.2-0.20221104003159-6b27644724d8/go.mod h1:IzvXUGQml2mrnvdb8zIlEW3qQs9oFLdD2hLwJdZ+pek= +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.63.2-0.20221108014805-0b08d5316426 h1:z/wLTMh7/vNxcFUDa5uG7/IPE3tYx6pzCWPV41ghyV8= +go.opentelemetry.io/collector v0.63.2-0.20221108014805-0b08d5316426/go.mod h1:+Zb70q0Rq17dA9FcHTiTjW6g96lvJ8kAZ0c+eWNkAv0= +go.opentelemetry.io/collector/pdata v0.63.2-0.20221108014805-0b08d5316426 h1:wKDpgP0Tx/gWI2SgDGAY1OTSeihhDivbbRqFR79IGTc= +go.opentelemetry.io/collector/pdata v0.63.2-0.20221108014805-0b08d5316426/go.mod h1:IzvXUGQml2mrnvdb8zIlEW3qQs9oFLdD2hLwJdZ+pek= 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/logstransformprocessor/processor.go b/processor/logstransformprocessor/processor.go index 36f7db2ec257..a616fa2f0deb 100644 --- a/processor/logstransformprocessor/processor.go +++ b/processor/logstransformprocessor/processor.go @@ -23,7 +23,6 @@ import ( "sync" "go.opentelemetry.io/collector/component" - "go.opentelemetry.io/collector/config" "go.opentelemetry.io/collector/extension/experimental/storage" "go.opentelemetry.io/collector/pdata/plog" "go.uber.org/zap" @@ -41,7 +40,7 @@ type outputType struct { type logsTransformProcessor struct { logger *zap.Logger config *Config - id config.ComponentID + id component.ID pipe *pipeline.DirectedPipeline firstOperator operator.Operator diff --git a/processor/logstransformprocessor/processor_test.go b/processor/logstransformprocessor/processor_test.go index 35517d8e2042..4d14ca459ca4 100644 --- a/processor/logstransformprocessor/processor_test.go +++ b/processor/logstransformprocessor/processor_test.go @@ -21,6 +21,7 @@ import ( "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" + "go.opentelemetry.io/collector/component" "go.opentelemetry.io/collector/component/componenttest" "go.opentelemetry.io/collector/config" "go.opentelemetry.io/collector/consumer/consumertest" @@ -37,7 +38,7 @@ import ( var ( cfg = &Config{ - ProcessorSettings: config.NewProcessorSettings(config.NewComponentID(typeStr)), + ProcessorSettings: config.NewProcessorSettings(component.NewID(typeStr)), BaseConfig: adapter.BaseConfig{ Operators: []operator.Config{ { diff --git a/processor/metricsgenerationprocessor/config_test.go b/processor/metricsgenerationprocessor/config_test.go index a8b3eb14462c..89a4eb020ce9 100644 --- a/processor/metricsgenerationprocessor/config_test.go +++ b/processor/metricsgenerationprocessor/config_test.go @@ -21,6 +21,7 @@ import ( "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" + "go.opentelemetry.io/collector/component" "go.opentelemetry.io/collector/config" "go.opentelemetry.io/collector/confmap/confmaptest" ) @@ -29,14 +30,14 @@ func TestLoadConfig(t *testing.T) { t.Parallel() tests := []struct { - id config.ComponentID - expected config.Processor + id component.ID + expected component.ProcessorConfig errorMessage string }{ { - id: config.NewComponentIDWithName(typeStr, ""), + id: component.NewIDWithName(typeStr, ""), expected: &Config{ - ProcessorSettings: config.NewProcessorSettings(config.NewComponentID(typeStr)), + ProcessorSettings: config.NewProcessorSettings(component.NewID(typeStr)), Rules: []Rule{ { Name: "new_metric", @@ -58,31 +59,31 @@ func TestLoadConfig(t *testing.T) { }, }, { - id: config.NewComponentIDWithName(typeStr, "missing_new_metric"), + id: component.NewIDWithName(typeStr, "missing_new_metric"), errorMessage: fmt.Sprintf("missing required field %q", nameFieldName), }, { - id: config.NewComponentIDWithName(typeStr, "missing_type"), + id: component.NewIDWithName(typeStr, "missing_type"), errorMessage: fmt.Sprintf("missing required field %q", typeFieldName), }, { - id: config.NewComponentIDWithName(typeStr, "invalid_generation_type"), + id: component.NewIDWithName(typeStr, "invalid_generation_type"), errorMessage: fmt.Sprintf("%q must be in %q", typeFieldName, generationTypeKeys()), }, { - id: config.NewComponentIDWithName(typeStr, "missing_operand1"), + id: component.NewIDWithName(typeStr, "missing_operand1"), errorMessage: fmt.Sprintf("missing required field %q", metric1FieldName), }, { - id: config.NewComponentIDWithName(typeStr, "missing_operand2"), + id: component.NewIDWithName(typeStr, "missing_operand2"), errorMessage: fmt.Sprintf("missing required field %q for generation type %q", metric2FieldName, calculate), }, { - id: config.NewComponentIDWithName(typeStr, "missing_scale_by"), + id: component.NewIDWithName(typeStr, "missing_scale_by"), errorMessage: fmt.Sprintf("field %q required to be greater than 0 for generation type %q", scaleByFieldName, scale), }, { - id: config.NewComponentIDWithName(typeStr, "invalid_operation"), + id: component.NewIDWithName(typeStr, "invalid_operation"), errorMessage: fmt.Sprintf("%q must be in %q", operationFieldName, operationTypeKeys()), }, } @@ -96,7 +97,7 @@ func TestLoadConfig(t *testing.T) { cfg := factory.CreateDefaultConfig() sub, err := cm.Sub(tt.id.String()) require.NoError(t, err) - require.NoError(t, config.UnmarshalProcessor(sub, cfg)) + require.NoError(t, component.UnmarshalProcessorConfig(sub, cfg)) if tt.expected == nil { assert.EqualError(t, cfg.Validate(), tt.errorMessage) diff --git a/processor/metricsgenerationprocessor/factory.go b/processor/metricsgenerationprocessor/factory.go index b6272ce6ccf0..e8139b796b2a 100644 --- a/processor/metricsgenerationprocessor/factory.go +++ b/processor/metricsgenerationprocessor/factory.go @@ -41,16 +41,16 @@ func NewFactory() component.ProcessorFactory { component.WithMetricsProcessor(createMetricsProcessor, stability)) } -func createDefaultConfig() config.Processor { +func createDefaultConfig() component.ProcessorConfig { return &Config{ - ProcessorSettings: config.NewProcessorSettings(config.NewComponentID(typeStr)), + ProcessorSettings: config.NewProcessorSettings(component.NewID(typeStr)), } } func createMetricsProcessor( ctx context.Context, set component.ProcessorCreateSettings, - cfg config.Processor, + cfg component.ProcessorConfig, nextConsumer consumer.Metrics, ) (component.MetricsProcessor, error) { processorConfig, ok := cfg.(*Config) diff --git a/processor/metricsgenerationprocessor/factory_test.go b/processor/metricsgenerationprocessor/factory_test.go index 9c5f20cf86ea..f7bbd641de1e 100644 --- a/processor/metricsgenerationprocessor/factory_test.go +++ b/processor/metricsgenerationprocessor/factory_test.go @@ -21,9 +21,9 @@ import ( "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" + "go.opentelemetry.io/collector/component" "go.opentelemetry.io/collector/component/componenttest" "go.opentelemetry.io/collector/config" - "go.opentelemetry.io/collector/config/configtest" "go.opentelemetry.io/collector/confmap/confmaptest" "go.opentelemetry.io/collector/consumer/consumertest" ) @@ -31,16 +31,16 @@ import ( func TestType(t *testing.T) { factory := NewFactory() pType := factory.Type() - assert.Equal(t, pType, config.Type("experimental_metricsgeneration")) + assert.Equal(t, pType, component.Type("experimental_metricsgeneration")) } func TestCreateDefaultConfig(t *testing.T) { factory := NewFactory() cfg := factory.CreateDefaultConfig() assert.Equal(t, cfg, &Config{ - ProcessorSettings: config.NewProcessorSettings(config.NewComponentID(typeStr)), + ProcessorSettings: config.NewProcessorSettings(component.NewID(typeStr)), }) - assert.NoError(t, configtest.CheckConfigStruct(cfg)) + assert.NoError(t, componenttest.CheckConfigStruct(cfg)) } func TestCreateProcessors(t *testing.T) { @@ -58,7 +58,7 @@ func TestCreateProcessors(t *testing.T) { sub, err := cm.Sub(k) require.NoError(t, err) - require.NoError(t, config.UnmarshalProcessor(sub, cfg)) + require.NoError(t, component.UnmarshalProcessorConfig(sub, cfg)) tp, tErr := factory.CreateTracesProcessor( context.Background(), diff --git a/processor/metricsgenerationprocessor/go.mod b/processor/metricsgenerationprocessor/go.mod index 66b015e900fa..f55281c30533 100644 --- a/processor/metricsgenerationprocessor/go.mod +++ b/processor/metricsgenerationprocessor/go.mod @@ -4,8 +4,8 @@ go 1.18 require ( github.com/stretchr/testify v1.8.1 - go.opentelemetry.io/collector v0.63.2-0.20221104003159-6b27644724d8 - go.opentelemetry.io/collector/pdata v0.63.2-0.20221104003159-6b27644724d8 + go.opentelemetry.io/collector v0.63.2-0.20221108014805-0b08d5316426 + go.opentelemetry.io/collector/pdata v0.63.2-0.20221108014805-0b08d5316426 go.uber.org/zap v1.23.0 ) @@ -25,7 +25,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.opencensus.io v0.23.0 // indirect + go.opencensus.io v0.24.0 // 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 bb7fd0bf3a89..bb05dc8e1712 100644 --- a/processor/metricsgenerationprocessor/go.sum +++ b/processor/metricsgenerationprocessor/go.sum @@ -257,7 +257,6 @@ github.com/stretchr/testify v1.2.2/go.mod h1:a8OnRcib4nhh0OaRAV+Yts87kKdq0PP7pXf github.com/stretchr/testify v1.3.0/go.mod h1:M5WIy9Dh21IEIfnGCwXGc5bZfKNJtfHm1UVUgZn+9EI= github.com/stretchr/testify v1.4.0/go.mod h1:j7eGeouHqKxXV5pUuKE4zz7dFj8WfuZ+81PSLYec5m4= github.com/stretchr/testify v1.5.1/go.mod h1:5W2xD1RspED5o8YsWQXVCued0rvSQ+mT+I5cxcmMvtA= -github.com/stretchr/testify v1.6.1/go.mod h1:6Fq8oRcR53rry900zMqJjRRixrwX3KX962/h/Wwjteg= github.com/stretchr/testify v1.7.0/go.mod h1:6Fq8oRcR53rry900zMqJjRRixrwX3KX962/h/Wwjteg= github.com/stretchr/testify v1.7.1/go.mod h1:6Fq8oRcR53rry900zMqJjRRixrwX3KX962/h/Wwjteg= github.com/stretchr/testify v1.8.0/go.mod h1:yNjHg4UonilssWZ8iaSj1OCr/vHnekPRkoO+kdMU+MU= @@ -269,12 +268,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.opencensus.io v0.23.0 h1:gqCw0LfLxScz8irSi8exQc7fyQ0fKQU/qnC/X8+V/1M= -go.opencensus.io v0.23.0/go.mod h1:XItmlyltB5F7CS4xOC1DcqMoFqwtC6OG2xF7mCv7P7E= -go.opentelemetry.io/collector v0.63.2-0.20221104003159-6b27644724d8 h1:rOT5HzXXfSISc6FiH012zH2/EFjp37UXfjEqj5BpkWQ= -go.opentelemetry.io/collector v0.63.2-0.20221104003159-6b27644724d8/go.mod h1:JVmeZXugK4ondC6KQgrHTHWiF4JttpG5k6dWPMt62+k= -go.opentelemetry.io/collector/pdata v0.63.2-0.20221104003159-6b27644724d8 h1:7xeTQjfsOm9eogQeIxjSEhlik9qsbBGsnmkQHfyKaRE= -go.opentelemetry.io/collector/pdata v0.63.2-0.20221104003159-6b27644724d8/go.mod h1:IzvXUGQml2mrnvdb8zIlEW3qQs9oFLdD2hLwJdZ+pek= +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.63.2-0.20221108014805-0b08d5316426 h1:z/wLTMh7/vNxcFUDa5uG7/IPE3tYx6pzCWPV41ghyV8= +go.opentelemetry.io/collector v0.63.2-0.20221108014805-0b08d5316426/go.mod h1:+Zb70q0Rq17dA9FcHTiTjW6g96lvJ8kAZ0c+eWNkAv0= +go.opentelemetry.io/collector/pdata v0.63.2-0.20221108014805-0b08d5316426 h1:wKDpgP0Tx/gWI2SgDGAY1OTSeihhDivbbRqFR79IGTc= +go.opentelemetry.io/collector/pdata v0.63.2-0.20221108014805-0b08d5316426/go.mod h1:IzvXUGQml2mrnvdb8zIlEW3qQs9oFLdD2hLwJdZ+pek= 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/metricsgenerationprocessor/processor_test.go b/processor/metricsgenerationprocessor/processor_test.go index b710dd8dd94c..a4ed2aa8baa3 100644 --- a/processor/metricsgenerationprocessor/processor_test.go +++ b/processor/metricsgenerationprocessor/processor_test.go @@ -21,6 +21,7 @@ import ( "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" + "go.opentelemetry.io/collector/component" "go.opentelemetry.io/collector/component/componenttest" "go.opentelemetry.io/collector/config" "go.opentelemetry.io/collector/consumer/consumertest" @@ -283,7 +284,7 @@ func TestMetricsGenerationProcessor(t *testing.T) { // next stores the results of the filter metric processor next := new(consumertest.MetricsSink) cfg := &Config{ - ProcessorSettings: config.NewProcessorSettings(config.NewComponentID(typeStr)), + ProcessorSettings: config.NewProcessorSettings(component.NewID(typeStr)), Rules: test.rules, } factory := NewFactory() diff --git a/processor/metricstransformprocessor/config_test.go b/processor/metricstransformprocessor/config_test.go index 6f3dc29d113d..38f41f378fdc 100644 --- a/processor/metricstransformprocessor/config_test.go +++ b/processor/metricstransformprocessor/config_test.go @@ -20,6 +20,7 @@ import ( "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" + "go.opentelemetry.io/collector/component" "go.opentelemetry.io/collector/config" "go.opentelemetry.io/collector/confmap/confmaptest" ) @@ -27,14 +28,14 @@ import ( func TestLoadConfig(t *testing.T) { tests := []struct { configFile string - id config.ComponentID - expected config.Processor + id component.ID + expected component.ProcessorConfig }{ { configFile: "config_full.yaml", - id: config.NewComponentID(typeStr), + id: component.NewID(typeStr), expected: &Config{ - ProcessorSettings: config.NewProcessorSettings(config.NewComponentID(typeStr)), + ProcessorSettings: config.NewProcessorSettings(component.NewID(typeStr)), Transforms: []Transform{ { MetricIncludeFilter: FilterConfig{ @@ -49,9 +50,9 @@ func TestLoadConfig(t *testing.T) { }, { configFile: "config_full.yaml", - id: config.NewComponentIDWithName(typeStr, "multiple"), + id: component.NewIDWithName(typeStr, "multiple"), expected: &Config{ - ProcessorSettings: config.NewProcessorSettings(config.NewComponentID(typeStr)), + ProcessorSettings: config.NewProcessorSettings(component.NewID(typeStr)), Transforms: []Transform{ { MetricIncludeFilter: FilterConfig{ @@ -165,7 +166,7 @@ func TestLoadConfig(t *testing.T) { sub, err := cm.Sub(tt.id.String()) require.NoError(t, err) - require.NoError(t, config.UnmarshalProcessor(sub, cfg)) + require.NoError(t, component.UnmarshalProcessorConfig(sub, cfg)) assert.NoError(t, cfg.Validate()) assert.Equal(t, tt.expected, cfg) diff --git a/processor/metricstransformprocessor/factory.go b/processor/metricstransformprocessor/factory.go index 5b80170b48b6..7811efd9d0c3 100644 --- a/processor/metricstransformprocessor/factory.go +++ b/processor/metricstransformprocessor/factory.go @@ -43,16 +43,16 @@ func NewFactory() component.ProcessorFactory { component.WithMetricsProcessor(createMetricsProcessor, stability)) } -func createDefaultConfig() config.Processor { +func createDefaultConfig() component.ProcessorConfig { return &Config{ - ProcessorSettings: config.NewProcessorSettings(config.NewComponentID(typeStr)), + ProcessorSettings: config.NewProcessorSettings(component.NewID(typeStr)), } } func createMetricsProcessor( ctx context.Context, set component.ProcessorCreateSettings, - cfg config.Processor, + cfg component.ProcessorConfig, nextConsumer consumer.Metrics, ) (component.MetricsProcessor, error) { oCfg := cfg.(*Config) diff --git a/processor/metricstransformprocessor/factory_test.go b/processor/metricstransformprocessor/factory_test.go index 2551a7a4d3db..28f620e404d2 100644 --- a/processor/metricstransformprocessor/factory_test.go +++ b/processor/metricstransformprocessor/factory_test.go @@ -23,9 +23,9 @@ import ( "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" + "go.opentelemetry.io/collector/component" "go.opentelemetry.io/collector/component/componenttest" "go.opentelemetry.io/collector/config" - "go.opentelemetry.io/collector/config/configtest" "go.opentelemetry.io/collector/confmap/confmaptest" "go.opentelemetry.io/collector/consumer/consumertest" ) @@ -33,16 +33,16 @@ import ( func TestType(t *testing.T) { factory := NewFactory() pType := factory.Type() - assert.Equal(t, pType, config.Type("metricstransform")) + assert.Equal(t, pType, component.Type("metricstransform")) } func TestCreateDefaultConfig(t *testing.T) { factory := NewFactory() cfg := factory.CreateDefaultConfig() assert.Equal(t, cfg, &Config{ - ProcessorSettings: config.NewProcessorSettings(config.NewComponentID(typeStr)), + ProcessorSettings: config.NewProcessorSettings(component.NewID(typeStr)), }) - assert.NoError(t, configtest.CheckConfigStruct(cfg)) + assert.NoError(t, componenttest.CheckConfigStruct(cfg)) } func TestCreateProcessors(t *testing.T) { @@ -131,7 +131,7 @@ func TestCreateProcessors(t *testing.T) { sub, err := cm.Sub(k) require.NoError(t, err) - require.NoError(t, config.UnmarshalProcessor(sub, cfg)) + require.NoError(t, component.UnmarshalProcessorConfig(sub, cfg)) tp, tErr := factory.CreateTracesProcessor( context.Background(), diff --git a/processor/metricstransformprocessor/go.mod b/processor/metricstransformprocessor/go.mod index b310cd5b2b3c..60e98e14681d 100644 --- a/processor/metricstransformprocessor/go.mod +++ b/processor/metricstransformprocessor/go.mod @@ -5,8 +5,8 @@ go 1.18 require ( github.com/open-telemetry/opentelemetry-collector-contrib/internal/scrapertest v0.63.0 github.com/stretchr/testify v1.8.1 - go.opentelemetry.io/collector v0.63.2-0.20221104003159-6b27644724d8 - go.opentelemetry.io/collector/pdata v0.63.2-0.20221104003159-6b27644724d8 + go.opentelemetry.io/collector v0.63.2-0.20221108014805-0b08d5316426 + go.opentelemetry.io/collector/pdata v0.63.2-0.20221108014805-0b08d5316426 go.uber.org/zap v1.23.0 ) @@ -27,7 +27,7 @@ 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.1 // indirect - go.opencensus.io v0.23.0 // indirect + go.opencensus.io v0.24.0 // 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 d820b9a0f56c..b283bad31485 100644 --- a/processor/metricstransformprocessor/go.sum +++ b/processor/metricstransformprocessor/go.sum @@ -251,7 +251,6 @@ github.com/stretchr/testify v1.2.2/go.mod h1:a8OnRcib4nhh0OaRAV+Yts87kKdq0PP7pXf github.com/stretchr/testify v1.3.0/go.mod h1:M5WIy9Dh21IEIfnGCwXGc5bZfKNJtfHm1UVUgZn+9EI= github.com/stretchr/testify v1.4.0/go.mod h1:j7eGeouHqKxXV5pUuKE4zz7dFj8WfuZ+81PSLYec5m4= github.com/stretchr/testify v1.5.1/go.mod h1:5W2xD1RspED5o8YsWQXVCued0rvSQ+mT+I5cxcmMvtA= -github.com/stretchr/testify v1.6.1/go.mod h1:6Fq8oRcR53rry900zMqJjRRixrwX3KX962/h/Wwjteg= github.com/stretchr/testify v1.7.0/go.mod h1:6Fq8oRcR53rry900zMqJjRRixrwX3KX962/h/Wwjteg= github.com/stretchr/testify v1.7.1/go.mod h1:6Fq8oRcR53rry900zMqJjRRixrwX3KX962/h/Wwjteg= github.com/stretchr/testify v1.8.0/go.mod h1:yNjHg4UonilssWZ8iaSj1OCr/vHnekPRkoO+kdMU+MU= @@ -263,12 +262,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.opencensus.io v0.23.0 h1:gqCw0LfLxScz8irSi8exQc7fyQ0fKQU/qnC/X8+V/1M= -go.opencensus.io v0.23.0/go.mod h1:XItmlyltB5F7CS4xOC1DcqMoFqwtC6OG2xF7mCv7P7E= -go.opentelemetry.io/collector v0.63.2-0.20221104003159-6b27644724d8 h1:rOT5HzXXfSISc6FiH012zH2/EFjp37UXfjEqj5BpkWQ= -go.opentelemetry.io/collector v0.63.2-0.20221104003159-6b27644724d8/go.mod h1:JVmeZXugK4ondC6KQgrHTHWiF4JttpG5k6dWPMt62+k= -go.opentelemetry.io/collector/pdata v0.63.2-0.20221104003159-6b27644724d8 h1:7xeTQjfsOm9eogQeIxjSEhlik9qsbBGsnmkQHfyKaRE= -go.opentelemetry.io/collector/pdata v0.63.2-0.20221104003159-6b27644724d8/go.mod h1:IzvXUGQml2mrnvdb8zIlEW3qQs9oFLdD2hLwJdZ+pek= +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.63.2-0.20221108014805-0b08d5316426 h1:z/wLTMh7/vNxcFUDa5uG7/IPE3tYx6pzCWPV41ghyV8= +go.opentelemetry.io/collector v0.63.2-0.20221108014805-0b08d5316426/go.mod h1:+Zb70q0Rq17dA9FcHTiTjW6g96lvJ8kAZ0c+eWNkAv0= +go.opentelemetry.io/collector/pdata v0.63.2-0.20221108014805-0b08d5316426 h1:wKDpgP0Tx/gWI2SgDGAY1OTSeihhDivbbRqFR79IGTc= +go.opentelemetry.io/collector/pdata v0.63.2-0.20221108014805-0b08d5316426/go.mod h1:IzvXUGQml2mrnvdb8zIlEW3qQs9oFLdD2hLwJdZ+pek= 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/metrics_transform_processor_group_test.go b/processor/metricstransformprocessor/metrics_transform_processor_group_test.go index 618ac9c5526b..79c2a78ee596 100644 --- a/processor/metricstransformprocessor/metrics_transform_processor_group_test.go +++ b/processor/metricstransformprocessor/metrics_transform_processor_group_test.go @@ -22,6 +22,7 @@ import ( "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" + "go.opentelemetry.io/collector/component" "go.opentelemetry.io/collector/component/componenttest" "go.opentelemetry.io/collector/config" "go.opentelemetry.io/collector/consumer/consumertest" @@ -83,7 +84,7 @@ func TestMetricsGrouping(t *testing.T) { context.Background(), componenttest.NewNopProcessorCreateSettings(), &Config{ - ProcessorSettings: config.NewProcessorSettings(config.NewComponentID(typeStr)), + ProcessorSettings: config.NewProcessorSettings(component.NewID(typeStr)), }, next, p.processMetrics, processorhelper.WithCapabilities(consumerCapabilities)) require.NoError(t, err) diff --git a/processor/metricstransformprocessor/metrics_transform_processor_test.go b/processor/metricstransformprocessor/metrics_transform_processor_test.go index cebb593fc83a..f37ba15f92e1 100644 --- a/processor/metricstransformprocessor/metrics_transform_processor_test.go +++ b/processor/metricstransformprocessor/metrics_transform_processor_test.go @@ -20,6 +20,7 @@ import ( "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" + "go.opentelemetry.io/collector/component" "go.opentelemetry.io/collector/component/componenttest" "go.opentelemetry.io/collector/config" "go.opentelemetry.io/collector/consumer/consumertest" @@ -43,7 +44,7 @@ func TestMetricsTransformProcessor(t *testing.T) { context.Background(), componenttest.NewNopProcessorCreateSettings(), &Config{ - ProcessorSettings: config.NewProcessorSettings(config.NewComponentID(typeStr)), + ProcessorSettings: config.NewProcessorSettings(component.NewID(typeStr)), }, next, p.processMetrics, diff --git a/processor/probabilisticsamplerprocessor/config.go b/processor/probabilisticsamplerprocessor/config.go index d7dd5dada8c0..d01c5713ebb6 100644 --- a/processor/probabilisticsamplerprocessor/config.go +++ b/processor/probabilisticsamplerprocessor/config.go @@ -15,6 +15,7 @@ package probabilisticsamplerprocessor // import "github.com/open-telemetry/opentelemetry-collector-contrib/processor/probabilisticsamplerprocessor" import ( + "go.opentelemetry.io/collector/component" "go.opentelemetry.io/collector/config" ) @@ -32,7 +33,7 @@ type Config struct { HashSeed uint32 `mapstructure:"hash_seed"` } -var _ config.Processor = (*Config)(nil) +var _ component.ProcessorConfig = (*Config)(nil) // Validate checks if the processor configuration is valid func (cfg *Config) Validate() error { diff --git a/processor/probabilisticsamplerprocessor/config_test.go b/processor/probabilisticsamplerprocessor/config_test.go index aa264920a400..7e564f0c1aa8 100644 --- a/processor/probabilisticsamplerprocessor/config_test.go +++ b/processor/probabilisticsamplerprocessor/config_test.go @@ -20,6 +20,7 @@ import ( "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" + "go.opentelemetry.io/collector/component" "go.opentelemetry.io/collector/config" "go.opentelemetry.io/collector/confmap/confmaptest" ) @@ -28,19 +29,19 @@ func TestLoadConfig(t *testing.T) { t.Parallel() tests := []struct { - id config.ComponentID - expected config.Processor + id component.ID + expected component.ProcessorConfig }{ { - id: config.NewComponentIDWithName(typeStr, ""), + id: component.NewIDWithName(typeStr, ""), expected: &Config{ - ProcessorSettings: config.NewProcessorSettings(config.NewComponentID(typeStr)), + ProcessorSettings: config.NewProcessorSettings(component.NewID(typeStr)), SamplingPercentage: 15.3, HashSeed: 22, }, }, { - id: config.NewComponentIDWithName(typeStr, "empty"), + id: component.NewIDWithName(typeStr, "empty"), expected: createDefaultConfig(), }, } @@ -55,7 +56,7 @@ func TestLoadConfig(t *testing.T) { sub, err := cm.Sub(tt.id.String()) require.NoError(t, err) - require.NoError(t, config.UnmarshalProcessor(sub, cfg)) + require.NoError(t, component.UnmarshalProcessorConfig(sub, cfg)) assert.NoError(t, cfg.Validate()) assert.Equal(t, tt.expected, cfg) diff --git a/processor/probabilisticsamplerprocessor/factory.go b/processor/probabilisticsamplerprocessor/factory.go index 6444f05d9724..fed452545d07 100644 --- a/processor/probabilisticsamplerprocessor/factory.go +++ b/processor/probabilisticsamplerprocessor/factory.go @@ -47,9 +47,9 @@ func NewFactory() component.ProcessorFactory { component.WithTracesProcessor(createTracesProcessor, stability)) } -func createDefaultConfig() config.Processor { +func createDefaultConfig() component.ProcessorConfig { return &Config{ - ProcessorSettings: config.NewProcessorSettings(config.NewComponentID(typeStr)), + ProcessorSettings: config.NewProcessorSettings(component.NewID(typeStr)), } } @@ -57,7 +57,7 @@ func createDefaultConfig() config.Processor { func createTracesProcessor( ctx context.Context, set component.ProcessorCreateSettings, - cfg config.Processor, + cfg component.ProcessorConfig, nextConsumer consumer.Traces, ) (component.TracesProcessor, error) { return newTracesProcessor(ctx, set, cfg.(*Config), nextConsumer) diff --git a/processor/probabilisticsamplerprocessor/factory_test.go b/processor/probabilisticsamplerprocessor/factory_test.go index e5e0a9f154f0..5958cc9800e9 100644 --- a/processor/probabilisticsamplerprocessor/factory_test.go +++ b/processor/probabilisticsamplerprocessor/factory_test.go @@ -20,14 +20,13 @@ import ( "github.com/stretchr/testify/assert" "go.opentelemetry.io/collector/component/componenttest" - "go.opentelemetry.io/collector/config/configtest" "go.opentelemetry.io/collector/consumer/consumertest" ) func TestCreateDefaultConfig(t *testing.T) { cfg := createDefaultConfig() assert.NotNil(t, cfg, "failed to create default config") - assert.NoError(t, configtest.CheckConfigStruct(cfg)) + assert.NoError(t, componenttest.CheckConfigStruct(cfg)) } func TestCreateProcessor(t *testing.T) { diff --git a/processor/probabilisticsamplerprocessor/go.mod b/processor/probabilisticsamplerprocessor/go.mod index c8aa624a940e..6f873082d117 100644 --- a/processor/probabilisticsamplerprocessor/go.mod +++ b/processor/probabilisticsamplerprocessor/go.mod @@ -5,10 +5,10 @@ go 1.18 require ( github.com/open-telemetry/opentelemetry-collector-contrib/internal/coreinternal v0.63.0 github.com/stretchr/testify v1.8.1 - go.opencensus.io v0.23.0 - go.opentelemetry.io/collector v0.63.2-0.20221104003159-6b27644724d8 - go.opentelemetry.io/collector/pdata v0.63.2-0.20221104003159-6b27644724d8 - go.opentelemetry.io/collector/semconv v0.63.2-0.20221104003159-6b27644724d8 + go.opencensus.io v0.24.0 + go.opentelemetry.io/collector v0.63.2-0.20221108014805-0b08d5316426 + go.opentelemetry.io/collector/pdata v0.63.2-0.20221108014805-0b08d5316426 + go.opentelemetry.io/collector/semconv v0.63.2-0.20221108014805-0b08d5316426 go.uber.org/zap v1.23.0 ) diff --git a/processor/probabilisticsamplerprocessor/go.sum b/processor/probabilisticsamplerprocessor/go.sum index f0a4dd8689c5..c0edd7712670 100644 --- a/processor/probabilisticsamplerprocessor/go.sum +++ b/processor/probabilisticsamplerprocessor/go.sum @@ -224,7 +224,7 @@ github.com/prometheus/client_golang v0.9.1/go.mod h1:7SWBe2y4D6OKWSNQJUaRYU/AaXP github.com/prometheus/client_golang v1.0.0/go.mod h1:db9x61etRT2tGnBNRi70OPL5FsnadC4Ky3P0J6CfImo= github.com/prometheus/client_golang v1.7.1/go.mod h1:PY5Wy2awLA44sXw4AOSfFBetzPP4j5+D6mVACh+pe2M= github.com/prometheus/client_golang v1.11.1/go.mod h1:Z6t4BnS23TR94PD6BsDNk8yVqroYurpAkEiz0P2BEV0= -github.com/prometheus/client_golang v1.13.0 h1:b71QUfeo5M8gq2+evJdTPfZhYMAU0uKPkyPJ7TPsloU= +github.com/prometheus/client_golang v1.13.1 h1:3gMjIY2+/hzmqhtUC/aQNYldJA6DtH3CgQvwS+02K1c= github.com/prometheus/client_model v0.0.0-20180712105110-5c3871d89910/go.mod h1:MbSGuTsp3dbXC40dX6PRTWyKYBIrTGTE9sqQNg2J8bo= github.com/prometheus/client_model v0.0.0-20190129233127-fd36f4220a90/go.mod h1:xMI15A0UPsDsEKsMN9yxemIoYk6Tm2C1GtYGdfGttqA= github.com/prometheus/client_model v0.0.0-20190812154241-14fe0d1b01d4/go.mod h1:xMI15A0UPsDsEKsMN9yxemIoYk6Tm2C1GtYGdfGttqA= @@ -261,7 +261,6 @@ github.com/stretchr/testify v1.2.2/go.mod h1:a8OnRcib4nhh0OaRAV+Yts87kKdq0PP7pXf github.com/stretchr/testify v1.3.0/go.mod h1:M5WIy9Dh21IEIfnGCwXGc5bZfKNJtfHm1UVUgZn+9EI= github.com/stretchr/testify v1.4.0/go.mod h1:j7eGeouHqKxXV5pUuKE4zz7dFj8WfuZ+81PSLYec5m4= github.com/stretchr/testify v1.5.1/go.mod h1:5W2xD1RspED5o8YsWQXVCued0rvSQ+mT+I5cxcmMvtA= -github.com/stretchr/testify v1.6.1/go.mod h1:6Fq8oRcR53rry900zMqJjRRixrwX3KX962/h/Wwjteg= github.com/stretchr/testify v1.7.0/go.mod h1:6Fq8oRcR53rry900zMqJjRRixrwX3KX962/h/Wwjteg= github.com/stretchr/testify v1.7.1/go.mod h1:6Fq8oRcR53rry900zMqJjRRixrwX3KX962/h/Wwjteg= github.com/stretchr/testify v1.8.0/go.mod h1:yNjHg4UonilssWZ8iaSj1OCr/vHnekPRkoO+kdMU+MU= @@ -273,14 +272,14 @@ 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.opencensus.io v0.23.0 h1:gqCw0LfLxScz8irSi8exQc7fyQ0fKQU/qnC/X8+V/1M= -go.opencensus.io v0.23.0/go.mod h1:XItmlyltB5F7CS4xOC1DcqMoFqwtC6OG2xF7mCv7P7E= -go.opentelemetry.io/collector v0.63.2-0.20221104003159-6b27644724d8 h1:rOT5HzXXfSISc6FiH012zH2/EFjp37UXfjEqj5BpkWQ= -go.opentelemetry.io/collector v0.63.2-0.20221104003159-6b27644724d8/go.mod h1:JVmeZXugK4ondC6KQgrHTHWiF4JttpG5k6dWPMt62+k= -go.opentelemetry.io/collector/pdata v0.63.2-0.20221104003159-6b27644724d8 h1:7xeTQjfsOm9eogQeIxjSEhlik9qsbBGsnmkQHfyKaRE= -go.opentelemetry.io/collector/pdata v0.63.2-0.20221104003159-6b27644724d8/go.mod h1:IzvXUGQml2mrnvdb8zIlEW3qQs9oFLdD2hLwJdZ+pek= -go.opentelemetry.io/collector/semconv v0.63.2-0.20221104003159-6b27644724d8 h1:jm0sNPyqo6S165QjQYMBHB2nK50wlJbMYM03Yr3Eo2k= -go.opentelemetry.io/collector/semconv v0.63.2-0.20221104003159-6b27644724d8/go.mod h1:5o9yhOa+ABt7g2E5JABDxGZ1PQPbtfxrKNbYn+LOTXU= +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.63.2-0.20221108014805-0b08d5316426 h1:z/wLTMh7/vNxcFUDa5uG7/IPE3tYx6pzCWPV41ghyV8= +go.opentelemetry.io/collector v0.63.2-0.20221108014805-0b08d5316426/go.mod h1:+Zb70q0Rq17dA9FcHTiTjW6g96lvJ8kAZ0c+eWNkAv0= +go.opentelemetry.io/collector/pdata v0.63.2-0.20221108014805-0b08d5316426 h1:wKDpgP0Tx/gWI2SgDGAY1OTSeihhDivbbRqFR79IGTc= +go.opentelemetry.io/collector/pdata v0.63.2-0.20221108014805-0b08d5316426/go.mod h1:IzvXUGQml2mrnvdb8zIlEW3qQs9oFLdD2hLwJdZ+pek= +go.opentelemetry.io/collector/semconv v0.63.2-0.20221108014805-0b08d5316426 h1:pqIl7OC531J6i9ttBCj3zLmZI/BSF4q323YpK0GgKGk= +go.opentelemetry.io/collector/semconv v0.63.2-0.20221108014805-0b08d5316426/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/probabilisticsamplerprocessor/probabilisticsampler_test.go b/processor/probabilisticsamplerprocessor/probabilisticsampler_test.go index f42aa0cdd74c..de1de2867d68 100644 --- a/processor/probabilisticsamplerprocessor/probabilisticsampler_test.go +++ b/processor/probabilisticsamplerprocessor/probabilisticsampler_test.go @@ -22,6 +22,7 @@ import ( "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" + "go.opentelemetry.io/collector/component" "go.opentelemetry.io/collector/component/componenttest" "go.opentelemetry.io/collector/config" "go.opentelemetry.io/collector/consumer" @@ -43,7 +44,7 @@ func TestNewTracesProcessor(t *testing.T) { { name: "nil_nextConsumer", cfg: &Config{ - ProcessorSettings: config.NewProcessorSettings(config.NewComponentID(typeStr)), + ProcessorSettings: config.NewProcessorSettings(component.NewID(typeStr)), SamplingPercentage: 15.5, }, wantErr: true, @@ -52,7 +53,7 @@ func TestNewTracesProcessor(t *testing.T) { name: "happy_path", nextConsumer: consumertest.NewNop(), cfg: &Config{ - ProcessorSettings: config.NewProcessorSettings(config.NewComponentID(typeStr)), + ProcessorSettings: config.NewProcessorSettings(component.NewID(typeStr)), SamplingPercentage: 15.5, }, }, @@ -60,7 +61,7 @@ func TestNewTracesProcessor(t *testing.T) { name: "happy_path_hash_seed", nextConsumer: consumertest.NewNop(), cfg: &Config{ - ProcessorSettings: config.NewProcessorSettings(config.NewComponentID(typeStr)), + ProcessorSettings: config.NewProcessorSettings(component.NewID(typeStr)), SamplingPercentage: 13.33, HashSeed: 4321, }, @@ -92,7 +93,7 @@ func Test_tracesamplerprocessor_SamplingPercentageRange(t *testing.T) { { name: "random_sampling_tiny", cfg: &Config{ - ProcessorSettings: config.NewProcessorSettings(config.NewComponentID(typeStr)), + ProcessorSettings: config.NewProcessorSettings(component.NewID(typeStr)), SamplingPercentage: 0.03, }, numBatches: 1e5, @@ -102,7 +103,7 @@ func Test_tracesamplerprocessor_SamplingPercentageRange(t *testing.T) { { name: "random_sampling_small", cfg: &Config{ - ProcessorSettings: config.NewProcessorSettings(config.NewComponentID(typeStr)), + ProcessorSettings: config.NewProcessorSettings(component.NewID(typeStr)), SamplingPercentage: 5, }, numBatches: 1e5, @@ -112,7 +113,7 @@ func Test_tracesamplerprocessor_SamplingPercentageRange(t *testing.T) { { name: "random_sampling_medium", cfg: &Config{ - ProcessorSettings: config.NewProcessorSettings(config.NewComponentID(typeStr)), + ProcessorSettings: config.NewProcessorSettings(component.NewID(typeStr)), SamplingPercentage: 50.0, }, numBatches: 1e5, @@ -122,7 +123,7 @@ func Test_tracesamplerprocessor_SamplingPercentageRange(t *testing.T) { { name: "random_sampling_high", cfg: &Config{ - ProcessorSettings: config.NewProcessorSettings(config.NewComponentID(typeStr)), + ProcessorSettings: config.NewProcessorSettings(component.NewID(typeStr)), SamplingPercentage: 90.0, }, numBatches: 1e5, @@ -132,7 +133,7 @@ func Test_tracesamplerprocessor_SamplingPercentageRange(t *testing.T) { { name: "random_sampling_all", cfg: &Config{ - ProcessorSettings: config.NewProcessorSettings(config.NewComponentID(typeStr)), + ProcessorSettings: config.NewProcessorSettings(component.NewID(typeStr)), SamplingPercentage: 100.0, }, numBatches: 1e5, @@ -181,7 +182,7 @@ func Test_tracesamplerprocessor_SamplingPercentageRange_MultipleResourceSpans(t { name: "single_batch_single_trace_two_resource_spans", cfg: &Config{ - ProcessorSettings: config.NewProcessorSettings(config.NewComponentID(typeStr)), + ProcessorSettings: config.NewProcessorSettings(component.NewID(typeStr)), SamplingPercentage: 100.0, }, numBatches: 1, @@ -192,7 +193,7 @@ func Test_tracesamplerprocessor_SamplingPercentageRange_MultipleResourceSpans(t { name: "single_batch_two_traces_two_resource_spans", cfg: &Config{ - ProcessorSettings: config.NewProcessorSettings(config.NewComponentID(typeStr)), + ProcessorSettings: config.NewProcessorSettings(component.NewID(typeStr)), SamplingPercentage: 100.0, }, numBatches: 1, @@ -237,7 +238,7 @@ func Test_tracesamplerprocessor_SpanSamplingPriority(t *testing.T) { { name: "must_sample", cfg: &Config{ - ProcessorSettings: config.NewProcessorSettings(config.NewComponentID(typeStr)), + ProcessorSettings: config.NewProcessorSettings(component.NewID(typeStr)), SamplingPercentage: 0.0, }, td: singleSpanWithAttrib( @@ -248,7 +249,7 @@ func Test_tracesamplerprocessor_SpanSamplingPriority(t *testing.T) { { name: "must_sample_double", cfg: &Config{ - ProcessorSettings: config.NewProcessorSettings(config.NewComponentID(typeStr)), + ProcessorSettings: config.NewProcessorSettings(component.NewID(typeStr)), SamplingPercentage: 0.0, }, td: singleSpanWithAttrib( @@ -259,7 +260,7 @@ func Test_tracesamplerprocessor_SpanSamplingPriority(t *testing.T) { { name: "must_sample_string", cfg: &Config{ - ProcessorSettings: config.NewProcessorSettings(config.NewComponentID(typeStr)), + ProcessorSettings: config.NewProcessorSettings(component.NewID(typeStr)), SamplingPercentage: 0.0, }, td: singleSpanWithAttrib( @@ -270,7 +271,7 @@ func Test_tracesamplerprocessor_SpanSamplingPriority(t *testing.T) { { name: "must_not_sample", cfg: &Config{ - ProcessorSettings: config.NewProcessorSettings(config.NewComponentID(typeStr)), + ProcessorSettings: config.NewProcessorSettings(component.NewID(typeStr)), SamplingPercentage: 100.0, }, td: singleSpanWithAttrib( @@ -280,7 +281,7 @@ func Test_tracesamplerprocessor_SpanSamplingPriority(t *testing.T) { { name: "must_not_sample_double", cfg: &Config{ - ProcessorSettings: config.NewProcessorSettings(config.NewComponentID(typeStr)), + ProcessorSettings: config.NewProcessorSettings(component.NewID(typeStr)), SamplingPercentage: 100.0, }, td: singleSpanWithAttrib( @@ -290,7 +291,7 @@ func Test_tracesamplerprocessor_SpanSamplingPriority(t *testing.T) { { name: "must_not_sample_string", cfg: &Config{ - ProcessorSettings: config.NewProcessorSettings(config.NewComponentID(typeStr)), + ProcessorSettings: config.NewProcessorSettings(component.NewID(typeStr)), SamplingPercentage: 100.0, }, td: singleSpanWithAttrib( @@ -300,7 +301,7 @@ func Test_tracesamplerprocessor_SpanSamplingPriority(t *testing.T) { { name: "defer_sample_expect_not_sampled", cfg: &Config{ - ProcessorSettings: config.NewProcessorSettings(config.NewComponentID(typeStr)), + ProcessorSettings: config.NewProcessorSettings(component.NewID(typeStr)), SamplingPercentage: 0.0, }, td: singleSpanWithAttrib( @@ -310,7 +311,7 @@ func Test_tracesamplerprocessor_SpanSamplingPriority(t *testing.T) { { name: "defer_sample_expect_sampled", cfg: &Config{ - ProcessorSettings: config.NewProcessorSettings(config.NewComponentID(typeStr)), + ProcessorSettings: config.NewProcessorSettings(component.NewID(typeStr)), SamplingPercentage: 100.0, }, td: singleSpanWithAttrib( diff --git a/processor/redactionprocessor/config_test.go b/processor/redactionprocessor/config_test.go index ba725e3fb37d..3ea9d5d59ed7 100644 --- a/processor/redactionprocessor/config_test.go +++ b/processor/redactionprocessor/config_test.go @@ -20,6 +20,7 @@ import ( "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" + "go.opentelemetry.io/collector/component" "go.opentelemetry.io/collector/config" "go.opentelemetry.io/collector/confmap/confmaptest" ) @@ -28,13 +29,13 @@ func TestLoadConfig(t *testing.T) { t.Parallel() tests := []struct { - id config.ComponentID - expected config.Processor + id component.ID + expected component.ProcessorConfig }{ { - id: config.NewComponentIDWithName(typeStr, ""), + id: component.NewIDWithName(typeStr, ""), expected: &Config{ - ProcessorSettings: config.NewProcessorSettings(config.NewComponentID(typeStr)), + ProcessorSettings: config.NewProcessorSettings(component.NewID(typeStr)), AllowAllKeys: false, AllowedKeys: []string{"description", "group", "id", "name"}, BlockedValues: []string{"4[0-9]{12}(?:[0-9]{3})?", "(5[1-5][0-9]{14})"}, @@ -42,7 +43,7 @@ func TestLoadConfig(t *testing.T) { }, }, { - id: config.NewComponentIDWithName(typeStr, "empty"), + id: component.NewIDWithName(typeStr, "empty"), expected: createDefaultConfig(), }, } @@ -57,7 +58,7 @@ func TestLoadConfig(t *testing.T) { sub, err := cm.Sub(tt.id.String()) require.NoError(t, err) - require.NoError(t, config.UnmarshalProcessor(sub, cfg)) + require.NoError(t, component.UnmarshalProcessorConfig(sub, cfg)) assert.NoError(t, cfg.Validate()) assert.Equal(t, tt.expected, cfg) diff --git a/processor/redactionprocessor/factory.go b/processor/redactionprocessor/factory.go index 75f4b7228b47..9fb8c51968f5 100644 --- a/processor/redactionprocessor/factory.go +++ b/processor/redactionprocessor/factory.go @@ -40,9 +40,9 @@ func NewFactory() component.ProcessorFactory { ) } -func createDefaultConfig() config.Processor { +func createDefaultConfig() component.ProcessorConfig { return &Config{ - ProcessorSettings: config.NewProcessorSettings(config.NewComponentID(typeStr)), + ProcessorSettings: config.NewProcessorSettings(component.NewID(typeStr)), } } @@ -50,7 +50,7 @@ func createDefaultConfig() config.Processor { func createTracesProcessor( ctx context.Context, set component.ProcessorCreateSettings, - cfg config.Processor, + cfg component.ProcessorConfig, next consumer.Traces, ) (component.TracesProcessor, error) { oCfg := cfg.(*Config) diff --git a/processor/redactionprocessor/factory_test.go b/processor/redactionprocessor/factory_test.go index 022e2ddcaa08..ad74547d70cb 100644 --- a/processor/redactionprocessor/factory_test.go +++ b/processor/redactionprocessor/factory_test.go @@ -19,6 +19,7 @@ import ( "testing" "github.com/stretchr/testify/assert" + "go.opentelemetry.io/collector/component" "go.opentelemetry.io/collector/component/componenttest" "go.opentelemetry.io/collector/config" "go.opentelemetry.io/collector/consumer/consumertest" @@ -32,7 +33,7 @@ func TestDefaultConfiguration(t *testing.T) { func TestCreateTestProcessor(t *testing.T) { cfg := &Config{ - ProcessorSettings: config.NewProcessorSettings(config.NewComponentID(typeStr)), + ProcessorSettings: config.NewProcessorSettings(component.NewID(typeStr)), } tp, err := createTracesProcessor(context.Background(), componenttest.NewNopProcessorCreateSettings(), cfg, consumertest.NewNop()) diff --git a/processor/redactionprocessor/go.mod b/processor/redactionprocessor/go.mod index d69022ed5d96..88a455b7cad8 100644 --- a/processor/redactionprocessor/go.mod +++ b/processor/redactionprocessor/go.mod @@ -4,8 +4,8 @@ go 1.18 require ( github.com/stretchr/testify v1.8.1 - go.opentelemetry.io/collector v0.63.2-0.20221104003159-6b27644724d8 - go.opentelemetry.io/collector/pdata v0.63.2-0.20221104003159-6b27644724d8 + go.opentelemetry.io/collector v0.63.2-0.20221108014805-0b08d5316426 + go.opentelemetry.io/collector/pdata v0.63.2-0.20221108014805-0b08d5316426 go.uber.org/zap v1.23.0 ) @@ -25,7 +25,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.opencensus.io v0.23.0 // indirect + go.opencensus.io v0.24.0 // 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 26161868ea3f..89f73030270e 100644 --- a/processor/redactionprocessor/go.sum +++ b/processor/redactionprocessor/go.sum @@ -258,7 +258,6 @@ github.com/stretchr/testify v1.2.2/go.mod h1:a8OnRcib4nhh0OaRAV+Yts87kKdq0PP7pXf github.com/stretchr/testify v1.3.0/go.mod h1:M5WIy9Dh21IEIfnGCwXGc5bZfKNJtfHm1UVUgZn+9EI= github.com/stretchr/testify v1.4.0/go.mod h1:j7eGeouHqKxXV5pUuKE4zz7dFj8WfuZ+81PSLYec5m4= github.com/stretchr/testify v1.5.1/go.mod h1:5W2xD1RspED5o8YsWQXVCued0rvSQ+mT+I5cxcmMvtA= -github.com/stretchr/testify v1.6.1/go.mod h1:6Fq8oRcR53rry900zMqJjRRixrwX3KX962/h/Wwjteg= github.com/stretchr/testify v1.7.0/go.mod h1:6Fq8oRcR53rry900zMqJjRRixrwX3KX962/h/Wwjteg= github.com/stretchr/testify v1.7.1/go.mod h1:6Fq8oRcR53rry900zMqJjRRixrwX3KX962/h/Wwjteg= github.com/stretchr/testify v1.8.0/go.mod h1:yNjHg4UonilssWZ8iaSj1OCr/vHnekPRkoO+kdMU+MU= @@ -270,12 +269,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.opencensus.io v0.23.0 h1:gqCw0LfLxScz8irSi8exQc7fyQ0fKQU/qnC/X8+V/1M= -go.opencensus.io v0.23.0/go.mod h1:XItmlyltB5F7CS4xOC1DcqMoFqwtC6OG2xF7mCv7P7E= -go.opentelemetry.io/collector v0.63.2-0.20221104003159-6b27644724d8 h1:rOT5HzXXfSISc6FiH012zH2/EFjp37UXfjEqj5BpkWQ= -go.opentelemetry.io/collector v0.63.2-0.20221104003159-6b27644724d8/go.mod h1:JVmeZXugK4ondC6KQgrHTHWiF4JttpG5k6dWPMt62+k= -go.opentelemetry.io/collector/pdata v0.63.2-0.20221104003159-6b27644724d8 h1:7xeTQjfsOm9eogQeIxjSEhlik9qsbBGsnmkQHfyKaRE= -go.opentelemetry.io/collector/pdata v0.63.2-0.20221104003159-6b27644724d8/go.mod h1:IzvXUGQml2mrnvdb8zIlEW3qQs9oFLdD2hLwJdZ+pek= +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.63.2-0.20221108014805-0b08d5316426 h1:z/wLTMh7/vNxcFUDa5uG7/IPE3tYx6pzCWPV41ghyV8= +go.opentelemetry.io/collector v0.63.2-0.20221108014805-0b08d5316426/go.mod h1:+Zb70q0Rq17dA9FcHTiTjW6g96lvJ8kAZ0c+eWNkAv0= +go.opentelemetry.io/collector/pdata v0.63.2-0.20221108014805-0b08d5316426 h1:wKDpgP0Tx/gWI2SgDGAY1OTSeihhDivbbRqFR79IGTc= +go.opentelemetry.io/collector/pdata v0.63.2-0.20221108014805-0b08d5316426/go.mod h1:IzvXUGQml2mrnvdb8zIlEW3qQs9oFLdD2hLwJdZ+pek= 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 29a54f0fd8e0..e32ef2da5cd2 100644 --- a/processor/resourcedetectionprocessor/config_test.go +++ b/processor/resourcedetectionprocessor/config_test.go @@ -21,6 +21,7 @@ import ( "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" + "go.opentelemetry.io/collector/component" "go.opentelemetry.io/collector/config" "go.opentelemetry.io/collector/config/confighttp" "go.opentelemetry.io/collector/confmap/confmaptest" @@ -37,23 +38,23 @@ func TestLoadConfig(t *testing.T) { cfg.Timeout = 2 * time.Second tests := []struct { - id config.ComponentID - expected config.Processor + id component.ID + expected component.ProcessorConfig errorMessage string }{ { - id: config.NewComponentIDWithName(typeStr, "gce"), + id: component.NewIDWithName(typeStr, "gce"), expected: &Config{ - ProcessorSettings: config.NewProcessorSettings(config.NewComponentID(typeStr)), + ProcessorSettings: config.NewProcessorSettings(component.NewID(typeStr)), Detectors: []string{"env", "gce"}, HTTPClientSettings: cfg, Override: false, }, }, { - id: config.NewComponentIDWithName(typeStr, "ec2"), + id: component.NewIDWithName(typeStr, "ec2"), expected: &Config{ - ProcessorSettings: config.NewProcessorSettings(config.NewComponentID(typeStr)), + ProcessorSettings: config.NewProcessorSettings(component.NewID(typeStr)), Detectors: []string{"env", "ec2"}, DetectorConfig: DetectorConfig{ EC2Config: ec2.Config{ @@ -65,9 +66,9 @@ func TestLoadConfig(t *testing.T) { }, }, { - id: config.NewComponentIDWithName(typeStr, "system"), + id: component.NewIDWithName(typeStr, "system"), expected: &Config{ - ProcessorSettings: config.NewProcessorSettings(config.NewComponentID(typeStr)), + ProcessorSettings: config.NewProcessorSettings(component.NewID(typeStr)), Detectors: []string{"env", "system"}, DetectorConfig: DetectorConfig{ SystemConfig: system.Config{ @@ -80,7 +81,7 @@ func TestLoadConfig(t *testing.T) { }, }, { - id: config.NewComponentIDWithName(typeStr, "invalid"), + id: component.NewIDWithName(typeStr, "invalid"), errorMessage: "hostname_sources contains invalid value: \"invalid_source\"", }, } @@ -94,7 +95,7 @@ func TestLoadConfig(t *testing.T) { sub, err := cm.Sub(tt.id.String()) require.NoError(t, err) - require.NoError(t, config.UnmarshalProcessor(sub, cfg)) + require.NoError(t, component.UnmarshalProcessorConfig(sub, cfg)) if tt.expected == nil { assert.EqualError(t, cfg.Validate(), tt.errorMessage) diff --git a/processor/resourcedetectionprocessor/factory.go b/processor/resourcedetectionprocessor/factory.go index 0ac01f99e256..27bf789c71ed 100644 --- a/processor/resourcedetectionprocessor/factory.go +++ b/processor/resourcedetectionprocessor/factory.go @@ -54,7 +54,7 @@ type factory struct { // providers stores a provider for each named processor that // may a different set of detectors configured. - providers map[config.ComponentID]*internal.ResourceProvider + providers map[component.ID]*internal.ResourceProvider lock sync.Mutex } @@ -79,7 +79,7 @@ func NewFactory() component.ProcessorFactory { f := &factory{ resourceProviderFactory: resourceProviderFactory, - providers: map[config.ComponentID]*internal.ResourceProvider{}, + providers: map[component.ID]*internal.ResourceProvider{}, } return component.NewProcessorFactory( @@ -91,13 +91,13 @@ func NewFactory() component.ProcessorFactory { } // Type gets the type of the Option config created by this factory. -func (*factory) Type() config.Type { +func (*factory) Type() component.Type { return typeStr } -func createDefaultConfig() config.Processor { +func createDefaultConfig() component.ProcessorConfig { return &Config{ - ProcessorSettings: config.NewProcessorSettings(config.NewComponentID(typeStr)), + ProcessorSettings: config.NewProcessorSettings(component.NewID(typeStr)), Detectors: []string{env.TypeStr}, HTTPClientSettings: defaultHTTPClientSettings(), Override: true, @@ -116,7 +116,7 @@ func defaultHTTPClientSettings() confighttp.HTTPClientSettings { func (f *factory) createTracesProcessor( ctx context.Context, set component.ProcessorCreateSettings, - cfg config.Processor, + cfg component.ProcessorConfig, nextConsumer consumer.Traces, ) (component.TracesProcessor, error) { rdp, err := f.getResourceDetectionProcessor(set, cfg) @@ -137,7 +137,7 @@ func (f *factory) createTracesProcessor( func (f *factory) createMetricsProcessor( ctx context.Context, set component.ProcessorCreateSettings, - cfg config.Processor, + cfg component.ProcessorConfig, nextConsumer consumer.Metrics, ) (component.MetricsProcessor, error) { rdp, err := f.getResourceDetectionProcessor(set, cfg) @@ -158,7 +158,7 @@ func (f *factory) createMetricsProcessor( func (f *factory) createLogsProcessor( ctx context.Context, set component.ProcessorCreateSettings, - cfg config.Processor, + cfg component.ProcessorConfig, nextConsumer consumer.Logs, ) (component.LogsProcessor, error) { rdp, err := f.getResourceDetectionProcessor(set, cfg) @@ -178,7 +178,7 @@ func (f *factory) createLogsProcessor( func (f *factory) getResourceDetectionProcessor( params component.ProcessorCreateSettings, - cfg config.Processor, + cfg component.ProcessorConfig, ) (*resourceDetectionProcessor, error) { oCfg := cfg.(*Config) @@ -197,7 +197,7 @@ func (f *factory) getResourceDetectionProcessor( func (f *factory) getResourceProvider( params component.ProcessorCreateSettings, - processorName config.ComponentID, + processorName component.ID, timeout time.Duration, configuredDetectors []string, detectorConfigs DetectorConfig, diff --git a/processor/resourcedetectionprocessor/factory_test.go b/processor/resourcedetectionprocessor/factory_test.go index 11c7d57f93d8..e9d1e7ed802e 100644 --- a/processor/resourcedetectionprocessor/factory_test.go +++ b/processor/resourcedetectionprocessor/factory_test.go @@ -21,16 +21,15 @@ import ( "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" + "go.opentelemetry.io/collector/component" "go.opentelemetry.io/collector/component/componenttest" - "go.opentelemetry.io/collector/config" - "go.opentelemetry.io/collector/config/configtest" "go.opentelemetry.io/collector/confmap/confmaptest" "go.opentelemetry.io/collector/consumer/consumertest" ) func TestCreateDefaultConfig(t *testing.T) { cfg := createDefaultConfig() - assert.NoError(t, configtest.CheckConfigStruct(cfg)) + assert.NoError(t, componenttest.CheckConfigStruct(cfg)) assert.NotNil(t, cfg) } @@ -63,7 +62,7 @@ func TestCreateConfigProcessors(t *testing.T) { sub, err := cm.Sub(k) require.NoError(t, err) - require.NoError(t, config.UnmarshalProcessor(sub, cfg)) + require.NoError(t, component.UnmarshalProcessorConfig(sub, cfg)) tt, err := factory.CreateTracesProcessor( context.Background(), diff --git a/processor/resourcedetectionprocessor/go.mod b/processor/resourcedetectionprocessor/go.mod index 70274db2fd26..9977d4900f2a 100644 --- a/processor/resourcedetectionprocessor/go.mod +++ b/processor/resourcedetectionprocessor/go.mod @@ -12,9 +12,9 @@ require ( github.com/open-telemetry/opentelemetry-collector-contrib/internal/metadataproviders v0.63.0 github.com/open-telemetry/opentelemetry-collector-contrib/pkg/translator/opencensus v0.63.0 github.com/stretchr/testify v1.8.1 - go.opentelemetry.io/collector v0.63.2-0.20221104003159-6b27644724d8 - go.opentelemetry.io/collector/pdata v0.63.2-0.20221104003159-6b27644724d8 - go.opentelemetry.io/collector/semconv v0.63.2-0.20221104003159-6b27644724d8 + go.opentelemetry.io/collector v0.63.2-0.20221108014805-0b08d5316426 + go.opentelemetry.io/collector/pdata v0.63.2-0.20221108014805-0b08d5316426 + go.opentelemetry.io/collector/semconv v0.63.2-0.20221108014805-0b08d5316426 go.uber.org/multierr v1.8.0 go.uber.org/zap v1.23.0 k8s.io/apimachinery v0.25.3 @@ -77,7 +77,7 @@ require ( github.com/rs/cors v1.8.2 // indirect github.com/sirupsen/logrus v1.8.1 // indirect github.com/stretchr/objx v0.5.0 // indirect - go.opencensus.io v0.23.0 // indirect + go.opencensus.io v0.24.0 // 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 bfefe4c99b5e..7cffcc3cf05b 100644 --- a/processor/resourcedetectionprocessor/go.sum +++ b/processor/resourcedetectionprocessor/go.sum @@ -396,14 +396,14 @@ 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.opencensus.io v0.23.0 h1:gqCw0LfLxScz8irSi8exQc7fyQ0fKQU/qnC/X8+V/1M= -go.opencensus.io v0.23.0/go.mod h1:XItmlyltB5F7CS4xOC1DcqMoFqwtC6OG2xF7mCv7P7E= -go.opentelemetry.io/collector v0.63.2-0.20221104003159-6b27644724d8 h1:rOT5HzXXfSISc6FiH012zH2/EFjp37UXfjEqj5BpkWQ= -go.opentelemetry.io/collector v0.63.2-0.20221104003159-6b27644724d8/go.mod h1:JVmeZXugK4ondC6KQgrHTHWiF4JttpG5k6dWPMt62+k= -go.opentelemetry.io/collector/pdata v0.63.2-0.20221104003159-6b27644724d8 h1:7xeTQjfsOm9eogQeIxjSEhlik9qsbBGsnmkQHfyKaRE= -go.opentelemetry.io/collector/pdata v0.63.2-0.20221104003159-6b27644724d8/go.mod h1:IzvXUGQml2mrnvdb8zIlEW3qQs9oFLdD2hLwJdZ+pek= -go.opentelemetry.io/collector/semconv v0.63.2-0.20221104003159-6b27644724d8 h1:jm0sNPyqo6S165QjQYMBHB2nK50wlJbMYM03Yr3Eo2k= -go.opentelemetry.io/collector/semconv v0.63.2-0.20221104003159-6b27644724d8/go.mod h1:5o9yhOa+ABt7g2E5JABDxGZ1PQPbtfxrKNbYn+LOTXU= +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.63.2-0.20221108014805-0b08d5316426 h1:z/wLTMh7/vNxcFUDa5uG7/IPE3tYx6pzCWPV41ghyV8= +go.opentelemetry.io/collector v0.63.2-0.20221108014805-0b08d5316426/go.mod h1:+Zb70q0Rq17dA9FcHTiTjW6g96lvJ8kAZ0c+eWNkAv0= +go.opentelemetry.io/collector/pdata v0.63.2-0.20221108014805-0b08d5316426 h1:wKDpgP0Tx/gWI2SgDGAY1OTSeihhDivbbRqFR79IGTc= +go.opentelemetry.io/collector/pdata v0.63.2-0.20221108014805-0b08d5316426/go.mod h1:IzvXUGQml2mrnvdb8zIlEW3qQs9oFLdD2hLwJdZ+pek= +go.opentelemetry.io/collector/semconv v0.63.2-0.20221108014805-0b08d5316426 h1:pqIl7OC531J6i9ttBCj3zLmZI/BSF4q323YpK0GgKGk= +go.opentelemetry.io/collector/semconv v0.63.2-0.20221108014805-0b08d5316426/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/resourcedetectionprocessor/resourcedetection_processor_test.go b/processor/resourcedetectionprocessor/resourcedetection_processor_test.go index a07c9b9d336f..649562a21d5d 100644 --- a/processor/resourcedetectionprocessor/resourcedetection_processor_test.go +++ b/processor/resourcedetectionprocessor/resourcedetection_processor_test.go @@ -158,7 +158,7 @@ func TestResourceProcessor(t *testing.T) { for _, tt := range tests { t.Run(tt.name, func(t *testing.T) { - factory := &factory{providers: map[config.ComponentID]*internal.ResourceProvider{}} + factory := &factory{providers: map[component.ID]*internal.ResourceProvider{}} md1 := &MockDetector{} md1.On("Detect").Return(tt.detectedResource, tt.detectedError) @@ -172,7 +172,7 @@ func TestResourceProcessor(t *testing.T) { } cfg := &Config{ - ProcessorSettings: config.NewProcessorSettings(config.NewComponentID(typeStr)), + ProcessorSettings: config.NewProcessorSettings(component.NewID(typeStr)), Override: tt.override, Detectors: tt.detectorKeys, HTTPClientSettings: confighttp.HTTPClientSettings{Timeout: time.Second}, diff --git a/processor/resourceprocessor/config.go b/processor/resourceprocessor/config.go index 45c42898ba9a..f3e6de422a03 100644 --- a/processor/resourceprocessor/config.go +++ b/processor/resourceprocessor/config.go @@ -15,6 +15,7 @@ package resourceprocessor // import "github.com/open-telemetry/opentelemetry-collector-contrib/processor/resourceprocessor" import ( + "go.opentelemetry.io/collector/component" "go.opentelemetry.io/collector/config" "github.com/open-telemetry/opentelemetry-collector-contrib/internal/coreinternal/attraction" @@ -29,7 +30,7 @@ type Config struct { AttributesActions []attraction.ActionKeyValue `mapstructure:"attributes"` } -var _ config.Processor = (*Config)(nil) +var _ component.ProcessorConfig = (*Config)(nil) // Validate checks if the processor configuration is valid func (cfg *Config) Validate() error { diff --git a/processor/resourceprocessor/config_test.go b/processor/resourceprocessor/config_test.go index a7f9120c04e0..caaa231718f6 100644 --- a/processor/resourceprocessor/config_test.go +++ b/processor/resourceprocessor/config_test.go @@ -20,6 +20,7 @@ import ( "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" + "go.opentelemetry.io/collector/component" "go.opentelemetry.io/collector/config" "go.opentelemetry.io/collector/confmap/confmaptest" @@ -30,13 +31,13 @@ func TestLoadConfig(t *testing.T) { t.Parallel() tests := []struct { - id config.ComponentID - expected config.Processor + id component.ID + expected component.ProcessorConfig }{ { - id: config.NewComponentIDWithName(typeStr, ""), + id: component.NewIDWithName(typeStr, ""), expected: &Config{ - ProcessorSettings: config.NewProcessorSettings(config.NewComponentID(typeStr)), + ProcessorSettings: config.NewProcessorSettings(component.NewID(typeStr)), AttributesActions: []attraction.ActionKeyValue{ {Key: "cloud.availability_zone", Value: "zone-1", Action: attraction.UPSERT}, {Key: "k8s.cluster.name", FromAttribute: "k8s-cluster", Action: attraction.INSERT}, @@ -45,7 +46,7 @@ func TestLoadConfig(t *testing.T) { }, }, { - id: config.NewComponentIDWithName(typeStr, "invalid"), + id: component.NewIDWithName(typeStr, "invalid"), expected: createDefaultConfig(), }, } @@ -60,7 +61,7 @@ func TestLoadConfig(t *testing.T) { sub, err := cm.Sub(tt.id.String()) require.NoError(t, err) - require.NoError(t, config.UnmarshalProcessor(sub, cfg)) + require.NoError(t, component.UnmarshalProcessorConfig(sub, cfg)) assert.NoError(t, cfg.Validate()) assert.Equal(t, tt.expected, cfg) diff --git a/processor/resourceprocessor/factory.go b/processor/resourceprocessor/factory.go index 172dedafe61d..e101cd371791 100644 --- a/processor/resourceprocessor/factory.go +++ b/processor/resourceprocessor/factory.go @@ -46,16 +46,16 @@ func NewFactory() component.ProcessorFactory { } // Note: This isn't a valid configuration because the processor would do no work. -func createDefaultConfig() config.Processor { +func createDefaultConfig() component.ProcessorConfig { return &Config{ - ProcessorSettings: config.NewProcessorSettings(config.NewComponentID(typeStr)), + ProcessorSettings: config.NewProcessorSettings(component.NewID(typeStr)), } } func createTracesProcessor( ctx context.Context, set component.ProcessorCreateSettings, - cfg config.Processor, + cfg component.ProcessorConfig, nextConsumer consumer.Traces) (component.TracesProcessor, error) { attrProc, err := createAttrProcessor(cfg.(*Config)) if err != nil { @@ -74,7 +74,7 @@ func createTracesProcessor( func createMetricsProcessor( ctx context.Context, set component.ProcessorCreateSettings, - cfg config.Processor, + cfg component.ProcessorConfig, nextConsumer consumer.Metrics) (component.MetricsProcessor, error) { attrProc, err := createAttrProcessor(cfg.(*Config)) if err != nil { @@ -93,7 +93,7 @@ func createMetricsProcessor( func createLogsProcessor( ctx context.Context, set component.ProcessorCreateSettings, - cfg config.Processor, + cfg component.ProcessorConfig, nextConsumer consumer.Logs) (component.LogsProcessor, error) { attrProc, err := createAttrProcessor(cfg.(*Config)) if err != nil { diff --git a/processor/resourceprocessor/factory_test.go b/processor/resourceprocessor/factory_test.go index c933ce6c22ee..6d8dfaa6ccd0 100644 --- a/processor/resourceprocessor/factory_test.go +++ b/processor/resourceprocessor/factory_test.go @@ -19,9 +19,9 @@ import ( "testing" "github.com/stretchr/testify/assert" + "go.opentelemetry.io/collector/component" "go.opentelemetry.io/collector/component/componenttest" "go.opentelemetry.io/collector/config" - "go.opentelemetry.io/collector/config/configtest" "go.opentelemetry.io/collector/consumer/consumertest" "github.com/open-telemetry/opentelemetry-collector-contrib/internal/coreinternal/attraction" @@ -30,14 +30,14 @@ import ( func TestCreateDefaultConfig(t *testing.T) { factory := NewFactory() cfg := factory.CreateDefaultConfig() - assert.NoError(t, configtest.CheckConfigStruct(cfg)) + assert.NoError(t, componenttest.CheckConfigStruct(cfg)) assert.NotNil(t, cfg) } func TestCreateProcessor(t *testing.T) { factory := NewFactory() cfg := &Config{ - ProcessorSettings: config.NewProcessorSettings(config.NewComponentID(typeStr)), + ProcessorSettings: config.NewProcessorSettings(component.NewID(typeStr)), AttributesActions: []attraction.ActionKeyValue{ {Key: "cloud.availability_zone", Value: "zone-1", Action: attraction.UPSERT}, }, @@ -66,7 +66,7 @@ func TestInvalidEmptyActions(t *testing.T) { func TestInvalidAttributeActions(t *testing.T) { factory := NewFactory() cfg := &Config{ - ProcessorSettings: config.NewProcessorSettings(config.NewComponentID(typeStr)), + ProcessorSettings: config.NewProcessorSettings(component.NewID(typeStr)), AttributesActions: []attraction.ActionKeyValue{ {Key: "k", Value: "v", Action: "invalid-action"}, }, diff --git a/processor/resourceprocessor/go.mod b/processor/resourceprocessor/go.mod index 758c7125accc..153eec8719f3 100644 --- a/processor/resourceprocessor/go.mod +++ b/processor/resourceprocessor/go.mod @@ -5,8 +5,8 @@ go 1.18 require ( github.com/open-telemetry/opentelemetry-collector-contrib/internal/coreinternal v0.63.0 github.com/stretchr/testify v1.8.1 - go.opentelemetry.io/collector v0.63.2-0.20221104003159-6b27644724d8 - go.opentelemetry.io/collector/pdata v0.63.2-0.20221104003159-6b27644724d8 + go.opentelemetry.io/collector v0.63.2-0.20221108014805-0b08d5316426 + go.opentelemetry.io/collector/pdata v0.63.2-0.20221108014805-0b08d5316426 go.uber.org/zap v1.23.0 ) @@ -23,7 +23,7 @@ require ( github.com/modern-go/reflect2 v1.0.2 // indirect github.com/pmezard/go-difflib v1.0.0 // indirect github.com/spf13/cast v1.5.0 // indirect - go.opencensus.io v0.23.0 // indirect + go.opencensus.io v0.24.0 // 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 8dbdcf8be808..b96440d90254 100644 --- a/processor/resourceprocessor/go.sum +++ b/processor/resourceprocessor/go.sum @@ -247,7 +247,6 @@ github.com/stretchr/testify v1.2.2/go.mod h1:a8OnRcib4nhh0OaRAV+Yts87kKdq0PP7pXf github.com/stretchr/testify v1.3.0/go.mod h1:M5WIy9Dh21IEIfnGCwXGc5bZfKNJtfHm1UVUgZn+9EI= github.com/stretchr/testify v1.4.0/go.mod h1:j7eGeouHqKxXV5pUuKE4zz7dFj8WfuZ+81PSLYec5m4= github.com/stretchr/testify v1.5.1/go.mod h1:5W2xD1RspED5o8YsWQXVCued0rvSQ+mT+I5cxcmMvtA= -github.com/stretchr/testify v1.6.1/go.mod h1:6Fq8oRcR53rry900zMqJjRRixrwX3KX962/h/Wwjteg= github.com/stretchr/testify v1.7.0/go.mod h1:6Fq8oRcR53rry900zMqJjRRixrwX3KX962/h/Wwjteg= github.com/stretchr/testify v1.7.1/go.mod h1:6Fq8oRcR53rry900zMqJjRRixrwX3KX962/h/Wwjteg= github.com/stretchr/testify v1.8.0/go.mod h1:yNjHg4UonilssWZ8iaSj1OCr/vHnekPRkoO+kdMU+MU= @@ -259,12 +258,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.opencensus.io v0.23.0 h1:gqCw0LfLxScz8irSi8exQc7fyQ0fKQU/qnC/X8+V/1M= -go.opencensus.io v0.23.0/go.mod h1:XItmlyltB5F7CS4xOC1DcqMoFqwtC6OG2xF7mCv7P7E= -go.opentelemetry.io/collector v0.63.2-0.20221104003159-6b27644724d8 h1:rOT5HzXXfSISc6FiH012zH2/EFjp37UXfjEqj5BpkWQ= -go.opentelemetry.io/collector v0.63.2-0.20221104003159-6b27644724d8/go.mod h1:JVmeZXugK4ondC6KQgrHTHWiF4JttpG5k6dWPMt62+k= -go.opentelemetry.io/collector/pdata v0.63.2-0.20221104003159-6b27644724d8 h1:7xeTQjfsOm9eogQeIxjSEhlik9qsbBGsnmkQHfyKaRE= -go.opentelemetry.io/collector/pdata v0.63.2-0.20221104003159-6b27644724d8/go.mod h1:IzvXUGQml2mrnvdb8zIlEW3qQs9oFLdD2hLwJdZ+pek= +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.63.2-0.20221108014805-0b08d5316426 h1:z/wLTMh7/vNxcFUDa5uG7/IPE3tYx6pzCWPV41ghyV8= +go.opentelemetry.io/collector v0.63.2-0.20221108014805-0b08d5316426/go.mod h1:+Zb70q0Rq17dA9FcHTiTjW6g96lvJ8kAZ0c+eWNkAv0= +go.opentelemetry.io/collector/pdata v0.63.2-0.20221108014805-0b08d5316426 h1:wKDpgP0Tx/gWI2SgDGAY1OTSeihhDivbbRqFR79IGTc= +go.opentelemetry.io/collector/pdata v0.63.2-0.20221108014805-0b08d5316426/go.mod h1:IzvXUGQml2mrnvdb8zIlEW3qQs9oFLdD2hLwJdZ+pek= 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/resourceprocessor/resource_processor_test.go b/processor/resourceprocessor/resource_processor_test.go index d6803f2db8d0..b893d8a7367f 100644 --- a/processor/resourceprocessor/resource_processor_test.go +++ b/processor/resourceprocessor/resource_processor_test.go @@ -20,6 +20,7 @@ import ( "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" + "go.opentelemetry.io/collector/component" "go.opentelemetry.io/collector/component/componenttest" "go.opentelemetry.io/collector/config" "go.opentelemetry.io/collector/consumer/consumertest" @@ -33,7 +34,7 @@ import ( var ( cfg = &Config{ - ProcessorSettings: config.NewProcessorSettings(config.NewComponentID(typeStr)), + ProcessorSettings: config.NewProcessorSettings(component.NewID(typeStr)), AttributesActions: []attraction.ActionKeyValue{ {Key: "cloud.availability_zone", Value: "zone-1", Action: attraction.UPSERT}, {Key: "k8s.cluster.name", FromAttribute: "k8s-cluster", Action: attraction.INSERT}, @@ -82,7 +83,7 @@ func TestResourceProcessorAttributesUpsert(t *testing.T) { { name: "config_attributes_replacement", config: &Config{ - ProcessorSettings: config.NewProcessorSettings(config.NewComponentID(typeStr)), + ProcessorSettings: config.NewProcessorSettings(component.NewID(typeStr)), AttributesActions: []attraction.ActionKeyValue{ {Key: "k8s.cluster.name", FromAttribute: "k8s-cluster", Action: attraction.INSERT}, {Key: "k8s-cluster", Action: attraction.DELETE}, @@ -151,7 +152,7 @@ func TestResourceProcessorAttributesUpsert(t *testing.T) { func TestResourceProcessorError(t *testing.T) { badCfg := &Config{ - ProcessorSettings: config.NewProcessorSettings(config.NewComponentID(typeStr)), + ProcessorSettings: config.NewProcessorSettings(component.NewID(typeStr)), AttributesActions: nil, } diff --git a/processor/routingprocessor/config_test.go b/processor/routingprocessor/config_test.go index e27a86c0afe0..aff3557c29b6 100644 --- a/processor/routingprocessor/config_test.go +++ b/processor/routingprocessor/config_test.go @@ -20,6 +20,7 @@ import ( "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" + "go.opentelemetry.io/collector/component" "go.opentelemetry.io/collector/config" "go.opentelemetry.io/collector/confmap/confmaptest" ) @@ -27,12 +28,12 @@ import ( func TestLoadConfig(t *testing.T) { testcases := []struct { configPath string - expected config.Processor + expected component.ProcessorConfig }{ { configPath: "config_traces.yaml", expected: &Config{ - ProcessorSettings: config.NewProcessorSettings(config.NewComponentID(typeStr)), + ProcessorSettings: config.NewProcessorSettings(component.NewID(typeStr)), DefaultExporters: []string{"otlp"}, AttributeSource: "context", FromAttribute: "X-Tenant", @@ -51,7 +52,7 @@ func TestLoadConfig(t *testing.T) { { configPath: "config_metrics.yaml", expected: &Config{ - ProcessorSettings: config.NewProcessorSettings(config.NewComponentID(typeStr)), + ProcessorSettings: config.NewProcessorSettings(component.NewID(typeStr)), DefaultExporters: []string{"logging/default"}, AttributeSource: "context", FromAttribute: "X-Custom-Metrics-Header", @@ -70,7 +71,7 @@ func TestLoadConfig(t *testing.T) { { configPath: "config_logs.yaml", expected: &Config{ - ProcessorSettings: config.NewProcessorSettings(config.NewComponentID(typeStr)), + ProcessorSettings: config.NewProcessorSettings(component.NewID(typeStr)), DefaultExporters: []string{"logging/default"}, AttributeSource: "context", FromAttribute: "X-Custom-Logs-Header", @@ -96,9 +97,9 @@ func TestLoadConfig(t *testing.T) { factory := NewFactory() cfg := factory.CreateDefaultConfig() - sub, err := cm.Sub(config.NewComponentIDWithName(typeStr, "").String()) + sub, err := cm.Sub(component.NewIDWithName(typeStr, "").String()) require.NoError(t, err) - require.NoError(t, config.UnmarshalProcessor(sub, cfg)) + require.NoError(t, component.UnmarshalProcessorConfig(sub, cfg)) assert.NoError(t, cfg.Validate()) assert.Equal(t, tt.expected, cfg) @@ -109,7 +110,7 @@ func TestLoadConfig(t *testing.T) { func TestValidateConfig(t *testing.T) { tests := []struct { name string - config config.Processor + config component.ProcessorConfig error string }{ { diff --git a/processor/routingprocessor/factory.go b/processor/routingprocessor/factory.go index 4080f9e5cf6c..b07942ee934d 100644 --- a/processor/routingprocessor/factory.go +++ b/processor/routingprocessor/factory.go @@ -41,24 +41,24 @@ func NewFactory() component.ProcessorFactory { ) } -func createDefaultConfig() config.Processor { +func createDefaultConfig() component.ProcessorConfig { return &Config{ - ProcessorSettings: config.NewProcessorSettings(config.NewComponentID(typeStr)), + ProcessorSettings: config.NewProcessorSettings(component.NewID(typeStr)), AttributeSource: defaultAttributeSource, } } -func createTracesProcessor(_ context.Context, params component.ProcessorCreateSettings, cfg config.Processor, nextConsumer consumer.Traces) (component.TracesProcessor, error) { +func createTracesProcessor(_ context.Context, params component.ProcessorCreateSettings, cfg component.ProcessorConfig, nextConsumer consumer.Traces) (component.TracesProcessor, error) { warnIfNotLastInPipeline(nextConsumer, params.Logger) return newTracesProcessor(params.TelemetrySettings, cfg), nil } -func createMetricsProcessor(_ context.Context, params component.ProcessorCreateSettings, cfg config.Processor, nextConsumer consumer.Metrics) (component.MetricsProcessor, error) { +func createMetricsProcessor(_ context.Context, params component.ProcessorCreateSettings, cfg component.ProcessorConfig, nextConsumer consumer.Metrics) (component.MetricsProcessor, error) { warnIfNotLastInPipeline(nextConsumer, params.Logger) return newMetricProcessor(params.TelemetrySettings, cfg), nil } -func createLogsProcessor(_ context.Context, params component.ProcessorCreateSettings, cfg config.Processor, nextConsumer consumer.Logs) (component.LogsProcessor, error) { +func createLogsProcessor(_ context.Context, params component.ProcessorCreateSettings, cfg component.ProcessorConfig, nextConsumer consumer.Logs) (component.LogsProcessor, error) { warnIfNotLastInPipeline(nextConsumer, params.Logger) return newLogProcessor(params.TelemetrySettings, cfg), nil } diff --git a/processor/routingprocessor/factory_test.go b/processor/routingprocessor/factory_test.go index 9096dc9547ec..8f81467a889c 100644 --- a/processor/routingprocessor/factory_test.go +++ b/processor/routingprocessor/factory_test.go @@ -38,7 +38,7 @@ func TestProcessorGetsCreatedWithValidConfiguration(t *testing.T) { factory := NewFactory() creationParams := componenttest.NewNopProcessorCreateSettings() cfg := &Config{ - ProcessorSettings: config.NewProcessorSettings(config.NewComponentID(typeStr)), + ProcessorSettings: config.NewProcessorSettings(component.NewID(typeStr)), DefaultExporters: []string{"otlp"}, FromAttribute: "X-Tenant", Table: []RoutingTableItem{ @@ -79,7 +79,7 @@ func TestFailOnEmptyConfiguration(t *testing.T) { func TestProcessorFailsToBeCreatedWhenRouteHasNoExporters(t *testing.T) { // prepare cfg := &Config{ - ProcessorSettings: config.NewProcessorSettings(config.NewComponentID(typeStr)), + ProcessorSettings: config.NewProcessorSettings(component.NewID(typeStr)), DefaultExporters: []string{"otlp"}, FromAttribute: "X-Tenant", Table: []RoutingTableItem{ @@ -93,7 +93,7 @@ func TestProcessorFailsToBeCreatedWhenRouteHasNoExporters(t *testing.T) { func TestProcessorFailsToBeCreatedWhenNoRoutesExist(t *testing.T) { cfg := &Config{ - ProcessorSettings: config.NewProcessorSettings(config.NewComponentID(typeStr)), + ProcessorSettings: config.NewProcessorSettings(component.NewID(typeStr)), DefaultExporters: []string{"otlp"}, FromAttribute: "X-Tenant", Table: []RoutingTableItem{}, @@ -103,7 +103,7 @@ func TestProcessorFailsToBeCreatedWhenNoRoutesExist(t *testing.T) { func TestProcessorFailsWithNoFromAttribute(t *testing.T) { cfg := &Config{ - ProcessorSettings: config.NewProcessorSettings(config.NewComponentID(typeStr)), + ProcessorSettings: config.NewProcessorSettings(component.NewID(typeStr)), DefaultExporters: []string{"otlp"}, Table: []RoutingTableItem{ { @@ -120,7 +120,7 @@ func TestShouldNotFailWhenNextIsProcessor(t *testing.T) { factory := NewFactory() creationParams := componenttest.NewNopProcessorCreateSettings() cfg := &Config{ - ProcessorSettings: config.NewProcessorSettings(config.NewComponentID(typeStr)), + ProcessorSettings: config.NewProcessorSettings(component.NewID(typeStr)), DefaultExporters: []string{"otlp"}, FromAttribute: "X-Tenant", Table: []RoutingTableItem{ @@ -155,7 +155,7 @@ func TestProcessorDoesNotFailToBuildExportersWithMultiplePipelines(t *testing.T) factories.Exporters["otlp"] = otlpExporterFactory otlpConfig := &otlpexporter.Config{ - ExporterSettings: config.NewExporterSettings(config.NewComponentID("otlp")), + ExporterSettings: config.NewExporterSettings(component.NewID("otlp")), GRPCClientSettings: configgrpc.GRPCClientSettings{ Endpoint: "example.com:1234", }, @@ -169,13 +169,13 @@ func TestProcessorDoesNotFailToBuildExportersWithMultiplePipelines(t *testing.T) host := &mockHost{ Host: componenttest.NewNopHost(), - GetExportersFunc: func() map[config.DataType]map[config.ComponentID]component.Exporter { - return map[config.DataType]map[config.ComponentID]component.Exporter{ - config.TracesDataType: { - config.NewComponentID("otlp/traces"): otlpTracesExporter, + GetExportersFunc: func() map[component.DataType]map[component.ID]component.Exporter { + return map[component.DataType]map[component.ID]component.Exporter{ + component.DataTypeTraces: { + component.NewID("otlp/traces"): otlpTracesExporter, }, - config.MetricsDataType: { - config.NewComponentID("otlp/metrics"): otlpMetricsExporter, + component.DataTypeMetrics: { + component.NewID("otlp/metrics"): otlpMetricsExporter, }, } }, @@ -191,7 +191,7 @@ func TestProcessorDoesNotFailToBuildExportersWithMultiplePipelines(t *testing.T) sub, err := cm.Sub(k) require.NoError(t, err) - require.NoError(t, config.UnmarshalProcessor(sub, cfg)) + require.NoError(t, component.UnmarshalProcessorConfig(sub, cfg)) exp := newMetricProcessor(component.TelemetrySettings{Logger: zap.NewNop()}, cfg) err = exp.Start(context.Background(), host) @@ -207,7 +207,7 @@ func TestShutdown(t *testing.T) { factory := NewFactory() creationParams := componenttest.NewNopProcessorCreateSettings() cfg := &Config{ - ProcessorSettings: config.NewProcessorSettings(config.NewComponentID(typeStr)), + ProcessorSettings: config.NewProcessorSettings(component.NewID(typeStr)), DefaultExporters: []string{"otlp"}, FromAttribute: "X-Tenant", Table: []RoutingTableItem{ @@ -237,10 +237,10 @@ func (mp *mockProcessor) processTraces(context.Context, ptrace.Traces) (ptrace.T type mockHost struct { component.Host - GetExportersFunc func() map[config.DataType]map[config.ComponentID]component.Exporter + GetExportersFunc func() map[component.DataType]map[component.ID]component.Exporter } -func (m *mockHost) GetExporters() map[config.DataType]map[config.ComponentID]component.Exporter { +func (m *mockHost) GetExporters() map[component.DataType]map[component.ID]component.Exporter { if m.GetExportersFunc != nil { return m.GetExportersFunc() } diff --git a/processor/routingprocessor/go.mod b/processor/routingprocessor/go.mod index 2a1a6777ff4f..909fc348b739 100644 --- a/processor/routingprocessor/go.mod +++ b/processor/routingprocessor/go.mod @@ -5,9 +5,9 @@ go 1.18 require ( github.com/open-telemetry/opentelemetry-collector-contrib/pkg/ottl v0.63.0 github.com/stretchr/testify v1.8.1 - go.opentelemetry.io/collector v0.63.2-0.20221104003159-6b27644724d8 - go.opentelemetry.io/collector/exporter/otlpexporter v0.63.2-0.20221104003159-6b27644724d8 - go.opentelemetry.io/collector/pdata v0.63.2-0.20221104003159-6b27644724d8 + go.opentelemetry.io/collector v0.63.2-0.20221108014805-0b08d5316426 + go.opentelemetry.io/collector/exporter/otlpexporter v0.63.2-0.20221108014805-0b08d5316426 + go.opentelemetry.io/collector/pdata v0.63.2-0.20221108014805-0b08d5316426 go.uber.org/multierr v1.8.0 go.uber.org/zap v1.23.0 google.golang.org/grpc v1.50.1 @@ -37,7 +37,7 @@ require ( github.com/pelletier/go-toml v1.9.5 // indirect github.com/pmezard/go-difflib v1.0.0 // indirect github.com/rogpeppe/go-internal v1.6.2 // indirect - go.opencensus.io v0.23.0 // indirect + go.opencensus.io v0.24.0 // 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 eb057b7f86e2..9c677399c44b 100644 --- a/processor/routingprocessor/go.sum +++ b/processor/routingprocessor/go.sum @@ -255,7 +255,7 @@ github.com/prometheus/client_golang v0.9.1/go.mod h1:7SWBe2y4D6OKWSNQJUaRYU/AaXP github.com/prometheus/client_golang v1.0.0/go.mod h1:db9x61etRT2tGnBNRi70OPL5FsnadC4Ky3P0J6CfImo= github.com/prometheus/client_golang v1.7.1/go.mod h1:PY5Wy2awLA44sXw4AOSfFBetzPP4j5+D6mVACh+pe2M= github.com/prometheus/client_golang v1.11.1/go.mod h1:Z6t4BnS23TR94PD6BsDNk8yVqroYurpAkEiz0P2BEV0= -github.com/prometheus/client_golang v1.13.0 h1:b71QUfeo5M8gq2+evJdTPfZhYMAU0uKPkyPJ7TPsloU= +github.com/prometheus/client_golang v1.13.1 h1:3gMjIY2+/hzmqhtUC/aQNYldJA6DtH3CgQvwS+02K1c= github.com/prometheus/client_model v0.0.0-20180712105110-5c3871d89910/go.mod h1:MbSGuTsp3dbXC40dX6PRTWyKYBIrTGTE9sqQNg2J8bo= github.com/prometheus/client_model v0.0.0-20190129233127-fd36f4220a90/go.mod h1:xMI15A0UPsDsEKsMN9yxemIoYk6Tm2C1GtYGdfGttqA= github.com/prometheus/client_model v0.0.0-20190812154241-14fe0d1b01d4/go.mod h1:xMI15A0UPsDsEKsMN9yxemIoYk6Tm2C1GtYGdfGttqA= @@ -293,7 +293,6 @@ github.com/stretchr/testify v1.2.2/go.mod h1:a8OnRcib4nhh0OaRAV+Yts87kKdq0PP7pXf github.com/stretchr/testify v1.3.0/go.mod h1:M5WIy9Dh21IEIfnGCwXGc5bZfKNJtfHm1UVUgZn+9EI= github.com/stretchr/testify v1.4.0/go.mod h1:j7eGeouHqKxXV5pUuKE4zz7dFj8WfuZ+81PSLYec5m4= github.com/stretchr/testify v1.5.1/go.mod h1:5W2xD1RspED5o8YsWQXVCued0rvSQ+mT+I5cxcmMvtA= -github.com/stretchr/testify v1.6.1/go.mod h1:6Fq8oRcR53rry900zMqJjRRixrwX3KX962/h/Wwjteg= github.com/stretchr/testify v1.7.0/go.mod h1:6Fq8oRcR53rry900zMqJjRRixrwX3KX962/h/Wwjteg= github.com/stretchr/testify v1.7.1/go.mod h1:6Fq8oRcR53rry900zMqJjRRixrwX3KX962/h/Wwjteg= github.com/stretchr/testify v1.8.0/go.mod h1:yNjHg4UonilssWZ8iaSj1OCr/vHnekPRkoO+kdMU+MU= @@ -305,14 +304,14 @@ 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.opencensus.io v0.23.0 h1:gqCw0LfLxScz8irSi8exQc7fyQ0fKQU/qnC/X8+V/1M= -go.opencensus.io v0.23.0/go.mod h1:XItmlyltB5F7CS4xOC1DcqMoFqwtC6OG2xF7mCv7P7E= -go.opentelemetry.io/collector v0.63.2-0.20221104003159-6b27644724d8 h1:rOT5HzXXfSISc6FiH012zH2/EFjp37UXfjEqj5BpkWQ= -go.opentelemetry.io/collector v0.63.2-0.20221104003159-6b27644724d8/go.mod h1:JVmeZXugK4ondC6KQgrHTHWiF4JttpG5k6dWPMt62+k= -go.opentelemetry.io/collector/exporter/otlpexporter v0.63.2-0.20221104003159-6b27644724d8 h1:LH4Xta7BzlK9kJwpYqdUApjHsv2rU+zivpTE8Iu7KJM= -go.opentelemetry.io/collector/exporter/otlpexporter v0.63.2-0.20221104003159-6b27644724d8/go.mod h1:t1QwWfBfdEsI80R28T9PeVFGm8f32ZGLdY+CAEfr2LI= -go.opentelemetry.io/collector/pdata v0.63.2-0.20221104003159-6b27644724d8 h1:7xeTQjfsOm9eogQeIxjSEhlik9qsbBGsnmkQHfyKaRE= -go.opentelemetry.io/collector/pdata v0.63.2-0.20221104003159-6b27644724d8/go.mod h1:IzvXUGQml2mrnvdb8zIlEW3qQs9oFLdD2hLwJdZ+pek= +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.63.2-0.20221108014805-0b08d5316426 h1:z/wLTMh7/vNxcFUDa5uG7/IPE3tYx6pzCWPV41ghyV8= +go.opentelemetry.io/collector v0.63.2-0.20221108014805-0b08d5316426/go.mod h1:+Zb70q0Rq17dA9FcHTiTjW6g96lvJ8kAZ0c+eWNkAv0= +go.opentelemetry.io/collector/exporter/otlpexporter v0.63.2-0.20221108014805-0b08d5316426 h1:zPTV1p+QFGd2e7f4DEwkujkeezTBGkurl2wrM9QZ3Dc= +go.opentelemetry.io/collector/exporter/otlpexporter v0.63.2-0.20221108014805-0b08d5316426/go.mod h1:ZdasRXXeeuXukj6gfIb4VJw3W5N4+fhMagKE1TEMOxM= +go.opentelemetry.io/collector/pdata v0.63.2-0.20221108014805-0b08d5316426 h1:wKDpgP0Tx/gWI2SgDGAY1OTSeihhDivbbRqFR79IGTc= +go.opentelemetry.io/collector/pdata v0.63.2-0.20221108014805-0b08d5316426/go.mod h1:IzvXUGQml2mrnvdb8zIlEW3qQs9oFLdD2hLwJdZ+pek= 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/routingprocessor/logs.go b/processor/routingprocessor/logs.go index 811a4038c633..df0d852933e3 100644 --- a/processor/routingprocessor/logs.go +++ b/processor/routingprocessor/logs.go @@ -18,7 +18,6 @@ import ( "context" "go.opentelemetry.io/collector/component" - "go.opentelemetry.io/collector/config" "go.opentelemetry.io/collector/consumer" "go.opentelemetry.io/collector/pdata/pcommon" "go.opentelemetry.io/collector/pdata/plog" @@ -39,7 +38,7 @@ type logProcessor struct { router router[component.LogsExporter, ottllogs.TransformContext] } -func newLogProcessor(settings component.TelemetrySettings, config config.Processor) *logProcessor { +func newLogProcessor(settings component.TelemetrySettings, config component.ProcessorConfig) *logProcessor { cfg := rewriteRoutingEntriesToOTTL(config.(*Config)) return &logProcessor{ @@ -56,7 +55,7 @@ func newLogProcessor(settings component.TelemetrySettings, config config.Process } func (p *logProcessor) Start(_ context.Context, host component.Host) error { - err := p.router.registerExporters(host.GetExporters()[config.LogsDataType]) + err := p.router.registerExporters(host.GetExporters()[component.DataTypeLogs]) if err != nil { return err } diff --git a/processor/routingprocessor/logs_test.go b/processor/routingprocessor/logs_test.go index f15ce5fcffa5..f1e02bfa0a52 100644 --- a/processor/routingprocessor/logs_test.go +++ b/processor/routingprocessor/logs_test.go @@ -22,7 +22,6 @@ import ( "github.com/stretchr/testify/require" "go.opentelemetry.io/collector/component" "go.opentelemetry.io/collector/component/componenttest" - "go.opentelemetry.io/collector/config" "go.opentelemetry.io/collector/consumer/consumertest" "go.opentelemetry.io/collector/pdata/plog" "go.uber.org/zap" @@ -53,11 +52,11 @@ func TestLogs_RoutingWorks_Context(t *testing.T) { host := &mockHost{ Host: componenttest.NewNopHost(), - GetExportersFunc: func() map[config.DataType]map[config.ComponentID]component.Exporter { - return map[config.DataType]map[config.ComponentID]component.Exporter{ - config.LogsDataType: { - config.NewComponentID("otlp"): defaultExp, - config.NewComponentIDWithName("otlp", "2"): lExp, + GetExportersFunc: func() map[component.DataType]map[component.ID]component.Exporter { + return map[component.DataType]map[component.ID]component.Exporter{ + component.DataTypeLogs: { + component.NewID("otlp"): defaultExp, + component.NewIDWithName("otlp", "2"): lExp, }, } }, @@ -117,11 +116,11 @@ func TestLogs_RoutingWorks_ResourceAttribute(t *testing.T) { host := &mockHost{ Host: componenttest.NewNopHost(), - GetExportersFunc: func() map[config.DataType]map[config.ComponentID]component.Exporter { - return map[config.DataType]map[config.ComponentID]component.Exporter{ - config.LogsDataType: { - config.NewComponentID("otlp"): defaultExp, - config.NewComponentIDWithName("otlp", "2"): lExp, + GetExportersFunc: func() map[component.DataType]map[component.ID]component.Exporter { + return map[component.DataType]map[component.ID]component.Exporter{ + component.DataTypeLogs: { + component.NewID("otlp"): defaultExp, + component.NewIDWithName("otlp", "2"): lExp, }, } }, @@ -175,11 +174,11 @@ func TestLogs_RoutingWorks_ResourceAttribute_DropsRoutingAttribute(t *testing.T) host := &mockHost{ Host: componenttest.NewNopHost(), - GetExportersFunc: func() map[config.DataType]map[config.ComponentID]component.Exporter { - return map[config.DataType]map[config.ComponentID]component.Exporter{ - config.LogsDataType: { - config.NewComponentID("otlp"): defaultExp, - config.NewComponentIDWithName("otlp", "2"): lExp, + GetExportersFunc: func() map[component.DataType]map[component.ID]component.Exporter { + return map[component.DataType]map[component.ID]component.Exporter{ + component.DataTypeLogs: { + component.NewID("otlp"): defaultExp, + component.NewIDWithName("otlp", "2"): lExp, }, } }, @@ -222,11 +221,11 @@ func TestLogs_AreCorrectlySplitPerResourceAttributeRouting(t *testing.T) { host := &mockHost{ Host: componenttest.NewNopHost(), - GetExportersFunc: func() map[config.DataType]map[config.ComponentID]component.Exporter { - return map[config.DataType]map[config.ComponentID]component.Exporter{ - config.LogsDataType: { - config.NewComponentID("otlp"): defaultExp, - config.NewComponentIDWithName("otlp", "2"): lExp, + GetExportersFunc: func() map[component.DataType]map[component.ID]component.Exporter { + return map[component.DataType]map[component.ID]component.Exporter{ + component.DataTypeLogs: { + component.NewID("otlp"): defaultExp, + component.NewIDWithName("otlp", "2"): lExp, }, } }, @@ -280,12 +279,12 @@ func TestLogsAreCorrectlySplitPerResourceAttributeWithOTTL(t *testing.T) { host := &mockHost{ Host: componenttest.NewNopHost(), - GetExportersFunc: func() map[config.DataType]map[config.ComponentID]component.Exporter { - return map[config.DataType]map[config.ComponentID]component.Exporter{ - config.LogsDataType: { - config.NewComponentID("otlp"): defaultExp, - config.NewComponentIDWithName("otlp", "1"): firstExp, - config.NewComponentIDWithName("otlp", "2"): secondExp, + GetExportersFunc: func() map[component.DataType]map[component.ID]component.Exporter { + return map[component.DataType]map[component.ID]component.Exporter{ + component.DataTypeLogs: { + component.NewID("otlp"): defaultExp, + component.NewIDWithName("otlp", "1"): firstExp, + component.NewIDWithName("otlp", "2"): secondExp, }, } }, diff --git a/processor/routingprocessor/metrics.go b/processor/routingprocessor/metrics.go index 28ee7d29f7ff..0b101fe498f8 100644 --- a/processor/routingprocessor/metrics.go +++ b/processor/routingprocessor/metrics.go @@ -18,7 +18,6 @@ import ( "context" "go.opentelemetry.io/collector/component" - "go.opentelemetry.io/collector/config" "go.opentelemetry.io/collector/consumer" "go.opentelemetry.io/collector/pdata/pcommon" "go.opentelemetry.io/collector/pdata/pmetric" @@ -39,7 +38,7 @@ type metricsProcessor struct { router router[component.MetricsExporter, ottldatapoints.TransformContext] } -func newMetricProcessor(settings component.TelemetrySettings, config config.Processor) *metricsProcessor { +func newMetricProcessor(settings component.TelemetrySettings, config component.ProcessorConfig) *metricsProcessor { cfg := rewriteRoutingEntriesToOTTL(config.(*Config)) return &metricsProcessor{ @@ -56,7 +55,7 @@ func newMetricProcessor(settings component.TelemetrySettings, config config.Proc } func (p *metricsProcessor) Start(_ context.Context, host component.Host) error { - err := p.router.registerExporters(host.GetExporters()[config.MetricsDataType]) + err := p.router.registerExporters(host.GetExporters()[component.DataTypeMetrics]) if err != nil { return err } diff --git a/processor/routingprocessor/metrics_test.go b/processor/routingprocessor/metrics_test.go index 6ca24766fb17..8ba7a9bb92ea 100644 --- a/processor/routingprocessor/metrics_test.go +++ b/processor/routingprocessor/metrics_test.go @@ -22,7 +22,6 @@ import ( "github.com/stretchr/testify/require" "go.opentelemetry.io/collector/component" "go.opentelemetry.io/collector/component/componenttest" - "go.opentelemetry.io/collector/config" "go.opentelemetry.io/collector/consumer/consumertest" "go.opentelemetry.io/collector/pdata/pmetric" "go.uber.org/zap" @@ -53,11 +52,11 @@ func TestMetrics_AreCorrectlySplitPerResourceAttributeRouting(t *testing.T) { host := &mockHost{ Host: componenttest.NewNopHost(), - GetExportersFunc: func() map[config.DataType]map[config.ComponentID]component.Exporter { - return map[config.DataType]map[config.ComponentID]component.Exporter{ - config.MetricsDataType: { - config.NewComponentID("otlp"): defaultExp, - config.NewComponentIDWithName("otlp", "2"): mExp, + GetExportersFunc: func() map[component.DataType]map[component.ID]component.Exporter { + return map[component.DataType]map[component.ID]component.Exporter{ + component.DataTypeMetrics: { + component.NewID("otlp"): defaultExp, + component.NewIDWithName("otlp", "2"): mExp, }, } }, @@ -116,11 +115,11 @@ func TestMetrics_RoutingWorks_Context(t *testing.T) { host := &mockHost{ Host: componenttest.NewNopHost(), - GetExportersFunc: func() map[config.DataType]map[config.ComponentID]component.Exporter { - return map[config.DataType]map[config.ComponentID]component.Exporter{ - config.MetricsDataType: { - config.NewComponentID("otlp"): defaultExp, - config.NewComponentIDWithName("otlp", "2"): mExp, + GetExportersFunc: func() map[component.DataType]map[component.ID]component.Exporter { + return map[component.DataType]map[component.ID]component.Exporter{ + component.DataTypeMetrics: { + component.NewID("otlp"): defaultExp, + component.NewIDWithName("otlp", "2"): mExp, }, } }, @@ -180,11 +179,11 @@ func TestMetrics_RoutingWorks_ResourceAttribute(t *testing.T) { host := &mockHost{ Host: componenttest.NewNopHost(), - GetExportersFunc: func() map[config.DataType]map[config.ComponentID]component.Exporter { - return map[config.DataType]map[config.ComponentID]component.Exporter{ - config.MetricsDataType: { - config.NewComponentID("otlp"): defaultExp, - config.NewComponentIDWithName("otlp", "2"): mExp, + GetExportersFunc: func() map[component.DataType]map[component.ID]component.Exporter { + return map[component.DataType]map[component.ID]component.Exporter{ + component.DataTypeMetrics: { + component.NewID("otlp"): defaultExp, + component.NewIDWithName("otlp", "2"): mExp, }, } }, @@ -238,11 +237,11 @@ func TestMetrics_RoutingWorks_ResourceAttribute_DropsRoutingAttribute(t *testing host := &mockHost{ Host: componenttest.NewNopHost(), - GetExportersFunc: func() map[config.DataType]map[config.ComponentID]component.Exporter { - return map[config.DataType]map[config.ComponentID]component.Exporter{ - config.MetricsDataType: { - config.NewComponentID("otlp"): defaultExp, - config.NewComponentIDWithName("otlp", "2"): mExp, + GetExportersFunc: func() map[component.DataType]map[component.ID]component.Exporter { + return map[component.DataType]map[component.ID]component.Exporter{ + component.DataTypeMetrics: { + component.NewID("otlp"): defaultExp, + component.NewIDWithName("otlp", "2"): mExp, }, } }, @@ -303,11 +302,11 @@ func Benchmark_MetricsRouting_ResourceAttribute(b *testing.B) { host := &mockHost{ Host: componenttest.NewNopHost(), - GetExportersFunc: func() map[config.DataType]map[config.ComponentID]component.Exporter { - return map[config.DataType]map[config.ComponentID]component.Exporter{ - config.MetricsDataType: { - config.NewComponentID("otlp"): defaultExp, - config.NewComponentIDWithName("otlp", "2"): mExp, + GetExportersFunc: func() map[component.DataType]map[component.ID]component.Exporter { + return map[component.DataType]map[component.ID]component.Exporter{ + component.DataTypeMetrics: { + component.NewID("otlp"): defaultExp, + component.NewIDWithName("otlp", "2"): mExp, }, } }, @@ -339,12 +338,12 @@ func TestMetricsAreCorrectlySplitPerResourceAttributeRoutingWithOTTL(t *testing. host := &mockHost{ Host: componenttest.NewNopHost(), - GetExportersFunc: func() map[config.DataType]map[config.ComponentID]component.Exporter { - return map[config.DataType]map[config.ComponentID]component.Exporter{ - config.MetricsDataType: { - config.NewComponentID("otlp"): defaultExp, - config.NewComponentIDWithName("otlp", "1"): firstExp, - config.NewComponentIDWithName("otlp", "2"): secondExp, + GetExportersFunc: func() map[component.DataType]map[component.ID]component.Exporter { + return map[component.DataType]map[component.ID]component.Exporter{ + component.DataTypeMetrics: { + component.NewID("otlp"): defaultExp, + component.NewIDWithName("otlp", "1"): firstExp, + component.NewIDWithName("otlp", "2"): secondExp, }, } }, diff --git a/processor/routingprocessor/router.go b/processor/routingprocessor/router.go index 432c2957f426..6a60eea29b51 100644 --- a/processor/routingprocessor/router.go +++ b/processor/routingprocessor/router.go @@ -19,7 +19,6 @@ import ( "fmt" "go.opentelemetry.io/collector/component" - "go.opentelemetry.io/collector/config" "go.uber.org/zap" "github.com/open-telemetry/opentelemetry-collector-contrib/pkg/ottl" @@ -65,7 +64,7 @@ type routingItem[E component.Exporter, K any] struct { statement *ottl.Statement[K] } -func (r *router[E, K]) registerExporters(available map[config.ComponentID]component.Exporter) error { +func (r *router[E, K]) registerExporters(available map[component.ID]component.Exporter) error { // register default exporters err := r.registerDefaultExporters(available) if err != nil { @@ -83,7 +82,7 @@ func (r *router[E, K]) registerExporters(available map[config.ComponentID]compon // registerDefaultExporters registers the configured default exporters // using the provided available exporters map. -func (r *router[E, K]) registerDefaultExporters(available map[config.ComponentID]component.Exporter) error { +func (r *router[E, K]) registerDefaultExporters(available map[component.ID]component.Exporter) error { for _, name := range r.defaultExporterIDs { e, err := r.extractExporter(name, available) if errors.Is(err, errExporterNotFound) { @@ -100,7 +99,7 @@ func (r *router[E, K]) registerDefaultExporters(available map[config.ComponentID // registerRouteExporters registers route exporters using the provided // available exporters map to check if they were available. -func (r *router[E, K]) registerRouteExporters(available map[config.ComponentID]component.Exporter) error { +func (r *router[E, K]) registerRouteExporters(available map[component.ID]component.Exporter) error { for _, item := range r.table { statement, err := r.getStatementFrom(item) if err != nil { @@ -154,11 +153,11 @@ func key(entry RoutingTableItem) string { // extractExporter returns an exporter for the given name (type/name) and type // argument if it exists in the list of available exporters. -func (r *router[E, K]) extractExporter(name string, available map[config.ComponentID]component.Exporter) (E, error) { +func (r *router[E, K]) extractExporter(name string, available map[component.ID]component.Exporter) (E, error) { var exporter E - id, err := config.NewComponentIDFromString(name) - if err != nil { + id := component.ID{} + if err := id.UnmarshalText([]byte(name)); err != nil { return exporter, err } v, ok := available[id] diff --git a/processor/routingprocessor/traces.go b/processor/routingprocessor/traces.go index 8c302d34404e..97206856c938 100644 --- a/processor/routingprocessor/traces.go +++ b/processor/routingprocessor/traces.go @@ -18,7 +18,6 @@ import ( "context" "go.opentelemetry.io/collector/component" - "go.opentelemetry.io/collector/config" "go.opentelemetry.io/collector/consumer" "go.opentelemetry.io/collector/pdata/pcommon" "go.opentelemetry.io/collector/pdata/ptrace" @@ -39,7 +38,7 @@ type tracesProcessor struct { router router[component.TracesExporter, ottltraces.TransformContext] } -func newTracesProcessor(settings component.TelemetrySettings, config config.Processor) *tracesProcessor { +func newTracesProcessor(settings component.TelemetrySettings, config component.ProcessorConfig) *tracesProcessor { cfg := rewriteRoutingEntriesToOTTL(config.(*Config)) return &tracesProcessor{ @@ -56,7 +55,7 @@ func newTracesProcessor(settings component.TelemetrySettings, config config.Proc } func (p *tracesProcessor) Start(_ context.Context, host component.Host) error { - err := p.router.registerExporters(host.GetExporters()[config.TracesDataType]) + err := p.router.registerExporters(host.GetExporters()[component.DataTypeTraces]) if err != nil { return err } diff --git a/processor/routingprocessor/traces_test.go b/processor/routingprocessor/traces_test.go index f3ca03a94b57..bc5187056d31 100644 --- a/processor/routingprocessor/traces_test.go +++ b/processor/routingprocessor/traces_test.go @@ -46,7 +46,7 @@ func TestTraces_RegisterExportersForValidRoute(t *testing.T) { otlpExpFactory := otlpexporter.NewFactory() otlpConfig := &otlpexporter.Config{ - ExporterSettings: config.NewExporterSettings(config.NewComponentID("otlp")), + ExporterSettings: config.NewExporterSettings(component.NewID("otlp")), GRPCClientSettings: configgrpc.GRPCClientSettings{ Endpoint: "example.com:1234", }, @@ -56,9 +56,9 @@ func TestTraces_RegisterExportersForValidRoute(t *testing.T) { host := &mockHost{ Host: componenttest.NewNopHost(), - GetExportersFunc: func() map[config.DataType]map[config.ComponentID]component.Exporter { - return map[config.DataType]map[config.ComponentID]component.Exporter{ - config.TracesDataType: { + GetExportersFunc: func() map[component.DataType]map[component.ID]component.Exporter { + return map[component.DataType]map[component.ID]component.Exporter{ + component.DataTypeTraces: { otlpConfig.ID(): otlpExp, }, } @@ -87,10 +87,10 @@ func TestTraces_InvalidExporter(t *testing.T) { host := &mockHost{ Host: componenttest.NewNopHost(), - GetExportersFunc: func() map[config.DataType]map[config.ComponentID]component.Exporter { - return map[config.DataType]map[config.ComponentID]component.Exporter{ - config.TracesDataType: { - config.NewComponentID("otlp"): &mockComponent{}, + GetExportersFunc: func() map[component.DataType]map[component.ID]component.Exporter { + return map[component.DataType]map[component.ID]component.Exporter{ + component.DataTypeTraces: { + component.NewID("otlp"): &mockComponent{}, }, } }, @@ -109,11 +109,11 @@ func TestTraces_AreCorrectlySplitPerResourceAttributeRouting(t *testing.T) { host := &mockHost{ Host: componenttest.NewNopHost(), - GetExportersFunc: func() map[config.DataType]map[config.ComponentID]component.Exporter { - return map[config.DataType]map[config.ComponentID]component.Exporter{ - config.TracesDataType: { - config.NewComponentID("otlp"): defaultExp, - config.NewComponentIDWithName("otlp", "2"): tExp, + GetExportersFunc: func() map[component.DataType]map[component.ID]component.Exporter { + return map[component.DataType]map[component.ID]component.Exporter{ + component.DataTypeTraces: { + component.NewID("otlp"): defaultExp, + component.NewIDWithName("otlp", "2"): tExp, }, } }, @@ -169,11 +169,11 @@ func TestTraces_RoutingWorks_Context(t *testing.T) { host := &mockHost{ Host: componenttest.NewNopHost(), - GetExportersFunc: func() map[config.DataType]map[config.ComponentID]component.Exporter { - return map[config.DataType]map[config.ComponentID]component.Exporter{ - config.TracesDataType: { - config.NewComponentID("otlp"): defaultExp, - config.NewComponentIDWithName("otlp", "2"): tExp, + GetExportersFunc: func() map[component.DataType]map[component.ID]component.Exporter { + return map[component.DataType]map[component.ID]component.Exporter{ + component.DataTypeTraces: { + component.NewID("otlp"): defaultExp, + component.NewIDWithName("otlp", "2"): tExp, }, } }, @@ -233,11 +233,11 @@ func TestTraces_RoutingWorks_ResourceAttribute(t *testing.T) { host := &mockHost{ Host: componenttest.NewNopHost(), - GetExportersFunc: func() map[config.DataType]map[config.ComponentID]component.Exporter { - return map[config.DataType]map[config.ComponentID]component.Exporter{ - config.TracesDataType: { - config.NewComponentID("otlp"): defaultExp, - config.NewComponentIDWithName("otlp", "2"): tExp, + GetExportersFunc: func() map[component.DataType]map[component.ID]component.Exporter { + return map[component.DataType]map[component.ID]component.Exporter{ + component.DataTypeTraces: { + component.NewID("otlp"): defaultExp, + component.NewIDWithName("otlp", "2"): tExp, }, } }, @@ -291,11 +291,11 @@ func TestTraces_RoutingWorks_ResourceAttribute_DropsRoutingAttribute(t *testing. host := &mockHost{ Host: componenttest.NewNopHost(), - GetExportersFunc: func() map[config.DataType]map[config.ComponentID]component.Exporter { - return map[config.DataType]map[config.ComponentID]component.Exporter{ - config.TracesDataType: { - config.NewComponentID("otlp"): defaultExp, - config.NewComponentIDWithName("otlp", "2"): tExp, + GetExportersFunc: func() map[component.DataType]map[component.ID]component.Exporter { + return map[component.DataType]map[component.ID]component.Exporter{ + component.DataTypeTraces: { + component.NewID("otlp"): defaultExp, + component.NewIDWithName("otlp", "2"): tExp, }, } }, @@ -341,12 +341,12 @@ func TestTracesAreCorrectlySplitPerResourceAttributeWithOTTL(t *testing.T) { host := &mockHost{ Host: componenttest.NewNopHost(), - GetExportersFunc: func() map[config.DataType]map[config.ComponentID]component.Exporter { - return map[config.DataType]map[config.ComponentID]component.Exporter{ - config.TracesDataType: { - config.NewComponentID("otlp"): defaultExp, - config.NewComponentIDWithName("otlp", "1"): firstExp, - config.NewComponentIDWithName("otlp", "2"): secondExp, + GetExportersFunc: func() map[component.DataType]map[component.ID]component.Exporter { + return map[component.DataType]map[component.ID]component.Exporter{ + component.DataTypeTraces: { + component.NewID("otlp"): defaultExp, + component.NewIDWithName("otlp", "1"): firstExp, + component.NewIDWithName("otlp", "2"): secondExp, }, } }, diff --git a/processor/schemaprocessor/config_test.go b/processor/schemaprocessor/config_test.go index b9d078b7ab9c..ed064b648915 100644 --- a/processor/schemaprocessor/config_test.go +++ b/processor/schemaprocessor/config_test.go @@ -20,6 +20,7 @@ import ( "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" + "go.opentelemetry.io/collector/component" "go.opentelemetry.io/collector/config" "go.opentelemetry.io/collector/config/confighttp" "go.opentelemetry.io/collector/confmap/confmaptest" @@ -36,12 +37,12 @@ func TestLoadConfig(t *testing.T) { factory := NewFactory() cfg := factory.CreateDefaultConfig() - sub, err := cm.Sub(config.NewComponentIDWithName(typeStr, "with-all-options").String()) + sub, err := cm.Sub(component.NewIDWithName(typeStr, "with-all-options").String()) require.NoError(t, err) - require.NoError(t, config.UnmarshalProcessor(sub, cfg)) + require.NoError(t, component.UnmarshalProcessorConfig(sub, cfg)) assert.Equal(t, &Config{ - ProcessorSettings: config.NewProcessorSettings(config.NewComponentID(typeStr)), + ProcessorSettings: config.NewProcessorSettings(component.NewID(typeStr)), HTTPClientSettings: confighttp.NewDefaultHTTPClientSettings(), Prefetch: []string{ "https://opentelemetry.io/schemas/1.9.0", diff --git a/processor/schemaprocessor/factory.go b/processor/schemaprocessor/factory.go index 21d99e84f2d5..52db60e1baf0 100644 --- a/processor/schemaprocessor/factory.go +++ b/processor/schemaprocessor/factory.go @@ -37,9 +37,9 @@ type factory struct{} // newDefaultConfiguration returns the configuration for schema transformer processor // with the default values being used throughout it -func newDefaultConfiguration() config.Processor { +func newDefaultConfiguration() component.ProcessorConfig { return &Config{ - ProcessorSettings: config.NewProcessorSettings(config.NewComponentID(typeStr)), + ProcessorSettings: config.NewProcessorSettings(component.NewID(typeStr)), HTTPClientSettings: confighttp.NewDefaultHTTPClientSettings(), } } @@ -58,7 +58,7 @@ func NewFactory() component.ProcessorFactory { func (f factory) createLogsProcessor( ctx context.Context, set component.ProcessorCreateSettings, - cfg config.Processor, + cfg component.ProcessorConfig, next consumer.Logs, ) (component.LogsProcessor, error) { transformer, err := newTransformer(ctx, cfg, set) @@ -79,7 +79,7 @@ func (f factory) createLogsProcessor( func (f factory) createMetricsProcessor( ctx context.Context, set component.ProcessorCreateSettings, - cfg config.Processor, + cfg component.ProcessorConfig, next consumer.Metrics, ) (component.MetricsProcessor, error) { transformer, err := newTransformer(ctx, cfg, set) @@ -100,7 +100,7 @@ func (f factory) createMetricsProcessor( func (f factory) createTracesProcessor( ctx context.Context, set component.ProcessorCreateSettings, - cfg config.Processor, + cfg component.ProcessorConfig, next consumer.Traces, ) (component.TracesProcessor, error) { transformer, err := newTransformer(ctx, cfg, set) diff --git a/processor/schemaprocessor/go.mod b/processor/schemaprocessor/go.mod index 3b8b5363e83d..7a7ee3b079fb 100644 --- a/processor/schemaprocessor/go.mod +++ b/processor/schemaprocessor/go.mod @@ -4,8 +4,8 @@ go 1.18 require ( github.com/stretchr/testify v1.8.1 - go.opentelemetry.io/collector v0.63.2-0.20221104003159-6b27644724d8 - go.opentelemetry.io/collector/pdata v0.63.2-0.20221104003159-6b27644724d8 + go.opentelemetry.io/collector v0.63.2-0.20221108014805-0b08d5316426 + go.opentelemetry.io/collector/pdata v0.63.2-0.20221108014805-0b08d5316426 go.uber.org/zap v1.23.0 ) @@ -31,7 +31,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.opencensus.io v0.23.0 // indirect + go.opencensus.io v0.24.0 // 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 de52919c6e0c..6bee4f09dde6 100644 --- a/processor/schemaprocessor/go.sum +++ b/processor/schemaprocessor/go.sum @@ -270,7 +270,6 @@ github.com/stretchr/testify v1.2.2/go.mod h1:a8OnRcib4nhh0OaRAV+Yts87kKdq0PP7pXf github.com/stretchr/testify v1.3.0/go.mod h1:M5WIy9Dh21IEIfnGCwXGc5bZfKNJtfHm1UVUgZn+9EI= github.com/stretchr/testify v1.4.0/go.mod h1:j7eGeouHqKxXV5pUuKE4zz7dFj8WfuZ+81PSLYec5m4= github.com/stretchr/testify v1.5.1/go.mod h1:5W2xD1RspED5o8YsWQXVCued0rvSQ+mT+I5cxcmMvtA= -github.com/stretchr/testify v1.6.1/go.mod h1:6Fq8oRcR53rry900zMqJjRRixrwX3KX962/h/Wwjteg= github.com/stretchr/testify v1.7.0/go.mod h1:6Fq8oRcR53rry900zMqJjRRixrwX3KX962/h/Wwjteg= github.com/stretchr/testify v1.7.1/go.mod h1:6Fq8oRcR53rry900zMqJjRRixrwX3KX962/h/Wwjteg= github.com/stretchr/testify v1.8.0/go.mod h1:yNjHg4UonilssWZ8iaSj1OCr/vHnekPRkoO+kdMU+MU= @@ -282,12 +281,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.opencensus.io v0.23.0 h1:gqCw0LfLxScz8irSi8exQc7fyQ0fKQU/qnC/X8+V/1M= -go.opencensus.io v0.23.0/go.mod h1:XItmlyltB5F7CS4xOC1DcqMoFqwtC6OG2xF7mCv7P7E= -go.opentelemetry.io/collector v0.63.2-0.20221104003159-6b27644724d8 h1:rOT5HzXXfSISc6FiH012zH2/EFjp37UXfjEqj5BpkWQ= -go.opentelemetry.io/collector v0.63.2-0.20221104003159-6b27644724d8/go.mod h1:JVmeZXugK4ondC6KQgrHTHWiF4JttpG5k6dWPMt62+k= -go.opentelemetry.io/collector/pdata v0.63.2-0.20221104003159-6b27644724d8 h1:7xeTQjfsOm9eogQeIxjSEhlik9qsbBGsnmkQHfyKaRE= -go.opentelemetry.io/collector/pdata v0.63.2-0.20221104003159-6b27644724d8/go.mod h1:IzvXUGQml2mrnvdb8zIlEW3qQs9oFLdD2hLwJdZ+pek= +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.63.2-0.20221108014805-0b08d5316426 h1:z/wLTMh7/vNxcFUDa5uG7/IPE3tYx6pzCWPV41ghyV8= +go.opentelemetry.io/collector v0.63.2-0.20221108014805-0b08d5316426/go.mod h1:+Zb70q0Rq17dA9FcHTiTjW6g96lvJ8kAZ0c+eWNkAv0= +go.opentelemetry.io/collector/pdata v0.63.2-0.20221108014805-0b08d5316426 h1:wKDpgP0Tx/gWI2SgDGAY1OTSeihhDivbbRqFR79IGTc= +go.opentelemetry.io/collector/pdata v0.63.2-0.20221108014805-0b08d5316426/go.mod h1:IzvXUGQml2mrnvdb8zIlEW3qQs9oFLdD2hLwJdZ+pek= 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/schemaprocessor/transformer.go b/processor/schemaprocessor/transformer.go index 33396e3b7542..83de2f5964ee 100644 --- a/processor/schemaprocessor/transformer.go +++ b/processor/schemaprocessor/transformer.go @@ -19,7 +19,6 @@ import ( "errors" "go.opentelemetry.io/collector/component" - "go.opentelemetry.io/collector/config" "go.opentelemetry.io/collector/pdata/plog" "go.opentelemetry.io/collector/pdata/pmetric" "go.opentelemetry.io/collector/pdata/ptrace" @@ -33,7 +32,7 @@ type transformer struct { func newTransformer( _ context.Context, - conf config.Processor, + conf component.ProcessorConfig, set component.ProcessorCreateSettings, ) (*transformer, error) { cfg, ok := conf.(*Config) diff --git a/processor/servicegraphprocessor/config_test.go b/processor/servicegraphprocessor/config_test.go index e7eb02bd1944..af358ad0afe2 100644 --- a/processor/servicegraphprocessor/config_test.go +++ b/processor/servicegraphprocessor/config_test.go @@ -21,6 +21,7 @@ import ( "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" + "go.opentelemetry.io/collector/component" "go.opentelemetry.io/collector/component/componenttest" "go.opentelemetry.io/collector/config" "go.opentelemetry.io/collector/service/servicetest" @@ -41,7 +42,7 @@ func TestLoadConfig(t *testing.T) { require.NotNil(t, cfg) assert.Equal(t, &Config{ - ProcessorSettings: config.NewProcessorSettings(config.NewComponentID(typeStr)), + ProcessorSettings: config.NewProcessorSettings(component.NewID(typeStr)), MetricsExporter: "metrics", LatencyHistogramBuckets: []time.Duration{1, 2, 3, 4, 5}, Dimensions: []string{"dimension-1", "dimension-2"}, @@ -50,6 +51,6 @@ func TestLoadConfig(t *testing.T) { MaxItems: 10, }, }, - cfg.Processors[config.NewComponentID(typeStr)], + cfg.Processors[component.NewID(typeStr)], ) } diff --git a/processor/servicegraphprocessor/factory.go b/processor/servicegraphprocessor/factory.go index 6538f9e11021..13e396f6c14f 100644 --- a/processor/servicegraphprocessor/factory.go +++ b/processor/servicegraphprocessor/factory.go @@ -43,9 +43,9 @@ func NewFactory() component.ProcessorFactory { ) } -func createDefaultConfig() config.Processor { +func createDefaultConfig() component.ProcessorConfig { return &Config{ - ProcessorSettings: config.NewProcessorSettings(config.NewComponentID(typeStr)), + ProcessorSettings: config.NewProcessorSettings(component.NewID(typeStr)), Store: StoreConfig{ TTL: 2 * time.Second, MaxItems: 1000, @@ -53,6 +53,6 @@ func createDefaultConfig() config.Processor { } } -func createTracesProcessor(_ context.Context, params component.ProcessorCreateSettings, cfg config.Processor, nextConsumer consumer.Traces) (component.TracesProcessor, error) { +func createTracesProcessor(_ context.Context, params component.ProcessorCreateSettings, cfg component.ProcessorConfig, nextConsumer consumer.Traces) (component.TracesProcessor, error) { return newProcessor(params.Logger, cfg, nextConsumer), nil } diff --git a/processor/servicegraphprocessor/go.mod b/processor/servicegraphprocessor/go.mod index 44e15a69b4fb..cd6d22404858 100644 --- a/processor/servicegraphprocessor/go.mod +++ b/processor/servicegraphprocessor/go.mod @@ -4,11 +4,11 @@ go 1.18 require ( github.com/stretchr/testify v1.8.1 - go.opencensus.io v0.23.0 - go.opentelemetry.io/collector v0.63.2-0.20221104003159-6b27644724d8 - go.opentelemetry.io/collector/exporter/otlpexporter v0.63.2-0.20221104003159-6b27644724d8 - go.opentelemetry.io/collector/pdata v0.63.2-0.20221104003159-6b27644724d8 - go.opentelemetry.io/collector/semconv v0.63.2-0.20221104003159-6b27644724d8 + go.opencensus.io v0.24.0 + go.opentelemetry.io/collector v0.63.2-0.20221108014805-0b08d5316426 + go.opentelemetry.io/collector/exporter/otlpexporter v0.63.2-0.20221108014805-0b08d5316426 + go.opentelemetry.io/collector/pdata v0.63.2-0.20221108014805-0b08d5316426 + go.opentelemetry.io/collector/semconv v0.63.2-0.20221108014805-0b08d5316426 go.uber.org/zap v1.23.0 ) @@ -46,7 +46,7 @@ require ( github.com/pelletier/go-toml v1.9.4 // indirect github.com/pmezard/go-difflib v1.0.0 // indirect github.com/power-devops/perfstat v0.0.0-20210106213030-5aafc221ea8c // indirect - github.com/prometheus/client_golang v1.13.0 // indirect + github.com/prometheus/client_golang v1.13.1 // indirect github.com/prometheus/client_model v0.3.0 // indirect github.com/prometheus/common v0.37.0 // indirect github.com/prometheus/procfs v0.8.0 // indirect @@ -58,7 +58,7 @@ 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.0.0-20221104003159-6b27644724d8 // indirect + go.opentelemetry.io/collector/processor/batchprocessor v0.0.0-20221108014805-0b08d5316426 // 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 306c7274075b..335d144c6472 100644 --- a/processor/servicegraphprocessor/go.sum +++ b/processor/servicegraphprocessor/go.sum @@ -339,8 +339,9 @@ github.com/prometheus/client_golang v1.11.0/go.mod h1:Z6t4BnS23TR94PD6BsDNk8yVqr github.com/prometheus/client_golang v1.11.1/go.mod h1:Z6t4BnS23TR94PD6BsDNk8yVqroYurpAkEiz0P2BEV0= github.com/prometheus/client_golang v1.12.1/go.mod h1:3Z9XVyYiZYEO+YQWt3RD2R3jrbd179Rt297l4aS6nDY= github.com/prometheus/client_golang v1.12.2/go.mod h1:3Z9XVyYiZYEO+YQWt3RD2R3jrbd179Rt297l4aS6nDY= -github.com/prometheus/client_golang v1.13.0 h1:b71QUfeo5M8gq2+evJdTPfZhYMAU0uKPkyPJ7TPsloU= github.com/prometheus/client_golang v1.13.0/go.mod h1:vTeo+zgvILHsnnj/39Ou/1fPN5nJFOEMgftOUOmlvYQ= +github.com/prometheus/client_golang v1.13.1 h1:3gMjIY2+/hzmqhtUC/aQNYldJA6DtH3CgQvwS+02K1c= +github.com/prometheus/client_golang v1.13.1/go.mod h1:vTeo+zgvILHsnnj/39Ou/1fPN5nJFOEMgftOUOmlvYQ= github.com/prometheus/client_model v0.0.0-20180712105110-5c3871d89910/go.mod h1:MbSGuTsp3dbXC40dX6PRTWyKYBIrTGTE9sqQNg2J8bo= github.com/prometheus/client_model v0.0.0-20190129233127-fd36f4220a90/go.mod h1:xMI15A0UPsDsEKsMN9yxemIoYk6Tm2C1GtYGdfGttqA= github.com/prometheus/client_model v0.0.0-20190812154241-14fe0d1b01d4/go.mod h1:xMI15A0UPsDsEKsMN9yxemIoYk6Tm2C1GtYGdfGttqA= @@ -417,19 +418,20 @@ 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.opencensus.io v0.23.0 h1:gqCw0LfLxScz8irSi8exQc7fyQ0fKQU/qnC/X8+V/1M= go.opencensus.io v0.23.0/go.mod h1:XItmlyltB5F7CS4xOC1DcqMoFqwtC6OG2xF7mCv7P7E= -go.opentelemetry.io/collector v0.63.2-0.20221104003159-6b27644724d8 h1:rOT5HzXXfSISc6FiH012zH2/EFjp37UXfjEqj5BpkWQ= -go.opentelemetry.io/collector v0.63.2-0.20221104003159-6b27644724d8/go.mod h1:JVmeZXugK4ondC6KQgrHTHWiF4JttpG5k6dWPMt62+k= -go.opentelemetry.io/collector/exporter/otlpexporter v0.63.2-0.20221104003159-6b27644724d8 h1:LH4Xta7BzlK9kJwpYqdUApjHsv2rU+zivpTE8Iu7KJM= -go.opentelemetry.io/collector/exporter/otlpexporter v0.63.2-0.20221104003159-6b27644724d8/go.mod h1:t1QwWfBfdEsI80R28T9PeVFGm8f32ZGLdY+CAEfr2LI= +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.63.2-0.20221108014805-0b08d5316426 h1:z/wLTMh7/vNxcFUDa5uG7/IPE3tYx6pzCWPV41ghyV8= +go.opentelemetry.io/collector v0.63.2-0.20221108014805-0b08d5316426/go.mod h1:+Zb70q0Rq17dA9FcHTiTjW6g96lvJ8kAZ0c+eWNkAv0= +go.opentelemetry.io/collector/exporter/otlpexporter v0.63.2-0.20221108014805-0b08d5316426 h1:zPTV1p+QFGd2e7f4DEwkujkeezTBGkurl2wrM9QZ3Dc= +go.opentelemetry.io/collector/exporter/otlpexporter v0.63.2-0.20221108014805-0b08d5316426/go.mod h1:ZdasRXXeeuXukj6gfIb4VJw3W5N4+fhMagKE1TEMOxM= go.opentelemetry.io/collector/extension/zpagesextension v0.0.0-20221102221454-bfc45c16c979 h1:YW7BL8ftoJ7k+EtnMICw1KWASLuSDIhbF7SjjgWMCl4= -go.opentelemetry.io/collector/pdata v0.63.2-0.20221104003159-6b27644724d8 h1:7xeTQjfsOm9eogQeIxjSEhlik9qsbBGsnmkQHfyKaRE= -go.opentelemetry.io/collector/pdata v0.63.2-0.20221104003159-6b27644724d8/go.mod h1:IzvXUGQml2mrnvdb8zIlEW3qQs9oFLdD2hLwJdZ+pek= -go.opentelemetry.io/collector/processor/batchprocessor v0.0.0-20221104003159-6b27644724d8 h1:jgN7o3WfR8x++rjMcVM1VN6OJi4ytlGANXbwd73BPXo= -go.opentelemetry.io/collector/processor/batchprocessor v0.0.0-20221104003159-6b27644724d8/go.mod h1:WBv1Nayi8p12K0vxLxTkHpRGr79JXYT3TXL2X0B/PRU= -go.opentelemetry.io/collector/semconv v0.63.2-0.20221104003159-6b27644724d8 h1:jm0sNPyqo6S165QjQYMBHB2nK50wlJbMYM03Yr3Eo2k= -go.opentelemetry.io/collector/semconv v0.63.2-0.20221104003159-6b27644724d8/go.mod h1:5o9yhOa+ABt7g2E5JABDxGZ1PQPbtfxrKNbYn+LOTXU= +go.opentelemetry.io/collector/pdata v0.63.2-0.20221108014805-0b08d5316426 h1:wKDpgP0Tx/gWI2SgDGAY1OTSeihhDivbbRqFR79IGTc= +go.opentelemetry.io/collector/pdata v0.63.2-0.20221108014805-0b08d5316426/go.mod h1:IzvXUGQml2mrnvdb8zIlEW3qQs9oFLdD2hLwJdZ+pek= +go.opentelemetry.io/collector/processor/batchprocessor v0.0.0-20221108014805-0b08d5316426 h1:7f0NVsVGYT8pxAyk0qBBa8ZQf7athr/mfQ6QltGywN0= +go.opentelemetry.io/collector/processor/batchprocessor v0.0.0-20221108014805-0b08d5316426/go.mod h1:gpd5Q/3HlROMGYhnmwlFpUhcz8Xy80sokEcKs7c7zzE= +go.opentelemetry.io/collector/semconv v0.63.2-0.20221108014805-0b08d5316426 h1:pqIl7OC531J6i9ttBCj3zLmZI/BSF4q323YpK0GgKGk= +go.opentelemetry.io/collector/semconv v0.63.2-0.20221108014805-0b08d5316426/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/servicegraphprocessor/processor.go b/processor/servicegraphprocessor/processor.go index 10d9397ebafe..385bd118d50e 100644 --- a/processor/servicegraphprocessor/processor.go +++ b/processor/servicegraphprocessor/processor.go @@ -25,7 +25,6 @@ import ( "go.opencensus.io/stats" "go.opentelemetry.io/collector/component" - "go.opentelemetry.io/collector/config" "go.opentelemetry.io/collector/consumer" "go.opentelemetry.io/collector/pdata/pcommon" "go.opentelemetry.io/collector/pdata/pmetric" @@ -76,7 +75,7 @@ type processor struct { shutdownCh chan interface{} } -func newProcessor(logger *zap.Logger, config config.Processor, nextConsumer consumer.Traces) *processor { +func newProcessor(logger *zap.Logger, config component.ProcessorConfig, nextConsumer consumer.Traces) *processor { pConfig := config.(*Config) bounds := defaultLatencyHistogramBucketsMs @@ -108,7 +107,7 @@ func (p *processor) Start(_ context.Context, host component.Host) error { exporters := host.GetExporters() // The available list of exporters come from any configured metrics pipelines' exporters. - for k, exp := range exporters[config.MetricsDataType] { + for k, exp := range exporters[component.DataTypeMetrics] { metricsExp, ok := exp.(component.MetricsExporter) if k.String() == p.config.MetricsExporter && ok { p.metricsExporter = metricsExp diff --git a/processor/servicegraphprocessor/processor_test.go b/processor/servicegraphprocessor/processor_test.go index e1f546f51717..f0846972aadb 100644 --- a/processor/servicegraphprocessor/processor_test.go +++ b/processor/servicegraphprocessor/processor_test.go @@ -51,13 +51,13 @@ func TestProcessorStart(t *testing.T) { } { t.Run(tc.name, func(t *testing.T) { // Prepare - exporters := map[config.DataType]map[config.ComponentID]component.Exporter{ - config.MetricsDataType: { + exporters := map[component.DataType]map[component.ID]component.Exporter{ + component.DataTypeMetrics: { otlpConfig.ID(): tc.exporter, }, } mHost := &mockHost{ - GetExportersFunc: func() map[config.DataType]map[config.ComponentID]component.Exporter { + GetExportersFunc: func() map[component.DataType]map[component.ID]component.Exporter { return exporters }, } @@ -113,10 +113,10 @@ func TestProcessorConsume(t *testing.T) { processor := newProcessor(zaptest.NewLogger(t), cfg, consumertest.NewNop()) mHost := &mockHost{ - GetExportersFunc: func() map[config.DataType]map[config.ComponentID]component.Exporter { - return map[config.DataType]map[config.ComponentID]component.Exporter{ - config.MetricsDataType: { - config.NewComponentID("mock"): mockMetricsExporter, + GetExportersFunc: func() map[component.DataType]map[component.ID]component.Exporter { + return map[component.DataType]map[component.ID]component.Exporter{ + component.DataTypeMetrics: { + component.NewID("mock"): mockMetricsExporter, }, } }, @@ -237,7 +237,7 @@ func sampleTraces() ptrace.Traces { func newOTLPExporters(t *testing.T) (*otlpexporter.Config, component.MetricsExporter, component.TracesExporter) { otlpExpFactory := otlpexporter.NewFactory() otlpConfig := &otlpexporter.Config{ - ExporterSettings: config.NewExporterSettings(config.NewComponentID("otlp")), + ExporterSettings: config.NewExporterSettings(component.NewID("otlp")), GRPCClientSettings: configgrpc.GRPCClientSettings{ Endpoint: "example.com:1234", }, @@ -254,10 +254,10 @@ var _ component.Host = (*mockHost)(nil) type mockHost struct { component.Host - GetExportersFunc func() map[config.DataType]map[config.ComponentID]component.Exporter + GetExportersFunc func() map[component.DataType]map[component.ID]component.Exporter } -func (m *mockHost) GetExporters() map[config.DataType]map[config.ComponentID]component.Exporter { +func (m *mockHost) GetExporters() map[component.DataType]map[component.ID]component.Exporter { if m.GetExportersFunc != nil { return m.GetExportersFunc() } diff --git a/processor/spanmetricsprocessor/config_test.go b/processor/spanmetricsprocessor/config_test.go index 0d9c8a9230f3..54aaeaa9037f 100644 --- a/processor/spanmetricsprocessor/config_test.go +++ b/processor/spanmetricsprocessor/config_test.go @@ -21,6 +21,7 @@ import ( "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" + "go.opentelemetry.io/collector/component" "go.opentelemetry.io/collector/component/componenttest" "go.opentelemetry.io/collector/config" "go.opentelemetry.io/collector/exporter/otlpexporter" @@ -100,14 +101,14 @@ func TestLoadConfig(t *testing.T) { require.NotNil(t, cfg) assert.Equal(t, &Config{ - ProcessorSettings: config.NewProcessorSettings(config.NewComponentID(typeStr)), + ProcessorSettings: config.NewProcessorSettings(component.NewID(typeStr)), MetricsExporter: tc.wantMetricsExporter, LatencyHistogramBuckets: tc.wantLatencyHistogramBuckets, Dimensions: tc.wantDimensions, DimensionsCacheSize: tc.wantDimensionsCacheSize, AggregationTemporality: tc.wantAggregationTemporality, }, - cfg.Processors[config.NewComponentID(typeStr)], + cfg.Processors[component.NewID(typeStr)], ) }) } diff --git a/processor/spanmetricsprocessor/factory.go b/processor/spanmetricsprocessor/factory.go index 60fc366d5fff..a6ca2b6d958d 100644 --- a/processor/spanmetricsprocessor/factory.go +++ b/processor/spanmetricsprocessor/factory.go @@ -39,15 +39,15 @@ func NewFactory() component.ProcessorFactory { ) } -func createDefaultConfig() config.Processor { +func createDefaultConfig() component.ProcessorConfig { return &Config{ - ProcessorSettings: config.NewProcessorSettings(config.NewComponentID(typeStr)), + ProcessorSettings: config.NewProcessorSettings(component.NewID(typeStr)), AggregationTemporality: "AGGREGATION_TEMPORALITY_CUMULATIVE", DimensionsCacheSize: defaultDimensionsCacheSize, skipSanitizeLabel: featuregate.GetRegistry().IsEnabled(dropSanitizationGate.GetID()), } } -func createTracesProcessor(_ context.Context, params component.ProcessorCreateSettings, cfg config.Processor, nextConsumer consumer.Traces) (component.TracesProcessor, error) { +func createTracesProcessor(_ context.Context, params component.ProcessorCreateSettings, cfg component.ProcessorConfig, nextConsumer consumer.Traces) (component.TracesProcessor, error) { return newProcessor(params.Logger, cfg, nextConsumer) } diff --git a/processor/spanmetricsprocessor/go.mod b/processor/spanmetricsprocessor/go.mod index ce603d9a9596..1a51a1997d9c 100644 --- a/processor/spanmetricsprocessor/go.mod +++ b/processor/spanmetricsprocessor/go.mod @@ -9,12 +9,12 @@ require ( github.com/open-telemetry/opentelemetry-collector-contrib/internal/coreinternal v0.63.0 github.com/open-telemetry/opentelemetry-collector-contrib/receiver/jaegerreceiver v0.63.0 github.com/stretchr/testify v1.8.1 - go.opentelemetry.io/collector v0.63.2-0.20221104003159-6b27644724d8 - go.opentelemetry.io/collector/exporter/otlpexporter v0.63.2-0.20221104003159-6b27644724d8 - go.opentelemetry.io/collector/pdata v0.63.2-0.20221104003159-6b27644724d8 - go.opentelemetry.io/collector/processor/batchprocessor v0.0.0-20221103161931-a167b006e8c0 - go.opentelemetry.io/collector/receiver/otlpreceiver v0.0.0-20221104003159-6b27644724d8 - go.opentelemetry.io/collector/semconv v0.63.2-0.20221104003159-6b27644724d8 + go.opentelemetry.io/collector v0.63.2-0.20221108014805-0b08d5316426 + go.opentelemetry.io/collector/exporter/otlpexporter v0.63.2-0.20221108014805-0b08d5316426 + go.opentelemetry.io/collector/pdata v0.63.2-0.20221108014805-0b08d5316426 + go.opentelemetry.io/collector/processor/batchprocessor v0.0.0-20221108014805-0b08d5316426 + go.opentelemetry.io/collector/receiver/otlpreceiver v0.0.0-20221108014805-0b08d5316426 + go.opentelemetry.io/collector/semconv v0.63.2-0.20221108014805-0b08d5316426 go.uber.org/multierr v1.8.0 go.uber.org/zap v1.23.0 google.golang.org/grpc v1.50.1 @@ -69,7 +69,7 @@ require ( github.com/pelletier/go-toml/v2 v2.0.5 // indirect github.com/pmezard/go-difflib v1.0.0 // indirect github.com/power-devops/perfstat v0.0.0-20210106213030-5aafc221ea8c // indirect - github.com/prometheus/client_golang v1.13.1-0.20221013115219-dcea97eee2b3 // indirect + github.com/prometheus/client_golang v1.13.1 // indirect github.com/prometheus/client_model v0.3.0 // indirect github.com/prometheus/common v0.37.0 // indirect github.com/prometheus/procfs v0.8.0 // indirect @@ -89,7 +89,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.opencensus.io v0.23.0 // indirect + go.opencensus.io v0.24.0 // 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/processor/spanmetricsprocessor/go.sum b/processor/spanmetricsprocessor/go.sum index 062fe53b691e..1cf4ef5ae73c 100644 --- a/processor/spanmetricsprocessor/go.sum +++ b/processor/spanmetricsprocessor/go.sum @@ -518,8 +518,8 @@ github.com/prometheus/client_golang v1.11.1/go.mod h1:Z6t4BnS23TR94PD6BsDNk8yVqr github.com/prometheus/client_golang v1.12.1/go.mod h1:3Z9XVyYiZYEO+YQWt3RD2R3jrbd179Rt297l4aS6nDY= github.com/prometheus/client_golang v1.12.2/go.mod h1:3Z9XVyYiZYEO+YQWt3RD2R3jrbd179Rt297l4aS6nDY= github.com/prometheus/client_golang v1.13.0/go.mod h1:vTeo+zgvILHsnnj/39Ou/1fPN5nJFOEMgftOUOmlvYQ= -github.com/prometheus/client_golang v1.13.1-0.20221013115219-dcea97eee2b3 h1:T49ADLrYOgiyTHKx/N7tUxcglkLEt7xzDoQRqJNTzKg= -github.com/prometheus/client_golang v1.13.1-0.20221013115219-dcea97eee2b3/go.mod h1:vTeo+zgvILHsnnj/39Ou/1fPN5nJFOEMgftOUOmlvYQ= +github.com/prometheus/client_golang v1.13.1 h1:3gMjIY2+/hzmqhtUC/aQNYldJA6DtH3CgQvwS+02K1c= +github.com/prometheus/client_golang v1.13.1/go.mod h1:vTeo+zgvILHsnnj/39Ou/1fPN5nJFOEMgftOUOmlvYQ= github.com/prometheus/client_model v0.0.0-20180712105110-5c3871d89910/go.mod h1:MbSGuTsp3dbXC40dX6PRTWyKYBIrTGTE9sqQNg2J8bo= github.com/prometheus/client_model v0.0.0-20190129233127-fd36f4220a90/go.mod h1:xMI15A0UPsDsEKsMN9yxemIoYk6Tm2C1GtYGdfGttqA= github.com/prometheus/client_model v0.0.0-20190812154241-14fe0d1b01d4/go.mod h1:xMI15A0UPsDsEKsMN9yxemIoYk6Tm2C1GtYGdfGttqA= @@ -612,21 +612,22 @@ 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.21.0/go.mod h1:mSImk1erAIZhrmZN+AvHh14ztQfjbGwt4TtuofqLduU= go.opencensus.io v0.22.5/go.mod h1:5pWMHQbX5EPX2/62yrJeAkowc+lfs/XD7Uxpq3pI6kk= -go.opencensus.io v0.23.0 h1:gqCw0LfLxScz8irSi8exQc7fyQ0fKQU/qnC/X8+V/1M= go.opencensus.io v0.23.0/go.mod h1:XItmlyltB5F7CS4xOC1DcqMoFqwtC6OG2xF7mCv7P7E= -go.opentelemetry.io/collector v0.63.2-0.20221104003159-6b27644724d8 h1:rOT5HzXXfSISc6FiH012zH2/EFjp37UXfjEqj5BpkWQ= -go.opentelemetry.io/collector v0.63.2-0.20221104003159-6b27644724d8/go.mod h1:JVmeZXugK4ondC6KQgrHTHWiF4JttpG5k6dWPMt62+k= -go.opentelemetry.io/collector/exporter/otlpexporter v0.63.2-0.20221104003159-6b27644724d8 h1:LH4Xta7BzlK9kJwpYqdUApjHsv2rU+zivpTE8Iu7KJM= -go.opentelemetry.io/collector/exporter/otlpexporter v0.63.2-0.20221104003159-6b27644724d8/go.mod h1:t1QwWfBfdEsI80R28T9PeVFGm8f32ZGLdY+CAEfr2LI= +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.63.2-0.20221108014805-0b08d5316426 h1:z/wLTMh7/vNxcFUDa5uG7/IPE3tYx6pzCWPV41ghyV8= +go.opentelemetry.io/collector v0.63.2-0.20221108014805-0b08d5316426/go.mod h1:+Zb70q0Rq17dA9FcHTiTjW6g96lvJ8kAZ0c+eWNkAv0= +go.opentelemetry.io/collector/exporter/otlpexporter v0.63.2-0.20221108014805-0b08d5316426 h1:zPTV1p+QFGd2e7f4DEwkujkeezTBGkurl2wrM9QZ3Dc= +go.opentelemetry.io/collector/exporter/otlpexporter v0.63.2-0.20221108014805-0b08d5316426/go.mod h1:ZdasRXXeeuXukj6gfIb4VJw3W5N4+fhMagKE1TEMOxM= go.opentelemetry.io/collector/extension/zpagesextension v0.0.0-20221102221454-bfc45c16c979 h1:YW7BL8ftoJ7k+EtnMICw1KWASLuSDIhbF7SjjgWMCl4= -go.opentelemetry.io/collector/pdata v0.63.2-0.20221104003159-6b27644724d8 h1:7xeTQjfsOm9eogQeIxjSEhlik9qsbBGsnmkQHfyKaRE= -go.opentelemetry.io/collector/pdata v0.63.2-0.20221104003159-6b27644724d8/go.mod h1:IzvXUGQml2mrnvdb8zIlEW3qQs9oFLdD2hLwJdZ+pek= -go.opentelemetry.io/collector/processor/batchprocessor v0.0.0-20221103161931-a167b006e8c0 h1:MybyhzAzHIb85NOg5yHQixODm6fq6kJnOTl6xb7GxFc= -go.opentelemetry.io/collector/processor/batchprocessor v0.0.0-20221103161931-a167b006e8c0/go.mod h1:WBv1Nayi8p12K0vxLxTkHpRGr79JXYT3TXL2X0B/PRU= -go.opentelemetry.io/collector/receiver/otlpreceiver v0.0.0-20221104003159-6b27644724d8 h1:1YsCIhhuM18flZ5fIXSDy5M/ZR027P3S52hlIYj7TPs= -go.opentelemetry.io/collector/receiver/otlpreceiver v0.0.0-20221104003159-6b27644724d8/go.mod h1:POjN0P6ae987Q5v5p/MbSVXwatmBaw7jtdMCtU/sxLk= -go.opentelemetry.io/collector/semconv v0.63.2-0.20221104003159-6b27644724d8 h1:jm0sNPyqo6S165QjQYMBHB2nK50wlJbMYM03Yr3Eo2k= -go.opentelemetry.io/collector/semconv v0.63.2-0.20221104003159-6b27644724d8/go.mod h1:5o9yhOa+ABt7g2E5JABDxGZ1PQPbtfxrKNbYn+LOTXU= +go.opentelemetry.io/collector/pdata v0.63.2-0.20221108014805-0b08d5316426 h1:wKDpgP0Tx/gWI2SgDGAY1OTSeihhDivbbRqFR79IGTc= +go.opentelemetry.io/collector/pdata v0.63.2-0.20221108014805-0b08d5316426/go.mod h1:IzvXUGQml2mrnvdb8zIlEW3qQs9oFLdD2hLwJdZ+pek= +go.opentelemetry.io/collector/processor/batchprocessor v0.0.0-20221108014805-0b08d5316426 h1:7f0NVsVGYT8pxAyk0qBBa8ZQf7athr/mfQ6QltGywN0= +go.opentelemetry.io/collector/processor/batchprocessor v0.0.0-20221108014805-0b08d5316426/go.mod h1:gpd5Q/3HlROMGYhnmwlFpUhcz8Xy80sokEcKs7c7zzE= +go.opentelemetry.io/collector/receiver/otlpreceiver v0.0.0-20221108014805-0b08d5316426 h1:6cosCaS91068I8El0q8TJkv3V5lRzAfH2Wuja/5ydIo= +go.opentelemetry.io/collector/receiver/otlpreceiver v0.0.0-20221108014805-0b08d5316426/go.mod h1:+sGF2/LgOFWN1QClgdzg2NYCY9dYyPO4W4NAfxdODto= +go.opentelemetry.io/collector/semconv v0.63.2-0.20221108014805-0b08d5316426 h1:pqIl7OC531J6i9ttBCj3zLmZI/BSF4q323YpK0GgKGk= +go.opentelemetry.io/collector/semconv v0.63.2-0.20221108014805-0b08d5316426/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/spanmetricsprocessor/mocks/Host.go b/processor/spanmetricsprocessor/mocks/Host.go index bafbf0862c1f..7a765a560c90 100644 --- a/processor/spanmetricsprocessor/mocks/Host.go +++ b/processor/spanmetricsprocessor/mocks/Host.go @@ -19,7 +19,6 @@ package mocks import ( mock "github.com/stretchr/testify/mock" component "go.opentelemetry.io/collector/component" - "go.opentelemetry.io/collector/config" ) // Host is an autogenerated mock type for the Host type @@ -28,15 +27,15 @@ type Host struct { } // GetExporters provides a mock function with given fields: -func (_m *Host) GetExporters() map[config.DataType]map[config.ComponentID]component.Exporter { +func (_m *Host) GetExporters() map[component.DataType]map[component.ID]component.Exporter { ret := _m.Called() - var r0 map[config.DataType]map[config.ComponentID]component.Exporter - if rf, ok := ret.Get(0).(func() map[config.DataType]map[config.ComponentID]component.Exporter); ok { + var r0 map[component.DataType]map[component.ID]component.Exporter + if rf, ok := ret.Get(0).(func() map[component.DataType]map[component.ID]component.Exporter); ok { r0 = rf() } else { if ret.Get(0) != nil { - r0 = ret.Get(0).(map[config.DataType]map[config.ComponentID]component.Exporter) + r0 = ret.Get(0).(map[component.DataType]map[component.ID]component.Exporter) } } @@ -44,15 +43,15 @@ func (_m *Host) GetExporters() map[config.DataType]map[config.ComponentID]compon } // GetExtensions provides a mock function with given fields: -func (_m *Host) GetExtensions() map[config.ComponentID]component.Extension { +func (_m *Host) GetExtensions() map[component.ID]component.Extension { ret := _m.Called() - var r0 map[config.ComponentID]component.Extension - if rf, ok := ret.Get(0).(func() map[config.ComponentID]component.Extension); ok { + var r0 map[component.ID]component.Extension + if rf, ok := ret.Get(0).(func() map[component.ID]component.Extension); ok { r0 = rf() } else { if ret.Get(0) != nil { - r0 = ret.Get(0).(map[config.ComponentID]component.Extension) + r0 = ret.Get(0).(map[component.ID]component.Extension) } } @@ -60,11 +59,11 @@ func (_m *Host) GetExtensions() map[config.ComponentID]component.Extension { } // GetFactory provides a mock function with given fields: kind, componentType -func (_m *Host) GetFactory(kind component.Kind, componentType config.Type) component.Factory { +func (_m *Host) GetFactory(kind component.Kind, componentType component.Type) component.Factory { ret := _m.Called(kind, componentType) var r0 component.Factory - if rf, ok := ret.Get(0).(func(component.Kind, config.Type) component.Factory); ok { + if rf, ok := ret.Get(0).(func(component.Kind, component.Type) component.Factory); ok { r0 = rf(kind, componentType) } else { if ret.Get(0) != nil { diff --git a/processor/spanmetricsprocessor/processor.go b/processor/spanmetricsprocessor/processor.go index fee13a24fcce..c0619b2c2a35 100644 --- a/processor/spanmetricsprocessor/processor.go +++ b/processor/spanmetricsprocessor/processor.go @@ -25,7 +25,6 @@ import ( "unicode" "go.opentelemetry.io/collector/component" - "go.opentelemetry.io/collector/config" "go.opentelemetry.io/collector/consumer" "go.opentelemetry.io/collector/pdata/pcommon" "go.opentelemetry.io/collector/pdata/pmetric" @@ -114,7 +113,7 @@ type histogramData struct { exemplarsData []exemplarData } -func newProcessor(logger *zap.Logger, config config.Processor, nextConsumer consumer.Traces) (*processorImp, error) { +func newProcessor(logger *zap.Logger, config component.ProcessorConfig, nextConsumer consumer.Traces) (*processorImp, error) { logger.Info("Building spanmetricsprocessor") pConfig := config.(*Config) @@ -202,7 +201,7 @@ func (p *processorImp) Start(ctx context.Context, host component.Host) error { var availableMetricsExporters []string // The available list of exporters come from any configured metrics pipelines' exporters. - for k, exp := range exporters[config.MetricsDataType] { + for k, exp := range exporters[component.DataTypeMetrics] { metricsExp, ok := exp.(component.MetricsExporter) if !ok { return fmt.Errorf("the exporter %q isn't a metrics exporter", k.String()) diff --git a/processor/spanmetricsprocessor/processor_test.go b/processor/spanmetricsprocessor/processor_test.go index 35079dfe89fd..522e3c5bf505 100644 --- a/processor/spanmetricsprocessor/processor_test.go +++ b/processor/spanmetricsprocessor/processor_test.go @@ -99,8 +99,8 @@ func TestProcessorStart(t *testing.T) { } { t.Run(tc.name, func(t *testing.T) { // Prepare - exporters := map[config.DataType]map[config.ComponentID]component.Exporter{ - config.MetricsDataType: { + exporters := map[component.DataType]map[component.ID]component.Exporter{ + component.DataTypeMetrics: { otlpConfig.ID(): tc.exporter, }, } @@ -635,7 +635,7 @@ func initSpan(span span, s ptrace.Span) { func newOTLPExporters(t *testing.T) (*otlpexporter.Config, component.MetricsExporter, component.TracesExporter) { otlpExpFactory := otlpexporter.NewFactory() otlpConfig := &otlpexporter.Config{ - ExporterSettings: config.NewExporterSettings(config.NewComponentID("otlp")), + ExporterSettings: config.NewExporterSettings(component.NewID("otlp")), GRPCClientSettings: configgrpc.GRPCClientSettings{ Endpoint: "example.com:1234", }, diff --git a/processor/spanprocessor/config.go b/processor/spanprocessor/config.go index 06948d5caa3d..39e539875f40 100644 --- a/processor/spanprocessor/config.go +++ b/processor/spanprocessor/config.go @@ -15,6 +15,7 @@ package spanprocessor // import "github.com/open-telemetry/opentelemetry-collector-contrib/processor/spanprocessor" import ( + "go.opentelemetry.io/collector/component" "go.opentelemetry.io/collector/config" "github.com/open-telemetry/opentelemetry-collector-contrib/internal/coreinternal/processor/filterconfig" @@ -92,7 +93,7 @@ type Status struct { Description string `mapstructure:"description"` } -var _ config.Processor = (*Config)(nil) +var _ component.ProcessorConfig = (*Config)(nil) // Validate checks if the processor configuration is valid func (cfg *Config) Validate() error { diff --git a/processor/spanprocessor/config_test.go b/processor/spanprocessor/config_test.go index a92c5c6d144e..3073b085b6b9 100644 --- a/processor/spanprocessor/config_test.go +++ b/processor/spanprocessor/config_test.go @@ -20,6 +20,7 @@ import ( "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" + "go.opentelemetry.io/collector/component" "go.opentelemetry.io/collector/config" "go.opentelemetry.io/collector/confmap/confmaptest" @@ -31,13 +32,13 @@ func TestLoadingConfig(t *testing.T) { t.Parallel() tests := []struct { - id config.ComponentID - expected config.Processor + id component.ID + expected component.ProcessorConfig }{ { - id: config.NewComponentIDWithName("span", "custom"), + id: component.NewIDWithName("span", "custom"), expected: &Config{ - ProcessorSettings: config.NewProcessorSettings(config.NewComponentID("span")), + ProcessorSettings: config.NewProcessorSettings(component.NewID("span")), Rename: Name{ FromAttributes: []string{"db.svc", "operation", "id"}, Separator: "::", @@ -45,9 +46,9 @@ func TestLoadingConfig(t *testing.T) { }, }, { - id: config.NewComponentIDWithName("span", "no-separator"), + id: component.NewIDWithName("span", "no-separator"), expected: &Config{ - ProcessorSettings: config.NewProcessorSettings(config.NewComponentID("span")), + ProcessorSettings: config.NewProcessorSettings(component.NewID("span")), Rename: Name{ FromAttributes: []string{"db.svc", "operation", "id"}, Separator: "", @@ -55,9 +56,9 @@ func TestLoadingConfig(t *testing.T) { }, }, { - id: config.NewComponentIDWithName("span", "to_attributes"), + id: component.NewIDWithName("span", "to_attributes"), expected: &Config{ - ProcessorSettings: config.NewProcessorSettings(config.NewComponentID("span")), + ProcessorSettings: config.NewProcessorSettings(component.NewID("span")), Rename: Name{ ToAttributes: &ToAttributes{ Rules: []string{`^\/api\/v1\/document\/(?P.*)\/update$`}, @@ -66,9 +67,9 @@ func TestLoadingConfig(t *testing.T) { }, }, { - id: config.NewComponentIDWithName("span", "includeexclude"), + id: component.NewIDWithName("span", "includeexclude"), expected: &Config{ - ProcessorSettings: config.NewProcessorSettings(config.NewComponentID("span")), + ProcessorSettings: config.NewProcessorSettings(component.NewID("span")), MatchConfig: filterconfig.MatchConfig{ Include: &filterconfig.MatchProperties{ Config: *createMatchConfig(filterset.Regexp), @@ -89,9 +90,9 @@ func TestLoadingConfig(t *testing.T) { }, { // Set name - id: config.NewComponentIDWithName("span", "set_status_err"), + id: component.NewIDWithName("span", "set_status_err"), expected: &Config{ - ProcessorSettings: config.NewProcessorSettings(config.NewComponentID("span")), + ProcessorSettings: config.NewProcessorSettings(component.NewID("span")), SetStatus: &Status{ Code: "Error", Description: "some additional error description", @@ -99,9 +100,9 @@ func TestLoadingConfig(t *testing.T) { }, }, { - id: config.NewComponentIDWithName("span", "set_status_ok"), + id: component.NewIDWithName("span", "set_status_ok"), expected: &Config{ - ProcessorSettings: config.NewProcessorSettings(config.NewComponentID("span")), + ProcessorSettings: config.NewProcessorSettings(component.NewID("span")), MatchConfig: filterconfig.MatchConfig{ Include: &filterconfig.MatchProperties{ Attributes: []filterconfig.Attribute{ @@ -125,7 +126,7 @@ func TestLoadingConfig(t *testing.T) { sub, err := cm.Sub(tt.id.String()) require.NoError(t, err) - require.NoError(t, config.UnmarshalProcessor(sub, cfg)) + require.NoError(t, component.UnmarshalProcessorConfig(sub, cfg)) assert.NoError(t, cfg.Validate()) assert.Equal(t, tt.expected, cfg) diff --git a/processor/spanprocessor/factory.go b/processor/spanprocessor/factory.go index 61c3886beb9a..2d691b147dfa 100644 --- a/processor/spanprocessor/factory.go +++ b/processor/spanprocessor/factory.go @@ -59,16 +59,16 @@ func NewFactory() component.ProcessorFactory { component.WithTracesProcessor(createTracesProcessor, stability)) } -func createDefaultConfig() config.Processor { +func createDefaultConfig() component.ProcessorConfig { return &Config{ - ProcessorSettings: config.NewProcessorSettings(config.NewComponentID(typeStr)), + ProcessorSettings: config.NewProcessorSettings(component.NewID(typeStr)), } } func createTracesProcessor( ctx context.Context, set component.ProcessorCreateSettings, - cfg config.Processor, + cfg component.ProcessorConfig, nextConsumer consumer.Traces, ) (component.TracesProcessor, error) { diff --git a/processor/spanprocessor/factory_test.go b/processor/spanprocessor/factory_test.go index 54991fd24405..131bf8447730 100644 --- a/processor/spanprocessor/factory_test.go +++ b/processor/spanprocessor/factory_test.go @@ -23,24 +23,22 @@ import ( "github.com/stretchr/testify/require" "go.opentelemetry.io/collector/component" "go.opentelemetry.io/collector/component/componenttest" - "go.opentelemetry.io/collector/config" - "go.opentelemetry.io/collector/config/configtest" "go.opentelemetry.io/collector/consumer/consumertest" ) func TestFactory_Type(t *testing.T) { factory := NewFactory() - assert.Equal(t, factory.Type(), config.Type(typeStr)) + assert.Equal(t, factory.Type(), component.Type(typeStr)) } func TestFactory_CreateDefaultConfig(t *testing.T) { factory := NewFactory() cfg := factory.CreateDefaultConfig() - assert.NoError(t, configtest.CheckConfigStruct(cfg)) + assert.NoError(t, componenttest.CheckConfigStruct(cfg)) // Check the values of the default configuration. assert.NotNil(t, cfg) - assert.Equal(t, config.NewComponentID(typeStr), cfg.ID()) + assert.Equal(t, component.NewID(typeStr), cfg.ID()) } func TestFactory_CreateTracesProcessor(t *testing.T) { diff --git a/processor/spanprocessor/go.mod b/processor/spanprocessor/go.mod index 6ff10e84e4e3..13a30aa6b0e1 100644 --- a/processor/spanprocessor/go.mod +++ b/processor/spanprocessor/go.mod @@ -5,9 +5,9 @@ go 1.18 require ( github.com/open-telemetry/opentelemetry-collector-contrib/internal/coreinternal v0.63.0 github.com/stretchr/testify v1.8.1 - go.opentelemetry.io/collector v0.63.2-0.20221104003159-6b27644724d8 - go.opentelemetry.io/collector/pdata v0.63.2-0.20221104003159-6b27644724d8 - go.opentelemetry.io/collector/semconv v0.63.2-0.20221104003159-6b27644724d8 + go.opentelemetry.io/collector v0.63.2-0.20221108014805-0b08d5316426 + go.opentelemetry.io/collector/pdata v0.63.2-0.20221108014805-0b08d5316426 + go.opentelemetry.io/collector/semconv v0.63.2-0.20221108014805-0b08d5316426 ) require ( @@ -24,7 +24,7 @@ require ( github.com/modern-go/reflect2 v1.0.2 // indirect github.com/pmezard/go-difflib v1.0.0 // indirect github.com/spf13/cast v1.5.0 // indirect - go.opencensus.io v0.23.0 // indirect + go.opencensus.io v0.24.0 // 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 745b8519044b..526b7eaadf4e 100644 --- a/processor/spanprocessor/go.sum +++ b/processor/spanprocessor/go.sum @@ -248,7 +248,6 @@ github.com/stretchr/testify v1.2.2/go.mod h1:a8OnRcib4nhh0OaRAV+Yts87kKdq0PP7pXf github.com/stretchr/testify v1.3.0/go.mod h1:M5WIy9Dh21IEIfnGCwXGc5bZfKNJtfHm1UVUgZn+9EI= github.com/stretchr/testify v1.4.0/go.mod h1:j7eGeouHqKxXV5pUuKE4zz7dFj8WfuZ+81PSLYec5m4= github.com/stretchr/testify v1.5.1/go.mod h1:5W2xD1RspED5o8YsWQXVCued0rvSQ+mT+I5cxcmMvtA= -github.com/stretchr/testify v1.6.1/go.mod h1:6Fq8oRcR53rry900zMqJjRRixrwX3KX962/h/Wwjteg= github.com/stretchr/testify v1.7.0/go.mod h1:6Fq8oRcR53rry900zMqJjRRixrwX3KX962/h/Wwjteg= github.com/stretchr/testify v1.7.1/go.mod h1:6Fq8oRcR53rry900zMqJjRRixrwX3KX962/h/Wwjteg= github.com/stretchr/testify v1.8.0/go.mod h1:yNjHg4UonilssWZ8iaSj1OCr/vHnekPRkoO+kdMU+MU= @@ -260,14 +259,14 @@ 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.opencensus.io v0.23.0 h1:gqCw0LfLxScz8irSi8exQc7fyQ0fKQU/qnC/X8+V/1M= -go.opencensus.io v0.23.0/go.mod h1:XItmlyltB5F7CS4xOC1DcqMoFqwtC6OG2xF7mCv7P7E= -go.opentelemetry.io/collector v0.63.2-0.20221104003159-6b27644724d8 h1:rOT5HzXXfSISc6FiH012zH2/EFjp37UXfjEqj5BpkWQ= -go.opentelemetry.io/collector v0.63.2-0.20221104003159-6b27644724d8/go.mod h1:JVmeZXugK4ondC6KQgrHTHWiF4JttpG5k6dWPMt62+k= -go.opentelemetry.io/collector/pdata v0.63.2-0.20221104003159-6b27644724d8 h1:7xeTQjfsOm9eogQeIxjSEhlik9qsbBGsnmkQHfyKaRE= -go.opentelemetry.io/collector/pdata v0.63.2-0.20221104003159-6b27644724d8/go.mod h1:IzvXUGQml2mrnvdb8zIlEW3qQs9oFLdD2hLwJdZ+pek= -go.opentelemetry.io/collector/semconv v0.63.2-0.20221104003159-6b27644724d8 h1:jm0sNPyqo6S165QjQYMBHB2nK50wlJbMYM03Yr3Eo2k= -go.opentelemetry.io/collector/semconv v0.63.2-0.20221104003159-6b27644724d8/go.mod h1:5o9yhOa+ABt7g2E5JABDxGZ1PQPbtfxrKNbYn+LOTXU= +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.63.2-0.20221108014805-0b08d5316426 h1:z/wLTMh7/vNxcFUDa5uG7/IPE3tYx6pzCWPV41ghyV8= +go.opentelemetry.io/collector v0.63.2-0.20221108014805-0b08d5316426/go.mod h1:+Zb70q0Rq17dA9FcHTiTjW6g96lvJ8kAZ0c+eWNkAv0= +go.opentelemetry.io/collector/pdata v0.63.2-0.20221108014805-0b08d5316426 h1:wKDpgP0Tx/gWI2SgDGAY1OTSeihhDivbbRqFR79IGTc= +go.opentelemetry.io/collector/pdata v0.63.2-0.20221108014805-0b08d5316426/go.mod h1:IzvXUGQml2mrnvdb8zIlEW3qQs9oFLdD2hLwJdZ+pek= +go.opentelemetry.io/collector/semconv v0.63.2-0.20221108014805-0b08d5316426 h1:pqIl7OC531J6i9ttBCj3zLmZI/BSF4q323YpK0GgKGk= +go.opentelemetry.io/collector/semconv v0.63.2-0.20221108014805-0b08d5316426/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/config_test.go b/processor/tailsamplingprocessor/config_test.go index f616c63ec333..34b632178206 100644 --- a/processor/tailsamplingprocessor/config_test.go +++ b/processor/tailsamplingprocessor/config_test.go @@ -21,6 +21,7 @@ import ( "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" + "go.opentelemetry.io/collector/component" "go.opentelemetry.io/collector/config" "go.opentelemetry.io/collector/confmap/confmaptest" ) @@ -34,14 +35,14 @@ func TestLoadConfig(t *testing.T) { factory := NewFactory() cfg := factory.CreateDefaultConfig() - sub, err := cm.Sub(config.NewComponentIDWithName(typeStr, "").String()) + sub, err := cm.Sub(component.NewIDWithName(typeStr, "").String()) require.NoError(t, err) - require.NoError(t, config.UnmarshalProcessor(sub, cfg)) + require.NoError(t, component.UnmarshalProcessorConfig(sub, cfg)) assert.Equal(t, cfg, &Config{ - ProcessorSettings: config.NewProcessorSettings(config.NewComponentID(typeStr)), + ProcessorSettings: config.NewProcessorSettings(component.NewID(typeStr)), DecisionWait: 10 * time.Second, NumTraces: 100, ExpectedNewTracesPerSec: 10, diff --git a/processor/tailsamplingprocessor/factory.go b/processor/tailsamplingprocessor/factory.go index 8f6706e55677..d6133bfea281 100644 --- a/processor/tailsamplingprocessor/factory.go +++ b/processor/tailsamplingprocessor/factory.go @@ -48,9 +48,9 @@ func NewFactory() component.ProcessorFactory { component.WithTracesProcessor(createTracesProcessor, stability)) } -func createDefaultConfig() config.Processor { +func createDefaultConfig() component.ProcessorConfig { return &Config{ - ProcessorSettings: config.NewProcessorSettings(config.NewComponentID(typeStr)), + ProcessorSettings: config.NewProcessorSettings(component.NewID(typeStr)), DecisionWait: 30 * time.Second, NumTraces: 50000, } @@ -59,7 +59,7 @@ func createDefaultConfig() config.Processor { func createTracesProcessor( _ context.Context, params component.ProcessorCreateSettings, - cfg config.Processor, + cfg component.ProcessorConfig, nextConsumer consumer.Traces, ) (component.TracesProcessor, error) { tCfg := cfg.(*Config) diff --git a/processor/tailsamplingprocessor/factory_test.go b/processor/tailsamplingprocessor/factory_test.go index 6c0b258e1ea7..75612a6bd43c 100644 --- a/processor/tailsamplingprocessor/factory_test.go +++ b/processor/tailsamplingprocessor/factory_test.go @@ -21,9 +21,8 @@ import ( "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" + "go.opentelemetry.io/collector/component" "go.opentelemetry.io/collector/component/componenttest" - "go.opentelemetry.io/collector/config" - "go.opentelemetry.io/collector/config/configtest" "go.opentelemetry.io/collector/confmap/confmaptest" "go.opentelemetry.io/collector/consumer/consumertest" ) @@ -31,7 +30,7 @@ import ( func TestCreateDefaultConfig(t *testing.T) { cfg := createDefaultConfig() assert.NotNil(t, cfg, "failed to create default config") - assert.NoError(t, configtest.CheckConfigStruct(cfg)) + assert.NoError(t, componenttest.CheckConfigStruct(cfg)) } func TestCreateProcessor(t *testing.T) { @@ -41,9 +40,9 @@ func TestCreateProcessor(t *testing.T) { factory := NewFactory() cfg := factory.CreateDefaultConfig() - sub, err := cm.Sub(config.NewComponentIDWithName(typeStr, "").String()) + sub, err := cm.Sub(component.NewIDWithName(typeStr, "").String()) require.NoError(t, err) - require.NoError(t, config.UnmarshalProcessor(sub, cfg)) + require.NoError(t, component.UnmarshalProcessorConfig(sub, cfg)) params := componenttest.NewNopProcessorCreateSettings() tp, err := factory.CreateTracesProcessor(context.Background(), params, cfg, consumertest.NewNop()) diff --git a/processor/tailsamplingprocessor/go.mod b/processor/tailsamplingprocessor/go.mod index a32a5e968d99..3d96650d8086 100644 --- a/processor/tailsamplingprocessor/go.mod +++ b/processor/tailsamplingprocessor/go.mod @@ -7,9 +7,9 @@ require ( github.com/google/uuid v1.3.0 github.com/open-telemetry/opentelemetry-collector-contrib/internal/coreinternal v0.63.0 github.com/stretchr/testify v1.8.1 - go.opencensus.io v0.23.0 - go.opentelemetry.io/collector v0.63.2-0.20221104003159-6b27644724d8 - go.opentelemetry.io/collector/pdata v0.63.2-0.20221104003159-6b27644724d8 + go.opencensus.io v0.24.0 + go.opentelemetry.io/collector v0.63.2-0.20221108014805-0b08d5316426 + go.opentelemetry.io/collector/pdata v0.63.2-0.20221108014805-0b08d5316426 go.opentelemetry.io/otel/trace v1.11.1 go.uber.org/atomic v1.10.0 go.uber.org/goleak v1.2.0 diff --git a/processor/tailsamplingprocessor/go.sum b/processor/tailsamplingprocessor/go.sum index 3cda92d78552..b74c3d753d82 100644 --- a/processor/tailsamplingprocessor/go.sum +++ b/processor/tailsamplingprocessor/go.sum @@ -226,7 +226,7 @@ github.com/prometheus/client_golang v0.9.1/go.mod h1:7SWBe2y4D6OKWSNQJUaRYU/AaXP github.com/prometheus/client_golang v1.0.0/go.mod h1:db9x61etRT2tGnBNRi70OPL5FsnadC4Ky3P0J6CfImo= github.com/prometheus/client_golang v1.7.1/go.mod h1:PY5Wy2awLA44sXw4AOSfFBetzPP4j5+D6mVACh+pe2M= github.com/prometheus/client_golang v1.11.1/go.mod h1:Z6t4BnS23TR94PD6BsDNk8yVqroYurpAkEiz0P2BEV0= -github.com/prometheus/client_golang v1.13.0 h1:b71QUfeo5M8gq2+evJdTPfZhYMAU0uKPkyPJ7TPsloU= +github.com/prometheus/client_golang v1.13.1 h1:3gMjIY2+/hzmqhtUC/aQNYldJA6DtH3CgQvwS+02K1c= github.com/prometheus/client_model v0.0.0-20180712105110-5c3871d89910/go.mod h1:MbSGuTsp3dbXC40dX6PRTWyKYBIrTGTE9sqQNg2J8bo= github.com/prometheus/client_model v0.0.0-20190129233127-fd36f4220a90/go.mod h1:xMI15A0UPsDsEKsMN9yxemIoYk6Tm2C1GtYGdfGttqA= github.com/prometheus/client_model v0.0.0-20190812154241-14fe0d1b01d4/go.mod h1:xMI15A0UPsDsEKsMN9yxemIoYk6Tm2C1GtYGdfGttqA= @@ -261,7 +261,6 @@ github.com/stretchr/testify v1.2.2/go.mod h1:a8OnRcib4nhh0OaRAV+Yts87kKdq0PP7pXf github.com/stretchr/testify v1.3.0/go.mod h1:M5WIy9Dh21IEIfnGCwXGc5bZfKNJtfHm1UVUgZn+9EI= github.com/stretchr/testify v1.4.0/go.mod h1:j7eGeouHqKxXV5pUuKE4zz7dFj8WfuZ+81PSLYec5m4= github.com/stretchr/testify v1.5.1/go.mod h1:5W2xD1RspED5o8YsWQXVCued0rvSQ+mT+I5cxcmMvtA= -github.com/stretchr/testify v1.6.1/go.mod h1:6Fq8oRcR53rry900zMqJjRRixrwX3KX962/h/Wwjteg= github.com/stretchr/testify v1.7.0/go.mod h1:6Fq8oRcR53rry900zMqJjRRixrwX3KX962/h/Wwjteg= github.com/stretchr/testify v1.7.1/go.mod h1:6Fq8oRcR53rry900zMqJjRRixrwX3KX962/h/Wwjteg= github.com/stretchr/testify v1.8.0/go.mod h1:yNjHg4UonilssWZ8iaSj1OCr/vHnekPRkoO+kdMU+MU= @@ -273,12 +272,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.opencensus.io v0.23.0 h1:gqCw0LfLxScz8irSi8exQc7fyQ0fKQU/qnC/X8+V/1M= -go.opencensus.io v0.23.0/go.mod h1:XItmlyltB5F7CS4xOC1DcqMoFqwtC6OG2xF7mCv7P7E= -go.opentelemetry.io/collector v0.63.2-0.20221104003159-6b27644724d8 h1:rOT5HzXXfSISc6FiH012zH2/EFjp37UXfjEqj5BpkWQ= -go.opentelemetry.io/collector v0.63.2-0.20221104003159-6b27644724d8/go.mod h1:JVmeZXugK4ondC6KQgrHTHWiF4JttpG5k6dWPMt62+k= -go.opentelemetry.io/collector/pdata v0.63.2-0.20221104003159-6b27644724d8 h1:7xeTQjfsOm9eogQeIxjSEhlik9qsbBGsnmkQHfyKaRE= -go.opentelemetry.io/collector/pdata v0.63.2-0.20221104003159-6b27644724d8/go.mod h1:IzvXUGQml2mrnvdb8zIlEW3qQs9oFLdD2hLwJdZ+pek= +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.63.2-0.20221108014805-0b08d5316426 h1:z/wLTMh7/vNxcFUDa5uG7/IPE3tYx6pzCWPV41ghyV8= +go.opentelemetry.io/collector v0.63.2-0.20221108014805-0b08d5316426/go.mod h1:+Zb70q0Rq17dA9FcHTiTjW6g96lvJ8kAZ0c+eWNkAv0= +go.opentelemetry.io/collector/pdata v0.63.2-0.20221108014805-0b08d5316426 h1:wKDpgP0Tx/gWI2SgDGAY1OTSeihhDivbbRqFR79IGTc= +go.opentelemetry.io/collector/pdata v0.63.2-0.20221108014805-0b08d5316426/go.mod h1:IzvXUGQml2mrnvdb8zIlEW3qQs9oFLdD2hLwJdZ+pek= 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.go b/processor/transformprocessor/config.go index a53bd772cb6f..3de35080eee2 100644 --- a/processor/transformprocessor/config.go +++ b/processor/transformprocessor/config.go @@ -44,7 +44,7 @@ type SignalConfig struct { Statements []string `mapstructure:"statements"` } -var _ config.Processor = (*Config)(nil) +var _ component.ProcessorConfig = (*Config)(nil) func (c *Config) Validate() error { var errors error diff --git a/processor/transformprocessor/config_test.go b/processor/transformprocessor/config_test.go index 410cb5a41c1f..9c53f1dd2bf6 100644 --- a/processor/transformprocessor/config_test.go +++ b/processor/transformprocessor/config_test.go @@ -20,6 +20,7 @@ import ( "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" + "go.opentelemetry.io/collector/component" "go.opentelemetry.io/collector/config" "go.opentelemetry.io/collector/confmap/confmaptest" ) @@ -28,14 +29,14 @@ func TestLoadConfig(t *testing.T) { t.Parallel() tests := []struct { - id config.ComponentID - expected config.Processor + id component.ID + expected component.ProcessorConfig errorMessage string }{ { - id: config.NewComponentIDWithName(typeStr, ""), + id: component.NewIDWithName(typeStr, ""), expected: &Config{ - ProcessorSettings: config.NewProcessorSettings(config.NewComponentID(typeStr)), + ProcessorSettings: config.NewProcessorSettings(component.NewID(typeStr)), OTTLConfig: OTTLConfig{ Traces: SignalConfig{ Statements: []string{ @@ -59,28 +60,28 @@ func TestLoadConfig(t *testing.T) { }, }, { - id: config.NewComponentIDWithName(typeStr, "bad_syntax_trace"), + id: component.NewIDWithName(typeStr, "bad_syntax_trace"), errorMessage: "1:18: unexpected token \"where\" (expected \")\")", }, { - id: config.NewComponentIDWithName(typeStr, "unknown_function_trace"), + id: component.NewIDWithName(typeStr, "unknown_function_trace"), errorMessage: "undefined function not_a_function", }, { - id: config.NewComponentIDWithName(typeStr, "bad_syntax_metric"), + id: component.NewIDWithName(typeStr, "bad_syntax_metric"), errorMessage: "1:18: unexpected token \"where\" (expected \")\")", }, { - id: config.NewComponentIDWithName(typeStr, "unknown_function_metric"), + id: component.NewIDWithName(typeStr, "unknown_function_metric"), errorMessage: "undefined function not_a_function", }, { - id: config.NewComponentIDWithName(typeStr, "bad_syntax_log"), + id: component.NewIDWithName(typeStr, "bad_syntax_log"), errorMessage: "1:18: unexpected token \"where\" (expected \")\")", }, { - id: config.NewComponentIDWithName(typeStr, "unknown_function_log"), + id: component.NewIDWithName(typeStr, "unknown_function_log"), errorMessage: "undefined function not_a_function", }, } @@ -94,7 +95,7 @@ func TestLoadConfig(t *testing.T) { sub, err := cm.Sub(tt.id.String()) require.NoError(t, err) - require.NoError(t, config.UnmarshalProcessor(sub, cfg)) + require.NoError(t, component.UnmarshalProcessorConfig(sub, cfg)) if tt.expected == nil { assert.EqualError(t, cfg.Validate(), tt.errorMessage) diff --git a/processor/transformprocessor/factory.go b/processor/transformprocessor/factory.go index 3890a28acdc8..9eda44d6ab2b 100644 --- a/processor/transformprocessor/factory.go +++ b/processor/transformprocessor/factory.go @@ -45,9 +45,9 @@ func NewFactory() component.ProcessorFactory { ) } -func createDefaultConfig() config.Processor { +func createDefaultConfig() component.ProcessorConfig { return &Config{ - ProcessorSettings: config.NewProcessorSettings(config.NewComponentID(typeStr)), + ProcessorSettings: config.NewProcessorSettings(component.NewID(typeStr)), OTTLConfig: OTTLConfig{ Logs: SignalConfig{ Statements: []string{}, @@ -65,7 +65,7 @@ func createDefaultConfig() config.Processor { func createLogsProcessor( ctx context.Context, set component.ProcessorCreateSettings, - cfg config.Processor, + cfg component.ProcessorConfig, nextConsumer consumer.Logs, ) (component.LogsProcessor, error) { oCfg := cfg.(*Config) @@ -86,7 +86,7 @@ func createLogsProcessor( func createTracesProcessor( ctx context.Context, set component.ProcessorCreateSettings, - cfg config.Processor, + cfg component.ProcessorConfig, nextConsumer consumer.Traces, ) (component.TracesProcessor, error) { oCfg := cfg.(*Config) @@ -107,7 +107,7 @@ func createTracesProcessor( func createMetricsProcessor( ctx context.Context, set component.ProcessorCreateSettings, - cfg config.Processor, + cfg component.ProcessorConfig, nextConsumer consumer.Metrics, ) (component.MetricsProcessor, error) { oCfg := cfg.(*Config) diff --git a/processor/transformprocessor/factory_test.go b/processor/transformprocessor/factory_test.go index 1c3319e9d123..da28884a5565 100644 --- a/processor/transformprocessor/factory_test.go +++ b/processor/transformprocessor/factory_test.go @@ -19,9 +19,9 @@ import ( "testing" "github.com/stretchr/testify/assert" + "go.opentelemetry.io/collector/component" "go.opentelemetry.io/collector/component/componenttest" "go.opentelemetry.io/collector/config" - "go.opentelemetry.io/collector/config/configtest" "go.opentelemetry.io/collector/consumer/consumertest" "go.opentelemetry.io/collector/pdata/plog" "go.opentelemetry.io/collector/pdata/pmetric" @@ -30,14 +30,14 @@ import ( func TestFactory_Type(t *testing.T) { factory := NewFactory() - assert.Equal(t, factory.Type(), config.Type(typeStr)) + assert.Equal(t, factory.Type(), component.Type(typeStr)) } func TestFactory_CreateDefaultConfig(t *testing.T) { factory := NewFactory() cfg := factory.CreateDefaultConfig() assert.Equal(t, cfg, &Config{ - ProcessorSettings: config.NewProcessorSettings(config.NewComponentID(typeStr)), + ProcessorSettings: config.NewProcessorSettings(component.NewID(typeStr)), OTTLConfig: OTTLConfig{ Traces: SignalConfig{ Statements: []string{}, @@ -50,7 +50,7 @@ func TestFactory_CreateDefaultConfig(t *testing.T) { }, }, }) - assert.NoError(t, configtest.CheckConfigStruct(cfg)) + assert.NoError(t, componenttest.CheckConfigStruct(cfg)) } func TestFactoryCreateProcessor_Empty(t *testing.T) { diff --git a/processor/transformprocessor/go.mod b/processor/transformprocessor/go.mod index 78958a4d43e3..6bc614bb35eb 100644 --- a/processor/transformprocessor/go.mod +++ b/processor/transformprocessor/go.mod @@ -5,8 +5,8 @@ go 1.18 require ( github.com/open-telemetry/opentelemetry-collector-contrib/pkg/ottl v0.63.0 github.com/stretchr/testify v1.8.1 - go.opentelemetry.io/collector v0.63.2-0.20221104003159-6b27644724d8 - go.opentelemetry.io/collector/pdata v0.63.2-0.20221104003159-6b27644724d8 + go.opentelemetry.io/collector v0.63.2-0.20221108014805-0b08d5316426 + go.opentelemetry.io/collector/pdata v0.63.2-0.20221108014805-0b08d5316426 go.uber.org/multierr v1.8.0 go.uber.org/zap v1.23.0 ) @@ -29,7 +29,7 @@ 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.6.1 // indirect - go.opencensus.io v0.23.0 // indirect + go.opencensus.io v0.24.0 // 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 4a7ac3c3d36f..f1ba4daa3080 100644 --- a/processor/transformprocessor/go.sum +++ b/processor/transformprocessor/go.sum @@ -262,7 +262,6 @@ github.com/stretchr/testify v1.2.2/go.mod h1:a8OnRcib4nhh0OaRAV+Yts87kKdq0PP7pXf github.com/stretchr/testify v1.3.0/go.mod h1:M5WIy9Dh21IEIfnGCwXGc5bZfKNJtfHm1UVUgZn+9EI= github.com/stretchr/testify v1.4.0/go.mod h1:j7eGeouHqKxXV5pUuKE4zz7dFj8WfuZ+81PSLYec5m4= github.com/stretchr/testify v1.5.1/go.mod h1:5W2xD1RspED5o8YsWQXVCued0rvSQ+mT+I5cxcmMvtA= -github.com/stretchr/testify v1.6.1/go.mod h1:6Fq8oRcR53rry900zMqJjRRixrwX3KX962/h/Wwjteg= github.com/stretchr/testify v1.7.0/go.mod h1:6Fq8oRcR53rry900zMqJjRRixrwX3KX962/h/Wwjteg= github.com/stretchr/testify v1.7.1/go.mod h1:6Fq8oRcR53rry900zMqJjRRixrwX3KX962/h/Wwjteg= github.com/stretchr/testify v1.8.0/go.mod h1:yNjHg4UonilssWZ8iaSj1OCr/vHnekPRkoO+kdMU+MU= @@ -274,12 +273,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.opencensus.io v0.23.0 h1:gqCw0LfLxScz8irSi8exQc7fyQ0fKQU/qnC/X8+V/1M= -go.opencensus.io v0.23.0/go.mod h1:XItmlyltB5F7CS4xOC1DcqMoFqwtC6OG2xF7mCv7P7E= -go.opentelemetry.io/collector v0.63.2-0.20221104003159-6b27644724d8 h1:rOT5HzXXfSISc6FiH012zH2/EFjp37UXfjEqj5BpkWQ= -go.opentelemetry.io/collector v0.63.2-0.20221104003159-6b27644724d8/go.mod h1:JVmeZXugK4ondC6KQgrHTHWiF4JttpG5k6dWPMt62+k= -go.opentelemetry.io/collector/pdata v0.63.2-0.20221104003159-6b27644724d8 h1:7xeTQjfsOm9eogQeIxjSEhlik9qsbBGsnmkQHfyKaRE= -go.opentelemetry.io/collector/pdata v0.63.2-0.20221104003159-6b27644724d8/go.mod h1:IzvXUGQml2mrnvdb8zIlEW3qQs9oFLdD2hLwJdZ+pek= +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.63.2-0.20221108014805-0b08d5316426 h1:z/wLTMh7/vNxcFUDa5uG7/IPE3tYx6pzCWPV41ghyV8= +go.opentelemetry.io/collector v0.63.2-0.20221108014805-0b08d5316426/go.mod h1:+Zb70q0Rq17dA9FcHTiTjW6g96lvJ8kAZ0c+eWNkAv0= +go.opentelemetry.io/collector/pdata v0.63.2-0.20221108014805-0b08d5316426 h1:wKDpgP0Tx/gWI2SgDGAY1OTSeihhDivbbRqFR79IGTc= +go.opentelemetry.io/collector/pdata v0.63.2-0.20221108014805-0b08d5316426/go.mod h1:IzvXUGQml2mrnvdb8zIlEW3qQs9oFLdD2hLwJdZ+pek= 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 aa553249eaf2..0cb4f5ca1655 100644 --- a/receiver/activedirectorydsreceiver/config_test.go +++ b/receiver/activedirectorydsreceiver/config_test.go @@ -23,6 +23,7 @@ import ( "github.com/google/go-cmp/cmp/cmpopts" "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" + "go.opentelemetry.io/collector/component" "go.opentelemetry.io/collector/config" "go.opentelemetry.io/collector/confmap/confmaptest" "go.opentelemetry.io/collector/receiver/scraperhelper" @@ -39,18 +40,18 @@ func TestLoadConfig(t *testing.T) { defaultMetricsSettings := metadata.DefaultMetricsSettings() defaultMetricsSettings.ActiveDirectoryDsReplicationObjectRate.Enabled = false tests := []struct { - id config.ComponentID - expected config.Receiver + id component.ID + expected component.ReceiverConfig }{ { - id: config.NewComponentIDWithName(typeStr, "defaults"), + id: component.NewIDWithName(typeStr, "defaults"), expected: createDefaultConfig(), }, { - id: config.NewComponentIDWithName(typeStr, ""), + id: component.NewIDWithName(typeStr, ""), expected: &Config{ ScraperControllerSettings: scraperhelper.ScraperControllerSettings{ - ReceiverSettings: config.NewReceiverSettings(config.NewComponentIDWithName(typeStr, "")), + ReceiverSettings: config.NewReceiverSettings(component.NewIDWithName(typeStr, "")), CollectionInterval: 2 * time.Minute, }, Metrics: defaultMetricsSettings, @@ -65,7 +66,7 @@ func TestLoadConfig(t *testing.T) { sub, err := cm.Sub(tt.id.String()) require.NoError(t, err) - require.NoError(t, config.UnmarshalReceiver(sub, cfg)) + require.NoError(t, component.UnmarshalReceiverConfig(sub, cfg)) assert.NoError(t, cfg.Validate()) if diff := cmp.Diff(tt.expected, cfg, cmpopts.IgnoreUnexported(config.ReceiverSettings{}, metadata.MetricSettings{})); diff != "" { diff --git a/receiver/activedirectorydsreceiver/factory.go b/receiver/activedirectorydsreceiver/factory.go index a07c32b4ade7..4262edde3897 100644 --- a/receiver/activedirectorydsreceiver/factory.go +++ b/receiver/activedirectorydsreceiver/factory.go @@ -38,10 +38,10 @@ func NewFactory() component.ReceiverFactory { ) } -func createDefaultConfig() config.Receiver { +func createDefaultConfig() component.ReceiverConfig { return &Config{ ScraperControllerSettings: scraperhelper.ScraperControllerSettings{ - ReceiverSettings: config.NewReceiverSettings(config.NewComponentID(typeStr)), + ReceiverSettings: config.NewReceiverSettings(component.NewID(typeStr)), CollectionInterval: defaultCollectionInterval, }, Metrics: metadata.DefaultMetricsSettings(), diff --git a/receiver/activedirectorydsreceiver/factory_others.go b/receiver/activedirectorydsreceiver/factory_others.go index 8441c6108cb1..d4bda2f35045 100644 --- a/receiver/activedirectorydsreceiver/factory_others.go +++ b/receiver/activedirectorydsreceiver/factory_others.go @@ -22,7 +22,6 @@ import ( "fmt" "go.opentelemetry.io/collector/component" - "go.opentelemetry.io/collector/config" "go.opentelemetry.io/collector/consumer" ) @@ -31,7 +30,7 @@ var errReceiverNotSupported = fmt.Errorf("The '%s' receiver is only supported on func createMetricsReceiver( _ context.Context, _ component.ReceiverCreateSettings, - _ config.Receiver, + _ component.ReceiverConfig, _ consumer.Metrics, ) (component.MetricsReceiver, error) { return nil, errReceiverNotSupported diff --git a/receiver/activedirectorydsreceiver/factory_windows.go b/receiver/activedirectorydsreceiver/factory_windows.go index fdc9fe4ee083..ad01f35fc49f 100644 --- a/receiver/activedirectorydsreceiver/factory_windows.go +++ b/receiver/activedirectorydsreceiver/factory_windows.go @@ -22,7 +22,6 @@ import ( "fmt" "go.opentelemetry.io/collector/component" - "go.opentelemetry.io/collector/config" "go.opentelemetry.io/collector/consumer" "go.opentelemetry.io/collector/receiver/scraperhelper" ) @@ -32,7 +31,7 @@ var errConfigNotActiveDirectory = fmt.Errorf("config is not valid for the '%s' r func createMetricsReceiver( ctx context.Context, params component.ReceiverCreateSettings, - rConf config.Receiver, + rConf component.ReceiverConfig, consumer consumer.Metrics, ) (component.MetricsReceiver, error) { c, ok := rConf.(*Config) diff --git a/receiver/activedirectorydsreceiver/go.mod b/receiver/activedirectorydsreceiver/go.mod index 3e3a96c5988f..9716ac29b4cd 100644 --- a/receiver/activedirectorydsreceiver/go.mod +++ b/receiver/activedirectorydsreceiver/go.mod @@ -7,8 +7,8 @@ require ( github.com/open-telemetry/opentelemetry-collector-contrib/internal/scrapertest v0.63.0 github.com/open-telemetry/opentelemetry-collector-contrib/pkg/winperfcounters v0.63.0 github.com/stretchr/testify v1.8.1 - go.opentelemetry.io/collector v0.63.2-0.20221104003159-6b27644724d8 - go.opentelemetry.io/collector/pdata v0.63.2-0.20221104003159-6b27644724d8 + go.opentelemetry.io/collector v0.63.2-0.20221108014805-0b08d5316426 + go.opentelemetry.io/collector/pdata v0.63.2-0.20221108014805-0b08d5316426 go.uber.org/multierr v1.8.0 ) @@ -25,7 +25,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.opencensus.io v0.23.0 // indirect + go.opencensus.io v0.24.0 // 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 df02eb50de8d..5a6c63029771 100644 --- a/receiver/activedirectorydsreceiver/go.sum +++ b/receiver/activedirectorydsreceiver/go.sum @@ -230,7 +230,7 @@ github.com/prometheus/client_golang v0.9.1/go.mod h1:7SWBe2y4D6OKWSNQJUaRYU/AaXP github.com/prometheus/client_golang v1.0.0/go.mod h1:db9x61etRT2tGnBNRi70OPL5FsnadC4Ky3P0J6CfImo= github.com/prometheus/client_golang v1.7.1/go.mod h1:PY5Wy2awLA44sXw4AOSfFBetzPP4j5+D6mVACh+pe2M= github.com/prometheus/client_golang v1.11.1/go.mod h1:Z6t4BnS23TR94PD6BsDNk8yVqroYurpAkEiz0P2BEV0= -github.com/prometheus/client_golang v1.13.0 h1:b71QUfeo5M8gq2+evJdTPfZhYMAU0uKPkyPJ7TPsloU= +github.com/prometheus/client_golang v1.13.1 h1:3gMjIY2+/hzmqhtUC/aQNYldJA6DtH3CgQvwS+02K1c= github.com/prometheus/client_model v0.0.0-20180712105110-5c3871d89910/go.mod h1:MbSGuTsp3dbXC40dX6PRTWyKYBIrTGTE9sqQNg2J8bo= github.com/prometheus/client_model v0.0.0-20190129233127-fd36f4220a90/go.mod h1:xMI15A0UPsDsEKsMN9yxemIoYk6Tm2C1GtYGdfGttqA= github.com/prometheus/client_model v0.0.0-20190812154241-14fe0d1b01d4/go.mod h1:xMI15A0UPsDsEKsMN9yxemIoYk6Tm2C1GtYGdfGttqA= @@ -267,7 +267,6 @@ github.com/stretchr/testify v1.2.2/go.mod h1:a8OnRcib4nhh0OaRAV+Yts87kKdq0PP7pXf github.com/stretchr/testify v1.3.0/go.mod h1:M5WIy9Dh21IEIfnGCwXGc5bZfKNJtfHm1UVUgZn+9EI= github.com/stretchr/testify v1.4.0/go.mod h1:j7eGeouHqKxXV5pUuKE4zz7dFj8WfuZ+81PSLYec5m4= github.com/stretchr/testify v1.5.1/go.mod h1:5W2xD1RspED5o8YsWQXVCued0rvSQ+mT+I5cxcmMvtA= -github.com/stretchr/testify v1.6.1/go.mod h1:6Fq8oRcR53rry900zMqJjRRixrwX3KX962/h/Wwjteg= github.com/stretchr/testify v1.7.0/go.mod h1:6Fq8oRcR53rry900zMqJjRRixrwX3KX962/h/Wwjteg= github.com/stretchr/testify v1.7.1/go.mod h1:6Fq8oRcR53rry900zMqJjRRixrwX3KX962/h/Wwjteg= github.com/stretchr/testify v1.8.0/go.mod h1:yNjHg4UonilssWZ8iaSj1OCr/vHnekPRkoO+kdMU+MU= @@ -279,12 +278,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.opencensus.io v0.23.0 h1:gqCw0LfLxScz8irSi8exQc7fyQ0fKQU/qnC/X8+V/1M= -go.opencensus.io v0.23.0/go.mod h1:XItmlyltB5F7CS4xOC1DcqMoFqwtC6OG2xF7mCv7P7E= -go.opentelemetry.io/collector v0.63.2-0.20221104003159-6b27644724d8 h1:rOT5HzXXfSISc6FiH012zH2/EFjp37UXfjEqj5BpkWQ= -go.opentelemetry.io/collector v0.63.2-0.20221104003159-6b27644724d8/go.mod h1:JVmeZXugK4ondC6KQgrHTHWiF4JttpG5k6dWPMt62+k= -go.opentelemetry.io/collector/pdata v0.63.2-0.20221104003159-6b27644724d8 h1:7xeTQjfsOm9eogQeIxjSEhlik9qsbBGsnmkQHfyKaRE= -go.opentelemetry.io/collector/pdata v0.63.2-0.20221104003159-6b27644724d8/go.mod h1:IzvXUGQml2mrnvdb8zIlEW3qQs9oFLdD2hLwJdZ+pek= +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.63.2-0.20221108014805-0b08d5316426 h1:z/wLTMh7/vNxcFUDa5uG7/IPE3tYx6pzCWPV41ghyV8= +go.opentelemetry.io/collector v0.63.2-0.20221108014805-0b08d5316426/go.mod h1:+Zb70q0Rq17dA9FcHTiTjW6g96lvJ8kAZ0c+eWNkAv0= +go.opentelemetry.io/collector/pdata v0.63.2-0.20221108014805-0b08d5316426 h1:wKDpgP0Tx/gWI2SgDGAY1OTSeihhDivbbRqFR79IGTc= +go.opentelemetry.io/collector/pdata v0.63.2-0.20221108014805-0b08d5316426/go.mod h1:IzvXUGQml2mrnvdb8zIlEW3qQs9oFLdD2hLwJdZ+pek= 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/config_test.go b/receiver/aerospikereceiver/config_test.go index 97ccc2ff0e46..149f4336de60 100644 --- a/receiver/aerospikereceiver/config_test.go +++ b/receiver/aerospikereceiver/config_test.go @@ -20,7 +20,7 @@ import ( "time" "github.com/stretchr/testify/require" - "go.opentelemetry.io/collector/config" + "go.opentelemetry.io/collector/component" "go.opentelemetry.io/collector/config/configtls" "go.opentelemetry.io/collector/confmap/confmaptest" ) @@ -141,9 +141,9 @@ func TestLoadConfig(t *testing.T) { factory := NewFactory() cfg := factory.CreateDefaultConfig() - sub, err := cm.Sub(config.NewComponentIDWithName(typeStr, "").String()) + sub, err := cm.Sub(component.NewIDWithName(typeStr, "").String()) require.NoError(t, err) - require.NoError(t, config.UnmarshalReceiver(sub, cfg)) + require.NoError(t, component.UnmarshalReceiverConfig(sub, cfg)) expected := factory.CreateDefaultConfig().(*Config) expected.Endpoint = "localhost:3000" diff --git a/receiver/aerospikereceiver/factory.go b/receiver/aerospikereceiver/factory.go index f23ead8fe0c7..45c3897e4978 100644 --- a/receiver/aerospikereceiver/factory.go +++ b/receiver/aerospikereceiver/factory.go @@ -47,7 +47,7 @@ func NewFactory() component.ReceiverFactory { func createMetricsReceiver( _ context.Context, params component.ReceiverCreateSettings, - rConf config.Receiver, + rConf component.ReceiverConfig, consumer consumer.Metrics, ) (component.MetricsReceiver, error) { cfg := rConf.(*Config) @@ -72,10 +72,10 @@ func createMetricsReceiver( ) } -func createDefaultConfig() config.Receiver { +func createDefaultConfig() component.ReceiverConfig { return &Config{ ScraperControllerSettings: scraperhelper.ScraperControllerSettings{ - ReceiverSettings: config.NewReceiverSettings(config.NewComponentID(typeStr)), + ReceiverSettings: config.NewReceiverSettings(component.NewID(typeStr)), CollectionInterval: time.Minute, }, Endpoint: defaultEndpoint, diff --git a/receiver/aerospikereceiver/go.mod b/receiver/aerospikereceiver/go.mod index 8055546e5526..fbd540652325 100644 --- a/receiver/aerospikereceiver/go.mod +++ b/receiver/aerospikereceiver/go.mod @@ -7,8 +7,8 @@ require ( github.com/open-telemetry/opentelemetry-collector-contrib/internal/containertest v0.63.0 github.com/open-telemetry/opentelemetry-collector-contrib/internal/scrapertest v0.63.0 github.com/stretchr/testify v1.8.1 - go.opentelemetry.io/collector v0.63.2-0.20221104003159-6b27644724d8 - go.opentelemetry.io/collector/pdata v0.63.2-0.20221104003159-6b27644724d8 + go.opentelemetry.io/collector v0.63.2-0.20221108014805-0b08d5316426 + go.opentelemetry.io/collector/pdata v0.63.2-0.20221108014805-0b08d5316426 go.uber.org/multierr v1.8.0 go.uber.org/zap v1.23.0 ) @@ -41,7 +41,7 @@ require ( github.com/sirupsen/logrus v1.8.1 // indirect github.com/stretchr/objx v0.5.0 // indirect github.com/yuin/gopher-lua v0.0.0-20220504180219-658193537a64 // indirect - go.opencensus.io v0.23.0 // indirect + go.opencensus.io v0.24.0 // 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 818c78cba5fc..c578f7ad314b 100644 --- a/receiver/aerospikereceiver/go.sum +++ b/receiver/aerospikereceiver/go.sum @@ -274,7 +274,7 @@ github.com/prometheus/client_golang v0.9.1/go.mod h1:7SWBe2y4D6OKWSNQJUaRYU/AaXP github.com/prometheus/client_golang v1.0.0/go.mod h1:db9x61etRT2tGnBNRi70OPL5FsnadC4Ky3P0J6CfImo= github.com/prometheus/client_golang v1.7.1/go.mod h1:PY5Wy2awLA44sXw4AOSfFBetzPP4j5+D6mVACh+pe2M= github.com/prometheus/client_golang v1.11.1/go.mod h1:Z6t4BnS23TR94PD6BsDNk8yVqroYurpAkEiz0P2BEV0= -github.com/prometheus/client_golang v1.13.0 h1:b71QUfeo5M8gq2+evJdTPfZhYMAU0uKPkyPJ7TPsloU= +github.com/prometheus/client_golang v1.13.1 h1:3gMjIY2+/hzmqhtUC/aQNYldJA6DtH3CgQvwS+02K1c= github.com/prometheus/client_model v0.0.0-20180712105110-5c3871d89910/go.mod h1:MbSGuTsp3dbXC40dX6PRTWyKYBIrTGTE9sqQNg2J8bo= github.com/prometheus/client_model v0.0.0-20190129233127-fd36f4220a90/go.mod h1:xMI15A0UPsDsEKsMN9yxemIoYk6Tm2C1GtYGdfGttqA= github.com/prometheus/client_model v0.0.0-20190812154241-14fe0d1b01d4/go.mod h1:xMI15A0UPsDsEKsMN9yxemIoYk6Tm2C1GtYGdfGttqA= @@ -316,7 +316,6 @@ github.com/stretchr/testify v1.2.2/go.mod h1:a8OnRcib4nhh0OaRAV+Yts87kKdq0PP7pXf github.com/stretchr/testify v1.3.0/go.mod h1:M5WIy9Dh21IEIfnGCwXGc5bZfKNJtfHm1UVUgZn+9EI= github.com/stretchr/testify v1.4.0/go.mod h1:j7eGeouHqKxXV5pUuKE4zz7dFj8WfuZ+81PSLYec5m4= github.com/stretchr/testify v1.5.1/go.mod h1:5W2xD1RspED5o8YsWQXVCued0rvSQ+mT+I5cxcmMvtA= -github.com/stretchr/testify v1.6.1/go.mod h1:6Fq8oRcR53rry900zMqJjRRixrwX3KX962/h/Wwjteg= github.com/stretchr/testify v1.7.0/go.mod h1:6Fq8oRcR53rry900zMqJjRRixrwX3KX962/h/Wwjteg= github.com/stretchr/testify v1.7.1/go.mod h1:6Fq8oRcR53rry900zMqJjRRixrwX3KX962/h/Wwjteg= github.com/stretchr/testify v1.8.0/go.mod h1:yNjHg4UonilssWZ8iaSj1OCr/vHnekPRkoO+kdMU+MU= @@ -331,12 +330,12 @@ github.com/yuin/gopher-lua v0.0.0-20220504180219-658193537a64/go.mod h1:GBR0iDaN 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.opencensus.io v0.23.0 h1:gqCw0LfLxScz8irSi8exQc7fyQ0fKQU/qnC/X8+V/1M= -go.opencensus.io v0.23.0/go.mod h1:XItmlyltB5F7CS4xOC1DcqMoFqwtC6OG2xF7mCv7P7E= -go.opentelemetry.io/collector v0.63.2-0.20221104003159-6b27644724d8 h1:rOT5HzXXfSISc6FiH012zH2/EFjp37UXfjEqj5BpkWQ= -go.opentelemetry.io/collector v0.63.2-0.20221104003159-6b27644724d8/go.mod h1:JVmeZXugK4ondC6KQgrHTHWiF4JttpG5k6dWPMt62+k= -go.opentelemetry.io/collector/pdata v0.63.2-0.20221104003159-6b27644724d8 h1:7xeTQjfsOm9eogQeIxjSEhlik9qsbBGsnmkQHfyKaRE= -go.opentelemetry.io/collector/pdata v0.63.2-0.20221104003159-6b27644724d8/go.mod h1:IzvXUGQml2mrnvdb8zIlEW3qQs9oFLdD2hLwJdZ+pek= +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.63.2-0.20221108014805-0b08d5316426 h1:z/wLTMh7/vNxcFUDa5uG7/IPE3tYx6pzCWPV41ghyV8= +go.opentelemetry.io/collector v0.63.2-0.20221108014805-0b08d5316426/go.mod h1:+Zb70q0Rq17dA9FcHTiTjW6g96lvJ8kAZ0c+eWNkAv0= +go.opentelemetry.io/collector/pdata v0.63.2-0.20221108014805-0b08d5316426 h1:wKDpgP0Tx/gWI2SgDGAY1OTSeihhDivbbRqFR79IGTc= +go.opentelemetry.io/collector/pdata v0.63.2-0.20221108014805-0b08d5316426/go.mod h1:IzvXUGQml2mrnvdb8zIlEW3qQs9oFLdD2hLwJdZ+pek= 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 977027d7d0b7..adab083c2659 100644 --- a/receiver/apachereceiver/config_test.go +++ b/receiver/apachereceiver/config_test.go @@ -20,7 +20,7 @@ import ( "time" "github.com/stretchr/testify/require" - "go.opentelemetry.io/collector/config" + "go.opentelemetry.io/collector/component" "go.opentelemetry.io/collector/confmap/confmaptest" ) @@ -97,9 +97,9 @@ func TestLoadConfig(t *testing.T) { factory := NewFactory() cfg := factory.CreateDefaultConfig() - sub, err := cm.Sub(config.NewComponentIDWithName(typeStr, "").String()) + sub, err := cm.Sub(component.NewIDWithName(typeStr, "").String()) require.NoError(t, err) - require.NoError(t, config.UnmarshalReceiver(sub, cfg)) + require.NoError(t, component.UnmarshalReceiverConfig(sub, cfg)) expected := factory.CreateDefaultConfig().(*Config) expected.Endpoint = "http://localhost:8080/server-status?auto" diff --git a/receiver/apachereceiver/factory.go b/receiver/apachereceiver/factory.go index 2320b98e5b39..e856c667a7a6 100644 --- a/receiver/apachereceiver/factory.go +++ b/receiver/apachereceiver/factory.go @@ -44,10 +44,10 @@ func NewFactory() component.ReceiverFactory { component.WithMetricsReceiver(createMetricsReceiver, stability)) } -func createDefaultConfig() config.Receiver { +func createDefaultConfig() component.ReceiverConfig { return &Config{ ScraperControllerSettings: scraperhelper.ScraperControllerSettings{ - ReceiverSettings: config.NewReceiverSettings(config.NewComponentID(typeStr)), + ReceiverSettings: config.NewReceiverSettings(component.NewID(typeStr)), CollectionInterval: 10 * time.Second, }, HTTPClientSettings: confighttp.HTTPClientSettings{ @@ -78,7 +78,7 @@ func parseResourseAttributes(endpoint string) (string, string, error) { func createMetricsReceiver( _ context.Context, params component.ReceiverCreateSettings, - rConf config.Receiver, + rConf component.ReceiverConfig, consumer consumer.Metrics, ) (component.MetricsReceiver, error) { cfg := rConf.(*Config) diff --git a/receiver/apachereceiver/go.mod b/receiver/apachereceiver/go.mod index d580290b9cdf..7dec975bc304 100644 --- a/receiver/apachereceiver/go.mod +++ b/receiver/apachereceiver/go.mod @@ -5,7 +5,7 @@ go 1.18 require ( github.com/open-telemetry/opentelemetry-collector-contrib/internal/scrapertest v0.63.0 github.com/stretchr/testify v1.8.1 - go.opentelemetry.io/collector v0.63.2-0.20221104003159-6b27644724d8 + go.opentelemetry.io/collector v0.63.2-0.20221108014805-0b08d5316426 go.uber.org/zap v1.23.0 ) @@ -50,7 +50,7 @@ require ( github.com/pmezard/go-difflib v1.0.0 // indirect github.com/rs/cors v1.8.2 // indirect github.com/sirupsen/logrus v1.8.1 // indirect - go.opencensus.io v0.23.0 // indirect + go.opencensus.io v0.24.0 // 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 @@ -68,7 +68,7 @@ require ( require ( github.com/testcontainers/testcontainers-go v0.15.0 - go.opentelemetry.io/collector/pdata v0.63.2-0.20221104003159-6b27644724d8 + go.opentelemetry.io/collector/pdata v0.63.2-0.20221108014805-0b08d5316426 ) replace github.com/open-telemetry/opentelemetry-collector-contrib/internal/scrapertest => ../../internal/scrapertest diff --git a/receiver/apachereceiver/go.sum b/receiver/apachereceiver/go.sum index b661440eb27b..fb4bb87b61c2 100644 --- a/receiver/apachereceiver/go.sum +++ b/receiver/apachereceiver/go.sum @@ -690,7 +690,7 @@ github.com/prometheus/client_golang v1.0.0/go.mod h1:db9x61etRT2tGnBNRi70OPL5Fsn github.com/prometheus/client_golang v1.1.0/go.mod h1:I1FGZT9+L76gKKOs5djB6ezCbFQP1xR9D75/vuwEF3g= github.com/prometheus/client_golang v1.7.1/go.mod h1:PY5Wy2awLA44sXw4AOSfFBetzPP4j5+D6mVACh+pe2M= github.com/prometheus/client_golang v1.11.1/go.mod h1:Z6t4BnS23TR94PD6BsDNk8yVqroYurpAkEiz0P2BEV0= -github.com/prometheus/client_golang v1.13.0 h1:b71QUfeo5M8gq2+evJdTPfZhYMAU0uKPkyPJ7TPsloU= +github.com/prometheus/client_golang v1.13.1 h1:3gMjIY2+/hzmqhtUC/aQNYldJA6DtH3CgQvwS+02K1c= github.com/prometheus/client_model v0.0.0-20171117100541-99fa1f4be8e5/go.mod h1:MbSGuTsp3dbXC40dX6PRTWyKYBIrTGTE9sqQNg2J8bo= github.com/prometheus/client_model v0.0.0-20180712105110-5c3871d89910/go.mod h1:MbSGuTsp3dbXC40dX6PRTWyKYBIrTGTE9sqQNg2J8bo= github.com/prometheus/client_model v0.0.0-20190129233127-fd36f4220a90/go.mod h1:xMI15A0UPsDsEKsMN9yxemIoYk6Tm2C1GtYGdfGttqA= @@ -826,12 +826,12 @@ go.opencensus.io v0.21.0/go.mod h1:mSImk1erAIZhrmZN+AvHh14ztQfjbGwt4TtuofqLduU= 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.23.0 h1:gqCw0LfLxScz8irSi8exQc7fyQ0fKQU/qnC/X8+V/1M= -go.opencensus.io v0.23.0/go.mod h1:XItmlyltB5F7CS4xOC1DcqMoFqwtC6OG2xF7mCv7P7E= -go.opentelemetry.io/collector v0.63.2-0.20221104003159-6b27644724d8 h1:rOT5HzXXfSISc6FiH012zH2/EFjp37UXfjEqj5BpkWQ= -go.opentelemetry.io/collector v0.63.2-0.20221104003159-6b27644724d8/go.mod h1:JVmeZXugK4ondC6KQgrHTHWiF4JttpG5k6dWPMt62+k= -go.opentelemetry.io/collector/pdata v0.63.2-0.20221104003159-6b27644724d8 h1:7xeTQjfsOm9eogQeIxjSEhlik9qsbBGsnmkQHfyKaRE= -go.opentelemetry.io/collector/pdata v0.63.2-0.20221104003159-6b27644724d8/go.mod h1:IzvXUGQml2mrnvdb8zIlEW3qQs9oFLdD2hLwJdZ+pek= +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.63.2-0.20221108014805-0b08d5316426 h1:z/wLTMh7/vNxcFUDa5uG7/IPE3tYx6pzCWPV41ghyV8= +go.opentelemetry.io/collector v0.63.2-0.20221108014805-0b08d5316426/go.mod h1:+Zb70q0Rq17dA9FcHTiTjW6g96lvJ8kAZ0c+eWNkAv0= +go.opentelemetry.io/collector/pdata v0.63.2-0.20221108014805-0b08d5316426 h1:wKDpgP0Tx/gWI2SgDGAY1OTSeihhDivbbRqFR79IGTc= +go.opentelemetry.io/collector/pdata v0.63.2-0.20221108014805-0b08d5316426/go.mod h1:IzvXUGQml2mrnvdb8zIlEW3qQs9oFLdD2hLwJdZ+pek= 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/awscloudwatchreceiver/config_test.go b/receiver/awscloudwatchreceiver/config_test.go index 4460a23b60ea..b765d3c6d5ef 100644 --- a/receiver/awscloudwatchreceiver/config_test.go +++ b/receiver/awscloudwatchreceiver/config_test.go @@ -22,6 +22,7 @@ import ( "github.com/aws/aws-sdk-go/aws" "github.com/stretchr/testify/require" + "go.opentelemetry.io/collector/component" "go.opentelemetry.io/collector/config" "go.opentelemetry.io/collector/confmap/confmaptest" ) @@ -156,12 +157,12 @@ func TestLoadConfig(t *testing.T) { cases := []struct { name string - expectedConfig config.Receiver + expectedConfig component.ReceiverConfig }{ { name: "default", expectedConfig: &Config{ - ReceiverSettings: config.NewReceiverSettings(config.NewComponentID(typeStr)), + ReceiverSettings: config.NewReceiverSettings(component.NewID(typeStr)), Region: "us-west-1", Logs: &LogsConfig{ PollInterval: time.Minute, @@ -177,7 +178,7 @@ func TestLoadConfig(t *testing.T) { { name: "prefix-log-group-autodiscover", expectedConfig: &Config{ - ReceiverSettings: config.NewReceiverSettings(config.NewComponentID(typeStr)), + ReceiverSettings: config.NewReceiverSettings(component.NewID(typeStr)), Region: "us-west-1", Logs: &LogsConfig{ PollInterval: time.Minute, @@ -194,7 +195,7 @@ func TestLoadConfig(t *testing.T) { { name: "autodiscover-filter-streams", expectedConfig: &Config{ - ReceiverSettings: config.NewReceiverSettings(config.NewComponentID(typeStr)), + ReceiverSettings: config.NewReceiverSettings(component.NewID(typeStr)), Region: "us-west-1", Logs: &LogsConfig{ PollInterval: time.Minute, @@ -213,7 +214,7 @@ func TestLoadConfig(t *testing.T) { { name: "autodiscover-filter-streams", expectedConfig: &Config{ - ReceiverSettings: config.NewReceiverSettings(config.NewComponentID(typeStr)), + ReceiverSettings: config.NewReceiverSettings(component.NewID(typeStr)), Region: "us-west-1", Logs: &LogsConfig{ PollInterval: time.Minute, @@ -232,7 +233,7 @@ func TestLoadConfig(t *testing.T) { { name: "named-prefix", expectedConfig: &Config{ - ReceiverSettings: config.NewReceiverSettings(config.NewComponentID(typeStr)), + ReceiverSettings: config.NewReceiverSettings(component.NewID(typeStr)), Profile: "my-profile", Region: "us-west-1", Logs: &LogsConfig{ @@ -249,7 +250,7 @@ func TestLoadConfig(t *testing.T) { { name: "named-prefix-with-streams", expectedConfig: &Config{ - ReceiverSettings: config.NewReceiverSettings(config.NewComponentID(typeStr)), + ReceiverSettings: config.NewReceiverSettings(component.NewID(typeStr)), Profile: "my-profile", Region: "us-west-1", Logs: &LogsConfig{ @@ -272,9 +273,9 @@ func TestLoadConfig(t *testing.T) { factory := NewFactory() cfg := factory.CreateDefaultConfig() - loaded, err := cm.Sub(config.NewComponentIDWithName(typeStr, tc.name).String()) + loaded, err := cm.Sub(component.NewIDWithName(typeStr, tc.name).String()) require.NoError(t, err) - require.NoError(t, config.UnmarshalReceiver(loaded, cfg)) + require.NoError(t, component.UnmarshalReceiverConfig(loaded, cfg)) require.Equal(t, cfg, tc.expectedConfig) require.NoError(t, cfg.Validate()) }) diff --git a/receiver/awscloudwatchreceiver/factory.go b/receiver/awscloudwatchreceiver/factory.go index 4f0b8bcbcce3..051f8447caf6 100644 --- a/receiver/awscloudwatchreceiver/factory.go +++ b/receiver/awscloudwatchreceiver/factory.go @@ -39,7 +39,7 @@ func NewFactory() component.ReceiverFactory { func createLogsReceiver( ctx context.Context, params component.ReceiverCreateSettings, - rConf config.Receiver, + rConf component.ReceiverConfig, consumer consumer.Logs, ) (component.LogsReceiver, error) { cfg := rConf.(*Config) @@ -47,9 +47,9 @@ func createLogsReceiver( return rcvr, nil } -func createDefaultConfig() config.Receiver { +func createDefaultConfig() component.ReceiverConfig { return &Config{ - ReceiverSettings: config.NewReceiverSettings(config.NewComponentID(typeStr)), + ReceiverSettings: config.NewReceiverSettings(component.NewID(typeStr)), Logs: &LogsConfig{ PollInterval: defaultPollInterval, MaxEventsPerRequest: defaultEventLimit, diff --git a/receiver/awscloudwatchreceiver/go.mod b/receiver/awscloudwatchreceiver/go.mod index c4ebcd564704..0dcffefa9499 100644 --- a/receiver/awscloudwatchreceiver/go.mod +++ b/receiver/awscloudwatchreceiver/go.mod @@ -5,8 +5,8 @@ go 1.18 require ( github.com/aws/aws-sdk-go v1.44.127 github.com/stretchr/testify v1.8.1 - go.opentelemetry.io/collector v0.63.2-0.20221104003159-6b27644724d8 - go.opentelemetry.io/collector/pdata v0.63.2-0.20221104003159-6b27644724d8 + go.opentelemetry.io/collector v0.63.2-0.20221108014805-0b08d5316426 + go.opentelemetry.io/collector/pdata v0.63.2-0.20221108014805-0b08d5316426 go.uber.org/multierr v1.8.0 go.uber.org/zap v1.23.0 ) diff --git a/receiver/awscloudwatchreceiver/go.sum b/receiver/awscloudwatchreceiver/go.sum index 3db69fa43b16..eee18a51baf8 100644 --- a/receiver/awscloudwatchreceiver/go.sum +++ b/receiver/awscloudwatchreceiver/go.sum @@ -262,10 +262,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.63.2-0.20221104003159-6b27644724d8 h1:rOT5HzXXfSISc6FiH012zH2/EFjp37UXfjEqj5BpkWQ= -go.opentelemetry.io/collector v0.63.2-0.20221104003159-6b27644724d8/go.mod h1:JVmeZXugK4ondC6KQgrHTHWiF4JttpG5k6dWPMt62+k= -go.opentelemetry.io/collector/pdata v0.63.2-0.20221104003159-6b27644724d8 h1:7xeTQjfsOm9eogQeIxjSEhlik9qsbBGsnmkQHfyKaRE= -go.opentelemetry.io/collector/pdata v0.63.2-0.20221104003159-6b27644724d8/go.mod h1:IzvXUGQml2mrnvdb8zIlEW3qQs9oFLdD2hLwJdZ+pek= +go.opentelemetry.io/collector v0.63.2-0.20221108014805-0b08d5316426 h1:z/wLTMh7/vNxcFUDa5uG7/IPE3tYx6pzCWPV41ghyV8= +go.opentelemetry.io/collector v0.63.2-0.20221108014805-0b08d5316426/go.mod h1:+Zb70q0Rq17dA9FcHTiTjW6g96lvJ8kAZ0c+eWNkAv0= +go.opentelemetry.io/collector/pdata v0.63.2-0.20221108014805-0b08d5316426 h1:wKDpgP0Tx/gWI2SgDGAY1OTSeihhDivbbRqFR79IGTc= +go.opentelemetry.io/collector/pdata v0.63.2-0.20221108014805-0b08d5316426/go.mod h1:IzvXUGQml2mrnvdb8zIlEW3qQs9oFLdD2hLwJdZ+pek= 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 07656d2545e0..204094762a55 100644 --- a/receiver/awscontainerinsightreceiver/config_test.go +++ b/receiver/awscontainerinsightreceiver/config_test.go @@ -21,6 +21,7 @@ import ( "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" + "go.opentelemetry.io/collector/component" "go.opentelemetry.io/collector/config" "go.opentelemetry.io/collector/confmap/confmaptest" ) @@ -32,17 +33,17 @@ func TestLoadConfig(t *testing.T) { require.NoError(t, err) tests := []struct { - id config.ComponentID - expected config.Receiver + id component.ID + expected component.ReceiverConfig }{ { - id: config.NewComponentIDWithName(typeStr, ""), + id: component.NewIDWithName(typeStr, ""), expected: createDefaultConfig(), }, { - id: config.NewComponentIDWithName(typeStr, "collection_interval_settings"), + id: component.NewIDWithName(typeStr, "collection_interval_settings"), expected: &Config{ - ReceiverSettings: config.NewReceiverSettings(config.NewComponentID(typeStr)), + ReceiverSettings: config.NewReceiverSettings(component.NewID(typeStr)), CollectionInterval: 60 * time.Second, ContainerOrchestrator: "eks", TagService: true, @@ -58,7 +59,7 @@ func TestLoadConfig(t *testing.T) { sub, err := cm.Sub(tt.id.String()) require.NoError(t, err) - require.NoError(t, config.UnmarshalReceiver(sub, cfg)) + require.NoError(t, component.UnmarshalReceiverConfig(sub, cfg)) assert.NoError(t, cfg.Validate()) assert.Equal(t, tt.expected, cfg) diff --git a/receiver/awscontainerinsightreceiver/factory.go b/receiver/awscontainerinsightreceiver/factory.go index 9e1eb9644794..66d0ceeae3d6 100644 --- a/receiver/awscontainerinsightreceiver/factory.go +++ b/receiver/awscontainerinsightreceiver/factory.go @@ -56,9 +56,9 @@ func NewFactory() component.ReceiverFactory { } // createDefaultConfig returns a default config for the receiver. -func createDefaultConfig() config.Receiver { +func createDefaultConfig() component.ReceiverConfig { return &Config{ - ReceiverSettings: config.NewReceiverSettings(config.NewComponentID(typeStr)), + ReceiverSettings: config.NewReceiverSettings(component.NewID(typeStr)), CollectionInterval: defaultCollectionInterval, ContainerOrchestrator: defaultContainerOrchestrator, TagService: defaultTagService, @@ -71,7 +71,7 @@ func createDefaultConfig() config.Receiver { func createMetricsReceiver( _ context.Context, params component.ReceiverCreateSettings, - baseCfg config.Receiver, + baseCfg component.ReceiverConfig, consumer consumer.Metrics, ) (component.MetricsReceiver, error) { diff --git a/receiver/awscontainerinsightreceiver/go.mod b/receiver/awscontainerinsightreceiver/go.mod index 947f7840e6b8..dce2aefd51d8 100644 --- a/receiver/awscontainerinsightreceiver/go.mod +++ b/receiver/awscontainerinsightreceiver/go.mod @@ -13,8 +13,8 @@ require ( github.com/open-telemetry/opentelemetry-collector-contrib/internal/kubelet v0.63.0 github.com/shirou/gopsutil/v3 v3.22.10 github.com/stretchr/testify v1.8.1 - go.opentelemetry.io/collector v0.63.2-0.20221104003159-6b27644724d8 - go.opentelemetry.io/collector/pdata v0.63.2-0.20221104003159-6b27644724d8 + go.opentelemetry.io/collector v0.63.2-0.20221108014805-0b08d5316426 + go.opentelemetry.io/collector/pdata v0.63.2-0.20221108014805-0b08d5316426 go.uber.org/zap v1.23.0 k8s.io/api v0.25.3 k8s.io/apimachinery v0.25.3 diff --git a/receiver/awscontainerinsightreceiver/go.sum b/receiver/awscontainerinsightreceiver/go.sum index 1611ef14a3f9..9db5b14732a2 100644 --- a/receiver/awscontainerinsightreceiver/go.sum +++ b/receiver/awscontainerinsightreceiver/go.sum @@ -568,10 +568,10 @@ 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.63.2-0.20221104003159-6b27644724d8 h1:rOT5HzXXfSISc6FiH012zH2/EFjp37UXfjEqj5BpkWQ= -go.opentelemetry.io/collector v0.63.2-0.20221104003159-6b27644724d8/go.mod h1:JVmeZXugK4ondC6KQgrHTHWiF4JttpG5k6dWPMt62+k= -go.opentelemetry.io/collector/pdata v0.63.2-0.20221104003159-6b27644724d8 h1:7xeTQjfsOm9eogQeIxjSEhlik9qsbBGsnmkQHfyKaRE= -go.opentelemetry.io/collector/pdata v0.63.2-0.20221104003159-6b27644724d8/go.mod h1:IzvXUGQml2mrnvdb8zIlEW3qQs9oFLdD2hLwJdZ+pek= +go.opentelemetry.io/collector v0.63.2-0.20221108014805-0b08d5316426 h1:z/wLTMh7/vNxcFUDa5uG7/IPE3tYx6pzCWPV41ghyV8= +go.opentelemetry.io/collector v0.63.2-0.20221108014805-0b08d5316426/go.mod h1:+Zb70q0Rq17dA9FcHTiTjW6g96lvJ8kAZ0c+eWNkAv0= +go.opentelemetry.io/collector/pdata v0.63.2-0.20221108014805-0b08d5316426 h1:wKDpgP0Tx/gWI2SgDGAY1OTSeihhDivbbRqFR79IGTc= +go.opentelemetry.io/collector/pdata v0.63.2-0.20221108014805-0b08d5316426/go.mod h1:IzvXUGQml2mrnvdb8zIlEW3qQs9oFLdD2hLwJdZ+pek= 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 c006686aeed8..fcaac9e6a0d5 100644 --- a/receiver/awsecscontainermetricsreceiver/config_test.go +++ b/receiver/awsecscontainermetricsreceiver/config_test.go @@ -21,6 +21,7 @@ import ( "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" + "go.opentelemetry.io/collector/component" "go.opentelemetry.io/collector/config" "go.opentelemetry.io/collector/confmap/confmaptest" ) @@ -32,17 +33,17 @@ func TestLoadConfig(t *testing.T) { require.NoError(t, err) tests := []struct { - id config.ComponentID - expected config.Receiver + id component.ID + expected component.ReceiverConfig }{ { - id: config.NewComponentIDWithName(typeStr, ""), + id: component.NewIDWithName(typeStr, ""), expected: createDefaultConfig(), }, { - id: config.NewComponentIDWithName(typeStr, "collection_interval_settings"), + id: component.NewIDWithName(typeStr, "collection_interval_settings"), expected: &Config{ - ReceiverSettings: config.NewReceiverSettings(config.NewComponentID(typeStr)), + ReceiverSettings: config.NewReceiverSettings(component.NewID(typeStr)), CollectionInterval: 10 * time.Second, }, }, @@ -55,7 +56,7 @@ func TestLoadConfig(t *testing.T) { sub, err := cm.Sub(tt.id.String()) require.NoError(t, err) - require.NoError(t, config.UnmarshalReceiver(sub, cfg)) + require.NoError(t, component.UnmarshalReceiverConfig(sub, cfg)) assert.NoError(t, cfg.Validate()) assert.Equal(t, tt.expected, cfg) diff --git a/receiver/awsecscontainermetricsreceiver/factory.go b/receiver/awsecscontainermetricsreceiver/factory.go index 20e465c1dfa6..3b8806e67c8a 100644 --- a/receiver/awsecscontainermetricsreceiver/factory.go +++ b/receiver/awsecscontainermetricsreceiver/factory.go @@ -49,9 +49,9 @@ func NewFactory() component.ReceiverFactory { } // createDefaultConfig returns a default config for the receiver. -func createDefaultConfig() config.Receiver { +func createDefaultConfig() component.ReceiverConfig { return &Config{ - ReceiverSettings: config.NewReceiverSettings(config.NewComponentID(typeStr)), + ReceiverSettings: config.NewReceiverSettings(component.NewID(typeStr)), CollectionInterval: defaultCollectionInterval, } } @@ -60,7 +60,7 @@ func createDefaultConfig() config.Receiver { func createMetricsReceiver( ctx context.Context, params component.ReceiverCreateSettings, - baseCfg config.Receiver, + baseCfg component.ReceiverConfig, consumer consumer.Metrics, ) (component.MetricsReceiver, error) { endpoint, err := endpoints.GetTMEV4FromEnv() diff --git a/receiver/awsecscontainermetricsreceiver/factory_test.go b/receiver/awsecscontainermetricsreceiver/factory_test.go index 2aa90ea359ab..a763b0dc3769 100644 --- a/receiver/awsecscontainermetricsreceiver/factory_test.go +++ b/receiver/awsecscontainermetricsreceiver/factory_test.go @@ -20,14 +20,13 @@ import ( "github.com/stretchr/testify/require" "go.opentelemetry.io/collector/component/componenttest" - "go.opentelemetry.io/collector/config/configtest" "go.opentelemetry.io/collector/consumer/consumertest" "github.com/open-telemetry/opentelemetry-collector-contrib/internal/aws/ecsutil/endpoints" ) func TestValidConfig(t *testing.T) { - err := configtest.CheckConfigStruct(createDefaultConfig()) + err := componenttest.CheckConfigStruct(createDefaultConfig()) require.NoError(t, err) } diff --git a/receiver/awsecscontainermetricsreceiver/go.mod b/receiver/awsecscontainermetricsreceiver/go.mod index a5ac86b1adf6..45825ba38e8e 100644 --- a/receiver/awsecscontainermetricsreceiver/go.mod +++ b/receiver/awsecscontainermetricsreceiver/go.mod @@ -6,9 +6,9 @@ require ( github.com/open-telemetry/opentelemetry-collector-contrib/internal/aws/ecsutil v0.63.0 github.com/open-telemetry/opentelemetry-collector-contrib/internal/common v0.63.0 github.com/stretchr/testify v1.8.1 - go.opentelemetry.io/collector v0.63.2-0.20221104003159-6b27644724d8 - go.opentelemetry.io/collector/pdata v0.63.2-0.20221104003159-6b27644724d8 - go.opentelemetry.io/collector/semconv v0.63.2-0.20221104003159-6b27644724d8 + go.opentelemetry.io/collector v0.63.2-0.20221108014805-0b08d5316426 + go.opentelemetry.io/collector/pdata v0.63.2-0.20221108014805-0b08d5316426 + go.opentelemetry.io/collector/semconv v0.63.2-0.20221108014805-0b08d5316426 go.uber.org/zap v1.23.0 ) diff --git a/receiver/awsecscontainermetricsreceiver/go.sum b/receiver/awsecscontainermetricsreceiver/go.sum index f46a45e30d3e..f1842e2f1a05 100644 --- a/receiver/awsecscontainermetricsreceiver/go.sum +++ b/receiver/awsecscontainermetricsreceiver/go.sum @@ -271,12 +271,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.63.2-0.20221104003159-6b27644724d8 h1:rOT5HzXXfSISc6FiH012zH2/EFjp37UXfjEqj5BpkWQ= -go.opentelemetry.io/collector v0.63.2-0.20221104003159-6b27644724d8/go.mod h1:JVmeZXugK4ondC6KQgrHTHWiF4JttpG5k6dWPMt62+k= -go.opentelemetry.io/collector/pdata v0.63.2-0.20221104003159-6b27644724d8 h1:7xeTQjfsOm9eogQeIxjSEhlik9qsbBGsnmkQHfyKaRE= -go.opentelemetry.io/collector/pdata v0.63.2-0.20221104003159-6b27644724d8/go.mod h1:IzvXUGQml2mrnvdb8zIlEW3qQs9oFLdD2hLwJdZ+pek= -go.opentelemetry.io/collector/semconv v0.63.2-0.20221104003159-6b27644724d8 h1:jm0sNPyqo6S165QjQYMBHB2nK50wlJbMYM03Yr3Eo2k= -go.opentelemetry.io/collector/semconv v0.63.2-0.20221104003159-6b27644724d8/go.mod h1:5o9yhOa+ABt7g2E5JABDxGZ1PQPbtfxrKNbYn+LOTXU= +go.opentelemetry.io/collector v0.63.2-0.20221108014805-0b08d5316426 h1:z/wLTMh7/vNxcFUDa5uG7/IPE3tYx6pzCWPV41ghyV8= +go.opentelemetry.io/collector v0.63.2-0.20221108014805-0b08d5316426/go.mod h1:+Zb70q0Rq17dA9FcHTiTjW6g96lvJ8kAZ0c+eWNkAv0= +go.opentelemetry.io/collector/pdata v0.63.2-0.20221108014805-0b08d5316426 h1:wKDpgP0Tx/gWI2SgDGAY1OTSeihhDivbbRqFR79IGTc= +go.opentelemetry.io/collector/pdata v0.63.2-0.20221108014805-0b08d5316426/go.mod h1:IzvXUGQml2mrnvdb8zIlEW3qQs9oFLdD2hLwJdZ+pek= +go.opentelemetry.io/collector/semconv v0.63.2-0.20221108014805-0b08d5316426 h1:pqIl7OC531J6i9ttBCj3zLmZI/BSF4q323YpK0GgKGk= +go.opentelemetry.io/collector/semconv v0.63.2-0.20221108014805-0b08d5316426/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 0a0270149e00..17774f759304 100644 --- a/receiver/awsfirehosereceiver/config_test.go +++ b/receiver/awsfirehosereceiver/config_test.go @@ -20,6 +20,7 @@ import ( "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" + "go.opentelemetry.io/collector/component" "go.opentelemetry.io/collector/config" "go.opentelemetry.io/collector/config/confighttp" "go.opentelemetry.io/collector/config/configtls" @@ -33,14 +34,14 @@ func TestLoadConfig(t *testing.T) { factory := NewFactory() cfg := factory.CreateDefaultConfig() - sub, err := cm.Sub(config.NewComponentIDWithName(typeStr, "").String()) + sub, err := cm.Sub(component.NewIDWithName(typeStr, "").String()) require.NoError(t, err) - require.NoError(t, config.UnmarshalReceiver(sub, cfg)) + require.NoError(t, component.UnmarshalReceiverConfig(sub, cfg)) assert.NoError(t, cfg.Validate()) require.Equal(t, &Config{ - ReceiverSettings: config.NewReceiverSettings(config.NewComponentID(typeStr)), + ReceiverSettings: config.NewReceiverSettings(component.NewID(typeStr)), RecordType: "cwmetrics", AccessKey: "some_access_key", HTTPServerSettings: confighttp.HTTPServerSettings{ diff --git a/receiver/awsfirehosereceiver/factory.go b/receiver/awsfirehosereceiver/factory.go index f31d24171cc9..4d96ea659be1 100644 --- a/receiver/awsfirehosereceiver/factory.go +++ b/receiver/awsfirehosereceiver/factory.go @@ -71,9 +71,9 @@ func defaultMetricsUnmarshalers(logger *zap.Logger) map[string]unmarshaler.Metri // createDefaultConfig creates a default config with the endpoint set // to port 8443 and the record type set to the CloudWatch metric stream. -func createDefaultConfig() config.Receiver { +func createDefaultConfig() component.ReceiverConfig { return &Config{ - ReceiverSettings: config.NewReceiverSettings(config.NewComponentID(typeStr)), + ReceiverSettings: config.NewReceiverSettings(component.NewID(typeStr)), RecordType: defaultRecordType, HTTPServerSettings: confighttp.HTTPServerSettings{ Endpoint: defaultEndpoint, @@ -85,7 +85,7 @@ func createDefaultConfig() config.Receiver { func createMetricsReceiver( _ context.Context, set component.ReceiverCreateSettings, - cfg config.Receiver, + cfg component.ReceiverConfig, nextConsumer consumer.Metrics, ) (component.MetricsReceiver, error) { return newMetricsReceiver(cfg.(*Config), set, defaultMetricsUnmarshalers(set.Logger), nextConsumer) diff --git a/receiver/awsfirehosereceiver/factory_test.go b/receiver/awsfirehosereceiver/factory_test.go index 4621801b515b..d4549deccd8d 100644 --- a/receiver/awsfirehosereceiver/factory_test.go +++ b/receiver/awsfirehosereceiver/factory_test.go @@ -20,12 +20,11 @@ import ( "github.com/stretchr/testify/require" "go.opentelemetry.io/collector/component/componenttest" - "go.opentelemetry.io/collector/config/configtest" "go.opentelemetry.io/collector/consumer/consumertest" ) func TestValidConfig(t *testing.T) { - err := configtest.CheckConfigStruct(createDefaultConfig()) + err := componenttest.CheckConfigStruct(createDefaultConfig()) require.NoError(t, err) } diff --git a/receiver/awsfirehosereceiver/go.mod b/receiver/awsfirehosereceiver/go.mod index 61f5392e34bd..d82ccf217d59 100644 --- a/receiver/awsfirehosereceiver/go.mod +++ b/receiver/awsfirehosereceiver/go.mod @@ -4,9 +4,9 @@ go 1.18 require ( github.com/stretchr/testify v1.8.1 - go.opentelemetry.io/collector v0.63.2-0.20221104003159-6b27644724d8 - go.opentelemetry.io/collector/pdata v0.63.2-0.20221104003159-6b27644724d8 - go.opentelemetry.io/collector/semconv v0.63.2-0.20221104003159-6b27644724d8 + go.opentelemetry.io/collector v0.63.2-0.20221108014805-0b08d5316426 + go.opentelemetry.io/collector/pdata v0.63.2-0.20221108014805-0b08d5316426 + go.opentelemetry.io/collector/semconv v0.63.2-0.20221108014805-0b08d5316426 go.uber.org/zap v1.23.0 ) diff --git a/receiver/awsfirehosereceiver/go.sum b/receiver/awsfirehosereceiver/go.sum index a34f30a2e876..fcbab58ce4fd 100644 --- a/receiver/awsfirehosereceiver/go.sum +++ b/receiver/awsfirehosereceiver/go.sum @@ -277,12 +277,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.63.2-0.20221104003159-6b27644724d8 h1:rOT5HzXXfSISc6FiH012zH2/EFjp37UXfjEqj5BpkWQ= -go.opentelemetry.io/collector v0.63.2-0.20221104003159-6b27644724d8/go.mod h1:JVmeZXugK4ondC6KQgrHTHWiF4JttpG5k6dWPMt62+k= -go.opentelemetry.io/collector/pdata v0.63.2-0.20221104003159-6b27644724d8 h1:7xeTQjfsOm9eogQeIxjSEhlik9qsbBGsnmkQHfyKaRE= -go.opentelemetry.io/collector/pdata v0.63.2-0.20221104003159-6b27644724d8/go.mod h1:IzvXUGQml2mrnvdb8zIlEW3qQs9oFLdD2hLwJdZ+pek= -go.opentelemetry.io/collector/semconv v0.63.2-0.20221104003159-6b27644724d8 h1:jm0sNPyqo6S165QjQYMBHB2nK50wlJbMYM03Yr3Eo2k= -go.opentelemetry.io/collector/semconv v0.63.2-0.20221104003159-6b27644724d8/go.mod h1:5o9yhOa+ABt7g2E5JABDxGZ1PQPbtfxrKNbYn+LOTXU= +go.opentelemetry.io/collector v0.63.2-0.20221108014805-0b08d5316426 h1:z/wLTMh7/vNxcFUDa5uG7/IPE3tYx6pzCWPV41ghyV8= +go.opentelemetry.io/collector v0.63.2-0.20221108014805-0b08d5316426/go.mod h1:+Zb70q0Rq17dA9FcHTiTjW6g96lvJ8kAZ0c+eWNkAv0= +go.opentelemetry.io/collector/pdata v0.63.2-0.20221108014805-0b08d5316426 h1:wKDpgP0Tx/gWI2SgDGAY1OTSeihhDivbbRqFR79IGTc= +go.opentelemetry.io/collector/pdata v0.63.2-0.20221108014805-0b08d5316426/go.mod h1:IzvXUGQml2mrnvdb8zIlEW3qQs9oFLdD2hLwJdZ+pek= +go.opentelemetry.io/collector/semconv v0.63.2-0.20221108014805-0b08d5316426 h1:pqIl7OC531J6i9ttBCj3zLmZI/BSF4q323YpK0GgKGk= +go.opentelemetry.io/collector/semconv v0.63.2-0.20221108014805-0b08d5316426/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/receiver.go b/receiver/awsfirehosereceiver/receiver.go index 6baf848f55c4..96bb56489ac3 100644 --- a/receiver/awsfirehosereceiver/receiver.go +++ b/receiver/awsfirehosereceiver/receiver.go @@ -27,7 +27,6 @@ import ( "time" "go.opentelemetry.io/collector/component" - "go.opentelemetry.io/collector/config" "go.uber.org/zap" ) @@ -56,7 +55,7 @@ type firehoseConsumer interface { // firehoseReceiver type firehoseReceiver struct { // instanceID is the instance ID for the receiver. - instanceID config.ComponentID + instanceID component.ID // settings is the base receiver settings. settings component.ReceiverCreateSettings // config is the configuration for the receiver. diff --git a/receiver/awsfirehosereceiver/receiver_test.go b/receiver/awsfirehosereceiver/receiver_test.go index 31b9b7897b8c..2363517abe65 100644 --- a/receiver/awsfirehosereceiver/receiver_test.go +++ b/receiver/awsfirehosereceiver/receiver_test.go @@ -69,7 +69,7 @@ func TestStart(t *testing.T) { for name, testCase := range testCases { t.Run(name, func(t *testing.T) { cfg := &Config{ - ReceiverSettings: config.NewReceiverSettings(config.NewComponentID(typeStr)), + ReceiverSettings: config.NewReceiverSettings(component.NewID(typeStr)), RecordType: defaultRecordType, } ctx := context.TODO() @@ -88,7 +88,7 @@ func TestStart(t *testing.T) { require.NoError(t, listener.Close()) }) cfg := &Config{ - ReceiverSettings: config.NewReceiverSettings(config.NewComponentID(typeStr)), + ReceiverSettings: config.NewReceiverSettings(component.NewID(typeStr)), RecordType: defaultRecordType, HTTPServerSettings: confighttp.HTTPServerSettings{ Endpoint: listener.Addr().String(), @@ -108,7 +108,7 @@ func TestFirehoseRequest(t *testing.T) { defaultConsumer := newNopFirehoseConsumer(http.StatusOK, nil) firehoseConsumerErr := errors.New("firehose consumer error") cfg := &Config{ - ReceiverSettings: config.NewReceiverSettings(config.NewComponentID(typeStr)), + ReceiverSettings: config.NewReceiverSettings(component.NewID(typeStr)), RecordType: defaultRecordType, AccessKey: testFirehoseAccessKey, } diff --git a/receiver/awsxrayreceiver/config_test.go b/receiver/awsxrayreceiver/config_test.go index 93a60026389a..b3d749ccc9ea 100644 --- a/receiver/awsxrayreceiver/config_test.go +++ b/receiver/awsxrayreceiver/config_test.go @@ -20,6 +20,7 @@ import ( "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" + "go.opentelemetry.io/collector/component" "go.opentelemetry.io/collector/config" "go.opentelemetry.io/collector/config/confignet" "go.opentelemetry.io/collector/config/configtls" @@ -36,17 +37,17 @@ func TestLoadConfig(t *testing.T) { require.NoError(t, err) tests := []struct { - id config.ComponentID - expected config.Receiver + id component.ID + expected component.ReceiverConfig }{ { - id: config.NewComponentIDWithName(awsxray.TypeStr, ""), + id: component.NewIDWithName(awsxray.TypeStr, ""), expected: createDefaultConfig(), }, { - id: config.NewComponentIDWithName(awsxray.TypeStr, "udp_endpoint"), + id: component.NewIDWithName(awsxray.TypeStr, "udp_endpoint"), expected: &Config{ - ReceiverSettings: config.NewReceiverSettings(config.NewComponentID(awsxray.TypeStr)), + ReceiverSettings: config.NewReceiverSettings(component.NewID(awsxray.TypeStr)), NetAddr: confignet.NetAddr{ Endpoint: "0.0.0.0:5678", Transport: "udp", @@ -67,9 +68,9 @@ func TestLoadConfig(t *testing.T) { }, }, { - id: config.NewComponentIDWithName(awsxray.TypeStr, "proxy_server"), + id: component.NewIDWithName(awsxray.TypeStr, "proxy_server"), expected: &Config{ - ReceiverSettings: config.NewReceiverSettings(config.NewComponentID(awsxray.TypeStr)), + ReceiverSettings: config.NewReceiverSettings(component.NewID(awsxray.TypeStr)), NetAddr: confignet.NetAddr{ Endpoint: "0.0.0.0:2000", Transport: "udp", @@ -98,7 +99,7 @@ func TestLoadConfig(t *testing.T) { sub, err := cm.Sub(tt.id.String()) require.NoError(t, err) - require.NoError(t, config.UnmarshalReceiver(sub, cfg)) + require.NoError(t, component.UnmarshalReceiverConfig(sub, cfg)) assert.NoError(t, cfg.Validate()) assert.Equal(t, tt.expected, cfg) diff --git a/receiver/awsxrayreceiver/factory.go b/receiver/awsxrayreceiver/factory.go index e60e0782f66d..c3e1f98baefc 100644 --- a/receiver/awsxrayreceiver/factory.go +++ b/receiver/awsxrayreceiver/factory.go @@ -35,12 +35,12 @@ func NewFactory() component.ReceiverFactory { component.WithTracesReceiver(createTracesReceiver, component.StabilityLevelBeta)) } -func createDefaultConfig() config.Receiver { +func createDefaultConfig() component.ReceiverConfig { // reference the existing default configurations provided // in the X-Ray daemon: // https://github.com/aws/aws-xray-daemon/blob/master/pkg/cfg/cfg.go#L99 return &Config{ - ReceiverSettings: config.NewReceiverSettings(config.NewComponentID(awsxray.TypeStr)), + ReceiverSettings: config.NewReceiverSettings(component.NewID(awsxray.TypeStr)), // X-Ray daemon defaults to 127.0.0.1:2000 but // the default in OT is 0.0.0.0. NetAddr: confignet.NetAddr{ @@ -54,7 +54,7 @@ func createDefaultConfig() config.Receiver { func createTracesReceiver( ctx context.Context, params component.ReceiverCreateSettings, - cfg config.Receiver, + cfg component.ReceiverConfig, consumer consumer.Traces) (component.TracesReceiver, error) { rcfg := cfg.(*Config) return newReceiver(rcfg, consumer, params) diff --git a/receiver/awsxrayreceiver/factory_test.go b/receiver/awsxrayreceiver/factory_test.go index bca64a08ddb0..c358e86af527 100644 --- a/receiver/awsxrayreceiver/factory_test.go +++ b/receiver/awsxrayreceiver/factory_test.go @@ -22,8 +22,6 @@ import ( "github.com/stretchr/testify/assert" "go.opentelemetry.io/collector/component" "go.opentelemetry.io/collector/component/componenttest" - "go.opentelemetry.io/collector/config" - "go.opentelemetry.io/collector/config/configtest" "go.opentelemetry.io/collector/consumer/consumertest" awsxray "github.com/open-telemetry/opentelemetry-collector-contrib/internal/aws/xray" @@ -33,9 +31,9 @@ func TestCreateDefaultConfig(t *testing.T) { factory := NewFactory() cfg := factory.CreateDefaultConfig() assert.NotNil(t, cfg, "failed to create default config") - assert.NoError(t, configtest.CheckConfigStruct(cfg)) + assert.NoError(t, componenttest.CheckConfigStruct(cfg)) - assert.Equal(t, config.Type(awsxray.TypeStr), factory.Type()) + assert.Equal(t, component.Type(awsxray.TypeStr), factory.Type()) } func TestCreateTracesReceiver(t *testing.T) { diff --git a/receiver/awsxrayreceiver/go.mod b/receiver/awsxrayreceiver/go.mod index 9ccd669bf24e..96db08682b55 100644 --- a/receiver/awsxrayreceiver/go.mod +++ b/receiver/awsxrayreceiver/go.mod @@ -9,8 +9,8 @@ require ( github.com/open-telemetry/opentelemetry-collector-contrib/internal/aws/xray v0.63.0 github.com/open-telemetry/opentelemetry-collector-contrib/internal/coreinternal v0.63.0 github.com/stretchr/testify v1.8.1 - go.opentelemetry.io/collector v0.63.2-0.20221104003159-6b27644724d8 - go.opentelemetry.io/collector/semconv v0.63.2-0.20221104003159-6b27644724d8 + go.opentelemetry.io/collector v0.63.2-0.20221108014805-0b08d5316426 + go.opentelemetry.io/collector/semconv v0.63.2-0.20221108014805-0b08d5316426 go.uber.org/multierr v1.8.0 go.uber.org/zap v1.23.0 ) @@ -37,13 +37,13 @@ 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 - github.com/prometheus/client_golang v1.13.0 // indirect + github.com/prometheus/client_golang v1.13.1 // indirect github.com/prometheus/client_model v0.3.0 // indirect 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 github.com/rogpeppe/go-internal v1.6.1 // indirect - go.opencensus.io v0.23.0 // indirect + go.opencensus.io v0.24.0 // 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 @@ -62,7 +62,7 @@ require ( require ( github.com/open-telemetry/opentelemetry-collector-contrib/internal/common v0.63.0 - go.opentelemetry.io/collector/pdata v0.63.2-0.20221104003159-6b27644724d8 + go.opentelemetry.io/collector/pdata v0.63.2-0.20221108014805-0b08d5316426 go.opentelemetry.io/otel/sdk v1.11.1 // indirect ) diff --git a/receiver/awsxrayreceiver/go.sum b/receiver/awsxrayreceiver/go.sum index 17aa2c1c6050..9ea795ec8354 100644 --- a/receiver/awsxrayreceiver/go.sum +++ b/receiver/awsxrayreceiver/go.sum @@ -307,8 +307,9 @@ github.com/prometheus/client_golang v1.11.0/go.mod h1:Z6t4BnS23TR94PD6BsDNk8yVqr github.com/prometheus/client_golang v1.11.1/go.mod h1:Z6t4BnS23TR94PD6BsDNk8yVqroYurpAkEiz0P2BEV0= github.com/prometheus/client_golang v1.12.1/go.mod h1:3Z9XVyYiZYEO+YQWt3RD2R3jrbd179Rt297l4aS6nDY= github.com/prometheus/client_golang v1.12.2/go.mod h1:3Z9XVyYiZYEO+YQWt3RD2R3jrbd179Rt297l4aS6nDY= -github.com/prometheus/client_golang v1.13.0 h1:b71QUfeo5M8gq2+evJdTPfZhYMAU0uKPkyPJ7TPsloU= github.com/prometheus/client_golang v1.13.0/go.mod h1:vTeo+zgvILHsnnj/39Ou/1fPN5nJFOEMgftOUOmlvYQ= +github.com/prometheus/client_golang v1.13.1 h1:3gMjIY2+/hzmqhtUC/aQNYldJA6DtH3CgQvwS+02K1c= +github.com/prometheus/client_golang v1.13.1/go.mod h1:vTeo+zgvILHsnnj/39Ou/1fPN5nJFOEMgftOUOmlvYQ= github.com/prometheus/client_model v0.0.0-20180712105110-5c3871d89910/go.mod h1:MbSGuTsp3dbXC40dX6PRTWyKYBIrTGTE9sqQNg2J8bo= github.com/prometheus/client_model v0.0.0-20190129233127-fd36f4220a90/go.mod h1:xMI15A0UPsDsEKsMN9yxemIoYk6Tm2C1GtYGdfGttqA= github.com/prometheus/client_model v0.0.0-20190812154241-14fe0d1b01d4/go.mod h1:xMI15A0UPsDsEKsMN9yxemIoYk6Tm2C1GtYGdfGttqA= @@ -373,14 +374,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.opencensus.io v0.23.0 h1:gqCw0LfLxScz8irSi8exQc7fyQ0fKQU/qnC/X8+V/1M= go.opencensus.io v0.23.0/go.mod h1:XItmlyltB5F7CS4xOC1DcqMoFqwtC6OG2xF7mCv7P7E= -go.opentelemetry.io/collector v0.63.2-0.20221104003159-6b27644724d8 h1:rOT5HzXXfSISc6FiH012zH2/EFjp37UXfjEqj5BpkWQ= -go.opentelemetry.io/collector v0.63.2-0.20221104003159-6b27644724d8/go.mod h1:JVmeZXugK4ondC6KQgrHTHWiF4JttpG5k6dWPMt62+k= -go.opentelemetry.io/collector/pdata v0.63.2-0.20221104003159-6b27644724d8 h1:7xeTQjfsOm9eogQeIxjSEhlik9qsbBGsnmkQHfyKaRE= -go.opentelemetry.io/collector/pdata v0.63.2-0.20221104003159-6b27644724d8/go.mod h1:IzvXUGQml2mrnvdb8zIlEW3qQs9oFLdD2hLwJdZ+pek= -go.opentelemetry.io/collector/semconv v0.63.2-0.20221104003159-6b27644724d8 h1:jm0sNPyqo6S165QjQYMBHB2nK50wlJbMYM03Yr3Eo2k= -go.opentelemetry.io/collector/semconv v0.63.2-0.20221104003159-6b27644724d8/go.mod h1:5o9yhOa+ABt7g2E5JABDxGZ1PQPbtfxrKNbYn+LOTXU= +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.63.2-0.20221108014805-0b08d5316426 h1:z/wLTMh7/vNxcFUDa5uG7/IPE3tYx6pzCWPV41ghyV8= +go.opentelemetry.io/collector v0.63.2-0.20221108014805-0b08d5316426/go.mod h1:+Zb70q0Rq17dA9FcHTiTjW6g96lvJ8kAZ0c+eWNkAv0= +go.opentelemetry.io/collector/pdata v0.63.2-0.20221108014805-0b08d5316426 h1:wKDpgP0Tx/gWI2SgDGAY1OTSeihhDivbbRqFR79IGTc= +go.opentelemetry.io/collector/pdata v0.63.2-0.20221108014805-0b08d5316426/go.mod h1:IzvXUGQml2mrnvdb8zIlEW3qQs9oFLdD2hLwJdZ+pek= +go.opentelemetry.io/collector/semconv v0.63.2-0.20221108014805-0b08d5316426 h1:pqIl7OC531J6i9ttBCj3zLmZI/BSF4q323YpK0GgKGk= +go.opentelemetry.io/collector/semconv v0.63.2-0.20221108014805-0b08d5316426/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/awsxrayreceiver/internal/udppoller/poller.go b/receiver/awsxrayreceiver/internal/udppoller/poller.go index bef109be1bd6..df7acffe0bb0 100644 --- a/receiver/awsxrayreceiver/internal/udppoller/poller.go +++ b/receiver/awsxrayreceiver/internal/udppoller/poller.go @@ -22,7 +22,6 @@ import ( "sync" "go.opentelemetry.io/collector/component" - "go.opentelemetry.io/collector/config" "go.opentelemetry.io/collector/obsreport" "go.uber.org/zap" @@ -66,14 +65,14 @@ type RawSegment struct { // Config represents the configurations needed to // start the UDP poller type Config struct { - ReceiverID config.ComponentID + ReceiverID component.ID Transport string Endpoint string NumOfPollerToStart int } type poller struct { - receiverID config.ComponentID + receiverID component.ID udpSock socketconn.SocketConn logger *zap.Logger wg sync.WaitGroup diff --git a/receiver/awsxrayreceiver/internal/udppoller/poller_test.go b/receiver/awsxrayreceiver/internal/udppoller/poller_test.go index 88f289633874..39a286825cae 100644 --- a/receiver/awsxrayreceiver/internal/udppoller/poller_test.go +++ b/receiver/awsxrayreceiver/internal/udppoller/poller_test.go @@ -28,7 +28,6 @@ import ( "github.com/stretchr/testify/assert" "go.opentelemetry.io/collector/component" "go.opentelemetry.io/collector/component/componenttest" - "go.opentelemetry.io/collector/config" "go.opentelemetry.io/collector/obsreport" "go.opentelemetry.io/collector/obsreport/obsreporttest" "go.uber.org/zap" @@ -129,7 +128,7 @@ func TestSuccessfullyPollPacket(t *testing.T) { assert.NoError(t, tt.Shutdown(context.Background())) }() - receiverID := config.NewComponentID("TestSuccessfullyPollPacket") + receiverID := component.NewID("TestSuccessfullyPollPacket") addr, p, _ := createAndOptionallyStartPoller(t, receiverID, true, tt.ToReceiverCreateSettings()) defer p.Close() @@ -165,7 +164,7 @@ func TestIncompletePacketNoSeparator(t *testing.T) { assert.NoError(t, tt.Shutdown(context.Background())) }() - receiverID := config.NewComponentID("TestIncompletePacketNoSeparator") + receiverID := component.NewID("TestIncompletePacketNoSeparator") addr, p, recordedLogs := createAndOptionallyStartPoller(t, receiverID, true, tt.ToReceiverCreateSettings()) defer p.Close() @@ -196,7 +195,7 @@ func TestIncompletePacketNoBody(t *testing.T) { assert.NoError(t, tt.Shutdown(context.Background())) }() - receiverID := config.NewComponentID("TestIncompletePacketNoBody") + receiverID := component.NewID("TestIncompletePacketNoBody") addr, p, recordedLogs := createAndOptionallyStartPoller(t, receiverID, true, tt.ToReceiverCreateSettings()) defer p.Close() @@ -222,7 +221,7 @@ func TestNonJsonHeader(t *testing.T) { assert.NoError(t, tt.Shutdown(context.Background())) }() - receiverID := config.NewComponentID("TestNonJsonHeader") + receiverID := component.NewID("TestNonJsonHeader") addr, p, recordedLogs := createAndOptionallyStartPoller(t, receiverID, true, tt.ToReceiverCreateSettings()) defer p.Close() @@ -253,7 +252,7 @@ func TestJsonInvalidHeader(t *testing.T) { assert.NoError(t, tt.Shutdown(context.Background())) }() - receiverID := config.NewComponentID("TestJsonInvalidHeader") + receiverID := component.NewID("TestJsonInvalidHeader") addr, p, recordedLogs := createAndOptionallyStartPoller(t, receiverID, true, tt.ToReceiverCreateSettings()) defer p.Close() @@ -290,7 +289,7 @@ func TestSocketReadIrrecoverableNetError(t *testing.T) { assert.NoError(t, tt.Shutdown(context.Background())) }() - receiverID := config.NewComponentID("TestSocketReadIrrecoverableNetError") + receiverID := component.NewID("TestSocketReadIrrecoverableNetError") _, p, recordedLogs := createAndOptionallyStartPoller(t, receiverID, false, tt.ToReceiverCreateSettings()) // close the actual socket because we are going to mock it out below @@ -327,7 +326,7 @@ func TestSocketReadTimeOutNetError(t *testing.T) { assert.NoError(t, tt.Shutdown(context.Background())) }() - receiverID := config.NewComponentID("TestSocketReadTimeOutNetError") + receiverID := component.NewID("TestSocketReadTimeOutNetError") _, p, recordedLogs := createAndOptionallyStartPoller(t, receiverID, false, tt.ToReceiverCreateSettings()) // close the actual socket because we are going to mock it out below @@ -365,7 +364,7 @@ func TestSocketGenericReadError(t *testing.T) { assert.NoError(t, tt.Shutdown(context.Background())) }() - receiverID := config.NewComponentID("TestSocketGenericReadError") + receiverID := component.NewID("TestSocketGenericReadError") _, p, recordedLogs := createAndOptionallyStartPoller(t, receiverID, false, tt.ToReceiverCreateSettings()) // close the actual socket because we are going to mock it out below @@ -443,7 +442,7 @@ func (m *mockSocketConn) Close() error { return nil } func createAndOptionallyStartPoller( t *testing.T, - receiverID config.ComponentID, + receiverID component.ID, start bool, set component.ReceiverCreateSettings) (string, Poller, *observer.ObservedLogs) { addr, err := findAvailableAddress() diff --git a/receiver/awsxrayreceiver/receiver.go b/receiver/awsxrayreceiver/receiver.go index 17f7c7d37006..b64881f0d356 100644 --- a/receiver/awsxrayreceiver/receiver.go +++ b/receiver/awsxrayreceiver/receiver.go @@ -19,7 +19,6 @@ import ( "fmt" "go.opentelemetry.io/collector/component" - "go.opentelemetry.io/collector/config" "go.opentelemetry.io/collector/consumer" "go.opentelemetry.io/collector/obsreport" "go.uber.org/multierr" @@ -40,7 +39,7 @@ const ( // xrayReceiver implements the component.TracesReceiver interface for converting // AWS X-Ray segment document into the OT internal trace format. type xrayReceiver struct { - instanceID config.ComponentID + instanceID component.ID poller udppoller.Poller server proxy.Server settings component.ReceiverCreateSettings diff --git a/receiver/awsxrayreceiver/receiver_test.go b/receiver/awsxrayreceiver/receiver_test.go index adbe588f429f..23c6c0cc6f1d 100644 --- a/receiver/awsxrayreceiver/receiver_test.go +++ b/receiver/awsxrayreceiver/receiver_test.go @@ -125,7 +125,7 @@ func TestSegmentsPassedToConsumer(t *testing.T) { t.Setenv(defaultRegionEnvName, mockRegion) - receiverID := config.NewComponentID("TestSegmentsPassedToConsumer") + receiverID := component.NewID("TestSegmentsPassedToConsumer") addr, rcvr, _ := createAndOptionallyStartReceiver(t, receiverID, nil, true, tt.ToReceiverCreateSettings()) defer func() { @@ -157,7 +157,7 @@ func TestTranslatorErrorsOut(t *testing.T) { t.Setenv(defaultRegionEnvName, mockRegion) - receiverID := config.NewComponentID("TestTranslatorErrorsOut") + receiverID := component.NewID("TestTranslatorErrorsOut") addr, rcvr, recordedLogs := createAndOptionallyStartReceiver(t, receiverID, nil, true, tt.ToReceiverCreateSettings()) defer func() { @@ -185,7 +185,7 @@ func TestSegmentsConsumerErrorsOut(t *testing.T) { t.Setenv(defaultRegionEnvName, mockRegion) - receiverID := config.NewComponentID("TestSegmentsConsumerErrorsOut") + receiverID := component.NewID("TestSegmentsConsumerErrorsOut") addr, rcvr, recordedLogs := createAndOptionallyStartReceiver(t, receiverID, consumertest.NewErr(errors.New("can't consume traces")), true, tt.ToReceiverCreateSettings()) @@ -217,7 +217,7 @@ func TestPollerCloseError(t *testing.T) { t.Setenv(defaultRegionEnvName, mockRegion) - _, rcvr, _ := createAndOptionallyStartReceiver(t, config.NewComponentID("TestPollerCloseError"), nil, false, tt.ToReceiverCreateSettings()) + _, rcvr, _ := createAndOptionallyStartReceiver(t, component.NewID("TestPollerCloseError"), nil, false, tt.ToReceiverCreateSettings()) mPoller := &mockPoller{closeErr: errors.New("mockPollerCloseErr")} rcvr.(*xrayReceiver).poller = mPoller rcvr.(*xrayReceiver).server = &mockProxy{} @@ -234,7 +234,7 @@ func TestProxyCloseError(t *testing.T) { t.Setenv(defaultRegionEnvName, mockRegion) - _, rcvr, _ := createAndOptionallyStartReceiver(t, config.NewComponentID("TestPollerCloseError"), nil, false, tt.ToReceiverCreateSettings()) + _, rcvr, _ := createAndOptionallyStartReceiver(t, component.NewID("TestPollerCloseError"), nil, false, tt.ToReceiverCreateSettings()) mProxy := &mockProxy{closeErr: errors.New("mockProxyCloseErr")} rcvr.(*xrayReceiver).poller = &mockPoller{} rcvr.(*xrayReceiver).server = mProxy @@ -251,7 +251,7 @@ func TestBothPollerAndProxyCloseError(t *testing.T) { t.Setenv(defaultRegionEnvName, mockRegion) - _, rcvr, _ := createAndOptionallyStartReceiver(t, config.NewComponentID("TestBothPollerAndProxyCloseError"), nil, false, tt.ToReceiverCreateSettings()) + _, rcvr, _ := createAndOptionallyStartReceiver(t, component.NewID("TestBothPollerAndProxyCloseError"), nil, false, tt.ToReceiverCreateSettings()) mPoller := &mockPoller{closeErr: errors.New("mockPollerCloseErr")} mProxy := &mockProxy{closeErr: errors.New("mockProxyCloseErr")} rcvr.(*xrayReceiver).poller = mPoller @@ -295,7 +295,7 @@ func (m *mockProxy) Shutdown(ctx context.Context) error { func createAndOptionallyStartReceiver( t *testing.T, - receiverID config.ComponentID, + receiverID component.ID, csu consumer.Traces, start bool, set component.ReceiverCreateSettings) (string, component.TracesReceiver, *observer.ObservedLogs) { diff --git a/receiver/azureblobreceiver/config.go b/receiver/azureblobreceiver/config.go index 5a2fa3ffb6b8..10a58db44cd3 100644 --- a/receiver/azureblobreceiver/config.go +++ b/receiver/azureblobreceiver/config.go @@ -14,9 +14,7 @@ package azureblobreceiver // import "github.com/open-telemetry/opentelemetry-collector-contrib/receiver/azureblobreceiver" -import ( - "go.opentelemetry.io/collector/config" -) +import "go.opentelemetry.io/collector/config" type Config struct { config.ReceiverSettings `mapstructure:",squash"` diff --git a/receiver/azureblobreceiver/config_test.go b/receiver/azureblobreceiver/config_test.go index 7634c098d636..524c5bea2f03 100644 --- a/receiver/azureblobreceiver/config_test.go +++ b/receiver/azureblobreceiver/config_test.go @@ -20,9 +20,9 @@ import ( "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" + "go.opentelemetry.io/collector/component" "go.opentelemetry.io/collector/component/componenttest" "go.opentelemetry.io/collector/config" - "go.opentelemetry.io/collector/config/configtest" "go.opentelemetry.io/collector/service/servicetest" ) @@ -39,15 +39,15 @@ func TestLoadConfig(t *testing.T) { assert.Equal(t, len(cfg.Receivers), 2) - receiver := cfg.Receivers[config.NewComponentID(typeStr)] + receiver := cfg.Receivers[component.NewID(typeStr)] assert.Equal(t, factory.CreateDefaultConfig(), receiver) - receiver = cfg.Receivers[config.NewComponentIDWithName(typeStr, "2")].(*Config) - assert.NoError(t, configtest.CheckConfigStruct(receiver)) + receiver = cfg.Receivers[component.NewIDWithName(typeStr, "2")].(*Config) + assert.NoError(t, componenttest.CheckConfigStruct(receiver)) assert.Equal( t, &Config{ - ReceiverSettings: config.NewReceiverSettings(config.NewComponentIDWithName(typeStr, "2")), + ReceiverSettings: config.NewReceiverSettings(component.NewIDWithName(typeStr, "2")), ConnectionString: goodConnectionString, Logs: LogsConfig{ContainerName: logsContainerName}, Traces: TracesConfig{ContainerName: tracesContainerName}, diff --git a/receiver/azureblobreceiver/factory.go b/receiver/azureblobreceiver/factory.go index 8497d6d9df4b..9cda69025fe6 100644 --- a/receiver/azureblobreceiver/factory.go +++ b/receiver/azureblobreceiver/factory.go @@ -54,9 +54,9 @@ func NewFactory() component.ReceiverFactory { component.WithLogsReceiver(f.createLogsReceiver, component.StabilityLevelBeta)) } -func (f *blobReceiverFactory) createDefaultConfig() config.Receiver { +func (f *blobReceiverFactory) createDefaultConfig() component.ReceiverConfig { return &Config{ - ReceiverSettings: config.NewReceiverSettings(config.NewComponentID(typeStr)), + ReceiverSettings: config.NewReceiverSettings(component.NewID(typeStr)), Logs: LogsConfig{ContainerName: logsContainerName}, Traces: TracesConfig{ContainerName: tracesContainerName}, } @@ -65,7 +65,7 @@ func (f *blobReceiverFactory) createDefaultConfig() config.Receiver { func (f *blobReceiverFactory) createLogsReceiver( ctx context.Context, set component.ReceiverCreateSettings, - cfg config.Receiver, + cfg component.ReceiverConfig, nextConsumer consumer.Logs, ) (component.LogsReceiver, error) { @@ -84,7 +84,7 @@ func (f *blobReceiverFactory) createLogsReceiver( func (f *blobReceiverFactory) createTracesReceiver( ctx context.Context, set component.ReceiverCreateSettings, - cfg config.Receiver, + cfg component.ReceiverConfig, nextConsumer consumer.Traces, ) (component.TracesReceiver, error) { @@ -101,7 +101,7 @@ func (f *blobReceiverFactory) createTracesReceiver( func (f *blobReceiverFactory) getReceiver( set component.ReceiverCreateSettings, - cfg config.Receiver) (component.Receiver, error) { + cfg component.ReceiverConfig) (component.Receiver, error) { var err error r := f.receivers.GetOrAdd(cfg, func() component.Component { diff --git a/receiver/azureblobreceiver/factory_test.go b/receiver/azureblobreceiver/factory_test.go index 04902b495df2..fb68c826cbbb 100644 --- a/receiver/azureblobreceiver/factory_test.go +++ b/receiver/azureblobreceiver/factory_test.go @@ -20,6 +20,7 @@ import ( "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" + "go.opentelemetry.io/collector/component" "go.opentelemetry.io/collector/component/componenttest" "go.opentelemetry.io/collector/config" "go.opentelemetry.io/collector/consumer/consumertest" @@ -65,9 +66,9 @@ func TestTracesAndLogsReceiversAreSame(t *testing.T) { assert.Equal(t, logsReceiver, tracesReceiver) } -func getConfig() config.Receiver { +func getConfig() component.ReceiverConfig { return &Config{ - ReceiverSettings: config.NewReceiverSettings(config.NewComponentID(typeStr)), + ReceiverSettings: config.NewReceiverSettings(component.NewID(typeStr)), ConnectionString: goodConnectionString, Logs: LogsConfig{ContainerName: logsContainerName}, Traces: TracesConfig{ContainerName: tracesContainerName}, diff --git a/receiver/azureblobreceiver/go.mod b/receiver/azureblobreceiver/go.mod index 13460b702f86..a3c728008bcd 100644 --- a/receiver/azureblobreceiver/go.mod +++ b/receiver/azureblobreceiver/go.mod @@ -7,8 +7,8 @@ require ( github.com/Azure/azure-sdk-for-go/sdk/storage/azblob v0.3.0 github.com/open-telemetry/opentelemetry-collector-contrib/internal/sharedcomponent v0.63.0 github.com/stretchr/testify v1.8.1 - go.opentelemetry.io/collector v0.63.2-0.20221104003159-6b27644724d8 - go.opentelemetry.io/collector/pdata v0.63.2-0.20221104003159-6b27644724d8 + go.opentelemetry.io/collector v0.63.2-0.20221108014805-0b08d5316426 + go.opentelemetry.io/collector/pdata v0.63.2-0.20221108014805-0b08d5316426 go.uber.org/zap v1.23.0 ) @@ -56,7 +56,7 @@ require ( github.com/modern-go/reflect2 v1.0.2 // indirect github.com/pmezard/go-difflib v1.0.0 // indirect github.com/power-devops/perfstat v0.0.0-20210106213030-5aafc221ea8c // indirect - github.com/prometheus/client_golang v1.13.0 // indirect + github.com/prometheus/client_golang v1.13.1 // indirect github.com/prometheus/client_model v0.3.0 // indirect github.com/prometheus/common v0.37.0 // indirect github.com/prometheus/procfs v0.8.0 // indirect @@ -69,9 +69,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.opencensus.io v0.23.0 // indirect - go.opentelemetry.io/collector/processor/batchprocessor v0.0.0-20221104003159-6b27644724d8 // indirect - go.opentelemetry.io/collector/semconv v0.63.2-0.20221104003159-6b27644724d8 // indirect + go.opencensus.io v0.24.0 // indirect + go.opentelemetry.io/collector/processor/batchprocessor v0.0.0-20221108014805-0b08d5316426 // indirect + go.opentelemetry.io/collector/semconv v0.63.2-0.20221108014805-0b08d5316426 // 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 ef7fab51eafc..3d55dcd556ca 100644 --- a/receiver/azureblobreceiver/go.sum +++ b/receiver/azureblobreceiver/go.sum @@ -399,8 +399,9 @@ github.com/prometheus/client_golang v1.11.0/go.mod h1:Z6t4BnS23TR94PD6BsDNk8yVqr github.com/prometheus/client_golang v1.11.1/go.mod h1:Z6t4BnS23TR94PD6BsDNk8yVqroYurpAkEiz0P2BEV0= github.com/prometheus/client_golang v1.12.1/go.mod h1:3Z9XVyYiZYEO+YQWt3RD2R3jrbd179Rt297l4aS6nDY= github.com/prometheus/client_golang v1.12.2/go.mod h1:3Z9XVyYiZYEO+YQWt3RD2R3jrbd179Rt297l4aS6nDY= -github.com/prometheus/client_golang v1.13.0 h1:b71QUfeo5M8gq2+evJdTPfZhYMAU0uKPkyPJ7TPsloU= github.com/prometheus/client_golang v1.13.0/go.mod h1:vTeo+zgvILHsnnj/39Ou/1fPN5nJFOEMgftOUOmlvYQ= +github.com/prometheus/client_golang v1.13.1 h1:3gMjIY2+/hzmqhtUC/aQNYldJA6DtH3CgQvwS+02K1c= +github.com/prometheus/client_golang v1.13.1/go.mod h1:vTeo+zgvILHsnnj/39Ou/1fPN5nJFOEMgftOUOmlvYQ= github.com/prometheus/client_model v0.0.0-20180712105110-5c3871d89910/go.mod h1:MbSGuTsp3dbXC40dX6PRTWyKYBIrTGTE9sqQNg2J8bo= github.com/prometheus/client_model v0.0.0-20190129233127-fd36f4220a90/go.mod h1:xMI15A0UPsDsEKsMN9yxemIoYk6Tm2C1GtYGdfGttqA= github.com/prometheus/client_model v0.0.0-20190812154241-14fe0d1b01d4/go.mod h1:xMI15A0UPsDsEKsMN9yxemIoYk6Tm2C1GtYGdfGttqA= @@ -479,17 +480,18 @@ 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.opencensus.io v0.23.0 h1:gqCw0LfLxScz8irSi8exQc7fyQ0fKQU/qnC/X8+V/1M= go.opencensus.io v0.23.0/go.mod h1:XItmlyltB5F7CS4xOC1DcqMoFqwtC6OG2xF7mCv7P7E= -go.opentelemetry.io/collector v0.63.2-0.20221104003159-6b27644724d8 h1:rOT5HzXXfSISc6FiH012zH2/EFjp37UXfjEqj5BpkWQ= -go.opentelemetry.io/collector v0.63.2-0.20221104003159-6b27644724d8/go.mod h1:JVmeZXugK4ondC6KQgrHTHWiF4JttpG5k6dWPMt62+k= +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.63.2-0.20221108014805-0b08d5316426 h1:z/wLTMh7/vNxcFUDa5uG7/IPE3tYx6pzCWPV41ghyV8= +go.opentelemetry.io/collector v0.63.2-0.20221108014805-0b08d5316426/go.mod h1:+Zb70q0Rq17dA9FcHTiTjW6g96lvJ8kAZ0c+eWNkAv0= go.opentelemetry.io/collector/extension/zpagesextension v0.0.0-20221102221454-bfc45c16c979 h1:YW7BL8ftoJ7k+EtnMICw1KWASLuSDIhbF7SjjgWMCl4= -go.opentelemetry.io/collector/pdata v0.63.2-0.20221104003159-6b27644724d8 h1:7xeTQjfsOm9eogQeIxjSEhlik9qsbBGsnmkQHfyKaRE= -go.opentelemetry.io/collector/pdata v0.63.2-0.20221104003159-6b27644724d8/go.mod h1:IzvXUGQml2mrnvdb8zIlEW3qQs9oFLdD2hLwJdZ+pek= -go.opentelemetry.io/collector/processor/batchprocessor v0.0.0-20221104003159-6b27644724d8 h1:jgN7o3WfR8x++rjMcVM1VN6OJi4ytlGANXbwd73BPXo= -go.opentelemetry.io/collector/processor/batchprocessor v0.0.0-20221104003159-6b27644724d8/go.mod h1:WBv1Nayi8p12K0vxLxTkHpRGr79JXYT3TXL2X0B/PRU= -go.opentelemetry.io/collector/semconv v0.63.2-0.20221104003159-6b27644724d8 h1:jm0sNPyqo6S165QjQYMBHB2nK50wlJbMYM03Yr3Eo2k= -go.opentelemetry.io/collector/semconv v0.63.2-0.20221104003159-6b27644724d8/go.mod h1:5o9yhOa+ABt7g2E5JABDxGZ1PQPbtfxrKNbYn+LOTXU= +go.opentelemetry.io/collector/pdata v0.63.2-0.20221108014805-0b08d5316426 h1:wKDpgP0Tx/gWI2SgDGAY1OTSeihhDivbbRqFR79IGTc= +go.opentelemetry.io/collector/pdata v0.63.2-0.20221108014805-0b08d5316426/go.mod h1:IzvXUGQml2mrnvdb8zIlEW3qQs9oFLdD2hLwJdZ+pek= +go.opentelemetry.io/collector/processor/batchprocessor v0.0.0-20221108014805-0b08d5316426 h1:7f0NVsVGYT8pxAyk0qBBa8ZQf7athr/mfQ6QltGywN0= +go.opentelemetry.io/collector/processor/batchprocessor v0.0.0-20221108014805-0b08d5316426/go.mod h1:gpd5Q/3HlROMGYhnmwlFpUhcz8Xy80sokEcKs7c7zzE= +go.opentelemetry.io/collector/semconv v0.63.2-0.20221108014805-0b08d5316426 h1:pqIl7OC531J6i9ttBCj3zLmZI/BSF4q323YpK0GgKGk= +go.opentelemetry.io/collector/semconv v0.63.2-0.20221108014805-0b08d5316426/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.go b/receiver/azureeventhubreceiver/config.go index 8023e039d0db..debb6e6ed958 100644 --- a/receiver/azureeventhubreceiver/config.go +++ b/receiver/azureeventhubreceiver/config.go @@ -17,6 +17,7 @@ import ( "errors" "github.com/Azure/azure-amqp-common-go/v3/conn" + "go.opentelemetry.io/collector/component" "go.opentelemetry.io/collector/config" ) @@ -26,10 +27,10 @@ var ( type Config struct { config.ReceiverSettings `mapstructure:",squash"` - Connection string `mapstructure:"connection"` - Partition string `mapstructure:"partition"` - Offset string `mapstructure:"offset"` - StorageID *config.ComponentID `mapstructure:"storage"` + Connection string `mapstructure:"connection"` + Partition string `mapstructure:"partition"` + Offset string `mapstructure:"offset"` + StorageID *component.ID `mapstructure:"storage"` } // Validate config diff --git a/receiver/azureeventhubreceiver/config_test.go b/receiver/azureeventhubreceiver/config_test.go index ba30326e6b24..1a6a13d80fef 100644 --- a/receiver/azureeventhubreceiver/config_test.go +++ b/receiver/azureeventhubreceiver/config_test.go @@ -20,8 +20,8 @@ import ( "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" + "go.opentelemetry.io/collector/component" "go.opentelemetry.io/collector/component/componenttest" - "go.opentelemetry.io/collector/config" "go.opentelemetry.io/collector/service/servicetest" ) @@ -38,12 +38,12 @@ func TestLoadConfig(t *testing.T) { assert.Equal(t, len(cfg.Receivers), 2) - r0 := cfg.Receivers[config.NewComponentID(typeStr)] + r0 := cfg.Receivers[component.NewID(typeStr)] assert.Equal(t, "Endpoint=sb://namespace.servicebus.windows.net/;SharedAccessKeyName=RootManageSharedAccessKey;SharedAccessKey=superSecret1234=;EntityPath=hubName", r0.(*Config).Connection) assert.Equal(t, "", r0.(*Config).Offset) assert.Equal(t, "", r0.(*Config).Partition) - r1 := cfg.Receivers[config.NewComponentIDWithName(typeStr, "all")] + r1 := cfg.Receivers[component.NewIDWithName(typeStr, "all")] assert.Equal(t, "Endpoint=sb://namespace.servicebus.windows.net/;SharedAccessKeyName=RootManageSharedAccessKey;SharedAccessKey=superSecret1234=;EntityPath=hubName", r1.(*Config).Connection) assert.Equal(t, "1234-5566", r1.(*Config).Offset) assert.Equal(t, "foo", r1.(*Config).Partition) diff --git a/receiver/azureeventhubreceiver/factory.go b/receiver/azureeventhubreceiver/factory.go index 5b6dbfa42717..548c072fbf0b 100644 --- a/receiver/azureeventhubreceiver/factory.go +++ b/receiver/azureeventhubreceiver/factory.go @@ -38,11 +38,11 @@ func NewFactory() component.ReceiverFactory { component.WithLogsReceiver(createLogsReceiver, stability)) } -func createDefaultConfig() config.Receiver { - return &Config{ReceiverSettings: config.NewReceiverSettings(config.NewComponentID(typeStr))} +func createDefaultConfig() component.ReceiverConfig { + return &Config{ReceiverSettings: config.NewReceiverSettings(component.NewID(typeStr))} } -func createLogsReceiver(_ context.Context, settings component.ReceiverCreateSettings, receiver config.Receiver, logs consumer.Logs) (component.LogsReceiver, error) { +func createLogsReceiver(_ context.Context, settings component.ReceiverCreateSettings, receiver component.ReceiverConfig, logs consumer.Logs) (component.LogsReceiver, error) { return &client{ logger: settings.Logger, diff --git a/receiver/azureeventhubreceiver/factory_test.go b/receiver/azureeventhubreceiver/factory_test.go index 75bcd50628dc..ccb018855f56 100644 --- a/receiver/azureeventhubreceiver/factory_test.go +++ b/receiver/azureeventhubreceiver/factory_test.go @@ -19,6 +19,7 @@ import ( "testing" "github.com/stretchr/testify/assert" + "go.opentelemetry.io/collector/component" "go.opentelemetry.io/collector/component/componenttest" "go.opentelemetry.io/collector/config" "go.opentelemetry.io/collector/consumer/consumertest" @@ -26,8 +27,8 @@ import ( func TestNewFactory(t *testing.T) { f := NewFactory() - assert.Equal(t, config.Type("azureeventhub"), f.Type()) - assert.Equal(t, &Config{ReceiverSettings: config.NewReceiverSettings(config.NewComponentID(typeStr))}, f.CreateDefaultConfig()) + assert.Equal(t, component.Type("azureeventhub"), f.Type()) + assert.Equal(t, &Config{ReceiverSettings: config.NewReceiverSettings(component.NewID(typeStr))}, f.CreateDefaultConfig()) } func TestNewLogsReceiver(t *testing.T) { diff --git a/receiver/azureeventhubreceiver/go.mod b/receiver/azureeventhubreceiver/go.mod index 32179a0340fb..e081c372bccf 100644 --- a/receiver/azureeventhubreceiver/go.mod +++ b/receiver/azureeventhubreceiver/go.mod @@ -8,8 +8,8 @@ require ( github.com/json-iterator/go v1.1.12 github.com/open-telemetry/opentelemetry-collector-contrib/pkg/stanza v0.63.0 github.com/stretchr/testify v1.8.1 - go.opentelemetry.io/collector v0.63.2-0.20221104003159-6b27644724d8 - go.opentelemetry.io/collector/pdata v0.63.2-0.20221104003159-6b27644724d8 + go.opentelemetry.io/collector v0.63.2-0.20221108014805-0b08d5316426 + go.opentelemetry.io/collector/pdata v0.63.2-0.20221108014805-0b08d5316426 go.uber.org/zap v1.23.0 ) @@ -53,7 +53,7 @@ require ( github.com/observiq/ctimefmt v1.0.0 // indirect github.com/pmezard/go-difflib v1.0.0 // indirect github.com/power-devops/perfstat v0.0.0-20210106213030-5aafc221ea8c // indirect - github.com/prometheus/client_golang v1.13.0 // indirect + github.com/prometheus/client_golang v1.13.1 // indirect github.com/prometheus/client_model v0.3.0 // indirect github.com/prometheus/common v0.37.0 // indirect github.com/prometheus/procfs v0.8.0 // indirect @@ -64,9 +64,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.opencensus.io v0.23.0 // indirect - go.opentelemetry.io/collector/processor/batchprocessor v0.0.0-20221104003159-6b27644724d8 // indirect - go.opentelemetry.io/collector/semconv v0.63.2-0.20221104003159-6b27644724d8 // indirect + go.opencensus.io v0.24.0 // indirect + go.opentelemetry.io/collector/processor/batchprocessor v0.0.0-20221108014805-0b08d5316426 // indirect + go.opentelemetry.io/collector/semconv v0.63.2-0.20221108014805-0b08d5316426 // 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 afb2b5f7d4a8..9de898da9b2e 100644 --- a/receiver/azureeventhubreceiver/go.sum +++ b/receiver/azureeventhubreceiver/go.sum @@ -398,8 +398,9 @@ github.com/prometheus/client_golang v1.11.0/go.mod h1:Z6t4BnS23TR94PD6BsDNk8yVqr github.com/prometheus/client_golang v1.11.1/go.mod h1:Z6t4BnS23TR94PD6BsDNk8yVqroYurpAkEiz0P2BEV0= github.com/prometheus/client_golang v1.12.1/go.mod h1:3Z9XVyYiZYEO+YQWt3RD2R3jrbd179Rt297l4aS6nDY= github.com/prometheus/client_golang v1.12.2/go.mod h1:3Z9XVyYiZYEO+YQWt3RD2R3jrbd179Rt297l4aS6nDY= -github.com/prometheus/client_golang v1.13.0 h1:b71QUfeo5M8gq2+evJdTPfZhYMAU0uKPkyPJ7TPsloU= github.com/prometheus/client_golang v1.13.0/go.mod h1:vTeo+zgvILHsnnj/39Ou/1fPN5nJFOEMgftOUOmlvYQ= +github.com/prometheus/client_golang v1.13.1 h1:3gMjIY2+/hzmqhtUC/aQNYldJA6DtH3CgQvwS+02K1c= +github.com/prometheus/client_golang v1.13.1/go.mod h1:vTeo+zgvILHsnnj/39Ou/1fPN5nJFOEMgftOUOmlvYQ= github.com/prometheus/client_model v0.0.0-20180712105110-5c3871d89910/go.mod h1:MbSGuTsp3dbXC40dX6PRTWyKYBIrTGTE9sqQNg2J8bo= github.com/prometheus/client_model v0.0.0-20190129233127-fd36f4220a90/go.mod h1:xMI15A0UPsDsEKsMN9yxemIoYk6Tm2C1GtYGdfGttqA= github.com/prometheus/client_model v0.0.0-20190812154241-14fe0d1b01d4/go.mod h1:xMI15A0UPsDsEKsMN9yxemIoYk6Tm2C1GtYGdfGttqA= @@ -480,17 +481,18 @@ 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.opencensus.io v0.23.0 h1:gqCw0LfLxScz8irSi8exQc7fyQ0fKQU/qnC/X8+V/1M= go.opencensus.io v0.23.0/go.mod h1:XItmlyltB5F7CS4xOC1DcqMoFqwtC6OG2xF7mCv7P7E= -go.opentelemetry.io/collector v0.63.2-0.20221104003159-6b27644724d8 h1:rOT5HzXXfSISc6FiH012zH2/EFjp37UXfjEqj5BpkWQ= -go.opentelemetry.io/collector v0.63.2-0.20221104003159-6b27644724d8/go.mod h1:JVmeZXugK4ondC6KQgrHTHWiF4JttpG5k6dWPMt62+k= +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.63.2-0.20221108014805-0b08d5316426 h1:z/wLTMh7/vNxcFUDa5uG7/IPE3tYx6pzCWPV41ghyV8= +go.opentelemetry.io/collector v0.63.2-0.20221108014805-0b08d5316426/go.mod h1:+Zb70q0Rq17dA9FcHTiTjW6g96lvJ8kAZ0c+eWNkAv0= go.opentelemetry.io/collector/extension/zpagesextension v0.0.0-20221102221454-bfc45c16c979 h1:YW7BL8ftoJ7k+EtnMICw1KWASLuSDIhbF7SjjgWMCl4= -go.opentelemetry.io/collector/pdata v0.63.2-0.20221104003159-6b27644724d8 h1:7xeTQjfsOm9eogQeIxjSEhlik9qsbBGsnmkQHfyKaRE= -go.opentelemetry.io/collector/pdata v0.63.2-0.20221104003159-6b27644724d8/go.mod h1:IzvXUGQml2mrnvdb8zIlEW3qQs9oFLdD2hLwJdZ+pek= -go.opentelemetry.io/collector/processor/batchprocessor v0.0.0-20221104003159-6b27644724d8 h1:jgN7o3WfR8x++rjMcVM1VN6OJi4ytlGANXbwd73BPXo= -go.opentelemetry.io/collector/processor/batchprocessor v0.0.0-20221104003159-6b27644724d8/go.mod h1:WBv1Nayi8p12K0vxLxTkHpRGr79JXYT3TXL2X0B/PRU= -go.opentelemetry.io/collector/semconv v0.63.2-0.20221104003159-6b27644724d8 h1:jm0sNPyqo6S165QjQYMBHB2nK50wlJbMYM03Yr3Eo2k= -go.opentelemetry.io/collector/semconv v0.63.2-0.20221104003159-6b27644724d8/go.mod h1:5o9yhOa+ABt7g2E5JABDxGZ1PQPbtfxrKNbYn+LOTXU= +go.opentelemetry.io/collector/pdata v0.63.2-0.20221108014805-0b08d5316426 h1:wKDpgP0Tx/gWI2SgDGAY1OTSeihhDivbbRqFR79IGTc= +go.opentelemetry.io/collector/pdata v0.63.2-0.20221108014805-0b08d5316426/go.mod h1:IzvXUGQml2mrnvdb8zIlEW3qQs9oFLdD2hLwJdZ+pek= +go.opentelemetry.io/collector/processor/batchprocessor v0.0.0-20221108014805-0b08d5316426 h1:7f0NVsVGYT8pxAyk0qBBa8ZQf7athr/mfQ6QltGywN0= +go.opentelemetry.io/collector/processor/batchprocessor v0.0.0-20221108014805-0b08d5316426/go.mod h1:gpd5Q/3HlROMGYhnmwlFpUhcz8Xy80sokEcKs7c7zzE= +go.opentelemetry.io/collector/semconv v0.63.2-0.20221108014805-0b08d5316426 h1:pqIl7OC531J6i9ttBCj3zLmZI/BSF4q323YpK0GgKGk= +go.opentelemetry.io/collector/semconv v0.63.2-0.20221108014805-0b08d5316426/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/config_test.go b/receiver/bigipreceiver/config_test.go index 378333d42bea..f6f13a9c0e0e 100644 --- a/receiver/bigipreceiver/config_test.go +++ b/receiver/bigipreceiver/config_test.go @@ -21,7 +21,7 @@ import ( "testing" "github.com/stretchr/testify/require" - "go.opentelemetry.io/collector/config" + "go.opentelemetry.io/collector/component" "go.opentelemetry.io/collector/config/confighttp" "go.opentelemetry.io/collector/confmap/confmaptest" "go.uber.org/multierr" @@ -135,9 +135,9 @@ func TestLoadConfig(t *testing.T) { factory := NewFactory() cfg := factory.CreateDefaultConfig() - sub, err := cm.Sub(config.NewComponentIDWithName(typeStr, "").String()) + sub, err := cm.Sub(component.NewIDWithName(typeStr, "").String()) require.NoError(t, err) - require.NoError(t, config.UnmarshalReceiver(sub, cfg)) + require.NoError(t, component.UnmarshalReceiverConfig(sub, cfg)) expected := factory.CreateDefaultConfig().(*Config) expected.Username = "otelu" diff --git a/receiver/bigipreceiver/factory.go b/receiver/bigipreceiver/factory.go index 0e042c642aca..b4a08ec1305a 100644 --- a/receiver/bigipreceiver/factory.go +++ b/receiver/bigipreceiver/factory.go @@ -44,10 +44,10 @@ func NewFactory() component.ReceiverFactory { } // createDefaultConfig creates a config for Big-IP with as many default values as possible -func createDefaultConfig() config.Receiver { +func createDefaultConfig() component.ReceiverConfig { return &Config{ ScraperControllerSettings: scraperhelper.ScraperControllerSettings{ - ReceiverSettings: config.NewReceiverSettings(config.NewComponentID(typeStr)), + ReceiverSettings: config.NewReceiverSettings(component.NewID(typeStr)), CollectionInterval: 10 * time.Second, }, HTTPClientSettings: confighttp.HTTPClientSettings{ @@ -59,7 +59,7 @@ func createDefaultConfig() config.Receiver { } // creates the metric receiver for Big-IP -func createMetricsReceiver(_ context.Context, params component.ReceiverCreateSettings, rConf config.Receiver, consumer consumer.Metrics) (component.MetricsReceiver, error) { +func createMetricsReceiver(_ context.Context, params component.ReceiverCreateSettings, rConf component.ReceiverConfig, consumer consumer.Metrics) (component.MetricsReceiver, error) { cfg, ok := rConf.(*Config) if !ok { return nil, errConfigNotBigip diff --git a/receiver/bigipreceiver/factory_test.go b/receiver/bigipreceiver/factory_test.go index f254ea9219ee..68657b71f491 100644 --- a/receiver/bigipreceiver/factory_test.go +++ b/receiver/bigipreceiver/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/config" "go.opentelemetry.io/collector/config/confighttp" @@ -46,9 +47,9 @@ func TestNewFactory(t *testing.T) { testFunc: func(t *testing.T) { factory := NewFactory() - var expectedCfg config.Receiver = &Config{ + var expectedCfg component.ReceiverConfig = &Config{ ScraperControllerSettings: scraperhelper.ScraperControllerSettings{ - ReceiverSettings: config.NewReceiverSettings(config.NewComponentID(typeStr)), + ReceiverSettings: config.NewReceiverSettings(component.NewID(typeStr)), CollectionInterval: 10 * time.Second, }, HTTPClientSettings: confighttp.HTTPClientSettings{ diff --git a/receiver/bigipreceiver/go.mod b/receiver/bigipreceiver/go.mod index db5b30fa5482..eb3e7be5a51a 100644 --- a/receiver/bigipreceiver/go.mod +++ b/receiver/bigipreceiver/go.mod @@ -4,8 +4,8 @@ go 1.18 require ( github.com/stretchr/testify v1.8.1 - go.opentelemetry.io/collector v0.63.2-0.20221104003159-6b27644724d8 - go.opentelemetry.io/collector/pdata v0.63.2-0.20221104003159-6b27644724d8 + go.opentelemetry.io/collector v0.63.2-0.20221108014805-0b08d5316426 + go.opentelemetry.io/collector/pdata v0.63.2-0.20221108014805-0b08d5316426 go.uber.org/multierr v1.8.0 go.uber.org/zap v1.23.0 ) @@ -33,7 +33,7 @@ require ( github.com/rogpeppe/go-internal v1.6.1 // indirect github.com/rs/cors v1.8.2 // indirect github.com/stretchr/objx v0.5.0 // indirect - go.opencensus.io v0.23.0 // indirect + go.opencensus.io v0.24.0 // 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 ef07dcc69f66..aaafaff4a98d 100644 --- a/receiver/bigipreceiver/go.sum +++ b/receiver/bigipreceiver/go.sum @@ -238,7 +238,7 @@ github.com/prometheus/client_golang v0.9.1/go.mod h1:7SWBe2y4D6OKWSNQJUaRYU/AaXP github.com/prometheus/client_golang v1.0.0/go.mod h1:db9x61etRT2tGnBNRi70OPL5FsnadC4Ky3P0J6CfImo= github.com/prometheus/client_golang v1.7.1/go.mod h1:PY5Wy2awLA44sXw4AOSfFBetzPP4j5+D6mVACh+pe2M= github.com/prometheus/client_golang v1.11.1/go.mod h1:Z6t4BnS23TR94PD6BsDNk8yVqroYurpAkEiz0P2BEV0= -github.com/prometheus/client_golang v1.13.0 h1:b71QUfeo5M8gq2+evJdTPfZhYMAU0uKPkyPJ7TPsloU= +github.com/prometheus/client_golang v1.13.1 h1:3gMjIY2+/hzmqhtUC/aQNYldJA6DtH3CgQvwS+02K1c= github.com/prometheus/client_model v0.0.0-20180712105110-5c3871d89910/go.mod h1:MbSGuTsp3dbXC40dX6PRTWyKYBIrTGTE9sqQNg2J8bo= github.com/prometheus/client_model v0.0.0-20190129233127-fd36f4220a90/go.mod h1:xMI15A0UPsDsEKsMN9yxemIoYk6Tm2C1GtYGdfGttqA= github.com/prometheus/client_model v0.0.0-20190812154241-14fe0d1b01d4/go.mod h1:xMI15A0UPsDsEKsMN9yxemIoYk6Tm2C1GtYGdfGttqA= @@ -279,7 +279,6 @@ github.com/stretchr/testify v1.2.2/go.mod h1:a8OnRcib4nhh0OaRAV+Yts87kKdq0PP7pXf github.com/stretchr/testify v1.3.0/go.mod h1:M5WIy9Dh21IEIfnGCwXGc5bZfKNJtfHm1UVUgZn+9EI= github.com/stretchr/testify v1.4.0/go.mod h1:j7eGeouHqKxXV5pUuKE4zz7dFj8WfuZ+81PSLYec5m4= github.com/stretchr/testify v1.5.1/go.mod h1:5W2xD1RspED5o8YsWQXVCued0rvSQ+mT+I5cxcmMvtA= -github.com/stretchr/testify v1.6.1/go.mod h1:6Fq8oRcR53rry900zMqJjRRixrwX3KX962/h/Wwjteg= github.com/stretchr/testify v1.7.0/go.mod h1:6Fq8oRcR53rry900zMqJjRRixrwX3KX962/h/Wwjteg= github.com/stretchr/testify v1.7.1/go.mod h1:6Fq8oRcR53rry900zMqJjRRixrwX3KX962/h/Wwjteg= github.com/stretchr/testify v1.8.0/go.mod h1:yNjHg4UonilssWZ8iaSj1OCr/vHnekPRkoO+kdMU+MU= @@ -291,12 +290,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.opencensus.io v0.23.0 h1:gqCw0LfLxScz8irSi8exQc7fyQ0fKQU/qnC/X8+V/1M= -go.opencensus.io v0.23.0/go.mod h1:XItmlyltB5F7CS4xOC1DcqMoFqwtC6OG2xF7mCv7P7E= -go.opentelemetry.io/collector v0.63.2-0.20221104003159-6b27644724d8 h1:rOT5HzXXfSISc6FiH012zH2/EFjp37UXfjEqj5BpkWQ= -go.opentelemetry.io/collector v0.63.2-0.20221104003159-6b27644724d8/go.mod h1:JVmeZXugK4ondC6KQgrHTHWiF4JttpG5k6dWPMt62+k= -go.opentelemetry.io/collector/pdata v0.63.2-0.20221104003159-6b27644724d8 h1:7xeTQjfsOm9eogQeIxjSEhlik9qsbBGsnmkQHfyKaRE= -go.opentelemetry.io/collector/pdata v0.63.2-0.20221104003159-6b27644724d8/go.mod h1:IzvXUGQml2mrnvdb8zIlEW3qQs9oFLdD2hLwJdZ+pek= +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.63.2-0.20221108014805-0b08d5316426 h1:z/wLTMh7/vNxcFUDa5uG7/IPE3tYx6pzCWPV41ghyV8= +go.opentelemetry.io/collector v0.63.2-0.20221108014805-0b08d5316426/go.mod h1:+Zb70q0Rq17dA9FcHTiTjW6g96lvJ8kAZ0c+eWNkAv0= +go.opentelemetry.io/collector/pdata v0.63.2-0.20221108014805-0b08d5316426 h1:wKDpgP0Tx/gWI2SgDGAY1OTSeihhDivbbRqFR79IGTc= +go.opentelemetry.io/collector/pdata v0.63.2-0.20221108014805-0b08d5316426/go.mod h1:IzvXUGQml2mrnvdb8zIlEW3qQs9oFLdD2hLwJdZ+pek= 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 df2750f16731..3dcd32298763 100644 --- a/receiver/carbonreceiver/config_test.go +++ b/receiver/carbonreceiver/config_test.go @@ -21,6 +21,7 @@ import ( "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" + "go.opentelemetry.io/collector/component" "go.opentelemetry.io/collector/config" "go.opentelemetry.io/collector/config/confignet" "go.opentelemetry.io/collector/confmap/confmaptest" @@ -35,17 +36,17 @@ func TestLoadConfig(t *testing.T) { require.NoError(t, err) tests := []struct { - id config.ComponentID - expected config.Receiver + id component.ID + expected component.ReceiverConfig }{ { - id: config.NewComponentIDWithName(typeStr, ""), + id: component.NewIDWithName(typeStr, ""), expected: createDefaultConfig(), }, { - id: config.NewComponentIDWithName(typeStr, "receiver_settings"), + id: component.NewIDWithName(typeStr, "receiver_settings"), expected: &Config{ - ReceiverSettings: config.NewReceiverSettings(config.NewComponentID(typeStr)), + ReceiverSettings: config.NewReceiverSettings(component.NewID(typeStr)), NetAddr: confignet.NetAddr{ Endpoint: "localhost:8080", Transport: "udp", @@ -58,9 +59,9 @@ func TestLoadConfig(t *testing.T) { }, }, { - id: config.NewComponentIDWithName(typeStr, "regex"), + id: component.NewIDWithName(typeStr, "regex"), expected: &Config{ - ReceiverSettings: config.NewReceiverSettings(config.NewComponentID(typeStr)), + ReceiverSettings: config.NewReceiverSettings(component.NewID(typeStr)), NetAddr: confignet.NetAddr{ Endpoint: "localhost:2003", Transport: "tcp", @@ -97,7 +98,7 @@ func TestLoadConfig(t *testing.T) { sub, err := cm.Sub(tt.id.String()) require.NoError(t, err) - require.NoError(t, config.UnmarshalReceiver(sub, cfg)) + require.NoError(t, component.UnmarshalReceiverConfig(sub, cfg)) assert.NoError(t, cfg.Validate()) assert.Equal(t, tt.expected, cfg) diff --git a/receiver/carbonreceiver/factory.go b/receiver/carbonreceiver/factory.go index 85d30da8cea0..d4ed1811c8ec 100644 --- a/receiver/carbonreceiver/factory.go +++ b/receiver/carbonreceiver/factory.go @@ -43,9 +43,9 @@ func NewFactory() component.ReceiverFactory { component.WithMetricsReceiver(createMetricsReceiver, stability)) } -func createDefaultConfig() config.Receiver { +func createDefaultConfig() component.ReceiverConfig { return &Config{ - ReceiverSettings: config.NewReceiverSettings(config.NewComponentID(typeStr)), + ReceiverSettings: config.NewReceiverSettings(component.NewID(typeStr)), NetAddr: confignet.NetAddr{ Endpoint: "localhost:2003", Transport: "tcp", @@ -61,7 +61,7 @@ func createDefaultConfig() config.Receiver { func createMetricsReceiver( _ context.Context, params component.ReceiverCreateSettings, - cfg config.Receiver, + cfg component.ReceiverConfig, consumer consumer.Metrics, ) (component.MetricsReceiver, error) { diff --git a/receiver/carbonreceiver/factory_test.go b/receiver/carbonreceiver/factory_test.go index add28925a519..4650e476a9a6 100644 --- a/receiver/carbonreceiver/factory_test.go +++ b/receiver/carbonreceiver/factory_test.go @@ -20,7 +20,6 @@ import ( "github.com/stretchr/testify/assert" "go.opentelemetry.io/collector/component/componenttest" - "go.opentelemetry.io/collector/config/configtest" "go.opentelemetry.io/collector/consumer/consumertest" ) @@ -28,7 +27,7 @@ func TestCreateDefaultConfig(t *testing.T) { factory := NewFactory() cfg := factory.CreateDefaultConfig() assert.NotNil(t, cfg, "failed to create default config") - assert.NoError(t, configtest.CheckConfigStruct(cfg)) + assert.NoError(t, componenttest.CheckConfigStruct(cfg)) } func TestCreateReceiver(t *testing.T) { diff --git a/receiver/carbonreceiver/go.mod b/receiver/carbonreceiver/go.mod index d7e06f30b326..8adf13700e52 100644 --- a/receiver/carbonreceiver/go.mod +++ b/receiver/carbonreceiver/go.mod @@ -7,8 +7,8 @@ require ( github.com/open-telemetry/opentelemetry-collector-contrib/internal/common v0.63.0 github.com/open-telemetry/opentelemetry-collector-contrib/pkg/translator/opencensus v0.63.0 github.com/stretchr/testify v1.8.1 - go.opencensus.io v0.23.0 - go.opentelemetry.io/collector v0.63.2-0.20221104003159-6b27644724d8 + go.opencensus.io v0.24.0 + go.opentelemetry.io/collector v0.63.2-0.20221108014805-0b08d5316426 go.uber.org/zap v1.23.0 google.golang.org/protobuf v1.28.1 @@ -36,13 +36,13 @@ require ( github.com/modern-go/reflect2 v1.0.2 // indirect github.com/open-telemetry/opentelemetry-collector-contrib/internal/coreinternal v0.63.0 // indirect github.com/pmezard/go-difflib v1.0.0 // indirect - github.com/prometheus/client_golang v1.13.0 // indirect + github.com/prometheus/client_golang v1.13.1 // indirect github.com/prometheus/client_model v0.3.0 // indirect 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.63.2-0.20221104003159-6b27644724d8 // indirect - go.opentelemetry.io/collector/semconv v0.63.2-0.20221104003159-6b27644724d8 // indirect + go.opentelemetry.io/collector/pdata v0.63.2-0.20221108014805-0b08d5316426 // indirect + go.opentelemetry.io/collector/semconv v0.63.2-0.20221108014805-0b08d5316426 // 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 6a168d7312eb..0621206f5e6d 100644 --- a/receiver/carbonreceiver/go.sum +++ b/receiver/carbonreceiver/go.sum @@ -305,8 +305,9 @@ github.com/prometheus/client_golang v1.11.0/go.mod h1:Z6t4BnS23TR94PD6BsDNk8yVqr github.com/prometheus/client_golang v1.11.1/go.mod h1:Z6t4BnS23TR94PD6BsDNk8yVqroYurpAkEiz0P2BEV0= github.com/prometheus/client_golang v1.12.1/go.mod h1:3Z9XVyYiZYEO+YQWt3RD2R3jrbd179Rt297l4aS6nDY= github.com/prometheus/client_golang v1.12.2/go.mod h1:3Z9XVyYiZYEO+YQWt3RD2R3jrbd179Rt297l4aS6nDY= -github.com/prometheus/client_golang v1.13.0 h1:b71QUfeo5M8gq2+evJdTPfZhYMAU0uKPkyPJ7TPsloU= github.com/prometheus/client_golang v1.13.0/go.mod h1:vTeo+zgvILHsnnj/39Ou/1fPN5nJFOEMgftOUOmlvYQ= +github.com/prometheus/client_golang v1.13.1 h1:3gMjIY2+/hzmqhtUC/aQNYldJA6DtH3CgQvwS+02K1c= +github.com/prometheus/client_golang v1.13.1/go.mod h1:vTeo+zgvILHsnnj/39Ou/1fPN5nJFOEMgftOUOmlvYQ= github.com/prometheus/client_model v0.0.0-20180712105110-5c3871d89910/go.mod h1:MbSGuTsp3dbXC40dX6PRTWyKYBIrTGTE9sqQNg2J8bo= github.com/prometheus/client_model v0.0.0-20190129233127-fd36f4220a90/go.mod h1:xMI15A0UPsDsEKsMN9yxemIoYk6Tm2C1GtYGdfGttqA= github.com/prometheus/client_model v0.0.0-20190812154241-14fe0d1b01d4/go.mod h1:xMI15A0UPsDsEKsMN9yxemIoYk6Tm2C1GtYGdfGttqA= @@ -369,14 +370,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.opencensus.io v0.23.0 h1:gqCw0LfLxScz8irSi8exQc7fyQ0fKQU/qnC/X8+V/1M= go.opencensus.io v0.23.0/go.mod h1:XItmlyltB5F7CS4xOC1DcqMoFqwtC6OG2xF7mCv7P7E= -go.opentelemetry.io/collector v0.63.2-0.20221104003159-6b27644724d8 h1:rOT5HzXXfSISc6FiH012zH2/EFjp37UXfjEqj5BpkWQ= -go.opentelemetry.io/collector v0.63.2-0.20221104003159-6b27644724d8/go.mod h1:JVmeZXugK4ondC6KQgrHTHWiF4JttpG5k6dWPMt62+k= -go.opentelemetry.io/collector/pdata v0.63.2-0.20221104003159-6b27644724d8 h1:7xeTQjfsOm9eogQeIxjSEhlik9qsbBGsnmkQHfyKaRE= -go.opentelemetry.io/collector/pdata v0.63.2-0.20221104003159-6b27644724d8/go.mod h1:IzvXUGQml2mrnvdb8zIlEW3qQs9oFLdD2hLwJdZ+pek= -go.opentelemetry.io/collector/semconv v0.63.2-0.20221104003159-6b27644724d8 h1:jm0sNPyqo6S165QjQYMBHB2nK50wlJbMYM03Yr3Eo2k= -go.opentelemetry.io/collector/semconv v0.63.2-0.20221104003159-6b27644724d8/go.mod h1:5o9yhOa+ABt7g2E5JABDxGZ1PQPbtfxrKNbYn+LOTXU= +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.63.2-0.20221108014805-0b08d5316426 h1:z/wLTMh7/vNxcFUDa5uG7/IPE3tYx6pzCWPV41ghyV8= +go.opentelemetry.io/collector v0.63.2-0.20221108014805-0b08d5316426/go.mod h1:+Zb70q0Rq17dA9FcHTiTjW6g96lvJ8kAZ0c+eWNkAv0= +go.opentelemetry.io/collector/pdata v0.63.2-0.20221108014805-0b08d5316426 h1:wKDpgP0Tx/gWI2SgDGAY1OTSeihhDivbbRqFR79IGTc= +go.opentelemetry.io/collector/pdata v0.63.2-0.20221108014805-0b08d5316426/go.mod h1:IzvXUGQml2mrnvdb8zIlEW3qQs9oFLdD2hLwJdZ+pek= +go.opentelemetry.io/collector/semconv v0.63.2-0.20221108014805-0b08d5316426 h1:pqIl7OC531J6i9ttBCj3zLmZI/BSF4q323YpK0GgKGk= +go.opentelemetry.io/collector/semconv v0.63.2-0.20221108014805-0b08d5316426/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/carbonreceiver/receiver_test.go b/receiver/carbonreceiver/receiver_test.go index c022c08a63a8..c64ed1b8f35a 100644 --- a/receiver/carbonreceiver/receiver_test.go +++ b/receiver/carbonreceiver/receiver_test.go @@ -80,7 +80,7 @@ func Test_carbonreceiver_New(t *testing.T) { name: "empty_endpoint", args: args{ config: Config{ - ReceiverSettings: config.NewReceiverSettings(config.NewComponentID(typeStr)), + ReceiverSettings: config.NewReceiverSettings(component.NewID(typeStr)), }, nextConsumer: consumertest.NewNop(), }, @@ -90,7 +90,7 @@ func Test_carbonreceiver_New(t *testing.T) { name: "invalid_transport", args: args{ config: Config{ - ReceiverSettings: config.NewReceiverSettings(config.NewComponentIDWithName(typeStr, "invalid_transport_rcv")), + ReceiverSettings: config.NewReceiverSettings(component.NewIDWithName(typeStr, "invalid_transport_rcv")), NetAddr: confignet.NetAddr{ Endpoint: "localhost:2003", Transport: "unknown_transp", @@ -108,7 +108,7 @@ func Test_carbonreceiver_New(t *testing.T) { name: "regex_parser", args: args{ config: Config{ - ReceiverSettings: config.NewReceiverSettings(config.NewComponentID(typeStr)), + ReceiverSettings: config.NewReceiverSettings(component.NewID(typeStr)), NetAddr: confignet.NetAddr{ Endpoint: "localhost:2003", Transport: "tcp", @@ -131,7 +131,7 @@ func Test_carbonreceiver_New(t *testing.T) { name: "negative_tcp_idle_timeout", args: args{ config: Config{ - ReceiverSettings: config.NewReceiverSettings(config.NewComponentID(typeStr)), + ReceiverSettings: config.NewReceiverSettings(component.NewID(typeStr)), NetAddr: confignet.NetAddr{ Endpoint: "localhost:2003", Transport: "tcp", diff --git a/receiver/carbonreceiver/reporter.go b/receiver/carbonreceiver/reporter.go index 8fbca1c8fb7b..854fab913ff8 100644 --- a/receiver/carbonreceiver/reporter.go +++ b/receiver/carbonreceiver/reporter.go @@ -19,7 +19,6 @@ import ( "go.opencensus.io/trace" "go.opentelemetry.io/collector/component" - "go.opentelemetry.io/collector/config" "go.opentelemetry.io/collector/obsreport" "go.uber.org/zap" @@ -29,7 +28,7 @@ import ( // reporter struct implements the transport.Reporter interface to give consistent // observability per Collector metric observability package. type reporter struct { - id config.ComponentID + id component.ID spanName string logger *zap.Logger sugaredLogger *zap.SugaredLogger // Used for generic debug logging @@ -38,7 +37,7 @@ type reporter struct { var _ transport.Reporter = (*reporter)(nil) -func newReporter(id config.ComponentID, set component.ReceiverCreateSettings) transport.Reporter { +func newReporter(id component.ID, set component.ReceiverCreateSettings) transport.Reporter { return &reporter{ id: id, spanName: id.String() + ".receiver", diff --git a/receiver/carbonreceiver/reporter_test.go b/receiver/carbonreceiver/reporter_test.go index 2bf939e6c501..c9c9a6bc851a 100644 --- a/receiver/carbonreceiver/reporter_test.go +++ b/receiver/carbonreceiver/reporter_test.go @@ -20,7 +20,7 @@ import ( "testing" "github.com/stretchr/testify/require" - "go.opentelemetry.io/collector/config" + "go.opentelemetry.io/collector/component" "go.opentelemetry.io/collector/obsreport/obsreporttest" ) @@ -31,7 +31,7 @@ func TestReporterObservability(t *testing.T) { require.NoError(t, tt.Shutdown(context.Background())) }() - receiverID := config.NewComponentIDWithName(typeStr, "fake_receiver") + receiverID := component.NewIDWithName(typeStr, "fake_receiver") reporter := newReporter(receiverID, tt.ToReceiverCreateSettings()) ctx := reporter.OnDataReceived(context.Background()) diff --git a/receiver/chronyreceiver/config.go b/receiver/chronyreceiver/config.go index c98cf8b44c52..de5abc7748d6 100644 --- a/receiver/chronyreceiver/config.go +++ b/receiver/chronyreceiver/config.go @@ -19,7 +19,7 @@ import ( "fmt" "time" - "go.opentelemetry.io/collector/config" + "go.opentelemetry.io/collector/component" "go.opentelemetry.io/collector/receiver/scraperhelper" "github.com/open-telemetry/opentelemetry-collector-contrib/receiver/chronyreceiver/internal/chrony" @@ -42,12 +42,12 @@ type Config struct { } var ( - _ config.Receiver = (*Config)(nil) + _ component.ReceiverConfig = (*Config)(nil) errInvalidValue = errors.New("invalid value") ) -func newDefaultCongfig() config.Receiver { +func newDefaultCongfig() component.ReceiverConfig { return &Config{ ScraperControllerSettings: scraperhelper.NewDefaultScraperControllerSettings(typeStr), MetricsSettings: metadata.DefaultMetricsSettings(), diff --git a/receiver/chronyreceiver/config_test.go b/receiver/chronyreceiver/config_test.go index 436dfc53281a..332ee25ea7f6 100644 --- a/receiver/chronyreceiver/config_test.go +++ b/receiver/chronyreceiver/config_test.go @@ -23,7 +23,7 @@ import ( "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" - "go.opentelemetry.io/collector/config" + "go.opentelemetry.io/collector/component" "go.opentelemetry.io/collector/confmap/confmaptest" "go.opentelemetry.io/collector/receiver/scraperhelper" @@ -40,9 +40,9 @@ func TestLoadConfig(t *testing.T) { factory := NewFactory() cfg := factory.CreateDefaultConfig() - sub, err := cm.Sub(config.NewComponentIDWithName(typeStr, "custom").String()) + sub, err := cm.Sub(component.NewIDWithName(typeStr, "custom").String()) require.NoError(t, err) - require.NoError(t, config.UnmarshalReceiver(sub, cfg)) + require.NoError(t, component.UnmarshalReceiverConfig(sub, cfg)) assert.Equal(t, &Config{ ScraperControllerSettings: scraperhelper.NewDefaultScraperControllerSettings(typeStr), diff --git a/receiver/chronyreceiver/factory.go b/receiver/chronyreceiver/factory.go index 7ba6b332eda3..b078539644af 100644 --- a/receiver/chronyreceiver/factory.go +++ b/receiver/chronyreceiver/factory.go @@ -19,7 +19,6 @@ import ( "fmt" "go.opentelemetry.io/collector/component" - "go.opentelemetry.io/collector/config" "go.opentelemetry.io/collector/consumer" "go.opentelemetry.io/collector/receiver/scraperhelper" @@ -44,7 +43,7 @@ func NewFactory() component.ReceiverFactory { func newMetricsReceiver( ctx context.Context, set component.ReceiverCreateSettings, - rCfg config.Receiver, + rCfg component.ReceiverConfig, consumer consumer.Metrics) (component.MetricsReceiver, error) { cfg, ok := rCfg.(*Config) if !ok { diff --git a/receiver/chronyreceiver/factory_test.go b/receiver/chronyreceiver/factory_test.go index aeb8e81a5629..e01a11173df3 100644 --- a/receiver/chronyreceiver/factory_test.go +++ b/receiver/chronyreceiver/factory_test.go @@ -20,9 +20,8 @@ import ( "time" "github.com/stretchr/testify/assert" + "go.opentelemetry.io/collector/component" "go.opentelemetry.io/collector/component/componenttest" - "go.opentelemetry.io/collector/config" - "go.opentelemetry.io/collector/config/configtest" "go.opentelemetry.io/collector/consumer/consumertest" "go.opentelemetry.io/collector/receiver/scraperhelper" @@ -33,14 +32,14 @@ func TestType(t *testing.T) { t.Parallel() factory := NewFactory() - assert.Equal(t, config.Type("chrony"), factory.Type(), "Must match the expected type") + assert.Equal(t, component.Type("chrony"), factory.Type(), "Must match the expected type") } func TestValidConfig(t *testing.T) { t.Parallel() factory := NewFactory() - assert.NoError(t, configtest.CheckConfigStruct(factory.CreateDefaultConfig())) + assert.NoError(t, componenttest.CheckConfigStruct(factory.CreateDefaultConfig())) } func TestCreatingMetricsReceiver(t *testing.T) { diff --git a/receiver/chronyreceiver/go.mod b/receiver/chronyreceiver/go.mod index 722a126befaa..8ae344c94a6c 100644 --- a/receiver/chronyreceiver/go.mod +++ b/receiver/chronyreceiver/go.mod @@ -6,8 +6,8 @@ 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.63.2-0.20221104003159-6b27644724d8 - go.opentelemetry.io/collector/pdata v0.63.2-0.20221104003159-6b27644724d8 + go.opentelemetry.io/collector v0.63.2-0.20221108014805-0b08d5316426 + go.opentelemetry.io/collector/pdata v0.63.2-0.20221108014805-0b08d5316426 go.uber.org/multierr v1.8.0 ) @@ -26,7 +26,7 @@ require ( github.com/pmezard/go-difflib v1.0.0 // indirect github.com/sirupsen/logrus v1.8.1 // indirect github.com/stretchr/objx v0.5.0 // indirect - go.opencensus.io v0.23.0 // indirect + go.opencensus.io v0.24.0 // 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 6c4542f26a63..c9c104eb6e0b 100644 --- a/receiver/chronyreceiver/go.sum +++ b/receiver/chronyreceiver/go.sum @@ -232,7 +232,7 @@ github.com/prometheus/client_golang v0.9.1/go.mod h1:7SWBe2y4D6OKWSNQJUaRYU/AaXP github.com/prometheus/client_golang v1.0.0/go.mod h1:db9x61etRT2tGnBNRi70OPL5FsnadC4Ky3P0J6CfImo= github.com/prometheus/client_golang v1.7.1/go.mod h1:PY5Wy2awLA44sXw4AOSfFBetzPP4j5+D6mVACh+pe2M= github.com/prometheus/client_golang v1.11.1/go.mod h1:Z6t4BnS23TR94PD6BsDNk8yVqroYurpAkEiz0P2BEV0= -github.com/prometheus/client_golang v1.13.0 h1:b71QUfeo5M8gq2+evJdTPfZhYMAU0uKPkyPJ7TPsloU= +github.com/prometheus/client_golang v1.13.1 h1:3gMjIY2+/hzmqhtUC/aQNYldJA6DtH3CgQvwS+02K1c= github.com/prometheus/client_model v0.0.0-20180712105110-5c3871d89910/go.mod h1:MbSGuTsp3dbXC40dX6PRTWyKYBIrTGTE9sqQNg2J8bo= github.com/prometheus/client_model v0.0.0-20190129233127-fd36f4220a90/go.mod h1:xMI15A0UPsDsEKsMN9yxemIoYk6Tm2C1GtYGdfGttqA= github.com/prometheus/client_model v0.0.0-20190812154241-14fe0d1b01d4/go.mod h1:xMI15A0UPsDsEKsMN9yxemIoYk6Tm2C1GtYGdfGttqA= @@ -273,7 +273,6 @@ github.com/stretchr/testify v1.2.2/go.mod h1:a8OnRcib4nhh0OaRAV+Yts87kKdq0PP7pXf github.com/stretchr/testify v1.3.0/go.mod h1:M5WIy9Dh21IEIfnGCwXGc5bZfKNJtfHm1UVUgZn+9EI= github.com/stretchr/testify v1.4.0/go.mod h1:j7eGeouHqKxXV5pUuKE4zz7dFj8WfuZ+81PSLYec5m4= github.com/stretchr/testify v1.5.1/go.mod h1:5W2xD1RspED5o8YsWQXVCued0rvSQ+mT+I5cxcmMvtA= -github.com/stretchr/testify v1.6.1/go.mod h1:6Fq8oRcR53rry900zMqJjRRixrwX3KX962/h/Wwjteg= github.com/stretchr/testify v1.7.0/go.mod h1:6Fq8oRcR53rry900zMqJjRRixrwX3KX962/h/Wwjteg= github.com/stretchr/testify v1.7.1/go.mod h1:6Fq8oRcR53rry900zMqJjRRixrwX3KX962/h/Wwjteg= github.com/stretchr/testify v1.8.0/go.mod h1:yNjHg4UonilssWZ8iaSj1OCr/vHnekPRkoO+kdMU+MU= @@ -287,12 +286,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.opencensus.io v0.23.0 h1:gqCw0LfLxScz8irSi8exQc7fyQ0fKQU/qnC/X8+V/1M= -go.opencensus.io v0.23.0/go.mod h1:XItmlyltB5F7CS4xOC1DcqMoFqwtC6OG2xF7mCv7P7E= -go.opentelemetry.io/collector v0.63.2-0.20221104003159-6b27644724d8 h1:rOT5HzXXfSISc6FiH012zH2/EFjp37UXfjEqj5BpkWQ= -go.opentelemetry.io/collector v0.63.2-0.20221104003159-6b27644724d8/go.mod h1:JVmeZXugK4ondC6KQgrHTHWiF4JttpG5k6dWPMt62+k= -go.opentelemetry.io/collector/pdata v0.63.2-0.20221104003159-6b27644724d8 h1:7xeTQjfsOm9eogQeIxjSEhlik9qsbBGsnmkQHfyKaRE= -go.opentelemetry.io/collector/pdata v0.63.2-0.20221104003159-6b27644724d8/go.mod h1:IzvXUGQml2mrnvdb8zIlEW3qQs9oFLdD2hLwJdZ+pek= +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.63.2-0.20221108014805-0b08d5316426 h1:z/wLTMh7/vNxcFUDa5uG7/IPE3tYx6pzCWPV41ghyV8= +go.opentelemetry.io/collector v0.63.2-0.20221108014805-0b08d5316426/go.mod h1:+Zb70q0Rq17dA9FcHTiTjW6g96lvJ8kAZ0c+eWNkAv0= +go.opentelemetry.io/collector/pdata v0.63.2-0.20221108014805-0b08d5316426 h1:wKDpgP0Tx/gWI2SgDGAY1OTSeihhDivbbRqFR79IGTc= +go.opentelemetry.io/collector/pdata v0.63.2-0.20221108014805-0b08d5316426/go.mod h1:IzvXUGQml2mrnvdb8zIlEW3qQs9oFLdD2hLwJdZ+pek= 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 ba29a54b358c..6d705b9fcdf4 100644 --- a/receiver/cloudfoundryreceiver/config_test.go +++ b/receiver/cloudfoundryreceiver/config_test.go @@ -22,6 +22,7 @@ import ( "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" + "go.opentelemetry.io/collector/component" "go.opentelemetry.io/collector/config" "go.opentelemetry.io/collector/config/confighttp" "go.opentelemetry.io/collector/config/configtls" @@ -35,14 +36,14 @@ func TestLoadConfig(t *testing.T) { require.NoError(t, err) tests := []struct { - id config.ComponentID - expected config.Receiver + id component.ID + expected component.ReceiverConfig errorMessage string }{ { - id: config.NewComponentIDWithName(typeStr, "one"), + id: component.NewIDWithName(typeStr, "one"), expected: &Config{ - ReceiverSettings: config.NewReceiverSettings(config.NewComponentID(typeStr)), + ReceiverSettings: config.NewReceiverSettings(component.NewID(typeStr)), RLPGateway: RLPGatewayConfig{ HTTPClientSettings: confighttp.HTTPClientSettings{ Endpoint: "https://log-stream.sys.example.internal", @@ -66,11 +67,11 @@ func TestLoadConfig(t *testing.T) { }, }, { - id: config.NewComponentIDWithName(typeStr, "empty"), + id: component.NewIDWithName(typeStr, "empty"), errorMessage: "UAA password not specified", }, { - id: config.NewComponentIDWithName(typeStr, "invalid"), + id: component.NewIDWithName(typeStr, "invalid"), errorMessage: "failed to parse rlp_gateway.endpoint as url: parse \"https://[invalid\": missing ']' in host", }, } @@ -81,7 +82,7 @@ func TestLoadConfig(t *testing.T) { sub, err := cm.Sub(tt.id.String()) require.NoError(t, err) - require.NoError(t, config.UnmarshalReceiver(sub, cfg)) + require.NoError(t, component.UnmarshalReceiverConfig(sub, cfg)) if tt.expected == nil { assert.EqualError(t, cfg.Validate(), tt.errorMessage) diff --git a/receiver/cloudfoundryreceiver/factory.go b/receiver/cloudfoundryreceiver/factory.go index c2ecf3ba5297..b349ede29b56 100644 --- a/receiver/cloudfoundryreceiver/factory.go +++ b/receiver/cloudfoundryreceiver/factory.go @@ -42,9 +42,9 @@ func NewFactory() component.ReceiverFactory { component.WithMetricsReceiver(createMetricsReceiver, stability)) } -func createDefaultConfig() config.Receiver { +func createDefaultConfig() component.ReceiverConfig { return &Config{ - ReceiverSettings: config.NewReceiverSettings(config.NewComponentID(typeStr)), + ReceiverSettings: config.NewReceiverSettings(component.NewID(typeStr)), RLPGateway: RLPGatewayConfig{ HTTPClientSettings: confighttp.HTTPClientSettings{ Endpoint: defaultURL, @@ -69,7 +69,7 @@ func createDefaultConfig() config.Receiver { func createMetricsReceiver( _ context.Context, params component.ReceiverCreateSettings, - cfg config.Receiver, + cfg component.ReceiverConfig, nextConsumer consumer.Metrics, ) (component.MetricsReceiver, error) { c := cfg.(*Config) diff --git a/receiver/cloudfoundryreceiver/factory_test.go b/receiver/cloudfoundryreceiver/factory_test.go index 982a0a1d3906..fafb355909d8 100644 --- a/receiver/cloudfoundryreceiver/factory_test.go +++ b/receiver/cloudfoundryreceiver/factory_test.go @@ -21,7 +21,6 @@ import ( "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" "go.opentelemetry.io/collector/component/componenttest" - "go.opentelemetry.io/collector/config/configtest" "go.opentelemetry.io/collector/consumer/consumertest" ) @@ -29,7 +28,7 @@ func TestCreateDefaultConfig(t *testing.T) { factory := NewFactory() cfg := factory.CreateDefaultConfig() require.NotNil(t, cfg, "failed to create default config") - assert.NoError(t, configtest.CheckConfigStruct(cfg)) + assert.NoError(t, componenttest.CheckConfigStruct(cfg)) } func TestCreateReceiver(t *testing.T) { diff --git a/receiver/cloudfoundryreceiver/go.mod b/receiver/cloudfoundryreceiver/go.mod index 2652e0931f49..d9eb7614fb54 100644 --- a/receiver/cloudfoundryreceiver/go.mod +++ b/receiver/cloudfoundryreceiver/go.mod @@ -6,8 +6,8 @@ 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.63.2-0.20221104003159-6b27644724d8 - go.opentelemetry.io/collector/pdata v0.63.2-0.20221104003159-6b27644724d8 + go.opentelemetry.io/collector v0.63.2-0.20221108014805-0b08d5316426 + go.opentelemetry.io/collector/pdata v0.63.2-0.20221108014805-0b08d5316426 go.uber.org/zap v1.23.0 ) @@ -36,7 +36,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.opencensus.io v0.23.0 // indirect + go.opencensus.io v0.24.0 // 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 99186ee9bac0..6757b2266147 100644 --- a/receiver/cloudfoundryreceiver/go.sum +++ b/receiver/cloudfoundryreceiver/go.sum @@ -267,7 +267,7 @@ github.com/prometheus/client_golang v0.9.1/go.mod h1:7SWBe2y4D6OKWSNQJUaRYU/AaXP github.com/prometheus/client_golang v1.0.0/go.mod h1:db9x61etRT2tGnBNRi70OPL5FsnadC4Ky3P0J6CfImo= github.com/prometheus/client_golang v1.7.1/go.mod h1:PY5Wy2awLA44sXw4AOSfFBetzPP4j5+D6mVACh+pe2M= github.com/prometheus/client_golang v1.11.1/go.mod h1:Z6t4BnS23TR94PD6BsDNk8yVqroYurpAkEiz0P2BEV0= -github.com/prometheus/client_golang v1.13.0 h1:b71QUfeo5M8gq2+evJdTPfZhYMAU0uKPkyPJ7TPsloU= +github.com/prometheus/client_golang v1.13.1 h1:3gMjIY2+/hzmqhtUC/aQNYldJA6DtH3CgQvwS+02K1c= github.com/prometheus/client_model v0.0.0-20180712105110-5c3871d89910/go.mod h1:MbSGuTsp3dbXC40dX6PRTWyKYBIrTGTE9sqQNg2J8bo= github.com/prometheus/client_model v0.0.0-20190129233127-fd36f4220a90/go.mod h1:xMI15A0UPsDsEKsMN9yxemIoYk6Tm2C1GtYGdfGttqA= github.com/prometheus/client_model v0.0.0-20190812154241-14fe0d1b01d4/go.mod h1:xMI15A0UPsDsEKsMN9yxemIoYk6Tm2C1GtYGdfGttqA= @@ -307,7 +307,6 @@ github.com/stretchr/testify v1.2.2/go.mod h1:a8OnRcib4nhh0OaRAV+Yts87kKdq0PP7pXf github.com/stretchr/testify v1.3.0/go.mod h1:M5WIy9Dh21IEIfnGCwXGc5bZfKNJtfHm1UVUgZn+9EI= github.com/stretchr/testify v1.4.0/go.mod h1:j7eGeouHqKxXV5pUuKE4zz7dFj8WfuZ+81PSLYec5m4= github.com/stretchr/testify v1.5.1/go.mod h1:5W2xD1RspED5o8YsWQXVCued0rvSQ+mT+I5cxcmMvtA= -github.com/stretchr/testify v1.6.1/go.mod h1:6Fq8oRcR53rry900zMqJjRRixrwX3KX962/h/Wwjteg= github.com/stretchr/testify v1.7.0/go.mod h1:6Fq8oRcR53rry900zMqJjRRixrwX3KX962/h/Wwjteg= github.com/stretchr/testify v1.7.1/go.mod h1:6Fq8oRcR53rry900zMqJjRRixrwX3KX962/h/Wwjteg= github.com/stretchr/testify v1.8.0/go.mod h1:yNjHg4UonilssWZ8iaSj1OCr/vHnekPRkoO+kdMU+MU= @@ -319,12 +318,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.opencensus.io v0.23.0 h1:gqCw0LfLxScz8irSi8exQc7fyQ0fKQU/qnC/X8+V/1M= -go.opencensus.io v0.23.0/go.mod h1:XItmlyltB5F7CS4xOC1DcqMoFqwtC6OG2xF7mCv7P7E= -go.opentelemetry.io/collector v0.63.2-0.20221104003159-6b27644724d8 h1:rOT5HzXXfSISc6FiH012zH2/EFjp37UXfjEqj5BpkWQ= -go.opentelemetry.io/collector v0.63.2-0.20221104003159-6b27644724d8/go.mod h1:JVmeZXugK4ondC6KQgrHTHWiF4JttpG5k6dWPMt62+k= -go.opentelemetry.io/collector/pdata v0.63.2-0.20221104003159-6b27644724d8 h1:7xeTQjfsOm9eogQeIxjSEhlik9qsbBGsnmkQHfyKaRE= -go.opentelemetry.io/collector/pdata v0.63.2-0.20221104003159-6b27644724d8/go.mod h1:IzvXUGQml2mrnvdb8zIlEW3qQs9oFLdD2hLwJdZ+pek= +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.63.2-0.20221108014805-0b08d5316426 h1:z/wLTMh7/vNxcFUDa5uG7/IPE3tYx6pzCWPV41ghyV8= +go.opentelemetry.io/collector v0.63.2-0.20221108014805-0b08d5316426/go.mod h1:+Zb70q0Rq17dA9FcHTiTjW6g96lvJ8kAZ0c+eWNkAv0= +go.opentelemetry.io/collector/pdata v0.63.2-0.20221108014805-0b08d5316426 h1:wKDpgP0Tx/gWI2SgDGAY1OTSeihhDivbbRqFR79IGTc= +go.opentelemetry.io/collector/pdata v0.63.2-0.20221108014805-0b08d5316426/go.mod h1:IzvXUGQml2mrnvdb8zIlEW3qQs9oFLdD2hLwJdZ+pek= 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 e4b275a7940b..869be94d6953 100644 --- a/receiver/collectdreceiver/config_test.go +++ b/receiver/collectdreceiver/config_test.go @@ -21,6 +21,7 @@ import ( "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" + "go.opentelemetry.io/collector/component" "go.opentelemetry.io/collector/config" "go.opentelemetry.io/collector/config/confignet" "go.opentelemetry.io/collector/confmap/confmaptest" @@ -30,17 +31,17 @@ func TestLoadConfig(t *testing.T) { t.Parallel() tests := []struct { - id config.ComponentID - expected config.Receiver + id component.ID + expected component.ReceiverConfig }{ { - id: config.NewComponentIDWithName(typeStr, ""), + id: component.NewIDWithName(typeStr, ""), expected: createDefaultConfig(), }, { - id: config.NewComponentIDWithName(typeStr, "one"), + id: component.NewIDWithName(typeStr, "one"), expected: &Config{ - ReceiverSettings: config.NewReceiverSettings(config.NewComponentID(typeStr)), + ReceiverSettings: config.NewReceiverSettings(component.NewID(typeStr)), TCPAddr: confignet.TCPAddr{ Endpoint: "localhost:12345", }, @@ -61,7 +62,7 @@ func TestLoadConfig(t *testing.T) { sub, err := cm.Sub(tt.id.String()) require.NoError(t, err) - require.NoError(t, config.UnmarshalReceiver(sub, cfg)) + require.NoError(t, component.UnmarshalReceiverConfig(sub, cfg)) assert.NoError(t, cfg.Validate()) assert.Equal(t, tt.expected, cfg) diff --git a/receiver/collectdreceiver/factory.go b/receiver/collectdreceiver/factory.go index 8bf9e45d9c39..f9394d0cf1b0 100644 --- a/receiver/collectdreceiver/factory.go +++ b/receiver/collectdreceiver/factory.go @@ -43,9 +43,9 @@ func NewFactory() component.ReceiverFactory { createDefaultConfig, component.WithMetricsReceiver(createMetricsReceiver, stability)) } -func createDefaultConfig() config.Receiver { +func createDefaultConfig() component.ReceiverConfig { return &Config{ - ReceiverSettings: config.NewReceiverSettings(config.NewComponentID(typeStr)), + ReceiverSettings: config.NewReceiverSettings(component.NewID(typeStr)), TCPAddr: confignet.TCPAddr{ Endpoint: defaultBindEndpoint, }, @@ -57,7 +57,7 @@ func createDefaultConfig() config.Receiver { func createMetricsReceiver( _ context.Context, params component.ReceiverCreateSettings, - cfg config.Receiver, + cfg component.ReceiverConfig, nextConsumer consumer.Metrics, ) (component.MetricsReceiver, error) { c := cfg.(*Config) diff --git a/receiver/collectdreceiver/factory_test.go b/receiver/collectdreceiver/factory_test.go index 612a640d36d4..842a3e36ae8a 100644 --- a/receiver/collectdreceiver/factory_test.go +++ b/receiver/collectdreceiver/factory_test.go @@ -20,7 +20,6 @@ import ( "github.com/stretchr/testify/assert" "go.opentelemetry.io/collector/component/componenttest" - "go.opentelemetry.io/collector/config/configtest" "go.opentelemetry.io/collector/consumer/consumertest" ) @@ -28,7 +27,7 @@ func TestCreateDefaultConfig(t *testing.T) { factory := NewFactory() cfg := factory.CreateDefaultConfig() assert.NotNil(t, cfg, "failed to create default config") - assert.NoError(t, configtest.CheckConfigStruct(cfg)) + assert.NoError(t, componenttest.CheckConfigStruct(cfg)) } func TestCreateReceiver(t *testing.T) { diff --git a/receiver/collectdreceiver/go.mod b/receiver/collectdreceiver/go.mod index 2678498a74b5..2dd0cef95588 100644 --- a/receiver/collectdreceiver/go.mod +++ b/receiver/collectdreceiver/go.mod @@ -7,8 +7,8 @@ require ( github.com/open-telemetry/opentelemetry-collector-contrib/internal/common v0.63.0 github.com/open-telemetry/opentelemetry-collector-contrib/pkg/translator/opencensus v0.63.0 github.com/stretchr/testify v1.8.1 - go.opencensus.io v0.23.0 - go.opentelemetry.io/collector v0.63.2-0.20221104003159-6b27644724d8 + go.opencensus.io v0.24.0 + go.opentelemetry.io/collector v0.63.2-0.20221108014805-0b08d5316426 go.uber.org/zap v1.23.0 google.golang.org/protobuf v1.28.1 ) @@ -28,8 +28,8 @@ require ( github.com/modern-go/reflect2 v1.0.2 // indirect github.com/open-telemetry/opentelemetry-collector-contrib/internal/coreinternal v0.63.0 // indirect github.com/pmezard/go-difflib v1.0.0 // indirect - go.opentelemetry.io/collector/pdata v0.63.2-0.20221104003159-6b27644724d8 // indirect - go.opentelemetry.io/collector/semconv v0.63.2-0.20221104003159-6b27644724d8 // indirect + go.opentelemetry.io/collector/pdata v0.63.2-0.20221108014805-0b08d5316426 // indirect + go.opentelemetry.io/collector/semconv v0.63.2-0.20221108014805-0b08d5316426 // 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 026df036cadf..92e2d770b443 100644 --- a/receiver/collectdreceiver/go.sum +++ b/receiver/collectdreceiver/go.sum @@ -249,7 +249,6 @@ github.com/stretchr/testify v1.2.2/go.mod h1:a8OnRcib4nhh0OaRAV+Yts87kKdq0PP7pXf github.com/stretchr/testify v1.3.0/go.mod h1:M5WIy9Dh21IEIfnGCwXGc5bZfKNJtfHm1UVUgZn+9EI= github.com/stretchr/testify v1.4.0/go.mod h1:j7eGeouHqKxXV5pUuKE4zz7dFj8WfuZ+81PSLYec5m4= github.com/stretchr/testify v1.5.1/go.mod h1:5W2xD1RspED5o8YsWQXVCued0rvSQ+mT+I5cxcmMvtA= -github.com/stretchr/testify v1.6.1/go.mod h1:6Fq8oRcR53rry900zMqJjRRixrwX3KX962/h/Wwjteg= github.com/stretchr/testify v1.7.0/go.mod h1:6Fq8oRcR53rry900zMqJjRRixrwX3KX962/h/Wwjteg= github.com/stretchr/testify v1.7.1/go.mod h1:6Fq8oRcR53rry900zMqJjRRixrwX3KX962/h/Wwjteg= github.com/stretchr/testify v1.8.0/go.mod h1:yNjHg4UonilssWZ8iaSj1OCr/vHnekPRkoO+kdMU+MU= @@ -261,14 +260,14 @@ 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.opencensus.io v0.23.0 h1:gqCw0LfLxScz8irSi8exQc7fyQ0fKQU/qnC/X8+V/1M= -go.opencensus.io v0.23.0/go.mod h1:XItmlyltB5F7CS4xOC1DcqMoFqwtC6OG2xF7mCv7P7E= -go.opentelemetry.io/collector v0.63.2-0.20221104003159-6b27644724d8 h1:rOT5HzXXfSISc6FiH012zH2/EFjp37UXfjEqj5BpkWQ= -go.opentelemetry.io/collector v0.63.2-0.20221104003159-6b27644724d8/go.mod h1:JVmeZXugK4ondC6KQgrHTHWiF4JttpG5k6dWPMt62+k= -go.opentelemetry.io/collector/pdata v0.63.2-0.20221104003159-6b27644724d8 h1:7xeTQjfsOm9eogQeIxjSEhlik9qsbBGsnmkQHfyKaRE= -go.opentelemetry.io/collector/pdata v0.63.2-0.20221104003159-6b27644724d8/go.mod h1:IzvXUGQml2mrnvdb8zIlEW3qQs9oFLdD2hLwJdZ+pek= -go.opentelemetry.io/collector/semconv v0.63.2-0.20221104003159-6b27644724d8 h1:jm0sNPyqo6S165QjQYMBHB2nK50wlJbMYM03Yr3Eo2k= -go.opentelemetry.io/collector/semconv v0.63.2-0.20221104003159-6b27644724d8/go.mod h1:5o9yhOa+ABt7g2E5JABDxGZ1PQPbtfxrKNbYn+LOTXU= +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.63.2-0.20221108014805-0b08d5316426 h1:z/wLTMh7/vNxcFUDa5uG7/IPE3tYx6pzCWPV41ghyV8= +go.opentelemetry.io/collector v0.63.2-0.20221108014805-0b08d5316426/go.mod h1:+Zb70q0Rq17dA9FcHTiTjW6g96lvJ8kAZ0c+eWNkAv0= +go.opentelemetry.io/collector/pdata v0.63.2-0.20221108014805-0b08d5316426 h1:wKDpgP0Tx/gWI2SgDGAY1OTSeihhDivbbRqFR79IGTc= +go.opentelemetry.io/collector/pdata v0.63.2-0.20221108014805-0b08d5316426/go.mod h1:IzvXUGQml2mrnvdb8zIlEW3qQs9oFLdD2hLwJdZ+pek= +go.opentelemetry.io/collector/semconv v0.63.2-0.20221108014805-0b08d5316426 h1:pqIl7OC531J6i9ttBCj3zLmZI/BSF4q323YpK0GgKGk= +go.opentelemetry.io/collector/semconv v0.63.2-0.20221108014805-0b08d5316426/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/config_test.go b/receiver/couchdbreceiver/config_test.go index d2fd6bfb4421..e552f53077fc 100644 --- a/receiver/couchdbreceiver/config_test.go +++ b/receiver/couchdbreceiver/config_test.go @@ -21,7 +21,7 @@ import ( "time" "github.com/stretchr/testify/require" - "go.opentelemetry.io/collector/config" + "go.opentelemetry.io/collector/component" "go.opentelemetry.io/collector/config/confighttp" "go.opentelemetry.io/collector/confmap/confmaptest" "go.uber.org/multierr" @@ -110,9 +110,9 @@ func TestLoadConfig(t *testing.T) { factory := NewFactory() cfg := factory.CreateDefaultConfig() - sub, err := cm.Sub(config.NewComponentIDWithName(typeStr, "").String()) + sub, err := cm.Sub(component.NewIDWithName(typeStr, "").String()) require.NoError(t, err) - require.NoError(t, config.UnmarshalReceiver(sub, cfg)) + require.NoError(t, component.UnmarshalReceiverConfig(sub, cfg)) expected := factory.CreateDefaultConfig().(*Config) expected.Endpoint = "http://localhost:5984" diff --git a/receiver/couchdbreceiver/factory.go b/receiver/couchdbreceiver/factory.go index 35fa001beb45..eaca73d7f1aa 100644 --- a/receiver/couchdbreceiver/factory.go +++ b/receiver/couchdbreceiver/factory.go @@ -41,11 +41,11 @@ func NewFactory() component.ReceiverFactory { component.WithMetricsReceiver(createMetricsReceiver, stability)) } -func createDefaultConfig() config.Receiver { +func createDefaultConfig() component.ReceiverConfig { return &Config{ Metrics: metadata.DefaultMetricsSettings(), ScraperControllerSettings: scraperhelper.ScraperControllerSettings{ - ReceiverSettings: config.NewReceiverSettings(config.NewComponentID(typeStr)), + ReceiverSettings: config.NewReceiverSettings(component.NewID(typeStr)), CollectionInterval: 1 * time.Minute, }, HTTPClientSettings: confighttp.HTTPClientSettings{ @@ -59,7 +59,7 @@ func createDefaultConfig() config.Receiver { func createMetricsReceiver( _ context.Context, params component.ReceiverCreateSettings, - rConf config.Receiver, + rConf component.ReceiverConfig, consumer consumer.Metrics, ) (component.MetricsReceiver, error) { cfg := rConf.(*Config) diff --git a/receiver/couchdbreceiver/go.mod b/receiver/couchdbreceiver/go.mod index c502a1d4b92f..004594322ce2 100644 --- a/receiver/couchdbreceiver/go.mod +++ b/receiver/couchdbreceiver/go.mod @@ -3,7 +3,7 @@ module github.com/open-telemetry/opentelemetry-collector-contrib/receiver/couchd go 1.18 require ( - go.opentelemetry.io/collector v0.63.2-0.20221104003159-6b27644724d8 + go.opentelemetry.io/collector v0.63.2-0.20221108014805-0b08d5316426 go.uber.org/multierr v1.8.0 ) @@ -11,7 +11,7 @@ require github.com/stretchr/testify v1.8.1 require ( github.com/open-telemetry/opentelemetry-collector-contrib/internal/scrapertest v0.63.0 - go.opentelemetry.io/collector/pdata v0.63.2-0.20221104003159-6b27644724d8 + go.opentelemetry.io/collector/pdata v0.63.2-0.20221108014805-0b08d5316426 go.uber.org/zap v1.23.0 ) @@ -38,7 +38,7 @@ require ( github.com/rogpeppe/go-internal v1.6.1 // indirect github.com/rs/cors v1.8.2 // indirect github.com/stretchr/objx v0.5.0 // indirect - go.opencensus.io v0.23.0 // indirect + go.opencensus.io v0.24.0 // 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 15f6226b634a..11a92ef7967e 100644 --- a/receiver/couchdbreceiver/go.sum +++ b/receiver/couchdbreceiver/go.sum @@ -241,7 +241,7 @@ github.com/prometheus/client_golang v0.9.1/go.mod h1:7SWBe2y4D6OKWSNQJUaRYU/AaXP github.com/prometheus/client_golang v1.0.0/go.mod h1:db9x61etRT2tGnBNRi70OPL5FsnadC4Ky3P0J6CfImo= github.com/prometheus/client_golang v1.7.1/go.mod h1:PY5Wy2awLA44sXw4AOSfFBetzPP4j5+D6mVACh+pe2M= github.com/prometheus/client_golang v1.11.1/go.mod h1:Z6t4BnS23TR94PD6BsDNk8yVqroYurpAkEiz0P2BEV0= -github.com/prometheus/client_golang v1.13.0 h1:b71QUfeo5M8gq2+evJdTPfZhYMAU0uKPkyPJ7TPsloU= +github.com/prometheus/client_golang v1.13.1 h1:3gMjIY2+/hzmqhtUC/aQNYldJA6DtH3CgQvwS+02K1c= github.com/prometheus/client_model v0.0.0-20180712105110-5c3871d89910/go.mod h1:MbSGuTsp3dbXC40dX6PRTWyKYBIrTGTE9sqQNg2J8bo= github.com/prometheus/client_model v0.0.0-20190129233127-fd36f4220a90/go.mod h1:xMI15A0UPsDsEKsMN9yxemIoYk6Tm2C1GtYGdfGttqA= github.com/prometheus/client_model v0.0.0-20190812154241-14fe0d1b01d4/go.mod h1:xMI15A0UPsDsEKsMN9yxemIoYk6Tm2C1GtYGdfGttqA= @@ -282,7 +282,6 @@ github.com/stretchr/testify v1.2.2/go.mod h1:a8OnRcib4nhh0OaRAV+Yts87kKdq0PP7pXf github.com/stretchr/testify v1.3.0/go.mod h1:M5WIy9Dh21IEIfnGCwXGc5bZfKNJtfHm1UVUgZn+9EI= github.com/stretchr/testify v1.4.0/go.mod h1:j7eGeouHqKxXV5pUuKE4zz7dFj8WfuZ+81PSLYec5m4= github.com/stretchr/testify v1.5.1/go.mod h1:5W2xD1RspED5o8YsWQXVCued0rvSQ+mT+I5cxcmMvtA= -github.com/stretchr/testify v1.6.1/go.mod h1:6Fq8oRcR53rry900zMqJjRRixrwX3KX962/h/Wwjteg= github.com/stretchr/testify v1.7.0/go.mod h1:6Fq8oRcR53rry900zMqJjRRixrwX3KX962/h/Wwjteg= github.com/stretchr/testify v1.7.1/go.mod h1:6Fq8oRcR53rry900zMqJjRRixrwX3KX962/h/Wwjteg= github.com/stretchr/testify v1.8.0/go.mod h1:yNjHg4UonilssWZ8iaSj1OCr/vHnekPRkoO+kdMU+MU= @@ -294,12 +293,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.opencensus.io v0.23.0 h1:gqCw0LfLxScz8irSi8exQc7fyQ0fKQU/qnC/X8+V/1M= -go.opencensus.io v0.23.0/go.mod h1:XItmlyltB5F7CS4xOC1DcqMoFqwtC6OG2xF7mCv7P7E= -go.opentelemetry.io/collector v0.63.2-0.20221104003159-6b27644724d8 h1:rOT5HzXXfSISc6FiH012zH2/EFjp37UXfjEqj5BpkWQ= -go.opentelemetry.io/collector v0.63.2-0.20221104003159-6b27644724d8/go.mod h1:JVmeZXugK4ondC6KQgrHTHWiF4JttpG5k6dWPMt62+k= -go.opentelemetry.io/collector/pdata v0.63.2-0.20221104003159-6b27644724d8 h1:7xeTQjfsOm9eogQeIxjSEhlik9qsbBGsnmkQHfyKaRE= -go.opentelemetry.io/collector/pdata v0.63.2-0.20221104003159-6b27644724d8/go.mod h1:IzvXUGQml2mrnvdb8zIlEW3qQs9oFLdD2hLwJdZ+pek= +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.63.2-0.20221108014805-0b08d5316426 h1:z/wLTMh7/vNxcFUDa5uG7/IPE3tYx6pzCWPV41ghyV8= +go.opentelemetry.io/collector v0.63.2-0.20221108014805-0b08d5316426/go.mod h1:+Zb70q0Rq17dA9FcHTiTjW6g96lvJ8kAZ0c+eWNkAv0= +go.opentelemetry.io/collector/pdata v0.63.2-0.20221108014805-0b08d5316426 h1:wKDpgP0Tx/gWI2SgDGAY1OTSeihhDivbbRqFR79IGTc= +go.opentelemetry.io/collector/pdata v0.63.2-0.20221108014805-0b08d5316426/go.mod h1:IzvXUGQml2mrnvdb8zIlEW3qQs9oFLdD2hLwJdZ+pek= 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/dockerstatsreceiver/config.go b/receiver/dockerstatsreceiver/config.go index 708d5740cf6d..3a17f6a5aeee 100644 --- a/receiver/dockerstatsreceiver/config.go +++ b/receiver/dockerstatsreceiver/config.go @@ -19,13 +19,13 @@ import ( "fmt" "time" - "go.opentelemetry.io/collector/config" + "go.opentelemetry.io/collector/component" "go.opentelemetry.io/collector/receiver/scraperhelper" "github.com/open-telemetry/opentelemetry-collector-contrib/receiver/dockerstatsreceiver/internal/metadata" ) -var _ config.Receiver = (*Config)(nil) +var _ component.ReceiverConfig = (*Config)(nil) type Config struct { scraperhelper.ScraperControllerSettings `mapstructure:",squash"` diff --git a/receiver/dockerstatsreceiver/config_test.go b/receiver/dockerstatsreceiver/config_test.go index 06b98bd21835..b91a18f15e91 100644 --- a/receiver/dockerstatsreceiver/config_test.go +++ b/receiver/dockerstatsreceiver/config_test.go @@ -23,6 +23,7 @@ import ( "github.com/google/go-cmp/cmp/cmpopts" "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" + "go.opentelemetry.io/collector/component" "go.opentelemetry.io/collector/config" "go.opentelemetry.io/collector/confmap/confmaptest" "go.opentelemetry.io/collector/receiver/scraperhelper" @@ -34,18 +35,18 @@ func TestLoadConfig(t *testing.T) { t.Parallel() tests := []struct { - id config.ComponentID - expected config.Receiver + id component.ID + expected component.ReceiverConfig }{ { - id: config.NewComponentIDWithName(typeStr, ""), + id: component.NewIDWithName(typeStr, ""), expected: createDefaultConfig(), }, { - id: config.NewComponentIDWithName(typeStr, "allsettings"), + id: component.NewIDWithName(typeStr, "allsettings"), expected: &Config{ ScraperControllerSettings: scraperhelper.ScraperControllerSettings{ - ReceiverSettings: config.NewReceiverSettings(config.NewComponentID(typeStr)), + ReceiverSettings: config.NewReceiverSettings(component.NewID(typeStr)), CollectionInterval: 2 * time.Second, }, @@ -92,7 +93,7 @@ func TestLoadConfig(t *testing.T) { sub, err := cm.Sub(tt.id.String()) require.NoError(t, err) - require.NoError(t, config.UnmarshalReceiver(sub, cfg)) + require.NoError(t, component.UnmarshalReceiverConfig(sub, cfg)) assert.NoError(t, cfg.Validate()) if diff := cmp.Diff(tt.expected, cfg, cmpopts.IgnoreUnexported(config.ReceiverSettings{}, metadata.MetricSettings{})); diff != "" { diff --git a/receiver/dockerstatsreceiver/factory.go b/receiver/dockerstatsreceiver/factory.go index bf565dae9475..59b5b2e1d920 100644 --- a/receiver/dockerstatsreceiver/factory.go +++ b/receiver/dockerstatsreceiver/factory.go @@ -19,7 +19,6 @@ import ( "time" "go.opentelemetry.io/collector/component" - "go.opentelemetry.io/collector/config" "go.opentelemetry.io/collector/consumer" "go.opentelemetry.io/collector/featuregate" "go.opentelemetry.io/collector/receiver/scraperhelper" @@ -48,7 +47,7 @@ func NewFactory() component.ReceiverFactory { component.WithMetricsReceiver(createMetricsReceiver, stability)) } -func createDefaultConfig() config.Receiver { +func createDefaultConfig() component.ReceiverConfig { scs := scraperhelper.NewDefaultScraperControllerSettings(typeStr) scs.CollectionInterval = 10 * time.Second return &Config{ @@ -63,7 +62,7 @@ func createDefaultConfig() config.Receiver { func createMetricsReceiver( _ context.Context, params component.ReceiverCreateSettings, - config config.Receiver, + config component.ReceiverConfig, consumer consumer.Metrics, ) (component.MetricsReceiver, error) { dockerConfig := config.(*Config) diff --git a/receiver/dockerstatsreceiver/factory_test.go b/receiver/dockerstatsreceiver/factory_test.go index 0c45dddca4cb..e9a1345742cc 100644 --- a/receiver/dockerstatsreceiver/factory_test.go +++ b/receiver/dockerstatsreceiver/factory_test.go @@ -21,7 +21,6 @@ import ( "github.com/stretchr/testify/assert" "go.opentelemetry.io/collector/component" "go.opentelemetry.io/collector/component/componenttest" - "go.opentelemetry.io/collector/config/configtest" "go.opentelemetry.io/collector/consumer/consumertest" ) @@ -31,7 +30,7 @@ func TestCreateDefaultConfig(t *testing.T) { config := factory.CreateDefaultConfig() assert.NotNil(t, config, "failed to create default config") - assert.NoError(t, configtest.CheckConfigStruct(config)) + assert.NoError(t, componenttest.CheckConfigStruct(config)) } func TestCreateReceiver(t *testing.T) { diff --git a/receiver/dockerstatsreceiver/go.mod b/receiver/dockerstatsreceiver/go.mod index d3e65fca205e..ac6eb6cbaf6a 100644 --- a/receiver/dockerstatsreceiver/go.mod +++ b/receiver/dockerstatsreceiver/go.mod @@ -9,9 +9,9 @@ require ( github.com/open-telemetry/opentelemetry-collector-contrib/internal/docker v0.63.0 github.com/open-telemetry/opentelemetry-collector-contrib/internal/scrapertest v0.63.0 github.com/stretchr/testify v1.8.1 - go.opentelemetry.io/collector v0.63.2-0.20221104003159-6b27644724d8 - go.opentelemetry.io/collector/pdata v0.63.2-0.20221104003159-6b27644724d8 - go.opentelemetry.io/collector/semconv v0.63.2-0.20221104003159-6b27644724d8 + go.opentelemetry.io/collector v0.63.2-0.20221108014805-0b08d5316426 + go.opentelemetry.io/collector/pdata v0.63.2-0.20221108014805-0b08d5316426 + go.opentelemetry.io/collector/semconv v0.63.2-0.20221108014805-0b08d5316426 go.uber.org/multierr v1.8.0 go.uber.org/zap v1.23.0 ) @@ -44,7 +44,7 @@ require ( github.com/pmezard/go-difflib v1.0.0 // indirect github.com/rogpeppe/go-internal v1.6.1 // indirect github.com/sirupsen/logrus v1.8.1 // indirect - go.opencensus.io v0.23.0 // indirect + go.opencensus.io v0.24.0 // 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/dockerstatsreceiver/go.sum b/receiver/dockerstatsreceiver/go.sum index 48b9276264d2..ecaee3eb22d2 100644 --- a/receiver/dockerstatsreceiver/go.sum +++ b/receiver/dockerstatsreceiver/go.sum @@ -256,7 +256,7 @@ github.com/prometheus/client_golang v0.9.1/go.mod h1:7SWBe2y4D6OKWSNQJUaRYU/AaXP github.com/prometheus/client_golang v1.0.0/go.mod h1:db9x61etRT2tGnBNRi70OPL5FsnadC4Ky3P0J6CfImo= github.com/prometheus/client_golang v1.7.1/go.mod h1:PY5Wy2awLA44sXw4AOSfFBetzPP4j5+D6mVACh+pe2M= github.com/prometheus/client_golang v1.11.1/go.mod h1:Z6t4BnS23TR94PD6BsDNk8yVqroYurpAkEiz0P2BEV0= -github.com/prometheus/client_golang v1.13.0 h1:b71QUfeo5M8gq2+evJdTPfZhYMAU0uKPkyPJ7TPsloU= +github.com/prometheus/client_golang v1.13.1 h1:3gMjIY2+/hzmqhtUC/aQNYldJA6DtH3CgQvwS+02K1c= github.com/prometheus/client_model v0.0.0-20180712105110-5c3871d89910/go.mod h1:MbSGuTsp3dbXC40dX6PRTWyKYBIrTGTE9sqQNg2J8bo= github.com/prometheus/client_model v0.0.0-20190129233127-fd36f4220a90/go.mod h1:xMI15A0UPsDsEKsMN9yxemIoYk6Tm2C1GtYGdfGttqA= github.com/prometheus/client_model v0.0.0-20190812154241-14fe0d1b01d4/go.mod h1:xMI15A0UPsDsEKsMN9yxemIoYk6Tm2C1GtYGdfGttqA= @@ -297,7 +297,6 @@ github.com/stretchr/testify v1.2.2/go.mod h1:a8OnRcib4nhh0OaRAV+Yts87kKdq0PP7pXf github.com/stretchr/testify v1.3.0/go.mod h1:M5WIy9Dh21IEIfnGCwXGc5bZfKNJtfHm1UVUgZn+9EI= github.com/stretchr/testify v1.4.0/go.mod h1:j7eGeouHqKxXV5pUuKE4zz7dFj8WfuZ+81PSLYec5m4= github.com/stretchr/testify v1.5.1/go.mod h1:5W2xD1RspED5o8YsWQXVCued0rvSQ+mT+I5cxcmMvtA= -github.com/stretchr/testify v1.6.1/go.mod h1:6Fq8oRcR53rry900zMqJjRRixrwX3KX962/h/Wwjteg= github.com/stretchr/testify v1.7.0/go.mod h1:6Fq8oRcR53rry900zMqJjRRixrwX3KX962/h/Wwjteg= github.com/stretchr/testify v1.7.1/go.mod h1:6Fq8oRcR53rry900zMqJjRRixrwX3KX962/h/Wwjteg= github.com/stretchr/testify v1.8.0/go.mod h1:yNjHg4UonilssWZ8iaSj1OCr/vHnekPRkoO+kdMU+MU= @@ -309,14 +308,14 @@ 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.opencensus.io v0.23.0 h1:gqCw0LfLxScz8irSi8exQc7fyQ0fKQU/qnC/X8+V/1M= -go.opencensus.io v0.23.0/go.mod h1:XItmlyltB5F7CS4xOC1DcqMoFqwtC6OG2xF7mCv7P7E= -go.opentelemetry.io/collector v0.63.2-0.20221104003159-6b27644724d8 h1:rOT5HzXXfSISc6FiH012zH2/EFjp37UXfjEqj5BpkWQ= -go.opentelemetry.io/collector v0.63.2-0.20221104003159-6b27644724d8/go.mod h1:JVmeZXugK4ondC6KQgrHTHWiF4JttpG5k6dWPMt62+k= -go.opentelemetry.io/collector/pdata v0.63.2-0.20221104003159-6b27644724d8 h1:7xeTQjfsOm9eogQeIxjSEhlik9qsbBGsnmkQHfyKaRE= -go.opentelemetry.io/collector/pdata v0.63.2-0.20221104003159-6b27644724d8/go.mod h1:IzvXUGQml2mrnvdb8zIlEW3qQs9oFLdD2hLwJdZ+pek= -go.opentelemetry.io/collector/semconv v0.63.2-0.20221104003159-6b27644724d8 h1:jm0sNPyqo6S165QjQYMBHB2nK50wlJbMYM03Yr3Eo2k= -go.opentelemetry.io/collector/semconv v0.63.2-0.20221104003159-6b27644724d8/go.mod h1:5o9yhOa+ABt7g2E5JABDxGZ1PQPbtfxrKNbYn+LOTXU= +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.63.2-0.20221108014805-0b08d5316426 h1:z/wLTMh7/vNxcFUDa5uG7/IPE3tYx6pzCWPV41ghyV8= +go.opentelemetry.io/collector v0.63.2-0.20221108014805-0b08d5316426/go.mod h1:+Zb70q0Rq17dA9FcHTiTjW6g96lvJ8kAZ0c+eWNkAv0= +go.opentelemetry.io/collector/pdata v0.63.2-0.20221108014805-0b08d5316426 h1:wKDpgP0Tx/gWI2SgDGAY1OTSeihhDivbbRqFR79IGTc= +go.opentelemetry.io/collector/pdata v0.63.2-0.20221108014805-0b08d5316426/go.mod h1:IzvXUGQml2mrnvdb8zIlEW3qQs9oFLdD2hLwJdZ+pek= +go.opentelemetry.io/collector/semconv v0.63.2-0.20221108014805-0b08d5316426 h1:pqIl7OC531J6i9ttBCj3zLmZI/BSF4q323YpK0GgKGk= +go.opentelemetry.io/collector/semconv v0.63.2-0.20221108014805-0b08d5316426/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/config_test.go b/receiver/dotnetdiagnosticsreceiver/config_test.go index 02cedd9c2a14..6daed7a01385 100644 --- a/receiver/dotnetdiagnosticsreceiver/config_test.go +++ b/receiver/dotnetdiagnosticsreceiver/config_test.go @@ -21,6 +21,7 @@ import ( "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" + "go.opentelemetry.io/collector/component" "go.opentelemetry.io/collector/config" "go.opentelemetry.io/collector/confmap/confmaptest" "go.opentelemetry.io/collector/receiver/scraperhelper" @@ -33,15 +34,15 @@ func TestLoadConfig(t *testing.T) { factory := NewFactory() cfg := factory.CreateDefaultConfig() - sub, err := cm.Sub(config.NewComponentIDWithName(typeStr, "").String()) + sub, err := cm.Sub(component.NewIDWithName(typeStr, "").String()) require.NoError(t, err) - require.NoError(t, config.UnmarshalReceiver(sub, cfg)) + require.NoError(t, component.UnmarshalReceiverConfig(sub, cfg)) assert.Equal(t, &Config{ PID: 1234, Counters: []string{"Foo", "Bar"}, ScraperControllerSettings: scraperhelper.ScraperControllerSettings{ - ReceiverSettings: config.NewReceiverSettings(config.NewComponentID(typeStr)), + ReceiverSettings: config.NewReceiverSettings(component.NewID(typeStr)), CollectionInterval: 2 * time.Second, }, }, cfg) diff --git a/receiver/dotnetdiagnosticsreceiver/factory.go b/receiver/dotnetdiagnosticsreceiver/factory.go index 826fe3a2a6db..47c8cd5ce02e 100644 --- a/receiver/dotnetdiagnosticsreceiver/factory.go +++ b/receiver/dotnetdiagnosticsreceiver/factory.go @@ -43,10 +43,10 @@ func NewFactory() component.ReceiverFactory { ) } -func createDefaultConfig() config.Receiver { +func createDefaultConfig() component.ReceiverConfig { return &Config{ ScraperControllerSettings: scraperhelper.ScraperControllerSettings{ - ReceiverSettings: config.NewReceiverSettings(config.NewComponentID(typeStr)), + ReceiverSettings: config.NewReceiverSettings(component.NewID(typeStr)), CollectionInterval: time.Second, }, Counters: []string{"System.Runtime", "Microsoft.AspNetCore.Hosting"}, @@ -56,7 +56,7 @@ func createDefaultConfig() config.Receiver { func createMetricsReceiver( ctx context.Context, params component.ReceiverCreateSettings, - baseConfig config.Receiver, + baseConfig component.ReceiverConfig, consumer consumer.Metrics, ) (component.MetricsReceiver, error) { cfg := baseConfig.(*Config) diff --git a/receiver/dotnetdiagnosticsreceiver/factory_test.go b/receiver/dotnetdiagnosticsreceiver/factory_test.go index c43380bafd5e..74a3025e7e48 100644 --- a/receiver/dotnetdiagnosticsreceiver/factory_test.go +++ b/receiver/dotnetdiagnosticsreceiver/factory_test.go @@ -22,7 +22,6 @@ import ( "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" "go.opentelemetry.io/collector/component/componenttest" - "go.opentelemetry.io/collector/config/configtest" "go.opentelemetry.io/collector/consumer/consumertest" ) @@ -31,7 +30,7 @@ func TestCreateDefaultConfig(t *testing.T) { assert.Equal(t, "dotnet_diagnostics", string(f.Type())) cfg := f.CreateDefaultConfig() assert.NotNil(t, cfg) - assert.NoError(t, configtest.CheckConfigStruct(cfg)) + assert.NoError(t, componenttest.CheckConfigStruct(cfg)) assert.Equal( t, []string{"System.Runtime", "Microsoft.AspNetCore.Hosting"}, diff --git a/receiver/dotnetdiagnosticsreceiver/go.mod b/receiver/dotnetdiagnosticsreceiver/go.mod index 237e4d4047b8..7b50114e962a 100644 --- a/receiver/dotnetdiagnosticsreceiver/go.mod +++ b/receiver/dotnetdiagnosticsreceiver/go.mod @@ -4,8 +4,8 @@ go 1.18 require ( github.com/stretchr/testify v1.8.1 - go.opentelemetry.io/collector v0.63.2-0.20221104003159-6b27644724d8 - go.opentelemetry.io/collector/pdata v0.63.2-0.20221104003159-6b27644724d8 + go.opentelemetry.io/collector v0.63.2-0.20221108014805-0b08d5316426 + go.opentelemetry.io/collector/pdata v0.63.2-0.20221108014805-0b08d5316426 go.uber.org/zap v1.23.0 ) @@ -24,7 +24,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.opencensus.io v0.23.0 // indirect + go.opencensus.io v0.24.0 // 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 9599123522de..51178ceaf3ac 100644 --- a/receiver/dotnetdiagnosticsreceiver/go.sum +++ b/receiver/dotnetdiagnosticsreceiver/go.sum @@ -233,7 +233,7 @@ github.com/prometheus/client_golang v0.9.1/go.mod h1:7SWBe2y4D6OKWSNQJUaRYU/AaXP github.com/prometheus/client_golang v1.0.0/go.mod h1:db9x61etRT2tGnBNRi70OPL5FsnadC4Ky3P0J6CfImo= github.com/prometheus/client_golang v1.7.1/go.mod h1:PY5Wy2awLA44sXw4AOSfFBetzPP4j5+D6mVACh+pe2M= github.com/prometheus/client_golang v1.11.1/go.mod h1:Z6t4BnS23TR94PD6BsDNk8yVqroYurpAkEiz0P2BEV0= -github.com/prometheus/client_golang v1.13.0 h1:b71QUfeo5M8gq2+evJdTPfZhYMAU0uKPkyPJ7TPsloU= +github.com/prometheus/client_golang v1.13.1 h1:3gMjIY2+/hzmqhtUC/aQNYldJA6DtH3CgQvwS+02K1c= github.com/prometheus/client_model v0.0.0-20180712105110-5c3871d89910/go.mod h1:MbSGuTsp3dbXC40dX6PRTWyKYBIrTGTE9sqQNg2J8bo= github.com/prometheus/client_model v0.0.0-20190129233127-fd36f4220a90/go.mod h1:xMI15A0UPsDsEKsMN9yxemIoYk6Tm2C1GtYGdfGttqA= github.com/prometheus/client_model v0.0.0-20190812154241-14fe0d1b01d4/go.mod h1:xMI15A0UPsDsEKsMN9yxemIoYk6Tm2C1GtYGdfGttqA= @@ -271,7 +271,6 @@ github.com/stretchr/testify v1.2.2/go.mod h1:a8OnRcib4nhh0OaRAV+Yts87kKdq0PP7pXf github.com/stretchr/testify v1.3.0/go.mod h1:M5WIy9Dh21IEIfnGCwXGc5bZfKNJtfHm1UVUgZn+9EI= github.com/stretchr/testify v1.4.0/go.mod h1:j7eGeouHqKxXV5pUuKE4zz7dFj8WfuZ+81PSLYec5m4= github.com/stretchr/testify v1.5.1/go.mod h1:5W2xD1RspED5o8YsWQXVCued0rvSQ+mT+I5cxcmMvtA= -github.com/stretchr/testify v1.6.1/go.mod h1:6Fq8oRcR53rry900zMqJjRRixrwX3KX962/h/Wwjteg= github.com/stretchr/testify v1.7.0/go.mod h1:6Fq8oRcR53rry900zMqJjRRixrwX3KX962/h/Wwjteg= github.com/stretchr/testify v1.7.1/go.mod h1:6Fq8oRcR53rry900zMqJjRRixrwX3KX962/h/Wwjteg= github.com/stretchr/testify v1.8.0/go.mod h1:yNjHg4UonilssWZ8iaSj1OCr/vHnekPRkoO+kdMU+MU= @@ -283,12 +282,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.opencensus.io v0.23.0 h1:gqCw0LfLxScz8irSi8exQc7fyQ0fKQU/qnC/X8+V/1M= -go.opencensus.io v0.23.0/go.mod h1:XItmlyltB5F7CS4xOC1DcqMoFqwtC6OG2xF7mCv7P7E= -go.opentelemetry.io/collector v0.63.2-0.20221104003159-6b27644724d8 h1:rOT5HzXXfSISc6FiH012zH2/EFjp37UXfjEqj5BpkWQ= -go.opentelemetry.io/collector v0.63.2-0.20221104003159-6b27644724d8/go.mod h1:JVmeZXugK4ondC6KQgrHTHWiF4JttpG5k6dWPMt62+k= -go.opentelemetry.io/collector/pdata v0.63.2-0.20221104003159-6b27644724d8 h1:7xeTQjfsOm9eogQeIxjSEhlik9qsbBGsnmkQHfyKaRE= -go.opentelemetry.io/collector/pdata v0.63.2-0.20221104003159-6b27644724d8/go.mod h1:IzvXUGQml2mrnvdb8zIlEW3qQs9oFLdD2hLwJdZ+pek= +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.63.2-0.20221108014805-0b08d5316426 h1:z/wLTMh7/vNxcFUDa5uG7/IPE3tYx6pzCWPV41ghyV8= +go.opentelemetry.io/collector v0.63.2-0.20221108014805-0b08d5316426/go.mod h1:+Zb70q0Rq17dA9FcHTiTjW6g96lvJ8kAZ0c+eWNkAv0= +go.opentelemetry.io/collector/pdata v0.63.2-0.20221108014805-0b08d5316426 h1:wKDpgP0Tx/gWI2SgDGAY1OTSeihhDivbbRqFR79IGTc= +go.opentelemetry.io/collector/pdata v0.63.2-0.20221108014805-0b08d5316426/go.mod h1:IzvXUGQml2mrnvdb8zIlEW3qQs9oFLdD2hLwJdZ+pek= 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 1cb5e18c70b5..84743b15f8f0 100644 --- a/receiver/elasticsearchreceiver/config_test.go +++ b/receiver/elasticsearchreceiver/config_test.go @@ -23,6 +23,7 @@ import ( "github.com/google/go-cmp/cmp/cmpopts" "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" + "go.opentelemetry.io/collector/component" "go.opentelemetry.io/collector/config" "go.opentelemetry.io/collector/config/confighttp" "go.opentelemetry.io/collector/confmap/confmaptest" @@ -158,21 +159,21 @@ func TestLoadConfig(t *testing.T) { defaultMetrics := metadata.DefaultMetricsSettings() defaultMetrics.ElasticsearchNodeFsDiskAvailable.Enabled = false tests := []struct { - id config.ComponentID - expected config.Receiver + id component.ID + expected component.ReceiverConfig }{ { - id: config.NewComponentIDWithName(typeStr, "defaults"), + id: component.NewIDWithName(typeStr, "defaults"), expected: createDefaultConfig(), }, { - id: config.NewComponentIDWithName(typeStr, ""), + id: component.NewIDWithName(typeStr, ""), expected: &Config{ SkipClusterMetrics: true, Nodes: []string{"_local"}, Indices: []string{".geoip_databases"}, ScraperControllerSettings: scraperhelper.ScraperControllerSettings{ - ReceiverSettings: config.NewReceiverSettings(config.NewComponentID(typeStr)), + ReceiverSettings: config.NewReceiverSettings(component.NewID(typeStr)), CollectionInterval: 2 * time.Minute, }, Metrics: defaultMetrics, @@ -193,7 +194,7 @@ func TestLoadConfig(t *testing.T) { sub, err := cm.Sub(tt.id.String()) require.NoError(t, err) - require.NoError(t, config.UnmarshalReceiver(sub, cfg)) + require.NoError(t, component.UnmarshalReceiverConfig(sub, cfg)) assert.NoError(t, cfg.Validate()) if diff := cmp.Diff(tt.expected, cfg, cmpopts.IgnoreUnexported(config.ReceiverSettings{}, metadata.MetricSettings{})); diff != "" { diff --git a/receiver/elasticsearchreceiver/factory.go b/receiver/elasticsearchreceiver/factory.go index 136b836e373a..997ca5960dab 100644 --- a/receiver/elasticsearchreceiver/factory.go +++ b/receiver/elasticsearchreceiver/factory.go @@ -44,10 +44,10 @@ func NewFactory() component.ReceiverFactory { } // createDefaultConfig creates the default elasticsearchreceiver config. -func createDefaultConfig() config.Receiver { +func createDefaultConfig() component.ReceiverConfig { return &Config{ ScraperControllerSettings: scraperhelper.ScraperControllerSettings{ - ReceiverSettings: config.NewReceiverSettings(config.NewComponentID(typeStr)), + ReceiverSettings: config.NewReceiverSettings(component.NewID(typeStr)), CollectionInterval: defaultCollectionInterval, }, HTTPClientSettings: confighttp.HTTPClientSettings{ @@ -66,7 +66,7 @@ var errConfigNotES = errors.New("config was not an elasticsearch receiver config func createMetricsReceiver( _ context.Context, params component.ReceiverCreateSettings, - rConf config.Receiver, + rConf component.ReceiverConfig, consumer consumer.Metrics, ) (component.MetricsReceiver, error) { c, ok := rConf.(*Config) diff --git a/receiver/elasticsearchreceiver/go.mod b/receiver/elasticsearchreceiver/go.mod index 3c3113f8f46b..c862dc1f6b0b 100644 --- a/receiver/elasticsearchreceiver/go.mod +++ b/receiver/elasticsearchreceiver/go.mod @@ -4,7 +4,7 @@ go 1.18 require ( github.com/stretchr/testify v1.8.1 - go.opentelemetry.io/collector v0.63.2-0.20221104003159-6b27644724d8 + go.opentelemetry.io/collector v0.63.2-0.20221108014805-0b08d5316426 go.uber.org/multierr v1.8.0 go.uber.org/zap v1.23.0 ) @@ -57,7 +57,7 @@ require ( github.com/rs/cors v1.8.2 // indirect github.com/sirupsen/logrus v1.8.1 // indirect github.com/stretchr/objx v0.5.0 // indirect - go.opencensus.io v0.23.0 // indirect + go.opencensus.io v0.24.0 // 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 @@ -73,7 +73,7 @@ require ( require ( github.com/open-telemetry/opentelemetry-collector-contrib/internal/scrapertest v0.63.0 - go.opentelemetry.io/collector/pdata v0.63.2-0.20221104003159-6b27644724d8 + go.opentelemetry.io/collector/pdata v0.63.2-0.20221108014805-0b08d5316426 golang.org/x/net v0.0.0-20220617184016-355a448f1bc9 // indirect ) diff --git a/receiver/elasticsearchreceiver/go.sum b/receiver/elasticsearchreceiver/go.sum index a46f95bdd318..f89c0e54e1d2 100644 --- a/receiver/elasticsearchreceiver/go.sum +++ b/receiver/elasticsearchreceiver/go.sum @@ -693,7 +693,7 @@ github.com/prometheus/client_golang v1.0.0/go.mod h1:db9x61etRT2tGnBNRi70OPL5Fsn github.com/prometheus/client_golang v1.1.0/go.mod h1:I1FGZT9+L76gKKOs5djB6ezCbFQP1xR9D75/vuwEF3g= github.com/prometheus/client_golang v1.7.1/go.mod h1:PY5Wy2awLA44sXw4AOSfFBetzPP4j5+D6mVACh+pe2M= github.com/prometheus/client_golang v1.11.1/go.mod h1:Z6t4BnS23TR94PD6BsDNk8yVqroYurpAkEiz0P2BEV0= -github.com/prometheus/client_golang v1.13.0 h1:b71QUfeo5M8gq2+evJdTPfZhYMAU0uKPkyPJ7TPsloU= +github.com/prometheus/client_golang v1.13.1 h1:3gMjIY2+/hzmqhtUC/aQNYldJA6DtH3CgQvwS+02K1c= github.com/prometheus/client_model v0.0.0-20171117100541-99fa1f4be8e5/go.mod h1:MbSGuTsp3dbXC40dX6PRTWyKYBIrTGTE9sqQNg2J8bo= github.com/prometheus/client_model v0.0.0-20180712105110-5c3871d89910/go.mod h1:MbSGuTsp3dbXC40dX6PRTWyKYBIrTGTE9sqQNg2J8bo= github.com/prometheus/client_model v0.0.0-20190129233127-fd36f4220a90/go.mod h1:xMI15A0UPsDsEKsMN9yxemIoYk6Tm2C1GtYGdfGttqA= @@ -830,12 +830,12 @@ go.opencensus.io v0.21.0/go.mod h1:mSImk1erAIZhrmZN+AvHh14ztQfjbGwt4TtuofqLduU= 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.23.0 h1:gqCw0LfLxScz8irSi8exQc7fyQ0fKQU/qnC/X8+V/1M= -go.opencensus.io v0.23.0/go.mod h1:XItmlyltB5F7CS4xOC1DcqMoFqwtC6OG2xF7mCv7P7E= -go.opentelemetry.io/collector v0.63.2-0.20221104003159-6b27644724d8 h1:rOT5HzXXfSISc6FiH012zH2/EFjp37UXfjEqj5BpkWQ= -go.opentelemetry.io/collector v0.63.2-0.20221104003159-6b27644724d8/go.mod h1:JVmeZXugK4ondC6KQgrHTHWiF4JttpG5k6dWPMt62+k= -go.opentelemetry.io/collector/pdata v0.63.2-0.20221104003159-6b27644724d8 h1:7xeTQjfsOm9eogQeIxjSEhlik9qsbBGsnmkQHfyKaRE= -go.opentelemetry.io/collector/pdata v0.63.2-0.20221104003159-6b27644724d8/go.mod h1:IzvXUGQml2mrnvdb8zIlEW3qQs9oFLdD2hLwJdZ+pek= +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.63.2-0.20221108014805-0b08d5316426 h1:z/wLTMh7/vNxcFUDa5uG7/IPE3tYx6pzCWPV41ghyV8= +go.opentelemetry.io/collector v0.63.2-0.20221108014805-0b08d5316426/go.mod h1:+Zb70q0Rq17dA9FcHTiTjW6g96lvJ8kAZ0c+eWNkAv0= +go.opentelemetry.io/collector/pdata v0.63.2-0.20221108014805-0b08d5316426 h1:wKDpgP0Tx/gWI2SgDGAY1OTSeihhDivbbRqFR79IGTc= +go.opentelemetry.io/collector/pdata v0.63.2-0.20221108014805-0b08d5316426/go.mod h1:IzvXUGQml2mrnvdb8zIlEW3qQs9oFLdD2hLwJdZ+pek= 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.go b/receiver/expvarreceiver/config.go index cc30a816aba3..89bfe3c7c789 100644 --- a/receiver/expvarreceiver/config.go +++ b/receiver/expvarreceiver/config.go @@ -18,7 +18,7 @@ import ( "fmt" "net/url" - "go.opentelemetry.io/collector/config" + "go.opentelemetry.io/collector/component" "go.opentelemetry.io/collector/config/confighttp" "go.opentelemetry.io/collector/receiver/scraperhelper" @@ -31,7 +31,7 @@ type Config struct { MetricsConfig metadata.MetricsSettings `mapstructure:"metrics"` } -var _ config.Receiver = (*Config)(nil) +var _ component.ReceiverConfig = (*Config)(nil) func (c *Config) Validate() error { u, err := url.Parse(c.Endpoint) diff --git a/receiver/expvarreceiver/config_test.go b/receiver/expvarreceiver/config_test.go index 196102b43ad2..da182be93c30 100644 --- a/receiver/expvarreceiver/config_test.go +++ b/receiver/expvarreceiver/config_test.go @@ -23,6 +23,7 @@ import ( "github.com/google/go-cmp/cmp/cmpopts" "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" + "go.opentelemetry.io/collector/component" "go.opentelemetry.io/collector/config" "go.opentelemetry.io/collector/config/confighttp" "go.opentelemetry.io/collector/confmap/confmaptest" @@ -40,19 +41,19 @@ func TestLoadConfig(t *testing.T) { metricCfg.ProcessRuntimeMemstatsMallocs.Enabled = false tests := []struct { - id config.ComponentID - expected config.Receiver + id component.ID + expected component.ReceiverConfig errorMessage string }{ { - id: config.NewComponentIDWithName(typeStr, "default"), + id: component.NewIDWithName(typeStr, "default"), expected: factory.CreateDefaultConfig(), }, { - id: config.NewComponentIDWithName(typeStr, "custom"), + id: component.NewIDWithName(typeStr, "custom"), expected: &Config{ ScraperControllerSettings: scraperhelper.ScraperControllerSettings{ - ReceiverSettings: config.NewReceiverSettings(config.NewComponentID(typeStr)), + ReceiverSettings: config.NewReceiverSettings(component.NewID(typeStr)), CollectionInterval: 30 * time.Second, }, HTTPClientSettings: confighttp.HTTPClientSettings{ @@ -63,15 +64,15 @@ func TestLoadConfig(t *testing.T) { }, }, { - id: config.NewComponentIDWithName(typeStr, "bad_schemeless_endpoint"), + id: component.NewIDWithName(typeStr, "bad_schemeless_endpoint"), errorMessage: "scheme must be 'http' or 'https', but was 'localhost'", }, { - id: config.NewComponentIDWithName(typeStr, "bad_hostless_endpoint"), + id: component.NewIDWithName(typeStr, "bad_hostless_endpoint"), errorMessage: "host not found in HTTP endpoint", }, { - id: config.NewComponentIDWithName(typeStr, "bad_invalid_url"), + id: component.NewIDWithName(typeStr, "bad_invalid_url"), errorMessage: "endpoint is not a valid URL: parse \"#$%^&*()_\": invalid URL escape \"%^&\"", }, } @@ -86,7 +87,7 @@ func TestLoadConfig(t *testing.T) { sub, err := cm.Sub(tt.id.String()) require.NoError(t, err) - require.NoError(t, config.UnmarshalReceiver(sub, cfg)) + require.NoError(t, component.UnmarshalReceiverConfig(sub, cfg)) if tt.expected == nil { assert.EqualError(t, cfg.Validate(), tt.errorMessage) diff --git a/receiver/expvarreceiver/factory.go b/receiver/expvarreceiver/factory.go index cdd37761f56d..4de1fc01acaa 100644 --- a/receiver/expvarreceiver/factory.go +++ b/receiver/expvarreceiver/factory.go @@ -19,7 +19,6 @@ import ( "time" "go.opentelemetry.io/collector/component" - "go.opentelemetry.io/collector/config" "go.opentelemetry.io/collector/config/confighttp" "go.opentelemetry.io/collector/consumer" "go.opentelemetry.io/collector/receiver/scraperhelper" @@ -45,7 +44,7 @@ func NewFactory() component.ReceiverFactory { func newMetricsReceiver( _ context.Context, set component.ReceiverCreateSettings, - rCfg config.Receiver, + rCfg component.ReceiverConfig, consumer consumer.Metrics, ) (component.MetricsReceiver, error) { cfg := rCfg.(*Config) @@ -68,7 +67,7 @@ func newMetricsReceiver( ) } -func newDefaultConfig() config.Receiver { +func newDefaultConfig() component.ReceiverConfig { return &Config{ ScraperControllerSettings: scraperhelper.NewDefaultScraperControllerSettings(typeStr), HTTPClientSettings: confighttp.HTTPClientSettings{ diff --git a/receiver/expvarreceiver/factory_test.go b/receiver/expvarreceiver/factory_test.go index ab8007e6ae78..159b635b80da 100644 --- a/receiver/expvarreceiver/factory_test.go +++ b/receiver/expvarreceiver/factory_test.go @@ -22,7 +22,6 @@ import ( "github.com/stretchr/testify/require" "go.opentelemetry.io/collector/component/componenttest" "go.opentelemetry.io/collector/config/confighttp" - "go.opentelemetry.io/collector/config/configtest" "go.opentelemetry.io/collector/consumer/consumertest" "go.opentelemetry.io/collector/receiver/scraperhelper" @@ -37,7 +36,7 @@ func TestType(t *testing.T) { func TestValidConfig(t *testing.T) { factory := NewFactory() - err := configtest.CheckConfigStruct(factory.CreateDefaultConfig()) + err := componenttest.CheckConfigStruct(factory.CreateDefaultConfig()) require.NoError(t, err) } diff --git a/receiver/expvarreceiver/go.mod b/receiver/expvarreceiver/go.mod index 671bae0044d1..82b00464762e 100644 --- a/receiver/expvarreceiver/go.mod +++ b/receiver/expvarreceiver/go.mod @@ -6,8 +6,8 @@ require ( github.com/google/go-cmp v0.5.9 github.com/open-telemetry/opentelemetry-collector-contrib/internal/scrapertest v0.63.0 github.com/stretchr/testify v1.8.1 - go.opentelemetry.io/collector v0.63.2-0.20221104003159-6b27644724d8 - go.opentelemetry.io/collector/pdata v0.63.2-0.20221104003159-6b27644724d8 + go.opentelemetry.io/collector v0.63.2-0.20221108014805-0b08d5316426 + go.opentelemetry.io/collector/pdata v0.63.2-0.20221108014805-0b08d5316426 ) require ( @@ -29,7 +29,7 @@ require ( github.com/pmezard/go-difflib v1.0.0 // indirect github.com/rogpeppe/go-internal v1.8.1 // indirect github.com/rs/cors v1.8.2 // indirect - go.opencensus.io v0.23.0 // indirect + go.opencensus.io v0.24.0 // 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 be88cf79d5b1..1ab85b310a47 100644 --- a/receiver/expvarreceiver/go.sum +++ b/receiver/expvarreceiver/go.sum @@ -238,7 +238,7 @@ github.com/prometheus/client_golang v0.9.1/go.mod h1:7SWBe2y4D6OKWSNQJUaRYU/AaXP github.com/prometheus/client_golang v1.0.0/go.mod h1:db9x61etRT2tGnBNRi70OPL5FsnadC4Ky3P0J6CfImo= github.com/prometheus/client_golang v1.7.1/go.mod h1:PY5Wy2awLA44sXw4AOSfFBetzPP4j5+D6mVACh+pe2M= github.com/prometheus/client_golang v1.11.1/go.mod h1:Z6t4BnS23TR94PD6BsDNk8yVqroYurpAkEiz0P2BEV0= -github.com/prometheus/client_golang v1.13.0 h1:b71QUfeo5M8gq2+evJdTPfZhYMAU0uKPkyPJ7TPsloU= +github.com/prometheus/client_golang v1.13.1 h1:3gMjIY2+/hzmqhtUC/aQNYldJA6DtH3CgQvwS+02K1c= github.com/prometheus/client_model v0.0.0-20180712105110-5c3871d89910/go.mod h1:MbSGuTsp3dbXC40dX6PRTWyKYBIrTGTE9sqQNg2J8bo= github.com/prometheus/client_model v0.0.0-20190129233127-fd36f4220a90/go.mod h1:xMI15A0UPsDsEKsMN9yxemIoYk6Tm2C1GtYGdfGttqA= github.com/prometheus/client_model v0.0.0-20190812154241-14fe0d1b01d4/go.mod h1:xMI15A0UPsDsEKsMN9yxemIoYk6Tm2C1GtYGdfGttqA= @@ -278,7 +278,6 @@ github.com/stretchr/testify v1.2.2/go.mod h1:a8OnRcib4nhh0OaRAV+Yts87kKdq0PP7pXf github.com/stretchr/testify v1.3.0/go.mod h1:M5WIy9Dh21IEIfnGCwXGc5bZfKNJtfHm1UVUgZn+9EI= github.com/stretchr/testify v1.4.0/go.mod h1:j7eGeouHqKxXV5pUuKE4zz7dFj8WfuZ+81PSLYec5m4= github.com/stretchr/testify v1.5.1/go.mod h1:5W2xD1RspED5o8YsWQXVCued0rvSQ+mT+I5cxcmMvtA= -github.com/stretchr/testify v1.6.1/go.mod h1:6Fq8oRcR53rry900zMqJjRRixrwX3KX962/h/Wwjteg= github.com/stretchr/testify v1.7.0/go.mod h1:6Fq8oRcR53rry900zMqJjRRixrwX3KX962/h/Wwjteg= github.com/stretchr/testify v1.7.1/go.mod h1:6Fq8oRcR53rry900zMqJjRRixrwX3KX962/h/Wwjteg= github.com/stretchr/testify v1.8.0/go.mod h1:yNjHg4UonilssWZ8iaSj1OCr/vHnekPRkoO+kdMU+MU= @@ -290,12 +289,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.opencensus.io v0.23.0 h1:gqCw0LfLxScz8irSi8exQc7fyQ0fKQU/qnC/X8+V/1M= -go.opencensus.io v0.23.0/go.mod h1:XItmlyltB5F7CS4xOC1DcqMoFqwtC6OG2xF7mCv7P7E= -go.opentelemetry.io/collector v0.63.2-0.20221104003159-6b27644724d8 h1:rOT5HzXXfSISc6FiH012zH2/EFjp37UXfjEqj5BpkWQ= -go.opentelemetry.io/collector v0.63.2-0.20221104003159-6b27644724d8/go.mod h1:JVmeZXugK4ondC6KQgrHTHWiF4JttpG5k6dWPMt62+k= -go.opentelemetry.io/collector/pdata v0.63.2-0.20221104003159-6b27644724d8 h1:7xeTQjfsOm9eogQeIxjSEhlik9qsbBGsnmkQHfyKaRE= -go.opentelemetry.io/collector/pdata v0.63.2-0.20221104003159-6b27644724d8/go.mod h1:IzvXUGQml2mrnvdb8zIlEW3qQs9oFLdD2hLwJdZ+pek= +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.63.2-0.20221108014805-0b08d5316426 h1:z/wLTMh7/vNxcFUDa5uG7/IPE3tYx6pzCWPV41ghyV8= +go.opentelemetry.io/collector v0.63.2-0.20221108014805-0b08d5316426/go.mod h1:+Zb70q0Rq17dA9FcHTiTjW6g96lvJ8kAZ0c+eWNkAv0= +go.opentelemetry.io/collector/pdata v0.63.2-0.20221108014805-0b08d5316426 h1:wKDpgP0Tx/gWI2SgDGAY1OTSeihhDivbbRqFR79IGTc= +go.opentelemetry.io/collector/pdata v0.63.2-0.20221108014805-0b08d5316426/go.mod h1:IzvXUGQml2mrnvdb8zIlEW3qQs9oFLdD2hLwJdZ+pek= 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.go b/receiver/filelogreceiver/filelog.go index 1c130098931e..c174aa1e6373 100644 --- a/receiver/filelogreceiver/filelog.go +++ b/receiver/filelogreceiver/filelog.go @@ -38,18 +38,18 @@ func NewFactory() component.ReceiverFactory { type ReceiverType struct{} // Type is the receiver type -func (f ReceiverType) Type() config.Type { +func (f ReceiverType) Type() component.Type { return typeStr } // CreateDefaultConfig creates a config with type and version -func (f ReceiverType) CreateDefaultConfig() config.Receiver { +func (f ReceiverType) CreateDefaultConfig() component.ReceiverConfig { return createDefaultConfig() } func createDefaultConfig() *FileLogConfig { return &FileLogConfig{ BaseConfig: adapter.BaseConfig{ - ReceiverSettings: config.NewReceiverSettings(config.NewComponentID(typeStr)), + ReceiverSettings: config.NewReceiverSettings(component.NewID(typeStr)), Operators: []operator.Config{}, }, InputConfig: *file.NewConfig(), @@ -57,7 +57,7 @@ func createDefaultConfig() *FileLogConfig { } // BaseConfig gets the base config from config, for now -func (f ReceiverType) BaseConfig(cfg config.Receiver) adapter.BaseConfig { +func (f ReceiverType) BaseConfig(cfg component.ReceiverConfig) adapter.BaseConfig { return cfg.(*FileLogConfig).BaseConfig } @@ -68,6 +68,6 @@ type FileLogConfig struct { } // InputConfig unmarshals the input operator -func (f ReceiverType) InputConfig(cfg config.Receiver) operator.Config { +func (f ReceiverType) InputConfig(cfg component.ReceiverConfig) operator.Config { return operator.NewConfig(&cfg.(*FileLogConfig).InputConfig) } diff --git a/receiver/filelogreceiver/filelog_test.go b/receiver/filelogreceiver/filelog_test.go index 315f490639b4..fdef3ffe97bf 100644 --- a/receiver/filelogreceiver/filelog_test.go +++ b/receiver/filelogreceiver/filelog_test.go @@ -28,9 +28,9 @@ import ( "github.com/observiq/nanojack" "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" + "go.opentelemetry.io/collector/component" "go.opentelemetry.io/collector/component/componenttest" "go.opentelemetry.io/collector/config" - "go.opentelemetry.io/collector/config/configtest" "go.opentelemetry.io/collector/confmap/confmaptest" "go.opentelemetry.io/collector/consumer/consumertest" "go.opentelemetry.io/collector/pdata/plog" @@ -48,7 +48,7 @@ func TestDefaultConfig(t *testing.T) { factory := NewFactory() cfg := factory.CreateDefaultConfig() require.NotNil(t, cfg, "failed to create default config") - require.NoError(t, configtest.CheckConfigStruct(cfg)) + require.NoError(t, componenttest.CheckConfigStruct(cfg)) } func TestLoadConfig(t *testing.T) { @@ -58,9 +58,9 @@ func TestLoadConfig(t *testing.T) { factory := NewFactory() cfg := factory.CreateDefaultConfig() - sub, err := cm.Sub(config.NewComponentID("filelog").String()) + sub, err := cm.Sub(component.NewID("filelog").String()) require.NoError(t, err) - require.NoError(t, config.UnmarshalReceiver(sub, cfg)) + require.NoError(t, component.UnmarshalReceiverConfig(sub, cfg)) assert.NoError(t, cfg.Validate()) assert.Equal(t, testdataConfigYaml(), cfg) @@ -261,7 +261,7 @@ func expectNLogs(sink *consumertest.LogsSink, expected int) func() bool { func testdataConfigYaml() *FileLogConfig { return &FileLogConfig{ BaseConfig: adapter.BaseConfig{ - ReceiverSettings: config.NewReceiverSettings(config.NewComponentID(typeStr)), + ReceiverSettings: config.NewReceiverSettings(component.NewID(typeStr)), Operators: []operator.Config{ { Builder: func() *regex.Config { @@ -293,7 +293,7 @@ func testdataConfigYaml() *FileLogConfig { func rotationTestConfig(tempDir string) *FileLogConfig { return &FileLogConfig{ BaseConfig: adapter.BaseConfig{ - ReceiverSettings: config.NewReceiverSettings(config.NewComponentID(typeStr)), + ReceiverSettings: config.NewReceiverSettings(component.NewID(typeStr)), Operators: []operator.Config{ { Builder: func() *regex.Config { diff --git a/receiver/filelogreceiver/go.mod b/receiver/filelogreceiver/go.mod index 55a283fb819e..935e98e04fb3 100644 --- a/receiver/filelogreceiver/go.mod +++ b/receiver/filelogreceiver/go.mod @@ -7,8 +7,8 @@ require ( github.com/open-telemetry/opentelemetry-collector-contrib/extension/storage v0.63.0 github.com/open-telemetry/opentelemetry-collector-contrib/pkg/stanza v0.63.0 github.com/stretchr/testify v1.8.1 - go.opentelemetry.io/collector v0.63.2-0.20221104003159-6b27644724d8 - go.opentelemetry.io/collector/pdata v0.63.2-0.20221104003159-6b27644724d8 + go.opentelemetry.io/collector v0.63.2-0.20221108014805-0b08d5316426 + go.opentelemetry.io/collector/pdata v0.63.2-0.20221108014805-0b08d5316426 go.uber.org/zap v1.23.0 ) @@ -28,7 +28,7 @@ require ( github.com/observiq/ctimefmt v1.0.0 // indirect github.com/pmezard/go-difflib v1.0.0 // indirect github.com/rogpeppe/go-internal v1.8.1 // indirect - go.opencensus.io v0.23.0 // indirect + go.opencensus.io v0.24.0 // 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 058cac8ab5d0..4342b6150e20 100644 --- a/receiver/filelogreceiver/go.sum +++ b/receiver/filelogreceiver/go.sum @@ -246,7 +246,7 @@ github.com/prometheus/client_golang v0.9.1/go.mod h1:7SWBe2y4D6OKWSNQJUaRYU/AaXP github.com/prometheus/client_golang v1.0.0/go.mod h1:db9x61etRT2tGnBNRi70OPL5FsnadC4Ky3P0J6CfImo= github.com/prometheus/client_golang v1.7.1/go.mod h1:PY5Wy2awLA44sXw4AOSfFBetzPP4j5+D6mVACh+pe2M= github.com/prometheus/client_golang v1.11.1/go.mod h1:Z6t4BnS23TR94PD6BsDNk8yVqroYurpAkEiz0P2BEV0= -github.com/prometheus/client_golang v1.13.0 h1:b71QUfeo5M8gq2+evJdTPfZhYMAU0uKPkyPJ7TPsloU= +github.com/prometheus/client_golang v1.13.1 h1:3gMjIY2+/hzmqhtUC/aQNYldJA6DtH3CgQvwS+02K1c= github.com/prometheus/client_model v0.0.0-20180712105110-5c3871d89910/go.mod h1:MbSGuTsp3dbXC40dX6PRTWyKYBIrTGTE9sqQNg2J8bo= github.com/prometheus/client_model v0.0.0-20190129233127-fd36f4220a90/go.mod h1:xMI15A0UPsDsEKsMN9yxemIoYk6Tm2C1GtYGdfGttqA= github.com/prometheus/client_model v0.0.0-20190812154241-14fe0d1b01d4/go.mod h1:xMI15A0UPsDsEKsMN9yxemIoYk6Tm2C1GtYGdfGttqA= @@ -301,12 +301,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.opencensus.io v0.23.0 h1:gqCw0LfLxScz8irSi8exQc7fyQ0fKQU/qnC/X8+V/1M= -go.opencensus.io v0.23.0/go.mod h1:XItmlyltB5F7CS4xOC1DcqMoFqwtC6OG2xF7mCv7P7E= -go.opentelemetry.io/collector v0.63.2-0.20221104003159-6b27644724d8 h1:rOT5HzXXfSISc6FiH012zH2/EFjp37UXfjEqj5BpkWQ= -go.opentelemetry.io/collector v0.63.2-0.20221104003159-6b27644724d8/go.mod h1:JVmeZXugK4ondC6KQgrHTHWiF4JttpG5k6dWPMt62+k= -go.opentelemetry.io/collector/pdata v0.63.2-0.20221104003159-6b27644724d8 h1:7xeTQjfsOm9eogQeIxjSEhlik9qsbBGsnmkQHfyKaRE= -go.opentelemetry.io/collector/pdata v0.63.2-0.20221104003159-6b27644724d8/go.mod h1:IzvXUGQml2mrnvdb8zIlEW3qQs9oFLdD2hLwJdZ+pek= +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.63.2-0.20221108014805-0b08d5316426 h1:z/wLTMh7/vNxcFUDa5uG7/IPE3tYx6pzCWPV41ghyV8= +go.opentelemetry.io/collector v0.63.2-0.20221108014805-0b08d5316426/go.mod h1:+Zb70q0Rq17dA9FcHTiTjW6g96lvJ8kAZ0c+eWNkAv0= +go.opentelemetry.io/collector/pdata v0.63.2-0.20221108014805-0b08d5316426 h1:wKDpgP0Tx/gWI2SgDGAY1OTSeihhDivbbRqFR79IGTc= +go.opentelemetry.io/collector/pdata v0.63.2-0.20221108014805-0b08d5316426/go.mod h1:IzvXUGQml2mrnvdb8zIlEW3qQs9oFLdD2hLwJdZ+pek= 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/config_test.go b/receiver/flinkmetricsreceiver/config_test.go index aad31fc8bef4..518aa3c997ff 100644 --- a/receiver/flinkmetricsreceiver/config_test.go +++ b/receiver/flinkmetricsreceiver/config_test.go @@ -22,7 +22,7 @@ import ( "time" "github.com/stretchr/testify/require" - "go.opentelemetry.io/collector/config" + "go.opentelemetry.io/collector/component" "go.opentelemetry.io/collector/config/confighttp" "go.opentelemetry.io/collector/confmap/confmaptest" ) @@ -73,9 +73,9 @@ func TestLoadConfig(t *testing.T) { factory := NewFactory() cfg := factory.CreateDefaultConfig() - sub, err := cm.Sub(config.NewComponentIDWithName(typeStr, "").String()) + sub, err := cm.Sub(component.NewIDWithName(typeStr, "").String()) require.NoError(t, err) - require.NoError(t, config.UnmarshalReceiver(sub, cfg)) + require.NoError(t, component.UnmarshalReceiverConfig(sub, cfg)) expected := factory.CreateDefaultConfig().(*Config) expected.Endpoint = "http://localhost:8081" diff --git a/receiver/flinkmetricsreceiver/factory.go b/receiver/flinkmetricsreceiver/factory.go index 95cc1bcf0357..faa133122961 100644 --- a/receiver/flinkmetricsreceiver/factory.go +++ b/receiver/flinkmetricsreceiver/factory.go @@ -44,10 +44,10 @@ func NewFactory() component.ReceiverFactory { ) } -func createDefaultConfig() config.Receiver { +func createDefaultConfig() component.ReceiverConfig { return &Config{ ScraperControllerSettings: scraperhelper.ScraperControllerSettings{ - ReceiverSettings: config.NewReceiverSettings(config.NewComponentID(typeStr)), + ReceiverSettings: config.NewReceiverSettings(component.NewID(typeStr)), CollectionInterval: 10 * time.Second, }, HTTPClientSettings: confighttp.HTTPClientSettings{ @@ -61,7 +61,7 @@ func createDefaultConfig() config.Receiver { func createMetricsReceiver( _ context.Context, params component.ReceiverCreateSettings, - rConf config.Receiver, + rConf component.ReceiverConfig, consumer consumer.Metrics, ) (component.MetricsReceiver, error) { cfg, ok := rConf.(*Config) diff --git a/receiver/flinkmetricsreceiver/factory_test.go b/receiver/flinkmetricsreceiver/factory_test.go index e2b29148d229..83a0dc87081c 100644 --- a/receiver/flinkmetricsreceiver/factory_test.go +++ b/receiver/flinkmetricsreceiver/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/config" "go.opentelemetry.io/collector/config/confighttp" @@ -46,9 +47,9 @@ func TestNewFactory(t *testing.T) { testFunc: func(t *testing.T) { factory := NewFactory() - var expectedCfg config.Receiver = &Config{ + var expectedCfg component.ReceiverConfig = &Config{ ScraperControllerSettings: scraperhelper.ScraperControllerSettings{ - ReceiverSettings: config.NewReceiverSettings(config.NewComponentID(typeStr)), + ReceiverSettings: config.NewReceiverSettings(component.NewID(typeStr)), CollectionInterval: 10 * time.Second, }, HTTPClientSettings: confighttp.HTTPClientSettings{ diff --git a/receiver/flinkmetricsreceiver/go.mod b/receiver/flinkmetricsreceiver/go.mod index b32fcac08959..700bb1d40504 100644 --- a/receiver/flinkmetricsreceiver/go.mod +++ b/receiver/flinkmetricsreceiver/go.mod @@ -6,8 +6,8 @@ require ( github.com/open-telemetry/opentelemetry-collector-contrib/internal/scrapertest v0.63.0 github.com/stretchr/testify v1.8.1 github.com/testcontainers/testcontainers-go v0.15.0 - go.opentelemetry.io/collector v0.63.2-0.20221104003159-6b27644724d8 - go.opentelemetry.io/collector/pdata v0.63.2-0.20221104003159-6b27644724d8 + go.opentelemetry.io/collector v0.63.2-0.20221108014805-0b08d5316426 + go.opentelemetry.io/collector/pdata v0.63.2-0.20221108014805-0b08d5316426 go.uber.org/zap v1.23.0 ) @@ -52,7 +52,7 @@ require ( github.com/rs/cors v1.8.2 // indirect github.com/sirupsen/logrus v1.8.1 // indirect github.com/stretchr/objx v0.5.0 // indirect - go.opencensus.io v0.23.0 // indirect + go.opencensus.io v0.24.0 // 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 c8b9782e7401..5bfcabd27a64 100644 --- a/receiver/flinkmetricsreceiver/go.sum +++ b/receiver/flinkmetricsreceiver/go.sum @@ -689,7 +689,7 @@ github.com/prometheus/client_golang v1.0.0/go.mod h1:db9x61etRT2tGnBNRi70OPL5Fsn github.com/prometheus/client_golang v1.1.0/go.mod h1:I1FGZT9+L76gKKOs5djB6ezCbFQP1xR9D75/vuwEF3g= github.com/prometheus/client_golang v1.7.1/go.mod h1:PY5Wy2awLA44sXw4AOSfFBetzPP4j5+D6mVACh+pe2M= github.com/prometheus/client_golang v1.11.1/go.mod h1:Z6t4BnS23TR94PD6BsDNk8yVqroYurpAkEiz0P2BEV0= -github.com/prometheus/client_golang v1.13.0 h1:b71QUfeo5M8gq2+evJdTPfZhYMAU0uKPkyPJ7TPsloU= +github.com/prometheus/client_golang v1.13.1 h1:3gMjIY2+/hzmqhtUC/aQNYldJA6DtH3CgQvwS+02K1c= github.com/prometheus/client_model v0.0.0-20171117100541-99fa1f4be8e5/go.mod h1:MbSGuTsp3dbXC40dX6PRTWyKYBIrTGTE9sqQNg2J8bo= github.com/prometheus/client_model v0.0.0-20180712105110-5c3871d89910/go.mod h1:MbSGuTsp3dbXC40dX6PRTWyKYBIrTGTE9sqQNg2J8bo= github.com/prometheus/client_model v0.0.0-20190129233127-fd36f4220a90/go.mod h1:xMI15A0UPsDsEKsMN9yxemIoYk6Tm2C1GtYGdfGttqA= @@ -826,12 +826,12 @@ go.opencensus.io v0.21.0/go.mod h1:mSImk1erAIZhrmZN+AvHh14ztQfjbGwt4TtuofqLduU= 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.23.0 h1:gqCw0LfLxScz8irSi8exQc7fyQ0fKQU/qnC/X8+V/1M= -go.opencensus.io v0.23.0/go.mod h1:XItmlyltB5F7CS4xOC1DcqMoFqwtC6OG2xF7mCv7P7E= -go.opentelemetry.io/collector v0.63.2-0.20221104003159-6b27644724d8 h1:rOT5HzXXfSISc6FiH012zH2/EFjp37UXfjEqj5BpkWQ= -go.opentelemetry.io/collector v0.63.2-0.20221104003159-6b27644724d8/go.mod h1:JVmeZXugK4ondC6KQgrHTHWiF4JttpG5k6dWPMt62+k= -go.opentelemetry.io/collector/pdata v0.63.2-0.20221104003159-6b27644724d8 h1:7xeTQjfsOm9eogQeIxjSEhlik9qsbBGsnmkQHfyKaRE= -go.opentelemetry.io/collector/pdata v0.63.2-0.20221104003159-6b27644724d8/go.mod h1:IzvXUGQml2mrnvdb8zIlEW3qQs9oFLdD2hLwJdZ+pek= +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.63.2-0.20221108014805-0b08d5316426 h1:z/wLTMh7/vNxcFUDa5uG7/IPE3tYx6pzCWPV41ghyV8= +go.opentelemetry.io/collector v0.63.2-0.20221108014805-0b08d5316426/go.mod h1:+Zb70q0Rq17dA9FcHTiTjW6g96lvJ8kAZ0c+eWNkAv0= +go.opentelemetry.io/collector/pdata v0.63.2-0.20221108014805-0b08d5316426 h1:wKDpgP0Tx/gWI2SgDGAY1OTSeihhDivbbRqFR79IGTc= +go.opentelemetry.io/collector/pdata v0.63.2-0.20221108014805-0b08d5316426/go.mod h1:IzvXUGQml2mrnvdb8zIlEW3qQs9oFLdD2hLwJdZ+pek= 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.go b/receiver/fluentforwardreceiver/config.go index 564a8805ddc0..a42e60fcfb42 100644 --- a/receiver/fluentforwardreceiver/config.go +++ b/receiver/fluentforwardreceiver/config.go @@ -14,9 +14,7 @@ package fluentforwardreceiver // import "github.com/open-telemetry/opentelemetry-collector-contrib/receiver/fluentforwardreceiver" -import "go.opentelemetry.io/collector/config" - -// Config defines configuration for the fluentforward receiver. +import "go.opentelemetry.io/collector/config" // Config defines configuration for the fluentforward receiver. type Config struct { config.ReceiverSettings `mapstructure:",squash"` // squash ensures fields are correctly decoded in embedded struct diff --git a/receiver/fluentforwardreceiver/config_test.go b/receiver/fluentforwardreceiver/config_test.go index 0ef91327e1a6..cfdfd31ca648 100644 --- a/receiver/fluentforwardreceiver/config_test.go +++ b/receiver/fluentforwardreceiver/config_test.go @@ -20,7 +20,7 @@ import ( "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" - "go.opentelemetry.io/collector/config" + "go.opentelemetry.io/collector/component" "go.opentelemetry.io/collector/confmap/confmaptest" ) @@ -31,9 +31,9 @@ func TestLoadConfig(t *testing.T) { factory := NewFactory() cfg := factory.CreateDefaultConfig() - sub, err := cm.Sub(config.NewComponentID("fluentforward").String()) + sub, err := cm.Sub(component.NewID("fluentforward").String()) require.NoError(t, err) - require.NoError(t, config.UnmarshalReceiver(sub, cfg)) + require.NoError(t, component.UnmarshalReceiverConfig(sub, cfg)) assert.NoError(t, cfg.Validate()) assert.Equal(t, factory.CreateDefaultConfig(), cfg) diff --git a/receiver/fluentforwardreceiver/factory.go b/receiver/fluentforwardreceiver/factory.go index 63dd8c2f3533..a6d61530ac98 100644 --- a/receiver/fluentforwardreceiver/factory.go +++ b/receiver/fluentforwardreceiver/factory.go @@ -37,16 +37,16 @@ func NewFactory() component.ReceiverFactory { component.WithLogsReceiver(createLogsReceiver, stability)) } -func createDefaultConfig() config.Receiver { +func createDefaultConfig() component.ReceiverConfig { return &Config{ - ReceiverSettings: config.NewReceiverSettings(config.NewComponentID(typeStr)), + ReceiverSettings: config.NewReceiverSettings(component.NewID(typeStr)), } } func createLogsReceiver( _ context.Context, params component.ReceiverCreateSettings, - cfg config.Receiver, + cfg component.ReceiverConfig, consumer consumer.Logs, ) (component.LogsReceiver, error) { diff --git a/receiver/fluentforwardreceiver/factory_test.go b/receiver/fluentforwardreceiver/factory_test.go index 80835fc3f041..91ba1f846936 100644 --- a/receiver/fluentforwardreceiver/factory_test.go +++ b/receiver/fluentforwardreceiver/factory_test.go @@ -20,9 +20,8 @@ import ( "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" + "go.opentelemetry.io/collector/component" "go.opentelemetry.io/collector/component/componenttest" - "go.opentelemetry.io/collector/config" - "go.opentelemetry.io/collector/config/configtest" "go.opentelemetry.io/collector/consumer/consumertest" ) @@ -30,7 +29,7 @@ func TestCreateDefaultConfig(t *testing.T) { factory := NewFactory() cfg := factory.CreateDefaultConfig() assert.NotNil(t, cfg, "failed to create default config") - assert.NoError(t, configtest.CheckConfigStruct(cfg)) + assert.NoError(t, componenttest.CheckConfigStruct(cfg)) } func TestCreateReceiver(t *testing.T) { @@ -38,7 +37,7 @@ func TestCreateReceiver(t *testing.T) { cfg := factory.CreateDefaultConfig().(*Config) cfg.ListenAddress = "localhost:0" // Endpoint is required, not going to be used here. - require.Equal(t, config.Type("fluentforward"), factory.Type()) + require.Equal(t, component.Type("fluentforward"), factory.Type()) tReceiver, err := factory.CreateLogsReceiver(context.Background(), componenttest.NewNopReceiverCreateSettings(), cfg, consumertest.NewNop()) assert.Nil(t, err, "receiver creation failed") diff --git a/receiver/fluentforwardreceiver/go.mod b/receiver/fluentforwardreceiver/go.mod index 268112faef22..ae1ae4891fbd 100644 --- a/receiver/fluentforwardreceiver/go.mod +++ b/receiver/fluentforwardreceiver/go.mod @@ -5,9 +5,9 @@ go 1.18 require ( github.com/stretchr/testify v1.8.1 github.com/tinylib/msgp v1.1.6 - go.opencensus.io v0.23.0 - go.opentelemetry.io/collector v0.63.2-0.20221104003159-6b27644724d8 - go.opentelemetry.io/collector/pdata v0.63.2-0.20221104003159-6b27644724d8 + go.opencensus.io v0.24.0 + go.opentelemetry.io/collector v0.63.2-0.20221108014805-0b08d5316426 + go.opentelemetry.io/collector/pdata v0.63.2-0.20221108014805-0b08d5316426 go.uber.org/zap v1.23.0 ) diff --git a/receiver/fluentforwardreceiver/go.sum b/receiver/fluentforwardreceiver/go.sum index 745679ffb350..43331cad0095 100644 --- a/receiver/fluentforwardreceiver/go.sum +++ b/receiver/fluentforwardreceiver/go.sum @@ -259,7 +259,6 @@ github.com/stretchr/testify v1.2.2/go.mod h1:a8OnRcib4nhh0OaRAV+Yts87kKdq0PP7pXf github.com/stretchr/testify v1.3.0/go.mod h1:M5WIy9Dh21IEIfnGCwXGc5bZfKNJtfHm1UVUgZn+9EI= github.com/stretchr/testify v1.4.0/go.mod h1:j7eGeouHqKxXV5pUuKE4zz7dFj8WfuZ+81PSLYec5m4= github.com/stretchr/testify v1.5.1/go.mod h1:5W2xD1RspED5o8YsWQXVCued0rvSQ+mT+I5cxcmMvtA= -github.com/stretchr/testify v1.6.1/go.mod h1:6Fq8oRcR53rry900zMqJjRRixrwX3KX962/h/Wwjteg= github.com/stretchr/testify v1.7.0/go.mod h1:6Fq8oRcR53rry900zMqJjRRixrwX3KX962/h/Wwjteg= github.com/stretchr/testify v1.7.1/go.mod h1:6Fq8oRcR53rry900zMqJjRRixrwX3KX962/h/Wwjteg= github.com/stretchr/testify v1.8.0/go.mod h1:yNjHg4UonilssWZ8iaSj1OCr/vHnekPRkoO+kdMU+MU= @@ -273,12 +272,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.opencensus.io v0.23.0 h1:gqCw0LfLxScz8irSi8exQc7fyQ0fKQU/qnC/X8+V/1M= -go.opencensus.io v0.23.0/go.mod h1:XItmlyltB5F7CS4xOC1DcqMoFqwtC6OG2xF7mCv7P7E= -go.opentelemetry.io/collector v0.63.2-0.20221104003159-6b27644724d8 h1:rOT5HzXXfSISc6FiH012zH2/EFjp37UXfjEqj5BpkWQ= -go.opentelemetry.io/collector v0.63.2-0.20221104003159-6b27644724d8/go.mod h1:JVmeZXugK4ondC6KQgrHTHWiF4JttpG5k6dWPMt62+k= -go.opentelemetry.io/collector/pdata v0.63.2-0.20221104003159-6b27644724d8 h1:7xeTQjfsOm9eogQeIxjSEhlik9qsbBGsnmkQHfyKaRE= -go.opentelemetry.io/collector/pdata v0.63.2-0.20221104003159-6b27644724d8/go.mod h1:IzvXUGQml2mrnvdb8zIlEW3qQs9oFLdD2hLwJdZ+pek= +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.63.2-0.20221108014805-0b08d5316426 h1:z/wLTMh7/vNxcFUDa5uG7/IPE3tYx6pzCWPV41ghyV8= +go.opentelemetry.io/collector v0.63.2-0.20221108014805-0b08d5316426/go.mod h1:+Zb70q0Rq17dA9FcHTiTjW6g96lvJ8kAZ0c+eWNkAv0= +go.opentelemetry.io/collector/pdata v0.63.2-0.20221108014805-0b08d5316426 h1:wKDpgP0Tx/gWI2SgDGAY1OTSeihhDivbbRqFR79IGTc= +go.opentelemetry.io/collector/pdata v0.63.2-0.20221108014805-0b08d5316426/go.mod h1:IzvXUGQml2mrnvdb8zIlEW3qQs9oFLdD2hLwJdZ+pek= 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 92793eefec00..56978cc7e0ba 100644 --- a/receiver/googlecloudpubsubreceiver/config_test.go +++ b/receiver/googlecloudpubsubreceiver/config_test.go @@ -21,6 +21,7 @@ import ( "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" + "go.opentelemetry.io/collector/component" "go.opentelemetry.io/collector/config" "go.opentelemetry.io/collector/confmap/confmaptest" "go.opentelemetry.io/collector/exporter/exporterhelper" @@ -33,19 +34,19 @@ func TestLoadConfig(t *testing.T) { require.NoError(t, err) tests := []struct { - id config.ComponentID - expected config.Receiver + id component.ID + expected component.ReceiverConfig expectedErr error }{ { - id: config.NewComponentIDWithName(typeStr, ""), + id: component.NewIDWithName(typeStr, ""), expected: &Config{ - ReceiverSettings: config.NewReceiverSettings(config.NewComponentID(typeStr))}, + ReceiverSettings: config.NewReceiverSettings(component.NewID(typeStr))}, }, { - id: config.NewComponentIDWithName(typeStr, "customname"), + id: component.NewIDWithName(typeStr, "customname"), expected: &Config{ - ReceiverSettings: config.NewReceiverSettings(config.NewComponentID(typeStr)), + ReceiverSettings: config.NewReceiverSettings(component.NewID(typeStr)), ProjectID: "my-project", UserAgent: "opentelemetry-collector-contrib {{version}}", TimeoutSettings: exporterhelper.TimeoutSettings{ @@ -63,7 +64,7 @@ func TestLoadConfig(t *testing.T) { sub, err := cm.Sub(tt.id.String()) require.NoError(t, err) - require.NoError(t, config.UnmarshalReceiver(sub, cfg)) + require.NoError(t, component.UnmarshalReceiverConfig(sub, cfg)) assert.NoError(t, cfg.Validate()) assert.Equal(t, tt.expected, cfg) diff --git a/receiver/googlecloudpubsubreceiver/factory.go b/receiver/googlecloudpubsubreceiver/factory.go index 64ec386fd7b1..b47ffe196257 100644 --- a/receiver/googlecloudpubsubreceiver/factory.go +++ b/receiver/googlecloudpubsubreceiver/factory.go @@ -48,13 +48,13 @@ type pubsubReceiverFactory struct { receivers map[*Config]*pubsubReceiver } -func (factory *pubsubReceiverFactory) CreateDefaultConfig() config.Receiver { +func (factory *pubsubReceiverFactory) CreateDefaultConfig() component.ReceiverConfig { return &Config{ - ReceiverSettings: config.NewReceiverSettings(config.NewComponentID(typeStr)), + ReceiverSettings: config.NewReceiverSettings(component.NewID(typeStr)), } } -func (factory *pubsubReceiverFactory) ensureReceiver(params component.ReceiverCreateSettings, config config.Receiver) *pubsubReceiver { +func (factory *pubsubReceiverFactory) ensureReceiver(params component.ReceiverCreateSettings, config component.ReceiverConfig) *pubsubReceiver { receiver := factory.receivers[config.(*Config)] if receiver != nil { return receiver @@ -77,7 +77,7 @@ func (factory *pubsubReceiverFactory) ensureReceiver(params component.ReceiverCr func (factory *pubsubReceiverFactory) CreateTracesReceiver( _ context.Context, params component.ReceiverCreateSettings, - cfg config.Receiver, + cfg component.ReceiverConfig, consumer consumer.Traces) (component.TracesReceiver, error) { if consumer == nil { @@ -95,7 +95,7 @@ func (factory *pubsubReceiverFactory) CreateTracesReceiver( func (factory *pubsubReceiverFactory) CreateMetricsReceiver( _ context.Context, params component.ReceiverCreateSettings, - cfg config.Receiver, + cfg component.ReceiverConfig, consumer consumer.Metrics) (component.MetricsReceiver, error) { if consumer == nil { @@ -113,7 +113,7 @@ func (factory *pubsubReceiverFactory) CreateMetricsReceiver( func (factory *pubsubReceiverFactory) CreateLogsReceiver( _ context.Context, params component.ReceiverCreateSettings, - cfg config.Receiver, + cfg component.ReceiverConfig, consumer consumer.Logs) (component.LogsReceiver, error) { if consumer == nil { diff --git a/receiver/googlecloudpubsubreceiver/factory_test.go b/receiver/googlecloudpubsubreceiver/factory_test.go index 219f0fdc9b83..64ab6a92ce98 100644 --- a/receiver/googlecloudpubsubreceiver/factory_test.go +++ b/receiver/googlecloudpubsubreceiver/factory_test.go @@ -19,9 +19,8 @@ import ( "testing" "github.com/stretchr/testify/assert" + "go.opentelemetry.io/collector/component" "go.opentelemetry.io/collector/component/componenttest" - "go.opentelemetry.io/collector/config" - "go.opentelemetry.io/collector/config/configtest" "go.opentelemetry.io/collector/consumer/consumertest" ) @@ -29,12 +28,12 @@ func TestCreateDefaultConfig(t *testing.T) { factory := NewFactory() cfg := factory.CreateDefaultConfig() assert.NotNil(t, cfg, "failed to create default config") - assert.NoError(t, configtest.CheckConfigStruct(cfg)) + assert.NoError(t, componenttest.CheckConfigStruct(cfg)) } func TestType(t *testing.T) { factory := NewFactory() - assert.Equal(t, config.Type(typeStr), factory.Type()) + assert.Equal(t, component.Type(typeStr), factory.Type()) } func TestCreateTracesReceiver(t *testing.T) { diff --git a/receiver/googlecloudpubsubreceiver/go.mod b/receiver/googlecloudpubsubreceiver/go.mod index 7b3be4574abd..fc3b94efb855 100644 --- a/receiver/googlecloudpubsubreceiver/go.mod +++ b/receiver/googlecloudpubsubreceiver/go.mod @@ -5,8 +5,8 @@ go 1.18 require ( cloud.google.com/go/pubsub v1.26.0 github.com/stretchr/testify v1.8.1 - go.opentelemetry.io/collector v0.63.2-0.20221104003159-6b27644724d8 - go.opentelemetry.io/collector/pdata v0.63.2-0.20221104003159-6b27644724d8 + go.opentelemetry.io/collector v0.63.2-0.20221108014805-0b08d5316426 + go.opentelemetry.io/collector/pdata v0.63.2-0.20221108014805-0b08d5316426 go.uber.org/atomic v1.10.0 go.uber.org/zap v1.23.0 google.golang.org/api v0.102.0 @@ -39,7 +39,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.opencensus.io v0.23.0 // indirect + go.opencensus.io v0.24.0 // 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 797fb649f103..41f180e00012 100644 --- a/receiver/googlecloudpubsubreceiver/go.sum +++ b/receiver/googlecloudpubsubreceiver/go.sum @@ -245,7 +245,7 @@ github.com/prometheus/client_golang v0.9.1/go.mod h1:7SWBe2y4D6OKWSNQJUaRYU/AaXP github.com/prometheus/client_golang v1.0.0/go.mod h1:db9x61etRT2tGnBNRi70OPL5FsnadC4Ky3P0J6CfImo= github.com/prometheus/client_golang v1.7.1/go.mod h1:PY5Wy2awLA44sXw4AOSfFBetzPP4j5+D6mVACh+pe2M= github.com/prometheus/client_golang v1.11.1/go.mod h1:Z6t4BnS23TR94PD6BsDNk8yVqroYurpAkEiz0P2BEV0= -github.com/prometheus/client_golang v1.13.0 h1:b71QUfeo5M8gq2+evJdTPfZhYMAU0uKPkyPJ7TPsloU= +github.com/prometheus/client_golang v1.13.1 h1:3gMjIY2+/hzmqhtUC/aQNYldJA6DtH3CgQvwS+02K1c= github.com/prometheus/client_model v0.0.0-20180712105110-5c3871d89910/go.mod h1:MbSGuTsp3dbXC40dX6PRTWyKYBIrTGTE9sqQNg2J8bo= github.com/prometheus/client_model v0.0.0-20190129233127-fd36f4220a90/go.mod h1:xMI15A0UPsDsEKsMN9yxemIoYk6Tm2C1GtYGdfGttqA= github.com/prometheus/client_model v0.0.0-20190812154241-14fe0d1b01d4/go.mod h1:xMI15A0UPsDsEKsMN9yxemIoYk6Tm2C1GtYGdfGttqA= @@ -282,7 +282,6 @@ github.com/stretchr/testify v1.2.2/go.mod h1:a8OnRcib4nhh0OaRAV+Yts87kKdq0PP7pXf github.com/stretchr/testify v1.3.0/go.mod h1:M5WIy9Dh21IEIfnGCwXGc5bZfKNJtfHm1UVUgZn+9EI= github.com/stretchr/testify v1.4.0/go.mod h1:j7eGeouHqKxXV5pUuKE4zz7dFj8WfuZ+81PSLYec5m4= github.com/stretchr/testify v1.5.1/go.mod h1:5W2xD1RspED5o8YsWQXVCued0rvSQ+mT+I5cxcmMvtA= -github.com/stretchr/testify v1.6.1/go.mod h1:6Fq8oRcR53rry900zMqJjRRixrwX3KX962/h/Wwjteg= github.com/stretchr/testify v1.7.0/go.mod h1:6Fq8oRcR53rry900zMqJjRRixrwX3KX962/h/Wwjteg= github.com/stretchr/testify v1.7.1/go.mod h1:6Fq8oRcR53rry900zMqJjRRixrwX3KX962/h/Wwjteg= github.com/stretchr/testify v1.8.0/go.mod h1:yNjHg4UonilssWZ8iaSj1OCr/vHnekPRkoO+kdMU+MU= @@ -294,12 +293,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.opencensus.io v0.23.0 h1:gqCw0LfLxScz8irSi8exQc7fyQ0fKQU/qnC/X8+V/1M= -go.opencensus.io v0.23.0/go.mod h1:XItmlyltB5F7CS4xOC1DcqMoFqwtC6OG2xF7mCv7P7E= -go.opentelemetry.io/collector v0.63.2-0.20221104003159-6b27644724d8 h1:rOT5HzXXfSISc6FiH012zH2/EFjp37UXfjEqj5BpkWQ= -go.opentelemetry.io/collector v0.63.2-0.20221104003159-6b27644724d8/go.mod h1:JVmeZXugK4ondC6KQgrHTHWiF4JttpG5k6dWPMt62+k= -go.opentelemetry.io/collector/pdata v0.63.2-0.20221104003159-6b27644724d8 h1:7xeTQjfsOm9eogQeIxjSEhlik9qsbBGsnmkQHfyKaRE= -go.opentelemetry.io/collector/pdata v0.63.2-0.20221104003159-6b27644724d8/go.mod h1:IzvXUGQml2mrnvdb8zIlEW3qQs9oFLdD2hLwJdZ+pek= +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.63.2-0.20221108014805-0b08d5316426 h1:z/wLTMh7/vNxcFUDa5uG7/IPE3tYx6pzCWPV41ghyV8= +go.opentelemetry.io/collector v0.63.2-0.20221108014805-0b08d5316426/go.mod h1:+Zb70q0Rq17dA9FcHTiTjW6g96lvJ8kAZ0c+eWNkAv0= +go.opentelemetry.io/collector/pdata v0.63.2-0.20221108014805-0b08d5316426 h1:wKDpgP0Tx/gWI2SgDGAY1OTSeihhDivbbRqFR79IGTc= +go.opentelemetry.io/collector/pdata v0.63.2-0.20221108014805-0b08d5316426/go.mod h1:IzvXUGQml2mrnvdb8zIlEW3qQs9oFLdD2hLwJdZ+pek= 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/googlecloudpubsubreceiver/receiver_test.go b/receiver/googlecloudpubsubreceiver/receiver_test.go index 71ba6365d819..fb49924ae54e 100644 --- a/receiver/googlecloudpubsubreceiver/receiver_test.go +++ b/receiver/googlecloudpubsubreceiver/receiver_test.go @@ -21,8 +21,8 @@ import ( "cloud.google.com/go/pubsub/pstest" "github.com/stretchr/testify/assert" + "go.opentelemetry.io/collector/component" "go.opentelemetry.io/collector/component/componenttest" - "go.opentelemetry.io/collector/config" "go.opentelemetry.io/collector/consumer/consumertest" "go.opentelemetry.io/collector/exporter/exporterhelper" "go.opentelemetry.io/collector/obsreport" @@ -88,7 +88,7 @@ func TestReceiver(t *testing.T) { receiver := &pubsubReceiver{ logger: zap.New(core), obsrecv: obsreport.MustNewReceiver(obsreport.ReceiverSettings{ - ReceiverID: config.NewComponentID(typeStr), + ReceiverID: component.NewID(typeStr), Transport: reportTransport, LongLivedCtx: false, ReceiverCreateSettings: params, diff --git a/receiver/googlecloudspannerreceiver/config_test.go b/receiver/googlecloudspannerreceiver/config_test.go index 10d8fb69413a..b13195e892d0 100644 --- a/receiver/googlecloudspannerreceiver/config_test.go +++ b/receiver/googlecloudspannerreceiver/config_test.go @@ -21,6 +21,7 @@ import ( "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" + "go.opentelemetry.io/collector/component" "go.opentelemetry.io/collector/config" "go.opentelemetry.io/collector/confmap/confmaptest" "go.opentelemetry.io/collector/receiver/scraperhelper" @@ -36,14 +37,14 @@ func TestLoadConfig(t *testing.T) { factory := NewFactory() cfg := factory.CreateDefaultConfig() - sub, err := cm.Sub(config.NewComponentIDWithName(typeStr, "").String()) + sub, err := cm.Sub(component.NewIDWithName(typeStr, "").String()) require.NoError(t, err) - require.NoError(t, config.UnmarshalReceiver(sub, cfg)) + require.NoError(t, component.UnmarshalReceiverConfig(sub, cfg)) assert.Equal(t, &Config{ ScraperControllerSettings: scraperhelper.ScraperControllerSettings{ - ReceiverSettings: config.NewReceiverSettings(config.NewComponentID(typeStr)), + ReceiverSettings: config.NewReceiverSettings(component.NewID(typeStr)), CollectionInterval: 120 * time.Second, }, TopMetricsQueryMaxRows: 10, @@ -185,7 +186,7 @@ func TestValidateConfig(t *testing.T) { t.Run(name, func(t *testing.T) { cfg := &Config{ ScraperControllerSettings: scraperhelper.ScraperControllerSettings{ - ReceiverSettings: config.NewReceiverSettings(config.NewComponentID(typeStr)), + ReceiverSettings: config.NewReceiverSettings(component.NewID(typeStr)), CollectionInterval: testCase.collectionInterval, }, TopMetricsQueryMaxRows: testCase.topMetricsQueryMaxRows, diff --git a/receiver/googlecloudspannerreceiver/factory.go b/receiver/googlecloudspannerreceiver/factory.go index 301fca072ad0..c58db764531e 100644 --- a/receiver/googlecloudspannerreceiver/factory.go +++ b/receiver/googlecloudspannerreceiver/factory.go @@ -40,10 +40,10 @@ func NewFactory() component.ReceiverFactory { component.WithMetricsReceiver(createMetricsReceiver, stability)) } -func createDefaultConfig() config.Receiver { +func createDefaultConfig() component.ReceiverConfig { return &Config{ ScraperControllerSettings: scraperhelper.ScraperControllerSettings{ - ReceiverSettings: config.NewReceiverSettings(config.NewComponentID(typeStr)), + ReceiverSettings: config.NewReceiverSettings(component.NewID(typeStr)), CollectionInterval: defaultCollectionInterval, }, TopMetricsQueryMaxRows: defaultTopMetricsQueryMaxRows, @@ -54,7 +54,7 @@ func createDefaultConfig() config.Receiver { func createMetricsReceiver( _ context.Context, settings component.ReceiverCreateSettings, - baseCfg config.Receiver, + baseCfg component.ReceiverConfig, consumer consumer.Metrics, ) (component.MetricsReceiver, error) { diff --git a/receiver/googlecloudspannerreceiver/factory_test.go b/receiver/googlecloudspannerreceiver/factory_test.go index c4e2b817049f..5234508b8079 100644 --- a/receiver/googlecloudspannerreceiver/factory_test.go +++ b/receiver/googlecloudspannerreceiver/factory_test.go @@ -20,8 +20,8 @@ import ( "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" + "go.opentelemetry.io/collector/component" "go.opentelemetry.io/collector/component/componenttest" - "go.opentelemetry.io/collector/config" "go.opentelemetry.io/collector/consumer/consumertest" ) @@ -33,7 +33,7 @@ func TestCreateDefaultConfig(t *testing.T) { func TestType(t *testing.T) { factory := NewFactory() - assert.Equal(t, config.Type(typeStr), factory.Type()) + assert.Equal(t, component.Type(typeStr), factory.Type()) } func TestCreateMetricsReceiver(t *testing.T) { diff --git a/receiver/googlecloudspannerreceiver/go.mod b/receiver/googlecloudspannerreceiver/go.mod index 4fc5932069f6..3cec3c47a265 100644 --- a/receiver/googlecloudspannerreceiver/go.mod +++ b/receiver/googlecloudspannerreceiver/go.mod @@ -5,7 +5,7 @@ go 1.18 require ( cloud.google.com/go/spanner v1.40.0 github.com/stretchr/testify v1.8.1 - go.opentelemetry.io/collector v0.63.2-0.20221104003159-6b27644724d8 + go.opentelemetry.io/collector v0.63.2-0.20221108014805-0b08d5316426 go.uber.org/zap v1.23.0 google.golang.org/api v0.102.0 gopkg.in/yaml.v3 v3.0.1 @@ -20,7 +20,7 @@ require ( require ( github.com/ReneKroon/ttlcache/v2 v2.11.0 github.com/mitchellh/hashstructure v1.1.0 - go.opentelemetry.io/collector/pdata v0.63.2-0.20221104003159-6b27644724d8 + go.opentelemetry.io/collector/pdata v0.63.2-0.20221108014805-0b08d5316426 ) require ( @@ -53,7 +53,7 @@ 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.opencensus.io v0.23.0 // indirect + go.opencensus.io v0.24.0 // 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 37d570eee4b5..116cb87c9c9e 100644 --- a/receiver/googlecloudspannerreceiver/go.sum +++ b/receiver/googlecloudspannerreceiver/go.sum @@ -265,7 +265,7 @@ github.com/prometheus/client_golang v0.9.1/go.mod h1:7SWBe2y4D6OKWSNQJUaRYU/AaXP github.com/prometheus/client_golang v1.0.0/go.mod h1:db9x61etRT2tGnBNRi70OPL5FsnadC4Ky3P0J6CfImo= github.com/prometheus/client_golang v1.7.1/go.mod h1:PY5Wy2awLA44sXw4AOSfFBetzPP4j5+D6mVACh+pe2M= github.com/prometheus/client_golang v1.11.1/go.mod h1:Z6t4BnS23TR94PD6BsDNk8yVqroYurpAkEiz0P2BEV0= -github.com/prometheus/client_golang v1.13.0 h1:b71QUfeo5M8gq2+evJdTPfZhYMAU0uKPkyPJ7TPsloU= +github.com/prometheus/client_golang v1.13.1 h1:3gMjIY2+/hzmqhtUC/aQNYldJA6DtH3CgQvwS+02K1c= github.com/prometheus/client_model v0.0.0-20180712105110-5c3871d89910/go.mod h1:MbSGuTsp3dbXC40dX6PRTWyKYBIrTGTE9sqQNg2J8bo= github.com/prometheus/client_model v0.0.0-20190129233127-fd36f4220a90/go.mod h1:xMI15A0UPsDsEKsMN9yxemIoYk6Tm2C1GtYGdfGttqA= github.com/prometheus/client_model v0.0.0-20190812154241-14fe0d1b01d4/go.mod h1:xMI15A0UPsDsEKsMN9yxemIoYk6Tm2C1GtYGdfGttqA= @@ -317,12 +317,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.opencensus.io v0.23.0 h1:gqCw0LfLxScz8irSi8exQc7fyQ0fKQU/qnC/X8+V/1M= -go.opencensus.io v0.23.0/go.mod h1:XItmlyltB5F7CS4xOC1DcqMoFqwtC6OG2xF7mCv7P7E= -go.opentelemetry.io/collector v0.63.2-0.20221104003159-6b27644724d8 h1:rOT5HzXXfSISc6FiH012zH2/EFjp37UXfjEqj5BpkWQ= -go.opentelemetry.io/collector v0.63.2-0.20221104003159-6b27644724d8/go.mod h1:JVmeZXugK4ondC6KQgrHTHWiF4JttpG5k6dWPMt62+k= -go.opentelemetry.io/collector/pdata v0.63.2-0.20221104003159-6b27644724d8 h1:7xeTQjfsOm9eogQeIxjSEhlik9qsbBGsnmkQHfyKaRE= -go.opentelemetry.io/collector/pdata v0.63.2-0.20221104003159-6b27644724d8/go.mod h1:IzvXUGQml2mrnvdb8zIlEW3qQs9oFLdD2hLwJdZ+pek= +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.63.2-0.20221108014805-0b08d5316426 h1:z/wLTMh7/vNxcFUDa5uG7/IPE3tYx6pzCWPV41ghyV8= +go.opentelemetry.io/collector v0.63.2-0.20221108014805-0b08d5316426/go.mod h1:+Zb70q0Rq17dA9FcHTiTjW6g96lvJ8kAZ0c+eWNkAv0= +go.opentelemetry.io/collector/pdata v0.63.2-0.20221108014805-0b08d5316426 h1:wKDpgP0Tx/gWI2SgDGAY1OTSeihhDivbbRqFR79IGTc= +go.opentelemetry.io/collector/pdata v0.63.2-0.20221108014805-0b08d5316426/go.mod h1:IzvXUGQml2mrnvdb8zIlEW3qQs9oFLdD2hLwJdZ+pek= 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/config.go b/receiver/hostmetricsreceiver/config.go index a966deb514b3..3843a7ba0d89 100644 --- a/receiver/hostmetricsreceiver/config.go +++ b/receiver/hostmetricsreceiver/config.go @@ -18,7 +18,7 @@ import ( "errors" "fmt" - "go.opentelemetry.io/collector/config" + "go.opentelemetry.io/collector/component" "go.opentelemetry.io/collector/confmap" "go.opentelemetry.io/collector/receiver/scraperhelper" "go.uber.org/multierr" @@ -38,7 +38,7 @@ type Config struct { RootPath string `mapstructure:"root_path"` } -var _ config.Receiver = (*Config)(nil) +var _ component.ReceiverConfig = (*Config)(nil) var _ confmap.Unmarshaler = (*Config)(nil) // Validate checks the receiver configuration is valid diff --git a/receiver/hostmetricsreceiver/config_test.go b/receiver/hostmetricsreceiver/config_test.go index 269710637660..6b1887f540c6 100644 --- a/receiver/hostmetricsreceiver/config_test.go +++ b/receiver/hostmetricsreceiver/config_test.go @@ -21,6 +21,7 @@ import ( "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" + "go.opentelemetry.io/collector/component" "go.opentelemetry.io/collector/component/componenttest" "go.opentelemetry.io/collector/config" "go.opentelemetry.io/collector/receiver/scraperhelper" @@ -52,7 +53,7 @@ func TestLoadConfig(t *testing.T) { assert.Equal(t, len(cfg.Receivers), 2) - r0 := cfg.Receivers[config.NewComponentID(typeStr)] + r0 := cfg.Receivers[component.NewID(typeStr)] defaultConfigCPUScraper := factory.CreateDefaultConfig() defaultConfigCPUScraper.(*Config).Scrapers = map[string]internal.Config{ cpuscraper.TypeStr: (&cpuscraper.Factory{}).CreateDefaultConfig(), @@ -60,10 +61,10 @@ func TestLoadConfig(t *testing.T) { assert.Equal(t, defaultConfigCPUScraper, r0) - r1 := cfg.Receivers[config.NewComponentIDWithName(typeStr, "customname")].(*Config) + r1 := cfg.Receivers[component.NewIDWithName(typeStr, "customname")].(*Config) expectedConfig := &Config{ ScraperControllerSettings: scraperhelper.ScraperControllerSettings{ - ReceiverSettings: config.NewReceiverSettings(config.NewComponentIDWithName(typeStr, "customname")), + ReceiverSettings: config.NewReceiverSettings(component.NewIDWithName(typeStr, "customname")), CollectionInterval: 30 * time.Second, }, Scrapers: map[string]internal.Config{ diff --git a/receiver/hostmetricsreceiver/factory.go b/receiver/hostmetricsreceiver/factory.go index e625ddd97fdb..a4be3be3020c 100644 --- a/receiver/hostmetricsreceiver/factory.go +++ b/receiver/hostmetricsreceiver/factory.go @@ -20,7 +20,6 @@ import ( "os" "go.opentelemetry.io/collector/component" - "go.opentelemetry.io/collector/config" "go.opentelemetry.io/collector/consumer" "go.opentelemetry.io/collector/receiver/scraperhelper" @@ -76,7 +75,7 @@ func getScraperFactory(key string) (internal.ScraperFactory, bool) { } // createDefaultConfig creates the default configuration for receiver. -func createDefaultConfig() config.Receiver { +func createDefaultConfig() component.ReceiverConfig { return &Config{ScraperControllerSettings: scraperhelper.NewDefaultScraperControllerSettings(typeStr)} } @@ -84,7 +83,7 @@ func createDefaultConfig() config.Receiver { func createMetricsReceiver( ctx context.Context, set component.ReceiverCreateSettings, - cfg config.Receiver, + cfg component.ReceiverConfig, consumer consumer.Metrics, ) (component.MetricsReceiver, error) { oCfg := cfg.(*Config) diff --git a/receiver/hostmetricsreceiver/factory_test.go b/receiver/hostmetricsreceiver/factory_test.go index 0b70b4a7945a..3bfa352970b2 100644 --- a/receiver/hostmetricsreceiver/factory_test.go +++ b/receiver/hostmetricsreceiver/factory_test.go @@ -22,7 +22,6 @@ import ( "github.com/stretchr/testify/assert" "go.opentelemetry.io/collector/component" "go.opentelemetry.io/collector/component/componenttest" - "go.opentelemetry.io/collector/config/configtest" "go.opentelemetry.io/collector/consumer/consumertest" "github.com/open-telemetry/opentelemetry-collector-contrib/receiver/hostmetricsreceiver/internal" @@ -34,7 +33,7 @@ func TestCreateDefaultConfig(t *testing.T) { factory := NewFactory() cfg := factory.CreateDefaultConfig() assert.NotNil(t, cfg, "failed to create default config") - assert.NoError(t, configtest.CheckConfigStruct(cfg)) + assert.NoError(t, componenttest.CheckConfigStruct(cfg)) } func TestCreateReceiver(t *testing.T) { diff --git a/receiver/hostmetricsreceiver/go.mod b/receiver/hostmetricsreceiver/go.mod index 7bfd179f5a44..0cc775595a63 100644 --- a/receiver/hostmetricsreceiver/go.mod +++ b/receiver/hostmetricsreceiver/go.mod @@ -7,9 +7,9 @@ require ( github.com/open-telemetry/opentelemetry-collector-contrib/internal/coreinternal v0.63.0 github.com/shirou/gopsutil/v3 v3.22.10 github.com/stretchr/testify v1.8.1 - go.opentelemetry.io/collector v0.63.2-0.20221104003159-6b27644724d8 - go.opentelemetry.io/collector/pdata v0.63.2-0.20221104003159-6b27644724d8 - go.opentelemetry.io/collector/semconv v0.63.2-0.20221104003159-6b27644724d8 + go.opentelemetry.io/collector v0.63.2-0.20221108014805-0b08d5316426 + go.opentelemetry.io/collector/pdata v0.63.2-0.20221108014805-0b08d5316426 + go.opentelemetry.io/collector/semconv v0.63.2-0.20221108014805-0b08d5316426 go.uber.org/multierr v1.8.0 go.uber.org/zap v1.23.0 golang.org/x/sys v0.0.0-20220919091848-fb04ddd9f9c8 @@ -43,7 +43,7 @@ require ( github.com/modern-go/reflect2 v1.0.2 // indirect github.com/pmezard/go-difflib v1.0.0 // indirect github.com/power-devops/perfstat v0.0.0-20210106213030-5aafc221ea8c // indirect - github.com/prometheus/client_golang v1.13.0 // indirect + github.com/prometheus/client_golang v1.13.1 // indirect github.com/prometheus/client_model v0.3.0 // indirect github.com/prometheus/common v0.37.0 // indirect github.com/prometheus/procfs v0.8.0 // indirect @@ -54,8 +54,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.opencensus.io v0.23.0 // indirect - go.opentelemetry.io/collector/processor/batchprocessor v0.0.0-20221104003159-6b27644724d8 // indirect + go.opencensus.io v0.24.0 // indirect + go.opentelemetry.io/collector/processor/batchprocessor v0.0.0-20221108014805-0b08d5316426 // 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 fc97468eaf08..8c1e8f6f6358 100644 --- a/receiver/hostmetricsreceiver/go.sum +++ b/receiver/hostmetricsreceiver/go.sum @@ -318,8 +318,9 @@ github.com/prometheus/client_golang v1.11.0/go.mod h1:Z6t4BnS23TR94PD6BsDNk8yVqr github.com/prometheus/client_golang v1.11.1/go.mod h1:Z6t4BnS23TR94PD6BsDNk8yVqroYurpAkEiz0P2BEV0= github.com/prometheus/client_golang v1.12.1/go.mod h1:3Z9XVyYiZYEO+YQWt3RD2R3jrbd179Rt297l4aS6nDY= github.com/prometheus/client_golang v1.12.2/go.mod h1:3Z9XVyYiZYEO+YQWt3RD2R3jrbd179Rt297l4aS6nDY= -github.com/prometheus/client_golang v1.13.0 h1:b71QUfeo5M8gq2+evJdTPfZhYMAU0uKPkyPJ7TPsloU= github.com/prometheus/client_golang v1.13.0/go.mod h1:vTeo+zgvILHsnnj/39Ou/1fPN5nJFOEMgftOUOmlvYQ= +github.com/prometheus/client_golang v1.13.1 h1:3gMjIY2+/hzmqhtUC/aQNYldJA6DtH3CgQvwS+02K1c= +github.com/prometheus/client_golang v1.13.1/go.mod h1:vTeo+zgvILHsnnj/39Ou/1fPN5nJFOEMgftOUOmlvYQ= github.com/prometheus/client_model v0.0.0-20180712105110-5c3871d89910/go.mod h1:MbSGuTsp3dbXC40dX6PRTWyKYBIrTGTE9sqQNg2J8bo= github.com/prometheus/client_model v0.0.0-20190129233127-fd36f4220a90/go.mod h1:xMI15A0UPsDsEKsMN9yxemIoYk6Tm2C1GtYGdfGttqA= github.com/prometheus/client_model v0.0.0-20190812154241-14fe0d1b01d4/go.mod h1:xMI15A0UPsDsEKsMN9yxemIoYk6Tm2C1GtYGdfGttqA= @@ -397,17 +398,18 @@ 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.opencensus.io v0.23.0 h1:gqCw0LfLxScz8irSi8exQc7fyQ0fKQU/qnC/X8+V/1M= go.opencensus.io v0.23.0/go.mod h1:XItmlyltB5F7CS4xOC1DcqMoFqwtC6OG2xF7mCv7P7E= -go.opentelemetry.io/collector v0.63.2-0.20221104003159-6b27644724d8 h1:rOT5HzXXfSISc6FiH012zH2/EFjp37UXfjEqj5BpkWQ= -go.opentelemetry.io/collector v0.63.2-0.20221104003159-6b27644724d8/go.mod h1:JVmeZXugK4ondC6KQgrHTHWiF4JttpG5k6dWPMt62+k= +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.63.2-0.20221108014805-0b08d5316426 h1:z/wLTMh7/vNxcFUDa5uG7/IPE3tYx6pzCWPV41ghyV8= +go.opentelemetry.io/collector v0.63.2-0.20221108014805-0b08d5316426/go.mod h1:+Zb70q0Rq17dA9FcHTiTjW6g96lvJ8kAZ0c+eWNkAv0= go.opentelemetry.io/collector/extension/zpagesextension v0.0.0-20221102221454-bfc45c16c979 h1:YW7BL8ftoJ7k+EtnMICw1KWASLuSDIhbF7SjjgWMCl4= -go.opentelemetry.io/collector/pdata v0.63.2-0.20221104003159-6b27644724d8 h1:7xeTQjfsOm9eogQeIxjSEhlik9qsbBGsnmkQHfyKaRE= -go.opentelemetry.io/collector/pdata v0.63.2-0.20221104003159-6b27644724d8/go.mod h1:IzvXUGQml2mrnvdb8zIlEW3qQs9oFLdD2hLwJdZ+pek= -go.opentelemetry.io/collector/processor/batchprocessor v0.0.0-20221104003159-6b27644724d8 h1:jgN7o3WfR8x++rjMcVM1VN6OJi4ytlGANXbwd73BPXo= -go.opentelemetry.io/collector/processor/batchprocessor v0.0.0-20221104003159-6b27644724d8/go.mod h1:WBv1Nayi8p12K0vxLxTkHpRGr79JXYT3TXL2X0B/PRU= -go.opentelemetry.io/collector/semconv v0.63.2-0.20221104003159-6b27644724d8 h1:jm0sNPyqo6S165QjQYMBHB2nK50wlJbMYM03Yr3Eo2k= -go.opentelemetry.io/collector/semconv v0.63.2-0.20221104003159-6b27644724d8/go.mod h1:5o9yhOa+ABt7g2E5JABDxGZ1PQPbtfxrKNbYn+LOTXU= +go.opentelemetry.io/collector/pdata v0.63.2-0.20221108014805-0b08d5316426 h1:wKDpgP0Tx/gWI2SgDGAY1OTSeihhDivbbRqFR79IGTc= +go.opentelemetry.io/collector/pdata v0.63.2-0.20221108014805-0b08d5316426/go.mod h1:IzvXUGQml2mrnvdb8zIlEW3qQs9oFLdD2hLwJdZ+pek= +go.opentelemetry.io/collector/processor/batchprocessor v0.0.0-20221108014805-0b08d5316426 h1:7f0NVsVGYT8pxAyk0qBBa8ZQf7athr/mfQ6QltGywN0= +go.opentelemetry.io/collector/processor/batchprocessor v0.0.0-20221108014805-0b08d5316426/go.mod h1:gpd5Q/3HlROMGYhnmwlFpUhcz8Xy80sokEcKs7c7zzE= +go.opentelemetry.io/collector/semconv v0.63.2-0.20221108014805-0b08d5316426 h1:pqIl7OC531J6i9ttBCj3zLmZI/BSF4q323YpK0GgKGk= +go.opentelemetry.io/collector/semconv v0.63.2-0.20221108014805-0b08d5316426/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/hostmetricsreceiver/hostmetrics_linux_test.go b/receiver/hostmetricsreceiver/hostmetrics_linux_test.go index f0d1e1be7364..bb883e0ee0d8 100644 --- a/receiver/hostmetricsreceiver/hostmetrics_linux_test.go +++ b/receiver/hostmetricsreceiver/hostmetrics_linux_test.go @@ -22,8 +22,8 @@ import ( "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" + "go.opentelemetry.io/collector/component" "go.opentelemetry.io/collector/component/componenttest" - "go.opentelemetry.io/collector/config" "go.opentelemetry.io/collector/service/servicetest" "github.com/open-telemetry/opentelemetry-collector-contrib/receiver/hostmetricsreceiver/internal" @@ -53,7 +53,7 @@ func TestLoadConfigRootPath(t *testing.T) { require.NoError(t, err) globalRootPath = "" - r := cfg.Receivers[config.NewComponentID(typeStr)].(*Config) + r := cfg.Receivers[component.NewID(typeStr)].(*Config) expectedConfig := factory.CreateDefaultConfig().(*Config) expectedConfig.RootPath = "testdata" cpuScraperCfg := (&cpuscraper.Factory{}).CreateDefaultConfig() diff --git a/receiver/hostmetricsreceiver/hostmetrics_receiver_test.go b/receiver/hostmetricsreceiver/hostmetrics_receiver_test.go index f4a0aaec96df..75e13d452b60 100644 --- a/receiver/hostmetricsreceiver/hostmetrics_receiver_test.go +++ b/receiver/hostmetricsreceiver/hostmetrics_receiver_test.go @@ -116,7 +116,7 @@ func TestGatherMetrics_EndToEnd(t *testing.T) { cfg := &Config{ ScraperControllerSettings: scraperhelper.ScraperControllerSettings{ - ReceiverSettings: config.NewReceiverSettings(config.NewComponentID(typeStr)), + ReceiverSettings: config.NewReceiverSettings(component.NewID(typeStr)), CollectionInterval: 100 * time.Millisecond, }, Scrapers: map[string]internal.Config{ @@ -235,7 +235,7 @@ func (m *mockFactory) CreateMetricsScraper(context.Context, component.ReceiverCr return args.Get(0).(scraperhelper.Scraper), args.Error(1) } -func (m *mockScraper) ID() config.ComponentID { return config.NewComponentID("") } +func (m *mockScraper) ID() component.ID { return component.NewID("") } func (m *mockScraper) Start(context.Context, component.Host) error { return nil } func (m *mockScraper) Shutdown(context.Context) error { return nil } func (m *mockScraper) Scrape(context.Context) (pmetric.Metrics, error) { diff --git a/receiver/httpcheckreceiver/factory.go b/receiver/httpcheckreceiver/factory.go index 1143d224f4c1..d24ee7d9750e 100644 --- a/receiver/httpcheckreceiver/factory.go +++ b/receiver/httpcheckreceiver/factory.go @@ -43,10 +43,10 @@ func NewFactory() component.ReceiverFactory { component.WithMetricsReceiver(createMetricsReceiver, stability)) } -func createDefaultConfig() config.Receiver { +func createDefaultConfig() component.ReceiverConfig { return &Config{ ScraperControllerSettings: scraperhelper.ScraperControllerSettings{ - ReceiverSettings: config.NewReceiverSettings(config.NewComponentID(typeStr)), + ReceiverSettings: config.NewReceiverSettings(component.NewID(typeStr)), CollectionInterval: 10 * time.Second, }, HTTPClientSettings: confighttp.HTTPClientSettings{ @@ -58,7 +58,7 @@ func createDefaultConfig() config.Receiver { } } -func createMetricsReceiver(ctx context.Context, params component.ReceiverCreateSettings, rConf config.Receiver, consumer consumer.Metrics) (component.MetricsReceiver, error) { +func createMetricsReceiver(ctx context.Context, params component.ReceiverCreateSettings, rConf component.ReceiverConfig, consumer consumer.Metrics) (component.MetricsReceiver, error) { cfg, ok := rConf.(*Config) if !ok { return nil, errConfigNotHTTPCheck diff --git a/receiver/httpcheckreceiver/factory_test.go b/receiver/httpcheckreceiver/factory_test.go index 67ea0a28e728..3e588dca0180 100644 --- a/receiver/httpcheckreceiver/factory_test.go +++ b/receiver/httpcheckreceiver/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/config" "go.opentelemetry.io/collector/config/confighttp" @@ -46,9 +47,9 @@ func TestNewFactory(t *testing.T) { testFunc: func(t *testing.T) { factory := NewFactory() - var expectedCfg config.Receiver = &Config{ + var expectedCfg component.ReceiverConfig = &Config{ ScraperControllerSettings: scraperhelper.ScraperControllerSettings{ - ReceiverSettings: config.NewReceiverSettings(config.NewComponentID(typeStr)), + ReceiverSettings: config.NewReceiverSettings(component.NewID(typeStr)), CollectionInterval: 10 * time.Second, }, HTTPClientSettings: confighttp.HTTPClientSettings{ diff --git a/receiver/httpcheckreceiver/go.mod b/receiver/httpcheckreceiver/go.mod index a998c8fd683f..193f0ad8d3b3 100644 --- a/receiver/httpcheckreceiver/go.mod +++ b/receiver/httpcheckreceiver/go.mod @@ -5,8 +5,8 @@ go 1.18 require ( github.com/open-telemetry/opentelemetry-collector-contrib/internal/scrapertest v0.63.0 github.com/stretchr/testify v1.8.1 - go.opentelemetry.io/collector v0.63.2-0.20221104003159-6b27644724d8 - go.opentelemetry.io/collector/pdata v0.63.2-0.20221104003159-6b27644724d8 + go.opentelemetry.io/collector v0.63.2-0.20221108014805-0b08d5316426 + go.opentelemetry.io/collector/pdata v0.63.2-0.20221108014805-0b08d5316426 go.uber.org/multierr v1.8.0 ) @@ -30,7 +30,7 @@ require ( github.com/pmezard/go-difflib v1.0.0 // indirect github.com/rogpeppe/go-internal v1.8.1 // indirect github.com/rs/cors v1.8.2 // indirect - go.opencensus.io v0.23.0 // indirect + go.opencensus.io v0.24.0 // 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 850e82027cf4..b59e1c9d0dae 100644 --- a/receiver/httpcheckreceiver/go.sum +++ b/receiver/httpcheckreceiver/go.sum @@ -239,7 +239,7 @@ github.com/prometheus/client_golang v0.9.1/go.mod h1:7SWBe2y4D6OKWSNQJUaRYU/AaXP github.com/prometheus/client_golang v1.0.0/go.mod h1:db9x61etRT2tGnBNRi70OPL5FsnadC4Ky3P0J6CfImo= github.com/prometheus/client_golang v1.7.1/go.mod h1:PY5Wy2awLA44sXw4AOSfFBetzPP4j5+D6mVACh+pe2M= github.com/prometheus/client_golang v1.11.1/go.mod h1:Z6t4BnS23TR94PD6BsDNk8yVqroYurpAkEiz0P2BEV0= -github.com/prometheus/client_golang v1.13.0 h1:b71QUfeo5M8gq2+evJdTPfZhYMAU0uKPkyPJ7TPsloU= +github.com/prometheus/client_golang v1.13.1 h1:3gMjIY2+/hzmqhtUC/aQNYldJA6DtH3CgQvwS+02K1c= github.com/prometheus/client_model v0.0.0-20180712105110-5c3871d89910/go.mod h1:MbSGuTsp3dbXC40dX6PRTWyKYBIrTGTE9sqQNg2J8bo= github.com/prometheus/client_model v0.0.0-20190129233127-fd36f4220a90/go.mod h1:xMI15A0UPsDsEKsMN9yxemIoYk6Tm2C1GtYGdfGttqA= github.com/prometheus/client_model v0.0.0-20190812154241-14fe0d1b01d4/go.mod h1:xMI15A0UPsDsEKsMN9yxemIoYk6Tm2C1GtYGdfGttqA= @@ -279,7 +279,6 @@ github.com/stretchr/testify v1.2.2/go.mod h1:a8OnRcib4nhh0OaRAV+Yts87kKdq0PP7pXf github.com/stretchr/testify v1.3.0/go.mod h1:M5WIy9Dh21IEIfnGCwXGc5bZfKNJtfHm1UVUgZn+9EI= github.com/stretchr/testify v1.4.0/go.mod h1:j7eGeouHqKxXV5pUuKE4zz7dFj8WfuZ+81PSLYec5m4= github.com/stretchr/testify v1.5.1/go.mod h1:5W2xD1RspED5o8YsWQXVCued0rvSQ+mT+I5cxcmMvtA= -github.com/stretchr/testify v1.6.1/go.mod h1:6Fq8oRcR53rry900zMqJjRRixrwX3KX962/h/Wwjteg= github.com/stretchr/testify v1.7.0/go.mod h1:6Fq8oRcR53rry900zMqJjRRixrwX3KX962/h/Wwjteg= github.com/stretchr/testify v1.7.1/go.mod h1:6Fq8oRcR53rry900zMqJjRRixrwX3KX962/h/Wwjteg= github.com/stretchr/testify v1.8.0/go.mod h1:yNjHg4UonilssWZ8iaSj1OCr/vHnekPRkoO+kdMU+MU= @@ -291,12 +290,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.opencensus.io v0.23.0 h1:gqCw0LfLxScz8irSi8exQc7fyQ0fKQU/qnC/X8+V/1M= -go.opencensus.io v0.23.0/go.mod h1:XItmlyltB5F7CS4xOC1DcqMoFqwtC6OG2xF7mCv7P7E= -go.opentelemetry.io/collector v0.63.2-0.20221104003159-6b27644724d8 h1:rOT5HzXXfSISc6FiH012zH2/EFjp37UXfjEqj5BpkWQ= -go.opentelemetry.io/collector v0.63.2-0.20221104003159-6b27644724d8/go.mod h1:JVmeZXugK4ondC6KQgrHTHWiF4JttpG5k6dWPMt62+k= -go.opentelemetry.io/collector/pdata v0.63.2-0.20221104003159-6b27644724d8 h1:7xeTQjfsOm9eogQeIxjSEhlik9qsbBGsnmkQHfyKaRE= -go.opentelemetry.io/collector/pdata v0.63.2-0.20221104003159-6b27644724d8/go.mod h1:IzvXUGQml2mrnvdb8zIlEW3qQs9oFLdD2hLwJdZ+pek= +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.63.2-0.20221108014805-0b08d5316426 h1:z/wLTMh7/vNxcFUDa5uG7/IPE3tYx6pzCWPV41ghyV8= +go.opentelemetry.io/collector v0.63.2-0.20221108014805-0b08d5316426/go.mod h1:+Zb70q0Rq17dA9FcHTiTjW6g96lvJ8kAZ0c+eWNkAv0= +go.opentelemetry.io/collector/pdata v0.63.2-0.20221108014805-0b08d5316426 h1:wKDpgP0Tx/gWI2SgDGAY1OTSeihhDivbbRqFR79IGTc= +go.opentelemetry.io/collector/pdata v0.63.2-0.20221108014805-0b08d5316426/go.mod h1:IzvXUGQml2mrnvdb8zIlEW3qQs9oFLdD2hLwJdZ+pek= 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/factory.go b/receiver/iisreceiver/factory.go index 13d78eeb9c4b..7a4c71fafaa4 100644 --- a/receiver/iisreceiver/factory.go +++ b/receiver/iisreceiver/factory.go @@ -37,10 +37,10 @@ func NewFactory() component.ReceiverFactory { component.WithMetricsReceiver(createMetricsReceiver, stability)) } -func createDefaultConfig() config.Receiver { +func createDefaultConfig() component.ReceiverConfig { return &Config{ ScraperControllerSettings: scraperhelper.ScraperControllerSettings{ - ReceiverSettings: config.NewReceiverSettings(config.NewComponentID(typeStr)), + ReceiverSettings: config.NewReceiverSettings(component.NewID(typeStr)), CollectionInterval: time.Minute, }, Metrics: metadata.DefaultMetricsSettings(), diff --git a/receiver/iisreceiver/factory_others.go b/receiver/iisreceiver/factory_others.go index 99db85f9592e..593eebb77236 100644 --- a/receiver/iisreceiver/factory_others.go +++ b/receiver/iisreceiver/factory_others.go @@ -22,7 +22,6 @@ import ( "errors" "go.opentelemetry.io/collector/component" - "go.opentelemetry.io/collector/config" "go.opentelemetry.io/collector/consumer" ) @@ -30,7 +29,7 @@ import ( func createMetricsReceiver( ctx context.Context, params component.ReceiverCreateSettings, - cfg config.Receiver, + cfg component.ReceiverConfig, consumer consumer.Metrics, ) (component.MetricsReceiver, error) { return nil, errors.New("the windows perf counters receiver is only supported on Windows") diff --git a/receiver/iisreceiver/factory_test.go b/receiver/iisreceiver/factory_test.go index 2eae9d11fe18..d9e78dc48437 100644 --- a/receiver/iisreceiver/factory_test.go +++ b/receiver/iisreceiver/factory_test.go @@ -19,6 +19,7 @@ import ( "time" "github.com/stretchr/testify/require" + "go.opentelemetry.io/collector/component" "go.opentelemetry.io/collector/config" "go.opentelemetry.io/collector/receiver/scraperhelper" @@ -34,9 +35,9 @@ func TestNewFactory(t *testing.T) { t.Run("NewFactoryDefaultConfig", func(t *testing.T) { factory := NewFactory() - var expectedCfg config.Receiver = &Config{ + var expectedCfg component.ReceiverConfig = &Config{ ScraperControllerSettings: scraperhelper.ScraperControllerSettings{ - ReceiverSettings: config.NewReceiverSettings(config.NewComponentID(typeStr)), + ReceiverSettings: config.NewReceiverSettings(component.NewID(typeStr)), CollectionInterval: 60 * time.Second, }, Metrics: metadata.DefaultMetricsSettings(), diff --git a/receiver/iisreceiver/factory_windows.go b/receiver/iisreceiver/factory_windows.go index f6e47b95b2ae..c0ac078f81fb 100644 --- a/receiver/iisreceiver/factory_windows.go +++ b/receiver/iisreceiver/factory_windows.go @@ -21,7 +21,6 @@ import ( "context" "go.opentelemetry.io/collector/component" - "go.opentelemetry.io/collector/config" "go.opentelemetry.io/collector/consumer" "go.opentelemetry.io/collector/receiver/scraperhelper" ) @@ -29,7 +28,7 @@ import ( func createMetricsReceiver( _ context.Context, params component.ReceiverCreateSettings, - rConf config.Receiver, + rConf component.ReceiverConfig, nextConsumer consumer.Metrics, ) (component.MetricsReceiver, error) { cfg := rConf.(*Config) diff --git a/receiver/iisreceiver/go.mod b/receiver/iisreceiver/go.mod index b8d18b74a3bc..edf5fe28ba73 100644 --- a/receiver/iisreceiver/go.mod +++ b/receiver/iisreceiver/go.mod @@ -5,8 +5,8 @@ go 1.18 require ( github.com/open-telemetry/opentelemetry-collector-contrib/pkg/winperfcounters v0.63.0 github.com/stretchr/testify v1.8.1 - go.opentelemetry.io/collector v0.63.2-0.20221104003159-6b27644724d8 - go.opentelemetry.io/collector/pdata v0.63.2-0.20221104003159-6b27644724d8 + go.opentelemetry.io/collector v0.63.2-0.20221108014805-0b08d5316426 + go.opentelemetry.io/collector/pdata v0.63.2-0.20221108014805-0b08d5316426 go.uber.org/zap v1.23.0 ) @@ -25,7 +25,7 @@ require ( github.com/modern-go/reflect2 v1.0.2 // indirect github.com/open-telemetry/opentelemetry-collector-contrib/internal/scrapertest v0.63.0 github.com/pmezard/go-difflib v1.0.0 // indirect - go.opencensus.io v0.23.0 // indirect + go.opencensus.io v0.24.0 // 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 482eca0fa080..6d0b73cb388c 100644 --- a/receiver/iisreceiver/go.sum +++ b/receiver/iisreceiver/go.sum @@ -229,7 +229,7 @@ github.com/prometheus/client_golang v0.9.1/go.mod h1:7SWBe2y4D6OKWSNQJUaRYU/AaXP github.com/prometheus/client_golang v1.0.0/go.mod h1:db9x61etRT2tGnBNRi70OPL5FsnadC4Ky3P0J6CfImo= github.com/prometheus/client_golang v1.7.1/go.mod h1:PY5Wy2awLA44sXw4AOSfFBetzPP4j5+D6mVACh+pe2M= github.com/prometheus/client_golang v1.11.1/go.mod h1:Z6t4BnS23TR94PD6BsDNk8yVqroYurpAkEiz0P2BEV0= -github.com/prometheus/client_golang v1.13.0 h1:b71QUfeo5M8gq2+evJdTPfZhYMAU0uKPkyPJ7TPsloU= +github.com/prometheus/client_golang v1.13.1 h1:3gMjIY2+/hzmqhtUC/aQNYldJA6DtH3CgQvwS+02K1c= github.com/prometheus/client_model v0.0.0-20180712105110-5c3871d89910/go.mod h1:MbSGuTsp3dbXC40dX6PRTWyKYBIrTGTE9sqQNg2J8bo= github.com/prometheus/client_model v0.0.0-20190129233127-fd36f4220a90/go.mod h1:xMI15A0UPsDsEKsMN9yxemIoYk6Tm2C1GtYGdfGttqA= github.com/prometheus/client_model v0.0.0-20190812154241-14fe0d1b01d4/go.mod h1:xMI15A0UPsDsEKsMN9yxemIoYk6Tm2C1GtYGdfGttqA= @@ -266,7 +266,6 @@ github.com/stretchr/testify v1.2.2/go.mod h1:a8OnRcib4nhh0OaRAV+Yts87kKdq0PP7pXf github.com/stretchr/testify v1.3.0/go.mod h1:M5WIy9Dh21IEIfnGCwXGc5bZfKNJtfHm1UVUgZn+9EI= github.com/stretchr/testify v1.4.0/go.mod h1:j7eGeouHqKxXV5pUuKE4zz7dFj8WfuZ+81PSLYec5m4= github.com/stretchr/testify v1.5.1/go.mod h1:5W2xD1RspED5o8YsWQXVCued0rvSQ+mT+I5cxcmMvtA= -github.com/stretchr/testify v1.6.1/go.mod h1:6Fq8oRcR53rry900zMqJjRRixrwX3KX962/h/Wwjteg= github.com/stretchr/testify v1.7.0/go.mod h1:6Fq8oRcR53rry900zMqJjRRixrwX3KX962/h/Wwjteg= github.com/stretchr/testify v1.7.1/go.mod h1:6Fq8oRcR53rry900zMqJjRRixrwX3KX962/h/Wwjteg= github.com/stretchr/testify v1.8.0/go.mod h1:yNjHg4UonilssWZ8iaSj1OCr/vHnekPRkoO+kdMU+MU= @@ -278,12 +277,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.opencensus.io v0.23.0 h1:gqCw0LfLxScz8irSi8exQc7fyQ0fKQU/qnC/X8+V/1M= -go.opencensus.io v0.23.0/go.mod h1:XItmlyltB5F7CS4xOC1DcqMoFqwtC6OG2xF7mCv7P7E= -go.opentelemetry.io/collector v0.63.2-0.20221104003159-6b27644724d8 h1:rOT5HzXXfSISc6FiH012zH2/EFjp37UXfjEqj5BpkWQ= -go.opentelemetry.io/collector v0.63.2-0.20221104003159-6b27644724d8/go.mod h1:JVmeZXugK4ondC6KQgrHTHWiF4JttpG5k6dWPMt62+k= -go.opentelemetry.io/collector/pdata v0.63.2-0.20221104003159-6b27644724d8 h1:7xeTQjfsOm9eogQeIxjSEhlik9qsbBGsnmkQHfyKaRE= -go.opentelemetry.io/collector/pdata v0.63.2-0.20221104003159-6b27644724d8/go.mod h1:IzvXUGQml2mrnvdb8zIlEW3qQs9oFLdD2hLwJdZ+pek= +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.63.2-0.20221108014805-0b08d5316426 h1:z/wLTMh7/vNxcFUDa5uG7/IPE3tYx6pzCWPV41ghyV8= +go.opentelemetry.io/collector v0.63.2-0.20221108014805-0b08d5316426/go.mod h1:+Zb70q0Rq17dA9FcHTiTjW6g96lvJ8kAZ0c+eWNkAv0= +go.opentelemetry.io/collector/pdata v0.63.2-0.20221108014805-0b08d5316426 h1:wKDpgP0Tx/gWI2SgDGAY1OTSeihhDivbbRqFR79IGTc= +go.opentelemetry.io/collector/pdata v0.63.2-0.20221108014805-0b08d5316426/go.mod h1:IzvXUGQml2mrnvdb8zIlEW3qQs9oFLdD2hLwJdZ+pek= 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/factory.go b/receiver/influxdbreceiver/factory.go index a28d12142b6d..a5497979c4be 100644 --- a/receiver/influxdbreceiver/factory.go +++ b/receiver/influxdbreceiver/factory.go @@ -36,15 +36,15 @@ func NewFactory() component.ReceiverFactory { } // createDefaultConfig creates the default configuration for receiver. -func createDefaultConfig() config.Receiver { +func createDefaultConfig() component.ReceiverConfig { return &Config{ - ReceiverSettings: config.NewReceiverSettings(config.NewComponentID(typeStr)), + ReceiverSettings: config.NewReceiverSettings(component.NewID(typeStr)), HTTPServerSettings: confighttp.HTTPServerSettings{ Endpoint: "0.0.0.0:8086", }, } } -func createMetricsReceiver(_ context.Context, params component.ReceiverCreateSettings, cfg config.Receiver, nextConsumer consumer.Metrics) (component.MetricsReceiver, error) { +func createMetricsReceiver(_ context.Context, params component.ReceiverCreateSettings, cfg component.ReceiverConfig, nextConsumer consumer.Metrics) (component.MetricsReceiver, error) { return newMetricsReceiver(cfg.(*Config), params.TelemetrySettings, nextConsumer) } diff --git a/receiver/influxdbreceiver/go.mod b/receiver/influxdbreceiver/go.mod index 0a3fc0373214..594538cfff5a 100644 --- a/receiver/influxdbreceiver/go.mod +++ b/receiver/influxdbreceiver/go.mod @@ -7,7 +7,7 @@ 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.63.0 - go.opentelemetry.io/collector v0.63.2-0.20221104003159-6b27644724d8 + go.opentelemetry.io/collector v0.63.2-0.20221108014805-0b08d5316426 go.uber.org/zap v1.23.0 ) @@ -31,7 +31,7 @@ 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.63.2-0.20221104003159-6b27644724d8 // indirect + go.opentelemetry.io/collector/pdata v0.63.2-0.20221108014805-0b08d5316426 // 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 7d0a769bfe3f..f08041d94904 100644 --- a/receiver/influxdbreceiver/go.sum +++ b/receiver/influxdbreceiver/go.sum @@ -291,10 +291,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.63.2-0.20221104003159-6b27644724d8 h1:rOT5HzXXfSISc6FiH012zH2/EFjp37UXfjEqj5BpkWQ= -go.opentelemetry.io/collector v0.63.2-0.20221104003159-6b27644724d8/go.mod h1:JVmeZXugK4ondC6KQgrHTHWiF4JttpG5k6dWPMt62+k= -go.opentelemetry.io/collector/pdata v0.63.2-0.20221104003159-6b27644724d8 h1:7xeTQjfsOm9eogQeIxjSEhlik9qsbBGsnmkQHfyKaRE= -go.opentelemetry.io/collector/pdata v0.63.2-0.20221104003159-6b27644724d8/go.mod h1:IzvXUGQml2mrnvdb8zIlEW3qQs9oFLdD2hLwJdZ+pek= +go.opentelemetry.io/collector v0.63.2-0.20221108014805-0b08d5316426 h1:z/wLTMh7/vNxcFUDa5uG7/IPE3tYx6pzCWPV41ghyV8= +go.opentelemetry.io/collector v0.63.2-0.20221108014805-0b08d5316426/go.mod h1:+Zb70q0Rq17dA9FcHTiTjW6g96lvJ8kAZ0c+eWNkAv0= +go.opentelemetry.io/collector/pdata v0.63.2-0.20221108014805-0b08d5316426 h1:wKDpgP0Tx/gWI2SgDGAY1OTSeihhDivbbRqFR79IGTc= +go.opentelemetry.io/collector/pdata v0.63.2-0.20221108014805-0b08d5316426/go.mod h1:IzvXUGQml2mrnvdb8zIlEW3qQs9oFLdD2hLwJdZ+pek= 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.go b/receiver/jaegerreceiver/config.go index cb51b1f5b9d5..f650dd5121bd 100644 --- a/receiver/jaegerreceiver/config.go +++ b/receiver/jaegerreceiver/config.go @@ -20,6 +20,7 @@ import ( "strconv" "time" + "go.opentelemetry.io/collector/component" "go.opentelemetry.io/collector/config" "go.opentelemetry.io/collector/config/configgrpc" "go.opentelemetry.io/collector/config/confighttp" @@ -84,7 +85,7 @@ type Config struct { RemoteSampling *RemoteSamplingConfig `mapstructure:"remote_sampling"` } -var _ config.Receiver = (*Config)(nil) +var _ component.ReceiverConfig = (*Config)(nil) var _ confmap.Unmarshaler = (*Config)(nil) // Validate checks the receiver configuration is valid diff --git a/receiver/jaegerreceiver/config_test.go b/receiver/jaegerreceiver/config_test.go index a739e9e5a0d1..c843fae8612f 100644 --- a/receiver/jaegerreceiver/config_test.go +++ b/receiver/jaegerreceiver/config_test.go @@ -21,6 +21,7 @@ import ( "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" + "go.opentelemetry.io/collector/component" "go.opentelemetry.io/collector/config" "go.opentelemetry.io/collector/config/configgrpc" "go.opentelemetry.io/collector/config/confighttp" @@ -36,13 +37,13 @@ func TestLoadConfig(t *testing.T) { require.NoError(t, err) tests := []struct { - id config.ComponentID - expected config.Receiver + id component.ID + expected component.ReceiverConfig }{ { - id: config.NewComponentIDWithName(typeStr, "customname"), + id: component.NewIDWithName(typeStr, "customname"), expected: &Config{ - ReceiverSettings: config.NewReceiverSettings(config.NewComponentID(typeStr)), + ReceiverSettings: config.NewReceiverSettings(component.NewID(typeStr)), Protocols: Protocols{ GRPC: &configgrpc.GRPCServerSettings{ NetAddr: confignet.NetAddr{ @@ -83,9 +84,9 @@ func TestLoadConfig(t *testing.T) { }, }, { - id: config.NewComponentIDWithName(typeStr, "defaults"), + id: component.NewIDWithName(typeStr, "defaults"), expected: &Config{ - ReceiverSettings: config.NewReceiverSettings(config.NewComponentID(typeStr)), + ReceiverSettings: config.NewReceiverSettings(component.NewID(typeStr)), Protocols: Protocols{ GRPC: &configgrpc.GRPCServerSettings{ NetAddr: confignet.NetAddr{ @@ -108,9 +109,9 @@ func TestLoadConfig(t *testing.T) { }, }, { - id: config.NewComponentIDWithName(typeStr, "mixed"), + id: component.NewIDWithName(typeStr, "mixed"), expected: &Config{ - ReceiverSettings: config.NewReceiverSettings(config.NewComponentID(typeStr)), + ReceiverSettings: config.NewReceiverSettings(component.NewID(typeStr)), Protocols: Protocols{ GRPC: &configgrpc.GRPCServerSettings{ NetAddr: confignet.NetAddr{ @@ -126,9 +127,9 @@ func TestLoadConfig(t *testing.T) { }, }, { - id: config.NewComponentIDWithName(typeStr, "tls"), + id: component.NewIDWithName(typeStr, "tls"), expected: &Config{ - ReceiverSettings: config.NewReceiverSettings(config.NewComponentID(typeStr)), + ReceiverSettings: config.NewReceiverSettings(component.NewID(typeStr)), Protocols: Protocols{ GRPC: &configgrpc.GRPCServerSettings{ NetAddr: confignet.NetAddr{ @@ -157,7 +158,7 @@ func TestLoadConfig(t *testing.T) { sub, err := cm.Sub(tt.id.String()) require.NoError(t, err) - require.NoError(t, config.UnmarshalReceiver(sub, cfg)) + require.NoError(t, component.UnmarshalReceiverConfig(sub, cfg)) assert.NoError(t, cfg.Validate()) assert.Equal(t, tt.expected, cfg) @@ -171,19 +172,19 @@ func TestFailedLoadConfig(t *testing.T) { factory := NewFactory() cfg := factory.CreateDefaultConfig() - sub, err := cm.Sub(config.NewComponentIDWithName(typeStr, "typo_default_proto_config").String()) + sub, err := cm.Sub(component.NewIDWithName(typeStr, "typo_default_proto_config").String()) require.NoError(t, err) - err = config.UnmarshalReceiver(sub, cfg) + err = component.UnmarshalReceiverConfig(sub, cfg) assert.EqualError(t, err, "1 error(s) decoding:\n\n* 'protocols' has invalid keys: thrift_htttp") - sub, err = cm.Sub(config.NewComponentIDWithName(typeStr, "bad_proto_config").String()) + sub, err = cm.Sub(component.NewIDWithName(typeStr, "bad_proto_config").String()) require.NoError(t, err) - err = config.UnmarshalReceiver(sub, cfg) + err = component.UnmarshalReceiverConfig(sub, cfg) assert.EqualError(t, err, "1 error(s) decoding:\n\n* 'protocols' has invalid keys: thrift_htttp") - sub, err = cm.Sub(config.NewComponentIDWithName(typeStr, "empty").String()) + sub, err = cm.Sub(component.NewIDWithName(typeStr, "empty").String()) require.NoError(t, err) - err = config.UnmarshalReceiver(sub, cfg) + err = component.UnmarshalReceiverConfig(sub, cfg) assert.EqualError(t, err, "empty config for Jaeger receiver") } diff --git a/receiver/jaegerreceiver/factory.go b/receiver/jaegerreceiver/factory.go index ee6dcefaa4cc..47f071c18f28 100644 --- a/receiver/jaegerreceiver/factory.go +++ b/receiver/jaegerreceiver/factory.go @@ -53,9 +53,9 @@ func NewFactory() component.ReceiverFactory { } // CreateDefaultConfig creates the default configuration for Jaeger receiver. -func createDefaultConfig() config.Receiver { +func createDefaultConfig() component.ReceiverConfig { return &Config{ - ReceiverSettings: config.NewReceiverSettings(config.NewComponentID(typeStr)), + ReceiverSettings: config.NewReceiverSettings(component.NewID(typeStr)), Protocols: Protocols{ GRPC: &configgrpc.GRPCServerSettings{ NetAddr: confignet.NetAddr{ @@ -82,7 +82,7 @@ func createDefaultConfig() config.Receiver { func createTracesReceiver( _ context.Context, set component.ReceiverCreateSettings, - cfg config.Receiver, + cfg component.ReceiverConfig, nextConsumer consumer.Traces, ) (component.TracesReceiver, error) { diff --git a/receiver/jaegerreceiver/factory_test.go b/receiver/jaegerreceiver/factory_test.go index eeaa31efd935..ebf464cb201e 100644 --- a/receiver/jaegerreceiver/factory_test.go +++ b/receiver/jaegerreceiver/factory_test.go @@ -23,11 +23,9 @@ import ( "github.com/stretchr/testify/require" "go.opentelemetry.io/collector/component" "go.opentelemetry.io/collector/component/componenttest" - "go.opentelemetry.io/collector/config" "go.opentelemetry.io/collector/config/configgrpc" "go.opentelemetry.io/collector/config/confighttp" "go.opentelemetry.io/collector/config/confignet" - "go.opentelemetry.io/collector/config/configtest" "go.opentelemetry.io/collector/config/configtls" "go.opentelemetry.io/collector/confmap/confmaptest" ) @@ -42,7 +40,7 @@ func TestCreateDefaultConfig(t *testing.T) { factory := NewFactory() cfg := factory.CreateDefaultConfig() assert.NotNil(t, cfg, "failed to create default config") - assert.NoError(t, configtest.CheckConfigStruct(cfg)) + assert.NoError(t, componenttest.CheckConfigStruct(cfg)) } func TestCreateReceiver(t *testing.T) { @@ -71,9 +69,9 @@ func TestCreateReceiverGeneralConfig(t *testing.T) { factory := NewFactory() cfg := factory.CreateDefaultConfig() - sub, err := cm.Sub(config.NewComponentIDWithName(typeStr, "customname").String()) + sub, err := cm.Sub(component.NewIDWithName(typeStr, "customname").String()) require.NoError(t, err) - require.NoError(t, config.UnmarshalReceiver(sub, cfg)) + require.NoError(t, component.UnmarshalReceiverConfig(sub, cfg)) set := componenttest.NewNopReceiverCreateSettings() tReceiver, err := factory.CreateTracesReceiver(context.Background(), set, cfg, nil) diff --git a/receiver/jaegerreceiver/go.mod b/receiver/jaegerreceiver/go.mod index 3ab9e0618970..d295f5d622d4 100644 --- a/receiver/jaegerreceiver/go.mod +++ b/receiver/jaegerreceiver/go.mod @@ -9,9 +9,9 @@ require ( github.com/open-telemetry/opentelemetry-collector-contrib/internal/common v0.63.0 github.com/open-telemetry/opentelemetry-collector-contrib/pkg/translator/jaeger v0.63.0 github.com/stretchr/testify v1.8.1 - go.opentelemetry.io/collector v0.63.2-0.20221104003159-6b27644724d8 - go.opentelemetry.io/collector/pdata v0.63.2-0.20221104003159-6b27644724d8 - go.opentelemetry.io/collector/semconv v0.63.2-0.20221104003159-6b27644724d8 + go.opentelemetry.io/collector v0.63.2-0.20221108014805-0b08d5316426 + go.opentelemetry.io/collector/pdata v0.63.2-0.20221108014805-0b08d5316426 + go.opentelemetry.io/collector/semconv v0.63.2-0.20221108014805-0b08d5316426 go.uber.org/multierr v1.8.0 google.golang.org/grpc v1.50.1 ) @@ -51,7 +51,7 @@ require ( github.com/pelletier/go-toml v1.9.5 // indirect github.com/pelletier/go-toml/v2 v2.0.5 // indirect github.com/pmezard/go-difflib v1.0.0 // indirect - github.com/prometheus/client_golang v1.13.0 // indirect + github.com/prometheus/client_golang v1.13.1 // indirect github.com/prometheus/client_model v0.3.0 // indirect github.com/prometheus/common v0.37.0 // indirect github.com/prometheus/procfs v0.8.0 // indirect @@ -65,8 +65,8 @@ 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.opencensus.io v0.23.0 // indirect - go.opentelemetry.io/collector/receiver/otlpreceiver v0.0.0-20221104003159-6b27644724d8 // indirect + go.opencensus.io v0.24.0 // indirect + go.opentelemetry.io/collector/receiver/otlpreceiver v0.0.0-20221108014805-0b08d5316426 // 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 fbb22400832f..97c298fbc075 100644 --- a/receiver/jaegerreceiver/go.sum +++ b/receiver/jaegerreceiver/go.sum @@ -366,8 +366,8 @@ github.com/prometheus/client_golang v1.7.1/go.mod h1:PY5Wy2awLA44sXw4AOSfFBetzPP github.com/prometheus/client_golang v1.11.0/go.mod h1:Z6t4BnS23TR94PD6BsDNk8yVqroYurpAkEiz0P2BEV0= github.com/prometheus/client_golang v1.11.1/go.mod h1:Z6t4BnS23TR94PD6BsDNk8yVqroYurpAkEiz0P2BEV0= github.com/prometheus/client_golang v1.12.1/go.mod h1:3Z9XVyYiZYEO+YQWt3RD2R3jrbd179Rt297l4aS6nDY= -github.com/prometheus/client_golang v1.13.0 h1:b71QUfeo5M8gq2+evJdTPfZhYMAU0uKPkyPJ7TPsloU= -github.com/prometheus/client_golang v1.13.0/go.mod h1:vTeo+zgvILHsnnj/39Ou/1fPN5nJFOEMgftOUOmlvYQ= +github.com/prometheus/client_golang v1.13.1 h1:3gMjIY2+/hzmqhtUC/aQNYldJA6DtH3CgQvwS+02K1c= +github.com/prometheus/client_golang v1.13.1/go.mod h1:vTeo+zgvILHsnnj/39Ou/1fPN5nJFOEMgftOUOmlvYQ= github.com/prometheus/client_model v0.0.0-20180712105110-5c3871d89910/go.mod h1:MbSGuTsp3dbXC40dX6PRTWyKYBIrTGTE9sqQNg2J8bo= github.com/prometheus/client_model v0.0.0-20190129233127-fd36f4220a90/go.mod h1:xMI15A0UPsDsEKsMN9yxemIoYk6Tm2C1GtYGdfGttqA= github.com/prometheus/client_model v0.0.0-20190812154241-14fe0d1b01d4/go.mod h1:xMI15A0UPsDsEKsMN9yxemIoYk6Tm2C1GtYGdfGttqA= @@ -424,7 +424,6 @@ github.com/stretchr/testify v1.2.2/go.mod h1:a8OnRcib4nhh0OaRAV+Yts87kKdq0PP7pXf github.com/stretchr/testify v1.3.0/go.mod h1:M5WIy9Dh21IEIfnGCwXGc5bZfKNJtfHm1UVUgZn+9EI= github.com/stretchr/testify v1.4.0/go.mod h1:j7eGeouHqKxXV5pUuKE4zz7dFj8WfuZ+81PSLYec5m4= github.com/stretchr/testify v1.5.1/go.mod h1:5W2xD1RspED5o8YsWQXVCued0rvSQ+mT+I5cxcmMvtA= -github.com/stretchr/testify v1.6.1/go.mod h1:6Fq8oRcR53rry900zMqJjRRixrwX3KX962/h/Wwjteg= github.com/stretchr/testify v1.7.0/go.mod h1:6Fq8oRcR53rry900zMqJjRRixrwX3KX962/h/Wwjteg= github.com/stretchr/testify v1.7.1/go.mod h1:6Fq8oRcR53rry900zMqJjRRixrwX3KX962/h/Wwjteg= github.com/stretchr/testify v1.8.0/go.mod h1:yNjHg4UonilssWZ8iaSj1OCr/vHnekPRkoO+kdMU+MU= @@ -450,16 +449,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.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 h1:gqCw0LfLxScz8irSi8exQc7fyQ0fKQU/qnC/X8+V/1M= -go.opencensus.io v0.23.0/go.mod h1:XItmlyltB5F7CS4xOC1DcqMoFqwtC6OG2xF7mCv7P7E= -go.opentelemetry.io/collector v0.63.2-0.20221104003159-6b27644724d8 h1:rOT5HzXXfSISc6FiH012zH2/EFjp37UXfjEqj5BpkWQ= -go.opentelemetry.io/collector v0.63.2-0.20221104003159-6b27644724d8/go.mod h1:JVmeZXugK4ondC6KQgrHTHWiF4JttpG5k6dWPMt62+k= -go.opentelemetry.io/collector/pdata v0.63.2-0.20221104003159-6b27644724d8 h1:7xeTQjfsOm9eogQeIxjSEhlik9qsbBGsnmkQHfyKaRE= -go.opentelemetry.io/collector/pdata v0.63.2-0.20221104003159-6b27644724d8/go.mod h1:IzvXUGQml2mrnvdb8zIlEW3qQs9oFLdD2hLwJdZ+pek= -go.opentelemetry.io/collector/receiver/otlpreceiver v0.0.0-20221104003159-6b27644724d8 h1:1YsCIhhuM18flZ5fIXSDy5M/ZR027P3S52hlIYj7TPs= -go.opentelemetry.io/collector/receiver/otlpreceiver v0.0.0-20221104003159-6b27644724d8/go.mod h1:POjN0P6ae987Q5v5p/MbSVXwatmBaw7jtdMCtU/sxLk= -go.opentelemetry.io/collector/semconv v0.63.2-0.20221104003159-6b27644724d8 h1:jm0sNPyqo6S165QjQYMBHB2nK50wlJbMYM03Yr3Eo2k= -go.opentelemetry.io/collector/semconv v0.63.2-0.20221104003159-6b27644724d8/go.mod h1:5o9yhOa+ABt7g2E5JABDxGZ1PQPbtfxrKNbYn+LOTXU= +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.63.2-0.20221108014805-0b08d5316426 h1:z/wLTMh7/vNxcFUDa5uG7/IPE3tYx6pzCWPV41ghyV8= +go.opentelemetry.io/collector v0.63.2-0.20221108014805-0b08d5316426/go.mod h1:+Zb70q0Rq17dA9FcHTiTjW6g96lvJ8kAZ0c+eWNkAv0= +go.opentelemetry.io/collector/pdata v0.63.2-0.20221108014805-0b08d5316426 h1:wKDpgP0Tx/gWI2SgDGAY1OTSeihhDivbbRqFR79IGTc= +go.opentelemetry.io/collector/pdata v0.63.2-0.20221108014805-0b08d5316426/go.mod h1:IzvXUGQml2mrnvdb8zIlEW3qQs9oFLdD2hLwJdZ+pek= +go.opentelemetry.io/collector/receiver/otlpreceiver v0.0.0-20221108014805-0b08d5316426 h1:6cosCaS91068I8El0q8TJkv3V5lRzAfH2Wuja/5ydIo= +go.opentelemetry.io/collector/receiver/otlpreceiver v0.0.0-20221108014805-0b08d5316426/go.mod h1:+sGF2/LgOFWN1QClgdzg2NYCY9dYyPO4W4NAfxdODto= +go.opentelemetry.io/collector/semconv v0.63.2-0.20221108014805-0b08d5316426 h1:pqIl7OC531J6i9ttBCj3zLmZI/BSF4q323YpK0GgKGk= +go.opentelemetry.io/collector/semconv v0.63.2-0.20221108014805-0b08d5316426/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/jaegerreceiver/jaeger_agent_test.go b/receiver/jaegerreceiver/jaeger_agent_test.go index fbf987df160b..5fdcc239bba9 100644 --- a/receiver/jaegerreceiver/jaeger_agent_test.go +++ b/receiver/jaegerreceiver/jaeger_agent_test.go @@ -31,8 +31,8 @@ import ( jaegerthrift "github.com/jaegertracing/jaeger/thrift-gen/jaeger" "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" + "go.opentelemetry.io/collector/component" "go.opentelemetry.io/collector/component/componenttest" - "go.opentelemetry.io/collector/config" "go.opentelemetry.io/collector/consumer/consumertest" "go.opentelemetry.io/collector/pdata/ptrace" conventions "go.opentelemetry.io/collector/semconv/v1.6.1" @@ -42,7 +42,7 @@ import ( "github.com/open-telemetry/opentelemetry-collector-contrib/pkg/translator/jaeger" ) -var jaegerAgent = config.NewComponentIDWithName(typeStr, "agent_test") +var jaegerAgent = component.NewIDWithName(typeStr, "agent_test") func TestJaegerAgentUDP_ThriftCompact(t *testing.T) { addr := testutil.GetAvailableLocalAddress(t) diff --git a/receiver/jaegerreceiver/trace_receiver.go b/receiver/jaegerreceiver/trace_receiver.go index b88dab5e9bc7..7adca061c2e1 100644 --- a/receiver/jaegerreceiver/trace_receiver.go +++ b/receiver/jaegerreceiver/trace_receiver.go @@ -41,7 +41,6 @@ import ( "github.com/jaegertracing/jaeger/thrift-gen/sampling" "github.com/jaegertracing/jaeger/thrift-gen/zipkincore" "go.opentelemetry.io/collector/component" - "go.opentelemetry.io/collector/config" "go.opentelemetry.io/collector/config/configgrpc" "go.opentelemetry.io/collector/config/confighttp" "go.opentelemetry.io/collector/consumer" @@ -67,7 +66,7 @@ type configuration struct { // This receiver is basically a Jaeger collector. type jReceiver struct { nextConsumer consumer.Traces - id config.ComponentID + id component.ID config *configuration @@ -105,7 +104,7 @@ var ( // newJaegerReceiver creates a TracesReceiver that receives traffic as a Jaeger collector, and // also as a Jaeger agent. func newJaegerReceiver( - id config.ComponentID, + id component.ID, config *configuration, nextConsumer consumer.Traces, set component.ReceiverCreateSettings, diff --git a/receiver/jaegerreceiver/trace_receiver_test.go b/receiver/jaegerreceiver/trace_receiver_test.go index 354e8900c50f..330d5aeade6c 100644 --- a/receiver/jaegerreceiver/trace_receiver_test.go +++ b/receiver/jaegerreceiver/trace_receiver_test.go @@ -33,8 +33,8 @@ import ( jaegerthrift "github.com/jaegertracing/jaeger/thrift-gen/jaeger" "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" + "go.opentelemetry.io/collector/component" "go.opentelemetry.io/collector/component/componenttest" - "go.opentelemetry.io/collector/config" "go.opentelemetry.io/collector/config/configgrpc" "go.opentelemetry.io/collector/config/confighttp" "go.opentelemetry.io/collector/config/confignet" @@ -51,7 +51,7 @@ import ( "github.com/open-telemetry/opentelemetry-collector-contrib/pkg/translator/jaeger" ) -var jaegerReceiver = config.NewComponentIDWithName("jaeger", "receiver_test") +var jaegerReceiver = component.NewIDWithName("jaeger", "receiver_test") func TestTraceSource(t *testing.T) { set := componenttest.NewNopReceiverCreateSettings() diff --git a/receiver/jmxreceiver/config_test.go b/receiver/jmxreceiver/config_test.go index cbdb90751efd..5cb2689ee865 100644 --- a/receiver/jmxreceiver/config_test.go +++ b/receiver/jmxreceiver/config_test.go @@ -21,6 +21,7 @@ import ( "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" + "go.opentelemetry.io/collector/component" "go.opentelemetry.io/collector/config" "go.opentelemetry.io/collector/confmap/confmaptest" "go.opentelemetry.io/collector/exporter/exporterhelper" @@ -33,19 +34,19 @@ func TestLoadConfig(t *testing.T) { require.NoError(t, err) initSupportedJars() tests := []struct { - id config.ComponentID - expected config.Receiver + id component.ID + expected component.ReceiverConfig expectedErr string }{ { - id: config.NewComponentIDWithName(typeStr, ""), + id: component.NewIDWithName(typeStr, ""), expectedErr: "missing required fields: `endpoint`, `target_system`", expected: createDefaultConfig(), }, { - id: config.NewComponentIDWithName(typeStr, "all"), + id: component.NewIDWithName(typeStr, "all"), expected: &Config{ - ReceiverSettings: config.NewReceiverSettings(config.NewComponentID(typeStr)), + ReceiverSettings: config.NewReceiverSettings(component.NewID(typeStr)), JARPath: "testdata/fake_jmx.jar", Endpoint: "myendpoint:12345", TargetSystem: "jvm", @@ -79,9 +80,9 @@ func TestLoadConfig(t *testing.T) { }, }, { - id: config.NewComponentIDWithName(typeStr, "missingendpoint"), + id: component.NewIDWithName(typeStr, "missingendpoint"), expected: &Config{ - ReceiverSettings: config.NewReceiverSettings(config.NewComponentID(typeStr)), + ReceiverSettings: config.NewReceiverSettings(component.NewID(typeStr)), JARPath: "testdata/fake_jmx.jar", TargetSystem: "jvm", CollectionInterval: 10 * time.Second, @@ -94,10 +95,10 @@ func TestLoadConfig(t *testing.T) { }, }, { - id: config.NewComponentIDWithName(typeStr, "missingtarget"), + id: component.NewIDWithName(typeStr, "missingtarget"), expectedErr: "jmx missing required field: `target_system`", expected: &Config{ - ReceiverSettings: config.NewReceiverSettings(config.NewComponentID(typeStr)), + ReceiverSettings: config.NewReceiverSettings(component.NewID(typeStr)), JARPath: "testdata/fake_jmx.jar", Endpoint: "service:jmx:rmi:///jndi/rmi://host:12345/jmxrmi", CollectionInterval: 10 * time.Second, @@ -110,10 +111,10 @@ func TestLoadConfig(t *testing.T) { }, }, { - id: config.NewComponentIDWithName(typeStr, "invalidinterval"), + id: component.NewIDWithName(typeStr, "invalidinterval"), expectedErr: "`interval` must be positive: -100ms", expected: &Config{ - ReceiverSettings: config.NewReceiverSettings(config.NewComponentID(typeStr)), + ReceiverSettings: config.NewReceiverSettings(component.NewID(typeStr)), JARPath: "testdata/fake_jmx.jar", Endpoint: "myendpoint:23456", TargetSystem: "jvm", @@ -127,10 +128,10 @@ func TestLoadConfig(t *testing.T) { }, }, { - id: config.NewComponentIDWithName(typeStr, "invalidotlptimeout"), + id: component.NewIDWithName(typeStr, "invalidotlptimeout"), expectedErr: "`otlp.timeout` must be positive: -100ms", expected: &Config{ - ReceiverSettings: config.NewReceiverSettings(config.NewComponentID(typeStr)), + ReceiverSettings: config.NewReceiverSettings(component.NewID(typeStr)), JARPath: "testdata/fake_jmx.jar", Endpoint: "myendpoint:34567", TargetSystem: "jvm", @@ -145,11 +146,11 @@ func TestLoadConfig(t *testing.T) { }, { - id: config.NewComponentIDWithName(typeStr, "nonexistentjar"), + id: component.NewIDWithName(typeStr, "nonexistentjar"), // Error is different based on OS, which is why this is contains, not equals expectedErr: "error validating `jar_path`: error hashing file: open testdata/file_does_not_exist.jar:", expected: &Config{ - ReceiverSettings: config.NewReceiverSettings(config.NewComponentID(typeStr)), + ReceiverSettings: config.NewReceiverSettings(component.NewID(typeStr)), JARPath: "testdata/file_does_not_exist.jar", Endpoint: "myendpoint:23456", TargetSystem: "jvm", @@ -163,10 +164,10 @@ func TestLoadConfig(t *testing.T) { }, }, { - id: config.NewComponentIDWithName(typeStr, "invalidjar"), + id: component.NewIDWithName(typeStr, "invalidjar"), expectedErr: "error validating `jar_path`: jar hash does not match known versions", expected: &Config{ - ReceiverSettings: config.NewReceiverSettings(config.NewComponentID(typeStr)), + ReceiverSettings: config.NewReceiverSettings(component.NewID(typeStr)), JARPath: "testdata/fake_jmx_wrong.jar", Endpoint: "myendpoint:23456", TargetSystem: "jvm", @@ -180,10 +181,10 @@ func TestLoadConfig(t *testing.T) { }, }, { - id: config.NewComponentIDWithName(typeStr, "invalidloglevel"), + id: component.NewIDWithName(typeStr, "invalidloglevel"), expectedErr: "jmx `log_level` must be one of 'debug', 'error', 'info', 'off', 'trace', 'warn'", expected: &Config{ - ReceiverSettings: config.NewReceiverSettings(config.NewComponentID(typeStr)), + ReceiverSettings: config.NewReceiverSettings(component.NewID(typeStr)), JARPath: "testdata/fake_jmx.jar", Endpoint: "myendpoint:55555", TargetSystem: "jvm", @@ -198,10 +199,10 @@ func TestLoadConfig(t *testing.T) { }, }, { - id: config.NewComponentIDWithName(typeStr, "invalidtargetsystem"), + id: component.NewIDWithName(typeStr, "invalidtargetsystem"), expectedErr: "`target_system` list may only be a subset of 'activemq', 'cassandra', 'hadoop', 'hbase', 'jetty', 'jvm', 'kafka', 'kafka-consumer', 'kafka-producer', 'solr', 'tomcat', 'wildfly'", expected: &Config{ - ReceiverSettings: config.NewReceiverSettings(config.NewComponentID(typeStr)), + ReceiverSettings: config.NewReceiverSettings(component.NewID(typeStr)), JARPath: "testdata/fake_jmx.jar", Endpoint: "myendpoint:55555", TargetSystem: "jvm,fakejvmtechnology", @@ -228,7 +229,7 @@ func TestLoadConfig(t *testing.T) { sub, err := cm.Sub(tt.id.String()) require.NoError(t, err) - require.NoError(t, config.UnmarshalReceiver(sub, cfg)) + require.NoError(t, component.UnmarshalReceiverConfig(sub, cfg)) if tt.expectedErr != "" { assert.ErrorContains(t, cfg.(*Config).validate(), tt.expectedErr) @@ -252,9 +253,9 @@ func TestCustomMetricsGathererConfig(t *testing.T) { factory := NewFactory() cfg := factory.CreateDefaultConfig() - sub, err := cm.Sub(config.NewComponentIDWithName(typeStr, "invalidtargetsystem").String()) + sub, err := cm.Sub(component.NewIDWithName(typeStr, "invalidtargetsystem").String()) require.NoError(t, err) - require.NoError(t, config.UnmarshalReceiver(sub, cfg)) + require.NoError(t, component.UnmarshalReceiverConfig(sub, cfg)) conf := cfg.(*Config) diff --git a/receiver/jmxreceiver/factory.go b/receiver/jmxreceiver/factory.go index 8a69d13a40fb..9cdbeccd8254 100644 --- a/receiver/jmxreceiver/factory.go +++ b/receiver/jmxreceiver/factory.go @@ -37,9 +37,9 @@ func NewFactory() component.ReceiverFactory { component.WithMetricsReceiver(createReceiver, stability)) } -func createDefaultConfig() config.Receiver { +func createDefaultConfig() component.ReceiverConfig { return &Config{ - ReceiverSettings: config.NewReceiverSettings(config.NewComponentID(typeStr)), + ReceiverSettings: config.NewReceiverSettings(component.NewID(typeStr)), JARPath: "/opt/opentelemetry-java-contrib-jmx-metrics.jar", CollectionInterval: 10 * time.Second, OTLPExporterConfig: otlpExporterConfig{ @@ -54,7 +54,7 @@ func createDefaultConfig() config.Receiver { func createReceiver( _ context.Context, params component.ReceiverCreateSettings, - cfg config.Receiver, + cfg component.ReceiverConfig, consumer consumer.Metrics, ) (component.MetricsReceiver, error) { jmxConfig := cfg.(*Config) diff --git a/receiver/jmxreceiver/factory_test.go b/receiver/jmxreceiver/factory_test.go index a3aeb3948e38..b5fce4f332c0 100644 --- a/receiver/jmxreceiver/factory_test.go +++ b/receiver/jmxreceiver/factory_test.go @@ -20,14 +20,14 @@ import ( "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" + "go.opentelemetry.io/collector/component" "go.opentelemetry.io/collector/component/componenttest" - "go.opentelemetry.io/collector/config" "go.opentelemetry.io/collector/consumer/consumertest" ) func TestWithInvalidConfig(t *testing.T) { f := NewFactory() - assert.Equal(t, config.Type("jmx"), f.Type()) + assert.Equal(t, component.Type("jmx"), f.Type()) cfg := f.CreateDefaultConfig() require.NotNil(t, cfg) @@ -47,7 +47,7 @@ func TestWithValidConfig(t *testing.T) { defer unmockJarVersions() f := NewFactory() - assert.Equal(t, config.Type("jmx"), f.Type()) + assert.Equal(t, component.Type("jmx"), f.Type()) cfg := f.CreateDefaultConfig() cfg.(*Config).Endpoint = "myendpoint:12345" diff --git a/receiver/jmxreceiver/go.mod b/receiver/jmxreceiver/go.mod index c97aba3d0a53..a9acb9a2b7c4 100644 --- a/receiver/jmxreceiver/go.mod +++ b/receiver/jmxreceiver/go.mod @@ -7,9 +7,9 @@ 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.63.2-0.20221104003159-6b27644724d8 - go.opentelemetry.io/collector/pdata v0.63.2-0.20221104003159-6b27644724d8 - go.opentelemetry.io/collector/receiver/otlpreceiver v0.0.0-20221104003159-6b27644724d8 + go.opentelemetry.io/collector v0.63.2-0.20221108014805-0b08d5316426 + go.opentelemetry.io/collector/pdata v0.63.2-0.20221108014805-0b08d5316426 + go.opentelemetry.io/collector/receiver/otlpreceiver v0.0.0-20221108014805-0b08d5316426 go.uber.org/atomic v1.10.0 go.uber.org/zap v1.23.0 @@ -64,7 +64,7 @@ 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.opencensus.io v0.23.0 // indirect + go.opencensus.io v0.24.0 // 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 d65197fc414c..f557ca719c2b 100644 --- a/receiver/jmxreceiver/go.sum +++ b/receiver/jmxreceiver/go.sum @@ -705,7 +705,7 @@ github.com/prometheus/client_golang v1.0.0/go.mod h1:db9x61etRT2tGnBNRi70OPL5Fsn github.com/prometheus/client_golang v1.1.0/go.mod h1:I1FGZT9+L76gKKOs5djB6ezCbFQP1xR9D75/vuwEF3g= github.com/prometheus/client_golang v1.7.1/go.mod h1:PY5Wy2awLA44sXw4AOSfFBetzPP4j5+D6mVACh+pe2M= github.com/prometheus/client_golang v1.11.1/go.mod h1:Z6t4BnS23TR94PD6BsDNk8yVqroYurpAkEiz0P2BEV0= -github.com/prometheus/client_golang v1.13.0 h1:b71QUfeo5M8gq2+evJdTPfZhYMAU0uKPkyPJ7TPsloU= +github.com/prometheus/client_golang v1.13.1 h1:3gMjIY2+/hzmqhtUC/aQNYldJA6DtH3CgQvwS+02K1c= github.com/prometheus/client_model v0.0.0-20171117100541-99fa1f4be8e5/go.mod h1:MbSGuTsp3dbXC40dX6PRTWyKYBIrTGTE9sqQNg2J8bo= github.com/prometheus/client_model v0.0.0-20180712105110-5c3871d89910/go.mod h1:MbSGuTsp3dbXC40dX6PRTWyKYBIrTGTE9sqQNg2J8bo= github.com/prometheus/client_model v0.0.0-20190129233127-fd36f4220a90/go.mod h1:xMI15A0UPsDsEKsMN9yxemIoYk6Tm2C1GtYGdfGttqA= @@ -851,14 +851,14 @@ go.opencensus.io v0.21.0/go.mod h1:mSImk1erAIZhrmZN+AvHh14ztQfjbGwt4TtuofqLduU= 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.23.0 h1:gqCw0LfLxScz8irSi8exQc7fyQ0fKQU/qnC/X8+V/1M= -go.opencensus.io v0.23.0/go.mod h1:XItmlyltB5F7CS4xOC1DcqMoFqwtC6OG2xF7mCv7P7E= -go.opentelemetry.io/collector v0.63.2-0.20221104003159-6b27644724d8 h1:rOT5HzXXfSISc6FiH012zH2/EFjp37UXfjEqj5BpkWQ= -go.opentelemetry.io/collector v0.63.2-0.20221104003159-6b27644724d8/go.mod h1:JVmeZXugK4ondC6KQgrHTHWiF4JttpG5k6dWPMt62+k= -go.opentelemetry.io/collector/pdata v0.63.2-0.20221104003159-6b27644724d8 h1:7xeTQjfsOm9eogQeIxjSEhlik9qsbBGsnmkQHfyKaRE= -go.opentelemetry.io/collector/pdata v0.63.2-0.20221104003159-6b27644724d8/go.mod h1:IzvXUGQml2mrnvdb8zIlEW3qQs9oFLdD2hLwJdZ+pek= -go.opentelemetry.io/collector/receiver/otlpreceiver v0.0.0-20221104003159-6b27644724d8 h1:1YsCIhhuM18flZ5fIXSDy5M/ZR027P3S52hlIYj7TPs= -go.opentelemetry.io/collector/receiver/otlpreceiver v0.0.0-20221104003159-6b27644724d8/go.mod h1:POjN0P6ae987Q5v5p/MbSVXwatmBaw7jtdMCtU/sxLk= +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.63.2-0.20221108014805-0b08d5316426 h1:z/wLTMh7/vNxcFUDa5uG7/IPE3tYx6pzCWPV41ghyV8= +go.opentelemetry.io/collector v0.63.2-0.20221108014805-0b08d5316426/go.mod h1:+Zb70q0Rq17dA9FcHTiTjW6g96lvJ8kAZ0c+eWNkAv0= +go.opentelemetry.io/collector/pdata v0.63.2-0.20221108014805-0b08d5316426 h1:wKDpgP0Tx/gWI2SgDGAY1OTSeihhDivbbRqFR79IGTc= +go.opentelemetry.io/collector/pdata v0.63.2-0.20221108014805-0b08d5316426/go.mod h1:IzvXUGQml2mrnvdb8zIlEW3qQs9oFLdD2hLwJdZ+pek= +go.opentelemetry.io/collector/receiver/otlpreceiver v0.0.0-20221108014805-0b08d5316426 h1:6cosCaS91068I8El0q8TJkv3V5lRzAfH2Wuja/5ydIo= +go.opentelemetry.io/collector/receiver/otlpreceiver v0.0.0-20221108014805-0b08d5316426/go.mod h1:+sGF2/LgOFWN1QClgdzg2NYCY9dYyPO4W4NAfxdODto= go.opentelemetry.io/collector/semconv v0.63.1 h1:o9Zz/vwqT85XXYf9XTIXa0qkmfEY8b/JMm4lXf+dwpc= 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 bdafa0ba157b..5ca578bd6d42 100644 --- a/receiver/journaldreceiver/go.mod +++ b/receiver/journaldreceiver/go.mod @@ -5,7 +5,7 @@ go 1.18 require ( github.com/open-telemetry/opentelemetry-collector-contrib/pkg/stanza v0.63.0 github.com/stretchr/testify v1.8.1 - go.opentelemetry.io/collector v0.63.2-0.20221104003159-6b27644724d8 + go.opentelemetry.io/collector v0.63.2-0.20221108014805-0b08d5316426 ) require ( @@ -26,8 +26,8 @@ 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.1 // indirect - go.opencensus.io v0.23.0 // indirect - go.opentelemetry.io/collector/pdata v0.63.2-0.20221104003159-6b27644724d8 // indirect + go.opencensus.io v0.24.0 // indirect + go.opentelemetry.io/collector/pdata v0.63.2-0.20221108014805-0b08d5316426 // 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 3d5579ca4619..93643f5961d8 100644 --- a/receiver/journaldreceiver/go.sum +++ b/receiver/journaldreceiver/go.sum @@ -248,7 +248,7 @@ github.com/prometheus/client_golang v0.9.1/go.mod h1:7SWBe2y4D6OKWSNQJUaRYU/AaXP github.com/prometheus/client_golang v1.0.0/go.mod h1:db9x61etRT2tGnBNRi70OPL5FsnadC4Ky3P0J6CfImo= github.com/prometheus/client_golang v1.7.1/go.mod h1:PY5Wy2awLA44sXw4AOSfFBetzPP4j5+D6mVACh+pe2M= github.com/prometheus/client_golang v1.11.1/go.mod h1:Z6t4BnS23TR94PD6BsDNk8yVqroYurpAkEiz0P2BEV0= -github.com/prometheus/client_golang v1.13.0 h1:b71QUfeo5M8gq2+evJdTPfZhYMAU0uKPkyPJ7TPsloU= +github.com/prometheus/client_golang v1.13.1 h1:3gMjIY2+/hzmqhtUC/aQNYldJA6DtH3CgQvwS+02K1c= github.com/prometheus/client_model v0.0.0-20180712105110-5c3871d89910/go.mod h1:MbSGuTsp3dbXC40dX6PRTWyKYBIrTGTE9sqQNg2J8bo= github.com/prometheus/client_model v0.0.0-20190129233127-fd36f4220a90/go.mod h1:xMI15A0UPsDsEKsMN9yxemIoYk6Tm2C1GtYGdfGttqA= github.com/prometheus/client_model v0.0.0-20190812154241-14fe0d1b01d4/go.mod h1:xMI15A0UPsDsEKsMN9yxemIoYk6Tm2C1GtYGdfGttqA= @@ -292,7 +292,6 @@ github.com/stretchr/testify v1.2.2/go.mod h1:a8OnRcib4nhh0OaRAV+Yts87kKdq0PP7pXf github.com/stretchr/testify v1.3.0/go.mod h1:M5WIy9Dh21IEIfnGCwXGc5bZfKNJtfHm1UVUgZn+9EI= github.com/stretchr/testify v1.4.0/go.mod h1:j7eGeouHqKxXV5pUuKE4zz7dFj8WfuZ+81PSLYec5m4= github.com/stretchr/testify v1.5.1/go.mod h1:5W2xD1RspED5o8YsWQXVCued0rvSQ+mT+I5cxcmMvtA= -github.com/stretchr/testify v1.6.1/go.mod h1:6Fq8oRcR53rry900zMqJjRRixrwX3KX962/h/Wwjteg= github.com/stretchr/testify v1.7.0/go.mod h1:6Fq8oRcR53rry900zMqJjRRixrwX3KX962/h/Wwjteg= github.com/stretchr/testify v1.7.1/go.mod h1:6Fq8oRcR53rry900zMqJjRRixrwX3KX962/h/Wwjteg= github.com/stretchr/testify v1.8.0/go.mod h1:yNjHg4UonilssWZ8iaSj1OCr/vHnekPRkoO+kdMU+MU= @@ -304,12 +303,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.opencensus.io v0.23.0 h1:gqCw0LfLxScz8irSi8exQc7fyQ0fKQU/qnC/X8+V/1M= -go.opencensus.io v0.23.0/go.mod h1:XItmlyltB5F7CS4xOC1DcqMoFqwtC6OG2xF7mCv7P7E= -go.opentelemetry.io/collector v0.63.2-0.20221104003159-6b27644724d8 h1:rOT5HzXXfSISc6FiH012zH2/EFjp37UXfjEqj5BpkWQ= -go.opentelemetry.io/collector v0.63.2-0.20221104003159-6b27644724d8/go.mod h1:JVmeZXugK4ondC6KQgrHTHWiF4JttpG5k6dWPMt62+k= -go.opentelemetry.io/collector/pdata v0.63.2-0.20221104003159-6b27644724d8 h1:7xeTQjfsOm9eogQeIxjSEhlik9qsbBGsnmkQHfyKaRE= -go.opentelemetry.io/collector/pdata v0.63.2-0.20221104003159-6b27644724d8/go.mod h1:IzvXUGQml2mrnvdb8zIlEW3qQs9oFLdD2hLwJdZ+pek= +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.63.2-0.20221108014805-0b08d5316426 h1:z/wLTMh7/vNxcFUDa5uG7/IPE3tYx6pzCWPV41ghyV8= +go.opentelemetry.io/collector v0.63.2-0.20221108014805-0b08d5316426/go.mod h1:+Zb70q0Rq17dA9FcHTiTjW6g96lvJ8kAZ0c+eWNkAv0= +go.opentelemetry.io/collector/pdata v0.63.2-0.20221108014805-0b08d5316426 h1:wKDpgP0Tx/gWI2SgDGAY1OTSeihhDivbbRqFR79IGTc= +go.opentelemetry.io/collector/pdata v0.63.2-0.20221108014805-0b08d5316426/go.mod h1:IzvXUGQml2mrnvdb8zIlEW3qQs9oFLdD2hLwJdZ+pek= 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/journaldreceiver/journald.go b/receiver/journaldreceiver/journald.go index b71b90f76405..ea97ad8c1087 100644 --- a/receiver/journaldreceiver/journald.go +++ b/receiver/journaldreceiver/journald.go @@ -41,15 +41,15 @@ func NewFactory() component.ReceiverFactory { type ReceiverType struct{} // Type is the receiver type -func (f ReceiverType) Type() config.Type { +func (f ReceiverType) Type() component.Type { return typeStr } // CreateDefaultConfig creates a config with type and version -func (f ReceiverType) CreateDefaultConfig() config.Receiver { +func (f ReceiverType) CreateDefaultConfig() component.ReceiverConfig { return &JournaldConfig{ BaseConfig: adapter.BaseConfig{ - ReceiverSettings: config.NewReceiverSettings(config.NewComponentID(typeStr)), + ReceiverSettings: config.NewReceiverSettings(component.NewID(typeStr)), Operators: []operator.Config{}, }, InputConfig: *journald.NewConfig(), @@ -57,7 +57,7 @@ func (f ReceiverType) CreateDefaultConfig() config.Receiver { } // BaseConfig gets the base config from config, for now -func (f ReceiverType) BaseConfig(cfg config.Receiver) adapter.BaseConfig { +func (f ReceiverType) BaseConfig(cfg component.ReceiverConfig) adapter.BaseConfig { return cfg.(*JournaldConfig).BaseConfig } @@ -68,6 +68,6 @@ type JournaldConfig struct { } // InputConfig unmarshals the input operator -func (f ReceiverType) InputConfig(cfg config.Receiver) operator.Config { +func (f ReceiverType) InputConfig(cfg component.ReceiverConfig) operator.Config { return operator.NewConfig(&cfg.(*JournaldConfig).InputConfig) } diff --git a/receiver/journaldreceiver/journald_nonlinux.go b/receiver/journaldreceiver/journald_nonlinux.go index 47145c631d3f..563d996b8d9c 100644 --- a/receiver/journaldreceiver/journald_nonlinux.go +++ b/receiver/journaldreceiver/journald_nonlinux.go @@ -46,10 +46,10 @@ type JournaldConfig struct { adapter.BaseConfig `mapstructure:",squash"` } -func createDefaultConfig() config.Receiver { +func createDefaultConfig() component.ReceiverConfig { return &JournaldConfig{ BaseConfig: adapter.BaseConfig{ - ReceiverSettings: config.NewReceiverSettings(config.NewComponentID(typeStr)), + ReceiverSettings: config.NewReceiverSettings(component.NewID(typeStr)), Operators: []operator.Config{}, }, } @@ -58,7 +58,7 @@ func createDefaultConfig() config.Receiver { func createLogsReceiver( _ context.Context, params component.ReceiverCreateSettings, - cfg config.Receiver, + cfg component.ReceiverConfig, consumer consumer.Logs, ) (component.LogsReceiver, error) { return nil, fmt.Errorf("journald is only supported on linux") diff --git a/receiver/journaldreceiver/journald_test.go b/receiver/journaldreceiver/journald_test.go index 5765ae0744c9..b2233bdc9824 100644 --- a/receiver/journaldreceiver/journald_test.go +++ b/receiver/journaldreceiver/journald_test.go @@ -24,6 +24,7 @@ import ( "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" + "go.opentelemetry.io/collector/component" "go.opentelemetry.io/collector/component/componenttest" "go.opentelemetry.io/collector/config" "go.opentelemetry.io/collector/confmap/confmaptest" @@ -40,9 +41,9 @@ func TestLoadConfig(t *testing.T) { factory := NewFactory() cfg := factory.CreateDefaultConfig() - sub, err := cm.Sub(config.NewComponentIDWithName(typeStr, "").String()) + sub, err := cm.Sub(component.NewIDWithName(typeStr, "").String()) require.NoError(t, err) - require.NoError(t, config.UnmarshalReceiver(sub, cfg)) + require.NoError(t, component.UnmarshalReceiverConfig(sub, cfg)) assert.Equal(t, testdataConfigYaml(), cfg) } @@ -52,7 +53,7 @@ func TestInputConfigFailure(t *testing.T) { factory := NewFactory() badCfg := &JournaldConfig{ BaseConfig: adapter.BaseConfig{ - ReceiverSettings: config.NewReceiverSettings(config.NewComponentID(typeStr)), + ReceiverSettings: config.NewReceiverSettings(component.NewID(typeStr)), Operators: []operator.Config{}, }, InputConfig: func() journald.Config { @@ -69,7 +70,7 @@ func TestInputConfigFailure(t *testing.T) { func testdataConfigYaml() *JournaldConfig { return &JournaldConfig{ BaseConfig: adapter.BaseConfig{ - ReceiverSettings: config.NewReceiverSettings(config.NewComponentID(typeStr)), + ReceiverSettings: config.NewReceiverSettings(component.NewID(typeStr)), Operators: []operator.Config{}, }, InputConfig: func() journald.Config { diff --git a/receiver/k8sclusterreceiver/config_test.go b/receiver/k8sclusterreceiver/config_test.go index 4615b48bd75a..32602c546b01 100644 --- a/receiver/k8sclusterreceiver/config_test.go +++ b/receiver/k8sclusterreceiver/config_test.go @@ -21,6 +21,7 @@ import ( "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" + "go.opentelemetry.io/collector/component" "go.opentelemetry.io/collector/config" "go.opentelemetry.io/collector/confmap/confmaptest" @@ -34,18 +35,18 @@ func TestLoadConfig(t *testing.T) { require.NoError(t, err) tests := []struct { - id config.ComponentID - expected config.Receiver + id component.ID + expected component.ReceiverConfig expectedErr error }{ { - id: config.NewComponentIDWithName(typeStr, ""), + id: component.NewIDWithName(typeStr, ""), expected: createDefaultConfig(), }, { - id: config.NewComponentIDWithName(typeStr, "all_settings"), + id: component.NewIDWithName(typeStr, "all_settings"), expected: &Config{ - ReceiverSettings: config.NewReceiverSettings(config.NewComponentID(typeStr)), + ReceiverSettings: config.NewReceiverSettings(component.NewID(typeStr)), Distribution: distributionKubernetes, CollectionInterval: 30 * time.Second, NodeConditionTypesToReport: []string{"Ready", "MemoryPressure"}, @@ -57,9 +58,9 @@ func TestLoadConfig(t *testing.T) { }, }, { - id: config.NewComponentIDWithName(typeStr, "partial_settings"), + id: component.NewIDWithName(typeStr, "partial_settings"), expected: &Config{ - ReceiverSettings: config.NewReceiverSettings(config.NewComponentID(typeStr)), + ReceiverSettings: config.NewReceiverSettings(component.NewID(typeStr)), Distribution: distributionOpenShift, CollectionInterval: 30 * time.Second, NodeConditionTypesToReport: []string{"Ready"}, @@ -77,7 +78,7 @@ func TestLoadConfig(t *testing.T) { sub, err := cm.Sub(tt.id.String()) require.NoError(t, err) - require.NoError(t, config.UnmarshalReceiver(sub, cfg)) + require.NoError(t, component.UnmarshalReceiverConfig(sub, cfg)) assert.NoError(t, cfg.Validate()) assert.Equal(t, tt.expected, cfg) @@ -88,7 +89,7 @@ func TestLoadConfig(t *testing.T) { func TestInvalidConfig(t *testing.T) { // No APIConfig cfg := &Config{ - ReceiverSettings: config.NewReceiverSettings(config.NewComponentIDWithName(typeStr, "all_settings")), + ReceiverSettings: config.NewReceiverSettings(component.NewIDWithName(typeStr, "all_settings")), Distribution: distributionKubernetes, CollectionInterval: 30 * time.Second, } @@ -98,7 +99,7 @@ func TestInvalidConfig(t *testing.T) { // Wrong distro cfg = &Config{ - ReceiverSettings: config.NewReceiverSettings(config.NewComponentIDWithName(typeStr, "all_settings")), + ReceiverSettings: config.NewReceiverSettings(component.NewIDWithName(typeStr, "all_settings")), Distribution: "wrong", CollectionInterval: 30 * time.Second, } diff --git a/receiver/k8sclusterreceiver/factory.go b/receiver/k8sclusterreceiver/factory.go index a568966e3e5d..fb253a61c92d 100644 --- a/receiver/k8sclusterreceiver/factory.go +++ b/receiver/k8sclusterreceiver/factory.go @@ -40,9 +40,9 @@ const ( var defaultNodeConditionsToReport = []string{"Ready"} -func createDefaultConfig() config.Receiver { +func createDefaultConfig() component.ReceiverConfig { return &Config{ - ReceiverSettings: config.NewReceiverSettings(config.NewComponentID(typeStr)), + ReceiverSettings: config.NewReceiverSettings(component.NewID(typeStr)), Distribution: defaultDistribution, CollectionInterval: defaultCollectionInterval, NodeConditionTypesToReport: defaultNodeConditionsToReport, diff --git a/receiver/k8sclusterreceiver/factory_test.go b/receiver/k8sclusterreceiver/factory_test.go index d66ce933c088..3cf76d386b4d 100644 --- a/receiver/k8sclusterreceiver/factory_test.go +++ b/receiver/k8sclusterreceiver/factory_test.go @@ -34,14 +34,14 @@ import ( func TestFactory(t *testing.T) { f := NewFactory() - require.Equal(t, config.Type("k8s_cluster"), f.Type()) + require.Equal(t, component.Type("k8s_cluster"), f.Type()) cfg := f.CreateDefaultConfig() rCfg, ok := cfg.(*Config) require.True(t, ok) require.Equal(t, &Config{ - ReceiverSettings: config.NewReceiverSettings(config.NewComponentID(typeStr)), + ReceiverSettings: config.NewReceiverSettings(component.NewID(typeStr)), Distribution: distributionKubernetes, CollectionInterval: 10 * time.Second, NodeConditionTypesToReport: defaultNodeConditionsToReport, @@ -71,7 +71,7 @@ func TestFactory(t *testing.T) { func TestFactoryDistributions(t *testing.T) { f := NewFactory() - require.Equal(t, config.Type("k8s_cluster"), f.Type()) + require.Equal(t, component.Type("k8s_cluster"), f.Type()) cfg := f.CreateDefaultConfig() rCfg, ok := cfg.(*Config) @@ -115,19 +115,19 @@ var _ component.Host = (*nopHostWithExporters)(nil) func (n nopHostWithExporters) ReportFatalError(error) { } -func (n nopHostWithExporters) GetFactory(component.Kind, config.Type) component.Factory { +func (n nopHostWithExporters) GetFactory(component.Kind, component.Type) component.Factory { return nil } -func (n nopHostWithExporters) GetExtensions() map[config.ComponentID]component.Extension { +func (n nopHostWithExporters) GetExtensions() map[component.ID]component.Extension { return nil } -func (n nopHostWithExporters) GetExporters() map[config.DataType]map[config.ComponentID]component.Exporter { - return map[config.DataType]map[config.ComponentID]component.Exporter{ - config.MetricsDataType: { - config.NewComponentIDWithName("nop", "withoutmetadata"): MockExporter{}, - config.NewComponentIDWithName("nop", "withmetadata"): mockExporterWithK8sMetadata{}, +func (n nopHostWithExporters) GetExporters() map[component.DataType]map[component.ID]component.Exporter { + return map[component.DataType]map[component.ID]component.Exporter{ + component.DataTypeMetrics: { + component.NewIDWithName("nop", "withoutmetadata"): MockExporter{}, + component.NewIDWithName("nop", "withmetadata"): mockExporterWithK8sMetadata{}, }, } } diff --git a/receiver/k8sclusterreceiver/go.mod b/receiver/k8sclusterreceiver/go.mod index d939efd64158..2e353d3c0874 100644 --- a/receiver/k8sclusterreceiver/go.mod +++ b/receiver/k8sclusterreceiver/go.mod @@ -12,9 +12,9 @@ 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.63.2-0.20221104003159-6b27644724d8 - go.opentelemetry.io/collector/pdata v0.63.2-0.20221104003159-6b27644724d8 - go.opentelemetry.io/collector/semconv v0.63.2-0.20221104003159-6b27644724d8 + go.opentelemetry.io/collector v0.63.2-0.20221108014805-0b08d5316426 + go.opentelemetry.io/collector/pdata v0.63.2-0.20221108014805-0b08d5316426 + go.opentelemetry.io/collector/semconv v0.63.2-0.20221108014805-0b08d5316426 go.uber.org/atomic v1.10.0 go.uber.org/zap v1.23.0 google.golang.org/protobuf v1.28.1 @@ -61,13 +61,13 @@ require ( github.com/open-telemetry/opentelemetry-collector-contrib/internal/coreinternal v0.63.0 // indirect github.com/pkg/errors v0.9.1 // indirect github.com/pmezard/go-difflib v1.0.0 // indirect - github.com/prometheus/client_golang v1.13.0 // indirect + github.com/prometheus/client_golang v1.13.1 // indirect github.com/prometheus/client_model v0.3.0 // indirect 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 github.com/spf13/pflag v1.0.5 // indirect - go.opencensus.io v0.23.0 // indirect + go.opencensus.io v0.24.0 // 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 e89436ca027d..2231552dfec3 100644 --- a/receiver/k8sclusterreceiver/go.sum +++ b/receiver/k8sclusterreceiver/go.sum @@ -396,8 +396,9 @@ github.com/prometheus/client_golang v1.11.0/go.mod h1:Z6t4BnS23TR94PD6BsDNk8yVqr github.com/prometheus/client_golang v1.11.1/go.mod h1:Z6t4BnS23TR94PD6BsDNk8yVqroYurpAkEiz0P2BEV0= github.com/prometheus/client_golang v1.12.1/go.mod h1:3Z9XVyYiZYEO+YQWt3RD2R3jrbd179Rt297l4aS6nDY= github.com/prometheus/client_golang v1.12.2/go.mod h1:3Z9XVyYiZYEO+YQWt3RD2R3jrbd179Rt297l4aS6nDY= -github.com/prometheus/client_golang v1.13.0 h1:b71QUfeo5M8gq2+evJdTPfZhYMAU0uKPkyPJ7TPsloU= github.com/prometheus/client_golang v1.13.0/go.mod h1:vTeo+zgvILHsnnj/39Ou/1fPN5nJFOEMgftOUOmlvYQ= +github.com/prometheus/client_golang v1.13.1 h1:3gMjIY2+/hzmqhtUC/aQNYldJA6DtH3CgQvwS+02K1c= +github.com/prometheus/client_golang v1.13.1/go.mod h1:vTeo+zgvILHsnnj/39Ou/1fPN5nJFOEMgftOUOmlvYQ= github.com/prometheus/client_model v0.0.0-20180712105110-5c3871d89910/go.mod h1:MbSGuTsp3dbXC40dX6PRTWyKYBIrTGTE9sqQNg2J8bo= github.com/prometheus/client_model v0.0.0-20190129233127-fd36f4220a90/go.mod h1:xMI15A0UPsDsEKsMN9yxemIoYk6Tm2C1GtYGdfGttqA= github.com/prometheus/client_model v0.0.0-20190812154241-14fe0d1b01d4/go.mod h1:xMI15A0UPsDsEKsMN9yxemIoYk6Tm2C1GtYGdfGttqA= @@ -464,14 +465,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.opencensus.io v0.23.0 h1:gqCw0LfLxScz8irSi8exQc7fyQ0fKQU/qnC/X8+V/1M= go.opencensus.io v0.23.0/go.mod h1:XItmlyltB5F7CS4xOC1DcqMoFqwtC6OG2xF7mCv7P7E= -go.opentelemetry.io/collector v0.63.2-0.20221104003159-6b27644724d8 h1:rOT5HzXXfSISc6FiH012zH2/EFjp37UXfjEqj5BpkWQ= -go.opentelemetry.io/collector v0.63.2-0.20221104003159-6b27644724d8/go.mod h1:JVmeZXugK4ondC6KQgrHTHWiF4JttpG5k6dWPMt62+k= -go.opentelemetry.io/collector/pdata v0.63.2-0.20221104003159-6b27644724d8 h1:7xeTQjfsOm9eogQeIxjSEhlik9qsbBGsnmkQHfyKaRE= -go.opentelemetry.io/collector/pdata v0.63.2-0.20221104003159-6b27644724d8/go.mod h1:IzvXUGQml2mrnvdb8zIlEW3qQs9oFLdD2hLwJdZ+pek= -go.opentelemetry.io/collector/semconv v0.63.2-0.20221104003159-6b27644724d8 h1:jm0sNPyqo6S165QjQYMBHB2nK50wlJbMYM03Yr3Eo2k= -go.opentelemetry.io/collector/semconv v0.63.2-0.20221104003159-6b27644724d8/go.mod h1:5o9yhOa+ABt7g2E5JABDxGZ1PQPbtfxrKNbYn+LOTXU= +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.63.2-0.20221108014805-0b08d5316426 h1:z/wLTMh7/vNxcFUDa5uG7/IPE3tYx6pzCWPV41ghyV8= +go.opentelemetry.io/collector v0.63.2-0.20221108014805-0b08d5316426/go.mod h1:+Zb70q0Rq17dA9FcHTiTjW6g96lvJ8kAZ0c+eWNkAv0= +go.opentelemetry.io/collector/pdata v0.63.2-0.20221108014805-0b08d5316426 h1:wKDpgP0Tx/gWI2SgDGAY1OTSeihhDivbbRqFR79IGTc= +go.opentelemetry.io/collector/pdata v0.63.2-0.20221108014805-0b08d5316426/go.mod h1:IzvXUGQml2mrnvdb8zIlEW3qQs9oFLdD2hLwJdZ+pek= +go.opentelemetry.io/collector/semconv v0.63.2-0.20221108014805-0b08d5316426 h1:pqIl7OC531J6i9ttBCj3zLmZI/BSF4q323YpK0GgKGk= +go.opentelemetry.io/collector/semconv v0.63.2-0.20221108014805-0b08d5316426/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/k8sclusterreceiver/receiver.go b/receiver/k8sclusterreceiver/receiver.go index 7f6a34b7919f..415bca1e8a9d 100644 --- a/receiver/k8sclusterreceiver/receiver.go +++ b/receiver/k8sclusterreceiver/receiver.go @@ -21,7 +21,6 @@ import ( "time" "go.opentelemetry.io/collector/component" - "go.opentelemetry.io/collector/config" "go.opentelemetry.io/collector/consumer" "go.opentelemetry.io/collector/obsreport" ) @@ -53,7 +52,7 @@ func (kr *kubernetesReceiver) Start(ctx context.Context, host component.Host) er exporters := host.GetExporters() if err := kr.resourceWatcher.setupMetadataExporters( - exporters[config.MetricsDataType], kr.config.MetadataExporters); err != nil { + exporters[component.DataTypeMetrics], kr.config.MetadataExporters); err != nil { return err } @@ -115,7 +114,7 @@ func (kr *kubernetesReceiver) dispatchMetrics(ctx context.Context) { } // newReceiver creates the Kubernetes cluster receiver with the given configuration. -func newReceiver(_ context.Context, set component.ReceiverCreateSettings, cfg config.Receiver, consumer consumer.Metrics) (component.MetricsReceiver, error) { +func newReceiver(_ context.Context, set component.ReceiverCreateSettings, cfg component.ReceiverConfig, consumer consumer.Metrics) (component.MetricsReceiver, error) { rCfg := cfg.(*Config) return &kubernetesReceiver{ resourceWatcher: newResourceWatcher(set.Logger, rCfg), diff --git a/receiver/k8sclusterreceiver/watcher.go b/receiver/k8sclusterreceiver/watcher.go index aef707173996..e66a40237edf 100644 --- a/receiver/k8sclusterreceiver/watcher.go +++ b/receiver/k8sclusterreceiver/watcher.go @@ -23,7 +23,6 @@ import ( quotaclientset "github.com/openshift/client-go/quota/clientset/versioned" quotainformersv1 "github.com/openshift/client-go/quota/informers/externalversions" "go.opentelemetry.io/collector/component" - "go.opentelemetry.io/collector/config" "go.uber.org/atomic" "go.uber.org/zap" apierrors "k8s.io/apimachinery/pkg/api/errors" @@ -282,7 +281,7 @@ func (rw *resourceWatcher) waitForInitialInformerSync() { } func (rw *resourceWatcher) setupMetadataExporters( - exporters map[config.ComponentID]component.Exporter, + exporters map[component.ID]component.Exporter, metadataExportersFromConfig []string, ) error { var out []metadataConsumer @@ -311,7 +310,7 @@ func (rw *resourceWatcher) setupMetadataExporters( } func validateMetadataExporters(metadataExporters map[string]bool, - exporters map[config.ComponentID]component.Exporter, + exporters map[component.ID]component.Exporter, ) error { configuredExporters := map[string]bool{} for cfg := range exporters { diff --git a/receiver/k8sclusterreceiver/watcher_test.go b/receiver/k8sclusterreceiver/watcher_test.go index d115671aa8c9..71a82be8f70e 100644 --- a/receiver/k8sclusterreceiver/watcher_test.go +++ b/receiver/k8sclusterreceiver/watcher_test.go @@ -20,7 +20,6 @@ import ( "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" "go.opentelemetry.io/collector/component" - "go.opentelemetry.io/collector/config" "go.uber.org/zap" "go.uber.org/zap/zaptest/observer" metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" @@ -37,7 +36,7 @@ func TestSetupMetadataExporters(t *testing.T) { metadataConsumers []metadataConsumer } type args struct { - exporters map[config.ComponentID]component.Exporter + exporters map[component.ID]component.Exporter metadataExportersFromConfig []string } tests := []struct { @@ -50,8 +49,8 @@ func TestSetupMetadataExporters(t *testing.T) { "Unsupported exporter", fields{}, args{ - exporters: map[config.ComponentID]component.Exporter{ - config.NewComponentID("nop"): MockExporter{}, + exporters: map[component.ID]component.Exporter{ + component.NewID("nop"): MockExporter{}, }, metadataExportersFromConfig: []string{"nop"}, }, @@ -62,8 +61,8 @@ func TestSetupMetadataExporters(t *testing.T) { fields{ metadataConsumers: []metadataConsumer{(&mockExporterWithK8sMetadata{}).ConsumeMetadata}, }, - args{exporters: map[config.ComponentID]component.Exporter{ - config.NewComponentID("nop"): mockExporterWithK8sMetadata{}, + args{exporters: map[component.ID]component.Exporter{ + component.NewID("nop"): mockExporterWithK8sMetadata{}, }, metadataExportersFromConfig: []string{"nop"}, }, @@ -74,8 +73,8 @@ func TestSetupMetadataExporters(t *testing.T) { fields{ metadataConsumers: []metadataConsumer{}, }, - args{exporters: map[config.ComponentID]component.Exporter{ - config.NewComponentID("nop"): mockExporterWithK8sMetadata{}, + args{exporters: map[component.ID]component.Exporter{ + component.NewID("nop"): mockExporterWithK8sMetadata{}, }, metadataExportersFromConfig: []string{"nop/1"}, }, diff --git a/receiver/k8seventsreceiver/config_test.go b/receiver/k8seventsreceiver/config_test.go index 902cd5f76a37..81df799a91b4 100644 --- a/receiver/k8seventsreceiver/config_test.go +++ b/receiver/k8seventsreceiver/config_test.go @@ -20,6 +20,7 @@ import ( "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" + "go.opentelemetry.io/collector/component" "go.opentelemetry.io/collector/config" "go.opentelemetry.io/collector/confmap/confmaptest" @@ -33,18 +34,18 @@ func TestLoadConfig(t *testing.T) { require.NoError(t, err) tests := []struct { - id config.ComponentID - expected config.Receiver + id component.ID + expected component.ReceiverConfig expectedErr error }{ { - id: config.NewComponentIDWithName(typeStr, ""), + id: component.NewIDWithName(typeStr, ""), expected: createDefaultConfig(), }, { - id: config.NewComponentIDWithName(typeStr, "all_settings"), + id: component.NewIDWithName(typeStr, "all_settings"), expected: &Config{ - ReceiverSettings: config.NewReceiverSettings(config.NewComponentID(typeStr)), + ReceiverSettings: config.NewReceiverSettings(component.NewID(typeStr)), Namespaces: []string{"default", "my_namespace"}, APIConfig: k8sconfig.APIConfig{ AuthType: k8sconfig.AuthTypeServiceAccount, @@ -60,7 +61,7 @@ func TestLoadConfig(t *testing.T) { sub, err := cm.Sub(tt.id.String()) require.NoError(t, err) - require.NoError(t, config.UnmarshalReceiver(sub, cfg)) + require.NoError(t, component.UnmarshalReceiverConfig(sub, cfg)) assert.NoError(t, cfg.Validate()) assert.Equal(t, tt.expected, cfg) diff --git a/receiver/k8seventsreceiver/factory.go b/receiver/k8seventsreceiver/factory.go index ba4f9d9461a8..0c87a0f07d61 100644 --- a/receiver/k8seventsreceiver/factory.go +++ b/receiver/k8seventsreceiver/factory.go @@ -39,9 +39,9 @@ func NewFactory() component.ReceiverFactory { component.WithLogsReceiver(createLogsReceiver, stability)) } -func createDefaultConfig() config.Receiver { +func createDefaultConfig() component.ReceiverConfig { return &Config{ - ReceiverSettings: config.NewReceiverSettings(config.NewComponentID(typeStr)), + ReceiverSettings: config.NewReceiverSettings(component.NewID(typeStr)), APIConfig: k8sconfig.APIConfig{ AuthType: k8sconfig.AuthTypeServiceAccount, }, @@ -51,7 +51,7 @@ func createDefaultConfig() config.Receiver { func createLogsReceiver( _ context.Context, params component.ReceiverCreateSettings, - cfg config.Receiver, + cfg component.ReceiverConfig, consumer consumer.Logs, ) (component.LogsReceiver, error) { rCfg := cfg.(*Config) diff --git a/receiver/k8seventsreceiver/factory_test.go b/receiver/k8seventsreceiver/factory_test.go index ea2eda2773b8..825efea5bfd0 100644 --- a/receiver/k8seventsreceiver/factory_test.go +++ b/receiver/k8seventsreceiver/factory_test.go @@ -20,6 +20,7 @@ import ( "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" + "go.opentelemetry.io/collector/component" "go.opentelemetry.io/collector/component/componenttest" "go.opentelemetry.io/collector/config" "go.opentelemetry.io/collector/consumer/consumertest" @@ -35,7 +36,7 @@ func TestDefaultConfig(t *testing.T) { require.True(t, ok) assert.Equal(t, &Config{ - ReceiverSettings: config.NewReceiverSettings(config.NewComponentID(typeStr)), + ReceiverSettings: config.NewReceiverSettings(component.NewID(typeStr)), APIConfig: k8sconfig.APIConfig{ AuthType: k8sconfig.AuthTypeServiceAccount, }, @@ -43,7 +44,7 @@ func TestDefaultConfig(t *testing.T) { } func TestFactoryType(t *testing.T) { - assert.Equal(t, config.Type("k8s_events"), NewFactory().Type()) + assert.Equal(t, component.Type("k8s_events"), NewFactory().Type()) } func TestCreateReceiver(t *testing.T) { diff --git a/receiver/k8seventsreceiver/go.mod b/receiver/k8seventsreceiver/go.mod index 24092cd6bb0d..b11bd5fba943 100644 --- a/receiver/k8seventsreceiver/go.mod +++ b/receiver/k8seventsreceiver/go.mod @@ -5,9 +5,9 @@ go 1.18 require ( github.com/open-telemetry/opentelemetry-collector-contrib/internal/k8sconfig v0.63.0 github.com/stretchr/testify v1.8.1 - go.opentelemetry.io/collector v0.63.2-0.20221104003159-6b27644724d8 - go.opentelemetry.io/collector/pdata v0.63.2-0.20221104003159-6b27644724d8 - go.opentelemetry.io/collector/semconv v0.63.2-0.20221104003159-6b27644724d8 + go.opentelemetry.io/collector v0.63.2-0.20221108014805-0b08d5316426 + go.opentelemetry.io/collector/pdata v0.63.2-0.20221108014805-0b08d5316426 + go.opentelemetry.io/collector/semconv v0.63.2-0.20221108014805-0b08d5316426 go.uber.org/zap v1.23.0 k8s.io/api v0.25.3 k8s.io/apimachinery v0.25.3 @@ -48,7 +48,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.opencensus.io v0.23.0 // indirect + go.opencensus.io v0.24.0 // 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 86edacc99296..6d54238be55e 100644 --- a/receiver/k8seventsreceiver/go.sum +++ b/receiver/k8seventsreceiver/go.sum @@ -386,7 +386,7 @@ github.com/prometheus/client_golang v0.9.1/go.mod h1:7SWBe2y4D6OKWSNQJUaRYU/AaXP github.com/prometheus/client_golang v1.0.0/go.mod h1:db9x61etRT2tGnBNRi70OPL5FsnadC4Ky3P0J6CfImo= github.com/prometheus/client_golang v1.7.1/go.mod h1:PY5Wy2awLA44sXw4AOSfFBetzPP4j5+D6mVACh+pe2M= github.com/prometheus/client_golang v1.11.1/go.mod h1:Z6t4BnS23TR94PD6BsDNk8yVqroYurpAkEiz0P2BEV0= -github.com/prometheus/client_golang v1.13.0 h1:b71QUfeo5M8gq2+evJdTPfZhYMAU0uKPkyPJ7TPsloU= +github.com/prometheus/client_golang v1.13.1 h1:3gMjIY2+/hzmqhtUC/aQNYldJA6DtH3CgQvwS+02K1c= github.com/prometheus/client_model v0.0.0-20180712105110-5c3871d89910/go.mod h1:MbSGuTsp3dbXC40dX6PRTWyKYBIrTGTE9sqQNg2J8bo= github.com/prometheus/client_model v0.0.0-20190129233127-fd36f4220a90/go.mod h1:xMI15A0UPsDsEKsMN9yxemIoYk6Tm2C1GtYGdfGttqA= github.com/prometheus/client_model v0.0.0-20190812154241-14fe0d1b01d4/go.mod h1:xMI15A0UPsDsEKsMN9yxemIoYk6Tm2C1GtYGdfGttqA= @@ -448,14 +448,14 @@ 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.opencensus.io v0.23.0 h1:gqCw0LfLxScz8irSi8exQc7fyQ0fKQU/qnC/X8+V/1M= -go.opencensus.io v0.23.0/go.mod h1:XItmlyltB5F7CS4xOC1DcqMoFqwtC6OG2xF7mCv7P7E= -go.opentelemetry.io/collector v0.63.2-0.20221104003159-6b27644724d8 h1:rOT5HzXXfSISc6FiH012zH2/EFjp37UXfjEqj5BpkWQ= -go.opentelemetry.io/collector v0.63.2-0.20221104003159-6b27644724d8/go.mod h1:JVmeZXugK4ondC6KQgrHTHWiF4JttpG5k6dWPMt62+k= -go.opentelemetry.io/collector/pdata v0.63.2-0.20221104003159-6b27644724d8 h1:7xeTQjfsOm9eogQeIxjSEhlik9qsbBGsnmkQHfyKaRE= -go.opentelemetry.io/collector/pdata v0.63.2-0.20221104003159-6b27644724d8/go.mod h1:IzvXUGQml2mrnvdb8zIlEW3qQs9oFLdD2hLwJdZ+pek= -go.opentelemetry.io/collector/semconv v0.63.2-0.20221104003159-6b27644724d8 h1:jm0sNPyqo6S165QjQYMBHB2nK50wlJbMYM03Yr3Eo2k= -go.opentelemetry.io/collector/semconv v0.63.2-0.20221104003159-6b27644724d8/go.mod h1:5o9yhOa+ABt7g2E5JABDxGZ1PQPbtfxrKNbYn+LOTXU= +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.63.2-0.20221108014805-0b08d5316426 h1:z/wLTMh7/vNxcFUDa5uG7/IPE3tYx6pzCWPV41ghyV8= +go.opentelemetry.io/collector v0.63.2-0.20221108014805-0b08d5316426/go.mod h1:+Zb70q0Rq17dA9FcHTiTjW6g96lvJ8kAZ0c+eWNkAv0= +go.opentelemetry.io/collector/pdata v0.63.2-0.20221108014805-0b08d5316426 h1:wKDpgP0Tx/gWI2SgDGAY1OTSeihhDivbbRqFR79IGTc= +go.opentelemetry.io/collector/pdata v0.63.2-0.20221108014805-0b08d5316426/go.mod h1:IzvXUGQml2mrnvdb8zIlEW3qQs9oFLdD2hLwJdZ+pek= +go.opentelemetry.io/collector/semconv v0.63.2-0.20221108014805-0b08d5316426 h1:pqIl7OC531J6i9ttBCj3zLmZI/BSF4q323YpK0GgKGk= +go.opentelemetry.io/collector/semconv v0.63.2-0.20221108014805-0b08d5316426/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_test.go b/receiver/k8sobjectsreceiver/config_test.go index 297aca2901c9..b34728615e24 100644 --- a/receiver/k8sobjectsreceiver/config_test.go +++ b/receiver/k8sobjectsreceiver/config_test.go @@ -21,7 +21,7 @@ import ( "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" - "go.opentelemetry.io/collector/config" + "go.opentelemetry.io/collector/component" "go.opentelemetry.io/collector/confmap/confmaptest" "k8s.io/apimachinery/pkg/runtime/schema" ) @@ -37,7 +37,7 @@ func TestLoadConfig(t *testing.T) { sub, err := cm.Sub("k8sobjects") require.NoError(t, err) - require.NoError(t, config.UnmarshalReceiver(sub, cfg)) + require.NoError(t, component.UnmarshalReceiverConfig(sub, cfg)) require.NotNil(t, cfg) err = cfg.Validate() @@ -88,7 +88,7 @@ func TestValidConfigs(t *testing.T) { sub, err := cm.Sub("k8sobjects/invalid_resource") require.NoError(t, err) - require.NoError(t, config.UnmarshalReceiver(sub, cfg)) + require.NoError(t, component.UnmarshalReceiverConfig(sub, cfg)) cfg.makeDiscoveryClient = getMockDiscoveryClient diff --git a/receiver/k8sobjectsreceiver/factory.go b/receiver/k8sobjectsreceiver/factory.go index 35801ffff51d..b8f4edbcfb96 100644 --- a/receiver/k8sobjectsreceiver/factory.go +++ b/receiver/k8sobjectsreceiver/factory.go @@ -40,9 +40,9 @@ func NewFactory() component.ReceiverFactory { ) } -func createDefaultConfig() config.Receiver { +func createDefaultConfig() component.ReceiverConfig { return &Config{ - ReceiverSettings: config.NewReceiverSettings(config.NewComponentID(typeStr)), + ReceiverSettings: config.NewReceiverSettings(component.NewID(typeStr)), APIConfig: k8sconfig.APIConfig{ AuthType: k8sconfig.AuthTypeServiceAccount, }, @@ -52,7 +52,7 @@ func createDefaultConfig() config.Receiver { func createLogsReceiver( _ context.Context, params component.ReceiverCreateSettings, - cfg config.Receiver, + cfg component.ReceiverConfig, consumer consumer.Logs, ) (component.LogsReceiver, error) { rcfg := cfg.(*Config) diff --git a/receiver/k8sobjectsreceiver/factory_test.go b/receiver/k8sobjectsreceiver/factory_test.go index 912950103da7..dbd0b199b842 100644 --- a/receiver/k8sobjectsreceiver/factory_test.go +++ b/receiver/k8sobjectsreceiver/factory_test.go @@ -20,6 +20,7 @@ import ( "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" + "go.opentelemetry.io/collector/component" "go.opentelemetry.io/collector/component/componenttest" "go.opentelemetry.io/collector/config" "go.opentelemetry.io/collector/consumer/consumertest" @@ -34,7 +35,7 @@ func TestDefaultConfig(t *testing.T) { require.True(t, ok) assert.Equal(t, &Config{ - ReceiverSettings: config.NewReceiverSettings(config.NewComponentID("k8sobjects")), + ReceiverSettings: config.NewReceiverSettings(component.NewID("k8sobjects")), APIConfig: k8sconfig.APIConfig{ AuthType: k8sconfig.AuthTypeServiceAccount, }, @@ -43,7 +44,7 @@ func TestDefaultConfig(t *testing.T) { func TestFactoryType(t *testing.T) { t.Parallel() - assert.Equal(t, config.Type("k8sobjects"), NewFactory().Type()) + assert.Equal(t, component.Type("k8sobjects"), NewFactory().Type()) } func TestCreateReceiver(t *testing.T) { diff --git a/receiver/k8sobjectsreceiver/go.mod b/receiver/k8sobjectsreceiver/go.mod index ff5d037aa0fa..88ad195cf615 100644 --- a/receiver/k8sobjectsreceiver/go.mod +++ b/receiver/k8sobjectsreceiver/go.mod @@ -4,9 +4,9 @@ go 1.18 require ( github.com/stretchr/testify v1.8.1 - go.opentelemetry.io/collector v0.63.2-0.20221104003159-6b27644724d8 - go.opentelemetry.io/collector/pdata v0.63.2-0.20221104003159-6b27644724d8 - go.opentelemetry.io/collector/semconv v0.63.2-0.20221104003159-6b27644724d8 + go.opentelemetry.io/collector v0.63.2-0.20221108014805-0b08d5316426 + go.opentelemetry.io/collector/pdata v0.63.2-0.20221108014805-0b08d5316426 + go.opentelemetry.io/collector/semconv v0.63.2-0.20221108014805-0b08d5316426 go.uber.org/zap v1.23.0 k8s.io/apimachinery v0.25.3 k8s.io/client-go v0.25.3 @@ -17,7 +17,7 @@ require ( github.com/openshift/api v0.0.0-20210521075222-e273a339932a // indirect github.com/openshift/client-go v0.0.0-20210521082421-73d9475a9142 // indirect github.com/spf13/pflag v1.0.5 // indirect - go.opencensus.io v0.23.0 // indirect + go.opencensus.io v0.24.0 // indirect ) require ( diff --git a/receiver/k8sobjectsreceiver/go.sum b/receiver/k8sobjectsreceiver/go.sum index 77369b3e913f..d6ed423365eb 100644 --- a/receiver/k8sobjectsreceiver/go.sum +++ b/receiver/k8sobjectsreceiver/go.sum @@ -380,7 +380,7 @@ github.com/prometheus/client_golang v0.9.1/go.mod h1:7SWBe2y4D6OKWSNQJUaRYU/AaXP github.com/prometheus/client_golang v1.0.0/go.mod h1:db9x61etRT2tGnBNRi70OPL5FsnadC4Ky3P0J6CfImo= github.com/prometheus/client_golang v1.7.1/go.mod h1:PY5Wy2awLA44sXw4AOSfFBetzPP4j5+D6mVACh+pe2M= github.com/prometheus/client_golang v1.11.1/go.mod h1:Z6t4BnS23TR94PD6BsDNk8yVqroYurpAkEiz0P2BEV0= -github.com/prometheus/client_golang v1.13.0 h1:b71QUfeo5M8gq2+evJdTPfZhYMAU0uKPkyPJ7TPsloU= +github.com/prometheus/client_golang v1.13.1 h1:3gMjIY2+/hzmqhtUC/aQNYldJA6DtH3CgQvwS+02K1c= github.com/prometheus/client_model v0.0.0-20180712105110-5c3871d89910/go.mod h1:MbSGuTsp3dbXC40dX6PRTWyKYBIrTGTE9sqQNg2J8bo= github.com/prometheus/client_model v0.0.0-20190129233127-fd36f4220a90/go.mod h1:xMI15A0UPsDsEKsMN9yxemIoYk6Tm2C1GtYGdfGttqA= github.com/prometheus/client_model v0.0.0-20190812154241-14fe0d1b01d4/go.mod h1:xMI15A0UPsDsEKsMN9yxemIoYk6Tm2C1GtYGdfGttqA= @@ -440,14 +440,14 @@ 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.opencensus.io v0.23.0 h1:gqCw0LfLxScz8irSi8exQc7fyQ0fKQU/qnC/X8+V/1M= -go.opencensus.io v0.23.0/go.mod h1:XItmlyltB5F7CS4xOC1DcqMoFqwtC6OG2xF7mCv7P7E= -go.opentelemetry.io/collector v0.63.2-0.20221104003159-6b27644724d8 h1:rOT5HzXXfSISc6FiH012zH2/EFjp37UXfjEqj5BpkWQ= -go.opentelemetry.io/collector v0.63.2-0.20221104003159-6b27644724d8/go.mod h1:JVmeZXugK4ondC6KQgrHTHWiF4JttpG5k6dWPMt62+k= -go.opentelemetry.io/collector/pdata v0.63.2-0.20221104003159-6b27644724d8 h1:7xeTQjfsOm9eogQeIxjSEhlik9qsbBGsnmkQHfyKaRE= -go.opentelemetry.io/collector/pdata v0.63.2-0.20221104003159-6b27644724d8/go.mod h1:IzvXUGQml2mrnvdb8zIlEW3qQs9oFLdD2hLwJdZ+pek= -go.opentelemetry.io/collector/semconv v0.63.2-0.20221104003159-6b27644724d8 h1:jm0sNPyqo6S165QjQYMBHB2nK50wlJbMYM03Yr3Eo2k= -go.opentelemetry.io/collector/semconv v0.63.2-0.20221104003159-6b27644724d8/go.mod h1:5o9yhOa+ABt7g2E5JABDxGZ1PQPbtfxrKNbYn+LOTXU= +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.63.2-0.20221108014805-0b08d5316426 h1:z/wLTMh7/vNxcFUDa5uG7/IPE3tYx6pzCWPV41ghyV8= +go.opentelemetry.io/collector v0.63.2-0.20221108014805-0b08d5316426/go.mod h1:+Zb70q0Rq17dA9FcHTiTjW6g96lvJ8kAZ0c+eWNkAv0= +go.opentelemetry.io/collector/pdata v0.63.2-0.20221108014805-0b08d5316426 h1:wKDpgP0Tx/gWI2SgDGAY1OTSeihhDivbbRqFR79IGTc= +go.opentelemetry.io/collector/pdata v0.63.2-0.20221108014805-0b08d5316426/go.mod h1:IzvXUGQml2mrnvdb8zIlEW3qQs9oFLdD2hLwJdZ+pek= +go.opentelemetry.io/collector/semconv v0.63.2-0.20221108014805-0b08d5316426 h1:pqIl7OC531J6i9ttBCj3zLmZI/BSF4q323YpK0GgKGk= +go.opentelemetry.io/collector/semconv v0.63.2-0.20221108014805-0b08d5316426/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/config_test.go b/receiver/kafkametricsreceiver/config_test.go index 5d047ebb04bc..8e7d3c7b555f 100644 --- a/receiver/kafkametricsreceiver/config_test.go +++ b/receiver/kafkametricsreceiver/config_test.go @@ -20,7 +20,7 @@ import ( "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" - "go.opentelemetry.io/collector/config" + "go.opentelemetry.io/collector/component" "go.opentelemetry.io/collector/config/configtls" "go.opentelemetry.io/collector/confmap/confmaptest" "go.opentelemetry.io/collector/receiver/scraperhelper" @@ -35,9 +35,9 @@ func TestLoadConfig(t *testing.T) { factory := NewFactory() cfg := factory.CreateDefaultConfig() - sub, err := cm.Sub(config.NewComponentIDWithName(typeStr, "").String()) + sub, err := cm.Sub(component.NewIDWithName(typeStr, "").String()) require.NoError(t, err) - require.NoError(t, config.UnmarshalReceiver(sub, cfg)) + require.NoError(t, component.UnmarshalReceiverConfig(sub, cfg)) assert.Equal(t, &Config{ ScraperControllerSettings: scraperhelper.NewDefaultScraperControllerSettings(typeStr), diff --git a/receiver/kafkametricsreceiver/factory.go b/receiver/kafkametricsreceiver/factory.go index 47a5a8ac8692..603ede8682ab 100644 --- a/receiver/kafkametricsreceiver/factory.go +++ b/receiver/kafkametricsreceiver/factory.go @@ -18,7 +18,6 @@ import ( "context" "go.opentelemetry.io/collector/component" - "go.opentelemetry.io/collector/config" "go.opentelemetry.io/collector/consumer" "go.opentelemetry.io/collector/receiver/scraperhelper" @@ -42,7 +41,7 @@ func NewFactory() component.ReceiverFactory { component.WithMetricsReceiver(createMetricsReceiver, stability)) } -func createDefaultConfig() config.Receiver { +func createDefaultConfig() component.ReceiverConfig { return &Config{ ScraperControllerSettings: scraperhelper.NewDefaultScraperControllerSettings(typeStr), Brokers: []string{defaultBroker}, @@ -56,7 +55,7 @@ func createDefaultConfig() config.Receiver { func createMetricsReceiver( ctx context.Context, params component.ReceiverCreateSettings, - cfg config.Receiver, + cfg component.ReceiverConfig, nextConsumer consumer.Metrics) (component.MetricsReceiver, error) { c := cfg.(*Config) r, err := newMetricsReceiver(ctx, *c, params, nextConsumer) diff --git a/receiver/kafkametricsreceiver/factory_test.go b/receiver/kafkametricsreceiver/factory_test.go index 42f37c5960db..dffb1a5ddd6c 100644 --- a/receiver/kafkametricsreceiver/factory_test.go +++ b/receiver/kafkametricsreceiver/factory_test.go @@ -21,7 +21,6 @@ import ( "github.com/stretchr/testify/assert" "go.opentelemetry.io/collector/component" "go.opentelemetry.io/collector/component/componenttest" - "go.opentelemetry.io/collector/config/configtest" "go.opentelemetry.io/collector/consumer" ) @@ -29,7 +28,7 @@ func TestCreateDefaultConfig(t *testing.T) { factory := NewFactory() cfg := factory.CreateDefaultConfig() assert.NotNil(t, cfg, "default config not created") - assert.NoError(t, configtest.CheckConfigStruct(cfg)) + assert.NoError(t, componenttest.CheckConfigStruct(cfg)) } func TestCreateMetricsReceiver_errors(t *testing.T) { diff --git a/receiver/kafkametricsreceiver/go.mod b/receiver/kafkametricsreceiver/go.mod index 5e5cb63bd296..6ac292ef0db1 100644 --- a/receiver/kafkametricsreceiver/go.mod +++ b/receiver/kafkametricsreceiver/go.mod @@ -7,8 +7,8 @@ require ( github.com/open-telemetry/opentelemetry-collector-contrib/exporter/kafkaexporter v0.63.0 github.com/open-telemetry/opentelemetry-collector-contrib/internal/containertest v0.63.0 github.com/stretchr/testify v1.8.1 - go.opentelemetry.io/collector v0.63.2-0.20221104003159-6b27644724d8 - go.opentelemetry.io/collector/pdata v0.63.2-0.20221104003159-6b27644724d8 + go.opentelemetry.io/collector v0.63.2-0.20221108014805-0b08d5316426 + go.opentelemetry.io/collector/pdata v0.63.2-0.20221108014805-0b08d5316426 go.uber.org/multierr v1.8.0 go.uber.org/zap v1.23.0 ) @@ -64,8 +64,8 @@ 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.opencensus.io v0.23.0 // indirect - go.opentelemetry.io/collector/semconv v0.63.2-0.20221104003159-6b27644724d8 // indirect + go.opencensus.io v0.24.0 // indirect + go.opentelemetry.io/collector/semconv v0.63.2-0.20221108014805-0b08d5316426 // 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 47acd615dc51..b6dfcbeed5b5 100644 --- a/receiver/kafkametricsreceiver/go.sum +++ b/receiver/kafkametricsreceiver/go.sum @@ -290,7 +290,7 @@ github.com/prometheus/client_golang v0.9.1/go.mod h1:7SWBe2y4D6OKWSNQJUaRYU/AaXP github.com/prometheus/client_golang v1.0.0/go.mod h1:db9x61etRT2tGnBNRi70OPL5FsnadC4Ky3P0J6CfImo= github.com/prometheus/client_golang v1.7.1/go.mod h1:PY5Wy2awLA44sXw4AOSfFBetzPP4j5+D6mVACh+pe2M= github.com/prometheus/client_golang v1.11.1/go.mod h1:Z6t4BnS23TR94PD6BsDNk8yVqroYurpAkEiz0P2BEV0= -github.com/prometheus/client_golang v1.13.0 h1:b71QUfeo5M8gq2+evJdTPfZhYMAU0uKPkyPJ7TPsloU= +github.com/prometheus/client_golang v1.13.1 h1:3gMjIY2+/hzmqhtUC/aQNYldJA6DtH3CgQvwS+02K1c= github.com/prometheus/client_model v0.0.0-20180712105110-5c3871d89910/go.mod h1:MbSGuTsp3dbXC40dX6PRTWyKYBIrTGTE9sqQNg2J8bo= github.com/prometheus/client_model v0.0.0-20190129233127-fd36f4220a90/go.mod h1:xMI15A0UPsDsEKsMN9yxemIoYk6Tm2C1GtYGdfGttqA= github.com/prometheus/client_model v0.0.0-20190812154241-14fe0d1b01d4/go.mod h1:xMI15A0UPsDsEKsMN9yxemIoYk6Tm2C1GtYGdfGttqA= @@ -333,7 +333,6 @@ github.com/stretchr/testify v1.2.2/go.mod h1:a8OnRcib4nhh0OaRAV+Yts87kKdq0PP7pXf github.com/stretchr/testify v1.3.0/go.mod h1:M5WIy9Dh21IEIfnGCwXGc5bZfKNJtfHm1UVUgZn+9EI= github.com/stretchr/testify v1.4.0/go.mod h1:j7eGeouHqKxXV5pUuKE4zz7dFj8WfuZ+81PSLYec5m4= github.com/stretchr/testify v1.5.1/go.mod h1:5W2xD1RspED5o8YsWQXVCued0rvSQ+mT+I5cxcmMvtA= -github.com/stretchr/testify v1.6.1/go.mod h1:6Fq8oRcR53rry900zMqJjRRixrwX3KX962/h/Wwjteg= github.com/stretchr/testify v1.7.0/go.mod h1:6Fq8oRcR53rry900zMqJjRRixrwX3KX962/h/Wwjteg= github.com/stretchr/testify v1.7.1/go.mod h1:6Fq8oRcR53rry900zMqJjRRixrwX3KX962/h/Wwjteg= github.com/stretchr/testify v1.8.0/go.mod h1:yNjHg4UonilssWZ8iaSj1OCr/vHnekPRkoO+kdMU+MU= @@ -355,14 +354,14 @@ 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.opencensus.io v0.23.0 h1:gqCw0LfLxScz8irSi8exQc7fyQ0fKQU/qnC/X8+V/1M= -go.opencensus.io v0.23.0/go.mod h1:XItmlyltB5F7CS4xOC1DcqMoFqwtC6OG2xF7mCv7P7E= -go.opentelemetry.io/collector v0.63.2-0.20221104003159-6b27644724d8 h1:rOT5HzXXfSISc6FiH012zH2/EFjp37UXfjEqj5BpkWQ= -go.opentelemetry.io/collector v0.63.2-0.20221104003159-6b27644724d8/go.mod h1:JVmeZXugK4ondC6KQgrHTHWiF4JttpG5k6dWPMt62+k= -go.opentelemetry.io/collector/pdata v0.63.2-0.20221104003159-6b27644724d8 h1:7xeTQjfsOm9eogQeIxjSEhlik9qsbBGsnmkQHfyKaRE= -go.opentelemetry.io/collector/pdata v0.63.2-0.20221104003159-6b27644724d8/go.mod h1:IzvXUGQml2mrnvdb8zIlEW3qQs9oFLdD2hLwJdZ+pek= -go.opentelemetry.io/collector/semconv v0.63.2-0.20221104003159-6b27644724d8 h1:jm0sNPyqo6S165QjQYMBHB2nK50wlJbMYM03Yr3Eo2k= -go.opentelemetry.io/collector/semconv v0.63.2-0.20221104003159-6b27644724d8/go.mod h1:5o9yhOa+ABt7g2E5JABDxGZ1PQPbtfxrKNbYn+LOTXU= +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.63.2-0.20221108014805-0b08d5316426 h1:z/wLTMh7/vNxcFUDa5uG7/IPE3tYx6pzCWPV41ghyV8= +go.opentelemetry.io/collector v0.63.2-0.20221108014805-0b08d5316426/go.mod h1:+Zb70q0Rq17dA9FcHTiTjW6g96lvJ8kAZ0c+eWNkAv0= +go.opentelemetry.io/collector/pdata v0.63.2-0.20221108014805-0b08d5316426 h1:wKDpgP0Tx/gWI2SgDGAY1OTSeihhDivbbRqFR79IGTc= +go.opentelemetry.io/collector/pdata v0.63.2-0.20221108014805-0b08d5316426/go.mod h1:IzvXUGQml2mrnvdb8zIlEW3qQs9oFLdD2hLwJdZ+pek= +go.opentelemetry.io/collector/semconv v0.63.2-0.20221108014805-0b08d5316426 h1:pqIl7OC531J6i9ttBCj3zLmZI/BSF4q323YpK0GgKGk= +go.opentelemetry.io/collector/semconv v0.63.2-0.20221108014805-0b08d5316426/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.go b/receiver/kafkareceiver/config.go index 46ca83819526..aaae45f0d17d 100644 --- a/receiver/kafkareceiver/config.go +++ b/receiver/kafkareceiver/config.go @@ -17,6 +17,7 @@ package kafkareceiver // import "github.com/open-telemetry/opentelemetry-collect import ( "time" + "go.opentelemetry.io/collector/component" "go.opentelemetry.io/collector/config" "github.com/open-telemetry/opentelemetry-collector-contrib/exporter/kafkaexporter" @@ -71,7 +72,7 @@ type Config struct { MessageMarking MessageMarking `mapstructure:"message_marking"` } -var _ config.Receiver = (*Config)(nil) +var _ component.ReceiverConfig = (*Config)(nil) // Validate checks the receiver configuration is valid func (cfg *Config) Validate() error { diff --git a/receiver/kafkareceiver/config_test.go b/receiver/kafkareceiver/config_test.go index 8529d0b18c69..57dad42cb831 100644 --- a/receiver/kafkareceiver/config_test.go +++ b/receiver/kafkareceiver/config_test.go @@ -21,6 +21,7 @@ import ( "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" + "go.opentelemetry.io/collector/component" "go.opentelemetry.io/collector/config" "go.opentelemetry.io/collector/config/configtls" "go.opentelemetry.io/collector/confmap/confmaptest" @@ -35,14 +36,14 @@ func TestLoadConfig(t *testing.T) { require.NoError(t, err) tests := []struct { - id config.ComponentID - expected config.Receiver + id component.ID + expected component.ReceiverConfig expectedErr error }{ { - id: config.NewComponentIDWithName(typeStr, ""), + id: component.NewIDWithName(typeStr, ""), expected: &Config{ - ReceiverSettings: config.NewReceiverSettings(config.NewComponentID(typeStr)), + ReceiverSettings: config.NewReceiverSettings(component.NewID(typeStr)), Topic: "spans", Encoding: "otlp_proto", Brokers: []string{"foo:123", "bar:456"}, @@ -72,9 +73,9 @@ func TestLoadConfig(t *testing.T) { }, { - id: config.NewComponentIDWithName(typeStr, "logs"), + id: component.NewIDWithName(typeStr, "logs"), expected: &Config{ - ReceiverSettings: config.NewReceiverSettings(config.NewComponentID(typeStr)), + ReceiverSettings: config.NewReceiverSettings(component.NewID(typeStr)), Topic: "logs", Encoding: "direct", Brokers: []string{"coffee:123", "foobar:456"}, @@ -111,7 +112,7 @@ func TestLoadConfig(t *testing.T) { sub, err := cm.Sub(tt.id.String()) require.NoError(t, err) - require.NoError(t, config.UnmarshalReceiver(sub, cfg)) + require.NoError(t, component.UnmarshalReceiverConfig(sub, cfg)) assert.NoError(t, cfg.Validate()) assert.Equal(t, tt.expected, cfg) diff --git a/receiver/kafkareceiver/factory.go b/receiver/kafkareceiver/factory.go index 0b5066e522a5..e2a11189638a 100644 --- a/receiver/kafkareceiver/factory.go +++ b/receiver/kafkareceiver/factory.go @@ -100,9 +100,9 @@ func NewFactory(options ...FactoryOption) component.ReceiverFactory { ) } -func createDefaultConfig() config.Receiver { +func createDefaultConfig() component.ReceiverConfig { return &Config{ - ReceiverSettings: config.NewReceiverSettings(config.NewComponentID(typeStr)), + ReceiverSettings: config.NewReceiverSettings(component.NewID(typeStr)), Topic: defaultTopic, Encoding: defaultEncoding, Brokers: []string{defaultBroker}, @@ -135,7 +135,7 @@ type kafkaReceiverFactory struct { func (f *kafkaReceiverFactory) createTracesReceiver( _ context.Context, set component.ReceiverCreateSettings, - cfg config.Receiver, + cfg component.ReceiverConfig, nextConsumer consumer.Traces, ) (component.TracesReceiver, error) { c := cfg.(*Config) @@ -149,7 +149,7 @@ func (f *kafkaReceiverFactory) createTracesReceiver( func (f *kafkaReceiverFactory) createMetricsReceiver( _ context.Context, set component.ReceiverCreateSettings, - cfg config.Receiver, + cfg component.ReceiverConfig, nextConsumer consumer.Metrics, ) (component.MetricsReceiver, error) { c := cfg.(*Config) @@ -163,7 +163,7 @@ func (f *kafkaReceiverFactory) createMetricsReceiver( func (f *kafkaReceiverFactory) createLogsReceiver( _ context.Context, set component.ReceiverCreateSettings, - cfg config.Receiver, + cfg component.ReceiverConfig, nextConsumer consumer.Logs, ) (component.LogsReceiver, error) { c := cfg.(*Config) diff --git a/receiver/kafkareceiver/factory_test.go b/receiver/kafkareceiver/factory_test.go index f25fb71c3ee3..000433e95183 100644 --- a/receiver/kafkareceiver/factory_test.go +++ b/receiver/kafkareceiver/factory_test.go @@ -21,7 +21,6 @@ import ( "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" "go.opentelemetry.io/collector/component/componenttest" - "go.opentelemetry.io/collector/config/configtest" "go.opentelemetry.io/collector/pdata/plog" "go.opentelemetry.io/collector/pdata/pmetric" "go.opentelemetry.io/collector/pdata/ptrace" @@ -30,7 +29,7 @@ import ( func TestCreateDefaultConfig(t *testing.T) { cfg := createDefaultConfig().(*Config) assert.NotNil(t, cfg, "failed to create default config") - assert.NoError(t, configtest.CheckConfigStruct(cfg)) + assert.NoError(t, componenttest.CheckConfigStruct(cfg)) assert.Equal(t, []string{defaultBroker}, cfg.Brokers) assert.Equal(t, defaultTopic, cfg.Topic) assert.Equal(t, defaultGroupID, cfg.GroupID) diff --git a/receiver/kafkareceiver/go.mod b/receiver/kafkareceiver/go.mod index 43b8e7b97755..cdfee0b4623a 100644 --- a/receiver/kafkareceiver/go.mod +++ b/receiver/kafkareceiver/go.mod @@ -13,10 +13,10 @@ require ( github.com/open-telemetry/opentelemetry-collector-contrib/pkg/translator/zipkin v0.63.0 github.com/openzipkin/zipkin-go v0.4.1 github.com/stretchr/testify v1.8.1 - go.opencensus.io v0.23.0 - go.opentelemetry.io/collector v0.63.2-0.20221104003159-6b27644724d8 - go.opentelemetry.io/collector/pdata v0.63.2-0.20221104003159-6b27644724d8 - go.opentelemetry.io/collector/semconv v0.63.2-0.20221104003159-6b27644724d8 + go.opencensus.io v0.24.0 + go.opentelemetry.io/collector v0.63.2-0.20221108014805-0b08d5316426 + go.opentelemetry.io/collector/pdata v0.63.2-0.20221108014805-0b08d5316426 + go.opentelemetry.io/collector/semconv v0.63.2-0.20221108014805-0b08d5316426 go.uber.org/zap v1.23.0 ) diff --git a/receiver/kafkareceiver/go.sum b/receiver/kafkareceiver/go.sum index 84e5ccd06c3b..a6fd43beec80 100644 --- a/receiver/kafkareceiver/go.sum +++ b/receiver/kafkareceiver/go.sum @@ -274,7 +274,7 @@ github.com/prometheus/client_golang v0.9.1/go.mod h1:7SWBe2y4D6OKWSNQJUaRYU/AaXP github.com/prometheus/client_golang v1.0.0/go.mod h1:db9x61etRT2tGnBNRi70OPL5FsnadC4Ky3P0J6CfImo= github.com/prometheus/client_golang v1.7.1/go.mod h1:PY5Wy2awLA44sXw4AOSfFBetzPP4j5+D6mVACh+pe2M= github.com/prometheus/client_golang v1.11.1/go.mod h1:Z6t4BnS23TR94PD6BsDNk8yVqroYurpAkEiz0P2BEV0= -github.com/prometheus/client_golang v1.13.0 h1:b71QUfeo5M8gq2+evJdTPfZhYMAU0uKPkyPJ7TPsloU= +github.com/prometheus/client_golang v1.13.1 h1:3gMjIY2+/hzmqhtUC/aQNYldJA6DtH3CgQvwS+02K1c= github.com/prometheus/client_model v0.0.0-20180712105110-5c3871d89910/go.mod h1:MbSGuTsp3dbXC40dX6PRTWyKYBIrTGTE9sqQNg2J8bo= github.com/prometheus/client_model v0.0.0-20190129233127-fd36f4220a90/go.mod h1:xMI15A0UPsDsEKsMN9yxemIoYk6Tm2C1GtYGdfGttqA= github.com/prometheus/client_model v0.0.0-20190812154241-14fe0d1b01d4/go.mod h1:xMI15A0UPsDsEKsMN9yxemIoYk6Tm2C1GtYGdfGttqA= @@ -313,7 +313,6 @@ github.com/stretchr/testify v1.2.2/go.mod h1:a8OnRcib4nhh0OaRAV+Yts87kKdq0PP7pXf github.com/stretchr/testify v1.3.0/go.mod h1:M5WIy9Dh21IEIfnGCwXGc5bZfKNJtfHm1UVUgZn+9EI= github.com/stretchr/testify v1.4.0/go.mod h1:j7eGeouHqKxXV5pUuKE4zz7dFj8WfuZ+81PSLYec5m4= github.com/stretchr/testify v1.5.1/go.mod h1:5W2xD1RspED5o8YsWQXVCued0rvSQ+mT+I5cxcmMvtA= -github.com/stretchr/testify v1.6.1/go.mod h1:6Fq8oRcR53rry900zMqJjRRixrwX3KX962/h/Wwjteg= github.com/stretchr/testify v1.7.0/go.mod h1:6Fq8oRcR53rry900zMqJjRRixrwX3KX962/h/Wwjteg= github.com/stretchr/testify v1.7.1/go.mod h1:6Fq8oRcR53rry900zMqJjRRixrwX3KX962/h/Wwjteg= github.com/stretchr/testify v1.8.0/go.mod h1:yNjHg4UonilssWZ8iaSj1OCr/vHnekPRkoO+kdMU+MU= @@ -335,14 +334,14 @@ 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.opencensus.io v0.23.0 h1:gqCw0LfLxScz8irSi8exQc7fyQ0fKQU/qnC/X8+V/1M= -go.opencensus.io v0.23.0/go.mod h1:XItmlyltB5F7CS4xOC1DcqMoFqwtC6OG2xF7mCv7P7E= -go.opentelemetry.io/collector v0.63.2-0.20221104003159-6b27644724d8 h1:rOT5HzXXfSISc6FiH012zH2/EFjp37UXfjEqj5BpkWQ= -go.opentelemetry.io/collector v0.63.2-0.20221104003159-6b27644724d8/go.mod h1:JVmeZXugK4ondC6KQgrHTHWiF4JttpG5k6dWPMt62+k= -go.opentelemetry.io/collector/pdata v0.63.2-0.20221104003159-6b27644724d8 h1:7xeTQjfsOm9eogQeIxjSEhlik9qsbBGsnmkQHfyKaRE= -go.opentelemetry.io/collector/pdata v0.63.2-0.20221104003159-6b27644724d8/go.mod h1:IzvXUGQml2mrnvdb8zIlEW3qQs9oFLdD2hLwJdZ+pek= -go.opentelemetry.io/collector/semconv v0.63.2-0.20221104003159-6b27644724d8 h1:jm0sNPyqo6S165QjQYMBHB2nK50wlJbMYM03Yr3Eo2k= -go.opentelemetry.io/collector/semconv v0.63.2-0.20221104003159-6b27644724d8/go.mod h1:5o9yhOa+ABt7g2E5JABDxGZ1PQPbtfxrKNbYn+LOTXU= +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.63.2-0.20221108014805-0b08d5316426 h1:z/wLTMh7/vNxcFUDa5uG7/IPE3tYx6pzCWPV41ghyV8= +go.opentelemetry.io/collector v0.63.2-0.20221108014805-0b08d5316426/go.mod h1:+Zb70q0Rq17dA9FcHTiTjW6g96lvJ8kAZ0c+eWNkAv0= +go.opentelemetry.io/collector/pdata v0.63.2-0.20221108014805-0b08d5316426 h1:wKDpgP0Tx/gWI2SgDGAY1OTSeihhDivbbRqFR79IGTc= +go.opentelemetry.io/collector/pdata v0.63.2-0.20221108014805-0b08d5316426/go.mod h1:IzvXUGQml2mrnvdb8zIlEW3qQs9oFLdD2hLwJdZ+pek= +go.opentelemetry.io/collector/semconv v0.63.2-0.20221108014805-0b08d5316426 h1:pqIl7OC531J6i9ttBCj3zLmZI/BSF4q323YpK0GgKGk= +go.opentelemetry.io/collector/semconv v0.63.2-0.20221108014805-0b08d5316426/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/kafka_receiver.go b/receiver/kafkareceiver/kafka_receiver.go index 18c553345f2e..6f53c84a5473 100644 --- a/receiver/kafkareceiver/kafka_receiver.go +++ b/receiver/kafkareceiver/kafka_receiver.go @@ -23,7 +23,6 @@ import ( "go.opencensus.io/stats" "go.opencensus.io/tag" "go.opentelemetry.io/collector/component" - "go.opentelemetry.io/collector/config" "go.opentelemetry.io/collector/consumer" "go.opentelemetry.io/collector/obsreport" "go.uber.org/zap" @@ -39,7 +38,7 @@ var errUnrecognizedEncoding = fmt.Errorf("unrecognized encoding") // kafkaTracesConsumer uses sarama to consume and handle messages from kafka. type kafkaTracesConsumer struct { - id config.ComponentID + id component.ID consumerGroup sarama.ConsumerGroup nextConsumer consumer.Traces topics []string @@ -54,7 +53,7 @@ type kafkaTracesConsumer struct { // kafkaMetricsConsumer uses sarama to consume and handle messages from kafka. type kafkaMetricsConsumer struct { - id config.ComponentID + id component.ID consumerGroup sarama.ConsumerGroup nextConsumer consumer.Metrics topics []string @@ -69,7 +68,7 @@ type kafkaMetricsConsumer struct { // kafkaLogsConsumer uses sarama to consume and handle messages from kafka. type kafkaLogsConsumer struct { - id config.ComponentID + id component.ID consumerGroup sarama.ConsumerGroup nextConsumer consumer.Logs topics []string @@ -342,7 +341,7 @@ func (c *kafkaLogsConsumer) Shutdown(context.Context) error { } type tracesConsumerGroupHandler struct { - id config.ComponentID + id component.ID unmarshaler TracesUnmarshaler nextConsumer consumer.Traces ready chan bool @@ -357,7 +356,7 @@ type tracesConsumerGroupHandler struct { } type metricsConsumerGroupHandler struct { - id config.ComponentID + id component.ID unmarshaler MetricsUnmarshaler nextConsumer consumer.Metrics ready chan bool @@ -372,7 +371,7 @@ type metricsConsumerGroupHandler struct { } type logsConsumerGroupHandler struct { - id config.ComponentID + id component.ID unmarshaler LogsUnmarshaler nextConsumer consumer.Logs ready chan bool diff --git a/receiver/kubeletstatsreceiver/config.go b/receiver/kubeletstatsreceiver/config.go index 04267966a14b..da58714daf33 100644 --- a/receiver/kubeletstatsreceiver/config.go +++ b/receiver/kubeletstatsreceiver/config.go @@ -18,7 +18,7 @@ import ( "errors" "fmt" - "go.opentelemetry.io/collector/config" + "go.opentelemetry.io/collector/component" "go.opentelemetry.io/collector/config/confignet" "go.opentelemetry.io/collector/confmap" "go.opentelemetry.io/collector/receiver/scraperhelper" @@ -30,7 +30,7 @@ import ( "github.com/open-telemetry/opentelemetry-collector-contrib/receiver/kubeletstatsreceiver/internal/metadata" ) -var _ config.Receiver = (*Config)(nil) +var _ component.ReceiverConfig = (*Config)(nil) type Config struct { scraperhelper.ScraperControllerSettings `mapstructure:",squash"` diff --git a/receiver/kubeletstatsreceiver/config_test.go b/receiver/kubeletstatsreceiver/config_test.go index 60817f36a6f2..0084b114d0a2 100644 --- a/receiver/kubeletstatsreceiver/config_test.go +++ b/receiver/kubeletstatsreceiver/config_test.go @@ -22,6 +22,7 @@ import ( "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" + "go.opentelemetry.io/collector/component" "go.opentelemetry.io/collector/config" "go.opentelemetry.io/collector/config/confignet" "go.opentelemetry.io/collector/config/configtls" @@ -43,15 +44,15 @@ func TestLoadConfig(t *testing.T) { duration := 10 * time.Second tests := []struct { - id config.ComponentID - expected config.Receiver + id component.ID + expected component.ReceiverConfig expectedErr error }{ { - id: config.NewComponentIDWithName(typeStr, "default"), + id: component.NewIDWithName(typeStr, "default"), expected: &Config{ ScraperControllerSettings: scraperhelper.ScraperControllerSettings{ - ReceiverSettings: config.NewReceiverSettings(config.NewComponentID(typeStr)), + ReceiverSettings: config.NewReceiverSettings(component.NewID(typeStr)), CollectionInterval: duration, }, ClientConfig: kube.ClientConfig{ @@ -68,10 +69,10 @@ func TestLoadConfig(t *testing.T) { }, }, { - id: config.NewComponentIDWithName(typeStr, "tls"), + id: component.NewIDWithName(typeStr, "tls"), expected: &Config{ ScraperControllerSettings: scraperhelper.ScraperControllerSettings{ - ReceiverSettings: config.NewReceiverSettings(config.NewComponentID(typeStr)), + ReceiverSettings: config.NewReceiverSettings(component.NewID(typeStr)), CollectionInterval: duration, }, TCPAddr: confignet.TCPAddr{ @@ -97,10 +98,10 @@ func TestLoadConfig(t *testing.T) { }, }, { - id: config.NewComponentIDWithName(typeStr, "sa"), + id: component.NewIDWithName(typeStr, "sa"), expected: &Config{ ScraperControllerSettings: scraperhelper.ScraperControllerSettings{ - ReceiverSettings: config.NewReceiverSettings(config.NewComponentID(typeStr)), + ReceiverSettings: config.NewReceiverSettings(component.NewID(typeStr)), CollectionInterval: duration, }, ClientConfig: kube.ClientConfig{ @@ -118,10 +119,10 @@ func TestLoadConfig(t *testing.T) { }, }, { - id: config.NewComponentIDWithName(typeStr, "metadata"), + id: component.NewIDWithName(typeStr, "metadata"), expected: &Config{ ScraperControllerSettings: scraperhelper.ScraperControllerSettings{ - ReceiverSettings: config.NewReceiverSettings(config.NewComponentID(typeStr)), + ReceiverSettings: config.NewReceiverSettings(component.NewID(typeStr)), CollectionInterval: duration, }, ClientConfig: kube.ClientConfig{ @@ -142,10 +143,10 @@ func TestLoadConfig(t *testing.T) { }, }, { - id: config.NewComponentIDWithName(typeStr, "metric_groups"), + id: component.NewIDWithName(typeStr, "metric_groups"), expected: &Config{ ScraperControllerSettings: scraperhelper.ScraperControllerSettings{ - ReceiverSettings: config.NewReceiverSettings(config.NewComponentID(typeStr)), + ReceiverSettings: config.NewReceiverSettings(component.NewID(typeStr)), CollectionInterval: 20 * time.Second, }, ClientConfig: kube.ClientConfig{ @@ -162,10 +163,10 @@ func TestLoadConfig(t *testing.T) { }, }, { - id: config.NewComponentIDWithName(typeStr, "metadata_with_k8s_api"), + id: component.NewIDWithName(typeStr, "metadata_with_k8s_api"), expected: &Config{ ScraperControllerSettings: scraperhelper.ScraperControllerSettings{ - ReceiverSettings: config.NewReceiverSettings(config.NewComponentID(typeStr)), + ReceiverSettings: config.NewReceiverSettings(component.NewID(typeStr)), CollectionInterval: duration, }, ClientConfig: kube.ClientConfig{ @@ -194,7 +195,7 @@ func TestLoadConfig(t *testing.T) { sub, err := cm.Sub(tt.id.String()) require.NoError(t, err) - require.NoError(t, config.UnmarshalReceiver(sub, cfg)) + require.NoError(t, component.UnmarshalReceiverConfig(sub, cfg)) assert.NoError(t, cfg.Validate()) assert.Equal(t, tt.expected, cfg) @@ -226,7 +227,7 @@ func TestGetReceiverOptions(t *testing.T) { }, }, want: &scraperOptions{ - id: config.NewComponentID(typeStr), + id: component.NewID(typeStr), extraMetadataLabels: []kubelet.MetadataLabel{ kubelet.MetadataLabelContainerID, }, @@ -270,7 +271,7 @@ func TestGetReceiverOptions(t *testing.T) { t.Run(tt.name, func(t *testing.T) { cfg := &Config{ ScraperControllerSettings: scraperhelper.ScraperControllerSettings{ - ReceiverSettings: config.NewReceiverSettings(config.NewComponentID(typeStr)), + ReceiverSettings: config.NewReceiverSettings(component.NewID(typeStr)), CollectionInterval: 10 * time.Second, }, ExtraMetadataLabels: tt.fields.extraMetadataLabels, diff --git a/receiver/kubeletstatsreceiver/factory.go b/receiver/kubeletstatsreceiver/factory.go index 9b3b88309a27..accfea2dbee9 100644 --- a/receiver/kubeletstatsreceiver/factory.go +++ b/receiver/kubeletstatsreceiver/factory.go @@ -19,7 +19,6 @@ import ( "time" "go.opentelemetry.io/collector/component" - "go.opentelemetry.io/collector/config" "go.opentelemetry.io/collector/consumer" "go.opentelemetry.io/collector/receiver/scraperhelper" "go.uber.org/zap" @@ -50,7 +49,7 @@ func NewFactory() component.ReceiverFactory { component.WithMetricsReceiver(createMetricsReceiver, stability)) } -func createDefaultConfig() config.Receiver { +func createDefaultConfig() component.ReceiverConfig { scs := scraperhelper.NewDefaultScraperControllerSettings(typeStr) scs.CollectionInterval = 10 * time.Second @@ -68,7 +67,7 @@ func createDefaultConfig() config.Receiver { func createMetricsReceiver( ctx context.Context, set component.ReceiverCreateSettings, - baseCfg config.Receiver, + baseCfg component.ReceiverConfig, consumer consumer.Metrics, ) (component.MetricsReceiver, error) { cfg := baseCfg.(*Config) diff --git a/receiver/kubeletstatsreceiver/factory_test.go b/receiver/kubeletstatsreceiver/factory_test.go index 16fdad7275a6..e83365999b74 100644 --- a/receiver/kubeletstatsreceiver/factory_test.go +++ b/receiver/kubeletstatsreceiver/factory_test.go @@ -28,7 +28,6 @@ import ( "github.com/stretchr/testify/require" "go.opentelemetry.io/collector/component" "go.opentelemetry.io/collector/component/componenttest" - "go.opentelemetry.io/collector/config/configtest" "go.opentelemetry.io/collector/config/configtls" "go.opentelemetry.io/collector/confmap" "go.opentelemetry.io/collector/consumer/consumertest" @@ -48,7 +47,7 @@ func TestType(t *testing.T) { func TestValidConfig(t *testing.T) { factory := NewFactory() - err := configtest.CheckConfigStruct(factory.CreateDefaultConfig()) + err := componenttest.CheckConfigStruct(factory.CreateDefaultConfig()) require.NoError(t, err) } diff --git a/receiver/kubeletstatsreceiver/go.mod b/receiver/kubeletstatsreceiver/go.mod index b65da4a8731c..16a2e9c24755 100644 --- a/receiver/kubeletstatsreceiver/go.mod +++ b/receiver/kubeletstatsreceiver/go.mod @@ -6,9 +6,9 @@ require ( github.com/open-telemetry/opentelemetry-collector-contrib/internal/k8sconfig v0.63.0 github.com/open-telemetry/opentelemetry-collector-contrib/internal/kubelet v0.63.0 github.com/stretchr/testify v1.8.1 - go.opentelemetry.io/collector v0.63.2-0.20221104003159-6b27644724d8 - go.opentelemetry.io/collector/pdata v0.63.2-0.20221104003159-6b27644724d8 - go.opentelemetry.io/collector/semconv v0.63.2-0.20221104003159-6b27644724d8 + go.opentelemetry.io/collector v0.63.2-0.20221108014805-0b08d5316426 + go.opentelemetry.io/collector/pdata v0.63.2-0.20221108014805-0b08d5316426 + go.opentelemetry.io/collector/semconv v0.63.2-0.20221108014805-0b08d5316426 go.uber.org/zap v1.23.0 k8s.io/api v0.25.3 k8s.io/apimachinery v0.25.3 @@ -49,7 +49,7 @@ require ( github.com/pmezard/go-difflib v1.0.0 // indirect github.com/rogpeppe/go-internal v1.6.1 // indirect github.com/spf13/pflag v1.0.5 // indirect - go.opencensus.io v0.23.0 // indirect + go.opencensus.io v0.24.0 // 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 5d44d203925c..489db7e16cfc 100644 --- a/receiver/kubeletstatsreceiver/go.sum +++ b/receiver/kubeletstatsreceiver/go.sum @@ -381,7 +381,7 @@ github.com/prometheus/client_golang v0.9.1/go.mod h1:7SWBe2y4D6OKWSNQJUaRYU/AaXP github.com/prometheus/client_golang v1.0.0/go.mod h1:db9x61etRT2tGnBNRi70OPL5FsnadC4Ky3P0J6CfImo= github.com/prometheus/client_golang v1.7.1/go.mod h1:PY5Wy2awLA44sXw4AOSfFBetzPP4j5+D6mVACh+pe2M= github.com/prometheus/client_golang v1.11.1/go.mod h1:Z6t4BnS23TR94PD6BsDNk8yVqroYurpAkEiz0P2BEV0= -github.com/prometheus/client_golang v1.13.0 h1:b71QUfeo5M8gq2+evJdTPfZhYMAU0uKPkyPJ7TPsloU= +github.com/prometheus/client_golang v1.13.1 h1:3gMjIY2+/hzmqhtUC/aQNYldJA6DtH3CgQvwS+02K1c= github.com/prometheus/client_model v0.0.0-20180712105110-5c3871d89910/go.mod h1:MbSGuTsp3dbXC40dX6PRTWyKYBIrTGTE9sqQNg2J8bo= github.com/prometheus/client_model v0.0.0-20190129233127-fd36f4220a90/go.mod h1:xMI15A0UPsDsEKsMN9yxemIoYk6Tm2C1GtYGdfGttqA= github.com/prometheus/client_model v0.0.0-20190812154241-14fe0d1b01d4/go.mod h1:xMI15A0UPsDsEKsMN9yxemIoYk6Tm2C1GtYGdfGttqA= @@ -442,14 +442,14 @@ 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.opencensus.io v0.23.0 h1:gqCw0LfLxScz8irSi8exQc7fyQ0fKQU/qnC/X8+V/1M= -go.opencensus.io v0.23.0/go.mod h1:XItmlyltB5F7CS4xOC1DcqMoFqwtC6OG2xF7mCv7P7E= -go.opentelemetry.io/collector v0.63.2-0.20221104003159-6b27644724d8 h1:rOT5HzXXfSISc6FiH012zH2/EFjp37UXfjEqj5BpkWQ= -go.opentelemetry.io/collector v0.63.2-0.20221104003159-6b27644724d8/go.mod h1:JVmeZXugK4ondC6KQgrHTHWiF4JttpG5k6dWPMt62+k= -go.opentelemetry.io/collector/pdata v0.63.2-0.20221104003159-6b27644724d8 h1:7xeTQjfsOm9eogQeIxjSEhlik9qsbBGsnmkQHfyKaRE= -go.opentelemetry.io/collector/pdata v0.63.2-0.20221104003159-6b27644724d8/go.mod h1:IzvXUGQml2mrnvdb8zIlEW3qQs9oFLdD2hLwJdZ+pek= -go.opentelemetry.io/collector/semconv v0.63.2-0.20221104003159-6b27644724d8 h1:jm0sNPyqo6S165QjQYMBHB2nK50wlJbMYM03Yr3Eo2k= -go.opentelemetry.io/collector/semconv v0.63.2-0.20221104003159-6b27644724d8/go.mod h1:5o9yhOa+ABt7g2E5JABDxGZ1PQPbtfxrKNbYn+LOTXU= +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.63.2-0.20221108014805-0b08d5316426 h1:z/wLTMh7/vNxcFUDa5uG7/IPE3tYx6pzCWPV41ghyV8= +go.opentelemetry.io/collector v0.63.2-0.20221108014805-0b08d5316426/go.mod h1:+Zb70q0Rq17dA9FcHTiTjW6g96lvJ8kAZ0c+eWNkAv0= +go.opentelemetry.io/collector/pdata v0.63.2-0.20221108014805-0b08d5316426 h1:wKDpgP0Tx/gWI2SgDGAY1OTSeihhDivbbRqFR79IGTc= +go.opentelemetry.io/collector/pdata v0.63.2-0.20221108014805-0b08d5316426/go.mod h1:IzvXUGQml2mrnvdb8zIlEW3qQs9oFLdD2hLwJdZ+pek= +go.opentelemetry.io/collector/semconv v0.63.2-0.20221108014805-0b08d5316426 h1:pqIl7OC531J6i9ttBCj3zLmZI/BSF4q323YpK0GgKGk= +go.opentelemetry.io/collector/semconv v0.63.2-0.20221108014805-0b08d5316426/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/scraper.go b/receiver/kubeletstatsreceiver/scraper.go index 272d11b2409d..934818fb9820 100644 --- a/receiver/kubeletstatsreceiver/scraper.go +++ b/receiver/kubeletstatsreceiver/scraper.go @@ -20,7 +20,6 @@ import ( "time" "go.opentelemetry.io/collector/component" - "go.opentelemetry.io/collector/config" "go.opentelemetry.io/collector/pdata/pmetric" "go.opentelemetry.io/collector/receiver/scraperhelper" "go.uber.org/zap" @@ -33,7 +32,7 @@ import ( ) type scraperOptions struct { - id config.ComponentID + id component.ID collectionInterval time.Duration extraMetadataLabels []kubelet.MetadataLabel metricGroupsToCollect map[kubelet.MetricGroup]bool diff --git a/receiver/memcachedreceiver/config_test.go b/receiver/memcachedreceiver/config_test.go index 1a5ba8fa6b23..b7607f7f27fb 100644 --- a/receiver/memcachedreceiver/config_test.go +++ b/receiver/memcachedreceiver/config_test.go @@ -19,7 +19,7 @@ import ( "testing" "github.com/stretchr/testify/require" - "go.opentelemetry.io/collector/config" + "go.opentelemetry.io/collector/component" "go.opentelemetry.io/collector/confmap/confmaptest" ) @@ -36,9 +36,9 @@ func TestLoadConfig(t *testing.T) { factory := NewFactory() cfg := factory.CreateDefaultConfig() - sub, err := cm.Sub(config.NewComponentIDWithName(typeStr, "").String()) + sub, err := cm.Sub(component.NewIDWithName(typeStr, "").String()) require.NoError(t, err) - require.NoError(t, config.UnmarshalReceiver(sub, cfg)) + require.NoError(t, component.UnmarshalReceiverConfig(sub, cfg)) require.Equal(t, factory.CreateDefaultConfig(), cfg) } diff --git a/receiver/memcachedreceiver/factory.go b/receiver/memcachedreceiver/factory.go index 65f1637ff279..8090c7154030 100644 --- a/receiver/memcachedreceiver/factory.go +++ b/receiver/memcachedreceiver/factory.go @@ -43,10 +43,10 @@ func NewFactory() component.ReceiverFactory { component.WithMetricsReceiver(createMetricsReceiver, stability)) } -func createDefaultConfig() config.Receiver { +func createDefaultConfig() component.ReceiverConfig { return &Config{ ScraperControllerSettings: scraperhelper.ScraperControllerSettings{ - ReceiverSettings: config.NewReceiverSettings(config.NewComponentID(typeStr)), + ReceiverSettings: config.NewReceiverSettings(component.NewID(typeStr)), CollectionInterval: defaultCollectionInterval, }, Timeout: defaultTimeout, @@ -60,7 +60,7 @@ func createDefaultConfig() config.Receiver { func createMetricsReceiver( _ context.Context, params component.ReceiverCreateSettings, - rConf config.Receiver, + rConf component.ReceiverConfig, consumer consumer.Metrics, ) (component.MetricsReceiver, error) { cfg := rConf.(*Config) diff --git a/receiver/memcachedreceiver/factory_test.go b/receiver/memcachedreceiver/factory_test.go index d2a235c00c8a..f7fd2d8e7f89 100644 --- a/receiver/memcachedreceiver/factory_test.go +++ b/receiver/memcachedreceiver/factory_test.go @@ -21,7 +21,6 @@ import ( "github.com/stretchr/testify/require" "go.opentelemetry.io/collector/component/componenttest" - "go.opentelemetry.io/collector/config/configtest" "go.opentelemetry.io/collector/consumer/consumertest" "go.opentelemetry.io/collector/receiver/scraperhelper" ) @@ -34,7 +33,7 @@ func TestType(t *testing.T) { func TestValidConfig(t *testing.T) { factory := NewFactory() - err := configtest.CheckConfigStruct(factory.CreateDefaultConfig()) + err := componenttest.CheckConfigStruct(factory.CreateDefaultConfig()) require.NoError(t, err) } diff --git a/receiver/memcachedreceiver/go.mod b/receiver/memcachedreceiver/go.mod index 359193ed5ba2..5ba0d035bf74 100644 --- a/receiver/memcachedreceiver/go.mod +++ b/receiver/memcachedreceiver/go.mod @@ -7,8 +7,8 @@ require ( github.com/open-telemetry/opentelemetry-collector-contrib/internal/containertest v0.63.0 github.com/open-telemetry/opentelemetry-collector-contrib/internal/scrapertest v0.63.0 github.com/stretchr/testify v1.8.1 - go.opentelemetry.io/collector v0.63.2-0.20221104003159-6b27644724d8 - go.opentelemetry.io/collector/pdata v0.63.2-0.20221104003159-6b27644724d8 + go.opentelemetry.io/collector v0.63.2-0.20221108014805-0b08d5316426 + go.opentelemetry.io/collector/pdata v0.63.2-0.20221108014805-0b08d5316426 go.uber.org/zap v1.23.0 ) @@ -39,7 +39,7 @@ require ( github.com/pmezard/go-difflib v1.0.0 // indirect github.com/rogpeppe/go-internal v1.6.1 // indirect github.com/sirupsen/logrus v1.8.1 // indirect - go.opencensus.io v0.23.0 // indirect + go.opencensus.io v0.24.0 // 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 e27f755409ad..23d4c59784fd 100644 --- a/receiver/memcachedreceiver/go.sum +++ b/receiver/memcachedreceiver/go.sum @@ -255,7 +255,7 @@ github.com/prometheus/client_golang v0.9.1/go.mod h1:7SWBe2y4D6OKWSNQJUaRYU/AaXP github.com/prometheus/client_golang v1.0.0/go.mod h1:db9x61etRT2tGnBNRi70OPL5FsnadC4Ky3P0J6CfImo= github.com/prometheus/client_golang v1.7.1/go.mod h1:PY5Wy2awLA44sXw4AOSfFBetzPP4j5+D6mVACh+pe2M= github.com/prometheus/client_golang v1.11.1/go.mod h1:Z6t4BnS23TR94PD6BsDNk8yVqroYurpAkEiz0P2BEV0= -github.com/prometheus/client_golang v1.13.0 h1:b71QUfeo5M8gq2+evJdTPfZhYMAU0uKPkyPJ7TPsloU= +github.com/prometheus/client_golang v1.13.1 h1:3gMjIY2+/hzmqhtUC/aQNYldJA6DtH3CgQvwS+02K1c= github.com/prometheus/client_model v0.0.0-20180712105110-5c3871d89910/go.mod h1:MbSGuTsp3dbXC40dX6PRTWyKYBIrTGTE9sqQNg2J8bo= github.com/prometheus/client_model v0.0.0-20190129233127-fd36f4220a90/go.mod h1:xMI15A0UPsDsEKsMN9yxemIoYk6Tm2C1GtYGdfGttqA= github.com/prometheus/client_model v0.0.0-20190812154241-14fe0d1b01d4/go.mod h1:xMI15A0UPsDsEKsMN9yxemIoYk6Tm2C1GtYGdfGttqA= @@ -297,7 +297,6 @@ github.com/stretchr/testify v1.2.2/go.mod h1:a8OnRcib4nhh0OaRAV+Yts87kKdq0PP7pXf github.com/stretchr/testify v1.3.0/go.mod h1:M5WIy9Dh21IEIfnGCwXGc5bZfKNJtfHm1UVUgZn+9EI= github.com/stretchr/testify v1.4.0/go.mod h1:j7eGeouHqKxXV5pUuKE4zz7dFj8WfuZ+81PSLYec5m4= github.com/stretchr/testify v1.5.1/go.mod h1:5W2xD1RspED5o8YsWQXVCued0rvSQ+mT+I5cxcmMvtA= -github.com/stretchr/testify v1.6.1/go.mod h1:6Fq8oRcR53rry900zMqJjRRixrwX3KX962/h/Wwjteg= github.com/stretchr/testify v1.7.0/go.mod h1:6Fq8oRcR53rry900zMqJjRRixrwX3KX962/h/Wwjteg= github.com/stretchr/testify v1.7.1/go.mod h1:6Fq8oRcR53rry900zMqJjRRixrwX3KX962/h/Wwjteg= github.com/stretchr/testify v1.8.0/go.mod h1:yNjHg4UonilssWZ8iaSj1OCr/vHnekPRkoO+kdMU+MU= @@ -309,12 +308,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.opencensus.io v0.23.0 h1:gqCw0LfLxScz8irSi8exQc7fyQ0fKQU/qnC/X8+V/1M= -go.opencensus.io v0.23.0/go.mod h1:XItmlyltB5F7CS4xOC1DcqMoFqwtC6OG2xF7mCv7P7E= -go.opentelemetry.io/collector v0.63.2-0.20221104003159-6b27644724d8 h1:rOT5HzXXfSISc6FiH012zH2/EFjp37UXfjEqj5BpkWQ= -go.opentelemetry.io/collector v0.63.2-0.20221104003159-6b27644724d8/go.mod h1:JVmeZXugK4ondC6KQgrHTHWiF4JttpG5k6dWPMt62+k= -go.opentelemetry.io/collector/pdata v0.63.2-0.20221104003159-6b27644724d8 h1:7xeTQjfsOm9eogQeIxjSEhlik9qsbBGsnmkQHfyKaRE= -go.opentelemetry.io/collector/pdata v0.63.2-0.20221104003159-6b27644724d8/go.mod h1:IzvXUGQml2mrnvdb8zIlEW3qQs9oFLdD2hLwJdZ+pek= +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.63.2-0.20221108014805-0b08d5316426 h1:z/wLTMh7/vNxcFUDa5uG7/IPE3tYx6pzCWPV41ghyV8= +go.opentelemetry.io/collector v0.63.2-0.20221108014805-0b08d5316426/go.mod h1:+Zb70q0Rq17dA9FcHTiTjW6g96lvJ8kAZ0c+eWNkAv0= +go.opentelemetry.io/collector/pdata v0.63.2-0.20221108014805-0b08d5316426 h1:wKDpgP0Tx/gWI2SgDGAY1OTSeihhDivbbRqFR79IGTc= +go.opentelemetry.io/collector/pdata v0.63.2-0.20221108014805-0b08d5316426/go.mod h1:IzvXUGQml2mrnvdb8zIlEW3qQs9oFLdD2hLwJdZ+pek= 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/alerts.go b/receiver/mongodbatlasreceiver/alerts.go index f9667e3e05f2..1a3fb7d17674 100644 --- a/receiver/mongodbatlasreceiver/alerts.go +++ b/receiver/mongodbatlasreceiver/alerts.go @@ -33,7 +33,6 @@ import ( "go.mongodb.org/atlas/mongodbatlas" "go.opentelemetry.io/collector/component" - "go.opentelemetry.io/collector/config" "go.opentelemetry.io/collector/config/configtls" "go.opentelemetry.io/collector/consumer" "go.opentelemetry.io/collector/exporter/exporterhelper" @@ -91,8 +90,8 @@ type alertsReceiver struct { pageSize int64 maxPages int64 doneChan chan bool - id config.ComponentID // ID of the receiver component - storageID *config.ComponentID // ID of the storage extension component + id component.ID // ID of the receiver component + storageID *component.ID // ID of the storage extension component storageClient storage.Client } diff --git a/receiver/mongodbatlasreceiver/config.go b/receiver/mongodbatlasreceiver/config.go index b387547330f7..f8e7c212ca45 100644 --- a/receiver/mongodbatlasreceiver/config.go +++ b/receiver/mongodbatlasreceiver/config.go @@ -21,7 +21,7 @@ import ( "strings" "time" - "go.opentelemetry.io/collector/config" + "go.opentelemetry.io/collector/component" "go.opentelemetry.io/collector/config/configtls" "go.opentelemetry.io/collector/exporter/exporterhelper" "go.opentelemetry.io/collector/receiver/scraperhelper" @@ -30,7 +30,7 @@ import ( "github.com/open-telemetry/opentelemetry-collector-contrib/receiver/mongodbatlasreceiver/internal/metadata" ) -var _ config.Receiver = (*Config)(nil) +var _ component.ReceiverConfig = (*Config)(nil) type Config struct { scraperhelper.ScraperControllerSettings `mapstructure:",squash"` @@ -41,7 +41,7 @@ type Config struct { Alerts AlertConfig `mapstructure:"alerts"` Logs LogConfig `mapstructure:"logs"` RetrySettings exporterhelper.RetrySettings `mapstructure:"retry_on_failure"` - StorageID *config.ComponentID `mapstructure:"storage"` + StorageID *component.ID `mapstructure:"storage"` } type AlertConfig struct { diff --git a/receiver/mongodbatlasreceiver/factory.go b/receiver/mongodbatlasreceiver/factory.go index 90dfb36ae0be..41d1dc96623d 100644 --- a/receiver/mongodbatlasreceiver/factory.go +++ b/receiver/mongodbatlasreceiver/factory.go @@ -20,7 +20,6 @@ import ( "fmt" "go.opentelemetry.io/collector/component" - "go.opentelemetry.io/collector/config" "go.opentelemetry.io/collector/consumer" "go.opentelemetry.io/collector/exporter/exporterhelper" "go.opentelemetry.io/collector/receiver/scraperhelper" @@ -49,7 +48,7 @@ func NewFactory() component.ReceiverFactory { func createMetricsReceiver( _ context.Context, params component.ReceiverCreateSettings, - rConf config.Receiver, + rConf component.ReceiverConfig, consumer consumer.Metrics, ) (component.MetricsReceiver, error) { cfg := rConf.(*Config) @@ -65,7 +64,7 @@ func createMetricsReceiver( func createCombinedLogReceiver( ctx context.Context, params component.ReceiverCreateSettings, - rConf config.Receiver, + rConf component.ReceiverConfig, consumer consumer.Logs, ) (component.LogsReceiver, error) { cfg := rConf.(*Config) @@ -91,7 +90,7 @@ func createCombinedLogReceiver( return recv, nil } -func createDefaultConfig() config.Receiver { +func createDefaultConfig() component.ReceiverConfig { return &Config{ ScraperControllerSettings: scraperhelper.NewDefaultScraperControllerSettings(typeStr), Granularity: defaultGranularity, diff --git a/receiver/mongodbatlasreceiver/go.mod b/receiver/mongodbatlasreceiver/go.mod index b42b6defc886..8228696c9f96 100644 --- a/receiver/mongodbatlasreceiver/go.mod +++ b/receiver/mongodbatlasreceiver/go.mod @@ -6,7 +6,7 @@ require ( github.com/cenkalti/backoff/v4 v4.1.3 github.com/mongodb-forks/digest v1.0.4 go.mongodb.org/atlas v0.18.0 - go.opentelemetry.io/collector v0.63.2-0.20221104003159-6b27644724d8 + go.opentelemetry.io/collector v0.63.2-0.20221108014805-0b08d5316426 go.uber.org/zap v1.23.0 ) @@ -31,7 +31,7 @@ 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.opencensus.io v0.23.0 // indirect + go.opencensus.io v0.24.0 // 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 @@ -50,7 +50,7 @@ require ( github.com/open-telemetry/opentelemetry-collector-contrib/internal/common v0.63.0 github.com/open-telemetry/opentelemetry-collector-contrib/pkg/stanza v0.63.0 github.com/stretchr/testify v1.8.1 - go.opentelemetry.io/collector/pdata v0.63.2-0.20221104003159-6b27644724d8 + go.opentelemetry.io/collector/pdata v0.63.2-0.20221108014805-0b08d5316426 go.uber.org/multierr v1.8.0 ) diff --git a/receiver/mongodbatlasreceiver/go.sum b/receiver/mongodbatlasreceiver/go.sum index 8f7e81b4546c..86f8d4eae6e5 100644 --- a/receiver/mongodbatlasreceiver/go.sum +++ b/receiver/mongodbatlasreceiver/go.sum @@ -257,7 +257,7 @@ github.com/prometheus/client_golang v0.9.1/go.mod h1:7SWBe2y4D6OKWSNQJUaRYU/AaXP github.com/prometheus/client_golang v1.0.0/go.mod h1:db9x61etRT2tGnBNRi70OPL5FsnadC4Ky3P0J6CfImo= github.com/prometheus/client_golang v1.7.1/go.mod h1:PY5Wy2awLA44sXw4AOSfFBetzPP4j5+D6mVACh+pe2M= github.com/prometheus/client_golang v1.11.1/go.mod h1:Z6t4BnS23TR94PD6BsDNk8yVqroYurpAkEiz0P2BEV0= -github.com/prometheus/client_golang v1.13.0 h1:b71QUfeo5M8gq2+evJdTPfZhYMAU0uKPkyPJ7TPsloU= +github.com/prometheus/client_golang v1.13.1 h1:3gMjIY2+/hzmqhtUC/aQNYldJA6DtH3CgQvwS+02K1c= github.com/prometheus/client_model v0.0.0-20180712105110-5c3871d89910/go.mod h1:MbSGuTsp3dbXC40dX6PRTWyKYBIrTGTE9sqQNg2J8bo= github.com/prometheus/client_model v0.0.0-20190129233127-fd36f4220a90/go.mod h1:xMI15A0UPsDsEKsMN9yxemIoYk6Tm2C1GtYGdfGttqA= github.com/prometheus/client_model v0.0.0-20190812154241-14fe0d1b01d4/go.mod h1:xMI15A0UPsDsEKsMN9yxemIoYk6Tm2C1GtYGdfGttqA= @@ -300,7 +300,6 @@ github.com/stretchr/testify v1.2.2/go.mod h1:a8OnRcib4nhh0OaRAV+Yts87kKdq0PP7pXf github.com/stretchr/testify v1.3.0/go.mod h1:M5WIy9Dh21IEIfnGCwXGc5bZfKNJtfHm1UVUgZn+9EI= github.com/stretchr/testify v1.4.0/go.mod h1:j7eGeouHqKxXV5pUuKE4zz7dFj8WfuZ+81PSLYec5m4= github.com/stretchr/testify v1.5.1/go.mod h1:5W2xD1RspED5o8YsWQXVCued0rvSQ+mT+I5cxcmMvtA= -github.com/stretchr/testify v1.6.1/go.mod h1:6Fq8oRcR53rry900zMqJjRRixrwX3KX962/h/Wwjteg= github.com/stretchr/testify v1.7.0/go.mod h1:6Fq8oRcR53rry900zMqJjRRixrwX3KX962/h/Wwjteg= github.com/stretchr/testify v1.7.1/go.mod h1:6Fq8oRcR53rry900zMqJjRRixrwX3KX962/h/Wwjteg= github.com/stretchr/testify v1.8.0/go.mod h1:yNjHg4UonilssWZ8iaSj1OCr/vHnekPRkoO+kdMU+MU= @@ -314,12 +313,12 @@ 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.mongodb.org/atlas v0.18.0 h1:hDEBykn31FlW0KKMt3xsGyqOrx+jkxB9jCO4GLhH6M0= go.mongodb.org/atlas v0.18.0/go.mod h1:GUuW7/ZrHzCO0o47aiqhokN0N6i0GM3yraRyHIBTykU= -go.opencensus.io v0.23.0 h1:gqCw0LfLxScz8irSi8exQc7fyQ0fKQU/qnC/X8+V/1M= -go.opencensus.io v0.23.0/go.mod h1:XItmlyltB5F7CS4xOC1DcqMoFqwtC6OG2xF7mCv7P7E= -go.opentelemetry.io/collector v0.63.2-0.20221104003159-6b27644724d8 h1:rOT5HzXXfSISc6FiH012zH2/EFjp37UXfjEqj5BpkWQ= -go.opentelemetry.io/collector v0.63.2-0.20221104003159-6b27644724d8/go.mod h1:JVmeZXugK4ondC6KQgrHTHWiF4JttpG5k6dWPMt62+k= -go.opentelemetry.io/collector/pdata v0.63.2-0.20221104003159-6b27644724d8 h1:7xeTQjfsOm9eogQeIxjSEhlik9qsbBGsnmkQHfyKaRE= -go.opentelemetry.io/collector/pdata v0.63.2-0.20221104003159-6b27644724d8/go.mod h1:IzvXUGQml2mrnvdb8zIlEW3qQs9oFLdD2hLwJdZ+pek= +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.63.2-0.20221108014805-0b08d5316426 h1:z/wLTMh7/vNxcFUDa5uG7/IPE3tYx6pzCWPV41ghyV8= +go.opentelemetry.io/collector v0.63.2-0.20221108014805-0b08d5316426/go.mod h1:+Zb70q0Rq17dA9FcHTiTjW6g96lvJ8kAZ0c+eWNkAv0= +go.opentelemetry.io/collector/pdata v0.63.2-0.20221108014805-0b08d5316426 h1:wKDpgP0Tx/gWI2SgDGAY1OTSeihhDivbbRqFR79IGTc= +go.opentelemetry.io/collector/pdata v0.63.2-0.20221108014805-0b08d5316426/go.mod h1:IzvXUGQml2mrnvdb8zIlEW3qQs9oFLdD2hLwJdZ+pek= 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 7506f3b356a9..18aadffbd4ad 100644 --- a/receiver/mongodbreceiver/config_test.go +++ b/receiver/mongodbreceiver/config_test.go @@ -21,7 +21,7 @@ import ( "time" "github.com/stretchr/testify/require" - "go.opentelemetry.io/collector/config" + "go.opentelemetry.io/collector/component" "go.opentelemetry.io/collector/config/confignet" "go.opentelemetry.io/collector/config/configtls" "go.opentelemetry.io/collector/confmap/confmaptest" @@ -207,9 +207,9 @@ func TestLoadConfig(t *testing.T) { factory := NewFactory() cfg := factory.CreateDefaultConfig() - sub, err := cm.Sub(config.NewComponentIDWithName(typeStr, "").String()) + sub, err := cm.Sub(component.NewIDWithName(typeStr, "").String()) require.NoError(t, err) - require.NoError(t, config.UnmarshalReceiver(sub, cfg)) + require.NoError(t, component.UnmarshalReceiverConfig(sub, cfg)) expected := factory.CreateDefaultConfig().(*Config) expected.Hosts = []confignet.NetAddr{ diff --git a/receiver/mongodbreceiver/factory.go b/receiver/mongodbreceiver/factory.go index d03fa678e148..5480705ceb19 100644 --- a/receiver/mongodbreceiver/factory.go +++ b/receiver/mongodbreceiver/factory.go @@ -41,10 +41,10 @@ func NewFactory() component.ReceiverFactory { component.WithMetricsReceiver(createMetricsReceiver, stability)) } -func createDefaultConfig() config.Receiver { +func createDefaultConfig() component.ReceiverConfig { return &Config{ ScraperControllerSettings: scraperhelper.ScraperControllerSettings{ - ReceiverSettings: config.NewReceiverSettings(config.NewComponentID(typeStr)), + ReceiverSettings: config.NewReceiverSettings(component.NewID(typeStr)), CollectionInterval: time.Minute, }, Timeout: time.Minute, @@ -61,7 +61,7 @@ func createDefaultConfig() config.Receiver { func createMetricsReceiver( _ context.Context, params component.ReceiverCreateSettings, - rConf config.Receiver, + rConf component.ReceiverConfig, consumer consumer.Metrics, ) (component.MetricsReceiver, error) { cfg := rConf.(*Config) diff --git a/receiver/mongodbreceiver/go.mod b/receiver/mongodbreceiver/go.mod index e72a6ebfe9d5..1796d643602b 100644 --- a/receiver/mongodbreceiver/go.mod +++ b/receiver/mongodbreceiver/go.mod @@ -4,7 +4,7 @@ go 1.18 require ( github.com/stretchr/testify v1.8.1 - go.opentelemetry.io/collector v0.63.2-0.20221104003159-6b27644724d8 + go.opentelemetry.io/collector v0.63.2-0.20221108014805-0b08d5316426 go.uber.org/multierr v1.8.0 ) @@ -13,7 +13,7 @@ require ( github.com/open-telemetry/opentelemetry-collector-contrib/internal/scrapertest v0.63.0 github.com/testcontainers/testcontainers-go v0.15.0 go.mongodb.org/mongo-driver v1.10.3 - go.opentelemetry.io/collector/pdata v0.63.2-0.20221104003159-6b27644724d8 + go.opentelemetry.io/collector/pdata v0.63.2-0.20221108014805-0b08d5316426 go.uber.org/zap v1.23.0 ) @@ -61,7 +61,7 @@ require ( github.com/xdg-go/scram v1.1.1 // indirect github.com/xdg-go/stringprep v1.0.3 // indirect github.com/youmark/pkcs8 v0.0.0-20181117223130-1be2e3e5546d // indirect - go.opencensus.io v0.23.0 // indirect + go.opencensus.io v0.24.0 // 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 9be59626c380..d21a6619981a 100644 --- a/receiver/mongodbreceiver/go.sum +++ b/receiver/mongodbreceiver/go.sum @@ -691,7 +691,7 @@ github.com/prometheus/client_golang v1.0.0/go.mod h1:db9x61etRT2tGnBNRi70OPL5Fsn github.com/prometheus/client_golang v1.1.0/go.mod h1:I1FGZT9+L76gKKOs5djB6ezCbFQP1xR9D75/vuwEF3g= github.com/prometheus/client_golang v1.7.1/go.mod h1:PY5Wy2awLA44sXw4AOSfFBetzPP4j5+D6mVACh+pe2M= github.com/prometheus/client_golang v1.11.1/go.mod h1:Z6t4BnS23TR94PD6BsDNk8yVqroYurpAkEiz0P2BEV0= -github.com/prometheus/client_golang v1.13.0 h1:b71QUfeo5M8gq2+evJdTPfZhYMAU0uKPkyPJ7TPsloU= +github.com/prometheus/client_golang v1.13.1 h1:3gMjIY2+/hzmqhtUC/aQNYldJA6DtH3CgQvwS+02K1c= github.com/prometheus/client_model v0.0.0-20171117100541-99fa1f4be8e5/go.mod h1:MbSGuTsp3dbXC40dX6PRTWyKYBIrTGTE9sqQNg2J8bo= github.com/prometheus/client_model v0.0.0-20180712105110-5c3871d89910/go.mod h1:MbSGuTsp3dbXC40dX6PRTWyKYBIrTGTE9sqQNg2J8bo= github.com/prometheus/client_model v0.0.0-20190129233127-fd36f4220a90/go.mod h1:xMI15A0UPsDsEKsMN9yxemIoYk6Tm2C1GtYGdfGttqA= @@ -838,12 +838,12 @@ go.opencensus.io v0.21.0/go.mod h1:mSImk1erAIZhrmZN+AvHh14ztQfjbGwt4TtuofqLduU= 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.23.0 h1:gqCw0LfLxScz8irSi8exQc7fyQ0fKQU/qnC/X8+V/1M= -go.opencensus.io v0.23.0/go.mod h1:XItmlyltB5F7CS4xOC1DcqMoFqwtC6OG2xF7mCv7P7E= -go.opentelemetry.io/collector v0.63.2-0.20221104003159-6b27644724d8 h1:rOT5HzXXfSISc6FiH012zH2/EFjp37UXfjEqj5BpkWQ= -go.opentelemetry.io/collector v0.63.2-0.20221104003159-6b27644724d8/go.mod h1:JVmeZXugK4ondC6KQgrHTHWiF4JttpG5k6dWPMt62+k= -go.opentelemetry.io/collector/pdata v0.63.2-0.20221104003159-6b27644724d8 h1:7xeTQjfsOm9eogQeIxjSEhlik9qsbBGsnmkQHfyKaRE= -go.opentelemetry.io/collector/pdata v0.63.2-0.20221104003159-6b27644724d8/go.mod h1:IzvXUGQml2mrnvdb8zIlEW3qQs9oFLdD2hLwJdZ+pek= +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.63.2-0.20221108014805-0b08d5316426 h1:z/wLTMh7/vNxcFUDa5uG7/IPE3tYx6pzCWPV41ghyV8= +go.opentelemetry.io/collector v0.63.2-0.20221108014805-0b08d5316426/go.mod h1:+Zb70q0Rq17dA9FcHTiTjW6g96lvJ8kAZ0c+eWNkAv0= +go.opentelemetry.io/collector/pdata v0.63.2-0.20221108014805-0b08d5316426 h1:wKDpgP0Tx/gWI2SgDGAY1OTSeihhDivbbRqFR79IGTc= +go.opentelemetry.io/collector/pdata v0.63.2-0.20221108014805-0b08d5316426/go.mod h1:IzvXUGQml2mrnvdb8zIlEW3qQs9oFLdD2hLwJdZ+pek= 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/config_test.go b/receiver/mysqlreceiver/config_test.go index a326d5677098..67782cf99a45 100644 --- a/receiver/mysqlreceiver/config_test.go +++ b/receiver/mysqlreceiver/config_test.go @@ -20,7 +20,7 @@ import ( "time" "github.com/stretchr/testify/require" - "go.opentelemetry.io/collector/config" + "go.opentelemetry.io/collector/component" "go.opentelemetry.io/collector/confmap/confmaptest" ) @@ -31,9 +31,9 @@ func TestLoadConfig(t *testing.T) { factory := NewFactory() cfg := factory.CreateDefaultConfig() - sub, err := cm.Sub(config.NewComponentIDWithName(typeStr, "").String()) + sub, err := cm.Sub(component.NewIDWithName(typeStr, "").String()) require.NoError(t, err) - require.NoError(t, config.UnmarshalReceiver(sub, cfg)) + require.NoError(t, component.UnmarshalReceiverConfig(sub, cfg)) expected := factory.CreateDefaultConfig().(*Config) expected.Endpoint = "localhost:3306" diff --git a/receiver/mysqlreceiver/factory.go b/receiver/mysqlreceiver/factory.go index a5ac04bbc2f5..580e9c2bf519 100644 --- a/receiver/mysqlreceiver/factory.go +++ b/receiver/mysqlreceiver/factory.go @@ -39,10 +39,10 @@ func NewFactory() component.ReceiverFactory { component.WithMetricsReceiver(createMetricsReceiver, stability)) } -func createDefaultConfig() config.Receiver { +func createDefaultConfig() component.ReceiverConfig { return &Config{ ScraperControllerSettings: scraperhelper.ScraperControllerSettings{ - ReceiverSettings: config.NewReceiverSettings(config.NewComponentID(typeStr)), + ReceiverSettings: config.NewReceiverSettings(component.NewID(typeStr)), CollectionInterval: 10 * time.Second, }, AllowNativePasswords: true, @@ -63,7 +63,7 @@ func createDefaultConfig() config.Receiver { func createMetricsReceiver( _ context.Context, params component.ReceiverCreateSettings, - rConf config.Receiver, + rConf component.ReceiverConfig, consumer consumer.Metrics, ) (component.MetricsReceiver, error) { cfg := rConf.(*Config) diff --git a/receiver/mysqlreceiver/factory_test.go b/receiver/mysqlreceiver/factory_test.go index a355e6026e01..90cf6138b81a 100644 --- a/receiver/mysqlreceiver/factory_test.go +++ b/receiver/mysqlreceiver/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/config" "go.opentelemetry.io/collector/config/confignet" @@ -49,7 +50,7 @@ func TestCreateMetricsReceiver(t *testing.T) { componenttest.NewNopReceiverCreateSettings(), &Config{ ScraperControllerSettings: scraperhelper.ScraperControllerSettings{ - ReceiverSettings: config.NewReceiverSettings(config.NewComponentID("mysql")), + ReceiverSettings: config.NewReceiverSettings(component.NewID("mysql")), CollectionInterval: 10 * time.Second, }, Username: "otel", diff --git a/receiver/mysqlreceiver/go.mod b/receiver/mysqlreceiver/go.mod index a19ec5094fc9..5bdca747cc10 100644 --- a/receiver/mysqlreceiver/go.mod +++ b/receiver/mysqlreceiver/go.mod @@ -6,13 +6,13 @@ require ( github.com/go-sql-driver/mysql v1.6.0 github.com/open-telemetry/opentelemetry-collector-contrib/internal/scrapertest v0.63.0 github.com/stretchr/testify v1.8.1 - go.opentelemetry.io/collector v0.63.2-0.20221104003159-6b27644724d8 + go.opentelemetry.io/collector v0.63.2-0.20221108014805-0b08d5316426 go.uber.org/zap v1.23.0 ) require ( github.com/testcontainers/testcontainers-go v0.15.0 - go.opentelemetry.io/collector/pdata v0.63.2-0.20221104003159-6b27644724d8 + go.opentelemetry.io/collector/pdata v0.63.2-0.20221108014805-0b08d5316426 ) require ( @@ -50,7 +50,7 @@ require ( github.com/pkg/errors v0.9.1 // indirect github.com/pmezard/go-difflib v1.0.0 // indirect github.com/sirupsen/logrus v1.8.1 // indirect - go.opencensus.io v0.23.0 // indirect + go.opencensus.io v0.24.0 // 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 111ed914bcfc..d14d42f7ec46 100644 --- a/receiver/mysqlreceiver/go.sum +++ b/receiver/mysqlreceiver/go.sum @@ -682,7 +682,7 @@ github.com/prometheus/client_golang v1.0.0/go.mod h1:db9x61etRT2tGnBNRi70OPL5Fsn github.com/prometheus/client_golang v1.1.0/go.mod h1:I1FGZT9+L76gKKOs5djB6ezCbFQP1xR9D75/vuwEF3g= github.com/prometheus/client_golang v1.7.1/go.mod h1:PY5Wy2awLA44sXw4AOSfFBetzPP4j5+D6mVACh+pe2M= github.com/prometheus/client_golang v1.11.1/go.mod h1:Z6t4BnS23TR94PD6BsDNk8yVqroYurpAkEiz0P2BEV0= -github.com/prometheus/client_golang v1.13.0 h1:b71QUfeo5M8gq2+evJdTPfZhYMAU0uKPkyPJ7TPsloU= +github.com/prometheus/client_golang v1.13.1 h1:3gMjIY2+/hzmqhtUC/aQNYldJA6DtH3CgQvwS+02K1c= github.com/prometheus/client_model v0.0.0-20171117100541-99fa1f4be8e5/go.mod h1:MbSGuTsp3dbXC40dX6PRTWyKYBIrTGTE9sqQNg2J8bo= github.com/prometheus/client_model v0.0.0-20180712105110-5c3871d89910/go.mod h1:MbSGuTsp3dbXC40dX6PRTWyKYBIrTGTE9sqQNg2J8bo= github.com/prometheus/client_model v0.0.0-20190129233127-fd36f4220a90/go.mod h1:xMI15A0UPsDsEKsMN9yxemIoYk6Tm2C1GtYGdfGttqA= @@ -816,12 +816,12 @@ go.opencensus.io v0.21.0/go.mod h1:mSImk1erAIZhrmZN+AvHh14ztQfjbGwt4TtuofqLduU= 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.23.0 h1:gqCw0LfLxScz8irSi8exQc7fyQ0fKQU/qnC/X8+V/1M= -go.opencensus.io v0.23.0/go.mod h1:XItmlyltB5F7CS4xOC1DcqMoFqwtC6OG2xF7mCv7P7E= -go.opentelemetry.io/collector v0.63.2-0.20221104003159-6b27644724d8 h1:rOT5HzXXfSISc6FiH012zH2/EFjp37UXfjEqj5BpkWQ= -go.opentelemetry.io/collector v0.63.2-0.20221104003159-6b27644724d8/go.mod h1:JVmeZXugK4ondC6KQgrHTHWiF4JttpG5k6dWPMt62+k= -go.opentelemetry.io/collector/pdata v0.63.2-0.20221104003159-6b27644724d8 h1:7xeTQjfsOm9eogQeIxjSEhlik9qsbBGsnmkQHfyKaRE= -go.opentelemetry.io/collector/pdata v0.63.2-0.20221104003159-6b27644724d8/go.mod h1:IzvXUGQml2mrnvdb8zIlEW3qQs9oFLdD2hLwJdZ+pek= +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.63.2-0.20221108014805-0b08d5316426 h1:z/wLTMh7/vNxcFUDa5uG7/IPE3tYx6pzCWPV41ghyV8= +go.opentelemetry.io/collector v0.63.2-0.20221108014805-0b08d5316426/go.mod h1:+Zb70q0Rq17dA9FcHTiTjW6g96lvJ8kAZ0c+eWNkAv0= +go.opentelemetry.io/collector/pdata v0.63.2-0.20221108014805-0b08d5316426 h1:wKDpgP0Tx/gWI2SgDGAY1OTSeihhDivbbRqFR79IGTc= +go.opentelemetry.io/collector/pdata v0.63.2-0.20221108014805-0b08d5316426/go.mod h1:IzvXUGQml2mrnvdb8zIlEW3qQs9oFLdD2hLwJdZ+pek= 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/config_test.go b/receiver/nginxreceiver/config_test.go index dee57d44e5ac..3724a8396e31 100644 --- a/receiver/nginxreceiver/config_test.go +++ b/receiver/nginxreceiver/config_test.go @@ -20,7 +20,7 @@ import ( "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" - "go.opentelemetry.io/collector/config" + "go.opentelemetry.io/collector/component" "go.opentelemetry.io/collector/confmap/confmaptest" ) @@ -30,9 +30,9 @@ func TestLoadConfig(t *testing.T) { factory := NewFactory() cfg := factory.CreateDefaultConfig() - sub, err := cm.Sub(config.NewComponentIDWithName(typeStr, "").String()) + sub, err := cm.Sub(component.NewIDWithName(typeStr, "").String()) require.NoError(t, err) - require.NoError(t, config.UnmarshalReceiver(sub, cfg)) + require.NoError(t, component.UnmarshalReceiverConfig(sub, cfg)) assert.Equal(t, factory.CreateDefaultConfig(), cfg) } diff --git a/receiver/nginxreceiver/factory.go b/receiver/nginxreceiver/factory.go index d7f945f877d1..e10c74d0e02c 100644 --- a/receiver/nginxreceiver/factory.go +++ b/receiver/nginxreceiver/factory.go @@ -40,10 +40,10 @@ func NewFactory() component.ReceiverFactory { component.WithMetricsReceiver(createMetricsReceiver, stability)) } -func createDefaultConfig() config.Receiver { +func createDefaultConfig() component.ReceiverConfig { return &Config{ ScraperControllerSettings: scraperhelper.ScraperControllerSettings{ - ReceiverSettings: config.NewReceiverSettings(config.NewComponentID(typeStr)), + ReceiverSettings: config.NewReceiverSettings(component.NewID(typeStr)), CollectionInterval: 10 * time.Second, }, HTTPClientSettings: confighttp.HTTPClientSettings{ @@ -57,7 +57,7 @@ func createDefaultConfig() config.Receiver { func createMetricsReceiver( _ context.Context, params component.ReceiverCreateSettings, - rConf config.Receiver, + rConf component.ReceiverConfig, consumer consumer.Metrics, ) (component.MetricsReceiver, error) { cfg := rConf.(*Config) diff --git a/receiver/nginxreceiver/factory_test.go b/receiver/nginxreceiver/factory_test.go index 4adc1e0f9f95..eff4e8aebeb3 100644 --- a/receiver/nginxreceiver/factory_test.go +++ b/receiver/nginxreceiver/factory_test.go @@ -21,7 +21,6 @@ import ( "github.com/stretchr/testify/require" "go.opentelemetry.io/collector/component/componenttest" - "go.opentelemetry.io/collector/config/configtest" "go.opentelemetry.io/collector/consumer/consumertest" "go.opentelemetry.io/collector/receiver/scraperhelper" ) @@ -34,7 +33,7 @@ func TestType(t *testing.T) { func TestValidConfig(t *testing.T) { factory := NewFactory() - err := configtest.CheckConfigStruct(factory.CreateDefaultConfig()) + err := componenttest.CheckConfigStruct(factory.CreateDefaultConfig()) require.NoError(t, err) } diff --git a/receiver/nginxreceiver/go.mod b/receiver/nginxreceiver/go.mod index 6a5edf52340c..a72cd1a4ed2f 100644 --- a/receiver/nginxreceiver/go.mod +++ b/receiver/nginxreceiver/go.mod @@ -8,8 +8,8 @@ require ( github.com/open-telemetry/opentelemetry-collector-contrib/internal/scrapertest v0.63.0 github.com/stretchr/testify v1.8.1 github.com/testcontainers/testcontainers-go v0.15.0 - go.opentelemetry.io/collector v0.63.2-0.20221104003159-6b27644724d8 - go.opentelemetry.io/collector/pdata v0.63.2-0.20221104003159-6b27644724d8 + go.opentelemetry.io/collector v0.63.2-0.20221108014805-0b08d5316426 + go.opentelemetry.io/collector/pdata v0.63.2-0.20221108014805-0b08d5316426 go.uber.org/zap v1.23.0 ) @@ -54,7 +54,7 @@ require ( github.com/pmezard/go-difflib v1.0.0 // indirect github.com/rs/cors v1.8.2 // indirect github.com/sirupsen/logrus v1.8.1 // indirect - go.opencensus.io v0.23.0 // indirect + go.opencensus.io v0.24.0 // 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 4b591bcb9fbd..05e12a969dee 100644 --- a/receiver/nginxreceiver/go.sum +++ b/receiver/nginxreceiver/go.sum @@ -695,7 +695,7 @@ github.com/prometheus/client_golang v1.1.0/go.mod h1:I1FGZT9+L76gKKOs5djB6ezCbFQ github.com/prometheus/client_golang v1.6.0/go.mod h1:ZLOG9ck3JLRdB5MgO8f+lLTe83AXG6ro35rLTxvnIl4= github.com/prometheus/client_golang v1.7.1/go.mod h1:PY5Wy2awLA44sXw4AOSfFBetzPP4j5+D6mVACh+pe2M= github.com/prometheus/client_golang v1.11.1/go.mod h1:Z6t4BnS23TR94PD6BsDNk8yVqroYurpAkEiz0P2BEV0= -github.com/prometheus/client_golang v1.13.0 h1:b71QUfeo5M8gq2+evJdTPfZhYMAU0uKPkyPJ7TPsloU= +github.com/prometheus/client_golang v1.13.1 h1:3gMjIY2+/hzmqhtUC/aQNYldJA6DtH3CgQvwS+02K1c= github.com/prometheus/client_model v0.0.0-20171117100541-99fa1f4be8e5/go.mod h1:MbSGuTsp3dbXC40dX6PRTWyKYBIrTGTE9sqQNg2J8bo= github.com/prometheus/client_model v0.0.0-20180712105110-5c3871d89910/go.mod h1:MbSGuTsp3dbXC40dX6PRTWyKYBIrTGTE9sqQNg2J8bo= github.com/prometheus/client_model v0.0.0-20190129233127-fd36f4220a90/go.mod h1:xMI15A0UPsDsEKsMN9yxemIoYk6Tm2C1GtYGdfGttqA= @@ -833,12 +833,12 @@ go.opencensus.io v0.21.0/go.mod h1:mSImk1erAIZhrmZN+AvHh14ztQfjbGwt4TtuofqLduU= 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.23.0 h1:gqCw0LfLxScz8irSi8exQc7fyQ0fKQU/qnC/X8+V/1M= -go.opencensus.io v0.23.0/go.mod h1:XItmlyltB5F7CS4xOC1DcqMoFqwtC6OG2xF7mCv7P7E= -go.opentelemetry.io/collector v0.63.2-0.20221104003159-6b27644724d8 h1:rOT5HzXXfSISc6FiH012zH2/EFjp37UXfjEqj5BpkWQ= -go.opentelemetry.io/collector v0.63.2-0.20221104003159-6b27644724d8/go.mod h1:JVmeZXugK4ondC6KQgrHTHWiF4JttpG5k6dWPMt62+k= -go.opentelemetry.io/collector/pdata v0.63.2-0.20221104003159-6b27644724d8 h1:7xeTQjfsOm9eogQeIxjSEhlik9qsbBGsnmkQHfyKaRE= -go.opentelemetry.io/collector/pdata v0.63.2-0.20221104003159-6b27644724d8/go.mod h1:IzvXUGQml2mrnvdb8zIlEW3qQs9oFLdD2hLwJdZ+pek= +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.63.2-0.20221108014805-0b08d5316426 h1:z/wLTMh7/vNxcFUDa5uG7/IPE3tYx6pzCWPV41ghyV8= +go.opentelemetry.io/collector v0.63.2-0.20221108014805-0b08d5316426/go.mod h1:+Zb70q0Rq17dA9FcHTiTjW6g96lvJ8kAZ0c+eWNkAv0= +go.opentelemetry.io/collector/pdata v0.63.2-0.20221108014805-0b08d5316426 h1:wKDpgP0Tx/gWI2SgDGAY1OTSeihhDivbbRqFR79IGTc= +go.opentelemetry.io/collector/pdata v0.63.2-0.20221108014805-0b08d5316426/go.mod h1:IzvXUGQml2mrnvdb8zIlEW3qQs9oFLdD2hLwJdZ+pek= 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/nsxtreceiver/config_test.go b/receiver/nsxtreceiver/config_test.go index 8bdd4ffee26a..2beddd248aff 100644 --- a/receiver/nsxtreceiver/config_test.go +++ b/receiver/nsxtreceiver/config_test.go @@ -21,7 +21,7 @@ import ( "time" "github.com/stretchr/testify/require" - "go.opentelemetry.io/collector/config" + "go.opentelemetry.io/collector/component" "go.opentelemetry.io/collector/config/confighttp" "go.opentelemetry.io/collector/confmap/confmaptest" ) @@ -96,9 +96,9 @@ func TestLoadConfig(t *testing.T) { factory := NewFactory() cfg := factory.CreateDefaultConfig() - sub, err := cm.Sub(config.NewComponentIDWithName(typeStr, "").String()) + sub, err := cm.Sub(component.NewIDWithName(typeStr, "").String()) require.NoError(t, err) - require.NoError(t, config.UnmarshalReceiver(sub, cfg)) + require.NoError(t, component.UnmarshalReceiverConfig(sub, cfg)) expected := factory.CreateDefaultConfig().(*Config) expected.Endpoint = "https://nsx-manager-endpoint" diff --git a/receiver/nsxtreceiver/factory.go b/receiver/nsxtreceiver/factory.go index 269c83da3acd..bd4a40164a93 100644 --- a/receiver/nsxtreceiver/factory.go +++ b/receiver/nsxtreceiver/factory.go @@ -43,17 +43,17 @@ func NewFactory() component.ReceiverFactory { ) } -func createDefaultConfig() config.Receiver { +func createDefaultConfig() component.ReceiverConfig { return &Config{ ScraperControllerSettings: scraperhelper.ScraperControllerSettings{ - ReceiverSettings: config.NewReceiverSettings(config.NewComponentID(typeStr)), + ReceiverSettings: config.NewReceiverSettings(component.NewID(typeStr)), CollectionInterval: time.Minute, }, Metrics: metadata.DefaultMetricsSettings(), } } -func createMetricsReceiver(ctx context.Context, params component.ReceiverCreateSettings, rConf config.Receiver, consumer consumer.Metrics) (component.MetricsReceiver, error) { +func createMetricsReceiver(ctx context.Context, params component.ReceiverCreateSettings, rConf component.ReceiverConfig, consumer consumer.Metrics) (component.MetricsReceiver, error) { cfg, ok := rConf.(*Config) if !ok { return nil, errConfigNotNSX diff --git a/receiver/nsxtreceiver/go.mod b/receiver/nsxtreceiver/go.mod index 7d5cd663830b..b2b8427b6e58 100644 --- a/receiver/nsxtreceiver/go.mod +++ b/receiver/nsxtreceiver/go.mod @@ -5,8 +5,8 @@ go 1.18 require ( github.com/open-telemetry/opentelemetry-collector-contrib/internal/scrapertest v0.63.0 github.com/vmware/go-vmware-nsxt v0.0.0-20220328155605-f49a14c1ef5f - go.opentelemetry.io/collector v0.63.2-0.20221104003159-6b27644724d8 - go.opentelemetry.io/collector/pdata v0.63.2-0.20221104003159-6b27644724d8 + go.opentelemetry.io/collector v0.63.2-0.20221108014805-0b08d5316426 + go.opentelemetry.io/collector/pdata v0.63.2-0.20221108014805-0b08d5316426 go.uber.org/multierr v1.8.0 go.uber.org/zap v1.23.0 ) @@ -32,7 +32,7 @@ require ( github.com/rs/cors v1.8.2 // indirect github.com/stretchr/objx v0.5.0 // indirect github.com/stretchr/testify v1.8.1 - go.opencensus.io v0.23.0 // indirect + go.opencensus.io v0.24.0 // 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 67fbc0405c46..a543d3d3c306 100644 --- a/receiver/nsxtreceiver/go.sum +++ b/receiver/nsxtreceiver/go.sum @@ -237,7 +237,7 @@ github.com/prometheus/client_golang v0.9.1/go.mod h1:7SWBe2y4D6OKWSNQJUaRYU/AaXP github.com/prometheus/client_golang v1.0.0/go.mod h1:db9x61etRT2tGnBNRi70OPL5FsnadC4Ky3P0J6CfImo= github.com/prometheus/client_golang v1.7.1/go.mod h1:PY5Wy2awLA44sXw4AOSfFBetzPP4j5+D6mVACh+pe2M= github.com/prometheus/client_golang v1.11.1/go.mod h1:Z6t4BnS23TR94PD6BsDNk8yVqroYurpAkEiz0P2BEV0= -github.com/prometheus/client_golang v1.13.0 h1:b71QUfeo5M8gq2+evJdTPfZhYMAU0uKPkyPJ7TPsloU= +github.com/prometheus/client_golang v1.13.1 h1:3gMjIY2+/hzmqhtUC/aQNYldJA6DtH3CgQvwS+02K1c= github.com/prometheus/client_model v0.0.0-20180712105110-5c3871d89910/go.mod h1:MbSGuTsp3dbXC40dX6PRTWyKYBIrTGTE9sqQNg2J8bo= github.com/prometheus/client_model v0.0.0-20190129233127-fd36f4220a90/go.mod h1:xMI15A0UPsDsEKsMN9yxemIoYk6Tm2C1GtYGdfGttqA= github.com/prometheus/client_model v0.0.0-20190812154241-14fe0d1b01d4/go.mod h1:xMI15A0UPsDsEKsMN9yxemIoYk6Tm2C1GtYGdfGttqA= @@ -278,7 +278,6 @@ github.com/stretchr/testify v1.2.2/go.mod h1:a8OnRcib4nhh0OaRAV+Yts87kKdq0PP7pXf github.com/stretchr/testify v1.3.0/go.mod h1:M5WIy9Dh21IEIfnGCwXGc5bZfKNJtfHm1UVUgZn+9EI= github.com/stretchr/testify v1.4.0/go.mod h1:j7eGeouHqKxXV5pUuKE4zz7dFj8WfuZ+81PSLYec5m4= github.com/stretchr/testify v1.5.1/go.mod h1:5W2xD1RspED5o8YsWQXVCued0rvSQ+mT+I5cxcmMvtA= -github.com/stretchr/testify v1.6.1/go.mod h1:6Fq8oRcR53rry900zMqJjRRixrwX3KX962/h/Wwjteg= github.com/stretchr/testify v1.7.0/go.mod h1:6Fq8oRcR53rry900zMqJjRRixrwX3KX962/h/Wwjteg= github.com/stretchr/testify v1.7.1/go.mod h1:6Fq8oRcR53rry900zMqJjRRixrwX3KX962/h/Wwjteg= github.com/stretchr/testify v1.8.0/go.mod h1:yNjHg4UonilssWZ8iaSj1OCr/vHnekPRkoO+kdMU+MU= @@ -292,12 +291,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.opencensus.io v0.23.0 h1:gqCw0LfLxScz8irSi8exQc7fyQ0fKQU/qnC/X8+V/1M= -go.opencensus.io v0.23.0/go.mod h1:XItmlyltB5F7CS4xOC1DcqMoFqwtC6OG2xF7mCv7P7E= -go.opentelemetry.io/collector v0.63.2-0.20221104003159-6b27644724d8 h1:rOT5HzXXfSISc6FiH012zH2/EFjp37UXfjEqj5BpkWQ= -go.opentelemetry.io/collector v0.63.2-0.20221104003159-6b27644724d8/go.mod h1:JVmeZXugK4ondC6KQgrHTHWiF4JttpG5k6dWPMt62+k= -go.opentelemetry.io/collector/pdata v0.63.2-0.20221104003159-6b27644724d8 h1:7xeTQjfsOm9eogQeIxjSEhlik9qsbBGsnmkQHfyKaRE= -go.opentelemetry.io/collector/pdata v0.63.2-0.20221104003159-6b27644724d8/go.mod h1:IzvXUGQml2mrnvdb8zIlEW3qQs9oFLdD2hLwJdZ+pek= +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.63.2-0.20221108014805-0b08d5316426 h1:z/wLTMh7/vNxcFUDa5uG7/IPE3tYx6pzCWPV41ghyV8= +go.opentelemetry.io/collector v0.63.2-0.20221108014805-0b08d5316426/go.mod h1:+Zb70q0Rq17dA9FcHTiTjW6g96lvJ8kAZ0c+eWNkAv0= +go.opentelemetry.io/collector/pdata v0.63.2-0.20221108014805-0b08d5316426 h1:wKDpgP0Tx/gWI2SgDGAY1OTSeihhDivbbRqFR79IGTc= +go.opentelemetry.io/collector/pdata v0.63.2-0.20221108014805-0b08d5316426/go.mod h1:IzvXUGQml2mrnvdb8zIlEW3qQs9oFLdD2hLwJdZ+pek= 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.go b/receiver/opencensusreceiver/config.go index 531937e24a3b..d0632a1a691d 100644 --- a/receiver/opencensusreceiver/config.go +++ b/receiver/opencensusreceiver/config.go @@ -15,6 +15,7 @@ package opencensusreceiver // import "github.com/open-telemetry/opentelemetry-collector-contrib/receiver/opencensusreceiver" import ( + "go.opentelemetry.io/collector/component" "go.opentelemetry.io/collector/config" "go.opentelemetry.io/collector/config/configgrpc" ) @@ -43,7 +44,7 @@ func (cfg *Config) buildOptions() []ocOption { return opts } -var _ config.Receiver = (*Config)(nil) +var _ component.ReceiverConfig = (*Config)(nil) // Validate checks the receiver configuration is valid func (cfg *Config) Validate() error { diff --git a/receiver/opencensusreceiver/config_test.go b/receiver/opencensusreceiver/config_test.go index ae82a98d307d..43d8f3fc7455 100644 --- a/receiver/opencensusreceiver/config_test.go +++ b/receiver/opencensusreceiver/config_test.go @@ -21,6 +21,7 @@ import ( "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" + "go.opentelemetry.io/collector/component" "go.opentelemetry.io/collector/config" "go.opentelemetry.io/collector/config/configgrpc" "go.opentelemetry.io/collector/config/confignet" @@ -35,13 +36,13 @@ func TestLoadConfig(t *testing.T) { require.NoError(t, err) tests := []struct { - id config.ComponentID - expected config.Receiver + id component.ID + expected component.ReceiverConfig }{ { - id: config.NewComponentIDWithName(typeStr, "customname"), + id: component.NewIDWithName(typeStr, "customname"), expected: &Config{ - ReceiverSettings: config.NewReceiverSettings(config.NewComponentID(typeStr)), + ReceiverSettings: config.NewReceiverSettings(component.NewID(typeStr)), GRPCServerSettings: configgrpc.GRPCServerSettings{ NetAddr: confignet.NetAddr{ Endpoint: "0.0.0.0:9090", @@ -52,9 +53,9 @@ func TestLoadConfig(t *testing.T) { }, }, { - id: config.NewComponentIDWithName(typeStr, "keepalive"), + id: component.NewIDWithName(typeStr, "keepalive"), expected: &Config{ - ReceiverSettings: config.NewReceiverSettings(config.NewComponentID(typeStr)), + ReceiverSettings: config.NewReceiverSettings(component.NewID(typeStr)), GRPCServerSettings: configgrpc.GRPCServerSettings{ NetAddr: confignet.NetAddr{ Endpoint: "0.0.0.0:55678", @@ -78,9 +79,9 @@ func TestLoadConfig(t *testing.T) { }, }, { - id: config.NewComponentIDWithName(typeStr, "msg-size-conc-connect-max-idle"), + id: component.NewIDWithName(typeStr, "msg-size-conc-connect-max-idle"), expected: &Config{ - ReceiverSettings: config.NewReceiverSettings(config.NewComponentID(typeStr)), + ReceiverSettings: config.NewReceiverSettings(component.NewID(typeStr)), GRPCServerSettings: configgrpc.GRPCServerSettings{ NetAddr: confignet.NetAddr{ Endpoint: "0.0.0.0:55678", @@ -99,9 +100,9 @@ func TestLoadConfig(t *testing.T) { }, }, { - id: config.NewComponentIDWithName(typeStr, "tlscredentials"), + id: component.NewIDWithName(typeStr, "tlscredentials"), expected: &Config{ - ReceiverSettings: config.NewReceiverSettings(config.NewComponentID(typeStr)), + ReceiverSettings: config.NewReceiverSettings(component.NewID(typeStr)), GRPCServerSettings: configgrpc.GRPCServerSettings{ NetAddr: confignet.NetAddr{ Endpoint: "0.0.0.0:55678", @@ -118,9 +119,9 @@ func TestLoadConfig(t *testing.T) { }, }, { - id: config.NewComponentIDWithName(typeStr, "cors"), + id: component.NewIDWithName(typeStr, "cors"), expected: &Config{ - ReceiverSettings: config.NewReceiverSettings(config.NewComponentID(typeStr)), + ReceiverSettings: config.NewReceiverSettings(component.NewID(typeStr)), GRPCServerSettings: configgrpc.GRPCServerSettings{ NetAddr: confignet.NetAddr{ Endpoint: "0.0.0.0:55678", @@ -132,9 +133,9 @@ func TestLoadConfig(t *testing.T) { }, }, { - id: config.NewComponentIDWithName(typeStr, "uds"), + id: component.NewIDWithName(typeStr, "uds"), expected: &Config{ - ReceiverSettings: config.NewReceiverSettings(config.NewComponentID(typeStr)), + ReceiverSettings: config.NewReceiverSettings(component.NewID(typeStr)), GRPCServerSettings: configgrpc.GRPCServerSettings{ NetAddr: confignet.NetAddr{ Endpoint: "/tmp/opencensus.sock", @@ -153,7 +154,7 @@ func TestLoadConfig(t *testing.T) { sub, err := cm.Sub(tt.id.String()) require.NoError(t, err) - require.NoError(t, config.UnmarshalReceiver(sub, cfg)) + require.NoError(t, component.UnmarshalReceiverConfig(sub, cfg)) assert.NoError(t, cfg.Validate()) assert.Equal(t, tt.expected, cfg) diff --git a/receiver/opencensusreceiver/factory.go b/receiver/opencensusreceiver/factory.go index 01d94d0a4cfc..e66289b52a9c 100644 --- a/receiver/opencensusreceiver/factory.go +++ b/receiver/opencensusreceiver/factory.go @@ -40,9 +40,9 @@ func NewFactory() component.ReceiverFactory { component.WithMetricsReceiver(createMetricsReceiver, stability)) } -func createDefaultConfig() config.Receiver { +func createDefaultConfig() component.ReceiverConfig { return &Config{ - ReceiverSettings: config.NewReceiverSettings(config.NewComponentID(typeStr)), + ReceiverSettings: config.NewReceiverSettings(component.NewID(typeStr)), GRPCServerSettings: configgrpc.GRPCServerSettings{ NetAddr: confignet.NetAddr{ Endpoint: "0.0.0.0:55678", @@ -57,7 +57,7 @@ func createDefaultConfig() config.Receiver { func createTracesReceiver( _ context.Context, set component.ReceiverCreateSettings, - cfg config.Receiver, + cfg component.ReceiverConfig, nextConsumer consumer.Traces, ) (component.TracesReceiver, error) { var err error @@ -78,7 +78,7 @@ func createTracesReceiver( func createMetricsReceiver( _ context.Context, set component.ReceiverCreateSettings, - cfg config.Receiver, + cfg component.ReceiverConfig, nextConsumer consumer.Metrics, ) (component.MetricsReceiver, error) { var err error diff --git a/receiver/opencensusreceiver/factory_test.go b/receiver/opencensusreceiver/factory_test.go index 9fcd647a09bd..296d3c0f6730 100644 --- a/receiver/opencensusreceiver/factory_test.go +++ b/receiver/opencensusreceiver/factory_test.go @@ -21,11 +21,11 @@ import ( "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" + "go.opentelemetry.io/collector/component" "go.opentelemetry.io/collector/component/componenttest" "go.opentelemetry.io/collector/config" "go.opentelemetry.io/collector/config/configgrpc" "go.opentelemetry.io/collector/config/confignet" - "go.opentelemetry.io/collector/config/configtest" "go.opentelemetry.io/collector/consumer/consumertest" "github.com/open-telemetry/opentelemetry-collector-contrib/internal/common/testutil" @@ -34,7 +34,7 @@ import ( func TestCreateDefaultConfig(t *testing.T) { cfg := createDefaultConfig() assert.NotNil(t, cfg, "failed to create default config") - assert.NoError(t, configtest.CheckConfigStruct(cfg)) + assert.NoError(t, componenttest.CheckConfigStruct(cfg)) } func TestCreateReceiver(t *testing.T) { @@ -67,14 +67,14 @@ func TestCreateTracesReceiver(t *testing.T) { { name: "default", cfg: &Config{ - ReceiverSettings: config.NewReceiverSettings(config.NewComponentID(typeStr)), + ReceiverSettings: config.NewReceiverSettings(component.NewID(typeStr)), GRPCServerSettings: defaultGRPCSettings, }, }, { name: "invalid_port", cfg: &Config{ - ReceiverSettings: config.NewReceiverSettings(config.NewComponentID(typeStr)), + ReceiverSettings: config.NewReceiverSettings(component.NewID(typeStr)), GRPCServerSettings: configgrpc.GRPCServerSettings{ NetAddr: confignet.NetAddr{ Endpoint: "localhost:112233", @@ -87,7 +87,7 @@ func TestCreateTracesReceiver(t *testing.T) { { name: "max-msg-size-and-concurrent-connections", cfg: &Config{ - ReceiverSettings: config.NewReceiverSettings(config.NewComponentID(typeStr)), + ReceiverSettings: config.NewReceiverSettings(component.NewID(typeStr)), GRPCServerSettings: configgrpc.GRPCServerSettings{ NetAddr: defaultNetAddr, MaxRecvMsgSizeMiB: 32, @@ -130,14 +130,14 @@ func TestCreateMetricsReceiver(t *testing.T) { { name: "default", cfg: &Config{ - ReceiverSettings: config.NewReceiverSettings(config.NewComponentID(typeStr)), + ReceiverSettings: config.NewReceiverSettings(component.NewID(typeStr)), GRPCServerSettings: defaultGRPCSettings, }, }, { name: "invalid_address", cfg: &Config{ - ReceiverSettings: config.NewReceiverSettings(config.NewComponentID(typeStr)), + ReceiverSettings: config.NewReceiverSettings(component.NewID(typeStr)), GRPCServerSettings: configgrpc.GRPCServerSettings{ NetAddr: confignet.NetAddr{ Endpoint: "327.0.0.1:1122", @@ -150,7 +150,7 @@ func TestCreateMetricsReceiver(t *testing.T) { { name: "keepalive", cfg: &Config{ - ReceiverSettings: config.NewReceiverSettings(config.NewComponentID(typeStr)), + ReceiverSettings: config.NewReceiverSettings(component.NewID(typeStr)), GRPCServerSettings: configgrpc.GRPCServerSettings{ NetAddr: defaultNetAddr, Keepalive: &configgrpc.KeepaliveServerConfig{ diff --git a/receiver/opencensusreceiver/go.mod b/receiver/opencensusreceiver/go.mod index 0761ab951872..7f3042e63391 100644 --- a/receiver/opencensusreceiver/go.mod +++ b/receiver/opencensusreceiver/go.mod @@ -12,8 +12,8 @@ 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.63.2-0.20221104003159-6b27644724d8 - go.opentelemetry.io/collector/pdata v0.63.2-0.20221104003159-6b27644724d8 + go.opentelemetry.io/collector v0.63.2-0.20221108014805-0b08d5316426 + go.opentelemetry.io/collector/pdata v0.63.2-0.20221108014805-0b08d5316426 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 @@ -47,13 +47,13 @@ require ( github.com/modern-go/reflect2 v1.0.2 // indirect github.com/mostynb/go-grpc-compression v1.1.17 // indirect github.com/pmezard/go-difflib v1.0.0 // indirect - github.com/prometheus/client_golang v1.13.0 // indirect + github.com/prometheus/client_golang v1.13.1 // indirect github.com/prometheus/client_model v0.3.0 // indirect 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.opencensus.io v0.23.0 // indirect - go.opentelemetry.io/collector/semconv v0.63.2-0.20221104003159-6b27644724d8 // indirect + go.opencensus.io v0.24.0 // indirect + go.opentelemetry.io/collector/semconv v0.63.2-0.20221108014805-0b08d5316426 // 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 05ec3a57627f..83c1df670846 100644 --- a/receiver/opencensusreceiver/go.sum +++ b/receiver/opencensusreceiver/go.sum @@ -326,8 +326,9 @@ github.com/prometheus/client_golang v1.11.0/go.mod h1:Z6t4BnS23TR94PD6BsDNk8yVqr github.com/prometheus/client_golang v1.11.1/go.mod h1:Z6t4BnS23TR94PD6BsDNk8yVqroYurpAkEiz0P2BEV0= github.com/prometheus/client_golang v1.12.1/go.mod h1:3Z9XVyYiZYEO+YQWt3RD2R3jrbd179Rt297l4aS6nDY= github.com/prometheus/client_golang v1.12.2/go.mod h1:3Z9XVyYiZYEO+YQWt3RD2R3jrbd179Rt297l4aS6nDY= -github.com/prometheus/client_golang v1.13.0 h1:b71QUfeo5M8gq2+evJdTPfZhYMAU0uKPkyPJ7TPsloU= github.com/prometheus/client_golang v1.13.0/go.mod h1:vTeo+zgvILHsnnj/39Ou/1fPN5nJFOEMgftOUOmlvYQ= +github.com/prometheus/client_golang v1.13.1 h1:3gMjIY2+/hzmqhtUC/aQNYldJA6DtH3CgQvwS+02K1c= +github.com/prometheus/client_golang v1.13.1/go.mod h1:vTeo+zgvILHsnnj/39Ou/1fPN5nJFOEMgftOUOmlvYQ= github.com/prometheus/client_model v0.0.0-20180712105110-5c3871d89910/go.mod h1:MbSGuTsp3dbXC40dX6PRTWyKYBIrTGTE9sqQNg2J8bo= github.com/prometheus/client_model v0.0.0-20190129233127-fd36f4220a90/go.mod h1:xMI15A0UPsDsEKsMN9yxemIoYk6Tm2C1GtYGdfGttqA= github.com/prometheus/client_model v0.0.0-20190812154241-14fe0d1b01d4/go.mod h1:xMI15A0UPsDsEKsMN9yxemIoYk6Tm2C1GtYGdfGttqA= @@ -396,14 +397,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.opencensus.io v0.23.0 h1:gqCw0LfLxScz8irSi8exQc7fyQ0fKQU/qnC/X8+V/1M= go.opencensus.io v0.23.0/go.mod h1:XItmlyltB5F7CS4xOC1DcqMoFqwtC6OG2xF7mCv7P7E= -go.opentelemetry.io/collector v0.63.2-0.20221104003159-6b27644724d8 h1:rOT5HzXXfSISc6FiH012zH2/EFjp37UXfjEqj5BpkWQ= -go.opentelemetry.io/collector v0.63.2-0.20221104003159-6b27644724d8/go.mod h1:JVmeZXugK4ondC6KQgrHTHWiF4JttpG5k6dWPMt62+k= -go.opentelemetry.io/collector/pdata v0.63.2-0.20221104003159-6b27644724d8 h1:7xeTQjfsOm9eogQeIxjSEhlik9qsbBGsnmkQHfyKaRE= -go.opentelemetry.io/collector/pdata v0.63.2-0.20221104003159-6b27644724d8/go.mod h1:IzvXUGQml2mrnvdb8zIlEW3qQs9oFLdD2hLwJdZ+pek= -go.opentelemetry.io/collector/semconv v0.63.2-0.20221104003159-6b27644724d8 h1:jm0sNPyqo6S165QjQYMBHB2nK50wlJbMYM03Yr3Eo2k= -go.opentelemetry.io/collector/semconv v0.63.2-0.20221104003159-6b27644724d8/go.mod h1:5o9yhOa+ABt7g2E5JABDxGZ1PQPbtfxrKNbYn+LOTXU= +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.63.2-0.20221108014805-0b08d5316426 h1:z/wLTMh7/vNxcFUDa5uG7/IPE3tYx6pzCWPV41ghyV8= +go.opentelemetry.io/collector v0.63.2-0.20221108014805-0b08d5316426/go.mod h1:+Zb70q0Rq17dA9FcHTiTjW6g96lvJ8kAZ0c+eWNkAv0= +go.opentelemetry.io/collector/pdata v0.63.2-0.20221108014805-0b08d5316426 h1:wKDpgP0Tx/gWI2SgDGAY1OTSeihhDivbbRqFR79IGTc= +go.opentelemetry.io/collector/pdata v0.63.2-0.20221108014805-0b08d5316426/go.mod h1:IzvXUGQml2mrnvdb8zIlEW3qQs9oFLdD2hLwJdZ+pek= +go.opentelemetry.io/collector/semconv v0.63.2-0.20221108014805-0b08d5316426 h1:pqIl7OC531J6i9ttBCj3zLmZI/BSF4q323YpK0GgKGk= +go.opentelemetry.io/collector/semconv v0.63.2-0.20221108014805-0b08d5316426/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/opencensusreceiver/internal/ocmetrics/opencensus.go b/receiver/opencensusreceiver/internal/ocmetrics/opencensus.go index c8b90be20308..eae25d3e9d95 100644 --- a/receiver/opencensusreceiver/internal/ocmetrics/opencensus.go +++ b/receiver/opencensusreceiver/internal/ocmetrics/opencensus.go @@ -24,7 +24,6 @@ import ( ocmetrics "github.com/census-instrumentation/opencensus-proto/gen-go/metrics/v1" resourcepb "github.com/census-instrumentation/opencensus-proto/gen-go/resource/v1" "go.opentelemetry.io/collector/component" - "go.opentelemetry.io/collector/config" "go.opentelemetry.io/collector/consumer" "go.opentelemetry.io/collector/obsreport" @@ -34,13 +33,13 @@ import ( // Receiver is the type used to handle metrics from OpenCensus exporters. type Receiver struct { agentmetricspb.UnimplementedMetricsServiceServer - id config.ComponentID + id component.ID nextConsumer consumer.Metrics obsrecv *obsreport.Receiver } // New creates a new ocmetrics.Receiver reference. -func New(id config.ComponentID, nextConsumer consumer.Metrics, set component.ReceiverCreateSettings) (*Receiver, error) { +func New(id component.ID, nextConsumer consumer.Metrics, set component.ReceiverCreateSettings) (*Receiver, error) { if nextConsumer == nil { return nil, component.ErrNilNextConsumer } diff --git a/receiver/opencensusreceiver/internal/ocmetrics/opencensus_test.go b/receiver/opencensusreceiver/internal/ocmetrics/opencensus_test.go index 2fd94885a717..b6770d137d52 100644 --- a/receiver/opencensusreceiver/internal/ocmetrics/opencensus_test.go +++ b/receiver/opencensusreceiver/internal/ocmetrics/opencensus_test.go @@ -33,7 +33,6 @@ import ( "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" "go.opentelemetry.io/collector/component" - "go.opentelemetry.io/collector/config" "go.opentelemetry.io/collector/consumer" "go.opentelemetry.io/collector/consumer/consumertest" "go.opentelemetry.io/collector/obsreport/obsreporttest" @@ -373,7 +372,7 @@ func ocReceiverOnGRPCServer(t *testing.T, sr consumer.Metrics, set component.Rec } } - oci, err := New(config.NewComponentID("opencensus"), sr, set) + oci, err := New(component.NewID("opencensus"), sr, set) require.NoError(t, err, "Failed to create the Receiver: %v", err) // Now run it as a gRPC server diff --git a/receiver/opencensusreceiver/internal/octrace/observability_test.go b/receiver/opencensusreceiver/internal/octrace/observability_test.go index 3d22ca5748d8..23bd5a3eca24 100644 --- a/receiver/opencensusreceiver/internal/octrace/observability_test.go +++ b/receiver/opencensusreceiver/internal/octrace/observability_test.go @@ -24,7 +24,7 @@ import ( tracepb "github.com/census-instrumentation/opencensus-proto/gen-go/trace/v1" "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" - "go.opentelemetry.io/collector/config" + "go.opentelemetry.io/collector/component" "go.opentelemetry.io/collector/consumer/consumertest" "go.opentelemetry.io/collector/obsreport/obsreporttest" "go.opentelemetry.io/otel" @@ -60,7 +60,7 @@ func TestEnsureRecordedMetrics(t *testing.T) { } flush(traceSvcDoneFn) - require.NoError(t, obsreporttest.CheckReceiverTraces(tt, config.NewComponentID("opencensus"), "grpc", int64(n), 0)) + require.NoError(t, obsreporttest.CheckReceiverTraces(tt, component.NewID("opencensus"), "grpc", int64(n), 0)) } func TestEnsureRecordedMetrics_zeroLengthSpansSender(t *testing.T) { @@ -83,7 +83,7 @@ func TestEnsureRecordedMetrics_zeroLengthSpansSender(t *testing.T) { } flush(traceSvcDoneFn) - require.NoError(t, obsreporttest.CheckReceiverTraces(tt, config.NewComponentID("opencensus"), "grpc", 0, 0)) + require.NoError(t, obsreporttest.CheckReceiverTraces(tt, component.NewID("opencensus"), "grpc", 0, 0)) } func TestExportSpanLinkingMaintainsParentLink(t *testing.T) { diff --git a/receiver/opencensusreceiver/internal/octrace/opencensus.go b/receiver/opencensusreceiver/internal/octrace/opencensus.go index 472bdb4cf934..dcf4dfababab 100644 --- a/receiver/opencensusreceiver/internal/octrace/opencensus.go +++ b/receiver/opencensusreceiver/internal/octrace/opencensus.go @@ -23,7 +23,6 @@ import ( agenttracepb "github.com/census-instrumentation/opencensus-proto/gen-go/agent/trace/v1" resourcepb "github.com/census-instrumentation/opencensus-proto/gen-go/resource/v1" "go.opentelemetry.io/collector/component" - "go.opentelemetry.io/collector/config" "go.opentelemetry.io/collector/consumer" "go.opentelemetry.io/collector/obsreport" "go.opentelemetry.io/collector/pdata/ptrace" @@ -40,12 +39,12 @@ const ( type Receiver struct { agenttracepb.UnimplementedTraceServiceServer nextConsumer consumer.Traces - id config.ComponentID + id component.ID obsrecv *obsreport.Receiver } // New creates a new opencensus.Receiver reference. -func New(id config.ComponentID, nextConsumer consumer.Traces, set component.ReceiverCreateSettings) (*Receiver, error) { +func New(id component.ID, nextConsumer consumer.Traces, set component.ReceiverCreateSettings) (*Receiver, error) { if nextConsumer == nil { return nil, component.ErrNilNextConsumer } diff --git a/receiver/opencensusreceiver/internal/octrace/opencensus_test.go b/receiver/opencensusreceiver/internal/octrace/opencensus_test.go index b2ae598ad405..374b7fe51035 100644 --- a/receiver/opencensusreceiver/internal/octrace/opencensus_test.go +++ b/receiver/opencensusreceiver/internal/octrace/opencensus_test.go @@ -31,7 +31,6 @@ import ( "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" "go.opentelemetry.io/collector/component" - "go.opentelemetry.io/collector/config" "go.opentelemetry.io/collector/consumer" "go.opentelemetry.io/collector/consumer/consumertest" "go.opentelemetry.io/collector/obsreport/obsreporttest" @@ -388,7 +387,7 @@ func ocReceiverOnGRPCServer(t *testing.T, sr consumer.Traces, set component.Rece } } - oci, err := New(config.NewComponentID("opencensus"), sr, set) + oci, err := New(component.NewID("opencensus"), sr, set) require.NoError(t, err, "Failed to create the Receiver: %v", err) // Now run it as a gRPC server diff --git a/receiver/opencensusreceiver/opencensus.go b/receiver/opencensusreceiver/opencensus.go index ef88833ac474..5094f450e93d 100644 --- a/receiver/opencensusreceiver/opencensus.go +++ b/receiver/opencensusreceiver/opencensus.go @@ -28,7 +28,6 @@ import ( "github.com/rs/cors" "github.com/soheilhy/cmux" "go.opentelemetry.io/collector/component" - "go.opentelemetry.io/collector/config" "go.opentelemetry.io/collector/config/configgrpc" "go.opentelemetry.io/collector/consumer" "google.golang.org/grpc" @@ -57,7 +56,7 @@ type ocReceiver struct { startTracesReceiverOnce sync.Once startMetricsReceiverOnce sync.Once - id config.ComponentID + id component.ID settings component.ReceiverCreateSettings } @@ -65,7 +64,7 @@ type ocReceiver struct { // responsibility to invoke the respective Start*Reception methods as well // as the various Stop*Reception methods to end it. func newOpenCensusReceiver( - id config.ComponentID, + id component.ID, transport string, addr string, tc consumer.Traces, diff --git a/receiver/opencensusreceiver/opencensus_test.go b/receiver/opencensusreceiver/opencensus_test.go index 712427106d56..77dcc684d885 100644 --- a/receiver/opencensusreceiver/opencensus_test.go +++ b/receiver/opencensusreceiver/opencensus_test.go @@ -38,6 +38,7 @@ import ( tracepb "github.com/census-instrumentation/opencensus-proto/gen-go/trace/v1" "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" + "go.opentelemetry.io/collector/component" "go.opentelemetry.io/collector/component/componenttest" "go.opentelemetry.io/collector/config" "go.opentelemetry.io/collector/config/configgrpc" @@ -58,7 +59,7 @@ import ( "github.com/open-telemetry/opentelemetry-collector-contrib/pkg/translator/opencensus" ) -var ocReceiverID = config.NewComponentIDWithName(typeStr, "receiver_test") +var ocReceiverID = component.NewIDWithName(typeStr, "receiver_test") func TestGrpcGateway_endToEnd(t *testing.T) { addr := testutil.GetAvailableLocalAddress(t) @@ -399,14 +400,14 @@ func TestOCReceiverTrace_HandleNextConsumerResponse(t *testing.T) { } exporters := []struct { - receiverID config.ComponentID + receiverID component.ID exportFn func( t *testing.T, cc *grpc.ClientConn, msg *agenttracepb.ExportTraceServiceRequest) error }{ { - receiverID: config.NewComponentIDWithName(typeStr, "traces"), + receiverID: component.NewIDWithName(typeStr, "traces"), exportFn: exportBidiFn, }, } @@ -550,14 +551,14 @@ func TestOCReceiverMetrics_HandleNextConsumerResponse(t *testing.T) { } exporters := []struct { - receiverID config.ComponentID + receiverID component.ID exportFn func( t *testing.T, cc *grpc.ClientConn, msg *agentmetricspb.ExportMetricsServiceRequest) error }{ { - receiverID: config.NewComponentIDWithName(typeStr, "metrics"), + receiverID: component.NewIDWithName(typeStr, "metrics"), exportFn: exportBidiFn, }, } @@ -610,7 +611,7 @@ func TestOCReceiverMetrics_HandleNextConsumerResponse(t *testing.T) { func TestInvalidTLSCredentials(t *testing.T) { cfg := Config{ - ReceiverSettings: config.NewReceiverSettings(config.NewComponentID(typeStr)), + ReceiverSettings: config.NewReceiverSettings(component.NewID(typeStr)), GRPCServerSettings: configgrpc.GRPCServerSettings{ TLSSetting: &configtls.TLSServerSetting{ TLSSetting: configtls.TLSSetting{ @@ -623,7 +624,7 @@ func TestInvalidTLSCredentials(t *testing.T) { assert.NotNil(t, opt) addr := testutil.GetAvailableLocalAddress(t) - ocr, err := newOpenCensusReceiver(config.NewComponentIDWithName(typeStr, "invalidtls"), "tcp", addr, nil, nil, componenttest.NewNopReceiverCreateSettings(), opt...) + ocr, err := newOpenCensusReceiver(component.NewIDWithName(typeStr, "invalidtls"), "tcp", addr, nil, nil, componenttest.NewNopReceiverCreateSettings(), opt...) assert.NoError(t, err) assert.NotNil(t, ocr) diff --git a/receiver/oracledbreceiver/config.go b/receiver/oracledbreceiver/config.go index 452b44d0c2a7..e8d56b2b9350 100644 --- a/receiver/oracledbreceiver/config.go +++ b/receiver/oracledbreceiver/config.go @@ -13,6 +13,7 @@ // limitations under the License. package oracledbreceiver // import "github.com/open-telemetry/opentelemetry-collector-contrib/receiver/oracledbreceiver" + import "go.opentelemetry.io/collector/config" type Config struct { diff --git a/receiver/oracledbreceiver/factory.go b/receiver/oracledbreceiver/factory.go index 1b744814a5cc..fbb1c94ae64e 100644 --- a/receiver/oracledbreceiver/factory.go +++ b/receiver/oracledbreceiver/factory.go @@ -35,10 +35,10 @@ func NewFactory() component.ReceiverFactory { component.WithMetricsReceiver(createMetricsReceiver, stability)) } -func createMetricsReceiver(ctx context.Context, settings component.ReceiverCreateSettings, receiver config.Receiver, metrics consumer.Metrics) (component.MetricsReceiver, error) { +func createMetricsReceiver(ctx context.Context, settings component.ReceiverCreateSettings, receiver component.ReceiverConfig, metrics consumer.Metrics) (component.MetricsReceiver, error) { return &oracledbreceiver{}, nil } -func createDefaultConfig() config.Receiver { - return &Config{ReceiverSettings: config.NewReceiverSettings(config.NewComponentID(typeStr))} +func createDefaultConfig() component.ReceiverConfig { + return &Config{ReceiverSettings: config.NewReceiverSettings(component.NewID(typeStr))} } diff --git a/receiver/oracledbreceiver/go.mod b/receiver/oracledbreceiver/go.mod index 761006bcee11..722bb0d91349 100644 --- a/receiver/oracledbreceiver/go.mod +++ b/receiver/oracledbreceiver/go.mod @@ -3,8 +3,8 @@ module github.com/open-telemetry/opentelemetry-collector-contrib/receiver/oracle go 1.18 require ( - go.opentelemetry.io/collector v0.63.2-0.20221104003159-6b27644724d8 - go.opentelemetry.io/collector/pdata v0.63.2-0.20221104003159-6b27644724d8 + go.opentelemetry.io/collector v0.63.2-0.20221108014805-0b08d5316426 + go.opentelemetry.io/collector/pdata v0.63.2-0.20221108014805-0b08d5316426 ) require ( diff --git a/receiver/oracledbreceiver/go.sum b/receiver/oracledbreceiver/go.sum index fd6245b77f46..475440ed1c10 100644 --- a/receiver/oracledbreceiver/go.sum +++ b/receiver/oracledbreceiver/go.sum @@ -250,10 +250,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.63.2-0.20221104003159-6b27644724d8 h1:rOT5HzXXfSISc6FiH012zH2/EFjp37UXfjEqj5BpkWQ= -go.opentelemetry.io/collector v0.63.2-0.20221104003159-6b27644724d8/go.mod h1:JVmeZXugK4ondC6KQgrHTHWiF4JttpG5k6dWPMt62+k= -go.opentelemetry.io/collector/pdata v0.63.2-0.20221104003159-6b27644724d8 h1:7xeTQjfsOm9eogQeIxjSEhlik9qsbBGsnmkQHfyKaRE= -go.opentelemetry.io/collector/pdata v0.63.2-0.20221104003159-6b27644724d8/go.mod h1:IzvXUGQml2mrnvdb8zIlEW3qQs9oFLdD2hLwJdZ+pek= +go.opentelemetry.io/collector v0.63.2-0.20221108014805-0b08d5316426 h1:z/wLTMh7/vNxcFUDa5uG7/IPE3tYx6pzCWPV41ghyV8= +go.opentelemetry.io/collector v0.63.2-0.20221108014805-0b08d5316426/go.mod h1:+Zb70q0Rq17dA9FcHTiTjW6g96lvJ8kAZ0c+eWNkAv0= +go.opentelemetry.io/collector/pdata v0.63.2-0.20221108014805-0b08d5316426 h1:wKDpgP0Tx/gWI2SgDGAY1OTSeihhDivbbRqFR79IGTc= +go.opentelemetry.io/collector/pdata v0.63.2-0.20221108014805-0b08d5316426/go.mod h1:IzvXUGQml2mrnvdb8zIlEW3qQs9oFLdD2hLwJdZ+pek= 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/file.go b/receiver/otlpjsonfilereceiver/file.go index 0e720704d5e9..b69dad8639f8 100644 --- a/receiver/otlpjsonfilereceiver/file.go +++ b/receiver/otlpjsonfilereceiver/file.go @@ -48,20 +48,20 @@ func NewFactory() component.ReceiverFactory { type Config struct { config.ReceiverSettings `mapstructure:",squash"` // squash ensures fields are correctly decoded in embedded struct fileconsumer.Config `mapstructure:",squash"` - StorageID *config.ComponentID `mapstructure:"storage"` + StorageID *component.ID `mapstructure:"storage"` } -func createDefaultConfig() config.Receiver { +func createDefaultConfig() component.ReceiverConfig { return &Config{ Config: *fileconsumer.NewConfig(), - ReceiverSettings: config.NewReceiverSettings(config.NewComponentID(typeStr)), + ReceiverSettings: config.NewReceiverSettings(component.NewID(typeStr)), } } type receiver struct { input *fileconsumer.Manager - id config.ComponentID - storageID *config.ComponentID + id component.ID + storageID *component.ID } func (f *receiver) Start(ctx context.Context, host component.Host) error { @@ -76,7 +76,7 @@ func (f *receiver) Shutdown(ctx context.Context) error { return f.input.Stop() } -func createLogsReceiver(_ context.Context, settings component.ReceiverCreateSettings, configuration config.Receiver, logs consumer.Logs) (component.LogsReceiver, error) { +func createLogsReceiver(_ context.Context, settings component.ReceiverCreateSettings, configuration component.ReceiverConfig, logs consumer.Logs) (component.LogsReceiver, error) { logsUnmarshaler := &plog.JSONUnmarshaler{} obsrecv := obsreport.MustNewReceiver(obsreport.ReceiverSettings{ ReceiverID: configuration.ID(), @@ -101,7 +101,7 @@ func createLogsReceiver(_ context.Context, settings component.ReceiverCreateSett return &receiver{input: input, id: cfg.ID(), storageID: cfg.StorageID}, nil } -func createMetricsReceiver(_ context.Context, settings component.ReceiverCreateSettings, configuration config.Receiver, metrics consumer.Metrics) (component.MetricsReceiver, error) { +func createMetricsReceiver(_ context.Context, settings component.ReceiverCreateSettings, configuration component.ReceiverConfig, metrics consumer.Metrics) (component.MetricsReceiver, error) { metricsUnmarshaler := &pmetric.JSONUnmarshaler{} obsrecv := obsreport.MustNewReceiver(obsreport.ReceiverSettings{ ReceiverID: configuration.ID(), @@ -126,7 +126,7 @@ func createMetricsReceiver(_ context.Context, settings component.ReceiverCreateS return &receiver{input: input, id: cfg.ID(), storageID: cfg.StorageID}, nil } -func createTracesReceiver(ctx context.Context, settings component.ReceiverCreateSettings, configuration config.Receiver, traces consumer.Traces) (component.TracesReceiver, error) { +func createTracesReceiver(ctx context.Context, settings component.ReceiverCreateSettings, configuration component.ReceiverConfig, traces consumer.Traces) (component.TracesReceiver, error) { tracesUnmarshaler := &ptrace.JSONUnmarshaler{} obsrecv := obsreport.MustNewReceiver(obsreport.ReceiverSettings{ ReceiverID: configuration.ID(), diff --git a/receiver/otlpjsonfilereceiver/file_test.go b/receiver/otlpjsonfilereceiver/file_test.go index 74de69859ca1..ec1a26a52eb8 100644 --- a/receiver/otlpjsonfilereceiver/file_test.go +++ b/receiver/otlpjsonfilereceiver/file_test.go @@ -23,9 +23,9 @@ import ( "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" + "go.opentelemetry.io/collector/component" "go.opentelemetry.io/collector/component/componenttest" "go.opentelemetry.io/collector/config" - "go.opentelemetry.io/collector/config/configtest" "go.opentelemetry.io/collector/confmap/confmaptest" "go.opentelemetry.io/collector/consumer/consumertest" "go.opentelemetry.io/collector/pdata/plog" @@ -41,7 +41,7 @@ func TestDefaultConfig(t *testing.T) { factory := NewFactory() cfg := factory.CreateDefaultConfig() require.NotNil(t, cfg, "failed to create default config") - require.NoError(t, configtest.CheckConfigStruct(cfg)) + require.NoError(t, componenttest.CheckConfigStruct(cfg)) } func TestFileTracesReceiver(t *testing.T) { @@ -124,7 +124,7 @@ func TestFileLogsReceiver(t *testing.T) { func testdataConfigYamlAsMap() *Config { return &Config{ - ReceiverSettings: config.NewReceiverSettings(config.NewComponentID(typeStr)), + ReceiverSettings: config.NewReceiverSettings(component.NewID(typeStr)), Config: fileconsumer.Config{ IncludeFileName: true, IncludeFilePath: false, @@ -150,9 +150,9 @@ func TestLoadConfig(t *testing.T) { factory := NewFactory() cfg := factory.CreateDefaultConfig() - sub, err := cm.Sub(config.NewComponentIDWithName(typeStr, "").String()) + sub, err := cm.Sub(component.NewIDWithName(typeStr, "").String()) require.NoError(t, err) - require.NoError(t, config.UnmarshalReceiver(sub, cfg)) + require.NoError(t, component.UnmarshalReceiverConfig(sub, cfg)) assert.Equal(t, testdataConfigYamlAsMap(), cfg) } diff --git a/receiver/otlpjsonfilereceiver/go.mod b/receiver/otlpjsonfilereceiver/go.mod index d6157b845d5a..dd8ba5d54f7f 100644 --- a/receiver/otlpjsonfilereceiver/go.mod +++ b/receiver/otlpjsonfilereceiver/go.mod @@ -6,8 +6,8 @@ require ( github.com/open-telemetry/opentelemetry-collector-contrib/internal/coreinternal v0.63.0 github.com/open-telemetry/opentelemetry-collector-contrib/pkg/stanza v0.63.0 github.com/stretchr/testify v1.8.1 - go.opentelemetry.io/collector v0.63.2-0.20221104003159-6b27644724d8 - go.opentelemetry.io/collector/pdata v0.63.2-0.20221104003159-6b27644724d8 + go.opentelemetry.io/collector v0.63.2-0.20221108014805-0b08d5316426 + go.opentelemetry.io/collector/pdata v0.63.2-0.20221108014805-0b08d5316426 ) require ( @@ -26,7 +26,7 @@ require ( github.com/modern-go/reflect2 v1.0.2 // indirect github.com/observiq/ctimefmt v1.0.0 // indirect github.com/pmezard/go-difflib v1.0.0 // indirect - go.opencensus.io v0.23.0 // indirect + go.opencensus.io v0.24.0 // 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 0748e4d8b36a..e7e644c7a2b9 100644 --- a/receiver/otlpjsonfilereceiver/go.sum +++ b/receiver/otlpjsonfilereceiver/go.sum @@ -241,7 +241,7 @@ github.com/prometheus/client_golang v0.9.1/go.mod h1:7SWBe2y4D6OKWSNQJUaRYU/AaXP github.com/prometheus/client_golang v1.0.0/go.mod h1:db9x61etRT2tGnBNRi70OPL5FsnadC4Ky3P0J6CfImo= github.com/prometheus/client_golang v1.7.1/go.mod h1:PY5Wy2awLA44sXw4AOSfFBetzPP4j5+D6mVACh+pe2M= github.com/prometheus/client_golang v1.11.1/go.mod h1:Z6t4BnS23TR94PD6BsDNk8yVqroYurpAkEiz0P2BEV0= -github.com/prometheus/client_golang v1.13.0 h1:b71QUfeo5M8gq2+evJdTPfZhYMAU0uKPkyPJ7TPsloU= +github.com/prometheus/client_golang v1.13.1 h1:3gMjIY2+/hzmqhtUC/aQNYldJA6DtH3CgQvwS+02K1c= github.com/prometheus/client_model v0.0.0-20180712105110-5c3871d89910/go.mod h1:MbSGuTsp3dbXC40dX6PRTWyKYBIrTGTE9sqQNg2J8bo= github.com/prometheus/client_model v0.0.0-20190129233127-fd36f4220a90/go.mod h1:xMI15A0UPsDsEKsMN9yxemIoYk6Tm2C1GtYGdfGttqA= github.com/prometheus/client_model v0.0.0-20190812154241-14fe0d1b01d4/go.mod h1:xMI15A0UPsDsEKsMN9yxemIoYk6Tm2C1GtYGdfGttqA= @@ -283,7 +283,6 @@ github.com/stretchr/testify v1.2.2/go.mod h1:a8OnRcib4nhh0OaRAV+Yts87kKdq0PP7pXf github.com/stretchr/testify v1.3.0/go.mod h1:M5WIy9Dh21IEIfnGCwXGc5bZfKNJtfHm1UVUgZn+9EI= github.com/stretchr/testify v1.4.0/go.mod h1:j7eGeouHqKxXV5pUuKE4zz7dFj8WfuZ+81PSLYec5m4= github.com/stretchr/testify v1.5.1/go.mod h1:5W2xD1RspED5o8YsWQXVCued0rvSQ+mT+I5cxcmMvtA= -github.com/stretchr/testify v1.6.1/go.mod h1:6Fq8oRcR53rry900zMqJjRRixrwX3KX962/h/Wwjteg= github.com/stretchr/testify v1.7.0/go.mod h1:6Fq8oRcR53rry900zMqJjRRixrwX3KX962/h/Wwjteg= github.com/stretchr/testify v1.7.1/go.mod h1:6Fq8oRcR53rry900zMqJjRRixrwX3KX962/h/Wwjteg= github.com/stretchr/testify v1.8.0/go.mod h1:yNjHg4UonilssWZ8iaSj1OCr/vHnekPRkoO+kdMU+MU= @@ -295,12 +294,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.opencensus.io v0.23.0 h1:gqCw0LfLxScz8irSi8exQc7fyQ0fKQU/qnC/X8+V/1M= -go.opencensus.io v0.23.0/go.mod h1:XItmlyltB5F7CS4xOC1DcqMoFqwtC6OG2xF7mCv7P7E= -go.opentelemetry.io/collector v0.63.2-0.20221104003159-6b27644724d8 h1:rOT5HzXXfSISc6FiH012zH2/EFjp37UXfjEqj5BpkWQ= -go.opentelemetry.io/collector v0.63.2-0.20221104003159-6b27644724d8/go.mod h1:JVmeZXugK4ondC6KQgrHTHWiF4JttpG5k6dWPMt62+k= -go.opentelemetry.io/collector/pdata v0.63.2-0.20221104003159-6b27644724d8 h1:7xeTQjfsOm9eogQeIxjSEhlik9qsbBGsnmkQHfyKaRE= -go.opentelemetry.io/collector/pdata v0.63.2-0.20221104003159-6b27644724d8/go.mod h1:IzvXUGQml2mrnvdb8zIlEW3qQs9oFLdD2hLwJdZ+pek= +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.63.2-0.20221108014805-0b08d5316426 h1:z/wLTMh7/vNxcFUDa5uG7/IPE3tYx6pzCWPV41ghyV8= +go.opentelemetry.io/collector v0.63.2-0.20221108014805-0b08d5316426/go.mod h1:+Zb70q0Rq17dA9FcHTiTjW6g96lvJ8kAZ0c+eWNkAv0= +go.opentelemetry.io/collector/pdata v0.63.2-0.20221108014805-0b08d5316426 h1:wKDpgP0Tx/gWI2SgDGAY1OTSeihhDivbbRqFR79IGTc= +go.opentelemetry.io/collector/pdata v0.63.2-0.20221108014805-0b08d5316426/go.mod h1:IzvXUGQml2mrnvdb8zIlEW3qQs9oFLdD2hLwJdZ+pek= 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.go b/receiver/podmanreceiver/config.go index cb479424f00d..a1b8fee09a13 100644 --- a/receiver/podmanreceiver/config.go +++ b/receiver/podmanreceiver/config.go @@ -18,11 +18,11 @@ import ( "errors" "time" - "go.opentelemetry.io/collector/config" + "go.opentelemetry.io/collector/component" "go.opentelemetry.io/collector/receiver/scraperhelper" ) -var _ config.Receiver = (*Config)(nil) +var _ component.ReceiverConfig = (*Config)(nil) type Config struct { scraperhelper.ScraperControllerSettings `mapstructure:",squash"` diff --git a/receiver/podmanreceiver/config_test.go b/receiver/podmanreceiver/config_test.go index 7ebbab614446..712542c861a6 100644 --- a/receiver/podmanreceiver/config_test.go +++ b/receiver/podmanreceiver/config_test.go @@ -21,6 +21,7 @@ import ( "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" + "go.opentelemetry.io/collector/component" "go.opentelemetry.io/collector/config" "go.opentelemetry.io/collector/confmap/confmaptest" "go.opentelemetry.io/collector/receiver/scraperhelper" @@ -33,15 +34,15 @@ func TestLoadConfig(t *testing.T) { require.NoError(t, err) tests := []struct { - id config.ComponentID - expected config.Receiver + id component.ID + expected component.ReceiverConfig expectedErr error }{ { - id: config.NewComponentIDWithName(typeStr, ""), + id: component.NewIDWithName(typeStr, ""), expected: &Config{ ScraperControllerSettings: scraperhelper.ScraperControllerSettings{ - ReceiverSettings: config.NewReceiverSettings(config.NewComponentID(typeStr)), + ReceiverSettings: config.NewReceiverSettings(component.NewID(typeStr)), CollectionInterval: 10 * time.Second, }, APIVersion: defaultAPIVersion, @@ -50,10 +51,10 @@ func TestLoadConfig(t *testing.T) { }, }, { - id: config.NewComponentIDWithName(typeStr, "all"), + id: component.NewIDWithName(typeStr, "all"), expected: &Config{ ScraperControllerSettings: scraperhelper.ScraperControllerSettings{ - ReceiverSettings: config.NewReceiverSettings(config.NewComponentID(typeStr)), + ReceiverSettings: config.NewReceiverSettings(component.NewID(typeStr)), CollectionInterval: 2 * time.Second, }, APIVersion: defaultAPIVersion, @@ -70,7 +71,7 @@ func TestLoadConfig(t *testing.T) { sub, err := cm.Sub(tt.id.String()) require.NoError(t, err) - require.NoError(t, config.UnmarshalReceiver(sub, cfg)) + require.NoError(t, component.UnmarshalReceiverConfig(sub, cfg)) assert.NoError(t, cfg.Validate()) assert.Equal(t, tt.expected, cfg) diff --git a/receiver/podmanreceiver/factory.go b/receiver/podmanreceiver/factory.go index bff27ee97694..e5d1d449e80c 100644 --- a/receiver/podmanreceiver/factory.go +++ b/receiver/podmanreceiver/factory.go @@ -40,7 +40,7 @@ func NewFactory() component.ReceiverFactory { func createDefaultConfig() *Config { return &Config{ ScraperControllerSettings: scraperhelper.ScraperControllerSettings{ - ReceiverSettings: config.NewReceiverSettings(config.NewComponentID(typeStr)), + ReceiverSettings: config.NewReceiverSettings(component.NewID(typeStr)), CollectionInterval: 10 * time.Second, }, Endpoint: "unix:///run/podman/podman.sock", @@ -49,14 +49,14 @@ func createDefaultConfig() *Config { } } -func createDefaultReceiverConfig() config.Receiver { +func createDefaultReceiverConfig() component.ReceiverConfig { return createDefaultConfig() } func createMetricsReceiver( ctx context.Context, params component.ReceiverCreateSettings, - config config.Receiver, + config component.ReceiverConfig, consumer consumer.Metrics, ) (component.MetricsReceiver, error) { podmanConfig := config.(*Config) diff --git a/receiver/podmanreceiver/factory_test.go b/receiver/podmanreceiver/factory_test.go index 0a1a6af7547e..9349bf9fc92a 100644 --- a/receiver/podmanreceiver/factory_test.go +++ b/receiver/podmanreceiver/factory_test.go @@ -24,7 +24,6 @@ import ( "github.com/stretchr/testify/assert" "go.opentelemetry.io/collector/component" "go.opentelemetry.io/collector/component/componenttest" - "go.opentelemetry.io/collector/config/configtest" "go.opentelemetry.io/collector/consumer/consumertest" ) @@ -34,7 +33,7 @@ func TestCreateDefaultConfig(t *testing.T) { config := factory.CreateDefaultConfig() assert.NotNil(t, config, "failed to create default config") - assert.NoError(t, configtest.CheckConfigStruct(config)) + assert.NoError(t, componenttest.CheckConfigStruct(config)) } func TestCreateReceiver(t *testing.T) { diff --git a/receiver/podmanreceiver/go.mod b/receiver/podmanreceiver/go.mod index 5cd7f450f6a4..34d7850ee979 100644 --- a/receiver/podmanreceiver/go.mod +++ b/receiver/podmanreceiver/go.mod @@ -4,9 +4,9 @@ go 1.18 require ( github.com/stretchr/testify v1.8.1 - go.opentelemetry.io/collector v0.63.2-0.20221104003159-6b27644724d8 - go.opentelemetry.io/collector/pdata v0.63.2-0.20221104003159-6b27644724d8 - go.opentelemetry.io/collector/semconv v0.63.2-0.20221104003159-6b27644724d8 + go.opentelemetry.io/collector v0.63.2-0.20221108014805-0b08d5316426 + go.opentelemetry.io/collector/pdata v0.63.2-0.20221108014805-0b08d5316426 + go.opentelemetry.io/collector/semconv v0.63.2-0.20221108014805-0b08d5316426 go.uber.org/multierr v1.8.0 go.uber.org/zap v1.23.0 golang.org/x/crypto v0.0.0-20220507011949-2cf3adece122 @@ -27,7 +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.opencensus.io v0.23.0 // indirect + go.opencensus.io v0.24.0 // 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 38b63bb02d76..34392d6b5f18 100644 --- a/receiver/podmanreceiver/go.sum +++ b/receiver/podmanreceiver/go.sum @@ -233,7 +233,7 @@ github.com/prometheus/client_golang v0.9.1/go.mod h1:7SWBe2y4D6OKWSNQJUaRYU/AaXP github.com/prometheus/client_golang v1.0.0/go.mod h1:db9x61etRT2tGnBNRi70OPL5FsnadC4Ky3P0J6CfImo= github.com/prometheus/client_golang v1.7.1/go.mod h1:PY5Wy2awLA44sXw4AOSfFBetzPP4j5+D6mVACh+pe2M= github.com/prometheus/client_golang v1.11.1/go.mod h1:Z6t4BnS23TR94PD6BsDNk8yVqroYurpAkEiz0P2BEV0= -github.com/prometheus/client_golang v1.13.0 h1:b71QUfeo5M8gq2+evJdTPfZhYMAU0uKPkyPJ7TPsloU= +github.com/prometheus/client_golang v1.13.1 h1:3gMjIY2+/hzmqhtUC/aQNYldJA6DtH3CgQvwS+02K1c= github.com/prometheus/client_model v0.0.0-20180712105110-5c3871d89910/go.mod h1:MbSGuTsp3dbXC40dX6PRTWyKYBIrTGTE9sqQNg2J8bo= github.com/prometheus/client_model v0.0.0-20190129233127-fd36f4220a90/go.mod h1:xMI15A0UPsDsEKsMN9yxemIoYk6Tm2C1GtYGdfGttqA= github.com/prometheus/client_model v0.0.0-20190812154241-14fe0d1b01d4/go.mod h1:xMI15A0UPsDsEKsMN9yxemIoYk6Tm2C1GtYGdfGttqA= @@ -271,7 +271,6 @@ github.com/stretchr/testify v1.2.2/go.mod h1:a8OnRcib4nhh0OaRAV+Yts87kKdq0PP7pXf github.com/stretchr/testify v1.3.0/go.mod h1:M5WIy9Dh21IEIfnGCwXGc5bZfKNJtfHm1UVUgZn+9EI= github.com/stretchr/testify v1.4.0/go.mod h1:j7eGeouHqKxXV5pUuKE4zz7dFj8WfuZ+81PSLYec5m4= github.com/stretchr/testify v1.5.1/go.mod h1:5W2xD1RspED5o8YsWQXVCued0rvSQ+mT+I5cxcmMvtA= -github.com/stretchr/testify v1.6.1/go.mod h1:6Fq8oRcR53rry900zMqJjRRixrwX3KX962/h/Wwjteg= github.com/stretchr/testify v1.7.0/go.mod h1:6Fq8oRcR53rry900zMqJjRRixrwX3KX962/h/Wwjteg= github.com/stretchr/testify v1.7.1/go.mod h1:6Fq8oRcR53rry900zMqJjRRixrwX3KX962/h/Wwjteg= github.com/stretchr/testify v1.8.0/go.mod h1:yNjHg4UonilssWZ8iaSj1OCr/vHnekPRkoO+kdMU+MU= @@ -283,14 +282,14 @@ 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.opencensus.io v0.23.0 h1:gqCw0LfLxScz8irSi8exQc7fyQ0fKQU/qnC/X8+V/1M= -go.opencensus.io v0.23.0/go.mod h1:XItmlyltB5F7CS4xOC1DcqMoFqwtC6OG2xF7mCv7P7E= -go.opentelemetry.io/collector v0.63.2-0.20221104003159-6b27644724d8 h1:rOT5HzXXfSISc6FiH012zH2/EFjp37UXfjEqj5BpkWQ= -go.opentelemetry.io/collector v0.63.2-0.20221104003159-6b27644724d8/go.mod h1:JVmeZXugK4ondC6KQgrHTHWiF4JttpG5k6dWPMt62+k= -go.opentelemetry.io/collector/pdata v0.63.2-0.20221104003159-6b27644724d8 h1:7xeTQjfsOm9eogQeIxjSEhlik9qsbBGsnmkQHfyKaRE= -go.opentelemetry.io/collector/pdata v0.63.2-0.20221104003159-6b27644724d8/go.mod h1:IzvXUGQml2mrnvdb8zIlEW3qQs9oFLdD2hLwJdZ+pek= -go.opentelemetry.io/collector/semconv v0.63.2-0.20221104003159-6b27644724d8 h1:jm0sNPyqo6S165QjQYMBHB2nK50wlJbMYM03Yr3Eo2k= -go.opentelemetry.io/collector/semconv v0.63.2-0.20221104003159-6b27644724d8/go.mod h1:5o9yhOa+ABt7g2E5JABDxGZ1PQPbtfxrKNbYn+LOTXU= +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.63.2-0.20221108014805-0b08d5316426 h1:z/wLTMh7/vNxcFUDa5uG7/IPE3tYx6pzCWPV41ghyV8= +go.opentelemetry.io/collector v0.63.2-0.20221108014805-0b08d5316426/go.mod h1:+Zb70q0Rq17dA9FcHTiTjW6g96lvJ8kAZ0c+eWNkAv0= +go.opentelemetry.io/collector/pdata v0.63.2-0.20221108014805-0b08d5316426 h1:wKDpgP0Tx/gWI2SgDGAY1OTSeihhDivbbRqFR79IGTc= +go.opentelemetry.io/collector/pdata v0.63.2-0.20221108014805-0b08d5316426/go.mod h1:IzvXUGQml2mrnvdb8zIlEW3qQs9oFLdD2hLwJdZ+pek= +go.opentelemetry.io/collector/semconv v0.63.2-0.20221108014805-0b08d5316426 h1:pqIl7OC531J6i9ttBCj3zLmZI/BSF4q323YpK0GgKGk= +go.opentelemetry.io/collector/semconv v0.63.2-0.20221108014805-0b08d5316426/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 55cdebf40834..04d8aa1c8b96 100644 --- a/receiver/postgresqlreceiver/config_test.go +++ b/receiver/postgresqlreceiver/config_test.go @@ -22,7 +22,7 @@ import ( "time" "github.com/stretchr/testify/require" - "go.opentelemetry.io/collector/config" + "go.opentelemetry.io/collector/component" "go.opentelemetry.io/collector/config/configtls" "go.opentelemetry.io/collector/confmap/confmaptest" "go.uber.org/multierr" @@ -125,9 +125,9 @@ func TestLoadConfig(t *testing.T) { cfg := factory.CreateDefaultConfig() t.Run("postgresql", func(t *testing.T) { - sub, err := cm.Sub(config.NewComponentIDWithName(typeStr, "").String()) + sub, err := cm.Sub(component.NewIDWithName(typeStr, "").String()) require.NoError(t, err) - require.NoError(t, config.UnmarshalReceiver(sub, cfg)) + require.NoError(t, component.UnmarshalReceiverConfig(sub, cfg)) expected := factory.CreateDefaultConfig().(*Config) expected.Endpoint = "localhost:5432" @@ -138,9 +138,9 @@ func TestLoadConfig(t *testing.T) { }) t.Run("postgresql/all", func(t *testing.T) { - sub, err := cm.Sub(config.NewComponentIDWithName(typeStr, "all").String()) + sub, err := cm.Sub(component.NewIDWithName(typeStr, "all").String()) require.NoError(t, err) - require.NoError(t, config.UnmarshalReceiver(sub, cfg)) + require.NoError(t, component.UnmarshalReceiverConfig(sub, cfg)) expected := factory.CreateDefaultConfig().(*Config) expected.Endpoint = "localhost:5432" diff --git a/receiver/postgresqlreceiver/factory.go b/receiver/postgresqlreceiver/factory.go index d6fb5eac49a7..4809a7fb5251 100644 --- a/receiver/postgresqlreceiver/factory.go +++ b/receiver/postgresqlreceiver/factory.go @@ -40,10 +40,10 @@ func NewFactory() component.ReceiverFactory { component.WithMetricsReceiver(createMetricsReceiver, stability)) } -func createDefaultConfig() config.Receiver { +func createDefaultConfig() component.ReceiverConfig { return &Config{ ScraperControllerSettings: scraperhelper.ScraperControllerSettings{ - ReceiverSettings: config.NewReceiverSettings(config.NewComponentID(typeStr)), + ReceiverSettings: config.NewReceiverSettings(component.NewID(typeStr)), CollectionInterval: 10 * time.Second, }, NetAddr: confignet.NetAddr{ @@ -61,7 +61,7 @@ func createDefaultConfig() config.Receiver { func createMetricsReceiver( _ context.Context, params component.ReceiverCreateSettings, - rConf config.Receiver, + rConf component.ReceiverConfig, consumer consumer.Metrics, ) (component.MetricsReceiver, error) { cfg := rConf.(*Config) diff --git a/receiver/postgresqlreceiver/factory_test.go b/receiver/postgresqlreceiver/factory_test.go index de98bb00871a..e05ae274d1ba 100644 --- a/receiver/postgresqlreceiver/factory_test.go +++ b/receiver/postgresqlreceiver/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/config" "go.opentelemetry.io/collector/consumer/consumertest" @@ -47,7 +48,7 @@ func TestCreateMetricsReceiver(t *testing.T) { componenttest.NewNopReceiverCreateSettings(), &Config{ ScraperControllerSettings: scraperhelper.ScraperControllerSettings{ - ReceiverSettings: config.NewReceiverSettings(config.NewComponentID("postgresql")), + ReceiverSettings: config.NewReceiverSettings(component.NewID("postgresql")), CollectionInterval: 10 * time.Second, }, Username: "otel", diff --git a/receiver/postgresqlreceiver/go.mod b/receiver/postgresqlreceiver/go.mod index 28c43355e50e..1c6d03ace73f 100644 --- a/receiver/postgresqlreceiver/go.mod +++ b/receiver/postgresqlreceiver/go.mod @@ -6,14 +6,14 @@ require ( github.com/lib/pq v1.10.7 github.com/open-telemetry/opentelemetry-collector-contrib/internal/scrapertest v0.63.0 github.com/stretchr/testify v1.8.1 - go.opentelemetry.io/collector v0.63.2-0.20221104003159-6b27644724d8 + go.opentelemetry.io/collector v0.63.2-0.20221108014805-0b08d5316426 go.uber.org/multierr v1.8.0 go.uber.org/zap v1.23.0 ) require ( github.com/testcontainers/testcontainers-go v0.15.0 - go.opentelemetry.io/collector/pdata v0.63.2-0.20221104003159-6b27644724d8 + go.opentelemetry.io/collector/pdata v0.63.2-0.20221108014805-0b08d5316426 ) require ( @@ -52,7 +52,7 @@ require ( github.com/pmezard/go-difflib v1.0.0 // indirect github.com/sirupsen/logrus v1.8.1 // indirect github.com/stretchr/objx v0.5.0 // indirect - go.opencensus.io v0.23.0 // indirect + go.opencensus.io v0.24.0 // 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/postgresqlreceiver/go.sum b/receiver/postgresqlreceiver/go.sum index 0a8d3ff913aa..e6941e40dfa5 100644 --- a/receiver/postgresqlreceiver/go.sum +++ b/receiver/postgresqlreceiver/go.sum @@ -683,7 +683,7 @@ github.com/prometheus/client_golang v1.0.0/go.mod h1:db9x61etRT2tGnBNRi70OPL5Fsn github.com/prometheus/client_golang v1.1.0/go.mod h1:I1FGZT9+L76gKKOs5djB6ezCbFQP1xR9D75/vuwEF3g= github.com/prometheus/client_golang v1.7.1/go.mod h1:PY5Wy2awLA44sXw4AOSfFBetzPP4j5+D6mVACh+pe2M= github.com/prometheus/client_golang v1.11.1/go.mod h1:Z6t4BnS23TR94PD6BsDNk8yVqroYurpAkEiz0P2BEV0= -github.com/prometheus/client_golang v1.13.0 h1:b71QUfeo5M8gq2+evJdTPfZhYMAU0uKPkyPJ7TPsloU= +github.com/prometheus/client_golang v1.13.1 h1:3gMjIY2+/hzmqhtUC/aQNYldJA6DtH3CgQvwS+02K1c= github.com/prometheus/client_model v0.0.0-20171117100541-99fa1f4be8e5/go.mod h1:MbSGuTsp3dbXC40dX6PRTWyKYBIrTGTE9sqQNg2J8bo= github.com/prometheus/client_model v0.0.0-20180712105110-5c3871d89910/go.mod h1:MbSGuTsp3dbXC40dX6PRTWyKYBIrTGTE9sqQNg2J8bo= github.com/prometheus/client_model v0.0.0-20190129233127-fd36f4220a90/go.mod h1:xMI15A0UPsDsEKsMN9yxemIoYk6Tm2C1GtYGdfGttqA= @@ -818,12 +818,12 @@ go.opencensus.io v0.21.0/go.mod h1:mSImk1erAIZhrmZN+AvHh14ztQfjbGwt4TtuofqLduU= 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.23.0 h1:gqCw0LfLxScz8irSi8exQc7fyQ0fKQU/qnC/X8+V/1M= -go.opencensus.io v0.23.0/go.mod h1:XItmlyltB5F7CS4xOC1DcqMoFqwtC6OG2xF7mCv7P7E= -go.opentelemetry.io/collector v0.63.2-0.20221104003159-6b27644724d8 h1:rOT5HzXXfSISc6FiH012zH2/EFjp37UXfjEqj5BpkWQ= -go.opentelemetry.io/collector v0.63.2-0.20221104003159-6b27644724d8/go.mod h1:JVmeZXugK4ondC6KQgrHTHWiF4JttpG5k6dWPMt62+k= -go.opentelemetry.io/collector/pdata v0.63.2-0.20221104003159-6b27644724d8 h1:7xeTQjfsOm9eogQeIxjSEhlik9qsbBGsnmkQHfyKaRE= -go.opentelemetry.io/collector/pdata v0.63.2-0.20221104003159-6b27644724d8/go.mod h1:IzvXUGQml2mrnvdb8zIlEW3qQs9oFLdD2hLwJdZ+pek= +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.63.2-0.20221108014805-0b08d5316426 h1:z/wLTMh7/vNxcFUDa5uG7/IPE3tYx6pzCWPV41ghyV8= +go.opentelemetry.io/collector v0.63.2-0.20221108014805-0b08d5316426/go.mod h1:+Zb70q0Rq17dA9FcHTiTjW6g96lvJ8kAZ0c+eWNkAv0= +go.opentelemetry.io/collector/pdata v0.63.2-0.20221108014805-0b08d5316426 h1:wKDpgP0Tx/gWI2SgDGAY1OTSeihhDivbbRqFR79IGTc= +go.opentelemetry.io/collector/pdata v0.63.2-0.20221108014805-0b08d5316426/go.mod h1:IzvXUGQml2mrnvdb8zIlEW3qQs9oFLdD2hLwJdZ+pek= 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 9da183c4a231..a5d7b9eaf9e8 100644 --- a/receiver/prometheusexecreceiver/config_test.go +++ b/receiver/prometheusexecreceiver/config_test.go @@ -21,6 +21,7 @@ import ( "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" + "go.opentelemetry.io/collector/component" "go.opentelemetry.io/collector/config" "go.opentelemetry.io/collector/confmap/confmaptest" @@ -34,14 +35,14 @@ func TestLoadConfig(t *testing.T) { require.NoError(t, err) tests := []struct { - id config.ComponentID - expected config.Receiver + id component.ID + expected component.ReceiverConfig expectedErr error }{ { - id: config.NewComponentIDWithName(typeStr, "test"), + id: component.NewIDWithName(typeStr, "test"), expected: &Config{ - ReceiverSettings: config.NewReceiverSettings(config.NewComponentID(typeStr)), + ReceiverSettings: config.NewReceiverSettings(component.NewID(typeStr)), ScrapeInterval: 60 * time.Second, ScrapeTimeout: 10 * time.Second, Port: 9104, @@ -52,9 +53,9 @@ func TestLoadConfig(t *testing.T) { }, }, { - id: config.NewComponentIDWithName(typeStr, "test2"), + id: component.NewIDWithName(typeStr, "test2"), expected: &Config{ - ReceiverSettings: config.NewReceiverSettings(config.NewComponentID(typeStr)), + ReceiverSettings: config.NewReceiverSettings(component.NewID(typeStr)), ScrapeInterval: 90 * time.Second, ScrapeTimeout: 10 * time.Second, SubprocessConfig: subprocessmanager.SubprocessConfig{ @@ -64,9 +65,9 @@ func TestLoadConfig(t *testing.T) { }, }, { - id: config.NewComponentIDWithName(typeStr, "end_to_end_test/1"), + id: component.NewIDWithName(typeStr, "end_to_end_test/1"), expected: &Config{ - ReceiverSettings: config.NewReceiverSettings(config.NewComponentID(typeStr)), + ReceiverSettings: config.NewReceiverSettings(component.NewID(typeStr)), ScrapeInterval: 1 * time.Second, ScrapeTimeout: 1 * time.Second, Port: 9999, @@ -86,9 +87,9 @@ func TestLoadConfig(t *testing.T) { }, }, { - id: config.NewComponentIDWithName(typeStr, "end_to_end_test/2"), + id: component.NewIDWithName(typeStr, "end_to_end_test/2"), expected: &Config{ - ReceiverSettings: config.NewReceiverSettings(config.NewComponentID(typeStr)), + ReceiverSettings: config.NewReceiverSettings(component.NewID(typeStr)), ScrapeInterval: 1 * time.Second, ScrapeTimeout: 1 * time.Second, SubprocessConfig: subprocessmanager.SubprocessConfig{ @@ -106,7 +107,7 @@ func TestLoadConfig(t *testing.T) { sub, err := cm.Sub(tt.id.String()) require.NoError(t, err) - require.NoError(t, config.UnmarshalReceiver(sub, cfg)) + require.NoError(t, component.UnmarshalReceiverConfig(sub, cfg)) assert.NoError(t, cfg.Validate()) assert.Equal(t, tt.expected, cfg) diff --git a/receiver/prometheusexecreceiver/factory.go b/receiver/prometheusexecreceiver/factory.go index 6b9f7ee9cab8..1484312ba612 100644 --- a/receiver/prometheusexecreceiver/factory.go +++ b/receiver/prometheusexecreceiver/factory.go @@ -54,9 +54,9 @@ func logDeprecation(logger *zap.Logger) { } // createDefaultConfig returns a default config -func createDefaultConfig() config.Receiver { +func createDefaultConfig() component.ReceiverConfig { return &Config{ - ReceiverSettings: config.NewReceiverSettings(config.NewComponentID(typeStr)), + ReceiverSettings: config.NewReceiverSettings(component.NewID(typeStr)), ScrapeInterval: defaultCollectionInterval, ScrapeTimeout: defaultTimeoutInterval, SubprocessConfig: subprocessmanager.SubprocessConfig{ @@ -69,7 +69,7 @@ func createDefaultConfig() config.Receiver { func createMetricsReceiver( ctx context.Context, params component.ReceiverCreateSettings, - cfg config.Receiver, + cfg component.ReceiverConfig, nextConsumer consumer.Metrics, ) (component.MetricsReceiver, error) { logDeprecation(params.Logger) diff --git a/receiver/prometheusexecreceiver/factory_test.go b/receiver/prometheusexecreceiver/factory_test.go index 0ddd6f91104f..d8db4caae254 100644 --- a/receiver/prometheusexecreceiver/factory_test.go +++ b/receiver/prometheusexecreceiver/factory_test.go @@ -44,9 +44,9 @@ func TestCreateTraceAndMetricsReceiver(t *testing.T) { factory := NewFactory() cfg := factory.CreateDefaultConfig() - sub, err := cm.Sub(config.NewComponentIDWithName(typeStr, "").String()) + sub, err := cm.Sub(component.NewIDWithName(typeStr, "").String()) require.NoError(t, err) - require.NoError(t, config.UnmarshalReceiver(sub, cfg)) + require.NoError(t, component.UnmarshalReceiverConfig(sub, cfg)) assert.NoError(t, err) assert.NotNil(t, cfg) @@ -62,9 +62,9 @@ func TestCreateTraceAndMetricsReceiver(t *testing.T) { assert.NotNil(t, err) // Test CreateMetricsReceiver - sub, err = cm.Sub(config.NewComponentIDWithName(typeStr, "test").String()) + sub, err = cm.Sub(component.NewIDWithName(typeStr, "test").String()) require.NoError(t, err) - require.NoError(t, config.UnmarshalReceiver(sub, cfg)) + require.NoError(t, component.UnmarshalReceiverConfig(sub, cfg)) metricReceiver, err = factory.CreateMetricsReceiver(context.Background(), componenttest.NewNopReceiverCreateSettings(), cfg, nil) assert.Equal(t, nil, err) @@ -73,7 +73,7 @@ func TestCreateTraceAndMetricsReceiver(t *testing.T) { config: cfg.(*Config), consumer: nil, promReceiverConfig: &prometheusreceiver.Config{ - ReceiverSettings: config.NewReceiverSettings(config.NewComponentID(typeStr)), + ReceiverSettings: config.NewReceiverSettings(component.NewID(typeStr)), PrometheusConfig: &promconfig.Config{ ScrapeConfigs: []*promconfig.ScrapeConfig{ { diff --git a/receiver/prometheusexecreceiver/go.mod b/receiver/prometheusexecreceiver/go.mod index 5e0747a16318..e5736b0c66cd 100644 --- a/receiver/prometheusexecreceiver/go.mod +++ b/receiver/prometheusexecreceiver/go.mod @@ -9,8 +9,8 @@ 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.63.2-0.20221104003159-6b27644724d8 - go.opentelemetry.io/collector/pdata v0.63.2-0.20221104003159-6b27644724d8 + go.opentelemetry.io/collector v0.63.2-0.20221108014805-0b08d5316426 + go.opentelemetry.io/collector/pdata v0.63.2-0.20221108014805-0b08d5316426 go.uber.org/zap v1.23.0 ) @@ -107,7 +107,7 @@ require ( github.com/opencontainers/image-spec v1.0.2 // indirect github.com/pkg/errors v0.9.1 // indirect github.com/pmezard/go-difflib v1.0.0 // indirect - github.com/prometheus/client_golang v1.13.0 // indirect + github.com/prometheus/client_golang v1.13.1 // indirect github.com/prometheus/client_model v0.3.0 // indirect github.com/prometheus/common/sigv4 v0.1.0 // indirect github.com/prometheus/procfs v0.8.0 // indirect @@ -115,8 +115,8 @@ require ( github.com/sirupsen/logrus v1.8.1 // indirect github.com/spf13/pflag v1.0.5 // indirect github.com/vultr/govultr/v2 v2.17.2 // indirect - go.opencensus.io v0.23.0 // indirect - go.opentelemetry.io/collector/semconv v0.63.2-0.20221104003159-6b27644724d8 // indirect + go.opencensus.io v0.24.0 // indirect + go.opentelemetry.io/collector/semconv v0.63.2-0.20221108014805-0b08d5316426 // 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 ca295f36f3b6..9cf39d9e1f30 100644 --- a/receiver/prometheusexecreceiver/go.sum +++ b/receiver/prometheusexecreceiver/go.sum @@ -517,8 +517,8 @@ github.com/prometheus/client_golang v1.7.1/go.mod h1:PY5Wy2awLA44sXw4AOSfFBetzPP github.com/prometheus/client_golang v1.11.0/go.mod h1:Z6t4BnS23TR94PD6BsDNk8yVqroYurpAkEiz0P2BEV0= github.com/prometheus/client_golang v1.11.1/go.mod h1:Z6t4BnS23TR94PD6BsDNk8yVqroYurpAkEiz0P2BEV0= github.com/prometheus/client_golang v1.12.1/go.mod h1:3Z9XVyYiZYEO+YQWt3RD2R3jrbd179Rt297l4aS6nDY= -github.com/prometheus/client_golang v1.13.0 h1:b71QUfeo5M8gq2+evJdTPfZhYMAU0uKPkyPJ7TPsloU= -github.com/prometheus/client_golang v1.13.0/go.mod h1:vTeo+zgvILHsnnj/39Ou/1fPN5nJFOEMgftOUOmlvYQ= +github.com/prometheus/client_golang v1.13.1 h1:3gMjIY2+/hzmqhtUC/aQNYldJA6DtH3CgQvwS+02K1c= +github.com/prometheus/client_golang v1.13.1/go.mod h1:vTeo+zgvILHsnnj/39Ou/1fPN5nJFOEMgftOUOmlvYQ= github.com/prometheus/client_model v0.0.0-20180712105110-5c3871d89910/go.mod h1:MbSGuTsp3dbXC40dX6PRTWyKYBIrTGTE9sqQNg2J8bo= github.com/prometheus/client_model v0.0.0-20190129233127-fd36f4220a90/go.mod h1:xMI15A0UPsDsEKsMN9yxemIoYk6Tm2C1GtYGdfGttqA= github.com/prometheus/client_model v0.0.0-20190812154241-14fe0d1b01d4/go.mod h1:xMI15A0UPsDsEKsMN9yxemIoYk6Tm2C1GtYGdfGttqA= @@ -613,15 +613,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.opencensus.io v0.23.0 h1:gqCw0LfLxScz8irSi8exQc7fyQ0fKQU/qnC/X8+V/1M= -go.opencensus.io v0.23.0/go.mod h1:XItmlyltB5F7CS4xOC1DcqMoFqwtC6OG2xF7mCv7P7E= -go.opentelemetry.io/collector v0.63.2-0.20221104003159-6b27644724d8 h1:rOT5HzXXfSISc6FiH012zH2/EFjp37UXfjEqj5BpkWQ= -go.opentelemetry.io/collector v0.63.2-0.20221104003159-6b27644724d8/go.mod h1:JVmeZXugK4ondC6KQgrHTHWiF4JttpG5k6dWPMt62+k= -go.opentelemetry.io/collector/pdata v0.63.2-0.20221104003159-6b27644724d8 h1:7xeTQjfsOm9eogQeIxjSEhlik9qsbBGsnmkQHfyKaRE= -go.opentelemetry.io/collector/pdata v0.63.2-0.20221104003159-6b27644724d8/go.mod h1:IzvXUGQml2mrnvdb8zIlEW3qQs9oFLdD2hLwJdZ+pek= -go.opentelemetry.io/collector/processor/batchprocessor v0.0.0-20221104003159-6b27644724d8 h1:jgN7o3WfR8x++rjMcVM1VN6OJi4ytlGANXbwd73BPXo= -go.opentelemetry.io/collector/semconv v0.63.2-0.20221104003159-6b27644724d8 h1:jm0sNPyqo6S165QjQYMBHB2nK50wlJbMYM03Yr3Eo2k= -go.opentelemetry.io/collector/semconv v0.63.2-0.20221104003159-6b27644724d8/go.mod h1:5o9yhOa+ABt7g2E5JABDxGZ1PQPbtfxrKNbYn+LOTXU= +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.63.2-0.20221108014805-0b08d5316426 h1:z/wLTMh7/vNxcFUDa5uG7/IPE3tYx6pzCWPV41ghyV8= +go.opentelemetry.io/collector v0.63.2-0.20221108014805-0b08d5316426/go.mod h1:+Zb70q0Rq17dA9FcHTiTjW6g96lvJ8kAZ0c+eWNkAv0= +go.opentelemetry.io/collector/pdata v0.63.2-0.20221108014805-0b08d5316426 h1:wKDpgP0Tx/gWI2SgDGAY1OTSeihhDivbbRqFR79IGTc= +go.opentelemetry.io/collector/pdata v0.63.2-0.20221108014805-0b08d5316426/go.mod h1:IzvXUGQml2mrnvdb8zIlEW3qQs9oFLdD2hLwJdZ+pek= +go.opentelemetry.io/collector/processor/batchprocessor v0.0.0-20221108014805-0b08d5316426 h1:7f0NVsVGYT8pxAyk0qBBa8ZQf7athr/mfQ6QltGywN0= +go.opentelemetry.io/collector/semconv v0.63.2-0.20221108014805-0b08d5316426 h1:pqIl7OC531J6i9ttBCj3zLmZI/BSF4q323YpK0GgKGk= +go.opentelemetry.io/collector/semconv v0.63.2-0.20221108014805-0b08d5316426/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/prometheusexecreceiver/receiver.go b/receiver/prometheusexecreceiver/receiver.go index 53f505786218..446a59a089c4 100644 --- a/receiver/prometheusexecreceiver/receiver.go +++ b/receiver/prometheusexecreceiver/receiver.go @@ -122,7 +122,7 @@ func getPromReceiverConfig(cfg *Config) *prometheusreceiver.Config { } return &prometheusreceiver.Config{ - ReceiverSettings: config.NewReceiverSettings(config.NewComponentIDWithName(typeStr, cfg.ID().Name())), + ReceiverSettings: config.NewReceiverSettings(component.NewIDWithName(typeStr, cfg.ID().Name())), PrometheusConfig: &promconfig.Config{ ScrapeConfigs: []*promconfig.ScrapeConfig{scrapeConfig}, }, diff --git a/receiver/prometheusexecreceiver/receiver_test.go b/receiver/prometheusexecreceiver/receiver_test.go index 371861624e86..b18ffe1c51a7 100644 --- a/receiver/prometheusexecreceiver/receiver_test.go +++ b/receiver/prometheusexecreceiver/receiver_test.go @@ -26,6 +26,7 @@ import ( "github.com/prometheus/prometheus/discovery" "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" + "go.opentelemetry.io/collector/component" "go.opentelemetry.io/collector/component/componenttest" "go.opentelemetry.io/collector/config" "go.opentelemetry.io/collector/confmap/confmaptest" @@ -37,7 +38,7 @@ import ( ) // loadConfigAssertNoError loads the test config and asserts there are no errors, and returns the receiver wanted -func loadConfigAssertNoError(t *testing.T, receiverConfigID config.ComponentID) config.Receiver { +func loadConfigAssertNoError(t *testing.T, receiverConfigID component.ID) component.ReceiverConfig { cm, err := confmaptest.LoadConf(filepath.Join("testdata", "config.yaml")) require.NoError(t, err) factory := NewFactory() @@ -45,20 +46,20 @@ func loadConfigAssertNoError(t *testing.T, receiverConfigID config.ComponentID) sub, err := cm.Sub(receiverConfigID.String()) require.NoError(t, err) - require.NoError(t, config.UnmarshalReceiver(sub, cfg)) + require.NoError(t, component.UnmarshalReceiverConfig(sub, cfg)) return cfg } // TestExecKeyMissing loads config and asserts there is an error with that config func TestExecKeyMissing(t *testing.T) { - receiverConfig := loadConfigAssertNoError(t, config.NewComponentID(typeStr)) + receiverConfig := loadConfigAssertNoError(t, component.NewID(typeStr)) assertErrorWhenExecKeyMissing(t, receiverConfig) } // assertErrorWhenExecKeyMissing makes sure the config passed throws an error, since it's missing the exec key -func assertErrorWhenExecKeyMissing(t *testing.T, errorReceiverConfig config.Receiver) { +func assertErrorWhenExecKeyMissing(t *testing.T, errorReceiverConfig component.ReceiverConfig) { _, err := newPromExecReceiver(componenttest.NewNopReceiverCreateSettings(), errorReceiverConfig.(*Config), nil) assert.Error(t, err, "newPromExecReceiver() didn't return an error") } @@ -66,14 +67,14 @@ func assertErrorWhenExecKeyMissing(t *testing.T, errorReceiverConfig config.Rece // TestEndToEnd loads the test config and completes an e2e test where Prometheus metrics are scrapped twice from `test_prometheus_exporter.go` func TestEndToEnd(t *testing.T) { t.Skip("Flaky test, see https://github.com/open-telemetry/opentelemetry-collector-contrib/issues/5859") - receiverConfig := loadConfigAssertNoError(t, config.NewComponentIDWithName(typeStr, "end_to_end_test/2")) + receiverConfig := loadConfigAssertNoError(t, component.NewIDWithName(typeStr, "end_to_end_test/2")) // e2e test with port undefined by user endToEndScrapeTest(t, receiverConfig, "end-to-end port not defined") } // endToEndScrapeTest creates a receiver that invokes `go run test_prometheus_exporter.go` and waits until it has scraped the /metrics endpoint twice - the application will crash between each scrape -func endToEndScrapeTest(t *testing.T, receiverConfig config.Receiver, testName string) { //nolint +func endToEndScrapeTest(t *testing.T, receiverConfig component.ReceiverConfig, testName string) { //nolint sink := new(consumertest.MetricsSink) wrapper, err := newPromExecReceiver(componenttest.NewNopReceiverCreateSettings(), receiverConfig.(*Config), sink) assert.NoError(t, err, "newPromExecReceiver() returned an error") @@ -141,7 +142,7 @@ func TestConfigBuilderFunctions(t *testing.T) { { name: "no command", cfg: &Config{ - ReceiverSettings: config.NewReceiverSettings(config.NewComponentID(typeStr)), + ReceiverSettings: config.NewReceiverSettings(component.NewID(typeStr)), ScrapeInterval: 60 * time.Second, ScrapeTimeout: 10 * time.Second, Port: 9104, @@ -151,7 +152,7 @@ func TestConfigBuilderFunctions(t *testing.T) { }, }, wantReceiverConfig: &prometheusreceiver.Config{ - ReceiverSettings: config.NewReceiverSettings(config.NewComponentID(typeStr)), + ReceiverSettings: config.NewReceiverSettings(component.NewID(typeStr)), PrometheusConfig: &promconfig.Config{ ScrapeConfigs: []*promconfig.ScrapeConfig{ { @@ -183,7 +184,7 @@ func TestConfigBuilderFunctions(t *testing.T) { { name: "normal config", cfg: &Config{ - ReceiverSettings: config.NewReceiverSettings(config.NewComponentIDWithName(typeStr, "mysqld")), + ReceiverSettings: config.NewReceiverSettings(component.NewIDWithName(typeStr, "mysqld")), ScrapeInterval: 90 * time.Second, ScrapeTimeout: 10 * time.Second, Port: 9104, @@ -198,7 +199,7 @@ func TestConfigBuilderFunctions(t *testing.T) { }, }, wantReceiverConfig: &prometheusreceiver.Config{ - ReceiverSettings: config.NewReceiverSettings(config.NewComponentIDWithName(typeStr, "mysqld")), + ReceiverSettings: config.NewReceiverSettings(component.NewIDWithName(typeStr, "mysqld")), PrometheusConfig: &promconfig.Config{ ScrapeConfigs: []*promconfig.ScrapeConfig{ { @@ -236,7 +237,7 @@ func TestConfigBuilderFunctions(t *testing.T) { { name: "lots of defaults", cfg: &Config{ - ReceiverSettings: config.NewReceiverSettings(config.NewComponentIDWithName(typeStr, "postgres/test")), + ReceiverSettings: config.NewReceiverSettings(component.NewIDWithName(typeStr, "postgres/test")), ScrapeInterval: 60 * time.Second, ScrapeTimeout: 10 * time.Second, SubprocessConfig: subprocessmanager.SubprocessConfig{ @@ -250,7 +251,7 @@ func TestConfigBuilderFunctions(t *testing.T) { }, }, wantReceiverConfig: &prometheusreceiver.Config{ - ReceiverSettings: config.NewReceiverSettings(config.NewComponentIDWithName(typeStr, "postgres/test")), + ReceiverSettings: config.NewReceiverSettings(component.NewIDWithName(typeStr, "postgres/test")), PrometheusConfig: &promconfig.Config{ ScrapeConfigs: []*promconfig.ScrapeConfig{ { diff --git a/receiver/prometheusreceiver/config.go b/receiver/prometheusreceiver/config.go index 3fedbbd71895..533696dad855 100644 --- a/receiver/prometheusreceiver/config.go +++ b/receiver/prometheusreceiver/config.go @@ -31,6 +31,7 @@ import ( promHTTP "github.com/prometheus/prometheus/discovery/http" "github.com/prometheus/prometheus/discovery/kubernetes" "github.com/prometheus/prometheus/discovery/targetgroup" + "go.opentelemetry.io/collector/component" "go.opentelemetry.io/collector/config" "go.opentelemetry.io/collector/confmap" "gopkg.in/yaml.v2" @@ -79,7 +80,7 @@ type targetAllocator struct { HTTPSDConfig *promHTTP.SDConfig `mapstructure:"-"` } -var _ config.Receiver = (*Config)(nil) +var _ component.ReceiverConfig = (*Config)(nil) var _ confmap.Unmarshaler = (*Config)(nil) func checkFile(fn string) error { diff --git a/receiver/prometheusreceiver/config_test.go b/receiver/prometheusreceiver/config_test.go index b4a9e5dc6f17..14528aec93ec 100644 --- a/receiver/prometheusreceiver/config_test.go +++ b/receiver/prometheusreceiver/config_test.go @@ -24,6 +24,7 @@ import ( promModel "github.com/prometheus/common/model" "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" + "go.opentelemetry.io/collector/component" "go.opentelemetry.io/collector/config" "go.opentelemetry.io/collector/confmap/confmaptest" ) @@ -34,19 +35,19 @@ func TestLoadConfig(t *testing.T) { factory := NewFactory() cfg := factory.CreateDefaultConfig() - sub, err := cm.Sub(config.NewComponentIDWithName(typeStr, "").String()) + sub, err := cm.Sub(component.NewIDWithName(typeStr, "").String()) require.NoError(t, err) - require.NoError(t, config.UnmarshalReceiver(sub, cfg)) + require.NoError(t, component.UnmarshalReceiverConfig(sub, cfg)) r0 := cfg.(*Config) assert.Equal(t, r0, factory.CreateDefaultConfig()) - sub, err = cm.Sub(config.NewComponentIDWithName(typeStr, "customname").String()) + sub, err = cm.Sub(component.NewIDWithName(typeStr, "customname").String()) require.NoError(t, err) - require.NoError(t, config.UnmarshalReceiver(sub, cfg)) + require.NoError(t, component.UnmarshalReceiverConfig(sub, cfg)) r1 := cfg.(*Config) - assert.Equal(t, r1.ReceiverSettings, config.NewReceiverSettings(config.NewComponentID(typeStr))) + assert.Equal(t, r1.ReceiverSettings, config.NewReceiverSettings(component.NewID(typeStr))) assert.Equal(t, r1.PrometheusConfig.ScrapeConfigs[0].JobName, "demo") assert.Equal(t, time.Duration(r1.PrometheusConfig.ScrapeConfigs[0].ScrapeInterval), 5*time.Second) assert.Equal(t, r1.UseStartTimeMetric, true) @@ -66,9 +67,9 @@ func TestLoadTargetAllocatorConfig(t *testing.T) { factory := NewFactory() cfg := factory.CreateDefaultConfig() - sub, err := cm.Sub(config.NewComponentIDWithName(typeStr, "").String()) + sub, err := cm.Sub(component.NewIDWithName(typeStr, "").String()) require.NoError(t, err) - require.NoError(t, config.UnmarshalReceiver(sub, cfg)) + require.NoError(t, component.UnmarshalReceiverConfig(sub, cfg)) r0 := cfg.(*Config) assert.Nil(t, r0.PrometheusConfig) @@ -76,10 +77,10 @@ func TestLoadTargetAllocatorConfig(t *testing.T) { assert.Equal(t, 30*time.Second, r0.TargetAllocator.Interval) assert.Equal(t, "collector-1", r0.TargetAllocator.CollectorID) - sub, err = cm.Sub(config.NewComponentIDWithName(typeStr, "withScrape").String()) + sub, err = cm.Sub(component.NewIDWithName(typeStr, "withScrape").String()) require.NoError(t, err) cfg = factory.CreateDefaultConfig() - require.NoError(t, config.UnmarshalReceiver(sub, cfg)) + require.NoError(t, component.UnmarshalReceiverConfig(sub, cfg)) r1 := cfg.(*Config) assert.Nil(t, r0.PrometheusConfig) @@ -91,10 +92,10 @@ func TestLoadTargetAllocatorConfig(t *testing.T) { assert.Equal(t, "demo", r1.PrometheusConfig.ScrapeConfigs[0].JobName) assert.Equal(t, promModel.Duration(5*time.Second), r1.PrometheusConfig.ScrapeConfigs[0].ScrapeInterval) - sub, err = cm.Sub(config.NewComponentIDWithName(typeStr, "withOnlyScrape").String()) + sub, err = cm.Sub(component.NewIDWithName(typeStr, "withOnlyScrape").String()) require.NoError(t, err) cfg = factory.CreateDefaultConfig() - require.NoError(t, config.UnmarshalReceiver(sub, cfg)) + require.NoError(t, component.UnmarshalReceiverConfig(sub, cfg)) r2 := cfg.(*Config) assert.Equal(t, 1, len(r2.PrometheusConfig.ScrapeConfigs)) @@ -108,9 +109,9 @@ func TestLoadConfigFailsOnUnknownSection(t *testing.T) { factory := NewFactory() cfg := factory.CreateDefaultConfig() - sub, err := cm.Sub(config.NewComponentIDWithName(typeStr, "").String()) + sub, err := cm.Sub(component.NewIDWithName(typeStr, "").String()) require.NoError(t, err) - require.Error(t, config.UnmarshalReceiver(sub, cfg)) + require.Error(t, component.UnmarshalReceiverConfig(sub, cfg)) } // As one of the config parameters is consuming prometheus @@ -122,9 +123,9 @@ func TestLoadConfigFailsOnUnknownPrometheusSection(t *testing.T) { factory := NewFactory() cfg := factory.CreateDefaultConfig() - sub, err := cm.Sub(config.NewComponentIDWithName(typeStr, "").String()) + sub, err := cm.Sub(component.NewIDWithName(typeStr, "").String()) require.NoError(t, err) - require.Error(t, config.UnmarshalReceiver(sub, cfg)) + require.Error(t, component.UnmarshalReceiverConfig(sub, cfg)) } // Renaming is not allowed @@ -134,9 +135,9 @@ func TestLoadConfigFailsOnRenameDisallowed(t *testing.T) { factory := NewFactory() cfg := factory.CreateDefaultConfig() - sub, err := cm.Sub(config.NewComponentIDWithName(typeStr, "").String()) + sub, err := cm.Sub(component.NewIDWithName(typeStr, "").String()) require.NoError(t, err) - require.NoError(t, config.UnmarshalReceiver(sub, cfg)) + require.NoError(t, component.UnmarshalReceiverConfig(sub, cfg)) assert.Error(t, cfg.Validate()) } @@ -147,9 +148,9 @@ func TestRejectUnsupportedPrometheusFeatures(t *testing.T) { factory := NewFactory() cfg := factory.CreateDefaultConfig() - sub, err := cm.Sub(config.NewComponentIDWithName(typeStr, "").String()) + sub, err := cm.Sub(component.NewIDWithName(typeStr, "").String()) require.NoError(t, err) - require.NoError(t, config.UnmarshalReceiver(sub, cfg)) + require.NoError(t, component.UnmarshalReceiverConfig(sub, cfg)) err = cfg.Validate() require.NotNil(t, err, "Expected a non-nil error") @@ -172,9 +173,9 @@ func TestNonExistentAuthCredentialsFile(t *testing.T) { factory := NewFactory() cfg := factory.CreateDefaultConfig() - sub, err := cm.Sub(config.NewComponentIDWithName(typeStr, "").String()) + sub, err := cm.Sub(component.NewIDWithName(typeStr, "").String()) require.NoError(t, err) - require.NoError(t, config.UnmarshalReceiver(sub, cfg)) + require.NoError(t, component.UnmarshalReceiverConfig(sub, cfg)) err = cfg.Validate() require.NotNil(t, err, "Expected a non-nil error") @@ -191,9 +192,9 @@ func TestTLSConfigNonExistentCertFile(t *testing.T) { factory := NewFactory() cfg := factory.CreateDefaultConfig() - sub, err := cm.Sub(config.NewComponentIDWithName(typeStr, "").String()) + sub, err := cm.Sub(component.NewIDWithName(typeStr, "").String()) require.NoError(t, err) - require.NoError(t, config.UnmarshalReceiver(sub, cfg)) + require.NoError(t, component.UnmarshalReceiverConfig(sub, cfg)) err = cfg.Validate() require.NotNil(t, err, "Expected a non-nil error") @@ -210,9 +211,9 @@ func TestTLSConfigNonExistentKeyFile(t *testing.T) { factory := NewFactory() cfg := factory.CreateDefaultConfig() - sub, err := cm.Sub(config.NewComponentIDWithName(typeStr, "").String()) + sub, err := cm.Sub(component.NewIDWithName(typeStr, "").String()) require.NoError(t, err) - require.NoError(t, config.UnmarshalReceiver(sub, cfg)) + require.NoError(t, component.UnmarshalReceiverConfig(sub, cfg)) err = cfg.Validate() require.NotNil(t, err, "Expected a non-nil error") @@ -229,9 +230,9 @@ func TestTLSConfigCertFileWithoutKeyFile(t *testing.T) { factory := NewFactory() cfg := factory.CreateDefaultConfig() - sub, err := cm.Sub(config.NewComponentIDWithName(typeStr, "").String()) + sub, err := cm.Sub(component.NewIDWithName(typeStr, "").String()) require.NoError(t, err) - require.NoError(t, config.UnmarshalReceiver(sub, cfg)) + require.NoError(t, component.UnmarshalReceiverConfig(sub, cfg)) err = cfg.Validate() require.NotNil(t, err, "Expected a non-nil error") @@ -248,9 +249,9 @@ func TestTLSConfigKeyFileWithoutCertFile(t *testing.T) { factory := NewFactory() cfg := factory.CreateDefaultConfig() - sub, err := cm.Sub(config.NewComponentIDWithName(typeStr, "").String()) + sub, err := cm.Sub(component.NewIDWithName(typeStr, "").String()) require.NoError(t, err) - require.NoError(t, config.UnmarshalReceiver(sub, cfg)) + require.NoError(t, component.UnmarshalReceiverConfig(sub, cfg)) err = cfg.Validate() require.NotNil(t, err, "Expected a non-nil error") @@ -267,9 +268,9 @@ func TestKubernetesSDConfigWithoutKeyFile(t *testing.T) { factory := NewFactory() cfg := factory.CreateDefaultConfig() - sub, err := cm.Sub(config.NewComponentIDWithName(typeStr, "").String()) + sub, err := cm.Sub(component.NewIDWithName(typeStr, "").String()) require.NoError(t, err) - require.NoError(t, config.UnmarshalReceiver(sub, cfg)) + require.NoError(t, component.UnmarshalReceiverConfig(sub, cfg)) err = cfg.Validate() require.NotNil(t, err, "Expected a non-nil error") @@ -286,9 +287,9 @@ func TestFileSDConfigJsonNilTargetGroup(t *testing.T) { factory := NewFactory() cfg := factory.CreateDefaultConfig() - sub, err := cm.Sub(config.NewComponentIDWithName(typeStr, "").String()) + sub, err := cm.Sub(component.NewIDWithName(typeStr, "").String()) require.NoError(t, err) - require.NoError(t, config.UnmarshalReceiver(sub, cfg)) + require.NoError(t, component.UnmarshalReceiverConfig(sub, cfg)) err = cfg.Validate() require.NotNil(t, err, "Expected a non-nil error") @@ -305,9 +306,9 @@ func TestFileSDConfigYamlNilTargetGroup(t *testing.T) { factory := NewFactory() cfg := factory.CreateDefaultConfig() - sub, err := cm.Sub(config.NewComponentIDWithName(typeStr, "").String()) + sub, err := cm.Sub(component.NewIDWithName(typeStr, "").String()) require.NoError(t, err) - require.NoError(t, config.UnmarshalReceiver(sub, cfg)) + require.NoError(t, component.UnmarshalReceiverConfig(sub, cfg)) err = cfg.Validate() require.NotNil(t, err, "Expected a non-nil error") diff --git a/receiver/prometheusreceiver/factory.go b/receiver/prometheusreceiver/factory.go index f1829002fdd7..ad8d912b025a 100644 --- a/receiver/prometheusreceiver/factory.go +++ b/receiver/prometheusreceiver/factory.go @@ -41,16 +41,16 @@ func NewFactory() component.ReceiverFactory { component.WithMetricsReceiver(createMetricsReceiver, stability)) } -func createDefaultConfig() config.Receiver { +func createDefaultConfig() component.ReceiverConfig { return &Config{ - ReceiverSettings: config.NewReceiverSettings(config.NewComponentID(typeStr)), + ReceiverSettings: config.NewReceiverSettings(component.NewID(typeStr)), } } func createMetricsReceiver( _ context.Context, set component.ReceiverCreateSettings, - cfg config.Receiver, + cfg component.ReceiverConfig, nextConsumer consumer.Metrics, ) (component.MetricsReceiver, error) { return newPrometheusReceiver(set, cfg.(*Config), nextConsumer), nil diff --git a/receiver/prometheusreceiver/factory_test.go b/receiver/prometheusreceiver/factory_test.go index 50481de872c6..59a2f753ad99 100644 --- a/receiver/prometheusreceiver/factory_test.go +++ b/receiver/prometheusreceiver/factory_test.go @@ -21,16 +21,15 @@ import ( "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" + "go.opentelemetry.io/collector/component" "go.opentelemetry.io/collector/component/componenttest" - "go.opentelemetry.io/collector/config" - "go.opentelemetry.io/collector/config/configtest" "go.opentelemetry.io/collector/confmap/confmaptest" ) func TestCreateDefaultConfig(t *testing.T) { cfg := createDefaultConfig() assert.NotNil(t, cfg, "failed to create default config") - assert.NoError(t, configtest.CheckConfigStruct(cfg)) + assert.NoError(t, componenttest.CheckConfigStruct(cfg)) } func TestCreateReceiver(t *testing.T) { @@ -49,7 +48,7 @@ func TestFactoryCanParseServiceDiscoveryConfigs(t *testing.T) { factory := NewFactory() cfg := factory.CreateDefaultConfig() - sub, err := cm.Sub(config.NewComponentIDWithName(typeStr, "").String()) + sub, err := cm.Sub(component.NewIDWithName(typeStr, "").String()) require.NoError(t, err) - assert.NoError(t, config.UnmarshalReceiver(sub, cfg)) + assert.NoError(t, component.UnmarshalReceiverConfig(sub, cfg)) } diff --git a/receiver/prometheusreceiver/go.mod b/receiver/prometheusreceiver/go.mod index cf6921ca79d8..997919af1c02 100644 --- a/receiver/prometheusreceiver/go.mod +++ b/receiver/prometheusreceiver/go.mod @@ -11,10 +11,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.63.2-0.20221104003159-6b27644724d8 - go.opentelemetry.io/collector/pdata v0.63.2-0.20221104003159-6b27644724d8 - go.opentelemetry.io/collector/processor/batchprocessor v0.0.0-20221104003159-6b27644724d8 - go.opentelemetry.io/collector/semconv v0.63.2-0.20221104003159-6b27644724d8 + go.opentelemetry.io/collector v0.63.2-0.20221108014805-0b08d5316426 + go.opentelemetry.io/collector/pdata v0.63.2-0.20221108014805-0b08d5316426 + go.opentelemetry.io/collector/processor/batchprocessor v0.0.0-20221108014805-0b08d5316426 + go.opentelemetry.io/collector/semconv v0.63.2-0.20221108014805-0b08d5316426 go.uber.org/atomic v1.10.0 go.uber.org/zap v1.23.0 google.golang.org/protobuf v1.28.1 @@ -125,7 +125,7 @@ require ( github.com/pkg/errors v0.9.1 // indirect github.com/pmezard/go-difflib v1.0.0 // indirect github.com/power-devops/perfstat v0.0.0-20210106213030-5aafc221ea8c // indirect - github.com/prometheus/client_golang v1.13.0 // indirect + github.com/prometheus/client_golang v1.13.1 // indirect github.com/prometheus/client_model v0.3.0 // indirect github.com/prometheus/common/sigv4 v0.1.0 // indirect github.com/prometheus/procfs v0.8.0 // indirect @@ -145,7 +145,7 @@ require ( github.com/tklauser/numcpus v0.4.0 // indirect github.com/vultr/govultr/v2 v2.17.2 // indirect github.com/yusufpapurcu/wmi v1.2.2 // indirect - go.opencensus.io v0.23.0 // indirect + go.opencensus.io v0.24.0 // 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 f0d1a1b5744b..341e7b786eb9 100644 --- a/receiver/prometheusreceiver/go.sum +++ b/receiver/prometheusreceiver/go.sum @@ -531,8 +531,9 @@ github.com/prometheus/client_golang v1.11.0/go.mod h1:Z6t4BnS23TR94PD6BsDNk8yVqr github.com/prometheus/client_golang v1.11.1/go.mod h1:Z6t4BnS23TR94PD6BsDNk8yVqroYurpAkEiz0P2BEV0= github.com/prometheus/client_golang v1.12.1/go.mod h1:3Z9XVyYiZYEO+YQWt3RD2R3jrbd179Rt297l4aS6nDY= github.com/prometheus/client_golang v1.12.2/go.mod h1:3Z9XVyYiZYEO+YQWt3RD2R3jrbd179Rt297l4aS6nDY= -github.com/prometheus/client_golang v1.13.0 h1:b71QUfeo5M8gq2+evJdTPfZhYMAU0uKPkyPJ7TPsloU= github.com/prometheus/client_golang v1.13.0/go.mod h1:vTeo+zgvILHsnnj/39Ou/1fPN5nJFOEMgftOUOmlvYQ= +github.com/prometheus/client_golang v1.13.1 h1:3gMjIY2+/hzmqhtUC/aQNYldJA6DtH3CgQvwS+02K1c= +github.com/prometheus/client_golang v1.13.1/go.mod h1:vTeo+zgvILHsnnj/39Ou/1fPN5nJFOEMgftOUOmlvYQ= github.com/prometheus/client_model v0.0.0-20180712105110-5c3871d89910/go.mod h1:MbSGuTsp3dbXC40dX6PRTWyKYBIrTGTE9sqQNg2J8bo= github.com/prometheus/client_model v0.0.0-20190129233127-fd36f4220a90/go.mod h1:xMI15A0UPsDsEKsMN9yxemIoYk6Tm2C1GtYGdfGttqA= github.com/prometheus/client_model v0.0.0-20190812154241-14fe0d1b01d4/go.mod h1:xMI15A0UPsDsEKsMN9yxemIoYk6Tm2C1GtYGdfGttqA= @@ -642,17 +643,18 @@ 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.opencensus.io v0.23.0 h1:gqCw0LfLxScz8irSi8exQc7fyQ0fKQU/qnC/X8+V/1M= go.opencensus.io v0.23.0/go.mod h1:XItmlyltB5F7CS4xOC1DcqMoFqwtC6OG2xF7mCv7P7E= -go.opentelemetry.io/collector v0.63.2-0.20221104003159-6b27644724d8 h1:rOT5HzXXfSISc6FiH012zH2/EFjp37UXfjEqj5BpkWQ= -go.opentelemetry.io/collector v0.63.2-0.20221104003159-6b27644724d8/go.mod h1:JVmeZXugK4ondC6KQgrHTHWiF4JttpG5k6dWPMt62+k= +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.63.2-0.20221108014805-0b08d5316426 h1:z/wLTMh7/vNxcFUDa5uG7/IPE3tYx6pzCWPV41ghyV8= +go.opentelemetry.io/collector v0.63.2-0.20221108014805-0b08d5316426/go.mod h1:+Zb70q0Rq17dA9FcHTiTjW6g96lvJ8kAZ0c+eWNkAv0= go.opentelemetry.io/collector/extension/zpagesextension v0.0.0-20221102221454-bfc45c16c979 h1:YW7BL8ftoJ7k+EtnMICw1KWASLuSDIhbF7SjjgWMCl4= -go.opentelemetry.io/collector/pdata v0.63.2-0.20221104003159-6b27644724d8 h1:7xeTQjfsOm9eogQeIxjSEhlik9qsbBGsnmkQHfyKaRE= -go.opentelemetry.io/collector/pdata v0.63.2-0.20221104003159-6b27644724d8/go.mod h1:IzvXUGQml2mrnvdb8zIlEW3qQs9oFLdD2hLwJdZ+pek= -go.opentelemetry.io/collector/processor/batchprocessor v0.0.0-20221104003159-6b27644724d8 h1:jgN7o3WfR8x++rjMcVM1VN6OJi4ytlGANXbwd73BPXo= -go.opentelemetry.io/collector/processor/batchprocessor v0.0.0-20221104003159-6b27644724d8/go.mod h1:WBv1Nayi8p12K0vxLxTkHpRGr79JXYT3TXL2X0B/PRU= -go.opentelemetry.io/collector/semconv v0.63.2-0.20221104003159-6b27644724d8 h1:jm0sNPyqo6S165QjQYMBHB2nK50wlJbMYM03Yr3Eo2k= -go.opentelemetry.io/collector/semconv v0.63.2-0.20221104003159-6b27644724d8/go.mod h1:5o9yhOa+ABt7g2E5JABDxGZ1PQPbtfxrKNbYn+LOTXU= +go.opentelemetry.io/collector/pdata v0.63.2-0.20221108014805-0b08d5316426 h1:wKDpgP0Tx/gWI2SgDGAY1OTSeihhDivbbRqFR79IGTc= +go.opentelemetry.io/collector/pdata v0.63.2-0.20221108014805-0b08d5316426/go.mod h1:IzvXUGQml2mrnvdb8zIlEW3qQs9oFLdD2hLwJdZ+pek= +go.opentelemetry.io/collector/processor/batchprocessor v0.0.0-20221108014805-0b08d5316426 h1:7f0NVsVGYT8pxAyk0qBBa8ZQf7athr/mfQ6QltGywN0= +go.opentelemetry.io/collector/processor/batchprocessor v0.0.0-20221108014805-0b08d5316426/go.mod h1:gpd5Q/3HlROMGYhnmwlFpUhcz8Xy80sokEcKs7c7zzE= +go.opentelemetry.io/collector/semconv v0.63.2-0.20221108014805-0b08d5316426 h1:pqIl7OC531J6i9ttBCj3zLmZI/BSF4q323YpK0GgKGk= +go.opentelemetry.io/collector/semconv v0.63.2-0.20221108014805-0b08d5316426/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/prometheusreceiver/internal/appendable.go b/receiver/prometheusreceiver/internal/appendable.go index 27ac1d28b296..fbac6d243068 100644 --- a/receiver/prometheusreceiver/internal/appendable.go +++ b/receiver/prometheusreceiver/internal/appendable.go @@ -22,7 +22,6 @@ import ( "github.com/prometheus/prometheus/model/labels" "github.com/prometheus/prometheus/storage" "go.opentelemetry.io/collector/component" - "go.opentelemetry.io/collector/config" "go.opentelemetry.io/collector/consumer" "go.opentelemetry.io/collector/obsreport" ) @@ -46,7 +45,7 @@ func NewAppendable( gcInterval time.Duration, useStartTimeMetric bool, startTimeMetricRegex *regexp.Regexp, - receiverID config.ComponentID, + receiverID component.ID, externalLabels labels.Labels) storage.Appendable { var metricAdjuster MetricsAdjuster if !useStartTimeMetric { diff --git a/receiver/prometheusreceiver/internal/transaction_test.go b/receiver/prometheusreceiver/internal/transaction_test.go index 0b21ea9994ed..a8770e74154e 100644 --- a/receiver/prometheusreceiver/internal/transaction_test.go +++ b/receiver/prometheusreceiver/internal/transaction_test.go @@ -27,8 +27,8 @@ import ( "github.com/prometheus/prometheus/scrape" "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" + "go.opentelemetry.io/collector/component" "go.opentelemetry.io/collector/component/componenttest" - "go.opentelemetry.io/collector/config" "go.opentelemetry.io/collector/consumer/consumertest" "go.opentelemetry.io/collector/obsreport" "go.opentelemetry.io/collector/pdata/pcommon" @@ -264,7 +264,7 @@ func TestAppendExemplarWithEmptyLabelArray(t *testing.T) { func nopObsRecv() *obsreport.Receiver { return obsreport.MustNewReceiver(obsreport.ReceiverSettings{ - ReceiverID: config.NewComponentID("prometheus"), + ReceiverID: component.NewID("prometheus"), Transport: transport, ReceiverCreateSettings: componenttest.NewNopReceiverCreateSettings(), }) diff --git a/receiver/prometheusreceiver/metrics_receiver_helper_test.go b/receiver/prometheusreceiver/metrics_receiver_helper_test.go index 3a0f7901ebe8..f3de629e8c0b 100644 --- a/receiver/prometheusreceiver/metrics_receiver_helper_test.go +++ b/receiver/prometheusreceiver/metrics_receiver_helper_test.go @@ -33,6 +33,7 @@ import ( "github.com/prometheus/prometheus/scrape" "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" + "go.opentelemetry.io/collector/component" "go.opentelemetry.io/collector/component/componenttest" "go.opentelemetry.io/collector/config" "go.opentelemetry.io/collector/consumer/consumertest" @@ -594,7 +595,7 @@ func testComponent(t *testing.T, targets []*testData, useStartTimeMetric bool, s cms := new(consumertest.MetricsSink) receiver := newPrometheusReceiver(componenttest.NewNopReceiverCreateSettings(), &Config{ - ReceiverSettings: config.NewReceiverSettings(config.NewComponentID(typeStr)), + ReceiverSettings: config.NewReceiverSettings(component.NewID(typeStr)), PrometheusConfig: cfg, UseStartTimeMetric: useStartTimeMetric, StartTimeMetricRegex: startTimeMetricRegex, diff --git a/receiver/prometheusreceiver/metrics_receiver_target_allocator_test.go b/receiver/prometheusreceiver/metrics_receiver_target_allocator_test.go index e4cf7ace13c6..4db7028a6e18 100644 --- a/receiver/prometheusreceiver/metrics_receiver_target_allocator_test.go +++ b/receiver/prometheusreceiver/metrics_receiver_target_allocator_test.go @@ -31,6 +31,7 @@ import ( promConfig "github.com/prometheus/prometheus/config" promHTTP "github.com/prometheus/prometheus/discovery/http" "github.com/stretchr/testify/require" + "go.opentelemetry.io/collector/component" "go.opentelemetry.io/collector/component/componenttest" "go.opentelemetry.io/collector/config" "go.opentelemetry.io/collector/consumer/consumertest" @@ -229,7 +230,7 @@ func TestTargetAllocatorJobRetrieval(t *testing.T) { }, }, cfg: &Config{ - ReceiverSettings: config.NewReceiverSettings(config.NewComponentID(typeStr)), + ReceiverSettings: config.NewReceiverSettings(component.NewID(typeStr)), PrometheusConfig: &promConfig.Config{}, TargetAllocator: &targetAllocator{ Interval: 10 * time.Second, @@ -324,7 +325,7 @@ func TestTargetAllocatorJobRetrieval(t *testing.T) { }, }, cfg: &Config{ - ReceiverSettings: config.NewReceiverSettings(config.NewComponentID(typeStr)), + ReceiverSettings: config.NewReceiverSettings(component.NewID(typeStr)), PrometheusConfig: &promConfig.Config{}, TargetAllocator: &targetAllocator{ Interval: 10 * time.Second, @@ -437,7 +438,7 @@ func TestTargetAllocatorJobRetrieval(t *testing.T) { }, }, cfg: &Config{ - ReceiverSettings: config.NewReceiverSettings(config.NewComponentID(typeStr)), + ReceiverSettings: config.NewReceiverSettings(component.NewID(typeStr)), PrometheusConfig: &promConfig.Config{}, TargetAllocator: &targetAllocator{ Interval: 10 * time.Second, @@ -480,7 +481,7 @@ func TestTargetAllocatorJobRetrieval(t *testing.T) { }, }, cfg: &Config{ - ReceiverSettings: config.NewReceiverSettings(config.NewComponentID(typeStr)), + ReceiverSettings: config.NewReceiverSettings(component.NewID(typeStr)), PrometheusConfig: &promConfig.Config{}, TargetAllocator: &targetAllocator{ Interval: 50 * time.Millisecond, diff --git a/receiver/pulsarreceiver/config.go b/receiver/pulsarreceiver/config.go index 3a3be890429e..6b1d39179f2c 100644 --- a/receiver/pulsarreceiver/config.go +++ b/receiver/pulsarreceiver/config.go @@ -18,6 +18,7 @@ import ( "errors" "github.com/apache/pulsar-client-go/pulsar" + "go.opentelemetry.io/collector/component" "go.opentelemetry.io/collector/config" ) @@ -73,7 +74,7 @@ type OAuth2 struct { Audience string `mapstructure:"audience"` } -var _ config.Receiver = (*Config)(nil) +var _ component.ReceiverConfig = (*Config)(nil) // Validate checks the receiver configuration is valid func (cfg *Config) Validate() error { diff --git a/receiver/pulsarreceiver/config_test.go b/receiver/pulsarreceiver/config_test.go index 4baba8033f90..1830e90174e3 100644 --- a/receiver/pulsarreceiver/config_test.go +++ b/receiver/pulsarreceiver/config_test.go @@ -20,6 +20,7 @@ import ( "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" + "go.opentelemetry.io/collector/component" "go.opentelemetry.io/collector/config" "go.opentelemetry.io/collector/confmap/confmaptest" ) @@ -30,12 +31,12 @@ func TestLoadConfig(t *testing.T) { factory := NewFactory() cfg := factory.CreateDefaultConfig() - sub, err := cm.Sub(config.NewComponentIDWithName(typeStr, "").String()) + sub, err := cm.Sub(component.NewIDWithName(typeStr, "").String()) require.NoError(t, err) - require.NoError(t, config.UnmarshalReceiver(sub, cfg)) + require.NoError(t, component.UnmarshalReceiverConfig(sub, cfg)) assert.Equal(t, &Config{ - ReceiverSettings: config.NewReceiverSettings(config.NewComponentID(typeStr)), + ReceiverSettings: config.NewReceiverSettings(component.NewID(typeStr)), Topic: "otel-pulsar", Endpoint: "pulsar://localhost:6500", ConsumerName: "otel-collector", diff --git a/receiver/pulsarreceiver/factory.go b/receiver/pulsarreceiver/factory.go index 81e9fe731bf7..9fdd80d11eeb 100644 --- a/receiver/pulsarreceiver/factory.go +++ b/receiver/pulsarreceiver/factory.go @@ -93,7 +93,7 @@ type pulsarReceiverFactory struct { func (f *pulsarReceiverFactory) createTracesReceiver( _ context.Context, set component.ReceiverCreateSettings, - cfg config.Receiver, + cfg component.ReceiverConfig, nextConsumer consumer.Traces, ) (component.TracesReceiver, error) { c := *(cfg.(*Config)) @@ -110,7 +110,7 @@ func (f *pulsarReceiverFactory) createTracesReceiver( func (f *pulsarReceiverFactory) createMetricsReceiver( _ context.Context, set component.ReceiverCreateSettings, - cfg config.Receiver, + cfg component.ReceiverConfig, nextConsumer consumer.Metrics, ) (component.MetricsReceiver, error) { c := *(cfg.(*Config)) @@ -127,7 +127,7 @@ func (f *pulsarReceiverFactory) createMetricsReceiver( func (f *pulsarReceiverFactory) createLogsReceiver( _ context.Context, set component.ReceiverCreateSettings, - cfg config.Receiver, + cfg component.ReceiverConfig, nextConsumer consumer.Logs, ) (component.LogsReceiver, error) { c := *(cfg.(*Config)) @@ -141,9 +141,9 @@ func (f *pulsarReceiverFactory) createLogsReceiver( return r, nil } -func createDefaultConfig() config.Receiver { +func createDefaultConfig() component.ReceiverConfig { return &Config{ - ReceiverSettings: config.NewReceiverSettings(config.NewComponentID(typeStr)), + ReceiverSettings: config.NewReceiverSettings(component.NewID(typeStr)), Encoding: defaultEncoding, ConsumerName: defaultConsumerName, Subscription: defaultSubscription, diff --git a/receiver/pulsarreceiver/factory_test.go b/receiver/pulsarreceiver/factory_test.go index 3946f7bdc22c..58b63923a65d 100644 --- a/receiver/pulsarreceiver/factory_test.go +++ b/receiver/pulsarreceiver/factory_test.go @@ -20,6 +20,7 @@ import ( "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" + "go.opentelemetry.io/collector/component" "go.opentelemetry.io/collector/component/componenttest" "go.opentelemetry.io/collector/config" ) @@ -27,7 +28,7 @@ import ( func TestCreateDefaultConfig(t *testing.T) { cfg := createDefaultConfig() assert.Equal(t, &Config{ - ReceiverSettings: config.NewReceiverSettings(config.NewComponentID(typeStr)), + ReceiverSettings: config.NewReceiverSettings(component.NewID(typeStr)), Topic: "", Encoding: defaultEncoding, ConsumerName: defaultConsumerName, diff --git a/receiver/pulsarreceiver/go.mod b/receiver/pulsarreceiver/go.mod index 686f3e82ef2e..93951bb13fa9 100644 --- a/receiver/pulsarreceiver/go.mod +++ b/receiver/pulsarreceiver/go.mod @@ -11,9 +11,9 @@ require ( github.com/open-telemetry/opentelemetry-collector-contrib/pkg/translator/zipkin v0.63.0 github.com/openzipkin/zipkin-go v0.4.1 github.com/stretchr/testify v1.8.1 - go.opentelemetry.io/collector v0.63.2-0.20221104003159-6b27644724d8 - go.opentelemetry.io/collector/pdata v0.63.2-0.20221104003159-6b27644724d8 - go.opentelemetry.io/collector/semconv v0.63.2-0.20221104003159-6b27644724d8 + go.opentelemetry.io/collector v0.63.2-0.20221108014805-0b08d5316426 + go.opentelemetry.io/collector/pdata v0.63.2-0.20221108014805-0b08d5316426 + go.opentelemetry.io/collector/semconv v0.63.2-0.20221108014805-0b08d5316426 go.uber.org/zap v1.23.0 ) @@ -52,7 +52,7 @@ require ( github.com/pierrec/lz4 v2.6.1+incompatible // indirect github.com/pkg/errors v0.9.1 // indirect github.com/pmezard/go-difflib v1.0.0 // indirect - github.com/prometheus/client_golang v1.13.0 // indirect + github.com/prometheus/client_golang v1.13.1 // indirect github.com/prometheus/client_model v0.3.0 // indirect github.com/prometheus/common v0.37.0 // indirect github.com/prometheus/procfs v0.8.0 // indirect diff --git a/receiver/pulsarreceiver/go.sum b/receiver/pulsarreceiver/go.sum index 45e4139c0db6..14e3921dc6e5 100644 --- a/receiver/pulsarreceiver/go.sum +++ b/receiver/pulsarreceiver/go.sum @@ -399,8 +399,8 @@ github.com/prometheus/client_golang v1.7.1/go.mod h1:PY5Wy2awLA44sXw4AOSfFBetzPP github.com/prometheus/client_golang v1.11.0/go.mod h1:Z6t4BnS23TR94PD6BsDNk8yVqroYurpAkEiz0P2BEV0= github.com/prometheus/client_golang v1.11.1/go.mod h1:Z6t4BnS23TR94PD6BsDNk8yVqroYurpAkEiz0P2BEV0= github.com/prometheus/client_golang v1.12.1/go.mod h1:3Z9XVyYiZYEO+YQWt3RD2R3jrbd179Rt297l4aS6nDY= -github.com/prometheus/client_golang v1.13.0 h1:b71QUfeo5M8gq2+evJdTPfZhYMAU0uKPkyPJ7TPsloU= -github.com/prometheus/client_golang v1.13.0/go.mod h1:vTeo+zgvILHsnnj/39Ou/1fPN5nJFOEMgftOUOmlvYQ= +github.com/prometheus/client_golang v1.13.1 h1:3gMjIY2+/hzmqhtUC/aQNYldJA6DtH3CgQvwS+02K1c= +github.com/prometheus/client_golang v1.13.1/go.mod h1:vTeo+zgvILHsnnj/39Ou/1fPN5nJFOEMgftOUOmlvYQ= github.com/prometheus/client_model v0.0.0-20180712105110-5c3871d89910/go.mod h1:MbSGuTsp3dbXC40dX6PRTWyKYBIrTGTE9sqQNg2J8bo= github.com/prometheus/client_model v0.0.0-20190129233127-fd36f4220a90/go.mod h1:xMI15A0UPsDsEKsMN9yxemIoYk6Tm2C1GtYGdfGttqA= github.com/prometheus/client_model v0.0.0-20190812154241-14fe0d1b01d4/go.mod h1:xMI15A0UPsDsEKsMN9yxemIoYk6Tm2C1GtYGdfGttqA= @@ -486,12 +486,12 @@ 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.63.2-0.20221104003159-6b27644724d8 h1:rOT5HzXXfSISc6FiH012zH2/EFjp37UXfjEqj5BpkWQ= -go.opentelemetry.io/collector v0.63.2-0.20221104003159-6b27644724d8/go.mod h1:JVmeZXugK4ondC6KQgrHTHWiF4JttpG5k6dWPMt62+k= -go.opentelemetry.io/collector/pdata v0.63.2-0.20221104003159-6b27644724d8 h1:7xeTQjfsOm9eogQeIxjSEhlik9qsbBGsnmkQHfyKaRE= -go.opentelemetry.io/collector/pdata v0.63.2-0.20221104003159-6b27644724d8/go.mod h1:IzvXUGQml2mrnvdb8zIlEW3qQs9oFLdD2hLwJdZ+pek= -go.opentelemetry.io/collector/semconv v0.63.2-0.20221104003159-6b27644724d8 h1:jm0sNPyqo6S165QjQYMBHB2nK50wlJbMYM03Yr3Eo2k= -go.opentelemetry.io/collector/semconv v0.63.2-0.20221104003159-6b27644724d8/go.mod h1:5o9yhOa+ABt7g2E5JABDxGZ1PQPbtfxrKNbYn+LOTXU= +go.opentelemetry.io/collector v0.63.2-0.20221108014805-0b08d5316426 h1:z/wLTMh7/vNxcFUDa5uG7/IPE3tYx6pzCWPV41ghyV8= +go.opentelemetry.io/collector v0.63.2-0.20221108014805-0b08d5316426/go.mod h1:+Zb70q0Rq17dA9FcHTiTjW6g96lvJ8kAZ0c+eWNkAv0= +go.opentelemetry.io/collector/pdata v0.63.2-0.20221108014805-0b08d5316426 h1:wKDpgP0Tx/gWI2SgDGAY1OTSeihhDivbbRqFR79IGTc= +go.opentelemetry.io/collector/pdata v0.63.2-0.20221108014805-0b08d5316426/go.mod h1:IzvXUGQml2mrnvdb8zIlEW3qQs9oFLdD2hLwJdZ+pek= +go.opentelemetry.io/collector/semconv v0.63.2-0.20221108014805-0b08d5316426 h1:pqIl7OC531J6i9ttBCj3zLmZI/BSF4q323YpK0GgKGk= +go.opentelemetry.io/collector/semconv v0.63.2-0.20221108014805-0b08d5316426/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/pulsarreceiver/pulsar_receiver.go b/receiver/pulsarreceiver/pulsar_receiver.go index 1826cffed418..838fa6bb4704 100644 --- a/receiver/pulsarreceiver/pulsar_receiver.go +++ b/receiver/pulsarreceiver/pulsar_receiver.go @@ -22,7 +22,6 @@ import ( "github.com/apache/pulsar-client-go/pulsar" "go.opentelemetry.io/collector/component" - "go.opentelemetry.io/collector/config" "go.opentelemetry.io/collector/consumer" "go.uber.org/zap" ) @@ -32,7 +31,7 @@ var errUnrecognizedEncoding = errors.New("unrecognized encoding") const alreadyClosedError = "AlreadyClosedError" type pulsarTracesConsumer struct { - id config.ComponentID + id component.ID tracesConsumer consumer.Traces topic string client pulsar.Client @@ -129,7 +128,7 @@ func (c *pulsarTracesConsumer) Shutdown(context.Context) error { } type pulsarMetricsConsumer struct { - id config.ComponentID + id component.ID metricsConsumer consumer.Metrics unmarshaler MetricsUnmarshaler topic string @@ -229,7 +228,7 @@ func (c *pulsarMetricsConsumer) Shutdown(context.Context) error { } type pulsarLogsConsumer struct { - id config.ComponentID + id component.ID logsConsumer consumer.Logs unmarshaler LogsUnmarshaler topic string diff --git a/receiver/rabbitmqreceiver/config_test.go b/receiver/rabbitmqreceiver/config_test.go index 5e9e95ff6ba7..deffefaabbee 100644 --- a/receiver/rabbitmqreceiver/config_test.go +++ b/receiver/rabbitmqreceiver/config_test.go @@ -22,7 +22,7 @@ import ( "time" "github.com/stretchr/testify/require" - "go.opentelemetry.io/collector/config" + "go.opentelemetry.io/collector/component" "go.opentelemetry.io/collector/config/confighttp" "go.opentelemetry.io/collector/confmap/confmaptest" "go.uber.org/multierr" @@ -119,9 +119,9 @@ func TestLoadConfig(t *testing.T) { factory := NewFactory() cfg := factory.CreateDefaultConfig() - sub, err := cm.Sub(config.NewComponentIDWithName(typeStr, "").String()) + sub, err := cm.Sub(component.NewIDWithName(typeStr, "").String()) require.NoError(t, err) - require.NoError(t, config.UnmarshalReceiver(sub, cfg)) + require.NoError(t, component.UnmarshalReceiverConfig(sub, cfg)) expected := factory.CreateDefaultConfig().(*Config) expected.Endpoint = "http://localhost:15672" diff --git a/receiver/rabbitmqreceiver/factory.go b/receiver/rabbitmqreceiver/factory.go index 33b2afc62f8b..0cc19df5c8d2 100644 --- a/receiver/rabbitmqreceiver/factory.go +++ b/receiver/rabbitmqreceiver/factory.go @@ -43,10 +43,10 @@ func NewFactory() component.ReceiverFactory { component.WithMetricsReceiver(createMetricsReceiver, stability)) } -func createDefaultConfig() config.Receiver { +func createDefaultConfig() component.ReceiverConfig { return &Config{ ScraperControllerSettings: scraperhelper.ScraperControllerSettings{ - ReceiverSettings: config.NewReceiverSettings(config.NewComponentID(typeStr)), + ReceiverSettings: config.NewReceiverSettings(component.NewID(typeStr)), CollectionInterval: 10 * time.Second, }, HTTPClientSettings: confighttp.HTTPClientSettings{ @@ -57,7 +57,7 @@ func createDefaultConfig() config.Receiver { } } -func createMetricsReceiver(ctx context.Context, params component.ReceiverCreateSettings, rConf config.Receiver, consumer consumer.Metrics) (component.MetricsReceiver, error) { +func createMetricsReceiver(ctx context.Context, params component.ReceiverCreateSettings, rConf component.ReceiverConfig, consumer consumer.Metrics) (component.MetricsReceiver, error) { cfg, ok := rConf.(*Config) if !ok { return nil, errConfigNotRabbit diff --git a/receiver/rabbitmqreceiver/factory_test.go b/receiver/rabbitmqreceiver/factory_test.go index 69c4784739ea..e24f4260e702 100644 --- a/receiver/rabbitmqreceiver/factory_test.go +++ b/receiver/rabbitmqreceiver/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/config" "go.opentelemetry.io/collector/config/confighttp" @@ -46,9 +47,9 @@ func TestNewFactory(t *testing.T) { testFunc: func(t *testing.T) { factory := NewFactory() - var expectedCfg config.Receiver = &Config{ + var expectedCfg component.ReceiverConfig = &Config{ ScraperControllerSettings: scraperhelper.ScraperControllerSettings{ - ReceiverSettings: config.NewReceiverSettings(config.NewComponentID(typeStr)), + ReceiverSettings: config.NewReceiverSettings(component.NewID(typeStr)), CollectionInterval: 10 * time.Second, }, HTTPClientSettings: confighttp.HTTPClientSettings{ diff --git a/receiver/rabbitmqreceiver/go.mod b/receiver/rabbitmqreceiver/go.mod index 7d085d5550aa..edcc6640f103 100644 --- a/receiver/rabbitmqreceiver/go.mod +++ b/receiver/rabbitmqreceiver/go.mod @@ -6,8 +6,8 @@ require ( github.com/open-telemetry/opentelemetry-collector-contrib/internal/scrapertest v0.63.0 github.com/stretchr/testify v1.8.1 github.com/testcontainers/testcontainers-go v0.15.0 - go.opentelemetry.io/collector v0.63.2-0.20221104003159-6b27644724d8 - go.opentelemetry.io/collector/pdata v0.63.2-0.20221104003159-6b27644724d8 + go.opentelemetry.io/collector v0.63.2-0.20221108014805-0b08d5316426 + go.opentelemetry.io/collector/pdata v0.63.2-0.20221108014805-0b08d5316426 go.uber.org/multierr v1.8.0 go.uber.org/zap v1.23.0 ) @@ -54,7 +54,7 @@ require ( github.com/rs/cors v1.8.2 // indirect github.com/sirupsen/logrus v1.8.1 // indirect github.com/stretchr/objx v0.5.0 // indirect - go.opencensus.io v0.23.0 // indirect + go.opencensus.io v0.24.0 // 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 77acb799494a..d66ca73aa84f 100644 --- a/receiver/rabbitmqreceiver/go.sum +++ b/receiver/rabbitmqreceiver/go.sum @@ -690,7 +690,7 @@ github.com/prometheus/client_golang v1.0.0/go.mod h1:db9x61etRT2tGnBNRi70OPL5Fsn github.com/prometheus/client_golang v1.1.0/go.mod h1:I1FGZT9+L76gKKOs5djB6ezCbFQP1xR9D75/vuwEF3g= github.com/prometheus/client_golang v1.7.1/go.mod h1:PY5Wy2awLA44sXw4AOSfFBetzPP4j5+D6mVACh+pe2M= github.com/prometheus/client_golang v1.11.1/go.mod h1:Z6t4BnS23TR94PD6BsDNk8yVqroYurpAkEiz0P2BEV0= -github.com/prometheus/client_golang v1.13.0 h1:b71QUfeo5M8gq2+evJdTPfZhYMAU0uKPkyPJ7TPsloU= +github.com/prometheus/client_golang v1.13.1 h1:3gMjIY2+/hzmqhtUC/aQNYldJA6DtH3CgQvwS+02K1c= github.com/prometheus/client_model v0.0.0-20171117100541-99fa1f4be8e5/go.mod h1:MbSGuTsp3dbXC40dX6PRTWyKYBIrTGTE9sqQNg2J8bo= github.com/prometheus/client_model v0.0.0-20180712105110-5c3871d89910/go.mod h1:MbSGuTsp3dbXC40dX6PRTWyKYBIrTGTE9sqQNg2J8bo= github.com/prometheus/client_model v0.0.0-20190129233127-fd36f4220a90/go.mod h1:xMI15A0UPsDsEKsMN9yxemIoYk6Tm2C1GtYGdfGttqA= @@ -827,12 +827,12 @@ go.opencensus.io v0.21.0/go.mod h1:mSImk1erAIZhrmZN+AvHh14ztQfjbGwt4TtuofqLduU= 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.23.0 h1:gqCw0LfLxScz8irSi8exQc7fyQ0fKQU/qnC/X8+V/1M= -go.opencensus.io v0.23.0/go.mod h1:XItmlyltB5F7CS4xOC1DcqMoFqwtC6OG2xF7mCv7P7E= -go.opentelemetry.io/collector v0.63.2-0.20221104003159-6b27644724d8 h1:rOT5HzXXfSISc6FiH012zH2/EFjp37UXfjEqj5BpkWQ= -go.opentelemetry.io/collector v0.63.2-0.20221104003159-6b27644724d8/go.mod h1:JVmeZXugK4ondC6KQgrHTHWiF4JttpG5k6dWPMt62+k= -go.opentelemetry.io/collector/pdata v0.63.2-0.20221104003159-6b27644724d8 h1:7xeTQjfsOm9eogQeIxjSEhlik9qsbBGsnmkQHfyKaRE= -go.opentelemetry.io/collector/pdata v0.63.2-0.20221104003159-6b27644724d8/go.mod h1:IzvXUGQml2mrnvdb8zIlEW3qQs9oFLdD2hLwJdZ+pek= +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.63.2-0.20221108014805-0b08d5316426 h1:z/wLTMh7/vNxcFUDa5uG7/IPE3tYx6pzCWPV41ghyV8= +go.opentelemetry.io/collector v0.63.2-0.20221108014805-0b08d5316426/go.mod h1:+Zb70q0Rq17dA9FcHTiTjW6g96lvJ8kAZ0c+eWNkAv0= +go.opentelemetry.io/collector/pdata v0.63.2-0.20221108014805-0b08d5316426 h1:wKDpgP0Tx/gWI2SgDGAY1OTSeihhDivbbRqFR79IGTc= +go.opentelemetry.io/collector/pdata v0.63.2-0.20221108014805-0b08d5316426/go.mod h1:IzvXUGQml2mrnvdb8zIlEW3qQs9oFLdD2hLwJdZ+pek= 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.go b/receiver/receivercreator/config.go index ffc03be3fa00..116386af58c9 100644 --- a/receiver/receivercreator/config.go +++ b/receiver/receivercreator/config.go @@ -18,6 +18,7 @@ import ( "fmt" "github.com/spf13/cast" + "go.opentelemetry.io/collector/component" "go.opentelemetry.io/collector/config" "go.opentelemetry.io/collector/confmap" @@ -36,7 +37,7 @@ const ( // receiverConfig describes a receiver instance with a default config. type receiverConfig struct { // id is the id of the subreceiver (ie /). - id config.ComponentID + id component.ID // config is the map configured by the user in the config file. It is the contents of the map from // the "config" section. The keys and values are arbitrarily configured by the user. config userConfigMap @@ -65,8 +66,8 @@ type resourceAttributes map[observer.EndpointType]map[string]string // newReceiverTemplate creates a receiverTemplate instance from the full name of a subreceiver // and its arbitrary config map values. func newReceiverTemplate(name string, cfg userConfigMap) (receiverTemplate, error) { - id, err := config.NewComponentIDFromString(name) - if err != nil { + id := component.ID{} + if err := id.UnmarshalText([]byte(name)); err != nil { return receiverTemplate{}, err } @@ -86,7 +87,7 @@ type Config struct { config.ReceiverSettings `mapstructure:",squash"` receiverTemplates map[string]receiverTemplate // WatchObservers are the extensions to listen to endpoints from. - WatchObservers []config.ComponentID `mapstructure:"watch_observers"` + WatchObservers []component.ID `mapstructure:"watch_observers"` // ResourceAttributes is a map of default resource attributes to add to each resource // object received by this receiver from dynamically created receivers. ResourceAttributes resourceAttributes `mapstructure:"resource_attributes"` diff --git a/receiver/receivercreator/config_test.go b/receiver/receivercreator/config_test.go index addcb3f40e22..e313126ac092 100644 --- a/receiver/receivercreator/config_test.go +++ b/receiver/receivercreator/config_test.go @@ -34,11 +34,11 @@ import ( type mockHostFactories struct { component.Host factories component.Factories - extensions map[config.ComponentID]component.Extension + extensions map[component.ID]component.Extension } // GetFactory of the specified kind. Returns the factory for a component type. -func (mh *mockHostFactories) GetFactory(kind component.Kind, componentType config.Type) component.Factory { +func (mh *mockHostFactories) GetFactory(kind component.Kind, componentType component.Type) component.Factory { switch kind { case component.KindReceiver: return mh.factories.Receivers[componentType] @@ -52,7 +52,7 @@ func (mh *mockHostFactories) GetFactory(kind component.Kind, componentType confi return nil } -func (mh *mockHostFactories) GetExtensions() map[config.ComponentID]component.Extension { +func (mh *mockHostFactories) GetExtensions() map[component.ID]component.Extension { return mh.extensions } @@ -63,21 +63,21 @@ func TestLoadConfig(t *testing.T) { require.NoError(t, err) tests := []struct { - id config.ComponentID - expected config.Receiver + id component.ID + expected component.ReceiverConfig }{ { - id: config.NewComponentIDWithName(typeStr, ""), + id: component.NewIDWithName(typeStr, ""), expected: createDefaultConfig(), }, { - id: config.NewComponentIDWithName(typeStr, "1"), + id: component.NewIDWithName(typeStr, "1"), expected: &Config{ - ReceiverSettings: config.NewReceiverSettings(config.NewComponentID(typeStr)), + ReceiverSettings: config.NewReceiverSettings(component.NewID(typeStr)), receiverTemplates: map[string]receiverTemplate{ "examplereceiver/1": { receiverConfig: receiverConfig{ - id: config.NewComponentIDWithName("examplereceiver", "1"), + id: component.NewIDWithName("examplereceiver", "1"), config: userConfigMap{ "key": "value", }, @@ -89,7 +89,7 @@ func TestLoadConfig(t *testing.T) { }, "nop/1": { receiverConfig: receiverConfig{ - id: config.NewComponentIDWithName("nop", "1"), + id: component.NewIDWithName("nop", "1"), config: userConfigMap{ endpointConfigKey: "localhost:12345", }, @@ -100,9 +100,9 @@ func TestLoadConfig(t *testing.T) { rule: newRuleOrPanic(`type == "port"`), }, }, - WatchObservers: []config.ComponentID{ - config.NewComponentID("mock_observer"), - config.NewComponentIDWithName("mock_observer", "with_name"), + WatchObservers: []component.ID{ + component.NewID("mock_observer"), + component.NewIDWithName("mock_observer", "with_name"), }, ResourceAttributes: map[observer.EndpointType]map[string]string{ observer.ContainerType: {"container.key": "container.value"}, @@ -122,7 +122,7 @@ func TestLoadConfig(t *testing.T) { sub, err := cm.Sub(tt.id.String()) require.NoError(t, err) - require.NoError(t, config.UnmarshalReceiver(sub, cfg)) + require.NoError(t, component.UnmarshalReceiverConfig(sub, cfg)) assert.NoError(t, cfg.Validate()) assert.Equal(t, tt.expected, cfg) @@ -171,9 +171,9 @@ type nopWithEndpointReceiver struct { component.ReceiverCreateSettings } -func (*nopWithEndpointFactory) CreateDefaultConfig() config.Receiver { +func (*nopWithEndpointFactory) CreateDefaultConfig() component.ReceiverConfig { return &nopWithEndpointConfig{ - ReceiverSettings: config.NewReceiverSettings(config.NewComponentID("nop")), + ReceiverSettings: config.NewReceiverSettings(component.NewID("nop")), } } @@ -185,7 +185,7 @@ type mockComponent struct { func (*nopWithEndpointFactory) CreateMetricsReceiver( ctx context.Context, rcs component.ReceiverCreateSettings, - _ config.Receiver, + _ component.ReceiverConfig, nextConsumer consumer.Metrics) (component.MetricsReceiver, error) { return &nopWithEndpointReceiver{ Component: mockComponent{}, diff --git a/receiver/receivercreator/factory.go b/receiver/receivercreator/factory.go index 59c9dda30a0a..be6d3e37635e 100644 --- a/receiver/receivercreator/factory.go +++ b/receiver/receivercreator/factory.go @@ -40,9 +40,9 @@ func NewFactory() component.ReceiverFactory { component.WithMetricsReceiver(createMetricsReceiver, stability)) } -func createDefaultConfig() config.Receiver { +func createDefaultConfig() component.ReceiverConfig { return &Config{ - ReceiverSettings: config.NewReceiverSettings(config.NewComponentID(typeStr)), + ReceiverSettings: config.NewReceiverSettings(component.NewID(typeStr)), ResourceAttributes: resourceAttributes{ observer.PodType: map[string]string{ conventions.AttributeK8SPodName: "`name`", @@ -70,7 +70,7 @@ func createDefaultConfig() config.Receiver { func createMetricsReceiver( ctx context.Context, params component.ReceiverCreateSettings, - cfg config.Receiver, + cfg component.ReceiverConfig, consumer consumer.Metrics, ) (component.MetricsReceiver, error) { return newReceiverCreator(params, cfg.(*Config), consumer) diff --git a/receiver/receivercreator/go.mod b/receiver/receivercreator/go.mod index 97acf2fad8c6..2f7b575e3432 100644 --- a/receiver/receivercreator/go.mod +++ b/receiver/receivercreator/go.mod @@ -9,9 +9,9 @@ require ( github.com/open-telemetry/opentelemetry-collector-contrib/pkg/translator/opencensus v0.63.0 github.com/spf13/cast v1.5.0 github.com/stretchr/testify v1.8.1 - go.opentelemetry.io/collector v0.63.2-0.20221104003159-6b27644724d8 - go.opentelemetry.io/collector/pdata v0.63.2-0.20221104003159-6b27644724d8 - go.opentelemetry.io/collector/semconv v0.63.2-0.20221104003159-6b27644724d8 + go.opentelemetry.io/collector v0.63.2-0.20221108014805-0b08d5316426 + go.opentelemetry.io/collector/pdata v0.63.2-0.20221108014805-0b08d5316426 + go.opentelemetry.io/collector/semconv v0.63.2-0.20221108014805-0b08d5316426 go.uber.org/multierr v1.8.0 go.uber.org/zap v1.23.0 ) @@ -43,7 +43,7 @@ require ( github.com/open-telemetry/opentelemetry-collector-contrib/internal/coreinternal v0.63.0 // indirect github.com/pmezard/go-difflib v1.0.0 // indirect github.com/power-devops/perfstat v0.0.0-20210106213030-5aafc221ea8c // indirect - github.com/prometheus/client_golang v1.13.0 // indirect + github.com/prometheus/client_golang v1.13.1 // indirect github.com/prometheus/client_model v0.3.0 // indirect github.com/prometheus/common v0.37.0 // indirect github.com/prometheus/procfs v0.8.0 // indirect @@ -55,8 +55,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.opencensus.io v0.23.0 // indirect - go.opentelemetry.io/collector/processor/batchprocessor v0.0.0-20221104003159-6b27644724d8 // indirect + go.opencensus.io v0.24.0 // indirect + go.opentelemetry.io/collector/processor/batchprocessor v0.0.0-20221108014805-0b08d5316426 // 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 a8c13baade18..bf0c04a8eebf 100644 --- a/receiver/receivercreator/go.sum +++ b/receiver/receivercreator/go.sum @@ -329,8 +329,9 @@ github.com/prometheus/client_golang v1.11.0/go.mod h1:Z6t4BnS23TR94PD6BsDNk8yVqr github.com/prometheus/client_golang v1.11.1/go.mod h1:Z6t4BnS23TR94PD6BsDNk8yVqroYurpAkEiz0P2BEV0= github.com/prometheus/client_golang v1.12.1/go.mod h1:3Z9XVyYiZYEO+YQWt3RD2R3jrbd179Rt297l4aS6nDY= github.com/prometheus/client_golang v1.12.2/go.mod h1:3Z9XVyYiZYEO+YQWt3RD2R3jrbd179Rt297l4aS6nDY= -github.com/prometheus/client_golang v1.13.0 h1:b71QUfeo5M8gq2+evJdTPfZhYMAU0uKPkyPJ7TPsloU= github.com/prometheus/client_golang v1.13.0/go.mod h1:vTeo+zgvILHsnnj/39Ou/1fPN5nJFOEMgftOUOmlvYQ= +github.com/prometheus/client_golang v1.13.1 h1:3gMjIY2+/hzmqhtUC/aQNYldJA6DtH3CgQvwS+02K1c= +github.com/prometheus/client_golang v1.13.1/go.mod h1:vTeo+zgvILHsnnj/39Ou/1fPN5nJFOEMgftOUOmlvYQ= github.com/prometheus/client_model v0.0.0-20180712105110-5c3871d89910/go.mod h1:MbSGuTsp3dbXC40dX6PRTWyKYBIrTGTE9sqQNg2J8bo= github.com/prometheus/client_model v0.0.0-20190129233127-fd36f4220a90/go.mod h1:xMI15A0UPsDsEKsMN9yxemIoYk6Tm2C1GtYGdfGttqA= github.com/prometheus/client_model v0.0.0-20190812154241-14fe0d1b01d4/go.mod h1:xMI15A0UPsDsEKsMN9yxemIoYk6Tm2C1GtYGdfGttqA= @@ -412,17 +413,18 @@ 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.opencensus.io v0.23.0 h1:gqCw0LfLxScz8irSi8exQc7fyQ0fKQU/qnC/X8+V/1M= go.opencensus.io v0.23.0/go.mod h1:XItmlyltB5F7CS4xOC1DcqMoFqwtC6OG2xF7mCv7P7E= -go.opentelemetry.io/collector v0.63.2-0.20221104003159-6b27644724d8 h1:rOT5HzXXfSISc6FiH012zH2/EFjp37UXfjEqj5BpkWQ= -go.opentelemetry.io/collector v0.63.2-0.20221104003159-6b27644724d8/go.mod h1:JVmeZXugK4ondC6KQgrHTHWiF4JttpG5k6dWPMt62+k= +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.63.2-0.20221108014805-0b08d5316426 h1:z/wLTMh7/vNxcFUDa5uG7/IPE3tYx6pzCWPV41ghyV8= +go.opentelemetry.io/collector v0.63.2-0.20221108014805-0b08d5316426/go.mod h1:+Zb70q0Rq17dA9FcHTiTjW6g96lvJ8kAZ0c+eWNkAv0= go.opentelemetry.io/collector/extension/zpagesextension v0.0.0-20221102221454-bfc45c16c979 h1:YW7BL8ftoJ7k+EtnMICw1KWASLuSDIhbF7SjjgWMCl4= -go.opentelemetry.io/collector/pdata v0.63.2-0.20221104003159-6b27644724d8 h1:7xeTQjfsOm9eogQeIxjSEhlik9qsbBGsnmkQHfyKaRE= -go.opentelemetry.io/collector/pdata v0.63.2-0.20221104003159-6b27644724d8/go.mod h1:IzvXUGQml2mrnvdb8zIlEW3qQs9oFLdD2hLwJdZ+pek= -go.opentelemetry.io/collector/processor/batchprocessor v0.0.0-20221104003159-6b27644724d8 h1:jgN7o3WfR8x++rjMcVM1VN6OJi4ytlGANXbwd73BPXo= -go.opentelemetry.io/collector/processor/batchprocessor v0.0.0-20221104003159-6b27644724d8/go.mod h1:WBv1Nayi8p12K0vxLxTkHpRGr79JXYT3TXL2X0B/PRU= -go.opentelemetry.io/collector/semconv v0.63.2-0.20221104003159-6b27644724d8 h1:jm0sNPyqo6S165QjQYMBHB2nK50wlJbMYM03Yr3Eo2k= -go.opentelemetry.io/collector/semconv v0.63.2-0.20221104003159-6b27644724d8/go.mod h1:5o9yhOa+ABt7g2E5JABDxGZ1PQPbtfxrKNbYn+LOTXU= +go.opentelemetry.io/collector/pdata v0.63.2-0.20221108014805-0b08d5316426 h1:wKDpgP0Tx/gWI2SgDGAY1OTSeihhDivbbRqFR79IGTc= +go.opentelemetry.io/collector/pdata v0.63.2-0.20221108014805-0b08d5316426/go.mod h1:IzvXUGQml2mrnvdb8zIlEW3qQs9oFLdD2hLwJdZ+pek= +go.opentelemetry.io/collector/processor/batchprocessor v0.0.0-20221108014805-0b08d5316426 h1:7f0NVsVGYT8pxAyk0qBBa8ZQf7athr/mfQ6QltGywN0= +go.opentelemetry.io/collector/processor/batchprocessor v0.0.0-20221108014805-0b08d5316426/go.mod h1:gpd5Q/3HlROMGYhnmwlFpUhcz8Xy80sokEcKs7c7zzE= +go.opentelemetry.io/collector/semconv v0.63.2-0.20221108014805-0b08d5316426 h1:pqIl7OC531J6i9ttBCj3zLmZI/BSF4q323YpK0GgKGk= +go.opentelemetry.io/collector/semconv v0.63.2-0.20221108014805-0b08d5316426/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/receivercreator/observerhandler_test.go b/receiver/receivercreator/observerhandler_test.go index 13007811e86a..b307ba5354bc 100644 --- a/receiver/receivercreator/observerhandler_test.go +++ b/receiver/receivercreator/observerhandler_test.go @@ -20,7 +20,6 @@ import ( "github.com/stretchr/testify/assert" "github.com/stretchr/testify/mock" "go.opentelemetry.io/collector/component" - "go.opentelemetry.io/collector/config" "go.opentelemetry.io/collector/consumer" "go.uber.org/zap" @@ -50,7 +49,7 @@ var _ runner = (*mockRunner)(nil) func TestOnAdd(t *testing.T) { runner := &mockRunner{} - rcvrCfg := receiverConfig{id: config.NewComponentIDWithName("name", "1"), config: userConfigMap{"foo": "bar"}, endpointID: portEndpoint.ID} + rcvrCfg := receiverConfig{id: component.NewIDWithName("name", "1"), config: userConfigMap{"foo": "bar"}, endpointID: portEndpoint.ID} cfg := createDefaultConfig().(*Config) cfg.receiverTemplates = map[string]receiverTemplate{ "name/1": {rcvrCfg, "", map[string]interface{}{}, newRuleOrPanic(`type == "port"`)}, @@ -100,7 +99,7 @@ func TestOnRemove(t *testing.T) { func TestOnChange(t *testing.T) { runner := &mockRunner{} - rcvrCfg := receiverConfig{id: config.NewComponentIDWithName("name", "1"), config: userConfigMap{"foo": "bar"}, endpointID: portEndpoint.ID} + rcvrCfg := receiverConfig{id: component.NewIDWithName("name", "1"), config: userConfigMap{"foo": "bar"}, endpointID: portEndpoint.ID} oldRcvr := &nopWithEndpointReceiver{} newRcvr := &nopWithEndpointReceiver{} cfg := createDefaultConfig().(*Config) @@ -136,7 +135,7 @@ func TestDynamicConfig(t *testing.T) { cfg := createDefaultConfig().(*Config) cfg.receiverTemplates = map[string]receiverTemplate{ "name/1": { - receiverConfig: receiverConfig{id: config.NewComponentIDWithName("name", "1"), config: userConfigMap{"endpoint": "`endpoint`:6379"}, endpointID: podEndpoint.ID}, + receiverConfig: receiverConfig{id: component.NewIDWithName("name", "1"), config: userConfigMap{"endpoint": "`endpoint`:6379"}, endpointID: podEndpoint.ID}, Rule: `type == "pod"`, rule: newRuleOrPanic("type == \"pod\""), }, @@ -150,7 +149,7 @@ func TestDynamicConfig(t *testing.T) { runner.On( "start", receiverConfig{ - id: config.NewComponentIDWithName("name", "1"), + id: component.NewIDWithName("name", "1"), config: userConfigMap{endpointConfigKey: "localhost:6379"}, endpointID: podEndpoint.ID, }, diff --git a/receiver/receivercreator/receiver.go b/receiver/receivercreator/receiver.go index 19d73d66f9d8..74f0b20e3d59 100644 --- a/receiver/receivercreator/receiver.go +++ b/receiver/receivercreator/receiver.go @@ -19,7 +19,6 @@ import ( "fmt" "go.opentelemetry.io/collector/component" - "go.opentelemetry.io/collector/config" "go.opentelemetry.io/collector/consumer" "go.uber.org/zap" @@ -78,7 +77,7 @@ func (rc *receiverCreator) Start(_ context.Context, host component.Host) error { }, } - observers := map[config.ComponentID]observer.Observable{} + observers := map[component.ID]observer.Observable{} // Match all configured observables to the extensions that are running. for _, watchObserver := range rc.cfg.WatchObservers { diff --git a/receiver/receivercreator/receiver_test.go b/receiver/receivercreator/receiver_test.go index 2c3ce6482ada..0cd3186b9675 100644 --- a/receiver/receivercreator/receiver_test.go +++ b/receiver/receivercreator/receiver_test.go @@ -29,8 +29,6 @@ import ( "github.com/stretchr/testify/require" "go.opentelemetry.io/collector/component" "go.opentelemetry.io/collector/component/componenttest" - "go.opentelemetry.io/collector/config" - "go.opentelemetry.io/collector/config/configtest" "go.opentelemetry.io/collector/confmap/confmaptest" "go.opentelemetry.io/collector/consumer/consumertest" "go.uber.org/zap" @@ -44,7 +42,7 @@ func TestCreateDefaultConfig(t *testing.T) { factory := NewFactory() cfg := factory.CreateDefaultConfig() assert.NotNil(t, cfg, "failed to create default config") - assert.NoError(t, configtest.CheckConfigStruct(cfg)) + assert.NoError(t, componenttest.CheckConfigStruct(cfg)) } type mockObserver struct { @@ -78,15 +76,15 @@ func TestMockedEndToEnd(t *testing.T) { factories.Receivers[typeStr] = factory host := &mockHostFactories{Host: componenttest.NewNopHost(), factories: factories} - host.extensions = map[config.ComponentID]component.Extension{ - config.NewComponentID("mock_observer"): &mockObserver{}, - config.NewComponentIDWithName("mock_observer", "with_name"): &mockObserver{}, + host.extensions = map[component.ID]component.Extension{ + component.NewID("mock_observer"): &mockObserver{}, + component.NewIDWithName("mock_observer", "with_name"): &mockObserver{}, } cfg := factory.CreateDefaultConfig() - sub, err := cm.Sub(config.NewComponentIDWithName(typeStr, "1").String()) + sub, err := cm.Sub(component.NewIDWithName(typeStr, "1").String()) require.NoError(t, err) - require.NoError(t, config.UnmarshalReceiver(sub, cfg)) + require.NoError(t, component.UnmarshalReceiverConfig(sub, cfg)) params := componenttest.NewNopReceiverCreateSettings() mockConsumer := new(consumertest.MetricsSink) diff --git a/receiver/receivercreator/runner.go b/receiver/receivercreator/runner.go index 9a08add789ad..3e910a23cc7e 100644 --- a/receiver/receivercreator/runner.go +++ b/receiver/receivercreator/runner.go @@ -20,7 +20,6 @@ import ( "github.com/spf13/cast" "go.opentelemetry.io/collector/component" - "go.opentelemetry.io/collector/config" "go.opentelemetry.io/collector/confmap" "go.opentelemetry.io/collector/consumer" "go.uber.org/zap" @@ -37,7 +36,7 @@ type runner interface { // receiverRunner handles starting/stopping of a concrete subreceiver instance. type receiverRunner struct { params component.ReceiverCreateSettings - idNamespace config.ComponentID + idNamespace component.ID host component.Host } @@ -84,7 +83,7 @@ func (run *receiverRunner) loadRuntimeReceiverConfig( factory component.ReceiverFactory, receiver receiverConfig, discoveredConfig userConfigMap, -) (config.Receiver, error) { +) (component.ReceiverConfig, error) { // Merge in the config values specified in the config file. mergedConfig := confmap.NewFromStringMap(receiver.config) @@ -96,7 +95,7 @@ func (run *receiverRunner) loadRuntimeReceiverConfig( receiverCfg := factory.CreateDefaultConfig() receiverCfg.SetIDName(receiver.id.Name()) - if err := config.UnmarshalReceiver(mergedConfig, receiverCfg); err != nil { + if err := component.UnmarshalReceiverConfig(mergedConfig, receiverCfg); err != nil { return nil, fmt.Errorf("failed to load template config: %w", err) } // Sets dynamically created receiver to something like receiver_creator/1/redis{endpoint="localhost:6380"}/. @@ -107,7 +106,7 @@ func (run *receiverRunner) loadRuntimeReceiverConfig( // createRuntimeReceiver creates a receiver that is discovered at runtime. func (run *receiverRunner) createRuntimeReceiver( factory component.ReceiverFactory, - cfg config.Receiver, + cfg component.ReceiverConfig, nextConsumer consumer.Metrics, ) (component.MetricsReceiver, error) { runParams := run.params diff --git a/receiver/receivercreator/runner_test.go b/receiver/receivercreator/runner_test.go index 13522e93484c..08f77134702d 100644 --- a/receiver/receivercreator/runner_test.go +++ b/receiver/receivercreator/runner_test.go @@ -19,8 +19,8 @@ import ( "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" + "go.opentelemetry.io/collector/component" "go.opentelemetry.io/collector/component/componenttest" - "go.opentelemetry.io/collector/config" "go.uber.org/zap" "go.uber.org/zap/zaptest/observer" ) @@ -30,7 +30,7 @@ func Test_loadAndCreateRuntimeReceiver(t *testing.T) { logger := zap.New(logCore).With(zap.String("name", "receiver_creator")) rcs := componenttest.NewNopReceiverCreateSettings() rcs.Logger = logger - run := &receiverRunner{params: rcs, idNamespace: config.NewComponentIDWithName(typeStr, "1")} + run := &receiverRunner{params: rcs, idNamespace: component.NewIDWithName(typeStr, "1")} exampleFactory := &nopWithEndpointFactory{} template, err := newReceiverTemplate("nop/1", nil) require.NoError(t, err) diff --git a/receiver/redisreceiver/config_test.go b/receiver/redisreceiver/config_test.go index 618f87b94f3a..1205be0f4d5f 100644 --- a/receiver/redisreceiver/config_test.go +++ b/receiver/redisreceiver/config_test.go @@ -21,6 +21,7 @@ import ( "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" + "go.opentelemetry.io/collector/component" "go.opentelemetry.io/collector/config" "go.opentelemetry.io/collector/config/confignet" "go.opentelemetry.io/collector/config/configtls" @@ -36,9 +37,9 @@ func TestConfig(t *testing.T) { factory := NewFactory() cfg := factory.CreateDefaultConfig() - sub, err := cm.Sub(config.NewComponentIDWithName(typeStr, "").String()) + sub, err := cm.Sub(component.NewIDWithName(typeStr, "").String()) require.NoError(t, err) - require.NoError(t, config.UnmarshalReceiver(sub, cfg)) + require.NoError(t, component.UnmarshalReceiverConfig(sub, cfg)) assert.Equal(t, &Config{ @@ -51,7 +52,7 @@ func TestConfig(t *testing.T) { }, Password: "test", ScraperControllerSettings: scraperhelper.ScraperControllerSettings{ - ReceiverSettings: config.NewReceiverSettings(config.NewComponentID(typeStr)), + ReceiverSettings: config.NewReceiverSettings(component.NewID(typeStr)), CollectionInterval: 10 * time.Second, }, Metrics: metadata.DefaultMetricsSettings(), diff --git a/receiver/redisreceiver/factory.go b/receiver/redisreceiver/factory.go index 8a63ce8b0750..e46f1d952bf7 100644 --- a/receiver/redisreceiver/factory.go +++ b/receiver/redisreceiver/factory.go @@ -19,7 +19,6 @@ import ( "time" "go.opentelemetry.io/collector/component" - "go.opentelemetry.io/collector/config" "go.opentelemetry.io/collector/config/confignet" "go.opentelemetry.io/collector/config/configtls" "go.opentelemetry.io/collector/consumer" @@ -41,7 +40,7 @@ func NewFactory() component.ReceiverFactory { component.WithMetricsReceiver(createMetricsReceiver, stability)) } -func createDefaultConfig() config.Receiver { +func createDefaultConfig() component.ReceiverConfig { scs := scraperhelper.NewDefaultScraperControllerSettings(typeStr) scs.CollectionInterval = 10 * time.Second return &Config{ @@ -59,7 +58,7 @@ func createDefaultConfig() config.Receiver { func createMetricsReceiver( ctx context.Context, set component.ReceiverCreateSettings, - cfg config.Receiver, + cfg component.ReceiverConfig, consumer consumer.Metrics, ) (component.MetricsReceiver, error) { oCfg := cfg.(*Config) diff --git a/receiver/redisreceiver/go.mod b/receiver/redisreceiver/go.mod index a42b4bf6623a..7844a8164a2a 100644 --- a/receiver/redisreceiver/go.mod +++ b/receiver/redisreceiver/go.mod @@ -6,8 +6,8 @@ require ( github.com/go-redis/redis/v7 v7.4.1 github.com/open-telemetry/opentelemetry-collector-contrib/internal/containertest v0.63.0 github.com/stretchr/testify v1.8.1 - go.opentelemetry.io/collector v0.63.2-0.20221104003159-6b27644724d8 - go.opentelemetry.io/collector/pdata v0.63.2-0.20221104003159-6b27644724d8 + go.opentelemetry.io/collector v0.63.2-0.20221108014805-0b08d5316426 + go.opentelemetry.io/collector/pdata v0.63.2-0.20221108014805-0b08d5316426 go.uber.org/zap v1.23.0 ) @@ -39,7 +39,7 @@ require ( github.com/pkg/errors v0.9.1 // indirect github.com/pmezard/go-difflib v1.0.0 // indirect github.com/sirupsen/logrus v1.8.1 // indirect - go.opencensus.io v0.23.0 // indirect + go.opencensus.io v0.24.0 // 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 2d21ed42830c..901125246181 100644 --- a/receiver/redisreceiver/go.sum +++ b/receiver/redisreceiver/go.sum @@ -270,7 +270,7 @@ github.com/prometheus/client_golang v0.9.1/go.mod h1:7SWBe2y4D6OKWSNQJUaRYU/AaXP github.com/prometheus/client_golang v1.0.0/go.mod h1:db9x61etRT2tGnBNRi70OPL5FsnadC4Ky3P0J6CfImo= github.com/prometheus/client_golang v1.7.1/go.mod h1:PY5Wy2awLA44sXw4AOSfFBetzPP4j5+D6mVACh+pe2M= github.com/prometheus/client_golang v1.11.1/go.mod h1:Z6t4BnS23TR94PD6BsDNk8yVqroYurpAkEiz0P2BEV0= -github.com/prometheus/client_golang v1.13.0 h1:b71QUfeo5M8gq2+evJdTPfZhYMAU0uKPkyPJ7TPsloU= +github.com/prometheus/client_golang v1.13.1 h1:3gMjIY2+/hzmqhtUC/aQNYldJA6DtH3CgQvwS+02K1c= github.com/prometheus/client_model v0.0.0-20180712105110-5c3871d89910/go.mod h1:MbSGuTsp3dbXC40dX6PRTWyKYBIrTGTE9sqQNg2J8bo= github.com/prometheus/client_model v0.0.0-20190129233127-fd36f4220a90/go.mod h1:xMI15A0UPsDsEKsMN9yxemIoYk6Tm2C1GtYGdfGttqA= github.com/prometheus/client_model v0.0.0-20190812154241-14fe0d1b01d4/go.mod h1:xMI15A0UPsDsEKsMN9yxemIoYk6Tm2C1GtYGdfGttqA= @@ -312,7 +312,6 @@ github.com/stretchr/testify v1.2.2/go.mod h1:a8OnRcib4nhh0OaRAV+Yts87kKdq0PP7pXf github.com/stretchr/testify v1.3.0/go.mod h1:M5WIy9Dh21IEIfnGCwXGc5bZfKNJtfHm1UVUgZn+9EI= github.com/stretchr/testify v1.4.0/go.mod h1:j7eGeouHqKxXV5pUuKE4zz7dFj8WfuZ+81PSLYec5m4= github.com/stretchr/testify v1.5.1/go.mod h1:5W2xD1RspED5o8YsWQXVCued0rvSQ+mT+I5cxcmMvtA= -github.com/stretchr/testify v1.6.1/go.mod h1:6Fq8oRcR53rry900zMqJjRRixrwX3KX962/h/Wwjteg= github.com/stretchr/testify v1.7.0/go.mod h1:6Fq8oRcR53rry900zMqJjRRixrwX3KX962/h/Wwjteg= github.com/stretchr/testify v1.7.1/go.mod h1:6Fq8oRcR53rry900zMqJjRRixrwX3KX962/h/Wwjteg= github.com/stretchr/testify v1.8.0/go.mod h1:yNjHg4UonilssWZ8iaSj1OCr/vHnekPRkoO+kdMU+MU= @@ -324,12 +323,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.opencensus.io v0.23.0 h1:gqCw0LfLxScz8irSi8exQc7fyQ0fKQU/qnC/X8+V/1M= -go.opencensus.io v0.23.0/go.mod h1:XItmlyltB5F7CS4xOC1DcqMoFqwtC6OG2xF7mCv7P7E= -go.opentelemetry.io/collector v0.63.2-0.20221104003159-6b27644724d8 h1:rOT5HzXXfSISc6FiH012zH2/EFjp37UXfjEqj5BpkWQ= -go.opentelemetry.io/collector v0.63.2-0.20221104003159-6b27644724d8/go.mod h1:JVmeZXugK4ondC6KQgrHTHWiF4JttpG5k6dWPMt62+k= -go.opentelemetry.io/collector/pdata v0.63.2-0.20221104003159-6b27644724d8 h1:7xeTQjfsOm9eogQeIxjSEhlik9qsbBGsnmkQHfyKaRE= -go.opentelemetry.io/collector/pdata v0.63.2-0.20221104003159-6b27644724d8/go.mod h1:IzvXUGQml2mrnvdb8zIlEW3qQs9oFLdD2hLwJdZ+pek= +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.63.2-0.20221108014805-0b08d5316426 h1:z/wLTMh7/vNxcFUDa5uG7/IPE3tYx6pzCWPV41ghyV8= +go.opentelemetry.io/collector v0.63.2-0.20221108014805-0b08d5316426/go.mod h1:+Zb70q0Rq17dA9FcHTiTjW6g96lvJ8kAZ0c+eWNkAv0= +go.opentelemetry.io/collector/pdata v0.63.2-0.20221108014805-0b08d5316426 h1:wKDpgP0Tx/gWI2SgDGAY1OTSeihhDivbbRqFR79IGTc= +go.opentelemetry.io/collector/pdata v0.63.2-0.20221108014805-0b08d5316426/go.mod h1:IzvXUGQml2mrnvdb8zIlEW3qQs9oFLdD2hLwJdZ+pek= 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/factory.go b/receiver/riakreceiver/factory.go index e1304d2a54a5..e04a48656916 100644 --- a/receiver/riakreceiver/factory.go +++ b/receiver/riakreceiver/factory.go @@ -43,10 +43,10 @@ func NewFactory() component.ReceiverFactory { component.WithMetricsReceiver(createMetricsReceiver, stability)) } -func createDefaultConfig() config.Receiver { +func createDefaultConfig() component.ReceiverConfig { return &Config{ ScraperControllerSettings: scraperhelper.ScraperControllerSettings{ - ReceiverSettings: config.NewReceiverSettings(config.NewComponentID(typeStr)), + ReceiverSettings: config.NewReceiverSettings(component.NewID(typeStr)), CollectionInterval: 10 * time.Second, }, HTTPClientSettings: confighttp.HTTPClientSettings{ @@ -57,7 +57,7 @@ func createDefaultConfig() config.Receiver { } } -func createMetricsReceiver(ctx context.Context, params component.ReceiverCreateSettings, rConf config.Receiver, consumer consumer.Metrics) (component.MetricsReceiver, error) { +func createMetricsReceiver(ctx context.Context, params component.ReceiverCreateSettings, rConf component.ReceiverConfig, consumer consumer.Metrics) (component.MetricsReceiver, error) { cfg, ok := rConf.(*Config) if !ok { return nil, errConfigNotRiak diff --git a/receiver/riakreceiver/factory_test.go b/receiver/riakreceiver/factory_test.go index b112e8609238..4973eb713db3 100644 --- a/receiver/riakreceiver/factory_test.go +++ b/receiver/riakreceiver/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/config" "go.opentelemetry.io/collector/config/confighttp" @@ -46,9 +47,9 @@ func TestNewFactory(t *testing.T) { testFunc: func(t *testing.T) { factory := NewFactory() - var expectedCfg config.Receiver = &Config{ + var expectedCfg component.ReceiverConfig = &Config{ ScraperControllerSettings: scraperhelper.ScraperControllerSettings{ - ReceiverSettings: config.NewReceiverSettings(config.NewComponentID(typeStr)), + ReceiverSettings: config.NewReceiverSettings(component.NewID(typeStr)), CollectionInterval: 10 * time.Second, }, HTTPClientSettings: confighttp.HTTPClientSettings{ diff --git a/receiver/riakreceiver/go.mod b/receiver/riakreceiver/go.mod index 4dab08b50393..22f2f9f34fc1 100644 --- a/receiver/riakreceiver/go.mod +++ b/receiver/riakreceiver/go.mod @@ -3,7 +3,7 @@ module github.com/open-telemetry/opentelemetry-collector-contrib/receiver/riakre go 1.18 require ( - go.opentelemetry.io/collector v0.63.2-0.20221104003159-6b27644724d8 + go.opentelemetry.io/collector v0.63.2-0.20221108014805-0b08d5316426 go.uber.org/multierr v1.8.0 go.uber.org/zap v1.23.0 ) @@ -13,7 +13,7 @@ require github.com/stretchr/testify v1.8.1 require ( github.com/open-telemetry/opentelemetry-collector-contrib/internal/scrapertest v0.63.0 github.com/testcontainers/testcontainers-go v0.15.0 - go.opentelemetry.io/collector/pdata v0.63.2-0.20221104003159-6b27644724d8 + go.opentelemetry.io/collector/pdata v0.63.2-0.20221108014805-0b08d5316426 ) require ( @@ -58,7 +58,7 @@ require ( github.com/rs/cors v1.8.2 // indirect github.com/sirupsen/logrus v1.8.1 // indirect github.com/stretchr/objx v0.5.0 // indirect - go.opencensus.io v0.23.0 // indirect + go.opencensus.io v0.24.0 // 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 77acb799494a..d66ca73aa84f 100644 --- a/receiver/riakreceiver/go.sum +++ b/receiver/riakreceiver/go.sum @@ -690,7 +690,7 @@ github.com/prometheus/client_golang v1.0.0/go.mod h1:db9x61etRT2tGnBNRi70OPL5Fsn github.com/prometheus/client_golang v1.1.0/go.mod h1:I1FGZT9+L76gKKOs5djB6ezCbFQP1xR9D75/vuwEF3g= github.com/prometheus/client_golang v1.7.1/go.mod h1:PY5Wy2awLA44sXw4AOSfFBetzPP4j5+D6mVACh+pe2M= github.com/prometheus/client_golang v1.11.1/go.mod h1:Z6t4BnS23TR94PD6BsDNk8yVqroYurpAkEiz0P2BEV0= -github.com/prometheus/client_golang v1.13.0 h1:b71QUfeo5M8gq2+evJdTPfZhYMAU0uKPkyPJ7TPsloU= +github.com/prometheus/client_golang v1.13.1 h1:3gMjIY2+/hzmqhtUC/aQNYldJA6DtH3CgQvwS+02K1c= github.com/prometheus/client_model v0.0.0-20171117100541-99fa1f4be8e5/go.mod h1:MbSGuTsp3dbXC40dX6PRTWyKYBIrTGTE9sqQNg2J8bo= github.com/prometheus/client_model v0.0.0-20180712105110-5c3871d89910/go.mod h1:MbSGuTsp3dbXC40dX6PRTWyKYBIrTGTE9sqQNg2J8bo= github.com/prometheus/client_model v0.0.0-20190129233127-fd36f4220a90/go.mod h1:xMI15A0UPsDsEKsMN9yxemIoYk6Tm2C1GtYGdfGttqA= @@ -827,12 +827,12 @@ go.opencensus.io v0.21.0/go.mod h1:mSImk1erAIZhrmZN+AvHh14ztQfjbGwt4TtuofqLduU= 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.23.0 h1:gqCw0LfLxScz8irSi8exQc7fyQ0fKQU/qnC/X8+V/1M= -go.opencensus.io v0.23.0/go.mod h1:XItmlyltB5F7CS4xOC1DcqMoFqwtC6OG2xF7mCv7P7E= -go.opentelemetry.io/collector v0.63.2-0.20221104003159-6b27644724d8 h1:rOT5HzXXfSISc6FiH012zH2/EFjp37UXfjEqj5BpkWQ= -go.opentelemetry.io/collector v0.63.2-0.20221104003159-6b27644724d8/go.mod h1:JVmeZXugK4ondC6KQgrHTHWiF4JttpG5k6dWPMt62+k= -go.opentelemetry.io/collector/pdata v0.63.2-0.20221104003159-6b27644724d8 h1:7xeTQjfsOm9eogQeIxjSEhlik9qsbBGsnmkQHfyKaRE= -go.opentelemetry.io/collector/pdata v0.63.2-0.20221104003159-6b27644724d8/go.mod h1:IzvXUGQml2mrnvdb8zIlEW3qQs9oFLdD2hLwJdZ+pek= +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.63.2-0.20221108014805-0b08d5316426 h1:z/wLTMh7/vNxcFUDa5uG7/IPE3tYx6pzCWPV41ghyV8= +go.opentelemetry.io/collector v0.63.2-0.20221108014805-0b08d5316426/go.mod h1:+Zb70q0Rq17dA9FcHTiTjW6g96lvJ8kAZ0c+eWNkAv0= +go.opentelemetry.io/collector/pdata v0.63.2-0.20221108014805-0b08d5316426 h1:wKDpgP0Tx/gWI2SgDGAY1OTSeihhDivbbRqFR79IGTc= +go.opentelemetry.io/collector/pdata v0.63.2-0.20221108014805-0b08d5316426/go.mod h1:IzvXUGQml2mrnvdb8zIlEW3qQs9oFLdD2hLwJdZ+pek= 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 960922e52112..32fd99d512bf 100644 --- a/receiver/saphanareceiver/config_test.go +++ b/receiver/saphanareceiver/config_test.go @@ -23,6 +23,7 @@ import ( "github.com/google/go-cmp/cmp" "github.com/google/go-cmp/cmp/cmpopts" "github.com/stretchr/testify/require" + "go.opentelemetry.io/collector/component" "go.opentelemetry.io/collector/config" "go.opentelemetry.io/collector/confmap/confmaptest" "go.uber.org/multierr" @@ -89,9 +90,9 @@ func TestLoadConfig(t *testing.T) { factory := NewFactory() cfg := factory.CreateDefaultConfig() - sub, err := cm.Sub(config.NewComponentIDWithName(typeStr, "").String()) + sub, err := cm.Sub(component.NewIDWithName(typeStr, "").String()) require.NoError(t, err) - require.NoError(t, config.UnmarshalReceiver(sub, cfg)) + require.NoError(t, component.UnmarshalReceiverConfig(sub, cfg)) expected := factory.CreateDefaultConfig().(*Config) expected.Metrics = metadata.DefaultMetricsSettings() diff --git a/receiver/saphanareceiver/factory.go b/receiver/saphanareceiver/factory.go index 327f31cfea4a..e403ad80c4c4 100644 --- a/receiver/saphanareceiver/factory.go +++ b/receiver/saphanareceiver/factory.go @@ -20,7 +20,6 @@ import ( "time" "go.opentelemetry.io/collector/component" - "go.opentelemetry.io/collector/config" "go.opentelemetry.io/collector/config/confignet" "go.opentelemetry.io/collector/config/configtls" "go.opentelemetry.io/collector/consumer" @@ -43,7 +42,7 @@ func NewFactory() component.ReceiverFactory { component.WithMetricsReceiver(createMetricsReceiver, stability)) } -func createDefaultConfig() config.Receiver { +func createDefaultConfig() component.ReceiverConfig { scs := scraperhelper.NewDefaultScraperControllerSettings(typeStr) scs.CollectionInterval = 10 * time.Second return &Config{ @@ -63,7 +62,7 @@ var errConfigNotSAPHANA = errors.New("config was not an sap hana receiver config func createMetricsReceiver( ctx context.Context, set component.ReceiverCreateSettings, - cfg config.Receiver, + cfg component.ReceiverConfig, consumer consumer.Metrics, ) (component.MetricsReceiver, error) { c, ok := cfg.(*Config) diff --git a/receiver/saphanareceiver/factory_test.go b/receiver/saphanareceiver/factory_test.go index a00ccb15d3a1..7fe15e0f6603 100644 --- a/receiver/saphanareceiver/factory_test.go +++ b/receiver/saphanareceiver/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/config" "go.opentelemetry.io/collector/consumer/consumertest" @@ -47,7 +48,7 @@ func TestCreateMetricsReceiver(t *testing.T) { componenttest.NewNopReceiverCreateSettings(), &Config{ ScraperControllerSettings: scraperhelper.ScraperControllerSettings{ - ReceiverSettings: config.NewReceiverSettings(config.NewComponentID("saphana")), + ReceiverSettings: config.NewReceiverSettings(component.NewID("saphana")), CollectionInterval: 10 * time.Second, }, Username: "otel", diff --git a/receiver/saphanareceiver/go.mod b/receiver/saphanareceiver/go.mod index 5e392b279684..d6954199de5e 100644 --- a/receiver/saphanareceiver/go.mod +++ b/receiver/saphanareceiver/go.mod @@ -7,8 +7,8 @@ require ( github.com/google/go-cmp v0.5.9 github.com/open-telemetry/opentelemetry-collector-contrib/internal/scrapertest v0.63.0 github.com/stretchr/testify v1.8.1 - go.opentelemetry.io/collector v0.63.2-0.20221104003159-6b27644724d8 - go.opentelemetry.io/collector/pdata v0.63.2-0.20221104003159-6b27644724d8 + go.opentelemetry.io/collector v0.63.2-0.20221108014805-0b08d5316426 + go.opentelemetry.io/collector/pdata v0.63.2-0.20221108014805-0b08d5316426 go.uber.org/multierr v1.8.0 ) @@ -29,7 +29,7 @@ require ( github.com/pmezard/go-difflib v1.0.0 // indirect github.com/rogpeppe/go-internal v1.6.1 // indirect github.com/stretchr/objx v0.5.0 // indirect - go.opencensus.io v0.23.0 // indirect + go.opencensus.io v0.24.0 // 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 cd322ad7a140..cf9d189e39c0 100644 --- a/receiver/saphanareceiver/go.sum +++ b/receiver/saphanareceiver/go.sum @@ -234,7 +234,7 @@ github.com/prometheus/client_golang v0.9.1/go.mod h1:7SWBe2y4D6OKWSNQJUaRYU/AaXP github.com/prometheus/client_golang v1.0.0/go.mod h1:db9x61etRT2tGnBNRi70OPL5FsnadC4Ky3P0J6CfImo= github.com/prometheus/client_golang v1.7.1/go.mod h1:PY5Wy2awLA44sXw4AOSfFBetzPP4j5+D6mVACh+pe2M= github.com/prometheus/client_golang v1.11.1/go.mod h1:Z6t4BnS23TR94PD6BsDNk8yVqroYurpAkEiz0P2BEV0= -github.com/prometheus/client_golang v1.13.0 h1:b71QUfeo5M8gq2+evJdTPfZhYMAU0uKPkyPJ7TPsloU= +github.com/prometheus/client_golang v1.13.1 h1:3gMjIY2+/hzmqhtUC/aQNYldJA6DtH3CgQvwS+02K1c= github.com/prometheus/client_model v0.0.0-20180712105110-5c3871d89910/go.mod h1:MbSGuTsp3dbXC40dX6PRTWyKYBIrTGTE9sqQNg2J8bo= github.com/prometheus/client_model v0.0.0-20190129233127-fd36f4220a90/go.mod h1:xMI15A0UPsDsEKsMN9yxemIoYk6Tm2C1GtYGdfGttqA= github.com/prometheus/client_model v0.0.0-20190812154241-14fe0d1b01d4/go.mod h1:xMI15A0UPsDsEKsMN9yxemIoYk6Tm2C1GtYGdfGttqA= @@ -273,7 +273,6 @@ github.com/stretchr/testify v1.2.2/go.mod h1:a8OnRcib4nhh0OaRAV+Yts87kKdq0PP7pXf github.com/stretchr/testify v1.3.0/go.mod h1:M5WIy9Dh21IEIfnGCwXGc5bZfKNJtfHm1UVUgZn+9EI= github.com/stretchr/testify v1.4.0/go.mod h1:j7eGeouHqKxXV5pUuKE4zz7dFj8WfuZ+81PSLYec5m4= github.com/stretchr/testify v1.5.1/go.mod h1:5W2xD1RspED5o8YsWQXVCued0rvSQ+mT+I5cxcmMvtA= -github.com/stretchr/testify v1.6.1/go.mod h1:6Fq8oRcR53rry900zMqJjRRixrwX3KX962/h/Wwjteg= github.com/stretchr/testify v1.7.0/go.mod h1:6Fq8oRcR53rry900zMqJjRRixrwX3KX962/h/Wwjteg= github.com/stretchr/testify v1.7.1/go.mod h1:6Fq8oRcR53rry900zMqJjRRixrwX3KX962/h/Wwjteg= github.com/stretchr/testify v1.8.0/go.mod h1:yNjHg4UonilssWZ8iaSj1OCr/vHnekPRkoO+kdMU+MU= @@ -285,12 +284,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.opencensus.io v0.23.0 h1:gqCw0LfLxScz8irSi8exQc7fyQ0fKQU/qnC/X8+V/1M= -go.opencensus.io v0.23.0/go.mod h1:XItmlyltB5F7CS4xOC1DcqMoFqwtC6OG2xF7mCv7P7E= -go.opentelemetry.io/collector v0.63.2-0.20221104003159-6b27644724d8 h1:rOT5HzXXfSISc6FiH012zH2/EFjp37UXfjEqj5BpkWQ= -go.opentelemetry.io/collector v0.63.2-0.20221104003159-6b27644724d8/go.mod h1:JVmeZXugK4ondC6KQgrHTHWiF4JttpG5k6dWPMt62+k= -go.opentelemetry.io/collector/pdata v0.63.2-0.20221104003159-6b27644724d8 h1:7xeTQjfsOm9eogQeIxjSEhlik9qsbBGsnmkQHfyKaRE= -go.opentelemetry.io/collector/pdata v0.63.2-0.20221104003159-6b27644724d8/go.mod h1:IzvXUGQml2mrnvdb8zIlEW3qQs9oFLdD2hLwJdZ+pek= +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.63.2-0.20221108014805-0b08d5316426 h1:z/wLTMh7/vNxcFUDa5uG7/IPE3tYx6pzCWPV41ghyV8= +go.opentelemetry.io/collector v0.63.2-0.20221108014805-0b08d5316426/go.mod h1:+Zb70q0Rq17dA9FcHTiTjW6g96lvJ8kAZ0c+eWNkAv0= +go.opentelemetry.io/collector/pdata v0.63.2-0.20221108014805-0b08d5316426 h1:wKDpgP0Tx/gWI2SgDGAY1OTSeihhDivbbRqFR79IGTc= +go.opentelemetry.io/collector/pdata v0.63.2-0.20221108014805-0b08d5316426/go.mod h1:IzvXUGQml2mrnvdb8zIlEW3qQs9oFLdD2hLwJdZ+pek= 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 29dfeb0f5b68..cf3da3f49bf1 100644 --- a/receiver/sapmreceiver/config_test.go +++ b/receiver/sapmreceiver/config_test.go @@ -20,6 +20,7 @@ import ( "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" + "go.opentelemetry.io/collector/component" "go.opentelemetry.io/collector/config" "go.opentelemetry.io/collector/config/confighttp" "go.opentelemetry.io/collector/config/configtls" @@ -35,26 +36,26 @@ func TestLoadConfig(t *testing.T) { require.NoError(t, err) tests := []struct { - id config.ComponentID - expected config.Receiver + id component.ID + expected component.ReceiverConfig }{ { - id: config.NewComponentIDWithName(typeStr, ""), + id: component.NewIDWithName(typeStr, ""), expected: createDefaultConfig(), }, { - id: config.NewComponentIDWithName(typeStr, "customname"), + id: component.NewIDWithName(typeStr, "customname"), expected: &Config{ - ReceiverSettings: config.NewReceiverSettings(config.NewComponentID(typeStr)), + ReceiverSettings: config.NewReceiverSettings(component.NewID(typeStr)), HTTPServerSettings: confighttp.HTTPServerSettings{ Endpoint: "0.0.0.0:7276", }, }, }, { - id: config.NewComponentIDWithName(typeStr, "tls"), + id: component.NewIDWithName(typeStr, "tls"), expected: &Config{ - ReceiverSettings: config.NewReceiverSettings(config.NewComponentID(typeStr)), + ReceiverSettings: config.NewReceiverSettings(component.NewID(typeStr)), HTTPServerSettings: confighttp.HTTPServerSettings{ Endpoint: ":7276", TLSSetting: &configtls.TLSServerSetting{ @@ -67,9 +68,9 @@ func TestLoadConfig(t *testing.T) { }, }, { - id: config.NewComponentIDWithName(typeStr, "passthrough"), + id: component.NewIDWithName(typeStr, "passthrough"), expected: &Config{ - ReceiverSettings: config.NewReceiverSettings(config.NewComponentID(typeStr)), + ReceiverSettings: config.NewReceiverSettings(component.NewID(typeStr)), HTTPServerSettings: confighttp.HTTPServerSettings{ Endpoint: ":7276", }, @@ -87,7 +88,7 @@ func TestLoadConfig(t *testing.T) { sub, err := cm.Sub(tt.id.String()) require.NoError(t, err) - require.NoError(t, config.UnmarshalReceiver(sub, cfg)) + require.NoError(t, component.UnmarshalReceiverConfig(sub, cfg)) assert.NoError(t, cfg.Validate()) assert.Equal(t, tt.expected, cfg) diff --git a/receiver/sapmreceiver/factory.go b/receiver/sapmreceiver/factory.go index b7914fdd95c9..2b631d257399 100644 --- a/receiver/sapmreceiver/factory.go +++ b/receiver/sapmreceiver/factory.go @@ -46,9 +46,9 @@ func NewFactory() component.ReceiverFactory { component.WithTracesReceiver(createTracesReceiver, stability)) } -func createDefaultConfig() config.Receiver { +func createDefaultConfig() component.ReceiverConfig { return &Config{ - ReceiverSettings: config.NewReceiverSettings(config.NewComponentID(typeStr)), + ReceiverSettings: config.NewReceiverSettings(component.NewID(typeStr)), HTTPServerSettings: confighttp.HTTPServerSettings{ Endpoint: defaultEndpoint, }, @@ -86,7 +86,7 @@ func (rCfg *Config) validate() error { func createTracesReceiver( _ context.Context, params component.ReceiverCreateSettings, - cfg config.Receiver, + cfg component.ReceiverConfig, nextConsumer consumer.Traces, ) (component.TracesReceiver, error) { // assert config is SAPM config diff --git a/receiver/sapmreceiver/factory_test.go b/receiver/sapmreceiver/factory_test.go index 706044474f55..4788ef91cef2 100644 --- a/receiver/sapmreceiver/factory_test.go +++ b/receiver/sapmreceiver/factory_test.go @@ -21,14 +21,13 @@ import ( "github.com/stretchr/testify/assert" "go.opentelemetry.io/collector/component" "go.opentelemetry.io/collector/component/componenttest" - "go.opentelemetry.io/collector/config/configtest" ) func TestCreateDefaultConfig(t *testing.T) { factory := NewFactory() cfg := factory.CreateDefaultConfig() assert.NotNil(t, cfg, "failed to create default config") - assert.NoError(t, configtest.CheckConfigStruct(cfg)) + assert.NoError(t, componenttest.CheckConfigStruct(cfg)) } func TestCreateReceiver(t *testing.T) { diff --git a/receiver/sapmreceiver/go.mod b/receiver/sapmreceiver/go.mod index 4ba8eb9d8267..7fb5c5c8fef8 100644 --- a/receiver/sapmreceiver/go.mod +++ b/receiver/sapmreceiver/go.mod @@ -10,9 +10,9 @@ require ( github.com/open-telemetry/opentelemetry-collector-contrib/pkg/translator/jaeger v0.63.0 github.com/signalfx/sapm-proto v0.12.0 github.com/stretchr/testify v1.8.1 - go.opentelemetry.io/collector v0.63.2-0.20221104003159-6b27644724d8 - go.opentelemetry.io/collector/pdata v0.63.2-0.20221104003159-6b27644724d8 - go.opentelemetry.io/collector/semconv v0.63.2-0.20221104003159-6b27644724d8 + go.opentelemetry.io/collector v0.63.2-0.20221108014805-0b08d5316426 + go.opentelemetry.io/collector/pdata v0.63.2-0.20221108014805-0b08d5316426 + go.opentelemetry.io/collector/semconv v0.63.2-0.20221108014805-0b08d5316426 ) require ( @@ -39,7 +39,7 @@ require ( github.com/rs/cors v1.8.2 // indirect 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.23.0 // indirect + go.opencensus.io v0.24.0 // 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 118bc4420f8a..f0a14e997dd2 100644 --- a/receiver/sapmreceiver/go.sum +++ b/receiver/sapmreceiver/go.sum @@ -242,7 +242,7 @@ github.com/prometheus/client_golang v0.9.1/go.mod h1:7SWBe2y4D6OKWSNQJUaRYU/AaXP github.com/prometheus/client_golang v1.0.0/go.mod h1:db9x61etRT2tGnBNRi70OPL5FsnadC4Ky3P0J6CfImo= github.com/prometheus/client_golang v1.7.1/go.mod h1:PY5Wy2awLA44sXw4AOSfFBetzPP4j5+D6mVACh+pe2M= github.com/prometheus/client_golang v1.11.1/go.mod h1:Z6t4BnS23TR94PD6BsDNk8yVqroYurpAkEiz0P2BEV0= -github.com/prometheus/client_golang v1.13.0 h1:b71QUfeo5M8gq2+evJdTPfZhYMAU0uKPkyPJ7TPsloU= +github.com/prometheus/client_golang v1.13.1 h1:3gMjIY2+/hzmqhtUC/aQNYldJA6DtH3CgQvwS+02K1c= github.com/prometheus/client_model v0.0.0-20180712105110-5c3871d89910/go.mod h1:MbSGuTsp3dbXC40dX6PRTWyKYBIrTGTE9sqQNg2J8bo= github.com/prometheus/client_model v0.0.0-20190129233127-fd36f4220a90/go.mod h1:xMI15A0UPsDsEKsMN9yxemIoYk6Tm2C1GtYGdfGttqA= github.com/prometheus/client_model v0.0.0-20190812154241-14fe0d1b01d4/go.mod h1:xMI15A0UPsDsEKsMN9yxemIoYk6Tm2C1GtYGdfGttqA= @@ -283,7 +283,6 @@ github.com/stretchr/testify v1.2.2/go.mod h1:a8OnRcib4nhh0OaRAV+Yts87kKdq0PP7pXf github.com/stretchr/testify v1.3.0/go.mod h1:M5WIy9Dh21IEIfnGCwXGc5bZfKNJtfHm1UVUgZn+9EI= github.com/stretchr/testify v1.4.0/go.mod h1:j7eGeouHqKxXV5pUuKE4zz7dFj8WfuZ+81PSLYec5m4= github.com/stretchr/testify v1.5.1/go.mod h1:5W2xD1RspED5o8YsWQXVCued0rvSQ+mT+I5cxcmMvtA= -github.com/stretchr/testify v1.6.1/go.mod h1:6Fq8oRcR53rry900zMqJjRRixrwX3KX962/h/Wwjteg= github.com/stretchr/testify v1.7.0/go.mod h1:6Fq8oRcR53rry900zMqJjRRixrwX3KX962/h/Wwjteg= github.com/stretchr/testify v1.7.1/go.mod h1:6Fq8oRcR53rry900zMqJjRRixrwX3KX962/h/Wwjteg= github.com/stretchr/testify v1.8.0/go.mod h1:yNjHg4UonilssWZ8iaSj1OCr/vHnekPRkoO+kdMU+MU= @@ -299,14 +298,14 @@ 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.opencensus.io v0.23.0 h1:gqCw0LfLxScz8irSi8exQc7fyQ0fKQU/qnC/X8+V/1M= -go.opencensus.io v0.23.0/go.mod h1:XItmlyltB5F7CS4xOC1DcqMoFqwtC6OG2xF7mCv7P7E= -go.opentelemetry.io/collector v0.63.2-0.20221104003159-6b27644724d8 h1:rOT5HzXXfSISc6FiH012zH2/EFjp37UXfjEqj5BpkWQ= -go.opentelemetry.io/collector v0.63.2-0.20221104003159-6b27644724d8/go.mod h1:JVmeZXugK4ondC6KQgrHTHWiF4JttpG5k6dWPMt62+k= -go.opentelemetry.io/collector/pdata v0.63.2-0.20221104003159-6b27644724d8 h1:7xeTQjfsOm9eogQeIxjSEhlik9qsbBGsnmkQHfyKaRE= -go.opentelemetry.io/collector/pdata v0.63.2-0.20221104003159-6b27644724d8/go.mod h1:IzvXUGQml2mrnvdb8zIlEW3qQs9oFLdD2hLwJdZ+pek= -go.opentelemetry.io/collector/semconv v0.63.2-0.20221104003159-6b27644724d8 h1:jm0sNPyqo6S165QjQYMBHB2nK50wlJbMYM03Yr3Eo2k= -go.opentelemetry.io/collector/semconv v0.63.2-0.20221104003159-6b27644724d8/go.mod h1:5o9yhOa+ABt7g2E5JABDxGZ1PQPbtfxrKNbYn+LOTXU= +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.63.2-0.20221108014805-0b08d5316426 h1:z/wLTMh7/vNxcFUDa5uG7/IPE3tYx6pzCWPV41ghyV8= +go.opentelemetry.io/collector v0.63.2-0.20221108014805-0b08d5316426/go.mod h1:+Zb70q0Rq17dA9FcHTiTjW6g96lvJ8kAZ0c+eWNkAv0= +go.opentelemetry.io/collector/pdata v0.63.2-0.20221108014805-0b08d5316426 h1:wKDpgP0Tx/gWI2SgDGAY1OTSeihhDivbbRqFR79IGTc= +go.opentelemetry.io/collector/pdata v0.63.2-0.20221108014805-0b08d5316426/go.mod h1:IzvXUGQml2mrnvdb8zIlEW3qQs9oFLdD2hLwJdZ+pek= +go.opentelemetry.io/collector/semconv v0.63.2-0.20221108014805-0b08d5316426 h1:pqIl7OC531J6i9ttBCj3zLmZI/BSF4q323YpK0GgKGk= +go.opentelemetry.io/collector/semconv v0.63.2-0.20221108014805-0b08d5316426/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 8a61a7344651..a2725daa1360 100644 --- a/receiver/signalfxreceiver/config_test.go +++ b/receiver/signalfxreceiver/config_test.go @@ -20,6 +20,7 @@ import ( "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" + "go.opentelemetry.io/collector/component" "go.opentelemetry.io/collector/config" "go.opentelemetry.io/collector/config/confighttp" "go.opentelemetry.io/collector/config/configtls" @@ -35,17 +36,17 @@ func TestLoadConfig(t *testing.T) { require.NoError(t, err) tests := []struct { - id config.ComponentID - expected config.Receiver + id component.ID + expected component.ReceiverConfig }{ { - id: config.NewComponentIDWithName(typeStr, ""), + id: component.NewIDWithName(typeStr, ""), expected: createDefaultConfig(), }, { - id: config.NewComponentIDWithName(typeStr, "allsettings"), + id: component.NewIDWithName(typeStr, "allsettings"), expected: &Config{ - ReceiverSettings: config.NewReceiverSettings(config.NewComponentID(typeStr)), + ReceiverSettings: config.NewReceiverSettings(component.NewID(typeStr)), HTTPServerSettings: confighttp.HTTPServerSettings{ Endpoint: "localhost:9943", }, @@ -55,9 +56,9 @@ func TestLoadConfig(t *testing.T) { }, }, { - id: config.NewComponentIDWithName(typeStr, "tls"), + id: component.NewIDWithName(typeStr, "tls"), expected: &Config{ - ReceiverSettings: config.NewReceiverSettings(config.NewComponentID(typeStr)), + ReceiverSettings: config.NewReceiverSettings(component.NewID(typeStr)), HTTPServerSettings: confighttp.HTTPServerSettings{ Endpoint: ":9943", TLSSetting: &configtls.TLSServerSetting{ @@ -81,7 +82,7 @@ func TestLoadConfig(t *testing.T) { sub, err := cm.Sub(tt.id.String()) require.NoError(t, err) - require.NoError(t, config.UnmarshalReceiver(sub, cfg)) + require.NoError(t, component.UnmarshalReceiverConfig(sub, cfg)) assert.NoError(t, cfg.Validate()) assert.Equal(t, tt.expected, cfg) diff --git a/receiver/signalfxreceiver/factory.go b/receiver/signalfxreceiver/factory.go index b574d738b3d3..4dd6c891e44f 100644 --- a/receiver/signalfxreceiver/factory.go +++ b/receiver/signalfxreceiver/factory.go @@ -48,9 +48,9 @@ func NewFactory() component.ReceiverFactory { component.WithLogsReceiver(createLogsReceiver, stability)) } -func createDefaultConfig() config.Receiver { +func createDefaultConfig() component.ReceiverConfig { return &Config{ - ReceiverSettings: config.NewReceiverSettings(config.NewComponentID(typeStr)), + ReceiverSettings: config.NewReceiverSettings(component.NewID(typeStr)), HTTPServerSettings: confighttp.HTTPServerSettings{ Endpoint: defaultEndpoint, }, @@ -91,7 +91,7 @@ func (rCfg *Config) validate() error { func createMetricsReceiver( _ context.Context, params component.ReceiverCreateSettings, - cfg config.Receiver, + cfg component.ReceiverConfig, consumer consumer.Metrics, ) (component.MetricsReceiver, error) { rCfg := cfg.(*Config) @@ -118,7 +118,7 @@ func createMetricsReceiver( func createLogsReceiver( _ context.Context, params component.ReceiverCreateSettings, - cfg config.Receiver, + cfg component.ReceiverConfig, consumer consumer.Logs, ) (component.LogsReceiver, error) { rCfg := cfg.(*Config) diff --git a/receiver/signalfxreceiver/factory_test.go b/receiver/signalfxreceiver/factory_test.go index 1f5d2333290b..324d9a944935 100644 --- a/receiver/signalfxreceiver/factory_test.go +++ b/receiver/signalfxreceiver/factory_test.go @@ -21,7 +21,6 @@ import ( "github.com/stretchr/testify/assert" "go.opentelemetry.io/collector/component" "go.opentelemetry.io/collector/component/componenttest" - "go.opentelemetry.io/collector/config/configtest" "go.opentelemetry.io/collector/consumer/consumertest" ) @@ -29,7 +28,7 @@ func TestCreateDefaultConfig(t *testing.T) { factory := NewFactory() cfg := factory.CreateDefaultConfig() assert.NotNil(t, cfg, "failed to create default config") - assert.NoError(t, configtest.CheckConfigStruct(cfg)) + assert.NoError(t, componenttest.CheckConfigStruct(cfg)) } func TestCreateReceiverMetricsFirst(t *testing.T) { diff --git a/receiver/signalfxreceiver/go.mod b/receiver/signalfxreceiver/go.mod index ceb8a4072111..6c786d07ee4c 100644 --- a/receiver/signalfxreceiver/go.mod +++ b/receiver/signalfxreceiver/go.mod @@ -10,10 +10,10 @@ require ( github.com/open-telemetry/opentelemetry-collector-contrib/pkg/translator/signalfx v0.63.0 github.com/signalfx/com_signalfx_metrics_protobuf v0.0.3 github.com/stretchr/testify v1.8.1 - go.opencensus.io v0.23.0 - go.opentelemetry.io/collector v0.63.2-0.20221104003159-6b27644724d8 - go.opentelemetry.io/collector/pdata v0.63.2-0.20221104003159-6b27644724d8 - go.opentelemetry.io/collector/semconv v0.63.2-0.20221104003159-6b27644724d8 + go.opencensus.io v0.24.0 + go.opentelemetry.io/collector v0.63.2-0.20221108014805-0b08d5316426 + go.opentelemetry.io/collector/pdata v0.63.2-0.20221108014805-0b08d5316426 + go.opentelemetry.io/collector/semconv v0.63.2-0.20221108014805-0b08d5316426 go.uber.org/zap v1.23.0 ) diff --git a/receiver/signalfxreceiver/go.sum b/receiver/signalfxreceiver/go.sum index 3777f2a26dc3..8774ccd10c67 100644 --- a/receiver/signalfxreceiver/go.sum +++ b/receiver/signalfxreceiver/go.sum @@ -974,8 +974,9 @@ github.com/prometheus/client_golang v1.11.0/go.mod h1:Z6t4BnS23TR94PD6BsDNk8yVqr github.com/prometheus/client_golang v1.11.1/go.mod h1:Z6t4BnS23TR94PD6BsDNk8yVqroYurpAkEiz0P2BEV0= github.com/prometheus/client_golang v1.12.1/go.mod h1:3Z9XVyYiZYEO+YQWt3RD2R3jrbd179Rt297l4aS6nDY= github.com/prometheus/client_golang v1.12.2/go.mod h1:3Z9XVyYiZYEO+YQWt3RD2R3jrbd179Rt297l4aS6nDY= -github.com/prometheus/client_golang v1.13.0 h1:b71QUfeo5M8gq2+evJdTPfZhYMAU0uKPkyPJ7TPsloU= github.com/prometheus/client_golang v1.13.0/go.mod h1:vTeo+zgvILHsnnj/39Ou/1fPN5nJFOEMgftOUOmlvYQ= +github.com/prometheus/client_golang v1.13.1 h1:3gMjIY2+/hzmqhtUC/aQNYldJA6DtH3CgQvwS+02K1c= +github.com/prometheus/client_golang v1.13.1/go.mod h1:vTeo+zgvILHsnnj/39Ou/1fPN5nJFOEMgftOUOmlvYQ= github.com/prometheus/client_model v0.0.0-20180712105110-5c3871d89910/go.mod h1:MbSGuTsp3dbXC40dX6PRTWyKYBIrTGTE9sqQNg2J8bo= github.com/prometheus/client_model v0.0.0-20190115171406-56726106282f/go.mod h1:MbSGuTsp3dbXC40dX6PRTWyKYBIrTGTE9sqQNg2J8bo= github.com/prometheus/client_model v0.0.0-20190129233127-fd36f4220a90/go.mod h1:xMI15A0UPsDsEKsMN9yxemIoYk6Tm2C1GtYGdfGttqA= @@ -1239,14 +1240,15 @@ 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.opencensus.io v0.22.5/go.mod h1:5pWMHQbX5EPX2/62yrJeAkowc+lfs/XD7Uxpq3pI6kk= -go.opencensus.io v0.23.0 h1:gqCw0LfLxScz8irSi8exQc7fyQ0fKQU/qnC/X8+V/1M= 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.52.0/go.mod h1:a9GvaOhyc0nVOUzqvdv5mxyWghCSso/WRO2GgRl4I1g= 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.63.1/go.mod h1:FZC9Px2N5CRiOG1VWH4XvkDeFx+Bu5tO8+gaqDSfXAA= -go.opentelemetry.io/collector v0.63.2-0.20221104003159-6b27644724d8 h1:rOT5HzXXfSISc6FiH012zH2/EFjp37UXfjEqj5BpkWQ= -go.opentelemetry.io/collector v0.63.2-0.20221104003159-6b27644724d8/go.mod h1:JVmeZXugK4ondC6KQgrHTHWiF4JttpG5k6dWPMt62+k= +go.opentelemetry.io/collector v0.63.2-0.20221108014805-0b08d5316426 h1:z/wLTMh7/vNxcFUDa5uG7/IPE3tYx6pzCWPV41ghyV8= +go.opentelemetry.io/collector v0.63.2-0.20221108014805-0b08d5316426/go.mod h1:+Zb70q0Rq17dA9FcHTiTjW6g96lvJ8kAZ0c+eWNkAv0= go.opentelemetry.io/collector/extension/zpagesextension v0.0.0-20221102221454-bfc45c16c979/go.mod h1:9/RxW3avsU7dJMDktR52UVj3oDP9P0skGQCHqpRsMoE= go.opentelemetry.io/collector/model v0.49.0/go.mod h1:nOYQv9KoFPs6ihJwOi24qB209EOhS9HkwhGj54YiEAw= go.opentelemetry.io/collector/pdata v0.49.0/go.mod h1:YwmKuiFhNgtmhRdpi8Q8FAWPa0AwJTCSlssSsAtuRcY= @@ -1255,16 +1257,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.63.1/go.mod h1:IzvXUGQml2mrnvdb8zIlEW3qQs9oFLdD2hLwJdZ+pek= -go.opentelemetry.io/collector/pdata v0.63.2-0.20221104003159-6b27644724d8 h1:7xeTQjfsOm9eogQeIxjSEhlik9qsbBGsnmkQHfyKaRE= -go.opentelemetry.io/collector/pdata v0.63.2-0.20221104003159-6b27644724d8/go.mod h1:IzvXUGQml2mrnvdb8zIlEW3qQs9oFLdD2hLwJdZ+pek= +go.opentelemetry.io/collector/pdata v0.63.2-0.20221108014805-0b08d5316426 h1:wKDpgP0Tx/gWI2SgDGAY1OTSeihhDivbbRqFR79IGTc= +go.opentelemetry.io/collector/pdata v0.63.2-0.20221108014805-0b08d5316426/go.mod h1:IzvXUGQml2mrnvdb8zIlEW3qQs9oFLdD2hLwJdZ+pek= go.opentelemetry.io/collector/processor/batchprocessor v0.0.0-20221103161931-a167b006e8c0/go.mod h1:WBv1Nayi8p12K0vxLxTkHpRGr79JXYT3TXL2X0B/PRU= 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.63.1/go.mod h1:5o9yhOa+ABt7g2E5JABDxGZ1PQPbtfxrKNbYn+LOTXU= -go.opentelemetry.io/collector/semconv v0.63.2-0.20221104003159-6b27644724d8 h1:jm0sNPyqo6S165QjQYMBHB2nK50wlJbMYM03Yr3Eo2k= -go.opentelemetry.io/collector/semconv v0.63.2-0.20221104003159-6b27644724d8/go.mod h1:5o9yhOa+ABt7g2E5JABDxGZ1PQPbtfxrKNbYn+LOTXU= +go.opentelemetry.io/collector/semconv v0.63.2-0.20221108014805-0b08d5316426 h1:pqIl7OC531J6i9ttBCj3zLmZI/BSF4q323YpK0GgKGk= +go.opentelemetry.io/collector/semconv v0.63.2-0.20221108014805-0b08d5316426/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/signalfxreceiver/receiver_test.go b/receiver/signalfxreceiver/receiver_test.go index 2aebf5a96342..e123475fdec9 100644 --- a/receiver/signalfxreceiver/receiver_test.go +++ b/receiver/signalfxreceiver/receiver_test.go @@ -155,7 +155,7 @@ func Test_signalfxeceiver_EndToEnd(t *testing.T) { } expCfg := &signalfxexporter.Config{ - ExporterSettings: config.NewExporterSettings(config.NewComponentID("signalfx")), + ExporterSettings: config.NewExporterSettings(component.NewID("signalfx")), IngestURL: "http://" + addr, APIURL: "http://localhost", AccessToken: "access_token", diff --git a/receiver/simpleprometheusreceiver/config_test.go b/receiver/simpleprometheusreceiver/config_test.go index 42292f39f5e3..b7c29044b600 100644 --- a/receiver/simpleprometheusreceiver/config_test.go +++ b/receiver/simpleprometheusreceiver/config_test.go @@ -22,6 +22,7 @@ import ( "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" + "go.opentelemetry.io/collector/component" "go.opentelemetry.io/collector/config" "go.opentelemetry.io/collector/config/confighttp" "go.opentelemetry.io/collector/config/configtls" @@ -35,17 +36,17 @@ func TestLoadConfig(t *testing.T) { require.NoError(t, err) tests := []struct { - id config.ComponentID - expected config.Receiver + id component.ID + expected component.ReceiverConfig }{ { - id: config.NewComponentIDWithName(typeStr, ""), + id: component.NewIDWithName(typeStr, ""), expected: createDefaultConfig(), }, { - id: config.NewComponentIDWithName(typeStr, "all_settings"), + id: component.NewIDWithName(typeStr, "all_settings"), expected: &Config{ - ReceiverSettings: config.NewReceiverSettings(config.NewComponentID(typeStr)), + ReceiverSettings: config.NewReceiverSettings(component.NewID(typeStr)), HTTPClientSettings: confighttp.HTTPClientSettings{ Endpoint: "localhost:1234", TLSSetting: configtls.TLSClientSetting{ @@ -64,9 +65,9 @@ func TestLoadConfig(t *testing.T) { }, }, { - id: config.NewComponentIDWithName(typeStr, "partial_settings"), + id: component.NewIDWithName(typeStr, "partial_settings"), expected: &Config{ - ReceiverSettings: config.NewReceiverSettings(config.NewComponentID(typeStr)), + ReceiverSettings: config.NewReceiverSettings(component.NewID(typeStr)), HTTPClientSettings: confighttp.HTTPClientSettings{ Endpoint: "localhost:1234", TLSSetting: configtls.TLSClientSetting{ @@ -78,9 +79,9 @@ func TestLoadConfig(t *testing.T) { }, }, { - id: config.NewComponentIDWithName(typeStr, "partial_tls_settings"), + id: component.NewIDWithName(typeStr, "partial_tls_settings"), expected: &Config{ - ReceiverSettings: config.NewReceiverSettings(config.NewComponentID(typeStr)), + ReceiverSettings: config.NewReceiverSettings(component.NewID(typeStr)), HTTPClientSettings: confighttp.HTTPClientSettings{ Endpoint: "localhost:1234", }, @@ -97,7 +98,7 @@ func TestLoadConfig(t *testing.T) { sub, err := cm.Sub(tt.id.String()) require.NoError(t, err) - require.NoError(t, config.UnmarshalReceiver(sub, cfg)) + require.NoError(t, component.UnmarshalReceiverConfig(sub, cfg)) assert.NoError(t, cfg.Validate()) assert.Equal(t, tt.expected, cfg) diff --git a/receiver/simpleprometheusreceiver/factory.go b/receiver/simpleprometheusreceiver/factory.go index 2515ec95500f..5aba36a714a1 100644 --- a/receiver/simpleprometheusreceiver/factory.go +++ b/receiver/simpleprometheusreceiver/factory.go @@ -46,9 +46,9 @@ func NewFactory() component.ReceiverFactory { component.WithMetricsReceiver(createMetricsReceiver, stability)) } -func createDefaultConfig() config.Receiver { +func createDefaultConfig() component.ReceiverConfig { return &Config{ - ReceiverSettings: config.NewReceiverSettings(config.NewComponentID(typeStr)), + ReceiverSettings: config.NewReceiverSettings(component.NewID(typeStr)), HTTPClientSettings: confighttp.HTTPClientSettings{ Endpoint: defaultEndpoint, TLSSetting: configtls.TLSClientSetting{ @@ -63,7 +63,7 @@ func createDefaultConfig() config.Receiver { func createMetricsReceiver( _ context.Context, params component.ReceiverCreateSettings, - cfg config.Receiver, + cfg component.ReceiverConfig, nextConsumer consumer.Metrics, ) (component.MetricsReceiver, error) { rCfg := cfg.(*Config) diff --git a/receiver/simpleprometheusreceiver/go.mod b/receiver/simpleprometheusreceiver/go.mod index 41f233ae8804..e43551ab7e87 100644 --- a/receiver/simpleprometheusreceiver/go.mod +++ b/receiver/simpleprometheusreceiver/go.mod @@ -7,7 +7,7 @@ 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.63.2-0.20221104003159-6b27644724d8 + go.opentelemetry.io/collector v0.63.2-0.20221108014805-0b08d5316426 k8s.io/client-go v0.25.3 ) @@ -108,7 +108,7 @@ require ( github.com/opencontainers/image-spec v1.0.2 // indirect github.com/pkg/errors v0.9.1 // indirect github.com/pmezard/go-difflib v1.0.0 // indirect - github.com/prometheus/client_golang v1.13.0 // indirect + github.com/prometheus/client_golang v1.13.1 // indirect github.com/prometheus/client_model v0.3.0 // indirect github.com/prometheus/common/sigv4 v0.1.0 // indirect github.com/prometheus/procfs v0.8.0 // indirect @@ -117,9 +117,9 @@ require ( github.com/sirupsen/logrus v1.8.1 // indirect github.com/spf13/pflag v1.0.5 // indirect github.com/vultr/govultr/v2 v2.17.2 // indirect - go.opencensus.io v0.23.0 // indirect - go.opentelemetry.io/collector/pdata v0.63.2-0.20221104003159-6b27644724d8 // indirect - go.opentelemetry.io/collector/semconv v0.63.2-0.20221104003159-6b27644724d8 // indirect + go.opencensus.io v0.24.0 // indirect + go.opentelemetry.io/collector/pdata v0.63.2-0.20221108014805-0b08d5316426 // indirect + go.opentelemetry.io/collector/semconv v0.63.2-0.20221108014805-0b08d5316426 // 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 5171ac20b770..3570b034d770 100644 --- a/receiver/simpleprometheusreceiver/go.sum +++ b/receiver/simpleprometheusreceiver/go.sum @@ -520,8 +520,8 @@ github.com/prometheus/client_golang v1.7.1/go.mod h1:PY5Wy2awLA44sXw4AOSfFBetzPP github.com/prometheus/client_golang v1.11.0/go.mod h1:Z6t4BnS23TR94PD6BsDNk8yVqroYurpAkEiz0P2BEV0= github.com/prometheus/client_golang v1.11.1/go.mod h1:Z6t4BnS23TR94PD6BsDNk8yVqroYurpAkEiz0P2BEV0= github.com/prometheus/client_golang v1.12.1/go.mod h1:3Z9XVyYiZYEO+YQWt3RD2R3jrbd179Rt297l4aS6nDY= -github.com/prometheus/client_golang v1.13.0 h1:b71QUfeo5M8gq2+evJdTPfZhYMAU0uKPkyPJ7TPsloU= -github.com/prometheus/client_golang v1.13.0/go.mod h1:vTeo+zgvILHsnnj/39Ou/1fPN5nJFOEMgftOUOmlvYQ= +github.com/prometheus/client_golang v1.13.1 h1:3gMjIY2+/hzmqhtUC/aQNYldJA6DtH3CgQvwS+02K1c= +github.com/prometheus/client_golang v1.13.1/go.mod h1:vTeo+zgvILHsnnj/39Ou/1fPN5nJFOEMgftOUOmlvYQ= github.com/prometheus/client_model v0.0.0-20180712105110-5c3871d89910/go.mod h1:MbSGuTsp3dbXC40dX6PRTWyKYBIrTGTE9sqQNg2J8bo= github.com/prometheus/client_model v0.0.0-20190129233127-fd36f4220a90/go.mod h1:xMI15A0UPsDsEKsMN9yxemIoYk6Tm2C1GtYGdfGttqA= github.com/prometheus/client_model v0.0.0-20190812154241-14fe0d1b01d4/go.mod h1:xMI15A0UPsDsEKsMN9yxemIoYk6Tm2C1GtYGdfGttqA= @@ -617,15 +617,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.opencensus.io v0.23.0 h1:gqCw0LfLxScz8irSi8exQc7fyQ0fKQU/qnC/X8+V/1M= -go.opencensus.io v0.23.0/go.mod h1:XItmlyltB5F7CS4xOC1DcqMoFqwtC6OG2xF7mCv7P7E= -go.opentelemetry.io/collector v0.63.2-0.20221104003159-6b27644724d8 h1:rOT5HzXXfSISc6FiH012zH2/EFjp37UXfjEqj5BpkWQ= -go.opentelemetry.io/collector v0.63.2-0.20221104003159-6b27644724d8/go.mod h1:JVmeZXugK4ondC6KQgrHTHWiF4JttpG5k6dWPMt62+k= -go.opentelemetry.io/collector/pdata v0.63.2-0.20221104003159-6b27644724d8 h1:7xeTQjfsOm9eogQeIxjSEhlik9qsbBGsnmkQHfyKaRE= -go.opentelemetry.io/collector/pdata v0.63.2-0.20221104003159-6b27644724d8/go.mod h1:IzvXUGQml2mrnvdb8zIlEW3qQs9oFLdD2hLwJdZ+pek= -go.opentelemetry.io/collector/processor/batchprocessor v0.0.0-20221104003159-6b27644724d8 h1:jgN7o3WfR8x++rjMcVM1VN6OJi4ytlGANXbwd73BPXo= -go.opentelemetry.io/collector/semconv v0.63.2-0.20221104003159-6b27644724d8 h1:jm0sNPyqo6S165QjQYMBHB2nK50wlJbMYM03Yr3Eo2k= -go.opentelemetry.io/collector/semconv v0.63.2-0.20221104003159-6b27644724d8/go.mod h1:5o9yhOa+ABt7g2E5JABDxGZ1PQPbtfxrKNbYn+LOTXU= +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.63.2-0.20221108014805-0b08d5316426 h1:z/wLTMh7/vNxcFUDa5uG7/IPE3tYx6pzCWPV41ghyV8= +go.opentelemetry.io/collector v0.63.2-0.20221108014805-0b08d5316426/go.mod h1:+Zb70q0Rq17dA9FcHTiTjW6g96lvJ8kAZ0c+eWNkAv0= +go.opentelemetry.io/collector/pdata v0.63.2-0.20221108014805-0b08d5316426 h1:wKDpgP0Tx/gWI2SgDGAY1OTSeihhDivbbRqFR79IGTc= +go.opentelemetry.io/collector/pdata v0.63.2-0.20221108014805-0b08d5316426/go.mod h1:IzvXUGQml2mrnvdb8zIlEW3qQs9oFLdD2hLwJdZ+pek= +go.opentelemetry.io/collector/processor/batchprocessor v0.0.0-20221108014805-0b08d5316426 h1:7f0NVsVGYT8pxAyk0qBBa8ZQf7athr/mfQ6QltGywN0= +go.opentelemetry.io/collector/semconv v0.63.2-0.20221108014805-0b08d5316426 h1:pqIl7OC531J6i9ttBCj3zLmZI/BSF4q323YpK0GgKGk= +go.opentelemetry.io/collector/semconv v0.63.2-0.20221108014805-0b08d5316426/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.go b/receiver/skywalkingreceiver/config.go index 628bf637a48f..840be120083c 100644 --- a/receiver/skywalkingreceiver/config.go +++ b/receiver/skywalkingreceiver/config.go @@ -17,6 +17,7 @@ package skywalkingreceiver // import "github.com/open-telemetry/opentelemetry-co import ( "fmt" + "go.opentelemetry.io/collector/component" "go.opentelemetry.io/collector/config" "go.opentelemetry.io/collector/config/configgrpc" "go.opentelemetry.io/collector/config/confighttp" @@ -40,7 +41,7 @@ type Config struct { Protocols `mapstructure:"protocols"` } -var _ config.Receiver = (*Config)(nil) +var _ component.ReceiverConfig = (*Config)(nil) var _ confmap.Unmarshaler = (*Config)(nil) // Validate checks the receiver configuration is valid diff --git a/receiver/skywalkingreceiver/config_test.go b/receiver/skywalkingreceiver/config_test.go index d3221105f583..481575137453 100644 --- a/receiver/skywalkingreceiver/config_test.go +++ b/receiver/skywalkingreceiver/config_test.go @@ -20,6 +20,7 @@ import ( "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" + "go.opentelemetry.io/collector/component" "go.opentelemetry.io/collector/config" "go.opentelemetry.io/collector/config/configgrpc" "go.opentelemetry.io/collector/config/confighttp" @@ -34,17 +35,17 @@ func TestLoadConfig(t *testing.T) { require.NoError(t, err) tests := []struct { - id config.ComponentID - expected config.Receiver + id component.ID + expected component.ReceiverConfig }{ { - id: config.NewComponentIDWithName(typeStr, ""), + id: component.NewIDWithName(typeStr, ""), expected: createDefaultConfig(), }, { - id: config.NewComponentIDWithName(typeStr, "customname"), + id: component.NewIDWithName(typeStr, "customname"), expected: &Config{ - ReceiverSettings: config.NewReceiverSettings(config.NewComponentID(typeStr)), + ReceiverSettings: config.NewReceiverSettings(component.NewID(typeStr)), Protocols: Protocols{ HTTP: &confighttp.HTTPServerSettings{ Endpoint: "0.0.0.0:12801", @@ -53,9 +54,9 @@ func TestLoadConfig(t *testing.T) { }, }, { - id: config.NewComponentIDWithName(typeStr, "defaults"), + id: component.NewIDWithName(typeStr, "defaults"), expected: &Config{ - ReceiverSettings: config.NewReceiverSettings(config.NewComponentID(typeStr)), + ReceiverSettings: config.NewReceiverSettings(component.NewID(typeStr)), Protocols: Protocols{ GRPC: &configgrpc.GRPCServerSettings{ NetAddr: confignet.NetAddr{ @@ -75,7 +76,7 @@ func TestLoadConfig(t *testing.T) { sub, err := cm.Sub(tt.id.String()) require.NoError(t, err) - require.NoError(t, config.UnmarshalReceiver(sub, cfg)) + require.NoError(t, component.UnmarshalReceiverConfig(sub, cfg)) assert.NoError(t, cfg.Validate()) assert.Equal(t, tt.expected, cfg) diff --git a/receiver/skywalkingreceiver/factory.go b/receiver/skywalkingreceiver/factory.go index 7e3d19e6746e..69e1da4c82c3 100644 --- a/receiver/skywalkingreceiver/factory.go +++ b/receiver/skywalkingreceiver/factory.go @@ -52,9 +52,9 @@ func NewFactory() component.ReceiverFactory { } // CreateDefaultConfig creates the default configuration for Skywalking receiver. -func createDefaultConfig() config.Receiver { +func createDefaultConfig() component.ReceiverConfig { return &Config{ - ReceiverSettings: config.NewReceiverSettings(config.NewComponentID(typeStr)), + ReceiverSettings: config.NewReceiverSettings(component.NewID(typeStr)), Protocols: Protocols{ GRPC: &configgrpc.GRPCServerSettings{ NetAddr: confignet.NetAddr{ @@ -73,7 +73,7 @@ func createDefaultConfig() config.Receiver { func createTracesReceiver( _ context.Context, set component.ReceiverCreateSettings, - cfg config.Receiver, + cfg component.ReceiverConfig, nextConsumer consumer.Traces, ) (component.TracesReceiver, error) { diff --git a/receiver/skywalkingreceiver/factory_test.go b/receiver/skywalkingreceiver/factory_test.go index 6a33e8d5ccb7..dffc73e233e3 100644 --- a/receiver/skywalkingreceiver/factory_test.go +++ b/receiver/skywalkingreceiver/factory_test.go @@ -23,11 +23,9 @@ import ( "github.com/stretchr/testify/require" "go.opentelemetry.io/collector/component" "go.opentelemetry.io/collector/component/componenttest" - "go.opentelemetry.io/collector/config" "go.opentelemetry.io/collector/config/configgrpc" "go.opentelemetry.io/collector/config/confighttp" "go.opentelemetry.io/collector/config/confignet" - "go.opentelemetry.io/collector/config/configtest" "go.opentelemetry.io/collector/config/configtls" "go.opentelemetry.io/collector/confmap/confmaptest" ) @@ -42,7 +40,7 @@ func TestCreateDefaultConfig(t *testing.T) { factory := NewFactory() cfg := factory.CreateDefaultConfig() assert.NotNil(t, cfg, "failed to create default config") - assert.NoError(t, configtest.CheckConfigStruct(cfg)) + assert.NoError(t, componenttest.CheckConfigStruct(cfg)) } func TestCreateReceiver(t *testing.T) { @@ -71,9 +69,9 @@ func TestCreateReceiverGeneralConfig(t *testing.T) { factory := NewFactory() cfg := factory.CreateDefaultConfig() - sub, err := cm.Sub(config.NewComponentIDWithName(typeStr, "customname").String()) + sub, err := cm.Sub(component.NewIDWithName(typeStr, "customname").String()) require.NoError(t, err) - require.NoError(t, config.UnmarshalReceiver(sub, cfg)) + require.NoError(t, component.UnmarshalReceiverConfig(sub, cfg)) set := componenttest.NewNopReceiverCreateSettings() tReceiver, err := factory.CreateTracesReceiver(context.Background(), set, cfg, nil) diff --git a/receiver/skywalkingreceiver/go.mod b/receiver/skywalkingreceiver/go.mod index b2f8eedd6899..19bda808e836 100644 --- a/receiver/skywalkingreceiver/go.mod +++ b/receiver/skywalkingreceiver/go.mod @@ -6,9 +6,9 @@ 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.63.2-0.20221104003159-6b27644724d8 - go.opentelemetry.io/collector/pdata v0.63.2-0.20221104003159-6b27644724d8 - go.opentelemetry.io/collector/semconv v0.63.2-0.20221104003159-6b27644724d8 + go.opentelemetry.io/collector v0.63.2-0.20221108014805-0b08d5316426 + go.opentelemetry.io/collector/pdata v0.63.2-0.20221108014805-0b08d5316426 + go.opentelemetry.io/collector/semconv v0.63.2-0.20221108014805-0b08d5316426 go.uber.org/multierr v1.8.0 google.golang.org/grpc v1.50.1 google.golang.org/protobuf v1.28.1 @@ -37,7 +37,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.opencensus.io v0.23.0 // indirect + go.opencensus.io v0.24.0 // 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 ff101a0770de..f6678369e42e 100644 --- a/receiver/skywalkingreceiver/go.sum +++ b/receiver/skywalkingreceiver/go.sum @@ -354,7 +354,7 @@ github.com/prometheus/client_golang v0.9.1/go.mod h1:7SWBe2y4D6OKWSNQJUaRYU/AaXP github.com/prometheus/client_golang v1.0.0/go.mod h1:db9x61etRT2tGnBNRi70OPL5FsnadC4Ky3P0J6CfImo= github.com/prometheus/client_golang v1.7.1/go.mod h1:PY5Wy2awLA44sXw4AOSfFBetzPP4j5+D6mVACh+pe2M= github.com/prometheus/client_golang v1.11.1/go.mod h1:Z6t4BnS23TR94PD6BsDNk8yVqroYurpAkEiz0P2BEV0= -github.com/prometheus/client_golang v1.13.0 h1:b71QUfeo5M8gq2+evJdTPfZhYMAU0uKPkyPJ7TPsloU= +github.com/prometheus/client_golang v1.13.1 h1:3gMjIY2+/hzmqhtUC/aQNYldJA6DtH3CgQvwS+02K1c= github.com/prometheus/client_model v0.0.0-20180712105110-5c3871d89910/go.mod h1:MbSGuTsp3dbXC40dX6PRTWyKYBIrTGTE9sqQNg2J8bo= github.com/prometheus/client_model v0.0.0-20190129233127-fd36f4220a90/go.mod h1:xMI15A0UPsDsEKsMN9yxemIoYk6Tm2C1GtYGdfGttqA= github.com/prometheus/client_model v0.0.0-20190812154241-14fe0d1b01d4/go.mod h1:xMI15A0UPsDsEKsMN9yxemIoYk6Tm2C1GtYGdfGttqA= @@ -415,14 +415,15 @@ 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.opencensus.io v0.22.5/go.mod h1:5pWMHQbX5EPX2/62yrJeAkowc+lfs/XD7Uxpq3pI6kk= -go.opencensus.io v0.23.0 h1:gqCw0LfLxScz8irSi8exQc7fyQ0fKQU/qnC/X8+V/1M= go.opencensus.io v0.23.0/go.mod h1:XItmlyltB5F7CS4xOC1DcqMoFqwtC6OG2xF7mCv7P7E= -go.opentelemetry.io/collector v0.63.2-0.20221104003159-6b27644724d8 h1:rOT5HzXXfSISc6FiH012zH2/EFjp37UXfjEqj5BpkWQ= -go.opentelemetry.io/collector v0.63.2-0.20221104003159-6b27644724d8/go.mod h1:JVmeZXugK4ondC6KQgrHTHWiF4JttpG5k6dWPMt62+k= -go.opentelemetry.io/collector/pdata v0.63.2-0.20221104003159-6b27644724d8 h1:7xeTQjfsOm9eogQeIxjSEhlik9qsbBGsnmkQHfyKaRE= -go.opentelemetry.io/collector/pdata v0.63.2-0.20221104003159-6b27644724d8/go.mod h1:IzvXUGQml2mrnvdb8zIlEW3qQs9oFLdD2hLwJdZ+pek= -go.opentelemetry.io/collector/semconv v0.63.2-0.20221104003159-6b27644724d8 h1:jm0sNPyqo6S165QjQYMBHB2nK50wlJbMYM03Yr3Eo2k= -go.opentelemetry.io/collector/semconv v0.63.2-0.20221104003159-6b27644724d8/go.mod h1:5o9yhOa+ABt7g2E5JABDxGZ1PQPbtfxrKNbYn+LOTXU= +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.63.2-0.20221108014805-0b08d5316426 h1:z/wLTMh7/vNxcFUDa5uG7/IPE3tYx6pzCWPV41ghyV8= +go.opentelemetry.io/collector v0.63.2-0.20221108014805-0b08d5316426/go.mod h1:+Zb70q0Rq17dA9FcHTiTjW6g96lvJ8kAZ0c+eWNkAv0= +go.opentelemetry.io/collector/pdata v0.63.2-0.20221108014805-0b08d5316426 h1:wKDpgP0Tx/gWI2SgDGAY1OTSeihhDivbbRqFR79IGTc= +go.opentelemetry.io/collector/pdata v0.63.2-0.20221108014805-0b08d5316426/go.mod h1:IzvXUGQml2mrnvdb8zIlEW3qQs9oFLdD2hLwJdZ+pek= +go.opentelemetry.io/collector/semconv v0.63.2-0.20221108014805-0b08d5316426 h1:pqIl7OC531J6i9ttBCj3zLmZI/BSF4q323YpK0GgKGk= +go.opentelemetry.io/collector/semconv v0.63.2-0.20221108014805-0b08d5316426/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/skywalkingreceiver/trace_receiver.go b/receiver/skywalkingreceiver/trace_receiver.go index 572014353cbd..8cd33d960c0c 100644 --- a/receiver/skywalkingreceiver/trace_receiver.go +++ b/receiver/skywalkingreceiver/trace_receiver.go @@ -26,7 +26,6 @@ import ( "github.com/gorilla/mux" "go.opentelemetry.io/collector/component" - "go.opentelemetry.io/collector/config" "go.opentelemetry.io/collector/config/configgrpc" "go.opentelemetry.io/collector/config/confighttp" "go.opentelemetry.io/collector/consumer" @@ -53,7 +52,7 @@ type configuration struct { // This receiver is basically a Skywalking collector. type swReceiver struct { nextConsumer consumer.Traces - id config.ComponentID + id component.ID config *configuration @@ -78,7 +77,7 @@ const ( // newSkywalkingReceiver creates a TracesReceiver that receives traffic as a Skywalking collector func newSkywalkingReceiver( - id config.ComponentID, + id component.ID, config *configuration, nextConsumer consumer.Traces, set component.ReceiverCreateSettings, diff --git a/receiver/skywalkingreceiver/trace_receiver_test.go b/receiver/skywalkingreceiver/trace_receiver_test.go index dee009135a87..5691a907a793 100644 --- a/receiver/skywalkingreceiver/trace_receiver_test.go +++ b/receiver/skywalkingreceiver/trace_receiver_test.go @@ -23,8 +23,8 @@ import ( "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" + "go.opentelemetry.io/collector/component" "go.opentelemetry.io/collector/component/componenttest" - "go.opentelemetry.io/collector/config" "go.opentelemetry.io/collector/config/confighttp" "go.opentelemetry.io/collector/consumer/consumertest" "google.golang.org/grpc" @@ -34,7 +34,7 @@ import ( ) var ( - skywalkingReceiver = config.NewComponentIDWithName("skywalking", "receiver_test") + skywalkingReceiver = component.NewIDWithName("skywalking", "receiver_test") ) func TestTraceSource(t *testing.T) { diff --git a/receiver/snmpreceiver/config_test.go b/receiver/snmpreceiver/config_test.go index 9b51f97ea4e3..f664a5962835 100644 --- a/receiver/snmpreceiver/config_test.go +++ b/receiver/snmpreceiver/config_test.go @@ -21,7 +21,7 @@ import ( "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" - "go.opentelemetry.io/collector/config" + "go.opentelemetry.io/collector/component" "go.opentelemetry.io/collector/confmap/confmaptest" ) @@ -258,11 +258,11 @@ func TestLoadConfigConnectionConfigs(t *testing.T) { for _, test := range testCases { t.Run(test.name, func(t *testing.T) { - sub, err := cm.Sub(config.NewComponentIDWithName(typeStr, test.nameVal).String()) + sub, err := cm.Sub(component.NewIDWithName(typeStr, test.nameVal).String()) require.NoError(t, err) cfg := factory.CreateDefaultConfig() - require.NoError(t, config.UnmarshalReceiver(sub, cfg)) + require.NoError(t, component.UnmarshalReceiverConfig(sub, cfg)) if test.expectedErr == "" { require.NoError(t, cfg.Validate()) } else { @@ -842,11 +842,11 @@ func TestLoadConfigMetricConfigs(t *testing.T) { for _, test := range testCases { t.Run(test.name, func(t *testing.T) { - sub, err := cm.Sub(config.NewComponentIDWithName(typeStr, test.nameVal).String()) + sub, err := cm.Sub(component.NewIDWithName(typeStr, test.nameVal).String()) require.NoError(t, err) cfg := factory.CreateDefaultConfig() - require.NoError(t, config.UnmarshalReceiver(sub, cfg)) + require.NoError(t, component.UnmarshalReceiverConfig(sub, cfg)) if test.expectedErr == "" { require.NoError(t, cfg.Validate()) } else { diff --git a/receiver/snmpreceiver/factory.go b/receiver/snmpreceiver/factory.go index e4e89fabe1d7..25eefd9c3277 100644 --- a/receiver/snmpreceiver/factory.go +++ b/receiver/snmpreceiver/factory.go @@ -43,10 +43,10 @@ func NewFactory() component.ReceiverFactory { } // createDefaultConfig creates a config for SNMP with as many default values as possible -func createDefaultConfig() config.Receiver { +func createDefaultConfig() component.ReceiverConfig { return &Config{ ScraperControllerSettings: scraperhelper.ScraperControllerSettings{ - ReceiverSettings: config.NewReceiverSettings(config.NewComponentID(typeStr)), + ReceiverSettings: config.NewReceiverSettings(component.NewID(typeStr)), CollectionInterval: defaultCollectionInterval, }, Endpoint: defaultEndpoint, @@ -62,7 +62,7 @@ func createDefaultConfig() config.Receiver { func createMetricsReceiver( _ context.Context, params component.ReceiverCreateSettings, - config config.Receiver, + config component.ReceiverConfig, consumer consumer.Metrics, ) (component.MetricsReceiver, error) { snmpConfig, ok := config.(*Config) diff --git a/receiver/snmpreceiver/factory_test.go b/receiver/snmpreceiver/factory_test.go index 7b399c52fe4e..c1417a85b384 100644 --- a/receiver/snmpreceiver/factory_test.go +++ b/receiver/snmpreceiver/factory_test.go @@ -19,6 +19,7 @@ import ( "testing" "github.com/stretchr/testify/require" + "go.opentelemetry.io/collector/component" "go.opentelemetry.io/collector/component/componenttest" "go.opentelemetry.io/collector/config" "go.opentelemetry.io/collector/consumer/consumertest" @@ -42,9 +43,9 @@ func TestNewFactory(t *testing.T) { testFunc: func(t *testing.T) { factory := NewFactory() - var expectedCfg config.Receiver = &Config{ + var expectedCfg component.ReceiverConfig = &Config{ ScraperControllerSettings: scraperhelper.ScraperControllerSettings{ - ReceiverSettings: config.NewReceiverSettings(config.NewComponentID(typeStr)), + ReceiverSettings: config.NewReceiverSettings(component.NewID(typeStr)), CollectionInterval: defaultCollectionInterval, }, Endpoint: defaultEndpoint, diff --git a/receiver/snmpreceiver/go.mod b/receiver/snmpreceiver/go.mod index 65528e16b264..be6ce1456285 100644 --- a/receiver/snmpreceiver/go.mod +++ b/receiver/snmpreceiver/go.mod @@ -6,8 +6,8 @@ require ( github.com/gosnmp/gosnmp v1.35.0 github.com/open-telemetry/opentelemetry-collector-contrib/internal/scrapertest v0.62.0 github.com/stretchr/testify v1.8.1 - go.opentelemetry.io/collector v0.63.2-0.20221104003159-6b27644724d8 - go.opentelemetry.io/collector/pdata v0.63.2-0.20221104003159-6b27644724d8 + go.opentelemetry.io/collector v0.63.2-0.20221108014805-0b08d5316426 + go.opentelemetry.io/collector/pdata v0.63.2-0.20221108014805-0b08d5316426 go.uber.org/multierr v1.8.0 go.uber.org/zap v1.23.0 ) @@ -27,7 +27,7 @@ require ( github.com/pmezard/go-difflib v1.0.0 // indirect github.com/rogpeppe/go-internal v1.9.0 // indirect github.com/stretchr/objx v0.5.0 // indirect - go.opencensus.io v0.23.0 // indirect + go.opencensus.io v0.24.0 // 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/snmpreceiver/go.sum b/receiver/snmpreceiver/go.sum index c31af04923bf..2a2895ce7e42 100644 --- a/receiver/snmpreceiver/go.sum +++ b/receiver/snmpreceiver/go.sum @@ -231,7 +231,7 @@ github.com/prometheus/client_golang v0.9.1/go.mod h1:7SWBe2y4D6OKWSNQJUaRYU/AaXP github.com/prometheus/client_golang v1.0.0/go.mod h1:db9x61etRT2tGnBNRi70OPL5FsnadC4Ky3P0J6CfImo= github.com/prometheus/client_golang v1.7.1/go.mod h1:PY5Wy2awLA44sXw4AOSfFBetzPP4j5+D6mVACh+pe2M= github.com/prometheus/client_golang v1.11.1/go.mod h1:Z6t4BnS23TR94PD6BsDNk8yVqroYurpAkEiz0P2BEV0= -github.com/prometheus/client_golang v1.13.0 h1:b71QUfeo5M8gq2+evJdTPfZhYMAU0uKPkyPJ7TPsloU= +github.com/prometheus/client_golang v1.13.1 h1:3gMjIY2+/hzmqhtUC/aQNYldJA6DtH3CgQvwS+02K1c= github.com/prometheus/client_model v0.0.0-20180712105110-5c3871d89910/go.mod h1:MbSGuTsp3dbXC40dX6PRTWyKYBIrTGTE9sqQNg2J8bo= github.com/prometheus/client_model v0.0.0-20190129233127-fd36f4220a90/go.mod h1:xMI15A0UPsDsEKsMN9yxemIoYk6Tm2C1GtYGdfGttqA= github.com/prometheus/client_model v0.0.0-20190812154241-14fe0d1b01d4/go.mod h1:xMI15A0UPsDsEKsMN9yxemIoYk6Tm2C1GtYGdfGttqA= @@ -270,7 +270,6 @@ github.com/stretchr/testify v1.2.2/go.mod h1:a8OnRcib4nhh0OaRAV+Yts87kKdq0PP7pXf github.com/stretchr/testify v1.3.0/go.mod h1:M5WIy9Dh21IEIfnGCwXGc5bZfKNJtfHm1UVUgZn+9EI= github.com/stretchr/testify v1.4.0/go.mod h1:j7eGeouHqKxXV5pUuKE4zz7dFj8WfuZ+81PSLYec5m4= github.com/stretchr/testify v1.5.1/go.mod h1:5W2xD1RspED5o8YsWQXVCued0rvSQ+mT+I5cxcmMvtA= -github.com/stretchr/testify v1.6.1/go.mod h1:6Fq8oRcR53rry900zMqJjRRixrwX3KX962/h/Wwjteg= github.com/stretchr/testify v1.7.0/go.mod h1:6Fq8oRcR53rry900zMqJjRRixrwX3KX962/h/Wwjteg= github.com/stretchr/testify v1.7.1/go.mod h1:6Fq8oRcR53rry900zMqJjRRixrwX3KX962/h/Wwjteg= github.com/stretchr/testify v1.8.0/go.mod h1:yNjHg4UonilssWZ8iaSj1OCr/vHnekPRkoO+kdMU+MU= @@ -282,12 +281,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.opencensus.io v0.23.0 h1:gqCw0LfLxScz8irSi8exQc7fyQ0fKQU/qnC/X8+V/1M= -go.opencensus.io v0.23.0/go.mod h1:XItmlyltB5F7CS4xOC1DcqMoFqwtC6OG2xF7mCv7P7E= -go.opentelemetry.io/collector v0.63.2-0.20221104003159-6b27644724d8 h1:rOT5HzXXfSISc6FiH012zH2/EFjp37UXfjEqj5BpkWQ= -go.opentelemetry.io/collector v0.63.2-0.20221104003159-6b27644724d8/go.mod h1:JVmeZXugK4ondC6KQgrHTHWiF4JttpG5k6dWPMt62+k= -go.opentelemetry.io/collector/pdata v0.63.2-0.20221104003159-6b27644724d8 h1:7xeTQjfsOm9eogQeIxjSEhlik9qsbBGsnmkQHfyKaRE= -go.opentelemetry.io/collector/pdata v0.63.2-0.20221104003159-6b27644724d8/go.mod h1:IzvXUGQml2mrnvdb8zIlEW3qQs9oFLdD2hLwJdZ+pek= +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.63.2-0.20221108014805-0b08d5316426 h1:z/wLTMh7/vNxcFUDa5uG7/IPE3tYx6pzCWPV41ghyV8= +go.opentelemetry.io/collector v0.63.2-0.20221108014805-0b08d5316426/go.mod h1:+Zb70q0Rq17dA9FcHTiTjW6g96lvJ8kAZ0c+eWNkAv0= +go.opentelemetry.io/collector/pdata v0.63.2-0.20221108014805-0b08d5316426 h1:wKDpgP0Tx/gWI2SgDGAY1OTSeihhDivbbRqFR79IGTc= +go.opentelemetry.io/collector/pdata v0.63.2-0.20221108014805-0b08d5316426/go.mod h1:IzvXUGQml2mrnvdb8zIlEW3qQs9oFLdD2hLwJdZ+pek= 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/solacereceiver/config_test.go b/receiver/solacereceiver/config_test.go index 861e243a1370..4b70d4ff65e7 100644 --- a/receiver/solacereceiver/config_test.go +++ b/receiver/solacereceiver/config_test.go @@ -20,6 +20,7 @@ import ( "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" + "go.opentelemetry.io/collector/component" "go.opentelemetry.io/collector/config" "go.opentelemetry.io/collector/config/configtls" "go.opentelemetry.io/collector/confmap/confmaptest" @@ -32,14 +33,14 @@ func TestLoadConfig(t *testing.T) { require.NoError(t, err) tests := []struct { - id config.ComponentID - expected config.Receiver + id component.ID + expected component.ReceiverConfig expectedErr error }{ { - id: config.NewComponentIDWithName(componentType, "primary"), + id: component.NewIDWithName(componentType, "primary"), expected: &Config{ - ReceiverSettings: config.NewReceiverSettings(config.NewComponentID(componentType)), + ReceiverSettings: config.NewReceiverSettings(component.NewID(componentType)), Broker: []string{"myHost:5671"}, Auth: Authentication{ PlainText: &SaslPlainTextConfig{ @@ -56,11 +57,11 @@ func TestLoadConfig(t *testing.T) { }, }, { - id: config.NewComponentIDWithName(componentType, "noauth"), + id: component.NewIDWithName(componentType, "noauth"), expectedErr: errMissingAuthDetails, }, { - id: config.NewComponentIDWithName(componentType, "noqueue"), + id: component.NewIDWithName(componentType, "noqueue"), expectedErr: errMissingQueueName, }, } @@ -72,7 +73,7 @@ func TestLoadConfig(t *testing.T) { sub, err := cm.Sub(tt.id.String()) require.NoError(t, err) - require.NoError(t, config.UnmarshalReceiver(sub, cfg)) + require.NoError(t, component.UnmarshalReceiverConfig(sub, cfg)) if tt.expectedErr != nil { assert.ErrorIs(t, cfg.Validate(), tt.expectedErr) diff --git a/receiver/solacereceiver/factory.go b/receiver/solacereceiver/factory.go index 2de4fc5239c6..c75883f0416a 100644 --- a/receiver/solacereceiver/factory.go +++ b/receiver/solacereceiver/factory.go @@ -24,7 +24,7 @@ import ( ) const ( - componentType config.Type = "solace" + componentType component.Type = "solace" // The stability level of the receiver. stability = component.StabilityLevelInDevelopment @@ -44,9 +44,9 @@ func NewFactory() component.ReceiverFactory { } // createDefaultConfig creates the default configuration for receiver. -func createDefaultConfig() config.Receiver { +func createDefaultConfig() component.ReceiverConfig { return &Config{ - ReceiverSettings: config.NewReceiverSettings(config.NewComponentID(componentType)), + ReceiverSettings: config.NewReceiverSettings(component.NewID(componentType)), Broker: []string{defaultHost}, MaxUnacked: defaultMaxUnaked, Auth: Authentication{}, @@ -61,7 +61,7 @@ func createDefaultConfig() config.Receiver { func createTracesReceiver( _ context.Context, params component.ReceiverCreateSettings, - receiverConfig config.Receiver, + receiverConfig component.ReceiverConfig, nextConsumer consumer.Traces, ) (component.TracesReceiver, error) { cfg, ok := receiverConfig.(*Config) diff --git a/receiver/solacereceiver/factory_test.go b/receiver/solacereceiver/factory_test.go index 3df7e68d23c1..5daae0d58b43 100644 --- a/receiver/solacereceiver/factory_test.go +++ b/receiver/solacereceiver/factory_test.go @@ -25,7 +25,6 @@ import ( "go.opencensus.io/stats/view" "go.opentelemetry.io/collector/component" "go.opentelemetry.io/collector/component/componenttest" - "go.opentelemetry.io/collector/config" "go.opentelemetry.io/collector/confmap/confmaptest" "go.opentelemetry.io/collector/consumer/consumertest" ) @@ -36,9 +35,9 @@ func TestCreateTracesReceiver(t *testing.T) { factory := NewFactory() cfg := factory.CreateDefaultConfig() - sub, err := cm.Sub(config.NewComponentIDWithName(componentType, "primary").String()) + sub, err := cm.Sub(component.NewIDWithName(componentType, "primary").String()) require.NoError(t, err) - require.NoError(t, config.UnmarshalReceiver(sub, cfg)) + require.NoError(t, component.UnmarshalReceiverConfig(sub, cfg)) receiver, err := factory.CreateTracesReceiver( context.Background(), @@ -103,9 +102,9 @@ func TestCreateTracesReceiverBadMetrics(t *testing.T) { factory := NewFactory() cfg := factory.CreateDefaultConfig() - sub, err := cm.Sub(config.NewComponentIDWithName(componentType, "primary").String()) + sub, err := cm.Sub(component.NewIDWithName(componentType, "primary").String()) require.NoError(t, err) - require.NoError(t, config.UnmarshalReceiver(sub, cfg)) + require.NoError(t, component.UnmarshalReceiverConfig(sub, cfg)) receiver, err := factory.CreateTracesReceiver( context.Background(), diff --git a/receiver/solacereceiver/go.mod b/receiver/solacereceiver/go.mod index 518417420088..627bb07b355e 100644 --- a/receiver/solacereceiver/go.mod +++ b/receiver/solacereceiver/go.mod @@ -19,9 +19,9 @@ go 1.18 require ( github.com/Azure/go-amqp v0.17.5 github.com/stretchr/testify v1.8.1 - go.opencensus.io v0.23.0 - go.opentelemetry.io/collector v0.63.2-0.20221104003159-6b27644724d8 - go.opentelemetry.io/collector/pdata v0.63.2-0.20221104003159-6b27644724d8 + go.opencensus.io v0.24.0 + go.opentelemetry.io/collector v0.63.2-0.20221108014805-0b08d5316426 + go.opentelemetry.io/collector/pdata v0.63.2-0.20221108014805-0b08d5316426 go.uber.org/atomic v1.10.0 go.uber.org/zap v1.23.0 google.golang.org/protobuf v1.28.1 diff --git a/receiver/solacereceiver/go.sum b/receiver/solacereceiver/go.sum index 33f27462ac6c..6467973eb11e 100644 --- a/receiver/solacereceiver/go.sum +++ b/receiver/solacereceiver/go.sum @@ -260,7 +260,6 @@ github.com/stretchr/testify v1.2.2/go.mod h1:a8OnRcib4nhh0OaRAV+Yts87kKdq0PP7pXf github.com/stretchr/testify v1.3.0/go.mod h1:M5WIy9Dh21IEIfnGCwXGc5bZfKNJtfHm1UVUgZn+9EI= github.com/stretchr/testify v1.4.0/go.mod h1:j7eGeouHqKxXV5pUuKE4zz7dFj8WfuZ+81PSLYec5m4= github.com/stretchr/testify v1.5.1/go.mod h1:5W2xD1RspED5o8YsWQXVCued0rvSQ+mT+I5cxcmMvtA= -github.com/stretchr/testify v1.6.1/go.mod h1:6Fq8oRcR53rry900zMqJjRRixrwX3KX962/h/Wwjteg= github.com/stretchr/testify v1.7.0/go.mod h1:6Fq8oRcR53rry900zMqJjRRixrwX3KX962/h/Wwjteg= github.com/stretchr/testify v1.7.1/go.mod h1:6Fq8oRcR53rry900zMqJjRRixrwX3KX962/h/Wwjteg= github.com/stretchr/testify v1.8.0/go.mod h1:yNjHg4UonilssWZ8iaSj1OCr/vHnekPRkoO+kdMU+MU= @@ -272,12 +271,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.opencensus.io v0.23.0 h1:gqCw0LfLxScz8irSi8exQc7fyQ0fKQU/qnC/X8+V/1M= -go.opencensus.io v0.23.0/go.mod h1:XItmlyltB5F7CS4xOC1DcqMoFqwtC6OG2xF7mCv7P7E= -go.opentelemetry.io/collector v0.63.2-0.20221104003159-6b27644724d8 h1:rOT5HzXXfSISc6FiH012zH2/EFjp37UXfjEqj5BpkWQ= -go.opentelemetry.io/collector v0.63.2-0.20221104003159-6b27644724d8/go.mod h1:JVmeZXugK4ondC6KQgrHTHWiF4JttpG5k6dWPMt62+k= -go.opentelemetry.io/collector/pdata v0.63.2-0.20221104003159-6b27644724d8 h1:7xeTQjfsOm9eogQeIxjSEhlik9qsbBGsnmkQHfyKaRE= -go.opentelemetry.io/collector/pdata v0.63.2-0.20221104003159-6b27644724d8/go.mod h1:IzvXUGQml2mrnvdb8zIlEW3qQs9oFLdD2hLwJdZ+pek= +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.63.2-0.20221108014805-0b08d5316426 h1:z/wLTMh7/vNxcFUDa5uG7/IPE3tYx6pzCWPV41ghyV8= +go.opentelemetry.io/collector v0.63.2-0.20221108014805-0b08d5316426/go.mod h1:+Zb70q0Rq17dA9FcHTiTjW6g96lvJ8kAZ0c+eWNkAv0= +go.opentelemetry.io/collector/pdata v0.63.2-0.20221108014805-0b08d5316426 h1:wKDpgP0Tx/gWI2SgDGAY1OTSeihhDivbbRqFR79IGTc= +go.opentelemetry.io/collector/pdata v0.63.2-0.20221108014805-0b08d5316426/go.mod h1:IzvXUGQml2mrnvdb8zIlEW3qQs9oFLdD2hLwJdZ+pek= 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/solacereceiver/messaging_service_test.go b/receiver/solacereceiver/messaging_service_test.go index bfb4fe1cb5a6..79dafbd79b6d 100644 --- a/receiver/solacereceiver/messaging_service_test.go +++ b/receiver/solacereceiver/messaging_service_test.go @@ -27,6 +27,7 @@ import ( "github.com/Azure/go-amqp" "github.com/stretchr/testify/assert" + "go.opentelemetry.io/collector/component" "go.opentelemetry.io/collector/config" "go.opentelemetry.io/collector/config/configtls" "go.uber.org/zap" @@ -80,7 +81,7 @@ const ( ) func TestNewAMQPMessagingServiceFactory(t *testing.T) { - receiverSettings := config.NewReceiverSettings(config.NewComponentID("someID")) + receiverSettings := config.NewReceiverSettings(component.NewID("someID")) broker := "some-broker:1234" queue := "someQueue" maxUnacked := uint32(100) diff --git a/receiver/solacereceiver/receiver.go b/receiver/solacereceiver/receiver.go index c08b6d734c76..c9b3c10349e1 100644 --- a/receiver/solacereceiver/receiver.go +++ b/receiver/solacereceiver/receiver.go @@ -21,7 +21,6 @@ import ( "time" "go.opentelemetry.io/collector/component" - "go.opentelemetry.io/collector/config" "go.opentelemetry.io/collector/consumer" "go.opentelemetry.io/collector/consumer/consumererror" "go.uber.org/atomic" @@ -30,7 +29,7 @@ import ( // solaceTracesReceiver uses azure AMQP to consume and handle telemetry data from SOlace. Implements component.TracesReceiver type solaceTracesReceiver struct { - instanceID config.ComponentID + instanceID component.ID // config is the receiver.Config instance used to build the receiver config *Config diff --git a/receiver/solacereceiver/receiver_test.go b/receiver/solacereceiver/receiver_test.go index 19a545736a12..3bc4c3da4d0b 100644 --- a/receiver/solacereceiver/receiver_test.go +++ b/receiver/solacereceiver/receiver_test.go @@ -22,8 +22,8 @@ import ( "time" "github.com/stretchr/testify/assert" + "go.opentelemetry.io/collector/component" "go.opentelemetry.io/collector/component/componenttest" - "go.opentelemetry.io/collector/config" "go.opentelemetry.io/collector/consumer/consumererror" "go.opentelemetry.io/collector/consumer/consumertest" "go.opentelemetry.io/collector/pdata/ptrace" @@ -349,7 +349,7 @@ func newReceiver(t *testing.T) (*solaceTracesReceiver, *mockMessagingService, *m metrics := newTestMetrics(t) receiver := &solaceTracesReceiver{ settings: componenttest.NewNopReceiverCreateSettings(), - instanceID: config.NewComponentID(config.Type(t.Name())), + instanceID: component.NewID(component.Type(t.Name())), config: &Config{}, nextConsumer: consumertest.NewNop(), metrics: metrics, diff --git a/receiver/splunkhecreceiver/config_test.go b/receiver/splunkhecreceiver/config_test.go index b628007be622..631d8d90ae6f 100644 --- a/receiver/splunkhecreceiver/config_test.go +++ b/receiver/splunkhecreceiver/config_test.go @@ -20,6 +20,7 @@ import ( "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" + "go.opentelemetry.io/collector/component" "go.opentelemetry.io/collector/config" "go.opentelemetry.io/collector/config/confighttp" "go.opentelemetry.io/collector/config/configtls" @@ -35,17 +36,17 @@ func TestLoadConfig(t *testing.T) { require.NoError(t, err) tests := []struct { - id config.ComponentID - expected config.Receiver + id component.ID + expected component.ReceiverConfig }{ { - id: config.NewComponentID(typeStr), + id: component.NewID(typeStr), expected: createDefaultConfig(), }, { - id: config.NewComponentIDWithName(typeStr, "allsettings"), + id: component.NewIDWithName(typeStr, "allsettings"), expected: &Config{ - ReceiverSettings: config.NewReceiverSettings(config.NewComponentID(typeStr)), + ReceiverSettings: config.NewReceiverSettings(component.NewID(typeStr)), HTTPServerSettings: confighttp.HTTPServerSettings{ Endpoint: "localhost:8088", }, @@ -62,9 +63,9 @@ func TestLoadConfig(t *testing.T) { }, }, { - id: config.NewComponentIDWithName(typeStr, "tls"), + id: component.NewIDWithName(typeStr, "tls"), expected: &Config{ - ReceiverSettings: config.NewReceiverSettings(config.NewComponentID(typeStr)), + ReceiverSettings: config.NewReceiverSettings(component.NewID(typeStr)), HTTPServerSettings: confighttp.HTTPServerSettings{ Endpoint: ":8088", TLSSetting: &configtls.TLSServerSetting{ @@ -95,7 +96,7 @@ func TestLoadConfig(t *testing.T) { sub, err := cm.Sub(tt.id.String()) require.NoError(t, err) - require.NoError(t, config.UnmarshalReceiver(sub, cfg)) + require.NoError(t, component.UnmarshalReceiverConfig(sub, cfg)) assert.NoError(t, cfg.Validate()) assert.Equal(t, tt.expected, cfg) diff --git a/receiver/splunkhecreceiver/factory.go b/receiver/splunkhecreceiver/factory.go index 3779099716d5..2eb989276429 100644 --- a/receiver/splunkhecreceiver/factory.go +++ b/receiver/splunkhecreceiver/factory.go @@ -49,9 +49,9 @@ func NewFactory() component.ReceiverFactory { } // CreateDefaultConfig creates the default configuration for Splunk HEC receiver. -func createDefaultConfig() config.Receiver { +func createDefaultConfig() component.ReceiverConfig { return &Config{ - ReceiverSettings: config.NewReceiverSettings(config.NewComponentID(typeStr)), + ReceiverSettings: config.NewReceiverSettings(component.NewID(typeStr)), HTTPServerSettings: confighttp.HTTPServerSettings{ Endpoint: defaultEndpoint, }, @@ -70,7 +70,7 @@ func createDefaultConfig() config.Receiver { func createMetricsReceiver( _ context.Context, params component.ReceiverCreateSettings, - cfg config.Receiver, + cfg component.ReceiverConfig, consumer consumer.Metrics, ) (component.MetricsReceiver, error) { @@ -87,7 +87,7 @@ func createMetricsReceiver( func createLogsReceiver( _ context.Context, params component.ReceiverCreateSettings, - cfg config.Receiver, + cfg component.ReceiverConfig, consumer consumer.Logs, ) (component.LogsReceiver, error) { diff --git a/receiver/splunkhecreceiver/factory_test.go b/receiver/splunkhecreceiver/factory_test.go index f28c6ba4bc1b..631e3ca36812 100644 --- a/receiver/splunkhecreceiver/factory_test.go +++ b/receiver/splunkhecreceiver/factory_test.go @@ -19,16 +19,15 @@ import ( "testing" "github.com/stretchr/testify/assert" + "go.opentelemetry.io/collector/component" "go.opentelemetry.io/collector/component/componenttest" - "go.opentelemetry.io/collector/config" - "go.opentelemetry.io/collector/config/configtest" "go.opentelemetry.io/collector/consumer/consumertest" ) func TestCreateDefaultConfig(t *testing.T) { cfg := createDefaultConfig() assert.NotNil(t, cfg, "failed to create default config") - assert.NoError(t, configtest.CheckConfigStruct(cfg)) + assert.NoError(t, componenttest.CheckConfigStruct(cfg)) } func TestCreateReceiver(t *testing.T) { @@ -47,7 +46,7 @@ func TestCreateReceiver(t *testing.T) { } func TestFactoryType(t *testing.T) { - assert.Equal(t, config.Type("splunk_hec"), NewFactory().Type()) + assert.Equal(t, component.Type("splunk_hec"), NewFactory().Type()) } func TestCreateNilNextConsumerMetrics(t *testing.T) { diff --git a/receiver/splunkhecreceiver/go.mod b/receiver/splunkhecreceiver/go.mod index 7dde469ce489..ab97048331ce 100644 --- a/receiver/splunkhecreceiver/go.mod +++ b/receiver/splunkhecreceiver/go.mod @@ -9,9 +9,9 @@ require ( github.com/open-telemetry/opentelemetry-collector-contrib/internal/common v0.63.0 github.com/open-telemetry/opentelemetry-collector-contrib/internal/splunk v0.63.0 github.com/stretchr/testify v1.8.1 - go.opentelemetry.io/collector v0.63.2-0.20221104003159-6b27644724d8 - go.opentelemetry.io/collector/pdata v0.63.2-0.20221104003159-6b27644724d8 - go.opentelemetry.io/collector/semconv v0.63.2-0.20221104003159-6b27644724d8 + go.opentelemetry.io/collector v0.63.2-0.20221108014805-0b08d5316426 + go.opentelemetry.io/collector/pdata v0.63.2-0.20221108014805-0b08d5316426 + go.opentelemetry.io/collector/semconv v0.63.2-0.20221108014805-0b08d5316426 go.uber.org/zap v1.23.0 ) @@ -31,11 +31,11 @@ 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 - github.com/open-telemetry/opentelemetry-collector-contrib/internal/coreinternal v0.0.0-00010101000000-000000000000 // indirect + github.com/open-telemetry/opentelemetry-collector-contrib/internal/coreinternal v0.63.0 // indirect github.com/open-telemetry/opentelemetry-collector-contrib/pkg/batchperresourceattr v0.63.0 // indirect github.com/pmezard/go-difflib v1.0.0 // indirect github.com/rs/cors v1.8.2 // indirect - go.opencensus.io v0.23.0 // indirect + go.opencensus.io v0.24.0 // 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 f571c1fdf238..4ead24e00f1c 100644 --- a/receiver/splunkhecreceiver/go.sum +++ b/receiver/splunkhecreceiver/go.sum @@ -234,7 +234,7 @@ github.com/prometheus/client_golang v0.9.1/go.mod h1:7SWBe2y4D6OKWSNQJUaRYU/AaXP github.com/prometheus/client_golang v1.0.0/go.mod h1:db9x61etRT2tGnBNRi70OPL5FsnadC4Ky3P0J6CfImo= github.com/prometheus/client_golang v1.7.1/go.mod h1:PY5Wy2awLA44sXw4AOSfFBetzPP4j5+D6mVACh+pe2M= github.com/prometheus/client_golang v1.11.1/go.mod h1:Z6t4BnS23TR94PD6BsDNk8yVqroYurpAkEiz0P2BEV0= -github.com/prometheus/client_golang v1.13.0 h1:b71QUfeo5M8gq2+evJdTPfZhYMAU0uKPkyPJ7TPsloU= +github.com/prometheus/client_golang v1.13.1 h1:3gMjIY2+/hzmqhtUC/aQNYldJA6DtH3CgQvwS+02K1c= github.com/prometheus/client_model v0.0.0-20180712105110-5c3871d89910/go.mod h1:MbSGuTsp3dbXC40dX6PRTWyKYBIrTGTE9sqQNg2J8bo= github.com/prometheus/client_model v0.0.0-20190129233127-fd36f4220a90/go.mod h1:xMI15A0UPsDsEKsMN9yxemIoYk6Tm2C1GtYGdfGttqA= github.com/prometheus/client_model v0.0.0-20190812154241-14fe0d1b01d4/go.mod h1:xMI15A0UPsDsEKsMN9yxemIoYk6Tm2C1GtYGdfGttqA= @@ -272,7 +272,6 @@ github.com/stretchr/testify v1.2.2/go.mod h1:a8OnRcib4nhh0OaRAV+Yts87kKdq0PP7pXf github.com/stretchr/testify v1.3.0/go.mod h1:M5WIy9Dh21IEIfnGCwXGc5bZfKNJtfHm1UVUgZn+9EI= github.com/stretchr/testify v1.4.0/go.mod h1:j7eGeouHqKxXV5pUuKE4zz7dFj8WfuZ+81PSLYec5m4= github.com/stretchr/testify v1.5.1/go.mod h1:5W2xD1RspED5o8YsWQXVCued0rvSQ+mT+I5cxcmMvtA= -github.com/stretchr/testify v1.6.1/go.mod h1:6Fq8oRcR53rry900zMqJjRRixrwX3KX962/h/Wwjteg= github.com/stretchr/testify v1.7.0/go.mod h1:6Fq8oRcR53rry900zMqJjRRixrwX3KX962/h/Wwjteg= github.com/stretchr/testify v1.7.1/go.mod h1:6Fq8oRcR53rry900zMqJjRRixrwX3KX962/h/Wwjteg= github.com/stretchr/testify v1.8.0/go.mod h1:yNjHg4UonilssWZ8iaSj1OCr/vHnekPRkoO+kdMU+MU= @@ -284,14 +283,14 @@ 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.opencensus.io v0.23.0 h1:gqCw0LfLxScz8irSi8exQc7fyQ0fKQU/qnC/X8+V/1M= -go.opencensus.io v0.23.0/go.mod h1:XItmlyltB5F7CS4xOC1DcqMoFqwtC6OG2xF7mCv7P7E= -go.opentelemetry.io/collector v0.63.2-0.20221104003159-6b27644724d8 h1:rOT5HzXXfSISc6FiH012zH2/EFjp37UXfjEqj5BpkWQ= -go.opentelemetry.io/collector v0.63.2-0.20221104003159-6b27644724d8/go.mod h1:JVmeZXugK4ondC6KQgrHTHWiF4JttpG5k6dWPMt62+k= -go.opentelemetry.io/collector/pdata v0.63.2-0.20221104003159-6b27644724d8 h1:7xeTQjfsOm9eogQeIxjSEhlik9qsbBGsnmkQHfyKaRE= -go.opentelemetry.io/collector/pdata v0.63.2-0.20221104003159-6b27644724d8/go.mod h1:IzvXUGQml2mrnvdb8zIlEW3qQs9oFLdD2hLwJdZ+pek= -go.opentelemetry.io/collector/semconv v0.63.2-0.20221104003159-6b27644724d8 h1:jm0sNPyqo6S165QjQYMBHB2nK50wlJbMYM03Yr3Eo2k= -go.opentelemetry.io/collector/semconv v0.63.2-0.20221104003159-6b27644724d8/go.mod h1:5o9yhOa+ABt7g2E5JABDxGZ1PQPbtfxrKNbYn+LOTXU= +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.63.2-0.20221108014805-0b08d5316426 h1:z/wLTMh7/vNxcFUDa5uG7/IPE3tYx6pzCWPV41ghyV8= +go.opentelemetry.io/collector v0.63.2-0.20221108014805-0b08d5316426/go.mod h1:+Zb70q0Rq17dA9FcHTiTjW6g96lvJ8kAZ0c+eWNkAv0= +go.opentelemetry.io/collector/pdata v0.63.2-0.20221108014805-0b08d5316426 h1:wKDpgP0Tx/gWI2SgDGAY1OTSeihhDivbbRqFR79IGTc= +go.opentelemetry.io/collector/pdata v0.63.2-0.20221108014805-0b08d5316426/go.mod h1:IzvXUGQml2mrnvdb8zIlEW3qQs9oFLdD2hLwJdZ+pek= +go.opentelemetry.io/collector/semconv v0.63.2-0.20221108014805-0b08d5316426 h1:pqIl7OC531J6i9ttBCj3zLmZI/BSF4q323YpK0GgKGk= +go.opentelemetry.io/collector/semconv v0.63.2-0.20221108014805-0b08d5316426/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.go b/receiver/sqlqueryreceiver/config.go index 436d163b3e3e..c28de628d0a8 100644 --- a/receiver/sqlqueryreceiver/config.go +++ b/receiver/sqlqueryreceiver/config.go @@ -19,6 +19,7 @@ import ( "fmt" "time" + "go.opentelemetry.io/collector/component" "go.opentelemetry.io/collector/config" "go.opentelemetry.io/collector/receiver/scraperhelper" "go.uber.org/multierr" @@ -157,10 +158,10 @@ func (a MetricAggregation) Validate() error { return fmt.Errorf("metric config has unsupported aggregation: '%s'", a) } -func createDefaultConfig() config.Receiver { +func createDefaultConfig() component.ReceiverConfig { return &Config{ ScraperControllerSettings: scraperhelper.ScraperControllerSettings{ - ReceiverSettings: config.NewReceiverSettings(config.NewComponentID(typeStr)), + ReceiverSettings: config.NewReceiverSettings(component.NewID(typeStr)), CollectionInterval: 10 * time.Second, }, } diff --git a/receiver/sqlqueryreceiver/config_test.go b/receiver/sqlqueryreceiver/config_test.go index 378cfbfa99e3..7fe806dfe273 100644 --- a/receiver/sqlqueryreceiver/config_test.go +++ b/receiver/sqlqueryreceiver/config_test.go @@ -21,6 +21,7 @@ import ( "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" + "go.opentelemetry.io/collector/component" "go.opentelemetry.io/collector/config" "go.opentelemetry.io/collector/confmap/confmaptest" "go.opentelemetry.io/collector/receiver/scraperhelper" @@ -31,16 +32,16 @@ func TestLoadConfig(t *testing.T) { tests := []struct { fname string - id config.ComponentID - expected config.Receiver + id component.ID + expected component.ReceiverConfig errorMessage string }{ { - id: config.NewComponentIDWithName(typeStr, ""), + id: component.NewIDWithName(typeStr, ""), fname: "config.yaml", expected: &Config{ ScraperControllerSettings: scraperhelper.ScraperControllerSettings{ - ReceiverSettings: config.NewReceiverSettings(config.NewComponentID(typeStr)), + ReceiverSettings: config.NewReceiverSettings(component.NewID(typeStr)), CollectionInterval: 10 * time.Second, }, Driver: "mydriver", @@ -66,57 +67,57 @@ func TestLoadConfig(t *testing.T) { }, { fname: "config-invalid-datatype.yaml", - id: config.NewComponentIDWithName(typeStr, ""), + id: component.NewIDWithName(typeStr, ""), errorMessage: "unsupported data_type: 'xyzgauge'", }, { fname: "config-invalid-valuetype.yaml", - id: config.NewComponentIDWithName(typeStr, ""), + id: component.NewIDWithName(typeStr, ""), errorMessage: "unsupported value_type: 'xyzint'", }, { fname: "config-invalid-aggregation.yaml", - id: config.NewComponentIDWithName(typeStr, ""), + id: component.NewIDWithName(typeStr, ""), errorMessage: "unsupported aggregation: 'xyzcumulative'", }, { fname: "config-invalid-missing-metricname.yaml", - id: config.NewComponentIDWithName(typeStr, ""), + id: component.NewIDWithName(typeStr, ""), errorMessage: "'metric_name' cannot be empty", }, { fname: "config-invalid-missing-valuecolumn.yaml", - id: config.NewComponentIDWithName(typeStr, ""), + id: component.NewIDWithName(typeStr, ""), errorMessage: "'value_column' cannot be empty", }, { fname: "config-invalid-missing-sql.yaml", - id: config.NewComponentIDWithName(typeStr, ""), + id: component.NewIDWithName(typeStr, ""), errorMessage: "'query.sql' cannot be empty", }, { fname: "config-invalid-missing-queries.yaml", - id: config.NewComponentIDWithName(typeStr, ""), + id: component.NewIDWithName(typeStr, ""), errorMessage: "'queries' cannot be empty", }, { fname: "config-invalid-missing-driver.yaml", - id: config.NewComponentIDWithName(typeStr, ""), + id: component.NewIDWithName(typeStr, ""), errorMessage: "'driver' cannot be empty", }, { fname: "config-invalid-missing-metrics.yaml", - id: config.NewComponentIDWithName(typeStr, ""), + id: component.NewIDWithName(typeStr, ""), errorMessage: "'query.metrics' cannot be empty", }, { fname: "config-invalid-missing-datasource.yaml", - id: config.NewComponentIDWithName(typeStr, ""), + id: component.NewIDWithName(typeStr, ""), errorMessage: "'datasource' cannot be empty", }, { fname: "config-unnecessary-aggregation.yaml", - id: config.NewComponentIDWithName(typeStr, ""), + id: component.NewIDWithName(typeStr, ""), errorMessage: "aggregation=cumulative but data_type=gauge does not support aggregation", }, } @@ -131,7 +132,7 @@ func TestLoadConfig(t *testing.T) { sub, err := cm.Sub(tt.id.String()) require.NoError(t, err) - require.NoError(t, config.UnmarshalReceiver(sub, cfg)) + require.NoError(t, component.UnmarshalReceiverConfig(sub, cfg)) if tt.expected == nil { assert.ErrorContains(t, cfg.Validate(), tt.errorMessage) @@ -155,9 +156,9 @@ func TestConfig_Validate_Multierr(t *testing.T) { factory := NewFactory() cfg := factory.CreateDefaultConfig() - sub, err := cm.Sub(config.NewComponentIDWithName(typeStr, "").String()) + sub, err := cm.Sub(component.NewIDWithName(typeStr, "").String()) require.NoError(t, err) - require.NoError(t, config.UnmarshalReceiver(sub, cfg)) + require.NoError(t, component.UnmarshalReceiverConfig(sub, cfg)) err = cfg.Validate() diff --git a/receiver/sqlqueryreceiver/go.mod b/receiver/sqlqueryreceiver/go.mod index d15a6c7af194..79065b2916bb 100644 --- a/receiver/sqlqueryreceiver/go.mod +++ b/receiver/sqlqueryreceiver/go.mod @@ -12,8 +12,8 @@ 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.63.2-0.20221104003159-6b27644724d8 - go.opentelemetry.io/collector/pdata v0.63.2-0.20221104003159-6b27644724d8 + go.opentelemetry.io/collector v0.63.2-0.20221108014805-0b08d5316426 + go.opentelemetry.io/collector/pdata v0.63.2-0.20221108014805-0b08d5316426 go.uber.org/multierr v1.8.0 go.uber.org/zap v1.23.0 ) @@ -78,7 +78,7 @@ require ( github.com/pmezard/go-difflib v1.0.0 // indirect github.com/rogpeppe/go-internal v1.8.1 // indirect github.com/sirupsen/logrus v1.8.1 // indirect - go.opencensus.io v0.23.0 // indirect + go.opencensus.io v0.24.0 // 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 daae675e921b..d89c19884635 100644 --- a/receiver/sqlqueryreceiver/go.sum +++ b/receiver/sqlqueryreceiver/go.sum @@ -792,7 +792,7 @@ github.com/prometheus/client_golang v1.0.0/go.mod h1:db9x61etRT2tGnBNRi70OPL5Fsn github.com/prometheus/client_golang v1.1.0/go.mod h1:I1FGZT9+L76gKKOs5djB6ezCbFQP1xR9D75/vuwEF3g= github.com/prometheus/client_golang v1.7.1/go.mod h1:PY5Wy2awLA44sXw4AOSfFBetzPP4j5+D6mVACh+pe2M= github.com/prometheus/client_golang v1.11.1/go.mod h1:Z6t4BnS23TR94PD6BsDNk8yVqroYurpAkEiz0P2BEV0= -github.com/prometheus/client_golang v1.13.0 h1:b71QUfeo5M8gq2+evJdTPfZhYMAU0uKPkyPJ7TPsloU= +github.com/prometheus/client_golang v1.13.1 h1:3gMjIY2+/hzmqhtUC/aQNYldJA6DtH3CgQvwS+02K1c= github.com/prometheus/client_model v0.0.0-20171117100541-99fa1f4be8e5/go.mod h1:MbSGuTsp3dbXC40dX6PRTWyKYBIrTGTE9sqQNg2J8bo= github.com/prometheus/client_model v0.0.0-20180712105110-5c3871d89910/go.mod h1:MbSGuTsp3dbXC40dX6PRTWyKYBIrTGTE9sqQNg2J8bo= github.com/prometheus/client_model v0.0.0-20190129233127-fd36f4220a90/go.mod h1:xMI15A0UPsDsEKsMN9yxemIoYk6Tm2C1GtYGdfGttqA= @@ -934,12 +934,12 @@ go.opencensus.io v0.21.0/go.mod h1:mSImk1erAIZhrmZN+AvHh14ztQfjbGwt4TtuofqLduU= 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.23.0 h1:gqCw0LfLxScz8irSi8exQc7fyQ0fKQU/qnC/X8+V/1M= -go.opencensus.io v0.23.0/go.mod h1:XItmlyltB5F7CS4xOC1DcqMoFqwtC6OG2xF7mCv7P7E= -go.opentelemetry.io/collector v0.63.2-0.20221104003159-6b27644724d8 h1:rOT5HzXXfSISc6FiH012zH2/EFjp37UXfjEqj5BpkWQ= -go.opentelemetry.io/collector v0.63.2-0.20221104003159-6b27644724d8/go.mod h1:JVmeZXugK4ondC6KQgrHTHWiF4JttpG5k6dWPMt62+k= -go.opentelemetry.io/collector/pdata v0.63.2-0.20221104003159-6b27644724d8 h1:7xeTQjfsOm9eogQeIxjSEhlik9qsbBGsnmkQHfyKaRE= -go.opentelemetry.io/collector/pdata v0.63.2-0.20221104003159-6b27644724d8/go.mod h1:IzvXUGQml2mrnvdb8zIlEW3qQs9oFLdD2hLwJdZ+pek= +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.63.2-0.20221108014805-0b08d5316426 h1:z/wLTMh7/vNxcFUDa5uG7/IPE3tYx6pzCWPV41ghyV8= +go.opentelemetry.io/collector v0.63.2-0.20221108014805-0b08d5316426/go.mod h1:+Zb70q0Rq17dA9FcHTiTjW6g96lvJ8kAZ0c+eWNkAv0= +go.opentelemetry.io/collector/pdata v0.63.2-0.20221108014805-0b08d5316426 h1:wKDpgP0Tx/gWI2SgDGAY1OTSeihhDivbbRqFR79IGTc= +go.opentelemetry.io/collector/pdata v0.63.2-0.20221108014805-0b08d5316426/go.mod h1:IzvXUGQml2mrnvdb8zIlEW3qQs9oFLdD2hLwJdZ+pek= 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/sqlqueryreceiver/receiver.go b/receiver/sqlqueryreceiver/receiver.go index 3c7ef2e357c0..e4ee1abe1403 100644 --- a/receiver/sqlqueryreceiver/receiver.go +++ b/receiver/sqlqueryreceiver/receiver.go @@ -20,7 +20,6 @@ import ( "fmt" "go.opentelemetry.io/collector/component" - "go.opentelemetry.io/collector/config" "go.opentelemetry.io/collector/consumer" "go.opentelemetry.io/collector/receiver/scraperhelper" "go.uber.org/zap" @@ -36,13 +35,13 @@ func createReceiverFunc(sqlOpenerFunc sqlOpenerFunc, clientProviderFunc clientPr return func( ctx context.Context, settings component.ReceiverCreateSettings, - cfg config.Receiver, + cfg component.ReceiverConfig, consumer consumer.Metrics, ) (component.MetricsReceiver, error) { sqlCfg := cfg.(*Config) var opts []scraperhelper.ScraperControllerOption for i, query := range sqlCfg.Queries { - id := config.NewComponentIDWithName("sqlqueryreceiver", fmt.Sprintf("query-%d: %s", i, query.SQL)) + id := component.NewIDWithName("sqlqueryreceiver", fmt.Sprintf("query-%d: %s", i, query.SQL)) mp := &scraper{ id: id, query: query, diff --git a/receiver/sqlqueryreceiver/scraper.go b/receiver/sqlqueryreceiver/scraper.go index 4418db96ae5a..6998c7404739 100644 --- a/receiver/sqlqueryreceiver/scraper.go +++ b/receiver/sqlqueryreceiver/scraper.go @@ -21,7 +21,6 @@ import ( "time" "go.opentelemetry.io/collector/component" - "go.opentelemetry.io/collector/config" "go.opentelemetry.io/collector/pdata/pcommon" "go.opentelemetry.io/collector/pdata/pmetric" "go.opentelemetry.io/collector/receiver/scraperhelper" @@ -30,7 +29,7 @@ import ( ) type scraper struct { - id config.ComponentID + id component.ID query Query scrapeCfg scraperhelper.ScraperControllerSettings startTime pcommon.Timestamp @@ -43,7 +42,7 @@ type scraper struct { var _ scraperhelper.Scraper = (*scraper)(nil) -func (s scraper) ID() config.ComponentID { +func (s scraper) ID() component.ID { return s.id } diff --git a/receiver/sqlserverreceiver/config_test.go b/receiver/sqlserverreceiver/config_test.go index 7c69752130b6..e77b68322739 100644 --- a/receiver/sqlserverreceiver/config_test.go +++ b/receiver/sqlserverreceiver/config_test.go @@ -20,7 +20,7 @@ import ( "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" - "go.opentelemetry.io/collector/config" + "go.opentelemetry.io/collector/component" "go.opentelemetry.io/collector/confmap/confmaptest" "github.com/open-telemetry/opentelemetry-collector-contrib/receiver/sqlserverreceiver/internal/metadata" @@ -62,7 +62,7 @@ func TestLoadConfig(t *testing.T) { sub, err := cm.Sub("sqlserver") require.NoError(t, err) - require.NoError(t, config.UnmarshalReceiver(sub, cfg)) + require.NoError(t, component.UnmarshalReceiverConfig(sub, cfg)) assert.NoError(t, cfg.Validate()) assert.Equal(t, factory.CreateDefaultConfig(), cfg) diff --git a/receiver/sqlserverreceiver/factory.go b/receiver/sqlserverreceiver/factory.go index e60070dda3d2..209ef984017a 100644 --- a/receiver/sqlserverreceiver/factory.go +++ b/receiver/sqlserverreceiver/factory.go @@ -37,10 +37,10 @@ func NewFactory() component.ReceiverFactory { component.WithMetricsReceiver(createMetricsReceiver, stability)) } -func createDefaultConfig() config.Receiver { +func createDefaultConfig() component.ReceiverConfig { return &Config{ ScraperControllerSettings: scraperhelper.ScraperControllerSettings{ - ReceiverSettings: config.NewReceiverSettings(config.NewComponentID(typeStr)), + ReceiverSettings: config.NewReceiverSettings(component.NewID(typeStr)), CollectionInterval: 10 * time.Second, }, Metrics: metadata.DefaultMetricsSettings(), diff --git a/receiver/sqlserverreceiver/factory_others.go b/receiver/sqlserverreceiver/factory_others.go index fa6aee832508..d8a1f99fe58c 100644 --- a/receiver/sqlserverreceiver/factory_others.go +++ b/receiver/sqlserverreceiver/factory_others.go @@ -22,7 +22,6 @@ import ( "errors" "go.opentelemetry.io/collector/component" - "go.opentelemetry.io/collector/config" "go.opentelemetry.io/collector/consumer" ) @@ -30,7 +29,7 @@ import ( func createMetricsReceiver( ctx context.Context, params component.ReceiverCreateSettings, - cfg config.Receiver, + cfg component.ReceiverConfig, consumer consumer.Metrics, ) (component.MetricsReceiver, error) { return nil, errors.New("the sqlserver receiver is only supported on Windows") diff --git a/receiver/sqlserverreceiver/factory_test.go b/receiver/sqlserverreceiver/factory_test.go index c367df546560..57aa2500dabb 100644 --- a/receiver/sqlserverreceiver/factory_test.go +++ b/receiver/sqlserverreceiver/factory_test.go @@ -19,6 +19,7 @@ import ( "time" "github.com/stretchr/testify/require" + "go.opentelemetry.io/collector/component" "go.opentelemetry.io/collector/config" "go.opentelemetry.io/collector/receiver/scraperhelper" @@ -42,9 +43,9 @@ func TestNewFactory(t *testing.T) { testFunc: func(t *testing.T) { factory := NewFactory() - var expectedCfg config.Receiver = &Config{ + var expectedCfg component.ReceiverConfig = &Config{ ScraperControllerSettings: scraperhelper.ScraperControllerSettings{ - ReceiverSettings: config.NewReceiverSettings(config.NewComponentID(typeStr)), + ReceiverSettings: config.NewReceiverSettings(component.NewID(typeStr)), CollectionInterval: 10 * time.Second, }, Metrics: metadata.DefaultMetricsSettings(), diff --git a/receiver/sqlserverreceiver/factory_windows.go b/receiver/sqlserverreceiver/factory_windows.go index 7e05e460e905..98e4a9750971 100644 --- a/receiver/sqlserverreceiver/factory_windows.go +++ b/receiver/sqlserverreceiver/factory_windows.go @@ -22,7 +22,6 @@ import ( "errors" "go.opentelemetry.io/collector/component" - "go.opentelemetry.io/collector/config" "go.opentelemetry.io/collector/consumer" "go.opentelemetry.io/collector/receiver/scraperhelper" ) @@ -33,7 +32,7 @@ var errConfigNotSqlServer = errors.New("config was not a sqlserver receiver conf func createMetricsReceiver( _ context.Context, params component.ReceiverCreateSettings, - receiverCfg config.Receiver, + receiverCfg component.ReceiverConfig, metricsConsumer consumer.Metrics, ) (component.MetricsReceiver, error) { cfg, ok := receiverCfg.(*Config) diff --git a/receiver/sqlserverreceiver/go.mod b/receiver/sqlserverreceiver/go.mod index 0ba40a82df4c..4332bbbcd9f0 100644 --- a/receiver/sqlserverreceiver/go.mod +++ b/receiver/sqlserverreceiver/go.mod @@ -6,8 +6,8 @@ require ( github.com/open-telemetry/opentelemetry-collector-contrib/internal/scrapertest v0.63.0 github.com/open-telemetry/opentelemetry-collector-contrib/pkg/winperfcounters v0.63.0 github.com/stretchr/testify v1.8.1 - go.opentelemetry.io/collector v0.63.2-0.20221104003159-6b27644724d8 - go.opentelemetry.io/collector/pdata v0.63.2-0.20221104003159-6b27644724d8 + go.opentelemetry.io/collector v0.63.2-0.20221108014805-0b08d5316426 + go.opentelemetry.io/collector/pdata v0.63.2-0.20221108014805-0b08d5316426 go.uber.org/multierr v1.8.0 go.uber.org/zap v1.23.0 ) @@ -29,7 +29,7 @@ require ( github.com/pmezard/go-difflib v1.0.0 // indirect github.com/rogpeppe/go-internal v1.8.1 // indirect github.com/stretchr/objx v0.5.0 // indirect - go.opencensus.io v0.23.0 // indirect + go.opencensus.io v0.24.0 // 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 22075e50e9a7..bca73215427c 100644 --- a/receiver/sqlserverreceiver/go.sum +++ b/receiver/sqlserverreceiver/go.sum @@ -232,7 +232,7 @@ github.com/prometheus/client_golang v0.9.1/go.mod h1:7SWBe2y4D6OKWSNQJUaRYU/AaXP github.com/prometheus/client_golang v1.0.0/go.mod h1:db9x61etRT2tGnBNRi70OPL5FsnadC4Ky3P0J6CfImo= github.com/prometheus/client_golang v1.7.1/go.mod h1:PY5Wy2awLA44sXw4AOSfFBetzPP4j5+D6mVACh+pe2M= github.com/prometheus/client_golang v1.11.1/go.mod h1:Z6t4BnS23TR94PD6BsDNk8yVqroYurpAkEiz0P2BEV0= -github.com/prometheus/client_golang v1.13.0 h1:b71QUfeo5M8gq2+evJdTPfZhYMAU0uKPkyPJ7TPsloU= +github.com/prometheus/client_golang v1.13.1 h1:3gMjIY2+/hzmqhtUC/aQNYldJA6DtH3CgQvwS+02K1c= github.com/prometheus/client_model v0.0.0-20180712105110-5c3871d89910/go.mod h1:MbSGuTsp3dbXC40dX6PRTWyKYBIrTGTE9sqQNg2J8bo= github.com/prometheus/client_model v0.0.0-20190129233127-fd36f4220a90/go.mod h1:xMI15A0UPsDsEKsMN9yxemIoYk6Tm2C1GtYGdfGttqA= github.com/prometheus/client_model v0.0.0-20190812154241-14fe0d1b01d4/go.mod h1:xMI15A0UPsDsEKsMN9yxemIoYk6Tm2C1GtYGdfGttqA= @@ -271,7 +271,6 @@ github.com/stretchr/testify v1.2.2/go.mod h1:a8OnRcib4nhh0OaRAV+Yts87kKdq0PP7pXf github.com/stretchr/testify v1.3.0/go.mod h1:M5WIy9Dh21IEIfnGCwXGc5bZfKNJtfHm1UVUgZn+9EI= github.com/stretchr/testify v1.4.0/go.mod h1:j7eGeouHqKxXV5pUuKE4zz7dFj8WfuZ+81PSLYec5m4= github.com/stretchr/testify v1.5.1/go.mod h1:5W2xD1RspED5o8YsWQXVCued0rvSQ+mT+I5cxcmMvtA= -github.com/stretchr/testify v1.6.1/go.mod h1:6Fq8oRcR53rry900zMqJjRRixrwX3KX962/h/Wwjteg= github.com/stretchr/testify v1.7.0/go.mod h1:6Fq8oRcR53rry900zMqJjRRixrwX3KX962/h/Wwjteg= github.com/stretchr/testify v1.7.1/go.mod h1:6Fq8oRcR53rry900zMqJjRRixrwX3KX962/h/Wwjteg= github.com/stretchr/testify v1.8.0/go.mod h1:yNjHg4UonilssWZ8iaSj1OCr/vHnekPRkoO+kdMU+MU= @@ -283,12 +282,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.opencensus.io v0.23.0 h1:gqCw0LfLxScz8irSi8exQc7fyQ0fKQU/qnC/X8+V/1M= -go.opencensus.io v0.23.0/go.mod h1:XItmlyltB5F7CS4xOC1DcqMoFqwtC6OG2xF7mCv7P7E= -go.opentelemetry.io/collector v0.63.2-0.20221104003159-6b27644724d8 h1:rOT5HzXXfSISc6FiH012zH2/EFjp37UXfjEqj5BpkWQ= -go.opentelemetry.io/collector v0.63.2-0.20221104003159-6b27644724d8/go.mod h1:JVmeZXugK4ondC6KQgrHTHWiF4JttpG5k6dWPMt62+k= -go.opentelemetry.io/collector/pdata v0.63.2-0.20221104003159-6b27644724d8 h1:7xeTQjfsOm9eogQeIxjSEhlik9qsbBGsnmkQHfyKaRE= -go.opentelemetry.io/collector/pdata v0.63.2-0.20221104003159-6b27644724d8/go.mod h1:IzvXUGQml2mrnvdb8zIlEW3qQs9oFLdD2hLwJdZ+pek= +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.63.2-0.20221108014805-0b08d5316426 h1:z/wLTMh7/vNxcFUDa5uG7/IPE3tYx6pzCWPV41ghyV8= +go.opentelemetry.io/collector v0.63.2-0.20221108014805-0b08d5316426/go.mod h1:+Zb70q0Rq17dA9FcHTiTjW6g96lvJ8kAZ0c+eWNkAv0= +go.opentelemetry.io/collector/pdata v0.63.2-0.20221108014805-0b08d5316426 h1:wKDpgP0Tx/gWI2SgDGAY1OTSeihhDivbbRqFR79IGTc= +go.opentelemetry.io/collector/pdata v0.63.2-0.20221108014805-0b08d5316426/go.mod h1:IzvXUGQml2mrnvdb8zIlEW3qQs9oFLdD2hLwJdZ+pek= 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 ec8526062395..b70b4be9ae61 100644 --- a/receiver/statsdreceiver/config_test.go +++ b/receiver/statsdreceiver/config_test.go @@ -22,6 +22,7 @@ import ( "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" + "go.opentelemetry.io/collector/component" "go.opentelemetry.io/collector/config" "go.opentelemetry.io/collector/config/confignet" "go.opentelemetry.io/collector/confmap/confmaptest" @@ -36,17 +37,17 @@ func TestLoadConfig(t *testing.T) { require.NoError(t, err) tests := []struct { - id config.ComponentID - expected config.Receiver + id component.ID + expected component.ReceiverConfig }{ { - id: config.NewComponentID(typeStr), + id: component.NewID(typeStr), expected: createDefaultConfig(), }, { - id: config.NewComponentIDWithName(typeStr, "receiver_settings"), + id: component.NewIDWithName(typeStr, "receiver_settings"), expected: &Config{ - ReceiverSettings: config.NewReceiverSettings(config.NewComponentID(typeStr)), + ReceiverSettings: config.NewReceiverSettings(component.NewID(typeStr)), NetAddr: confignet.NetAddr{ Endpoint: "localhost:12345", Transport: "custom_transport", @@ -76,7 +77,7 @@ func TestLoadConfig(t *testing.T) { sub, err := cm.Sub(tt.id.String()) require.NoError(t, err) - require.NoError(t, config.UnmarshalReceiver(sub, cfg)) + require.NoError(t, component.UnmarshalReceiverConfig(sub, cfg)) assert.NoError(t, cfg.Validate()) assert.Equal(t, tt.expected, cfg) diff --git a/receiver/statsdreceiver/factory.go b/receiver/statsdreceiver/factory.go index fb09a21bb5c6..0f3fa98f2b74 100644 --- a/receiver/statsdreceiver/factory.go +++ b/receiver/statsdreceiver/factory.go @@ -50,9 +50,9 @@ func NewFactory() component.ReceiverFactory { ) } -func createDefaultConfig() config.Receiver { +func createDefaultConfig() component.ReceiverConfig { return &Config{ - ReceiverSettings: config.NewReceiverSettings(config.NewComponentID(typeStr)), + ReceiverSettings: config.NewReceiverSettings(component.NewID(typeStr)), NetAddr: confignet.NetAddr{ Endpoint: defaultBindEndpoint, Transport: defaultTransport, @@ -67,7 +67,7 @@ func createDefaultConfig() config.Receiver { func createMetricsReceiver( _ context.Context, params component.ReceiverCreateSettings, - cfg config.Receiver, + cfg component.ReceiverConfig, consumer consumer.Metrics, ) (component.MetricsReceiver, error) { c := cfg.(*Config) diff --git a/receiver/statsdreceiver/factory_test.go b/receiver/statsdreceiver/factory_test.go index 24a6122304a6..2f1fb07f6d37 100644 --- a/receiver/statsdreceiver/factory_test.go +++ b/receiver/statsdreceiver/factory_test.go @@ -23,7 +23,6 @@ import ( "github.com/stretchr/testify/assert" "go.opentelemetry.io/collector/component" "go.opentelemetry.io/collector/component/componenttest" - "go.opentelemetry.io/collector/config/configtest" "go.opentelemetry.io/collector/consumer/consumertest" "github.com/open-telemetry/opentelemetry-collector-contrib/receiver/statsdreceiver/protocol" @@ -45,7 +44,7 @@ func TestCreateDefaultConfig(t *testing.T) { factory := NewFactory() cfg := factory.CreateDefaultConfig() assert.NotNil(t, cfg, "failed to create default config") - assert.NoError(t, configtest.CheckConfigStruct(cfg)) + assert.NoError(t, componenttest.CheckConfigStruct(cfg)) } func TestCreateReceiver(t *testing.T) { diff --git a/receiver/statsdreceiver/go.mod b/receiver/statsdreceiver/go.mod index 6530eb81c6c7..22cdc140f172 100644 --- a/receiver/statsdreceiver/go.mod +++ b/receiver/statsdreceiver/go.mod @@ -7,9 +7,9 @@ require ( github.com/open-telemetry/opentelemetry-collector-contrib/internal/common v0.63.0 github.com/open-telemetry/opentelemetry-collector-contrib/internal/coreinternal v0.63.0 github.com/stretchr/testify v1.8.1 - go.opencensus.io v0.23.0 - go.opentelemetry.io/collector v0.63.2-0.20221104003159-6b27644724d8 - go.opentelemetry.io/collector/pdata v0.63.2-0.20221104003159-6b27644724d8 + go.opencensus.io v0.24.0 + go.opentelemetry.io/collector v0.63.2-0.20221108014805-0b08d5316426 + go.opentelemetry.io/collector/pdata v0.63.2-0.20221108014805-0b08d5316426 go.opentelemetry.io/otel v1.11.1 go.uber.org/multierr v1.8.0 go.uber.org/zap v1.23.0 @@ -38,7 +38,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 - github.com/prometheus/client_golang v1.13.0 // indirect + github.com/prometheus/client_golang v1.13.1 // indirect github.com/prometheus/client_model v0.3.0 // indirect github.com/prometheus/common v0.37.0 // indirect github.com/prometheus/procfs v0.8.0 // indirect diff --git a/receiver/statsdreceiver/go.sum b/receiver/statsdreceiver/go.sum index 6e6f98c74bbf..2f7bcef5fc92 100644 --- a/receiver/statsdreceiver/go.sum +++ b/receiver/statsdreceiver/go.sum @@ -306,8 +306,9 @@ github.com/prometheus/client_golang v1.11.0/go.mod h1:Z6t4BnS23TR94PD6BsDNk8yVqr github.com/prometheus/client_golang v1.11.1/go.mod h1:Z6t4BnS23TR94PD6BsDNk8yVqroYurpAkEiz0P2BEV0= github.com/prometheus/client_golang v1.12.1/go.mod h1:3Z9XVyYiZYEO+YQWt3RD2R3jrbd179Rt297l4aS6nDY= github.com/prometheus/client_golang v1.12.2/go.mod h1:3Z9XVyYiZYEO+YQWt3RD2R3jrbd179Rt297l4aS6nDY= -github.com/prometheus/client_golang v1.13.0 h1:b71QUfeo5M8gq2+evJdTPfZhYMAU0uKPkyPJ7TPsloU= github.com/prometheus/client_golang v1.13.0/go.mod h1:vTeo+zgvILHsnnj/39Ou/1fPN5nJFOEMgftOUOmlvYQ= +github.com/prometheus/client_golang v1.13.1 h1:3gMjIY2+/hzmqhtUC/aQNYldJA6DtH3CgQvwS+02K1c= +github.com/prometheus/client_golang v1.13.1/go.mod h1:vTeo+zgvILHsnnj/39Ou/1fPN5nJFOEMgftOUOmlvYQ= github.com/prometheus/client_model v0.0.0-20180712105110-5c3871d89910/go.mod h1:MbSGuTsp3dbXC40dX6PRTWyKYBIrTGTE9sqQNg2J8bo= github.com/prometheus/client_model v0.0.0-20190129233127-fd36f4220a90/go.mod h1:xMI15A0UPsDsEKsMN9yxemIoYk6Tm2C1GtYGdfGttqA= github.com/prometheus/client_model v0.0.0-20190812154241-14fe0d1b01d4/go.mod h1:xMI15A0UPsDsEKsMN9yxemIoYk6Tm2C1GtYGdfGttqA= @@ -372,13 +373,14 @@ 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.opencensus.io v0.23.0 h1:gqCw0LfLxScz8irSi8exQc7fyQ0fKQU/qnC/X8+V/1M= go.opencensus.io v0.23.0/go.mod h1:XItmlyltB5F7CS4xOC1DcqMoFqwtC6OG2xF7mCv7P7E= -go.opentelemetry.io/collector v0.63.2-0.20221104003159-6b27644724d8 h1:rOT5HzXXfSISc6FiH012zH2/EFjp37UXfjEqj5BpkWQ= -go.opentelemetry.io/collector v0.63.2-0.20221104003159-6b27644724d8/go.mod h1:JVmeZXugK4ondC6KQgrHTHWiF4JttpG5k6dWPMt62+k= -go.opentelemetry.io/collector/pdata v0.63.2-0.20221104003159-6b27644724d8 h1:7xeTQjfsOm9eogQeIxjSEhlik9qsbBGsnmkQHfyKaRE= -go.opentelemetry.io/collector/pdata v0.63.2-0.20221104003159-6b27644724d8/go.mod h1:IzvXUGQml2mrnvdb8zIlEW3qQs9oFLdD2hLwJdZ+pek= -go.opentelemetry.io/collector/semconv v0.63.2-0.20221104003159-6b27644724d8 h1:jm0sNPyqo6S165QjQYMBHB2nK50wlJbMYM03Yr3Eo2k= +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.63.2-0.20221108014805-0b08d5316426 h1:z/wLTMh7/vNxcFUDa5uG7/IPE3tYx6pzCWPV41ghyV8= +go.opentelemetry.io/collector v0.63.2-0.20221108014805-0b08d5316426/go.mod h1:+Zb70q0Rq17dA9FcHTiTjW6g96lvJ8kAZ0c+eWNkAv0= +go.opentelemetry.io/collector/pdata v0.63.2-0.20221108014805-0b08d5316426 h1:wKDpgP0Tx/gWI2SgDGAY1OTSeihhDivbbRqFR79IGTc= +go.opentelemetry.io/collector/pdata v0.63.2-0.20221108014805-0b08d5316426/go.mod h1:IzvXUGQml2mrnvdb8zIlEW3qQs9oFLdD2hLwJdZ+pek= +go.opentelemetry.io/collector/semconv v0.63.2-0.20221108014805-0b08d5316426 h1:pqIl7OC531J6i9ttBCj3zLmZI/BSF4q323YpK0GgKGk= 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/receiver_test.go b/receiver/statsdreceiver/receiver_test.go index 9a7b4d021d34..ea09fc9ccc39 100644 --- a/receiver/statsdreceiver/receiver_test.go +++ b/receiver/statsdreceiver/receiver_test.go @@ -107,7 +107,7 @@ func Test_statsdreceiver_EndToEnd(t *testing.T) { name: "default_config with 9s interval", configFn: func() *Config { return &Config{ - ReceiverSettings: config.NewReceiverSettings(config.NewComponentID(typeStr)), + ReceiverSettings: config.NewReceiverSettings(component.NewID(typeStr)), NetAddr: confignet.NetAddr{ Endpoint: defaultBindEndpoint, Transport: defaultTransport, diff --git a/receiver/statsdreceiver/reporter.go b/receiver/statsdreceiver/reporter.go index ff60e2f05b09..ac73815cd9ac 100644 --- a/receiver/statsdreceiver/reporter.go +++ b/receiver/statsdreceiver/reporter.go @@ -19,7 +19,6 @@ import ( "go.opencensus.io/trace" "go.opentelemetry.io/collector/component" - "go.opentelemetry.io/collector/config" "go.opentelemetry.io/collector/obsreport" "go.uber.org/zap" @@ -29,7 +28,7 @@ import ( // reporter struct implements the transport.Reporter interface to give consistent // observability per Collector metric observability package. type reporter struct { - id config.ComponentID + id component.ID logger *zap.Logger sugaredLogger *zap.SugaredLogger // Used for generic debug logging obsrecv *obsreport.Receiver @@ -37,7 +36,7 @@ type reporter struct { var _ transport.Reporter = (*reporter)(nil) -func newReporter(receiverID config.ComponentID, set component.ReceiverCreateSettings) transport.Reporter { +func newReporter(receiverID component.ID, set component.ReceiverCreateSettings) transport.Reporter { return &reporter{ id: receiverID, logger: set.Logger, diff --git a/receiver/statsdreceiver/reporter_test.go b/receiver/statsdreceiver/reporter_test.go index 1c0808c846e0..d115b5319b30 100644 --- a/receiver/statsdreceiver/reporter_test.go +++ b/receiver/statsdreceiver/reporter_test.go @@ -20,7 +20,7 @@ import ( "testing" "github.com/stretchr/testify/require" - "go.opentelemetry.io/collector/config" + "go.opentelemetry.io/collector/component" "go.opentelemetry.io/collector/obsreport/obsreporttest" ) @@ -31,7 +31,7 @@ func TestReporterObservability(t *testing.T) { require.NoError(t, tt.Shutdown(context.Background())) }() - receiverID := config.NewComponentIDWithName(typeStr, "fake_receiver") + receiverID := component.NewIDWithName(typeStr, "fake_receiver") reporter := newReporter(receiverID, tt.ToReceiverCreateSettings()) ctx := reporter.OnDataReceived(context.Background()) diff --git a/receiver/syslogreceiver/go.mod b/receiver/syslogreceiver/go.mod index e8fed1175e78..483b75aeec14 100644 --- a/receiver/syslogreceiver/go.mod +++ b/receiver/syslogreceiver/go.mod @@ -5,8 +5,8 @@ go 1.18 require ( github.com/open-telemetry/opentelemetry-collector-contrib/pkg/stanza v0.63.0 github.com/stretchr/testify v1.8.1 - go.opentelemetry.io/collector v0.63.2-0.20221104003159-6b27644724d8 - go.opentelemetry.io/collector/pdata v0.63.2-0.20221104003159-6b27644724d8 + go.opentelemetry.io/collector v0.63.2-0.20221108014805-0b08d5316426 + go.opentelemetry.io/collector/pdata v0.63.2-0.20221108014805-0b08d5316426 ) require ( @@ -30,7 +30,7 @@ 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.1 // indirect - go.opencensus.io v0.23.0 // indirect + go.opencensus.io v0.24.0 // 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 22bc16b6ea9b..49ea9fde8d5c 100644 --- a/receiver/syslogreceiver/go.sum +++ b/receiver/syslogreceiver/go.sum @@ -253,7 +253,7 @@ github.com/prometheus/client_golang v0.9.1/go.mod h1:7SWBe2y4D6OKWSNQJUaRYU/AaXP github.com/prometheus/client_golang v1.0.0/go.mod h1:db9x61etRT2tGnBNRi70OPL5FsnadC4Ky3P0J6CfImo= github.com/prometheus/client_golang v1.7.1/go.mod h1:PY5Wy2awLA44sXw4AOSfFBetzPP4j5+D6mVACh+pe2M= github.com/prometheus/client_golang v1.11.1/go.mod h1:Z6t4BnS23TR94PD6BsDNk8yVqroYurpAkEiz0P2BEV0= -github.com/prometheus/client_golang v1.13.0 h1:b71QUfeo5M8gq2+evJdTPfZhYMAU0uKPkyPJ7TPsloU= +github.com/prometheus/client_golang v1.13.1 h1:3gMjIY2+/hzmqhtUC/aQNYldJA6DtH3CgQvwS+02K1c= github.com/prometheus/client_model v0.0.0-20180712105110-5c3871d89910/go.mod h1:MbSGuTsp3dbXC40dX6PRTWyKYBIrTGTE9sqQNg2J8bo= github.com/prometheus/client_model v0.0.0-20190129233127-fd36f4220a90/go.mod h1:xMI15A0UPsDsEKsMN9yxemIoYk6Tm2C1GtYGdfGttqA= github.com/prometheus/client_model v0.0.0-20190812154241-14fe0d1b01d4/go.mod h1:xMI15A0UPsDsEKsMN9yxemIoYk6Tm2C1GtYGdfGttqA= @@ -297,7 +297,6 @@ github.com/stretchr/testify v1.2.2/go.mod h1:a8OnRcib4nhh0OaRAV+Yts87kKdq0PP7pXf github.com/stretchr/testify v1.3.0/go.mod h1:M5WIy9Dh21IEIfnGCwXGc5bZfKNJtfHm1UVUgZn+9EI= github.com/stretchr/testify v1.4.0/go.mod h1:j7eGeouHqKxXV5pUuKE4zz7dFj8WfuZ+81PSLYec5m4= github.com/stretchr/testify v1.5.1/go.mod h1:5W2xD1RspED5o8YsWQXVCued0rvSQ+mT+I5cxcmMvtA= -github.com/stretchr/testify v1.6.1/go.mod h1:6Fq8oRcR53rry900zMqJjRRixrwX3KX962/h/Wwjteg= github.com/stretchr/testify v1.7.0/go.mod h1:6Fq8oRcR53rry900zMqJjRRixrwX3KX962/h/Wwjteg= github.com/stretchr/testify v1.7.1/go.mod h1:6Fq8oRcR53rry900zMqJjRRixrwX3KX962/h/Wwjteg= github.com/stretchr/testify v1.8.0/go.mod h1:yNjHg4UonilssWZ8iaSj1OCr/vHnekPRkoO+kdMU+MU= @@ -309,12 +308,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.opencensus.io v0.23.0 h1:gqCw0LfLxScz8irSi8exQc7fyQ0fKQU/qnC/X8+V/1M= -go.opencensus.io v0.23.0/go.mod h1:XItmlyltB5F7CS4xOC1DcqMoFqwtC6OG2xF7mCv7P7E= -go.opentelemetry.io/collector v0.63.2-0.20221104003159-6b27644724d8 h1:rOT5HzXXfSISc6FiH012zH2/EFjp37UXfjEqj5BpkWQ= -go.opentelemetry.io/collector v0.63.2-0.20221104003159-6b27644724d8/go.mod h1:JVmeZXugK4ondC6KQgrHTHWiF4JttpG5k6dWPMt62+k= -go.opentelemetry.io/collector/pdata v0.63.2-0.20221104003159-6b27644724d8 h1:7xeTQjfsOm9eogQeIxjSEhlik9qsbBGsnmkQHfyKaRE= -go.opentelemetry.io/collector/pdata v0.63.2-0.20221104003159-6b27644724d8/go.mod h1:IzvXUGQml2mrnvdb8zIlEW3qQs9oFLdD2hLwJdZ+pek= +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.63.2-0.20221108014805-0b08d5316426 h1:z/wLTMh7/vNxcFUDa5uG7/IPE3tYx6pzCWPV41ghyV8= +go.opentelemetry.io/collector v0.63.2-0.20221108014805-0b08d5316426/go.mod h1:+Zb70q0Rq17dA9FcHTiTjW6g96lvJ8kAZ0c+eWNkAv0= +go.opentelemetry.io/collector/pdata v0.63.2-0.20221108014805-0b08d5316426 h1:wKDpgP0Tx/gWI2SgDGAY1OTSeihhDivbbRqFR79IGTc= +go.opentelemetry.io/collector/pdata v0.63.2-0.20221108014805-0b08d5316426/go.mod h1:IzvXUGQml2mrnvdb8zIlEW3qQs9oFLdD2hLwJdZ+pek= 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.go b/receiver/syslogreceiver/syslog.go index 1c78dc145062..e619f4c74134 100644 --- a/receiver/syslogreceiver/syslog.go +++ b/receiver/syslogreceiver/syslog.go @@ -41,15 +41,15 @@ func NewFactory() component.ReceiverFactory { type ReceiverType struct{} // Type is the receiver type -func (f ReceiverType) Type() config.Type { +func (f ReceiverType) Type() component.Type { return typeStr } // CreateDefaultConfig creates a config with type and version -func (f ReceiverType) CreateDefaultConfig() config.Receiver { +func (f ReceiverType) CreateDefaultConfig() component.ReceiverConfig { return &SysLogConfig{ BaseConfig: adapter.BaseConfig{ - ReceiverSettings: config.NewReceiverSettings(config.NewComponentID(typeStr)), + ReceiverSettings: config.NewReceiverSettings(component.NewID(typeStr)), Operators: []operator.Config{}, }, InputConfig: *syslog.NewConfig(), @@ -57,7 +57,7 @@ func (f ReceiverType) CreateDefaultConfig() config.Receiver { } // BaseConfig gets the base config from config, for now -func (f ReceiverType) BaseConfig(cfg config.Receiver) adapter.BaseConfig { +func (f ReceiverType) BaseConfig(cfg component.ReceiverConfig) adapter.BaseConfig { return cfg.(*SysLogConfig).BaseConfig } @@ -68,7 +68,7 @@ type SysLogConfig struct { } // InputConfig unmarshals the input operator -func (f ReceiverType) InputConfig(cfg config.Receiver) operator.Config { +func (f ReceiverType) InputConfig(cfg component.ReceiverConfig) operator.Config { return operator.NewConfig(&cfg.(*SysLogConfig).InputConfig) } diff --git a/receiver/syslogreceiver/syslog_test.go b/receiver/syslogreceiver/syslog_test.go index 43711dd42e37..583614a50a5d 100644 --- a/receiver/syslogreceiver/syslog_test.go +++ b/receiver/syslogreceiver/syslog_test.go @@ -24,6 +24,7 @@ import ( "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" + "go.opentelemetry.io/collector/component" "go.opentelemetry.io/collector/component/componenttest" "go.opentelemetry.io/collector/config" "go.opentelemetry.io/collector/confmap/confmaptest" @@ -95,7 +96,7 @@ func TestLoadConfig(t *testing.T) { sub, err := cm.Sub("syslog") require.NoError(t, err) - require.NoError(t, config.UnmarshalReceiver(sub, cfg)) + require.NoError(t, component.UnmarshalReceiverConfig(sub, cfg)) assert.NoError(t, cfg.Validate()) assert.Equal(t, testdataConfigYaml(), cfg) @@ -104,7 +105,7 @@ func TestLoadConfig(t *testing.T) { func testdataConfigYaml() *SysLogConfig { return &SysLogConfig{ BaseConfig: adapter.BaseConfig{ - ReceiverSettings: config.NewReceiverSettings(config.NewComponentID(typeStr)), + ReceiverSettings: config.NewReceiverSettings(component.NewID(typeStr)), Operators: []operator.Config{}, }, InputConfig: func() syslog.Config { @@ -120,7 +121,7 @@ func testdataConfigYaml() *SysLogConfig { func testdataUDPConfig() *SysLogConfig { return &SysLogConfig{ BaseConfig: adapter.BaseConfig{ - ReceiverSettings: config.NewReceiverSettings(config.NewComponentID(typeStr)), + ReceiverSettings: config.NewReceiverSettings(component.NewID(typeStr)), Operators: []operator.Config{}, }, InputConfig: func() syslog.Config { @@ -138,7 +139,7 @@ func TestDecodeInputConfigFailure(t *testing.T) { factory := NewFactory() badCfg := &SysLogConfig{ BaseConfig: adapter.BaseConfig{ - ReceiverSettings: config.NewReceiverSettings(config.NewComponentID(typeStr)), + ReceiverSettings: config.NewReceiverSettings(component.NewID(typeStr)), Operators: []operator.Config{}, }, InputConfig: func() syslog.Config { diff --git a/receiver/tcplogreceiver/go.mod b/receiver/tcplogreceiver/go.mod index a9d81e35164d..b801ae1174c2 100644 --- a/receiver/tcplogreceiver/go.mod +++ b/receiver/tcplogreceiver/go.mod @@ -5,7 +5,7 @@ go 1.18 require ( github.com/open-telemetry/opentelemetry-collector-contrib/pkg/stanza v0.63.0 github.com/stretchr/testify v1.8.1 - go.opentelemetry.io/collector v0.63.2-0.20221104003159-6b27644724d8 + go.opentelemetry.io/collector v0.63.2-0.20221108014805-0b08d5316426 ) require ( @@ -27,8 +27,8 @@ 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.1 // indirect - go.opencensus.io v0.23.0 // indirect - go.opentelemetry.io/collector/pdata v0.63.2-0.20221104003159-6b27644724d8 // indirect + go.opencensus.io v0.24.0 // indirect + go.opentelemetry.io/collector/pdata v0.63.2-0.20221108014805-0b08d5316426 // 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 484bc7fb4e02..f3e8c88580ac 100644 --- a/receiver/tcplogreceiver/go.sum +++ b/receiver/tcplogreceiver/go.sum @@ -249,7 +249,7 @@ github.com/prometheus/client_golang v0.9.1/go.mod h1:7SWBe2y4D6OKWSNQJUaRYU/AaXP github.com/prometheus/client_golang v1.0.0/go.mod h1:db9x61etRT2tGnBNRi70OPL5FsnadC4Ky3P0J6CfImo= github.com/prometheus/client_golang v1.7.1/go.mod h1:PY5Wy2awLA44sXw4AOSfFBetzPP4j5+D6mVACh+pe2M= github.com/prometheus/client_golang v1.11.1/go.mod h1:Z6t4BnS23TR94PD6BsDNk8yVqroYurpAkEiz0P2BEV0= -github.com/prometheus/client_golang v1.13.0 h1:b71QUfeo5M8gq2+evJdTPfZhYMAU0uKPkyPJ7TPsloU= +github.com/prometheus/client_golang v1.13.1 h1:3gMjIY2+/hzmqhtUC/aQNYldJA6DtH3CgQvwS+02K1c= github.com/prometheus/client_model v0.0.0-20180712105110-5c3871d89910/go.mod h1:MbSGuTsp3dbXC40dX6PRTWyKYBIrTGTE9sqQNg2J8bo= github.com/prometheus/client_model v0.0.0-20190129233127-fd36f4220a90/go.mod h1:xMI15A0UPsDsEKsMN9yxemIoYk6Tm2C1GtYGdfGttqA= github.com/prometheus/client_model v0.0.0-20190812154241-14fe0d1b01d4/go.mod h1:xMI15A0UPsDsEKsMN9yxemIoYk6Tm2C1GtYGdfGttqA= @@ -293,7 +293,6 @@ github.com/stretchr/testify v1.2.2/go.mod h1:a8OnRcib4nhh0OaRAV+Yts87kKdq0PP7pXf github.com/stretchr/testify v1.3.0/go.mod h1:M5WIy9Dh21IEIfnGCwXGc5bZfKNJtfHm1UVUgZn+9EI= github.com/stretchr/testify v1.4.0/go.mod h1:j7eGeouHqKxXV5pUuKE4zz7dFj8WfuZ+81PSLYec5m4= github.com/stretchr/testify v1.5.1/go.mod h1:5W2xD1RspED5o8YsWQXVCued0rvSQ+mT+I5cxcmMvtA= -github.com/stretchr/testify v1.6.1/go.mod h1:6Fq8oRcR53rry900zMqJjRRixrwX3KX962/h/Wwjteg= github.com/stretchr/testify v1.7.0/go.mod h1:6Fq8oRcR53rry900zMqJjRRixrwX3KX962/h/Wwjteg= github.com/stretchr/testify v1.7.1/go.mod h1:6Fq8oRcR53rry900zMqJjRRixrwX3KX962/h/Wwjteg= github.com/stretchr/testify v1.8.0/go.mod h1:yNjHg4UonilssWZ8iaSj1OCr/vHnekPRkoO+kdMU+MU= @@ -305,12 +304,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.opencensus.io v0.23.0 h1:gqCw0LfLxScz8irSi8exQc7fyQ0fKQU/qnC/X8+V/1M= -go.opencensus.io v0.23.0/go.mod h1:XItmlyltB5F7CS4xOC1DcqMoFqwtC6OG2xF7mCv7P7E= -go.opentelemetry.io/collector v0.63.2-0.20221104003159-6b27644724d8 h1:rOT5HzXXfSISc6FiH012zH2/EFjp37UXfjEqj5BpkWQ= -go.opentelemetry.io/collector v0.63.2-0.20221104003159-6b27644724d8/go.mod h1:JVmeZXugK4ondC6KQgrHTHWiF4JttpG5k6dWPMt62+k= -go.opentelemetry.io/collector/pdata v0.63.2-0.20221104003159-6b27644724d8 h1:7xeTQjfsOm9eogQeIxjSEhlik9qsbBGsnmkQHfyKaRE= -go.opentelemetry.io/collector/pdata v0.63.2-0.20221104003159-6b27644724d8/go.mod h1:IzvXUGQml2mrnvdb8zIlEW3qQs9oFLdD2hLwJdZ+pek= +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.63.2-0.20221108014805-0b08d5316426 h1:z/wLTMh7/vNxcFUDa5uG7/IPE3tYx6pzCWPV41ghyV8= +go.opentelemetry.io/collector v0.63.2-0.20221108014805-0b08d5316426/go.mod h1:+Zb70q0Rq17dA9FcHTiTjW6g96lvJ8kAZ0c+eWNkAv0= +go.opentelemetry.io/collector/pdata v0.63.2-0.20221108014805-0b08d5316426 h1:wKDpgP0Tx/gWI2SgDGAY1OTSeihhDivbbRqFR79IGTc= +go.opentelemetry.io/collector/pdata v0.63.2-0.20221108014805-0b08d5316426/go.mod h1:IzvXUGQml2mrnvdb8zIlEW3qQs9oFLdD2hLwJdZ+pek= 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.go b/receiver/tcplogreceiver/tcp.go index 965723936880..3dac50469b05 100644 --- a/receiver/tcplogreceiver/tcp.go +++ b/receiver/tcplogreceiver/tcp.go @@ -38,15 +38,15 @@ func NewFactory() component.ReceiverFactory { type ReceiverType struct{} // Type is the receiver type -func (f ReceiverType) Type() config.Type { +func (f ReceiverType) Type() component.Type { return typeStr } // CreateDefaultConfig creates a config with type and version -func (f ReceiverType) CreateDefaultConfig() config.Receiver { +func (f ReceiverType) CreateDefaultConfig() component.ReceiverConfig { return &TCPLogConfig{ BaseConfig: adapter.BaseConfig{ - ReceiverSettings: config.NewReceiverSettings(config.NewComponentID(typeStr)), + ReceiverSettings: config.NewReceiverSettings(component.NewID(typeStr)), Operators: []operator.Config{}, }, InputConfig: *tcp.NewConfig(), @@ -54,7 +54,7 @@ func (f ReceiverType) CreateDefaultConfig() config.Receiver { } // BaseConfig gets the base config from config, for now -func (f ReceiverType) BaseConfig(cfg config.Receiver) adapter.BaseConfig { +func (f ReceiverType) BaseConfig(cfg component.ReceiverConfig) adapter.BaseConfig { return cfg.(*TCPLogConfig).BaseConfig } @@ -65,6 +65,6 @@ type TCPLogConfig struct { } // InputConfig unmarshals the input operator -func (f ReceiverType) InputConfig(cfg config.Receiver) operator.Config { +func (f ReceiverType) InputConfig(cfg component.ReceiverConfig) operator.Config { return operator.NewConfig(&cfg.(*TCPLogConfig).InputConfig) } diff --git a/receiver/tcplogreceiver/tcp_test.go b/receiver/tcplogreceiver/tcp_test.go index 6d5ad69d7328..d35d93663f62 100644 --- a/receiver/tcplogreceiver/tcp_test.go +++ b/receiver/tcplogreceiver/tcp_test.go @@ -24,6 +24,7 @@ import ( "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" + "go.opentelemetry.io/collector/component" "go.opentelemetry.io/collector/component/componenttest" "go.opentelemetry.io/collector/config" "go.opentelemetry.io/collector/confmap/confmaptest" @@ -81,7 +82,7 @@ func TestLoadConfig(t *testing.T) { sub, err := cm.Sub("tcplog") require.NoError(t, err) - require.NoError(t, config.UnmarshalReceiver(sub, cfg)) + require.NoError(t, component.UnmarshalReceiverConfig(sub, cfg)) assert.NoError(t, cfg.Validate()) assert.Equal(t, testdataConfigYaml(), cfg) @@ -90,7 +91,7 @@ func TestLoadConfig(t *testing.T) { func testdataConfigYaml() *TCPLogConfig { return &TCPLogConfig{ BaseConfig: adapter.BaseConfig{ - ReceiverSettings: config.NewReceiverSettings(config.NewComponentID(typeStr)), + ReceiverSettings: config.NewReceiverSettings(component.NewID(typeStr)), Operators: []operator.Config{}, }, InputConfig: func() tcp.Config { @@ -105,7 +106,7 @@ func TestDecodeInputConfigFailure(t *testing.T) { factory := NewFactory() badCfg := &TCPLogConfig{ BaseConfig: adapter.BaseConfig{ - ReceiverSettings: config.NewReceiverSettings(config.NewComponentID(typeStr)), + ReceiverSettings: config.NewReceiverSettings(component.NewID(typeStr)), Operators: []operator.Config{}, }, InputConfig: func() tcp.Config { diff --git a/receiver/udplogreceiver/go.mod b/receiver/udplogreceiver/go.mod index 6350f0d7476c..c9d3cc3e54fd 100644 --- a/receiver/udplogreceiver/go.mod +++ b/receiver/udplogreceiver/go.mod @@ -5,7 +5,7 @@ go 1.18 require ( github.com/open-telemetry/opentelemetry-collector-contrib/pkg/stanza v0.63.0 github.com/stretchr/testify v1.8.1 - go.opentelemetry.io/collector v0.63.2-0.20221104003159-6b27644724d8 + go.opentelemetry.io/collector v0.63.2-0.20221108014805-0b08d5316426 ) require ( @@ -26,8 +26,8 @@ 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.1 // indirect - go.opencensus.io v0.23.0 // indirect - go.opentelemetry.io/collector/pdata v0.63.2-0.20221104003159-6b27644724d8 // indirect + go.opencensus.io v0.24.0 // indirect + go.opentelemetry.io/collector/pdata v0.63.2-0.20221108014805-0b08d5316426 // 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 3d5579ca4619..93643f5961d8 100644 --- a/receiver/udplogreceiver/go.sum +++ b/receiver/udplogreceiver/go.sum @@ -248,7 +248,7 @@ github.com/prometheus/client_golang v0.9.1/go.mod h1:7SWBe2y4D6OKWSNQJUaRYU/AaXP github.com/prometheus/client_golang v1.0.0/go.mod h1:db9x61etRT2tGnBNRi70OPL5FsnadC4Ky3P0J6CfImo= github.com/prometheus/client_golang v1.7.1/go.mod h1:PY5Wy2awLA44sXw4AOSfFBetzPP4j5+D6mVACh+pe2M= github.com/prometheus/client_golang v1.11.1/go.mod h1:Z6t4BnS23TR94PD6BsDNk8yVqroYurpAkEiz0P2BEV0= -github.com/prometheus/client_golang v1.13.0 h1:b71QUfeo5M8gq2+evJdTPfZhYMAU0uKPkyPJ7TPsloU= +github.com/prometheus/client_golang v1.13.1 h1:3gMjIY2+/hzmqhtUC/aQNYldJA6DtH3CgQvwS+02K1c= github.com/prometheus/client_model v0.0.0-20180712105110-5c3871d89910/go.mod h1:MbSGuTsp3dbXC40dX6PRTWyKYBIrTGTE9sqQNg2J8bo= github.com/prometheus/client_model v0.0.0-20190129233127-fd36f4220a90/go.mod h1:xMI15A0UPsDsEKsMN9yxemIoYk6Tm2C1GtYGdfGttqA= github.com/prometheus/client_model v0.0.0-20190812154241-14fe0d1b01d4/go.mod h1:xMI15A0UPsDsEKsMN9yxemIoYk6Tm2C1GtYGdfGttqA= @@ -292,7 +292,6 @@ github.com/stretchr/testify v1.2.2/go.mod h1:a8OnRcib4nhh0OaRAV+Yts87kKdq0PP7pXf github.com/stretchr/testify v1.3.0/go.mod h1:M5WIy9Dh21IEIfnGCwXGc5bZfKNJtfHm1UVUgZn+9EI= github.com/stretchr/testify v1.4.0/go.mod h1:j7eGeouHqKxXV5pUuKE4zz7dFj8WfuZ+81PSLYec5m4= github.com/stretchr/testify v1.5.1/go.mod h1:5W2xD1RspED5o8YsWQXVCued0rvSQ+mT+I5cxcmMvtA= -github.com/stretchr/testify v1.6.1/go.mod h1:6Fq8oRcR53rry900zMqJjRRixrwX3KX962/h/Wwjteg= github.com/stretchr/testify v1.7.0/go.mod h1:6Fq8oRcR53rry900zMqJjRRixrwX3KX962/h/Wwjteg= github.com/stretchr/testify v1.7.1/go.mod h1:6Fq8oRcR53rry900zMqJjRRixrwX3KX962/h/Wwjteg= github.com/stretchr/testify v1.8.0/go.mod h1:yNjHg4UonilssWZ8iaSj1OCr/vHnekPRkoO+kdMU+MU= @@ -304,12 +303,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.opencensus.io v0.23.0 h1:gqCw0LfLxScz8irSi8exQc7fyQ0fKQU/qnC/X8+V/1M= -go.opencensus.io v0.23.0/go.mod h1:XItmlyltB5F7CS4xOC1DcqMoFqwtC6OG2xF7mCv7P7E= -go.opentelemetry.io/collector v0.63.2-0.20221104003159-6b27644724d8 h1:rOT5HzXXfSISc6FiH012zH2/EFjp37UXfjEqj5BpkWQ= -go.opentelemetry.io/collector v0.63.2-0.20221104003159-6b27644724d8/go.mod h1:JVmeZXugK4ondC6KQgrHTHWiF4JttpG5k6dWPMt62+k= -go.opentelemetry.io/collector/pdata v0.63.2-0.20221104003159-6b27644724d8 h1:7xeTQjfsOm9eogQeIxjSEhlik9qsbBGsnmkQHfyKaRE= -go.opentelemetry.io/collector/pdata v0.63.2-0.20221104003159-6b27644724d8/go.mod h1:IzvXUGQml2mrnvdb8zIlEW3qQs9oFLdD2hLwJdZ+pek= +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.63.2-0.20221108014805-0b08d5316426 h1:z/wLTMh7/vNxcFUDa5uG7/IPE3tYx6pzCWPV41ghyV8= +go.opentelemetry.io/collector v0.63.2-0.20221108014805-0b08d5316426/go.mod h1:+Zb70q0Rq17dA9FcHTiTjW6g96lvJ8kAZ0c+eWNkAv0= +go.opentelemetry.io/collector/pdata v0.63.2-0.20221108014805-0b08d5316426 h1:wKDpgP0Tx/gWI2SgDGAY1OTSeihhDivbbRqFR79IGTc= +go.opentelemetry.io/collector/pdata v0.63.2-0.20221108014805-0b08d5316426/go.mod h1:IzvXUGQml2mrnvdb8zIlEW3qQs9oFLdD2hLwJdZ+pek= 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.go b/receiver/udplogreceiver/udp.go index 0536fb037cb4..8673794ac16f 100644 --- a/receiver/udplogreceiver/udp.go +++ b/receiver/udplogreceiver/udp.go @@ -38,15 +38,15 @@ func NewFactory() component.ReceiverFactory { type ReceiverType struct{} // Type is the receiver type -func (f ReceiverType) Type() config.Type { +func (f ReceiverType) Type() component.Type { return typeStr } // CreateDefaultConfig creates a config with type and version -func (f ReceiverType) CreateDefaultConfig() config.Receiver { +func (f ReceiverType) CreateDefaultConfig() component.ReceiverConfig { return &UDPLogConfig{ BaseConfig: adapter.BaseConfig{ - ReceiverSettings: config.NewReceiverSettings(config.NewComponentID(typeStr)), + ReceiverSettings: config.NewReceiverSettings(component.NewID(typeStr)), Operators: []operator.Config{}, }, InputConfig: *udp.NewConfig(), @@ -54,7 +54,7 @@ func (f ReceiverType) CreateDefaultConfig() config.Receiver { } // BaseConfig gets the base config from config, for now -func (f ReceiverType) BaseConfig(cfg config.Receiver) adapter.BaseConfig { +func (f ReceiverType) BaseConfig(cfg component.ReceiverConfig) adapter.BaseConfig { return cfg.(*UDPLogConfig).BaseConfig } @@ -65,6 +65,6 @@ type UDPLogConfig struct { } // InputConfig unmarshals the input operator -func (f ReceiverType) InputConfig(cfg config.Receiver) operator.Config { +func (f ReceiverType) InputConfig(cfg component.ReceiverConfig) operator.Config { return operator.NewConfig(&cfg.(*UDPLogConfig).InputConfig) } diff --git a/receiver/udplogreceiver/udp_test.go b/receiver/udplogreceiver/udp_test.go index 473895f14015..5534c66da5ff 100644 --- a/receiver/udplogreceiver/udp_test.go +++ b/receiver/udplogreceiver/udp_test.go @@ -24,6 +24,7 @@ import ( "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" + "go.opentelemetry.io/collector/component" "go.opentelemetry.io/collector/component/componenttest" "go.opentelemetry.io/collector/config" "go.opentelemetry.io/collector/confmap/confmaptest" @@ -85,7 +86,7 @@ func TestLoadConfig(t *testing.T) { sub, err := cm.Sub("udplog") require.NoError(t, err) - require.NoError(t, config.UnmarshalReceiver(sub, cfg)) + require.NoError(t, component.UnmarshalReceiverConfig(sub, cfg)) assert.NoError(t, cfg.Validate()) assert.Equal(t, testdataConfigYaml(), cfg) @@ -94,7 +95,7 @@ func TestLoadConfig(t *testing.T) { func testdataConfigYaml() *UDPLogConfig { return &UDPLogConfig{ BaseConfig: adapter.BaseConfig{ - ReceiverSettings: config.NewReceiverSettings(config.NewComponentID("udplog")), + ReceiverSettings: config.NewReceiverSettings(component.NewID("udplog")), Operators: []operator.Config{}, }, InputConfig: func() udp.Config { @@ -110,7 +111,7 @@ func TestDecodeInputConfigFailure(t *testing.T) { factory := NewFactory() badCfg := &UDPLogConfig{ BaseConfig: adapter.BaseConfig{ - ReceiverSettings: config.NewReceiverSettings(config.NewComponentID("udplog")), + ReceiverSettings: config.NewReceiverSettings(component.NewID("udplog")), Operators: []operator.Config{}, }, InputConfig: func() udp.Config { diff --git a/receiver/vcenterreceiver/config_test.go b/receiver/vcenterreceiver/config_test.go index 298c7f8b881e..722680d76f43 100644 --- a/receiver/vcenterreceiver/config_test.go +++ b/receiver/vcenterreceiver/config_test.go @@ -23,6 +23,7 @@ import ( "github.com/google/go-cmp/cmp" "github.com/google/go-cmp/cmp/cmpopts" "github.com/stretchr/testify/require" + "go.opentelemetry.io/collector/component" "go.opentelemetry.io/collector/config" "go.opentelemetry.io/collector/config/configtls" "go.opentelemetry.io/collector/confmap/confmaptest" @@ -100,9 +101,9 @@ func TestLoadConfig(t *testing.T) { factory := NewFactory() cfg := factory.CreateDefaultConfig() - sub, err := cm.Sub(config.NewComponentIDWithName(typeStr, "").String()) + sub, err := cm.Sub(component.NewIDWithName(typeStr, "").String()) require.NoError(t, err) - require.NoError(t, config.UnmarshalReceiver(sub, cfg)) + require.NoError(t, component.UnmarshalReceiverConfig(sub, cfg)) expected := factory.CreateDefaultConfig().(*Config) expected.Endpoint = "http://vcsa.host.localnet" diff --git a/receiver/vcenterreceiver/factory.go b/receiver/vcenterreceiver/factory.go index 05fb6700bc80..af634e562966 100644 --- a/receiver/vcenterreceiver/factory.go +++ b/receiver/vcenterreceiver/factory.go @@ -42,10 +42,10 @@ func NewFactory() component.ReceiverFactory { ) } -func createDefaultConfig() config.Receiver { +func createDefaultConfig() component.ReceiverConfig { return &Config{ ScraperControllerSettings: scraperhelper.ScraperControllerSettings{ - ReceiverSettings: config.NewReceiverSettings(config.NewComponentID(typeStr)), + ReceiverSettings: config.NewReceiverSettings(component.NewID(typeStr)), CollectionInterval: 2 * time.Minute, }, TLSClientSetting: configtls.TLSClientSetting{}, @@ -58,7 +58,7 @@ var errConfigNotVcenter = errors.New("config was not an vcenter receiver config" func createMetricsReceiver( _ context.Context, params component.ReceiverCreateSettings, - rConf config.Receiver, + rConf component.ReceiverConfig, consumer consumer.Metrics, ) (component.MetricsReceiver, error) { cfg, ok := rConf.(*Config) diff --git a/receiver/vcenterreceiver/go.mod b/receiver/vcenterreceiver/go.mod index 79059dd94ae6..9270ac9b7dfa 100644 --- a/receiver/vcenterreceiver/go.mod +++ b/receiver/vcenterreceiver/go.mod @@ -5,8 +5,8 @@ go 1.18 require ( github.com/google/go-cmp v0.5.9 github.com/vmware/govmomi v0.29.0 - go.opentelemetry.io/collector v0.63.2-0.20221104003159-6b27644724d8 - go.opentelemetry.io/collector/pdata v0.63.2-0.20221104003159-6b27644724d8 + go.opentelemetry.io/collector v0.63.2-0.20221108014805-0b08d5316426 + go.opentelemetry.io/collector/pdata v0.63.2-0.20221108014805-0b08d5316426 go.uber.org/multierr v1.8.0 go.uber.org/zap v1.23.0 ) @@ -40,7 +40,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.opencensus.io v0.23.0 // indirect + go.opencensus.io v0.24.0 // 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 d22fad7e6d29..0414ede9ee89 100644 --- a/receiver/vcenterreceiver/go.sum +++ b/receiver/vcenterreceiver/go.sum @@ -238,7 +238,7 @@ github.com/prometheus/client_golang v0.9.1/go.mod h1:7SWBe2y4D6OKWSNQJUaRYU/AaXP github.com/prometheus/client_golang v1.0.0/go.mod h1:db9x61etRT2tGnBNRi70OPL5FsnadC4Ky3P0J6CfImo= github.com/prometheus/client_golang v1.7.1/go.mod h1:PY5Wy2awLA44sXw4AOSfFBetzPP4j5+D6mVACh+pe2M= github.com/prometheus/client_golang v1.11.1/go.mod h1:Z6t4BnS23TR94PD6BsDNk8yVqroYurpAkEiz0P2BEV0= -github.com/prometheus/client_golang v1.13.0 h1:b71QUfeo5M8gq2+evJdTPfZhYMAU0uKPkyPJ7TPsloU= +github.com/prometheus/client_golang v1.13.1 h1:3gMjIY2+/hzmqhtUC/aQNYldJA6DtH3CgQvwS+02K1c= github.com/prometheus/client_model v0.0.0-20180712105110-5c3871d89910/go.mod h1:MbSGuTsp3dbXC40dX6PRTWyKYBIrTGTE9sqQNg2J8bo= github.com/prometheus/client_model v0.0.0-20190129233127-fd36f4220a90/go.mod h1:xMI15A0UPsDsEKsMN9yxemIoYk6Tm2C1GtYGdfGttqA= github.com/prometheus/client_model v0.0.0-20190812154241-14fe0d1b01d4/go.mod h1:xMI15A0UPsDsEKsMN9yxemIoYk6Tm2C1GtYGdfGttqA= @@ -276,7 +276,6 @@ github.com/stretchr/testify v1.2.2/go.mod h1:a8OnRcib4nhh0OaRAV+Yts87kKdq0PP7pXf github.com/stretchr/testify v1.3.0/go.mod h1:M5WIy9Dh21IEIfnGCwXGc5bZfKNJtfHm1UVUgZn+9EI= github.com/stretchr/testify v1.4.0/go.mod h1:j7eGeouHqKxXV5pUuKE4zz7dFj8WfuZ+81PSLYec5m4= github.com/stretchr/testify v1.5.1/go.mod h1:5W2xD1RspED5o8YsWQXVCued0rvSQ+mT+I5cxcmMvtA= -github.com/stretchr/testify v1.6.1/go.mod h1:6Fq8oRcR53rry900zMqJjRRixrwX3KX962/h/Wwjteg= github.com/stretchr/testify v1.7.0/go.mod h1:6Fq8oRcR53rry900zMqJjRRixrwX3KX962/h/Wwjteg= github.com/stretchr/testify v1.7.1/go.mod h1:6Fq8oRcR53rry900zMqJjRRixrwX3KX962/h/Wwjteg= github.com/stretchr/testify v1.8.0/go.mod h1:yNjHg4UonilssWZ8iaSj1OCr/vHnekPRkoO+kdMU+MU= @@ -290,12 +289,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.opencensus.io v0.23.0 h1:gqCw0LfLxScz8irSi8exQc7fyQ0fKQU/qnC/X8+V/1M= -go.opencensus.io v0.23.0/go.mod h1:XItmlyltB5F7CS4xOC1DcqMoFqwtC6OG2xF7mCv7P7E= -go.opentelemetry.io/collector v0.63.2-0.20221104003159-6b27644724d8 h1:rOT5HzXXfSISc6FiH012zH2/EFjp37UXfjEqj5BpkWQ= -go.opentelemetry.io/collector v0.63.2-0.20221104003159-6b27644724d8/go.mod h1:JVmeZXugK4ondC6KQgrHTHWiF4JttpG5k6dWPMt62+k= -go.opentelemetry.io/collector/pdata v0.63.2-0.20221104003159-6b27644724d8 h1:7xeTQjfsOm9eogQeIxjSEhlik9qsbBGsnmkQHfyKaRE= -go.opentelemetry.io/collector/pdata v0.63.2-0.20221104003159-6b27644724d8/go.mod h1:IzvXUGQml2mrnvdb8zIlEW3qQs9oFLdD2hLwJdZ+pek= +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.63.2-0.20221108014805-0b08d5316426 h1:z/wLTMh7/vNxcFUDa5uG7/IPE3tYx6pzCWPV41ghyV8= +go.opentelemetry.io/collector v0.63.2-0.20221108014805-0b08d5316426/go.mod h1:+Zb70q0Rq17dA9FcHTiTjW6g96lvJ8kAZ0c+eWNkAv0= +go.opentelemetry.io/collector/pdata v0.63.2-0.20221108014805-0b08d5316426 h1:wKDpgP0Tx/gWI2SgDGAY1OTSeihhDivbbRqFR79IGTc= +go.opentelemetry.io/collector/pdata v0.63.2-0.20221108014805-0b08d5316426/go.mod h1:IzvXUGQml2mrnvdb8zIlEW3qQs9oFLdD2hLwJdZ+pek= 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 23e8f715f959..8e6adc35afa4 100644 --- a/receiver/wavefrontreceiver/config_test.go +++ b/receiver/wavefrontreceiver/config_test.go @@ -21,6 +21,7 @@ import ( "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" + "go.opentelemetry.io/collector/component" "go.opentelemetry.io/collector/config" "go.opentelemetry.io/collector/config/confignet" "go.opentelemetry.io/collector/confmap/confmaptest" @@ -33,17 +34,17 @@ func TestLoadConfig(t *testing.T) { require.NoError(t, err) tests := []struct { - id config.ComponentID - expected config.Receiver + id component.ID + expected component.ReceiverConfig }{ { - id: config.NewComponentID(typeStr), + id: component.NewID(typeStr), expected: createDefaultConfig(), }, { - id: config.NewComponentIDWithName(typeStr, "allsettings"), + id: component.NewIDWithName(typeStr, "allsettings"), expected: &Config{ - ReceiverSettings: config.NewReceiverSettings(config.NewComponentID(typeStr)), + ReceiverSettings: config.NewReceiverSettings(component.NewID(typeStr)), TCPAddr: confignet.TCPAddr{ Endpoint: "localhost:8080", }, @@ -60,7 +61,7 @@ func TestLoadConfig(t *testing.T) { sub, err := cm.Sub(tt.id.String()) require.NoError(t, err) - require.NoError(t, config.UnmarshalReceiver(sub, cfg)) + require.NoError(t, component.UnmarshalReceiverConfig(sub, cfg)) assert.NoError(t, cfg.Validate()) assert.Equal(t, tt.expected, cfg) diff --git a/receiver/wavefrontreceiver/factory.go b/receiver/wavefrontreceiver/factory.go index f0f3f7dfe8c2..7eedb71a6c1c 100644 --- a/receiver/wavefrontreceiver/factory.go +++ b/receiver/wavefrontreceiver/factory.go @@ -44,9 +44,9 @@ func NewFactory() component.ReceiverFactory { component.WithMetricsReceiver(createMetricsReceiver, stability)) } -func createDefaultConfig() config.Receiver { +func createDefaultConfig() component.ReceiverConfig { return &Config{ - ReceiverSettings: config.NewReceiverSettings(config.NewComponentID(typeStr)), + ReceiverSettings: config.NewReceiverSettings(component.NewID(typeStr)), TCPAddr: confignet.TCPAddr{ Endpoint: "localhost:2003", }, @@ -57,7 +57,7 @@ func createDefaultConfig() config.Receiver { func createMetricsReceiver( ctx context.Context, params component.ReceiverCreateSettings, - cfg config.Receiver, + cfg component.ReceiverConfig, consumer consumer.Metrics, ) (component.MetricsReceiver, error) { diff --git a/receiver/wavefrontreceiver/factory_test.go b/receiver/wavefrontreceiver/factory_test.go index e8c37dcda178..e66334a5d0f4 100644 --- a/receiver/wavefrontreceiver/factory_test.go +++ b/receiver/wavefrontreceiver/factory_test.go @@ -20,7 +20,6 @@ import ( "github.com/stretchr/testify/assert" "go.opentelemetry.io/collector/component/componenttest" - "go.opentelemetry.io/collector/config/configtest" "go.opentelemetry.io/collector/consumer/consumertest" ) @@ -28,7 +27,7 @@ func TestCreateDefaultConfig(t *testing.T) { factory := NewFactory() cfg := factory.CreateDefaultConfig() assert.NotNil(t, cfg, "failed to create default config") - assert.NoError(t, configtest.CheckConfigStruct(cfg)) + assert.NoError(t, componenttest.CheckConfigStruct(cfg)) } func TestCreateReceiver(t *testing.T) { diff --git a/receiver/wavefrontreceiver/go.mod b/receiver/wavefrontreceiver/go.mod index f51f24266502..3a7debf1222c 100644 --- a/receiver/wavefrontreceiver/go.mod +++ b/receiver/wavefrontreceiver/go.mod @@ -9,7 +9,7 @@ require ( github.com/open-telemetry/opentelemetry-collector-contrib/receiver/carbonreceiver v0.63.0 github.com/open-telemetry/opentelemetry-collector-contrib/receiver/collectdreceiver v0.63.0 github.com/stretchr/testify v1.8.1 - go.opentelemetry.io/collector v0.63.2-0.20221104003159-6b27644724d8 + go.opentelemetry.io/collector v0.63.2-0.20221108014805-0b08d5316426 google.golang.org/protobuf v1.28.1 ) @@ -27,9 +27,9 @@ require ( github.com/modern-go/reflect2 v1.0.2 // indirect github.com/open-telemetry/opentelemetry-collector-contrib/internal/coreinternal v0.63.0 // indirect github.com/pmezard/go-difflib v1.0.0 // indirect - go.opencensus.io v0.23.0 // indirect - go.opentelemetry.io/collector/pdata v0.63.2-0.20221104003159-6b27644724d8 // indirect - go.opentelemetry.io/collector/semconv v0.63.2-0.20221104003159-6b27644724d8 // indirect + go.opencensus.io v0.24.0 // indirect + go.opentelemetry.io/collector/pdata v0.63.2-0.20221108014805-0b08d5316426 // indirect + go.opentelemetry.io/collector/semconv v0.63.2-0.20221108014805-0b08d5316426 // 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 5295d237395f..04a2beac7f58 100644 --- a/receiver/wavefrontreceiver/go.sum +++ b/receiver/wavefrontreceiver/go.sum @@ -226,7 +226,7 @@ github.com/prometheus/client_golang v0.9.1/go.mod h1:7SWBe2y4D6OKWSNQJUaRYU/AaXP github.com/prometheus/client_golang v1.0.0/go.mod h1:db9x61etRT2tGnBNRi70OPL5FsnadC4Ky3P0J6CfImo= github.com/prometheus/client_golang v1.7.1/go.mod h1:PY5Wy2awLA44sXw4AOSfFBetzPP4j5+D6mVACh+pe2M= github.com/prometheus/client_golang v1.11.1/go.mod h1:Z6t4BnS23TR94PD6BsDNk8yVqroYurpAkEiz0P2BEV0= -github.com/prometheus/client_golang v1.13.0 h1:b71QUfeo5M8gq2+evJdTPfZhYMAU0uKPkyPJ7TPsloU= +github.com/prometheus/client_golang v1.13.1 h1:3gMjIY2+/hzmqhtUC/aQNYldJA6DtH3CgQvwS+02K1c= github.com/prometheus/client_model v0.0.0-20180712105110-5c3871d89910/go.mod h1:MbSGuTsp3dbXC40dX6PRTWyKYBIrTGTE9sqQNg2J8bo= github.com/prometheus/client_model v0.0.0-20190129233127-fd36f4220a90/go.mod h1:xMI15A0UPsDsEKsMN9yxemIoYk6Tm2C1GtYGdfGttqA= github.com/prometheus/client_model v0.0.0-20190812154241-14fe0d1b01d4/go.mod h1:xMI15A0UPsDsEKsMN9yxemIoYk6Tm2C1GtYGdfGttqA= @@ -261,7 +261,6 @@ github.com/stretchr/testify v1.2.2/go.mod h1:a8OnRcib4nhh0OaRAV+Yts87kKdq0PP7pXf github.com/stretchr/testify v1.3.0/go.mod h1:M5WIy9Dh21IEIfnGCwXGc5bZfKNJtfHm1UVUgZn+9EI= github.com/stretchr/testify v1.4.0/go.mod h1:j7eGeouHqKxXV5pUuKE4zz7dFj8WfuZ+81PSLYec5m4= github.com/stretchr/testify v1.5.1/go.mod h1:5W2xD1RspED5o8YsWQXVCued0rvSQ+mT+I5cxcmMvtA= -github.com/stretchr/testify v1.6.1/go.mod h1:6Fq8oRcR53rry900zMqJjRRixrwX3KX962/h/Wwjteg= github.com/stretchr/testify v1.7.0/go.mod h1:6Fq8oRcR53rry900zMqJjRRixrwX3KX962/h/Wwjteg= github.com/stretchr/testify v1.7.1/go.mod h1:6Fq8oRcR53rry900zMqJjRRixrwX3KX962/h/Wwjteg= github.com/stretchr/testify v1.8.0/go.mod h1:yNjHg4UonilssWZ8iaSj1OCr/vHnekPRkoO+kdMU+MU= @@ -273,14 +272,14 @@ 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.opencensus.io v0.23.0 h1:gqCw0LfLxScz8irSi8exQc7fyQ0fKQU/qnC/X8+V/1M= -go.opencensus.io v0.23.0/go.mod h1:XItmlyltB5F7CS4xOC1DcqMoFqwtC6OG2xF7mCv7P7E= -go.opentelemetry.io/collector v0.63.2-0.20221104003159-6b27644724d8 h1:rOT5HzXXfSISc6FiH012zH2/EFjp37UXfjEqj5BpkWQ= -go.opentelemetry.io/collector v0.63.2-0.20221104003159-6b27644724d8/go.mod h1:JVmeZXugK4ondC6KQgrHTHWiF4JttpG5k6dWPMt62+k= -go.opentelemetry.io/collector/pdata v0.63.2-0.20221104003159-6b27644724d8 h1:7xeTQjfsOm9eogQeIxjSEhlik9qsbBGsnmkQHfyKaRE= -go.opentelemetry.io/collector/pdata v0.63.2-0.20221104003159-6b27644724d8/go.mod h1:IzvXUGQml2mrnvdb8zIlEW3qQs9oFLdD2hLwJdZ+pek= -go.opentelemetry.io/collector/semconv v0.63.2-0.20221104003159-6b27644724d8 h1:jm0sNPyqo6S165QjQYMBHB2nK50wlJbMYM03Yr3Eo2k= -go.opentelemetry.io/collector/semconv v0.63.2-0.20221104003159-6b27644724d8/go.mod h1:5o9yhOa+ABt7g2E5JABDxGZ1PQPbtfxrKNbYn+LOTXU= +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.63.2-0.20221108014805-0b08d5316426 h1:z/wLTMh7/vNxcFUDa5uG7/IPE3tYx6pzCWPV41ghyV8= +go.opentelemetry.io/collector v0.63.2-0.20221108014805-0b08d5316426/go.mod h1:+Zb70q0Rq17dA9FcHTiTjW6g96lvJ8kAZ0c+eWNkAv0= +go.opentelemetry.io/collector/pdata v0.63.2-0.20221108014805-0b08d5316426 h1:wKDpgP0Tx/gWI2SgDGAY1OTSeihhDivbbRqFR79IGTc= +go.opentelemetry.io/collector/pdata v0.63.2-0.20221108014805-0b08d5316426/go.mod h1:IzvXUGQml2mrnvdb8zIlEW3qQs9oFLdD2hLwJdZ+pek= +go.opentelemetry.io/collector/semconv v0.63.2-0.20221108014805-0b08d5316426 h1:pqIl7OC531J6i9ttBCj3zLmZI/BSF4q323YpK0GgKGk= +go.opentelemetry.io/collector/semconv v0.63.2-0.20221108014805-0b08d5316426/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 91d3e118141d..f91480e318d9 100644 --- a/receiver/windowseventlogreceiver/go.mod +++ b/receiver/windowseventlogreceiver/go.mod @@ -5,7 +5,7 @@ go 1.18 require ( github.com/open-telemetry/opentelemetry-collector-contrib/pkg/stanza v0.63.0 github.com/stretchr/testify v1.8.1 - go.opentelemetry.io/collector v0.63.2-0.20221104003159-6b27644724d8 + go.opentelemetry.io/collector v0.63.2-0.20221108014805-0b08d5316426 golang.org/x/sys v0.0.0-20220919091848-fb04ddd9f9c8 ) @@ -27,8 +27,8 @@ 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.1 // indirect - go.opencensus.io v0.23.0 // indirect - go.opentelemetry.io/collector/pdata v0.63.2-0.20221104003159-6b27644724d8 // indirect + go.opencensus.io v0.24.0 // indirect + go.opentelemetry.io/collector/pdata v0.63.2-0.20221108014805-0b08d5316426 // 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 0832059b5a7a..81b829064fb4 100644 --- a/receiver/windowseventlogreceiver/go.sum +++ b/receiver/windowseventlogreceiver/go.sum @@ -248,7 +248,7 @@ github.com/prometheus/client_golang v0.9.1/go.mod h1:7SWBe2y4D6OKWSNQJUaRYU/AaXP github.com/prometheus/client_golang v1.0.0/go.mod h1:db9x61etRT2tGnBNRi70OPL5FsnadC4Ky3P0J6CfImo= github.com/prometheus/client_golang v1.7.1/go.mod h1:PY5Wy2awLA44sXw4AOSfFBetzPP4j5+D6mVACh+pe2M= github.com/prometheus/client_golang v1.11.1/go.mod h1:Z6t4BnS23TR94PD6BsDNk8yVqroYurpAkEiz0P2BEV0= -github.com/prometheus/client_golang v1.13.0 h1:b71QUfeo5M8gq2+evJdTPfZhYMAU0uKPkyPJ7TPsloU= +github.com/prometheus/client_golang v1.13.1 h1:3gMjIY2+/hzmqhtUC/aQNYldJA6DtH3CgQvwS+02K1c= github.com/prometheus/client_model v0.0.0-20180712105110-5c3871d89910/go.mod h1:MbSGuTsp3dbXC40dX6PRTWyKYBIrTGTE9sqQNg2J8bo= github.com/prometheus/client_model v0.0.0-20190129233127-fd36f4220a90/go.mod h1:xMI15A0UPsDsEKsMN9yxemIoYk6Tm2C1GtYGdfGttqA= github.com/prometheus/client_model v0.0.0-20190812154241-14fe0d1b01d4/go.mod h1:xMI15A0UPsDsEKsMN9yxemIoYk6Tm2C1GtYGdfGttqA= @@ -291,7 +291,6 @@ github.com/stretchr/testify v1.2.2/go.mod h1:a8OnRcib4nhh0OaRAV+Yts87kKdq0PP7pXf github.com/stretchr/testify v1.3.0/go.mod h1:M5WIy9Dh21IEIfnGCwXGc5bZfKNJtfHm1UVUgZn+9EI= github.com/stretchr/testify v1.4.0/go.mod h1:j7eGeouHqKxXV5pUuKE4zz7dFj8WfuZ+81PSLYec5m4= github.com/stretchr/testify v1.5.1/go.mod h1:5W2xD1RspED5o8YsWQXVCued0rvSQ+mT+I5cxcmMvtA= -github.com/stretchr/testify v1.6.1/go.mod h1:6Fq8oRcR53rry900zMqJjRRixrwX3KX962/h/Wwjteg= github.com/stretchr/testify v1.7.0/go.mod h1:6Fq8oRcR53rry900zMqJjRRixrwX3KX962/h/Wwjteg= github.com/stretchr/testify v1.7.1/go.mod h1:6Fq8oRcR53rry900zMqJjRRixrwX3KX962/h/Wwjteg= github.com/stretchr/testify v1.8.0/go.mod h1:yNjHg4UonilssWZ8iaSj1OCr/vHnekPRkoO+kdMU+MU= @@ -303,12 +302,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.opencensus.io v0.23.0 h1:gqCw0LfLxScz8irSi8exQc7fyQ0fKQU/qnC/X8+V/1M= -go.opencensus.io v0.23.0/go.mod h1:XItmlyltB5F7CS4xOC1DcqMoFqwtC6OG2xF7mCv7P7E= -go.opentelemetry.io/collector v0.63.2-0.20221104003159-6b27644724d8 h1:rOT5HzXXfSISc6FiH012zH2/EFjp37UXfjEqj5BpkWQ= -go.opentelemetry.io/collector v0.63.2-0.20221104003159-6b27644724d8/go.mod h1:JVmeZXugK4ondC6KQgrHTHWiF4JttpG5k6dWPMt62+k= -go.opentelemetry.io/collector/pdata v0.63.2-0.20221104003159-6b27644724d8 h1:7xeTQjfsOm9eogQeIxjSEhlik9qsbBGsnmkQHfyKaRE= -go.opentelemetry.io/collector/pdata v0.63.2-0.20221104003159-6b27644724d8/go.mod h1:IzvXUGQml2mrnvdb8zIlEW3qQs9oFLdD2hLwJdZ+pek= +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.63.2-0.20221108014805-0b08d5316426 h1:z/wLTMh7/vNxcFUDa5uG7/IPE3tYx6pzCWPV41ghyV8= +go.opentelemetry.io/collector v0.63.2-0.20221108014805-0b08d5316426/go.mod h1:+Zb70q0Rq17dA9FcHTiTjW6g96lvJ8kAZ0c+eWNkAv0= +go.opentelemetry.io/collector/pdata v0.63.2-0.20221108014805-0b08d5316426 h1:wKDpgP0Tx/gWI2SgDGAY1OTSeihhDivbbRqFR79IGTc= +go.opentelemetry.io/collector/pdata v0.63.2-0.20221108014805-0b08d5316426/go.mod h1:IzvXUGQml2mrnvdb8zIlEW3qQs9oFLdD2hLwJdZ+pek= 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/receiver_others.go b/receiver/windowseventlogreceiver/receiver_others.go index 586735393331..3e5fdd99bd60 100644 --- a/receiver/windowseventlogreceiver/receiver_others.go +++ b/receiver/windowseventlogreceiver/receiver_others.go @@ -42,10 +42,10 @@ func NewFactory() component.ReceiverFactory { component.WithLogsReceiver(createLogsReceiver, stability)) } -func createDefaultConfig() config.Receiver { +func createDefaultConfig() component.ReceiverConfig { return &WindowsLogConfig{ BaseConfig: adapter.BaseConfig{ - ReceiverSettings: config.NewReceiverSettings(config.NewComponentID(typeStr)), + ReceiverSettings: config.NewReceiverSettings(component.NewID(typeStr)), Operators: []operator.Config{}, }, } @@ -54,7 +54,7 @@ func createDefaultConfig() config.Receiver { func createLogsReceiver( _ context.Context, params component.ReceiverCreateSettings, - cfg config.Receiver, + cfg component.ReceiverConfig, consumer consumer.Logs, ) (component.LogsReceiver, error) { return nil, fmt.Errorf("windows eventlog receiver is only supported on Windows") diff --git a/receiver/windowseventlogreceiver/receiver_others_test.go b/receiver/windowseventlogreceiver/receiver_others_test.go index a13074305c3f..cbf0eace7a3d 100644 --- a/receiver/windowseventlogreceiver/receiver_others_test.go +++ b/receiver/windowseventlogreceiver/receiver_others_test.go @@ -23,7 +23,6 @@ import ( "github.com/stretchr/testify/require" "go.opentelemetry.io/collector/component/componenttest" - "go.opentelemetry.io/collector/config/configtest" "go.opentelemetry.io/collector/consumer/consumertest" ) @@ -31,7 +30,7 @@ func TestDefaultConfigFailure(t *testing.T) { factory := NewFactory() cfg := factory.CreateDefaultConfig() require.NotNil(t, cfg, "failed to create default config") - require.NoError(t, configtest.CheckConfigStruct(cfg)) + require.NoError(t, componenttest.CheckConfigStruct(cfg)) receiver, err := factory.CreateLogsReceiver( context.Background(), diff --git a/receiver/windowseventlogreceiver/receiver_windows.go b/receiver/windowseventlogreceiver/receiver_windows.go index 9d7f07effac1..27def60f4b6b 100644 --- a/receiver/windowseventlogreceiver/receiver_windows.go +++ b/receiver/windowseventlogreceiver/receiver_windows.go @@ -41,15 +41,15 @@ func NewFactory() component.ReceiverFactory { type ReceiverType struct{} // Type is the receiver type -func (f ReceiverType) Type() config.Type { +func (f ReceiverType) Type() component.Type { return typeStr } // CreateDefaultConfig creates a config with type and version -func (f ReceiverType) CreateDefaultConfig() config.Receiver { +func (f ReceiverType) CreateDefaultConfig() component.ReceiverConfig { return &WindowsLogConfig{ BaseConfig: adapter.BaseConfig{ - ReceiverSettings: config.NewReceiverSettings(config.NewComponentID(typeStr)), + ReceiverSettings: config.NewReceiverSettings(component.NewID(typeStr)), Operators: []operator.Config{}, }, InputConfig: *windows.NewConfig(), @@ -57,12 +57,12 @@ func (f ReceiverType) CreateDefaultConfig() config.Receiver { } // BaseConfig gets the base config from config, for now -func (f ReceiverType) BaseConfig(cfg config.Receiver) adapter.BaseConfig { +func (f ReceiverType) BaseConfig(cfg component.ReceiverConfig) adapter.BaseConfig { return cfg.(*WindowsLogConfig).BaseConfig } // InputConfig unmarshals the input operator -func (f ReceiverType) InputConfig(cfg config.Receiver) operator.Config { +func (f ReceiverType) InputConfig(cfg component.ReceiverConfig) operator.Config { return operator.NewConfig(&cfg.(*WindowsLogConfig).InputConfig) } diff --git a/receiver/windowseventlogreceiver/receiver_windows_test.go b/receiver/windowseventlogreceiver/receiver_windows_test.go index 3d12de80de84..a5430542b969 100644 --- a/receiver/windowseventlogreceiver/receiver_windows_test.go +++ b/receiver/windowseventlogreceiver/receiver_windows_test.go @@ -25,9 +25,9 @@ import ( "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" + "go.opentelemetry.io/collector/component" "go.opentelemetry.io/collector/component/componenttest" "go.opentelemetry.io/collector/config" - "go.opentelemetry.io/collector/config/configtest" "go.opentelemetry.io/collector/confmap/confmaptest" "go.opentelemetry.io/collector/consumer/consumertest" "golang.org/x/sys/windows/svc/eventlog" @@ -41,7 +41,7 @@ func TestDefaultConfig(t *testing.T) { factory := NewFactory() cfg := factory.CreateDefaultConfig() require.NotNil(t, cfg, "failed to create default config") - require.NoError(t, configtest.CheckConfigStruct(cfg)) + require.NoError(t, componenttest.CheckConfigStruct(cfg)) } func TestLoadConfig(t *testing.T) { @@ -50,9 +50,9 @@ func TestLoadConfig(t *testing.T) { factory := NewFactory() cfg := factory.CreateDefaultConfig() - sub, err := cm.Sub(config.NewComponentIDWithName(typeStr, "").String()) + sub, err := cm.Sub(component.NewIDWithName(typeStr, "").String()) require.NoError(t, err) - require.NoError(t, config.UnmarshalReceiver(sub, cfg)) + require.NoError(t, component.UnmarshalReceiverConfig(sub, cfg)) assert.Equal(t, createTestConfig(), cfg) } @@ -136,7 +136,7 @@ func TestReadWindowsEventLogger(t *testing.T) { func createTestConfig() *WindowsLogConfig { return &WindowsLogConfig{ BaseConfig: adapter.BaseConfig{ - ReceiverSettings: config.NewReceiverSettings(config.NewComponentID(typeStr)), + ReceiverSettings: config.NewReceiverSettings(component.NewID(typeStr)), Operators: []operator.Config{}, }, InputConfig: func() windows.Config { diff --git a/receiver/windowsperfcountersreceiver/config_test.go b/receiver/windowsperfcountersreceiver/config_test.go index 42f8dd3073e3..a978a91a528a 100644 --- a/receiver/windowsperfcountersreceiver/config_test.go +++ b/receiver/windowsperfcountersreceiver/config_test.go @@ -22,6 +22,7 @@ import ( "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" + "go.opentelemetry.io/collector/component" "go.opentelemetry.io/collector/config" "go.opentelemetry.io/collector/confmap/confmaptest" "go.opentelemetry.io/collector/receiver/scraperhelper" @@ -58,19 +59,19 @@ func TestLoadConfig(t *testing.T) { } tests := []struct { - id config.ComponentID - expected config.Receiver + id component.ID + expected component.ReceiverConfig expectedErr string }{ { - id: config.NewComponentIDWithName(typeStr, ""), + id: component.NewIDWithName(typeStr, ""), expected: singleObject, }, { - id: config.NewComponentIDWithName(typeStr, "customname"), + id: component.NewIDWithName(typeStr, "customname"), expected: &Config{ ScraperControllerSettings: scraperhelper.ScraperControllerSettings{ - ReceiverSettings: config.NewReceiverSettings(config.NewComponentID(typeStr)), + ReceiverSettings: config.NewReceiverSettings(component.NewID(typeStr)), CollectionInterval: 30 * time.Second, }, PerfCounters: []ObjectConfig{ @@ -106,10 +107,10 @@ func TestLoadConfig(t *testing.T) { }, }, { - id: config.NewComponentIDWithName(typeStr, "nometrics"), + id: component.NewIDWithName(typeStr, "nometrics"), expected: &Config{ ScraperControllerSettings: scraperhelper.ScraperControllerSettings{ - ReceiverSettings: config.NewReceiverSettings(config.NewComponentID(typeStr)), + ReceiverSettings: config.NewReceiverSettings(component.NewID(typeStr)), CollectionInterval: 60 * time.Second, }, PerfCounters: []ObjectConfig{ @@ -121,10 +122,10 @@ func TestLoadConfig(t *testing.T) { }, }, { - id: config.NewComponentIDWithName(typeStr, "nometricspecified"), + id: component.NewIDWithName(typeStr, "nometricspecified"), expected: &Config{ ScraperControllerSettings: scraperhelper.ScraperControllerSettings{ - ReceiverSettings: config.NewReceiverSettings(config.NewComponentID(typeStr)), + ReceiverSettings: config.NewReceiverSettings(component.NewID(typeStr)), CollectionInterval: 60 * time.Second, }, PerfCounters: []ObjectConfig{ @@ -143,10 +144,10 @@ func TestLoadConfig(t *testing.T) { }, }, { - id: config.NewComponentIDWithName(typeStr, "summetric"), + id: component.NewIDWithName(typeStr, "summetric"), expected: &Config{ ScraperControllerSettings: scraperhelper.ScraperControllerSettings{ - ReceiverSettings: config.NewReceiverSettings(config.NewComponentID(typeStr)), + ReceiverSettings: config.NewReceiverSettings(component.NewID(typeStr)), CollectionInterval: 60 * time.Second, }, PerfCounters: []ObjectConfig{ @@ -168,10 +169,10 @@ func TestLoadConfig(t *testing.T) { }, }, { - id: config.NewComponentIDWithName(typeStr, "unspecifiedmetrictype"), + id: component.NewIDWithName(typeStr, "unspecifiedmetrictype"), expected: &Config{ ScraperControllerSettings: scraperhelper.ScraperControllerSettings{ - ReceiverSettings: config.NewReceiverSettings(config.NewComponentID(typeStr)), + ReceiverSettings: config.NewReceiverSettings(component.NewID(typeStr)), CollectionInterval: 60 * time.Second, }, PerfCounters: []ObjectConfig{ @@ -190,23 +191,23 @@ func TestLoadConfig(t *testing.T) { }, }, { - id: config.NewComponentIDWithName(typeStr, "negative-collection-interval"), + id: component.NewIDWithName(typeStr, "negative-collection-interval"), expectedErr: negativeCollectionIntervalErr, }, { - id: config.NewComponentIDWithName(typeStr, "noperfcounters"), + id: component.NewIDWithName(typeStr, "noperfcounters"), expectedErr: noPerfCountersErr, }, { - id: config.NewComponentIDWithName(typeStr, "noobjectname"), + id: component.NewIDWithName(typeStr, "noobjectname"), expectedErr: noObjectNameErr, }, { - id: config.NewComponentIDWithName(typeStr, "nocounters"), + id: component.NewIDWithName(typeStr, "nocounters"), expectedErr: fmt.Sprintf(noCountersErr, "object"), }, { - id: config.NewComponentIDWithName(typeStr, "allerrors"), + id: component.NewIDWithName(typeStr, "allerrors"), expectedErr: fmt.Sprintf( "%s; %s; %s; %s", negativeCollectionIntervalErr, @@ -216,7 +217,7 @@ func TestLoadConfig(t *testing.T) { ), }, { - id: config.NewComponentIDWithName(typeStr, "emptyinstance"), + id: component.NewIDWithName(typeStr, "emptyinstance"), expectedErr: fmt.Sprintf(emptyInstanceErr, "object"), }, } @@ -228,7 +229,7 @@ func TestLoadConfig(t *testing.T) { sub, err := cm.Sub(tt.id.String()) require.NoError(t, err) - require.NoError(t, config.UnmarshalReceiver(sub, cfg)) + require.NoError(t, component.UnmarshalReceiverConfig(sub, cfg)) if tt.expectedErr != "" { assert.Equal(t, cfg.Validate().Error(), tt.expectedErr) diff --git a/receiver/windowsperfcountersreceiver/factory.go b/receiver/windowsperfcountersreceiver/factory.go index 1e3e4e753396..6c12787264bc 100644 --- a/receiver/windowsperfcountersreceiver/factory.go +++ b/receiver/windowsperfcountersreceiver/factory.go @@ -40,10 +40,10 @@ func NewFactory() component.ReceiverFactory { } // createDefaultConfig creates the default configuration for receiver. -func createDefaultConfig() config.Receiver { +func createDefaultConfig() component.ReceiverConfig { return &Config{ ScraperControllerSettings: scraperhelper.ScraperControllerSettings{ - ReceiverSettings: config.NewReceiverSettings(config.NewComponentID(typeStr)), + ReceiverSettings: config.NewReceiverSettings(component.NewID(typeStr)), CollectionInterval: time.Minute, }, } diff --git a/receiver/windowsperfcountersreceiver/factory_others.go b/receiver/windowsperfcountersreceiver/factory_others.go index beb26a2011b1..017c8ce872c4 100644 --- a/receiver/windowsperfcountersreceiver/factory_others.go +++ b/receiver/windowsperfcountersreceiver/factory_others.go @@ -22,7 +22,6 @@ import ( "errors" "go.opentelemetry.io/collector/component" - "go.opentelemetry.io/collector/config" "go.opentelemetry.io/collector/consumer" ) @@ -30,7 +29,7 @@ import ( func createMetricsReceiver( ctx context.Context, params component.ReceiverCreateSettings, - cfg config.Receiver, + cfg component.ReceiverConfig, consumer consumer.Metrics, ) (component.MetricsReceiver, error) { return nil, errors.New("the windows perf counters receiver is only supported on Windows") diff --git a/receiver/windowsperfcountersreceiver/factory_test.go b/receiver/windowsperfcountersreceiver/factory_test.go index 8dd94e5655e6..c336cc0a48f5 100644 --- a/receiver/windowsperfcountersreceiver/factory_test.go +++ b/receiver/windowsperfcountersreceiver/factory_test.go @@ -21,7 +21,6 @@ import ( "github.com/stretchr/testify/assert" "go.opentelemetry.io/collector/component" "go.opentelemetry.io/collector/component/componenttest" - "go.opentelemetry.io/collector/config/configtest" "go.opentelemetry.io/collector/consumer/consumertest" ) @@ -32,7 +31,7 @@ func TestCreateDefaultConfig(t *testing.T) { cfg := factory.CreateDefaultConfig() assert.NotNil(t, cfg, "failed to create default config") - assert.NoError(t, configtest.CheckConfigStruct(cfg)) + assert.NoError(t, componenttest.CheckConfigStruct(cfg)) cfg.(*Config).PerfCounters = []ObjectConfig{ { diff --git a/receiver/windowsperfcountersreceiver/factory_windows.go b/receiver/windowsperfcountersreceiver/factory_windows.go index a7c932b835fb..4ed73aecb2f6 100644 --- a/receiver/windowsperfcountersreceiver/factory_windows.go +++ b/receiver/windowsperfcountersreceiver/factory_windows.go @@ -21,7 +21,6 @@ import ( "context" "go.opentelemetry.io/collector/component" - "go.opentelemetry.io/collector/config" "go.opentelemetry.io/collector/consumer" "go.opentelemetry.io/collector/receiver/scraperhelper" ) @@ -30,7 +29,7 @@ import ( func createMetricsReceiver( ctx context.Context, params component.ReceiverCreateSettings, - cfg config.Receiver, + cfg component.ReceiverConfig, consumer consumer.Metrics, ) (component.MetricsReceiver, error) { oCfg := cfg.(*Config) diff --git a/receiver/windowsperfcountersreceiver/go.mod b/receiver/windowsperfcountersreceiver/go.mod index 471e0ea4fe79..9686f257688f 100644 --- a/receiver/windowsperfcountersreceiver/go.mod +++ b/receiver/windowsperfcountersreceiver/go.mod @@ -5,7 +5,7 @@ go 1.18 require ( github.com/open-telemetry/opentelemetry-collector-contrib/pkg/winperfcounters v0.63.0 github.com/stretchr/testify v1.8.1 - go.opentelemetry.io/collector v0.63.2-0.20221104003159-6b27644724d8 + go.opentelemetry.io/collector v0.63.2-0.20221108014805-0b08d5316426 go.uber.org/multierr v1.8.0 go.uber.org/zap v1.23.0 ) @@ -23,7 +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.opencensus.io v0.23.0 // indirect + go.opencensus.io v0.24.0 // 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 @@ -41,7 +41,7 @@ require ( github.com/fsnotify/fsnotify v1.6.0 // indirect github.com/open-telemetry/opentelemetry-collector-contrib/internal/scrapertest v0.63.0 github.com/pelletier/go-toml v1.9.4 // indirect - go.opentelemetry.io/collector/pdata v0.63.2-0.20221104003159-6b27644724d8 + go.opentelemetry.io/collector/pdata v0.63.2-0.20221108014805-0b08d5316426 ) replace github.com/open-telemetry/opentelemetry-collector-contrib/internal/scrapertest => ../../internal/scrapertest diff --git a/receiver/windowsperfcountersreceiver/go.sum b/receiver/windowsperfcountersreceiver/go.sum index 7a6a2de9ecce..64b40628319c 100644 --- a/receiver/windowsperfcountersreceiver/go.sum +++ b/receiver/windowsperfcountersreceiver/go.sum @@ -231,7 +231,7 @@ github.com/prometheus/client_golang v0.9.1/go.mod h1:7SWBe2y4D6OKWSNQJUaRYU/AaXP github.com/prometheus/client_golang v1.0.0/go.mod h1:db9x61etRT2tGnBNRi70OPL5FsnadC4Ky3P0J6CfImo= github.com/prometheus/client_golang v1.7.1/go.mod h1:PY5Wy2awLA44sXw4AOSfFBetzPP4j5+D6mVACh+pe2M= github.com/prometheus/client_golang v1.11.1/go.mod h1:Z6t4BnS23TR94PD6BsDNk8yVqroYurpAkEiz0P2BEV0= -github.com/prometheus/client_golang v1.13.0 h1:b71QUfeo5M8gq2+evJdTPfZhYMAU0uKPkyPJ7TPsloU= +github.com/prometheus/client_golang v1.13.1 h1:3gMjIY2+/hzmqhtUC/aQNYldJA6DtH3CgQvwS+02K1c= github.com/prometheus/client_model v0.0.0-20180712105110-5c3871d89910/go.mod h1:MbSGuTsp3dbXC40dX6PRTWyKYBIrTGTE9sqQNg2J8bo= github.com/prometheus/client_model v0.0.0-20190129233127-fd36f4220a90/go.mod h1:xMI15A0UPsDsEKsMN9yxemIoYk6Tm2C1GtYGdfGttqA= github.com/prometheus/client_model v0.0.0-20190812154241-14fe0d1b01d4/go.mod h1:xMI15A0UPsDsEKsMN9yxemIoYk6Tm2C1GtYGdfGttqA= @@ -268,7 +268,6 @@ github.com/stretchr/testify v1.2.2/go.mod h1:a8OnRcib4nhh0OaRAV+Yts87kKdq0PP7pXf github.com/stretchr/testify v1.3.0/go.mod h1:M5WIy9Dh21IEIfnGCwXGc5bZfKNJtfHm1UVUgZn+9EI= github.com/stretchr/testify v1.4.0/go.mod h1:j7eGeouHqKxXV5pUuKE4zz7dFj8WfuZ+81PSLYec5m4= github.com/stretchr/testify v1.5.1/go.mod h1:5W2xD1RspED5o8YsWQXVCued0rvSQ+mT+I5cxcmMvtA= -github.com/stretchr/testify v1.6.1/go.mod h1:6Fq8oRcR53rry900zMqJjRRixrwX3KX962/h/Wwjteg= github.com/stretchr/testify v1.7.0/go.mod h1:6Fq8oRcR53rry900zMqJjRRixrwX3KX962/h/Wwjteg= github.com/stretchr/testify v1.7.1/go.mod h1:6Fq8oRcR53rry900zMqJjRRixrwX3KX962/h/Wwjteg= github.com/stretchr/testify v1.8.0/go.mod h1:yNjHg4UonilssWZ8iaSj1OCr/vHnekPRkoO+kdMU+MU= @@ -280,12 +279,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.opencensus.io v0.23.0 h1:gqCw0LfLxScz8irSi8exQc7fyQ0fKQU/qnC/X8+V/1M= -go.opencensus.io v0.23.0/go.mod h1:XItmlyltB5F7CS4xOC1DcqMoFqwtC6OG2xF7mCv7P7E= -go.opentelemetry.io/collector v0.63.2-0.20221104003159-6b27644724d8 h1:rOT5HzXXfSISc6FiH012zH2/EFjp37UXfjEqj5BpkWQ= -go.opentelemetry.io/collector v0.63.2-0.20221104003159-6b27644724d8/go.mod h1:JVmeZXugK4ondC6KQgrHTHWiF4JttpG5k6dWPMt62+k= -go.opentelemetry.io/collector/pdata v0.63.2-0.20221104003159-6b27644724d8 h1:7xeTQjfsOm9eogQeIxjSEhlik9qsbBGsnmkQHfyKaRE= -go.opentelemetry.io/collector/pdata v0.63.2-0.20221104003159-6b27644724d8/go.mod h1:IzvXUGQml2mrnvdb8zIlEW3qQs9oFLdD2hLwJdZ+pek= +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.63.2-0.20221108014805-0b08d5316426 h1:z/wLTMh7/vNxcFUDa5uG7/IPE3tYx6pzCWPV41ghyV8= +go.opentelemetry.io/collector v0.63.2-0.20221108014805-0b08d5316426/go.mod h1:+Zb70q0Rq17dA9FcHTiTjW6g96lvJ8kAZ0c+eWNkAv0= +go.opentelemetry.io/collector/pdata v0.63.2-0.20221108014805-0b08d5316426 h1:wKDpgP0Tx/gWI2SgDGAY1OTSeihhDivbbRqFR79IGTc= +go.opentelemetry.io/collector/pdata v0.63.2-0.20221108014805-0b08d5316426/go.mod h1:IzvXUGQml2mrnvdb8zIlEW3qQs9oFLdD2hLwJdZ+pek= 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.go b/receiver/zipkinreceiver/config.go index affa458e9e28..7a01a7237164 100644 --- a/receiver/zipkinreceiver/config.go +++ b/receiver/zipkinreceiver/config.go @@ -15,6 +15,7 @@ package zipkinreceiver // import "github.com/open-telemetry/opentelemetry-collector-contrib/receiver/zipkinreceiver" import ( + "go.opentelemetry.io/collector/component" "go.opentelemetry.io/collector/config" "go.opentelemetry.io/collector/config/confighttp" ) @@ -29,7 +30,7 @@ type Config struct { ParseStringTags bool `mapstructure:"parse_string_tags"` } -var _ config.Receiver = (*Config)(nil) +var _ component.ReceiverConfig = (*Config)(nil) // Validate checks the receiver configuration is valid func (cfg *Config) Validate() error { diff --git a/receiver/zipkinreceiver/config_test.go b/receiver/zipkinreceiver/config_test.go index 68fbe4ff40b2..5f4c39bcd209 100644 --- a/receiver/zipkinreceiver/config_test.go +++ b/receiver/zipkinreceiver/config_test.go @@ -20,6 +20,7 @@ import ( "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" + "go.opentelemetry.io/collector/component" "go.opentelemetry.io/collector/config" "go.opentelemetry.io/collector/config/confighttp" "go.opentelemetry.io/collector/confmap/confmaptest" @@ -32,17 +33,17 @@ func TestLoadConfig(t *testing.T) { require.NoError(t, err) tests := []struct { - id config.ComponentID - expected config.Receiver + id component.ID + expected component.ReceiverConfig }{ { - id: config.NewComponentID(typeStr), + id: component.NewID(typeStr), expected: createDefaultConfig(), }, { - id: config.NewComponentIDWithName(typeStr, "customname"), + id: component.NewIDWithName(typeStr, "customname"), expected: &Config{ - ReceiverSettings: config.NewReceiverSettings(config.NewComponentID(typeStr)), + ReceiverSettings: config.NewReceiverSettings(component.NewID(typeStr)), HTTPServerSettings: confighttp.HTTPServerSettings{ Endpoint: "localhost:8765", }, @@ -50,9 +51,9 @@ func TestLoadConfig(t *testing.T) { }, }, { - id: config.NewComponentIDWithName(typeStr, "parse_strings"), + id: component.NewIDWithName(typeStr, "parse_strings"), expected: &Config{ - ReceiverSettings: config.NewReceiverSettings(config.NewComponentID(typeStr)), + ReceiverSettings: config.NewReceiverSettings(component.NewID(typeStr)), HTTPServerSettings: confighttp.HTTPServerSettings{ Endpoint: defaultBindEndpoint, }, @@ -68,7 +69,7 @@ func TestLoadConfig(t *testing.T) { sub, err := cm.Sub(tt.id.String()) require.NoError(t, err) - require.NoError(t, config.UnmarshalReceiver(sub, cfg)) + require.NoError(t, component.UnmarshalReceiverConfig(sub, cfg)) assert.NoError(t, cfg.Validate()) assert.Equal(t, tt.expected, cfg) diff --git a/receiver/zipkinreceiver/factory.go b/receiver/zipkinreceiver/factory.go index 2cb2010f5268..79cd45ce9e96 100644 --- a/receiver/zipkinreceiver/factory.go +++ b/receiver/zipkinreceiver/factory.go @@ -42,9 +42,9 @@ func NewFactory() component.ReceiverFactory { } // createDefaultConfig creates the default configuration for Zipkin receiver. -func createDefaultConfig() config.Receiver { +func createDefaultConfig() component.ReceiverConfig { return &Config{ - ReceiverSettings: config.NewReceiverSettings(config.NewComponentID(typeStr)), + ReceiverSettings: config.NewReceiverSettings(component.NewID(typeStr)), HTTPServerSettings: confighttp.HTTPServerSettings{ Endpoint: defaultBindEndpoint, }, @@ -56,7 +56,7 @@ func createDefaultConfig() config.Receiver { func createTracesReceiver( _ context.Context, set component.ReceiverCreateSettings, - cfg config.Receiver, + cfg component.ReceiverConfig, nextConsumer consumer.Traces, ) (component.TracesReceiver, error) { rCfg := cfg.(*Config) diff --git a/receiver/zipkinreceiver/factory_test.go b/receiver/zipkinreceiver/factory_test.go index 9df6f2fa7017..0f2628d2be2f 100644 --- a/receiver/zipkinreceiver/factory_test.go +++ b/receiver/zipkinreceiver/factory_test.go @@ -20,14 +20,13 @@ import ( "github.com/stretchr/testify/assert" "go.opentelemetry.io/collector/component/componenttest" - "go.opentelemetry.io/collector/config/configtest" "go.opentelemetry.io/collector/consumer/consumertest" ) func TestCreateDefaultConfig(t *testing.T) { cfg := createDefaultConfig() assert.NotNil(t, cfg, "failed to create default config") - assert.NoError(t, configtest.CheckConfigStruct(cfg)) + assert.NoError(t, componenttest.CheckConfigStruct(cfg)) } func TestCreateReceiver(t *testing.T) { diff --git a/receiver/zipkinreceiver/go.mod b/receiver/zipkinreceiver/go.mod index 7a5a711ab97f..afd5ab2b5208 100644 --- a/receiver/zipkinreceiver/go.mod +++ b/receiver/zipkinreceiver/go.mod @@ -8,9 +8,9 @@ require ( github.com/open-telemetry/opentelemetry-collector-contrib/pkg/translator/zipkin v0.63.0 github.com/openzipkin/zipkin-go v0.4.1 github.com/stretchr/testify v1.8.1 - go.opentelemetry.io/collector v0.63.2-0.20221104003159-6b27644724d8 - go.opentelemetry.io/collector/pdata v0.63.2-0.20221104003159-6b27644724d8 - go.opentelemetry.io/collector/semconv v0.63.2-0.20221104003159-6b27644724d8 + go.opentelemetry.io/collector v0.63.2-0.20221108014805-0b08d5316426 + go.opentelemetry.io/collector/pdata v0.63.2-0.20221108014805-0b08d5316426 + go.opentelemetry.io/collector/semconv v0.63.2-0.20221108014805-0b08d5316426 google.golang.org/protobuf v1.28.1 ) @@ -36,7 +36,7 @@ require ( github.com/rs/cors v1.8.2 // indirect 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.23.0 // indirect + go.opencensus.io v0.24.0 // 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 75e5c296231f..390209392987 100644 --- a/receiver/zipkinreceiver/go.sum +++ b/receiver/zipkinreceiver/go.sum @@ -240,7 +240,7 @@ github.com/prometheus/client_golang v0.9.1/go.mod h1:7SWBe2y4D6OKWSNQJUaRYU/AaXP github.com/prometheus/client_golang v1.0.0/go.mod h1:db9x61etRT2tGnBNRi70OPL5FsnadC4Ky3P0J6CfImo= github.com/prometheus/client_golang v1.7.1/go.mod h1:PY5Wy2awLA44sXw4AOSfFBetzPP4j5+D6mVACh+pe2M= github.com/prometheus/client_golang v1.11.1/go.mod h1:Z6t4BnS23TR94PD6BsDNk8yVqroYurpAkEiz0P2BEV0= -github.com/prometheus/client_golang v1.13.0 h1:b71QUfeo5M8gq2+evJdTPfZhYMAU0uKPkyPJ7TPsloU= +github.com/prometheus/client_golang v1.13.1 h1:3gMjIY2+/hzmqhtUC/aQNYldJA6DtH3CgQvwS+02K1c= github.com/prometheus/client_model v0.0.0-20180712105110-5c3871d89910/go.mod h1:MbSGuTsp3dbXC40dX6PRTWyKYBIrTGTE9sqQNg2J8bo= github.com/prometheus/client_model v0.0.0-20190129233127-fd36f4220a90/go.mod h1:xMI15A0UPsDsEKsMN9yxemIoYk6Tm2C1GtYGdfGttqA= github.com/prometheus/client_model v0.0.0-20190812154241-14fe0d1b01d4/go.mod h1:xMI15A0UPsDsEKsMN9yxemIoYk6Tm2C1GtYGdfGttqA= @@ -279,7 +279,6 @@ github.com/stretchr/testify v1.2.2/go.mod h1:a8OnRcib4nhh0OaRAV+Yts87kKdq0PP7pXf github.com/stretchr/testify v1.3.0/go.mod h1:M5WIy9Dh21IEIfnGCwXGc5bZfKNJtfHm1UVUgZn+9EI= github.com/stretchr/testify v1.4.0/go.mod h1:j7eGeouHqKxXV5pUuKE4zz7dFj8WfuZ+81PSLYec5m4= github.com/stretchr/testify v1.5.1/go.mod h1:5W2xD1RspED5o8YsWQXVCued0rvSQ+mT+I5cxcmMvtA= -github.com/stretchr/testify v1.6.1/go.mod h1:6Fq8oRcR53rry900zMqJjRRixrwX3KX962/h/Wwjteg= github.com/stretchr/testify v1.7.0/go.mod h1:6Fq8oRcR53rry900zMqJjRRixrwX3KX962/h/Wwjteg= github.com/stretchr/testify v1.7.1/go.mod h1:6Fq8oRcR53rry900zMqJjRRixrwX3KX962/h/Wwjteg= github.com/stretchr/testify v1.8.0/go.mod h1:yNjHg4UonilssWZ8iaSj1OCr/vHnekPRkoO+kdMU+MU= @@ -295,14 +294,14 @@ 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.opencensus.io v0.23.0 h1:gqCw0LfLxScz8irSi8exQc7fyQ0fKQU/qnC/X8+V/1M= -go.opencensus.io v0.23.0/go.mod h1:XItmlyltB5F7CS4xOC1DcqMoFqwtC6OG2xF7mCv7P7E= -go.opentelemetry.io/collector v0.63.2-0.20221104003159-6b27644724d8 h1:rOT5HzXXfSISc6FiH012zH2/EFjp37UXfjEqj5BpkWQ= -go.opentelemetry.io/collector v0.63.2-0.20221104003159-6b27644724d8/go.mod h1:JVmeZXugK4ondC6KQgrHTHWiF4JttpG5k6dWPMt62+k= -go.opentelemetry.io/collector/pdata v0.63.2-0.20221104003159-6b27644724d8 h1:7xeTQjfsOm9eogQeIxjSEhlik9qsbBGsnmkQHfyKaRE= -go.opentelemetry.io/collector/pdata v0.63.2-0.20221104003159-6b27644724d8/go.mod h1:IzvXUGQml2mrnvdb8zIlEW3qQs9oFLdD2hLwJdZ+pek= -go.opentelemetry.io/collector/semconv v0.63.2-0.20221104003159-6b27644724d8 h1:jm0sNPyqo6S165QjQYMBHB2nK50wlJbMYM03Yr3Eo2k= -go.opentelemetry.io/collector/semconv v0.63.2-0.20221104003159-6b27644724d8/go.mod h1:5o9yhOa+ABt7g2E5JABDxGZ1PQPbtfxrKNbYn+LOTXU= +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.63.2-0.20221108014805-0b08d5316426 h1:z/wLTMh7/vNxcFUDa5uG7/IPE3tYx6pzCWPV41ghyV8= +go.opentelemetry.io/collector v0.63.2-0.20221108014805-0b08d5316426/go.mod h1:+Zb70q0Rq17dA9FcHTiTjW6g96lvJ8kAZ0c+eWNkAv0= +go.opentelemetry.io/collector/pdata v0.63.2-0.20221108014805-0b08d5316426 h1:wKDpgP0Tx/gWI2SgDGAY1OTSeihhDivbbRqFR79IGTc= +go.opentelemetry.io/collector/pdata v0.63.2-0.20221108014805-0b08d5316426/go.mod h1:IzvXUGQml2mrnvdb8zIlEW3qQs9oFLdD2hLwJdZ+pek= +go.opentelemetry.io/collector/semconv v0.63.2-0.20221108014805-0b08d5316426 h1:pqIl7OC531J6i9ttBCj3zLmZI/BSF4q323YpK0GgKGk= +go.opentelemetry.io/collector/semconv v0.63.2-0.20221108014805-0b08d5316426/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/zipkinreceiver/trace_receiver.go b/receiver/zipkinreceiver/trace_receiver.go index 5f00b7a4e192..e2b95c733dfd 100644 --- a/receiver/zipkinreceiver/trace_receiver.go +++ b/receiver/zipkinreceiver/trace_receiver.go @@ -26,7 +26,6 @@ import ( "sync" "go.opentelemetry.io/collector/component" - "go.opentelemetry.io/collector/config" "go.opentelemetry.io/collector/consumer" "go.opentelemetry.io/collector/obsreport" "go.opentelemetry.io/collector/pdata/ptrace" @@ -47,7 +46,7 @@ var errNextConsumerRespBody = []byte(`"Internal Server Error"`) // zipkinReceiver type is used to handle spans received in the Zipkin format. type zipkinReceiver struct { nextConsumer consumer.Traces - id config.ComponentID + id component.ID shutdownWG sync.WaitGroup server *http.Server diff --git a/receiver/zipkinreceiver/trace_receiver_test.go b/receiver/zipkinreceiver/trace_receiver_test.go index 3a4ba067e58e..6f4279e5ed26 100644 --- a/receiver/zipkinreceiver/trace_receiver_test.go +++ b/receiver/zipkinreceiver/trace_receiver_test.go @@ -47,7 +47,7 @@ const ( zipkinV1SingleBatch = "../../pkg/translator/zipkin/zipkinv1/testdata/zipkin_v1_single_batch.json" ) -var zipkinReceiverID = config.NewComponentIDWithName(typeStr, "receiver_test") +var zipkinReceiverID = component.NewIDWithName(typeStr, "receiver_test") func TestNew(t *testing.T) { type args struct { @@ -422,7 +422,7 @@ func TestFromBytesWithNoTimestamp(t *testing.T) { require.NoError(t, err, "Failed to read sample JSON file: %v", err) cfg := &Config{ - ReceiverSettings: config.NewReceiverSettings(config.NewComponentID(typeStr)), + ReceiverSettings: config.NewReceiverSettings(component.NewID(typeStr)), HTTPServerSettings: confighttp.HTTPServerSettings{ Endpoint: "", }, diff --git a/receiver/zookeeperreceiver/factory.go b/receiver/zookeeperreceiver/factory.go index 3055a9415899..416766416c1a 100644 --- a/receiver/zookeeperreceiver/factory.go +++ b/receiver/zookeeperreceiver/factory.go @@ -43,10 +43,10 @@ func NewFactory() component.ReceiverFactory { ) } -func createDefaultConfig() config.Receiver { +func createDefaultConfig() component.ReceiverConfig { return &Config{ ScraperControllerSettings: scraperhelper.ScraperControllerSettings{ - ReceiverSettings: config.NewReceiverSettings(config.NewComponentID(typeStr)), + ReceiverSettings: config.NewReceiverSettings(component.NewID(typeStr)), CollectionInterval: defaultCollectionInterval, }, TCPAddr: confignet.TCPAddr{ @@ -61,7 +61,7 @@ func createDefaultConfig() config.Receiver { func createMetricsReceiver( _ context.Context, params component.ReceiverCreateSettings, - config config.Receiver, + config component.ReceiverConfig, consumer consumer.Metrics, ) (component.MetricsReceiver, error) { rConfig := config.(*Config) diff --git a/receiver/zookeeperreceiver/factory_test.go b/receiver/zookeeperreceiver/factory_test.go index 48c5f54000bc..e0345ee3dd65 100644 --- a/receiver/zookeeperreceiver/factory_test.go +++ b/receiver/zookeeperreceiver/factory_test.go @@ -21,15 +21,15 @@ import ( "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" + "go.opentelemetry.io/collector/component" "go.opentelemetry.io/collector/component/componenttest" - "go.opentelemetry.io/collector/config" "go.opentelemetry.io/collector/config/confignet" "go.opentelemetry.io/collector/consumer/consumertest" ) func TestFactory(t *testing.T) { f := NewFactory() - require.Equal(t, config.Type("zookeeper"), f.Type()) + require.Equal(t, component.Type("zookeeper"), f.Type()) cfg := f.CreateDefaultConfig() rCfg := cfg.(*Config) @@ -41,7 +41,7 @@ func TestFactory(t *testing.T) { tests := []struct { name string - config config.Receiver + config component.ReceiverConfig wantErr bool }{ { diff --git a/receiver/zookeeperreceiver/go.mod b/receiver/zookeeperreceiver/go.mod index 32ce6b9ee22f..e6e793bd4403 100644 --- a/receiver/zookeeperreceiver/go.mod +++ b/receiver/zookeeperreceiver/go.mod @@ -7,8 +7,8 @@ require ( github.com/open-telemetry/opentelemetry-collector-contrib/internal/containertest v0.63.0 github.com/open-telemetry/opentelemetry-collector-contrib/internal/scrapertest v0.63.0 github.com/stretchr/testify v1.8.1 - go.opentelemetry.io/collector v0.63.2-0.20221104003159-6b27644724d8 - go.opentelemetry.io/collector/pdata v0.63.2-0.20221104003159-6b27644724d8 + go.opentelemetry.io/collector v0.63.2-0.20221108014805-0b08d5316426 + go.opentelemetry.io/collector/pdata v0.63.2-0.20221108014805-0b08d5316426 go.uber.org/zap v1.23.0 ) @@ -39,7 +39,7 @@ require ( github.com/pmezard/go-difflib v1.0.0 // indirect github.com/rogpeppe/go-internal v1.6.1 // indirect github.com/sirupsen/logrus v1.8.1 // indirect - go.opencensus.io v0.23.0 // indirect + go.opencensus.io v0.24.0 // 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 970b047a9a00..0851c40c09df 100644 --- a/receiver/zookeeperreceiver/go.sum +++ b/receiver/zookeeperreceiver/go.sum @@ -250,7 +250,7 @@ github.com/prometheus/client_golang v0.9.1/go.mod h1:7SWBe2y4D6OKWSNQJUaRYU/AaXP github.com/prometheus/client_golang v1.0.0/go.mod h1:db9x61etRT2tGnBNRi70OPL5FsnadC4Ky3P0J6CfImo= github.com/prometheus/client_golang v1.7.1/go.mod h1:PY5Wy2awLA44sXw4AOSfFBetzPP4j5+D6mVACh+pe2M= github.com/prometheus/client_golang v1.11.1/go.mod h1:Z6t4BnS23TR94PD6BsDNk8yVqroYurpAkEiz0P2BEV0= -github.com/prometheus/client_golang v1.13.0 h1:b71QUfeo5M8gq2+evJdTPfZhYMAU0uKPkyPJ7TPsloU= +github.com/prometheus/client_golang v1.13.1 h1:3gMjIY2+/hzmqhtUC/aQNYldJA6DtH3CgQvwS+02K1c= github.com/prometheus/client_model v0.0.0-20180712105110-5c3871d89910/go.mod h1:MbSGuTsp3dbXC40dX6PRTWyKYBIrTGTE9sqQNg2J8bo= github.com/prometheus/client_model v0.0.0-20190129233127-fd36f4220a90/go.mod h1:xMI15A0UPsDsEKsMN9yxemIoYk6Tm2C1GtYGdfGttqA= github.com/prometheus/client_model v0.0.0-20190812154241-14fe0d1b01d4/go.mod h1:xMI15A0UPsDsEKsMN9yxemIoYk6Tm2C1GtYGdfGttqA= @@ -292,7 +292,6 @@ github.com/stretchr/testify v1.2.2/go.mod h1:a8OnRcib4nhh0OaRAV+Yts87kKdq0PP7pXf github.com/stretchr/testify v1.3.0/go.mod h1:M5WIy9Dh21IEIfnGCwXGc5bZfKNJtfHm1UVUgZn+9EI= github.com/stretchr/testify v1.4.0/go.mod h1:j7eGeouHqKxXV5pUuKE4zz7dFj8WfuZ+81PSLYec5m4= github.com/stretchr/testify v1.5.1/go.mod h1:5W2xD1RspED5o8YsWQXVCued0rvSQ+mT+I5cxcmMvtA= -github.com/stretchr/testify v1.6.1/go.mod h1:6Fq8oRcR53rry900zMqJjRRixrwX3KX962/h/Wwjteg= github.com/stretchr/testify v1.7.0/go.mod h1:6Fq8oRcR53rry900zMqJjRRixrwX3KX962/h/Wwjteg= github.com/stretchr/testify v1.7.1/go.mod h1:6Fq8oRcR53rry900zMqJjRRixrwX3KX962/h/Wwjteg= github.com/stretchr/testify v1.8.0/go.mod h1:yNjHg4UonilssWZ8iaSj1OCr/vHnekPRkoO+kdMU+MU= @@ -304,12 +303,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.opencensus.io v0.23.0 h1:gqCw0LfLxScz8irSi8exQc7fyQ0fKQU/qnC/X8+V/1M= -go.opencensus.io v0.23.0/go.mod h1:XItmlyltB5F7CS4xOC1DcqMoFqwtC6OG2xF7mCv7P7E= -go.opentelemetry.io/collector v0.63.2-0.20221104003159-6b27644724d8 h1:rOT5HzXXfSISc6FiH012zH2/EFjp37UXfjEqj5BpkWQ= -go.opentelemetry.io/collector v0.63.2-0.20221104003159-6b27644724d8/go.mod h1:JVmeZXugK4ondC6KQgrHTHWiF4JttpG5k6dWPMt62+k= -go.opentelemetry.io/collector/pdata v0.63.2-0.20221104003159-6b27644724d8 h1:7xeTQjfsOm9eogQeIxjSEhlik9qsbBGsnmkQHfyKaRE= -go.opentelemetry.io/collector/pdata v0.63.2-0.20221104003159-6b27644724d8/go.mod h1:IzvXUGQml2mrnvdb8zIlEW3qQs9oFLdD2hLwJdZ+pek= +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.63.2-0.20221108014805-0b08d5316426 h1:z/wLTMh7/vNxcFUDa5uG7/IPE3tYx6pzCWPV41ghyV8= +go.opentelemetry.io/collector v0.63.2-0.20221108014805-0b08d5316426/go.mod h1:+Zb70q0Rq17dA9FcHTiTjW6g96lvJ8kAZ0c+eWNkAv0= +go.opentelemetry.io/collector/pdata v0.63.2-0.20221108014805-0b08d5316426 h1:wKDpgP0Tx/gWI2SgDGAY1OTSeihhDivbbRqFR79IGTc= +go.opentelemetry.io/collector/pdata v0.63.2-0.20221108014805-0b08d5316426/go.mod h1:IzvXUGQml2mrnvdb8zIlEW3qQs9oFLdD2hLwJdZ+pek= 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/datasenders/carbon.go b/testbed/datasenders/carbon.go index 0876ad2ead75..419da1da573a 100644 --- a/testbed/datasenders/carbon.go +++ b/testbed/datasenders/carbon.go @@ -19,6 +19,7 @@ import ( "fmt" "time" + "go.opentelemetry.io/collector/component" "go.opentelemetry.io/collector/component/componenttest" "go.opentelemetry.io/collector/config" "go.opentelemetry.io/collector/consumer" @@ -52,7 +53,7 @@ func NewCarbonDataSender(port int) *CarbonDataSender { func (cs *CarbonDataSender) Start() error { factory := carbonexporter.NewFactory() cfg := &carbonexporter.Config{ - ExporterSettings: config.NewExporterSettings(config.NewComponentID(factory.Type())), + ExporterSettings: config.NewExporterSettings(component.NewID(factory.Type())), Endpoint: cs.GetEndpoint().String(), Timeout: 5 * time.Second, } diff --git a/testbed/datasenders/sapm.go b/testbed/datasenders/sapm.go index dd0d0e623eeb..a27bd4426ed0 100644 --- a/testbed/datasenders/sapm.go +++ b/testbed/datasenders/sapm.go @@ -18,6 +18,7 @@ import ( "context" "fmt" + "go.opentelemetry.io/collector/component" "go.opentelemetry.io/collector/component/componenttest" "go.opentelemetry.io/collector/config" "go.opentelemetry.io/collector/consumer" @@ -51,7 +52,7 @@ func NewSapmDataSender(port int) *SapmDataSender { func (je *SapmDataSender) Start() error { factory := sapmexporter.NewFactory() cfg := &sapmexporter.Config{ - ExporterSettings: config.NewExporterSettings(config.NewComponentID(factory.Type())), + ExporterSettings: config.NewExporterSettings(component.NewID(factory.Type())), Endpoint: fmt.Sprintf("http://%s/v2/trace", je.GetEndpoint()), DisableCompression: true, AccessToken: "MyToken", diff --git a/testbed/datasenders/signalfx.go b/testbed/datasenders/signalfx.go index 1982e358444b..49d2ee4e2056 100644 --- a/testbed/datasenders/signalfx.go +++ b/testbed/datasenders/signalfx.go @@ -18,6 +18,7 @@ import ( "context" "fmt" + "go.opentelemetry.io/collector/component" "go.opentelemetry.io/collector/component/componenttest" "go.opentelemetry.io/collector/config" "go.opentelemetry.io/collector/consumer" @@ -51,7 +52,7 @@ func NewSFxMetricDataSender(port int) *SFxMetricsDataSender { func (sf *SFxMetricsDataSender) Start() error { factory := signalfxexporter.NewFactory() cfg := &signalfxexporter.Config{ - ExporterSettings: config.NewExporterSettings(config.NewComponentID(factory.Type())), + ExporterSettings: config.NewExporterSettings(component.NewID(factory.Type())), IngestURL: fmt.Sprintf("http://%s", sf.GetEndpoint()), APIURL: "http://127.0.0.1", AccessToken: "access_token", diff --git a/testbed/go.mod b/testbed/go.mod index d7bbad1708b8..66d35727be8b 100644 --- a/testbed/go.mod +++ b/testbed/go.mod @@ -15,11 +15,11 @@ require ( github.com/open-telemetry/opentelemetry-collector-contrib/internal/coreinternal v0.63.0 github.com/open-telemetry/opentelemetry-collector-contrib/internal/splunk v0.63.0 github.com/open-telemetry/opentelemetry-collector-contrib/receiver/carbonreceiver v0.63.0 - github.com/open-telemetry/opentelemetry-collector-contrib/receiver/jaegerreceiver v0.0.0-00010101000000-000000000000 + github.com/open-telemetry/opentelemetry-collector-contrib/receiver/jaegerreceiver v0.63.0 github.com/open-telemetry/opentelemetry-collector-contrib/receiver/opencensusreceiver v0.63.0 github.com/open-telemetry/opentelemetry-collector-contrib/receiver/prometheusreceiver v0.63.0 github.com/open-telemetry/opentelemetry-collector-contrib/receiver/sapmreceiver v0.63.0 - github.com/open-telemetry/opentelemetry-collector-contrib/receiver/signalfxreceiver v0.0.0-00010101000000-000000000000 + github.com/open-telemetry/opentelemetry-collector-contrib/receiver/signalfxreceiver v0.63.0 github.com/open-telemetry/opentelemetry-collector-contrib/receiver/splunkhecreceiver v0.63.0 github.com/open-telemetry/opentelemetry-collector-contrib/receiver/zipkinreceiver v0.63.0 github.com/open-telemetry/opentelemetry-collector-contrib/testbed/mockdatareceivers/mockawsxrayreceiver v0.63.0 @@ -27,17 +27,17 @@ 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.63.2-0.20221104003159-6b27644724d8 - go.opentelemetry.io/collector/exporter/loggingexporter v0.63.2-0.20221104003159-6b27644724d8 - go.opentelemetry.io/collector/exporter/otlpexporter v0.63.2-0.20221104003159-6b27644724d8 - go.opentelemetry.io/collector/exporter/otlphttpexporter v0.63.1 + go.opentelemetry.io/collector v0.63.2-0.20221108014805-0b08d5316426 + go.opentelemetry.io/collector/exporter/loggingexporter v0.63.2-0.20221108014805-0b08d5316426 + go.opentelemetry.io/collector/exporter/otlpexporter v0.63.2-0.20221108014805-0b08d5316426 + go.opentelemetry.io/collector/exporter/otlphttpexporter v0.63.2-0.20221108014805-0b08d5316426 go.opentelemetry.io/collector/extension/ballastextension v0.0.0-20221103164255-2ed41215f324 go.opentelemetry.io/collector/extension/zpagesextension v0.0.0-20221102221454-bfc45c16c979 - go.opentelemetry.io/collector/pdata v0.63.2-0.20221104003159-6b27644724d8 - go.opentelemetry.io/collector/processor/batchprocessor v0.0.0-20221104003159-6b27644724d8 + go.opentelemetry.io/collector/pdata v0.63.2-0.20221108014805-0b08d5316426 + go.opentelemetry.io/collector/processor/batchprocessor v0.0.0-20221108014805-0b08d5316426 go.opentelemetry.io/collector/processor/memorylimiterprocessor v0.0.0-20221103164255-2ed41215f324 - go.opentelemetry.io/collector/receiver/otlpreceiver v0.0.0-20221104003159-6b27644724d8 - go.opentelemetry.io/collector/semconv v0.63.2-0.20221104003159-6b27644724d8 + go.opentelemetry.io/collector/receiver/otlpreceiver v0.63.1 + go.opentelemetry.io/collector/semconv v0.63.2-0.20221108014805-0b08d5316426 go.uber.org/atomic v1.10.0 go.uber.org/multierr v1.8.0 go.uber.org/zap v1.23.0 @@ -174,7 +174,7 @@ require ( github.com/pkg/errors v0.9.1 // indirect github.com/pmezard/go-difflib v1.0.0 // indirect github.com/power-devops/perfstat v0.0.0-20210106213030-5aafc221ea8c // indirect - github.com/prometheus/client_golang v1.13.1-0.20221013115219-dcea97eee2b3 // indirect + github.com/prometheus/client_golang v1.13.1 // indirect github.com/prometheus/client_model v0.3.0 // indirect github.com/prometheus/common/sigv4 v0.1.0 // indirect github.com/prometheus/procfs v0.8.0 // indirect @@ -202,7 +202,7 @@ require ( github.com/uber/jaeger-lib v2.4.1+incompatible // indirect github.com/vultr/govultr/v2 v2.17.2 // indirect github.com/yusufpapurcu/wmi v1.2.2 // indirect - go.opencensus.io v0.23.0 // indirect + go.opencensus.io v0.24.0 // 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 @@ -304,4 +304,4 @@ replace github.com/open-telemetry/opentelemetry-collector-contrib/internal/corei replace github.com/open-telemetry/opentelemetry-collector-contrib/pkg/resourcetotelemetry => ../pkg/resourcetotelemetry -replace go.opentelemetry.io/collector/receiver/otlpreceiver => go.opentelemetry.io/collector/receiver/otlpreceiver v0.0.0-20221101161158-df8deb48186b +replace go.opentelemetry.io/collector/receiver/otlpreceiver => go.opentelemetry.io/collector/receiver/otlpreceiver v0.0.0-20221108014805-0b08d5316426 diff --git a/testbed/go.sum b/testbed/go.sum index 0fdf6926b828..ce87d2dfcf28 100644 --- a/testbed/go.sum +++ b/testbed/go.sum @@ -1130,8 +1130,8 @@ github.com/prometheus/client_golang v1.11.1/go.mod h1:Z6t4BnS23TR94PD6BsDNk8yVqr github.com/prometheus/client_golang v1.12.1/go.mod h1:3Z9XVyYiZYEO+YQWt3RD2R3jrbd179Rt297l4aS6nDY= github.com/prometheus/client_golang v1.12.2/go.mod h1:3Z9XVyYiZYEO+YQWt3RD2R3jrbd179Rt297l4aS6nDY= github.com/prometheus/client_golang v1.13.0/go.mod h1:vTeo+zgvILHsnnj/39Ou/1fPN5nJFOEMgftOUOmlvYQ= -github.com/prometheus/client_golang v1.13.1-0.20221013115219-dcea97eee2b3 h1:T49ADLrYOgiyTHKx/N7tUxcglkLEt7xzDoQRqJNTzKg= -github.com/prometheus/client_golang v1.13.1-0.20221013115219-dcea97eee2b3/go.mod h1:vTeo+zgvILHsnnj/39Ou/1fPN5nJFOEMgftOUOmlvYQ= +github.com/prometheus/client_golang v1.13.1 h1:3gMjIY2+/hzmqhtUC/aQNYldJA6DtH3CgQvwS+02K1c= +github.com/prometheus/client_golang v1.13.1/go.mod h1:vTeo+zgvILHsnnj/39Ou/1fPN5nJFOEMgftOUOmlvYQ= github.com/prometheus/client_model v0.0.0-20180712105110-5c3871d89910/go.mod h1:MbSGuTsp3dbXC40dX6PRTWyKYBIrTGTE9sqQNg2J8bo= github.com/prometheus/client_model v0.0.0-20190115171406-56726106282f/go.mod h1:MbSGuTsp3dbXC40dX6PRTWyKYBIrTGTE9sqQNg2J8bo= github.com/prometheus/client_model v0.0.0-20190129233127-fd36f4220a90/go.mod h1:xMI15A0UPsDsEKsMN9yxemIoYk6Tm2C1GtYGdfGttqA= @@ -1415,19 +1415,20 @@ 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.opencensus.io v0.22.5/go.mod h1:5pWMHQbX5EPX2/62yrJeAkowc+lfs/XD7Uxpq3pI6kk= -go.opencensus.io v0.23.0 h1:gqCw0LfLxScz8irSi8exQc7fyQ0fKQU/qnC/X8+V/1M= 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.57.2/go.mod h1:9TwWyMRhbFNzaaGLtm/6poWNDJw+etvQMS6Fy+8/8Xs= go.opentelemetry.io/collector v0.63.0/go.mod h1:/wnGBrLyrQ804Eh7jZAPh4xJVa9xwbDbGfKQXLil3yM= go.opentelemetry.io/collector v0.63.1/go.mod h1:FZC9Px2N5CRiOG1VWH4XvkDeFx+Bu5tO8+gaqDSfXAA= -go.opentelemetry.io/collector v0.63.2-0.20221104003159-6b27644724d8 h1:rOT5HzXXfSISc6FiH012zH2/EFjp37UXfjEqj5BpkWQ= -go.opentelemetry.io/collector v0.63.2-0.20221104003159-6b27644724d8/go.mod h1:JVmeZXugK4ondC6KQgrHTHWiF4JttpG5k6dWPMt62+k= -go.opentelemetry.io/collector/exporter/loggingexporter v0.63.2-0.20221104003159-6b27644724d8 h1:8eJDjaRFnt94NKdArrgi9I/kJYqZjRxUrnfjaZyBeQA= -go.opentelemetry.io/collector/exporter/loggingexporter v0.63.2-0.20221104003159-6b27644724d8/go.mod h1:/gESyMRxKKNCrPZCRw/3eBhtByYxPCiPfoR/aniFaMA= -go.opentelemetry.io/collector/exporter/otlpexporter v0.63.2-0.20221104003159-6b27644724d8 h1:LH4Xta7BzlK9kJwpYqdUApjHsv2rU+zivpTE8Iu7KJM= -go.opentelemetry.io/collector/exporter/otlpexporter v0.63.2-0.20221104003159-6b27644724d8/go.mod h1:t1QwWfBfdEsI80R28T9PeVFGm8f32ZGLdY+CAEfr2LI= -go.opentelemetry.io/collector/exporter/otlphttpexporter v0.63.1 h1:hAWwZOHg/pwHqxZzDf/cfsUIp1oA85Pp4b2anMk5a4w= -go.opentelemetry.io/collector/exporter/otlphttpexporter v0.63.1/go.mod h1:GbE0IhSPvKRe3868XUG7sYdyvqAgfj6ESKFz9kaAnrM= +go.opentelemetry.io/collector v0.63.2-0.20221108014805-0b08d5316426 h1:z/wLTMh7/vNxcFUDa5uG7/IPE3tYx6pzCWPV41ghyV8= +go.opentelemetry.io/collector v0.63.2-0.20221108014805-0b08d5316426/go.mod h1:+Zb70q0Rq17dA9FcHTiTjW6g96lvJ8kAZ0c+eWNkAv0= +go.opentelemetry.io/collector/exporter/loggingexporter v0.63.2-0.20221108014805-0b08d5316426 h1:DmxLLUbQQu4chu1xU4rytprZLO1gocMXn5QxlG6GrO0= +go.opentelemetry.io/collector/exporter/loggingexporter v0.63.2-0.20221108014805-0b08d5316426/go.mod h1:W2E/sdTLclh6LqFIkeg66VxlIMweCmcwAlxzzYuULkw= +go.opentelemetry.io/collector/exporter/otlpexporter v0.63.2-0.20221108014805-0b08d5316426 h1:zPTV1p+QFGd2e7f4DEwkujkeezTBGkurl2wrM9QZ3Dc= +go.opentelemetry.io/collector/exporter/otlpexporter v0.63.2-0.20221108014805-0b08d5316426/go.mod h1:ZdasRXXeeuXukj6gfIb4VJw3W5N4+fhMagKE1TEMOxM= +go.opentelemetry.io/collector/exporter/otlphttpexporter v0.63.2-0.20221108014805-0b08d5316426 h1:1xUhrje+DsP7lj6Oiesd6BpsZYMjNg2Ua3GMIaX9OHo= +go.opentelemetry.io/collector/exporter/otlphttpexporter v0.63.2-0.20221108014805-0b08d5316426/go.mod h1:/r5XMUNlCvz1o6q9WQB2OhiAmUPRiXJSFsCURTBNA2Y= go.opentelemetry.io/collector/extension/ballastextension v0.0.0-20221103164255-2ed41215f324 h1:pXYdlcrEGWCDtQBWv+XIjNrDqvBIUOcw7ekhN4vUTQo= go.opentelemetry.io/collector/extension/ballastextension v0.0.0-20221103164255-2ed41215f324/go.mod h1:x79DldeotQtNkVz3MCxWUXpaXwZJqksyvaW0l0Uttic= go.opentelemetry.io/collector/extension/zpagesextension v0.0.0-20221102221454-bfc45c16c979 h1:YW7BL8ftoJ7k+EtnMICw1KWASLuSDIhbF7SjjgWMCl4= @@ -1436,21 +1437,21 @@ go.opentelemetry.io/collector/pdata v0.56.0/go.mod h1:mYcCREWiIJyHss0dbU+GSiz2tm go.opentelemetry.io/collector/pdata v0.57.2/go.mod h1:RU9I8lwBUxucwOsSYzHEcHi15M9QaX78hgQ2PRdSxV0= go.opentelemetry.io/collector/pdata v0.63.0/go.mod h1:IzvXUGQml2mrnvdb8zIlEW3qQs9oFLdD2hLwJdZ+pek= go.opentelemetry.io/collector/pdata v0.63.1/go.mod h1:IzvXUGQml2mrnvdb8zIlEW3qQs9oFLdD2hLwJdZ+pek= -go.opentelemetry.io/collector/pdata v0.63.2-0.20221104003159-6b27644724d8 h1:7xeTQjfsOm9eogQeIxjSEhlik9qsbBGsnmkQHfyKaRE= -go.opentelemetry.io/collector/pdata v0.63.2-0.20221104003159-6b27644724d8/go.mod h1:IzvXUGQml2mrnvdb8zIlEW3qQs9oFLdD2hLwJdZ+pek= +go.opentelemetry.io/collector/pdata v0.63.2-0.20221108014805-0b08d5316426 h1:wKDpgP0Tx/gWI2SgDGAY1OTSeihhDivbbRqFR79IGTc= +go.opentelemetry.io/collector/pdata v0.63.2-0.20221108014805-0b08d5316426/go.mod h1:IzvXUGQml2mrnvdb8zIlEW3qQs9oFLdD2hLwJdZ+pek= go.opentelemetry.io/collector/processor/batchprocessor v0.0.0-20221103161931-a167b006e8c0/go.mod h1:WBv1Nayi8p12K0vxLxTkHpRGr79JXYT3TXL2X0B/PRU= -go.opentelemetry.io/collector/processor/batchprocessor v0.0.0-20221104003159-6b27644724d8 h1:jgN7o3WfR8x++rjMcVM1VN6OJi4ytlGANXbwd73BPXo= -go.opentelemetry.io/collector/processor/batchprocessor v0.0.0-20221104003159-6b27644724d8/go.mod h1:WBv1Nayi8p12K0vxLxTkHpRGr79JXYT3TXL2X0B/PRU= +go.opentelemetry.io/collector/processor/batchprocessor v0.0.0-20221108014805-0b08d5316426 h1:7f0NVsVGYT8pxAyk0qBBa8ZQf7athr/mfQ6QltGywN0= +go.opentelemetry.io/collector/processor/batchprocessor v0.0.0-20221108014805-0b08d5316426/go.mod h1:gpd5Q/3HlROMGYhnmwlFpUhcz8Xy80sokEcKs7c7zzE= go.opentelemetry.io/collector/processor/memorylimiterprocessor v0.0.0-20221103164255-2ed41215f324 h1:kskVPWYC7QhffnYezcq66fCMNVL2eUMybzSYEMlv0yQ= go.opentelemetry.io/collector/processor/memorylimiterprocessor v0.0.0-20221103164255-2ed41215f324/go.mod h1:EnZwZH5MPkSDrUTLPZ8SaePpvmugL6J4fk66ikM0pu8= -go.opentelemetry.io/collector/receiver/otlpreceiver v0.0.0-20221101161158-df8deb48186b h1:no9i2NWBheMrzP0uNdOgmPkp4nGsb/bUCEDwFDwMlfQ= -go.opentelemetry.io/collector/receiver/otlpreceiver v0.0.0-20221101161158-df8deb48186b/go.mod h1:C8qTtCEPf/V/7SC1clotABlD5h/MhSbGxh7cZzkazeM= +go.opentelemetry.io/collector/receiver/otlpreceiver v0.0.0-20221108014805-0b08d5316426 h1:6cosCaS91068I8El0q8TJkv3V5lRzAfH2Wuja/5ydIo= +go.opentelemetry.io/collector/receiver/otlpreceiver v0.0.0-20221108014805-0b08d5316426/go.mod h1:+sGF2/LgOFWN1QClgdzg2NYCY9dYyPO4W4NAfxdODto= 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.63.0/go.mod h1:5o9yhOa+ABt7g2E5JABDxGZ1PQPbtfxrKNbYn+LOTXU= go.opentelemetry.io/collector/semconv v0.63.1/go.mod h1:5o9yhOa+ABt7g2E5JABDxGZ1PQPbtfxrKNbYn+LOTXU= -go.opentelemetry.io/collector/semconv v0.63.2-0.20221104003159-6b27644724d8 h1:jm0sNPyqo6S165QjQYMBHB2nK50wlJbMYM03Yr3Eo2k= -go.opentelemetry.io/collector/semconv v0.63.2-0.20221104003159-6b27644724d8/go.mod h1:5o9yhOa+ABt7g2E5JABDxGZ1PQPbtfxrKNbYn+LOTXU= +go.opentelemetry.io/collector/semconv v0.63.2-0.20221108014805-0b08d5316426 h1:pqIl7OC531J6i9ttBCj3zLmZI/BSF4q323YpK0GgKGk= +go.opentelemetry.io/collector/semconv v0.63.2-0.20221108014805-0b08d5316426/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 9532f5f846c1..38eff4125a7d 100644 --- a/testbed/mockdatareceivers/mockawsxrayreceiver/factory.go +++ b/testbed/mockdatareceivers/mockawsxrayreceiver/factory.go @@ -43,9 +43,9 @@ func NewFactory() component.ReceiverFactory { } // CreateDefaultConfig creates the default configuration for Jaeger receiver. -func createDefaultConfig() config.Receiver { +func createDefaultConfig() component.ReceiverConfig { return &Config{ - ReceiverSettings: config.NewReceiverSettings(config.NewComponentID(typeStr)), + ReceiverSettings: config.NewReceiverSettings(component.NewID(typeStr)), Endpoint: defaultEndpoint, } } @@ -54,7 +54,7 @@ func createDefaultConfig() config.Receiver { func createTracesReceiver( ctx context.Context, params component.ReceiverCreateSettings, - cfg config.Receiver, + cfg component.ReceiverConfig, nextConsumer consumer.Traces, ) (component.TracesReceiver, error) { rCfg := cfg.(*Config) diff --git a/testbed/mockdatareceivers/mockawsxrayreceiver/go.mod b/testbed/mockdatareceivers/mockawsxrayreceiver/go.mod index 93154b002c86..c7e0e2a6a9b5 100644 --- a/testbed/mockdatareceivers/mockawsxrayreceiver/go.mod +++ b/testbed/mockdatareceivers/mockawsxrayreceiver/go.mod @@ -4,8 +4,8 @@ go 1.18 require ( github.com/gorilla/mux v1.8.0 - go.opentelemetry.io/collector v0.63.2-0.20221104003159-6b27644724d8 - go.opentelemetry.io/collector/pdata v0.63.2-0.20221104003159-6b27644724d8 + go.opentelemetry.io/collector v0.63.2-0.20221108014805-0b08d5316426 + go.opentelemetry.io/collector/pdata v0.63.2-0.20221108014805-0b08d5316426 go.uber.org/zap v1.23.0 ) @@ -22,7 +22,7 @@ require ( github.com/modern-go/concurrent v0.0.0-20180306012644-bacd9c7ef1dd // indirect github.com/modern-go/reflect2 v1.0.2 // indirect github.com/pelletier/go-toml v1.9.4 // indirect - go.opencensus.io v0.23.0 // indirect + go.opencensus.io v0.24.0 // 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 ee469da9edd4..92313d2ef21f 100644 --- a/testbed/mockdatareceivers/mockawsxrayreceiver/go.sum +++ b/testbed/mockdatareceivers/mockawsxrayreceiver/go.sum @@ -229,7 +229,7 @@ github.com/prometheus/client_golang v0.9.1/go.mod h1:7SWBe2y4D6OKWSNQJUaRYU/AaXP github.com/prometheus/client_golang v1.0.0/go.mod h1:db9x61etRT2tGnBNRi70OPL5FsnadC4Ky3P0J6CfImo= github.com/prometheus/client_golang v1.7.1/go.mod h1:PY5Wy2awLA44sXw4AOSfFBetzPP4j5+D6mVACh+pe2M= github.com/prometheus/client_golang v1.11.1/go.mod h1:Z6t4BnS23TR94PD6BsDNk8yVqroYurpAkEiz0P2BEV0= -github.com/prometheus/client_golang v1.13.0 h1:b71QUfeo5M8gq2+evJdTPfZhYMAU0uKPkyPJ7TPsloU= +github.com/prometheus/client_golang v1.13.1 h1:3gMjIY2+/hzmqhtUC/aQNYldJA6DtH3CgQvwS+02K1c= github.com/prometheus/client_model v0.0.0-20180712105110-5c3871d89910/go.mod h1:MbSGuTsp3dbXC40dX6PRTWyKYBIrTGTE9sqQNg2J8bo= github.com/prometheus/client_model v0.0.0-20190129233127-fd36f4220a90/go.mod h1:xMI15A0UPsDsEKsMN9yxemIoYk6Tm2C1GtYGdfGttqA= github.com/prometheus/client_model v0.0.0-20190812154241-14fe0d1b01d4/go.mod h1:xMI15A0UPsDsEKsMN9yxemIoYk6Tm2C1GtYGdfGttqA= @@ -259,25 +259,29 @@ github.com/spf13/pflag v1.0.5 h1:iy+VFUOCP1a+8yFto/drg2CJ5u0yRoB7fZw3DKv/JXA= github.com/spf13/pflag v1.0.5/go.mod h1:McXfInJRrz4CZXVZOBLb0bTZqETkiAhM9Iw0y3An2Bg= github.com/stretchr/objx v0.1.0/go.mod h1:HFkY916IF+rwdDfMAkV7OtwuqBVzrE8GR6GFx+wExME= github.com/stretchr/objx v0.1.1/go.mod h1:HFkY916IF+rwdDfMAkV7OtwuqBVzrE8GR6GFx+wExME= +github.com/stretchr/objx v0.4.0/go.mod h1:YvHI0jy2hoMjB+UWwv71VJQ9isScKT/TqJzVSSt89Yw= +github.com/stretchr/objx v0.5.0/go.mod h1:Yh+to48EsGEfYuaHDzXPcE3xhTkx73EhmCGUpEOglKo= github.com/stretchr/testify v1.2.2/go.mod h1:a8OnRcib4nhh0OaRAV+Yts87kKdq0PP7pXfy6kDkUVs= github.com/stretchr/testify v1.3.0/go.mod h1:M5WIy9Dh21IEIfnGCwXGc5bZfKNJtfHm1UVUgZn+9EI= github.com/stretchr/testify v1.4.0/go.mod h1:j7eGeouHqKxXV5pUuKE4zz7dFj8WfuZ+81PSLYec5m4= github.com/stretchr/testify v1.5.1/go.mod h1:5W2xD1RspED5o8YsWQXVCued0rvSQ+mT+I5cxcmMvtA= -github.com/stretchr/testify v1.6.1/go.mod h1:6Fq8oRcR53rry900zMqJjRRixrwX3KX962/h/Wwjteg= github.com/stretchr/testify v1.7.0/go.mod h1:6Fq8oRcR53rry900zMqJjRRixrwX3KX962/h/Wwjteg= +github.com/stretchr/testify v1.7.1/go.mod h1:6Fq8oRcR53rry900zMqJjRRixrwX3KX962/h/Wwjteg= +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= github.com/yuin/goldmark v1.1.27/go.mod h1:3hX8gzYuyVAZsxl0MRgGTJEmQBFcNTphYh9decYSb74= github.com/yuin/goldmark v1.2.1/go.mod h1:3hX8gzYuyVAZsxl0MRgGTJEmQBFcNTphYh9decYSb74= github.com/yuin/goldmark v1.3.5/go.mod h1:mwnBkeHKe2W/ZEtQ+71ViKU8L12m81fl3OWwC1Zlc8k= 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.opencensus.io v0.23.0 h1:gqCw0LfLxScz8irSi8exQc7fyQ0fKQU/qnC/X8+V/1M= -go.opencensus.io v0.23.0/go.mod h1:XItmlyltB5F7CS4xOC1DcqMoFqwtC6OG2xF7mCv7P7E= -go.opentelemetry.io/collector v0.63.2-0.20221104003159-6b27644724d8 h1:rOT5HzXXfSISc6FiH012zH2/EFjp37UXfjEqj5BpkWQ= -go.opentelemetry.io/collector v0.63.2-0.20221104003159-6b27644724d8/go.mod h1:JVmeZXugK4ondC6KQgrHTHWiF4JttpG5k6dWPMt62+k= -go.opentelemetry.io/collector/pdata v0.63.2-0.20221104003159-6b27644724d8 h1:7xeTQjfsOm9eogQeIxjSEhlik9qsbBGsnmkQHfyKaRE= -go.opentelemetry.io/collector/pdata v0.63.2-0.20221104003159-6b27644724d8/go.mod h1:IzvXUGQml2mrnvdb8zIlEW3qQs9oFLdD2hLwJdZ+pek= +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.63.2-0.20221108014805-0b08d5316426 h1:z/wLTMh7/vNxcFUDa5uG7/IPE3tYx6pzCWPV41ghyV8= +go.opentelemetry.io/collector v0.63.2-0.20221108014805-0b08d5316426/go.mod h1:+Zb70q0Rq17dA9FcHTiTjW6g96lvJ8kAZ0c+eWNkAv0= +go.opentelemetry.io/collector/pdata v0.63.2-0.20221108014805-0b08d5316426 h1:wKDpgP0Tx/gWI2SgDGAY1OTSeihhDivbbRqFR79IGTc= +go.opentelemetry.io/collector/pdata v0.63.2-0.20221108014805-0b08d5316426/go.mod h1:IzvXUGQml2mrnvdb8zIlEW3qQs9oFLdD2hLwJdZ+pek= 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/testbed/data_providers.go b/testbed/testbed/data_providers.go index d0870a88abac..119ea5732ff5 100644 --- a/testbed/testbed/data_providers.go +++ b/testbed/testbed/data_providers.go @@ -21,7 +21,7 @@ import ( "strconv" "time" - "go.opentelemetry.io/collector/config" + "go.opentelemetry.io/collector/component" "go.opentelemetry.io/collector/pdata/pcommon" "go.opentelemetry.io/collector/pdata/plog" "go.opentelemetry.io/collector/pdata/pmetric" @@ -254,7 +254,7 @@ type FileDataProvider struct { // NewFileDataProvider creates an instance of FileDataProvider which generates test data // loaded from a file. -func NewFileDataProvider(filePath string, dataType config.DataType) (*FileDataProvider, error) { +func NewFileDataProvider(filePath string, dataType component.DataType) (*FileDataProvider, error) { buf, err := os.ReadFile(filepath.Clean(filePath)) if err != nil { return nil, err @@ -263,19 +263,19 @@ func NewFileDataProvider(filePath string, dataType config.DataType) (*FileDataPr dp := &FileDataProvider{} // Load the message from the file and count the data points. switch dataType { - case config.TracesDataType: + case component.DataTypeTraces: unmarshaler := &ptrace.JSONUnmarshaler{} if dp.traces, err = unmarshaler.UnmarshalTraces(buf); err != nil { return nil, err } dp.ItemsPerBatch = dp.traces.SpanCount() - case config.MetricsDataType: + case component.DataTypeMetrics: unmarshaler := &pmetric.JSONUnmarshaler{} if dp.metrics, err = unmarshaler.UnmarshalMetrics(buf); err != nil { return nil, err } dp.ItemsPerBatch = dp.metrics.DataPointCount() - case config.LogsDataType: + case component.DataTypeLogs: unmarshaler := &plog.JSONUnmarshaler{} if dp.logs, err = unmarshaler.UnmarshalLogs(buf); err != nil { return nil, err diff --git a/testbed/tests/metric_test.go b/testbed/tests/metric_test.go index 77484316d7f1..ca22bb2d68e8 100644 --- a/testbed/tests/metric_test.go +++ b/testbed/tests/metric_test.go @@ -23,7 +23,7 @@ import ( "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" - "go.opentelemetry.io/collector/config" + "go.opentelemetry.io/collector/component" "github.com/open-telemetry/opentelemetry-collector-contrib/testbed/datareceivers" "github.com/open-telemetry/opentelemetry-collector-contrib/testbed/datasenders" @@ -113,7 +113,7 @@ func TestMetricsFromFile(t *testing.T) { require.NoError(t, err) // Use metrics previously recorded using "file" exporter and "k8scluster" receiver. - dataProvider, err := testbed.NewFileDataProvider("testdata/k8s-metrics.json", config.MetricsDataType) + dataProvider, err := testbed.NewFileDataProvider("testdata/k8s-metrics.json", component.DataTypeMetrics) assert.NoError(t, err) options := testbed.LoadOptions{