From 2e2623c4ce6198ceb7db9ecdd8bb82f535a07443 Mon Sep 17 00:00:00 2001 From: Bogdan Drutu Date: Fri, 2 Dec 2022 08:24:14 -0800 Subject: [PATCH] Upgrade core, fix usage of deprecated component.Config.ID (#16576) Signed-off-by: Bogdan Drutu Signed-off-by: Bogdan Drutu --- cmd/configschema/go.mod | 43 ++-- cmd/configschema/go.sum | 83 ++++--- cmd/mdatagen/go.mod | 6 +- cmd/mdatagen/go.sum | 12 +- cmd/otelcontribcol/main_testbed.go | 3 +- confmap/provider/s3provider/go.mod | 5 +- confmap/provider/s3provider/go.sum | 9 +- .../alibabacloudlogserviceexporter/go.mod | 15 +- .../alibabacloudlogserviceexporter/go.sum | 30 +-- exporter/awscloudwatchlogsexporter/go.mod | 13 +- exporter/awscloudwatchlogsexporter/go.sum | 26 ++- exporter/awsemfexporter/go.mod | 15 +- exporter/awsemfexporter/go.sum | 30 +-- exporter/awskinesisexporter/go.mod | 15 +- exporter/awskinesisexporter/go.sum | 30 +-- exporter/awsxrayexporter/awsxray.go | 4 +- exporter/awsxrayexporter/go.mod | 15 +- exporter/awsxrayexporter/go.sum | 30 +-- exporter/azuredataexplorerexporter/go.mod | 13 +- exporter/azuredataexplorerexporter/go.sum | 26 ++- exporter/azuremonitorexporter/go.mod | 15 +- exporter/azuremonitorexporter/go.sum | 30 +-- exporter/carbonexporter/config.go | 18 ++ exporter/carbonexporter/config_test.go | 38 +++ exporter/carbonexporter/exporter.go | 12 - exporter/carbonexporter/exporter_test.go | 45 +--- exporter/carbonexporter/go.mod | 15 +- exporter/carbonexporter/go.sum | 30 +-- exporter/clickhouseexporter/go.mod | 15 +- exporter/clickhouseexporter/go.sum | 30 +-- exporter/coralogixexporter/go.mod | 15 +- exporter/coralogixexporter/go.sum | 30 +-- exporter/datadogexporter/go.mod | 25 +- exporter/datadogexporter/go.sum | 51 ++-- exporter/dynatraceexporter/go.mod | 13 +- exporter/dynatraceexporter/go.sum | 26 ++- exporter/elasticsearchexporter/go.mod | 13 +- exporter/elasticsearchexporter/go.sum | 26 ++- exporter/f5cloudexporter/go.mod | 15 +- exporter/f5cloudexporter/go.sum | 32 +-- exporter/fileexporter/go.mod | 13 +- exporter/fileexporter/go.sum | 26 ++- exporter/googlecloudexporter/go.mod | 21 +- exporter/googlecloudexporter/go.sum | 42 ++-- exporter/googlecloudpubsubexporter/go.mod | 13 +- exporter/googlecloudpubsubexporter/go.sum | 26 ++- .../googlemanagedprometheusexporter/go.mod | 33 +-- .../googlemanagedprometheusexporter/go.sum | 219 +++++++++++++++--- exporter/humioexporter/go.mod | 15 +- exporter/humioexporter/go.sum | 30 +-- exporter/influxdbexporter/go.mod | 13 +- exporter/influxdbexporter/go.sum | 26 ++- exporter/instanaexporter/go.mod | 15 +- exporter/instanaexporter/go.sum | 30 +-- exporter/jaegerexporter/config.go | 5 + exporter/jaegerexporter/config_test.go | 7 +- exporter/jaegerexporter/exporter.go | 8 +- exporter/jaegerexporter/factory.go | 8 - exporter/jaegerexporter/factory_test.go | 7 +- exporter/jaegerexporter/go.mod | 15 +- exporter/jaegerexporter/go.sum | 30 +-- exporter/jaegerthrifthttpexporter/config.go | 13 ++ .../jaegerthrifthttpexporter/config_test.go | 42 ++++ exporter/jaegerthrifthttpexporter/factory.go | 13 -- .../jaegerthrifthttpexporter/factory_test.go | 55 +---- exporter/jaegerthrifthttpexporter/go.mod | 15 +- exporter/jaegerthrifthttpexporter/go.sum | 30 +-- exporter/kafkaexporter/go.mod | 15 +- exporter/kafkaexporter/go.sum | 30 +-- exporter/loadbalancingexporter/go.mod | 23 +- exporter/loadbalancingexporter/go.sum | 46 ++-- exporter/logicmonitorexporter/go.mod | 13 +- exporter/logicmonitorexporter/go.sum | 26 ++- exporter/logzioexporter/go.mod | 15 +- exporter/logzioexporter/go.sum | 30 +-- exporter/lokiexporter/go.mod | 15 +- exporter/lokiexporter/go.sum | 30 +-- exporter/mezmoexporter/go.mod | 15 +- exporter/mezmoexporter/go.sum | 30 +-- exporter/opencensusexporter/go.mod | 15 +- exporter/opencensusexporter/go.sum | 30 +-- exporter/parquetexporter/go.mod | 13 +- exporter/parquetexporter/go.sum | 26 ++- exporter/prometheusexporter/go.mod | 15 +- exporter/prometheusexporter/go.sum | 36 +-- exporter/prometheusexporter/prometheus.go | 2 +- exporter/prometheusremotewriteexporter/go.mod | 15 +- exporter/prometheusremotewriteexporter/go.sum | 30 +-- exporter/pulsarexporter/go.mod | 15 +- exporter/pulsarexporter/go.sum | 30 +-- exporter/sapmexporter/go.mod | 15 +- exporter/sapmexporter/go.sum | 30 +-- exporter/sentryexporter/go.mod | 15 +- exporter/sentryexporter/go.sum | 30 +-- exporter/signalfxexporter/exporter.go | 5 +- exporter/signalfxexporter/factory_test.go | 10 +- exporter/signalfxexporter/go.mod | 19 +- exporter/signalfxexporter/go.sum | 42 ++-- exporter/skywalkingexporter/go.mod | 15 +- exporter/skywalkingexporter/go.sum | 30 +-- exporter/splunkhecexporter/exporter.go | 3 +- exporter/splunkhecexporter/factory.go | 1 - exporter/splunkhecexporter/factory_test.go | 4 +- exporter/splunkhecexporter/go.mod | 15 +- exporter/splunkhecexporter/go.sum | 30 +-- exporter/sumologicexporter/go.mod | 13 +- exporter/sumologicexporter/go.sum | 26 ++- exporter/tanzuobservabilityexporter/go.mod | 21 +- exporter/tanzuobservabilityexporter/go.sum | 42 ++-- .../tencentcloudlogserviceexporter/go.mod | 15 +- .../tencentcloudlogserviceexporter/go.sum | 30 +-- exporter/zipkinexporter/go.mod | 15 +- exporter/zipkinexporter/go.sum | 30 +-- extension/asapauthextension/extension.go | 67 ++---- extension/asapauthextension/factory.go | 7 +- extension/asapauthextension/factory_test.go | 3 +- extension/asapauthextension/go.mod | 13 +- extension/asapauthextension/go.sum | 26 ++- extension/awsproxy/extension.go | 5 +- extension/awsproxy/factory.go | 7 +- extension/awsproxy/factory_test.go | 3 +- extension/awsproxy/go.mod | 13 +- extension/awsproxy/go.sum | 26 ++- extension/basicauthextension/extension.go | 18 +- extension/basicauthextension/factory.go | 7 +- extension/basicauthextension/factory_test.go | 5 +- extension/basicauthextension/go.mod | 13 +- extension/basicauthextension/go.sum | 26 ++- .../bearertokenauth.go | 6 +- extension/bearertokenauthextension/factory.go | 7 +- .../bearertokenauthextension/factory_test.go | 3 +- extension/bearertokenauthextension/go.mod | 13 +- extension/bearertokenauthextension/go.sum | 26 ++- extension/fluentbitextension/factory.go | 7 +- extension/fluentbitextension/factory_test.go | 5 +- extension/fluentbitextension/go.mod | 17 +- extension/fluentbitextension/go.sum | 32 +-- extension/headerssetterextension/extension.go | 10 +- extension/headerssetterextension/factory.go | 9 +- .../headerssetterextension/factory_test.go | 3 +- extension/headerssetterextension/go.mod | 13 +- extension/headerssetterextension/go.sum | 26 ++- extension/healthcheckextension/factory.go | 7 +- .../healthcheckextension/factory_test.go | 5 +- extension/healthcheckextension/go.mod | 13 +- extension/healthcheckextension/go.sum | 26 ++- .../healthcheckextension.go | 3 +- extension/httpforwarder/extension.go | 5 +- extension/httpforwarder/factory.go | 9 +- extension/httpforwarder/factory_test.go | 4 +- extension/httpforwarder/go.mod | 13 +- extension/httpforwarder/go.sum | 26 ++- extension/jaegerremotesampling/extension.go | 3 +- extension/jaegerremotesampling/factory.go | 7 +- .../jaegerremotesampling/factory_test.go | 3 +- extension/jaegerremotesampling/go.mod | 13 +- extension/jaegerremotesampling/go.sum | 26 ++- extension/oauth2clientauthextension/doc.go | 2 +- .../oauth2clientauthextension/factory.go | 15 +- .../oauth2clientauthextension/factory_test.go | 3 +- extension/oauth2clientauthextension/go.mod | 13 +- extension/oauth2clientauthextension/go.sum | 26 ++- .../observer/dockerobserver/extension.go | 5 +- extension/observer/dockerobserver/factory.go | 9 +- .../observer/dockerobserver/factory_test.go | 3 +- extension/observer/dockerobserver/go.mod | 13 +- extension/observer/dockerobserver/go.sum | 26 ++- extension/observer/ecsobserver/extension.go | 3 +- .../observer/ecsobserver/extension_test.go | 6 +- extension/observer/ecsobserver/factory.go | 9 +- extension/observer/ecsobserver/go.mod | 13 +- extension/observer/ecsobserver/go.sum | 26 ++- .../observer/ecstaskobserver/extension.go | 5 +- extension/observer/ecstaskobserver/factory.go | 13 +- .../observer/ecstaskobserver/factory_test.go | 4 +- extension/observer/ecstaskobserver/go.mod | 13 +- extension/observer/ecstaskobserver/go.sum | 26 ++- extension/observer/hostobserver/extension.go | 13 +- extension/observer/hostobserver/factory.go | 12 +- .../observer/hostobserver/factory_test.go | 3 +- extension/observer/hostobserver/go.mod | 17 +- extension/observer/hostobserver/go.sum | 32 +-- extension/observer/k8sobserver/extension.go | 15 +- .../observer/k8sobserver/extension_test.go | 12 +- extension/observer/k8sobserver/factory.go | 11 +- .../observer/k8sobserver/factory_test.go | 3 +- extension/observer/k8sobserver/go.mod | 13 +- extension/observer/k8sobserver/go.sum | 26 ++- extension/oidcauthextension/extension.go | 6 +- extension/oidcauthextension/factory.go | 7 +- extension/oidcauthextension/factory_test.go | 3 +- extension/oidcauthextension/go.mod | 13 +- extension/oidcauthextension/go.sum | 26 ++- extension/pprofextension/factory.go | 7 +- extension/pprofextension/factory_test.go | 5 +- extension/pprofextension/go.mod | 13 +- extension/pprofextension/go.sum | 26 ++- extension/sigv4authextension/design.md | 8 +- extension/sigv4authextension/doc.go | 2 +- extension/sigv4authextension/extension.go | 11 +- extension/sigv4authextension/factory.go | 7 +- extension/sigv4authextension/factory_test.go | 14 +- extension/sigv4authextension/go.mod | 13 +- extension/sigv4authextension/go.sum | 26 ++- extension/storage/dbstorage/config.go | 6 +- extension/storage/dbstorage/config_test.go | 7 +- extension/storage/dbstorage/extension.go | 3 +- extension/storage/dbstorage/extension_test.go | 3 +- extension/storage/dbstorage/factory.go | 9 +- extension/storage/filestorage/extension.go | 3 +- .../storage/filestorage/extension_test.go | 10 +- extension/storage/filestorage/factory.go | 9 +- extension/storage/filestorage/factory_test.go | 5 +- extension/storage/go.mod | 13 +- extension/storage/go.sum | 26 ++- extension/storage/storagetest/extension.go | 46 +--- .../storage/storagetest/extension_test.go | 14 +- extension/storage/storagetest/host.go | 9 +- extension/storage/storagetest/host_test.go | 12 +- go.mod | 41 ++-- go.sum | 83 ++++--- internal/aws/containerinsight/go.mod | 2 +- internal/aws/containerinsight/go.sum | 4 +- internal/aws/cwlogs/go.mod | 13 +- internal/aws/cwlogs/go.sum | 26 ++- internal/aws/ecsutil/go.mod | 13 +- internal/aws/ecsutil/go.sum | 26 ++- internal/aws/proxy/go.mod | 6 +- internal/aws/proxy/go.sum | 12 +- internal/common/go.mod | 2 +- internal/common/go.sum | 4 +- internal/components/components.go | 5 +- internal/components/components_test.go | 5 - internal/components/exporters_test.go | 1 - internal/components/extensions_test.go | 7 +- internal/components/processors_test.go | 1 - internal/components/receivers_test.go | 4 - internal/coreinternal/go.mod | 8 +- internal/coreinternal/go.sum | 18 +- internal/filter/go.mod | 15 +- internal/filter/go.sum | 30 +-- internal/kubelet/go.mod | 4 +- internal/kubelet/go.sum | 8 +- internal/scrapertest/go.mod | 2 +- internal/scrapertest/go.sum | 4 +- internal/sharedcomponent/go.mod | 13 +- internal/sharedcomponent/go.sum | 26 ++- internal/splunk/go.mod | 15 +- internal/splunk/go.sum | 30 +-- pkg/batchperresourceattr/go.mod | 4 +- pkg/batchperresourceattr/go.sum | 10 +- pkg/batchpersignal/go.mod | 2 +- pkg/batchpersignal/go.sum | 4 +- pkg/ottl/go.mod | 13 +- pkg/ottl/go.sum | 26 ++- pkg/resourcetotelemetry/go.mod | 13 +- pkg/resourcetotelemetry/go.sum | 26 ++- pkg/stanza/adapter/factory.go | 4 +- pkg/stanza/adapter/storage_test.go | 8 +- pkg/stanza/go.mod | 13 +- pkg/stanza/go.sum | 26 ++- pkg/translator/jaeger/go.mod | 6 +- pkg/translator/jaeger/go.sum | 12 +- pkg/translator/loki/go.mod | 4 +- pkg/translator/loki/go.sum | 8 +- pkg/translator/opencensus/go.mod | 4 +- pkg/translator/opencensus/go.sum | 8 +- pkg/translator/prometheus/go.mod | 4 +- pkg/translator/prometheus/go.sum | 8 +- pkg/translator/prometheusremotewrite/go.mod | 8 +- pkg/translator/prometheusremotewrite/go.sum | 18 +- pkg/translator/signalfx/go.mod | 2 +- pkg/translator/signalfx/go.sum | 4 +- pkg/translator/zipkin/go.mod | 6 +- pkg/translator/zipkin/go.sum | 12 +- processor/attributesprocessor/config.go | 5 + processor/attributesprocessor/factory.go | 17 +- processor/attributesprocessor/factory_test.go | 24 +- processor/attributesprocessor/go.mod | 15 +- processor/attributesprocessor/go.sum | 30 +-- processor/cumulativetodeltaprocessor/go.mod | 13 +- processor/cumulativetodeltaprocessor/go.sum | 26 ++- processor/deltatorateprocessor/go.mod | 13 +- processor/deltatorateprocessor/go.sum | 26 ++- processor/filterprocessor/go.mod | 15 +- processor/filterprocessor/go.sum | 30 +-- processor/filterprocessor/traces.go | 1 - processor/groupbyattrsprocessor/go.mod | 13 +- processor/groupbyattrsprocessor/go.sum | 26 ++- processor/groupbytraceprocessor/go.mod | 13 +- processor/groupbytraceprocessor/go.sum | 26 ++- processor/k8sattributesprocessor/go.mod | 15 +- processor/k8sattributesprocessor/go.sum | 30 +-- processor/logstransformprocessor/factory.go | 1 - processor/logstransformprocessor/go.mod | 13 +- processor/logstransformprocessor/go.sum | 26 ++- processor/logstransformprocessor/processor.go | 1 - processor/metricsgenerationprocessor/go.mod | 13 +- processor/metricsgenerationprocessor/go.sum | 26 ++- processor/metricstransformprocessor/go.mod | 13 +- processor/metricstransformprocessor/go.sum | 26 ++- .../config_test.go | 3 +- .../probabilisticsamplerprocessor/go.mod | 21 +- .../probabilisticsamplerprocessor/go.sum | 42 ++-- processor/redactionprocessor/go.mod | 13 +- processor/redactionprocessor/go.sum | 26 ++- .../resourcedetectionprocessor/factory.go | 7 +- processor/resourcedetectionprocessor/go.mod | 17 +- processor/resourcedetectionprocessor/go.sum | 34 +-- processor/resourceprocessor/config.go | 5 + processor/resourceprocessor/config_test.go | 8 +- processor/resourceprocessor/factory.go | 18 +- processor/resourceprocessor/factory_test.go | 11 - processor/resourceprocessor/go.mod | 13 +- processor/resourceprocessor/go.sum | 26 ++- .../resource_processor_test.go | 23 -- processor/routingprocessor/go.mod | 15 +- processor/routingprocessor/go.sum | 30 +-- processor/routingprocessor/traces_test.go | 5 +- processor/schemaprocessor/go.mod | 13 +- processor/schemaprocessor/go.sum | 26 ++- processor/servicegraphprocessor/go.mod | 23 +- processor/servicegraphprocessor/go.sum | 46 ++-- .../servicegraphprocessor/processor_test.go | 11 +- processor/spanmetricsprocessor/go.mod | 25 +- processor/spanmetricsprocessor/go.sum | 50 ++-- .../spanmetricsprocessor/processor_test.go | 11 +- processor/spanprocessor/factory_test.go | 1 - processor/spanprocessor/go.mod | 15 +- processor/spanprocessor/go.sum | 30 +-- processor/tailsamplingprocessor/go.mod | 13 +- processor/tailsamplingprocessor/go.sum | 26 ++- processor/transformprocessor/go.mod | 13 +- processor/transformprocessor/go.sum | 26 ++- receiver/activedirectorydsreceiver/go.mod | 13 +- receiver/activedirectorydsreceiver/go.sum | 26 ++- receiver/aerospikereceiver/go.mod | 13 +- receiver/aerospikereceiver/go.sum | 26 ++- receiver/apachereceiver/go.mod | 13 +- receiver/apachereceiver/go.sum | 26 ++- receiver/awscloudwatchreceiver/go.mod | 13 +- receiver/awscloudwatchreceiver/go.sum | 26 ++- receiver/awscontainerinsightreceiver/go.mod | 17 +- receiver/awscontainerinsightreceiver/go.sum | 32 +-- .../awsecscontainermetricsreceiver/go.mod | 15 +- .../awsecscontainermetricsreceiver/go.sum | 30 +-- receiver/awsfirehosereceiver/go.mod | 15 +- receiver/awsfirehosereceiver/go.sum | 30 +-- .../awsfirehosereceiver/metrics_receiver.go | 7 +- receiver/awsfirehosereceiver/receiver.go | 2 - receiver/awsfirehosereceiver/receiver_test.go | 7 +- receiver/awsxrayreceiver/go.mod | 15 +- receiver/awsxrayreceiver/go.sum | 30 +-- .../internal/udppoller/poller.go | 5 +- .../internal/udppoller/poller_test.go | 58 ++--- receiver/awsxrayreceiver/receiver.go | 25 +- receiver/awsxrayreceiver/receiver_test.go | 37 ++- receiver/azureblobreceiver/factory.go | 2 +- receiver/azureblobreceiver/go.mod | 21 +- receiver/azureblobreceiver/go.sum | 42 ++-- receiver/azureblobreceiver/receiver.go | 4 +- receiver/azureblobreceiver/receiver_test.go | 3 +- receiver/azureeventhubreceiver/client.go | 7 +- receiver/azureeventhubreceiver/client_test.go | 8 +- receiver/azureeventhubreceiver/factory.go | 10 +- receiver/azureeventhubreceiver/go.mod | 21 +- receiver/azureeventhubreceiver/go.sum | 42 ++-- receiver/bigipreceiver/go.mod | 13 +- receiver/bigipreceiver/go.sum | 26 ++- receiver/carbonreceiver/config.go | 2 +- receiver/carbonreceiver/go.mod | 15 +- receiver/carbonreceiver/go.sum | 30 +-- receiver/carbonreceiver/receiver.go | 4 +- receiver/carbonreceiver/receiver_test.go | 2 +- receiver/carbonreceiver/reporter.go | 8 +- receiver/carbonreceiver/reporter_test.go | 6 +- receiver/chronyreceiver/go.mod | 13 +- receiver/chronyreceiver/go.sum | 26 ++- receiver/cloudfoundryreceiver/go.mod | 13 +- receiver/cloudfoundryreceiver/go.sum | 26 ++- receiver/cloudfoundryreceiver/receiver.go | 2 +- receiver/collectdreceiver/go.mod | 15 +- receiver/collectdreceiver/go.sum | 30 +-- receiver/couchdbreceiver/go.mod | 13 +- receiver/couchdbreceiver/go.sum | 26 ++- receiver/dockerstatsreceiver/go.mod | 15 +- receiver/dockerstatsreceiver/go.sum | 30 +-- receiver/dotnetdiagnosticsreceiver/go.mod | 13 +- receiver/dotnetdiagnosticsreceiver/go.sum | 26 ++- receiver/elasticsearchreceiver/go.mod | 13 +- receiver/elasticsearchreceiver/go.sum | 26 ++- receiver/expvarreceiver/go.mod | 13 +- receiver/expvarreceiver/go.sum | 26 ++- receiver/filelogreceiver/go.mod | 13 +- receiver/filelogreceiver/go.sum | 26 ++- receiver/filelogreceiver/storage_test.go | 8 +- receiver/flinkmetricsreceiver/go.mod | 13 +- receiver/flinkmetricsreceiver/go.sum | 26 ++- receiver/fluentforwardreceiver/go.mod | 13 +- receiver/fluentforwardreceiver/go.sum | 26 ++- receiver/googlecloudpubsubreceiver/factory.go | 2 +- receiver/googlecloudpubsubreceiver/go.mod | 13 +- receiver/googlecloudpubsubreceiver/go.sum | 26 ++- receiver/googlecloudspannerreceiver/config.go | 22 +- receiver/googlecloudspannerreceiver/go.mod | 13 +- receiver/googlecloudspannerreceiver/go.sum | 26 ++- receiver/hostmetricsreceiver/go.mod | 21 +- receiver/hostmetricsreceiver/go.sum | 42 ++-- receiver/httpcheckreceiver/go.mod | 13 +- receiver/httpcheckreceiver/go.sum | 26 ++- receiver/iisreceiver/go.mod | 13 +- receiver/iisreceiver/go.sum | 26 ++- receiver/influxdbreceiver/go.mod | 13 +- receiver/influxdbreceiver/go.sum | 26 ++- receiver/jaegerreceiver/factory.go | 2 +- receiver/jaegerreceiver/go.mod | 15 +- receiver/jaegerreceiver/go.sum | 30 +-- receiver/jmxreceiver/config.go | 22 +- receiver/jmxreceiver/config_test.go | 25 +- receiver/jmxreceiver/factory.go | 2 +- receiver/jmxreceiver/factory_test.go | 2 +- receiver/jmxreceiver/go.mod | 19 +- receiver/jmxreceiver/go.sum | 38 +-- receiver/jmxreceiver/integration_test.go | 2 +- receiver/journaldreceiver/go.mod | 13 +- receiver/journaldreceiver/go.sum | 26 ++- receiver/k8sclusterreceiver/go.mod | 15 +- receiver/k8sclusterreceiver/go.sum | 30 +-- receiver/k8sclusterreceiver/receiver.go | 5 +- receiver/k8sclusterreceiver/receiver_test.go | 9 +- receiver/k8seventsreceiver/go.mod | 15 +- receiver/k8seventsreceiver/go.sum | 30 +-- receiver/k8seventsreceiver/receiver.go | 2 +- receiver/k8sobjectsreceiver/go.mod | 15 +- receiver/k8sobjectsreceiver/go.sum | 30 +-- receiver/k8sobjectsreceiver/receiver.go | 2 +- receiver/kafkametricsreceiver/go.mod | 15 +- receiver/kafkametricsreceiver/go.sum | 30 +-- receiver/kafkareceiver/go.mod | 15 +- receiver/kafkareceiver/go.sum | 30 +-- receiver/kafkareceiver/kafka_receiver.go | 15 +- receiver/kubeletstatsreceiver/config.go | 1 - receiver/kubeletstatsreceiver/config_test.go | 1 - receiver/kubeletstatsreceiver/go.mod | 15 +- receiver/kubeletstatsreceiver/go.sum | 30 +-- receiver/kubeletstatsreceiver/scraper.go | 1 - receiver/memcachedreceiver/go.mod | 13 +- receiver/memcachedreceiver/go.sum | 26 ++- receiver/mongodbatlasreceiver/alerts.go | 6 +- receiver/mongodbatlasreceiver/alerts_test.go | 15 +- receiver/mongodbatlasreceiver/factory.go | 2 +- receiver/mongodbatlasreceiver/go.mod | 13 +- receiver/mongodbatlasreceiver/go.sum | 26 ++- receiver/mongodbatlasreceiver/logs_test.go | 28 +-- .../mongodbatlasreceiver/receiver_test.go | 19 +- receiver/mongodbreceiver/go.mod | 13 +- receiver/mongodbreceiver/go.sum | 26 ++- receiver/mysqlreceiver/go.mod | 13 +- receiver/mysqlreceiver/go.sum | 26 ++- receiver/nginxreceiver/go.mod | 13 +- receiver/nginxreceiver/go.sum | 26 ++- receiver/nsxtreceiver/go.mod | 13 +- receiver/nsxtreceiver/go.sum | 26 ++- receiver/opencensusreceiver/factory.go | 4 +- receiver/opencensusreceiver/go.mod | 15 +- receiver/opencensusreceiver/go.sum | 30 +-- .../internal/ocmetrics/opencensus.go | 6 +- .../internal/ocmetrics/opencensus_test.go | 10 +- .../internal/octrace/observability_test.go | 6 +- .../internal/octrace/opencensus.go | 6 +- .../internal/octrace/opencensus_test.go | 10 +- receiver/opencensusreceiver/opencensus.go | 7 +- .../opencensusreceiver/opencensus_test.go | 26 +-- receiver/oracledbreceiver/go.mod | 13 +- receiver/oracledbreceiver/go.sum | 26 ++- receiver/otlpjsonfilereceiver/file.go | 12 +- receiver/otlpjsonfilereceiver/go.mod | 13 +- receiver/otlpjsonfilereceiver/go.sum | 26 ++- receiver/podmanreceiver/go.mod | 15 +- receiver/podmanreceiver/go.sum | 30 +-- receiver/postgresqlreceiver/go.mod | 13 +- receiver/postgresqlreceiver/go.sum | 26 ++- receiver/prometheusexecreceiver/config.go | 8 + receiver/prometheusexecreceiver/factory.go | 2 +- .../prometheusexecreceiver/factory_test.go | 13 +- receiver/prometheusexecreceiver/go.mod | 15 +- receiver/prometheusexecreceiver/go.sum | 36 +-- receiver/prometheusexecreceiver/receiver.go | 17 +- .../prometheusexecreceiver/receiver_test.go | 42 ++-- receiver/prometheusreceiver/go.mod | 21 +- receiver/prometheusreceiver/go.sum | 42 ++-- .../prometheusreceiver/internal/appendable.go | 3 +- .../prometheusreceiver/metrics_receiver.go | 1 - receiver/promtailreceiver/go.mod | 13 +- receiver/promtailreceiver/go.sum | 26 ++- receiver/pulsarreceiver/go.mod | 15 +- receiver/pulsarreceiver/go.sum | 30 +-- receiver/pulsarreceiver/pulsar_receiver.go | 6 - receiver/purefareceiver/go.mod | 15 +- receiver/purefareceiver/go.sum | 36 +-- .../internal/bearertoken_test.go | 4 +- .../purefareceiver/internal/scraper_test.go | 4 +- receiver/rabbitmqreceiver/go.mod | 13 +- receiver/rabbitmqreceiver/go.sum | 26 ++- receiver/receivercreator/go.mod | 21 +- receiver/receivercreator/go.sum | 42 ++-- receiver/receivercreator/observerhandler.go | 29 +-- .../receivercreator/observerhandler_test.go | 24 +- receiver/receivercreator/receiver.go | 4 +- receiver/receivercreator/receiver_test.go | 3 +- receiver/receivercreator/runner.go | 29 +-- receiver/receivercreator/runner_test.go | 10 +- receiver/redisreceiver/go.mod | 13 +- receiver/redisreceiver/go.sum | 26 ++- receiver/riakreceiver/go.mod | 13 +- receiver/riakreceiver/go.sum | 26 ++- receiver/saphanareceiver/go.mod | 13 +- receiver/saphanareceiver/go.sum | 26 ++- receiver/sapmreceiver/go.mod | 15 +- receiver/sapmreceiver/go.sum | 30 +-- receiver/sapmreceiver/trace_receiver.go | 4 +- receiver/signalfxreceiver/go.mod | 19 +- receiver/signalfxreceiver/go.sum | 42 ++-- receiver/signalfxreceiver/receiver.go | 4 +- receiver/simpleprometheusreceiver/go.mod | 15 +- receiver/simpleprometheusreceiver/go.sum | 36 +-- receiver/skywalkingreceiver/factory.go | 2 +- receiver/skywalkingreceiver/go.mod | 15 +- receiver/skywalkingreceiver/go.sum | 30 +-- receiver/skywalkingreceiver/trace_receiver.go | 7 +- .../skywalkingreceiver/trace_receiver_test.go | 10 +- receiver/snmpreceiver/go.mod | 21 +- receiver/snmpreceiver/go.sum | 42 ++-- receiver/solacereceiver/go.mod | 13 +- receiver/solacereceiver/go.sum | 26 ++- receiver/solacereceiver/receiver.go | 20 +- receiver/solacereceiver/receiver_test.go | 2 - receiver/splunkhecreceiver/go.mod | 15 +- receiver/splunkhecreceiver/go.sum | 30 +-- receiver/splunkhecreceiver/receiver.go | 4 +- receiver/sqlqueryreceiver/go.mod | 13 +- receiver/sqlqueryreceiver/go.sum | 26 ++- receiver/sqlserverreceiver/go.mod | 13 +- receiver/sqlserverreceiver/go.sum | 26 ++- receiver/statsdreceiver/go.mod | 13 +- receiver/statsdreceiver/go.sum | 28 +-- receiver/statsdreceiver/receiver.go | 4 +- receiver/statsdreceiver/receiver_test.go | 2 +- receiver/statsdreceiver/reporter.go | 6 +- receiver/statsdreceiver/reporter_test.go | 6 +- receiver/syslogreceiver/go.mod | 13 +- receiver/syslogreceiver/go.sum | 26 ++- receiver/tcplogreceiver/go.mod | 13 +- receiver/tcplogreceiver/go.sum | 26 ++- receiver/udplogreceiver/go.mod | 13 +- receiver/udplogreceiver/go.sum | 26 ++- receiver/vcenterreceiver/go.mod | 13 +- receiver/vcenterreceiver/go.sum | 26 ++- receiver/wavefrontreceiver/go.mod | 15 +- receiver/wavefrontreceiver/go.sum | 30 +-- receiver/windowseventlogreceiver/go.mod | 13 +- receiver/windowseventlogreceiver/go.sum | 26 ++- .../factory_windows.go | 2 +- receiver/windowsperfcountersreceiver/go.mod | 13 +- receiver/windowsperfcountersreceiver/go.sum | 26 ++- receiver/zipkinreceiver/go.mod | 15 +- receiver/zipkinreceiver/go.sum | 30 +-- receiver/zipkinreceiver/trace_receiver.go | 4 +- receiver/zookeeperreceiver/go.mod | 13 +- receiver/zookeeperreceiver/go.sum | 26 ++- testbed/go.mod | 35 +-- testbed/go.sum | 74 +++--- .../mockawsxrayreceiver/go.mod | 13 +- .../mockawsxrayreceiver/go.sum | 26 ++- .../mockawsxrayreceiver/trace_receiver.go | 4 +- testbed/testbed/components.go | 3 +- 576 files changed, 5325 insertions(+), 4758 deletions(-) diff --git a/cmd/configschema/go.mod b/cmd/configschema/go.mod index 1f468b585dfb..a0089df17ff1 100644 --- a/cmd/configschema/go.mod +++ b/cmd/configschema/go.mod @@ -5,12 +5,12 @@ go 1.18 require ( github.com/fatih/structtag v1.2.0 github.com/google/uuid v1.3.0 - github.com/open-telemetry/opentelemetry-collector-contrib v0.66.0 + github.com/open-telemetry/opentelemetry-collector-contrib v0.0.0-00010101000000-000000000000 github.com/open-telemetry/opentelemetry-collector-contrib/receiver/redisreceiver v0.66.0 github.com/stretchr/testify v1.8.1 - go.opentelemetry.io/collector v0.66.1-0.20221128222955-4ff1ff379b90 - go.opentelemetry.io/collector/component v0.66.1-0.20221128222955-4ff1ff379b90 - go.opentelemetry.io/collector/receiver/otlpreceiver v0.66.1-0.20221128222955-4ff1ff379b90 + go.opentelemetry.io/collector v0.66.1-0.20221202005155-1c54042beb70 + go.opentelemetry.io/collector/component v0.66.1-0.20221202005155-1c54042beb70 + go.opentelemetry.io/collector/receiver/otlpreceiver v0.66.1-0.20221202005155-1c54042beb70 golang.org/x/mod v0.6.0 golang.org/x/text v0.4.0 ) @@ -73,9 +73,9 @@ require ( github.com/DataDog/sketches-go v1.4.1 // indirect github.com/DataDog/zstd v1.5.2 // indirect github.com/GehirnInc/crypt v0.0.0-20200316065508-bb7000b8a962 // indirect - github.com/GoogleCloudPlatform/opentelemetry-operations-go/detectors/gcp v0.34.1 // indirect + github.com/GoogleCloudPlatform/opentelemetry-operations-go/detectors/gcp v0.34.2 // indirect github.com/GoogleCloudPlatform/opentelemetry-operations-go/exporter/collector v0.34.2 // indirect - github.com/GoogleCloudPlatform/opentelemetry-operations-go/exporter/collector/googlemanagedprometheus v0.34.1 // indirect + github.com/GoogleCloudPlatform/opentelemetry-operations-go/exporter/collector/googlemanagedprometheus v0.34.2 // indirect github.com/GoogleCloudPlatform/opentelemetry-operations-go/exporter/trace v1.10.2 // indirect github.com/GoogleCloudPlatform/opentelemetry-operations-go/internal/resourcemapping v0.34.2 // indirect github.com/Masterminds/goutils v1.1.1 // indirect @@ -502,7 +502,7 @@ require ( github.com/open-telemetry/opentelemetry-collector-contrib/receiver/riakreceiver v0.66.0 // indirect github.com/open-telemetry/opentelemetry-collector-contrib/receiver/saphanareceiver v0.66.0 // indirect github.com/open-telemetry/opentelemetry-collector-contrib/receiver/sapmreceiver v0.66.0 // indirect - github.com/open-telemetry/opentelemetry-collector-contrib/receiver/signalfxreceiver v0.66.0 // indirect + github.com/open-telemetry/opentelemetry-collector-contrib/receiver/signalfxreceiver v0.0.0-00010101000000-000000000000 // indirect github.com/open-telemetry/opentelemetry-collector-contrib/receiver/simpleprometheusreceiver v0.66.0 // indirect github.com/open-telemetry/opentelemetry-collector-contrib/receiver/skywalkingreceiver v0.66.0 // indirect github.com/open-telemetry/opentelemetry-collector-contrib/receiver/snmpreceiver v0.66.0 // indirect @@ -588,8 +588,8 @@ require ( github.com/tidwall/wal v1.1.7 // indirect github.com/tilinna/clock v1.1.0 // indirect github.com/tinylib/msgp v1.1.6 // indirect - github.com/tklauser/go-sysconf v0.3.10 // indirect - github.com/tklauser/numcpus v0.5.0 // indirect + github.com/tklauser/go-sysconf v0.3.11 // indirect + github.com/tklauser/numcpus v0.6.0 // indirect github.com/uber/jaeger-client-go v2.30.0+incompatible // indirect github.com/uber/jaeger-lib v2.4.1+incompatible // indirect github.com/vincent-petithory/dataurl v1.0.0 // indirect @@ -614,17 +614,18 @@ require ( go.mongodb.org/atlas v0.19.0 // indirect go.mongodb.org/mongo-driver v1.10.3 // indirect go.opencensus.io v0.24.0 // indirect - go.opentelemetry.io/collector/consumer v0.66.1-0.20221128222955-4ff1ff379b90 // indirect - go.opentelemetry.io/collector/exporter/loggingexporter v0.66.1-0.20221128222955-4ff1ff379b90 // indirect - go.opentelemetry.io/collector/exporter/otlpexporter v0.66.1-0.20221128222955-4ff1ff379b90 // indirect - go.opentelemetry.io/collector/exporter/otlphttpexporter v0.66.1-0.20221128222955-4ff1ff379b90 // indirect - go.opentelemetry.io/collector/extension/ballastextension v0.66.1-0.20221128222955-4ff1ff379b90 // indirect - go.opentelemetry.io/collector/extension/zpagesextension v0.66.1-0.20221128222955-4ff1ff379b90 // indirect - go.opentelemetry.io/collector/featuregate v0.66.1-0.20221128222955-4ff1ff379b90 // indirect - go.opentelemetry.io/collector/pdata v0.66.1-0.20221128222955-4ff1ff379b90 // indirect - go.opentelemetry.io/collector/processor/batchprocessor v0.66.1-0.20221128222955-4ff1ff379b90 // indirect - go.opentelemetry.io/collector/processor/memorylimiterprocessor v0.66.1-0.20221128222955-4ff1ff379b90 // indirect - go.opentelemetry.io/collector/semconv v0.66.1-0.20221128222955-4ff1ff379b90 // indirect + go.opentelemetry.io/collector/confmap v0.0.0-20221201172708-2bdff61fa52a // indirect + go.opentelemetry.io/collector/consumer v0.66.1-0.20221202005155-1c54042beb70 // indirect + go.opentelemetry.io/collector/exporter/loggingexporter v0.66.1-0.20221202005155-1c54042beb70 // indirect + go.opentelemetry.io/collector/exporter/otlpexporter v0.66.1-0.20221202005155-1c54042beb70 // indirect + go.opentelemetry.io/collector/exporter/otlphttpexporter v0.66.1-0.20221202005155-1c54042beb70 // indirect + go.opentelemetry.io/collector/extension/ballastextension v0.66.1-0.20221202005155-1c54042beb70 // indirect + go.opentelemetry.io/collector/extension/zpagesextension v0.66.1-0.20221202005155-1c54042beb70 // indirect + go.opentelemetry.io/collector/featuregate v0.66.1-0.20221202005155-1c54042beb70 // indirect + go.opentelemetry.io/collector/pdata v0.66.1-0.20221202005155-1c54042beb70 // indirect + go.opentelemetry.io/collector/processor/batchprocessor v0.66.1-0.20221202005155-1c54042beb70 // indirect + go.opentelemetry.io/collector/processor/memorylimiterprocessor v0.66.1-0.20221202005155-1c54042beb70 // indirect + go.opentelemetry.io/collector/semconv v0.66.1-0.20221202005155-1c54042beb70 // 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 @@ -636,7 +637,7 @@ require ( go.uber.org/atomic v1.10.0 // indirect go.uber.org/goleak v1.2.0 // indirect go.uber.org/multierr v1.8.0 // indirect - go.uber.org/zap v1.23.0 // indirect + go.uber.org/zap v1.24.0 // indirect go4.org/intern v0.0.0-20211027215823-ae77deb06f29 // indirect go4.org/unsafe/assume-no-moving-gc v0.0.0-20220617031537-928513b29760 // indirect golang.org/x/crypto v0.1.0 // indirect diff --git a/cmd/configschema/go.sum b/cmd/configschema/go.sum index 0654610bfd38..b3c09fc64e46 100644 --- a/cmd/configschema/go.sum +++ b/cmd/configschema/go.sum @@ -447,12 +447,12 @@ github.com/DataDog/zstd v1.5.2/go.mod h1:g4AWEaM3yOg3HYfnJ3YIawPnVdXJh9QME85blwS github.com/Djarvur/go-err113 v0.0.0-20210108212216-aea10b59be24/go.mod h1:4UJr5HIiMZrwgkSPdsjy2uOQExX/WEILpIrO9UPGuXs= github.com/GehirnInc/crypt v0.0.0-20200316065508-bb7000b8a962 h1:KeNholpO2xKjgaaSyd+DyQRrsQjhbSeS7qe4nEw8aQw= github.com/GehirnInc/crypt v0.0.0-20200316065508-bb7000b8a962/go.mod h1:kC29dT1vFpj7py2OvG1khBdQpo3kInWP+6QipLbdngo= -github.com/GoogleCloudPlatform/opentelemetry-operations-go/detectors/gcp v0.34.1 h1:gcHr5iIamTMH+TOqvcIrkZ9zpDOKVkc2du/VYGJkYfM= -github.com/GoogleCloudPlatform/opentelemetry-operations-go/detectors/gcp v0.34.1/go.mod h1:8jbDwk101z1YJ201wir2t/3O5Sxn55M37IDVwnQA1rg= +github.com/GoogleCloudPlatform/opentelemetry-operations-go/detectors/gcp v0.34.2 h1:ebkUIeRzDUUeX7Mot0nYeyOhBMhS9bJj7v3tvZyqpdQ= +github.com/GoogleCloudPlatform/opentelemetry-operations-go/detectors/gcp v0.34.2/go.mod h1:HpmGbYLf1fsWiqVA0Z2oKh7qi7BroCgOl2NqB2N/TG4= github.com/GoogleCloudPlatform/opentelemetry-operations-go/exporter/collector v0.34.2 h1:LPtUGPSP+r9ONQ2rMlQtcU4ZPtJPLMYfbiT+/3q2rH4= github.com/GoogleCloudPlatform/opentelemetry-operations-go/exporter/collector v0.34.2/go.mod h1:Ak7usPCI+GqelKZTtbE7Sk4+ci2jjnkfl4X04YH7/ZY= -github.com/GoogleCloudPlatform/opentelemetry-operations-go/exporter/collector/googlemanagedprometheus v0.34.1 h1:O89aZCuqbyM1EB3XQkiyoeUXfGKsiEUwj7RyIGhH4uc= -github.com/GoogleCloudPlatform/opentelemetry-operations-go/exporter/collector/googlemanagedprometheus v0.34.1/go.mod h1:AWHL23liZLi/Ljw5XqFHyX/vloKqPodLx7Um4UKXisI= +github.com/GoogleCloudPlatform/opentelemetry-operations-go/exporter/collector/googlemanagedprometheus v0.34.2 h1:0WbyP5GfXxWvhoQVL7U4YouxQRrIRp6MEwcxxCIEGR0= +github.com/GoogleCloudPlatform/opentelemetry-operations-go/exporter/collector/googlemanagedprometheus v0.34.2/go.mod h1:NW+a69oLVqYvWZ98nlUPI/TqsOA/YRdOokzQVGNOxc4= github.com/GoogleCloudPlatform/opentelemetry-operations-go/exporter/trace v1.10.2 h1:mZ/DetsTFTLmOQq1B9l1ADBpJAYErGULD1C4oNLXjhI= github.com/GoogleCloudPlatform/opentelemetry-operations-go/exporter/trace v1.10.2/go.mod h1:wSSk0tKu5LMPxly6isD4u/myjFfXbqjzDbWRiLbXseE= github.com/GoogleCloudPlatform/opentelemetry-operations-go/internal/cloudmock v0.34.2 h1:svYLYCkrSUba1GQNyugC+4KVer/J9w8QPqoxWk8Rx58= @@ -2435,12 +2435,13 @@ github.com/timakin/bodyclose v0.0.0-20200424151742-cb6215831a94/go.mod h1:Qimiff github.com/tinylib/msgp v1.1.6 h1:i+SbKraHhnrf9M5MYmvQhFnbLhAXSDWF8WWsuyRdocw= github.com/tinylib/msgp v1.1.6/go.mod h1:75BAfg2hauQhs3qedfdDZmWAPcFMAvJE5b9rGOMufyw= github.com/tklauser/go-sysconf v0.3.9/go.mod h1:11DU/5sG7UexIrp/O6g35hrWzu0JxlwQ3LSFUzyeuhs= -github.com/tklauser/go-sysconf v0.3.10 h1:IJ1AZGZRWbY8T5Vfk04D9WOA5WSejdflXxP03OUqALw= github.com/tklauser/go-sysconf v0.3.10/go.mod h1:C8XykCvCb+Gn0oNCWPIlcb0RuglQTYaQ2hGm7jmxEFk= +github.com/tklauser/go-sysconf v0.3.11 h1:89WgdJhk5SNwJfu+GKyYveZ4IaJ7xAkecBo+KdJV0CM= +github.com/tklauser/go-sysconf v0.3.11/go.mod h1:GqXfhXY3kiPa0nAXPDIQIWzJbMCB7AmcWpGR8lSZfqI= github.com/tklauser/numcpus v0.3.0/go.mod h1:yFGUr7TUHQRAhyqBcEg0Ge34zDBAsIvJJcyE6boqnA8= github.com/tklauser/numcpus v0.4.0/go.mod h1:1+UI3pD8NW14VMwdgJNJ1ESk2UnwhAnz5hMwiKKqXCQ= -github.com/tklauser/numcpus v0.5.0 h1:ooe7gN0fg6myJ0EKoTAf5hebTZrH52px3New/D9iJ+A= -github.com/tklauser/numcpus v0.5.0/go.mod h1:OGzpTxpcIMNGYQdit2BYL1pvk/dSOaJWjKoflh+RQjo= +github.com/tklauser/numcpus v0.6.0 h1:kebhY2Qt+3U6RNK7UqpYNA+tJ23IBEGKkB7JQBfDYms= +github.com/tklauser/numcpus v0.6.0/go.mod h1:FEZLMke0lhOUG6w2JadTzp0a+Nl8PF/GFkQ5UVIcaL4= github.com/tmc/grpc-websocket-proxy v0.0.0-20170815181823-89b8d40f7ca8/go.mod h1:ncp9v5uamzpCO7NfCPTXjqaC+bZgJeR0sMTm6dMHP7U= github.com/tmc/grpc-websocket-proxy v0.0.0-20190109142713-0ad062ec5ee5/go.mod h1:ncp9v5uamzpCO7NfCPTXjqaC+bZgJeR0sMTm6dMHP7U= github.com/tomarrell/wrapcheck v0.0.0-20201130113247-1683564d9756/go.mod h1:yiFB6fFoV7saXirUGfuK+cPtUh4NX/Hf5y2WC2lehu0= @@ -2585,50 +2586,59 @@ go.opencensus.io v0.24.0/go.mod h1:vNK8G9p7aAivkbmorf4v+7Hgx+Zs0yY+0fOtgBfjQKo= go.opentelemetry.io/collector v0.57.2/go.mod h1:9TwWyMRhbFNzaaGLtm/6poWNDJw+etvQMS6Fy+8/8Xs= go.opentelemetry.io/collector v0.64.1/go.mod h1:RxdEKzwxTEhBAgzC4wzyJEwSFgjWU73CHnLjKUKQDyo= go.opentelemetry.io/collector v0.65.0/go.mod h1:hE6jCs+0rfiufCrVPucKZTMwfHit1okfDPnwPT2eW1I= -go.opentelemetry.io/collector v0.66.1-0.20221128222955-4ff1ff379b90 h1:yRe05/jMdzH4TFHfndZ5h2o2hKBK/79W72j8w51qNsI= -go.opentelemetry.io/collector v0.66.1-0.20221128222955-4ff1ff379b90/go.mod h1:hE6jCs+0rfiufCrVPucKZTMwfHit1okfDPnwPT2eW1I= +go.opentelemetry.io/collector v0.66.1-0.20221202005155-1c54042beb70 h1:INB2CsOtqqrija2KvMuIpbBQ3qX1BECEeR+d0NJX+oM= +go.opentelemetry.io/collector v0.66.1-0.20221202005155-1c54042beb70/go.mod h1:d0NHkHyANJy3HDTvYE/PoylMShUmFIbiir89ieI0X0c= go.opentelemetry.io/collector/component v0.65.0/go.mod h1:0c84EqXUhvYe6KW7hJfh76tiI/5yjWCH2amwyQ06XLM= -go.opentelemetry.io/collector/component v0.66.1-0.20221128222955-4ff1ff379b90 h1:AYSNTXbezhNg43EuYdVVcgxE/2gBVrm00FDx4DOmQVg= -go.opentelemetry.io/collector/component v0.66.1-0.20221128222955-4ff1ff379b90/go.mod h1:0c84EqXUhvYe6KW7hJfh76tiI/5yjWCH2amwyQ06XLM= +go.opentelemetry.io/collector/component v0.66.0/go.mod h1:0c84EqXUhvYe6KW7hJfh76tiI/5yjWCH2amwyQ06XLM= +go.opentelemetry.io/collector/component v0.66.1-0.20221202005155-1c54042beb70 h1:dEoJhzCmRShgmVro/kXm6pouGElgxkH2DsvanzCeZtU= +go.opentelemetry.io/collector/component v0.66.1-0.20221202005155-1c54042beb70/go.mod h1:OsVnvFFe38QSpcuZlQ8cvarDzcloCexgQ1/B2m80F6U= +go.opentelemetry.io/collector/confmap v0.0.0-20221201172708-2bdff61fa52a h1:2TscCXAQASO2kU9xHcMIUM/FP29fiQIRTilZmliq/7I= +go.opentelemetry.io/collector/confmap v0.0.0-20221201172708-2bdff61fa52a/go.mod h1:qJ3e8bA8h4wz/jYlbeEUafVHdrU7DkpStnmIUAz6VTQ= go.opentelemetry.io/collector/consumer v0.65.0/go.mod h1:WtoRZa5SnxQO1ZEQdVxYpFcXCmq62rakv0oUSlPO0NQ= -go.opentelemetry.io/collector/consumer v0.66.1-0.20221128222955-4ff1ff379b90 h1:nzNXVfC1FzXBXCLMzbMv+qK3E4EGiNsnMhfVsBd2yzc= -go.opentelemetry.io/collector/consumer v0.66.1-0.20221128222955-4ff1ff379b90/go.mod h1:WtoRZa5SnxQO1ZEQdVxYpFcXCmq62rakv0oUSlPO0NQ= -go.opentelemetry.io/collector/exporter/loggingexporter v0.66.1-0.20221128222955-4ff1ff379b90 h1:kCxEnurhKpScV+wDU/7RDngmOFeqyEh7GZUqrBaYnUU= -go.opentelemetry.io/collector/exporter/loggingexporter v0.66.1-0.20221128222955-4ff1ff379b90/go.mod h1:X7fNHTbcgvOOio9QDEyVk0WbIm1JaVYby4z3VzsOc2k= -go.opentelemetry.io/collector/exporter/otlpexporter v0.66.1-0.20221128222955-4ff1ff379b90 h1:3+YgPEDEyNzwiI+V9J2YBVGyV9Qppu4VPbB3jHeN8Ns= -go.opentelemetry.io/collector/exporter/otlpexporter v0.66.1-0.20221128222955-4ff1ff379b90/go.mod h1:IOoHR1lsV1r2TFOVctPogn9RUXT4jiU7kH+IhfUlP1w= -go.opentelemetry.io/collector/exporter/otlphttpexporter v0.66.1-0.20221128222955-4ff1ff379b90 h1:KkI/to7/yvuL5zHzhviy7UXMZVZ7jbfnk+YCAwCiimA= -go.opentelemetry.io/collector/exporter/otlphttpexporter v0.66.1-0.20221128222955-4ff1ff379b90/go.mod h1:Gx9WIGE9pUv38Sm8IN0IPM7k+mX2hHGfRZI/65pOSIc= -go.opentelemetry.io/collector/extension/ballastextension v0.66.1-0.20221128222955-4ff1ff379b90 h1:JmfSDExgWNiFQJ4eF9UzjDaE9rfBhKxIu5khBbAScd0= -go.opentelemetry.io/collector/extension/ballastextension v0.66.1-0.20221128222955-4ff1ff379b90/go.mod h1:vjBno34PZB+byrW3QWzftLFqCI1G8PbgPrgPzpFXpQM= +go.opentelemetry.io/collector/consumer v0.66.0/go.mod h1:WtoRZa5SnxQO1ZEQdVxYpFcXCmq62rakv0oUSlPO0NQ= +go.opentelemetry.io/collector/consumer v0.66.1-0.20221202005155-1c54042beb70 h1:XwpVjI1KeKGPXOZBLefGILMziPYuNf6IzbmiIEsIyI0= +go.opentelemetry.io/collector/consumer v0.66.1-0.20221202005155-1c54042beb70/go.mod h1:EWVBcSGcIcmeDGTnIboc/aqa3agsBeH8/q7yFWG7xVc= +go.opentelemetry.io/collector/exporter/loggingexporter v0.66.1-0.20221202005155-1c54042beb70 h1:/C637mgJY6I0l/KFLXmL9I1foefM53aob20WF2Yh/0Y= +go.opentelemetry.io/collector/exporter/loggingexporter v0.66.1-0.20221202005155-1c54042beb70/go.mod h1:xxkHO5NrxffTV22dhCy3K8XZThGJ1ak7LZ1ctoiJp5k= +go.opentelemetry.io/collector/exporter/otlpexporter v0.66.1-0.20221202005155-1c54042beb70 h1:m9GPfziw/079Xt7/Pfby/5obJhtqR19WKkgQQ/VxNZo= +go.opentelemetry.io/collector/exporter/otlpexporter v0.66.1-0.20221202005155-1c54042beb70/go.mod h1:bCD3trc7OqeEVCgyQdO3kwGgogZMjcMu2tX49SFv1lU= +go.opentelemetry.io/collector/exporter/otlphttpexporter v0.66.1-0.20221202005155-1c54042beb70 h1:7rDNCZS1qfqZxnCLaBWItnX/TweYKC6NyULpelzXl4g= +go.opentelemetry.io/collector/exporter/otlphttpexporter v0.66.1-0.20221202005155-1c54042beb70/go.mod h1:vkFlRP0DDfDfSDVl96Gvy5Ah8L8sMcVAxMZn+0af2ew= +go.opentelemetry.io/collector/extension/ballastextension v0.66.1-0.20221202005155-1c54042beb70 h1:pSGZDMMURLRp7iSxeNlDNDxDgFQJqCYt+Fv7bZxC0JU= +go.opentelemetry.io/collector/extension/ballastextension v0.66.1-0.20221202005155-1c54042beb70/go.mod h1:+YdyZisEXLDE8rhZE7Ce4wli0ZVE164SFN0qg2mPjDU= go.opentelemetry.io/collector/extension/zpagesextension v0.64.1/go.mod h1:XenhQAUbOHgqNq5YQ/vQIcDHRcPUaDgZQxDC2qoI4Bc= go.opentelemetry.io/collector/extension/zpagesextension v0.65.0/go.mod h1:+IPas7AeffG0GMIXhZr8IzpTNhH1Ri/6S/9YFqbLsmQ= -go.opentelemetry.io/collector/extension/zpagesextension v0.66.1-0.20221128222955-4ff1ff379b90 h1:Hsvd2zNTCjHjYVsHt57zUgpKMrmESgndZItuuvvv2bA= -go.opentelemetry.io/collector/extension/zpagesextension v0.66.1-0.20221128222955-4ff1ff379b90/go.mod h1:+IPas7AeffG0GMIXhZr8IzpTNhH1Ri/6S/9YFqbLsmQ= +go.opentelemetry.io/collector/extension/zpagesextension v0.66.0/go.mod h1:+IPas7AeffG0GMIXhZr8IzpTNhH1Ri/6S/9YFqbLsmQ= +go.opentelemetry.io/collector/extension/zpagesextension v0.66.1-0.20221202005155-1c54042beb70 h1:+vq59gRJpiAcUshBVxhqhc9aXOc/8Z5wuWlyng5Hfm4= +go.opentelemetry.io/collector/extension/zpagesextension v0.66.1-0.20221202005155-1c54042beb70/go.mod h1:tejEMB1pDXsmEeyg7UHB+S++4Lvgtki7N5CVWk5rI4A= go.opentelemetry.io/collector/featuregate v0.65.0/go.mod h1:tewuFKJYalWBU0bmNKg++MC1ipINXUr6szYzOw2p1GI= -go.opentelemetry.io/collector/featuregate v0.66.1-0.20221128222955-4ff1ff379b90 h1:UuJSFWbi9XxyNZsJKZuvpWg35BgRbcCGFH+38V2MAdw= -go.opentelemetry.io/collector/featuregate v0.66.1-0.20221128222955-4ff1ff379b90/go.mod h1:tewuFKJYalWBU0bmNKg++MC1ipINXUr6szYzOw2p1GI= +go.opentelemetry.io/collector/featuregate v0.66.0/go.mod h1:tewuFKJYalWBU0bmNKg++MC1ipINXUr6szYzOw2p1GI= +go.opentelemetry.io/collector/featuregate v0.66.1-0.20221202005155-1c54042beb70 h1:V0tf4ebciqIs07jFATfLGdUpLRaEsi+AiWuA/in0G8Y= +go.opentelemetry.io/collector/featuregate v0.66.1-0.20221202005155-1c54042beb70/go.mod h1:tewuFKJYalWBU0bmNKg++MC1ipINXUr6szYzOw2p1GI= go.opentelemetry.io/collector/pdata v0.56.0/go.mod h1:mYcCREWiIJyHss0dbU+GSiz2tmGZ6u09vtfkKTciog4= go.opentelemetry.io/collector/pdata v0.57.2/go.mod h1:RU9I8lwBUxucwOsSYzHEcHi15M9QaX78hgQ2PRdSxV0= go.opentelemetry.io/collector/pdata v0.64.1/go.mod h1:IzvXUGQml2mrnvdb8zIlEW3qQs9oFLdD2hLwJdZ+pek= go.opentelemetry.io/collector/pdata v0.65.0/go.mod h1:pqyaznLzk21m+1KL6fwOsRryRELL+zNM0qiVSn0MbVc= -go.opentelemetry.io/collector/pdata v0.66.1-0.20221128222955-4ff1ff379b90 h1:Vu4S4jSNcd0VFPzxQNO4+UqGwnes1xJDoFLPRiWHm8I= -go.opentelemetry.io/collector/pdata v0.66.1-0.20221128222955-4ff1ff379b90/go.mod h1:pqyaznLzk21m+1KL6fwOsRryRELL+zNM0qiVSn0MbVc= +go.opentelemetry.io/collector/pdata v0.66.0/go.mod h1:pqyaznLzk21m+1KL6fwOsRryRELL+zNM0qiVSn0MbVc= +go.opentelemetry.io/collector/pdata v0.66.1-0.20221202005155-1c54042beb70 h1:TPOrxkEMvZzfBSwF3ct+kUUgKA5g8unkZZbKQvJweeA= +go.opentelemetry.io/collector/pdata v0.66.1-0.20221202005155-1c54042beb70/go.mod h1:pqyaznLzk21m+1KL6fwOsRryRELL+zNM0qiVSn0MbVc= go.opentelemetry.io/collector/processor/batchprocessor v0.64.1/go.mod h1:qVl0+aYokPfiq5y+JVAvlII2rrUFBDEqqiDbTSnax78= go.opentelemetry.io/collector/processor/batchprocessor v0.65.0/go.mod h1:XhGTsC1B/bq4gpg8IZ/QYBLXkzE4Gw3r7Xu2+ik8A1Q= -go.opentelemetry.io/collector/processor/batchprocessor v0.66.1-0.20221128222955-4ff1ff379b90 h1:K12L9juzjChBMfp7cQaQsToz7i7975tUYVzJ3Tpw/Cw= -go.opentelemetry.io/collector/processor/batchprocessor v0.66.1-0.20221128222955-4ff1ff379b90/go.mod h1:XhGTsC1B/bq4gpg8IZ/QYBLXkzE4Gw3r7Xu2+ik8A1Q= -go.opentelemetry.io/collector/processor/memorylimiterprocessor v0.66.1-0.20221128222955-4ff1ff379b90 h1:4+4M7itvIDswjFTjvVttC+XWy7eOU2lxjEBaUiq/MXk= -go.opentelemetry.io/collector/processor/memorylimiterprocessor v0.66.1-0.20221128222955-4ff1ff379b90/go.mod h1:KfHfOzND4tzQYewrYzi/NGzvOV3wR7jzWTkxSR00lRI= +go.opentelemetry.io/collector/processor/batchprocessor v0.66.0/go.mod h1:XhGTsC1B/bq4gpg8IZ/QYBLXkzE4Gw3r7Xu2+ik8A1Q= +go.opentelemetry.io/collector/processor/batchprocessor v0.66.1-0.20221202005155-1c54042beb70 h1:Y4e8NnVevonnAgmjX9Z7QIMA32yMqHAOnAlh8SzTS8c= +go.opentelemetry.io/collector/processor/batchprocessor v0.66.1-0.20221202005155-1c54042beb70/go.mod h1:Pi1CsKDQFoDrUP1i3+VdE6s2Xuji7bOGFBgqHK0J32E= +go.opentelemetry.io/collector/processor/memorylimiterprocessor v0.66.1-0.20221202005155-1c54042beb70 h1:l0005D1ERsXKno9Ax5Gr2A8FaysF7n40yer6r5qAMHQ= +go.opentelemetry.io/collector/processor/memorylimiterprocessor v0.66.1-0.20221202005155-1c54042beb70/go.mod h1:9CBysimj8fH0weF6Wu8S8nW7cG/XRanrMU1BWlIXeN4= go.opentelemetry.io/collector/receiver/otlpreceiver v0.64.1/go.mod h1:4rwNi9SeCKBP9XGLWNRFKPsWUV5NK4iqMvdj2WRMksQ= -go.opentelemetry.io/collector/receiver/otlpreceiver v0.66.1-0.20221128222955-4ff1ff379b90 h1:/+HfaoVPSXgHUZOTZSSriuKOQi8L/rgyb7TTRx5jzoo= -go.opentelemetry.io/collector/receiver/otlpreceiver v0.66.1-0.20221128222955-4ff1ff379b90/go.mod h1:pb+dcV+KJ44dP+CqV0N6L6dTeDDvCXB8StCqwlrrSkM= +go.opentelemetry.io/collector/receiver/otlpreceiver v0.66.1-0.20221202005155-1c54042beb70 h1:KBbbPVDV7o5w857g6ePphdu4MV87jrcQevFYDA1okUk= +go.opentelemetry.io/collector/receiver/otlpreceiver v0.66.1-0.20221202005155-1c54042beb70/go.mod h1:0Py8RNjNiFRH6/F+vM2uptdaw9hMj1FBdv0ySntM2gE= go.opentelemetry.io/collector/semconv v0.56.0/go.mod h1:EH1wbDvTyqKpKBBpoMIe0KQk2plCcFS66Mo17WtR7CQ= go.opentelemetry.io/collector/semconv v0.57.2/go.mod h1:84YnUjmm+nhGu4YTDLnHCbxnL74ooWpismPG79tFD7w= go.opentelemetry.io/collector/semconv v0.64.1/go.mod h1:5o9yhOa+ABt7g2E5JABDxGZ1PQPbtfxrKNbYn+LOTXU= go.opentelemetry.io/collector/semconv v0.65.0/go.mod h1:5o9yhOa+ABt7g2E5JABDxGZ1PQPbtfxrKNbYn+LOTXU= -go.opentelemetry.io/collector/semconv v0.66.1-0.20221128222955-4ff1ff379b90 h1:hFaTA68cggZKWMv7wQ3bKP8KGTbowh/5AQZKCHzHTqM= -go.opentelemetry.io/collector/semconv v0.66.1-0.20221128222955-4ff1ff379b90/go.mod h1:5o9yhOa+ABt7g2E5JABDxGZ1PQPbtfxrKNbYn+LOTXU= +go.opentelemetry.io/collector/semconv v0.66.0/go.mod h1:5o9yhOa+ABt7g2E5JABDxGZ1PQPbtfxrKNbYn+LOTXU= +go.opentelemetry.io/collector/semconv v0.66.1-0.20221202005155-1c54042beb70 h1:Q5L9Urod3c8as6ZYaoaqBjarx/HXxsxy34DFZIU2fO4= +go.opentelemetry.io/collector/semconv v0.66.1-0.20221202005155-1c54042beb70/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= @@ -2715,8 +2725,9 @@ go.uber.org/zap v1.17.0/go.mod h1:MXVU+bhUf/A7Xi2HNOnopQOrmycQ5Ih87HtOu4q5SSo= go.uber.org/zap v1.19.1/go.mod h1:j3DNczoxDZroyBnOT1L/Q79cfUMGZxlv/9dzN7SM1rI= go.uber.org/zap v1.21.0/go.mod h1:wjWOCqI0f2ZZrJF/UufIOkiC8ii6tm1iqIsLo76RfJw= go.uber.org/zap v1.22.0/go.mod h1:H4siCOZOrAolnUPJEkfaSjDqyP+BDS0DdDWzwcgt3+U= -go.uber.org/zap v1.23.0 h1:OjGQ5KQDEUawVHxNwQgPpiypGHOxo2mNZsOqTak4fFY= go.uber.org/zap v1.23.0/go.mod h1:D+nX8jyLsMHMYrln8A0rJjFt/T/9/bGgIhAqxv5URuY= +go.uber.org/zap v1.24.0 h1:FiJd5l1UOLj0wCgbSE0rwwXHzEdAZS6hiiSnxJN/D60= +go.uber.org/zap v1.24.0/go.mod h1:2kMP+WWQ8aoFoedH3T2sq6iJ2yDWpHbP0f6MQbS9Gkg= go4.org/intern v0.0.0-20211027215823-ae77deb06f29 h1:UXLjNohABv4S58tHmeuIZDO6e3mHpW2Dx33gaNt03LE= go4.org/intern v0.0.0-20211027215823-ae77deb06f29/go.mod h1:cS2ma+47FKrLPdXFpr7CuxiTW3eyJbWew4qx0qtQWDA= go4.org/unsafe/assume-no-moving-gc v0.0.0-20211027215541-db492cf91b37/go.mod h1:FftLjUGFEDu5k8lt0ddY+HcrH/qU/0qk+H8j9/nTl3E= diff --git a/cmd/mdatagen/go.mod b/cmd/mdatagen/go.mod index b19546b54cdf..6be644a6bfe7 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.66.1-0.20221128222955-4ff1ff379b90 - go.opentelemetry.io/collector/pdata v0.66.1-0.20221128222955-4ff1ff379b90 + go.opentelemetry.io/collector/confmap v0.0.0-20221201172708-2bdff61fa52a + go.opentelemetry.io/collector/pdata v0.66.1-0.20221202005155-1c54042beb70 ) require ( @@ -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.opentelemetry.io/collector/featuregate v0.66.1-0.20221128222955-4ff1ff379b90 // indirect + go.opentelemetry.io/collector/featuregate v0.66.1-0.20221202005155-1c54042beb70 // indirect go.uber.org/atomic v1.10.0 // indirect go.uber.org/multierr v1.8.0 // indirect golang.org/x/crypto v0.0.0-20220507011949-2cf3adece122 // indirect diff --git a/cmd/mdatagen/go.sum b/cmd/mdatagen/go.sum index 1fd53dd5dd66..7b4c10aa7843 100644 --- a/cmd/mdatagen/go.sum +++ b/cmd/mdatagen/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.66.1-0.20221128222955-4ff1ff379b90 h1:yRe05/jMdzH4TFHfndZ5h2o2hKBK/79W72j8w51qNsI= -go.opentelemetry.io/collector v0.66.1-0.20221128222955-4ff1ff379b90/go.mod h1:hE6jCs+0rfiufCrVPucKZTMwfHit1okfDPnwPT2eW1I= -go.opentelemetry.io/collector/featuregate v0.66.1-0.20221128222955-4ff1ff379b90 h1:UuJSFWbi9XxyNZsJKZuvpWg35BgRbcCGFH+38V2MAdw= -go.opentelemetry.io/collector/featuregate v0.66.1-0.20221128222955-4ff1ff379b90/go.mod h1:tewuFKJYalWBU0bmNKg++MC1ipINXUr6szYzOw2p1GI= -go.opentelemetry.io/collector/pdata v0.66.1-0.20221128222955-4ff1ff379b90 h1:Vu4S4jSNcd0VFPzxQNO4+UqGwnes1xJDoFLPRiWHm8I= -go.opentelemetry.io/collector/pdata v0.66.1-0.20221128222955-4ff1ff379b90/go.mod h1:pqyaznLzk21m+1KL6fwOsRryRELL+zNM0qiVSn0MbVc= +go.opentelemetry.io/collector/confmap v0.0.0-20221201172708-2bdff61fa52a h1:2TscCXAQASO2kU9xHcMIUM/FP29fiQIRTilZmliq/7I= +go.opentelemetry.io/collector/confmap v0.0.0-20221201172708-2bdff61fa52a/go.mod h1:qJ3e8bA8h4wz/jYlbeEUafVHdrU7DkpStnmIUAz6VTQ= +go.opentelemetry.io/collector/featuregate v0.66.1-0.20221202005155-1c54042beb70 h1:V0tf4ebciqIs07jFATfLGdUpLRaEsi+AiWuA/in0G8Y= +go.opentelemetry.io/collector/featuregate v0.66.1-0.20221202005155-1c54042beb70/go.mod h1:tewuFKJYalWBU0bmNKg++MC1ipINXUr6szYzOw2p1GI= +go.opentelemetry.io/collector/pdata v0.66.1-0.20221202005155-1c54042beb70 h1:TPOrxkEMvZzfBSwF3ct+kUUgKA5g8unkZZbKQvJweeA= +go.opentelemetry.io/collector/pdata v0.66.1-0.20221202005155-1c54042beb70/go.mod h1:pqyaznLzk21m+1KL6fwOsRryRELL+zNM0qiVSn0MbVc= 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/cmd/otelcontribcol/main_testbed.go b/cmd/otelcontribcol/main_testbed.go index 1c2ffad5690c..9a9cdd39436b 100644 --- a/cmd/otelcontribcol/main_testbed.go +++ b/cmd/otelcontribcol/main_testbed.go @@ -26,6 +26,7 @@ import ( "go.opentelemetry.io/collector/exporter/loggingexporter" "go.opentelemetry.io/collector/exporter/otlpexporter" "go.opentelemetry.io/collector/exporter/otlphttpexporter" + "go.opentelemetry.io/collector/extension" "go.opentelemetry.io/collector/extension/ballastextension" "go.opentelemetry.io/collector/extension/zpagesextension" "go.opentelemetry.io/collector/processor/batchprocessor" @@ -73,7 +74,7 @@ func Components() ( ) { var errs error - extensions, err := component.MakeExtensionFactoryMap( + extensions, err := extension.MakeFactoryMap( ballastextension.NewFactory(), filestorage.NewFactory(), fluentbitextension.NewFactory(), diff --git a/confmap/provider/s3provider/go.mod b/confmap/provider/s3provider/go.mod index 156144ee37b5..0b76bc48b379 100644 --- a/confmap/provider/s3provider/go.mod +++ b/confmap/provider/s3provider/go.mod @@ -7,7 +7,7 @@ require ( github.com/aws/aws-sdk-go-v2/config v1.18.0 github.com/aws/aws-sdk-go-v2/service/s3 v1.19.0 github.com/stretchr/testify v1.8.1 - go.opentelemetry.io/collector v0.66.1-0.20221128222955-4ff1ff379b90 + go.opentelemetry.io/collector/confmap v0.0.0-20221201172708-2bdff61fa52a gopkg.in/yaml.v2 v2.4.0 ) @@ -31,9 +31,10 @@ require ( github.com/mitchellh/mapstructure v1.5.0 // indirect github.com/mitchellh/reflectwalk v1.0.2 // indirect github.com/pmezard/go-difflib v1.0.0 // indirect - go.opentelemetry.io/collector/featuregate v0.66.1-0.20221128222955-4ff1ff379b90 // indirect + go.opentelemetry.io/collector/featuregate v0.66.1-0.20221202005155-1c54042beb70 // indirect go.uber.org/atomic v1.10.0 // indirect go.uber.org/multierr v1.8.0 // indirect + golang.org/x/sys v0.2.0 // indirect gopkg.in/yaml.v3 v3.0.1 // indirect ) diff --git a/confmap/provider/s3provider/go.sum b/confmap/provider/s3provider/go.sum index b27f72452d90..b32e3ccff850 100644 --- a/confmap/provider/s3provider/go.sum +++ b/confmap/provider/s3provider/go.sum @@ -280,10 +280,10 @@ github.com/yuin/goldmark v1.3.5/go.mod h1:mwnBkeHKe2W/ZEtQ+71ViKU8L12m81fl3OWwC1 go.etcd.io/etcd/api/v3 v3.5.4/go.mod h1:5GB2vv4A4AOn3yk7MftYGHkUfGtDHnEraIjym4dYz5A= go.etcd.io/etcd/client/pkg/v3 v3.5.4/go.mod h1:IJHfcCEKxYu1Os13ZdwCwIUTUVGYTSAM3YSwc9/Ac1g= go.etcd.io/etcd/client/v3 v3.5.4/go.mod h1:ZaRkVgBZC+L+dLCjTcF1hRXpgZXQPOvnA/Ak/gq3kiY= -go.opentelemetry.io/collector v0.66.1-0.20221128222955-4ff1ff379b90 h1:yRe05/jMdzH4TFHfndZ5h2o2hKBK/79W72j8w51qNsI= -go.opentelemetry.io/collector v0.66.1-0.20221128222955-4ff1ff379b90/go.mod h1:hE6jCs+0rfiufCrVPucKZTMwfHit1okfDPnwPT2eW1I= -go.opentelemetry.io/collector/featuregate v0.66.1-0.20221128222955-4ff1ff379b90 h1:UuJSFWbi9XxyNZsJKZuvpWg35BgRbcCGFH+38V2MAdw= -go.opentelemetry.io/collector/featuregate v0.66.1-0.20221128222955-4ff1ff379b90/go.mod h1:tewuFKJYalWBU0bmNKg++MC1ipINXUr6szYzOw2p1GI= +go.opentelemetry.io/collector/confmap v0.0.0-20221201172708-2bdff61fa52a h1:2TscCXAQASO2kU9xHcMIUM/FP29fiQIRTilZmliq/7I= +go.opentelemetry.io/collector/confmap v0.0.0-20221201172708-2bdff61fa52a/go.mod h1:qJ3e8bA8h4wz/jYlbeEUafVHdrU7DkpStnmIUAz6VTQ= +go.opentelemetry.io/collector/featuregate v0.66.1-0.20221202005155-1c54042beb70 h1:V0tf4ebciqIs07jFATfLGdUpLRaEsi+AiWuA/in0G8Y= +go.opentelemetry.io/collector/featuregate v0.66.1-0.20221202005155-1c54042beb70/go.mod h1:tewuFKJYalWBU0bmNKg++MC1ipINXUr6szYzOw2p1GI= go.uber.org/atomic v1.7.0/go.mod h1:fEN4uk6kAWBTFdckzkM89CLk9XfWZrxpCo0nPH17wJc= go.uber.org/atomic v1.10.0 h1:9qC72Qh0+3MqyJbAn8YU5xVq1frD8bn3JtD2oXtafVQ= go.uber.org/atomic v1.10.0/go.mod h1:LUxbIzbOniOlMKjJjyPfpl4v+PKK2cNJn91OQbhoJI0= @@ -365,6 +365,7 @@ golang.org/x/sys v0.0.0-20210403161142-5e06dd20ab57/go.mod h1:h1NjWce9XRLGQEsW7w golang.org/x/sys v0.0.0-20210510120138-977fb7262007/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= golang.org/x/sys v0.0.0-20210603081109-ebe580a85c40/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= golang.org/x/sys v0.2.0 h1:ljd4t30dBnAvMZaQCevtY0xLLD0A+bRZXbgLMLU1F/A= +golang.org/x/sys v0.2.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= golang.org/x/term v0.0.0-20201126162022-7de9c90e9dd1/go.mod h1:bj7SfCRtBDWHUb9snDiAeCFNEtKQo2Wmx5Cou7ajbmo= golang.org/x/text v0.3.0/go.mod h1:NqM8EUOU14njkJ3fqMW+pc6Ldnwhi/IjpwHt7yyuwOQ= golang.org/x/text v0.3.1-0.20181227161524-e6919f6577db/go.mod h1:bEr9sfX3Q8Zfm5fL9x+3itogRgK3+ptLWKqgva+5dAk= diff --git a/exporter/alibabacloudlogserviceexporter/go.mod b/exporter/alibabacloudlogserviceexporter/go.mod index 4dfede05c3ab..7854612b2cd3 100644 --- a/exporter/alibabacloudlogserviceexporter/go.mod +++ b/exporter/alibabacloudlogserviceexporter/go.mod @@ -7,11 +7,12 @@ require ( github.com/gogo/protobuf v1.3.2 github.com/open-telemetry/opentelemetry-collector-contrib/internal/coreinternal v0.66.0 github.com/stretchr/testify v1.8.1 - go.opentelemetry.io/collector v0.66.1-0.20221128222955-4ff1ff379b90 - go.opentelemetry.io/collector/component v0.66.1-0.20221128222955-4ff1ff379b90 - go.opentelemetry.io/collector/pdata v0.66.1-0.20221128222955-4ff1ff379b90 - go.opentelemetry.io/collector/semconv v0.66.1-0.20221128222955-4ff1ff379b90 - go.uber.org/zap v1.23.0 + go.opentelemetry.io/collector v0.66.1-0.20221202005155-1c54042beb70 + go.opentelemetry.io/collector/component v0.66.1-0.20221202005155-1c54042beb70 + go.opentelemetry.io/collector/confmap v0.0.0-20221201172708-2bdff61fa52a + go.opentelemetry.io/collector/pdata v0.66.1-0.20221202005155-1c54042beb70 + go.opentelemetry.io/collector/semconv v0.66.1-0.20221202005155-1c54042beb70 + go.uber.org/zap v1.24.0 ) require ( @@ -33,8 +34,8 @@ require ( github.com/pmezard/go-difflib v1.0.0 // indirect github.com/rogpeppe/go-internal v1.9.0 // indirect go.opencensus.io v0.24.0 // indirect - go.opentelemetry.io/collector/consumer v0.66.1-0.20221128222955-4ff1ff379b90 // indirect - go.opentelemetry.io/collector/featuregate v0.66.1-0.20221128222955-4ff1ff379b90 // indirect + go.opentelemetry.io/collector/consumer v0.66.1-0.20221202005155-1c54042beb70 // indirect + go.opentelemetry.io/collector/featuregate v0.66.1-0.20221202005155-1c54042beb70 // 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 378f36dba3e9..f78b38b49c37 100644 --- a/exporter/alibabacloudlogserviceexporter/go.sum +++ b/exporter/alibabacloudlogserviceexporter/go.sum @@ -422,18 +422,20 @@ go.opencensus.io v0.20.2/go.mod h1:6WKK9ahsWS3RSO+PY9ZHZUfv2irvY6gN279GOPZjmmk= go.opencensus.io v0.22.2/go.mod h1:yxeiOL68Rb0Xd1ddK5vPZ/oVn4vY4Ynel7k9FzqtOIw= go.opencensus.io v0.24.0 h1:y73uSU6J157QMP2kn2r30vwW1A2W2WFwSCGnAVxeaD0= go.opencensus.io v0.24.0/go.mod h1:vNK8G9p7aAivkbmorf4v+7Hgx+Zs0yY+0fOtgBfjQKo= -go.opentelemetry.io/collector v0.66.1-0.20221128222955-4ff1ff379b90 h1:yRe05/jMdzH4TFHfndZ5h2o2hKBK/79W72j8w51qNsI= -go.opentelemetry.io/collector v0.66.1-0.20221128222955-4ff1ff379b90/go.mod h1:hE6jCs+0rfiufCrVPucKZTMwfHit1okfDPnwPT2eW1I= -go.opentelemetry.io/collector/component v0.66.1-0.20221128222955-4ff1ff379b90 h1:AYSNTXbezhNg43EuYdVVcgxE/2gBVrm00FDx4DOmQVg= -go.opentelemetry.io/collector/component v0.66.1-0.20221128222955-4ff1ff379b90/go.mod h1:0c84EqXUhvYe6KW7hJfh76tiI/5yjWCH2amwyQ06XLM= -go.opentelemetry.io/collector/consumer v0.66.1-0.20221128222955-4ff1ff379b90 h1:nzNXVfC1FzXBXCLMzbMv+qK3E4EGiNsnMhfVsBd2yzc= -go.opentelemetry.io/collector/consumer v0.66.1-0.20221128222955-4ff1ff379b90/go.mod h1:WtoRZa5SnxQO1ZEQdVxYpFcXCmq62rakv0oUSlPO0NQ= -go.opentelemetry.io/collector/featuregate v0.66.1-0.20221128222955-4ff1ff379b90 h1:UuJSFWbi9XxyNZsJKZuvpWg35BgRbcCGFH+38V2MAdw= -go.opentelemetry.io/collector/featuregate v0.66.1-0.20221128222955-4ff1ff379b90/go.mod h1:tewuFKJYalWBU0bmNKg++MC1ipINXUr6szYzOw2p1GI= -go.opentelemetry.io/collector/pdata v0.66.1-0.20221128222955-4ff1ff379b90 h1:Vu4S4jSNcd0VFPzxQNO4+UqGwnes1xJDoFLPRiWHm8I= -go.opentelemetry.io/collector/pdata v0.66.1-0.20221128222955-4ff1ff379b90/go.mod h1:pqyaznLzk21m+1KL6fwOsRryRELL+zNM0qiVSn0MbVc= -go.opentelemetry.io/collector/semconv v0.66.1-0.20221128222955-4ff1ff379b90 h1:hFaTA68cggZKWMv7wQ3bKP8KGTbowh/5AQZKCHzHTqM= -go.opentelemetry.io/collector/semconv v0.66.1-0.20221128222955-4ff1ff379b90/go.mod h1:5o9yhOa+ABt7g2E5JABDxGZ1PQPbtfxrKNbYn+LOTXU= +go.opentelemetry.io/collector v0.66.1-0.20221202005155-1c54042beb70 h1:INB2CsOtqqrija2KvMuIpbBQ3qX1BECEeR+d0NJX+oM= +go.opentelemetry.io/collector v0.66.1-0.20221202005155-1c54042beb70/go.mod h1:d0NHkHyANJy3HDTvYE/PoylMShUmFIbiir89ieI0X0c= +go.opentelemetry.io/collector/component v0.66.1-0.20221202005155-1c54042beb70 h1:dEoJhzCmRShgmVro/kXm6pouGElgxkH2DsvanzCeZtU= +go.opentelemetry.io/collector/component v0.66.1-0.20221202005155-1c54042beb70/go.mod h1:OsVnvFFe38QSpcuZlQ8cvarDzcloCexgQ1/B2m80F6U= +go.opentelemetry.io/collector/confmap v0.0.0-20221201172708-2bdff61fa52a h1:2TscCXAQASO2kU9xHcMIUM/FP29fiQIRTilZmliq/7I= +go.opentelemetry.io/collector/confmap v0.0.0-20221201172708-2bdff61fa52a/go.mod h1:qJ3e8bA8h4wz/jYlbeEUafVHdrU7DkpStnmIUAz6VTQ= +go.opentelemetry.io/collector/consumer v0.66.1-0.20221202005155-1c54042beb70 h1:XwpVjI1KeKGPXOZBLefGILMziPYuNf6IzbmiIEsIyI0= +go.opentelemetry.io/collector/consumer v0.66.1-0.20221202005155-1c54042beb70/go.mod h1:EWVBcSGcIcmeDGTnIboc/aqa3agsBeH8/q7yFWG7xVc= +go.opentelemetry.io/collector/featuregate v0.66.1-0.20221202005155-1c54042beb70 h1:V0tf4ebciqIs07jFATfLGdUpLRaEsi+AiWuA/in0G8Y= +go.opentelemetry.io/collector/featuregate v0.66.1-0.20221202005155-1c54042beb70/go.mod h1:tewuFKJYalWBU0bmNKg++MC1ipINXUr6szYzOw2p1GI= +go.opentelemetry.io/collector/pdata v0.66.1-0.20221202005155-1c54042beb70 h1:TPOrxkEMvZzfBSwF3ct+kUUgKA5g8unkZZbKQvJweeA= +go.opentelemetry.io/collector/pdata v0.66.1-0.20221202005155-1c54042beb70/go.mod h1:pqyaznLzk21m+1KL6fwOsRryRELL+zNM0qiVSn0MbVc= +go.opentelemetry.io/collector/semconv v0.66.1-0.20221202005155-1c54042beb70 h1:Q5L9Urod3c8as6ZYaoaqBjarx/HXxsxy34DFZIU2fO4= +go.opentelemetry.io/collector/semconv v0.66.1-0.20221202005155-1c54042beb70/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= @@ -458,8 +460,8 @@ go.uber.org/tools v0.0.0-20190618225709-2cfd321de3ee/go.mod h1:vJERXedbb3MVM5f9E go.uber.org/zap v1.10.0/go.mod h1:vwi/ZaCAaUcBkycHslxD9B2zi4UTXhF60s6SWpuDF0Q= go.uber.org/zap v1.13.0/go.mod h1:zwrFLgMcdUuIBviXEYEH1YKNaOBnKXsx2IPda5bBwHM= go.uber.org/zap v1.17.0/go.mod h1:MXVU+bhUf/A7Xi2HNOnopQOrmycQ5Ih87HtOu4q5SSo= -go.uber.org/zap v1.23.0 h1:OjGQ5KQDEUawVHxNwQgPpiypGHOxo2mNZsOqTak4fFY= -go.uber.org/zap v1.23.0/go.mod h1:D+nX8jyLsMHMYrln8A0rJjFt/T/9/bGgIhAqxv5URuY= +go.uber.org/zap v1.24.0 h1:FiJd5l1UOLj0wCgbSE0rwwXHzEdAZS6hiiSnxJN/D60= +go.uber.org/zap v1.24.0/go.mod h1:2kMP+WWQ8aoFoedH3T2sq6iJ2yDWpHbP0f6MQbS9Gkg= golang.org/x/crypto v0.0.0-20180904163835-0709b304e793/go.mod h1:6SG95UA2DQfeDnfUPMdvaQW0Q7yPrPDi9nlGo2tz2b4= golang.org/x/crypto v0.0.0-20181029021203-45a5f77698d3/go.mod h1:6SG95UA2DQfeDnfUPMdvaQW0Q7yPrPDi9nlGo2tz2b4= golang.org/x/crypto v0.0.0-20190308221718-c2843e01d9a2/go.mod h1:djNgcEr1/C05ACkg1iLfiJU5Ep61QUkGW8qpdssI0+w= diff --git a/exporter/awscloudwatchlogsexporter/go.mod b/exporter/awscloudwatchlogsexporter/go.mod index 8c5c3135bed5..d49f5863f26c 100644 --- a/exporter/awscloudwatchlogsexporter/go.mod +++ b/exporter/awscloudwatchlogsexporter/go.mod @@ -8,12 +8,13 @@ require ( github.com/open-telemetry/opentelemetry-collector-contrib/internal/aws/awsutil v0.66.0 github.com/open-telemetry/opentelemetry-collector-contrib/internal/aws/cwlogs v0.66.0 github.com/stretchr/testify v1.8.1 - go.opentelemetry.io/collector v0.66.1-0.20221128222955-4ff1ff379b90 - go.opentelemetry.io/collector/component v0.66.1-0.20221128222955-4ff1ff379b90 - go.opentelemetry.io/collector/consumer v0.66.1-0.20221128222955-4ff1ff379b90 - go.opentelemetry.io/collector/pdata v0.66.1-0.20221128222955-4ff1ff379b90 + go.opentelemetry.io/collector v0.66.1-0.20221202005155-1c54042beb70 + go.opentelemetry.io/collector/component v0.66.1-0.20221202005155-1c54042beb70 + go.opentelemetry.io/collector/confmap v0.0.0-20221201172708-2bdff61fa52a + go.opentelemetry.io/collector/consumer v0.66.1-0.20221202005155-1c54042beb70 + go.opentelemetry.io/collector/pdata v0.66.1-0.20221202005155-1c54042beb70 go.uber.org/multierr v1.8.0 - go.uber.org/zap v1.23.0 + go.uber.org/zap v1.24.0 ) require ( @@ -33,7 +34,7 @@ require ( github.com/rogpeppe/go-internal v1.8.1 // indirect github.com/stretchr/objx v0.5.0 // indirect go.opencensus.io v0.24.0 // indirect - go.opentelemetry.io/collector/featuregate v0.66.1-0.20221128222955-4ff1ff379b90 // indirect + go.opentelemetry.io/collector/featuregate v0.66.1-0.20221202005155-1c54042beb70 // 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 2c3fc7580785..ad55e0dbf183 100644 --- a/exporter/awscloudwatchlogsexporter/go.sum +++ b/exporter/awscloudwatchlogsexporter/go.sum @@ -289,16 +289,18 @@ go.etcd.io/etcd/client/pkg/v3 v3.5.4/go.mod h1:IJHfcCEKxYu1Os13ZdwCwIUTUVGYTSAM3 go.etcd.io/etcd/client/v3 v3.5.4/go.mod h1:ZaRkVgBZC+L+dLCjTcF1hRXpgZXQPOvnA/Ak/gq3kiY= go.opencensus.io v0.24.0 h1:y73uSU6J157QMP2kn2r30vwW1A2W2WFwSCGnAVxeaD0= go.opencensus.io v0.24.0/go.mod h1:vNK8G9p7aAivkbmorf4v+7Hgx+Zs0yY+0fOtgBfjQKo= -go.opentelemetry.io/collector v0.66.1-0.20221128222955-4ff1ff379b90 h1:yRe05/jMdzH4TFHfndZ5h2o2hKBK/79W72j8w51qNsI= -go.opentelemetry.io/collector v0.66.1-0.20221128222955-4ff1ff379b90/go.mod h1:hE6jCs+0rfiufCrVPucKZTMwfHit1okfDPnwPT2eW1I= -go.opentelemetry.io/collector/component v0.66.1-0.20221128222955-4ff1ff379b90 h1:AYSNTXbezhNg43EuYdVVcgxE/2gBVrm00FDx4DOmQVg= -go.opentelemetry.io/collector/component v0.66.1-0.20221128222955-4ff1ff379b90/go.mod h1:0c84EqXUhvYe6KW7hJfh76tiI/5yjWCH2amwyQ06XLM= -go.opentelemetry.io/collector/consumer v0.66.1-0.20221128222955-4ff1ff379b90 h1:nzNXVfC1FzXBXCLMzbMv+qK3E4EGiNsnMhfVsBd2yzc= -go.opentelemetry.io/collector/consumer v0.66.1-0.20221128222955-4ff1ff379b90/go.mod h1:WtoRZa5SnxQO1ZEQdVxYpFcXCmq62rakv0oUSlPO0NQ= -go.opentelemetry.io/collector/featuregate v0.66.1-0.20221128222955-4ff1ff379b90 h1:UuJSFWbi9XxyNZsJKZuvpWg35BgRbcCGFH+38V2MAdw= -go.opentelemetry.io/collector/featuregate v0.66.1-0.20221128222955-4ff1ff379b90/go.mod h1:tewuFKJYalWBU0bmNKg++MC1ipINXUr6szYzOw2p1GI= -go.opentelemetry.io/collector/pdata v0.66.1-0.20221128222955-4ff1ff379b90 h1:Vu4S4jSNcd0VFPzxQNO4+UqGwnes1xJDoFLPRiWHm8I= -go.opentelemetry.io/collector/pdata v0.66.1-0.20221128222955-4ff1ff379b90/go.mod h1:pqyaznLzk21m+1KL6fwOsRryRELL+zNM0qiVSn0MbVc= +go.opentelemetry.io/collector v0.66.1-0.20221202005155-1c54042beb70 h1:INB2CsOtqqrija2KvMuIpbBQ3qX1BECEeR+d0NJX+oM= +go.opentelemetry.io/collector v0.66.1-0.20221202005155-1c54042beb70/go.mod h1:d0NHkHyANJy3HDTvYE/PoylMShUmFIbiir89ieI0X0c= +go.opentelemetry.io/collector/component v0.66.1-0.20221202005155-1c54042beb70 h1:dEoJhzCmRShgmVro/kXm6pouGElgxkH2DsvanzCeZtU= +go.opentelemetry.io/collector/component v0.66.1-0.20221202005155-1c54042beb70/go.mod h1:OsVnvFFe38QSpcuZlQ8cvarDzcloCexgQ1/B2m80F6U= +go.opentelemetry.io/collector/confmap v0.0.0-20221201172708-2bdff61fa52a h1:2TscCXAQASO2kU9xHcMIUM/FP29fiQIRTilZmliq/7I= +go.opentelemetry.io/collector/confmap v0.0.0-20221201172708-2bdff61fa52a/go.mod h1:qJ3e8bA8h4wz/jYlbeEUafVHdrU7DkpStnmIUAz6VTQ= +go.opentelemetry.io/collector/consumer v0.66.1-0.20221202005155-1c54042beb70 h1:XwpVjI1KeKGPXOZBLefGILMziPYuNf6IzbmiIEsIyI0= +go.opentelemetry.io/collector/consumer v0.66.1-0.20221202005155-1c54042beb70/go.mod h1:EWVBcSGcIcmeDGTnIboc/aqa3agsBeH8/q7yFWG7xVc= +go.opentelemetry.io/collector/featuregate v0.66.1-0.20221202005155-1c54042beb70 h1:V0tf4ebciqIs07jFATfLGdUpLRaEsi+AiWuA/in0G8Y= +go.opentelemetry.io/collector/featuregate v0.66.1-0.20221202005155-1c54042beb70/go.mod h1:tewuFKJYalWBU0bmNKg++MC1ipINXUr6szYzOw2p1GI= +go.opentelemetry.io/collector/pdata v0.66.1-0.20221202005155-1c54042beb70 h1:TPOrxkEMvZzfBSwF3ct+kUUgKA5g8unkZZbKQvJweeA= +go.opentelemetry.io/collector/pdata v0.66.1-0.20221202005155-1c54042beb70/go.mod h1:pqyaznLzk21m+1KL6fwOsRryRELL+zNM0qiVSn0MbVc= 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= @@ -317,8 +319,8 @@ go.uber.org/multierr v1.6.0/go.mod h1:cdWPpRnG4AhwMwsgIHip0KRBQjJy5kYEpYjJxpXp9i go.uber.org/multierr v1.8.0 h1:dg6GjLku4EH+249NNmoIciG9N/jURbDG+pFlTkhzIC8= go.uber.org/multierr v1.8.0/go.mod h1:7EAYxJLBy9rStEaz58O2t4Uvip6FSURkq8/ppBp95ak= go.uber.org/zap v1.17.0/go.mod h1:MXVU+bhUf/A7Xi2HNOnopQOrmycQ5Ih87HtOu4q5SSo= -go.uber.org/zap v1.23.0 h1:OjGQ5KQDEUawVHxNwQgPpiypGHOxo2mNZsOqTak4fFY= -go.uber.org/zap v1.23.0/go.mod h1:D+nX8jyLsMHMYrln8A0rJjFt/T/9/bGgIhAqxv5URuY= +go.uber.org/zap v1.24.0 h1:FiJd5l1UOLj0wCgbSE0rwwXHzEdAZS6hiiSnxJN/D60= +go.uber.org/zap v1.24.0/go.mod h1:2kMP+WWQ8aoFoedH3T2sq6iJ2yDWpHbP0f6MQbS9Gkg= golang.org/x/crypto v0.0.0-20180904163835-0709b304e793/go.mod h1:6SG95UA2DQfeDnfUPMdvaQW0Q7yPrPDi9nlGo2tz2b4= golang.org/x/crypto v0.0.0-20190308221718-c2843e01d9a2/go.mod h1:djNgcEr1/C05ACkg1iLfiJU5Ep61QUkGW8qpdssI0+w= golang.org/x/crypto v0.0.0-20190923035154-9ee001bba392/go.mod h1:/lpIB1dKB+9EgE3H3cr1v9wB50oz8l4C4h62xy7jSTY= diff --git a/exporter/awsemfexporter/go.mod b/exporter/awsemfexporter/go.mod index e9b4abafdb8f..a906a53a5b07 100644 --- a/exporter/awsemfexporter/go.mod +++ b/exporter/awsemfexporter/go.mod @@ -13,12 +13,13 @@ require ( github.com/open-telemetry/opentelemetry-collector-contrib/pkg/resourcetotelemetry v0.66.0 github.com/open-telemetry/opentelemetry-collector-contrib/pkg/translator/opencensus v0.66.0 github.com/stretchr/testify v1.8.1 - go.opentelemetry.io/collector v0.66.1-0.20221128222955-4ff1ff379b90 - go.opentelemetry.io/collector/component v0.66.1-0.20221128222955-4ff1ff379b90 - go.opentelemetry.io/collector/consumer v0.66.1-0.20221128222955-4ff1ff379b90 - go.opentelemetry.io/collector/pdata v0.66.1-0.20221128222955-4ff1ff379b90 - go.opentelemetry.io/collector/semconv v0.66.1-0.20221128222955-4ff1ff379b90 - go.uber.org/zap v1.23.0 + go.opentelemetry.io/collector v0.66.1-0.20221202005155-1c54042beb70 + go.opentelemetry.io/collector/component v0.66.1-0.20221202005155-1c54042beb70 + go.opentelemetry.io/collector/confmap v0.0.0-20221201172708-2bdff61fa52a + go.opentelemetry.io/collector/consumer v0.66.1-0.20221202005155-1c54042beb70 + go.opentelemetry.io/collector/pdata v0.66.1-0.20221202005155-1c54042beb70 + go.opentelemetry.io/collector/semconv v0.66.1-0.20221202005155-1c54042beb70 + go.uber.org/zap v1.24.0 google.golang.org/protobuf v1.28.1 ) @@ -40,7 +41,7 @@ require ( github.com/pmezard/go-difflib v1.0.0 // indirect github.com/stretchr/objx v0.5.0 // indirect go.opencensus.io v0.24.0 // indirect - go.opentelemetry.io/collector/featuregate v0.66.1-0.20221128222955-4ff1ff379b90 // indirect + go.opentelemetry.io/collector/featuregate v0.66.1-0.20221202005155-1c54042beb70 // 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 939befba95d0..71f5fb501c72 100644 --- a/exporter/awsemfexporter/go.sum +++ b/exporter/awsemfexporter/go.sum @@ -286,18 +286,20 @@ go.etcd.io/etcd/client/pkg/v3 v3.5.4/go.mod h1:IJHfcCEKxYu1Os13ZdwCwIUTUVGYTSAM3 go.etcd.io/etcd/client/v3 v3.5.4/go.mod h1:ZaRkVgBZC+L+dLCjTcF1hRXpgZXQPOvnA/Ak/gq3kiY= go.opencensus.io v0.24.0 h1:y73uSU6J157QMP2kn2r30vwW1A2W2WFwSCGnAVxeaD0= go.opencensus.io v0.24.0/go.mod h1:vNK8G9p7aAivkbmorf4v+7Hgx+Zs0yY+0fOtgBfjQKo= -go.opentelemetry.io/collector v0.66.1-0.20221128222955-4ff1ff379b90 h1:yRe05/jMdzH4TFHfndZ5h2o2hKBK/79W72j8w51qNsI= -go.opentelemetry.io/collector v0.66.1-0.20221128222955-4ff1ff379b90/go.mod h1:hE6jCs+0rfiufCrVPucKZTMwfHit1okfDPnwPT2eW1I= -go.opentelemetry.io/collector/component v0.66.1-0.20221128222955-4ff1ff379b90 h1:AYSNTXbezhNg43EuYdVVcgxE/2gBVrm00FDx4DOmQVg= -go.opentelemetry.io/collector/component v0.66.1-0.20221128222955-4ff1ff379b90/go.mod h1:0c84EqXUhvYe6KW7hJfh76tiI/5yjWCH2amwyQ06XLM= -go.opentelemetry.io/collector/consumer v0.66.1-0.20221128222955-4ff1ff379b90 h1:nzNXVfC1FzXBXCLMzbMv+qK3E4EGiNsnMhfVsBd2yzc= -go.opentelemetry.io/collector/consumer v0.66.1-0.20221128222955-4ff1ff379b90/go.mod h1:WtoRZa5SnxQO1ZEQdVxYpFcXCmq62rakv0oUSlPO0NQ= -go.opentelemetry.io/collector/featuregate v0.66.1-0.20221128222955-4ff1ff379b90 h1:UuJSFWbi9XxyNZsJKZuvpWg35BgRbcCGFH+38V2MAdw= -go.opentelemetry.io/collector/featuregate v0.66.1-0.20221128222955-4ff1ff379b90/go.mod h1:tewuFKJYalWBU0bmNKg++MC1ipINXUr6szYzOw2p1GI= -go.opentelemetry.io/collector/pdata v0.66.1-0.20221128222955-4ff1ff379b90 h1:Vu4S4jSNcd0VFPzxQNO4+UqGwnes1xJDoFLPRiWHm8I= -go.opentelemetry.io/collector/pdata v0.66.1-0.20221128222955-4ff1ff379b90/go.mod h1:pqyaznLzk21m+1KL6fwOsRryRELL+zNM0qiVSn0MbVc= -go.opentelemetry.io/collector/semconv v0.66.1-0.20221128222955-4ff1ff379b90 h1:hFaTA68cggZKWMv7wQ3bKP8KGTbowh/5AQZKCHzHTqM= -go.opentelemetry.io/collector/semconv v0.66.1-0.20221128222955-4ff1ff379b90/go.mod h1:5o9yhOa+ABt7g2E5JABDxGZ1PQPbtfxrKNbYn+LOTXU= +go.opentelemetry.io/collector v0.66.1-0.20221202005155-1c54042beb70 h1:INB2CsOtqqrija2KvMuIpbBQ3qX1BECEeR+d0NJX+oM= +go.opentelemetry.io/collector v0.66.1-0.20221202005155-1c54042beb70/go.mod h1:d0NHkHyANJy3HDTvYE/PoylMShUmFIbiir89ieI0X0c= +go.opentelemetry.io/collector/component v0.66.1-0.20221202005155-1c54042beb70 h1:dEoJhzCmRShgmVro/kXm6pouGElgxkH2DsvanzCeZtU= +go.opentelemetry.io/collector/component v0.66.1-0.20221202005155-1c54042beb70/go.mod h1:OsVnvFFe38QSpcuZlQ8cvarDzcloCexgQ1/B2m80F6U= +go.opentelemetry.io/collector/confmap v0.0.0-20221201172708-2bdff61fa52a h1:2TscCXAQASO2kU9xHcMIUM/FP29fiQIRTilZmliq/7I= +go.opentelemetry.io/collector/confmap v0.0.0-20221201172708-2bdff61fa52a/go.mod h1:qJ3e8bA8h4wz/jYlbeEUafVHdrU7DkpStnmIUAz6VTQ= +go.opentelemetry.io/collector/consumer v0.66.1-0.20221202005155-1c54042beb70 h1:XwpVjI1KeKGPXOZBLefGILMziPYuNf6IzbmiIEsIyI0= +go.opentelemetry.io/collector/consumer v0.66.1-0.20221202005155-1c54042beb70/go.mod h1:EWVBcSGcIcmeDGTnIboc/aqa3agsBeH8/q7yFWG7xVc= +go.opentelemetry.io/collector/featuregate v0.66.1-0.20221202005155-1c54042beb70 h1:V0tf4ebciqIs07jFATfLGdUpLRaEsi+AiWuA/in0G8Y= +go.opentelemetry.io/collector/featuregate v0.66.1-0.20221202005155-1c54042beb70/go.mod h1:tewuFKJYalWBU0bmNKg++MC1ipINXUr6szYzOw2p1GI= +go.opentelemetry.io/collector/pdata v0.66.1-0.20221202005155-1c54042beb70 h1:TPOrxkEMvZzfBSwF3ct+kUUgKA5g8unkZZbKQvJweeA= +go.opentelemetry.io/collector/pdata v0.66.1-0.20221202005155-1c54042beb70/go.mod h1:pqyaznLzk21m+1KL6fwOsRryRELL+zNM0qiVSn0MbVc= +go.opentelemetry.io/collector/semconv v0.66.1-0.20221202005155-1c54042beb70 h1:Q5L9Urod3c8as6ZYaoaqBjarx/HXxsxy34DFZIU2fO4= +go.opentelemetry.io/collector/semconv v0.66.1-0.20221202005155-1c54042beb70/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= @@ -315,8 +317,8 @@ go.uber.org/multierr v1.6.0/go.mod h1:cdWPpRnG4AhwMwsgIHip0KRBQjJy5kYEpYjJxpXp9i go.uber.org/multierr v1.8.0 h1:dg6GjLku4EH+249NNmoIciG9N/jURbDG+pFlTkhzIC8= go.uber.org/multierr v1.8.0/go.mod h1:7EAYxJLBy9rStEaz58O2t4Uvip6FSURkq8/ppBp95ak= go.uber.org/zap v1.17.0/go.mod h1:MXVU+bhUf/A7Xi2HNOnopQOrmycQ5Ih87HtOu4q5SSo= -go.uber.org/zap v1.23.0 h1:OjGQ5KQDEUawVHxNwQgPpiypGHOxo2mNZsOqTak4fFY= -go.uber.org/zap v1.23.0/go.mod h1:D+nX8jyLsMHMYrln8A0rJjFt/T/9/bGgIhAqxv5URuY= +go.uber.org/zap v1.24.0 h1:FiJd5l1UOLj0wCgbSE0rwwXHzEdAZS6hiiSnxJN/D60= +go.uber.org/zap v1.24.0/go.mod h1:2kMP+WWQ8aoFoedH3T2sq6iJ2yDWpHbP0f6MQbS9Gkg= golang.org/x/crypto v0.0.0-20180904163835-0709b304e793/go.mod h1:6SG95UA2DQfeDnfUPMdvaQW0Q7yPrPDi9nlGo2tz2b4= golang.org/x/crypto v0.0.0-20190308221718-c2843e01d9a2/go.mod h1:djNgcEr1/C05ACkg1iLfiJU5Ep61QUkGW8qpdssI0+w= golang.org/x/crypto v0.0.0-20190923035154-9ee001bba392/go.mod h1:/lpIB1dKB+9EgE3H3cr1v9wB50oz8l4C4h62xy7jSTY= diff --git a/exporter/awskinesisexporter/go.mod b/exporter/awskinesisexporter/go.mod index 06206e4fedeb..d73190284c3e 100644 --- a/exporter/awskinesisexporter/go.mod +++ b/exporter/awskinesisexporter/go.mod @@ -14,12 +14,13 @@ require ( github.com/open-telemetry/opentelemetry-collector-contrib/pkg/translator/jaeger v0.66.0 github.com/open-telemetry/opentelemetry-collector-contrib/pkg/translator/zipkin v0.66.0 github.com/stretchr/testify v1.8.1 - go.opentelemetry.io/collector v0.66.1-0.20221128222955-4ff1ff379b90 - go.opentelemetry.io/collector/component v0.66.1-0.20221128222955-4ff1ff379b90 - go.opentelemetry.io/collector/consumer v0.66.1-0.20221128222955-4ff1ff379b90 - go.opentelemetry.io/collector/pdata v0.66.1-0.20221128222955-4ff1ff379b90 + go.opentelemetry.io/collector v0.66.1-0.20221202005155-1c54042beb70 + go.opentelemetry.io/collector/component v0.66.1-0.20221202005155-1c54042beb70 + go.opentelemetry.io/collector/confmap v0.0.0-20221201172708-2bdff61fa52a + go.opentelemetry.io/collector/consumer v0.66.1-0.20221202005155-1c54042beb70 + go.opentelemetry.io/collector/pdata v0.66.1-0.20221202005155-1c54042beb70 go.uber.org/multierr v1.8.0 - go.uber.org/zap v1.23.0 + go.uber.org/zap v1.24.0 ) require ( @@ -52,8 +53,8 @@ require ( github.com/uber/jaeger-client-go v2.30.0+incompatible // indirect github.com/uber/jaeger-lib v2.4.1+incompatible // indirect go.opencensus.io v0.24.0 // indirect - go.opentelemetry.io/collector/featuregate v0.66.1-0.20221128222955-4ff1ff379b90 // indirect - go.opentelemetry.io/collector/semconv v0.66.1-0.20221128222955-4ff1ff379b90 // indirect + go.opentelemetry.io/collector/featuregate v0.66.1-0.20221202005155-1c54042beb70 // indirect + go.opentelemetry.io/collector/semconv v0.66.1-0.20221202005155-1c54042beb70 // 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 02a26fd1a730..7aa31d017ee7 100644 --- a/exporter/awskinesisexporter/go.sum +++ b/exporter/awskinesisexporter/go.sum @@ -321,18 +321,20 @@ go.etcd.io/etcd/client/pkg/v3 v3.5.4/go.mod h1:IJHfcCEKxYu1Os13ZdwCwIUTUVGYTSAM3 go.etcd.io/etcd/client/v3 v3.5.4/go.mod h1:ZaRkVgBZC+L+dLCjTcF1hRXpgZXQPOvnA/Ak/gq3kiY= go.opencensus.io v0.24.0 h1:y73uSU6J157QMP2kn2r30vwW1A2W2WFwSCGnAVxeaD0= go.opencensus.io v0.24.0/go.mod h1:vNK8G9p7aAivkbmorf4v+7Hgx+Zs0yY+0fOtgBfjQKo= -go.opentelemetry.io/collector v0.66.1-0.20221128222955-4ff1ff379b90 h1:yRe05/jMdzH4TFHfndZ5h2o2hKBK/79W72j8w51qNsI= -go.opentelemetry.io/collector v0.66.1-0.20221128222955-4ff1ff379b90/go.mod h1:hE6jCs+0rfiufCrVPucKZTMwfHit1okfDPnwPT2eW1I= -go.opentelemetry.io/collector/component v0.66.1-0.20221128222955-4ff1ff379b90 h1:AYSNTXbezhNg43EuYdVVcgxE/2gBVrm00FDx4DOmQVg= -go.opentelemetry.io/collector/component v0.66.1-0.20221128222955-4ff1ff379b90/go.mod h1:0c84EqXUhvYe6KW7hJfh76tiI/5yjWCH2amwyQ06XLM= -go.opentelemetry.io/collector/consumer v0.66.1-0.20221128222955-4ff1ff379b90 h1:nzNXVfC1FzXBXCLMzbMv+qK3E4EGiNsnMhfVsBd2yzc= -go.opentelemetry.io/collector/consumer v0.66.1-0.20221128222955-4ff1ff379b90/go.mod h1:WtoRZa5SnxQO1ZEQdVxYpFcXCmq62rakv0oUSlPO0NQ= -go.opentelemetry.io/collector/featuregate v0.66.1-0.20221128222955-4ff1ff379b90 h1:UuJSFWbi9XxyNZsJKZuvpWg35BgRbcCGFH+38V2MAdw= -go.opentelemetry.io/collector/featuregate v0.66.1-0.20221128222955-4ff1ff379b90/go.mod h1:tewuFKJYalWBU0bmNKg++MC1ipINXUr6szYzOw2p1GI= -go.opentelemetry.io/collector/pdata v0.66.1-0.20221128222955-4ff1ff379b90 h1:Vu4S4jSNcd0VFPzxQNO4+UqGwnes1xJDoFLPRiWHm8I= -go.opentelemetry.io/collector/pdata v0.66.1-0.20221128222955-4ff1ff379b90/go.mod h1:pqyaznLzk21m+1KL6fwOsRryRELL+zNM0qiVSn0MbVc= -go.opentelemetry.io/collector/semconv v0.66.1-0.20221128222955-4ff1ff379b90 h1:hFaTA68cggZKWMv7wQ3bKP8KGTbowh/5AQZKCHzHTqM= -go.opentelemetry.io/collector/semconv v0.66.1-0.20221128222955-4ff1ff379b90/go.mod h1:5o9yhOa+ABt7g2E5JABDxGZ1PQPbtfxrKNbYn+LOTXU= +go.opentelemetry.io/collector v0.66.1-0.20221202005155-1c54042beb70 h1:INB2CsOtqqrija2KvMuIpbBQ3qX1BECEeR+d0NJX+oM= +go.opentelemetry.io/collector v0.66.1-0.20221202005155-1c54042beb70/go.mod h1:d0NHkHyANJy3HDTvYE/PoylMShUmFIbiir89ieI0X0c= +go.opentelemetry.io/collector/component v0.66.1-0.20221202005155-1c54042beb70 h1:dEoJhzCmRShgmVro/kXm6pouGElgxkH2DsvanzCeZtU= +go.opentelemetry.io/collector/component v0.66.1-0.20221202005155-1c54042beb70/go.mod h1:OsVnvFFe38QSpcuZlQ8cvarDzcloCexgQ1/B2m80F6U= +go.opentelemetry.io/collector/confmap v0.0.0-20221201172708-2bdff61fa52a h1:2TscCXAQASO2kU9xHcMIUM/FP29fiQIRTilZmliq/7I= +go.opentelemetry.io/collector/confmap v0.0.0-20221201172708-2bdff61fa52a/go.mod h1:qJ3e8bA8h4wz/jYlbeEUafVHdrU7DkpStnmIUAz6VTQ= +go.opentelemetry.io/collector/consumer v0.66.1-0.20221202005155-1c54042beb70 h1:XwpVjI1KeKGPXOZBLefGILMziPYuNf6IzbmiIEsIyI0= +go.opentelemetry.io/collector/consumer v0.66.1-0.20221202005155-1c54042beb70/go.mod h1:EWVBcSGcIcmeDGTnIboc/aqa3agsBeH8/q7yFWG7xVc= +go.opentelemetry.io/collector/featuregate v0.66.1-0.20221202005155-1c54042beb70 h1:V0tf4ebciqIs07jFATfLGdUpLRaEsi+AiWuA/in0G8Y= +go.opentelemetry.io/collector/featuregate v0.66.1-0.20221202005155-1c54042beb70/go.mod h1:tewuFKJYalWBU0bmNKg++MC1ipINXUr6szYzOw2p1GI= +go.opentelemetry.io/collector/pdata v0.66.1-0.20221202005155-1c54042beb70 h1:TPOrxkEMvZzfBSwF3ct+kUUgKA5g8unkZZbKQvJweeA= +go.opentelemetry.io/collector/pdata v0.66.1-0.20221202005155-1c54042beb70/go.mod h1:pqyaznLzk21m+1KL6fwOsRryRELL+zNM0qiVSn0MbVc= +go.opentelemetry.io/collector/semconv v0.66.1-0.20221202005155-1c54042beb70 h1:Q5L9Urod3c8as6ZYaoaqBjarx/HXxsxy34DFZIU2fO4= +go.opentelemetry.io/collector/semconv v0.66.1-0.20221202005155-1c54042beb70/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= @@ -350,8 +352,8 @@ go.uber.org/multierr v1.6.0/go.mod h1:cdWPpRnG4AhwMwsgIHip0KRBQjJy5kYEpYjJxpXp9i go.uber.org/multierr v1.8.0 h1:dg6GjLku4EH+249NNmoIciG9N/jURbDG+pFlTkhzIC8= go.uber.org/multierr v1.8.0/go.mod h1:7EAYxJLBy9rStEaz58O2t4Uvip6FSURkq8/ppBp95ak= go.uber.org/zap v1.17.0/go.mod h1:MXVU+bhUf/A7Xi2HNOnopQOrmycQ5Ih87HtOu4q5SSo= -go.uber.org/zap v1.23.0 h1:OjGQ5KQDEUawVHxNwQgPpiypGHOxo2mNZsOqTak4fFY= -go.uber.org/zap v1.23.0/go.mod h1:D+nX8jyLsMHMYrln8A0rJjFt/T/9/bGgIhAqxv5URuY= +go.uber.org/zap v1.24.0 h1:FiJd5l1UOLj0wCgbSE0rwwXHzEdAZS6hiiSnxJN/D60= +go.uber.org/zap v1.24.0/go.mod h1:2kMP+WWQ8aoFoedH3T2sq6iJ2yDWpHbP0f6MQbS9Gkg= golang.org/x/crypto v0.0.0-20180904163835-0709b304e793/go.mod h1:6SG95UA2DQfeDnfUPMdvaQW0Q7yPrPDi9nlGo2tz2b4= golang.org/x/crypto v0.0.0-20190308221718-c2843e01d9a2/go.mod h1:djNgcEr1/C05ACkg1iLfiJU5Ep61QUkGW8qpdssI0+w= golang.org/x/crypto v0.0.0-20190923035154-9ee001bba392/go.mod h1:/lpIB1dKB+9EgE3H3cr1v9wB50oz8l4C4h62xy7jSTY= diff --git a/exporter/awsxrayexporter/awsxray.go b/exporter/awsxrayexporter/awsxray.go index f0e800de455f..6e19dba82e9b 100644 --- a/exporter/awsxrayexporter/awsxray.go +++ b/exporter/awsxrayexporter/awsxray.go @@ -38,8 +38,8 @@ const ( // request and then posts the request to the configured region's X-Ray endpoint. func newTracesExporter( config component.Config, set component.ExporterCreateSettings, cn awsutil.ConnAttr) (component.TracesExporter, error) { - typeLog := zap.String("type", string(config.ID().Type())) - nameLog := zap.String("name", config.ID().String()) + typeLog := zap.String("type", string(set.ID.Type())) + nameLog := zap.String("name", set.ID.String()) logger := set.Logger awsConfig, session, err := awsutil.GetAWSConfigSession(logger, cn, &config.(*Config).AWSSessionSettings) if err != nil { diff --git a/exporter/awsxrayexporter/go.mod b/exporter/awsxrayexporter/go.mod index 3452130fedd1..b4202a14a6ca 100644 --- a/exporter/awsxrayexporter/go.mod +++ b/exporter/awsxrayexporter/go.mod @@ -8,12 +8,13 @@ require ( github.com/open-telemetry/opentelemetry-collector-contrib/internal/aws/xray v0.66.0 github.com/open-telemetry/opentelemetry-collector-contrib/internal/coreinternal v0.66.0 github.com/stretchr/testify v1.8.1 - go.opentelemetry.io/collector v0.66.1-0.20221128222955-4ff1ff379b90 - go.opentelemetry.io/collector/component v0.66.1-0.20221128222955-4ff1ff379b90 - go.opentelemetry.io/collector/consumer v0.66.1-0.20221128222955-4ff1ff379b90 - go.opentelemetry.io/collector/pdata v0.66.1-0.20221128222955-4ff1ff379b90 - go.opentelemetry.io/collector/semconv v0.66.1-0.20221128222955-4ff1ff379b90 - go.uber.org/zap v1.23.0 + go.opentelemetry.io/collector v0.66.1-0.20221202005155-1c54042beb70 + go.opentelemetry.io/collector/component v0.66.1-0.20221202005155-1c54042beb70 + go.opentelemetry.io/collector/confmap v0.0.0-20221201172708-2bdff61fa52a + go.opentelemetry.io/collector/consumer v0.66.1-0.20221202005155-1c54042beb70 + go.opentelemetry.io/collector/pdata v0.66.1-0.20221202005155-1c54042beb70 + go.opentelemetry.io/collector/semconv v0.66.1-0.20221202005155-1c54042beb70 + go.uber.org/zap v1.24.0 ) require ( @@ -33,7 +34,7 @@ require ( github.com/pmezard/go-difflib v1.0.0 // indirect github.com/rogpeppe/go-internal v1.6.1 // indirect go.opencensus.io v0.24.0 // indirect - go.opentelemetry.io/collector/featuregate v0.66.1-0.20221128222955-4ff1ff379b90 // indirect + go.opentelemetry.io/collector/featuregate v0.66.1-0.20221202005155-1c54042beb70 // 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 ec15337a03df..76b5ea3f5125 100644 --- a/exporter/awsxrayexporter/go.sum +++ b/exporter/awsxrayexporter/go.sum @@ -281,18 +281,20 @@ go.etcd.io/etcd/client/pkg/v3 v3.5.4/go.mod h1:IJHfcCEKxYu1Os13ZdwCwIUTUVGYTSAM3 go.etcd.io/etcd/client/v3 v3.5.4/go.mod h1:ZaRkVgBZC+L+dLCjTcF1hRXpgZXQPOvnA/Ak/gq3kiY= go.opencensus.io v0.24.0 h1:y73uSU6J157QMP2kn2r30vwW1A2W2WFwSCGnAVxeaD0= go.opencensus.io v0.24.0/go.mod h1:vNK8G9p7aAivkbmorf4v+7Hgx+Zs0yY+0fOtgBfjQKo= -go.opentelemetry.io/collector v0.66.1-0.20221128222955-4ff1ff379b90 h1:yRe05/jMdzH4TFHfndZ5h2o2hKBK/79W72j8w51qNsI= -go.opentelemetry.io/collector v0.66.1-0.20221128222955-4ff1ff379b90/go.mod h1:hE6jCs+0rfiufCrVPucKZTMwfHit1okfDPnwPT2eW1I= -go.opentelemetry.io/collector/component v0.66.1-0.20221128222955-4ff1ff379b90 h1:AYSNTXbezhNg43EuYdVVcgxE/2gBVrm00FDx4DOmQVg= -go.opentelemetry.io/collector/component v0.66.1-0.20221128222955-4ff1ff379b90/go.mod h1:0c84EqXUhvYe6KW7hJfh76tiI/5yjWCH2amwyQ06XLM= -go.opentelemetry.io/collector/consumer v0.66.1-0.20221128222955-4ff1ff379b90 h1:nzNXVfC1FzXBXCLMzbMv+qK3E4EGiNsnMhfVsBd2yzc= -go.opentelemetry.io/collector/consumer v0.66.1-0.20221128222955-4ff1ff379b90/go.mod h1:WtoRZa5SnxQO1ZEQdVxYpFcXCmq62rakv0oUSlPO0NQ= -go.opentelemetry.io/collector/featuregate v0.66.1-0.20221128222955-4ff1ff379b90 h1:UuJSFWbi9XxyNZsJKZuvpWg35BgRbcCGFH+38V2MAdw= -go.opentelemetry.io/collector/featuregate v0.66.1-0.20221128222955-4ff1ff379b90/go.mod h1:tewuFKJYalWBU0bmNKg++MC1ipINXUr6szYzOw2p1GI= -go.opentelemetry.io/collector/pdata v0.66.1-0.20221128222955-4ff1ff379b90 h1:Vu4S4jSNcd0VFPzxQNO4+UqGwnes1xJDoFLPRiWHm8I= -go.opentelemetry.io/collector/pdata v0.66.1-0.20221128222955-4ff1ff379b90/go.mod h1:pqyaznLzk21m+1KL6fwOsRryRELL+zNM0qiVSn0MbVc= -go.opentelemetry.io/collector/semconv v0.66.1-0.20221128222955-4ff1ff379b90 h1:hFaTA68cggZKWMv7wQ3bKP8KGTbowh/5AQZKCHzHTqM= -go.opentelemetry.io/collector/semconv v0.66.1-0.20221128222955-4ff1ff379b90/go.mod h1:5o9yhOa+ABt7g2E5JABDxGZ1PQPbtfxrKNbYn+LOTXU= +go.opentelemetry.io/collector v0.66.1-0.20221202005155-1c54042beb70 h1:INB2CsOtqqrija2KvMuIpbBQ3qX1BECEeR+d0NJX+oM= +go.opentelemetry.io/collector v0.66.1-0.20221202005155-1c54042beb70/go.mod h1:d0NHkHyANJy3HDTvYE/PoylMShUmFIbiir89ieI0X0c= +go.opentelemetry.io/collector/component v0.66.1-0.20221202005155-1c54042beb70 h1:dEoJhzCmRShgmVro/kXm6pouGElgxkH2DsvanzCeZtU= +go.opentelemetry.io/collector/component v0.66.1-0.20221202005155-1c54042beb70/go.mod h1:OsVnvFFe38QSpcuZlQ8cvarDzcloCexgQ1/B2m80F6U= +go.opentelemetry.io/collector/confmap v0.0.0-20221201172708-2bdff61fa52a h1:2TscCXAQASO2kU9xHcMIUM/FP29fiQIRTilZmliq/7I= +go.opentelemetry.io/collector/confmap v0.0.0-20221201172708-2bdff61fa52a/go.mod h1:qJ3e8bA8h4wz/jYlbeEUafVHdrU7DkpStnmIUAz6VTQ= +go.opentelemetry.io/collector/consumer v0.66.1-0.20221202005155-1c54042beb70 h1:XwpVjI1KeKGPXOZBLefGILMziPYuNf6IzbmiIEsIyI0= +go.opentelemetry.io/collector/consumer v0.66.1-0.20221202005155-1c54042beb70/go.mod h1:EWVBcSGcIcmeDGTnIboc/aqa3agsBeH8/q7yFWG7xVc= +go.opentelemetry.io/collector/featuregate v0.66.1-0.20221202005155-1c54042beb70 h1:V0tf4ebciqIs07jFATfLGdUpLRaEsi+AiWuA/in0G8Y= +go.opentelemetry.io/collector/featuregate v0.66.1-0.20221202005155-1c54042beb70/go.mod h1:tewuFKJYalWBU0bmNKg++MC1ipINXUr6szYzOw2p1GI= +go.opentelemetry.io/collector/pdata v0.66.1-0.20221202005155-1c54042beb70 h1:TPOrxkEMvZzfBSwF3ct+kUUgKA5g8unkZZbKQvJweeA= +go.opentelemetry.io/collector/pdata v0.66.1-0.20221202005155-1c54042beb70/go.mod h1:pqyaznLzk21m+1KL6fwOsRryRELL+zNM0qiVSn0MbVc= +go.opentelemetry.io/collector/semconv v0.66.1-0.20221202005155-1c54042beb70 h1:Q5L9Urod3c8as6ZYaoaqBjarx/HXxsxy34DFZIU2fO4= +go.opentelemetry.io/collector/semconv v0.66.1-0.20221202005155-1c54042beb70/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= @@ -310,8 +312,8 @@ go.uber.org/multierr v1.6.0/go.mod h1:cdWPpRnG4AhwMwsgIHip0KRBQjJy5kYEpYjJxpXp9i go.uber.org/multierr v1.8.0 h1:dg6GjLku4EH+249NNmoIciG9N/jURbDG+pFlTkhzIC8= go.uber.org/multierr v1.8.0/go.mod h1:7EAYxJLBy9rStEaz58O2t4Uvip6FSURkq8/ppBp95ak= go.uber.org/zap v1.17.0/go.mod h1:MXVU+bhUf/A7Xi2HNOnopQOrmycQ5Ih87HtOu4q5SSo= -go.uber.org/zap v1.23.0 h1:OjGQ5KQDEUawVHxNwQgPpiypGHOxo2mNZsOqTak4fFY= -go.uber.org/zap v1.23.0/go.mod h1:D+nX8jyLsMHMYrln8A0rJjFt/T/9/bGgIhAqxv5URuY= +go.uber.org/zap v1.24.0 h1:FiJd5l1UOLj0wCgbSE0rwwXHzEdAZS6hiiSnxJN/D60= +go.uber.org/zap v1.24.0/go.mod h1:2kMP+WWQ8aoFoedH3T2sq6iJ2yDWpHbP0f6MQbS9Gkg= golang.org/x/crypto v0.0.0-20180904163835-0709b304e793/go.mod h1:6SG95UA2DQfeDnfUPMdvaQW0Q7yPrPDi9nlGo2tz2b4= golang.org/x/crypto v0.0.0-20190308221718-c2843e01d9a2/go.mod h1:djNgcEr1/C05ACkg1iLfiJU5Ep61QUkGW8qpdssI0+w= golang.org/x/crypto v0.0.0-20190923035154-9ee001bba392/go.mod h1:/lpIB1dKB+9EgE3H3cr1v9wB50oz8l4C4h62xy7jSTY= diff --git a/exporter/azuredataexplorerexporter/go.mod b/exporter/azuredataexplorerexporter/go.mod index 4eb513dbf6b5..56e44827d2b7 100644 --- a/exporter/azuredataexplorerexporter/go.mod +++ b/exporter/azuredataexplorerexporter/go.mod @@ -8,10 +8,11 @@ require ( github.com/json-iterator/go v1.1.12 github.com/open-telemetry/opentelemetry-collector-contrib/internal/coreinternal v0.66.0 github.com/stretchr/testify v1.8.1 - go.opentelemetry.io/collector v0.66.1-0.20221128222955-4ff1ff379b90 - go.opentelemetry.io/collector/component v0.66.1-0.20221128222955-4ff1ff379b90 - go.opentelemetry.io/collector/pdata v0.66.1-0.20221128222955-4ff1ff379b90 - go.uber.org/zap v1.23.0 + go.opentelemetry.io/collector v0.66.1-0.20221202005155-1c54042beb70 + go.opentelemetry.io/collector/component v0.66.1-0.20221202005155-1c54042beb70 + go.opentelemetry.io/collector/confmap v0.0.0-20221201172708-2bdff61fa52a + go.opentelemetry.io/collector/pdata v0.66.1-0.20221202005155-1c54042beb70 + go.uber.org/zap v1.24.0 ) require ( @@ -49,8 +50,8 @@ require ( github.com/pmezard/go-difflib v1.0.0 // indirect github.com/rogpeppe/go-internal v1.9.0 // indirect go.opencensus.io v0.24.0 // indirect - go.opentelemetry.io/collector/consumer v0.66.1-0.20221128222955-4ff1ff379b90 // indirect - go.opentelemetry.io/collector/featuregate v0.66.1-0.20221128222955-4ff1ff379b90 // indirect + go.opentelemetry.io/collector/consumer v0.66.1-0.20221202005155-1c54042beb70 // indirect + go.opentelemetry.io/collector/featuregate v0.66.1-0.20221202005155-1c54042beb70 // 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 4e2725fc1a1b..229f008e52be 100644 --- a/exporter/azuredataexplorerexporter/go.sum +++ b/exporter/azuredataexplorerexporter/go.sum @@ -330,16 +330,18 @@ go.etcd.io/etcd/client/pkg/v3 v3.5.4/go.mod h1:IJHfcCEKxYu1Os13ZdwCwIUTUVGYTSAM3 go.etcd.io/etcd/client/v3 v3.5.4/go.mod h1:ZaRkVgBZC+L+dLCjTcF1hRXpgZXQPOvnA/Ak/gq3kiY= go.opencensus.io v0.24.0 h1:y73uSU6J157QMP2kn2r30vwW1A2W2WFwSCGnAVxeaD0= go.opencensus.io v0.24.0/go.mod h1:vNK8G9p7aAivkbmorf4v+7Hgx+Zs0yY+0fOtgBfjQKo= -go.opentelemetry.io/collector v0.66.1-0.20221128222955-4ff1ff379b90 h1:yRe05/jMdzH4TFHfndZ5h2o2hKBK/79W72j8w51qNsI= -go.opentelemetry.io/collector v0.66.1-0.20221128222955-4ff1ff379b90/go.mod h1:hE6jCs+0rfiufCrVPucKZTMwfHit1okfDPnwPT2eW1I= -go.opentelemetry.io/collector/component v0.66.1-0.20221128222955-4ff1ff379b90 h1:AYSNTXbezhNg43EuYdVVcgxE/2gBVrm00FDx4DOmQVg= -go.opentelemetry.io/collector/component v0.66.1-0.20221128222955-4ff1ff379b90/go.mod h1:0c84EqXUhvYe6KW7hJfh76tiI/5yjWCH2amwyQ06XLM= -go.opentelemetry.io/collector/consumer v0.66.1-0.20221128222955-4ff1ff379b90 h1:nzNXVfC1FzXBXCLMzbMv+qK3E4EGiNsnMhfVsBd2yzc= -go.opentelemetry.io/collector/consumer v0.66.1-0.20221128222955-4ff1ff379b90/go.mod h1:WtoRZa5SnxQO1ZEQdVxYpFcXCmq62rakv0oUSlPO0NQ= -go.opentelemetry.io/collector/featuregate v0.66.1-0.20221128222955-4ff1ff379b90 h1:UuJSFWbi9XxyNZsJKZuvpWg35BgRbcCGFH+38V2MAdw= -go.opentelemetry.io/collector/featuregate v0.66.1-0.20221128222955-4ff1ff379b90/go.mod h1:tewuFKJYalWBU0bmNKg++MC1ipINXUr6szYzOw2p1GI= -go.opentelemetry.io/collector/pdata v0.66.1-0.20221128222955-4ff1ff379b90 h1:Vu4S4jSNcd0VFPzxQNO4+UqGwnes1xJDoFLPRiWHm8I= -go.opentelemetry.io/collector/pdata v0.66.1-0.20221128222955-4ff1ff379b90/go.mod h1:pqyaznLzk21m+1KL6fwOsRryRELL+zNM0qiVSn0MbVc= +go.opentelemetry.io/collector v0.66.1-0.20221202005155-1c54042beb70 h1:INB2CsOtqqrija2KvMuIpbBQ3qX1BECEeR+d0NJX+oM= +go.opentelemetry.io/collector v0.66.1-0.20221202005155-1c54042beb70/go.mod h1:d0NHkHyANJy3HDTvYE/PoylMShUmFIbiir89ieI0X0c= +go.opentelemetry.io/collector/component v0.66.1-0.20221202005155-1c54042beb70 h1:dEoJhzCmRShgmVro/kXm6pouGElgxkH2DsvanzCeZtU= +go.opentelemetry.io/collector/component v0.66.1-0.20221202005155-1c54042beb70/go.mod h1:OsVnvFFe38QSpcuZlQ8cvarDzcloCexgQ1/B2m80F6U= +go.opentelemetry.io/collector/confmap v0.0.0-20221201172708-2bdff61fa52a h1:2TscCXAQASO2kU9xHcMIUM/FP29fiQIRTilZmliq/7I= +go.opentelemetry.io/collector/confmap v0.0.0-20221201172708-2bdff61fa52a/go.mod h1:qJ3e8bA8h4wz/jYlbeEUafVHdrU7DkpStnmIUAz6VTQ= +go.opentelemetry.io/collector/consumer v0.66.1-0.20221202005155-1c54042beb70 h1:XwpVjI1KeKGPXOZBLefGILMziPYuNf6IzbmiIEsIyI0= +go.opentelemetry.io/collector/consumer v0.66.1-0.20221202005155-1c54042beb70/go.mod h1:EWVBcSGcIcmeDGTnIboc/aqa3agsBeH8/q7yFWG7xVc= +go.opentelemetry.io/collector/featuregate v0.66.1-0.20221202005155-1c54042beb70 h1:V0tf4ebciqIs07jFATfLGdUpLRaEsi+AiWuA/in0G8Y= +go.opentelemetry.io/collector/featuregate v0.66.1-0.20221202005155-1c54042beb70/go.mod h1:tewuFKJYalWBU0bmNKg++MC1ipINXUr6szYzOw2p1GI= +go.opentelemetry.io/collector/pdata v0.66.1-0.20221202005155-1c54042beb70 h1:TPOrxkEMvZzfBSwF3ct+kUUgKA5g8unkZZbKQvJweeA= +go.opentelemetry.io/collector/pdata v0.66.1-0.20221202005155-1c54042beb70/go.mod h1:pqyaznLzk21m+1KL6fwOsRryRELL+zNM0qiVSn0MbVc= 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= @@ -357,8 +359,8 @@ go.uber.org/multierr v1.6.0/go.mod h1:cdWPpRnG4AhwMwsgIHip0KRBQjJy5kYEpYjJxpXp9i go.uber.org/multierr v1.8.0 h1:dg6GjLku4EH+249NNmoIciG9N/jURbDG+pFlTkhzIC8= go.uber.org/multierr v1.8.0/go.mod h1:7EAYxJLBy9rStEaz58O2t4Uvip6FSURkq8/ppBp95ak= go.uber.org/zap v1.17.0/go.mod h1:MXVU+bhUf/A7Xi2HNOnopQOrmycQ5Ih87HtOu4q5SSo= -go.uber.org/zap v1.23.0 h1:OjGQ5KQDEUawVHxNwQgPpiypGHOxo2mNZsOqTak4fFY= -go.uber.org/zap v1.23.0/go.mod h1:D+nX8jyLsMHMYrln8A0rJjFt/T/9/bGgIhAqxv5URuY= +go.uber.org/zap v1.24.0 h1:FiJd5l1UOLj0wCgbSE0rwwXHzEdAZS6hiiSnxJN/D60= +go.uber.org/zap v1.24.0/go.mod h1:2kMP+WWQ8aoFoedH3T2sq6iJ2yDWpHbP0f6MQbS9Gkg= golang.org/x/crypto v0.0.0-20180904163835-0709b304e793/go.mod h1:6SG95UA2DQfeDnfUPMdvaQW0Q7yPrPDi9nlGo2tz2b4= golang.org/x/crypto v0.0.0-20190308221718-c2843e01d9a2/go.mod h1:djNgcEr1/C05ACkg1iLfiJU5Ep61QUkGW8qpdssI0+w= golang.org/x/crypto v0.0.0-20190923035154-9ee001bba392/go.mod h1:/lpIB1dKB+9EgE3H3cr1v9wB50oz8l4C4h62xy7jSTY= diff --git a/exporter/azuremonitorexporter/go.mod b/exporter/azuremonitorexporter/go.mod index 4a108466fc36..b5b2de7360d1 100644 --- a/exporter/azuremonitorexporter/go.mod +++ b/exporter/azuremonitorexporter/go.mod @@ -6,12 +6,13 @@ require ( github.com/microsoft/ApplicationInsights-Go v0.4.4 github.com/open-telemetry/opentelemetry-collector-contrib/internal/coreinternal v0.66.0 github.com/stretchr/testify v1.8.1 - go.opentelemetry.io/collector v0.66.1-0.20221128222955-4ff1ff379b90 - go.opentelemetry.io/collector/component v0.66.1-0.20221128222955-4ff1ff379b90 - go.opentelemetry.io/collector/consumer v0.66.1-0.20221128222955-4ff1ff379b90 - go.opentelemetry.io/collector/pdata v0.66.1-0.20221128222955-4ff1ff379b90 - go.opentelemetry.io/collector/semconv v0.66.1-0.20221128222955-4ff1ff379b90 - go.uber.org/zap v1.23.0 + go.opentelemetry.io/collector v0.66.1-0.20221202005155-1c54042beb70 + go.opentelemetry.io/collector/component v0.66.1-0.20221202005155-1c54042beb70 + go.opentelemetry.io/collector/confmap v0.0.0-20221201172708-2bdff61fa52a + go.opentelemetry.io/collector/consumer v0.66.1-0.20221202005155-1c54042beb70 + go.opentelemetry.io/collector/pdata v0.66.1-0.20221202005155-1c54042beb70 + go.opentelemetry.io/collector/semconv v0.66.1-0.20221202005155-1c54042beb70 + go.uber.org/zap v1.24.0 golang.org/x/net v0.0.0-20220722155237-a158d28d115b ) @@ -34,7 +35,7 @@ require ( github.com/rogpeppe/go-internal v1.6.1 // indirect github.com/stretchr/objx v0.5.0 // indirect go.opencensus.io v0.24.0 // indirect - go.opentelemetry.io/collector/featuregate v0.66.1-0.20221128222955-4ff1ff379b90 // indirect + go.opentelemetry.io/collector/featuregate v0.66.1-0.20221202005155-1c54042beb70 // 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 606bc7ed9212..d7d0da233931 100644 --- a/exporter/azuremonitorexporter/go.sum +++ b/exporter/azuremonitorexporter/go.sum @@ -290,18 +290,20 @@ go.etcd.io/etcd/client/pkg/v3 v3.5.4/go.mod h1:IJHfcCEKxYu1Os13ZdwCwIUTUVGYTSAM3 go.etcd.io/etcd/client/v3 v3.5.4/go.mod h1:ZaRkVgBZC+L+dLCjTcF1hRXpgZXQPOvnA/Ak/gq3kiY= go.opencensus.io v0.24.0 h1:y73uSU6J157QMP2kn2r30vwW1A2W2WFwSCGnAVxeaD0= go.opencensus.io v0.24.0/go.mod h1:vNK8G9p7aAivkbmorf4v+7Hgx+Zs0yY+0fOtgBfjQKo= -go.opentelemetry.io/collector v0.66.1-0.20221128222955-4ff1ff379b90 h1:yRe05/jMdzH4TFHfndZ5h2o2hKBK/79W72j8w51qNsI= -go.opentelemetry.io/collector v0.66.1-0.20221128222955-4ff1ff379b90/go.mod h1:hE6jCs+0rfiufCrVPucKZTMwfHit1okfDPnwPT2eW1I= -go.opentelemetry.io/collector/component v0.66.1-0.20221128222955-4ff1ff379b90 h1:AYSNTXbezhNg43EuYdVVcgxE/2gBVrm00FDx4DOmQVg= -go.opentelemetry.io/collector/component v0.66.1-0.20221128222955-4ff1ff379b90/go.mod h1:0c84EqXUhvYe6KW7hJfh76tiI/5yjWCH2amwyQ06XLM= -go.opentelemetry.io/collector/consumer v0.66.1-0.20221128222955-4ff1ff379b90 h1:nzNXVfC1FzXBXCLMzbMv+qK3E4EGiNsnMhfVsBd2yzc= -go.opentelemetry.io/collector/consumer v0.66.1-0.20221128222955-4ff1ff379b90/go.mod h1:WtoRZa5SnxQO1ZEQdVxYpFcXCmq62rakv0oUSlPO0NQ= -go.opentelemetry.io/collector/featuregate v0.66.1-0.20221128222955-4ff1ff379b90 h1:UuJSFWbi9XxyNZsJKZuvpWg35BgRbcCGFH+38V2MAdw= -go.opentelemetry.io/collector/featuregate v0.66.1-0.20221128222955-4ff1ff379b90/go.mod h1:tewuFKJYalWBU0bmNKg++MC1ipINXUr6szYzOw2p1GI= -go.opentelemetry.io/collector/pdata v0.66.1-0.20221128222955-4ff1ff379b90 h1:Vu4S4jSNcd0VFPzxQNO4+UqGwnes1xJDoFLPRiWHm8I= -go.opentelemetry.io/collector/pdata v0.66.1-0.20221128222955-4ff1ff379b90/go.mod h1:pqyaznLzk21m+1KL6fwOsRryRELL+zNM0qiVSn0MbVc= -go.opentelemetry.io/collector/semconv v0.66.1-0.20221128222955-4ff1ff379b90 h1:hFaTA68cggZKWMv7wQ3bKP8KGTbowh/5AQZKCHzHTqM= -go.opentelemetry.io/collector/semconv v0.66.1-0.20221128222955-4ff1ff379b90/go.mod h1:5o9yhOa+ABt7g2E5JABDxGZ1PQPbtfxrKNbYn+LOTXU= +go.opentelemetry.io/collector v0.66.1-0.20221202005155-1c54042beb70 h1:INB2CsOtqqrija2KvMuIpbBQ3qX1BECEeR+d0NJX+oM= +go.opentelemetry.io/collector v0.66.1-0.20221202005155-1c54042beb70/go.mod h1:d0NHkHyANJy3HDTvYE/PoylMShUmFIbiir89ieI0X0c= +go.opentelemetry.io/collector/component v0.66.1-0.20221202005155-1c54042beb70 h1:dEoJhzCmRShgmVro/kXm6pouGElgxkH2DsvanzCeZtU= +go.opentelemetry.io/collector/component v0.66.1-0.20221202005155-1c54042beb70/go.mod h1:OsVnvFFe38QSpcuZlQ8cvarDzcloCexgQ1/B2m80F6U= +go.opentelemetry.io/collector/confmap v0.0.0-20221201172708-2bdff61fa52a h1:2TscCXAQASO2kU9xHcMIUM/FP29fiQIRTilZmliq/7I= +go.opentelemetry.io/collector/confmap v0.0.0-20221201172708-2bdff61fa52a/go.mod h1:qJ3e8bA8h4wz/jYlbeEUafVHdrU7DkpStnmIUAz6VTQ= +go.opentelemetry.io/collector/consumer v0.66.1-0.20221202005155-1c54042beb70 h1:XwpVjI1KeKGPXOZBLefGILMziPYuNf6IzbmiIEsIyI0= +go.opentelemetry.io/collector/consumer v0.66.1-0.20221202005155-1c54042beb70/go.mod h1:EWVBcSGcIcmeDGTnIboc/aqa3agsBeH8/q7yFWG7xVc= +go.opentelemetry.io/collector/featuregate v0.66.1-0.20221202005155-1c54042beb70 h1:V0tf4ebciqIs07jFATfLGdUpLRaEsi+AiWuA/in0G8Y= +go.opentelemetry.io/collector/featuregate v0.66.1-0.20221202005155-1c54042beb70/go.mod h1:tewuFKJYalWBU0bmNKg++MC1ipINXUr6szYzOw2p1GI= +go.opentelemetry.io/collector/pdata v0.66.1-0.20221202005155-1c54042beb70 h1:TPOrxkEMvZzfBSwF3ct+kUUgKA5g8unkZZbKQvJweeA= +go.opentelemetry.io/collector/pdata v0.66.1-0.20221202005155-1c54042beb70/go.mod h1:pqyaznLzk21m+1KL6fwOsRryRELL+zNM0qiVSn0MbVc= +go.opentelemetry.io/collector/semconv v0.66.1-0.20221202005155-1c54042beb70 h1:Q5L9Urod3c8as6ZYaoaqBjarx/HXxsxy34DFZIU2fO4= +go.opentelemetry.io/collector/semconv v0.66.1-0.20221202005155-1c54042beb70/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= @@ -319,8 +321,8 @@ go.uber.org/multierr v1.6.0/go.mod h1:cdWPpRnG4AhwMwsgIHip0KRBQjJy5kYEpYjJxpXp9i go.uber.org/multierr v1.8.0 h1:dg6GjLku4EH+249NNmoIciG9N/jURbDG+pFlTkhzIC8= go.uber.org/multierr v1.8.0/go.mod h1:7EAYxJLBy9rStEaz58O2t4Uvip6FSURkq8/ppBp95ak= go.uber.org/zap v1.17.0/go.mod h1:MXVU+bhUf/A7Xi2HNOnopQOrmycQ5Ih87HtOu4q5SSo= -go.uber.org/zap v1.23.0 h1:OjGQ5KQDEUawVHxNwQgPpiypGHOxo2mNZsOqTak4fFY= -go.uber.org/zap v1.23.0/go.mod h1:D+nX8jyLsMHMYrln8A0rJjFt/T/9/bGgIhAqxv5URuY= +go.uber.org/zap v1.24.0 h1:FiJd5l1UOLj0wCgbSE0rwwXHzEdAZS6hiiSnxJN/D60= +go.uber.org/zap v1.24.0/go.mod h1:2kMP+WWQ8aoFoedH3T2sq6iJ2yDWpHbP0f6MQbS9Gkg= golang.org/x/crypto v0.0.0-20180904163835-0709b304e793/go.mod h1:6SG95UA2DQfeDnfUPMdvaQW0Q7yPrPDi9nlGo2tz2b4= golang.org/x/crypto v0.0.0-20190308221718-c2843e01d9a2/go.mod h1:djNgcEr1/C05ACkg1iLfiJU5Ep61QUkGW8qpdssI0+w= golang.org/x/crypto v0.0.0-20190923035154-9ee001bba392/go.mod h1:/lpIB1dKB+9EgE3H3cr1v9wB50oz8l4C4h62xy7jSTY= diff --git a/exporter/carbonexporter/config.go b/exporter/carbonexporter/config.go index d943ee7feb51..3fd56304888e 100644 --- a/exporter/carbonexporter/config.go +++ b/exporter/carbonexporter/config.go @@ -15,6 +15,9 @@ package carbonexporter // import "github.com/open-telemetry/opentelemetry-collector-contrib/exporter/carbonexporter" import ( + "errors" + "fmt" + "net" "time" "go.opentelemetry.io/collector/config" @@ -39,3 +42,18 @@ type Config struct { // The default value is defined by the DefaultSendTimeout constant. Timeout time.Duration `mapstructure:"timeout"` } + +func (cfg *Config) Validate() error { + // Resolve TCP address just to ensure that it is a valid one. It is better + // to fail here than at when the exporter is started. + if _, err := net.ResolveTCPAddr("tcp", cfg.Endpoint); err != nil { + return fmt.Errorf("exporter has an invalid TCP endpoint: %w", err) + } + + // Negative timeouts are not acceptable, since all sends will fail. + if cfg.Timeout < 0 { + return errors.New("exporter requires a positive timeout") + } + + return nil +} diff --git a/exporter/carbonexporter/config_test.go b/exporter/carbonexporter/config_test.go index 844fe202934c..0ca8ced7e6b8 100644 --- a/exporter/carbonexporter/config_test.go +++ b/exporter/carbonexporter/config_test.go @@ -66,3 +66,41 @@ func TestLoadConfig(t *testing.T) { }) } } + +func TestValidateConfig(t *testing.T) { + tests := []struct { + name string + config *Config + wantErr bool + }{ + { + name: "default_config", + config: createDefaultConfig().(*Config), + }, + { + name: "invalid_tcp_addr", + config: &Config{ + ExporterSettings: config.NewExporterSettings(component.NewID(typeStr)), + Endpoint: "http://localhost:2003", + }, + wantErr: true, + }, + { + name: "invalid_timeout", + config: &Config{ + ExporterSettings: config.NewExporterSettings(component.NewID(typeStr)), + Timeout: -5 * time.Second, + }, + wantErr: true, + }, + } + for _, tt := range tests { + t.Run(tt.name, func(t *testing.T) { + if tt.wantErr { + assert.Error(t, tt.config.Validate()) + } else { + assert.NoError(t, tt.config.Validate()) + } + }) + } +} diff --git a/exporter/carbonexporter/exporter.go b/exporter/carbonexporter/exporter.go index 5267d07c17ff..2fc5fa3abdfe 100644 --- a/exporter/carbonexporter/exporter.go +++ b/exporter/carbonexporter/exporter.go @@ -16,7 +16,6 @@ package carbonexporter // import "github.com/open-telemetry/opentelemetry-collec import ( "context" - "fmt" "net" "sync" "time" @@ -28,17 +27,6 @@ import ( // newCarbonExporter returns a new Carbon exporter. func newCarbonExporter(cfg *Config, set component.ExporterCreateSettings) (component.MetricsExporter, error) { - // Resolve TCP address just to ensure that it is a valid one. It is better - // to fail here than at when the exporter is started. - if _, err := net.ResolveTCPAddr("tcp", cfg.Endpoint); err != nil { - return nil, fmt.Errorf("%v exporter has an invalid TCP endpoint: %w", cfg.ID(), err) - } - - // Negative timeouts are not acceptable, since all sends will fail. - if cfg.Timeout < 0 { - return nil, fmt.Errorf("%v exporter requires a positive timeout", cfg.ID()) - } - sender := carbonSender{ connPool: newTCPConnPool(cfg.Endpoint, cfg.Timeout), } diff --git a/exporter/carbonexporter/exporter_test.go b/exporter/carbonexporter/exporter_test.go index 88c59d971473..8aa98be8ac01 100644 --- a/exporter/carbonexporter/exporter_test.go +++ b/exporter/carbonexporter/exporter_test.go @@ -29,9 +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" "go.opentelemetry.io/collector/pdata/pmetric" conventions "go.opentelemetry.io/collector/semconv/v1.9.0" @@ -41,45 +39,10 @@ import ( ) func TestNew(t *testing.T) { - tests := []struct { - name string - config *Config - wantErr bool - }{ - { - name: "default_config", - config: createDefaultConfig().(*Config), - }, - { - name: "invalid_tcp_addr", - config: &Config{ - ExporterSettings: config.NewExporterSettings(component.NewID(typeStr)), - Endpoint: "http://localhost:2003", - }, - wantErr: true, - }, - { - name: "invalid_timeout", - config: &Config{ - ExporterSettings: config.NewExporterSettings(component.NewID(typeStr)), - Timeout: -5 * time.Second, - }, - wantErr: true, - }, - } - for _, tt := range tests { - t.Run(tt.name, func(t *testing.T) { - got, err := newCarbonExporter(tt.config, componenttest.NewNopExporterCreateSettings()) - if tt.wantErr { - assert.Nil(t, got) - assert.Error(t, err) - return - } - - assert.NotNil(t, got) - assert.NoError(t, err) - }) - } + cfg := createDefaultConfig().(*Config) + got, err := newCarbonExporter(cfg, componenttest.NewNopExporterCreateSettings()) + assert.NotNil(t, got) + assert.NoError(t, err) } func TestConsumeMetricsData(t *testing.T) { diff --git a/exporter/carbonexporter/go.mod b/exporter/carbonexporter/go.mod index b406502c5aa1..7e4db95a64e6 100644 --- a/exporter/carbonexporter/go.mod +++ b/exporter/carbonexporter/go.mod @@ -5,10 +5,11 @@ go 1.18 require ( github.com/open-telemetry/opentelemetry-collector-contrib/internal/common v0.66.0 github.com/stretchr/testify v1.8.1 - go.opentelemetry.io/collector v0.66.1-0.20221128222955-4ff1ff379b90 - go.opentelemetry.io/collector/component v0.66.1-0.20221128222955-4ff1ff379b90 - go.opentelemetry.io/collector/pdata v0.66.1-0.20221128222955-4ff1ff379b90 - go.opentelemetry.io/collector/semconv v0.66.1-0.20221128222955-4ff1ff379b90 + go.opentelemetry.io/collector v0.66.1-0.20221202005155-1c54042beb70 + go.opentelemetry.io/collector/component v0.66.1-0.20221202005155-1c54042beb70 + go.opentelemetry.io/collector/confmap v0.0.0-20221201172708-2bdff61fa52a + go.opentelemetry.io/collector/pdata v0.66.1-0.20221202005155-1c54042beb70 + go.opentelemetry.io/collector/semconv v0.66.1-0.20221202005155-1c54042beb70 go.uber.org/atomic v1.10.0 ) @@ -28,13 +29,13 @@ require ( github.com/pelletier/go-toml v1.9.4 // indirect github.com/pmezard/go-difflib v1.0.0 // indirect go.opencensus.io v0.24.0 // indirect - go.opentelemetry.io/collector/consumer v0.66.1-0.20221128222955-4ff1ff379b90 // indirect - go.opentelemetry.io/collector/featuregate v0.66.1-0.20221128222955-4ff1ff379b90 // indirect + go.opentelemetry.io/collector/consumer v0.66.1-0.20221202005155-1c54042beb70 // indirect + go.opentelemetry.io/collector/featuregate v0.66.1-0.20221202005155-1c54042beb70 // 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 go.uber.org/multierr v1.8.0 // indirect - go.uber.org/zap v1.23.0 // indirect + go.uber.org/zap v1.24.0 // indirect golang.org/x/net v0.0.0-20220722155237-a158d28d115b // indirect golang.org/x/sys v0.2.0 // indirect golang.org/x/text v0.4.0 // indirect diff --git a/exporter/carbonexporter/go.sum b/exporter/carbonexporter/go.sum index 40852464c97e..857cd7797459 100644 --- a/exporter/carbonexporter/go.sum +++ b/exporter/carbonexporter/go.sum @@ -273,18 +273,20 @@ go.etcd.io/etcd/client/pkg/v3 v3.5.4/go.mod h1:IJHfcCEKxYu1Os13ZdwCwIUTUVGYTSAM3 go.etcd.io/etcd/client/v3 v3.5.4/go.mod h1:ZaRkVgBZC+L+dLCjTcF1hRXpgZXQPOvnA/Ak/gq3kiY= go.opencensus.io v0.24.0 h1:y73uSU6J157QMP2kn2r30vwW1A2W2WFwSCGnAVxeaD0= go.opencensus.io v0.24.0/go.mod h1:vNK8G9p7aAivkbmorf4v+7Hgx+Zs0yY+0fOtgBfjQKo= -go.opentelemetry.io/collector v0.66.1-0.20221128222955-4ff1ff379b90 h1:yRe05/jMdzH4TFHfndZ5h2o2hKBK/79W72j8w51qNsI= -go.opentelemetry.io/collector v0.66.1-0.20221128222955-4ff1ff379b90/go.mod h1:hE6jCs+0rfiufCrVPucKZTMwfHit1okfDPnwPT2eW1I= -go.opentelemetry.io/collector/component v0.66.1-0.20221128222955-4ff1ff379b90 h1:AYSNTXbezhNg43EuYdVVcgxE/2gBVrm00FDx4DOmQVg= -go.opentelemetry.io/collector/component v0.66.1-0.20221128222955-4ff1ff379b90/go.mod h1:0c84EqXUhvYe6KW7hJfh76tiI/5yjWCH2amwyQ06XLM= -go.opentelemetry.io/collector/consumer v0.66.1-0.20221128222955-4ff1ff379b90 h1:nzNXVfC1FzXBXCLMzbMv+qK3E4EGiNsnMhfVsBd2yzc= -go.opentelemetry.io/collector/consumer v0.66.1-0.20221128222955-4ff1ff379b90/go.mod h1:WtoRZa5SnxQO1ZEQdVxYpFcXCmq62rakv0oUSlPO0NQ= -go.opentelemetry.io/collector/featuregate v0.66.1-0.20221128222955-4ff1ff379b90 h1:UuJSFWbi9XxyNZsJKZuvpWg35BgRbcCGFH+38V2MAdw= -go.opentelemetry.io/collector/featuregate v0.66.1-0.20221128222955-4ff1ff379b90/go.mod h1:tewuFKJYalWBU0bmNKg++MC1ipINXUr6szYzOw2p1GI= -go.opentelemetry.io/collector/pdata v0.66.1-0.20221128222955-4ff1ff379b90 h1:Vu4S4jSNcd0VFPzxQNO4+UqGwnes1xJDoFLPRiWHm8I= -go.opentelemetry.io/collector/pdata v0.66.1-0.20221128222955-4ff1ff379b90/go.mod h1:pqyaznLzk21m+1KL6fwOsRryRELL+zNM0qiVSn0MbVc= -go.opentelemetry.io/collector/semconv v0.66.1-0.20221128222955-4ff1ff379b90 h1:hFaTA68cggZKWMv7wQ3bKP8KGTbowh/5AQZKCHzHTqM= -go.opentelemetry.io/collector/semconv v0.66.1-0.20221128222955-4ff1ff379b90/go.mod h1:5o9yhOa+ABt7g2E5JABDxGZ1PQPbtfxrKNbYn+LOTXU= +go.opentelemetry.io/collector v0.66.1-0.20221202005155-1c54042beb70 h1:INB2CsOtqqrija2KvMuIpbBQ3qX1BECEeR+d0NJX+oM= +go.opentelemetry.io/collector v0.66.1-0.20221202005155-1c54042beb70/go.mod h1:d0NHkHyANJy3HDTvYE/PoylMShUmFIbiir89ieI0X0c= +go.opentelemetry.io/collector/component v0.66.1-0.20221202005155-1c54042beb70 h1:dEoJhzCmRShgmVro/kXm6pouGElgxkH2DsvanzCeZtU= +go.opentelemetry.io/collector/component v0.66.1-0.20221202005155-1c54042beb70/go.mod h1:OsVnvFFe38QSpcuZlQ8cvarDzcloCexgQ1/B2m80F6U= +go.opentelemetry.io/collector/confmap v0.0.0-20221201172708-2bdff61fa52a h1:2TscCXAQASO2kU9xHcMIUM/FP29fiQIRTilZmliq/7I= +go.opentelemetry.io/collector/confmap v0.0.0-20221201172708-2bdff61fa52a/go.mod h1:qJ3e8bA8h4wz/jYlbeEUafVHdrU7DkpStnmIUAz6VTQ= +go.opentelemetry.io/collector/consumer v0.66.1-0.20221202005155-1c54042beb70 h1:XwpVjI1KeKGPXOZBLefGILMziPYuNf6IzbmiIEsIyI0= +go.opentelemetry.io/collector/consumer v0.66.1-0.20221202005155-1c54042beb70/go.mod h1:EWVBcSGcIcmeDGTnIboc/aqa3agsBeH8/q7yFWG7xVc= +go.opentelemetry.io/collector/featuregate v0.66.1-0.20221202005155-1c54042beb70 h1:V0tf4ebciqIs07jFATfLGdUpLRaEsi+AiWuA/in0G8Y= +go.opentelemetry.io/collector/featuregate v0.66.1-0.20221202005155-1c54042beb70/go.mod h1:tewuFKJYalWBU0bmNKg++MC1ipINXUr6szYzOw2p1GI= +go.opentelemetry.io/collector/pdata v0.66.1-0.20221202005155-1c54042beb70 h1:TPOrxkEMvZzfBSwF3ct+kUUgKA5g8unkZZbKQvJweeA= +go.opentelemetry.io/collector/pdata v0.66.1-0.20221202005155-1c54042beb70/go.mod h1:pqyaznLzk21m+1KL6fwOsRryRELL+zNM0qiVSn0MbVc= +go.opentelemetry.io/collector/semconv v0.66.1-0.20221202005155-1c54042beb70 h1:Q5L9Urod3c8as6ZYaoaqBjarx/HXxsxy34DFZIU2fO4= +go.opentelemetry.io/collector/semconv v0.66.1-0.20221202005155-1c54042beb70/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= @@ -302,8 +304,8 @@ go.uber.org/multierr v1.6.0/go.mod h1:cdWPpRnG4AhwMwsgIHip0KRBQjJy5kYEpYjJxpXp9i go.uber.org/multierr v1.8.0 h1:dg6GjLku4EH+249NNmoIciG9N/jURbDG+pFlTkhzIC8= go.uber.org/multierr v1.8.0/go.mod h1:7EAYxJLBy9rStEaz58O2t4Uvip6FSURkq8/ppBp95ak= go.uber.org/zap v1.17.0/go.mod h1:MXVU+bhUf/A7Xi2HNOnopQOrmycQ5Ih87HtOu4q5SSo= -go.uber.org/zap v1.23.0 h1:OjGQ5KQDEUawVHxNwQgPpiypGHOxo2mNZsOqTak4fFY= -go.uber.org/zap v1.23.0/go.mod h1:D+nX8jyLsMHMYrln8A0rJjFt/T/9/bGgIhAqxv5URuY= +go.uber.org/zap v1.24.0 h1:FiJd5l1UOLj0wCgbSE0rwwXHzEdAZS6hiiSnxJN/D60= +go.uber.org/zap v1.24.0/go.mod h1:2kMP+WWQ8aoFoedH3T2sq6iJ2yDWpHbP0f6MQbS9Gkg= golang.org/x/crypto v0.0.0-20180904163835-0709b304e793/go.mod h1:6SG95UA2DQfeDnfUPMdvaQW0Q7yPrPDi9nlGo2tz2b4= golang.org/x/crypto v0.0.0-20190308221718-c2843e01d9a2/go.mod h1:djNgcEr1/C05ACkg1iLfiJU5Ep61QUkGW8qpdssI0+w= golang.org/x/crypto v0.0.0-20190923035154-9ee001bba392/go.mod h1:/lpIB1dKB+9EgE3H3cr1v9wB50oz8l4C4h62xy7jSTY= diff --git a/exporter/clickhouseexporter/go.mod b/exporter/clickhouseexporter/go.mod index afab7660f33d..c7fb6eb8ef4f 100644 --- a/exporter/clickhouseexporter/go.mod +++ b/exporter/clickhouseexporter/go.mod @@ -6,12 +6,13 @@ require ( github.com/ClickHouse/clickhouse-go/v2 v2.3.0 github.com/open-telemetry/opentelemetry-collector-contrib/internal/coreinternal v0.66.0 github.com/stretchr/testify v1.8.1 - go.opentelemetry.io/collector v0.66.1-0.20221128222955-4ff1ff379b90 - go.opentelemetry.io/collector/component v0.66.1-0.20221128222955-4ff1ff379b90 - go.opentelemetry.io/collector/pdata v0.66.1-0.20221128222955-4ff1ff379b90 - go.opentelemetry.io/collector/semconv v0.66.1-0.20221128222955-4ff1ff379b90 + go.opentelemetry.io/collector v0.66.1-0.20221202005155-1c54042beb70 + go.opentelemetry.io/collector/component v0.66.1-0.20221202005155-1c54042beb70 + go.opentelemetry.io/collector/confmap v0.0.0-20221201172708-2bdff61fa52a + go.opentelemetry.io/collector/pdata v0.66.1-0.20221202005155-1c54042beb70 + go.opentelemetry.io/collector/semconv v0.66.1-0.20221202005155-1c54042beb70 go.uber.org/multierr v1.8.0 - go.uber.org/zap v1.23.0 + go.uber.org/zap v1.24.0 ) require ( @@ -42,8 +43,8 @@ require ( github.com/segmentio/asm v1.2.0 // indirect github.com/shopspring/decimal v1.3.1 // indirect go.opencensus.io v0.24.0 // indirect - go.opentelemetry.io/collector/consumer v0.66.1-0.20221128222955-4ff1ff379b90 // indirect - go.opentelemetry.io/collector/featuregate v0.66.1-0.20221128222955-4ff1ff379b90 // indirect + go.opentelemetry.io/collector/consumer v0.66.1-0.20221202005155-1c54042beb70 // indirect + go.opentelemetry.io/collector/featuregate v0.66.1-0.20221202005155-1c54042beb70 // 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 e191bbd8339d..395174cd708d 100644 --- a/exporter/clickhouseexporter/go.sum +++ b/exporter/clickhouseexporter/go.sum @@ -299,18 +299,20 @@ go.etcd.io/etcd/client/pkg/v3 v3.5.4/go.mod h1:IJHfcCEKxYu1Os13ZdwCwIUTUVGYTSAM3 go.etcd.io/etcd/client/v3 v3.5.4/go.mod h1:ZaRkVgBZC+L+dLCjTcF1hRXpgZXQPOvnA/Ak/gq3kiY= go.opencensus.io v0.24.0 h1:y73uSU6J157QMP2kn2r30vwW1A2W2WFwSCGnAVxeaD0= go.opencensus.io v0.24.0/go.mod h1:vNK8G9p7aAivkbmorf4v+7Hgx+Zs0yY+0fOtgBfjQKo= -go.opentelemetry.io/collector v0.66.1-0.20221128222955-4ff1ff379b90 h1:yRe05/jMdzH4TFHfndZ5h2o2hKBK/79W72j8w51qNsI= -go.opentelemetry.io/collector v0.66.1-0.20221128222955-4ff1ff379b90/go.mod h1:hE6jCs+0rfiufCrVPucKZTMwfHit1okfDPnwPT2eW1I= -go.opentelemetry.io/collector/component v0.66.1-0.20221128222955-4ff1ff379b90 h1:AYSNTXbezhNg43EuYdVVcgxE/2gBVrm00FDx4DOmQVg= -go.opentelemetry.io/collector/component v0.66.1-0.20221128222955-4ff1ff379b90/go.mod h1:0c84EqXUhvYe6KW7hJfh76tiI/5yjWCH2amwyQ06XLM= -go.opentelemetry.io/collector/consumer v0.66.1-0.20221128222955-4ff1ff379b90 h1:nzNXVfC1FzXBXCLMzbMv+qK3E4EGiNsnMhfVsBd2yzc= -go.opentelemetry.io/collector/consumer v0.66.1-0.20221128222955-4ff1ff379b90/go.mod h1:WtoRZa5SnxQO1ZEQdVxYpFcXCmq62rakv0oUSlPO0NQ= -go.opentelemetry.io/collector/featuregate v0.66.1-0.20221128222955-4ff1ff379b90 h1:UuJSFWbi9XxyNZsJKZuvpWg35BgRbcCGFH+38V2MAdw= -go.opentelemetry.io/collector/featuregate v0.66.1-0.20221128222955-4ff1ff379b90/go.mod h1:tewuFKJYalWBU0bmNKg++MC1ipINXUr6szYzOw2p1GI= -go.opentelemetry.io/collector/pdata v0.66.1-0.20221128222955-4ff1ff379b90 h1:Vu4S4jSNcd0VFPzxQNO4+UqGwnes1xJDoFLPRiWHm8I= -go.opentelemetry.io/collector/pdata v0.66.1-0.20221128222955-4ff1ff379b90/go.mod h1:pqyaznLzk21m+1KL6fwOsRryRELL+zNM0qiVSn0MbVc= -go.opentelemetry.io/collector/semconv v0.66.1-0.20221128222955-4ff1ff379b90 h1:hFaTA68cggZKWMv7wQ3bKP8KGTbowh/5AQZKCHzHTqM= -go.opentelemetry.io/collector/semconv v0.66.1-0.20221128222955-4ff1ff379b90/go.mod h1:5o9yhOa+ABt7g2E5JABDxGZ1PQPbtfxrKNbYn+LOTXU= +go.opentelemetry.io/collector v0.66.1-0.20221202005155-1c54042beb70 h1:INB2CsOtqqrija2KvMuIpbBQ3qX1BECEeR+d0NJX+oM= +go.opentelemetry.io/collector v0.66.1-0.20221202005155-1c54042beb70/go.mod h1:d0NHkHyANJy3HDTvYE/PoylMShUmFIbiir89ieI0X0c= +go.opentelemetry.io/collector/component v0.66.1-0.20221202005155-1c54042beb70 h1:dEoJhzCmRShgmVro/kXm6pouGElgxkH2DsvanzCeZtU= +go.opentelemetry.io/collector/component v0.66.1-0.20221202005155-1c54042beb70/go.mod h1:OsVnvFFe38QSpcuZlQ8cvarDzcloCexgQ1/B2m80F6U= +go.opentelemetry.io/collector/confmap v0.0.0-20221201172708-2bdff61fa52a h1:2TscCXAQASO2kU9xHcMIUM/FP29fiQIRTilZmliq/7I= +go.opentelemetry.io/collector/confmap v0.0.0-20221201172708-2bdff61fa52a/go.mod h1:qJ3e8bA8h4wz/jYlbeEUafVHdrU7DkpStnmIUAz6VTQ= +go.opentelemetry.io/collector/consumer v0.66.1-0.20221202005155-1c54042beb70 h1:XwpVjI1KeKGPXOZBLefGILMziPYuNf6IzbmiIEsIyI0= +go.opentelemetry.io/collector/consumer v0.66.1-0.20221202005155-1c54042beb70/go.mod h1:EWVBcSGcIcmeDGTnIboc/aqa3agsBeH8/q7yFWG7xVc= +go.opentelemetry.io/collector/featuregate v0.66.1-0.20221202005155-1c54042beb70 h1:V0tf4ebciqIs07jFATfLGdUpLRaEsi+AiWuA/in0G8Y= +go.opentelemetry.io/collector/featuregate v0.66.1-0.20221202005155-1c54042beb70/go.mod h1:tewuFKJYalWBU0bmNKg++MC1ipINXUr6szYzOw2p1GI= +go.opentelemetry.io/collector/pdata v0.66.1-0.20221202005155-1c54042beb70 h1:TPOrxkEMvZzfBSwF3ct+kUUgKA5g8unkZZbKQvJweeA= +go.opentelemetry.io/collector/pdata v0.66.1-0.20221202005155-1c54042beb70/go.mod h1:pqyaznLzk21m+1KL6fwOsRryRELL+zNM0qiVSn0MbVc= +go.opentelemetry.io/collector/semconv v0.66.1-0.20221202005155-1c54042beb70 h1:Q5L9Urod3c8as6ZYaoaqBjarx/HXxsxy34DFZIU2fO4= +go.opentelemetry.io/collector/semconv v0.66.1-0.20221202005155-1c54042beb70/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= @@ -328,8 +330,8 @@ go.uber.org/multierr v1.6.0/go.mod h1:cdWPpRnG4AhwMwsgIHip0KRBQjJy5kYEpYjJxpXp9i go.uber.org/multierr v1.8.0 h1:dg6GjLku4EH+249NNmoIciG9N/jURbDG+pFlTkhzIC8= go.uber.org/multierr v1.8.0/go.mod h1:7EAYxJLBy9rStEaz58O2t4Uvip6FSURkq8/ppBp95ak= go.uber.org/zap v1.17.0/go.mod h1:MXVU+bhUf/A7Xi2HNOnopQOrmycQ5Ih87HtOu4q5SSo= -go.uber.org/zap v1.23.0 h1:OjGQ5KQDEUawVHxNwQgPpiypGHOxo2mNZsOqTak4fFY= -go.uber.org/zap v1.23.0/go.mod h1:D+nX8jyLsMHMYrln8A0rJjFt/T/9/bGgIhAqxv5URuY= +go.uber.org/zap v1.24.0 h1:FiJd5l1UOLj0wCgbSE0rwwXHzEdAZS6hiiSnxJN/D60= +go.uber.org/zap v1.24.0/go.mod h1:2kMP+WWQ8aoFoedH3T2sq6iJ2yDWpHbP0f6MQbS9Gkg= golang.org/x/crypto v0.0.0-20180904163835-0709b304e793/go.mod h1:6SG95UA2DQfeDnfUPMdvaQW0Q7yPrPDi9nlGo2tz2b4= golang.org/x/crypto v0.0.0-20190308221718-c2843e01d9a2/go.mod h1:djNgcEr1/C05ACkg1iLfiJU5Ep61QUkGW8qpdssI0+w= golang.org/x/crypto v0.0.0-20190923035154-9ee001bba392/go.mod h1:/lpIB1dKB+9EgE3H3cr1v9wB50oz8l4C4h62xy7jSTY= diff --git a/exporter/coralogixexporter/go.mod b/exporter/coralogixexporter/go.mod index ba55695e949a..0b7ed474a404 100644 --- a/exporter/coralogixexporter/go.mod +++ b/exporter/coralogixexporter/go.mod @@ -7,11 +7,12 @@ require ( github.com/open-telemetry/opentelemetry-collector-contrib/internal/common v0.66.0 github.com/open-telemetry/opentelemetry-collector-contrib/pkg/translator/jaeger v0.66.0 github.com/stretchr/testify v1.8.1 - go.opentelemetry.io/collector v0.66.1-0.20221128222955-4ff1ff379b90 - go.opentelemetry.io/collector/component v0.66.1-0.20221128222955-4ff1ff379b90 - go.opentelemetry.io/collector/consumer v0.66.1-0.20221128222955-4ff1ff379b90 - go.opentelemetry.io/collector/pdata v0.66.1-0.20221128222955-4ff1ff379b90 - go.uber.org/zap v1.23.0 + go.opentelemetry.io/collector v0.66.1-0.20221202005155-1c54042beb70 + go.opentelemetry.io/collector/component v0.66.1-0.20221202005155-1c54042beb70 + go.opentelemetry.io/collector/confmap v0.0.0-20221201172708-2bdff61fa52a + go.opentelemetry.io/collector/consumer v0.66.1-0.20221202005155-1c54042beb70 + go.opentelemetry.io/collector/pdata v0.66.1-0.20221202005155-1c54042beb70 + go.uber.org/zap v1.24.0 google.golang.org/genproto v0.0.0-20221027153422-115e99e71e1c google.golang.org/grpc v1.51.0 ) @@ -43,8 +44,8 @@ require ( github.com/uber/jaeger-client-go v2.30.0+incompatible // indirect github.com/uber/jaeger-lib v2.4.1+incompatible // indirect go.opencensus.io v0.24.0 // indirect - go.opentelemetry.io/collector/featuregate v0.66.1-0.20221128222955-4ff1ff379b90 // indirect - go.opentelemetry.io/collector/semconv v0.66.1-0.20221128222955-4ff1ff379b90 // indirect + go.opentelemetry.io/collector/featuregate v0.66.1-0.20221202005155-1c54042beb70 // indirect + go.opentelemetry.io/collector/semconv v0.66.1-0.20221202005155-1c54042beb70 // 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 8418449ab156..e3876dad9e14 100644 --- a/exporter/coralogixexporter/go.sum +++ b/exporter/coralogixexporter/go.sum @@ -315,18 +315,20 @@ go.etcd.io/etcd/client/pkg/v3 v3.5.4/go.mod h1:IJHfcCEKxYu1Os13ZdwCwIUTUVGYTSAM3 go.etcd.io/etcd/client/v3 v3.5.4/go.mod h1:ZaRkVgBZC+L+dLCjTcF1hRXpgZXQPOvnA/Ak/gq3kiY= go.opencensus.io v0.24.0 h1:y73uSU6J157QMP2kn2r30vwW1A2W2WFwSCGnAVxeaD0= go.opencensus.io v0.24.0/go.mod h1:vNK8G9p7aAivkbmorf4v+7Hgx+Zs0yY+0fOtgBfjQKo= -go.opentelemetry.io/collector v0.66.1-0.20221128222955-4ff1ff379b90 h1:yRe05/jMdzH4TFHfndZ5h2o2hKBK/79W72j8w51qNsI= -go.opentelemetry.io/collector v0.66.1-0.20221128222955-4ff1ff379b90/go.mod h1:hE6jCs+0rfiufCrVPucKZTMwfHit1okfDPnwPT2eW1I= -go.opentelemetry.io/collector/component v0.66.1-0.20221128222955-4ff1ff379b90 h1:AYSNTXbezhNg43EuYdVVcgxE/2gBVrm00FDx4DOmQVg= -go.opentelemetry.io/collector/component v0.66.1-0.20221128222955-4ff1ff379b90/go.mod h1:0c84EqXUhvYe6KW7hJfh76tiI/5yjWCH2amwyQ06XLM= -go.opentelemetry.io/collector/consumer v0.66.1-0.20221128222955-4ff1ff379b90 h1:nzNXVfC1FzXBXCLMzbMv+qK3E4EGiNsnMhfVsBd2yzc= -go.opentelemetry.io/collector/consumer v0.66.1-0.20221128222955-4ff1ff379b90/go.mod h1:WtoRZa5SnxQO1ZEQdVxYpFcXCmq62rakv0oUSlPO0NQ= -go.opentelemetry.io/collector/featuregate v0.66.1-0.20221128222955-4ff1ff379b90 h1:UuJSFWbi9XxyNZsJKZuvpWg35BgRbcCGFH+38V2MAdw= -go.opentelemetry.io/collector/featuregate v0.66.1-0.20221128222955-4ff1ff379b90/go.mod h1:tewuFKJYalWBU0bmNKg++MC1ipINXUr6szYzOw2p1GI= -go.opentelemetry.io/collector/pdata v0.66.1-0.20221128222955-4ff1ff379b90 h1:Vu4S4jSNcd0VFPzxQNO4+UqGwnes1xJDoFLPRiWHm8I= -go.opentelemetry.io/collector/pdata v0.66.1-0.20221128222955-4ff1ff379b90/go.mod h1:pqyaznLzk21m+1KL6fwOsRryRELL+zNM0qiVSn0MbVc= -go.opentelemetry.io/collector/semconv v0.66.1-0.20221128222955-4ff1ff379b90 h1:hFaTA68cggZKWMv7wQ3bKP8KGTbowh/5AQZKCHzHTqM= -go.opentelemetry.io/collector/semconv v0.66.1-0.20221128222955-4ff1ff379b90/go.mod h1:5o9yhOa+ABt7g2E5JABDxGZ1PQPbtfxrKNbYn+LOTXU= +go.opentelemetry.io/collector v0.66.1-0.20221202005155-1c54042beb70 h1:INB2CsOtqqrija2KvMuIpbBQ3qX1BECEeR+d0NJX+oM= +go.opentelemetry.io/collector v0.66.1-0.20221202005155-1c54042beb70/go.mod h1:d0NHkHyANJy3HDTvYE/PoylMShUmFIbiir89ieI0X0c= +go.opentelemetry.io/collector/component v0.66.1-0.20221202005155-1c54042beb70 h1:dEoJhzCmRShgmVro/kXm6pouGElgxkH2DsvanzCeZtU= +go.opentelemetry.io/collector/component v0.66.1-0.20221202005155-1c54042beb70/go.mod h1:OsVnvFFe38QSpcuZlQ8cvarDzcloCexgQ1/B2m80F6U= +go.opentelemetry.io/collector/confmap v0.0.0-20221201172708-2bdff61fa52a h1:2TscCXAQASO2kU9xHcMIUM/FP29fiQIRTilZmliq/7I= +go.opentelemetry.io/collector/confmap v0.0.0-20221201172708-2bdff61fa52a/go.mod h1:qJ3e8bA8h4wz/jYlbeEUafVHdrU7DkpStnmIUAz6VTQ= +go.opentelemetry.io/collector/consumer v0.66.1-0.20221202005155-1c54042beb70 h1:XwpVjI1KeKGPXOZBLefGILMziPYuNf6IzbmiIEsIyI0= +go.opentelemetry.io/collector/consumer v0.66.1-0.20221202005155-1c54042beb70/go.mod h1:EWVBcSGcIcmeDGTnIboc/aqa3agsBeH8/q7yFWG7xVc= +go.opentelemetry.io/collector/featuregate v0.66.1-0.20221202005155-1c54042beb70 h1:V0tf4ebciqIs07jFATfLGdUpLRaEsi+AiWuA/in0G8Y= +go.opentelemetry.io/collector/featuregate v0.66.1-0.20221202005155-1c54042beb70/go.mod h1:tewuFKJYalWBU0bmNKg++MC1ipINXUr6szYzOw2p1GI= +go.opentelemetry.io/collector/pdata v0.66.1-0.20221202005155-1c54042beb70 h1:TPOrxkEMvZzfBSwF3ct+kUUgKA5g8unkZZbKQvJweeA= +go.opentelemetry.io/collector/pdata v0.66.1-0.20221202005155-1c54042beb70/go.mod h1:pqyaznLzk21m+1KL6fwOsRryRELL+zNM0qiVSn0MbVc= +go.opentelemetry.io/collector/semconv v0.66.1-0.20221202005155-1c54042beb70 h1:Q5L9Urod3c8as6ZYaoaqBjarx/HXxsxy34DFZIU2fO4= +go.opentelemetry.io/collector/semconv v0.66.1-0.20221202005155-1c54042beb70/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= @@ -347,8 +349,8 @@ go.uber.org/multierr v1.6.0/go.mod h1:cdWPpRnG4AhwMwsgIHip0KRBQjJy5kYEpYjJxpXp9i go.uber.org/multierr v1.8.0 h1:dg6GjLku4EH+249NNmoIciG9N/jURbDG+pFlTkhzIC8= go.uber.org/multierr v1.8.0/go.mod h1:7EAYxJLBy9rStEaz58O2t4Uvip6FSURkq8/ppBp95ak= go.uber.org/zap v1.17.0/go.mod h1:MXVU+bhUf/A7Xi2HNOnopQOrmycQ5Ih87HtOu4q5SSo= -go.uber.org/zap v1.23.0 h1:OjGQ5KQDEUawVHxNwQgPpiypGHOxo2mNZsOqTak4fFY= -go.uber.org/zap v1.23.0/go.mod h1:D+nX8jyLsMHMYrln8A0rJjFt/T/9/bGgIhAqxv5URuY= +go.uber.org/zap v1.24.0 h1:FiJd5l1UOLj0wCgbSE0rwwXHzEdAZS6hiiSnxJN/D60= +go.uber.org/zap v1.24.0/go.mod h1:2kMP+WWQ8aoFoedH3T2sq6iJ2yDWpHbP0f6MQbS9Gkg= golang.org/x/crypto v0.0.0-20180904163835-0709b304e793/go.mod h1:6SG95UA2DQfeDnfUPMdvaQW0Q7yPrPDi9nlGo2tz2b4= golang.org/x/crypto v0.0.0-20190308221718-c2843e01d9a2/go.mod h1:djNgcEr1/C05ACkg1iLfiJU5Ep61QUkGW8qpdssI0+w= golang.org/x/crypto v0.0.0-20190923035154-9ee001bba392/go.mod h1:/lpIB1dKB+9EgE3H3cr1v9wB50oz8l4C4h62xy7jSTY= diff --git a/exporter/datadogexporter/go.mod b/exporter/datadogexporter/go.mod index f7562cffb356..0c8f3e7a7495 100644 --- a/exporter/datadogexporter/go.mod +++ b/exporter/datadogexporter/go.mod @@ -9,7 +9,7 @@ require ( github.com/DataDog/datadog-agent/pkg/trace v0.41.0-rc.3.0.20221114173638-98b8cd5ae742 github.com/DataDog/datadog-api-client-go/v2 v2.4.0 github.com/DataDog/gohai v0.0.0-20220718130825-1776f9beb9cc - github.com/GoogleCloudPlatform/opentelemetry-operations-go/detectors/gcp v0.34.1 + github.com/GoogleCloudPlatform/opentelemetry-operations-go/detectors/gcp v0.34.2 github.com/aws/aws-sdk-go v1.44.145 github.com/cenkalti/backoff/v4 v4.2.0 github.com/open-telemetry/opentelemetry-collector-contrib/internal/aws/ecsutil v0.66.0 @@ -23,16 +23,17 @@ require ( github.com/open-telemetry/opentelemetry-collector-contrib/receiver/hostmetricsreceiver v0.66.0 github.com/patrickmn/go-cache v2.1.0+incompatible github.com/stretchr/testify v1.8.1 - go.opentelemetry.io/collector v0.66.1-0.20221128222955-4ff1ff379b90 - go.opentelemetry.io/collector/component v0.66.1-0.20221128222955-4ff1ff379b90 - go.opentelemetry.io/collector/consumer v0.66.1-0.20221128222955-4ff1ff379b90 - go.opentelemetry.io/collector/featuregate v0.66.1-0.20221128222955-4ff1ff379b90 - go.opentelemetry.io/collector/pdata v0.66.1-0.20221128222955-4ff1ff379b90 - go.opentelemetry.io/collector/processor/batchprocessor v0.66.1-0.20221128222955-4ff1ff379b90 - go.opentelemetry.io/collector/receiver/otlpreceiver v0.66.1-0.20221128222955-4ff1ff379b90 - go.opentelemetry.io/collector/semconv v0.66.1-0.20221128222955-4ff1ff379b90 + go.opentelemetry.io/collector v0.66.1-0.20221202005155-1c54042beb70 + go.opentelemetry.io/collector/component v0.66.1-0.20221202005155-1c54042beb70 + go.opentelemetry.io/collector/confmap v0.0.0-20221201172708-2bdff61fa52a + go.opentelemetry.io/collector/consumer v0.66.1-0.20221202005155-1c54042beb70 + go.opentelemetry.io/collector/featuregate v0.66.1-0.20221202005155-1c54042beb70 + go.opentelemetry.io/collector/pdata v0.66.1-0.20221202005155-1c54042beb70 + go.opentelemetry.io/collector/processor/batchprocessor v0.66.1-0.20221202005155-1c54042beb70 + go.opentelemetry.io/collector/receiver/otlpreceiver v0.66.1-0.20221202005155-1c54042beb70 + go.opentelemetry.io/collector/semconv v0.66.1-0.20221202005155-1c54042beb70 go.uber.org/multierr v1.8.0 - go.uber.org/zap v1.23.0 + go.uber.org/zap v1.24.0 gopkg.in/yaml.v2 v2.4.0 gopkg.in/zorkian/go-datadog-api.v2 v2.30.0 k8s.io/apimachinery v0.25.4 @@ -150,8 +151,8 @@ require ( github.com/stretchr/objx v0.5.0 // indirect github.com/theupdateframework/go-tuf v0.3.0 // indirect github.com/tinylib/msgp v1.1.6 // indirect - github.com/tklauser/go-sysconf v0.3.10 // indirect - github.com/tklauser/numcpus v0.5.0 // indirect + github.com/tklauser/go-sysconf v0.3.11 // indirect + github.com/tklauser/numcpus v0.6.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.24.0 // indirect diff --git a/exporter/datadogexporter/go.sum b/exporter/datadogexporter/go.sum index 6066ce68fcf4..e5744dc2cb94 100644 --- a/exporter/datadogexporter/go.sum +++ b/exporter/datadogexporter/go.sum @@ -75,8 +75,8 @@ github.com/DataDog/sketches-go v1.4.1 h1:j5G6as+9FASM2qC36lvpvQAj9qsv/jUs3FtO8Cw github.com/DataDog/sketches-go v1.4.1/go.mod h1:xJIXldczJyyjnbDop7ZZcLxJdV3+7Kra7H1KMgpgkLk= github.com/DataDog/zstd v1.5.0 h1:+K/VEwIAaPcHiMtQvpLD4lqW7f0Gk3xdYZmI1hD+CXo= github.com/DataDog/zstd v1.5.0/go.mod h1:g4AWEaM3yOg3HYfnJ3YIawPnVdXJh9QME85blwSAmyw= -github.com/GoogleCloudPlatform/opentelemetry-operations-go/detectors/gcp v0.34.1 h1:gcHr5iIamTMH+TOqvcIrkZ9zpDOKVkc2du/VYGJkYfM= -github.com/GoogleCloudPlatform/opentelemetry-operations-go/detectors/gcp v0.34.1/go.mod h1:8jbDwk101z1YJ201wir2t/3O5Sxn55M37IDVwnQA1rg= +github.com/GoogleCloudPlatform/opentelemetry-operations-go/detectors/gcp v0.34.2 h1:ebkUIeRzDUUeX7Mot0nYeyOhBMhS9bJj7v3tvZyqpdQ= +github.com/GoogleCloudPlatform/opentelemetry-operations-go/detectors/gcp v0.34.2/go.mod h1:HpmGbYLf1fsWiqVA0Z2oKh7qi7BroCgOl2NqB2N/TG4= github.com/Microsoft/go-winio v0.5.0/go.mod h1:JPGBdM1cNvN/6ISo+n8V5iA4v8pBzdOpzfwIujj1a84= github.com/Microsoft/go-winio v0.5.1/go.mod h1:JPGBdM1cNvN/6ISo+n8V5iA4v8pBzdOpzfwIujj1a84= github.com/Microsoft/go-winio v0.5.2 h1:a9IhgEQBCUEk6QCdml9CiJGhAws+YwffDHEMp1VMrpA= @@ -676,12 +676,13 @@ github.com/theupdateframework/go-tuf v0.3.0/go.mod h1:E5XP0wXitrFUHe4b8cUcAAdxBW github.com/tinylib/msgp v1.1.6 h1:i+SbKraHhnrf9M5MYmvQhFnbLhAXSDWF8WWsuyRdocw= github.com/tinylib/msgp v1.1.6/go.mod h1:75BAfg2hauQhs3qedfdDZmWAPcFMAvJE5b9rGOMufyw= github.com/tklauser/go-sysconf v0.3.9/go.mod h1:11DU/5sG7UexIrp/O6g35hrWzu0JxlwQ3LSFUzyeuhs= -github.com/tklauser/go-sysconf v0.3.10 h1:IJ1AZGZRWbY8T5Vfk04D9WOA5WSejdflXxP03OUqALw= github.com/tklauser/go-sysconf v0.3.10/go.mod h1:C8XykCvCb+Gn0oNCWPIlcb0RuglQTYaQ2hGm7jmxEFk= +github.com/tklauser/go-sysconf v0.3.11 h1:89WgdJhk5SNwJfu+GKyYveZ4IaJ7xAkecBo+KdJV0CM= +github.com/tklauser/go-sysconf v0.3.11/go.mod h1:GqXfhXY3kiPa0nAXPDIQIWzJbMCB7AmcWpGR8lSZfqI= github.com/tklauser/numcpus v0.3.0/go.mod h1:yFGUr7TUHQRAhyqBcEg0Ge34zDBAsIvJJcyE6boqnA8= github.com/tklauser/numcpus v0.4.0/go.mod h1:1+UI3pD8NW14VMwdgJNJ1ESk2UnwhAnz5hMwiKKqXCQ= -github.com/tklauser/numcpus v0.5.0 h1:ooe7gN0fg6myJ0EKoTAf5hebTZrH52px3New/D9iJ+A= -github.com/tklauser/numcpus v0.5.0/go.mod h1:OGzpTxpcIMNGYQdit2BYL1pvk/dSOaJWjKoflh+RQjo= +github.com/tklauser/numcpus v0.6.0 h1:kebhY2Qt+3U6RNK7UqpYNA+tJ23IBEGKkB7JQBfDYms= +github.com/tklauser/numcpus v0.6.0/go.mod h1:FEZLMke0lhOUG6w2JadTzp0a+Nl8PF/GFkQ5UVIcaL4= github.com/tv42/httpunix v0.0.0-20150427012821-b75d8614f926/go.mod h1:9ESjWnEqriFuLhtthL60Sar/7RFoluCcXsuvEwTV5KM= github.com/vmihailenco/msgpack/v4 v4.3.12 h1:07s4sz9IReOgdikxLTKNbBdqDMLsjPKXwvCazn8G65U= github.com/vmihailenco/tagparser v0.1.2 h1:gnjoVuB/kljJ5wICEEOpx98oXMWPLj22G67Vbd1qPqc= @@ -706,23 +707,25 @@ go.opencensus.io v0.22.4/go.mod h1:yxeiOL68Rb0Xd1ddK5vPZ/oVn4vY4Ynel7k9FzqtOIw= go.opencensus.io v0.23.0/go.mod h1:XItmlyltB5F7CS4xOC1DcqMoFqwtC6OG2xF7mCv7P7E= go.opencensus.io v0.24.0 h1:y73uSU6J157QMP2kn2r30vwW1A2W2WFwSCGnAVxeaD0= go.opencensus.io v0.24.0/go.mod h1:vNK8G9p7aAivkbmorf4v+7Hgx+Zs0yY+0fOtgBfjQKo= -go.opentelemetry.io/collector v0.66.1-0.20221128222955-4ff1ff379b90 h1:yRe05/jMdzH4TFHfndZ5h2o2hKBK/79W72j8w51qNsI= -go.opentelemetry.io/collector v0.66.1-0.20221128222955-4ff1ff379b90/go.mod h1:hE6jCs+0rfiufCrVPucKZTMwfHit1okfDPnwPT2eW1I= -go.opentelemetry.io/collector/component v0.66.1-0.20221128222955-4ff1ff379b90 h1:AYSNTXbezhNg43EuYdVVcgxE/2gBVrm00FDx4DOmQVg= -go.opentelemetry.io/collector/component v0.66.1-0.20221128222955-4ff1ff379b90/go.mod h1:0c84EqXUhvYe6KW7hJfh76tiI/5yjWCH2amwyQ06XLM= -go.opentelemetry.io/collector/consumer v0.66.1-0.20221128222955-4ff1ff379b90 h1:nzNXVfC1FzXBXCLMzbMv+qK3E4EGiNsnMhfVsBd2yzc= -go.opentelemetry.io/collector/consumer v0.66.1-0.20221128222955-4ff1ff379b90/go.mod h1:WtoRZa5SnxQO1ZEQdVxYpFcXCmq62rakv0oUSlPO0NQ= -go.opentelemetry.io/collector/extension/zpagesextension v0.65.0 h1:T5JJIJ3cmClqdSMgkbjoIiP9p059AAvbfcd3houJkxM= -go.opentelemetry.io/collector/featuregate v0.66.1-0.20221128222955-4ff1ff379b90 h1:UuJSFWbi9XxyNZsJKZuvpWg35BgRbcCGFH+38V2MAdw= -go.opentelemetry.io/collector/featuregate v0.66.1-0.20221128222955-4ff1ff379b90/go.mod h1:tewuFKJYalWBU0bmNKg++MC1ipINXUr6szYzOw2p1GI= -go.opentelemetry.io/collector/pdata v0.66.1-0.20221128222955-4ff1ff379b90 h1:Vu4S4jSNcd0VFPzxQNO4+UqGwnes1xJDoFLPRiWHm8I= -go.opentelemetry.io/collector/pdata v0.66.1-0.20221128222955-4ff1ff379b90/go.mod h1:pqyaznLzk21m+1KL6fwOsRryRELL+zNM0qiVSn0MbVc= -go.opentelemetry.io/collector/processor/batchprocessor v0.66.1-0.20221128222955-4ff1ff379b90 h1:K12L9juzjChBMfp7cQaQsToz7i7975tUYVzJ3Tpw/Cw= -go.opentelemetry.io/collector/processor/batchprocessor v0.66.1-0.20221128222955-4ff1ff379b90/go.mod h1:XhGTsC1B/bq4gpg8IZ/QYBLXkzE4Gw3r7Xu2+ik8A1Q= -go.opentelemetry.io/collector/receiver/otlpreceiver v0.66.1-0.20221128222955-4ff1ff379b90 h1:/+HfaoVPSXgHUZOTZSSriuKOQi8L/rgyb7TTRx5jzoo= -go.opentelemetry.io/collector/receiver/otlpreceiver v0.66.1-0.20221128222955-4ff1ff379b90/go.mod h1:pb+dcV+KJ44dP+CqV0N6L6dTeDDvCXB8StCqwlrrSkM= -go.opentelemetry.io/collector/semconv v0.66.1-0.20221128222955-4ff1ff379b90 h1:hFaTA68cggZKWMv7wQ3bKP8KGTbowh/5AQZKCHzHTqM= -go.opentelemetry.io/collector/semconv v0.66.1-0.20221128222955-4ff1ff379b90/go.mod h1:5o9yhOa+ABt7g2E5JABDxGZ1PQPbtfxrKNbYn+LOTXU= +go.opentelemetry.io/collector v0.66.1-0.20221202005155-1c54042beb70 h1:INB2CsOtqqrija2KvMuIpbBQ3qX1BECEeR+d0NJX+oM= +go.opentelemetry.io/collector v0.66.1-0.20221202005155-1c54042beb70/go.mod h1:d0NHkHyANJy3HDTvYE/PoylMShUmFIbiir89ieI0X0c= +go.opentelemetry.io/collector/component v0.66.1-0.20221202005155-1c54042beb70 h1:dEoJhzCmRShgmVro/kXm6pouGElgxkH2DsvanzCeZtU= +go.opentelemetry.io/collector/component v0.66.1-0.20221202005155-1c54042beb70/go.mod h1:OsVnvFFe38QSpcuZlQ8cvarDzcloCexgQ1/B2m80F6U= +go.opentelemetry.io/collector/confmap v0.0.0-20221201172708-2bdff61fa52a h1:2TscCXAQASO2kU9xHcMIUM/FP29fiQIRTilZmliq/7I= +go.opentelemetry.io/collector/confmap v0.0.0-20221201172708-2bdff61fa52a/go.mod h1:qJ3e8bA8h4wz/jYlbeEUafVHdrU7DkpStnmIUAz6VTQ= +go.opentelemetry.io/collector/consumer v0.66.1-0.20221202005155-1c54042beb70 h1:XwpVjI1KeKGPXOZBLefGILMziPYuNf6IzbmiIEsIyI0= +go.opentelemetry.io/collector/consumer v0.66.1-0.20221202005155-1c54042beb70/go.mod h1:EWVBcSGcIcmeDGTnIboc/aqa3agsBeH8/q7yFWG7xVc= +go.opentelemetry.io/collector/extension/zpagesextension v0.66.0 h1:tPqSKH5K3VhTT0XXVoWL3woWBSTJqnXZQRt0ZLSCoCc= +go.opentelemetry.io/collector/featuregate v0.66.1-0.20221202005155-1c54042beb70 h1:V0tf4ebciqIs07jFATfLGdUpLRaEsi+AiWuA/in0G8Y= +go.opentelemetry.io/collector/featuregate v0.66.1-0.20221202005155-1c54042beb70/go.mod h1:tewuFKJYalWBU0bmNKg++MC1ipINXUr6szYzOw2p1GI= +go.opentelemetry.io/collector/pdata v0.66.1-0.20221202005155-1c54042beb70 h1:TPOrxkEMvZzfBSwF3ct+kUUgKA5g8unkZZbKQvJweeA= +go.opentelemetry.io/collector/pdata v0.66.1-0.20221202005155-1c54042beb70/go.mod h1:pqyaznLzk21m+1KL6fwOsRryRELL+zNM0qiVSn0MbVc= +go.opentelemetry.io/collector/processor/batchprocessor v0.66.1-0.20221202005155-1c54042beb70 h1:Y4e8NnVevonnAgmjX9Z7QIMA32yMqHAOnAlh8SzTS8c= +go.opentelemetry.io/collector/processor/batchprocessor v0.66.1-0.20221202005155-1c54042beb70/go.mod h1:Pi1CsKDQFoDrUP1i3+VdE6s2Xuji7bOGFBgqHK0J32E= +go.opentelemetry.io/collector/receiver/otlpreceiver v0.66.1-0.20221202005155-1c54042beb70 h1:KBbbPVDV7o5w857g6ePphdu4MV87jrcQevFYDA1okUk= +go.opentelemetry.io/collector/receiver/otlpreceiver v0.66.1-0.20221202005155-1c54042beb70/go.mod h1:0Py8RNjNiFRH6/F+vM2uptdaw9hMj1FBdv0ySntM2gE= +go.opentelemetry.io/collector/semconv v0.66.1-0.20221202005155-1c54042beb70 h1:Q5L9Urod3c8as6ZYaoaqBjarx/HXxsxy34DFZIU2fO4= +go.opentelemetry.io/collector/semconv v0.66.1-0.20221202005155-1c54042beb70/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= @@ -751,8 +754,8 @@ go.uber.org/multierr v1.6.0/go.mod h1:cdWPpRnG4AhwMwsgIHip0KRBQjJy5kYEpYjJxpXp9i go.uber.org/multierr v1.8.0 h1:dg6GjLku4EH+249NNmoIciG9N/jURbDG+pFlTkhzIC8= go.uber.org/multierr v1.8.0/go.mod h1:7EAYxJLBy9rStEaz58O2t4Uvip6FSURkq8/ppBp95ak= go.uber.org/zap v1.17.0/go.mod h1:MXVU+bhUf/A7Xi2HNOnopQOrmycQ5Ih87HtOu4q5SSo= -go.uber.org/zap v1.23.0 h1:OjGQ5KQDEUawVHxNwQgPpiypGHOxo2mNZsOqTak4fFY= -go.uber.org/zap v1.23.0/go.mod h1:D+nX8jyLsMHMYrln8A0rJjFt/T/9/bGgIhAqxv5URuY= +go.uber.org/zap v1.24.0 h1:FiJd5l1UOLj0wCgbSE0rwwXHzEdAZS6hiiSnxJN/D60= +go.uber.org/zap v1.24.0/go.mod h1:2kMP+WWQ8aoFoedH3T2sq6iJ2yDWpHbP0f6MQbS9Gkg= golang.org/x/crypto v0.0.0-20180904163835-0709b304e793/go.mod h1:6SG95UA2DQfeDnfUPMdvaQW0Q7yPrPDi9nlGo2tz2b4= golang.org/x/crypto v0.0.0-20190308221718-c2843e01d9a2/go.mod h1:djNgcEr1/C05ACkg1iLfiJU5Ep61QUkGW8qpdssI0+w= golang.org/x/crypto v0.0.0-20190510104115-cbcb75029529/go.mod h1:yigFU9vqHzYiE8UmvKecakEJjdnWj3jj499lnFckfCI= diff --git a/exporter/dynatraceexporter/go.mod b/exporter/dynatraceexporter/go.mod index e4a439e28407..0e65c5803a6c 100644 --- a/exporter/dynatraceexporter/go.mod +++ b/exporter/dynatraceexporter/go.mod @@ -7,11 +7,12 @@ require ( github.com/open-telemetry/opentelemetry-collector-contrib/internal/common v0.66.0 github.com/open-telemetry/opentelemetry-collector-contrib/pkg/resourcetotelemetry v0.66.0 github.com/stretchr/testify v1.8.1 - go.opentelemetry.io/collector v0.66.1-0.20221128222955-4ff1ff379b90 - go.opentelemetry.io/collector/component v0.66.1-0.20221128222955-4ff1ff379b90 - go.opentelemetry.io/collector/consumer v0.66.1-0.20221128222955-4ff1ff379b90 - go.opentelemetry.io/collector/pdata v0.66.1-0.20221128222955-4ff1ff379b90 - go.uber.org/zap v1.23.0 + go.opentelemetry.io/collector v0.66.1-0.20221202005155-1c54042beb70 + go.opentelemetry.io/collector/component v0.66.1-0.20221202005155-1c54042beb70 + go.opentelemetry.io/collector/confmap v0.0.0-20221201172708-2bdff61fa52a + go.opentelemetry.io/collector/consumer v0.66.1-0.20221202005155-1c54042beb70 + go.opentelemetry.io/collector/pdata v0.66.1-0.20221202005155-1c54042beb70 + go.uber.org/zap v1.24.0 ) require ( @@ -34,7 +35,7 @@ require ( github.com/pmezard/go-difflib v1.0.0 // indirect github.com/rs/cors v1.8.2 // indirect go.opencensus.io v0.24.0 // indirect - go.opentelemetry.io/collector/featuregate v0.66.1-0.20221128222955-4ff1ff379b90 // indirect + go.opentelemetry.io/collector/featuregate v0.66.1-0.20221202005155-1c54042beb70 // 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 c1862eb6af26..a79a0fcaa548 100644 --- a/exporter/dynatraceexporter/go.sum +++ b/exporter/dynatraceexporter/go.sum @@ -284,16 +284,18 @@ go.etcd.io/etcd/client/pkg/v3 v3.5.4/go.mod h1:IJHfcCEKxYu1Os13ZdwCwIUTUVGYTSAM3 go.etcd.io/etcd/client/v3 v3.5.4/go.mod h1:ZaRkVgBZC+L+dLCjTcF1hRXpgZXQPOvnA/Ak/gq3kiY= go.opencensus.io v0.24.0 h1:y73uSU6J157QMP2kn2r30vwW1A2W2WFwSCGnAVxeaD0= go.opencensus.io v0.24.0/go.mod h1:vNK8G9p7aAivkbmorf4v+7Hgx+Zs0yY+0fOtgBfjQKo= -go.opentelemetry.io/collector v0.66.1-0.20221128222955-4ff1ff379b90 h1:yRe05/jMdzH4TFHfndZ5h2o2hKBK/79W72j8w51qNsI= -go.opentelemetry.io/collector v0.66.1-0.20221128222955-4ff1ff379b90/go.mod h1:hE6jCs+0rfiufCrVPucKZTMwfHit1okfDPnwPT2eW1I= -go.opentelemetry.io/collector/component v0.66.1-0.20221128222955-4ff1ff379b90 h1:AYSNTXbezhNg43EuYdVVcgxE/2gBVrm00FDx4DOmQVg= -go.opentelemetry.io/collector/component v0.66.1-0.20221128222955-4ff1ff379b90/go.mod h1:0c84EqXUhvYe6KW7hJfh76tiI/5yjWCH2amwyQ06XLM= -go.opentelemetry.io/collector/consumer v0.66.1-0.20221128222955-4ff1ff379b90 h1:nzNXVfC1FzXBXCLMzbMv+qK3E4EGiNsnMhfVsBd2yzc= -go.opentelemetry.io/collector/consumer v0.66.1-0.20221128222955-4ff1ff379b90/go.mod h1:WtoRZa5SnxQO1ZEQdVxYpFcXCmq62rakv0oUSlPO0NQ= -go.opentelemetry.io/collector/featuregate v0.66.1-0.20221128222955-4ff1ff379b90 h1:UuJSFWbi9XxyNZsJKZuvpWg35BgRbcCGFH+38V2MAdw= -go.opentelemetry.io/collector/featuregate v0.66.1-0.20221128222955-4ff1ff379b90/go.mod h1:tewuFKJYalWBU0bmNKg++MC1ipINXUr6szYzOw2p1GI= -go.opentelemetry.io/collector/pdata v0.66.1-0.20221128222955-4ff1ff379b90 h1:Vu4S4jSNcd0VFPzxQNO4+UqGwnes1xJDoFLPRiWHm8I= -go.opentelemetry.io/collector/pdata v0.66.1-0.20221128222955-4ff1ff379b90/go.mod h1:pqyaznLzk21m+1KL6fwOsRryRELL+zNM0qiVSn0MbVc= +go.opentelemetry.io/collector v0.66.1-0.20221202005155-1c54042beb70 h1:INB2CsOtqqrija2KvMuIpbBQ3qX1BECEeR+d0NJX+oM= +go.opentelemetry.io/collector v0.66.1-0.20221202005155-1c54042beb70/go.mod h1:d0NHkHyANJy3HDTvYE/PoylMShUmFIbiir89ieI0X0c= +go.opentelemetry.io/collector/component v0.66.1-0.20221202005155-1c54042beb70 h1:dEoJhzCmRShgmVro/kXm6pouGElgxkH2DsvanzCeZtU= +go.opentelemetry.io/collector/component v0.66.1-0.20221202005155-1c54042beb70/go.mod h1:OsVnvFFe38QSpcuZlQ8cvarDzcloCexgQ1/B2m80F6U= +go.opentelemetry.io/collector/confmap v0.0.0-20221201172708-2bdff61fa52a h1:2TscCXAQASO2kU9xHcMIUM/FP29fiQIRTilZmliq/7I= +go.opentelemetry.io/collector/confmap v0.0.0-20221201172708-2bdff61fa52a/go.mod h1:qJ3e8bA8h4wz/jYlbeEUafVHdrU7DkpStnmIUAz6VTQ= +go.opentelemetry.io/collector/consumer v0.66.1-0.20221202005155-1c54042beb70 h1:XwpVjI1KeKGPXOZBLefGILMziPYuNf6IzbmiIEsIyI0= +go.opentelemetry.io/collector/consumer v0.66.1-0.20221202005155-1c54042beb70/go.mod h1:EWVBcSGcIcmeDGTnIboc/aqa3agsBeH8/q7yFWG7xVc= +go.opentelemetry.io/collector/featuregate v0.66.1-0.20221202005155-1c54042beb70 h1:V0tf4ebciqIs07jFATfLGdUpLRaEsi+AiWuA/in0G8Y= +go.opentelemetry.io/collector/featuregate v0.66.1-0.20221202005155-1c54042beb70/go.mod h1:tewuFKJYalWBU0bmNKg++MC1ipINXUr6szYzOw2p1GI= +go.opentelemetry.io/collector/pdata v0.66.1-0.20221202005155-1c54042beb70 h1:TPOrxkEMvZzfBSwF3ct+kUUgKA5g8unkZZbKQvJweeA= +go.opentelemetry.io/collector/pdata v0.66.1-0.20221202005155-1c54042beb70/go.mod h1:pqyaznLzk21m+1KL6fwOsRryRELL+zNM0qiVSn0MbVc= 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= @@ -313,8 +315,8 @@ go.uber.org/multierr v1.6.0/go.mod h1:cdWPpRnG4AhwMwsgIHip0KRBQjJy5kYEpYjJxpXp9i go.uber.org/multierr v1.8.0 h1:dg6GjLku4EH+249NNmoIciG9N/jURbDG+pFlTkhzIC8= go.uber.org/multierr v1.8.0/go.mod h1:7EAYxJLBy9rStEaz58O2t4Uvip6FSURkq8/ppBp95ak= go.uber.org/zap v1.17.0/go.mod h1:MXVU+bhUf/A7Xi2HNOnopQOrmycQ5Ih87HtOu4q5SSo= -go.uber.org/zap v1.23.0 h1:OjGQ5KQDEUawVHxNwQgPpiypGHOxo2mNZsOqTak4fFY= -go.uber.org/zap v1.23.0/go.mod h1:D+nX8jyLsMHMYrln8A0rJjFt/T/9/bGgIhAqxv5URuY= +go.uber.org/zap v1.24.0 h1:FiJd5l1UOLj0wCgbSE0rwwXHzEdAZS6hiiSnxJN/D60= +go.uber.org/zap v1.24.0/go.mod h1:2kMP+WWQ8aoFoedH3T2sq6iJ2yDWpHbP0f6MQbS9Gkg= golang.org/x/crypto v0.0.0-20180904163835-0709b304e793/go.mod h1:6SG95UA2DQfeDnfUPMdvaQW0Q7yPrPDi9nlGo2tz2b4= golang.org/x/crypto v0.0.0-20190308221718-c2843e01d9a2/go.mod h1:djNgcEr1/C05ACkg1iLfiJU5Ep61QUkGW8qpdssI0+w= golang.org/x/crypto v0.0.0-20190923035154-9ee001bba392/go.mod h1:/lpIB1dKB+9EgE3H3cr1v9wB50oz8l4C4h62xy7jSTY= diff --git a/exporter/elasticsearchexporter/go.mod b/exporter/elasticsearchexporter/go.mod index 7ed886c209bc..fe38436f900e 100644 --- a/exporter/elasticsearchexporter/go.mod +++ b/exporter/elasticsearchexporter/go.mod @@ -9,12 +9,13 @@ require ( github.com/open-telemetry/opentelemetry-collector-contrib/internal/common v0.66.0 github.com/open-telemetry/opentelemetry-collector-contrib/internal/coreinternal v0.66.0 github.com/stretchr/testify v1.8.1 - go.opentelemetry.io/collector v0.66.1-0.20221128222955-4ff1ff379b90 - go.opentelemetry.io/collector/component v0.66.1-0.20221128222955-4ff1ff379b90 - go.opentelemetry.io/collector/pdata v0.66.1-0.20221128222955-4ff1ff379b90 + go.opentelemetry.io/collector v0.66.1-0.20221202005155-1c54042beb70 + go.opentelemetry.io/collector/component v0.66.1-0.20221202005155-1c54042beb70 + go.opentelemetry.io/collector/confmap v0.0.0-20221201172708-2bdff61fa52a + go.opentelemetry.io/collector/pdata v0.66.1-0.20221202005155-1c54042beb70 go.uber.org/atomic v1.10.0 go.uber.org/multierr v1.8.0 - go.uber.org/zap v1.23.0 + go.uber.org/zap v1.24.0 ) require ( @@ -33,8 +34,8 @@ require ( github.com/pmezard/go-difflib v1.0.0 // indirect github.com/rogpeppe/go-internal v1.8.1 // indirect go.opencensus.io v0.24.0 // indirect - go.opentelemetry.io/collector/consumer v0.66.1-0.20221128222955-4ff1ff379b90 // indirect - go.opentelemetry.io/collector/featuregate v0.66.1-0.20221128222955-4ff1ff379b90 // indirect + go.opentelemetry.io/collector/consumer v0.66.1-0.20221202005155-1c54042beb70 // indirect + go.opentelemetry.io/collector/featuregate v0.66.1-0.20221202005155-1c54042beb70 // 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 621bc7ad7671..6a68aef23894 100644 --- a/exporter/elasticsearchexporter/go.sum +++ b/exporter/elasticsearchexporter/go.sum @@ -281,16 +281,18 @@ go.etcd.io/etcd/client/pkg/v3 v3.5.4/go.mod h1:IJHfcCEKxYu1Os13ZdwCwIUTUVGYTSAM3 go.etcd.io/etcd/client/v3 v3.5.4/go.mod h1:ZaRkVgBZC+L+dLCjTcF1hRXpgZXQPOvnA/Ak/gq3kiY= go.opencensus.io v0.24.0 h1:y73uSU6J157QMP2kn2r30vwW1A2W2WFwSCGnAVxeaD0= go.opencensus.io v0.24.0/go.mod h1:vNK8G9p7aAivkbmorf4v+7Hgx+Zs0yY+0fOtgBfjQKo= -go.opentelemetry.io/collector v0.66.1-0.20221128222955-4ff1ff379b90 h1:yRe05/jMdzH4TFHfndZ5h2o2hKBK/79W72j8w51qNsI= -go.opentelemetry.io/collector v0.66.1-0.20221128222955-4ff1ff379b90/go.mod h1:hE6jCs+0rfiufCrVPucKZTMwfHit1okfDPnwPT2eW1I= -go.opentelemetry.io/collector/component v0.66.1-0.20221128222955-4ff1ff379b90 h1:AYSNTXbezhNg43EuYdVVcgxE/2gBVrm00FDx4DOmQVg= -go.opentelemetry.io/collector/component v0.66.1-0.20221128222955-4ff1ff379b90/go.mod h1:0c84EqXUhvYe6KW7hJfh76tiI/5yjWCH2amwyQ06XLM= -go.opentelemetry.io/collector/consumer v0.66.1-0.20221128222955-4ff1ff379b90 h1:nzNXVfC1FzXBXCLMzbMv+qK3E4EGiNsnMhfVsBd2yzc= -go.opentelemetry.io/collector/consumer v0.66.1-0.20221128222955-4ff1ff379b90/go.mod h1:WtoRZa5SnxQO1ZEQdVxYpFcXCmq62rakv0oUSlPO0NQ= -go.opentelemetry.io/collector/featuregate v0.66.1-0.20221128222955-4ff1ff379b90 h1:UuJSFWbi9XxyNZsJKZuvpWg35BgRbcCGFH+38V2MAdw= -go.opentelemetry.io/collector/featuregate v0.66.1-0.20221128222955-4ff1ff379b90/go.mod h1:tewuFKJYalWBU0bmNKg++MC1ipINXUr6szYzOw2p1GI= -go.opentelemetry.io/collector/pdata v0.66.1-0.20221128222955-4ff1ff379b90 h1:Vu4S4jSNcd0VFPzxQNO4+UqGwnes1xJDoFLPRiWHm8I= -go.opentelemetry.io/collector/pdata v0.66.1-0.20221128222955-4ff1ff379b90/go.mod h1:pqyaznLzk21m+1KL6fwOsRryRELL+zNM0qiVSn0MbVc= +go.opentelemetry.io/collector v0.66.1-0.20221202005155-1c54042beb70 h1:INB2CsOtqqrija2KvMuIpbBQ3qX1BECEeR+d0NJX+oM= +go.opentelemetry.io/collector v0.66.1-0.20221202005155-1c54042beb70/go.mod h1:d0NHkHyANJy3HDTvYE/PoylMShUmFIbiir89ieI0X0c= +go.opentelemetry.io/collector/component v0.66.1-0.20221202005155-1c54042beb70 h1:dEoJhzCmRShgmVro/kXm6pouGElgxkH2DsvanzCeZtU= +go.opentelemetry.io/collector/component v0.66.1-0.20221202005155-1c54042beb70/go.mod h1:OsVnvFFe38QSpcuZlQ8cvarDzcloCexgQ1/B2m80F6U= +go.opentelemetry.io/collector/confmap v0.0.0-20221201172708-2bdff61fa52a h1:2TscCXAQASO2kU9xHcMIUM/FP29fiQIRTilZmliq/7I= +go.opentelemetry.io/collector/confmap v0.0.0-20221201172708-2bdff61fa52a/go.mod h1:qJ3e8bA8h4wz/jYlbeEUafVHdrU7DkpStnmIUAz6VTQ= +go.opentelemetry.io/collector/consumer v0.66.1-0.20221202005155-1c54042beb70 h1:XwpVjI1KeKGPXOZBLefGILMziPYuNf6IzbmiIEsIyI0= +go.opentelemetry.io/collector/consumer v0.66.1-0.20221202005155-1c54042beb70/go.mod h1:EWVBcSGcIcmeDGTnIboc/aqa3agsBeH8/q7yFWG7xVc= +go.opentelemetry.io/collector/featuregate v0.66.1-0.20221202005155-1c54042beb70 h1:V0tf4ebciqIs07jFATfLGdUpLRaEsi+AiWuA/in0G8Y= +go.opentelemetry.io/collector/featuregate v0.66.1-0.20221202005155-1c54042beb70/go.mod h1:tewuFKJYalWBU0bmNKg++MC1ipINXUr6szYzOw2p1GI= +go.opentelemetry.io/collector/pdata v0.66.1-0.20221202005155-1c54042beb70 h1:TPOrxkEMvZzfBSwF3ct+kUUgKA5g8unkZZbKQvJweeA= +go.opentelemetry.io/collector/pdata v0.66.1-0.20221202005155-1c54042beb70/go.mod h1:pqyaznLzk21m+1KL6fwOsRryRELL+zNM0qiVSn0MbVc= 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= @@ -308,8 +310,8 @@ go.uber.org/multierr v1.6.0/go.mod h1:cdWPpRnG4AhwMwsgIHip0KRBQjJy5kYEpYjJxpXp9i go.uber.org/multierr v1.8.0 h1:dg6GjLku4EH+249NNmoIciG9N/jURbDG+pFlTkhzIC8= go.uber.org/multierr v1.8.0/go.mod h1:7EAYxJLBy9rStEaz58O2t4Uvip6FSURkq8/ppBp95ak= go.uber.org/zap v1.17.0/go.mod h1:MXVU+bhUf/A7Xi2HNOnopQOrmycQ5Ih87HtOu4q5SSo= -go.uber.org/zap v1.23.0 h1:OjGQ5KQDEUawVHxNwQgPpiypGHOxo2mNZsOqTak4fFY= -go.uber.org/zap v1.23.0/go.mod h1:D+nX8jyLsMHMYrln8A0rJjFt/T/9/bGgIhAqxv5URuY= +go.uber.org/zap v1.24.0 h1:FiJd5l1UOLj0wCgbSE0rwwXHzEdAZS6hiiSnxJN/D60= +go.uber.org/zap v1.24.0/go.mod h1:2kMP+WWQ8aoFoedH3T2sq6iJ2yDWpHbP0f6MQbS9Gkg= golang.org/x/crypto v0.0.0-20180904163835-0709b304e793/go.mod h1:6SG95UA2DQfeDnfUPMdvaQW0Q7yPrPDi9nlGo2tz2b4= golang.org/x/crypto v0.0.0-20190308221718-c2843e01d9a2/go.mod h1:djNgcEr1/C05ACkg1iLfiJU5Ep61QUkGW8qpdssI0+w= golang.org/x/crypto v0.0.0-20190923035154-9ee001bba392/go.mod h1:/lpIB1dKB+9EgE3H3cr1v9wB50oz8l4C4h62xy7jSTY= diff --git a/exporter/f5cloudexporter/go.mod b/exporter/f5cloudexporter/go.mod index ba17ea6aadda..ca82796beaaf 100644 --- a/exporter/f5cloudexporter/go.mod +++ b/exporter/f5cloudexporter/go.mod @@ -5,9 +5,10 @@ go 1.18 require ( github.com/open-telemetry/opentelemetry-collector-contrib/internal/common v0.66.0 github.com/stretchr/testify v1.8.1 - go.opentelemetry.io/collector v0.66.1-0.20221128222955-4ff1ff379b90 - go.opentelemetry.io/collector/component v0.66.1-0.20221128222955-4ff1ff379b90 - go.opentelemetry.io/collector/exporter/otlphttpexporter v0.66.1-0.20221128222955-4ff1ff379b90 + go.opentelemetry.io/collector v0.66.1-0.20221202005155-1c54042beb70 + go.opentelemetry.io/collector/component v0.66.1-0.20221202005155-1c54042beb70 + go.opentelemetry.io/collector/confmap v0.0.0-20221201172708-2bdff61fa52a + go.opentelemetry.io/collector/exporter/otlphttpexporter v0.66.1-0.20221202005155-1c54042beb70 golang.org/x/oauth2 v0.0.0-20221014153046-6fdb5e3db783 google.golang.org/api v0.103.0 ) @@ -40,16 +41,16 @@ require ( github.com/rogpeppe/go-internal v1.8.1 // indirect github.com/rs/cors v1.8.2 // indirect go.opencensus.io v0.24.0 // indirect - go.opentelemetry.io/collector/consumer v0.66.1-0.20221128222955-4ff1ff379b90 // indirect - go.opentelemetry.io/collector/featuregate v0.66.1-0.20221128222955-4ff1ff379b90 // indirect - go.opentelemetry.io/collector/pdata v0.66.1-0.20221128222955-4ff1ff379b90 // indirect + go.opentelemetry.io/collector/consumer v0.66.1-0.20221202005155-1c54042beb70 // indirect + go.opentelemetry.io/collector/featuregate v0.66.1-0.20221202005155-1c54042beb70 // indirect + go.opentelemetry.io/collector/pdata v0.66.1-0.20221202005155-1c54042beb70 // 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 go.opentelemetry.io/otel/trace v1.11.1 // indirect go.uber.org/atomic v1.10.0 // indirect go.uber.org/multierr v1.8.0 // indirect - go.uber.org/zap v1.23.0 // indirect + go.uber.org/zap v1.24.0 // indirect golang.org/x/net v0.0.0-20221014081412-f15817d10f9b // indirect golang.org/x/sys v0.2.0 // indirect golang.org/x/text v0.4.0 // indirect diff --git a/exporter/f5cloudexporter/go.sum b/exporter/f5cloudexporter/go.sum index bebf7ab86e62..6902c675f90e 100644 --- a/exporter/f5cloudexporter/go.sum +++ b/exporter/f5cloudexporter/go.sum @@ -299,19 +299,21 @@ go.etcd.io/etcd/client/pkg/v3 v3.5.4/go.mod h1:IJHfcCEKxYu1Os13ZdwCwIUTUVGYTSAM3 go.etcd.io/etcd/client/v3 v3.5.4/go.mod h1:ZaRkVgBZC+L+dLCjTcF1hRXpgZXQPOvnA/Ak/gq3kiY= go.opencensus.io v0.24.0 h1:y73uSU6J157QMP2kn2r30vwW1A2W2WFwSCGnAVxeaD0= go.opencensus.io v0.24.0/go.mod h1:vNK8G9p7aAivkbmorf4v+7Hgx+Zs0yY+0fOtgBfjQKo= -go.opentelemetry.io/collector v0.66.1-0.20221128222955-4ff1ff379b90 h1:yRe05/jMdzH4TFHfndZ5h2o2hKBK/79W72j8w51qNsI= -go.opentelemetry.io/collector v0.66.1-0.20221128222955-4ff1ff379b90/go.mod h1:hE6jCs+0rfiufCrVPucKZTMwfHit1okfDPnwPT2eW1I= -go.opentelemetry.io/collector/component v0.66.1-0.20221128222955-4ff1ff379b90 h1:AYSNTXbezhNg43EuYdVVcgxE/2gBVrm00FDx4DOmQVg= -go.opentelemetry.io/collector/component v0.66.1-0.20221128222955-4ff1ff379b90/go.mod h1:0c84EqXUhvYe6KW7hJfh76tiI/5yjWCH2amwyQ06XLM= -go.opentelemetry.io/collector/consumer v0.66.1-0.20221128222955-4ff1ff379b90 h1:nzNXVfC1FzXBXCLMzbMv+qK3E4EGiNsnMhfVsBd2yzc= -go.opentelemetry.io/collector/consumer v0.66.1-0.20221128222955-4ff1ff379b90/go.mod h1:WtoRZa5SnxQO1ZEQdVxYpFcXCmq62rakv0oUSlPO0NQ= -go.opentelemetry.io/collector/exporter/otlphttpexporter v0.66.1-0.20221128222955-4ff1ff379b90 h1:KkI/to7/yvuL5zHzhviy7UXMZVZ7jbfnk+YCAwCiimA= -go.opentelemetry.io/collector/exporter/otlphttpexporter v0.66.1-0.20221128222955-4ff1ff379b90/go.mod h1:Gx9WIGE9pUv38Sm8IN0IPM7k+mX2hHGfRZI/65pOSIc= -go.opentelemetry.io/collector/featuregate v0.66.1-0.20221128222955-4ff1ff379b90 h1:UuJSFWbi9XxyNZsJKZuvpWg35BgRbcCGFH+38V2MAdw= -go.opentelemetry.io/collector/featuregate v0.66.1-0.20221128222955-4ff1ff379b90/go.mod h1:tewuFKJYalWBU0bmNKg++MC1ipINXUr6szYzOw2p1GI= -go.opentelemetry.io/collector/pdata v0.66.1-0.20221128222955-4ff1ff379b90 h1:Vu4S4jSNcd0VFPzxQNO4+UqGwnes1xJDoFLPRiWHm8I= -go.opentelemetry.io/collector/pdata v0.66.1-0.20221128222955-4ff1ff379b90/go.mod h1:pqyaznLzk21m+1KL6fwOsRryRELL+zNM0qiVSn0MbVc= -go.opentelemetry.io/collector/receiver/otlpreceiver v0.65.0 h1:XIfbhgAORTpq20LPtSZer1Y5/7b80nYXaAGa0rVaUxY= +go.opentelemetry.io/collector v0.66.1-0.20221202005155-1c54042beb70 h1:INB2CsOtqqrija2KvMuIpbBQ3qX1BECEeR+d0NJX+oM= +go.opentelemetry.io/collector v0.66.1-0.20221202005155-1c54042beb70/go.mod h1:d0NHkHyANJy3HDTvYE/PoylMShUmFIbiir89ieI0X0c= +go.opentelemetry.io/collector/component v0.66.1-0.20221202005155-1c54042beb70 h1:dEoJhzCmRShgmVro/kXm6pouGElgxkH2DsvanzCeZtU= +go.opentelemetry.io/collector/component v0.66.1-0.20221202005155-1c54042beb70/go.mod h1:OsVnvFFe38QSpcuZlQ8cvarDzcloCexgQ1/B2m80F6U= +go.opentelemetry.io/collector/confmap v0.0.0-20221201172708-2bdff61fa52a h1:2TscCXAQASO2kU9xHcMIUM/FP29fiQIRTilZmliq/7I= +go.opentelemetry.io/collector/confmap v0.0.0-20221201172708-2bdff61fa52a/go.mod h1:qJ3e8bA8h4wz/jYlbeEUafVHdrU7DkpStnmIUAz6VTQ= +go.opentelemetry.io/collector/consumer v0.66.1-0.20221202005155-1c54042beb70 h1:XwpVjI1KeKGPXOZBLefGILMziPYuNf6IzbmiIEsIyI0= +go.opentelemetry.io/collector/consumer v0.66.1-0.20221202005155-1c54042beb70/go.mod h1:EWVBcSGcIcmeDGTnIboc/aqa3agsBeH8/q7yFWG7xVc= +go.opentelemetry.io/collector/exporter/otlphttpexporter v0.66.1-0.20221202005155-1c54042beb70 h1:7rDNCZS1qfqZxnCLaBWItnX/TweYKC6NyULpelzXl4g= +go.opentelemetry.io/collector/exporter/otlphttpexporter v0.66.1-0.20221202005155-1c54042beb70/go.mod h1:vkFlRP0DDfDfSDVl96Gvy5Ah8L8sMcVAxMZn+0af2ew= +go.opentelemetry.io/collector/featuregate v0.66.1-0.20221202005155-1c54042beb70 h1:V0tf4ebciqIs07jFATfLGdUpLRaEsi+AiWuA/in0G8Y= +go.opentelemetry.io/collector/featuregate v0.66.1-0.20221202005155-1c54042beb70/go.mod h1:tewuFKJYalWBU0bmNKg++MC1ipINXUr6szYzOw2p1GI= +go.opentelemetry.io/collector/pdata v0.66.1-0.20221202005155-1c54042beb70 h1:TPOrxkEMvZzfBSwF3ct+kUUgKA5g8unkZZbKQvJweeA= +go.opentelemetry.io/collector/pdata v0.66.1-0.20221202005155-1c54042beb70/go.mod h1:pqyaznLzk21m+1KL6fwOsRryRELL+zNM0qiVSn0MbVc= +go.opentelemetry.io/collector/receiver/otlpreceiver v0.66.0 h1:ZHEOeGOIYIDTKhI9xs30/obFfhUbb9b2+e/eahp1fJA= 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= @@ -332,8 +334,8 @@ go.uber.org/multierr v1.6.0/go.mod h1:cdWPpRnG4AhwMwsgIHip0KRBQjJy5kYEpYjJxpXp9i go.uber.org/multierr v1.8.0 h1:dg6GjLku4EH+249NNmoIciG9N/jURbDG+pFlTkhzIC8= go.uber.org/multierr v1.8.0/go.mod h1:7EAYxJLBy9rStEaz58O2t4Uvip6FSURkq8/ppBp95ak= go.uber.org/zap v1.17.0/go.mod h1:MXVU+bhUf/A7Xi2HNOnopQOrmycQ5Ih87HtOu4q5SSo= -go.uber.org/zap v1.23.0 h1:OjGQ5KQDEUawVHxNwQgPpiypGHOxo2mNZsOqTak4fFY= -go.uber.org/zap v1.23.0/go.mod h1:D+nX8jyLsMHMYrln8A0rJjFt/T/9/bGgIhAqxv5URuY= +go.uber.org/zap v1.24.0 h1:FiJd5l1UOLj0wCgbSE0rwwXHzEdAZS6hiiSnxJN/D60= +go.uber.org/zap v1.24.0/go.mod h1:2kMP+WWQ8aoFoedH3T2sq6iJ2yDWpHbP0f6MQbS9Gkg= golang.org/x/crypto v0.0.0-20180904163835-0709b304e793/go.mod h1:6SG95UA2DQfeDnfUPMdvaQW0Q7yPrPDi9nlGo2tz2b4= golang.org/x/crypto v0.0.0-20190308221718-c2843e01d9a2/go.mod h1:djNgcEr1/C05ACkg1iLfiJU5Ep61QUkGW8qpdssI0+w= golang.org/x/crypto v0.0.0-20190923035154-9ee001bba392/go.mod h1:/lpIB1dKB+9EgE3H3cr1v9wB50oz8l4C4h62xy7jSTY= diff --git a/exporter/fileexporter/go.mod b/exporter/fileexporter/go.mod index 33a26884dd21..ee3fb1b71550 100644 --- a/exporter/fileexporter/go.mod +++ b/exporter/fileexporter/go.mod @@ -7,10 +7,11 @@ require ( github.com/open-telemetry/opentelemetry-collector-contrib/internal/coreinternal v0.66.0 github.com/open-telemetry/opentelemetry-collector-contrib/internal/sharedcomponent v0.66.0 github.com/stretchr/testify v1.8.1 - go.opentelemetry.io/collector v0.66.1-0.20221128222955-4ff1ff379b90 - go.opentelemetry.io/collector/component v0.66.1-0.20221128222955-4ff1ff379b90 - go.opentelemetry.io/collector/consumer v0.66.1-0.20221128222955-4ff1ff379b90 - go.opentelemetry.io/collector/pdata v0.66.1-0.20221128222955-4ff1ff379b90 + go.opentelemetry.io/collector v0.66.1-0.20221202005155-1c54042beb70 + go.opentelemetry.io/collector/component v0.66.1-0.20221202005155-1c54042beb70 + go.opentelemetry.io/collector/confmap v0.0.0-20221201172708-2bdff61fa52a + go.opentelemetry.io/collector/consumer v0.66.1-0.20221202005155-1c54042beb70 + go.opentelemetry.io/collector/pdata v0.66.1-0.20221202005155-1c54042beb70 gopkg.in/natefinch/lumberjack.v2 v2.0.0 ) @@ -29,13 +30,13 @@ require ( github.com/pmezard/go-difflib v1.0.0 // indirect github.com/rogpeppe/go-internal v1.8.0 // indirect go.opencensus.io v0.24.0 // indirect - go.opentelemetry.io/collector/featuregate v0.66.1-0.20221128222955-4ff1ff379b90 // indirect + go.opentelemetry.io/collector/featuregate v0.66.1-0.20221202005155-1c54042beb70 // 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 go.uber.org/atomic v1.10.0 // indirect go.uber.org/multierr v1.8.0 // indirect - go.uber.org/zap v1.23.0 // indirect + go.uber.org/zap v1.24.0 // indirect golang.org/x/net v0.0.0-20220722155237-a158d28d115b // indirect golang.org/x/sys v0.2.0 // indirect golang.org/x/text v0.4.0 // indirect diff --git a/exporter/fileexporter/go.sum b/exporter/fileexporter/go.sum index b401b5c4290d..27f5353f4199 100644 --- a/exporter/fileexporter/go.sum +++ b/exporter/fileexporter/go.sum @@ -277,16 +277,18 @@ go.etcd.io/etcd/client/pkg/v3 v3.5.4/go.mod h1:IJHfcCEKxYu1Os13ZdwCwIUTUVGYTSAM3 go.etcd.io/etcd/client/v3 v3.5.4/go.mod h1:ZaRkVgBZC+L+dLCjTcF1hRXpgZXQPOvnA/Ak/gq3kiY= go.opencensus.io v0.24.0 h1:y73uSU6J157QMP2kn2r30vwW1A2W2WFwSCGnAVxeaD0= go.opencensus.io v0.24.0/go.mod h1:vNK8G9p7aAivkbmorf4v+7Hgx+Zs0yY+0fOtgBfjQKo= -go.opentelemetry.io/collector v0.66.1-0.20221128222955-4ff1ff379b90 h1:yRe05/jMdzH4TFHfndZ5h2o2hKBK/79W72j8w51qNsI= -go.opentelemetry.io/collector v0.66.1-0.20221128222955-4ff1ff379b90/go.mod h1:hE6jCs+0rfiufCrVPucKZTMwfHit1okfDPnwPT2eW1I= -go.opentelemetry.io/collector/component v0.66.1-0.20221128222955-4ff1ff379b90 h1:AYSNTXbezhNg43EuYdVVcgxE/2gBVrm00FDx4DOmQVg= -go.opentelemetry.io/collector/component v0.66.1-0.20221128222955-4ff1ff379b90/go.mod h1:0c84EqXUhvYe6KW7hJfh76tiI/5yjWCH2amwyQ06XLM= -go.opentelemetry.io/collector/consumer v0.66.1-0.20221128222955-4ff1ff379b90 h1:nzNXVfC1FzXBXCLMzbMv+qK3E4EGiNsnMhfVsBd2yzc= -go.opentelemetry.io/collector/consumer v0.66.1-0.20221128222955-4ff1ff379b90/go.mod h1:WtoRZa5SnxQO1ZEQdVxYpFcXCmq62rakv0oUSlPO0NQ= -go.opentelemetry.io/collector/featuregate v0.66.1-0.20221128222955-4ff1ff379b90 h1:UuJSFWbi9XxyNZsJKZuvpWg35BgRbcCGFH+38V2MAdw= -go.opentelemetry.io/collector/featuregate v0.66.1-0.20221128222955-4ff1ff379b90/go.mod h1:tewuFKJYalWBU0bmNKg++MC1ipINXUr6szYzOw2p1GI= -go.opentelemetry.io/collector/pdata v0.66.1-0.20221128222955-4ff1ff379b90 h1:Vu4S4jSNcd0VFPzxQNO4+UqGwnes1xJDoFLPRiWHm8I= -go.opentelemetry.io/collector/pdata v0.66.1-0.20221128222955-4ff1ff379b90/go.mod h1:pqyaznLzk21m+1KL6fwOsRryRELL+zNM0qiVSn0MbVc= +go.opentelemetry.io/collector v0.66.1-0.20221202005155-1c54042beb70 h1:INB2CsOtqqrija2KvMuIpbBQ3qX1BECEeR+d0NJX+oM= +go.opentelemetry.io/collector v0.66.1-0.20221202005155-1c54042beb70/go.mod h1:d0NHkHyANJy3HDTvYE/PoylMShUmFIbiir89ieI0X0c= +go.opentelemetry.io/collector/component v0.66.1-0.20221202005155-1c54042beb70 h1:dEoJhzCmRShgmVro/kXm6pouGElgxkH2DsvanzCeZtU= +go.opentelemetry.io/collector/component v0.66.1-0.20221202005155-1c54042beb70/go.mod h1:OsVnvFFe38QSpcuZlQ8cvarDzcloCexgQ1/B2m80F6U= +go.opentelemetry.io/collector/confmap v0.0.0-20221201172708-2bdff61fa52a h1:2TscCXAQASO2kU9xHcMIUM/FP29fiQIRTilZmliq/7I= +go.opentelemetry.io/collector/confmap v0.0.0-20221201172708-2bdff61fa52a/go.mod h1:qJ3e8bA8h4wz/jYlbeEUafVHdrU7DkpStnmIUAz6VTQ= +go.opentelemetry.io/collector/consumer v0.66.1-0.20221202005155-1c54042beb70 h1:XwpVjI1KeKGPXOZBLefGILMziPYuNf6IzbmiIEsIyI0= +go.opentelemetry.io/collector/consumer v0.66.1-0.20221202005155-1c54042beb70/go.mod h1:EWVBcSGcIcmeDGTnIboc/aqa3agsBeH8/q7yFWG7xVc= +go.opentelemetry.io/collector/featuregate v0.66.1-0.20221202005155-1c54042beb70 h1:V0tf4ebciqIs07jFATfLGdUpLRaEsi+AiWuA/in0G8Y= +go.opentelemetry.io/collector/featuregate v0.66.1-0.20221202005155-1c54042beb70/go.mod h1:tewuFKJYalWBU0bmNKg++MC1ipINXUr6szYzOw2p1GI= +go.opentelemetry.io/collector/pdata v0.66.1-0.20221202005155-1c54042beb70 h1:TPOrxkEMvZzfBSwF3ct+kUUgKA5g8unkZZbKQvJweeA= +go.opentelemetry.io/collector/pdata v0.66.1-0.20221202005155-1c54042beb70/go.mod h1:pqyaznLzk21m+1KL6fwOsRryRELL+zNM0qiVSn0MbVc= 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= @@ -304,8 +306,8 @@ go.uber.org/multierr v1.6.0/go.mod h1:cdWPpRnG4AhwMwsgIHip0KRBQjJy5kYEpYjJxpXp9i go.uber.org/multierr v1.8.0 h1:dg6GjLku4EH+249NNmoIciG9N/jURbDG+pFlTkhzIC8= go.uber.org/multierr v1.8.0/go.mod h1:7EAYxJLBy9rStEaz58O2t4Uvip6FSURkq8/ppBp95ak= go.uber.org/zap v1.17.0/go.mod h1:MXVU+bhUf/A7Xi2HNOnopQOrmycQ5Ih87HtOu4q5SSo= -go.uber.org/zap v1.23.0 h1:OjGQ5KQDEUawVHxNwQgPpiypGHOxo2mNZsOqTak4fFY= -go.uber.org/zap v1.23.0/go.mod h1:D+nX8jyLsMHMYrln8A0rJjFt/T/9/bGgIhAqxv5URuY= +go.uber.org/zap v1.24.0 h1:FiJd5l1UOLj0wCgbSE0rwwXHzEdAZS6hiiSnxJN/D60= +go.uber.org/zap v1.24.0/go.mod h1:2kMP+WWQ8aoFoedH3T2sq6iJ2yDWpHbP0f6MQbS9Gkg= golang.org/x/crypto v0.0.0-20180904163835-0709b304e793/go.mod h1:6SG95UA2DQfeDnfUPMdvaQW0Q7yPrPDi9nlGo2tz2b4= golang.org/x/crypto v0.0.0-20190308221718-c2843e01d9a2/go.mod h1:djNgcEr1/C05ACkg1iLfiJU5Ep61QUkGW8qpdssI0+w= golang.org/x/crypto v0.0.0-20190923035154-9ee001bba392/go.mod h1:/lpIB1dKB+9EgE3H3cr1v9wB50oz8l4C4h62xy7jSTY= diff --git a/exporter/googlecloudexporter/go.mod b/exporter/googlecloudexporter/go.mod index e0116b68db10..fc62eb5d67b5 100644 --- a/exporter/googlecloudexporter/go.mod +++ b/exporter/googlecloudexporter/go.mod @@ -11,11 +11,12 @@ require ( github.com/open-telemetry/opentelemetry-collector-contrib/pkg/translator/opencensus v0.66.0 github.com/stretchr/testify v1.8.1 go.opencensus.io v0.24.0 - go.opentelemetry.io/collector v0.66.1-0.20221128222955-4ff1ff379b90 - go.opentelemetry.io/collector/component v0.66.1-0.20221128222955-4ff1ff379b90 - go.opentelemetry.io/collector/featuregate v0.66.1-0.20221128222955-4ff1ff379b90 - go.opentelemetry.io/collector/pdata v0.66.1-0.20221128222955-4ff1ff379b90 - go.opentelemetry.io/collector/semconv v0.66.1-0.20221128222955-4ff1ff379b90 + go.opentelemetry.io/collector v0.66.1-0.20221202005155-1c54042beb70 + go.opentelemetry.io/collector/component v0.66.1-0.20221202005155-1c54042beb70 + go.opentelemetry.io/collector/confmap v0.0.0-20221201172708-2bdff61fa52a + go.opentelemetry.io/collector/featuregate v0.66.1-0.20221202005155-1c54042beb70 + go.opentelemetry.io/collector/pdata v0.66.1-0.20221202005155-1c54042beb70 + go.opentelemetry.io/collector/semconv v0.66.1-0.20221202005155-1c54042beb70 google.golang.org/api v0.103.0 google.golang.org/genproto v0.0.0-20221027153422-115e99e71e1c google.golang.org/grpc v1.51.0 @@ -72,11 +73,11 @@ require ( github.com/shirou/gopsutil/v3 v3.22.10 // indirect github.com/spf13/cobra v1.6.1 // indirect github.com/spf13/pflag v1.0.5 // indirect - github.com/tklauser/go-sysconf v0.3.10 // indirect - github.com/tklauser/numcpus v0.4.0 // indirect + github.com/tklauser/go-sysconf v0.3.11 // indirect + github.com/tklauser/numcpus v0.6.0 // indirect github.com/yusufpapurcu/wmi v1.2.2 // indirect - go.opentelemetry.io/collector/consumer v0.66.1-0.20221128222955-4ff1ff379b90 // indirect - go.opentelemetry.io/collector/processor/batchprocessor v0.66.1-0.20221128222955-4ff1ff379b90 // indirect + go.opentelemetry.io/collector/consumer v0.66.1-0.20221202005155-1c54042beb70 // indirect + go.opentelemetry.io/collector/processor/batchprocessor v0.66.1-0.20221202005155-1c54042beb70 // 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 @@ -86,7 +87,7 @@ require ( go.opentelemetry.io/otel/trace v1.11.1 // indirect go.uber.org/atomic v1.10.0 // indirect go.uber.org/multierr v1.8.0 // indirect - go.uber.org/zap v1.23.0 // indirect + go.uber.org/zap v1.24.0 // indirect golang.org/x/net v0.1.0 // indirect golang.org/x/oauth2 v0.1.0 // indirect golang.org/x/sync v0.1.0 // indirect diff --git a/exporter/googlecloudexporter/go.sum b/exporter/googlecloudexporter/go.sum index 187ebdf30c9f..0ad30ebf7a8b 100644 --- a/exporter/googlecloudexporter/go.sum +++ b/exporter/googlecloudexporter/go.sum @@ -473,10 +473,12 @@ github.com/stretchr/testify v1.8.0/go.mod h1:yNjHg4UonilssWZ8iaSj1OCr/vHnekPRkoO github.com/stretchr/testify v1.8.1 h1:w7B6lhMri9wdJUVmEZPGGhZzrYTPvgJArz7wNPgYKsk= github.com/stretchr/testify v1.8.1/go.mod h1:w2LPCIKwWwSfY2zedu0+kehJoqGctiVI29o6fzry7u4= github.com/stvp/go-udp-testing v0.0.0-20201019212854-469649b16807/go.mod h1:7jxmlfBCDBXRzr0eAQJ48XC1hBu1np4CS5+cHEYfwpc= -github.com/tklauser/go-sysconf v0.3.10 h1:IJ1AZGZRWbY8T5Vfk04D9WOA5WSejdflXxP03OUqALw= github.com/tklauser/go-sysconf v0.3.10/go.mod h1:C8XykCvCb+Gn0oNCWPIlcb0RuglQTYaQ2hGm7jmxEFk= -github.com/tklauser/numcpus v0.4.0 h1:E53Dm1HjH1/R2/aoCtXtPgzmElmn51aOkhCFSuZq//o= +github.com/tklauser/go-sysconf v0.3.11 h1:89WgdJhk5SNwJfu+GKyYveZ4IaJ7xAkecBo+KdJV0CM= +github.com/tklauser/go-sysconf v0.3.11/go.mod h1:GqXfhXY3kiPa0nAXPDIQIWzJbMCB7AmcWpGR8lSZfqI= github.com/tklauser/numcpus v0.4.0/go.mod h1:1+UI3pD8NW14VMwdgJNJ1ESk2UnwhAnz5hMwiKKqXCQ= +github.com/tklauser/numcpus v0.6.0 h1:kebhY2Qt+3U6RNK7UqpYNA+tJ23IBEGKkB7JQBfDYms= +github.com/tklauser/numcpus v0.6.0/go.mod h1:FEZLMke0lhOUG6w2JadTzp0a+Nl8PF/GFkQ5UVIcaL4= github.com/yuin/goldmark v1.1.25/go.mod h1:3hX8gzYuyVAZsxl0MRgGTJEmQBFcNTphYh9decYSb74= github.com/yuin/goldmark v1.1.27/go.mod h1:3hX8gzYuyVAZsxl0MRgGTJEmQBFcNTphYh9decYSb74= github.com/yuin/goldmark v1.1.32/go.mod h1:3hX8gzYuyVAZsxl0MRgGTJEmQBFcNTphYh9decYSb74= @@ -497,21 +499,23 @@ go.opencensus.io v0.22.5/go.mod h1:5pWMHQbX5EPX2/62yrJeAkowc+lfs/XD7Uxpq3pI6kk= go.opencensus.io v0.23.0/go.mod h1:XItmlyltB5F7CS4xOC1DcqMoFqwtC6OG2xF7mCv7P7E= go.opencensus.io v0.24.0 h1:y73uSU6J157QMP2kn2r30vwW1A2W2WFwSCGnAVxeaD0= go.opencensus.io v0.24.0/go.mod h1:vNK8G9p7aAivkbmorf4v+7Hgx+Zs0yY+0fOtgBfjQKo= -go.opentelemetry.io/collector v0.66.1-0.20221128222955-4ff1ff379b90 h1:yRe05/jMdzH4TFHfndZ5h2o2hKBK/79W72j8w51qNsI= -go.opentelemetry.io/collector v0.66.1-0.20221128222955-4ff1ff379b90/go.mod h1:hE6jCs+0rfiufCrVPucKZTMwfHit1okfDPnwPT2eW1I= -go.opentelemetry.io/collector/component v0.66.1-0.20221128222955-4ff1ff379b90 h1:AYSNTXbezhNg43EuYdVVcgxE/2gBVrm00FDx4DOmQVg= -go.opentelemetry.io/collector/component v0.66.1-0.20221128222955-4ff1ff379b90/go.mod h1:0c84EqXUhvYe6KW7hJfh76tiI/5yjWCH2amwyQ06XLM= -go.opentelemetry.io/collector/consumer v0.66.1-0.20221128222955-4ff1ff379b90 h1:nzNXVfC1FzXBXCLMzbMv+qK3E4EGiNsnMhfVsBd2yzc= -go.opentelemetry.io/collector/consumer v0.66.1-0.20221128222955-4ff1ff379b90/go.mod h1:WtoRZa5SnxQO1ZEQdVxYpFcXCmq62rakv0oUSlPO0NQ= -go.opentelemetry.io/collector/extension/zpagesextension v0.65.0 h1:T5JJIJ3cmClqdSMgkbjoIiP9p059AAvbfcd3houJkxM= -go.opentelemetry.io/collector/featuregate v0.66.1-0.20221128222955-4ff1ff379b90 h1:UuJSFWbi9XxyNZsJKZuvpWg35BgRbcCGFH+38V2MAdw= -go.opentelemetry.io/collector/featuregate v0.66.1-0.20221128222955-4ff1ff379b90/go.mod h1:tewuFKJYalWBU0bmNKg++MC1ipINXUr6szYzOw2p1GI= -go.opentelemetry.io/collector/pdata v0.66.1-0.20221128222955-4ff1ff379b90 h1:Vu4S4jSNcd0VFPzxQNO4+UqGwnes1xJDoFLPRiWHm8I= -go.opentelemetry.io/collector/pdata v0.66.1-0.20221128222955-4ff1ff379b90/go.mod h1:pqyaznLzk21m+1KL6fwOsRryRELL+zNM0qiVSn0MbVc= -go.opentelemetry.io/collector/processor/batchprocessor v0.66.1-0.20221128222955-4ff1ff379b90 h1:K12L9juzjChBMfp7cQaQsToz7i7975tUYVzJ3Tpw/Cw= -go.opentelemetry.io/collector/processor/batchprocessor v0.66.1-0.20221128222955-4ff1ff379b90/go.mod h1:XhGTsC1B/bq4gpg8IZ/QYBLXkzE4Gw3r7Xu2+ik8A1Q= -go.opentelemetry.io/collector/semconv v0.66.1-0.20221128222955-4ff1ff379b90 h1:hFaTA68cggZKWMv7wQ3bKP8KGTbowh/5AQZKCHzHTqM= -go.opentelemetry.io/collector/semconv v0.66.1-0.20221128222955-4ff1ff379b90/go.mod h1:5o9yhOa+ABt7g2E5JABDxGZ1PQPbtfxrKNbYn+LOTXU= +go.opentelemetry.io/collector v0.66.1-0.20221202005155-1c54042beb70 h1:INB2CsOtqqrija2KvMuIpbBQ3qX1BECEeR+d0NJX+oM= +go.opentelemetry.io/collector v0.66.1-0.20221202005155-1c54042beb70/go.mod h1:d0NHkHyANJy3HDTvYE/PoylMShUmFIbiir89ieI0X0c= +go.opentelemetry.io/collector/component v0.66.1-0.20221202005155-1c54042beb70 h1:dEoJhzCmRShgmVro/kXm6pouGElgxkH2DsvanzCeZtU= +go.opentelemetry.io/collector/component v0.66.1-0.20221202005155-1c54042beb70/go.mod h1:OsVnvFFe38QSpcuZlQ8cvarDzcloCexgQ1/B2m80F6U= +go.opentelemetry.io/collector/confmap v0.0.0-20221201172708-2bdff61fa52a h1:2TscCXAQASO2kU9xHcMIUM/FP29fiQIRTilZmliq/7I= +go.opentelemetry.io/collector/confmap v0.0.0-20221201172708-2bdff61fa52a/go.mod h1:qJ3e8bA8h4wz/jYlbeEUafVHdrU7DkpStnmIUAz6VTQ= +go.opentelemetry.io/collector/consumer v0.66.1-0.20221202005155-1c54042beb70 h1:XwpVjI1KeKGPXOZBLefGILMziPYuNf6IzbmiIEsIyI0= +go.opentelemetry.io/collector/consumer v0.66.1-0.20221202005155-1c54042beb70/go.mod h1:EWVBcSGcIcmeDGTnIboc/aqa3agsBeH8/q7yFWG7xVc= +go.opentelemetry.io/collector/extension/zpagesextension v0.66.0 h1:tPqSKH5K3VhTT0XXVoWL3woWBSTJqnXZQRt0ZLSCoCc= +go.opentelemetry.io/collector/featuregate v0.66.1-0.20221202005155-1c54042beb70 h1:V0tf4ebciqIs07jFATfLGdUpLRaEsi+AiWuA/in0G8Y= +go.opentelemetry.io/collector/featuregate v0.66.1-0.20221202005155-1c54042beb70/go.mod h1:tewuFKJYalWBU0bmNKg++MC1ipINXUr6szYzOw2p1GI= +go.opentelemetry.io/collector/pdata v0.66.1-0.20221202005155-1c54042beb70 h1:TPOrxkEMvZzfBSwF3ct+kUUgKA5g8unkZZbKQvJweeA= +go.opentelemetry.io/collector/pdata v0.66.1-0.20221202005155-1c54042beb70/go.mod h1:pqyaznLzk21m+1KL6fwOsRryRELL+zNM0qiVSn0MbVc= +go.opentelemetry.io/collector/processor/batchprocessor v0.66.1-0.20221202005155-1c54042beb70 h1:Y4e8NnVevonnAgmjX9Z7QIMA32yMqHAOnAlh8SzTS8c= +go.opentelemetry.io/collector/processor/batchprocessor v0.66.1-0.20221202005155-1c54042beb70/go.mod h1:Pi1CsKDQFoDrUP1i3+VdE6s2Xuji7bOGFBgqHK0J32E= +go.opentelemetry.io/collector/semconv v0.66.1-0.20221202005155-1c54042beb70 h1:Q5L9Urod3c8as6ZYaoaqBjarx/HXxsxy34DFZIU2fO4= +go.opentelemetry.io/collector/semconv v0.66.1-0.20221202005155-1c54042beb70/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= @@ -536,8 +540,8 @@ go.uber.org/multierr v1.6.0/go.mod h1:cdWPpRnG4AhwMwsgIHip0KRBQjJy5kYEpYjJxpXp9i go.uber.org/multierr v1.8.0 h1:dg6GjLku4EH+249NNmoIciG9N/jURbDG+pFlTkhzIC8= go.uber.org/multierr v1.8.0/go.mod h1:7EAYxJLBy9rStEaz58O2t4Uvip6FSURkq8/ppBp95ak= go.uber.org/zap v1.17.0/go.mod h1:MXVU+bhUf/A7Xi2HNOnopQOrmycQ5Ih87HtOu4q5SSo= -go.uber.org/zap v1.23.0 h1:OjGQ5KQDEUawVHxNwQgPpiypGHOxo2mNZsOqTak4fFY= -go.uber.org/zap v1.23.0/go.mod h1:D+nX8jyLsMHMYrln8A0rJjFt/T/9/bGgIhAqxv5URuY= +go.uber.org/zap v1.24.0 h1:FiJd5l1UOLj0wCgbSE0rwwXHzEdAZS6hiiSnxJN/D60= +go.uber.org/zap v1.24.0/go.mod h1:2kMP+WWQ8aoFoedH3T2sq6iJ2yDWpHbP0f6MQbS9Gkg= golang.org/x/crypto v0.0.0-20180904163835-0709b304e793/go.mod h1:6SG95UA2DQfeDnfUPMdvaQW0Q7yPrPDi9nlGo2tz2b4= golang.org/x/crypto v0.0.0-20190308221718-c2843e01d9a2/go.mod h1:djNgcEr1/C05ACkg1iLfiJU5Ep61QUkGW8qpdssI0+w= golang.org/x/crypto v0.0.0-20190510104115-cbcb75029529/go.mod h1:yigFU9vqHzYiE8UmvKecakEJjdnWj3jj499lnFckfCI= diff --git a/exporter/googlecloudpubsubexporter/go.mod b/exporter/googlecloudpubsubexporter/go.mod index c9f25ad4a969..e102dff8141f 100644 --- a/exporter/googlecloudpubsubexporter/go.mod +++ b/exporter/googlecloudpubsubexporter/go.mod @@ -6,11 +6,12 @@ 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.66.1-0.20221128222955-4ff1ff379b90 - go.opentelemetry.io/collector/component v0.66.1-0.20221128222955-4ff1ff379b90 - go.opentelemetry.io/collector/consumer v0.66.1-0.20221128222955-4ff1ff379b90 - go.opentelemetry.io/collector/pdata v0.66.1-0.20221128222955-4ff1ff379b90 - go.uber.org/zap v1.23.0 + go.opentelemetry.io/collector v0.66.1-0.20221202005155-1c54042beb70 + go.opentelemetry.io/collector/component v0.66.1-0.20221202005155-1c54042beb70 + go.opentelemetry.io/collector/confmap v0.0.0-20221201172708-2bdff61fa52a + go.opentelemetry.io/collector/consumer v0.66.1-0.20221202005155-1c54042beb70 + go.opentelemetry.io/collector/pdata v0.66.1-0.20221202005155-1c54042beb70 + go.uber.org/zap v1.24.0 google.golang.org/api v0.103.0 google.golang.org/genproto v0.0.0-20221027153422-115e99e71e1c google.golang.org/grpc v1.51.0 @@ -41,7 +42,7 @@ require ( github.com/pelletier/go-toml v1.9.4 // indirect github.com/pmezard/go-difflib v1.0.0 // indirect go.opencensus.io v0.24.0 // indirect - go.opentelemetry.io/collector/featuregate v0.66.1-0.20221128222955-4ff1ff379b90 // indirect + go.opentelemetry.io/collector/featuregate v0.66.1-0.20221202005155-1c54042beb70 // 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 387e9b7d90f2..d23b18f2117f 100644 --- a/exporter/googlecloudpubsubexporter/go.sum +++ b/exporter/googlecloudpubsubexporter/go.sum @@ -297,16 +297,18 @@ go.etcd.io/etcd/client/pkg/v3 v3.5.4/go.mod h1:IJHfcCEKxYu1Os13ZdwCwIUTUVGYTSAM3 go.etcd.io/etcd/client/v3 v3.5.4/go.mod h1:ZaRkVgBZC+L+dLCjTcF1hRXpgZXQPOvnA/Ak/gq3kiY= go.opencensus.io v0.24.0 h1:y73uSU6J157QMP2kn2r30vwW1A2W2WFwSCGnAVxeaD0= go.opencensus.io v0.24.0/go.mod h1:vNK8G9p7aAivkbmorf4v+7Hgx+Zs0yY+0fOtgBfjQKo= -go.opentelemetry.io/collector v0.66.1-0.20221128222955-4ff1ff379b90 h1:yRe05/jMdzH4TFHfndZ5h2o2hKBK/79W72j8w51qNsI= -go.opentelemetry.io/collector v0.66.1-0.20221128222955-4ff1ff379b90/go.mod h1:hE6jCs+0rfiufCrVPucKZTMwfHit1okfDPnwPT2eW1I= -go.opentelemetry.io/collector/component v0.66.1-0.20221128222955-4ff1ff379b90 h1:AYSNTXbezhNg43EuYdVVcgxE/2gBVrm00FDx4DOmQVg= -go.opentelemetry.io/collector/component v0.66.1-0.20221128222955-4ff1ff379b90/go.mod h1:0c84EqXUhvYe6KW7hJfh76tiI/5yjWCH2amwyQ06XLM= -go.opentelemetry.io/collector/consumer v0.66.1-0.20221128222955-4ff1ff379b90 h1:nzNXVfC1FzXBXCLMzbMv+qK3E4EGiNsnMhfVsBd2yzc= -go.opentelemetry.io/collector/consumer v0.66.1-0.20221128222955-4ff1ff379b90/go.mod h1:WtoRZa5SnxQO1ZEQdVxYpFcXCmq62rakv0oUSlPO0NQ= -go.opentelemetry.io/collector/featuregate v0.66.1-0.20221128222955-4ff1ff379b90 h1:UuJSFWbi9XxyNZsJKZuvpWg35BgRbcCGFH+38V2MAdw= -go.opentelemetry.io/collector/featuregate v0.66.1-0.20221128222955-4ff1ff379b90/go.mod h1:tewuFKJYalWBU0bmNKg++MC1ipINXUr6szYzOw2p1GI= -go.opentelemetry.io/collector/pdata v0.66.1-0.20221128222955-4ff1ff379b90 h1:Vu4S4jSNcd0VFPzxQNO4+UqGwnes1xJDoFLPRiWHm8I= -go.opentelemetry.io/collector/pdata v0.66.1-0.20221128222955-4ff1ff379b90/go.mod h1:pqyaznLzk21m+1KL6fwOsRryRELL+zNM0qiVSn0MbVc= +go.opentelemetry.io/collector v0.66.1-0.20221202005155-1c54042beb70 h1:INB2CsOtqqrija2KvMuIpbBQ3qX1BECEeR+d0NJX+oM= +go.opentelemetry.io/collector v0.66.1-0.20221202005155-1c54042beb70/go.mod h1:d0NHkHyANJy3HDTvYE/PoylMShUmFIbiir89ieI0X0c= +go.opentelemetry.io/collector/component v0.66.1-0.20221202005155-1c54042beb70 h1:dEoJhzCmRShgmVro/kXm6pouGElgxkH2DsvanzCeZtU= +go.opentelemetry.io/collector/component v0.66.1-0.20221202005155-1c54042beb70/go.mod h1:OsVnvFFe38QSpcuZlQ8cvarDzcloCexgQ1/B2m80F6U= +go.opentelemetry.io/collector/confmap v0.0.0-20221201172708-2bdff61fa52a h1:2TscCXAQASO2kU9xHcMIUM/FP29fiQIRTilZmliq/7I= +go.opentelemetry.io/collector/confmap v0.0.0-20221201172708-2bdff61fa52a/go.mod h1:qJ3e8bA8h4wz/jYlbeEUafVHdrU7DkpStnmIUAz6VTQ= +go.opentelemetry.io/collector/consumer v0.66.1-0.20221202005155-1c54042beb70 h1:XwpVjI1KeKGPXOZBLefGILMziPYuNf6IzbmiIEsIyI0= +go.opentelemetry.io/collector/consumer v0.66.1-0.20221202005155-1c54042beb70/go.mod h1:EWVBcSGcIcmeDGTnIboc/aqa3agsBeH8/q7yFWG7xVc= +go.opentelemetry.io/collector/featuregate v0.66.1-0.20221202005155-1c54042beb70 h1:V0tf4ebciqIs07jFATfLGdUpLRaEsi+AiWuA/in0G8Y= +go.opentelemetry.io/collector/featuregate v0.66.1-0.20221202005155-1c54042beb70/go.mod h1:tewuFKJYalWBU0bmNKg++MC1ipINXUr6szYzOw2p1GI= +go.opentelemetry.io/collector/pdata v0.66.1-0.20221202005155-1c54042beb70 h1:TPOrxkEMvZzfBSwF3ct+kUUgKA5g8unkZZbKQvJweeA= +go.opentelemetry.io/collector/pdata v0.66.1-0.20221202005155-1c54042beb70/go.mod h1:pqyaznLzk21m+1KL6fwOsRryRELL+zNM0qiVSn0MbVc= 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= @@ -324,8 +326,8 @@ go.uber.org/multierr v1.6.0/go.mod h1:cdWPpRnG4AhwMwsgIHip0KRBQjJy5kYEpYjJxpXp9i go.uber.org/multierr v1.8.0 h1:dg6GjLku4EH+249NNmoIciG9N/jURbDG+pFlTkhzIC8= go.uber.org/multierr v1.8.0/go.mod h1:7EAYxJLBy9rStEaz58O2t4Uvip6FSURkq8/ppBp95ak= go.uber.org/zap v1.17.0/go.mod h1:MXVU+bhUf/A7Xi2HNOnopQOrmycQ5Ih87HtOu4q5SSo= -go.uber.org/zap v1.23.0 h1:OjGQ5KQDEUawVHxNwQgPpiypGHOxo2mNZsOqTak4fFY= -go.uber.org/zap v1.23.0/go.mod h1:D+nX8jyLsMHMYrln8A0rJjFt/T/9/bGgIhAqxv5URuY= +go.uber.org/zap v1.24.0 h1:FiJd5l1UOLj0wCgbSE0rwwXHzEdAZS6hiiSnxJN/D60= +go.uber.org/zap v1.24.0/go.mod h1:2kMP+WWQ8aoFoedH3T2sq6iJ2yDWpHbP0f6MQbS9Gkg= golang.org/x/crypto v0.0.0-20180904163835-0709b304e793/go.mod h1:6SG95UA2DQfeDnfUPMdvaQW0Q7yPrPDi9nlGo2tz2b4= golang.org/x/crypto v0.0.0-20190308221718-c2843e01d9a2/go.mod h1:djNgcEr1/C05ACkg1iLfiJU5Ep61QUkGW8qpdssI0+w= golang.org/x/crypto v0.0.0-20190923035154-9ee001bba392/go.mod h1:/lpIB1dKB+9EgE3H3cr1v9wB50oz8l4C4h62xy7jSTY= diff --git a/exporter/googlemanagedprometheusexporter/go.mod b/exporter/googlemanagedprometheusexporter/go.mod index 09bd2fee0a41..d24e03ea12a6 100644 --- a/exporter/googlemanagedprometheusexporter/go.mod +++ b/exporter/googlemanagedprometheusexporter/go.mod @@ -3,24 +3,24 @@ module github.com/open-telemetry/opentelemetry-collector-contrib/exporter/google go 1.18 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/GoogleCloudPlatform/opentelemetry-operations-go/exporter/collector v0.34.2 + github.com/GoogleCloudPlatform/opentelemetry-operations-go/exporter/collector/googlemanagedprometheus v0.34.2 github.com/stretchr/testify v1.8.1 - go.opentelemetry.io/collector v0.66.1-0.20221128222955-4ff1ff379b90 - go.opentelemetry.io/collector/component v0.66.1-0.20221128222955-4ff1ff379b90 + go.opentelemetry.io/collector v0.66.1-0.20221202005155-1c54042beb70 + go.opentelemetry.io/collector/component v0.66.1-0.20221202005155-1c54042beb70 ) require ( cloud.google.com/go v0.105.0 // indirect cloud.google.com/go/compute v1.12.1 // indirect cloud.google.com/go/compute/metadata v0.2.1 // indirect - cloud.google.com/go/logging v1.4.2 // indirect + cloud.google.com/go/logging v1.5.0 // indirect cloud.google.com/go/longrunning v0.1.1 // indirect cloud.google.com/go/monitoring v1.7.0 // indirect cloud.google.com/go/trace v1.3.0 // indirect contrib.go.opencensus.io/exporter/prometheus v0.4.2 // indirect - github.com/GoogleCloudPlatform/opentelemetry-operations-go/exporter/trace v1.10.1 // indirect - github.com/GoogleCloudPlatform/opentelemetry-operations-go/internal/resourcemapping v0.34.1 // indirect + github.com/GoogleCloudPlatform/opentelemetry-operations-go/exporter/trace v1.10.2 // indirect + github.com/GoogleCloudPlatform/opentelemetry-operations-go/internal/resourcemapping v0.34.2 // indirect github.com/beorn7/perks v1.0.1 // indirect github.com/cenkalti/backoff/v4 v4.2.0 // indirect github.com/cespare/xxhash/v2 v2.1.2 // indirect @@ -57,15 +57,16 @@ require ( github.com/shirou/gopsutil/v3 v3.22.10 // indirect github.com/spf13/cobra v1.6.1 // indirect github.com/spf13/pflag v1.0.5 // indirect - github.com/tklauser/go-sysconf v0.3.10 // indirect - github.com/tklauser/numcpus v0.4.0 // indirect + github.com/tklauser/go-sysconf v0.3.11 // indirect + github.com/tklauser/numcpus v0.6.0 // indirect github.com/yusufpapurcu/wmi v1.2.2 // indirect go.opencensus.io v0.24.0 // indirect - go.opentelemetry.io/collector/consumer v0.66.1-0.20221128222955-4ff1ff379b90 // indirect - go.opentelemetry.io/collector/featuregate v0.66.1-0.20221128222955-4ff1ff379b90 // indirect - go.opentelemetry.io/collector/pdata v0.66.1-0.20221128222955-4ff1ff379b90 // indirect - go.opentelemetry.io/collector/processor/batchprocessor v0.66.1-0.20221128222955-4ff1ff379b90 // indirect - go.opentelemetry.io/collector/semconv v0.66.1-0.20221128222955-4ff1ff379b90 // indirect + go.opentelemetry.io/collector/confmap v0.0.0-20221201172708-2bdff61fa52a // indirect + go.opentelemetry.io/collector/consumer v0.66.1-0.20221202005155-1c54042beb70 // indirect + go.opentelemetry.io/collector/featuregate v0.66.1-0.20221202005155-1c54042beb70 // indirect + go.opentelemetry.io/collector/pdata v0.66.1-0.20221202005155-1c54042beb70 // indirect + go.opentelemetry.io/collector/processor/batchprocessor v0.66.1-0.20221202005155-1c54042beb70 // indirect + go.opentelemetry.io/collector/semconv v0.66.1-0.20221202005155-1c54042beb70 // 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 @@ -75,8 +76,8 @@ require ( go.opentelemetry.io/otel/trace v1.11.1 // indirect go.uber.org/atomic v1.10.0 // indirect go.uber.org/multierr v1.8.0 // indirect - go.uber.org/zap v1.23.0 // indirect - golang.org/x/net v0.0.0-20221014081412-f15817d10f9b // indirect + go.uber.org/zap v1.24.0 // indirect + golang.org/x/net v0.0.0-20221017152216-f25eb7ecb193 // indirect golang.org/x/oauth2 v0.0.0-20221014153046-6fdb5e3db783 // indirect golang.org/x/sync v0.1.0 // indirect golang.org/x/sys v0.2.0 // indirect diff --git a/exporter/googlemanagedprometheusexporter/go.sum b/exporter/googlemanagedprometheusexporter/go.sum index 1c3e83304bbe..7cc0db7126b0 100644 --- a/exporter/googlemanagedprometheusexporter/go.sum +++ b/exporter/googlemanagedprometheusexporter/go.sum @@ -18,6 +18,17 @@ cloud.google.com/go v0.74.0/go.mod h1:VV1xSbzvo+9QJOxLDaJfTjx5e+MePCpCWwvftOeQmW cloud.google.com/go v0.78.0/go.mod h1:QjdrLG0uq+YwhjoVOLsS1t7TW8fs36kLs4XO5R5ECHg= cloud.google.com/go v0.79.0/go.mod h1:3bzgcEeQlzbuEAYu4mrWhKqWjmpprinYgKJLgKHnbb8= cloud.google.com/go v0.81.0/go.mod h1:mk/AM35KwGk/Nm2YSeZbxXdrNK3KZOYHmLkOqC2V6E0= +cloud.google.com/go v0.83.0/go.mod h1:Z7MJUsANfY0pYPdw0lbnivPx4/vhy/e2FEkSkF7vAVY= +cloud.google.com/go v0.84.0/go.mod h1:RazrYuxIK6Kb7YrzzhPoLmCVzl7Sup4NrbKPg8KHSUM= +cloud.google.com/go v0.87.0/go.mod h1:TpDYlFy7vuLzZMMZ+B6iRiELaY7z/gJPaqbMx6mlWcY= +cloud.google.com/go v0.90.0/go.mod h1:kRX0mNRHe0e2rC6oNakvwQqzyDmg57xJ+SZU1eT2aDQ= +cloud.google.com/go v0.93.3/go.mod h1:8utlLll2EF5XMAV15woO4lSbWQlk8rer9aLOfLh7+YI= +cloud.google.com/go v0.94.1/go.mod h1:qAlAugsXlC+JWO+Bke5vCtc9ONxjQT3drlTTnAplMW4= +cloud.google.com/go v0.97.0/go.mod h1:GF7l59pYBVlXQIBLx3a761cZ41F9bBH3JUlihCt2Udc= +cloud.google.com/go v0.99.0/go.mod h1:w0Xx2nLzqWJPuozYQX+hFfCSI8WioryfRDzkoI/Y2ZA= +cloud.google.com/go v0.100.2/go.mod h1:4Xra9TjzAeYHrl5+oeLlzbM2k3mjVhZh4UqTZ//w99A= +cloud.google.com/go v0.102.0/go.mod h1:oWcCzKlqJ5zgHQt9YsaeTY9KzIvjyy0ArmiBUgpQ+nc= +cloud.google.com/go v0.102.1/go.mod h1:XZ77E9qnTEnrgEOvr4xzfdX5TRo7fB4T2F4O6+34hIU= cloud.google.com/go v0.105.0 h1:DNtEKRBAAzeS4KyIory52wWHuClNaXJ5x1F7xa4q+5Y= cloud.google.com/go v0.105.0/go.mod h1:PrLgOJNe5nfE9UMxKxgXj4mD3voiP+YQ6gdt6KMFOKM= cloud.google.com/go/bigquery v1.0.1/go.mod h1:i/xbL2UlR5RvWAURpBYZTtm/cXjCha9lbfbpx4poX+o= @@ -26,14 +37,21 @@ cloud.google.com/go/bigquery v1.4.0/go.mod h1:S8dzgnTigyfTmLBfrtrhyYhwRxG72rYxvf cloud.google.com/go/bigquery v1.5.0/go.mod h1:snEHRnqQbz117VIFhE8bmtwIDY80NLUZUMb4Nv6dBIg= cloud.google.com/go/bigquery v1.7.0/go.mod h1://okPTzCYNXSlb24MZs83e2Do+h+VXtc4gLoIoXIAPc= cloud.google.com/go/bigquery v1.8.0/go.mod h1:J5hqkt3O0uAFnINi6JXValWIb1v0goeZM77hZzJN/fQ= +cloud.google.com/go/compute v0.1.0/go.mod h1:GAesmwr110a34z04OlxYkATPBEfVhkymfTBXtfbBFow= +cloud.google.com/go/compute v1.3.0/go.mod h1:cCZiE1NHEtai4wiufUhW8I8S1JKkAnhnQJWM7YD99wM= +cloud.google.com/go/compute v1.5.0/go.mod h1:9SMHyhJlzhlkJqrPAc839t2BZFTSk6Jdj6mkzQJeu0M= +cloud.google.com/go/compute v1.6.0/go.mod h1:T29tfhtVbq1wvAPo0E3+7vhgmkOYeXjhFvz/FMzPu0s= +cloud.google.com/go/compute v1.6.1/go.mod h1:g85FgpzFvNULZ+S8AYq87axRKuf2Kh7deLqV/jJ3thU= +cloud.google.com/go/compute v1.7.0/go.mod h1:435lt8av5oL9P3fv1OEzSbSUe+ybHXGMPQHHZWZxy9U= cloud.google.com/go/compute v1.12.1 h1:gKVJMEyqV5c/UnpzjjQbo3Rjvvqpr9B1DFSbJC4OXr0= cloud.google.com/go/compute v1.12.1/go.mod h1:e8yNOBcBONZU1vJKCvCoDw/4JQsA0dpM4x/6PIIOocU= cloud.google.com/go/compute/metadata v0.2.1 h1:efOwf5ymceDhK6PKMnnrTHP4pppY5L22mle96M1yP48= cloud.google.com/go/compute/metadata v0.2.1/go.mod h1:jgHgmJd2RKBGzXqF5LR2EZMGxBkeanZ9wwa75XHJgOM= cloud.google.com/go/datastore v1.0.0/go.mod h1:LXYbyblFSglQ5pkeyhO+Qmw7ukd3C+pD7TKLgZqpHYE= cloud.google.com/go/datastore v1.1.0/go.mod h1:umbIZjpQpHh4hmRpGhH4tLFup+FVzqBi1b3c64qFpCk= -cloud.google.com/go/logging v1.4.2 h1:Mu2Q75VBDQlW1HlBMjTX4X84UFR73G1TiLlRYc/b7tA= -cloud.google.com/go/logging v1.4.2/go.mod h1:jco9QZSx8HiVVqLJReq7z7bVdj0P1Jb9PDFs63T+axo= +cloud.google.com/go/iam v0.3.0/go.mod h1:XzJPvDayI+9zsASAFO68Hk07u3z+f+JrT2xXNdp4bnY= +cloud.google.com/go/logging v1.5.0 h1:DcR52smaYLgeK9KPzJlBJyyBYqW/EGKiuRRl8boL1s4= +cloud.google.com/go/logging v1.5.0/go.mod h1:c/57U/aLdzSFuBtvbtFduG1Ii54uSm95HOBnp58P7/U= cloud.google.com/go/longrunning v0.1.1 h1:y50CXG4j0+qvEukslYFBCrzaXX0qpFbBzc3PchSu/LE= cloud.google.com/go/longrunning v0.1.1/go.mod h1:UUFxuDWkv22EuY93jjmDMFT5GPQKeFVJBIF6QlTqdsE= cloud.google.com/go/monitoring v1.7.0 h1:zK12aN/jzLRzrRXopEOUaG6kvuF6WJmlv1mXn1L7a6E= @@ -47,6 +65,7 @@ cloud.google.com/go/storage v1.5.0/go.mod h1:tpKbwo567HUNpVclU5sGELwQWBDZ8gh0Zeo cloud.google.com/go/storage v1.6.0/go.mod h1:N7U0C8pVQ/+NIKOBQyamJIeKQKkZ+mxpohlUTyfDhBk= cloud.google.com/go/storage v1.8.0/go.mod h1:Wv1Oy7z6Yz3DshWRJFhqM/UCfaWIRTdp0RXyy7KQOVs= cloud.google.com/go/storage v1.10.0/go.mod h1:FLPqc6j+Ki4BU591ie1oL6qBQGu2Bl/tZ9ullr3+Kg0= +cloud.google.com/go/storage v1.22.1/go.mod h1:S8N1cAStu7BOeFfE8KAQzmyyLkK8p/vmRq6kuBTW58Y= cloud.google.com/go/trace v1.3.0 h1:YmCusGVDe0scOkHKi+y/GgBZlwQjHybtQHV12AfJEgo= cloud.google.com/go/trace v1.3.0/go.mod h1:FFUE83d9Ca57C+K8rDl/Ih8LwOzWIV1krKgxg6N0G28= contrib.go.opencensus.io/exporter/prometheus v0.4.2 h1:sqfsYl5GIY/L570iT+l93ehxaWJs2/OwXtiWwew3oAg= @@ -54,15 +73,16 @@ contrib.go.opencensus.io/exporter/prometheus v0.4.2/go.mod h1:dvEHbiKmgvbr5pjaF9 dmitri.shuralyov.com/gpu/mtl v0.0.0-20190408044501-666a987793e9/go.mod h1:H6x//7gZCb22OMCxBHrMx7a5I7Hp++hsVxbQ4BYO7hU= github.com/BurntSushi/toml v0.3.1/go.mod h1:xHWCNGjB5oqiDr8zfno3MHue2Ht5sIBksp03qcyfWMU= github.com/BurntSushi/xgb v0.0.0-20160522181843-27f122750802/go.mod h1:IVnqGOEym/WlBOVXweHU+Q+/VP0lqqI8lqeDx9IjBqo= -github.com/GoogleCloudPlatform/opentelemetry-operations-go/exporter/collector v0.34.1 h1:qXN4o1+RWbfLZanP6zFCzzfiKwgstKzobaXkQRAxeAk= -github.com/GoogleCloudPlatform/opentelemetry-operations-go/exporter/collector v0.34.1/go.mod h1:KGxTw4iYuQBtmGGZpcqC2SEw+fRdcR8PxpUb+aEczQ8= -github.com/GoogleCloudPlatform/opentelemetry-operations-go/exporter/collector/googlemanagedprometheus v0.34.1 h1:O89aZCuqbyM1EB3XQkiyoeUXfGKsiEUwj7RyIGhH4uc= -github.com/GoogleCloudPlatform/opentelemetry-operations-go/exporter/collector/googlemanagedprometheus v0.34.1/go.mod h1:AWHL23liZLi/Ljw5XqFHyX/vloKqPodLx7Um4UKXisI= -github.com/GoogleCloudPlatform/opentelemetry-operations-go/exporter/trace v1.10.1 h1:E0Hwk1YC0lWXJboAvQrOnDSyVpmdlqC2v4m+GNmNszA= -github.com/GoogleCloudPlatform/opentelemetry-operations-go/exporter/trace v1.10.1/go.mod h1:ZWWusXNLjdTConvbpJZf+/5xxtLfu7y3hRfKjmb/DOI= -github.com/GoogleCloudPlatform/opentelemetry-operations-go/internal/cloudmock v0.34.1 h1:2G1eO4RSvcTNncDivyGTd3Zh9tozmMeA2JpF07QEYlc= -github.com/GoogleCloudPlatform/opentelemetry-operations-go/internal/resourcemapping v0.34.1 h1:2zV0DiJaSJ+zoaYwMuWAkqMQyLggPfStnrwrFNv+ty4= -github.com/GoogleCloudPlatform/opentelemetry-operations-go/internal/resourcemapping v0.34.1/go.mod h1:oBeOrlgeIZVX6bRZ+TDJiEuL1bsDdgAWKa4iETycZf8= +github.com/GoogleCloudPlatform/opentelemetry-operations-go/exporter/collector v0.34.2 h1:LPtUGPSP+r9ONQ2rMlQtcU4ZPtJPLMYfbiT+/3q2rH4= +github.com/GoogleCloudPlatform/opentelemetry-operations-go/exporter/collector v0.34.2/go.mod h1:Ak7usPCI+GqelKZTtbE7Sk4+ci2jjnkfl4X04YH7/ZY= +github.com/GoogleCloudPlatform/opentelemetry-operations-go/exporter/collector/googlemanagedprometheus v0.34.2 h1:0WbyP5GfXxWvhoQVL7U4YouxQRrIRp6MEwcxxCIEGR0= +github.com/GoogleCloudPlatform/opentelemetry-operations-go/exporter/collector/googlemanagedprometheus v0.34.2/go.mod h1:NW+a69oLVqYvWZ98nlUPI/TqsOA/YRdOokzQVGNOxc4= +github.com/GoogleCloudPlatform/opentelemetry-operations-go/exporter/trace v1.10.2 h1:mZ/DetsTFTLmOQq1B9l1ADBpJAYErGULD1C4oNLXjhI= +github.com/GoogleCloudPlatform/opentelemetry-operations-go/exporter/trace v1.10.2/go.mod h1:wSSk0tKu5LMPxly6isD4u/myjFfXbqjzDbWRiLbXseE= +github.com/GoogleCloudPlatform/opentelemetry-operations-go/internal/cloudmock v0.34.2 h1:svYLYCkrSUba1GQNyugC+4KVer/J9w8QPqoxWk8Rx58= +github.com/GoogleCloudPlatform/opentelemetry-operations-go/internal/resourcemapping v0.34.2 h1:zb7KO+Ti/CUnMpS6gdzhyi3jw1W5q1S2aiIBJ7LAfO4= +github.com/GoogleCloudPlatform/opentelemetry-operations-go/internal/resourcemapping v0.34.2/go.mod h1:bVzzMryjn/wyTtxukT/IkUqbnRAKzEdz/ZFoNpcy+Jo= +github.com/OneOfOne/xxhash v1.2.2/go.mod h1:HSdplMjZKSmBqAxg5vPj2TmRDmfkzw+cTzAElWljhcU= github.com/alecthomas/template v0.0.0-20160405071501-a0175ee3bccc/go.mod h1:LOuyumcjzFXgccqObfd/Ljyb9UuFJ6TxHnclSeseNhc= github.com/alecthomas/template v0.0.0-20190718012654-fb15b899a751/go.mod h1:LOuyumcjzFXgccqObfd/Ljyb9UuFJ6TxHnclSeseNhc= github.com/alecthomas/units v0.0.0-20151022065526-2efee857e7cf/go.mod h1:ybxpYRFXyAe+OPACYpWeL0wqObRcbAqCMya13uyzqw0= @@ -93,6 +113,7 @@ github.com/bgentry/speakeasy v0.1.0/go.mod h1:+zsyZBPWlz7T6j88CTgSN5bM796AkVf0kB github.com/cenkalti/backoff/v4 v4.2.0 h1:HN5dHm3WBOgndBH6E8V0q2jIYIR3s9yglV8k/+MN3u4= github.com/cenkalti/backoff/v4 v4.2.0/go.mod h1:Y3VNntkOUPxTVeUxJ/G5vcM//AlwfmyYozVcomhLiZE= github.com/census-instrumentation/opencensus-proto v0.2.1/go.mod h1:f6KPmirojxKA12rnyqOA5BBL4O983OfeGPqjHWSTneU= +github.com/cespare/xxhash v1.1.0/go.mod h1:XrSqR1VqqWfGrhpAt58auRo0WTKS1nRRg3ghfAqPWnc= github.com/cespare/xxhash/v2 v2.1.1/go.mod h1:VGX0DQ3Q6kWi7AoAeZDth3/j3BFtOZR5XLFGgcrjCOs= github.com/cespare/xxhash/v2 v2.1.2 h1:YRXhKfTDauu4ajMg1TPgFO5jnlC2HCbmLXMcTG5cbYE= github.com/cespare/xxhash/v2 v2.1.2/go.mod h1:VGX0DQ3Q6kWi7AoAeZDth3/j3BFtOZR5XLFGgcrjCOs= @@ -103,6 +124,12 @@ github.com/client9/misspell v0.3.4/go.mod h1:qj6jICC3Q7zFZvVWo7KLAzC3yx5G7kyvSDk github.com/cncf/udpa/go v0.0.0-20191209042840-269d4d468f6f/go.mod h1:M8M6+tZqaGXZJjfX53e64911xZQV5JYwmTeXPW+k8Sc= github.com/cncf/udpa/go v0.0.0-20200629203442-efcf912fb354/go.mod h1:WmhPx2Nbnhtbo57+VJT5O0JRkEi1Wbu0z5j0R8u5Hbk= github.com/cncf/udpa/go v0.0.0-20201120205902-5459f2c99403/go.mod h1:WmhPx2Nbnhtbo57+VJT5O0JRkEi1Wbu0z5j0R8u5Hbk= +github.com/cncf/udpa/go v0.0.0-20210930031921-04548b0d99d4/go.mod h1:6pvJx4me5XPnfI9Z40ddWsdw2W/uZgQLFXToKeRcDiI= +github.com/cncf/xds/go v0.0.0-20210312221358-fbca930ec8ed/go.mod h1:eXthEFrGJvWHgFFCl3hGmgk+/aYT6PnTQLykKQRLhEs= +github.com/cncf/xds/go v0.0.0-20210805033703-aa0b78936158/go.mod h1:eXthEFrGJvWHgFFCl3hGmgk+/aYT6PnTQLykKQRLhEs= +github.com/cncf/xds/go v0.0.0-20210922020428-25de7278fc84/go.mod h1:eXthEFrGJvWHgFFCl3hGmgk+/aYT6PnTQLykKQRLhEs= +github.com/cncf/xds/go v0.0.0-20211001041855-01bcc9b48dfe/go.mod h1:eXthEFrGJvWHgFFCl3hGmgk+/aYT6PnTQLykKQRLhEs= +github.com/cncf/xds/go v0.0.0-20211011173535-cb28da3451f1/go.mod h1:eXthEFrGJvWHgFFCl3hGmgk+/aYT6PnTQLykKQRLhEs= github.com/coreos/go-semver v0.3.0/go.mod h1:nnelYz7RCh+5ahJtPPxZlU+153eP4D4r3EedlOD2RNk= github.com/coreos/go-systemd/v22 v22.3.2/go.mod h1:Y58oyj3AT4RCenI/lSvhwexgC+NSVTIJ3seZv2GcEnc= github.com/cpuguy83/go-md2man/v2 v2.0.2/go.mod h1:tgQtvFlXSQOSOSIRvRPT7W67SCa46tRHOmNcaadrF8o= @@ -116,6 +143,9 @@ github.com/envoyproxy/go-control-plane v0.9.4/go.mod h1:6rpuAdCZL397s3pYoYcLgu1m github.com/envoyproxy/go-control-plane v0.9.7/go.mod h1:cwu0lG7PUMfa9snN8LXBig5ynNVH9qI8YYLbd1fK2po= github.com/envoyproxy/go-control-plane v0.9.9-0.20201210154907-fd9021fe5dad/go.mod h1:cXg6YxExXjJnVBQHBLXeUAgxn2UodCpnH306RInaBQk= github.com/envoyproxy/go-control-plane v0.9.9-0.20210217033140-668b12f5399d/go.mod h1:cXg6YxExXjJnVBQHBLXeUAgxn2UodCpnH306RInaBQk= +github.com/envoyproxy/go-control-plane v0.9.9-0.20210512163311-63b5d3c536b0/go.mod h1:hliV/p42l8fGbc6Y9bQ70uLwIvmJyVE5k4iMKlh8wCQ= +github.com/envoyproxy/go-control-plane v0.9.10-0.20210907150352-cf90f659a021/go.mod h1:AFq3mo9L8Lqqiid3OhADV3RfLJnjiw63cSpi+fDTRC0= +github.com/envoyproxy/go-control-plane v0.10.2-0.20220325020618-49ff273808a1/go.mod h1:KJwIaB5Mv44NWtYuAOFCVOjcI94vtpEz2JU/D2v6IjE= github.com/envoyproxy/protoc-gen-validate v0.1.0/go.mod h1:iSmxcyjqTsJpI2R4NaDN7+kN2VEUnK/pcBlmesArF7c= github.com/fatih/color v1.7.0/go.mod h1:Zm6kSWBoL9eyXnKyktHP6abPY2pDugNf5KwzbycvMj4= github.com/fatih/color v1.9.0/go.mod h1:eQcE1qtQxscV5RaZvpXrrb8Drkc3/DdQ+uUYCNjL+zU= @@ -165,6 +195,7 @@ github.com/golang/mock v1.4.1/go.mod h1:UOMv5ysSaYNkG+OFQykRIcU/QvvxJf3p21QfJ2Bt github.com/golang/mock v1.4.3/go.mod h1:UOMv5ysSaYNkG+OFQykRIcU/QvvxJf3p21QfJ2Bt3cw= github.com/golang/mock v1.4.4/go.mod h1:l3mdAwkq5BuhzHwde/uurv3sEJeZMXNpwsxVWU71h+4= github.com/golang/mock v1.5.0/go.mod h1:CWnOUgYIOo4TcNZ0wHX3YZCqsaM1I1Jvs6v3mP3KVu8= +github.com/golang/mock v1.6.0/go.mod h1:p6yTPP+5HYm5mzsMV8JkE6ZKdX+/wYM6Hr+LicevLPs= github.com/golang/protobuf v1.2.0/go.mod h1:6lQm79b+lXiMfvg/cZm0SGofjICqVBUtrP5yJMmIC1U= github.com/golang/protobuf v1.3.1/go.mod h1:6lQm79b+lXiMfvg/cZm0SGofjICqVBUtrP5yJMmIC1U= github.com/golang/protobuf v1.3.2/go.mod h1:6lQm79b+lXiMfvg/cZm0SGofjICqVBUtrP5yJMmIC1U= @@ -184,6 +215,7 @@ github.com/golang/protobuf v1.5.1/go.mod h1:DopwsBzvsk0Fs44TXzsVbJyPhcCPeIwnvohx github.com/golang/protobuf v1.5.2 h1:ROPKBNFfQgOUMifHyP+KYbvpjbdoFNs+aK7DXlji0Tw= github.com/golang/protobuf v1.5.2/go.mod h1:XVQd3VNwM+JqD3oG2Ue2ip4fOMUkwXdXDdiuN0vRsmY= github.com/golang/snappy v0.0.1/go.mod h1:/XxbfmMg8lxefKM7IXC3fBNl/7bRcc72aCRzEWrmP2Q= +github.com/golang/snappy v0.0.3/go.mod h1:/XxbfmMg8lxefKM7IXC3fBNl/7bRcc72aCRzEWrmP2Q= github.com/google/btree v0.0.0-20180813153112-4030bb1f1f0c/go.mod h1:lNA+9X1NB3Zf8V7Ke586lFgjr2dZNuvo3lPJSGZ5JPQ= github.com/google/btree v1.0.0/go.mod h1:lNA+9X1NB3Zf8V7Ke586lFgjr2dZNuvo3lPJSGZ5JPQ= github.com/google/go-cmp v0.2.0/go.mod h1:oXzfMopK8JAjlY9xF4vHSVASa0yLyX7SntLO5aqRK0M= @@ -206,6 +238,7 @@ github.com/google/gofuzz v1.0.0/go.mod h1:dBl0BpW6vV/+mYPU4Po3pmUjxk6FQPldtuIdl/ github.com/google/martian v2.1.0+incompatible/go.mod h1:9I4somxYTbIHy5NJKHRl3wXiIaQGbYVAs8BPL6v8lEs= github.com/google/martian/v3 v3.0.0/go.mod h1:y5Zk1BBys9G+gd6Jrk0W3cC1+ELVxBWuIGO+w/tUAp0= github.com/google/martian/v3 v3.1.0/go.mod h1:y5Zk1BBys9G+gd6Jrk0W3cC1+ELVxBWuIGO+w/tUAp0= +github.com/google/martian/v3 v3.2.1/go.mod h1:oBOf6HBosgwRXnUGWUB05QECsc6uvmMiJ3+6W4l/CUk= github.com/google/pprof v0.0.0-20181206194817-3ea8567a2e57/go.mod h1:zfwlbNMJ+OItoe0UupaVj+oy1omPYYDuagoSzA8v9mc= github.com/google/pprof v0.0.0-20190515194954-54271f7e092f/go.mod h1:zfwlbNMJ+OItoe0UupaVj+oy1omPYYDuagoSzA8v9mc= github.com/google/pprof v0.0.0-20191218002539-d4f498aebedc/go.mod h1:ZgVRPoUq/hfqzAqh7sHMqb3I9Rq5C59dIz2SbBwJ4eM= @@ -217,16 +250,26 @@ github.com/google/pprof v0.0.0-20201023163331-3e6fc7fc9c4c/go.mod h1:kpwsk12EmLe github.com/google/pprof v0.0.0-20201203190320-1bf35d6f28c2/go.mod h1:kpwsk12EmLew5upagYY7GY0pfYCcupk39gWOCRROcvE= github.com/google/pprof v0.0.0-20210122040257-d980be63207e/go.mod h1:kpwsk12EmLew5upagYY7GY0pfYCcupk39gWOCRROcvE= github.com/google/pprof v0.0.0-20210226084205-cbba55b83ad5/go.mod h1:kpwsk12EmLew5upagYY7GY0pfYCcupk39gWOCRROcvE= +github.com/google/pprof v0.0.0-20210601050228-01bbb1931b22/go.mod h1:kpwsk12EmLew5upagYY7GY0pfYCcupk39gWOCRROcvE= +github.com/google/pprof v0.0.0-20210609004039-a478d1d731e9/go.mod h1:kpwsk12EmLew5upagYY7GY0pfYCcupk39gWOCRROcvE= +github.com/google/pprof v0.0.0-20210720184732-4bb14d4b1be1/go.mod h1:kpwsk12EmLew5upagYY7GY0pfYCcupk39gWOCRROcvE= github.com/google/renameio v0.1.0/go.mod h1:KWCgfxg9yswjAJkECMjeO8J8rahYeXnNhOm40UhjYkI= github.com/google/uuid v1.1.2/go.mod h1:TIyPZe4MgqvfeYDBFedMoGGpEw/LqOeaOT+nhxU+yHo= github.com/google/uuid v1.3.0 h1:t6JiXgmwXMjEs8VusXIJk2BXHsn+wx8BZdTaoZ5fu7I= github.com/google/uuid v1.3.0/go.mod h1:TIyPZe4MgqvfeYDBFedMoGGpEw/LqOeaOT+nhxU+yHo= +github.com/googleapis/enterprise-certificate-proxy v0.0.0-20220520183353-fd19c99a87aa/go.mod h1:17drOmN3MwGY7t0e+Ei9b45FFGA3fBs3x36SsCg1hq8= github.com/googleapis/enterprise-certificate-proxy v0.2.0 h1:y8Yozv7SZtlU//QXbezB6QkpuE6jMD2/gfzk4AftXjs= github.com/googleapis/enterprise-certificate-proxy v0.2.0/go.mod h1:8C0jb7/mgJe/9KK8Lm7X9ctZC2t60YyIpYEI16jx0Qg= github.com/googleapis/gax-go/v2 v2.0.4/go.mod h1:0Wqv26UfaUD9n4G6kQubkQ+KchISgw+vpHVxEJEs9eg= github.com/googleapis/gax-go/v2 v2.0.5/go.mod h1:DWXyrwAJ9X0FpwwEdw+IPEYBICEFu5mhpdKc/us6bOk= +github.com/googleapis/gax-go/v2 v2.1.0/go.mod h1:Q3nei7sK6ybPYH7twZdmQpAd1MKb7pfu6SK+H1/DsU0= +github.com/googleapis/gax-go/v2 v2.1.1/go.mod h1:hddJymUZASv3XPyGkUpKj8pPO47Rmb0eJc8R6ouapiM= +github.com/googleapis/gax-go/v2 v2.2.0/go.mod h1:as02EH8zWkzwUoLbBaFeQ+arQaj/OthfcblKl4IGNaM= +github.com/googleapis/gax-go/v2 v2.3.0/go.mod h1:b8LNqSzNabLiUpXKkY7HAR5jr6bIT99EXz9pXxye9YM= +github.com/googleapis/gax-go/v2 v2.4.0/go.mod h1:XOTVJ59hdnfJLIP/dh8n5CGryZR2LxK9wbMD5+iXC6c= github.com/googleapis/gax-go/v2 v2.7.0 h1:IcsPKeInNvYi7eqSaDjiZqDDKu5rsmunY0Y1YupQSSQ= github.com/googleapis/gax-go/v2 v2.7.0/go.mod h1:TEop28CZZQ2y+c0VxMUmu1lV+fQx57QpBWsYpwqHJx8= +github.com/googleapis/go-type-adapters v1.0.0/go.mod h1:zHW75FOG2aur7gAO2B+MLby+cLsWGBF62rFAi7WjWO4= github.com/grpc-ecosystem/go-grpc-prometheus v1.2.0/go.mod h1:8NvIoxWQoOIhqOTXgfV/d3M/q6VIi02HzZEHgUlZvzk= github.com/grpc-ecosystem/grpc-gateway v1.16.0/go.mod h1:BDjrQk3hbvj6Nolgz8mAMFbcEtjT1g+wF4CSlocrBnw= github.com/hashicorp/consul/api v1.13.0/go.mod h1:ZlVrynguJKcYr54zGaDbaL3fOvKC9m72FhPvA8T35KQ= @@ -398,6 +441,7 @@ github.com/shirou/gopsutil/v3 v3.22.10/go.mod h1:QNza6r4YQoydyCfo6rH0blGfKahgibh github.com/sirupsen/logrus v1.2.0/go.mod h1:LxeOpSwHxABJmUn/MG1IvRgCAasNZTLOkJPxbbu5VWo= github.com/sirupsen/logrus v1.4.2/go.mod h1:tLMulIdttU9McNUspp0xgXVQah82FyeX6MwdIuYE2rE= github.com/sirupsen/logrus v1.6.0/go.mod h1:7uNnSEd1DgxDLC74fIahvMZmmYsHGZGEOFrfsX/uA88= +github.com/spaolacci/murmur3 v0.0.0-20180118202830-f09979ecbc72/go.mod h1:JwIasOWyU6f++ZhiEuf87xNszmSA2myDM2Kzu9HwQUA= github.com/spf13/cobra v1.6.1 h1:o94oiPyS4KD1mPy2fmcYYHHfCxLqYjJOhGsCHFZtEzA= github.com/spf13/cobra v1.6.1/go.mod h1:IOw/AERYS7UzyrGinqmz6HLUo219MORXGxhbaJUqzrY= github.com/spf13/pflag v1.0.5 h1:iy+VFUOCP1a+8yFto/drg2CJ5u0yRoB7fZw3DKv/JXA= @@ -417,10 +461,12 @@ github.com/stretchr/testify v1.8.0/go.mod h1:yNjHg4UonilssWZ8iaSj1OCr/vHnekPRkoO github.com/stretchr/testify v1.8.1 h1:w7B6lhMri9wdJUVmEZPGGhZzrYTPvgJArz7wNPgYKsk= github.com/stretchr/testify v1.8.1/go.mod h1:w2LPCIKwWwSfY2zedu0+kehJoqGctiVI29o6fzry7u4= github.com/stvp/go-udp-testing v0.0.0-20201019212854-469649b16807/go.mod h1:7jxmlfBCDBXRzr0eAQJ48XC1hBu1np4CS5+cHEYfwpc= -github.com/tklauser/go-sysconf v0.3.10 h1:IJ1AZGZRWbY8T5Vfk04D9WOA5WSejdflXxP03OUqALw= github.com/tklauser/go-sysconf v0.3.10/go.mod h1:C8XykCvCb+Gn0oNCWPIlcb0RuglQTYaQ2hGm7jmxEFk= -github.com/tklauser/numcpus v0.4.0 h1:E53Dm1HjH1/R2/aoCtXtPgzmElmn51aOkhCFSuZq//o= +github.com/tklauser/go-sysconf v0.3.11 h1:89WgdJhk5SNwJfu+GKyYveZ4IaJ7xAkecBo+KdJV0CM= +github.com/tklauser/go-sysconf v0.3.11/go.mod h1:GqXfhXY3kiPa0nAXPDIQIWzJbMCB7AmcWpGR8lSZfqI= github.com/tklauser/numcpus v0.4.0/go.mod h1:1+UI3pD8NW14VMwdgJNJ1ESk2UnwhAnz5hMwiKKqXCQ= +github.com/tklauser/numcpus v0.6.0 h1:kebhY2Qt+3U6RNK7UqpYNA+tJ23IBEGKkB7JQBfDYms= +github.com/tklauser/numcpus v0.6.0/go.mod h1:FEZLMke0lhOUG6w2JadTzp0a+Nl8PF/GFkQ5UVIcaL4= github.com/yuin/goldmark v1.1.25/go.mod h1:3hX8gzYuyVAZsxl0MRgGTJEmQBFcNTphYh9decYSb74= github.com/yuin/goldmark v1.1.27/go.mod h1:3hX8gzYuyVAZsxl0MRgGTJEmQBFcNTphYh9decYSb74= github.com/yuin/goldmark v1.1.32/go.mod h1:3hX8gzYuyVAZsxl0MRgGTJEmQBFcNTphYh9decYSb74= @@ -440,21 +486,23 @@ go.opencensus.io v0.22.5/go.mod h1:5pWMHQbX5EPX2/62yrJeAkowc+lfs/XD7Uxpq3pI6kk= go.opencensus.io v0.23.0/go.mod h1:XItmlyltB5F7CS4xOC1DcqMoFqwtC6OG2xF7mCv7P7E= go.opencensus.io v0.24.0 h1:y73uSU6J157QMP2kn2r30vwW1A2W2WFwSCGnAVxeaD0= go.opencensus.io v0.24.0/go.mod h1:vNK8G9p7aAivkbmorf4v+7Hgx+Zs0yY+0fOtgBfjQKo= -go.opentelemetry.io/collector v0.66.1-0.20221128222955-4ff1ff379b90 h1:yRe05/jMdzH4TFHfndZ5h2o2hKBK/79W72j8w51qNsI= -go.opentelemetry.io/collector v0.66.1-0.20221128222955-4ff1ff379b90/go.mod h1:hE6jCs+0rfiufCrVPucKZTMwfHit1okfDPnwPT2eW1I= -go.opentelemetry.io/collector/component v0.66.1-0.20221128222955-4ff1ff379b90 h1:AYSNTXbezhNg43EuYdVVcgxE/2gBVrm00FDx4DOmQVg= -go.opentelemetry.io/collector/component v0.66.1-0.20221128222955-4ff1ff379b90/go.mod h1:0c84EqXUhvYe6KW7hJfh76tiI/5yjWCH2amwyQ06XLM= -go.opentelemetry.io/collector/consumer v0.66.1-0.20221128222955-4ff1ff379b90 h1:nzNXVfC1FzXBXCLMzbMv+qK3E4EGiNsnMhfVsBd2yzc= -go.opentelemetry.io/collector/consumer v0.66.1-0.20221128222955-4ff1ff379b90/go.mod h1:WtoRZa5SnxQO1ZEQdVxYpFcXCmq62rakv0oUSlPO0NQ= -go.opentelemetry.io/collector/extension/zpagesextension v0.65.0 h1:T5JJIJ3cmClqdSMgkbjoIiP9p059AAvbfcd3houJkxM= -go.opentelemetry.io/collector/featuregate v0.66.1-0.20221128222955-4ff1ff379b90 h1:UuJSFWbi9XxyNZsJKZuvpWg35BgRbcCGFH+38V2MAdw= -go.opentelemetry.io/collector/featuregate v0.66.1-0.20221128222955-4ff1ff379b90/go.mod h1:tewuFKJYalWBU0bmNKg++MC1ipINXUr6szYzOw2p1GI= -go.opentelemetry.io/collector/pdata v0.66.1-0.20221128222955-4ff1ff379b90 h1:Vu4S4jSNcd0VFPzxQNO4+UqGwnes1xJDoFLPRiWHm8I= -go.opentelemetry.io/collector/pdata v0.66.1-0.20221128222955-4ff1ff379b90/go.mod h1:pqyaznLzk21m+1KL6fwOsRryRELL+zNM0qiVSn0MbVc= -go.opentelemetry.io/collector/processor/batchprocessor v0.66.1-0.20221128222955-4ff1ff379b90 h1:K12L9juzjChBMfp7cQaQsToz7i7975tUYVzJ3Tpw/Cw= -go.opentelemetry.io/collector/processor/batchprocessor v0.66.1-0.20221128222955-4ff1ff379b90/go.mod h1:XhGTsC1B/bq4gpg8IZ/QYBLXkzE4Gw3r7Xu2+ik8A1Q= -go.opentelemetry.io/collector/semconv v0.66.1-0.20221128222955-4ff1ff379b90 h1:hFaTA68cggZKWMv7wQ3bKP8KGTbowh/5AQZKCHzHTqM= -go.opentelemetry.io/collector/semconv v0.66.1-0.20221128222955-4ff1ff379b90/go.mod h1:5o9yhOa+ABt7g2E5JABDxGZ1PQPbtfxrKNbYn+LOTXU= +go.opentelemetry.io/collector v0.66.1-0.20221202005155-1c54042beb70 h1:INB2CsOtqqrija2KvMuIpbBQ3qX1BECEeR+d0NJX+oM= +go.opentelemetry.io/collector v0.66.1-0.20221202005155-1c54042beb70/go.mod h1:d0NHkHyANJy3HDTvYE/PoylMShUmFIbiir89ieI0X0c= +go.opentelemetry.io/collector/component v0.66.1-0.20221202005155-1c54042beb70 h1:dEoJhzCmRShgmVro/kXm6pouGElgxkH2DsvanzCeZtU= +go.opentelemetry.io/collector/component v0.66.1-0.20221202005155-1c54042beb70/go.mod h1:OsVnvFFe38QSpcuZlQ8cvarDzcloCexgQ1/B2m80F6U= +go.opentelemetry.io/collector/confmap v0.0.0-20221201172708-2bdff61fa52a h1:2TscCXAQASO2kU9xHcMIUM/FP29fiQIRTilZmliq/7I= +go.opentelemetry.io/collector/confmap v0.0.0-20221201172708-2bdff61fa52a/go.mod h1:qJ3e8bA8h4wz/jYlbeEUafVHdrU7DkpStnmIUAz6VTQ= +go.opentelemetry.io/collector/consumer v0.66.1-0.20221202005155-1c54042beb70 h1:XwpVjI1KeKGPXOZBLefGILMziPYuNf6IzbmiIEsIyI0= +go.opentelemetry.io/collector/consumer v0.66.1-0.20221202005155-1c54042beb70/go.mod h1:EWVBcSGcIcmeDGTnIboc/aqa3agsBeH8/q7yFWG7xVc= +go.opentelemetry.io/collector/extension/zpagesextension v0.66.0 h1:tPqSKH5K3VhTT0XXVoWL3woWBSTJqnXZQRt0ZLSCoCc= +go.opentelemetry.io/collector/featuregate v0.66.1-0.20221202005155-1c54042beb70 h1:V0tf4ebciqIs07jFATfLGdUpLRaEsi+AiWuA/in0G8Y= +go.opentelemetry.io/collector/featuregate v0.66.1-0.20221202005155-1c54042beb70/go.mod h1:tewuFKJYalWBU0bmNKg++MC1ipINXUr6szYzOw2p1GI= +go.opentelemetry.io/collector/pdata v0.66.1-0.20221202005155-1c54042beb70 h1:TPOrxkEMvZzfBSwF3ct+kUUgKA5g8unkZZbKQvJweeA= +go.opentelemetry.io/collector/pdata v0.66.1-0.20221202005155-1c54042beb70/go.mod h1:pqyaznLzk21m+1KL6fwOsRryRELL+zNM0qiVSn0MbVc= +go.opentelemetry.io/collector/processor/batchprocessor v0.66.1-0.20221202005155-1c54042beb70 h1:Y4e8NnVevonnAgmjX9Z7QIMA32yMqHAOnAlh8SzTS8c= +go.opentelemetry.io/collector/processor/batchprocessor v0.66.1-0.20221202005155-1c54042beb70/go.mod h1:Pi1CsKDQFoDrUP1i3+VdE6s2Xuji7bOGFBgqHK0J32E= +go.opentelemetry.io/collector/semconv v0.66.1-0.20221202005155-1c54042beb70 h1:Q5L9Urod3c8as6ZYaoaqBjarx/HXxsxy34DFZIU2fO4= +go.opentelemetry.io/collector/semconv v0.66.1-0.20221202005155-1c54042beb70/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= @@ -470,6 +518,7 @@ go.opentelemetry.io/otel/sdk/metric v0.33.0 h1:oTqyWfksgKoJmbrs2q7O7ahkJzt+Ipeki go.opentelemetry.io/otel/sdk/metric v0.33.0/go.mod h1:xdypMeA21JBOvjjzDUtD0kzIcHO/SPez+a8HOzJPGp0= go.opentelemetry.io/otel/trace v1.11.1 h1:ofxdnzsNrGBYXbP7t7zpUK281+go5rF7dvdIZXF8gdQ= go.opentelemetry.io/otel/trace v1.11.1/go.mod h1:f/Q9G7vzk5u91PhbmKbg1Qn0rzH1LJ4vbPHFGkTPtOk= +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= go.uber.org/atomic v1.10.0/go.mod h1:LUxbIzbOniOlMKjJjyPfpl4v+PKK2cNJn91OQbhoJI0= @@ -478,8 +527,8 @@ go.uber.org/multierr v1.6.0/go.mod h1:cdWPpRnG4AhwMwsgIHip0KRBQjJy5kYEpYjJxpXp9i go.uber.org/multierr v1.8.0 h1:dg6GjLku4EH+249NNmoIciG9N/jURbDG+pFlTkhzIC8= go.uber.org/multierr v1.8.0/go.mod h1:7EAYxJLBy9rStEaz58O2t4Uvip6FSURkq8/ppBp95ak= go.uber.org/zap v1.17.0/go.mod h1:MXVU+bhUf/A7Xi2HNOnopQOrmycQ5Ih87HtOu4q5SSo= -go.uber.org/zap v1.23.0 h1:OjGQ5KQDEUawVHxNwQgPpiypGHOxo2mNZsOqTak4fFY= -go.uber.org/zap v1.23.0/go.mod h1:D+nX8jyLsMHMYrln8A0rJjFt/T/9/bGgIhAqxv5URuY= +go.uber.org/zap v1.24.0 h1:FiJd5l1UOLj0wCgbSE0rwwXHzEdAZS6hiiSnxJN/D60= +go.uber.org/zap v1.24.0/go.mod h1:2kMP+WWQ8aoFoedH3T2sq6iJ2yDWpHbP0f6MQbS9Gkg= golang.org/x/crypto v0.0.0-20180904163835-0709b304e793/go.mod h1:6SG95UA2DQfeDnfUPMdvaQW0Q7yPrPDi9nlGo2tz2b4= golang.org/x/crypto v0.0.0-20190308221718-c2843e01d9a2/go.mod h1:djNgcEr1/C05ACkg1iLfiJU5Ep61QUkGW8qpdssI0+w= golang.org/x/crypto v0.0.0-20190510104115-cbcb75029529/go.mod h1:yigFU9vqHzYiE8UmvKecakEJjdnWj3jj499lnFckfCI= @@ -564,8 +613,12 @@ golang.org/x/net v0.0.0-20210503060351-7fd8e65b6420/go.mod h1:9nx3DQGgdP8bBQD5qx golang.org/x/net v0.0.0-20210525063256-abc453219eb5/go.mod h1:9nx3DQGgdP8bBQD5qxJ1jj9UTztislL4KSBs9R2vV5Y= golang.org/x/net v0.0.0-20220127200216-cd36cc0744dd/go.mod h1:CfG3xpIq0wQ8r1q4Su4UZFWDARRcnwPjda9FqA0JpMk= golang.org/x/net v0.0.0-20220225172249-27dd8689420f/go.mod h1:CfG3xpIq0wQ8r1q4Su4UZFWDARRcnwPjda9FqA0JpMk= -golang.org/x/net v0.0.0-20221014081412-f15817d10f9b h1:tvrvnPFcdzp294diPnrdZZZ8XUt2Tyj7svb7X52iDuU= -golang.org/x/net v0.0.0-20221014081412-f15817d10f9b/go.mod h1:YDH+HFinaLZZlnHAfSS6ZXJJ9M9t4Dl22yv3iI2vPwk= +golang.org/x/net v0.0.0-20220325170049-de3da57026de/go.mod h1:CfG3xpIq0wQ8r1q4Su4UZFWDARRcnwPjda9FqA0JpMk= +golang.org/x/net v0.0.0-20220412020605-290c469a71a5/go.mod h1:CfG3xpIq0wQ8r1q4Su4UZFWDARRcnwPjda9FqA0JpMk= +golang.org/x/net v0.0.0-20220425223048-2871e0cb64e4/go.mod h1:CfG3xpIq0wQ8r1q4Su4UZFWDARRcnwPjda9FqA0JpMk= +golang.org/x/net v0.0.0-20220607020251-c690dde0001d/go.mod h1:XRhObCWvk6IyKnWLug+ECip1KBveYUHfp+8e9klMJ9c= +golang.org/x/net v0.0.0-20221017152216-f25eb7ecb193 h1:3Moaxt4TfzNcQH6DWvlYKraN1ozhBXQHcgvXjRGeim0= +golang.org/x/net v0.0.0-20221017152216-f25eb7ecb193/go.mod h1:RpDiru2p0u2F0lLpEoqnP2+7xs0ifAuOcJ442g6GU2s= golang.org/x/oauth2 v0.0.0-20180821212333-d2e6202438be/go.mod h1:N/0e6XlmueqKjAGxoOufVs8QHGRruUQn6yWY3a++T0U= golang.org/x/oauth2 v0.0.0-20190226205417-e64efc72b421/go.mod h1:gOpvHmFTYa4IltrdGE7lF6nIHvwfUNPOp7c8zoXwtLw= golang.org/x/oauth2 v0.0.0-20190604053449-0f29369cfe45/go.mod h1:gOpvHmFTYa4IltrdGE7lF6nIHvwfUNPOp7c8zoXwtLw= @@ -577,9 +630,15 @@ golang.org/x/oauth2 v0.0.0-20201208152858-08078c50e5b5/go.mod h1:KelEdhl1UZF7XfJ golang.org/x/oauth2 v0.0.0-20210218202405-ba52d332ba99/go.mod h1:KelEdhl1UZF7XfJ4dDtk6s++YSgaE7mD/BuKKDLBl4A= golang.org/x/oauth2 v0.0.0-20210220000619-9bb904979d93/go.mod h1:KelEdhl1UZF7XfJ4dDtk6s++YSgaE7mD/BuKKDLBl4A= golang.org/x/oauth2 v0.0.0-20210313182246-cd4f82c27b84/go.mod h1:KelEdhl1UZF7XfJ4dDtk6s++YSgaE7mD/BuKKDLBl4A= -golang.org/x/oauth2 v0.0.0-20210427180440-81ed05c6b58c/go.mod h1:KelEdhl1UZF7XfJ4dDtk6s++YSgaE7mD/BuKKDLBl4A= golang.org/x/oauth2 v0.0.0-20210514164344-f6687ab2804c/go.mod h1:KelEdhl1UZF7XfJ4dDtk6s++YSgaE7mD/BuKKDLBl4A= +golang.org/x/oauth2 v0.0.0-20210628180205-a41e5a781914/go.mod h1:KelEdhl1UZF7XfJ4dDtk6s++YSgaE7mD/BuKKDLBl4A= +golang.org/x/oauth2 v0.0.0-20210805134026-6f1e6394065a/go.mod h1:KelEdhl1UZF7XfJ4dDtk6s++YSgaE7mD/BuKKDLBl4A= +golang.org/x/oauth2 v0.0.0-20210819190943-2bc19b11175f/go.mod h1:KelEdhl1UZF7XfJ4dDtk6s++YSgaE7mD/BuKKDLBl4A= +golang.org/x/oauth2 v0.0.0-20211104180415-d3ed0bb246c8/go.mod h1:KelEdhl1UZF7XfJ4dDtk6s++YSgaE7mD/BuKKDLBl4A= golang.org/x/oauth2 v0.0.0-20220223155221-ee480838109b/go.mod h1:DAh4E804XQdzx2j+YRIaUnCqCV2RuMz24cGBJ5QYIrc= +golang.org/x/oauth2 v0.0.0-20220309155454-6242fa91716a/go.mod h1:DAh4E804XQdzx2j+YRIaUnCqCV2RuMz24cGBJ5QYIrc= +golang.org/x/oauth2 v0.0.0-20220411215720-9780585627b5/go.mod h1:DAh4E804XQdzx2j+YRIaUnCqCV2RuMz24cGBJ5QYIrc= +golang.org/x/oauth2 v0.0.0-20220608161450-d0670ef3b1eb/go.mod h1:jaDAt6Dkxork7LmZnYtzbRWj0W47D86a3TGe0YHBvmE= golang.org/x/oauth2 v0.0.0-20221014153046-6fdb5e3db783 h1:nt+Q6cXKz4MosCSpnbMtqiQ8Oz0pxTef2B4Vca2lvfk= golang.org/x/oauth2 v0.0.0-20221014153046-6fdb5e3db783/go.mod h1:h4gKUeWbJ4rQPri7E0u6Gs4e9Ri2zaLxzw5DI5XGrYg= golang.org/x/sync v0.0.0-20180314180146-1d60e4601c6f/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM= @@ -655,14 +714,29 @@ golang.org/x/sys v0.0.0-20210320140829-1e4c9ba3b0c4/go.mod h1:h1NjWce9XRLGQEsW7w golang.org/x/sys v0.0.0-20210330210617-4fbd30eecc44/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= golang.org/x/sys v0.0.0-20210403161142-5e06dd20ab57/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= golang.org/x/sys v0.0.0-20210423082822-04245dca01da/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= -golang.org/x/sys v0.0.0-20210503080704-8803ae5d1324/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= golang.org/x/sys v0.0.0-20210510120138-977fb7262007/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= +golang.org/x/sys v0.0.0-20210514084401-e8d321eab015/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= golang.org/x/sys v0.0.0-20210603081109-ebe580a85c40/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= +golang.org/x/sys v0.0.0-20210603125802-9665404d3644/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= golang.org/x/sys v0.0.0-20210615035016-665e8c7367d1/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= +golang.org/x/sys v0.0.0-20210616094352-59db8d763f22/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= +golang.org/x/sys v0.0.0-20210630005230-0f9fa26af87c/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= +golang.org/x/sys v0.0.0-20210806184541-e5e7981a1069/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= +golang.org/x/sys v0.0.0-20210823070655-63515b42dcdf/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= +golang.org/x/sys v0.0.0-20210908233432-aa78b53d3365/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= +golang.org/x/sys v0.0.0-20211124211545-fe61309f8881/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= +golang.org/x/sys v0.0.0-20211210111614-af8b64212486/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= golang.org/x/sys v0.0.0-20211216021012-1d35b9e2eb4e/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= golang.org/x/sys v0.0.0-20220114195835-da31bd327af9/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= golang.org/x/sys v0.0.0-20220128215802-99c3d69c2c27/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= +golang.org/x/sys v0.0.0-20220209214540-3681064d5158/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= +golang.org/x/sys v0.0.0-20220227234510-4e6760a101f9/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= +golang.org/x/sys v0.0.0-20220328115105-d36c6a25d886/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= +golang.org/x/sys v0.0.0-20220412211240-33da011f77ad/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= +golang.org/x/sys v0.0.0-20220502124256-b6088ccd6cba/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= +golang.org/x/sys v0.0.0-20220503163025-988cb79eb6c6/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= golang.org/x/sys v0.0.0-20220520151302-bc2c85ada10a/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= +golang.org/x/sys v0.0.0-20220610221304-9f5ed59c137d/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= golang.org/x/sys v0.0.0-20220708085239-5a0f0661e09d/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= golang.org/x/sys v0.2.0 h1:ljd4t30dBnAvMZaQCevtY0xLLD0A+bRZXbgLMLU1F/A= golang.org/x/sys v0.2.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= @@ -732,11 +806,18 @@ golang.org/x/tools v0.0.0-20201208233053-a543418bbed2/go.mod h1:emZCQorbCU4vsT4f golang.org/x/tools v0.0.0-20210105154028-b0ab187a4818/go.mod h1:emZCQorbCU4vsT4fOWvOPXz4eW1wZW4PmDk9uLelYpA= golang.org/x/tools v0.0.0-20210106214847-113979e3529a/go.mod h1:emZCQorbCU4vsT4fOWvOPXz4eW1wZW4PmDk9uLelYpA= golang.org/x/tools v0.1.0/go.mod h1:xkSsbof2nBLbhDlRMhhhyNLN/zl3eTqcnHD5viDpcZ0= +golang.org/x/tools v0.1.1/go.mod h1:o0xws9oXOQQZyjljx8fwUC0k7L1pTE6eaCbjGeHmOkk= golang.org/x/tools v0.1.2/go.mod h1:o0xws9oXOQQZyjljx8fwUC0k7L1pTE6eaCbjGeHmOkk= +golang.org/x/tools v0.1.3/go.mod h1:o0xws9oXOQQZyjljx8fwUC0k7L1pTE6eaCbjGeHmOkk= +golang.org/x/tools v0.1.4/go.mod h1:o0xws9oXOQQZyjljx8fwUC0k7L1pTE6eaCbjGeHmOkk= +golang.org/x/tools v0.1.5/go.mod h1:o0xws9oXOQQZyjljx8fwUC0k7L1pTE6eaCbjGeHmOkk= golang.org/x/xerrors v0.0.0-20190717185122-a985d3407aa7/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0= golang.org/x/xerrors v0.0.0-20191011141410-1b5146add898/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0= golang.org/x/xerrors v0.0.0-20191204190536-9bdfabe68543/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0= golang.org/x/xerrors v0.0.0-20200804184101-5ec99f83aff1/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0= +golang.org/x/xerrors v0.0.0-20220411194840-2f41105eb62f/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0= +golang.org/x/xerrors v0.0.0-20220517211312-f3a8303e98df/go.mod h1:K8+ghG5WaK9qNqU5K3HdILfMLy1f3aNYFI/wnl100a8= +golang.org/x/xerrors v0.0.0-20220609144429-65e65417b02f/go.mod h1:K8+ghG5WaK9qNqU5K3HdILfMLy1f3aNYFI/wnl100a8= google.golang.org/api v0.4.0/go.mod h1:8k5glujaEP+g9n7WNsDg8QP6cUVNI86fCNMcbazEtwE= google.golang.org/api v0.7.0/go.mod h1:WtwebWUNSVBH/HAw79HIFXZNqEvBhG+Ra+ax0hx3E3M= google.golang.org/api v0.8.0/go.mod h1:o4eAsZoiT+ibD93RtjEohWalFOjRDx6CVaqeizhEnKg= @@ -758,7 +839,24 @@ google.golang.org/api v0.36.0/go.mod h1:+z5ficQTmoYpPn8LCUNVpK5I7hwkpjbcgqA7I34q google.golang.org/api v0.40.0/go.mod h1:fYKFpnQN0DsDSKRVRcQSDQNtqWPfM9i+zNPxepjRCQ8= google.golang.org/api v0.41.0/go.mod h1:RkxM5lITDfTzmyKFPt+wGrCJbVfniCr2ool8kTBzRTU= google.golang.org/api v0.43.0/go.mod h1:nQsDGjRXMo4lvh5hP0TKqF244gqhGcr/YSIykhUk/94= -google.golang.org/api v0.46.0/go.mod h1:ceL4oozhkAiTID8XMmJBsIxID/9wMXJVVFXPg4ylg3I= +google.golang.org/api v0.47.0/go.mod h1:Wbvgpq1HddcWVtzsVLyfLp8lDg6AA241LmgIL59tHXo= +google.golang.org/api v0.48.0/go.mod h1:71Pr1vy+TAZRPkPs/xlCf5SsU8WjuAWv1Pfjbtukyy4= +google.golang.org/api v0.50.0/go.mod h1:4bNT5pAuq5ji4SRZm+5QIkjny9JAyVD/3gaSihNefaw= +google.golang.org/api v0.51.0/go.mod h1:t4HdrdoNgyN5cbEfm7Lum0lcLDLiise1F8qDKX00sOU= +google.golang.org/api v0.54.0/go.mod h1:7C4bFFOvVDGXjfDTAsgGwDgAxRDeQ4X8NvUedIt6z3k= +google.golang.org/api v0.55.0/go.mod h1:38yMfeP1kfjsl8isn0tliTjIb1rJXcQi4UXlbqivdVE= +google.golang.org/api v0.56.0/go.mod h1:38yMfeP1kfjsl8isn0tliTjIb1rJXcQi4UXlbqivdVE= +google.golang.org/api v0.57.0/go.mod h1:dVPlbZyBo2/OjBpmvNdpn2GRm6rPy75jyU7bmhdrMgI= +google.golang.org/api v0.61.0/go.mod h1:xQRti5UdCmoCEqFxcz93fTl338AVqDgyaDRuOZ3hg9I= +google.golang.org/api v0.63.0/go.mod h1:gs4ij2ffTRXwuzzgJl/56BdwJaA194ijkfn++9tDuPo= +google.golang.org/api v0.67.0/go.mod h1:ShHKP8E60yPsKNw/w8w+VYaj9H6buA5UqDp8dhbQZ6g= +google.golang.org/api v0.70.0/go.mod h1:Bs4ZM2HGifEvXwd50TtW70ovgJffJYw2oRCOFU/SkfA= +google.golang.org/api v0.71.0/go.mod h1:4PyU6e6JogV1f9eA4voyrTY2batOLdgZ5qZ5HOCc4j8= +google.golang.org/api v0.74.0/go.mod h1:ZpfMZOVRMywNyvJFeqL9HRWBgAuRfSjJFpe9QtRRyDs= +google.golang.org/api v0.75.0/go.mod h1:pU9QmyHLnzlpar1Mjt4IbapUCy8J+6HD6GeELN69ljA= +google.golang.org/api v0.78.0/go.mod h1:1Sg78yoMLOhlQTeF+ARBoytAcH1NNyyl390YMy6rKmw= +google.golang.org/api v0.80.0/go.mod h1:xY3nI94gbvBrE0J6NHXhxOmW97HG7Khjkku6AFB3Hyg= +google.golang.org/api v0.84.0/go.mod h1:NTsGnUFJMYROtiquksZHBWtHfeMC7iYthki7Eq3pa8o= google.golang.org/api v0.103.0 h1:9yuVqlu2JCvcLg9p8S3fcFLZij8EPSyvODIY1rkMizQ= google.golang.org/api v0.103.0/go.mod h1:hGtW6nK1AC+d9si/UBhw8Xli+QMOf6xyNAyJw4qU9w0= google.golang.org/appengine v1.1.0/go.mod h1:EbEs0AVv82hx2wNQdGPgUI5lhzA/G0D9YwlJXL52JkM= @@ -809,10 +907,46 @@ google.golang.org/genproto v0.0.0-20210222152913-aa3ee6e6a81c/go.mod h1:FWY/as6D google.golang.org/genproto v0.0.0-20210303154014-9728d6b83eeb/go.mod h1:FWY/as6DDZQgahTzZj3fqbO1CbirC29ZNUFHwi0/+no= google.golang.org/genproto v0.0.0-20210310155132-4ce2db91004e/go.mod h1:FWY/as6DDZQgahTzZj3fqbO1CbirC29ZNUFHwi0/+no= google.golang.org/genproto v0.0.0-20210319143718-93e7006c17a6/go.mod h1:FWY/as6DDZQgahTzZj3fqbO1CbirC29ZNUFHwi0/+no= +google.golang.org/genproto v0.0.0-20210329143202-679c6ae281ee/go.mod h1:9lPAdzaEmUacj36I+k7YKbEc5CXzPIeORRgDAUOu28A= google.golang.org/genproto v0.0.0-20210402141018-6c239bbf2bb1/go.mod h1:9lPAdzaEmUacj36I+k7YKbEc5CXzPIeORRgDAUOu28A= -google.golang.org/genproto v0.0.0-20210429181445-86c259c2b4ab/go.mod h1:P3QM42oQyzQSnHPnZ/vqoCdDmzH28fzWByN9asMeM8A= -google.golang.org/genproto v0.0.0-20210517163617-5e0236093d7a/go.mod h1:P3QM42oQyzQSnHPnZ/vqoCdDmzH28fzWByN9asMeM8A= +google.golang.org/genproto v0.0.0-20210513213006-bf773b8c8384/go.mod h1:P3QM42oQyzQSnHPnZ/vqoCdDmzH28fzWByN9asMeM8A= google.golang.org/genproto v0.0.0-20210602131652-f16073e35f0c/go.mod h1:UODoCrxHCcBojKKwX1terBiRUaqAsFqJiF615XL43r0= +google.golang.org/genproto v0.0.0-20210604141403-392c879c8b08/go.mod h1:UODoCrxHCcBojKKwX1terBiRUaqAsFqJiF615XL43r0= +google.golang.org/genproto v0.0.0-20210608205507-b6d2f5bf0d7d/go.mod h1:UODoCrxHCcBojKKwX1terBiRUaqAsFqJiF615XL43r0= +google.golang.org/genproto v0.0.0-20210624195500-8bfb893ecb84/go.mod h1:SzzZ/N+nwJDaO1kznhnlzqS8ocJICar6hYhVyhi++24= +google.golang.org/genproto v0.0.0-20210713002101-d411969a0d9a/go.mod h1:AxrInvYm1dci+enl5hChSFPOmmUF1+uAa/UsgNRWd7k= +google.golang.org/genproto v0.0.0-20210716133855-ce7ef5c701ea/go.mod h1:AxrInvYm1dci+enl5hChSFPOmmUF1+uAa/UsgNRWd7k= +google.golang.org/genproto v0.0.0-20210728212813-7823e685a01f/go.mod h1:ob2IJxKrgPT52GcgX759i1sleT07tiKowYBGbczaW48= +google.golang.org/genproto v0.0.0-20210805201207-89edb61ffb67/go.mod h1:ob2IJxKrgPT52GcgX759i1sleT07tiKowYBGbczaW48= +google.golang.org/genproto v0.0.0-20210813162853-db860fec028c/go.mod h1:cFeNkxwySK631ADgubI+/XFU/xp8FD5KIVV4rj8UC5w= +google.golang.org/genproto v0.0.0-20210821163610-241b8fcbd6c8/go.mod h1:eFjDcFEctNawg4eG61bRv87N7iHBWyVhJu7u1kqDUXY= +google.golang.org/genproto v0.0.0-20210828152312-66f60bf46e71/go.mod h1:eFjDcFEctNawg4eG61bRv87N7iHBWyVhJu7u1kqDUXY= +google.golang.org/genproto v0.0.0-20210831024726-fe130286e0e2/go.mod h1:eFjDcFEctNawg4eG61bRv87N7iHBWyVhJu7u1kqDUXY= +google.golang.org/genproto v0.0.0-20210903162649-d08c68adba83/go.mod h1:eFjDcFEctNawg4eG61bRv87N7iHBWyVhJu7u1kqDUXY= +google.golang.org/genproto v0.0.0-20210909211513-a8c4777a87af/go.mod h1:eFjDcFEctNawg4eG61bRv87N7iHBWyVhJu7u1kqDUXY= +google.golang.org/genproto v0.0.0-20210924002016-3dee208752a0/go.mod h1:5CzLGKJ67TSI2B9POpiiyGha0AjJvZIUgRMt1dSmuhc= +google.golang.org/genproto v0.0.0-20211118181313-81c1377c94b1/go.mod h1:5CzLGKJ67TSI2B9POpiiyGha0AjJvZIUgRMt1dSmuhc= +google.golang.org/genproto v0.0.0-20211206160659-862468c7d6e0/go.mod h1:5CzLGKJ67TSI2B9POpiiyGha0AjJvZIUgRMt1dSmuhc= +google.golang.org/genproto v0.0.0-20211208223120-3a66f561d7aa/go.mod h1:5CzLGKJ67TSI2B9POpiiyGha0AjJvZIUgRMt1dSmuhc= +google.golang.org/genproto v0.0.0-20211221195035-429b39de9b1c/go.mod h1:5CzLGKJ67TSI2B9POpiiyGha0AjJvZIUgRMt1dSmuhc= +google.golang.org/genproto v0.0.0-20220126215142-9970aeb2e350/go.mod h1:5CzLGKJ67TSI2B9POpiiyGha0AjJvZIUgRMt1dSmuhc= +google.golang.org/genproto v0.0.0-20220207164111-0872dc986b00/go.mod h1:5CzLGKJ67TSI2B9POpiiyGha0AjJvZIUgRMt1dSmuhc= +google.golang.org/genproto v0.0.0-20220218161850-94dd64e39d7c/go.mod h1:kGP+zUP2Ddo0ayMi4YuN7C3WZyJvGLZRh8Z5wnAqvEI= +google.golang.org/genproto v0.0.0-20220222213610-43724f9ea8cf/go.mod h1:kGP+zUP2Ddo0ayMi4YuN7C3WZyJvGLZRh8Z5wnAqvEI= +google.golang.org/genproto v0.0.0-20220304144024-325a89244dc8/go.mod h1:kGP+zUP2Ddo0ayMi4YuN7C3WZyJvGLZRh8Z5wnAqvEI= +google.golang.org/genproto v0.0.0-20220310185008-1973136f34c6/go.mod h1:kGP+zUP2Ddo0ayMi4YuN7C3WZyJvGLZRh8Z5wnAqvEI= +google.golang.org/genproto v0.0.0-20220324131243-acbaeb5b85eb/go.mod h1:hAL49I2IFola2sVEjAn7MEwsja0xp51I0tlGAf9hz4E= +google.golang.org/genproto v0.0.0-20220407144326-9054f6ed7bac/go.mod h1:8w6bsBMX6yCPbAVTeqQHvzxW0EIFigd5lZyahWgyfDo= +google.golang.org/genproto v0.0.0-20220413183235-5e96e2839df9/go.mod h1:8w6bsBMX6yCPbAVTeqQHvzxW0EIFigd5lZyahWgyfDo= +google.golang.org/genproto v0.0.0-20220414192740-2d67ff6cf2b4/go.mod h1:8w6bsBMX6yCPbAVTeqQHvzxW0EIFigd5lZyahWgyfDo= +google.golang.org/genproto v0.0.0-20220421151946-72621c1f0bd3/go.mod h1:8w6bsBMX6yCPbAVTeqQHvzxW0EIFigd5lZyahWgyfDo= +google.golang.org/genproto v0.0.0-20220429170224-98d788798c3e/go.mod h1:8w6bsBMX6yCPbAVTeqQHvzxW0EIFigd5lZyahWgyfDo= +google.golang.org/genproto v0.0.0-20220505152158-f39f71e6c8f3/go.mod h1:RAyBrSAP7Fh3Nc84ghnVLDPuV51xc9agzmm4Ph6i0Q4= +google.golang.org/genproto v0.0.0-20220518221133-4f43b3371335/go.mod h1:RAyBrSAP7Fh3Nc84ghnVLDPuV51xc9agzmm4Ph6i0Q4= +google.golang.org/genproto v0.0.0-20220523171625-347a074981d8/go.mod h1:RAyBrSAP7Fh3Nc84ghnVLDPuV51xc9agzmm4Ph6i0Q4= +google.golang.org/genproto v0.0.0-20220608133413-ed9918b62aac/go.mod h1:KEWEmljWE5zPzLBa/oHl6DaEt9LmfH6WtH1OHIvleBA= +google.golang.org/genproto v0.0.0-20220616135557-88e70c0c3a90/go.mod h1:KEWEmljWE5zPzLBa/oHl6DaEt9LmfH6WtH1OHIvleBA= +google.golang.org/genproto v0.0.0-20220617124728-180714bec0ad/go.mod h1:KEWEmljWE5zPzLBa/oHl6DaEt9LmfH6WtH1OHIvleBA= google.golang.org/genproto v0.0.0-20221027153422-115e99e71e1c h1:QgY/XxIAIeccR+Ca/rDdKubLIU9rcJ3xfy1DC/Wd2Oo= google.golang.org/genproto v0.0.0-20221027153422-115e99e71e1c/go.mod h1:CGI5F/G+E5bKwmfYo09AXuVN4dD894kIKUFmVbP2/Fo= google.golang.org/grpc v1.14.0/go.mod h1:yo6s7OP7yaDglbqo1J04qKzAhqBH6lvTonzMVmEdcZw= @@ -839,8 +973,18 @@ google.golang.org/grpc v1.36.1/go.mod h1:qjiiYl8FncCW8feJPdyg3v6XW24KsRHe+dy9BAG google.golang.org/grpc v1.37.0/go.mod h1:NREThFqKR1f3iQ6oBuvc5LadQuXVGo9rkm5ZGrQdJfM= google.golang.org/grpc v1.37.1/go.mod h1:NREThFqKR1f3iQ6oBuvc5LadQuXVGo9rkm5ZGrQdJfM= google.golang.org/grpc v1.38.0/go.mod h1:NREThFqKR1f3iQ6oBuvc5LadQuXVGo9rkm5ZGrQdJfM= +google.golang.org/grpc v1.39.0/go.mod h1:PImNr+rS9TWYb2O4/emRugxiyHZ5JyHW5F+RPnDzfrE= +google.golang.org/grpc v1.39.1/go.mod h1:PImNr+rS9TWYb2O4/emRugxiyHZ5JyHW5F+RPnDzfrE= +google.golang.org/grpc v1.40.0/go.mod h1:ogyxbiOoUXAkP+4+xa6PZSE9DZgIHtSpzjDTB9KAK34= +google.golang.org/grpc v1.40.1/go.mod h1:ogyxbiOoUXAkP+4+xa6PZSE9DZgIHtSpzjDTB9KAK34= +google.golang.org/grpc v1.44.0/go.mod h1:k+4IHHFw41K8+bbowsex27ge2rCb65oeWqe4jJ590SU= +google.golang.org/grpc v1.45.0/go.mod h1:lN7owxKUQEqMfSyQikvvk5tf/6zMPsrK+ONuO11+0rQ= +google.golang.org/grpc v1.46.0/go.mod h1:vN9eftEi1UMyUsIF80+uQXhHjbXYbm0uXoFCACuMGWk= +google.golang.org/grpc v1.46.2/go.mod h1:vN9eftEi1UMyUsIF80+uQXhHjbXYbm0uXoFCACuMGWk= +google.golang.org/grpc v1.47.0/go.mod h1:vN9eftEi1UMyUsIF80+uQXhHjbXYbm0uXoFCACuMGWk= google.golang.org/grpc v1.51.0 h1:E1eGv1FTqoLIdnBCZufiSHgKjlqG6fKFf6pPWtMTh8U= google.golang.org/grpc v1.51.0/go.mod h1:wgNDFcnuBGmxLKI/qn4T+m5BtEBYXJPvibbUPsAIPww= +google.golang.org/grpc/cmd/protoc-gen-go-grpc v1.1.0/go.mod h1:6Kw0yEErY5E/yWrBtf03jp27GLLJujG4z/JK95pnjjw= google.golang.org/protobuf v0.0.0-20200109180630-ec00e32a8dfd/go.mod h1:DFci5gLYBciE7Vtevhsrf46CRTquxDuWsQurQQe4oz8= google.golang.org/protobuf v0.0.0-20200221191635-4d8936d0db64/go.mod h1:kwYJMbMJ01Woi6D6+Kah6886xMZcty6N08ah7+eCXa0= google.golang.org/protobuf v0.0.0-20200228230310-ab0ca4ff8a60/go.mod h1:cfTl7dwQJ+fmap5saPgwCLgHXTUD7jkjRqWcaiX5VyM= @@ -853,6 +997,7 @@ google.golang.org/protobuf v1.24.0/go.mod h1:r/3tXBNzIEhYS9I1OUVjXDlt8tc493IdKGj google.golang.org/protobuf v1.25.0/go.mod h1:9JNX74DMeImyA3h4bdi1ymwjUzf21/xIlbajtzgsN7c= google.golang.org/protobuf v1.26.0-rc.1/go.mod h1:jlhhOSvTdKEhbULTjvd4ARK9grFBp09yW+WbY/TyQbw= google.golang.org/protobuf v1.26.0/go.mod h1:9q0QmTI4eRPtz6boOQmLYwt+qCgq0jsYwAQnmE0givc= +google.golang.org/protobuf v1.27.1/go.mod h1:9q0QmTI4eRPtz6boOQmLYwt+qCgq0jsYwAQnmE0givc= google.golang.org/protobuf v1.28.0/go.mod h1:HV8QOd/L58Z+nl8r43ehVNZIU/HEI6OcFqwMG9pJV4I= google.golang.org/protobuf v1.28.1 h1:d0NfwRgPtno5B1Wa6L2DAG+KivqkdutMf1UhdNx175w= google.golang.org/protobuf v1.28.1/go.mod h1:HV8QOd/L58Z+nl8r43ehVNZIU/HEI6OcFqwMG9pJV4I= diff --git a/exporter/humioexporter/go.mod b/exporter/humioexporter/go.mod index 525bc615399b..7a4cfdee9da4 100644 --- a/exporter/humioexporter/go.mod +++ b/exporter/humioexporter/go.mod @@ -5,11 +5,12 @@ go 1.18 require ( github.com/open-telemetry/opentelemetry-collector-contrib/internal/coreinternal v0.66.0 github.com/stretchr/testify v1.8.1 - go.opentelemetry.io/collector v0.66.1-0.20221128222955-4ff1ff379b90 - go.opentelemetry.io/collector/component v0.66.1-0.20221128222955-4ff1ff379b90 - go.opentelemetry.io/collector/consumer v0.66.1-0.20221128222955-4ff1ff379b90 - go.opentelemetry.io/collector/pdata v0.66.1-0.20221128222955-4ff1ff379b90 - go.opentelemetry.io/collector/semconv v0.66.1-0.20221128222955-4ff1ff379b90 + go.opentelemetry.io/collector v0.66.1-0.20221202005155-1c54042beb70 + go.opentelemetry.io/collector/component v0.66.1-0.20221202005155-1c54042beb70 + go.opentelemetry.io/collector/confmap v0.0.0-20221201172708-2bdff61fa52a + go.opentelemetry.io/collector/consumer v0.66.1-0.20221202005155-1c54042beb70 + go.opentelemetry.io/collector/pdata v0.66.1-0.20221202005155-1c54042beb70 + go.opentelemetry.io/collector/semconv v0.66.1-0.20221202005155-1c54042beb70 ) require ( @@ -34,14 +35,14 @@ require ( github.com/rogpeppe/go-internal v1.6.1 // indirect github.com/rs/cors v1.8.2 // indirect go.opencensus.io v0.24.0 // indirect - go.opentelemetry.io/collector/featuregate v0.66.1-0.20221128222955-4ff1ff379b90 // indirect + go.opentelemetry.io/collector/featuregate v0.66.1-0.20221202005155-1c54042beb70 // 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 go.opentelemetry.io/otel/trace v1.11.1 // indirect go.uber.org/atomic v1.10.0 // indirect go.uber.org/multierr v1.8.0 // indirect - go.uber.org/zap v1.23.0 // indirect + go.uber.org/zap v1.24.0 // indirect golang.org/x/net v0.0.0-20220722155237-a158d28d115b // indirect golang.org/x/sys v0.2.0 // indirect golang.org/x/text v0.4.0 // indirect diff --git a/exporter/humioexporter/go.sum b/exporter/humioexporter/go.sum index 0059375af66a..9767435b8be9 100644 --- a/exporter/humioexporter/go.sum +++ b/exporter/humioexporter/go.sum @@ -286,18 +286,20 @@ go.etcd.io/etcd/client/pkg/v3 v3.5.4/go.mod h1:IJHfcCEKxYu1Os13ZdwCwIUTUVGYTSAM3 go.etcd.io/etcd/client/v3 v3.5.4/go.mod h1:ZaRkVgBZC+L+dLCjTcF1hRXpgZXQPOvnA/Ak/gq3kiY= go.opencensus.io v0.24.0 h1:y73uSU6J157QMP2kn2r30vwW1A2W2WFwSCGnAVxeaD0= go.opencensus.io v0.24.0/go.mod h1:vNK8G9p7aAivkbmorf4v+7Hgx+Zs0yY+0fOtgBfjQKo= -go.opentelemetry.io/collector v0.66.1-0.20221128222955-4ff1ff379b90 h1:yRe05/jMdzH4TFHfndZ5h2o2hKBK/79W72j8w51qNsI= -go.opentelemetry.io/collector v0.66.1-0.20221128222955-4ff1ff379b90/go.mod h1:hE6jCs+0rfiufCrVPucKZTMwfHit1okfDPnwPT2eW1I= -go.opentelemetry.io/collector/component v0.66.1-0.20221128222955-4ff1ff379b90 h1:AYSNTXbezhNg43EuYdVVcgxE/2gBVrm00FDx4DOmQVg= -go.opentelemetry.io/collector/component v0.66.1-0.20221128222955-4ff1ff379b90/go.mod h1:0c84EqXUhvYe6KW7hJfh76tiI/5yjWCH2amwyQ06XLM= -go.opentelemetry.io/collector/consumer v0.66.1-0.20221128222955-4ff1ff379b90 h1:nzNXVfC1FzXBXCLMzbMv+qK3E4EGiNsnMhfVsBd2yzc= -go.opentelemetry.io/collector/consumer v0.66.1-0.20221128222955-4ff1ff379b90/go.mod h1:WtoRZa5SnxQO1ZEQdVxYpFcXCmq62rakv0oUSlPO0NQ= -go.opentelemetry.io/collector/featuregate v0.66.1-0.20221128222955-4ff1ff379b90 h1:UuJSFWbi9XxyNZsJKZuvpWg35BgRbcCGFH+38V2MAdw= -go.opentelemetry.io/collector/featuregate v0.66.1-0.20221128222955-4ff1ff379b90/go.mod h1:tewuFKJYalWBU0bmNKg++MC1ipINXUr6szYzOw2p1GI= -go.opentelemetry.io/collector/pdata v0.66.1-0.20221128222955-4ff1ff379b90 h1:Vu4S4jSNcd0VFPzxQNO4+UqGwnes1xJDoFLPRiWHm8I= -go.opentelemetry.io/collector/pdata v0.66.1-0.20221128222955-4ff1ff379b90/go.mod h1:pqyaznLzk21m+1KL6fwOsRryRELL+zNM0qiVSn0MbVc= -go.opentelemetry.io/collector/semconv v0.66.1-0.20221128222955-4ff1ff379b90 h1:hFaTA68cggZKWMv7wQ3bKP8KGTbowh/5AQZKCHzHTqM= -go.opentelemetry.io/collector/semconv v0.66.1-0.20221128222955-4ff1ff379b90/go.mod h1:5o9yhOa+ABt7g2E5JABDxGZ1PQPbtfxrKNbYn+LOTXU= +go.opentelemetry.io/collector v0.66.1-0.20221202005155-1c54042beb70 h1:INB2CsOtqqrija2KvMuIpbBQ3qX1BECEeR+d0NJX+oM= +go.opentelemetry.io/collector v0.66.1-0.20221202005155-1c54042beb70/go.mod h1:d0NHkHyANJy3HDTvYE/PoylMShUmFIbiir89ieI0X0c= +go.opentelemetry.io/collector/component v0.66.1-0.20221202005155-1c54042beb70 h1:dEoJhzCmRShgmVro/kXm6pouGElgxkH2DsvanzCeZtU= +go.opentelemetry.io/collector/component v0.66.1-0.20221202005155-1c54042beb70/go.mod h1:OsVnvFFe38QSpcuZlQ8cvarDzcloCexgQ1/B2m80F6U= +go.opentelemetry.io/collector/confmap v0.0.0-20221201172708-2bdff61fa52a h1:2TscCXAQASO2kU9xHcMIUM/FP29fiQIRTilZmliq/7I= +go.opentelemetry.io/collector/confmap v0.0.0-20221201172708-2bdff61fa52a/go.mod h1:qJ3e8bA8h4wz/jYlbeEUafVHdrU7DkpStnmIUAz6VTQ= +go.opentelemetry.io/collector/consumer v0.66.1-0.20221202005155-1c54042beb70 h1:XwpVjI1KeKGPXOZBLefGILMziPYuNf6IzbmiIEsIyI0= +go.opentelemetry.io/collector/consumer v0.66.1-0.20221202005155-1c54042beb70/go.mod h1:EWVBcSGcIcmeDGTnIboc/aqa3agsBeH8/q7yFWG7xVc= +go.opentelemetry.io/collector/featuregate v0.66.1-0.20221202005155-1c54042beb70 h1:V0tf4ebciqIs07jFATfLGdUpLRaEsi+AiWuA/in0G8Y= +go.opentelemetry.io/collector/featuregate v0.66.1-0.20221202005155-1c54042beb70/go.mod h1:tewuFKJYalWBU0bmNKg++MC1ipINXUr6szYzOw2p1GI= +go.opentelemetry.io/collector/pdata v0.66.1-0.20221202005155-1c54042beb70 h1:TPOrxkEMvZzfBSwF3ct+kUUgKA5g8unkZZbKQvJweeA= +go.opentelemetry.io/collector/pdata v0.66.1-0.20221202005155-1c54042beb70/go.mod h1:pqyaznLzk21m+1KL6fwOsRryRELL+zNM0qiVSn0MbVc= +go.opentelemetry.io/collector/semconv v0.66.1-0.20221202005155-1c54042beb70 h1:Q5L9Urod3c8as6ZYaoaqBjarx/HXxsxy34DFZIU2fO4= +go.opentelemetry.io/collector/semconv v0.66.1-0.20221202005155-1c54042beb70/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= @@ -317,8 +319,8 @@ go.uber.org/multierr v1.6.0/go.mod h1:cdWPpRnG4AhwMwsgIHip0KRBQjJy5kYEpYjJxpXp9i go.uber.org/multierr v1.8.0 h1:dg6GjLku4EH+249NNmoIciG9N/jURbDG+pFlTkhzIC8= go.uber.org/multierr v1.8.0/go.mod h1:7EAYxJLBy9rStEaz58O2t4Uvip6FSURkq8/ppBp95ak= go.uber.org/zap v1.17.0/go.mod h1:MXVU+bhUf/A7Xi2HNOnopQOrmycQ5Ih87HtOu4q5SSo= -go.uber.org/zap v1.23.0 h1:OjGQ5KQDEUawVHxNwQgPpiypGHOxo2mNZsOqTak4fFY= -go.uber.org/zap v1.23.0/go.mod h1:D+nX8jyLsMHMYrln8A0rJjFt/T/9/bGgIhAqxv5URuY= +go.uber.org/zap v1.24.0 h1:FiJd5l1UOLj0wCgbSE0rwwXHzEdAZS6hiiSnxJN/D60= +go.uber.org/zap v1.24.0/go.mod h1:2kMP+WWQ8aoFoedH3T2sq6iJ2yDWpHbP0f6MQbS9Gkg= golang.org/x/crypto v0.0.0-20180904163835-0709b304e793/go.mod h1:6SG95UA2DQfeDnfUPMdvaQW0Q7yPrPDi9nlGo2tz2b4= golang.org/x/crypto v0.0.0-20190308221718-c2843e01d9a2/go.mod h1:djNgcEr1/C05ACkg1iLfiJU5Ep61QUkGW8qpdssI0+w= golang.org/x/crypto v0.0.0-20190923035154-9ee001bba392/go.mod h1:/lpIB1dKB+9EgE3H3cr1v9wB50oz8l4C4h62xy7jSTY= diff --git a/exporter/influxdbexporter/go.mod b/exporter/influxdbexporter/go.mod index 8a66000d7de9..fab9bff81458 100644 --- a/exporter/influxdbexporter/go.mod +++ b/exporter/influxdbexporter/go.mod @@ -7,11 +7,12 @@ require ( github.com/influxdata/influxdb-observability/otel2influx v0.2.32 github.com/influxdata/line-protocol/v2 v2.2.1 github.com/stretchr/testify v1.8.1 - go.opentelemetry.io/collector v0.66.1-0.20221128222955-4ff1ff379b90 - go.opentelemetry.io/collector/component v0.66.1-0.20221128222955-4ff1ff379b90 - go.opentelemetry.io/collector/consumer v0.66.1-0.20221128222955-4ff1ff379b90 - go.opentelemetry.io/collector/pdata v0.66.1-0.20221128222955-4ff1ff379b90 - go.uber.org/zap v1.23.0 + go.opentelemetry.io/collector v0.66.1-0.20221202005155-1c54042beb70 + go.opentelemetry.io/collector/component v0.66.1-0.20221202005155-1c54042beb70 + go.opentelemetry.io/collector/confmap v0.0.0-20221201172708-2bdff61fa52a + go.opentelemetry.io/collector/consumer v0.66.1-0.20221202005155-1c54042beb70 + go.opentelemetry.io/collector/pdata v0.66.1-0.20221202005155-1c54042beb70 + go.uber.org/zap v1.24.0 ) require ( @@ -37,7 +38,7 @@ require ( github.com/pmezard/go-difflib v1.0.0 // indirect github.com/rs/cors v1.8.2 // indirect go.opencensus.io v0.24.0 // indirect - go.opentelemetry.io/collector/featuregate v0.66.1-0.20221128222955-4ff1ff379b90 // indirect + go.opentelemetry.io/collector/featuregate v0.66.1-0.20221202005155-1c54042beb70 // 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 3f7595a56aba..d7e6e46214a0 100644 --- a/exporter/influxdbexporter/go.sum +++ b/exporter/influxdbexporter/go.sum @@ -315,16 +315,18 @@ go.etcd.io/etcd/client/pkg/v3 v3.5.4/go.mod h1:IJHfcCEKxYu1Os13ZdwCwIUTUVGYTSAM3 go.etcd.io/etcd/client/v3 v3.5.4/go.mod h1:ZaRkVgBZC+L+dLCjTcF1hRXpgZXQPOvnA/Ak/gq3kiY= go.opencensus.io v0.24.0 h1:y73uSU6J157QMP2kn2r30vwW1A2W2WFwSCGnAVxeaD0= go.opencensus.io v0.24.0/go.mod h1:vNK8G9p7aAivkbmorf4v+7Hgx+Zs0yY+0fOtgBfjQKo= -go.opentelemetry.io/collector v0.66.1-0.20221128222955-4ff1ff379b90 h1:yRe05/jMdzH4TFHfndZ5h2o2hKBK/79W72j8w51qNsI= -go.opentelemetry.io/collector v0.66.1-0.20221128222955-4ff1ff379b90/go.mod h1:hE6jCs+0rfiufCrVPucKZTMwfHit1okfDPnwPT2eW1I= -go.opentelemetry.io/collector/component v0.66.1-0.20221128222955-4ff1ff379b90 h1:AYSNTXbezhNg43EuYdVVcgxE/2gBVrm00FDx4DOmQVg= -go.opentelemetry.io/collector/component v0.66.1-0.20221128222955-4ff1ff379b90/go.mod h1:0c84EqXUhvYe6KW7hJfh76tiI/5yjWCH2amwyQ06XLM= -go.opentelemetry.io/collector/consumer v0.66.1-0.20221128222955-4ff1ff379b90 h1:nzNXVfC1FzXBXCLMzbMv+qK3E4EGiNsnMhfVsBd2yzc= -go.opentelemetry.io/collector/consumer v0.66.1-0.20221128222955-4ff1ff379b90/go.mod h1:WtoRZa5SnxQO1ZEQdVxYpFcXCmq62rakv0oUSlPO0NQ= -go.opentelemetry.io/collector/featuregate v0.66.1-0.20221128222955-4ff1ff379b90 h1:UuJSFWbi9XxyNZsJKZuvpWg35BgRbcCGFH+38V2MAdw= -go.opentelemetry.io/collector/featuregate v0.66.1-0.20221128222955-4ff1ff379b90/go.mod h1:tewuFKJYalWBU0bmNKg++MC1ipINXUr6szYzOw2p1GI= -go.opentelemetry.io/collector/pdata v0.66.1-0.20221128222955-4ff1ff379b90 h1:Vu4S4jSNcd0VFPzxQNO4+UqGwnes1xJDoFLPRiWHm8I= -go.opentelemetry.io/collector/pdata v0.66.1-0.20221128222955-4ff1ff379b90/go.mod h1:pqyaznLzk21m+1KL6fwOsRryRELL+zNM0qiVSn0MbVc= +go.opentelemetry.io/collector v0.66.1-0.20221202005155-1c54042beb70 h1:INB2CsOtqqrija2KvMuIpbBQ3qX1BECEeR+d0NJX+oM= +go.opentelemetry.io/collector v0.66.1-0.20221202005155-1c54042beb70/go.mod h1:d0NHkHyANJy3HDTvYE/PoylMShUmFIbiir89ieI0X0c= +go.opentelemetry.io/collector/component v0.66.1-0.20221202005155-1c54042beb70 h1:dEoJhzCmRShgmVro/kXm6pouGElgxkH2DsvanzCeZtU= +go.opentelemetry.io/collector/component v0.66.1-0.20221202005155-1c54042beb70/go.mod h1:OsVnvFFe38QSpcuZlQ8cvarDzcloCexgQ1/B2m80F6U= +go.opentelemetry.io/collector/confmap v0.0.0-20221201172708-2bdff61fa52a h1:2TscCXAQASO2kU9xHcMIUM/FP29fiQIRTilZmliq/7I= +go.opentelemetry.io/collector/confmap v0.0.0-20221201172708-2bdff61fa52a/go.mod h1:qJ3e8bA8h4wz/jYlbeEUafVHdrU7DkpStnmIUAz6VTQ= +go.opentelemetry.io/collector/consumer v0.66.1-0.20221202005155-1c54042beb70 h1:XwpVjI1KeKGPXOZBLefGILMziPYuNf6IzbmiIEsIyI0= +go.opentelemetry.io/collector/consumer v0.66.1-0.20221202005155-1c54042beb70/go.mod h1:EWVBcSGcIcmeDGTnIboc/aqa3agsBeH8/q7yFWG7xVc= +go.opentelemetry.io/collector/featuregate v0.66.1-0.20221202005155-1c54042beb70 h1:V0tf4ebciqIs07jFATfLGdUpLRaEsi+AiWuA/in0G8Y= +go.opentelemetry.io/collector/featuregate v0.66.1-0.20221202005155-1c54042beb70/go.mod h1:tewuFKJYalWBU0bmNKg++MC1ipINXUr6szYzOw2p1GI= +go.opentelemetry.io/collector/pdata v0.66.1-0.20221202005155-1c54042beb70 h1:TPOrxkEMvZzfBSwF3ct+kUUgKA5g8unkZZbKQvJweeA= +go.opentelemetry.io/collector/pdata v0.66.1-0.20221202005155-1c54042beb70/go.mod h1:pqyaznLzk21m+1KL6fwOsRryRELL+zNM0qiVSn0MbVc= 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= @@ -345,8 +347,8 @@ go.uber.org/multierr v1.6.0/go.mod h1:cdWPpRnG4AhwMwsgIHip0KRBQjJy5kYEpYjJxpXp9i go.uber.org/multierr v1.8.0 h1:dg6GjLku4EH+249NNmoIciG9N/jURbDG+pFlTkhzIC8= go.uber.org/multierr v1.8.0/go.mod h1:7EAYxJLBy9rStEaz58O2t4Uvip6FSURkq8/ppBp95ak= go.uber.org/zap v1.17.0/go.mod h1:MXVU+bhUf/A7Xi2HNOnopQOrmycQ5Ih87HtOu4q5SSo= -go.uber.org/zap v1.23.0 h1:OjGQ5KQDEUawVHxNwQgPpiypGHOxo2mNZsOqTak4fFY= -go.uber.org/zap v1.23.0/go.mod h1:D+nX8jyLsMHMYrln8A0rJjFt/T/9/bGgIhAqxv5URuY= +go.uber.org/zap v1.24.0 h1:FiJd5l1UOLj0wCgbSE0rwwXHzEdAZS6hiiSnxJN/D60= +go.uber.org/zap v1.24.0/go.mod h1:2kMP+WWQ8aoFoedH3T2sq6iJ2yDWpHbP0f6MQbS9Gkg= golang.org/x/crypto v0.0.0-20180904163835-0709b304e793/go.mod h1:6SG95UA2DQfeDnfUPMdvaQW0Q7yPrPDi9nlGo2tz2b4= golang.org/x/crypto v0.0.0-20190308221718-c2843e01d9a2/go.mod h1:djNgcEr1/C05ACkg1iLfiJU5Ep61QUkGW8qpdssI0+w= golang.org/x/crypto v0.0.0-20190923035154-9ee001bba392/go.mod h1:/lpIB1dKB+9EgE3H3cr1v9wB50oz8l4C4h62xy7jSTY= diff --git a/exporter/instanaexporter/go.mod b/exporter/instanaexporter/go.mod index 3267e06bd9c7..2851a3bfa906 100644 --- a/exporter/instanaexporter/go.mod +++ b/exporter/instanaexporter/go.mod @@ -5,12 +5,13 @@ go 1.18 require ( github.com/open-telemetry/opentelemetry-collector-contrib/internal/coreinternal v0.66.0 github.com/stretchr/testify v1.8.1 - go.opentelemetry.io/collector v0.66.1-0.20221128222955-4ff1ff379b90 - go.opentelemetry.io/collector/component v0.66.1-0.20221128222955-4ff1ff379b90 - go.opentelemetry.io/collector/consumer v0.66.1-0.20221128222955-4ff1ff379b90 - go.opentelemetry.io/collector/pdata v0.66.1-0.20221128222955-4ff1ff379b90 - go.opentelemetry.io/collector/semconv v0.66.1-0.20221128222955-4ff1ff379b90 - go.uber.org/zap v1.23.0 + go.opentelemetry.io/collector v0.66.1-0.20221202005155-1c54042beb70 + go.opentelemetry.io/collector/component v0.66.1-0.20221202005155-1c54042beb70 + go.opentelemetry.io/collector/confmap v0.0.0-20221201172708-2bdff61fa52a + go.opentelemetry.io/collector/consumer v0.66.1-0.20221202005155-1c54042beb70 + go.opentelemetry.io/collector/pdata v0.66.1-0.20221202005155-1c54042beb70 + go.opentelemetry.io/collector/semconv v0.66.1-0.20221202005155-1c54042beb70 + go.uber.org/zap v1.24.0 ) require ( @@ -34,7 +35,7 @@ require ( github.com/rogpeppe/go-internal v1.9.0 // indirect github.com/rs/cors v1.8.2 // indirect go.opencensus.io v0.24.0 // indirect - go.opentelemetry.io/collector/featuregate v0.66.1-0.20221128222955-4ff1ff379b90 // indirect + go.opentelemetry.io/collector/featuregate v0.66.1-0.20221202005155-1c54042beb70 // 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 69aa73994cad..92a547b8f22f 100644 --- a/exporter/instanaexporter/go.sum +++ b/exporter/instanaexporter/go.sum @@ -284,18 +284,20 @@ go.etcd.io/etcd/client/pkg/v3 v3.5.4/go.mod h1:IJHfcCEKxYu1Os13ZdwCwIUTUVGYTSAM3 go.etcd.io/etcd/client/v3 v3.5.4/go.mod h1:ZaRkVgBZC+L+dLCjTcF1hRXpgZXQPOvnA/Ak/gq3kiY= go.opencensus.io v0.24.0 h1:y73uSU6J157QMP2kn2r30vwW1A2W2WFwSCGnAVxeaD0= go.opencensus.io v0.24.0/go.mod h1:vNK8G9p7aAivkbmorf4v+7Hgx+Zs0yY+0fOtgBfjQKo= -go.opentelemetry.io/collector v0.66.1-0.20221128222955-4ff1ff379b90 h1:yRe05/jMdzH4TFHfndZ5h2o2hKBK/79W72j8w51qNsI= -go.opentelemetry.io/collector v0.66.1-0.20221128222955-4ff1ff379b90/go.mod h1:hE6jCs+0rfiufCrVPucKZTMwfHit1okfDPnwPT2eW1I= -go.opentelemetry.io/collector/component v0.66.1-0.20221128222955-4ff1ff379b90 h1:AYSNTXbezhNg43EuYdVVcgxE/2gBVrm00FDx4DOmQVg= -go.opentelemetry.io/collector/component v0.66.1-0.20221128222955-4ff1ff379b90/go.mod h1:0c84EqXUhvYe6KW7hJfh76tiI/5yjWCH2amwyQ06XLM= -go.opentelemetry.io/collector/consumer v0.66.1-0.20221128222955-4ff1ff379b90 h1:nzNXVfC1FzXBXCLMzbMv+qK3E4EGiNsnMhfVsBd2yzc= -go.opentelemetry.io/collector/consumer v0.66.1-0.20221128222955-4ff1ff379b90/go.mod h1:WtoRZa5SnxQO1ZEQdVxYpFcXCmq62rakv0oUSlPO0NQ= -go.opentelemetry.io/collector/featuregate v0.66.1-0.20221128222955-4ff1ff379b90 h1:UuJSFWbi9XxyNZsJKZuvpWg35BgRbcCGFH+38V2MAdw= -go.opentelemetry.io/collector/featuregate v0.66.1-0.20221128222955-4ff1ff379b90/go.mod h1:tewuFKJYalWBU0bmNKg++MC1ipINXUr6szYzOw2p1GI= -go.opentelemetry.io/collector/pdata v0.66.1-0.20221128222955-4ff1ff379b90 h1:Vu4S4jSNcd0VFPzxQNO4+UqGwnes1xJDoFLPRiWHm8I= -go.opentelemetry.io/collector/pdata v0.66.1-0.20221128222955-4ff1ff379b90/go.mod h1:pqyaznLzk21m+1KL6fwOsRryRELL+zNM0qiVSn0MbVc= -go.opentelemetry.io/collector/semconv v0.66.1-0.20221128222955-4ff1ff379b90 h1:hFaTA68cggZKWMv7wQ3bKP8KGTbowh/5AQZKCHzHTqM= -go.opentelemetry.io/collector/semconv v0.66.1-0.20221128222955-4ff1ff379b90/go.mod h1:5o9yhOa+ABt7g2E5JABDxGZ1PQPbtfxrKNbYn+LOTXU= +go.opentelemetry.io/collector v0.66.1-0.20221202005155-1c54042beb70 h1:INB2CsOtqqrija2KvMuIpbBQ3qX1BECEeR+d0NJX+oM= +go.opentelemetry.io/collector v0.66.1-0.20221202005155-1c54042beb70/go.mod h1:d0NHkHyANJy3HDTvYE/PoylMShUmFIbiir89ieI0X0c= +go.opentelemetry.io/collector/component v0.66.1-0.20221202005155-1c54042beb70 h1:dEoJhzCmRShgmVro/kXm6pouGElgxkH2DsvanzCeZtU= +go.opentelemetry.io/collector/component v0.66.1-0.20221202005155-1c54042beb70/go.mod h1:OsVnvFFe38QSpcuZlQ8cvarDzcloCexgQ1/B2m80F6U= +go.opentelemetry.io/collector/confmap v0.0.0-20221201172708-2bdff61fa52a h1:2TscCXAQASO2kU9xHcMIUM/FP29fiQIRTilZmliq/7I= +go.opentelemetry.io/collector/confmap v0.0.0-20221201172708-2bdff61fa52a/go.mod h1:qJ3e8bA8h4wz/jYlbeEUafVHdrU7DkpStnmIUAz6VTQ= +go.opentelemetry.io/collector/consumer v0.66.1-0.20221202005155-1c54042beb70 h1:XwpVjI1KeKGPXOZBLefGILMziPYuNf6IzbmiIEsIyI0= +go.opentelemetry.io/collector/consumer v0.66.1-0.20221202005155-1c54042beb70/go.mod h1:EWVBcSGcIcmeDGTnIboc/aqa3agsBeH8/q7yFWG7xVc= +go.opentelemetry.io/collector/featuregate v0.66.1-0.20221202005155-1c54042beb70 h1:V0tf4ebciqIs07jFATfLGdUpLRaEsi+AiWuA/in0G8Y= +go.opentelemetry.io/collector/featuregate v0.66.1-0.20221202005155-1c54042beb70/go.mod h1:tewuFKJYalWBU0bmNKg++MC1ipINXUr6szYzOw2p1GI= +go.opentelemetry.io/collector/pdata v0.66.1-0.20221202005155-1c54042beb70 h1:TPOrxkEMvZzfBSwF3ct+kUUgKA5g8unkZZbKQvJweeA= +go.opentelemetry.io/collector/pdata v0.66.1-0.20221202005155-1c54042beb70/go.mod h1:pqyaznLzk21m+1KL6fwOsRryRELL+zNM0qiVSn0MbVc= +go.opentelemetry.io/collector/semconv v0.66.1-0.20221202005155-1c54042beb70 h1:Q5L9Urod3c8as6ZYaoaqBjarx/HXxsxy34DFZIU2fO4= +go.opentelemetry.io/collector/semconv v0.66.1-0.20221202005155-1c54042beb70/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= @@ -315,8 +317,8 @@ go.uber.org/multierr v1.6.0/go.mod h1:cdWPpRnG4AhwMwsgIHip0KRBQjJy5kYEpYjJxpXp9i go.uber.org/multierr v1.8.0 h1:dg6GjLku4EH+249NNmoIciG9N/jURbDG+pFlTkhzIC8= go.uber.org/multierr v1.8.0/go.mod h1:7EAYxJLBy9rStEaz58O2t4Uvip6FSURkq8/ppBp95ak= go.uber.org/zap v1.17.0/go.mod h1:MXVU+bhUf/A7Xi2HNOnopQOrmycQ5Ih87HtOu4q5SSo= -go.uber.org/zap v1.23.0 h1:OjGQ5KQDEUawVHxNwQgPpiypGHOxo2mNZsOqTak4fFY= -go.uber.org/zap v1.23.0/go.mod h1:D+nX8jyLsMHMYrln8A0rJjFt/T/9/bGgIhAqxv5URuY= +go.uber.org/zap v1.24.0 h1:FiJd5l1UOLj0wCgbSE0rwwXHzEdAZS6hiiSnxJN/D60= +go.uber.org/zap v1.24.0/go.mod h1:2kMP+WWQ8aoFoedH3T2sq6iJ2yDWpHbP0f6MQbS9Gkg= golang.org/x/crypto v0.0.0-20180904163835-0709b304e793/go.mod h1:6SG95UA2DQfeDnfUPMdvaQW0Q7yPrPDi9nlGo2tz2b4= golang.org/x/crypto v0.0.0-20190308221718-c2843e01d9a2/go.mod h1:djNgcEr1/C05ACkg1iLfiJU5Ep61QUkGW8qpdssI0+w= golang.org/x/crypto v0.0.0-20190923035154-9ee001bba392/go.mod h1:/lpIB1dKB+9EgE3H3cr1v9wB50oz8l4C4h62xy7jSTY= diff --git a/exporter/jaegerexporter/config.go b/exporter/jaegerexporter/config.go index d85f97a2f50d..6af9be1986cd 100644 --- a/exporter/jaegerexporter/config.go +++ b/exporter/jaegerexporter/config.go @@ -15,6 +15,8 @@ package jaegerexporter // import "github.com/open-telemetry/opentelemetry-collector-contrib/exporter/jaegerexporter" import ( + "errors" + "go.opentelemetry.io/collector/component" "go.opentelemetry.io/collector/config" "go.opentelemetry.io/collector/config/configgrpc" @@ -35,5 +37,8 @@ var _ component.Config = (*Config)(nil) // Validate checks if the exporter configuration is valid func (cfg *Config) Validate() error { + if cfg.Endpoint == "" { + return errors.New("must have a non-empty \"endpoint\"") + } return nil } diff --git a/exporter/jaegerexporter/config_test.go b/exporter/jaegerexporter/config_test.go index 6b258e2f57ae..502880112b9b 100644 --- a/exporter/jaegerexporter/config_test.go +++ b/exporter/jaegerexporter/config_test.go @@ -77,9 +77,12 @@ func TestLoadConfig(t *testing.T) { sub, err := cm.Sub(tt.id.String()) require.NoError(t, err) require.NoError(t, component.UnmarshalConfig(sub, cfg)) - - assert.NoError(t, component.ValidateConfig(cfg)) assert.Equal(t, tt.expected, cfg) }) } } + +func TestValidateConfig(t *testing.T) { + cfg := &Config{} + assert.EqualError(t, component.ValidateConfig(cfg), "must have a non-empty \"endpoint\"") +} diff --git a/exporter/jaegerexporter/exporter.go b/exporter/jaegerexporter/exporter.go index a8899197f28f..c998c162f49f 100644 --- a/exporter/jaegerexporter/exporter.go +++ b/exporter/jaegerexporter/exporter.go @@ -41,7 +41,7 @@ import ( // The exporter name is the name to be used in the observability of the exporter. // The collectorEndpoint should be of the form "hostname:14250" (a gRPC target). func newTracesExporter(cfg *Config, set component.ExporterCreateSettings) (component.TracesExporter, error) { - s := newProtoGRPCSender(cfg, set.TelemetrySettings) + s := newProtoGRPCSender(cfg, set) return exporterhelper.NewTracesExporter( context.TODO(), set, cfg, s.pushTraces, exporterhelper.WithCapabilities(consumer.Capabilities{MutatesData: false}), @@ -72,10 +72,10 @@ type protoGRPCSender struct { clientSettings *configgrpc.GRPCClientSettings } -func newProtoGRPCSender(cfg *Config, settings component.TelemetrySettings) *protoGRPCSender { +func newProtoGRPCSender(cfg *Config, set component.ExporterCreateSettings) *protoGRPCSender { s := &protoGRPCSender{ - name: cfg.ID().String(), - settings: settings, + name: set.ID.String(), + settings: set.TelemetrySettings, metadata: metadata.New(cfg.GRPCClientSettings.Headers), waitForReady: cfg.WaitForReady, connStateReporterInterval: time.Second, diff --git a/exporter/jaegerexporter/factory.go b/exporter/jaegerexporter/factory.go index bdc29d83a3e0..0a023d0ef6e1 100644 --- a/exporter/jaegerexporter/factory.go +++ b/exporter/jaegerexporter/factory.go @@ -16,7 +16,6 @@ package jaegerexporter // import "github.com/open-telemetry/opentelemetry-collec import ( "context" - "fmt" "go.opentelemetry.io/collector/component" "go.opentelemetry.io/collector/config" @@ -59,12 +58,5 @@ func createTracesExporter( ) (component.TracesExporter, error) { expCfg := config.(*Config) - if expCfg.Endpoint == "" { - // TODO: Improve error message, see #215 - return nil, fmt.Errorf( - "%q config requires a non-empty \"endpoint\"", - expCfg.ID().String()) - } - return newTracesExporter(expCfg, set) } diff --git a/exporter/jaegerexporter/factory_test.go b/exporter/jaegerexporter/factory_test.go index 43ae57be5130..11cc6ee94721 100644 --- a/exporter/jaegerexporter/factory_test.go +++ b/exporter/jaegerexporter/factory_test.go @@ -47,15 +47,10 @@ func TestCreateInstanceViaFactory(t *testing.T) { // Default config doesn't have default endpoint so creating from it should // fail. set := componenttest.NewNopExporterCreateSettings() - exp, err := factory.CreateTracesExporter(context.Background(), set, cfg) - assert.NotNil(t, err) - assert.Equal(t, "\"jaeger\" config requires a non-empty \"endpoint\"", err.Error()) - assert.Nil(t, exp) - // Endpoint doesn't have a default value so set it directly. expCfg := cfg.(*Config) expCfg.Endpoint = "some.target.org:12345" - exp, err = factory.CreateTracesExporter(context.Background(), set, cfg) + exp, err := factory.CreateTracesExporter(context.Background(), set, cfg) assert.NoError(t, err) assert.NotNil(t, exp) diff --git a/exporter/jaegerexporter/go.mod b/exporter/jaegerexporter/go.mod index 3089a8e83d39..5e280e1ed4bd 100644 --- a/exporter/jaegerexporter/go.mod +++ b/exporter/jaegerexporter/go.mod @@ -8,11 +8,12 @@ require ( github.com/open-telemetry/opentelemetry-collector-contrib/pkg/translator/jaeger v0.66.0 github.com/stretchr/testify v1.8.1 go.opencensus.io v0.24.0 - go.opentelemetry.io/collector v0.66.1-0.20221128222955-4ff1ff379b90 - go.opentelemetry.io/collector/component v0.66.1-0.20221128222955-4ff1ff379b90 - go.opentelemetry.io/collector/consumer v0.66.1-0.20221128222955-4ff1ff379b90 - go.opentelemetry.io/collector/pdata v0.66.1-0.20221128222955-4ff1ff379b90 - go.uber.org/zap v1.23.0 + go.opentelemetry.io/collector v0.66.1-0.20221202005155-1c54042beb70 + go.opentelemetry.io/collector/component v0.66.1-0.20221202005155-1c54042beb70 + go.opentelemetry.io/collector/confmap v0.0.0-20221201172708-2bdff61fa52a + go.opentelemetry.io/collector/consumer v0.66.1-0.20221202005155-1c54042beb70 + go.opentelemetry.io/collector/pdata v0.66.1-0.20221202005155-1c54042beb70 + go.uber.org/zap v1.24.0 google.golang.org/grpc v1.51.0 ) @@ -40,8 +41,8 @@ require ( github.com/pmezard/go-difflib v1.0.0 // indirect github.com/uber/jaeger-client-go v2.30.0+incompatible // indirect github.com/uber/jaeger-lib v2.4.1+incompatible // indirect - go.opentelemetry.io/collector/featuregate v0.66.1-0.20221128222955-4ff1ff379b90 // indirect - go.opentelemetry.io/collector/semconv v0.66.1-0.20221128222955-4ff1ff379b90 // indirect + go.opentelemetry.io/collector/featuregate v0.66.1-0.20221202005155-1c54042beb70 // indirect + go.opentelemetry.io/collector/semconv v0.66.1-0.20221202005155-1c54042beb70 // 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 10e00393e658..46aadfec485f 100644 --- a/exporter/jaegerexporter/go.sum +++ b/exporter/jaegerexporter/go.sum @@ -313,18 +313,20 @@ go.etcd.io/etcd/client/pkg/v3 v3.5.4/go.mod h1:IJHfcCEKxYu1Os13ZdwCwIUTUVGYTSAM3 go.etcd.io/etcd/client/v3 v3.5.4/go.mod h1:ZaRkVgBZC+L+dLCjTcF1hRXpgZXQPOvnA/Ak/gq3kiY= go.opencensus.io v0.24.0 h1:y73uSU6J157QMP2kn2r30vwW1A2W2WFwSCGnAVxeaD0= go.opencensus.io v0.24.0/go.mod h1:vNK8G9p7aAivkbmorf4v+7Hgx+Zs0yY+0fOtgBfjQKo= -go.opentelemetry.io/collector v0.66.1-0.20221128222955-4ff1ff379b90 h1:yRe05/jMdzH4TFHfndZ5h2o2hKBK/79W72j8w51qNsI= -go.opentelemetry.io/collector v0.66.1-0.20221128222955-4ff1ff379b90/go.mod h1:hE6jCs+0rfiufCrVPucKZTMwfHit1okfDPnwPT2eW1I= -go.opentelemetry.io/collector/component v0.66.1-0.20221128222955-4ff1ff379b90 h1:AYSNTXbezhNg43EuYdVVcgxE/2gBVrm00FDx4DOmQVg= -go.opentelemetry.io/collector/component v0.66.1-0.20221128222955-4ff1ff379b90/go.mod h1:0c84EqXUhvYe6KW7hJfh76tiI/5yjWCH2amwyQ06XLM= -go.opentelemetry.io/collector/consumer v0.66.1-0.20221128222955-4ff1ff379b90 h1:nzNXVfC1FzXBXCLMzbMv+qK3E4EGiNsnMhfVsBd2yzc= -go.opentelemetry.io/collector/consumer v0.66.1-0.20221128222955-4ff1ff379b90/go.mod h1:WtoRZa5SnxQO1ZEQdVxYpFcXCmq62rakv0oUSlPO0NQ= -go.opentelemetry.io/collector/featuregate v0.66.1-0.20221128222955-4ff1ff379b90 h1:UuJSFWbi9XxyNZsJKZuvpWg35BgRbcCGFH+38V2MAdw= -go.opentelemetry.io/collector/featuregate v0.66.1-0.20221128222955-4ff1ff379b90/go.mod h1:tewuFKJYalWBU0bmNKg++MC1ipINXUr6szYzOw2p1GI= -go.opentelemetry.io/collector/pdata v0.66.1-0.20221128222955-4ff1ff379b90 h1:Vu4S4jSNcd0VFPzxQNO4+UqGwnes1xJDoFLPRiWHm8I= -go.opentelemetry.io/collector/pdata v0.66.1-0.20221128222955-4ff1ff379b90/go.mod h1:pqyaznLzk21m+1KL6fwOsRryRELL+zNM0qiVSn0MbVc= -go.opentelemetry.io/collector/semconv v0.66.1-0.20221128222955-4ff1ff379b90 h1:hFaTA68cggZKWMv7wQ3bKP8KGTbowh/5AQZKCHzHTqM= -go.opentelemetry.io/collector/semconv v0.66.1-0.20221128222955-4ff1ff379b90/go.mod h1:5o9yhOa+ABt7g2E5JABDxGZ1PQPbtfxrKNbYn+LOTXU= +go.opentelemetry.io/collector v0.66.1-0.20221202005155-1c54042beb70 h1:INB2CsOtqqrija2KvMuIpbBQ3qX1BECEeR+d0NJX+oM= +go.opentelemetry.io/collector v0.66.1-0.20221202005155-1c54042beb70/go.mod h1:d0NHkHyANJy3HDTvYE/PoylMShUmFIbiir89ieI0X0c= +go.opentelemetry.io/collector/component v0.66.1-0.20221202005155-1c54042beb70 h1:dEoJhzCmRShgmVro/kXm6pouGElgxkH2DsvanzCeZtU= +go.opentelemetry.io/collector/component v0.66.1-0.20221202005155-1c54042beb70/go.mod h1:OsVnvFFe38QSpcuZlQ8cvarDzcloCexgQ1/B2m80F6U= +go.opentelemetry.io/collector/confmap v0.0.0-20221201172708-2bdff61fa52a h1:2TscCXAQASO2kU9xHcMIUM/FP29fiQIRTilZmliq/7I= +go.opentelemetry.io/collector/confmap v0.0.0-20221201172708-2bdff61fa52a/go.mod h1:qJ3e8bA8h4wz/jYlbeEUafVHdrU7DkpStnmIUAz6VTQ= +go.opentelemetry.io/collector/consumer v0.66.1-0.20221202005155-1c54042beb70 h1:XwpVjI1KeKGPXOZBLefGILMziPYuNf6IzbmiIEsIyI0= +go.opentelemetry.io/collector/consumer v0.66.1-0.20221202005155-1c54042beb70/go.mod h1:EWVBcSGcIcmeDGTnIboc/aqa3agsBeH8/q7yFWG7xVc= +go.opentelemetry.io/collector/featuregate v0.66.1-0.20221202005155-1c54042beb70 h1:V0tf4ebciqIs07jFATfLGdUpLRaEsi+AiWuA/in0G8Y= +go.opentelemetry.io/collector/featuregate v0.66.1-0.20221202005155-1c54042beb70/go.mod h1:tewuFKJYalWBU0bmNKg++MC1ipINXUr6szYzOw2p1GI= +go.opentelemetry.io/collector/pdata v0.66.1-0.20221202005155-1c54042beb70 h1:TPOrxkEMvZzfBSwF3ct+kUUgKA5g8unkZZbKQvJweeA= +go.opentelemetry.io/collector/pdata v0.66.1-0.20221202005155-1c54042beb70/go.mod h1:pqyaznLzk21m+1KL6fwOsRryRELL+zNM0qiVSn0MbVc= +go.opentelemetry.io/collector/semconv v0.66.1-0.20221202005155-1c54042beb70 h1:Q5L9Urod3c8as6ZYaoaqBjarx/HXxsxy34DFZIU2fO4= +go.opentelemetry.io/collector/semconv v0.66.1-0.20221202005155-1c54042beb70/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= @@ -345,8 +347,8 @@ go.uber.org/multierr v1.6.0/go.mod h1:cdWPpRnG4AhwMwsgIHip0KRBQjJy5kYEpYjJxpXp9i go.uber.org/multierr v1.8.0 h1:dg6GjLku4EH+249NNmoIciG9N/jURbDG+pFlTkhzIC8= go.uber.org/multierr v1.8.0/go.mod h1:7EAYxJLBy9rStEaz58O2t4Uvip6FSURkq8/ppBp95ak= go.uber.org/zap v1.17.0/go.mod h1:MXVU+bhUf/A7Xi2HNOnopQOrmycQ5Ih87HtOu4q5SSo= -go.uber.org/zap v1.23.0 h1:OjGQ5KQDEUawVHxNwQgPpiypGHOxo2mNZsOqTak4fFY= -go.uber.org/zap v1.23.0/go.mod h1:D+nX8jyLsMHMYrln8A0rJjFt/T/9/bGgIhAqxv5URuY= +go.uber.org/zap v1.24.0 h1:FiJd5l1UOLj0wCgbSE0rwwXHzEdAZS6hiiSnxJN/D60= +go.uber.org/zap v1.24.0/go.mod h1:2kMP+WWQ8aoFoedH3T2sq6iJ2yDWpHbP0f6MQbS9Gkg= golang.org/x/crypto v0.0.0-20180904163835-0709b304e793/go.mod h1:6SG95UA2DQfeDnfUPMdvaQW0Q7yPrPDi9nlGo2tz2b4= golang.org/x/crypto v0.0.0-20190308221718-c2843e01d9a2/go.mod h1:djNgcEr1/C05ACkg1iLfiJU5Ep61QUkGW8qpdssI0+w= golang.org/x/crypto v0.0.0-20190923035154-9ee001bba392/go.mod h1:/lpIB1dKB+9EgE3H3cr1v9wB50oz8l4C4h62xy7jSTY= diff --git a/exporter/jaegerthrifthttpexporter/config.go b/exporter/jaegerthrifthttpexporter/config.go index 835bf6cf14b8..48e9c69e5ddb 100644 --- a/exporter/jaegerthrifthttpexporter/config.go +++ b/exporter/jaegerthrifthttpexporter/config.go @@ -15,6 +15,10 @@ package jaegerthrifthttpexporter // import "github.com/open-telemetry/opentelemetry-collector-contrib/exporter/jaegerthrifthttpexporter" import ( + "errors" + "fmt" + "net/url" + "go.opentelemetry.io/collector/component" "go.opentelemetry.io/collector/config" "go.opentelemetry.io/collector/config/confighttp" @@ -30,5 +34,14 @@ var _ component.Config = (*Config)(nil) // Validate checks if the exporter configuration is valid func (cfg *Config) Validate() error { + _, err := url.ParseRequestURI(cfg.HTTPClientSettings.Endpoint) + if err != nil { + return fmt.Errorf("invalid \"endpoint\": %w", err) + } + + if cfg.HTTPClientSettings.Timeout <= 0 { + return errors.New("invalid negative value for \"timeout\"") + } + return nil } diff --git a/exporter/jaegerthrifthttpexporter/config_test.go b/exporter/jaegerthrifthttpexporter/config_test.go index f2f82db8d8cc..0f106babd7e3 100644 --- a/exporter/jaegerthrifthttpexporter/config_test.go +++ b/exporter/jaegerthrifthttpexporter/config_test.go @@ -75,3 +75,45 @@ func TestLoadConfig(t *testing.T) { }) } } + +func TestValidateConfig(t *testing.T) { + tests := []struct { + name string + config *Config + errorMessage string + }{ + { + name: "empty_url", + config: &Config{ + ExporterSettings: config.NewExporterSettings(component.NewID(typeStr)), + }, + errorMessage: "invalid \"endpoint\": parse \"\": empty url", + }, + { + name: "invalid_url", + config: &Config{ + ExporterSettings: config.NewExporterSettings(component.NewID(typeStr)), + HTTPClientSettings: confighttp.HTTPClientSettings{ + Endpoint: ".example:123", + }, + }, + errorMessage: "invalid \"endpoint\": parse \".example:123\": invalid URI for request", + }, + { + name: "negative_duration", + config: &Config{ + ExporterSettings: config.NewExporterSettings(component.NewID(typeStr)), + HTTPClientSettings: confighttp.HTTPClientSettings{ + Endpoint: "example.com:123", + Timeout: -2 * time.Second, + }, + }, + errorMessage: "invalid negative value for \"timeout\"", + }, + } + for _, tt := range tests { + t.Run(tt.name, func(t *testing.T) { + assert.EqualError(t, tt.config.Validate(), tt.errorMessage) + }) + } +} diff --git a/exporter/jaegerthrifthttpexporter/factory.go b/exporter/jaegerthrifthttpexporter/factory.go index 52703edf9524..693781b11f52 100644 --- a/exporter/jaegerthrifthttpexporter/factory.go +++ b/exporter/jaegerthrifthttpexporter/factory.go @@ -16,8 +16,6 @@ package jaegerthrifthttpexporter // import "github.com/open-telemetry/openteleme import ( "context" - "fmt" - "net/url" "go.opentelemetry.io/collector/component" "go.opentelemetry.io/collector/config" @@ -56,17 +54,6 @@ func createTracesExporter( ) (component.TracesExporter, error) { expCfg := config.(*Config) - _, err := url.ParseRequestURI(expCfg.HTTPClientSettings.Endpoint) - if err != nil { - // TODO: Improve error message, see #215 - err = fmt.Errorf("%q config requires a valid \"endpoint\": %w", expCfg.ID().String(), err) - return nil, err - } - - if expCfg.HTTPClientSettings.Timeout <= 0 { - err := fmt.Errorf("%q config requires a positive value for \"timeout\"", expCfg.ID().String()) - return nil, err - } return newTracesExporter(expCfg, set) } diff --git a/exporter/jaegerthrifthttpexporter/factory_test.go b/exporter/jaegerthrifthttpexporter/factory_test.go index 2765b17fc586..a9eff7dbf9b1 100644 --- a/exporter/jaegerthrifthttpexporter/factory_test.go +++ b/exporter/jaegerthrifthttpexporter/factory_test.go @@ -33,20 +33,12 @@ func TestCreateDefaultConfig(t *testing.T) { } func TestCreateInstanceViaFactory(t *testing.T) { - cfg := createDefaultConfig() - - // Default config doesn't have default URL so creating from it should - // fail. params := componenttest.NewNopExporterCreateSettings() - exp, err := createTracesExporter(context.Background(), params, cfg) - assert.Error(t, err) - assert.Nil(t, exp) - // Endpoint doesn't have a default value so set it directly. expCfg := cfg.(*Config) expCfg.HTTPClientSettings.Endpoint = "http://jaeger.example.com:12345/api/traces" - exp, err = createTracesExporter(context.Background(), params, cfg) + exp, err := createTracesExporter(context.Background(), params, cfg) assert.NoError(t, err) assert.NotNil(t, exp) @@ -71,48 +63,3 @@ func TestFactory_CreateTracesExporter(t *testing.T) { assert.NoError(t, err) assert.NotNil(t, te) } - -func TestFactory_CreateTracesExporterFails(t *testing.T) { - tests := []struct { - name string - config *Config - errorMessage string - }{ - { - name: "empty_url", - config: &Config{ - 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(component.NewID(typeStr)), - HTTPClientSettings: confighttp.HTTPClientSettings{ - Endpoint: ".example:123", - }, - }, - errorMessage: "\"jaeger_thrift\" config requires a valid \"endpoint\": parse \".example:123\": invalid URI for request", - }, - { - name: "negative_duration", - config: &Config{ - ExporterSettings: config.NewExporterSettings(component.NewID(typeStr)), - HTTPClientSettings: confighttp.HTTPClientSettings{ - Endpoint: "example.com:123", - Timeout: -2 * time.Second, - }, - }, - errorMessage: "\"jaeger_thrift\" config requires a positive value for \"timeout\"", - }, - } - for _, tt := range tests { - t.Run(tt.name, func(t *testing.T) { - params := componenttest.NewNopExporterCreateSettings() - te, err := createTracesExporter(context.Background(), params, tt.config) - assert.EqualError(t, err, tt.errorMessage) - assert.Nil(t, te) - }) - } -} diff --git a/exporter/jaegerthrifthttpexporter/go.mod b/exporter/jaegerthrifthttpexporter/go.mod index 694e2b3664a0..49cc9daae794 100644 --- a/exporter/jaegerthrifthttpexporter/go.mod +++ b/exporter/jaegerthrifthttpexporter/go.mod @@ -7,10 +7,11 @@ require ( github.com/jaegertracing/jaeger v1.39.1-0.20221110195127-14c11365a856 github.com/open-telemetry/opentelemetry-collector-contrib/pkg/translator/jaeger v0.66.0 github.com/stretchr/testify v1.8.1 - go.opentelemetry.io/collector v0.66.1-0.20221128222955-4ff1ff379b90 - go.opentelemetry.io/collector/component v0.66.1-0.20221128222955-4ff1ff379b90 - go.opentelemetry.io/collector/consumer v0.66.1-0.20221128222955-4ff1ff379b90 - go.opentelemetry.io/collector/pdata v0.66.1-0.20221128222955-4ff1ff379b90 + go.opentelemetry.io/collector v0.66.1-0.20221202005155-1c54042beb70 + go.opentelemetry.io/collector/component v0.66.1-0.20221202005155-1c54042beb70 + go.opentelemetry.io/collector/confmap v0.0.0-20221201172708-2bdff61fa52a + go.opentelemetry.io/collector/consumer v0.66.1-0.20221202005155-1c54042beb70 + go.opentelemetry.io/collector/pdata v0.66.1-0.20221202005155-1c54042beb70 ) require ( @@ -38,15 +39,15 @@ require ( github.com/uber/jaeger-client-go v2.30.0+incompatible // indirect github.com/uber/jaeger-lib v2.4.1+incompatible // indirect go.opencensus.io v0.24.0 // indirect - go.opentelemetry.io/collector/featuregate v0.66.1-0.20221128222955-4ff1ff379b90 // indirect - go.opentelemetry.io/collector/semconv v0.66.1-0.20221128222955-4ff1ff379b90 // indirect + go.opentelemetry.io/collector/featuregate v0.66.1-0.20221202005155-1c54042beb70 // indirect + go.opentelemetry.io/collector/semconv v0.66.1-0.20221202005155-1c54042beb70 // 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 go.opentelemetry.io/otel/trace v1.11.1 // indirect go.uber.org/atomic v1.10.0 // indirect go.uber.org/multierr v1.8.0 // indirect - go.uber.org/zap v1.23.0 // indirect + go.uber.org/zap v1.24.0 // indirect golang.org/x/net v0.0.0-20221014081412-f15817d10f9b // indirect golang.org/x/sys v0.2.0 // indirect golang.org/x/text v0.4.0 // indirect diff --git a/exporter/jaegerthrifthttpexporter/go.sum b/exporter/jaegerthrifthttpexporter/go.sum index 63d4e74f8bf9..2cfb9e56ba8f 100644 --- a/exporter/jaegerthrifthttpexporter/go.sum +++ b/exporter/jaegerthrifthttpexporter/go.sum @@ -298,18 +298,20 @@ go.etcd.io/etcd/client/pkg/v3 v3.5.4/go.mod h1:IJHfcCEKxYu1Os13ZdwCwIUTUVGYTSAM3 go.etcd.io/etcd/client/v3 v3.5.4/go.mod h1:ZaRkVgBZC+L+dLCjTcF1hRXpgZXQPOvnA/Ak/gq3kiY= go.opencensus.io v0.24.0 h1:y73uSU6J157QMP2kn2r30vwW1A2W2WFwSCGnAVxeaD0= go.opencensus.io v0.24.0/go.mod h1:vNK8G9p7aAivkbmorf4v+7Hgx+Zs0yY+0fOtgBfjQKo= -go.opentelemetry.io/collector v0.66.1-0.20221128222955-4ff1ff379b90 h1:yRe05/jMdzH4TFHfndZ5h2o2hKBK/79W72j8w51qNsI= -go.opentelemetry.io/collector v0.66.1-0.20221128222955-4ff1ff379b90/go.mod h1:hE6jCs+0rfiufCrVPucKZTMwfHit1okfDPnwPT2eW1I= -go.opentelemetry.io/collector/component v0.66.1-0.20221128222955-4ff1ff379b90 h1:AYSNTXbezhNg43EuYdVVcgxE/2gBVrm00FDx4DOmQVg= -go.opentelemetry.io/collector/component v0.66.1-0.20221128222955-4ff1ff379b90/go.mod h1:0c84EqXUhvYe6KW7hJfh76tiI/5yjWCH2amwyQ06XLM= -go.opentelemetry.io/collector/consumer v0.66.1-0.20221128222955-4ff1ff379b90 h1:nzNXVfC1FzXBXCLMzbMv+qK3E4EGiNsnMhfVsBd2yzc= -go.opentelemetry.io/collector/consumer v0.66.1-0.20221128222955-4ff1ff379b90/go.mod h1:WtoRZa5SnxQO1ZEQdVxYpFcXCmq62rakv0oUSlPO0NQ= -go.opentelemetry.io/collector/featuregate v0.66.1-0.20221128222955-4ff1ff379b90 h1:UuJSFWbi9XxyNZsJKZuvpWg35BgRbcCGFH+38V2MAdw= -go.opentelemetry.io/collector/featuregate v0.66.1-0.20221128222955-4ff1ff379b90/go.mod h1:tewuFKJYalWBU0bmNKg++MC1ipINXUr6szYzOw2p1GI= -go.opentelemetry.io/collector/pdata v0.66.1-0.20221128222955-4ff1ff379b90 h1:Vu4S4jSNcd0VFPzxQNO4+UqGwnes1xJDoFLPRiWHm8I= -go.opentelemetry.io/collector/pdata v0.66.1-0.20221128222955-4ff1ff379b90/go.mod h1:pqyaznLzk21m+1KL6fwOsRryRELL+zNM0qiVSn0MbVc= -go.opentelemetry.io/collector/semconv v0.66.1-0.20221128222955-4ff1ff379b90 h1:hFaTA68cggZKWMv7wQ3bKP8KGTbowh/5AQZKCHzHTqM= -go.opentelemetry.io/collector/semconv v0.66.1-0.20221128222955-4ff1ff379b90/go.mod h1:5o9yhOa+ABt7g2E5JABDxGZ1PQPbtfxrKNbYn+LOTXU= +go.opentelemetry.io/collector v0.66.1-0.20221202005155-1c54042beb70 h1:INB2CsOtqqrija2KvMuIpbBQ3qX1BECEeR+d0NJX+oM= +go.opentelemetry.io/collector v0.66.1-0.20221202005155-1c54042beb70/go.mod h1:d0NHkHyANJy3HDTvYE/PoylMShUmFIbiir89ieI0X0c= +go.opentelemetry.io/collector/component v0.66.1-0.20221202005155-1c54042beb70 h1:dEoJhzCmRShgmVro/kXm6pouGElgxkH2DsvanzCeZtU= +go.opentelemetry.io/collector/component v0.66.1-0.20221202005155-1c54042beb70/go.mod h1:OsVnvFFe38QSpcuZlQ8cvarDzcloCexgQ1/B2m80F6U= +go.opentelemetry.io/collector/confmap v0.0.0-20221201172708-2bdff61fa52a h1:2TscCXAQASO2kU9xHcMIUM/FP29fiQIRTilZmliq/7I= +go.opentelemetry.io/collector/confmap v0.0.0-20221201172708-2bdff61fa52a/go.mod h1:qJ3e8bA8h4wz/jYlbeEUafVHdrU7DkpStnmIUAz6VTQ= +go.opentelemetry.io/collector/consumer v0.66.1-0.20221202005155-1c54042beb70 h1:XwpVjI1KeKGPXOZBLefGILMziPYuNf6IzbmiIEsIyI0= +go.opentelemetry.io/collector/consumer v0.66.1-0.20221202005155-1c54042beb70/go.mod h1:EWVBcSGcIcmeDGTnIboc/aqa3agsBeH8/q7yFWG7xVc= +go.opentelemetry.io/collector/featuregate v0.66.1-0.20221202005155-1c54042beb70 h1:V0tf4ebciqIs07jFATfLGdUpLRaEsi+AiWuA/in0G8Y= +go.opentelemetry.io/collector/featuregate v0.66.1-0.20221202005155-1c54042beb70/go.mod h1:tewuFKJYalWBU0bmNKg++MC1ipINXUr6szYzOw2p1GI= +go.opentelemetry.io/collector/pdata v0.66.1-0.20221202005155-1c54042beb70 h1:TPOrxkEMvZzfBSwF3ct+kUUgKA5g8unkZZbKQvJweeA= +go.opentelemetry.io/collector/pdata v0.66.1-0.20221202005155-1c54042beb70/go.mod h1:pqyaznLzk21m+1KL6fwOsRryRELL+zNM0qiVSn0MbVc= +go.opentelemetry.io/collector/semconv v0.66.1-0.20221202005155-1c54042beb70 h1:Q5L9Urod3c8as6ZYaoaqBjarx/HXxsxy34DFZIU2fO4= +go.opentelemetry.io/collector/semconv v0.66.1-0.20221202005155-1c54042beb70/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= @@ -329,8 +331,8 @@ go.uber.org/multierr v1.6.0/go.mod h1:cdWPpRnG4AhwMwsgIHip0KRBQjJy5kYEpYjJxpXp9i go.uber.org/multierr v1.8.0 h1:dg6GjLku4EH+249NNmoIciG9N/jURbDG+pFlTkhzIC8= go.uber.org/multierr v1.8.0/go.mod h1:7EAYxJLBy9rStEaz58O2t4Uvip6FSURkq8/ppBp95ak= go.uber.org/zap v1.17.0/go.mod h1:MXVU+bhUf/A7Xi2HNOnopQOrmycQ5Ih87HtOu4q5SSo= -go.uber.org/zap v1.23.0 h1:OjGQ5KQDEUawVHxNwQgPpiypGHOxo2mNZsOqTak4fFY= -go.uber.org/zap v1.23.0/go.mod h1:D+nX8jyLsMHMYrln8A0rJjFt/T/9/bGgIhAqxv5URuY= +go.uber.org/zap v1.24.0 h1:FiJd5l1UOLj0wCgbSE0rwwXHzEdAZS6hiiSnxJN/D60= +go.uber.org/zap v1.24.0/go.mod h1:2kMP+WWQ8aoFoedH3T2sq6iJ2yDWpHbP0f6MQbS9Gkg= golang.org/x/crypto v0.0.0-20180904163835-0709b304e793/go.mod h1:6SG95UA2DQfeDnfUPMdvaQW0Q7yPrPDi9nlGo2tz2b4= golang.org/x/crypto v0.0.0-20190308221718-c2843e01d9a2/go.mod h1:djNgcEr1/C05ACkg1iLfiJU5Ep61QUkGW8qpdssI0+w= golang.org/x/crypto v0.0.0-20190923035154-9ee001bba392/go.mod h1:/lpIB1dKB+9EgE3H3cr1v9wB50oz8l4C4h62xy7jSTY= diff --git a/exporter/kafkaexporter/go.mod b/exporter/kafkaexporter/go.mod index 3cf2689b599c..09dbd0c640cf 100644 --- a/exporter/kafkaexporter/go.mod +++ b/exporter/kafkaexporter/go.mod @@ -11,13 +11,14 @@ require ( github.com/open-telemetry/opentelemetry-collector-contrib/pkg/translator/jaeger v0.66.0 github.com/stretchr/testify v1.8.1 github.com/xdg-go/scram v1.1.1 - go.opentelemetry.io/collector v0.66.1-0.20221128222955-4ff1ff379b90 - go.opentelemetry.io/collector/component v0.66.1-0.20221128222955-4ff1ff379b90 - go.opentelemetry.io/collector/consumer v0.66.1-0.20221128222955-4ff1ff379b90 - go.opentelemetry.io/collector/pdata v0.66.1-0.20221128222955-4ff1ff379b90 - go.opentelemetry.io/collector/semconv v0.66.1-0.20221128222955-4ff1ff379b90 + go.opentelemetry.io/collector v0.66.1-0.20221202005155-1c54042beb70 + go.opentelemetry.io/collector/component v0.66.1-0.20221202005155-1c54042beb70 + go.opentelemetry.io/collector/confmap v0.0.0-20221201172708-2bdff61fa52a + go.opentelemetry.io/collector/consumer v0.66.1-0.20221202005155-1c54042beb70 + go.opentelemetry.io/collector/pdata v0.66.1-0.20221202005155-1c54042beb70 + go.opentelemetry.io/collector/semconv v0.66.1-0.20221202005155-1c54042beb70 go.uber.org/multierr v1.8.0 - go.uber.org/zap v1.23.0 + go.uber.org/zap v1.24.0 ) require ( @@ -55,7 +56,7 @@ require ( github.com/xdg-go/pbkdf2 v1.0.0 // indirect github.com/xdg-go/stringprep v1.0.3 // indirect go.opencensus.io v0.24.0 // indirect - go.opentelemetry.io/collector/featuregate v0.66.1-0.20221128222955-4ff1ff379b90 // indirect + go.opentelemetry.io/collector/featuregate v0.66.1-0.20221202005155-1c54042beb70 // 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 dc223880e203..514e732eab96 100644 --- a/exporter/kafkaexporter/go.sum +++ b/exporter/kafkaexporter/go.sum @@ -334,18 +334,20 @@ go.etcd.io/etcd/client/pkg/v3 v3.5.4/go.mod h1:IJHfcCEKxYu1Os13ZdwCwIUTUVGYTSAM3 go.etcd.io/etcd/client/v3 v3.5.4/go.mod h1:ZaRkVgBZC+L+dLCjTcF1hRXpgZXQPOvnA/Ak/gq3kiY= go.opencensus.io v0.24.0 h1:y73uSU6J157QMP2kn2r30vwW1A2W2WFwSCGnAVxeaD0= go.opencensus.io v0.24.0/go.mod h1:vNK8G9p7aAivkbmorf4v+7Hgx+Zs0yY+0fOtgBfjQKo= -go.opentelemetry.io/collector v0.66.1-0.20221128222955-4ff1ff379b90 h1:yRe05/jMdzH4TFHfndZ5h2o2hKBK/79W72j8w51qNsI= -go.opentelemetry.io/collector v0.66.1-0.20221128222955-4ff1ff379b90/go.mod h1:hE6jCs+0rfiufCrVPucKZTMwfHit1okfDPnwPT2eW1I= -go.opentelemetry.io/collector/component v0.66.1-0.20221128222955-4ff1ff379b90 h1:AYSNTXbezhNg43EuYdVVcgxE/2gBVrm00FDx4DOmQVg= -go.opentelemetry.io/collector/component v0.66.1-0.20221128222955-4ff1ff379b90/go.mod h1:0c84EqXUhvYe6KW7hJfh76tiI/5yjWCH2amwyQ06XLM= -go.opentelemetry.io/collector/consumer v0.66.1-0.20221128222955-4ff1ff379b90 h1:nzNXVfC1FzXBXCLMzbMv+qK3E4EGiNsnMhfVsBd2yzc= -go.opentelemetry.io/collector/consumer v0.66.1-0.20221128222955-4ff1ff379b90/go.mod h1:WtoRZa5SnxQO1ZEQdVxYpFcXCmq62rakv0oUSlPO0NQ= -go.opentelemetry.io/collector/featuregate v0.66.1-0.20221128222955-4ff1ff379b90 h1:UuJSFWbi9XxyNZsJKZuvpWg35BgRbcCGFH+38V2MAdw= -go.opentelemetry.io/collector/featuregate v0.66.1-0.20221128222955-4ff1ff379b90/go.mod h1:tewuFKJYalWBU0bmNKg++MC1ipINXUr6szYzOw2p1GI= -go.opentelemetry.io/collector/pdata v0.66.1-0.20221128222955-4ff1ff379b90 h1:Vu4S4jSNcd0VFPzxQNO4+UqGwnes1xJDoFLPRiWHm8I= -go.opentelemetry.io/collector/pdata v0.66.1-0.20221128222955-4ff1ff379b90/go.mod h1:pqyaznLzk21m+1KL6fwOsRryRELL+zNM0qiVSn0MbVc= -go.opentelemetry.io/collector/semconv v0.66.1-0.20221128222955-4ff1ff379b90 h1:hFaTA68cggZKWMv7wQ3bKP8KGTbowh/5AQZKCHzHTqM= -go.opentelemetry.io/collector/semconv v0.66.1-0.20221128222955-4ff1ff379b90/go.mod h1:5o9yhOa+ABt7g2E5JABDxGZ1PQPbtfxrKNbYn+LOTXU= +go.opentelemetry.io/collector v0.66.1-0.20221202005155-1c54042beb70 h1:INB2CsOtqqrija2KvMuIpbBQ3qX1BECEeR+d0NJX+oM= +go.opentelemetry.io/collector v0.66.1-0.20221202005155-1c54042beb70/go.mod h1:d0NHkHyANJy3HDTvYE/PoylMShUmFIbiir89ieI0X0c= +go.opentelemetry.io/collector/component v0.66.1-0.20221202005155-1c54042beb70 h1:dEoJhzCmRShgmVro/kXm6pouGElgxkH2DsvanzCeZtU= +go.opentelemetry.io/collector/component v0.66.1-0.20221202005155-1c54042beb70/go.mod h1:OsVnvFFe38QSpcuZlQ8cvarDzcloCexgQ1/B2m80F6U= +go.opentelemetry.io/collector/confmap v0.0.0-20221201172708-2bdff61fa52a h1:2TscCXAQASO2kU9xHcMIUM/FP29fiQIRTilZmliq/7I= +go.opentelemetry.io/collector/confmap v0.0.0-20221201172708-2bdff61fa52a/go.mod h1:qJ3e8bA8h4wz/jYlbeEUafVHdrU7DkpStnmIUAz6VTQ= +go.opentelemetry.io/collector/consumer v0.66.1-0.20221202005155-1c54042beb70 h1:XwpVjI1KeKGPXOZBLefGILMziPYuNf6IzbmiIEsIyI0= +go.opentelemetry.io/collector/consumer v0.66.1-0.20221202005155-1c54042beb70/go.mod h1:EWVBcSGcIcmeDGTnIboc/aqa3agsBeH8/q7yFWG7xVc= +go.opentelemetry.io/collector/featuregate v0.66.1-0.20221202005155-1c54042beb70 h1:V0tf4ebciqIs07jFATfLGdUpLRaEsi+AiWuA/in0G8Y= +go.opentelemetry.io/collector/featuregate v0.66.1-0.20221202005155-1c54042beb70/go.mod h1:tewuFKJYalWBU0bmNKg++MC1ipINXUr6szYzOw2p1GI= +go.opentelemetry.io/collector/pdata v0.66.1-0.20221202005155-1c54042beb70 h1:TPOrxkEMvZzfBSwF3ct+kUUgKA5g8unkZZbKQvJweeA= +go.opentelemetry.io/collector/pdata v0.66.1-0.20221202005155-1c54042beb70/go.mod h1:pqyaznLzk21m+1KL6fwOsRryRELL+zNM0qiVSn0MbVc= +go.opentelemetry.io/collector/semconv v0.66.1-0.20221202005155-1c54042beb70 h1:Q5L9Urod3c8as6ZYaoaqBjarx/HXxsxy34DFZIU2fO4= +go.opentelemetry.io/collector/semconv v0.66.1-0.20221202005155-1c54042beb70/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= @@ -363,8 +365,8 @@ go.uber.org/multierr v1.6.0/go.mod h1:cdWPpRnG4AhwMwsgIHip0KRBQjJy5kYEpYjJxpXp9i go.uber.org/multierr v1.8.0 h1:dg6GjLku4EH+249NNmoIciG9N/jURbDG+pFlTkhzIC8= go.uber.org/multierr v1.8.0/go.mod h1:7EAYxJLBy9rStEaz58O2t4Uvip6FSURkq8/ppBp95ak= go.uber.org/zap v1.17.0/go.mod h1:MXVU+bhUf/A7Xi2HNOnopQOrmycQ5Ih87HtOu4q5SSo= -go.uber.org/zap v1.23.0 h1:OjGQ5KQDEUawVHxNwQgPpiypGHOxo2mNZsOqTak4fFY= -go.uber.org/zap v1.23.0/go.mod h1:D+nX8jyLsMHMYrln8A0rJjFt/T/9/bGgIhAqxv5URuY= +go.uber.org/zap v1.24.0 h1:FiJd5l1UOLj0wCgbSE0rwwXHzEdAZS6hiiSnxJN/D60= +go.uber.org/zap v1.24.0/go.mod h1:2kMP+WWQ8aoFoedH3T2sq6iJ2yDWpHbP0f6MQbS9Gkg= golang.org/x/crypto v0.0.0-20180904163835-0709b304e793/go.mod h1:6SG95UA2DQfeDnfUPMdvaQW0Q7yPrPDi9nlGo2tz2b4= golang.org/x/crypto v0.0.0-20190308221718-c2843e01d9a2/go.mod h1:djNgcEr1/C05ACkg1iLfiJU5Ep61QUkGW8qpdssI0+w= golang.org/x/crypto v0.0.0-20190923035154-9ee001bba392/go.mod h1:/lpIB1dKB+9EgE3H3cr1v9wB50oz8l4C4h62xy7jSTY= diff --git a/exporter/loadbalancingexporter/go.mod b/exporter/loadbalancingexporter/go.mod index c386448b8dbf..8d4fb5393636 100644 --- a/exporter/loadbalancingexporter/go.mod +++ b/exporter/loadbalancingexporter/go.mod @@ -6,15 +6,16 @@ require ( github.com/open-telemetry/opentelemetry-collector-contrib/pkg/batchpersignal v0.66.0 github.com/stretchr/testify v1.8.1 go.opencensus.io v0.24.0 - go.opentelemetry.io/collector v0.66.1-0.20221128222955-4ff1ff379b90 - go.opentelemetry.io/collector/component v0.66.1-0.20221128222955-4ff1ff379b90 - go.opentelemetry.io/collector/consumer v0.66.1-0.20221128222955-4ff1ff379b90 - go.opentelemetry.io/collector/exporter/otlpexporter v0.66.1-0.20221128222955-4ff1ff379b90 - go.opentelemetry.io/collector/pdata v0.66.1-0.20221128222955-4ff1ff379b90 - go.opentelemetry.io/collector/semconv v0.66.1-0.20221128222955-4ff1ff379b90 + go.opentelemetry.io/collector v0.66.1-0.20221202005155-1c54042beb70 + go.opentelemetry.io/collector/component v0.66.1-0.20221202005155-1c54042beb70 + go.opentelemetry.io/collector/confmap v0.0.0-20221201172708-2bdff61fa52a + go.opentelemetry.io/collector/consumer v0.66.1-0.20221202005155-1c54042beb70 + go.opentelemetry.io/collector/exporter/otlpexporter v0.66.1-0.20221202005155-1c54042beb70 + go.opentelemetry.io/collector/pdata v0.66.1-0.20221202005155-1c54042beb70 + go.opentelemetry.io/collector/semconv v0.66.1-0.20221202005155-1c54042beb70 go.uber.org/atomic v1.10.0 go.uber.org/multierr v1.8.0 - go.uber.org/zap v1.23.0 + go.uber.org/zap v1.24.0 ) require ( @@ -58,11 +59,11 @@ require ( github.com/shirou/gopsutil/v3 v3.22.10 // indirect github.com/spf13/cobra v1.6.1 // indirect github.com/spf13/pflag v1.0.5 // indirect - github.com/tklauser/go-sysconf v0.3.10 // indirect - github.com/tklauser/numcpus v0.4.0 // indirect + github.com/tklauser/go-sysconf v0.3.11 // indirect + github.com/tklauser/numcpus v0.6.0 // indirect github.com/yusufpapurcu/wmi v1.2.2 // indirect - go.opentelemetry.io/collector/featuregate v0.66.1-0.20221128222955-4ff1ff379b90 // indirect - go.opentelemetry.io/collector/processor/batchprocessor v0.66.1-0.20221128222955-4ff1ff379b90 // indirect + go.opentelemetry.io/collector/featuregate v0.66.1-0.20221202005155-1c54042beb70 // indirect + go.opentelemetry.io/collector/processor/batchprocessor v0.66.1-0.20221202005155-1c54042beb70 // indirect go.opentelemetry.io/contrib/instrumentation/google.golang.org/grpc/otelgrpc v0.36.4 // indirect go.opentelemetry.io/contrib/propagators/b3 v1.11.1 // indirect go.opentelemetry.io/otel v1.11.1 // indirect diff --git a/exporter/loadbalancingexporter/go.sum b/exporter/loadbalancingexporter/go.sum index 5d1c384a004b..119be500d538 100644 --- a/exporter/loadbalancingexporter/go.sum +++ b/exporter/loadbalancingexporter/go.sum @@ -396,10 +396,12 @@ github.com/stretchr/testify v1.8.0/go.mod h1:yNjHg4UonilssWZ8iaSj1OCr/vHnekPRkoO github.com/stretchr/testify v1.8.1 h1:w7B6lhMri9wdJUVmEZPGGhZzrYTPvgJArz7wNPgYKsk= github.com/stretchr/testify v1.8.1/go.mod h1:w2LPCIKwWwSfY2zedu0+kehJoqGctiVI29o6fzry7u4= github.com/stvp/go-udp-testing v0.0.0-20201019212854-469649b16807/go.mod h1:7jxmlfBCDBXRzr0eAQJ48XC1hBu1np4CS5+cHEYfwpc= -github.com/tklauser/go-sysconf v0.3.10 h1:IJ1AZGZRWbY8T5Vfk04D9WOA5WSejdflXxP03OUqALw= github.com/tklauser/go-sysconf v0.3.10/go.mod h1:C8XykCvCb+Gn0oNCWPIlcb0RuglQTYaQ2hGm7jmxEFk= -github.com/tklauser/numcpus v0.4.0 h1:E53Dm1HjH1/R2/aoCtXtPgzmElmn51aOkhCFSuZq//o= +github.com/tklauser/go-sysconf v0.3.11 h1:89WgdJhk5SNwJfu+GKyYveZ4IaJ7xAkecBo+KdJV0CM= +github.com/tklauser/go-sysconf v0.3.11/go.mod h1:GqXfhXY3kiPa0nAXPDIQIWzJbMCB7AmcWpGR8lSZfqI= github.com/tklauser/numcpus v0.4.0/go.mod h1:1+UI3pD8NW14VMwdgJNJ1ESk2UnwhAnz5hMwiKKqXCQ= +github.com/tklauser/numcpus v0.6.0 h1:kebhY2Qt+3U6RNK7UqpYNA+tJ23IBEGKkB7JQBfDYms= +github.com/tklauser/numcpus v0.6.0/go.mod h1:FEZLMke0lhOUG6w2JadTzp0a+Nl8PF/GFkQ5UVIcaL4= github.com/yuin/goldmark v1.1.25/go.mod h1:3hX8gzYuyVAZsxl0MRgGTJEmQBFcNTphYh9decYSb74= github.com/yuin/goldmark v1.1.27/go.mod h1:3hX8gzYuyVAZsxl0MRgGTJEmQBFcNTphYh9decYSb74= github.com/yuin/goldmark v1.1.32/go.mod h1:3hX8gzYuyVAZsxl0MRgGTJEmQBFcNTphYh9decYSb74= @@ -418,23 +420,25 @@ go.opencensus.io v0.22.4/go.mod h1:yxeiOL68Rb0Xd1ddK5vPZ/oVn4vY4Ynel7k9FzqtOIw= go.opencensus.io v0.23.0/go.mod h1:XItmlyltB5F7CS4xOC1DcqMoFqwtC6OG2xF7mCv7P7E= go.opencensus.io v0.24.0 h1:y73uSU6J157QMP2kn2r30vwW1A2W2WFwSCGnAVxeaD0= go.opencensus.io v0.24.0/go.mod h1:vNK8G9p7aAivkbmorf4v+7Hgx+Zs0yY+0fOtgBfjQKo= -go.opentelemetry.io/collector v0.66.1-0.20221128222955-4ff1ff379b90 h1:yRe05/jMdzH4TFHfndZ5h2o2hKBK/79W72j8w51qNsI= -go.opentelemetry.io/collector v0.66.1-0.20221128222955-4ff1ff379b90/go.mod h1:hE6jCs+0rfiufCrVPucKZTMwfHit1okfDPnwPT2eW1I= -go.opentelemetry.io/collector/component v0.66.1-0.20221128222955-4ff1ff379b90 h1:AYSNTXbezhNg43EuYdVVcgxE/2gBVrm00FDx4DOmQVg= -go.opentelemetry.io/collector/component v0.66.1-0.20221128222955-4ff1ff379b90/go.mod h1:0c84EqXUhvYe6KW7hJfh76tiI/5yjWCH2amwyQ06XLM= -go.opentelemetry.io/collector/consumer v0.66.1-0.20221128222955-4ff1ff379b90 h1:nzNXVfC1FzXBXCLMzbMv+qK3E4EGiNsnMhfVsBd2yzc= -go.opentelemetry.io/collector/consumer v0.66.1-0.20221128222955-4ff1ff379b90/go.mod h1:WtoRZa5SnxQO1ZEQdVxYpFcXCmq62rakv0oUSlPO0NQ= -go.opentelemetry.io/collector/exporter/otlpexporter v0.66.1-0.20221128222955-4ff1ff379b90 h1:3+YgPEDEyNzwiI+V9J2YBVGyV9Qppu4VPbB3jHeN8Ns= -go.opentelemetry.io/collector/exporter/otlpexporter v0.66.1-0.20221128222955-4ff1ff379b90/go.mod h1:IOoHR1lsV1r2TFOVctPogn9RUXT4jiU7kH+IhfUlP1w= -go.opentelemetry.io/collector/extension/zpagesextension v0.65.0 h1:T5JJIJ3cmClqdSMgkbjoIiP9p059AAvbfcd3houJkxM= -go.opentelemetry.io/collector/featuregate v0.66.1-0.20221128222955-4ff1ff379b90 h1:UuJSFWbi9XxyNZsJKZuvpWg35BgRbcCGFH+38V2MAdw= -go.opentelemetry.io/collector/featuregate v0.66.1-0.20221128222955-4ff1ff379b90/go.mod h1:tewuFKJYalWBU0bmNKg++MC1ipINXUr6szYzOw2p1GI= -go.opentelemetry.io/collector/pdata v0.66.1-0.20221128222955-4ff1ff379b90 h1:Vu4S4jSNcd0VFPzxQNO4+UqGwnes1xJDoFLPRiWHm8I= -go.opentelemetry.io/collector/pdata v0.66.1-0.20221128222955-4ff1ff379b90/go.mod h1:pqyaznLzk21m+1KL6fwOsRryRELL+zNM0qiVSn0MbVc= -go.opentelemetry.io/collector/processor/batchprocessor v0.66.1-0.20221128222955-4ff1ff379b90 h1:K12L9juzjChBMfp7cQaQsToz7i7975tUYVzJ3Tpw/Cw= -go.opentelemetry.io/collector/processor/batchprocessor v0.66.1-0.20221128222955-4ff1ff379b90/go.mod h1:XhGTsC1B/bq4gpg8IZ/QYBLXkzE4Gw3r7Xu2+ik8A1Q= -go.opentelemetry.io/collector/semconv v0.66.1-0.20221128222955-4ff1ff379b90 h1:hFaTA68cggZKWMv7wQ3bKP8KGTbowh/5AQZKCHzHTqM= -go.opentelemetry.io/collector/semconv v0.66.1-0.20221128222955-4ff1ff379b90/go.mod h1:5o9yhOa+ABt7g2E5JABDxGZ1PQPbtfxrKNbYn+LOTXU= +go.opentelemetry.io/collector v0.66.1-0.20221202005155-1c54042beb70 h1:INB2CsOtqqrija2KvMuIpbBQ3qX1BECEeR+d0NJX+oM= +go.opentelemetry.io/collector v0.66.1-0.20221202005155-1c54042beb70/go.mod h1:d0NHkHyANJy3HDTvYE/PoylMShUmFIbiir89ieI0X0c= +go.opentelemetry.io/collector/component v0.66.1-0.20221202005155-1c54042beb70 h1:dEoJhzCmRShgmVro/kXm6pouGElgxkH2DsvanzCeZtU= +go.opentelemetry.io/collector/component v0.66.1-0.20221202005155-1c54042beb70/go.mod h1:OsVnvFFe38QSpcuZlQ8cvarDzcloCexgQ1/B2m80F6U= +go.opentelemetry.io/collector/confmap v0.0.0-20221201172708-2bdff61fa52a h1:2TscCXAQASO2kU9xHcMIUM/FP29fiQIRTilZmliq/7I= +go.opentelemetry.io/collector/confmap v0.0.0-20221201172708-2bdff61fa52a/go.mod h1:qJ3e8bA8h4wz/jYlbeEUafVHdrU7DkpStnmIUAz6VTQ= +go.opentelemetry.io/collector/consumer v0.66.1-0.20221202005155-1c54042beb70 h1:XwpVjI1KeKGPXOZBLefGILMziPYuNf6IzbmiIEsIyI0= +go.opentelemetry.io/collector/consumer v0.66.1-0.20221202005155-1c54042beb70/go.mod h1:EWVBcSGcIcmeDGTnIboc/aqa3agsBeH8/q7yFWG7xVc= +go.opentelemetry.io/collector/exporter/otlpexporter v0.66.1-0.20221202005155-1c54042beb70 h1:m9GPfziw/079Xt7/Pfby/5obJhtqR19WKkgQQ/VxNZo= +go.opentelemetry.io/collector/exporter/otlpexporter v0.66.1-0.20221202005155-1c54042beb70/go.mod h1:bCD3trc7OqeEVCgyQdO3kwGgogZMjcMu2tX49SFv1lU= +go.opentelemetry.io/collector/extension/zpagesextension v0.66.0 h1:tPqSKH5K3VhTT0XXVoWL3woWBSTJqnXZQRt0ZLSCoCc= +go.opentelemetry.io/collector/featuregate v0.66.1-0.20221202005155-1c54042beb70 h1:V0tf4ebciqIs07jFATfLGdUpLRaEsi+AiWuA/in0G8Y= +go.opentelemetry.io/collector/featuregate v0.66.1-0.20221202005155-1c54042beb70/go.mod h1:tewuFKJYalWBU0bmNKg++MC1ipINXUr6szYzOw2p1GI= +go.opentelemetry.io/collector/pdata v0.66.1-0.20221202005155-1c54042beb70 h1:TPOrxkEMvZzfBSwF3ct+kUUgKA5g8unkZZbKQvJweeA= +go.opentelemetry.io/collector/pdata v0.66.1-0.20221202005155-1c54042beb70/go.mod h1:pqyaznLzk21m+1KL6fwOsRryRELL+zNM0qiVSn0MbVc= +go.opentelemetry.io/collector/processor/batchprocessor v0.66.1-0.20221202005155-1c54042beb70 h1:Y4e8NnVevonnAgmjX9Z7QIMA32yMqHAOnAlh8SzTS8c= +go.opentelemetry.io/collector/processor/batchprocessor v0.66.1-0.20221202005155-1c54042beb70/go.mod h1:Pi1CsKDQFoDrUP1i3+VdE6s2Xuji7bOGFBgqHK0J32E= +go.opentelemetry.io/collector/semconv v0.66.1-0.20221202005155-1c54042beb70 h1:Q5L9Urod3c8as6ZYaoaqBjarx/HXxsxy34DFZIU2fO4= +go.opentelemetry.io/collector/semconv v0.66.1-0.20221202005155-1c54042beb70/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= @@ -461,8 +465,8 @@ go.uber.org/multierr v1.6.0/go.mod h1:cdWPpRnG4AhwMwsgIHip0KRBQjJy5kYEpYjJxpXp9i go.uber.org/multierr v1.8.0 h1:dg6GjLku4EH+249NNmoIciG9N/jURbDG+pFlTkhzIC8= go.uber.org/multierr v1.8.0/go.mod h1:7EAYxJLBy9rStEaz58O2t4Uvip6FSURkq8/ppBp95ak= go.uber.org/zap v1.17.0/go.mod h1:MXVU+bhUf/A7Xi2HNOnopQOrmycQ5Ih87HtOu4q5SSo= -go.uber.org/zap v1.23.0 h1:OjGQ5KQDEUawVHxNwQgPpiypGHOxo2mNZsOqTak4fFY= -go.uber.org/zap v1.23.0/go.mod h1:D+nX8jyLsMHMYrln8A0rJjFt/T/9/bGgIhAqxv5URuY= +go.uber.org/zap v1.24.0 h1:FiJd5l1UOLj0wCgbSE0rwwXHzEdAZS6hiiSnxJN/D60= +go.uber.org/zap v1.24.0/go.mod h1:2kMP+WWQ8aoFoedH3T2sq6iJ2yDWpHbP0f6MQbS9Gkg= golang.org/x/crypto v0.0.0-20180904163835-0709b304e793/go.mod h1:6SG95UA2DQfeDnfUPMdvaQW0Q7yPrPDi9nlGo2tz2b4= golang.org/x/crypto v0.0.0-20190308221718-c2843e01d9a2/go.mod h1:djNgcEr1/C05ACkg1iLfiJU5Ep61QUkGW8qpdssI0+w= golang.org/x/crypto v0.0.0-20190510104115-cbcb75029529/go.mod h1:yigFU9vqHzYiE8UmvKecakEJjdnWj3jj499lnFckfCI= diff --git a/exporter/logicmonitorexporter/go.mod b/exporter/logicmonitorexporter/go.mod index 80b683b4c96f..6e2b3c0ad896 100644 --- a/exporter/logicmonitorexporter/go.mod +++ b/exporter/logicmonitorexporter/go.mod @@ -5,9 +5,10 @@ go 1.18 require ( github.com/open-telemetry/opentelemetry-collector-contrib/pkg/resourcetotelemetry v0.66.0 github.com/stretchr/testify v1.8.1 - go.opentelemetry.io/collector v0.66.1-0.20221128222955-4ff1ff379b90 - go.opentelemetry.io/collector/component v0.66.1-0.20221128222955-4ff1ff379b90 - go.opentelemetry.io/collector/consumer v0.66.1-0.20221128222955-4ff1ff379b90 + go.opentelemetry.io/collector v0.66.1-0.20221202005155-1c54042beb70 + go.opentelemetry.io/collector/component v0.66.1-0.20221202005155-1c54042beb70 + go.opentelemetry.io/collector/confmap v0.0.0-20221201172708-2bdff61fa52a + go.opentelemetry.io/collector/consumer v0.66.1-0.20221202005155-1c54042beb70 ) require ( @@ -30,15 +31,15 @@ require ( github.com/pmezard/go-difflib v1.0.0 // indirect github.com/rs/cors v1.8.2 // indirect go.opencensus.io v0.24.0 // indirect - go.opentelemetry.io/collector/featuregate v0.66.1-0.20221128222955-4ff1ff379b90 // indirect - go.opentelemetry.io/collector/pdata v0.66.1-0.20221128222955-4ff1ff379b90 // indirect + go.opentelemetry.io/collector/featuregate v0.66.1-0.20221202005155-1c54042beb70 // indirect + go.opentelemetry.io/collector/pdata v0.66.1-0.20221202005155-1c54042beb70 // 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 go.opentelemetry.io/otel/trace v1.11.1 // indirect go.uber.org/atomic v1.10.0 // indirect go.uber.org/multierr v1.8.0 // indirect - go.uber.org/zap v1.23.0 // indirect + go.uber.org/zap v1.24.0 // indirect golang.org/x/net v0.2.0 // indirect golang.org/x/sys v0.2.0 // indirect golang.org/x/text v0.4.0 // indirect diff --git a/exporter/logicmonitorexporter/go.sum b/exporter/logicmonitorexporter/go.sum index efa2c2b4f75f..08dc02fefab9 100644 --- a/exporter/logicmonitorexporter/go.sum +++ b/exporter/logicmonitorexporter/go.sum @@ -284,16 +284,18 @@ go.etcd.io/etcd/client/pkg/v3 v3.5.4/go.mod h1:IJHfcCEKxYu1Os13ZdwCwIUTUVGYTSAM3 go.etcd.io/etcd/client/v3 v3.5.4/go.mod h1:ZaRkVgBZC+L+dLCjTcF1hRXpgZXQPOvnA/Ak/gq3kiY= go.opencensus.io v0.24.0 h1:y73uSU6J157QMP2kn2r30vwW1A2W2WFwSCGnAVxeaD0= go.opencensus.io v0.24.0/go.mod h1:vNK8G9p7aAivkbmorf4v+7Hgx+Zs0yY+0fOtgBfjQKo= -go.opentelemetry.io/collector v0.66.1-0.20221128222955-4ff1ff379b90 h1:yRe05/jMdzH4TFHfndZ5h2o2hKBK/79W72j8w51qNsI= -go.opentelemetry.io/collector v0.66.1-0.20221128222955-4ff1ff379b90/go.mod h1:hE6jCs+0rfiufCrVPucKZTMwfHit1okfDPnwPT2eW1I= -go.opentelemetry.io/collector/component v0.66.1-0.20221128222955-4ff1ff379b90 h1:AYSNTXbezhNg43EuYdVVcgxE/2gBVrm00FDx4DOmQVg= -go.opentelemetry.io/collector/component v0.66.1-0.20221128222955-4ff1ff379b90/go.mod h1:0c84EqXUhvYe6KW7hJfh76tiI/5yjWCH2amwyQ06XLM= -go.opentelemetry.io/collector/consumer v0.66.1-0.20221128222955-4ff1ff379b90 h1:nzNXVfC1FzXBXCLMzbMv+qK3E4EGiNsnMhfVsBd2yzc= -go.opentelemetry.io/collector/consumer v0.66.1-0.20221128222955-4ff1ff379b90/go.mod h1:WtoRZa5SnxQO1ZEQdVxYpFcXCmq62rakv0oUSlPO0NQ= -go.opentelemetry.io/collector/featuregate v0.66.1-0.20221128222955-4ff1ff379b90 h1:UuJSFWbi9XxyNZsJKZuvpWg35BgRbcCGFH+38V2MAdw= -go.opentelemetry.io/collector/featuregate v0.66.1-0.20221128222955-4ff1ff379b90/go.mod h1:tewuFKJYalWBU0bmNKg++MC1ipINXUr6szYzOw2p1GI= -go.opentelemetry.io/collector/pdata v0.66.1-0.20221128222955-4ff1ff379b90 h1:Vu4S4jSNcd0VFPzxQNO4+UqGwnes1xJDoFLPRiWHm8I= -go.opentelemetry.io/collector/pdata v0.66.1-0.20221128222955-4ff1ff379b90/go.mod h1:pqyaznLzk21m+1KL6fwOsRryRELL+zNM0qiVSn0MbVc= +go.opentelemetry.io/collector v0.66.1-0.20221202005155-1c54042beb70 h1:INB2CsOtqqrija2KvMuIpbBQ3qX1BECEeR+d0NJX+oM= +go.opentelemetry.io/collector v0.66.1-0.20221202005155-1c54042beb70/go.mod h1:d0NHkHyANJy3HDTvYE/PoylMShUmFIbiir89ieI0X0c= +go.opentelemetry.io/collector/component v0.66.1-0.20221202005155-1c54042beb70 h1:dEoJhzCmRShgmVro/kXm6pouGElgxkH2DsvanzCeZtU= +go.opentelemetry.io/collector/component v0.66.1-0.20221202005155-1c54042beb70/go.mod h1:OsVnvFFe38QSpcuZlQ8cvarDzcloCexgQ1/B2m80F6U= +go.opentelemetry.io/collector/confmap v0.0.0-20221201172708-2bdff61fa52a h1:2TscCXAQASO2kU9xHcMIUM/FP29fiQIRTilZmliq/7I= +go.opentelemetry.io/collector/confmap v0.0.0-20221201172708-2bdff61fa52a/go.mod h1:qJ3e8bA8h4wz/jYlbeEUafVHdrU7DkpStnmIUAz6VTQ= +go.opentelemetry.io/collector/consumer v0.66.1-0.20221202005155-1c54042beb70 h1:XwpVjI1KeKGPXOZBLefGILMziPYuNf6IzbmiIEsIyI0= +go.opentelemetry.io/collector/consumer v0.66.1-0.20221202005155-1c54042beb70/go.mod h1:EWVBcSGcIcmeDGTnIboc/aqa3agsBeH8/q7yFWG7xVc= +go.opentelemetry.io/collector/featuregate v0.66.1-0.20221202005155-1c54042beb70 h1:V0tf4ebciqIs07jFATfLGdUpLRaEsi+AiWuA/in0G8Y= +go.opentelemetry.io/collector/featuregate v0.66.1-0.20221202005155-1c54042beb70/go.mod h1:tewuFKJYalWBU0bmNKg++MC1ipINXUr6szYzOw2p1GI= +go.opentelemetry.io/collector/pdata v0.66.1-0.20221202005155-1c54042beb70 h1:TPOrxkEMvZzfBSwF3ct+kUUgKA5g8unkZZbKQvJweeA= +go.opentelemetry.io/collector/pdata v0.66.1-0.20221202005155-1c54042beb70/go.mod h1:pqyaznLzk21m+1KL6fwOsRryRELL+zNM0qiVSn0MbVc= 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= @@ -313,8 +315,8 @@ go.uber.org/multierr v1.6.0/go.mod h1:cdWPpRnG4AhwMwsgIHip0KRBQjJy5kYEpYjJxpXp9i go.uber.org/multierr v1.8.0 h1:dg6GjLku4EH+249NNmoIciG9N/jURbDG+pFlTkhzIC8= go.uber.org/multierr v1.8.0/go.mod h1:7EAYxJLBy9rStEaz58O2t4Uvip6FSURkq8/ppBp95ak= go.uber.org/zap v1.17.0/go.mod h1:MXVU+bhUf/A7Xi2HNOnopQOrmycQ5Ih87HtOu4q5SSo= -go.uber.org/zap v1.23.0 h1:OjGQ5KQDEUawVHxNwQgPpiypGHOxo2mNZsOqTak4fFY= -go.uber.org/zap v1.23.0/go.mod h1:D+nX8jyLsMHMYrln8A0rJjFt/T/9/bGgIhAqxv5URuY= +go.uber.org/zap v1.24.0 h1:FiJd5l1UOLj0wCgbSE0rwwXHzEdAZS6hiiSnxJN/D60= +go.uber.org/zap v1.24.0/go.mod h1:2kMP+WWQ8aoFoedH3T2sq6iJ2yDWpHbP0f6MQbS9Gkg= golang.org/x/crypto v0.0.0-20180904163835-0709b304e793/go.mod h1:6SG95UA2DQfeDnfUPMdvaQW0Q7yPrPDi9nlGo2tz2b4= golang.org/x/crypto v0.0.0-20190308221718-c2843e01d9a2/go.mod h1:djNgcEr1/C05ACkg1iLfiJU5Ep61QUkGW8qpdssI0+w= golang.org/x/crypto v0.0.0-20190923035154-9ee001bba392/go.mod h1:/lpIB1dKB+9EgE3H3cr1v9wB50oz8l4C4h62xy7jSTY= diff --git a/exporter/logzioexporter/go.mod b/exporter/logzioexporter/go.mod index f352c38e31b5..4a82f9c70763 100644 --- a/exporter/logzioexporter/go.mod +++ b/exporter/logzioexporter/go.mod @@ -8,12 +8,13 @@ require ( github.com/open-telemetry/opentelemetry-collector-contrib/internal/coreinternal v0.66.0 github.com/open-telemetry/opentelemetry-collector-contrib/pkg/translator/jaeger v0.66.0 github.com/stretchr/testify v1.8.1 - go.opentelemetry.io/collector v0.66.1-0.20221128222955-4ff1ff379b90 - go.opentelemetry.io/collector/component v0.66.1-0.20221128222955-4ff1ff379b90 - go.opentelemetry.io/collector/consumer v0.66.1-0.20221128222955-4ff1ff379b90 - go.opentelemetry.io/collector/pdata v0.66.1-0.20221128222955-4ff1ff379b90 - go.opentelemetry.io/collector/semconv v0.66.1-0.20221128222955-4ff1ff379b90 - go.uber.org/zap v1.23.0 + go.opentelemetry.io/collector v0.66.1-0.20221202005155-1c54042beb70 + go.opentelemetry.io/collector/component v0.66.1-0.20221202005155-1c54042beb70 + go.opentelemetry.io/collector/confmap v0.0.0-20221201172708-2bdff61fa52a + go.opentelemetry.io/collector/consumer v0.66.1-0.20221202005155-1c54042beb70 + go.opentelemetry.io/collector/pdata v0.66.1-0.20221202005155-1c54042beb70 + go.opentelemetry.io/collector/semconv v0.66.1-0.20221202005155-1c54042beb70 + go.uber.org/zap v1.24.0 google.golang.org/genproto v0.0.0-20221027153422-115e99e71e1c google.golang.org/protobuf v1.28.1 ) @@ -45,7 +46,7 @@ require ( github.com/uber/jaeger-client-go v2.30.0+incompatible // indirect github.com/uber/jaeger-lib v2.4.1+incompatible // indirect go.opencensus.io v0.24.0 // indirect - go.opentelemetry.io/collector/featuregate v0.66.1-0.20221128222955-4ff1ff379b90 // indirect + go.opentelemetry.io/collector/featuregate v0.66.1-0.20221202005155-1c54042beb70 // 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 e26315a441e6..9fe6e7efb2f6 100644 --- a/exporter/logzioexporter/go.sum +++ b/exporter/logzioexporter/go.sum @@ -306,18 +306,20 @@ go.etcd.io/etcd/client/pkg/v3 v3.5.4/go.mod h1:IJHfcCEKxYu1Os13ZdwCwIUTUVGYTSAM3 go.etcd.io/etcd/client/v3 v3.5.4/go.mod h1:ZaRkVgBZC+L+dLCjTcF1hRXpgZXQPOvnA/Ak/gq3kiY= go.opencensus.io v0.24.0 h1:y73uSU6J157QMP2kn2r30vwW1A2W2WFwSCGnAVxeaD0= go.opencensus.io v0.24.0/go.mod h1:vNK8G9p7aAivkbmorf4v+7Hgx+Zs0yY+0fOtgBfjQKo= -go.opentelemetry.io/collector v0.66.1-0.20221128222955-4ff1ff379b90 h1:yRe05/jMdzH4TFHfndZ5h2o2hKBK/79W72j8w51qNsI= -go.opentelemetry.io/collector v0.66.1-0.20221128222955-4ff1ff379b90/go.mod h1:hE6jCs+0rfiufCrVPucKZTMwfHit1okfDPnwPT2eW1I= -go.opentelemetry.io/collector/component v0.66.1-0.20221128222955-4ff1ff379b90 h1:AYSNTXbezhNg43EuYdVVcgxE/2gBVrm00FDx4DOmQVg= -go.opentelemetry.io/collector/component v0.66.1-0.20221128222955-4ff1ff379b90/go.mod h1:0c84EqXUhvYe6KW7hJfh76tiI/5yjWCH2amwyQ06XLM= -go.opentelemetry.io/collector/consumer v0.66.1-0.20221128222955-4ff1ff379b90 h1:nzNXVfC1FzXBXCLMzbMv+qK3E4EGiNsnMhfVsBd2yzc= -go.opentelemetry.io/collector/consumer v0.66.1-0.20221128222955-4ff1ff379b90/go.mod h1:WtoRZa5SnxQO1ZEQdVxYpFcXCmq62rakv0oUSlPO0NQ= -go.opentelemetry.io/collector/featuregate v0.66.1-0.20221128222955-4ff1ff379b90 h1:UuJSFWbi9XxyNZsJKZuvpWg35BgRbcCGFH+38V2MAdw= -go.opentelemetry.io/collector/featuregate v0.66.1-0.20221128222955-4ff1ff379b90/go.mod h1:tewuFKJYalWBU0bmNKg++MC1ipINXUr6szYzOw2p1GI= -go.opentelemetry.io/collector/pdata v0.66.1-0.20221128222955-4ff1ff379b90 h1:Vu4S4jSNcd0VFPzxQNO4+UqGwnes1xJDoFLPRiWHm8I= -go.opentelemetry.io/collector/pdata v0.66.1-0.20221128222955-4ff1ff379b90/go.mod h1:pqyaznLzk21m+1KL6fwOsRryRELL+zNM0qiVSn0MbVc= -go.opentelemetry.io/collector/semconv v0.66.1-0.20221128222955-4ff1ff379b90 h1:hFaTA68cggZKWMv7wQ3bKP8KGTbowh/5AQZKCHzHTqM= -go.opentelemetry.io/collector/semconv v0.66.1-0.20221128222955-4ff1ff379b90/go.mod h1:5o9yhOa+ABt7g2E5JABDxGZ1PQPbtfxrKNbYn+LOTXU= +go.opentelemetry.io/collector v0.66.1-0.20221202005155-1c54042beb70 h1:INB2CsOtqqrija2KvMuIpbBQ3qX1BECEeR+d0NJX+oM= +go.opentelemetry.io/collector v0.66.1-0.20221202005155-1c54042beb70/go.mod h1:d0NHkHyANJy3HDTvYE/PoylMShUmFIbiir89ieI0X0c= +go.opentelemetry.io/collector/component v0.66.1-0.20221202005155-1c54042beb70 h1:dEoJhzCmRShgmVro/kXm6pouGElgxkH2DsvanzCeZtU= +go.opentelemetry.io/collector/component v0.66.1-0.20221202005155-1c54042beb70/go.mod h1:OsVnvFFe38QSpcuZlQ8cvarDzcloCexgQ1/B2m80F6U= +go.opentelemetry.io/collector/confmap v0.0.0-20221201172708-2bdff61fa52a h1:2TscCXAQASO2kU9xHcMIUM/FP29fiQIRTilZmliq/7I= +go.opentelemetry.io/collector/confmap v0.0.0-20221201172708-2bdff61fa52a/go.mod h1:qJ3e8bA8h4wz/jYlbeEUafVHdrU7DkpStnmIUAz6VTQ= +go.opentelemetry.io/collector/consumer v0.66.1-0.20221202005155-1c54042beb70 h1:XwpVjI1KeKGPXOZBLefGILMziPYuNf6IzbmiIEsIyI0= +go.opentelemetry.io/collector/consumer v0.66.1-0.20221202005155-1c54042beb70/go.mod h1:EWVBcSGcIcmeDGTnIboc/aqa3agsBeH8/q7yFWG7xVc= +go.opentelemetry.io/collector/featuregate v0.66.1-0.20221202005155-1c54042beb70 h1:V0tf4ebciqIs07jFATfLGdUpLRaEsi+AiWuA/in0G8Y= +go.opentelemetry.io/collector/featuregate v0.66.1-0.20221202005155-1c54042beb70/go.mod h1:tewuFKJYalWBU0bmNKg++MC1ipINXUr6szYzOw2p1GI= +go.opentelemetry.io/collector/pdata v0.66.1-0.20221202005155-1c54042beb70 h1:TPOrxkEMvZzfBSwF3ct+kUUgKA5g8unkZZbKQvJweeA= +go.opentelemetry.io/collector/pdata v0.66.1-0.20221202005155-1c54042beb70/go.mod h1:pqyaznLzk21m+1KL6fwOsRryRELL+zNM0qiVSn0MbVc= +go.opentelemetry.io/collector/semconv v0.66.1-0.20221202005155-1c54042beb70 h1:Q5L9Urod3c8as6ZYaoaqBjarx/HXxsxy34DFZIU2fO4= +go.opentelemetry.io/collector/semconv v0.66.1-0.20221202005155-1c54042beb70/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= @@ -337,8 +339,8 @@ go.uber.org/multierr v1.6.0/go.mod h1:cdWPpRnG4AhwMwsgIHip0KRBQjJy5kYEpYjJxpXp9i go.uber.org/multierr v1.8.0 h1:dg6GjLku4EH+249NNmoIciG9N/jURbDG+pFlTkhzIC8= go.uber.org/multierr v1.8.0/go.mod h1:7EAYxJLBy9rStEaz58O2t4Uvip6FSURkq8/ppBp95ak= go.uber.org/zap v1.17.0/go.mod h1:MXVU+bhUf/A7Xi2HNOnopQOrmycQ5Ih87HtOu4q5SSo= -go.uber.org/zap v1.23.0 h1:OjGQ5KQDEUawVHxNwQgPpiypGHOxo2mNZsOqTak4fFY= -go.uber.org/zap v1.23.0/go.mod h1:D+nX8jyLsMHMYrln8A0rJjFt/T/9/bGgIhAqxv5URuY= +go.uber.org/zap v1.24.0 h1:FiJd5l1UOLj0wCgbSE0rwwXHzEdAZS6hiiSnxJN/D60= +go.uber.org/zap v1.24.0/go.mod h1:2kMP+WWQ8aoFoedH3T2sq6iJ2yDWpHbP0f6MQbS9Gkg= golang.org/x/crypto v0.0.0-20180904163835-0709b304e793/go.mod h1:6SG95UA2DQfeDnfUPMdvaQW0Q7yPrPDi9nlGo2tz2b4= golang.org/x/crypto v0.0.0-20190308221718-c2843e01d9a2/go.mod h1:djNgcEr1/C05ACkg1iLfiJU5Ep61QUkGW8qpdssI0+w= golang.org/x/crypto v0.0.0-20190923035154-9ee001bba392/go.mod h1:/lpIB1dKB+9EgE3H3cr1v9wB50oz8l4C4h62xy7jSTY= diff --git a/exporter/lokiexporter/go.mod b/exporter/lokiexporter/go.mod index c381c3ef9ac2..6aa70e1334f5 100644 --- a/exporter/lokiexporter/go.mod +++ b/exporter/lokiexporter/go.mod @@ -11,13 +11,14 @@ require ( github.com/open-telemetry/opentelemetry-collector-contrib/pkg/translator/loki v0.66.0 github.com/prometheus/common v0.37.0 github.com/stretchr/testify v1.8.1 - go.opentelemetry.io/collector v0.66.1-0.20221128222955-4ff1ff379b90 - go.opentelemetry.io/collector/component v0.66.1-0.20221128222955-4ff1ff379b90 - go.opentelemetry.io/collector/consumer v0.66.1-0.20221128222955-4ff1ff379b90 - go.opentelemetry.io/collector/pdata v0.66.1-0.20221128222955-4ff1ff379b90 - go.opentelemetry.io/collector/semconv v0.66.1-0.20221128222955-4ff1ff379b90 + go.opentelemetry.io/collector v0.66.1-0.20221202005155-1c54042beb70 + go.opentelemetry.io/collector/component v0.66.1-0.20221202005155-1c54042beb70 + go.opentelemetry.io/collector/confmap v0.0.0-20221201172708-2bdff61fa52a + go.opentelemetry.io/collector/consumer v0.66.1-0.20221202005155-1c54042beb70 + go.opentelemetry.io/collector/pdata v0.66.1-0.20221202005155-1c54042beb70 + go.opentelemetry.io/collector/semconv v0.66.1-0.20221202005155-1c54042beb70 go.uber.org/multierr v1.8.0 - go.uber.org/zap v1.23.0 + go.uber.org/zap v1.24.0 ) require ( @@ -94,7 +95,7 @@ require ( go.etcd.io/etcd/client/pkg/v3 v3.5.4 // indirect go.etcd.io/etcd/client/v3 v3.5.4 // indirect go.opencensus.io v0.24.0 // indirect - go.opentelemetry.io/collector/featuregate v0.66.1-0.20221128222955-4ff1ff379b90 // indirect + go.opentelemetry.io/collector/featuregate v0.66.1-0.20221202005155-1c54042beb70 // 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 8ce29cd3bf01..6ce8eb7f97aa 100644 --- a/exporter/lokiexporter/go.sum +++ b/exporter/lokiexporter/go.sum @@ -503,18 +503,20 @@ go.opencensus.io v0.22.3/go.mod h1:yxeiOL68Rb0Xd1ddK5vPZ/oVn4vY4Ynel7k9FzqtOIw= go.opencensus.io v0.22.4/go.mod h1:yxeiOL68Rb0Xd1ddK5vPZ/oVn4vY4Ynel7k9FzqtOIw= go.opencensus.io v0.24.0 h1:y73uSU6J157QMP2kn2r30vwW1A2W2WFwSCGnAVxeaD0= go.opencensus.io v0.24.0/go.mod h1:vNK8G9p7aAivkbmorf4v+7Hgx+Zs0yY+0fOtgBfjQKo= -go.opentelemetry.io/collector v0.66.1-0.20221128222955-4ff1ff379b90 h1:yRe05/jMdzH4TFHfndZ5h2o2hKBK/79W72j8w51qNsI= -go.opentelemetry.io/collector v0.66.1-0.20221128222955-4ff1ff379b90/go.mod h1:hE6jCs+0rfiufCrVPucKZTMwfHit1okfDPnwPT2eW1I= -go.opentelemetry.io/collector/component v0.66.1-0.20221128222955-4ff1ff379b90 h1:AYSNTXbezhNg43EuYdVVcgxE/2gBVrm00FDx4DOmQVg= -go.opentelemetry.io/collector/component v0.66.1-0.20221128222955-4ff1ff379b90/go.mod h1:0c84EqXUhvYe6KW7hJfh76tiI/5yjWCH2amwyQ06XLM= -go.opentelemetry.io/collector/consumer v0.66.1-0.20221128222955-4ff1ff379b90 h1:nzNXVfC1FzXBXCLMzbMv+qK3E4EGiNsnMhfVsBd2yzc= -go.opentelemetry.io/collector/consumer v0.66.1-0.20221128222955-4ff1ff379b90/go.mod h1:WtoRZa5SnxQO1ZEQdVxYpFcXCmq62rakv0oUSlPO0NQ= -go.opentelemetry.io/collector/featuregate v0.66.1-0.20221128222955-4ff1ff379b90 h1:UuJSFWbi9XxyNZsJKZuvpWg35BgRbcCGFH+38V2MAdw= -go.opentelemetry.io/collector/featuregate v0.66.1-0.20221128222955-4ff1ff379b90/go.mod h1:tewuFKJYalWBU0bmNKg++MC1ipINXUr6szYzOw2p1GI= -go.opentelemetry.io/collector/pdata v0.66.1-0.20221128222955-4ff1ff379b90 h1:Vu4S4jSNcd0VFPzxQNO4+UqGwnes1xJDoFLPRiWHm8I= -go.opentelemetry.io/collector/pdata v0.66.1-0.20221128222955-4ff1ff379b90/go.mod h1:pqyaznLzk21m+1KL6fwOsRryRELL+zNM0qiVSn0MbVc= -go.opentelemetry.io/collector/semconv v0.66.1-0.20221128222955-4ff1ff379b90 h1:hFaTA68cggZKWMv7wQ3bKP8KGTbowh/5AQZKCHzHTqM= -go.opentelemetry.io/collector/semconv v0.66.1-0.20221128222955-4ff1ff379b90/go.mod h1:5o9yhOa+ABt7g2E5JABDxGZ1PQPbtfxrKNbYn+LOTXU= +go.opentelemetry.io/collector v0.66.1-0.20221202005155-1c54042beb70 h1:INB2CsOtqqrija2KvMuIpbBQ3qX1BECEeR+d0NJX+oM= +go.opentelemetry.io/collector v0.66.1-0.20221202005155-1c54042beb70/go.mod h1:d0NHkHyANJy3HDTvYE/PoylMShUmFIbiir89ieI0X0c= +go.opentelemetry.io/collector/component v0.66.1-0.20221202005155-1c54042beb70 h1:dEoJhzCmRShgmVro/kXm6pouGElgxkH2DsvanzCeZtU= +go.opentelemetry.io/collector/component v0.66.1-0.20221202005155-1c54042beb70/go.mod h1:OsVnvFFe38QSpcuZlQ8cvarDzcloCexgQ1/B2m80F6U= +go.opentelemetry.io/collector/confmap v0.0.0-20221201172708-2bdff61fa52a h1:2TscCXAQASO2kU9xHcMIUM/FP29fiQIRTilZmliq/7I= +go.opentelemetry.io/collector/confmap v0.0.0-20221201172708-2bdff61fa52a/go.mod h1:qJ3e8bA8h4wz/jYlbeEUafVHdrU7DkpStnmIUAz6VTQ= +go.opentelemetry.io/collector/consumer v0.66.1-0.20221202005155-1c54042beb70 h1:XwpVjI1KeKGPXOZBLefGILMziPYuNf6IzbmiIEsIyI0= +go.opentelemetry.io/collector/consumer v0.66.1-0.20221202005155-1c54042beb70/go.mod h1:EWVBcSGcIcmeDGTnIboc/aqa3agsBeH8/q7yFWG7xVc= +go.opentelemetry.io/collector/featuregate v0.66.1-0.20221202005155-1c54042beb70 h1:V0tf4ebciqIs07jFATfLGdUpLRaEsi+AiWuA/in0G8Y= +go.opentelemetry.io/collector/featuregate v0.66.1-0.20221202005155-1c54042beb70/go.mod h1:tewuFKJYalWBU0bmNKg++MC1ipINXUr6szYzOw2p1GI= +go.opentelemetry.io/collector/pdata v0.66.1-0.20221202005155-1c54042beb70 h1:TPOrxkEMvZzfBSwF3ct+kUUgKA5g8unkZZbKQvJweeA= +go.opentelemetry.io/collector/pdata v0.66.1-0.20221202005155-1c54042beb70/go.mod h1:pqyaznLzk21m+1KL6fwOsRryRELL+zNM0qiVSn0MbVc= +go.opentelemetry.io/collector/semconv v0.66.1-0.20221202005155-1c54042beb70 h1:Q5L9Urod3c8as6ZYaoaqBjarx/HXxsxy34DFZIU2fO4= +go.opentelemetry.io/collector/semconv v0.66.1-0.20221202005155-1c54042beb70/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= @@ -539,8 +541,8 @@ go.uber.org/multierr v1.8.0 h1:dg6GjLku4EH+249NNmoIciG9N/jURbDG+pFlTkhzIC8= go.uber.org/multierr v1.8.0/go.mod h1:7EAYxJLBy9rStEaz58O2t4Uvip6FSURkq8/ppBp95ak= go.uber.org/zap v1.10.0/go.mod h1:vwi/ZaCAaUcBkycHslxD9B2zi4UTXhF60s6SWpuDF0Q= go.uber.org/zap v1.17.0/go.mod h1:MXVU+bhUf/A7Xi2HNOnopQOrmycQ5Ih87HtOu4q5SSo= -go.uber.org/zap v1.23.0 h1:OjGQ5KQDEUawVHxNwQgPpiypGHOxo2mNZsOqTak4fFY= -go.uber.org/zap v1.23.0/go.mod h1:D+nX8jyLsMHMYrln8A0rJjFt/T/9/bGgIhAqxv5URuY= +go.uber.org/zap v1.24.0 h1:FiJd5l1UOLj0wCgbSE0rwwXHzEdAZS6hiiSnxJN/D60= +go.uber.org/zap v1.24.0/go.mod h1:2kMP+WWQ8aoFoedH3T2sq6iJ2yDWpHbP0f6MQbS9Gkg= golang.org/x/crypto v0.0.0-20180904163835-0709b304e793/go.mod h1:6SG95UA2DQfeDnfUPMdvaQW0Q7yPrPDi9nlGo2tz2b4= golang.org/x/crypto v0.0.0-20190308221718-c2843e01d9a2/go.mod h1:djNgcEr1/C05ACkg1iLfiJU5Ep61QUkGW8qpdssI0+w= golang.org/x/crypto v0.0.0-20190510104115-cbcb75029529/go.mod h1:yigFU9vqHzYiE8UmvKecakEJjdnWj3jj499lnFckfCI= diff --git a/exporter/mezmoexporter/go.mod b/exporter/mezmoexporter/go.mod index b46caa69c212..8b7a9bab737d 100644 --- a/exporter/mezmoexporter/go.mod +++ b/exporter/mezmoexporter/go.mod @@ -4,11 +4,12 @@ go 1.18 require ( github.com/stretchr/testify v1.8.1 - go.opentelemetry.io/collector v0.66.1-0.20221128222955-4ff1ff379b90 - go.opentelemetry.io/collector/component v0.66.1-0.20221128222955-4ff1ff379b90 - go.opentelemetry.io/collector/pdata v0.66.1-0.20221128222955-4ff1ff379b90 - go.opentelemetry.io/collector/semconv v0.66.1-0.20221128222955-4ff1ff379b90 - go.uber.org/zap v1.23.0 + go.opentelemetry.io/collector v0.66.1-0.20221202005155-1c54042beb70 + go.opentelemetry.io/collector/component v0.66.1-0.20221202005155-1c54042beb70 + go.opentelemetry.io/collector/confmap v0.0.0-20221201172708-2bdff61fa52a + go.opentelemetry.io/collector/pdata v0.66.1-0.20221202005155-1c54042beb70 + go.opentelemetry.io/collector/semconv v0.66.1-0.20221202005155-1c54042beb70 + go.uber.org/zap v1.24.0 ) require ( @@ -31,8 +32,8 @@ require ( github.com/pmezard/go-difflib v1.0.0 // indirect github.com/rs/cors v1.8.2 // indirect go.opencensus.io v0.24.0 // indirect - go.opentelemetry.io/collector/consumer v0.66.1-0.20221128222955-4ff1ff379b90 // indirect - go.opentelemetry.io/collector/featuregate v0.66.1-0.20221128222955-4ff1ff379b90 // indirect + go.opentelemetry.io/collector/consumer v0.66.1-0.20221202005155-1c54042beb70 // indirect + go.opentelemetry.io/collector/featuregate v0.66.1-0.20221202005155-1c54042beb70 // 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 5912698b48e5..3d64000a1642 100644 --- a/exporter/mezmoexporter/go.sum +++ b/exporter/mezmoexporter/go.sum @@ -289,18 +289,20 @@ go.etcd.io/etcd/client/pkg/v3 v3.5.4/go.mod h1:IJHfcCEKxYu1Os13ZdwCwIUTUVGYTSAM3 go.etcd.io/etcd/client/v3 v3.5.4/go.mod h1:ZaRkVgBZC+L+dLCjTcF1hRXpgZXQPOvnA/Ak/gq3kiY= go.opencensus.io v0.24.0 h1:y73uSU6J157QMP2kn2r30vwW1A2W2WFwSCGnAVxeaD0= go.opencensus.io v0.24.0/go.mod h1:vNK8G9p7aAivkbmorf4v+7Hgx+Zs0yY+0fOtgBfjQKo= -go.opentelemetry.io/collector v0.66.1-0.20221128222955-4ff1ff379b90 h1:yRe05/jMdzH4TFHfndZ5h2o2hKBK/79W72j8w51qNsI= -go.opentelemetry.io/collector v0.66.1-0.20221128222955-4ff1ff379b90/go.mod h1:hE6jCs+0rfiufCrVPucKZTMwfHit1okfDPnwPT2eW1I= -go.opentelemetry.io/collector/component v0.66.1-0.20221128222955-4ff1ff379b90 h1:AYSNTXbezhNg43EuYdVVcgxE/2gBVrm00FDx4DOmQVg= -go.opentelemetry.io/collector/component v0.66.1-0.20221128222955-4ff1ff379b90/go.mod h1:0c84EqXUhvYe6KW7hJfh76tiI/5yjWCH2amwyQ06XLM= -go.opentelemetry.io/collector/consumer v0.66.1-0.20221128222955-4ff1ff379b90 h1:nzNXVfC1FzXBXCLMzbMv+qK3E4EGiNsnMhfVsBd2yzc= -go.opentelemetry.io/collector/consumer v0.66.1-0.20221128222955-4ff1ff379b90/go.mod h1:WtoRZa5SnxQO1ZEQdVxYpFcXCmq62rakv0oUSlPO0NQ= -go.opentelemetry.io/collector/featuregate v0.66.1-0.20221128222955-4ff1ff379b90 h1:UuJSFWbi9XxyNZsJKZuvpWg35BgRbcCGFH+38V2MAdw= -go.opentelemetry.io/collector/featuregate v0.66.1-0.20221128222955-4ff1ff379b90/go.mod h1:tewuFKJYalWBU0bmNKg++MC1ipINXUr6szYzOw2p1GI= -go.opentelemetry.io/collector/pdata v0.66.1-0.20221128222955-4ff1ff379b90 h1:Vu4S4jSNcd0VFPzxQNO4+UqGwnes1xJDoFLPRiWHm8I= -go.opentelemetry.io/collector/pdata v0.66.1-0.20221128222955-4ff1ff379b90/go.mod h1:pqyaznLzk21m+1KL6fwOsRryRELL+zNM0qiVSn0MbVc= -go.opentelemetry.io/collector/semconv v0.66.1-0.20221128222955-4ff1ff379b90 h1:hFaTA68cggZKWMv7wQ3bKP8KGTbowh/5AQZKCHzHTqM= -go.opentelemetry.io/collector/semconv v0.66.1-0.20221128222955-4ff1ff379b90/go.mod h1:5o9yhOa+ABt7g2E5JABDxGZ1PQPbtfxrKNbYn+LOTXU= +go.opentelemetry.io/collector v0.66.1-0.20221202005155-1c54042beb70 h1:INB2CsOtqqrija2KvMuIpbBQ3qX1BECEeR+d0NJX+oM= +go.opentelemetry.io/collector v0.66.1-0.20221202005155-1c54042beb70/go.mod h1:d0NHkHyANJy3HDTvYE/PoylMShUmFIbiir89ieI0X0c= +go.opentelemetry.io/collector/component v0.66.1-0.20221202005155-1c54042beb70 h1:dEoJhzCmRShgmVro/kXm6pouGElgxkH2DsvanzCeZtU= +go.opentelemetry.io/collector/component v0.66.1-0.20221202005155-1c54042beb70/go.mod h1:OsVnvFFe38QSpcuZlQ8cvarDzcloCexgQ1/B2m80F6U= +go.opentelemetry.io/collector/confmap v0.0.0-20221201172708-2bdff61fa52a h1:2TscCXAQASO2kU9xHcMIUM/FP29fiQIRTilZmliq/7I= +go.opentelemetry.io/collector/confmap v0.0.0-20221201172708-2bdff61fa52a/go.mod h1:qJ3e8bA8h4wz/jYlbeEUafVHdrU7DkpStnmIUAz6VTQ= +go.opentelemetry.io/collector/consumer v0.66.1-0.20221202005155-1c54042beb70 h1:XwpVjI1KeKGPXOZBLefGILMziPYuNf6IzbmiIEsIyI0= +go.opentelemetry.io/collector/consumer v0.66.1-0.20221202005155-1c54042beb70/go.mod h1:EWVBcSGcIcmeDGTnIboc/aqa3agsBeH8/q7yFWG7xVc= +go.opentelemetry.io/collector/featuregate v0.66.1-0.20221202005155-1c54042beb70 h1:V0tf4ebciqIs07jFATfLGdUpLRaEsi+AiWuA/in0G8Y= +go.opentelemetry.io/collector/featuregate v0.66.1-0.20221202005155-1c54042beb70/go.mod h1:tewuFKJYalWBU0bmNKg++MC1ipINXUr6szYzOw2p1GI= +go.opentelemetry.io/collector/pdata v0.66.1-0.20221202005155-1c54042beb70 h1:TPOrxkEMvZzfBSwF3ct+kUUgKA5g8unkZZbKQvJweeA= +go.opentelemetry.io/collector/pdata v0.66.1-0.20221202005155-1c54042beb70/go.mod h1:pqyaznLzk21m+1KL6fwOsRryRELL+zNM0qiVSn0MbVc= +go.opentelemetry.io/collector/semconv v0.66.1-0.20221202005155-1c54042beb70 h1:Q5L9Urod3c8as6ZYaoaqBjarx/HXxsxy34DFZIU2fO4= +go.opentelemetry.io/collector/semconv v0.66.1-0.20221202005155-1c54042beb70/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= @@ -321,8 +323,8 @@ go.uber.org/multierr v1.6.0/go.mod h1:cdWPpRnG4AhwMwsgIHip0KRBQjJy5kYEpYjJxpXp9i go.uber.org/multierr v1.8.0 h1:dg6GjLku4EH+249NNmoIciG9N/jURbDG+pFlTkhzIC8= go.uber.org/multierr v1.8.0/go.mod h1:7EAYxJLBy9rStEaz58O2t4Uvip6FSURkq8/ppBp95ak= go.uber.org/zap v1.17.0/go.mod h1:MXVU+bhUf/A7Xi2HNOnopQOrmycQ5Ih87HtOu4q5SSo= -go.uber.org/zap v1.23.0 h1:OjGQ5KQDEUawVHxNwQgPpiypGHOxo2mNZsOqTak4fFY= -go.uber.org/zap v1.23.0/go.mod h1:D+nX8jyLsMHMYrln8A0rJjFt/T/9/bGgIhAqxv5URuY= +go.uber.org/zap v1.24.0 h1:FiJd5l1UOLj0wCgbSE0rwwXHzEdAZS6hiiSnxJN/D60= +go.uber.org/zap v1.24.0/go.mod h1:2kMP+WWQ8aoFoedH3T2sq6iJ2yDWpHbP0f6MQbS9Gkg= golang.org/x/crypto v0.0.0-20180904163835-0709b304e793/go.mod h1:6SG95UA2DQfeDnfUPMdvaQW0Q7yPrPDi9nlGo2tz2b4= golang.org/x/crypto v0.0.0-20190308221718-c2843e01d9a2/go.mod h1:djNgcEr1/C05ACkg1iLfiJU5Ep61QUkGW8qpdssI0+w= golang.org/x/crypto v0.0.0-20190923035154-9ee001bba392/go.mod h1:/lpIB1dKB+9EgE3H3cr1v9wB50oz8l4C4h62xy7jSTY= diff --git a/exporter/opencensusexporter/go.mod b/exporter/opencensusexporter/go.mod index 8e599eaa7497..c1dc0e089863 100644 --- a/exporter/opencensusexporter/go.mod +++ b/exporter/opencensusexporter/go.mod @@ -9,10 +9,11 @@ require ( github.com/open-telemetry/opentelemetry-collector-contrib/pkg/translator/opencensus v0.66.0 github.com/open-telemetry/opentelemetry-collector-contrib/receiver/opencensusreceiver v0.66.0 github.com/stretchr/testify v1.8.1 - go.opentelemetry.io/collector v0.66.1-0.20221128222955-4ff1ff379b90 - go.opentelemetry.io/collector/component v0.66.1-0.20221128222955-4ff1ff379b90 - go.opentelemetry.io/collector/consumer v0.66.1-0.20221128222955-4ff1ff379b90 - go.opentelemetry.io/collector/pdata v0.66.1-0.20221128222955-4ff1ff379b90 + go.opentelemetry.io/collector v0.66.1-0.20221202005155-1c54042beb70 + go.opentelemetry.io/collector/component v0.66.1-0.20221202005155-1c54042beb70 + go.opentelemetry.io/collector/confmap v0.0.0-20221201172708-2bdff61fa52a + go.opentelemetry.io/collector/consumer v0.66.1-0.20221202005155-1c54042beb70 + go.opentelemetry.io/collector/pdata v0.66.1-0.20221202005155-1c54042beb70 google.golang.org/grpc v1.51.0 ) @@ -40,15 +41,15 @@ require ( github.com/rs/cors v1.8.2 // indirect github.com/soheilhy/cmux v0.1.5 // indirect go.opencensus.io v0.24.0 // indirect - go.opentelemetry.io/collector/featuregate v0.66.1-0.20221128222955-4ff1ff379b90 // indirect - go.opentelemetry.io/collector/semconv v0.66.1-0.20221128222955-4ff1ff379b90 // indirect + go.opentelemetry.io/collector/featuregate v0.66.1-0.20221202005155-1c54042beb70 // indirect + go.opentelemetry.io/collector/semconv v0.66.1-0.20221202005155-1c54042beb70 // 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 go.opentelemetry.io/otel/trace v1.11.1 // indirect go.uber.org/atomic v1.10.0 // indirect go.uber.org/multierr v1.8.0 // indirect - go.uber.org/zap v1.23.0 // indirect + go.uber.org/zap v1.24.0 // indirect golang.org/x/net v0.1.0 // indirect golang.org/x/sys v0.2.0 // indirect golang.org/x/text v0.4.0 // indirect diff --git a/exporter/opencensusexporter/go.sum b/exporter/opencensusexporter/go.sum index c79d03b8e3a5..b636d89714d6 100644 --- a/exporter/opencensusexporter/go.sum +++ b/exporter/opencensusexporter/go.sum @@ -319,18 +319,20 @@ go.etcd.io/etcd/client/v3 v3.5.4/go.mod h1:ZaRkVgBZC+L+dLCjTcF1hRXpgZXQPOvnA/Ak/ go.opencensus.io v0.23.0/go.mod h1:XItmlyltB5F7CS4xOC1DcqMoFqwtC6OG2xF7mCv7P7E= go.opencensus.io v0.24.0 h1:y73uSU6J157QMP2kn2r30vwW1A2W2WFwSCGnAVxeaD0= go.opencensus.io v0.24.0/go.mod h1:vNK8G9p7aAivkbmorf4v+7Hgx+Zs0yY+0fOtgBfjQKo= -go.opentelemetry.io/collector v0.66.1-0.20221128222955-4ff1ff379b90 h1:yRe05/jMdzH4TFHfndZ5h2o2hKBK/79W72j8w51qNsI= -go.opentelemetry.io/collector v0.66.1-0.20221128222955-4ff1ff379b90/go.mod h1:hE6jCs+0rfiufCrVPucKZTMwfHit1okfDPnwPT2eW1I= -go.opentelemetry.io/collector/component v0.66.1-0.20221128222955-4ff1ff379b90 h1:AYSNTXbezhNg43EuYdVVcgxE/2gBVrm00FDx4DOmQVg= -go.opentelemetry.io/collector/component v0.66.1-0.20221128222955-4ff1ff379b90/go.mod h1:0c84EqXUhvYe6KW7hJfh76tiI/5yjWCH2amwyQ06XLM= -go.opentelemetry.io/collector/consumer v0.66.1-0.20221128222955-4ff1ff379b90 h1:nzNXVfC1FzXBXCLMzbMv+qK3E4EGiNsnMhfVsBd2yzc= -go.opentelemetry.io/collector/consumer v0.66.1-0.20221128222955-4ff1ff379b90/go.mod h1:WtoRZa5SnxQO1ZEQdVxYpFcXCmq62rakv0oUSlPO0NQ= -go.opentelemetry.io/collector/featuregate v0.66.1-0.20221128222955-4ff1ff379b90 h1:UuJSFWbi9XxyNZsJKZuvpWg35BgRbcCGFH+38V2MAdw= -go.opentelemetry.io/collector/featuregate v0.66.1-0.20221128222955-4ff1ff379b90/go.mod h1:tewuFKJYalWBU0bmNKg++MC1ipINXUr6szYzOw2p1GI= -go.opentelemetry.io/collector/pdata v0.66.1-0.20221128222955-4ff1ff379b90 h1:Vu4S4jSNcd0VFPzxQNO4+UqGwnes1xJDoFLPRiWHm8I= -go.opentelemetry.io/collector/pdata v0.66.1-0.20221128222955-4ff1ff379b90/go.mod h1:pqyaznLzk21m+1KL6fwOsRryRELL+zNM0qiVSn0MbVc= -go.opentelemetry.io/collector/semconv v0.66.1-0.20221128222955-4ff1ff379b90 h1:hFaTA68cggZKWMv7wQ3bKP8KGTbowh/5AQZKCHzHTqM= -go.opentelemetry.io/collector/semconv v0.66.1-0.20221128222955-4ff1ff379b90/go.mod h1:5o9yhOa+ABt7g2E5JABDxGZ1PQPbtfxrKNbYn+LOTXU= +go.opentelemetry.io/collector v0.66.1-0.20221202005155-1c54042beb70 h1:INB2CsOtqqrija2KvMuIpbBQ3qX1BECEeR+d0NJX+oM= +go.opentelemetry.io/collector v0.66.1-0.20221202005155-1c54042beb70/go.mod h1:d0NHkHyANJy3HDTvYE/PoylMShUmFIbiir89ieI0X0c= +go.opentelemetry.io/collector/component v0.66.1-0.20221202005155-1c54042beb70 h1:dEoJhzCmRShgmVro/kXm6pouGElgxkH2DsvanzCeZtU= +go.opentelemetry.io/collector/component v0.66.1-0.20221202005155-1c54042beb70/go.mod h1:OsVnvFFe38QSpcuZlQ8cvarDzcloCexgQ1/B2m80F6U= +go.opentelemetry.io/collector/confmap v0.0.0-20221201172708-2bdff61fa52a h1:2TscCXAQASO2kU9xHcMIUM/FP29fiQIRTilZmliq/7I= +go.opentelemetry.io/collector/confmap v0.0.0-20221201172708-2bdff61fa52a/go.mod h1:qJ3e8bA8h4wz/jYlbeEUafVHdrU7DkpStnmIUAz6VTQ= +go.opentelemetry.io/collector/consumer v0.66.1-0.20221202005155-1c54042beb70 h1:XwpVjI1KeKGPXOZBLefGILMziPYuNf6IzbmiIEsIyI0= +go.opentelemetry.io/collector/consumer v0.66.1-0.20221202005155-1c54042beb70/go.mod h1:EWVBcSGcIcmeDGTnIboc/aqa3agsBeH8/q7yFWG7xVc= +go.opentelemetry.io/collector/featuregate v0.66.1-0.20221202005155-1c54042beb70 h1:V0tf4ebciqIs07jFATfLGdUpLRaEsi+AiWuA/in0G8Y= +go.opentelemetry.io/collector/featuregate v0.66.1-0.20221202005155-1c54042beb70/go.mod h1:tewuFKJYalWBU0bmNKg++MC1ipINXUr6szYzOw2p1GI= +go.opentelemetry.io/collector/pdata v0.66.1-0.20221202005155-1c54042beb70 h1:TPOrxkEMvZzfBSwF3ct+kUUgKA5g8unkZZbKQvJweeA= +go.opentelemetry.io/collector/pdata v0.66.1-0.20221202005155-1c54042beb70/go.mod h1:pqyaznLzk21m+1KL6fwOsRryRELL+zNM0qiVSn0MbVc= +go.opentelemetry.io/collector/semconv v0.66.1-0.20221202005155-1c54042beb70 h1:Q5L9Urod3c8as6ZYaoaqBjarx/HXxsxy34DFZIU2fO4= +go.opentelemetry.io/collector/semconv v0.66.1-0.20221202005155-1c54042beb70/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= @@ -351,8 +353,8 @@ go.uber.org/multierr v1.6.0/go.mod h1:cdWPpRnG4AhwMwsgIHip0KRBQjJy5kYEpYjJxpXp9i go.uber.org/multierr v1.8.0 h1:dg6GjLku4EH+249NNmoIciG9N/jURbDG+pFlTkhzIC8= go.uber.org/multierr v1.8.0/go.mod h1:7EAYxJLBy9rStEaz58O2t4Uvip6FSURkq8/ppBp95ak= go.uber.org/zap v1.17.0/go.mod h1:MXVU+bhUf/A7Xi2HNOnopQOrmycQ5Ih87HtOu4q5SSo= -go.uber.org/zap v1.23.0 h1:OjGQ5KQDEUawVHxNwQgPpiypGHOxo2mNZsOqTak4fFY= -go.uber.org/zap v1.23.0/go.mod h1:D+nX8jyLsMHMYrln8A0rJjFt/T/9/bGgIhAqxv5URuY= +go.uber.org/zap v1.24.0 h1:FiJd5l1UOLj0wCgbSE0rwwXHzEdAZS6hiiSnxJN/D60= +go.uber.org/zap v1.24.0/go.mod h1:2kMP+WWQ8aoFoedH3T2sq6iJ2yDWpHbP0f6MQbS9Gkg= golang.org/x/crypto v0.0.0-20180904163835-0709b304e793/go.mod h1:6SG95UA2DQfeDnfUPMdvaQW0Q7yPrPDi9nlGo2tz2b4= golang.org/x/crypto v0.0.0-20190308221718-c2843e01d9a2/go.mod h1:djNgcEr1/C05ACkg1iLfiJU5Ep61QUkGW8qpdssI0+w= golang.org/x/crypto v0.0.0-20190923035154-9ee001bba392/go.mod h1:/lpIB1dKB+9EgE3H3cr1v9wB50oz8l4C4h62xy7jSTY= diff --git a/exporter/parquetexporter/go.mod b/exporter/parquetexporter/go.mod index 36bf43fef990..8e6248dca9d8 100644 --- a/exporter/parquetexporter/go.mod +++ b/exporter/parquetexporter/go.mod @@ -3,9 +3,9 @@ module github.com/open-telemetry/opentelemetry-collector-contrib/exporter/parque go 1.18 require ( - go.opentelemetry.io/collector v0.66.1-0.20221128222955-4ff1ff379b90 - go.opentelemetry.io/collector/component v0.66.1-0.20221128222955-4ff1ff379b90 - go.opentelemetry.io/collector/pdata v0.66.1-0.20221128222955-4ff1ff379b90 + go.opentelemetry.io/collector v0.66.1-0.20221202005155-1c54042beb70 + go.opentelemetry.io/collector/component v0.66.1-0.20221202005155-1c54042beb70 + go.opentelemetry.io/collector/pdata v0.66.1-0.20221202005155-1c54042beb70 ) require ( @@ -22,14 +22,15 @@ require ( github.com/modern-go/reflect2 v1.0.2 // indirect github.com/pelletier/go-toml v1.9.4 // indirect go.opencensus.io v0.24.0 // indirect - go.opentelemetry.io/collector/consumer v0.66.1-0.20221128222955-4ff1ff379b90 // indirect - go.opentelemetry.io/collector/featuregate v0.66.1-0.20221128222955-4ff1ff379b90 // indirect + go.opentelemetry.io/collector/confmap v0.0.0-20221201172708-2bdff61fa52a // indirect + go.opentelemetry.io/collector/consumer v0.66.1-0.20221202005155-1c54042beb70 // indirect + go.opentelemetry.io/collector/featuregate v0.66.1-0.20221202005155-1c54042beb70 // 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 go.uber.org/atomic v1.10.0 // indirect go.uber.org/multierr v1.8.0 // indirect - go.uber.org/zap v1.23.0 // indirect + go.uber.org/zap v1.24.0 // indirect golang.org/x/net v0.0.0-20220722155237-a158d28d115b // indirect golang.org/x/sys v0.2.0 // indirect golang.org/x/text v0.4.0 // indirect diff --git a/exporter/parquetexporter/go.sum b/exporter/parquetexporter/go.sum index 70863f9d9055..a7afc64826af 100644 --- a/exporter/parquetexporter/go.sum +++ b/exporter/parquetexporter/go.sum @@ -278,16 +278,18 @@ go.etcd.io/etcd/client/pkg/v3 v3.5.4/go.mod h1:IJHfcCEKxYu1Os13ZdwCwIUTUVGYTSAM3 go.etcd.io/etcd/client/v3 v3.5.4/go.mod h1:ZaRkVgBZC+L+dLCjTcF1hRXpgZXQPOvnA/Ak/gq3kiY= go.opencensus.io v0.24.0 h1:y73uSU6J157QMP2kn2r30vwW1A2W2WFwSCGnAVxeaD0= go.opencensus.io v0.24.0/go.mod h1:vNK8G9p7aAivkbmorf4v+7Hgx+Zs0yY+0fOtgBfjQKo= -go.opentelemetry.io/collector v0.66.1-0.20221128222955-4ff1ff379b90 h1:yRe05/jMdzH4TFHfndZ5h2o2hKBK/79W72j8w51qNsI= -go.opentelemetry.io/collector v0.66.1-0.20221128222955-4ff1ff379b90/go.mod h1:hE6jCs+0rfiufCrVPucKZTMwfHit1okfDPnwPT2eW1I= -go.opentelemetry.io/collector/component v0.66.1-0.20221128222955-4ff1ff379b90 h1:AYSNTXbezhNg43EuYdVVcgxE/2gBVrm00FDx4DOmQVg= -go.opentelemetry.io/collector/component v0.66.1-0.20221128222955-4ff1ff379b90/go.mod h1:0c84EqXUhvYe6KW7hJfh76tiI/5yjWCH2amwyQ06XLM= -go.opentelemetry.io/collector/consumer v0.66.1-0.20221128222955-4ff1ff379b90 h1:nzNXVfC1FzXBXCLMzbMv+qK3E4EGiNsnMhfVsBd2yzc= -go.opentelemetry.io/collector/consumer v0.66.1-0.20221128222955-4ff1ff379b90/go.mod h1:WtoRZa5SnxQO1ZEQdVxYpFcXCmq62rakv0oUSlPO0NQ= -go.opentelemetry.io/collector/featuregate v0.66.1-0.20221128222955-4ff1ff379b90 h1:UuJSFWbi9XxyNZsJKZuvpWg35BgRbcCGFH+38V2MAdw= -go.opentelemetry.io/collector/featuregate v0.66.1-0.20221128222955-4ff1ff379b90/go.mod h1:tewuFKJYalWBU0bmNKg++MC1ipINXUr6szYzOw2p1GI= -go.opentelemetry.io/collector/pdata v0.66.1-0.20221128222955-4ff1ff379b90 h1:Vu4S4jSNcd0VFPzxQNO4+UqGwnes1xJDoFLPRiWHm8I= -go.opentelemetry.io/collector/pdata v0.66.1-0.20221128222955-4ff1ff379b90/go.mod h1:pqyaznLzk21m+1KL6fwOsRryRELL+zNM0qiVSn0MbVc= +go.opentelemetry.io/collector v0.66.1-0.20221202005155-1c54042beb70 h1:INB2CsOtqqrija2KvMuIpbBQ3qX1BECEeR+d0NJX+oM= +go.opentelemetry.io/collector v0.66.1-0.20221202005155-1c54042beb70/go.mod h1:d0NHkHyANJy3HDTvYE/PoylMShUmFIbiir89ieI0X0c= +go.opentelemetry.io/collector/component v0.66.1-0.20221202005155-1c54042beb70 h1:dEoJhzCmRShgmVro/kXm6pouGElgxkH2DsvanzCeZtU= +go.opentelemetry.io/collector/component v0.66.1-0.20221202005155-1c54042beb70/go.mod h1:OsVnvFFe38QSpcuZlQ8cvarDzcloCexgQ1/B2m80F6U= +go.opentelemetry.io/collector/confmap v0.0.0-20221201172708-2bdff61fa52a h1:2TscCXAQASO2kU9xHcMIUM/FP29fiQIRTilZmliq/7I= +go.opentelemetry.io/collector/confmap v0.0.0-20221201172708-2bdff61fa52a/go.mod h1:qJ3e8bA8h4wz/jYlbeEUafVHdrU7DkpStnmIUAz6VTQ= +go.opentelemetry.io/collector/consumer v0.66.1-0.20221202005155-1c54042beb70 h1:XwpVjI1KeKGPXOZBLefGILMziPYuNf6IzbmiIEsIyI0= +go.opentelemetry.io/collector/consumer v0.66.1-0.20221202005155-1c54042beb70/go.mod h1:EWVBcSGcIcmeDGTnIboc/aqa3agsBeH8/q7yFWG7xVc= +go.opentelemetry.io/collector/featuregate v0.66.1-0.20221202005155-1c54042beb70 h1:V0tf4ebciqIs07jFATfLGdUpLRaEsi+AiWuA/in0G8Y= +go.opentelemetry.io/collector/featuregate v0.66.1-0.20221202005155-1c54042beb70/go.mod h1:tewuFKJYalWBU0bmNKg++MC1ipINXUr6szYzOw2p1GI= +go.opentelemetry.io/collector/pdata v0.66.1-0.20221202005155-1c54042beb70 h1:TPOrxkEMvZzfBSwF3ct+kUUgKA5g8unkZZbKQvJweeA= +go.opentelemetry.io/collector/pdata v0.66.1-0.20221202005155-1c54042beb70/go.mod h1:pqyaznLzk21m+1KL6fwOsRryRELL+zNM0qiVSn0MbVc= 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= @@ -306,8 +308,8 @@ go.uber.org/multierr v1.6.0/go.mod h1:cdWPpRnG4AhwMwsgIHip0KRBQjJy5kYEpYjJxpXp9i go.uber.org/multierr v1.8.0 h1:dg6GjLku4EH+249NNmoIciG9N/jURbDG+pFlTkhzIC8= go.uber.org/multierr v1.8.0/go.mod h1:7EAYxJLBy9rStEaz58O2t4Uvip6FSURkq8/ppBp95ak= go.uber.org/zap v1.17.0/go.mod h1:MXVU+bhUf/A7Xi2HNOnopQOrmycQ5Ih87HtOu4q5SSo= -go.uber.org/zap v1.23.0 h1:OjGQ5KQDEUawVHxNwQgPpiypGHOxo2mNZsOqTak4fFY= -go.uber.org/zap v1.23.0/go.mod h1:D+nX8jyLsMHMYrln8A0rJjFt/T/9/bGgIhAqxv5URuY= +go.uber.org/zap v1.24.0 h1:FiJd5l1UOLj0wCgbSE0rwwXHzEdAZS6hiiSnxJN/D60= +go.uber.org/zap v1.24.0/go.mod h1:2kMP+WWQ8aoFoedH3T2sq6iJ2yDWpHbP0f6MQbS9Gkg= golang.org/x/crypto v0.0.0-20180904163835-0709b304e793/go.mod h1:6SG95UA2DQfeDnfUPMdvaQW0Q7yPrPDi9nlGo2tz2b4= golang.org/x/crypto v0.0.0-20190308221718-c2843e01d9a2/go.mod h1:djNgcEr1/C05ACkg1iLfiJU5Ep61QUkGW8qpdssI0+w= golang.org/x/crypto v0.0.0-20190923035154-9ee001bba392/go.mod h1:/lpIB1dKB+9EgE3H3cr1v9wB50oz8l4C4h62xy7jSTY= diff --git a/exporter/prometheusexporter/go.mod b/exporter/prometheusexporter/go.mod index 8662dcb2c522..0ebd710fc5c5 100644 --- a/exporter/prometheusexporter/go.mod +++ b/exporter/prometheusexporter/go.mod @@ -12,11 +12,12 @@ require ( github.com/prometheus/common v0.37.0 github.com/prometheus/prometheus v0.38.0 github.com/stretchr/testify v1.8.1 - go.opentelemetry.io/collector v0.66.1-0.20221128222955-4ff1ff379b90 - go.opentelemetry.io/collector/component v0.66.1-0.20221128222955-4ff1ff379b90 - go.opentelemetry.io/collector/pdata v0.66.1-0.20221128222955-4ff1ff379b90 - go.opentelemetry.io/collector/semconv v0.66.1-0.20221128222955-4ff1ff379b90 - go.uber.org/zap v1.23.0 + go.opentelemetry.io/collector v0.66.1-0.20221202005155-1c54042beb70 + go.opentelemetry.io/collector/component v0.66.1-0.20221202005155-1c54042beb70 + go.opentelemetry.io/collector/confmap v0.0.0-20221201172708-2bdff61fa52a + go.opentelemetry.io/collector/pdata v0.66.1-0.20221202005155-1c54042beb70 + go.opentelemetry.io/collector/semconv v0.66.1-0.20221202005155-1c54042beb70 + go.uber.org/zap v1.24.0 gopkg.in/yaml.v2 v2.4.0 ) @@ -126,8 +127,8 @@ require ( github.com/spf13/pflag v1.0.5 // indirect github.com/vultr/govultr/v2 v2.17.2 // indirect go.opencensus.io v0.24.0 // indirect - go.opentelemetry.io/collector/consumer v0.66.1-0.20221128222955-4ff1ff379b90 // indirect - go.opentelemetry.io/collector/featuregate v0.66.1-0.20221128222955-4ff1ff379b90 // indirect + go.opentelemetry.io/collector/consumer v0.66.1-0.20221202005155-1c54042beb70 // indirect + go.opentelemetry.io/collector/featuregate v0.66.1-0.20221202005155-1c54042beb70 // 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 8f94b01fc76c..b43fa9c74d3a 100644 --- a/exporter/prometheusexporter/go.sum +++ b/exporter/prometheusexporter/go.sum @@ -601,8 +601,8 @@ github.com/tidwall/match v1.1.1 h1:+Ho715JplO36QYgwN9PGYNhgZvoUSc9X2c80KVTi+GA= github.com/tidwall/pretty v1.2.0 h1:RWIZEg2iJ8/g6fDDYzMpobmaoGh5OLl4AXtGUGPcqCs= github.com/tidwall/tinylru v1.1.0 h1:XY6IUfzVTU9rpwdhKUF6nQdChgCdGjkMfLzbWyiau6I= github.com/tidwall/wal v1.1.7 h1:emc1TRjIVsdKKSnpwGBAcsAGg0767SvUk8+ygx7Bb+4= -github.com/tklauser/go-sysconf v0.3.10 h1:IJ1AZGZRWbY8T5Vfk04D9WOA5WSejdflXxP03OUqALw= -github.com/tklauser/numcpus v0.4.0 h1:E53Dm1HjH1/R2/aoCtXtPgzmElmn51aOkhCFSuZq//o= +github.com/tklauser/go-sysconf v0.3.11 h1:89WgdJhk5SNwJfu+GKyYveZ4IaJ7xAkecBo+KdJV0CM= +github.com/tklauser/numcpus v0.6.0 h1:kebhY2Qt+3U6RNK7UqpYNA+tJ23IBEGKkB7JQBfDYms= github.com/tv42/httpunix v0.0.0-20150427012821-b75d8614f926/go.mod h1:9ESjWnEqriFuLhtthL60Sar/7RFoluCcXsuvEwTV5KM= github.com/vultr/govultr/v2 v2.17.2 h1:gej/rwr91Puc/tgh+j33p/BLR16UrIPnSr+AIwYWZQs= github.com/vultr/govultr/v2 v2.17.2/go.mod h1:ZFOKGWmgjytfyjeyAdhQlSWwTjh2ig+X49cAp50dzXI= @@ -623,19 +623,21 @@ go.opencensus.io v0.22.3/go.mod h1:yxeiOL68Rb0Xd1ddK5vPZ/oVn4vY4Ynel7k9FzqtOIw= go.opencensus.io v0.22.4/go.mod h1:yxeiOL68Rb0Xd1ddK5vPZ/oVn4vY4Ynel7k9FzqtOIw= go.opencensus.io v0.24.0 h1:y73uSU6J157QMP2kn2r30vwW1A2W2WFwSCGnAVxeaD0= go.opencensus.io v0.24.0/go.mod h1:vNK8G9p7aAivkbmorf4v+7Hgx+Zs0yY+0fOtgBfjQKo= -go.opentelemetry.io/collector v0.66.1-0.20221128222955-4ff1ff379b90 h1:yRe05/jMdzH4TFHfndZ5h2o2hKBK/79W72j8w51qNsI= -go.opentelemetry.io/collector v0.66.1-0.20221128222955-4ff1ff379b90/go.mod h1:hE6jCs+0rfiufCrVPucKZTMwfHit1okfDPnwPT2eW1I= -go.opentelemetry.io/collector/component v0.66.1-0.20221128222955-4ff1ff379b90 h1:AYSNTXbezhNg43EuYdVVcgxE/2gBVrm00FDx4DOmQVg= -go.opentelemetry.io/collector/component v0.66.1-0.20221128222955-4ff1ff379b90/go.mod h1:0c84EqXUhvYe6KW7hJfh76tiI/5yjWCH2amwyQ06XLM= -go.opentelemetry.io/collector/consumer v0.66.1-0.20221128222955-4ff1ff379b90 h1:nzNXVfC1FzXBXCLMzbMv+qK3E4EGiNsnMhfVsBd2yzc= -go.opentelemetry.io/collector/consumer v0.66.1-0.20221128222955-4ff1ff379b90/go.mod h1:WtoRZa5SnxQO1ZEQdVxYpFcXCmq62rakv0oUSlPO0NQ= -go.opentelemetry.io/collector/featuregate v0.66.1-0.20221128222955-4ff1ff379b90 h1:UuJSFWbi9XxyNZsJKZuvpWg35BgRbcCGFH+38V2MAdw= -go.opentelemetry.io/collector/featuregate v0.66.1-0.20221128222955-4ff1ff379b90/go.mod h1:tewuFKJYalWBU0bmNKg++MC1ipINXUr6szYzOw2p1GI= -go.opentelemetry.io/collector/pdata v0.66.1-0.20221128222955-4ff1ff379b90 h1:Vu4S4jSNcd0VFPzxQNO4+UqGwnes1xJDoFLPRiWHm8I= -go.opentelemetry.io/collector/pdata v0.66.1-0.20221128222955-4ff1ff379b90/go.mod h1:pqyaznLzk21m+1KL6fwOsRryRELL+zNM0qiVSn0MbVc= -go.opentelemetry.io/collector/processor/batchprocessor v0.66.1-0.20221128222955-4ff1ff379b90 h1:K12L9juzjChBMfp7cQaQsToz7i7975tUYVzJ3Tpw/Cw= -go.opentelemetry.io/collector/semconv v0.66.1-0.20221128222955-4ff1ff379b90 h1:hFaTA68cggZKWMv7wQ3bKP8KGTbowh/5AQZKCHzHTqM= -go.opentelemetry.io/collector/semconv v0.66.1-0.20221128222955-4ff1ff379b90/go.mod h1:5o9yhOa+ABt7g2E5JABDxGZ1PQPbtfxrKNbYn+LOTXU= +go.opentelemetry.io/collector v0.66.1-0.20221202005155-1c54042beb70 h1:INB2CsOtqqrija2KvMuIpbBQ3qX1BECEeR+d0NJX+oM= +go.opentelemetry.io/collector v0.66.1-0.20221202005155-1c54042beb70/go.mod h1:d0NHkHyANJy3HDTvYE/PoylMShUmFIbiir89ieI0X0c= +go.opentelemetry.io/collector/component v0.66.1-0.20221202005155-1c54042beb70 h1:dEoJhzCmRShgmVro/kXm6pouGElgxkH2DsvanzCeZtU= +go.opentelemetry.io/collector/component v0.66.1-0.20221202005155-1c54042beb70/go.mod h1:OsVnvFFe38QSpcuZlQ8cvarDzcloCexgQ1/B2m80F6U= +go.opentelemetry.io/collector/confmap v0.0.0-20221201172708-2bdff61fa52a h1:2TscCXAQASO2kU9xHcMIUM/FP29fiQIRTilZmliq/7I= +go.opentelemetry.io/collector/confmap v0.0.0-20221201172708-2bdff61fa52a/go.mod h1:qJ3e8bA8h4wz/jYlbeEUafVHdrU7DkpStnmIUAz6VTQ= +go.opentelemetry.io/collector/consumer v0.66.1-0.20221202005155-1c54042beb70 h1:XwpVjI1KeKGPXOZBLefGILMziPYuNf6IzbmiIEsIyI0= +go.opentelemetry.io/collector/consumer v0.66.1-0.20221202005155-1c54042beb70/go.mod h1:EWVBcSGcIcmeDGTnIboc/aqa3agsBeH8/q7yFWG7xVc= +go.opentelemetry.io/collector/featuregate v0.66.1-0.20221202005155-1c54042beb70 h1:V0tf4ebciqIs07jFATfLGdUpLRaEsi+AiWuA/in0G8Y= +go.opentelemetry.io/collector/featuregate v0.66.1-0.20221202005155-1c54042beb70/go.mod h1:tewuFKJYalWBU0bmNKg++MC1ipINXUr6szYzOw2p1GI= +go.opentelemetry.io/collector/pdata v0.66.1-0.20221202005155-1c54042beb70 h1:TPOrxkEMvZzfBSwF3ct+kUUgKA5g8unkZZbKQvJweeA= +go.opentelemetry.io/collector/pdata v0.66.1-0.20221202005155-1c54042beb70/go.mod h1:pqyaznLzk21m+1KL6fwOsRryRELL+zNM0qiVSn0MbVc= +go.opentelemetry.io/collector/processor/batchprocessor v0.66.1-0.20221202005155-1c54042beb70 h1:Y4e8NnVevonnAgmjX9Z7QIMA32yMqHAOnAlh8SzTS8c= +go.opentelemetry.io/collector/semconv v0.66.1-0.20221202005155-1c54042beb70 h1:Q5L9Urod3c8as6ZYaoaqBjarx/HXxsxy34DFZIU2fO4= +go.opentelemetry.io/collector/semconv v0.66.1-0.20221202005155-1c54042beb70/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= @@ -659,8 +661,8 @@ go.uber.org/multierr v1.6.0/go.mod h1:cdWPpRnG4AhwMwsgIHip0KRBQjJy5kYEpYjJxpXp9i go.uber.org/multierr v1.8.0 h1:dg6GjLku4EH+249NNmoIciG9N/jURbDG+pFlTkhzIC8= go.uber.org/multierr v1.8.0/go.mod h1:7EAYxJLBy9rStEaz58O2t4Uvip6FSURkq8/ppBp95ak= go.uber.org/zap v1.17.0/go.mod h1:MXVU+bhUf/A7Xi2HNOnopQOrmycQ5Ih87HtOu4q5SSo= -go.uber.org/zap v1.23.0 h1:OjGQ5KQDEUawVHxNwQgPpiypGHOxo2mNZsOqTak4fFY= -go.uber.org/zap v1.23.0/go.mod h1:D+nX8jyLsMHMYrln8A0rJjFt/T/9/bGgIhAqxv5URuY= +go.uber.org/zap v1.24.0 h1:FiJd5l1UOLj0wCgbSE0rwwXHzEdAZS6hiiSnxJN/D60= +go.uber.org/zap v1.24.0/go.mod h1:2kMP+WWQ8aoFoedH3T2sq6iJ2yDWpHbP0f6MQbS9Gkg= golang.org/x/crypto v0.0.0-20180904163835-0709b304e793/go.mod h1:6SG95UA2DQfeDnfUPMdvaQW0Q7yPrPDi9nlGo2tz2b4= golang.org/x/crypto v0.0.0-20190308221718-c2843e01d9a2/go.mod h1:djNgcEr1/C05ACkg1iLfiJU5Ep61QUkGW8qpdssI0+w= golang.org/x/crypto v0.0.0-20190510104115-cbcb75029529/go.mod h1:yigFU9vqHzYiE8UmvKecakEJjdnWj3jj499lnFckfCI= diff --git a/exporter/prometheusexporter/prometheus.go b/exporter/prometheusexporter/prometheus.go index ff11977bb6ab..9650f2dfe934 100644 --- a/exporter/prometheusexporter/prometheus.go +++ b/exporter/prometheusexporter/prometheus.go @@ -50,7 +50,7 @@ func newPrometheusExporter(config *Config, set component.ExporterCreateSettings) _ = registry.Register(collector) return &prometheusExporter{ config: *config, - name: config.ID().String(), + name: set.ID.String(), endpoint: addr, collector: collector, registry: registry, diff --git a/exporter/prometheusremotewriteexporter/go.mod b/exporter/prometheusremotewriteexporter/go.mod index bf1f61f85159..20d25f1ceda5 100644 --- a/exporter/prometheusremotewriteexporter/go.mod +++ b/exporter/prometheusremotewriteexporter/go.mod @@ -13,13 +13,14 @@ 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.66.1-0.20221128222955-4ff1ff379b90 - go.opentelemetry.io/collector/component v0.66.1-0.20221128222955-4ff1ff379b90 - go.opentelemetry.io/collector/consumer v0.66.1-0.20221128222955-4ff1ff379b90 - go.opentelemetry.io/collector/pdata v0.66.1-0.20221128222955-4ff1ff379b90 + go.opentelemetry.io/collector v0.66.1-0.20221202005155-1c54042beb70 + go.opentelemetry.io/collector/component v0.66.1-0.20221202005155-1c54042beb70 + go.opentelemetry.io/collector/confmap v0.0.0-20221201172708-2bdff61fa52a + go.opentelemetry.io/collector/consumer v0.66.1-0.20221202005155-1c54042beb70 + go.opentelemetry.io/collector/pdata v0.66.1-0.20221202005155-1c54042beb70 go.uber.org/atomic v1.10.0 go.uber.org/multierr v1.8.0 - go.uber.org/zap v1.23.0 + go.uber.org/zap v1.24.0 ) require ( @@ -45,8 +46,8 @@ require ( github.com/tidwall/pretty v1.2.0 // indirect github.com/tidwall/tinylru v1.1.0 // indirect go.opencensus.io v0.24.0 // indirect - go.opentelemetry.io/collector/featuregate v0.66.1-0.20221128222955-4ff1ff379b90 // indirect - go.opentelemetry.io/collector/semconv v0.66.1-0.20221128222955-4ff1ff379b90 // indirect + go.opentelemetry.io/collector/featuregate v0.66.1-0.20221202005155-1c54042beb70 // indirect + go.opentelemetry.io/collector/semconv v0.66.1-0.20221202005155-1c54042beb70 // 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 4a9ab14f2c0c..cb6ad5dd2fb0 100644 --- a/exporter/prometheusremotewriteexporter/go.sum +++ b/exporter/prometheusremotewriteexporter/go.sum @@ -378,18 +378,20 @@ go.opencensus.io v0.22.3/go.mod h1:yxeiOL68Rb0Xd1ddK5vPZ/oVn4vY4Ynel7k9FzqtOIw= go.opencensus.io v0.22.4/go.mod h1:yxeiOL68Rb0Xd1ddK5vPZ/oVn4vY4Ynel7k9FzqtOIw= go.opencensus.io v0.24.0 h1:y73uSU6J157QMP2kn2r30vwW1A2W2WFwSCGnAVxeaD0= go.opencensus.io v0.24.0/go.mod h1:vNK8G9p7aAivkbmorf4v+7Hgx+Zs0yY+0fOtgBfjQKo= -go.opentelemetry.io/collector v0.66.1-0.20221128222955-4ff1ff379b90 h1:yRe05/jMdzH4TFHfndZ5h2o2hKBK/79W72j8w51qNsI= -go.opentelemetry.io/collector v0.66.1-0.20221128222955-4ff1ff379b90/go.mod h1:hE6jCs+0rfiufCrVPucKZTMwfHit1okfDPnwPT2eW1I= -go.opentelemetry.io/collector/component v0.66.1-0.20221128222955-4ff1ff379b90 h1:AYSNTXbezhNg43EuYdVVcgxE/2gBVrm00FDx4DOmQVg= -go.opentelemetry.io/collector/component v0.66.1-0.20221128222955-4ff1ff379b90/go.mod h1:0c84EqXUhvYe6KW7hJfh76tiI/5yjWCH2amwyQ06XLM= -go.opentelemetry.io/collector/consumer v0.66.1-0.20221128222955-4ff1ff379b90 h1:nzNXVfC1FzXBXCLMzbMv+qK3E4EGiNsnMhfVsBd2yzc= -go.opentelemetry.io/collector/consumer v0.66.1-0.20221128222955-4ff1ff379b90/go.mod h1:WtoRZa5SnxQO1ZEQdVxYpFcXCmq62rakv0oUSlPO0NQ= -go.opentelemetry.io/collector/featuregate v0.66.1-0.20221128222955-4ff1ff379b90 h1:UuJSFWbi9XxyNZsJKZuvpWg35BgRbcCGFH+38V2MAdw= -go.opentelemetry.io/collector/featuregate v0.66.1-0.20221128222955-4ff1ff379b90/go.mod h1:tewuFKJYalWBU0bmNKg++MC1ipINXUr6szYzOw2p1GI= -go.opentelemetry.io/collector/pdata v0.66.1-0.20221128222955-4ff1ff379b90 h1:Vu4S4jSNcd0VFPzxQNO4+UqGwnes1xJDoFLPRiWHm8I= -go.opentelemetry.io/collector/pdata v0.66.1-0.20221128222955-4ff1ff379b90/go.mod h1:pqyaznLzk21m+1KL6fwOsRryRELL+zNM0qiVSn0MbVc= -go.opentelemetry.io/collector/semconv v0.66.1-0.20221128222955-4ff1ff379b90 h1:hFaTA68cggZKWMv7wQ3bKP8KGTbowh/5AQZKCHzHTqM= -go.opentelemetry.io/collector/semconv v0.66.1-0.20221128222955-4ff1ff379b90/go.mod h1:5o9yhOa+ABt7g2E5JABDxGZ1PQPbtfxrKNbYn+LOTXU= +go.opentelemetry.io/collector v0.66.1-0.20221202005155-1c54042beb70 h1:INB2CsOtqqrija2KvMuIpbBQ3qX1BECEeR+d0NJX+oM= +go.opentelemetry.io/collector v0.66.1-0.20221202005155-1c54042beb70/go.mod h1:d0NHkHyANJy3HDTvYE/PoylMShUmFIbiir89ieI0X0c= +go.opentelemetry.io/collector/component v0.66.1-0.20221202005155-1c54042beb70 h1:dEoJhzCmRShgmVro/kXm6pouGElgxkH2DsvanzCeZtU= +go.opentelemetry.io/collector/component v0.66.1-0.20221202005155-1c54042beb70/go.mod h1:OsVnvFFe38QSpcuZlQ8cvarDzcloCexgQ1/B2m80F6U= +go.opentelemetry.io/collector/confmap v0.0.0-20221201172708-2bdff61fa52a h1:2TscCXAQASO2kU9xHcMIUM/FP29fiQIRTilZmliq/7I= +go.opentelemetry.io/collector/confmap v0.0.0-20221201172708-2bdff61fa52a/go.mod h1:qJ3e8bA8h4wz/jYlbeEUafVHdrU7DkpStnmIUAz6VTQ= +go.opentelemetry.io/collector/consumer v0.66.1-0.20221202005155-1c54042beb70 h1:XwpVjI1KeKGPXOZBLefGILMziPYuNf6IzbmiIEsIyI0= +go.opentelemetry.io/collector/consumer v0.66.1-0.20221202005155-1c54042beb70/go.mod h1:EWVBcSGcIcmeDGTnIboc/aqa3agsBeH8/q7yFWG7xVc= +go.opentelemetry.io/collector/featuregate v0.66.1-0.20221202005155-1c54042beb70 h1:V0tf4ebciqIs07jFATfLGdUpLRaEsi+AiWuA/in0G8Y= +go.opentelemetry.io/collector/featuregate v0.66.1-0.20221202005155-1c54042beb70/go.mod h1:tewuFKJYalWBU0bmNKg++MC1ipINXUr6szYzOw2p1GI= +go.opentelemetry.io/collector/pdata v0.66.1-0.20221202005155-1c54042beb70 h1:TPOrxkEMvZzfBSwF3ct+kUUgKA5g8unkZZbKQvJweeA= +go.opentelemetry.io/collector/pdata v0.66.1-0.20221202005155-1c54042beb70/go.mod h1:pqyaznLzk21m+1KL6fwOsRryRELL+zNM0qiVSn0MbVc= +go.opentelemetry.io/collector/semconv v0.66.1-0.20221202005155-1c54042beb70 h1:Q5L9Urod3c8as6ZYaoaqBjarx/HXxsxy34DFZIU2fO4= +go.opentelemetry.io/collector/semconv v0.66.1-0.20221202005155-1c54042beb70/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= @@ -409,8 +411,8 @@ go.uber.org/multierr v1.6.0/go.mod h1:cdWPpRnG4AhwMwsgIHip0KRBQjJy5kYEpYjJxpXp9i go.uber.org/multierr v1.8.0 h1:dg6GjLku4EH+249NNmoIciG9N/jURbDG+pFlTkhzIC8= go.uber.org/multierr v1.8.0/go.mod h1:7EAYxJLBy9rStEaz58O2t4Uvip6FSURkq8/ppBp95ak= go.uber.org/zap v1.17.0/go.mod h1:MXVU+bhUf/A7Xi2HNOnopQOrmycQ5Ih87HtOu4q5SSo= -go.uber.org/zap v1.23.0 h1:OjGQ5KQDEUawVHxNwQgPpiypGHOxo2mNZsOqTak4fFY= -go.uber.org/zap v1.23.0/go.mod h1:D+nX8jyLsMHMYrln8A0rJjFt/T/9/bGgIhAqxv5URuY= +go.uber.org/zap v1.24.0 h1:FiJd5l1UOLj0wCgbSE0rwwXHzEdAZS6hiiSnxJN/D60= +go.uber.org/zap v1.24.0/go.mod h1:2kMP+WWQ8aoFoedH3T2sq6iJ2yDWpHbP0f6MQbS9Gkg= golang.org/x/crypto v0.0.0-20180904163835-0709b304e793/go.mod h1:6SG95UA2DQfeDnfUPMdvaQW0Q7yPrPDi9nlGo2tz2b4= golang.org/x/crypto v0.0.0-20190308221718-c2843e01d9a2/go.mod h1:djNgcEr1/C05ACkg1iLfiJU5Ep61QUkGW8qpdssI0+w= golang.org/x/crypto v0.0.0-20190510104115-cbcb75029529/go.mod h1:yigFU9vqHzYiE8UmvKecakEJjdnWj3jj499lnFckfCI= diff --git a/exporter/pulsarexporter/go.mod b/exporter/pulsarexporter/go.mod index 97c83f9cc912..56754d4b56d0 100644 --- a/exporter/pulsarexporter/go.mod +++ b/exporter/pulsarexporter/go.mod @@ -9,13 +9,14 @@ require ( github.com/open-telemetry/opentelemetry-collector-contrib/internal/coreinternal v0.66.0 github.com/open-telemetry/opentelemetry-collector-contrib/pkg/translator/jaeger v0.66.0 github.com/stretchr/testify v1.8.1 - go.opentelemetry.io/collector v0.66.1-0.20221128222955-4ff1ff379b90 - go.opentelemetry.io/collector/component v0.66.1-0.20221128222955-4ff1ff379b90 - go.opentelemetry.io/collector/consumer v0.66.1-0.20221128222955-4ff1ff379b90 - go.opentelemetry.io/collector/pdata v0.66.1-0.20221128222955-4ff1ff379b90 - go.opentelemetry.io/collector/semconv v0.66.1-0.20221128222955-4ff1ff379b90 + go.opentelemetry.io/collector v0.66.1-0.20221202005155-1c54042beb70 + go.opentelemetry.io/collector/component v0.66.1-0.20221202005155-1c54042beb70 + go.opentelemetry.io/collector/confmap v0.0.0-20221201172708-2bdff61fa52a + go.opentelemetry.io/collector/consumer v0.66.1-0.20221202005155-1c54042beb70 + go.opentelemetry.io/collector/pdata v0.66.1-0.20221202005155-1c54042beb70 + go.opentelemetry.io/collector/semconv v0.66.1-0.20221202005155-1c54042beb70 go.uber.org/multierr v1.8.0 - go.uber.org/zap v1.23.0 + go.uber.org/zap v1.24.0 ) require ( @@ -64,7 +65,7 @@ require ( github.com/uber/jaeger-client-go v2.30.0+incompatible // indirect github.com/uber/jaeger-lib v2.4.1+incompatible // indirect go.opencensus.io v0.24.0 // indirect - go.opentelemetry.io/collector/featuregate v0.66.1-0.20221128222955-4ff1ff379b90 // indirect + go.opentelemetry.io/collector/featuregate v0.66.1-0.20221202005155-1c54042beb70 // 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 244faea607b9..5e7edd00ef69 100644 --- a/exporter/pulsarexporter/go.sum +++ b/exporter/pulsarexporter/go.sum @@ -496,18 +496,20 @@ go.opencensus.io v0.22.5/go.mod h1:5pWMHQbX5EPX2/62yrJeAkowc+lfs/XD7Uxpq3pI6kk= go.opencensus.io v0.23.0/go.mod h1:XItmlyltB5F7CS4xOC1DcqMoFqwtC6OG2xF7mCv7P7E= go.opencensus.io v0.24.0 h1:y73uSU6J157QMP2kn2r30vwW1A2W2WFwSCGnAVxeaD0= go.opencensus.io v0.24.0/go.mod h1:vNK8G9p7aAivkbmorf4v+7Hgx+Zs0yY+0fOtgBfjQKo= -go.opentelemetry.io/collector v0.66.1-0.20221128222955-4ff1ff379b90 h1:yRe05/jMdzH4TFHfndZ5h2o2hKBK/79W72j8w51qNsI= -go.opentelemetry.io/collector v0.66.1-0.20221128222955-4ff1ff379b90/go.mod h1:hE6jCs+0rfiufCrVPucKZTMwfHit1okfDPnwPT2eW1I= -go.opentelemetry.io/collector/component v0.66.1-0.20221128222955-4ff1ff379b90 h1:AYSNTXbezhNg43EuYdVVcgxE/2gBVrm00FDx4DOmQVg= -go.opentelemetry.io/collector/component v0.66.1-0.20221128222955-4ff1ff379b90/go.mod h1:0c84EqXUhvYe6KW7hJfh76tiI/5yjWCH2amwyQ06XLM= -go.opentelemetry.io/collector/consumer v0.66.1-0.20221128222955-4ff1ff379b90 h1:nzNXVfC1FzXBXCLMzbMv+qK3E4EGiNsnMhfVsBd2yzc= -go.opentelemetry.io/collector/consumer v0.66.1-0.20221128222955-4ff1ff379b90/go.mod h1:WtoRZa5SnxQO1ZEQdVxYpFcXCmq62rakv0oUSlPO0NQ= -go.opentelemetry.io/collector/featuregate v0.66.1-0.20221128222955-4ff1ff379b90 h1:UuJSFWbi9XxyNZsJKZuvpWg35BgRbcCGFH+38V2MAdw= -go.opentelemetry.io/collector/featuregate v0.66.1-0.20221128222955-4ff1ff379b90/go.mod h1:tewuFKJYalWBU0bmNKg++MC1ipINXUr6szYzOw2p1GI= -go.opentelemetry.io/collector/pdata v0.66.1-0.20221128222955-4ff1ff379b90 h1:Vu4S4jSNcd0VFPzxQNO4+UqGwnes1xJDoFLPRiWHm8I= -go.opentelemetry.io/collector/pdata v0.66.1-0.20221128222955-4ff1ff379b90/go.mod h1:pqyaznLzk21m+1KL6fwOsRryRELL+zNM0qiVSn0MbVc= -go.opentelemetry.io/collector/semconv v0.66.1-0.20221128222955-4ff1ff379b90 h1:hFaTA68cggZKWMv7wQ3bKP8KGTbowh/5AQZKCHzHTqM= -go.opentelemetry.io/collector/semconv v0.66.1-0.20221128222955-4ff1ff379b90/go.mod h1:5o9yhOa+ABt7g2E5JABDxGZ1PQPbtfxrKNbYn+LOTXU= +go.opentelemetry.io/collector v0.66.1-0.20221202005155-1c54042beb70 h1:INB2CsOtqqrija2KvMuIpbBQ3qX1BECEeR+d0NJX+oM= +go.opentelemetry.io/collector v0.66.1-0.20221202005155-1c54042beb70/go.mod h1:d0NHkHyANJy3HDTvYE/PoylMShUmFIbiir89ieI0X0c= +go.opentelemetry.io/collector/component v0.66.1-0.20221202005155-1c54042beb70 h1:dEoJhzCmRShgmVro/kXm6pouGElgxkH2DsvanzCeZtU= +go.opentelemetry.io/collector/component v0.66.1-0.20221202005155-1c54042beb70/go.mod h1:OsVnvFFe38QSpcuZlQ8cvarDzcloCexgQ1/B2m80F6U= +go.opentelemetry.io/collector/confmap v0.0.0-20221201172708-2bdff61fa52a h1:2TscCXAQASO2kU9xHcMIUM/FP29fiQIRTilZmliq/7I= +go.opentelemetry.io/collector/confmap v0.0.0-20221201172708-2bdff61fa52a/go.mod h1:qJ3e8bA8h4wz/jYlbeEUafVHdrU7DkpStnmIUAz6VTQ= +go.opentelemetry.io/collector/consumer v0.66.1-0.20221202005155-1c54042beb70 h1:XwpVjI1KeKGPXOZBLefGILMziPYuNf6IzbmiIEsIyI0= +go.opentelemetry.io/collector/consumer v0.66.1-0.20221202005155-1c54042beb70/go.mod h1:EWVBcSGcIcmeDGTnIboc/aqa3agsBeH8/q7yFWG7xVc= +go.opentelemetry.io/collector/featuregate v0.66.1-0.20221202005155-1c54042beb70 h1:V0tf4ebciqIs07jFATfLGdUpLRaEsi+AiWuA/in0G8Y= +go.opentelemetry.io/collector/featuregate v0.66.1-0.20221202005155-1c54042beb70/go.mod h1:tewuFKJYalWBU0bmNKg++MC1ipINXUr6szYzOw2p1GI= +go.opentelemetry.io/collector/pdata v0.66.1-0.20221202005155-1c54042beb70 h1:TPOrxkEMvZzfBSwF3ct+kUUgKA5g8unkZZbKQvJweeA= +go.opentelemetry.io/collector/pdata v0.66.1-0.20221202005155-1c54042beb70/go.mod h1:pqyaznLzk21m+1KL6fwOsRryRELL+zNM0qiVSn0MbVc= +go.opentelemetry.io/collector/semconv v0.66.1-0.20221202005155-1c54042beb70 h1:Q5L9Urod3c8as6ZYaoaqBjarx/HXxsxy34DFZIU2fO4= +go.opentelemetry.io/collector/semconv v0.66.1-0.20221202005155-1c54042beb70/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= @@ -525,8 +527,8 @@ go.uber.org/multierr v1.6.0/go.mod h1:cdWPpRnG4AhwMwsgIHip0KRBQjJy5kYEpYjJxpXp9i go.uber.org/multierr v1.8.0 h1:dg6GjLku4EH+249NNmoIciG9N/jURbDG+pFlTkhzIC8= go.uber.org/multierr v1.8.0/go.mod h1:7EAYxJLBy9rStEaz58O2t4Uvip6FSURkq8/ppBp95ak= go.uber.org/zap v1.17.0/go.mod h1:MXVU+bhUf/A7Xi2HNOnopQOrmycQ5Ih87HtOu4q5SSo= -go.uber.org/zap v1.23.0 h1:OjGQ5KQDEUawVHxNwQgPpiypGHOxo2mNZsOqTak4fFY= -go.uber.org/zap v1.23.0/go.mod h1:D+nX8jyLsMHMYrln8A0rJjFt/T/9/bGgIhAqxv5URuY= +go.uber.org/zap v1.24.0 h1:FiJd5l1UOLj0wCgbSE0rwwXHzEdAZS6hiiSnxJN/D60= +go.uber.org/zap v1.24.0/go.mod h1:2kMP+WWQ8aoFoedH3T2sq6iJ2yDWpHbP0f6MQbS9Gkg= golang.org/x/crypto v0.0.0-20180904163835-0709b304e793/go.mod h1:6SG95UA2DQfeDnfUPMdvaQW0Q7yPrPDi9nlGo2tz2b4= golang.org/x/crypto v0.0.0-20181029021203-45a5f77698d3/go.mod h1:6SG95UA2DQfeDnfUPMdvaQW0Q7yPrPDi9nlGo2tz2b4= golang.org/x/crypto v0.0.0-20190308221718-c2843e01d9a2/go.mod h1:djNgcEr1/C05ACkg1iLfiJU5Ep61QUkGW8qpdssI0+w= diff --git a/exporter/sapmexporter/go.mod b/exporter/sapmexporter/go.mod index 1c62c14a34bb..93e3c84035a0 100644 --- a/exporter/sapmexporter/go.mod +++ b/exporter/sapmexporter/go.mod @@ -9,11 +9,12 @@ require ( github.com/open-telemetry/opentelemetry-collector-contrib/pkg/translator/jaeger v0.66.0 github.com/signalfx/sapm-proto v0.12.0 github.com/stretchr/testify v1.8.1 - go.opentelemetry.io/collector v0.66.1-0.20221128222955-4ff1ff379b90 - go.opentelemetry.io/collector/component v0.66.1-0.20221128222955-4ff1ff379b90 - go.opentelemetry.io/collector/consumer v0.66.1-0.20221128222955-4ff1ff379b90 - go.opentelemetry.io/collector/pdata v0.66.1-0.20221128222955-4ff1ff379b90 - go.uber.org/zap v1.23.0 + go.opentelemetry.io/collector v0.66.1-0.20221202005155-1c54042beb70 + go.opentelemetry.io/collector/component v0.66.1-0.20221202005155-1c54042beb70 + go.opentelemetry.io/collector/confmap v0.0.0-20221201172708-2bdff61fa52a + go.opentelemetry.io/collector/consumer v0.66.1-0.20221202005155-1c54042beb70 + go.opentelemetry.io/collector/pdata v0.66.1-0.20221202005155-1c54042beb70 + go.uber.org/zap v1.24.0 ) require ( @@ -38,8 +39,8 @@ require ( github.com/uber/jaeger-client-go v2.30.0+incompatible // indirect github.com/uber/jaeger-lib v2.4.1+incompatible // indirect go.opencensus.io v0.24.0 // indirect - go.opentelemetry.io/collector/featuregate v0.66.1-0.20221128222955-4ff1ff379b90 // indirect - go.opentelemetry.io/collector/semconv v0.66.1-0.20221128222955-4ff1ff379b90 // indirect + go.opentelemetry.io/collector/featuregate v0.66.1-0.20221202005155-1c54042beb70 // indirect + go.opentelemetry.io/collector/semconv v0.66.1-0.20221202005155-1c54042beb70 // 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 bf71baabe6d4..1e501959832a 100644 --- a/exporter/sapmexporter/go.sum +++ b/exporter/sapmexporter/go.sum @@ -292,18 +292,20 @@ go.etcd.io/etcd/client/pkg/v3 v3.5.4/go.mod h1:IJHfcCEKxYu1Os13ZdwCwIUTUVGYTSAM3 go.etcd.io/etcd/client/v3 v3.5.4/go.mod h1:ZaRkVgBZC+L+dLCjTcF1hRXpgZXQPOvnA/Ak/gq3kiY= go.opencensus.io v0.24.0 h1:y73uSU6J157QMP2kn2r30vwW1A2W2WFwSCGnAVxeaD0= go.opencensus.io v0.24.0/go.mod h1:vNK8G9p7aAivkbmorf4v+7Hgx+Zs0yY+0fOtgBfjQKo= -go.opentelemetry.io/collector v0.66.1-0.20221128222955-4ff1ff379b90 h1:yRe05/jMdzH4TFHfndZ5h2o2hKBK/79W72j8w51qNsI= -go.opentelemetry.io/collector v0.66.1-0.20221128222955-4ff1ff379b90/go.mod h1:hE6jCs+0rfiufCrVPucKZTMwfHit1okfDPnwPT2eW1I= -go.opentelemetry.io/collector/component v0.66.1-0.20221128222955-4ff1ff379b90 h1:AYSNTXbezhNg43EuYdVVcgxE/2gBVrm00FDx4DOmQVg= -go.opentelemetry.io/collector/component v0.66.1-0.20221128222955-4ff1ff379b90/go.mod h1:0c84EqXUhvYe6KW7hJfh76tiI/5yjWCH2amwyQ06XLM= -go.opentelemetry.io/collector/consumer v0.66.1-0.20221128222955-4ff1ff379b90 h1:nzNXVfC1FzXBXCLMzbMv+qK3E4EGiNsnMhfVsBd2yzc= -go.opentelemetry.io/collector/consumer v0.66.1-0.20221128222955-4ff1ff379b90/go.mod h1:WtoRZa5SnxQO1ZEQdVxYpFcXCmq62rakv0oUSlPO0NQ= -go.opentelemetry.io/collector/featuregate v0.66.1-0.20221128222955-4ff1ff379b90 h1:UuJSFWbi9XxyNZsJKZuvpWg35BgRbcCGFH+38V2MAdw= -go.opentelemetry.io/collector/featuregate v0.66.1-0.20221128222955-4ff1ff379b90/go.mod h1:tewuFKJYalWBU0bmNKg++MC1ipINXUr6szYzOw2p1GI= -go.opentelemetry.io/collector/pdata v0.66.1-0.20221128222955-4ff1ff379b90 h1:Vu4S4jSNcd0VFPzxQNO4+UqGwnes1xJDoFLPRiWHm8I= -go.opentelemetry.io/collector/pdata v0.66.1-0.20221128222955-4ff1ff379b90/go.mod h1:pqyaznLzk21m+1KL6fwOsRryRELL+zNM0qiVSn0MbVc= -go.opentelemetry.io/collector/semconv v0.66.1-0.20221128222955-4ff1ff379b90 h1:hFaTA68cggZKWMv7wQ3bKP8KGTbowh/5AQZKCHzHTqM= -go.opentelemetry.io/collector/semconv v0.66.1-0.20221128222955-4ff1ff379b90/go.mod h1:5o9yhOa+ABt7g2E5JABDxGZ1PQPbtfxrKNbYn+LOTXU= +go.opentelemetry.io/collector v0.66.1-0.20221202005155-1c54042beb70 h1:INB2CsOtqqrija2KvMuIpbBQ3qX1BECEeR+d0NJX+oM= +go.opentelemetry.io/collector v0.66.1-0.20221202005155-1c54042beb70/go.mod h1:d0NHkHyANJy3HDTvYE/PoylMShUmFIbiir89ieI0X0c= +go.opentelemetry.io/collector/component v0.66.1-0.20221202005155-1c54042beb70 h1:dEoJhzCmRShgmVro/kXm6pouGElgxkH2DsvanzCeZtU= +go.opentelemetry.io/collector/component v0.66.1-0.20221202005155-1c54042beb70/go.mod h1:OsVnvFFe38QSpcuZlQ8cvarDzcloCexgQ1/B2m80F6U= +go.opentelemetry.io/collector/confmap v0.0.0-20221201172708-2bdff61fa52a h1:2TscCXAQASO2kU9xHcMIUM/FP29fiQIRTilZmliq/7I= +go.opentelemetry.io/collector/confmap v0.0.0-20221201172708-2bdff61fa52a/go.mod h1:qJ3e8bA8h4wz/jYlbeEUafVHdrU7DkpStnmIUAz6VTQ= +go.opentelemetry.io/collector/consumer v0.66.1-0.20221202005155-1c54042beb70 h1:XwpVjI1KeKGPXOZBLefGILMziPYuNf6IzbmiIEsIyI0= +go.opentelemetry.io/collector/consumer v0.66.1-0.20221202005155-1c54042beb70/go.mod h1:EWVBcSGcIcmeDGTnIboc/aqa3agsBeH8/q7yFWG7xVc= +go.opentelemetry.io/collector/featuregate v0.66.1-0.20221202005155-1c54042beb70 h1:V0tf4ebciqIs07jFATfLGdUpLRaEsi+AiWuA/in0G8Y= +go.opentelemetry.io/collector/featuregate v0.66.1-0.20221202005155-1c54042beb70/go.mod h1:tewuFKJYalWBU0bmNKg++MC1ipINXUr6szYzOw2p1GI= +go.opentelemetry.io/collector/pdata v0.66.1-0.20221202005155-1c54042beb70 h1:TPOrxkEMvZzfBSwF3ct+kUUgKA5g8unkZZbKQvJweeA= +go.opentelemetry.io/collector/pdata v0.66.1-0.20221202005155-1c54042beb70/go.mod h1:pqyaznLzk21m+1KL6fwOsRryRELL+zNM0qiVSn0MbVc= +go.opentelemetry.io/collector/semconv v0.66.1-0.20221202005155-1c54042beb70 h1:Q5L9Urod3c8as6ZYaoaqBjarx/HXxsxy34DFZIU2fO4= +go.opentelemetry.io/collector/semconv v0.66.1-0.20221202005155-1c54042beb70/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= @@ -323,8 +325,8 @@ go.uber.org/multierr v1.6.0/go.mod h1:cdWPpRnG4AhwMwsgIHip0KRBQjJy5kYEpYjJxpXp9i go.uber.org/multierr v1.8.0 h1:dg6GjLku4EH+249NNmoIciG9N/jURbDG+pFlTkhzIC8= go.uber.org/multierr v1.8.0/go.mod h1:7EAYxJLBy9rStEaz58O2t4Uvip6FSURkq8/ppBp95ak= go.uber.org/zap v1.17.0/go.mod h1:MXVU+bhUf/A7Xi2HNOnopQOrmycQ5Ih87HtOu4q5SSo= -go.uber.org/zap v1.23.0 h1:OjGQ5KQDEUawVHxNwQgPpiypGHOxo2mNZsOqTak4fFY= -go.uber.org/zap v1.23.0/go.mod h1:D+nX8jyLsMHMYrln8A0rJjFt/T/9/bGgIhAqxv5URuY= +go.uber.org/zap v1.24.0 h1:FiJd5l1UOLj0wCgbSE0rwwXHzEdAZS6hiiSnxJN/D60= +go.uber.org/zap v1.24.0/go.mod h1:2kMP+WWQ8aoFoedH3T2sq6iJ2yDWpHbP0f6MQbS9Gkg= golang.org/x/crypto v0.0.0-20180904163835-0709b304e793/go.mod h1:6SG95UA2DQfeDnfUPMdvaQW0Q7yPrPDi9nlGo2tz2b4= golang.org/x/crypto v0.0.0-20190308221718-c2843e01d9a2/go.mod h1:djNgcEr1/C05ACkg1iLfiJU5Ep61QUkGW8qpdssI0+w= golang.org/x/crypto v0.0.0-20190923035154-9ee001bba392/go.mod h1:/lpIB1dKB+9EgE3H3cr1v9wB50oz8l4C4h62xy7jSTY= diff --git a/exporter/sentryexporter/go.mod b/exporter/sentryexporter/go.mod index 6a51b392f8d1..8242a5e03a77 100644 --- a/exporter/sentryexporter/go.mod +++ b/exporter/sentryexporter/go.mod @@ -7,10 +7,11 @@ require ( github.com/google/go-cmp v0.5.9 github.com/open-telemetry/opentelemetry-collector-contrib/internal/coreinternal v0.66.0 github.com/stretchr/testify v1.8.1 - go.opentelemetry.io/collector v0.66.1-0.20221128222955-4ff1ff379b90 - go.opentelemetry.io/collector/component v0.66.1-0.20221128222955-4ff1ff379b90 - go.opentelemetry.io/collector/pdata v0.66.1-0.20221128222955-4ff1ff379b90 - go.opentelemetry.io/collector/semconv v0.66.1-0.20221128222955-4ff1ff379b90 + go.opentelemetry.io/collector v0.66.1-0.20221202005155-1c54042beb70 + go.opentelemetry.io/collector/component v0.66.1-0.20221202005155-1c54042beb70 + go.opentelemetry.io/collector/confmap v0.0.0-20221201172708-2bdff61fa52a + go.opentelemetry.io/collector/pdata v0.66.1-0.20221202005155-1c54042beb70 + go.opentelemetry.io/collector/semconv v0.66.1-0.20221202005155-1c54042beb70 ) require ( @@ -29,14 +30,14 @@ require ( github.com/pmezard/go-difflib v1.0.0 // indirect github.com/rogpeppe/go-internal v1.6.1 // indirect go.opencensus.io v0.24.0 // indirect - go.opentelemetry.io/collector/consumer v0.66.1-0.20221128222955-4ff1ff379b90 // indirect - go.opentelemetry.io/collector/featuregate v0.66.1-0.20221128222955-4ff1ff379b90 // indirect + go.opentelemetry.io/collector/consumer v0.66.1-0.20221202005155-1c54042beb70 // indirect + go.opentelemetry.io/collector/featuregate v0.66.1-0.20221202005155-1c54042beb70 // 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 go.uber.org/atomic v1.10.0 // indirect go.uber.org/multierr v1.8.0 // indirect - go.uber.org/zap v1.23.0 // indirect + go.uber.org/zap v1.24.0 // indirect golang.org/x/net v0.0.0-20221002022538-bcab6841153b // indirect golang.org/x/sys v0.2.0 // indirect golang.org/x/text v0.4.0 // indirect diff --git a/exporter/sentryexporter/go.sum b/exporter/sentryexporter/go.sum index 58ae8f386151..10049144cf8a 100644 --- a/exporter/sentryexporter/go.sum +++ b/exporter/sentryexporter/go.sum @@ -280,18 +280,20 @@ go.etcd.io/etcd/client/pkg/v3 v3.5.4/go.mod h1:IJHfcCEKxYu1Os13ZdwCwIUTUVGYTSAM3 go.etcd.io/etcd/client/v3 v3.5.4/go.mod h1:ZaRkVgBZC+L+dLCjTcF1hRXpgZXQPOvnA/Ak/gq3kiY= go.opencensus.io v0.24.0 h1:y73uSU6J157QMP2kn2r30vwW1A2W2WFwSCGnAVxeaD0= go.opencensus.io v0.24.0/go.mod h1:vNK8G9p7aAivkbmorf4v+7Hgx+Zs0yY+0fOtgBfjQKo= -go.opentelemetry.io/collector v0.66.1-0.20221128222955-4ff1ff379b90 h1:yRe05/jMdzH4TFHfndZ5h2o2hKBK/79W72j8w51qNsI= -go.opentelemetry.io/collector v0.66.1-0.20221128222955-4ff1ff379b90/go.mod h1:hE6jCs+0rfiufCrVPucKZTMwfHit1okfDPnwPT2eW1I= -go.opentelemetry.io/collector/component v0.66.1-0.20221128222955-4ff1ff379b90 h1:AYSNTXbezhNg43EuYdVVcgxE/2gBVrm00FDx4DOmQVg= -go.opentelemetry.io/collector/component v0.66.1-0.20221128222955-4ff1ff379b90/go.mod h1:0c84EqXUhvYe6KW7hJfh76tiI/5yjWCH2amwyQ06XLM= -go.opentelemetry.io/collector/consumer v0.66.1-0.20221128222955-4ff1ff379b90 h1:nzNXVfC1FzXBXCLMzbMv+qK3E4EGiNsnMhfVsBd2yzc= -go.opentelemetry.io/collector/consumer v0.66.1-0.20221128222955-4ff1ff379b90/go.mod h1:WtoRZa5SnxQO1ZEQdVxYpFcXCmq62rakv0oUSlPO0NQ= -go.opentelemetry.io/collector/featuregate v0.66.1-0.20221128222955-4ff1ff379b90 h1:UuJSFWbi9XxyNZsJKZuvpWg35BgRbcCGFH+38V2MAdw= -go.opentelemetry.io/collector/featuregate v0.66.1-0.20221128222955-4ff1ff379b90/go.mod h1:tewuFKJYalWBU0bmNKg++MC1ipINXUr6szYzOw2p1GI= -go.opentelemetry.io/collector/pdata v0.66.1-0.20221128222955-4ff1ff379b90 h1:Vu4S4jSNcd0VFPzxQNO4+UqGwnes1xJDoFLPRiWHm8I= -go.opentelemetry.io/collector/pdata v0.66.1-0.20221128222955-4ff1ff379b90/go.mod h1:pqyaznLzk21m+1KL6fwOsRryRELL+zNM0qiVSn0MbVc= -go.opentelemetry.io/collector/semconv v0.66.1-0.20221128222955-4ff1ff379b90 h1:hFaTA68cggZKWMv7wQ3bKP8KGTbowh/5AQZKCHzHTqM= -go.opentelemetry.io/collector/semconv v0.66.1-0.20221128222955-4ff1ff379b90/go.mod h1:5o9yhOa+ABt7g2E5JABDxGZ1PQPbtfxrKNbYn+LOTXU= +go.opentelemetry.io/collector v0.66.1-0.20221202005155-1c54042beb70 h1:INB2CsOtqqrija2KvMuIpbBQ3qX1BECEeR+d0NJX+oM= +go.opentelemetry.io/collector v0.66.1-0.20221202005155-1c54042beb70/go.mod h1:d0NHkHyANJy3HDTvYE/PoylMShUmFIbiir89ieI0X0c= +go.opentelemetry.io/collector/component v0.66.1-0.20221202005155-1c54042beb70 h1:dEoJhzCmRShgmVro/kXm6pouGElgxkH2DsvanzCeZtU= +go.opentelemetry.io/collector/component v0.66.1-0.20221202005155-1c54042beb70/go.mod h1:OsVnvFFe38QSpcuZlQ8cvarDzcloCexgQ1/B2m80F6U= +go.opentelemetry.io/collector/confmap v0.0.0-20221201172708-2bdff61fa52a h1:2TscCXAQASO2kU9xHcMIUM/FP29fiQIRTilZmliq/7I= +go.opentelemetry.io/collector/confmap v0.0.0-20221201172708-2bdff61fa52a/go.mod h1:qJ3e8bA8h4wz/jYlbeEUafVHdrU7DkpStnmIUAz6VTQ= +go.opentelemetry.io/collector/consumer v0.66.1-0.20221202005155-1c54042beb70 h1:XwpVjI1KeKGPXOZBLefGILMziPYuNf6IzbmiIEsIyI0= +go.opentelemetry.io/collector/consumer v0.66.1-0.20221202005155-1c54042beb70/go.mod h1:EWVBcSGcIcmeDGTnIboc/aqa3agsBeH8/q7yFWG7xVc= +go.opentelemetry.io/collector/featuregate v0.66.1-0.20221202005155-1c54042beb70 h1:V0tf4ebciqIs07jFATfLGdUpLRaEsi+AiWuA/in0G8Y= +go.opentelemetry.io/collector/featuregate v0.66.1-0.20221202005155-1c54042beb70/go.mod h1:tewuFKJYalWBU0bmNKg++MC1ipINXUr6szYzOw2p1GI= +go.opentelemetry.io/collector/pdata v0.66.1-0.20221202005155-1c54042beb70 h1:TPOrxkEMvZzfBSwF3ct+kUUgKA5g8unkZZbKQvJweeA= +go.opentelemetry.io/collector/pdata v0.66.1-0.20221202005155-1c54042beb70/go.mod h1:pqyaznLzk21m+1KL6fwOsRryRELL+zNM0qiVSn0MbVc= +go.opentelemetry.io/collector/semconv v0.66.1-0.20221202005155-1c54042beb70 h1:Q5L9Urod3c8as6ZYaoaqBjarx/HXxsxy34DFZIU2fO4= +go.opentelemetry.io/collector/semconv v0.66.1-0.20221202005155-1c54042beb70/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= @@ -309,8 +311,8 @@ go.uber.org/multierr v1.6.0/go.mod h1:cdWPpRnG4AhwMwsgIHip0KRBQjJy5kYEpYjJxpXp9i go.uber.org/multierr v1.8.0 h1:dg6GjLku4EH+249NNmoIciG9N/jURbDG+pFlTkhzIC8= go.uber.org/multierr v1.8.0/go.mod h1:7EAYxJLBy9rStEaz58O2t4Uvip6FSURkq8/ppBp95ak= go.uber.org/zap v1.17.0/go.mod h1:MXVU+bhUf/A7Xi2HNOnopQOrmycQ5Ih87HtOu4q5SSo= -go.uber.org/zap v1.23.0 h1:OjGQ5KQDEUawVHxNwQgPpiypGHOxo2mNZsOqTak4fFY= -go.uber.org/zap v1.23.0/go.mod h1:D+nX8jyLsMHMYrln8A0rJjFt/T/9/bGgIhAqxv5URuY= +go.uber.org/zap v1.24.0 h1:FiJd5l1UOLj0wCgbSE0rwwXHzEdAZS6hiiSnxJN/D60= +go.uber.org/zap v1.24.0/go.mod h1:2kMP+WWQ8aoFoedH3T2sq6iJ2yDWpHbP0f6MQbS9Gkg= golang.org/x/crypto v0.0.0-20180904163835-0709b304e793/go.mod h1:6SG95UA2DQfeDnfUPMdvaQW0Q7yPrPDi9nlGo2tz2b4= golang.org/x/crypto v0.0.0-20190308221718-c2843e01d9a2/go.mod h1:djNgcEr1/C05ACkg1iLfiJU5Ep61QUkGW8qpdssI0+w= golang.org/x/crypto v0.0.0-20190923035154-9ee001bba392/go.mod h1:/lpIB1dKB+9EgE3H3cr1v9wB50oz8l4C4h62xy7jSTY= diff --git a/exporter/signalfxexporter/exporter.go b/exporter/signalfxexporter/exporter.go index 86e2e12bb490..1f83ea01fcff 100644 --- a/exporter/signalfxexporter/exporter.go +++ b/exporter/signalfxexporter/exporter.go @@ -88,8 +88,7 @@ func newSignalFxExporter( options, err := config.getOptionsFromConfig() if err != nil { - return nil, - fmt.Errorf("failed to process %q config: %w", config.ID().String(), err) + return nil, err } headers := buildHeaders(config) @@ -183,7 +182,7 @@ func newEventExporter(config *Config, logger *zap.Logger) (*signalfxExporter, er options, err := config.getOptionsFromConfig() if err != nil { return nil, - fmt.Errorf("failed to process %q config: %w", config.ID().String(), err) + fmt.Errorf("failed to process config: %w", err) } headers := buildHeaders(config) diff --git a/exporter/signalfxexporter/factory_test.go b/exporter/signalfxexporter/factory_test.go index 43871aaa244a..856e5ca39b91 100644 --- a/exporter/signalfxexporter/factory_test.go +++ b/exporter/signalfxexporter/factory_test.go @@ -140,7 +140,7 @@ func TestFactory_CreateMetricsExporterFails(t *testing.T) { Realm: "lab", TimeoutSettings: exporterhelper.TimeoutSettings{Timeout: -2 * time.Second}, }, - errorMessage: "failed to process \"signalfx\" config: cannot have a negative \"timeout\"", + errorMessage: "cannot have a negative \"timeout\"", }, { name: "empty_realm_and_urls", @@ -148,8 +148,7 @@ func TestFactory_CreateMetricsExporterFails(t *testing.T) { ExporterSettings: config.NewExporterSettings(component.NewID(typeStr)), AccessToken: "testToken", }, - errorMessage: "failed to process \"signalfx\" config: requires a non-empty \"realm\"," + - " or \"ingest_url\" and \"api_url\" should be explicitly set", + errorMessage: "requires a non-empty \"realm\", or \"ingest_url\" and \"api_url\" should be explicitly set", }, { name: "empty_realm_and_api_url", @@ -158,8 +157,7 @@ func TestFactory_CreateMetricsExporterFails(t *testing.T) { AccessToken: "testToken", IngestURL: "http://localhost:123", }, - errorMessage: "failed to process \"signalfx\" config: requires a non-empty \"realm\"," + - " or \"ingest_url\" and \"api_url\" should be explicitly set", + errorMessage: "requires a non-empty \"realm\", or \"ingest_url\" and \"api_url\" should be explicitly set", }, { name: "negative_MaxConnections", @@ -171,7 +169,7 @@ func TestFactory_CreateMetricsExporterFails(t *testing.T) { APIURL: "https://api.us1.signalfx.com/", MaxConnections: -10, }, - errorMessage: "failed to process \"signalfx\" config: cannot have a negative \"max_connections\"", + errorMessage: "cannot have a negative \"max_connections\"", }, } for _, tt := range tests { diff --git a/exporter/signalfxexporter/go.mod b/exporter/signalfxexporter/go.mod index f9c014d816ac..bf987f485a8e 100644 --- a/exporter/signalfxexporter/go.mod +++ b/exporter/signalfxexporter/go.mod @@ -15,14 +15,15 @@ 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.66.1-0.20221128222955-4ff1ff379b90 - go.opentelemetry.io/collector/component v0.66.1-0.20221128222955-4ff1ff379b90 - go.opentelemetry.io/collector/consumer v0.66.1-0.20221128222955-4ff1ff379b90 - go.opentelemetry.io/collector/pdata v0.66.1-0.20221128222955-4ff1ff379b90 - go.opentelemetry.io/collector/semconv v0.66.1-0.20221128222955-4ff1ff379b90 + go.opentelemetry.io/collector v0.66.1-0.20221202005155-1c54042beb70 + go.opentelemetry.io/collector/component v0.66.1-0.20221202005155-1c54042beb70 + go.opentelemetry.io/collector/confmap v0.0.0-20221201172708-2bdff61fa52a + go.opentelemetry.io/collector/consumer v0.66.1-0.20221202005155-1c54042beb70 + go.opentelemetry.io/collector/pdata v0.66.1-0.20221202005155-1c54042beb70 + go.opentelemetry.io/collector/semconv v0.66.1-0.20221202005155-1c54042beb70 go.uber.org/atomic v1.10.0 go.uber.org/multierr v1.8.0 - go.uber.org/zap v1.23.0 + go.uber.org/zap v1.24.0 golang.org/x/sys v0.2.0 gopkg.in/yaml.v2 v2.4.0 ) @@ -57,13 +58,13 @@ require ( github.com/signalfx/gohistogram v0.0.0-20160107210732-1ccfd2ff5083 // indirect github.com/signalfx/golib/v3 v3.3.46 // indirect github.com/signalfx/sapm-proto v0.12.0 // indirect - github.com/tklauser/go-sysconf v0.3.10 // indirect - github.com/tklauser/numcpus v0.4.0 // indirect + github.com/tklauser/go-sysconf v0.3.11 // indirect + github.com/tklauser/numcpus v0.6.0 // indirect 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.24.0 // indirect - go.opentelemetry.io/collector/featuregate v0.66.1-0.20221128222955-4ff1ff379b90 // indirect + go.opentelemetry.io/collector/featuregate v0.66.1-0.20221202005155-1c54042beb70 // 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 98e7e9f9dca5..084f4c784773 100644 --- a/exporter/signalfxexporter/go.sum +++ b/exporter/signalfxexporter/go.sum @@ -1141,10 +1141,12 @@ github.com/tdakkota/asciicheck v0.0.0-20200416200610-e657995f937b/go.mod h1:yHp0 github.com/tetafro/godot v1.4.4/go.mod h1:FVDd4JuKliW3UgjswZfJfHq4vAx0bD/Jd5brJjGeaz4= github.com/tidwall/pretty v1.0.0/go.mod h1:XNkn88O1ChpSDQmQeStsy+sBenx6DDtFZJxhVysOjyk= github.com/timakin/bodyclose v0.0.0-20200424151742-cb6215831a94/go.mod h1:Qimiffbc6q9tBWlVV6x0P9sat/ao1xEkREYPPj9hphk= -github.com/tklauser/go-sysconf v0.3.10 h1:IJ1AZGZRWbY8T5Vfk04D9WOA5WSejdflXxP03OUqALw= github.com/tklauser/go-sysconf v0.3.10/go.mod h1:C8XykCvCb+Gn0oNCWPIlcb0RuglQTYaQ2hGm7jmxEFk= -github.com/tklauser/numcpus v0.4.0 h1:E53Dm1HjH1/R2/aoCtXtPgzmElmn51aOkhCFSuZq//o= +github.com/tklauser/go-sysconf v0.3.11 h1:89WgdJhk5SNwJfu+GKyYveZ4IaJ7xAkecBo+KdJV0CM= +github.com/tklauser/go-sysconf v0.3.11/go.mod h1:GqXfhXY3kiPa0nAXPDIQIWzJbMCB7AmcWpGR8lSZfqI= github.com/tklauser/numcpus v0.4.0/go.mod h1:1+UI3pD8NW14VMwdgJNJ1ESk2UnwhAnz5hMwiKKqXCQ= +github.com/tklauser/numcpus v0.6.0 h1:kebhY2Qt+3U6RNK7UqpYNA+tJ23IBEGKkB7JQBfDYms= +github.com/tklauser/numcpus v0.6.0/go.mod h1:FEZLMke0lhOUG6w2JadTzp0a+Nl8PF/GFkQ5UVIcaL4= github.com/tmc/grpc-websocket-proxy v0.0.0-20170815181823-89b8d40f7ca8/go.mod h1:ncp9v5uamzpCO7NfCPTXjqaC+bZgJeR0sMTm6dMHP7U= github.com/tmc/grpc-websocket-proxy v0.0.0-20190109142713-0ad062ec5ee5/go.mod h1:ncp9v5uamzpCO7NfCPTXjqaC+bZgJeR0sMTm6dMHP7U= github.com/tomarrell/wrapcheck v0.0.0-20201130113247-1683564d9756/go.mod h1:yiFB6fFoV7saXirUGfuK+cPtUh4NX/Hf5y2WC2lehu0= @@ -1230,18 +1232,24 @@ go.opentelemetry.io/collector v0.52.0/go.mod h1:a9GvaOhyc0nVOUzqvdv5mxyWghCSso/W go.opentelemetry.io/collector v0.54.0/go.mod h1:FgNzyfb4sAGb5cqusB5znETJ8Pz4OQUBGbOeGIZ2rlQ= go.opentelemetry.io/collector v0.57.2/go.mod h1:9TwWyMRhbFNzaaGLtm/6poWNDJw+etvQMS6Fy+8/8Xs= go.opentelemetry.io/collector v0.65.0/go.mod h1:hE6jCs+0rfiufCrVPucKZTMwfHit1okfDPnwPT2eW1I= -go.opentelemetry.io/collector v0.66.1-0.20221128222955-4ff1ff379b90 h1:yRe05/jMdzH4TFHfndZ5h2o2hKBK/79W72j8w51qNsI= -go.opentelemetry.io/collector v0.66.1-0.20221128222955-4ff1ff379b90/go.mod h1:hE6jCs+0rfiufCrVPucKZTMwfHit1okfDPnwPT2eW1I= +go.opentelemetry.io/collector v0.66.1-0.20221202005155-1c54042beb70 h1:INB2CsOtqqrija2KvMuIpbBQ3qX1BECEeR+d0NJX+oM= +go.opentelemetry.io/collector v0.66.1-0.20221202005155-1c54042beb70/go.mod h1:d0NHkHyANJy3HDTvYE/PoylMShUmFIbiir89ieI0X0c= go.opentelemetry.io/collector/component v0.65.0/go.mod h1:0c84EqXUhvYe6KW7hJfh76tiI/5yjWCH2amwyQ06XLM= -go.opentelemetry.io/collector/component v0.66.1-0.20221128222955-4ff1ff379b90 h1:AYSNTXbezhNg43EuYdVVcgxE/2gBVrm00FDx4DOmQVg= -go.opentelemetry.io/collector/component v0.66.1-0.20221128222955-4ff1ff379b90/go.mod h1:0c84EqXUhvYe6KW7hJfh76tiI/5yjWCH2amwyQ06XLM= +go.opentelemetry.io/collector/component v0.66.0/go.mod h1:0c84EqXUhvYe6KW7hJfh76tiI/5yjWCH2amwyQ06XLM= +go.opentelemetry.io/collector/component v0.66.1-0.20221202005155-1c54042beb70 h1:dEoJhzCmRShgmVro/kXm6pouGElgxkH2DsvanzCeZtU= +go.opentelemetry.io/collector/component v0.66.1-0.20221202005155-1c54042beb70/go.mod h1:OsVnvFFe38QSpcuZlQ8cvarDzcloCexgQ1/B2m80F6U= +go.opentelemetry.io/collector/confmap v0.0.0-20221201172708-2bdff61fa52a h1:2TscCXAQASO2kU9xHcMIUM/FP29fiQIRTilZmliq/7I= +go.opentelemetry.io/collector/confmap v0.0.0-20221201172708-2bdff61fa52a/go.mod h1:qJ3e8bA8h4wz/jYlbeEUafVHdrU7DkpStnmIUAz6VTQ= go.opentelemetry.io/collector/consumer v0.65.0/go.mod h1:WtoRZa5SnxQO1ZEQdVxYpFcXCmq62rakv0oUSlPO0NQ= -go.opentelemetry.io/collector/consumer v0.66.1-0.20221128222955-4ff1ff379b90 h1:nzNXVfC1FzXBXCLMzbMv+qK3E4EGiNsnMhfVsBd2yzc= -go.opentelemetry.io/collector/consumer v0.66.1-0.20221128222955-4ff1ff379b90/go.mod h1:WtoRZa5SnxQO1ZEQdVxYpFcXCmq62rakv0oUSlPO0NQ= +go.opentelemetry.io/collector/consumer v0.66.0/go.mod h1:WtoRZa5SnxQO1ZEQdVxYpFcXCmq62rakv0oUSlPO0NQ= +go.opentelemetry.io/collector/consumer v0.66.1-0.20221202005155-1c54042beb70 h1:XwpVjI1KeKGPXOZBLefGILMziPYuNf6IzbmiIEsIyI0= +go.opentelemetry.io/collector/consumer v0.66.1-0.20221202005155-1c54042beb70/go.mod h1:EWVBcSGcIcmeDGTnIboc/aqa3agsBeH8/q7yFWG7xVc= go.opentelemetry.io/collector/extension/zpagesextension v0.65.0/go.mod h1:+IPas7AeffG0GMIXhZr8IzpTNhH1Ri/6S/9YFqbLsmQ= +go.opentelemetry.io/collector/extension/zpagesextension v0.66.0/go.mod h1:+IPas7AeffG0GMIXhZr8IzpTNhH1Ri/6S/9YFqbLsmQ= go.opentelemetry.io/collector/featuregate v0.65.0/go.mod h1:tewuFKJYalWBU0bmNKg++MC1ipINXUr6szYzOw2p1GI= -go.opentelemetry.io/collector/featuregate v0.66.1-0.20221128222955-4ff1ff379b90 h1:UuJSFWbi9XxyNZsJKZuvpWg35BgRbcCGFH+38V2MAdw= -go.opentelemetry.io/collector/featuregate v0.66.1-0.20221128222955-4ff1ff379b90/go.mod h1:tewuFKJYalWBU0bmNKg++MC1ipINXUr6szYzOw2p1GI= +go.opentelemetry.io/collector/featuregate v0.66.0/go.mod h1:tewuFKJYalWBU0bmNKg++MC1ipINXUr6szYzOw2p1GI= +go.opentelemetry.io/collector/featuregate v0.66.1-0.20221202005155-1c54042beb70 h1:V0tf4ebciqIs07jFATfLGdUpLRaEsi+AiWuA/in0G8Y= +go.opentelemetry.io/collector/featuregate v0.66.1-0.20221202005155-1c54042beb70/go.mod h1:tewuFKJYalWBU0bmNKg++MC1ipINXUr6szYzOw2p1GI= go.opentelemetry.io/collector/model v0.49.0/go.mod h1:nOYQv9KoFPs6ihJwOi24qB209EOhS9HkwhGj54YiEAw= go.opentelemetry.io/collector/pdata v0.49.0/go.mod h1:YwmKuiFhNgtmhRdpi8Q8FAWPa0AwJTCSlssSsAtuRcY= go.opentelemetry.io/collector/pdata v0.52.0/go.mod h1:GJUTfTv8mlYpHRjcmHXVbvJr48EW/q/P/HuBvpXAE58= @@ -1249,16 +1257,19 @@ 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.65.0/go.mod h1:pqyaznLzk21m+1KL6fwOsRryRELL+zNM0qiVSn0MbVc= -go.opentelemetry.io/collector/pdata v0.66.1-0.20221128222955-4ff1ff379b90 h1:Vu4S4jSNcd0VFPzxQNO4+UqGwnes1xJDoFLPRiWHm8I= -go.opentelemetry.io/collector/pdata v0.66.1-0.20221128222955-4ff1ff379b90/go.mod h1:pqyaznLzk21m+1KL6fwOsRryRELL+zNM0qiVSn0MbVc= +go.opentelemetry.io/collector/pdata v0.66.0/go.mod h1:pqyaznLzk21m+1KL6fwOsRryRELL+zNM0qiVSn0MbVc= +go.opentelemetry.io/collector/pdata v0.66.1-0.20221202005155-1c54042beb70 h1:TPOrxkEMvZzfBSwF3ct+kUUgKA5g8unkZZbKQvJweeA= +go.opentelemetry.io/collector/pdata v0.66.1-0.20221202005155-1c54042beb70/go.mod h1:pqyaznLzk21m+1KL6fwOsRryRELL+zNM0qiVSn0MbVc= go.opentelemetry.io/collector/processor/batchprocessor v0.65.0/go.mod h1:XhGTsC1B/bq4gpg8IZ/QYBLXkzE4Gw3r7Xu2+ik8A1Q= +go.opentelemetry.io/collector/processor/batchprocessor v0.66.0/go.mod h1:XhGTsC1B/bq4gpg8IZ/QYBLXkzE4Gw3r7Xu2+ik8A1Q= 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.65.0/go.mod h1:5o9yhOa+ABt7g2E5JABDxGZ1PQPbtfxrKNbYn+LOTXU= -go.opentelemetry.io/collector/semconv v0.66.1-0.20221128222955-4ff1ff379b90 h1:hFaTA68cggZKWMv7wQ3bKP8KGTbowh/5AQZKCHzHTqM= -go.opentelemetry.io/collector/semconv v0.66.1-0.20221128222955-4ff1ff379b90/go.mod h1:5o9yhOa+ABt7g2E5JABDxGZ1PQPbtfxrKNbYn+LOTXU= +go.opentelemetry.io/collector/semconv v0.66.0/go.mod h1:5o9yhOa+ABt7g2E5JABDxGZ1PQPbtfxrKNbYn+LOTXU= +go.opentelemetry.io/collector/semconv v0.66.1-0.20221202005155-1c54042beb70 h1:Q5L9Urod3c8as6ZYaoaqBjarx/HXxsxy34DFZIU2fO4= +go.opentelemetry.io/collector/semconv v0.66.1-0.20221202005155-1c54042beb70/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= @@ -1325,8 +1336,9 @@ go.uber.org/zap v1.17.0/go.mod h1:MXVU+bhUf/A7Xi2HNOnopQOrmycQ5Ih87HtOu4q5SSo= go.uber.org/zap v1.19.1/go.mod h1:j3DNczoxDZroyBnOT1L/Q79cfUMGZxlv/9dzN7SM1rI= go.uber.org/zap v1.21.0/go.mod h1:wjWOCqI0f2ZZrJF/UufIOkiC8ii6tm1iqIsLo76RfJw= go.uber.org/zap v1.22.0/go.mod h1:H4siCOZOrAolnUPJEkfaSjDqyP+BDS0DdDWzwcgt3+U= -go.uber.org/zap v1.23.0 h1:OjGQ5KQDEUawVHxNwQgPpiypGHOxo2mNZsOqTak4fFY= go.uber.org/zap v1.23.0/go.mod h1:D+nX8jyLsMHMYrln8A0rJjFt/T/9/bGgIhAqxv5URuY= +go.uber.org/zap v1.24.0 h1:FiJd5l1UOLj0wCgbSE0rwwXHzEdAZS6hiiSnxJN/D60= +go.uber.org/zap v1.24.0/go.mod h1:2kMP+WWQ8aoFoedH3T2sq6iJ2yDWpHbP0f6MQbS9Gkg= golang.org/x/crypto v0.0.0-20180904163835-0709b304e793/go.mod h1:6SG95UA2DQfeDnfUPMdvaQW0Q7yPrPDi9nlGo2tz2b4= golang.org/x/crypto v0.0.0-20181029021203-45a5f77698d3/go.mod h1:6SG95UA2DQfeDnfUPMdvaQW0Q7yPrPDi9nlGo2tz2b4= golang.org/x/crypto v0.0.0-20181203042331-505ab145d0a9/go.mod h1:6SG95UA2DQfeDnfUPMdvaQW0Q7yPrPDi9nlGo2tz2b4= diff --git a/exporter/skywalkingexporter/go.mod b/exporter/skywalkingexporter/go.mod index 3517a2897d29..6a95fe3c5b6d 100644 --- a/exporter/skywalkingexporter/go.mod +++ b/exporter/skywalkingexporter/go.mod @@ -6,11 +6,12 @@ require ( github.com/open-telemetry/opentelemetry-collector-contrib/internal/common v0.66.0 github.com/open-telemetry/opentelemetry-collector-contrib/internal/coreinternal v0.66.0 github.com/stretchr/testify v1.8.1 - go.opentelemetry.io/collector v0.66.1-0.20221128222955-4ff1ff379b90 - go.opentelemetry.io/collector/component v0.66.1-0.20221128222955-4ff1ff379b90 - go.opentelemetry.io/collector/consumer v0.66.1-0.20221128222955-4ff1ff379b90 - go.opentelemetry.io/collector/pdata v0.66.1-0.20221128222955-4ff1ff379b90 - go.opentelemetry.io/collector/semconv v0.66.1-0.20221128222955-4ff1ff379b90 + go.opentelemetry.io/collector v0.66.1-0.20221202005155-1c54042beb70 + go.opentelemetry.io/collector/component v0.66.1-0.20221202005155-1c54042beb70 + go.opentelemetry.io/collector/confmap v0.0.0-20221201172708-2bdff61fa52a + go.opentelemetry.io/collector/consumer v0.66.1-0.20221202005155-1c54042beb70 + go.opentelemetry.io/collector/pdata v0.66.1-0.20221202005155-1c54042beb70 + go.opentelemetry.io/collector/semconv v0.66.1-0.20221202005155-1c54042beb70 go.uber.org/atomic v1.10.0 google.golang.org/grpc v1.51.0 skywalking.apache.org/repo/goapi v0.0.0-20211122071111-ffc517fbfe21 @@ -36,13 +37,13 @@ require ( github.com/pmezard/go-difflib v1.0.0 // indirect github.com/rogpeppe/go-internal v1.8.0 // indirect go.opencensus.io v0.24.0 // indirect - go.opentelemetry.io/collector/featuregate v0.66.1-0.20221128222955-4ff1ff379b90 // indirect + go.opentelemetry.io/collector/featuregate v0.66.1-0.20221202005155-1c54042beb70 // 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 go.opentelemetry.io/otel/trace v1.11.1 // indirect go.uber.org/multierr v1.8.0 // indirect - go.uber.org/zap v1.23.0 // indirect + go.uber.org/zap v1.24.0 // indirect golang.org/x/net v0.0.0-20220722155237-a158d28d115b // indirect golang.org/x/sys v0.2.0 // indirect golang.org/x/text v0.4.0 // indirect diff --git a/exporter/skywalkingexporter/go.sum b/exporter/skywalkingexporter/go.sum index a32ec47195ae..e6a349bc9331 100644 --- a/exporter/skywalkingexporter/go.sum +++ b/exporter/skywalkingexporter/go.sum @@ -303,18 +303,20 @@ go.etcd.io/etcd/client/pkg/v3 v3.5.4/go.mod h1:IJHfcCEKxYu1Os13ZdwCwIUTUVGYTSAM3 go.etcd.io/etcd/client/v3 v3.5.4/go.mod h1:ZaRkVgBZC+L+dLCjTcF1hRXpgZXQPOvnA/Ak/gq3kiY= go.opencensus.io v0.24.0 h1:y73uSU6J157QMP2kn2r30vwW1A2W2WFwSCGnAVxeaD0= go.opencensus.io v0.24.0/go.mod h1:vNK8G9p7aAivkbmorf4v+7Hgx+Zs0yY+0fOtgBfjQKo= -go.opentelemetry.io/collector v0.66.1-0.20221128222955-4ff1ff379b90 h1:yRe05/jMdzH4TFHfndZ5h2o2hKBK/79W72j8w51qNsI= -go.opentelemetry.io/collector v0.66.1-0.20221128222955-4ff1ff379b90/go.mod h1:hE6jCs+0rfiufCrVPucKZTMwfHit1okfDPnwPT2eW1I= -go.opentelemetry.io/collector/component v0.66.1-0.20221128222955-4ff1ff379b90 h1:AYSNTXbezhNg43EuYdVVcgxE/2gBVrm00FDx4DOmQVg= -go.opentelemetry.io/collector/component v0.66.1-0.20221128222955-4ff1ff379b90/go.mod h1:0c84EqXUhvYe6KW7hJfh76tiI/5yjWCH2amwyQ06XLM= -go.opentelemetry.io/collector/consumer v0.66.1-0.20221128222955-4ff1ff379b90 h1:nzNXVfC1FzXBXCLMzbMv+qK3E4EGiNsnMhfVsBd2yzc= -go.opentelemetry.io/collector/consumer v0.66.1-0.20221128222955-4ff1ff379b90/go.mod h1:WtoRZa5SnxQO1ZEQdVxYpFcXCmq62rakv0oUSlPO0NQ= -go.opentelemetry.io/collector/featuregate v0.66.1-0.20221128222955-4ff1ff379b90 h1:UuJSFWbi9XxyNZsJKZuvpWg35BgRbcCGFH+38V2MAdw= -go.opentelemetry.io/collector/featuregate v0.66.1-0.20221128222955-4ff1ff379b90/go.mod h1:tewuFKJYalWBU0bmNKg++MC1ipINXUr6szYzOw2p1GI= -go.opentelemetry.io/collector/pdata v0.66.1-0.20221128222955-4ff1ff379b90 h1:Vu4S4jSNcd0VFPzxQNO4+UqGwnes1xJDoFLPRiWHm8I= -go.opentelemetry.io/collector/pdata v0.66.1-0.20221128222955-4ff1ff379b90/go.mod h1:pqyaznLzk21m+1KL6fwOsRryRELL+zNM0qiVSn0MbVc= -go.opentelemetry.io/collector/semconv v0.66.1-0.20221128222955-4ff1ff379b90 h1:hFaTA68cggZKWMv7wQ3bKP8KGTbowh/5AQZKCHzHTqM= -go.opentelemetry.io/collector/semconv v0.66.1-0.20221128222955-4ff1ff379b90/go.mod h1:5o9yhOa+ABt7g2E5JABDxGZ1PQPbtfxrKNbYn+LOTXU= +go.opentelemetry.io/collector v0.66.1-0.20221202005155-1c54042beb70 h1:INB2CsOtqqrija2KvMuIpbBQ3qX1BECEeR+d0NJX+oM= +go.opentelemetry.io/collector v0.66.1-0.20221202005155-1c54042beb70/go.mod h1:d0NHkHyANJy3HDTvYE/PoylMShUmFIbiir89ieI0X0c= +go.opentelemetry.io/collector/component v0.66.1-0.20221202005155-1c54042beb70 h1:dEoJhzCmRShgmVro/kXm6pouGElgxkH2DsvanzCeZtU= +go.opentelemetry.io/collector/component v0.66.1-0.20221202005155-1c54042beb70/go.mod h1:OsVnvFFe38QSpcuZlQ8cvarDzcloCexgQ1/B2m80F6U= +go.opentelemetry.io/collector/confmap v0.0.0-20221201172708-2bdff61fa52a h1:2TscCXAQASO2kU9xHcMIUM/FP29fiQIRTilZmliq/7I= +go.opentelemetry.io/collector/confmap v0.0.0-20221201172708-2bdff61fa52a/go.mod h1:qJ3e8bA8h4wz/jYlbeEUafVHdrU7DkpStnmIUAz6VTQ= +go.opentelemetry.io/collector/consumer v0.66.1-0.20221202005155-1c54042beb70 h1:XwpVjI1KeKGPXOZBLefGILMziPYuNf6IzbmiIEsIyI0= +go.opentelemetry.io/collector/consumer v0.66.1-0.20221202005155-1c54042beb70/go.mod h1:EWVBcSGcIcmeDGTnIboc/aqa3agsBeH8/q7yFWG7xVc= +go.opentelemetry.io/collector/featuregate v0.66.1-0.20221202005155-1c54042beb70 h1:V0tf4ebciqIs07jFATfLGdUpLRaEsi+AiWuA/in0G8Y= +go.opentelemetry.io/collector/featuregate v0.66.1-0.20221202005155-1c54042beb70/go.mod h1:tewuFKJYalWBU0bmNKg++MC1ipINXUr6szYzOw2p1GI= +go.opentelemetry.io/collector/pdata v0.66.1-0.20221202005155-1c54042beb70 h1:TPOrxkEMvZzfBSwF3ct+kUUgKA5g8unkZZbKQvJweeA= +go.opentelemetry.io/collector/pdata v0.66.1-0.20221202005155-1c54042beb70/go.mod h1:pqyaznLzk21m+1KL6fwOsRryRELL+zNM0qiVSn0MbVc= +go.opentelemetry.io/collector/semconv v0.66.1-0.20221202005155-1c54042beb70 h1:Q5L9Urod3c8as6ZYaoaqBjarx/HXxsxy34DFZIU2fO4= +go.opentelemetry.io/collector/semconv v0.66.1-0.20221202005155-1c54042beb70/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= @@ -335,8 +337,8 @@ go.uber.org/multierr v1.6.0/go.mod h1:cdWPpRnG4AhwMwsgIHip0KRBQjJy5kYEpYjJxpXp9i go.uber.org/multierr v1.8.0 h1:dg6GjLku4EH+249NNmoIciG9N/jURbDG+pFlTkhzIC8= go.uber.org/multierr v1.8.0/go.mod h1:7EAYxJLBy9rStEaz58O2t4Uvip6FSURkq8/ppBp95ak= go.uber.org/zap v1.17.0/go.mod h1:MXVU+bhUf/A7Xi2HNOnopQOrmycQ5Ih87HtOu4q5SSo= -go.uber.org/zap v1.23.0 h1:OjGQ5KQDEUawVHxNwQgPpiypGHOxo2mNZsOqTak4fFY= -go.uber.org/zap v1.23.0/go.mod h1:D+nX8jyLsMHMYrln8A0rJjFt/T/9/bGgIhAqxv5URuY= +go.uber.org/zap v1.24.0 h1:FiJd5l1UOLj0wCgbSE0rwwXHzEdAZS6hiiSnxJN/D60= +go.uber.org/zap v1.24.0/go.mod h1:2kMP+WWQ8aoFoedH3T2sq6iJ2yDWpHbP0f6MQbS9Gkg= golang.org/x/crypto v0.0.0-20180904163835-0709b304e793/go.mod h1:6SG95UA2DQfeDnfUPMdvaQW0Q7yPrPDi9nlGo2tz2b4= golang.org/x/crypto v0.0.0-20190308221718-c2843e01d9a2/go.mod h1:djNgcEr1/C05ACkg1iLfiJU5Ep61QUkGW8qpdssI0+w= golang.org/x/crypto v0.0.0-20190923035154-9ee001bba392/go.mod h1:/lpIB1dKB+9EgE3H3cr1v9wB50oz8l4C4h62xy7jSTY= diff --git a/exporter/splunkhecexporter/exporter.go b/exporter/splunkhecexporter/exporter.go index c2d5714c9402..fd558397f699 100644 --- a/exporter/splunkhecexporter/exporter.go +++ b/exporter/splunkhecexporter/exporter.go @@ -79,8 +79,7 @@ func createExporter( options, err := config.getOptionsFromConfig() if err != nil { - return nil, - fmt.Errorf("failed to process %q config: %w", config.ID().String(), err) + return nil, err } client, err := buildClient(options, config, logger) diff --git a/exporter/splunkhecexporter/factory.go b/exporter/splunkhecexporter/factory.go index 44cae02c3840..725c990afba9 100644 --- a/exporter/splunkhecexporter/factory.go +++ b/exporter/splunkhecexporter/factory.go @@ -128,7 +128,6 @@ func createMetricsExporter( cfg := config.(*Config) exp, err := createExporter(cfg, set.Logger, &set.BuildInfo) - if err != nil { return nil, err } diff --git a/exporter/splunkhecexporter/factory_test.go b/exporter/splunkhecexporter/factory_test.go index b1bae405e9e0..12be9b0b9fce 100644 --- a/exporter/splunkhecexporter/factory_test.go +++ b/exporter/splunkhecexporter/factory_test.go @@ -145,7 +145,7 @@ func TestFactory_CreateMetricsExporterFails(t *testing.T) { ExporterSettings: config.NewExporterSettings(component.NewID(typeStr)), Token: "token", }, - errorMessage: "failed to process \"splunk_hec\" config: requires a non-empty \"endpoint\"", + errorMessage: "requires a non-empty \"endpoint\"", }, { name: "empty_token", @@ -153,7 +153,7 @@ func TestFactory_CreateMetricsExporterFails(t *testing.T) { ExporterSettings: config.NewExporterSettings(component.NewID(typeStr)), Endpoint: "https://example.com:8000", }, - errorMessage: "failed to process \"splunk_hec\" config: requires a non-empty \"token\"", + errorMessage: "requires a non-empty \"token\"", }, } for _, tt := range tests { diff --git a/exporter/splunkhecexporter/go.mod b/exporter/splunkhecexporter/go.mod index 612f708596aa..de8bc5370604 100644 --- a/exporter/splunkhecexporter/go.mod +++ b/exporter/splunkhecexporter/go.mod @@ -8,13 +8,14 @@ require ( github.com/open-telemetry/opentelemetry-collector-contrib/internal/splunk v0.66.0 github.com/open-telemetry/opentelemetry-collector-contrib/pkg/batchperresourceattr v0.66.0 github.com/stretchr/testify v1.8.1 - go.opentelemetry.io/collector v0.66.1-0.20221128222955-4ff1ff379b90 - go.opentelemetry.io/collector/component v0.66.1-0.20221128222955-4ff1ff379b90 - go.opentelemetry.io/collector/consumer v0.66.1-0.20221128222955-4ff1ff379b90 - go.opentelemetry.io/collector/pdata v0.66.1-0.20221128222955-4ff1ff379b90 - go.opentelemetry.io/collector/semconv v0.66.1-0.20221128222955-4ff1ff379b90 + go.opentelemetry.io/collector v0.66.1-0.20221202005155-1c54042beb70 + go.opentelemetry.io/collector/component v0.66.1-0.20221202005155-1c54042beb70 + go.opentelemetry.io/collector/confmap v0.0.0-20221201172708-2bdff61fa52a + go.opentelemetry.io/collector/consumer v0.66.1-0.20221202005155-1c54042beb70 + go.opentelemetry.io/collector/pdata v0.66.1-0.20221202005155-1c54042beb70 + go.opentelemetry.io/collector/semconv v0.66.1-0.20221202005155-1c54042beb70 go.uber.org/multierr v1.8.0 - go.uber.org/zap v1.23.0 + go.uber.org/zap v1.24.0 ) require ( @@ -33,7 +34,7 @@ require ( github.com/pmezard/go-difflib v1.0.0 // indirect github.com/rogpeppe/go-internal v1.8.1 // indirect go.opencensus.io v0.24.0 // indirect - go.opentelemetry.io/collector/featuregate v0.66.1-0.20221128222955-4ff1ff379b90 // indirect + go.opentelemetry.io/collector/featuregate v0.66.1-0.20221202005155-1c54042beb70 // 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 94024930b762..777d0b5aa136 100644 --- a/exporter/splunkhecexporter/go.sum +++ b/exporter/splunkhecexporter/go.sum @@ -277,18 +277,20 @@ go.etcd.io/etcd/client/pkg/v3 v3.5.4/go.mod h1:IJHfcCEKxYu1Os13ZdwCwIUTUVGYTSAM3 go.etcd.io/etcd/client/v3 v3.5.4/go.mod h1:ZaRkVgBZC+L+dLCjTcF1hRXpgZXQPOvnA/Ak/gq3kiY= go.opencensus.io v0.24.0 h1:y73uSU6J157QMP2kn2r30vwW1A2W2WFwSCGnAVxeaD0= go.opencensus.io v0.24.0/go.mod h1:vNK8G9p7aAivkbmorf4v+7Hgx+Zs0yY+0fOtgBfjQKo= -go.opentelemetry.io/collector v0.66.1-0.20221128222955-4ff1ff379b90 h1:yRe05/jMdzH4TFHfndZ5h2o2hKBK/79W72j8w51qNsI= -go.opentelemetry.io/collector v0.66.1-0.20221128222955-4ff1ff379b90/go.mod h1:hE6jCs+0rfiufCrVPucKZTMwfHit1okfDPnwPT2eW1I= -go.opentelemetry.io/collector/component v0.66.1-0.20221128222955-4ff1ff379b90 h1:AYSNTXbezhNg43EuYdVVcgxE/2gBVrm00FDx4DOmQVg= -go.opentelemetry.io/collector/component v0.66.1-0.20221128222955-4ff1ff379b90/go.mod h1:0c84EqXUhvYe6KW7hJfh76tiI/5yjWCH2amwyQ06XLM= -go.opentelemetry.io/collector/consumer v0.66.1-0.20221128222955-4ff1ff379b90 h1:nzNXVfC1FzXBXCLMzbMv+qK3E4EGiNsnMhfVsBd2yzc= -go.opentelemetry.io/collector/consumer v0.66.1-0.20221128222955-4ff1ff379b90/go.mod h1:WtoRZa5SnxQO1ZEQdVxYpFcXCmq62rakv0oUSlPO0NQ= -go.opentelemetry.io/collector/featuregate v0.66.1-0.20221128222955-4ff1ff379b90 h1:UuJSFWbi9XxyNZsJKZuvpWg35BgRbcCGFH+38V2MAdw= -go.opentelemetry.io/collector/featuregate v0.66.1-0.20221128222955-4ff1ff379b90/go.mod h1:tewuFKJYalWBU0bmNKg++MC1ipINXUr6szYzOw2p1GI= -go.opentelemetry.io/collector/pdata v0.66.1-0.20221128222955-4ff1ff379b90 h1:Vu4S4jSNcd0VFPzxQNO4+UqGwnes1xJDoFLPRiWHm8I= -go.opentelemetry.io/collector/pdata v0.66.1-0.20221128222955-4ff1ff379b90/go.mod h1:pqyaznLzk21m+1KL6fwOsRryRELL+zNM0qiVSn0MbVc= -go.opentelemetry.io/collector/semconv v0.66.1-0.20221128222955-4ff1ff379b90 h1:hFaTA68cggZKWMv7wQ3bKP8KGTbowh/5AQZKCHzHTqM= -go.opentelemetry.io/collector/semconv v0.66.1-0.20221128222955-4ff1ff379b90/go.mod h1:5o9yhOa+ABt7g2E5JABDxGZ1PQPbtfxrKNbYn+LOTXU= +go.opentelemetry.io/collector v0.66.1-0.20221202005155-1c54042beb70 h1:INB2CsOtqqrija2KvMuIpbBQ3qX1BECEeR+d0NJX+oM= +go.opentelemetry.io/collector v0.66.1-0.20221202005155-1c54042beb70/go.mod h1:d0NHkHyANJy3HDTvYE/PoylMShUmFIbiir89ieI0X0c= +go.opentelemetry.io/collector/component v0.66.1-0.20221202005155-1c54042beb70 h1:dEoJhzCmRShgmVro/kXm6pouGElgxkH2DsvanzCeZtU= +go.opentelemetry.io/collector/component v0.66.1-0.20221202005155-1c54042beb70/go.mod h1:OsVnvFFe38QSpcuZlQ8cvarDzcloCexgQ1/B2m80F6U= +go.opentelemetry.io/collector/confmap v0.0.0-20221201172708-2bdff61fa52a h1:2TscCXAQASO2kU9xHcMIUM/FP29fiQIRTilZmliq/7I= +go.opentelemetry.io/collector/confmap v0.0.0-20221201172708-2bdff61fa52a/go.mod h1:qJ3e8bA8h4wz/jYlbeEUafVHdrU7DkpStnmIUAz6VTQ= +go.opentelemetry.io/collector/consumer v0.66.1-0.20221202005155-1c54042beb70 h1:XwpVjI1KeKGPXOZBLefGILMziPYuNf6IzbmiIEsIyI0= +go.opentelemetry.io/collector/consumer v0.66.1-0.20221202005155-1c54042beb70/go.mod h1:EWVBcSGcIcmeDGTnIboc/aqa3agsBeH8/q7yFWG7xVc= +go.opentelemetry.io/collector/featuregate v0.66.1-0.20221202005155-1c54042beb70 h1:V0tf4ebciqIs07jFATfLGdUpLRaEsi+AiWuA/in0G8Y= +go.opentelemetry.io/collector/featuregate v0.66.1-0.20221202005155-1c54042beb70/go.mod h1:tewuFKJYalWBU0bmNKg++MC1ipINXUr6szYzOw2p1GI= +go.opentelemetry.io/collector/pdata v0.66.1-0.20221202005155-1c54042beb70 h1:TPOrxkEMvZzfBSwF3ct+kUUgKA5g8unkZZbKQvJweeA= +go.opentelemetry.io/collector/pdata v0.66.1-0.20221202005155-1c54042beb70/go.mod h1:pqyaznLzk21m+1KL6fwOsRryRELL+zNM0qiVSn0MbVc= +go.opentelemetry.io/collector/semconv v0.66.1-0.20221202005155-1c54042beb70 h1:Q5L9Urod3c8as6ZYaoaqBjarx/HXxsxy34DFZIU2fO4= +go.opentelemetry.io/collector/semconv v0.66.1-0.20221202005155-1c54042beb70/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= @@ -306,8 +308,8 @@ go.uber.org/multierr v1.6.0/go.mod h1:cdWPpRnG4AhwMwsgIHip0KRBQjJy5kYEpYjJxpXp9i go.uber.org/multierr v1.8.0 h1:dg6GjLku4EH+249NNmoIciG9N/jURbDG+pFlTkhzIC8= go.uber.org/multierr v1.8.0/go.mod h1:7EAYxJLBy9rStEaz58O2t4Uvip6FSURkq8/ppBp95ak= go.uber.org/zap v1.17.0/go.mod h1:MXVU+bhUf/A7Xi2HNOnopQOrmycQ5Ih87HtOu4q5SSo= -go.uber.org/zap v1.23.0 h1:OjGQ5KQDEUawVHxNwQgPpiypGHOxo2mNZsOqTak4fFY= -go.uber.org/zap v1.23.0/go.mod h1:D+nX8jyLsMHMYrln8A0rJjFt/T/9/bGgIhAqxv5URuY= +go.uber.org/zap v1.24.0 h1:FiJd5l1UOLj0wCgbSE0rwwXHzEdAZS6hiiSnxJN/D60= +go.uber.org/zap v1.24.0/go.mod h1:2kMP+WWQ8aoFoedH3T2sq6iJ2yDWpHbP0f6MQbS9Gkg= golang.org/x/crypto v0.0.0-20180904163835-0709b304e793/go.mod h1:6SG95UA2DQfeDnfUPMdvaQW0Q7yPrPDi9nlGo2tz2b4= golang.org/x/crypto v0.0.0-20190308221718-c2843e01d9a2/go.mod h1:djNgcEr1/C05ACkg1iLfiJU5Ep61QUkGW8qpdssI0+w= golang.org/x/crypto v0.0.0-20190923035154-9ee001bba392/go.mod h1:/lpIB1dKB+9EgE3H3cr1v9wB50oz8l4C4h62xy7jSTY= diff --git a/exporter/sumologicexporter/go.mod b/exporter/sumologicexporter/go.mod index 1f396c6a286b..bc4f6f2739db 100644 --- a/exporter/sumologicexporter/go.mod +++ b/exporter/sumologicexporter/go.mod @@ -4,10 +4,10 @@ go 1.18 require ( github.com/stretchr/testify v1.8.1 - go.opentelemetry.io/collector v0.66.1-0.20221128222955-4ff1ff379b90 - go.opentelemetry.io/collector/component v0.66.1-0.20221128222955-4ff1ff379b90 - go.opentelemetry.io/collector/consumer v0.66.1-0.20221128222955-4ff1ff379b90 - go.opentelemetry.io/collector/pdata v0.66.1-0.20221128222955-4ff1ff379b90 + go.opentelemetry.io/collector v0.66.1-0.20221202005155-1c54042beb70 + go.opentelemetry.io/collector/component v0.66.1-0.20221202005155-1c54042beb70 + go.opentelemetry.io/collector/consumer v0.66.1-0.20221202005155-1c54042beb70 + go.opentelemetry.io/collector/pdata v0.66.1-0.20221202005155-1c54042beb70 go.uber.org/atomic v1.10.0 go.uber.org/multierr v1.8.0 ) @@ -35,12 +35,13 @@ require ( github.com/pmezard/go-difflib v1.0.0 // indirect github.com/rs/cors v1.8.2 // indirect go.opencensus.io v0.24.0 // indirect - go.opentelemetry.io/collector/featuregate v0.66.1-0.20221128222955-4ff1ff379b90 // indirect + go.opentelemetry.io/collector/confmap v0.0.0-20221201172708-2bdff61fa52a // indirect + go.opentelemetry.io/collector/featuregate v0.66.1-0.20221202005155-1c54042beb70 // 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 go.opentelemetry.io/otel/trace v1.11.1 // indirect - go.uber.org/zap v1.23.0 // indirect + go.uber.org/zap v1.24.0 // indirect golang.org/x/net v0.0.0-20220722155237-a158d28d115b // indirect golang.org/x/sys v0.2.0 // indirect golang.org/x/text v0.4.0 // indirect diff --git a/exporter/sumologicexporter/go.sum b/exporter/sumologicexporter/go.sum index 612d4fe3c8a9..e1beba9cbb46 100644 --- a/exporter/sumologicexporter/go.sum +++ b/exporter/sumologicexporter/go.sum @@ -297,16 +297,18 @@ go.etcd.io/etcd/client/pkg/v3 v3.5.4/go.mod h1:IJHfcCEKxYu1Os13ZdwCwIUTUVGYTSAM3 go.etcd.io/etcd/client/v3 v3.5.4/go.mod h1:ZaRkVgBZC+L+dLCjTcF1hRXpgZXQPOvnA/Ak/gq3kiY= go.opencensus.io v0.24.0 h1:y73uSU6J157QMP2kn2r30vwW1A2W2WFwSCGnAVxeaD0= go.opencensus.io v0.24.0/go.mod h1:vNK8G9p7aAivkbmorf4v+7Hgx+Zs0yY+0fOtgBfjQKo= -go.opentelemetry.io/collector v0.66.1-0.20221128222955-4ff1ff379b90 h1:yRe05/jMdzH4TFHfndZ5h2o2hKBK/79W72j8w51qNsI= -go.opentelemetry.io/collector v0.66.1-0.20221128222955-4ff1ff379b90/go.mod h1:hE6jCs+0rfiufCrVPucKZTMwfHit1okfDPnwPT2eW1I= -go.opentelemetry.io/collector/component v0.66.1-0.20221128222955-4ff1ff379b90 h1:AYSNTXbezhNg43EuYdVVcgxE/2gBVrm00FDx4DOmQVg= -go.opentelemetry.io/collector/component v0.66.1-0.20221128222955-4ff1ff379b90/go.mod h1:0c84EqXUhvYe6KW7hJfh76tiI/5yjWCH2amwyQ06XLM= -go.opentelemetry.io/collector/consumer v0.66.1-0.20221128222955-4ff1ff379b90 h1:nzNXVfC1FzXBXCLMzbMv+qK3E4EGiNsnMhfVsBd2yzc= -go.opentelemetry.io/collector/consumer v0.66.1-0.20221128222955-4ff1ff379b90/go.mod h1:WtoRZa5SnxQO1ZEQdVxYpFcXCmq62rakv0oUSlPO0NQ= -go.opentelemetry.io/collector/featuregate v0.66.1-0.20221128222955-4ff1ff379b90 h1:UuJSFWbi9XxyNZsJKZuvpWg35BgRbcCGFH+38V2MAdw= -go.opentelemetry.io/collector/featuregate v0.66.1-0.20221128222955-4ff1ff379b90/go.mod h1:tewuFKJYalWBU0bmNKg++MC1ipINXUr6szYzOw2p1GI= -go.opentelemetry.io/collector/pdata v0.66.1-0.20221128222955-4ff1ff379b90 h1:Vu4S4jSNcd0VFPzxQNO4+UqGwnes1xJDoFLPRiWHm8I= -go.opentelemetry.io/collector/pdata v0.66.1-0.20221128222955-4ff1ff379b90/go.mod h1:pqyaznLzk21m+1KL6fwOsRryRELL+zNM0qiVSn0MbVc= +go.opentelemetry.io/collector v0.66.1-0.20221202005155-1c54042beb70 h1:INB2CsOtqqrija2KvMuIpbBQ3qX1BECEeR+d0NJX+oM= +go.opentelemetry.io/collector v0.66.1-0.20221202005155-1c54042beb70/go.mod h1:d0NHkHyANJy3HDTvYE/PoylMShUmFIbiir89ieI0X0c= +go.opentelemetry.io/collector/component v0.66.1-0.20221202005155-1c54042beb70 h1:dEoJhzCmRShgmVro/kXm6pouGElgxkH2DsvanzCeZtU= +go.opentelemetry.io/collector/component v0.66.1-0.20221202005155-1c54042beb70/go.mod h1:OsVnvFFe38QSpcuZlQ8cvarDzcloCexgQ1/B2m80F6U= +go.opentelemetry.io/collector/confmap v0.0.0-20221201172708-2bdff61fa52a h1:2TscCXAQASO2kU9xHcMIUM/FP29fiQIRTilZmliq/7I= +go.opentelemetry.io/collector/confmap v0.0.0-20221201172708-2bdff61fa52a/go.mod h1:qJ3e8bA8h4wz/jYlbeEUafVHdrU7DkpStnmIUAz6VTQ= +go.opentelemetry.io/collector/consumer v0.66.1-0.20221202005155-1c54042beb70 h1:XwpVjI1KeKGPXOZBLefGILMziPYuNf6IzbmiIEsIyI0= +go.opentelemetry.io/collector/consumer v0.66.1-0.20221202005155-1c54042beb70/go.mod h1:EWVBcSGcIcmeDGTnIboc/aqa3agsBeH8/q7yFWG7xVc= +go.opentelemetry.io/collector/featuregate v0.66.1-0.20221202005155-1c54042beb70 h1:V0tf4ebciqIs07jFATfLGdUpLRaEsi+AiWuA/in0G8Y= +go.opentelemetry.io/collector/featuregate v0.66.1-0.20221202005155-1c54042beb70/go.mod h1:tewuFKJYalWBU0bmNKg++MC1ipINXUr6szYzOw2p1GI= +go.opentelemetry.io/collector/pdata v0.66.1-0.20221202005155-1c54042beb70 h1:TPOrxkEMvZzfBSwF3ct+kUUgKA5g8unkZZbKQvJweeA= +go.opentelemetry.io/collector/pdata v0.66.1-0.20221202005155-1c54042beb70/go.mod h1:pqyaznLzk21m+1KL6fwOsRryRELL+zNM0qiVSn0MbVc= 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= @@ -327,8 +329,8 @@ go.uber.org/multierr v1.6.0/go.mod h1:cdWPpRnG4AhwMwsgIHip0KRBQjJy5kYEpYjJxpXp9i go.uber.org/multierr v1.8.0 h1:dg6GjLku4EH+249NNmoIciG9N/jURbDG+pFlTkhzIC8= go.uber.org/multierr v1.8.0/go.mod h1:7EAYxJLBy9rStEaz58O2t4Uvip6FSURkq8/ppBp95ak= go.uber.org/zap v1.17.0/go.mod h1:MXVU+bhUf/A7Xi2HNOnopQOrmycQ5Ih87HtOu4q5SSo= -go.uber.org/zap v1.23.0 h1:OjGQ5KQDEUawVHxNwQgPpiypGHOxo2mNZsOqTak4fFY= -go.uber.org/zap v1.23.0/go.mod h1:D+nX8jyLsMHMYrln8A0rJjFt/T/9/bGgIhAqxv5URuY= +go.uber.org/zap v1.24.0 h1:FiJd5l1UOLj0wCgbSE0rwwXHzEdAZS6hiiSnxJN/D60= +go.uber.org/zap v1.24.0/go.mod h1:2kMP+WWQ8aoFoedH3T2sq6iJ2yDWpHbP0f6MQbS9Gkg= golang.org/x/crypto v0.0.0-20180904163835-0709b304e793/go.mod h1:6SG95UA2DQfeDnfUPMdvaQW0Q7yPrPDi9nlGo2tz2b4= golang.org/x/crypto v0.0.0-20190308221718-c2843e01d9a2/go.mod h1:djNgcEr1/C05ACkg1iLfiJU5Ep61QUkGW8qpdssI0+w= golang.org/x/crypto v0.0.0-20190923035154-9ee001bba392/go.mod h1:/lpIB1dKB+9EgE3H3cr1v9wB50oz8l4C4h62xy7jSTY= diff --git a/exporter/tanzuobservabilityexporter/go.mod b/exporter/tanzuobservabilityexporter/go.mod index 225b6533851b..7a3da8a30dfa 100644 --- a/exporter/tanzuobservabilityexporter/go.mod +++ b/exporter/tanzuobservabilityexporter/go.mod @@ -7,13 +7,13 @@ require ( github.com/open-telemetry/opentelemetry-collector-contrib/internal/coreinternal v0.66.0 github.com/stretchr/testify v1.8.1 github.com/wavefronthq/wavefront-sdk-go v0.10.4 - go.opentelemetry.io/collector v0.66.1-0.20221128222955-4ff1ff379b90 - go.opentelemetry.io/collector/component v0.66.1-0.20221128222955-4ff1ff379b90 - go.opentelemetry.io/collector/pdata v0.66.1-0.20221128222955-4ff1ff379b90 - go.opentelemetry.io/collector/semconv v0.66.1-0.20221128222955-4ff1ff379b90 + go.opentelemetry.io/collector v0.66.1-0.20221202005155-1c54042beb70 + go.opentelemetry.io/collector/component v0.66.1-0.20221202005155-1c54042beb70 + go.opentelemetry.io/collector/pdata v0.66.1-0.20221202005155-1c54042beb70 + go.opentelemetry.io/collector/semconv v0.66.1-0.20221202005155-1c54042beb70 go.uber.org/atomic v1.10.0 go.uber.org/multierr v1.8.0 - go.uber.org/zap v1.23.0 + go.uber.org/zap v1.24.0 ) require ( @@ -57,13 +57,14 @@ require ( github.com/shirou/gopsutil/v3 v3.22.10 // indirect github.com/spf13/cobra v1.6.1 // indirect github.com/spf13/pflag v1.0.5 // indirect - github.com/tklauser/go-sysconf v0.3.10 // indirect - github.com/tklauser/numcpus v0.4.0 // indirect + github.com/tklauser/go-sysconf v0.3.11 // indirect + github.com/tklauser/numcpus v0.6.0 // indirect github.com/yusufpapurcu/wmi v1.2.2 // indirect go.opencensus.io v0.24.0 // indirect - go.opentelemetry.io/collector/consumer v0.66.1-0.20221128222955-4ff1ff379b90 // indirect - go.opentelemetry.io/collector/featuregate v0.66.1-0.20221128222955-4ff1ff379b90 // indirect - go.opentelemetry.io/collector/processor/batchprocessor v0.66.1-0.20221128222955-4ff1ff379b90 // indirect + go.opentelemetry.io/collector/confmap v0.0.0-20221201172708-2bdff61fa52a // indirect + go.opentelemetry.io/collector/consumer v0.66.1-0.20221202005155-1c54042beb70 // indirect + go.opentelemetry.io/collector/featuregate v0.66.1-0.20221202005155-1c54042beb70 // indirect + go.opentelemetry.io/collector/processor/batchprocessor v0.66.1-0.20221202005155-1c54042beb70 // indirect go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.36.4 // indirect go.opentelemetry.io/contrib/propagators/b3 v1.11.1 // indirect go.opentelemetry.io/otel v1.11.1 // indirect diff --git a/exporter/tanzuobservabilityexporter/go.sum b/exporter/tanzuobservabilityexporter/go.sum index 19d710dfdbec..23d0787cccb9 100644 --- a/exporter/tanzuobservabilityexporter/go.sum +++ b/exporter/tanzuobservabilityexporter/go.sum @@ -387,10 +387,12 @@ github.com/stretchr/testify v1.8.0/go.mod h1:yNjHg4UonilssWZ8iaSj1OCr/vHnekPRkoO github.com/stretchr/testify v1.8.1 h1:w7B6lhMri9wdJUVmEZPGGhZzrYTPvgJArz7wNPgYKsk= github.com/stretchr/testify v1.8.1/go.mod h1:w2LPCIKwWwSfY2zedu0+kehJoqGctiVI29o6fzry7u4= github.com/stvp/go-udp-testing v0.0.0-20201019212854-469649b16807/go.mod h1:7jxmlfBCDBXRzr0eAQJ48XC1hBu1np4CS5+cHEYfwpc= -github.com/tklauser/go-sysconf v0.3.10 h1:IJ1AZGZRWbY8T5Vfk04D9WOA5WSejdflXxP03OUqALw= github.com/tklauser/go-sysconf v0.3.10/go.mod h1:C8XykCvCb+Gn0oNCWPIlcb0RuglQTYaQ2hGm7jmxEFk= -github.com/tklauser/numcpus v0.4.0 h1:E53Dm1HjH1/R2/aoCtXtPgzmElmn51aOkhCFSuZq//o= +github.com/tklauser/go-sysconf v0.3.11 h1:89WgdJhk5SNwJfu+GKyYveZ4IaJ7xAkecBo+KdJV0CM= +github.com/tklauser/go-sysconf v0.3.11/go.mod h1:GqXfhXY3kiPa0nAXPDIQIWzJbMCB7AmcWpGR8lSZfqI= github.com/tklauser/numcpus v0.4.0/go.mod h1:1+UI3pD8NW14VMwdgJNJ1ESk2UnwhAnz5hMwiKKqXCQ= +github.com/tklauser/numcpus v0.6.0 h1:kebhY2Qt+3U6RNK7UqpYNA+tJ23IBEGKkB7JQBfDYms= +github.com/tklauser/numcpus v0.6.0/go.mod h1:FEZLMke0lhOUG6w2JadTzp0a+Nl8PF/GFkQ5UVIcaL4= github.com/wavefronthq/wavefront-sdk-go v0.10.4 h1:O8jNBlz21GUDN12YiEFwJWRs25C2zTGt1HEf2I2cs+g= github.com/wavefronthq/wavefront-sdk-go v0.10.4/go.mod h1:oKJ9Y0y36n+szFm2NiivXI+UubZe3lwfWnN1p+mFNDw= github.com/yuin/goldmark v1.1.25/go.mod h1:3hX8gzYuyVAZsxl0MRgGTJEmQBFcNTphYh9decYSb74= @@ -411,21 +413,23 @@ go.opencensus.io v0.22.4/go.mod h1:yxeiOL68Rb0Xd1ddK5vPZ/oVn4vY4Ynel7k9FzqtOIw= go.opencensus.io v0.23.0/go.mod h1:XItmlyltB5F7CS4xOC1DcqMoFqwtC6OG2xF7mCv7P7E= go.opencensus.io v0.24.0 h1:y73uSU6J157QMP2kn2r30vwW1A2W2WFwSCGnAVxeaD0= go.opencensus.io v0.24.0/go.mod h1:vNK8G9p7aAivkbmorf4v+7Hgx+Zs0yY+0fOtgBfjQKo= -go.opentelemetry.io/collector v0.66.1-0.20221128222955-4ff1ff379b90 h1:yRe05/jMdzH4TFHfndZ5h2o2hKBK/79W72j8w51qNsI= -go.opentelemetry.io/collector v0.66.1-0.20221128222955-4ff1ff379b90/go.mod h1:hE6jCs+0rfiufCrVPucKZTMwfHit1okfDPnwPT2eW1I= -go.opentelemetry.io/collector/component v0.66.1-0.20221128222955-4ff1ff379b90 h1:AYSNTXbezhNg43EuYdVVcgxE/2gBVrm00FDx4DOmQVg= -go.opentelemetry.io/collector/component v0.66.1-0.20221128222955-4ff1ff379b90/go.mod h1:0c84EqXUhvYe6KW7hJfh76tiI/5yjWCH2amwyQ06XLM= -go.opentelemetry.io/collector/consumer v0.66.1-0.20221128222955-4ff1ff379b90 h1:nzNXVfC1FzXBXCLMzbMv+qK3E4EGiNsnMhfVsBd2yzc= -go.opentelemetry.io/collector/consumer v0.66.1-0.20221128222955-4ff1ff379b90/go.mod h1:WtoRZa5SnxQO1ZEQdVxYpFcXCmq62rakv0oUSlPO0NQ= -go.opentelemetry.io/collector/extension/zpagesextension v0.65.0 h1:T5JJIJ3cmClqdSMgkbjoIiP9p059AAvbfcd3houJkxM= -go.opentelemetry.io/collector/featuregate v0.66.1-0.20221128222955-4ff1ff379b90 h1:UuJSFWbi9XxyNZsJKZuvpWg35BgRbcCGFH+38V2MAdw= -go.opentelemetry.io/collector/featuregate v0.66.1-0.20221128222955-4ff1ff379b90/go.mod h1:tewuFKJYalWBU0bmNKg++MC1ipINXUr6szYzOw2p1GI= -go.opentelemetry.io/collector/pdata v0.66.1-0.20221128222955-4ff1ff379b90 h1:Vu4S4jSNcd0VFPzxQNO4+UqGwnes1xJDoFLPRiWHm8I= -go.opentelemetry.io/collector/pdata v0.66.1-0.20221128222955-4ff1ff379b90/go.mod h1:pqyaznLzk21m+1KL6fwOsRryRELL+zNM0qiVSn0MbVc= -go.opentelemetry.io/collector/processor/batchprocessor v0.66.1-0.20221128222955-4ff1ff379b90 h1:K12L9juzjChBMfp7cQaQsToz7i7975tUYVzJ3Tpw/Cw= -go.opentelemetry.io/collector/processor/batchprocessor v0.66.1-0.20221128222955-4ff1ff379b90/go.mod h1:XhGTsC1B/bq4gpg8IZ/QYBLXkzE4Gw3r7Xu2+ik8A1Q= -go.opentelemetry.io/collector/semconv v0.66.1-0.20221128222955-4ff1ff379b90 h1:hFaTA68cggZKWMv7wQ3bKP8KGTbowh/5AQZKCHzHTqM= -go.opentelemetry.io/collector/semconv v0.66.1-0.20221128222955-4ff1ff379b90/go.mod h1:5o9yhOa+ABt7g2E5JABDxGZ1PQPbtfxrKNbYn+LOTXU= +go.opentelemetry.io/collector v0.66.1-0.20221202005155-1c54042beb70 h1:INB2CsOtqqrija2KvMuIpbBQ3qX1BECEeR+d0NJX+oM= +go.opentelemetry.io/collector v0.66.1-0.20221202005155-1c54042beb70/go.mod h1:d0NHkHyANJy3HDTvYE/PoylMShUmFIbiir89ieI0X0c= +go.opentelemetry.io/collector/component v0.66.1-0.20221202005155-1c54042beb70 h1:dEoJhzCmRShgmVro/kXm6pouGElgxkH2DsvanzCeZtU= +go.opentelemetry.io/collector/component v0.66.1-0.20221202005155-1c54042beb70/go.mod h1:OsVnvFFe38QSpcuZlQ8cvarDzcloCexgQ1/B2m80F6U= +go.opentelemetry.io/collector/confmap v0.0.0-20221201172708-2bdff61fa52a h1:2TscCXAQASO2kU9xHcMIUM/FP29fiQIRTilZmliq/7I= +go.opentelemetry.io/collector/confmap v0.0.0-20221201172708-2bdff61fa52a/go.mod h1:qJ3e8bA8h4wz/jYlbeEUafVHdrU7DkpStnmIUAz6VTQ= +go.opentelemetry.io/collector/consumer v0.66.1-0.20221202005155-1c54042beb70 h1:XwpVjI1KeKGPXOZBLefGILMziPYuNf6IzbmiIEsIyI0= +go.opentelemetry.io/collector/consumer v0.66.1-0.20221202005155-1c54042beb70/go.mod h1:EWVBcSGcIcmeDGTnIboc/aqa3agsBeH8/q7yFWG7xVc= +go.opentelemetry.io/collector/extension/zpagesextension v0.66.0 h1:tPqSKH5K3VhTT0XXVoWL3woWBSTJqnXZQRt0ZLSCoCc= +go.opentelemetry.io/collector/featuregate v0.66.1-0.20221202005155-1c54042beb70 h1:V0tf4ebciqIs07jFATfLGdUpLRaEsi+AiWuA/in0G8Y= +go.opentelemetry.io/collector/featuregate v0.66.1-0.20221202005155-1c54042beb70/go.mod h1:tewuFKJYalWBU0bmNKg++MC1ipINXUr6szYzOw2p1GI= +go.opentelemetry.io/collector/pdata v0.66.1-0.20221202005155-1c54042beb70 h1:TPOrxkEMvZzfBSwF3ct+kUUgKA5g8unkZZbKQvJweeA= +go.opentelemetry.io/collector/pdata v0.66.1-0.20221202005155-1c54042beb70/go.mod h1:pqyaznLzk21m+1KL6fwOsRryRELL+zNM0qiVSn0MbVc= +go.opentelemetry.io/collector/processor/batchprocessor v0.66.1-0.20221202005155-1c54042beb70 h1:Y4e8NnVevonnAgmjX9Z7QIMA32yMqHAOnAlh8SzTS8c= +go.opentelemetry.io/collector/processor/batchprocessor v0.66.1-0.20221202005155-1c54042beb70/go.mod h1:Pi1CsKDQFoDrUP1i3+VdE6s2Xuji7bOGFBgqHK0J32E= +go.opentelemetry.io/collector/semconv v0.66.1-0.20221202005155-1c54042beb70 h1:Q5L9Urod3c8as6ZYaoaqBjarx/HXxsxy34DFZIU2fO4= +go.opentelemetry.io/collector/semconv v0.66.1-0.20221202005155-1c54042beb70/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= @@ -451,8 +455,8 @@ go.uber.org/multierr v1.6.0/go.mod h1:cdWPpRnG4AhwMwsgIHip0KRBQjJy5kYEpYjJxpXp9i go.uber.org/multierr v1.8.0 h1:dg6GjLku4EH+249NNmoIciG9N/jURbDG+pFlTkhzIC8= go.uber.org/multierr v1.8.0/go.mod h1:7EAYxJLBy9rStEaz58O2t4Uvip6FSURkq8/ppBp95ak= go.uber.org/zap v1.17.0/go.mod h1:MXVU+bhUf/A7Xi2HNOnopQOrmycQ5Ih87HtOu4q5SSo= -go.uber.org/zap v1.23.0 h1:OjGQ5KQDEUawVHxNwQgPpiypGHOxo2mNZsOqTak4fFY= -go.uber.org/zap v1.23.0/go.mod h1:D+nX8jyLsMHMYrln8A0rJjFt/T/9/bGgIhAqxv5URuY= +go.uber.org/zap v1.24.0 h1:FiJd5l1UOLj0wCgbSE0rwwXHzEdAZS6hiiSnxJN/D60= +go.uber.org/zap v1.24.0/go.mod h1:2kMP+WWQ8aoFoedH3T2sq6iJ2yDWpHbP0f6MQbS9Gkg= golang.org/x/crypto v0.0.0-20180904163835-0709b304e793/go.mod h1:6SG95UA2DQfeDnfUPMdvaQW0Q7yPrPDi9nlGo2tz2b4= golang.org/x/crypto v0.0.0-20190308221718-c2843e01d9a2/go.mod h1:djNgcEr1/C05ACkg1iLfiJU5Ep61QUkGW8qpdssI0+w= golang.org/x/crypto v0.0.0-20190510104115-cbcb75029529/go.mod h1:yigFU9vqHzYiE8UmvKecakEJjdnWj3jj499lnFckfCI= diff --git a/exporter/tencentcloudlogserviceexporter/go.mod b/exporter/tencentcloudlogserviceexporter/go.mod index bb5316a098d9..4e8d16236d29 100644 --- a/exporter/tencentcloudlogserviceexporter/go.mod +++ b/exporter/tencentcloudlogserviceexporter/go.mod @@ -7,11 +7,12 @@ require ( github.com/pierrec/lz4 v2.6.1+incompatible github.com/stretchr/testify v1.8.1 github.com/tencentcloud/tencentcloud-sdk-go/tencentcloud/common v1.0.532 - go.opentelemetry.io/collector v0.66.1-0.20221128222955-4ff1ff379b90 - go.opentelemetry.io/collector/component v0.66.1-0.20221128222955-4ff1ff379b90 - go.opentelemetry.io/collector/pdata v0.66.1-0.20221128222955-4ff1ff379b90 - go.opentelemetry.io/collector/semconv v0.66.1-0.20221128222955-4ff1ff379b90 - go.uber.org/zap v1.23.0 + go.opentelemetry.io/collector v0.66.1-0.20221202005155-1c54042beb70 + go.opentelemetry.io/collector/component v0.66.1-0.20221202005155-1c54042beb70 + go.opentelemetry.io/collector/confmap v0.0.0-20221201172708-2bdff61fa52a + go.opentelemetry.io/collector/pdata v0.66.1-0.20221202005155-1c54042beb70 + go.opentelemetry.io/collector/semconv v0.66.1-0.20221202005155-1c54042beb70 + go.uber.org/zap v1.24.0 google.golang.org/protobuf v1.28.1 ) @@ -30,8 +31,8 @@ require ( github.com/modern-go/reflect2 v1.0.2 // indirect github.com/pmezard/go-difflib v1.0.0 // indirect go.opencensus.io v0.24.0 // indirect - go.opentelemetry.io/collector/consumer v0.66.1-0.20221128222955-4ff1ff379b90 // indirect - go.opentelemetry.io/collector/featuregate v0.66.1-0.20221128222955-4ff1ff379b90 // indirect + go.opentelemetry.io/collector/consumer v0.66.1-0.20221202005155-1c54042beb70 // indirect + go.opentelemetry.io/collector/featuregate v0.66.1-0.20221202005155-1c54042beb70 // 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 008dc1911636..d786d5f17eb3 100644 --- a/exporter/tencentcloudlogserviceexporter/go.sum +++ b/exporter/tencentcloudlogserviceexporter/go.sum @@ -282,18 +282,20 @@ go.etcd.io/etcd/client/pkg/v3 v3.5.4/go.mod h1:IJHfcCEKxYu1Os13ZdwCwIUTUVGYTSAM3 go.etcd.io/etcd/client/v3 v3.5.4/go.mod h1:ZaRkVgBZC+L+dLCjTcF1hRXpgZXQPOvnA/Ak/gq3kiY= go.opencensus.io v0.24.0 h1:y73uSU6J157QMP2kn2r30vwW1A2W2WFwSCGnAVxeaD0= go.opencensus.io v0.24.0/go.mod h1:vNK8G9p7aAivkbmorf4v+7Hgx+Zs0yY+0fOtgBfjQKo= -go.opentelemetry.io/collector v0.66.1-0.20221128222955-4ff1ff379b90 h1:yRe05/jMdzH4TFHfndZ5h2o2hKBK/79W72j8w51qNsI= -go.opentelemetry.io/collector v0.66.1-0.20221128222955-4ff1ff379b90/go.mod h1:hE6jCs+0rfiufCrVPucKZTMwfHit1okfDPnwPT2eW1I= -go.opentelemetry.io/collector/component v0.66.1-0.20221128222955-4ff1ff379b90 h1:AYSNTXbezhNg43EuYdVVcgxE/2gBVrm00FDx4DOmQVg= -go.opentelemetry.io/collector/component v0.66.1-0.20221128222955-4ff1ff379b90/go.mod h1:0c84EqXUhvYe6KW7hJfh76tiI/5yjWCH2amwyQ06XLM= -go.opentelemetry.io/collector/consumer v0.66.1-0.20221128222955-4ff1ff379b90 h1:nzNXVfC1FzXBXCLMzbMv+qK3E4EGiNsnMhfVsBd2yzc= -go.opentelemetry.io/collector/consumer v0.66.1-0.20221128222955-4ff1ff379b90/go.mod h1:WtoRZa5SnxQO1ZEQdVxYpFcXCmq62rakv0oUSlPO0NQ= -go.opentelemetry.io/collector/featuregate v0.66.1-0.20221128222955-4ff1ff379b90 h1:UuJSFWbi9XxyNZsJKZuvpWg35BgRbcCGFH+38V2MAdw= -go.opentelemetry.io/collector/featuregate v0.66.1-0.20221128222955-4ff1ff379b90/go.mod h1:tewuFKJYalWBU0bmNKg++MC1ipINXUr6szYzOw2p1GI= -go.opentelemetry.io/collector/pdata v0.66.1-0.20221128222955-4ff1ff379b90 h1:Vu4S4jSNcd0VFPzxQNO4+UqGwnes1xJDoFLPRiWHm8I= -go.opentelemetry.io/collector/pdata v0.66.1-0.20221128222955-4ff1ff379b90/go.mod h1:pqyaznLzk21m+1KL6fwOsRryRELL+zNM0qiVSn0MbVc= -go.opentelemetry.io/collector/semconv v0.66.1-0.20221128222955-4ff1ff379b90 h1:hFaTA68cggZKWMv7wQ3bKP8KGTbowh/5AQZKCHzHTqM= -go.opentelemetry.io/collector/semconv v0.66.1-0.20221128222955-4ff1ff379b90/go.mod h1:5o9yhOa+ABt7g2E5JABDxGZ1PQPbtfxrKNbYn+LOTXU= +go.opentelemetry.io/collector v0.66.1-0.20221202005155-1c54042beb70 h1:INB2CsOtqqrija2KvMuIpbBQ3qX1BECEeR+d0NJX+oM= +go.opentelemetry.io/collector v0.66.1-0.20221202005155-1c54042beb70/go.mod h1:d0NHkHyANJy3HDTvYE/PoylMShUmFIbiir89ieI0X0c= +go.opentelemetry.io/collector/component v0.66.1-0.20221202005155-1c54042beb70 h1:dEoJhzCmRShgmVro/kXm6pouGElgxkH2DsvanzCeZtU= +go.opentelemetry.io/collector/component v0.66.1-0.20221202005155-1c54042beb70/go.mod h1:OsVnvFFe38QSpcuZlQ8cvarDzcloCexgQ1/B2m80F6U= +go.opentelemetry.io/collector/confmap v0.0.0-20221201172708-2bdff61fa52a h1:2TscCXAQASO2kU9xHcMIUM/FP29fiQIRTilZmliq/7I= +go.opentelemetry.io/collector/confmap v0.0.0-20221201172708-2bdff61fa52a/go.mod h1:qJ3e8bA8h4wz/jYlbeEUafVHdrU7DkpStnmIUAz6VTQ= +go.opentelemetry.io/collector/consumer v0.66.1-0.20221202005155-1c54042beb70 h1:XwpVjI1KeKGPXOZBLefGILMziPYuNf6IzbmiIEsIyI0= +go.opentelemetry.io/collector/consumer v0.66.1-0.20221202005155-1c54042beb70/go.mod h1:EWVBcSGcIcmeDGTnIboc/aqa3agsBeH8/q7yFWG7xVc= +go.opentelemetry.io/collector/featuregate v0.66.1-0.20221202005155-1c54042beb70 h1:V0tf4ebciqIs07jFATfLGdUpLRaEsi+AiWuA/in0G8Y= +go.opentelemetry.io/collector/featuregate v0.66.1-0.20221202005155-1c54042beb70/go.mod h1:tewuFKJYalWBU0bmNKg++MC1ipINXUr6szYzOw2p1GI= +go.opentelemetry.io/collector/pdata v0.66.1-0.20221202005155-1c54042beb70 h1:TPOrxkEMvZzfBSwF3ct+kUUgKA5g8unkZZbKQvJweeA= +go.opentelemetry.io/collector/pdata v0.66.1-0.20221202005155-1c54042beb70/go.mod h1:pqyaznLzk21m+1KL6fwOsRryRELL+zNM0qiVSn0MbVc= +go.opentelemetry.io/collector/semconv v0.66.1-0.20221202005155-1c54042beb70 h1:Q5L9Urod3c8as6ZYaoaqBjarx/HXxsxy34DFZIU2fO4= +go.opentelemetry.io/collector/semconv v0.66.1-0.20221202005155-1c54042beb70/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= @@ -311,8 +313,8 @@ go.uber.org/multierr v1.6.0/go.mod h1:cdWPpRnG4AhwMwsgIHip0KRBQjJy5kYEpYjJxpXp9i go.uber.org/multierr v1.8.0 h1:dg6GjLku4EH+249NNmoIciG9N/jURbDG+pFlTkhzIC8= go.uber.org/multierr v1.8.0/go.mod h1:7EAYxJLBy9rStEaz58O2t4Uvip6FSURkq8/ppBp95ak= go.uber.org/zap v1.17.0/go.mod h1:MXVU+bhUf/A7Xi2HNOnopQOrmycQ5Ih87HtOu4q5SSo= -go.uber.org/zap v1.23.0 h1:OjGQ5KQDEUawVHxNwQgPpiypGHOxo2mNZsOqTak4fFY= -go.uber.org/zap v1.23.0/go.mod h1:D+nX8jyLsMHMYrln8A0rJjFt/T/9/bGgIhAqxv5URuY= +go.uber.org/zap v1.24.0 h1:FiJd5l1UOLj0wCgbSE0rwwXHzEdAZS6hiiSnxJN/D60= +go.uber.org/zap v1.24.0/go.mod h1:2kMP+WWQ8aoFoedH3T2sq6iJ2yDWpHbP0f6MQbS9Gkg= golang.org/x/crypto v0.0.0-20180904163835-0709b304e793/go.mod h1:6SG95UA2DQfeDnfUPMdvaQW0Q7yPrPDi9nlGo2tz2b4= golang.org/x/crypto v0.0.0-20190308221718-c2843e01d9a2/go.mod h1:djNgcEr1/C05ACkg1iLfiJU5Ep61QUkGW8qpdssI0+w= golang.org/x/crypto v0.0.0-20190923035154-9ee001bba392/go.mod h1:/lpIB1dKB+9EgE3H3cr1v9wB50oz8l4C4h62xy7jSTY= diff --git a/exporter/zipkinexporter/go.mod b/exporter/zipkinexporter/go.mod index c5802d6be5bb..71a46af21300 100644 --- a/exporter/zipkinexporter/go.mod +++ b/exporter/zipkinexporter/go.mod @@ -8,10 +8,11 @@ require ( github.com/open-telemetry/opentelemetry-collector-contrib/receiver/zipkinreceiver v0.66.0 github.com/openzipkin/zipkin-go v0.4.1 github.com/stretchr/testify v1.8.1 - go.opentelemetry.io/collector v0.66.1-0.20221128222955-4ff1ff379b90 - go.opentelemetry.io/collector/component v0.66.1-0.20221128222955-4ff1ff379b90 - go.opentelemetry.io/collector/consumer v0.66.1-0.20221128222955-4ff1ff379b90 - go.opentelemetry.io/collector/pdata v0.66.1-0.20221128222955-4ff1ff379b90 + go.opentelemetry.io/collector v0.66.1-0.20221202005155-1c54042beb70 + go.opentelemetry.io/collector/component v0.66.1-0.20221202005155-1c54042beb70 + go.opentelemetry.io/collector/confmap v0.0.0-20221201172708-2bdff61fa52a + go.opentelemetry.io/collector/consumer v0.66.1-0.20221202005155-1c54042beb70 + go.opentelemetry.io/collector/pdata v0.66.1-0.20221202005155-1c54042beb70 ) require ( @@ -40,15 +41,15 @@ require ( github.com/uber/jaeger-client-go v2.30.0+incompatible // indirect github.com/uber/jaeger-lib v2.4.1+incompatible // indirect go.opencensus.io v0.24.0 // indirect - go.opentelemetry.io/collector/featuregate v0.66.1-0.20221128222955-4ff1ff379b90 // indirect - go.opentelemetry.io/collector/semconv v0.66.1-0.20221128222955-4ff1ff379b90 // indirect + go.opentelemetry.io/collector/featuregate v0.66.1-0.20221202005155-1c54042beb70 // indirect + go.opentelemetry.io/collector/semconv v0.66.1-0.20221202005155-1c54042beb70 // 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 go.opentelemetry.io/otel/trace v1.11.1 // indirect go.uber.org/atomic v1.10.0 // indirect go.uber.org/multierr v1.8.0 // indirect - go.uber.org/zap v1.23.0 // indirect + go.uber.org/zap v1.24.0 // indirect golang.org/x/net v0.0.0-20221014081412-f15817d10f9b // indirect golang.org/x/sys v0.2.0 // indirect golang.org/x/text v0.4.0 // indirect diff --git a/exporter/zipkinexporter/go.sum b/exporter/zipkinexporter/go.sum index 33cc845d77db..812683019ebd 100644 --- a/exporter/zipkinexporter/go.sum +++ b/exporter/zipkinexporter/go.sum @@ -298,18 +298,20 @@ go.etcd.io/etcd/client/pkg/v3 v3.5.4/go.mod h1:IJHfcCEKxYu1Os13ZdwCwIUTUVGYTSAM3 go.etcd.io/etcd/client/v3 v3.5.4/go.mod h1:ZaRkVgBZC+L+dLCjTcF1hRXpgZXQPOvnA/Ak/gq3kiY= go.opencensus.io v0.24.0 h1:y73uSU6J157QMP2kn2r30vwW1A2W2WFwSCGnAVxeaD0= go.opencensus.io v0.24.0/go.mod h1:vNK8G9p7aAivkbmorf4v+7Hgx+Zs0yY+0fOtgBfjQKo= -go.opentelemetry.io/collector v0.66.1-0.20221128222955-4ff1ff379b90 h1:yRe05/jMdzH4TFHfndZ5h2o2hKBK/79W72j8w51qNsI= -go.opentelemetry.io/collector v0.66.1-0.20221128222955-4ff1ff379b90/go.mod h1:hE6jCs+0rfiufCrVPucKZTMwfHit1okfDPnwPT2eW1I= -go.opentelemetry.io/collector/component v0.66.1-0.20221128222955-4ff1ff379b90 h1:AYSNTXbezhNg43EuYdVVcgxE/2gBVrm00FDx4DOmQVg= -go.opentelemetry.io/collector/component v0.66.1-0.20221128222955-4ff1ff379b90/go.mod h1:0c84EqXUhvYe6KW7hJfh76tiI/5yjWCH2amwyQ06XLM= -go.opentelemetry.io/collector/consumer v0.66.1-0.20221128222955-4ff1ff379b90 h1:nzNXVfC1FzXBXCLMzbMv+qK3E4EGiNsnMhfVsBd2yzc= -go.opentelemetry.io/collector/consumer v0.66.1-0.20221128222955-4ff1ff379b90/go.mod h1:WtoRZa5SnxQO1ZEQdVxYpFcXCmq62rakv0oUSlPO0NQ= -go.opentelemetry.io/collector/featuregate v0.66.1-0.20221128222955-4ff1ff379b90 h1:UuJSFWbi9XxyNZsJKZuvpWg35BgRbcCGFH+38V2MAdw= -go.opentelemetry.io/collector/featuregate v0.66.1-0.20221128222955-4ff1ff379b90/go.mod h1:tewuFKJYalWBU0bmNKg++MC1ipINXUr6szYzOw2p1GI= -go.opentelemetry.io/collector/pdata v0.66.1-0.20221128222955-4ff1ff379b90 h1:Vu4S4jSNcd0VFPzxQNO4+UqGwnes1xJDoFLPRiWHm8I= -go.opentelemetry.io/collector/pdata v0.66.1-0.20221128222955-4ff1ff379b90/go.mod h1:pqyaznLzk21m+1KL6fwOsRryRELL+zNM0qiVSn0MbVc= -go.opentelemetry.io/collector/semconv v0.66.1-0.20221128222955-4ff1ff379b90 h1:hFaTA68cggZKWMv7wQ3bKP8KGTbowh/5AQZKCHzHTqM= -go.opentelemetry.io/collector/semconv v0.66.1-0.20221128222955-4ff1ff379b90/go.mod h1:5o9yhOa+ABt7g2E5JABDxGZ1PQPbtfxrKNbYn+LOTXU= +go.opentelemetry.io/collector v0.66.1-0.20221202005155-1c54042beb70 h1:INB2CsOtqqrija2KvMuIpbBQ3qX1BECEeR+d0NJX+oM= +go.opentelemetry.io/collector v0.66.1-0.20221202005155-1c54042beb70/go.mod h1:d0NHkHyANJy3HDTvYE/PoylMShUmFIbiir89ieI0X0c= +go.opentelemetry.io/collector/component v0.66.1-0.20221202005155-1c54042beb70 h1:dEoJhzCmRShgmVro/kXm6pouGElgxkH2DsvanzCeZtU= +go.opentelemetry.io/collector/component v0.66.1-0.20221202005155-1c54042beb70/go.mod h1:OsVnvFFe38QSpcuZlQ8cvarDzcloCexgQ1/B2m80F6U= +go.opentelemetry.io/collector/confmap v0.0.0-20221201172708-2bdff61fa52a h1:2TscCXAQASO2kU9xHcMIUM/FP29fiQIRTilZmliq/7I= +go.opentelemetry.io/collector/confmap v0.0.0-20221201172708-2bdff61fa52a/go.mod h1:qJ3e8bA8h4wz/jYlbeEUafVHdrU7DkpStnmIUAz6VTQ= +go.opentelemetry.io/collector/consumer v0.66.1-0.20221202005155-1c54042beb70 h1:XwpVjI1KeKGPXOZBLefGILMziPYuNf6IzbmiIEsIyI0= +go.opentelemetry.io/collector/consumer v0.66.1-0.20221202005155-1c54042beb70/go.mod h1:EWVBcSGcIcmeDGTnIboc/aqa3agsBeH8/q7yFWG7xVc= +go.opentelemetry.io/collector/featuregate v0.66.1-0.20221202005155-1c54042beb70 h1:V0tf4ebciqIs07jFATfLGdUpLRaEsi+AiWuA/in0G8Y= +go.opentelemetry.io/collector/featuregate v0.66.1-0.20221202005155-1c54042beb70/go.mod h1:tewuFKJYalWBU0bmNKg++MC1ipINXUr6szYzOw2p1GI= +go.opentelemetry.io/collector/pdata v0.66.1-0.20221202005155-1c54042beb70 h1:TPOrxkEMvZzfBSwF3ct+kUUgKA5g8unkZZbKQvJweeA= +go.opentelemetry.io/collector/pdata v0.66.1-0.20221202005155-1c54042beb70/go.mod h1:pqyaznLzk21m+1KL6fwOsRryRELL+zNM0qiVSn0MbVc= +go.opentelemetry.io/collector/semconv v0.66.1-0.20221202005155-1c54042beb70 h1:Q5L9Urod3c8as6ZYaoaqBjarx/HXxsxy34DFZIU2fO4= +go.opentelemetry.io/collector/semconv v0.66.1-0.20221202005155-1c54042beb70/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= @@ -329,8 +331,8 @@ go.uber.org/multierr v1.6.0/go.mod h1:cdWPpRnG4AhwMwsgIHip0KRBQjJy5kYEpYjJxpXp9i go.uber.org/multierr v1.8.0 h1:dg6GjLku4EH+249NNmoIciG9N/jURbDG+pFlTkhzIC8= go.uber.org/multierr v1.8.0/go.mod h1:7EAYxJLBy9rStEaz58O2t4Uvip6FSURkq8/ppBp95ak= go.uber.org/zap v1.17.0/go.mod h1:MXVU+bhUf/A7Xi2HNOnopQOrmycQ5Ih87HtOu4q5SSo= -go.uber.org/zap v1.23.0 h1:OjGQ5KQDEUawVHxNwQgPpiypGHOxo2mNZsOqTak4fFY= -go.uber.org/zap v1.23.0/go.mod h1:D+nX8jyLsMHMYrln8A0rJjFt/T/9/bGgIhAqxv5URuY= +go.uber.org/zap v1.24.0 h1:FiJd5l1UOLj0wCgbSE0rwwXHzEdAZS6hiiSnxJN/D60= +go.uber.org/zap v1.24.0/go.mod h1:2kMP+WWQ8aoFoedH3T2sq6iJ2yDWpHbP0f6MQbS9Gkg= golang.org/x/crypto v0.0.0-20180904163835-0709b304e793/go.mod h1:6SG95UA2DQfeDnfUPMdvaQW0Q7yPrPDi9nlGo2tz2b4= golang.org/x/crypto v0.0.0-20190308221718-c2843e01d9a2/go.mod h1:djNgcEr1/C05ACkg1iLfiJU5Ep61QUkGW8qpdssI0+w= golang.org/x/crypto v0.0.0-20190923035154-9ee001bba392/go.mod h1:/lpIB1dKB+9EgE3H3cr1v9wB50oz8l4C4h62xy7jSTY= diff --git a/extension/asapauthextension/extension.go b/extension/asapauthextension/extension.go index 230bd6e576e2..77e9d6bd006e 100644 --- a/extension/asapauthextension/extension.go +++ b/extension/asapauthextension/extension.go @@ -19,72 +19,45 @@ import ( "fmt" "net/http" - asap "bitbucket.org/atlassian/go-asap/v2" + "bitbucket.org/atlassian/go-asap/v2" "github.com/SermoDigital/jose/crypto" - "go.opentelemetry.io/collector/component" - "go.opentelemetry.io/collector/config/configauth" + "go.opentelemetry.io/collector/extension/auth" "google.golang.org/grpc/credentials" ) -// ASAPClientAuthenticator implements ClientAuthenticator -type ASAPClientAuthenticator struct { - provisioner asap.Provisioner - privateKey interface{} -} - -var _ configauth.ClientAuthenticator = (*ASAPClientAuthenticator)(nil) - -func (a ASAPClientAuthenticator) RoundTripper(base http.RoundTripper) (http.RoundTripper, error) { - return asap.NewTransportDecorator(a.provisioner, a.privateKey)(base), nil -} - -func (a ASAPClientAuthenticator) PerRPCCredentials() (credentials.PerRPCCredentials, error) { - return &PerRPCAuth{ - authenticator: a, - }, nil -} - -// Start does nothing and returns nil -func (a ASAPClientAuthenticator) Start(_ context.Context, _ component.Host) error { - return nil -} - -// Shutdown does nothing and returns nil -func (a ASAPClientAuthenticator) Shutdown(_ context.Context) error { - return nil -} - -func createASAPClientAuthenticator(cfg *Config) (ASAPClientAuthenticator, error) { - var a ASAPClientAuthenticator +func createASAPClientAuthenticator(cfg *Config) (auth.Client, error) { pk, err := asap.NewPrivateKey([]byte(cfg.PrivateKey)) if err != nil { - return a, err + return nil, err } // Caching provisioner will only issue a new token after the current token's expiry (determined by TTL). p := asap.NewCachingProvisioner(asap.NewProvisioner( cfg.KeyID, cfg.TTL, cfg.Issuer, cfg.Audience, crypto.SigningMethodRS256)) - return ASAPClientAuthenticator{ - provisioner: p, - privateKey: pk, - }, nil + return auth.NewClient( + auth.WithClientRoundTripper(func(base http.RoundTripper) (http.RoundTripper, error) { + return asap.NewTransportDecorator(p, pk)(base), nil + }), + auth.WithClientPerRPCCredentials(func() (credentials.PerRPCCredentials, error) { + return &perRPCAuth{provisioner: p, privateKey: pk}, nil + }), + ), nil } -var _ credentials.PerRPCCredentials = (*PerRPCAuth)(nil) - -// PerRPCAuth is a gRPC credentials.PerRPCCredentials implementation that returns an 'authorization' header. -type PerRPCAuth struct { - authenticator ASAPClientAuthenticator +// perRPCAuth is a gRPC credentials.PerRPCCredentials implementation that returns an 'authorization' header. +type perRPCAuth struct { + provisioner asap.Provisioner + privateKey interface{} } // GetRequestMetadata returns the request metadata to be used with the RPC. -func (c *PerRPCAuth) GetRequestMetadata(context.Context, ...string) (map[string]string, error) { - token, err := c.authenticator.provisioner.Provision() +func (c *perRPCAuth) GetRequestMetadata(context.Context, ...string) (map[string]string, error) { + token, err := c.provisioner.Provision() if err != nil { return nil, err } - headerValue, err := token.Serialize(c.authenticator.privateKey) + headerValue, err := token.Serialize(c.privateKey) if err != nil { return nil, err } @@ -95,6 +68,6 @@ func (c *PerRPCAuth) GetRequestMetadata(context.Context, ...string) (map[string] } // RequireTransportSecurity always returns true for this implementation. -func (*PerRPCAuth) RequireTransportSecurity() bool { +func (*perRPCAuth) RequireTransportSecurity() bool { return true } diff --git a/extension/asapauthextension/factory.go b/extension/asapauthextension/factory.go index 46a26f35150d..bc9634649280 100644 --- a/extension/asapauthextension/factory.go +++ b/extension/asapauthextension/factory.go @@ -19,6 +19,7 @@ import ( "go.opentelemetry.io/collector/component" "go.opentelemetry.io/collector/config" + "go.opentelemetry.io/collector/extension" ) const ( @@ -27,8 +28,8 @@ const ( ) // NewFactory creates a factory for asapauthextension. -func NewFactory() component.ExtensionFactory { - return component.NewExtensionFactory( +func NewFactory() extension.Factory { + return extension.NewFactory( typeStr, createDefaultConfig, createExtension, @@ -36,7 +37,7 @@ func NewFactory() component.ExtensionFactory { ) } -func createExtension(_ context.Context, _ component.ExtensionCreateSettings, cfg component.Config) (component.Extension, error) { +func createExtension(_ context.Context, _ extension.CreateSettings, cfg component.Config) (extension.Extension, error) { return createASAPClientAuthenticator(cfg.(*Config)) } diff --git a/extension/asapauthextension/factory_test.go b/extension/asapauthextension/factory_test.go index e32898afb8f7..5b6c9bdb3a03 100644 --- a/extension/asapauthextension/factory_test.go +++ b/extension/asapauthextension/factory_test.go @@ -22,6 +22,7 @@ import ( "go.opentelemetry.io/collector/component" "go.opentelemetry.io/collector/component/componenttest" "go.opentelemetry.io/collector/config" + "go.opentelemetry.io/collector/extension/extensiontest" ) func TestCreateDefaultConfig(t *testing.T) { @@ -86,7 +87,7 @@ func TestCreateExtension(t *testing.T) { cfg.PrivateKey = testcase.settings.PrivateKey // validate extension creation - ext, err := createExtension(context.Background(), componenttest.NewNopExtensionCreateSettings(), cfg) + ext, err := createExtension(context.Background(), extensiontest.NewNopCreateSettings(), cfg) if testcase.shouldError { assert.Error(t, err) } else { diff --git a/extension/asapauthextension/go.mod b/extension/asapauthextension/go.mod index d5b260154466..56f1dedc4d65 100644 --- a/extension/asapauthextension/go.mod +++ b/extension/asapauthextension/go.mod @@ -6,8 +6,9 @@ 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.66.1-0.20221128222955-4ff1ff379b90 - go.opentelemetry.io/collector/component v0.66.1-0.20221128222955-4ff1ff379b90 + go.opentelemetry.io/collector v0.66.1-0.20221202005155-1c54042beb70 + go.opentelemetry.io/collector/component v0.66.1-0.20221202005155-1c54042beb70 + go.opentelemetry.io/collector/confmap v0.0.0-20221201172708-2bdff61fa52a go.uber.org/multierr v1.8.0 google.golang.org/grpc v1.51.0 ) @@ -30,14 +31,14 @@ 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/consumer v0.66.1-0.20221128222955-4ff1ff379b90 // indirect - go.opentelemetry.io/collector/featuregate v0.66.1-0.20221128222955-4ff1ff379b90 // indirect - go.opentelemetry.io/collector/pdata v0.66.1-0.20221128222955-4ff1ff379b90 // indirect + go.opentelemetry.io/collector/consumer v0.66.1-0.20221202005155-1c54042beb70 // indirect + go.opentelemetry.io/collector/featuregate v0.66.1-0.20221202005155-1c54042beb70 // indirect + go.opentelemetry.io/collector/pdata v0.66.1-0.20221202005155-1c54042beb70 // 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 go.uber.org/atomic v1.10.0 // indirect - go.uber.org/zap v1.23.0 // indirect + go.uber.org/zap v1.24.0 // indirect golang.org/x/net v0.0.0-20220722155237-a158d28d115b // indirect golang.org/x/sys v0.2.0 // indirect golang.org/x/text v0.4.0 // indirect diff --git a/extension/asapauthextension/go.sum b/extension/asapauthextension/go.sum index c223338d4746..3b0fd8212106 100644 --- a/extension/asapauthextension/go.sum +++ b/extension/asapauthextension/go.sum @@ -276,16 +276,18 @@ github.com/yuin/goldmark v1.3.5/go.mod h1:mwnBkeHKe2W/ZEtQ+71ViKU8L12m81fl3OWwC1 go.etcd.io/etcd/api/v3 v3.5.4/go.mod h1:5GB2vv4A4AOn3yk7MftYGHkUfGtDHnEraIjym4dYz5A= go.etcd.io/etcd/client/pkg/v3 v3.5.4/go.mod h1:IJHfcCEKxYu1Os13ZdwCwIUTUVGYTSAM3YSwc9/Ac1g= go.etcd.io/etcd/client/v3 v3.5.4/go.mod h1:ZaRkVgBZC+L+dLCjTcF1hRXpgZXQPOvnA/Ak/gq3kiY= -go.opentelemetry.io/collector v0.66.1-0.20221128222955-4ff1ff379b90 h1:yRe05/jMdzH4TFHfndZ5h2o2hKBK/79W72j8w51qNsI= -go.opentelemetry.io/collector v0.66.1-0.20221128222955-4ff1ff379b90/go.mod h1:hE6jCs+0rfiufCrVPucKZTMwfHit1okfDPnwPT2eW1I= -go.opentelemetry.io/collector/component v0.66.1-0.20221128222955-4ff1ff379b90 h1:AYSNTXbezhNg43EuYdVVcgxE/2gBVrm00FDx4DOmQVg= -go.opentelemetry.io/collector/component v0.66.1-0.20221128222955-4ff1ff379b90/go.mod h1:0c84EqXUhvYe6KW7hJfh76tiI/5yjWCH2amwyQ06XLM= -go.opentelemetry.io/collector/consumer v0.66.1-0.20221128222955-4ff1ff379b90 h1:nzNXVfC1FzXBXCLMzbMv+qK3E4EGiNsnMhfVsBd2yzc= -go.opentelemetry.io/collector/consumer v0.66.1-0.20221128222955-4ff1ff379b90/go.mod h1:WtoRZa5SnxQO1ZEQdVxYpFcXCmq62rakv0oUSlPO0NQ= -go.opentelemetry.io/collector/featuregate v0.66.1-0.20221128222955-4ff1ff379b90 h1:UuJSFWbi9XxyNZsJKZuvpWg35BgRbcCGFH+38V2MAdw= -go.opentelemetry.io/collector/featuregate v0.66.1-0.20221128222955-4ff1ff379b90/go.mod h1:tewuFKJYalWBU0bmNKg++MC1ipINXUr6szYzOw2p1GI= -go.opentelemetry.io/collector/pdata v0.66.1-0.20221128222955-4ff1ff379b90 h1:Vu4S4jSNcd0VFPzxQNO4+UqGwnes1xJDoFLPRiWHm8I= -go.opentelemetry.io/collector/pdata v0.66.1-0.20221128222955-4ff1ff379b90/go.mod h1:pqyaznLzk21m+1KL6fwOsRryRELL+zNM0qiVSn0MbVc= +go.opentelemetry.io/collector v0.66.1-0.20221202005155-1c54042beb70 h1:INB2CsOtqqrija2KvMuIpbBQ3qX1BECEeR+d0NJX+oM= +go.opentelemetry.io/collector v0.66.1-0.20221202005155-1c54042beb70/go.mod h1:d0NHkHyANJy3HDTvYE/PoylMShUmFIbiir89ieI0X0c= +go.opentelemetry.io/collector/component v0.66.1-0.20221202005155-1c54042beb70 h1:dEoJhzCmRShgmVro/kXm6pouGElgxkH2DsvanzCeZtU= +go.opentelemetry.io/collector/component v0.66.1-0.20221202005155-1c54042beb70/go.mod h1:OsVnvFFe38QSpcuZlQ8cvarDzcloCexgQ1/B2m80F6U= +go.opentelemetry.io/collector/confmap v0.0.0-20221201172708-2bdff61fa52a h1:2TscCXAQASO2kU9xHcMIUM/FP29fiQIRTilZmliq/7I= +go.opentelemetry.io/collector/confmap v0.0.0-20221201172708-2bdff61fa52a/go.mod h1:qJ3e8bA8h4wz/jYlbeEUafVHdrU7DkpStnmIUAz6VTQ= +go.opentelemetry.io/collector/consumer v0.66.1-0.20221202005155-1c54042beb70 h1:XwpVjI1KeKGPXOZBLefGILMziPYuNf6IzbmiIEsIyI0= +go.opentelemetry.io/collector/consumer v0.66.1-0.20221202005155-1c54042beb70/go.mod h1:EWVBcSGcIcmeDGTnIboc/aqa3agsBeH8/q7yFWG7xVc= +go.opentelemetry.io/collector/featuregate v0.66.1-0.20221202005155-1c54042beb70 h1:V0tf4ebciqIs07jFATfLGdUpLRaEsi+AiWuA/in0G8Y= +go.opentelemetry.io/collector/featuregate v0.66.1-0.20221202005155-1c54042beb70/go.mod h1:tewuFKJYalWBU0bmNKg++MC1ipINXUr6szYzOw2p1GI= +go.opentelemetry.io/collector/pdata v0.66.1-0.20221202005155-1c54042beb70 h1:TPOrxkEMvZzfBSwF3ct+kUUgKA5g8unkZZbKQvJweeA= +go.opentelemetry.io/collector/pdata v0.66.1-0.20221202005155-1c54042beb70/go.mod h1:pqyaznLzk21m+1KL6fwOsRryRELL+zNM0qiVSn0MbVc= 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= @@ -301,8 +303,8 @@ go.uber.org/multierr v1.6.0/go.mod h1:cdWPpRnG4AhwMwsgIHip0KRBQjJy5kYEpYjJxpXp9i go.uber.org/multierr v1.8.0 h1:dg6GjLku4EH+249NNmoIciG9N/jURbDG+pFlTkhzIC8= go.uber.org/multierr v1.8.0/go.mod h1:7EAYxJLBy9rStEaz58O2t4Uvip6FSURkq8/ppBp95ak= go.uber.org/zap v1.17.0/go.mod h1:MXVU+bhUf/A7Xi2HNOnopQOrmycQ5Ih87HtOu4q5SSo= -go.uber.org/zap v1.23.0 h1:OjGQ5KQDEUawVHxNwQgPpiypGHOxo2mNZsOqTak4fFY= -go.uber.org/zap v1.23.0/go.mod h1:D+nX8jyLsMHMYrln8A0rJjFt/T/9/bGgIhAqxv5URuY= +go.uber.org/zap v1.24.0 h1:FiJd5l1UOLj0wCgbSE0rwwXHzEdAZS6hiiSnxJN/D60= +go.uber.org/zap v1.24.0/go.mod h1:2kMP+WWQ8aoFoedH3T2sq6iJ2yDWpHbP0f6MQbS9Gkg= golang.org/x/crypto v0.0.0-20180904163835-0709b304e793/go.mod h1:6SG95UA2DQfeDnfUPMdvaQW0Q7yPrPDi9nlGo2tz2b4= golang.org/x/crypto v0.0.0-20190308221718-c2843e01d9a2/go.mod h1:djNgcEr1/C05ACkg1iLfiJU5Ep61QUkGW8qpdssI0+w= golang.org/x/crypto v0.0.0-20190923035154-9ee001bba392/go.mod h1:/lpIB1dKB+9EgE3H3cr1v9wB50oz8l4C4h62xy7jSTY= diff --git a/extension/awsproxy/extension.go b/extension/awsproxy/extension.go index 5323b708edc7..6d8d0ae8850f 100644 --- a/extension/awsproxy/extension.go +++ b/extension/awsproxy/extension.go @@ -20,6 +20,7 @@ import ( "net/http" "go.opentelemetry.io/collector/component" + "go.opentelemetry.io/collector/extension" "go.uber.org/zap" "github.com/open-telemetry/opentelemetry-collector-contrib/internal/aws/proxy" @@ -31,7 +32,7 @@ type xrayProxy struct { server proxy.Server } -var _ component.Extension = (*xrayProxy)(nil) +var _ extension.Extension = (*xrayProxy)(nil) func (x xrayProxy) Start(ctx context.Context, host component.Host) error { go func() { @@ -47,7 +48,7 @@ func (x xrayProxy) Shutdown(ctx context.Context) error { return x.server.Shutdown(ctx) } -func newXrayProxy(config *Config, logger *zap.Logger) (component.Extension, error) { +func newXrayProxy(config *Config, logger *zap.Logger) (extension.Extension, error) { srv, err := proxy.NewServer(&config.ProxyConfig, logger) if err != nil { diff --git a/extension/awsproxy/factory.go b/extension/awsproxy/factory.go index 99df00b130db..d885b3630e76 100644 --- a/extension/awsproxy/factory.go +++ b/extension/awsproxy/factory.go @@ -21,6 +21,7 @@ import ( "go.opentelemetry.io/collector/config" "go.opentelemetry.io/collector/config/confignet" "go.opentelemetry.io/collector/config/configtls" + "go.opentelemetry.io/collector/extension" "github.com/open-telemetry/opentelemetry-collector-contrib/internal/aws/proxy" ) @@ -33,8 +34,8 @@ const ( ) // NewFactory creates a factory for awsproxy extension. -func NewFactory() component.ExtensionFactory { - return component.NewExtensionFactory( +func NewFactory() extension.Factory { + return extension.NewFactory( typeStr, createDefaultConfig, createExtension, @@ -56,6 +57,6 @@ func createDefaultConfig() component.Config { } } -func createExtension(_ context.Context, params component.ExtensionCreateSettings, cfg component.Config) (component.Extension, error) { +func createExtension(_ context.Context, params extension.CreateSettings, cfg component.Config) (extension.Extension, error) { return newXrayProxy(cfg.(*Config), params.Logger) } diff --git a/extension/awsproxy/factory_test.go b/extension/awsproxy/factory_test.go index 8ceada900bfd..2a178a463b52 100644 --- a/extension/awsproxy/factory_test.go +++ b/extension/awsproxy/factory_test.go @@ -29,6 +29,7 @@ import ( "go.opentelemetry.io/collector/component/componenttest" "go.opentelemetry.io/collector/config" "go.opentelemetry.io/collector/config/confignet" + "go.opentelemetry.io/collector/extension/extensiontest" "github.com/open-telemetry/opentelemetry-collector-contrib/internal/aws/proxy" "github.com/open-telemetry/opentelemetry-collector-contrib/internal/common/testutil" @@ -73,7 +74,7 @@ func TestFactory_CreateExtension(t *testing.T) { t.Setenv("AWS_SECRET_ACCESS_KEY", "fakeSecretAccessKey") ctx := context.Background() - ext, err := createExtension(ctx, componenttest.NewNopExtensionCreateSettings(), cfg) + ext, err := createExtension(ctx, extensiontest.NewNopCreateSettings(), cfg) assert.NoError(t, err) assert.NotNil(t, ext) diff --git a/extension/awsproxy/go.mod b/extension/awsproxy/go.mod index 0fd98a59eed3..889b7af90e07 100644 --- a/extension/awsproxy/go.mod +++ b/extension/awsproxy/go.mod @@ -6,9 +6,10 @@ require ( github.com/open-telemetry/opentelemetry-collector-contrib/internal/aws/proxy v0.66.0 github.com/open-telemetry/opentelemetry-collector-contrib/internal/common v0.66.0 github.com/stretchr/testify v1.8.1 - go.opentelemetry.io/collector v0.66.1-0.20221128222955-4ff1ff379b90 - go.opentelemetry.io/collector/component v0.66.1-0.20221128222955-4ff1ff379b90 - go.uber.org/zap v1.23.0 + go.opentelemetry.io/collector v0.66.1-0.20221202005155-1c54042beb70 + go.opentelemetry.io/collector/component v0.66.1-0.20221202005155-1c54042beb70 + go.opentelemetry.io/collector/confmap v0.0.0-20221201172708-2bdff61fa52a + go.uber.org/zap v1.24.0 ) require ( @@ -26,9 +27,9 @@ require ( github.com/modern-go/reflect2 v1.0.2 // indirect github.com/pmezard/go-difflib v1.0.0 // indirect github.com/rogpeppe/go-internal v1.8.0 // indirect - go.opentelemetry.io/collector/consumer v0.66.1-0.20221128222955-4ff1ff379b90 // indirect - go.opentelemetry.io/collector/featuregate v0.66.1-0.20221128222955-4ff1ff379b90 // indirect - go.opentelemetry.io/collector/pdata v0.66.1-0.20221128222955-4ff1ff379b90 // indirect + go.opentelemetry.io/collector/consumer v0.66.1-0.20221202005155-1c54042beb70 // indirect + go.opentelemetry.io/collector/featuregate v0.66.1-0.20221202005155-1c54042beb70 // indirect + go.opentelemetry.io/collector/pdata v0.66.1-0.20221202005155-1c54042beb70 // 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 fa97bbfce1ab..0aca72b55340 100644 --- a/extension/awsproxy/go.sum +++ b/extension/awsproxy/go.sum @@ -265,16 +265,18 @@ github.com/yuin/goldmark v1.4.13/go.mod h1:6yULJ656Px+3vBD8DxQVa3kxgyrAnzto9xy5t go.etcd.io/etcd/api/v3 v3.5.4/go.mod h1:5GB2vv4A4AOn3yk7MftYGHkUfGtDHnEraIjym4dYz5A= go.etcd.io/etcd/client/pkg/v3 v3.5.4/go.mod h1:IJHfcCEKxYu1Os13ZdwCwIUTUVGYTSAM3YSwc9/Ac1g= go.etcd.io/etcd/client/v3 v3.5.4/go.mod h1:ZaRkVgBZC+L+dLCjTcF1hRXpgZXQPOvnA/Ak/gq3kiY= -go.opentelemetry.io/collector v0.66.1-0.20221128222955-4ff1ff379b90 h1:yRe05/jMdzH4TFHfndZ5h2o2hKBK/79W72j8w51qNsI= -go.opentelemetry.io/collector v0.66.1-0.20221128222955-4ff1ff379b90/go.mod h1:hE6jCs+0rfiufCrVPucKZTMwfHit1okfDPnwPT2eW1I= -go.opentelemetry.io/collector/component v0.66.1-0.20221128222955-4ff1ff379b90 h1:AYSNTXbezhNg43EuYdVVcgxE/2gBVrm00FDx4DOmQVg= -go.opentelemetry.io/collector/component v0.66.1-0.20221128222955-4ff1ff379b90/go.mod h1:0c84EqXUhvYe6KW7hJfh76tiI/5yjWCH2amwyQ06XLM= -go.opentelemetry.io/collector/consumer v0.66.1-0.20221128222955-4ff1ff379b90 h1:nzNXVfC1FzXBXCLMzbMv+qK3E4EGiNsnMhfVsBd2yzc= -go.opentelemetry.io/collector/consumer v0.66.1-0.20221128222955-4ff1ff379b90/go.mod h1:WtoRZa5SnxQO1ZEQdVxYpFcXCmq62rakv0oUSlPO0NQ= -go.opentelemetry.io/collector/featuregate v0.66.1-0.20221128222955-4ff1ff379b90 h1:UuJSFWbi9XxyNZsJKZuvpWg35BgRbcCGFH+38V2MAdw= -go.opentelemetry.io/collector/featuregate v0.66.1-0.20221128222955-4ff1ff379b90/go.mod h1:tewuFKJYalWBU0bmNKg++MC1ipINXUr6szYzOw2p1GI= -go.opentelemetry.io/collector/pdata v0.66.1-0.20221128222955-4ff1ff379b90 h1:Vu4S4jSNcd0VFPzxQNO4+UqGwnes1xJDoFLPRiWHm8I= -go.opentelemetry.io/collector/pdata v0.66.1-0.20221128222955-4ff1ff379b90/go.mod h1:pqyaznLzk21m+1KL6fwOsRryRELL+zNM0qiVSn0MbVc= +go.opentelemetry.io/collector v0.66.1-0.20221202005155-1c54042beb70 h1:INB2CsOtqqrija2KvMuIpbBQ3qX1BECEeR+d0NJX+oM= +go.opentelemetry.io/collector v0.66.1-0.20221202005155-1c54042beb70/go.mod h1:d0NHkHyANJy3HDTvYE/PoylMShUmFIbiir89ieI0X0c= +go.opentelemetry.io/collector/component v0.66.1-0.20221202005155-1c54042beb70 h1:dEoJhzCmRShgmVro/kXm6pouGElgxkH2DsvanzCeZtU= +go.opentelemetry.io/collector/component v0.66.1-0.20221202005155-1c54042beb70/go.mod h1:OsVnvFFe38QSpcuZlQ8cvarDzcloCexgQ1/B2m80F6U= +go.opentelemetry.io/collector/confmap v0.0.0-20221201172708-2bdff61fa52a h1:2TscCXAQASO2kU9xHcMIUM/FP29fiQIRTilZmliq/7I= +go.opentelemetry.io/collector/confmap v0.0.0-20221201172708-2bdff61fa52a/go.mod h1:qJ3e8bA8h4wz/jYlbeEUafVHdrU7DkpStnmIUAz6VTQ= +go.opentelemetry.io/collector/consumer v0.66.1-0.20221202005155-1c54042beb70 h1:XwpVjI1KeKGPXOZBLefGILMziPYuNf6IzbmiIEsIyI0= +go.opentelemetry.io/collector/consumer v0.66.1-0.20221202005155-1c54042beb70/go.mod h1:EWVBcSGcIcmeDGTnIboc/aqa3agsBeH8/q7yFWG7xVc= +go.opentelemetry.io/collector/featuregate v0.66.1-0.20221202005155-1c54042beb70 h1:V0tf4ebciqIs07jFATfLGdUpLRaEsi+AiWuA/in0G8Y= +go.opentelemetry.io/collector/featuregate v0.66.1-0.20221202005155-1c54042beb70/go.mod h1:tewuFKJYalWBU0bmNKg++MC1ipINXUr6szYzOw2p1GI= +go.opentelemetry.io/collector/pdata v0.66.1-0.20221202005155-1c54042beb70 h1:TPOrxkEMvZzfBSwF3ct+kUUgKA5g8unkZZbKQvJweeA= +go.opentelemetry.io/collector/pdata v0.66.1-0.20221202005155-1c54042beb70/go.mod h1:pqyaznLzk21m+1KL6fwOsRryRELL+zNM0qiVSn0MbVc= 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= @@ -290,8 +292,8 @@ go.uber.org/multierr v1.6.0/go.mod h1:cdWPpRnG4AhwMwsgIHip0KRBQjJy5kYEpYjJxpXp9i go.uber.org/multierr v1.8.0 h1:dg6GjLku4EH+249NNmoIciG9N/jURbDG+pFlTkhzIC8= go.uber.org/multierr v1.8.0/go.mod h1:7EAYxJLBy9rStEaz58O2t4Uvip6FSURkq8/ppBp95ak= go.uber.org/zap v1.17.0/go.mod h1:MXVU+bhUf/A7Xi2HNOnopQOrmycQ5Ih87HtOu4q5SSo= -go.uber.org/zap v1.23.0 h1:OjGQ5KQDEUawVHxNwQgPpiypGHOxo2mNZsOqTak4fFY= -go.uber.org/zap v1.23.0/go.mod h1:D+nX8jyLsMHMYrln8A0rJjFt/T/9/bGgIhAqxv5URuY= +go.uber.org/zap v1.24.0 h1:FiJd5l1UOLj0wCgbSE0rwwXHzEdAZS6hiiSnxJN/D60= +go.uber.org/zap v1.24.0/go.mod h1:2kMP+WWQ8aoFoedH3T2sq6iJ2yDWpHbP0f6MQbS9Gkg= golang.org/x/crypto v0.0.0-20180904163835-0709b304e793/go.mod h1:6SG95UA2DQfeDnfUPMdvaQW0Q7yPrPDi9nlGo2tz2b4= golang.org/x/crypto v0.0.0-20190308221718-c2843e01d9a2/go.mod h1:djNgcEr1/C05ACkg1iLfiJU5Ep61QUkGW8qpdssI0+w= golang.org/x/crypto v0.0.0-20190923035154-9ee001bba392/go.mod h1:/lpIB1dKB+9EgE3H3cr1v9wB50oz8l4C4h62xy7jSTY= diff --git a/extension/basicauthextension/extension.go b/extension/basicauthextension/extension.go index 8f7801cbdc58..4a8537b66312 100644 --- a/extension/basicauthextension/extension.go +++ b/extension/basicauthextension/extension.go @@ -27,7 +27,7 @@ import ( "github.com/tg123/go-htpasswd" "go.opentelemetry.io/collector/client" "go.opentelemetry.io/collector/component" - "go.opentelemetry.io/collector/config/configauth" + "go.opentelemetry.io/collector/extension/auth" creds "google.golang.org/grpc/credentials" ) @@ -44,7 +44,7 @@ type basicAuth struct { matchFunc func(username, password string) bool } -func newClientAuthExtension(cfg *Config) (configauth.ClientAuthenticator, error) { +func newClientAuthExtension(cfg *Config) (auth.Client, error) { if cfg.ClientAuth == nil || cfg.ClientAuth.Username == "" { return nil, errNoCredentialSource } @@ -52,13 +52,13 @@ func newClientAuthExtension(cfg *Config) (configauth.ClientAuthenticator, error) ba := basicAuth{ clientAuth: cfg.ClientAuth, } - return configauth.NewClientAuthenticator( - configauth.WithClientRoundTripper(ba.roundTripper), - configauth.WithPerRPCCredentials(ba.perRPCCredentials), + return auth.NewClient( + auth.WithClientRoundTripper(ba.roundTripper), + auth.WithClientPerRPCCredentials(ba.perRPCCredentials), ), nil } -func newServerAuthExtension(cfg *Config) (configauth.ServerAuthenticator, error) { +func newServerAuthExtension(cfg *Config) (auth.Server, error) { if cfg.Htpasswd == nil || (cfg.Htpasswd.File == "" && cfg.Htpasswd.Inline == "") { return nil, errNoCredentialSource @@ -67,9 +67,9 @@ func newServerAuthExtension(cfg *Config) (configauth.ServerAuthenticator, error) ba := basicAuth{ htpasswd: cfg.Htpasswd, } - return configauth.NewServerAuthenticator( - configauth.WithStart(ba.serverStart), - configauth.WithAuthenticate(ba.authenticate), + return auth.NewServer( + auth.WithServerStart(ba.serverStart), + auth.WithServerAuthenticate(ba.authenticate), ), nil } diff --git a/extension/basicauthextension/factory.go b/extension/basicauthextension/factory.go index 28ace2fc7f71..2b6f1c324bfb 100644 --- a/extension/basicauthextension/factory.go +++ b/extension/basicauthextension/factory.go @@ -19,6 +19,7 @@ import ( "go.opentelemetry.io/collector/component" "go.opentelemetry.io/collector/config" + "go.opentelemetry.io/collector/extension" ) const ( @@ -26,8 +27,8 @@ const ( ) // NewFactory creates a factory for the static bearer token Authenticator extension. -func NewFactory() component.ExtensionFactory { - return component.NewExtensionFactory( +func NewFactory() extension.Factory { + return extension.NewFactory( typeStr, createDefaultConfig, createExtension, @@ -41,7 +42,7 @@ func createDefaultConfig() component.Config { } } -func createExtension(_ context.Context, _ component.ExtensionCreateSettings, cfg component.Config) (component.Extension, error) { +func createExtension(_ context.Context, _ extension.CreateSettings, cfg component.Config) (extension.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 158709c68b39..5e1f7c26dd2f 100644 --- a/extension/basicauthextension/factory_test.go +++ b/extension/basicauthextension/factory_test.go @@ -22,6 +22,7 @@ import ( "go.opentelemetry.io/collector/component" "go.opentelemetry.io/collector/component/componenttest" "go.opentelemetry.io/collector/config" + "go.opentelemetry.io/collector/extension/extensiontest" ) func TestCreateDefaultConfig(t *testing.T) { @@ -36,7 +37,7 @@ func TestCreateDefaultConfig(t *testing.T) { func TestCreateExtension_DefaultConfig(t *testing.T) { cfg := createDefaultConfig() - ext, err := createExtension(context.Background(), componenttest.NewNopExtensionCreateSettings(), cfg) + ext, err := createExtension(context.Background(), extensiontest.NewNopCreateSettings(), cfg) assert.Equal(t, err, errNoCredentialSource) assert.Nil(t, ext) } @@ -49,7 +50,7 @@ func TestCreateExtension_ValidConfig(t *testing.T) { }, } - ext, err := createExtension(context.Background(), componenttest.NewNopExtensionCreateSettings(), cfg) + ext, err := createExtension(context.Background(), extensiontest.NewNopCreateSettings(), cfg) assert.NoError(t, err) assert.NotNil(t, ext) } diff --git a/extension/basicauthextension/go.mod b/extension/basicauthextension/go.mod index fbc27d4cae96..c3bcfde08797 100644 --- a/extension/basicauthextension/go.mod +++ b/extension/basicauthextension/go.mod @@ -5,8 +5,9 @@ go 1.18 require ( github.com/stretchr/testify v1.8.1 github.com/tg123/go-htpasswd v1.2.0 - go.opentelemetry.io/collector v0.66.1-0.20221128222955-4ff1ff379b90 - go.opentelemetry.io/collector/component v0.66.1-0.20221128222955-4ff1ff379b90 + go.opentelemetry.io/collector v0.66.1-0.20221202005155-1c54042beb70 + go.opentelemetry.io/collector/component v0.66.1-0.20221202005155-1c54042beb70 + go.opentelemetry.io/collector/confmap v0.0.0-20221201172708-2bdff61fa52a google.golang.org/grpc v1.51.0 ) @@ -26,15 +27,15 @@ 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/consumer v0.66.1-0.20221128222955-4ff1ff379b90 // indirect - go.opentelemetry.io/collector/featuregate v0.66.1-0.20221128222955-4ff1ff379b90 // indirect - go.opentelemetry.io/collector/pdata v0.66.1-0.20221128222955-4ff1ff379b90 // indirect + go.opentelemetry.io/collector/consumer v0.66.1-0.20221202005155-1c54042beb70 // indirect + go.opentelemetry.io/collector/featuregate v0.66.1-0.20221202005155-1c54042beb70 // indirect + go.opentelemetry.io/collector/pdata v0.66.1-0.20221202005155-1c54042beb70 // 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 go.uber.org/atomic v1.10.0 // indirect go.uber.org/multierr v1.8.0 // indirect - go.uber.org/zap v1.23.0 // indirect + go.uber.org/zap v1.24.0 // indirect golang.org/x/crypto v0.0.0-20220507011949-2cf3adece122 // indirect golang.org/x/net v0.0.0-20220722155237-a158d28d115b // indirect golang.org/x/sys v0.2.0 // indirect diff --git a/extension/basicauthextension/go.sum b/extension/basicauthextension/go.sum index d2becf03d5ff..222b1863ace1 100644 --- a/extension/basicauthextension/go.sum +++ b/extension/basicauthextension/go.sum @@ -269,16 +269,18 @@ github.com/yuin/goldmark v1.3.5/go.mod h1:mwnBkeHKe2W/ZEtQ+71ViKU8L12m81fl3OWwC1 go.etcd.io/etcd/api/v3 v3.5.4/go.mod h1:5GB2vv4A4AOn3yk7MftYGHkUfGtDHnEraIjym4dYz5A= go.etcd.io/etcd/client/pkg/v3 v3.5.4/go.mod h1:IJHfcCEKxYu1Os13ZdwCwIUTUVGYTSAM3YSwc9/Ac1g= go.etcd.io/etcd/client/v3 v3.5.4/go.mod h1:ZaRkVgBZC+L+dLCjTcF1hRXpgZXQPOvnA/Ak/gq3kiY= -go.opentelemetry.io/collector v0.66.1-0.20221128222955-4ff1ff379b90 h1:yRe05/jMdzH4TFHfndZ5h2o2hKBK/79W72j8w51qNsI= -go.opentelemetry.io/collector v0.66.1-0.20221128222955-4ff1ff379b90/go.mod h1:hE6jCs+0rfiufCrVPucKZTMwfHit1okfDPnwPT2eW1I= -go.opentelemetry.io/collector/component v0.66.1-0.20221128222955-4ff1ff379b90 h1:AYSNTXbezhNg43EuYdVVcgxE/2gBVrm00FDx4DOmQVg= -go.opentelemetry.io/collector/component v0.66.1-0.20221128222955-4ff1ff379b90/go.mod h1:0c84EqXUhvYe6KW7hJfh76tiI/5yjWCH2amwyQ06XLM= -go.opentelemetry.io/collector/consumer v0.66.1-0.20221128222955-4ff1ff379b90 h1:nzNXVfC1FzXBXCLMzbMv+qK3E4EGiNsnMhfVsBd2yzc= -go.opentelemetry.io/collector/consumer v0.66.1-0.20221128222955-4ff1ff379b90/go.mod h1:WtoRZa5SnxQO1ZEQdVxYpFcXCmq62rakv0oUSlPO0NQ= -go.opentelemetry.io/collector/featuregate v0.66.1-0.20221128222955-4ff1ff379b90 h1:UuJSFWbi9XxyNZsJKZuvpWg35BgRbcCGFH+38V2MAdw= -go.opentelemetry.io/collector/featuregate v0.66.1-0.20221128222955-4ff1ff379b90/go.mod h1:tewuFKJYalWBU0bmNKg++MC1ipINXUr6szYzOw2p1GI= -go.opentelemetry.io/collector/pdata v0.66.1-0.20221128222955-4ff1ff379b90 h1:Vu4S4jSNcd0VFPzxQNO4+UqGwnes1xJDoFLPRiWHm8I= -go.opentelemetry.io/collector/pdata v0.66.1-0.20221128222955-4ff1ff379b90/go.mod h1:pqyaznLzk21m+1KL6fwOsRryRELL+zNM0qiVSn0MbVc= +go.opentelemetry.io/collector v0.66.1-0.20221202005155-1c54042beb70 h1:INB2CsOtqqrija2KvMuIpbBQ3qX1BECEeR+d0NJX+oM= +go.opentelemetry.io/collector v0.66.1-0.20221202005155-1c54042beb70/go.mod h1:d0NHkHyANJy3HDTvYE/PoylMShUmFIbiir89ieI0X0c= +go.opentelemetry.io/collector/component v0.66.1-0.20221202005155-1c54042beb70 h1:dEoJhzCmRShgmVro/kXm6pouGElgxkH2DsvanzCeZtU= +go.opentelemetry.io/collector/component v0.66.1-0.20221202005155-1c54042beb70/go.mod h1:OsVnvFFe38QSpcuZlQ8cvarDzcloCexgQ1/B2m80F6U= +go.opentelemetry.io/collector/confmap v0.0.0-20221201172708-2bdff61fa52a h1:2TscCXAQASO2kU9xHcMIUM/FP29fiQIRTilZmliq/7I= +go.opentelemetry.io/collector/confmap v0.0.0-20221201172708-2bdff61fa52a/go.mod h1:qJ3e8bA8h4wz/jYlbeEUafVHdrU7DkpStnmIUAz6VTQ= +go.opentelemetry.io/collector/consumer v0.66.1-0.20221202005155-1c54042beb70 h1:XwpVjI1KeKGPXOZBLefGILMziPYuNf6IzbmiIEsIyI0= +go.opentelemetry.io/collector/consumer v0.66.1-0.20221202005155-1c54042beb70/go.mod h1:EWVBcSGcIcmeDGTnIboc/aqa3agsBeH8/q7yFWG7xVc= +go.opentelemetry.io/collector/featuregate v0.66.1-0.20221202005155-1c54042beb70 h1:V0tf4ebciqIs07jFATfLGdUpLRaEsi+AiWuA/in0G8Y= +go.opentelemetry.io/collector/featuregate v0.66.1-0.20221202005155-1c54042beb70/go.mod h1:tewuFKJYalWBU0bmNKg++MC1ipINXUr6szYzOw2p1GI= +go.opentelemetry.io/collector/pdata v0.66.1-0.20221202005155-1c54042beb70 h1:TPOrxkEMvZzfBSwF3ct+kUUgKA5g8unkZZbKQvJweeA= +go.opentelemetry.io/collector/pdata v0.66.1-0.20221202005155-1c54042beb70/go.mod h1:pqyaznLzk21m+1KL6fwOsRryRELL+zNM0qiVSn0MbVc= 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= @@ -294,8 +296,8 @@ go.uber.org/multierr v1.6.0/go.mod h1:cdWPpRnG4AhwMwsgIHip0KRBQjJy5kYEpYjJxpXp9i go.uber.org/multierr v1.8.0 h1:dg6GjLku4EH+249NNmoIciG9N/jURbDG+pFlTkhzIC8= go.uber.org/multierr v1.8.0/go.mod h1:7EAYxJLBy9rStEaz58O2t4Uvip6FSURkq8/ppBp95ak= go.uber.org/zap v1.17.0/go.mod h1:MXVU+bhUf/A7Xi2HNOnopQOrmycQ5Ih87HtOu4q5SSo= -go.uber.org/zap v1.23.0 h1:OjGQ5KQDEUawVHxNwQgPpiypGHOxo2mNZsOqTak4fFY= -go.uber.org/zap v1.23.0/go.mod h1:D+nX8jyLsMHMYrln8A0rJjFt/T/9/bGgIhAqxv5URuY= +go.uber.org/zap v1.24.0 h1:FiJd5l1UOLj0wCgbSE0rwwXHzEdAZS6hiiSnxJN/D60= +go.uber.org/zap v1.24.0/go.mod h1:2kMP+WWQ8aoFoedH3T2sq6iJ2yDWpHbP0f6MQbS9Gkg= golang.org/x/crypto v0.0.0-20180904163835-0709b304e793/go.mod h1:6SG95UA2DQfeDnfUPMdvaQW0Q7yPrPDi9nlGo2tz2b4= golang.org/x/crypto v0.0.0-20190228161510-8dd112bcdc25/go.mod h1:djNgcEr1/C05ACkg1iLfiJU5Ep61QUkGW8qpdssI0+w= golang.org/x/crypto v0.0.0-20190308221718-c2843e01d9a2/go.mod h1:djNgcEr1/C05ACkg1iLfiJU5Ep61QUkGW8qpdssI0+w= diff --git a/extension/bearertokenauthextension/bearertokenauth.go b/extension/bearertokenauthextension/bearertokenauth.go index e397494b35d9..d05998ff8075 100644 --- a/extension/bearertokenauthextension/bearertokenauth.go +++ b/extension/bearertokenauthextension/bearertokenauth.go @@ -23,7 +23,7 @@ import ( "github.com/fsnotify/fsnotify" "go.opentelemetry.io/collector/component" - "go.opentelemetry.io/collector/config/configauth" + "go.opentelemetry.io/collector/extension/auth" "go.uber.org/zap" "google.golang.org/grpc/credentials" ) @@ -45,7 +45,7 @@ func (c *PerRPCAuth) RequireTransportSecurity() bool { return true } -// BearerTokenAuth is an implementation of configauth.GRPCClientAuthenticator. It embeds a static authorization "bearer" token in every rpc call. +// BearerTokenAuth is an implementation of auth.Client. It embeds a static authorization "bearer" token in every rpc call. type BearerTokenAuth struct { muTokenString sync.RWMutex scheme string @@ -57,7 +57,7 @@ type BearerTokenAuth struct { logger *zap.Logger } -var _ configauth.ClientAuthenticator = (*BearerTokenAuth)(nil) +var _ auth.Client = (*BearerTokenAuth)(nil) func newBearerTokenAuth(cfg *Config, logger *zap.Logger) *BearerTokenAuth { if cfg.Filename != "" && cfg.BearerToken != "" { diff --git a/extension/bearertokenauthextension/factory.go b/extension/bearertokenauthextension/factory.go index 058703cc19d4..f1be29d81334 100644 --- a/extension/bearertokenauthextension/factory.go +++ b/extension/bearertokenauthextension/factory.go @@ -19,6 +19,7 @@ import ( "go.opentelemetry.io/collector/component" "go.opentelemetry.io/collector/config" + "go.opentelemetry.io/collector/extension" ) const ( @@ -29,8 +30,8 @@ const ( ) // NewFactory creates a factory for the static bearer token Authenticator extension. -func NewFactory() component.ExtensionFactory { - return component.NewExtensionFactory( +func NewFactory() extension.Factory { + return extension.NewFactory( typeStr, createDefaultConfig, createExtension, @@ -45,6 +46,6 @@ func createDefaultConfig() component.Config { } } -func createExtension(_ context.Context, set component.ExtensionCreateSettings, cfg component.Config) (component.Extension, error) { +func createExtension(_ context.Context, set extension.CreateSettings, cfg component.Config) (extension.Extension, error) { return newBearerTokenAuth(cfg.(*Config), set.Logger), nil } diff --git a/extension/bearertokenauthextension/factory_test.go b/extension/bearertokenauthextension/factory_test.go index bcd68b557dd1..c07e94823ef2 100644 --- a/extension/bearertokenauthextension/factory_test.go +++ b/extension/bearertokenauthextension/factory_test.go @@ -23,6 +23,7 @@ import ( "go.opentelemetry.io/collector/component" "go.opentelemetry.io/collector/component/componenttest" "go.opentelemetry.io/collector/config" + "go.opentelemetry.io/collector/extension/extensiontest" ) func TestFactory_CreateDefaultConfig(t *testing.T) { @@ -34,7 +35,7 @@ func TestFactory_CreateDefaultConfig(t *testing.T) { func TestFactory_CreateExtension(t *testing.T) { cfg := createDefaultConfig().(*Config) cfg.BearerToken = "somerandometoken" - ext, err := createExtension(context.Background(), componenttest.NewNopExtensionCreateSettings(), cfg) + ext, err := createExtension(context.Background(), extensiontest.NewNopCreateSettings(), cfg) require.NoError(t, err) require.NotNil(t, ext) } diff --git a/extension/bearertokenauthextension/go.mod b/extension/bearertokenauthextension/go.mod index ab58c5d7a8a9..3c9bdff58bc4 100644 --- a/extension/bearertokenauthextension/go.mod +++ b/extension/bearertokenauthextension/go.mod @@ -5,9 +5,10 @@ go 1.18 require ( github.com/fsnotify/fsnotify v1.6.0 github.com/stretchr/testify v1.8.1 - go.opentelemetry.io/collector v0.66.1-0.20221128222955-4ff1ff379b90 - go.opentelemetry.io/collector/component v0.66.1-0.20221128222955-4ff1ff379b90 - go.uber.org/zap v1.23.0 + go.opentelemetry.io/collector v0.66.1-0.20221202005155-1c54042beb70 + go.opentelemetry.io/collector/component v0.66.1-0.20221202005155-1c54042beb70 + go.opentelemetry.io/collector/confmap v0.0.0-20221201172708-2bdff61fa52a + go.uber.org/zap v1.24.0 google.golang.org/grpc v1.51.0 ) @@ -26,9 +27,9 @@ require ( github.com/modern-go/reflect2 v1.0.2 // indirect github.com/pelletier/go-toml v1.9.4 // indirect github.com/pmezard/go-difflib v1.0.0 // indirect - go.opentelemetry.io/collector/consumer v0.66.1-0.20221128222955-4ff1ff379b90 // indirect - go.opentelemetry.io/collector/featuregate v0.66.1-0.20221128222955-4ff1ff379b90 // indirect - go.opentelemetry.io/collector/pdata v0.66.1-0.20221128222955-4ff1ff379b90 // indirect + go.opentelemetry.io/collector/consumer v0.66.1-0.20221202005155-1c54042beb70 // indirect + go.opentelemetry.io/collector/featuregate v0.66.1-0.20221202005155-1c54042beb70 // indirect + go.opentelemetry.io/collector/pdata v0.66.1-0.20221202005155-1c54042beb70 // 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 5eb94e226dc3..d8f484717480 100644 --- a/extension/bearertokenauthextension/go.sum +++ b/extension/bearertokenauthextension/go.sum @@ -266,16 +266,18 @@ github.com/yuin/goldmark v1.3.5/go.mod h1:mwnBkeHKe2W/ZEtQ+71ViKU8L12m81fl3OWwC1 go.etcd.io/etcd/api/v3 v3.5.4/go.mod h1:5GB2vv4A4AOn3yk7MftYGHkUfGtDHnEraIjym4dYz5A= go.etcd.io/etcd/client/pkg/v3 v3.5.4/go.mod h1:IJHfcCEKxYu1Os13ZdwCwIUTUVGYTSAM3YSwc9/Ac1g= go.etcd.io/etcd/client/v3 v3.5.4/go.mod h1:ZaRkVgBZC+L+dLCjTcF1hRXpgZXQPOvnA/Ak/gq3kiY= -go.opentelemetry.io/collector v0.66.1-0.20221128222955-4ff1ff379b90 h1:yRe05/jMdzH4TFHfndZ5h2o2hKBK/79W72j8w51qNsI= -go.opentelemetry.io/collector v0.66.1-0.20221128222955-4ff1ff379b90/go.mod h1:hE6jCs+0rfiufCrVPucKZTMwfHit1okfDPnwPT2eW1I= -go.opentelemetry.io/collector/component v0.66.1-0.20221128222955-4ff1ff379b90 h1:AYSNTXbezhNg43EuYdVVcgxE/2gBVrm00FDx4DOmQVg= -go.opentelemetry.io/collector/component v0.66.1-0.20221128222955-4ff1ff379b90/go.mod h1:0c84EqXUhvYe6KW7hJfh76tiI/5yjWCH2amwyQ06XLM= -go.opentelemetry.io/collector/consumer v0.66.1-0.20221128222955-4ff1ff379b90 h1:nzNXVfC1FzXBXCLMzbMv+qK3E4EGiNsnMhfVsBd2yzc= -go.opentelemetry.io/collector/consumer v0.66.1-0.20221128222955-4ff1ff379b90/go.mod h1:WtoRZa5SnxQO1ZEQdVxYpFcXCmq62rakv0oUSlPO0NQ= -go.opentelemetry.io/collector/featuregate v0.66.1-0.20221128222955-4ff1ff379b90 h1:UuJSFWbi9XxyNZsJKZuvpWg35BgRbcCGFH+38V2MAdw= -go.opentelemetry.io/collector/featuregate v0.66.1-0.20221128222955-4ff1ff379b90/go.mod h1:tewuFKJYalWBU0bmNKg++MC1ipINXUr6szYzOw2p1GI= -go.opentelemetry.io/collector/pdata v0.66.1-0.20221128222955-4ff1ff379b90 h1:Vu4S4jSNcd0VFPzxQNO4+UqGwnes1xJDoFLPRiWHm8I= -go.opentelemetry.io/collector/pdata v0.66.1-0.20221128222955-4ff1ff379b90/go.mod h1:pqyaznLzk21m+1KL6fwOsRryRELL+zNM0qiVSn0MbVc= +go.opentelemetry.io/collector v0.66.1-0.20221202005155-1c54042beb70 h1:INB2CsOtqqrija2KvMuIpbBQ3qX1BECEeR+d0NJX+oM= +go.opentelemetry.io/collector v0.66.1-0.20221202005155-1c54042beb70/go.mod h1:d0NHkHyANJy3HDTvYE/PoylMShUmFIbiir89ieI0X0c= +go.opentelemetry.io/collector/component v0.66.1-0.20221202005155-1c54042beb70 h1:dEoJhzCmRShgmVro/kXm6pouGElgxkH2DsvanzCeZtU= +go.opentelemetry.io/collector/component v0.66.1-0.20221202005155-1c54042beb70/go.mod h1:OsVnvFFe38QSpcuZlQ8cvarDzcloCexgQ1/B2m80F6U= +go.opentelemetry.io/collector/confmap v0.0.0-20221201172708-2bdff61fa52a h1:2TscCXAQASO2kU9xHcMIUM/FP29fiQIRTilZmliq/7I= +go.opentelemetry.io/collector/confmap v0.0.0-20221201172708-2bdff61fa52a/go.mod h1:qJ3e8bA8h4wz/jYlbeEUafVHdrU7DkpStnmIUAz6VTQ= +go.opentelemetry.io/collector/consumer v0.66.1-0.20221202005155-1c54042beb70 h1:XwpVjI1KeKGPXOZBLefGILMziPYuNf6IzbmiIEsIyI0= +go.opentelemetry.io/collector/consumer v0.66.1-0.20221202005155-1c54042beb70/go.mod h1:EWVBcSGcIcmeDGTnIboc/aqa3agsBeH8/q7yFWG7xVc= +go.opentelemetry.io/collector/featuregate v0.66.1-0.20221202005155-1c54042beb70 h1:V0tf4ebciqIs07jFATfLGdUpLRaEsi+AiWuA/in0G8Y= +go.opentelemetry.io/collector/featuregate v0.66.1-0.20221202005155-1c54042beb70/go.mod h1:tewuFKJYalWBU0bmNKg++MC1ipINXUr6szYzOw2p1GI= +go.opentelemetry.io/collector/pdata v0.66.1-0.20221202005155-1c54042beb70 h1:TPOrxkEMvZzfBSwF3ct+kUUgKA5g8unkZZbKQvJweeA= +go.opentelemetry.io/collector/pdata v0.66.1-0.20221202005155-1c54042beb70/go.mod h1:pqyaznLzk21m+1KL6fwOsRryRELL+zNM0qiVSn0MbVc= 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= @@ -291,8 +293,8 @@ go.uber.org/multierr v1.6.0/go.mod h1:cdWPpRnG4AhwMwsgIHip0KRBQjJy5kYEpYjJxpXp9i go.uber.org/multierr v1.8.0 h1:dg6GjLku4EH+249NNmoIciG9N/jURbDG+pFlTkhzIC8= go.uber.org/multierr v1.8.0/go.mod h1:7EAYxJLBy9rStEaz58O2t4Uvip6FSURkq8/ppBp95ak= go.uber.org/zap v1.17.0/go.mod h1:MXVU+bhUf/A7Xi2HNOnopQOrmycQ5Ih87HtOu4q5SSo= -go.uber.org/zap v1.23.0 h1:OjGQ5KQDEUawVHxNwQgPpiypGHOxo2mNZsOqTak4fFY= -go.uber.org/zap v1.23.0/go.mod h1:D+nX8jyLsMHMYrln8A0rJjFt/T/9/bGgIhAqxv5URuY= +go.uber.org/zap v1.24.0 h1:FiJd5l1UOLj0wCgbSE0rwwXHzEdAZS6hiiSnxJN/D60= +go.uber.org/zap v1.24.0/go.mod h1:2kMP+WWQ8aoFoedH3T2sq6iJ2yDWpHbP0f6MQbS9Gkg= golang.org/x/crypto v0.0.0-20180904163835-0709b304e793/go.mod h1:6SG95UA2DQfeDnfUPMdvaQW0Q7yPrPDi9nlGo2tz2b4= golang.org/x/crypto v0.0.0-20190308221718-c2843e01d9a2/go.mod h1:djNgcEr1/C05ACkg1iLfiJU5Ep61QUkGW8qpdssI0+w= golang.org/x/crypto v0.0.0-20190923035154-9ee001bba392/go.mod h1:/lpIB1dKB+9EgE3H3cr1v9wB50oz8l4C4h62xy7jSTY= diff --git a/extension/fluentbitextension/factory.go b/extension/fluentbitextension/factory.go index 903ee75d498b..42a2a9c43e25 100644 --- a/extension/fluentbitextension/factory.go +++ b/extension/fluentbitextension/factory.go @@ -20,6 +20,7 @@ import ( "go.opentelemetry.io/collector/component" "go.opentelemetry.io/collector/config" + "go.opentelemetry.io/collector/extension" "go.uber.org/zap" ) @@ -31,8 +32,8 @@ const ( var once sync.Once // NewFactory creates a factory for FluentBit extension. -func NewFactory() component.ExtensionFactory { - return component.NewExtensionFactory( +func NewFactory() extension.Factory { + return extension.NewFactory( typeStr, createDefaultConfig, createExtension, @@ -52,7 +53,7 @@ func logDeprecation(logger *zap.Logger) { }) } -func createExtension(_ context.Context, params component.ExtensionCreateSettings, cfg component.Config) (component.Extension, error) { +func createExtension(_ context.Context, params extension.CreateSettings, cfg component.Config) (extension.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 40f42a358a61..6ec1007f8182 100644 --- a/extension/fluentbitextension/factory_test.go +++ b/extension/fluentbitextension/factory_test.go @@ -23,6 +23,7 @@ import ( "go.opentelemetry.io/collector/component" "go.opentelemetry.io/collector/component/componenttest" "go.opentelemetry.io/collector/config" + "go.opentelemetry.io/collector/extension/extensiontest" ) func TestFactory_CreateDefaultConfig(t *testing.T) { @@ -32,14 +33,14 @@ func TestFactory_CreateDefaultConfig(t *testing.T) { }, cfg) assert.NoError(t, componenttest.CheckConfigStruct(cfg)) - ext, err := createExtension(context.Background(), componenttest.NewNopExtensionCreateSettings(), cfg) + ext, err := createExtension(context.Background(), extensiontest.NewNopCreateSettings(), cfg) require.NoError(t, err) require.NotNil(t, ext) } func TestFactory_CreateExtension(t *testing.T) { cfg := createDefaultConfig().(*Config) - ext, err := createExtension(context.Background(), componenttest.NewNopExtensionCreateSettings(), cfg) + ext, err := createExtension(context.Background(), extensiontest.NewNopCreateSettings(), cfg) require.NoError(t, err) require.NotNil(t, ext) } diff --git a/extension/fluentbitextension/go.mod b/extension/fluentbitextension/go.mod index 18fd61375308..2a291b454386 100644 --- a/extension/fluentbitextension/go.mod +++ b/extension/fluentbitextension/go.mod @@ -7,9 +7,10 @@ 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.66.1-0.20221128222955-4ff1ff379b90 - go.opentelemetry.io/collector/component v0.66.1-0.20221128222955-4ff1ff379b90 - go.uber.org/zap v1.23.0 + go.opentelemetry.io/collector v0.66.1-0.20221202005155-1c54042beb70 + go.opentelemetry.io/collector/component v0.66.1-0.20221202005155-1c54042beb70 + go.opentelemetry.io/collector/confmap v0.0.0-20221201172708-2bdff61fa52a + go.uber.org/zap v1.24.0 ) require ( @@ -29,12 +30,12 @@ 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/tklauser/go-sysconf v0.3.10 // indirect - github.com/tklauser/numcpus v0.4.0 // indirect + github.com/tklauser/go-sysconf v0.3.11 // indirect + github.com/tklauser/numcpus v0.6.0 // indirect github.com/yusufpapurcu/wmi v1.2.2 // indirect - go.opentelemetry.io/collector/consumer v0.66.1-0.20221128222955-4ff1ff379b90 // indirect - go.opentelemetry.io/collector/featuregate v0.66.1-0.20221128222955-4ff1ff379b90 // indirect - go.opentelemetry.io/collector/pdata v0.66.1-0.20221128222955-4ff1ff379b90 // indirect + go.opentelemetry.io/collector/consumer v0.66.1-0.20221202005155-1c54042beb70 // indirect + go.opentelemetry.io/collector/featuregate v0.66.1-0.20221202005155-1c54042beb70 // indirect + go.opentelemetry.io/collector/pdata v0.66.1-0.20221202005155-1c54042beb70 // 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 bb2e6c642e59..a9a19df47148 100644 --- a/extension/fluentbitextension/go.sum +++ b/extension/fluentbitextension/go.sum @@ -268,10 +268,12 @@ 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= -github.com/tklauser/go-sysconf v0.3.10 h1:IJ1AZGZRWbY8T5Vfk04D9WOA5WSejdflXxP03OUqALw= github.com/tklauser/go-sysconf v0.3.10/go.mod h1:C8XykCvCb+Gn0oNCWPIlcb0RuglQTYaQ2hGm7jmxEFk= -github.com/tklauser/numcpus v0.4.0 h1:E53Dm1HjH1/R2/aoCtXtPgzmElmn51aOkhCFSuZq//o= +github.com/tklauser/go-sysconf v0.3.11 h1:89WgdJhk5SNwJfu+GKyYveZ4IaJ7xAkecBo+KdJV0CM= +github.com/tklauser/go-sysconf v0.3.11/go.mod h1:GqXfhXY3kiPa0nAXPDIQIWzJbMCB7AmcWpGR8lSZfqI= github.com/tklauser/numcpus v0.4.0/go.mod h1:1+UI3pD8NW14VMwdgJNJ1ESk2UnwhAnz5hMwiKKqXCQ= +github.com/tklauser/numcpus v0.6.0 h1:kebhY2Qt+3U6RNK7UqpYNA+tJ23IBEGKkB7JQBfDYms= +github.com/tklauser/numcpus v0.6.0/go.mod h1:FEZLMke0lhOUG6w2JadTzp0a+Nl8PF/GFkQ5UVIcaL4= 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= @@ -280,16 +282,18 @@ 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.66.1-0.20221128222955-4ff1ff379b90 h1:yRe05/jMdzH4TFHfndZ5h2o2hKBK/79W72j8w51qNsI= -go.opentelemetry.io/collector v0.66.1-0.20221128222955-4ff1ff379b90/go.mod h1:hE6jCs+0rfiufCrVPucKZTMwfHit1okfDPnwPT2eW1I= -go.opentelemetry.io/collector/component v0.66.1-0.20221128222955-4ff1ff379b90 h1:AYSNTXbezhNg43EuYdVVcgxE/2gBVrm00FDx4DOmQVg= -go.opentelemetry.io/collector/component v0.66.1-0.20221128222955-4ff1ff379b90/go.mod h1:0c84EqXUhvYe6KW7hJfh76tiI/5yjWCH2amwyQ06XLM= -go.opentelemetry.io/collector/consumer v0.66.1-0.20221128222955-4ff1ff379b90 h1:nzNXVfC1FzXBXCLMzbMv+qK3E4EGiNsnMhfVsBd2yzc= -go.opentelemetry.io/collector/consumer v0.66.1-0.20221128222955-4ff1ff379b90/go.mod h1:WtoRZa5SnxQO1ZEQdVxYpFcXCmq62rakv0oUSlPO0NQ= -go.opentelemetry.io/collector/featuregate v0.66.1-0.20221128222955-4ff1ff379b90 h1:UuJSFWbi9XxyNZsJKZuvpWg35BgRbcCGFH+38V2MAdw= -go.opentelemetry.io/collector/featuregate v0.66.1-0.20221128222955-4ff1ff379b90/go.mod h1:tewuFKJYalWBU0bmNKg++MC1ipINXUr6szYzOw2p1GI= -go.opentelemetry.io/collector/pdata v0.66.1-0.20221128222955-4ff1ff379b90 h1:Vu4S4jSNcd0VFPzxQNO4+UqGwnes1xJDoFLPRiWHm8I= -go.opentelemetry.io/collector/pdata v0.66.1-0.20221128222955-4ff1ff379b90/go.mod h1:pqyaznLzk21m+1KL6fwOsRryRELL+zNM0qiVSn0MbVc= +go.opentelemetry.io/collector v0.66.1-0.20221202005155-1c54042beb70 h1:INB2CsOtqqrija2KvMuIpbBQ3qX1BECEeR+d0NJX+oM= +go.opentelemetry.io/collector v0.66.1-0.20221202005155-1c54042beb70/go.mod h1:d0NHkHyANJy3HDTvYE/PoylMShUmFIbiir89ieI0X0c= +go.opentelemetry.io/collector/component v0.66.1-0.20221202005155-1c54042beb70 h1:dEoJhzCmRShgmVro/kXm6pouGElgxkH2DsvanzCeZtU= +go.opentelemetry.io/collector/component v0.66.1-0.20221202005155-1c54042beb70/go.mod h1:OsVnvFFe38QSpcuZlQ8cvarDzcloCexgQ1/B2m80F6U= +go.opentelemetry.io/collector/confmap v0.0.0-20221201172708-2bdff61fa52a h1:2TscCXAQASO2kU9xHcMIUM/FP29fiQIRTilZmliq/7I= +go.opentelemetry.io/collector/confmap v0.0.0-20221201172708-2bdff61fa52a/go.mod h1:qJ3e8bA8h4wz/jYlbeEUafVHdrU7DkpStnmIUAz6VTQ= +go.opentelemetry.io/collector/consumer v0.66.1-0.20221202005155-1c54042beb70 h1:XwpVjI1KeKGPXOZBLefGILMziPYuNf6IzbmiIEsIyI0= +go.opentelemetry.io/collector/consumer v0.66.1-0.20221202005155-1c54042beb70/go.mod h1:EWVBcSGcIcmeDGTnIboc/aqa3agsBeH8/q7yFWG7xVc= +go.opentelemetry.io/collector/featuregate v0.66.1-0.20221202005155-1c54042beb70 h1:V0tf4ebciqIs07jFATfLGdUpLRaEsi+AiWuA/in0G8Y= +go.opentelemetry.io/collector/featuregate v0.66.1-0.20221202005155-1c54042beb70/go.mod h1:tewuFKJYalWBU0bmNKg++MC1ipINXUr6szYzOw2p1GI= +go.opentelemetry.io/collector/pdata v0.66.1-0.20221202005155-1c54042beb70 h1:TPOrxkEMvZzfBSwF3ct+kUUgKA5g8unkZZbKQvJweeA= +go.opentelemetry.io/collector/pdata v0.66.1-0.20221202005155-1c54042beb70/go.mod h1:pqyaznLzk21m+1KL6fwOsRryRELL+zNM0qiVSn0MbVc= 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= @@ -305,8 +309,8 @@ go.uber.org/multierr v1.6.0/go.mod h1:cdWPpRnG4AhwMwsgIHip0KRBQjJy5kYEpYjJxpXp9i go.uber.org/multierr v1.8.0 h1:dg6GjLku4EH+249NNmoIciG9N/jURbDG+pFlTkhzIC8= go.uber.org/multierr v1.8.0/go.mod h1:7EAYxJLBy9rStEaz58O2t4Uvip6FSURkq8/ppBp95ak= go.uber.org/zap v1.17.0/go.mod h1:MXVU+bhUf/A7Xi2HNOnopQOrmycQ5Ih87HtOu4q5SSo= -go.uber.org/zap v1.23.0 h1:OjGQ5KQDEUawVHxNwQgPpiypGHOxo2mNZsOqTak4fFY= -go.uber.org/zap v1.23.0/go.mod h1:D+nX8jyLsMHMYrln8A0rJjFt/T/9/bGgIhAqxv5URuY= +go.uber.org/zap v1.24.0 h1:FiJd5l1UOLj0wCgbSE0rwwXHzEdAZS6hiiSnxJN/D60= +go.uber.org/zap v1.24.0/go.mod h1:2kMP+WWQ8aoFoedH3T2sq6iJ2yDWpHbP0f6MQbS9Gkg= golang.org/x/crypto v0.0.0-20180904163835-0709b304e793/go.mod h1:6SG95UA2DQfeDnfUPMdvaQW0Q7yPrPDi9nlGo2tz2b4= golang.org/x/crypto v0.0.0-20190308221718-c2843e01d9a2/go.mod h1:djNgcEr1/C05ACkg1iLfiJU5Ep61QUkGW8qpdssI0+w= golang.org/x/crypto v0.0.0-20190923035154-9ee001bba392/go.mod h1:/lpIB1dKB+9EgE3H3cr1v9wB50oz8l4C4h62xy7jSTY= diff --git a/extension/headerssetterextension/extension.go b/extension/headerssetterextension/extension.go index cc5d4249e7d6..bbd1056af8d3 100644 --- a/extension/headerssetterextension/extension.go +++ b/extension/headerssetterextension/extension.go @@ -20,7 +20,7 @@ import ( "fmt" "net/http" - "go.opentelemetry.io/collector/config/configauth" + "go.opentelemetry.io/collector/extension/auth" "google.golang.org/grpc/credentials" "github.com/open-telemetry/opentelemetry-collector-contrib/extension/headerssetterextension/internal/source" @@ -31,7 +31,7 @@ type Header struct { source source.Source } -func newHeadersSetterExtension(cfg *Config) (configauth.ClientAuthenticator, error) { +func newHeadersSetterExtension(cfg *Config) (auth.Client, error) { if cfg == nil { return nil, errors.New("extension configuration is not provided") } @@ -51,15 +51,15 @@ func newHeadersSetterExtension(cfg *Config) (configauth.ClientAuthenticator, err headers = append(headers, Header{key: *header.Key, source: s}) } - return configauth.NewClientAuthenticator( - configauth.WithClientRoundTripper( + return auth.NewClient( + auth.WithClientRoundTripper( func(base http.RoundTripper) (http.RoundTripper, error) { return &headersRoundTripper{ base: base, headers: headers, }, nil }), - configauth.WithPerRPCCredentials(func() (credentials.PerRPCCredentials, error) { + auth.WithClientPerRPCCredentials(func() (credentials.PerRPCCredentials, error) { return &headersPerRPC{headers: headers}, nil }), ), nil diff --git a/extension/headerssetterextension/factory.go b/extension/headerssetterextension/factory.go index 3d6d5015657f..fef86786a8f0 100644 --- a/extension/headerssetterextension/factory.go +++ b/extension/headerssetterextension/factory.go @@ -19,6 +19,7 @@ import ( "go.opentelemetry.io/collector/component" "go.opentelemetry.io/collector/config" + "go.opentelemetry.io/collector/extension" ) const ( @@ -26,8 +27,8 @@ const ( ) // NewFactory creates a factory for the headers setter extension. -func NewFactory() component.ExtensionFactory { - return component.NewExtensionFactory( +func NewFactory() extension.Factory { + return extension.NewFactory( typeStr, createDefaultConfig, createExtension, @@ -43,8 +44,8 @@ func createDefaultConfig() component.Config { func createExtension( _ context.Context, - _ component.ExtensionCreateSettings, + _ extension.CreateSettings, cfg component.Config, -) (component.Extension, error) { +) (extension.Extension, error) { return newHeadersSetterExtension(cfg.(*Config)) } diff --git a/extension/headerssetterextension/factory_test.go b/extension/headerssetterextension/factory_test.go index e77794bcd541..268d9d6cf3bf 100644 --- a/extension/headerssetterextension/factory_test.go +++ b/extension/headerssetterextension/factory_test.go @@ -22,6 +22,7 @@ import ( "go.opentelemetry.io/collector/component" "go.opentelemetry.io/collector/component/componenttest" "go.opentelemetry.io/collector/config" + "go.opentelemetry.io/collector/extension/extensiontest" ) func TestCreateDefaultConfig(t *testing.T) { @@ -38,7 +39,7 @@ func TestCreateDefaultConfig(t *testing.T) { func TestCreateExtension(t *testing.T) { cfg := createDefaultConfig().(*Config) - ext, err := createExtension(context.Background(), componenttest.NewNopExtensionCreateSettings(), cfg) + ext, err := createExtension(context.Background(), extensiontest.NewNopCreateSettings(), cfg) assert.NoError(t, err) assert.NotNil(t, ext) } diff --git a/extension/headerssetterextension/go.mod b/extension/headerssetterextension/go.mod index 58991e67cac5..734722c52ea0 100644 --- a/extension/headerssetterextension/go.mod +++ b/extension/headerssetterextension/go.mod @@ -4,8 +4,9 @@ go 1.18 require ( github.com/stretchr/testify v1.8.1 - go.opentelemetry.io/collector v0.66.1-0.20221128222955-4ff1ff379b90 - go.opentelemetry.io/collector/component v0.66.1-0.20221128222955-4ff1ff379b90 + go.opentelemetry.io/collector v0.66.1-0.20221202005155-1c54042beb70 + go.opentelemetry.io/collector/component v0.66.1-0.20221202005155-1c54042beb70 + go.opentelemetry.io/collector/confmap v0.0.0-20221201172708-2bdff61fa52a google.golang.org/grpc v1.51.0 ) @@ -21,15 +22,15 @@ 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/consumer v0.66.1-0.20221128222955-4ff1ff379b90 // indirect - go.opentelemetry.io/collector/featuregate v0.66.1-0.20221128222955-4ff1ff379b90 // indirect - go.opentelemetry.io/collector/pdata v0.66.1-0.20221128222955-4ff1ff379b90 // indirect + go.opentelemetry.io/collector/consumer v0.66.1-0.20221202005155-1c54042beb70 // indirect + go.opentelemetry.io/collector/featuregate v0.66.1-0.20221202005155-1c54042beb70 // indirect + go.opentelemetry.io/collector/pdata v0.66.1-0.20221202005155-1c54042beb70 // 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 go.uber.org/atomic v1.10.0 // indirect go.uber.org/multierr v1.8.0 // indirect - go.uber.org/zap v1.23.0 // indirect + go.uber.org/zap v1.24.0 // indirect golang.org/x/net v0.0.0-20220722155237-a158d28d115b // indirect golang.org/x/sys v0.2.0 // indirect golang.org/x/text v0.4.0 // indirect diff --git a/extension/headerssetterextension/go.sum b/extension/headerssetterextension/go.sum index bb7d1973a697..1324c1ca4278 100644 --- a/extension/headerssetterextension/go.sum +++ b/extension/headerssetterextension/go.sum @@ -257,16 +257,18 @@ github.com/yuin/goldmark v1.3.5/go.mod h1:mwnBkeHKe2W/ZEtQ+71ViKU8L12m81fl3OWwC1 go.etcd.io/etcd/api/v3 v3.5.4/go.mod h1:5GB2vv4A4AOn3yk7MftYGHkUfGtDHnEraIjym4dYz5A= go.etcd.io/etcd/client/pkg/v3 v3.5.4/go.mod h1:IJHfcCEKxYu1Os13ZdwCwIUTUVGYTSAM3YSwc9/Ac1g= go.etcd.io/etcd/client/v3 v3.5.4/go.mod h1:ZaRkVgBZC+L+dLCjTcF1hRXpgZXQPOvnA/Ak/gq3kiY= -go.opentelemetry.io/collector v0.66.1-0.20221128222955-4ff1ff379b90 h1:yRe05/jMdzH4TFHfndZ5h2o2hKBK/79W72j8w51qNsI= -go.opentelemetry.io/collector v0.66.1-0.20221128222955-4ff1ff379b90/go.mod h1:hE6jCs+0rfiufCrVPucKZTMwfHit1okfDPnwPT2eW1I= -go.opentelemetry.io/collector/component v0.66.1-0.20221128222955-4ff1ff379b90 h1:AYSNTXbezhNg43EuYdVVcgxE/2gBVrm00FDx4DOmQVg= -go.opentelemetry.io/collector/component v0.66.1-0.20221128222955-4ff1ff379b90/go.mod h1:0c84EqXUhvYe6KW7hJfh76tiI/5yjWCH2amwyQ06XLM= -go.opentelemetry.io/collector/consumer v0.66.1-0.20221128222955-4ff1ff379b90 h1:nzNXVfC1FzXBXCLMzbMv+qK3E4EGiNsnMhfVsBd2yzc= -go.opentelemetry.io/collector/consumer v0.66.1-0.20221128222955-4ff1ff379b90/go.mod h1:WtoRZa5SnxQO1ZEQdVxYpFcXCmq62rakv0oUSlPO0NQ= -go.opentelemetry.io/collector/featuregate v0.66.1-0.20221128222955-4ff1ff379b90 h1:UuJSFWbi9XxyNZsJKZuvpWg35BgRbcCGFH+38V2MAdw= -go.opentelemetry.io/collector/featuregate v0.66.1-0.20221128222955-4ff1ff379b90/go.mod h1:tewuFKJYalWBU0bmNKg++MC1ipINXUr6szYzOw2p1GI= -go.opentelemetry.io/collector/pdata v0.66.1-0.20221128222955-4ff1ff379b90 h1:Vu4S4jSNcd0VFPzxQNO4+UqGwnes1xJDoFLPRiWHm8I= -go.opentelemetry.io/collector/pdata v0.66.1-0.20221128222955-4ff1ff379b90/go.mod h1:pqyaznLzk21m+1KL6fwOsRryRELL+zNM0qiVSn0MbVc= +go.opentelemetry.io/collector v0.66.1-0.20221202005155-1c54042beb70 h1:INB2CsOtqqrija2KvMuIpbBQ3qX1BECEeR+d0NJX+oM= +go.opentelemetry.io/collector v0.66.1-0.20221202005155-1c54042beb70/go.mod h1:d0NHkHyANJy3HDTvYE/PoylMShUmFIbiir89ieI0X0c= +go.opentelemetry.io/collector/component v0.66.1-0.20221202005155-1c54042beb70 h1:dEoJhzCmRShgmVro/kXm6pouGElgxkH2DsvanzCeZtU= +go.opentelemetry.io/collector/component v0.66.1-0.20221202005155-1c54042beb70/go.mod h1:OsVnvFFe38QSpcuZlQ8cvarDzcloCexgQ1/B2m80F6U= +go.opentelemetry.io/collector/confmap v0.0.0-20221201172708-2bdff61fa52a h1:2TscCXAQASO2kU9xHcMIUM/FP29fiQIRTilZmliq/7I= +go.opentelemetry.io/collector/confmap v0.0.0-20221201172708-2bdff61fa52a/go.mod h1:qJ3e8bA8h4wz/jYlbeEUafVHdrU7DkpStnmIUAz6VTQ= +go.opentelemetry.io/collector/consumer v0.66.1-0.20221202005155-1c54042beb70 h1:XwpVjI1KeKGPXOZBLefGILMziPYuNf6IzbmiIEsIyI0= +go.opentelemetry.io/collector/consumer v0.66.1-0.20221202005155-1c54042beb70/go.mod h1:EWVBcSGcIcmeDGTnIboc/aqa3agsBeH8/q7yFWG7xVc= +go.opentelemetry.io/collector/featuregate v0.66.1-0.20221202005155-1c54042beb70 h1:V0tf4ebciqIs07jFATfLGdUpLRaEsi+AiWuA/in0G8Y= +go.opentelemetry.io/collector/featuregate v0.66.1-0.20221202005155-1c54042beb70/go.mod h1:tewuFKJYalWBU0bmNKg++MC1ipINXUr6szYzOw2p1GI= +go.opentelemetry.io/collector/pdata v0.66.1-0.20221202005155-1c54042beb70 h1:TPOrxkEMvZzfBSwF3ct+kUUgKA5g8unkZZbKQvJweeA= +go.opentelemetry.io/collector/pdata v0.66.1-0.20221202005155-1c54042beb70/go.mod h1:pqyaznLzk21m+1KL6fwOsRryRELL+zNM0qiVSn0MbVc= 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= @@ -282,8 +284,8 @@ go.uber.org/multierr v1.6.0/go.mod h1:cdWPpRnG4AhwMwsgIHip0KRBQjJy5kYEpYjJxpXp9i go.uber.org/multierr v1.8.0 h1:dg6GjLku4EH+249NNmoIciG9N/jURbDG+pFlTkhzIC8= go.uber.org/multierr v1.8.0/go.mod h1:7EAYxJLBy9rStEaz58O2t4Uvip6FSURkq8/ppBp95ak= go.uber.org/zap v1.17.0/go.mod h1:MXVU+bhUf/A7Xi2HNOnopQOrmycQ5Ih87HtOu4q5SSo= -go.uber.org/zap v1.23.0 h1:OjGQ5KQDEUawVHxNwQgPpiypGHOxo2mNZsOqTak4fFY= -go.uber.org/zap v1.23.0/go.mod h1:D+nX8jyLsMHMYrln8A0rJjFt/T/9/bGgIhAqxv5URuY= +go.uber.org/zap v1.24.0 h1:FiJd5l1UOLj0wCgbSE0rwwXHzEdAZS6hiiSnxJN/D60= +go.uber.org/zap v1.24.0/go.mod h1:2kMP+WWQ8aoFoedH3T2sq6iJ2yDWpHbP0f6MQbS9Gkg= golang.org/x/crypto v0.0.0-20180904163835-0709b304e793/go.mod h1:6SG95UA2DQfeDnfUPMdvaQW0Q7yPrPDi9nlGo2tz2b4= golang.org/x/crypto v0.0.0-20190308221718-c2843e01d9a2/go.mod h1:djNgcEr1/C05ACkg1iLfiJU5Ep61QUkGW8qpdssI0+w= golang.org/x/crypto v0.0.0-20190923035154-9ee001bba392/go.mod h1:/lpIB1dKB+9EgE3H3cr1v9wB50oz8l4C4h62xy7jSTY= diff --git a/extension/healthcheckextension/factory.go b/extension/healthcheckextension/factory.go index ef669bed109b..9cd06b853d4d 100644 --- a/extension/healthcheckextension/factory.go +++ b/extension/healthcheckextension/factory.go @@ -20,6 +20,7 @@ import ( "go.opentelemetry.io/collector/component" "go.opentelemetry.io/collector/config" "go.opentelemetry.io/collector/config/confighttp" + "go.opentelemetry.io/collector/extension" ) const ( @@ -32,8 +33,8 @@ const ( ) // NewFactory creates a factory for HealthCheck extension. -func NewFactory() component.ExtensionFactory { - return component.NewExtensionFactory( +func NewFactory() extension.Factory { + return extension.NewFactory( typeStr, createDefaultConfig, createExtension, @@ -52,7 +53,7 @@ func createDefaultConfig() component.Config { } } -func createExtension(_ context.Context, set component.ExtensionCreateSettings, cfg component.Config) (component.Extension, error) { +func createExtension(_ context.Context, set extension.CreateSettings, cfg component.Config) (extension.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 6293294605ab..8df3e98daf13 100644 --- a/extension/healthcheckextension/factory_test.go +++ b/extension/healthcheckextension/factory_test.go @@ -24,6 +24,7 @@ import ( "go.opentelemetry.io/collector/component/componenttest" "go.opentelemetry.io/collector/config" "go.opentelemetry.io/collector/config/confighttp" + "go.opentelemetry.io/collector/extension/extensiontest" "github.com/open-telemetry/opentelemetry-collector-contrib/internal/common/testutil" ) @@ -40,7 +41,7 @@ func TestFactory_CreateDefaultConfig(t *testing.T) { }, cfg) assert.NoError(t, componenttest.CheckConfigStruct(cfg)) - ext, err := createExtension(context.Background(), componenttest.NewNopExtensionCreateSettings(), cfg) + ext, err := createExtension(context.Background(), extensiontest.NewNopCreateSettings(), cfg) require.NoError(t, err) require.NotNil(t, ext) } @@ -49,7 +50,7 @@ func TestFactory_CreateExtension(t *testing.T) { cfg := createDefaultConfig().(*Config) cfg.Endpoint = testutil.GetAvailableLocalAddress(t) - ext, err := createExtension(context.Background(), componenttest.NewNopExtensionCreateSettings(), cfg) + ext, err := createExtension(context.Background(), extensiontest.NewNopCreateSettings(), cfg) require.NoError(t, err) require.NotNil(t, ext) } diff --git a/extension/healthcheckextension/go.mod b/extension/healthcheckextension/go.mod index 6bc1db622889..b8e4d1a34f15 100644 --- a/extension/healthcheckextension/go.mod +++ b/extension/healthcheckextension/go.mod @@ -7,9 +7,10 @@ require ( github.com/open-telemetry/opentelemetry-collector-contrib/internal/common v0.66.0 github.com/stretchr/testify v1.8.1 go.opencensus.io v0.24.0 - go.opentelemetry.io/collector v0.66.1-0.20221128222955-4ff1ff379b90 - go.opentelemetry.io/collector/component v0.66.1-0.20221128222955-4ff1ff379b90 - go.uber.org/zap v1.23.0 + go.opentelemetry.io/collector v0.66.1-0.20221202005155-1c54042beb70 + go.opentelemetry.io/collector/component v0.66.1-0.20221202005155-1c54042beb70 + go.opentelemetry.io/collector/confmap v0.0.0-20221201172708-2bdff61fa52a + go.uber.org/zap v1.24.0 ) require ( @@ -30,9 +31,9 @@ require ( github.com/modern-go/reflect2 v1.0.2 // indirect github.com/pmezard/go-difflib v1.0.0 // indirect github.com/rs/cors v1.8.2 // indirect - go.opentelemetry.io/collector/consumer v0.66.1-0.20221128222955-4ff1ff379b90 // indirect - go.opentelemetry.io/collector/featuregate v0.66.1-0.20221128222955-4ff1ff379b90 // indirect - go.opentelemetry.io/collector/pdata v0.66.1-0.20221128222955-4ff1ff379b90 // indirect + go.opentelemetry.io/collector/consumer v0.66.1-0.20221202005155-1c54042beb70 // indirect + go.opentelemetry.io/collector/featuregate v0.66.1-0.20221202005155-1c54042beb70 // indirect + go.opentelemetry.io/collector/pdata v0.66.1-0.20221202005155-1c54042beb70 // 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 938eb1b6d447..ec0bc0c6e687 100644 --- a/extension/healthcheckextension/go.sum +++ b/extension/healthcheckextension/go.sum @@ -272,16 +272,18 @@ go.etcd.io/etcd/client/pkg/v3 v3.5.4/go.mod h1:IJHfcCEKxYu1Os13ZdwCwIUTUVGYTSAM3 go.etcd.io/etcd/client/v3 v3.5.4/go.mod h1:ZaRkVgBZC+L+dLCjTcF1hRXpgZXQPOvnA/Ak/gq3kiY= go.opencensus.io v0.24.0 h1:y73uSU6J157QMP2kn2r30vwW1A2W2WFwSCGnAVxeaD0= go.opencensus.io v0.24.0/go.mod h1:vNK8G9p7aAivkbmorf4v+7Hgx+Zs0yY+0fOtgBfjQKo= -go.opentelemetry.io/collector v0.66.1-0.20221128222955-4ff1ff379b90 h1:yRe05/jMdzH4TFHfndZ5h2o2hKBK/79W72j8w51qNsI= -go.opentelemetry.io/collector v0.66.1-0.20221128222955-4ff1ff379b90/go.mod h1:hE6jCs+0rfiufCrVPucKZTMwfHit1okfDPnwPT2eW1I= -go.opentelemetry.io/collector/component v0.66.1-0.20221128222955-4ff1ff379b90 h1:AYSNTXbezhNg43EuYdVVcgxE/2gBVrm00FDx4DOmQVg= -go.opentelemetry.io/collector/component v0.66.1-0.20221128222955-4ff1ff379b90/go.mod h1:0c84EqXUhvYe6KW7hJfh76tiI/5yjWCH2amwyQ06XLM= -go.opentelemetry.io/collector/consumer v0.66.1-0.20221128222955-4ff1ff379b90 h1:nzNXVfC1FzXBXCLMzbMv+qK3E4EGiNsnMhfVsBd2yzc= -go.opentelemetry.io/collector/consumer v0.66.1-0.20221128222955-4ff1ff379b90/go.mod h1:WtoRZa5SnxQO1ZEQdVxYpFcXCmq62rakv0oUSlPO0NQ= -go.opentelemetry.io/collector/featuregate v0.66.1-0.20221128222955-4ff1ff379b90 h1:UuJSFWbi9XxyNZsJKZuvpWg35BgRbcCGFH+38V2MAdw= -go.opentelemetry.io/collector/featuregate v0.66.1-0.20221128222955-4ff1ff379b90/go.mod h1:tewuFKJYalWBU0bmNKg++MC1ipINXUr6szYzOw2p1GI= -go.opentelemetry.io/collector/pdata v0.66.1-0.20221128222955-4ff1ff379b90 h1:Vu4S4jSNcd0VFPzxQNO4+UqGwnes1xJDoFLPRiWHm8I= -go.opentelemetry.io/collector/pdata v0.66.1-0.20221128222955-4ff1ff379b90/go.mod h1:pqyaznLzk21m+1KL6fwOsRryRELL+zNM0qiVSn0MbVc= +go.opentelemetry.io/collector v0.66.1-0.20221202005155-1c54042beb70 h1:INB2CsOtqqrija2KvMuIpbBQ3qX1BECEeR+d0NJX+oM= +go.opentelemetry.io/collector v0.66.1-0.20221202005155-1c54042beb70/go.mod h1:d0NHkHyANJy3HDTvYE/PoylMShUmFIbiir89ieI0X0c= +go.opentelemetry.io/collector/component v0.66.1-0.20221202005155-1c54042beb70 h1:dEoJhzCmRShgmVro/kXm6pouGElgxkH2DsvanzCeZtU= +go.opentelemetry.io/collector/component v0.66.1-0.20221202005155-1c54042beb70/go.mod h1:OsVnvFFe38QSpcuZlQ8cvarDzcloCexgQ1/B2m80F6U= +go.opentelemetry.io/collector/confmap v0.0.0-20221201172708-2bdff61fa52a h1:2TscCXAQASO2kU9xHcMIUM/FP29fiQIRTilZmliq/7I= +go.opentelemetry.io/collector/confmap v0.0.0-20221201172708-2bdff61fa52a/go.mod h1:qJ3e8bA8h4wz/jYlbeEUafVHdrU7DkpStnmIUAz6VTQ= +go.opentelemetry.io/collector/consumer v0.66.1-0.20221202005155-1c54042beb70 h1:XwpVjI1KeKGPXOZBLefGILMziPYuNf6IzbmiIEsIyI0= +go.opentelemetry.io/collector/consumer v0.66.1-0.20221202005155-1c54042beb70/go.mod h1:EWVBcSGcIcmeDGTnIboc/aqa3agsBeH8/q7yFWG7xVc= +go.opentelemetry.io/collector/featuregate v0.66.1-0.20221202005155-1c54042beb70 h1:V0tf4ebciqIs07jFATfLGdUpLRaEsi+AiWuA/in0G8Y= +go.opentelemetry.io/collector/featuregate v0.66.1-0.20221202005155-1c54042beb70/go.mod h1:tewuFKJYalWBU0bmNKg++MC1ipINXUr6szYzOw2p1GI= +go.opentelemetry.io/collector/pdata v0.66.1-0.20221202005155-1c54042beb70 h1:TPOrxkEMvZzfBSwF3ct+kUUgKA5g8unkZZbKQvJweeA= +go.opentelemetry.io/collector/pdata v0.66.1-0.20221202005155-1c54042beb70/go.mod h1:pqyaznLzk21m+1KL6fwOsRryRELL+zNM0qiVSn0MbVc= 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= @@ -298,8 +300,8 @@ go.uber.org/multierr v1.6.0/go.mod h1:cdWPpRnG4AhwMwsgIHip0KRBQjJy5kYEpYjJxpXp9i go.uber.org/multierr v1.8.0 h1:dg6GjLku4EH+249NNmoIciG9N/jURbDG+pFlTkhzIC8= go.uber.org/multierr v1.8.0/go.mod h1:7EAYxJLBy9rStEaz58O2t4Uvip6FSURkq8/ppBp95ak= go.uber.org/zap v1.17.0/go.mod h1:MXVU+bhUf/A7Xi2HNOnopQOrmycQ5Ih87HtOu4q5SSo= -go.uber.org/zap v1.23.0 h1:OjGQ5KQDEUawVHxNwQgPpiypGHOxo2mNZsOqTak4fFY= -go.uber.org/zap v1.23.0/go.mod h1:D+nX8jyLsMHMYrln8A0rJjFt/T/9/bGgIhAqxv5URuY= +go.uber.org/zap v1.24.0 h1:FiJd5l1UOLj0wCgbSE0rwwXHzEdAZS6hiiSnxJN/D60= +go.uber.org/zap v1.24.0/go.mod h1:2kMP+WWQ8aoFoedH3T2sq6iJ2yDWpHbP0f6MQbS9Gkg= golang.org/x/crypto v0.0.0-20180904163835-0709b304e793/go.mod h1:6SG95UA2DQfeDnfUPMdvaQW0Q7yPrPDi9nlGo2tz2b4= golang.org/x/crypto v0.0.0-20190308221718-c2843e01d9a2/go.mod h1:djNgcEr1/C05ACkg1iLfiJU5Ep61QUkGW8qpdssI0+w= golang.org/x/crypto v0.0.0-20190923035154-9ee001bba392/go.mod h1:/lpIB1dKB+9EgE3H3cr1v9wB50oz8l4C4h62xy7jSTY= diff --git a/extension/healthcheckextension/healthcheckextension.go b/extension/healthcheckextension/healthcheckextension.go index fc18090f05cd..da26b6de5ed3 100644 --- a/extension/healthcheckextension/healthcheckextension.go +++ b/extension/healthcheckextension/healthcheckextension.go @@ -24,6 +24,7 @@ import ( "github.com/jaegertracing/jaeger/pkg/healthcheck" "go.opencensus.io/stats/view" "go.opentelemetry.io/collector/component" + "go.opentelemetry.io/collector/extension" "go.uber.org/zap" ) @@ -37,7 +38,7 @@ type healthCheckExtension struct { settings component.TelemetrySettings } -var _ component.PipelineWatcher = (*healthCheckExtension)(nil) +var _ extension.PipelineWatcher = (*healthCheckExtension)(nil) func (hc *healthCheckExtension) Start(_ context.Context, host component.Host) error { diff --git a/extension/httpforwarder/extension.go b/extension/httpforwarder/extension.go index f5917a768c3f..888f92461f52 100644 --- a/extension/httpforwarder/extension.go +++ b/extension/httpforwarder/extension.go @@ -23,6 +23,7 @@ import ( "net/url" "go.opentelemetry.io/collector/component" + "go.opentelemetry.io/collector/extension" "go.uber.org/zap" ) @@ -34,7 +35,7 @@ type httpForwarder struct { config *Config } -var _ component.Extension = (*httpForwarder)(nil) +var _ extension.Extension = (*httpForwarder)(nil) func (h *httpForwarder) Start(_ context.Context, host component.Host) error { listener, err := h.config.Ingress.ToListener() @@ -117,7 +118,7 @@ func addViaHeader(header http.Header, protocol string, host string) { header.Add("Via", fmt.Sprintf("%s %s", protocol, host)) } -func newHTTPForwarder(config *Config, settings component.TelemetrySettings) (component.Extension, error) { +func newHTTPForwarder(config *Config, settings component.TelemetrySettings) (extension.Extension, error) { if config.Egress.Endpoint == "" { return nil, errors.New("'egress.endpoint' config option cannot be empty") } diff --git a/extension/httpforwarder/factory.go b/extension/httpforwarder/factory.go index ba614a180c49..a1dd203c51bf 100644 --- a/extension/httpforwarder/factory.go +++ b/extension/httpforwarder/factory.go @@ -21,6 +21,7 @@ import ( "go.opentelemetry.io/collector/component" "go.opentelemetry.io/collector/config" "go.opentelemetry.io/collector/config/confighttp" + "go.opentelemetry.io/collector/extension" ) const ( @@ -32,8 +33,8 @@ const ( ) // NewFactory creates a factory for HostObserver extension. -func NewFactory() component.ExtensionFactory { - return component.NewExtensionFactory( +func NewFactory() extension.Factory { + return extension.NewFactory( typeStr, createDefaultConfig, createExtension, @@ -54,8 +55,8 @@ func createDefaultConfig() component.Config { func createExtension( _ context.Context, - params component.ExtensionCreateSettings, + params extension.CreateSettings, cfg component.Config, -) (component.Extension, error) { +) (extension.Extension, error) { return newHTTPForwarder(cfg.(*Config), params.TelemetrySettings) } diff --git a/extension/httpforwarder/factory_test.go b/extension/httpforwarder/factory_test.go index 12d777095977..410bf257a4bb 100644 --- a/extension/httpforwarder/factory_test.go +++ b/extension/httpforwarder/factory_test.go @@ -24,6 +24,7 @@ import ( "go.opentelemetry.io/collector/component" "go.opentelemetry.io/collector/component/componenttest" "go.opentelemetry.io/collector/config/confighttp" + "go.opentelemetry.io/collector/extension/extensiontest" ) func TestFactory(t *testing.T) { @@ -32,7 +33,6 @@ func TestFactory(t *testing.T) { require.Equal(t, component.Type(expectType), f.Type()) cfg := f.CreateDefaultConfig().(*Config) - require.Equal(t, component.NewID(typeStr), cfg.ID()) require.Equal(t, ":6060", cfg.Ingress.Endpoint) require.Equal(t, 10*time.Second, cfg.Egress.Timeout) @@ -63,7 +63,7 @@ func TestFactory(t *testing.T) { t.Run(test.name, func(t *testing.T) { e, err := f.CreateExtension( context.Background(), - componenttest.NewNopExtensionCreateSettings(), + extensiontest.NewNopCreateSettings(), test.config, ) if test.wantErr { diff --git a/extension/httpforwarder/go.mod b/extension/httpforwarder/go.mod index 08f2e288dc1a..ffc779597b41 100644 --- a/extension/httpforwarder/go.mod +++ b/extension/httpforwarder/go.mod @@ -5,9 +5,10 @@ go 1.18 require ( github.com/open-telemetry/opentelemetry-collector-contrib/internal/common v0.66.0 github.com/stretchr/testify v1.8.1 - go.opentelemetry.io/collector v0.66.1-0.20221128222955-4ff1ff379b90 - go.opentelemetry.io/collector/component v0.66.1-0.20221128222955-4ff1ff379b90 - go.uber.org/zap v1.23.0 + go.opentelemetry.io/collector v0.66.1-0.20221202005155-1c54042beb70 + go.opentelemetry.io/collector/component v0.66.1-0.20221202005155-1c54042beb70 + go.opentelemetry.io/collector/confmap v0.0.0-20221201172708-2bdff61fa52a + go.uber.org/zap v1.24.0 ) require ( @@ -32,9 +33,9 @@ require ( github.com/pmezard/go-difflib v1.0.0 // indirect github.com/rogpeppe/go-internal v1.8.0 // indirect github.com/rs/cors v1.8.2 // indirect - go.opentelemetry.io/collector/consumer v0.66.1-0.20221128222955-4ff1ff379b90 // indirect - go.opentelemetry.io/collector/featuregate v0.66.1-0.20221128222955-4ff1ff379b90 // indirect - go.opentelemetry.io/collector/pdata v0.66.1-0.20221128222955-4ff1ff379b90 // indirect + go.opentelemetry.io/collector/consumer v0.66.1-0.20221202005155-1c54042beb70 // indirect + go.opentelemetry.io/collector/featuregate v0.66.1-0.20221202005155-1c54042beb70 // indirect + go.opentelemetry.io/collector/pdata v0.66.1-0.20221202005155-1c54042beb70 // 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 055dd6856c09..040323515c59 100644 --- a/extension/httpforwarder/go.sum +++ b/extension/httpforwarder/go.sum @@ -279,16 +279,18 @@ github.com/yuin/goldmark v1.3.5/go.mod h1:mwnBkeHKe2W/ZEtQ+71ViKU8L12m81fl3OWwC1 go.etcd.io/etcd/api/v3 v3.5.4/go.mod h1:5GB2vv4A4AOn3yk7MftYGHkUfGtDHnEraIjym4dYz5A= go.etcd.io/etcd/client/pkg/v3 v3.5.4/go.mod h1:IJHfcCEKxYu1Os13ZdwCwIUTUVGYTSAM3YSwc9/Ac1g= go.etcd.io/etcd/client/v3 v3.5.4/go.mod h1:ZaRkVgBZC+L+dLCjTcF1hRXpgZXQPOvnA/Ak/gq3kiY= -go.opentelemetry.io/collector v0.66.1-0.20221128222955-4ff1ff379b90 h1:yRe05/jMdzH4TFHfndZ5h2o2hKBK/79W72j8w51qNsI= -go.opentelemetry.io/collector v0.66.1-0.20221128222955-4ff1ff379b90/go.mod h1:hE6jCs+0rfiufCrVPucKZTMwfHit1okfDPnwPT2eW1I= -go.opentelemetry.io/collector/component v0.66.1-0.20221128222955-4ff1ff379b90 h1:AYSNTXbezhNg43EuYdVVcgxE/2gBVrm00FDx4DOmQVg= -go.opentelemetry.io/collector/component v0.66.1-0.20221128222955-4ff1ff379b90/go.mod h1:0c84EqXUhvYe6KW7hJfh76tiI/5yjWCH2amwyQ06XLM= -go.opentelemetry.io/collector/consumer v0.66.1-0.20221128222955-4ff1ff379b90 h1:nzNXVfC1FzXBXCLMzbMv+qK3E4EGiNsnMhfVsBd2yzc= -go.opentelemetry.io/collector/consumer v0.66.1-0.20221128222955-4ff1ff379b90/go.mod h1:WtoRZa5SnxQO1ZEQdVxYpFcXCmq62rakv0oUSlPO0NQ= -go.opentelemetry.io/collector/featuregate v0.66.1-0.20221128222955-4ff1ff379b90 h1:UuJSFWbi9XxyNZsJKZuvpWg35BgRbcCGFH+38V2MAdw= -go.opentelemetry.io/collector/featuregate v0.66.1-0.20221128222955-4ff1ff379b90/go.mod h1:tewuFKJYalWBU0bmNKg++MC1ipINXUr6szYzOw2p1GI= -go.opentelemetry.io/collector/pdata v0.66.1-0.20221128222955-4ff1ff379b90 h1:Vu4S4jSNcd0VFPzxQNO4+UqGwnes1xJDoFLPRiWHm8I= -go.opentelemetry.io/collector/pdata v0.66.1-0.20221128222955-4ff1ff379b90/go.mod h1:pqyaznLzk21m+1KL6fwOsRryRELL+zNM0qiVSn0MbVc= +go.opentelemetry.io/collector v0.66.1-0.20221202005155-1c54042beb70 h1:INB2CsOtqqrija2KvMuIpbBQ3qX1BECEeR+d0NJX+oM= +go.opentelemetry.io/collector v0.66.1-0.20221202005155-1c54042beb70/go.mod h1:d0NHkHyANJy3HDTvYE/PoylMShUmFIbiir89ieI0X0c= +go.opentelemetry.io/collector/component v0.66.1-0.20221202005155-1c54042beb70 h1:dEoJhzCmRShgmVro/kXm6pouGElgxkH2DsvanzCeZtU= +go.opentelemetry.io/collector/component v0.66.1-0.20221202005155-1c54042beb70/go.mod h1:OsVnvFFe38QSpcuZlQ8cvarDzcloCexgQ1/B2m80F6U= +go.opentelemetry.io/collector/confmap v0.0.0-20221201172708-2bdff61fa52a h1:2TscCXAQASO2kU9xHcMIUM/FP29fiQIRTilZmliq/7I= +go.opentelemetry.io/collector/confmap v0.0.0-20221201172708-2bdff61fa52a/go.mod h1:qJ3e8bA8h4wz/jYlbeEUafVHdrU7DkpStnmIUAz6VTQ= +go.opentelemetry.io/collector/consumer v0.66.1-0.20221202005155-1c54042beb70 h1:XwpVjI1KeKGPXOZBLefGILMziPYuNf6IzbmiIEsIyI0= +go.opentelemetry.io/collector/consumer v0.66.1-0.20221202005155-1c54042beb70/go.mod h1:EWVBcSGcIcmeDGTnIboc/aqa3agsBeH8/q7yFWG7xVc= +go.opentelemetry.io/collector/featuregate v0.66.1-0.20221202005155-1c54042beb70 h1:V0tf4ebciqIs07jFATfLGdUpLRaEsi+AiWuA/in0G8Y= +go.opentelemetry.io/collector/featuregate v0.66.1-0.20221202005155-1c54042beb70/go.mod h1:tewuFKJYalWBU0bmNKg++MC1ipINXUr6szYzOw2p1GI= +go.opentelemetry.io/collector/pdata v0.66.1-0.20221202005155-1c54042beb70 h1:TPOrxkEMvZzfBSwF3ct+kUUgKA5g8unkZZbKQvJweeA= +go.opentelemetry.io/collector/pdata v0.66.1-0.20221202005155-1c54042beb70/go.mod h1:pqyaznLzk21m+1KL6fwOsRryRELL+zNM0qiVSn0MbVc= 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= @@ -306,8 +308,8 @@ go.uber.org/multierr v1.6.0/go.mod h1:cdWPpRnG4AhwMwsgIHip0KRBQjJy5kYEpYjJxpXp9i go.uber.org/multierr v1.8.0 h1:dg6GjLku4EH+249NNmoIciG9N/jURbDG+pFlTkhzIC8= go.uber.org/multierr v1.8.0/go.mod h1:7EAYxJLBy9rStEaz58O2t4Uvip6FSURkq8/ppBp95ak= go.uber.org/zap v1.17.0/go.mod h1:MXVU+bhUf/A7Xi2HNOnopQOrmycQ5Ih87HtOu4q5SSo= -go.uber.org/zap v1.23.0 h1:OjGQ5KQDEUawVHxNwQgPpiypGHOxo2mNZsOqTak4fFY= -go.uber.org/zap v1.23.0/go.mod h1:D+nX8jyLsMHMYrln8A0rJjFt/T/9/bGgIhAqxv5URuY= +go.uber.org/zap v1.24.0 h1:FiJd5l1UOLj0wCgbSE0rwwXHzEdAZS6hiiSnxJN/D60= +go.uber.org/zap v1.24.0/go.mod h1:2kMP+WWQ8aoFoedH3T2sq6iJ2yDWpHbP0f6MQbS9Gkg= golang.org/x/crypto v0.0.0-20180904163835-0709b304e793/go.mod h1:6SG95UA2DQfeDnfUPMdvaQW0Q7yPrPDi9nlGo2tz2b4= golang.org/x/crypto v0.0.0-20190308221718-c2843e01d9a2/go.mod h1:djNgcEr1/C05ACkg1iLfiJU5Ep61QUkGW8qpdssI0+w= golang.org/x/crypto v0.0.0-20190923035154-9ee001bba392/go.mod h1:/lpIB1dKB+9EgE3H3cr1v9wB50oz8l4C4h62xy7jSTY= diff --git a/extension/jaegerremotesampling/extension.go b/extension/jaegerremotesampling/extension.go index f1d97cbe1702..6a585f7face1 100644 --- a/extension/jaegerremotesampling/extension.go +++ b/extension/jaegerremotesampling/extension.go @@ -22,12 +22,13 @@ import ( "github.com/jaegertracing/jaeger/cmd/collector/app/sampling/strategystore" "github.com/jaegertracing/jaeger/plugin/sampling/strategystore/static" "go.opentelemetry.io/collector/component" + "go.opentelemetry.io/collector/extension" "go.uber.org/zap" "github.com/open-telemetry/opentelemetry-collector-contrib/extension/jaegerremotesampling/internal" ) -var _ component.Extension = (*jrsExtension)(nil) +var _ extension.Extension = (*jrsExtension)(nil) type jrsExtension struct { cfg *Config diff --git a/extension/jaegerremotesampling/factory.go b/extension/jaegerremotesampling/factory.go index 14bb39f56fee..aa8006a68ae5 100644 --- a/extension/jaegerremotesampling/factory.go +++ b/extension/jaegerremotesampling/factory.go @@ -22,6 +22,7 @@ import ( "go.opentelemetry.io/collector/config/configgrpc" "go.opentelemetry.io/collector/config/confighttp" "go.opentelemetry.io/collector/config/confignet" + "go.opentelemetry.io/collector/extension" ) const ( @@ -30,8 +31,8 @@ const ( ) // NewFactory creates a factory for the OIDC Authenticator extension. -func NewFactory() component.ExtensionFactory { - return component.NewExtensionFactory( +func NewFactory() extension.Factory { + return extension.NewFactory( typeStr, createDefaultConfig, createExtension, @@ -55,6 +56,6 @@ func createDefaultConfig() component.Config { } } -func createExtension(_ context.Context, set component.ExtensionCreateSettings, cfg component.Config) (component.Extension, error) { +func createExtension(_ context.Context, set extension.CreateSettings, cfg component.Config) (extension.Extension, error) { return newExtension(cfg.(*Config), set.TelemetrySettings), nil } diff --git a/extension/jaegerremotesampling/factory_test.go b/extension/jaegerremotesampling/factory_test.go index b7e98d32df3a..8ec97395f59f 100644 --- a/extension/jaegerremotesampling/factory_test.go +++ b/extension/jaegerremotesampling/factory_test.go @@ -25,6 +25,7 @@ import ( "go.opentelemetry.io/collector/config/configgrpc" "go.opentelemetry.io/collector/config/confighttp" "go.opentelemetry.io/collector/config/confignet" + "go.opentelemetry.io/collector/extension/extensiontest" ) func TestCreateDefaultConfig(t *testing.T) { @@ -49,7 +50,7 @@ func TestCreateDefaultConfig(t *testing.T) { func TestCreateExtension(t *testing.T) { cfg := createDefaultConfig().(*Config) - ext, err := createExtension(context.Background(), componenttest.NewNopExtensionCreateSettings(), cfg) + ext, err := createExtension(context.Background(), extensiontest.NewNopCreateSettings(), cfg) assert.NoError(t, err) assert.NotNil(t, ext) } diff --git a/extension/jaegerremotesampling/go.mod b/extension/jaegerremotesampling/go.mod index 47e13b1ef913..9636948a12a8 100644 --- a/extension/jaegerremotesampling/go.mod +++ b/extension/jaegerremotesampling/go.mod @@ -5,9 +5,10 @@ go 1.18 require ( github.com/jaegertracing/jaeger v1.39.1-0.20221110195127-14c11365a856 github.com/stretchr/testify v1.8.1 - go.opentelemetry.io/collector v0.66.1-0.20221128222955-4ff1ff379b90 - go.opentelemetry.io/collector/component v0.66.1-0.20221128222955-4ff1ff379b90 - go.uber.org/zap v1.23.0 + go.opentelemetry.io/collector v0.66.1-0.20221202005155-1c54042beb70 + go.opentelemetry.io/collector/component v0.66.1-0.20221202005155-1c54042beb70 + go.opentelemetry.io/collector/confmap v0.0.0-20221201172708-2bdff61fa52a + go.uber.org/zap v1.24.0 google.golang.org/grpc v1.51.0 ) @@ -46,9 +47,9 @@ require ( github.com/subosito/gotenv v1.4.1 // indirect github.com/uber/jaeger-client-go v2.30.0+incompatible // indirect github.com/uber/jaeger-lib v2.4.1+incompatible // indirect - go.opentelemetry.io/collector/consumer v0.66.1-0.20221128222955-4ff1ff379b90 // indirect - go.opentelemetry.io/collector/featuregate v0.66.1-0.20221128222955-4ff1ff379b90 // indirect - go.opentelemetry.io/collector/pdata v0.66.1-0.20221128222955-4ff1ff379b90 // indirect + go.opentelemetry.io/collector/consumer v0.66.1-0.20221202005155-1c54042beb70 // indirect + go.opentelemetry.io/collector/featuregate v0.66.1-0.20221202005155-1c54042beb70 // indirect + go.opentelemetry.io/collector/pdata v0.66.1-0.20221202005155-1c54042beb70 // 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 771fe9e0c3e4..bda09ab1d4d8 100644 --- a/extension/jaegerremotesampling/go.sum +++ b/extension/jaegerremotesampling/go.sum @@ -423,16 +423,18 @@ go.opencensus.io v0.22.3/go.mod h1:yxeiOL68Rb0Xd1ddK5vPZ/oVn4vY4Ynel7k9FzqtOIw= go.opencensus.io v0.22.4/go.mod h1:yxeiOL68Rb0Xd1ddK5vPZ/oVn4vY4Ynel7k9FzqtOIw= go.opencensus.io v0.22.5/go.mod h1:5pWMHQbX5EPX2/62yrJeAkowc+lfs/XD7Uxpq3pI6kk= go.opencensus.io v0.24.0 h1:y73uSU6J157QMP2kn2r30vwW1A2W2WFwSCGnAVxeaD0= -go.opentelemetry.io/collector v0.66.1-0.20221128222955-4ff1ff379b90 h1:yRe05/jMdzH4TFHfndZ5h2o2hKBK/79W72j8w51qNsI= -go.opentelemetry.io/collector v0.66.1-0.20221128222955-4ff1ff379b90/go.mod h1:hE6jCs+0rfiufCrVPucKZTMwfHit1okfDPnwPT2eW1I= -go.opentelemetry.io/collector/component v0.66.1-0.20221128222955-4ff1ff379b90 h1:AYSNTXbezhNg43EuYdVVcgxE/2gBVrm00FDx4DOmQVg= -go.opentelemetry.io/collector/component v0.66.1-0.20221128222955-4ff1ff379b90/go.mod h1:0c84EqXUhvYe6KW7hJfh76tiI/5yjWCH2amwyQ06XLM= -go.opentelemetry.io/collector/consumer v0.66.1-0.20221128222955-4ff1ff379b90 h1:nzNXVfC1FzXBXCLMzbMv+qK3E4EGiNsnMhfVsBd2yzc= -go.opentelemetry.io/collector/consumer v0.66.1-0.20221128222955-4ff1ff379b90/go.mod h1:WtoRZa5SnxQO1ZEQdVxYpFcXCmq62rakv0oUSlPO0NQ= -go.opentelemetry.io/collector/featuregate v0.66.1-0.20221128222955-4ff1ff379b90 h1:UuJSFWbi9XxyNZsJKZuvpWg35BgRbcCGFH+38V2MAdw= -go.opentelemetry.io/collector/featuregate v0.66.1-0.20221128222955-4ff1ff379b90/go.mod h1:tewuFKJYalWBU0bmNKg++MC1ipINXUr6szYzOw2p1GI= -go.opentelemetry.io/collector/pdata v0.66.1-0.20221128222955-4ff1ff379b90 h1:Vu4S4jSNcd0VFPzxQNO4+UqGwnes1xJDoFLPRiWHm8I= -go.opentelemetry.io/collector/pdata v0.66.1-0.20221128222955-4ff1ff379b90/go.mod h1:pqyaznLzk21m+1KL6fwOsRryRELL+zNM0qiVSn0MbVc= +go.opentelemetry.io/collector v0.66.1-0.20221202005155-1c54042beb70 h1:INB2CsOtqqrija2KvMuIpbBQ3qX1BECEeR+d0NJX+oM= +go.opentelemetry.io/collector v0.66.1-0.20221202005155-1c54042beb70/go.mod h1:d0NHkHyANJy3HDTvYE/PoylMShUmFIbiir89ieI0X0c= +go.opentelemetry.io/collector/component v0.66.1-0.20221202005155-1c54042beb70 h1:dEoJhzCmRShgmVro/kXm6pouGElgxkH2DsvanzCeZtU= +go.opentelemetry.io/collector/component v0.66.1-0.20221202005155-1c54042beb70/go.mod h1:OsVnvFFe38QSpcuZlQ8cvarDzcloCexgQ1/B2m80F6U= +go.opentelemetry.io/collector/confmap v0.0.0-20221201172708-2bdff61fa52a h1:2TscCXAQASO2kU9xHcMIUM/FP29fiQIRTilZmliq/7I= +go.opentelemetry.io/collector/confmap v0.0.0-20221201172708-2bdff61fa52a/go.mod h1:qJ3e8bA8h4wz/jYlbeEUafVHdrU7DkpStnmIUAz6VTQ= +go.opentelemetry.io/collector/consumer v0.66.1-0.20221202005155-1c54042beb70 h1:XwpVjI1KeKGPXOZBLefGILMziPYuNf6IzbmiIEsIyI0= +go.opentelemetry.io/collector/consumer v0.66.1-0.20221202005155-1c54042beb70/go.mod h1:EWVBcSGcIcmeDGTnIboc/aqa3agsBeH8/q7yFWG7xVc= +go.opentelemetry.io/collector/featuregate v0.66.1-0.20221202005155-1c54042beb70 h1:V0tf4ebciqIs07jFATfLGdUpLRaEsi+AiWuA/in0G8Y= +go.opentelemetry.io/collector/featuregate v0.66.1-0.20221202005155-1c54042beb70/go.mod h1:tewuFKJYalWBU0bmNKg++MC1ipINXUr6szYzOw2p1GI= +go.opentelemetry.io/collector/pdata v0.66.1-0.20221202005155-1c54042beb70 h1:TPOrxkEMvZzfBSwF3ct+kUUgKA5g8unkZZbKQvJweeA= +go.opentelemetry.io/collector/pdata v0.66.1-0.20221202005155-1c54042beb70/go.mod h1:pqyaznLzk21m+1KL6fwOsRryRELL+zNM0qiVSn0MbVc= 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= @@ -455,8 +457,8 @@ go.uber.org/multierr v1.6.0/go.mod h1:cdWPpRnG4AhwMwsgIHip0KRBQjJy5kYEpYjJxpXp9i go.uber.org/multierr v1.8.0 h1:dg6GjLku4EH+249NNmoIciG9N/jURbDG+pFlTkhzIC8= go.uber.org/multierr v1.8.0/go.mod h1:7EAYxJLBy9rStEaz58O2t4Uvip6FSURkq8/ppBp95ak= go.uber.org/zap v1.17.0/go.mod h1:MXVU+bhUf/A7Xi2HNOnopQOrmycQ5Ih87HtOu4q5SSo= -go.uber.org/zap v1.23.0 h1:OjGQ5KQDEUawVHxNwQgPpiypGHOxo2mNZsOqTak4fFY= -go.uber.org/zap v1.23.0/go.mod h1:D+nX8jyLsMHMYrln8A0rJjFt/T/9/bGgIhAqxv5URuY= +go.uber.org/zap v1.24.0 h1:FiJd5l1UOLj0wCgbSE0rwwXHzEdAZS6hiiSnxJN/D60= +go.uber.org/zap v1.24.0/go.mod h1:2kMP+WWQ8aoFoedH3T2sq6iJ2yDWpHbP0f6MQbS9Gkg= golang.org/x/crypto v0.0.0-20180904163835-0709b304e793/go.mod h1:6SG95UA2DQfeDnfUPMdvaQW0Q7yPrPDi9nlGo2tz2b4= golang.org/x/crypto v0.0.0-20190308221718-c2843e01d9a2/go.mod h1:djNgcEr1/C05ACkg1iLfiJU5Ep61QUkGW8qpdssI0+w= golang.org/x/crypto v0.0.0-20190510104115-cbcb75029529/go.mod h1:yigFU9vqHzYiE8UmvKecakEJjdnWj3jj499lnFckfCI= diff --git a/extension/oauth2clientauthextension/doc.go b/extension/oauth2clientauthextension/doc.go index e97bf9bc54ed..a26df16889ab 100644 --- a/extension/oauth2clientauthextension/doc.go +++ b/extension/oauth2clientauthextension/doc.go @@ -12,7 +12,7 @@ // See the License for the specific language governing permissions and // limitations under the License. -// Package oauth2clientcredentialsauthextension implements `configauth.ClientAuthenticator` +// Package oauth2clientauthextension implements `cauth.Client` // This extension provides OAuth2 Client Credentials flow authenticator for HTTP and gRPC based exporters. // The extension fetches and refreshes the token after expiry // For further details about OAuth2 Client Credentials flow refer https://datatracker.ietf.org/doc/html/rfc6749#section-4.4 diff --git a/extension/oauth2clientauthextension/factory.go b/extension/oauth2clientauthextension/factory.go index 7485f546c98f..492f139d407a 100644 --- a/extension/oauth2clientauthextension/factory.go +++ b/extension/oauth2clientauthextension/factory.go @@ -19,7 +19,8 @@ import ( "go.opentelemetry.io/collector/component" "go.opentelemetry.io/collector/config" - "go.opentelemetry.io/collector/config/configauth" + "go.opentelemetry.io/collector/extension" + "go.opentelemetry.io/collector/extension/auth" ) const ( @@ -28,8 +29,8 @@ const ( ) // NewFactory creates a factory for the OIDC Authenticator extension. -func NewFactory() component.ExtensionFactory { - return component.NewExtensionFactory( +func NewFactory() extension.Factory { + return extension.NewFactory( typeStr, createDefaultConfig, createExtension, @@ -43,14 +44,14 @@ func createDefaultConfig() component.Config { } } -func createExtension(_ context.Context, set component.ExtensionCreateSettings, cfg component.Config) (component.Extension, error) { +func createExtension(_ context.Context, set extension.CreateSettings, cfg component.Config) (extension.Extension, error) { ca, err := newClientAuthenticator(cfg.(*Config), set.Logger) if err != nil { return nil, err } - return configauth.NewClientAuthenticator( - configauth.WithClientRoundTripper(ca.roundTripper), - configauth.WithPerRPCCredentials(ca.perRPCCredentials), + return auth.NewClient( + auth.WithClientRoundTripper(ca.roundTripper), + auth.WithClientPerRPCCredentials(ca.perRPCCredentials), ), nil } diff --git a/extension/oauth2clientauthextension/factory_test.go b/extension/oauth2clientauthextension/factory_test.go index 2e983e0e965f..535c6f09b665 100644 --- a/extension/oauth2clientauthextension/factory_test.go +++ b/extension/oauth2clientauthextension/factory_test.go @@ -22,6 +22,7 @@ import ( "go.opentelemetry.io/collector/component" "go.opentelemetry.io/collector/component/componenttest" "go.opentelemetry.io/collector/config" + "go.opentelemetry.io/collector/extension/extensiontest" ) func TestCreateDefaultConfig(t *testing.T) { @@ -74,7 +75,7 @@ func TestCreateExtension(t *testing.T) { cfg.ClientSecret = testcase.settings.ClientSecret cfg.TokenURL = testcase.settings.TokenURL cfg.Scopes = testcase.settings.Scopes - ext, err := createExtension(context.Background(), componenttest.NewNopExtensionCreateSettings(), cfg) + ext, err := createExtension(context.Background(), extensiontest.NewNopCreateSettings(), cfg) if testcase.shouldError { assert.Error(t, err) assert.Nil(t, ext) diff --git a/extension/oauth2clientauthextension/go.mod b/extension/oauth2clientauthextension/go.mod index dd807d08daa8..d86eb5e54183 100644 --- a/extension/oauth2clientauthextension/go.mod +++ b/extension/oauth2clientauthextension/go.mod @@ -4,10 +4,11 @@ go 1.18 require ( github.com/stretchr/testify v1.8.1 - go.opentelemetry.io/collector v0.66.1-0.20221128222955-4ff1ff379b90 - go.opentelemetry.io/collector/component v0.66.1-0.20221128222955-4ff1ff379b90 + go.opentelemetry.io/collector v0.66.1-0.20221202005155-1c54042beb70 + go.opentelemetry.io/collector/component v0.66.1-0.20221202005155-1c54042beb70 + go.opentelemetry.io/collector/confmap v0.0.0-20221201172708-2bdff61fa52a go.uber.org/multierr v1.8.0 - go.uber.org/zap v1.23.0 + go.uber.org/zap v1.24.0 golang.org/x/oauth2 v0.0.0-20220909003341-f21342109be1 google.golang.org/grpc v1.51.0 ) @@ -34,9 +35,9 @@ require ( github.com/pelletier/go-toml v1.9.4 // indirect github.com/pmezard/go-difflib v1.0.0 // indirect github.com/rs/cors v1.8.2 // indirect - go.opentelemetry.io/collector/consumer v0.66.1-0.20221128222955-4ff1ff379b90 // indirect - go.opentelemetry.io/collector/featuregate v0.66.1-0.20221128222955-4ff1ff379b90 // indirect - go.opentelemetry.io/collector/pdata v0.66.1-0.20221128222955-4ff1ff379b90 // indirect + go.opentelemetry.io/collector/consumer v0.66.1-0.20221202005155-1c54042beb70 // indirect + go.opentelemetry.io/collector/featuregate v0.66.1-0.20221202005155-1c54042beb70 // indirect + go.opentelemetry.io/collector/pdata v0.66.1-0.20221202005155-1c54042beb70 // 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 3aba482a311b..7fdd75b7741a 100644 --- a/extension/oauth2clientauthextension/go.sum +++ b/extension/oauth2clientauthextension/go.sum @@ -274,16 +274,18 @@ github.com/yuin/goldmark v1.3.5/go.mod h1:mwnBkeHKe2W/ZEtQ+71ViKU8L12m81fl3OWwC1 go.etcd.io/etcd/api/v3 v3.5.4/go.mod h1:5GB2vv4A4AOn3yk7MftYGHkUfGtDHnEraIjym4dYz5A= go.etcd.io/etcd/client/pkg/v3 v3.5.4/go.mod h1:IJHfcCEKxYu1Os13ZdwCwIUTUVGYTSAM3YSwc9/Ac1g= go.etcd.io/etcd/client/v3 v3.5.4/go.mod h1:ZaRkVgBZC+L+dLCjTcF1hRXpgZXQPOvnA/Ak/gq3kiY= -go.opentelemetry.io/collector v0.66.1-0.20221128222955-4ff1ff379b90 h1:yRe05/jMdzH4TFHfndZ5h2o2hKBK/79W72j8w51qNsI= -go.opentelemetry.io/collector v0.66.1-0.20221128222955-4ff1ff379b90/go.mod h1:hE6jCs+0rfiufCrVPucKZTMwfHit1okfDPnwPT2eW1I= -go.opentelemetry.io/collector/component v0.66.1-0.20221128222955-4ff1ff379b90 h1:AYSNTXbezhNg43EuYdVVcgxE/2gBVrm00FDx4DOmQVg= -go.opentelemetry.io/collector/component v0.66.1-0.20221128222955-4ff1ff379b90/go.mod h1:0c84EqXUhvYe6KW7hJfh76tiI/5yjWCH2amwyQ06XLM= -go.opentelemetry.io/collector/consumer v0.66.1-0.20221128222955-4ff1ff379b90 h1:nzNXVfC1FzXBXCLMzbMv+qK3E4EGiNsnMhfVsBd2yzc= -go.opentelemetry.io/collector/consumer v0.66.1-0.20221128222955-4ff1ff379b90/go.mod h1:WtoRZa5SnxQO1ZEQdVxYpFcXCmq62rakv0oUSlPO0NQ= -go.opentelemetry.io/collector/featuregate v0.66.1-0.20221128222955-4ff1ff379b90 h1:UuJSFWbi9XxyNZsJKZuvpWg35BgRbcCGFH+38V2MAdw= -go.opentelemetry.io/collector/featuregate v0.66.1-0.20221128222955-4ff1ff379b90/go.mod h1:tewuFKJYalWBU0bmNKg++MC1ipINXUr6szYzOw2p1GI= -go.opentelemetry.io/collector/pdata v0.66.1-0.20221128222955-4ff1ff379b90 h1:Vu4S4jSNcd0VFPzxQNO4+UqGwnes1xJDoFLPRiWHm8I= -go.opentelemetry.io/collector/pdata v0.66.1-0.20221128222955-4ff1ff379b90/go.mod h1:pqyaznLzk21m+1KL6fwOsRryRELL+zNM0qiVSn0MbVc= +go.opentelemetry.io/collector v0.66.1-0.20221202005155-1c54042beb70 h1:INB2CsOtqqrija2KvMuIpbBQ3qX1BECEeR+d0NJX+oM= +go.opentelemetry.io/collector v0.66.1-0.20221202005155-1c54042beb70/go.mod h1:d0NHkHyANJy3HDTvYE/PoylMShUmFIbiir89ieI0X0c= +go.opentelemetry.io/collector/component v0.66.1-0.20221202005155-1c54042beb70 h1:dEoJhzCmRShgmVro/kXm6pouGElgxkH2DsvanzCeZtU= +go.opentelemetry.io/collector/component v0.66.1-0.20221202005155-1c54042beb70/go.mod h1:OsVnvFFe38QSpcuZlQ8cvarDzcloCexgQ1/B2m80F6U= +go.opentelemetry.io/collector/confmap v0.0.0-20221201172708-2bdff61fa52a h1:2TscCXAQASO2kU9xHcMIUM/FP29fiQIRTilZmliq/7I= +go.opentelemetry.io/collector/confmap v0.0.0-20221201172708-2bdff61fa52a/go.mod h1:qJ3e8bA8h4wz/jYlbeEUafVHdrU7DkpStnmIUAz6VTQ= +go.opentelemetry.io/collector/consumer v0.66.1-0.20221202005155-1c54042beb70 h1:XwpVjI1KeKGPXOZBLefGILMziPYuNf6IzbmiIEsIyI0= +go.opentelemetry.io/collector/consumer v0.66.1-0.20221202005155-1c54042beb70/go.mod h1:EWVBcSGcIcmeDGTnIboc/aqa3agsBeH8/q7yFWG7xVc= +go.opentelemetry.io/collector/featuregate v0.66.1-0.20221202005155-1c54042beb70 h1:V0tf4ebciqIs07jFATfLGdUpLRaEsi+AiWuA/in0G8Y= +go.opentelemetry.io/collector/featuregate v0.66.1-0.20221202005155-1c54042beb70/go.mod h1:tewuFKJYalWBU0bmNKg++MC1ipINXUr6szYzOw2p1GI= +go.opentelemetry.io/collector/pdata v0.66.1-0.20221202005155-1c54042beb70 h1:TPOrxkEMvZzfBSwF3ct+kUUgKA5g8unkZZbKQvJweeA= +go.opentelemetry.io/collector/pdata v0.66.1-0.20221202005155-1c54042beb70/go.mod h1:pqyaznLzk21m+1KL6fwOsRryRELL+zNM0qiVSn0MbVc= 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= @@ -300,8 +302,8 @@ go.uber.org/multierr v1.6.0/go.mod h1:cdWPpRnG4AhwMwsgIHip0KRBQjJy5kYEpYjJxpXp9i go.uber.org/multierr v1.8.0 h1:dg6GjLku4EH+249NNmoIciG9N/jURbDG+pFlTkhzIC8= go.uber.org/multierr v1.8.0/go.mod h1:7EAYxJLBy9rStEaz58O2t4Uvip6FSURkq8/ppBp95ak= go.uber.org/zap v1.17.0/go.mod h1:MXVU+bhUf/A7Xi2HNOnopQOrmycQ5Ih87HtOu4q5SSo= -go.uber.org/zap v1.23.0 h1:OjGQ5KQDEUawVHxNwQgPpiypGHOxo2mNZsOqTak4fFY= -go.uber.org/zap v1.23.0/go.mod h1:D+nX8jyLsMHMYrln8A0rJjFt/T/9/bGgIhAqxv5URuY= +go.uber.org/zap v1.24.0 h1:FiJd5l1UOLj0wCgbSE0rwwXHzEdAZS6hiiSnxJN/D60= +go.uber.org/zap v1.24.0/go.mod h1:2kMP+WWQ8aoFoedH3T2sq6iJ2yDWpHbP0f6MQbS9Gkg= golang.org/x/crypto v0.0.0-20180904163835-0709b304e793/go.mod h1:6SG95UA2DQfeDnfUPMdvaQW0Q7yPrPDi9nlGo2tz2b4= golang.org/x/crypto v0.0.0-20190308221718-c2843e01d9a2/go.mod h1:djNgcEr1/C05ACkg1iLfiJU5Ep61QUkGW8qpdssI0+w= golang.org/x/crypto v0.0.0-20190923035154-9ee001bba392/go.mod h1:/lpIB1dKB+9EgE3H3cr1v9wB50oz8l4C4h62xy7jSTY= diff --git a/extension/observer/dockerobserver/extension.go b/extension/observer/dockerobserver/extension.go index a88cb5899a41..b984dbfb3ca4 100644 --- a/extension/observer/dockerobserver/extension.go +++ b/extension/observer/dockerobserver/extension.go @@ -24,6 +24,7 @@ import ( dtypes "github.com/docker/docker/api/types" "github.com/docker/go-connections/nat" "go.opentelemetry.io/collector/component" + "go.opentelemetry.io/collector/extension" "go.uber.org/zap" "github.com/open-telemetry/opentelemetry-collector-contrib/extension/observer" @@ -36,7 +37,7 @@ const ( minimalRequiredDockerAPIVersion = 1.22 ) -var _ component.Extension = (*dockerObserver)(nil) +var _ extension.Extension = (*dockerObserver)(nil) var _ observer.EndpointsLister = (*dockerObserver)(nil) var _ observer.Observable = (*dockerObserver)(nil) @@ -51,7 +52,7 @@ type dockerObserver struct { } // newObserver creates a new docker observer extension. -func newObserver(logger *zap.Logger, config *Config) (component.Extension, error) { +func newObserver(logger *zap.Logger, config *Config) (extension.Extension, error) { d := &dockerObserver{ logger: logger, config: config, once: &sync.Once{}, diff --git a/extension/observer/dockerobserver/factory.go b/extension/observer/dockerobserver/factory.go index 5b753b28912e..7e700b7015d9 100644 --- a/extension/observer/dockerobserver/factory.go +++ b/extension/observer/dockerobserver/factory.go @@ -20,6 +20,7 @@ import ( "go.opentelemetry.io/collector/component" "go.opentelemetry.io/collector/config" + "go.opentelemetry.io/collector/extension" ) const ( @@ -28,8 +29,8 @@ const ( ) // NewFactory should be called to create a factory with default values. -func NewFactory() component.ExtensionFactory { - return component.NewExtensionFactory( +func NewFactory() extension.Factory { + return extension.NewFactory( typeStr, createDefaultConfig, createExtension, @@ -49,9 +50,9 @@ func createDefaultConfig() component.Config { func createExtension( _ context.Context, - settings component.ExtensionCreateSettings, + settings extension.CreateSettings, cfg component.Config, -) (component.Extension, error) { +) (extension.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 d5e5c3983087..ccf62dbdca23 100644 --- a/extension/observer/dockerobserver/factory_test.go +++ b/extension/observer/dockerobserver/factory_test.go @@ -22,6 +22,7 @@ import ( "go.opentelemetry.io/collector/component" "go.opentelemetry.io/collector/component/componenttest" "go.opentelemetry.io/collector/config" + "go.opentelemetry.io/collector/extension/extensiontest" ) func TestValidConfig(t *testing.T) { @@ -32,7 +33,7 @@ func TestValidConfig(t *testing.T) { func TestCreateExtension(t *testing.T) { dockerObserver, err := createExtension( context.Background(), - componenttest.NewNopExtensionCreateSettings(), + extensiontest.NewNopCreateSettings(), &Config{ ExtensionSettings: config.NewExtensionSettings(component.NewID(typeStr)), }, diff --git a/extension/observer/dockerobserver/go.mod b/extension/observer/dockerobserver/go.mod index 1fc96ee18c74..c074697dbe53 100644 --- a/extension/observer/dockerobserver/go.mod +++ b/extension/observer/dockerobserver/go.mod @@ -10,9 +10,10 @@ require ( github.com/open-telemetry/opentelemetry-collector-contrib/internal/docker v0.66.0 github.com/stretchr/testify v1.8.1 github.com/testcontainers/testcontainers-go v0.15.0 - go.opentelemetry.io/collector v0.66.1-0.20221128222955-4ff1ff379b90 - go.opentelemetry.io/collector/component v0.66.1-0.20221128222955-4ff1ff379b90 - go.uber.org/zap v1.23.0 + go.opentelemetry.io/collector v0.66.1-0.20221202005155-1c54042beb70 + go.opentelemetry.io/collector/component v0.66.1-0.20221202005155-1c54042beb70 + go.opentelemetry.io/collector/confmap v0.0.0-20221201172708-2bdff61fa52a + go.uber.org/zap v1.24.0 ) require ( @@ -52,9 +53,9 @@ require ( github.com/pmezard/go-difflib v1.0.0 // indirect github.com/sirupsen/logrus v1.8.1 // indirect go.opencensus.io v0.24.0 // indirect - go.opentelemetry.io/collector/consumer v0.66.1-0.20221128222955-4ff1ff379b90 // indirect - go.opentelemetry.io/collector/featuregate v0.66.1-0.20221128222955-4ff1ff379b90 // indirect - go.opentelemetry.io/collector/pdata v0.66.1-0.20221128222955-4ff1ff379b90 // indirect + go.opentelemetry.io/collector/consumer v0.66.1-0.20221202005155-1c54042beb70 // indirect + go.opentelemetry.io/collector/featuregate v0.66.1-0.20221202005155-1c54042beb70 // indirect + go.opentelemetry.io/collector/pdata v0.66.1-0.20221202005155-1c54042beb70 // 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 b267c1c34b32..bbb89e184853 100644 --- a/extension/observer/dockerobserver/go.sum +++ b/extension/observer/dockerobserver/go.sum @@ -813,16 +813,18 @@ go.opencensus.io v0.22.2/go.mod h1:yxeiOL68Rb0Xd1ddK5vPZ/oVn4vY4Ynel7k9FzqtOIw= go.opencensus.io v0.22.3/go.mod h1:yxeiOL68Rb0Xd1ddK5vPZ/oVn4vY4Ynel7k9FzqtOIw= go.opencensus.io v0.24.0 h1:y73uSU6J157QMP2kn2r30vwW1A2W2WFwSCGnAVxeaD0= go.opencensus.io v0.24.0/go.mod h1:vNK8G9p7aAivkbmorf4v+7Hgx+Zs0yY+0fOtgBfjQKo= -go.opentelemetry.io/collector v0.66.1-0.20221128222955-4ff1ff379b90 h1:yRe05/jMdzH4TFHfndZ5h2o2hKBK/79W72j8w51qNsI= -go.opentelemetry.io/collector v0.66.1-0.20221128222955-4ff1ff379b90/go.mod h1:hE6jCs+0rfiufCrVPucKZTMwfHit1okfDPnwPT2eW1I= -go.opentelemetry.io/collector/component v0.66.1-0.20221128222955-4ff1ff379b90 h1:AYSNTXbezhNg43EuYdVVcgxE/2gBVrm00FDx4DOmQVg= -go.opentelemetry.io/collector/component v0.66.1-0.20221128222955-4ff1ff379b90/go.mod h1:0c84EqXUhvYe6KW7hJfh76tiI/5yjWCH2amwyQ06XLM= -go.opentelemetry.io/collector/consumer v0.66.1-0.20221128222955-4ff1ff379b90 h1:nzNXVfC1FzXBXCLMzbMv+qK3E4EGiNsnMhfVsBd2yzc= -go.opentelemetry.io/collector/consumer v0.66.1-0.20221128222955-4ff1ff379b90/go.mod h1:WtoRZa5SnxQO1ZEQdVxYpFcXCmq62rakv0oUSlPO0NQ= -go.opentelemetry.io/collector/featuregate v0.66.1-0.20221128222955-4ff1ff379b90 h1:UuJSFWbi9XxyNZsJKZuvpWg35BgRbcCGFH+38V2MAdw= -go.opentelemetry.io/collector/featuregate v0.66.1-0.20221128222955-4ff1ff379b90/go.mod h1:tewuFKJYalWBU0bmNKg++MC1ipINXUr6szYzOw2p1GI= -go.opentelemetry.io/collector/pdata v0.66.1-0.20221128222955-4ff1ff379b90 h1:Vu4S4jSNcd0VFPzxQNO4+UqGwnes1xJDoFLPRiWHm8I= -go.opentelemetry.io/collector/pdata v0.66.1-0.20221128222955-4ff1ff379b90/go.mod h1:pqyaznLzk21m+1KL6fwOsRryRELL+zNM0qiVSn0MbVc= +go.opentelemetry.io/collector v0.66.1-0.20221202005155-1c54042beb70 h1:INB2CsOtqqrija2KvMuIpbBQ3qX1BECEeR+d0NJX+oM= +go.opentelemetry.io/collector v0.66.1-0.20221202005155-1c54042beb70/go.mod h1:d0NHkHyANJy3HDTvYE/PoylMShUmFIbiir89ieI0X0c= +go.opentelemetry.io/collector/component v0.66.1-0.20221202005155-1c54042beb70 h1:dEoJhzCmRShgmVro/kXm6pouGElgxkH2DsvanzCeZtU= +go.opentelemetry.io/collector/component v0.66.1-0.20221202005155-1c54042beb70/go.mod h1:OsVnvFFe38QSpcuZlQ8cvarDzcloCexgQ1/B2m80F6U= +go.opentelemetry.io/collector/confmap v0.0.0-20221201172708-2bdff61fa52a h1:2TscCXAQASO2kU9xHcMIUM/FP29fiQIRTilZmliq/7I= +go.opentelemetry.io/collector/confmap v0.0.0-20221201172708-2bdff61fa52a/go.mod h1:qJ3e8bA8h4wz/jYlbeEUafVHdrU7DkpStnmIUAz6VTQ= +go.opentelemetry.io/collector/consumer v0.66.1-0.20221202005155-1c54042beb70 h1:XwpVjI1KeKGPXOZBLefGILMziPYuNf6IzbmiIEsIyI0= +go.opentelemetry.io/collector/consumer v0.66.1-0.20221202005155-1c54042beb70/go.mod h1:EWVBcSGcIcmeDGTnIboc/aqa3agsBeH8/q7yFWG7xVc= +go.opentelemetry.io/collector/featuregate v0.66.1-0.20221202005155-1c54042beb70 h1:V0tf4ebciqIs07jFATfLGdUpLRaEsi+AiWuA/in0G8Y= +go.opentelemetry.io/collector/featuregate v0.66.1-0.20221202005155-1c54042beb70/go.mod h1:tewuFKJYalWBU0bmNKg++MC1ipINXUr6szYzOw2p1GI= +go.opentelemetry.io/collector/pdata v0.66.1-0.20221202005155-1c54042beb70 h1:TPOrxkEMvZzfBSwF3ct+kUUgKA5g8unkZZbKQvJweeA= +go.opentelemetry.io/collector/pdata v0.66.1-0.20221202005155-1c54042beb70/go.mod h1:pqyaznLzk21m+1KL6fwOsRryRELL+zNM0qiVSn0MbVc= 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= @@ -842,8 +844,8 @@ go.uber.org/multierr v1.8.0 h1:dg6GjLku4EH+249NNmoIciG9N/jURbDG+pFlTkhzIC8= go.uber.org/multierr v1.8.0/go.mod h1:7EAYxJLBy9rStEaz58O2t4Uvip6FSURkq8/ppBp95ak= go.uber.org/zap v1.10.0/go.mod h1:vwi/ZaCAaUcBkycHslxD9B2zi4UTXhF60s6SWpuDF0Q= go.uber.org/zap v1.17.0/go.mod h1:MXVU+bhUf/A7Xi2HNOnopQOrmycQ5Ih87HtOu4q5SSo= -go.uber.org/zap v1.23.0 h1:OjGQ5KQDEUawVHxNwQgPpiypGHOxo2mNZsOqTak4fFY= -go.uber.org/zap v1.23.0/go.mod h1:D+nX8jyLsMHMYrln8A0rJjFt/T/9/bGgIhAqxv5URuY= +go.uber.org/zap v1.24.0 h1:FiJd5l1UOLj0wCgbSE0rwwXHzEdAZS6hiiSnxJN/D60= +go.uber.org/zap v1.24.0/go.mod h1:2kMP+WWQ8aoFoedH3T2sq6iJ2yDWpHbP0f6MQbS9Gkg= golang.org/x/crypto v0.0.0-20171113213409-9f005a07e0d3/go.mod h1:6SG95UA2DQfeDnfUPMdvaQW0Q7yPrPDi9nlGo2tz2b4= golang.org/x/crypto v0.0.0-20180904163835-0709b304e793/go.mod h1:6SG95UA2DQfeDnfUPMdvaQW0Q7yPrPDi9nlGo2tz2b4= golang.org/x/crypto v0.0.0-20181009213950-7c1a557ab941/go.mod h1:6SG95UA2DQfeDnfUPMdvaQW0Q7yPrPDi9nlGo2tz2b4= diff --git a/extension/observer/ecsobserver/extension.go b/extension/observer/ecsobserver/extension.go index aa5c2f7ba4d7..45349ecacd7c 100644 --- a/extension/observer/ecsobserver/extension.go +++ b/extension/observer/ecsobserver/extension.go @@ -18,10 +18,11 @@ import ( "context" "go.opentelemetry.io/collector/component" + "go.opentelemetry.io/collector/extension" "go.uber.org/zap" ) -var _ component.Extension = (*ecsObserver)(nil) +var _ extension.Extension = (*ecsObserver)(nil) // ecsObserver implements component.ServiceExtension interface. type ecsObserver struct { diff --git a/extension/observer/ecsobserver/extension_test.go b/extension/observer/ecsobserver/extension_test.go index 699cee2fd60b..294edd34233b 100644 --- a/extension/observer/ecsobserver/extension_test.go +++ b/extension/observer/ecsobserver/extension_test.go @@ -24,6 +24,8 @@ import ( "github.com/stretchr/testify/require" "go.opentelemetry.io/collector/component" "go.opentelemetry.io/collector/component/componenttest" + "go.opentelemetry.io/collector/extension" + "go.opentelemetry.io/collector/extension/extensiontest" "go.uber.org/zap" "github.com/open-telemetry/opentelemetry-collector-contrib/extension/observer/ecsobserver/internal/ecsmock" @@ -82,13 +84,13 @@ func TestExtensionStartStop(t *testing.T) { refreshInterval := 100 * time.Millisecond waitDuration := 2 * refreshInterval - createTestExt := func(c *ecsmock.Cluster, output string) component.Extension { + createTestExt := func(c *ecsmock.Cluster, output string) extension.Extension { f := newTestTaskFetcher(t, c) cfg := createDefaultConfig() sdCfg := cfg.(*Config) sdCfg.RefreshInterval = refreshInterval sdCfg.ResultFile = output - ext, err := createExtensionWithFetcher(componenttest.NewNopExtensionCreateSettings(), sdCfg, f) + ext, err := createExtensionWithFetcher(extensiontest.NewNopCreateSettings(), sdCfg, f) require.NoError(t, err) return ext } diff --git a/extension/observer/ecsobserver/factory.go b/extension/observer/ecsobserver/factory.go index 2133eeb6e966..7bf98a841fb9 100644 --- a/extension/observer/ecsobserver/factory.go +++ b/extension/observer/ecsobserver/factory.go @@ -19,6 +19,7 @@ import ( "fmt" "go.opentelemetry.io/collector/component" + "go.opentelemetry.io/collector/extension" ) const ( @@ -26,8 +27,8 @@ const ( ) // NewFactory creates a factory for ECSObserver extension. -func NewFactory() component.ExtensionFactory { - return component.NewExtensionFactory( +func NewFactory() extension.Factory { + return extension.NewFactory( typeStr, createDefaultConfig, createExtension, @@ -40,7 +41,7 @@ func createDefaultConfig() component.Config { return &cfg } -func createExtension(ctx context.Context, params component.ExtensionCreateSettings, cfg component.Config) (component.Extension, error) { +func createExtension(ctx context.Context, params extension.CreateSettings, cfg component.Config) (extension.Extension, error) { sdCfg := cfg.(*Config) fetcher, err := newTaskFetcherFromConfig(*sdCfg, params.Logger) if err != nil { @@ -50,7 +51,7 @@ func createExtension(ctx context.Context, params component.ExtensionCreateSettin } // fetcher is mock in unit test or AWS API client -func createExtensionWithFetcher(params component.ExtensionCreateSettings, sdCfg *Config, fetcher *taskFetcher) (component.Extension, error) { +func createExtensionWithFetcher(params extension.CreateSettings, sdCfg *Config, fetcher *taskFetcher) (extension.Extension, error) { sd, err := newDiscovery(*sdCfg, serviceDiscoveryOptions{Logger: params.Logger, Fetcher: fetcher}) if err != nil { return nil, err diff --git a/extension/observer/ecsobserver/go.mod b/extension/observer/ecsobserver/go.mod index 964d88c8c703..b8cfc0c82fc8 100644 --- a/extension/observer/ecsobserver/go.mod +++ b/extension/observer/ecsobserver/go.mod @@ -6,10 +6,11 @@ require ( github.com/aws/aws-sdk-go v1.44.145 github.com/hashicorp/golang-lru v0.5.4 github.com/stretchr/testify v1.8.1 - go.opentelemetry.io/collector v0.66.1-0.20221128222955-4ff1ff379b90 - go.opentelemetry.io/collector/component v0.66.1-0.20221128222955-4ff1ff379b90 + go.opentelemetry.io/collector v0.66.1-0.20221202005155-1c54042beb70 + go.opentelemetry.io/collector/component v0.66.1-0.20221202005155-1c54042beb70 + go.opentelemetry.io/collector/confmap v0.0.0-20221201172708-2bdff61fa52a go.uber.org/multierr v1.8.0 - go.uber.org/zap v1.23.0 + go.uber.org/zap v1.24.0 gopkg.in/yaml.v2 v2.4.0 ) @@ -29,9 +30,9 @@ require ( github.com/modern-go/reflect2 v1.0.2 // indirect github.com/pelletier/go-toml v1.9.4 // indirect github.com/pmezard/go-difflib v1.0.0 // indirect - go.opentelemetry.io/collector/consumer v0.66.1-0.20221128222955-4ff1ff379b90 // indirect - go.opentelemetry.io/collector/featuregate v0.66.1-0.20221128222955-4ff1ff379b90 // indirect - go.opentelemetry.io/collector/pdata v0.66.1-0.20221128222955-4ff1ff379b90 // indirect + go.opentelemetry.io/collector/consumer v0.66.1-0.20221202005155-1c54042beb70 // indirect + go.opentelemetry.io/collector/featuregate v0.66.1-0.20221202005155-1c54042beb70 // indirect + go.opentelemetry.io/collector/pdata v0.66.1-0.20221202005155-1c54042beb70 // 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 241440995598..0bf6c16e1d00 100644 --- a/extension/observer/ecsobserver/go.sum +++ b/extension/observer/ecsobserver/go.sum @@ -272,16 +272,18 @@ github.com/yuin/goldmark v1.4.13/go.mod h1:6yULJ656Px+3vBD8DxQVa3kxgyrAnzto9xy5t go.etcd.io/etcd/api/v3 v3.5.4/go.mod h1:5GB2vv4A4AOn3yk7MftYGHkUfGtDHnEraIjym4dYz5A= go.etcd.io/etcd/client/pkg/v3 v3.5.4/go.mod h1:IJHfcCEKxYu1Os13ZdwCwIUTUVGYTSAM3YSwc9/Ac1g= go.etcd.io/etcd/client/v3 v3.5.4/go.mod h1:ZaRkVgBZC+L+dLCjTcF1hRXpgZXQPOvnA/Ak/gq3kiY= -go.opentelemetry.io/collector v0.66.1-0.20221128222955-4ff1ff379b90 h1:yRe05/jMdzH4TFHfndZ5h2o2hKBK/79W72j8w51qNsI= -go.opentelemetry.io/collector v0.66.1-0.20221128222955-4ff1ff379b90/go.mod h1:hE6jCs+0rfiufCrVPucKZTMwfHit1okfDPnwPT2eW1I= -go.opentelemetry.io/collector/component v0.66.1-0.20221128222955-4ff1ff379b90 h1:AYSNTXbezhNg43EuYdVVcgxE/2gBVrm00FDx4DOmQVg= -go.opentelemetry.io/collector/component v0.66.1-0.20221128222955-4ff1ff379b90/go.mod h1:0c84EqXUhvYe6KW7hJfh76tiI/5yjWCH2amwyQ06XLM= -go.opentelemetry.io/collector/consumer v0.66.1-0.20221128222955-4ff1ff379b90 h1:nzNXVfC1FzXBXCLMzbMv+qK3E4EGiNsnMhfVsBd2yzc= -go.opentelemetry.io/collector/consumer v0.66.1-0.20221128222955-4ff1ff379b90/go.mod h1:WtoRZa5SnxQO1ZEQdVxYpFcXCmq62rakv0oUSlPO0NQ= -go.opentelemetry.io/collector/featuregate v0.66.1-0.20221128222955-4ff1ff379b90 h1:UuJSFWbi9XxyNZsJKZuvpWg35BgRbcCGFH+38V2MAdw= -go.opentelemetry.io/collector/featuregate v0.66.1-0.20221128222955-4ff1ff379b90/go.mod h1:tewuFKJYalWBU0bmNKg++MC1ipINXUr6szYzOw2p1GI= -go.opentelemetry.io/collector/pdata v0.66.1-0.20221128222955-4ff1ff379b90 h1:Vu4S4jSNcd0VFPzxQNO4+UqGwnes1xJDoFLPRiWHm8I= -go.opentelemetry.io/collector/pdata v0.66.1-0.20221128222955-4ff1ff379b90/go.mod h1:pqyaznLzk21m+1KL6fwOsRryRELL+zNM0qiVSn0MbVc= +go.opentelemetry.io/collector v0.66.1-0.20221202005155-1c54042beb70 h1:INB2CsOtqqrija2KvMuIpbBQ3qX1BECEeR+d0NJX+oM= +go.opentelemetry.io/collector v0.66.1-0.20221202005155-1c54042beb70/go.mod h1:d0NHkHyANJy3HDTvYE/PoylMShUmFIbiir89ieI0X0c= +go.opentelemetry.io/collector/component v0.66.1-0.20221202005155-1c54042beb70 h1:dEoJhzCmRShgmVro/kXm6pouGElgxkH2DsvanzCeZtU= +go.opentelemetry.io/collector/component v0.66.1-0.20221202005155-1c54042beb70/go.mod h1:OsVnvFFe38QSpcuZlQ8cvarDzcloCexgQ1/B2m80F6U= +go.opentelemetry.io/collector/confmap v0.0.0-20221201172708-2bdff61fa52a h1:2TscCXAQASO2kU9xHcMIUM/FP29fiQIRTilZmliq/7I= +go.opentelemetry.io/collector/confmap v0.0.0-20221201172708-2bdff61fa52a/go.mod h1:qJ3e8bA8h4wz/jYlbeEUafVHdrU7DkpStnmIUAz6VTQ= +go.opentelemetry.io/collector/consumer v0.66.1-0.20221202005155-1c54042beb70 h1:XwpVjI1KeKGPXOZBLefGILMziPYuNf6IzbmiIEsIyI0= +go.opentelemetry.io/collector/consumer v0.66.1-0.20221202005155-1c54042beb70/go.mod h1:EWVBcSGcIcmeDGTnIboc/aqa3agsBeH8/q7yFWG7xVc= +go.opentelemetry.io/collector/featuregate v0.66.1-0.20221202005155-1c54042beb70 h1:V0tf4ebciqIs07jFATfLGdUpLRaEsi+AiWuA/in0G8Y= +go.opentelemetry.io/collector/featuregate v0.66.1-0.20221202005155-1c54042beb70/go.mod h1:tewuFKJYalWBU0bmNKg++MC1ipINXUr6szYzOw2p1GI= +go.opentelemetry.io/collector/pdata v0.66.1-0.20221202005155-1c54042beb70 h1:TPOrxkEMvZzfBSwF3ct+kUUgKA5g8unkZZbKQvJweeA= +go.opentelemetry.io/collector/pdata v0.66.1-0.20221202005155-1c54042beb70/go.mod h1:pqyaznLzk21m+1KL6fwOsRryRELL+zNM0qiVSn0MbVc= 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= @@ -297,8 +299,8 @@ go.uber.org/multierr v1.6.0/go.mod h1:cdWPpRnG4AhwMwsgIHip0KRBQjJy5kYEpYjJxpXp9i go.uber.org/multierr v1.8.0 h1:dg6GjLku4EH+249NNmoIciG9N/jURbDG+pFlTkhzIC8= go.uber.org/multierr v1.8.0/go.mod h1:7EAYxJLBy9rStEaz58O2t4Uvip6FSURkq8/ppBp95ak= go.uber.org/zap v1.17.0/go.mod h1:MXVU+bhUf/A7Xi2HNOnopQOrmycQ5Ih87HtOu4q5SSo= -go.uber.org/zap v1.23.0 h1:OjGQ5KQDEUawVHxNwQgPpiypGHOxo2mNZsOqTak4fFY= -go.uber.org/zap v1.23.0/go.mod h1:D+nX8jyLsMHMYrln8A0rJjFt/T/9/bGgIhAqxv5URuY= +go.uber.org/zap v1.24.0 h1:FiJd5l1UOLj0wCgbSE0rwwXHzEdAZS6hiiSnxJN/D60= +go.uber.org/zap v1.24.0/go.mod h1:2kMP+WWQ8aoFoedH3T2sq6iJ2yDWpHbP0f6MQbS9Gkg= golang.org/x/crypto v0.0.0-20180904163835-0709b304e793/go.mod h1:6SG95UA2DQfeDnfUPMdvaQW0Q7yPrPDi9nlGo2tz2b4= golang.org/x/crypto v0.0.0-20190308221718-c2843e01d9a2/go.mod h1:djNgcEr1/C05ACkg1iLfiJU5Ep61QUkGW8qpdssI0+w= golang.org/x/crypto v0.0.0-20190923035154-9ee001bba392/go.mod h1:/lpIB1dKB+9EgE3H3cr1v9wB50oz8l4C4h62xy7jSTY= diff --git a/extension/observer/ecstaskobserver/extension.go b/extension/observer/ecstaskobserver/extension.go index 36a8e7f64ac7..5bfa3b764f55 100644 --- a/extension/observer/ecstaskobserver/extension.go +++ b/extension/observer/ecstaskobserver/extension.go @@ -20,6 +20,7 @@ import ( "strconv" "go.opentelemetry.io/collector/component" + "go.opentelemetry.io/collector/extension" "go.uber.org/zap" "github.com/open-telemetry/opentelemetry-collector-contrib/extension/observer" @@ -29,12 +30,12 @@ import ( const runningStatus = "RUNNING" -var _ component.Extension = (*ecsTaskObserver)(nil) +var _ extension.Extension = (*ecsTaskObserver)(nil) var _ observer.EndpointsLister = (*ecsTaskObserver)(nil) var _ observer.Observable = (*ecsTaskObserver)(nil) type ecsTaskObserver struct { - component.Extension + extension.Extension *observer.EndpointsWatcher config *Config metadataProvider ecsutil.MetadataProvider diff --git a/extension/observer/ecstaskobserver/factory.go b/extension/observer/ecstaskobserver/factory.go index b6994d340b61..7a980c39dd03 100644 --- a/extension/observer/ecstaskobserver/factory.go +++ b/extension/observer/ecstaskobserver/factory.go @@ -20,6 +20,7 @@ import ( "net/url" "go.opentelemetry.io/collector/component" + "go.opentelemetry.io/collector/extension" "github.com/open-telemetry/opentelemetry-collector-contrib/extension/observer" "github.com/open-telemetry/opentelemetry-collector-contrib/internal/aws/ecsutil" @@ -30,8 +31,8 @@ const ( ) // NewFactory creates a factory for ECSTaskObserver extension. -func NewFactory() component.ExtensionFactory { - return component.NewExtensionFactory( +func NewFactory() extension.Factory { + return extension.NewFactory( typeStr, createDefaultConfig, createExtension, @@ -44,16 +45,16 @@ func createDefaultConfig() component.Config { return &cfg } -type extension struct { +type baseExtension struct { component.StartFunc component.ShutdownFunc } func createExtension( _ context.Context, - params component.ExtensionCreateSettings, + params extension.CreateSettings, cfg component.Config, -) (component.Extension, error) { +) (extension.Extension, error) { obsCfg := cfg.(*Config) var metadataProvider ecsutil.MetadataProvider @@ -73,7 +74,7 @@ func createExtension( metadataProvider: metadataProvider, telemetry: params.TelemetrySettings, } - e.Extension = extension{ + e.Extension = baseExtension{ ShutdownFunc: e.Shutdown, } e.EndpointsWatcher = observer.NewEndpointsWatcher(e, obsCfg.RefreshInterval, params.TelemetrySettings.Logger) diff --git a/extension/observer/ecstaskobserver/factory_test.go b/extension/observer/ecstaskobserver/factory_test.go index 0cb238ec1a23..caa19ed23299 100644 --- a/extension/observer/ecstaskobserver/factory_test.go +++ b/extension/observer/ecstaskobserver/factory_test.go @@ -19,7 +19,7 @@ import ( "testing" "github.com/stretchr/testify/require" - "go.opentelemetry.io/collector/component/componenttest" + "go.opentelemetry.io/collector/extension/extensiontest" "github.com/open-telemetry/opentelemetry-collector-contrib/extension/observer" ) @@ -29,7 +29,7 @@ func TestFactoryCreatedExtensionIsEndpointsLister(t *testing.T) { cfg := etoFactory.CreateDefaultConfig() cfg.(*Config).Endpoint = "http://localhost:1234/mock/endpoint" - eto, err := etoFactory.CreateExtension(context.Background(), componenttest.NewNopExtensionCreateSettings(), cfg) + eto, err := etoFactory.CreateExtension(context.Background(), extensiontest.NewNopCreateSettings(), cfg) require.NoError(t, err) require.NotNil(t, eto) require.Implements(t, (*observer.EndpointsLister)(nil), eto) diff --git a/extension/observer/ecstaskobserver/go.mod b/extension/observer/ecstaskobserver/go.mod index 41777c30bdef..98899838f407 100644 --- a/extension/observer/ecstaskobserver/go.mod +++ b/extension/observer/ecstaskobserver/go.mod @@ -7,9 +7,10 @@ require ( github.com/open-telemetry/opentelemetry-collector-contrib/internal/aws/ecsutil v0.66.0 github.com/open-telemetry/opentelemetry-collector-contrib/internal/common v0.66.0 github.com/stretchr/testify v1.8.1 - go.opentelemetry.io/collector v0.66.1-0.20221128222955-4ff1ff379b90 - go.opentelemetry.io/collector/component v0.66.1-0.20221128222955-4ff1ff379b90 - go.uber.org/zap v1.23.0 + go.opentelemetry.io/collector v0.66.1-0.20221202005155-1c54042beb70 + go.opentelemetry.io/collector/component v0.66.1-0.20221202005155-1c54042beb70 + go.opentelemetry.io/collector/confmap v0.0.0-20221201172708-2bdff61fa52a + go.uber.org/zap v1.24.0 ) require ( @@ -30,9 +31,9 @@ require ( github.com/modern-go/reflect2 v1.0.2 // indirect github.com/pmezard/go-difflib v1.0.0 // indirect github.com/rs/cors v1.8.2 // indirect - go.opentelemetry.io/collector/consumer v0.66.1-0.20221128222955-4ff1ff379b90 // indirect - go.opentelemetry.io/collector/featuregate v0.66.1-0.20221128222955-4ff1ff379b90 // indirect - go.opentelemetry.io/collector/pdata v0.66.1-0.20221128222955-4ff1ff379b90 // indirect + go.opentelemetry.io/collector/consumer v0.66.1-0.20221202005155-1c54042beb70 // indirect + go.opentelemetry.io/collector/featuregate v0.66.1-0.20221202005155-1c54042beb70 // indirect + go.opentelemetry.io/collector/pdata v0.66.1-0.20221202005155-1c54042beb70 // 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 1180e571aac3..0256c11c909b 100644 --- a/extension/observer/ecstaskobserver/go.sum +++ b/extension/observer/ecstaskobserver/go.sum @@ -272,16 +272,18 @@ github.com/yuin/goldmark v1.3.5/go.mod h1:mwnBkeHKe2W/ZEtQ+71ViKU8L12m81fl3OWwC1 go.etcd.io/etcd/api/v3 v3.5.4/go.mod h1:5GB2vv4A4AOn3yk7MftYGHkUfGtDHnEraIjym4dYz5A= go.etcd.io/etcd/client/pkg/v3 v3.5.4/go.mod h1:IJHfcCEKxYu1Os13ZdwCwIUTUVGYTSAM3YSwc9/Ac1g= go.etcd.io/etcd/client/v3 v3.5.4/go.mod h1:ZaRkVgBZC+L+dLCjTcF1hRXpgZXQPOvnA/Ak/gq3kiY= -go.opentelemetry.io/collector v0.66.1-0.20221128222955-4ff1ff379b90 h1:yRe05/jMdzH4TFHfndZ5h2o2hKBK/79W72j8w51qNsI= -go.opentelemetry.io/collector v0.66.1-0.20221128222955-4ff1ff379b90/go.mod h1:hE6jCs+0rfiufCrVPucKZTMwfHit1okfDPnwPT2eW1I= -go.opentelemetry.io/collector/component v0.66.1-0.20221128222955-4ff1ff379b90 h1:AYSNTXbezhNg43EuYdVVcgxE/2gBVrm00FDx4DOmQVg= -go.opentelemetry.io/collector/component v0.66.1-0.20221128222955-4ff1ff379b90/go.mod h1:0c84EqXUhvYe6KW7hJfh76tiI/5yjWCH2amwyQ06XLM= -go.opentelemetry.io/collector/consumer v0.66.1-0.20221128222955-4ff1ff379b90 h1:nzNXVfC1FzXBXCLMzbMv+qK3E4EGiNsnMhfVsBd2yzc= -go.opentelemetry.io/collector/consumer v0.66.1-0.20221128222955-4ff1ff379b90/go.mod h1:WtoRZa5SnxQO1ZEQdVxYpFcXCmq62rakv0oUSlPO0NQ= -go.opentelemetry.io/collector/featuregate v0.66.1-0.20221128222955-4ff1ff379b90 h1:UuJSFWbi9XxyNZsJKZuvpWg35BgRbcCGFH+38V2MAdw= -go.opentelemetry.io/collector/featuregate v0.66.1-0.20221128222955-4ff1ff379b90/go.mod h1:tewuFKJYalWBU0bmNKg++MC1ipINXUr6szYzOw2p1GI= -go.opentelemetry.io/collector/pdata v0.66.1-0.20221128222955-4ff1ff379b90 h1:Vu4S4jSNcd0VFPzxQNO4+UqGwnes1xJDoFLPRiWHm8I= -go.opentelemetry.io/collector/pdata v0.66.1-0.20221128222955-4ff1ff379b90/go.mod h1:pqyaznLzk21m+1KL6fwOsRryRELL+zNM0qiVSn0MbVc= +go.opentelemetry.io/collector v0.66.1-0.20221202005155-1c54042beb70 h1:INB2CsOtqqrija2KvMuIpbBQ3qX1BECEeR+d0NJX+oM= +go.opentelemetry.io/collector v0.66.1-0.20221202005155-1c54042beb70/go.mod h1:d0NHkHyANJy3HDTvYE/PoylMShUmFIbiir89ieI0X0c= +go.opentelemetry.io/collector/component v0.66.1-0.20221202005155-1c54042beb70 h1:dEoJhzCmRShgmVro/kXm6pouGElgxkH2DsvanzCeZtU= +go.opentelemetry.io/collector/component v0.66.1-0.20221202005155-1c54042beb70/go.mod h1:OsVnvFFe38QSpcuZlQ8cvarDzcloCexgQ1/B2m80F6U= +go.opentelemetry.io/collector/confmap v0.0.0-20221201172708-2bdff61fa52a h1:2TscCXAQASO2kU9xHcMIUM/FP29fiQIRTilZmliq/7I= +go.opentelemetry.io/collector/confmap v0.0.0-20221201172708-2bdff61fa52a/go.mod h1:qJ3e8bA8h4wz/jYlbeEUafVHdrU7DkpStnmIUAz6VTQ= +go.opentelemetry.io/collector/consumer v0.66.1-0.20221202005155-1c54042beb70 h1:XwpVjI1KeKGPXOZBLefGILMziPYuNf6IzbmiIEsIyI0= +go.opentelemetry.io/collector/consumer v0.66.1-0.20221202005155-1c54042beb70/go.mod h1:EWVBcSGcIcmeDGTnIboc/aqa3agsBeH8/q7yFWG7xVc= +go.opentelemetry.io/collector/featuregate v0.66.1-0.20221202005155-1c54042beb70 h1:V0tf4ebciqIs07jFATfLGdUpLRaEsi+AiWuA/in0G8Y= +go.opentelemetry.io/collector/featuregate v0.66.1-0.20221202005155-1c54042beb70/go.mod h1:tewuFKJYalWBU0bmNKg++MC1ipINXUr6szYzOw2p1GI= +go.opentelemetry.io/collector/pdata v0.66.1-0.20221202005155-1c54042beb70 h1:TPOrxkEMvZzfBSwF3ct+kUUgKA5g8unkZZbKQvJweeA= +go.opentelemetry.io/collector/pdata v0.66.1-0.20221202005155-1c54042beb70/go.mod h1:pqyaznLzk21m+1KL6fwOsRryRELL+zNM0qiVSn0MbVc= 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= @@ -299,8 +301,8 @@ go.uber.org/multierr v1.6.0/go.mod h1:cdWPpRnG4AhwMwsgIHip0KRBQjJy5kYEpYjJxpXp9i go.uber.org/multierr v1.8.0 h1:dg6GjLku4EH+249NNmoIciG9N/jURbDG+pFlTkhzIC8= go.uber.org/multierr v1.8.0/go.mod h1:7EAYxJLBy9rStEaz58O2t4Uvip6FSURkq8/ppBp95ak= go.uber.org/zap v1.17.0/go.mod h1:MXVU+bhUf/A7Xi2HNOnopQOrmycQ5Ih87HtOu4q5SSo= -go.uber.org/zap v1.23.0 h1:OjGQ5KQDEUawVHxNwQgPpiypGHOxo2mNZsOqTak4fFY= -go.uber.org/zap v1.23.0/go.mod h1:D+nX8jyLsMHMYrln8A0rJjFt/T/9/bGgIhAqxv5URuY= +go.uber.org/zap v1.24.0 h1:FiJd5l1UOLj0wCgbSE0rwwXHzEdAZS6hiiSnxJN/D60= +go.uber.org/zap v1.24.0/go.mod h1:2kMP+WWQ8aoFoedH3T2sq6iJ2yDWpHbP0f6MQbS9Gkg= golang.org/x/crypto v0.0.0-20180904163835-0709b304e793/go.mod h1:6SG95UA2DQfeDnfUPMdvaQW0Q7yPrPDi9nlGo2tz2b4= golang.org/x/crypto v0.0.0-20190308221718-c2843e01d9a2/go.mod h1:djNgcEr1/C05ACkg1iLfiJU5Ep61QUkGW8qpdssI0+w= golang.org/x/crypto v0.0.0-20190923035154-9ee001bba392/go.mod h1:/lpIB1dKB+9EgE3H3cr1v9wB50oz8l4C4h62xy7jSTY= diff --git a/extension/observer/hostobserver/extension.go b/extension/observer/hostobserver/extension.go index 0adca5d1bd1f..d04ceb225602 100644 --- a/extension/observer/hostobserver/extension.go +++ b/extension/observer/hostobserver/extension.go @@ -23,6 +23,7 @@ import ( "github.com/shirou/gopsutil/v3/net" "github.com/shirou/gopsutil/v3/process" "go.opentelemetry.io/collector/component" + "go.opentelemetry.io/collector/extension" "go.uber.org/zap" "github.com/open-telemetry/opentelemetry-collector-contrib/extension/observer" @@ -42,18 +43,20 @@ type endpointsLister struct { collectProcessDetails func(proc *process.Process) (*processDetails, error) } -var _ component.Extension = (*hostObserver)(nil) +var _ extension.Extension = (*hostObserver)(nil) -func newObserver(logger *zap.Logger, config *Config) (component.Extension, error) { +func newObserver(params extension.CreateSettings, config *Config) (extension.Extension, error) { h := &hostObserver{ EndpointsWatcher: observer.NewEndpointsWatcher( endpointsLister{ - logger: logger, - observerName: config.ID().String(), + logger: params.Logger, + observerName: params.ID.String(), getConnections: getConnections, getProcess: process.NewProcess, collectProcessDetails: collectProcessDetails, - }, config.RefreshInterval, logger, + }, + config.RefreshInterval, + params.Logger, ), } diff --git a/extension/observer/hostobserver/factory.go b/extension/observer/hostobserver/factory.go index 7222d3d036dd..9d857188d983 100644 --- a/extension/observer/hostobserver/factory.go +++ b/extension/observer/hostobserver/factory.go @@ -20,6 +20,7 @@ import ( "go.opentelemetry.io/collector/component" "go.opentelemetry.io/collector/config" + "go.opentelemetry.io/collector/extension" ) const ( @@ -30,8 +31,8 @@ const ( ) // NewFactory creates a factory for HostObserver extension. -func NewFactory() component.ExtensionFactory { - return component.NewExtensionFactory( +func NewFactory() extension.Factory { + return extension.NewFactory( typeStr, createDefaultConfig, createExtension, @@ -48,9 +49,8 @@ func createDefaultConfig() component.Config { func createExtension( _ context.Context, - params component.ExtensionCreateSettings, + params extension.CreateSettings, cfg component.Config, -) (component.Extension, error) { - config := cfg.(*Config) - return newObserver(params.Logger, config) +) (extension.Extension, error) { + return newObserver(params, cfg.(*Config)) } diff --git a/extension/observer/hostobserver/factory_test.go b/extension/observer/hostobserver/factory_test.go index 345137c14cf3..2995bdf01547 100644 --- a/extension/observer/hostobserver/factory_test.go +++ b/extension/observer/hostobserver/factory_test.go @@ -22,6 +22,7 @@ import ( "go.opentelemetry.io/collector/component" "go.opentelemetry.io/collector/component/componenttest" "go.opentelemetry.io/collector/config" + "go.opentelemetry.io/collector/extension/extensiontest" ) func TestValidConfig(t *testing.T) { @@ -32,7 +33,7 @@ func TestValidConfig(t *testing.T) { func TestCreateMetricsReceiver(t *testing.T) { hostObserver, err := createExtension( context.Background(), - componenttest.NewNopExtensionCreateSettings(), + extensiontest.NewNopCreateSettings(), &Config{ ExtensionSettings: config.NewExtensionSettings(component.NewID(typeStr)), }, diff --git a/extension/observer/hostobserver/go.mod b/extension/observer/hostobserver/go.mod index 6da7f1626a48..ca41b6fbf818 100644 --- a/extension/observer/hostobserver/go.mod +++ b/extension/observer/hostobserver/go.mod @@ -6,9 +6,10 @@ require ( github.com/open-telemetry/opentelemetry-collector-contrib/extension/observer v0.66.0 github.com/shirou/gopsutil/v3 v3.22.10 github.com/stretchr/testify v1.8.1 - go.opentelemetry.io/collector v0.66.1-0.20221128222955-4ff1ff379b90 - go.opentelemetry.io/collector/component v0.66.1-0.20221128222955-4ff1ff379b90 - go.uber.org/zap v1.23.0 + go.opentelemetry.io/collector v0.66.1-0.20221202005155-1c54042beb70 + go.opentelemetry.io/collector/component v0.66.1-0.20221202005155-1c54042beb70 + go.opentelemetry.io/collector/confmap v0.0.0-20221201172708-2bdff61fa52a + go.uber.org/zap v1.24.0 ) require ( @@ -30,12 +31,12 @@ 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/tklauser/go-sysconf v0.3.10 // indirect - github.com/tklauser/numcpus v0.4.0 // indirect + github.com/tklauser/go-sysconf v0.3.11 // indirect + github.com/tklauser/numcpus v0.6.0 // indirect github.com/yusufpapurcu/wmi v1.2.2 // indirect - go.opentelemetry.io/collector/consumer v0.66.1-0.20221128222955-4ff1ff379b90 // indirect - go.opentelemetry.io/collector/featuregate v0.66.1-0.20221128222955-4ff1ff379b90 // indirect - go.opentelemetry.io/collector/pdata v0.66.1-0.20221128222955-4ff1ff379b90 // indirect + go.opentelemetry.io/collector/consumer v0.66.1-0.20221202005155-1c54042beb70 // indirect + go.opentelemetry.io/collector/featuregate v0.66.1-0.20221202005155-1c54042beb70 // indirect + go.opentelemetry.io/collector/pdata v0.66.1-0.20221202005155-1c54042beb70 // 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 45dcc712857f..8707ed61e426 100644 --- a/extension/observer/hostobserver/go.sum +++ b/extension/observer/hostobserver/go.sum @@ -270,10 +270,12 @@ 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= -github.com/tklauser/go-sysconf v0.3.10 h1:IJ1AZGZRWbY8T5Vfk04D9WOA5WSejdflXxP03OUqALw= github.com/tklauser/go-sysconf v0.3.10/go.mod h1:C8XykCvCb+Gn0oNCWPIlcb0RuglQTYaQ2hGm7jmxEFk= -github.com/tklauser/numcpus v0.4.0 h1:E53Dm1HjH1/R2/aoCtXtPgzmElmn51aOkhCFSuZq//o= +github.com/tklauser/go-sysconf v0.3.11 h1:89WgdJhk5SNwJfu+GKyYveZ4IaJ7xAkecBo+KdJV0CM= +github.com/tklauser/go-sysconf v0.3.11/go.mod h1:GqXfhXY3kiPa0nAXPDIQIWzJbMCB7AmcWpGR8lSZfqI= github.com/tklauser/numcpus v0.4.0/go.mod h1:1+UI3pD8NW14VMwdgJNJ1ESk2UnwhAnz5hMwiKKqXCQ= +github.com/tklauser/numcpus v0.6.0 h1:kebhY2Qt+3U6RNK7UqpYNA+tJ23IBEGKkB7JQBfDYms= +github.com/tklauser/numcpus v0.6.0/go.mod h1:FEZLMke0lhOUG6w2JadTzp0a+Nl8PF/GFkQ5UVIcaL4= 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= @@ -282,16 +284,18 @@ 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.66.1-0.20221128222955-4ff1ff379b90 h1:yRe05/jMdzH4TFHfndZ5h2o2hKBK/79W72j8w51qNsI= -go.opentelemetry.io/collector v0.66.1-0.20221128222955-4ff1ff379b90/go.mod h1:hE6jCs+0rfiufCrVPucKZTMwfHit1okfDPnwPT2eW1I= -go.opentelemetry.io/collector/component v0.66.1-0.20221128222955-4ff1ff379b90 h1:AYSNTXbezhNg43EuYdVVcgxE/2gBVrm00FDx4DOmQVg= -go.opentelemetry.io/collector/component v0.66.1-0.20221128222955-4ff1ff379b90/go.mod h1:0c84EqXUhvYe6KW7hJfh76tiI/5yjWCH2amwyQ06XLM= -go.opentelemetry.io/collector/consumer v0.66.1-0.20221128222955-4ff1ff379b90 h1:nzNXVfC1FzXBXCLMzbMv+qK3E4EGiNsnMhfVsBd2yzc= -go.opentelemetry.io/collector/consumer v0.66.1-0.20221128222955-4ff1ff379b90/go.mod h1:WtoRZa5SnxQO1ZEQdVxYpFcXCmq62rakv0oUSlPO0NQ= -go.opentelemetry.io/collector/featuregate v0.66.1-0.20221128222955-4ff1ff379b90 h1:UuJSFWbi9XxyNZsJKZuvpWg35BgRbcCGFH+38V2MAdw= -go.opentelemetry.io/collector/featuregate v0.66.1-0.20221128222955-4ff1ff379b90/go.mod h1:tewuFKJYalWBU0bmNKg++MC1ipINXUr6szYzOw2p1GI= -go.opentelemetry.io/collector/pdata v0.66.1-0.20221128222955-4ff1ff379b90 h1:Vu4S4jSNcd0VFPzxQNO4+UqGwnes1xJDoFLPRiWHm8I= -go.opentelemetry.io/collector/pdata v0.66.1-0.20221128222955-4ff1ff379b90/go.mod h1:pqyaznLzk21m+1KL6fwOsRryRELL+zNM0qiVSn0MbVc= +go.opentelemetry.io/collector v0.66.1-0.20221202005155-1c54042beb70 h1:INB2CsOtqqrija2KvMuIpbBQ3qX1BECEeR+d0NJX+oM= +go.opentelemetry.io/collector v0.66.1-0.20221202005155-1c54042beb70/go.mod h1:d0NHkHyANJy3HDTvYE/PoylMShUmFIbiir89ieI0X0c= +go.opentelemetry.io/collector/component v0.66.1-0.20221202005155-1c54042beb70 h1:dEoJhzCmRShgmVro/kXm6pouGElgxkH2DsvanzCeZtU= +go.opentelemetry.io/collector/component v0.66.1-0.20221202005155-1c54042beb70/go.mod h1:OsVnvFFe38QSpcuZlQ8cvarDzcloCexgQ1/B2m80F6U= +go.opentelemetry.io/collector/confmap v0.0.0-20221201172708-2bdff61fa52a h1:2TscCXAQASO2kU9xHcMIUM/FP29fiQIRTilZmliq/7I= +go.opentelemetry.io/collector/confmap v0.0.0-20221201172708-2bdff61fa52a/go.mod h1:qJ3e8bA8h4wz/jYlbeEUafVHdrU7DkpStnmIUAz6VTQ= +go.opentelemetry.io/collector/consumer v0.66.1-0.20221202005155-1c54042beb70 h1:XwpVjI1KeKGPXOZBLefGILMziPYuNf6IzbmiIEsIyI0= +go.opentelemetry.io/collector/consumer v0.66.1-0.20221202005155-1c54042beb70/go.mod h1:EWVBcSGcIcmeDGTnIboc/aqa3agsBeH8/q7yFWG7xVc= +go.opentelemetry.io/collector/featuregate v0.66.1-0.20221202005155-1c54042beb70 h1:V0tf4ebciqIs07jFATfLGdUpLRaEsi+AiWuA/in0G8Y= +go.opentelemetry.io/collector/featuregate v0.66.1-0.20221202005155-1c54042beb70/go.mod h1:tewuFKJYalWBU0bmNKg++MC1ipINXUr6szYzOw2p1GI= +go.opentelemetry.io/collector/pdata v0.66.1-0.20221202005155-1c54042beb70 h1:TPOrxkEMvZzfBSwF3ct+kUUgKA5g8unkZZbKQvJweeA= +go.opentelemetry.io/collector/pdata v0.66.1-0.20221202005155-1c54042beb70/go.mod h1:pqyaznLzk21m+1KL6fwOsRryRELL+zNM0qiVSn0MbVc= 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= @@ -307,8 +311,8 @@ go.uber.org/multierr v1.6.0/go.mod h1:cdWPpRnG4AhwMwsgIHip0KRBQjJy5kYEpYjJxpXp9i go.uber.org/multierr v1.8.0 h1:dg6GjLku4EH+249NNmoIciG9N/jURbDG+pFlTkhzIC8= go.uber.org/multierr v1.8.0/go.mod h1:7EAYxJLBy9rStEaz58O2t4Uvip6FSURkq8/ppBp95ak= go.uber.org/zap v1.17.0/go.mod h1:MXVU+bhUf/A7Xi2HNOnopQOrmycQ5Ih87HtOu4q5SSo= -go.uber.org/zap v1.23.0 h1:OjGQ5KQDEUawVHxNwQgPpiypGHOxo2mNZsOqTak4fFY= -go.uber.org/zap v1.23.0/go.mod h1:D+nX8jyLsMHMYrln8A0rJjFt/T/9/bGgIhAqxv5URuY= +go.uber.org/zap v1.24.0 h1:FiJd5l1UOLj0wCgbSE0rwwXHzEdAZS6hiiSnxJN/D60= +go.uber.org/zap v1.24.0/go.mod h1:2kMP+WWQ8aoFoedH3T2sq6iJ2yDWpHbP0f6MQbS9Gkg= golang.org/x/crypto v0.0.0-20180904163835-0709b304e793/go.mod h1:6SG95UA2DQfeDnfUPMdvaQW0Q7yPrPDi9nlGo2tz2b4= golang.org/x/crypto v0.0.0-20190308221718-c2843e01d9a2/go.mod h1:djNgcEr1/C05ACkg1iLfiJU5Ep61QUkGW8qpdssI0+w= golang.org/x/crypto v0.0.0-20190923035154-9ee001bba392/go.mod h1:/lpIB1dKB+9EgE3H3cr1v9wB50oz8l4C4h62xy7jSTY= diff --git a/extension/observer/k8sobserver/extension.go b/extension/observer/k8sobserver/extension.go index 62d7258d9686..b53df9267be7 100644 --- a/extension/observer/k8sobserver/extension.go +++ b/extension/observer/k8sobserver/extension.go @@ -21,6 +21,7 @@ import ( "time" "go.opentelemetry.io/collector/component" + "go.opentelemetry.io/collector/extension" v1 "k8s.io/api/core/v1" "k8s.io/apimachinery/pkg/fields" "k8s.io/client-go/tools/cache" @@ -29,7 +30,7 @@ import ( "github.com/open-telemetry/opentelemetry-collector-contrib/internal/k8sconfig" ) -var _ component.Extension = (*k8sObserver)(nil) +var _ extension.Extension = (*k8sObserver)(nil) var _ observer.Observable = (*k8sObserver)(nil) type k8sObserver struct { @@ -76,7 +77,7 @@ func (k *k8sObserver) Shutdown(ctx context.Context) error { } // newObserver creates a new k8s observer extension. -func newObserver(config *Config, telemetrySettings component.TelemetrySettings) (component.Extension, error) { +func newObserver(config *Config, set extension.CreateSettings) (extension.Extension, error) { client, err := k8sconfig.MakeClient(config.APIConfig) if err != nil { return nil, err @@ -91,7 +92,7 @@ func newObserver(config *Config, telemetrySettings component.TelemetrySettings) } else { podSelector = fields.OneTermEqualSelector("spec.nodeName", config.Node) } - telemetrySettings.Logger.Debug("observing pods") + set.Logger.Debug("observing pods") podListerWatcher = cache.NewListWatchFromClient(restClient, "pods", v1.NamespaceAll, podSelector) } @@ -103,13 +104,13 @@ func newObserver(config *Config, telemetrySettings component.TelemetrySettings) } else { nodeSelector = fields.OneTermEqualSelector("metadata.name", config.Node) } - telemetrySettings.Logger.Debug("observing nodes") + set.Logger.Debug("observing nodes") nodeListerWatcher = cache.NewListWatchFromClient(restClient, "nodes", v1.NamespaceAll, nodeSelector) } - h := &handler{idNamespace: config.ID().String(), endpoints: &sync.Map{}, logger: telemetrySettings.Logger} + h := &handler{idNamespace: set.ID.String(), endpoints: &sync.Map{}, logger: set.TelemetrySettings.Logger} obs := &k8sObserver{ - EndpointsWatcher: observer.NewEndpointsWatcher(h, time.Second, telemetrySettings.Logger), - telemetry: telemetrySettings, + EndpointsWatcher: observer.NewEndpointsWatcher(h, time.Second, set.TelemetrySettings.Logger), + telemetry: set.TelemetrySettings, podListerWatcher: podListerWatcher, nodeListerWatcher: nodeListerWatcher, stop: make(chan struct{}), diff --git a/extension/observer/k8sobserver/extension_test.go b/extension/observer/k8sobserver/extension_test.go index cae8e2597429..d5d710684963 100644 --- a/extension/observer/k8sobserver/extension_test.go +++ b/extension/observer/k8sobserver/extension_test.go @@ -20,7 +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/extension/extensiontest" framework "k8s.io/client-go/tools/cache/testing" "github.com/open-telemetry/opentelemetry-collector-contrib/extension/observer" @@ -43,7 +45,7 @@ func TestNewExtension(t *testing.T) { config := factory.CreateDefaultConfig().(*Config) mockServiceHost(t, config) - ext, err := newObserver(config, componenttest.NewNopTelemetrySettings()) + ext, err := newObserver(config, extensiontest.NewNopCreateSettings()) require.NoError(t, err) require.NotNil(t, ext) } @@ -53,7 +55,9 @@ func TestExtensionObservePods(t *testing.T) { config := factory.CreateDefaultConfig().(*Config) mockServiceHost(t, config) - ext, err := newObserver(config, componenttest.NewNopTelemetrySettings()) + set := extensiontest.NewNopCreateSettings() + set.ID = component.NewID(typeStr) + ext, err := newObserver(config, set) require.NoError(t, err) require.NotNil(t, ext) @@ -133,7 +137,9 @@ func TestExtensionObserveNodes(t *testing.T) { config := factory.CreateDefaultConfig().(*Config) mockServiceHost(t, config) - ext, err := newObserver(config, componenttest.NewNopTelemetrySettings()) + set := extensiontest.NewNopCreateSettings() + set.ID = component.NewID(typeStr) + ext, err := newObserver(config, set) require.NoError(t, err) require.NotNil(t, ext) diff --git a/extension/observer/k8sobserver/factory.go b/extension/observer/k8sobserver/factory.go index bf9e6a0ab841..158f9241ee29 100644 --- a/extension/observer/k8sobserver/factory.go +++ b/extension/observer/k8sobserver/factory.go @@ -19,6 +19,7 @@ import ( "go.opentelemetry.io/collector/component" "go.opentelemetry.io/collector/config" + "go.opentelemetry.io/collector/extension" "github.com/open-telemetry/opentelemetry-collector-contrib/internal/k8sconfig" ) @@ -29,8 +30,8 @@ const ( ) // NewFactory should be called to create a factory with default values. -func NewFactory() component.ExtensionFactory { - return component.NewExtensionFactory( +func NewFactory() extension.Factory { + return extension.NewFactory( typeStr, createDefaultConfig, createExtension, @@ -51,8 +52,8 @@ func createDefaultConfig() component.Config { // CreateExtension creates the extension based on this config. func createExtension( ctx context.Context, - params component.ExtensionCreateSettings, + params extension.CreateSettings, cfg component.Config, -) (component.Extension, error) { - return newObserver(cfg.(*Config), params.TelemetrySettings) +) (extension.Extension, error) { + return newObserver(cfg.(*Config), params) } diff --git a/extension/observer/k8sobserver/factory_test.go b/extension/observer/k8sobserver/factory_test.go index f08879af1f18..a1809544743a 100644 --- a/extension/observer/k8sobserver/factory_test.go +++ b/extension/observer/k8sobserver/factory_test.go @@ -23,6 +23,7 @@ import ( "go.opentelemetry.io/collector/component" "go.opentelemetry.io/collector/component/componenttest" "go.opentelemetry.io/collector/config" + "go.opentelemetry.io/collector/extension/extensiontest" "github.com/open-telemetry/opentelemetry-collector-contrib/internal/k8sconfig" ) @@ -39,7 +40,7 @@ func TestFactory_CreateExtension(t *testing.T) { factory := NewFactory() cfg := factory.CreateDefaultConfig().(*Config) - ext, err := factory.CreateExtension(context.Background(), componenttest.NewNopExtensionCreateSettings(), cfg) + ext, err := factory.CreateExtension(context.Background(), extensiontest.NewNopCreateSettings(), cfg) require.Error(t, err) require.Nil(t, ext) } diff --git a/extension/observer/k8sobserver/go.mod b/extension/observer/k8sobserver/go.mod index 32b73a25acf3..85b83b49035f 100644 --- a/extension/observer/k8sobserver/go.mod +++ b/extension/observer/k8sobserver/go.mod @@ -6,9 +6,10 @@ require ( github.com/open-telemetry/opentelemetry-collector-contrib/extension/observer v0.66.0 github.com/open-telemetry/opentelemetry-collector-contrib/internal/k8sconfig v0.66.0 github.com/stretchr/testify v1.8.1 - go.opentelemetry.io/collector v0.66.1-0.20221128222955-4ff1ff379b90 - go.opentelemetry.io/collector/component v0.66.1-0.20221128222955-4ff1ff379b90 - go.uber.org/zap v1.23.0 + go.opentelemetry.io/collector v0.66.1-0.20221202005155-1c54042beb70 + go.opentelemetry.io/collector/component v0.66.1-0.20221202005155-1c54042beb70 + go.opentelemetry.io/collector/confmap v0.0.0-20221201172708-2bdff61fa52a + go.uber.org/zap v1.24.0 k8s.io/api v0.25.4 k8s.io/apimachinery v0.25.4 k8s.io/client-go v0.25.4 @@ -46,9 +47,9 @@ require ( github.com/pelletier/go-toml v1.9.4 // indirect github.com/pmezard/go-difflib v1.0.0 // indirect github.com/spf13/pflag v1.0.5 // indirect - go.opentelemetry.io/collector/consumer v0.66.1-0.20221128222955-4ff1ff379b90 // indirect - go.opentelemetry.io/collector/featuregate v0.66.1-0.20221128222955-4ff1ff379b90 // indirect - go.opentelemetry.io/collector/pdata v0.66.1-0.20221128222955-4ff1ff379b90 // indirect + go.opentelemetry.io/collector/consumer v0.66.1-0.20221202005155-1c54042beb70 // indirect + go.opentelemetry.io/collector/featuregate v0.66.1-0.20221202005155-1c54042beb70 // indirect + go.opentelemetry.io/collector/pdata v0.66.1-0.20221202005155-1c54042beb70 // 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 cf18de6811f3..d68406cfb7e6 100644 --- a/extension/observer/k8sobserver/go.sum +++ b/extension/observer/k8sobserver/go.sum @@ -432,16 +432,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.opentelemetry.io/collector v0.66.1-0.20221128222955-4ff1ff379b90 h1:yRe05/jMdzH4TFHfndZ5h2o2hKBK/79W72j8w51qNsI= -go.opentelemetry.io/collector v0.66.1-0.20221128222955-4ff1ff379b90/go.mod h1:hE6jCs+0rfiufCrVPucKZTMwfHit1okfDPnwPT2eW1I= -go.opentelemetry.io/collector/component v0.66.1-0.20221128222955-4ff1ff379b90 h1:AYSNTXbezhNg43EuYdVVcgxE/2gBVrm00FDx4DOmQVg= -go.opentelemetry.io/collector/component v0.66.1-0.20221128222955-4ff1ff379b90/go.mod h1:0c84EqXUhvYe6KW7hJfh76tiI/5yjWCH2amwyQ06XLM= -go.opentelemetry.io/collector/consumer v0.66.1-0.20221128222955-4ff1ff379b90 h1:nzNXVfC1FzXBXCLMzbMv+qK3E4EGiNsnMhfVsBd2yzc= -go.opentelemetry.io/collector/consumer v0.66.1-0.20221128222955-4ff1ff379b90/go.mod h1:WtoRZa5SnxQO1ZEQdVxYpFcXCmq62rakv0oUSlPO0NQ= -go.opentelemetry.io/collector/featuregate v0.66.1-0.20221128222955-4ff1ff379b90 h1:UuJSFWbi9XxyNZsJKZuvpWg35BgRbcCGFH+38V2MAdw= -go.opentelemetry.io/collector/featuregate v0.66.1-0.20221128222955-4ff1ff379b90/go.mod h1:tewuFKJYalWBU0bmNKg++MC1ipINXUr6szYzOw2p1GI= -go.opentelemetry.io/collector/pdata v0.66.1-0.20221128222955-4ff1ff379b90 h1:Vu4S4jSNcd0VFPzxQNO4+UqGwnes1xJDoFLPRiWHm8I= -go.opentelemetry.io/collector/pdata v0.66.1-0.20221128222955-4ff1ff379b90/go.mod h1:pqyaznLzk21m+1KL6fwOsRryRELL+zNM0qiVSn0MbVc= +go.opentelemetry.io/collector v0.66.1-0.20221202005155-1c54042beb70 h1:INB2CsOtqqrija2KvMuIpbBQ3qX1BECEeR+d0NJX+oM= +go.opentelemetry.io/collector v0.66.1-0.20221202005155-1c54042beb70/go.mod h1:d0NHkHyANJy3HDTvYE/PoylMShUmFIbiir89ieI0X0c= +go.opentelemetry.io/collector/component v0.66.1-0.20221202005155-1c54042beb70 h1:dEoJhzCmRShgmVro/kXm6pouGElgxkH2DsvanzCeZtU= +go.opentelemetry.io/collector/component v0.66.1-0.20221202005155-1c54042beb70/go.mod h1:OsVnvFFe38QSpcuZlQ8cvarDzcloCexgQ1/B2m80F6U= +go.opentelemetry.io/collector/confmap v0.0.0-20221201172708-2bdff61fa52a h1:2TscCXAQASO2kU9xHcMIUM/FP29fiQIRTilZmliq/7I= +go.opentelemetry.io/collector/confmap v0.0.0-20221201172708-2bdff61fa52a/go.mod h1:qJ3e8bA8h4wz/jYlbeEUafVHdrU7DkpStnmIUAz6VTQ= +go.opentelemetry.io/collector/consumer v0.66.1-0.20221202005155-1c54042beb70 h1:XwpVjI1KeKGPXOZBLefGILMziPYuNf6IzbmiIEsIyI0= +go.opentelemetry.io/collector/consumer v0.66.1-0.20221202005155-1c54042beb70/go.mod h1:EWVBcSGcIcmeDGTnIboc/aqa3agsBeH8/q7yFWG7xVc= +go.opentelemetry.io/collector/featuregate v0.66.1-0.20221202005155-1c54042beb70 h1:V0tf4ebciqIs07jFATfLGdUpLRaEsi+AiWuA/in0G8Y= +go.opentelemetry.io/collector/featuregate v0.66.1-0.20221202005155-1c54042beb70/go.mod h1:tewuFKJYalWBU0bmNKg++MC1ipINXUr6szYzOw2p1GI= +go.opentelemetry.io/collector/pdata v0.66.1-0.20221202005155-1c54042beb70 h1:TPOrxkEMvZzfBSwF3ct+kUUgKA5g8unkZZbKQvJweeA= +go.opentelemetry.io/collector/pdata v0.66.1-0.20221202005155-1c54042beb70/go.mod h1:pqyaznLzk21m+1KL6fwOsRryRELL+zNM0qiVSn0MbVc= 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= @@ -457,8 +459,8 @@ go.uber.org/multierr v1.6.0/go.mod h1:cdWPpRnG4AhwMwsgIHip0KRBQjJy5kYEpYjJxpXp9i go.uber.org/multierr v1.8.0 h1:dg6GjLku4EH+249NNmoIciG9N/jURbDG+pFlTkhzIC8= go.uber.org/multierr v1.8.0/go.mod h1:7EAYxJLBy9rStEaz58O2t4Uvip6FSURkq8/ppBp95ak= go.uber.org/zap v1.17.0/go.mod h1:MXVU+bhUf/A7Xi2HNOnopQOrmycQ5Ih87HtOu4q5SSo= -go.uber.org/zap v1.23.0 h1:OjGQ5KQDEUawVHxNwQgPpiypGHOxo2mNZsOqTak4fFY= -go.uber.org/zap v1.23.0/go.mod h1:D+nX8jyLsMHMYrln8A0rJjFt/T/9/bGgIhAqxv5URuY= +go.uber.org/zap v1.24.0 h1:FiJd5l1UOLj0wCgbSE0rwwXHzEdAZS6hiiSnxJN/D60= +go.uber.org/zap v1.24.0/go.mod h1:2kMP+WWQ8aoFoedH3T2sq6iJ2yDWpHbP0f6MQbS9Gkg= golang.org/x/crypto v0.0.0-20180904163835-0709b304e793/go.mod h1:6SG95UA2DQfeDnfUPMdvaQW0Q7yPrPDi9nlGo2tz2b4= golang.org/x/crypto v0.0.0-20190308221718-c2843e01d9a2/go.mod h1:djNgcEr1/C05ACkg1iLfiJU5Ep61QUkGW8qpdssI0+w= golang.org/x/crypto v0.0.0-20190510104115-cbcb75029529/go.mod h1:yigFU9vqHzYiE8UmvKecakEJjdnWj3jj499lnFckfCI= diff --git a/extension/oidcauthextension/extension.go b/extension/oidcauthextension/extension.go index f8ba006c435c..d992d7d738ea 100644 --- a/extension/oidcauthextension/extension.go +++ b/extension/oidcauthextension/extension.go @@ -31,7 +31,7 @@ import ( "github.com/coreos/go-oidc" "go.opentelemetry.io/collector/client" "go.opentelemetry.io/collector/component" - "go.opentelemetry.io/collector/config/configauth" + "go.opentelemetry.io/collector/extension/auth" "go.uber.org/zap" ) @@ -55,7 +55,7 @@ var ( errNotAuthenticated = errors.New("authentication didn't succeed") ) -func newExtension(cfg *Config, logger *zap.Logger) (configauth.ServerAuthenticator, error) { +func newExtension(cfg *Config, logger *zap.Logger) (auth.Server, error) { if cfg.Audience == "" { return nil, errNoAudienceProvided } @@ -71,7 +71,7 @@ func newExtension(cfg *Config, logger *zap.Logger) (configauth.ServerAuthenticat cfg: cfg, logger: logger, } - return configauth.NewServerAuthenticator(configauth.WithStart(oe.start), configauth.WithAuthenticate(oe.authenticate)), nil + return auth.NewServer(auth.WithServerStart(oe.start), auth.WithServerAuthenticate(oe.authenticate)), nil } func (e *oidcExtension) start(context.Context, component.Host) error { diff --git a/extension/oidcauthextension/factory.go b/extension/oidcauthextension/factory.go index a0f9ce711b46..7d14c075a9b2 100644 --- a/extension/oidcauthextension/factory.go +++ b/extension/oidcauthextension/factory.go @@ -19,6 +19,7 @@ import ( "go.opentelemetry.io/collector/component" "go.opentelemetry.io/collector/config" + "go.opentelemetry.io/collector/extension" ) const ( @@ -29,8 +30,8 @@ const ( ) // NewFactory creates a factory for the OIDC Authenticator extension. -func NewFactory() component.ExtensionFactory { - return component.NewExtensionFactory( +func NewFactory() extension.Factory { + return extension.NewFactory( typeStr, createDefaultConfig, createExtension, @@ -45,6 +46,6 @@ func createDefaultConfig() component.Config { } } -func createExtension(_ context.Context, set component.ExtensionCreateSettings, cfg component.Config) (component.Extension, error) { +func createExtension(_ context.Context, set extension.CreateSettings, cfg component.Config) (extension.Extension, error) { return newExtension(cfg.(*Config), set.Logger) } diff --git a/extension/oidcauthextension/factory_test.go b/extension/oidcauthextension/factory_test.go index 484a0f7bdbea..89a8815b0e92 100644 --- a/extension/oidcauthextension/factory_test.go +++ b/extension/oidcauthextension/factory_test.go @@ -22,6 +22,7 @@ import ( "go.opentelemetry.io/collector/component" "go.opentelemetry.io/collector/component/componenttest" "go.opentelemetry.io/collector/config" + "go.opentelemetry.io/collector/extension/extensiontest" ) func TestCreateDefaultConfig(t *testing.T) { @@ -44,7 +45,7 @@ func TestCreateExtension(t *testing.T) { cfg.Audience = "collector" cfg.IssuerURL = "https://auth.example.com" - ext, err := createExtension(context.Background(), componenttest.NewNopExtensionCreateSettings(), cfg) + ext, err := createExtension(context.Background(), extensiontest.NewNopCreateSettings(), cfg) assert.NoError(t, err) assert.NotNil(t, ext) } diff --git a/extension/oidcauthextension/go.mod b/extension/oidcauthextension/go.mod index 2d3e70d94b8f..02ceeb810153 100644 --- a/extension/oidcauthextension/go.mod +++ b/extension/oidcauthextension/go.mod @@ -5,9 +5,9 @@ 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.66.1-0.20221128222955-4ff1ff379b90 - go.opentelemetry.io/collector/component v0.66.1-0.20221128222955-4ff1ff379b90 - go.uber.org/zap v1.23.0 + go.opentelemetry.io/collector v0.66.1-0.20221202005155-1c54042beb70 + go.opentelemetry.io/collector/component v0.66.1-0.20221202005155-1c54042beb70 + go.uber.org/zap v1.24.0 ) require ( @@ -26,9 +26,10 @@ 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/consumer v0.66.1-0.20221128222955-4ff1ff379b90 // indirect - go.opentelemetry.io/collector/featuregate v0.66.1-0.20221128222955-4ff1ff379b90 // indirect - go.opentelemetry.io/collector/pdata v0.66.1-0.20221128222955-4ff1ff379b90 // indirect + go.opentelemetry.io/collector/confmap v0.0.0-20221201172708-2bdff61fa52a // indirect + go.opentelemetry.io/collector/consumer v0.66.1-0.20221202005155-1c54042beb70 // indirect + go.opentelemetry.io/collector/featuregate v0.66.1-0.20221202005155-1c54042beb70 // indirect + go.opentelemetry.io/collector/pdata v0.66.1-0.20221202005155-1c54042beb70 // 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 0f260586dc8b..1c570a0dbe02 100644 --- a/extension/oidcauthextension/go.sum +++ b/extension/oidcauthextension/go.sum @@ -345,16 +345,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.opentelemetry.io/collector v0.66.1-0.20221128222955-4ff1ff379b90 h1:yRe05/jMdzH4TFHfndZ5h2o2hKBK/79W72j8w51qNsI= -go.opentelemetry.io/collector v0.66.1-0.20221128222955-4ff1ff379b90/go.mod h1:hE6jCs+0rfiufCrVPucKZTMwfHit1okfDPnwPT2eW1I= -go.opentelemetry.io/collector/component v0.66.1-0.20221128222955-4ff1ff379b90 h1:AYSNTXbezhNg43EuYdVVcgxE/2gBVrm00FDx4DOmQVg= -go.opentelemetry.io/collector/component v0.66.1-0.20221128222955-4ff1ff379b90/go.mod h1:0c84EqXUhvYe6KW7hJfh76tiI/5yjWCH2amwyQ06XLM= -go.opentelemetry.io/collector/consumer v0.66.1-0.20221128222955-4ff1ff379b90 h1:nzNXVfC1FzXBXCLMzbMv+qK3E4EGiNsnMhfVsBd2yzc= -go.opentelemetry.io/collector/consumer v0.66.1-0.20221128222955-4ff1ff379b90/go.mod h1:WtoRZa5SnxQO1ZEQdVxYpFcXCmq62rakv0oUSlPO0NQ= -go.opentelemetry.io/collector/featuregate v0.66.1-0.20221128222955-4ff1ff379b90 h1:UuJSFWbi9XxyNZsJKZuvpWg35BgRbcCGFH+38V2MAdw= -go.opentelemetry.io/collector/featuregate v0.66.1-0.20221128222955-4ff1ff379b90/go.mod h1:tewuFKJYalWBU0bmNKg++MC1ipINXUr6szYzOw2p1GI= -go.opentelemetry.io/collector/pdata v0.66.1-0.20221128222955-4ff1ff379b90 h1:Vu4S4jSNcd0VFPzxQNO4+UqGwnes1xJDoFLPRiWHm8I= -go.opentelemetry.io/collector/pdata v0.66.1-0.20221128222955-4ff1ff379b90/go.mod h1:pqyaznLzk21m+1KL6fwOsRryRELL+zNM0qiVSn0MbVc= +go.opentelemetry.io/collector v0.66.1-0.20221202005155-1c54042beb70 h1:INB2CsOtqqrija2KvMuIpbBQ3qX1BECEeR+d0NJX+oM= +go.opentelemetry.io/collector v0.66.1-0.20221202005155-1c54042beb70/go.mod h1:d0NHkHyANJy3HDTvYE/PoylMShUmFIbiir89ieI0X0c= +go.opentelemetry.io/collector/component v0.66.1-0.20221202005155-1c54042beb70 h1:dEoJhzCmRShgmVro/kXm6pouGElgxkH2DsvanzCeZtU= +go.opentelemetry.io/collector/component v0.66.1-0.20221202005155-1c54042beb70/go.mod h1:OsVnvFFe38QSpcuZlQ8cvarDzcloCexgQ1/B2m80F6U= +go.opentelemetry.io/collector/confmap v0.0.0-20221201172708-2bdff61fa52a h1:2TscCXAQASO2kU9xHcMIUM/FP29fiQIRTilZmliq/7I= +go.opentelemetry.io/collector/confmap v0.0.0-20221201172708-2bdff61fa52a/go.mod h1:qJ3e8bA8h4wz/jYlbeEUafVHdrU7DkpStnmIUAz6VTQ= +go.opentelemetry.io/collector/consumer v0.66.1-0.20221202005155-1c54042beb70 h1:XwpVjI1KeKGPXOZBLefGILMziPYuNf6IzbmiIEsIyI0= +go.opentelemetry.io/collector/consumer v0.66.1-0.20221202005155-1c54042beb70/go.mod h1:EWVBcSGcIcmeDGTnIboc/aqa3agsBeH8/q7yFWG7xVc= +go.opentelemetry.io/collector/featuregate v0.66.1-0.20221202005155-1c54042beb70 h1:V0tf4ebciqIs07jFATfLGdUpLRaEsi+AiWuA/in0G8Y= +go.opentelemetry.io/collector/featuregate v0.66.1-0.20221202005155-1c54042beb70/go.mod h1:tewuFKJYalWBU0bmNKg++MC1ipINXUr6szYzOw2p1GI= +go.opentelemetry.io/collector/pdata v0.66.1-0.20221202005155-1c54042beb70 h1:TPOrxkEMvZzfBSwF3ct+kUUgKA5g8unkZZbKQvJweeA= +go.opentelemetry.io/collector/pdata v0.66.1-0.20221202005155-1c54042beb70/go.mod h1:pqyaznLzk21m+1KL6fwOsRryRELL+zNM0qiVSn0MbVc= 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= @@ -370,8 +372,8 @@ go.uber.org/multierr v1.6.0/go.mod h1:cdWPpRnG4AhwMwsgIHip0KRBQjJy5kYEpYjJxpXp9i go.uber.org/multierr v1.8.0 h1:dg6GjLku4EH+249NNmoIciG9N/jURbDG+pFlTkhzIC8= go.uber.org/multierr v1.8.0/go.mod h1:7EAYxJLBy9rStEaz58O2t4Uvip6FSURkq8/ppBp95ak= go.uber.org/zap v1.17.0/go.mod h1:MXVU+bhUf/A7Xi2HNOnopQOrmycQ5Ih87HtOu4q5SSo= -go.uber.org/zap v1.23.0 h1:OjGQ5KQDEUawVHxNwQgPpiypGHOxo2mNZsOqTak4fFY= -go.uber.org/zap v1.23.0/go.mod h1:D+nX8jyLsMHMYrln8A0rJjFt/T/9/bGgIhAqxv5URuY= +go.uber.org/zap v1.24.0 h1:FiJd5l1UOLj0wCgbSE0rwwXHzEdAZS6hiiSnxJN/D60= +go.uber.org/zap v1.24.0/go.mod h1:2kMP+WWQ8aoFoedH3T2sq6iJ2yDWpHbP0f6MQbS9Gkg= golang.org/x/crypto v0.0.0-20180904163835-0709b304e793/go.mod h1:6SG95UA2DQfeDnfUPMdvaQW0Q7yPrPDi9nlGo2tz2b4= golang.org/x/crypto v0.0.0-20190308221718-c2843e01d9a2/go.mod h1:djNgcEr1/C05ACkg1iLfiJU5Ep61QUkGW8qpdssI0+w= golang.org/x/crypto v0.0.0-20190510104115-cbcb75029529/go.mod h1:yigFU9vqHzYiE8UmvKecakEJjdnWj3jj499lnFckfCI= diff --git a/extension/pprofextension/factory.go b/extension/pprofextension/factory.go index 1fd4a3369516..e2c08c10d8a9 100644 --- a/extension/pprofextension/factory.go +++ b/extension/pprofextension/factory.go @@ -21,6 +21,7 @@ import ( "go.opentelemetry.io/collector/component" "go.opentelemetry.io/collector/config" "go.opentelemetry.io/collector/config/confignet" + "go.opentelemetry.io/collector/extension" ) const ( @@ -31,8 +32,8 @@ const ( ) // NewFactory creates a factory for pprof extension. -func NewFactory() component.ExtensionFactory { - return component.NewExtensionFactory( +func NewFactory() extension.Factory { + return extension.NewFactory( typeStr, createDefaultConfig, createExtension, @@ -49,7 +50,7 @@ func createDefaultConfig() component.Config { } } -func createExtension(_ context.Context, set component.ExtensionCreateSettings, cfg component.Config) (component.Extension, error) { +func createExtension(_ context.Context, set extension.CreateSettings, cfg component.Config) (extension.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 b0cc2fcbe9dc..fe7aa0a62a1e 100644 --- a/extension/pprofextension/factory_test.go +++ b/extension/pprofextension/factory_test.go @@ -24,6 +24,7 @@ import ( "go.opentelemetry.io/collector/component/componenttest" "go.opentelemetry.io/collector/config" "go.opentelemetry.io/collector/config/confignet" + "go.opentelemetry.io/collector/extension/extensiontest" "github.com/open-telemetry/opentelemetry-collector-contrib/internal/common/testutil" ) @@ -37,7 +38,7 @@ func TestFactory_CreateDefaultConfig(t *testing.T) { cfg) assert.NoError(t, componenttest.CheckConfigStruct(cfg)) - ext, err := createExtension(context.Background(), componenttest.NewNopExtensionCreateSettings(), cfg) + ext, err := createExtension(context.Background(), extensiontest.NewNopCreateSettings(), cfg) require.NoError(t, err) require.NotNil(t, ext) } @@ -46,7 +47,7 @@ func TestFactory_CreateExtension(t *testing.T) { cfg := createDefaultConfig().(*Config) cfg.TCPAddr.Endpoint = testutil.GetAvailableLocalAddress(t) - ext, err := createExtension(context.Background(), componenttest.NewNopExtensionCreateSettings(), cfg) + ext, err := createExtension(context.Background(), extensiontest.NewNopCreateSettings(), cfg) require.NoError(t, err) require.NotNil(t, ext) } diff --git a/extension/pprofextension/go.mod b/extension/pprofextension/go.mod index 2a0b83638afa..d104b356c05b 100644 --- a/extension/pprofextension/go.mod +++ b/extension/pprofextension/go.mod @@ -5,10 +5,11 @@ go 1.18 require ( github.com/open-telemetry/opentelemetry-collector-contrib/internal/common v0.66.0 github.com/stretchr/testify v1.8.1 - go.opentelemetry.io/collector v0.66.1-0.20221128222955-4ff1ff379b90 - go.opentelemetry.io/collector/component v0.66.1-0.20221128222955-4ff1ff379b90 + go.opentelemetry.io/collector v0.66.1-0.20221202005155-1c54042beb70 + go.opentelemetry.io/collector/component v0.66.1-0.20221202005155-1c54042beb70 + go.opentelemetry.io/collector/confmap v0.0.0-20221201172708-2bdff61fa52a go.uber.org/atomic v1.10.0 - go.uber.org/zap v1.23.0 + go.uber.org/zap v1.24.0 ) require ( @@ -27,9 +28,9 @@ require ( github.com/pelletier/go-toml v1.9.4 // indirect github.com/pmezard/go-difflib v1.0.0 // indirect github.com/rogpeppe/go-internal v1.8.0 // indirect - go.opentelemetry.io/collector/consumer v0.66.1-0.20221128222955-4ff1ff379b90 // indirect - go.opentelemetry.io/collector/featuregate v0.66.1-0.20221128222955-4ff1ff379b90 // indirect - go.opentelemetry.io/collector/pdata v0.66.1-0.20221128222955-4ff1ff379b90 // indirect + go.opentelemetry.io/collector/consumer v0.66.1-0.20221202005155-1c54042beb70 // indirect + go.opentelemetry.io/collector/featuregate v0.66.1-0.20221202005155-1c54042beb70 // indirect + go.opentelemetry.io/collector/pdata v0.66.1-0.20221202005155-1c54042beb70 // 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 0bfcf69c6dbd..e27b20f0fd9c 100644 --- a/extension/pprofextension/go.sum +++ b/extension/pprofextension/go.sum @@ -266,16 +266,18 @@ github.com/yuin/goldmark v1.3.5/go.mod h1:mwnBkeHKe2W/ZEtQ+71ViKU8L12m81fl3OWwC1 go.etcd.io/etcd/api/v3 v3.5.4/go.mod h1:5GB2vv4A4AOn3yk7MftYGHkUfGtDHnEraIjym4dYz5A= go.etcd.io/etcd/client/pkg/v3 v3.5.4/go.mod h1:IJHfcCEKxYu1Os13ZdwCwIUTUVGYTSAM3YSwc9/Ac1g= go.etcd.io/etcd/client/v3 v3.5.4/go.mod h1:ZaRkVgBZC+L+dLCjTcF1hRXpgZXQPOvnA/Ak/gq3kiY= -go.opentelemetry.io/collector v0.66.1-0.20221128222955-4ff1ff379b90 h1:yRe05/jMdzH4TFHfndZ5h2o2hKBK/79W72j8w51qNsI= -go.opentelemetry.io/collector v0.66.1-0.20221128222955-4ff1ff379b90/go.mod h1:hE6jCs+0rfiufCrVPucKZTMwfHit1okfDPnwPT2eW1I= -go.opentelemetry.io/collector/component v0.66.1-0.20221128222955-4ff1ff379b90 h1:AYSNTXbezhNg43EuYdVVcgxE/2gBVrm00FDx4DOmQVg= -go.opentelemetry.io/collector/component v0.66.1-0.20221128222955-4ff1ff379b90/go.mod h1:0c84EqXUhvYe6KW7hJfh76tiI/5yjWCH2amwyQ06XLM= -go.opentelemetry.io/collector/consumer v0.66.1-0.20221128222955-4ff1ff379b90 h1:nzNXVfC1FzXBXCLMzbMv+qK3E4EGiNsnMhfVsBd2yzc= -go.opentelemetry.io/collector/consumer v0.66.1-0.20221128222955-4ff1ff379b90/go.mod h1:WtoRZa5SnxQO1ZEQdVxYpFcXCmq62rakv0oUSlPO0NQ= -go.opentelemetry.io/collector/featuregate v0.66.1-0.20221128222955-4ff1ff379b90 h1:UuJSFWbi9XxyNZsJKZuvpWg35BgRbcCGFH+38V2MAdw= -go.opentelemetry.io/collector/featuregate v0.66.1-0.20221128222955-4ff1ff379b90/go.mod h1:tewuFKJYalWBU0bmNKg++MC1ipINXUr6szYzOw2p1GI= -go.opentelemetry.io/collector/pdata v0.66.1-0.20221128222955-4ff1ff379b90 h1:Vu4S4jSNcd0VFPzxQNO4+UqGwnes1xJDoFLPRiWHm8I= -go.opentelemetry.io/collector/pdata v0.66.1-0.20221128222955-4ff1ff379b90/go.mod h1:pqyaznLzk21m+1KL6fwOsRryRELL+zNM0qiVSn0MbVc= +go.opentelemetry.io/collector v0.66.1-0.20221202005155-1c54042beb70 h1:INB2CsOtqqrija2KvMuIpbBQ3qX1BECEeR+d0NJX+oM= +go.opentelemetry.io/collector v0.66.1-0.20221202005155-1c54042beb70/go.mod h1:d0NHkHyANJy3HDTvYE/PoylMShUmFIbiir89ieI0X0c= +go.opentelemetry.io/collector/component v0.66.1-0.20221202005155-1c54042beb70 h1:dEoJhzCmRShgmVro/kXm6pouGElgxkH2DsvanzCeZtU= +go.opentelemetry.io/collector/component v0.66.1-0.20221202005155-1c54042beb70/go.mod h1:OsVnvFFe38QSpcuZlQ8cvarDzcloCexgQ1/B2m80F6U= +go.opentelemetry.io/collector/confmap v0.0.0-20221201172708-2bdff61fa52a h1:2TscCXAQASO2kU9xHcMIUM/FP29fiQIRTilZmliq/7I= +go.opentelemetry.io/collector/confmap v0.0.0-20221201172708-2bdff61fa52a/go.mod h1:qJ3e8bA8h4wz/jYlbeEUafVHdrU7DkpStnmIUAz6VTQ= +go.opentelemetry.io/collector/consumer v0.66.1-0.20221202005155-1c54042beb70 h1:XwpVjI1KeKGPXOZBLefGILMziPYuNf6IzbmiIEsIyI0= +go.opentelemetry.io/collector/consumer v0.66.1-0.20221202005155-1c54042beb70/go.mod h1:EWVBcSGcIcmeDGTnIboc/aqa3agsBeH8/q7yFWG7xVc= +go.opentelemetry.io/collector/featuregate v0.66.1-0.20221202005155-1c54042beb70 h1:V0tf4ebciqIs07jFATfLGdUpLRaEsi+AiWuA/in0G8Y= +go.opentelemetry.io/collector/featuregate v0.66.1-0.20221202005155-1c54042beb70/go.mod h1:tewuFKJYalWBU0bmNKg++MC1ipINXUr6szYzOw2p1GI= +go.opentelemetry.io/collector/pdata v0.66.1-0.20221202005155-1c54042beb70 h1:TPOrxkEMvZzfBSwF3ct+kUUgKA5g8unkZZbKQvJweeA= +go.opentelemetry.io/collector/pdata v0.66.1-0.20221202005155-1c54042beb70/go.mod h1:pqyaznLzk21m+1KL6fwOsRryRELL+zNM0qiVSn0MbVc= 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= @@ -291,8 +293,8 @@ go.uber.org/multierr v1.6.0/go.mod h1:cdWPpRnG4AhwMwsgIHip0KRBQjJy5kYEpYjJxpXp9i go.uber.org/multierr v1.8.0 h1:dg6GjLku4EH+249NNmoIciG9N/jURbDG+pFlTkhzIC8= go.uber.org/multierr v1.8.0/go.mod h1:7EAYxJLBy9rStEaz58O2t4Uvip6FSURkq8/ppBp95ak= go.uber.org/zap v1.17.0/go.mod h1:MXVU+bhUf/A7Xi2HNOnopQOrmycQ5Ih87HtOu4q5SSo= -go.uber.org/zap v1.23.0 h1:OjGQ5KQDEUawVHxNwQgPpiypGHOxo2mNZsOqTak4fFY= -go.uber.org/zap v1.23.0/go.mod h1:D+nX8jyLsMHMYrln8A0rJjFt/T/9/bGgIhAqxv5URuY= +go.uber.org/zap v1.24.0 h1:FiJd5l1UOLj0wCgbSE0rwwXHzEdAZS6hiiSnxJN/D60= +go.uber.org/zap v1.24.0/go.mod h1:2kMP+WWQ8aoFoedH3T2sq6iJ2yDWpHbP0f6MQbS9Gkg= golang.org/x/crypto v0.0.0-20180904163835-0709b304e793/go.mod h1:6SG95UA2DQfeDnfUPMdvaQW0Q7yPrPDi9nlGo2tz2b4= golang.org/x/crypto v0.0.0-20190308221718-c2843e01d9a2/go.mod h1:djNgcEr1/C05ACkg1iLfiJU5Ep61QUkGW8qpdssI0+w= golang.org/x/crypto v0.0.0-20190923035154-9ee001bba392/go.mod h1:/lpIB1dKB+9EgE3H3cr1v9wB50oz8l4C4h62xy7jSTY= diff --git a/extension/sigv4authextension/design.md b/extension/sigv4authextension/design.md index 1de6ae887dbd..69abd3dd7e44 100644 --- a/extension/sigv4authextension/design.md +++ b/extension/sigv4authextension/design.md @@ -41,7 +41,7 @@ type Config struct { ``` -* [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 +* [config.ExtensionSettings](https://github.com/open-telemetry/opentelemetry-collector/blob/main/config/extension.go) is a struct needed to needed to satisfy the [component.Config](https://github.com/open-telemetry/opentelemetry-collector/blob/main/component/config.go) 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. @@ -355,7 +355,7 @@ Lastly, we introduce `factory.go`, which provides the logic for creating the Sig ```go -func NewFactory() component.ExtensionFactory { +func NewFactory() extension.Factory { return extensionhelper.NewFactory( "sigv4auth", createDefaultConfig, @@ -368,7 +368,7 @@ func NewFactory() component.ExtensionFactory { ```go -func createDefaultConfig() component.ExtensionConfig { +func createDefaultConfig() component.Config { return &Config{ ExtensionSettings: config.NewExtensionSettings(component.NewID("sigv4auth")), } @@ -380,7 +380,7 @@ func createDefaultConfig() component.ExtensionConfig { ```go -func createExtension(_ context.Context, set component.ExtensionCreateSettings, cfg component.ExtensionConfig) (component.Extension, error) { +func createExtension(_ context.Context, set extension.CreateSettings, cfg component.Config) (extension.Extension, error) { awsSDKInfo := fmt.Sprintf("%s/%s", aws.SDKName, aws.SDKVersion) return newSigv4Extension(cfg.(*Config), awsSDKInfo, set.Logger) } diff --git a/extension/sigv4authextension/doc.go b/extension/sigv4authextension/doc.go index ae17af6ff436..6b665322e1f4 100644 --- a/extension/sigv4authextension/doc.go +++ b/extension/sigv4authextension/doc.go @@ -12,7 +12,7 @@ // See the License for the specific language governing permissions and // limitations under the License. -// Package sigv4authextension implements the `configauth.ClientAuthenticator` interface. +// Package sigv4authextension implements the `auth.Client` interface. // This extension provides the Sigv4 process of adding authentication information to AWS API requests sent by HTTP. // As such, the extension can be used for HTTP based exporters that export to AWS services. package sigv4authextension // import "github.com/open-telemetry/opentelemetry-collector-contrib/extension/sigv4authextension" diff --git a/extension/sigv4authextension/extension.go b/extension/sigv4authextension/extension.go index 000a5d4770e8..df95f31e853b 100644 --- a/extension/sigv4authextension/extension.go +++ b/extension/sigv4authextension/extension.go @@ -25,12 +25,12 @@ import ( "github.com/aws/aws-sdk-go-v2/credentials/stscreds" "github.com/aws/aws-sdk-go-v2/service/sts" "go.opentelemetry.io/collector/component" - "go.opentelemetry.io/collector/config/configauth" + "go.opentelemetry.io/collector/extension/auth" "go.uber.org/zap" grpcCredentials "google.golang.org/grpc/credentials" ) -// sigv4Auth is a struct that implements the configauth.ClientAuthenticator interface. +// sigv4Auth is a struct that implements the auth.Client interface. // It provides the implementation for providing Sigv4 authentication for HTTP requests only. type sigv4Auth struct { cfg *Config @@ -40,8 +40,8 @@ type sigv4Auth struct { component.ShutdownFunc // embedded default behavior to do nothing with Shutdown() } -// compile time check that the sigv4Auth struct satisfies the configauth.ClientAuthenticator interface -var _ configauth.ClientAuthenticator = (*sigv4Auth)(nil) +// compile time check that the sigv4Auth struct satisfies the auth.Client interface +var _ auth.Client = (*sigv4Auth)(nil) // RoundTripper() returns a custom signingRoundTripper. func (sa *sigv4Auth) RoundTripper(base http.RoundTripper) (http.RoundTripper, error) { @@ -63,8 +63,7 @@ func (sa *sigv4Auth) RoundTripper(base http.RoundTripper) (http.RoundTripper, er return &rt, nil } -// PerRPCCredentials() is implemented to satisfy the configauth.ClientAuthenticator -// interface but will not be implemented. +// PerRPCCredentials is implemented to satisfy the auth.Client interface but will not be implemented. func (sa *sigv4Auth) PerRPCCredentials() (grpcCredentials.PerRPCCredentials, error) { return nil, errors.New("Not Implemented") } diff --git a/extension/sigv4authextension/factory.go b/extension/sigv4authextension/factory.go index a5557ff57d22..7d1325964e43 100644 --- a/extension/sigv4authextension/factory.go +++ b/extension/sigv4authextension/factory.go @@ -21,6 +21,7 @@ import ( "github.com/aws/aws-sdk-go-v2/aws" "go.opentelemetry.io/collector/component" "go.opentelemetry.io/collector/config" + "go.opentelemetry.io/collector/extension" ) const ( @@ -29,8 +30,8 @@ const ( ) // NewFactory creates a factory for the Sigv4 Authenticator extension. -func NewFactory() component.ExtensionFactory { - return component.NewExtensionFactory(typeStr, createDefaultConfig, createExtension, component.StabilityLevelBeta) +func NewFactory() extension.Factory { + return extension.NewFactory(typeStr, createDefaultConfig, createExtension, component.StabilityLevelBeta) } // createDefaultConfig() creates a Config struct with default values. @@ -42,7 +43,7 @@ func createDefaultConfig() component.Config { } // createExtension() calls newSigv4Extension() in extension.go to create the extension. -func createExtension(_ context.Context, set component.ExtensionCreateSettings, cfg component.Config) (component.Extension, error) { +func createExtension(_ context.Context, set extension.CreateSettings, cfg component.Config) (extension.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 7b0321174053..d4b9c17a3de1 100644 --- a/extension/sigv4authextension/factory_test.go +++ b/extension/sigv4authextension/factory_test.go @@ -22,6 +22,7 @@ import ( "go.opentelemetry.io/collector/component" "go.opentelemetry.io/collector/component/componenttest" "go.opentelemetry.io/collector/config" + "go.opentelemetry.io/collector/extension/extensiontest" ) func TestNewFactory(t *testing.T) { @@ -31,26 +32,21 @@ func TestNewFactory(t *testing.T) { cfg := createDefaultConfig().(*Config) assert.Equal(t, f.CreateDefaultConfig().(*Config), cfg) - ext, _ := createExtension(context.Background(), componenttest.NewNopExtensionCreateSettings(), cfg) - fext, _ := f.CreateExtension(context.Background(), componenttest.NewNopExtensionCreateSettings(), cfg) + ext, _ := createExtension(context.Background(), extensiontest.NewNopCreateSettings(), cfg) + fext, _ := f.CreateExtension(context.Background(), extensiontest.NewNopCreateSettings(), cfg) assert.Equal(t, fext, ext) } func TestCreateDefaultConfig(t *testing.T) { - 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.Equal(t, &Config{ExtensionSettings: config.NewExtensionSettings(component.NewID(typeStr))}, cfg) assert.NoError(t, componenttest.CheckConfigStruct(cfg)) } func TestCreateExtension(t *testing.T) { cfg := createDefaultConfig().(*Config) - ext, err := createExtension(context.Background(), componenttest.NewNopExtensionCreateSettings(), cfg) + ext, err := createExtension(context.Background(), extensiontest.NewNopCreateSettings(), cfg) assert.Nil(t, err) assert.NotNil(t, ext) diff --git a/extension/sigv4authextension/go.mod b/extension/sigv4authextension/go.mod index 8849044af5bf..f14d084afc36 100644 --- a/extension/sigv4authextension/go.mod +++ b/extension/sigv4authextension/go.mod @@ -8,9 +8,10 @@ require ( github.com/aws/aws-sdk-go-v2/credentials v1.13.0 github.com/aws/aws-sdk-go-v2/service/sts v1.17.2 github.com/stretchr/testify v1.8.1 - go.opentelemetry.io/collector v0.66.1-0.20221128222955-4ff1ff379b90 - go.opentelemetry.io/collector/component v0.66.1-0.20221128222955-4ff1ff379b90 - go.uber.org/zap v1.23.0 + go.opentelemetry.io/collector v0.66.1-0.20221202005155-1c54042beb70 + go.opentelemetry.io/collector/component v0.66.1-0.20221202005155-1c54042beb70 + go.opentelemetry.io/collector/confmap v0.0.0-20221201172708-2bdff61fa52a + go.uber.org/zap v1.24.0 google.golang.org/grpc v1.51.0 ) @@ -34,9 +35,9 @@ require ( github.com/modern-go/concurrent v0.0.0-20180306012644-bacd9c7ef1dd // indirect github.com/modern-go/reflect2 v1.0.2 // indirect github.com/pmezard/go-difflib v1.0.0 // indirect - go.opentelemetry.io/collector/consumer v0.66.1-0.20221128222955-4ff1ff379b90 // indirect - go.opentelemetry.io/collector/featuregate v0.66.1-0.20221128222955-4ff1ff379b90 // indirect - go.opentelemetry.io/collector/pdata v0.66.1-0.20221128222955-4ff1ff379b90 // indirect + go.opentelemetry.io/collector/consumer v0.66.1-0.20221202005155-1c54042beb70 // indirect + go.opentelemetry.io/collector/featuregate v0.66.1-0.20221202005155-1c54042beb70 // indirect + go.opentelemetry.io/collector/pdata v0.66.1-0.20221202005155-1c54042beb70 // 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 ae03394fab75..0a4d36be6f09 100644 --- a/extension/sigv4authextension/go.sum +++ b/extension/sigv4authextension/go.sum @@ -282,16 +282,18 @@ github.com/yuin/goldmark v1.3.5/go.mod h1:mwnBkeHKe2W/ZEtQ+71ViKU8L12m81fl3OWwC1 go.etcd.io/etcd/api/v3 v3.5.4/go.mod h1:5GB2vv4A4AOn3yk7MftYGHkUfGtDHnEraIjym4dYz5A= go.etcd.io/etcd/client/pkg/v3 v3.5.4/go.mod h1:IJHfcCEKxYu1Os13ZdwCwIUTUVGYTSAM3YSwc9/Ac1g= go.etcd.io/etcd/client/v3 v3.5.4/go.mod h1:ZaRkVgBZC+L+dLCjTcF1hRXpgZXQPOvnA/Ak/gq3kiY= -go.opentelemetry.io/collector v0.66.1-0.20221128222955-4ff1ff379b90 h1:yRe05/jMdzH4TFHfndZ5h2o2hKBK/79W72j8w51qNsI= -go.opentelemetry.io/collector v0.66.1-0.20221128222955-4ff1ff379b90/go.mod h1:hE6jCs+0rfiufCrVPucKZTMwfHit1okfDPnwPT2eW1I= -go.opentelemetry.io/collector/component v0.66.1-0.20221128222955-4ff1ff379b90 h1:AYSNTXbezhNg43EuYdVVcgxE/2gBVrm00FDx4DOmQVg= -go.opentelemetry.io/collector/component v0.66.1-0.20221128222955-4ff1ff379b90/go.mod h1:0c84EqXUhvYe6KW7hJfh76tiI/5yjWCH2amwyQ06XLM= -go.opentelemetry.io/collector/consumer v0.66.1-0.20221128222955-4ff1ff379b90 h1:nzNXVfC1FzXBXCLMzbMv+qK3E4EGiNsnMhfVsBd2yzc= -go.opentelemetry.io/collector/consumer v0.66.1-0.20221128222955-4ff1ff379b90/go.mod h1:WtoRZa5SnxQO1ZEQdVxYpFcXCmq62rakv0oUSlPO0NQ= -go.opentelemetry.io/collector/featuregate v0.66.1-0.20221128222955-4ff1ff379b90 h1:UuJSFWbi9XxyNZsJKZuvpWg35BgRbcCGFH+38V2MAdw= -go.opentelemetry.io/collector/featuregate v0.66.1-0.20221128222955-4ff1ff379b90/go.mod h1:tewuFKJYalWBU0bmNKg++MC1ipINXUr6szYzOw2p1GI= -go.opentelemetry.io/collector/pdata v0.66.1-0.20221128222955-4ff1ff379b90 h1:Vu4S4jSNcd0VFPzxQNO4+UqGwnes1xJDoFLPRiWHm8I= -go.opentelemetry.io/collector/pdata v0.66.1-0.20221128222955-4ff1ff379b90/go.mod h1:pqyaznLzk21m+1KL6fwOsRryRELL+zNM0qiVSn0MbVc= +go.opentelemetry.io/collector v0.66.1-0.20221202005155-1c54042beb70 h1:INB2CsOtqqrija2KvMuIpbBQ3qX1BECEeR+d0NJX+oM= +go.opentelemetry.io/collector v0.66.1-0.20221202005155-1c54042beb70/go.mod h1:d0NHkHyANJy3HDTvYE/PoylMShUmFIbiir89ieI0X0c= +go.opentelemetry.io/collector/component v0.66.1-0.20221202005155-1c54042beb70 h1:dEoJhzCmRShgmVro/kXm6pouGElgxkH2DsvanzCeZtU= +go.opentelemetry.io/collector/component v0.66.1-0.20221202005155-1c54042beb70/go.mod h1:OsVnvFFe38QSpcuZlQ8cvarDzcloCexgQ1/B2m80F6U= +go.opentelemetry.io/collector/confmap v0.0.0-20221201172708-2bdff61fa52a h1:2TscCXAQASO2kU9xHcMIUM/FP29fiQIRTilZmliq/7I= +go.opentelemetry.io/collector/confmap v0.0.0-20221201172708-2bdff61fa52a/go.mod h1:qJ3e8bA8h4wz/jYlbeEUafVHdrU7DkpStnmIUAz6VTQ= +go.opentelemetry.io/collector/consumer v0.66.1-0.20221202005155-1c54042beb70 h1:XwpVjI1KeKGPXOZBLefGILMziPYuNf6IzbmiIEsIyI0= +go.opentelemetry.io/collector/consumer v0.66.1-0.20221202005155-1c54042beb70/go.mod h1:EWVBcSGcIcmeDGTnIboc/aqa3agsBeH8/q7yFWG7xVc= +go.opentelemetry.io/collector/featuregate v0.66.1-0.20221202005155-1c54042beb70 h1:V0tf4ebciqIs07jFATfLGdUpLRaEsi+AiWuA/in0G8Y= +go.opentelemetry.io/collector/featuregate v0.66.1-0.20221202005155-1c54042beb70/go.mod h1:tewuFKJYalWBU0bmNKg++MC1ipINXUr6szYzOw2p1GI= +go.opentelemetry.io/collector/pdata v0.66.1-0.20221202005155-1c54042beb70 h1:TPOrxkEMvZzfBSwF3ct+kUUgKA5g8unkZZbKQvJweeA= +go.opentelemetry.io/collector/pdata v0.66.1-0.20221202005155-1c54042beb70/go.mod h1:pqyaznLzk21m+1KL6fwOsRryRELL+zNM0qiVSn0MbVc= 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= @@ -307,8 +309,8 @@ go.uber.org/multierr v1.6.0/go.mod h1:cdWPpRnG4AhwMwsgIHip0KRBQjJy5kYEpYjJxpXp9i go.uber.org/multierr v1.8.0 h1:dg6GjLku4EH+249NNmoIciG9N/jURbDG+pFlTkhzIC8= go.uber.org/multierr v1.8.0/go.mod h1:7EAYxJLBy9rStEaz58O2t4Uvip6FSURkq8/ppBp95ak= go.uber.org/zap v1.17.0/go.mod h1:MXVU+bhUf/A7Xi2HNOnopQOrmycQ5Ih87HtOu4q5SSo= -go.uber.org/zap v1.23.0 h1:OjGQ5KQDEUawVHxNwQgPpiypGHOxo2mNZsOqTak4fFY= -go.uber.org/zap v1.23.0/go.mod h1:D+nX8jyLsMHMYrln8A0rJjFt/T/9/bGgIhAqxv5URuY= +go.uber.org/zap v1.24.0 h1:FiJd5l1UOLj0wCgbSE0rwwXHzEdAZS6hiiSnxJN/D60= +go.uber.org/zap v1.24.0/go.mod h1:2kMP+WWQ8aoFoedH3T2sq6iJ2yDWpHbP0f6MQbS9Gkg= golang.org/x/crypto v0.0.0-20180904163835-0709b304e793/go.mod h1:6SG95UA2DQfeDnfUPMdvaQW0Q7yPrPDi9nlGo2tz2b4= golang.org/x/crypto v0.0.0-20190308221718-c2843e01d9a2/go.mod h1:djNgcEr1/C05ACkg1iLfiJU5Ep61QUkGW8qpdssI0+w= golang.org/x/crypto v0.0.0-20190923035154-9ee001bba392/go.mod h1:/lpIB1dKB+9EgE3H3cr1v9wB50oz8l4C4h62xy7jSTY= diff --git a/extension/storage/dbstorage/config.go b/extension/storage/dbstorage/config.go index 90f31cdb5ca4..48dcc1d0aa5c 100644 --- a/extension/storage/dbstorage/config.go +++ b/extension/storage/dbstorage/config.go @@ -15,7 +15,7 @@ package dbstorage // import "github.com/open-telemetry/opentelemetry-collector-contrib/extension/storage/dbstorage" import ( - "fmt" + "errors" "go.opentelemetry.io/collector/config" ) @@ -29,10 +29,10 @@ type Config struct { func (cfg *Config) Validate() error { if cfg.DataSource == "" { - return fmt.Errorf(fmt.Sprintf("missing datasource for %s", cfg.ID())) + return errors.New("missing datasource") } if cfg.DriverName == "" { - return fmt.Errorf(fmt.Sprintf("missing driver name for %s", cfg.ID())) + return errors.New("missing driver name") } return nil diff --git a/extension/storage/dbstorage/config_test.go b/extension/storage/dbstorage/config_test.go index 19dff0383d75..4e63416ae500 100644 --- a/extension/storage/dbstorage/config_test.go +++ b/extension/storage/dbstorage/config_test.go @@ -24,7 +24,7 @@ import ( "github.com/stretchr/testify/assert" ) -func TestConfig_Validate(t *testing.T) { +func TestConfigValidate(t *testing.T) { tests := []struct { name string config Config @@ -33,12 +33,12 @@ func TestConfig_Validate(t *testing.T) { { "Missing driver name", Config{DataSource: "foo"}, - errors.New("missing driver name for /blah"), + errors.New("missing driver name"), }, { "Missing datasource", Config{DriverName: "foo"}, - errors.New("missing datasource for /blah"), + errors.New("missing datasource"), }, { "valid", @@ -48,7 +48,6 @@ func TestConfig_Validate(t *testing.T) { } for _, test := range tests { - test.config.SetIDName("blah") err := test.config.Validate() if test.errWanted == nil { assert.NoError(t, err) diff --git a/extension/storage/dbstorage/extension.go b/extension/storage/dbstorage/extension.go index 3081cd9b14b8..39fa9c5a79fa 100644 --- a/extension/storage/dbstorage/extension.go +++ b/extension/storage/dbstorage/extension.go @@ -21,6 +21,7 @@ import ( "strings" "go.opentelemetry.io/collector/component" + "go.opentelemetry.io/collector/extension" "go.opentelemetry.io/collector/extension/experimental/storage" "go.uber.org/zap" ) @@ -35,7 +36,7 @@ type databaseStorage struct { // Ensure this storage extension implements the appropriate interface var _ storage.Extension = (*databaseStorage)(nil) -func newDBStorage(logger *zap.Logger, config *Config) (component.Extension, error) { +func newDBStorage(logger *zap.Logger, config *Config) (extension.Extension, error) { return &databaseStorage{ driverName: config.DriverName, datasourceName: config.DataSource, diff --git a/extension/storage/dbstorage/extension_test.go b/extension/storage/dbstorage/extension_test.go index 05e10a95fd9e..bd41e22a5931 100644 --- a/extension/storage/dbstorage/extension_test.go +++ b/extension/storage/dbstorage/extension_test.go @@ -29,6 +29,7 @@ import ( "go.opentelemetry.io/collector/component" "go.opentelemetry.io/collector/component/componenttest" "go.opentelemetry.io/collector/extension/experimental/storage" + "go.opentelemetry.io/collector/extension/extensiontest" ) func TestExtensionIntegrity(t *testing.T) { @@ -117,7 +118,7 @@ func newTestExtension(t *testing.T) storage.Extension { cfg.DriverName = "sqlite3" cfg.DataSource = fmt.Sprintf("file:%s/foo.db?_busy_timeout=10000&_journal=WAL&_sync=NORMAL", t.TempDir()) - extension, err := f.CreateExtension(context.Background(), componenttest.NewNopExtensionCreateSettings(), cfg) + extension, err := f.CreateExtension(context.Background(), extensiontest.NewNopCreateSettings(), cfg) require.NoError(t, err) se, ok := extension.(storage.Extension) diff --git a/extension/storage/dbstorage/factory.go b/extension/storage/dbstorage/factory.go index ca0944edb6da..78dac1cc2e1c 100644 --- a/extension/storage/dbstorage/factory.go +++ b/extension/storage/dbstorage/factory.go @@ -19,14 +19,15 @@ import ( "go.opentelemetry.io/collector/component" "go.opentelemetry.io/collector/config" + "go.opentelemetry.io/collector/extension" ) // The value of extension "type" in configuration. const typeStr component.Type = "db_storage" // NewFactory creates a factory for DBStorage extension. -func NewFactory() component.ExtensionFactory { - return component.NewExtensionFactory( +func NewFactory() extension.Factory { + return extension.NewFactory( typeStr, createDefaultConfig, createExtension, @@ -42,8 +43,8 @@ func createDefaultConfig() component.Config { func createExtension( _ context.Context, - params component.ExtensionCreateSettings, + params extension.CreateSettings, cfg component.Config, -) (component.Extension, error) { +) (extension.Extension, error) { return newDBStorage(params.Logger, cfg.(*Config)) } diff --git a/extension/storage/filestorage/extension.go b/extension/storage/filestorage/extension.go index 9c2c054751b6..0a5645b51750 100644 --- a/extension/storage/filestorage/extension.go +++ b/extension/storage/filestorage/extension.go @@ -20,6 +20,7 @@ import ( "path/filepath" "go.opentelemetry.io/collector/component" + "go.opentelemetry.io/collector/extension" "go.opentelemetry.io/collector/extension/experimental/storage" "go.uber.org/zap" ) @@ -32,7 +33,7 @@ type localFileStorage struct { // Ensure this storage extension implements the appropriate interface var _ storage.Extension = (*localFileStorage)(nil) -func newLocalFileStorage(logger *zap.Logger, config *Config) (component.Extension, error) { +func newLocalFileStorage(logger *zap.Logger, config *Config) (extension.Extension, error) { return &localFileStorage{ cfg: config, logger: logger, diff --git a/extension/storage/filestorage/extension_test.go b/extension/storage/filestorage/extension_test.go index bd9ac83c4996..44d6d94e0dba 100644 --- a/extension/storage/filestorage/extension_test.go +++ b/extension/storage/filestorage/extension_test.go @@ -24,8 +24,8 @@ import ( "github.com/stretchr/testify/require" "go.opentelemetry.io/collector/component" - "go.opentelemetry.io/collector/component/componenttest" "go.opentelemetry.io/collector/extension/experimental/storage" + "go.opentelemetry.io/collector/extension/extensiontest" ) func TestExtensionIntegrity(t *testing.T) { @@ -205,7 +205,7 @@ func TestGetClientErrorsOnDeletedDirectory(t *testing.T) { cfg := f.CreateDefaultConfig().(*Config) cfg.Directory = tempDir - extension, err := f.CreateExtension(context.Background(), componenttest.NewNopExtensionCreateSettings(), cfg) + extension, err := f.CreateExtension(context.Background(), extensiontest.NewNopCreateSettings(), cfg) require.NoError(t, err) se, ok := extension.(storage.Extension) @@ -231,7 +231,7 @@ func newTestExtension(t *testing.T) storage.Extension { cfg := f.CreateDefaultConfig().(*Config) cfg.Directory = t.TempDir() - extension, err := f.CreateExtension(context.Background(), componenttest.NewNopExtensionCreateSettings(), cfg) + extension, err := f.CreateExtension(context.Background(), extensiontest.NewNopCreateSettings(), cfg) require.NoError(t, err) se, ok := extension.(storage.Extension) @@ -253,7 +253,7 @@ func TestCompaction(t *testing.T) { cfg := f.CreateDefaultConfig().(*Config) cfg.Directory = tempDir - extension, err := f.CreateExtension(context.Background(), componenttest.NewNopExtensionCreateSettings(), cfg) + extension, err := f.CreateExtension(context.Background(), extensiontest.NewNopCreateSettings(), cfg) require.NoError(t, err) se, ok := extension.(storage.Extension) @@ -343,7 +343,7 @@ func TestCompactionRemoveTemp(t *testing.T) { cfg := f.CreateDefaultConfig().(*Config) cfg.Directory = tempDir - extension, err := f.CreateExtension(context.Background(), componenttest.NewNopExtensionCreateSettings(), cfg) + extension, err := f.CreateExtension(context.Background(), extensiontest.NewNopCreateSettings(), cfg) require.NoError(t, err) se, ok := extension.(storage.Extension) diff --git a/extension/storage/filestorage/factory.go b/extension/storage/filestorage/factory.go index 564d02ae744f..4b681f9227de 100644 --- a/extension/storage/filestorage/factory.go +++ b/extension/storage/filestorage/factory.go @@ -20,6 +20,7 @@ import ( "go.opentelemetry.io/collector/component" "go.opentelemetry.io/collector/config" + "go.opentelemetry.io/collector/extension" ) // The value of extension "type" in configuration. @@ -35,8 +36,8 @@ const ( ) // NewFactory creates a factory for HostObserver extension. -func NewFactory() component.ExtensionFactory { - return component.NewExtensionFactory( +func NewFactory() extension.Factory { + return extension.NewFactory( typeStr, createDefaultConfig, createExtension, @@ -63,8 +64,8 @@ func createDefaultConfig() component.Config { func createExtension( _ context.Context, - params component.ExtensionCreateSettings, + params extension.CreateSettings, cfg component.Config, -) (component.Extension, error) { +) (extension.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 edd104a4a0e1..962e6a3a1948 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/extension/extensiontest" ) func TestFactory(t *testing.T) { @@ -33,7 +33,6 @@ func TestFactory(t *testing.T) { require.Equal(t, typeStr, f.Type()) cfg := f.CreateDefaultConfig().(*Config) - require.Equal(t, component.NewID(typeStr), cfg.ID()) if runtime.GOOS != "windows" { require.Equal(t, "/var/lib/otelcol/file_storage", cfg.Directory) @@ -64,7 +63,7 @@ func TestFactory(t *testing.T) { t.Run(test.name, func(t *testing.T) { e, err := f.CreateExtension( context.Background(), - componenttest.NewNopExtensionCreateSettings(), + extensiontest.NewNopCreateSettings(), test.config, ) if test.wantErr { diff --git a/extension/storage/go.mod b/extension/storage/go.mod index c183d644f9a7..56630de7dc37 100644 --- a/extension/storage/go.mod +++ b/extension/storage/go.mod @@ -7,9 +7,10 @@ require ( github.com/mattn/go-sqlite3 v2.0.3+incompatible github.com/stretchr/testify v1.8.1 go.etcd.io/bbolt v1.3.6 - go.opentelemetry.io/collector v0.66.1-0.20221128222955-4ff1ff379b90 - go.opentelemetry.io/collector/component v0.66.1-0.20221128222955-4ff1ff379b90 - go.uber.org/zap v1.23.0 + go.opentelemetry.io/collector v0.66.1-0.20221202005155-1c54042beb70 + go.opentelemetry.io/collector/component v0.66.1-0.20221202005155-1c54042beb70 + go.opentelemetry.io/collector/confmap v0.0.0-20221201172708-2bdff61fa52a + go.uber.org/zap v1.24.0 ) require ( @@ -34,9 +35,9 @@ require ( github.com/modern-go/reflect2 v1.0.2 // indirect github.com/pelletier/go-toml v1.9.4 // indirect github.com/pmezard/go-difflib v1.0.0 // indirect - go.opentelemetry.io/collector/consumer v0.66.1-0.20221128222955-4ff1ff379b90 // indirect - go.opentelemetry.io/collector/featuregate v0.66.1-0.20221128222955-4ff1ff379b90 // indirect - go.opentelemetry.io/collector/pdata v0.66.1-0.20221128222955-4ff1ff379b90 // indirect + go.opentelemetry.io/collector/consumer v0.66.1-0.20221202005155-1c54042beb70 // indirect + go.opentelemetry.io/collector/featuregate v0.66.1-0.20221202005155-1c54042beb70 // indirect + go.opentelemetry.io/collector/pdata v0.66.1-0.20221202005155-1c54042beb70 // 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 cd14175a1c5d..eba3707d508a 100644 --- a/extension/storage/go.sum +++ b/extension/storage/go.sum @@ -347,16 +347,18 @@ 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.66.1-0.20221128222955-4ff1ff379b90 h1:yRe05/jMdzH4TFHfndZ5h2o2hKBK/79W72j8w51qNsI= -go.opentelemetry.io/collector v0.66.1-0.20221128222955-4ff1ff379b90/go.mod h1:hE6jCs+0rfiufCrVPucKZTMwfHit1okfDPnwPT2eW1I= -go.opentelemetry.io/collector/component v0.66.1-0.20221128222955-4ff1ff379b90 h1:AYSNTXbezhNg43EuYdVVcgxE/2gBVrm00FDx4DOmQVg= -go.opentelemetry.io/collector/component v0.66.1-0.20221128222955-4ff1ff379b90/go.mod h1:0c84EqXUhvYe6KW7hJfh76tiI/5yjWCH2amwyQ06XLM= -go.opentelemetry.io/collector/consumer v0.66.1-0.20221128222955-4ff1ff379b90 h1:nzNXVfC1FzXBXCLMzbMv+qK3E4EGiNsnMhfVsBd2yzc= -go.opentelemetry.io/collector/consumer v0.66.1-0.20221128222955-4ff1ff379b90/go.mod h1:WtoRZa5SnxQO1ZEQdVxYpFcXCmq62rakv0oUSlPO0NQ= -go.opentelemetry.io/collector/featuregate v0.66.1-0.20221128222955-4ff1ff379b90 h1:UuJSFWbi9XxyNZsJKZuvpWg35BgRbcCGFH+38V2MAdw= -go.opentelemetry.io/collector/featuregate v0.66.1-0.20221128222955-4ff1ff379b90/go.mod h1:tewuFKJYalWBU0bmNKg++MC1ipINXUr6szYzOw2p1GI= -go.opentelemetry.io/collector/pdata v0.66.1-0.20221128222955-4ff1ff379b90 h1:Vu4S4jSNcd0VFPzxQNO4+UqGwnes1xJDoFLPRiWHm8I= -go.opentelemetry.io/collector/pdata v0.66.1-0.20221128222955-4ff1ff379b90/go.mod h1:pqyaznLzk21m+1KL6fwOsRryRELL+zNM0qiVSn0MbVc= +go.opentelemetry.io/collector v0.66.1-0.20221202005155-1c54042beb70 h1:INB2CsOtqqrija2KvMuIpbBQ3qX1BECEeR+d0NJX+oM= +go.opentelemetry.io/collector v0.66.1-0.20221202005155-1c54042beb70/go.mod h1:d0NHkHyANJy3HDTvYE/PoylMShUmFIbiir89ieI0X0c= +go.opentelemetry.io/collector/component v0.66.1-0.20221202005155-1c54042beb70 h1:dEoJhzCmRShgmVro/kXm6pouGElgxkH2DsvanzCeZtU= +go.opentelemetry.io/collector/component v0.66.1-0.20221202005155-1c54042beb70/go.mod h1:OsVnvFFe38QSpcuZlQ8cvarDzcloCexgQ1/B2m80F6U= +go.opentelemetry.io/collector/confmap v0.0.0-20221201172708-2bdff61fa52a h1:2TscCXAQASO2kU9xHcMIUM/FP29fiQIRTilZmliq/7I= +go.opentelemetry.io/collector/confmap v0.0.0-20221201172708-2bdff61fa52a/go.mod h1:qJ3e8bA8h4wz/jYlbeEUafVHdrU7DkpStnmIUAz6VTQ= +go.opentelemetry.io/collector/consumer v0.66.1-0.20221202005155-1c54042beb70 h1:XwpVjI1KeKGPXOZBLefGILMziPYuNf6IzbmiIEsIyI0= +go.opentelemetry.io/collector/consumer v0.66.1-0.20221202005155-1c54042beb70/go.mod h1:EWVBcSGcIcmeDGTnIboc/aqa3agsBeH8/q7yFWG7xVc= +go.opentelemetry.io/collector/featuregate v0.66.1-0.20221202005155-1c54042beb70 h1:V0tf4ebciqIs07jFATfLGdUpLRaEsi+AiWuA/in0G8Y= +go.opentelemetry.io/collector/featuregate v0.66.1-0.20221202005155-1c54042beb70/go.mod h1:tewuFKJYalWBU0bmNKg++MC1ipINXUr6szYzOw2p1GI= +go.opentelemetry.io/collector/pdata v0.66.1-0.20221202005155-1c54042beb70 h1:TPOrxkEMvZzfBSwF3ct+kUUgKA5g8unkZZbKQvJweeA= +go.opentelemetry.io/collector/pdata v0.66.1-0.20221202005155-1c54042beb70/go.mod h1:pqyaznLzk21m+1KL6fwOsRryRELL+zNM0qiVSn0MbVc= 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= @@ -383,8 +385,8 @@ go.uber.org/zap v1.9.1/go.mod h1:vwi/ZaCAaUcBkycHslxD9B2zi4UTXhF60s6SWpuDF0Q= go.uber.org/zap v1.10.0/go.mod h1:vwi/ZaCAaUcBkycHslxD9B2zi4UTXhF60s6SWpuDF0Q= go.uber.org/zap v1.13.0/go.mod h1:zwrFLgMcdUuIBviXEYEH1YKNaOBnKXsx2IPda5bBwHM= go.uber.org/zap v1.17.0/go.mod h1:MXVU+bhUf/A7Xi2HNOnopQOrmycQ5Ih87HtOu4q5SSo= -go.uber.org/zap v1.23.0 h1:OjGQ5KQDEUawVHxNwQgPpiypGHOxo2mNZsOqTak4fFY= -go.uber.org/zap v1.23.0/go.mod h1:D+nX8jyLsMHMYrln8A0rJjFt/T/9/bGgIhAqxv5URuY= +go.uber.org/zap v1.24.0 h1:FiJd5l1UOLj0wCgbSE0rwwXHzEdAZS6hiiSnxJN/D60= +go.uber.org/zap v1.24.0/go.mod h1:2kMP+WWQ8aoFoedH3T2sq6iJ2yDWpHbP0f6MQbS9Gkg= golang.org/x/crypto v0.0.0-20180904163835-0709b304e793/go.mod h1:6SG95UA2DQfeDnfUPMdvaQW0Q7yPrPDi9nlGo2tz2b4= golang.org/x/crypto v0.0.0-20190308221718-c2843e01d9a2/go.mod h1:djNgcEr1/C05ACkg1iLfiJU5Ep61QUkGW8qpdssI0+w= golang.org/x/crypto v0.0.0-20190411191339-88737f569e3a/go.mod h1:WFFai1msRO1wXaEeE5yQxYXgSfI8pQAWXbQop6sCtWE= diff --git a/extension/storage/storagetest/extension.go b/extension/storage/storagetest/extension.go index 872790590902..8cc7f1cf9c8f 100644 --- a/extension/storage/storagetest/extension.go +++ b/extension/storage/storagetest/extension.go @@ -18,7 +18,7 @@ import ( "context" "go.opentelemetry.io/collector/component" - "go.opentelemetry.io/collector/config" + "go.opentelemetry.io/collector/extension" "go.opentelemetry.io/collector/extension/experimental/storage" ) @@ -26,7 +26,9 @@ var testStorageType component.Type = "test_storage" // TestStorage is an in memory storage extension designed for testing type TestStorage struct { - config.ExtensionSettings + component.StartFunc + component.ShutdownFunc + ID component.ID storageDir string } @@ -40,32 +42,18 @@ func NewStorageID(name string) component.ID { // NewInMemoryStorageExtension creates a TestStorage extension func NewInMemoryStorageExtension(name string) *TestStorage { return &TestStorage{ - ExtensionSettings: config.NewExtensionSettings( - NewStorageID(name), - ), + ID: NewStorageID(name), } } // NewFileBackedStorageExtension creates a TestStorage extension func NewFileBackedStorageExtension(name string, storageDir string) *TestStorage { return &TestStorage{ - ExtensionSettings: config.NewExtensionSettings( - NewStorageID(name), - ), + ID: NewStorageID(name), storageDir: storageDir, } } -// Start does nothing -func (s *TestStorage) Start(context.Context, component.Host) error { - return nil -} - -// Shutdown does nothing -func (s *TestStorage) Shutdown(ctx context.Context) error { - return nil -} - // GetClient returns a storage client for an individual component func (s *TestStorage) GetClient(ctx context.Context, kind component.Kind, ent component.ID, name string) (storage.Client, error) { var client *TestClient @@ -74,7 +62,7 @@ func (s *TestStorage) GetClient(ctx context.Context, kind component.Kind, ent co } else { client = NewFileBackedClient(kind, ent, name, s.storageDir) } - return client, setCreatorID(ctx, client, s.ID()) + return client, setCreatorID(ctx, client, s.ID) } var nonStorageType component.Type = "non_storage" @@ -82,11 +70,13 @@ var nonStorageType component.Type = "non_storage" // NonStorage is useful for testing expected behaviors that involve // non-storage extensions type NonStorage struct { - config.ExtensionSettings + component.StartFunc + component.ShutdownFunc + ID component.ID } // Ensure this extension implements the appropriate interface -var _ component.Extension = (*NonStorage)(nil) +var _ extension.Extension = (*NonStorage)(nil) func NewNonStorageID(name string) component.ID { return component.NewIDWithName(nonStorageType, name) @@ -95,18 +85,6 @@ func NewNonStorageID(name string) component.ID { // NewNonStorageExtension creates a NonStorage extension func NewNonStorageExtension(name string) *NonStorage { return &NonStorage{ - ExtensionSettings: config.NewExtensionSettings( - NewNonStorageID(name), - ), + ID: NewNonStorageID(name), } } - -// Start does nothing -func (ns *NonStorage) Start(context.Context, component.Host) error { - return nil -} - -// Shutdown does nothing -func (ns *NonStorage) Shutdown(context.Context) error { - return nil -} diff --git a/extension/storage/storagetest/extension_test.go b/extension/storage/storagetest/extension_test.go index c644c77a98b1..7813eaa4b9f5 100644 --- a/extension/storage/storagetest/extension_test.go +++ b/extension/storage/storagetest/extension_test.go @@ -25,21 +25,21 @@ import ( ) func TestID(t *testing.T) { - require.Equal(t, NewStorageID("test"), NewInMemoryStorageExtension("test").ID()) - require.Equal(t, NewStorageID("test"), NewFileBackedStorageExtension("test", t.TempDir()).ID()) - require.Equal(t, NewNonStorageID("test"), NewNonStorageExtension("test").ID()) + require.Equal(t, NewStorageID("test"), NewInMemoryStorageExtension("test").ID) + require.Equal(t, NewStorageID("test"), NewFileBackedStorageExtension("test", t.TempDir()).ID) + require.Equal(t, NewNonStorageID("test"), NewNonStorageExtension("test").ID) } func TestInMemoryLifecycle(t *testing.T) { ext := NewInMemoryStorageExtension("test") - require.Equal(t, component.NewIDWithName(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, component.NewIDWithName(testStorageType, "test"), ext.ID()) + require.Equal(t, component.NewIDWithName(testStorageType, "test"), ext.ID) runExtensionLifecycle(t, ext, true) } @@ -52,7 +52,7 @@ func runExtensionLifecycle(t *testing.T, ext *TestStorage, expectPersistence boo creatorID, err := CreatorID(ctx, clientOne) require.NoError(t, err) - require.Equal(t, ext.ID(), creatorID) + require.Equal(t, ext.ID, creatorID) // Write a value, confirm it is saved require.NoError(t, clientOne.Set(ctx, "foo", []byte("bar"))) @@ -81,7 +81,7 @@ func runExtensionLifecycle(t *testing.T, ext *TestStorage, expectPersistence boo creatorID, err = CreatorID(ctx, clientTwo) require.NoError(t, err) - require.Equal(t, ext.ID(), creatorID) + require.Equal(t, ext.ID, creatorID) // Check if the value is accessible from another client fooVal, err = clientTwo.Get(ctx, "foo2") diff --git a/extension/storage/storagetest/host.go b/extension/storage/storagetest/host.go index 60af00aa06f2..eab4baf30e30 100644 --- a/extension/storage/storagetest/host.go +++ b/extension/storage/storagetest/host.go @@ -17,6 +17,7 @@ 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/extension" ) type StorageHost struct { @@ -31,26 +32,26 @@ func NewStorageHost() *StorageHost { } } -func (h *StorageHost) WithExtension(id component.ID, ext component.Extension) *StorageHost { +func (h *StorageHost) WithExtension(id component.ID, ext extension.Extension) *StorageHost { h.extensions[id] = ext return h } func (h *StorageHost) WithInMemoryStorageExtension(name string) *StorageHost { ext := NewInMemoryStorageExtension(name) - h.extensions[ext.ID()] = ext + h.extensions[ext.ID] = ext return h } func (h *StorageHost) WithFileBackedStorageExtension(name, storageDir string) *StorageHost { ext := NewFileBackedStorageExtension(name, storageDir) - h.extensions[ext.ID()] = ext + h.extensions[ext.ID] = ext return h } func (h *StorageHost) WithNonStorageExtension(name string) *StorageHost { ext := NewNonStorageExtension(name) - h.extensions[ext.ID()] = ext + h.extensions[ext.ID] = ext return h } diff --git a/extension/storage/storagetest/host_test.go b/extension/storage/storagetest/host_test.go index e18328c940d7..90b45cb47a31 100644 --- a/extension/storage/storagetest/host_test.go +++ b/extension/storage/storagetest/host_test.go @@ -38,7 +38,7 @@ func TestStorageHostWithOne(t *testing.T) { storageOne, ok := extOne.(*TestStorage) require.True(t, ok) - require.Equal(t, storageID, storageOne.ID()) + require.Equal(t, storageID, storageOne.ID) } func TestStorageHostWithTwo(t *testing.T) { @@ -57,14 +57,14 @@ func TestStorageHostWithTwo(t *testing.T) { storageOne, ok := extOne.(*TestStorage) require.True(t, ok) - require.Equal(t, storageOneID, storageOne.ID()) + require.Equal(t, storageOneID, storageOne.ID) extTwo, exists := exts[storageTwoID] require.True(t, exists) storageTwo, ok := extTwo.(*TestStorage) require.True(t, ok) - require.Equal(t, storageTwoID, storageTwo.ID()) + require.Equal(t, storageTwoID, storageTwo.ID) } func TestStorageHostWithMixed(t *testing.T) { @@ -85,19 +85,19 @@ func TestStorageHostWithMixed(t *testing.T) { storageOne, ok := extOne.(*TestStorage) require.True(t, ok) - require.Equal(t, storageOneID, storageOne.ID()) + require.Equal(t, storageOneID, storageOne.ID) extTwo, exists := exts[storageTwoID] require.True(t, exists) storageTwo, ok := extTwo.(*TestStorage) require.True(t, ok) - require.Equal(t, storageTwoID, storageTwo.ID()) + require.Equal(t, storageTwoID, storageTwo.ID) extNon, exists := exts[nonStorageID] require.True(t, exists) nonStorage, ok := extNon.(*NonStorage) require.True(t, ok) - require.Equal(t, nonStorageID, nonStorage.ID()) + require.Equal(t, nonStorageID, nonStorage.ID) } diff --git a/go.mod b/go.mod index 3555da287ce2..37930c3d7a21 100644 --- a/go.mod +++ b/go.mod @@ -142,7 +142,7 @@ require ( github.com/open-telemetry/opentelemetry-collector-contrib/receiver/riakreceiver v0.66.0 github.com/open-telemetry/opentelemetry-collector-contrib/receiver/saphanareceiver v0.66.0 github.com/open-telemetry/opentelemetry-collector-contrib/receiver/sapmreceiver v0.66.0 - github.com/open-telemetry/opentelemetry-collector-contrib/receiver/signalfxreceiver v0.66.0 + github.com/open-telemetry/opentelemetry-collector-contrib/receiver/signalfxreceiver v0.0.0-00010101000000-000000000000 github.com/open-telemetry/opentelemetry-collector-contrib/receiver/simpleprometheusreceiver v0.66.0 github.com/open-telemetry/opentelemetry-collector-contrib/receiver/skywalkingreceiver v0.66.0 github.com/open-telemetry/opentelemetry-collector-contrib/receiver/snmpreceiver v0.66.0 @@ -163,17 +163,17 @@ require ( github.com/prometheus/common v0.37.0 github.com/prometheus/prometheus v0.39.1 github.com/stretchr/testify v1.8.1 - go.opentelemetry.io/collector v0.66.1-0.20221128222955-4ff1ff379b90 - go.opentelemetry.io/collector/component v0.66.1-0.20221128222955-4ff1ff379b90 - go.opentelemetry.io/collector/consumer v0.66.1-0.20221128222955-4ff1ff379b90 - go.opentelemetry.io/collector/exporter/loggingexporter v0.66.1-0.20221128222955-4ff1ff379b90 - go.opentelemetry.io/collector/exporter/otlpexporter v0.66.1-0.20221128222955-4ff1ff379b90 - go.opentelemetry.io/collector/exporter/otlphttpexporter v0.66.1-0.20221128222955-4ff1ff379b90 - go.opentelemetry.io/collector/extension/ballastextension v0.66.1-0.20221128222955-4ff1ff379b90 - go.opentelemetry.io/collector/extension/zpagesextension v0.66.1-0.20221128222955-4ff1ff379b90 - go.opentelemetry.io/collector/processor/batchprocessor v0.66.1-0.20221128222955-4ff1ff379b90 - go.opentelemetry.io/collector/processor/memorylimiterprocessor v0.66.1-0.20221128222955-4ff1ff379b90 - go.opentelemetry.io/collector/receiver/otlpreceiver v0.66.1-0.20221128222955-4ff1ff379b90 + go.opentelemetry.io/collector v0.66.1-0.20221202005155-1c54042beb70 + go.opentelemetry.io/collector/component v0.66.1-0.20221202005155-1c54042beb70 + go.opentelemetry.io/collector/consumer v0.66.1-0.20221202005155-1c54042beb70 + go.opentelemetry.io/collector/exporter/loggingexporter v0.66.1-0.20221202005155-1c54042beb70 + go.opentelemetry.io/collector/exporter/otlpexporter v0.66.1-0.20221202005155-1c54042beb70 + go.opentelemetry.io/collector/exporter/otlphttpexporter v0.66.1-0.20221202005155-1c54042beb70 + go.opentelemetry.io/collector/extension/ballastextension v0.66.1-0.20221202005155-1c54042beb70 + go.opentelemetry.io/collector/extension/zpagesextension v0.66.1-0.20221202005155-1c54042beb70 + go.opentelemetry.io/collector/processor/batchprocessor v0.66.1-0.20221202005155-1c54042beb70 + go.opentelemetry.io/collector/processor/memorylimiterprocessor v0.66.1-0.20221202005155-1c54042beb70 + go.opentelemetry.io/collector/receiver/otlpreceiver v0.66.1-0.20221202005155-1c54042beb70 go.uber.org/multierr v1.8.0 golang.org/x/sys v0.2.0 ) @@ -237,9 +237,9 @@ require ( github.com/DataDog/sketches-go v1.4.1 // indirect github.com/DataDog/zstd v1.5.2 // indirect github.com/GehirnInc/crypt v0.0.0-20200316065508-bb7000b8a962 // indirect - github.com/GoogleCloudPlatform/opentelemetry-operations-go/detectors/gcp v0.34.1 // indirect + github.com/GoogleCloudPlatform/opentelemetry-operations-go/detectors/gcp v0.34.2 // indirect github.com/GoogleCloudPlatform/opentelemetry-operations-go/exporter/collector v0.34.2 // indirect - github.com/GoogleCloudPlatform/opentelemetry-operations-go/exporter/collector/googlemanagedprometheus v0.34.1 // indirect + github.com/GoogleCloudPlatform/opentelemetry-operations-go/exporter/collector/googlemanagedprometheus v0.34.2 // indirect github.com/GoogleCloudPlatform/opentelemetry-operations-go/exporter/trace v1.10.2 // indirect github.com/GoogleCloudPlatform/opentelemetry-operations-go/internal/resourcemapping v0.34.2 // indirect github.com/Masterminds/goutils v1.1.1 // indirect @@ -598,8 +598,8 @@ require ( github.com/tidwall/wal v1.1.7 // indirect github.com/tilinna/clock v1.1.0 // indirect github.com/tinylib/msgp v1.1.6 // indirect - github.com/tklauser/go-sysconf v0.3.10 // indirect - github.com/tklauser/numcpus v0.5.0 // indirect + github.com/tklauser/go-sysconf v0.3.11 // indirect + github.com/tklauser/numcpus v0.6.0 // indirect github.com/uber/jaeger-client-go v2.30.0+incompatible // indirect github.com/uber/jaeger-lib v2.4.1+incompatible // indirect github.com/vincent-petithory/dataurl v1.0.0 // indirect @@ -624,9 +624,10 @@ require ( go.mongodb.org/atlas v0.19.0 // indirect go.mongodb.org/mongo-driver v1.10.3 // indirect go.opencensus.io v0.24.0 // indirect - go.opentelemetry.io/collector/featuregate v0.66.1-0.20221128222955-4ff1ff379b90 // indirect - go.opentelemetry.io/collector/pdata v0.66.1-0.20221128222955-4ff1ff379b90 // indirect - go.opentelemetry.io/collector/semconv v0.66.1-0.20221128222955-4ff1ff379b90 // indirect + go.opentelemetry.io/collector/confmap v0.0.0-20221201172708-2bdff61fa52a // indirect + go.opentelemetry.io/collector/featuregate v0.66.1-0.20221202005155-1c54042beb70 // indirect + go.opentelemetry.io/collector/pdata v0.66.1-0.20221202005155-1c54042beb70 // indirect + go.opentelemetry.io/collector/semconv v0.66.1-0.20221202005155-1c54042beb70 // 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 @@ -639,7 +640,7 @@ require ( go.opentelemetry.io/otel/trace v1.11.1 // indirect go.uber.org/atomic v1.10.0 // indirect go.uber.org/goleak v1.2.0 // indirect - go.uber.org/zap v1.23.0 // indirect + go.uber.org/zap v1.24.0 // indirect go4.org/intern v0.0.0-20211027215823-ae77deb06f29 // indirect go4.org/unsafe/assume-no-moving-gc v0.0.0-20220617031537-928513b29760 // indirect golang.org/x/crypto v0.1.0 // indirect diff --git a/go.sum b/go.sum index 09ecb12a6eca..4fcf79651cfa 100644 --- a/go.sum +++ b/go.sum @@ -447,12 +447,12 @@ github.com/DataDog/zstd v1.5.2/go.mod h1:g4AWEaM3yOg3HYfnJ3YIawPnVdXJh9QME85blwS github.com/Djarvur/go-err113 v0.0.0-20210108212216-aea10b59be24/go.mod h1:4UJr5HIiMZrwgkSPdsjy2uOQExX/WEILpIrO9UPGuXs= github.com/GehirnInc/crypt v0.0.0-20200316065508-bb7000b8a962 h1:KeNholpO2xKjgaaSyd+DyQRrsQjhbSeS7qe4nEw8aQw= github.com/GehirnInc/crypt v0.0.0-20200316065508-bb7000b8a962/go.mod h1:kC29dT1vFpj7py2OvG1khBdQpo3kInWP+6QipLbdngo= -github.com/GoogleCloudPlatform/opentelemetry-operations-go/detectors/gcp v0.34.1 h1:gcHr5iIamTMH+TOqvcIrkZ9zpDOKVkc2du/VYGJkYfM= -github.com/GoogleCloudPlatform/opentelemetry-operations-go/detectors/gcp v0.34.1/go.mod h1:8jbDwk101z1YJ201wir2t/3O5Sxn55M37IDVwnQA1rg= +github.com/GoogleCloudPlatform/opentelemetry-operations-go/detectors/gcp v0.34.2 h1:ebkUIeRzDUUeX7Mot0nYeyOhBMhS9bJj7v3tvZyqpdQ= +github.com/GoogleCloudPlatform/opentelemetry-operations-go/detectors/gcp v0.34.2/go.mod h1:HpmGbYLf1fsWiqVA0Z2oKh7qi7BroCgOl2NqB2N/TG4= github.com/GoogleCloudPlatform/opentelemetry-operations-go/exporter/collector v0.34.2 h1:LPtUGPSP+r9ONQ2rMlQtcU4ZPtJPLMYfbiT+/3q2rH4= github.com/GoogleCloudPlatform/opentelemetry-operations-go/exporter/collector v0.34.2/go.mod h1:Ak7usPCI+GqelKZTtbE7Sk4+ci2jjnkfl4X04YH7/ZY= -github.com/GoogleCloudPlatform/opentelemetry-operations-go/exporter/collector/googlemanagedprometheus v0.34.1 h1:O89aZCuqbyM1EB3XQkiyoeUXfGKsiEUwj7RyIGhH4uc= -github.com/GoogleCloudPlatform/opentelemetry-operations-go/exporter/collector/googlemanagedprometheus v0.34.1/go.mod h1:AWHL23liZLi/Ljw5XqFHyX/vloKqPodLx7Um4UKXisI= +github.com/GoogleCloudPlatform/opentelemetry-operations-go/exporter/collector/googlemanagedprometheus v0.34.2 h1:0WbyP5GfXxWvhoQVL7U4YouxQRrIRp6MEwcxxCIEGR0= +github.com/GoogleCloudPlatform/opentelemetry-operations-go/exporter/collector/googlemanagedprometheus v0.34.2/go.mod h1:NW+a69oLVqYvWZ98nlUPI/TqsOA/YRdOokzQVGNOxc4= github.com/GoogleCloudPlatform/opentelemetry-operations-go/exporter/trace v1.10.2 h1:mZ/DetsTFTLmOQq1B9l1ADBpJAYErGULD1C4oNLXjhI= github.com/GoogleCloudPlatform/opentelemetry-operations-go/exporter/trace v1.10.2/go.mod h1:wSSk0tKu5LMPxly6isD4u/myjFfXbqjzDbWRiLbXseE= github.com/GoogleCloudPlatform/opentelemetry-operations-go/internal/cloudmock v0.34.2 h1:svYLYCkrSUba1GQNyugC+4KVer/J9w8QPqoxWk8Rx58= @@ -2432,12 +2432,13 @@ github.com/timakin/bodyclose v0.0.0-20200424151742-cb6215831a94/go.mod h1:Qimiff github.com/tinylib/msgp v1.1.6 h1:i+SbKraHhnrf9M5MYmvQhFnbLhAXSDWF8WWsuyRdocw= github.com/tinylib/msgp v1.1.6/go.mod h1:75BAfg2hauQhs3qedfdDZmWAPcFMAvJE5b9rGOMufyw= github.com/tklauser/go-sysconf v0.3.9/go.mod h1:11DU/5sG7UexIrp/O6g35hrWzu0JxlwQ3LSFUzyeuhs= -github.com/tklauser/go-sysconf v0.3.10 h1:IJ1AZGZRWbY8T5Vfk04D9WOA5WSejdflXxP03OUqALw= github.com/tklauser/go-sysconf v0.3.10/go.mod h1:C8XykCvCb+Gn0oNCWPIlcb0RuglQTYaQ2hGm7jmxEFk= +github.com/tklauser/go-sysconf v0.3.11 h1:89WgdJhk5SNwJfu+GKyYveZ4IaJ7xAkecBo+KdJV0CM= +github.com/tklauser/go-sysconf v0.3.11/go.mod h1:GqXfhXY3kiPa0nAXPDIQIWzJbMCB7AmcWpGR8lSZfqI= github.com/tklauser/numcpus v0.3.0/go.mod h1:yFGUr7TUHQRAhyqBcEg0Ge34zDBAsIvJJcyE6boqnA8= github.com/tklauser/numcpus v0.4.0/go.mod h1:1+UI3pD8NW14VMwdgJNJ1ESk2UnwhAnz5hMwiKKqXCQ= -github.com/tklauser/numcpus v0.5.0 h1:ooe7gN0fg6myJ0EKoTAf5hebTZrH52px3New/D9iJ+A= -github.com/tklauser/numcpus v0.5.0/go.mod h1:OGzpTxpcIMNGYQdit2BYL1pvk/dSOaJWjKoflh+RQjo= +github.com/tklauser/numcpus v0.6.0 h1:kebhY2Qt+3U6RNK7UqpYNA+tJ23IBEGKkB7JQBfDYms= +github.com/tklauser/numcpus v0.6.0/go.mod h1:FEZLMke0lhOUG6w2JadTzp0a+Nl8PF/GFkQ5UVIcaL4= github.com/tmc/grpc-websocket-proxy v0.0.0-20170815181823-89b8d40f7ca8/go.mod h1:ncp9v5uamzpCO7NfCPTXjqaC+bZgJeR0sMTm6dMHP7U= github.com/tmc/grpc-websocket-proxy v0.0.0-20190109142713-0ad062ec5ee5/go.mod h1:ncp9v5uamzpCO7NfCPTXjqaC+bZgJeR0sMTm6dMHP7U= github.com/tomarrell/wrapcheck v0.0.0-20201130113247-1683564d9756/go.mod h1:yiFB6fFoV7saXirUGfuK+cPtUh4NX/Hf5y2WC2lehu0= @@ -2582,50 +2583,59 @@ go.opencensus.io v0.24.0/go.mod h1:vNK8G9p7aAivkbmorf4v+7Hgx+Zs0yY+0fOtgBfjQKo= go.opentelemetry.io/collector v0.57.2/go.mod h1:9TwWyMRhbFNzaaGLtm/6poWNDJw+etvQMS6Fy+8/8Xs= go.opentelemetry.io/collector v0.64.1/go.mod h1:RxdEKzwxTEhBAgzC4wzyJEwSFgjWU73CHnLjKUKQDyo= go.opentelemetry.io/collector v0.65.0/go.mod h1:hE6jCs+0rfiufCrVPucKZTMwfHit1okfDPnwPT2eW1I= -go.opentelemetry.io/collector v0.66.1-0.20221128222955-4ff1ff379b90 h1:yRe05/jMdzH4TFHfndZ5h2o2hKBK/79W72j8w51qNsI= -go.opentelemetry.io/collector v0.66.1-0.20221128222955-4ff1ff379b90/go.mod h1:hE6jCs+0rfiufCrVPucKZTMwfHit1okfDPnwPT2eW1I= +go.opentelemetry.io/collector v0.66.1-0.20221202005155-1c54042beb70 h1:INB2CsOtqqrija2KvMuIpbBQ3qX1BECEeR+d0NJX+oM= +go.opentelemetry.io/collector v0.66.1-0.20221202005155-1c54042beb70/go.mod h1:d0NHkHyANJy3HDTvYE/PoylMShUmFIbiir89ieI0X0c= go.opentelemetry.io/collector/component v0.65.0/go.mod h1:0c84EqXUhvYe6KW7hJfh76tiI/5yjWCH2amwyQ06XLM= -go.opentelemetry.io/collector/component v0.66.1-0.20221128222955-4ff1ff379b90 h1:AYSNTXbezhNg43EuYdVVcgxE/2gBVrm00FDx4DOmQVg= -go.opentelemetry.io/collector/component v0.66.1-0.20221128222955-4ff1ff379b90/go.mod h1:0c84EqXUhvYe6KW7hJfh76tiI/5yjWCH2amwyQ06XLM= +go.opentelemetry.io/collector/component v0.66.0/go.mod h1:0c84EqXUhvYe6KW7hJfh76tiI/5yjWCH2amwyQ06XLM= +go.opentelemetry.io/collector/component v0.66.1-0.20221202005155-1c54042beb70 h1:dEoJhzCmRShgmVro/kXm6pouGElgxkH2DsvanzCeZtU= +go.opentelemetry.io/collector/component v0.66.1-0.20221202005155-1c54042beb70/go.mod h1:OsVnvFFe38QSpcuZlQ8cvarDzcloCexgQ1/B2m80F6U= +go.opentelemetry.io/collector/confmap v0.0.0-20221201172708-2bdff61fa52a h1:2TscCXAQASO2kU9xHcMIUM/FP29fiQIRTilZmliq/7I= +go.opentelemetry.io/collector/confmap v0.0.0-20221201172708-2bdff61fa52a/go.mod h1:qJ3e8bA8h4wz/jYlbeEUafVHdrU7DkpStnmIUAz6VTQ= go.opentelemetry.io/collector/consumer v0.65.0/go.mod h1:WtoRZa5SnxQO1ZEQdVxYpFcXCmq62rakv0oUSlPO0NQ= -go.opentelemetry.io/collector/consumer v0.66.1-0.20221128222955-4ff1ff379b90 h1:nzNXVfC1FzXBXCLMzbMv+qK3E4EGiNsnMhfVsBd2yzc= -go.opentelemetry.io/collector/consumer v0.66.1-0.20221128222955-4ff1ff379b90/go.mod h1:WtoRZa5SnxQO1ZEQdVxYpFcXCmq62rakv0oUSlPO0NQ= -go.opentelemetry.io/collector/exporter/loggingexporter v0.66.1-0.20221128222955-4ff1ff379b90 h1:kCxEnurhKpScV+wDU/7RDngmOFeqyEh7GZUqrBaYnUU= -go.opentelemetry.io/collector/exporter/loggingexporter v0.66.1-0.20221128222955-4ff1ff379b90/go.mod h1:X7fNHTbcgvOOio9QDEyVk0WbIm1JaVYby4z3VzsOc2k= -go.opentelemetry.io/collector/exporter/otlpexporter v0.66.1-0.20221128222955-4ff1ff379b90 h1:3+YgPEDEyNzwiI+V9J2YBVGyV9Qppu4VPbB3jHeN8Ns= -go.opentelemetry.io/collector/exporter/otlpexporter v0.66.1-0.20221128222955-4ff1ff379b90/go.mod h1:IOoHR1lsV1r2TFOVctPogn9RUXT4jiU7kH+IhfUlP1w= -go.opentelemetry.io/collector/exporter/otlphttpexporter v0.66.1-0.20221128222955-4ff1ff379b90 h1:KkI/to7/yvuL5zHzhviy7UXMZVZ7jbfnk+YCAwCiimA= -go.opentelemetry.io/collector/exporter/otlphttpexporter v0.66.1-0.20221128222955-4ff1ff379b90/go.mod h1:Gx9WIGE9pUv38Sm8IN0IPM7k+mX2hHGfRZI/65pOSIc= -go.opentelemetry.io/collector/extension/ballastextension v0.66.1-0.20221128222955-4ff1ff379b90 h1:JmfSDExgWNiFQJ4eF9UzjDaE9rfBhKxIu5khBbAScd0= -go.opentelemetry.io/collector/extension/ballastextension v0.66.1-0.20221128222955-4ff1ff379b90/go.mod h1:vjBno34PZB+byrW3QWzftLFqCI1G8PbgPrgPzpFXpQM= +go.opentelemetry.io/collector/consumer v0.66.0/go.mod h1:WtoRZa5SnxQO1ZEQdVxYpFcXCmq62rakv0oUSlPO0NQ= +go.opentelemetry.io/collector/consumer v0.66.1-0.20221202005155-1c54042beb70 h1:XwpVjI1KeKGPXOZBLefGILMziPYuNf6IzbmiIEsIyI0= +go.opentelemetry.io/collector/consumer v0.66.1-0.20221202005155-1c54042beb70/go.mod h1:EWVBcSGcIcmeDGTnIboc/aqa3agsBeH8/q7yFWG7xVc= +go.opentelemetry.io/collector/exporter/loggingexporter v0.66.1-0.20221202005155-1c54042beb70 h1:/C637mgJY6I0l/KFLXmL9I1foefM53aob20WF2Yh/0Y= +go.opentelemetry.io/collector/exporter/loggingexporter v0.66.1-0.20221202005155-1c54042beb70/go.mod h1:xxkHO5NrxffTV22dhCy3K8XZThGJ1ak7LZ1ctoiJp5k= +go.opentelemetry.io/collector/exporter/otlpexporter v0.66.1-0.20221202005155-1c54042beb70 h1:m9GPfziw/079Xt7/Pfby/5obJhtqR19WKkgQQ/VxNZo= +go.opentelemetry.io/collector/exporter/otlpexporter v0.66.1-0.20221202005155-1c54042beb70/go.mod h1:bCD3trc7OqeEVCgyQdO3kwGgogZMjcMu2tX49SFv1lU= +go.opentelemetry.io/collector/exporter/otlphttpexporter v0.66.1-0.20221202005155-1c54042beb70 h1:7rDNCZS1qfqZxnCLaBWItnX/TweYKC6NyULpelzXl4g= +go.opentelemetry.io/collector/exporter/otlphttpexporter v0.66.1-0.20221202005155-1c54042beb70/go.mod h1:vkFlRP0DDfDfSDVl96Gvy5Ah8L8sMcVAxMZn+0af2ew= +go.opentelemetry.io/collector/extension/ballastextension v0.66.1-0.20221202005155-1c54042beb70 h1:pSGZDMMURLRp7iSxeNlDNDxDgFQJqCYt+Fv7bZxC0JU= +go.opentelemetry.io/collector/extension/ballastextension v0.66.1-0.20221202005155-1c54042beb70/go.mod h1:+YdyZisEXLDE8rhZE7Ce4wli0ZVE164SFN0qg2mPjDU= go.opentelemetry.io/collector/extension/zpagesextension v0.64.1/go.mod h1:XenhQAUbOHgqNq5YQ/vQIcDHRcPUaDgZQxDC2qoI4Bc= go.opentelemetry.io/collector/extension/zpagesextension v0.65.0/go.mod h1:+IPas7AeffG0GMIXhZr8IzpTNhH1Ri/6S/9YFqbLsmQ= -go.opentelemetry.io/collector/extension/zpagesextension v0.66.1-0.20221128222955-4ff1ff379b90 h1:Hsvd2zNTCjHjYVsHt57zUgpKMrmESgndZItuuvvv2bA= -go.opentelemetry.io/collector/extension/zpagesextension v0.66.1-0.20221128222955-4ff1ff379b90/go.mod h1:+IPas7AeffG0GMIXhZr8IzpTNhH1Ri/6S/9YFqbLsmQ= +go.opentelemetry.io/collector/extension/zpagesextension v0.66.0/go.mod h1:+IPas7AeffG0GMIXhZr8IzpTNhH1Ri/6S/9YFqbLsmQ= +go.opentelemetry.io/collector/extension/zpagesextension v0.66.1-0.20221202005155-1c54042beb70 h1:+vq59gRJpiAcUshBVxhqhc9aXOc/8Z5wuWlyng5Hfm4= +go.opentelemetry.io/collector/extension/zpagesextension v0.66.1-0.20221202005155-1c54042beb70/go.mod h1:tejEMB1pDXsmEeyg7UHB+S++4Lvgtki7N5CVWk5rI4A= go.opentelemetry.io/collector/featuregate v0.65.0/go.mod h1:tewuFKJYalWBU0bmNKg++MC1ipINXUr6szYzOw2p1GI= -go.opentelemetry.io/collector/featuregate v0.66.1-0.20221128222955-4ff1ff379b90 h1:UuJSFWbi9XxyNZsJKZuvpWg35BgRbcCGFH+38V2MAdw= -go.opentelemetry.io/collector/featuregate v0.66.1-0.20221128222955-4ff1ff379b90/go.mod h1:tewuFKJYalWBU0bmNKg++MC1ipINXUr6szYzOw2p1GI= +go.opentelemetry.io/collector/featuregate v0.66.0/go.mod h1:tewuFKJYalWBU0bmNKg++MC1ipINXUr6szYzOw2p1GI= +go.opentelemetry.io/collector/featuregate v0.66.1-0.20221202005155-1c54042beb70 h1:V0tf4ebciqIs07jFATfLGdUpLRaEsi+AiWuA/in0G8Y= +go.opentelemetry.io/collector/featuregate v0.66.1-0.20221202005155-1c54042beb70/go.mod h1:tewuFKJYalWBU0bmNKg++MC1ipINXUr6szYzOw2p1GI= go.opentelemetry.io/collector/pdata v0.56.0/go.mod h1:mYcCREWiIJyHss0dbU+GSiz2tmGZ6u09vtfkKTciog4= go.opentelemetry.io/collector/pdata v0.57.2/go.mod h1:RU9I8lwBUxucwOsSYzHEcHi15M9QaX78hgQ2PRdSxV0= go.opentelemetry.io/collector/pdata v0.64.1/go.mod h1:IzvXUGQml2mrnvdb8zIlEW3qQs9oFLdD2hLwJdZ+pek= go.opentelemetry.io/collector/pdata v0.65.0/go.mod h1:pqyaznLzk21m+1KL6fwOsRryRELL+zNM0qiVSn0MbVc= -go.opentelemetry.io/collector/pdata v0.66.1-0.20221128222955-4ff1ff379b90 h1:Vu4S4jSNcd0VFPzxQNO4+UqGwnes1xJDoFLPRiWHm8I= -go.opentelemetry.io/collector/pdata v0.66.1-0.20221128222955-4ff1ff379b90/go.mod h1:pqyaznLzk21m+1KL6fwOsRryRELL+zNM0qiVSn0MbVc= +go.opentelemetry.io/collector/pdata v0.66.0/go.mod h1:pqyaznLzk21m+1KL6fwOsRryRELL+zNM0qiVSn0MbVc= +go.opentelemetry.io/collector/pdata v0.66.1-0.20221202005155-1c54042beb70 h1:TPOrxkEMvZzfBSwF3ct+kUUgKA5g8unkZZbKQvJweeA= +go.opentelemetry.io/collector/pdata v0.66.1-0.20221202005155-1c54042beb70/go.mod h1:pqyaznLzk21m+1KL6fwOsRryRELL+zNM0qiVSn0MbVc= go.opentelemetry.io/collector/processor/batchprocessor v0.64.1/go.mod h1:qVl0+aYokPfiq5y+JVAvlII2rrUFBDEqqiDbTSnax78= go.opentelemetry.io/collector/processor/batchprocessor v0.65.0/go.mod h1:XhGTsC1B/bq4gpg8IZ/QYBLXkzE4Gw3r7Xu2+ik8A1Q= -go.opentelemetry.io/collector/processor/batchprocessor v0.66.1-0.20221128222955-4ff1ff379b90 h1:K12L9juzjChBMfp7cQaQsToz7i7975tUYVzJ3Tpw/Cw= -go.opentelemetry.io/collector/processor/batchprocessor v0.66.1-0.20221128222955-4ff1ff379b90/go.mod h1:XhGTsC1B/bq4gpg8IZ/QYBLXkzE4Gw3r7Xu2+ik8A1Q= -go.opentelemetry.io/collector/processor/memorylimiterprocessor v0.66.1-0.20221128222955-4ff1ff379b90 h1:4+4M7itvIDswjFTjvVttC+XWy7eOU2lxjEBaUiq/MXk= -go.opentelemetry.io/collector/processor/memorylimiterprocessor v0.66.1-0.20221128222955-4ff1ff379b90/go.mod h1:KfHfOzND4tzQYewrYzi/NGzvOV3wR7jzWTkxSR00lRI= +go.opentelemetry.io/collector/processor/batchprocessor v0.66.0/go.mod h1:XhGTsC1B/bq4gpg8IZ/QYBLXkzE4Gw3r7Xu2+ik8A1Q= +go.opentelemetry.io/collector/processor/batchprocessor v0.66.1-0.20221202005155-1c54042beb70 h1:Y4e8NnVevonnAgmjX9Z7QIMA32yMqHAOnAlh8SzTS8c= +go.opentelemetry.io/collector/processor/batchprocessor v0.66.1-0.20221202005155-1c54042beb70/go.mod h1:Pi1CsKDQFoDrUP1i3+VdE6s2Xuji7bOGFBgqHK0J32E= +go.opentelemetry.io/collector/processor/memorylimiterprocessor v0.66.1-0.20221202005155-1c54042beb70 h1:l0005D1ERsXKno9Ax5Gr2A8FaysF7n40yer6r5qAMHQ= +go.opentelemetry.io/collector/processor/memorylimiterprocessor v0.66.1-0.20221202005155-1c54042beb70/go.mod h1:9CBysimj8fH0weF6Wu8S8nW7cG/XRanrMU1BWlIXeN4= go.opentelemetry.io/collector/receiver/otlpreceiver v0.64.1/go.mod h1:4rwNi9SeCKBP9XGLWNRFKPsWUV5NK4iqMvdj2WRMksQ= -go.opentelemetry.io/collector/receiver/otlpreceiver v0.66.1-0.20221128222955-4ff1ff379b90 h1:/+HfaoVPSXgHUZOTZSSriuKOQi8L/rgyb7TTRx5jzoo= -go.opentelemetry.io/collector/receiver/otlpreceiver v0.66.1-0.20221128222955-4ff1ff379b90/go.mod h1:pb+dcV+KJ44dP+CqV0N6L6dTeDDvCXB8StCqwlrrSkM= +go.opentelemetry.io/collector/receiver/otlpreceiver v0.66.1-0.20221202005155-1c54042beb70 h1:KBbbPVDV7o5w857g6ePphdu4MV87jrcQevFYDA1okUk= +go.opentelemetry.io/collector/receiver/otlpreceiver v0.66.1-0.20221202005155-1c54042beb70/go.mod h1:0Py8RNjNiFRH6/F+vM2uptdaw9hMj1FBdv0ySntM2gE= go.opentelemetry.io/collector/semconv v0.56.0/go.mod h1:EH1wbDvTyqKpKBBpoMIe0KQk2plCcFS66Mo17WtR7CQ= go.opentelemetry.io/collector/semconv v0.57.2/go.mod h1:84YnUjmm+nhGu4YTDLnHCbxnL74ooWpismPG79tFD7w= go.opentelemetry.io/collector/semconv v0.64.1/go.mod h1:5o9yhOa+ABt7g2E5JABDxGZ1PQPbtfxrKNbYn+LOTXU= go.opentelemetry.io/collector/semconv v0.65.0/go.mod h1:5o9yhOa+ABt7g2E5JABDxGZ1PQPbtfxrKNbYn+LOTXU= -go.opentelemetry.io/collector/semconv v0.66.1-0.20221128222955-4ff1ff379b90 h1:hFaTA68cggZKWMv7wQ3bKP8KGTbowh/5AQZKCHzHTqM= -go.opentelemetry.io/collector/semconv v0.66.1-0.20221128222955-4ff1ff379b90/go.mod h1:5o9yhOa+ABt7g2E5JABDxGZ1PQPbtfxrKNbYn+LOTXU= +go.opentelemetry.io/collector/semconv v0.66.0/go.mod h1:5o9yhOa+ABt7g2E5JABDxGZ1PQPbtfxrKNbYn+LOTXU= +go.opentelemetry.io/collector/semconv v0.66.1-0.20221202005155-1c54042beb70 h1:Q5L9Urod3c8as6ZYaoaqBjarx/HXxsxy34DFZIU2fO4= +go.opentelemetry.io/collector/semconv v0.66.1-0.20221202005155-1c54042beb70/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= @@ -2712,8 +2722,9 @@ go.uber.org/zap v1.17.0/go.mod h1:MXVU+bhUf/A7Xi2HNOnopQOrmycQ5Ih87HtOu4q5SSo= go.uber.org/zap v1.19.1/go.mod h1:j3DNczoxDZroyBnOT1L/Q79cfUMGZxlv/9dzN7SM1rI= go.uber.org/zap v1.21.0/go.mod h1:wjWOCqI0f2ZZrJF/UufIOkiC8ii6tm1iqIsLo76RfJw= go.uber.org/zap v1.22.0/go.mod h1:H4siCOZOrAolnUPJEkfaSjDqyP+BDS0DdDWzwcgt3+U= -go.uber.org/zap v1.23.0 h1:OjGQ5KQDEUawVHxNwQgPpiypGHOxo2mNZsOqTak4fFY= go.uber.org/zap v1.23.0/go.mod h1:D+nX8jyLsMHMYrln8A0rJjFt/T/9/bGgIhAqxv5URuY= +go.uber.org/zap v1.24.0 h1:FiJd5l1UOLj0wCgbSE0rwwXHzEdAZS6hiiSnxJN/D60= +go.uber.org/zap v1.24.0/go.mod h1:2kMP+WWQ8aoFoedH3T2sq6iJ2yDWpHbP0f6MQbS9Gkg= go4.org/intern v0.0.0-20211027215823-ae77deb06f29 h1:UXLjNohABv4S58tHmeuIZDO6e3mHpW2Dx33gaNt03LE= go4.org/intern v0.0.0-20211027215823-ae77deb06f29/go.mod h1:cS2ma+47FKrLPdXFpr7CuxiTW3eyJbWew4qx0qtQWDA= go4.org/unsafe/assume-no-moving-gc v0.0.0-20211027215541-db492cf91b37/go.mod h1:FftLjUGFEDu5k8lt0ddY+HcrH/qU/0qk+H8j9/nTl3E= diff --git a/internal/aws/containerinsight/go.mod b/internal/aws/containerinsight/go.mod index b874fb9f7fff..56ee76506bdc 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.66.1-0.20221128222955-4ff1ff379b90 + go.opentelemetry.io/collector/pdata v0.66.1-0.20221202005155-1c54042beb70 go.uber.org/zap v1.23.0 ) diff --git a/internal/aws/containerinsight/go.sum b/internal/aws/containerinsight/go.sum index d2a200bb404e..d492dded46cd 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.66.1-0.20221128222955-4ff1ff379b90 h1:Vu4S4jSNcd0VFPzxQNO4+UqGwnes1xJDoFLPRiWHm8I= -go.opentelemetry.io/collector/pdata v0.66.1-0.20221128222955-4ff1ff379b90/go.mod h1:pqyaznLzk21m+1KL6fwOsRryRELL+zNM0qiVSn0MbVc= +go.opentelemetry.io/collector/pdata v0.66.1-0.20221202005155-1c54042beb70 h1:TPOrxkEMvZzfBSwF3ct+kUUgKA5g8unkZZbKQvJweeA= +go.opentelemetry.io/collector/pdata v0.66.1-0.20221202005155-1c54042beb70/go.mod h1:pqyaznLzk21m+1KL6fwOsRryRELL+zNM0qiVSn0MbVc= 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 36c2a0fe9fad..edc99a37c50d 100644 --- a/internal/aws/cwlogs/go.mod +++ b/internal/aws/cwlogs/go.mod @@ -5,8 +5,8 @@ go 1.18 require ( github.com/aws/aws-sdk-go v1.44.145 github.com/stretchr/testify v1.8.1 - go.opentelemetry.io/collector/component v0.66.1-0.20221128222955-4ff1ff379b90 - go.uber.org/zap v1.23.0 + go.opentelemetry.io/collector/component v0.66.1-0.20221202005155-1c54042beb70 + go.uber.org/zap v1.24.0 ) require ( @@ -26,10 +26,11 @@ 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 v0.66.1-0.20221128222955-4ff1ff379b90 // indirect - go.opentelemetry.io/collector/consumer v0.66.1-0.20221128222955-4ff1ff379b90 // indirect - go.opentelemetry.io/collector/featuregate v0.66.1-0.20221128222955-4ff1ff379b90 // indirect - go.opentelemetry.io/collector/pdata v0.66.1-0.20221128222955-4ff1ff379b90 // indirect + go.opentelemetry.io/collector v0.66.1-0.20221202005155-1c54042beb70 // indirect + go.opentelemetry.io/collector/confmap v0.0.0-20221201172708-2bdff61fa52a // indirect + go.opentelemetry.io/collector/consumer v0.66.1-0.20221202005155-1c54042beb70 // indirect + go.opentelemetry.io/collector/featuregate v0.66.1-0.20221202005155-1c54042beb70 // indirect + go.opentelemetry.io/collector/pdata v0.66.1-0.20221202005155-1c54042beb70 // 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 0cd276955d14..27164ccd7604 100644 --- a/internal/aws/cwlogs/go.sum +++ b/internal/aws/cwlogs/go.sum @@ -271,16 +271,18 @@ github.com/yuin/goldmark v1.4.13/go.mod h1:6yULJ656Px+3vBD8DxQVa3kxgyrAnzto9xy5t go.etcd.io/etcd/api/v3 v3.5.4/go.mod h1:5GB2vv4A4AOn3yk7MftYGHkUfGtDHnEraIjym4dYz5A= go.etcd.io/etcd/client/pkg/v3 v3.5.4/go.mod h1:IJHfcCEKxYu1Os13ZdwCwIUTUVGYTSAM3YSwc9/Ac1g= go.etcd.io/etcd/client/v3 v3.5.4/go.mod h1:ZaRkVgBZC+L+dLCjTcF1hRXpgZXQPOvnA/Ak/gq3kiY= -go.opentelemetry.io/collector v0.66.1-0.20221128222955-4ff1ff379b90 h1:yRe05/jMdzH4TFHfndZ5h2o2hKBK/79W72j8w51qNsI= -go.opentelemetry.io/collector v0.66.1-0.20221128222955-4ff1ff379b90/go.mod h1:hE6jCs+0rfiufCrVPucKZTMwfHit1okfDPnwPT2eW1I= -go.opentelemetry.io/collector/component v0.66.1-0.20221128222955-4ff1ff379b90 h1:AYSNTXbezhNg43EuYdVVcgxE/2gBVrm00FDx4DOmQVg= -go.opentelemetry.io/collector/component v0.66.1-0.20221128222955-4ff1ff379b90/go.mod h1:0c84EqXUhvYe6KW7hJfh76tiI/5yjWCH2amwyQ06XLM= -go.opentelemetry.io/collector/consumer v0.66.1-0.20221128222955-4ff1ff379b90 h1:nzNXVfC1FzXBXCLMzbMv+qK3E4EGiNsnMhfVsBd2yzc= -go.opentelemetry.io/collector/consumer v0.66.1-0.20221128222955-4ff1ff379b90/go.mod h1:WtoRZa5SnxQO1ZEQdVxYpFcXCmq62rakv0oUSlPO0NQ= -go.opentelemetry.io/collector/featuregate v0.66.1-0.20221128222955-4ff1ff379b90 h1:UuJSFWbi9XxyNZsJKZuvpWg35BgRbcCGFH+38V2MAdw= -go.opentelemetry.io/collector/featuregate v0.66.1-0.20221128222955-4ff1ff379b90/go.mod h1:tewuFKJYalWBU0bmNKg++MC1ipINXUr6szYzOw2p1GI= -go.opentelemetry.io/collector/pdata v0.66.1-0.20221128222955-4ff1ff379b90 h1:Vu4S4jSNcd0VFPzxQNO4+UqGwnes1xJDoFLPRiWHm8I= -go.opentelemetry.io/collector/pdata v0.66.1-0.20221128222955-4ff1ff379b90/go.mod h1:pqyaznLzk21m+1KL6fwOsRryRELL+zNM0qiVSn0MbVc= +go.opentelemetry.io/collector v0.66.1-0.20221202005155-1c54042beb70 h1:INB2CsOtqqrija2KvMuIpbBQ3qX1BECEeR+d0NJX+oM= +go.opentelemetry.io/collector v0.66.1-0.20221202005155-1c54042beb70/go.mod h1:d0NHkHyANJy3HDTvYE/PoylMShUmFIbiir89ieI0X0c= +go.opentelemetry.io/collector/component v0.66.1-0.20221202005155-1c54042beb70 h1:dEoJhzCmRShgmVro/kXm6pouGElgxkH2DsvanzCeZtU= +go.opentelemetry.io/collector/component v0.66.1-0.20221202005155-1c54042beb70/go.mod h1:OsVnvFFe38QSpcuZlQ8cvarDzcloCexgQ1/B2m80F6U= +go.opentelemetry.io/collector/confmap v0.0.0-20221201172708-2bdff61fa52a h1:2TscCXAQASO2kU9xHcMIUM/FP29fiQIRTilZmliq/7I= +go.opentelemetry.io/collector/confmap v0.0.0-20221201172708-2bdff61fa52a/go.mod h1:qJ3e8bA8h4wz/jYlbeEUafVHdrU7DkpStnmIUAz6VTQ= +go.opentelemetry.io/collector/consumer v0.66.1-0.20221202005155-1c54042beb70 h1:XwpVjI1KeKGPXOZBLefGILMziPYuNf6IzbmiIEsIyI0= +go.opentelemetry.io/collector/consumer v0.66.1-0.20221202005155-1c54042beb70/go.mod h1:EWVBcSGcIcmeDGTnIboc/aqa3agsBeH8/q7yFWG7xVc= +go.opentelemetry.io/collector/featuregate v0.66.1-0.20221202005155-1c54042beb70 h1:V0tf4ebciqIs07jFATfLGdUpLRaEsi+AiWuA/in0G8Y= +go.opentelemetry.io/collector/featuregate v0.66.1-0.20221202005155-1c54042beb70/go.mod h1:tewuFKJYalWBU0bmNKg++MC1ipINXUr6szYzOw2p1GI= +go.opentelemetry.io/collector/pdata v0.66.1-0.20221202005155-1c54042beb70 h1:TPOrxkEMvZzfBSwF3ct+kUUgKA5g8unkZZbKQvJweeA= +go.opentelemetry.io/collector/pdata v0.66.1-0.20221202005155-1c54042beb70/go.mod h1:pqyaznLzk21m+1KL6fwOsRryRELL+zNM0qiVSn0MbVc= 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= @@ -296,8 +298,8 @@ go.uber.org/multierr v1.6.0/go.mod h1:cdWPpRnG4AhwMwsgIHip0KRBQjJy5kYEpYjJxpXp9i go.uber.org/multierr v1.8.0 h1:dg6GjLku4EH+249NNmoIciG9N/jURbDG+pFlTkhzIC8= go.uber.org/multierr v1.8.0/go.mod h1:7EAYxJLBy9rStEaz58O2t4Uvip6FSURkq8/ppBp95ak= go.uber.org/zap v1.17.0/go.mod h1:MXVU+bhUf/A7Xi2HNOnopQOrmycQ5Ih87HtOu4q5SSo= -go.uber.org/zap v1.23.0 h1:OjGQ5KQDEUawVHxNwQgPpiypGHOxo2mNZsOqTak4fFY= -go.uber.org/zap v1.23.0/go.mod h1:D+nX8jyLsMHMYrln8A0rJjFt/T/9/bGgIhAqxv5URuY= +go.uber.org/zap v1.24.0 h1:FiJd5l1UOLj0wCgbSE0rwwXHzEdAZS6hiiSnxJN/D60= +go.uber.org/zap v1.24.0/go.mod h1:2kMP+WWQ8aoFoedH3T2sq6iJ2yDWpHbP0f6MQbS9Gkg= golang.org/x/crypto v0.0.0-20180904163835-0709b304e793/go.mod h1:6SG95UA2DQfeDnfUPMdvaQW0Q7yPrPDi9nlGo2tz2b4= golang.org/x/crypto v0.0.0-20190308221718-c2843e01d9a2/go.mod h1:djNgcEr1/C05ACkg1iLfiJU5Ep61QUkGW8qpdssI0+w= golang.org/x/crypto v0.0.0-20190923035154-9ee001bba392/go.mod h1:/lpIB1dKB+9EgE3H3cr1v9wB50oz8l4C4h62xy7jSTY= diff --git a/internal/aws/ecsutil/go.mod b/internal/aws/ecsutil/go.mod index 6cc753f186ed..7334cb1bbcbf 100644 --- a/internal/aws/ecsutil/go.mod +++ b/internal/aws/ecsutil/go.mod @@ -5,9 +5,9 @@ go 1.18 require ( github.com/open-telemetry/opentelemetry-collector-contrib/internal/common v0.66.0 github.com/stretchr/testify v1.8.1 - go.opentelemetry.io/collector v0.66.1-0.20221128222955-4ff1ff379b90 - go.opentelemetry.io/collector/component v0.66.1-0.20221128222955-4ff1ff379b90 - go.uber.org/zap v1.23.0 + go.opentelemetry.io/collector v0.66.1-0.20221202005155-1c54042beb70 + go.opentelemetry.io/collector/component v0.66.1-0.20221202005155-1c54042beb70 + go.uber.org/zap v1.24.0 ) require ( @@ -32,9 +32,10 @@ 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/consumer v0.66.1-0.20221128222955-4ff1ff379b90 // indirect - go.opentelemetry.io/collector/featuregate v0.66.1-0.20221128222955-4ff1ff379b90 // indirect - go.opentelemetry.io/collector/pdata v0.66.1-0.20221128222955-4ff1ff379b90 // indirect + go.opentelemetry.io/collector/confmap v0.0.0-20221201172708-2bdff61fa52a // indirect + go.opentelemetry.io/collector/consumer v0.66.1-0.20221202005155-1c54042beb70 // indirect + go.opentelemetry.io/collector/featuregate v0.66.1-0.20221202005155-1c54042beb70 // indirect + go.opentelemetry.io/collector/pdata v0.66.1-0.20221202005155-1c54042beb70 // 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 055dd6856c09..040323515c59 100644 --- a/internal/aws/ecsutil/go.sum +++ b/internal/aws/ecsutil/go.sum @@ -279,16 +279,18 @@ github.com/yuin/goldmark v1.3.5/go.mod h1:mwnBkeHKe2W/ZEtQ+71ViKU8L12m81fl3OWwC1 go.etcd.io/etcd/api/v3 v3.5.4/go.mod h1:5GB2vv4A4AOn3yk7MftYGHkUfGtDHnEraIjym4dYz5A= go.etcd.io/etcd/client/pkg/v3 v3.5.4/go.mod h1:IJHfcCEKxYu1Os13ZdwCwIUTUVGYTSAM3YSwc9/Ac1g= go.etcd.io/etcd/client/v3 v3.5.4/go.mod h1:ZaRkVgBZC+L+dLCjTcF1hRXpgZXQPOvnA/Ak/gq3kiY= -go.opentelemetry.io/collector v0.66.1-0.20221128222955-4ff1ff379b90 h1:yRe05/jMdzH4TFHfndZ5h2o2hKBK/79W72j8w51qNsI= -go.opentelemetry.io/collector v0.66.1-0.20221128222955-4ff1ff379b90/go.mod h1:hE6jCs+0rfiufCrVPucKZTMwfHit1okfDPnwPT2eW1I= -go.opentelemetry.io/collector/component v0.66.1-0.20221128222955-4ff1ff379b90 h1:AYSNTXbezhNg43EuYdVVcgxE/2gBVrm00FDx4DOmQVg= -go.opentelemetry.io/collector/component v0.66.1-0.20221128222955-4ff1ff379b90/go.mod h1:0c84EqXUhvYe6KW7hJfh76tiI/5yjWCH2amwyQ06XLM= -go.opentelemetry.io/collector/consumer v0.66.1-0.20221128222955-4ff1ff379b90 h1:nzNXVfC1FzXBXCLMzbMv+qK3E4EGiNsnMhfVsBd2yzc= -go.opentelemetry.io/collector/consumer v0.66.1-0.20221128222955-4ff1ff379b90/go.mod h1:WtoRZa5SnxQO1ZEQdVxYpFcXCmq62rakv0oUSlPO0NQ= -go.opentelemetry.io/collector/featuregate v0.66.1-0.20221128222955-4ff1ff379b90 h1:UuJSFWbi9XxyNZsJKZuvpWg35BgRbcCGFH+38V2MAdw= -go.opentelemetry.io/collector/featuregate v0.66.1-0.20221128222955-4ff1ff379b90/go.mod h1:tewuFKJYalWBU0bmNKg++MC1ipINXUr6szYzOw2p1GI= -go.opentelemetry.io/collector/pdata v0.66.1-0.20221128222955-4ff1ff379b90 h1:Vu4S4jSNcd0VFPzxQNO4+UqGwnes1xJDoFLPRiWHm8I= -go.opentelemetry.io/collector/pdata v0.66.1-0.20221128222955-4ff1ff379b90/go.mod h1:pqyaznLzk21m+1KL6fwOsRryRELL+zNM0qiVSn0MbVc= +go.opentelemetry.io/collector v0.66.1-0.20221202005155-1c54042beb70 h1:INB2CsOtqqrija2KvMuIpbBQ3qX1BECEeR+d0NJX+oM= +go.opentelemetry.io/collector v0.66.1-0.20221202005155-1c54042beb70/go.mod h1:d0NHkHyANJy3HDTvYE/PoylMShUmFIbiir89ieI0X0c= +go.opentelemetry.io/collector/component v0.66.1-0.20221202005155-1c54042beb70 h1:dEoJhzCmRShgmVro/kXm6pouGElgxkH2DsvanzCeZtU= +go.opentelemetry.io/collector/component v0.66.1-0.20221202005155-1c54042beb70/go.mod h1:OsVnvFFe38QSpcuZlQ8cvarDzcloCexgQ1/B2m80F6U= +go.opentelemetry.io/collector/confmap v0.0.0-20221201172708-2bdff61fa52a h1:2TscCXAQASO2kU9xHcMIUM/FP29fiQIRTilZmliq/7I= +go.opentelemetry.io/collector/confmap v0.0.0-20221201172708-2bdff61fa52a/go.mod h1:qJ3e8bA8h4wz/jYlbeEUafVHdrU7DkpStnmIUAz6VTQ= +go.opentelemetry.io/collector/consumer v0.66.1-0.20221202005155-1c54042beb70 h1:XwpVjI1KeKGPXOZBLefGILMziPYuNf6IzbmiIEsIyI0= +go.opentelemetry.io/collector/consumer v0.66.1-0.20221202005155-1c54042beb70/go.mod h1:EWVBcSGcIcmeDGTnIboc/aqa3agsBeH8/q7yFWG7xVc= +go.opentelemetry.io/collector/featuregate v0.66.1-0.20221202005155-1c54042beb70 h1:V0tf4ebciqIs07jFATfLGdUpLRaEsi+AiWuA/in0G8Y= +go.opentelemetry.io/collector/featuregate v0.66.1-0.20221202005155-1c54042beb70/go.mod h1:tewuFKJYalWBU0bmNKg++MC1ipINXUr6szYzOw2p1GI= +go.opentelemetry.io/collector/pdata v0.66.1-0.20221202005155-1c54042beb70 h1:TPOrxkEMvZzfBSwF3ct+kUUgKA5g8unkZZbKQvJweeA= +go.opentelemetry.io/collector/pdata v0.66.1-0.20221202005155-1c54042beb70/go.mod h1:pqyaznLzk21m+1KL6fwOsRryRELL+zNM0qiVSn0MbVc= 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= @@ -306,8 +308,8 @@ go.uber.org/multierr v1.6.0/go.mod h1:cdWPpRnG4AhwMwsgIHip0KRBQjJy5kYEpYjJxpXp9i go.uber.org/multierr v1.8.0 h1:dg6GjLku4EH+249NNmoIciG9N/jURbDG+pFlTkhzIC8= go.uber.org/multierr v1.8.0/go.mod h1:7EAYxJLBy9rStEaz58O2t4Uvip6FSURkq8/ppBp95ak= go.uber.org/zap v1.17.0/go.mod h1:MXVU+bhUf/A7Xi2HNOnopQOrmycQ5Ih87HtOu4q5SSo= -go.uber.org/zap v1.23.0 h1:OjGQ5KQDEUawVHxNwQgPpiypGHOxo2mNZsOqTak4fFY= -go.uber.org/zap v1.23.0/go.mod h1:D+nX8jyLsMHMYrln8A0rJjFt/T/9/bGgIhAqxv5URuY= +go.uber.org/zap v1.24.0 h1:FiJd5l1UOLj0wCgbSE0rwwXHzEdAZS6hiiSnxJN/D60= +go.uber.org/zap v1.24.0/go.mod h1:2kMP+WWQ8aoFoedH3T2sq6iJ2yDWpHbP0f6MQbS9Gkg= golang.org/x/crypto v0.0.0-20180904163835-0709b304e793/go.mod h1:6SG95UA2DQfeDnfUPMdvaQW0Q7yPrPDi9nlGo2tz2b4= golang.org/x/crypto v0.0.0-20190308221718-c2843e01d9a2/go.mod h1:djNgcEr1/C05ACkg1iLfiJU5Ep61QUkGW8qpdssI0+w= golang.org/x/crypto v0.0.0-20190923035154-9ee001bba392/go.mod h1:/lpIB1dKB+9EgE3H3cr1v9wB50oz8l4C4h62xy7jSTY= diff --git a/internal/aws/proxy/go.mod b/internal/aws/proxy/go.mod index a3c03fc78d63..8a683e249d7a 100644 --- a/internal/aws/proxy/go.mod +++ b/internal/aws/proxy/go.mod @@ -6,8 +6,8 @@ require ( github.com/aws/aws-sdk-go v1.44.145 github.com/open-telemetry/opentelemetry-collector-contrib/internal/common v0.66.0 github.com/stretchr/testify v1.8.1 - go.opentelemetry.io/collector v0.66.1-0.20221128222955-4ff1ff379b90 - go.uber.org/zap v1.23.0 + go.opentelemetry.io/collector v0.66.1-0.20221202005155-1c54042beb70 + go.uber.org/zap v1.24.0 ) require ( @@ -15,7 +15,7 @@ require ( github.com/jmespath/go-jmespath v0.4.0 // indirect github.com/kr/pretty v0.3.0 // indirect github.com/pmezard/go-difflib v1.0.0 // indirect - go.opentelemetry.io/collector/featuregate v0.66.1-0.20221128222955-4ff1ff379b90 // indirect + go.opentelemetry.io/collector/featuregate v0.66.1-0.20221202005155-1c54042beb70 // indirect go.uber.org/atomic v1.10.0 // indirect go.uber.org/multierr v1.8.0 // indirect gopkg.in/yaml.v3 v3.0.1 // indirect diff --git a/internal/aws/proxy/go.sum b/internal/aws/proxy/go.sum index c1855eb40dcf..514794cc0aad 100644 --- a/internal/aws/proxy/go.sum +++ b/internal/aws/proxy/go.sum @@ -32,18 +32,18 @@ github.com/stretchr/testify v1.8.0/go.mod h1:yNjHg4UonilssWZ8iaSj1OCr/vHnekPRkoO github.com/stretchr/testify v1.8.1 h1:w7B6lhMri9wdJUVmEZPGGhZzrYTPvgJArz7wNPgYKsk= github.com/stretchr/testify v1.8.1/go.mod h1:w2LPCIKwWwSfY2zedu0+kehJoqGctiVI29o6fzry7u4= github.com/yuin/goldmark v1.4.13/go.mod h1:6yULJ656Px+3vBD8DxQVa3kxgyrAnzto9xy5taEt/CY= -go.opentelemetry.io/collector v0.66.1-0.20221128222955-4ff1ff379b90 h1:yRe05/jMdzH4TFHfndZ5h2o2hKBK/79W72j8w51qNsI= -go.opentelemetry.io/collector v0.66.1-0.20221128222955-4ff1ff379b90/go.mod h1:hE6jCs+0rfiufCrVPucKZTMwfHit1okfDPnwPT2eW1I= -go.opentelemetry.io/collector/featuregate v0.66.1-0.20221128222955-4ff1ff379b90 h1:UuJSFWbi9XxyNZsJKZuvpWg35BgRbcCGFH+38V2MAdw= -go.opentelemetry.io/collector/featuregate v0.66.1-0.20221128222955-4ff1ff379b90/go.mod h1:tewuFKJYalWBU0bmNKg++MC1ipINXUr6szYzOw2p1GI= +go.opentelemetry.io/collector v0.66.1-0.20221202005155-1c54042beb70 h1:INB2CsOtqqrija2KvMuIpbBQ3qX1BECEeR+d0NJX+oM= +go.opentelemetry.io/collector v0.66.1-0.20221202005155-1c54042beb70/go.mod h1:d0NHkHyANJy3HDTvYE/PoylMShUmFIbiir89ieI0X0c= +go.opentelemetry.io/collector/featuregate v0.66.1-0.20221202005155-1c54042beb70 h1:V0tf4ebciqIs07jFATfLGdUpLRaEsi+AiWuA/in0G8Y= +go.opentelemetry.io/collector/featuregate v0.66.1-0.20221202005155-1c54042beb70/go.mod h1:tewuFKJYalWBU0bmNKg++MC1ipINXUr6szYzOw2p1GI= go.uber.org/atomic v1.7.0/go.mod h1:fEN4uk6kAWBTFdckzkM89CLk9XfWZrxpCo0nPH17wJc= go.uber.org/atomic v1.10.0 h1:9qC72Qh0+3MqyJbAn8YU5xVq1frD8bn3JtD2oXtafVQ= go.uber.org/atomic v1.10.0/go.mod h1:LUxbIzbOniOlMKjJjyPfpl4v+PKK2cNJn91OQbhoJI0= go.uber.org/goleak v1.1.11 h1:wy28qYRKZgnJTxGxvye5/wgWr1EKjmUDGYox5mGlRlI= go.uber.org/multierr v1.8.0 h1:dg6GjLku4EH+249NNmoIciG9N/jURbDG+pFlTkhzIC8= go.uber.org/multierr v1.8.0/go.mod h1:7EAYxJLBy9rStEaz58O2t4Uvip6FSURkq8/ppBp95ak= -go.uber.org/zap v1.23.0 h1:OjGQ5KQDEUawVHxNwQgPpiypGHOxo2mNZsOqTak4fFY= -go.uber.org/zap v1.23.0/go.mod h1:D+nX8jyLsMHMYrln8A0rJjFt/T/9/bGgIhAqxv5URuY= +go.uber.org/zap v1.24.0 h1:FiJd5l1UOLj0wCgbSE0rwwXHzEdAZS6hiiSnxJN/D60= +go.uber.org/zap v1.24.0/go.mod h1:2kMP+WWQ8aoFoedH3T2sq6iJ2yDWpHbP0f6MQbS9Gkg= golang.org/x/crypto v0.0.0-20190308221718-c2843e01d9a2/go.mod h1:djNgcEr1/C05ACkg1iLfiJU5Ep61QUkGW8qpdssI0+w= golang.org/x/crypto v0.0.0-20210921155107-089bfa567519/go.mod h1:GvvjBRRGRdwPK5ydBHafDWAxML/pGHZbMvKqRZ5+Abc= golang.org/x/mod v0.6.0-dev.0.20220419223038-86c51ed26bb4/go.mod h1:jJ57K6gSWd91VN4djpZkiMVwK6gcyfeH4XE8wZrZaV4= diff --git a/internal/common/go.mod b/internal/common/go.mod index 7bc5f60e6c9b..97e601351958 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/featuregate v0.66.1-0.20221128222955-4ff1ff379b90 + go.opentelemetry.io/collector/featuregate v0.66.1-0.20221202005155-1c54042beb70 go.uber.org/zap v1.23.0 ) diff --git a/internal/common/go.sum b/internal/common/go.sum index 01530a35a558..a0aba8b2275d 100644 --- a/internal/common/go.sum +++ b/internal/common/go.sum @@ -23,8 +23,8 @@ github.com/stretchr/testify v1.7.1/go.mod h1:6Fq8oRcR53rry900zMqJjRRixrwX3KX962/ github.com/stretchr/testify v1.8.0/go.mod h1:yNjHg4UonilssWZ8iaSj1OCr/vHnekPRkoO+kdMU+MU= github.com/stretchr/testify v1.8.1 h1:w7B6lhMri9wdJUVmEZPGGhZzrYTPvgJArz7wNPgYKsk= github.com/stretchr/testify v1.8.1/go.mod h1:w2LPCIKwWwSfY2zedu0+kehJoqGctiVI29o6fzry7u4= -go.opentelemetry.io/collector/featuregate v0.66.1-0.20221128222955-4ff1ff379b90 h1:UuJSFWbi9XxyNZsJKZuvpWg35BgRbcCGFH+38V2MAdw= -go.opentelemetry.io/collector/featuregate v0.66.1-0.20221128222955-4ff1ff379b90/go.mod h1:tewuFKJYalWBU0bmNKg++MC1ipINXUr6szYzOw2p1GI= +go.opentelemetry.io/collector/featuregate v0.66.1-0.20221202005155-1c54042beb70 h1:V0tf4ebciqIs07jFATfLGdUpLRaEsi+AiWuA/in0G8Y= +go.opentelemetry.io/collector/featuregate v0.66.1-0.20221202005155-1c54042beb70/go.mod h1:tewuFKJYalWBU0bmNKg++MC1ipINXUr6szYzOw2p1GI= go.uber.org/atomic v1.7.0/go.mod h1:fEN4uk6kAWBTFdckzkM89CLk9XfWZrxpCo0nPH17wJc= go.uber.org/atomic v1.10.0 h1:9qC72Qh0+3MqyJbAn8YU5xVq1frD8bn3JtD2oXtafVQ= go.uber.org/atomic v1.10.0/go.mod h1:LUxbIzbOniOlMKjJjyPfpl4v+PKK2cNJn91OQbhoJI0= diff --git a/internal/components/components.go b/internal/components/components.go index 449090325e00..fe409a8365e3 100644 --- a/internal/components/components.go +++ b/internal/components/components.go @@ -19,6 +19,7 @@ import ( "go.opentelemetry.io/collector/exporter/loggingexporter" "go.opentelemetry.io/collector/exporter/otlpexporter" "go.opentelemetry.io/collector/exporter/otlphttpexporter" + "go.opentelemetry.io/collector/extension" "go.opentelemetry.io/collector/extension/ballastextension" "go.opentelemetry.io/collector/extension/zpagesextension" "go.opentelemetry.io/collector/processor/batchprocessor" @@ -184,7 +185,7 @@ import ( func Components() (component.Factories, error) { var err error factories := component.Factories{} - extensions := []component.ExtensionFactory{ + extensions := []extension.Factory{ asapauthextension.NewFactory(), awsproxy.NewFactory(), ballastextension.NewFactory(), @@ -205,7 +206,7 @@ func Components() (component.Factories, error) { sigv4authextension.NewFactory(), zpagesextension.NewFactory(), } - factories.Extensions, err = component.MakeExtensionFactoryMap(extensions...) + factories.Extensions, err = extension.MakeFactoryMap(extensions...) if err != nil { return component.Factories{}, err } diff --git a/internal/components/components_test.go b/internal/components/components_test.go index 4b0b892827b3..41cf445e890d 100644 --- a/internal/components/components_test.go +++ b/internal/components/components_test.go @@ -22,7 +22,6 @@ import ( "testing" "github.com/stretchr/testify/assert" - "go.opentelemetry.io/collector/component" ) func TestDefaultComponents(t *testing.T) { @@ -32,24 +31,20 @@ func TestDefaultComponents(t *testing.T) { exts := factories.Extensions for k, v := range exts { assert.Equal(t, k, v.Type()) - 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, component.NewID(k), v.CreateDefaultConfig().ID()) } procs := factories.Processors for k, v := range procs { assert.Equal(t, k, v.Type()) - 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, component.NewID(k), v.CreateDefaultConfig().ID()) } } diff --git a/internal/components/exporters_test.go b/internal/components/exporters_test.go index 098238b6a398..42c3308786d4 100644 --- a/internal/components/exporters_test.go +++ b/internal/components/exporters_test.go @@ -455,7 +455,6 @@ func TestDefaultExporters(t *testing.T) { factory, ok := expFactories[tt.exporter] require.True(t, ok) assert.Equal(t, tt.exporter, factory.Type()) - assert.Equal(t, component.NewID(tt.exporter), factory.CreateDefaultConfig().ID()) if tt.skipLifecycle { t.Skip("Skipping lifecycle test", tt.exporter) diff --git a/internal/components/extensions_test.go b/internal/components/extensions_test.go index 204ec6627b44..a655a2270050 100644 --- a/internal/components/extensions_test.go +++ b/internal/components/extensions_test.go @@ -29,7 +29,9 @@ import ( "github.com/stretchr/testify/require" "go.opentelemetry.io/collector/component" "go.opentelemetry.io/collector/component/componenttest" + "go.opentelemetry.io/collector/extension" "go.opentelemetry.io/collector/extension/ballastextension" + "go.opentelemetry.io/collector/extension/extensiontest" "go.opentelemetry.io/collector/extension/zpagesextension" "github.com/open-telemetry/opentelemetry-collector-contrib/extension/asapauthextension" @@ -226,7 +228,6 @@ func TestDefaultExtensions(t *testing.T) { factory, ok := extFactories[tt.extension] require.True(t, ok) assert.Equal(t, tt.extension, factory.Type()) - assert.Equal(t, component.NewID(tt.extension), factory.CreateDefaultConfig().ID()) if tt.skipLifecycle { t.Skip("Skipping lifecycle test for ", tt.extension) @@ -246,10 +247,10 @@ type getExtensionConfigFn func() component.Config // 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 // the test can't be done with the default configuration for the component. -func verifyExtensionLifecycle(t *testing.T, factory component.ExtensionFactory, getConfigFn getExtensionConfigFn) { +func verifyExtensionLifecycle(t *testing.T, factory extension.Factory, getConfigFn getExtensionConfigFn) { ctx := context.Background() host := newAssertNoErrorHost(t) - extCreateSet := componenttest.NewNopExtensionCreateSettings() + extCreateSet := extensiontest.NewNopCreateSettings() if getConfigFn == nil { getConfigFn = factory.CreateDefaultConfig diff --git a/internal/components/processors_test.go b/internal/components/processors_test.go index 937e3885e019..2bfecaad8ca6 100644 --- a/internal/components/processors_test.go +++ b/internal/components/processors_test.go @@ -145,7 +145,6 @@ func TestDefaultProcessors(t *testing.T) { factory, ok := procFactories[tt.processor] require.True(t, ok) assert.Equal(t, tt.processor, factory.Type()) - assert.EqualValues(t, component.NewID(tt.processor), factory.CreateDefaultConfig().ID()) if tt.skipLifecycle { t.Skip("Skipping lifecycle processor check for:", tt.processor) diff --git a/internal/components/receivers_test.go b/internal/components/receivers_test.go index 21af236919a9..2bc447b12000 100644 --- a/internal/components/receivers_test.go +++ b/internal/components/receivers_test.go @@ -23,7 +23,6 @@ import ( "errors" "path/filepath" "runtime" - "strconv" "testing" "time" @@ -229,10 +228,8 @@ func TestDefaultReceivers(t *testing.T) { }, { receiver: "mongodbatlas", - // MongoDB Atlas needs unique config IDs getConfigFn: func() component.Config { cfg := rcvrFactories["mongodbatlas"].CreateDefaultConfig().(*mongodbatlasreceiver.Config) - cfg.SetIDName(strconv.Itoa(int(time.Now().UnixNano()))) cfg.Logs.Enabled = true return cfg }, @@ -438,7 +435,6 @@ func TestDefaultReceivers(t *testing.T) { factory, ok := rcvrFactories[tt.receiver] require.True(t, ok) assert.Equal(t, tt.receiver, factory.Type()) - assert.Equal(t, component.NewID(tt.receiver), factory.CreateDefaultConfig().ID()) if tt.skipLifecyle { t.Skip("Skipping lifecycle test", tt.receiver) diff --git a/internal/coreinternal/go.mod b/internal/coreinternal/go.mod index fba09763ae87..9cf0647c8b3c 100644 --- a/internal/coreinternal/go.mod +++ b/internal/coreinternal/go.mod @@ -4,10 +4,10 @@ go 1.18 require ( github.com/stretchr/testify v1.8.1 - go.opentelemetry.io/collector v0.66.1-0.20221128222955-4ff1ff379b90 - go.opentelemetry.io/collector/pdata v0.66.1-0.20221128222955-4ff1ff379b90 - go.opentelemetry.io/collector/semconv v0.66.1-0.20221128222955-4ff1ff379b90 - go.uber.org/zap v1.23.0 + go.opentelemetry.io/collector v0.66.1-0.20221202005155-1c54042beb70 + go.opentelemetry.io/collector/pdata v0.66.1-0.20221202005155-1c54042beb70 + go.opentelemetry.io/collector/semconv v0.66.1-0.20221202005155-1c54042beb70 + go.uber.org/zap v1.24.0 ) require ( diff --git a/internal/coreinternal/go.sum b/internal/coreinternal/go.sum index 240e23eb3699..8e62af975eca 100644 --- a/internal/coreinternal/go.sum +++ b/internal/coreinternal/go.sum @@ -45,21 +45,21 @@ 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.66.1-0.20221128222955-4ff1ff379b90 h1:yRe05/jMdzH4TFHfndZ5h2o2hKBK/79W72j8w51qNsI= -go.opentelemetry.io/collector v0.66.1-0.20221128222955-4ff1ff379b90/go.mod h1:hE6jCs+0rfiufCrVPucKZTMwfHit1okfDPnwPT2eW1I= -go.opentelemetry.io/collector/consumer v0.65.0 h1:9pjl1zV8nQ2QtQLuCcu0X7i9k+qXlTsE3YS9IaIQqHY= -go.opentelemetry.io/collector/pdata v0.66.1-0.20221128222955-4ff1ff379b90 h1:Vu4S4jSNcd0VFPzxQNO4+UqGwnes1xJDoFLPRiWHm8I= -go.opentelemetry.io/collector/pdata v0.66.1-0.20221128222955-4ff1ff379b90/go.mod h1:pqyaznLzk21m+1KL6fwOsRryRELL+zNM0qiVSn0MbVc= -go.opentelemetry.io/collector/semconv v0.66.1-0.20221128222955-4ff1ff379b90 h1:hFaTA68cggZKWMv7wQ3bKP8KGTbowh/5AQZKCHzHTqM= -go.opentelemetry.io/collector/semconv v0.66.1-0.20221128222955-4ff1ff379b90/go.mod h1:5o9yhOa+ABt7g2E5JABDxGZ1PQPbtfxrKNbYn+LOTXU= +go.opentelemetry.io/collector v0.66.1-0.20221202005155-1c54042beb70 h1:INB2CsOtqqrija2KvMuIpbBQ3qX1BECEeR+d0NJX+oM= +go.opentelemetry.io/collector v0.66.1-0.20221202005155-1c54042beb70/go.mod h1:d0NHkHyANJy3HDTvYE/PoylMShUmFIbiir89ieI0X0c= +go.opentelemetry.io/collector/consumer v0.66.0 h1:wDx0MmqqsHGBcEa24HS0MlvDbLR0jT/936CSZ7vvP4M= +go.opentelemetry.io/collector/pdata v0.66.1-0.20221202005155-1c54042beb70 h1:TPOrxkEMvZzfBSwF3ct+kUUgKA5g8unkZZbKQvJweeA= +go.opentelemetry.io/collector/pdata v0.66.1-0.20221202005155-1c54042beb70/go.mod h1:pqyaznLzk21m+1KL6fwOsRryRELL+zNM0qiVSn0MbVc= +go.opentelemetry.io/collector/semconv v0.66.1-0.20221202005155-1c54042beb70 h1:Q5L9Urod3c8as6ZYaoaqBjarx/HXxsxy34DFZIU2fO4= +go.opentelemetry.io/collector/semconv v0.66.1-0.20221202005155-1c54042beb70/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= go.uber.org/goleak v1.1.11 h1:wy28qYRKZgnJTxGxvye5/wgWr1EKjmUDGYox5mGlRlI= go.uber.org/multierr v1.8.0 h1:dg6GjLku4EH+249NNmoIciG9N/jURbDG+pFlTkhzIC8= go.uber.org/multierr v1.8.0/go.mod h1:7EAYxJLBy9rStEaz58O2t4Uvip6FSURkq8/ppBp95ak= -go.uber.org/zap v1.23.0 h1:OjGQ5KQDEUawVHxNwQgPpiypGHOxo2mNZsOqTak4fFY= -go.uber.org/zap v1.23.0/go.mod h1:D+nX8jyLsMHMYrln8A0rJjFt/T/9/bGgIhAqxv5URuY= +go.uber.org/zap v1.24.0 h1:FiJd5l1UOLj0wCgbSE0rwwXHzEdAZS6hiiSnxJN/D60= +go.uber.org/zap v1.24.0/go.mod h1:2kMP+WWQ8aoFoedH3T2sq6iJ2yDWpHbP0f6MQbS9Gkg= 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/internal/filter/go.mod b/internal/filter/go.mod index 81406dfc9de2..3fa7a3d840bc 100644 --- a/internal/filter/go.mod +++ b/internal/filter/go.mod @@ -8,9 +8,9 @@ require ( github.com/open-telemetry/opentelemetry-collector-contrib/internal/coreinternal v0.66.0 github.com/open-telemetry/opentelemetry-collector-contrib/pkg/ottl v0.66.0 github.com/stretchr/testify v1.8.1 - go.opentelemetry.io/collector v0.66.1-0.20221128222955-4ff1ff379b90 - go.opentelemetry.io/collector/pdata v0.66.1-0.20221128222955-4ff1ff379b90 - go.opentelemetry.io/collector/semconv v0.66.1-0.20221128222955-4ff1ff379b90 + go.opentelemetry.io/collector/confmap v0.0.0-20221201172708-2bdff61fa52a + go.opentelemetry.io/collector/pdata v0.66.1-0.20221202005155-1c54042beb70 + go.opentelemetry.io/collector/semconv v0.66.1-0.20221202005155-1c54042beb70 ) require ( @@ -28,15 +28,16 @@ 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.6.1 // indirect - go.opentelemetry.io/collector/component v0.66.1-0.20221128222955-4ff1ff379b90 // indirect - go.opentelemetry.io/collector/consumer v0.66.1-0.20221128222955-4ff1ff379b90 // indirect - go.opentelemetry.io/collector/featuregate v0.66.1-0.20221128222955-4ff1ff379b90 // indirect + go.opentelemetry.io/collector v0.66.1-0.20221202005155-1c54042beb70 // indirect + go.opentelemetry.io/collector/component v0.66.1-0.20221202005155-1c54042beb70 // indirect + go.opentelemetry.io/collector/consumer v0.66.1-0.20221202005155-1c54042beb70 // indirect + go.opentelemetry.io/collector/featuregate v0.66.1-0.20221202005155-1c54042beb70 // 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 go.uber.org/atomic v1.10.0 // indirect go.uber.org/multierr v1.8.0 // indirect - go.uber.org/zap v1.23.0 // indirect + go.uber.org/zap v1.24.0 // indirect golang.org/x/exp v0.0.0-20220722155223-a9213eeb770e // indirect golang.org/x/net v0.0.0-20220722155237-a158d28d115b // indirect golang.org/x/sys v0.2.0 // indirect diff --git a/internal/filter/go.sum b/internal/filter/go.sum index ce0a9db17d30..348f036caa50 100644 --- a/internal/filter/go.sum +++ b/internal/filter/go.sum @@ -277,18 +277,20 @@ 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.66.1-0.20221128222955-4ff1ff379b90 h1:yRe05/jMdzH4TFHfndZ5h2o2hKBK/79W72j8w51qNsI= -go.opentelemetry.io/collector v0.66.1-0.20221128222955-4ff1ff379b90/go.mod h1:hE6jCs+0rfiufCrVPucKZTMwfHit1okfDPnwPT2eW1I= -go.opentelemetry.io/collector/component v0.66.1-0.20221128222955-4ff1ff379b90 h1:AYSNTXbezhNg43EuYdVVcgxE/2gBVrm00FDx4DOmQVg= -go.opentelemetry.io/collector/component v0.66.1-0.20221128222955-4ff1ff379b90/go.mod h1:0c84EqXUhvYe6KW7hJfh76tiI/5yjWCH2amwyQ06XLM= -go.opentelemetry.io/collector/consumer v0.66.1-0.20221128222955-4ff1ff379b90 h1:nzNXVfC1FzXBXCLMzbMv+qK3E4EGiNsnMhfVsBd2yzc= -go.opentelemetry.io/collector/consumer v0.66.1-0.20221128222955-4ff1ff379b90/go.mod h1:WtoRZa5SnxQO1ZEQdVxYpFcXCmq62rakv0oUSlPO0NQ= -go.opentelemetry.io/collector/featuregate v0.66.1-0.20221128222955-4ff1ff379b90 h1:UuJSFWbi9XxyNZsJKZuvpWg35BgRbcCGFH+38V2MAdw= -go.opentelemetry.io/collector/featuregate v0.66.1-0.20221128222955-4ff1ff379b90/go.mod h1:tewuFKJYalWBU0bmNKg++MC1ipINXUr6szYzOw2p1GI= -go.opentelemetry.io/collector/pdata v0.66.1-0.20221128222955-4ff1ff379b90 h1:Vu4S4jSNcd0VFPzxQNO4+UqGwnes1xJDoFLPRiWHm8I= -go.opentelemetry.io/collector/pdata v0.66.1-0.20221128222955-4ff1ff379b90/go.mod h1:pqyaznLzk21m+1KL6fwOsRryRELL+zNM0qiVSn0MbVc= -go.opentelemetry.io/collector/semconv v0.66.1-0.20221128222955-4ff1ff379b90 h1:hFaTA68cggZKWMv7wQ3bKP8KGTbowh/5AQZKCHzHTqM= -go.opentelemetry.io/collector/semconv v0.66.1-0.20221128222955-4ff1ff379b90/go.mod h1:5o9yhOa+ABt7g2E5JABDxGZ1PQPbtfxrKNbYn+LOTXU= +go.opentelemetry.io/collector v0.66.1-0.20221202005155-1c54042beb70 h1:INB2CsOtqqrija2KvMuIpbBQ3qX1BECEeR+d0NJX+oM= +go.opentelemetry.io/collector v0.66.1-0.20221202005155-1c54042beb70/go.mod h1:d0NHkHyANJy3HDTvYE/PoylMShUmFIbiir89ieI0X0c= +go.opentelemetry.io/collector/component v0.66.1-0.20221202005155-1c54042beb70 h1:dEoJhzCmRShgmVro/kXm6pouGElgxkH2DsvanzCeZtU= +go.opentelemetry.io/collector/component v0.66.1-0.20221202005155-1c54042beb70/go.mod h1:OsVnvFFe38QSpcuZlQ8cvarDzcloCexgQ1/B2m80F6U= +go.opentelemetry.io/collector/confmap v0.0.0-20221201172708-2bdff61fa52a h1:2TscCXAQASO2kU9xHcMIUM/FP29fiQIRTilZmliq/7I= +go.opentelemetry.io/collector/confmap v0.0.0-20221201172708-2bdff61fa52a/go.mod h1:qJ3e8bA8h4wz/jYlbeEUafVHdrU7DkpStnmIUAz6VTQ= +go.opentelemetry.io/collector/consumer v0.66.1-0.20221202005155-1c54042beb70 h1:XwpVjI1KeKGPXOZBLefGILMziPYuNf6IzbmiIEsIyI0= +go.opentelemetry.io/collector/consumer v0.66.1-0.20221202005155-1c54042beb70/go.mod h1:EWVBcSGcIcmeDGTnIboc/aqa3agsBeH8/q7yFWG7xVc= +go.opentelemetry.io/collector/featuregate v0.66.1-0.20221202005155-1c54042beb70 h1:V0tf4ebciqIs07jFATfLGdUpLRaEsi+AiWuA/in0G8Y= +go.opentelemetry.io/collector/featuregate v0.66.1-0.20221202005155-1c54042beb70/go.mod h1:tewuFKJYalWBU0bmNKg++MC1ipINXUr6szYzOw2p1GI= +go.opentelemetry.io/collector/pdata v0.66.1-0.20221202005155-1c54042beb70 h1:TPOrxkEMvZzfBSwF3ct+kUUgKA5g8unkZZbKQvJweeA= +go.opentelemetry.io/collector/pdata v0.66.1-0.20221202005155-1c54042beb70/go.mod h1:pqyaznLzk21m+1KL6fwOsRryRELL+zNM0qiVSn0MbVc= +go.opentelemetry.io/collector/semconv v0.66.1-0.20221202005155-1c54042beb70 h1:Q5L9Urod3c8as6ZYaoaqBjarx/HXxsxy34DFZIU2fO4= +go.opentelemetry.io/collector/semconv v0.66.1-0.20221202005155-1c54042beb70/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= @@ -303,8 +305,8 @@ go.uber.org/multierr v1.6.0/go.mod h1:cdWPpRnG4AhwMwsgIHip0KRBQjJy5kYEpYjJxpXp9i go.uber.org/multierr v1.8.0 h1:dg6GjLku4EH+249NNmoIciG9N/jURbDG+pFlTkhzIC8= go.uber.org/multierr v1.8.0/go.mod h1:7EAYxJLBy9rStEaz58O2t4Uvip6FSURkq8/ppBp95ak= go.uber.org/zap v1.17.0/go.mod h1:MXVU+bhUf/A7Xi2HNOnopQOrmycQ5Ih87HtOu4q5SSo= -go.uber.org/zap v1.23.0 h1:OjGQ5KQDEUawVHxNwQgPpiypGHOxo2mNZsOqTak4fFY= -go.uber.org/zap v1.23.0/go.mod h1:D+nX8jyLsMHMYrln8A0rJjFt/T/9/bGgIhAqxv5URuY= +go.uber.org/zap v1.24.0 h1:FiJd5l1UOLj0wCgbSE0rwwXHzEdAZS6hiiSnxJN/D60= +go.uber.org/zap v1.24.0/go.mod h1:2kMP+WWQ8aoFoedH3T2sq6iJ2yDWpHbP0f6MQbS9Gkg= golang.org/x/crypto v0.0.0-20180904163835-0709b304e793/go.mod h1:6SG95UA2DQfeDnfUPMdvaQW0Q7yPrPDi9nlGo2tz2b4= golang.org/x/crypto v0.0.0-20190308221718-c2843e01d9a2/go.mod h1:djNgcEr1/C05ACkg1iLfiJU5Ep61QUkGW8qpdssI0+w= golang.org/x/crypto v0.0.0-20190923035154-9ee001bba392/go.mod h1:/lpIB1dKB+9EgE3H3cr1v9wB50oz8l4C4h62xy7jSTY= diff --git a/internal/kubelet/go.mod b/internal/kubelet/go.mod index 4d3b2b93a134..9a94a24c44e4 100644 --- a/internal/kubelet/go.mod +++ b/internal/kubelet/go.mod @@ -6,8 +6,8 @@ require ( github.com/open-telemetry/opentelemetry-collector-contrib/internal/common v0.66.0 github.com/open-telemetry/opentelemetry-collector-contrib/internal/k8sconfig v0.66.0 github.com/stretchr/testify v1.8.1 - go.opentelemetry.io/collector v0.66.1-0.20221128222955-4ff1ff379b90 - go.uber.org/zap v1.23.0 + go.opentelemetry.io/collector v0.66.1-0.20221202005155-1c54042beb70 + go.uber.org/zap v1.24.0 ) require ( diff --git a/internal/kubelet/go.sum b/internal/kubelet/go.sum index 86caee8ce0d8..655319f5b2e4 100644 --- a/internal/kubelet/go.sum +++ b/internal/kubelet/go.sum @@ -252,16 +252,16 @@ go.opencensus.io v0.22.0/go.mod h1:+kGneAE2xo2IficOXnaByMWTGM9T73dGwxeWcUqIpI8= go.opencensus.io v0.22.2/go.mod h1:yxeiOL68Rb0Xd1ddK5vPZ/oVn4vY4Ynel7k9FzqtOIw= go.opencensus.io v0.22.3/go.mod h1:yxeiOL68Rb0Xd1ddK5vPZ/oVn4vY4Ynel7k9FzqtOIw= go.opencensus.io v0.22.4/go.mod h1:yxeiOL68Rb0Xd1ddK5vPZ/oVn4vY4Ynel7k9FzqtOIw= -go.opentelemetry.io/collector v0.66.1-0.20221128222955-4ff1ff379b90 h1:yRe05/jMdzH4TFHfndZ5h2o2hKBK/79W72j8w51qNsI= -go.opentelemetry.io/collector v0.66.1-0.20221128222955-4ff1ff379b90/go.mod h1:hE6jCs+0rfiufCrVPucKZTMwfHit1okfDPnwPT2eW1I= +go.opentelemetry.io/collector v0.66.1-0.20221202005155-1c54042beb70 h1:INB2CsOtqqrija2KvMuIpbBQ3qX1BECEeR+d0NJX+oM= +go.opentelemetry.io/collector v0.66.1-0.20221202005155-1c54042beb70/go.mod h1:d0NHkHyANJy3HDTvYE/PoylMShUmFIbiir89ieI0X0c= 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= go.uber.org/goleak v1.1.11 h1:wy28qYRKZgnJTxGxvye5/wgWr1EKjmUDGYox5mGlRlI= go.uber.org/multierr v1.8.0 h1:dg6GjLku4EH+249NNmoIciG9N/jURbDG+pFlTkhzIC8= go.uber.org/multierr v1.8.0/go.mod h1:7EAYxJLBy9rStEaz58O2t4Uvip6FSURkq8/ppBp95ak= -go.uber.org/zap v1.23.0 h1:OjGQ5KQDEUawVHxNwQgPpiypGHOxo2mNZsOqTak4fFY= -go.uber.org/zap v1.23.0/go.mod h1:D+nX8jyLsMHMYrln8A0rJjFt/T/9/bGgIhAqxv5URuY= +go.uber.org/zap v1.24.0 h1:FiJd5l1UOLj0wCgbSE0rwwXHzEdAZS6hiiSnxJN/D60= +go.uber.org/zap v1.24.0/go.mod h1:2kMP+WWQ8aoFoedH3T2sq6iJ2yDWpHbP0f6MQbS9Gkg= golang.org/x/crypto v0.0.0-20190308221718-c2843e01d9a2/go.mod h1:djNgcEr1/C05ACkg1iLfiJU5Ep61QUkGW8qpdssI0+w= golang.org/x/crypto v0.0.0-20190510104115-cbcb75029529/go.mod h1:yigFU9vqHzYiE8UmvKecakEJjdnWj3jj499lnFckfCI= golang.org/x/crypto v0.0.0-20190605123033-f99c8df09eb5/go.mod h1:yigFU9vqHzYiE8UmvKecakEJjdnWj3jj499lnFckfCI= diff --git a/internal/scrapertest/go.mod b/internal/scrapertest/go.mod index e60d54a13cb8..f0a667a67949 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.66.1-0.20221128222955-4ff1ff379b90 + go.opentelemetry.io/collector/pdata v0.66.1-0.20221202005155-1c54042beb70 go.uber.org/multierr v1.8.0 ) diff --git a/internal/scrapertest/go.sum b/internal/scrapertest/go.sum index 02f8a2c49068..ed9f6f6a55a9 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.66.1-0.20221128222955-4ff1ff379b90 h1:Vu4S4jSNcd0VFPzxQNO4+UqGwnes1xJDoFLPRiWHm8I= -go.opentelemetry.io/collector/pdata v0.66.1-0.20221128222955-4ff1ff379b90/go.mod h1:pqyaznLzk21m+1KL6fwOsRryRELL+zNM0qiVSn0MbVc= +go.opentelemetry.io/collector/pdata v0.66.1-0.20221202005155-1c54042beb70 h1:TPOrxkEMvZzfBSwF3ct+kUUgKA5g8unkZZbKQvJweeA= +go.opentelemetry.io/collector/pdata v0.66.1-0.20221202005155-1c54042beb70/go.mod h1:pqyaznLzk21m+1KL6fwOsRryRELL+zNM0qiVSn0MbVc= 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 50d80905aa27..5379d62e2338 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/component v0.66.1-0.20221128222955-4ff1ff379b90 + go.opentelemetry.io/collector/component v0.66.1-0.20221202005155-1c54042beb70 ) require ( @@ -22,16 +22,17 @@ 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 v0.66.1-0.20221128222955-4ff1ff379b90 // indirect - go.opentelemetry.io/collector/consumer v0.66.1-0.20221128222955-4ff1ff379b90 // indirect - go.opentelemetry.io/collector/featuregate v0.66.1-0.20221128222955-4ff1ff379b90 // indirect - go.opentelemetry.io/collector/pdata v0.66.1-0.20221128222955-4ff1ff379b90 // indirect + go.opentelemetry.io/collector v0.66.1-0.20221202005155-1c54042beb70 // indirect + go.opentelemetry.io/collector/confmap v0.0.0-20221201172708-2bdff61fa52a // indirect + go.opentelemetry.io/collector/consumer v0.66.1-0.20221202005155-1c54042beb70 // indirect + go.opentelemetry.io/collector/featuregate v0.66.1-0.20221202005155-1c54042beb70 // indirect + go.opentelemetry.io/collector/pdata v0.66.1-0.20221202005155-1c54042beb70 // 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 go.uber.org/atomic v1.10.0 // indirect go.uber.org/multierr v1.8.0 // indirect - go.uber.org/zap v1.23.0 // indirect + go.uber.org/zap v1.24.0 // indirect golang.org/x/net v0.0.0-20220722155237-a158d28d115b // indirect golang.org/x/sys v0.2.0 // indirect golang.org/x/text v0.4.0 // indirect diff --git a/internal/sharedcomponent/go.sum b/internal/sharedcomponent/go.sum index 10b29d8d14e7..945d38cf4922 100644 --- a/internal/sharedcomponent/go.sum +++ b/internal/sharedcomponent/go.sum @@ -265,16 +265,18 @@ github.com/yuin/goldmark v1.3.5/go.mod h1:mwnBkeHKe2W/ZEtQ+71ViKU8L12m81fl3OWwC1 go.etcd.io/etcd/api/v3 v3.5.4/go.mod h1:5GB2vv4A4AOn3yk7MftYGHkUfGtDHnEraIjym4dYz5A= go.etcd.io/etcd/client/pkg/v3 v3.5.4/go.mod h1:IJHfcCEKxYu1Os13ZdwCwIUTUVGYTSAM3YSwc9/Ac1g= go.etcd.io/etcd/client/v3 v3.5.4/go.mod h1:ZaRkVgBZC+L+dLCjTcF1hRXpgZXQPOvnA/Ak/gq3kiY= -go.opentelemetry.io/collector v0.66.1-0.20221128222955-4ff1ff379b90 h1:yRe05/jMdzH4TFHfndZ5h2o2hKBK/79W72j8w51qNsI= -go.opentelemetry.io/collector v0.66.1-0.20221128222955-4ff1ff379b90/go.mod h1:hE6jCs+0rfiufCrVPucKZTMwfHit1okfDPnwPT2eW1I= -go.opentelemetry.io/collector/component v0.66.1-0.20221128222955-4ff1ff379b90 h1:AYSNTXbezhNg43EuYdVVcgxE/2gBVrm00FDx4DOmQVg= -go.opentelemetry.io/collector/component v0.66.1-0.20221128222955-4ff1ff379b90/go.mod h1:0c84EqXUhvYe6KW7hJfh76tiI/5yjWCH2amwyQ06XLM= -go.opentelemetry.io/collector/consumer v0.66.1-0.20221128222955-4ff1ff379b90 h1:nzNXVfC1FzXBXCLMzbMv+qK3E4EGiNsnMhfVsBd2yzc= -go.opentelemetry.io/collector/consumer v0.66.1-0.20221128222955-4ff1ff379b90/go.mod h1:WtoRZa5SnxQO1ZEQdVxYpFcXCmq62rakv0oUSlPO0NQ= -go.opentelemetry.io/collector/featuregate v0.66.1-0.20221128222955-4ff1ff379b90 h1:UuJSFWbi9XxyNZsJKZuvpWg35BgRbcCGFH+38V2MAdw= -go.opentelemetry.io/collector/featuregate v0.66.1-0.20221128222955-4ff1ff379b90/go.mod h1:tewuFKJYalWBU0bmNKg++MC1ipINXUr6szYzOw2p1GI= -go.opentelemetry.io/collector/pdata v0.66.1-0.20221128222955-4ff1ff379b90 h1:Vu4S4jSNcd0VFPzxQNO4+UqGwnes1xJDoFLPRiWHm8I= -go.opentelemetry.io/collector/pdata v0.66.1-0.20221128222955-4ff1ff379b90/go.mod h1:pqyaznLzk21m+1KL6fwOsRryRELL+zNM0qiVSn0MbVc= +go.opentelemetry.io/collector v0.66.1-0.20221202005155-1c54042beb70 h1:INB2CsOtqqrija2KvMuIpbBQ3qX1BECEeR+d0NJX+oM= +go.opentelemetry.io/collector v0.66.1-0.20221202005155-1c54042beb70/go.mod h1:d0NHkHyANJy3HDTvYE/PoylMShUmFIbiir89ieI0X0c= +go.opentelemetry.io/collector/component v0.66.1-0.20221202005155-1c54042beb70 h1:dEoJhzCmRShgmVro/kXm6pouGElgxkH2DsvanzCeZtU= +go.opentelemetry.io/collector/component v0.66.1-0.20221202005155-1c54042beb70/go.mod h1:OsVnvFFe38QSpcuZlQ8cvarDzcloCexgQ1/B2m80F6U= +go.opentelemetry.io/collector/confmap v0.0.0-20221201172708-2bdff61fa52a h1:2TscCXAQASO2kU9xHcMIUM/FP29fiQIRTilZmliq/7I= +go.opentelemetry.io/collector/confmap v0.0.0-20221201172708-2bdff61fa52a/go.mod h1:qJ3e8bA8h4wz/jYlbeEUafVHdrU7DkpStnmIUAz6VTQ= +go.opentelemetry.io/collector/consumer v0.66.1-0.20221202005155-1c54042beb70 h1:XwpVjI1KeKGPXOZBLefGILMziPYuNf6IzbmiIEsIyI0= +go.opentelemetry.io/collector/consumer v0.66.1-0.20221202005155-1c54042beb70/go.mod h1:EWVBcSGcIcmeDGTnIboc/aqa3agsBeH8/q7yFWG7xVc= +go.opentelemetry.io/collector/featuregate v0.66.1-0.20221202005155-1c54042beb70 h1:V0tf4ebciqIs07jFATfLGdUpLRaEsi+AiWuA/in0G8Y= +go.opentelemetry.io/collector/featuregate v0.66.1-0.20221202005155-1c54042beb70/go.mod h1:tewuFKJYalWBU0bmNKg++MC1ipINXUr6szYzOw2p1GI= +go.opentelemetry.io/collector/pdata v0.66.1-0.20221202005155-1c54042beb70 h1:TPOrxkEMvZzfBSwF3ct+kUUgKA5g8unkZZbKQvJweeA= +go.opentelemetry.io/collector/pdata v0.66.1-0.20221202005155-1c54042beb70/go.mod h1:pqyaznLzk21m+1KL6fwOsRryRELL+zNM0qiVSn0MbVc= 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= @@ -290,8 +292,8 @@ go.uber.org/multierr v1.6.0/go.mod h1:cdWPpRnG4AhwMwsgIHip0KRBQjJy5kYEpYjJxpXp9i go.uber.org/multierr v1.8.0 h1:dg6GjLku4EH+249NNmoIciG9N/jURbDG+pFlTkhzIC8= go.uber.org/multierr v1.8.0/go.mod h1:7EAYxJLBy9rStEaz58O2t4Uvip6FSURkq8/ppBp95ak= go.uber.org/zap v1.17.0/go.mod h1:MXVU+bhUf/A7Xi2HNOnopQOrmycQ5Ih87HtOu4q5SSo= -go.uber.org/zap v1.23.0 h1:OjGQ5KQDEUawVHxNwQgPpiypGHOxo2mNZsOqTak4fFY= -go.uber.org/zap v1.23.0/go.mod h1:D+nX8jyLsMHMYrln8A0rJjFt/T/9/bGgIhAqxv5URuY= +go.uber.org/zap v1.24.0 h1:FiJd5l1UOLj0wCgbSE0rwwXHzEdAZS6hiiSnxJN/D60= +go.uber.org/zap v1.24.0/go.mod h1:2kMP+WWQ8aoFoedH3T2sq6iJ2yDWpHbP0f6MQbS9Gkg= golang.org/x/crypto v0.0.0-20180904163835-0709b304e793/go.mod h1:6SG95UA2DQfeDnfUPMdvaQW0Q7yPrPDi9nlGo2tz2b4= golang.org/x/crypto v0.0.0-20190308221718-c2843e01d9a2/go.mod h1:djNgcEr1/C05ACkg1iLfiJU5Ep61QUkGW8qpdssI0+w= golang.org/x/crypto v0.0.0-20190923035154-9ee001bba392/go.mod h1:/lpIB1dKB+9EgE3H3cr1v9wB50oz8l4C4h62xy7jSTY= diff --git a/internal/splunk/go.mod b/internal/splunk/go.mod index cd3382cd17bf..dce03c72c01b 100644 --- a/internal/splunk/go.mod +++ b/internal/splunk/go.mod @@ -4,10 +4,10 @@ go 1.18 require ( github.com/stretchr/testify v1.8.1 - go.opentelemetry.io/collector v0.66.1-0.20221128222955-4ff1ff379b90 - go.opentelemetry.io/collector/consumer v0.66.1-0.20221128222955-4ff1ff379b90 - go.opentelemetry.io/collector/pdata v0.66.1-0.20221128222955-4ff1ff379b90 - go.opentelemetry.io/collector/semconv v0.66.1-0.20221128222955-4ff1ff379b90 + go.opentelemetry.io/collector v0.66.1-0.20221202005155-1c54042beb70 + go.opentelemetry.io/collector/consumer v0.66.1-0.20221202005155-1c54042beb70 + go.opentelemetry.io/collector/pdata v0.66.1-0.20221202005155-1c54042beb70 + go.opentelemetry.io/collector/semconv v0.66.1-0.20221202005155-1c54042beb70 go.uber.org/multierr v1.8.0 ) @@ -28,13 +28,14 @@ require ( github.com/pelletier/go-toml v1.9.4 // indirect github.com/pmezard/go-difflib v1.0.0 // indirect go.opencensus.io v0.24.0 // indirect - go.opentelemetry.io/collector/component v0.66.1-0.20221128222955-4ff1ff379b90 // indirect - go.opentelemetry.io/collector/featuregate v0.66.1-0.20221128222955-4ff1ff379b90 // indirect + go.opentelemetry.io/collector/component v0.66.1-0.20221202005155-1c54042beb70 // indirect + go.opentelemetry.io/collector/confmap v0.0.0-20221201172708-2bdff61fa52a // indirect + go.opentelemetry.io/collector/featuregate v0.66.1-0.20221202005155-1c54042beb70 // 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 go.uber.org/atomic v1.10.0 // indirect - go.uber.org/zap v1.23.0 // indirect + go.uber.org/zap v1.24.0 // indirect golang.org/x/net v0.0.0-20220722155237-a158d28d115b // indirect golang.org/x/sys v0.2.0 // indirect golang.org/x/text v0.4.0 // indirect diff --git a/internal/splunk/go.sum b/internal/splunk/go.sum index 48a42a8e7500..687b6744a9d1 100644 --- a/internal/splunk/go.sum +++ b/internal/splunk/go.sum @@ -286,18 +286,20 @@ go.etcd.io/etcd/client/pkg/v3 v3.5.4/go.mod h1:IJHfcCEKxYu1Os13ZdwCwIUTUVGYTSAM3 go.etcd.io/etcd/client/v3 v3.5.4/go.mod h1:ZaRkVgBZC+L+dLCjTcF1hRXpgZXQPOvnA/Ak/gq3kiY= go.opencensus.io v0.24.0 h1:y73uSU6J157QMP2kn2r30vwW1A2W2WFwSCGnAVxeaD0= go.opencensus.io v0.24.0/go.mod h1:vNK8G9p7aAivkbmorf4v+7Hgx+Zs0yY+0fOtgBfjQKo= -go.opentelemetry.io/collector v0.66.1-0.20221128222955-4ff1ff379b90 h1:yRe05/jMdzH4TFHfndZ5h2o2hKBK/79W72j8w51qNsI= -go.opentelemetry.io/collector v0.66.1-0.20221128222955-4ff1ff379b90/go.mod h1:hE6jCs+0rfiufCrVPucKZTMwfHit1okfDPnwPT2eW1I= -go.opentelemetry.io/collector/component v0.66.1-0.20221128222955-4ff1ff379b90 h1:AYSNTXbezhNg43EuYdVVcgxE/2gBVrm00FDx4DOmQVg= -go.opentelemetry.io/collector/component v0.66.1-0.20221128222955-4ff1ff379b90/go.mod h1:0c84EqXUhvYe6KW7hJfh76tiI/5yjWCH2amwyQ06XLM= -go.opentelemetry.io/collector/consumer v0.66.1-0.20221128222955-4ff1ff379b90 h1:nzNXVfC1FzXBXCLMzbMv+qK3E4EGiNsnMhfVsBd2yzc= -go.opentelemetry.io/collector/consumer v0.66.1-0.20221128222955-4ff1ff379b90/go.mod h1:WtoRZa5SnxQO1ZEQdVxYpFcXCmq62rakv0oUSlPO0NQ= -go.opentelemetry.io/collector/featuregate v0.66.1-0.20221128222955-4ff1ff379b90 h1:UuJSFWbi9XxyNZsJKZuvpWg35BgRbcCGFH+38V2MAdw= -go.opentelemetry.io/collector/featuregate v0.66.1-0.20221128222955-4ff1ff379b90/go.mod h1:tewuFKJYalWBU0bmNKg++MC1ipINXUr6szYzOw2p1GI= -go.opentelemetry.io/collector/pdata v0.66.1-0.20221128222955-4ff1ff379b90 h1:Vu4S4jSNcd0VFPzxQNO4+UqGwnes1xJDoFLPRiWHm8I= -go.opentelemetry.io/collector/pdata v0.66.1-0.20221128222955-4ff1ff379b90/go.mod h1:pqyaznLzk21m+1KL6fwOsRryRELL+zNM0qiVSn0MbVc= -go.opentelemetry.io/collector/semconv v0.66.1-0.20221128222955-4ff1ff379b90 h1:hFaTA68cggZKWMv7wQ3bKP8KGTbowh/5AQZKCHzHTqM= -go.opentelemetry.io/collector/semconv v0.66.1-0.20221128222955-4ff1ff379b90/go.mod h1:5o9yhOa+ABt7g2E5JABDxGZ1PQPbtfxrKNbYn+LOTXU= +go.opentelemetry.io/collector v0.66.1-0.20221202005155-1c54042beb70 h1:INB2CsOtqqrija2KvMuIpbBQ3qX1BECEeR+d0NJX+oM= +go.opentelemetry.io/collector v0.66.1-0.20221202005155-1c54042beb70/go.mod h1:d0NHkHyANJy3HDTvYE/PoylMShUmFIbiir89ieI0X0c= +go.opentelemetry.io/collector/component v0.66.1-0.20221202005155-1c54042beb70 h1:dEoJhzCmRShgmVro/kXm6pouGElgxkH2DsvanzCeZtU= +go.opentelemetry.io/collector/component v0.66.1-0.20221202005155-1c54042beb70/go.mod h1:OsVnvFFe38QSpcuZlQ8cvarDzcloCexgQ1/B2m80F6U= +go.opentelemetry.io/collector/confmap v0.0.0-20221201172708-2bdff61fa52a h1:2TscCXAQASO2kU9xHcMIUM/FP29fiQIRTilZmliq/7I= +go.opentelemetry.io/collector/confmap v0.0.0-20221201172708-2bdff61fa52a/go.mod h1:qJ3e8bA8h4wz/jYlbeEUafVHdrU7DkpStnmIUAz6VTQ= +go.opentelemetry.io/collector/consumer v0.66.1-0.20221202005155-1c54042beb70 h1:XwpVjI1KeKGPXOZBLefGILMziPYuNf6IzbmiIEsIyI0= +go.opentelemetry.io/collector/consumer v0.66.1-0.20221202005155-1c54042beb70/go.mod h1:EWVBcSGcIcmeDGTnIboc/aqa3agsBeH8/q7yFWG7xVc= +go.opentelemetry.io/collector/featuregate v0.66.1-0.20221202005155-1c54042beb70 h1:V0tf4ebciqIs07jFATfLGdUpLRaEsi+AiWuA/in0G8Y= +go.opentelemetry.io/collector/featuregate v0.66.1-0.20221202005155-1c54042beb70/go.mod h1:tewuFKJYalWBU0bmNKg++MC1ipINXUr6szYzOw2p1GI= +go.opentelemetry.io/collector/pdata v0.66.1-0.20221202005155-1c54042beb70 h1:TPOrxkEMvZzfBSwF3ct+kUUgKA5g8unkZZbKQvJweeA= +go.opentelemetry.io/collector/pdata v0.66.1-0.20221202005155-1c54042beb70/go.mod h1:pqyaznLzk21m+1KL6fwOsRryRELL+zNM0qiVSn0MbVc= +go.opentelemetry.io/collector/semconv v0.66.1-0.20221202005155-1c54042beb70 h1:Q5L9Urod3c8as6ZYaoaqBjarx/HXxsxy34DFZIU2fO4= +go.opentelemetry.io/collector/semconv v0.66.1-0.20221202005155-1c54042beb70/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= @@ -316,8 +318,8 @@ go.uber.org/multierr v1.6.0/go.mod h1:cdWPpRnG4AhwMwsgIHip0KRBQjJy5kYEpYjJxpXp9i go.uber.org/multierr v1.8.0 h1:dg6GjLku4EH+249NNmoIciG9N/jURbDG+pFlTkhzIC8= go.uber.org/multierr v1.8.0/go.mod h1:7EAYxJLBy9rStEaz58O2t4Uvip6FSURkq8/ppBp95ak= go.uber.org/zap v1.17.0/go.mod h1:MXVU+bhUf/A7Xi2HNOnopQOrmycQ5Ih87HtOu4q5SSo= -go.uber.org/zap v1.23.0 h1:OjGQ5KQDEUawVHxNwQgPpiypGHOxo2mNZsOqTak4fFY= -go.uber.org/zap v1.23.0/go.mod h1:D+nX8jyLsMHMYrln8A0rJjFt/T/9/bGgIhAqxv5URuY= +go.uber.org/zap v1.24.0 h1:FiJd5l1UOLj0wCgbSE0rwwXHzEdAZS6hiiSnxJN/D60= +go.uber.org/zap v1.24.0/go.mod h1:2kMP+WWQ8aoFoedH3T2sq6iJ2yDWpHbP0f6MQbS9Gkg= golang.org/x/crypto v0.0.0-20180904163835-0709b304e793/go.mod h1:6SG95UA2DQfeDnfUPMdvaQW0Q7yPrPDi9nlGo2tz2b4= golang.org/x/crypto v0.0.0-20190308221718-c2843e01d9a2/go.mod h1:djNgcEr1/C05ACkg1iLfiJU5Ep61QUkGW8qpdssI0+w= golang.org/x/crypto v0.0.0-20190923035154-9ee001bba392/go.mod h1:/lpIB1dKB+9EgE3H3cr1v9wB50oz8l4C4h62xy7jSTY= diff --git a/pkg/batchperresourceattr/go.mod b/pkg/batchperresourceattr/go.mod index 94b7d94ffec2..e3aff9bb56a0 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/consumer v0.66.1-0.20221128222955-4ff1ff379b90 - go.opentelemetry.io/collector/pdata v0.66.1-0.20221128222955-4ff1ff379b90 + go.opentelemetry.io/collector/consumer v0.66.1-0.20221202005155-1c54042beb70 + go.opentelemetry.io/collector/pdata v0.66.1-0.20221202005155-1c54042beb70 go.uber.org/multierr v1.8.0 ) diff --git a/pkg/batchperresourceattr/go.sum b/pkg/batchperresourceattr/go.sum index 98c24dd8e9a9..ebd972a33363 100644 --- a/pkg/batchperresourceattr/go.sum +++ b/pkg/batchperresourceattr/go.sum @@ -84,11 +84,11 @@ 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.65.0 h1:LId2egS/jd/EsGHe6fm36UXouQtyc6n7U2MPDEGw/Kk= -go.opentelemetry.io/collector/consumer v0.66.1-0.20221128222955-4ff1ff379b90 h1:nzNXVfC1FzXBXCLMzbMv+qK3E4EGiNsnMhfVsBd2yzc= -go.opentelemetry.io/collector/consumer v0.66.1-0.20221128222955-4ff1ff379b90/go.mod h1:WtoRZa5SnxQO1ZEQdVxYpFcXCmq62rakv0oUSlPO0NQ= -go.opentelemetry.io/collector/pdata v0.66.1-0.20221128222955-4ff1ff379b90 h1:Vu4S4jSNcd0VFPzxQNO4+UqGwnes1xJDoFLPRiWHm8I= -go.opentelemetry.io/collector/pdata v0.66.1-0.20221128222955-4ff1ff379b90/go.mod h1:pqyaznLzk21m+1KL6fwOsRryRELL+zNM0qiVSn0MbVc= +go.opentelemetry.io/collector v0.66.0 h1:5+0N2PCyqHoE3MYV8tgCsyeD86KbmIVDKmqKF9A7u9k= +go.opentelemetry.io/collector/consumer v0.66.1-0.20221202005155-1c54042beb70 h1:XwpVjI1KeKGPXOZBLefGILMziPYuNf6IzbmiIEsIyI0= +go.opentelemetry.io/collector/consumer v0.66.1-0.20221202005155-1c54042beb70/go.mod h1:EWVBcSGcIcmeDGTnIboc/aqa3agsBeH8/q7yFWG7xVc= +go.opentelemetry.io/collector/pdata v0.66.1-0.20221202005155-1c54042beb70 h1:TPOrxkEMvZzfBSwF3ct+kUUgKA5g8unkZZbKQvJweeA= +go.opentelemetry.io/collector/pdata v0.66.1-0.20221202005155-1c54042beb70/go.mod h1:pqyaznLzk21m+1KL6fwOsRryRELL+zNM0qiVSn0MbVc= 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 9979aa69f0ea..b66389af5598 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.66.1-0.20221128222955-4ff1ff379b90 + go.opentelemetry.io/collector/pdata v0.66.1-0.20221202005155-1c54042beb70 ) require ( diff --git a/pkg/batchpersignal/go.sum b/pkg/batchpersignal/go.sum index cbcf7b53153f..2aa4b03af24a 100644 --- a/pkg/batchpersignal/go.sum +++ b/pkg/batchpersignal/go.sum @@ -51,8 +51,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.66.1-0.20221128222955-4ff1ff379b90 h1:Vu4S4jSNcd0VFPzxQNO4+UqGwnes1xJDoFLPRiWHm8I= -go.opentelemetry.io/collector/pdata v0.66.1-0.20221128222955-4ff1ff379b90/go.mod h1:pqyaznLzk21m+1KL6fwOsRryRELL+zNM0qiVSn0MbVc= +go.opentelemetry.io/collector/pdata v0.66.1-0.20221202005155-1c54042beb70 h1:TPOrxkEMvZzfBSwF3ct+kUUgKA5g8unkZZbKQvJweeA= +go.opentelemetry.io/collector/pdata v0.66.1-0.20221202005155-1c54042beb70/go.mod h1:pqyaznLzk21m+1KL6fwOsRryRELL+zNM0qiVSn0MbVc= go.uber.org/atomic v1.7.0 h1:ADUqmZGgLDDfbSL9ZmPxKTybcoEYHgpYfELNoN+7hsw= go.uber.org/atomic v1.7.0/go.mod h1:fEN4uk6kAWBTFdckzkM89CLk9XfWZrxpCo0nPH17wJc= go.uber.org/multierr v1.8.0 h1:dg6GjLku4EH+249NNmoIciG9N/jURbDG+pFlTkhzIC8= diff --git a/pkg/ottl/go.mod b/pkg/ottl/go.mod index 72eca6443579..566a773e92fc 100644 --- a/pkg/ottl/go.mod +++ b/pkg/ottl/go.mod @@ -8,11 +8,11 @@ require ( github.com/iancoleman/strcase v0.2.0 github.com/json-iterator/go v1.1.12 github.com/stretchr/testify v1.8.1 - go.opentelemetry.io/collector/component v0.66.1-0.20221128222955-4ff1ff379b90 - go.opentelemetry.io/collector/pdata v0.66.1-0.20221128222955-4ff1ff379b90 + go.opentelemetry.io/collector/component v0.66.1-0.20221202005155-1c54042beb70 + go.opentelemetry.io/collector/pdata v0.66.1-0.20221202005155-1c54042beb70 go.opentelemetry.io/otel/trace v1.11.1 go.uber.org/multierr v1.8.0 - go.uber.org/zap v1.23.0 + go.uber.org/zap v1.24.0 golang.org/x/exp v0.0.0-20220722155223-a9213eeb770e ) @@ -30,9 +30,10 @@ require ( github.com/modern-go/reflect2 v1.0.2 // indirect github.com/pelletier/go-toml v1.9.4 // indirect github.com/pmezard/go-difflib v1.0.0 // indirect - go.opentelemetry.io/collector v0.66.1-0.20221128222955-4ff1ff379b90 // indirect - go.opentelemetry.io/collector/consumer v0.66.1-0.20221128222955-4ff1ff379b90 // indirect - go.opentelemetry.io/collector/featuregate v0.66.1-0.20221128222955-4ff1ff379b90 // indirect + go.opentelemetry.io/collector v0.66.1-0.20221202005155-1c54042beb70 // indirect + go.opentelemetry.io/collector/confmap v0.0.0-20221201172708-2bdff61fa52a // indirect + go.opentelemetry.io/collector/consumer v0.66.1-0.20221202005155-1c54042beb70 // indirect + go.opentelemetry.io/collector/featuregate v0.66.1-0.20221202005155-1c54042beb70 // indirect go.opentelemetry.io/otel v1.11.1 // indirect go.opentelemetry.io/otel/metric v0.33.0 // indirect go.uber.org/atomic v1.10.0 // indirect diff --git a/pkg/ottl/go.sum b/pkg/ottl/go.sum index 4d89c2b27acf..3b28beef6aad 100644 --- a/pkg/ottl/go.sum +++ b/pkg/ottl/go.sum @@ -268,16 +268,18 @@ github.com/yuin/goldmark v1.3.5/go.mod h1:mwnBkeHKe2W/ZEtQ+71ViKU8L12m81fl3OWwC1 go.etcd.io/etcd/api/v3 v3.5.4/go.mod h1:5GB2vv4A4AOn3yk7MftYGHkUfGtDHnEraIjym4dYz5A= go.etcd.io/etcd/client/pkg/v3 v3.5.4/go.mod h1:IJHfcCEKxYu1Os13ZdwCwIUTUVGYTSAM3YSwc9/Ac1g= go.etcd.io/etcd/client/v3 v3.5.4/go.mod h1:ZaRkVgBZC+L+dLCjTcF1hRXpgZXQPOvnA/Ak/gq3kiY= -go.opentelemetry.io/collector v0.66.1-0.20221128222955-4ff1ff379b90 h1:yRe05/jMdzH4TFHfndZ5h2o2hKBK/79W72j8w51qNsI= -go.opentelemetry.io/collector v0.66.1-0.20221128222955-4ff1ff379b90/go.mod h1:hE6jCs+0rfiufCrVPucKZTMwfHit1okfDPnwPT2eW1I= -go.opentelemetry.io/collector/component v0.66.1-0.20221128222955-4ff1ff379b90 h1:AYSNTXbezhNg43EuYdVVcgxE/2gBVrm00FDx4DOmQVg= -go.opentelemetry.io/collector/component v0.66.1-0.20221128222955-4ff1ff379b90/go.mod h1:0c84EqXUhvYe6KW7hJfh76tiI/5yjWCH2amwyQ06XLM= -go.opentelemetry.io/collector/consumer v0.66.1-0.20221128222955-4ff1ff379b90 h1:nzNXVfC1FzXBXCLMzbMv+qK3E4EGiNsnMhfVsBd2yzc= -go.opentelemetry.io/collector/consumer v0.66.1-0.20221128222955-4ff1ff379b90/go.mod h1:WtoRZa5SnxQO1ZEQdVxYpFcXCmq62rakv0oUSlPO0NQ= -go.opentelemetry.io/collector/featuregate v0.66.1-0.20221128222955-4ff1ff379b90 h1:UuJSFWbi9XxyNZsJKZuvpWg35BgRbcCGFH+38V2MAdw= -go.opentelemetry.io/collector/featuregate v0.66.1-0.20221128222955-4ff1ff379b90/go.mod h1:tewuFKJYalWBU0bmNKg++MC1ipINXUr6szYzOw2p1GI= -go.opentelemetry.io/collector/pdata v0.66.1-0.20221128222955-4ff1ff379b90 h1:Vu4S4jSNcd0VFPzxQNO4+UqGwnes1xJDoFLPRiWHm8I= -go.opentelemetry.io/collector/pdata v0.66.1-0.20221128222955-4ff1ff379b90/go.mod h1:pqyaznLzk21m+1KL6fwOsRryRELL+zNM0qiVSn0MbVc= +go.opentelemetry.io/collector v0.66.1-0.20221202005155-1c54042beb70 h1:INB2CsOtqqrija2KvMuIpbBQ3qX1BECEeR+d0NJX+oM= +go.opentelemetry.io/collector v0.66.1-0.20221202005155-1c54042beb70/go.mod h1:d0NHkHyANJy3HDTvYE/PoylMShUmFIbiir89ieI0X0c= +go.opentelemetry.io/collector/component v0.66.1-0.20221202005155-1c54042beb70 h1:dEoJhzCmRShgmVro/kXm6pouGElgxkH2DsvanzCeZtU= +go.opentelemetry.io/collector/component v0.66.1-0.20221202005155-1c54042beb70/go.mod h1:OsVnvFFe38QSpcuZlQ8cvarDzcloCexgQ1/B2m80F6U= +go.opentelemetry.io/collector/confmap v0.0.0-20221201172708-2bdff61fa52a h1:2TscCXAQASO2kU9xHcMIUM/FP29fiQIRTilZmliq/7I= +go.opentelemetry.io/collector/confmap v0.0.0-20221201172708-2bdff61fa52a/go.mod h1:qJ3e8bA8h4wz/jYlbeEUafVHdrU7DkpStnmIUAz6VTQ= +go.opentelemetry.io/collector/consumer v0.66.1-0.20221202005155-1c54042beb70 h1:XwpVjI1KeKGPXOZBLefGILMziPYuNf6IzbmiIEsIyI0= +go.opentelemetry.io/collector/consumer v0.66.1-0.20221202005155-1c54042beb70/go.mod h1:EWVBcSGcIcmeDGTnIboc/aqa3agsBeH8/q7yFWG7xVc= +go.opentelemetry.io/collector/featuregate v0.66.1-0.20221202005155-1c54042beb70 h1:V0tf4ebciqIs07jFATfLGdUpLRaEsi+AiWuA/in0G8Y= +go.opentelemetry.io/collector/featuregate v0.66.1-0.20221202005155-1c54042beb70/go.mod h1:tewuFKJYalWBU0bmNKg++MC1ipINXUr6szYzOw2p1GI= +go.opentelemetry.io/collector/pdata v0.66.1-0.20221202005155-1c54042beb70 h1:TPOrxkEMvZzfBSwF3ct+kUUgKA5g8unkZZbKQvJweeA= +go.opentelemetry.io/collector/pdata v0.66.1-0.20221202005155-1c54042beb70/go.mod h1:pqyaznLzk21m+1KL6fwOsRryRELL+zNM0qiVSn0MbVc= 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= @@ -292,8 +294,8 @@ go.uber.org/multierr v1.6.0/go.mod h1:cdWPpRnG4AhwMwsgIHip0KRBQjJy5kYEpYjJxpXp9i go.uber.org/multierr v1.8.0 h1:dg6GjLku4EH+249NNmoIciG9N/jURbDG+pFlTkhzIC8= go.uber.org/multierr v1.8.0/go.mod h1:7EAYxJLBy9rStEaz58O2t4Uvip6FSURkq8/ppBp95ak= go.uber.org/zap v1.17.0/go.mod h1:MXVU+bhUf/A7Xi2HNOnopQOrmycQ5Ih87HtOu4q5SSo= -go.uber.org/zap v1.23.0 h1:OjGQ5KQDEUawVHxNwQgPpiypGHOxo2mNZsOqTak4fFY= -go.uber.org/zap v1.23.0/go.mod h1:D+nX8jyLsMHMYrln8A0rJjFt/T/9/bGgIhAqxv5URuY= +go.uber.org/zap v1.24.0 h1:FiJd5l1UOLj0wCgbSE0rwwXHzEdAZS6hiiSnxJN/D60= +go.uber.org/zap v1.24.0/go.mod h1:2kMP+WWQ8aoFoedH3T2sq6iJ2yDWpHbP0f6MQbS9Gkg= golang.org/x/crypto v0.0.0-20180904163835-0709b304e793/go.mod h1:6SG95UA2DQfeDnfUPMdvaQW0Q7yPrPDi9nlGo2tz2b4= golang.org/x/crypto v0.0.0-20190308221718-c2843e01d9a2/go.mod h1:djNgcEr1/C05ACkg1iLfiJU5Ep61QUkGW8qpdssI0+w= golang.org/x/crypto v0.0.0-20190923035154-9ee001bba392/go.mod h1:/lpIB1dKB+9EgE3H3cr1v9wB50oz8l4C4h62xy7jSTY= diff --git a/pkg/resourcetotelemetry/go.mod b/pkg/resourcetotelemetry/go.mod index 76ba52900c3d..664e47f548e8 100644 --- a/pkg/resourcetotelemetry/go.mod +++ b/pkg/resourcetotelemetry/go.mod @@ -5,9 +5,9 @@ go 1.18 require ( github.com/open-telemetry/opentelemetry-collector-contrib/internal/coreinternal v0.66.0 github.com/stretchr/testify v1.8.1 - go.opentelemetry.io/collector/component v0.66.1-0.20221128222955-4ff1ff379b90 - go.opentelemetry.io/collector/consumer v0.66.1-0.20221128222955-4ff1ff379b90 - go.opentelemetry.io/collector/pdata v0.66.1-0.20221128222955-4ff1ff379b90 + go.opentelemetry.io/collector/component v0.66.1-0.20221202005155-1c54042beb70 + go.opentelemetry.io/collector/consumer v0.66.1-0.20221202005155-1c54042beb70 + go.opentelemetry.io/collector/pdata v0.66.1-0.20221202005155-1c54042beb70 ) require ( @@ -24,14 +24,15 @@ 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.6.1 // indirect - go.opentelemetry.io/collector v0.66.1-0.20221128222955-4ff1ff379b90 // indirect - go.opentelemetry.io/collector/featuregate v0.66.1-0.20221128222955-4ff1ff379b90 // indirect + go.opentelemetry.io/collector v0.66.1-0.20221202005155-1c54042beb70 // indirect + go.opentelemetry.io/collector/confmap v0.0.0-20221201172708-2bdff61fa52a // indirect + go.opentelemetry.io/collector/featuregate v0.66.1-0.20221202005155-1c54042beb70 // 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 go.uber.org/atomic v1.10.0 // indirect go.uber.org/multierr v1.8.0 // indirect - go.uber.org/zap v1.23.0 // indirect + go.uber.org/zap v1.24.0 // indirect golang.org/x/net v0.0.0-20220722155237-a158d28d115b // indirect golang.org/x/sys v0.2.0 // indirect golang.org/x/text v0.4.0 // indirect diff --git a/pkg/resourcetotelemetry/go.sum b/pkg/resourcetotelemetry/go.sum index 5affc98d0f51..eb111a8dfc9b 100644 --- a/pkg/resourcetotelemetry/go.sum +++ b/pkg/resourcetotelemetry/go.sum @@ -255,16 +255,18 @@ github.com/yuin/goldmark v1.3.5/go.mod h1:mwnBkeHKe2W/ZEtQ+71ViKU8L12m81fl3OWwC1 go.etcd.io/etcd/api/v3 v3.5.4/go.mod h1:5GB2vv4A4AOn3yk7MftYGHkUfGtDHnEraIjym4dYz5A= go.etcd.io/etcd/client/pkg/v3 v3.5.4/go.mod h1:IJHfcCEKxYu1Os13ZdwCwIUTUVGYTSAM3YSwc9/Ac1g= go.etcd.io/etcd/client/v3 v3.5.4/go.mod h1:ZaRkVgBZC+L+dLCjTcF1hRXpgZXQPOvnA/Ak/gq3kiY= -go.opentelemetry.io/collector v0.66.1-0.20221128222955-4ff1ff379b90 h1:yRe05/jMdzH4TFHfndZ5h2o2hKBK/79W72j8w51qNsI= -go.opentelemetry.io/collector v0.66.1-0.20221128222955-4ff1ff379b90/go.mod h1:hE6jCs+0rfiufCrVPucKZTMwfHit1okfDPnwPT2eW1I= -go.opentelemetry.io/collector/component v0.66.1-0.20221128222955-4ff1ff379b90 h1:AYSNTXbezhNg43EuYdVVcgxE/2gBVrm00FDx4DOmQVg= -go.opentelemetry.io/collector/component v0.66.1-0.20221128222955-4ff1ff379b90/go.mod h1:0c84EqXUhvYe6KW7hJfh76tiI/5yjWCH2amwyQ06XLM= -go.opentelemetry.io/collector/consumer v0.66.1-0.20221128222955-4ff1ff379b90 h1:nzNXVfC1FzXBXCLMzbMv+qK3E4EGiNsnMhfVsBd2yzc= -go.opentelemetry.io/collector/consumer v0.66.1-0.20221128222955-4ff1ff379b90/go.mod h1:WtoRZa5SnxQO1ZEQdVxYpFcXCmq62rakv0oUSlPO0NQ= -go.opentelemetry.io/collector/featuregate v0.66.1-0.20221128222955-4ff1ff379b90 h1:UuJSFWbi9XxyNZsJKZuvpWg35BgRbcCGFH+38V2MAdw= -go.opentelemetry.io/collector/featuregate v0.66.1-0.20221128222955-4ff1ff379b90/go.mod h1:tewuFKJYalWBU0bmNKg++MC1ipINXUr6szYzOw2p1GI= -go.opentelemetry.io/collector/pdata v0.66.1-0.20221128222955-4ff1ff379b90 h1:Vu4S4jSNcd0VFPzxQNO4+UqGwnes1xJDoFLPRiWHm8I= -go.opentelemetry.io/collector/pdata v0.66.1-0.20221128222955-4ff1ff379b90/go.mod h1:pqyaznLzk21m+1KL6fwOsRryRELL+zNM0qiVSn0MbVc= +go.opentelemetry.io/collector v0.66.1-0.20221202005155-1c54042beb70 h1:INB2CsOtqqrija2KvMuIpbBQ3qX1BECEeR+d0NJX+oM= +go.opentelemetry.io/collector v0.66.1-0.20221202005155-1c54042beb70/go.mod h1:d0NHkHyANJy3HDTvYE/PoylMShUmFIbiir89ieI0X0c= +go.opentelemetry.io/collector/component v0.66.1-0.20221202005155-1c54042beb70 h1:dEoJhzCmRShgmVro/kXm6pouGElgxkH2DsvanzCeZtU= +go.opentelemetry.io/collector/component v0.66.1-0.20221202005155-1c54042beb70/go.mod h1:OsVnvFFe38QSpcuZlQ8cvarDzcloCexgQ1/B2m80F6U= +go.opentelemetry.io/collector/confmap v0.0.0-20221201172708-2bdff61fa52a h1:2TscCXAQASO2kU9xHcMIUM/FP29fiQIRTilZmliq/7I= +go.opentelemetry.io/collector/confmap v0.0.0-20221201172708-2bdff61fa52a/go.mod h1:qJ3e8bA8h4wz/jYlbeEUafVHdrU7DkpStnmIUAz6VTQ= +go.opentelemetry.io/collector/consumer v0.66.1-0.20221202005155-1c54042beb70 h1:XwpVjI1KeKGPXOZBLefGILMziPYuNf6IzbmiIEsIyI0= +go.opentelemetry.io/collector/consumer v0.66.1-0.20221202005155-1c54042beb70/go.mod h1:EWVBcSGcIcmeDGTnIboc/aqa3agsBeH8/q7yFWG7xVc= +go.opentelemetry.io/collector/featuregate v0.66.1-0.20221202005155-1c54042beb70 h1:V0tf4ebciqIs07jFATfLGdUpLRaEsi+AiWuA/in0G8Y= +go.opentelemetry.io/collector/featuregate v0.66.1-0.20221202005155-1c54042beb70/go.mod h1:tewuFKJYalWBU0bmNKg++MC1ipINXUr6szYzOw2p1GI= +go.opentelemetry.io/collector/pdata v0.66.1-0.20221202005155-1c54042beb70 h1:TPOrxkEMvZzfBSwF3ct+kUUgKA5g8unkZZbKQvJweeA= +go.opentelemetry.io/collector/pdata v0.66.1-0.20221202005155-1c54042beb70/go.mod h1:pqyaznLzk21m+1KL6fwOsRryRELL+zNM0qiVSn0MbVc= 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= @@ -279,8 +281,8 @@ go.uber.org/multierr v1.6.0/go.mod h1:cdWPpRnG4AhwMwsgIHip0KRBQjJy5kYEpYjJxpXp9i go.uber.org/multierr v1.8.0 h1:dg6GjLku4EH+249NNmoIciG9N/jURbDG+pFlTkhzIC8= go.uber.org/multierr v1.8.0/go.mod h1:7EAYxJLBy9rStEaz58O2t4Uvip6FSURkq8/ppBp95ak= go.uber.org/zap v1.17.0/go.mod h1:MXVU+bhUf/A7Xi2HNOnopQOrmycQ5Ih87HtOu4q5SSo= -go.uber.org/zap v1.23.0 h1:OjGQ5KQDEUawVHxNwQgPpiypGHOxo2mNZsOqTak4fFY= -go.uber.org/zap v1.23.0/go.mod h1:D+nX8jyLsMHMYrln8A0rJjFt/T/9/bGgIhAqxv5URuY= +go.uber.org/zap v1.24.0 h1:FiJd5l1UOLj0wCgbSE0rwwXHzEdAZS6hiiSnxJN/D60= +go.uber.org/zap v1.24.0/go.mod h1:2kMP+WWQ8aoFoedH3T2sq6iJ2yDWpHbP0f6MQbS9Gkg= golang.org/x/crypto v0.0.0-20180904163835-0709b304e793/go.mod h1:6SG95UA2DQfeDnfUPMdvaQW0Q7yPrPDi9nlGo2tz2b4= golang.org/x/crypto v0.0.0-20190308221718-c2843e01d9a2/go.mod h1:djNgcEr1/C05ACkg1iLfiJU5Ep61QUkGW8qpdssI0+w= golang.org/x/crypto v0.0.0-20190923035154-9ee001bba392/go.mod h1:/lpIB1dKB+9EgE3H3cr1v9wB50oz8l4C4h62xy7jSTY= diff --git a/pkg/stanza/adapter/factory.go b/pkg/stanza/adapter/factory.go index 9d9e5d66c853..af91828a8cf1 100644 --- a/pkg/stanza/adapter/factory.go +++ b/pkg/stanza/adapter/factory.go @@ -65,14 +65,14 @@ func createLogsReceiver(logReceiverType LogReceiverType) component.CreateLogsRec converter := NewConverter(params.Logger) obsrecv, err := obsreport.NewReceiver(obsreport.ReceiverSettings{ - ReceiverID: cfg.ID(), + ReceiverID: params.ID, ReceiverCreateSettings: params, }) if err != nil { return nil, err } return &receiver{ - id: cfg.ID(), + id: params.ID, pipe: pipe, emitter: emitter, consumer: nextConsumer, diff --git a/pkg/stanza/adapter/storage_test.go b/pkg/stanza/adapter/storage_test.go index 90b67e0a48bd..47eee3885a9c 100644 --- a/pkg/stanza/adapter/storage_test.go +++ b/pkg/stanza/adapter/storage_test.go @@ -31,9 +31,9 @@ func TestStorage(t *testing.T) { storageExt := storagetest.NewFileBackedStorageExtension("test", t.TempDir()) host := storagetest.NewStorageHost(). - WithExtension(storageExt.ID(), storageExt) + WithExtension(storageExt.ID, storageExt) - id := storageExt.ID() + id := storageExt.ID r := createReceiver(t, id) require.NoError(t, r.Start(ctx, host)) @@ -75,7 +75,7 @@ func TestStorage(t *testing.T) { func TestFindCorrectStorageExtension(t *testing.T) { correctStoragedExt := storagetest.NewInMemoryStorageExtension("want") - id := correctStoragedExt.ID() + id := correctStoragedExt.ID r := createReceiver(t, id) host := storagetest.NewStorageHost(). WithNonStorageExtension("one"). @@ -104,7 +104,7 @@ func TestFailOnMissingStorageExtension(t *testing.T) { func TestFailOnNonStorageExtension(t *testing.T) { nonStorageExt := storagetest.NewNonStorageExtension("non") - id := nonStorageExt.ID() + id := nonStorageExt.ID r := createReceiver(t, id) host := storagetest.NewStorageHost(). WithExtension(id, nonStorageExt) diff --git a/pkg/stanza/go.mod b/pkg/stanza/go.mod index 0b5039bb8d2f..0899fad4b4fd 100644 --- a/pkg/stanza/go.mod +++ b/pkg/stanza/go.mod @@ -12,13 +12,14 @@ require ( github.com/observiq/nanojack v0.0.0-20201106172433-343928847ebc github.com/open-telemetry/opentelemetry-collector-contrib/extension/storage v0.66.0 github.com/stretchr/testify v1.8.1 - go.opentelemetry.io/collector v0.66.1-0.20221128222955-4ff1ff379b90 - go.opentelemetry.io/collector/component v0.66.1-0.20221128222955-4ff1ff379b90 - go.opentelemetry.io/collector/consumer v0.66.1-0.20221128222955-4ff1ff379b90 - go.opentelemetry.io/collector/pdata v0.66.1-0.20221128222955-4ff1ff379b90 + go.opentelemetry.io/collector v0.66.1-0.20221202005155-1c54042beb70 + go.opentelemetry.io/collector/component v0.66.1-0.20221202005155-1c54042beb70 + go.opentelemetry.io/collector/confmap v0.0.0-20221201172708-2bdff61fa52a + go.opentelemetry.io/collector/consumer v0.66.1-0.20221202005155-1c54042beb70 + go.opentelemetry.io/collector/pdata v0.66.1-0.20221202005155-1c54042beb70 go.uber.org/atomic v1.10.0 go.uber.org/multierr v1.8.0 - go.uber.org/zap v1.23.0 + go.uber.org/zap v1.24.0 golang.org/x/sys v0.2.0 golang.org/x/text v0.4.0 gonum.org/v1/gonum v0.12.0 @@ -41,7 +42,7 @@ require ( github.com/rogpeppe/go-internal v1.6.1 // indirect github.com/stretchr/objx v0.5.0 // indirect go.opencensus.io v0.24.0 // indirect - go.opentelemetry.io/collector/featuregate v0.66.1-0.20221128222955-4ff1ff379b90 // indirect + go.opentelemetry.io/collector/featuregate v0.66.1-0.20221202005155-1c54042beb70 // 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 aafba5948a4e..eed462cbdf3a 100644 --- a/pkg/stanza/go.sum +++ b/pkg/stanza/go.sum @@ -311,16 +311,18 @@ go.etcd.io/etcd/client/pkg/v3 v3.5.4/go.mod h1:IJHfcCEKxYu1Os13ZdwCwIUTUVGYTSAM3 go.etcd.io/etcd/client/v3 v3.5.4/go.mod h1:ZaRkVgBZC+L+dLCjTcF1hRXpgZXQPOvnA/Ak/gq3kiY= go.opencensus.io v0.24.0 h1:y73uSU6J157QMP2kn2r30vwW1A2W2WFwSCGnAVxeaD0= go.opencensus.io v0.24.0/go.mod h1:vNK8G9p7aAivkbmorf4v+7Hgx+Zs0yY+0fOtgBfjQKo= -go.opentelemetry.io/collector v0.66.1-0.20221128222955-4ff1ff379b90 h1:yRe05/jMdzH4TFHfndZ5h2o2hKBK/79W72j8w51qNsI= -go.opentelemetry.io/collector v0.66.1-0.20221128222955-4ff1ff379b90/go.mod h1:hE6jCs+0rfiufCrVPucKZTMwfHit1okfDPnwPT2eW1I= -go.opentelemetry.io/collector/component v0.66.1-0.20221128222955-4ff1ff379b90 h1:AYSNTXbezhNg43EuYdVVcgxE/2gBVrm00FDx4DOmQVg= -go.opentelemetry.io/collector/component v0.66.1-0.20221128222955-4ff1ff379b90/go.mod h1:0c84EqXUhvYe6KW7hJfh76tiI/5yjWCH2amwyQ06XLM= -go.opentelemetry.io/collector/consumer v0.66.1-0.20221128222955-4ff1ff379b90 h1:nzNXVfC1FzXBXCLMzbMv+qK3E4EGiNsnMhfVsBd2yzc= -go.opentelemetry.io/collector/consumer v0.66.1-0.20221128222955-4ff1ff379b90/go.mod h1:WtoRZa5SnxQO1ZEQdVxYpFcXCmq62rakv0oUSlPO0NQ= -go.opentelemetry.io/collector/featuregate v0.66.1-0.20221128222955-4ff1ff379b90 h1:UuJSFWbi9XxyNZsJKZuvpWg35BgRbcCGFH+38V2MAdw= -go.opentelemetry.io/collector/featuregate v0.66.1-0.20221128222955-4ff1ff379b90/go.mod h1:tewuFKJYalWBU0bmNKg++MC1ipINXUr6szYzOw2p1GI= -go.opentelemetry.io/collector/pdata v0.66.1-0.20221128222955-4ff1ff379b90 h1:Vu4S4jSNcd0VFPzxQNO4+UqGwnes1xJDoFLPRiWHm8I= -go.opentelemetry.io/collector/pdata v0.66.1-0.20221128222955-4ff1ff379b90/go.mod h1:pqyaznLzk21m+1KL6fwOsRryRELL+zNM0qiVSn0MbVc= +go.opentelemetry.io/collector v0.66.1-0.20221202005155-1c54042beb70 h1:INB2CsOtqqrija2KvMuIpbBQ3qX1BECEeR+d0NJX+oM= +go.opentelemetry.io/collector v0.66.1-0.20221202005155-1c54042beb70/go.mod h1:d0NHkHyANJy3HDTvYE/PoylMShUmFIbiir89ieI0X0c= +go.opentelemetry.io/collector/component v0.66.1-0.20221202005155-1c54042beb70 h1:dEoJhzCmRShgmVro/kXm6pouGElgxkH2DsvanzCeZtU= +go.opentelemetry.io/collector/component v0.66.1-0.20221202005155-1c54042beb70/go.mod h1:OsVnvFFe38QSpcuZlQ8cvarDzcloCexgQ1/B2m80F6U= +go.opentelemetry.io/collector/confmap v0.0.0-20221201172708-2bdff61fa52a h1:2TscCXAQASO2kU9xHcMIUM/FP29fiQIRTilZmliq/7I= +go.opentelemetry.io/collector/confmap v0.0.0-20221201172708-2bdff61fa52a/go.mod h1:qJ3e8bA8h4wz/jYlbeEUafVHdrU7DkpStnmIUAz6VTQ= +go.opentelemetry.io/collector/consumer v0.66.1-0.20221202005155-1c54042beb70 h1:XwpVjI1KeKGPXOZBLefGILMziPYuNf6IzbmiIEsIyI0= +go.opentelemetry.io/collector/consumer v0.66.1-0.20221202005155-1c54042beb70/go.mod h1:EWVBcSGcIcmeDGTnIboc/aqa3agsBeH8/q7yFWG7xVc= +go.opentelemetry.io/collector/featuregate v0.66.1-0.20221202005155-1c54042beb70 h1:V0tf4ebciqIs07jFATfLGdUpLRaEsi+AiWuA/in0G8Y= +go.opentelemetry.io/collector/featuregate v0.66.1-0.20221202005155-1c54042beb70/go.mod h1:tewuFKJYalWBU0bmNKg++MC1ipINXUr6szYzOw2p1GI= +go.opentelemetry.io/collector/pdata v0.66.1-0.20221202005155-1c54042beb70 h1:TPOrxkEMvZzfBSwF3ct+kUUgKA5g8unkZZbKQvJweeA= +go.opentelemetry.io/collector/pdata v0.66.1-0.20221202005155-1c54042beb70/go.mod h1:pqyaznLzk21m+1KL6fwOsRryRELL+zNM0qiVSn0MbVc= 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= @@ -339,8 +341,8 @@ go.uber.org/multierr v1.6.0/go.mod h1:cdWPpRnG4AhwMwsgIHip0KRBQjJy5kYEpYjJxpXp9i go.uber.org/multierr v1.8.0 h1:dg6GjLku4EH+249NNmoIciG9N/jURbDG+pFlTkhzIC8= go.uber.org/multierr v1.8.0/go.mod h1:7EAYxJLBy9rStEaz58O2t4Uvip6FSURkq8/ppBp95ak= go.uber.org/zap v1.17.0/go.mod h1:MXVU+bhUf/A7Xi2HNOnopQOrmycQ5Ih87HtOu4q5SSo= -go.uber.org/zap v1.23.0 h1:OjGQ5KQDEUawVHxNwQgPpiypGHOxo2mNZsOqTak4fFY= -go.uber.org/zap v1.23.0/go.mod h1:D+nX8jyLsMHMYrln8A0rJjFt/T/9/bGgIhAqxv5URuY= +go.uber.org/zap v1.24.0 h1:FiJd5l1UOLj0wCgbSE0rwwXHzEdAZS6hiiSnxJN/D60= +go.uber.org/zap v1.24.0/go.mod h1:2kMP+WWQ8aoFoedH3T2sq6iJ2yDWpHbP0f6MQbS9Gkg= golang.org/x/crypto v0.0.0-20180904163835-0709b304e793/go.mod h1:6SG95UA2DQfeDnfUPMdvaQW0Q7yPrPDi9nlGo2tz2b4= golang.org/x/crypto v0.0.0-20190308221718-c2843e01d9a2/go.mod h1:djNgcEr1/C05ACkg1iLfiJU5Ep61QUkGW8qpdssI0+w= golang.org/x/crypto v0.0.0-20190923035154-9ee001bba392/go.mod h1:/lpIB1dKB+9EgE3H3cr1v9wB50oz8l4C4h62xy7jSTY= diff --git a/pkg/translator/jaeger/go.mod b/pkg/translator/jaeger/go.mod index 3d5202610984..4c48da345038 100644 --- a/pkg/translator/jaeger/go.mod +++ b/pkg/translator/jaeger/go.mod @@ -6,8 +6,8 @@ require ( github.com/jaegertracing/jaeger v1.39.1-0.20221110195127-14c11365a856 github.com/open-telemetry/opentelemetry-collector-contrib/internal/coreinternal v0.66.0 github.com/stretchr/testify v1.8.1 - go.opentelemetry.io/collector/pdata v0.66.1-0.20221128222955-4ff1ff379b90 - go.opentelemetry.io/collector/semconv v0.66.1-0.20221128222955-4ff1ff379b90 + go.opentelemetry.io/collector/pdata v0.66.1-0.20221202005155-1c54042beb70 + go.opentelemetry.io/collector/semconv v0.66.1-0.20221202005155-1c54042beb70 ) require ( @@ -24,7 +24,7 @@ require ( github.com/uber/jaeger-lib v2.4.1+incompatible // indirect go.uber.org/atomic v1.10.0 // indirect go.uber.org/multierr v1.8.0 // indirect - go.uber.org/zap v1.23.0 // indirect + go.uber.org/zap v1.24.0 // indirect golang.org/x/net v0.0.0-20221014081412-f15817d10f9b // indirect golang.org/x/sys v0.2.0 // indirect golang.org/x/text v0.4.0 // indirect diff --git a/pkg/translator/jaeger/go.sum b/pkg/translator/jaeger/go.sum index fbe3132e6f1d..33b299471380 100644 --- a/pkg/translator/jaeger/go.sum +++ b/pkg/translator/jaeger/go.sum @@ -48,18 +48,18 @@ 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.66.1-0.20221128222955-4ff1ff379b90 h1:Vu4S4jSNcd0VFPzxQNO4+UqGwnes1xJDoFLPRiWHm8I= -go.opentelemetry.io/collector/pdata v0.66.1-0.20221128222955-4ff1ff379b90/go.mod h1:pqyaznLzk21m+1KL6fwOsRryRELL+zNM0qiVSn0MbVc= -go.opentelemetry.io/collector/semconv v0.66.1-0.20221128222955-4ff1ff379b90 h1:hFaTA68cggZKWMv7wQ3bKP8KGTbowh/5AQZKCHzHTqM= -go.opentelemetry.io/collector/semconv v0.66.1-0.20221128222955-4ff1ff379b90/go.mod h1:5o9yhOa+ABt7g2E5JABDxGZ1PQPbtfxrKNbYn+LOTXU= +go.opentelemetry.io/collector/pdata v0.66.1-0.20221202005155-1c54042beb70 h1:TPOrxkEMvZzfBSwF3ct+kUUgKA5g8unkZZbKQvJweeA= +go.opentelemetry.io/collector/pdata v0.66.1-0.20221202005155-1c54042beb70/go.mod h1:pqyaznLzk21m+1KL6fwOsRryRELL+zNM0qiVSn0MbVc= +go.opentelemetry.io/collector/semconv v0.66.1-0.20221202005155-1c54042beb70 h1:Q5L9Urod3c8as6ZYaoaqBjarx/HXxsxy34DFZIU2fO4= +go.opentelemetry.io/collector/semconv v0.66.1-0.20221202005155-1c54042beb70/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= go.uber.org/goleak v1.1.11 h1:wy28qYRKZgnJTxGxvye5/wgWr1EKjmUDGYox5mGlRlI= go.uber.org/multierr v1.8.0 h1:dg6GjLku4EH+249NNmoIciG9N/jURbDG+pFlTkhzIC8= go.uber.org/multierr v1.8.0/go.mod h1:7EAYxJLBy9rStEaz58O2t4Uvip6FSURkq8/ppBp95ak= -go.uber.org/zap v1.23.0 h1:OjGQ5KQDEUawVHxNwQgPpiypGHOxo2mNZsOqTak4fFY= -go.uber.org/zap v1.23.0/go.mod h1:D+nX8jyLsMHMYrln8A0rJjFt/T/9/bGgIhAqxv5URuY= +go.uber.org/zap v1.24.0 h1:FiJd5l1UOLj0wCgbSE0rwwXHzEdAZS6hiiSnxJN/D60= +go.uber.org/zap v1.24.0/go.mod h1:2kMP+WWQ8aoFoedH3T2sq6iJ2yDWpHbP0f6MQbS9Gkg= 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/loki/go.mod b/pkg/translator/loki/go.mod index 95319bc0797b..a014f8455ea5 100644 --- a/pkg/translator/loki/go.mod +++ b/pkg/translator/loki/go.mod @@ -8,7 +8,7 @@ require ( github.com/open-telemetry/opentelemetry-collector-contrib/internal/coreinternal v0.66.0 github.com/prometheus/common v0.37.0 github.com/stretchr/testify v1.8.1 - go.opentelemetry.io/collector/pdata v0.66.1-0.20221128222955-4ff1ff379b90 + go.opentelemetry.io/collector/pdata v0.66.1-0.20221202005155-1c54042beb70 ) require ( @@ -81,7 +81,7 @@ require ( go.uber.org/atomic v1.10.0 // indirect go.uber.org/goleak v1.2.0 // indirect go.uber.org/multierr v1.8.0 // indirect - go.uber.org/zap v1.23.0 // indirect + go.uber.org/zap v1.24.0 // indirect golang.org/x/crypto v0.1.0 // indirect golang.org/x/mod v0.6.0 // indirect golang.org/x/net v0.1.0 // indirect diff --git a/pkg/translator/loki/go.sum b/pkg/translator/loki/go.sum index 8c812715cda3..3c4172d4cfae 100644 --- a/pkg/translator/loki/go.sum +++ b/pkg/translator/loki/go.sum @@ -434,8 +434,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.66.1-0.20221128222955-4ff1ff379b90 h1:Vu4S4jSNcd0VFPzxQNO4+UqGwnes1xJDoFLPRiWHm8I= -go.opentelemetry.io/collector/pdata v0.66.1-0.20221128222955-4ff1ff379b90/go.mod h1:pqyaznLzk21m+1KL6fwOsRryRELL+zNM0qiVSn0MbVc= +go.opentelemetry.io/collector/pdata v0.66.1-0.20221202005155-1c54042beb70 h1:TPOrxkEMvZzfBSwF3ct+kUUgKA5g8unkZZbKQvJweeA= +go.opentelemetry.io/collector/pdata v0.66.1-0.20221202005155-1c54042beb70/go.mod h1:pqyaznLzk21m+1KL6fwOsRryRELL+zNM0qiVSn0MbVc= 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= @@ -449,8 +449,8 @@ go.uber.org/multierr v1.8.0 h1:dg6GjLku4EH+249NNmoIciG9N/jURbDG+pFlTkhzIC8= go.uber.org/multierr v1.8.0/go.mod h1:7EAYxJLBy9rStEaz58O2t4Uvip6FSURkq8/ppBp95ak= go.uber.org/zap v1.10.0/go.mod h1:vwi/ZaCAaUcBkycHslxD9B2zi4UTXhF60s6SWpuDF0Q= go.uber.org/zap v1.17.0/go.mod h1:MXVU+bhUf/A7Xi2HNOnopQOrmycQ5Ih87HtOu4q5SSo= -go.uber.org/zap v1.23.0 h1:OjGQ5KQDEUawVHxNwQgPpiypGHOxo2mNZsOqTak4fFY= -go.uber.org/zap v1.23.0/go.mod h1:D+nX8jyLsMHMYrln8A0rJjFt/T/9/bGgIhAqxv5URuY= +go.uber.org/zap v1.24.0 h1:FiJd5l1UOLj0wCgbSE0rwwXHzEdAZS6hiiSnxJN/D60= +go.uber.org/zap v1.24.0/go.mod h1:2kMP+WWQ8aoFoedH3T2sq6iJ2yDWpHbP0f6MQbS9Gkg= golang.org/x/crypto v0.0.0-20180904163835-0709b304e793/go.mod h1:6SG95UA2DQfeDnfUPMdvaQW0Q7yPrPDi9nlGo2tz2b4= golang.org/x/crypto v0.0.0-20190308221718-c2843e01d9a2/go.mod h1:djNgcEr1/C05ACkg1iLfiJU5Ep61QUkGW8qpdssI0+w= golang.org/x/crypto v0.0.0-20190510104115-cbcb75029529/go.mod h1:yigFU9vqHzYiE8UmvKecakEJjdnWj3jj499lnFckfCI= diff --git a/pkg/translator/opencensus/go.mod b/pkg/translator/opencensus/go.mod index 4f7f0271dd5f..5233de81503d 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.66.0 github.com/stretchr/testify v1.8.1 go.opencensus.io v0.24.0 - go.opentelemetry.io/collector/pdata v0.66.1-0.20221128222955-4ff1ff379b90 - go.opentelemetry.io/collector/semconv v0.66.1-0.20221128222955-4ff1ff379b90 + go.opentelemetry.io/collector/pdata v0.66.1-0.20221202005155-1c54042beb70 + go.opentelemetry.io/collector/semconv v0.66.1-0.20221202005155-1c54042beb70 google.golang.org/protobuf v1.28.1 ) diff --git a/pkg/translator/opencensus/go.sum b/pkg/translator/opencensus/go.sum index c4830116a10b..51cca8bab245 100644 --- a/pkg/translator/opencensus/go.sum +++ b/pkg/translator/opencensus/go.sum @@ -76,10 +76,10 @@ github.com/yuin/goldmark v1.1.27/go.mod h1:3hX8gzYuyVAZsxl0MRgGTJEmQBFcNTphYh9de github.com/yuin/goldmark v1.2.1/go.mod h1:3hX8gzYuyVAZsxl0MRgGTJEmQBFcNTphYh9decYSb74= go.opencensus.io v0.24.0 h1:y73uSU6J157QMP2kn2r30vwW1A2W2WFwSCGnAVxeaD0= go.opencensus.io v0.24.0/go.mod h1:vNK8G9p7aAivkbmorf4v+7Hgx+Zs0yY+0fOtgBfjQKo= -go.opentelemetry.io/collector/pdata v0.66.1-0.20221128222955-4ff1ff379b90 h1:Vu4S4jSNcd0VFPzxQNO4+UqGwnes1xJDoFLPRiWHm8I= -go.opentelemetry.io/collector/pdata v0.66.1-0.20221128222955-4ff1ff379b90/go.mod h1:pqyaznLzk21m+1KL6fwOsRryRELL+zNM0qiVSn0MbVc= -go.opentelemetry.io/collector/semconv v0.66.1-0.20221128222955-4ff1ff379b90 h1:hFaTA68cggZKWMv7wQ3bKP8KGTbowh/5AQZKCHzHTqM= -go.opentelemetry.io/collector/semconv v0.66.1-0.20221128222955-4ff1ff379b90/go.mod h1:5o9yhOa+ABt7g2E5JABDxGZ1PQPbtfxrKNbYn+LOTXU= +go.opentelemetry.io/collector/pdata v0.66.1-0.20221202005155-1c54042beb70 h1:TPOrxkEMvZzfBSwF3ct+kUUgKA5g8unkZZbKQvJweeA= +go.opentelemetry.io/collector/pdata v0.66.1-0.20221202005155-1c54042beb70/go.mod h1:pqyaznLzk21m+1KL6fwOsRryRELL+zNM0qiVSn0MbVc= +go.opentelemetry.io/collector/semconv v0.66.1-0.20221202005155-1c54042beb70 h1:Q5L9Urod3c8as6ZYaoaqBjarx/HXxsxy34DFZIU2fO4= +go.opentelemetry.io/collector/semconv v0.66.1-0.20221202005155-1c54042beb70/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/prometheus/go.mod b/pkg/translator/prometheus/go.mod index 3ca56e29b05a..a845f4f5967a 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.66.0 github.com/stretchr/testify v1.8.1 - go.opentelemetry.io/collector/featuregate v0.66.1-0.20221128222955-4ff1ff379b90 - go.opentelemetry.io/collector/pdata v0.66.1-0.20221128222955-4ff1ff379b90 + go.opentelemetry.io/collector/featuregate v0.66.1-0.20221202005155-1c54042beb70 + go.opentelemetry.io/collector/pdata v0.66.1-0.20221202005155-1c54042beb70 ) require ( diff --git a/pkg/translator/prometheus/go.sum b/pkg/translator/prometheus/go.sum index a0b60e05c875..ed9dc2b7047d 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/featuregate v0.66.1-0.20221128222955-4ff1ff379b90 h1:UuJSFWbi9XxyNZsJKZuvpWg35BgRbcCGFH+38V2MAdw= -go.opentelemetry.io/collector/featuregate v0.66.1-0.20221128222955-4ff1ff379b90/go.mod h1:tewuFKJYalWBU0bmNKg++MC1ipINXUr6szYzOw2p1GI= -go.opentelemetry.io/collector/pdata v0.66.1-0.20221128222955-4ff1ff379b90 h1:Vu4S4jSNcd0VFPzxQNO4+UqGwnes1xJDoFLPRiWHm8I= -go.opentelemetry.io/collector/pdata v0.66.1-0.20221128222955-4ff1ff379b90/go.mod h1:pqyaznLzk21m+1KL6fwOsRryRELL+zNM0qiVSn0MbVc= +go.opentelemetry.io/collector/featuregate v0.66.1-0.20221202005155-1c54042beb70 h1:V0tf4ebciqIs07jFATfLGdUpLRaEsi+AiWuA/in0G8Y= +go.opentelemetry.io/collector/featuregate v0.66.1-0.20221202005155-1c54042beb70/go.mod h1:tewuFKJYalWBU0bmNKg++MC1ipINXUr6szYzOw2p1GI= +go.opentelemetry.io/collector/pdata v0.66.1-0.20221202005155-1c54042beb70 h1:TPOrxkEMvZzfBSwF3ct+kUUgKA5g8unkZZbKQvJweeA= +go.opentelemetry.io/collector/pdata v0.66.1-0.20221202005155-1c54042beb70/go.mod h1:pqyaznLzk21m+1KL6fwOsRryRELL+zNM0qiVSn0MbVc= 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/translator/prometheusremotewrite/go.mod b/pkg/translator/prometheusremotewrite/go.mod index ce7795266154..7871d286d530 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/consumer v0.66.1-0.20221128222955-4ff1ff379b90 - go.opentelemetry.io/collector/pdata v0.66.1-0.20221128222955-4ff1ff379b90 - go.opentelemetry.io/collector/semconv v0.66.1-0.20221128222955-4ff1ff379b90 + go.opentelemetry.io/collector/consumer v0.66.1-0.20221202005155-1c54042beb70 + go.opentelemetry.io/collector/pdata v0.66.1-0.20221202005155-1c54042beb70 + go.opentelemetry.io/collector/semconv v0.66.1-0.20221202005155-1c54042beb70 go.uber.org/multierr v1.8.0 ) @@ -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/rogpeppe/go-internal v1.9.0 // indirect - go.opentelemetry.io/collector/featuregate v0.66.1-0.20221128222955-4ff1ff379b90 // indirect + go.opentelemetry.io/collector/featuregate v0.66.1-0.20221202005155-1c54042beb70 // indirect go.uber.org/atomic v1.10.0 // indirect golang.org/x/net v0.0.0-20220809184613-07c6da5e1ced // indirect golang.org/x/sys v0.2.0 // indirect diff --git a/pkg/translator/prometheusremotewrite/go.sum b/pkg/translator/prometheusremotewrite/go.sum index 88e4a1204bd7..d2a5c2537572 100644 --- a/pkg/translator/prometheusremotewrite/go.sum +++ b/pkg/translator/prometheusremotewrite/go.sum @@ -213,15 +213,15 @@ go.opencensus.io v0.22.0/go.mod h1:+kGneAE2xo2IficOXnaByMWTGM9T73dGwxeWcUqIpI8= go.opencensus.io v0.22.2/go.mod h1:yxeiOL68Rb0Xd1ddK5vPZ/oVn4vY4Ynel7k9FzqtOIw= go.opencensus.io v0.22.3/go.mod h1:yxeiOL68Rb0Xd1ddK5vPZ/oVn4vY4Ynel7k9FzqtOIw= go.opencensus.io v0.22.4/go.mod h1:yxeiOL68Rb0Xd1ddK5vPZ/oVn4vY4Ynel7k9FzqtOIw= -go.opentelemetry.io/collector v0.66.1-0.20221128222955-4ff1ff379b90 h1:yRe05/jMdzH4TFHfndZ5h2o2hKBK/79W72j8w51qNsI= -go.opentelemetry.io/collector/consumer v0.66.1-0.20221128222955-4ff1ff379b90 h1:nzNXVfC1FzXBXCLMzbMv+qK3E4EGiNsnMhfVsBd2yzc= -go.opentelemetry.io/collector/consumer v0.66.1-0.20221128222955-4ff1ff379b90/go.mod h1:WtoRZa5SnxQO1ZEQdVxYpFcXCmq62rakv0oUSlPO0NQ= -go.opentelemetry.io/collector/featuregate v0.66.1-0.20221128222955-4ff1ff379b90 h1:UuJSFWbi9XxyNZsJKZuvpWg35BgRbcCGFH+38V2MAdw= -go.opentelemetry.io/collector/featuregate v0.66.1-0.20221128222955-4ff1ff379b90/go.mod h1:tewuFKJYalWBU0bmNKg++MC1ipINXUr6szYzOw2p1GI= -go.opentelemetry.io/collector/pdata v0.66.1-0.20221128222955-4ff1ff379b90 h1:Vu4S4jSNcd0VFPzxQNO4+UqGwnes1xJDoFLPRiWHm8I= -go.opentelemetry.io/collector/pdata v0.66.1-0.20221128222955-4ff1ff379b90/go.mod h1:pqyaznLzk21m+1KL6fwOsRryRELL+zNM0qiVSn0MbVc= -go.opentelemetry.io/collector/semconv v0.66.1-0.20221128222955-4ff1ff379b90 h1:hFaTA68cggZKWMv7wQ3bKP8KGTbowh/5AQZKCHzHTqM= -go.opentelemetry.io/collector/semconv v0.66.1-0.20221128222955-4ff1ff379b90/go.mod h1:5o9yhOa+ABt7g2E5JABDxGZ1PQPbtfxrKNbYn+LOTXU= +go.opentelemetry.io/collector v0.66.1-0.20221202005155-1c54042beb70 h1:INB2CsOtqqrija2KvMuIpbBQ3qX1BECEeR+d0NJX+oM= +go.opentelemetry.io/collector/consumer v0.66.1-0.20221202005155-1c54042beb70 h1:XwpVjI1KeKGPXOZBLefGILMziPYuNf6IzbmiIEsIyI0= +go.opentelemetry.io/collector/consumer v0.66.1-0.20221202005155-1c54042beb70/go.mod h1:EWVBcSGcIcmeDGTnIboc/aqa3agsBeH8/q7yFWG7xVc= +go.opentelemetry.io/collector/featuregate v0.66.1-0.20221202005155-1c54042beb70 h1:V0tf4ebciqIs07jFATfLGdUpLRaEsi+AiWuA/in0G8Y= +go.opentelemetry.io/collector/featuregate v0.66.1-0.20221202005155-1c54042beb70/go.mod h1:tewuFKJYalWBU0bmNKg++MC1ipINXUr6szYzOw2p1GI= +go.opentelemetry.io/collector/pdata v0.66.1-0.20221202005155-1c54042beb70 h1:TPOrxkEMvZzfBSwF3ct+kUUgKA5g8unkZZbKQvJweeA= +go.opentelemetry.io/collector/pdata v0.66.1-0.20221202005155-1c54042beb70/go.mod h1:pqyaznLzk21m+1KL6fwOsRryRELL+zNM0qiVSn0MbVc= +go.opentelemetry.io/collector/semconv v0.66.1-0.20221202005155-1c54042beb70 h1:Q5L9Urod3c8as6ZYaoaqBjarx/HXxsxy34DFZIU2fO4= +go.opentelemetry.io/collector/semconv v0.66.1-0.20221202005155-1c54042beb70/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 c0bb555ce0e6..c4217bff3b7c 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.66.0 github.com/signalfx/com_signalfx_metrics_protobuf v0.0.3 github.com/stretchr/testify v1.8.1 - go.opentelemetry.io/collector/pdata v0.66.1-0.20221128222955-4ff1ff379b90 + go.opentelemetry.io/collector/pdata v0.66.1-0.20221202005155-1c54042beb70 go.uber.org/multierr v1.8.0 ) diff --git a/pkg/translator/signalfx/go.sum b/pkg/translator/signalfx/go.sum index ca141ae245b8..fc89c01368f8 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.66.1-0.20221128222955-4ff1ff379b90 h1:Vu4S4jSNcd0VFPzxQNO4+UqGwnes1xJDoFLPRiWHm8I= -go.opentelemetry.io/collector/pdata v0.66.1-0.20221128222955-4ff1ff379b90/go.mod h1:pqyaznLzk21m+1KL6fwOsRryRELL+zNM0qiVSn0MbVc= +go.opentelemetry.io/collector/pdata v0.66.1-0.20221202005155-1c54042beb70 h1:TPOrxkEMvZzfBSwF3ct+kUUgKA5g8unkZZbKQvJweeA= +go.opentelemetry.io/collector/pdata v0.66.1-0.20221202005155-1c54042beb70/go.mod h1:pqyaznLzk21m+1KL6fwOsRryRELL+zNM0qiVSn0MbVc= 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 d6816a7ca17f..b797a1d9d4db 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.66.0 github.com/openzipkin/zipkin-go v0.4.1 github.com/stretchr/testify v1.8.1 - go.opentelemetry.io/collector/pdata v0.66.1-0.20221128222955-4ff1ff379b90 - go.opentelemetry.io/collector/semconv v0.66.1-0.20221128222955-4ff1ff379b90 + go.opentelemetry.io/collector/pdata v0.66.1-0.20221202005155-1c54042beb70 + go.opentelemetry.io/collector/semconv v0.66.1-0.20221202005155-1c54042beb70 ) require ( @@ -25,7 +25,7 @@ require ( github.com/uber/jaeger-lib v2.4.1+incompatible // indirect go.uber.org/atomic v1.10.0 // indirect go.uber.org/multierr v1.8.0 // indirect - go.uber.org/zap v1.23.0 // indirect + go.uber.org/zap v1.24.0 // indirect golang.org/x/net v0.0.0-20221014081412-f15817d10f9b // indirect golang.org/x/sys v0.2.0 // indirect golang.org/x/text v0.4.0 // indirect diff --git a/pkg/translator/zipkin/go.sum b/pkg/translator/zipkin/go.sum index b2da86beced5..576acf601739 100644 --- a/pkg/translator/zipkin/go.sum +++ b/pkg/translator/zipkin/go.sum @@ -50,18 +50,18 @@ 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.66.1-0.20221128222955-4ff1ff379b90 h1:Vu4S4jSNcd0VFPzxQNO4+UqGwnes1xJDoFLPRiWHm8I= -go.opentelemetry.io/collector/pdata v0.66.1-0.20221128222955-4ff1ff379b90/go.mod h1:pqyaznLzk21m+1KL6fwOsRryRELL+zNM0qiVSn0MbVc= -go.opentelemetry.io/collector/semconv v0.66.1-0.20221128222955-4ff1ff379b90 h1:hFaTA68cggZKWMv7wQ3bKP8KGTbowh/5AQZKCHzHTqM= -go.opentelemetry.io/collector/semconv v0.66.1-0.20221128222955-4ff1ff379b90/go.mod h1:5o9yhOa+ABt7g2E5JABDxGZ1PQPbtfxrKNbYn+LOTXU= +go.opentelemetry.io/collector/pdata v0.66.1-0.20221202005155-1c54042beb70 h1:TPOrxkEMvZzfBSwF3ct+kUUgKA5g8unkZZbKQvJweeA= +go.opentelemetry.io/collector/pdata v0.66.1-0.20221202005155-1c54042beb70/go.mod h1:pqyaznLzk21m+1KL6fwOsRryRELL+zNM0qiVSn0MbVc= +go.opentelemetry.io/collector/semconv v0.66.1-0.20221202005155-1c54042beb70 h1:Q5L9Urod3c8as6ZYaoaqBjarx/HXxsxy34DFZIU2fO4= +go.opentelemetry.io/collector/semconv v0.66.1-0.20221202005155-1c54042beb70/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= go.uber.org/goleak v1.1.11 h1:wy28qYRKZgnJTxGxvye5/wgWr1EKjmUDGYox5mGlRlI= go.uber.org/multierr v1.8.0 h1:dg6GjLku4EH+249NNmoIciG9N/jURbDG+pFlTkhzIC8= go.uber.org/multierr v1.8.0/go.mod h1:7EAYxJLBy9rStEaz58O2t4Uvip6FSURkq8/ppBp95ak= -go.uber.org/zap v1.23.0 h1:OjGQ5KQDEUawVHxNwQgPpiypGHOxo2mNZsOqTak4fFY= -go.uber.org/zap v1.23.0/go.mod h1:D+nX8jyLsMHMYrln8A0rJjFt/T/9/bGgIhAqxv5URuY= +go.uber.org/zap v1.24.0 h1:FiJd5l1UOLj0wCgbSE0rwwXHzEdAZS6hiiSnxJN/D60= +go.uber.org/zap v1.24.0/go.mod h1:2kMP+WWQ8aoFoedH3T2sq6iJ2yDWpHbP0f6MQbS9Gkg= 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/processor/attributesprocessor/config.go b/processor/attributesprocessor/config.go index d66915e8d724..1def022cdf9d 100644 --- a/processor/attributesprocessor/config.go +++ b/processor/attributesprocessor/config.go @@ -15,6 +15,8 @@ package attributesprocessor // import "github.com/open-telemetry/opentelemetry-collector-contrib/processor/attributesprocessor" import ( + "errors" + "go.opentelemetry.io/collector/component" "go.opentelemetry.io/collector/config" @@ -44,5 +46,8 @@ var _ component.Config = (*Config)(nil) // Validate checks if the processor configuration is valid func (cfg *Config) Validate() error { + if len(cfg.Actions) == 0 { + return errors.New("missing required field \"actions\"") + } return nil } diff --git a/processor/attributesprocessor/factory.go b/processor/attributesprocessor/factory.go index c7c5c4d1a56a..39dec38fc02e 100644 --- a/processor/attributesprocessor/factory.go +++ b/processor/attributesprocessor/factory.go @@ -16,7 +16,6 @@ package attributesprocessor // import "github.com/open-telemetry/opentelemetry-c import ( "context" - "fmt" "go.opentelemetry.io/collector/component" "go.opentelemetry.io/collector/config" @@ -62,12 +61,9 @@ func createTracesProcessor( nextConsumer consumer.Traces, ) (component.TracesProcessor, error) { oCfg := cfg.(*Config) - if len(oCfg.Actions) == 0 { - return nil, fmt.Errorf("error creating \"attributes\" processor due to missing required field \"actions\" of processor %v", cfg.ID()) - } attrProc, err := attraction.NewAttrProc(&oCfg.Settings) if err != nil { - return nil, fmt.Errorf("error creating \"attributes\" processor %v: %w", cfg.ID(), err) + return nil, err } skipExpr, err := filterspan.NewSkipExpr(&oCfg.MatchConfig) if err != nil { @@ -89,12 +85,9 @@ func createLogsProcessor( nextConsumer consumer.Logs, ) (component.LogsProcessor, error) { oCfg := cfg.(*Config) - if len(oCfg.Actions) == 0 { - return nil, fmt.Errorf("error creating \"attributes\" processor due to missing required field \"actions\" of processor %v", cfg.ID()) - } attrProc, err := attraction.NewAttrProc(&oCfg.Settings) if err != nil { - return nil, fmt.Errorf("error creating \"attributes\" processor %v: %w", cfg.ID(), err) + return nil, err } skipExpr, err := filterlog.NewSkipExpr(&oCfg.MatchConfig) @@ -119,13 +112,9 @@ func createMetricsProcessor( ) (component.MetricsProcessor, error) { oCfg := cfg.(*Config) - if len(oCfg.Actions) == 0 { - return nil, fmt.Errorf("error creating \"attributes\" processor due to missing required field \"actions\" of processor %v", cfg.ID()) - } - attrProc, err := attraction.NewAttrProc(&oCfg.Settings) if err != nil { - return nil, fmt.Errorf("error creating \"attributes\" processor %v: %w", cfg.ID(), err) + return nil, err } skipExpr, err := filtermetric.NewSkipExpr( diff --git a/processor/attributesprocessor/factory_test.go b/processor/attributesprocessor/factory_test.go index 267e6498e8e5..ed663d44aa62 100644 --- a/processor/attributesprocessor/factory_test.go +++ b/processor/attributesprocessor/factory_test.go @@ -42,12 +42,10 @@ func TestFactory_CreateDefaultConfig(t *testing.T) { assert.NoError(t, componenttest.CheckConfigStruct(cfg)) } -func TestFactoryCreateTracesProcessor_EmptyActions(t *testing.T) { +func TestValidateConfig(t *testing.T) { factory := NewFactory() cfg := factory.CreateDefaultConfig() - ap, err := factory.CreateTracesProcessor(context.Background(), componenttest.NewNopProcessorCreateSettings(), cfg, consumertest.NewNop()) - assert.Error(t, err) - assert.Nil(t, ap) + assert.Error(t, component.ValidateConfig(cfg)) } func TestFactoryCreateTracesProcessor_InvalidActions(t *testing.T) { @@ -67,7 +65,7 @@ func TestFactoryCreateTracesProcessor_InvalidActions(t *testing.T) { } ap2, err2 := factory.CreateTracesProcessor(context.Background(), componenttest.NewNopProcessorCreateSettings(), cfg, consumertest.NewNop()) assert.Error(t, err2) - assert.Equal(t, "error creating \"attributes\" processor attributes: error creating AttrProc due to invalid value \"array\" in field \"converted_type\" for action \"convert\" at the 0-th action", err2.Error()) + assert.Equal(t, "error creating AttrProc due to invalid value \"array\" in field \"converted_type\" for action \"convert\" at the 0-th action", err2.Error()) assert.Nil(t, ap2) } @@ -98,17 +96,11 @@ func TestFactoryCreateTracesProcessor(t *testing.T) { func TestFactory_CreateMetricsProcessor(t *testing.T) { factory := NewFactory() cfg := factory.CreateDefaultConfig() - - // Create should fail without any actions - mp, err := factory.CreateMetricsProcessor(context.Background(), componenttest.NewNopProcessorCreateSettings(), cfg, consumertest.NewNop()) - require.Nil(t, mp) - assert.Error(t, err) - cfg.(*Config).Actions = []attraction.ActionKeyValue{ {Key: "fake_key", Action: attraction.INSERT, Value: "100"}, } - mp, err = factory.CreateMetricsProcessor(context.Background(), componenttest.NewNopProcessorCreateSettings(), cfg, consumertest.NewNop()) + mp, err := factory.CreateMetricsProcessor(context.Background(), componenttest.NewNopProcessorCreateSettings(), cfg, consumertest.NewNop()) require.NotNil(t, mp) require.NoError(t, err) @@ -126,14 +118,6 @@ func TestFactory_CreateMetricsProcessor(t *testing.T) { require.Error(t, err) } -func TestFactoryCreateLogsProcessor_EmptyActions(t *testing.T) { - factory := NewFactory() - cfg := factory.CreateDefaultConfig() - ap, err := factory.CreateLogsProcessor(context.Background(), componenttest.NewNopProcessorCreateSettings(), cfg, consumertest.NewNop()) - assert.Error(t, err) - assert.Nil(t, ap) -} - func TestFactoryCreateLogsProcessor_InvalidActions(t *testing.T) { factory := NewFactory() cfg := factory.CreateDefaultConfig() diff --git a/processor/attributesprocessor/go.mod b/processor/attributesprocessor/go.mod index 9b2b479b1ec5..f1efee1e0b35 100644 --- a/processor/attributesprocessor/go.mod +++ b/processor/attributesprocessor/go.mod @@ -7,12 +7,13 @@ require ( github.com/open-telemetry/opentelemetry-collector-contrib/internal/filter v0.66.0 github.com/open-telemetry/opentelemetry-collector-contrib/pkg/ottl v0.66.0 github.com/stretchr/testify v1.8.1 - go.opentelemetry.io/collector v0.66.1-0.20221128222955-4ff1ff379b90 - go.opentelemetry.io/collector/component v0.66.1-0.20221128222955-4ff1ff379b90 - go.opentelemetry.io/collector/consumer v0.66.1-0.20221128222955-4ff1ff379b90 - go.opentelemetry.io/collector/pdata v0.66.1-0.20221128222955-4ff1ff379b90 - go.opentelemetry.io/collector/semconv v0.66.1-0.20221128222955-4ff1ff379b90 - go.uber.org/zap v1.23.0 + go.opentelemetry.io/collector v0.66.1-0.20221202005155-1c54042beb70 + go.opentelemetry.io/collector/component v0.66.1-0.20221202005155-1c54042beb70 + go.opentelemetry.io/collector/confmap v0.0.0-20221201172708-2bdff61fa52a + go.opentelemetry.io/collector/consumer v0.66.1-0.20221202005155-1c54042beb70 + go.opentelemetry.io/collector/pdata v0.66.1-0.20221202005155-1c54042beb70 + go.opentelemetry.io/collector/semconv v0.66.1-0.20221202005155-1c54042beb70 + go.uber.org/zap v1.24.0 ) require ( @@ -31,7 +32,7 @@ require ( github.com/modern-go/reflect2 v1.0.2 // indirect github.com/pmezard/go-difflib v1.0.0 // indirect go.opencensus.io v0.24.0 // indirect - go.opentelemetry.io/collector/featuregate v0.66.1-0.20221128222955-4ff1ff379b90 // indirect + go.opentelemetry.io/collector/featuregate v0.66.1-0.20221202005155-1c54042beb70 // 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 91d1d71d4f4e..b451e38c6a7f 100644 --- a/processor/attributesprocessor/go.sum +++ b/processor/attributesprocessor/go.sum @@ -278,18 +278,20 @@ go.etcd.io/etcd/client/pkg/v3 v3.5.4/go.mod h1:IJHfcCEKxYu1Os13ZdwCwIUTUVGYTSAM3 go.etcd.io/etcd/client/v3 v3.5.4/go.mod h1:ZaRkVgBZC+L+dLCjTcF1hRXpgZXQPOvnA/Ak/gq3kiY= go.opencensus.io v0.24.0 h1:y73uSU6J157QMP2kn2r30vwW1A2W2WFwSCGnAVxeaD0= go.opencensus.io v0.24.0/go.mod h1:vNK8G9p7aAivkbmorf4v+7Hgx+Zs0yY+0fOtgBfjQKo= -go.opentelemetry.io/collector v0.66.1-0.20221128222955-4ff1ff379b90 h1:yRe05/jMdzH4TFHfndZ5h2o2hKBK/79W72j8w51qNsI= -go.opentelemetry.io/collector v0.66.1-0.20221128222955-4ff1ff379b90/go.mod h1:hE6jCs+0rfiufCrVPucKZTMwfHit1okfDPnwPT2eW1I= -go.opentelemetry.io/collector/component v0.66.1-0.20221128222955-4ff1ff379b90 h1:AYSNTXbezhNg43EuYdVVcgxE/2gBVrm00FDx4DOmQVg= -go.opentelemetry.io/collector/component v0.66.1-0.20221128222955-4ff1ff379b90/go.mod h1:0c84EqXUhvYe6KW7hJfh76tiI/5yjWCH2amwyQ06XLM= -go.opentelemetry.io/collector/consumer v0.66.1-0.20221128222955-4ff1ff379b90 h1:nzNXVfC1FzXBXCLMzbMv+qK3E4EGiNsnMhfVsBd2yzc= -go.opentelemetry.io/collector/consumer v0.66.1-0.20221128222955-4ff1ff379b90/go.mod h1:WtoRZa5SnxQO1ZEQdVxYpFcXCmq62rakv0oUSlPO0NQ= -go.opentelemetry.io/collector/featuregate v0.66.1-0.20221128222955-4ff1ff379b90 h1:UuJSFWbi9XxyNZsJKZuvpWg35BgRbcCGFH+38V2MAdw= -go.opentelemetry.io/collector/featuregate v0.66.1-0.20221128222955-4ff1ff379b90/go.mod h1:tewuFKJYalWBU0bmNKg++MC1ipINXUr6szYzOw2p1GI= -go.opentelemetry.io/collector/pdata v0.66.1-0.20221128222955-4ff1ff379b90 h1:Vu4S4jSNcd0VFPzxQNO4+UqGwnes1xJDoFLPRiWHm8I= -go.opentelemetry.io/collector/pdata v0.66.1-0.20221128222955-4ff1ff379b90/go.mod h1:pqyaznLzk21m+1KL6fwOsRryRELL+zNM0qiVSn0MbVc= -go.opentelemetry.io/collector/semconv v0.66.1-0.20221128222955-4ff1ff379b90 h1:hFaTA68cggZKWMv7wQ3bKP8KGTbowh/5AQZKCHzHTqM= -go.opentelemetry.io/collector/semconv v0.66.1-0.20221128222955-4ff1ff379b90/go.mod h1:5o9yhOa+ABt7g2E5JABDxGZ1PQPbtfxrKNbYn+LOTXU= +go.opentelemetry.io/collector v0.66.1-0.20221202005155-1c54042beb70 h1:INB2CsOtqqrija2KvMuIpbBQ3qX1BECEeR+d0NJX+oM= +go.opentelemetry.io/collector v0.66.1-0.20221202005155-1c54042beb70/go.mod h1:d0NHkHyANJy3HDTvYE/PoylMShUmFIbiir89ieI0X0c= +go.opentelemetry.io/collector/component v0.66.1-0.20221202005155-1c54042beb70 h1:dEoJhzCmRShgmVro/kXm6pouGElgxkH2DsvanzCeZtU= +go.opentelemetry.io/collector/component v0.66.1-0.20221202005155-1c54042beb70/go.mod h1:OsVnvFFe38QSpcuZlQ8cvarDzcloCexgQ1/B2m80F6U= +go.opentelemetry.io/collector/confmap v0.0.0-20221201172708-2bdff61fa52a h1:2TscCXAQASO2kU9xHcMIUM/FP29fiQIRTilZmliq/7I= +go.opentelemetry.io/collector/confmap v0.0.0-20221201172708-2bdff61fa52a/go.mod h1:qJ3e8bA8h4wz/jYlbeEUafVHdrU7DkpStnmIUAz6VTQ= +go.opentelemetry.io/collector/consumer v0.66.1-0.20221202005155-1c54042beb70 h1:XwpVjI1KeKGPXOZBLefGILMziPYuNf6IzbmiIEsIyI0= +go.opentelemetry.io/collector/consumer v0.66.1-0.20221202005155-1c54042beb70/go.mod h1:EWVBcSGcIcmeDGTnIboc/aqa3agsBeH8/q7yFWG7xVc= +go.opentelemetry.io/collector/featuregate v0.66.1-0.20221202005155-1c54042beb70 h1:V0tf4ebciqIs07jFATfLGdUpLRaEsi+AiWuA/in0G8Y= +go.opentelemetry.io/collector/featuregate v0.66.1-0.20221202005155-1c54042beb70/go.mod h1:tewuFKJYalWBU0bmNKg++MC1ipINXUr6szYzOw2p1GI= +go.opentelemetry.io/collector/pdata v0.66.1-0.20221202005155-1c54042beb70 h1:TPOrxkEMvZzfBSwF3ct+kUUgKA5g8unkZZbKQvJweeA= +go.opentelemetry.io/collector/pdata v0.66.1-0.20221202005155-1c54042beb70/go.mod h1:pqyaznLzk21m+1KL6fwOsRryRELL+zNM0qiVSn0MbVc= +go.opentelemetry.io/collector/semconv v0.66.1-0.20221202005155-1c54042beb70 h1:Q5L9Urod3c8as6ZYaoaqBjarx/HXxsxy34DFZIU2fO4= +go.opentelemetry.io/collector/semconv v0.66.1-0.20221202005155-1c54042beb70/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= @@ -304,8 +306,8 @@ go.uber.org/multierr v1.6.0/go.mod h1:cdWPpRnG4AhwMwsgIHip0KRBQjJy5kYEpYjJxpXp9i go.uber.org/multierr v1.8.0 h1:dg6GjLku4EH+249NNmoIciG9N/jURbDG+pFlTkhzIC8= go.uber.org/multierr v1.8.0/go.mod h1:7EAYxJLBy9rStEaz58O2t4Uvip6FSURkq8/ppBp95ak= go.uber.org/zap v1.17.0/go.mod h1:MXVU+bhUf/A7Xi2HNOnopQOrmycQ5Ih87HtOu4q5SSo= -go.uber.org/zap v1.23.0 h1:OjGQ5KQDEUawVHxNwQgPpiypGHOxo2mNZsOqTak4fFY= -go.uber.org/zap v1.23.0/go.mod h1:D+nX8jyLsMHMYrln8A0rJjFt/T/9/bGgIhAqxv5URuY= +go.uber.org/zap v1.24.0 h1:FiJd5l1UOLj0wCgbSE0rwwXHzEdAZS6hiiSnxJN/D60= +go.uber.org/zap v1.24.0/go.mod h1:2kMP+WWQ8aoFoedH3T2sq6iJ2yDWpHbP0f6MQbS9Gkg= golang.org/x/crypto v0.0.0-20180904163835-0709b304e793/go.mod h1:6SG95UA2DQfeDnfUPMdvaQW0Q7yPrPDi9nlGo2tz2b4= golang.org/x/crypto v0.0.0-20190308221718-c2843e01d9a2/go.mod h1:djNgcEr1/C05ACkg1iLfiJU5Ep61QUkGW8qpdssI0+w= golang.org/x/crypto v0.0.0-20190923035154-9ee001bba392/go.mod h1:/lpIB1dKB+9EgE3H3cr1v9wB50oz8l4C4h62xy7jSTY= diff --git a/processor/cumulativetodeltaprocessor/go.mod b/processor/cumulativetodeltaprocessor/go.mod index 07bcdf5cb223..9ae63f5e089f 100644 --- a/processor/cumulativetodeltaprocessor/go.mod +++ b/processor/cumulativetodeltaprocessor/go.mod @@ -5,13 +5,14 @@ go 1.18 require ( github.com/open-telemetry/opentelemetry-collector-contrib/internal/filter v0.66.0 github.com/stretchr/testify v1.8.1 - go.opentelemetry.io/collector v0.66.1-0.20221128222955-4ff1ff379b90 - go.opentelemetry.io/collector/component v0.66.1-0.20221128222955-4ff1ff379b90 - go.opentelemetry.io/collector/consumer v0.66.1-0.20221128222955-4ff1ff379b90 - go.opentelemetry.io/collector/featuregate v0.66.1-0.20221128222955-4ff1ff379b90 - go.opentelemetry.io/collector/pdata v0.66.1-0.20221128222955-4ff1ff379b90 + go.opentelemetry.io/collector v0.66.1-0.20221202005155-1c54042beb70 + go.opentelemetry.io/collector/component v0.66.1-0.20221202005155-1c54042beb70 + go.opentelemetry.io/collector/confmap v0.0.0-20221201172708-2bdff61fa52a + go.opentelemetry.io/collector/consumer v0.66.1-0.20221202005155-1c54042beb70 + go.opentelemetry.io/collector/featuregate v0.66.1-0.20221202005155-1c54042beb70 + go.opentelemetry.io/collector/pdata v0.66.1-0.20221202005155-1c54042beb70 go.uber.org/atomic v1.10.0 - go.uber.org/zap v1.23.0 + go.uber.org/zap v1.24.0 ) require ( diff --git a/processor/cumulativetodeltaprocessor/go.sum b/processor/cumulativetodeltaprocessor/go.sum index 6199bef6fe13..314ac4066259 100644 --- a/processor/cumulativetodeltaprocessor/go.sum +++ b/processor/cumulativetodeltaprocessor/go.sum @@ -257,16 +257,18 @@ go.etcd.io/etcd/client/pkg/v3 v3.5.4/go.mod h1:IJHfcCEKxYu1Os13ZdwCwIUTUVGYTSAM3 go.etcd.io/etcd/client/v3 v3.5.4/go.mod h1:ZaRkVgBZC+L+dLCjTcF1hRXpgZXQPOvnA/Ak/gq3kiY= go.opencensus.io v0.24.0 h1:y73uSU6J157QMP2kn2r30vwW1A2W2WFwSCGnAVxeaD0= go.opencensus.io v0.24.0/go.mod h1:vNK8G9p7aAivkbmorf4v+7Hgx+Zs0yY+0fOtgBfjQKo= -go.opentelemetry.io/collector v0.66.1-0.20221128222955-4ff1ff379b90 h1:yRe05/jMdzH4TFHfndZ5h2o2hKBK/79W72j8w51qNsI= -go.opentelemetry.io/collector v0.66.1-0.20221128222955-4ff1ff379b90/go.mod h1:hE6jCs+0rfiufCrVPucKZTMwfHit1okfDPnwPT2eW1I= -go.opentelemetry.io/collector/component v0.66.1-0.20221128222955-4ff1ff379b90 h1:AYSNTXbezhNg43EuYdVVcgxE/2gBVrm00FDx4DOmQVg= -go.opentelemetry.io/collector/component v0.66.1-0.20221128222955-4ff1ff379b90/go.mod h1:0c84EqXUhvYe6KW7hJfh76tiI/5yjWCH2amwyQ06XLM= -go.opentelemetry.io/collector/consumer v0.66.1-0.20221128222955-4ff1ff379b90 h1:nzNXVfC1FzXBXCLMzbMv+qK3E4EGiNsnMhfVsBd2yzc= -go.opentelemetry.io/collector/consumer v0.66.1-0.20221128222955-4ff1ff379b90/go.mod h1:WtoRZa5SnxQO1ZEQdVxYpFcXCmq62rakv0oUSlPO0NQ= -go.opentelemetry.io/collector/featuregate v0.66.1-0.20221128222955-4ff1ff379b90 h1:UuJSFWbi9XxyNZsJKZuvpWg35BgRbcCGFH+38V2MAdw= -go.opentelemetry.io/collector/featuregate v0.66.1-0.20221128222955-4ff1ff379b90/go.mod h1:tewuFKJYalWBU0bmNKg++MC1ipINXUr6szYzOw2p1GI= -go.opentelemetry.io/collector/pdata v0.66.1-0.20221128222955-4ff1ff379b90 h1:Vu4S4jSNcd0VFPzxQNO4+UqGwnes1xJDoFLPRiWHm8I= -go.opentelemetry.io/collector/pdata v0.66.1-0.20221128222955-4ff1ff379b90/go.mod h1:pqyaznLzk21m+1KL6fwOsRryRELL+zNM0qiVSn0MbVc= +go.opentelemetry.io/collector v0.66.1-0.20221202005155-1c54042beb70 h1:INB2CsOtqqrija2KvMuIpbBQ3qX1BECEeR+d0NJX+oM= +go.opentelemetry.io/collector v0.66.1-0.20221202005155-1c54042beb70/go.mod h1:d0NHkHyANJy3HDTvYE/PoylMShUmFIbiir89ieI0X0c= +go.opentelemetry.io/collector/component v0.66.1-0.20221202005155-1c54042beb70 h1:dEoJhzCmRShgmVro/kXm6pouGElgxkH2DsvanzCeZtU= +go.opentelemetry.io/collector/component v0.66.1-0.20221202005155-1c54042beb70/go.mod h1:OsVnvFFe38QSpcuZlQ8cvarDzcloCexgQ1/B2m80F6U= +go.opentelemetry.io/collector/confmap v0.0.0-20221201172708-2bdff61fa52a h1:2TscCXAQASO2kU9xHcMIUM/FP29fiQIRTilZmliq/7I= +go.opentelemetry.io/collector/confmap v0.0.0-20221201172708-2bdff61fa52a/go.mod h1:qJ3e8bA8h4wz/jYlbeEUafVHdrU7DkpStnmIUAz6VTQ= +go.opentelemetry.io/collector/consumer v0.66.1-0.20221202005155-1c54042beb70 h1:XwpVjI1KeKGPXOZBLefGILMziPYuNf6IzbmiIEsIyI0= +go.opentelemetry.io/collector/consumer v0.66.1-0.20221202005155-1c54042beb70/go.mod h1:EWVBcSGcIcmeDGTnIboc/aqa3agsBeH8/q7yFWG7xVc= +go.opentelemetry.io/collector/featuregate v0.66.1-0.20221202005155-1c54042beb70 h1:V0tf4ebciqIs07jFATfLGdUpLRaEsi+AiWuA/in0G8Y= +go.opentelemetry.io/collector/featuregate v0.66.1-0.20221202005155-1c54042beb70/go.mod h1:tewuFKJYalWBU0bmNKg++MC1ipINXUr6szYzOw2p1GI= +go.opentelemetry.io/collector/pdata v0.66.1-0.20221202005155-1c54042beb70 h1:TPOrxkEMvZzfBSwF3ct+kUUgKA5g8unkZZbKQvJweeA= +go.opentelemetry.io/collector/pdata v0.66.1-0.20221202005155-1c54042beb70/go.mod h1:pqyaznLzk21m+1KL6fwOsRryRELL+zNM0qiVSn0MbVc= 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= @@ -281,8 +283,8 @@ go.uber.org/multierr v1.6.0/go.mod h1:cdWPpRnG4AhwMwsgIHip0KRBQjJy5kYEpYjJxpXp9i go.uber.org/multierr v1.8.0 h1:dg6GjLku4EH+249NNmoIciG9N/jURbDG+pFlTkhzIC8= go.uber.org/multierr v1.8.0/go.mod h1:7EAYxJLBy9rStEaz58O2t4Uvip6FSURkq8/ppBp95ak= go.uber.org/zap v1.17.0/go.mod h1:MXVU+bhUf/A7Xi2HNOnopQOrmycQ5Ih87HtOu4q5SSo= -go.uber.org/zap v1.23.0 h1:OjGQ5KQDEUawVHxNwQgPpiypGHOxo2mNZsOqTak4fFY= -go.uber.org/zap v1.23.0/go.mod h1:D+nX8jyLsMHMYrln8A0rJjFt/T/9/bGgIhAqxv5URuY= +go.uber.org/zap v1.24.0 h1:FiJd5l1UOLj0wCgbSE0rwwXHzEdAZS6hiiSnxJN/D60= +go.uber.org/zap v1.24.0/go.mod h1:2kMP+WWQ8aoFoedH3T2sq6iJ2yDWpHbP0f6MQbS9Gkg= golang.org/x/crypto v0.0.0-20180904163835-0709b304e793/go.mod h1:6SG95UA2DQfeDnfUPMdvaQW0Q7yPrPDi9nlGo2tz2b4= golang.org/x/crypto v0.0.0-20190308221718-c2843e01d9a2/go.mod h1:djNgcEr1/C05ACkg1iLfiJU5Ep61QUkGW8qpdssI0+w= golang.org/x/crypto v0.0.0-20190923035154-9ee001bba392/go.mod h1:/lpIB1dKB+9EgE3H3cr1v9wB50oz8l4C4h62xy7jSTY= diff --git a/processor/deltatorateprocessor/go.mod b/processor/deltatorateprocessor/go.mod index 161e16e152d7..9c0f4dbb3b71 100644 --- a/processor/deltatorateprocessor/go.mod +++ b/processor/deltatorateprocessor/go.mod @@ -4,11 +4,12 @@ go 1.18 require ( github.com/stretchr/testify v1.8.1 - go.opentelemetry.io/collector v0.66.1-0.20221128222955-4ff1ff379b90 - go.opentelemetry.io/collector/component v0.66.1-0.20221128222955-4ff1ff379b90 - go.opentelemetry.io/collector/consumer v0.66.1-0.20221128222955-4ff1ff379b90 - go.opentelemetry.io/collector/pdata v0.66.1-0.20221128222955-4ff1ff379b90 - go.uber.org/zap v1.23.0 + go.opentelemetry.io/collector v0.66.1-0.20221202005155-1c54042beb70 + go.opentelemetry.io/collector/component v0.66.1-0.20221202005155-1c54042beb70 + go.opentelemetry.io/collector/confmap v0.0.0-20221201172708-2bdff61fa52a + go.opentelemetry.io/collector/consumer v0.66.1-0.20221202005155-1c54042beb70 + go.opentelemetry.io/collector/pdata v0.66.1-0.20221202005155-1c54042beb70 + go.uber.org/zap v1.24.0 ) require ( @@ -27,7 +28,7 @@ require ( github.com/pelletier/go-toml v1.9.4 // indirect github.com/pmezard/go-difflib v1.0.0 // indirect go.opencensus.io v0.24.0 // indirect - go.opentelemetry.io/collector/featuregate v0.66.1-0.20221128222955-4ff1ff379b90 // indirect + go.opentelemetry.io/collector/featuregate v0.66.1-0.20221202005155-1c54042beb70 // 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 c80d33698554..0535e9dd98d3 100644 --- a/processor/deltatorateprocessor/go.sum +++ b/processor/deltatorateprocessor/go.sum @@ -270,16 +270,18 @@ go.etcd.io/etcd/client/pkg/v3 v3.5.4/go.mod h1:IJHfcCEKxYu1Os13ZdwCwIUTUVGYTSAM3 go.etcd.io/etcd/client/v3 v3.5.4/go.mod h1:ZaRkVgBZC+L+dLCjTcF1hRXpgZXQPOvnA/Ak/gq3kiY= go.opencensus.io v0.24.0 h1:y73uSU6J157QMP2kn2r30vwW1A2W2WFwSCGnAVxeaD0= go.opencensus.io v0.24.0/go.mod h1:vNK8G9p7aAivkbmorf4v+7Hgx+Zs0yY+0fOtgBfjQKo= -go.opentelemetry.io/collector v0.66.1-0.20221128222955-4ff1ff379b90 h1:yRe05/jMdzH4TFHfndZ5h2o2hKBK/79W72j8w51qNsI= -go.opentelemetry.io/collector v0.66.1-0.20221128222955-4ff1ff379b90/go.mod h1:hE6jCs+0rfiufCrVPucKZTMwfHit1okfDPnwPT2eW1I= -go.opentelemetry.io/collector/component v0.66.1-0.20221128222955-4ff1ff379b90 h1:AYSNTXbezhNg43EuYdVVcgxE/2gBVrm00FDx4DOmQVg= -go.opentelemetry.io/collector/component v0.66.1-0.20221128222955-4ff1ff379b90/go.mod h1:0c84EqXUhvYe6KW7hJfh76tiI/5yjWCH2amwyQ06XLM= -go.opentelemetry.io/collector/consumer v0.66.1-0.20221128222955-4ff1ff379b90 h1:nzNXVfC1FzXBXCLMzbMv+qK3E4EGiNsnMhfVsBd2yzc= -go.opentelemetry.io/collector/consumer v0.66.1-0.20221128222955-4ff1ff379b90/go.mod h1:WtoRZa5SnxQO1ZEQdVxYpFcXCmq62rakv0oUSlPO0NQ= -go.opentelemetry.io/collector/featuregate v0.66.1-0.20221128222955-4ff1ff379b90 h1:UuJSFWbi9XxyNZsJKZuvpWg35BgRbcCGFH+38V2MAdw= -go.opentelemetry.io/collector/featuregate v0.66.1-0.20221128222955-4ff1ff379b90/go.mod h1:tewuFKJYalWBU0bmNKg++MC1ipINXUr6szYzOw2p1GI= -go.opentelemetry.io/collector/pdata v0.66.1-0.20221128222955-4ff1ff379b90 h1:Vu4S4jSNcd0VFPzxQNO4+UqGwnes1xJDoFLPRiWHm8I= -go.opentelemetry.io/collector/pdata v0.66.1-0.20221128222955-4ff1ff379b90/go.mod h1:pqyaznLzk21m+1KL6fwOsRryRELL+zNM0qiVSn0MbVc= +go.opentelemetry.io/collector v0.66.1-0.20221202005155-1c54042beb70 h1:INB2CsOtqqrija2KvMuIpbBQ3qX1BECEeR+d0NJX+oM= +go.opentelemetry.io/collector v0.66.1-0.20221202005155-1c54042beb70/go.mod h1:d0NHkHyANJy3HDTvYE/PoylMShUmFIbiir89ieI0X0c= +go.opentelemetry.io/collector/component v0.66.1-0.20221202005155-1c54042beb70 h1:dEoJhzCmRShgmVro/kXm6pouGElgxkH2DsvanzCeZtU= +go.opentelemetry.io/collector/component v0.66.1-0.20221202005155-1c54042beb70/go.mod h1:OsVnvFFe38QSpcuZlQ8cvarDzcloCexgQ1/B2m80F6U= +go.opentelemetry.io/collector/confmap v0.0.0-20221201172708-2bdff61fa52a h1:2TscCXAQASO2kU9xHcMIUM/FP29fiQIRTilZmliq/7I= +go.opentelemetry.io/collector/confmap v0.0.0-20221201172708-2bdff61fa52a/go.mod h1:qJ3e8bA8h4wz/jYlbeEUafVHdrU7DkpStnmIUAz6VTQ= +go.opentelemetry.io/collector/consumer v0.66.1-0.20221202005155-1c54042beb70 h1:XwpVjI1KeKGPXOZBLefGILMziPYuNf6IzbmiIEsIyI0= +go.opentelemetry.io/collector/consumer v0.66.1-0.20221202005155-1c54042beb70/go.mod h1:EWVBcSGcIcmeDGTnIboc/aqa3agsBeH8/q7yFWG7xVc= +go.opentelemetry.io/collector/featuregate v0.66.1-0.20221202005155-1c54042beb70 h1:V0tf4ebciqIs07jFATfLGdUpLRaEsi+AiWuA/in0G8Y= +go.opentelemetry.io/collector/featuregate v0.66.1-0.20221202005155-1c54042beb70/go.mod h1:tewuFKJYalWBU0bmNKg++MC1ipINXUr6szYzOw2p1GI= +go.opentelemetry.io/collector/pdata v0.66.1-0.20221202005155-1c54042beb70 h1:TPOrxkEMvZzfBSwF3ct+kUUgKA5g8unkZZbKQvJweeA= +go.opentelemetry.io/collector/pdata v0.66.1-0.20221202005155-1c54042beb70/go.mod h1:pqyaznLzk21m+1KL6fwOsRryRELL+zNM0qiVSn0MbVc= 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= @@ -295,8 +297,8 @@ go.uber.org/multierr v1.6.0/go.mod h1:cdWPpRnG4AhwMwsgIHip0KRBQjJy5kYEpYjJxpXp9i go.uber.org/multierr v1.8.0 h1:dg6GjLku4EH+249NNmoIciG9N/jURbDG+pFlTkhzIC8= go.uber.org/multierr v1.8.0/go.mod h1:7EAYxJLBy9rStEaz58O2t4Uvip6FSURkq8/ppBp95ak= go.uber.org/zap v1.17.0/go.mod h1:MXVU+bhUf/A7Xi2HNOnopQOrmycQ5Ih87HtOu4q5SSo= -go.uber.org/zap v1.23.0 h1:OjGQ5KQDEUawVHxNwQgPpiypGHOxo2mNZsOqTak4fFY= -go.uber.org/zap v1.23.0/go.mod h1:D+nX8jyLsMHMYrln8A0rJjFt/T/9/bGgIhAqxv5URuY= +go.uber.org/zap v1.24.0 h1:FiJd5l1UOLj0wCgbSE0rwwXHzEdAZS6hiiSnxJN/D60= +go.uber.org/zap v1.24.0/go.mod h1:2kMP+WWQ8aoFoedH3T2sq6iJ2yDWpHbP0f6MQbS9Gkg= golang.org/x/crypto v0.0.0-20180904163835-0709b304e793/go.mod h1:6SG95UA2DQfeDnfUPMdvaQW0Q7yPrPDi9nlGo2tz2b4= golang.org/x/crypto v0.0.0-20190308221718-c2843e01d9a2/go.mod h1:djNgcEr1/C05ACkg1iLfiJU5Ep61QUkGW8qpdssI0+w= golang.org/x/crypto v0.0.0-20190923035154-9ee001bba392/go.mod h1:/lpIB1dKB+9EgE3H3cr1v9wB50oz8l4C4h62xy7jSTY= diff --git a/processor/filterprocessor/go.mod b/processor/filterprocessor/go.mod index 61e28bc1f5e1..81b4596540a3 100644 --- a/processor/filterprocessor/go.mod +++ b/processor/filterprocessor/go.mod @@ -7,12 +7,13 @@ require ( github.com/open-telemetry/opentelemetry-collector-contrib/internal/filter v0.66.0 github.com/open-telemetry/opentelemetry-collector-contrib/pkg/ottl v0.66.0 github.com/stretchr/testify v1.8.1 - go.opentelemetry.io/collector v0.66.1-0.20221128222955-4ff1ff379b90 - go.opentelemetry.io/collector/component v0.66.1-0.20221128222955-4ff1ff379b90 - go.opentelemetry.io/collector/consumer v0.66.1-0.20221128222955-4ff1ff379b90 - go.opentelemetry.io/collector/pdata v0.66.1-0.20221128222955-4ff1ff379b90 + go.opentelemetry.io/collector v0.66.1-0.20221202005155-1c54042beb70 + go.opentelemetry.io/collector/component v0.66.1-0.20221202005155-1c54042beb70 + go.opentelemetry.io/collector/confmap v0.0.0-20221201172708-2bdff61fa52a + go.opentelemetry.io/collector/consumer v0.66.1-0.20221202005155-1c54042beb70 + go.opentelemetry.io/collector/pdata v0.66.1-0.20221202005155-1c54042beb70 go.uber.org/multierr v1.8.0 - go.uber.org/zap v1.23.0 + go.uber.org/zap v1.24.0 ) require ( @@ -33,8 +34,8 @@ require ( github.com/modern-go/reflect2 v1.0.2 // indirect github.com/pmezard/go-difflib v1.0.0 // indirect go.opencensus.io v0.24.0 // indirect - go.opentelemetry.io/collector/featuregate v0.66.1-0.20221128222955-4ff1ff379b90 // indirect - go.opentelemetry.io/collector/semconv v0.66.1-0.20221128222955-4ff1ff379b90 // indirect + go.opentelemetry.io/collector/featuregate v0.66.1-0.20221202005155-1c54042beb70 // indirect + go.opentelemetry.io/collector/semconv v0.66.1-0.20221202005155-1c54042beb70 // 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 6608f5d4257f..3c5d7eca4010 100644 --- a/processor/filterprocessor/go.sum +++ b/processor/filterprocessor/go.sum @@ -282,18 +282,20 @@ go.etcd.io/etcd/client/pkg/v3 v3.5.4/go.mod h1:IJHfcCEKxYu1Os13ZdwCwIUTUVGYTSAM3 go.etcd.io/etcd/client/v3 v3.5.4/go.mod h1:ZaRkVgBZC+L+dLCjTcF1hRXpgZXQPOvnA/Ak/gq3kiY= go.opencensus.io v0.24.0 h1:y73uSU6J157QMP2kn2r30vwW1A2W2WFwSCGnAVxeaD0= go.opencensus.io v0.24.0/go.mod h1:vNK8G9p7aAivkbmorf4v+7Hgx+Zs0yY+0fOtgBfjQKo= -go.opentelemetry.io/collector v0.66.1-0.20221128222955-4ff1ff379b90 h1:yRe05/jMdzH4TFHfndZ5h2o2hKBK/79W72j8w51qNsI= -go.opentelemetry.io/collector v0.66.1-0.20221128222955-4ff1ff379b90/go.mod h1:hE6jCs+0rfiufCrVPucKZTMwfHit1okfDPnwPT2eW1I= -go.opentelemetry.io/collector/component v0.66.1-0.20221128222955-4ff1ff379b90 h1:AYSNTXbezhNg43EuYdVVcgxE/2gBVrm00FDx4DOmQVg= -go.opentelemetry.io/collector/component v0.66.1-0.20221128222955-4ff1ff379b90/go.mod h1:0c84EqXUhvYe6KW7hJfh76tiI/5yjWCH2amwyQ06XLM= -go.opentelemetry.io/collector/consumer v0.66.1-0.20221128222955-4ff1ff379b90 h1:nzNXVfC1FzXBXCLMzbMv+qK3E4EGiNsnMhfVsBd2yzc= -go.opentelemetry.io/collector/consumer v0.66.1-0.20221128222955-4ff1ff379b90/go.mod h1:WtoRZa5SnxQO1ZEQdVxYpFcXCmq62rakv0oUSlPO0NQ= -go.opentelemetry.io/collector/featuregate v0.66.1-0.20221128222955-4ff1ff379b90 h1:UuJSFWbi9XxyNZsJKZuvpWg35BgRbcCGFH+38V2MAdw= -go.opentelemetry.io/collector/featuregate v0.66.1-0.20221128222955-4ff1ff379b90/go.mod h1:tewuFKJYalWBU0bmNKg++MC1ipINXUr6szYzOw2p1GI= -go.opentelemetry.io/collector/pdata v0.66.1-0.20221128222955-4ff1ff379b90 h1:Vu4S4jSNcd0VFPzxQNO4+UqGwnes1xJDoFLPRiWHm8I= -go.opentelemetry.io/collector/pdata v0.66.1-0.20221128222955-4ff1ff379b90/go.mod h1:pqyaznLzk21m+1KL6fwOsRryRELL+zNM0qiVSn0MbVc= -go.opentelemetry.io/collector/semconv v0.66.1-0.20221128222955-4ff1ff379b90 h1:hFaTA68cggZKWMv7wQ3bKP8KGTbowh/5AQZKCHzHTqM= -go.opentelemetry.io/collector/semconv v0.66.1-0.20221128222955-4ff1ff379b90/go.mod h1:5o9yhOa+ABt7g2E5JABDxGZ1PQPbtfxrKNbYn+LOTXU= +go.opentelemetry.io/collector v0.66.1-0.20221202005155-1c54042beb70 h1:INB2CsOtqqrija2KvMuIpbBQ3qX1BECEeR+d0NJX+oM= +go.opentelemetry.io/collector v0.66.1-0.20221202005155-1c54042beb70/go.mod h1:d0NHkHyANJy3HDTvYE/PoylMShUmFIbiir89ieI0X0c= +go.opentelemetry.io/collector/component v0.66.1-0.20221202005155-1c54042beb70 h1:dEoJhzCmRShgmVro/kXm6pouGElgxkH2DsvanzCeZtU= +go.opentelemetry.io/collector/component v0.66.1-0.20221202005155-1c54042beb70/go.mod h1:OsVnvFFe38QSpcuZlQ8cvarDzcloCexgQ1/B2m80F6U= +go.opentelemetry.io/collector/confmap v0.0.0-20221201172708-2bdff61fa52a h1:2TscCXAQASO2kU9xHcMIUM/FP29fiQIRTilZmliq/7I= +go.opentelemetry.io/collector/confmap v0.0.0-20221201172708-2bdff61fa52a/go.mod h1:qJ3e8bA8h4wz/jYlbeEUafVHdrU7DkpStnmIUAz6VTQ= +go.opentelemetry.io/collector/consumer v0.66.1-0.20221202005155-1c54042beb70 h1:XwpVjI1KeKGPXOZBLefGILMziPYuNf6IzbmiIEsIyI0= +go.opentelemetry.io/collector/consumer v0.66.1-0.20221202005155-1c54042beb70/go.mod h1:EWVBcSGcIcmeDGTnIboc/aqa3agsBeH8/q7yFWG7xVc= +go.opentelemetry.io/collector/featuregate v0.66.1-0.20221202005155-1c54042beb70 h1:V0tf4ebciqIs07jFATfLGdUpLRaEsi+AiWuA/in0G8Y= +go.opentelemetry.io/collector/featuregate v0.66.1-0.20221202005155-1c54042beb70/go.mod h1:tewuFKJYalWBU0bmNKg++MC1ipINXUr6szYzOw2p1GI= +go.opentelemetry.io/collector/pdata v0.66.1-0.20221202005155-1c54042beb70 h1:TPOrxkEMvZzfBSwF3ct+kUUgKA5g8unkZZbKQvJweeA= +go.opentelemetry.io/collector/pdata v0.66.1-0.20221202005155-1c54042beb70/go.mod h1:pqyaznLzk21m+1KL6fwOsRryRELL+zNM0qiVSn0MbVc= +go.opentelemetry.io/collector/semconv v0.66.1-0.20221202005155-1c54042beb70 h1:Q5L9Urod3c8as6ZYaoaqBjarx/HXxsxy34DFZIU2fO4= +go.opentelemetry.io/collector/semconv v0.66.1-0.20221202005155-1c54042beb70/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= @@ -308,8 +310,8 @@ go.uber.org/multierr v1.6.0/go.mod h1:cdWPpRnG4AhwMwsgIHip0KRBQjJy5kYEpYjJxpXp9i go.uber.org/multierr v1.8.0 h1:dg6GjLku4EH+249NNmoIciG9N/jURbDG+pFlTkhzIC8= go.uber.org/multierr v1.8.0/go.mod h1:7EAYxJLBy9rStEaz58O2t4Uvip6FSURkq8/ppBp95ak= go.uber.org/zap v1.17.0/go.mod h1:MXVU+bhUf/A7Xi2HNOnopQOrmycQ5Ih87HtOu4q5SSo= -go.uber.org/zap v1.23.0 h1:OjGQ5KQDEUawVHxNwQgPpiypGHOxo2mNZsOqTak4fFY= -go.uber.org/zap v1.23.0/go.mod h1:D+nX8jyLsMHMYrln8A0rJjFt/T/9/bGgIhAqxv5URuY= +go.uber.org/zap v1.24.0 h1:FiJd5l1UOLj0wCgbSE0rwwXHzEdAZS6hiiSnxJN/D60= +go.uber.org/zap v1.24.0/go.mod h1:2kMP+WWQ8aoFoedH3T2sq6iJ2yDWpHbP0f6MQbS9Gkg= golang.org/x/crypto v0.0.0-20180904163835-0709b304e793/go.mod h1:6SG95UA2DQfeDnfUPMdvaQW0Q7yPrPDi9nlGo2tz2b4= golang.org/x/crypto v0.0.0-20190308221718-c2843e01d9a2/go.mod h1:djNgcEr1/C05ACkg1iLfiJU5Ep61QUkGW8qpdssI0+w= golang.org/x/crypto v0.0.0-20190923035154-9ee001bba392/go.mod h1:/lpIB1dKB+9EgE3H3cr1v9wB50oz8l4C4h62xy7jSTY= diff --git a/processor/filterprocessor/traces.go b/processor/filterprocessor/traces.go index 1d6bed152900..2e8b437427b6 100644 --- a/processor/filterprocessor/traces.go +++ b/processor/filterprocessor/traces.go @@ -70,7 +70,6 @@ func newFilterSpansProcessor(set component.TelemetrySettings, cfg *Config) (*fil set.Logger.Info( "Span filter configured", - zap.String("ID", cfg.ID().String()), zap.String("[Include] match_type", includeMatchType), zap.String("[Exclude] match_type", excludeMatchType), ) diff --git a/processor/groupbyattrsprocessor/go.mod b/processor/groupbyattrsprocessor/go.mod index d63a0afbde1b..db67d23b84d0 100644 --- a/processor/groupbyattrsprocessor/go.mod +++ b/processor/groupbyattrsprocessor/go.mod @@ -5,11 +5,12 @@ go 1.18 require ( github.com/stretchr/testify v1.8.1 go.opencensus.io v0.24.0 - go.opentelemetry.io/collector v0.66.1-0.20221128222955-4ff1ff379b90 - go.opentelemetry.io/collector/component v0.66.1-0.20221128222955-4ff1ff379b90 - go.opentelemetry.io/collector/consumer v0.66.1-0.20221128222955-4ff1ff379b90 - go.opentelemetry.io/collector/pdata v0.66.1-0.20221128222955-4ff1ff379b90 - go.uber.org/zap v1.23.0 + go.opentelemetry.io/collector v0.66.1-0.20221202005155-1c54042beb70 + go.opentelemetry.io/collector/component v0.66.1-0.20221202005155-1c54042beb70 + go.opentelemetry.io/collector/confmap v0.0.0-20221201172708-2bdff61fa52a + go.opentelemetry.io/collector/consumer v0.66.1-0.20221202005155-1c54042beb70 + go.opentelemetry.io/collector/pdata v0.66.1-0.20221202005155-1c54042beb70 + go.uber.org/zap v1.24.0 ) require ( @@ -27,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/featuregate v0.66.1-0.20221128222955-4ff1ff379b90 // indirect + go.opentelemetry.io/collector/featuregate v0.66.1-0.20221202005155-1c54042beb70 // indirect go.opentelemetry.io/otel v1.11.1 // indirect go.opentelemetry.io/otel/metric v0.33.0 // indirect go.opentelemetry.io/otel/trace v1.11.1 // indirect diff --git a/processor/groupbyattrsprocessor/go.sum b/processor/groupbyattrsprocessor/go.sum index adafaba3226a..8937b9e112dd 100644 --- a/processor/groupbyattrsprocessor/go.sum +++ b/processor/groupbyattrsprocessor/go.sum @@ -284,16 +284,18 @@ go.etcd.io/etcd/client/pkg/v3 v3.5.4/go.mod h1:IJHfcCEKxYu1Os13ZdwCwIUTUVGYTSAM3 go.etcd.io/etcd/client/v3 v3.5.4/go.mod h1:ZaRkVgBZC+L+dLCjTcF1hRXpgZXQPOvnA/Ak/gq3kiY= go.opencensus.io v0.24.0 h1:y73uSU6J157QMP2kn2r30vwW1A2W2WFwSCGnAVxeaD0= go.opencensus.io v0.24.0/go.mod h1:vNK8G9p7aAivkbmorf4v+7Hgx+Zs0yY+0fOtgBfjQKo= -go.opentelemetry.io/collector v0.66.1-0.20221128222955-4ff1ff379b90 h1:yRe05/jMdzH4TFHfndZ5h2o2hKBK/79W72j8w51qNsI= -go.opentelemetry.io/collector v0.66.1-0.20221128222955-4ff1ff379b90/go.mod h1:hE6jCs+0rfiufCrVPucKZTMwfHit1okfDPnwPT2eW1I= -go.opentelemetry.io/collector/component v0.66.1-0.20221128222955-4ff1ff379b90 h1:AYSNTXbezhNg43EuYdVVcgxE/2gBVrm00FDx4DOmQVg= -go.opentelemetry.io/collector/component v0.66.1-0.20221128222955-4ff1ff379b90/go.mod h1:0c84EqXUhvYe6KW7hJfh76tiI/5yjWCH2amwyQ06XLM= -go.opentelemetry.io/collector/consumer v0.66.1-0.20221128222955-4ff1ff379b90 h1:nzNXVfC1FzXBXCLMzbMv+qK3E4EGiNsnMhfVsBd2yzc= -go.opentelemetry.io/collector/consumer v0.66.1-0.20221128222955-4ff1ff379b90/go.mod h1:WtoRZa5SnxQO1ZEQdVxYpFcXCmq62rakv0oUSlPO0NQ= -go.opentelemetry.io/collector/featuregate v0.66.1-0.20221128222955-4ff1ff379b90 h1:UuJSFWbi9XxyNZsJKZuvpWg35BgRbcCGFH+38V2MAdw= -go.opentelemetry.io/collector/featuregate v0.66.1-0.20221128222955-4ff1ff379b90/go.mod h1:tewuFKJYalWBU0bmNKg++MC1ipINXUr6szYzOw2p1GI= -go.opentelemetry.io/collector/pdata v0.66.1-0.20221128222955-4ff1ff379b90 h1:Vu4S4jSNcd0VFPzxQNO4+UqGwnes1xJDoFLPRiWHm8I= -go.opentelemetry.io/collector/pdata v0.66.1-0.20221128222955-4ff1ff379b90/go.mod h1:pqyaznLzk21m+1KL6fwOsRryRELL+zNM0qiVSn0MbVc= +go.opentelemetry.io/collector v0.66.1-0.20221202005155-1c54042beb70 h1:INB2CsOtqqrija2KvMuIpbBQ3qX1BECEeR+d0NJX+oM= +go.opentelemetry.io/collector v0.66.1-0.20221202005155-1c54042beb70/go.mod h1:d0NHkHyANJy3HDTvYE/PoylMShUmFIbiir89ieI0X0c= +go.opentelemetry.io/collector/component v0.66.1-0.20221202005155-1c54042beb70 h1:dEoJhzCmRShgmVro/kXm6pouGElgxkH2DsvanzCeZtU= +go.opentelemetry.io/collector/component v0.66.1-0.20221202005155-1c54042beb70/go.mod h1:OsVnvFFe38QSpcuZlQ8cvarDzcloCexgQ1/B2m80F6U= +go.opentelemetry.io/collector/confmap v0.0.0-20221201172708-2bdff61fa52a h1:2TscCXAQASO2kU9xHcMIUM/FP29fiQIRTilZmliq/7I= +go.opentelemetry.io/collector/confmap v0.0.0-20221201172708-2bdff61fa52a/go.mod h1:qJ3e8bA8h4wz/jYlbeEUafVHdrU7DkpStnmIUAz6VTQ= +go.opentelemetry.io/collector/consumer v0.66.1-0.20221202005155-1c54042beb70 h1:XwpVjI1KeKGPXOZBLefGILMziPYuNf6IzbmiIEsIyI0= +go.opentelemetry.io/collector/consumer v0.66.1-0.20221202005155-1c54042beb70/go.mod h1:EWVBcSGcIcmeDGTnIboc/aqa3agsBeH8/q7yFWG7xVc= +go.opentelemetry.io/collector/featuregate v0.66.1-0.20221202005155-1c54042beb70 h1:V0tf4ebciqIs07jFATfLGdUpLRaEsi+AiWuA/in0G8Y= +go.opentelemetry.io/collector/featuregate v0.66.1-0.20221202005155-1c54042beb70/go.mod h1:tewuFKJYalWBU0bmNKg++MC1ipINXUr6szYzOw2p1GI= +go.opentelemetry.io/collector/pdata v0.66.1-0.20221202005155-1c54042beb70 h1:TPOrxkEMvZzfBSwF3ct+kUUgKA5g8unkZZbKQvJweeA= +go.opentelemetry.io/collector/pdata v0.66.1-0.20221202005155-1c54042beb70/go.mod h1:pqyaznLzk21m+1KL6fwOsRryRELL+zNM0qiVSn0MbVc= 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= @@ -312,8 +314,8 @@ go.uber.org/multierr v1.6.0/go.mod h1:cdWPpRnG4AhwMwsgIHip0KRBQjJy5kYEpYjJxpXp9i go.uber.org/multierr v1.8.0 h1:dg6GjLku4EH+249NNmoIciG9N/jURbDG+pFlTkhzIC8= go.uber.org/multierr v1.8.0/go.mod h1:7EAYxJLBy9rStEaz58O2t4Uvip6FSURkq8/ppBp95ak= go.uber.org/zap v1.17.0/go.mod h1:MXVU+bhUf/A7Xi2HNOnopQOrmycQ5Ih87HtOu4q5SSo= -go.uber.org/zap v1.23.0 h1:OjGQ5KQDEUawVHxNwQgPpiypGHOxo2mNZsOqTak4fFY= -go.uber.org/zap v1.23.0/go.mod h1:D+nX8jyLsMHMYrln8A0rJjFt/T/9/bGgIhAqxv5URuY= +go.uber.org/zap v1.24.0 h1:FiJd5l1UOLj0wCgbSE0rwwXHzEdAZS6hiiSnxJN/D60= +go.uber.org/zap v1.24.0/go.mod h1:2kMP+WWQ8aoFoedH3T2sq6iJ2yDWpHbP0f6MQbS9Gkg= golang.org/x/crypto v0.0.0-20180904163835-0709b304e793/go.mod h1:6SG95UA2DQfeDnfUPMdvaQW0Q7yPrPDi9nlGo2tz2b4= golang.org/x/crypto v0.0.0-20190308221718-c2843e01d9a2/go.mod h1:djNgcEr1/C05ACkg1iLfiJU5Ep61QUkGW8qpdssI0+w= golang.org/x/crypto v0.0.0-20190923035154-9ee001bba392/go.mod h1:/lpIB1dKB+9EgE3H3cr1v9wB50oz8l4C4h62xy7jSTY= diff --git a/processor/groupbytraceprocessor/go.mod b/processor/groupbytraceprocessor/go.mod index b57f64a1a729..10334e15c2a4 100644 --- a/processor/groupbytraceprocessor/go.mod +++ b/processor/groupbytraceprocessor/go.mod @@ -6,13 +6,13 @@ require ( github.com/open-telemetry/opentelemetry-collector-contrib/pkg/batchpersignal v0.66.0 github.com/stretchr/testify v1.8.1 go.opencensus.io v0.24.0 - go.opentelemetry.io/collector v0.66.1-0.20221128222955-4ff1ff379b90 - go.opentelemetry.io/collector/component v0.66.1-0.20221128222955-4ff1ff379b90 - go.opentelemetry.io/collector/consumer v0.66.1-0.20221128222955-4ff1ff379b90 - go.opentelemetry.io/collector/pdata v0.66.1-0.20221128222955-4ff1ff379b90 + go.opentelemetry.io/collector v0.66.1-0.20221202005155-1c54042beb70 + go.opentelemetry.io/collector/component v0.66.1-0.20221202005155-1c54042beb70 + go.opentelemetry.io/collector/consumer v0.66.1-0.20221202005155-1c54042beb70 + go.opentelemetry.io/collector/pdata v0.66.1-0.20221202005155-1c54042beb70 go.uber.org/atomic v1.10.0 go.uber.org/multierr v1.8.0 - go.uber.org/zap v1.23.0 + go.uber.org/zap v1.24.0 ) require ( @@ -30,7 +30,8 @@ require ( github.com/modern-go/reflect2 v1.0.2 // indirect github.com/pelletier/go-toml v1.9.4 // indirect github.com/pmezard/go-difflib v1.0.0 // indirect - go.opentelemetry.io/collector/featuregate v0.66.1-0.20221128222955-4ff1ff379b90 // indirect + go.opentelemetry.io/collector/confmap v0.0.0-20221201172708-2bdff61fa52a // indirect + go.opentelemetry.io/collector/featuregate v0.66.1-0.20221202005155-1c54042beb70 // indirect go.opentelemetry.io/otel v1.11.1 // indirect go.opentelemetry.io/otel/metric v0.33.0 // indirect go.opentelemetry.io/otel/trace v1.11.1 // indirect diff --git a/processor/groupbytraceprocessor/go.sum b/processor/groupbytraceprocessor/go.sum index adafaba3226a..8937b9e112dd 100644 --- a/processor/groupbytraceprocessor/go.sum +++ b/processor/groupbytraceprocessor/go.sum @@ -284,16 +284,18 @@ go.etcd.io/etcd/client/pkg/v3 v3.5.4/go.mod h1:IJHfcCEKxYu1Os13ZdwCwIUTUVGYTSAM3 go.etcd.io/etcd/client/v3 v3.5.4/go.mod h1:ZaRkVgBZC+L+dLCjTcF1hRXpgZXQPOvnA/Ak/gq3kiY= go.opencensus.io v0.24.0 h1:y73uSU6J157QMP2kn2r30vwW1A2W2WFwSCGnAVxeaD0= go.opencensus.io v0.24.0/go.mod h1:vNK8G9p7aAivkbmorf4v+7Hgx+Zs0yY+0fOtgBfjQKo= -go.opentelemetry.io/collector v0.66.1-0.20221128222955-4ff1ff379b90 h1:yRe05/jMdzH4TFHfndZ5h2o2hKBK/79W72j8w51qNsI= -go.opentelemetry.io/collector v0.66.1-0.20221128222955-4ff1ff379b90/go.mod h1:hE6jCs+0rfiufCrVPucKZTMwfHit1okfDPnwPT2eW1I= -go.opentelemetry.io/collector/component v0.66.1-0.20221128222955-4ff1ff379b90 h1:AYSNTXbezhNg43EuYdVVcgxE/2gBVrm00FDx4DOmQVg= -go.opentelemetry.io/collector/component v0.66.1-0.20221128222955-4ff1ff379b90/go.mod h1:0c84EqXUhvYe6KW7hJfh76tiI/5yjWCH2amwyQ06XLM= -go.opentelemetry.io/collector/consumer v0.66.1-0.20221128222955-4ff1ff379b90 h1:nzNXVfC1FzXBXCLMzbMv+qK3E4EGiNsnMhfVsBd2yzc= -go.opentelemetry.io/collector/consumer v0.66.1-0.20221128222955-4ff1ff379b90/go.mod h1:WtoRZa5SnxQO1ZEQdVxYpFcXCmq62rakv0oUSlPO0NQ= -go.opentelemetry.io/collector/featuregate v0.66.1-0.20221128222955-4ff1ff379b90 h1:UuJSFWbi9XxyNZsJKZuvpWg35BgRbcCGFH+38V2MAdw= -go.opentelemetry.io/collector/featuregate v0.66.1-0.20221128222955-4ff1ff379b90/go.mod h1:tewuFKJYalWBU0bmNKg++MC1ipINXUr6szYzOw2p1GI= -go.opentelemetry.io/collector/pdata v0.66.1-0.20221128222955-4ff1ff379b90 h1:Vu4S4jSNcd0VFPzxQNO4+UqGwnes1xJDoFLPRiWHm8I= -go.opentelemetry.io/collector/pdata v0.66.1-0.20221128222955-4ff1ff379b90/go.mod h1:pqyaznLzk21m+1KL6fwOsRryRELL+zNM0qiVSn0MbVc= +go.opentelemetry.io/collector v0.66.1-0.20221202005155-1c54042beb70 h1:INB2CsOtqqrija2KvMuIpbBQ3qX1BECEeR+d0NJX+oM= +go.opentelemetry.io/collector v0.66.1-0.20221202005155-1c54042beb70/go.mod h1:d0NHkHyANJy3HDTvYE/PoylMShUmFIbiir89ieI0X0c= +go.opentelemetry.io/collector/component v0.66.1-0.20221202005155-1c54042beb70 h1:dEoJhzCmRShgmVro/kXm6pouGElgxkH2DsvanzCeZtU= +go.opentelemetry.io/collector/component v0.66.1-0.20221202005155-1c54042beb70/go.mod h1:OsVnvFFe38QSpcuZlQ8cvarDzcloCexgQ1/B2m80F6U= +go.opentelemetry.io/collector/confmap v0.0.0-20221201172708-2bdff61fa52a h1:2TscCXAQASO2kU9xHcMIUM/FP29fiQIRTilZmliq/7I= +go.opentelemetry.io/collector/confmap v0.0.0-20221201172708-2bdff61fa52a/go.mod h1:qJ3e8bA8h4wz/jYlbeEUafVHdrU7DkpStnmIUAz6VTQ= +go.opentelemetry.io/collector/consumer v0.66.1-0.20221202005155-1c54042beb70 h1:XwpVjI1KeKGPXOZBLefGILMziPYuNf6IzbmiIEsIyI0= +go.opentelemetry.io/collector/consumer v0.66.1-0.20221202005155-1c54042beb70/go.mod h1:EWVBcSGcIcmeDGTnIboc/aqa3agsBeH8/q7yFWG7xVc= +go.opentelemetry.io/collector/featuregate v0.66.1-0.20221202005155-1c54042beb70 h1:V0tf4ebciqIs07jFATfLGdUpLRaEsi+AiWuA/in0G8Y= +go.opentelemetry.io/collector/featuregate v0.66.1-0.20221202005155-1c54042beb70/go.mod h1:tewuFKJYalWBU0bmNKg++MC1ipINXUr6szYzOw2p1GI= +go.opentelemetry.io/collector/pdata v0.66.1-0.20221202005155-1c54042beb70 h1:TPOrxkEMvZzfBSwF3ct+kUUgKA5g8unkZZbKQvJweeA= +go.opentelemetry.io/collector/pdata v0.66.1-0.20221202005155-1c54042beb70/go.mod h1:pqyaznLzk21m+1KL6fwOsRryRELL+zNM0qiVSn0MbVc= 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= @@ -312,8 +314,8 @@ go.uber.org/multierr v1.6.0/go.mod h1:cdWPpRnG4AhwMwsgIHip0KRBQjJy5kYEpYjJxpXp9i go.uber.org/multierr v1.8.0 h1:dg6GjLku4EH+249NNmoIciG9N/jURbDG+pFlTkhzIC8= go.uber.org/multierr v1.8.0/go.mod h1:7EAYxJLBy9rStEaz58O2t4Uvip6FSURkq8/ppBp95ak= go.uber.org/zap v1.17.0/go.mod h1:MXVU+bhUf/A7Xi2HNOnopQOrmycQ5Ih87HtOu4q5SSo= -go.uber.org/zap v1.23.0 h1:OjGQ5KQDEUawVHxNwQgPpiypGHOxo2mNZsOqTak4fFY= -go.uber.org/zap v1.23.0/go.mod h1:D+nX8jyLsMHMYrln8A0rJjFt/T/9/bGgIhAqxv5URuY= +go.uber.org/zap v1.24.0 h1:FiJd5l1UOLj0wCgbSE0rwwXHzEdAZS6hiiSnxJN/D60= +go.uber.org/zap v1.24.0/go.mod h1:2kMP+WWQ8aoFoedH3T2sq6iJ2yDWpHbP0f6MQbS9Gkg= golang.org/x/crypto v0.0.0-20180904163835-0709b304e793/go.mod h1:6SG95UA2DQfeDnfUPMdvaQW0Q7yPrPDi9nlGo2tz2b4= golang.org/x/crypto v0.0.0-20190308221718-c2843e01d9a2/go.mod h1:djNgcEr1/C05ACkg1iLfiJU5Ep61QUkGW8qpdssI0+w= golang.org/x/crypto v0.0.0-20190923035154-9ee001bba392/go.mod h1:/lpIB1dKB+9EgE3H3cr1v9wB50oz8l4C4h62xy7jSTY= diff --git a/processor/k8sattributesprocessor/go.mod b/processor/k8sattributesprocessor/go.mod index ee6536da1069..7ca9de64d5aa 100644 --- a/processor/k8sattributesprocessor/go.mod +++ b/processor/k8sattributesprocessor/go.mod @@ -6,12 +6,13 @@ require ( github.com/open-telemetry/opentelemetry-collector-contrib/internal/k8sconfig v0.66.0 github.com/stretchr/testify v1.8.1 go.opencensus.io v0.24.0 - go.opentelemetry.io/collector v0.66.1-0.20221128222955-4ff1ff379b90 - go.opentelemetry.io/collector/component v0.66.1-0.20221128222955-4ff1ff379b90 - go.opentelemetry.io/collector/consumer v0.66.1-0.20221128222955-4ff1ff379b90 - go.opentelemetry.io/collector/pdata v0.66.1-0.20221128222955-4ff1ff379b90 - go.opentelemetry.io/collector/semconv v0.66.1-0.20221128222955-4ff1ff379b90 - go.uber.org/zap v1.23.0 + go.opentelemetry.io/collector v0.66.1-0.20221202005155-1c54042beb70 + go.opentelemetry.io/collector/component v0.66.1-0.20221202005155-1c54042beb70 + go.opentelemetry.io/collector/confmap v0.0.0-20221201172708-2bdff61fa52a + go.opentelemetry.io/collector/consumer v0.66.1-0.20221202005155-1c54042beb70 + go.opentelemetry.io/collector/pdata v0.66.1-0.20221202005155-1c54042beb70 + go.opentelemetry.io/collector/semconv v0.66.1-0.20221202005155-1c54042beb70 + go.uber.org/zap v1.24.0 k8s.io/api v0.25.4 k8s.io/apimachinery v0.25.4 k8s.io/client-go v0.25.4 @@ -52,7 +53,7 @@ require ( github.com/pkg/errors v0.9.1 // indirect github.com/pmezard/go-difflib v1.0.0 // indirect github.com/spf13/pflag v1.0.5 // indirect - go.opentelemetry.io/collector/featuregate v0.66.1-0.20221128222955-4ff1ff379b90 // indirect + go.opentelemetry.io/collector/featuregate v0.66.1-0.20221202005155-1c54042beb70 // indirect go.opentelemetry.io/otel v1.11.1 // indirect go.opentelemetry.io/otel/metric v0.33.0 // indirect go.opentelemetry.io/otel/trace v1.11.1 // indirect diff --git a/processor/k8sattributesprocessor/go.sum b/processor/k8sattributesprocessor/go.sum index cefdb884555c..d64d7ad89d69 100644 --- a/processor/k8sattributesprocessor/go.sum +++ b/processor/k8sattributesprocessor/go.sum @@ -438,18 +438,20 @@ go.opencensus.io v0.22.3/go.mod h1:yxeiOL68Rb0Xd1ddK5vPZ/oVn4vY4Ynel7k9FzqtOIw= go.opencensus.io v0.22.4/go.mod h1:yxeiOL68Rb0Xd1ddK5vPZ/oVn4vY4Ynel7k9FzqtOIw= go.opencensus.io v0.24.0 h1:y73uSU6J157QMP2kn2r30vwW1A2W2WFwSCGnAVxeaD0= go.opencensus.io v0.24.0/go.mod h1:vNK8G9p7aAivkbmorf4v+7Hgx+Zs0yY+0fOtgBfjQKo= -go.opentelemetry.io/collector v0.66.1-0.20221128222955-4ff1ff379b90 h1:yRe05/jMdzH4TFHfndZ5h2o2hKBK/79W72j8w51qNsI= -go.opentelemetry.io/collector v0.66.1-0.20221128222955-4ff1ff379b90/go.mod h1:hE6jCs+0rfiufCrVPucKZTMwfHit1okfDPnwPT2eW1I= -go.opentelemetry.io/collector/component v0.66.1-0.20221128222955-4ff1ff379b90 h1:AYSNTXbezhNg43EuYdVVcgxE/2gBVrm00FDx4DOmQVg= -go.opentelemetry.io/collector/component v0.66.1-0.20221128222955-4ff1ff379b90/go.mod h1:0c84EqXUhvYe6KW7hJfh76tiI/5yjWCH2amwyQ06XLM= -go.opentelemetry.io/collector/consumer v0.66.1-0.20221128222955-4ff1ff379b90 h1:nzNXVfC1FzXBXCLMzbMv+qK3E4EGiNsnMhfVsBd2yzc= -go.opentelemetry.io/collector/consumer v0.66.1-0.20221128222955-4ff1ff379b90/go.mod h1:WtoRZa5SnxQO1ZEQdVxYpFcXCmq62rakv0oUSlPO0NQ= -go.opentelemetry.io/collector/featuregate v0.66.1-0.20221128222955-4ff1ff379b90 h1:UuJSFWbi9XxyNZsJKZuvpWg35BgRbcCGFH+38V2MAdw= -go.opentelemetry.io/collector/featuregate v0.66.1-0.20221128222955-4ff1ff379b90/go.mod h1:tewuFKJYalWBU0bmNKg++MC1ipINXUr6szYzOw2p1GI= -go.opentelemetry.io/collector/pdata v0.66.1-0.20221128222955-4ff1ff379b90 h1:Vu4S4jSNcd0VFPzxQNO4+UqGwnes1xJDoFLPRiWHm8I= -go.opentelemetry.io/collector/pdata v0.66.1-0.20221128222955-4ff1ff379b90/go.mod h1:pqyaznLzk21m+1KL6fwOsRryRELL+zNM0qiVSn0MbVc= -go.opentelemetry.io/collector/semconv v0.66.1-0.20221128222955-4ff1ff379b90 h1:hFaTA68cggZKWMv7wQ3bKP8KGTbowh/5AQZKCHzHTqM= -go.opentelemetry.io/collector/semconv v0.66.1-0.20221128222955-4ff1ff379b90/go.mod h1:5o9yhOa+ABt7g2E5JABDxGZ1PQPbtfxrKNbYn+LOTXU= +go.opentelemetry.io/collector v0.66.1-0.20221202005155-1c54042beb70 h1:INB2CsOtqqrija2KvMuIpbBQ3qX1BECEeR+d0NJX+oM= +go.opentelemetry.io/collector v0.66.1-0.20221202005155-1c54042beb70/go.mod h1:d0NHkHyANJy3HDTvYE/PoylMShUmFIbiir89ieI0X0c= +go.opentelemetry.io/collector/component v0.66.1-0.20221202005155-1c54042beb70 h1:dEoJhzCmRShgmVro/kXm6pouGElgxkH2DsvanzCeZtU= +go.opentelemetry.io/collector/component v0.66.1-0.20221202005155-1c54042beb70/go.mod h1:OsVnvFFe38QSpcuZlQ8cvarDzcloCexgQ1/B2m80F6U= +go.opentelemetry.io/collector/confmap v0.0.0-20221201172708-2bdff61fa52a h1:2TscCXAQASO2kU9xHcMIUM/FP29fiQIRTilZmliq/7I= +go.opentelemetry.io/collector/confmap v0.0.0-20221201172708-2bdff61fa52a/go.mod h1:qJ3e8bA8h4wz/jYlbeEUafVHdrU7DkpStnmIUAz6VTQ= +go.opentelemetry.io/collector/consumer v0.66.1-0.20221202005155-1c54042beb70 h1:XwpVjI1KeKGPXOZBLefGILMziPYuNf6IzbmiIEsIyI0= +go.opentelemetry.io/collector/consumer v0.66.1-0.20221202005155-1c54042beb70/go.mod h1:EWVBcSGcIcmeDGTnIboc/aqa3agsBeH8/q7yFWG7xVc= +go.opentelemetry.io/collector/featuregate v0.66.1-0.20221202005155-1c54042beb70 h1:V0tf4ebciqIs07jFATfLGdUpLRaEsi+AiWuA/in0G8Y= +go.opentelemetry.io/collector/featuregate v0.66.1-0.20221202005155-1c54042beb70/go.mod h1:tewuFKJYalWBU0bmNKg++MC1ipINXUr6szYzOw2p1GI= +go.opentelemetry.io/collector/pdata v0.66.1-0.20221202005155-1c54042beb70 h1:TPOrxkEMvZzfBSwF3ct+kUUgKA5g8unkZZbKQvJweeA= +go.opentelemetry.io/collector/pdata v0.66.1-0.20221202005155-1c54042beb70/go.mod h1:pqyaznLzk21m+1KL6fwOsRryRELL+zNM0qiVSn0MbVc= +go.opentelemetry.io/collector/semconv v0.66.1-0.20221202005155-1c54042beb70 h1:Q5L9Urod3c8as6ZYaoaqBjarx/HXxsxy34DFZIU2fO4= +go.opentelemetry.io/collector/semconv v0.66.1-0.20221202005155-1c54042beb70/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= @@ -465,8 +467,8 @@ go.uber.org/multierr v1.6.0/go.mod h1:cdWPpRnG4AhwMwsgIHip0KRBQjJy5kYEpYjJxpXp9i go.uber.org/multierr v1.8.0 h1:dg6GjLku4EH+249NNmoIciG9N/jURbDG+pFlTkhzIC8= go.uber.org/multierr v1.8.0/go.mod h1:7EAYxJLBy9rStEaz58O2t4Uvip6FSURkq8/ppBp95ak= go.uber.org/zap v1.17.0/go.mod h1:MXVU+bhUf/A7Xi2HNOnopQOrmycQ5Ih87HtOu4q5SSo= -go.uber.org/zap v1.23.0 h1:OjGQ5KQDEUawVHxNwQgPpiypGHOxo2mNZsOqTak4fFY= -go.uber.org/zap v1.23.0/go.mod h1:D+nX8jyLsMHMYrln8A0rJjFt/T/9/bGgIhAqxv5URuY= +go.uber.org/zap v1.24.0 h1:FiJd5l1UOLj0wCgbSE0rwwXHzEdAZS6hiiSnxJN/D60= +go.uber.org/zap v1.24.0/go.mod h1:2kMP+WWQ8aoFoedH3T2sq6iJ2yDWpHbP0f6MQbS9Gkg= golang.org/x/crypto v0.0.0-20180904163835-0709b304e793/go.mod h1:6SG95UA2DQfeDnfUPMdvaQW0Q7yPrPDi9nlGo2tz2b4= golang.org/x/crypto v0.0.0-20190308221718-c2843e01d9a2/go.mod h1:djNgcEr1/C05ACkg1iLfiJU5Ep61QUkGW8qpdssI0+w= golang.org/x/crypto v0.0.0-20190510104115-cbcb75029529/go.mod h1:yigFU9vqHzYiE8UmvKecakEJjdnWj3jj499lnFckfCI= diff --git a/processor/logstransformprocessor/factory.go b/processor/logstransformprocessor/factory.go index a06a6e51ac01..f24d05f56756 100644 --- a/processor/logstransformprocessor/factory.go +++ b/processor/logstransformprocessor/factory.go @@ -69,7 +69,6 @@ func createLogsProcessor( } proc := &logsTransformProcessor{ - id: cfg.ID(), logger: set.Logger, config: pCfg, } diff --git a/processor/logstransformprocessor/go.mod b/processor/logstransformprocessor/go.mod index ddf8bbfada95..53619d1f99bf 100644 --- a/processor/logstransformprocessor/go.mod +++ b/processor/logstransformprocessor/go.mod @@ -6,11 +6,12 @@ require ( github.com/open-telemetry/opentelemetry-collector-contrib/internal/coreinternal v0.66.0 github.com/open-telemetry/opentelemetry-collector-contrib/pkg/stanza v0.66.0 github.com/stretchr/testify v1.8.1 - go.opentelemetry.io/collector v0.66.1-0.20221128222955-4ff1ff379b90 - go.opentelemetry.io/collector/component v0.66.1-0.20221128222955-4ff1ff379b90 - go.opentelemetry.io/collector/consumer v0.66.1-0.20221128222955-4ff1ff379b90 - go.opentelemetry.io/collector/pdata v0.66.1-0.20221128222955-4ff1ff379b90 - go.uber.org/zap v1.23.0 + go.opentelemetry.io/collector v0.66.1-0.20221202005155-1c54042beb70 + go.opentelemetry.io/collector/component v0.66.1-0.20221202005155-1c54042beb70 + go.opentelemetry.io/collector/confmap v0.0.0-20221201172708-2bdff61fa52a + go.opentelemetry.io/collector/consumer v0.66.1-0.20221202005155-1c54042beb70 + go.opentelemetry.io/collector/pdata v0.66.1-0.20221202005155-1c54042beb70 + go.uber.org/zap v1.24.0 ) require ( @@ -30,7 +31,7 @@ require ( github.com/pmezard/go-difflib v1.0.0 // indirect github.com/rogpeppe/go-internal v1.8.1 // indirect go.opencensus.io v0.24.0 // indirect - go.opentelemetry.io/collector/featuregate v0.66.1-0.20221128222955-4ff1ff379b90 // indirect + go.opentelemetry.io/collector/featuregate v0.66.1-0.20221202005155-1c54042beb70 // 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 b2f0fbc584fa..b5f0c9078529 100644 --- a/processor/logstransformprocessor/go.sum +++ b/processor/logstransformprocessor/go.sum @@ -293,16 +293,18 @@ go.etcd.io/etcd/client/pkg/v3 v3.5.4/go.mod h1:IJHfcCEKxYu1Os13ZdwCwIUTUVGYTSAM3 go.etcd.io/etcd/client/v3 v3.5.4/go.mod h1:ZaRkVgBZC+L+dLCjTcF1hRXpgZXQPOvnA/Ak/gq3kiY= go.opencensus.io v0.24.0 h1:y73uSU6J157QMP2kn2r30vwW1A2W2WFwSCGnAVxeaD0= go.opencensus.io v0.24.0/go.mod h1:vNK8G9p7aAivkbmorf4v+7Hgx+Zs0yY+0fOtgBfjQKo= -go.opentelemetry.io/collector v0.66.1-0.20221128222955-4ff1ff379b90 h1:yRe05/jMdzH4TFHfndZ5h2o2hKBK/79W72j8w51qNsI= -go.opentelemetry.io/collector v0.66.1-0.20221128222955-4ff1ff379b90/go.mod h1:hE6jCs+0rfiufCrVPucKZTMwfHit1okfDPnwPT2eW1I= -go.opentelemetry.io/collector/component v0.66.1-0.20221128222955-4ff1ff379b90 h1:AYSNTXbezhNg43EuYdVVcgxE/2gBVrm00FDx4DOmQVg= -go.opentelemetry.io/collector/component v0.66.1-0.20221128222955-4ff1ff379b90/go.mod h1:0c84EqXUhvYe6KW7hJfh76tiI/5yjWCH2amwyQ06XLM= -go.opentelemetry.io/collector/consumer v0.66.1-0.20221128222955-4ff1ff379b90 h1:nzNXVfC1FzXBXCLMzbMv+qK3E4EGiNsnMhfVsBd2yzc= -go.opentelemetry.io/collector/consumer v0.66.1-0.20221128222955-4ff1ff379b90/go.mod h1:WtoRZa5SnxQO1ZEQdVxYpFcXCmq62rakv0oUSlPO0NQ= -go.opentelemetry.io/collector/featuregate v0.66.1-0.20221128222955-4ff1ff379b90 h1:UuJSFWbi9XxyNZsJKZuvpWg35BgRbcCGFH+38V2MAdw= -go.opentelemetry.io/collector/featuregate v0.66.1-0.20221128222955-4ff1ff379b90/go.mod h1:tewuFKJYalWBU0bmNKg++MC1ipINXUr6szYzOw2p1GI= -go.opentelemetry.io/collector/pdata v0.66.1-0.20221128222955-4ff1ff379b90 h1:Vu4S4jSNcd0VFPzxQNO4+UqGwnes1xJDoFLPRiWHm8I= -go.opentelemetry.io/collector/pdata v0.66.1-0.20221128222955-4ff1ff379b90/go.mod h1:pqyaznLzk21m+1KL6fwOsRryRELL+zNM0qiVSn0MbVc= +go.opentelemetry.io/collector v0.66.1-0.20221202005155-1c54042beb70 h1:INB2CsOtqqrija2KvMuIpbBQ3qX1BECEeR+d0NJX+oM= +go.opentelemetry.io/collector v0.66.1-0.20221202005155-1c54042beb70/go.mod h1:d0NHkHyANJy3HDTvYE/PoylMShUmFIbiir89ieI0X0c= +go.opentelemetry.io/collector/component v0.66.1-0.20221202005155-1c54042beb70 h1:dEoJhzCmRShgmVro/kXm6pouGElgxkH2DsvanzCeZtU= +go.opentelemetry.io/collector/component v0.66.1-0.20221202005155-1c54042beb70/go.mod h1:OsVnvFFe38QSpcuZlQ8cvarDzcloCexgQ1/B2m80F6U= +go.opentelemetry.io/collector/confmap v0.0.0-20221201172708-2bdff61fa52a h1:2TscCXAQASO2kU9xHcMIUM/FP29fiQIRTilZmliq/7I= +go.opentelemetry.io/collector/confmap v0.0.0-20221201172708-2bdff61fa52a/go.mod h1:qJ3e8bA8h4wz/jYlbeEUafVHdrU7DkpStnmIUAz6VTQ= +go.opentelemetry.io/collector/consumer v0.66.1-0.20221202005155-1c54042beb70 h1:XwpVjI1KeKGPXOZBLefGILMziPYuNf6IzbmiIEsIyI0= +go.opentelemetry.io/collector/consumer v0.66.1-0.20221202005155-1c54042beb70/go.mod h1:EWVBcSGcIcmeDGTnIboc/aqa3agsBeH8/q7yFWG7xVc= +go.opentelemetry.io/collector/featuregate v0.66.1-0.20221202005155-1c54042beb70 h1:V0tf4ebciqIs07jFATfLGdUpLRaEsi+AiWuA/in0G8Y= +go.opentelemetry.io/collector/featuregate v0.66.1-0.20221202005155-1c54042beb70/go.mod h1:tewuFKJYalWBU0bmNKg++MC1ipINXUr6szYzOw2p1GI= +go.opentelemetry.io/collector/pdata v0.66.1-0.20221202005155-1c54042beb70 h1:TPOrxkEMvZzfBSwF3ct+kUUgKA5g8unkZZbKQvJweeA= +go.opentelemetry.io/collector/pdata v0.66.1-0.20221202005155-1c54042beb70/go.mod h1:pqyaznLzk21m+1KL6fwOsRryRELL+zNM0qiVSn0MbVc= 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= @@ -320,8 +322,8 @@ go.uber.org/multierr v1.6.0/go.mod h1:cdWPpRnG4AhwMwsgIHip0KRBQjJy5kYEpYjJxpXp9i go.uber.org/multierr v1.8.0 h1:dg6GjLku4EH+249NNmoIciG9N/jURbDG+pFlTkhzIC8= go.uber.org/multierr v1.8.0/go.mod h1:7EAYxJLBy9rStEaz58O2t4Uvip6FSURkq8/ppBp95ak= go.uber.org/zap v1.17.0/go.mod h1:MXVU+bhUf/A7Xi2HNOnopQOrmycQ5Ih87HtOu4q5SSo= -go.uber.org/zap v1.23.0 h1:OjGQ5KQDEUawVHxNwQgPpiypGHOxo2mNZsOqTak4fFY= -go.uber.org/zap v1.23.0/go.mod h1:D+nX8jyLsMHMYrln8A0rJjFt/T/9/bGgIhAqxv5URuY= +go.uber.org/zap v1.24.0 h1:FiJd5l1UOLj0wCgbSE0rwwXHzEdAZS6hiiSnxJN/D60= +go.uber.org/zap v1.24.0/go.mod h1:2kMP+WWQ8aoFoedH3T2sq6iJ2yDWpHbP0f6MQbS9Gkg= golang.org/x/crypto v0.0.0-20180904163835-0709b304e793/go.mod h1:6SG95UA2DQfeDnfUPMdvaQW0Q7yPrPDi9nlGo2tz2b4= golang.org/x/crypto v0.0.0-20190308221718-c2843e01d9a2/go.mod h1:djNgcEr1/C05ACkg1iLfiJU5Ep61QUkGW8qpdssI0+w= golang.org/x/crypto v0.0.0-20190923035154-9ee001bba392/go.mod h1:/lpIB1dKB+9EgE3H3cr1v9wB50oz8l4C4h62xy7jSTY= diff --git a/processor/logstransformprocessor/processor.go b/processor/logstransformprocessor/processor.go index a616fa2f0deb..2db83b8271ce 100644 --- a/processor/logstransformprocessor/processor.go +++ b/processor/logstransformprocessor/processor.go @@ -40,7 +40,6 @@ type outputType struct { type logsTransformProcessor struct { logger *zap.Logger config *Config - id component.ID pipe *pipeline.DirectedPipeline firstOperator operator.Operator diff --git a/processor/metricsgenerationprocessor/go.mod b/processor/metricsgenerationprocessor/go.mod index 5e271a68b750..7ef6dde07605 100644 --- a/processor/metricsgenerationprocessor/go.mod +++ b/processor/metricsgenerationprocessor/go.mod @@ -4,11 +4,12 @@ go 1.18 require ( github.com/stretchr/testify v1.8.1 - go.opentelemetry.io/collector v0.66.1-0.20221128222955-4ff1ff379b90 - go.opentelemetry.io/collector/component v0.66.1-0.20221128222955-4ff1ff379b90 - go.opentelemetry.io/collector/consumer v0.66.1-0.20221128222955-4ff1ff379b90 - go.opentelemetry.io/collector/pdata v0.66.1-0.20221128222955-4ff1ff379b90 - go.uber.org/zap v1.23.0 + go.opentelemetry.io/collector v0.66.1-0.20221202005155-1c54042beb70 + go.opentelemetry.io/collector/component v0.66.1-0.20221202005155-1c54042beb70 + go.opentelemetry.io/collector/confmap v0.0.0-20221201172708-2bdff61fa52a + go.opentelemetry.io/collector/consumer v0.66.1-0.20221202005155-1c54042beb70 + go.opentelemetry.io/collector/pdata v0.66.1-0.20221202005155-1c54042beb70 + go.uber.org/zap v1.24.0 ) require ( @@ -27,7 +28,7 @@ require ( github.com/pelletier/go-toml v1.9.4 // indirect github.com/pmezard/go-difflib v1.0.0 // indirect go.opencensus.io v0.24.0 // indirect - go.opentelemetry.io/collector/featuregate v0.66.1-0.20221128222955-4ff1ff379b90 // indirect + go.opentelemetry.io/collector/featuregate v0.66.1-0.20221202005155-1c54042beb70 // 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 c80d33698554..0535e9dd98d3 100644 --- a/processor/metricsgenerationprocessor/go.sum +++ b/processor/metricsgenerationprocessor/go.sum @@ -270,16 +270,18 @@ go.etcd.io/etcd/client/pkg/v3 v3.5.4/go.mod h1:IJHfcCEKxYu1Os13ZdwCwIUTUVGYTSAM3 go.etcd.io/etcd/client/v3 v3.5.4/go.mod h1:ZaRkVgBZC+L+dLCjTcF1hRXpgZXQPOvnA/Ak/gq3kiY= go.opencensus.io v0.24.0 h1:y73uSU6J157QMP2kn2r30vwW1A2W2WFwSCGnAVxeaD0= go.opencensus.io v0.24.0/go.mod h1:vNK8G9p7aAivkbmorf4v+7Hgx+Zs0yY+0fOtgBfjQKo= -go.opentelemetry.io/collector v0.66.1-0.20221128222955-4ff1ff379b90 h1:yRe05/jMdzH4TFHfndZ5h2o2hKBK/79W72j8w51qNsI= -go.opentelemetry.io/collector v0.66.1-0.20221128222955-4ff1ff379b90/go.mod h1:hE6jCs+0rfiufCrVPucKZTMwfHit1okfDPnwPT2eW1I= -go.opentelemetry.io/collector/component v0.66.1-0.20221128222955-4ff1ff379b90 h1:AYSNTXbezhNg43EuYdVVcgxE/2gBVrm00FDx4DOmQVg= -go.opentelemetry.io/collector/component v0.66.1-0.20221128222955-4ff1ff379b90/go.mod h1:0c84EqXUhvYe6KW7hJfh76tiI/5yjWCH2amwyQ06XLM= -go.opentelemetry.io/collector/consumer v0.66.1-0.20221128222955-4ff1ff379b90 h1:nzNXVfC1FzXBXCLMzbMv+qK3E4EGiNsnMhfVsBd2yzc= -go.opentelemetry.io/collector/consumer v0.66.1-0.20221128222955-4ff1ff379b90/go.mod h1:WtoRZa5SnxQO1ZEQdVxYpFcXCmq62rakv0oUSlPO0NQ= -go.opentelemetry.io/collector/featuregate v0.66.1-0.20221128222955-4ff1ff379b90 h1:UuJSFWbi9XxyNZsJKZuvpWg35BgRbcCGFH+38V2MAdw= -go.opentelemetry.io/collector/featuregate v0.66.1-0.20221128222955-4ff1ff379b90/go.mod h1:tewuFKJYalWBU0bmNKg++MC1ipINXUr6szYzOw2p1GI= -go.opentelemetry.io/collector/pdata v0.66.1-0.20221128222955-4ff1ff379b90 h1:Vu4S4jSNcd0VFPzxQNO4+UqGwnes1xJDoFLPRiWHm8I= -go.opentelemetry.io/collector/pdata v0.66.1-0.20221128222955-4ff1ff379b90/go.mod h1:pqyaznLzk21m+1KL6fwOsRryRELL+zNM0qiVSn0MbVc= +go.opentelemetry.io/collector v0.66.1-0.20221202005155-1c54042beb70 h1:INB2CsOtqqrija2KvMuIpbBQ3qX1BECEeR+d0NJX+oM= +go.opentelemetry.io/collector v0.66.1-0.20221202005155-1c54042beb70/go.mod h1:d0NHkHyANJy3HDTvYE/PoylMShUmFIbiir89ieI0X0c= +go.opentelemetry.io/collector/component v0.66.1-0.20221202005155-1c54042beb70 h1:dEoJhzCmRShgmVro/kXm6pouGElgxkH2DsvanzCeZtU= +go.opentelemetry.io/collector/component v0.66.1-0.20221202005155-1c54042beb70/go.mod h1:OsVnvFFe38QSpcuZlQ8cvarDzcloCexgQ1/B2m80F6U= +go.opentelemetry.io/collector/confmap v0.0.0-20221201172708-2bdff61fa52a h1:2TscCXAQASO2kU9xHcMIUM/FP29fiQIRTilZmliq/7I= +go.opentelemetry.io/collector/confmap v0.0.0-20221201172708-2bdff61fa52a/go.mod h1:qJ3e8bA8h4wz/jYlbeEUafVHdrU7DkpStnmIUAz6VTQ= +go.opentelemetry.io/collector/consumer v0.66.1-0.20221202005155-1c54042beb70 h1:XwpVjI1KeKGPXOZBLefGILMziPYuNf6IzbmiIEsIyI0= +go.opentelemetry.io/collector/consumer v0.66.1-0.20221202005155-1c54042beb70/go.mod h1:EWVBcSGcIcmeDGTnIboc/aqa3agsBeH8/q7yFWG7xVc= +go.opentelemetry.io/collector/featuregate v0.66.1-0.20221202005155-1c54042beb70 h1:V0tf4ebciqIs07jFATfLGdUpLRaEsi+AiWuA/in0G8Y= +go.opentelemetry.io/collector/featuregate v0.66.1-0.20221202005155-1c54042beb70/go.mod h1:tewuFKJYalWBU0bmNKg++MC1ipINXUr6szYzOw2p1GI= +go.opentelemetry.io/collector/pdata v0.66.1-0.20221202005155-1c54042beb70 h1:TPOrxkEMvZzfBSwF3ct+kUUgKA5g8unkZZbKQvJweeA= +go.opentelemetry.io/collector/pdata v0.66.1-0.20221202005155-1c54042beb70/go.mod h1:pqyaznLzk21m+1KL6fwOsRryRELL+zNM0qiVSn0MbVc= 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= @@ -295,8 +297,8 @@ go.uber.org/multierr v1.6.0/go.mod h1:cdWPpRnG4AhwMwsgIHip0KRBQjJy5kYEpYjJxpXp9i go.uber.org/multierr v1.8.0 h1:dg6GjLku4EH+249NNmoIciG9N/jURbDG+pFlTkhzIC8= go.uber.org/multierr v1.8.0/go.mod h1:7EAYxJLBy9rStEaz58O2t4Uvip6FSURkq8/ppBp95ak= go.uber.org/zap v1.17.0/go.mod h1:MXVU+bhUf/A7Xi2HNOnopQOrmycQ5Ih87HtOu4q5SSo= -go.uber.org/zap v1.23.0 h1:OjGQ5KQDEUawVHxNwQgPpiypGHOxo2mNZsOqTak4fFY= -go.uber.org/zap v1.23.0/go.mod h1:D+nX8jyLsMHMYrln8A0rJjFt/T/9/bGgIhAqxv5URuY= +go.uber.org/zap v1.24.0 h1:FiJd5l1UOLj0wCgbSE0rwwXHzEdAZS6hiiSnxJN/D60= +go.uber.org/zap v1.24.0/go.mod h1:2kMP+WWQ8aoFoedH3T2sq6iJ2yDWpHbP0f6MQbS9Gkg= golang.org/x/crypto v0.0.0-20180904163835-0709b304e793/go.mod h1:6SG95UA2DQfeDnfUPMdvaQW0Q7yPrPDi9nlGo2tz2b4= golang.org/x/crypto v0.0.0-20190308221718-c2843e01d9a2/go.mod h1:djNgcEr1/C05ACkg1iLfiJU5Ep61QUkGW8qpdssI0+w= golang.org/x/crypto v0.0.0-20190923035154-9ee001bba392/go.mod h1:/lpIB1dKB+9EgE3H3cr1v9wB50oz8l4C4h62xy7jSTY= diff --git a/processor/metricstransformprocessor/go.mod b/processor/metricstransformprocessor/go.mod index c96be039b434..fd88bca20bd5 100644 --- a/processor/metricstransformprocessor/go.mod +++ b/processor/metricstransformprocessor/go.mod @@ -5,11 +5,12 @@ go 1.18 require ( github.com/open-telemetry/opentelemetry-collector-contrib/internal/scrapertest v0.66.0 github.com/stretchr/testify v1.8.1 - go.opentelemetry.io/collector v0.66.1-0.20221128222955-4ff1ff379b90 - go.opentelemetry.io/collector/component v0.66.1-0.20221128222955-4ff1ff379b90 - go.opentelemetry.io/collector/consumer v0.66.1-0.20221128222955-4ff1ff379b90 - go.opentelemetry.io/collector/pdata v0.66.1-0.20221128222955-4ff1ff379b90 - go.uber.org/zap v1.23.0 + go.opentelemetry.io/collector v0.66.1-0.20221202005155-1c54042beb70 + go.opentelemetry.io/collector/component v0.66.1-0.20221202005155-1c54042beb70 + go.opentelemetry.io/collector/confmap v0.0.0-20221201172708-2bdff61fa52a + go.opentelemetry.io/collector/consumer v0.66.1-0.20221202005155-1c54042beb70 + go.opentelemetry.io/collector/pdata v0.66.1-0.20221202005155-1c54042beb70 + go.uber.org/zap v1.24.0 ) require ( @@ -29,7 +30,7 @@ require ( github.com/pmezard/go-difflib v1.0.0 // indirect github.com/rogpeppe/go-internal v1.8.1 // indirect go.opencensus.io v0.24.0 // indirect - go.opentelemetry.io/collector/featuregate v0.66.1-0.20221128222955-4ff1ff379b90 // indirect + go.opentelemetry.io/collector/featuregate v0.66.1-0.20221202005155-1c54042beb70 // 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 77a704ce7538..ffdfd00fdac6 100644 --- a/processor/metricstransformprocessor/go.sum +++ b/processor/metricstransformprocessor/go.sum @@ -264,16 +264,18 @@ go.etcd.io/etcd/client/pkg/v3 v3.5.4/go.mod h1:IJHfcCEKxYu1Os13ZdwCwIUTUVGYTSAM3 go.etcd.io/etcd/client/v3 v3.5.4/go.mod h1:ZaRkVgBZC+L+dLCjTcF1hRXpgZXQPOvnA/Ak/gq3kiY= go.opencensus.io v0.24.0 h1:y73uSU6J157QMP2kn2r30vwW1A2W2WFwSCGnAVxeaD0= go.opencensus.io v0.24.0/go.mod h1:vNK8G9p7aAivkbmorf4v+7Hgx+Zs0yY+0fOtgBfjQKo= -go.opentelemetry.io/collector v0.66.1-0.20221128222955-4ff1ff379b90 h1:yRe05/jMdzH4TFHfndZ5h2o2hKBK/79W72j8w51qNsI= -go.opentelemetry.io/collector v0.66.1-0.20221128222955-4ff1ff379b90/go.mod h1:hE6jCs+0rfiufCrVPucKZTMwfHit1okfDPnwPT2eW1I= -go.opentelemetry.io/collector/component v0.66.1-0.20221128222955-4ff1ff379b90 h1:AYSNTXbezhNg43EuYdVVcgxE/2gBVrm00FDx4DOmQVg= -go.opentelemetry.io/collector/component v0.66.1-0.20221128222955-4ff1ff379b90/go.mod h1:0c84EqXUhvYe6KW7hJfh76tiI/5yjWCH2amwyQ06XLM= -go.opentelemetry.io/collector/consumer v0.66.1-0.20221128222955-4ff1ff379b90 h1:nzNXVfC1FzXBXCLMzbMv+qK3E4EGiNsnMhfVsBd2yzc= -go.opentelemetry.io/collector/consumer v0.66.1-0.20221128222955-4ff1ff379b90/go.mod h1:WtoRZa5SnxQO1ZEQdVxYpFcXCmq62rakv0oUSlPO0NQ= -go.opentelemetry.io/collector/featuregate v0.66.1-0.20221128222955-4ff1ff379b90 h1:UuJSFWbi9XxyNZsJKZuvpWg35BgRbcCGFH+38V2MAdw= -go.opentelemetry.io/collector/featuregate v0.66.1-0.20221128222955-4ff1ff379b90/go.mod h1:tewuFKJYalWBU0bmNKg++MC1ipINXUr6szYzOw2p1GI= -go.opentelemetry.io/collector/pdata v0.66.1-0.20221128222955-4ff1ff379b90 h1:Vu4S4jSNcd0VFPzxQNO4+UqGwnes1xJDoFLPRiWHm8I= -go.opentelemetry.io/collector/pdata v0.66.1-0.20221128222955-4ff1ff379b90/go.mod h1:pqyaznLzk21m+1KL6fwOsRryRELL+zNM0qiVSn0MbVc= +go.opentelemetry.io/collector v0.66.1-0.20221202005155-1c54042beb70 h1:INB2CsOtqqrija2KvMuIpbBQ3qX1BECEeR+d0NJX+oM= +go.opentelemetry.io/collector v0.66.1-0.20221202005155-1c54042beb70/go.mod h1:d0NHkHyANJy3HDTvYE/PoylMShUmFIbiir89ieI0X0c= +go.opentelemetry.io/collector/component v0.66.1-0.20221202005155-1c54042beb70 h1:dEoJhzCmRShgmVro/kXm6pouGElgxkH2DsvanzCeZtU= +go.opentelemetry.io/collector/component v0.66.1-0.20221202005155-1c54042beb70/go.mod h1:OsVnvFFe38QSpcuZlQ8cvarDzcloCexgQ1/B2m80F6U= +go.opentelemetry.io/collector/confmap v0.0.0-20221201172708-2bdff61fa52a h1:2TscCXAQASO2kU9xHcMIUM/FP29fiQIRTilZmliq/7I= +go.opentelemetry.io/collector/confmap v0.0.0-20221201172708-2bdff61fa52a/go.mod h1:qJ3e8bA8h4wz/jYlbeEUafVHdrU7DkpStnmIUAz6VTQ= +go.opentelemetry.io/collector/consumer v0.66.1-0.20221202005155-1c54042beb70 h1:XwpVjI1KeKGPXOZBLefGILMziPYuNf6IzbmiIEsIyI0= +go.opentelemetry.io/collector/consumer v0.66.1-0.20221202005155-1c54042beb70/go.mod h1:EWVBcSGcIcmeDGTnIboc/aqa3agsBeH8/q7yFWG7xVc= +go.opentelemetry.io/collector/featuregate v0.66.1-0.20221202005155-1c54042beb70 h1:V0tf4ebciqIs07jFATfLGdUpLRaEsi+AiWuA/in0G8Y= +go.opentelemetry.io/collector/featuregate v0.66.1-0.20221202005155-1c54042beb70/go.mod h1:tewuFKJYalWBU0bmNKg++MC1ipINXUr6szYzOw2p1GI= +go.opentelemetry.io/collector/pdata v0.66.1-0.20221202005155-1c54042beb70 h1:TPOrxkEMvZzfBSwF3ct+kUUgKA5g8unkZZbKQvJweeA= +go.opentelemetry.io/collector/pdata v0.66.1-0.20221202005155-1c54042beb70/go.mod h1:pqyaznLzk21m+1KL6fwOsRryRELL+zNM0qiVSn0MbVc= 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= @@ -288,8 +290,8 @@ go.uber.org/multierr v1.6.0/go.mod h1:cdWPpRnG4AhwMwsgIHip0KRBQjJy5kYEpYjJxpXp9i go.uber.org/multierr v1.8.0 h1:dg6GjLku4EH+249NNmoIciG9N/jURbDG+pFlTkhzIC8= go.uber.org/multierr v1.8.0/go.mod h1:7EAYxJLBy9rStEaz58O2t4Uvip6FSURkq8/ppBp95ak= go.uber.org/zap v1.17.0/go.mod h1:MXVU+bhUf/A7Xi2HNOnopQOrmycQ5Ih87HtOu4q5SSo= -go.uber.org/zap v1.23.0 h1:OjGQ5KQDEUawVHxNwQgPpiypGHOxo2mNZsOqTak4fFY= -go.uber.org/zap v1.23.0/go.mod h1:D+nX8jyLsMHMYrln8A0rJjFt/T/9/bGgIhAqxv5URuY= +go.uber.org/zap v1.24.0 h1:FiJd5l1UOLj0wCgbSE0rwwXHzEdAZS6hiiSnxJN/D60= +go.uber.org/zap v1.24.0/go.mod h1:2kMP+WWQ8aoFoedH3T2sq6iJ2yDWpHbP0f6MQbS9Gkg= golang.org/x/crypto v0.0.0-20180904163835-0709b304e793/go.mod h1:6SG95UA2DQfeDnfUPMdvaQW0Q7yPrPDi9nlGo2tz2b4= golang.org/x/crypto v0.0.0-20190308221718-c2843e01d9a2/go.mod h1:djNgcEr1/C05ACkg1iLfiJU5Ep61QUkGW8qpdssI0+w= golang.org/x/crypto v0.0.0-20190923035154-9ee001bba392/go.mod h1:/lpIB1dKB+9EgE3H3cr1v9wB50oz8l4C4h62xy7jSTY= diff --git a/processor/probabilisticsamplerprocessor/config_test.go b/processor/probabilisticsamplerprocessor/config_test.go index 5f96324246d7..7eed26e8cbff 100644 --- a/processor/probabilisticsamplerprocessor/config_test.go +++ b/processor/probabilisticsamplerprocessor/config_test.go @@ -45,7 +45,7 @@ func TestLoadConfig(t *testing.T) { { id: component.NewIDWithName(typeStr, "logs"), expected: &Config{ - ProcessorSettings: config.NewProcessorSettings(component.NewIDWithName(typeStr, "logs")), + ProcessorSettings: config.NewProcessorSettings(component.NewID(typeStr)), SamplingPercentage: 15.3, HashSeed: 22, AttributeSource: "record", @@ -68,7 +68,6 @@ func TestLoadConfig(t *testing.T) { sub, err := processors.Sub(tt.id.String()) require.NoError(t, err) require.NoError(t, component.UnmarshalConfig(sub, cfg)) - cfg.SetIDName(tt.id.Name()) assert.NoError(t, component.ValidateConfig(cfg)) assert.Equal(t, tt.expected, cfg) diff --git a/processor/probabilisticsamplerprocessor/go.mod b/processor/probabilisticsamplerprocessor/go.mod index 685d1f32857d..c5b2a78a6b72 100644 --- a/processor/probabilisticsamplerprocessor/go.mod +++ b/processor/probabilisticsamplerprocessor/go.mod @@ -6,12 +6,13 @@ require ( github.com/open-telemetry/opentelemetry-collector-contrib/internal/coreinternal v0.66.0 github.com/stretchr/testify v1.8.1 go.opencensus.io v0.24.0 - go.opentelemetry.io/collector v0.66.1-0.20221128222955-4ff1ff379b90 - go.opentelemetry.io/collector/component v0.66.1-0.20221128222955-4ff1ff379b90 - go.opentelemetry.io/collector/consumer v0.66.1-0.20221128222955-4ff1ff379b90 - go.opentelemetry.io/collector/pdata v0.66.1-0.20221128222955-4ff1ff379b90 - go.opentelemetry.io/collector/semconv v0.66.1-0.20221128222955-4ff1ff379b90 - go.uber.org/zap v1.23.0 + go.opentelemetry.io/collector v0.66.1-0.20221202005155-1c54042beb70 + go.opentelemetry.io/collector/component v0.66.1-0.20221202005155-1c54042beb70 + go.opentelemetry.io/collector/confmap v0.0.0-20221201172708-2bdff61fa52a + go.opentelemetry.io/collector/consumer v0.66.1-0.20221202005155-1c54042beb70 + go.opentelemetry.io/collector/pdata v0.66.1-0.20221202005155-1c54042beb70 + go.opentelemetry.io/collector/semconv v0.66.1-0.20221202005155-1c54042beb70 + go.uber.org/zap v1.24.0 ) require ( @@ -50,11 +51,11 @@ require ( github.com/shirou/gopsutil/v3 v3.22.10 // indirect github.com/spf13/cobra v1.6.1 // indirect github.com/spf13/pflag v1.0.5 // indirect - github.com/tklauser/go-sysconf v0.3.10 // indirect - github.com/tklauser/numcpus v0.4.0 // indirect + github.com/tklauser/go-sysconf v0.3.11 // indirect + github.com/tklauser/numcpus v0.6.0 // indirect github.com/yusufpapurcu/wmi v1.2.2 // indirect - go.opentelemetry.io/collector/featuregate v0.66.1-0.20221128222955-4ff1ff379b90 // indirect - go.opentelemetry.io/collector/processor/batchprocessor v0.66.1-0.20221128222955-4ff1ff379b90 // indirect + go.opentelemetry.io/collector/featuregate v0.66.1-0.20221202005155-1c54042beb70 // indirect + go.opentelemetry.io/collector/processor/batchprocessor v0.66.1-0.20221202005155-1c54042beb70 // 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/processor/probabilisticsamplerprocessor/go.sum b/processor/probabilisticsamplerprocessor/go.sum index cb52baa2a0b4..a3f8857031cd 100644 --- a/processor/probabilisticsamplerprocessor/go.sum +++ b/processor/probabilisticsamplerprocessor/go.sum @@ -374,10 +374,12 @@ github.com/stretchr/testify v1.8.0/go.mod h1:yNjHg4UonilssWZ8iaSj1OCr/vHnekPRkoO github.com/stretchr/testify v1.8.1 h1:w7B6lhMri9wdJUVmEZPGGhZzrYTPvgJArz7wNPgYKsk= github.com/stretchr/testify v1.8.1/go.mod h1:w2LPCIKwWwSfY2zedu0+kehJoqGctiVI29o6fzry7u4= github.com/stvp/go-udp-testing v0.0.0-20201019212854-469649b16807/go.mod h1:7jxmlfBCDBXRzr0eAQJ48XC1hBu1np4CS5+cHEYfwpc= -github.com/tklauser/go-sysconf v0.3.10 h1:IJ1AZGZRWbY8T5Vfk04D9WOA5WSejdflXxP03OUqALw= github.com/tklauser/go-sysconf v0.3.10/go.mod h1:C8XykCvCb+Gn0oNCWPIlcb0RuglQTYaQ2hGm7jmxEFk= -github.com/tklauser/numcpus v0.4.0 h1:E53Dm1HjH1/R2/aoCtXtPgzmElmn51aOkhCFSuZq//o= +github.com/tklauser/go-sysconf v0.3.11 h1:89WgdJhk5SNwJfu+GKyYveZ4IaJ7xAkecBo+KdJV0CM= +github.com/tklauser/go-sysconf v0.3.11/go.mod h1:GqXfhXY3kiPa0nAXPDIQIWzJbMCB7AmcWpGR8lSZfqI= github.com/tklauser/numcpus v0.4.0/go.mod h1:1+UI3pD8NW14VMwdgJNJ1ESk2UnwhAnz5hMwiKKqXCQ= +github.com/tklauser/numcpus v0.6.0 h1:kebhY2Qt+3U6RNK7UqpYNA+tJ23IBEGKkB7JQBfDYms= +github.com/tklauser/numcpus v0.6.0/go.mod h1:FEZLMke0lhOUG6w2JadTzp0a+Nl8PF/GFkQ5UVIcaL4= github.com/yuin/goldmark v1.1.25/go.mod h1:3hX8gzYuyVAZsxl0MRgGTJEmQBFcNTphYh9decYSb74= github.com/yuin/goldmark v1.1.27/go.mod h1:3hX8gzYuyVAZsxl0MRgGTJEmQBFcNTphYh9decYSb74= github.com/yuin/goldmark v1.1.32/go.mod h1:3hX8gzYuyVAZsxl0MRgGTJEmQBFcNTphYh9decYSb74= @@ -396,21 +398,23 @@ go.opencensus.io v0.22.4/go.mod h1:yxeiOL68Rb0Xd1ddK5vPZ/oVn4vY4Ynel7k9FzqtOIw= go.opencensus.io v0.23.0/go.mod h1:XItmlyltB5F7CS4xOC1DcqMoFqwtC6OG2xF7mCv7P7E= go.opencensus.io v0.24.0 h1:y73uSU6J157QMP2kn2r30vwW1A2W2WFwSCGnAVxeaD0= go.opencensus.io v0.24.0/go.mod h1:vNK8G9p7aAivkbmorf4v+7Hgx+Zs0yY+0fOtgBfjQKo= -go.opentelemetry.io/collector v0.66.1-0.20221128222955-4ff1ff379b90 h1:yRe05/jMdzH4TFHfndZ5h2o2hKBK/79W72j8w51qNsI= -go.opentelemetry.io/collector v0.66.1-0.20221128222955-4ff1ff379b90/go.mod h1:hE6jCs+0rfiufCrVPucKZTMwfHit1okfDPnwPT2eW1I= -go.opentelemetry.io/collector/component v0.66.1-0.20221128222955-4ff1ff379b90 h1:AYSNTXbezhNg43EuYdVVcgxE/2gBVrm00FDx4DOmQVg= -go.opentelemetry.io/collector/component v0.66.1-0.20221128222955-4ff1ff379b90/go.mod h1:0c84EqXUhvYe6KW7hJfh76tiI/5yjWCH2amwyQ06XLM= -go.opentelemetry.io/collector/consumer v0.66.1-0.20221128222955-4ff1ff379b90 h1:nzNXVfC1FzXBXCLMzbMv+qK3E4EGiNsnMhfVsBd2yzc= -go.opentelemetry.io/collector/consumer v0.66.1-0.20221128222955-4ff1ff379b90/go.mod h1:WtoRZa5SnxQO1ZEQdVxYpFcXCmq62rakv0oUSlPO0NQ= -go.opentelemetry.io/collector/extension/zpagesextension v0.65.0 h1:T5JJIJ3cmClqdSMgkbjoIiP9p059AAvbfcd3houJkxM= -go.opentelemetry.io/collector/featuregate v0.66.1-0.20221128222955-4ff1ff379b90 h1:UuJSFWbi9XxyNZsJKZuvpWg35BgRbcCGFH+38V2MAdw= -go.opentelemetry.io/collector/featuregate v0.66.1-0.20221128222955-4ff1ff379b90/go.mod h1:tewuFKJYalWBU0bmNKg++MC1ipINXUr6szYzOw2p1GI= -go.opentelemetry.io/collector/pdata v0.66.1-0.20221128222955-4ff1ff379b90 h1:Vu4S4jSNcd0VFPzxQNO4+UqGwnes1xJDoFLPRiWHm8I= -go.opentelemetry.io/collector/pdata v0.66.1-0.20221128222955-4ff1ff379b90/go.mod h1:pqyaznLzk21m+1KL6fwOsRryRELL+zNM0qiVSn0MbVc= -go.opentelemetry.io/collector/processor/batchprocessor v0.66.1-0.20221128222955-4ff1ff379b90 h1:K12L9juzjChBMfp7cQaQsToz7i7975tUYVzJ3Tpw/Cw= -go.opentelemetry.io/collector/processor/batchprocessor v0.66.1-0.20221128222955-4ff1ff379b90/go.mod h1:XhGTsC1B/bq4gpg8IZ/QYBLXkzE4Gw3r7Xu2+ik8A1Q= -go.opentelemetry.io/collector/semconv v0.66.1-0.20221128222955-4ff1ff379b90 h1:hFaTA68cggZKWMv7wQ3bKP8KGTbowh/5AQZKCHzHTqM= -go.opentelemetry.io/collector/semconv v0.66.1-0.20221128222955-4ff1ff379b90/go.mod h1:5o9yhOa+ABt7g2E5JABDxGZ1PQPbtfxrKNbYn+LOTXU= +go.opentelemetry.io/collector v0.66.1-0.20221202005155-1c54042beb70 h1:INB2CsOtqqrija2KvMuIpbBQ3qX1BECEeR+d0NJX+oM= +go.opentelemetry.io/collector v0.66.1-0.20221202005155-1c54042beb70/go.mod h1:d0NHkHyANJy3HDTvYE/PoylMShUmFIbiir89ieI0X0c= +go.opentelemetry.io/collector/component v0.66.1-0.20221202005155-1c54042beb70 h1:dEoJhzCmRShgmVro/kXm6pouGElgxkH2DsvanzCeZtU= +go.opentelemetry.io/collector/component v0.66.1-0.20221202005155-1c54042beb70/go.mod h1:OsVnvFFe38QSpcuZlQ8cvarDzcloCexgQ1/B2m80F6U= +go.opentelemetry.io/collector/confmap v0.0.0-20221201172708-2bdff61fa52a h1:2TscCXAQASO2kU9xHcMIUM/FP29fiQIRTilZmliq/7I= +go.opentelemetry.io/collector/confmap v0.0.0-20221201172708-2bdff61fa52a/go.mod h1:qJ3e8bA8h4wz/jYlbeEUafVHdrU7DkpStnmIUAz6VTQ= +go.opentelemetry.io/collector/consumer v0.66.1-0.20221202005155-1c54042beb70 h1:XwpVjI1KeKGPXOZBLefGILMziPYuNf6IzbmiIEsIyI0= +go.opentelemetry.io/collector/consumer v0.66.1-0.20221202005155-1c54042beb70/go.mod h1:EWVBcSGcIcmeDGTnIboc/aqa3agsBeH8/q7yFWG7xVc= +go.opentelemetry.io/collector/extension/zpagesextension v0.66.0 h1:tPqSKH5K3VhTT0XXVoWL3woWBSTJqnXZQRt0ZLSCoCc= +go.opentelemetry.io/collector/featuregate v0.66.1-0.20221202005155-1c54042beb70 h1:V0tf4ebciqIs07jFATfLGdUpLRaEsi+AiWuA/in0G8Y= +go.opentelemetry.io/collector/featuregate v0.66.1-0.20221202005155-1c54042beb70/go.mod h1:tewuFKJYalWBU0bmNKg++MC1ipINXUr6szYzOw2p1GI= +go.opentelemetry.io/collector/pdata v0.66.1-0.20221202005155-1c54042beb70 h1:TPOrxkEMvZzfBSwF3ct+kUUgKA5g8unkZZbKQvJweeA= +go.opentelemetry.io/collector/pdata v0.66.1-0.20221202005155-1c54042beb70/go.mod h1:pqyaznLzk21m+1KL6fwOsRryRELL+zNM0qiVSn0MbVc= +go.opentelemetry.io/collector/processor/batchprocessor v0.66.1-0.20221202005155-1c54042beb70 h1:Y4e8NnVevonnAgmjX9Z7QIMA32yMqHAOnAlh8SzTS8c= +go.opentelemetry.io/collector/processor/batchprocessor v0.66.1-0.20221202005155-1c54042beb70/go.mod h1:Pi1CsKDQFoDrUP1i3+VdE6s2Xuji7bOGFBgqHK0J32E= +go.opentelemetry.io/collector/semconv v0.66.1-0.20221202005155-1c54042beb70 h1:Q5L9Urod3c8as6ZYaoaqBjarx/HXxsxy34DFZIU2fO4= +go.opentelemetry.io/collector/semconv v0.66.1-0.20221202005155-1c54042beb70/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= @@ -434,8 +438,8 @@ go.uber.org/multierr v1.6.0/go.mod h1:cdWPpRnG4AhwMwsgIHip0KRBQjJy5kYEpYjJxpXp9i go.uber.org/multierr v1.8.0 h1:dg6GjLku4EH+249NNmoIciG9N/jURbDG+pFlTkhzIC8= go.uber.org/multierr v1.8.0/go.mod h1:7EAYxJLBy9rStEaz58O2t4Uvip6FSURkq8/ppBp95ak= go.uber.org/zap v1.17.0/go.mod h1:MXVU+bhUf/A7Xi2HNOnopQOrmycQ5Ih87HtOu4q5SSo= -go.uber.org/zap v1.23.0 h1:OjGQ5KQDEUawVHxNwQgPpiypGHOxo2mNZsOqTak4fFY= -go.uber.org/zap v1.23.0/go.mod h1:D+nX8jyLsMHMYrln8A0rJjFt/T/9/bGgIhAqxv5URuY= +go.uber.org/zap v1.24.0 h1:FiJd5l1UOLj0wCgbSE0rwwXHzEdAZS6hiiSnxJN/D60= +go.uber.org/zap v1.24.0/go.mod h1:2kMP+WWQ8aoFoedH3T2sq6iJ2yDWpHbP0f6MQbS9Gkg= golang.org/x/crypto v0.0.0-20180904163835-0709b304e793/go.mod h1:6SG95UA2DQfeDnfUPMdvaQW0Q7yPrPDi9nlGo2tz2b4= golang.org/x/crypto v0.0.0-20190308221718-c2843e01d9a2/go.mod h1:djNgcEr1/C05ACkg1iLfiJU5Ep61QUkGW8qpdssI0+w= golang.org/x/crypto v0.0.0-20190510104115-cbcb75029529/go.mod h1:yigFU9vqHzYiE8UmvKecakEJjdnWj3jj499lnFckfCI= diff --git a/processor/redactionprocessor/go.mod b/processor/redactionprocessor/go.mod index d25b9d4115c6..a963e2faa152 100644 --- a/processor/redactionprocessor/go.mod +++ b/processor/redactionprocessor/go.mod @@ -4,11 +4,12 @@ go 1.18 require ( github.com/stretchr/testify v1.8.1 - go.opentelemetry.io/collector v0.66.1-0.20221128222955-4ff1ff379b90 - go.opentelemetry.io/collector/component v0.66.1-0.20221128222955-4ff1ff379b90 - go.opentelemetry.io/collector/consumer v0.66.1-0.20221128222955-4ff1ff379b90 - go.opentelemetry.io/collector/pdata v0.66.1-0.20221128222955-4ff1ff379b90 - go.uber.org/zap v1.23.0 + go.opentelemetry.io/collector v0.66.1-0.20221202005155-1c54042beb70 + go.opentelemetry.io/collector/component v0.66.1-0.20221202005155-1c54042beb70 + go.opentelemetry.io/collector/confmap v0.0.0-20221201172708-2bdff61fa52a + go.opentelemetry.io/collector/consumer v0.66.1-0.20221202005155-1c54042beb70 + go.opentelemetry.io/collector/pdata v0.66.1-0.20221202005155-1c54042beb70 + go.uber.org/zap v1.24.0 ) require ( @@ -28,7 +29,7 @@ require ( github.com/pelletier/go-toml v1.9.4 // indirect github.com/pmezard/go-difflib v1.0.0 // indirect go.opencensus.io v0.24.0 // indirect - go.opentelemetry.io/collector/featuregate v0.66.1-0.20221128222955-4ff1ff379b90 // indirect + go.opentelemetry.io/collector/featuregate v0.66.1-0.20221202005155-1c54042beb70 // 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 ea32c58d9257..237fd2c56c5e 100644 --- a/processor/redactionprocessor/go.sum +++ b/processor/redactionprocessor/go.sum @@ -271,16 +271,18 @@ go.etcd.io/etcd/client/pkg/v3 v3.5.4/go.mod h1:IJHfcCEKxYu1Os13ZdwCwIUTUVGYTSAM3 go.etcd.io/etcd/client/v3 v3.5.4/go.mod h1:ZaRkVgBZC+L+dLCjTcF1hRXpgZXQPOvnA/Ak/gq3kiY= go.opencensus.io v0.24.0 h1:y73uSU6J157QMP2kn2r30vwW1A2W2WFwSCGnAVxeaD0= go.opencensus.io v0.24.0/go.mod h1:vNK8G9p7aAivkbmorf4v+7Hgx+Zs0yY+0fOtgBfjQKo= -go.opentelemetry.io/collector v0.66.1-0.20221128222955-4ff1ff379b90 h1:yRe05/jMdzH4TFHfndZ5h2o2hKBK/79W72j8w51qNsI= -go.opentelemetry.io/collector v0.66.1-0.20221128222955-4ff1ff379b90/go.mod h1:hE6jCs+0rfiufCrVPucKZTMwfHit1okfDPnwPT2eW1I= -go.opentelemetry.io/collector/component v0.66.1-0.20221128222955-4ff1ff379b90 h1:AYSNTXbezhNg43EuYdVVcgxE/2gBVrm00FDx4DOmQVg= -go.opentelemetry.io/collector/component v0.66.1-0.20221128222955-4ff1ff379b90/go.mod h1:0c84EqXUhvYe6KW7hJfh76tiI/5yjWCH2amwyQ06XLM= -go.opentelemetry.io/collector/consumer v0.66.1-0.20221128222955-4ff1ff379b90 h1:nzNXVfC1FzXBXCLMzbMv+qK3E4EGiNsnMhfVsBd2yzc= -go.opentelemetry.io/collector/consumer v0.66.1-0.20221128222955-4ff1ff379b90/go.mod h1:WtoRZa5SnxQO1ZEQdVxYpFcXCmq62rakv0oUSlPO0NQ= -go.opentelemetry.io/collector/featuregate v0.66.1-0.20221128222955-4ff1ff379b90 h1:UuJSFWbi9XxyNZsJKZuvpWg35BgRbcCGFH+38V2MAdw= -go.opentelemetry.io/collector/featuregate v0.66.1-0.20221128222955-4ff1ff379b90/go.mod h1:tewuFKJYalWBU0bmNKg++MC1ipINXUr6szYzOw2p1GI= -go.opentelemetry.io/collector/pdata v0.66.1-0.20221128222955-4ff1ff379b90 h1:Vu4S4jSNcd0VFPzxQNO4+UqGwnes1xJDoFLPRiWHm8I= -go.opentelemetry.io/collector/pdata v0.66.1-0.20221128222955-4ff1ff379b90/go.mod h1:pqyaznLzk21m+1KL6fwOsRryRELL+zNM0qiVSn0MbVc= +go.opentelemetry.io/collector v0.66.1-0.20221202005155-1c54042beb70 h1:INB2CsOtqqrija2KvMuIpbBQ3qX1BECEeR+d0NJX+oM= +go.opentelemetry.io/collector v0.66.1-0.20221202005155-1c54042beb70/go.mod h1:d0NHkHyANJy3HDTvYE/PoylMShUmFIbiir89ieI0X0c= +go.opentelemetry.io/collector/component v0.66.1-0.20221202005155-1c54042beb70 h1:dEoJhzCmRShgmVro/kXm6pouGElgxkH2DsvanzCeZtU= +go.opentelemetry.io/collector/component v0.66.1-0.20221202005155-1c54042beb70/go.mod h1:OsVnvFFe38QSpcuZlQ8cvarDzcloCexgQ1/B2m80F6U= +go.opentelemetry.io/collector/confmap v0.0.0-20221201172708-2bdff61fa52a h1:2TscCXAQASO2kU9xHcMIUM/FP29fiQIRTilZmliq/7I= +go.opentelemetry.io/collector/confmap v0.0.0-20221201172708-2bdff61fa52a/go.mod h1:qJ3e8bA8h4wz/jYlbeEUafVHdrU7DkpStnmIUAz6VTQ= +go.opentelemetry.io/collector/consumer v0.66.1-0.20221202005155-1c54042beb70 h1:XwpVjI1KeKGPXOZBLefGILMziPYuNf6IzbmiIEsIyI0= +go.opentelemetry.io/collector/consumer v0.66.1-0.20221202005155-1c54042beb70/go.mod h1:EWVBcSGcIcmeDGTnIboc/aqa3agsBeH8/q7yFWG7xVc= +go.opentelemetry.io/collector/featuregate v0.66.1-0.20221202005155-1c54042beb70 h1:V0tf4ebciqIs07jFATfLGdUpLRaEsi+AiWuA/in0G8Y= +go.opentelemetry.io/collector/featuregate v0.66.1-0.20221202005155-1c54042beb70/go.mod h1:tewuFKJYalWBU0bmNKg++MC1ipINXUr6szYzOw2p1GI= +go.opentelemetry.io/collector/pdata v0.66.1-0.20221202005155-1c54042beb70 h1:TPOrxkEMvZzfBSwF3ct+kUUgKA5g8unkZZbKQvJweeA= +go.opentelemetry.io/collector/pdata v0.66.1-0.20221202005155-1c54042beb70/go.mod h1:pqyaznLzk21m+1KL6fwOsRryRELL+zNM0qiVSn0MbVc= 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= @@ -296,8 +298,8 @@ go.uber.org/multierr v1.6.0/go.mod h1:cdWPpRnG4AhwMwsgIHip0KRBQjJy5kYEpYjJxpXp9i go.uber.org/multierr v1.8.0 h1:dg6GjLku4EH+249NNmoIciG9N/jURbDG+pFlTkhzIC8= go.uber.org/multierr v1.8.0/go.mod h1:7EAYxJLBy9rStEaz58O2t4Uvip6FSURkq8/ppBp95ak= go.uber.org/zap v1.17.0/go.mod h1:MXVU+bhUf/A7Xi2HNOnopQOrmycQ5Ih87HtOu4q5SSo= -go.uber.org/zap v1.23.0 h1:OjGQ5KQDEUawVHxNwQgPpiypGHOxo2mNZsOqTak4fFY= -go.uber.org/zap v1.23.0/go.mod h1:D+nX8jyLsMHMYrln8A0rJjFt/T/9/bGgIhAqxv5URuY= +go.uber.org/zap v1.24.0 h1:FiJd5l1UOLj0wCgbSE0rwwXHzEdAZS6hiiSnxJN/D60= +go.uber.org/zap v1.24.0/go.mod h1:2kMP+WWQ8aoFoedH3T2sq6iJ2yDWpHbP0f6MQbS9Gkg= golang.org/x/crypto v0.0.0-20180904163835-0709b304e793/go.mod h1:6SG95UA2DQfeDnfUPMdvaQW0Q7yPrPDi9nlGo2tz2b4= golang.org/x/crypto v0.0.0-20190308221718-c2843e01d9a2/go.mod h1:djNgcEr1/C05ACkg1iLfiJU5Ep61QUkGW8qpdssI0+w= golang.org/x/crypto v0.0.0-20190923035154-9ee001bba392/go.mod h1:/lpIB1dKB+9EgE3H3cr1v9wB50oz8l4C4h62xy7jSTY= diff --git a/processor/resourcedetectionprocessor/factory.go b/processor/resourcedetectionprocessor/factory.go index fc0ce293bead..f8c4cde03e42 100644 --- a/processor/resourcedetectionprocessor/factory.go +++ b/processor/resourcedetectionprocessor/factory.go @@ -182,7 +182,7 @@ func (f *factory) getResourceDetectionProcessor( ) (*resourceDetectionProcessor, error) { oCfg := cfg.(*Config) - provider, err := f.getResourceProvider(params, cfg.ID(), oCfg.HTTPClientSettings.Timeout, oCfg.Detectors, oCfg.DetectorConfig, oCfg.Attributes) + provider, err := f.getResourceProvider(params, oCfg.HTTPClientSettings.Timeout, oCfg.Detectors, oCfg.DetectorConfig, oCfg.Attributes) if err != nil { return nil, err } @@ -197,7 +197,6 @@ func (f *factory) getResourceDetectionProcessor( func (f *factory) getResourceProvider( params component.ProcessorCreateSettings, - processorName component.ID, timeout time.Duration, configuredDetectors []string, detectorConfigs DetectorConfig, @@ -206,7 +205,7 @@ func (f *factory) getResourceProvider( f.lock.Lock() defer f.lock.Unlock() - if provider, ok := f.providers[processorName]; ok { + if provider, ok := f.providers[params.ID]; ok { return provider, nil } @@ -223,6 +222,6 @@ func (f *factory) getResourceProvider( return nil, err } - f.providers[processorName] = provider + f.providers[params.ID] = provider return provider, nil } diff --git a/processor/resourcedetectionprocessor/go.mod b/processor/resourcedetectionprocessor/go.mod index 75d8953d3204..35e5242bfd4a 100644 --- a/processor/resourcedetectionprocessor/go.mod +++ b/processor/resourcedetectionprocessor/go.mod @@ -4,7 +4,7 @@ go 1.18 require ( cloud.google.com/go/compute v1.10.0 - github.com/GoogleCloudPlatform/opentelemetry-operations-go/detectors/gcp v0.34.1 + github.com/GoogleCloudPlatform/opentelemetry-operations-go/detectors/gcp v0.34.2 github.com/aws/aws-sdk-go v1.44.145 github.com/census-instrumentation/opencensus-proto v0.4.1 github.com/hashicorp/consul/api v1.15.3 @@ -12,13 +12,14 @@ require ( github.com/open-telemetry/opentelemetry-collector-contrib/internal/metadataproviders v0.66.0 github.com/open-telemetry/opentelemetry-collector-contrib/pkg/translator/opencensus v0.66.0 github.com/stretchr/testify v1.8.1 - go.opentelemetry.io/collector v0.66.1-0.20221128222955-4ff1ff379b90 - go.opentelemetry.io/collector/component v0.66.1-0.20221128222955-4ff1ff379b90 - go.opentelemetry.io/collector/consumer v0.66.1-0.20221128222955-4ff1ff379b90 - go.opentelemetry.io/collector/pdata v0.66.1-0.20221128222955-4ff1ff379b90 - go.opentelemetry.io/collector/semconv v0.66.1-0.20221128222955-4ff1ff379b90 + go.opentelemetry.io/collector v0.66.1-0.20221202005155-1c54042beb70 + go.opentelemetry.io/collector/component v0.66.1-0.20221202005155-1c54042beb70 + go.opentelemetry.io/collector/confmap v0.0.0-20221201172708-2bdff61fa52a + go.opentelemetry.io/collector/consumer v0.66.1-0.20221202005155-1c54042beb70 + go.opentelemetry.io/collector/pdata v0.66.1-0.20221202005155-1c54042beb70 + go.opentelemetry.io/collector/semconv v0.66.1-0.20221202005155-1c54042beb70 go.uber.org/multierr v1.8.0 - go.uber.org/zap v1.23.0 + go.uber.org/zap v1.24.0 k8s.io/apimachinery v0.25.4 k8s.io/client-go v0.25.4 ) @@ -80,7 +81,7 @@ require ( github.com/sirupsen/logrus v1.8.1 // indirect github.com/stretchr/objx v0.5.0 // indirect go.opencensus.io v0.24.0 // indirect - go.opentelemetry.io/collector/featuregate v0.66.1-0.20221128222955-4ff1ff379b90 // indirect + go.opentelemetry.io/collector/featuregate v0.66.1-0.20221202005155-1c54042beb70 // 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 85c15a44296b..d6d5b41efb4a 100644 --- a/processor/resourcedetectionprocessor/go.sum +++ b/processor/resourcedetectionprocessor/go.sum @@ -6,8 +6,8 @@ github.com/Azure/go-ansiterm v0.0.0-20210617225240-d185dfc1b5a1 h1:UQHMgLO+TxOEl github.com/Azure/go-ansiterm v0.0.0-20210617225240-d185dfc1b5a1/go.mod h1:xomTg63KZ2rFqZQzSB4Vz2SUXa1BpHTVz9L5PTmPC4E= github.com/BurntSushi/toml v0.3.1/go.mod h1:xHWCNGjB5oqiDr8zfno3MHue2Ht5sIBksp03qcyfWMU= github.com/DataDog/datadog-go v3.2.0+incompatible/go.mod h1:LButxg5PwREeZtORoXG3tL4fMGNddJ+vMq1mwgfaqoQ= -github.com/GoogleCloudPlatform/opentelemetry-operations-go/detectors/gcp v0.34.1 h1:gcHr5iIamTMH+TOqvcIrkZ9zpDOKVkc2du/VYGJkYfM= -github.com/GoogleCloudPlatform/opentelemetry-operations-go/detectors/gcp v0.34.1/go.mod h1:8jbDwk101z1YJ201wir2t/3O5Sxn55M37IDVwnQA1rg= +github.com/GoogleCloudPlatform/opentelemetry-operations-go/detectors/gcp v0.34.2 h1:ebkUIeRzDUUeX7Mot0nYeyOhBMhS9bJj7v3tvZyqpdQ= +github.com/GoogleCloudPlatform/opentelemetry-operations-go/detectors/gcp v0.34.2/go.mod h1:HpmGbYLf1fsWiqVA0Z2oKh7qi7BroCgOl2NqB2N/TG4= github.com/Microsoft/go-winio v0.5.2 h1:a9IhgEQBCUEk6QCdml9CiJGhAws+YwffDHEMp1VMrpA= github.com/Microsoft/go-winio v0.5.2/go.mod h1:WpS1mjBmmwHBEWmogvA2mj8546UReBk4v8QkMxJ6pZY= github.com/PuerkitoBio/purell v1.1.1 h1:WEQqlqaGbrPkxLJWfBwQmfEAE1Z7ONdDLqrN38tNFfI= @@ -399,18 +399,20 @@ go.etcd.io/etcd/client/pkg/v3 v3.5.4/go.mod h1:IJHfcCEKxYu1Os13ZdwCwIUTUVGYTSAM3 go.etcd.io/etcd/client/v3 v3.5.4/go.mod h1:ZaRkVgBZC+L+dLCjTcF1hRXpgZXQPOvnA/Ak/gq3kiY= go.opencensus.io v0.24.0 h1:y73uSU6J157QMP2kn2r30vwW1A2W2WFwSCGnAVxeaD0= go.opencensus.io v0.24.0/go.mod h1:vNK8G9p7aAivkbmorf4v+7Hgx+Zs0yY+0fOtgBfjQKo= -go.opentelemetry.io/collector v0.66.1-0.20221128222955-4ff1ff379b90 h1:yRe05/jMdzH4TFHfndZ5h2o2hKBK/79W72j8w51qNsI= -go.opentelemetry.io/collector v0.66.1-0.20221128222955-4ff1ff379b90/go.mod h1:hE6jCs+0rfiufCrVPucKZTMwfHit1okfDPnwPT2eW1I= -go.opentelemetry.io/collector/component v0.66.1-0.20221128222955-4ff1ff379b90 h1:AYSNTXbezhNg43EuYdVVcgxE/2gBVrm00FDx4DOmQVg= -go.opentelemetry.io/collector/component v0.66.1-0.20221128222955-4ff1ff379b90/go.mod h1:0c84EqXUhvYe6KW7hJfh76tiI/5yjWCH2amwyQ06XLM= -go.opentelemetry.io/collector/consumer v0.66.1-0.20221128222955-4ff1ff379b90 h1:nzNXVfC1FzXBXCLMzbMv+qK3E4EGiNsnMhfVsBd2yzc= -go.opentelemetry.io/collector/consumer v0.66.1-0.20221128222955-4ff1ff379b90/go.mod h1:WtoRZa5SnxQO1ZEQdVxYpFcXCmq62rakv0oUSlPO0NQ= -go.opentelemetry.io/collector/featuregate v0.66.1-0.20221128222955-4ff1ff379b90 h1:UuJSFWbi9XxyNZsJKZuvpWg35BgRbcCGFH+38V2MAdw= -go.opentelemetry.io/collector/featuregate v0.66.1-0.20221128222955-4ff1ff379b90/go.mod h1:tewuFKJYalWBU0bmNKg++MC1ipINXUr6szYzOw2p1GI= -go.opentelemetry.io/collector/pdata v0.66.1-0.20221128222955-4ff1ff379b90 h1:Vu4S4jSNcd0VFPzxQNO4+UqGwnes1xJDoFLPRiWHm8I= -go.opentelemetry.io/collector/pdata v0.66.1-0.20221128222955-4ff1ff379b90/go.mod h1:pqyaznLzk21m+1KL6fwOsRryRELL+zNM0qiVSn0MbVc= -go.opentelemetry.io/collector/semconv v0.66.1-0.20221128222955-4ff1ff379b90 h1:hFaTA68cggZKWMv7wQ3bKP8KGTbowh/5AQZKCHzHTqM= -go.opentelemetry.io/collector/semconv v0.66.1-0.20221128222955-4ff1ff379b90/go.mod h1:5o9yhOa+ABt7g2E5JABDxGZ1PQPbtfxrKNbYn+LOTXU= +go.opentelemetry.io/collector v0.66.1-0.20221202005155-1c54042beb70 h1:INB2CsOtqqrija2KvMuIpbBQ3qX1BECEeR+d0NJX+oM= +go.opentelemetry.io/collector v0.66.1-0.20221202005155-1c54042beb70/go.mod h1:d0NHkHyANJy3HDTvYE/PoylMShUmFIbiir89ieI0X0c= +go.opentelemetry.io/collector/component v0.66.1-0.20221202005155-1c54042beb70 h1:dEoJhzCmRShgmVro/kXm6pouGElgxkH2DsvanzCeZtU= +go.opentelemetry.io/collector/component v0.66.1-0.20221202005155-1c54042beb70/go.mod h1:OsVnvFFe38QSpcuZlQ8cvarDzcloCexgQ1/B2m80F6U= +go.opentelemetry.io/collector/confmap v0.0.0-20221201172708-2bdff61fa52a h1:2TscCXAQASO2kU9xHcMIUM/FP29fiQIRTilZmliq/7I= +go.opentelemetry.io/collector/confmap v0.0.0-20221201172708-2bdff61fa52a/go.mod h1:qJ3e8bA8h4wz/jYlbeEUafVHdrU7DkpStnmIUAz6VTQ= +go.opentelemetry.io/collector/consumer v0.66.1-0.20221202005155-1c54042beb70 h1:XwpVjI1KeKGPXOZBLefGILMziPYuNf6IzbmiIEsIyI0= +go.opentelemetry.io/collector/consumer v0.66.1-0.20221202005155-1c54042beb70/go.mod h1:EWVBcSGcIcmeDGTnIboc/aqa3agsBeH8/q7yFWG7xVc= +go.opentelemetry.io/collector/featuregate v0.66.1-0.20221202005155-1c54042beb70 h1:V0tf4ebciqIs07jFATfLGdUpLRaEsi+AiWuA/in0G8Y= +go.opentelemetry.io/collector/featuregate v0.66.1-0.20221202005155-1c54042beb70/go.mod h1:tewuFKJYalWBU0bmNKg++MC1ipINXUr6szYzOw2p1GI= +go.opentelemetry.io/collector/pdata v0.66.1-0.20221202005155-1c54042beb70 h1:TPOrxkEMvZzfBSwF3ct+kUUgKA5g8unkZZbKQvJweeA= +go.opentelemetry.io/collector/pdata v0.66.1-0.20221202005155-1c54042beb70/go.mod h1:pqyaznLzk21m+1KL6fwOsRryRELL+zNM0qiVSn0MbVc= +go.opentelemetry.io/collector/semconv v0.66.1-0.20221202005155-1c54042beb70 h1:Q5L9Urod3c8as6ZYaoaqBjarx/HXxsxy34DFZIU2fO4= +go.opentelemetry.io/collector/semconv v0.66.1-0.20221202005155-1c54042beb70/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= @@ -427,8 +429,8 @@ go.uber.org/multierr v1.6.0/go.mod h1:cdWPpRnG4AhwMwsgIHip0KRBQjJy5kYEpYjJxpXp9i go.uber.org/multierr v1.8.0 h1:dg6GjLku4EH+249NNmoIciG9N/jURbDG+pFlTkhzIC8= go.uber.org/multierr v1.8.0/go.mod h1:7EAYxJLBy9rStEaz58O2t4Uvip6FSURkq8/ppBp95ak= go.uber.org/zap v1.17.0/go.mod h1:MXVU+bhUf/A7Xi2HNOnopQOrmycQ5Ih87HtOu4q5SSo= -go.uber.org/zap v1.23.0 h1:OjGQ5KQDEUawVHxNwQgPpiypGHOxo2mNZsOqTak4fFY= -go.uber.org/zap v1.23.0/go.mod h1:D+nX8jyLsMHMYrln8A0rJjFt/T/9/bGgIhAqxv5URuY= +go.uber.org/zap v1.24.0 h1:FiJd5l1UOLj0wCgbSE0rwwXHzEdAZS6hiiSnxJN/D60= +go.uber.org/zap v1.24.0/go.mod h1:2kMP+WWQ8aoFoedH3T2sq6iJ2yDWpHbP0f6MQbS9Gkg= golang.org/x/crypto v0.0.0-20180904163835-0709b304e793/go.mod h1:6SG95UA2DQfeDnfUPMdvaQW0Q7yPrPDi9nlGo2tz2b4= golang.org/x/crypto v0.0.0-20190308221718-c2843e01d9a2/go.mod h1:djNgcEr1/C05ACkg1iLfiJU5Ep61QUkGW8qpdssI0+w= golang.org/x/crypto v0.0.0-20190923035154-9ee001bba392/go.mod h1:/lpIB1dKB+9EgE3H3cr1v9wB50oz8l4C4h62xy7jSTY= diff --git a/processor/resourceprocessor/config.go b/processor/resourceprocessor/config.go index cb7a84854f40..d3f548cfbfe2 100644 --- a/processor/resourceprocessor/config.go +++ b/processor/resourceprocessor/config.go @@ -15,6 +15,8 @@ package resourceprocessor // import "github.com/open-telemetry/opentelemetry-collector-contrib/processor/resourceprocessor" import ( + "errors" + "go.opentelemetry.io/collector/component" "go.opentelemetry.io/collector/config" @@ -34,5 +36,8 @@ var _ component.Config = (*Config)(nil) // Validate checks if the processor configuration is valid func (cfg *Config) Validate() error { + if len(cfg.AttributesActions) == 0 { + return errors.New("missing required field \"attributes\"") + } return nil } diff --git a/processor/resourceprocessor/config_test.go b/processor/resourceprocessor/config_test.go index 6acdf58938aa..822c954d1d50 100644 --- a/processor/resourceprocessor/config_test.go +++ b/processor/resourceprocessor/config_test.go @@ -33,6 +33,7 @@ func TestLoadConfig(t *testing.T) { tests := []struct { id component.ID expected component.Config + valid bool }{ { id: component.NewIDWithName(typeStr, ""), @@ -44,6 +45,7 @@ func TestLoadConfig(t *testing.T) { {Key: "redundant-attribute", Action: attraction.DELETE}, }, }, + valid: true, }, { id: component.NewIDWithName(typeStr, "invalid"), @@ -63,7 +65,11 @@ func TestLoadConfig(t *testing.T) { require.NoError(t, err) require.NoError(t, component.UnmarshalConfig(sub, cfg)) - assert.NoError(t, component.ValidateConfig(cfg)) + if tt.valid { + assert.NoError(t, component.ValidateConfig(cfg)) + } else { + assert.Error(t, component.ValidateConfig(cfg)) + } assert.Equal(t, tt.expected, cfg) }) } diff --git a/processor/resourceprocessor/factory.go b/processor/resourceprocessor/factory.go index c953789ba09f..624335bf0cec 100644 --- a/processor/resourceprocessor/factory.go +++ b/processor/resourceprocessor/factory.go @@ -16,7 +16,6 @@ package resourceprocessor // import "github.com/open-telemetry/opentelemetry-col import ( "context" - "fmt" "go.opentelemetry.io/collector/component" "go.opentelemetry.io/collector/config" @@ -57,7 +56,7 @@ func createTracesProcessor( set component.ProcessorCreateSettings, cfg component.Config, nextConsumer consumer.Traces) (component.TracesProcessor, error) { - attrProc, err := createAttrProcessor(cfg.(*Config)) + attrProc, err := attraction.NewAttrProc(&attraction.Settings{Actions: cfg.(*Config).AttributesActions}) if err != nil { return nil, err } @@ -76,7 +75,7 @@ func createMetricsProcessor( set component.ProcessorCreateSettings, cfg component.Config, nextConsumer consumer.Metrics) (component.MetricsProcessor, error) { - attrProc, err := createAttrProcessor(cfg.(*Config)) + attrProc, err := attraction.NewAttrProc(&attraction.Settings{Actions: cfg.(*Config).AttributesActions}) if err != nil { return nil, err } @@ -95,7 +94,7 @@ func createLogsProcessor( set component.ProcessorCreateSettings, cfg component.Config, nextConsumer consumer.Logs) (component.LogsProcessor, error) { - attrProc, err := createAttrProcessor(cfg.(*Config)) + attrProc, err := attraction.NewAttrProc(&attraction.Settings{Actions: cfg.(*Config).AttributesActions}) if err != nil { return nil, err } @@ -108,14 +107,3 @@ func createLogsProcessor( proc.processLogs, processorhelper.WithCapabilities(processorCapabilities)) } - -func createAttrProcessor(cfg *Config) (*attraction.AttrProc, error) { - if len(cfg.AttributesActions) == 0 { - return nil, fmt.Errorf("error creating \"%v\" processor due to missing required field \"attributes\"", cfg.ID()) - } - attrProc, err := attraction.NewAttrProc(&attraction.Settings{Actions: cfg.AttributesActions}) - if err != nil { - return nil, fmt.Errorf("error creating \"%v\" processor: %w", cfg.ID(), err) - } - return attrProc, nil -} diff --git a/processor/resourceprocessor/factory_test.go b/processor/resourceprocessor/factory_test.go index 6d8dfaa6ccd0..2df645cbd49e 100644 --- a/processor/resourceprocessor/factory_test.go +++ b/processor/resourceprocessor/factory_test.go @@ -52,17 +52,6 @@ func TestCreateProcessor(t *testing.T) { assert.NotNil(t, mp) } -func TestInvalidEmptyActions(t *testing.T) { - factory := NewFactory() - cfg := factory.CreateDefaultConfig() - - _, err := factory.CreateTracesProcessor(context.Background(), componenttest.NewNopProcessorCreateSettings(), cfg, consumertest.NewNop()) - assert.Error(t, err) - - _, err = factory.CreateMetricsProcessor(context.Background(), componenttest.NewNopProcessorCreateSettings(), cfg, consumertest.NewNop()) - assert.Error(t, err) -} - func TestInvalidAttributeActions(t *testing.T) { factory := NewFactory() cfg := &Config{ diff --git a/processor/resourceprocessor/go.mod b/processor/resourceprocessor/go.mod index 6acd86f9b01c..8d3ef715d5b7 100644 --- a/processor/resourceprocessor/go.mod +++ b/processor/resourceprocessor/go.mod @@ -5,11 +5,12 @@ go 1.18 require ( github.com/open-telemetry/opentelemetry-collector-contrib/internal/coreinternal v0.66.0 github.com/stretchr/testify v1.8.1 - go.opentelemetry.io/collector v0.66.1-0.20221128222955-4ff1ff379b90 - go.opentelemetry.io/collector/component v0.66.1-0.20221128222955-4ff1ff379b90 - go.opentelemetry.io/collector/consumer v0.66.1-0.20221128222955-4ff1ff379b90 - go.opentelemetry.io/collector/pdata v0.66.1-0.20221128222955-4ff1ff379b90 - go.uber.org/zap v1.23.0 + go.opentelemetry.io/collector v0.66.1-0.20221202005155-1c54042beb70 + go.opentelemetry.io/collector/component v0.66.1-0.20221202005155-1c54042beb70 + go.opentelemetry.io/collector/confmap v0.0.0-20221201172708-2bdff61fa52a + go.opentelemetry.io/collector/consumer v0.66.1-0.20221202005155-1c54042beb70 + go.opentelemetry.io/collector/pdata v0.66.1-0.20221202005155-1c54042beb70 + go.uber.org/zap v1.24.0 ) require ( @@ -27,7 +28,7 @@ require ( github.com/pmezard/go-difflib v1.0.0 // indirect github.com/rogpeppe/go-internal v1.6.1 // indirect go.opencensus.io v0.24.0 // indirect - go.opentelemetry.io/collector/featuregate v0.66.1-0.20221128222955-4ff1ff379b90 // indirect + go.opentelemetry.io/collector/featuregate v0.66.1-0.20221202005155-1c54042beb70 // 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 ea344580a376..f160661c7160 100644 --- a/processor/resourceprocessor/go.sum +++ b/processor/resourceprocessor/go.sum @@ -260,16 +260,18 @@ go.etcd.io/etcd/client/pkg/v3 v3.5.4/go.mod h1:IJHfcCEKxYu1Os13ZdwCwIUTUVGYTSAM3 go.etcd.io/etcd/client/v3 v3.5.4/go.mod h1:ZaRkVgBZC+L+dLCjTcF1hRXpgZXQPOvnA/Ak/gq3kiY= go.opencensus.io v0.24.0 h1:y73uSU6J157QMP2kn2r30vwW1A2W2WFwSCGnAVxeaD0= go.opencensus.io v0.24.0/go.mod h1:vNK8G9p7aAivkbmorf4v+7Hgx+Zs0yY+0fOtgBfjQKo= -go.opentelemetry.io/collector v0.66.1-0.20221128222955-4ff1ff379b90 h1:yRe05/jMdzH4TFHfndZ5h2o2hKBK/79W72j8w51qNsI= -go.opentelemetry.io/collector v0.66.1-0.20221128222955-4ff1ff379b90/go.mod h1:hE6jCs+0rfiufCrVPucKZTMwfHit1okfDPnwPT2eW1I= -go.opentelemetry.io/collector/component v0.66.1-0.20221128222955-4ff1ff379b90 h1:AYSNTXbezhNg43EuYdVVcgxE/2gBVrm00FDx4DOmQVg= -go.opentelemetry.io/collector/component v0.66.1-0.20221128222955-4ff1ff379b90/go.mod h1:0c84EqXUhvYe6KW7hJfh76tiI/5yjWCH2amwyQ06XLM= -go.opentelemetry.io/collector/consumer v0.66.1-0.20221128222955-4ff1ff379b90 h1:nzNXVfC1FzXBXCLMzbMv+qK3E4EGiNsnMhfVsBd2yzc= -go.opentelemetry.io/collector/consumer v0.66.1-0.20221128222955-4ff1ff379b90/go.mod h1:WtoRZa5SnxQO1ZEQdVxYpFcXCmq62rakv0oUSlPO0NQ= -go.opentelemetry.io/collector/featuregate v0.66.1-0.20221128222955-4ff1ff379b90 h1:UuJSFWbi9XxyNZsJKZuvpWg35BgRbcCGFH+38V2MAdw= -go.opentelemetry.io/collector/featuregate v0.66.1-0.20221128222955-4ff1ff379b90/go.mod h1:tewuFKJYalWBU0bmNKg++MC1ipINXUr6szYzOw2p1GI= -go.opentelemetry.io/collector/pdata v0.66.1-0.20221128222955-4ff1ff379b90 h1:Vu4S4jSNcd0VFPzxQNO4+UqGwnes1xJDoFLPRiWHm8I= -go.opentelemetry.io/collector/pdata v0.66.1-0.20221128222955-4ff1ff379b90/go.mod h1:pqyaznLzk21m+1KL6fwOsRryRELL+zNM0qiVSn0MbVc= +go.opentelemetry.io/collector v0.66.1-0.20221202005155-1c54042beb70 h1:INB2CsOtqqrija2KvMuIpbBQ3qX1BECEeR+d0NJX+oM= +go.opentelemetry.io/collector v0.66.1-0.20221202005155-1c54042beb70/go.mod h1:d0NHkHyANJy3HDTvYE/PoylMShUmFIbiir89ieI0X0c= +go.opentelemetry.io/collector/component v0.66.1-0.20221202005155-1c54042beb70 h1:dEoJhzCmRShgmVro/kXm6pouGElgxkH2DsvanzCeZtU= +go.opentelemetry.io/collector/component v0.66.1-0.20221202005155-1c54042beb70/go.mod h1:OsVnvFFe38QSpcuZlQ8cvarDzcloCexgQ1/B2m80F6U= +go.opentelemetry.io/collector/confmap v0.0.0-20221201172708-2bdff61fa52a h1:2TscCXAQASO2kU9xHcMIUM/FP29fiQIRTilZmliq/7I= +go.opentelemetry.io/collector/confmap v0.0.0-20221201172708-2bdff61fa52a/go.mod h1:qJ3e8bA8h4wz/jYlbeEUafVHdrU7DkpStnmIUAz6VTQ= +go.opentelemetry.io/collector/consumer v0.66.1-0.20221202005155-1c54042beb70 h1:XwpVjI1KeKGPXOZBLefGILMziPYuNf6IzbmiIEsIyI0= +go.opentelemetry.io/collector/consumer v0.66.1-0.20221202005155-1c54042beb70/go.mod h1:EWVBcSGcIcmeDGTnIboc/aqa3agsBeH8/q7yFWG7xVc= +go.opentelemetry.io/collector/featuregate v0.66.1-0.20221202005155-1c54042beb70 h1:V0tf4ebciqIs07jFATfLGdUpLRaEsi+AiWuA/in0G8Y= +go.opentelemetry.io/collector/featuregate v0.66.1-0.20221202005155-1c54042beb70/go.mod h1:tewuFKJYalWBU0bmNKg++MC1ipINXUr6szYzOw2p1GI= +go.opentelemetry.io/collector/pdata v0.66.1-0.20221202005155-1c54042beb70 h1:TPOrxkEMvZzfBSwF3ct+kUUgKA5g8unkZZbKQvJweeA= +go.opentelemetry.io/collector/pdata v0.66.1-0.20221202005155-1c54042beb70/go.mod h1:pqyaznLzk21m+1KL6fwOsRryRELL+zNM0qiVSn0MbVc= 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= @@ -284,8 +286,8 @@ go.uber.org/multierr v1.6.0/go.mod h1:cdWPpRnG4AhwMwsgIHip0KRBQjJy5kYEpYjJxpXp9i go.uber.org/multierr v1.8.0 h1:dg6GjLku4EH+249NNmoIciG9N/jURbDG+pFlTkhzIC8= go.uber.org/multierr v1.8.0/go.mod h1:7EAYxJLBy9rStEaz58O2t4Uvip6FSURkq8/ppBp95ak= go.uber.org/zap v1.17.0/go.mod h1:MXVU+bhUf/A7Xi2HNOnopQOrmycQ5Ih87HtOu4q5SSo= -go.uber.org/zap v1.23.0 h1:OjGQ5KQDEUawVHxNwQgPpiypGHOxo2mNZsOqTak4fFY= -go.uber.org/zap v1.23.0/go.mod h1:D+nX8jyLsMHMYrln8A0rJjFt/T/9/bGgIhAqxv5URuY= +go.uber.org/zap v1.24.0 h1:FiJd5l1UOLj0wCgbSE0rwwXHzEdAZS6hiiSnxJN/D60= +go.uber.org/zap v1.24.0/go.mod h1:2kMP+WWQ8aoFoedH3T2sq6iJ2yDWpHbP0f6MQbS9Gkg= golang.org/x/crypto v0.0.0-20180904163835-0709b304e793/go.mod h1:6SG95UA2DQfeDnfUPMdvaQW0Q7yPrPDi9nlGo2tz2b4= golang.org/x/crypto v0.0.0-20190308221718-c2843e01d9a2/go.mod h1:djNgcEr1/C05ACkg1iLfiJU5Ep61QUkGW8qpdssI0+w= golang.org/x/crypto v0.0.0-20190923035154-9ee001bba392/go.mod h1:/lpIB1dKB+9EgE3H3cr1v9wB50oz8l4C4h62xy7jSTY= diff --git a/processor/resourceprocessor/resource_processor_test.go b/processor/resourceprocessor/resource_processor_test.go index b893d8a7367f..485293914050 100644 --- a/processor/resourceprocessor/resource_processor_test.go +++ b/processor/resourceprocessor/resource_processor_test.go @@ -150,29 +150,6 @@ func TestResourceProcessorAttributesUpsert(t *testing.T) { } } -func TestResourceProcessorError(t *testing.T) { - badCfg := &Config{ - ProcessorSettings: config.NewProcessorSettings(component.NewID(typeStr)), - AttributesActions: nil, - } - - // Test traces consumer - factory := NewFactory() - rtp, err := factory.CreateTracesProcessor(context.Background(), componenttest.NewNopProcessorCreateSettings(), badCfg, consumertest.NewNop()) - require.Error(t, err) - require.Nil(t, rtp) - - // Test metrics consumer - rmp, err := factory.CreateMetricsProcessor(context.Background(), componenttest.NewNopProcessorCreateSettings(), badCfg, consumertest.NewNop()) - require.Error(t, err) - require.Nil(t, rmp) - - // Test logs consumer - rlp, err := factory.CreateLogsProcessor(context.Background(), componenttest.NewNopProcessorCreateSettings(), badCfg, consumertest.NewNop()) - require.Error(t, err) - require.Nil(t, rlp) -} - func generateTraceData(attributes map[string]string) ptrace.Traces { td := testdata.GenerateTracesOneSpanNoResource() if attributes == nil { diff --git a/processor/routingprocessor/go.mod b/processor/routingprocessor/go.mod index f42c305e7b4a..2f303a9809eb 100644 --- a/processor/routingprocessor/go.mod +++ b/processor/routingprocessor/go.mod @@ -5,13 +5,14 @@ go 1.18 require ( github.com/open-telemetry/opentelemetry-collector-contrib/pkg/ottl v0.66.0 github.com/stretchr/testify v1.8.1 - go.opentelemetry.io/collector v0.66.1-0.20221128222955-4ff1ff379b90 - go.opentelemetry.io/collector/component v0.66.1-0.20221128222955-4ff1ff379b90 - go.opentelemetry.io/collector/consumer v0.66.1-0.20221128222955-4ff1ff379b90 - go.opentelemetry.io/collector/exporter/otlpexporter v0.66.1-0.20221128222955-4ff1ff379b90 - go.opentelemetry.io/collector/pdata v0.66.1-0.20221128222955-4ff1ff379b90 + go.opentelemetry.io/collector v0.66.1-0.20221202005155-1c54042beb70 + go.opentelemetry.io/collector/component v0.66.1-0.20221202005155-1c54042beb70 + go.opentelemetry.io/collector/confmap v0.0.0-20221201172708-2bdff61fa52a + go.opentelemetry.io/collector/consumer v0.66.1-0.20221202005155-1c54042beb70 + go.opentelemetry.io/collector/exporter/otlpexporter v0.66.1-0.20221202005155-1c54042beb70 + go.opentelemetry.io/collector/pdata v0.66.1-0.20221202005155-1c54042beb70 go.uber.org/multierr v1.8.0 - go.uber.org/zap v1.23.0 + go.uber.org/zap v1.24.0 google.golang.org/grpc v1.51.0 ) @@ -40,7 +41,7 @@ require ( github.com/pmezard/go-difflib v1.0.0 // indirect github.com/rogpeppe/go-internal v1.6.2 // indirect go.opencensus.io v0.24.0 // indirect - go.opentelemetry.io/collector/featuregate v0.66.1-0.20221128222955-4ff1ff379b90 // indirect + go.opentelemetry.io/collector/featuregate v0.66.1-0.20221202005155-1c54042beb70 // 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 34fc078e978e..9894267b350e 100644 --- a/processor/routingprocessor/go.sum +++ b/processor/routingprocessor/go.sum @@ -307,18 +307,20 @@ go.etcd.io/etcd/client/pkg/v3 v3.5.4/go.mod h1:IJHfcCEKxYu1Os13ZdwCwIUTUVGYTSAM3 go.etcd.io/etcd/client/v3 v3.5.4/go.mod h1:ZaRkVgBZC+L+dLCjTcF1hRXpgZXQPOvnA/Ak/gq3kiY= go.opencensus.io v0.24.0 h1:y73uSU6J157QMP2kn2r30vwW1A2W2WFwSCGnAVxeaD0= go.opencensus.io v0.24.0/go.mod h1:vNK8G9p7aAivkbmorf4v+7Hgx+Zs0yY+0fOtgBfjQKo= -go.opentelemetry.io/collector v0.66.1-0.20221128222955-4ff1ff379b90 h1:yRe05/jMdzH4TFHfndZ5h2o2hKBK/79W72j8w51qNsI= -go.opentelemetry.io/collector v0.66.1-0.20221128222955-4ff1ff379b90/go.mod h1:hE6jCs+0rfiufCrVPucKZTMwfHit1okfDPnwPT2eW1I= -go.opentelemetry.io/collector/component v0.66.1-0.20221128222955-4ff1ff379b90 h1:AYSNTXbezhNg43EuYdVVcgxE/2gBVrm00FDx4DOmQVg= -go.opentelemetry.io/collector/component v0.66.1-0.20221128222955-4ff1ff379b90/go.mod h1:0c84EqXUhvYe6KW7hJfh76tiI/5yjWCH2amwyQ06XLM= -go.opentelemetry.io/collector/consumer v0.66.1-0.20221128222955-4ff1ff379b90 h1:nzNXVfC1FzXBXCLMzbMv+qK3E4EGiNsnMhfVsBd2yzc= -go.opentelemetry.io/collector/consumer v0.66.1-0.20221128222955-4ff1ff379b90/go.mod h1:WtoRZa5SnxQO1ZEQdVxYpFcXCmq62rakv0oUSlPO0NQ= -go.opentelemetry.io/collector/exporter/otlpexporter v0.66.1-0.20221128222955-4ff1ff379b90 h1:3+YgPEDEyNzwiI+V9J2YBVGyV9Qppu4VPbB3jHeN8Ns= -go.opentelemetry.io/collector/exporter/otlpexporter v0.66.1-0.20221128222955-4ff1ff379b90/go.mod h1:IOoHR1lsV1r2TFOVctPogn9RUXT4jiU7kH+IhfUlP1w= -go.opentelemetry.io/collector/featuregate v0.66.1-0.20221128222955-4ff1ff379b90 h1:UuJSFWbi9XxyNZsJKZuvpWg35BgRbcCGFH+38V2MAdw= -go.opentelemetry.io/collector/featuregate v0.66.1-0.20221128222955-4ff1ff379b90/go.mod h1:tewuFKJYalWBU0bmNKg++MC1ipINXUr6szYzOw2p1GI= -go.opentelemetry.io/collector/pdata v0.66.1-0.20221128222955-4ff1ff379b90 h1:Vu4S4jSNcd0VFPzxQNO4+UqGwnes1xJDoFLPRiWHm8I= -go.opentelemetry.io/collector/pdata v0.66.1-0.20221128222955-4ff1ff379b90/go.mod h1:pqyaznLzk21m+1KL6fwOsRryRELL+zNM0qiVSn0MbVc= +go.opentelemetry.io/collector v0.66.1-0.20221202005155-1c54042beb70 h1:INB2CsOtqqrija2KvMuIpbBQ3qX1BECEeR+d0NJX+oM= +go.opentelemetry.io/collector v0.66.1-0.20221202005155-1c54042beb70/go.mod h1:d0NHkHyANJy3HDTvYE/PoylMShUmFIbiir89ieI0X0c= +go.opentelemetry.io/collector/component v0.66.1-0.20221202005155-1c54042beb70 h1:dEoJhzCmRShgmVro/kXm6pouGElgxkH2DsvanzCeZtU= +go.opentelemetry.io/collector/component v0.66.1-0.20221202005155-1c54042beb70/go.mod h1:OsVnvFFe38QSpcuZlQ8cvarDzcloCexgQ1/B2m80F6U= +go.opentelemetry.io/collector/confmap v0.0.0-20221201172708-2bdff61fa52a h1:2TscCXAQASO2kU9xHcMIUM/FP29fiQIRTilZmliq/7I= +go.opentelemetry.io/collector/confmap v0.0.0-20221201172708-2bdff61fa52a/go.mod h1:qJ3e8bA8h4wz/jYlbeEUafVHdrU7DkpStnmIUAz6VTQ= +go.opentelemetry.io/collector/consumer v0.66.1-0.20221202005155-1c54042beb70 h1:XwpVjI1KeKGPXOZBLefGILMziPYuNf6IzbmiIEsIyI0= +go.opentelemetry.io/collector/consumer v0.66.1-0.20221202005155-1c54042beb70/go.mod h1:EWVBcSGcIcmeDGTnIboc/aqa3agsBeH8/q7yFWG7xVc= +go.opentelemetry.io/collector/exporter/otlpexporter v0.66.1-0.20221202005155-1c54042beb70 h1:m9GPfziw/079Xt7/Pfby/5obJhtqR19WKkgQQ/VxNZo= +go.opentelemetry.io/collector/exporter/otlpexporter v0.66.1-0.20221202005155-1c54042beb70/go.mod h1:bCD3trc7OqeEVCgyQdO3kwGgogZMjcMu2tX49SFv1lU= +go.opentelemetry.io/collector/featuregate v0.66.1-0.20221202005155-1c54042beb70 h1:V0tf4ebciqIs07jFATfLGdUpLRaEsi+AiWuA/in0G8Y= +go.opentelemetry.io/collector/featuregate v0.66.1-0.20221202005155-1c54042beb70/go.mod h1:tewuFKJYalWBU0bmNKg++MC1ipINXUr6szYzOw2p1GI= +go.opentelemetry.io/collector/pdata v0.66.1-0.20221202005155-1c54042beb70 h1:TPOrxkEMvZzfBSwF3ct+kUUgKA5g8unkZZbKQvJweeA= +go.opentelemetry.io/collector/pdata v0.66.1-0.20221202005155-1c54042beb70/go.mod h1:pqyaznLzk21m+1KL6fwOsRryRELL+zNM0qiVSn0MbVc= 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= @@ -339,8 +341,8 @@ go.uber.org/multierr v1.6.0/go.mod h1:cdWPpRnG4AhwMwsgIHip0KRBQjJy5kYEpYjJxpXp9i go.uber.org/multierr v1.8.0 h1:dg6GjLku4EH+249NNmoIciG9N/jURbDG+pFlTkhzIC8= go.uber.org/multierr v1.8.0/go.mod h1:7EAYxJLBy9rStEaz58O2t4Uvip6FSURkq8/ppBp95ak= go.uber.org/zap v1.17.0/go.mod h1:MXVU+bhUf/A7Xi2HNOnopQOrmycQ5Ih87HtOu4q5SSo= -go.uber.org/zap v1.23.0 h1:OjGQ5KQDEUawVHxNwQgPpiypGHOxo2mNZsOqTak4fFY= -go.uber.org/zap v1.23.0/go.mod h1:D+nX8jyLsMHMYrln8A0rJjFt/T/9/bGgIhAqxv5URuY= +go.uber.org/zap v1.24.0 h1:FiJd5l1UOLj0wCgbSE0rwwXHzEdAZS6hiiSnxJN/D60= +go.uber.org/zap v1.24.0/go.mod h1:2kMP+WWQ8aoFoedH3T2sq6iJ2yDWpHbP0f6MQbS9Gkg= golang.org/x/crypto v0.0.0-20180904163835-0709b304e793/go.mod h1:6SG95UA2DQfeDnfUPMdvaQW0Q7yPrPDi9nlGo2tz2b4= golang.org/x/crypto v0.0.0-20190308221718-c2843e01d9a2/go.mod h1:djNgcEr1/C05ACkg1iLfiJU5Ep61QUkGW8qpdssI0+w= golang.org/x/crypto v0.0.0-20190923035154-9ee001bba392/go.mod h1:/lpIB1dKB+9EgE3H3cr1v9wB50oz8l4C4h62xy7jSTY= diff --git a/processor/routingprocessor/traces_test.go b/processor/routingprocessor/traces_test.go index 9de1a011afbc..1b33f6b87096 100644 --- a/processor/routingprocessor/traces_test.go +++ b/processor/routingprocessor/traces_test.go @@ -45,8 +45,9 @@ func TestTraces_RegisterExportersForValidRoute(t *testing.T) { }) otlpExpFactory := otlpexporter.NewFactory() + otlpID := component.NewID("otlp") otlpConfig := &otlpexporter.Config{ - ExporterSettings: config.NewExporterSettings(component.NewID("otlp")), + ExporterSettings: config.NewExporterSettings(otlpID), GRPCClientSettings: configgrpc.GRPCClientSettings{ Endpoint: "example.com:1234", }, @@ -56,7 +57,7 @@ func TestTraces_RegisterExportersForValidRoute(t *testing.T) { host := newMockHost(map[component.DataType]map[component.ID]component.Component{ component.DataTypeTraces: { - otlpConfig.ID(): otlpExp, + otlpID: otlpExp, }, }) diff --git a/processor/schemaprocessor/go.mod b/processor/schemaprocessor/go.mod index 2306bb045c09..d718f11545b8 100644 --- a/processor/schemaprocessor/go.mod +++ b/processor/schemaprocessor/go.mod @@ -4,11 +4,12 @@ go 1.18 require ( github.com/stretchr/testify v1.8.1 - go.opentelemetry.io/collector v0.66.1-0.20221128222955-4ff1ff379b90 - go.opentelemetry.io/collector/component v0.66.1-0.20221128222955-4ff1ff379b90 - go.opentelemetry.io/collector/consumer v0.66.1-0.20221128222955-4ff1ff379b90 - go.opentelemetry.io/collector/pdata v0.66.1-0.20221128222955-4ff1ff379b90 - go.uber.org/zap v1.23.0 + go.opentelemetry.io/collector v0.66.1-0.20221202005155-1c54042beb70 + go.opentelemetry.io/collector/component v0.66.1-0.20221202005155-1c54042beb70 + go.opentelemetry.io/collector/confmap v0.0.0-20221201172708-2bdff61fa52a + go.opentelemetry.io/collector/consumer v0.66.1-0.20221202005155-1c54042beb70 + go.opentelemetry.io/collector/pdata v0.66.1-0.20221202005155-1c54042beb70 + go.uber.org/zap v1.24.0 ) require ( @@ -34,7 +35,7 @@ require ( github.com/pmezard/go-difflib v1.0.0 // indirect github.com/rs/cors v1.8.2 // indirect go.opencensus.io v0.24.0 // indirect - go.opentelemetry.io/collector/featuregate v0.66.1-0.20221128222955-4ff1ff379b90 // indirect + go.opentelemetry.io/collector/featuregate v0.66.1-0.20221202005155-1c54042beb70 // 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 321a2ad37a4e..5b791b3b6827 100644 --- a/processor/schemaprocessor/go.sum +++ b/processor/schemaprocessor/go.sum @@ -283,16 +283,18 @@ go.etcd.io/etcd/client/pkg/v3 v3.5.4/go.mod h1:IJHfcCEKxYu1Os13ZdwCwIUTUVGYTSAM3 go.etcd.io/etcd/client/v3 v3.5.4/go.mod h1:ZaRkVgBZC+L+dLCjTcF1hRXpgZXQPOvnA/Ak/gq3kiY= go.opencensus.io v0.24.0 h1:y73uSU6J157QMP2kn2r30vwW1A2W2WFwSCGnAVxeaD0= go.opencensus.io v0.24.0/go.mod h1:vNK8G9p7aAivkbmorf4v+7Hgx+Zs0yY+0fOtgBfjQKo= -go.opentelemetry.io/collector v0.66.1-0.20221128222955-4ff1ff379b90 h1:yRe05/jMdzH4TFHfndZ5h2o2hKBK/79W72j8w51qNsI= -go.opentelemetry.io/collector v0.66.1-0.20221128222955-4ff1ff379b90/go.mod h1:hE6jCs+0rfiufCrVPucKZTMwfHit1okfDPnwPT2eW1I= -go.opentelemetry.io/collector/component v0.66.1-0.20221128222955-4ff1ff379b90 h1:AYSNTXbezhNg43EuYdVVcgxE/2gBVrm00FDx4DOmQVg= -go.opentelemetry.io/collector/component v0.66.1-0.20221128222955-4ff1ff379b90/go.mod h1:0c84EqXUhvYe6KW7hJfh76tiI/5yjWCH2amwyQ06XLM= -go.opentelemetry.io/collector/consumer v0.66.1-0.20221128222955-4ff1ff379b90 h1:nzNXVfC1FzXBXCLMzbMv+qK3E4EGiNsnMhfVsBd2yzc= -go.opentelemetry.io/collector/consumer v0.66.1-0.20221128222955-4ff1ff379b90/go.mod h1:WtoRZa5SnxQO1ZEQdVxYpFcXCmq62rakv0oUSlPO0NQ= -go.opentelemetry.io/collector/featuregate v0.66.1-0.20221128222955-4ff1ff379b90 h1:UuJSFWbi9XxyNZsJKZuvpWg35BgRbcCGFH+38V2MAdw= -go.opentelemetry.io/collector/featuregate v0.66.1-0.20221128222955-4ff1ff379b90/go.mod h1:tewuFKJYalWBU0bmNKg++MC1ipINXUr6szYzOw2p1GI= -go.opentelemetry.io/collector/pdata v0.66.1-0.20221128222955-4ff1ff379b90 h1:Vu4S4jSNcd0VFPzxQNO4+UqGwnes1xJDoFLPRiWHm8I= -go.opentelemetry.io/collector/pdata v0.66.1-0.20221128222955-4ff1ff379b90/go.mod h1:pqyaznLzk21m+1KL6fwOsRryRELL+zNM0qiVSn0MbVc= +go.opentelemetry.io/collector v0.66.1-0.20221202005155-1c54042beb70 h1:INB2CsOtqqrija2KvMuIpbBQ3qX1BECEeR+d0NJX+oM= +go.opentelemetry.io/collector v0.66.1-0.20221202005155-1c54042beb70/go.mod h1:d0NHkHyANJy3HDTvYE/PoylMShUmFIbiir89ieI0X0c= +go.opentelemetry.io/collector/component v0.66.1-0.20221202005155-1c54042beb70 h1:dEoJhzCmRShgmVro/kXm6pouGElgxkH2DsvanzCeZtU= +go.opentelemetry.io/collector/component v0.66.1-0.20221202005155-1c54042beb70/go.mod h1:OsVnvFFe38QSpcuZlQ8cvarDzcloCexgQ1/B2m80F6U= +go.opentelemetry.io/collector/confmap v0.0.0-20221201172708-2bdff61fa52a h1:2TscCXAQASO2kU9xHcMIUM/FP29fiQIRTilZmliq/7I= +go.opentelemetry.io/collector/confmap v0.0.0-20221201172708-2bdff61fa52a/go.mod h1:qJ3e8bA8h4wz/jYlbeEUafVHdrU7DkpStnmIUAz6VTQ= +go.opentelemetry.io/collector/consumer v0.66.1-0.20221202005155-1c54042beb70 h1:XwpVjI1KeKGPXOZBLefGILMziPYuNf6IzbmiIEsIyI0= +go.opentelemetry.io/collector/consumer v0.66.1-0.20221202005155-1c54042beb70/go.mod h1:EWVBcSGcIcmeDGTnIboc/aqa3agsBeH8/q7yFWG7xVc= +go.opentelemetry.io/collector/featuregate v0.66.1-0.20221202005155-1c54042beb70 h1:V0tf4ebciqIs07jFATfLGdUpLRaEsi+AiWuA/in0G8Y= +go.opentelemetry.io/collector/featuregate v0.66.1-0.20221202005155-1c54042beb70/go.mod h1:tewuFKJYalWBU0bmNKg++MC1ipINXUr6szYzOw2p1GI= +go.opentelemetry.io/collector/pdata v0.66.1-0.20221202005155-1c54042beb70 h1:TPOrxkEMvZzfBSwF3ct+kUUgKA5g8unkZZbKQvJweeA= +go.opentelemetry.io/collector/pdata v0.66.1-0.20221202005155-1c54042beb70/go.mod h1:pqyaznLzk21m+1KL6fwOsRryRELL+zNM0qiVSn0MbVc= 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= @@ -310,8 +312,8 @@ go.uber.org/multierr v1.6.0/go.mod h1:cdWPpRnG4AhwMwsgIHip0KRBQjJy5kYEpYjJxpXp9i go.uber.org/multierr v1.8.0 h1:dg6GjLku4EH+249NNmoIciG9N/jURbDG+pFlTkhzIC8= go.uber.org/multierr v1.8.0/go.mod h1:7EAYxJLBy9rStEaz58O2t4Uvip6FSURkq8/ppBp95ak= go.uber.org/zap v1.17.0/go.mod h1:MXVU+bhUf/A7Xi2HNOnopQOrmycQ5Ih87HtOu4q5SSo= -go.uber.org/zap v1.23.0 h1:OjGQ5KQDEUawVHxNwQgPpiypGHOxo2mNZsOqTak4fFY= -go.uber.org/zap v1.23.0/go.mod h1:D+nX8jyLsMHMYrln8A0rJjFt/T/9/bGgIhAqxv5URuY= +go.uber.org/zap v1.24.0 h1:FiJd5l1UOLj0wCgbSE0rwwXHzEdAZS6hiiSnxJN/D60= +go.uber.org/zap v1.24.0/go.mod h1:2kMP+WWQ8aoFoedH3T2sq6iJ2yDWpHbP0f6MQbS9Gkg= golang.org/x/crypto v0.0.0-20180904163835-0709b304e793/go.mod h1:6SG95UA2DQfeDnfUPMdvaQW0Q7yPrPDi9nlGo2tz2b4= golang.org/x/crypto v0.0.0-20190308221718-c2843e01d9a2/go.mod h1:djNgcEr1/C05ACkg1iLfiJU5Ep61QUkGW8qpdssI0+w= golang.org/x/crypto v0.0.0-20190923035154-9ee001bba392/go.mod h1:/lpIB1dKB+9EgE3H3cr1v9wB50oz8l4C4h62xy7jSTY= diff --git a/processor/servicegraphprocessor/go.mod b/processor/servicegraphprocessor/go.mod index 04caf5260d08..24e6d2051459 100644 --- a/processor/servicegraphprocessor/go.mod +++ b/processor/servicegraphprocessor/go.mod @@ -5,13 +5,13 @@ go 1.18 require ( github.com/stretchr/testify v1.8.1 go.opencensus.io v0.24.0 - go.opentelemetry.io/collector v0.66.1-0.20221128222955-4ff1ff379b90 - go.opentelemetry.io/collector/component v0.66.1-0.20221128222955-4ff1ff379b90 - go.opentelemetry.io/collector/consumer v0.66.1-0.20221128222955-4ff1ff379b90 - go.opentelemetry.io/collector/exporter/otlpexporter v0.66.1-0.20221128222955-4ff1ff379b90 - go.opentelemetry.io/collector/pdata v0.66.1-0.20221128222955-4ff1ff379b90 - go.opentelemetry.io/collector/semconv v0.66.1-0.20221128222955-4ff1ff379b90 - go.uber.org/zap v1.23.0 + go.opentelemetry.io/collector v0.66.1-0.20221202005155-1c54042beb70 + go.opentelemetry.io/collector/component v0.66.1-0.20221202005155-1c54042beb70 + go.opentelemetry.io/collector/consumer v0.66.1-0.20221202005155-1c54042beb70 + go.opentelemetry.io/collector/exporter/otlpexporter v0.66.1-0.20221202005155-1c54042beb70 + go.opentelemetry.io/collector/pdata v0.66.1-0.20221202005155-1c54042beb70 + go.opentelemetry.io/collector/semconv v0.66.1-0.20221202005155-1c54042beb70 + go.uber.org/zap v1.24.0 ) require ( @@ -57,11 +57,12 @@ require ( github.com/shirou/gopsutil/v3 v3.22.10 // indirect github.com/spf13/cobra v1.6.1 // indirect github.com/spf13/pflag v1.0.5 // indirect - github.com/tklauser/go-sysconf v0.3.10 // indirect - github.com/tklauser/numcpus v0.4.0 // indirect + github.com/tklauser/go-sysconf v0.3.11 // indirect + github.com/tklauser/numcpus v0.6.0 // indirect github.com/yusufpapurcu/wmi v1.2.2 // indirect - go.opentelemetry.io/collector/featuregate v0.66.1-0.20221128222955-4ff1ff379b90 // indirect - go.opentelemetry.io/collector/processor/batchprocessor v0.66.1-0.20221128222955-4ff1ff379b90 // indirect + go.opentelemetry.io/collector/confmap v0.0.0-20221201172708-2bdff61fa52a // indirect + go.opentelemetry.io/collector/featuregate v0.66.1-0.20221202005155-1c54042beb70 // indirect + go.opentelemetry.io/collector/processor/batchprocessor v0.66.1-0.20221202005155-1c54042beb70 // 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 a6af35b86132..61fef7db4399 100644 --- a/processor/servicegraphprocessor/go.sum +++ b/processor/servicegraphprocessor/go.sum @@ -399,10 +399,12 @@ github.com/stretchr/testify v1.8.0/go.mod h1:yNjHg4UonilssWZ8iaSj1OCr/vHnekPRkoO github.com/stretchr/testify v1.8.1 h1:w7B6lhMri9wdJUVmEZPGGhZzrYTPvgJArz7wNPgYKsk= github.com/stretchr/testify v1.8.1/go.mod h1:w2LPCIKwWwSfY2zedu0+kehJoqGctiVI29o6fzry7u4= github.com/stvp/go-udp-testing v0.0.0-20201019212854-469649b16807/go.mod h1:7jxmlfBCDBXRzr0eAQJ48XC1hBu1np4CS5+cHEYfwpc= -github.com/tklauser/go-sysconf v0.3.10 h1:IJ1AZGZRWbY8T5Vfk04D9WOA5WSejdflXxP03OUqALw= github.com/tklauser/go-sysconf v0.3.10/go.mod h1:C8XykCvCb+Gn0oNCWPIlcb0RuglQTYaQ2hGm7jmxEFk= -github.com/tklauser/numcpus v0.4.0 h1:E53Dm1HjH1/R2/aoCtXtPgzmElmn51aOkhCFSuZq//o= +github.com/tklauser/go-sysconf v0.3.11 h1:89WgdJhk5SNwJfu+GKyYveZ4IaJ7xAkecBo+KdJV0CM= +github.com/tklauser/go-sysconf v0.3.11/go.mod h1:GqXfhXY3kiPa0nAXPDIQIWzJbMCB7AmcWpGR8lSZfqI= github.com/tklauser/numcpus v0.4.0/go.mod h1:1+UI3pD8NW14VMwdgJNJ1ESk2UnwhAnz5hMwiKKqXCQ= +github.com/tklauser/numcpus v0.6.0 h1:kebhY2Qt+3U6RNK7UqpYNA+tJ23IBEGKkB7JQBfDYms= +github.com/tklauser/numcpus v0.6.0/go.mod h1:FEZLMke0lhOUG6w2JadTzp0a+Nl8PF/GFkQ5UVIcaL4= github.com/yuin/goldmark v1.1.25/go.mod h1:3hX8gzYuyVAZsxl0MRgGTJEmQBFcNTphYh9decYSb74= github.com/yuin/goldmark v1.1.27/go.mod h1:3hX8gzYuyVAZsxl0MRgGTJEmQBFcNTphYh9decYSb74= github.com/yuin/goldmark v1.1.32/go.mod h1:3hX8gzYuyVAZsxl0MRgGTJEmQBFcNTphYh9decYSb74= @@ -421,23 +423,25 @@ go.opencensus.io v0.22.4/go.mod h1:yxeiOL68Rb0Xd1ddK5vPZ/oVn4vY4Ynel7k9FzqtOIw= go.opencensus.io v0.23.0/go.mod h1:XItmlyltB5F7CS4xOC1DcqMoFqwtC6OG2xF7mCv7P7E= go.opencensus.io v0.24.0 h1:y73uSU6J157QMP2kn2r30vwW1A2W2WFwSCGnAVxeaD0= go.opencensus.io v0.24.0/go.mod h1:vNK8G9p7aAivkbmorf4v+7Hgx+Zs0yY+0fOtgBfjQKo= -go.opentelemetry.io/collector v0.66.1-0.20221128222955-4ff1ff379b90 h1:yRe05/jMdzH4TFHfndZ5h2o2hKBK/79W72j8w51qNsI= -go.opentelemetry.io/collector v0.66.1-0.20221128222955-4ff1ff379b90/go.mod h1:hE6jCs+0rfiufCrVPucKZTMwfHit1okfDPnwPT2eW1I= -go.opentelemetry.io/collector/component v0.66.1-0.20221128222955-4ff1ff379b90 h1:AYSNTXbezhNg43EuYdVVcgxE/2gBVrm00FDx4DOmQVg= -go.opentelemetry.io/collector/component v0.66.1-0.20221128222955-4ff1ff379b90/go.mod h1:0c84EqXUhvYe6KW7hJfh76tiI/5yjWCH2amwyQ06XLM= -go.opentelemetry.io/collector/consumer v0.66.1-0.20221128222955-4ff1ff379b90 h1:nzNXVfC1FzXBXCLMzbMv+qK3E4EGiNsnMhfVsBd2yzc= -go.opentelemetry.io/collector/consumer v0.66.1-0.20221128222955-4ff1ff379b90/go.mod h1:WtoRZa5SnxQO1ZEQdVxYpFcXCmq62rakv0oUSlPO0NQ= -go.opentelemetry.io/collector/exporter/otlpexporter v0.66.1-0.20221128222955-4ff1ff379b90 h1:3+YgPEDEyNzwiI+V9J2YBVGyV9Qppu4VPbB3jHeN8Ns= -go.opentelemetry.io/collector/exporter/otlpexporter v0.66.1-0.20221128222955-4ff1ff379b90/go.mod h1:IOoHR1lsV1r2TFOVctPogn9RUXT4jiU7kH+IhfUlP1w= -go.opentelemetry.io/collector/extension/zpagesextension v0.65.0 h1:T5JJIJ3cmClqdSMgkbjoIiP9p059AAvbfcd3houJkxM= -go.opentelemetry.io/collector/featuregate v0.66.1-0.20221128222955-4ff1ff379b90 h1:UuJSFWbi9XxyNZsJKZuvpWg35BgRbcCGFH+38V2MAdw= -go.opentelemetry.io/collector/featuregate v0.66.1-0.20221128222955-4ff1ff379b90/go.mod h1:tewuFKJYalWBU0bmNKg++MC1ipINXUr6szYzOw2p1GI= -go.opentelemetry.io/collector/pdata v0.66.1-0.20221128222955-4ff1ff379b90 h1:Vu4S4jSNcd0VFPzxQNO4+UqGwnes1xJDoFLPRiWHm8I= -go.opentelemetry.io/collector/pdata v0.66.1-0.20221128222955-4ff1ff379b90/go.mod h1:pqyaznLzk21m+1KL6fwOsRryRELL+zNM0qiVSn0MbVc= -go.opentelemetry.io/collector/processor/batchprocessor v0.66.1-0.20221128222955-4ff1ff379b90 h1:K12L9juzjChBMfp7cQaQsToz7i7975tUYVzJ3Tpw/Cw= -go.opentelemetry.io/collector/processor/batchprocessor v0.66.1-0.20221128222955-4ff1ff379b90/go.mod h1:XhGTsC1B/bq4gpg8IZ/QYBLXkzE4Gw3r7Xu2+ik8A1Q= -go.opentelemetry.io/collector/semconv v0.66.1-0.20221128222955-4ff1ff379b90 h1:hFaTA68cggZKWMv7wQ3bKP8KGTbowh/5AQZKCHzHTqM= -go.opentelemetry.io/collector/semconv v0.66.1-0.20221128222955-4ff1ff379b90/go.mod h1:5o9yhOa+ABt7g2E5JABDxGZ1PQPbtfxrKNbYn+LOTXU= +go.opentelemetry.io/collector v0.66.1-0.20221202005155-1c54042beb70 h1:INB2CsOtqqrija2KvMuIpbBQ3qX1BECEeR+d0NJX+oM= +go.opentelemetry.io/collector v0.66.1-0.20221202005155-1c54042beb70/go.mod h1:d0NHkHyANJy3HDTvYE/PoylMShUmFIbiir89ieI0X0c= +go.opentelemetry.io/collector/component v0.66.1-0.20221202005155-1c54042beb70 h1:dEoJhzCmRShgmVro/kXm6pouGElgxkH2DsvanzCeZtU= +go.opentelemetry.io/collector/component v0.66.1-0.20221202005155-1c54042beb70/go.mod h1:OsVnvFFe38QSpcuZlQ8cvarDzcloCexgQ1/B2m80F6U= +go.opentelemetry.io/collector/confmap v0.0.0-20221201172708-2bdff61fa52a h1:2TscCXAQASO2kU9xHcMIUM/FP29fiQIRTilZmliq/7I= +go.opentelemetry.io/collector/confmap v0.0.0-20221201172708-2bdff61fa52a/go.mod h1:qJ3e8bA8h4wz/jYlbeEUafVHdrU7DkpStnmIUAz6VTQ= +go.opentelemetry.io/collector/consumer v0.66.1-0.20221202005155-1c54042beb70 h1:XwpVjI1KeKGPXOZBLefGILMziPYuNf6IzbmiIEsIyI0= +go.opentelemetry.io/collector/consumer v0.66.1-0.20221202005155-1c54042beb70/go.mod h1:EWVBcSGcIcmeDGTnIboc/aqa3agsBeH8/q7yFWG7xVc= +go.opentelemetry.io/collector/exporter/otlpexporter v0.66.1-0.20221202005155-1c54042beb70 h1:m9GPfziw/079Xt7/Pfby/5obJhtqR19WKkgQQ/VxNZo= +go.opentelemetry.io/collector/exporter/otlpexporter v0.66.1-0.20221202005155-1c54042beb70/go.mod h1:bCD3trc7OqeEVCgyQdO3kwGgogZMjcMu2tX49SFv1lU= +go.opentelemetry.io/collector/extension/zpagesextension v0.66.0 h1:tPqSKH5K3VhTT0XXVoWL3woWBSTJqnXZQRt0ZLSCoCc= +go.opentelemetry.io/collector/featuregate v0.66.1-0.20221202005155-1c54042beb70 h1:V0tf4ebciqIs07jFATfLGdUpLRaEsi+AiWuA/in0G8Y= +go.opentelemetry.io/collector/featuregate v0.66.1-0.20221202005155-1c54042beb70/go.mod h1:tewuFKJYalWBU0bmNKg++MC1ipINXUr6szYzOw2p1GI= +go.opentelemetry.io/collector/pdata v0.66.1-0.20221202005155-1c54042beb70 h1:TPOrxkEMvZzfBSwF3ct+kUUgKA5g8unkZZbKQvJweeA= +go.opentelemetry.io/collector/pdata v0.66.1-0.20221202005155-1c54042beb70/go.mod h1:pqyaznLzk21m+1KL6fwOsRryRELL+zNM0qiVSn0MbVc= +go.opentelemetry.io/collector/processor/batchprocessor v0.66.1-0.20221202005155-1c54042beb70 h1:Y4e8NnVevonnAgmjX9Z7QIMA32yMqHAOnAlh8SzTS8c= +go.opentelemetry.io/collector/processor/batchprocessor v0.66.1-0.20221202005155-1c54042beb70/go.mod h1:Pi1CsKDQFoDrUP1i3+VdE6s2Xuji7bOGFBgqHK0J32E= +go.opentelemetry.io/collector/semconv v0.66.1-0.20221202005155-1c54042beb70 h1:Q5L9Urod3c8as6ZYaoaqBjarx/HXxsxy34DFZIU2fO4= +go.opentelemetry.io/collector/semconv v0.66.1-0.20221202005155-1c54042beb70/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= @@ -465,8 +469,8 @@ go.uber.org/multierr v1.6.0/go.mod h1:cdWPpRnG4AhwMwsgIHip0KRBQjJy5kYEpYjJxpXp9i go.uber.org/multierr v1.8.0 h1:dg6GjLku4EH+249NNmoIciG9N/jURbDG+pFlTkhzIC8= go.uber.org/multierr v1.8.0/go.mod h1:7EAYxJLBy9rStEaz58O2t4Uvip6FSURkq8/ppBp95ak= go.uber.org/zap v1.17.0/go.mod h1:MXVU+bhUf/A7Xi2HNOnopQOrmycQ5Ih87HtOu4q5SSo= -go.uber.org/zap v1.23.0 h1:OjGQ5KQDEUawVHxNwQgPpiypGHOxo2mNZsOqTak4fFY= -go.uber.org/zap v1.23.0/go.mod h1:D+nX8jyLsMHMYrln8A0rJjFt/T/9/bGgIhAqxv5URuY= +go.uber.org/zap v1.24.0 h1:FiJd5l1UOLj0wCgbSE0rwwXHzEdAZS6hiiSnxJN/D60= +go.uber.org/zap v1.24.0/go.mod h1:2kMP+WWQ8aoFoedH3T2sq6iJ2yDWpHbP0f6MQbS9Gkg= golang.org/x/crypto v0.0.0-20180904163835-0709b304e793/go.mod h1:6SG95UA2DQfeDnfUPMdvaQW0Q7yPrPDi9nlGo2tz2b4= golang.org/x/crypto v0.0.0-20190308221718-c2843e01d9a2/go.mod h1:djNgcEr1/C05ACkg1iLfiJU5Ep61QUkGW8qpdssI0+w= golang.org/x/crypto v0.0.0-20190510104115-cbcb75029529/go.mod h1:yigFU9vqHzYiE8UmvKecakEJjdnWj3jj499lnFckfCI= diff --git a/processor/servicegraphprocessor/processor_test.go b/processor/servicegraphprocessor/processor_test.go index d87c6966ef39..19bc574770c7 100644 --- a/processor/servicegraphprocessor/processor_test.go +++ b/processor/servicegraphprocessor/processor_test.go @@ -37,7 +37,7 @@ import ( func TestProcessorStart(t *testing.T) { // Create otlp exporters. - otlpConfig, mexp, texp := newOTLPExporters(t) + otlpID, mexp, texp := newOTLPExporters(t) for _, tc := range []struct { name string @@ -53,7 +53,7 @@ func TestProcessorStart(t *testing.T) { // Prepare exporters := map[component.DataType]map[component.ID]component.Component{ component.DataTypeMetrics: { - otlpConfig.ID(): tc.exporter, + otlpID: tc.exporter, }, } @@ -225,10 +225,11 @@ func sampleTraces() ptrace.Traces { return traces } -func newOTLPExporters(t *testing.T) (*otlpexporter.Config, component.MetricsExporter, component.TracesExporter) { +func newOTLPExporters(t *testing.T) (component.ID, component.MetricsExporter, component.TracesExporter) { otlpExpFactory := otlpexporter.NewFactory() + otlpID := component.NewID("otlp") otlpConfig := &otlpexporter.Config{ - ExporterSettings: config.NewExporterSettings(component.NewID("otlp")), + ExporterSettings: config.NewExporterSettings(otlpID), GRPCClientSettings: configgrpc.GRPCClientSettings{ Endpoint: "example.com:1234", }, @@ -238,7 +239,7 @@ func newOTLPExporters(t *testing.T) (*otlpexporter.Config, component.MetricsExpo require.NoError(t, err) texp, err := otlpExpFactory.CreateTracesExporter(context.Background(), expCreationParams, otlpConfig) require.NoError(t, err) - return otlpConfig, mexp, texp + return otlpID, mexp, texp } type mockHost struct { diff --git a/processor/spanmetricsprocessor/go.mod b/processor/spanmetricsprocessor/go.mod index f5cca03a7412..ca572c829fa5 100644 --- a/processor/spanmetricsprocessor/go.mod +++ b/processor/spanmetricsprocessor/go.mod @@ -9,17 +9,17 @@ require ( github.com/open-telemetry/opentelemetry-collector-contrib/internal/coreinternal v0.66.0 github.com/open-telemetry/opentelemetry-collector-contrib/receiver/jaegerreceiver v0.66.0 github.com/stretchr/testify v1.8.1 - go.opentelemetry.io/collector v0.66.1-0.20221128222955-4ff1ff379b90 - go.opentelemetry.io/collector/component v0.66.1-0.20221128222955-4ff1ff379b90 - go.opentelemetry.io/collector/consumer v0.66.1-0.20221128222955-4ff1ff379b90 - go.opentelemetry.io/collector/exporter/otlpexporter v0.66.1-0.20221128222955-4ff1ff379b90 - go.opentelemetry.io/collector/featuregate v0.66.1-0.20221128222955-4ff1ff379b90 - go.opentelemetry.io/collector/pdata v0.66.1-0.20221128222955-4ff1ff379b90 - go.opentelemetry.io/collector/processor/batchprocessor v0.66.1-0.20221128222955-4ff1ff379b90 - go.opentelemetry.io/collector/receiver/otlpreceiver v0.66.1-0.20221128222955-4ff1ff379b90 - go.opentelemetry.io/collector/semconv v0.66.1-0.20221128222955-4ff1ff379b90 + go.opentelemetry.io/collector v0.66.1-0.20221202005155-1c54042beb70 + go.opentelemetry.io/collector/component v0.66.1-0.20221202005155-1c54042beb70 + go.opentelemetry.io/collector/consumer v0.66.1-0.20221202005155-1c54042beb70 + go.opentelemetry.io/collector/exporter/otlpexporter v0.66.1-0.20221202005155-1c54042beb70 + go.opentelemetry.io/collector/featuregate v0.66.1-0.20221202005155-1c54042beb70 + go.opentelemetry.io/collector/pdata v0.66.1-0.20221202005155-1c54042beb70 + go.opentelemetry.io/collector/processor/batchprocessor v0.66.1-0.20221202005155-1c54042beb70 + go.opentelemetry.io/collector/receiver/otlpreceiver v0.66.1-0.20221202005155-1c54042beb70 + go.opentelemetry.io/collector/semconv v0.66.1-0.20221202005155-1c54042beb70 go.uber.org/multierr v1.8.0 - go.uber.org/zap v1.23.0 + go.uber.org/zap v1.24.0 google.golang.org/grpc v1.51.0 ) @@ -75,12 +75,13 @@ require ( github.com/spf13/cobra v1.6.1 // indirect github.com/spf13/pflag v1.0.5 // indirect github.com/stretchr/objx v0.5.0 // indirect - github.com/tklauser/go-sysconf v0.3.10 // indirect - github.com/tklauser/numcpus v0.4.0 // indirect + github.com/tklauser/go-sysconf v0.3.11 // indirect + github.com/tklauser/numcpus v0.6.0 // indirect 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.24.0 // indirect + go.opentelemetry.io/collector/confmap v0.0.0-20221201172708-2bdff61fa52a // 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 a6e7156cde47..57dc7efaad47 100644 --- a/processor/spanmetricsprocessor/go.sum +++ b/processor/spanmetricsprocessor/go.sum @@ -578,10 +578,12 @@ github.com/stretchr/testify v1.8.1 h1:w7B6lhMri9wdJUVmEZPGGhZzrYTPvgJArz7wNPgYKs github.com/stretchr/testify v1.8.1/go.mod h1:w2LPCIKwWwSfY2zedu0+kehJoqGctiVI29o6fzry7u4= github.com/stvp/go-udp-testing v0.0.0-20201019212854-469649b16807/go.mod h1:7jxmlfBCDBXRzr0eAQJ48XC1hBu1np4CS5+cHEYfwpc= github.com/subosito/gotenv v1.4.1 h1:jyEFiXpy21Wm81FBN71l9VoMMV8H8jG+qIK3GCpY6Qs= -github.com/tklauser/go-sysconf v0.3.10 h1:IJ1AZGZRWbY8T5Vfk04D9WOA5WSejdflXxP03OUqALw= github.com/tklauser/go-sysconf v0.3.10/go.mod h1:C8XykCvCb+Gn0oNCWPIlcb0RuglQTYaQ2hGm7jmxEFk= -github.com/tklauser/numcpus v0.4.0 h1:E53Dm1HjH1/R2/aoCtXtPgzmElmn51aOkhCFSuZq//o= +github.com/tklauser/go-sysconf v0.3.11 h1:89WgdJhk5SNwJfu+GKyYveZ4IaJ7xAkecBo+KdJV0CM= +github.com/tklauser/go-sysconf v0.3.11/go.mod h1:GqXfhXY3kiPa0nAXPDIQIWzJbMCB7AmcWpGR8lSZfqI= github.com/tklauser/numcpus v0.4.0/go.mod h1:1+UI3pD8NW14VMwdgJNJ1ESk2UnwhAnz5hMwiKKqXCQ= +github.com/tklauser/numcpus v0.6.0 h1:kebhY2Qt+3U6RNK7UqpYNA+tJ23IBEGKkB7JQBfDYms= +github.com/tklauser/numcpus v0.6.0/go.mod h1:FEZLMke0lhOUG6w2JadTzp0a+Nl8PF/GFkQ5UVIcaL4= github.com/tv42/httpunix v0.0.0-20150427012821-b75d8614f926/go.mod h1:9ESjWnEqriFuLhtthL60Sar/7RFoluCcXsuvEwTV5KM= github.com/uber/jaeger-client-go v2.30.0+incompatible h1:D6wyKGCecFaSRUpo8lCVbaOOb6ThwMmTEbhRwtKR97o= github.com/uber/jaeger-client-go v2.30.0+incompatible/go.mod h1:WVhlPFC8FDjOFMMWRy2pZqQJSXxYSwNYOkTr/Z6d3Kk= @@ -599,25 +601,27 @@ go.etcd.io/etcd/client/v3 v3.5.4/go.mod h1:ZaRkVgBZC+L+dLCjTcF1hRXpgZXQPOvnA/Ak/ go.opencensus.io v0.23.0/go.mod h1:XItmlyltB5F7CS4xOC1DcqMoFqwtC6OG2xF7mCv7P7E= go.opencensus.io v0.24.0 h1:y73uSU6J157QMP2kn2r30vwW1A2W2WFwSCGnAVxeaD0= go.opencensus.io v0.24.0/go.mod h1:vNK8G9p7aAivkbmorf4v+7Hgx+Zs0yY+0fOtgBfjQKo= -go.opentelemetry.io/collector v0.66.1-0.20221128222955-4ff1ff379b90 h1:yRe05/jMdzH4TFHfndZ5h2o2hKBK/79W72j8w51qNsI= -go.opentelemetry.io/collector v0.66.1-0.20221128222955-4ff1ff379b90/go.mod h1:hE6jCs+0rfiufCrVPucKZTMwfHit1okfDPnwPT2eW1I= -go.opentelemetry.io/collector/component v0.66.1-0.20221128222955-4ff1ff379b90 h1:AYSNTXbezhNg43EuYdVVcgxE/2gBVrm00FDx4DOmQVg= -go.opentelemetry.io/collector/component v0.66.1-0.20221128222955-4ff1ff379b90/go.mod h1:0c84EqXUhvYe6KW7hJfh76tiI/5yjWCH2amwyQ06XLM= -go.opentelemetry.io/collector/consumer v0.66.1-0.20221128222955-4ff1ff379b90 h1:nzNXVfC1FzXBXCLMzbMv+qK3E4EGiNsnMhfVsBd2yzc= -go.opentelemetry.io/collector/consumer v0.66.1-0.20221128222955-4ff1ff379b90/go.mod h1:WtoRZa5SnxQO1ZEQdVxYpFcXCmq62rakv0oUSlPO0NQ= -go.opentelemetry.io/collector/exporter/otlpexporter v0.66.1-0.20221128222955-4ff1ff379b90 h1:3+YgPEDEyNzwiI+V9J2YBVGyV9Qppu4VPbB3jHeN8Ns= -go.opentelemetry.io/collector/exporter/otlpexporter v0.66.1-0.20221128222955-4ff1ff379b90/go.mod h1:IOoHR1lsV1r2TFOVctPogn9RUXT4jiU7kH+IhfUlP1w= -go.opentelemetry.io/collector/extension/zpagesextension v0.65.0 h1:T5JJIJ3cmClqdSMgkbjoIiP9p059AAvbfcd3houJkxM= -go.opentelemetry.io/collector/featuregate v0.66.1-0.20221128222955-4ff1ff379b90 h1:UuJSFWbi9XxyNZsJKZuvpWg35BgRbcCGFH+38V2MAdw= -go.opentelemetry.io/collector/featuregate v0.66.1-0.20221128222955-4ff1ff379b90/go.mod h1:tewuFKJYalWBU0bmNKg++MC1ipINXUr6szYzOw2p1GI= -go.opentelemetry.io/collector/pdata v0.66.1-0.20221128222955-4ff1ff379b90 h1:Vu4S4jSNcd0VFPzxQNO4+UqGwnes1xJDoFLPRiWHm8I= -go.opentelemetry.io/collector/pdata v0.66.1-0.20221128222955-4ff1ff379b90/go.mod h1:pqyaznLzk21m+1KL6fwOsRryRELL+zNM0qiVSn0MbVc= -go.opentelemetry.io/collector/processor/batchprocessor v0.66.1-0.20221128222955-4ff1ff379b90 h1:K12L9juzjChBMfp7cQaQsToz7i7975tUYVzJ3Tpw/Cw= -go.opentelemetry.io/collector/processor/batchprocessor v0.66.1-0.20221128222955-4ff1ff379b90/go.mod h1:XhGTsC1B/bq4gpg8IZ/QYBLXkzE4Gw3r7Xu2+ik8A1Q= -go.opentelemetry.io/collector/receiver/otlpreceiver v0.66.1-0.20221128222955-4ff1ff379b90 h1:/+HfaoVPSXgHUZOTZSSriuKOQi8L/rgyb7TTRx5jzoo= -go.opentelemetry.io/collector/receiver/otlpreceiver v0.66.1-0.20221128222955-4ff1ff379b90/go.mod h1:pb+dcV+KJ44dP+CqV0N6L6dTeDDvCXB8StCqwlrrSkM= -go.opentelemetry.io/collector/semconv v0.66.1-0.20221128222955-4ff1ff379b90 h1:hFaTA68cggZKWMv7wQ3bKP8KGTbowh/5AQZKCHzHTqM= -go.opentelemetry.io/collector/semconv v0.66.1-0.20221128222955-4ff1ff379b90/go.mod h1:5o9yhOa+ABt7g2E5JABDxGZ1PQPbtfxrKNbYn+LOTXU= +go.opentelemetry.io/collector v0.66.1-0.20221202005155-1c54042beb70 h1:INB2CsOtqqrija2KvMuIpbBQ3qX1BECEeR+d0NJX+oM= +go.opentelemetry.io/collector v0.66.1-0.20221202005155-1c54042beb70/go.mod h1:d0NHkHyANJy3HDTvYE/PoylMShUmFIbiir89ieI0X0c= +go.opentelemetry.io/collector/component v0.66.1-0.20221202005155-1c54042beb70 h1:dEoJhzCmRShgmVro/kXm6pouGElgxkH2DsvanzCeZtU= +go.opentelemetry.io/collector/component v0.66.1-0.20221202005155-1c54042beb70/go.mod h1:OsVnvFFe38QSpcuZlQ8cvarDzcloCexgQ1/B2m80F6U= +go.opentelemetry.io/collector/confmap v0.0.0-20221201172708-2bdff61fa52a h1:2TscCXAQASO2kU9xHcMIUM/FP29fiQIRTilZmliq/7I= +go.opentelemetry.io/collector/confmap v0.0.0-20221201172708-2bdff61fa52a/go.mod h1:qJ3e8bA8h4wz/jYlbeEUafVHdrU7DkpStnmIUAz6VTQ= +go.opentelemetry.io/collector/consumer v0.66.1-0.20221202005155-1c54042beb70 h1:XwpVjI1KeKGPXOZBLefGILMziPYuNf6IzbmiIEsIyI0= +go.opentelemetry.io/collector/consumer v0.66.1-0.20221202005155-1c54042beb70/go.mod h1:EWVBcSGcIcmeDGTnIboc/aqa3agsBeH8/q7yFWG7xVc= +go.opentelemetry.io/collector/exporter/otlpexporter v0.66.1-0.20221202005155-1c54042beb70 h1:m9GPfziw/079Xt7/Pfby/5obJhtqR19WKkgQQ/VxNZo= +go.opentelemetry.io/collector/exporter/otlpexporter v0.66.1-0.20221202005155-1c54042beb70/go.mod h1:bCD3trc7OqeEVCgyQdO3kwGgogZMjcMu2tX49SFv1lU= +go.opentelemetry.io/collector/extension/zpagesextension v0.66.0 h1:tPqSKH5K3VhTT0XXVoWL3woWBSTJqnXZQRt0ZLSCoCc= +go.opentelemetry.io/collector/featuregate v0.66.1-0.20221202005155-1c54042beb70 h1:V0tf4ebciqIs07jFATfLGdUpLRaEsi+AiWuA/in0G8Y= +go.opentelemetry.io/collector/featuregate v0.66.1-0.20221202005155-1c54042beb70/go.mod h1:tewuFKJYalWBU0bmNKg++MC1ipINXUr6szYzOw2p1GI= +go.opentelemetry.io/collector/pdata v0.66.1-0.20221202005155-1c54042beb70 h1:TPOrxkEMvZzfBSwF3ct+kUUgKA5g8unkZZbKQvJweeA= +go.opentelemetry.io/collector/pdata v0.66.1-0.20221202005155-1c54042beb70/go.mod h1:pqyaznLzk21m+1KL6fwOsRryRELL+zNM0qiVSn0MbVc= +go.opentelemetry.io/collector/processor/batchprocessor v0.66.1-0.20221202005155-1c54042beb70 h1:Y4e8NnVevonnAgmjX9Z7QIMA32yMqHAOnAlh8SzTS8c= +go.opentelemetry.io/collector/processor/batchprocessor v0.66.1-0.20221202005155-1c54042beb70/go.mod h1:Pi1CsKDQFoDrUP1i3+VdE6s2Xuji7bOGFBgqHK0J32E= +go.opentelemetry.io/collector/receiver/otlpreceiver v0.66.1-0.20221202005155-1c54042beb70 h1:KBbbPVDV7o5w857g6ePphdu4MV87jrcQevFYDA1okUk= +go.opentelemetry.io/collector/receiver/otlpreceiver v0.66.1-0.20221202005155-1c54042beb70/go.mod h1:0Py8RNjNiFRH6/F+vM2uptdaw9hMj1FBdv0ySntM2gE= +go.opentelemetry.io/collector/semconv v0.66.1-0.20221202005155-1c54042beb70 h1:Q5L9Urod3c8as6ZYaoaqBjarx/HXxsxy34DFZIU2fO4= +go.opentelemetry.io/collector/semconv v0.66.1-0.20221202005155-1c54042beb70/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= @@ -646,8 +650,8 @@ go.uber.org/multierr v1.6.0/go.mod h1:cdWPpRnG4AhwMwsgIHip0KRBQjJy5kYEpYjJxpXp9i go.uber.org/multierr v1.8.0 h1:dg6GjLku4EH+249NNmoIciG9N/jURbDG+pFlTkhzIC8= go.uber.org/multierr v1.8.0/go.mod h1:7EAYxJLBy9rStEaz58O2t4Uvip6FSURkq8/ppBp95ak= go.uber.org/zap v1.17.0/go.mod h1:MXVU+bhUf/A7Xi2HNOnopQOrmycQ5Ih87HtOu4q5SSo= -go.uber.org/zap v1.23.0 h1:OjGQ5KQDEUawVHxNwQgPpiypGHOxo2mNZsOqTak4fFY= -go.uber.org/zap v1.23.0/go.mod h1:D+nX8jyLsMHMYrln8A0rJjFt/T/9/bGgIhAqxv5URuY= +go.uber.org/zap v1.24.0 h1:FiJd5l1UOLj0wCgbSE0rwwXHzEdAZS6hiiSnxJN/D60= +go.uber.org/zap v1.24.0/go.mod h1:2kMP+WWQ8aoFoedH3T2sq6iJ2yDWpHbP0f6MQbS9Gkg= golang.org/x/crypto v0.0.0-20180904163835-0709b304e793/go.mod h1:6SG95UA2DQfeDnfUPMdvaQW0Q7yPrPDi9nlGo2tz2b4= golang.org/x/crypto v0.0.0-20190308221718-c2843e01d9a2/go.mod h1:djNgcEr1/C05ACkg1iLfiJU5Ep61QUkGW8qpdssI0+w= golang.org/x/crypto v0.0.0-20190923035154-9ee001bba392/go.mod h1:/lpIB1dKB+9EgE3H3cr1v9wB50oz8l4C4h62xy7jSTY= diff --git a/processor/spanmetricsprocessor/processor_test.go b/processor/spanmetricsprocessor/processor_test.go index 43e32d36d8b5..76ab6426971b 100644 --- a/processor/spanmetricsprocessor/processor_test.go +++ b/processor/spanmetricsprocessor/processor_test.go @@ -85,7 +85,7 @@ type span struct { func TestProcessorStart(t *testing.T) { // Create otlp exporters. - otlpConfig, mexp, texp := newOTLPExporters(t) + otlpID, mexp, texp := newOTLPExporters(t) for _, tc := range []struct { name string @@ -101,7 +101,7 @@ func TestProcessorStart(t *testing.T) { // Prepare exporters := map[component.DataType]map[component.ID]component.Component{ component.DataTypeMetrics: { - otlpConfig.ID(): tc.exporter, + otlpID: tc.exporter, }, } mhost := &mocks.Host{} @@ -620,10 +620,11 @@ func initSpan(span span, s ptrace.Span) { s.SetSpanID(pcommon.SpanID([8]byte{byte(42)})) } -func newOTLPExporters(t *testing.T) (*otlpexporter.Config, component.MetricsExporter, component.TracesExporter) { +func newOTLPExporters(t *testing.T) (component.ID, component.MetricsExporter, component.TracesExporter) { otlpExpFactory := otlpexporter.NewFactory() + otlpID := component.NewID("otlp") otlpConfig := &otlpexporter.Config{ - ExporterSettings: config.NewExporterSettings(component.NewID("otlp")), + ExporterSettings: config.NewExporterSettings(otlpID), GRPCClientSettings: configgrpc.GRPCClientSettings{ Endpoint: "example.com:1234", }, @@ -633,7 +634,7 @@ func newOTLPExporters(t *testing.T) (*otlpexporter.Config, component.MetricsExpo require.NoError(t, err) texp, err := otlpExpFactory.CreateTracesExporter(context.Background(), expCreationParams, otlpConfig) require.NoError(t, err) - return otlpConfig, mexp, texp + return otlpID, mexp, texp } func TestBuildKeySameServiceOperationCharSequence(t *testing.T) { diff --git a/processor/spanprocessor/factory_test.go b/processor/spanprocessor/factory_test.go index 131bf8447730..47d4d03dcb87 100644 --- a/processor/spanprocessor/factory_test.go +++ b/processor/spanprocessor/factory_test.go @@ -38,7 +38,6 @@ func TestFactory_CreateDefaultConfig(t *testing.T) { // Check the values of the default configuration. assert.NotNil(t, cfg) - 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 54f9f2100e37..60b7ec012e6b 100644 --- a/processor/spanprocessor/go.mod +++ b/processor/spanprocessor/go.mod @@ -7,11 +7,12 @@ require ( github.com/open-telemetry/opentelemetry-collector-contrib/internal/filter v0.66.0 github.com/open-telemetry/opentelemetry-collector-contrib/pkg/ottl v0.66.0 github.com/stretchr/testify v1.8.1 - go.opentelemetry.io/collector v0.66.1-0.20221128222955-4ff1ff379b90 - go.opentelemetry.io/collector/component v0.66.1-0.20221128222955-4ff1ff379b90 - go.opentelemetry.io/collector/consumer v0.66.1-0.20221128222955-4ff1ff379b90 - go.opentelemetry.io/collector/pdata v0.66.1-0.20221128222955-4ff1ff379b90 - go.opentelemetry.io/collector/semconv v0.66.1-0.20221128222955-4ff1ff379b90 + go.opentelemetry.io/collector v0.66.1-0.20221202005155-1c54042beb70 + go.opentelemetry.io/collector/component v0.66.1-0.20221202005155-1c54042beb70 + go.opentelemetry.io/collector/confmap v0.0.0-20221201172708-2bdff61fa52a + go.opentelemetry.io/collector/consumer v0.66.1-0.20221202005155-1c54042beb70 + go.opentelemetry.io/collector/pdata v0.66.1-0.20221202005155-1c54042beb70 + go.opentelemetry.io/collector/semconv v0.66.1-0.20221202005155-1c54042beb70 ) require ( @@ -29,13 +30,13 @@ require ( github.com/modern-go/reflect2 v1.0.2 // indirect github.com/pmezard/go-difflib v1.0.0 // indirect go.opencensus.io v0.24.0 // indirect - go.opentelemetry.io/collector/featuregate v0.66.1-0.20221128222955-4ff1ff379b90 // indirect + go.opentelemetry.io/collector/featuregate v0.66.1-0.20221202005155-1c54042beb70 // 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 go.uber.org/atomic v1.10.0 // indirect go.uber.org/multierr v1.8.0 // indirect - go.uber.org/zap v1.23.0 // indirect + go.uber.org/zap v1.24.0 // indirect golang.org/x/exp v0.0.0-20220722155223-a9213eeb770e // indirect golang.org/x/net v0.0.0-20220722155237-a158d28d115b // indirect golang.org/x/sys v0.2.0 // indirect diff --git a/processor/spanprocessor/go.sum b/processor/spanprocessor/go.sum index c72de8a766e8..eeb5fdac40f5 100644 --- a/processor/spanprocessor/go.sum +++ b/processor/spanprocessor/go.sum @@ -263,18 +263,20 @@ go.etcd.io/etcd/client/pkg/v3 v3.5.4/go.mod h1:IJHfcCEKxYu1Os13ZdwCwIUTUVGYTSAM3 go.etcd.io/etcd/client/v3 v3.5.4/go.mod h1:ZaRkVgBZC+L+dLCjTcF1hRXpgZXQPOvnA/Ak/gq3kiY= go.opencensus.io v0.24.0 h1:y73uSU6J157QMP2kn2r30vwW1A2W2WFwSCGnAVxeaD0= go.opencensus.io v0.24.0/go.mod h1:vNK8G9p7aAivkbmorf4v+7Hgx+Zs0yY+0fOtgBfjQKo= -go.opentelemetry.io/collector v0.66.1-0.20221128222955-4ff1ff379b90 h1:yRe05/jMdzH4TFHfndZ5h2o2hKBK/79W72j8w51qNsI= -go.opentelemetry.io/collector v0.66.1-0.20221128222955-4ff1ff379b90/go.mod h1:hE6jCs+0rfiufCrVPucKZTMwfHit1okfDPnwPT2eW1I= -go.opentelemetry.io/collector/component v0.66.1-0.20221128222955-4ff1ff379b90 h1:AYSNTXbezhNg43EuYdVVcgxE/2gBVrm00FDx4DOmQVg= -go.opentelemetry.io/collector/component v0.66.1-0.20221128222955-4ff1ff379b90/go.mod h1:0c84EqXUhvYe6KW7hJfh76tiI/5yjWCH2amwyQ06XLM= -go.opentelemetry.io/collector/consumer v0.66.1-0.20221128222955-4ff1ff379b90 h1:nzNXVfC1FzXBXCLMzbMv+qK3E4EGiNsnMhfVsBd2yzc= -go.opentelemetry.io/collector/consumer v0.66.1-0.20221128222955-4ff1ff379b90/go.mod h1:WtoRZa5SnxQO1ZEQdVxYpFcXCmq62rakv0oUSlPO0NQ= -go.opentelemetry.io/collector/featuregate v0.66.1-0.20221128222955-4ff1ff379b90 h1:UuJSFWbi9XxyNZsJKZuvpWg35BgRbcCGFH+38V2MAdw= -go.opentelemetry.io/collector/featuregate v0.66.1-0.20221128222955-4ff1ff379b90/go.mod h1:tewuFKJYalWBU0bmNKg++MC1ipINXUr6szYzOw2p1GI= -go.opentelemetry.io/collector/pdata v0.66.1-0.20221128222955-4ff1ff379b90 h1:Vu4S4jSNcd0VFPzxQNO4+UqGwnes1xJDoFLPRiWHm8I= -go.opentelemetry.io/collector/pdata v0.66.1-0.20221128222955-4ff1ff379b90/go.mod h1:pqyaznLzk21m+1KL6fwOsRryRELL+zNM0qiVSn0MbVc= -go.opentelemetry.io/collector/semconv v0.66.1-0.20221128222955-4ff1ff379b90 h1:hFaTA68cggZKWMv7wQ3bKP8KGTbowh/5AQZKCHzHTqM= -go.opentelemetry.io/collector/semconv v0.66.1-0.20221128222955-4ff1ff379b90/go.mod h1:5o9yhOa+ABt7g2E5JABDxGZ1PQPbtfxrKNbYn+LOTXU= +go.opentelemetry.io/collector v0.66.1-0.20221202005155-1c54042beb70 h1:INB2CsOtqqrija2KvMuIpbBQ3qX1BECEeR+d0NJX+oM= +go.opentelemetry.io/collector v0.66.1-0.20221202005155-1c54042beb70/go.mod h1:d0NHkHyANJy3HDTvYE/PoylMShUmFIbiir89ieI0X0c= +go.opentelemetry.io/collector/component v0.66.1-0.20221202005155-1c54042beb70 h1:dEoJhzCmRShgmVro/kXm6pouGElgxkH2DsvanzCeZtU= +go.opentelemetry.io/collector/component v0.66.1-0.20221202005155-1c54042beb70/go.mod h1:OsVnvFFe38QSpcuZlQ8cvarDzcloCexgQ1/B2m80F6U= +go.opentelemetry.io/collector/confmap v0.0.0-20221201172708-2bdff61fa52a h1:2TscCXAQASO2kU9xHcMIUM/FP29fiQIRTilZmliq/7I= +go.opentelemetry.io/collector/confmap v0.0.0-20221201172708-2bdff61fa52a/go.mod h1:qJ3e8bA8h4wz/jYlbeEUafVHdrU7DkpStnmIUAz6VTQ= +go.opentelemetry.io/collector/consumer v0.66.1-0.20221202005155-1c54042beb70 h1:XwpVjI1KeKGPXOZBLefGILMziPYuNf6IzbmiIEsIyI0= +go.opentelemetry.io/collector/consumer v0.66.1-0.20221202005155-1c54042beb70/go.mod h1:EWVBcSGcIcmeDGTnIboc/aqa3agsBeH8/q7yFWG7xVc= +go.opentelemetry.io/collector/featuregate v0.66.1-0.20221202005155-1c54042beb70 h1:V0tf4ebciqIs07jFATfLGdUpLRaEsi+AiWuA/in0G8Y= +go.opentelemetry.io/collector/featuregate v0.66.1-0.20221202005155-1c54042beb70/go.mod h1:tewuFKJYalWBU0bmNKg++MC1ipINXUr6szYzOw2p1GI= +go.opentelemetry.io/collector/pdata v0.66.1-0.20221202005155-1c54042beb70 h1:TPOrxkEMvZzfBSwF3ct+kUUgKA5g8unkZZbKQvJweeA= +go.opentelemetry.io/collector/pdata v0.66.1-0.20221202005155-1c54042beb70/go.mod h1:pqyaznLzk21m+1KL6fwOsRryRELL+zNM0qiVSn0MbVc= +go.opentelemetry.io/collector/semconv v0.66.1-0.20221202005155-1c54042beb70 h1:Q5L9Urod3c8as6ZYaoaqBjarx/HXxsxy34DFZIU2fO4= +go.opentelemetry.io/collector/semconv v0.66.1-0.20221202005155-1c54042beb70/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= @@ -289,8 +291,8 @@ go.uber.org/multierr v1.6.0/go.mod h1:cdWPpRnG4AhwMwsgIHip0KRBQjJy5kYEpYjJxpXp9i go.uber.org/multierr v1.8.0 h1:dg6GjLku4EH+249NNmoIciG9N/jURbDG+pFlTkhzIC8= go.uber.org/multierr v1.8.0/go.mod h1:7EAYxJLBy9rStEaz58O2t4Uvip6FSURkq8/ppBp95ak= go.uber.org/zap v1.17.0/go.mod h1:MXVU+bhUf/A7Xi2HNOnopQOrmycQ5Ih87HtOu4q5SSo= -go.uber.org/zap v1.23.0 h1:OjGQ5KQDEUawVHxNwQgPpiypGHOxo2mNZsOqTak4fFY= -go.uber.org/zap v1.23.0/go.mod h1:D+nX8jyLsMHMYrln8A0rJjFt/T/9/bGgIhAqxv5URuY= +go.uber.org/zap v1.24.0 h1:FiJd5l1UOLj0wCgbSE0rwwXHzEdAZS6hiiSnxJN/D60= +go.uber.org/zap v1.24.0/go.mod h1:2kMP+WWQ8aoFoedH3T2sq6iJ2yDWpHbP0f6MQbS9Gkg= golang.org/x/crypto v0.0.0-20180904163835-0709b304e793/go.mod h1:6SG95UA2DQfeDnfUPMdvaQW0Q7yPrPDi9nlGo2tz2b4= golang.org/x/crypto v0.0.0-20190308221718-c2843e01d9a2/go.mod h1:djNgcEr1/C05ACkg1iLfiJU5Ep61QUkGW8qpdssI0+w= golang.org/x/crypto v0.0.0-20190923035154-9ee001bba392/go.mod h1:/lpIB1dKB+9EgE3H3cr1v9wB50oz8l4C4h62xy7jSTY= diff --git a/processor/tailsamplingprocessor/go.mod b/processor/tailsamplingprocessor/go.mod index 40edea466686..e661f65a6700 100644 --- a/processor/tailsamplingprocessor/go.mod +++ b/processor/tailsamplingprocessor/go.mod @@ -8,14 +8,15 @@ require ( github.com/open-telemetry/opentelemetry-collector-contrib/internal/coreinternal v0.66.0 github.com/stretchr/testify v1.8.1 go.opencensus.io v0.24.0 - go.opentelemetry.io/collector v0.66.1-0.20221128222955-4ff1ff379b90 - go.opentelemetry.io/collector/component v0.66.1-0.20221128222955-4ff1ff379b90 - go.opentelemetry.io/collector/consumer v0.66.1-0.20221128222955-4ff1ff379b90 - go.opentelemetry.io/collector/pdata v0.66.1-0.20221128222955-4ff1ff379b90 + go.opentelemetry.io/collector v0.66.1-0.20221202005155-1c54042beb70 + go.opentelemetry.io/collector/component v0.66.1-0.20221202005155-1c54042beb70 + go.opentelemetry.io/collector/confmap v0.0.0-20221201172708-2bdff61fa52a + go.opentelemetry.io/collector/consumer v0.66.1-0.20221202005155-1c54042beb70 + go.opentelemetry.io/collector/pdata v0.66.1-0.20221202005155-1c54042beb70 go.opentelemetry.io/otel/trace v1.11.1 go.uber.org/atomic v1.10.0 go.uber.org/goleak v1.2.0 - go.uber.org/zap v1.23.0 + go.uber.org/zap v1.24.0 ) require ( @@ -32,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.9.0 // indirect - go.opentelemetry.io/collector/featuregate v0.66.1-0.20221128222955-4ff1ff379b90 // indirect + go.opentelemetry.io/collector/featuregate v0.66.1-0.20221202005155-1c54042beb70 // indirect go.opentelemetry.io/otel v1.11.1 // indirect go.opentelemetry.io/otel/metric v0.33.0 // indirect go.uber.org/multierr v1.8.0 // indirect diff --git a/processor/tailsamplingprocessor/go.sum b/processor/tailsamplingprocessor/go.sum index 7affc372917f..5f24c70c6d02 100644 --- a/processor/tailsamplingprocessor/go.sum +++ b/processor/tailsamplingprocessor/go.sum @@ -276,16 +276,18 @@ go.etcd.io/etcd/client/pkg/v3 v3.5.4/go.mod h1:IJHfcCEKxYu1Os13ZdwCwIUTUVGYTSAM3 go.etcd.io/etcd/client/v3 v3.5.4/go.mod h1:ZaRkVgBZC+L+dLCjTcF1hRXpgZXQPOvnA/Ak/gq3kiY= go.opencensus.io v0.24.0 h1:y73uSU6J157QMP2kn2r30vwW1A2W2WFwSCGnAVxeaD0= go.opencensus.io v0.24.0/go.mod h1:vNK8G9p7aAivkbmorf4v+7Hgx+Zs0yY+0fOtgBfjQKo= -go.opentelemetry.io/collector v0.66.1-0.20221128222955-4ff1ff379b90 h1:yRe05/jMdzH4TFHfndZ5h2o2hKBK/79W72j8w51qNsI= -go.opentelemetry.io/collector v0.66.1-0.20221128222955-4ff1ff379b90/go.mod h1:hE6jCs+0rfiufCrVPucKZTMwfHit1okfDPnwPT2eW1I= -go.opentelemetry.io/collector/component v0.66.1-0.20221128222955-4ff1ff379b90 h1:AYSNTXbezhNg43EuYdVVcgxE/2gBVrm00FDx4DOmQVg= -go.opentelemetry.io/collector/component v0.66.1-0.20221128222955-4ff1ff379b90/go.mod h1:0c84EqXUhvYe6KW7hJfh76tiI/5yjWCH2amwyQ06XLM= -go.opentelemetry.io/collector/consumer v0.66.1-0.20221128222955-4ff1ff379b90 h1:nzNXVfC1FzXBXCLMzbMv+qK3E4EGiNsnMhfVsBd2yzc= -go.opentelemetry.io/collector/consumer v0.66.1-0.20221128222955-4ff1ff379b90/go.mod h1:WtoRZa5SnxQO1ZEQdVxYpFcXCmq62rakv0oUSlPO0NQ= -go.opentelemetry.io/collector/featuregate v0.66.1-0.20221128222955-4ff1ff379b90 h1:UuJSFWbi9XxyNZsJKZuvpWg35BgRbcCGFH+38V2MAdw= -go.opentelemetry.io/collector/featuregate v0.66.1-0.20221128222955-4ff1ff379b90/go.mod h1:tewuFKJYalWBU0bmNKg++MC1ipINXUr6szYzOw2p1GI= -go.opentelemetry.io/collector/pdata v0.66.1-0.20221128222955-4ff1ff379b90 h1:Vu4S4jSNcd0VFPzxQNO4+UqGwnes1xJDoFLPRiWHm8I= -go.opentelemetry.io/collector/pdata v0.66.1-0.20221128222955-4ff1ff379b90/go.mod h1:pqyaznLzk21m+1KL6fwOsRryRELL+zNM0qiVSn0MbVc= +go.opentelemetry.io/collector v0.66.1-0.20221202005155-1c54042beb70 h1:INB2CsOtqqrija2KvMuIpbBQ3qX1BECEeR+d0NJX+oM= +go.opentelemetry.io/collector v0.66.1-0.20221202005155-1c54042beb70/go.mod h1:d0NHkHyANJy3HDTvYE/PoylMShUmFIbiir89ieI0X0c= +go.opentelemetry.io/collector/component v0.66.1-0.20221202005155-1c54042beb70 h1:dEoJhzCmRShgmVro/kXm6pouGElgxkH2DsvanzCeZtU= +go.opentelemetry.io/collector/component v0.66.1-0.20221202005155-1c54042beb70/go.mod h1:OsVnvFFe38QSpcuZlQ8cvarDzcloCexgQ1/B2m80F6U= +go.opentelemetry.io/collector/confmap v0.0.0-20221201172708-2bdff61fa52a h1:2TscCXAQASO2kU9xHcMIUM/FP29fiQIRTilZmliq/7I= +go.opentelemetry.io/collector/confmap v0.0.0-20221201172708-2bdff61fa52a/go.mod h1:qJ3e8bA8h4wz/jYlbeEUafVHdrU7DkpStnmIUAz6VTQ= +go.opentelemetry.io/collector/consumer v0.66.1-0.20221202005155-1c54042beb70 h1:XwpVjI1KeKGPXOZBLefGILMziPYuNf6IzbmiIEsIyI0= +go.opentelemetry.io/collector/consumer v0.66.1-0.20221202005155-1c54042beb70/go.mod h1:EWVBcSGcIcmeDGTnIboc/aqa3agsBeH8/q7yFWG7xVc= +go.opentelemetry.io/collector/featuregate v0.66.1-0.20221202005155-1c54042beb70 h1:V0tf4ebciqIs07jFATfLGdUpLRaEsi+AiWuA/in0G8Y= +go.opentelemetry.io/collector/featuregate v0.66.1-0.20221202005155-1c54042beb70/go.mod h1:tewuFKJYalWBU0bmNKg++MC1ipINXUr6szYzOw2p1GI= +go.opentelemetry.io/collector/pdata v0.66.1-0.20221202005155-1c54042beb70 h1:TPOrxkEMvZzfBSwF3ct+kUUgKA5g8unkZZbKQvJweeA= +go.opentelemetry.io/collector/pdata v0.66.1-0.20221202005155-1c54042beb70/go.mod h1:pqyaznLzk21m+1KL6fwOsRryRELL+zNM0qiVSn0MbVc= 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= @@ -304,8 +306,8 @@ go.uber.org/multierr v1.6.0/go.mod h1:cdWPpRnG4AhwMwsgIHip0KRBQjJy5kYEpYjJxpXp9i go.uber.org/multierr v1.8.0 h1:dg6GjLku4EH+249NNmoIciG9N/jURbDG+pFlTkhzIC8= go.uber.org/multierr v1.8.0/go.mod h1:7EAYxJLBy9rStEaz58O2t4Uvip6FSURkq8/ppBp95ak= go.uber.org/zap v1.17.0/go.mod h1:MXVU+bhUf/A7Xi2HNOnopQOrmycQ5Ih87HtOu4q5SSo= -go.uber.org/zap v1.23.0 h1:OjGQ5KQDEUawVHxNwQgPpiypGHOxo2mNZsOqTak4fFY= -go.uber.org/zap v1.23.0/go.mod h1:D+nX8jyLsMHMYrln8A0rJjFt/T/9/bGgIhAqxv5URuY= +go.uber.org/zap v1.24.0 h1:FiJd5l1UOLj0wCgbSE0rwwXHzEdAZS6hiiSnxJN/D60= +go.uber.org/zap v1.24.0/go.mod h1:2kMP+WWQ8aoFoedH3T2sq6iJ2yDWpHbP0f6MQbS9Gkg= golang.org/x/crypto v0.0.0-20180904163835-0709b304e793/go.mod h1:6SG95UA2DQfeDnfUPMdvaQW0Q7yPrPDi9nlGo2tz2b4= golang.org/x/crypto v0.0.0-20190308221718-c2843e01d9a2/go.mod h1:djNgcEr1/C05ACkg1iLfiJU5Ep61QUkGW8qpdssI0+w= golang.org/x/crypto v0.0.0-20190923035154-9ee001bba392/go.mod h1:/lpIB1dKB+9EgE3H3cr1v9wB50oz8l4C4h62xy7jSTY= diff --git a/processor/transformprocessor/go.mod b/processor/transformprocessor/go.mod index d5c53c76ea8b..9aaa01664842 100644 --- a/processor/transformprocessor/go.mod +++ b/processor/transformprocessor/go.mod @@ -5,11 +5,12 @@ go 1.18 require ( github.com/open-telemetry/opentelemetry-collector-contrib/pkg/ottl v0.66.0 github.com/stretchr/testify v1.8.1 - go.opentelemetry.io/collector v0.66.1-0.20221128222955-4ff1ff379b90 - go.opentelemetry.io/collector/component v0.66.1-0.20221128222955-4ff1ff379b90 - go.opentelemetry.io/collector/consumer v0.66.1-0.20221128222955-4ff1ff379b90 - go.opentelemetry.io/collector/pdata v0.66.1-0.20221128222955-4ff1ff379b90 - go.uber.org/zap v1.23.0 + go.opentelemetry.io/collector v0.66.1-0.20221202005155-1c54042beb70 + go.opentelemetry.io/collector/component v0.66.1-0.20221202005155-1c54042beb70 + go.opentelemetry.io/collector/confmap v0.0.0-20221201172708-2bdff61fa52a + go.opentelemetry.io/collector/consumer v0.66.1-0.20221202005155-1c54042beb70 + go.opentelemetry.io/collector/pdata v0.66.1-0.20221202005155-1c54042beb70 + go.uber.org/zap v1.24.0 ) require ( @@ -30,7 +31,7 @@ require ( github.com/pmezard/go-difflib v1.0.0 // indirect github.com/rogpeppe/go-internal v1.6.1 // indirect go.opencensus.io v0.24.0 // indirect - go.opentelemetry.io/collector/featuregate v0.66.1-0.20221128222955-4ff1ff379b90 // indirect + go.opentelemetry.io/collector/featuregate v0.66.1-0.20221202005155-1c54042beb70 // 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 9c5fddeec8ac..ea686528556a 100644 --- a/processor/transformprocessor/go.sum +++ b/processor/transformprocessor/go.sum @@ -269,16 +269,18 @@ go.etcd.io/etcd/client/pkg/v3 v3.5.4/go.mod h1:IJHfcCEKxYu1Os13ZdwCwIUTUVGYTSAM3 go.etcd.io/etcd/client/v3 v3.5.4/go.mod h1:ZaRkVgBZC+L+dLCjTcF1hRXpgZXQPOvnA/Ak/gq3kiY= go.opencensus.io v0.24.0 h1:y73uSU6J157QMP2kn2r30vwW1A2W2WFwSCGnAVxeaD0= go.opencensus.io v0.24.0/go.mod h1:vNK8G9p7aAivkbmorf4v+7Hgx+Zs0yY+0fOtgBfjQKo= -go.opentelemetry.io/collector v0.66.1-0.20221128222955-4ff1ff379b90 h1:yRe05/jMdzH4TFHfndZ5h2o2hKBK/79W72j8w51qNsI= -go.opentelemetry.io/collector v0.66.1-0.20221128222955-4ff1ff379b90/go.mod h1:hE6jCs+0rfiufCrVPucKZTMwfHit1okfDPnwPT2eW1I= -go.opentelemetry.io/collector/component v0.66.1-0.20221128222955-4ff1ff379b90 h1:AYSNTXbezhNg43EuYdVVcgxE/2gBVrm00FDx4DOmQVg= -go.opentelemetry.io/collector/component v0.66.1-0.20221128222955-4ff1ff379b90/go.mod h1:0c84EqXUhvYe6KW7hJfh76tiI/5yjWCH2amwyQ06XLM= -go.opentelemetry.io/collector/consumer v0.66.1-0.20221128222955-4ff1ff379b90 h1:nzNXVfC1FzXBXCLMzbMv+qK3E4EGiNsnMhfVsBd2yzc= -go.opentelemetry.io/collector/consumer v0.66.1-0.20221128222955-4ff1ff379b90/go.mod h1:WtoRZa5SnxQO1ZEQdVxYpFcXCmq62rakv0oUSlPO0NQ= -go.opentelemetry.io/collector/featuregate v0.66.1-0.20221128222955-4ff1ff379b90 h1:UuJSFWbi9XxyNZsJKZuvpWg35BgRbcCGFH+38V2MAdw= -go.opentelemetry.io/collector/featuregate v0.66.1-0.20221128222955-4ff1ff379b90/go.mod h1:tewuFKJYalWBU0bmNKg++MC1ipINXUr6szYzOw2p1GI= -go.opentelemetry.io/collector/pdata v0.66.1-0.20221128222955-4ff1ff379b90 h1:Vu4S4jSNcd0VFPzxQNO4+UqGwnes1xJDoFLPRiWHm8I= -go.opentelemetry.io/collector/pdata v0.66.1-0.20221128222955-4ff1ff379b90/go.mod h1:pqyaznLzk21m+1KL6fwOsRryRELL+zNM0qiVSn0MbVc= +go.opentelemetry.io/collector v0.66.1-0.20221202005155-1c54042beb70 h1:INB2CsOtqqrija2KvMuIpbBQ3qX1BECEeR+d0NJX+oM= +go.opentelemetry.io/collector v0.66.1-0.20221202005155-1c54042beb70/go.mod h1:d0NHkHyANJy3HDTvYE/PoylMShUmFIbiir89ieI0X0c= +go.opentelemetry.io/collector/component v0.66.1-0.20221202005155-1c54042beb70 h1:dEoJhzCmRShgmVro/kXm6pouGElgxkH2DsvanzCeZtU= +go.opentelemetry.io/collector/component v0.66.1-0.20221202005155-1c54042beb70/go.mod h1:OsVnvFFe38QSpcuZlQ8cvarDzcloCexgQ1/B2m80F6U= +go.opentelemetry.io/collector/confmap v0.0.0-20221201172708-2bdff61fa52a h1:2TscCXAQASO2kU9xHcMIUM/FP29fiQIRTilZmliq/7I= +go.opentelemetry.io/collector/confmap v0.0.0-20221201172708-2bdff61fa52a/go.mod h1:qJ3e8bA8h4wz/jYlbeEUafVHdrU7DkpStnmIUAz6VTQ= +go.opentelemetry.io/collector/consumer v0.66.1-0.20221202005155-1c54042beb70 h1:XwpVjI1KeKGPXOZBLefGILMziPYuNf6IzbmiIEsIyI0= +go.opentelemetry.io/collector/consumer v0.66.1-0.20221202005155-1c54042beb70/go.mod h1:EWVBcSGcIcmeDGTnIboc/aqa3agsBeH8/q7yFWG7xVc= +go.opentelemetry.io/collector/featuregate v0.66.1-0.20221202005155-1c54042beb70 h1:V0tf4ebciqIs07jFATfLGdUpLRaEsi+AiWuA/in0G8Y= +go.opentelemetry.io/collector/featuregate v0.66.1-0.20221202005155-1c54042beb70/go.mod h1:tewuFKJYalWBU0bmNKg++MC1ipINXUr6szYzOw2p1GI= +go.opentelemetry.io/collector/pdata v0.66.1-0.20221202005155-1c54042beb70 h1:TPOrxkEMvZzfBSwF3ct+kUUgKA5g8unkZZbKQvJweeA= +go.opentelemetry.io/collector/pdata v0.66.1-0.20221202005155-1c54042beb70/go.mod h1:pqyaznLzk21m+1KL6fwOsRryRELL+zNM0qiVSn0MbVc= 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= @@ -293,8 +295,8 @@ go.uber.org/multierr v1.6.0/go.mod h1:cdWPpRnG4AhwMwsgIHip0KRBQjJy5kYEpYjJxpXp9i go.uber.org/multierr v1.8.0 h1:dg6GjLku4EH+249NNmoIciG9N/jURbDG+pFlTkhzIC8= go.uber.org/multierr v1.8.0/go.mod h1:7EAYxJLBy9rStEaz58O2t4Uvip6FSURkq8/ppBp95ak= go.uber.org/zap v1.17.0/go.mod h1:MXVU+bhUf/A7Xi2HNOnopQOrmycQ5Ih87HtOu4q5SSo= -go.uber.org/zap v1.23.0 h1:OjGQ5KQDEUawVHxNwQgPpiypGHOxo2mNZsOqTak4fFY= -go.uber.org/zap v1.23.0/go.mod h1:D+nX8jyLsMHMYrln8A0rJjFt/T/9/bGgIhAqxv5URuY= +go.uber.org/zap v1.24.0 h1:FiJd5l1UOLj0wCgbSE0rwwXHzEdAZS6hiiSnxJN/D60= +go.uber.org/zap v1.24.0/go.mod h1:2kMP+WWQ8aoFoedH3T2sq6iJ2yDWpHbP0f6MQbS9Gkg= golang.org/x/crypto v0.0.0-20180904163835-0709b304e793/go.mod h1:6SG95UA2DQfeDnfUPMdvaQW0Q7yPrPDi9nlGo2tz2b4= golang.org/x/crypto v0.0.0-20190308221718-c2843e01d9a2/go.mod h1:djNgcEr1/C05ACkg1iLfiJU5Ep61QUkGW8qpdssI0+w= golang.org/x/crypto v0.0.0-20190923035154-9ee001bba392/go.mod h1:/lpIB1dKB+9EgE3H3cr1v9wB50oz8l4C4h62xy7jSTY= diff --git a/receiver/activedirectorydsreceiver/go.mod b/receiver/activedirectorydsreceiver/go.mod index aa7b25d16446..7a3a3f9f2ddd 100644 --- a/receiver/activedirectorydsreceiver/go.mod +++ b/receiver/activedirectorydsreceiver/go.mod @@ -7,10 +7,11 @@ require ( github.com/open-telemetry/opentelemetry-collector-contrib/internal/scrapertest v0.66.0 github.com/open-telemetry/opentelemetry-collector-contrib/pkg/winperfcounters v0.66.0 github.com/stretchr/testify v1.8.1 - go.opentelemetry.io/collector v0.66.1-0.20221128222955-4ff1ff379b90 - go.opentelemetry.io/collector/component v0.66.1-0.20221128222955-4ff1ff379b90 - go.opentelemetry.io/collector/consumer v0.66.1-0.20221128222955-4ff1ff379b90 - go.opentelemetry.io/collector/pdata v0.66.1-0.20221128222955-4ff1ff379b90 + go.opentelemetry.io/collector v0.66.1-0.20221202005155-1c54042beb70 + go.opentelemetry.io/collector/component v0.66.1-0.20221202005155-1c54042beb70 + go.opentelemetry.io/collector/confmap v0.0.0-20221201172708-2bdff61fa52a + go.opentelemetry.io/collector/consumer v0.66.1-0.20221202005155-1c54042beb70 + go.opentelemetry.io/collector/pdata v0.66.1-0.20221202005155-1c54042beb70 go.uber.org/multierr v1.8.0 ) @@ -28,12 +29,12 @@ require ( github.com/modern-go/reflect2 v1.0.2 // indirect github.com/pmezard/go-difflib v1.0.0 // indirect go.opencensus.io v0.24.0 // indirect - go.opentelemetry.io/collector/featuregate v0.66.1-0.20221128222955-4ff1ff379b90 // indirect + go.opentelemetry.io/collector/featuregate v0.66.1-0.20221202005155-1c54042beb70 // 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 go.uber.org/atomic v1.10.0 // indirect - go.uber.org/zap v1.23.0 // indirect + go.uber.org/zap v1.24.0 // indirect golang.org/x/net v0.0.0-20220722155237-a158d28d115b // indirect golang.org/x/sys v0.2.0 // indirect golang.org/x/text v0.4.0 // indirect diff --git a/receiver/activedirectorydsreceiver/go.sum b/receiver/activedirectorydsreceiver/go.sum index 2be3d47a415a..9b2260d67485 100644 --- a/receiver/activedirectorydsreceiver/go.sum +++ b/receiver/activedirectorydsreceiver/go.sum @@ -280,16 +280,18 @@ go.etcd.io/etcd/client/pkg/v3 v3.5.4/go.mod h1:IJHfcCEKxYu1Os13ZdwCwIUTUVGYTSAM3 go.etcd.io/etcd/client/v3 v3.5.4/go.mod h1:ZaRkVgBZC+L+dLCjTcF1hRXpgZXQPOvnA/Ak/gq3kiY= go.opencensus.io v0.24.0 h1:y73uSU6J157QMP2kn2r30vwW1A2W2WFwSCGnAVxeaD0= go.opencensus.io v0.24.0/go.mod h1:vNK8G9p7aAivkbmorf4v+7Hgx+Zs0yY+0fOtgBfjQKo= -go.opentelemetry.io/collector v0.66.1-0.20221128222955-4ff1ff379b90 h1:yRe05/jMdzH4TFHfndZ5h2o2hKBK/79W72j8w51qNsI= -go.opentelemetry.io/collector v0.66.1-0.20221128222955-4ff1ff379b90/go.mod h1:hE6jCs+0rfiufCrVPucKZTMwfHit1okfDPnwPT2eW1I= -go.opentelemetry.io/collector/component v0.66.1-0.20221128222955-4ff1ff379b90 h1:AYSNTXbezhNg43EuYdVVcgxE/2gBVrm00FDx4DOmQVg= -go.opentelemetry.io/collector/component v0.66.1-0.20221128222955-4ff1ff379b90/go.mod h1:0c84EqXUhvYe6KW7hJfh76tiI/5yjWCH2amwyQ06XLM= -go.opentelemetry.io/collector/consumer v0.66.1-0.20221128222955-4ff1ff379b90 h1:nzNXVfC1FzXBXCLMzbMv+qK3E4EGiNsnMhfVsBd2yzc= -go.opentelemetry.io/collector/consumer v0.66.1-0.20221128222955-4ff1ff379b90/go.mod h1:WtoRZa5SnxQO1ZEQdVxYpFcXCmq62rakv0oUSlPO0NQ= -go.opentelemetry.io/collector/featuregate v0.66.1-0.20221128222955-4ff1ff379b90 h1:UuJSFWbi9XxyNZsJKZuvpWg35BgRbcCGFH+38V2MAdw= -go.opentelemetry.io/collector/featuregate v0.66.1-0.20221128222955-4ff1ff379b90/go.mod h1:tewuFKJYalWBU0bmNKg++MC1ipINXUr6szYzOw2p1GI= -go.opentelemetry.io/collector/pdata v0.66.1-0.20221128222955-4ff1ff379b90 h1:Vu4S4jSNcd0VFPzxQNO4+UqGwnes1xJDoFLPRiWHm8I= -go.opentelemetry.io/collector/pdata v0.66.1-0.20221128222955-4ff1ff379b90/go.mod h1:pqyaznLzk21m+1KL6fwOsRryRELL+zNM0qiVSn0MbVc= +go.opentelemetry.io/collector v0.66.1-0.20221202005155-1c54042beb70 h1:INB2CsOtqqrija2KvMuIpbBQ3qX1BECEeR+d0NJX+oM= +go.opentelemetry.io/collector v0.66.1-0.20221202005155-1c54042beb70/go.mod h1:d0NHkHyANJy3HDTvYE/PoylMShUmFIbiir89ieI0X0c= +go.opentelemetry.io/collector/component v0.66.1-0.20221202005155-1c54042beb70 h1:dEoJhzCmRShgmVro/kXm6pouGElgxkH2DsvanzCeZtU= +go.opentelemetry.io/collector/component v0.66.1-0.20221202005155-1c54042beb70/go.mod h1:OsVnvFFe38QSpcuZlQ8cvarDzcloCexgQ1/B2m80F6U= +go.opentelemetry.io/collector/confmap v0.0.0-20221201172708-2bdff61fa52a h1:2TscCXAQASO2kU9xHcMIUM/FP29fiQIRTilZmliq/7I= +go.opentelemetry.io/collector/confmap v0.0.0-20221201172708-2bdff61fa52a/go.mod h1:qJ3e8bA8h4wz/jYlbeEUafVHdrU7DkpStnmIUAz6VTQ= +go.opentelemetry.io/collector/consumer v0.66.1-0.20221202005155-1c54042beb70 h1:XwpVjI1KeKGPXOZBLefGILMziPYuNf6IzbmiIEsIyI0= +go.opentelemetry.io/collector/consumer v0.66.1-0.20221202005155-1c54042beb70/go.mod h1:EWVBcSGcIcmeDGTnIboc/aqa3agsBeH8/q7yFWG7xVc= +go.opentelemetry.io/collector/featuregate v0.66.1-0.20221202005155-1c54042beb70 h1:V0tf4ebciqIs07jFATfLGdUpLRaEsi+AiWuA/in0G8Y= +go.opentelemetry.io/collector/featuregate v0.66.1-0.20221202005155-1c54042beb70/go.mod h1:tewuFKJYalWBU0bmNKg++MC1ipINXUr6szYzOw2p1GI= +go.opentelemetry.io/collector/pdata v0.66.1-0.20221202005155-1c54042beb70 h1:TPOrxkEMvZzfBSwF3ct+kUUgKA5g8unkZZbKQvJweeA= +go.opentelemetry.io/collector/pdata v0.66.1-0.20221202005155-1c54042beb70/go.mod h1:pqyaznLzk21m+1KL6fwOsRryRELL+zNM0qiVSn0MbVc= 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= @@ -308,8 +310,8 @@ go.uber.org/multierr v1.6.0/go.mod h1:cdWPpRnG4AhwMwsgIHip0KRBQjJy5kYEpYjJxpXp9i go.uber.org/multierr v1.8.0 h1:dg6GjLku4EH+249NNmoIciG9N/jURbDG+pFlTkhzIC8= go.uber.org/multierr v1.8.0/go.mod h1:7EAYxJLBy9rStEaz58O2t4Uvip6FSURkq8/ppBp95ak= go.uber.org/zap v1.17.0/go.mod h1:MXVU+bhUf/A7Xi2HNOnopQOrmycQ5Ih87HtOu4q5SSo= -go.uber.org/zap v1.23.0 h1:OjGQ5KQDEUawVHxNwQgPpiypGHOxo2mNZsOqTak4fFY= -go.uber.org/zap v1.23.0/go.mod h1:D+nX8jyLsMHMYrln8A0rJjFt/T/9/bGgIhAqxv5URuY= +go.uber.org/zap v1.24.0 h1:FiJd5l1UOLj0wCgbSE0rwwXHzEdAZS6hiiSnxJN/D60= +go.uber.org/zap v1.24.0/go.mod h1:2kMP+WWQ8aoFoedH3T2sq6iJ2yDWpHbP0f6MQbS9Gkg= golang.org/x/crypto v0.0.0-20180904163835-0709b304e793/go.mod h1:6SG95UA2DQfeDnfUPMdvaQW0Q7yPrPDi9nlGo2tz2b4= golang.org/x/crypto v0.0.0-20190308221718-c2843e01d9a2/go.mod h1:djNgcEr1/C05ACkg1iLfiJU5Ep61QUkGW8qpdssI0+w= golang.org/x/crypto v0.0.0-20190923035154-9ee001bba392/go.mod h1:/lpIB1dKB+9EgE3H3cr1v9wB50oz8l4C4h62xy7jSTY= diff --git a/receiver/aerospikereceiver/go.mod b/receiver/aerospikereceiver/go.mod index db552168304c..388b502c81d9 100644 --- a/receiver/aerospikereceiver/go.mod +++ b/receiver/aerospikereceiver/go.mod @@ -7,12 +7,13 @@ require ( github.com/open-telemetry/opentelemetry-collector-contrib/internal/scrapertest v0.66.0 github.com/stretchr/testify v1.8.1 github.com/testcontainers/testcontainers-go v0.15.0 - go.opentelemetry.io/collector v0.66.1-0.20221128222955-4ff1ff379b90 - go.opentelemetry.io/collector/component v0.66.1-0.20221128222955-4ff1ff379b90 - go.opentelemetry.io/collector/consumer v0.66.1-0.20221128222955-4ff1ff379b90 - go.opentelemetry.io/collector/pdata v0.66.1-0.20221128222955-4ff1ff379b90 + go.opentelemetry.io/collector v0.66.1-0.20221202005155-1c54042beb70 + go.opentelemetry.io/collector/component v0.66.1-0.20221202005155-1c54042beb70 + go.opentelemetry.io/collector/confmap v0.0.0-20221201172708-2bdff61fa52a + go.opentelemetry.io/collector/consumer v0.66.1-0.20221202005155-1c54042beb70 + go.opentelemetry.io/collector/pdata v0.66.1-0.20221202005155-1c54042beb70 go.uber.org/multierr v1.8.0 - go.uber.org/zap v1.23.0 + go.uber.org/zap v1.24.0 ) require ( @@ -52,7 +53,7 @@ require ( github.com/stretchr/objx v0.5.0 // indirect github.com/yuin/gopher-lua v0.0.0-20220504180219-658193537a64 // indirect go.opencensus.io v0.24.0 // indirect - go.opentelemetry.io/collector/featuregate v0.66.1-0.20221128222955-4ff1ff379b90 // indirect + go.opentelemetry.io/collector/featuregate v0.66.1-0.20221202005155-1c54042beb70 // 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 fc5f5f9b91bf..18eda7e02410 100644 --- a/receiver/aerospikereceiver/go.sum +++ b/receiver/aerospikereceiver/go.sum @@ -834,16 +834,18 @@ go.opencensus.io v0.22.2/go.mod h1:yxeiOL68Rb0Xd1ddK5vPZ/oVn4vY4Ynel7k9FzqtOIw= go.opencensus.io v0.22.3/go.mod h1:yxeiOL68Rb0Xd1ddK5vPZ/oVn4vY4Ynel7k9FzqtOIw= go.opencensus.io v0.24.0 h1:y73uSU6J157QMP2kn2r30vwW1A2W2WFwSCGnAVxeaD0= go.opencensus.io v0.24.0/go.mod h1:vNK8G9p7aAivkbmorf4v+7Hgx+Zs0yY+0fOtgBfjQKo= -go.opentelemetry.io/collector v0.66.1-0.20221128222955-4ff1ff379b90 h1:yRe05/jMdzH4TFHfndZ5h2o2hKBK/79W72j8w51qNsI= -go.opentelemetry.io/collector v0.66.1-0.20221128222955-4ff1ff379b90/go.mod h1:hE6jCs+0rfiufCrVPucKZTMwfHit1okfDPnwPT2eW1I= -go.opentelemetry.io/collector/component v0.66.1-0.20221128222955-4ff1ff379b90 h1:AYSNTXbezhNg43EuYdVVcgxE/2gBVrm00FDx4DOmQVg= -go.opentelemetry.io/collector/component v0.66.1-0.20221128222955-4ff1ff379b90/go.mod h1:0c84EqXUhvYe6KW7hJfh76tiI/5yjWCH2amwyQ06XLM= -go.opentelemetry.io/collector/consumer v0.66.1-0.20221128222955-4ff1ff379b90 h1:nzNXVfC1FzXBXCLMzbMv+qK3E4EGiNsnMhfVsBd2yzc= -go.opentelemetry.io/collector/consumer v0.66.1-0.20221128222955-4ff1ff379b90/go.mod h1:WtoRZa5SnxQO1ZEQdVxYpFcXCmq62rakv0oUSlPO0NQ= -go.opentelemetry.io/collector/featuregate v0.66.1-0.20221128222955-4ff1ff379b90 h1:UuJSFWbi9XxyNZsJKZuvpWg35BgRbcCGFH+38V2MAdw= -go.opentelemetry.io/collector/featuregate v0.66.1-0.20221128222955-4ff1ff379b90/go.mod h1:tewuFKJYalWBU0bmNKg++MC1ipINXUr6szYzOw2p1GI= -go.opentelemetry.io/collector/pdata v0.66.1-0.20221128222955-4ff1ff379b90 h1:Vu4S4jSNcd0VFPzxQNO4+UqGwnes1xJDoFLPRiWHm8I= -go.opentelemetry.io/collector/pdata v0.66.1-0.20221128222955-4ff1ff379b90/go.mod h1:pqyaznLzk21m+1KL6fwOsRryRELL+zNM0qiVSn0MbVc= +go.opentelemetry.io/collector v0.66.1-0.20221202005155-1c54042beb70 h1:INB2CsOtqqrija2KvMuIpbBQ3qX1BECEeR+d0NJX+oM= +go.opentelemetry.io/collector v0.66.1-0.20221202005155-1c54042beb70/go.mod h1:d0NHkHyANJy3HDTvYE/PoylMShUmFIbiir89ieI0X0c= +go.opentelemetry.io/collector/component v0.66.1-0.20221202005155-1c54042beb70 h1:dEoJhzCmRShgmVro/kXm6pouGElgxkH2DsvanzCeZtU= +go.opentelemetry.io/collector/component v0.66.1-0.20221202005155-1c54042beb70/go.mod h1:OsVnvFFe38QSpcuZlQ8cvarDzcloCexgQ1/B2m80F6U= +go.opentelemetry.io/collector/confmap v0.0.0-20221201172708-2bdff61fa52a h1:2TscCXAQASO2kU9xHcMIUM/FP29fiQIRTilZmliq/7I= +go.opentelemetry.io/collector/confmap v0.0.0-20221201172708-2bdff61fa52a/go.mod h1:qJ3e8bA8h4wz/jYlbeEUafVHdrU7DkpStnmIUAz6VTQ= +go.opentelemetry.io/collector/consumer v0.66.1-0.20221202005155-1c54042beb70 h1:XwpVjI1KeKGPXOZBLefGILMziPYuNf6IzbmiIEsIyI0= +go.opentelemetry.io/collector/consumer v0.66.1-0.20221202005155-1c54042beb70/go.mod h1:EWVBcSGcIcmeDGTnIboc/aqa3agsBeH8/q7yFWG7xVc= +go.opentelemetry.io/collector/featuregate v0.66.1-0.20221202005155-1c54042beb70 h1:V0tf4ebciqIs07jFATfLGdUpLRaEsi+AiWuA/in0G8Y= +go.opentelemetry.io/collector/featuregate v0.66.1-0.20221202005155-1c54042beb70/go.mod h1:tewuFKJYalWBU0bmNKg++MC1ipINXUr6szYzOw2p1GI= +go.opentelemetry.io/collector/pdata v0.66.1-0.20221202005155-1c54042beb70 h1:TPOrxkEMvZzfBSwF3ct+kUUgKA5g8unkZZbKQvJweeA= +go.opentelemetry.io/collector/pdata v0.66.1-0.20221202005155-1c54042beb70/go.mod h1:pqyaznLzk21m+1KL6fwOsRryRELL+zNM0qiVSn0MbVc= 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= @@ -866,8 +868,8 @@ go.uber.org/multierr v1.8.0 h1:dg6GjLku4EH+249NNmoIciG9N/jURbDG+pFlTkhzIC8= go.uber.org/multierr v1.8.0/go.mod h1:7EAYxJLBy9rStEaz58O2t4Uvip6FSURkq8/ppBp95ak= go.uber.org/zap v1.10.0/go.mod h1:vwi/ZaCAaUcBkycHslxD9B2zi4UTXhF60s6SWpuDF0Q= go.uber.org/zap v1.17.0/go.mod h1:MXVU+bhUf/A7Xi2HNOnopQOrmycQ5Ih87HtOu4q5SSo= -go.uber.org/zap v1.23.0 h1:OjGQ5KQDEUawVHxNwQgPpiypGHOxo2mNZsOqTak4fFY= -go.uber.org/zap v1.23.0/go.mod h1:D+nX8jyLsMHMYrln8A0rJjFt/T/9/bGgIhAqxv5URuY= +go.uber.org/zap v1.24.0 h1:FiJd5l1UOLj0wCgbSE0rwwXHzEdAZS6hiiSnxJN/D60= +go.uber.org/zap v1.24.0/go.mod h1:2kMP+WWQ8aoFoedH3T2sq6iJ2yDWpHbP0f6MQbS9Gkg= golang.org/x/crypto v0.0.0-20171113213409-9f005a07e0d3/go.mod h1:6SG95UA2DQfeDnfUPMdvaQW0Q7yPrPDi9nlGo2tz2b4= golang.org/x/crypto v0.0.0-20180904163835-0709b304e793/go.mod h1:6SG95UA2DQfeDnfUPMdvaQW0Q7yPrPDi9nlGo2tz2b4= golang.org/x/crypto v0.0.0-20181009213950-7c1a557ab941/go.mod h1:6SG95UA2DQfeDnfUPMdvaQW0Q7yPrPDi9nlGo2tz2b4= diff --git a/receiver/apachereceiver/go.mod b/receiver/apachereceiver/go.mod index 713523f9e992..932ae5a013fd 100644 --- a/receiver/apachereceiver/go.mod +++ b/receiver/apachereceiver/go.mod @@ -6,12 +6,13 @@ require ( github.com/open-telemetry/opentelemetry-collector-contrib/internal/scrapertest v0.66.0 github.com/stretchr/testify v1.8.1 github.com/testcontainers/testcontainers-go v0.15.0 - go.opentelemetry.io/collector v0.66.1-0.20221128222955-4ff1ff379b90 - go.opentelemetry.io/collector/component v0.66.1-0.20221128222955-4ff1ff379b90 - go.opentelemetry.io/collector/consumer v0.66.1-0.20221128222955-4ff1ff379b90 - go.opentelemetry.io/collector/featuregate v0.66.1-0.20221128222955-4ff1ff379b90 - go.opentelemetry.io/collector/pdata v0.66.1-0.20221128222955-4ff1ff379b90 - go.uber.org/zap v1.23.0 + go.opentelemetry.io/collector v0.66.1-0.20221202005155-1c54042beb70 + go.opentelemetry.io/collector/component v0.66.1-0.20221202005155-1c54042beb70 + go.opentelemetry.io/collector/confmap v0.0.0-20221201172708-2bdff61fa52a + go.opentelemetry.io/collector/consumer v0.66.1-0.20221202005155-1c54042beb70 + go.opentelemetry.io/collector/featuregate v0.66.1-0.20221202005155-1c54042beb70 + go.opentelemetry.io/collector/pdata v0.66.1-0.20221202005155-1c54042beb70 + go.uber.org/zap v1.24.0 ) require ( diff --git a/receiver/apachereceiver/go.sum b/receiver/apachereceiver/go.sum index b906c7a4124e..02f4e8c5e236 100644 --- a/receiver/apachereceiver/go.sum +++ b/receiver/apachereceiver/go.sum @@ -828,16 +828,18 @@ go.opencensus.io v0.22.2/go.mod h1:yxeiOL68Rb0Xd1ddK5vPZ/oVn4vY4Ynel7k9FzqtOIw= go.opencensus.io v0.22.3/go.mod h1:yxeiOL68Rb0Xd1ddK5vPZ/oVn4vY4Ynel7k9FzqtOIw= go.opencensus.io v0.24.0 h1:y73uSU6J157QMP2kn2r30vwW1A2W2WFwSCGnAVxeaD0= go.opencensus.io v0.24.0/go.mod h1:vNK8G9p7aAivkbmorf4v+7Hgx+Zs0yY+0fOtgBfjQKo= -go.opentelemetry.io/collector v0.66.1-0.20221128222955-4ff1ff379b90 h1:yRe05/jMdzH4TFHfndZ5h2o2hKBK/79W72j8w51qNsI= -go.opentelemetry.io/collector v0.66.1-0.20221128222955-4ff1ff379b90/go.mod h1:hE6jCs+0rfiufCrVPucKZTMwfHit1okfDPnwPT2eW1I= -go.opentelemetry.io/collector/component v0.66.1-0.20221128222955-4ff1ff379b90 h1:AYSNTXbezhNg43EuYdVVcgxE/2gBVrm00FDx4DOmQVg= -go.opentelemetry.io/collector/component v0.66.1-0.20221128222955-4ff1ff379b90/go.mod h1:0c84EqXUhvYe6KW7hJfh76tiI/5yjWCH2amwyQ06XLM= -go.opentelemetry.io/collector/consumer v0.66.1-0.20221128222955-4ff1ff379b90 h1:nzNXVfC1FzXBXCLMzbMv+qK3E4EGiNsnMhfVsBd2yzc= -go.opentelemetry.io/collector/consumer v0.66.1-0.20221128222955-4ff1ff379b90/go.mod h1:WtoRZa5SnxQO1ZEQdVxYpFcXCmq62rakv0oUSlPO0NQ= -go.opentelemetry.io/collector/featuregate v0.66.1-0.20221128222955-4ff1ff379b90 h1:UuJSFWbi9XxyNZsJKZuvpWg35BgRbcCGFH+38V2MAdw= -go.opentelemetry.io/collector/featuregate v0.66.1-0.20221128222955-4ff1ff379b90/go.mod h1:tewuFKJYalWBU0bmNKg++MC1ipINXUr6szYzOw2p1GI= -go.opentelemetry.io/collector/pdata v0.66.1-0.20221128222955-4ff1ff379b90 h1:Vu4S4jSNcd0VFPzxQNO4+UqGwnes1xJDoFLPRiWHm8I= -go.opentelemetry.io/collector/pdata v0.66.1-0.20221128222955-4ff1ff379b90/go.mod h1:pqyaznLzk21m+1KL6fwOsRryRELL+zNM0qiVSn0MbVc= +go.opentelemetry.io/collector v0.66.1-0.20221202005155-1c54042beb70 h1:INB2CsOtqqrija2KvMuIpbBQ3qX1BECEeR+d0NJX+oM= +go.opentelemetry.io/collector v0.66.1-0.20221202005155-1c54042beb70/go.mod h1:d0NHkHyANJy3HDTvYE/PoylMShUmFIbiir89ieI0X0c= +go.opentelemetry.io/collector/component v0.66.1-0.20221202005155-1c54042beb70 h1:dEoJhzCmRShgmVro/kXm6pouGElgxkH2DsvanzCeZtU= +go.opentelemetry.io/collector/component v0.66.1-0.20221202005155-1c54042beb70/go.mod h1:OsVnvFFe38QSpcuZlQ8cvarDzcloCexgQ1/B2m80F6U= +go.opentelemetry.io/collector/confmap v0.0.0-20221201172708-2bdff61fa52a h1:2TscCXAQASO2kU9xHcMIUM/FP29fiQIRTilZmliq/7I= +go.opentelemetry.io/collector/confmap v0.0.0-20221201172708-2bdff61fa52a/go.mod h1:qJ3e8bA8h4wz/jYlbeEUafVHdrU7DkpStnmIUAz6VTQ= +go.opentelemetry.io/collector/consumer v0.66.1-0.20221202005155-1c54042beb70 h1:XwpVjI1KeKGPXOZBLefGILMziPYuNf6IzbmiIEsIyI0= +go.opentelemetry.io/collector/consumer v0.66.1-0.20221202005155-1c54042beb70/go.mod h1:EWVBcSGcIcmeDGTnIboc/aqa3agsBeH8/q7yFWG7xVc= +go.opentelemetry.io/collector/featuregate v0.66.1-0.20221202005155-1c54042beb70 h1:V0tf4ebciqIs07jFATfLGdUpLRaEsi+AiWuA/in0G8Y= +go.opentelemetry.io/collector/featuregate v0.66.1-0.20221202005155-1c54042beb70/go.mod h1:tewuFKJYalWBU0bmNKg++MC1ipINXUr6szYzOw2p1GI= +go.opentelemetry.io/collector/pdata v0.66.1-0.20221202005155-1c54042beb70 h1:TPOrxkEMvZzfBSwF3ct+kUUgKA5g8unkZZbKQvJweeA= +go.opentelemetry.io/collector/pdata v0.66.1-0.20221202005155-1c54042beb70/go.mod h1:pqyaznLzk21m+1KL6fwOsRryRELL+zNM0qiVSn0MbVc= 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= @@ -862,8 +864,8 @@ go.uber.org/multierr v1.8.0 h1:dg6GjLku4EH+249NNmoIciG9N/jURbDG+pFlTkhzIC8= go.uber.org/multierr v1.8.0/go.mod h1:7EAYxJLBy9rStEaz58O2t4Uvip6FSURkq8/ppBp95ak= go.uber.org/zap v1.10.0/go.mod h1:vwi/ZaCAaUcBkycHslxD9B2zi4UTXhF60s6SWpuDF0Q= go.uber.org/zap v1.17.0/go.mod h1:MXVU+bhUf/A7Xi2HNOnopQOrmycQ5Ih87HtOu4q5SSo= -go.uber.org/zap v1.23.0 h1:OjGQ5KQDEUawVHxNwQgPpiypGHOxo2mNZsOqTak4fFY= -go.uber.org/zap v1.23.0/go.mod h1:D+nX8jyLsMHMYrln8A0rJjFt/T/9/bGgIhAqxv5URuY= +go.uber.org/zap v1.24.0 h1:FiJd5l1UOLj0wCgbSE0rwwXHzEdAZS6hiiSnxJN/D60= +go.uber.org/zap v1.24.0/go.mod h1:2kMP+WWQ8aoFoedH3T2sq6iJ2yDWpHbP0f6MQbS9Gkg= golang.org/x/crypto v0.0.0-20171113213409-9f005a07e0d3/go.mod h1:6SG95UA2DQfeDnfUPMdvaQW0Q7yPrPDi9nlGo2tz2b4= golang.org/x/crypto v0.0.0-20180904163835-0709b304e793/go.mod h1:6SG95UA2DQfeDnfUPMdvaQW0Q7yPrPDi9nlGo2tz2b4= golang.org/x/crypto v0.0.0-20181009213950-7c1a557ab941/go.mod h1:6SG95UA2DQfeDnfUPMdvaQW0Q7yPrPDi9nlGo2tz2b4= diff --git a/receiver/awscloudwatchreceiver/go.mod b/receiver/awscloudwatchreceiver/go.mod index 44e0085408b7..df9c31f2bf1d 100644 --- a/receiver/awscloudwatchreceiver/go.mod +++ b/receiver/awscloudwatchreceiver/go.mod @@ -5,12 +5,13 @@ go 1.18 require ( github.com/aws/aws-sdk-go v1.44.145 github.com/stretchr/testify v1.8.1 - go.opentelemetry.io/collector v0.66.1-0.20221128222955-4ff1ff379b90 - go.opentelemetry.io/collector/component v0.66.1-0.20221128222955-4ff1ff379b90 - go.opentelemetry.io/collector/consumer v0.66.1-0.20221128222955-4ff1ff379b90 - go.opentelemetry.io/collector/pdata v0.66.1-0.20221128222955-4ff1ff379b90 + go.opentelemetry.io/collector v0.66.1-0.20221202005155-1c54042beb70 + go.opentelemetry.io/collector/component v0.66.1-0.20221202005155-1c54042beb70 + go.opentelemetry.io/collector/confmap v0.0.0-20221201172708-2bdff61fa52a + go.opentelemetry.io/collector/consumer v0.66.1-0.20221202005155-1c54042beb70 + go.opentelemetry.io/collector/pdata v0.66.1-0.20221202005155-1c54042beb70 go.uber.org/multierr v1.8.0 - go.uber.org/zap v1.23.0 + go.uber.org/zap v1.24.0 ) require ( @@ -27,7 +28,7 @@ require ( github.com/modern-go/reflect2 v1.0.2 // indirect github.com/pmezard/go-difflib v1.0.0 // indirect github.com/stretchr/objx v0.5.0 // indirect - go.opentelemetry.io/collector/featuregate v0.66.1-0.20221128222955-4ff1ff379b90 // indirect + go.opentelemetry.io/collector/featuregate v0.66.1-0.20221202005155-1c54042beb70 // indirect go.opentelemetry.io/otel v1.11.1 // indirect go.opentelemetry.io/otel/metric v0.33.0 // indirect go.opentelemetry.io/otel/trace v1.11.1 // indirect diff --git a/receiver/awscloudwatchreceiver/go.sum b/receiver/awscloudwatchreceiver/go.sum index 144d79ea2f64..2dd3756f0a59 100644 --- a/receiver/awscloudwatchreceiver/go.sum +++ b/receiver/awscloudwatchreceiver/go.sum @@ -263,16 +263,18 @@ github.com/yuin/goldmark v1.4.13/go.mod h1:6yULJ656Px+3vBD8DxQVa3kxgyrAnzto9xy5t go.etcd.io/etcd/api/v3 v3.5.4/go.mod h1:5GB2vv4A4AOn3yk7MftYGHkUfGtDHnEraIjym4dYz5A= go.etcd.io/etcd/client/pkg/v3 v3.5.4/go.mod h1:IJHfcCEKxYu1Os13ZdwCwIUTUVGYTSAM3YSwc9/Ac1g= go.etcd.io/etcd/client/v3 v3.5.4/go.mod h1:ZaRkVgBZC+L+dLCjTcF1hRXpgZXQPOvnA/Ak/gq3kiY= -go.opentelemetry.io/collector v0.66.1-0.20221128222955-4ff1ff379b90 h1:yRe05/jMdzH4TFHfndZ5h2o2hKBK/79W72j8w51qNsI= -go.opentelemetry.io/collector v0.66.1-0.20221128222955-4ff1ff379b90/go.mod h1:hE6jCs+0rfiufCrVPucKZTMwfHit1okfDPnwPT2eW1I= -go.opentelemetry.io/collector/component v0.66.1-0.20221128222955-4ff1ff379b90 h1:AYSNTXbezhNg43EuYdVVcgxE/2gBVrm00FDx4DOmQVg= -go.opentelemetry.io/collector/component v0.66.1-0.20221128222955-4ff1ff379b90/go.mod h1:0c84EqXUhvYe6KW7hJfh76tiI/5yjWCH2amwyQ06XLM= -go.opentelemetry.io/collector/consumer v0.66.1-0.20221128222955-4ff1ff379b90 h1:nzNXVfC1FzXBXCLMzbMv+qK3E4EGiNsnMhfVsBd2yzc= -go.opentelemetry.io/collector/consumer v0.66.1-0.20221128222955-4ff1ff379b90/go.mod h1:WtoRZa5SnxQO1ZEQdVxYpFcXCmq62rakv0oUSlPO0NQ= -go.opentelemetry.io/collector/featuregate v0.66.1-0.20221128222955-4ff1ff379b90 h1:UuJSFWbi9XxyNZsJKZuvpWg35BgRbcCGFH+38V2MAdw= -go.opentelemetry.io/collector/featuregate v0.66.1-0.20221128222955-4ff1ff379b90/go.mod h1:tewuFKJYalWBU0bmNKg++MC1ipINXUr6szYzOw2p1GI= -go.opentelemetry.io/collector/pdata v0.66.1-0.20221128222955-4ff1ff379b90 h1:Vu4S4jSNcd0VFPzxQNO4+UqGwnes1xJDoFLPRiWHm8I= -go.opentelemetry.io/collector/pdata v0.66.1-0.20221128222955-4ff1ff379b90/go.mod h1:pqyaznLzk21m+1KL6fwOsRryRELL+zNM0qiVSn0MbVc= +go.opentelemetry.io/collector v0.66.1-0.20221202005155-1c54042beb70 h1:INB2CsOtqqrija2KvMuIpbBQ3qX1BECEeR+d0NJX+oM= +go.opentelemetry.io/collector v0.66.1-0.20221202005155-1c54042beb70/go.mod h1:d0NHkHyANJy3HDTvYE/PoylMShUmFIbiir89ieI0X0c= +go.opentelemetry.io/collector/component v0.66.1-0.20221202005155-1c54042beb70 h1:dEoJhzCmRShgmVro/kXm6pouGElgxkH2DsvanzCeZtU= +go.opentelemetry.io/collector/component v0.66.1-0.20221202005155-1c54042beb70/go.mod h1:OsVnvFFe38QSpcuZlQ8cvarDzcloCexgQ1/B2m80F6U= +go.opentelemetry.io/collector/confmap v0.0.0-20221201172708-2bdff61fa52a h1:2TscCXAQASO2kU9xHcMIUM/FP29fiQIRTilZmliq/7I= +go.opentelemetry.io/collector/confmap v0.0.0-20221201172708-2bdff61fa52a/go.mod h1:qJ3e8bA8h4wz/jYlbeEUafVHdrU7DkpStnmIUAz6VTQ= +go.opentelemetry.io/collector/consumer v0.66.1-0.20221202005155-1c54042beb70 h1:XwpVjI1KeKGPXOZBLefGILMziPYuNf6IzbmiIEsIyI0= +go.opentelemetry.io/collector/consumer v0.66.1-0.20221202005155-1c54042beb70/go.mod h1:EWVBcSGcIcmeDGTnIboc/aqa3agsBeH8/q7yFWG7xVc= +go.opentelemetry.io/collector/featuregate v0.66.1-0.20221202005155-1c54042beb70 h1:V0tf4ebciqIs07jFATfLGdUpLRaEsi+AiWuA/in0G8Y= +go.opentelemetry.io/collector/featuregate v0.66.1-0.20221202005155-1c54042beb70/go.mod h1:tewuFKJYalWBU0bmNKg++MC1ipINXUr6szYzOw2p1GI= +go.opentelemetry.io/collector/pdata v0.66.1-0.20221202005155-1c54042beb70 h1:TPOrxkEMvZzfBSwF3ct+kUUgKA5g8unkZZbKQvJweeA= +go.opentelemetry.io/collector/pdata v0.66.1-0.20221202005155-1c54042beb70/go.mod h1:pqyaznLzk21m+1KL6fwOsRryRELL+zNM0qiVSn0MbVc= 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= @@ -288,8 +290,8 @@ go.uber.org/multierr v1.6.0/go.mod h1:cdWPpRnG4AhwMwsgIHip0KRBQjJy5kYEpYjJxpXp9i go.uber.org/multierr v1.8.0 h1:dg6GjLku4EH+249NNmoIciG9N/jURbDG+pFlTkhzIC8= go.uber.org/multierr v1.8.0/go.mod h1:7EAYxJLBy9rStEaz58O2t4Uvip6FSURkq8/ppBp95ak= go.uber.org/zap v1.17.0/go.mod h1:MXVU+bhUf/A7Xi2HNOnopQOrmycQ5Ih87HtOu4q5SSo= -go.uber.org/zap v1.23.0 h1:OjGQ5KQDEUawVHxNwQgPpiypGHOxo2mNZsOqTak4fFY= -go.uber.org/zap v1.23.0/go.mod h1:D+nX8jyLsMHMYrln8A0rJjFt/T/9/bGgIhAqxv5URuY= +go.uber.org/zap v1.24.0 h1:FiJd5l1UOLj0wCgbSE0rwwXHzEdAZS6hiiSnxJN/D60= +go.uber.org/zap v1.24.0/go.mod h1:2kMP+WWQ8aoFoedH3T2sq6iJ2yDWpHbP0f6MQbS9Gkg= golang.org/x/crypto v0.0.0-20180904163835-0709b304e793/go.mod h1:6SG95UA2DQfeDnfUPMdvaQW0Q7yPrPDi9nlGo2tz2b4= golang.org/x/crypto v0.0.0-20190308221718-c2843e01d9a2/go.mod h1:djNgcEr1/C05ACkg1iLfiJU5Ep61QUkGW8qpdssI0+w= golang.org/x/crypto v0.0.0-20190923035154-9ee001bba392/go.mod h1:/lpIB1dKB+9EgE3H3cr1v9wB50oz8l4C4h62xy7jSTY= diff --git a/receiver/awscontainerinsightreceiver/go.mod b/receiver/awscontainerinsightreceiver/go.mod index 17e5690c66fe..e81700d165f7 100644 --- a/receiver/awscontainerinsightreceiver/go.mod +++ b/receiver/awscontainerinsightreceiver/go.mod @@ -13,11 +13,12 @@ require ( github.com/open-telemetry/opentelemetry-collector-contrib/internal/kubelet v0.66.0 github.com/shirou/gopsutil/v3 v3.22.10 github.com/stretchr/testify v1.8.1 - go.opentelemetry.io/collector v0.66.1-0.20221128222955-4ff1ff379b90 - go.opentelemetry.io/collector/component v0.66.1-0.20221128222955-4ff1ff379b90 - go.opentelemetry.io/collector/consumer v0.66.1-0.20221128222955-4ff1ff379b90 - go.opentelemetry.io/collector/pdata v0.66.1-0.20221128222955-4ff1ff379b90 - go.uber.org/zap v1.23.0 + go.opentelemetry.io/collector v0.66.1-0.20221202005155-1c54042beb70 + go.opentelemetry.io/collector/component v0.66.1-0.20221202005155-1c54042beb70 + go.opentelemetry.io/collector/confmap v0.0.0-20221201172708-2bdff61fa52a + go.opentelemetry.io/collector/consumer v0.66.1-0.20221202005155-1c54042beb70 + go.opentelemetry.io/collector/pdata v0.66.1-0.20221202005155-1c54042beb70 + go.uber.org/zap v1.24.0 k8s.io/api v0.25.4 k8s.io/apimachinery v0.25.4 k8s.io/client-go v0.25.4 @@ -100,12 +101,12 @@ require ( github.com/spf13/pflag v1.0.5 // indirect github.com/stretchr/objx v0.5.0 // indirect github.com/syndtr/gocapability v0.0.0-20200815063812-42c35b437635 // indirect - github.com/tklauser/go-sysconf v0.3.10 // indirect - github.com/tklauser/numcpus v0.4.0 // indirect + github.com/tklauser/go-sysconf v0.3.11 // indirect + github.com/tklauser/numcpus v0.6.0 // indirect github.com/vishvananda/netlink v1.1.1-0.20201029203352-d40f9887b852 // indirect github.com/vishvananda/netns v0.0.0-20200728191858-db3c7e526aae // indirect github.com/yusufpapurcu/wmi v1.2.2 // indirect - go.opentelemetry.io/collector/featuregate v0.66.1-0.20221128222955-4ff1ff379b90 // indirect + go.opentelemetry.io/collector/featuregate v0.66.1-0.20221202005155-1c54042beb70 // indirect go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.36.4 // indirect go.opentelemetry.io/otel v1.11.1 // indirect go.opentelemetry.io/otel/metric v0.33.0 // indirect diff --git a/receiver/awscontainerinsightreceiver/go.sum b/receiver/awscontainerinsightreceiver/go.sum index fefd9328297d..61f2cc3120fd 100644 --- a/receiver/awscontainerinsightreceiver/go.sum +++ b/receiver/awscontainerinsightreceiver/go.sum @@ -547,10 +547,12 @@ github.com/stretchr/testify v1.8.1 h1:w7B6lhMri9wdJUVmEZPGGhZzrYTPvgJArz7wNPgYKs github.com/stretchr/testify v1.8.1/go.mod h1:w2LPCIKwWwSfY2zedu0+kehJoqGctiVI29o6fzry7u4= github.com/syndtr/gocapability v0.0.0-20200815063812-42c35b437635 h1:kdXcSzyDtseVEc4yCz2qF8ZrQvIDBJLl4S1c3GCXmoI= github.com/syndtr/gocapability v0.0.0-20200815063812-42c35b437635/go.mod h1:hkRG7XYTFWNJGYcbNJQlaLq0fg1yr4J4t/NcTQtrfww= -github.com/tklauser/go-sysconf v0.3.10 h1:IJ1AZGZRWbY8T5Vfk04D9WOA5WSejdflXxP03OUqALw= github.com/tklauser/go-sysconf v0.3.10/go.mod h1:C8XykCvCb+Gn0oNCWPIlcb0RuglQTYaQ2hGm7jmxEFk= -github.com/tklauser/numcpus v0.4.0 h1:E53Dm1HjH1/R2/aoCtXtPgzmElmn51aOkhCFSuZq//o= +github.com/tklauser/go-sysconf v0.3.11 h1:89WgdJhk5SNwJfu+GKyYveZ4IaJ7xAkecBo+KdJV0CM= +github.com/tklauser/go-sysconf v0.3.11/go.mod h1:GqXfhXY3kiPa0nAXPDIQIWzJbMCB7AmcWpGR8lSZfqI= github.com/tklauser/numcpus v0.4.0/go.mod h1:1+UI3pD8NW14VMwdgJNJ1ESk2UnwhAnz5hMwiKKqXCQ= +github.com/tklauser/numcpus v0.6.0 h1:kebhY2Qt+3U6RNK7UqpYNA+tJ23IBEGKkB7JQBfDYms= +github.com/tklauser/numcpus v0.6.0/go.mod h1:FEZLMke0lhOUG6w2JadTzp0a+Nl8PF/GFkQ5UVIcaL4= github.com/urfave/cli v1.22.1/go.mod h1:Gos4lmkARVdJ6EkW0WaNv/tZAAMe9V7XWyB60NtXRu0= github.com/vishvananda/netlink v1.1.0/go.mod h1:cTgwzPIzzgDAYoQrMm0EdrjRUBkTqKYppBueQtXaqoE= github.com/vishvananda/netlink v1.1.1-0.20201029203352-d40f9887b852 h1:cPXZWzzG0NllBLdjWoD1nDfaqu98YMv+OneaKc8sPOA= @@ -574,16 +576,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.opentelemetry.io/collector v0.66.1-0.20221128222955-4ff1ff379b90 h1:yRe05/jMdzH4TFHfndZ5h2o2hKBK/79W72j8w51qNsI= -go.opentelemetry.io/collector v0.66.1-0.20221128222955-4ff1ff379b90/go.mod h1:hE6jCs+0rfiufCrVPucKZTMwfHit1okfDPnwPT2eW1I= -go.opentelemetry.io/collector/component v0.66.1-0.20221128222955-4ff1ff379b90 h1:AYSNTXbezhNg43EuYdVVcgxE/2gBVrm00FDx4DOmQVg= -go.opentelemetry.io/collector/component v0.66.1-0.20221128222955-4ff1ff379b90/go.mod h1:0c84EqXUhvYe6KW7hJfh76tiI/5yjWCH2amwyQ06XLM= -go.opentelemetry.io/collector/consumer v0.66.1-0.20221128222955-4ff1ff379b90 h1:nzNXVfC1FzXBXCLMzbMv+qK3E4EGiNsnMhfVsBd2yzc= -go.opentelemetry.io/collector/consumer v0.66.1-0.20221128222955-4ff1ff379b90/go.mod h1:WtoRZa5SnxQO1ZEQdVxYpFcXCmq62rakv0oUSlPO0NQ= -go.opentelemetry.io/collector/featuregate v0.66.1-0.20221128222955-4ff1ff379b90 h1:UuJSFWbi9XxyNZsJKZuvpWg35BgRbcCGFH+38V2MAdw= -go.opentelemetry.io/collector/featuregate v0.66.1-0.20221128222955-4ff1ff379b90/go.mod h1:tewuFKJYalWBU0bmNKg++MC1ipINXUr6szYzOw2p1GI= -go.opentelemetry.io/collector/pdata v0.66.1-0.20221128222955-4ff1ff379b90 h1:Vu4S4jSNcd0VFPzxQNO4+UqGwnes1xJDoFLPRiWHm8I= -go.opentelemetry.io/collector/pdata v0.66.1-0.20221128222955-4ff1ff379b90/go.mod h1:pqyaznLzk21m+1KL6fwOsRryRELL+zNM0qiVSn0MbVc= +go.opentelemetry.io/collector v0.66.1-0.20221202005155-1c54042beb70 h1:INB2CsOtqqrija2KvMuIpbBQ3qX1BECEeR+d0NJX+oM= +go.opentelemetry.io/collector v0.66.1-0.20221202005155-1c54042beb70/go.mod h1:d0NHkHyANJy3HDTvYE/PoylMShUmFIbiir89ieI0X0c= +go.opentelemetry.io/collector/component v0.66.1-0.20221202005155-1c54042beb70 h1:dEoJhzCmRShgmVro/kXm6pouGElgxkH2DsvanzCeZtU= +go.opentelemetry.io/collector/component v0.66.1-0.20221202005155-1c54042beb70/go.mod h1:OsVnvFFe38QSpcuZlQ8cvarDzcloCexgQ1/B2m80F6U= +go.opentelemetry.io/collector/confmap v0.0.0-20221201172708-2bdff61fa52a h1:2TscCXAQASO2kU9xHcMIUM/FP29fiQIRTilZmliq/7I= +go.opentelemetry.io/collector/confmap v0.0.0-20221201172708-2bdff61fa52a/go.mod h1:qJ3e8bA8h4wz/jYlbeEUafVHdrU7DkpStnmIUAz6VTQ= +go.opentelemetry.io/collector/consumer v0.66.1-0.20221202005155-1c54042beb70 h1:XwpVjI1KeKGPXOZBLefGILMziPYuNf6IzbmiIEsIyI0= +go.opentelemetry.io/collector/consumer v0.66.1-0.20221202005155-1c54042beb70/go.mod h1:EWVBcSGcIcmeDGTnIboc/aqa3agsBeH8/q7yFWG7xVc= +go.opentelemetry.io/collector/featuregate v0.66.1-0.20221202005155-1c54042beb70 h1:V0tf4ebciqIs07jFATfLGdUpLRaEsi+AiWuA/in0G8Y= +go.opentelemetry.io/collector/featuregate v0.66.1-0.20221202005155-1c54042beb70/go.mod h1:tewuFKJYalWBU0bmNKg++MC1ipINXUr6szYzOw2p1GI= +go.opentelemetry.io/collector/pdata v0.66.1-0.20221202005155-1c54042beb70 h1:TPOrxkEMvZzfBSwF3ct+kUUgKA5g8unkZZbKQvJweeA= +go.opentelemetry.io/collector/pdata v0.66.1-0.20221202005155-1c54042beb70/go.mod h1:pqyaznLzk21m+1KL6fwOsRryRELL+zNM0qiVSn0MbVc= 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= @@ -601,8 +605,8 @@ go.uber.org/multierr v1.6.0/go.mod h1:cdWPpRnG4AhwMwsgIHip0KRBQjJy5kYEpYjJxpXp9i go.uber.org/multierr v1.8.0 h1:dg6GjLku4EH+249NNmoIciG9N/jURbDG+pFlTkhzIC8= go.uber.org/multierr v1.8.0/go.mod h1:7EAYxJLBy9rStEaz58O2t4Uvip6FSURkq8/ppBp95ak= go.uber.org/zap v1.17.0/go.mod h1:MXVU+bhUf/A7Xi2HNOnopQOrmycQ5Ih87HtOu4q5SSo= -go.uber.org/zap v1.23.0 h1:OjGQ5KQDEUawVHxNwQgPpiypGHOxo2mNZsOqTak4fFY= -go.uber.org/zap v1.23.0/go.mod h1:D+nX8jyLsMHMYrln8A0rJjFt/T/9/bGgIhAqxv5URuY= +go.uber.org/zap v1.24.0 h1:FiJd5l1UOLj0wCgbSE0rwwXHzEdAZS6hiiSnxJN/D60= +go.uber.org/zap v1.24.0/go.mod h1:2kMP+WWQ8aoFoedH3T2sq6iJ2yDWpHbP0f6MQbS9Gkg= golang.org/x/crypto v0.0.0-20180904163835-0709b304e793/go.mod h1:6SG95UA2DQfeDnfUPMdvaQW0Q7yPrPDi9nlGo2tz2b4= golang.org/x/crypto v0.0.0-20190308221718-c2843e01d9a2/go.mod h1:djNgcEr1/C05ACkg1iLfiJU5Ep61QUkGW8qpdssI0+w= golang.org/x/crypto v0.0.0-20190510104115-cbcb75029529/go.mod h1:yigFU9vqHzYiE8UmvKecakEJjdnWj3jj499lnFckfCI= diff --git a/receiver/awsecscontainermetricsreceiver/go.mod b/receiver/awsecscontainermetricsreceiver/go.mod index 330ee991f25a..93cf3b480529 100644 --- a/receiver/awsecscontainermetricsreceiver/go.mod +++ b/receiver/awsecscontainermetricsreceiver/go.mod @@ -6,12 +6,13 @@ require ( github.com/open-telemetry/opentelemetry-collector-contrib/internal/aws/ecsutil v0.66.0 github.com/open-telemetry/opentelemetry-collector-contrib/internal/common v0.66.0 github.com/stretchr/testify v1.8.1 - go.opentelemetry.io/collector v0.66.1-0.20221128222955-4ff1ff379b90 - go.opentelemetry.io/collector/component v0.66.1-0.20221128222955-4ff1ff379b90 - go.opentelemetry.io/collector/consumer v0.66.1-0.20221128222955-4ff1ff379b90 - go.opentelemetry.io/collector/pdata v0.66.1-0.20221128222955-4ff1ff379b90 - go.opentelemetry.io/collector/semconv v0.66.1-0.20221128222955-4ff1ff379b90 - go.uber.org/zap v1.23.0 + go.opentelemetry.io/collector v0.66.1-0.20221202005155-1c54042beb70 + go.opentelemetry.io/collector/component v0.66.1-0.20221202005155-1c54042beb70 + go.opentelemetry.io/collector/confmap v0.0.0-20221201172708-2bdff61fa52a + go.opentelemetry.io/collector/consumer v0.66.1-0.20221202005155-1c54042beb70 + go.opentelemetry.io/collector/pdata v0.66.1-0.20221202005155-1c54042beb70 + go.opentelemetry.io/collector/semconv v0.66.1-0.20221202005155-1c54042beb70 + go.uber.org/zap v1.24.0 ) require ( @@ -32,7 +33,7 @@ require ( github.com/modern-go/reflect2 v1.0.2 // indirect github.com/pmezard/go-difflib v1.0.0 // indirect github.com/rs/cors v1.8.2 // indirect - go.opentelemetry.io/collector/featuregate v0.66.1-0.20221128222955-4ff1ff379b90 // indirect + go.opentelemetry.io/collector/featuregate v0.66.1-0.20221202005155-1c54042beb70 // indirect go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.36.4 // indirect go.opentelemetry.io/otel v1.11.1 // indirect go.opentelemetry.io/otel/metric v0.33.0 // indirect diff --git a/receiver/awsecscontainermetricsreceiver/go.sum b/receiver/awsecscontainermetricsreceiver/go.sum index 62327c9241d8..6b5bddc7524b 100644 --- a/receiver/awsecscontainermetricsreceiver/go.sum +++ b/receiver/awsecscontainermetricsreceiver/go.sum @@ -271,18 +271,20 @@ 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.66.1-0.20221128222955-4ff1ff379b90 h1:yRe05/jMdzH4TFHfndZ5h2o2hKBK/79W72j8w51qNsI= -go.opentelemetry.io/collector v0.66.1-0.20221128222955-4ff1ff379b90/go.mod h1:hE6jCs+0rfiufCrVPucKZTMwfHit1okfDPnwPT2eW1I= -go.opentelemetry.io/collector/component v0.66.1-0.20221128222955-4ff1ff379b90 h1:AYSNTXbezhNg43EuYdVVcgxE/2gBVrm00FDx4DOmQVg= -go.opentelemetry.io/collector/component v0.66.1-0.20221128222955-4ff1ff379b90/go.mod h1:0c84EqXUhvYe6KW7hJfh76tiI/5yjWCH2amwyQ06XLM= -go.opentelemetry.io/collector/consumer v0.66.1-0.20221128222955-4ff1ff379b90 h1:nzNXVfC1FzXBXCLMzbMv+qK3E4EGiNsnMhfVsBd2yzc= -go.opentelemetry.io/collector/consumer v0.66.1-0.20221128222955-4ff1ff379b90/go.mod h1:WtoRZa5SnxQO1ZEQdVxYpFcXCmq62rakv0oUSlPO0NQ= -go.opentelemetry.io/collector/featuregate v0.66.1-0.20221128222955-4ff1ff379b90 h1:UuJSFWbi9XxyNZsJKZuvpWg35BgRbcCGFH+38V2MAdw= -go.opentelemetry.io/collector/featuregate v0.66.1-0.20221128222955-4ff1ff379b90/go.mod h1:tewuFKJYalWBU0bmNKg++MC1ipINXUr6szYzOw2p1GI= -go.opentelemetry.io/collector/pdata v0.66.1-0.20221128222955-4ff1ff379b90 h1:Vu4S4jSNcd0VFPzxQNO4+UqGwnes1xJDoFLPRiWHm8I= -go.opentelemetry.io/collector/pdata v0.66.1-0.20221128222955-4ff1ff379b90/go.mod h1:pqyaznLzk21m+1KL6fwOsRryRELL+zNM0qiVSn0MbVc= -go.opentelemetry.io/collector/semconv v0.66.1-0.20221128222955-4ff1ff379b90 h1:hFaTA68cggZKWMv7wQ3bKP8KGTbowh/5AQZKCHzHTqM= -go.opentelemetry.io/collector/semconv v0.66.1-0.20221128222955-4ff1ff379b90/go.mod h1:5o9yhOa+ABt7g2E5JABDxGZ1PQPbtfxrKNbYn+LOTXU= +go.opentelemetry.io/collector v0.66.1-0.20221202005155-1c54042beb70 h1:INB2CsOtqqrija2KvMuIpbBQ3qX1BECEeR+d0NJX+oM= +go.opentelemetry.io/collector v0.66.1-0.20221202005155-1c54042beb70/go.mod h1:d0NHkHyANJy3HDTvYE/PoylMShUmFIbiir89ieI0X0c= +go.opentelemetry.io/collector/component v0.66.1-0.20221202005155-1c54042beb70 h1:dEoJhzCmRShgmVro/kXm6pouGElgxkH2DsvanzCeZtU= +go.opentelemetry.io/collector/component v0.66.1-0.20221202005155-1c54042beb70/go.mod h1:OsVnvFFe38QSpcuZlQ8cvarDzcloCexgQ1/B2m80F6U= +go.opentelemetry.io/collector/confmap v0.0.0-20221201172708-2bdff61fa52a h1:2TscCXAQASO2kU9xHcMIUM/FP29fiQIRTilZmliq/7I= +go.opentelemetry.io/collector/confmap v0.0.0-20221201172708-2bdff61fa52a/go.mod h1:qJ3e8bA8h4wz/jYlbeEUafVHdrU7DkpStnmIUAz6VTQ= +go.opentelemetry.io/collector/consumer v0.66.1-0.20221202005155-1c54042beb70 h1:XwpVjI1KeKGPXOZBLefGILMziPYuNf6IzbmiIEsIyI0= +go.opentelemetry.io/collector/consumer v0.66.1-0.20221202005155-1c54042beb70/go.mod h1:EWVBcSGcIcmeDGTnIboc/aqa3agsBeH8/q7yFWG7xVc= +go.opentelemetry.io/collector/featuregate v0.66.1-0.20221202005155-1c54042beb70 h1:V0tf4ebciqIs07jFATfLGdUpLRaEsi+AiWuA/in0G8Y= +go.opentelemetry.io/collector/featuregate v0.66.1-0.20221202005155-1c54042beb70/go.mod h1:tewuFKJYalWBU0bmNKg++MC1ipINXUr6szYzOw2p1GI= +go.opentelemetry.io/collector/pdata v0.66.1-0.20221202005155-1c54042beb70 h1:TPOrxkEMvZzfBSwF3ct+kUUgKA5g8unkZZbKQvJweeA= +go.opentelemetry.io/collector/pdata v0.66.1-0.20221202005155-1c54042beb70/go.mod h1:pqyaznLzk21m+1KL6fwOsRryRELL+zNM0qiVSn0MbVc= +go.opentelemetry.io/collector/semconv v0.66.1-0.20221202005155-1c54042beb70 h1:Q5L9Urod3c8as6ZYaoaqBjarx/HXxsxy34DFZIU2fO4= +go.opentelemetry.io/collector/semconv v0.66.1-0.20221202005155-1c54042beb70/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= @@ -300,8 +302,8 @@ go.uber.org/multierr v1.6.0/go.mod h1:cdWPpRnG4AhwMwsgIHip0KRBQjJy5kYEpYjJxpXp9i go.uber.org/multierr v1.8.0 h1:dg6GjLku4EH+249NNmoIciG9N/jURbDG+pFlTkhzIC8= go.uber.org/multierr v1.8.0/go.mod h1:7EAYxJLBy9rStEaz58O2t4Uvip6FSURkq8/ppBp95ak= go.uber.org/zap v1.17.0/go.mod h1:MXVU+bhUf/A7Xi2HNOnopQOrmycQ5Ih87HtOu4q5SSo= -go.uber.org/zap v1.23.0 h1:OjGQ5KQDEUawVHxNwQgPpiypGHOxo2mNZsOqTak4fFY= -go.uber.org/zap v1.23.0/go.mod h1:D+nX8jyLsMHMYrln8A0rJjFt/T/9/bGgIhAqxv5URuY= +go.uber.org/zap v1.24.0 h1:FiJd5l1UOLj0wCgbSE0rwwXHzEdAZS6hiiSnxJN/D60= +go.uber.org/zap v1.24.0/go.mod h1:2kMP+WWQ8aoFoedH3T2sq6iJ2yDWpHbP0f6MQbS9Gkg= golang.org/x/crypto v0.0.0-20180904163835-0709b304e793/go.mod h1:6SG95UA2DQfeDnfUPMdvaQW0Q7yPrPDi9nlGo2tz2b4= golang.org/x/crypto v0.0.0-20190308221718-c2843e01d9a2/go.mod h1:djNgcEr1/C05ACkg1iLfiJU5Ep61QUkGW8qpdssI0+w= golang.org/x/crypto v0.0.0-20190923035154-9ee001bba392/go.mod h1:/lpIB1dKB+9EgE3H3cr1v9wB50oz8l4C4h62xy7jSTY= diff --git a/receiver/awsfirehosereceiver/go.mod b/receiver/awsfirehosereceiver/go.mod index f6e2d46f9e3a..0b8a804aaf10 100644 --- a/receiver/awsfirehosereceiver/go.mod +++ b/receiver/awsfirehosereceiver/go.mod @@ -4,12 +4,13 @@ go 1.18 require ( github.com/stretchr/testify v1.8.1 - go.opentelemetry.io/collector v0.66.1-0.20221128222955-4ff1ff379b90 - go.opentelemetry.io/collector/component v0.66.1-0.20221128222955-4ff1ff379b90 - go.opentelemetry.io/collector/consumer v0.66.1-0.20221128222955-4ff1ff379b90 - go.opentelemetry.io/collector/pdata v0.66.1-0.20221128222955-4ff1ff379b90 - go.opentelemetry.io/collector/semconv v0.66.1-0.20221128222955-4ff1ff379b90 - go.uber.org/zap v1.23.0 + go.opentelemetry.io/collector v0.66.1-0.20221202005155-1c54042beb70 + go.opentelemetry.io/collector/component v0.66.1-0.20221202005155-1c54042beb70 + go.opentelemetry.io/collector/confmap v0.0.0-20221201172708-2bdff61fa52a + go.opentelemetry.io/collector/consumer v0.66.1-0.20221202005155-1c54042beb70 + go.opentelemetry.io/collector/pdata v0.66.1-0.20221202005155-1c54042beb70 + go.opentelemetry.io/collector/semconv v0.66.1-0.20221202005155-1c54042beb70 + go.uber.org/zap v1.24.0 ) require ( @@ -33,7 +34,7 @@ require ( github.com/pelletier/go-toml v1.9.4 // indirect github.com/pmezard/go-difflib v1.0.0 // indirect github.com/rs/cors v1.8.2 // indirect - go.opentelemetry.io/collector/featuregate v0.66.1-0.20221128222955-4ff1ff379b90 // indirect + go.opentelemetry.io/collector/featuregate v0.66.1-0.20221202005155-1c54042beb70 // indirect go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.36.4 // indirect go.opentelemetry.io/otel v1.11.1 // indirect go.opentelemetry.io/otel/metric v0.33.0 // indirect diff --git a/receiver/awsfirehosereceiver/go.sum b/receiver/awsfirehosereceiver/go.sum index 1b9ca3e0bd5c..bc0514db286a 100644 --- a/receiver/awsfirehosereceiver/go.sum +++ b/receiver/awsfirehosereceiver/go.sum @@ -277,18 +277,20 @@ 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.66.1-0.20221128222955-4ff1ff379b90 h1:yRe05/jMdzH4TFHfndZ5h2o2hKBK/79W72j8w51qNsI= -go.opentelemetry.io/collector v0.66.1-0.20221128222955-4ff1ff379b90/go.mod h1:hE6jCs+0rfiufCrVPucKZTMwfHit1okfDPnwPT2eW1I= -go.opentelemetry.io/collector/component v0.66.1-0.20221128222955-4ff1ff379b90 h1:AYSNTXbezhNg43EuYdVVcgxE/2gBVrm00FDx4DOmQVg= -go.opentelemetry.io/collector/component v0.66.1-0.20221128222955-4ff1ff379b90/go.mod h1:0c84EqXUhvYe6KW7hJfh76tiI/5yjWCH2amwyQ06XLM= -go.opentelemetry.io/collector/consumer v0.66.1-0.20221128222955-4ff1ff379b90 h1:nzNXVfC1FzXBXCLMzbMv+qK3E4EGiNsnMhfVsBd2yzc= -go.opentelemetry.io/collector/consumer v0.66.1-0.20221128222955-4ff1ff379b90/go.mod h1:WtoRZa5SnxQO1ZEQdVxYpFcXCmq62rakv0oUSlPO0NQ= -go.opentelemetry.io/collector/featuregate v0.66.1-0.20221128222955-4ff1ff379b90 h1:UuJSFWbi9XxyNZsJKZuvpWg35BgRbcCGFH+38V2MAdw= -go.opentelemetry.io/collector/featuregate v0.66.1-0.20221128222955-4ff1ff379b90/go.mod h1:tewuFKJYalWBU0bmNKg++MC1ipINXUr6szYzOw2p1GI= -go.opentelemetry.io/collector/pdata v0.66.1-0.20221128222955-4ff1ff379b90 h1:Vu4S4jSNcd0VFPzxQNO4+UqGwnes1xJDoFLPRiWHm8I= -go.opentelemetry.io/collector/pdata v0.66.1-0.20221128222955-4ff1ff379b90/go.mod h1:pqyaznLzk21m+1KL6fwOsRryRELL+zNM0qiVSn0MbVc= -go.opentelemetry.io/collector/semconv v0.66.1-0.20221128222955-4ff1ff379b90 h1:hFaTA68cggZKWMv7wQ3bKP8KGTbowh/5AQZKCHzHTqM= -go.opentelemetry.io/collector/semconv v0.66.1-0.20221128222955-4ff1ff379b90/go.mod h1:5o9yhOa+ABt7g2E5JABDxGZ1PQPbtfxrKNbYn+LOTXU= +go.opentelemetry.io/collector v0.66.1-0.20221202005155-1c54042beb70 h1:INB2CsOtqqrija2KvMuIpbBQ3qX1BECEeR+d0NJX+oM= +go.opentelemetry.io/collector v0.66.1-0.20221202005155-1c54042beb70/go.mod h1:d0NHkHyANJy3HDTvYE/PoylMShUmFIbiir89ieI0X0c= +go.opentelemetry.io/collector/component v0.66.1-0.20221202005155-1c54042beb70 h1:dEoJhzCmRShgmVro/kXm6pouGElgxkH2DsvanzCeZtU= +go.opentelemetry.io/collector/component v0.66.1-0.20221202005155-1c54042beb70/go.mod h1:OsVnvFFe38QSpcuZlQ8cvarDzcloCexgQ1/B2m80F6U= +go.opentelemetry.io/collector/confmap v0.0.0-20221201172708-2bdff61fa52a h1:2TscCXAQASO2kU9xHcMIUM/FP29fiQIRTilZmliq/7I= +go.opentelemetry.io/collector/confmap v0.0.0-20221201172708-2bdff61fa52a/go.mod h1:qJ3e8bA8h4wz/jYlbeEUafVHdrU7DkpStnmIUAz6VTQ= +go.opentelemetry.io/collector/consumer v0.66.1-0.20221202005155-1c54042beb70 h1:XwpVjI1KeKGPXOZBLefGILMziPYuNf6IzbmiIEsIyI0= +go.opentelemetry.io/collector/consumer v0.66.1-0.20221202005155-1c54042beb70/go.mod h1:EWVBcSGcIcmeDGTnIboc/aqa3agsBeH8/q7yFWG7xVc= +go.opentelemetry.io/collector/featuregate v0.66.1-0.20221202005155-1c54042beb70 h1:V0tf4ebciqIs07jFATfLGdUpLRaEsi+AiWuA/in0G8Y= +go.opentelemetry.io/collector/featuregate v0.66.1-0.20221202005155-1c54042beb70/go.mod h1:tewuFKJYalWBU0bmNKg++MC1ipINXUr6szYzOw2p1GI= +go.opentelemetry.io/collector/pdata v0.66.1-0.20221202005155-1c54042beb70 h1:TPOrxkEMvZzfBSwF3ct+kUUgKA5g8unkZZbKQvJweeA= +go.opentelemetry.io/collector/pdata v0.66.1-0.20221202005155-1c54042beb70/go.mod h1:pqyaznLzk21m+1KL6fwOsRryRELL+zNM0qiVSn0MbVc= +go.opentelemetry.io/collector/semconv v0.66.1-0.20221202005155-1c54042beb70 h1:Q5L9Urod3c8as6ZYaoaqBjarx/HXxsxy34DFZIU2fO4= +go.opentelemetry.io/collector/semconv v0.66.1-0.20221202005155-1c54042beb70/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= @@ -306,8 +308,8 @@ go.uber.org/multierr v1.6.0/go.mod h1:cdWPpRnG4AhwMwsgIHip0KRBQjJy5kYEpYjJxpXp9i go.uber.org/multierr v1.8.0 h1:dg6GjLku4EH+249NNmoIciG9N/jURbDG+pFlTkhzIC8= go.uber.org/multierr v1.8.0/go.mod h1:7EAYxJLBy9rStEaz58O2t4Uvip6FSURkq8/ppBp95ak= go.uber.org/zap v1.17.0/go.mod h1:MXVU+bhUf/A7Xi2HNOnopQOrmycQ5Ih87HtOu4q5SSo= -go.uber.org/zap v1.23.0 h1:OjGQ5KQDEUawVHxNwQgPpiypGHOxo2mNZsOqTak4fFY= -go.uber.org/zap v1.23.0/go.mod h1:D+nX8jyLsMHMYrln8A0rJjFt/T/9/bGgIhAqxv5URuY= +go.uber.org/zap v1.24.0 h1:FiJd5l1UOLj0wCgbSE0rwwXHzEdAZS6hiiSnxJN/D60= +go.uber.org/zap v1.24.0/go.mod h1:2kMP+WWQ8aoFoedH3T2sq6iJ2yDWpHbP0f6MQbS9Gkg= golang.org/x/crypto v0.0.0-20180904163835-0709b304e793/go.mod h1:6SG95UA2DQfeDnfUPMdvaQW0Q7yPrPDi9nlGo2tz2b4= golang.org/x/crypto v0.0.0-20190308221718-c2843e01d9a2/go.mod h1:djNgcEr1/C05ACkg1iLfiJU5Ep61QUkGW8qpdssI0+w= golang.org/x/crypto v0.0.0-20190923035154-9ee001bba392/go.mod h1:/lpIB1dKB+9EgE3H3cr1v9wB50oz8l4C4h62xy7jSTY= diff --git a/receiver/awsfirehosereceiver/metrics_receiver.go b/receiver/awsfirehosereceiver/metrics_receiver.go index cd11441f257f..cf6395441a4b 100644 --- a/receiver/awsfirehosereceiver/metrics_receiver.go +++ b/receiver/awsfirehosereceiver/metrics_receiver.go @@ -60,10 +60,9 @@ func newMetricsReceiver( } return &firehoseReceiver{ - instanceID: config.ID(), - settings: set, - config: config, - consumer: mc, + settings: set, + config: config, + consumer: mc, }, nil } diff --git a/receiver/awsfirehosereceiver/receiver.go b/receiver/awsfirehosereceiver/receiver.go index 8881f1161e0e..ffc20439258f 100644 --- a/receiver/awsfirehosereceiver/receiver.go +++ b/receiver/awsfirehosereceiver/receiver.go @@ -54,8 +54,6 @@ type firehoseConsumer interface { // firehoseReceiver type firehoseReceiver struct { - // instanceID is the instance ID for the receiver. - 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 2363517abe65..3884e016ecd1 100644 --- a/receiver/awsfirehosereceiver/receiver_test.go +++ b/receiver/awsfirehosereceiver/receiver_test.go @@ -241,10 +241,9 @@ func TestFirehoseRequest(t *testing.T) { // testFirehoseReceiver is a convenience function for creating a test firehoseReceiver func testFirehoseReceiver(config *Config, consumer firehoseConsumer) *firehoseReceiver { return &firehoseReceiver{ - instanceID: config.ID(), - settings: componenttest.NewNopReceiverCreateSettings(), - config: config, - consumer: consumer, + settings: componenttest.NewNopReceiverCreateSettings(), + config: config, + consumer: consumer, } } diff --git a/receiver/awsxrayreceiver/go.mod b/receiver/awsxrayreceiver/go.mod index 2cffd028034e..14a6c62495ae 100644 --- a/receiver/awsxrayreceiver/go.mod +++ b/receiver/awsxrayreceiver/go.mod @@ -10,13 +10,14 @@ require ( github.com/open-telemetry/opentelemetry-collector-contrib/internal/common v0.66.0 github.com/open-telemetry/opentelemetry-collector-contrib/internal/coreinternal v0.66.0 github.com/stretchr/testify v1.8.1 - go.opentelemetry.io/collector v0.66.1-0.20221128222955-4ff1ff379b90 - go.opentelemetry.io/collector/component v0.66.1-0.20221128222955-4ff1ff379b90 - go.opentelemetry.io/collector/consumer v0.66.1-0.20221128222955-4ff1ff379b90 - go.opentelemetry.io/collector/pdata v0.66.1-0.20221128222955-4ff1ff379b90 - go.opentelemetry.io/collector/semconv v0.66.1-0.20221128222955-4ff1ff379b90 + go.opentelemetry.io/collector v0.66.1-0.20221202005155-1c54042beb70 + go.opentelemetry.io/collector/component v0.66.1-0.20221202005155-1c54042beb70 + go.opentelemetry.io/collector/confmap v0.0.0-20221201172708-2bdff61fa52a + go.opentelemetry.io/collector/consumer v0.66.1-0.20221202005155-1c54042beb70 + go.opentelemetry.io/collector/pdata v0.66.1-0.20221202005155-1c54042beb70 + go.opentelemetry.io/collector/semconv v0.66.1-0.20221202005155-1c54042beb70 go.uber.org/multierr v1.8.0 - go.uber.org/zap v1.23.0 + go.uber.org/zap v1.24.0 ) require ( @@ -48,7 +49,7 @@ require ( github.com/prometheus/statsd_exporter v0.22.7 // indirect github.com/rogpeppe/go-internal v1.6.1 // indirect go.opencensus.io v0.24.0 // indirect - go.opentelemetry.io/collector/featuregate v0.66.1-0.20221128222955-4ff1ff379b90 // indirect + go.opentelemetry.io/collector/featuregate v0.66.1-0.20221202005155-1c54042beb70 // indirect go.opentelemetry.io/otel v1.11.1 // indirect go.opentelemetry.io/otel/exporters/prometheus v0.33.0 // indirect go.opentelemetry.io/otel/metric v0.33.0 // indirect diff --git a/receiver/awsxrayreceiver/go.sum b/receiver/awsxrayreceiver/go.sum index bf790aef2f0e..482f7a2d0071 100644 --- a/receiver/awsxrayreceiver/go.sum +++ b/receiver/awsxrayreceiver/go.sum @@ -378,18 +378,20 @@ go.opencensus.io v0.22.4/go.mod h1:yxeiOL68Rb0Xd1ddK5vPZ/oVn4vY4Ynel7k9FzqtOIw= go.opencensus.io v0.23.0/go.mod h1:XItmlyltB5F7CS4xOC1DcqMoFqwtC6OG2xF7mCv7P7E= go.opencensus.io v0.24.0 h1:y73uSU6J157QMP2kn2r30vwW1A2W2WFwSCGnAVxeaD0= go.opencensus.io v0.24.0/go.mod h1:vNK8G9p7aAivkbmorf4v+7Hgx+Zs0yY+0fOtgBfjQKo= -go.opentelemetry.io/collector v0.66.1-0.20221128222955-4ff1ff379b90 h1:yRe05/jMdzH4TFHfndZ5h2o2hKBK/79W72j8w51qNsI= -go.opentelemetry.io/collector v0.66.1-0.20221128222955-4ff1ff379b90/go.mod h1:hE6jCs+0rfiufCrVPucKZTMwfHit1okfDPnwPT2eW1I= -go.opentelemetry.io/collector/component v0.66.1-0.20221128222955-4ff1ff379b90 h1:AYSNTXbezhNg43EuYdVVcgxE/2gBVrm00FDx4DOmQVg= -go.opentelemetry.io/collector/component v0.66.1-0.20221128222955-4ff1ff379b90/go.mod h1:0c84EqXUhvYe6KW7hJfh76tiI/5yjWCH2amwyQ06XLM= -go.opentelemetry.io/collector/consumer v0.66.1-0.20221128222955-4ff1ff379b90 h1:nzNXVfC1FzXBXCLMzbMv+qK3E4EGiNsnMhfVsBd2yzc= -go.opentelemetry.io/collector/consumer v0.66.1-0.20221128222955-4ff1ff379b90/go.mod h1:WtoRZa5SnxQO1ZEQdVxYpFcXCmq62rakv0oUSlPO0NQ= -go.opentelemetry.io/collector/featuregate v0.66.1-0.20221128222955-4ff1ff379b90 h1:UuJSFWbi9XxyNZsJKZuvpWg35BgRbcCGFH+38V2MAdw= -go.opentelemetry.io/collector/featuregate v0.66.1-0.20221128222955-4ff1ff379b90/go.mod h1:tewuFKJYalWBU0bmNKg++MC1ipINXUr6szYzOw2p1GI= -go.opentelemetry.io/collector/pdata v0.66.1-0.20221128222955-4ff1ff379b90 h1:Vu4S4jSNcd0VFPzxQNO4+UqGwnes1xJDoFLPRiWHm8I= -go.opentelemetry.io/collector/pdata v0.66.1-0.20221128222955-4ff1ff379b90/go.mod h1:pqyaznLzk21m+1KL6fwOsRryRELL+zNM0qiVSn0MbVc= -go.opentelemetry.io/collector/semconv v0.66.1-0.20221128222955-4ff1ff379b90 h1:hFaTA68cggZKWMv7wQ3bKP8KGTbowh/5AQZKCHzHTqM= -go.opentelemetry.io/collector/semconv v0.66.1-0.20221128222955-4ff1ff379b90/go.mod h1:5o9yhOa+ABt7g2E5JABDxGZ1PQPbtfxrKNbYn+LOTXU= +go.opentelemetry.io/collector v0.66.1-0.20221202005155-1c54042beb70 h1:INB2CsOtqqrija2KvMuIpbBQ3qX1BECEeR+d0NJX+oM= +go.opentelemetry.io/collector v0.66.1-0.20221202005155-1c54042beb70/go.mod h1:d0NHkHyANJy3HDTvYE/PoylMShUmFIbiir89ieI0X0c= +go.opentelemetry.io/collector/component v0.66.1-0.20221202005155-1c54042beb70 h1:dEoJhzCmRShgmVro/kXm6pouGElgxkH2DsvanzCeZtU= +go.opentelemetry.io/collector/component v0.66.1-0.20221202005155-1c54042beb70/go.mod h1:OsVnvFFe38QSpcuZlQ8cvarDzcloCexgQ1/B2m80F6U= +go.opentelemetry.io/collector/confmap v0.0.0-20221201172708-2bdff61fa52a h1:2TscCXAQASO2kU9xHcMIUM/FP29fiQIRTilZmliq/7I= +go.opentelemetry.io/collector/confmap v0.0.0-20221201172708-2bdff61fa52a/go.mod h1:qJ3e8bA8h4wz/jYlbeEUafVHdrU7DkpStnmIUAz6VTQ= +go.opentelemetry.io/collector/consumer v0.66.1-0.20221202005155-1c54042beb70 h1:XwpVjI1KeKGPXOZBLefGILMziPYuNf6IzbmiIEsIyI0= +go.opentelemetry.io/collector/consumer v0.66.1-0.20221202005155-1c54042beb70/go.mod h1:EWVBcSGcIcmeDGTnIboc/aqa3agsBeH8/q7yFWG7xVc= +go.opentelemetry.io/collector/featuregate v0.66.1-0.20221202005155-1c54042beb70 h1:V0tf4ebciqIs07jFATfLGdUpLRaEsi+AiWuA/in0G8Y= +go.opentelemetry.io/collector/featuregate v0.66.1-0.20221202005155-1c54042beb70/go.mod h1:tewuFKJYalWBU0bmNKg++MC1ipINXUr6szYzOw2p1GI= +go.opentelemetry.io/collector/pdata v0.66.1-0.20221202005155-1c54042beb70 h1:TPOrxkEMvZzfBSwF3ct+kUUgKA5g8unkZZbKQvJweeA= +go.opentelemetry.io/collector/pdata v0.66.1-0.20221202005155-1c54042beb70/go.mod h1:pqyaznLzk21m+1KL6fwOsRryRELL+zNM0qiVSn0MbVc= +go.opentelemetry.io/collector/semconv v0.66.1-0.20221202005155-1c54042beb70 h1:Q5L9Urod3c8as6ZYaoaqBjarx/HXxsxy34DFZIU2fO4= +go.opentelemetry.io/collector/semconv v0.66.1-0.20221202005155-1c54042beb70/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= @@ -410,8 +412,8 @@ go.uber.org/multierr v1.6.0/go.mod h1:cdWPpRnG4AhwMwsgIHip0KRBQjJy5kYEpYjJxpXp9i go.uber.org/multierr v1.8.0 h1:dg6GjLku4EH+249NNmoIciG9N/jURbDG+pFlTkhzIC8= go.uber.org/multierr v1.8.0/go.mod h1:7EAYxJLBy9rStEaz58O2t4Uvip6FSURkq8/ppBp95ak= go.uber.org/zap v1.17.0/go.mod h1:MXVU+bhUf/A7Xi2HNOnopQOrmycQ5Ih87HtOu4q5SSo= -go.uber.org/zap v1.23.0 h1:OjGQ5KQDEUawVHxNwQgPpiypGHOxo2mNZsOqTak4fFY= -go.uber.org/zap v1.23.0/go.mod h1:D+nX8jyLsMHMYrln8A0rJjFt/T/9/bGgIhAqxv5URuY= +go.uber.org/zap v1.24.0 h1:FiJd5l1UOLj0wCgbSE0rwwXHzEdAZS6hiiSnxJN/D60= +go.uber.org/zap v1.24.0/go.mod h1:2kMP+WWQ8aoFoedH3T2sq6iJ2yDWpHbP0f6MQbS9Gkg= golang.org/x/crypto v0.0.0-20180904163835-0709b304e793/go.mod h1:6SG95UA2DQfeDnfUPMdvaQW0Q7yPrPDi9nlGo2tz2b4= golang.org/x/crypto v0.0.0-20190308221718-c2843e01d9a2/go.mod h1:djNgcEr1/C05ACkg1iLfiJU5Ep61QUkGW8qpdssI0+w= golang.org/x/crypto v0.0.0-20190510104115-cbcb75029529/go.mod h1:yigFU9vqHzYiE8UmvKecakEJjdnWj3jj499lnFckfCI= diff --git a/receiver/awsxrayreceiver/internal/udppoller/poller.go b/receiver/awsxrayreceiver/internal/udppoller/poller.go index 2bc40febef64..fa63694aca69 100644 --- a/receiver/awsxrayreceiver/internal/udppoller/poller.go +++ b/receiver/awsxrayreceiver/internal/udppoller/poller.go @@ -65,14 +65,12 @@ type RawSegment struct { // Config represents the configurations needed to // start the UDP poller type Config struct { - ReceiverID component.ID Transport string Endpoint string NumOfPollerToStart int } type poller struct { - receiverID component.ID udpSock socketconn.SocketConn logger *zap.Logger wg sync.WaitGroup @@ -109,7 +107,7 @@ func New(cfg *Config, set component.ReceiverCreateSettings) (Poller, error) { zap.String(Transport, addr.String())) obsrecv, err := obsreport.NewReceiver(obsreport.ReceiverSettings{ - ReceiverID: cfg.ReceiverID, + ReceiverID: set.ID, Transport: cfg.Transport, LongLivedCtx: true, ReceiverCreateSettings: set, @@ -119,7 +117,6 @@ func New(cfg *Config, set component.ReceiverCreateSettings) (Poller, error) { } return &poller{ - receiverID: cfg.ReceiverID, udpSock: sock, logger: set.Logger, maxPollerCount: cfg.NumOfPollerToStart, diff --git a/receiver/awsxrayreceiver/internal/udppoller/poller_test.go b/receiver/awsxrayreceiver/internal/udppoller/poller_test.go index 1d021eda5c66..a5b853ae7e84 100644 --- a/receiver/awsxrayreceiver/internal/udppoller/poller_test.go +++ b/receiver/awsxrayreceiver/internal/udppoller/poller_test.go @@ -123,15 +123,14 @@ func TestCloseStopsPoller(t *testing.T) { } func TestSuccessfullyPollPacket(t *testing.T) { - tt, err := obsreporttest.SetupTelemetry() + receiverID := component.NewID("TestSuccessfullyPollPacket") + tt, err := obsreporttest.SetupTelemetryWithID(receiverID) assert.NoError(t, err, "SetupTelemetry should succeed") defer func() { assert.NoError(t, tt.Shutdown(context.Background())) }() - receiverID := component.NewID("TestSuccessfullyPollPacket") - - addr, p, _ := createAndOptionallyStartPoller(t, receiverID, true, tt.ToReceiverCreateSettings()) + addr, p, _ := createAndOptionallyStartPoller(t, true, tt.ToReceiverCreateSettings()) defer p.Close() randString, _ := uuid.NewRandom() @@ -160,15 +159,14 @@ func TestSuccessfullyPollPacket(t *testing.T) { } func TestIncompletePacketNoSeparator(t *testing.T) { - tt, err := obsreporttest.SetupTelemetry() + receiverID := component.NewID("TestIncompletePacketNoSeparator") + tt, err := obsreporttest.SetupTelemetryWithID(receiverID) assert.NoError(t, err, "SetupTelemetry should succeed") defer func() { assert.NoError(t, tt.Shutdown(context.Background())) }() - receiverID := component.NewID("TestIncompletePacketNoSeparator") - - addr, p, recordedLogs := createAndOptionallyStartPoller(t, receiverID, true, tt.ToReceiverCreateSettings()) + addr, p, recordedLogs := createAndOptionallyStartPoller(t, true, tt.ToReceiverCreateSettings()) defer p.Close() rawData := []byte(`{"format": "json", "version": 1}`) // no separator @@ -191,15 +189,14 @@ func TestIncompletePacketNoSeparator(t *testing.T) { } func TestIncompletePacketNoBody(t *testing.T) { - tt, err := obsreporttest.SetupTelemetry() + receiverID := component.NewID("TestIncompletePacketNoBody") + tt, err := obsreporttest.SetupTelemetryWithID(receiverID) assert.NoError(t, err, "SetupTelemetry should succeed") defer func() { assert.NoError(t, tt.Shutdown(context.Background())) }() - receiverID := component.NewID("TestIncompletePacketNoBody") - - addr, p, recordedLogs := createAndOptionallyStartPoller(t, receiverID, true, tt.ToReceiverCreateSettings()) + addr, p, recordedLogs := createAndOptionallyStartPoller(t, true, tt.ToReceiverCreateSettings()) defer p.Close() rawData := []byte(`{"format": "json", "version": 1}` + "\n") // no body @@ -217,15 +214,14 @@ func TestIncompletePacketNoBody(t *testing.T) { } func TestNonJsonHeader(t *testing.T) { - tt, err := obsreporttest.SetupTelemetry() + receiverID := component.NewID("TestNonJsonHeader") + tt, err := obsreporttest.SetupTelemetryWithID(receiverID) assert.NoError(t, err, "SetupTelemetry should succeed") defer func() { assert.NoError(t, tt.Shutdown(context.Background())) }() - receiverID := component.NewID("TestNonJsonHeader") - - addr, p, recordedLogs := createAndOptionallyStartPoller(t, receiverID, true, tt.ToReceiverCreateSettings()) + addr, p, recordedLogs := createAndOptionallyStartPoller(t, true, tt.ToReceiverCreateSettings()) defer p.Close() // the header (i.e. the portion before \n) is invalid @@ -248,15 +244,14 @@ func TestNonJsonHeader(t *testing.T) { } func TestJsonInvalidHeader(t *testing.T) { - tt, err := obsreporttest.SetupTelemetry() + receiverID := component.NewID("TestJsonInvalidHeader") + tt, err := obsreporttest.SetupTelemetryWithID(receiverID) assert.NoError(t, err, "SetupTelemetry should succeed") defer func() { assert.NoError(t, tt.Shutdown(context.Background())) }() - receiverID := component.NewID("TestJsonInvalidHeader") - - addr, p, recordedLogs := createAndOptionallyStartPoller(t, receiverID, true, tt.ToReceiverCreateSettings()) + addr, p, recordedLogs := createAndOptionallyStartPoller(t, true, tt.ToReceiverCreateSettings()) defer p.Close() randString, _ := uuid.NewRandom() @@ -285,15 +280,14 @@ func TestJsonInvalidHeader(t *testing.T) { } func TestSocketReadIrrecoverableNetError(t *testing.T) { - tt, err := obsreporttest.SetupTelemetry() + receiverID := component.NewID("TestSocketReadIrrecoverableNetError") + tt, err := obsreporttest.SetupTelemetryWithID(receiverID) assert.NoError(t, err, "SetupTelemetry should succeed") defer func() { assert.NoError(t, tt.Shutdown(context.Background())) }() - receiverID := component.NewID("TestSocketReadIrrecoverableNetError") - - _, p, recordedLogs := createAndOptionallyStartPoller(t, receiverID, false, tt.ToReceiverCreateSettings()) + _, p, recordedLogs := createAndOptionallyStartPoller(t, false, tt.ToReceiverCreateSettings()) // close the actual socket because we are going to mock it out below p.(*poller).udpSock.Close() @@ -322,15 +316,14 @@ func TestSocketReadIrrecoverableNetError(t *testing.T) { } func TestSocketReadTimeOutNetError(t *testing.T) { - tt, err := obsreporttest.SetupTelemetry() + receiverID := component.NewID("TestSocketReadTimeOutNetError") + tt, err := obsreporttest.SetupTelemetryWithID(receiverID) assert.NoError(t, err, "SetupTelemetry should succeed") defer func() { assert.NoError(t, tt.Shutdown(context.Background())) }() - receiverID := component.NewID("TestSocketReadTimeOutNetError") - - _, p, recordedLogs := createAndOptionallyStartPoller(t, receiverID, false, tt.ToReceiverCreateSettings()) + _, p, recordedLogs := createAndOptionallyStartPoller(t, false, tt.ToReceiverCreateSettings()) // close the actual socket because we are going to mock it out below p.(*poller).udpSock.Close() @@ -360,15 +353,14 @@ func TestSocketReadTimeOutNetError(t *testing.T) { } func TestSocketGenericReadError(t *testing.T) { - tt, err := obsreporttest.SetupTelemetry() + receiverID := component.NewID("TestSocketGenericReadError") + tt, err := obsreporttest.SetupTelemetryWithID(receiverID) assert.NoError(t, err, "SetupTelemetry should succeed") defer func() { assert.NoError(t, tt.Shutdown(context.Background())) }() - receiverID := component.NewID("TestSocketGenericReadError") - - _, p, recordedLogs := createAndOptionallyStartPoller(t, receiverID, false, tt.ToReceiverCreateSettings()) + _, p, recordedLogs := createAndOptionallyStartPoller(t, false, tt.ToReceiverCreateSettings()) // close the actual socket because we are going to mock it out below p.(*poller).udpSock.Close() @@ -444,7 +436,6 @@ func (m *mockSocketConn) Close() error { return nil } func createAndOptionallyStartPoller( t *testing.T, - receiverID component.ID, start bool, set component.ReceiverCreateSettings) (string, Poller, *observer.ObservedLogs) { addr, err := findAvailableAddress() @@ -453,7 +444,6 @@ func createAndOptionallyStartPoller( logger, recorded := logSetup() set.Logger = logger poller, err := New(&Config{ - ReceiverID: receiverID, Transport: Transport, Endpoint: addr, NumOfPollerToStart: 2, diff --git a/receiver/awsxrayreceiver/receiver.go b/receiver/awsxrayreceiver/receiver.go index a4972ee6b6f3..29d4f85153c0 100644 --- a/receiver/awsxrayreceiver/receiver.go +++ b/receiver/awsxrayreceiver/receiver.go @@ -39,12 +39,11 @@ const ( // xrayReceiver implements the component.TracesReceiver interface for converting // AWS X-Ray segment document into the OT internal trace format. type xrayReceiver struct { - instanceID component.ID - poller udppoller.Poller - server proxy.Server - settings component.ReceiverCreateSettings - consumer consumer.Traces - obsrecv *obsreport.Receiver + poller udppoller.Poller + server proxy.Server + settings component.ReceiverCreateSettings + consumer consumer.Traces + obsrecv *obsreport.Receiver } func newReceiver(config *Config, @@ -58,7 +57,6 @@ func newReceiver(config *Config, set.Logger.Info("Going to listen on endpoint for X-Ray segments", zap.String(udppoller.Transport, config.Endpoint)) poller, err := udppoller.New(&udppoller.Config{ - ReceiverID: config.ID(), Transport: config.Transport, Endpoint: config.Endpoint, NumOfPollerToStart: maxPollerCount, @@ -76,7 +74,7 @@ func newReceiver(config *Config, } obsrecv, err := obsreport.NewReceiver(obsreport.ReceiverSettings{ - ReceiverID: config.ID(), + ReceiverID: set.ID, Transport: udppoller.Transport, ReceiverCreateSettings: set, }) @@ -85,12 +83,11 @@ func newReceiver(config *Config, } return &xrayReceiver{ - instanceID: config.ID(), - poller: poller, - server: srv, - settings: set, - consumer: consumer, - obsrecv: obsrecv, + poller: poller, + server: srv, + settings: set, + consumer: consumer, + obsrecv: obsrecv, }, nil } diff --git a/receiver/awsxrayreceiver/receiver_test.go b/receiver/awsxrayreceiver/receiver_test.go index 23c6c0cc6f1d..f619573cfdec 100644 --- a/receiver/awsxrayreceiver/receiver_test.go +++ b/receiver/awsxrayreceiver/receiver_test.go @@ -29,7 +29,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/confignet" "go.opentelemetry.io/collector/consumer" "go.opentelemetry.io/collector/consumer/consumertest" @@ -117,7 +116,8 @@ func TestSegmentsPassedToConsumer(t *testing.T) { } t.Skip("Flaky Test - See https://github.com/open-telemetry/opentelemetry-collector-contrib/issues/10596") - tt, err := obsreporttest.SetupTelemetry() + receiverID := component.NewID("TestSegmentsPassedToConsumer") + tt, err := obsreporttest.SetupTelemetryWithID(receiverID) assert.NoError(t, err, "SetupTelemetry should succeed") defer func() { assert.NoError(t, tt.Shutdown(context.Background())) @@ -125,9 +125,7 @@ func TestSegmentsPassedToConsumer(t *testing.T) { t.Setenv(defaultRegionEnvName, mockRegion) - receiverID := component.NewID("TestSegmentsPassedToConsumer") - - addr, rcvr, _ := createAndOptionallyStartReceiver(t, receiverID, nil, true, tt.ToReceiverCreateSettings()) + addr, rcvr, _ := createAndOptionallyStartReceiver(t, nil, true, tt.ToReceiverCreateSettings()) defer func() { assert.NoError(t, rcvr.Shutdown(context.Background())) }() @@ -149,7 +147,8 @@ func TestSegmentsPassedToConsumer(t *testing.T) { } func TestTranslatorErrorsOut(t *testing.T) { - tt, err := obsreporttest.SetupTelemetry() + receiverID := component.NewID("TestTranslatorErrorsOut") + tt, err := obsreporttest.SetupTelemetryWithID(receiverID) assert.NoError(t, err, "SetupTelemetry should succeed") defer func() { assert.NoError(t, tt.Shutdown(context.Background())) @@ -157,9 +156,7 @@ func TestTranslatorErrorsOut(t *testing.T) { t.Setenv(defaultRegionEnvName, mockRegion) - receiverID := component.NewID("TestTranslatorErrorsOut") - - addr, rcvr, recordedLogs := createAndOptionallyStartReceiver(t, receiverID, nil, true, tt.ToReceiverCreateSettings()) + addr, rcvr, recordedLogs := createAndOptionallyStartReceiver(t, nil, true, tt.ToReceiverCreateSettings()) defer func() { assert.NoError(t, rcvr.Shutdown(context.Background())) }() @@ -177,7 +174,8 @@ func TestTranslatorErrorsOut(t *testing.T) { } func TestSegmentsConsumerErrorsOut(t *testing.T) { - tt, err := obsreporttest.SetupTelemetry() + receiverID := component.NewID("TestSegmentsConsumerErrorsOut") + tt, err := obsreporttest.SetupTelemetryWithID(receiverID) assert.NoError(t, err, "SetupTelemetry should succeed") defer func() { assert.NoError(t, tt.Shutdown(context.Background())) @@ -185,10 +183,7 @@ func TestSegmentsConsumerErrorsOut(t *testing.T) { t.Setenv(defaultRegionEnvName, mockRegion) - receiverID := component.NewID("TestSegmentsConsumerErrorsOut") - - addr, rcvr, recordedLogs := createAndOptionallyStartReceiver(t, receiverID, - consumertest.NewErr(errors.New("can't consume traces")), true, tt.ToReceiverCreateSettings()) + addr, rcvr, recordedLogs := createAndOptionallyStartReceiver(t, consumertest.NewErr(errors.New("can't consume traces")), true, tt.ToReceiverCreateSettings()) defer func() { assert.NoError(t, rcvr.Shutdown(context.Background())) }() @@ -209,7 +204,7 @@ func TestSegmentsConsumerErrorsOut(t *testing.T) { } func TestPollerCloseError(t *testing.T) { - tt, err := obsreporttest.SetupTelemetry() + tt, err := obsreporttest.SetupTelemetryWithID(component.NewID("TestPollerCloseError")) assert.NoError(t, err, "SetupTelemetry should succeed") defer func() { assert.NoError(t, tt.Shutdown(context.Background())) @@ -217,7 +212,7 @@ func TestPollerCloseError(t *testing.T) { t.Setenv(defaultRegionEnvName, mockRegion) - _, rcvr, _ := createAndOptionallyStartReceiver(t, component.NewID("TestPollerCloseError"), nil, false, tt.ToReceiverCreateSettings()) + _, rcvr, _ := createAndOptionallyStartReceiver(t, nil, false, tt.ToReceiverCreateSettings()) mPoller := &mockPoller{closeErr: errors.New("mockPollerCloseErr")} rcvr.(*xrayReceiver).poller = mPoller rcvr.(*xrayReceiver).server = &mockProxy{} @@ -226,7 +221,7 @@ func TestPollerCloseError(t *testing.T) { } func TestProxyCloseError(t *testing.T) { - tt, err := obsreporttest.SetupTelemetry() + tt, err := obsreporttest.SetupTelemetryWithID(component.NewID("TestPollerCloseError")) assert.NoError(t, err, "SetupTelemetry should succeed") defer func() { assert.NoError(t, tt.Shutdown(context.Background())) @@ -234,7 +229,7 @@ func TestProxyCloseError(t *testing.T) { t.Setenv(defaultRegionEnvName, mockRegion) - _, rcvr, _ := createAndOptionallyStartReceiver(t, component.NewID("TestPollerCloseError"), nil, false, tt.ToReceiverCreateSettings()) + _, rcvr, _ := createAndOptionallyStartReceiver(t, nil, false, tt.ToReceiverCreateSettings()) mProxy := &mockProxy{closeErr: errors.New("mockProxyCloseErr")} rcvr.(*xrayReceiver).poller = &mockPoller{} rcvr.(*xrayReceiver).server = mProxy @@ -243,7 +238,7 @@ func TestProxyCloseError(t *testing.T) { } func TestBothPollerAndProxyCloseError(t *testing.T) { - tt, err := obsreporttest.SetupTelemetry() + tt, err := obsreporttest.SetupTelemetryWithID(component.NewID("TestBothPollerAndProxyCloseError")) assert.NoError(t, err, "SetupTelemetry should succeed") defer func() { assert.NoError(t, tt.Shutdown(context.Background())) @@ -251,7 +246,7 @@ func TestBothPollerAndProxyCloseError(t *testing.T) { t.Setenv(defaultRegionEnvName, mockRegion) - _, rcvr, _ := createAndOptionallyStartReceiver(t, component.NewID("TestBothPollerAndProxyCloseError"), nil, false, tt.ToReceiverCreateSettings()) + _, rcvr, _ := createAndOptionallyStartReceiver(t, nil, false, tt.ToReceiverCreateSettings()) mPoller := &mockPoller{closeErr: errors.New("mockPollerCloseErr")} mProxy := &mockProxy{closeErr: errors.New("mockProxyCloseErr")} rcvr.(*xrayReceiver).poller = mPoller @@ -295,7 +290,6 @@ func (m *mockProxy) Shutdown(ctx context.Context) error { func createAndOptionallyStartReceiver( t *testing.T, - receiverID component.ID, csu consumer.Traces, start bool, set component.ReceiverCreateSettings) (string, component.TracesReceiver, *observer.ObservedLogs) { @@ -314,7 +308,6 @@ func createAndOptionallyStartReceiver( set.Logger = logger rcvr, err := newReceiver( &Config{ - ReceiverSettings: config.NewReceiverSettings(receiverID), NetAddr: confignet.NetAddr{ Endpoint: addr, Transport: udppoller.Transport, diff --git a/receiver/azureblobreceiver/factory.go b/receiver/azureblobreceiver/factory.go index 9ee925fe99a3..ae61f7d4e333 100644 --- a/receiver/azureblobreceiver/factory.go +++ b/receiver/azureblobreceiver/factory.go @@ -119,7 +119,7 @@ func (f *blobReceiverFactory) getReceiver( } var receiver component.Component - receiver, err = newReceiver(*receiverConfig, set, beh) + receiver, err = newReceiver(set, beh) return receiver }) diff --git a/receiver/azureblobreceiver/go.mod b/receiver/azureblobreceiver/go.mod index 121fa06690c2..ea132564b2ac 100644 --- a/receiver/azureblobreceiver/go.mod +++ b/receiver/azureblobreceiver/go.mod @@ -7,11 +7,11 @@ require ( github.com/Azure/azure-sdk-for-go/sdk/storage/azblob v0.3.0 github.com/open-telemetry/opentelemetry-collector-contrib/internal/sharedcomponent v0.66.0 github.com/stretchr/testify v1.8.1 - go.opentelemetry.io/collector v0.66.1-0.20221128222955-4ff1ff379b90 - go.opentelemetry.io/collector/component v0.66.1-0.20221128222955-4ff1ff379b90 - go.opentelemetry.io/collector/consumer v0.66.1-0.20221128222955-4ff1ff379b90 - go.opentelemetry.io/collector/pdata v0.66.1-0.20221128222955-4ff1ff379b90 - go.uber.org/zap v1.23.0 + go.opentelemetry.io/collector v0.66.1-0.20221202005155-1c54042beb70 + go.opentelemetry.io/collector/component v0.66.1-0.20221202005155-1c54042beb70 + go.opentelemetry.io/collector/consumer v0.66.1-0.20221202005155-1c54042beb70 + go.opentelemetry.io/collector/pdata v0.66.1-0.20221202005155-1c54042beb70 + go.uber.org/zap v1.24.0 ) require ( @@ -68,13 +68,14 @@ require ( github.com/spf13/cobra v1.6.1 // indirect github.com/spf13/pflag v1.0.5 // indirect github.com/stretchr/objx v0.5.0 // indirect - github.com/tklauser/go-sysconf v0.3.10 // indirect - github.com/tklauser/numcpus v0.4.0 // indirect + github.com/tklauser/go-sysconf v0.3.11 // indirect + github.com/tklauser/numcpus v0.6.0 // indirect github.com/yusufpapurcu/wmi v1.2.2 // indirect go.opencensus.io v0.24.0 // indirect - go.opentelemetry.io/collector/featuregate v0.66.1-0.20221128222955-4ff1ff379b90 // indirect - go.opentelemetry.io/collector/processor/batchprocessor v0.66.1-0.20221128222955-4ff1ff379b90 // indirect - go.opentelemetry.io/collector/semconv v0.66.1-0.20221128222955-4ff1ff379b90 // indirect + go.opentelemetry.io/collector/confmap v0.0.0-20221201172708-2bdff61fa52a // indirect + go.opentelemetry.io/collector/featuregate v0.66.1-0.20221202005155-1c54042beb70 // indirect + go.opentelemetry.io/collector/processor/batchprocessor v0.66.1-0.20221202005155-1c54042beb70 // indirect + go.opentelemetry.io/collector/semconv v0.66.1-0.20221202005155-1c54042beb70 // 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 f7ed08b7d07e..f182d003d770 100644 --- a/receiver/azureblobreceiver/go.sum +++ b/receiver/azureblobreceiver/go.sum @@ -461,10 +461,12 @@ github.com/stretchr/testify v1.8.0/go.mod h1:yNjHg4UonilssWZ8iaSj1OCr/vHnekPRkoO github.com/stretchr/testify v1.8.1 h1:w7B6lhMri9wdJUVmEZPGGhZzrYTPvgJArz7wNPgYKsk= github.com/stretchr/testify v1.8.1/go.mod h1:w2LPCIKwWwSfY2zedu0+kehJoqGctiVI29o6fzry7u4= github.com/stvp/go-udp-testing v0.0.0-20201019212854-469649b16807/go.mod h1:7jxmlfBCDBXRzr0eAQJ48XC1hBu1np4CS5+cHEYfwpc= -github.com/tklauser/go-sysconf v0.3.10 h1:IJ1AZGZRWbY8T5Vfk04D9WOA5WSejdflXxP03OUqALw= github.com/tklauser/go-sysconf v0.3.10/go.mod h1:C8XykCvCb+Gn0oNCWPIlcb0RuglQTYaQ2hGm7jmxEFk= -github.com/tklauser/numcpus v0.4.0 h1:E53Dm1HjH1/R2/aoCtXtPgzmElmn51aOkhCFSuZq//o= +github.com/tklauser/go-sysconf v0.3.11 h1:89WgdJhk5SNwJfu+GKyYveZ4IaJ7xAkecBo+KdJV0CM= +github.com/tklauser/go-sysconf v0.3.11/go.mod h1:GqXfhXY3kiPa0nAXPDIQIWzJbMCB7AmcWpGR8lSZfqI= github.com/tklauser/numcpus v0.4.0/go.mod h1:1+UI3pD8NW14VMwdgJNJ1ESk2UnwhAnz5hMwiKKqXCQ= +github.com/tklauser/numcpus v0.6.0 h1:kebhY2Qt+3U6RNK7UqpYNA+tJ23IBEGKkB7JQBfDYms= +github.com/tklauser/numcpus v0.6.0/go.mod h1:FEZLMke0lhOUG6w2JadTzp0a+Nl8PF/GFkQ5UVIcaL4= github.com/yuin/goldmark v1.1.25/go.mod h1:3hX8gzYuyVAZsxl0MRgGTJEmQBFcNTphYh9decYSb74= github.com/yuin/goldmark v1.1.27/go.mod h1:3hX8gzYuyVAZsxl0MRgGTJEmQBFcNTphYh9decYSb74= github.com/yuin/goldmark v1.1.32/go.mod h1:3hX8gzYuyVAZsxl0MRgGTJEmQBFcNTphYh9decYSb74= @@ -483,21 +485,23 @@ go.opencensus.io v0.22.4/go.mod h1:yxeiOL68Rb0Xd1ddK5vPZ/oVn4vY4Ynel7k9FzqtOIw= go.opencensus.io v0.23.0/go.mod h1:XItmlyltB5F7CS4xOC1DcqMoFqwtC6OG2xF7mCv7P7E= go.opencensus.io v0.24.0 h1:y73uSU6J157QMP2kn2r30vwW1A2W2WFwSCGnAVxeaD0= go.opencensus.io v0.24.0/go.mod h1:vNK8G9p7aAivkbmorf4v+7Hgx+Zs0yY+0fOtgBfjQKo= -go.opentelemetry.io/collector v0.66.1-0.20221128222955-4ff1ff379b90 h1:yRe05/jMdzH4TFHfndZ5h2o2hKBK/79W72j8w51qNsI= -go.opentelemetry.io/collector v0.66.1-0.20221128222955-4ff1ff379b90/go.mod h1:hE6jCs+0rfiufCrVPucKZTMwfHit1okfDPnwPT2eW1I= -go.opentelemetry.io/collector/component v0.66.1-0.20221128222955-4ff1ff379b90 h1:AYSNTXbezhNg43EuYdVVcgxE/2gBVrm00FDx4DOmQVg= -go.opentelemetry.io/collector/component v0.66.1-0.20221128222955-4ff1ff379b90/go.mod h1:0c84EqXUhvYe6KW7hJfh76tiI/5yjWCH2amwyQ06XLM= -go.opentelemetry.io/collector/consumer v0.66.1-0.20221128222955-4ff1ff379b90 h1:nzNXVfC1FzXBXCLMzbMv+qK3E4EGiNsnMhfVsBd2yzc= -go.opentelemetry.io/collector/consumer v0.66.1-0.20221128222955-4ff1ff379b90/go.mod h1:WtoRZa5SnxQO1ZEQdVxYpFcXCmq62rakv0oUSlPO0NQ= -go.opentelemetry.io/collector/extension/zpagesextension v0.65.0 h1:T5JJIJ3cmClqdSMgkbjoIiP9p059AAvbfcd3houJkxM= -go.opentelemetry.io/collector/featuregate v0.66.1-0.20221128222955-4ff1ff379b90 h1:UuJSFWbi9XxyNZsJKZuvpWg35BgRbcCGFH+38V2MAdw= -go.opentelemetry.io/collector/featuregate v0.66.1-0.20221128222955-4ff1ff379b90/go.mod h1:tewuFKJYalWBU0bmNKg++MC1ipINXUr6szYzOw2p1GI= -go.opentelemetry.io/collector/pdata v0.66.1-0.20221128222955-4ff1ff379b90 h1:Vu4S4jSNcd0VFPzxQNO4+UqGwnes1xJDoFLPRiWHm8I= -go.opentelemetry.io/collector/pdata v0.66.1-0.20221128222955-4ff1ff379b90/go.mod h1:pqyaznLzk21m+1KL6fwOsRryRELL+zNM0qiVSn0MbVc= -go.opentelemetry.io/collector/processor/batchprocessor v0.66.1-0.20221128222955-4ff1ff379b90 h1:K12L9juzjChBMfp7cQaQsToz7i7975tUYVzJ3Tpw/Cw= -go.opentelemetry.io/collector/processor/batchprocessor v0.66.1-0.20221128222955-4ff1ff379b90/go.mod h1:XhGTsC1B/bq4gpg8IZ/QYBLXkzE4Gw3r7Xu2+ik8A1Q= -go.opentelemetry.io/collector/semconv v0.66.1-0.20221128222955-4ff1ff379b90 h1:hFaTA68cggZKWMv7wQ3bKP8KGTbowh/5AQZKCHzHTqM= -go.opentelemetry.io/collector/semconv v0.66.1-0.20221128222955-4ff1ff379b90/go.mod h1:5o9yhOa+ABt7g2E5JABDxGZ1PQPbtfxrKNbYn+LOTXU= +go.opentelemetry.io/collector v0.66.1-0.20221202005155-1c54042beb70 h1:INB2CsOtqqrija2KvMuIpbBQ3qX1BECEeR+d0NJX+oM= +go.opentelemetry.io/collector v0.66.1-0.20221202005155-1c54042beb70/go.mod h1:d0NHkHyANJy3HDTvYE/PoylMShUmFIbiir89ieI0X0c= +go.opentelemetry.io/collector/component v0.66.1-0.20221202005155-1c54042beb70 h1:dEoJhzCmRShgmVro/kXm6pouGElgxkH2DsvanzCeZtU= +go.opentelemetry.io/collector/component v0.66.1-0.20221202005155-1c54042beb70/go.mod h1:OsVnvFFe38QSpcuZlQ8cvarDzcloCexgQ1/B2m80F6U= +go.opentelemetry.io/collector/confmap v0.0.0-20221201172708-2bdff61fa52a h1:2TscCXAQASO2kU9xHcMIUM/FP29fiQIRTilZmliq/7I= +go.opentelemetry.io/collector/confmap v0.0.0-20221201172708-2bdff61fa52a/go.mod h1:qJ3e8bA8h4wz/jYlbeEUafVHdrU7DkpStnmIUAz6VTQ= +go.opentelemetry.io/collector/consumer v0.66.1-0.20221202005155-1c54042beb70 h1:XwpVjI1KeKGPXOZBLefGILMziPYuNf6IzbmiIEsIyI0= +go.opentelemetry.io/collector/consumer v0.66.1-0.20221202005155-1c54042beb70/go.mod h1:EWVBcSGcIcmeDGTnIboc/aqa3agsBeH8/q7yFWG7xVc= +go.opentelemetry.io/collector/extension/zpagesextension v0.66.0 h1:tPqSKH5K3VhTT0XXVoWL3woWBSTJqnXZQRt0ZLSCoCc= +go.opentelemetry.io/collector/featuregate v0.66.1-0.20221202005155-1c54042beb70 h1:V0tf4ebciqIs07jFATfLGdUpLRaEsi+AiWuA/in0G8Y= +go.opentelemetry.io/collector/featuregate v0.66.1-0.20221202005155-1c54042beb70/go.mod h1:tewuFKJYalWBU0bmNKg++MC1ipINXUr6szYzOw2p1GI= +go.opentelemetry.io/collector/pdata v0.66.1-0.20221202005155-1c54042beb70 h1:TPOrxkEMvZzfBSwF3ct+kUUgKA5g8unkZZbKQvJweeA= +go.opentelemetry.io/collector/pdata v0.66.1-0.20221202005155-1c54042beb70/go.mod h1:pqyaznLzk21m+1KL6fwOsRryRELL+zNM0qiVSn0MbVc= +go.opentelemetry.io/collector/processor/batchprocessor v0.66.1-0.20221202005155-1c54042beb70 h1:Y4e8NnVevonnAgmjX9Z7QIMA32yMqHAOnAlh8SzTS8c= +go.opentelemetry.io/collector/processor/batchprocessor v0.66.1-0.20221202005155-1c54042beb70/go.mod h1:Pi1CsKDQFoDrUP1i3+VdE6s2Xuji7bOGFBgqHK0J32E= +go.opentelemetry.io/collector/semconv v0.66.1-0.20221202005155-1c54042beb70 h1:Q5L9Urod3c8as6ZYaoaqBjarx/HXxsxy34DFZIU2fO4= +go.opentelemetry.io/collector/semconv v0.66.1-0.20221202005155-1c54042beb70/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= @@ -522,8 +526,8 @@ go.uber.org/multierr v1.6.0/go.mod h1:cdWPpRnG4AhwMwsgIHip0KRBQjJy5kYEpYjJxpXp9i go.uber.org/multierr v1.8.0 h1:dg6GjLku4EH+249NNmoIciG9N/jURbDG+pFlTkhzIC8= go.uber.org/multierr v1.8.0/go.mod h1:7EAYxJLBy9rStEaz58O2t4Uvip6FSURkq8/ppBp95ak= go.uber.org/zap v1.17.0/go.mod h1:MXVU+bhUf/A7Xi2HNOnopQOrmycQ5Ih87HtOu4q5SSo= -go.uber.org/zap v1.23.0 h1:OjGQ5KQDEUawVHxNwQgPpiypGHOxo2mNZsOqTak4fFY= -go.uber.org/zap v1.23.0/go.mod h1:D+nX8jyLsMHMYrln8A0rJjFt/T/9/bGgIhAqxv5URuY= +go.uber.org/zap v1.24.0 h1:FiJd5l1UOLj0wCgbSE0rwwXHzEdAZS6hiiSnxJN/D60= +go.uber.org/zap v1.24.0/go.mod h1:2kMP+WWQ8aoFoedH3T2sq6iJ2yDWpHbP0f6MQbS9Gkg= golang.org/x/crypto v0.0.0-20180904163835-0709b304e793/go.mod h1:6SG95UA2DQfeDnfUPMdvaQW0Q7yPrPDi9nlGo2tz2b4= golang.org/x/crypto v0.0.0-20190308221718-c2843e01d9a2/go.mod h1:djNgcEr1/C05ACkg1iLfiJU5Ep61QUkGW8qpdssI0+w= golang.org/x/crypto v0.0.0-20190510104115-cbcb75029529/go.mod h1:yigFU9vqHzYiE8UmvKecakEJjdnWj3jj499lnFckfCI= diff --git a/receiver/azureblobreceiver/receiver.go b/receiver/azureblobreceiver/receiver.go index 53ca4999f72f..ea73244eed10 100644 --- a/receiver/azureblobreceiver/receiver.go +++ b/receiver/azureblobreceiver/receiver.go @@ -104,9 +104,9 @@ func (b *blobReceiver) consumeTracesJSON(ctx context.Context, json []byte) error } // Returns a new instance of the log receiver -func newReceiver(config Config, set component.ReceiverCreateSettings, blobEventHandler blobEventHandler) (component.Component, error) { +func newReceiver(set component.ReceiverCreateSettings, blobEventHandler blobEventHandler) (component.Component, error) { obsrecv, err := obsreport.NewReceiver(obsreport.ReceiverSettings{ - ReceiverID: config.ID(), + ReceiverID: set.ID, Transport: "event", ReceiverCreateSettings: set, }) diff --git a/receiver/azureblobreceiver/receiver_test.go b/receiver/azureblobreceiver/receiver_test.go index 35ed6b231b41..eb1e6aa1e8c5 100644 --- a/receiver/azureblobreceiver/receiver_test.go +++ b/receiver/azureblobreceiver/receiver_test.go @@ -68,11 +68,10 @@ func TestConsumeTracesJSON(t *testing.T) { func getBlobReceiver(t *testing.T) (component.Component, error) { set := componenttest.NewNopReceiverCreateSettings() - cfg := getConfig().(*Config) blobClient := newMockBlobClient() blobEventHandler := getBlobEventHandler(t, blobClient) getBlobEventHandler(t, blobClient) - return newReceiver(*cfg, set, blobEventHandler) + return newReceiver(set, blobEventHandler) } diff --git a/receiver/azureeventhubreceiver/client.go b/receiver/azureeventhubreceiver/client.go index c93637c064eb..71112026c755 100644 --- a/receiver/azureeventhubreceiver/client.go +++ b/receiver/azureeventhubreceiver/client.go @@ -13,6 +13,7 @@ // limitations under the License. package azureeventhubreceiver // import "github.com/open-telemetry/opentelemetry-collector-contrib/receiver/azureeventhubreceiver" + import ( "context" "fmt" @@ -28,7 +29,7 @@ import ( ) type client struct { - logger *zap.Logger + settings component.ReceiverCreateSettings consumer consumer.Logs config *Config obsrecv *obsreport.Receiver @@ -69,7 +70,7 @@ func (h *hubWrapperImpl) Close(ctx context.Context) error { } func (c *client) Start(ctx context.Context, host component.Host) error { - storageClient, err := adapter.GetStorageClient(ctx, host, c.config.StorageID, c.config.ID()) + storageClient, err := adapter.GetStorageClient(ctx, host, c.config.StorageID, c.settings.ID) if err != nil { return err } @@ -120,7 +121,7 @@ func (c *client) setUpOnePartition(ctx context.Context, partitionID string, appl <-handle.Done() err := handle.Err() if err != nil { - c.logger.Error("Error reported by event hub", zap.Error(err)) + c.settings.Logger.Error("Error reported by event hub", zap.Error(err)) } }() diff --git a/receiver/azureeventhubreceiver/client_test.go b/receiver/azureeventhubreceiver/client_test.go index 2535bdfa98af..84acf64e89b9 100644 --- a/receiver/azureeventhubreceiver/client_test.go +++ b/receiver/azureeventhubreceiver/client_test.go @@ -22,10 +22,10 @@ import ( eventhub "github.com/Azure/azure-event-hubs-go/v3" "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/consumer/consumertest" "go.opentelemetry.io/collector/obsreport" - "go.uber.org/zap" ) type mockHubWrapper struct { @@ -67,7 +67,7 @@ func TestClient_Start(t *testing.T) { config.(*Config).Connection = "Endpoint=sb://namespace.servicebus.windows.net/;SharedAccessKeyName=RootManageSharedAccessKey;SharedAccessKey=superSecret1234=;EntityPath=hubName" c := &client{ - logger: zap.NewNop(), + settings: componenttest.NewNopReceiverCreateSettings(), consumer: consumertest.NewNop(), config: config.(*Config), convert: &rawConverter{}, @@ -85,14 +85,14 @@ func TestClient_handle(t *testing.T) { sink := new(consumertest.LogsSink) obsrecv, err := obsreport.NewReceiver(obsreport.ReceiverSettings{ - ReceiverID: config.ID(), + ReceiverID: component.NewID(typeStr), Transport: "", LongLivedCtx: false, ReceiverCreateSettings: componenttest.NewNopReceiverCreateSettings(), }) require.NoError(t, err) c := &client{ - logger: zap.NewNop(), + settings: componenttest.NewNopReceiverCreateSettings(), consumer: sink, config: config.(*Config), obsrecv: obsrecv, diff --git a/receiver/azureeventhubreceiver/factory.go b/receiver/azureeventhubreceiver/factory.go index 5ec5e8ca0f0c..10ffcd857f0c 100644 --- a/receiver/azureeventhubreceiver/factory.go +++ b/receiver/azureeventhubreceiver/factory.go @@ -42,10 +42,10 @@ func createDefaultConfig() component.Config { return &Config{ReceiverSettings: config.NewReceiverSettings(component.NewID(typeStr))} } -func createLogsReceiver(_ context.Context, settings component.ReceiverCreateSettings, receiver component.Config, logs consumer.Logs) (component.LogsReceiver, error) { +func createLogsReceiver(_ context.Context, settings component.ReceiverCreateSettings, cfg component.Config, logs consumer.Logs) (component.LogsReceiver, error) { obsrecv, err := obsreport.NewReceiver(obsreport.ReceiverSettings{ - ReceiverID: receiver.ID(), + ReceiverID: settings.ID, Transport: "azureeventhub", ReceiverCreateSettings: settings, }) @@ -54,7 +54,7 @@ func createLogsReceiver(_ context.Context, settings component.ReceiverCreateSett } var converter eventConverter - switch logFormat(receiver.(*Config).Format) { + switch logFormat(cfg.(*Config).Format) { case azureLogFormat: converter = newAzureLogFormatConverter(settings) case rawLogFormat: @@ -64,9 +64,9 @@ func createLogsReceiver(_ context.Context, settings component.ReceiverCreateSett } return &client{ - logger: settings.Logger, + settings: settings, consumer: logs, - config: receiver.(*Config), + config: cfg.(*Config), obsrecv: obsrecv, convert: converter, }, nil diff --git a/receiver/azureeventhubreceiver/go.mod b/receiver/azureeventhubreceiver/go.mod index e2a0a73f7858..98cfa173ca86 100644 --- a/receiver/azureeventhubreceiver/go.mod +++ b/receiver/azureeventhubreceiver/go.mod @@ -10,12 +10,12 @@ require ( github.com/open-telemetry/opentelemetry-collector-contrib/pkg/stanza v0.66.0 github.com/relvacode/iso8601 v1.1.0 github.com/stretchr/testify v1.8.1 - go.opentelemetry.io/collector v0.66.1-0.20221128222955-4ff1ff379b90 - go.opentelemetry.io/collector/component v0.66.1-0.20221128222955-4ff1ff379b90 - go.opentelemetry.io/collector/consumer v0.66.1-0.20221128222955-4ff1ff379b90 - go.opentelemetry.io/collector/pdata v0.66.1-0.20221128222955-4ff1ff379b90 - go.opentelemetry.io/collector/semconv v0.66.1-0.20221128222955-4ff1ff379b90 - go.uber.org/zap v1.23.0 + go.opentelemetry.io/collector v0.66.1-0.20221202005155-1c54042beb70 + go.opentelemetry.io/collector/component v0.66.1-0.20221202005155-1c54042beb70 + go.opentelemetry.io/collector/consumer v0.66.1-0.20221202005155-1c54042beb70 + go.opentelemetry.io/collector/pdata v0.66.1-0.20221202005155-1c54042beb70 + go.opentelemetry.io/collector/semconv v0.66.1-0.20221202005155-1c54042beb70 + go.uber.org/zap v1.24.0 ) require ( @@ -66,12 +66,13 @@ require ( github.com/shirou/gopsutil/v3 v3.22.10 // indirect github.com/spf13/cobra v1.6.1 // indirect github.com/spf13/pflag v1.0.5 // indirect - github.com/tklauser/go-sysconf v0.3.10 // indirect - github.com/tklauser/numcpus v0.4.0 // indirect + github.com/tklauser/go-sysconf v0.3.11 // indirect + github.com/tklauser/numcpus v0.6.0 // indirect github.com/yusufpapurcu/wmi v1.2.2 // indirect go.opencensus.io v0.24.0 // indirect - go.opentelemetry.io/collector/featuregate v0.66.1-0.20221128222955-4ff1ff379b90 // indirect - go.opentelemetry.io/collector/processor/batchprocessor v0.66.1-0.20221128222955-4ff1ff379b90 // indirect + go.opentelemetry.io/collector/confmap v0.0.0-20221201172708-2bdff61fa52a // indirect + go.opentelemetry.io/collector/featuregate v0.66.1-0.20221202005155-1c54042beb70 // indirect + go.opentelemetry.io/collector/processor/batchprocessor v0.66.1-0.20221202005155-1c54042beb70 // 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 60bb8fe8c6ef..70e00ffd2ed8 100644 --- a/receiver/azureeventhubreceiver/go.sum +++ b/receiver/azureeventhubreceiver/go.sum @@ -466,10 +466,12 @@ github.com/stretchr/testify v1.8.0/go.mod h1:yNjHg4UonilssWZ8iaSj1OCr/vHnekPRkoO github.com/stretchr/testify v1.8.1 h1:w7B6lhMri9wdJUVmEZPGGhZzrYTPvgJArz7wNPgYKsk= github.com/stretchr/testify v1.8.1/go.mod h1:w2LPCIKwWwSfY2zedu0+kehJoqGctiVI29o6fzry7u4= github.com/stvp/go-udp-testing v0.0.0-20201019212854-469649b16807/go.mod h1:7jxmlfBCDBXRzr0eAQJ48XC1hBu1np4CS5+cHEYfwpc= -github.com/tklauser/go-sysconf v0.3.10 h1:IJ1AZGZRWbY8T5Vfk04D9WOA5WSejdflXxP03OUqALw= github.com/tklauser/go-sysconf v0.3.10/go.mod h1:C8XykCvCb+Gn0oNCWPIlcb0RuglQTYaQ2hGm7jmxEFk= -github.com/tklauser/numcpus v0.4.0 h1:E53Dm1HjH1/R2/aoCtXtPgzmElmn51aOkhCFSuZq//o= +github.com/tklauser/go-sysconf v0.3.11 h1:89WgdJhk5SNwJfu+GKyYveZ4IaJ7xAkecBo+KdJV0CM= +github.com/tklauser/go-sysconf v0.3.11/go.mod h1:GqXfhXY3kiPa0nAXPDIQIWzJbMCB7AmcWpGR8lSZfqI= github.com/tklauser/numcpus v0.4.0/go.mod h1:1+UI3pD8NW14VMwdgJNJ1ESk2UnwhAnz5hMwiKKqXCQ= +github.com/tklauser/numcpus v0.6.0 h1:kebhY2Qt+3U6RNK7UqpYNA+tJ23IBEGKkB7JQBfDYms= +github.com/tklauser/numcpus v0.6.0/go.mod h1:FEZLMke0lhOUG6w2JadTzp0a+Nl8PF/GFkQ5UVIcaL4= github.com/yuin/goldmark v1.1.25/go.mod h1:3hX8gzYuyVAZsxl0MRgGTJEmQBFcNTphYh9decYSb74= github.com/yuin/goldmark v1.1.27/go.mod h1:3hX8gzYuyVAZsxl0MRgGTJEmQBFcNTphYh9decYSb74= github.com/yuin/goldmark v1.1.32/go.mod h1:3hX8gzYuyVAZsxl0MRgGTJEmQBFcNTphYh9decYSb74= @@ -488,21 +490,23 @@ go.opencensus.io v0.22.4/go.mod h1:yxeiOL68Rb0Xd1ddK5vPZ/oVn4vY4Ynel7k9FzqtOIw= go.opencensus.io v0.23.0/go.mod h1:XItmlyltB5F7CS4xOC1DcqMoFqwtC6OG2xF7mCv7P7E= go.opencensus.io v0.24.0 h1:y73uSU6J157QMP2kn2r30vwW1A2W2WFwSCGnAVxeaD0= go.opencensus.io v0.24.0/go.mod h1:vNK8G9p7aAivkbmorf4v+7Hgx+Zs0yY+0fOtgBfjQKo= -go.opentelemetry.io/collector v0.66.1-0.20221128222955-4ff1ff379b90 h1:yRe05/jMdzH4TFHfndZ5h2o2hKBK/79W72j8w51qNsI= -go.opentelemetry.io/collector v0.66.1-0.20221128222955-4ff1ff379b90/go.mod h1:hE6jCs+0rfiufCrVPucKZTMwfHit1okfDPnwPT2eW1I= -go.opentelemetry.io/collector/component v0.66.1-0.20221128222955-4ff1ff379b90 h1:AYSNTXbezhNg43EuYdVVcgxE/2gBVrm00FDx4DOmQVg= -go.opentelemetry.io/collector/component v0.66.1-0.20221128222955-4ff1ff379b90/go.mod h1:0c84EqXUhvYe6KW7hJfh76tiI/5yjWCH2amwyQ06XLM= -go.opentelemetry.io/collector/consumer v0.66.1-0.20221128222955-4ff1ff379b90 h1:nzNXVfC1FzXBXCLMzbMv+qK3E4EGiNsnMhfVsBd2yzc= -go.opentelemetry.io/collector/consumer v0.66.1-0.20221128222955-4ff1ff379b90/go.mod h1:WtoRZa5SnxQO1ZEQdVxYpFcXCmq62rakv0oUSlPO0NQ= -go.opentelemetry.io/collector/extension/zpagesextension v0.65.0 h1:T5JJIJ3cmClqdSMgkbjoIiP9p059AAvbfcd3houJkxM= -go.opentelemetry.io/collector/featuregate v0.66.1-0.20221128222955-4ff1ff379b90 h1:UuJSFWbi9XxyNZsJKZuvpWg35BgRbcCGFH+38V2MAdw= -go.opentelemetry.io/collector/featuregate v0.66.1-0.20221128222955-4ff1ff379b90/go.mod h1:tewuFKJYalWBU0bmNKg++MC1ipINXUr6szYzOw2p1GI= -go.opentelemetry.io/collector/pdata v0.66.1-0.20221128222955-4ff1ff379b90 h1:Vu4S4jSNcd0VFPzxQNO4+UqGwnes1xJDoFLPRiWHm8I= -go.opentelemetry.io/collector/pdata v0.66.1-0.20221128222955-4ff1ff379b90/go.mod h1:pqyaznLzk21m+1KL6fwOsRryRELL+zNM0qiVSn0MbVc= -go.opentelemetry.io/collector/processor/batchprocessor v0.66.1-0.20221128222955-4ff1ff379b90 h1:K12L9juzjChBMfp7cQaQsToz7i7975tUYVzJ3Tpw/Cw= -go.opentelemetry.io/collector/processor/batchprocessor v0.66.1-0.20221128222955-4ff1ff379b90/go.mod h1:XhGTsC1B/bq4gpg8IZ/QYBLXkzE4Gw3r7Xu2+ik8A1Q= -go.opentelemetry.io/collector/semconv v0.66.1-0.20221128222955-4ff1ff379b90 h1:hFaTA68cggZKWMv7wQ3bKP8KGTbowh/5AQZKCHzHTqM= -go.opentelemetry.io/collector/semconv v0.66.1-0.20221128222955-4ff1ff379b90/go.mod h1:5o9yhOa+ABt7g2E5JABDxGZ1PQPbtfxrKNbYn+LOTXU= +go.opentelemetry.io/collector v0.66.1-0.20221202005155-1c54042beb70 h1:INB2CsOtqqrija2KvMuIpbBQ3qX1BECEeR+d0NJX+oM= +go.opentelemetry.io/collector v0.66.1-0.20221202005155-1c54042beb70/go.mod h1:d0NHkHyANJy3HDTvYE/PoylMShUmFIbiir89ieI0X0c= +go.opentelemetry.io/collector/component v0.66.1-0.20221202005155-1c54042beb70 h1:dEoJhzCmRShgmVro/kXm6pouGElgxkH2DsvanzCeZtU= +go.opentelemetry.io/collector/component v0.66.1-0.20221202005155-1c54042beb70/go.mod h1:OsVnvFFe38QSpcuZlQ8cvarDzcloCexgQ1/B2m80F6U= +go.opentelemetry.io/collector/confmap v0.0.0-20221201172708-2bdff61fa52a h1:2TscCXAQASO2kU9xHcMIUM/FP29fiQIRTilZmliq/7I= +go.opentelemetry.io/collector/confmap v0.0.0-20221201172708-2bdff61fa52a/go.mod h1:qJ3e8bA8h4wz/jYlbeEUafVHdrU7DkpStnmIUAz6VTQ= +go.opentelemetry.io/collector/consumer v0.66.1-0.20221202005155-1c54042beb70 h1:XwpVjI1KeKGPXOZBLefGILMziPYuNf6IzbmiIEsIyI0= +go.opentelemetry.io/collector/consumer v0.66.1-0.20221202005155-1c54042beb70/go.mod h1:EWVBcSGcIcmeDGTnIboc/aqa3agsBeH8/q7yFWG7xVc= +go.opentelemetry.io/collector/extension/zpagesextension v0.66.0 h1:tPqSKH5K3VhTT0XXVoWL3woWBSTJqnXZQRt0ZLSCoCc= +go.opentelemetry.io/collector/featuregate v0.66.1-0.20221202005155-1c54042beb70 h1:V0tf4ebciqIs07jFATfLGdUpLRaEsi+AiWuA/in0G8Y= +go.opentelemetry.io/collector/featuregate v0.66.1-0.20221202005155-1c54042beb70/go.mod h1:tewuFKJYalWBU0bmNKg++MC1ipINXUr6szYzOw2p1GI= +go.opentelemetry.io/collector/pdata v0.66.1-0.20221202005155-1c54042beb70 h1:TPOrxkEMvZzfBSwF3ct+kUUgKA5g8unkZZbKQvJweeA= +go.opentelemetry.io/collector/pdata v0.66.1-0.20221202005155-1c54042beb70/go.mod h1:pqyaznLzk21m+1KL6fwOsRryRELL+zNM0qiVSn0MbVc= +go.opentelemetry.io/collector/processor/batchprocessor v0.66.1-0.20221202005155-1c54042beb70 h1:Y4e8NnVevonnAgmjX9Z7QIMA32yMqHAOnAlh8SzTS8c= +go.opentelemetry.io/collector/processor/batchprocessor v0.66.1-0.20221202005155-1c54042beb70/go.mod h1:Pi1CsKDQFoDrUP1i3+VdE6s2Xuji7bOGFBgqHK0J32E= +go.opentelemetry.io/collector/semconv v0.66.1-0.20221202005155-1c54042beb70 h1:Q5L9Urod3c8as6ZYaoaqBjarx/HXxsxy34DFZIU2fO4= +go.opentelemetry.io/collector/semconv v0.66.1-0.20221202005155-1c54042beb70/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= @@ -527,8 +531,8 @@ go.uber.org/multierr v1.6.0/go.mod h1:cdWPpRnG4AhwMwsgIHip0KRBQjJy5kYEpYjJxpXp9i go.uber.org/multierr v1.8.0 h1:dg6GjLku4EH+249NNmoIciG9N/jURbDG+pFlTkhzIC8= go.uber.org/multierr v1.8.0/go.mod h1:7EAYxJLBy9rStEaz58O2t4Uvip6FSURkq8/ppBp95ak= go.uber.org/zap v1.17.0/go.mod h1:MXVU+bhUf/A7Xi2HNOnopQOrmycQ5Ih87HtOu4q5SSo= -go.uber.org/zap v1.23.0 h1:OjGQ5KQDEUawVHxNwQgPpiypGHOxo2mNZsOqTak4fFY= -go.uber.org/zap v1.23.0/go.mod h1:D+nX8jyLsMHMYrln8A0rJjFt/T/9/bGgIhAqxv5URuY= +go.uber.org/zap v1.24.0 h1:FiJd5l1UOLj0wCgbSE0rwwXHzEdAZS6hiiSnxJN/D60= +go.uber.org/zap v1.24.0/go.mod h1:2kMP+WWQ8aoFoedH3T2sq6iJ2yDWpHbP0f6MQbS9Gkg= golang.org/x/crypto v0.0.0-20180904163835-0709b304e793/go.mod h1:6SG95UA2DQfeDnfUPMdvaQW0Q7yPrPDi9nlGo2tz2b4= golang.org/x/crypto v0.0.0-20190308221718-c2843e01d9a2/go.mod h1:djNgcEr1/C05ACkg1iLfiJU5Ep61QUkGW8qpdssI0+w= golang.org/x/crypto v0.0.0-20190510104115-cbcb75029529/go.mod h1:yigFU9vqHzYiE8UmvKecakEJjdnWj3jj499lnFckfCI= diff --git a/receiver/bigipreceiver/go.mod b/receiver/bigipreceiver/go.mod index e0055726e623..942676ec5f41 100644 --- a/receiver/bigipreceiver/go.mod +++ b/receiver/bigipreceiver/go.mod @@ -5,12 +5,13 @@ go 1.18 require ( github.com/open-telemetry/opentelemetry-collector-contrib/internal/scrapertest v0.66.0 github.com/stretchr/testify v1.8.1 - go.opentelemetry.io/collector v0.66.1-0.20221128222955-4ff1ff379b90 - go.opentelemetry.io/collector/component v0.66.1-0.20221128222955-4ff1ff379b90 - go.opentelemetry.io/collector/consumer v0.66.1-0.20221128222955-4ff1ff379b90 - go.opentelemetry.io/collector/pdata v0.66.1-0.20221128222955-4ff1ff379b90 + go.opentelemetry.io/collector v0.66.1-0.20221202005155-1c54042beb70 + go.opentelemetry.io/collector/component v0.66.1-0.20221202005155-1c54042beb70 + go.opentelemetry.io/collector/confmap v0.0.0-20221201172708-2bdff61fa52a + go.opentelemetry.io/collector/consumer v0.66.1-0.20221202005155-1c54042beb70 + go.opentelemetry.io/collector/pdata v0.66.1-0.20221202005155-1c54042beb70 go.uber.org/multierr v1.8.0 - go.uber.org/zap v1.23.0 + go.uber.org/zap v1.24.0 ) require ( @@ -35,7 +36,7 @@ require ( github.com/rs/cors v1.8.2 // indirect github.com/stretchr/objx v0.5.0 // indirect go.opencensus.io v0.24.0 // indirect - go.opentelemetry.io/collector/featuregate v0.66.1-0.20221128222955-4ff1ff379b90 // indirect + go.opentelemetry.io/collector/featuregate v0.66.1-0.20221202005155-1c54042beb70 // 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 041c5a1d5d4b..f636a213be11 100644 --- a/receiver/bigipreceiver/go.sum +++ b/receiver/bigipreceiver/go.sum @@ -292,16 +292,18 @@ go.etcd.io/etcd/client/pkg/v3 v3.5.4/go.mod h1:IJHfcCEKxYu1Os13ZdwCwIUTUVGYTSAM3 go.etcd.io/etcd/client/v3 v3.5.4/go.mod h1:ZaRkVgBZC+L+dLCjTcF1hRXpgZXQPOvnA/Ak/gq3kiY= go.opencensus.io v0.24.0 h1:y73uSU6J157QMP2kn2r30vwW1A2W2WFwSCGnAVxeaD0= go.opencensus.io v0.24.0/go.mod h1:vNK8G9p7aAivkbmorf4v+7Hgx+Zs0yY+0fOtgBfjQKo= -go.opentelemetry.io/collector v0.66.1-0.20221128222955-4ff1ff379b90 h1:yRe05/jMdzH4TFHfndZ5h2o2hKBK/79W72j8w51qNsI= -go.opentelemetry.io/collector v0.66.1-0.20221128222955-4ff1ff379b90/go.mod h1:hE6jCs+0rfiufCrVPucKZTMwfHit1okfDPnwPT2eW1I= -go.opentelemetry.io/collector/component v0.66.1-0.20221128222955-4ff1ff379b90 h1:AYSNTXbezhNg43EuYdVVcgxE/2gBVrm00FDx4DOmQVg= -go.opentelemetry.io/collector/component v0.66.1-0.20221128222955-4ff1ff379b90/go.mod h1:0c84EqXUhvYe6KW7hJfh76tiI/5yjWCH2amwyQ06XLM= -go.opentelemetry.io/collector/consumer v0.66.1-0.20221128222955-4ff1ff379b90 h1:nzNXVfC1FzXBXCLMzbMv+qK3E4EGiNsnMhfVsBd2yzc= -go.opentelemetry.io/collector/consumer v0.66.1-0.20221128222955-4ff1ff379b90/go.mod h1:WtoRZa5SnxQO1ZEQdVxYpFcXCmq62rakv0oUSlPO0NQ= -go.opentelemetry.io/collector/featuregate v0.66.1-0.20221128222955-4ff1ff379b90 h1:UuJSFWbi9XxyNZsJKZuvpWg35BgRbcCGFH+38V2MAdw= -go.opentelemetry.io/collector/featuregate v0.66.1-0.20221128222955-4ff1ff379b90/go.mod h1:tewuFKJYalWBU0bmNKg++MC1ipINXUr6szYzOw2p1GI= -go.opentelemetry.io/collector/pdata v0.66.1-0.20221128222955-4ff1ff379b90 h1:Vu4S4jSNcd0VFPzxQNO4+UqGwnes1xJDoFLPRiWHm8I= -go.opentelemetry.io/collector/pdata v0.66.1-0.20221128222955-4ff1ff379b90/go.mod h1:pqyaznLzk21m+1KL6fwOsRryRELL+zNM0qiVSn0MbVc= +go.opentelemetry.io/collector v0.66.1-0.20221202005155-1c54042beb70 h1:INB2CsOtqqrija2KvMuIpbBQ3qX1BECEeR+d0NJX+oM= +go.opentelemetry.io/collector v0.66.1-0.20221202005155-1c54042beb70/go.mod h1:d0NHkHyANJy3HDTvYE/PoylMShUmFIbiir89ieI0X0c= +go.opentelemetry.io/collector/component v0.66.1-0.20221202005155-1c54042beb70 h1:dEoJhzCmRShgmVro/kXm6pouGElgxkH2DsvanzCeZtU= +go.opentelemetry.io/collector/component v0.66.1-0.20221202005155-1c54042beb70/go.mod h1:OsVnvFFe38QSpcuZlQ8cvarDzcloCexgQ1/B2m80F6U= +go.opentelemetry.io/collector/confmap v0.0.0-20221201172708-2bdff61fa52a h1:2TscCXAQASO2kU9xHcMIUM/FP29fiQIRTilZmliq/7I= +go.opentelemetry.io/collector/confmap v0.0.0-20221201172708-2bdff61fa52a/go.mod h1:qJ3e8bA8h4wz/jYlbeEUafVHdrU7DkpStnmIUAz6VTQ= +go.opentelemetry.io/collector/consumer v0.66.1-0.20221202005155-1c54042beb70 h1:XwpVjI1KeKGPXOZBLefGILMziPYuNf6IzbmiIEsIyI0= +go.opentelemetry.io/collector/consumer v0.66.1-0.20221202005155-1c54042beb70/go.mod h1:EWVBcSGcIcmeDGTnIboc/aqa3agsBeH8/q7yFWG7xVc= +go.opentelemetry.io/collector/featuregate v0.66.1-0.20221202005155-1c54042beb70 h1:V0tf4ebciqIs07jFATfLGdUpLRaEsi+AiWuA/in0G8Y= +go.opentelemetry.io/collector/featuregate v0.66.1-0.20221202005155-1c54042beb70/go.mod h1:tewuFKJYalWBU0bmNKg++MC1ipINXUr6szYzOw2p1GI= +go.opentelemetry.io/collector/pdata v0.66.1-0.20221202005155-1c54042beb70 h1:TPOrxkEMvZzfBSwF3ct+kUUgKA5g8unkZZbKQvJweeA= +go.opentelemetry.io/collector/pdata v0.66.1-0.20221202005155-1c54042beb70/go.mod h1:pqyaznLzk21m+1KL6fwOsRryRELL+zNM0qiVSn0MbVc= 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= @@ -322,8 +324,8 @@ go.uber.org/multierr v1.6.0/go.mod h1:cdWPpRnG4AhwMwsgIHip0KRBQjJy5kYEpYjJxpXp9i go.uber.org/multierr v1.8.0 h1:dg6GjLku4EH+249NNmoIciG9N/jURbDG+pFlTkhzIC8= go.uber.org/multierr v1.8.0/go.mod h1:7EAYxJLBy9rStEaz58O2t4Uvip6FSURkq8/ppBp95ak= go.uber.org/zap v1.17.0/go.mod h1:MXVU+bhUf/A7Xi2HNOnopQOrmycQ5Ih87HtOu4q5SSo= -go.uber.org/zap v1.23.0 h1:OjGQ5KQDEUawVHxNwQgPpiypGHOxo2mNZsOqTak4fFY= -go.uber.org/zap v1.23.0/go.mod h1:D+nX8jyLsMHMYrln8A0rJjFt/T/9/bGgIhAqxv5URuY= +go.uber.org/zap v1.24.0 h1:FiJd5l1UOLj0wCgbSE0rwwXHzEdAZS6hiiSnxJN/D60= +go.uber.org/zap v1.24.0/go.mod h1:2kMP+WWQ8aoFoedH3T2sq6iJ2yDWpHbP0f6MQbS9Gkg= golang.org/x/crypto v0.0.0-20180904163835-0709b304e793/go.mod h1:6SG95UA2DQfeDnfUPMdvaQW0Q7yPrPDi9nlGo2tz2b4= golang.org/x/crypto v0.0.0-20190308221718-c2843e01d9a2/go.mod h1:djNgcEr1/C05ACkg1iLfiJU5Ep61QUkGW8qpdssI0+w= golang.org/x/crypto v0.0.0-20190923035154-9ee001bba392/go.mod h1:/lpIB1dKB+9EgE3H3cr1v9wB50oz8l4C4h62xy7jSTY= diff --git a/receiver/carbonreceiver/config.go b/receiver/carbonreceiver/config.go index 629715152c84..5dbda0eb9344 100644 --- a/receiver/carbonreceiver/config.go +++ b/receiver/carbonreceiver/config.go @@ -69,7 +69,7 @@ func (cfg *Config) Unmarshal(componentParser *confmap.Conf) error { } if err := protocol.LoadParserConfig(vParserCfg, cfg.Parser); err != nil { - return fmt.Errorf("error on %q section for %s: %w", parserConfigSection, cfg.ID().String(), err) + return fmt.Errorf("error on %q section: %w", parserConfigSection, err) } // Unmarshal exact to validate the config keys. diff --git a/receiver/carbonreceiver/go.mod b/receiver/carbonreceiver/go.mod index 65f35f8f8e70..43af4773409d 100644 --- a/receiver/carbonreceiver/go.mod +++ b/receiver/carbonreceiver/go.mod @@ -8,10 +8,11 @@ require ( github.com/open-telemetry/opentelemetry-collector-contrib/pkg/translator/opencensus v0.66.0 github.com/stretchr/testify v1.8.1 go.opencensus.io v0.24.0 - go.opentelemetry.io/collector v0.66.1-0.20221128222955-4ff1ff379b90 - go.opentelemetry.io/collector/component v0.66.1-0.20221128222955-4ff1ff379b90 - go.opentelemetry.io/collector/consumer v0.66.1-0.20221128222955-4ff1ff379b90 - go.uber.org/zap v1.23.0 + go.opentelemetry.io/collector v0.66.1-0.20221202005155-1c54042beb70 + go.opentelemetry.io/collector/component v0.66.1-0.20221202005155-1c54042beb70 + go.opentelemetry.io/collector/confmap v0.0.0-20221201172708-2bdff61fa52a + go.opentelemetry.io/collector/consumer v0.66.1-0.20221202005155-1c54042beb70 + go.uber.org/zap v1.24.0 google.golang.org/protobuf v1.28.1 ) @@ -42,9 +43,9 @@ require ( github.com/prometheus/common v0.37.0 // indirect github.com/prometheus/procfs v0.8.0 // indirect github.com/prometheus/statsd_exporter v0.22.7 // indirect - go.opentelemetry.io/collector/featuregate v0.66.1-0.20221128222955-4ff1ff379b90 // indirect - go.opentelemetry.io/collector/pdata v0.66.1-0.20221128222955-4ff1ff379b90 // indirect - go.opentelemetry.io/collector/semconv v0.66.1-0.20221128222955-4ff1ff379b90 // indirect + go.opentelemetry.io/collector/featuregate v0.66.1-0.20221202005155-1c54042beb70 // indirect + go.opentelemetry.io/collector/pdata v0.66.1-0.20221202005155-1c54042beb70 // indirect + go.opentelemetry.io/collector/semconv v0.66.1-0.20221202005155-1c54042beb70 // 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 7443e5eaefd0..d5dbc479007f 100644 --- a/receiver/carbonreceiver/go.sum +++ b/receiver/carbonreceiver/go.sum @@ -374,18 +374,20 @@ go.opencensus.io v0.22.4/go.mod h1:yxeiOL68Rb0Xd1ddK5vPZ/oVn4vY4Ynel7k9FzqtOIw= go.opencensus.io v0.23.0/go.mod h1:XItmlyltB5F7CS4xOC1DcqMoFqwtC6OG2xF7mCv7P7E= go.opencensus.io v0.24.0 h1:y73uSU6J157QMP2kn2r30vwW1A2W2WFwSCGnAVxeaD0= go.opencensus.io v0.24.0/go.mod h1:vNK8G9p7aAivkbmorf4v+7Hgx+Zs0yY+0fOtgBfjQKo= -go.opentelemetry.io/collector v0.66.1-0.20221128222955-4ff1ff379b90 h1:yRe05/jMdzH4TFHfndZ5h2o2hKBK/79W72j8w51qNsI= -go.opentelemetry.io/collector v0.66.1-0.20221128222955-4ff1ff379b90/go.mod h1:hE6jCs+0rfiufCrVPucKZTMwfHit1okfDPnwPT2eW1I= -go.opentelemetry.io/collector/component v0.66.1-0.20221128222955-4ff1ff379b90 h1:AYSNTXbezhNg43EuYdVVcgxE/2gBVrm00FDx4DOmQVg= -go.opentelemetry.io/collector/component v0.66.1-0.20221128222955-4ff1ff379b90/go.mod h1:0c84EqXUhvYe6KW7hJfh76tiI/5yjWCH2amwyQ06XLM= -go.opentelemetry.io/collector/consumer v0.66.1-0.20221128222955-4ff1ff379b90 h1:nzNXVfC1FzXBXCLMzbMv+qK3E4EGiNsnMhfVsBd2yzc= -go.opentelemetry.io/collector/consumer v0.66.1-0.20221128222955-4ff1ff379b90/go.mod h1:WtoRZa5SnxQO1ZEQdVxYpFcXCmq62rakv0oUSlPO0NQ= -go.opentelemetry.io/collector/featuregate v0.66.1-0.20221128222955-4ff1ff379b90 h1:UuJSFWbi9XxyNZsJKZuvpWg35BgRbcCGFH+38V2MAdw= -go.opentelemetry.io/collector/featuregate v0.66.1-0.20221128222955-4ff1ff379b90/go.mod h1:tewuFKJYalWBU0bmNKg++MC1ipINXUr6szYzOw2p1GI= -go.opentelemetry.io/collector/pdata v0.66.1-0.20221128222955-4ff1ff379b90 h1:Vu4S4jSNcd0VFPzxQNO4+UqGwnes1xJDoFLPRiWHm8I= -go.opentelemetry.io/collector/pdata v0.66.1-0.20221128222955-4ff1ff379b90/go.mod h1:pqyaznLzk21m+1KL6fwOsRryRELL+zNM0qiVSn0MbVc= -go.opentelemetry.io/collector/semconv v0.66.1-0.20221128222955-4ff1ff379b90 h1:hFaTA68cggZKWMv7wQ3bKP8KGTbowh/5AQZKCHzHTqM= -go.opentelemetry.io/collector/semconv v0.66.1-0.20221128222955-4ff1ff379b90/go.mod h1:5o9yhOa+ABt7g2E5JABDxGZ1PQPbtfxrKNbYn+LOTXU= +go.opentelemetry.io/collector v0.66.1-0.20221202005155-1c54042beb70 h1:INB2CsOtqqrija2KvMuIpbBQ3qX1BECEeR+d0NJX+oM= +go.opentelemetry.io/collector v0.66.1-0.20221202005155-1c54042beb70/go.mod h1:d0NHkHyANJy3HDTvYE/PoylMShUmFIbiir89ieI0X0c= +go.opentelemetry.io/collector/component v0.66.1-0.20221202005155-1c54042beb70 h1:dEoJhzCmRShgmVro/kXm6pouGElgxkH2DsvanzCeZtU= +go.opentelemetry.io/collector/component v0.66.1-0.20221202005155-1c54042beb70/go.mod h1:OsVnvFFe38QSpcuZlQ8cvarDzcloCexgQ1/B2m80F6U= +go.opentelemetry.io/collector/confmap v0.0.0-20221201172708-2bdff61fa52a h1:2TscCXAQASO2kU9xHcMIUM/FP29fiQIRTilZmliq/7I= +go.opentelemetry.io/collector/confmap v0.0.0-20221201172708-2bdff61fa52a/go.mod h1:qJ3e8bA8h4wz/jYlbeEUafVHdrU7DkpStnmIUAz6VTQ= +go.opentelemetry.io/collector/consumer v0.66.1-0.20221202005155-1c54042beb70 h1:XwpVjI1KeKGPXOZBLefGILMziPYuNf6IzbmiIEsIyI0= +go.opentelemetry.io/collector/consumer v0.66.1-0.20221202005155-1c54042beb70/go.mod h1:EWVBcSGcIcmeDGTnIboc/aqa3agsBeH8/q7yFWG7xVc= +go.opentelemetry.io/collector/featuregate v0.66.1-0.20221202005155-1c54042beb70 h1:V0tf4ebciqIs07jFATfLGdUpLRaEsi+AiWuA/in0G8Y= +go.opentelemetry.io/collector/featuregate v0.66.1-0.20221202005155-1c54042beb70/go.mod h1:tewuFKJYalWBU0bmNKg++MC1ipINXUr6szYzOw2p1GI= +go.opentelemetry.io/collector/pdata v0.66.1-0.20221202005155-1c54042beb70 h1:TPOrxkEMvZzfBSwF3ct+kUUgKA5g8unkZZbKQvJweeA= +go.opentelemetry.io/collector/pdata v0.66.1-0.20221202005155-1c54042beb70/go.mod h1:pqyaznLzk21m+1KL6fwOsRryRELL+zNM0qiVSn0MbVc= +go.opentelemetry.io/collector/semconv v0.66.1-0.20221202005155-1c54042beb70 h1:Q5L9Urod3c8as6ZYaoaqBjarx/HXxsxy34DFZIU2fO4= +go.opentelemetry.io/collector/semconv v0.66.1-0.20221202005155-1c54042beb70/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= @@ -406,8 +408,8 @@ go.uber.org/multierr v1.6.0/go.mod h1:cdWPpRnG4AhwMwsgIHip0KRBQjJy5kYEpYjJxpXp9i go.uber.org/multierr v1.8.0 h1:dg6GjLku4EH+249NNmoIciG9N/jURbDG+pFlTkhzIC8= go.uber.org/multierr v1.8.0/go.mod h1:7EAYxJLBy9rStEaz58O2t4Uvip6FSURkq8/ppBp95ak= go.uber.org/zap v1.17.0/go.mod h1:MXVU+bhUf/A7Xi2HNOnopQOrmycQ5Ih87HtOu4q5SSo= -go.uber.org/zap v1.23.0 h1:OjGQ5KQDEUawVHxNwQgPpiypGHOxo2mNZsOqTak4fFY= -go.uber.org/zap v1.23.0/go.mod h1:D+nX8jyLsMHMYrln8A0rJjFt/T/9/bGgIhAqxv5URuY= +go.uber.org/zap v1.24.0 h1:FiJd5l1UOLj0wCgbSE0rwwXHzEdAZS6hiiSnxJN/D60= +go.uber.org/zap v1.24.0/go.mod h1:2kMP+WWQ8aoFoedH3T2sq6iJ2yDWpHbP0f6MQbS9Gkg= golang.org/x/crypto v0.0.0-20180904163835-0709b304e793/go.mod h1:6SG95UA2DQfeDnfUPMdvaQW0Q7yPrPDi9nlGo2tz2b4= golang.org/x/crypto v0.0.0-20190308221718-c2843e01d9a2/go.mod h1:djNgcEr1/C05ACkg1iLfiJU5Ep61QUkGW8qpdssI0+w= golang.org/x/crypto v0.0.0-20190510104115-cbcb75029529/go.mod h1:yigFU9vqHzYiE8UmvKecakEJjdnWj3jj499lnFckfCI= diff --git a/receiver/carbonreceiver/receiver.go b/receiver/carbonreceiver/receiver.go index b4edf4aa2b96..9dd0db018990 100644 --- a/receiver/carbonreceiver/receiver.go +++ b/receiver/carbonreceiver/receiver.go @@ -80,7 +80,7 @@ func New( return nil, err } - rep, err := newReporter(config.ID(), set) + rep, err := newReporter(set) if err != nil { return nil, err } @@ -105,7 +105,7 @@ func buildTransportServer(config Config) (transport.Server, error) { return transport.NewUDPServer(config.Endpoint) } - return nil, fmt.Errorf("unsupported transport %q for receiver %v", config.Transport, config.ID()) + return nil, fmt.Errorf("unsupported transport %q", config.Transport) } // Start tells the receiver to start its processing. diff --git a/receiver/carbonreceiver/receiver_test.go b/receiver/carbonreceiver/receiver_test.go index c64ed1b8f35a..dc8e1c2c5696 100644 --- a/receiver/carbonreceiver/receiver_test.go +++ b/receiver/carbonreceiver/receiver_test.go @@ -102,7 +102,7 @@ func Test_carbonreceiver_New(t *testing.T) { }, nextConsumer: consumertest.NewNop(), }, - wantErr: errors.New("unsupported transport \"unknown_transp\" for receiver carbon/invalid_transport_rcv"), + wantErr: errors.New("unsupported transport \"unknown_transp\""), }, { name: "regex_parser", diff --git a/receiver/carbonreceiver/reporter.go b/receiver/carbonreceiver/reporter.go index 5598fabdb8d6..221af0fb89df 100644 --- a/receiver/carbonreceiver/reporter.go +++ b/receiver/carbonreceiver/reporter.go @@ -28,8 +28,6 @@ import ( // reporter struct implements the transport.Reporter interface to give consistent // observability per Collector metric observability package. type reporter struct { - id component.ID - spanName string logger *zap.Logger sugaredLogger *zap.SugaredLogger // Used for generic debug logging obsrecv *obsreport.Receiver @@ -37,9 +35,9 @@ type reporter struct { var _ transport.Reporter = (*reporter)(nil) -func newReporter(id component.ID, set component.ReceiverCreateSettings) (transport.Reporter, error) { +func newReporter(set component.ReceiverCreateSettings) (transport.Reporter, error) { obsrecv, err := obsreport.NewReceiver(obsreport.ReceiverSettings{ - ReceiverID: id, + ReceiverID: set.ID, Transport: "tcp", ReceiverCreateSettings: set, }) @@ -48,8 +46,6 @@ func newReporter(id component.ID, set component.ReceiverCreateSettings) (transpo } return &reporter{ - id: id, - spanName: id.String() + ".receiver", logger: set.Logger, sugaredLogger: set.Logger.Sugar(), obsrecv: obsrecv, diff --git a/receiver/carbonreceiver/reporter_test.go b/receiver/carbonreceiver/reporter_test.go index 7b9278309190..73f95354917c 100644 --- a/receiver/carbonreceiver/reporter_test.go +++ b/receiver/carbonreceiver/reporter_test.go @@ -25,14 +25,14 @@ import ( ) func TestReporterObservability(t *testing.T) { - tt, err := obsreporttest.SetupTelemetry() + receiverID := component.NewIDWithName(typeStr, "fake_receiver") + tt, err := obsreporttest.SetupTelemetryWithID(receiverID) require.NoError(t, err) defer func() { require.NoError(t, tt.Shutdown(context.Background())) }() - receiverID := component.NewIDWithName(typeStr, "fake_receiver") - reporter, err := newReporter(receiverID, tt.ToReceiverCreateSettings()) + reporter, err := newReporter(tt.ToReceiverCreateSettings()) require.NoError(t, err) ctx := reporter.OnDataReceived(context.Background()) diff --git a/receiver/chronyreceiver/go.mod b/receiver/chronyreceiver/go.mod index e9167ee210a6..f5aacf14286b 100644 --- a/receiver/chronyreceiver/go.mod +++ b/receiver/chronyreceiver/go.mod @@ -6,10 +6,11 @@ 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.66.1-0.20221128222955-4ff1ff379b90 - go.opentelemetry.io/collector/component v0.66.1-0.20221128222955-4ff1ff379b90 - go.opentelemetry.io/collector/consumer v0.66.1-0.20221128222955-4ff1ff379b90 - go.opentelemetry.io/collector/pdata v0.66.1-0.20221128222955-4ff1ff379b90 + go.opentelemetry.io/collector v0.66.1-0.20221202005155-1c54042beb70 + go.opentelemetry.io/collector/component v0.66.1-0.20221202005155-1c54042beb70 + go.opentelemetry.io/collector/confmap v0.0.0-20221201172708-2bdff61fa52a + go.opentelemetry.io/collector/consumer v0.66.1-0.20221202005155-1c54042beb70 + go.opentelemetry.io/collector/pdata v0.66.1-0.20221202005155-1c54042beb70 go.uber.org/multierr v1.8.0 ) @@ -29,12 +30,12 @@ require ( github.com/sirupsen/logrus v1.8.1 // indirect github.com/stretchr/objx v0.5.0 // indirect go.opencensus.io v0.24.0 // indirect - go.opentelemetry.io/collector/featuregate v0.66.1-0.20221128222955-4ff1ff379b90 // indirect + go.opentelemetry.io/collector/featuregate v0.66.1-0.20221202005155-1c54042beb70 // 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 go.uber.org/atomic v1.10.0 // indirect - go.uber.org/zap v1.23.0 // indirect + go.uber.org/zap v1.24.0 // indirect golang.org/x/net v0.0.0-20220722155237-a158d28d115b // indirect golang.org/x/sys v0.2.0 // indirect golang.org/x/text v0.4.0 // indirect diff --git a/receiver/chronyreceiver/go.sum b/receiver/chronyreceiver/go.sum index 77ba1c42d40f..4fe382395bb4 100644 --- a/receiver/chronyreceiver/go.sum +++ b/receiver/chronyreceiver/go.sum @@ -288,16 +288,18 @@ go.etcd.io/etcd/client/pkg/v3 v3.5.4/go.mod h1:IJHfcCEKxYu1Os13ZdwCwIUTUVGYTSAM3 go.etcd.io/etcd/client/v3 v3.5.4/go.mod h1:ZaRkVgBZC+L+dLCjTcF1hRXpgZXQPOvnA/Ak/gq3kiY= go.opencensus.io v0.24.0 h1:y73uSU6J157QMP2kn2r30vwW1A2W2WFwSCGnAVxeaD0= go.opencensus.io v0.24.0/go.mod h1:vNK8G9p7aAivkbmorf4v+7Hgx+Zs0yY+0fOtgBfjQKo= -go.opentelemetry.io/collector v0.66.1-0.20221128222955-4ff1ff379b90 h1:yRe05/jMdzH4TFHfndZ5h2o2hKBK/79W72j8w51qNsI= -go.opentelemetry.io/collector v0.66.1-0.20221128222955-4ff1ff379b90/go.mod h1:hE6jCs+0rfiufCrVPucKZTMwfHit1okfDPnwPT2eW1I= -go.opentelemetry.io/collector/component v0.66.1-0.20221128222955-4ff1ff379b90 h1:AYSNTXbezhNg43EuYdVVcgxE/2gBVrm00FDx4DOmQVg= -go.opentelemetry.io/collector/component v0.66.1-0.20221128222955-4ff1ff379b90/go.mod h1:0c84EqXUhvYe6KW7hJfh76tiI/5yjWCH2amwyQ06XLM= -go.opentelemetry.io/collector/consumer v0.66.1-0.20221128222955-4ff1ff379b90 h1:nzNXVfC1FzXBXCLMzbMv+qK3E4EGiNsnMhfVsBd2yzc= -go.opentelemetry.io/collector/consumer v0.66.1-0.20221128222955-4ff1ff379b90/go.mod h1:WtoRZa5SnxQO1ZEQdVxYpFcXCmq62rakv0oUSlPO0NQ= -go.opentelemetry.io/collector/featuregate v0.66.1-0.20221128222955-4ff1ff379b90 h1:UuJSFWbi9XxyNZsJKZuvpWg35BgRbcCGFH+38V2MAdw= -go.opentelemetry.io/collector/featuregate v0.66.1-0.20221128222955-4ff1ff379b90/go.mod h1:tewuFKJYalWBU0bmNKg++MC1ipINXUr6szYzOw2p1GI= -go.opentelemetry.io/collector/pdata v0.66.1-0.20221128222955-4ff1ff379b90 h1:Vu4S4jSNcd0VFPzxQNO4+UqGwnes1xJDoFLPRiWHm8I= -go.opentelemetry.io/collector/pdata v0.66.1-0.20221128222955-4ff1ff379b90/go.mod h1:pqyaznLzk21m+1KL6fwOsRryRELL+zNM0qiVSn0MbVc= +go.opentelemetry.io/collector v0.66.1-0.20221202005155-1c54042beb70 h1:INB2CsOtqqrija2KvMuIpbBQ3qX1BECEeR+d0NJX+oM= +go.opentelemetry.io/collector v0.66.1-0.20221202005155-1c54042beb70/go.mod h1:d0NHkHyANJy3HDTvYE/PoylMShUmFIbiir89ieI0X0c= +go.opentelemetry.io/collector/component v0.66.1-0.20221202005155-1c54042beb70 h1:dEoJhzCmRShgmVro/kXm6pouGElgxkH2DsvanzCeZtU= +go.opentelemetry.io/collector/component v0.66.1-0.20221202005155-1c54042beb70/go.mod h1:OsVnvFFe38QSpcuZlQ8cvarDzcloCexgQ1/B2m80F6U= +go.opentelemetry.io/collector/confmap v0.0.0-20221201172708-2bdff61fa52a h1:2TscCXAQASO2kU9xHcMIUM/FP29fiQIRTilZmliq/7I= +go.opentelemetry.io/collector/confmap v0.0.0-20221201172708-2bdff61fa52a/go.mod h1:qJ3e8bA8h4wz/jYlbeEUafVHdrU7DkpStnmIUAz6VTQ= +go.opentelemetry.io/collector/consumer v0.66.1-0.20221202005155-1c54042beb70 h1:XwpVjI1KeKGPXOZBLefGILMziPYuNf6IzbmiIEsIyI0= +go.opentelemetry.io/collector/consumer v0.66.1-0.20221202005155-1c54042beb70/go.mod h1:EWVBcSGcIcmeDGTnIboc/aqa3agsBeH8/q7yFWG7xVc= +go.opentelemetry.io/collector/featuregate v0.66.1-0.20221202005155-1c54042beb70 h1:V0tf4ebciqIs07jFATfLGdUpLRaEsi+AiWuA/in0G8Y= +go.opentelemetry.io/collector/featuregate v0.66.1-0.20221202005155-1c54042beb70/go.mod h1:tewuFKJYalWBU0bmNKg++MC1ipINXUr6szYzOw2p1GI= +go.opentelemetry.io/collector/pdata v0.66.1-0.20221202005155-1c54042beb70 h1:TPOrxkEMvZzfBSwF3ct+kUUgKA5g8unkZZbKQvJweeA= +go.opentelemetry.io/collector/pdata v0.66.1-0.20221202005155-1c54042beb70/go.mod h1:pqyaznLzk21m+1KL6fwOsRryRELL+zNM0qiVSn0MbVc= 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= @@ -316,8 +318,8 @@ go.uber.org/multierr v1.6.0/go.mod h1:cdWPpRnG4AhwMwsgIHip0KRBQjJy5kYEpYjJxpXp9i go.uber.org/multierr v1.8.0 h1:dg6GjLku4EH+249NNmoIciG9N/jURbDG+pFlTkhzIC8= go.uber.org/multierr v1.8.0/go.mod h1:7EAYxJLBy9rStEaz58O2t4Uvip6FSURkq8/ppBp95ak= go.uber.org/zap v1.17.0/go.mod h1:MXVU+bhUf/A7Xi2HNOnopQOrmycQ5Ih87HtOu4q5SSo= -go.uber.org/zap v1.23.0 h1:OjGQ5KQDEUawVHxNwQgPpiypGHOxo2mNZsOqTak4fFY= -go.uber.org/zap v1.23.0/go.mod h1:D+nX8jyLsMHMYrln8A0rJjFt/T/9/bGgIhAqxv5URuY= +go.uber.org/zap v1.24.0 h1:FiJd5l1UOLj0wCgbSE0rwwXHzEdAZS6hiiSnxJN/D60= +go.uber.org/zap v1.24.0/go.mod h1:2kMP+WWQ8aoFoedH3T2sq6iJ2yDWpHbP0f6MQbS9Gkg= golang.org/x/crypto v0.0.0-20180904163835-0709b304e793/go.mod h1:6SG95UA2DQfeDnfUPMdvaQW0Q7yPrPDi9nlGo2tz2b4= golang.org/x/crypto v0.0.0-20190308221718-c2843e01d9a2/go.mod h1:djNgcEr1/C05ACkg1iLfiJU5Ep61QUkGW8qpdssI0+w= golang.org/x/crypto v0.0.0-20190923035154-9ee001bba392/go.mod h1:/lpIB1dKB+9EgE3H3cr1v9wB50oz8l4C4h62xy7jSTY= diff --git a/receiver/cloudfoundryreceiver/go.mod b/receiver/cloudfoundryreceiver/go.mod index 932884b3076b..fa69b3bd1f77 100644 --- a/receiver/cloudfoundryreceiver/go.mod +++ b/receiver/cloudfoundryreceiver/go.mod @@ -6,11 +6,12 @@ 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.66.1-0.20221128222955-4ff1ff379b90 - go.opentelemetry.io/collector/component v0.66.1-0.20221128222955-4ff1ff379b90 - go.opentelemetry.io/collector/consumer v0.66.1-0.20221128222955-4ff1ff379b90 - go.opentelemetry.io/collector/pdata v0.66.1-0.20221128222955-4ff1ff379b90 - go.uber.org/zap v1.23.0 + go.opentelemetry.io/collector v0.66.1-0.20221202005155-1c54042beb70 + go.opentelemetry.io/collector/component v0.66.1-0.20221202005155-1c54042beb70 + go.opentelemetry.io/collector/confmap v0.0.0-20221201172708-2bdff61fa52a + go.opentelemetry.io/collector/consumer v0.66.1-0.20221202005155-1c54042beb70 + go.opentelemetry.io/collector/pdata v0.66.1-0.20221202005155-1c54042beb70 + go.uber.org/zap v1.24.0 ) require ( @@ -39,7 +40,7 @@ require ( github.com/pmezard/go-difflib v1.0.0 // indirect github.com/rs/cors v1.8.2 // indirect go.opencensus.io v0.24.0 // indirect - go.opentelemetry.io/collector/featuregate v0.66.1-0.20221128222955-4ff1ff379b90 // indirect + go.opentelemetry.io/collector/featuregate v0.66.1-0.20221202005155-1c54042beb70 // 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 038f772ee58a..cde147cac912 100644 --- a/receiver/cloudfoundryreceiver/go.sum +++ b/receiver/cloudfoundryreceiver/go.sum @@ -320,16 +320,18 @@ go.etcd.io/etcd/client/pkg/v3 v3.5.4/go.mod h1:IJHfcCEKxYu1Os13ZdwCwIUTUVGYTSAM3 go.etcd.io/etcd/client/v3 v3.5.4/go.mod h1:ZaRkVgBZC+L+dLCjTcF1hRXpgZXQPOvnA/Ak/gq3kiY= go.opencensus.io v0.24.0 h1:y73uSU6J157QMP2kn2r30vwW1A2W2WFwSCGnAVxeaD0= go.opencensus.io v0.24.0/go.mod h1:vNK8G9p7aAivkbmorf4v+7Hgx+Zs0yY+0fOtgBfjQKo= -go.opentelemetry.io/collector v0.66.1-0.20221128222955-4ff1ff379b90 h1:yRe05/jMdzH4TFHfndZ5h2o2hKBK/79W72j8w51qNsI= -go.opentelemetry.io/collector v0.66.1-0.20221128222955-4ff1ff379b90/go.mod h1:hE6jCs+0rfiufCrVPucKZTMwfHit1okfDPnwPT2eW1I= -go.opentelemetry.io/collector/component v0.66.1-0.20221128222955-4ff1ff379b90 h1:AYSNTXbezhNg43EuYdVVcgxE/2gBVrm00FDx4DOmQVg= -go.opentelemetry.io/collector/component v0.66.1-0.20221128222955-4ff1ff379b90/go.mod h1:0c84EqXUhvYe6KW7hJfh76tiI/5yjWCH2amwyQ06XLM= -go.opentelemetry.io/collector/consumer v0.66.1-0.20221128222955-4ff1ff379b90 h1:nzNXVfC1FzXBXCLMzbMv+qK3E4EGiNsnMhfVsBd2yzc= -go.opentelemetry.io/collector/consumer v0.66.1-0.20221128222955-4ff1ff379b90/go.mod h1:WtoRZa5SnxQO1ZEQdVxYpFcXCmq62rakv0oUSlPO0NQ= -go.opentelemetry.io/collector/featuregate v0.66.1-0.20221128222955-4ff1ff379b90 h1:UuJSFWbi9XxyNZsJKZuvpWg35BgRbcCGFH+38V2MAdw= -go.opentelemetry.io/collector/featuregate v0.66.1-0.20221128222955-4ff1ff379b90/go.mod h1:tewuFKJYalWBU0bmNKg++MC1ipINXUr6szYzOw2p1GI= -go.opentelemetry.io/collector/pdata v0.66.1-0.20221128222955-4ff1ff379b90 h1:Vu4S4jSNcd0VFPzxQNO4+UqGwnes1xJDoFLPRiWHm8I= -go.opentelemetry.io/collector/pdata v0.66.1-0.20221128222955-4ff1ff379b90/go.mod h1:pqyaznLzk21m+1KL6fwOsRryRELL+zNM0qiVSn0MbVc= +go.opentelemetry.io/collector v0.66.1-0.20221202005155-1c54042beb70 h1:INB2CsOtqqrija2KvMuIpbBQ3qX1BECEeR+d0NJX+oM= +go.opentelemetry.io/collector v0.66.1-0.20221202005155-1c54042beb70/go.mod h1:d0NHkHyANJy3HDTvYE/PoylMShUmFIbiir89ieI0X0c= +go.opentelemetry.io/collector/component v0.66.1-0.20221202005155-1c54042beb70 h1:dEoJhzCmRShgmVro/kXm6pouGElgxkH2DsvanzCeZtU= +go.opentelemetry.io/collector/component v0.66.1-0.20221202005155-1c54042beb70/go.mod h1:OsVnvFFe38QSpcuZlQ8cvarDzcloCexgQ1/B2m80F6U= +go.opentelemetry.io/collector/confmap v0.0.0-20221201172708-2bdff61fa52a h1:2TscCXAQASO2kU9xHcMIUM/FP29fiQIRTilZmliq/7I= +go.opentelemetry.io/collector/confmap v0.0.0-20221201172708-2bdff61fa52a/go.mod h1:qJ3e8bA8h4wz/jYlbeEUafVHdrU7DkpStnmIUAz6VTQ= +go.opentelemetry.io/collector/consumer v0.66.1-0.20221202005155-1c54042beb70 h1:XwpVjI1KeKGPXOZBLefGILMziPYuNf6IzbmiIEsIyI0= +go.opentelemetry.io/collector/consumer v0.66.1-0.20221202005155-1c54042beb70/go.mod h1:EWVBcSGcIcmeDGTnIboc/aqa3agsBeH8/q7yFWG7xVc= +go.opentelemetry.io/collector/featuregate v0.66.1-0.20221202005155-1c54042beb70 h1:V0tf4ebciqIs07jFATfLGdUpLRaEsi+AiWuA/in0G8Y= +go.opentelemetry.io/collector/featuregate v0.66.1-0.20221202005155-1c54042beb70/go.mod h1:tewuFKJYalWBU0bmNKg++MC1ipINXUr6szYzOw2p1GI= +go.opentelemetry.io/collector/pdata v0.66.1-0.20221202005155-1c54042beb70 h1:TPOrxkEMvZzfBSwF3ct+kUUgKA5g8unkZZbKQvJweeA= +go.opentelemetry.io/collector/pdata v0.66.1-0.20221202005155-1c54042beb70/go.mod h1:pqyaznLzk21m+1KL6fwOsRryRELL+zNM0qiVSn0MbVc= 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= @@ -350,8 +352,8 @@ go.uber.org/multierr v1.6.0/go.mod h1:cdWPpRnG4AhwMwsgIHip0KRBQjJy5kYEpYjJxpXp9i go.uber.org/multierr v1.8.0 h1:dg6GjLku4EH+249NNmoIciG9N/jURbDG+pFlTkhzIC8= go.uber.org/multierr v1.8.0/go.mod h1:7EAYxJLBy9rStEaz58O2t4Uvip6FSURkq8/ppBp95ak= go.uber.org/zap v1.17.0/go.mod h1:MXVU+bhUf/A7Xi2HNOnopQOrmycQ5Ih87HtOu4q5SSo= -go.uber.org/zap v1.23.0 h1:OjGQ5KQDEUawVHxNwQgPpiypGHOxo2mNZsOqTak4fFY= -go.uber.org/zap v1.23.0/go.mod h1:D+nX8jyLsMHMYrln8A0rJjFt/T/9/bGgIhAqxv5URuY= +go.uber.org/zap v1.24.0 h1:FiJd5l1UOLj0wCgbSE0rwwXHzEdAZS6hiiSnxJN/D60= +go.uber.org/zap v1.24.0/go.mod h1:2kMP+WWQ8aoFoedH3T2sq6iJ2yDWpHbP0f6MQbS9Gkg= golang.org/x/crypto v0.0.0-20180904163835-0709b304e793/go.mod h1:6SG95UA2DQfeDnfUPMdvaQW0Q7yPrPDi9nlGo2tz2b4= golang.org/x/crypto v0.0.0-20190308221718-c2843e01d9a2/go.mod h1:djNgcEr1/C05ACkg1iLfiJU5Ep61QUkGW8qpdssI0+w= golang.org/x/crypto v0.0.0-20190923035154-9ee001bba392/go.mod h1:/lpIB1dKB+9EgE3H3cr1v9wB50oz8l4C4h62xy7jSTY= diff --git a/receiver/cloudfoundryreceiver/receiver.go b/receiver/cloudfoundryreceiver/receiver.go index 219b6eb07ba0..083faeb45543 100644 --- a/receiver/cloudfoundryreceiver/receiver.go +++ b/receiver/cloudfoundryreceiver/receiver.go @@ -58,7 +58,7 @@ func newCloudFoundryReceiver( } obsrecv, err := obsreport.NewReceiver(obsreport.ReceiverSettings{ - ReceiverID: config.ID(), + ReceiverID: settings.ID, Transport: transport, ReceiverCreateSettings: settings, }) diff --git a/receiver/collectdreceiver/go.mod b/receiver/collectdreceiver/go.mod index 607c9950583d..2cf3ca1aa099 100644 --- a/receiver/collectdreceiver/go.mod +++ b/receiver/collectdreceiver/go.mod @@ -8,10 +8,11 @@ require ( github.com/open-telemetry/opentelemetry-collector-contrib/pkg/translator/opencensus v0.66.0 github.com/stretchr/testify v1.8.1 go.opencensus.io v0.24.0 - go.opentelemetry.io/collector v0.66.1-0.20221128222955-4ff1ff379b90 - go.opentelemetry.io/collector/component v0.66.1-0.20221128222955-4ff1ff379b90 - go.opentelemetry.io/collector/consumer v0.66.1-0.20221128222955-4ff1ff379b90 - go.uber.org/zap v1.23.0 + go.opentelemetry.io/collector v0.66.1-0.20221202005155-1c54042beb70 + go.opentelemetry.io/collector/component v0.66.1-0.20221202005155-1c54042beb70 + go.opentelemetry.io/collector/confmap v0.0.0-20221201172708-2bdff61fa52a + go.opentelemetry.io/collector/consumer v0.66.1-0.20221202005155-1c54042beb70 + go.uber.org/zap v1.24.0 google.golang.org/protobuf v1.28.1 ) @@ -30,9 +31,9 @@ require ( github.com/modern-go/reflect2 v1.0.2 // indirect github.com/open-telemetry/opentelemetry-collector-contrib/internal/coreinternal v0.66.0 // indirect github.com/pmezard/go-difflib v1.0.0 // indirect - go.opentelemetry.io/collector/featuregate v0.66.1-0.20221128222955-4ff1ff379b90 // indirect - go.opentelemetry.io/collector/pdata v0.66.1-0.20221128222955-4ff1ff379b90 // indirect - go.opentelemetry.io/collector/semconv v0.66.1-0.20221128222955-4ff1ff379b90 // indirect + go.opentelemetry.io/collector/featuregate v0.66.1-0.20221202005155-1c54042beb70 // indirect + go.opentelemetry.io/collector/pdata v0.66.1-0.20221202005155-1c54042beb70 // indirect + go.opentelemetry.io/collector/semconv v0.66.1-0.20221202005155-1c54042beb70 // 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 2493c4af4c93..6507e42a00c1 100644 --- a/receiver/collectdreceiver/go.sum +++ b/receiver/collectdreceiver/go.sum @@ -263,18 +263,20 @@ go.etcd.io/etcd/client/pkg/v3 v3.5.4/go.mod h1:IJHfcCEKxYu1Os13ZdwCwIUTUVGYTSAM3 go.etcd.io/etcd/client/v3 v3.5.4/go.mod h1:ZaRkVgBZC+L+dLCjTcF1hRXpgZXQPOvnA/Ak/gq3kiY= go.opencensus.io v0.24.0 h1:y73uSU6J157QMP2kn2r30vwW1A2W2WFwSCGnAVxeaD0= go.opencensus.io v0.24.0/go.mod h1:vNK8G9p7aAivkbmorf4v+7Hgx+Zs0yY+0fOtgBfjQKo= -go.opentelemetry.io/collector v0.66.1-0.20221128222955-4ff1ff379b90 h1:yRe05/jMdzH4TFHfndZ5h2o2hKBK/79W72j8w51qNsI= -go.opentelemetry.io/collector v0.66.1-0.20221128222955-4ff1ff379b90/go.mod h1:hE6jCs+0rfiufCrVPucKZTMwfHit1okfDPnwPT2eW1I= -go.opentelemetry.io/collector/component v0.66.1-0.20221128222955-4ff1ff379b90 h1:AYSNTXbezhNg43EuYdVVcgxE/2gBVrm00FDx4DOmQVg= -go.opentelemetry.io/collector/component v0.66.1-0.20221128222955-4ff1ff379b90/go.mod h1:0c84EqXUhvYe6KW7hJfh76tiI/5yjWCH2amwyQ06XLM= -go.opentelemetry.io/collector/consumer v0.66.1-0.20221128222955-4ff1ff379b90 h1:nzNXVfC1FzXBXCLMzbMv+qK3E4EGiNsnMhfVsBd2yzc= -go.opentelemetry.io/collector/consumer v0.66.1-0.20221128222955-4ff1ff379b90/go.mod h1:WtoRZa5SnxQO1ZEQdVxYpFcXCmq62rakv0oUSlPO0NQ= -go.opentelemetry.io/collector/featuregate v0.66.1-0.20221128222955-4ff1ff379b90 h1:UuJSFWbi9XxyNZsJKZuvpWg35BgRbcCGFH+38V2MAdw= -go.opentelemetry.io/collector/featuregate v0.66.1-0.20221128222955-4ff1ff379b90/go.mod h1:tewuFKJYalWBU0bmNKg++MC1ipINXUr6szYzOw2p1GI= -go.opentelemetry.io/collector/pdata v0.66.1-0.20221128222955-4ff1ff379b90 h1:Vu4S4jSNcd0VFPzxQNO4+UqGwnes1xJDoFLPRiWHm8I= -go.opentelemetry.io/collector/pdata v0.66.1-0.20221128222955-4ff1ff379b90/go.mod h1:pqyaznLzk21m+1KL6fwOsRryRELL+zNM0qiVSn0MbVc= -go.opentelemetry.io/collector/semconv v0.66.1-0.20221128222955-4ff1ff379b90 h1:hFaTA68cggZKWMv7wQ3bKP8KGTbowh/5AQZKCHzHTqM= -go.opentelemetry.io/collector/semconv v0.66.1-0.20221128222955-4ff1ff379b90/go.mod h1:5o9yhOa+ABt7g2E5JABDxGZ1PQPbtfxrKNbYn+LOTXU= +go.opentelemetry.io/collector v0.66.1-0.20221202005155-1c54042beb70 h1:INB2CsOtqqrija2KvMuIpbBQ3qX1BECEeR+d0NJX+oM= +go.opentelemetry.io/collector v0.66.1-0.20221202005155-1c54042beb70/go.mod h1:d0NHkHyANJy3HDTvYE/PoylMShUmFIbiir89ieI0X0c= +go.opentelemetry.io/collector/component v0.66.1-0.20221202005155-1c54042beb70 h1:dEoJhzCmRShgmVro/kXm6pouGElgxkH2DsvanzCeZtU= +go.opentelemetry.io/collector/component v0.66.1-0.20221202005155-1c54042beb70/go.mod h1:OsVnvFFe38QSpcuZlQ8cvarDzcloCexgQ1/B2m80F6U= +go.opentelemetry.io/collector/confmap v0.0.0-20221201172708-2bdff61fa52a h1:2TscCXAQASO2kU9xHcMIUM/FP29fiQIRTilZmliq/7I= +go.opentelemetry.io/collector/confmap v0.0.0-20221201172708-2bdff61fa52a/go.mod h1:qJ3e8bA8h4wz/jYlbeEUafVHdrU7DkpStnmIUAz6VTQ= +go.opentelemetry.io/collector/consumer v0.66.1-0.20221202005155-1c54042beb70 h1:XwpVjI1KeKGPXOZBLefGILMziPYuNf6IzbmiIEsIyI0= +go.opentelemetry.io/collector/consumer v0.66.1-0.20221202005155-1c54042beb70/go.mod h1:EWVBcSGcIcmeDGTnIboc/aqa3agsBeH8/q7yFWG7xVc= +go.opentelemetry.io/collector/featuregate v0.66.1-0.20221202005155-1c54042beb70 h1:V0tf4ebciqIs07jFATfLGdUpLRaEsi+AiWuA/in0G8Y= +go.opentelemetry.io/collector/featuregate v0.66.1-0.20221202005155-1c54042beb70/go.mod h1:tewuFKJYalWBU0bmNKg++MC1ipINXUr6szYzOw2p1GI= +go.opentelemetry.io/collector/pdata v0.66.1-0.20221202005155-1c54042beb70 h1:TPOrxkEMvZzfBSwF3ct+kUUgKA5g8unkZZbKQvJweeA= +go.opentelemetry.io/collector/pdata v0.66.1-0.20221202005155-1c54042beb70/go.mod h1:pqyaznLzk21m+1KL6fwOsRryRELL+zNM0qiVSn0MbVc= +go.opentelemetry.io/collector/semconv v0.66.1-0.20221202005155-1c54042beb70 h1:Q5L9Urod3c8as6ZYaoaqBjarx/HXxsxy34DFZIU2fO4= +go.opentelemetry.io/collector/semconv v0.66.1-0.20221202005155-1c54042beb70/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= @@ -289,8 +291,8 @@ go.uber.org/multierr v1.6.0/go.mod h1:cdWPpRnG4AhwMwsgIHip0KRBQjJy5kYEpYjJxpXp9i go.uber.org/multierr v1.8.0 h1:dg6GjLku4EH+249NNmoIciG9N/jURbDG+pFlTkhzIC8= go.uber.org/multierr v1.8.0/go.mod h1:7EAYxJLBy9rStEaz58O2t4Uvip6FSURkq8/ppBp95ak= go.uber.org/zap v1.17.0/go.mod h1:MXVU+bhUf/A7Xi2HNOnopQOrmycQ5Ih87HtOu4q5SSo= -go.uber.org/zap v1.23.0 h1:OjGQ5KQDEUawVHxNwQgPpiypGHOxo2mNZsOqTak4fFY= -go.uber.org/zap v1.23.0/go.mod h1:D+nX8jyLsMHMYrln8A0rJjFt/T/9/bGgIhAqxv5URuY= +go.uber.org/zap v1.24.0 h1:FiJd5l1UOLj0wCgbSE0rwwXHzEdAZS6hiiSnxJN/D60= +go.uber.org/zap v1.24.0/go.mod h1:2kMP+WWQ8aoFoedH3T2sq6iJ2yDWpHbP0f6MQbS9Gkg= golang.org/x/crypto v0.0.0-20180904163835-0709b304e793/go.mod h1:6SG95UA2DQfeDnfUPMdvaQW0Q7yPrPDi9nlGo2tz2b4= golang.org/x/crypto v0.0.0-20190308221718-c2843e01d9a2/go.mod h1:djNgcEr1/C05ACkg1iLfiJU5Ep61QUkGW8qpdssI0+w= golang.org/x/crypto v0.0.0-20190923035154-9ee001bba392/go.mod h1:/lpIB1dKB+9EgE3H3cr1v9wB50oz8l4C4h62xy7jSTY= diff --git a/receiver/couchdbreceiver/go.mod b/receiver/couchdbreceiver/go.mod index 9bab3544c7c4..cfba6cb2382a 100644 --- a/receiver/couchdbreceiver/go.mod +++ b/receiver/couchdbreceiver/go.mod @@ -5,12 +5,13 @@ go 1.18 require ( github.com/open-telemetry/opentelemetry-collector-contrib/internal/scrapertest v0.66.0 github.com/stretchr/testify v1.8.1 - go.opentelemetry.io/collector v0.66.1-0.20221128222955-4ff1ff379b90 - go.opentelemetry.io/collector/component v0.66.1-0.20221128222955-4ff1ff379b90 - go.opentelemetry.io/collector/consumer v0.66.1-0.20221128222955-4ff1ff379b90 - go.opentelemetry.io/collector/pdata v0.66.1-0.20221128222955-4ff1ff379b90 + go.opentelemetry.io/collector v0.66.1-0.20221202005155-1c54042beb70 + go.opentelemetry.io/collector/component v0.66.1-0.20221202005155-1c54042beb70 + go.opentelemetry.io/collector/confmap v0.0.0-20221201172708-2bdff61fa52a + go.opentelemetry.io/collector/consumer v0.66.1-0.20221202005155-1c54042beb70 + go.opentelemetry.io/collector/pdata v0.66.1-0.20221202005155-1c54042beb70 go.uber.org/multierr v1.8.0 - go.uber.org/zap v1.23.0 + go.uber.org/zap v1.24.0 ) require ( @@ -37,7 +38,7 @@ require ( github.com/rs/cors v1.8.2 // indirect github.com/stretchr/objx v0.5.0 // indirect go.opencensus.io v0.24.0 // indirect - go.opentelemetry.io/collector/featuregate v0.66.1-0.20221128222955-4ff1ff379b90 // indirect + go.opentelemetry.io/collector/featuregate v0.66.1-0.20221202005155-1c54042beb70 // 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 c9076532a250..655ddee132da 100644 --- a/receiver/couchdbreceiver/go.sum +++ b/receiver/couchdbreceiver/go.sum @@ -295,16 +295,18 @@ go.etcd.io/etcd/client/pkg/v3 v3.5.4/go.mod h1:IJHfcCEKxYu1Os13ZdwCwIUTUVGYTSAM3 go.etcd.io/etcd/client/v3 v3.5.4/go.mod h1:ZaRkVgBZC+L+dLCjTcF1hRXpgZXQPOvnA/Ak/gq3kiY= go.opencensus.io v0.24.0 h1:y73uSU6J157QMP2kn2r30vwW1A2W2WFwSCGnAVxeaD0= go.opencensus.io v0.24.0/go.mod h1:vNK8G9p7aAivkbmorf4v+7Hgx+Zs0yY+0fOtgBfjQKo= -go.opentelemetry.io/collector v0.66.1-0.20221128222955-4ff1ff379b90 h1:yRe05/jMdzH4TFHfndZ5h2o2hKBK/79W72j8w51qNsI= -go.opentelemetry.io/collector v0.66.1-0.20221128222955-4ff1ff379b90/go.mod h1:hE6jCs+0rfiufCrVPucKZTMwfHit1okfDPnwPT2eW1I= -go.opentelemetry.io/collector/component v0.66.1-0.20221128222955-4ff1ff379b90 h1:AYSNTXbezhNg43EuYdVVcgxE/2gBVrm00FDx4DOmQVg= -go.opentelemetry.io/collector/component v0.66.1-0.20221128222955-4ff1ff379b90/go.mod h1:0c84EqXUhvYe6KW7hJfh76tiI/5yjWCH2amwyQ06XLM= -go.opentelemetry.io/collector/consumer v0.66.1-0.20221128222955-4ff1ff379b90 h1:nzNXVfC1FzXBXCLMzbMv+qK3E4EGiNsnMhfVsBd2yzc= -go.opentelemetry.io/collector/consumer v0.66.1-0.20221128222955-4ff1ff379b90/go.mod h1:WtoRZa5SnxQO1ZEQdVxYpFcXCmq62rakv0oUSlPO0NQ= -go.opentelemetry.io/collector/featuregate v0.66.1-0.20221128222955-4ff1ff379b90 h1:UuJSFWbi9XxyNZsJKZuvpWg35BgRbcCGFH+38V2MAdw= -go.opentelemetry.io/collector/featuregate v0.66.1-0.20221128222955-4ff1ff379b90/go.mod h1:tewuFKJYalWBU0bmNKg++MC1ipINXUr6szYzOw2p1GI= -go.opentelemetry.io/collector/pdata v0.66.1-0.20221128222955-4ff1ff379b90 h1:Vu4S4jSNcd0VFPzxQNO4+UqGwnes1xJDoFLPRiWHm8I= -go.opentelemetry.io/collector/pdata v0.66.1-0.20221128222955-4ff1ff379b90/go.mod h1:pqyaznLzk21m+1KL6fwOsRryRELL+zNM0qiVSn0MbVc= +go.opentelemetry.io/collector v0.66.1-0.20221202005155-1c54042beb70 h1:INB2CsOtqqrija2KvMuIpbBQ3qX1BECEeR+d0NJX+oM= +go.opentelemetry.io/collector v0.66.1-0.20221202005155-1c54042beb70/go.mod h1:d0NHkHyANJy3HDTvYE/PoylMShUmFIbiir89ieI0X0c= +go.opentelemetry.io/collector/component v0.66.1-0.20221202005155-1c54042beb70 h1:dEoJhzCmRShgmVro/kXm6pouGElgxkH2DsvanzCeZtU= +go.opentelemetry.io/collector/component v0.66.1-0.20221202005155-1c54042beb70/go.mod h1:OsVnvFFe38QSpcuZlQ8cvarDzcloCexgQ1/B2m80F6U= +go.opentelemetry.io/collector/confmap v0.0.0-20221201172708-2bdff61fa52a h1:2TscCXAQASO2kU9xHcMIUM/FP29fiQIRTilZmliq/7I= +go.opentelemetry.io/collector/confmap v0.0.0-20221201172708-2bdff61fa52a/go.mod h1:qJ3e8bA8h4wz/jYlbeEUafVHdrU7DkpStnmIUAz6VTQ= +go.opentelemetry.io/collector/consumer v0.66.1-0.20221202005155-1c54042beb70 h1:XwpVjI1KeKGPXOZBLefGILMziPYuNf6IzbmiIEsIyI0= +go.opentelemetry.io/collector/consumer v0.66.1-0.20221202005155-1c54042beb70/go.mod h1:EWVBcSGcIcmeDGTnIboc/aqa3agsBeH8/q7yFWG7xVc= +go.opentelemetry.io/collector/featuregate v0.66.1-0.20221202005155-1c54042beb70 h1:V0tf4ebciqIs07jFATfLGdUpLRaEsi+AiWuA/in0G8Y= +go.opentelemetry.io/collector/featuregate v0.66.1-0.20221202005155-1c54042beb70/go.mod h1:tewuFKJYalWBU0bmNKg++MC1ipINXUr6szYzOw2p1GI= +go.opentelemetry.io/collector/pdata v0.66.1-0.20221202005155-1c54042beb70 h1:TPOrxkEMvZzfBSwF3ct+kUUgKA5g8unkZZbKQvJweeA= +go.opentelemetry.io/collector/pdata v0.66.1-0.20221202005155-1c54042beb70/go.mod h1:pqyaznLzk21m+1KL6fwOsRryRELL+zNM0qiVSn0MbVc= 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= @@ -325,8 +327,8 @@ go.uber.org/multierr v1.6.0/go.mod h1:cdWPpRnG4AhwMwsgIHip0KRBQjJy5kYEpYjJxpXp9i go.uber.org/multierr v1.8.0 h1:dg6GjLku4EH+249NNmoIciG9N/jURbDG+pFlTkhzIC8= go.uber.org/multierr v1.8.0/go.mod h1:7EAYxJLBy9rStEaz58O2t4Uvip6FSURkq8/ppBp95ak= go.uber.org/zap v1.17.0/go.mod h1:MXVU+bhUf/A7Xi2HNOnopQOrmycQ5Ih87HtOu4q5SSo= -go.uber.org/zap v1.23.0 h1:OjGQ5KQDEUawVHxNwQgPpiypGHOxo2mNZsOqTak4fFY= -go.uber.org/zap v1.23.0/go.mod h1:D+nX8jyLsMHMYrln8A0rJjFt/T/9/bGgIhAqxv5URuY= +go.uber.org/zap v1.24.0 h1:FiJd5l1UOLj0wCgbSE0rwwXHzEdAZS6hiiSnxJN/D60= +go.uber.org/zap v1.24.0/go.mod h1:2kMP+WWQ8aoFoedH3T2sq6iJ2yDWpHbP0f6MQbS9Gkg= golang.org/x/crypto v0.0.0-20180904163835-0709b304e793/go.mod h1:6SG95UA2DQfeDnfUPMdvaQW0Q7yPrPDi9nlGo2tz2b4= golang.org/x/crypto v0.0.0-20190308221718-c2843e01d9a2/go.mod h1:djNgcEr1/C05ACkg1iLfiJU5Ep61QUkGW8qpdssI0+w= golang.org/x/crypto v0.0.0-20190923035154-9ee001bba392/go.mod h1:/lpIB1dKB+9EgE3H3cr1v9wB50oz8l4C4h62xy7jSTY= diff --git a/receiver/dockerstatsreceiver/go.mod b/receiver/dockerstatsreceiver/go.mod index 1e2248950284..bce5069d6230 100644 --- a/receiver/dockerstatsreceiver/go.mod +++ b/receiver/dockerstatsreceiver/go.mod @@ -9,14 +9,15 @@ require ( github.com/open-telemetry/opentelemetry-collector-contrib/internal/scrapertest v0.66.0 github.com/stretchr/testify v1.8.1 github.com/testcontainers/testcontainers-go v0.15.0 - go.opentelemetry.io/collector v0.66.1-0.20221128222955-4ff1ff379b90 - go.opentelemetry.io/collector/component v0.66.1-0.20221128222955-4ff1ff379b90 - go.opentelemetry.io/collector/consumer v0.66.1-0.20221128222955-4ff1ff379b90 - go.opentelemetry.io/collector/featuregate v0.66.1-0.20221128222955-4ff1ff379b90 - go.opentelemetry.io/collector/pdata v0.66.1-0.20221128222955-4ff1ff379b90 - go.opentelemetry.io/collector/semconv v0.66.1-0.20221128222955-4ff1ff379b90 + go.opentelemetry.io/collector v0.66.1-0.20221202005155-1c54042beb70 + go.opentelemetry.io/collector/component v0.66.1-0.20221202005155-1c54042beb70 + go.opentelemetry.io/collector/confmap v0.0.0-20221201172708-2bdff61fa52a + go.opentelemetry.io/collector/consumer v0.66.1-0.20221202005155-1c54042beb70 + go.opentelemetry.io/collector/featuregate v0.66.1-0.20221202005155-1c54042beb70 + go.opentelemetry.io/collector/pdata v0.66.1-0.20221202005155-1c54042beb70 + go.opentelemetry.io/collector/semconv v0.66.1-0.20221202005155-1c54042beb70 go.uber.org/multierr v1.8.0 - go.uber.org/zap v1.23.0 + go.uber.org/zap v1.24.0 ) require ( diff --git a/receiver/dockerstatsreceiver/go.sum b/receiver/dockerstatsreceiver/go.sum index 95ccb99700f4..0abaf25d2e8f 100644 --- a/receiver/dockerstatsreceiver/go.sum +++ b/receiver/dockerstatsreceiver/go.sum @@ -824,18 +824,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.24.0 h1:y73uSU6J157QMP2kn2r30vwW1A2W2WFwSCGnAVxeaD0= go.opencensus.io v0.24.0/go.mod h1:vNK8G9p7aAivkbmorf4v+7Hgx+Zs0yY+0fOtgBfjQKo= -go.opentelemetry.io/collector v0.66.1-0.20221128222955-4ff1ff379b90 h1:yRe05/jMdzH4TFHfndZ5h2o2hKBK/79W72j8w51qNsI= -go.opentelemetry.io/collector v0.66.1-0.20221128222955-4ff1ff379b90/go.mod h1:hE6jCs+0rfiufCrVPucKZTMwfHit1okfDPnwPT2eW1I= -go.opentelemetry.io/collector/component v0.66.1-0.20221128222955-4ff1ff379b90 h1:AYSNTXbezhNg43EuYdVVcgxE/2gBVrm00FDx4DOmQVg= -go.opentelemetry.io/collector/component v0.66.1-0.20221128222955-4ff1ff379b90/go.mod h1:0c84EqXUhvYe6KW7hJfh76tiI/5yjWCH2amwyQ06XLM= -go.opentelemetry.io/collector/consumer v0.66.1-0.20221128222955-4ff1ff379b90 h1:nzNXVfC1FzXBXCLMzbMv+qK3E4EGiNsnMhfVsBd2yzc= -go.opentelemetry.io/collector/consumer v0.66.1-0.20221128222955-4ff1ff379b90/go.mod h1:WtoRZa5SnxQO1ZEQdVxYpFcXCmq62rakv0oUSlPO0NQ= -go.opentelemetry.io/collector/featuregate v0.66.1-0.20221128222955-4ff1ff379b90 h1:UuJSFWbi9XxyNZsJKZuvpWg35BgRbcCGFH+38V2MAdw= -go.opentelemetry.io/collector/featuregate v0.66.1-0.20221128222955-4ff1ff379b90/go.mod h1:tewuFKJYalWBU0bmNKg++MC1ipINXUr6szYzOw2p1GI= -go.opentelemetry.io/collector/pdata v0.66.1-0.20221128222955-4ff1ff379b90 h1:Vu4S4jSNcd0VFPzxQNO4+UqGwnes1xJDoFLPRiWHm8I= -go.opentelemetry.io/collector/pdata v0.66.1-0.20221128222955-4ff1ff379b90/go.mod h1:pqyaznLzk21m+1KL6fwOsRryRELL+zNM0qiVSn0MbVc= -go.opentelemetry.io/collector/semconv v0.66.1-0.20221128222955-4ff1ff379b90 h1:hFaTA68cggZKWMv7wQ3bKP8KGTbowh/5AQZKCHzHTqM= -go.opentelemetry.io/collector/semconv v0.66.1-0.20221128222955-4ff1ff379b90/go.mod h1:5o9yhOa+ABt7g2E5JABDxGZ1PQPbtfxrKNbYn+LOTXU= +go.opentelemetry.io/collector v0.66.1-0.20221202005155-1c54042beb70 h1:INB2CsOtqqrija2KvMuIpbBQ3qX1BECEeR+d0NJX+oM= +go.opentelemetry.io/collector v0.66.1-0.20221202005155-1c54042beb70/go.mod h1:d0NHkHyANJy3HDTvYE/PoylMShUmFIbiir89ieI0X0c= +go.opentelemetry.io/collector/component v0.66.1-0.20221202005155-1c54042beb70 h1:dEoJhzCmRShgmVro/kXm6pouGElgxkH2DsvanzCeZtU= +go.opentelemetry.io/collector/component v0.66.1-0.20221202005155-1c54042beb70/go.mod h1:OsVnvFFe38QSpcuZlQ8cvarDzcloCexgQ1/B2m80F6U= +go.opentelemetry.io/collector/confmap v0.0.0-20221201172708-2bdff61fa52a h1:2TscCXAQASO2kU9xHcMIUM/FP29fiQIRTilZmliq/7I= +go.opentelemetry.io/collector/confmap v0.0.0-20221201172708-2bdff61fa52a/go.mod h1:qJ3e8bA8h4wz/jYlbeEUafVHdrU7DkpStnmIUAz6VTQ= +go.opentelemetry.io/collector/consumer v0.66.1-0.20221202005155-1c54042beb70 h1:XwpVjI1KeKGPXOZBLefGILMziPYuNf6IzbmiIEsIyI0= +go.opentelemetry.io/collector/consumer v0.66.1-0.20221202005155-1c54042beb70/go.mod h1:EWVBcSGcIcmeDGTnIboc/aqa3agsBeH8/q7yFWG7xVc= +go.opentelemetry.io/collector/featuregate v0.66.1-0.20221202005155-1c54042beb70 h1:V0tf4ebciqIs07jFATfLGdUpLRaEsi+AiWuA/in0G8Y= +go.opentelemetry.io/collector/featuregate v0.66.1-0.20221202005155-1c54042beb70/go.mod h1:tewuFKJYalWBU0bmNKg++MC1ipINXUr6szYzOw2p1GI= +go.opentelemetry.io/collector/pdata v0.66.1-0.20221202005155-1c54042beb70 h1:TPOrxkEMvZzfBSwF3ct+kUUgKA5g8unkZZbKQvJweeA= +go.opentelemetry.io/collector/pdata v0.66.1-0.20221202005155-1c54042beb70/go.mod h1:pqyaznLzk21m+1KL6fwOsRryRELL+zNM0qiVSn0MbVc= +go.opentelemetry.io/collector/semconv v0.66.1-0.20221202005155-1c54042beb70 h1:Q5L9Urod3c8as6ZYaoaqBjarx/HXxsxy34DFZIU2fO4= +go.opentelemetry.io/collector/semconv v0.66.1-0.20221202005155-1c54042beb70/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= @@ -858,8 +860,8 @@ go.uber.org/multierr v1.8.0 h1:dg6GjLku4EH+249NNmoIciG9N/jURbDG+pFlTkhzIC8= go.uber.org/multierr v1.8.0/go.mod h1:7EAYxJLBy9rStEaz58O2t4Uvip6FSURkq8/ppBp95ak= go.uber.org/zap v1.10.0/go.mod h1:vwi/ZaCAaUcBkycHslxD9B2zi4UTXhF60s6SWpuDF0Q= go.uber.org/zap v1.17.0/go.mod h1:MXVU+bhUf/A7Xi2HNOnopQOrmycQ5Ih87HtOu4q5SSo= -go.uber.org/zap v1.23.0 h1:OjGQ5KQDEUawVHxNwQgPpiypGHOxo2mNZsOqTak4fFY= -go.uber.org/zap v1.23.0/go.mod h1:D+nX8jyLsMHMYrln8A0rJjFt/T/9/bGgIhAqxv5URuY= +go.uber.org/zap v1.24.0 h1:FiJd5l1UOLj0wCgbSE0rwwXHzEdAZS6hiiSnxJN/D60= +go.uber.org/zap v1.24.0/go.mod h1:2kMP+WWQ8aoFoedH3T2sq6iJ2yDWpHbP0f6MQbS9Gkg= golang.org/x/crypto v0.0.0-20171113213409-9f005a07e0d3/go.mod h1:6SG95UA2DQfeDnfUPMdvaQW0Q7yPrPDi9nlGo2tz2b4= golang.org/x/crypto v0.0.0-20180904163835-0709b304e793/go.mod h1:6SG95UA2DQfeDnfUPMdvaQW0Q7yPrPDi9nlGo2tz2b4= golang.org/x/crypto v0.0.0-20181009213950-7c1a557ab941/go.mod h1:6SG95UA2DQfeDnfUPMdvaQW0Q7yPrPDi9nlGo2tz2b4= diff --git a/receiver/dotnetdiagnosticsreceiver/go.mod b/receiver/dotnetdiagnosticsreceiver/go.mod index 403ec4fce2a4..1f5e2514321e 100644 --- a/receiver/dotnetdiagnosticsreceiver/go.mod +++ b/receiver/dotnetdiagnosticsreceiver/go.mod @@ -4,11 +4,12 @@ go 1.18 require ( github.com/stretchr/testify v1.8.1 - go.opentelemetry.io/collector v0.66.1-0.20221128222955-4ff1ff379b90 - go.opentelemetry.io/collector/component v0.66.1-0.20221128222955-4ff1ff379b90 - go.opentelemetry.io/collector/consumer v0.66.1-0.20221128222955-4ff1ff379b90 - go.opentelemetry.io/collector/pdata v0.66.1-0.20221128222955-4ff1ff379b90 - go.uber.org/zap v1.23.0 + go.opentelemetry.io/collector v0.66.1-0.20221202005155-1c54042beb70 + go.opentelemetry.io/collector/component v0.66.1-0.20221202005155-1c54042beb70 + go.opentelemetry.io/collector/confmap v0.0.0-20221201172708-2bdff61fa52a + go.opentelemetry.io/collector/consumer v0.66.1-0.20221202005155-1c54042beb70 + go.opentelemetry.io/collector/pdata v0.66.1-0.20221202005155-1c54042beb70 + go.uber.org/zap v1.24.0 ) require ( @@ -27,7 +28,7 @@ require ( github.com/pelletier/go-toml v1.9.4 // indirect github.com/pmezard/go-difflib v1.0.0 // indirect go.opencensus.io v0.24.0 // indirect - go.opentelemetry.io/collector/featuregate v0.66.1-0.20221128222955-4ff1ff379b90 // indirect + go.opentelemetry.io/collector/featuregate v0.66.1-0.20221202005155-1c54042beb70 // 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 adafaba3226a..8937b9e112dd 100644 --- a/receiver/dotnetdiagnosticsreceiver/go.sum +++ b/receiver/dotnetdiagnosticsreceiver/go.sum @@ -284,16 +284,18 @@ go.etcd.io/etcd/client/pkg/v3 v3.5.4/go.mod h1:IJHfcCEKxYu1Os13ZdwCwIUTUVGYTSAM3 go.etcd.io/etcd/client/v3 v3.5.4/go.mod h1:ZaRkVgBZC+L+dLCjTcF1hRXpgZXQPOvnA/Ak/gq3kiY= go.opencensus.io v0.24.0 h1:y73uSU6J157QMP2kn2r30vwW1A2W2WFwSCGnAVxeaD0= go.opencensus.io v0.24.0/go.mod h1:vNK8G9p7aAivkbmorf4v+7Hgx+Zs0yY+0fOtgBfjQKo= -go.opentelemetry.io/collector v0.66.1-0.20221128222955-4ff1ff379b90 h1:yRe05/jMdzH4TFHfndZ5h2o2hKBK/79W72j8w51qNsI= -go.opentelemetry.io/collector v0.66.1-0.20221128222955-4ff1ff379b90/go.mod h1:hE6jCs+0rfiufCrVPucKZTMwfHit1okfDPnwPT2eW1I= -go.opentelemetry.io/collector/component v0.66.1-0.20221128222955-4ff1ff379b90 h1:AYSNTXbezhNg43EuYdVVcgxE/2gBVrm00FDx4DOmQVg= -go.opentelemetry.io/collector/component v0.66.1-0.20221128222955-4ff1ff379b90/go.mod h1:0c84EqXUhvYe6KW7hJfh76tiI/5yjWCH2amwyQ06XLM= -go.opentelemetry.io/collector/consumer v0.66.1-0.20221128222955-4ff1ff379b90 h1:nzNXVfC1FzXBXCLMzbMv+qK3E4EGiNsnMhfVsBd2yzc= -go.opentelemetry.io/collector/consumer v0.66.1-0.20221128222955-4ff1ff379b90/go.mod h1:WtoRZa5SnxQO1ZEQdVxYpFcXCmq62rakv0oUSlPO0NQ= -go.opentelemetry.io/collector/featuregate v0.66.1-0.20221128222955-4ff1ff379b90 h1:UuJSFWbi9XxyNZsJKZuvpWg35BgRbcCGFH+38V2MAdw= -go.opentelemetry.io/collector/featuregate v0.66.1-0.20221128222955-4ff1ff379b90/go.mod h1:tewuFKJYalWBU0bmNKg++MC1ipINXUr6szYzOw2p1GI= -go.opentelemetry.io/collector/pdata v0.66.1-0.20221128222955-4ff1ff379b90 h1:Vu4S4jSNcd0VFPzxQNO4+UqGwnes1xJDoFLPRiWHm8I= -go.opentelemetry.io/collector/pdata v0.66.1-0.20221128222955-4ff1ff379b90/go.mod h1:pqyaznLzk21m+1KL6fwOsRryRELL+zNM0qiVSn0MbVc= +go.opentelemetry.io/collector v0.66.1-0.20221202005155-1c54042beb70 h1:INB2CsOtqqrija2KvMuIpbBQ3qX1BECEeR+d0NJX+oM= +go.opentelemetry.io/collector v0.66.1-0.20221202005155-1c54042beb70/go.mod h1:d0NHkHyANJy3HDTvYE/PoylMShUmFIbiir89ieI0X0c= +go.opentelemetry.io/collector/component v0.66.1-0.20221202005155-1c54042beb70 h1:dEoJhzCmRShgmVro/kXm6pouGElgxkH2DsvanzCeZtU= +go.opentelemetry.io/collector/component v0.66.1-0.20221202005155-1c54042beb70/go.mod h1:OsVnvFFe38QSpcuZlQ8cvarDzcloCexgQ1/B2m80F6U= +go.opentelemetry.io/collector/confmap v0.0.0-20221201172708-2bdff61fa52a h1:2TscCXAQASO2kU9xHcMIUM/FP29fiQIRTilZmliq/7I= +go.opentelemetry.io/collector/confmap v0.0.0-20221201172708-2bdff61fa52a/go.mod h1:qJ3e8bA8h4wz/jYlbeEUafVHdrU7DkpStnmIUAz6VTQ= +go.opentelemetry.io/collector/consumer v0.66.1-0.20221202005155-1c54042beb70 h1:XwpVjI1KeKGPXOZBLefGILMziPYuNf6IzbmiIEsIyI0= +go.opentelemetry.io/collector/consumer v0.66.1-0.20221202005155-1c54042beb70/go.mod h1:EWVBcSGcIcmeDGTnIboc/aqa3agsBeH8/q7yFWG7xVc= +go.opentelemetry.io/collector/featuregate v0.66.1-0.20221202005155-1c54042beb70 h1:V0tf4ebciqIs07jFATfLGdUpLRaEsi+AiWuA/in0G8Y= +go.opentelemetry.io/collector/featuregate v0.66.1-0.20221202005155-1c54042beb70/go.mod h1:tewuFKJYalWBU0bmNKg++MC1ipINXUr6szYzOw2p1GI= +go.opentelemetry.io/collector/pdata v0.66.1-0.20221202005155-1c54042beb70 h1:TPOrxkEMvZzfBSwF3ct+kUUgKA5g8unkZZbKQvJweeA= +go.opentelemetry.io/collector/pdata v0.66.1-0.20221202005155-1c54042beb70/go.mod h1:pqyaznLzk21m+1KL6fwOsRryRELL+zNM0qiVSn0MbVc= 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= @@ -312,8 +314,8 @@ go.uber.org/multierr v1.6.0/go.mod h1:cdWPpRnG4AhwMwsgIHip0KRBQjJy5kYEpYjJxpXp9i go.uber.org/multierr v1.8.0 h1:dg6GjLku4EH+249NNmoIciG9N/jURbDG+pFlTkhzIC8= go.uber.org/multierr v1.8.0/go.mod h1:7EAYxJLBy9rStEaz58O2t4Uvip6FSURkq8/ppBp95ak= go.uber.org/zap v1.17.0/go.mod h1:MXVU+bhUf/A7Xi2HNOnopQOrmycQ5Ih87HtOu4q5SSo= -go.uber.org/zap v1.23.0 h1:OjGQ5KQDEUawVHxNwQgPpiypGHOxo2mNZsOqTak4fFY= -go.uber.org/zap v1.23.0/go.mod h1:D+nX8jyLsMHMYrln8A0rJjFt/T/9/bGgIhAqxv5URuY= +go.uber.org/zap v1.24.0 h1:FiJd5l1UOLj0wCgbSE0rwwXHzEdAZS6hiiSnxJN/D60= +go.uber.org/zap v1.24.0/go.mod h1:2kMP+WWQ8aoFoedH3T2sq6iJ2yDWpHbP0f6MQbS9Gkg= golang.org/x/crypto v0.0.0-20180904163835-0709b304e793/go.mod h1:6SG95UA2DQfeDnfUPMdvaQW0Q7yPrPDi9nlGo2tz2b4= golang.org/x/crypto v0.0.0-20190308221718-c2843e01d9a2/go.mod h1:djNgcEr1/C05ACkg1iLfiJU5Ep61QUkGW8qpdssI0+w= golang.org/x/crypto v0.0.0-20190923035154-9ee001bba392/go.mod h1:/lpIB1dKB+9EgE3H3cr1v9wB50oz8l4C4h62xy7jSTY= diff --git a/receiver/elasticsearchreceiver/go.mod b/receiver/elasticsearchreceiver/go.mod index 77ce8ce1a02f..a11c3cdea240 100644 --- a/receiver/elasticsearchreceiver/go.mod +++ b/receiver/elasticsearchreceiver/go.mod @@ -8,13 +8,14 @@ require ( github.com/open-telemetry/opentelemetry-collector-contrib/internal/scrapertest v0.66.0 github.com/stretchr/testify v1.8.1 github.com/testcontainers/testcontainers-go v0.15.0 - go.opentelemetry.io/collector v0.66.1-0.20221128222955-4ff1ff379b90 - go.opentelemetry.io/collector/component v0.66.1-0.20221128222955-4ff1ff379b90 - go.opentelemetry.io/collector/consumer v0.66.1-0.20221128222955-4ff1ff379b90 - go.opentelemetry.io/collector/featuregate v0.66.1-0.20221128222955-4ff1ff379b90 - go.opentelemetry.io/collector/pdata v0.66.1-0.20221128222955-4ff1ff379b90 + go.opentelemetry.io/collector v0.66.1-0.20221202005155-1c54042beb70 + go.opentelemetry.io/collector/component v0.66.1-0.20221202005155-1c54042beb70 + go.opentelemetry.io/collector/confmap v0.0.0-20221201172708-2bdff61fa52a + go.opentelemetry.io/collector/consumer v0.66.1-0.20221202005155-1c54042beb70 + go.opentelemetry.io/collector/featuregate v0.66.1-0.20221202005155-1c54042beb70 + go.opentelemetry.io/collector/pdata v0.66.1-0.20221202005155-1c54042beb70 go.uber.org/multierr v1.8.0 - go.uber.org/zap v1.23.0 + go.uber.org/zap v1.24.0 ) require ( diff --git a/receiver/elasticsearchreceiver/go.sum b/receiver/elasticsearchreceiver/go.sum index 6257b9b89177..a6325cfe00cb 100644 --- a/receiver/elasticsearchreceiver/go.sum +++ b/receiver/elasticsearchreceiver/go.sum @@ -832,16 +832,18 @@ go.opencensus.io v0.22.2/go.mod h1:yxeiOL68Rb0Xd1ddK5vPZ/oVn4vY4Ynel7k9FzqtOIw= go.opencensus.io v0.22.3/go.mod h1:yxeiOL68Rb0Xd1ddK5vPZ/oVn4vY4Ynel7k9FzqtOIw= go.opencensus.io v0.24.0 h1:y73uSU6J157QMP2kn2r30vwW1A2W2WFwSCGnAVxeaD0= go.opencensus.io v0.24.0/go.mod h1:vNK8G9p7aAivkbmorf4v+7Hgx+Zs0yY+0fOtgBfjQKo= -go.opentelemetry.io/collector v0.66.1-0.20221128222955-4ff1ff379b90 h1:yRe05/jMdzH4TFHfndZ5h2o2hKBK/79W72j8w51qNsI= -go.opentelemetry.io/collector v0.66.1-0.20221128222955-4ff1ff379b90/go.mod h1:hE6jCs+0rfiufCrVPucKZTMwfHit1okfDPnwPT2eW1I= -go.opentelemetry.io/collector/component v0.66.1-0.20221128222955-4ff1ff379b90 h1:AYSNTXbezhNg43EuYdVVcgxE/2gBVrm00FDx4DOmQVg= -go.opentelemetry.io/collector/component v0.66.1-0.20221128222955-4ff1ff379b90/go.mod h1:0c84EqXUhvYe6KW7hJfh76tiI/5yjWCH2amwyQ06XLM= -go.opentelemetry.io/collector/consumer v0.66.1-0.20221128222955-4ff1ff379b90 h1:nzNXVfC1FzXBXCLMzbMv+qK3E4EGiNsnMhfVsBd2yzc= -go.opentelemetry.io/collector/consumer v0.66.1-0.20221128222955-4ff1ff379b90/go.mod h1:WtoRZa5SnxQO1ZEQdVxYpFcXCmq62rakv0oUSlPO0NQ= -go.opentelemetry.io/collector/featuregate v0.66.1-0.20221128222955-4ff1ff379b90 h1:UuJSFWbi9XxyNZsJKZuvpWg35BgRbcCGFH+38V2MAdw= -go.opentelemetry.io/collector/featuregate v0.66.1-0.20221128222955-4ff1ff379b90/go.mod h1:tewuFKJYalWBU0bmNKg++MC1ipINXUr6szYzOw2p1GI= -go.opentelemetry.io/collector/pdata v0.66.1-0.20221128222955-4ff1ff379b90 h1:Vu4S4jSNcd0VFPzxQNO4+UqGwnes1xJDoFLPRiWHm8I= -go.opentelemetry.io/collector/pdata v0.66.1-0.20221128222955-4ff1ff379b90/go.mod h1:pqyaznLzk21m+1KL6fwOsRryRELL+zNM0qiVSn0MbVc= +go.opentelemetry.io/collector v0.66.1-0.20221202005155-1c54042beb70 h1:INB2CsOtqqrija2KvMuIpbBQ3qX1BECEeR+d0NJX+oM= +go.opentelemetry.io/collector v0.66.1-0.20221202005155-1c54042beb70/go.mod h1:d0NHkHyANJy3HDTvYE/PoylMShUmFIbiir89ieI0X0c= +go.opentelemetry.io/collector/component v0.66.1-0.20221202005155-1c54042beb70 h1:dEoJhzCmRShgmVro/kXm6pouGElgxkH2DsvanzCeZtU= +go.opentelemetry.io/collector/component v0.66.1-0.20221202005155-1c54042beb70/go.mod h1:OsVnvFFe38QSpcuZlQ8cvarDzcloCexgQ1/B2m80F6U= +go.opentelemetry.io/collector/confmap v0.0.0-20221201172708-2bdff61fa52a h1:2TscCXAQASO2kU9xHcMIUM/FP29fiQIRTilZmliq/7I= +go.opentelemetry.io/collector/confmap v0.0.0-20221201172708-2bdff61fa52a/go.mod h1:qJ3e8bA8h4wz/jYlbeEUafVHdrU7DkpStnmIUAz6VTQ= +go.opentelemetry.io/collector/consumer v0.66.1-0.20221202005155-1c54042beb70 h1:XwpVjI1KeKGPXOZBLefGILMziPYuNf6IzbmiIEsIyI0= +go.opentelemetry.io/collector/consumer v0.66.1-0.20221202005155-1c54042beb70/go.mod h1:EWVBcSGcIcmeDGTnIboc/aqa3agsBeH8/q7yFWG7xVc= +go.opentelemetry.io/collector/featuregate v0.66.1-0.20221202005155-1c54042beb70 h1:V0tf4ebciqIs07jFATfLGdUpLRaEsi+AiWuA/in0G8Y= +go.opentelemetry.io/collector/featuregate v0.66.1-0.20221202005155-1c54042beb70/go.mod h1:tewuFKJYalWBU0bmNKg++MC1ipINXUr6szYzOw2p1GI= +go.opentelemetry.io/collector/pdata v0.66.1-0.20221202005155-1c54042beb70 h1:TPOrxkEMvZzfBSwF3ct+kUUgKA5g8unkZZbKQvJweeA= +go.opentelemetry.io/collector/pdata v0.66.1-0.20221202005155-1c54042beb70/go.mod h1:pqyaznLzk21m+1KL6fwOsRryRELL+zNM0qiVSn0MbVc= 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= @@ -866,8 +868,8 @@ go.uber.org/multierr v1.8.0 h1:dg6GjLku4EH+249NNmoIciG9N/jURbDG+pFlTkhzIC8= go.uber.org/multierr v1.8.0/go.mod h1:7EAYxJLBy9rStEaz58O2t4Uvip6FSURkq8/ppBp95ak= go.uber.org/zap v1.10.0/go.mod h1:vwi/ZaCAaUcBkycHslxD9B2zi4UTXhF60s6SWpuDF0Q= go.uber.org/zap v1.17.0/go.mod h1:MXVU+bhUf/A7Xi2HNOnopQOrmycQ5Ih87HtOu4q5SSo= -go.uber.org/zap v1.23.0 h1:OjGQ5KQDEUawVHxNwQgPpiypGHOxo2mNZsOqTak4fFY= -go.uber.org/zap v1.23.0/go.mod h1:D+nX8jyLsMHMYrln8A0rJjFt/T/9/bGgIhAqxv5URuY= +go.uber.org/zap v1.24.0 h1:FiJd5l1UOLj0wCgbSE0rwwXHzEdAZS6hiiSnxJN/D60= +go.uber.org/zap v1.24.0/go.mod h1:2kMP+WWQ8aoFoedH3T2sq6iJ2yDWpHbP0f6MQbS9Gkg= golang.org/x/crypto v0.0.0-20171113213409-9f005a07e0d3/go.mod h1:6SG95UA2DQfeDnfUPMdvaQW0Q7yPrPDi9nlGo2tz2b4= golang.org/x/crypto v0.0.0-20180904163835-0709b304e793/go.mod h1:6SG95UA2DQfeDnfUPMdvaQW0Q7yPrPDi9nlGo2tz2b4= golang.org/x/crypto v0.0.0-20181009213950-7c1a557ab941/go.mod h1:6SG95UA2DQfeDnfUPMdvaQW0Q7yPrPDi9nlGo2tz2b4= diff --git a/receiver/expvarreceiver/go.mod b/receiver/expvarreceiver/go.mod index 3894688cee1e..17a7741f4a31 100644 --- a/receiver/expvarreceiver/go.mod +++ b/receiver/expvarreceiver/go.mod @@ -6,10 +6,11 @@ require ( github.com/google/go-cmp v0.5.9 github.com/open-telemetry/opentelemetry-collector-contrib/internal/scrapertest v0.66.0 github.com/stretchr/testify v1.8.1 - go.opentelemetry.io/collector v0.66.1-0.20221128222955-4ff1ff379b90 - go.opentelemetry.io/collector/component v0.66.1-0.20221128222955-4ff1ff379b90 - go.opentelemetry.io/collector/consumer v0.66.1-0.20221128222955-4ff1ff379b90 - go.opentelemetry.io/collector/pdata v0.66.1-0.20221128222955-4ff1ff379b90 + go.opentelemetry.io/collector v0.66.1-0.20221202005155-1c54042beb70 + go.opentelemetry.io/collector/component v0.66.1-0.20221202005155-1c54042beb70 + go.opentelemetry.io/collector/confmap v0.0.0-20221201172708-2bdff61fa52a + go.opentelemetry.io/collector/consumer v0.66.1-0.20221202005155-1c54042beb70 + go.opentelemetry.io/collector/pdata v0.66.1-0.20221202005155-1c54042beb70 ) require ( @@ -32,14 +33,14 @@ require ( github.com/rogpeppe/go-internal v1.8.1 // indirect github.com/rs/cors v1.8.2 // indirect go.opencensus.io v0.24.0 // indirect - go.opentelemetry.io/collector/featuregate v0.66.1-0.20221128222955-4ff1ff379b90 // indirect + go.opentelemetry.io/collector/featuregate v0.66.1-0.20221202005155-1c54042beb70 // 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 go.opentelemetry.io/otel/trace v1.11.1 // indirect go.uber.org/atomic v1.10.0 // indirect go.uber.org/multierr v1.8.0 // indirect - go.uber.org/zap v1.23.0 // indirect + go.uber.org/zap v1.24.0 // indirect golang.org/x/net v0.0.0-20220722155237-a158d28d115b // indirect golang.org/x/sys v0.2.0 // indirect golang.org/x/text v0.4.0 // indirect diff --git a/receiver/expvarreceiver/go.sum b/receiver/expvarreceiver/go.sum index ac086592ba10..2c288d09c6d9 100644 --- a/receiver/expvarreceiver/go.sum +++ b/receiver/expvarreceiver/go.sum @@ -291,16 +291,18 @@ go.etcd.io/etcd/client/pkg/v3 v3.5.4/go.mod h1:IJHfcCEKxYu1Os13ZdwCwIUTUVGYTSAM3 go.etcd.io/etcd/client/v3 v3.5.4/go.mod h1:ZaRkVgBZC+L+dLCjTcF1hRXpgZXQPOvnA/Ak/gq3kiY= go.opencensus.io v0.24.0 h1:y73uSU6J157QMP2kn2r30vwW1A2W2WFwSCGnAVxeaD0= go.opencensus.io v0.24.0/go.mod h1:vNK8G9p7aAivkbmorf4v+7Hgx+Zs0yY+0fOtgBfjQKo= -go.opentelemetry.io/collector v0.66.1-0.20221128222955-4ff1ff379b90 h1:yRe05/jMdzH4TFHfndZ5h2o2hKBK/79W72j8w51qNsI= -go.opentelemetry.io/collector v0.66.1-0.20221128222955-4ff1ff379b90/go.mod h1:hE6jCs+0rfiufCrVPucKZTMwfHit1okfDPnwPT2eW1I= -go.opentelemetry.io/collector/component v0.66.1-0.20221128222955-4ff1ff379b90 h1:AYSNTXbezhNg43EuYdVVcgxE/2gBVrm00FDx4DOmQVg= -go.opentelemetry.io/collector/component v0.66.1-0.20221128222955-4ff1ff379b90/go.mod h1:0c84EqXUhvYe6KW7hJfh76tiI/5yjWCH2amwyQ06XLM= -go.opentelemetry.io/collector/consumer v0.66.1-0.20221128222955-4ff1ff379b90 h1:nzNXVfC1FzXBXCLMzbMv+qK3E4EGiNsnMhfVsBd2yzc= -go.opentelemetry.io/collector/consumer v0.66.1-0.20221128222955-4ff1ff379b90/go.mod h1:WtoRZa5SnxQO1ZEQdVxYpFcXCmq62rakv0oUSlPO0NQ= -go.opentelemetry.io/collector/featuregate v0.66.1-0.20221128222955-4ff1ff379b90 h1:UuJSFWbi9XxyNZsJKZuvpWg35BgRbcCGFH+38V2MAdw= -go.opentelemetry.io/collector/featuregate v0.66.1-0.20221128222955-4ff1ff379b90/go.mod h1:tewuFKJYalWBU0bmNKg++MC1ipINXUr6szYzOw2p1GI= -go.opentelemetry.io/collector/pdata v0.66.1-0.20221128222955-4ff1ff379b90 h1:Vu4S4jSNcd0VFPzxQNO4+UqGwnes1xJDoFLPRiWHm8I= -go.opentelemetry.io/collector/pdata v0.66.1-0.20221128222955-4ff1ff379b90/go.mod h1:pqyaznLzk21m+1KL6fwOsRryRELL+zNM0qiVSn0MbVc= +go.opentelemetry.io/collector v0.66.1-0.20221202005155-1c54042beb70 h1:INB2CsOtqqrija2KvMuIpbBQ3qX1BECEeR+d0NJX+oM= +go.opentelemetry.io/collector v0.66.1-0.20221202005155-1c54042beb70/go.mod h1:d0NHkHyANJy3HDTvYE/PoylMShUmFIbiir89ieI0X0c= +go.opentelemetry.io/collector/component v0.66.1-0.20221202005155-1c54042beb70 h1:dEoJhzCmRShgmVro/kXm6pouGElgxkH2DsvanzCeZtU= +go.opentelemetry.io/collector/component v0.66.1-0.20221202005155-1c54042beb70/go.mod h1:OsVnvFFe38QSpcuZlQ8cvarDzcloCexgQ1/B2m80F6U= +go.opentelemetry.io/collector/confmap v0.0.0-20221201172708-2bdff61fa52a h1:2TscCXAQASO2kU9xHcMIUM/FP29fiQIRTilZmliq/7I= +go.opentelemetry.io/collector/confmap v0.0.0-20221201172708-2bdff61fa52a/go.mod h1:qJ3e8bA8h4wz/jYlbeEUafVHdrU7DkpStnmIUAz6VTQ= +go.opentelemetry.io/collector/consumer v0.66.1-0.20221202005155-1c54042beb70 h1:XwpVjI1KeKGPXOZBLefGILMziPYuNf6IzbmiIEsIyI0= +go.opentelemetry.io/collector/consumer v0.66.1-0.20221202005155-1c54042beb70/go.mod h1:EWVBcSGcIcmeDGTnIboc/aqa3agsBeH8/q7yFWG7xVc= +go.opentelemetry.io/collector/featuregate v0.66.1-0.20221202005155-1c54042beb70 h1:V0tf4ebciqIs07jFATfLGdUpLRaEsi+AiWuA/in0G8Y= +go.opentelemetry.io/collector/featuregate v0.66.1-0.20221202005155-1c54042beb70/go.mod h1:tewuFKJYalWBU0bmNKg++MC1ipINXUr6szYzOw2p1GI= +go.opentelemetry.io/collector/pdata v0.66.1-0.20221202005155-1c54042beb70 h1:TPOrxkEMvZzfBSwF3ct+kUUgKA5g8unkZZbKQvJweeA= +go.opentelemetry.io/collector/pdata v0.66.1-0.20221202005155-1c54042beb70/go.mod h1:pqyaznLzk21m+1KL6fwOsRryRELL+zNM0qiVSn0MbVc= 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= @@ -321,8 +323,8 @@ go.uber.org/multierr v1.6.0/go.mod h1:cdWPpRnG4AhwMwsgIHip0KRBQjJy5kYEpYjJxpXp9i go.uber.org/multierr v1.8.0 h1:dg6GjLku4EH+249NNmoIciG9N/jURbDG+pFlTkhzIC8= go.uber.org/multierr v1.8.0/go.mod h1:7EAYxJLBy9rStEaz58O2t4Uvip6FSURkq8/ppBp95ak= go.uber.org/zap v1.17.0/go.mod h1:MXVU+bhUf/A7Xi2HNOnopQOrmycQ5Ih87HtOu4q5SSo= -go.uber.org/zap v1.23.0 h1:OjGQ5KQDEUawVHxNwQgPpiypGHOxo2mNZsOqTak4fFY= -go.uber.org/zap v1.23.0/go.mod h1:D+nX8jyLsMHMYrln8A0rJjFt/T/9/bGgIhAqxv5URuY= +go.uber.org/zap v1.24.0 h1:FiJd5l1UOLj0wCgbSE0rwwXHzEdAZS6hiiSnxJN/D60= +go.uber.org/zap v1.24.0/go.mod h1:2kMP+WWQ8aoFoedH3T2sq6iJ2yDWpHbP0f6MQbS9Gkg= golang.org/x/crypto v0.0.0-20180904163835-0709b304e793/go.mod h1:6SG95UA2DQfeDnfUPMdvaQW0Q7yPrPDi9nlGo2tz2b4= golang.org/x/crypto v0.0.0-20190308221718-c2843e01d9a2/go.mod h1:djNgcEr1/C05ACkg1iLfiJU5Ep61QUkGW8qpdssI0+w= golang.org/x/crypto v0.0.0-20190923035154-9ee001bba392/go.mod h1:/lpIB1dKB+9EgE3H3cr1v9wB50oz8l4C4h62xy7jSTY= diff --git a/receiver/filelogreceiver/go.mod b/receiver/filelogreceiver/go.mod index 4946f34ceb3c..e8047868588a 100644 --- a/receiver/filelogreceiver/go.mod +++ b/receiver/filelogreceiver/go.mod @@ -7,11 +7,12 @@ require ( github.com/open-telemetry/opentelemetry-collector-contrib/extension/storage v0.66.0 github.com/open-telemetry/opentelemetry-collector-contrib/pkg/stanza v0.66.0 github.com/stretchr/testify v1.8.1 - go.opentelemetry.io/collector v0.66.1-0.20221128222955-4ff1ff379b90 - go.opentelemetry.io/collector/component v0.66.1-0.20221128222955-4ff1ff379b90 - go.opentelemetry.io/collector/consumer v0.66.1-0.20221128222955-4ff1ff379b90 - go.opentelemetry.io/collector/pdata v0.66.1-0.20221128222955-4ff1ff379b90 - go.uber.org/zap v1.23.0 + go.opentelemetry.io/collector v0.66.1-0.20221202005155-1c54042beb70 + go.opentelemetry.io/collector/component v0.66.1-0.20221202005155-1c54042beb70 + go.opentelemetry.io/collector/confmap v0.0.0-20221201172708-2bdff61fa52a + go.opentelemetry.io/collector/consumer v0.66.1-0.20221202005155-1c54042beb70 + go.opentelemetry.io/collector/pdata v0.66.1-0.20221202005155-1c54042beb70 + go.uber.org/zap v1.24.0 ) require ( @@ -31,7 +32,7 @@ require ( github.com/pmezard/go-difflib v1.0.0 // indirect github.com/rogpeppe/go-internal v1.8.1 // indirect go.opencensus.io v0.24.0 // indirect - go.opentelemetry.io/collector/featuregate v0.66.1-0.20221128222955-4ff1ff379b90 // indirect + go.opentelemetry.io/collector/featuregate v0.66.1-0.20221202005155-1c54042beb70 // 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 bad9309f9f99..0ed1fc5003ad 100644 --- a/receiver/filelogreceiver/go.sum +++ b/receiver/filelogreceiver/go.sum @@ -303,16 +303,18 @@ go.etcd.io/etcd/client/pkg/v3 v3.5.4/go.mod h1:IJHfcCEKxYu1Os13ZdwCwIUTUVGYTSAM3 go.etcd.io/etcd/client/v3 v3.5.4/go.mod h1:ZaRkVgBZC+L+dLCjTcF1hRXpgZXQPOvnA/Ak/gq3kiY= go.opencensus.io v0.24.0 h1:y73uSU6J157QMP2kn2r30vwW1A2W2WFwSCGnAVxeaD0= go.opencensus.io v0.24.0/go.mod h1:vNK8G9p7aAivkbmorf4v+7Hgx+Zs0yY+0fOtgBfjQKo= -go.opentelemetry.io/collector v0.66.1-0.20221128222955-4ff1ff379b90 h1:yRe05/jMdzH4TFHfndZ5h2o2hKBK/79W72j8w51qNsI= -go.opentelemetry.io/collector v0.66.1-0.20221128222955-4ff1ff379b90/go.mod h1:hE6jCs+0rfiufCrVPucKZTMwfHit1okfDPnwPT2eW1I= -go.opentelemetry.io/collector/component v0.66.1-0.20221128222955-4ff1ff379b90 h1:AYSNTXbezhNg43EuYdVVcgxE/2gBVrm00FDx4DOmQVg= -go.opentelemetry.io/collector/component v0.66.1-0.20221128222955-4ff1ff379b90/go.mod h1:0c84EqXUhvYe6KW7hJfh76tiI/5yjWCH2amwyQ06XLM= -go.opentelemetry.io/collector/consumer v0.66.1-0.20221128222955-4ff1ff379b90 h1:nzNXVfC1FzXBXCLMzbMv+qK3E4EGiNsnMhfVsBd2yzc= -go.opentelemetry.io/collector/consumer v0.66.1-0.20221128222955-4ff1ff379b90/go.mod h1:WtoRZa5SnxQO1ZEQdVxYpFcXCmq62rakv0oUSlPO0NQ= -go.opentelemetry.io/collector/featuregate v0.66.1-0.20221128222955-4ff1ff379b90 h1:UuJSFWbi9XxyNZsJKZuvpWg35BgRbcCGFH+38V2MAdw= -go.opentelemetry.io/collector/featuregate v0.66.1-0.20221128222955-4ff1ff379b90/go.mod h1:tewuFKJYalWBU0bmNKg++MC1ipINXUr6szYzOw2p1GI= -go.opentelemetry.io/collector/pdata v0.66.1-0.20221128222955-4ff1ff379b90 h1:Vu4S4jSNcd0VFPzxQNO4+UqGwnes1xJDoFLPRiWHm8I= -go.opentelemetry.io/collector/pdata v0.66.1-0.20221128222955-4ff1ff379b90/go.mod h1:pqyaznLzk21m+1KL6fwOsRryRELL+zNM0qiVSn0MbVc= +go.opentelemetry.io/collector v0.66.1-0.20221202005155-1c54042beb70 h1:INB2CsOtqqrija2KvMuIpbBQ3qX1BECEeR+d0NJX+oM= +go.opentelemetry.io/collector v0.66.1-0.20221202005155-1c54042beb70/go.mod h1:d0NHkHyANJy3HDTvYE/PoylMShUmFIbiir89ieI0X0c= +go.opentelemetry.io/collector/component v0.66.1-0.20221202005155-1c54042beb70 h1:dEoJhzCmRShgmVro/kXm6pouGElgxkH2DsvanzCeZtU= +go.opentelemetry.io/collector/component v0.66.1-0.20221202005155-1c54042beb70/go.mod h1:OsVnvFFe38QSpcuZlQ8cvarDzcloCexgQ1/B2m80F6U= +go.opentelemetry.io/collector/confmap v0.0.0-20221201172708-2bdff61fa52a h1:2TscCXAQASO2kU9xHcMIUM/FP29fiQIRTilZmliq/7I= +go.opentelemetry.io/collector/confmap v0.0.0-20221201172708-2bdff61fa52a/go.mod h1:qJ3e8bA8h4wz/jYlbeEUafVHdrU7DkpStnmIUAz6VTQ= +go.opentelemetry.io/collector/consumer v0.66.1-0.20221202005155-1c54042beb70 h1:XwpVjI1KeKGPXOZBLefGILMziPYuNf6IzbmiIEsIyI0= +go.opentelemetry.io/collector/consumer v0.66.1-0.20221202005155-1c54042beb70/go.mod h1:EWVBcSGcIcmeDGTnIboc/aqa3agsBeH8/q7yFWG7xVc= +go.opentelemetry.io/collector/featuregate v0.66.1-0.20221202005155-1c54042beb70 h1:V0tf4ebciqIs07jFATfLGdUpLRaEsi+AiWuA/in0G8Y= +go.opentelemetry.io/collector/featuregate v0.66.1-0.20221202005155-1c54042beb70/go.mod h1:tewuFKJYalWBU0bmNKg++MC1ipINXUr6szYzOw2p1GI= +go.opentelemetry.io/collector/pdata v0.66.1-0.20221202005155-1c54042beb70 h1:TPOrxkEMvZzfBSwF3ct+kUUgKA5g8unkZZbKQvJweeA= +go.opentelemetry.io/collector/pdata v0.66.1-0.20221202005155-1c54042beb70/go.mod h1:pqyaznLzk21m+1KL6fwOsRryRELL+zNM0qiVSn0MbVc= 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= @@ -331,8 +333,8 @@ go.uber.org/multierr v1.6.0/go.mod h1:cdWPpRnG4AhwMwsgIHip0KRBQjJy5kYEpYjJxpXp9i go.uber.org/multierr v1.8.0 h1:dg6GjLku4EH+249NNmoIciG9N/jURbDG+pFlTkhzIC8= go.uber.org/multierr v1.8.0/go.mod h1:7EAYxJLBy9rStEaz58O2t4Uvip6FSURkq8/ppBp95ak= go.uber.org/zap v1.17.0/go.mod h1:MXVU+bhUf/A7Xi2HNOnopQOrmycQ5Ih87HtOu4q5SSo= -go.uber.org/zap v1.23.0 h1:OjGQ5KQDEUawVHxNwQgPpiypGHOxo2mNZsOqTak4fFY= -go.uber.org/zap v1.23.0/go.mod h1:D+nX8jyLsMHMYrln8A0rJjFt/T/9/bGgIhAqxv5URuY= +go.uber.org/zap v1.24.0 h1:FiJd5l1UOLj0wCgbSE0rwwXHzEdAZS6hiiSnxJN/D60= +go.uber.org/zap v1.24.0/go.mod h1:2kMP+WWQ8aoFoedH3T2sq6iJ2yDWpHbP0f6MQbS9Gkg= golang.org/x/crypto v0.0.0-20180904163835-0709b304e793/go.mod h1:6SG95UA2DQfeDnfUPMdvaQW0Q7yPrPDi9nlGo2tz2b4= golang.org/x/crypto v0.0.0-20190308221718-c2843e01d9a2/go.mod h1:djNgcEr1/C05ACkg1iLfiJU5Ep61QUkGW8qpdssI0+w= golang.org/x/crypto v0.0.0-20190923035154-9ee001bba392/go.mod h1:/lpIB1dKB+9EgE3H3cr1v9wB50oz8l4C4h62xy7jSTY= diff --git a/receiver/filelogreceiver/storage_test.go b/receiver/filelogreceiver/storage_test.go index c7b384242142..15713867d8fd 100644 --- a/receiver/filelogreceiver/storage_test.go +++ b/receiver/filelogreceiver/storage_test.go @@ -39,7 +39,7 @@ func TestStorage(t *testing.T) { logsDir := t.TempDir() storageDir := t.TempDir() - extID := storagetest.NewFileBackedStorageExtension("test", storageDir).ID() + extID := storagetest.NewFileBackedStorageExtension("test", storageDir).ID f := NewFactory() @@ -50,7 +50,7 @@ func TestStorage(t *testing.T) { logger := newRecallLogger(t, logsDir) ext := storagetest.NewFileBackedStorageExtension("test", storageDir) - host := storagetest.NewStorageHost().WithExtension(ext.ID(), ext) + host := storagetest.NewStorageHost().WithExtension(ext.ID, ext) sink := new(consumertest.LogsSink) rcvr, err := f.CreateLogsReceiver(ctx, componenttest.NewNopReceiverCreateSettings(), cfg, sink) require.NoError(t, err, "failed to create receiver") @@ -82,7 +82,7 @@ func TestStorage(t *testing.T) { // Start the components again ext = storagetest.NewFileBackedStorageExtension("test", storageDir) - host = storagetest.NewStorageHost().WithExtension(ext.ID(), ext) + host = storagetest.NewStorageHost().WithExtension(ext.ID, ext) rcvr, err = f.CreateLogsReceiver(ctx, componenttest.NewNopReceiverCreateSettings(), cfg, sink) require.NoError(t, err, "failed to create receiver") require.NoError(t, rcvr.Start(ctx, host)) @@ -127,7 +127,7 @@ func TestStorage(t *testing.T) { // Start the components again ext = storagetest.NewFileBackedStorageExtension("test", storageDir) - host = storagetest.NewStorageHost().WithExtension(ext.ID(), ext) + host = storagetest.NewStorageHost().WithExtension(ext.ID, ext) rcvr, err = f.CreateLogsReceiver(ctx, componenttest.NewNopReceiverCreateSettings(), cfg, sink) require.NoError(t, err, "failed to create receiver") require.NoError(t, rcvr.Start(ctx, host)) diff --git a/receiver/flinkmetricsreceiver/go.mod b/receiver/flinkmetricsreceiver/go.mod index 7f5816f1f8da..b2b8227821c0 100644 --- a/receiver/flinkmetricsreceiver/go.mod +++ b/receiver/flinkmetricsreceiver/go.mod @@ -6,11 +6,12 @@ require ( github.com/open-telemetry/opentelemetry-collector-contrib/internal/scrapertest v0.66.0 github.com/stretchr/testify v1.8.1 github.com/testcontainers/testcontainers-go v0.15.0 - go.opentelemetry.io/collector v0.66.1-0.20221128222955-4ff1ff379b90 - go.opentelemetry.io/collector/component v0.66.1-0.20221128222955-4ff1ff379b90 - go.opentelemetry.io/collector/consumer v0.66.1-0.20221128222955-4ff1ff379b90 - go.opentelemetry.io/collector/pdata v0.66.1-0.20221128222955-4ff1ff379b90 - go.uber.org/zap v1.23.0 + go.opentelemetry.io/collector v0.66.1-0.20221202005155-1c54042beb70 + go.opentelemetry.io/collector/component v0.66.1-0.20221202005155-1c54042beb70 + go.opentelemetry.io/collector/confmap v0.0.0-20221201172708-2bdff61fa52a + go.opentelemetry.io/collector/consumer v0.66.1-0.20221202005155-1c54042beb70 + go.opentelemetry.io/collector/pdata v0.66.1-0.20221202005155-1c54042beb70 + go.uber.org/zap v1.24.0 ) require ( @@ -55,7 +56,7 @@ require ( github.com/sirupsen/logrus v1.8.1 // indirect github.com/stretchr/objx v0.5.0 // indirect go.opencensus.io v0.24.0 // indirect - go.opentelemetry.io/collector/featuregate v0.66.1-0.20221128222955-4ff1ff379b90 // indirect + go.opentelemetry.io/collector/featuregate v0.66.1-0.20221202005155-1c54042beb70 // 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 165b7b550349..d06088c85bb9 100644 --- a/receiver/flinkmetricsreceiver/go.sum +++ b/receiver/flinkmetricsreceiver/go.sum @@ -828,16 +828,18 @@ go.opencensus.io v0.22.2/go.mod h1:yxeiOL68Rb0Xd1ddK5vPZ/oVn4vY4Ynel7k9FzqtOIw= go.opencensus.io v0.22.3/go.mod h1:yxeiOL68Rb0Xd1ddK5vPZ/oVn4vY4Ynel7k9FzqtOIw= go.opencensus.io v0.24.0 h1:y73uSU6J157QMP2kn2r30vwW1A2W2WFwSCGnAVxeaD0= go.opencensus.io v0.24.0/go.mod h1:vNK8G9p7aAivkbmorf4v+7Hgx+Zs0yY+0fOtgBfjQKo= -go.opentelemetry.io/collector v0.66.1-0.20221128222955-4ff1ff379b90 h1:yRe05/jMdzH4TFHfndZ5h2o2hKBK/79W72j8w51qNsI= -go.opentelemetry.io/collector v0.66.1-0.20221128222955-4ff1ff379b90/go.mod h1:hE6jCs+0rfiufCrVPucKZTMwfHit1okfDPnwPT2eW1I= -go.opentelemetry.io/collector/component v0.66.1-0.20221128222955-4ff1ff379b90 h1:AYSNTXbezhNg43EuYdVVcgxE/2gBVrm00FDx4DOmQVg= -go.opentelemetry.io/collector/component v0.66.1-0.20221128222955-4ff1ff379b90/go.mod h1:0c84EqXUhvYe6KW7hJfh76tiI/5yjWCH2amwyQ06XLM= -go.opentelemetry.io/collector/consumer v0.66.1-0.20221128222955-4ff1ff379b90 h1:nzNXVfC1FzXBXCLMzbMv+qK3E4EGiNsnMhfVsBd2yzc= -go.opentelemetry.io/collector/consumer v0.66.1-0.20221128222955-4ff1ff379b90/go.mod h1:WtoRZa5SnxQO1ZEQdVxYpFcXCmq62rakv0oUSlPO0NQ= -go.opentelemetry.io/collector/featuregate v0.66.1-0.20221128222955-4ff1ff379b90 h1:UuJSFWbi9XxyNZsJKZuvpWg35BgRbcCGFH+38V2MAdw= -go.opentelemetry.io/collector/featuregate v0.66.1-0.20221128222955-4ff1ff379b90/go.mod h1:tewuFKJYalWBU0bmNKg++MC1ipINXUr6szYzOw2p1GI= -go.opentelemetry.io/collector/pdata v0.66.1-0.20221128222955-4ff1ff379b90 h1:Vu4S4jSNcd0VFPzxQNO4+UqGwnes1xJDoFLPRiWHm8I= -go.opentelemetry.io/collector/pdata v0.66.1-0.20221128222955-4ff1ff379b90/go.mod h1:pqyaznLzk21m+1KL6fwOsRryRELL+zNM0qiVSn0MbVc= +go.opentelemetry.io/collector v0.66.1-0.20221202005155-1c54042beb70 h1:INB2CsOtqqrija2KvMuIpbBQ3qX1BECEeR+d0NJX+oM= +go.opentelemetry.io/collector v0.66.1-0.20221202005155-1c54042beb70/go.mod h1:d0NHkHyANJy3HDTvYE/PoylMShUmFIbiir89ieI0X0c= +go.opentelemetry.io/collector/component v0.66.1-0.20221202005155-1c54042beb70 h1:dEoJhzCmRShgmVro/kXm6pouGElgxkH2DsvanzCeZtU= +go.opentelemetry.io/collector/component v0.66.1-0.20221202005155-1c54042beb70/go.mod h1:OsVnvFFe38QSpcuZlQ8cvarDzcloCexgQ1/B2m80F6U= +go.opentelemetry.io/collector/confmap v0.0.0-20221201172708-2bdff61fa52a h1:2TscCXAQASO2kU9xHcMIUM/FP29fiQIRTilZmliq/7I= +go.opentelemetry.io/collector/confmap v0.0.0-20221201172708-2bdff61fa52a/go.mod h1:qJ3e8bA8h4wz/jYlbeEUafVHdrU7DkpStnmIUAz6VTQ= +go.opentelemetry.io/collector/consumer v0.66.1-0.20221202005155-1c54042beb70 h1:XwpVjI1KeKGPXOZBLefGILMziPYuNf6IzbmiIEsIyI0= +go.opentelemetry.io/collector/consumer v0.66.1-0.20221202005155-1c54042beb70/go.mod h1:EWVBcSGcIcmeDGTnIboc/aqa3agsBeH8/q7yFWG7xVc= +go.opentelemetry.io/collector/featuregate v0.66.1-0.20221202005155-1c54042beb70 h1:V0tf4ebciqIs07jFATfLGdUpLRaEsi+AiWuA/in0G8Y= +go.opentelemetry.io/collector/featuregate v0.66.1-0.20221202005155-1c54042beb70/go.mod h1:tewuFKJYalWBU0bmNKg++MC1ipINXUr6szYzOw2p1GI= +go.opentelemetry.io/collector/pdata v0.66.1-0.20221202005155-1c54042beb70 h1:TPOrxkEMvZzfBSwF3ct+kUUgKA5g8unkZZbKQvJweeA= +go.opentelemetry.io/collector/pdata v0.66.1-0.20221202005155-1c54042beb70/go.mod h1:pqyaznLzk21m+1KL6fwOsRryRELL+zNM0qiVSn0MbVc= 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= @@ -862,8 +864,8 @@ go.uber.org/multierr v1.8.0 h1:dg6GjLku4EH+249NNmoIciG9N/jURbDG+pFlTkhzIC8= go.uber.org/multierr v1.8.0/go.mod h1:7EAYxJLBy9rStEaz58O2t4Uvip6FSURkq8/ppBp95ak= go.uber.org/zap v1.10.0/go.mod h1:vwi/ZaCAaUcBkycHslxD9B2zi4UTXhF60s6SWpuDF0Q= go.uber.org/zap v1.17.0/go.mod h1:MXVU+bhUf/A7Xi2HNOnopQOrmycQ5Ih87HtOu4q5SSo= -go.uber.org/zap v1.23.0 h1:OjGQ5KQDEUawVHxNwQgPpiypGHOxo2mNZsOqTak4fFY= -go.uber.org/zap v1.23.0/go.mod h1:D+nX8jyLsMHMYrln8A0rJjFt/T/9/bGgIhAqxv5URuY= +go.uber.org/zap v1.24.0 h1:FiJd5l1UOLj0wCgbSE0rwwXHzEdAZS6hiiSnxJN/D60= +go.uber.org/zap v1.24.0/go.mod h1:2kMP+WWQ8aoFoedH3T2sq6iJ2yDWpHbP0f6MQbS9Gkg= golang.org/x/crypto v0.0.0-20171113213409-9f005a07e0d3/go.mod h1:6SG95UA2DQfeDnfUPMdvaQW0Q7yPrPDi9nlGo2tz2b4= golang.org/x/crypto v0.0.0-20180904163835-0709b304e793/go.mod h1:6SG95UA2DQfeDnfUPMdvaQW0Q7yPrPDi9nlGo2tz2b4= golang.org/x/crypto v0.0.0-20181009213950-7c1a557ab941/go.mod h1:6SG95UA2DQfeDnfUPMdvaQW0Q7yPrPDi9nlGo2tz2b4= diff --git a/receiver/fluentforwardreceiver/go.mod b/receiver/fluentforwardreceiver/go.mod index d5f1088fd3d4..669b56b58bbb 100644 --- a/receiver/fluentforwardreceiver/go.mod +++ b/receiver/fluentforwardreceiver/go.mod @@ -6,11 +6,12 @@ require ( github.com/stretchr/testify v1.8.1 github.com/tinylib/msgp v1.1.6 go.opencensus.io v0.24.0 - go.opentelemetry.io/collector v0.66.1-0.20221128222955-4ff1ff379b90 - go.opentelemetry.io/collector/component v0.66.1-0.20221128222955-4ff1ff379b90 - go.opentelemetry.io/collector/consumer v0.66.1-0.20221128222955-4ff1ff379b90 - go.opentelemetry.io/collector/pdata v0.66.1-0.20221128222955-4ff1ff379b90 - go.uber.org/zap v1.23.0 + go.opentelemetry.io/collector v0.66.1-0.20221202005155-1c54042beb70 + go.opentelemetry.io/collector/component v0.66.1-0.20221202005155-1c54042beb70 + go.opentelemetry.io/collector/confmap v0.0.0-20221201172708-2bdff61fa52a + go.opentelemetry.io/collector/consumer v0.66.1-0.20221202005155-1c54042beb70 + go.opentelemetry.io/collector/pdata v0.66.1-0.20221202005155-1c54042beb70 + go.uber.org/zap v1.24.0 ) require ( @@ -29,7 +30,7 @@ require ( github.com/pelletier/go-toml v1.9.4 // indirect github.com/philhofer/fwd v1.1.1 // indirect github.com/pmezard/go-difflib v1.0.0 // indirect - go.opentelemetry.io/collector/featuregate v0.66.1-0.20221128222955-4ff1ff379b90 // indirect + go.opentelemetry.io/collector/featuregate v0.66.1-0.20221202005155-1c54042beb70 // indirect go.opentelemetry.io/otel v1.11.1 // indirect go.opentelemetry.io/otel/metric v0.33.0 // indirect go.opentelemetry.io/otel/trace v1.11.1 // indirect diff --git a/receiver/fluentforwardreceiver/go.sum b/receiver/fluentforwardreceiver/go.sum index 1a91b6d961d9..717703e2c970 100644 --- a/receiver/fluentforwardreceiver/go.sum +++ b/receiver/fluentforwardreceiver/go.sum @@ -274,16 +274,18 @@ go.etcd.io/etcd/client/pkg/v3 v3.5.4/go.mod h1:IJHfcCEKxYu1Os13ZdwCwIUTUVGYTSAM3 go.etcd.io/etcd/client/v3 v3.5.4/go.mod h1:ZaRkVgBZC+L+dLCjTcF1hRXpgZXQPOvnA/Ak/gq3kiY= go.opencensus.io v0.24.0 h1:y73uSU6J157QMP2kn2r30vwW1A2W2WFwSCGnAVxeaD0= go.opencensus.io v0.24.0/go.mod h1:vNK8G9p7aAivkbmorf4v+7Hgx+Zs0yY+0fOtgBfjQKo= -go.opentelemetry.io/collector v0.66.1-0.20221128222955-4ff1ff379b90 h1:yRe05/jMdzH4TFHfndZ5h2o2hKBK/79W72j8w51qNsI= -go.opentelemetry.io/collector v0.66.1-0.20221128222955-4ff1ff379b90/go.mod h1:hE6jCs+0rfiufCrVPucKZTMwfHit1okfDPnwPT2eW1I= -go.opentelemetry.io/collector/component v0.66.1-0.20221128222955-4ff1ff379b90 h1:AYSNTXbezhNg43EuYdVVcgxE/2gBVrm00FDx4DOmQVg= -go.opentelemetry.io/collector/component v0.66.1-0.20221128222955-4ff1ff379b90/go.mod h1:0c84EqXUhvYe6KW7hJfh76tiI/5yjWCH2amwyQ06XLM= -go.opentelemetry.io/collector/consumer v0.66.1-0.20221128222955-4ff1ff379b90 h1:nzNXVfC1FzXBXCLMzbMv+qK3E4EGiNsnMhfVsBd2yzc= -go.opentelemetry.io/collector/consumer v0.66.1-0.20221128222955-4ff1ff379b90/go.mod h1:WtoRZa5SnxQO1ZEQdVxYpFcXCmq62rakv0oUSlPO0NQ= -go.opentelemetry.io/collector/featuregate v0.66.1-0.20221128222955-4ff1ff379b90 h1:UuJSFWbi9XxyNZsJKZuvpWg35BgRbcCGFH+38V2MAdw= -go.opentelemetry.io/collector/featuregate v0.66.1-0.20221128222955-4ff1ff379b90/go.mod h1:tewuFKJYalWBU0bmNKg++MC1ipINXUr6szYzOw2p1GI= -go.opentelemetry.io/collector/pdata v0.66.1-0.20221128222955-4ff1ff379b90 h1:Vu4S4jSNcd0VFPzxQNO4+UqGwnes1xJDoFLPRiWHm8I= -go.opentelemetry.io/collector/pdata v0.66.1-0.20221128222955-4ff1ff379b90/go.mod h1:pqyaznLzk21m+1KL6fwOsRryRELL+zNM0qiVSn0MbVc= +go.opentelemetry.io/collector v0.66.1-0.20221202005155-1c54042beb70 h1:INB2CsOtqqrija2KvMuIpbBQ3qX1BECEeR+d0NJX+oM= +go.opentelemetry.io/collector v0.66.1-0.20221202005155-1c54042beb70/go.mod h1:d0NHkHyANJy3HDTvYE/PoylMShUmFIbiir89ieI0X0c= +go.opentelemetry.io/collector/component v0.66.1-0.20221202005155-1c54042beb70 h1:dEoJhzCmRShgmVro/kXm6pouGElgxkH2DsvanzCeZtU= +go.opentelemetry.io/collector/component v0.66.1-0.20221202005155-1c54042beb70/go.mod h1:OsVnvFFe38QSpcuZlQ8cvarDzcloCexgQ1/B2m80F6U= +go.opentelemetry.io/collector/confmap v0.0.0-20221201172708-2bdff61fa52a h1:2TscCXAQASO2kU9xHcMIUM/FP29fiQIRTilZmliq/7I= +go.opentelemetry.io/collector/confmap v0.0.0-20221201172708-2bdff61fa52a/go.mod h1:qJ3e8bA8h4wz/jYlbeEUafVHdrU7DkpStnmIUAz6VTQ= +go.opentelemetry.io/collector/consumer v0.66.1-0.20221202005155-1c54042beb70 h1:XwpVjI1KeKGPXOZBLefGILMziPYuNf6IzbmiIEsIyI0= +go.opentelemetry.io/collector/consumer v0.66.1-0.20221202005155-1c54042beb70/go.mod h1:EWVBcSGcIcmeDGTnIboc/aqa3agsBeH8/q7yFWG7xVc= +go.opentelemetry.io/collector/featuregate v0.66.1-0.20221202005155-1c54042beb70 h1:V0tf4ebciqIs07jFATfLGdUpLRaEsi+AiWuA/in0G8Y= +go.opentelemetry.io/collector/featuregate v0.66.1-0.20221202005155-1c54042beb70/go.mod h1:tewuFKJYalWBU0bmNKg++MC1ipINXUr6szYzOw2p1GI= +go.opentelemetry.io/collector/pdata v0.66.1-0.20221202005155-1c54042beb70 h1:TPOrxkEMvZzfBSwF3ct+kUUgKA5g8unkZZbKQvJweeA= +go.opentelemetry.io/collector/pdata v0.66.1-0.20221202005155-1c54042beb70/go.mod h1:pqyaznLzk21m+1KL6fwOsRryRELL+zNM0qiVSn0MbVc= 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= @@ -299,8 +301,8 @@ go.uber.org/multierr v1.6.0/go.mod h1:cdWPpRnG4AhwMwsgIHip0KRBQjJy5kYEpYjJxpXp9i go.uber.org/multierr v1.8.0 h1:dg6GjLku4EH+249NNmoIciG9N/jURbDG+pFlTkhzIC8= go.uber.org/multierr v1.8.0/go.mod h1:7EAYxJLBy9rStEaz58O2t4Uvip6FSURkq8/ppBp95ak= go.uber.org/zap v1.17.0/go.mod h1:MXVU+bhUf/A7Xi2HNOnopQOrmycQ5Ih87HtOu4q5SSo= -go.uber.org/zap v1.23.0 h1:OjGQ5KQDEUawVHxNwQgPpiypGHOxo2mNZsOqTak4fFY= -go.uber.org/zap v1.23.0/go.mod h1:D+nX8jyLsMHMYrln8A0rJjFt/T/9/bGgIhAqxv5URuY= +go.uber.org/zap v1.24.0 h1:FiJd5l1UOLj0wCgbSE0rwwXHzEdAZS6hiiSnxJN/D60= +go.uber.org/zap v1.24.0/go.mod h1:2kMP+WWQ8aoFoedH3T2sq6iJ2yDWpHbP0f6MQbS9Gkg= golang.org/x/crypto v0.0.0-20180904163835-0709b304e793/go.mod h1:6SG95UA2DQfeDnfUPMdvaQW0Q7yPrPDi9nlGo2tz2b4= golang.org/x/crypto v0.0.0-20190308221718-c2843e01d9a2/go.mod h1:djNgcEr1/C05ACkg1iLfiJU5Ep61QUkGW8qpdssI0+w= golang.org/x/crypto v0.0.0-20190923035154-9ee001bba392/go.mod h1:/lpIB1dKB+9EgE3H3cr1v9wB50oz8l4C4h62xy7jSTY= diff --git a/receiver/googlecloudpubsubreceiver/factory.go b/receiver/googlecloudpubsubreceiver/factory.go index 627ba8ca1f26..6dab6c749342 100644 --- a/receiver/googlecloudpubsubreceiver/factory.go +++ b/receiver/googlecloudpubsubreceiver/factory.go @@ -61,7 +61,7 @@ func (factory *pubsubReceiverFactory) ensureReceiver(params component.ReceiverCr } rconfig := config.(*Config) obsrecv, err := obsreport.NewReceiver(obsreport.ReceiverSettings{ - ReceiverID: config.ID(), + ReceiverID: params.ID, Transport: reportTransport, ReceiverCreateSettings: params, }) diff --git a/receiver/googlecloudpubsubreceiver/go.mod b/receiver/googlecloudpubsubreceiver/go.mod index 00d7b1dab24d..c3eb354fdcf5 100644 --- a/receiver/googlecloudpubsubreceiver/go.mod +++ b/receiver/googlecloudpubsubreceiver/go.mod @@ -5,12 +5,13 @@ go 1.18 require ( cloud.google.com/go/pubsub v1.26.0 github.com/stretchr/testify v1.8.1 - go.opentelemetry.io/collector v0.66.1-0.20221128222955-4ff1ff379b90 - go.opentelemetry.io/collector/component v0.66.1-0.20221128222955-4ff1ff379b90 - go.opentelemetry.io/collector/consumer v0.66.1-0.20221128222955-4ff1ff379b90 - go.opentelemetry.io/collector/pdata v0.66.1-0.20221128222955-4ff1ff379b90 + go.opentelemetry.io/collector v0.66.1-0.20221202005155-1c54042beb70 + go.opentelemetry.io/collector/component v0.66.1-0.20221202005155-1c54042beb70 + go.opentelemetry.io/collector/confmap v0.0.0-20221201172708-2bdff61fa52a + go.opentelemetry.io/collector/consumer v0.66.1-0.20221202005155-1c54042beb70 + go.opentelemetry.io/collector/pdata v0.66.1-0.20221202005155-1c54042beb70 go.uber.org/atomic v1.10.0 - go.uber.org/zap v1.23.0 + go.uber.org/zap v1.24.0 google.golang.org/api v0.103.0 google.golang.org/genproto v0.0.0-20221027153422-115e99e71e1c google.golang.org/grpc v1.51.0 @@ -42,7 +43,7 @@ require ( github.com/pelletier/go-toml v1.9.4 // indirect github.com/pmezard/go-difflib v1.0.0 // indirect go.opencensus.io v0.24.0 // indirect - go.opentelemetry.io/collector/featuregate v0.66.1-0.20221128222955-4ff1ff379b90 // indirect + go.opentelemetry.io/collector/featuregate v0.66.1-0.20221202005155-1c54042beb70 // 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 49265092480c..fd150aae3cea 100644 --- a/receiver/googlecloudpubsubreceiver/go.sum +++ b/receiver/googlecloudpubsubreceiver/go.sum @@ -297,16 +297,18 @@ go.etcd.io/etcd/client/pkg/v3 v3.5.4/go.mod h1:IJHfcCEKxYu1Os13ZdwCwIUTUVGYTSAM3 go.etcd.io/etcd/client/v3 v3.5.4/go.mod h1:ZaRkVgBZC+L+dLCjTcF1hRXpgZXQPOvnA/Ak/gq3kiY= go.opencensus.io v0.24.0 h1:y73uSU6J157QMP2kn2r30vwW1A2W2WFwSCGnAVxeaD0= go.opencensus.io v0.24.0/go.mod h1:vNK8G9p7aAivkbmorf4v+7Hgx+Zs0yY+0fOtgBfjQKo= -go.opentelemetry.io/collector v0.66.1-0.20221128222955-4ff1ff379b90 h1:yRe05/jMdzH4TFHfndZ5h2o2hKBK/79W72j8w51qNsI= -go.opentelemetry.io/collector v0.66.1-0.20221128222955-4ff1ff379b90/go.mod h1:hE6jCs+0rfiufCrVPucKZTMwfHit1okfDPnwPT2eW1I= -go.opentelemetry.io/collector/component v0.66.1-0.20221128222955-4ff1ff379b90 h1:AYSNTXbezhNg43EuYdVVcgxE/2gBVrm00FDx4DOmQVg= -go.opentelemetry.io/collector/component v0.66.1-0.20221128222955-4ff1ff379b90/go.mod h1:0c84EqXUhvYe6KW7hJfh76tiI/5yjWCH2amwyQ06XLM= -go.opentelemetry.io/collector/consumer v0.66.1-0.20221128222955-4ff1ff379b90 h1:nzNXVfC1FzXBXCLMzbMv+qK3E4EGiNsnMhfVsBd2yzc= -go.opentelemetry.io/collector/consumer v0.66.1-0.20221128222955-4ff1ff379b90/go.mod h1:WtoRZa5SnxQO1ZEQdVxYpFcXCmq62rakv0oUSlPO0NQ= -go.opentelemetry.io/collector/featuregate v0.66.1-0.20221128222955-4ff1ff379b90 h1:UuJSFWbi9XxyNZsJKZuvpWg35BgRbcCGFH+38V2MAdw= -go.opentelemetry.io/collector/featuregate v0.66.1-0.20221128222955-4ff1ff379b90/go.mod h1:tewuFKJYalWBU0bmNKg++MC1ipINXUr6szYzOw2p1GI= -go.opentelemetry.io/collector/pdata v0.66.1-0.20221128222955-4ff1ff379b90 h1:Vu4S4jSNcd0VFPzxQNO4+UqGwnes1xJDoFLPRiWHm8I= -go.opentelemetry.io/collector/pdata v0.66.1-0.20221128222955-4ff1ff379b90/go.mod h1:pqyaznLzk21m+1KL6fwOsRryRELL+zNM0qiVSn0MbVc= +go.opentelemetry.io/collector v0.66.1-0.20221202005155-1c54042beb70 h1:INB2CsOtqqrija2KvMuIpbBQ3qX1BECEeR+d0NJX+oM= +go.opentelemetry.io/collector v0.66.1-0.20221202005155-1c54042beb70/go.mod h1:d0NHkHyANJy3HDTvYE/PoylMShUmFIbiir89ieI0X0c= +go.opentelemetry.io/collector/component v0.66.1-0.20221202005155-1c54042beb70 h1:dEoJhzCmRShgmVro/kXm6pouGElgxkH2DsvanzCeZtU= +go.opentelemetry.io/collector/component v0.66.1-0.20221202005155-1c54042beb70/go.mod h1:OsVnvFFe38QSpcuZlQ8cvarDzcloCexgQ1/B2m80F6U= +go.opentelemetry.io/collector/confmap v0.0.0-20221201172708-2bdff61fa52a h1:2TscCXAQASO2kU9xHcMIUM/FP29fiQIRTilZmliq/7I= +go.opentelemetry.io/collector/confmap v0.0.0-20221201172708-2bdff61fa52a/go.mod h1:qJ3e8bA8h4wz/jYlbeEUafVHdrU7DkpStnmIUAz6VTQ= +go.opentelemetry.io/collector/consumer v0.66.1-0.20221202005155-1c54042beb70 h1:XwpVjI1KeKGPXOZBLefGILMziPYuNf6IzbmiIEsIyI0= +go.opentelemetry.io/collector/consumer v0.66.1-0.20221202005155-1c54042beb70/go.mod h1:EWVBcSGcIcmeDGTnIboc/aqa3agsBeH8/q7yFWG7xVc= +go.opentelemetry.io/collector/featuregate v0.66.1-0.20221202005155-1c54042beb70 h1:V0tf4ebciqIs07jFATfLGdUpLRaEsi+AiWuA/in0G8Y= +go.opentelemetry.io/collector/featuregate v0.66.1-0.20221202005155-1c54042beb70/go.mod h1:tewuFKJYalWBU0bmNKg++MC1ipINXUr6szYzOw2p1GI= +go.opentelemetry.io/collector/pdata v0.66.1-0.20221202005155-1c54042beb70 h1:TPOrxkEMvZzfBSwF3ct+kUUgKA5g8unkZZbKQvJweeA= +go.opentelemetry.io/collector/pdata v0.66.1-0.20221202005155-1c54042beb70/go.mod h1:pqyaznLzk21m+1KL6fwOsRryRELL+zNM0qiVSn0MbVc= 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= @@ -324,8 +326,8 @@ go.uber.org/multierr v1.6.0/go.mod h1:cdWPpRnG4AhwMwsgIHip0KRBQjJy5kYEpYjJxpXp9i go.uber.org/multierr v1.8.0 h1:dg6GjLku4EH+249NNmoIciG9N/jURbDG+pFlTkhzIC8= go.uber.org/multierr v1.8.0/go.mod h1:7EAYxJLBy9rStEaz58O2t4Uvip6FSURkq8/ppBp95ak= go.uber.org/zap v1.17.0/go.mod h1:MXVU+bhUf/A7Xi2HNOnopQOrmycQ5Ih87HtOu4q5SSo= -go.uber.org/zap v1.23.0 h1:OjGQ5KQDEUawVHxNwQgPpiypGHOxo2mNZsOqTak4fFY= -go.uber.org/zap v1.23.0/go.mod h1:D+nX8jyLsMHMYrln8A0rJjFt/T/9/bGgIhAqxv5URuY= +go.uber.org/zap v1.24.0 h1:FiJd5l1UOLj0wCgbSE0rwwXHzEdAZS6hiiSnxJN/D60= +go.uber.org/zap v1.24.0/go.mod h1:2kMP+WWQ8aoFoedH3T2sq6iJ2yDWpHbP0f6MQbS9Gkg= golang.org/x/crypto v0.0.0-20180904163835-0709b304e793/go.mod h1:6SG95UA2DQfeDnfUPMdvaQW0Q7yPrPDi9nlGo2tz2b4= golang.org/x/crypto v0.0.0-20190308221718-c2843e01d9a2/go.mod h1:djNgcEr1/C05ACkg1iLfiJU5Ep61QUkGW8qpdssI0+w= golang.org/x/crypto v0.0.0-20190923035154-9ee001bba392/go.mod h1:/lpIB1dKB+9EgE3H3cr1v9wB50oz8l4C4h62xy7jSTY= diff --git a/receiver/googlecloudspannerreceiver/config.go b/receiver/googlecloudspannerreceiver/config.go index 61877f8570db..2bfd71ecf7db 100644 --- a/receiver/googlecloudspannerreceiver/config.go +++ b/receiver/googlecloudspannerreceiver/config.go @@ -49,27 +49,23 @@ type Instance struct { func (config *Config) Validate() error { if config.CollectionInterval.Seconds() < minCollectionIntervalSeconds { - return fmt.Errorf("%v %q must be not lower than %v seconds, current value is %v seconds", config.ID(), - "collection_interval", minCollectionIntervalSeconds, config.CollectionInterval.Seconds()) + return fmt.Errorf("\"collection_interval\" must be not lower than %v seconds, current value is %v seconds", minCollectionIntervalSeconds, config.CollectionInterval.Seconds()) } if config.TopMetricsQueryMaxRows <= 0 { - return fmt.Errorf("%v %q must be positive: %v", config.ID(), "top_metrics_query_max_rows", - config.TopMetricsQueryMaxRows) + return fmt.Errorf("\"top_metrics_query_max_rows\" must be positive: %v", config.TopMetricsQueryMaxRows) } if config.TopMetricsQueryMaxRows > maxTopMetricsQueryMaxRows { - return fmt.Errorf("%v %q must be not greater than %v, current value is %v", config.ID(), - "top_metrics_query_max_rows", maxTopMetricsQueryMaxRows, config.TopMetricsQueryMaxRows) + return fmt.Errorf("\"top_metrics_query_max_rows\" must be not greater than %v, current value is %v", maxTopMetricsQueryMaxRows, config.TopMetricsQueryMaxRows) } if config.CardinalityTotalLimit < 0 { - return fmt.Errorf("%v %q must be not negative, current value is %v", - config.ID(), "cardinality_total_limit", config.CardinalityTotalLimit) + return fmt.Errorf("\"cardinality_total_limit\" must be not negative, current value is %v", config.CardinalityTotalLimit) } if len(config.Projects) == 0 { - return fmt.Errorf("%v missing required field %q or its value is empty", config.ID(), "projects") + return errors.New("missing required field \"projects\" or its value is empty") } for _, project := range config.Projects { @@ -87,7 +83,7 @@ func (project Project) Validate() error { } if len(project.Instances) == 0 { - return fmt.Errorf("field %q is required and cannot be empty for project configuration", "instances") + return errors.New("field \"instances\" is required and cannot be empty for project configuration") } for _, instance := range project.Instances { @@ -101,16 +97,16 @@ func (project Project) Validate() error { func (instance Instance) Validate() error { if instance.ID == "" { - return fmt.Errorf("field %q is required and cannot be empty for instance configuration", "instance_id") + return errors.New("field \"instance_id\" is required and cannot be empty for instance configuration") } if len(instance.Databases) == 0 { - return fmt.Errorf("field %q is required and cannot be empty for instance configuration", "databases") + return errors.New("field \"databases\" is required and cannot be empty for instance configuration") } for _, database := range instance.Databases { if database == "" { - return fmt.Errorf("field %q contains empty database names", "databases") + return errors.New("field \"databases\" contains empty database names") } } diff --git a/receiver/googlecloudspannerreceiver/go.mod b/receiver/googlecloudspannerreceiver/go.mod index 96811f9217d4..e23517ffd397 100644 --- a/receiver/googlecloudspannerreceiver/go.mod +++ b/receiver/googlecloudspannerreceiver/go.mod @@ -7,11 +7,12 @@ require ( github.com/ReneKroon/ttlcache/v2 v2.11.0 github.com/mitchellh/hashstructure v1.1.0 github.com/stretchr/testify v1.8.1 - go.opentelemetry.io/collector v0.66.1-0.20221128222955-4ff1ff379b90 - go.opentelemetry.io/collector/component v0.66.1-0.20221128222955-4ff1ff379b90 - go.opentelemetry.io/collector/consumer v0.66.1-0.20221128222955-4ff1ff379b90 - go.opentelemetry.io/collector/pdata v0.66.1-0.20221128222955-4ff1ff379b90 - go.uber.org/zap v1.23.0 + go.opentelemetry.io/collector v0.66.1-0.20221202005155-1c54042beb70 + go.opentelemetry.io/collector/component v0.66.1-0.20221202005155-1c54042beb70 + go.opentelemetry.io/collector/confmap v0.0.0-20221201172708-2bdff61fa52a + go.opentelemetry.io/collector/consumer v0.66.1-0.20221202005155-1c54042beb70 + go.opentelemetry.io/collector/pdata v0.66.1-0.20221202005155-1c54042beb70 + go.uber.org/zap v1.24.0 google.golang.org/api v0.103.0 google.golang.org/genproto v0.0.0-20221027153422-115e99e71e1c google.golang.org/grpc v1.51.0 @@ -50,7 +51,7 @@ require ( github.com/pmezard/go-difflib v1.0.0 // indirect github.com/stretchr/objx v0.5.0 // indirect go.opencensus.io v0.24.0 // indirect - go.opentelemetry.io/collector/featuregate v0.66.1-0.20221128222955-4ff1ff379b90 // indirect + go.opentelemetry.io/collector/featuregate v0.66.1-0.20221202005155-1c54042beb70 // 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 0a1fbcbef82b..2ebf6d078dcd 100644 --- a/receiver/googlecloudspannerreceiver/go.sum +++ b/receiver/googlecloudspannerreceiver/go.sum @@ -321,16 +321,18 @@ go.etcd.io/etcd/client/pkg/v3 v3.5.4/go.mod h1:IJHfcCEKxYu1Os13ZdwCwIUTUVGYTSAM3 go.etcd.io/etcd/client/v3 v3.5.4/go.mod h1:ZaRkVgBZC+L+dLCjTcF1hRXpgZXQPOvnA/Ak/gq3kiY= go.opencensus.io v0.24.0 h1:y73uSU6J157QMP2kn2r30vwW1A2W2WFwSCGnAVxeaD0= go.opencensus.io v0.24.0/go.mod h1:vNK8G9p7aAivkbmorf4v+7Hgx+Zs0yY+0fOtgBfjQKo= -go.opentelemetry.io/collector v0.66.1-0.20221128222955-4ff1ff379b90 h1:yRe05/jMdzH4TFHfndZ5h2o2hKBK/79W72j8w51qNsI= -go.opentelemetry.io/collector v0.66.1-0.20221128222955-4ff1ff379b90/go.mod h1:hE6jCs+0rfiufCrVPucKZTMwfHit1okfDPnwPT2eW1I= -go.opentelemetry.io/collector/component v0.66.1-0.20221128222955-4ff1ff379b90 h1:AYSNTXbezhNg43EuYdVVcgxE/2gBVrm00FDx4DOmQVg= -go.opentelemetry.io/collector/component v0.66.1-0.20221128222955-4ff1ff379b90/go.mod h1:0c84EqXUhvYe6KW7hJfh76tiI/5yjWCH2amwyQ06XLM= -go.opentelemetry.io/collector/consumer v0.66.1-0.20221128222955-4ff1ff379b90 h1:nzNXVfC1FzXBXCLMzbMv+qK3E4EGiNsnMhfVsBd2yzc= -go.opentelemetry.io/collector/consumer v0.66.1-0.20221128222955-4ff1ff379b90/go.mod h1:WtoRZa5SnxQO1ZEQdVxYpFcXCmq62rakv0oUSlPO0NQ= -go.opentelemetry.io/collector/featuregate v0.66.1-0.20221128222955-4ff1ff379b90 h1:UuJSFWbi9XxyNZsJKZuvpWg35BgRbcCGFH+38V2MAdw= -go.opentelemetry.io/collector/featuregate v0.66.1-0.20221128222955-4ff1ff379b90/go.mod h1:tewuFKJYalWBU0bmNKg++MC1ipINXUr6szYzOw2p1GI= -go.opentelemetry.io/collector/pdata v0.66.1-0.20221128222955-4ff1ff379b90 h1:Vu4S4jSNcd0VFPzxQNO4+UqGwnes1xJDoFLPRiWHm8I= -go.opentelemetry.io/collector/pdata v0.66.1-0.20221128222955-4ff1ff379b90/go.mod h1:pqyaznLzk21m+1KL6fwOsRryRELL+zNM0qiVSn0MbVc= +go.opentelemetry.io/collector v0.66.1-0.20221202005155-1c54042beb70 h1:INB2CsOtqqrija2KvMuIpbBQ3qX1BECEeR+d0NJX+oM= +go.opentelemetry.io/collector v0.66.1-0.20221202005155-1c54042beb70/go.mod h1:d0NHkHyANJy3HDTvYE/PoylMShUmFIbiir89ieI0X0c= +go.opentelemetry.io/collector/component v0.66.1-0.20221202005155-1c54042beb70 h1:dEoJhzCmRShgmVro/kXm6pouGElgxkH2DsvanzCeZtU= +go.opentelemetry.io/collector/component v0.66.1-0.20221202005155-1c54042beb70/go.mod h1:OsVnvFFe38QSpcuZlQ8cvarDzcloCexgQ1/B2m80F6U= +go.opentelemetry.io/collector/confmap v0.0.0-20221201172708-2bdff61fa52a h1:2TscCXAQASO2kU9xHcMIUM/FP29fiQIRTilZmliq/7I= +go.opentelemetry.io/collector/confmap v0.0.0-20221201172708-2bdff61fa52a/go.mod h1:qJ3e8bA8h4wz/jYlbeEUafVHdrU7DkpStnmIUAz6VTQ= +go.opentelemetry.io/collector/consumer v0.66.1-0.20221202005155-1c54042beb70 h1:XwpVjI1KeKGPXOZBLefGILMziPYuNf6IzbmiIEsIyI0= +go.opentelemetry.io/collector/consumer v0.66.1-0.20221202005155-1c54042beb70/go.mod h1:EWVBcSGcIcmeDGTnIboc/aqa3agsBeH8/q7yFWG7xVc= +go.opentelemetry.io/collector/featuregate v0.66.1-0.20221202005155-1c54042beb70 h1:V0tf4ebciqIs07jFATfLGdUpLRaEsi+AiWuA/in0G8Y= +go.opentelemetry.io/collector/featuregate v0.66.1-0.20221202005155-1c54042beb70/go.mod h1:tewuFKJYalWBU0bmNKg++MC1ipINXUr6szYzOw2p1GI= +go.opentelemetry.io/collector/pdata v0.66.1-0.20221202005155-1c54042beb70 h1:TPOrxkEMvZzfBSwF3ct+kUUgKA5g8unkZZbKQvJweeA= +go.opentelemetry.io/collector/pdata v0.66.1-0.20221202005155-1c54042beb70/go.mod h1:pqyaznLzk21m+1KL6fwOsRryRELL+zNM0qiVSn0MbVc= 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= @@ -350,8 +352,8 @@ go.uber.org/multierr v1.6.0/go.mod h1:cdWPpRnG4AhwMwsgIHip0KRBQjJy5kYEpYjJxpXp9i go.uber.org/multierr v1.8.0 h1:dg6GjLku4EH+249NNmoIciG9N/jURbDG+pFlTkhzIC8= go.uber.org/multierr v1.8.0/go.mod h1:7EAYxJLBy9rStEaz58O2t4Uvip6FSURkq8/ppBp95ak= go.uber.org/zap v1.17.0/go.mod h1:MXVU+bhUf/A7Xi2HNOnopQOrmycQ5Ih87HtOu4q5SSo= -go.uber.org/zap v1.23.0 h1:OjGQ5KQDEUawVHxNwQgPpiypGHOxo2mNZsOqTak4fFY= -go.uber.org/zap v1.23.0/go.mod h1:D+nX8jyLsMHMYrln8A0rJjFt/T/9/bGgIhAqxv5URuY= +go.uber.org/zap v1.24.0 h1:FiJd5l1UOLj0wCgbSE0rwwXHzEdAZS6hiiSnxJN/D60= +go.uber.org/zap v1.24.0/go.mod h1:2kMP+WWQ8aoFoedH3T2sq6iJ2yDWpHbP0f6MQbS9Gkg= golang.org/x/crypto v0.0.0-20180904163835-0709b304e793/go.mod h1:6SG95UA2DQfeDnfUPMdvaQW0Q7yPrPDi9nlGo2tz2b4= golang.org/x/crypto v0.0.0-20190308221718-c2843e01d9a2/go.mod h1:djNgcEr1/C05ACkg1iLfiJU5Ep61QUkGW8qpdssI0+w= golang.org/x/crypto v0.0.0-20190820162420-60c769a6c586/go.mod h1:yigFU9vqHzYiE8UmvKecakEJjdnWj3jj499lnFckfCI= diff --git a/receiver/hostmetricsreceiver/go.mod b/receiver/hostmetricsreceiver/go.mod index 3393b9c2a923..ed30d4544332 100644 --- a/receiver/hostmetricsreceiver/go.mod +++ b/receiver/hostmetricsreceiver/go.mod @@ -7,13 +7,14 @@ require ( github.com/open-telemetry/opentelemetry-collector-contrib/internal/filter v0.66.0 github.com/shirou/gopsutil/v3 v3.22.10 github.com/stretchr/testify v1.8.1 - go.opentelemetry.io/collector v0.66.1-0.20221128222955-4ff1ff379b90 - go.opentelemetry.io/collector/component v0.66.1-0.20221128222955-4ff1ff379b90 - go.opentelemetry.io/collector/consumer v0.66.1-0.20221128222955-4ff1ff379b90 - go.opentelemetry.io/collector/pdata v0.66.1-0.20221128222955-4ff1ff379b90 - go.opentelemetry.io/collector/semconv v0.66.1-0.20221128222955-4ff1ff379b90 + go.opentelemetry.io/collector v0.66.1-0.20221202005155-1c54042beb70 + go.opentelemetry.io/collector/component v0.66.1-0.20221202005155-1c54042beb70 + go.opentelemetry.io/collector/confmap v0.0.0-20221201172708-2bdff61fa52a + go.opentelemetry.io/collector/consumer v0.66.1-0.20221202005155-1c54042beb70 + go.opentelemetry.io/collector/pdata v0.66.1-0.20221202005155-1c54042beb70 + go.opentelemetry.io/collector/semconv v0.66.1-0.20221202005155-1c54042beb70 go.uber.org/multierr v1.8.0 - go.uber.org/zap v1.23.0 + go.uber.org/zap v1.24.0 golang.org/x/sys v0.2.0 ) @@ -51,12 +52,12 @@ require ( github.com/spf13/cobra v1.6.1 // indirect github.com/spf13/pflag v1.0.5 // indirect github.com/stretchr/objx v0.5.0 // indirect - github.com/tklauser/go-sysconf v0.3.10 // indirect - github.com/tklauser/numcpus v0.4.0 // indirect + github.com/tklauser/go-sysconf v0.3.11 // indirect + github.com/tklauser/numcpus v0.6.0 // indirect github.com/yusufpapurcu/wmi v1.2.2 // indirect go.opencensus.io v0.24.0 // indirect - go.opentelemetry.io/collector/featuregate v0.66.1-0.20221128222955-4ff1ff379b90 // indirect - go.opentelemetry.io/collector/processor/batchprocessor v0.66.1-0.20221128222955-4ff1ff379b90 // indirect + go.opentelemetry.io/collector/featuregate v0.66.1-0.20221202005155-1c54042beb70 // indirect + go.opentelemetry.io/collector/processor/batchprocessor v0.66.1-0.20221202005155-1c54042beb70 // 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 c89692db828f..f36df8b090d8 100644 --- a/receiver/hostmetricsreceiver/go.sum +++ b/receiver/hostmetricsreceiver/go.sum @@ -374,10 +374,12 @@ github.com/stretchr/testify v1.8.0/go.mod h1:yNjHg4UonilssWZ8iaSj1OCr/vHnekPRkoO github.com/stretchr/testify v1.8.1 h1:w7B6lhMri9wdJUVmEZPGGhZzrYTPvgJArz7wNPgYKsk= github.com/stretchr/testify v1.8.1/go.mod h1:w2LPCIKwWwSfY2zedu0+kehJoqGctiVI29o6fzry7u4= github.com/stvp/go-udp-testing v0.0.0-20201019212854-469649b16807/go.mod h1:7jxmlfBCDBXRzr0eAQJ48XC1hBu1np4CS5+cHEYfwpc= -github.com/tklauser/go-sysconf v0.3.10 h1:IJ1AZGZRWbY8T5Vfk04D9WOA5WSejdflXxP03OUqALw= github.com/tklauser/go-sysconf v0.3.10/go.mod h1:C8XykCvCb+Gn0oNCWPIlcb0RuglQTYaQ2hGm7jmxEFk= -github.com/tklauser/numcpus v0.4.0 h1:E53Dm1HjH1/R2/aoCtXtPgzmElmn51aOkhCFSuZq//o= +github.com/tklauser/go-sysconf v0.3.11 h1:89WgdJhk5SNwJfu+GKyYveZ4IaJ7xAkecBo+KdJV0CM= +github.com/tklauser/go-sysconf v0.3.11/go.mod h1:GqXfhXY3kiPa0nAXPDIQIWzJbMCB7AmcWpGR8lSZfqI= github.com/tklauser/numcpus v0.4.0/go.mod h1:1+UI3pD8NW14VMwdgJNJ1ESk2UnwhAnz5hMwiKKqXCQ= +github.com/tklauser/numcpus v0.6.0 h1:kebhY2Qt+3U6RNK7UqpYNA+tJ23IBEGKkB7JQBfDYms= +github.com/tklauser/numcpus v0.6.0/go.mod h1:FEZLMke0lhOUG6w2JadTzp0a+Nl8PF/GFkQ5UVIcaL4= github.com/yuin/goldmark v1.1.25/go.mod h1:3hX8gzYuyVAZsxl0MRgGTJEmQBFcNTphYh9decYSb74= github.com/yuin/goldmark v1.1.27/go.mod h1:3hX8gzYuyVAZsxl0MRgGTJEmQBFcNTphYh9decYSb74= github.com/yuin/goldmark v1.1.32/go.mod h1:3hX8gzYuyVAZsxl0MRgGTJEmQBFcNTphYh9decYSb74= @@ -396,21 +398,23 @@ go.opencensus.io v0.22.4/go.mod h1:yxeiOL68Rb0Xd1ddK5vPZ/oVn4vY4Ynel7k9FzqtOIw= go.opencensus.io v0.23.0/go.mod h1:XItmlyltB5F7CS4xOC1DcqMoFqwtC6OG2xF7mCv7P7E= go.opencensus.io v0.24.0 h1:y73uSU6J157QMP2kn2r30vwW1A2W2WFwSCGnAVxeaD0= go.opencensus.io v0.24.0/go.mod h1:vNK8G9p7aAivkbmorf4v+7Hgx+Zs0yY+0fOtgBfjQKo= -go.opentelemetry.io/collector v0.66.1-0.20221128222955-4ff1ff379b90 h1:yRe05/jMdzH4TFHfndZ5h2o2hKBK/79W72j8w51qNsI= -go.opentelemetry.io/collector v0.66.1-0.20221128222955-4ff1ff379b90/go.mod h1:hE6jCs+0rfiufCrVPucKZTMwfHit1okfDPnwPT2eW1I= -go.opentelemetry.io/collector/component v0.66.1-0.20221128222955-4ff1ff379b90 h1:AYSNTXbezhNg43EuYdVVcgxE/2gBVrm00FDx4DOmQVg= -go.opentelemetry.io/collector/component v0.66.1-0.20221128222955-4ff1ff379b90/go.mod h1:0c84EqXUhvYe6KW7hJfh76tiI/5yjWCH2amwyQ06XLM= -go.opentelemetry.io/collector/consumer v0.66.1-0.20221128222955-4ff1ff379b90 h1:nzNXVfC1FzXBXCLMzbMv+qK3E4EGiNsnMhfVsBd2yzc= -go.opentelemetry.io/collector/consumer v0.66.1-0.20221128222955-4ff1ff379b90/go.mod h1:WtoRZa5SnxQO1ZEQdVxYpFcXCmq62rakv0oUSlPO0NQ= -go.opentelemetry.io/collector/extension/zpagesextension v0.65.0 h1:T5JJIJ3cmClqdSMgkbjoIiP9p059AAvbfcd3houJkxM= -go.opentelemetry.io/collector/featuregate v0.66.1-0.20221128222955-4ff1ff379b90 h1:UuJSFWbi9XxyNZsJKZuvpWg35BgRbcCGFH+38V2MAdw= -go.opentelemetry.io/collector/featuregate v0.66.1-0.20221128222955-4ff1ff379b90/go.mod h1:tewuFKJYalWBU0bmNKg++MC1ipINXUr6szYzOw2p1GI= -go.opentelemetry.io/collector/pdata v0.66.1-0.20221128222955-4ff1ff379b90 h1:Vu4S4jSNcd0VFPzxQNO4+UqGwnes1xJDoFLPRiWHm8I= -go.opentelemetry.io/collector/pdata v0.66.1-0.20221128222955-4ff1ff379b90/go.mod h1:pqyaznLzk21m+1KL6fwOsRryRELL+zNM0qiVSn0MbVc= -go.opentelemetry.io/collector/processor/batchprocessor v0.66.1-0.20221128222955-4ff1ff379b90 h1:K12L9juzjChBMfp7cQaQsToz7i7975tUYVzJ3Tpw/Cw= -go.opentelemetry.io/collector/processor/batchprocessor v0.66.1-0.20221128222955-4ff1ff379b90/go.mod h1:XhGTsC1B/bq4gpg8IZ/QYBLXkzE4Gw3r7Xu2+ik8A1Q= -go.opentelemetry.io/collector/semconv v0.66.1-0.20221128222955-4ff1ff379b90 h1:hFaTA68cggZKWMv7wQ3bKP8KGTbowh/5AQZKCHzHTqM= -go.opentelemetry.io/collector/semconv v0.66.1-0.20221128222955-4ff1ff379b90/go.mod h1:5o9yhOa+ABt7g2E5JABDxGZ1PQPbtfxrKNbYn+LOTXU= +go.opentelemetry.io/collector v0.66.1-0.20221202005155-1c54042beb70 h1:INB2CsOtqqrija2KvMuIpbBQ3qX1BECEeR+d0NJX+oM= +go.opentelemetry.io/collector v0.66.1-0.20221202005155-1c54042beb70/go.mod h1:d0NHkHyANJy3HDTvYE/PoylMShUmFIbiir89ieI0X0c= +go.opentelemetry.io/collector/component v0.66.1-0.20221202005155-1c54042beb70 h1:dEoJhzCmRShgmVro/kXm6pouGElgxkH2DsvanzCeZtU= +go.opentelemetry.io/collector/component v0.66.1-0.20221202005155-1c54042beb70/go.mod h1:OsVnvFFe38QSpcuZlQ8cvarDzcloCexgQ1/B2m80F6U= +go.opentelemetry.io/collector/confmap v0.0.0-20221201172708-2bdff61fa52a h1:2TscCXAQASO2kU9xHcMIUM/FP29fiQIRTilZmliq/7I= +go.opentelemetry.io/collector/confmap v0.0.0-20221201172708-2bdff61fa52a/go.mod h1:qJ3e8bA8h4wz/jYlbeEUafVHdrU7DkpStnmIUAz6VTQ= +go.opentelemetry.io/collector/consumer v0.66.1-0.20221202005155-1c54042beb70 h1:XwpVjI1KeKGPXOZBLefGILMziPYuNf6IzbmiIEsIyI0= +go.opentelemetry.io/collector/consumer v0.66.1-0.20221202005155-1c54042beb70/go.mod h1:EWVBcSGcIcmeDGTnIboc/aqa3agsBeH8/q7yFWG7xVc= +go.opentelemetry.io/collector/extension/zpagesextension v0.66.0 h1:tPqSKH5K3VhTT0XXVoWL3woWBSTJqnXZQRt0ZLSCoCc= +go.opentelemetry.io/collector/featuregate v0.66.1-0.20221202005155-1c54042beb70 h1:V0tf4ebciqIs07jFATfLGdUpLRaEsi+AiWuA/in0G8Y= +go.opentelemetry.io/collector/featuregate v0.66.1-0.20221202005155-1c54042beb70/go.mod h1:tewuFKJYalWBU0bmNKg++MC1ipINXUr6szYzOw2p1GI= +go.opentelemetry.io/collector/pdata v0.66.1-0.20221202005155-1c54042beb70 h1:TPOrxkEMvZzfBSwF3ct+kUUgKA5g8unkZZbKQvJweeA= +go.opentelemetry.io/collector/pdata v0.66.1-0.20221202005155-1c54042beb70/go.mod h1:pqyaznLzk21m+1KL6fwOsRryRELL+zNM0qiVSn0MbVc= +go.opentelemetry.io/collector/processor/batchprocessor v0.66.1-0.20221202005155-1c54042beb70 h1:Y4e8NnVevonnAgmjX9Z7QIMA32yMqHAOnAlh8SzTS8c= +go.opentelemetry.io/collector/processor/batchprocessor v0.66.1-0.20221202005155-1c54042beb70/go.mod h1:Pi1CsKDQFoDrUP1i3+VdE6s2Xuji7bOGFBgqHK0J32E= +go.opentelemetry.io/collector/semconv v0.66.1-0.20221202005155-1c54042beb70 h1:Q5L9Urod3c8as6ZYaoaqBjarx/HXxsxy34DFZIU2fO4= +go.opentelemetry.io/collector/semconv v0.66.1-0.20221202005155-1c54042beb70/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= @@ -434,8 +438,8 @@ go.uber.org/multierr v1.6.0/go.mod h1:cdWPpRnG4AhwMwsgIHip0KRBQjJy5kYEpYjJxpXp9i go.uber.org/multierr v1.8.0 h1:dg6GjLku4EH+249NNmoIciG9N/jURbDG+pFlTkhzIC8= go.uber.org/multierr v1.8.0/go.mod h1:7EAYxJLBy9rStEaz58O2t4Uvip6FSURkq8/ppBp95ak= go.uber.org/zap v1.17.0/go.mod h1:MXVU+bhUf/A7Xi2HNOnopQOrmycQ5Ih87HtOu4q5SSo= -go.uber.org/zap v1.23.0 h1:OjGQ5KQDEUawVHxNwQgPpiypGHOxo2mNZsOqTak4fFY= -go.uber.org/zap v1.23.0/go.mod h1:D+nX8jyLsMHMYrln8A0rJjFt/T/9/bGgIhAqxv5URuY= +go.uber.org/zap v1.24.0 h1:FiJd5l1UOLj0wCgbSE0rwwXHzEdAZS6hiiSnxJN/D60= +go.uber.org/zap v1.24.0/go.mod h1:2kMP+WWQ8aoFoedH3T2sq6iJ2yDWpHbP0f6MQbS9Gkg= golang.org/x/crypto v0.0.0-20180904163835-0709b304e793/go.mod h1:6SG95UA2DQfeDnfUPMdvaQW0Q7yPrPDi9nlGo2tz2b4= golang.org/x/crypto v0.0.0-20190308221718-c2843e01d9a2/go.mod h1:djNgcEr1/C05ACkg1iLfiJU5Ep61QUkGW8qpdssI0+w= golang.org/x/crypto v0.0.0-20190510104115-cbcb75029529/go.mod h1:yigFU9vqHzYiE8UmvKecakEJjdnWj3jj499lnFckfCI= diff --git a/receiver/httpcheckreceiver/go.mod b/receiver/httpcheckreceiver/go.mod index 42f502b85643..220d29151264 100644 --- a/receiver/httpcheckreceiver/go.mod +++ b/receiver/httpcheckreceiver/go.mod @@ -5,10 +5,11 @@ go 1.18 require ( github.com/open-telemetry/opentelemetry-collector-contrib/internal/scrapertest v0.66.0 github.com/stretchr/testify v1.8.1 - go.opentelemetry.io/collector v0.66.1-0.20221128222955-4ff1ff379b90 - go.opentelemetry.io/collector/component v0.66.1-0.20221128222955-4ff1ff379b90 - go.opentelemetry.io/collector/consumer v0.66.1-0.20221128222955-4ff1ff379b90 - go.opentelemetry.io/collector/pdata v0.66.1-0.20221128222955-4ff1ff379b90 + go.opentelemetry.io/collector v0.66.1-0.20221202005155-1c54042beb70 + go.opentelemetry.io/collector/component v0.66.1-0.20221202005155-1c54042beb70 + go.opentelemetry.io/collector/confmap v0.0.0-20221201172708-2bdff61fa52a + go.opentelemetry.io/collector/consumer v0.66.1-0.20221202005155-1c54042beb70 + go.opentelemetry.io/collector/pdata v0.66.1-0.20221202005155-1c54042beb70 go.uber.org/multierr v1.8.0 ) @@ -33,13 +34,13 @@ require ( github.com/rogpeppe/go-internal v1.8.1 // indirect github.com/rs/cors v1.8.2 // indirect go.opencensus.io v0.24.0 // indirect - go.opentelemetry.io/collector/featuregate v0.66.1-0.20221128222955-4ff1ff379b90 // indirect + go.opentelemetry.io/collector/featuregate v0.66.1-0.20221202005155-1c54042beb70 // 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 go.opentelemetry.io/otel/trace v1.11.1 // indirect go.uber.org/atomic v1.10.0 // indirect - go.uber.org/zap v1.23.0 // indirect + go.uber.org/zap v1.24.0 // indirect golang.org/x/net v0.0.0-20220722155237-a158d28d115b // indirect golang.org/x/sys v0.2.0 // indirect golang.org/x/text v0.4.0 // indirect diff --git a/receiver/httpcheckreceiver/go.sum b/receiver/httpcheckreceiver/go.sum index d3bc0f40c5b2..52f0bfd50272 100644 --- a/receiver/httpcheckreceiver/go.sum +++ b/receiver/httpcheckreceiver/go.sum @@ -292,16 +292,18 @@ go.etcd.io/etcd/client/pkg/v3 v3.5.4/go.mod h1:IJHfcCEKxYu1Os13ZdwCwIUTUVGYTSAM3 go.etcd.io/etcd/client/v3 v3.5.4/go.mod h1:ZaRkVgBZC+L+dLCjTcF1hRXpgZXQPOvnA/Ak/gq3kiY= go.opencensus.io v0.24.0 h1:y73uSU6J157QMP2kn2r30vwW1A2W2WFwSCGnAVxeaD0= go.opencensus.io v0.24.0/go.mod h1:vNK8G9p7aAivkbmorf4v+7Hgx+Zs0yY+0fOtgBfjQKo= -go.opentelemetry.io/collector v0.66.1-0.20221128222955-4ff1ff379b90 h1:yRe05/jMdzH4TFHfndZ5h2o2hKBK/79W72j8w51qNsI= -go.opentelemetry.io/collector v0.66.1-0.20221128222955-4ff1ff379b90/go.mod h1:hE6jCs+0rfiufCrVPucKZTMwfHit1okfDPnwPT2eW1I= -go.opentelemetry.io/collector/component v0.66.1-0.20221128222955-4ff1ff379b90 h1:AYSNTXbezhNg43EuYdVVcgxE/2gBVrm00FDx4DOmQVg= -go.opentelemetry.io/collector/component v0.66.1-0.20221128222955-4ff1ff379b90/go.mod h1:0c84EqXUhvYe6KW7hJfh76tiI/5yjWCH2amwyQ06XLM= -go.opentelemetry.io/collector/consumer v0.66.1-0.20221128222955-4ff1ff379b90 h1:nzNXVfC1FzXBXCLMzbMv+qK3E4EGiNsnMhfVsBd2yzc= -go.opentelemetry.io/collector/consumer v0.66.1-0.20221128222955-4ff1ff379b90/go.mod h1:WtoRZa5SnxQO1ZEQdVxYpFcXCmq62rakv0oUSlPO0NQ= -go.opentelemetry.io/collector/featuregate v0.66.1-0.20221128222955-4ff1ff379b90 h1:UuJSFWbi9XxyNZsJKZuvpWg35BgRbcCGFH+38V2MAdw= -go.opentelemetry.io/collector/featuregate v0.66.1-0.20221128222955-4ff1ff379b90/go.mod h1:tewuFKJYalWBU0bmNKg++MC1ipINXUr6szYzOw2p1GI= -go.opentelemetry.io/collector/pdata v0.66.1-0.20221128222955-4ff1ff379b90 h1:Vu4S4jSNcd0VFPzxQNO4+UqGwnes1xJDoFLPRiWHm8I= -go.opentelemetry.io/collector/pdata v0.66.1-0.20221128222955-4ff1ff379b90/go.mod h1:pqyaznLzk21m+1KL6fwOsRryRELL+zNM0qiVSn0MbVc= +go.opentelemetry.io/collector v0.66.1-0.20221202005155-1c54042beb70 h1:INB2CsOtqqrija2KvMuIpbBQ3qX1BECEeR+d0NJX+oM= +go.opentelemetry.io/collector v0.66.1-0.20221202005155-1c54042beb70/go.mod h1:d0NHkHyANJy3HDTvYE/PoylMShUmFIbiir89ieI0X0c= +go.opentelemetry.io/collector/component v0.66.1-0.20221202005155-1c54042beb70 h1:dEoJhzCmRShgmVro/kXm6pouGElgxkH2DsvanzCeZtU= +go.opentelemetry.io/collector/component v0.66.1-0.20221202005155-1c54042beb70/go.mod h1:OsVnvFFe38QSpcuZlQ8cvarDzcloCexgQ1/B2m80F6U= +go.opentelemetry.io/collector/confmap v0.0.0-20221201172708-2bdff61fa52a h1:2TscCXAQASO2kU9xHcMIUM/FP29fiQIRTilZmliq/7I= +go.opentelemetry.io/collector/confmap v0.0.0-20221201172708-2bdff61fa52a/go.mod h1:qJ3e8bA8h4wz/jYlbeEUafVHdrU7DkpStnmIUAz6VTQ= +go.opentelemetry.io/collector/consumer v0.66.1-0.20221202005155-1c54042beb70 h1:XwpVjI1KeKGPXOZBLefGILMziPYuNf6IzbmiIEsIyI0= +go.opentelemetry.io/collector/consumer v0.66.1-0.20221202005155-1c54042beb70/go.mod h1:EWVBcSGcIcmeDGTnIboc/aqa3agsBeH8/q7yFWG7xVc= +go.opentelemetry.io/collector/featuregate v0.66.1-0.20221202005155-1c54042beb70 h1:V0tf4ebciqIs07jFATfLGdUpLRaEsi+AiWuA/in0G8Y= +go.opentelemetry.io/collector/featuregate v0.66.1-0.20221202005155-1c54042beb70/go.mod h1:tewuFKJYalWBU0bmNKg++MC1ipINXUr6szYzOw2p1GI= +go.opentelemetry.io/collector/pdata v0.66.1-0.20221202005155-1c54042beb70 h1:TPOrxkEMvZzfBSwF3ct+kUUgKA5g8unkZZbKQvJweeA= +go.opentelemetry.io/collector/pdata v0.66.1-0.20221202005155-1c54042beb70/go.mod h1:pqyaznLzk21m+1KL6fwOsRryRELL+zNM0qiVSn0MbVc= 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= @@ -322,8 +324,8 @@ go.uber.org/multierr v1.6.0/go.mod h1:cdWPpRnG4AhwMwsgIHip0KRBQjJy5kYEpYjJxpXp9i go.uber.org/multierr v1.8.0 h1:dg6GjLku4EH+249NNmoIciG9N/jURbDG+pFlTkhzIC8= go.uber.org/multierr v1.8.0/go.mod h1:7EAYxJLBy9rStEaz58O2t4Uvip6FSURkq8/ppBp95ak= go.uber.org/zap v1.17.0/go.mod h1:MXVU+bhUf/A7Xi2HNOnopQOrmycQ5Ih87HtOu4q5SSo= -go.uber.org/zap v1.23.0 h1:OjGQ5KQDEUawVHxNwQgPpiypGHOxo2mNZsOqTak4fFY= -go.uber.org/zap v1.23.0/go.mod h1:D+nX8jyLsMHMYrln8A0rJjFt/T/9/bGgIhAqxv5URuY= +go.uber.org/zap v1.24.0 h1:FiJd5l1UOLj0wCgbSE0rwwXHzEdAZS6hiiSnxJN/D60= +go.uber.org/zap v1.24.0/go.mod h1:2kMP+WWQ8aoFoedH3T2sq6iJ2yDWpHbP0f6MQbS9Gkg= golang.org/x/crypto v0.0.0-20180904163835-0709b304e793/go.mod h1:6SG95UA2DQfeDnfUPMdvaQW0Q7yPrPDi9nlGo2tz2b4= golang.org/x/crypto v0.0.0-20190308221718-c2843e01d9a2/go.mod h1:djNgcEr1/C05ACkg1iLfiJU5Ep61QUkGW8qpdssI0+w= golang.org/x/crypto v0.0.0-20190923035154-9ee001bba392/go.mod h1:/lpIB1dKB+9EgE3H3cr1v9wB50oz8l4C4h62xy7jSTY= diff --git a/receiver/iisreceiver/go.mod b/receiver/iisreceiver/go.mod index 15a3faf1d112..84a5e171b032 100644 --- a/receiver/iisreceiver/go.mod +++ b/receiver/iisreceiver/go.mod @@ -6,12 +6,13 @@ require ( github.com/open-telemetry/opentelemetry-collector-contrib/internal/scrapertest v0.66.0 github.com/open-telemetry/opentelemetry-collector-contrib/pkg/winperfcounters v0.66.0 github.com/stretchr/testify v1.8.1 - go.opentelemetry.io/collector v0.66.1-0.20221128222955-4ff1ff379b90 - go.opentelemetry.io/collector/component v0.66.1-0.20221128222955-4ff1ff379b90 - go.opentelemetry.io/collector/consumer v0.66.1-0.20221128222955-4ff1ff379b90 - go.opentelemetry.io/collector/pdata v0.66.1-0.20221128222955-4ff1ff379b90 + go.opentelemetry.io/collector v0.66.1-0.20221202005155-1c54042beb70 + go.opentelemetry.io/collector/component v0.66.1-0.20221202005155-1c54042beb70 + go.opentelemetry.io/collector/confmap v0.0.0-20221201172708-2bdff61fa52a + go.opentelemetry.io/collector/consumer v0.66.1-0.20221202005155-1c54042beb70 + go.opentelemetry.io/collector/pdata v0.66.1-0.20221202005155-1c54042beb70 go.uber.org/multierr v1.8.0 - go.uber.org/zap v1.23.0 + go.uber.org/zap v1.24.0 ) require ( @@ -28,7 +29,7 @@ require ( github.com/modern-go/reflect2 v1.0.2 // indirect github.com/pmezard/go-difflib v1.0.0 // indirect go.opencensus.io v0.24.0 // indirect - go.opentelemetry.io/collector/featuregate v0.66.1-0.20221128222955-4ff1ff379b90 // indirect + go.opentelemetry.io/collector/featuregate v0.66.1-0.20221202005155-1c54042beb70 // 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 4c6656f8bfa5..160c98f0ff81 100644 --- a/receiver/iisreceiver/go.sum +++ b/receiver/iisreceiver/go.sum @@ -279,16 +279,18 @@ go.etcd.io/etcd/client/pkg/v3 v3.5.4/go.mod h1:IJHfcCEKxYu1Os13ZdwCwIUTUVGYTSAM3 go.etcd.io/etcd/client/v3 v3.5.4/go.mod h1:ZaRkVgBZC+L+dLCjTcF1hRXpgZXQPOvnA/Ak/gq3kiY= go.opencensus.io v0.24.0 h1:y73uSU6J157QMP2kn2r30vwW1A2W2WFwSCGnAVxeaD0= go.opencensus.io v0.24.0/go.mod h1:vNK8G9p7aAivkbmorf4v+7Hgx+Zs0yY+0fOtgBfjQKo= -go.opentelemetry.io/collector v0.66.1-0.20221128222955-4ff1ff379b90 h1:yRe05/jMdzH4TFHfndZ5h2o2hKBK/79W72j8w51qNsI= -go.opentelemetry.io/collector v0.66.1-0.20221128222955-4ff1ff379b90/go.mod h1:hE6jCs+0rfiufCrVPucKZTMwfHit1okfDPnwPT2eW1I= -go.opentelemetry.io/collector/component v0.66.1-0.20221128222955-4ff1ff379b90 h1:AYSNTXbezhNg43EuYdVVcgxE/2gBVrm00FDx4DOmQVg= -go.opentelemetry.io/collector/component v0.66.1-0.20221128222955-4ff1ff379b90/go.mod h1:0c84EqXUhvYe6KW7hJfh76tiI/5yjWCH2amwyQ06XLM= -go.opentelemetry.io/collector/consumer v0.66.1-0.20221128222955-4ff1ff379b90 h1:nzNXVfC1FzXBXCLMzbMv+qK3E4EGiNsnMhfVsBd2yzc= -go.opentelemetry.io/collector/consumer v0.66.1-0.20221128222955-4ff1ff379b90/go.mod h1:WtoRZa5SnxQO1ZEQdVxYpFcXCmq62rakv0oUSlPO0NQ= -go.opentelemetry.io/collector/featuregate v0.66.1-0.20221128222955-4ff1ff379b90 h1:UuJSFWbi9XxyNZsJKZuvpWg35BgRbcCGFH+38V2MAdw= -go.opentelemetry.io/collector/featuregate v0.66.1-0.20221128222955-4ff1ff379b90/go.mod h1:tewuFKJYalWBU0bmNKg++MC1ipINXUr6szYzOw2p1GI= -go.opentelemetry.io/collector/pdata v0.66.1-0.20221128222955-4ff1ff379b90 h1:Vu4S4jSNcd0VFPzxQNO4+UqGwnes1xJDoFLPRiWHm8I= -go.opentelemetry.io/collector/pdata v0.66.1-0.20221128222955-4ff1ff379b90/go.mod h1:pqyaznLzk21m+1KL6fwOsRryRELL+zNM0qiVSn0MbVc= +go.opentelemetry.io/collector v0.66.1-0.20221202005155-1c54042beb70 h1:INB2CsOtqqrija2KvMuIpbBQ3qX1BECEeR+d0NJX+oM= +go.opentelemetry.io/collector v0.66.1-0.20221202005155-1c54042beb70/go.mod h1:d0NHkHyANJy3HDTvYE/PoylMShUmFIbiir89ieI0X0c= +go.opentelemetry.io/collector/component v0.66.1-0.20221202005155-1c54042beb70 h1:dEoJhzCmRShgmVro/kXm6pouGElgxkH2DsvanzCeZtU= +go.opentelemetry.io/collector/component v0.66.1-0.20221202005155-1c54042beb70/go.mod h1:OsVnvFFe38QSpcuZlQ8cvarDzcloCexgQ1/B2m80F6U= +go.opentelemetry.io/collector/confmap v0.0.0-20221201172708-2bdff61fa52a h1:2TscCXAQASO2kU9xHcMIUM/FP29fiQIRTilZmliq/7I= +go.opentelemetry.io/collector/confmap v0.0.0-20221201172708-2bdff61fa52a/go.mod h1:qJ3e8bA8h4wz/jYlbeEUafVHdrU7DkpStnmIUAz6VTQ= +go.opentelemetry.io/collector/consumer v0.66.1-0.20221202005155-1c54042beb70 h1:XwpVjI1KeKGPXOZBLefGILMziPYuNf6IzbmiIEsIyI0= +go.opentelemetry.io/collector/consumer v0.66.1-0.20221202005155-1c54042beb70/go.mod h1:EWVBcSGcIcmeDGTnIboc/aqa3agsBeH8/q7yFWG7xVc= +go.opentelemetry.io/collector/featuregate v0.66.1-0.20221202005155-1c54042beb70 h1:V0tf4ebciqIs07jFATfLGdUpLRaEsi+AiWuA/in0G8Y= +go.opentelemetry.io/collector/featuregate v0.66.1-0.20221202005155-1c54042beb70/go.mod h1:tewuFKJYalWBU0bmNKg++MC1ipINXUr6szYzOw2p1GI= +go.opentelemetry.io/collector/pdata v0.66.1-0.20221202005155-1c54042beb70 h1:TPOrxkEMvZzfBSwF3ct+kUUgKA5g8unkZZbKQvJweeA= +go.opentelemetry.io/collector/pdata v0.66.1-0.20221202005155-1c54042beb70/go.mod h1:pqyaznLzk21m+1KL6fwOsRryRELL+zNM0qiVSn0MbVc= 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= @@ -307,8 +309,8 @@ go.uber.org/multierr v1.6.0/go.mod h1:cdWPpRnG4AhwMwsgIHip0KRBQjJy5kYEpYjJxpXp9i go.uber.org/multierr v1.8.0 h1:dg6GjLku4EH+249NNmoIciG9N/jURbDG+pFlTkhzIC8= go.uber.org/multierr v1.8.0/go.mod h1:7EAYxJLBy9rStEaz58O2t4Uvip6FSURkq8/ppBp95ak= go.uber.org/zap v1.17.0/go.mod h1:MXVU+bhUf/A7Xi2HNOnopQOrmycQ5Ih87HtOu4q5SSo= -go.uber.org/zap v1.23.0 h1:OjGQ5KQDEUawVHxNwQgPpiypGHOxo2mNZsOqTak4fFY= -go.uber.org/zap v1.23.0/go.mod h1:D+nX8jyLsMHMYrln8A0rJjFt/T/9/bGgIhAqxv5URuY= +go.uber.org/zap v1.24.0 h1:FiJd5l1UOLj0wCgbSE0rwwXHzEdAZS6hiiSnxJN/D60= +go.uber.org/zap v1.24.0/go.mod h1:2kMP+WWQ8aoFoedH3T2sq6iJ2yDWpHbP0f6MQbS9Gkg= golang.org/x/crypto v0.0.0-20180904163835-0709b304e793/go.mod h1:6SG95UA2DQfeDnfUPMdvaQW0Q7yPrPDi9nlGo2tz2b4= golang.org/x/crypto v0.0.0-20190308221718-c2843e01d9a2/go.mod h1:djNgcEr1/C05ACkg1iLfiJU5Ep61QUkGW8qpdssI0+w= golang.org/x/crypto v0.0.0-20190923035154-9ee001bba392/go.mod h1:/lpIB1dKB+9EgE3H3cr1v9wB50oz8l4C4h62xy7jSTY= diff --git a/receiver/influxdbreceiver/go.mod b/receiver/influxdbreceiver/go.mod index 6b343048701b..07e9b97e556a 100644 --- a/receiver/influxdbreceiver/go.mod +++ b/receiver/influxdbreceiver/go.mod @@ -7,10 +7,10 @@ require ( github.com/influxdata/influxdb-observability/influx2otel v0.2.32 github.com/influxdata/line-protocol/v2 v2.2.1 github.com/open-telemetry/opentelemetry-collector-contrib/internal/common v0.66.0 - go.opentelemetry.io/collector v0.66.1-0.20221128222955-4ff1ff379b90 - go.opentelemetry.io/collector/component v0.66.1-0.20221128222955-4ff1ff379b90 - go.opentelemetry.io/collector/consumer v0.66.1-0.20221128222955-4ff1ff379b90 - go.uber.org/zap v1.23.0 + go.opentelemetry.io/collector v0.66.1-0.20221202005155-1c54042beb70 + go.opentelemetry.io/collector/component v0.66.1-0.20221202005155-1c54042beb70 + go.opentelemetry.io/collector/consumer v0.66.1-0.20221202005155-1c54042beb70 + go.uber.org/zap v1.24.0 ) require ( @@ -32,8 +32,9 @@ 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/featuregate v0.66.1-0.20221128222955-4ff1ff379b90 // indirect - go.opentelemetry.io/collector/pdata v0.66.1-0.20221128222955-4ff1ff379b90 // indirect + go.opentelemetry.io/collector/confmap v0.0.0-20221201172708-2bdff61fa52a // indirect + go.opentelemetry.io/collector/featuregate v0.66.1-0.20221202005155-1c54042beb70 // indirect + go.opentelemetry.io/collector/pdata v0.66.1-0.20221202005155-1c54042beb70 // 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 55d8307f8a8f..ea52904e96e8 100644 --- a/receiver/influxdbreceiver/go.sum +++ b/receiver/influxdbreceiver/go.sum @@ -291,16 +291,18 @@ github.com/yuin/goldmark v1.3.5/go.mod h1:mwnBkeHKe2W/ZEtQ+71ViKU8L12m81fl3OWwC1 go.etcd.io/etcd/api/v3 v3.5.4/go.mod h1:5GB2vv4A4AOn3yk7MftYGHkUfGtDHnEraIjym4dYz5A= go.etcd.io/etcd/client/pkg/v3 v3.5.4/go.mod h1:IJHfcCEKxYu1Os13ZdwCwIUTUVGYTSAM3YSwc9/Ac1g= go.etcd.io/etcd/client/v3 v3.5.4/go.mod h1:ZaRkVgBZC+L+dLCjTcF1hRXpgZXQPOvnA/Ak/gq3kiY= -go.opentelemetry.io/collector v0.66.1-0.20221128222955-4ff1ff379b90 h1:yRe05/jMdzH4TFHfndZ5h2o2hKBK/79W72j8w51qNsI= -go.opentelemetry.io/collector v0.66.1-0.20221128222955-4ff1ff379b90/go.mod h1:hE6jCs+0rfiufCrVPucKZTMwfHit1okfDPnwPT2eW1I= -go.opentelemetry.io/collector/component v0.66.1-0.20221128222955-4ff1ff379b90 h1:AYSNTXbezhNg43EuYdVVcgxE/2gBVrm00FDx4DOmQVg= -go.opentelemetry.io/collector/component v0.66.1-0.20221128222955-4ff1ff379b90/go.mod h1:0c84EqXUhvYe6KW7hJfh76tiI/5yjWCH2amwyQ06XLM= -go.opentelemetry.io/collector/consumer v0.66.1-0.20221128222955-4ff1ff379b90 h1:nzNXVfC1FzXBXCLMzbMv+qK3E4EGiNsnMhfVsBd2yzc= -go.opentelemetry.io/collector/consumer v0.66.1-0.20221128222955-4ff1ff379b90/go.mod h1:WtoRZa5SnxQO1ZEQdVxYpFcXCmq62rakv0oUSlPO0NQ= -go.opentelemetry.io/collector/featuregate v0.66.1-0.20221128222955-4ff1ff379b90 h1:UuJSFWbi9XxyNZsJKZuvpWg35BgRbcCGFH+38V2MAdw= -go.opentelemetry.io/collector/featuregate v0.66.1-0.20221128222955-4ff1ff379b90/go.mod h1:tewuFKJYalWBU0bmNKg++MC1ipINXUr6szYzOw2p1GI= -go.opentelemetry.io/collector/pdata v0.66.1-0.20221128222955-4ff1ff379b90 h1:Vu4S4jSNcd0VFPzxQNO4+UqGwnes1xJDoFLPRiWHm8I= -go.opentelemetry.io/collector/pdata v0.66.1-0.20221128222955-4ff1ff379b90/go.mod h1:pqyaznLzk21m+1KL6fwOsRryRELL+zNM0qiVSn0MbVc= +go.opentelemetry.io/collector v0.66.1-0.20221202005155-1c54042beb70 h1:INB2CsOtqqrija2KvMuIpbBQ3qX1BECEeR+d0NJX+oM= +go.opentelemetry.io/collector v0.66.1-0.20221202005155-1c54042beb70/go.mod h1:d0NHkHyANJy3HDTvYE/PoylMShUmFIbiir89ieI0X0c= +go.opentelemetry.io/collector/component v0.66.1-0.20221202005155-1c54042beb70 h1:dEoJhzCmRShgmVro/kXm6pouGElgxkH2DsvanzCeZtU= +go.opentelemetry.io/collector/component v0.66.1-0.20221202005155-1c54042beb70/go.mod h1:OsVnvFFe38QSpcuZlQ8cvarDzcloCexgQ1/B2m80F6U= +go.opentelemetry.io/collector/confmap v0.0.0-20221201172708-2bdff61fa52a h1:2TscCXAQASO2kU9xHcMIUM/FP29fiQIRTilZmliq/7I= +go.opentelemetry.io/collector/confmap v0.0.0-20221201172708-2bdff61fa52a/go.mod h1:qJ3e8bA8h4wz/jYlbeEUafVHdrU7DkpStnmIUAz6VTQ= +go.opentelemetry.io/collector/consumer v0.66.1-0.20221202005155-1c54042beb70 h1:XwpVjI1KeKGPXOZBLefGILMziPYuNf6IzbmiIEsIyI0= +go.opentelemetry.io/collector/consumer v0.66.1-0.20221202005155-1c54042beb70/go.mod h1:EWVBcSGcIcmeDGTnIboc/aqa3agsBeH8/q7yFWG7xVc= +go.opentelemetry.io/collector/featuregate v0.66.1-0.20221202005155-1c54042beb70 h1:V0tf4ebciqIs07jFATfLGdUpLRaEsi+AiWuA/in0G8Y= +go.opentelemetry.io/collector/featuregate v0.66.1-0.20221202005155-1c54042beb70/go.mod h1:tewuFKJYalWBU0bmNKg++MC1ipINXUr6szYzOw2p1GI= +go.opentelemetry.io/collector/pdata v0.66.1-0.20221202005155-1c54042beb70 h1:TPOrxkEMvZzfBSwF3ct+kUUgKA5g8unkZZbKQvJweeA= +go.opentelemetry.io/collector/pdata v0.66.1-0.20221202005155-1c54042beb70/go.mod h1:pqyaznLzk21m+1KL6fwOsRryRELL+zNM0qiVSn0MbVc= 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= @@ -318,8 +320,8 @@ go.uber.org/multierr v1.6.0/go.mod h1:cdWPpRnG4AhwMwsgIHip0KRBQjJy5kYEpYjJxpXp9i go.uber.org/multierr v1.8.0 h1:dg6GjLku4EH+249NNmoIciG9N/jURbDG+pFlTkhzIC8= go.uber.org/multierr v1.8.0/go.mod h1:7EAYxJLBy9rStEaz58O2t4Uvip6FSURkq8/ppBp95ak= go.uber.org/zap v1.17.0/go.mod h1:MXVU+bhUf/A7Xi2HNOnopQOrmycQ5Ih87HtOu4q5SSo= -go.uber.org/zap v1.23.0 h1:OjGQ5KQDEUawVHxNwQgPpiypGHOxo2mNZsOqTak4fFY= -go.uber.org/zap v1.23.0/go.mod h1:D+nX8jyLsMHMYrln8A0rJjFt/T/9/bGgIhAqxv5URuY= +go.uber.org/zap v1.24.0 h1:FiJd5l1UOLj0wCgbSE0rwwXHzEdAZS6hiiSnxJN/D60= +go.uber.org/zap v1.24.0/go.mod h1:2kMP+WWQ8aoFoedH3T2sq6iJ2yDWpHbP0f6MQbS9Gkg= golang.org/x/crypto v0.0.0-20180904163835-0709b304e793/go.mod h1:6SG95UA2DQfeDnfUPMdvaQW0Q7yPrPDi9nlGo2tz2b4= golang.org/x/crypto v0.0.0-20190308221718-c2843e01d9a2/go.mod h1:djNgcEr1/C05ACkg1iLfiJU5Ep61QUkGW8qpdssI0+w= golang.org/x/crypto v0.0.0-20190923035154-9ee001bba392/go.mod h1:/lpIB1dKB+9EgE3H3cr1v9wB50oz8l4C4h62xy7jSTY= diff --git a/receiver/jaegerreceiver/factory.go b/receiver/jaegerreceiver/factory.go index d44fd30b270c..fb74f5577e0b 100644 --- a/receiver/jaegerreceiver/factory.go +++ b/receiver/jaegerreceiver/factory.go @@ -111,5 +111,5 @@ func createTracesReceiver( } // Create the receiver. - return newJaegerReceiver(rCfg.ID(), &config, nextConsumer, set) + return newJaegerReceiver(set.ID, &config, nextConsumer, set) } diff --git a/receiver/jaegerreceiver/go.mod b/receiver/jaegerreceiver/go.mod index 8fce28a31256..c50e84589b1e 100644 --- a/receiver/jaegerreceiver/go.mod +++ b/receiver/jaegerreceiver/go.mod @@ -9,11 +9,12 @@ require ( github.com/open-telemetry/opentelemetry-collector-contrib/internal/common v0.66.0 github.com/open-telemetry/opentelemetry-collector-contrib/pkg/translator/jaeger v0.66.0 github.com/stretchr/testify v1.8.1 - go.opentelemetry.io/collector v0.66.1-0.20221128222955-4ff1ff379b90 - go.opentelemetry.io/collector/component v0.66.1-0.20221128222955-4ff1ff379b90 - go.opentelemetry.io/collector/consumer v0.66.1-0.20221128222955-4ff1ff379b90 - go.opentelemetry.io/collector/pdata v0.66.1-0.20221128222955-4ff1ff379b90 - go.opentelemetry.io/collector/semconv v0.66.1-0.20221128222955-4ff1ff379b90 + go.opentelemetry.io/collector v0.66.1-0.20221202005155-1c54042beb70 + go.opentelemetry.io/collector/component v0.66.1-0.20221202005155-1c54042beb70 + go.opentelemetry.io/collector/confmap v0.0.0-20221201172708-2bdff61fa52a + go.opentelemetry.io/collector/consumer v0.66.1-0.20221202005155-1c54042beb70 + go.opentelemetry.io/collector/pdata v0.66.1-0.20221202005155-1c54042beb70 + go.opentelemetry.io/collector/semconv v0.66.1-0.20221202005155-1c54042beb70 go.uber.org/multierr v1.8.0 google.golang.org/grpc v1.51.0 ) @@ -44,14 +45,14 @@ require ( github.com/uber/jaeger-client-go v2.30.0+incompatible // indirect github.com/uber/jaeger-lib v2.4.1+incompatible // indirect go.opencensus.io v0.24.0 // indirect - go.opentelemetry.io/collector/featuregate v0.66.1-0.20221128222955-4ff1ff379b90 // indirect + go.opentelemetry.io/collector/featuregate v0.66.1-0.20221202005155-1c54042beb70 // 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 go.opentelemetry.io/otel/metric v0.33.0 // indirect go.opentelemetry.io/otel/trace v1.11.1 // indirect go.uber.org/atomic v1.10.0 // indirect - go.uber.org/zap v1.23.0 // indirect + go.uber.org/zap v1.24.0 // indirect golang.org/x/net v0.0.0-20221014081412-f15817d10f9b // indirect golang.org/x/oauth2 v0.0.0-20221014153046-6fdb5e3db783 // indirect golang.org/x/sys v0.2.0 // indirect diff --git a/receiver/jaegerreceiver/go.sum b/receiver/jaegerreceiver/go.sum index 95a47868f56a..c882b878b5cf 100644 --- a/receiver/jaegerreceiver/go.sum +++ b/receiver/jaegerreceiver/go.sum @@ -330,18 +330,20 @@ go.etcd.io/etcd/client/pkg/v3 v3.5.4/go.mod h1:IJHfcCEKxYu1Os13ZdwCwIUTUVGYTSAM3 go.etcd.io/etcd/client/v3 v3.5.4/go.mod h1:ZaRkVgBZC+L+dLCjTcF1hRXpgZXQPOvnA/Ak/gq3kiY= go.opencensus.io v0.24.0 h1:y73uSU6J157QMP2kn2r30vwW1A2W2WFwSCGnAVxeaD0= go.opencensus.io v0.24.0/go.mod h1:vNK8G9p7aAivkbmorf4v+7Hgx+Zs0yY+0fOtgBfjQKo= -go.opentelemetry.io/collector v0.66.1-0.20221128222955-4ff1ff379b90 h1:yRe05/jMdzH4TFHfndZ5h2o2hKBK/79W72j8w51qNsI= -go.opentelemetry.io/collector v0.66.1-0.20221128222955-4ff1ff379b90/go.mod h1:hE6jCs+0rfiufCrVPucKZTMwfHit1okfDPnwPT2eW1I= -go.opentelemetry.io/collector/component v0.66.1-0.20221128222955-4ff1ff379b90 h1:AYSNTXbezhNg43EuYdVVcgxE/2gBVrm00FDx4DOmQVg= -go.opentelemetry.io/collector/component v0.66.1-0.20221128222955-4ff1ff379b90/go.mod h1:0c84EqXUhvYe6KW7hJfh76tiI/5yjWCH2amwyQ06XLM= -go.opentelemetry.io/collector/consumer v0.66.1-0.20221128222955-4ff1ff379b90 h1:nzNXVfC1FzXBXCLMzbMv+qK3E4EGiNsnMhfVsBd2yzc= -go.opentelemetry.io/collector/consumer v0.66.1-0.20221128222955-4ff1ff379b90/go.mod h1:WtoRZa5SnxQO1ZEQdVxYpFcXCmq62rakv0oUSlPO0NQ= -go.opentelemetry.io/collector/featuregate v0.66.1-0.20221128222955-4ff1ff379b90 h1:UuJSFWbi9XxyNZsJKZuvpWg35BgRbcCGFH+38V2MAdw= -go.opentelemetry.io/collector/featuregate v0.66.1-0.20221128222955-4ff1ff379b90/go.mod h1:tewuFKJYalWBU0bmNKg++MC1ipINXUr6szYzOw2p1GI= -go.opentelemetry.io/collector/pdata v0.66.1-0.20221128222955-4ff1ff379b90 h1:Vu4S4jSNcd0VFPzxQNO4+UqGwnes1xJDoFLPRiWHm8I= -go.opentelemetry.io/collector/pdata v0.66.1-0.20221128222955-4ff1ff379b90/go.mod h1:pqyaznLzk21m+1KL6fwOsRryRELL+zNM0qiVSn0MbVc= -go.opentelemetry.io/collector/semconv v0.66.1-0.20221128222955-4ff1ff379b90 h1:hFaTA68cggZKWMv7wQ3bKP8KGTbowh/5AQZKCHzHTqM= -go.opentelemetry.io/collector/semconv v0.66.1-0.20221128222955-4ff1ff379b90/go.mod h1:5o9yhOa+ABt7g2E5JABDxGZ1PQPbtfxrKNbYn+LOTXU= +go.opentelemetry.io/collector v0.66.1-0.20221202005155-1c54042beb70 h1:INB2CsOtqqrija2KvMuIpbBQ3qX1BECEeR+d0NJX+oM= +go.opentelemetry.io/collector v0.66.1-0.20221202005155-1c54042beb70/go.mod h1:d0NHkHyANJy3HDTvYE/PoylMShUmFIbiir89ieI0X0c= +go.opentelemetry.io/collector/component v0.66.1-0.20221202005155-1c54042beb70 h1:dEoJhzCmRShgmVro/kXm6pouGElgxkH2DsvanzCeZtU= +go.opentelemetry.io/collector/component v0.66.1-0.20221202005155-1c54042beb70/go.mod h1:OsVnvFFe38QSpcuZlQ8cvarDzcloCexgQ1/B2m80F6U= +go.opentelemetry.io/collector/confmap v0.0.0-20221201172708-2bdff61fa52a h1:2TscCXAQASO2kU9xHcMIUM/FP29fiQIRTilZmliq/7I= +go.opentelemetry.io/collector/confmap v0.0.0-20221201172708-2bdff61fa52a/go.mod h1:qJ3e8bA8h4wz/jYlbeEUafVHdrU7DkpStnmIUAz6VTQ= +go.opentelemetry.io/collector/consumer v0.66.1-0.20221202005155-1c54042beb70 h1:XwpVjI1KeKGPXOZBLefGILMziPYuNf6IzbmiIEsIyI0= +go.opentelemetry.io/collector/consumer v0.66.1-0.20221202005155-1c54042beb70/go.mod h1:EWVBcSGcIcmeDGTnIboc/aqa3agsBeH8/q7yFWG7xVc= +go.opentelemetry.io/collector/featuregate v0.66.1-0.20221202005155-1c54042beb70 h1:V0tf4ebciqIs07jFATfLGdUpLRaEsi+AiWuA/in0G8Y= +go.opentelemetry.io/collector/featuregate v0.66.1-0.20221202005155-1c54042beb70/go.mod h1:tewuFKJYalWBU0bmNKg++MC1ipINXUr6szYzOw2p1GI= +go.opentelemetry.io/collector/pdata v0.66.1-0.20221202005155-1c54042beb70 h1:TPOrxkEMvZzfBSwF3ct+kUUgKA5g8unkZZbKQvJweeA= +go.opentelemetry.io/collector/pdata v0.66.1-0.20221202005155-1c54042beb70/go.mod h1:pqyaznLzk21m+1KL6fwOsRryRELL+zNM0qiVSn0MbVc= +go.opentelemetry.io/collector/semconv v0.66.1-0.20221202005155-1c54042beb70 h1:Q5L9Urod3c8as6ZYaoaqBjarx/HXxsxy34DFZIU2fO4= +go.opentelemetry.io/collector/semconv v0.66.1-0.20221202005155-1c54042beb70/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= @@ -364,8 +366,8 @@ go.uber.org/multierr v1.6.0/go.mod h1:cdWPpRnG4AhwMwsgIHip0KRBQjJy5kYEpYjJxpXp9i go.uber.org/multierr v1.8.0 h1:dg6GjLku4EH+249NNmoIciG9N/jURbDG+pFlTkhzIC8= go.uber.org/multierr v1.8.0/go.mod h1:7EAYxJLBy9rStEaz58O2t4Uvip6FSURkq8/ppBp95ak= go.uber.org/zap v1.17.0/go.mod h1:MXVU+bhUf/A7Xi2HNOnopQOrmycQ5Ih87HtOu4q5SSo= -go.uber.org/zap v1.23.0 h1:OjGQ5KQDEUawVHxNwQgPpiypGHOxo2mNZsOqTak4fFY= -go.uber.org/zap v1.23.0/go.mod h1:D+nX8jyLsMHMYrln8A0rJjFt/T/9/bGgIhAqxv5URuY= +go.uber.org/zap v1.24.0 h1:FiJd5l1UOLj0wCgbSE0rwwXHzEdAZS6hiiSnxJN/D60= +go.uber.org/zap v1.24.0/go.mod h1:2kMP+WWQ8aoFoedH3T2sq6iJ2yDWpHbP0f6MQbS9Gkg= golang.org/x/crypto v0.0.0-20180904163835-0709b304e793/go.mod h1:6SG95UA2DQfeDnfUPMdvaQW0Q7yPrPDi9nlGo2tz2b4= golang.org/x/crypto v0.0.0-20190308221718-c2843e01d9a2/go.mod h1:djNgcEr1/C05ACkg1iLfiJU5Ep61QUkGW8qpdssI0+w= golang.org/x/crypto v0.0.0-20190923035154-9ee001bba392/go.mod h1:/lpIB1dKB+9EgE3H3cr1v9wB50oz8l4C4h62xy7jSTY= diff --git a/receiver/jmxreceiver/config.go b/receiver/jmxreceiver/config.go index 7c0119e75d67..4e36e7294b16 100644 --- a/receiver/jmxreceiver/config.go +++ b/receiver/jmxreceiver/config.go @@ -227,7 +227,7 @@ func initAdditionalTargetSystems() { } } -func (c *Config) validate() error { +func (c *Config) Validate() error { var missingFields []string if c.JARPath == "" { missingFields = append(missingFields, "`jar_path`") @@ -242,43 +242,39 @@ func (c *Config) validate() error { missingFields = append(missingFields, "`jar_path`") } if missingFields != nil { - baseMsg := fmt.Sprintf("%v missing required field", c.ID()) - if len(missingFields) > 1 { - baseMsg += "s" - } - return fmt.Errorf("%v: %v", baseMsg, strings.Join(missingFields, ", ")) + return fmt.Errorf("missing required field(s): %v", strings.Join(missingFields, ", ")) } err := c.validateJar(jmxMetricsGathererVersions, c.JARPath) if err != nil { - return fmt.Errorf("%v error validating `jar_path`: %w", c.ID(), err) + return fmt.Errorf("invalid `jar_path`: %w", err) } for _, additionalJar := range c.AdditionalJars { err := c.validateJar(wildflyJarVersions, additionalJar) if err != nil { - return fmt.Errorf("%v error validating `additional_jars`. Additional Jar should be a jboss-client.jar from Wildfly, "+ - "no other integrations require additional jars at this time: %w", c.ID(), err) + return fmt.Errorf("invalid `additional_jars`. Additional Jar should be a jboss-client.jar from Wildfly, "+ + "no other integrations require additional jars at this time: %w", err) } } if c.CollectionInterval < 0 { - return fmt.Errorf("%v `interval` must be positive: %vms", c.ID(), c.CollectionInterval.Milliseconds()) + return fmt.Errorf("`interval` must be positive: %vms", c.CollectionInterval.Milliseconds()) } if c.OTLPExporterConfig.Timeout < 0 { - return fmt.Errorf("%v `otlp.timeout` must be positive: %vms", c.ID(), c.OTLPExporterConfig.Timeout.Milliseconds()) + return fmt.Errorf("`otlp.timeout` must be positive: %vms", c.OTLPExporterConfig.Timeout.Milliseconds()) } if len(c.LogLevel) > 0 { if _, ok := validLogLevels[strings.ToLower(c.LogLevel)]; !ok { - return fmt.Errorf("%v `log_level` must be one of %s", c.ID(), listKeys(validLogLevels)) + return fmt.Errorf("`log_level` must be one of %s", listKeys(validLogLevels)) } } for _, system := range strings.Split(c.TargetSystem, ",") { if _, ok := validTargetSystems[strings.ToLower(system)]; !ok { - return fmt.Errorf("%v `target_system` list may only be a subset of %s", c.ID(), listKeys(validTargetSystems)) + return fmt.Errorf("`target_system` list may only be a subset of %s", listKeys(validTargetSystems)) } } diff --git a/receiver/jmxreceiver/config_test.go b/receiver/jmxreceiver/config_test.go index 87e4302f2789..ea04dc40d492 100644 --- a/receiver/jmxreceiver/config_test.go +++ b/receiver/jmxreceiver/config_test.go @@ -40,7 +40,7 @@ func TestLoadConfig(t *testing.T) { }{ { id: component.NewIDWithName(typeStr, ""), - expectedErr: "missing required fields: `endpoint`, `target_system`", + expectedErr: "missing required field(s): `endpoint`, `target_system`", expected: createDefaultConfig(), }, { @@ -80,7 +80,8 @@ func TestLoadConfig(t *testing.T) { }, }, { - id: component.NewIDWithName(typeStr, "missingendpoint"), + id: component.NewIDWithName(typeStr, "missingendpoint"), + expectedErr: "missing required field(s): `endpoint`", expected: &Config{ ReceiverSettings: config.NewReceiverSettings(component.NewID(typeStr)), JARPath: "testdata/fake_jmx.jar", @@ -96,7 +97,7 @@ func TestLoadConfig(t *testing.T) { }, { id: component.NewIDWithName(typeStr, "missingtarget"), - expectedErr: "jmx missing required field: `target_system`", + expectedErr: "missing required field(s): `target_system`", expected: &Config{ ReceiverSettings: config.NewReceiverSettings(component.NewID(typeStr)), JARPath: "testdata/fake_jmx.jar", @@ -148,7 +149,7 @@ func TestLoadConfig(t *testing.T) { { 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:", + expectedErr: "invalid `jar_path`: error hashing file: open testdata/file_does_not_exist.jar:", expected: &Config{ ReceiverSettings: config.NewReceiverSettings(component.NewID(typeStr)), JARPath: "testdata/file_does_not_exist.jar", @@ -165,7 +166,7 @@ func TestLoadConfig(t *testing.T) { }, { id: component.NewIDWithName(typeStr, "invalidjar"), - expectedErr: "error validating `jar_path`: jar hash does not match known versions", + expectedErr: "invalid `jar_path`: jar hash does not match known versions", expected: &Config{ ReceiverSettings: config.NewReceiverSettings(component.NewID(typeStr)), JARPath: "testdata/fake_jmx_wrong.jar", @@ -182,7 +183,7 @@ func TestLoadConfig(t *testing.T) { }, { id: component.NewIDWithName(typeStr, "invalidloglevel"), - expectedErr: "jmx `log_level` must be one of 'debug', 'error', 'info', 'off', 'trace', 'warn'", + expectedErr: "`log_level` must be one of 'debug', 'error', 'info', 'off', 'trace', 'warn'", expected: &Config{ ReceiverSettings: config.NewReceiverSettings(component.NewID(typeStr)), JARPath: "testdata/fake_jmx.jar", @@ -232,7 +233,7 @@ func TestLoadConfig(t *testing.T) { require.NoError(t, component.UnmarshalConfig(sub, cfg)) if tt.expectedErr != "" { - assert.ErrorContains(t, cfg.(*Config).validate(), tt.expectedErr) + assert.ErrorContains(t, cfg.(*Config).Validate(), tt.expectedErr) assert.Equal(t, tt.expected, cfg) return } @@ -259,16 +260,16 @@ func TestCustomMetricsGathererConfig(t *testing.T) { conf := cfg.(*Config) - err = conf.validate() + err = conf.Validate() require.Error(t, err) - assert.Equal(t, "jmx error validating `jar_path`: jar hash does not match known versions", err.Error()) + assert.Equal(t, "invalid `jar_path`: jar hash does not match known versions", err.Error()) MetricsGathererHash = "5994471abb01112afcc18159f6cc74b4f511b99806da59b3caf5a9c173cacfc5" initSupportedJars() - err = conf.validate() + err = conf.Validate() require.Error(t, err) - assert.Equal(t, "jmx `target_system` list may only be a subset of 'activemq', 'cassandra', 'hadoop', 'hbase', 'jetty', 'jvm', 'kafka', 'kafka-consumer', 'kafka-producer', 'solr', 'tomcat', 'wildfly'", err.Error()) + assert.Equal(t, "`target_system` list may only be a subset of 'activemq', 'cassandra', 'hadoop', 'hbase', 'jetty', 'jvm', 'kafka', 'kafka-consumer', 'kafka-producer', 'solr', 'tomcat', 'wildfly'", err.Error()) AdditionalTargetSystems = "fakejvmtechnology,anothertechnology" t.Cleanup(func() { @@ -279,7 +280,7 @@ func TestCustomMetricsGathererConfig(t *testing.T) { conf.TargetSystem = "jvm,fakejvmtechnology,anothertechnology" - require.NoError(t, conf.validate()) + require.NoError(t, conf.Validate()) } func TestClassPathParse(t *testing.T) { diff --git a/receiver/jmxreceiver/factory.go b/receiver/jmxreceiver/factory.go index 7ba30677594a..33b430ccae37 100644 --- a/receiver/jmxreceiver/factory.go +++ b/receiver/jmxreceiver/factory.go @@ -58,7 +58,7 @@ func createReceiver( consumer consumer.Metrics, ) (component.MetricsReceiver, error) { jmxConfig := cfg.(*Config) - if err := jmxConfig.validate(); err != nil { + if err := jmxConfig.Validate(); err != nil { return nil, err } return newJMXMetricReceiver(params, jmxConfig, consumer), nil diff --git a/receiver/jmxreceiver/factory_test.go b/receiver/jmxreceiver/factory_test.go index b5fce4f332c0..99943a6cc010 100644 --- a/receiver/jmxreceiver/factory_test.go +++ b/receiver/jmxreceiver/factory_test.go @@ -38,7 +38,7 @@ func TestWithInvalidConfig(t *testing.T) { cfg, consumertest.NewNop(), ) require.Error(t, err) - assert.Equal(t, "jmx missing required fields: `endpoint`, `target_system`", err.Error()) + assert.Equal(t, "missing required field(s): `endpoint`, `target_system`", err.Error()) require.Nil(t, r) } diff --git a/receiver/jmxreceiver/go.mod b/receiver/jmxreceiver/go.mod index bf26a7cc00b9..7b3529b66ac2 100644 --- a/receiver/jmxreceiver/go.mod +++ b/receiver/jmxreceiver/go.mod @@ -7,13 +7,14 @@ 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.66.1-0.20221128222955-4ff1ff379b90 - go.opentelemetry.io/collector/component v0.66.1-0.20221128222955-4ff1ff379b90 - go.opentelemetry.io/collector/consumer v0.66.1-0.20221128222955-4ff1ff379b90 - go.opentelemetry.io/collector/pdata v0.66.1-0.20221128222955-4ff1ff379b90 - go.opentelemetry.io/collector/receiver/otlpreceiver v0.66.1-0.20221128222955-4ff1ff379b90 + go.opentelemetry.io/collector v0.66.1-0.20221202005155-1c54042beb70 + go.opentelemetry.io/collector/component v0.66.1-0.20221202005155-1c54042beb70 + go.opentelemetry.io/collector/confmap v0.0.0-20221201172708-2bdff61fa52a + go.opentelemetry.io/collector/consumer v0.66.1-0.20221202005155-1c54042beb70 + go.opentelemetry.io/collector/pdata v0.66.1-0.20221202005155-1c54042beb70 + go.opentelemetry.io/collector/receiver/otlpreceiver v0.66.1-0.20221202005155-1c54042beb70 go.uber.org/atomic v1.10.0 - go.uber.org/zap v1.23.0 + go.uber.org/zap v1.24.0 ) require ( @@ -62,11 +63,11 @@ require ( github.com/power-devops/perfstat v0.0.0-20210106213030-5aafc221ea8c // indirect github.com/rs/cors v1.8.2 // indirect github.com/sirupsen/logrus v1.8.1 // indirect - github.com/tklauser/go-sysconf v0.3.10 // indirect - github.com/tklauser/numcpus v0.4.0 // indirect + github.com/tklauser/go-sysconf v0.3.11 // indirect + github.com/tklauser/numcpus v0.6.0 // indirect github.com/yusufpapurcu/wmi v1.2.2 // indirect go.opencensus.io v0.24.0 // indirect - go.opentelemetry.io/collector/featuregate v0.66.1-0.20221128222955-4ff1ff379b90 // indirect + go.opentelemetry.io/collector/featuregate v0.66.1-0.20221202005155-1c54042beb70 // 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 4bb794e1bd82..c25c5b24862e 100644 --- a/receiver/jmxreceiver/go.sum +++ b/receiver/jmxreceiver/go.sum @@ -806,10 +806,12 @@ github.com/syndtr/gocapability v0.0.0-20200815063812-42c35b437635/go.mod h1:hkRG github.com/tchap/go-patricia v2.2.6+incompatible/go.mod h1:bmLyhP68RS6kStMGxByiQ23RP/odRBOTVjwp2cDyi6I= github.com/testcontainers/testcontainers-go v0.15.0 h1:3Ex7PUGFv0b2bBsdOv6R42+SK2qoZnWBd21LvZYhUtQ= github.com/testcontainers/testcontainers-go v0.15.0/go.mod h1:PkohMRH2X8Hib0IWtifVexDfLPVT+tb5E9hsf7cW12w= -github.com/tklauser/go-sysconf v0.3.10 h1:IJ1AZGZRWbY8T5Vfk04D9WOA5WSejdflXxP03OUqALw= github.com/tklauser/go-sysconf v0.3.10/go.mod h1:C8XykCvCb+Gn0oNCWPIlcb0RuglQTYaQ2hGm7jmxEFk= -github.com/tklauser/numcpus v0.4.0 h1:E53Dm1HjH1/R2/aoCtXtPgzmElmn51aOkhCFSuZq//o= +github.com/tklauser/go-sysconf v0.3.11 h1:89WgdJhk5SNwJfu+GKyYveZ4IaJ7xAkecBo+KdJV0CM= +github.com/tklauser/go-sysconf v0.3.11/go.mod h1:GqXfhXY3kiPa0nAXPDIQIWzJbMCB7AmcWpGR8lSZfqI= github.com/tklauser/numcpus v0.4.0/go.mod h1:1+UI3pD8NW14VMwdgJNJ1ESk2UnwhAnz5hMwiKKqXCQ= +github.com/tklauser/numcpus v0.6.0 h1:kebhY2Qt+3U6RNK7UqpYNA+tJ23IBEGKkB7JQBfDYms= +github.com/tklauser/numcpus v0.6.0/go.mod h1:FEZLMke0lhOUG6w2JadTzp0a+Nl8PF/GFkQ5UVIcaL4= github.com/tmc/grpc-websocket-proxy v0.0.0-20170815181823-89b8d40f7ca8/go.mod h1:ncp9v5uamzpCO7NfCPTXjqaC+bZgJeR0sMTm6dMHP7U= github.com/tmc/grpc-websocket-proxy v0.0.0-20190109142713-0ad062ec5ee5/go.mod h1:ncp9v5uamzpCO7NfCPTXjqaC+bZgJeR0sMTm6dMHP7U= github.com/ugorji/go v1.1.4/go.mod h1:uQMGLiO92mf5W77hV/PUCpI3pbzQx3CRekS0kk+RGrc= @@ -853,19 +855,21 @@ go.opencensus.io v0.22.2/go.mod h1:yxeiOL68Rb0Xd1ddK5vPZ/oVn4vY4Ynel7k9FzqtOIw= go.opencensus.io v0.22.3/go.mod h1:yxeiOL68Rb0Xd1ddK5vPZ/oVn4vY4Ynel7k9FzqtOIw= go.opencensus.io v0.24.0 h1:y73uSU6J157QMP2kn2r30vwW1A2W2WFwSCGnAVxeaD0= go.opencensus.io v0.24.0/go.mod h1:vNK8G9p7aAivkbmorf4v+7Hgx+Zs0yY+0fOtgBfjQKo= -go.opentelemetry.io/collector v0.66.1-0.20221128222955-4ff1ff379b90 h1:yRe05/jMdzH4TFHfndZ5h2o2hKBK/79W72j8w51qNsI= -go.opentelemetry.io/collector v0.66.1-0.20221128222955-4ff1ff379b90/go.mod h1:hE6jCs+0rfiufCrVPucKZTMwfHit1okfDPnwPT2eW1I= -go.opentelemetry.io/collector/component v0.66.1-0.20221128222955-4ff1ff379b90 h1:AYSNTXbezhNg43EuYdVVcgxE/2gBVrm00FDx4DOmQVg= -go.opentelemetry.io/collector/component v0.66.1-0.20221128222955-4ff1ff379b90/go.mod h1:0c84EqXUhvYe6KW7hJfh76tiI/5yjWCH2amwyQ06XLM= -go.opentelemetry.io/collector/consumer v0.66.1-0.20221128222955-4ff1ff379b90 h1:nzNXVfC1FzXBXCLMzbMv+qK3E4EGiNsnMhfVsBd2yzc= -go.opentelemetry.io/collector/consumer v0.66.1-0.20221128222955-4ff1ff379b90/go.mod h1:WtoRZa5SnxQO1ZEQdVxYpFcXCmq62rakv0oUSlPO0NQ= -go.opentelemetry.io/collector/featuregate v0.66.1-0.20221128222955-4ff1ff379b90 h1:UuJSFWbi9XxyNZsJKZuvpWg35BgRbcCGFH+38V2MAdw= -go.opentelemetry.io/collector/featuregate v0.66.1-0.20221128222955-4ff1ff379b90/go.mod h1:tewuFKJYalWBU0bmNKg++MC1ipINXUr6szYzOw2p1GI= -go.opentelemetry.io/collector/pdata v0.66.1-0.20221128222955-4ff1ff379b90 h1:Vu4S4jSNcd0VFPzxQNO4+UqGwnes1xJDoFLPRiWHm8I= -go.opentelemetry.io/collector/pdata v0.66.1-0.20221128222955-4ff1ff379b90/go.mod h1:pqyaznLzk21m+1KL6fwOsRryRELL+zNM0qiVSn0MbVc= -go.opentelemetry.io/collector/receiver/otlpreceiver v0.66.1-0.20221128222955-4ff1ff379b90 h1:/+HfaoVPSXgHUZOTZSSriuKOQi8L/rgyb7TTRx5jzoo= -go.opentelemetry.io/collector/receiver/otlpreceiver v0.66.1-0.20221128222955-4ff1ff379b90/go.mod h1:pb+dcV+KJ44dP+CqV0N6L6dTeDDvCXB8StCqwlrrSkM= -go.opentelemetry.io/collector/semconv v0.65.0 h1:y3eB42UD+Ie/918wuZD6VdqNgMD05gjAI7SVkWKrA38= +go.opentelemetry.io/collector v0.66.1-0.20221202005155-1c54042beb70 h1:INB2CsOtqqrija2KvMuIpbBQ3qX1BECEeR+d0NJX+oM= +go.opentelemetry.io/collector v0.66.1-0.20221202005155-1c54042beb70/go.mod h1:d0NHkHyANJy3HDTvYE/PoylMShUmFIbiir89ieI0X0c= +go.opentelemetry.io/collector/component v0.66.1-0.20221202005155-1c54042beb70 h1:dEoJhzCmRShgmVro/kXm6pouGElgxkH2DsvanzCeZtU= +go.opentelemetry.io/collector/component v0.66.1-0.20221202005155-1c54042beb70/go.mod h1:OsVnvFFe38QSpcuZlQ8cvarDzcloCexgQ1/B2m80F6U= +go.opentelemetry.io/collector/confmap v0.0.0-20221201172708-2bdff61fa52a h1:2TscCXAQASO2kU9xHcMIUM/FP29fiQIRTilZmliq/7I= +go.opentelemetry.io/collector/confmap v0.0.0-20221201172708-2bdff61fa52a/go.mod h1:qJ3e8bA8h4wz/jYlbeEUafVHdrU7DkpStnmIUAz6VTQ= +go.opentelemetry.io/collector/consumer v0.66.1-0.20221202005155-1c54042beb70 h1:XwpVjI1KeKGPXOZBLefGILMziPYuNf6IzbmiIEsIyI0= +go.opentelemetry.io/collector/consumer v0.66.1-0.20221202005155-1c54042beb70/go.mod h1:EWVBcSGcIcmeDGTnIboc/aqa3agsBeH8/q7yFWG7xVc= +go.opentelemetry.io/collector/featuregate v0.66.1-0.20221202005155-1c54042beb70 h1:V0tf4ebciqIs07jFATfLGdUpLRaEsi+AiWuA/in0G8Y= +go.opentelemetry.io/collector/featuregate v0.66.1-0.20221202005155-1c54042beb70/go.mod h1:tewuFKJYalWBU0bmNKg++MC1ipINXUr6szYzOw2p1GI= +go.opentelemetry.io/collector/pdata v0.66.1-0.20221202005155-1c54042beb70 h1:TPOrxkEMvZzfBSwF3ct+kUUgKA5g8unkZZbKQvJweeA= +go.opentelemetry.io/collector/pdata v0.66.1-0.20221202005155-1c54042beb70/go.mod h1:pqyaznLzk21m+1KL6fwOsRryRELL+zNM0qiVSn0MbVc= +go.opentelemetry.io/collector/receiver/otlpreceiver v0.66.1-0.20221202005155-1c54042beb70 h1:KBbbPVDV7o5w857g6ePphdu4MV87jrcQevFYDA1okUk= +go.opentelemetry.io/collector/receiver/otlpreceiver v0.66.1-0.20221202005155-1c54042beb70/go.mod h1:0Py8RNjNiFRH6/F+vM2uptdaw9hMj1FBdv0ySntM2gE= +go.opentelemetry.io/collector/semconv v0.66.0 h1:gz4fYzOVOt1EQCcOL6pbSmTRj93pZErjHD+H100pH+4= 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= @@ -892,8 +896,8 @@ go.uber.org/multierr v1.8.0 h1:dg6GjLku4EH+249NNmoIciG9N/jURbDG+pFlTkhzIC8= go.uber.org/multierr v1.8.0/go.mod h1:7EAYxJLBy9rStEaz58O2t4Uvip6FSURkq8/ppBp95ak= go.uber.org/zap v1.10.0/go.mod h1:vwi/ZaCAaUcBkycHslxD9B2zi4UTXhF60s6SWpuDF0Q= go.uber.org/zap v1.17.0/go.mod h1:MXVU+bhUf/A7Xi2HNOnopQOrmycQ5Ih87HtOu4q5SSo= -go.uber.org/zap v1.23.0 h1:OjGQ5KQDEUawVHxNwQgPpiypGHOxo2mNZsOqTak4fFY= -go.uber.org/zap v1.23.0/go.mod h1:D+nX8jyLsMHMYrln8A0rJjFt/T/9/bGgIhAqxv5URuY= +go.uber.org/zap v1.24.0 h1:FiJd5l1UOLj0wCgbSE0rwwXHzEdAZS6hiiSnxJN/D60= +go.uber.org/zap v1.24.0/go.mod h1:2kMP+WWQ8aoFoedH3T2sq6iJ2yDWpHbP0f6MQbS9Gkg= golang.org/x/crypto v0.0.0-20171113213409-9f005a07e0d3/go.mod h1:6SG95UA2DQfeDnfUPMdvaQW0Q7yPrPDi9nlGo2tz2b4= golang.org/x/crypto v0.0.0-20180904163835-0709b304e793/go.mod h1:6SG95UA2DQfeDnfUPMdvaQW0Q7yPrPDi9nlGo2tz2b4= golang.org/x/crypto v0.0.0-20181009213950-7c1a557ab941/go.mod h1:6SG95UA2DQfeDnfUPMdvaQW0Q7yPrPDi9nlGo2tz2b4= diff --git a/receiver/jmxreceiver/integration_test.go b/receiver/jmxreceiver/integration_test.go index 1b30a7c943d3..528e59663192 100644 --- a/receiver/jmxreceiver/integration_test.go +++ b/receiver/jmxreceiver/integration_test.go @@ -171,7 +171,7 @@ func (suite *JMXIntegrationSuite) TestJMXReceiverHappyPath() { }, LogLevel: "debug", } - require.NoError(t, cfg.validate()) + require.NoError(t, cfg.Validate()) consumer := new(consumertest.MetricsSink) require.NotNil(t, consumer) diff --git a/receiver/journaldreceiver/go.mod b/receiver/journaldreceiver/go.mod index 45bf2dacc4e0..bdd0569e3fd1 100644 --- a/receiver/journaldreceiver/go.mod +++ b/receiver/journaldreceiver/go.mod @@ -5,9 +5,10 @@ go 1.18 require ( github.com/open-telemetry/opentelemetry-collector-contrib/pkg/stanza v0.66.0 github.com/stretchr/testify v1.8.1 - go.opentelemetry.io/collector v0.66.1-0.20221128222955-4ff1ff379b90 - go.opentelemetry.io/collector/component v0.66.1-0.20221128222955-4ff1ff379b90 - go.opentelemetry.io/collector/consumer v0.66.1-0.20221128222955-4ff1ff379b90 + go.opentelemetry.io/collector v0.66.1-0.20221202005155-1c54042beb70 + go.opentelemetry.io/collector/component v0.66.1-0.20221202005155-1c54042beb70 + go.opentelemetry.io/collector/confmap v0.0.0-20221201172708-2bdff61fa52a + go.opentelemetry.io/collector/consumer v0.66.1-0.20221202005155-1c54042beb70 ) require ( @@ -29,14 +30,14 @@ require ( github.com/pmezard/go-difflib v1.0.0 // indirect github.com/rogpeppe/go-internal v1.8.1 // indirect go.opencensus.io v0.24.0 // indirect - go.opentelemetry.io/collector/featuregate v0.66.1-0.20221128222955-4ff1ff379b90 // indirect - go.opentelemetry.io/collector/pdata v0.66.1-0.20221128222955-4ff1ff379b90 // indirect + go.opentelemetry.io/collector/featuregate v0.66.1-0.20221202005155-1c54042beb70 // indirect + go.opentelemetry.io/collector/pdata v0.66.1-0.20221202005155-1c54042beb70 // 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 go.uber.org/atomic v1.10.0 // indirect go.uber.org/multierr v1.8.0 // indirect - go.uber.org/zap v1.23.0 // indirect + go.uber.org/zap v1.24.0 // indirect golang.org/x/net v0.0.0-20220722155237-a158d28d115b // indirect golang.org/x/sys v0.2.0 // indirect golang.org/x/text v0.4.0 // indirect diff --git a/receiver/journaldreceiver/go.sum b/receiver/journaldreceiver/go.sum index bc5848452b04..ab674d893c76 100644 --- a/receiver/journaldreceiver/go.sum +++ b/receiver/journaldreceiver/go.sum @@ -305,16 +305,18 @@ go.etcd.io/etcd/client/pkg/v3 v3.5.4/go.mod h1:IJHfcCEKxYu1Os13ZdwCwIUTUVGYTSAM3 go.etcd.io/etcd/client/v3 v3.5.4/go.mod h1:ZaRkVgBZC+L+dLCjTcF1hRXpgZXQPOvnA/Ak/gq3kiY= go.opencensus.io v0.24.0 h1:y73uSU6J157QMP2kn2r30vwW1A2W2WFwSCGnAVxeaD0= go.opencensus.io v0.24.0/go.mod h1:vNK8G9p7aAivkbmorf4v+7Hgx+Zs0yY+0fOtgBfjQKo= -go.opentelemetry.io/collector v0.66.1-0.20221128222955-4ff1ff379b90 h1:yRe05/jMdzH4TFHfndZ5h2o2hKBK/79W72j8w51qNsI= -go.opentelemetry.io/collector v0.66.1-0.20221128222955-4ff1ff379b90/go.mod h1:hE6jCs+0rfiufCrVPucKZTMwfHit1okfDPnwPT2eW1I= -go.opentelemetry.io/collector/component v0.66.1-0.20221128222955-4ff1ff379b90 h1:AYSNTXbezhNg43EuYdVVcgxE/2gBVrm00FDx4DOmQVg= -go.opentelemetry.io/collector/component v0.66.1-0.20221128222955-4ff1ff379b90/go.mod h1:0c84EqXUhvYe6KW7hJfh76tiI/5yjWCH2amwyQ06XLM= -go.opentelemetry.io/collector/consumer v0.66.1-0.20221128222955-4ff1ff379b90 h1:nzNXVfC1FzXBXCLMzbMv+qK3E4EGiNsnMhfVsBd2yzc= -go.opentelemetry.io/collector/consumer v0.66.1-0.20221128222955-4ff1ff379b90/go.mod h1:WtoRZa5SnxQO1ZEQdVxYpFcXCmq62rakv0oUSlPO0NQ= -go.opentelemetry.io/collector/featuregate v0.66.1-0.20221128222955-4ff1ff379b90 h1:UuJSFWbi9XxyNZsJKZuvpWg35BgRbcCGFH+38V2MAdw= -go.opentelemetry.io/collector/featuregate v0.66.1-0.20221128222955-4ff1ff379b90/go.mod h1:tewuFKJYalWBU0bmNKg++MC1ipINXUr6szYzOw2p1GI= -go.opentelemetry.io/collector/pdata v0.66.1-0.20221128222955-4ff1ff379b90 h1:Vu4S4jSNcd0VFPzxQNO4+UqGwnes1xJDoFLPRiWHm8I= -go.opentelemetry.io/collector/pdata v0.66.1-0.20221128222955-4ff1ff379b90/go.mod h1:pqyaznLzk21m+1KL6fwOsRryRELL+zNM0qiVSn0MbVc= +go.opentelemetry.io/collector v0.66.1-0.20221202005155-1c54042beb70 h1:INB2CsOtqqrija2KvMuIpbBQ3qX1BECEeR+d0NJX+oM= +go.opentelemetry.io/collector v0.66.1-0.20221202005155-1c54042beb70/go.mod h1:d0NHkHyANJy3HDTvYE/PoylMShUmFIbiir89ieI0X0c= +go.opentelemetry.io/collector/component v0.66.1-0.20221202005155-1c54042beb70 h1:dEoJhzCmRShgmVro/kXm6pouGElgxkH2DsvanzCeZtU= +go.opentelemetry.io/collector/component v0.66.1-0.20221202005155-1c54042beb70/go.mod h1:OsVnvFFe38QSpcuZlQ8cvarDzcloCexgQ1/B2m80F6U= +go.opentelemetry.io/collector/confmap v0.0.0-20221201172708-2bdff61fa52a h1:2TscCXAQASO2kU9xHcMIUM/FP29fiQIRTilZmliq/7I= +go.opentelemetry.io/collector/confmap v0.0.0-20221201172708-2bdff61fa52a/go.mod h1:qJ3e8bA8h4wz/jYlbeEUafVHdrU7DkpStnmIUAz6VTQ= +go.opentelemetry.io/collector/consumer v0.66.1-0.20221202005155-1c54042beb70 h1:XwpVjI1KeKGPXOZBLefGILMziPYuNf6IzbmiIEsIyI0= +go.opentelemetry.io/collector/consumer v0.66.1-0.20221202005155-1c54042beb70/go.mod h1:EWVBcSGcIcmeDGTnIboc/aqa3agsBeH8/q7yFWG7xVc= +go.opentelemetry.io/collector/featuregate v0.66.1-0.20221202005155-1c54042beb70 h1:V0tf4ebciqIs07jFATfLGdUpLRaEsi+AiWuA/in0G8Y= +go.opentelemetry.io/collector/featuregate v0.66.1-0.20221202005155-1c54042beb70/go.mod h1:tewuFKJYalWBU0bmNKg++MC1ipINXUr6szYzOw2p1GI= +go.opentelemetry.io/collector/pdata v0.66.1-0.20221202005155-1c54042beb70 h1:TPOrxkEMvZzfBSwF3ct+kUUgKA5g8unkZZbKQvJweeA= +go.opentelemetry.io/collector/pdata v0.66.1-0.20221202005155-1c54042beb70/go.mod h1:pqyaznLzk21m+1KL6fwOsRryRELL+zNM0qiVSn0MbVc= 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= @@ -333,8 +335,8 @@ go.uber.org/multierr v1.6.0/go.mod h1:cdWPpRnG4AhwMwsgIHip0KRBQjJy5kYEpYjJxpXp9i go.uber.org/multierr v1.8.0 h1:dg6GjLku4EH+249NNmoIciG9N/jURbDG+pFlTkhzIC8= go.uber.org/multierr v1.8.0/go.mod h1:7EAYxJLBy9rStEaz58O2t4Uvip6FSURkq8/ppBp95ak= go.uber.org/zap v1.17.0/go.mod h1:MXVU+bhUf/A7Xi2HNOnopQOrmycQ5Ih87HtOu4q5SSo= -go.uber.org/zap v1.23.0 h1:OjGQ5KQDEUawVHxNwQgPpiypGHOxo2mNZsOqTak4fFY= -go.uber.org/zap v1.23.0/go.mod h1:D+nX8jyLsMHMYrln8A0rJjFt/T/9/bGgIhAqxv5URuY= +go.uber.org/zap v1.24.0 h1:FiJd5l1UOLj0wCgbSE0rwwXHzEdAZS6hiiSnxJN/D60= +go.uber.org/zap v1.24.0/go.mod h1:2kMP+WWQ8aoFoedH3T2sq6iJ2yDWpHbP0f6MQbS9Gkg= golang.org/x/crypto v0.0.0-20180904163835-0709b304e793/go.mod h1:6SG95UA2DQfeDnfUPMdvaQW0Q7yPrPDi9nlGo2tz2b4= golang.org/x/crypto v0.0.0-20190308221718-c2843e01d9a2/go.mod h1:djNgcEr1/C05ACkg1iLfiJU5Ep61QUkGW8qpdssI0+w= golang.org/x/crypto v0.0.0-20190923035154-9ee001bba392/go.mod h1:/lpIB1dKB+9EgE3H3cr1v9wB50oz8l4C4h62xy7jSTY= diff --git a/receiver/k8sclusterreceiver/go.mod b/receiver/k8sclusterreceiver/go.mod index 9759bb5b0088..451ea55cf117 100644 --- a/receiver/k8sclusterreceiver/go.mod +++ b/receiver/k8sclusterreceiver/go.mod @@ -12,13 +12,14 @@ 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.66.1-0.20221128222955-4ff1ff379b90 - go.opentelemetry.io/collector/component v0.66.1-0.20221128222955-4ff1ff379b90 - go.opentelemetry.io/collector/consumer v0.66.1-0.20221128222955-4ff1ff379b90 - go.opentelemetry.io/collector/pdata v0.66.1-0.20221128222955-4ff1ff379b90 - go.opentelemetry.io/collector/semconv v0.66.1-0.20221128222955-4ff1ff379b90 + go.opentelemetry.io/collector v0.66.1-0.20221202005155-1c54042beb70 + go.opentelemetry.io/collector/component v0.66.1-0.20221202005155-1c54042beb70 + go.opentelemetry.io/collector/confmap v0.0.0-20221201172708-2bdff61fa52a + go.opentelemetry.io/collector/consumer v0.66.1-0.20221202005155-1c54042beb70 + go.opentelemetry.io/collector/pdata v0.66.1-0.20221202005155-1c54042beb70 + go.opentelemetry.io/collector/semconv v0.66.1-0.20221202005155-1c54042beb70 go.uber.org/atomic v1.10.0 - go.uber.org/zap v1.23.0 + go.uber.org/zap v1.24.0 google.golang.org/protobuf v1.28.1 k8s.io/api v0.25.4 k8s.io/apimachinery v0.25.4 @@ -70,7 +71,7 @@ require ( github.com/prometheus/statsd_exporter v0.22.7 // indirect github.com/spf13/pflag v1.0.5 // indirect go.opencensus.io v0.24.0 // indirect - go.opentelemetry.io/collector/featuregate v0.66.1-0.20221128222955-4ff1ff379b90 // indirect + go.opentelemetry.io/collector/featuregate v0.66.1-0.20221202005155-1c54042beb70 // 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 9e81b4f09a54..33c989a3f489 100644 --- a/receiver/k8sclusterreceiver/go.sum +++ b/receiver/k8sclusterreceiver/go.sum @@ -469,18 +469,20 @@ go.opencensus.io v0.22.4/go.mod h1:yxeiOL68Rb0Xd1ddK5vPZ/oVn4vY4Ynel7k9FzqtOIw= go.opencensus.io v0.23.0/go.mod h1:XItmlyltB5F7CS4xOC1DcqMoFqwtC6OG2xF7mCv7P7E= go.opencensus.io v0.24.0 h1:y73uSU6J157QMP2kn2r30vwW1A2W2WFwSCGnAVxeaD0= go.opencensus.io v0.24.0/go.mod h1:vNK8G9p7aAivkbmorf4v+7Hgx+Zs0yY+0fOtgBfjQKo= -go.opentelemetry.io/collector v0.66.1-0.20221128222955-4ff1ff379b90 h1:yRe05/jMdzH4TFHfndZ5h2o2hKBK/79W72j8w51qNsI= -go.opentelemetry.io/collector v0.66.1-0.20221128222955-4ff1ff379b90/go.mod h1:hE6jCs+0rfiufCrVPucKZTMwfHit1okfDPnwPT2eW1I= -go.opentelemetry.io/collector/component v0.66.1-0.20221128222955-4ff1ff379b90 h1:AYSNTXbezhNg43EuYdVVcgxE/2gBVrm00FDx4DOmQVg= -go.opentelemetry.io/collector/component v0.66.1-0.20221128222955-4ff1ff379b90/go.mod h1:0c84EqXUhvYe6KW7hJfh76tiI/5yjWCH2amwyQ06XLM= -go.opentelemetry.io/collector/consumer v0.66.1-0.20221128222955-4ff1ff379b90 h1:nzNXVfC1FzXBXCLMzbMv+qK3E4EGiNsnMhfVsBd2yzc= -go.opentelemetry.io/collector/consumer v0.66.1-0.20221128222955-4ff1ff379b90/go.mod h1:WtoRZa5SnxQO1ZEQdVxYpFcXCmq62rakv0oUSlPO0NQ= -go.opentelemetry.io/collector/featuregate v0.66.1-0.20221128222955-4ff1ff379b90 h1:UuJSFWbi9XxyNZsJKZuvpWg35BgRbcCGFH+38V2MAdw= -go.opentelemetry.io/collector/featuregate v0.66.1-0.20221128222955-4ff1ff379b90/go.mod h1:tewuFKJYalWBU0bmNKg++MC1ipINXUr6szYzOw2p1GI= -go.opentelemetry.io/collector/pdata v0.66.1-0.20221128222955-4ff1ff379b90 h1:Vu4S4jSNcd0VFPzxQNO4+UqGwnes1xJDoFLPRiWHm8I= -go.opentelemetry.io/collector/pdata v0.66.1-0.20221128222955-4ff1ff379b90/go.mod h1:pqyaznLzk21m+1KL6fwOsRryRELL+zNM0qiVSn0MbVc= -go.opentelemetry.io/collector/semconv v0.66.1-0.20221128222955-4ff1ff379b90 h1:hFaTA68cggZKWMv7wQ3bKP8KGTbowh/5AQZKCHzHTqM= -go.opentelemetry.io/collector/semconv v0.66.1-0.20221128222955-4ff1ff379b90/go.mod h1:5o9yhOa+ABt7g2E5JABDxGZ1PQPbtfxrKNbYn+LOTXU= +go.opentelemetry.io/collector v0.66.1-0.20221202005155-1c54042beb70 h1:INB2CsOtqqrija2KvMuIpbBQ3qX1BECEeR+d0NJX+oM= +go.opentelemetry.io/collector v0.66.1-0.20221202005155-1c54042beb70/go.mod h1:d0NHkHyANJy3HDTvYE/PoylMShUmFIbiir89ieI0X0c= +go.opentelemetry.io/collector/component v0.66.1-0.20221202005155-1c54042beb70 h1:dEoJhzCmRShgmVro/kXm6pouGElgxkH2DsvanzCeZtU= +go.opentelemetry.io/collector/component v0.66.1-0.20221202005155-1c54042beb70/go.mod h1:OsVnvFFe38QSpcuZlQ8cvarDzcloCexgQ1/B2m80F6U= +go.opentelemetry.io/collector/confmap v0.0.0-20221201172708-2bdff61fa52a h1:2TscCXAQASO2kU9xHcMIUM/FP29fiQIRTilZmliq/7I= +go.opentelemetry.io/collector/confmap v0.0.0-20221201172708-2bdff61fa52a/go.mod h1:qJ3e8bA8h4wz/jYlbeEUafVHdrU7DkpStnmIUAz6VTQ= +go.opentelemetry.io/collector/consumer v0.66.1-0.20221202005155-1c54042beb70 h1:XwpVjI1KeKGPXOZBLefGILMziPYuNf6IzbmiIEsIyI0= +go.opentelemetry.io/collector/consumer v0.66.1-0.20221202005155-1c54042beb70/go.mod h1:EWVBcSGcIcmeDGTnIboc/aqa3agsBeH8/q7yFWG7xVc= +go.opentelemetry.io/collector/featuregate v0.66.1-0.20221202005155-1c54042beb70 h1:V0tf4ebciqIs07jFATfLGdUpLRaEsi+AiWuA/in0G8Y= +go.opentelemetry.io/collector/featuregate v0.66.1-0.20221202005155-1c54042beb70/go.mod h1:tewuFKJYalWBU0bmNKg++MC1ipINXUr6szYzOw2p1GI= +go.opentelemetry.io/collector/pdata v0.66.1-0.20221202005155-1c54042beb70 h1:TPOrxkEMvZzfBSwF3ct+kUUgKA5g8unkZZbKQvJweeA= +go.opentelemetry.io/collector/pdata v0.66.1-0.20221202005155-1c54042beb70/go.mod h1:pqyaznLzk21m+1KL6fwOsRryRELL+zNM0qiVSn0MbVc= +go.opentelemetry.io/collector/semconv v0.66.1-0.20221202005155-1c54042beb70 h1:Q5L9Urod3c8as6ZYaoaqBjarx/HXxsxy34DFZIU2fO4= +go.opentelemetry.io/collector/semconv v0.66.1-0.20221202005155-1c54042beb70/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= @@ -501,8 +503,8 @@ go.uber.org/multierr v1.6.0/go.mod h1:cdWPpRnG4AhwMwsgIHip0KRBQjJy5kYEpYjJxpXp9i go.uber.org/multierr v1.8.0 h1:dg6GjLku4EH+249NNmoIciG9N/jURbDG+pFlTkhzIC8= go.uber.org/multierr v1.8.0/go.mod h1:7EAYxJLBy9rStEaz58O2t4Uvip6FSURkq8/ppBp95ak= go.uber.org/zap v1.17.0/go.mod h1:MXVU+bhUf/A7Xi2HNOnopQOrmycQ5Ih87HtOu4q5SSo= -go.uber.org/zap v1.23.0 h1:OjGQ5KQDEUawVHxNwQgPpiypGHOxo2mNZsOqTak4fFY= -go.uber.org/zap v1.23.0/go.mod h1:D+nX8jyLsMHMYrln8A0rJjFt/T/9/bGgIhAqxv5URuY= +go.uber.org/zap v1.24.0 h1:FiJd5l1UOLj0wCgbSE0rwwXHzEdAZS6hiiSnxJN/D60= +go.uber.org/zap v1.24.0/go.mod h1:2kMP+WWQ8aoFoedH3T2sq6iJ2yDWpHbP0f6MQbS9Gkg= golang.org/x/crypto v0.0.0-20180904163835-0709b304e793/go.mod h1:6SG95UA2DQfeDnfUPMdvaQW0Q7yPrPDi9nlGo2tz2b4= golang.org/x/crypto v0.0.0-20190308221718-c2843e01d9a2/go.mod h1:djNgcEr1/C05ACkg1iLfiJU5Ep61QUkGW8qpdssI0+w= golang.org/x/crypto v0.0.0-20190510104115-cbcb75029529/go.mod h1:yigFU9vqHzYiE8UmvKecakEJjdnWj3jj499lnFckfCI= diff --git a/receiver/k8sclusterreceiver/receiver.go b/receiver/k8sclusterreceiver/receiver.go index 102691b8ea0b..6414eede3d4a 100644 --- a/receiver/k8sclusterreceiver/receiver.go +++ b/receiver/k8sclusterreceiver/receiver.go @@ -17,7 +17,6 @@ package k8sclusterreceiver // import "github.com/open-telemetry/opentelemetry-co import ( "context" "errors" - "fmt" "time" "go.opentelemetry.io/collector/component" @@ -73,7 +72,7 @@ func (kr *kubernetesReceiver) Start(ctx context.Context, host component.Host) er if errors.Is(timedContextForInitialSync.Err(), context.DeadlineExceeded) { kr.resourceWatcher.initialSyncTimedOut.Store(true) kr.settings.Logger.Error("Timed out waiting for initial cache sync.") - host.ReportFatalError(fmt.Errorf("failed to start receiver: %v", kr.config.ID())) + host.ReportFatalError(errors.New("failed to start receiver")) return } } @@ -118,7 +117,7 @@ func newReceiver(_ context.Context, set component.ReceiverCreateSettings, cfg co rCfg := cfg.(*Config) obsrecv, err := obsreport.NewReceiver(obsreport.ReceiverSettings{ - ReceiverID: cfg.ID(), + ReceiverID: set.ID, Transport: transport, ReceiverCreateSettings: set, }) diff --git a/receiver/k8sclusterreceiver/receiver_test.go b/receiver/k8sclusterreceiver/receiver_test.go index 122aee2c9523..1e7931d494e5 100644 --- a/receiver/k8sclusterreceiver/receiver_test.go +++ b/receiver/k8sclusterreceiver/receiver_test.go @@ -22,6 +22,7 @@ import ( quotaclientset "github.com/openshift/client-go/quota/clientset/versioned" fakeQuota "github.com/openshift/client-go/quota/clientset/versioned/fake" "github.com/stretchr/testify/require" + "go.opentelemetry.io/collector/component" "go.opentelemetry.io/collector/component/componenttest" "go.opentelemetry.io/collector/consumer" "go.opentelemetry.io/collector/consumer/consumertest" @@ -38,7 +39,7 @@ import ( ) func TestReceiver(t *testing.T) { - tt, err := obsreporttest.SetupTelemetry() + tt, err := obsreporttest.SetupTelemetryWithID(component.NewID(typeStr)) require.NoError(t, err) defer func() { require.NoError(t, tt.Shutdown(context.Background())) @@ -88,7 +89,7 @@ func TestReceiver(t *testing.T) { } func TestReceiverTimesOutAfterStartup(t *testing.T) { - tt, err := obsreporttest.SetupTelemetry() + tt, err := obsreporttest.SetupTelemetryWithID(component.NewID(typeStr)) require.NoError(t, err) defer func() { require.NoError(t, tt.Shutdown(context.Background())) @@ -109,7 +110,7 @@ func TestReceiverTimesOutAfterStartup(t *testing.T) { } func TestReceiverWithManyResources(t *testing.T) { - tt, err := obsreporttest.SetupTelemetry() + tt, err := obsreporttest.SetupTelemetryWithID(component.NewID(typeStr)) require.NoError(t, err) defer func() { require.NoError(t, tt.Shutdown(context.Background())) @@ -147,7 +148,7 @@ var consumeMetadataInvocation = func() { } func TestReceiverWithMetadata(t *testing.T) { - tt, err := obsreporttest.SetupTelemetry() + tt, err := obsreporttest.SetupTelemetryWithID(component.NewID(typeStr)) require.NoError(t, err) defer func() { require.NoError(t, tt.Shutdown(context.Background())) diff --git a/receiver/k8seventsreceiver/go.mod b/receiver/k8seventsreceiver/go.mod index b6b8cc3a96d1..1b01c3e06b5f 100644 --- a/receiver/k8seventsreceiver/go.mod +++ b/receiver/k8seventsreceiver/go.mod @@ -5,12 +5,13 @@ go 1.18 require ( github.com/open-telemetry/opentelemetry-collector-contrib/internal/k8sconfig v0.66.0 github.com/stretchr/testify v1.8.1 - go.opentelemetry.io/collector v0.66.1-0.20221128222955-4ff1ff379b90 - go.opentelemetry.io/collector/component v0.66.1-0.20221128222955-4ff1ff379b90 - go.opentelemetry.io/collector/consumer v0.66.1-0.20221128222955-4ff1ff379b90 - go.opentelemetry.io/collector/pdata v0.66.1-0.20221128222955-4ff1ff379b90 - go.opentelemetry.io/collector/semconv v0.66.1-0.20221128222955-4ff1ff379b90 - go.uber.org/zap v1.23.0 + go.opentelemetry.io/collector v0.66.1-0.20221202005155-1c54042beb70 + go.opentelemetry.io/collector/component v0.66.1-0.20221202005155-1c54042beb70 + go.opentelemetry.io/collector/confmap v0.0.0-20221201172708-2bdff61fa52a + go.opentelemetry.io/collector/consumer v0.66.1-0.20221202005155-1c54042beb70 + go.opentelemetry.io/collector/pdata v0.66.1-0.20221202005155-1c54042beb70 + go.opentelemetry.io/collector/semconv v0.66.1-0.20221202005155-1c54042beb70 + go.uber.org/zap v1.24.0 k8s.io/api v0.25.4 k8s.io/apimachinery v0.25.4 k8s.io/client-go v0.25.4 @@ -51,7 +52,7 @@ require ( github.com/pmezard/go-difflib v1.0.0 // indirect github.com/spf13/pflag v1.0.5 // indirect go.opencensus.io v0.24.0 // indirect - go.opentelemetry.io/collector/featuregate v0.66.1-0.20221128222955-4ff1ff379b90 // indirect + go.opentelemetry.io/collector/featuregate v0.66.1-0.20221202005155-1c54042beb70 // 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 24ab7d95368f..279034b90034 100644 --- a/receiver/k8seventsreceiver/go.sum +++ b/receiver/k8seventsreceiver/go.sum @@ -450,18 +450,20 @@ go.opencensus.io v0.22.3/go.mod h1:yxeiOL68Rb0Xd1ddK5vPZ/oVn4vY4Ynel7k9FzqtOIw= go.opencensus.io v0.22.4/go.mod h1:yxeiOL68Rb0Xd1ddK5vPZ/oVn4vY4Ynel7k9FzqtOIw= go.opencensus.io v0.24.0 h1:y73uSU6J157QMP2kn2r30vwW1A2W2WFwSCGnAVxeaD0= go.opencensus.io v0.24.0/go.mod h1:vNK8G9p7aAivkbmorf4v+7Hgx+Zs0yY+0fOtgBfjQKo= -go.opentelemetry.io/collector v0.66.1-0.20221128222955-4ff1ff379b90 h1:yRe05/jMdzH4TFHfndZ5h2o2hKBK/79W72j8w51qNsI= -go.opentelemetry.io/collector v0.66.1-0.20221128222955-4ff1ff379b90/go.mod h1:hE6jCs+0rfiufCrVPucKZTMwfHit1okfDPnwPT2eW1I= -go.opentelemetry.io/collector/component v0.66.1-0.20221128222955-4ff1ff379b90 h1:AYSNTXbezhNg43EuYdVVcgxE/2gBVrm00FDx4DOmQVg= -go.opentelemetry.io/collector/component v0.66.1-0.20221128222955-4ff1ff379b90/go.mod h1:0c84EqXUhvYe6KW7hJfh76tiI/5yjWCH2amwyQ06XLM= -go.opentelemetry.io/collector/consumer v0.66.1-0.20221128222955-4ff1ff379b90 h1:nzNXVfC1FzXBXCLMzbMv+qK3E4EGiNsnMhfVsBd2yzc= -go.opentelemetry.io/collector/consumer v0.66.1-0.20221128222955-4ff1ff379b90/go.mod h1:WtoRZa5SnxQO1ZEQdVxYpFcXCmq62rakv0oUSlPO0NQ= -go.opentelemetry.io/collector/featuregate v0.66.1-0.20221128222955-4ff1ff379b90 h1:UuJSFWbi9XxyNZsJKZuvpWg35BgRbcCGFH+38V2MAdw= -go.opentelemetry.io/collector/featuregate v0.66.1-0.20221128222955-4ff1ff379b90/go.mod h1:tewuFKJYalWBU0bmNKg++MC1ipINXUr6szYzOw2p1GI= -go.opentelemetry.io/collector/pdata v0.66.1-0.20221128222955-4ff1ff379b90 h1:Vu4S4jSNcd0VFPzxQNO4+UqGwnes1xJDoFLPRiWHm8I= -go.opentelemetry.io/collector/pdata v0.66.1-0.20221128222955-4ff1ff379b90/go.mod h1:pqyaznLzk21m+1KL6fwOsRryRELL+zNM0qiVSn0MbVc= -go.opentelemetry.io/collector/semconv v0.66.1-0.20221128222955-4ff1ff379b90 h1:hFaTA68cggZKWMv7wQ3bKP8KGTbowh/5AQZKCHzHTqM= -go.opentelemetry.io/collector/semconv v0.66.1-0.20221128222955-4ff1ff379b90/go.mod h1:5o9yhOa+ABt7g2E5JABDxGZ1PQPbtfxrKNbYn+LOTXU= +go.opentelemetry.io/collector v0.66.1-0.20221202005155-1c54042beb70 h1:INB2CsOtqqrija2KvMuIpbBQ3qX1BECEeR+d0NJX+oM= +go.opentelemetry.io/collector v0.66.1-0.20221202005155-1c54042beb70/go.mod h1:d0NHkHyANJy3HDTvYE/PoylMShUmFIbiir89ieI0X0c= +go.opentelemetry.io/collector/component v0.66.1-0.20221202005155-1c54042beb70 h1:dEoJhzCmRShgmVro/kXm6pouGElgxkH2DsvanzCeZtU= +go.opentelemetry.io/collector/component v0.66.1-0.20221202005155-1c54042beb70/go.mod h1:OsVnvFFe38QSpcuZlQ8cvarDzcloCexgQ1/B2m80F6U= +go.opentelemetry.io/collector/confmap v0.0.0-20221201172708-2bdff61fa52a h1:2TscCXAQASO2kU9xHcMIUM/FP29fiQIRTilZmliq/7I= +go.opentelemetry.io/collector/confmap v0.0.0-20221201172708-2bdff61fa52a/go.mod h1:qJ3e8bA8h4wz/jYlbeEUafVHdrU7DkpStnmIUAz6VTQ= +go.opentelemetry.io/collector/consumer v0.66.1-0.20221202005155-1c54042beb70 h1:XwpVjI1KeKGPXOZBLefGILMziPYuNf6IzbmiIEsIyI0= +go.opentelemetry.io/collector/consumer v0.66.1-0.20221202005155-1c54042beb70/go.mod h1:EWVBcSGcIcmeDGTnIboc/aqa3agsBeH8/q7yFWG7xVc= +go.opentelemetry.io/collector/featuregate v0.66.1-0.20221202005155-1c54042beb70 h1:V0tf4ebciqIs07jFATfLGdUpLRaEsi+AiWuA/in0G8Y= +go.opentelemetry.io/collector/featuregate v0.66.1-0.20221202005155-1c54042beb70/go.mod h1:tewuFKJYalWBU0bmNKg++MC1ipINXUr6szYzOw2p1GI= +go.opentelemetry.io/collector/pdata v0.66.1-0.20221202005155-1c54042beb70 h1:TPOrxkEMvZzfBSwF3ct+kUUgKA5g8unkZZbKQvJweeA= +go.opentelemetry.io/collector/pdata v0.66.1-0.20221202005155-1c54042beb70/go.mod h1:pqyaznLzk21m+1KL6fwOsRryRELL+zNM0qiVSn0MbVc= +go.opentelemetry.io/collector/semconv v0.66.1-0.20221202005155-1c54042beb70 h1:Q5L9Urod3c8as6ZYaoaqBjarx/HXxsxy34DFZIU2fO4= +go.opentelemetry.io/collector/semconv v0.66.1-0.20221202005155-1c54042beb70/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= @@ -480,8 +482,8 @@ go.uber.org/multierr v1.6.0/go.mod h1:cdWPpRnG4AhwMwsgIHip0KRBQjJy5kYEpYjJxpXp9i go.uber.org/multierr v1.8.0 h1:dg6GjLku4EH+249NNmoIciG9N/jURbDG+pFlTkhzIC8= go.uber.org/multierr v1.8.0/go.mod h1:7EAYxJLBy9rStEaz58O2t4Uvip6FSURkq8/ppBp95ak= go.uber.org/zap v1.17.0/go.mod h1:MXVU+bhUf/A7Xi2HNOnopQOrmycQ5Ih87HtOu4q5SSo= -go.uber.org/zap v1.23.0 h1:OjGQ5KQDEUawVHxNwQgPpiypGHOxo2mNZsOqTak4fFY= -go.uber.org/zap v1.23.0/go.mod h1:D+nX8jyLsMHMYrln8A0rJjFt/T/9/bGgIhAqxv5URuY= +go.uber.org/zap v1.24.0 h1:FiJd5l1UOLj0wCgbSE0rwwXHzEdAZS6hiiSnxJN/D60= +go.uber.org/zap v1.24.0/go.mod h1:2kMP+WWQ8aoFoedH3T2sq6iJ2yDWpHbP0f6MQbS9Gkg= golang.org/x/crypto v0.0.0-20180904163835-0709b304e793/go.mod h1:6SG95UA2DQfeDnfUPMdvaQW0Q7yPrPDi9nlGo2tz2b4= golang.org/x/crypto v0.0.0-20190308221718-c2843e01d9a2/go.mod h1:djNgcEr1/C05ACkg1iLfiJU5Ep61QUkGW8qpdssI0+w= golang.org/x/crypto v0.0.0-20190510104115-cbcb75029529/go.mod h1:yigFU9vqHzYiE8UmvKecakEJjdnWj3jj499lnFckfCI= diff --git a/receiver/k8seventsreceiver/receiver.go b/receiver/k8seventsreceiver/receiver.go index f106a9f53f6c..4f5027027de4 100644 --- a/receiver/k8seventsreceiver/receiver.go +++ b/receiver/k8seventsreceiver/receiver.go @@ -49,7 +49,7 @@ func newReceiver( transport := "http" obsrecv, err := obsreport.NewReceiver(obsreport.ReceiverSettings{ - ReceiverID: config.ID(), + ReceiverID: set.ID, Transport: transport, ReceiverCreateSettings: set, }) diff --git a/receiver/k8sobjectsreceiver/go.mod b/receiver/k8sobjectsreceiver/go.mod index 8d82bf78932e..c043a8025822 100644 --- a/receiver/k8sobjectsreceiver/go.mod +++ b/receiver/k8sobjectsreceiver/go.mod @@ -5,12 +5,13 @@ go 1.18 require ( github.com/open-telemetry/opentelemetry-collector-contrib/internal/k8sconfig v0.66.0 github.com/stretchr/testify v1.8.1 - go.opentelemetry.io/collector v0.66.1-0.20221128222955-4ff1ff379b90 - go.opentelemetry.io/collector/component v0.66.1-0.20221128222955-4ff1ff379b90 - go.opentelemetry.io/collector/consumer v0.66.1-0.20221128222955-4ff1ff379b90 - go.opentelemetry.io/collector/pdata v0.66.1-0.20221128222955-4ff1ff379b90 - go.opentelemetry.io/collector/semconv v0.66.1-0.20221128222955-4ff1ff379b90 - go.uber.org/zap v1.23.0 + go.opentelemetry.io/collector v0.66.1-0.20221202005155-1c54042beb70 + go.opentelemetry.io/collector/component v0.66.1-0.20221202005155-1c54042beb70 + go.opentelemetry.io/collector/confmap v0.0.0-20221201172708-2bdff61fa52a + go.opentelemetry.io/collector/consumer v0.66.1-0.20221202005155-1c54042beb70 + go.opentelemetry.io/collector/pdata v0.66.1-0.20221202005155-1c54042beb70 + go.opentelemetry.io/collector/semconv v0.66.1-0.20221202005155-1c54042beb70 + go.uber.org/zap v1.24.0 k8s.io/apimachinery v0.25.4 k8s.io/client-go v0.25.4 ) @@ -46,7 +47,7 @@ require ( github.com/pmezard/go-difflib v1.0.0 // indirect github.com/spf13/pflag v1.0.5 // indirect go.opencensus.io v0.24.0 // indirect - go.opentelemetry.io/collector/featuregate v0.66.1-0.20221128222955-4ff1ff379b90 // indirect + go.opentelemetry.io/collector/featuregate v0.66.1-0.20221202005155-1c54042beb70 // indirect go.opentelemetry.io/otel v1.11.1 // indirect go.opentelemetry.io/otel/metric v0.33.0 // indirect go.opentelemetry.io/otel/trace v1.11.1 // indirect diff --git a/receiver/k8sobjectsreceiver/go.sum b/receiver/k8sobjectsreceiver/go.sum index 567c7f3ad0a3..6088ac801e58 100644 --- a/receiver/k8sobjectsreceiver/go.sum +++ b/receiver/k8sobjectsreceiver/go.sum @@ -442,18 +442,20 @@ go.opencensus.io v0.22.3/go.mod h1:yxeiOL68Rb0Xd1ddK5vPZ/oVn4vY4Ynel7k9FzqtOIw= go.opencensus.io v0.22.4/go.mod h1:yxeiOL68Rb0Xd1ddK5vPZ/oVn4vY4Ynel7k9FzqtOIw= go.opencensus.io v0.24.0 h1:y73uSU6J157QMP2kn2r30vwW1A2W2WFwSCGnAVxeaD0= go.opencensus.io v0.24.0/go.mod h1:vNK8G9p7aAivkbmorf4v+7Hgx+Zs0yY+0fOtgBfjQKo= -go.opentelemetry.io/collector v0.66.1-0.20221128222955-4ff1ff379b90 h1:yRe05/jMdzH4TFHfndZ5h2o2hKBK/79W72j8w51qNsI= -go.opentelemetry.io/collector v0.66.1-0.20221128222955-4ff1ff379b90/go.mod h1:hE6jCs+0rfiufCrVPucKZTMwfHit1okfDPnwPT2eW1I= -go.opentelemetry.io/collector/component v0.66.1-0.20221128222955-4ff1ff379b90 h1:AYSNTXbezhNg43EuYdVVcgxE/2gBVrm00FDx4DOmQVg= -go.opentelemetry.io/collector/component v0.66.1-0.20221128222955-4ff1ff379b90/go.mod h1:0c84EqXUhvYe6KW7hJfh76tiI/5yjWCH2amwyQ06XLM= -go.opentelemetry.io/collector/consumer v0.66.1-0.20221128222955-4ff1ff379b90 h1:nzNXVfC1FzXBXCLMzbMv+qK3E4EGiNsnMhfVsBd2yzc= -go.opentelemetry.io/collector/consumer v0.66.1-0.20221128222955-4ff1ff379b90/go.mod h1:WtoRZa5SnxQO1ZEQdVxYpFcXCmq62rakv0oUSlPO0NQ= -go.opentelemetry.io/collector/featuregate v0.66.1-0.20221128222955-4ff1ff379b90 h1:UuJSFWbi9XxyNZsJKZuvpWg35BgRbcCGFH+38V2MAdw= -go.opentelemetry.io/collector/featuregate v0.66.1-0.20221128222955-4ff1ff379b90/go.mod h1:tewuFKJYalWBU0bmNKg++MC1ipINXUr6szYzOw2p1GI= -go.opentelemetry.io/collector/pdata v0.66.1-0.20221128222955-4ff1ff379b90 h1:Vu4S4jSNcd0VFPzxQNO4+UqGwnes1xJDoFLPRiWHm8I= -go.opentelemetry.io/collector/pdata v0.66.1-0.20221128222955-4ff1ff379b90/go.mod h1:pqyaznLzk21m+1KL6fwOsRryRELL+zNM0qiVSn0MbVc= -go.opentelemetry.io/collector/semconv v0.66.1-0.20221128222955-4ff1ff379b90 h1:hFaTA68cggZKWMv7wQ3bKP8KGTbowh/5AQZKCHzHTqM= -go.opentelemetry.io/collector/semconv v0.66.1-0.20221128222955-4ff1ff379b90/go.mod h1:5o9yhOa+ABt7g2E5JABDxGZ1PQPbtfxrKNbYn+LOTXU= +go.opentelemetry.io/collector v0.66.1-0.20221202005155-1c54042beb70 h1:INB2CsOtqqrija2KvMuIpbBQ3qX1BECEeR+d0NJX+oM= +go.opentelemetry.io/collector v0.66.1-0.20221202005155-1c54042beb70/go.mod h1:d0NHkHyANJy3HDTvYE/PoylMShUmFIbiir89ieI0X0c= +go.opentelemetry.io/collector/component v0.66.1-0.20221202005155-1c54042beb70 h1:dEoJhzCmRShgmVro/kXm6pouGElgxkH2DsvanzCeZtU= +go.opentelemetry.io/collector/component v0.66.1-0.20221202005155-1c54042beb70/go.mod h1:OsVnvFFe38QSpcuZlQ8cvarDzcloCexgQ1/B2m80F6U= +go.opentelemetry.io/collector/confmap v0.0.0-20221201172708-2bdff61fa52a h1:2TscCXAQASO2kU9xHcMIUM/FP29fiQIRTilZmliq/7I= +go.opentelemetry.io/collector/confmap v0.0.0-20221201172708-2bdff61fa52a/go.mod h1:qJ3e8bA8h4wz/jYlbeEUafVHdrU7DkpStnmIUAz6VTQ= +go.opentelemetry.io/collector/consumer v0.66.1-0.20221202005155-1c54042beb70 h1:XwpVjI1KeKGPXOZBLefGILMziPYuNf6IzbmiIEsIyI0= +go.opentelemetry.io/collector/consumer v0.66.1-0.20221202005155-1c54042beb70/go.mod h1:EWVBcSGcIcmeDGTnIboc/aqa3agsBeH8/q7yFWG7xVc= +go.opentelemetry.io/collector/featuregate v0.66.1-0.20221202005155-1c54042beb70 h1:V0tf4ebciqIs07jFATfLGdUpLRaEsi+AiWuA/in0G8Y= +go.opentelemetry.io/collector/featuregate v0.66.1-0.20221202005155-1c54042beb70/go.mod h1:tewuFKJYalWBU0bmNKg++MC1ipINXUr6szYzOw2p1GI= +go.opentelemetry.io/collector/pdata v0.66.1-0.20221202005155-1c54042beb70 h1:TPOrxkEMvZzfBSwF3ct+kUUgKA5g8unkZZbKQvJweeA= +go.opentelemetry.io/collector/pdata v0.66.1-0.20221202005155-1c54042beb70/go.mod h1:pqyaznLzk21m+1KL6fwOsRryRELL+zNM0qiVSn0MbVc= +go.opentelemetry.io/collector/semconv v0.66.1-0.20221202005155-1c54042beb70 h1:Q5L9Urod3c8as6ZYaoaqBjarx/HXxsxy34DFZIU2fO4= +go.opentelemetry.io/collector/semconv v0.66.1-0.20221202005155-1c54042beb70/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= @@ -472,8 +474,8 @@ go.uber.org/multierr v1.6.0/go.mod h1:cdWPpRnG4AhwMwsgIHip0KRBQjJy5kYEpYjJxpXp9i go.uber.org/multierr v1.8.0 h1:dg6GjLku4EH+249NNmoIciG9N/jURbDG+pFlTkhzIC8= go.uber.org/multierr v1.8.0/go.mod h1:7EAYxJLBy9rStEaz58O2t4Uvip6FSURkq8/ppBp95ak= go.uber.org/zap v1.17.0/go.mod h1:MXVU+bhUf/A7Xi2HNOnopQOrmycQ5Ih87HtOu4q5SSo= -go.uber.org/zap v1.23.0 h1:OjGQ5KQDEUawVHxNwQgPpiypGHOxo2mNZsOqTak4fFY= -go.uber.org/zap v1.23.0/go.mod h1:D+nX8jyLsMHMYrln8A0rJjFt/T/9/bGgIhAqxv5URuY= +go.uber.org/zap v1.24.0 h1:FiJd5l1UOLj0wCgbSE0rwwXHzEdAZS6hiiSnxJN/D60= +go.uber.org/zap v1.24.0/go.mod h1:2kMP+WWQ8aoFoedH3T2sq6iJ2yDWpHbP0f6MQbS9Gkg= golang.org/x/crypto v0.0.0-20180904163835-0709b304e793/go.mod h1:6SG95UA2DQfeDnfUPMdvaQW0Q7yPrPDi9nlGo2tz2b4= golang.org/x/crypto v0.0.0-20190308221718-c2843e01d9a2/go.mod h1:djNgcEr1/C05ACkg1iLfiJU5Ep61QUkGW8qpdssI0+w= golang.org/x/crypto v0.0.0-20190510104115-cbcb75029529/go.mod h1:yigFU9vqHzYiE8UmvKecakEJjdnWj3jj499lnFckfCI= diff --git a/receiver/k8sobjectsreceiver/receiver.go b/receiver/k8sobjectsreceiver/receiver.go index ce338836fe2f..7b32ec15203b 100644 --- a/receiver/k8sobjectsreceiver/receiver.go +++ b/receiver/k8sobjectsreceiver/receiver.go @@ -45,7 +45,7 @@ func newReceiver(params component.ReceiverCreateSettings, config *Config, consum } obsrecv, err := obsreport.NewReceiver(obsreport.ReceiverSettings{ - ReceiverID: config.ID(), + ReceiverID: params.ID, Transport: transport, ReceiverCreateSettings: params, }) diff --git a/receiver/kafkametricsreceiver/go.mod b/receiver/kafkametricsreceiver/go.mod index d1c96551f2ae..745d5c0769f3 100644 --- a/receiver/kafkametricsreceiver/go.mod +++ b/receiver/kafkametricsreceiver/go.mod @@ -7,12 +7,13 @@ require ( github.com/open-telemetry/opentelemetry-collector-contrib/exporter/kafkaexporter v0.66.0 github.com/stretchr/testify v1.8.1 github.com/testcontainers/testcontainers-go v0.15.0 - go.opentelemetry.io/collector v0.66.1-0.20221128222955-4ff1ff379b90 - go.opentelemetry.io/collector/component v0.66.1-0.20221128222955-4ff1ff379b90 - go.opentelemetry.io/collector/consumer v0.66.1-0.20221128222955-4ff1ff379b90 - go.opentelemetry.io/collector/pdata v0.66.1-0.20221128222955-4ff1ff379b90 + go.opentelemetry.io/collector v0.66.1-0.20221202005155-1c54042beb70 + go.opentelemetry.io/collector/component v0.66.1-0.20221202005155-1c54042beb70 + go.opentelemetry.io/collector/confmap v0.0.0-20221201172708-2bdff61fa52a + go.opentelemetry.io/collector/consumer v0.66.1-0.20221202005155-1c54042beb70 + go.opentelemetry.io/collector/pdata v0.66.1-0.20221202005155-1c54042beb70 go.uber.org/multierr v1.8.0 - go.uber.org/zap v1.23.0 + go.uber.org/zap v1.24.0 ) require ( @@ -78,8 +79,8 @@ require ( github.com/xdg-go/scram v1.1.1 // indirect github.com/xdg-go/stringprep v1.0.3 // indirect go.opencensus.io v0.24.0 // indirect - go.opentelemetry.io/collector/featuregate v0.66.1-0.20221128222955-4ff1ff379b90 // indirect - go.opentelemetry.io/collector/semconv v0.66.1-0.20221128222955-4ff1ff379b90 // indirect + go.opentelemetry.io/collector/featuregate v0.66.1-0.20221202005155-1c54042beb70 // indirect + go.opentelemetry.io/collector/semconv v0.66.1-0.20221202005155-1c54042beb70 // 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 0de259ffc507..8ae7d1a05764 100644 --- a/receiver/kafkametricsreceiver/go.sum +++ b/receiver/kafkametricsreceiver/go.sum @@ -874,18 +874,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.24.0 h1:y73uSU6J157QMP2kn2r30vwW1A2W2WFwSCGnAVxeaD0= go.opencensus.io v0.24.0/go.mod h1:vNK8G9p7aAivkbmorf4v+7Hgx+Zs0yY+0fOtgBfjQKo= -go.opentelemetry.io/collector v0.66.1-0.20221128222955-4ff1ff379b90 h1:yRe05/jMdzH4TFHfndZ5h2o2hKBK/79W72j8w51qNsI= -go.opentelemetry.io/collector v0.66.1-0.20221128222955-4ff1ff379b90/go.mod h1:hE6jCs+0rfiufCrVPucKZTMwfHit1okfDPnwPT2eW1I= -go.opentelemetry.io/collector/component v0.66.1-0.20221128222955-4ff1ff379b90 h1:AYSNTXbezhNg43EuYdVVcgxE/2gBVrm00FDx4DOmQVg= -go.opentelemetry.io/collector/component v0.66.1-0.20221128222955-4ff1ff379b90/go.mod h1:0c84EqXUhvYe6KW7hJfh76tiI/5yjWCH2amwyQ06XLM= -go.opentelemetry.io/collector/consumer v0.66.1-0.20221128222955-4ff1ff379b90 h1:nzNXVfC1FzXBXCLMzbMv+qK3E4EGiNsnMhfVsBd2yzc= -go.opentelemetry.io/collector/consumer v0.66.1-0.20221128222955-4ff1ff379b90/go.mod h1:WtoRZa5SnxQO1ZEQdVxYpFcXCmq62rakv0oUSlPO0NQ= -go.opentelemetry.io/collector/featuregate v0.66.1-0.20221128222955-4ff1ff379b90 h1:UuJSFWbi9XxyNZsJKZuvpWg35BgRbcCGFH+38V2MAdw= -go.opentelemetry.io/collector/featuregate v0.66.1-0.20221128222955-4ff1ff379b90/go.mod h1:tewuFKJYalWBU0bmNKg++MC1ipINXUr6szYzOw2p1GI= -go.opentelemetry.io/collector/pdata v0.66.1-0.20221128222955-4ff1ff379b90 h1:Vu4S4jSNcd0VFPzxQNO4+UqGwnes1xJDoFLPRiWHm8I= -go.opentelemetry.io/collector/pdata v0.66.1-0.20221128222955-4ff1ff379b90/go.mod h1:pqyaznLzk21m+1KL6fwOsRryRELL+zNM0qiVSn0MbVc= -go.opentelemetry.io/collector/semconv v0.66.1-0.20221128222955-4ff1ff379b90 h1:hFaTA68cggZKWMv7wQ3bKP8KGTbowh/5AQZKCHzHTqM= -go.opentelemetry.io/collector/semconv v0.66.1-0.20221128222955-4ff1ff379b90/go.mod h1:5o9yhOa+ABt7g2E5JABDxGZ1PQPbtfxrKNbYn+LOTXU= +go.opentelemetry.io/collector v0.66.1-0.20221202005155-1c54042beb70 h1:INB2CsOtqqrija2KvMuIpbBQ3qX1BECEeR+d0NJX+oM= +go.opentelemetry.io/collector v0.66.1-0.20221202005155-1c54042beb70/go.mod h1:d0NHkHyANJy3HDTvYE/PoylMShUmFIbiir89ieI0X0c= +go.opentelemetry.io/collector/component v0.66.1-0.20221202005155-1c54042beb70 h1:dEoJhzCmRShgmVro/kXm6pouGElgxkH2DsvanzCeZtU= +go.opentelemetry.io/collector/component v0.66.1-0.20221202005155-1c54042beb70/go.mod h1:OsVnvFFe38QSpcuZlQ8cvarDzcloCexgQ1/B2m80F6U= +go.opentelemetry.io/collector/confmap v0.0.0-20221201172708-2bdff61fa52a h1:2TscCXAQASO2kU9xHcMIUM/FP29fiQIRTilZmliq/7I= +go.opentelemetry.io/collector/confmap v0.0.0-20221201172708-2bdff61fa52a/go.mod h1:qJ3e8bA8h4wz/jYlbeEUafVHdrU7DkpStnmIUAz6VTQ= +go.opentelemetry.io/collector/consumer v0.66.1-0.20221202005155-1c54042beb70 h1:XwpVjI1KeKGPXOZBLefGILMziPYuNf6IzbmiIEsIyI0= +go.opentelemetry.io/collector/consumer v0.66.1-0.20221202005155-1c54042beb70/go.mod h1:EWVBcSGcIcmeDGTnIboc/aqa3agsBeH8/q7yFWG7xVc= +go.opentelemetry.io/collector/featuregate v0.66.1-0.20221202005155-1c54042beb70 h1:V0tf4ebciqIs07jFATfLGdUpLRaEsi+AiWuA/in0G8Y= +go.opentelemetry.io/collector/featuregate v0.66.1-0.20221202005155-1c54042beb70/go.mod h1:tewuFKJYalWBU0bmNKg++MC1ipINXUr6szYzOw2p1GI= +go.opentelemetry.io/collector/pdata v0.66.1-0.20221202005155-1c54042beb70 h1:TPOrxkEMvZzfBSwF3ct+kUUgKA5g8unkZZbKQvJweeA= +go.opentelemetry.io/collector/pdata v0.66.1-0.20221202005155-1c54042beb70/go.mod h1:pqyaznLzk21m+1KL6fwOsRryRELL+zNM0qiVSn0MbVc= +go.opentelemetry.io/collector/semconv v0.66.1-0.20221202005155-1c54042beb70 h1:Q5L9Urod3c8as6ZYaoaqBjarx/HXxsxy34DFZIU2fO4= +go.opentelemetry.io/collector/semconv v0.66.1-0.20221202005155-1c54042beb70/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= @@ -908,8 +910,8 @@ go.uber.org/multierr v1.8.0 h1:dg6GjLku4EH+249NNmoIciG9N/jURbDG+pFlTkhzIC8= go.uber.org/multierr v1.8.0/go.mod h1:7EAYxJLBy9rStEaz58O2t4Uvip6FSURkq8/ppBp95ak= go.uber.org/zap v1.10.0/go.mod h1:vwi/ZaCAaUcBkycHslxD9B2zi4UTXhF60s6SWpuDF0Q= go.uber.org/zap v1.17.0/go.mod h1:MXVU+bhUf/A7Xi2HNOnopQOrmycQ5Ih87HtOu4q5SSo= -go.uber.org/zap v1.23.0 h1:OjGQ5KQDEUawVHxNwQgPpiypGHOxo2mNZsOqTak4fFY= -go.uber.org/zap v1.23.0/go.mod h1:D+nX8jyLsMHMYrln8A0rJjFt/T/9/bGgIhAqxv5URuY= +go.uber.org/zap v1.24.0 h1:FiJd5l1UOLj0wCgbSE0rwwXHzEdAZS6hiiSnxJN/D60= +go.uber.org/zap v1.24.0/go.mod h1:2kMP+WWQ8aoFoedH3T2sq6iJ2yDWpHbP0f6MQbS9Gkg= golang.org/x/crypto v0.0.0-20171113213409-9f005a07e0d3/go.mod h1:6SG95UA2DQfeDnfUPMdvaQW0Q7yPrPDi9nlGo2tz2b4= golang.org/x/crypto v0.0.0-20180904163835-0709b304e793/go.mod h1:6SG95UA2DQfeDnfUPMdvaQW0Q7yPrPDi9nlGo2tz2b4= golang.org/x/crypto v0.0.0-20181009213950-7c1a557ab941/go.mod h1:6SG95UA2DQfeDnfUPMdvaQW0Q7yPrPDi9nlGo2tz2b4= diff --git a/receiver/kafkareceiver/go.mod b/receiver/kafkareceiver/go.mod index b194dd4d0542..7c93591c5c70 100644 --- a/receiver/kafkareceiver/go.mod +++ b/receiver/kafkareceiver/go.mod @@ -14,12 +14,13 @@ require ( github.com/openzipkin/zipkin-go v0.4.1 github.com/stretchr/testify v1.8.1 go.opencensus.io v0.24.0 - go.opentelemetry.io/collector v0.66.1-0.20221128222955-4ff1ff379b90 - go.opentelemetry.io/collector/component v0.66.1-0.20221128222955-4ff1ff379b90 - go.opentelemetry.io/collector/consumer v0.66.1-0.20221128222955-4ff1ff379b90 - go.opentelemetry.io/collector/pdata v0.66.1-0.20221128222955-4ff1ff379b90 - go.opentelemetry.io/collector/semconv v0.66.1-0.20221128222955-4ff1ff379b90 - go.uber.org/zap v1.23.0 + go.opentelemetry.io/collector v0.66.1-0.20221202005155-1c54042beb70 + go.opentelemetry.io/collector/component v0.66.1-0.20221202005155-1c54042beb70 + go.opentelemetry.io/collector/confmap v0.0.0-20221201172708-2bdff61fa52a + go.opentelemetry.io/collector/consumer v0.66.1-0.20221202005155-1c54042beb70 + go.opentelemetry.io/collector/pdata v0.66.1-0.20221202005155-1c54042beb70 + go.opentelemetry.io/collector/semconv v0.66.1-0.20221202005155-1c54042beb70 + go.uber.org/zap v1.24.0 ) require ( @@ -57,7 +58,7 @@ require ( github.com/xdg-go/pbkdf2 v1.0.0 // indirect github.com/xdg-go/scram v1.1.1 // indirect github.com/xdg-go/stringprep v1.0.3 // indirect - go.opentelemetry.io/collector/featuregate v0.66.1-0.20221128222955-4ff1ff379b90 // indirect + go.opentelemetry.io/collector/featuregate v0.66.1-0.20221202005155-1c54042beb70 // indirect go.opentelemetry.io/otel v1.11.1 // indirect go.opentelemetry.io/otel/metric v0.33.0 // indirect go.opentelemetry.io/otel/trace v1.11.1 // indirect diff --git a/receiver/kafkareceiver/go.sum b/receiver/kafkareceiver/go.sum index a2aef9da3fbd..5114e951e93c 100644 --- a/receiver/kafkareceiver/go.sum +++ b/receiver/kafkareceiver/go.sum @@ -337,18 +337,20 @@ go.etcd.io/etcd/client/pkg/v3 v3.5.4/go.mod h1:IJHfcCEKxYu1Os13ZdwCwIUTUVGYTSAM3 go.etcd.io/etcd/client/v3 v3.5.4/go.mod h1:ZaRkVgBZC+L+dLCjTcF1hRXpgZXQPOvnA/Ak/gq3kiY= go.opencensus.io v0.24.0 h1:y73uSU6J157QMP2kn2r30vwW1A2W2WFwSCGnAVxeaD0= go.opencensus.io v0.24.0/go.mod h1:vNK8G9p7aAivkbmorf4v+7Hgx+Zs0yY+0fOtgBfjQKo= -go.opentelemetry.io/collector v0.66.1-0.20221128222955-4ff1ff379b90 h1:yRe05/jMdzH4TFHfndZ5h2o2hKBK/79W72j8w51qNsI= -go.opentelemetry.io/collector v0.66.1-0.20221128222955-4ff1ff379b90/go.mod h1:hE6jCs+0rfiufCrVPucKZTMwfHit1okfDPnwPT2eW1I= -go.opentelemetry.io/collector/component v0.66.1-0.20221128222955-4ff1ff379b90 h1:AYSNTXbezhNg43EuYdVVcgxE/2gBVrm00FDx4DOmQVg= -go.opentelemetry.io/collector/component v0.66.1-0.20221128222955-4ff1ff379b90/go.mod h1:0c84EqXUhvYe6KW7hJfh76tiI/5yjWCH2amwyQ06XLM= -go.opentelemetry.io/collector/consumer v0.66.1-0.20221128222955-4ff1ff379b90 h1:nzNXVfC1FzXBXCLMzbMv+qK3E4EGiNsnMhfVsBd2yzc= -go.opentelemetry.io/collector/consumer v0.66.1-0.20221128222955-4ff1ff379b90/go.mod h1:WtoRZa5SnxQO1ZEQdVxYpFcXCmq62rakv0oUSlPO0NQ= -go.opentelemetry.io/collector/featuregate v0.66.1-0.20221128222955-4ff1ff379b90 h1:UuJSFWbi9XxyNZsJKZuvpWg35BgRbcCGFH+38V2MAdw= -go.opentelemetry.io/collector/featuregate v0.66.1-0.20221128222955-4ff1ff379b90/go.mod h1:tewuFKJYalWBU0bmNKg++MC1ipINXUr6szYzOw2p1GI= -go.opentelemetry.io/collector/pdata v0.66.1-0.20221128222955-4ff1ff379b90 h1:Vu4S4jSNcd0VFPzxQNO4+UqGwnes1xJDoFLPRiWHm8I= -go.opentelemetry.io/collector/pdata v0.66.1-0.20221128222955-4ff1ff379b90/go.mod h1:pqyaznLzk21m+1KL6fwOsRryRELL+zNM0qiVSn0MbVc= -go.opentelemetry.io/collector/semconv v0.66.1-0.20221128222955-4ff1ff379b90 h1:hFaTA68cggZKWMv7wQ3bKP8KGTbowh/5AQZKCHzHTqM= -go.opentelemetry.io/collector/semconv v0.66.1-0.20221128222955-4ff1ff379b90/go.mod h1:5o9yhOa+ABt7g2E5JABDxGZ1PQPbtfxrKNbYn+LOTXU= +go.opentelemetry.io/collector v0.66.1-0.20221202005155-1c54042beb70 h1:INB2CsOtqqrija2KvMuIpbBQ3qX1BECEeR+d0NJX+oM= +go.opentelemetry.io/collector v0.66.1-0.20221202005155-1c54042beb70/go.mod h1:d0NHkHyANJy3HDTvYE/PoylMShUmFIbiir89ieI0X0c= +go.opentelemetry.io/collector/component v0.66.1-0.20221202005155-1c54042beb70 h1:dEoJhzCmRShgmVro/kXm6pouGElgxkH2DsvanzCeZtU= +go.opentelemetry.io/collector/component v0.66.1-0.20221202005155-1c54042beb70/go.mod h1:OsVnvFFe38QSpcuZlQ8cvarDzcloCexgQ1/B2m80F6U= +go.opentelemetry.io/collector/confmap v0.0.0-20221201172708-2bdff61fa52a h1:2TscCXAQASO2kU9xHcMIUM/FP29fiQIRTilZmliq/7I= +go.opentelemetry.io/collector/confmap v0.0.0-20221201172708-2bdff61fa52a/go.mod h1:qJ3e8bA8h4wz/jYlbeEUafVHdrU7DkpStnmIUAz6VTQ= +go.opentelemetry.io/collector/consumer v0.66.1-0.20221202005155-1c54042beb70 h1:XwpVjI1KeKGPXOZBLefGILMziPYuNf6IzbmiIEsIyI0= +go.opentelemetry.io/collector/consumer v0.66.1-0.20221202005155-1c54042beb70/go.mod h1:EWVBcSGcIcmeDGTnIboc/aqa3agsBeH8/q7yFWG7xVc= +go.opentelemetry.io/collector/featuregate v0.66.1-0.20221202005155-1c54042beb70 h1:V0tf4ebciqIs07jFATfLGdUpLRaEsi+AiWuA/in0G8Y= +go.opentelemetry.io/collector/featuregate v0.66.1-0.20221202005155-1c54042beb70/go.mod h1:tewuFKJYalWBU0bmNKg++MC1ipINXUr6szYzOw2p1GI= +go.opentelemetry.io/collector/pdata v0.66.1-0.20221202005155-1c54042beb70 h1:TPOrxkEMvZzfBSwF3ct+kUUgKA5g8unkZZbKQvJweeA= +go.opentelemetry.io/collector/pdata v0.66.1-0.20221202005155-1c54042beb70/go.mod h1:pqyaznLzk21m+1KL6fwOsRryRELL+zNM0qiVSn0MbVc= +go.opentelemetry.io/collector/semconv v0.66.1-0.20221202005155-1c54042beb70 h1:Q5L9Urod3c8as6ZYaoaqBjarx/HXxsxy34DFZIU2fO4= +go.opentelemetry.io/collector/semconv v0.66.1-0.20221202005155-1c54042beb70/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= @@ -366,8 +368,8 @@ go.uber.org/multierr v1.6.0/go.mod h1:cdWPpRnG4AhwMwsgIHip0KRBQjJy5kYEpYjJxpXp9i go.uber.org/multierr v1.8.0 h1:dg6GjLku4EH+249NNmoIciG9N/jURbDG+pFlTkhzIC8= go.uber.org/multierr v1.8.0/go.mod h1:7EAYxJLBy9rStEaz58O2t4Uvip6FSURkq8/ppBp95ak= go.uber.org/zap v1.17.0/go.mod h1:MXVU+bhUf/A7Xi2HNOnopQOrmycQ5Ih87HtOu4q5SSo= -go.uber.org/zap v1.23.0 h1:OjGQ5KQDEUawVHxNwQgPpiypGHOxo2mNZsOqTak4fFY= -go.uber.org/zap v1.23.0/go.mod h1:D+nX8jyLsMHMYrln8A0rJjFt/T/9/bGgIhAqxv5URuY= +go.uber.org/zap v1.24.0 h1:FiJd5l1UOLj0wCgbSE0rwwXHzEdAZS6hiiSnxJN/D60= +go.uber.org/zap v1.24.0/go.mod h1:2kMP+WWQ8aoFoedH3T2sq6iJ2yDWpHbP0f6MQbS9Gkg= golang.org/x/crypto v0.0.0-20180904163835-0709b304e793/go.mod h1:6SG95UA2DQfeDnfUPMdvaQW0Q7yPrPDi9nlGo2tz2b4= golang.org/x/crypto v0.0.0-20190308221718-c2843e01d9a2/go.mod h1:djNgcEr1/C05ACkg1iLfiJU5Ep61QUkGW8qpdssI0+w= golang.org/x/crypto v0.0.0-20190923035154-9ee001bba392/go.mod h1:/lpIB1dKB+9EgE3H3cr1v9wB50oz8l4C4h62xy7jSTY= diff --git a/receiver/kafkareceiver/kafka_receiver.go b/receiver/kafkareceiver/kafka_receiver.go index aa9d969f9d5e..09eb70356773 100644 --- a/receiver/kafkareceiver/kafka_receiver.go +++ b/receiver/kafkareceiver/kafka_receiver.go @@ -38,7 +38,6 @@ var errUnrecognizedEncoding = fmt.Errorf("unrecognized encoding") // kafkaTracesConsumer uses sarama to consume and handle messages from kafka. type kafkaTracesConsumer struct { - id component.ID consumerGroup sarama.ConsumerGroup nextConsumer consumer.Traces topics []string @@ -53,7 +52,6 @@ type kafkaTracesConsumer struct { // kafkaMetricsConsumer uses sarama to consume and handle messages from kafka. type kafkaMetricsConsumer struct { - id component.ID consumerGroup sarama.ConsumerGroup nextConsumer consumer.Metrics topics []string @@ -68,7 +66,6 @@ type kafkaMetricsConsumer struct { // kafkaLogsConsumer uses sarama to consume and handle messages from kafka. type kafkaLogsConsumer struct { - id component.ID consumerGroup sarama.ConsumerGroup nextConsumer consumer.Logs topics []string @@ -111,7 +108,6 @@ func newTracesReceiver(config Config, set component.ReceiverCreateSettings, unma return nil, err } return &kafkaTracesConsumer{ - id: config.ID(), consumerGroup: client, topics: []string{config.Topic}, nextConsumer: nextConsumer, @@ -126,7 +122,7 @@ func (c *kafkaTracesConsumer) Start(_ context.Context, host component.Host) erro ctx, cancel := context.WithCancel(context.Background()) c.cancelConsumeLoop = cancel obsrecv, err := obsreport.NewReceiver(obsreport.ReceiverSettings{ - ReceiverID: c.id, + ReceiverID: c.settings.ID, Transport: transport, ReceiverCreateSettings: c.settings, }) @@ -134,7 +130,6 @@ func (c *kafkaTracesConsumer) Start(_ context.Context, host component.Host) erro return err } consumerGroup := &tracesConsumerGroupHandler{ - id: c.id, logger: c.settings.Logger, unmarshaler: c.unmarshaler, nextConsumer: c.nextConsumer, @@ -202,7 +197,6 @@ func newMetricsReceiver(config Config, set component.ReceiverCreateSettings, unm return nil, err } return &kafkaMetricsConsumer{ - id: config.ID(), consumerGroup: client, topics: []string{config.Topic}, nextConsumer: nextConsumer, @@ -217,7 +211,7 @@ func (c *kafkaMetricsConsumer) Start(_ context.Context, host component.Host) err ctx, cancel := context.WithCancel(context.Background()) c.cancelConsumeLoop = cancel obsrecv, err := obsreport.NewReceiver(obsreport.ReceiverSettings{ - ReceiverID: c.id, + ReceiverID: c.settings.ID, Transport: transport, ReceiverCreateSettings: c.settings, }) @@ -225,7 +219,6 @@ func (c *kafkaMetricsConsumer) Start(_ context.Context, host component.Host) err return err } metricsConsumerGroup := &metricsConsumerGroupHandler{ - id: c.id, logger: c.settings.Logger, unmarshaler: c.unmarshaler, nextConsumer: c.nextConsumer, @@ -290,7 +283,6 @@ func newLogsReceiver(config Config, set component.ReceiverCreateSettings, unmars return nil, err } return &kafkaLogsConsumer{ - id: config.ID(), consumerGroup: client, topics: []string{config.Topic}, nextConsumer: nextConsumer, @@ -305,7 +297,7 @@ func (c *kafkaLogsConsumer) Start(_ context.Context, host component.Host) error ctx, cancel := context.WithCancel(context.Background()) c.cancelConsumeLoop = cancel obsrecv, err := obsreport.NewReceiver(obsreport.ReceiverSettings{ - ReceiverID: c.id, + ReceiverID: c.settings.ID, Transport: transport, ReceiverCreateSettings: c.settings, }) @@ -314,7 +306,6 @@ func (c *kafkaLogsConsumer) Start(_ context.Context, host component.Host) error } logsConsumerGroup := &logsConsumerGroupHandler{ - id: c.id, logger: c.settings.Logger, unmarshaler: c.unmarshaler, nextConsumer: c.nextConsumer, diff --git a/receiver/kubeletstatsreceiver/config.go b/receiver/kubeletstatsreceiver/config.go index 72e1440442db..6aa160371112 100644 --- a/receiver/kubeletstatsreceiver/config.go +++ b/receiver/kubeletstatsreceiver/config.go @@ -77,7 +77,6 @@ func (cfg *Config) getReceiverOptions() (*scraperOptions, error) { } return &scraperOptions{ - id: cfg.ID(), collectionInterval: cfg.CollectionInterval, extraMetadataLabels: cfg.ExtraMetadataLabels, metricGroupsToCollect: mgs, diff --git a/receiver/kubeletstatsreceiver/config_test.go b/receiver/kubeletstatsreceiver/config_test.go index e4569b73f47a..f41f3329f2b6 100644 --- a/receiver/kubeletstatsreceiver/config_test.go +++ b/receiver/kubeletstatsreceiver/config_test.go @@ -227,7 +227,6 @@ func TestGetReceiverOptions(t *testing.T) { }, }, want: &scraperOptions{ - id: component.NewID(typeStr), extraMetadataLabels: []kubelet.MetadataLabel{ kubelet.MetadataLabelContainerID, }, diff --git a/receiver/kubeletstatsreceiver/go.mod b/receiver/kubeletstatsreceiver/go.mod index 1bb5c8992cb1..fa90e4b18561 100644 --- a/receiver/kubeletstatsreceiver/go.mod +++ b/receiver/kubeletstatsreceiver/go.mod @@ -6,12 +6,13 @@ require ( github.com/open-telemetry/opentelemetry-collector-contrib/internal/k8sconfig v0.66.0 github.com/open-telemetry/opentelemetry-collector-contrib/internal/kubelet v0.66.0 github.com/stretchr/testify v1.8.1 - go.opentelemetry.io/collector v0.66.1-0.20221128222955-4ff1ff379b90 - go.opentelemetry.io/collector/component v0.66.1-0.20221128222955-4ff1ff379b90 - go.opentelemetry.io/collector/consumer v0.66.1-0.20221128222955-4ff1ff379b90 - go.opentelemetry.io/collector/pdata v0.66.1-0.20221128222955-4ff1ff379b90 - go.opentelemetry.io/collector/semconv v0.66.1-0.20221128222955-4ff1ff379b90 - go.uber.org/zap v1.23.0 + go.opentelemetry.io/collector v0.66.1-0.20221202005155-1c54042beb70 + go.opentelemetry.io/collector/component v0.66.1-0.20221202005155-1c54042beb70 + go.opentelemetry.io/collector/confmap v0.0.0-20221201172708-2bdff61fa52a + go.opentelemetry.io/collector/consumer v0.66.1-0.20221202005155-1c54042beb70 + go.opentelemetry.io/collector/pdata v0.66.1-0.20221202005155-1c54042beb70 + go.opentelemetry.io/collector/semconv v0.66.1-0.20221202005155-1c54042beb70 + go.uber.org/zap v1.24.0 k8s.io/api v0.25.4 k8s.io/apimachinery v0.25.4 k8s.io/client-go v0.25.4 @@ -52,7 +53,7 @@ require ( github.com/rogpeppe/go-internal v1.6.1 // indirect github.com/spf13/pflag v1.0.5 // indirect go.opencensus.io v0.24.0 // indirect - go.opentelemetry.io/collector/featuregate v0.66.1-0.20221128222955-4ff1ff379b90 // indirect + go.opentelemetry.io/collector/featuregate v0.66.1-0.20221202005155-1c54042beb70 // 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 b7ce8d79fbe6..d0f02b91241f 100644 --- a/receiver/kubeletstatsreceiver/go.sum +++ b/receiver/kubeletstatsreceiver/go.sum @@ -444,18 +444,20 @@ go.opencensus.io v0.22.3/go.mod h1:yxeiOL68Rb0Xd1ddK5vPZ/oVn4vY4Ynel7k9FzqtOIw= go.opencensus.io v0.22.4/go.mod h1:yxeiOL68Rb0Xd1ddK5vPZ/oVn4vY4Ynel7k9FzqtOIw= go.opencensus.io v0.24.0 h1:y73uSU6J157QMP2kn2r30vwW1A2W2WFwSCGnAVxeaD0= go.opencensus.io v0.24.0/go.mod h1:vNK8G9p7aAivkbmorf4v+7Hgx+Zs0yY+0fOtgBfjQKo= -go.opentelemetry.io/collector v0.66.1-0.20221128222955-4ff1ff379b90 h1:yRe05/jMdzH4TFHfndZ5h2o2hKBK/79W72j8w51qNsI= -go.opentelemetry.io/collector v0.66.1-0.20221128222955-4ff1ff379b90/go.mod h1:hE6jCs+0rfiufCrVPucKZTMwfHit1okfDPnwPT2eW1I= -go.opentelemetry.io/collector/component v0.66.1-0.20221128222955-4ff1ff379b90 h1:AYSNTXbezhNg43EuYdVVcgxE/2gBVrm00FDx4DOmQVg= -go.opentelemetry.io/collector/component v0.66.1-0.20221128222955-4ff1ff379b90/go.mod h1:0c84EqXUhvYe6KW7hJfh76tiI/5yjWCH2amwyQ06XLM= -go.opentelemetry.io/collector/consumer v0.66.1-0.20221128222955-4ff1ff379b90 h1:nzNXVfC1FzXBXCLMzbMv+qK3E4EGiNsnMhfVsBd2yzc= -go.opentelemetry.io/collector/consumer v0.66.1-0.20221128222955-4ff1ff379b90/go.mod h1:WtoRZa5SnxQO1ZEQdVxYpFcXCmq62rakv0oUSlPO0NQ= -go.opentelemetry.io/collector/featuregate v0.66.1-0.20221128222955-4ff1ff379b90 h1:UuJSFWbi9XxyNZsJKZuvpWg35BgRbcCGFH+38V2MAdw= -go.opentelemetry.io/collector/featuregate v0.66.1-0.20221128222955-4ff1ff379b90/go.mod h1:tewuFKJYalWBU0bmNKg++MC1ipINXUr6szYzOw2p1GI= -go.opentelemetry.io/collector/pdata v0.66.1-0.20221128222955-4ff1ff379b90 h1:Vu4S4jSNcd0VFPzxQNO4+UqGwnes1xJDoFLPRiWHm8I= -go.opentelemetry.io/collector/pdata v0.66.1-0.20221128222955-4ff1ff379b90/go.mod h1:pqyaznLzk21m+1KL6fwOsRryRELL+zNM0qiVSn0MbVc= -go.opentelemetry.io/collector/semconv v0.66.1-0.20221128222955-4ff1ff379b90 h1:hFaTA68cggZKWMv7wQ3bKP8KGTbowh/5AQZKCHzHTqM= -go.opentelemetry.io/collector/semconv v0.66.1-0.20221128222955-4ff1ff379b90/go.mod h1:5o9yhOa+ABt7g2E5JABDxGZ1PQPbtfxrKNbYn+LOTXU= +go.opentelemetry.io/collector v0.66.1-0.20221202005155-1c54042beb70 h1:INB2CsOtqqrija2KvMuIpbBQ3qX1BECEeR+d0NJX+oM= +go.opentelemetry.io/collector v0.66.1-0.20221202005155-1c54042beb70/go.mod h1:d0NHkHyANJy3HDTvYE/PoylMShUmFIbiir89ieI0X0c= +go.opentelemetry.io/collector/component v0.66.1-0.20221202005155-1c54042beb70 h1:dEoJhzCmRShgmVro/kXm6pouGElgxkH2DsvanzCeZtU= +go.opentelemetry.io/collector/component v0.66.1-0.20221202005155-1c54042beb70/go.mod h1:OsVnvFFe38QSpcuZlQ8cvarDzcloCexgQ1/B2m80F6U= +go.opentelemetry.io/collector/confmap v0.0.0-20221201172708-2bdff61fa52a h1:2TscCXAQASO2kU9xHcMIUM/FP29fiQIRTilZmliq/7I= +go.opentelemetry.io/collector/confmap v0.0.0-20221201172708-2bdff61fa52a/go.mod h1:qJ3e8bA8h4wz/jYlbeEUafVHdrU7DkpStnmIUAz6VTQ= +go.opentelemetry.io/collector/consumer v0.66.1-0.20221202005155-1c54042beb70 h1:XwpVjI1KeKGPXOZBLefGILMziPYuNf6IzbmiIEsIyI0= +go.opentelemetry.io/collector/consumer v0.66.1-0.20221202005155-1c54042beb70/go.mod h1:EWVBcSGcIcmeDGTnIboc/aqa3agsBeH8/q7yFWG7xVc= +go.opentelemetry.io/collector/featuregate v0.66.1-0.20221202005155-1c54042beb70 h1:V0tf4ebciqIs07jFATfLGdUpLRaEsi+AiWuA/in0G8Y= +go.opentelemetry.io/collector/featuregate v0.66.1-0.20221202005155-1c54042beb70/go.mod h1:tewuFKJYalWBU0bmNKg++MC1ipINXUr6szYzOw2p1GI= +go.opentelemetry.io/collector/pdata v0.66.1-0.20221202005155-1c54042beb70 h1:TPOrxkEMvZzfBSwF3ct+kUUgKA5g8unkZZbKQvJweeA= +go.opentelemetry.io/collector/pdata v0.66.1-0.20221202005155-1c54042beb70/go.mod h1:pqyaznLzk21m+1KL6fwOsRryRELL+zNM0qiVSn0MbVc= +go.opentelemetry.io/collector/semconv v0.66.1-0.20221202005155-1c54042beb70 h1:Q5L9Urod3c8as6ZYaoaqBjarx/HXxsxy34DFZIU2fO4= +go.opentelemetry.io/collector/semconv v0.66.1-0.20221202005155-1c54042beb70/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= @@ -474,8 +476,8 @@ go.uber.org/multierr v1.6.0/go.mod h1:cdWPpRnG4AhwMwsgIHip0KRBQjJy5kYEpYjJxpXp9i go.uber.org/multierr v1.8.0 h1:dg6GjLku4EH+249NNmoIciG9N/jURbDG+pFlTkhzIC8= go.uber.org/multierr v1.8.0/go.mod h1:7EAYxJLBy9rStEaz58O2t4Uvip6FSURkq8/ppBp95ak= go.uber.org/zap v1.17.0/go.mod h1:MXVU+bhUf/A7Xi2HNOnopQOrmycQ5Ih87HtOu4q5SSo= -go.uber.org/zap v1.23.0 h1:OjGQ5KQDEUawVHxNwQgPpiypGHOxo2mNZsOqTak4fFY= -go.uber.org/zap v1.23.0/go.mod h1:D+nX8jyLsMHMYrln8A0rJjFt/T/9/bGgIhAqxv5URuY= +go.uber.org/zap v1.24.0 h1:FiJd5l1UOLj0wCgbSE0rwwXHzEdAZS6hiiSnxJN/D60= +go.uber.org/zap v1.24.0/go.mod h1:2kMP+WWQ8aoFoedH3T2sq6iJ2yDWpHbP0f6MQbS9Gkg= golang.org/x/crypto v0.0.0-20180904163835-0709b304e793/go.mod h1:6SG95UA2DQfeDnfUPMdvaQW0Q7yPrPDi9nlGo2tz2b4= golang.org/x/crypto v0.0.0-20190308221718-c2843e01d9a2/go.mod h1:djNgcEr1/C05ACkg1iLfiJU5Ep61QUkGW8qpdssI0+w= golang.org/x/crypto v0.0.0-20190510104115-cbcb75029529/go.mod h1:yigFU9vqHzYiE8UmvKecakEJjdnWj3jj499lnFckfCI= diff --git a/receiver/kubeletstatsreceiver/scraper.go b/receiver/kubeletstatsreceiver/scraper.go index 934818fb9820..a2988978ec81 100644 --- a/receiver/kubeletstatsreceiver/scraper.go +++ b/receiver/kubeletstatsreceiver/scraper.go @@ -32,7 +32,6 @@ import ( ) type scraperOptions struct { - id component.ID collectionInterval time.Duration extraMetadataLabels []kubelet.MetadataLabel metricGroupsToCollect map[kubelet.MetricGroup]bool diff --git a/receiver/memcachedreceiver/go.mod b/receiver/memcachedreceiver/go.mod index 7149a152c999..b2c6885ba024 100644 --- a/receiver/memcachedreceiver/go.mod +++ b/receiver/memcachedreceiver/go.mod @@ -7,11 +7,12 @@ require ( github.com/open-telemetry/opentelemetry-collector-contrib/internal/scrapertest v0.66.0 github.com/stretchr/testify v1.8.1 github.com/testcontainers/testcontainers-go v0.15.0 - go.opentelemetry.io/collector v0.66.1-0.20221128222955-4ff1ff379b90 - go.opentelemetry.io/collector/component v0.66.1-0.20221128222955-4ff1ff379b90 - go.opentelemetry.io/collector/consumer v0.66.1-0.20221128222955-4ff1ff379b90 - go.opentelemetry.io/collector/pdata v0.66.1-0.20221128222955-4ff1ff379b90 - go.uber.org/zap v1.23.0 + go.opentelemetry.io/collector v0.66.1-0.20221202005155-1c54042beb70 + go.opentelemetry.io/collector/component v0.66.1-0.20221202005155-1c54042beb70 + go.opentelemetry.io/collector/confmap v0.0.0-20221201172708-2bdff61fa52a + go.opentelemetry.io/collector/consumer v0.66.1-0.20221202005155-1c54042beb70 + go.opentelemetry.io/collector/pdata v0.66.1-0.20221202005155-1c54042beb70 + go.uber.org/zap v1.24.0 ) require ( @@ -52,7 +53,7 @@ require ( github.com/rogpeppe/go-internal v1.6.1 // indirect github.com/sirupsen/logrus v1.8.1 // indirect go.opencensus.io v0.24.0 // indirect - go.opentelemetry.io/collector/featuregate v0.66.1-0.20221128222955-4ff1ff379b90 // indirect + go.opentelemetry.io/collector/featuregate v0.66.1-0.20221202005155-1c54042beb70 // 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 75e91eda75a1..f1573881165d 100644 --- a/receiver/memcachedreceiver/go.sum +++ b/receiver/memcachedreceiver/go.sum @@ -823,16 +823,18 @@ go.opencensus.io v0.22.2/go.mod h1:yxeiOL68Rb0Xd1ddK5vPZ/oVn4vY4Ynel7k9FzqtOIw= go.opencensus.io v0.22.3/go.mod h1:yxeiOL68Rb0Xd1ddK5vPZ/oVn4vY4Ynel7k9FzqtOIw= go.opencensus.io v0.24.0 h1:y73uSU6J157QMP2kn2r30vwW1A2W2WFwSCGnAVxeaD0= go.opencensus.io v0.24.0/go.mod h1:vNK8G9p7aAivkbmorf4v+7Hgx+Zs0yY+0fOtgBfjQKo= -go.opentelemetry.io/collector v0.66.1-0.20221128222955-4ff1ff379b90 h1:yRe05/jMdzH4TFHfndZ5h2o2hKBK/79W72j8w51qNsI= -go.opentelemetry.io/collector v0.66.1-0.20221128222955-4ff1ff379b90/go.mod h1:hE6jCs+0rfiufCrVPucKZTMwfHit1okfDPnwPT2eW1I= -go.opentelemetry.io/collector/component v0.66.1-0.20221128222955-4ff1ff379b90 h1:AYSNTXbezhNg43EuYdVVcgxE/2gBVrm00FDx4DOmQVg= -go.opentelemetry.io/collector/component v0.66.1-0.20221128222955-4ff1ff379b90/go.mod h1:0c84EqXUhvYe6KW7hJfh76tiI/5yjWCH2amwyQ06XLM= -go.opentelemetry.io/collector/consumer v0.66.1-0.20221128222955-4ff1ff379b90 h1:nzNXVfC1FzXBXCLMzbMv+qK3E4EGiNsnMhfVsBd2yzc= -go.opentelemetry.io/collector/consumer v0.66.1-0.20221128222955-4ff1ff379b90/go.mod h1:WtoRZa5SnxQO1ZEQdVxYpFcXCmq62rakv0oUSlPO0NQ= -go.opentelemetry.io/collector/featuregate v0.66.1-0.20221128222955-4ff1ff379b90 h1:UuJSFWbi9XxyNZsJKZuvpWg35BgRbcCGFH+38V2MAdw= -go.opentelemetry.io/collector/featuregate v0.66.1-0.20221128222955-4ff1ff379b90/go.mod h1:tewuFKJYalWBU0bmNKg++MC1ipINXUr6szYzOw2p1GI= -go.opentelemetry.io/collector/pdata v0.66.1-0.20221128222955-4ff1ff379b90 h1:Vu4S4jSNcd0VFPzxQNO4+UqGwnes1xJDoFLPRiWHm8I= -go.opentelemetry.io/collector/pdata v0.66.1-0.20221128222955-4ff1ff379b90/go.mod h1:pqyaznLzk21m+1KL6fwOsRryRELL+zNM0qiVSn0MbVc= +go.opentelemetry.io/collector v0.66.1-0.20221202005155-1c54042beb70 h1:INB2CsOtqqrija2KvMuIpbBQ3qX1BECEeR+d0NJX+oM= +go.opentelemetry.io/collector v0.66.1-0.20221202005155-1c54042beb70/go.mod h1:d0NHkHyANJy3HDTvYE/PoylMShUmFIbiir89ieI0X0c= +go.opentelemetry.io/collector/component v0.66.1-0.20221202005155-1c54042beb70 h1:dEoJhzCmRShgmVro/kXm6pouGElgxkH2DsvanzCeZtU= +go.opentelemetry.io/collector/component v0.66.1-0.20221202005155-1c54042beb70/go.mod h1:OsVnvFFe38QSpcuZlQ8cvarDzcloCexgQ1/B2m80F6U= +go.opentelemetry.io/collector/confmap v0.0.0-20221201172708-2bdff61fa52a h1:2TscCXAQASO2kU9xHcMIUM/FP29fiQIRTilZmliq/7I= +go.opentelemetry.io/collector/confmap v0.0.0-20221201172708-2bdff61fa52a/go.mod h1:qJ3e8bA8h4wz/jYlbeEUafVHdrU7DkpStnmIUAz6VTQ= +go.opentelemetry.io/collector/consumer v0.66.1-0.20221202005155-1c54042beb70 h1:XwpVjI1KeKGPXOZBLefGILMziPYuNf6IzbmiIEsIyI0= +go.opentelemetry.io/collector/consumer v0.66.1-0.20221202005155-1c54042beb70/go.mod h1:EWVBcSGcIcmeDGTnIboc/aqa3agsBeH8/q7yFWG7xVc= +go.opentelemetry.io/collector/featuregate v0.66.1-0.20221202005155-1c54042beb70 h1:V0tf4ebciqIs07jFATfLGdUpLRaEsi+AiWuA/in0G8Y= +go.opentelemetry.io/collector/featuregate v0.66.1-0.20221202005155-1c54042beb70/go.mod h1:tewuFKJYalWBU0bmNKg++MC1ipINXUr6szYzOw2p1GI= +go.opentelemetry.io/collector/pdata v0.66.1-0.20221202005155-1c54042beb70 h1:TPOrxkEMvZzfBSwF3ct+kUUgKA5g8unkZZbKQvJweeA= +go.opentelemetry.io/collector/pdata v0.66.1-0.20221202005155-1c54042beb70/go.mod h1:pqyaznLzk21m+1KL6fwOsRryRELL+zNM0qiVSn0MbVc= 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= @@ -855,8 +857,8 @@ go.uber.org/multierr v1.8.0 h1:dg6GjLku4EH+249NNmoIciG9N/jURbDG+pFlTkhzIC8= go.uber.org/multierr v1.8.0/go.mod h1:7EAYxJLBy9rStEaz58O2t4Uvip6FSURkq8/ppBp95ak= go.uber.org/zap v1.10.0/go.mod h1:vwi/ZaCAaUcBkycHslxD9B2zi4UTXhF60s6SWpuDF0Q= go.uber.org/zap v1.17.0/go.mod h1:MXVU+bhUf/A7Xi2HNOnopQOrmycQ5Ih87HtOu4q5SSo= -go.uber.org/zap v1.23.0 h1:OjGQ5KQDEUawVHxNwQgPpiypGHOxo2mNZsOqTak4fFY= -go.uber.org/zap v1.23.0/go.mod h1:D+nX8jyLsMHMYrln8A0rJjFt/T/9/bGgIhAqxv5URuY= +go.uber.org/zap v1.24.0 h1:FiJd5l1UOLj0wCgbSE0rwwXHzEdAZS6hiiSnxJN/D60= +go.uber.org/zap v1.24.0/go.mod h1:2kMP+WWQ8aoFoedH3T2sq6iJ2yDWpHbP0f6MQbS9Gkg= golang.org/x/crypto v0.0.0-20171113213409-9f005a07e0d3/go.mod h1:6SG95UA2DQfeDnfUPMdvaQW0Q7yPrPDi9nlGo2tz2b4= golang.org/x/crypto v0.0.0-20180904163835-0709b304e793/go.mod h1:6SG95UA2DQfeDnfUPMdvaQW0Q7yPrPDi9nlGo2tz2b4= golang.org/x/crypto v0.0.0-20181009213950-7c1a557ab941/go.mod h1:6SG95UA2DQfeDnfUPMdvaQW0Q7yPrPDi9nlGo2tz2b4= diff --git a/receiver/mongodbatlasreceiver/alerts.go b/receiver/mongodbatlasreceiver/alerts.go index f28c3bf484ba..8395853d8615 100644 --- a/receiver/mongodbatlasreceiver/alerts.go +++ b/receiver/mongodbatlasreceiver/alerts.go @@ -95,7 +95,7 @@ type alertsReceiver struct { storageClient storage.Client } -func newAlertsReceiver(logger *zap.Logger, baseConfig *Config, consumer consumer.Logs) (*alertsReceiver, error) { +func newAlertsReceiver(params component.ReceiverCreateSettings, baseConfig *Config, consumer consumer.Logs) (*alertsReceiver, error) { cfg := baseConfig.Alerts var tlsConfig *tls.Config @@ -127,8 +127,8 @@ func newAlertsReceiver(logger *zap.Logger, baseConfig *Config, consumer consumer maxPages: baseConfig.Alerts.MaxPages, pageSize: baseConfig.Alerts.PageSize, doneChan: make(chan bool, 1), - logger: logger, - id: baseConfig.ID(), + logger: params.Logger, + id: params.ID, storageID: baseConfig.StorageID, } diff --git a/receiver/mongodbatlasreceiver/alerts_test.go b/receiver/mongodbatlasreceiver/alerts_test.go index c0395d828ee0..33b49dbc8cdb 100644 --- a/receiver/mongodbatlasreceiver/alerts_test.go +++ b/receiver/mongodbatlasreceiver/alerts_test.go @@ -39,7 +39,6 @@ import ( "go.opentelemetry.io/collector/pdata/pcommon" "go.opentelemetry.io/collector/pdata/plog" "go.opentelemetry.io/collector/receiver/scraperhelper" - "go.uber.org/zap" "go.uber.org/zap/zaptest" "github.com/open-telemetry/opentelemetry-collector-contrib/receiver/mongodbatlasreceiver/internal" @@ -411,13 +410,9 @@ func TestHandleRequest(t *testing.T) { consumer = &consumertest.LogsSink{} } - ar, err := newAlertsReceiver(zaptest.NewLogger(t), - &Config{ - Alerts: AlertConfig{ - Secret: "some_secret", - }, - }, consumer) - + set := componenttest.NewNopReceiverCreateSettings() + set.Logger = zaptest.NewLogger(t) + ar, err := newAlertsReceiver(set, &Config{Alerts: AlertConfig{Secret: "some_secret"}}, consumer) require.NoError(t, err, "Failed to create alerts receiver") rec := httptest.NewRecorder() @@ -731,7 +726,7 @@ func TestAlertsRetrieval(t *testing.T) { t.Run(tc.name, func(t *testing.T) { t.Parallel() logSink := &consumertest.LogsSink{} - alertsRcvr, err := newAlertsReceiver(zap.NewNop(), tc.config(), logSink) + alertsRcvr, err := newAlertsReceiver(componenttest.NewNopReceiverCreateSettings(), tc.config(), logSink) require.NoError(t, err) alertsRcvr.client = tc.client() @@ -752,7 +747,7 @@ func TestAlertsRetrieval(t *testing.T) { func TestAlertPollingExclusions(t *testing.T) { logSink := &consumertest.LogsSink{} - alertsRcvr, err := newAlertsReceiver(zap.NewNop(), &Config{ + alertsRcvr, err := newAlertsReceiver(componenttest.NewNopReceiverCreateSettings(), &Config{ Alerts: AlertConfig{ Enabled: true, Mode: alertModePoll, diff --git a/receiver/mongodbatlasreceiver/factory.go b/receiver/mongodbatlasreceiver/factory.go index 46a1a290ceb0..6b7dcc7c3c29 100644 --- a/receiver/mongodbatlasreceiver/factory.go +++ b/receiver/mongodbatlasreceiver/factory.go @@ -77,7 +77,7 @@ func createCombinedLogReceiver( recv := &combinedLogsReceiver{} if cfg.Alerts.Enabled { - recv.alerts, err = newAlertsReceiver(params.Logger, cfg, consumer) + recv.alerts, err = newAlertsReceiver(params, cfg, consumer) if err != nil { return nil, fmt.Errorf("unable to create a MongoDB Atlas Alerts Receiver instance: %w", err) } diff --git a/receiver/mongodbatlasreceiver/go.mod b/receiver/mongodbatlasreceiver/go.mod index 80cdec16ffd4..277d864e071b 100644 --- a/receiver/mongodbatlasreceiver/go.mod +++ b/receiver/mongodbatlasreceiver/go.mod @@ -9,12 +9,13 @@ require ( github.com/open-telemetry/opentelemetry-collector-contrib/pkg/stanza v0.66.0 github.com/stretchr/testify v1.8.1 go.mongodb.org/atlas v0.19.0 - go.opentelemetry.io/collector v0.66.1-0.20221128222955-4ff1ff379b90 - go.opentelemetry.io/collector/component v0.66.1-0.20221128222955-4ff1ff379b90 - go.opentelemetry.io/collector/consumer v0.66.1-0.20221128222955-4ff1ff379b90 - go.opentelemetry.io/collector/pdata v0.66.1-0.20221128222955-4ff1ff379b90 + go.opentelemetry.io/collector v0.66.1-0.20221202005155-1c54042beb70 + go.opentelemetry.io/collector/component v0.66.1-0.20221202005155-1c54042beb70 + go.opentelemetry.io/collector/confmap v0.0.0-20221201172708-2bdff61fa52a + go.opentelemetry.io/collector/consumer v0.66.1-0.20221202005155-1c54042beb70 + go.opentelemetry.io/collector/pdata v0.66.1-0.20221202005155-1c54042beb70 go.uber.org/multierr v1.8.0 - go.uber.org/zap v1.23.0 + go.uber.org/zap v1.24.0 ) require ( @@ -39,7 +40,7 @@ require ( github.com/pmezard/go-difflib v1.0.0 // indirect github.com/stretchr/objx v0.5.0 // indirect go.opencensus.io v0.24.0 // indirect - go.opentelemetry.io/collector/featuregate v0.66.1-0.20221128222955-4ff1ff379b90 // indirect + go.opentelemetry.io/collector/featuregate v0.66.1-0.20221202005155-1c54042beb70 // indirect go.opentelemetry.io/otel v1.11.1 // indirect go.opentelemetry.io/otel/metric v0.33.0 // indirect go.opentelemetry.io/otel/trace v1.11.1 // indirect diff --git a/receiver/mongodbatlasreceiver/go.sum b/receiver/mongodbatlasreceiver/go.sum index 0fa05584b8d0..e45ba77a4a3f 100644 --- a/receiver/mongodbatlasreceiver/go.sum +++ b/receiver/mongodbatlasreceiver/go.sum @@ -315,16 +315,18 @@ go.mongodb.org/atlas v0.19.0 h1:gvezG9d0KsSDaExEdTtcGqZHRvvVazzuEcBUpBXxmlg= go.mongodb.org/atlas v0.19.0/go.mod h1:PFk1IGhiGjFXHGVspOK7i1U2nnPjK8wAjYwQf6FoVf4= go.opencensus.io v0.24.0 h1:y73uSU6J157QMP2kn2r30vwW1A2W2WFwSCGnAVxeaD0= go.opencensus.io v0.24.0/go.mod h1:vNK8G9p7aAivkbmorf4v+7Hgx+Zs0yY+0fOtgBfjQKo= -go.opentelemetry.io/collector v0.66.1-0.20221128222955-4ff1ff379b90 h1:yRe05/jMdzH4TFHfndZ5h2o2hKBK/79W72j8w51qNsI= -go.opentelemetry.io/collector v0.66.1-0.20221128222955-4ff1ff379b90/go.mod h1:hE6jCs+0rfiufCrVPucKZTMwfHit1okfDPnwPT2eW1I= -go.opentelemetry.io/collector/component v0.66.1-0.20221128222955-4ff1ff379b90 h1:AYSNTXbezhNg43EuYdVVcgxE/2gBVrm00FDx4DOmQVg= -go.opentelemetry.io/collector/component v0.66.1-0.20221128222955-4ff1ff379b90/go.mod h1:0c84EqXUhvYe6KW7hJfh76tiI/5yjWCH2amwyQ06XLM= -go.opentelemetry.io/collector/consumer v0.66.1-0.20221128222955-4ff1ff379b90 h1:nzNXVfC1FzXBXCLMzbMv+qK3E4EGiNsnMhfVsBd2yzc= -go.opentelemetry.io/collector/consumer v0.66.1-0.20221128222955-4ff1ff379b90/go.mod h1:WtoRZa5SnxQO1ZEQdVxYpFcXCmq62rakv0oUSlPO0NQ= -go.opentelemetry.io/collector/featuregate v0.66.1-0.20221128222955-4ff1ff379b90 h1:UuJSFWbi9XxyNZsJKZuvpWg35BgRbcCGFH+38V2MAdw= -go.opentelemetry.io/collector/featuregate v0.66.1-0.20221128222955-4ff1ff379b90/go.mod h1:tewuFKJYalWBU0bmNKg++MC1ipINXUr6szYzOw2p1GI= -go.opentelemetry.io/collector/pdata v0.66.1-0.20221128222955-4ff1ff379b90 h1:Vu4S4jSNcd0VFPzxQNO4+UqGwnes1xJDoFLPRiWHm8I= -go.opentelemetry.io/collector/pdata v0.66.1-0.20221128222955-4ff1ff379b90/go.mod h1:pqyaznLzk21m+1KL6fwOsRryRELL+zNM0qiVSn0MbVc= +go.opentelemetry.io/collector v0.66.1-0.20221202005155-1c54042beb70 h1:INB2CsOtqqrija2KvMuIpbBQ3qX1BECEeR+d0NJX+oM= +go.opentelemetry.io/collector v0.66.1-0.20221202005155-1c54042beb70/go.mod h1:d0NHkHyANJy3HDTvYE/PoylMShUmFIbiir89ieI0X0c= +go.opentelemetry.io/collector/component v0.66.1-0.20221202005155-1c54042beb70 h1:dEoJhzCmRShgmVro/kXm6pouGElgxkH2DsvanzCeZtU= +go.opentelemetry.io/collector/component v0.66.1-0.20221202005155-1c54042beb70/go.mod h1:OsVnvFFe38QSpcuZlQ8cvarDzcloCexgQ1/B2m80F6U= +go.opentelemetry.io/collector/confmap v0.0.0-20221201172708-2bdff61fa52a h1:2TscCXAQASO2kU9xHcMIUM/FP29fiQIRTilZmliq/7I= +go.opentelemetry.io/collector/confmap v0.0.0-20221201172708-2bdff61fa52a/go.mod h1:qJ3e8bA8h4wz/jYlbeEUafVHdrU7DkpStnmIUAz6VTQ= +go.opentelemetry.io/collector/consumer v0.66.1-0.20221202005155-1c54042beb70 h1:XwpVjI1KeKGPXOZBLefGILMziPYuNf6IzbmiIEsIyI0= +go.opentelemetry.io/collector/consumer v0.66.1-0.20221202005155-1c54042beb70/go.mod h1:EWVBcSGcIcmeDGTnIboc/aqa3agsBeH8/q7yFWG7xVc= +go.opentelemetry.io/collector/featuregate v0.66.1-0.20221202005155-1c54042beb70 h1:V0tf4ebciqIs07jFATfLGdUpLRaEsi+AiWuA/in0G8Y= +go.opentelemetry.io/collector/featuregate v0.66.1-0.20221202005155-1c54042beb70/go.mod h1:tewuFKJYalWBU0bmNKg++MC1ipINXUr6szYzOw2p1GI= +go.opentelemetry.io/collector/pdata v0.66.1-0.20221202005155-1c54042beb70 h1:TPOrxkEMvZzfBSwF3ct+kUUgKA5g8unkZZbKQvJweeA= +go.opentelemetry.io/collector/pdata v0.66.1-0.20221202005155-1c54042beb70/go.mod h1:pqyaznLzk21m+1KL6fwOsRryRELL+zNM0qiVSn0MbVc= 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= @@ -343,8 +345,8 @@ go.uber.org/multierr v1.6.0/go.mod h1:cdWPpRnG4AhwMwsgIHip0KRBQjJy5kYEpYjJxpXp9i go.uber.org/multierr v1.8.0 h1:dg6GjLku4EH+249NNmoIciG9N/jURbDG+pFlTkhzIC8= go.uber.org/multierr v1.8.0/go.mod h1:7EAYxJLBy9rStEaz58O2t4Uvip6FSURkq8/ppBp95ak= go.uber.org/zap v1.17.0/go.mod h1:MXVU+bhUf/A7Xi2HNOnopQOrmycQ5Ih87HtOu4q5SSo= -go.uber.org/zap v1.23.0 h1:OjGQ5KQDEUawVHxNwQgPpiypGHOxo2mNZsOqTak4fFY= -go.uber.org/zap v1.23.0/go.mod h1:D+nX8jyLsMHMYrln8A0rJjFt/T/9/bGgIhAqxv5URuY= +go.uber.org/zap v1.24.0 h1:FiJd5l1UOLj0wCgbSE0rwwXHzEdAZS6hiiSnxJN/D60= +go.uber.org/zap v1.24.0/go.mod h1:2kMP+WWQ8aoFoedH3T2sq6iJ2yDWpHbP0f6MQbS9Gkg= golang.org/x/crypto v0.0.0-20180904163835-0709b304e793/go.mod h1:6SG95UA2DQfeDnfUPMdvaQW0Q7yPrPDi9nlGo2tz2b4= golang.org/x/crypto v0.0.0-20190308221718-c2843e01d9a2/go.mod h1:djNgcEr1/C05ACkg1iLfiJU5Ep61QUkGW8qpdssI0+w= golang.org/x/crypto v0.0.0-20190923035154-9ee001bba392/go.mod h1:/lpIB1dKB+9EgE3H3cr1v9wB50oz8l4C4h62xy7jSTY= diff --git a/receiver/mongodbatlasreceiver/logs_test.go b/receiver/mongodbatlasreceiver/logs_test.go index e3c0177ed823..e66836b3599d 100644 --- a/receiver/mongodbatlasreceiver/logs_test.go +++ b/receiver/mongodbatlasreceiver/logs_test.go @@ -47,40 +47,24 @@ func TestFilterClusters(t *testing.T) { func TestDefaultLoggingConfig(t *testing.T) { factory := NewFactory() cfg := factory.CreateDefaultConfig().(*Config) - cfg.SetIDName("LoggingID") - params := componenttest.NewNopReceiverCreateSettings() - ctx := context.Background() cfg.Logs.Enabled = true - receiver, err := createCombinedLogReceiver( - ctx, - params, - cfg, - consumertest.NewNop(), - ) + recv, err := createCombinedLogReceiver(context.Background(), componenttest.NewNopReceiverCreateSettings(), cfg, consumertest.NewNop()) require.NoError(t, err) - require.NotNil(t, receiver, "receiver creation failed") + require.NotNil(t, recv, "receiver creation failed") - err = receiver.Start(ctx, componenttest.NewNopHost()) + err = recv.Start(context.Background(), componenttest.NewNopHost()) require.NoError(t, err) - err = receiver.Shutdown(ctx) + err = recv.Shutdown(context.Background()) require.NoError(t, err) } func TestNoLoggingEnabled(t *testing.T) { factory := NewFactory() cfg := factory.CreateDefaultConfig().(*Config) - cfg.SetIDName("LoggingID") - params := componenttest.NewNopReceiverCreateSettings() - ctx := context.Background() - receiver, err := createCombinedLogReceiver( - ctx, - params, - cfg, - consumertest.NewNop(), - ) + recv, err := createCombinedLogReceiver(context.Background(), componenttest.NewNopReceiverCreateSettings(), cfg, consumertest.NewNop()) require.Error(t, err) - require.Nil(t, receiver, "receiver creation failed") + require.Nil(t, recv, "receiver creation failed") } diff --git a/receiver/mongodbatlasreceiver/receiver_test.go b/receiver/mongodbatlasreceiver/receiver_test.go index 9d54a3b56d9d..fbeb49e60428 100644 --- a/receiver/mongodbatlasreceiver/receiver_test.go +++ b/receiver/mongodbatlasreceiver/receiver_test.go @@ -26,24 +26,15 @@ import ( func TestDefaultConfig(t *testing.T) { factory := NewFactory() - cfg := factory.CreateDefaultConfig().(*Config) - cfg.SetIDName("testDefaultConfig") - params := componenttest.NewNopReceiverCreateSettings() - ctx := context.Background() - - receiver, err := createMetricsReceiver( - ctx, - params, - cfg, - consumertest.NewNop(), - ) + cfg := factory.CreateDefaultConfig() + recv, err := createMetricsReceiver(context.Background(), componenttest.NewNopReceiverCreateSettings(), cfg, consumertest.NewNop()) require.NoError(t, err) - require.NotNil(t, receiver, "receiver creation failed") + require.NotNil(t, recv, "receiver creation failed") - err = receiver.Start(ctx, componenttest.NewNopHost()) + err = recv.Start(context.Background(), componenttest.NewNopHost()) require.NoError(t, err) - err = receiver.Shutdown(ctx) + err = recv.Shutdown(context.Background()) require.NoError(t, err) } diff --git a/receiver/mongodbreceiver/go.mod b/receiver/mongodbreceiver/go.mod index 7c527debe338..9a1296e6e8a2 100644 --- a/receiver/mongodbreceiver/go.mod +++ b/receiver/mongodbreceiver/go.mod @@ -8,12 +8,13 @@ require ( github.com/stretchr/testify v1.8.1 github.com/testcontainers/testcontainers-go v0.15.0 go.mongodb.org/mongo-driver v1.10.3 - go.opentelemetry.io/collector v0.66.1-0.20221128222955-4ff1ff379b90 - go.opentelemetry.io/collector/component v0.66.1-0.20221128222955-4ff1ff379b90 - go.opentelemetry.io/collector/consumer v0.66.1-0.20221128222955-4ff1ff379b90 - go.opentelemetry.io/collector/pdata v0.66.1-0.20221128222955-4ff1ff379b90 + go.opentelemetry.io/collector v0.66.1-0.20221202005155-1c54042beb70 + go.opentelemetry.io/collector/component v0.66.1-0.20221202005155-1c54042beb70 + go.opentelemetry.io/collector/confmap v0.0.0-20221201172708-2bdff61fa52a + go.opentelemetry.io/collector/consumer v0.66.1-0.20221202005155-1c54042beb70 + go.opentelemetry.io/collector/pdata v0.66.1-0.20221202005155-1c54042beb70 go.uber.org/multierr v1.8.0 - go.uber.org/zap v1.23.0 + go.uber.org/zap v1.24.0 ) require ( @@ -61,7 +62,7 @@ require ( github.com/xdg-go/stringprep v1.0.3 // indirect github.com/youmark/pkcs8 v0.0.0-20181117223130-1be2e3e5546d // indirect go.opencensus.io v0.24.0 // indirect - go.opentelemetry.io/collector/featuregate v0.66.1-0.20221128222955-4ff1ff379b90 // indirect + go.opentelemetry.io/collector/featuregate v0.66.1-0.20221202005155-1c54042beb70 // 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 8c8d56211eab..88661e0da88b 100644 --- a/receiver/mongodbreceiver/go.sum +++ b/receiver/mongodbreceiver/go.sum @@ -840,16 +840,18 @@ go.opencensus.io v0.22.2/go.mod h1:yxeiOL68Rb0Xd1ddK5vPZ/oVn4vY4Ynel7k9FzqtOIw= go.opencensus.io v0.22.3/go.mod h1:yxeiOL68Rb0Xd1ddK5vPZ/oVn4vY4Ynel7k9FzqtOIw= go.opencensus.io v0.24.0 h1:y73uSU6J157QMP2kn2r30vwW1A2W2WFwSCGnAVxeaD0= go.opencensus.io v0.24.0/go.mod h1:vNK8G9p7aAivkbmorf4v+7Hgx+Zs0yY+0fOtgBfjQKo= -go.opentelemetry.io/collector v0.66.1-0.20221128222955-4ff1ff379b90 h1:yRe05/jMdzH4TFHfndZ5h2o2hKBK/79W72j8w51qNsI= -go.opentelemetry.io/collector v0.66.1-0.20221128222955-4ff1ff379b90/go.mod h1:hE6jCs+0rfiufCrVPucKZTMwfHit1okfDPnwPT2eW1I= -go.opentelemetry.io/collector/component v0.66.1-0.20221128222955-4ff1ff379b90 h1:AYSNTXbezhNg43EuYdVVcgxE/2gBVrm00FDx4DOmQVg= -go.opentelemetry.io/collector/component v0.66.1-0.20221128222955-4ff1ff379b90/go.mod h1:0c84EqXUhvYe6KW7hJfh76tiI/5yjWCH2amwyQ06XLM= -go.opentelemetry.io/collector/consumer v0.66.1-0.20221128222955-4ff1ff379b90 h1:nzNXVfC1FzXBXCLMzbMv+qK3E4EGiNsnMhfVsBd2yzc= -go.opentelemetry.io/collector/consumer v0.66.1-0.20221128222955-4ff1ff379b90/go.mod h1:WtoRZa5SnxQO1ZEQdVxYpFcXCmq62rakv0oUSlPO0NQ= -go.opentelemetry.io/collector/featuregate v0.66.1-0.20221128222955-4ff1ff379b90 h1:UuJSFWbi9XxyNZsJKZuvpWg35BgRbcCGFH+38V2MAdw= -go.opentelemetry.io/collector/featuregate v0.66.1-0.20221128222955-4ff1ff379b90/go.mod h1:tewuFKJYalWBU0bmNKg++MC1ipINXUr6szYzOw2p1GI= -go.opentelemetry.io/collector/pdata v0.66.1-0.20221128222955-4ff1ff379b90 h1:Vu4S4jSNcd0VFPzxQNO4+UqGwnes1xJDoFLPRiWHm8I= -go.opentelemetry.io/collector/pdata v0.66.1-0.20221128222955-4ff1ff379b90/go.mod h1:pqyaznLzk21m+1KL6fwOsRryRELL+zNM0qiVSn0MbVc= +go.opentelemetry.io/collector v0.66.1-0.20221202005155-1c54042beb70 h1:INB2CsOtqqrija2KvMuIpbBQ3qX1BECEeR+d0NJX+oM= +go.opentelemetry.io/collector v0.66.1-0.20221202005155-1c54042beb70/go.mod h1:d0NHkHyANJy3HDTvYE/PoylMShUmFIbiir89ieI0X0c= +go.opentelemetry.io/collector/component v0.66.1-0.20221202005155-1c54042beb70 h1:dEoJhzCmRShgmVro/kXm6pouGElgxkH2DsvanzCeZtU= +go.opentelemetry.io/collector/component v0.66.1-0.20221202005155-1c54042beb70/go.mod h1:OsVnvFFe38QSpcuZlQ8cvarDzcloCexgQ1/B2m80F6U= +go.opentelemetry.io/collector/confmap v0.0.0-20221201172708-2bdff61fa52a h1:2TscCXAQASO2kU9xHcMIUM/FP29fiQIRTilZmliq/7I= +go.opentelemetry.io/collector/confmap v0.0.0-20221201172708-2bdff61fa52a/go.mod h1:qJ3e8bA8h4wz/jYlbeEUafVHdrU7DkpStnmIUAz6VTQ= +go.opentelemetry.io/collector/consumer v0.66.1-0.20221202005155-1c54042beb70 h1:XwpVjI1KeKGPXOZBLefGILMziPYuNf6IzbmiIEsIyI0= +go.opentelemetry.io/collector/consumer v0.66.1-0.20221202005155-1c54042beb70/go.mod h1:EWVBcSGcIcmeDGTnIboc/aqa3agsBeH8/q7yFWG7xVc= +go.opentelemetry.io/collector/featuregate v0.66.1-0.20221202005155-1c54042beb70 h1:V0tf4ebciqIs07jFATfLGdUpLRaEsi+AiWuA/in0G8Y= +go.opentelemetry.io/collector/featuregate v0.66.1-0.20221202005155-1c54042beb70/go.mod h1:tewuFKJYalWBU0bmNKg++MC1ipINXUr6szYzOw2p1GI= +go.opentelemetry.io/collector/pdata v0.66.1-0.20221202005155-1c54042beb70 h1:TPOrxkEMvZzfBSwF3ct+kUUgKA5g8unkZZbKQvJweeA= +go.opentelemetry.io/collector/pdata v0.66.1-0.20221202005155-1c54042beb70/go.mod h1:pqyaznLzk21m+1KL6fwOsRryRELL+zNM0qiVSn0MbVc= 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= @@ -872,8 +874,8 @@ go.uber.org/multierr v1.8.0 h1:dg6GjLku4EH+249NNmoIciG9N/jURbDG+pFlTkhzIC8= go.uber.org/multierr v1.8.0/go.mod h1:7EAYxJLBy9rStEaz58O2t4Uvip6FSURkq8/ppBp95ak= go.uber.org/zap v1.10.0/go.mod h1:vwi/ZaCAaUcBkycHslxD9B2zi4UTXhF60s6SWpuDF0Q= go.uber.org/zap v1.17.0/go.mod h1:MXVU+bhUf/A7Xi2HNOnopQOrmycQ5Ih87HtOu4q5SSo= -go.uber.org/zap v1.23.0 h1:OjGQ5KQDEUawVHxNwQgPpiypGHOxo2mNZsOqTak4fFY= -go.uber.org/zap v1.23.0/go.mod h1:D+nX8jyLsMHMYrln8A0rJjFt/T/9/bGgIhAqxv5URuY= +go.uber.org/zap v1.24.0 h1:FiJd5l1UOLj0wCgbSE0rwwXHzEdAZS6hiiSnxJN/D60= +go.uber.org/zap v1.24.0/go.mod h1:2kMP+WWQ8aoFoedH3T2sq6iJ2yDWpHbP0f6MQbS9Gkg= golang.org/x/crypto v0.0.0-20171113213409-9f005a07e0d3/go.mod h1:6SG95UA2DQfeDnfUPMdvaQW0Q7yPrPDi9nlGo2tz2b4= golang.org/x/crypto v0.0.0-20180904163835-0709b304e793/go.mod h1:6SG95UA2DQfeDnfUPMdvaQW0Q7yPrPDi9nlGo2tz2b4= golang.org/x/crypto v0.0.0-20181009213950-7c1a557ab941/go.mod h1:6SG95UA2DQfeDnfUPMdvaQW0Q7yPrPDi9nlGo2tz2b4= diff --git a/receiver/mysqlreceiver/go.mod b/receiver/mysqlreceiver/go.mod index bc67010dedb0..52f01ae2cb06 100644 --- a/receiver/mysqlreceiver/go.mod +++ b/receiver/mysqlreceiver/go.mod @@ -7,12 +7,13 @@ require ( github.com/open-telemetry/opentelemetry-collector-contrib/internal/scrapertest v0.66.0 github.com/stretchr/testify v1.8.1 github.com/testcontainers/testcontainers-go v0.15.0 - go.opentelemetry.io/collector v0.66.1-0.20221128222955-4ff1ff379b90 - go.opentelemetry.io/collector/component v0.66.1-0.20221128222955-4ff1ff379b90 - go.opentelemetry.io/collector/consumer v0.66.1-0.20221128222955-4ff1ff379b90 - go.opentelemetry.io/collector/featuregate v0.66.1-0.20221128222955-4ff1ff379b90 - go.opentelemetry.io/collector/pdata v0.66.1-0.20221128222955-4ff1ff379b90 - go.uber.org/zap v1.23.0 + go.opentelemetry.io/collector v0.66.1-0.20221202005155-1c54042beb70 + go.opentelemetry.io/collector/component v0.66.1-0.20221202005155-1c54042beb70 + go.opentelemetry.io/collector/confmap v0.0.0-20221201172708-2bdff61fa52a + go.opentelemetry.io/collector/consumer v0.66.1-0.20221202005155-1c54042beb70 + go.opentelemetry.io/collector/featuregate v0.66.1-0.20221202005155-1c54042beb70 + go.opentelemetry.io/collector/pdata v0.66.1-0.20221202005155-1c54042beb70 + go.uber.org/zap v1.24.0 ) require ( diff --git a/receiver/mysqlreceiver/go.sum b/receiver/mysqlreceiver/go.sum index 9d5d43706b70..b955d83b5014 100644 --- a/receiver/mysqlreceiver/go.sum +++ b/receiver/mysqlreceiver/go.sum @@ -818,16 +818,18 @@ go.opencensus.io v0.22.2/go.mod h1:yxeiOL68Rb0Xd1ddK5vPZ/oVn4vY4Ynel7k9FzqtOIw= go.opencensus.io v0.22.3/go.mod h1:yxeiOL68Rb0Xd1ddK5vPZ/oVn4vY4Ynel7k9FzqtOIw= go.opencensus.io v0.24.0 h1:y73uSU6J157QMP2kn2r30vwW1A2W2WFwSCGnAVxeaD0= go.opencensus.io v0.24.0/go.mod h1:vNK8G9p7aAivkbmorf4v+7Hgx+Zs0yY+0fOtgBfjQKo= -go.opentelemetry.io/collector v0.66.1-0.20221128222955-4ff1ff379b90 h1:yRe05/jMdzH4TFHfndZ5h2o2hKBK/79W72j8w51qNsI= -go.opentelemetry.io/collector v0.66.1-0.20221128222955-4ff1ff379b90/go.mod h1:hE6jCs+0rfiufCrVPucKZTMwfHit1okfDPnwPT2eW1I= -go.opentelemetry.io/collector/component v0.66.1-0.20221128222955-4ff1ff379b90 h1:AYSNTXbezhNg43EuYdVVcgxE/2gBVrm00FDx4DOmQVg= -go.opentelemetry.io/collector/component v0.66.1-0.20221128222955-4ff1ff379b90/go.mod h1:0c84EqXUhvYe6KW7hJfh76tiI/5yjWCH2amwyQ06XLM= -go.opentelemetry.io/collector/consumer v0.66.1-0.20221128222955-4ff1ff379b90 h1:nzNXVfC1FzXBXCLMzbMv+qK3E4EGiNsnMhfVsBd2yzc= -go.opentelemetry.io/collector/consumer v0.66.1-0.20221128222955-4ff1ff379b90/go.mod h1:WtoRZa5SnxQO1ZEQdVxYpFcXCmq62rakv0oUSlPO0NQ= -go.opentelemetry.io/collector/featuregate v0.66.1-0.20221128222955-4ff1ff379b90 h1:UuJSFWbi9XxyNZsJKZuvpWg35BgRbcCGFH+38V2MAdw= -go.opentelemetry.io/collector/featuregate v0.66.1-0.20221128222955-4ff1ff379b90/go.mod h1:tewuFKJYalWBU0bmNKg++MC1ipINXUr6szYzOw2p1GI= -go.opentelemetry.io/collector/pdata v0.66.1-0.20221128222955-4ff1ff379b90 h1:Vu4S4jSNcd0VFPzxQNO4+UqGwnes1xJDoFLPRiWHm8I= -go.opentelemetry.io/collector/pdata v0.66.1-0.20221128222955-4ff1ff379b90/go.mod h1:pqyaznLzk21m+1KL6fwOsRryRELL+zNM0qiVSn0MbVc= +go.opentelemetry.io/collector v0.66.1-0.20221202005155-1c54042beb70 h1:INB2CsOtqqrija2KvMuIpbBQ3qX1BECEeR+d0NJX+oM= +go.opentelemetry.io/collector v0.66.1-0.20221202005155-1c54042beb70/go.mod h1:d0NHkHyANJy3HDTvYE/PoylMShUmFIbiir89ieI0X0c= +go.opentelemetry.io/collector/component v0.66.1-0.20221202005155-1c54042beb70 h1:dEoJhzCmRShgmVro/kXm6pouGElgxkH2DsvanzCeZtU= +go.opentelemetry.io/collector/component v0.66.1-0.20221202005155-1c54042beb70/go.mod h1:OsVnvFFe38QSpcuZlQ8cvarDzcloCexgQ1/B2m80F6U= +go.opentelemetry.io/collector/confmap v0.0.0-20221201172708-2bdff61fa52a h1:2TscCXAQASO2kU9xHcMIUM/FP29fiQIRTilZmliq/7I= +go.opentelemetry.io/collector/confmap v0.0.0-20221201172708-2bdff61fa52a/go.mod h1:qJ3e8bA8h4wz/jYlbeEUafVHdrU7DkpStnmIUAz6VTQ= +go.opentelemetry.io/collector/consumer v0.66.1-0.20221202005155-1c54042beb70 h1:XwpVjI1KeKGPXOZBLefGILMziPYuNf6IzbmiIEsIyI0= +go.opentelemetry.io/collector/consumer v0.66.1-0.20221202005155-1c54042beb70/go.mod h1:EWVBcSGcIcmeDGTnIboc/aqa3agsBeH8/q7yFWG7xVc= +go.opentelemetry.io/collector/featuregate v0.66.1-0.20221202005155-1c54042beb70 h1:V0tf4ebciqIs07jFATfLGdUpLRaEsi+AiWuA/in0G8Y= +go.opentelemetry.io/collector/featuregate v0.66.1-0.20221202005155-1c54042beb70/go.mod h1:tewuFKJYalWBU0bmNKg++MC1ipINXUr6szYzOw2p1GI= +go.opentelemetry.io/collector/pdata v0.66.1-0.20221202005155-1c54042beb70 h1:TPOrxkEMvZzfBSwF3ct+kUUgKA5g8unkZZbKQvJweeA= +go.opentelemetry.io/collector/pdata v0.66.1-0.20221202005155-1c54042beb70/go.mod h1:pqyaznLzk21m+1KL6fwOsRryRELL+zNM0qiVSn0MbVc= 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= @@ -850,8 +852,8 @@ go.uber.org/multierr v1.8.0 h1:dg6GjLku4EH+249NNmoIciG9N/jURbDG+pFlTkhzIC8= go.uber.org/multierr v1.8.0/go.mod h1:7EAYxJLBy9rStEaz58O2t4Uvip6FSURkq8/ppBp95ak= go.uber.org/zap v1.10.0/go.mod h1:vwi/ZaCAaUcBkycHslxD9B2zi4UTXhF60s6SWpuDF0Q= go.uber.org/zap v1.17.0/go.mod h1:MXVU+bhUf/A7Xi2HNOnopQOrmycQ5Ih87HtOu4q5SSo= -go.uber.org/zap v1.23.0 h1:OjGQ5KQDEUawVHxNwQgPpiypGHOxo2mNZsOqTak4fFY= -go.uber.org/zap v1.23.0/go.mod h1:D+nX8jyLsMHMYrln8A0rJjFt/T/9/bGgIhAqxv5URuY= +go.uber.org/zap v1.24.0 h1:FiJd5l1UOLj0wCgbSE0rwwXHzEdAZS6hiiSnxJN/D60= +go.uber.org/zap v1.24.0/go.mod h1:2kMP+WWQ8aoFoedH3T2sq6iJ2yDWpHbP0f6MQbS9Gkg= golang.org/x/crypto v0.0.0-20171113213409-9f005a07e0d3/go.mod h1:6SG95UA2DQfeDnfUPMdvaQW0Q7yPrPDi9nlGo2tz2b4= golang.org/x/crypto v0.0.0-20180904163835-0709b304e793/go.mod h1:6SG95UA2DQfeDnfUPMdvaQW0Q7yPrPDi9nlGo2tz2b4= golang.org/x/crypto v0.0.0-20181009213950-7c1a557ab941/go.mod h1:6SG95UA2DQfeDnfUPMdvaQW0Q7yPrPDi9nlGo2tz2b4= diff --git a/receiver/nginxreceiver/go.mod b/receiver/nginxreceiver/go.mod index 64d256d26d2d..49837c72b4fe 100644 --- a/receiver/nginxreceiver/go.mod +++ b/receiver/nginxreceiver/go.mod @@ -7,11 +7,12 @@ require ( github.com/open-telemetry/opentelemetry-collector-contrib/internal/scrapertest v0.66.0 github.com/stretchr/testify v1.8.1 github.com/testcontainers/testcontainers-go v0.15.0 - go.opentelemetry.io/collector v0.66.1-0.20221128222955-4ff1ff379b90 - go.opentelemetry.io/collector/component v0.66.1-0.20221128222955-4ff1ff379b90 - go.opentelemetry.io/collector/consumer v0.66.1-0.20221128222955-4ff1ff379b90 - go.opentelemetry.io/collector/pdata v0.66.1-0.20221128222955-4ff1ff379b90 - go.uber.org/zap v1.23.0 + go.opentelemetry.io/collector v0.66.1-0.20221202005155-1c54042beb70 + go.opentelemetry.io/collector/component v0.66.1-0.20221202005155-1c54042beb70 + go.opentelemetry.io/collector/confmap v0.0.0-20221201172708-2bdff61fa52a + go.opentelemetry.io/collector/consumer v0.66.1-0.20221202005155-1c54042beb70 + go.opentelemetry.io/collector/pdata v0.66.1-0.20221202005155-1c54042beb70 + go.uber.org/zap v1.24.0 ) require ( @@ -56,7 +57,7 @@ require ( github.com/rs/cors v1.8.2 // indirect github.com/sirupsen/logrus v1.8.1 // indirect go.opencensus.io v0.24.0 // indirect - go.opentelemetry.io/collector/featuregate v0.66.1-0.20221128222955-4ff1ff379b90 // indirect + go.opentelemetry.io/collector/featuregate v0.66.1-0.20221202005155-1c54042beb70 // 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 87f08d6c0a46..c3b6feaf4c3d 100644 --- a/receiver/nginxreceiver/go.sum +++ b/receiver/nginxreceiver/go.sum @@ -835,16 +835,18 @@ go.opencensus.io v0.22.2/go.mod h1:yxeiOL68Rb0Xd1ddK5vPZ/oVn4vY4Ynel7k9FzqtOIw= go.opencensus.io v0.22.3/go.mod h1:yxeiOL68Rb0Xd1ddK5vPZ/oVn4vY4Ynel7k9FzqtOIw= go.opencensus.io v0.24.0 h1:y73uSU6J157QMP2kn2r30vwW1A2W2WFwSCGnAVxeaD0= go.opencensus.io v0.24.0/go.mod h1:vNK8G9p7aAivkbmorf4v+7Hgx+Zs0yY+0fOtgBfjQKo= -go.opentelemetry.io/collector v0.66.1-0.20221128222955-4ff1ff379b90 h1:yRe05/jMdzH4TFHfndZ5h2o2hKBK/79W72j8w51qNsI= -go.opentelemetry.io/collector v0.66.1-0.20221128222955-4ff1ff379b90/go.mod h1:hE6jCs+0rfiufCrVPucKZTMwfHit1okfDPnwPT2eW1I= -go.opentelemetry.io/collector/component v0.66.1-0.20221128222955-4ff1ff379b90 h1:AYSNTXbezhNg43EuYdVVcgxE/2gBVrm00FDx4DOmQVg= -go.opentelemetry.io/collector/component v0.66.1-0.20221128222955-4ff1ff379b90/go.mod h1:0c84EqXUhvYe6KW7hJfh76tiI/5yjWCH2amwyQ06XLM= -go.opentelemetry.io/collector/consumer v0.66.1-0.20221128222955-4ff1ff379b90 h1:nzNXVfC1FzXBXCLMzbMv+qK3E4EGiNsnMhfVsBd2yzc= -go.opentelemetry.io/collector/consumer v0.66.1-0.20221128222955-4ff1ff379b90/go.mod h1:WtoRZa5SnxQO1ZEQdVxYpFcXCmq62rakv0oUSlPO0NQ= -go.opentelemetry.io/collector/featuregate v0.66.1-0.20221128222955-4ff1ff379b90 h1:UuJSFWbi9XxyNZsJKZuvpWg35BgRbcCGFH+38V2MAdw= -go.opentelemetry.io/collector/featuregate v0.66.1-0.20221128222955-4ff1ff379b90/go.mod h1:tewuFKJYalWBU0bmNKg++MC1ipINXUr6szYzOw2p1GI= -go.opentelemetry.io/collector/pdata v0.66.1-0.20221128222955-4ff1ff379b90 h1:Vu4S4jSNcd0VFPzxQNO4+UqGwnes1xJDoFLPRiWHm8I= -go.opentelemetry.io/collector/pdata v0.66.1-0.20221128222955-4ff1ff379b90/go.mod h1:pqyaznLzk21m+1KL6fwOsRryRELL+zNM0qiVSn0MbVc= +go.opentelemetry.io/collector v0.66.1-0.20221202005155-1c54042beb70 h1:INB2CsOtqqrija2KvMuIpbBQ3qX1BECEeR+d0NJX+oM= +go.opentelemetry.io/collector v0.66.1-0.20221202005155-1c54042beb70/go.mod h1:d0NHkHyANJy3HDTvYE/PoylMShUmFIbiir89ieI0X0c= +go.opentelemetry.io/collector/component v0.66.1-0.20221202005155-1c54042beb70 h1:dEoJhzCmRShgmVro/kXm6pouGElgxkH2DsvanzCeZtU= +go.opentelemetry.io/collector/component v0.66.1-0.20221202005155-1c54042beb70/go.mod h1:OsVnvFFe38QSpcuZlQ8cvarDzcloCexgQ1/B2m80F6U= +go.opentelemetry.io/collector/confmap v0.0.0-20221201172708-2bdff61fa52a h1:2TscCXAQASO2kU9xHcMIUM/FP29fiQIRTilZmliq/7I= +go.opentelemetry.io/collector/confmap v0.0.0-20221201172708-2bdff61fa52a/go.mod h1:qJ3e8bA8h4wz/jYlbeEUafVHdrU7DkpStnmIUAz6VTQ= +go.opentelemetry.io/collector/consumer v0.66.1-0.20221202005155-1c54042beb70 h1:XwpVjI1KeKGPXOZBLefGILMziPYuNf6IzbmiIEsIyI0= +go.opentelemetry.io/collector/consumer v0.66.1-0.20221202005155-1c54042beb70/go.mod h1:EWVBcSGcIcmeDGTnIboc/aqa3agsBeH8/q7yFWG7xVc= +go.opentelemetry.io/collector/featuregate v0.66.1-0.20221202005155-1c54042beb70 h1:V0tf4ebciqIs07jFATfLGdUpLRaEsi+AiWuA/in0G8Y= +go.opentelemetry.io/collector/featuregate v0.66.1-0.20221202005155-1c54042beb70/go.mod h1:tewuFKJYalWBU0bmNKg++MC1ipINXUr6szYzOw2p1GI= +go.opentelemetry.io/collector/pdata v0.66.1-0.20221202005155-1c54042beb70 h1:TPOrxkEMvZzfBSwF3ct+kUUgKA5g8unkZZbKQvJweeA= +go.opentelemetry.io/collector/pdata v0.66.1-0.20221202005155-1c54042beb70/go.mod h1:pqyaznLzk21m+1KL6fwOsRryRELL+zNM0qiVSn0MbVc= 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= @@ -869,8 +871,8 @@ go.uber.org/multierr v1.8.0 h1:dg6GjLku4EH+249NNmoIciG9N/jURbDG+pFlTkhzIC8= go.uber.org/multierr v1.8.0/go.mod h1:7EAYxJLBy9rStEaz58O2t4Uvip6FSURkq8/ppBp95ak= go.uber.org/zap v1.10.0/go.mod h1:vwi/ZaCAaUcBkycHslxD9B2zi4UTXhF60s6SWpuDF0Q= go.uber.org/zap v1.17.0/go.mod h1:MXVU+bhUf/A7Xi2HNOnopQOrmycQ5Ih87HtOu4q5SSo= -go.uber.org/zap v1.23.0 h1:OjGQ5KQDEUawVHxNwQgPpiypGHOxo2mNZsOqTak4fFY= -go.uber.org/zap v1.23.0/go.mod h1:D+nX8jyLsMHMYrln8A0rJjFt/T/9/bGgIhAqxv5URuY= +go.uber.org/zap v1.24.0 h1:FiJd5l1UOLj0wCgbSE0rwwXHzEdAZS6hiiSnxJN/D60= +go.uber.org/zap v1.24.0/go.mod h1:2kMP+WWQ8aoFoedH3T2sq6iJ2yDWpHbP0f6MQbS9Gkg= golang.org/x/crypto v0.0.0-20171113213409-9f005a07e0d3/go.mod h1:6SG95UA2DQfeDnfUPMdvaQW0Q7yPrPDi9nlGo2tz2b4= golang.org/x/crypto v0.0.0-20180904163835-0709b304e793/go.mod h1:6SG95UA2DQfeDnfUPMdvaQW0Q7yPrPDi9nlGo2tz2b4= golang.org/x/crypto v0.0.0-20181009213950-7c1a557ab941/go.mod h1:6SG95UA2DQfeDnfUPMdvaQW0Q7yPrPDi9nlGo2tz2b4= diff --git a/receiver/nsxtreceiver/go.mod b/receiver/nsxtreceiver/go.mod index 0ed689a77d21..3889a3881d14 100644 --- a/receiver/nsxtreceiver/go.mod +++ b/receiver/nsxtreceiver/go.mod @@ -6,12 +6,13 @@ require ( github.com/open-telemetry/opentelemetry-collector-contrib/internal/scrapertest v0.66.0 github.com/stretchr/testify v1.8.1 github.com/vmware/go-vmware-nsxt v0.0.0-20220328155605-f49a14c1ef5f - go.opentelemetry.io/collector v0.66.1-0.20221128222955-4ff1ff379b90 - go.opentelemetry.io/collector/component v0.66.1-0.20221128222955-4ff1ff379b90 - go.opentelemetry.io/collector/consumer v0.66.1-0.20221128222955-4ff1ff379b90 - go.opentelemetry.io/collector/pdata v0.66.1-0.20221128222955-4ff1ff379b90 + go.opentelemetry.io/collector v0.66.1-0.20221202005155-1c54042beb70 + go.opentelemetry.io/collector/component v0.66.1-0.20221202005155-1c54042beb70 + go.opentelemetry.io/collector/confmap v0.0.0-20221201172708-2bdff61fa52a + go.opentelemetry.io/collector/consumer v0.66.1-0.20221202005155-1c54042beb70 + go.opentelemetry.io/collector/pdata v0.66.1-0.20221202005155-1c54042beb70 go.uber.org/multierr v1.8.0 - go.uber.org/zap v1.23.0 + go.uber.org/zap v1.24.0 ) require ( @@ -35,7 +36,7 @@ require ( github.com/rs/cors v1.8.2 // indirect github.com/stretchr/objx v0.5.0 // indirect go.opencensus.io v0.24.0 // indirect - go.opentelemetry.io/collector/featuregate v0.66.1-0.20221128222955-4ff1ff379b90 // indirect + go.opentelemetry.io/collector/featuregate v0.66.1-0.20221202005155-1c54042beb70 // 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 d271bea25d32..654f0db4ef62 100644 --- a/receiver/nsxtreceiver/go.sum +++ b/receiver/nsxtreceiver/go.sum @@ -293,16 +293,18 @@ go.etcd.io/etcd/client/pkg/v3 v3.5.4/go.mod h1:IJHfcCEKxYu1Os13ZdwCwIUTUVGYTSAM3 go.etcd.io/etcd/client/v3 v3.5.4/go.mod h1:ZaRkVgBZC+L+dLCjTcF1hRXpgZXQPOvnA/Ak/gq3kiY= go.opencensus.io v0.24.0 h1:y73uSU6J157QMP2kn2r30vwW1A2W2WFwSCGnAVxeaD0= go.opencensus.io v0.24.0/go.mod h1:vNK8G9p7aAivkbmorf4v+7Hgx+Zs0yY+0fOtgBfjQKo= -go.opentelemetry.io/collector v0.66.1-0.20221128222955-4ff1ff379b90 h1:yRe05/jMdzH4TFHfndZ5h2o2hKBK/79W72j8w51qNsI= -go.opentelemetry.io/collector v0.66.1-0.20221128222955-4ff1ff379b90/go.mod h1:hE6jCs+0rfiufCrVPucKZTMwfHit1okfDPnwPT2eW1I= -go.opentelemetry.io/collector/component v0.66.1-0.20221128222955-4ff1ff379b90 h1:AYSNTXbezhNg43EuYdVVcgxE/2gBVrm00FDx4DOmQVg= -go.opentelemetry.io/collector/component v0.66.1-0.20221128222955-4ff1ff379b90/go.mod h1:0c84EqXUhvYe6KW7hJfh76tiI/5yjWCH2amwyQ06XLM= -go.opentelemetry.io/collector/consumer v0.66.1-0.20221128222955-4ff1ff379b90 h1:nzNXVfC1FzXBXCLMzbMv+qK3E4EGiNsnMhfVsBd2yzc= -go.opentelemetry.io/collector/consumer v0.66.1-0.20221128222955-4ff1ff379b90/go.mod h1:WtoRZa5SnxQO1ZEQdVxYpFcXCmq62rakv0oUSlPO0NQ= -go.opentelemetry.io/collector/featuregate v0.66.1-0.20221128222955-4ff1ff379b90 h1:UuJSFWbi9XxyNZsJKZuvpWg35BgRbcCGFH+38V2MAdw= -go.opentelemetry.io/collector/featuregate v0.66.1-0.20221128222955-4ff1ff379b90/go.mod h1:tewuFKJYalWBU0bmNKg++MC1ipINXUr6szYzOw2p1GI= -go.opentelemetry.io/collector/pdata v0.66.1-0.20221128222955-4ff1ff379b90 h1:Vu4S4jSNcd0VFPzxQNO4+UqGwnes1xJDoFLPRiWHm8I= -go.opentelemetry.io/collector/pdata v0.66.1-0.20221128222955-4ff1ff379b90/go.mod h1:pqyaznLzk21m+1KL6fwOsRryRELL+zNM0qiVSn0MbVc= +go.opentelemetry.io/collector v0.66.1-0.20221202005155-1c54042beb70 h1:INB2CsOtqqrija2KvMuIpbBQ3qX1BECEeR+d0NJX+oM= +go.opentelemetry.io/collector v0.66.1-0.20221202005155-1c54042beb70/go.mod h1:d0NHkHyANJy3HDTvYE/PoylMShUmFIbiir89ieI0X0c= +go.opentelemetry.io/collector/component v0.66.1-0.20221202005155-1c54042beb70 h1:dEoJhzCmRShgmVro/kXm6pouGElgxkH2DsvanzCeZtU= +go.opentelemetry.io/collector/component v0.66.1-0.20221202005155-1c54042beb70/go.mod h1:OsVnvFFe38QSpcuZlQ8cvarDzcloCexgQ1/B2m80F6U= +go.opentelemetry.io/collector/confmap v0.0.0-20221201172708-2bdff61fa52a h1:2TscCXAQASO2kU9xHcMIUM/FP29fiQIRTilZmliq/7I= +go.opentelemetry.io/collector/confmap v0.0.0-20221201172708-2bdff61fa52a/go.mod h1:qJ3e8bA8h4wz/jYlbeEUafVHdrU7DkpStnmIUAz6VTQ= +go.opentelemetry.io/collector/consumer v0.66.1-0.20221202005155-1c54042beb70 h1:XwpVjI1KeKGPXOZBLefGILMziPYuNf6IzbmiIEsIyI0= +go.opentelemetry.io/collector/consumer v0.66.1-0.20221202005155-1c54042beb70/go.mod h1:EWVBcSGcIcmeDGTnIboc/aqa3agsBeH8/q7yFWG7xVc= +go.opentelemetry.io/collector/featuregate v0.66.1-0.20221202005155-1c54042beb70 h1:V0tf4ebciqIs07jFATfLGdUpLRaEsi+AiWuA/in0G8Y= +go.opentelemetry.io/collector/featuregate v0.66.1-0.20221202005155-1c54042beb70/go.mod h1:tewuFKJYalWBU0bmNKg++MC1ipINXUr6szYzOw2p1GI= +go.opentelemetry.io/collector/pdata v0.66.1-0.20221202005155-1c54042beb70 h1:TPOrxkEMvZzfBSwF3ct+kUUgKA5g8unkZZbKQvJweeA= +go.opentelemetry.io/collector/pdata v0.66.1-0.20221202005155-1c54042beb70/go.mod h1:pqyaznLzk21m+1KL6fwOsRryRELL+zNM0qiVSn0MbVc= 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= @@ -323,8 +325,8 @@ go.uber.org/multierr v1.6.0/go.mod h1:cdWPpRnG4AhwMwsgIHip0KRBQjJy5kYEpYjJxpXp9i go.uber.org/multierr v1.8.0 h1:dg6GjLku4EH+249NNmoIciG9N/jURbDG+pFlTkhzIC8= go.uber.org/multierr v1.8.0/go.mod h1:7EAYxJLBy9rStEaz58O2t4Uvip6FSURkq8/ppBp95ak= go.uber.org/zap v1.17.0/go.mod h1:MXVU+bhUf/A7Xi2HNOnopQOrmycQ5Ih87HtOu4q5SSo= -go.uber.org/zap v1.23.0 h1:OjGQ5KQDEUawVHxNwQgPpiypGHOxo2mNZsOqTak4fFY= -go.uber.org/zap v1.23.0/go.mod h1:D+nX8jyLsMHMYrln8A0rJjFt/T/9/bGgIhAqxv5URuY= +go.uber.org/zap v1.24.0 h1:FiJd5l1UOLj0wCgbSE0rwwXHzEdAZS6hiiSnxJN/D60= +go.uber.org/zap v1.24.0/go.mod h1:2kMP+WWQ8aoFoedH3T2sq6iJ2yDWpHbP0f6MQbS9Gkg= golang.org/x/crypto v0.0.0-20180904163835-0709b304e793/go.mod h1:6SG95UA2DQfeDnfUPMdvaQW0Q7yPrPDi9nlGo2tz2b4= golang.org/x/crypto v0.0.0-20190308221718-c2843e01d9a2/go.mod h1:djNgcEr1/C05ACkg1iLfiJU5Ep61QUkGW8qpdssI0+w= golang.org/x/crypto v0.0.0-20190923035154-9ee001bba392/go.mod h1:/lpIB1dKB+9EgE3H3cr1v9wB50oz8l4C4h62xy7jSTY= diff --git a/receiver/opencensusreceiver/factory.go b/receiver/opencensusreceiver/factory.go index 5bf5ace4fb6d..8866d7e1e761 100644 --- a/receiver/opencensusreceiver/factory.go +++ b/receiver/opencensusreceiver/factory.go @@ -64,7 +64,7 @@ func createTracesReceiver( r := receivers.GetOrAdd(cfg, func() component.Component { rCfg := cfg.(*Config) var recv *ocReceiver - recv, err = newOpenCensusReceiver(rCfg.ID(), rCfg.NetAddr.Transport, rCfg.NetAddr.Endpoint, nil, nil, set, rCfg.buildOptions()...) + recv, err = newOpenCensusReceiver(rCfg.NetAddr.Transport, rCfg.NetAddr.Endpoint, nil, nil, set, rCfg.buildOptions()...) return recv }) if err != nil { @@ -85,7 +85,7 @@ func createMetricsReceiver( r := receivers.GetOrAdd(cfg, func() component.Component { rCfg := cfg.(*Config) var recv *ocReceiver - recv, err = newOpenCensusReceiver(rCfg.ID(), rCfg.NetAddr.Transport, rCfg.NetAddr.Endpoint, nil, nil, set, rCfg.buildOptions()...) + recv, err = newOpenCensusReceiver(rCfg.NetAddr.Transport, rCfg.NetAddr.Endpoint, nil, nil, set, rCfg.buildOptions()...) return recv }) if err != nil { diff --git a/receiver/opencensusreceiver/go.mod b/receiver/opencensusreceiver/go.mod index bae2cead970a..dac06f9b92db 100644 --- a/receiver/opencensusreceiver/go.mod +++ b/receiver/opencensusreceiver/go.mod @@ -12,10 +12,11 @@ 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.66.1-0.20221128222955-4ff1ff379b90 - go.opentelemetry.io/collector/component v0.66.1-0.20221128222955-4ff1ff379b90 - go.opentelemetry.io/collector/consumer v0.66.1-0.20221128222955-4ff1ff379b90 - go.opentelemetry.io/collector/pdata v0.66.1-0.20221128222955-4ff1ff379b90 + go.opentelemetry.io/collector v0.66.1-0.20221202005155-1c54042beb70 + go.opentelemetry.io/collector/component v0.66.1-0.20221202005155-1c54042beb70 + go.opentelemetry.io/collector/confmap v0.0.0-20221201172708-2bdff61fa52a + go.opentelemetry.io/collector/consumer v0.66.1-0.20221202005155-1c54042beb70 + go.opentelemetry.io/collector/pdata v0.66.1-0.20221202005155-1c54042beb70 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 @@ -55,14 +56,14 @@ require ( github.com/prometheus/procfs v0.8.0 // indirect github.com/prometheus/statsd_exporter v0.22.7 // indirect go.opencensus.io v0.24.0 // indirect - go.opentelemetry.io/collector/featuregate v0.66.1-0.20221128222955-4ff1ff379b90 // indirect - go.opentelemetry.io/collector/semconv v0.66.1-0.20221128222955-4ff1ff379b90 // indirect + go.opentelemetry.io/collector/featuregate v0.66.1-0.20221202005155-1c54042beb70 // indirect + go.opentelemetry.io/collector/semconv v0.66.1-0.20221202005155-1c54042beb70 // 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 go.uber.org/atomic v1.10.0 // indirect go.uber.org/multierr v1.8.0 // indirect - go.uber.org/zap v1.23.0 // indirect + go.uber.org/zap v1.24.0 // indirect golang.org/x/net v0.1.0 // indirect golang.org/x/sys v0.2.0 // indirect golang.org/x/text v0.4.0 // indirect diff --git a/receiver/opencensusreceiver/go.sum b/receiver/opencensusreceiver/go.sum index b17b4dfd9213..31f268115d2e 100644 --- a/receiver/opencensusreceiver/go.sum +++ b/receiver/opencensusreceiver/go.sum @@ -400,18 +400,20 @@ go.opencensus.io v0.22.4/go.mod h1:yxeiOL68Rb0Xd1ddK5vPZ/oVn4vY4Ynel7k9FzqtOIw= go.opencensus.io v0.23.0/go.mod h1:XItmlyltB5F7CS4xOC1DcqMoFqwtC6OG2xF7mCv7P7E= go.opencensus.io v0.24.0 h1:y73uSU6J157QMP2kn2r30vwW1A2W2WFwSCGnAVxeaD0= go.opencensus.io v0.24.0/go.mod h1:vNK8G9p7aAivkbmorf4v+7Hgx+Zs0yY+0fOtgBfjQKo= -go.opentelemetry.io/collector v0.66.1-0.20221128222955-4ff1ff379b90 h1:yRe05/jMdzH4TFHfndZ5h2o2hKBK/79W72j8w51qNsI= -go.opentelemetry.io/collector v0.66.1-0.20221128222955-4ff1ff379b90/go.mod h1:hE6jCs+0rfiufCrVPucKZTMwfHit1okfDPnwPT2eW1I= -go.opentelemetry.io/collector/component v0.66.1-0.20221128222955-4ff1ff379b90 h1:AYSNTXbezhNg43EuYdVVcgxE/2gBVrm00FDx4DOmQVg= -go.opentelemetry.io/collector/component v0.66.1-0.20221128222955-4ff1ff379b90/go.mod h1:0c84EqXUhvYe6KW7hJfh76tiI/5yjWCH2amwyQ06XLM= -go.opentelemetry.io/collector/consumer v0.66.1-0.20221128222955-4ff1ff379b90 h1:nzNXVfC1FzXBXCLMzbMv+qK3E4EGiNsnMhfVsBd2yzc= -go.opentelemetry.io/collector/consumer v0.66.1-0.20221128222955-4ff1ff379b90/go.mod h1:WtoRZa5SnxQO1ZEQdVxYpFcXCmq62rakv0oUSlPO0NQ= -go.opentelemetry.io/collector/featuregate v0.66.1-0.20221128222955-4ff1ff379b90 h1:UuJSFWbi9XxyNZsJKZuvpWg35BgRbcCGFH+38V2MAdw= -go.opentelemetry.io/collector/featuregate v0.66.1-0.20221128222955-4ff1ff379b90/go.mod h1:tewuFKJYalWBU0bmNKg++MC1ipINXUr6szYzOw2p1GI= -go.opentelemetry.io/collector/pdata v0.66.1-0.20221128222955-4ff1ff379b90 h1:Vu4S4jSNcd0VFPzxQNO4+UqGwnes1xJDoFLPRiWHm8I= -go.opentelemetry.io/collector/pdata v0.66.1-0.20221128222955-4ff1ff379b90/go.mod h1:pqyaznLzk21m+1KL6fwOsRryRELL+zNM0qiVSn0MbVc= -go.opentelemetry.io/collector/semconv v0.66.1-0.20221128222955-4ff1ff379b90 h1:hFaTA68cggZKWMv7wQ3bKP8KGTbowh/5AQZKCHzHTqM= -go.opentelemetry.io/collector/semconv v0.66.1-0.20221128222955-4ff1ff379b90/go.mod h1:5o9yhOa+ABt7g2E5JABDxGZ1PQPbtfxrKNbYn+LOTXU= +go.opentelemetry.io/collector v0.66.1-0.20221202005155-1c54042beb70 h1:INB2CsOtqqrija2KvMuIpbBQ3qX1BECEeR+d0NJX+oM= +go.opentelemetry.io/collector v0.66.1-0.20221202005155-1c54042beb70/go.mod h1:d0NHkHyANJy3HDTvYE/PoylMShUmFIbiir89ieI0X0c= +go.opentelemetry.io/collector/component v0.66.1-0.20221202005155-1c54042beb70 h1:dEoJhzCmRShgmVro/kXm6pouGElgxkH2DsvanzCeZtU= +go.opentelemetry.io/collector/component v0.66.1-0.20221202005155-1c54042beb70/go.mod h1:OsVnvFFe38QSpcuZlQ8cvarDzcloCexgQ1/B2m80F6U= +go.opentelemetry.io/collector/confmap v0.0.0-20221201172708-2bdff61fa52a h1:2TscCXAQASO2kU9xHcMIUM/FP29fiQIRTilZmliq/7I= +go.opentelemetry.io/collector/confmap v0.0.0-20221201172708-2bdff61fa52a/go.mod h1:qJ3e8bA8h4wz/jYlbeEUafVHdrU7DkpStnmIUAz6VTQ= +go.opentelemetry.io/collector/consumer v0.66.1-0.20221202005155-1c54042beb70 h1:XwpVjI1KeKGPXOZBLefGILMziPYuNf6IzbmiIEsIyI0= +go.opentelemetry.io/collector/consumer v0.66.1-0.20221202005155-1c54042beb70/go.mod h1:EWVBcSGcIcmeDGTnIboc/aqa3agsBeH8/q7yFWG7xVc= +go.opentelemetry.io/collector/featuregate v0.66.1-0.20221202005155-1c54042beb70 h1:V0tf4ebciqIs07jFATfLGdUpLRaEsi+AiWuA/in0G8Y= +go.opentelemetry.io/collector/featuregate v0.66.1-0.20221202005155-1c54042beb70/go.mod h1:tewuFKJYalWBU0bmNKg++MC1ipINXUr6szYzOw2p1GI= +go.opentelemetry.io/collector/pdata v0.66.1-0.20221202005155-1c54042beb70 h1:TPOrxkEMvZzfBSwF3ct+kUUgKA5g8unkZZbKQvJweeA= +go.opentelemetry.io/collector/pdata v0.66.1-0.20221202005155-1c54042beb70/go.mod h1:pqyaznLzk21m+1KL6fwOsRryRELL+zNM0qiVSn0MbVc= +go.opentelemetry.io/collector/semconv v0.66.1-0.20221202005155-1c54042beb70 h1:Q5L9Urod3c8as6ZYaoaqBjarx/HXxsxy34DFZIU2fO4= +go.opentelemetry.io/collector/semconv v0.66.1-0.20221202005155-1c54042beb70/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= @@ -435,8 +437,8 @@ go.uber.org/multierr v1.6.0/go.mod h1:cdWPpRnG4AhwMwsgIHip0KRBQjJy5kYEpYjJxpXp9i go.uber.org/multierr v1.8.0 h1:dg6GjLku4EH+249NNmoIciG9N/jURbDG+pFlTkhzIC8= go.uber.org/multierr v1.8.0/go.mod h1:7EAYxJLBy9rStEaz58O2t4Uvip6FSURkq8/ppBp95ak= go.uber.org/zap v1.17.0/go.mod h1:MXVU+bhUf/A7Xi2HNOnopQOrmycQ5Ih87HtOu4q5SSo= -go.uber.org/zap v1.23.0 h1:OjGQ5KQDEUawVHxNwQgPpiypGHOxo2mNZsOqTak4fFY= -go.uber.org/zap v1.23.0/go.mod h1:D+nX8jyLsMHMYrln8A0rJjFt/T/9/bGgIhAqxv5URuY= +go.uber.org/zap v1.24.0 h1:FiJd5l1UOLj0wCgbSE0rwwXHzEdAZS6hiiSnxJN/D60= +go.uber.org/zap v1.24.0/go.mod h1:2kMP+WWQ8aoFoedH3T2sq6iJ2yDWpHbP0f6MQbS9Gkg= golang.org/x/crypto v0.0.0-20180904163835-0709b304e793/go.mod h1:6SG95UA2DQfeDnfUPMdvaQW0Q7yPrPDi9nlGo2tz2b4= golang.org/x/crypto v0.0.0-20190308221718-c2843e01d9a2/go.mod h1:djNgcEr1/C05ACkg1iLfiJU5Ep61QUkGW8qpdssI0+w= golang.org/x/crypto v0.0.0-20190510104115-cbcb75029529/go.mod h1:yigFU9vqHzYiE8UmvKecakEJjdnWj3jj499lnFckfCI= diff --git a/receiver/opencensusreceiver/internal/ocmetrics/opencensus.go b/receiver/opencensusreceiver/internal/ocmetrics/opencensus.go index af47a36b73e1..4082403eb155 100644 --- a/receiver/opencensusreceiver/internal/ocmetrics/opencensus.go +++ b/receiver/opencensusreceiver/internal/ocmetrics/opencensus.go @@ -33,18 +33,17 @@ import ( // Receiver is the type used to handle metrics from OpenCensus exporters. type Receiver struct { agentmetricspb.UnimplementedMetricsServiceServer - id component.ID nextConsumer consumer.Metrics obsrecv *obsreport.Receiver } // New creates a new ocmetrics.Receiver reference. -func New(id component.ID, nextConsumer consumer.Metrics, set component.ReceiverCreateSettings) (*Receiver, error) { +func New(nextConsumer consumer.Metrics, set component.ReceiverCreateSettings) (*Receiver, error) { if nextConsumer == nil { return nil, component.ErrNilNextConsumer } obsrecv, err := obsreport.NewReceiver(obsreport.ReceiverSettings{ - ReceiverID: id, + ReceiverID: set.ID, Transport: receiverTransport, LongLivedCtx: true, ReceiverCreateSettings: set, @@ -53,7 +52,6 @@ func New(id component.ID, nextConsumer consumer.Metrics, set component.ReceiverC return nil, err } ocr := &Receiver{ - id: id, nextConsumer: nextConsumer, obsrecv: obsrecv, } diff --git a/receiver/opencensusreceiver/internal/ocmetrics/opencensus_test.go b/receiver/opencensusreceiver/internal/ocmetrics/opencensus_test.go index b6770d137d52..6388410bbf59 100644 --- a/receiver/opencensusreceiver/internal/ocmetrics/opencensus_test.go +++ b/receiver/opencensusreceiver/internal/ocmetrics/opencensus_test.go @@ -46,7 +46,7 @@ import ( ) func TestReceiver_endToEnd(t *testing.T) { - tt, err := obsreporttest.SetupTelemetry() + tt, err := obsreporttest.SetupTelemetryWithID(component.NewID("opencensus")) require.NoError(t, err) defer func() { require.NoError(t, tt.Shutdown(context.Background())) @@ -79,7 +79,7 @@ func TestReceiver_endToEnd(t *testing.T) { // accept nodes from downstream sources, but if a node isn't specified in // an exportMetrics request, assume it is from the last received and non-nil node. func TestExportMultiplexing(t *testing.T) { - tt, err := obsreporttest.SetupTelemetry() + tt, err := obsreporttest.SetupTelemetryWithID(component.NewID("opencensus")) require.NoError(t, err) defer func() { require.NoError(t, tt.Shutdown(context.Background())) @@ -198,7 +198,7 @@ func TestExportMultiplexing(t *testing.T) { // The first message without a Node MUST be rejected and teardown the connection. // See https://github.com/census-instrumentation/opencensus-service/issues/53 func TestExportProtocolViolations_nodelessFirstMessage(t *testing.T) { - tt, err := obsreporttest.SetupTelemetry() + tt, err := obsreporttest.SetupTelemetryWithID(component.NewID("opencensus")) require.NoError(t, err) defer func() { require.NoError(t, tt.Shutdown(context.Background())) @@ -275,7 +275,7 @@ func TestExportProtocolViolations_nodelessFirstMessage(t *testing.T) { // See https://github.com/census-instrumentation/opencensus-service/issues/51 func TestExportProtocolConformation_metricsInFirstMessage(t *testing.T) { // This test used to be flaky on Windows. Skip if errors pop up again - tt, err := obsreporttest.SetupTelemetry() + tt, err := obsreporttest.SetupTelemetryWithID(component.NewID("opencensus")) require.NoError(t, err) defer func() { require.NoError(t, tt.Shutdown(context.Background())) @@ -372,7 +372,7 @@ func ocReceiverOnGRPCServer(t *testing.T, sr consumer.Metrics, set component.Rec } } - oci, err := New(component.NewID("opencensus"), sr, set) + oci, err := New(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 23bd5a3eca24..1c95ff637639 100644 --- a/receiver/opencensusreceiver/internal/octrace/observability_test.go +++ b/receiver/opencensusreceiver/internal/octrace/observability_test.go @@ -40,7 +40,7 @@ import ( // test is to ensure exactness, but with the mentioned views registered, the // output will be quite noisy. func TestEnsureRecordedMetrics(t *testing.T) { - tt, err := obsreporttest.SetupTelemetry() + tt, err := obsreporttest.SetupTelemetryWithID(component.NewID("opencensus")) require.NoError(t, err) defer func() { require.NoError(t, tt.Shutdown(context.Background())) @@ -64,7 +64,7 @@ func TestEnsureRecordedMetrics(t *testing.T) { } func TestEnsureRecordedMetrics_zeroLengthSpansSender(t *testing.T) { - tt, err := obsreporttest.SetupTelemetry() + tt, err := obsreporttest.SetupTelemetryWithID(component.NewID("opencensus")) require.NoError(t, err) defer func() { require.NoError(t, tt.Shutdown(context.Background())) @@ -87,7 +87,7 @@ func TestEnsureRecordedMetrics_zeroLengthSpansSender(t *testing.T) { } func TestExportSpanLinkingMaintainsParentLink(t *testing.T) { - tt, err := obsreporttest.SetupTelemetry() + tt, err := obsreporttest.SetupTelemetryWithID(component.NewID("opencensus")) require.NoError(t, err) defer func() { require.NoError(t, tt.Shutdown(context.Background())) diff --git a/receiver/opencensusreceiver/internal/octrace/opencensus.go b/receiver/opencensusreceiver/internal/octrace/opencensus.go index d4fb585bc39f..96f3e4aa757d 100644 --- a/receiver/opencensusreceiver/internal/octrace/opencensus.go +++ b/receiver/opencensusreceiver/internal/octrace/opencensus.go @@ -39,18 +39,17 @@ const ( type Receiver struct { agenttracepb.UnimplementedTraceServiceServer nextConsumer consumer.Traces - id component.ID obsrecv *obsreport.Receiver } // New creates a new opencensus.Receiver reference. -func New(id component.ID, nextConsumer consumer.Traces, set component.ReceiverCreateSettings) (*Receiver, error) { +func New(nextConsumer consumer.Traces, set component.ReceiverCreateSettings) (*Receiver, error) { if nextConsumer == nil { return nil, component.ErrNilNextConsumer } obsrecv, err := obsreport.NewReceiver(obsreport.ReceiverSettings{ - ReceiverID: id, + ReceiverID: set.ID, Transport: receiverTransport, LongLivedCtx: true, ReceiverCreateSettings: set, @@ -60,7 +59,6 @@ func New(id component.ID, nextConsumer consumer.Traces, set component.ReceiverCr } return &Receiver{ nextConsumer: nextConsumer, - id: id, obsrecv: obsrecv, }, nil } diff --git a/receiver/opencensusreceiver/internal/octrace/opencensus_test.go b/receiver/opencensusreceiver/internal/octrace/opencensus_test.go index 374b7fe51035..c9c8d37cca12 100644 --- a/receiver/opencensusreceiver/internal/octrace/opencensus_test.go +++ b/receiver/opencensusreceiver/internal/octrace/opencensus_test.go @@ -44,7 +44,7 @@ import ( ) func TestReceiver_endToEnd(t *testing.T) { - tt, err := obsreporttest.SetupTelemetry() + tt, err := obsreporttest.SetupTelemetryWithID(component.NewID("opencensus")) require.NoError(t, err) defer func() { require.NoError(t, tt.Shutdown(context.Background())) @@ -77,7 +77,7 @@ func TestReceiver_endToEnd(t *testing.T) { // accept nodes from downstream sources, but if a node isn't specified in // an exportTrace request, assume it is from the last received and non-nil node. func TestExportMultiplexing(t *testing.T) { - tt, err := obsreporttest.SetupTelemetry() + tt, err := obsreporttest.SetupTelemetryWithID(component.NewID("opencensus")) require.NoError(t, err) defer func() { require.NoError(t, tt.Shutdown(context.Background())) @@ -213,7 +213,7 @@ func TestExportMultiplexing(t *testing.T) { // The first message without a Node MUST be rejected and teardown the connection. // See https://github.com/census-instrumentation/opencensus-service/issues/53 func TestExportProtocolViolations_nodelessFirstMessage(t *testing.T) { - tt, err := obsreporttest.SetupTelemetry() + tt, err := obsreporttest.SetupTelemetryWithID(component.NewID("opencensus")) require.NoError(t, err) defer func() { require.NoError(t, tt.Shutdown(context.Background())) @@ -287,7 +287,7 @@ func TestExportProtocolViolations_nodelessFirstMessage(t *testing.T) { // spans should be received and NEVER discarded. // See https://github.com/census-instrumentation/opencensus-service/issues/51 func TestExportProtocolConformation_spansInFirstMessage(t *testing.T) { - tt, err := obsreporttest.SetupTelemetry() + tt, err := obsreporttest.SetupTelemetryWithID(component.NewID("opencensus")) require.NoError(t, err) defer func() { require.NoError(t, tt.Shutdown(context.Background())) @@ -387,7 +387,7 @@ func ocReceiverOnGRPCServer(t *testing.T, sr consumer.Traces, set component.Rece } } - oci, err := New(component.NewID("opencensus"), sr, set) + oci, err := New(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 5094f450e93d..dc6485739e98 100644 --- a/receiver/opencensusreceiver/opencensus.go +++ b/receiver/opencensusreceiver/opencensus.go @@ -56,7 +56,6 @@ type ocReceiver struct { startTracesReceiverOnce sync.Once startMetricsReceiverOnce sync.Once - id component.ID settings component.ReceiverCreateSettings } @@ -64,7 +63,6 @@ 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 component.ID, transport string, addr string, tc consumer.Traces, @@ -79,7 +77,6 @@ func newOpenCensusReceiver( } ocr := &ocReceiver{ - id: id, ln: ln, corsOrigins: []string{}, // Disable CORS by default. gatewayMux: gatewayruntime.NewServeMux(), @@ -130,7 +127,7 @@ func (ocr *ocReceiver) registerTraceConsumer(host component.Host) error { var err error ocr.startTracesReceiverOnce.Do(func() { - ocr.traceReceiver, err = octrace.New(ocr.id, ocr.traceConsumer, ocr.settings) + ocr.traceReceiver, err = octrace.New(ocr.traceConsumer, ocr.settings) if err != nil { return } @@ -152,7 +149,7 @@ func (ocr *ocReceiver) registerMetricsConsumer(host component.Host) error { var err error ocr.startMetricsReceiverOnce.Do(func() { - ocr.metricsReceiver, err = ocmetrics.New(ocr.id, ocr.metricsConsumer, ocr.settings) + ocr.metricsReceiver, err = ocmetrics.New(ocr.metricsConsumer, ocr.settings) if err != nil { return } diff --git a/receiver/opencensusreceiver/opencensus_test.go b/receiver/opencensusreceiver/opencensus_test.go index 77dcc684d885..c1202348ae46 100644 --- a/receiver/opencensusreceiver/opencensus_test.go +++ b/receiver/opencensusreceiver/opencensus_test.go @@ -66,7 +66,7 @@ func TestGrpcGateway_endToEnd(t *testing.T) { // Set the buffer count to 1 to make it flush the test span immediately. sink := new(consumertest.TracesSink) - ocr, err := newOpenCensusReceiver(ocReceiverID, "tcp", addr, sink, nil, componenttest.NewNopReceiverCreateSettings()) + ocr, err := newOpenCensusReceiver("tcp", addr, sink, nil, componenttest.NewNopReceiverCreateSettings()) require.NoError(t, err, "Failed to create trace receiver: %v", err) err = ocr.Start(context.Background(), componenttest.NewNopHost()) @@ -152,7 +152,7 @@ func TestTraceGrpcGatewayCors_endToEnd(t *testing.T) { addr := testutil.GetAvailableLocalAddress(t) corsOrigins := []string{"allowed-*.com"} - ocr, err := newOpenCensusReceiver(ocReceiverID, "tcp", addr, consumertest.NewNop(), nil, componenttest.NewNopReceiverCreateSettings(), withCorsOrigins(corsOrigins)) + ocr, err := newOpenCensusReceiver("tcp", addr, consumertest.NewNop(), nil, componenttest.NewNopReceiverCreateSettings(), withCorsOrigins(corsOrigins)) require.NoError(t, err, "Failed to create trace receiver: %v", err) t.Cleanup(func() { require.NoError(t, ocr.Shutdown(context.Background())) }) @@ -176,7 +176,7 @@ func TestMetricsGrpcGatewayCors_endToEnd(t *testing.T) { addr := testutil.GetAvailableLocalAddress(t) corsOrigins := []string{"allowed-*.com"} - ocr, err := newOpenCensusReceiver(ocReceiverID, "tcp", addr, nil, consumertest.NewNop(), componenttest.NewNopReceiverCreateSettings(), withCorsOrigins(corsOrigins)) + ocr, err := newOpenCensusReceiver("tcp", addr, nil, consumertest.NewNop(), componenttest.NewNopReceiverCreateSettings(), withCorsOrigins(corsOrigins)) require.NoError(t, err, "Failed to create metrics receiver: %v", err) t.Cleanup(func() { require.NoError(t, ocr.Shutdown(context.Background())) }) @@ -229,7 +229,7 @@ func verifyCorsResp(t *testing.T, url string, origin string, wantStatus int, wan func TestStopWithoutStartNeverCrashes(t *testing.T) { addr := testutil.GetAvailableLocalAddress(t) - ocr, err := newOpenCensusReceiver(ocReceiverID, "tcp", addr, nil, nil, componenttest.NewNopReceiverCreateSettings()) + ocr, err := newOpenCensusReceiver("tcp", addr, nil, nil, componenttest.NewNopReceiverCreateSettings()) require.NoError(t, err, "Failed to create an OpenCensus receiver: %v", err) // Stop it before ever invoking Start*. require.NoError(t, ocr.Shutdown(context.Background())) @@ -241,14 +241,14 @@ func TestNewPortAlreadyUsed(t *testing.T) { require.NoError(t, err, "failed to listen on %q: %v", addr, err) defer ln.Close() - r, err := newOpenCensusReceiver(ocReceiverID, "tcp", addr, nil, nil, componenttest.NewNopReceiverCreateSettings()) + r, err := newOpenCensusReceiver("tcp", addr, nil, nil, componenttest.NewNopReceiverCreateSettings()) require.Error(t, err) require.Nil(t, r) } func TestMultipleStopReceptionShouldNotError(t *testing.T) { addr := testutil.GetAvailableLocalAddress(t) - r, err := newOpenCensusReceiver(ocReceiverID, "tcp", addr, consumertest.NewNop(), consumertest.NewNop(), componenttest.NewNopReceiverCreateSettings()) + r, err := newOpenCensusReceiver("tcp", addr, consumertest.NewNop(), consumertest.NewNop(), componenttest.NewNopReceiverCreateSettings()) require.NoError(t, err) require.NotNil(t, r) @@ -258,7 +258,7 @@ func TestMultipleStopReceptionShouldNotError(t *testing.T) { func TestStartWithoutConsumersShouldFail(t *testing.T) { addr := testutil.GetAvailableLocalAddress(t) - r, err := newOpenCensusReceiver(ocReceiverID, "tcp", addr, nil, nil, componenttest.NewNopReceiverCreateSettings()) + r, err := newOpenCensusReceiver("tcp", addr, nil, nil, componenttest.NewNopReceiverCreateSettings()) require.NoError(t, err) require.NotNil(t, r) @@ -277,7 +277,7 @@ func tempSocketName(t *testing.T) string { func TestReceiveOnUnixDomainSocket_endToEnd(t *testing.T) { socketName := tempSocketName(t) cbts := consumertest.NewNop() - r, err := newOpenCensusReceiver(ocReceiverID, "unix", socketName, cbts, nil, componenttest.NewNopReceiverCreateSettings()) + r, err := newOpenCensusReceiver("unix", socketName, cbts, nil, componenttest.NewNopReceiverCreateSettings()) require.NoError(t, err) require.NotNil(t, r) require.NoError(t, r.Start(context.Background(), componenttest.NewNopHost())) @@ -414,7 +414,7 @@ func TestOCReceiverTrace_HandleNextConsumerResponse(t *testing.T) { for _, exporter := range exporters { for _, tt := range tests { t.Run(tt.name+"/"+exporter.receiverID.String(), func(t *testing.T) { - testTel, err := obsreporttest.SetupTelemetry() + testTel, err := obsreporttest.SetupTelemetryWithID(exporter.receiverID) require.NoError(t, err) defer func() { require.NoError(t, testTel.Shutdown(context.Background())) @@ -423,7 +423,7 @@ func TestOCReceiverTrace_HandleNextConsumerResponse(t *testing.T) { sink := &errOrSinkConsumer{TracesSink: new(consumertest.TracesSink)} var opts []ocOption - ocr, err := newOpenCensusReceiver(exporter.receiverID, "tcp", addr, nil, nil, testTel.ToReceiverCreateSettings(), opts...) + ocr, err := newOpenCensusReceiver("tcp", addr, nil, nil, testTel.ToReceiverCreateSettings(), opts...) require.Nil(t, err) require.NotNil(t, ocr) @@ -565,7 +565,7 @@ func TestOCReceiverMetrics_HandleNextConsumerResponse(t *testing.T) { for _, exporter := range exporters { for _, tt := range tests { t.Run(tt.name+"/"+exporter.receiverID.String(), func(t *testing.T) { - testTel, err := obsreporttest.SetupTelemetry() + testTel, err := obsreporttest.SetupTelemetryWithID(exporter.receiverID) require.NoError(t, err) defer func() { require.NoError(t, testTel.Shutdown(context.Background())) @@ -574,7 +574,7 @@ func TestOCReceiverMetrics_HandleNextConsumerResponse(t *testing.T) { sink := &errOrSinkConsumer{MetricsSink: new(consumertest.MetricsSink)} var opts []ocOption - ocr, err := newOpenCensusReceiver(exporter.receiverID, "tcp", addr, nil, nil, testTel.ToReceiverCreateSettings(), opts...) + ocr, err := newOpenCensusReceiver("tcp", addr, nil, nil, testTel.ToReceiverCreateSettings(), opts...) require.Nil(t, err) require.NotNil(t, ocr) @@ -624,7 +624,7 @@ func TestInvalidTLSCredentials(t *testing.T) { assert.NotNil(t, opt) addr := testutil.GetAvailableLocalAddress(t) - ocr, err := newOpenCensusReceiver(component.NewIDWithName(typeStr, "invalidtls"), "tcp", addr, nil, nil, componenttest.NewNopReceiverCreateSettings(), opt...) + ocr, err := newOpenCensusReceiver("tcp", addr, nil, nil, componenttest.NewNopReceiverCreateSettings(), opt...) assert.NoError(t, err) assert.NotNil(t, ocr) diff --git a/receiver/oracledbreceiver/go.mod b/receiver/oracledbreceiver/go.mod index d3bad2c1ecdf..a7a6cf4f73eb 100644 --- a/receiver/oracledbreceiver/go.mod +++ b/receiver/oracledbreceiver/go.mod @@ -4,10 +4,11 @@ go 1.18 require ( github.com/stretchr/testify v1.8.1 - go.opentelemetry.io/collector v0.66.1-0.20221128222955-4ff1ff379b90 - go.opentelemetry.io/collector/component v0.66.1-0.20221128222955-4ff1ff379b90 - go.opentelemetry.io/collector/consumer v0.66.1-0.20221128222955-4ff1ff379b90 - go.opentelemetry.io/collector/pdata v0.66.1-0.20221128222955-4ff1ff379b90 + go.opentelemetry.io/collector v0.66.1-0.20221202005155-1c54042beb70 + go.opentelemetry.io/collector/component v0.66.1-0.20221202005155-1c54042beb70 + go.opentelemetry.io/collector/confmap v0.0.0-20221201172708-2bdff61fa52a + go.opentelemetry.io/collector/consumer v0.66.1-0.20221202005155-1c54042beb70 + go.opentelemetry.io/collector/pdata v0.66.1-0.20221202005155-1c54042beb70 ) require ( @@ -22,13 +23,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 - go.opentelemetry.io/collector/featuregate v0.66.1-0.20221128222955-4ff1ff379b90 // indirect + go.opentelemetry.io/collector/featuregate v0.66.1-0.20221202005155-1c54042beb70 // 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 go.uber.org/atomic v1.10.0 // indirect go.uber.org/multierr v1.8.0 // indirect - go.uber.org/zap v1.23.0 // indirect + go.uber.org/zap v1.24.0 // indirect golang.org/x/net v0.0.0-20220722155237-a158d28d115b // indirect golang.org/x/sys v0.2.0 // indirect golang.org/x/text v0.4.0 // indirect diff --git a/receiver/oracledbreceiver/go.sum b/receiver/oracledbreceiver/go.sum index bb7d1973a697..1324c1ca4278 100644 --- a/receiver/oracledbreceiver/go.sum +++ b/receiver/oracledbreceiver/go.sum @@ -257,16 +257,18 @@ github.com/yuin/goldmark v1.3.5/go.mod h1:mwnBkeHKe2W/ZEtQ+71ViKU8L12m81fl3OWwC1 go.etcd.io/etcd/api/v3 v3.5.4/go.mod h1:5GB2vv4A4AOn3yk7MftYGHkUfGtDHnEraIjym4dYz5A= go.etcd.io/etcd/client/pkg/v3 v3.5.4/go.mod h1:IJHfcCEKxYu1Os13ZdwCwIUTUVGYTSAM3YSwc9/Ac1g= go.etcd.io/etcd/client/v3 v3.5.4/go.mod h1:ZaRkVgBZC+L+dLCjTcF1hRXpgZXQPOvnA/Ak/gq3kiY= -go.opentelemetry.io/collector v0.66.1-0.20221128222955-4ff1ff379b90 h1:yRe05/jMdzH4TFHfndZ5h2o2hKBK/79W72j8w51qNsI= -go.opentelemetry.io/collector v0.66.1-0.20221128222955-4ff1ff379b90/go.mod h1:hE6jCs+0rfiufCrVPucKZTMwfHit1okfDPnwPT2eW1I= -go.opentelemetry.io/collector/component v0.66.1-0.20221128222955-4ff1ff379b90 h1:AYSNTXbezhNg43EuYdVVcgxE/2gBVrm00FDx4DOmQVg= -go.opentelemetry.io/collector/component v0.66.1-0.20221128222955-4ff1ff379b90/go.mod h1:0c84EqXUhvYe6KW7hJfh76tiI/5yjWCH2amwyQ06XLM= -go.opentelemetry.io/collector/consumer v0.66.1-0.20221128222955-4ff1ff379b90 h1:nzNXVfC1FzXBXCLMzbMv+qK3E4EGiNsnMhfVsBd2yzc= -go.opentelemetry.io/collector/consumer v0.66.1-0.20221128222955-4ff1ff379b90/go.mod h1:WtoRZa5SnxQO1ZEQdVxYpFcXCmq62rakv0oUSlPO0NQ= -go.opentelemetry.io/collector/featuregate v0.66.1-0.20221128222955-4ff1ff379b90 h1:UuJSFWbi9XxyNZsJKZuvpWg35BgRbcCGFH+38V2MAdw= -go.opentelemetry.io/collector/featuregate v0.66.1-0.20221128222955-4ff1ff379b90/go.mod h1:tewuFKJYalWBU0bmNKg++MC1ipINXUr6szYzOw2p1GI= -go.opentelemetry.io/collector/pdata v0.66.1-0.20221128222955-4ff1ff379b90 h1:Vu4S4jSNcd0VFPzxQNO4+UqGwnes1xJDoFLPRiWHm8I= -go.opentelemetry.io/collector/pdata v0.66.1-0.20221128222955-4ff1ff379b90/go.mod h1:pqyaznLzk21m+1KL6fwOsRryRELL+zNM0qiVSn0MbVc= +go.opentelemetry.io/collector v0.66.1-0.20221202005155-1c54042beb70 h1:INB2CsOtqqrija2KvMuIpbBQ3qX1BECEeR+d0NJX+oM= +go.opentelemetry.io/collector v0.66.1-0.20221202005155-1c54042beb70/go.mod h1:d0NHkHyANJy3HDTvYE/PoylMShUmFIbiir89ieI0X0c= +go.opentelemetry.io/collector/component v0.66.1-0.20221202005155-1c54042beb70 h1:dEoJhzCmRShgmVro/kXm6pouGElgxkH2DsvanzCeZtU= +go.opentelemetry.io/collector/component v0.66.1-0.20221202005155-1c54042beb70/go.mod h1:OsVnvFFe38QSpcuZlQ8cvarDzcloCexgQ1/B2m80F6U= +go.opentelemetry.io/collector/confmap v0.0.0-20221201172708-2bdff61fa52a h1:2TscCXAQASO2kU9xHcMIUM/FP29fiQIRTilZmliq/7I= +go.opentelemetry.io/collector/confmap v0.0.0-20221201172708-2bdff61fa52a/go.mod h1:qJ3e8bA8h4wz/jYlbeEUafVHdrU7DkpStnmIUAz6VTQ= +go.opentelemetry.io/collector/consumer v0.66.1-0.20221202005155-1c54042beb70 h1:XwpVjI1KeKGPXOZBLefGILMziPYuNf6IzbmiIEsIyI0= +go.opentelemetry.io/collector/consumer v0.66.1-0.20221202005155-1c54042beb70/go.mod h1:EWVBcSGcIcmeDGTnIboc/aqa3agsBeH8/q7yFWG7xVc= +go.opentelemetry.io/collector/featuregate v0.66.1-0.20221202005155-1c54042beb70 h1:V0tf4ebciqIs07jFATfLGdUpLRaEsi+AiWuA/in0G8Y= +go.opentelemetry.io/collector/featuregate v0.66.1-0.20221202005155-1c54042beb70/go.mod h1:tewuFKJYalWBU0bmNKg++MC1ipINXUr6szYzOw2p1GI= +go.opentelemetry.io/collector/pdata v0.66.1-0.20221202005155-1c54042beb70 h1:TPOrxkEMvZzfBSwF3ct+kUUgKA5g8unkZZbKQvJweeA= +go.opentelemetry.io/collector/pdata v0.66.1-0.20221202005155-1c54042beb70/go.mod h1:pqyaznLzk21m+1KL6fwOsRryRELL+zNM0qiVSn0MbVc= 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= @@ -282,8 +284,8 @@ go.uber.org/multierr v1.6.0/go.mod h1:cdWPpRnG4AhwMwsgIHip0KRBQjJy5kYEpYjJxpXp9i go.uber.org/multierr v1.8.0 h1:dg6GjLku4EH+249NNmoIciG9N/jURbDG+pFlTkhzIC8= go.uber.org/multierr v1.8.0/go.mod h1:7EAYxJLBy9rStEaz58O2t4Uvip6FSURkq8/ppBp95ak= go.uber.org/zap v1.17.0/go.mod h1:MXVU+bhUf/A7Xi2HNOnopQOrmycQ5Ih87HtOu4q5SSo= -go.uber.org/zap v1.23.0 h1:OjGQ5KQDEUawVHxNwQgPpiypGHOxo2mNZsOqTak4fFY= -go.uber.org/zap v1.23.0/go.mod h1:D+nX8jyLsMHMYrln8A0rJjFt/T/9/bGgIhAqxv5URuY= +go.uber.org/zap v1.24.0 h1:FiJd5l1UOLj0wCgbSE0rwwXHzEdAZS6hiiSnxJN/D60= +go.uber.org/zap v1.24.0/go.mod h1:2kMP+WWQ8aoFoedH3T2sq6iJ2yDWpHbP0f6MQbS9Gkg= golang.org/x/crypto v0.0.0-20180904163835-0709b304e793/go.mod h1:6SG95UA2DQfeDnfUPMdvaQW0Q7yPrPDi9nlGo2tz2b4= golang.org/x/crypto v0.0.0-20190308221718-c2843e01d9a2/go.mod h1:djNgcEr1/C05ACkg1iLfiJU5Ep61QUkGW8qpdssI0+w= golang.org/x/crypto v0.0.0-20190923035154-9ee001bba392/go.mod h1:/lpIB1dKB+9EgE3H3cr1v9wB50oz8l4C4h62xy7jSTY= diff --git a/receiver/otlpjsonfilereceiver/file.go b/receiver/otlpjsonfilereceiver/file.go index 21a493921635..960c12ee9b85 100644 --- a/receiver/otlpjsonfilereceiver/file.go +++ b/receiver/otlpjsonfilereceiver/file.go @@ -79,7 +79,7 @@ func (f *receiver) Shutdown(ctx context.Context) error { func createLogsReceiver(_ context.Context, settings component.ReceiverCreateSettings, configuration component.Config, logs consumer.Logs) (component.LogsReceiver, error) { logsUnmarshaler := &plog.JSONUnmarshaler{} obsrecv, err := obsreport.NewReceiver(obsreport.ReceiverSettings{ - ReceiverID: configuration.ID(), + ReceiverID: settings.ID, Transport: transport, ReceiverCreateSettings: settings, }) @@ -102,13 +102,13 @@ func createLogsReceiver(_ context.Context, settings component.ReceiverCreateSett return nil, err } - return &receiver{input: input, id: cfg.ID(), storageID: cfg.StorageID}, nil + return &receiver{input: input, id: settings.ID, storageID: cfg.StorageID}, nil } func createMetricsReceiver(_ context.Context, settings component.ReceiverCreateSettings, configuration component.Config, metrics consumer.Metrics) (component.MetricsReceiver, error) { metricsUnmarshaler := &pmetric.JSONUnmarshaler{} obsrecv, err := obsreport.NewReceiver(obsreport.ReceiverSettings{ - ReceiverID: configuration.ID(), + ReceiverID: settings.ID, Transport: transport, ReceiverCreateSettings: settings, }) @@ -131,13 +131,13 @@ func createMetricsReceiver(_ context.Context, settings component.ReceiverCreateS return nil, err } - return &receiver{input: input, id: cfg.ID(), storageID: cfg.StorageID}, nil + return &receiver{input: input, id: settings.ID, storageID: cfg.StorageID}, nil } func createTracesReceiver(ctx context.Context, settings component.ReceiverCreateSettings, configuration component.Config, traces consumer.Traces) (component.TracesReceiver, error) { tracesUnmarshaler := &ptrace.JSONUnmarshaler{} obsrecv, err := obsreport.NewReceiver(obsreport.ReceiverSettings{ - ReceiverID: configuration.ID(), + ReceiverID: settings.ID, Transport: transport, ReceiverCreateSettings: settings, }) @@ -160,5 +160,5 @@ func createTracesReceiver(ctx context.Context, settings component.ReceiverCreate return nil, err } - return &receiver{input: input, id: cfg.ID(), storageID: cfg.StorageID}, nil + return &receiver{input: input, id: settings.ID, storageID: cfg.StorageID}, nil } diff --git a/receiver/otlpjsonfilereceiver/go.mod b/receiver/otlpjsonfilereceiver/go.mod index 8d6e1e19342a..de6cf8205abc 100644 --- a/receiver/otlpjsonfilereceiver/go.mod +++ b/receiver/otlpjsonfilereceiver/go.mod @@ -6,10 +6,11 @@ require ( github.com/open-telemetry/opentelemetry-collector-contrib/internal/coreinternal v0.66.0 github.com/open-telemetry/opentelemetry-collector-contrib/pkg/stanza v0.66.0 github.com/stretchr/testify v1.8.1 - go.opentelemetry.io/collector v0.66.1-0.20221128222955-4ff1ff379b90 - go.opentelemetry.io/collector/component v0.66.1-0.20221128222955-4ff1ff379b90 - go.opentelemetry.io/collector/consumer v0.66.1-0.20221128222955-4ff1ff379b90 - go.opentelemetry.io/collector/pdata v0.66.1-0.20221128222955-4ff1ff379b90 + go.opentelemetry.io/collector v0.66.1-0.20221202005155-1c54042beb70 + go.opentelemetry.io/collector/component v0.66.1-0.20221202005155-1c54042beb70 + go.opentelemetry.io/collector/confmap v0.0.0-20221201172708-2bdff61fa52a + go.opentelemetry.io/collector/consumer v0.66.1-0.20221202005155-1c54042beb70 + go.opentelemetry.io/collector/pdata v0.66.1-0.20221202005155-1c54042beb70 ) require ( @@ -29,13 +30,13 @@ require ( github.com/observiq/ctimefmt v1.0.0 // indirect github.com/pmezard/go-difflib v1.0.0 // indirect go.opencensus.io v0.24.0 // indirect - go.opentelemetry.io/collector/featuregate v0.66.1-0.20221128222955-4ff1ff379b90 // indirect + go.opentelemetry.io/collector/featuregate v0.66.1-0.20221202005155-1c54042beb70 // 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 go.uber.org/atomic v1.10.0 // indirect go.uber.org/multierr v1.8.0 // indirect - go.uber.org/zap v1.23.0 // indirect + go.uber.org/zap v1.24.0 // indirect golang.org/x/net v0.0.0-20220722155237-a158d28d115b // indirect golang.org/x/sys v0.2.0 // indirect golang.org/x/text v0.4.0 // indirect diff --git a/receiver/otlpjsonfilereceiver/go.sum b/receiver/otlpjsonfilereceiver/go.sum index 0a5f3e242c59..6b7e768bf731 100644 --- a/receiver/otlpjsonfilereceiver/go.sum +++ b/receiver/otlpjsonfilereceiver/go.sum @@ -294,16 +294,18 @@ go.etcd.io/etcd/client/pkg/v3 v3.5.4/go.mod h1:IJHfcCEKxYu1Os13ZdwCwIUTUVGYTSAM3 go.etcd.io/etcd/client/v3 v3.5.4/go.mod h1:ZaRkVgBZC+L+dLCjTcF1hRXpgZXQPOvnA/Ak/gq3kiY= go.opencensus.io v0.24.0 h1:y73uSU6J157QMP2kn2r30vwW1A2W2WFwSCGnAVxeaD0= go.opencensus.io v0.24.0/go.mod h1:vNK8G9p7aAivkbmorf4v+7Hgx+Zs0yY+0fOtgBfjQKo= -go.opentelemetry.io/collector v0.66.1-0.20221128222955-4ff1ff379b90 h1:yRe05/jMdzH4TFHfndZ5h2o2hKBK/79W72j8w51qNsI= -go.opentelemetry.io/collector v0.66.1-0.20221128222955-4ff1ff379b90/go.mod h1:hE6jCs+0rfiufCrVPucKZTMwfHit1okfDPnwPT2eW1I= -go.opentelemetry.io/collector/component v0.66.1-0.20221128222955-4ff1ff379b90 h1:AYSNTXbezhNg43EuYdVVcgxE/2gBVrm00FDx4DOmQVg= -go.opentelemetry.io/collector/component v0.66.1-0.20221128222955-4ff1ff379b90/go.mod h1:0c84EqXUhvYe6KW7hJfh76tiI/5yjWCH2amwyQ06XLM= -go.opentelemetry.io/collector/consumer v0.66.1-0.20221128222955-4ff1ff379b90 h1:nzNXVfC1FzXBXCLMzbMv+qK3E4EGiNsnMhfVsBd2yzc= -go.opentelemetry.io/collector/consumer v0.66.1-0.20221128222955-4ff1ff379b90/go.mod h1:WtoRZa5SnxQO1ZEQdVxYpFcXCmq62rakv0oUSlPO0NQ= -go.opentelemetry.io/collector/featuregate v0.66.1-0.20221128222955-4ff1ff379b90 h1:UuJSFWbi9XxyNZsJKZuvpWg35BgRbcCGFH+38V2MAdw= -go.opentelemetry.io/collector/featuregate v0.66.1-0.20221128222955-4ff1ff379b90/go.mod h1:tewuFKJYalWBU0bmNKg++MC1ipINXUr6szYzOw2p1GI= -go.opentelemetry.io/collector/pdata v0.66.1-0.20221128222955-4ff1ff379b90 h1:Vu4S4jSNcd0VFPzxQNO4+UqGwnes1xJDoFLPRiWHm8I= -go.opentelemetry.io/collector/pdata v0.66.1-0.20221128222955-4ff1ff379b90/go.mod h1:pqyaznLzk21m+1KL6fwOsRryRELL+zNM0qiVSn0MbVc= +go.opentelemetry.io/collector v0.66.1-0.20221202005155-1c54042beb70 h1:INB2CsOtqqrija2KvMuIpbBQ3qX1BECEeR+d0NJX+oM= +go.opentelemetry.io/collector v0.66.1-0.20221202005155-1c54042beb70/go.mod h1:d0NHkHyANJy3HDTvYE/PoylMShUmFIbiir89ieI0X0c= +go.opentelemetry.io/collector/component v0.66.1-0.20221202005155-1c54042beb70 h1:dEoJhzCmRShgmVro/kXm6pouGElgxkH2DsvanzCeZtU= +go.opentelemetry.io/collector/component v0.66.1-0.20221202005155-1c54042beb70/go.mod h1:OsVnvFFe38QSpcuZlQ8cvarDzcloCexgQ1/B2m80F6U= +go.opentelemetry.io/collector/confmap v0.0.0-20221201172708-2bdff61fa52a h1:2TscCXAQASO2kU9xHcMIUM/FP29fiQIRTilZmliq/7I= +go.opentelemetry.io/collector/confmap v0.0.0-20221201172708-2bdff61fa52a/go.mod h1:qJ3e8bA8h4wz/jYlbeEUafVHdrU7DkpStnmIUAz6VTQ= +go.opentelemetry.io/collector/consumer v0.66.1-0.20221202005155-1c54042beb70 h1:XwpVjI1KeKGPXOZBLefGILMziPYuNf6IzbmiIEsIyI0= +go.opentelemetry.io/collector/consumer v0.66.1-0.20221202005155-1c54042beb70/go.mod h1:EWVBcSGcIcmeDGTnIboc/aqa3agsBeH8/q7yFWG7xVc= +go.opentelemetry.io/collector/featuregate v0.66.1-0.20221202005155-1c54042beb70 h1:V0tf4ebciqIs07jFATfLGdUpLRaEsi+AiWuA/in0G8Y= +go.opentelemetry.io/collector/featuregate v0.66.1-0.20221202005155-1c54042beb70/go.mod h1:tewuFKJYalWBU0bmNKg++MC1ipINXUr6szYzOw2p1GI= +go.opentelemetry.io/collector/pdata v0.66.1-0.20221202005155-1c54042beb70 h1:TPOrxkEMvZzfBSwF3ct+kUUgKA5g8unkZZbKQvJweeA= +go.opentelemetry.io/collector/pdata v0.66.1-0.20221202005155-1c54042beb70/go.mod h1:pqyaznLzk21m+1KL6fwOsRryRELL+zNM0qiVSn0MbVc= 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= @@ -321,8 +323,8 @@ go.uber.org/multierr v1.6.0/go.mod h1:cdWPpRnG4AhwMwsgIHip0KRBQjJy5kYEpYjJxpXp9i go.uber.org/multierr v1.8.0 h1:dg6GjLku4EH+249NNmoIciG9N/jURbDG+pFlTkhzIC8= go.uber.org/multierr v1.8.0/go.mod h1:7EAYxJLBy9rStEaz58O2t4Uvip6FSURkq8/ppBp95ak= go.uber.org/zap v1.17.0/go.mod h1:MXVU+bhUf/A7Xi2HNOnopQOrmycQ5Ih87HtOu4q5SSo= -go.uber.org/zap v1.23.0 h1:OjGQ5KQDEUawVHxNwQgPpiypGHOxo2mNZsOqTak4fFY= -go.uber.org/zap v1.23.0/go.mod h1:D+nX8jyLsMHMYrln8A0rJjFt/T/9/bGgIhAqxv5URuY= +go.uber.org/zap v1.24.0 h1:FiJd5l1UOLj0wCgbSE0rwwXHzEdAZS6hiiSnxJN/D60= +go.uber.org/zap v1.24.0/go.mod h1:2kMP+WWQ8aoFoedH3T2sq6iJ2yDWpHbP0f6MQbS9Gkg= golang.org/x/crypto v0.0.0-20180904163835-0709b304e793/go.mod h1:6SG95UA2DQfeDnfUPMdvaQW0Q7yPrPDi9nlGo2tz2b4= golang.org/x/crypto v0.0.0-20190308221718-c2843e01d9a2/go.mod h1:djNgcEr1/C05ACkg1iLfiJU5Ep61QUkGW8qpdssI0+w= golang.org/x/crypto v0.0.0-20190923035154-9ee001bba392/go.mod h1:/lpIB1dKB+9EgE3H3cr1v9wB50oz8l4C4h62xy7jSTY= diff --git a/receiver/podmanreceiver/go.mod b/receiver/podmanreceiver/go.mod index 11598e6280af..712d540e126b 100644 --- a/receiver/podmanreceiver/go.mod +++ b/receiver/podmanreceiver/go.mod @@ -4,13 +4,14 @@ go 1.18 require ( github.com/stretchr/testify v1.8.1 - go.opentelemetry.io/collector v0.66.1-0.20221128222955-4ff1ff379b90 - go.opentelemetry.io/collector/component v0.66.1-0.20221128222955-4ff1ff379b90 - go.opentelemetry.io/collector/consumer v0.66.1-0.20221128222955-4ff1ff379b90 - go.opentelemetry.io/collector/pdata v0.66.1-0.20221128222955-4ff1ff379b90 - go.opentelemetry.io/collector/semconv v0.66.1-0.20221128222955-4ff1ff379b90 + go.opentelemetry.io/collector v0.66.1-0.20221202005155-1c54042beb70 + go.opentelemetry.io/collector/component v0.66.1-0.20221202005155-1c54042beb70 + go.opentelemetry.io/collector/confmap v0.0.0-20221201172708-2bdff61fa52a + go.opentelemetry.io/collector/consumer v0.66.1-0.20221202005155-1c54042beb70 + go.opentelemetry.io/collector/pdata v0.66.1-0.20221202005155-1c54042beb70 + go.opentelemetry.io/collector/semconv v0.66.1-0.20221202005155-1c54042beb70 go.uber.org/multierr v1.8.0 - go.uber.org/zap v1.23.0 + go.uber.org/zap v1.24.0 golang.org/x/crypto v0.0.0-20220507011949-2cf3adece122 ) @@ -30,7 +31,7 @@ require ( github.com/pelletier/go-toml v1.9.4 // indirect github.com/pmezard/go-difflib v1.0.0 // indirect go.opencensus.io v0.24.0 // indirect - go.opentelemetry.io/collector/featuregate v0.66.1-0.20221128222955-4ff1ff379b90 // indirect + go.opentelemetry.io/collector/featuregate v0.66.1-0.20221202005155-1c54042beb70 // 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 7e5ffad3a7aa..fefde5eb2e51 100644 --- a/receiver/podmanreceiver/go.sum +++ b/receiver/podmanreceiver/go.sum @@ -284,18 +284,20 @@ go.etcd.io/etcd/client/pkg/v3 v3.5.4/go.mod h1:IJHfcCEKxYu1Os13ZdwCwIUTUVGYTSAM3 go.etcd.io/etcd/client/v3 v3.5.4/go.mod h1:ZaRkVgBZC+L+dLCjTcF1hRXpgZXQPOvnA/Ak/gq3kiY= go.opencensus.io v0.24.0 h1:y73uSU6J157QMP2kn2r30vwW1A2W2WFwSCGnAVxeaD0= go.opencensus.io v0.24.0/go.mod h1:vNK8G9p7aAivkbmorf4v+7Hgx+Zs0yY+0fOtgBfjQKo= -go.opentelemetry.io/collector v0.66.1-0.20221128222955-4ff1ff379b90 h1:yRe05/jMdzH4TFHfndZ5h2o2hKBK/79W72j8w51qNsI= -go.opentelemetry.io/collector v0.66.1-0.20221128222955-4ff1ff379b90/go.mod h1:hE6jCs+0rfiufCrVPucKZTMwfHit1okfDPnwPT2eW1I= -go.opentelemetry.io/collector/component v0.66.1-0.20221128222955-4ff1ff379b90 h1:AYSNTXbezhNg43EuYdVVcgxE/2gBVrm00FDx4DOmQVg= -go.opentelemetry.io/collector/component v0.66.1-0.20221128222955-4ff1ff379b90/go.mod h1:0c84EqXUhvYe6KW7hJfh76tiI/5yjWCH2amwyQ06XLM= -go.opentelemetry.io/collector/consumer v0.66.1-0.20221128222955-4ff1ff379b90 h1:nzNXVfC1FzXBXCLMzbMv+qK3E4EGiNsnMhfVsBd2yzc= -go.opentelemetry.io/collector/consumer v0.66.1-0.20221128222955-4ff1ff379b90/go.mod h1:WtoRZa5SnxQO1ZEQdVxYpFcXCmq62rakv0oUSlPO0NQ= -go.opentelemetry.io/collector/featuregate v0.66.1-0.20221128222955-4ff1ff379b90 h1:UuJSFWbi9XxyNZsJKZuvpWg35BgRbcCGFH+38V2MAdw= -go.opentelemetry.io/collector/featuregate v0.66.1-0.20221128222955-4ff1ff379b90/go.mod h1:tewuFKJYalWBU0bmNKg++MC1ipINXUr6szYzOw2p1GI= -go.opentelemetry.io/collector/pdata v0.66.1-0.20221128222955-4ff1ff379b90 h1:Vu4S4jSNcd0VFPzxQNO4+UqGwnes1xJDoFLPRiWHm8I= -go.opentelemetry.io/collector/pdata v0.66.1-0.20221128222955-4ff1ff379b90/go.mod h1:pqyaznLzk21m+1KL6fwOsRryRELL+zNM0qiVSn0MbVc= -go.opentelemetry.io/collector/semconv v0.66.1-0.20221128222955-4ff1ff379b90 h1:hFaTA68cggZKWMv7wQ3bKP8KGTbowh/5AQZKCHzHTqM= -go.opentelemetry.io/collector/semconv v0.66.1-0.20221128222955-4ff1ff379b90/go.mod h1:5o9yhOa+ABt7g2E5JABDxGZ1PQPbtfxrKNbYn+LOTXU= +go.opentelemetry.io/collector v0.66.1-0.20221202005155-1c54042beb70 h1:INB2CsOtqqrija2KvMuIpbBQ3qX1BECEeR+d0NJX+oM= +go.opentelemetry.io/collector v0.66.1-0.20221202005155-1c54042beb70/go.mod h1:d0NHkHyANJy3HDTvYE/PoylMShUmFIbiir89ieI0X0c= +go.opentelemetry.io/collector/component v0.66.1-0.20221202005155-1c54042beb70 h1:dEoJhzCmRShgmVro/kXm6pouGElgxkH2DsvanzCeZtU= +go.opentelemetry.io/collector/component v0.66.1-0.20221202005155-1c54042beb70/go.mod h1:OsVnvFFe38QSpcuZlQ8cvarDzcloCexgQ1/B2m80F6U= +go.opentelemetry.io/collector/confmap v0.0.0-20221201172708-2bdff61fa52a h1:2TscCXAQASO2kU9xHcMIUM/FP29fiQIRTilZmliq/7I= +go.opentelemetry.io/collector/confmap v0.0.0-20221201172708-2bdff61fa52a/go.mod h1:qJ3e8bA8h4wz/jYlbeEUafVHdrU7DkpStnmIUAz6VTQ= +go.opentelemetry.io/collector/consumer v0.66.1-0.20221202005155-1c54042beb70 h1:XwpVjI1KeKGPXOZBLefGILMziPYuNf6IzbmiIEsIyI0= +go.opentelemetry.io/collector/consumer v0.66.1-0.20221202005155-1c54042beb70/go.mod h1:EWVBcSGcIcmeDGTnIboc/aqa3agsBeH8/q7yFWG7xVc= +go.opentelemetry.io/collector/featuregate v0.66.1-0.20221202005155-1c54042beb70 h1:V0tf4ebciqIs07jFATfLGdUpLRaEsi+AiWuA/in0G8Y= +go.opentelemetry.io/collector/featuregate v0.66.1-0.20221202005155-1c54042beb70/go.mod h1:tewuFKJYalWBU0bmNKg++MC1ipINXUr6szYzOw2p1GI= +go.opentelemetry.io/collector/pdata v0.66.1-0.20221202005155-1c54042beb70 h1:TPOrxkEMvZzfBSwF3ct+kUUgKA5g8unkZZbKQvJweeA= +go.opentelemetry.io/collector/pdata v0.66.1-0.20221202005155-1c54042beb70/go.mod h1:pqyaznLzk21m+1KL6fwOsRryRELL+zNM0qiVSn0MbVc= +go.opentelemetry.io/collector/semconv v0.66.1-0.20221202005155-1c54042beb70 h1:Q5L9Urod3c8as6ZYaoaqBjarx/HXxsxy34DFZIU2fO4= +go.opentelemetry.io/collector/semconv v0.66.1-0.20221202005155-1c54042beb70/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= @@ -314,8 +316,8 @@ go.uber.org/multierr v1.6.0/go.mod h1:cdWPpRnG4AhwMwsgIHip0KRBQjJy5kYEpYjJxpXp9i go.uber.org/multierr v1.8.0 h1:dg6GjLku4EH+249NNmoIciG9N/jURbDG+pFlTkhzIC8= go.uber.org/multierr v1.8.0/go.mod h1:7EAYxJLBy9rStEaz58O2t4Uvip6FSURkq8/ppBp95ak= go.uber.org/zap v1.17.0/go.mod h1:MXVU+bhUf/A7Xi2HNOnopQOrmycQ5Ih87HtOu4q5SSo= -go.uber.org/zap v1.23.0 h1:OjGQ5KQDEUawVHxNwQgPpiypGHOxo2mNZsOqTak4fFY= -go.uber.org/zap v1.23.0/go.mod h1:D+nX8jyLsMHMYrln8A0rJjFt/T/9/bGgIhAqxv5URuY= +go.uber.org/zap v1.24.0 h1:FiJd5l1UOLj0wCgbSE0rwwXHzEdAZS6hiiSnxJN/D60= +go.uber.org/zap v1.24.0/go.mod h1:2kMP+WWQ8aoFoedH3T2sq6iJ2yDWpHbP0f6MQbS9Gkg= golang.org/x/crypto v0.0.0-20180904163835-0709b304e793/go.mod h1:6SG95UA2DQfeDnfUPMdvaQW0Q7yPrPDi9nlGo2tz2b4= golang.org/x/crypto v0.0.0-20190308221718-c2843e01d9a2/go.mod h1:djNgcEr1/C05ACkg1iLfiJU5Ep61QUkGW8qpdssI0+w= golang.org/x/crypto v0.0.0-20190923035154-9ee001bba392/go.mod h1:/lpIB1dKB+9EgE3H3cr1v9wB50oz8l4C4h62xy7jSTY= diff --git a/receiver/postgresqlreceiver/go.mod b/receiver/postgresqlreceiver/go.mod index cf6969dcf801..0eaf1451b030 100644 --- a/receiver/postgresqlreceiver/go.mod +++ b/receiver/postgresqlreceiver/go.mod @@ -7,13 +7,14 @@ require ( github.com/open-telemetry/opentelemetry-collector-contrib/internal/scrapertest v0.66.0 github.com/stretchr/testify v1.8.1 github.com/testcontainers/testcontainers-go v0.15.0 - go.opentelemetry.io/collector v0.66.1-0.20221128222955-4ff1ff379b90 - go.opentelemetry.io/collector/component v0.66.1-0.20221128222955-4ff1ff379b90 - go.opentelemetry.io/collector/consumer v0.66.1-0.20221128222955-4ff1ff379b90 - go.opentelemetry.io/collector/featuregate v0.66.1-0.20221128222955-4ff1ff379b90 - go.opentelemetry.io/collector/pdata v0.66.1-0.20221128222955-4ff1ff379b90 + go.opentelemetry.io/collector v0.66.1-0.20221202005155-1c54042beb70 + go.opentelemetry.io/collector/component v0.66.1-0.20221202005155-1c54042beb70 + go.opentelemetry.io/collector/confmap v0.0.0-20221201172708-2bdff61fa52a + go.opentelemetry.io/collector/consumer v0.66.1-0.20221202005155-1c54042beb70 + go.opentelemetry.io/collector/featuregate v0.66.1-0.20221202005155-1c54042beb70 + go.opentelemetry.io/collector/pdata v0.66.1-0.20221202005155-1c54042beb70 go.uber.org/multierr v1.8.0 - go.uber.org/zap v1.23.0 + go.uber.org/zap v1.24.0 ) require ( diff --git a/receiver/postgresqlreceiver/go.sum b/receiver/postgresqlreceiver/go.sum index a5ba0e5ee3a5..604c2ebf35b5 100644 --- a/receiver/postgresqlreceiver/go.sum +++ b/receiver/postgresqlreceiver/go.sum @@ -820,16 +820,18 @@ go.opencensus.io v0.22.2/go.mod h1:yxeiOL68Rb0Xd1ddK5vPZ/oVn4vY4Ynel7k9FzqtOIw= go.opencensus.io v0.22.3/go.mod h1:yxeiOL68Rb0Xd1ddK5vPZ/oVn4vY4Ynel7k9FzqtOIw= go.opencensus.io v0.24.0 h1:y73uSU6J157QMP2kn2r30vwW1A2W2WFwSCGnAVxeaD0= go.opencensus.io v0.24.0/go.mod h1:vNK8G9p7aAivkbmorf4v+7Hgx+Zs0yY+0fOtgBfjQKo= -go.opentelemetry.io/collector v0.66.1-0.20221128222955-4ff1ff379b90 h1:yRe05/jMdzH4TFHfndZ5h2o2hKBK/79W72j8w51qNsI= -go.opentelemetry.io/collector v0.66.1-0.20221128222955-4ff1ff379b90/go.mod h1:hE6jCs+0rfiufCrVPucKZTMwfHit1okfDPnwPT2eW1I= -go.opentelemetry.io/collector/component v0.66.1-0.20221128222955-4ff1ff379b90 h1:AYSNTXbezhNg43EuYdVVcgxE/2gBVrm00FDx4DOmQVg= -go.opentelemetry.io/collector/component v0.66.1-0.20221128222955-4ff1ff379b90/go.mod h1:0c84EqXUhvYe6KW7hJfh76tiI/5yjWCH2amwyQ06XLM= -go.opentelemetry.io/collector/consumer v0.66.1-0.20221128222955-4ff1ff379b90 h1:nzNXVfC1FzXBXCLMzbMv+qK3E4EGiNsnMhfVsBd2yzc= -go.opentelemetry.io/collector/consumer v0.66.1-0.20221128222955-4ff1ff379b90/go.mod h1:WtoRZa5SnxQO1ZEQdVxYpFcXCmq62rakv0oUSlPO0NQ= -go.opentelemetry.io/collector/featuregate v0.66.1-0.20221128222955-4ff1ff379b90 h1:UuJSFWbi9XxyNZsJKZuvpWg35BgRbcCGFH+38V2MAdw= -go.opentelemetry.io/collector/featuregate v0.66.1-0.20221128222955-4ff1ff379b90/go.mod h1:tewuFKJYalWBU0bmNKg++MC1ipINXUr6szYzOw2p1GI= -go.opentelemetry.io/collector/pdata v0.66.1-0.20221128222955-4ff1ff379b90 h1:Vu4S4jSNcd0VFPzxQNO4+UqGwnes1xJDoFLPRiWHm8I= -go.opentelemetry.io/collector/pdata v0.66.1-0.20221128222955-4ff1ff379b90/go.mod h1:pqyaznLzk21m+1KL6fwOsRryRELL+zNM0qiVSn0MbVc= +go.opentelemetry.io/collector v0.66.1-0.20221202005155-1c54042beb70 h1:INB2CsOtqqrija2KvMuIpbBQ3qX1BECEeR+d0NJX+oM= +go.opentelemetry.io/collector v0.66.1-0.20221202005155-1c54042beb70/go.mod h1:d0NHkHyANJy3HDTvYE/PoylMShUmFIbiir89ieI0X0c= +go.opentelemetry.io/collector/component v0.66.1-0.20221202005155-1c54042beb70 h1:dEoJhzCmRShgmVro/kXm6pouGElgxkH2DsvanzCeZtU= +go.opentelemetry.io/collector/component v0.66.1-0.20221202005155-1c54042beb70/go.mod h1:OsVnvFFe38QSpcuZlQ8cvarDzcloCexgQ1/B2m80F6U= +go.opentelemetry.io/collector/confmap v0.0.0-20221201172708-2bdff61fa52a h1:2TscCXAQASO2kU9xHcMIUM/FP29fiQIRTilZmliq/7I= +go.opentelemetry.io/collector/confmap v0.0.0-20221201172708-2bdff61fa52a/go.mod h1:qJ3e8bA8h4wz/jYlbeEUafVHdrU7DkpStnmIUAz6VTQ= +go.opentelemetry.io/collector/consumer v0.66.1-0.20221202005155-1c54042beb70 h1:XwpVjI1KeKGPXOZBLefGILMziPYuNf6IzbmiIEsIyI0= +go.opentelemetry.io/collector/consumer v0.66.1-0.20221202005155-1c54042beb70/go.mod h1:EWVBcSGcIcmeDGTnIboc/aqa3agsBeH8/q7yFWG7xVc= +go.opentelemetry.io/collector/featuregate v0.66.1-0.20221202005155-1c54042beb70 h1:V0tf4ebciqIs07jFATfLGdUpLRaEsi+AiWuA/in0G8Y= +go.opentelemetry.io/collector/featuregate v0.66.1-0.20221202005155-1c54042beb70/go.mod h1:tewuFKJYalWBU0bmNKg++MC1ipINXUr6szYzOw2p1GI= +go.opentelemetry.io/collector/pdata v0.66.1-0.20221202005155-1c54042beb70 h1:TPOrxkEMvZzfBSwF3ct+kUUgKA5g8unkZZbKQvJweeA= +go.opentelemetry.io/collector/pdata v0.66.1-0.20221202005155-1c54042beb70/go.mod h1:pqyaznLzk21m+1KL6fwOsRryRELL+zNM0qiVSn0MbVc= 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= @@ -852,8 +854,8 @@ go.uber.org/multierr v1.8.0 h1:dg6GjLku4EH+249NNmoIciG9N/jURbDG+pFlTkhzIC8= go.uber.org/multierr v1.8.0/go.mod h1:7EAYxJLBy9rStEaz58O2t4Uvip6FSURkq8/ppBp95ak= go.uber.org/zap v1.10.0/go.mod h1:vwi/ZaCAaUcBkycHslxD9B2zi4UTXhF60s6SWpuDF0Q= go.uber.org/zap v1.17.0/go.mod h1:MXVU+bhUf/A7Xi2HNOnopQOrmycQ5Ih87HtOu4q5SSo= -go.uber.org/zap v1.23.0 h1:OjGQ5KQDEUawVHxNwQgPpiypGHOxo2mNZsOqTak4fFY= -go.uber.org/zap v1.23.0/go.mod h1:D+nX8jyLsMHMYrln8A0rJjFt/T/9/bGgIhAqxv5URuY= +go.uber.org/zap v1.24.0 h1:FiJd5l1UOLj0wCgbSE0rwwXHzEdAZS6hiiSnxJN/D60= +go.uber.org/zap v1.24.0/go.mod h1:2kMP+WWQ8aoFoedH3T2sq6iJ2yDWpHbP0f6MQbS9Gkg= golang.org/x/crypto v0.0.0-20171113213409-9f005a07e0d3/go.mod h1:6SG95UA2DQfeDnfUPMdvaQW0Q7yPrPDi9nlGo2tz2b4= golang.org/x/crypto v0.0.0-20180904163835-0709b304e793/go.mod h1:6SG95UA2DQfeDnfUPMdvaQW0Q7yPrPDi9nlGo2tz2b4= golang.org/x/crypto v0.0.0-20181009213950-7c1a557ab941/go.mod h1:6SG95UA2DQfeDnfUPMdvaQW0Q7yPrPDi9nlGo2tz2b4= diff --git a/receiver/prometheusexecreceiver/config.go b/receiver/prometheusexecreceiver/config.go index f8e4d90e330e..266fe0554d2d 100644 --- a/receiver/prometheusexecreceiver/config.go +++ b/receiver/prometheusexecreceiver/config.go @@ -15,6 +15,7 @@ package prometheusexecreceiver // import "github.com/open-telemetry/opentelemetry-collector-contrib/receiver/prometheusexecreceiver" import ( + "errors" "time" "go.opentelemetry.io/collector/config" @@ -35,3 +36,10 @@ type Config struct { // SubprocessConfig is the configuration needed for the subprocess SubprocessConfig subprocessmanager.SubprocessConfig `mapstructure:",squash"` } + +func (cfg *Config) Validate() error { + if cfg.SubprocessConfig.Command == "" { + return errors.New("command to execute must be non-empty") + } + return nil +} diff --git a/receiver/prometheusexecreceiver/factory.go b/receiver/prometheusexecreceiver/factory.go index 00bedd5b88de..56307bb739bc 100644 --- a/receiver/prometheusexecreceiver/factory.go +++ b/receiver/prometheusexecreceiver/factory.go @@ -74,5 +74,5 @@ func createMetricsReceiver( ) (component.MetricsReceiver, error) { logDeprecation(params.Logger) rCfg := cfg.(*Config) - return newPromExecReceiver(params, rCfg, nextConsumer) + return newPromExecReceiver(params, rCfg, nextConsumer), nil } diff --git a/receiver/prometheusexecreceiver/factory_test.go b/receiver/prometheusexecreceiver/factory_test.go index 87392173ac4d..3d93413e29b7 100644 --- a/receiver/prometheusexecreceiver/factory_test.go +++ b/receiver/prometheusexecreceiver/factory_test.go @@ -44,7 +44,7 @@ func TestCreateTraceAndMetricsReceiver(t *testing.T) { factory := NewFactory() cfg := factory.CreateDefaultConfig() - sub, err := cm.Sub(component.NewIDWithName(typeStr, "").String()) + sub, err := cm.Sub(component.NewID(typeStr).String()) require.NoError(t, err) require.NoError(t, component.UnmarshalConfig(sub, cfg)) @@ -57,19 +57,20 @@ func TestCreateTraceAndMetricsReceiver(t *testing.T) { assert.Equal(t, nil, traceReceiver) assert.ErrorIs(t, err, component.ErrDataTypeIsNotSupported) - // Test CreateMetricsReceiver error because of lack of command - _, err = factory.CreateMetricsReceiver(context.Background(), componenttest.NewNopReceiverCreateSettings(), cfg, nil) - assert.NotNil(t, err) + // Test error because of lack of command + assert.Error(t, component.ValidateConfig(cfg)) // Test CreateMetricsReceiver sub, err = cm.Sub(component.NewIDWithName(typeStr, "test").String()) require.NoError(t, err) require.NoError(t, component.UnmarshalConfig(sub, cfg)) - metricReceiver, err = factory.CreateMetricsReceiver(context.Background(), componenttest.NewNopReceiverCreateSettings(), cfg, nil) + set := componenttest.NewNopReceiverCreateSettings() + set.ID = component.NewID(typeStr) + metricReceiver, err = factory.CreateMetricsReceiver(context.Background(), set, cfg, nil) assert.Equal(t, nil, err) wantPer := &prometheusExecReceiver{ - params: componenttest.NewNopReceiverCreateSettings(), + params: set, config: cfg.(*Config), consumer: nil, promReceiverConfig: &prometheusreceiver.Config{ diff --git a/receiver/prometheusexecreceiver/go.mod b/receiver/prometheusexecreceiver/go.mod index b09e43d0a715..3b0feacc0ef8 100644 --- a/receiver/prometheusexecreceiver/go.mod +++ b/receiver/prometheusexecreceiver/go.mod @@ -9,11 +9,12 @@ require ( github.com/prometheus/common v0.37.0 github.com/prometheus/prometheus v0.38.0 github.com/stretchr/testify v1.8.1 - go.opentelemetry.io/collector v0.66.1-0.20221128222955-4ff1ff379b90 - go.opentelemetry.io/collector/component v0.66.1-0.20221128222955-4ff1ff379b90 - go.opentelemetry.io/collector/consumer v0.66.1-0.20221128222955-4ff1ff379b90 - go.opentelemetry.io/collector/pdata v0.66.1-0.20221128222955-4ff1ff379b90 - go.uber.org/zap v1.23.0 + go.opentelemetry.io/collector v0.66.1-0.20221202005155-1c54042beb70 + go.opentelemetry.io/collector/component v0.66.1-0.20221202005155-1c54042beb70 + go.opentelemetry.io/collector/confmap v0.0.0-20221201172708-2bdff61fa52a + go.opentelemetry.io/collector/consumer v0.66.1-0.20221202005155-1c54042beb70 + go.opentelemetry.io/collector/pdata v0.66.1-0.20221202005155-1c54042beb70 + go.uber.org/zap v1.24.0 ) require ( @@ -119,8 +120,8 @@ require ( github.com/spf13/pflag v1.0.5 // indirect github.com/vultr/govultr/v2 v2.17.2 // indirect go.opencensus.io v0.24.0 // indirect - go.opentelemetry.io/collector/featuregate v0.66.1-0.20221128222955-4ff1ff379b90 // indirect - go.opentelemetry.io/collector/semconv v0.66.1-0.20221128222955-4ff1ff379b90 // indirect + go.opentelemetry.io/collector/featuregate v0.66.1-0.20221202005155-1c54042beb70 // indirect + go.opentelemetry.io/collector/semconv v0.66.1-0.20221202005155-1c54042beb70 // 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 83eb04f75941..a575f959940f 100644 --- a/receiver/prometheusexecreceiver/go.sum +++ b/receiver/prometheusexecreceiver/go.sum @@ -596,8 +596,8 @@ github.com/tidwall/match v1.1.1 h1:+Ho715JplO36QYgwN9PGYNhgZvoUSc9X2c80KVTi+GA= github.com/tidwall/pretty v1.2.0 h1:RWIZEg2iJ8/g6fDDYzMpobmaoGh5OLl4AXtGUGPcqCs= github.com/tidwall/tinylru v1.1.0 h1:XY6IUfzVTU9rpwdhKUF6nQdChgCdGjkMfLzbWyiau6I= github.com/tidwall/wal v1.1.7 h1:emc1TRjIVsdKKSnpwGBAcsAGg0767SvUk8+ygx7Bb+4= -github.com/tklauser/go-sysconf v0.3.10 h1:IJ1AZGZRWbY8T5Vfk04D9WOA5WSejdflXxP03OUqALw= -github.com/tklauser/numcpus v0.4.0 h1:E53Dm1HjH1/R2/aoCtXtPgzmElmn51aOkhCFSuZq//o= +github.com/tklauser/go-sysconf v0.3.11 h1:89WgdJhk5SNwJfu+GKyYveZ4IaJ7xAkecBo+KdJV0CM= +github.com/tklauser/numcpus v0.6.0 h1:kebhY2Qt+3U6RNK7UqpYNA+tJ23IBEGKkB7JQBfDYms= github.com/tv42/httpunix v0.0.0-20150427012821-b75d8614f926/go.mod h1:9ESjWnEqriFuLhtthL60Sar/7RFoluCcXsuvEwTV5KM= github.com/vultr/govultr/v2 v2.17.2 h1:gej/rwr91Puc/tgh+j33p/BLR16UrIPnSr+AIwYWZQs= github.com/vultr/govultr/v2 v2.17.2/go.mod h1:ZFOKGWmgjytfyjeyAdhQlSWwTjh2ig+X49cAp50dzXI= @@ -618,19 +618,21 @@ go.opencensus.io v0.22.3/go.mod h1:yxeiOL68Rb0Xd1ddK5vPZ/oVn4vY4Ynel7k9FzqtOIw= go.opencensus.io v0.22.4/go.mod h1:yxeiOL68Rb0Xd1ddK5vPZ/oVn4vY4Ynel7k9FzqtOIw= go.opencensus.io v0.24.0 h1:y73uSU6J157QMP2kn2r30vwW1A2W2WFwSCGnAVxeaD0= go.opencensus.io v0.24.0/go.mod h1:vNK8G9p7aAivkbmorf4v+7Hgx+Zs0yY+0fOtgBfjQKo= -go.opentelemetry.io/collector v0.66.1-0.20221128222955-4ff1ff379b90 h1:yRe05/jMdzH4TFHfndZ5h2o2hKBK/79W72j8w51qNsI= -go.opentelemetry.io/collector v0.66.1-0.20221128222955-4ff1ff379b90/go.mod h1:hE6jCs+0rfiufCrVPucKZTMwfHit1okfDPnwPT2eW1I= -go.opentelemetry.io/collector/component v0.66.1-0.20221128222955-4ff1ff379b90 h1:AYSNTXbezhNg43EuYdVVcgxE/2gBVrm00FDx4DOmQVg= -go.opentelemetry.io/collector/component v0.66.1-0.20221128222955-4ff1ff379b90/go.mod h1:0c84EqXUhvYe6KW7hJfh76tiI/5yjWCH2amwyQ06XLM= -go.opentelemetry.io/collector/consumer v0.66.1-0.20221128222955-4ff1ff379b90 h1:nzNXVfC1FzXBXCLMzbMv+qK3E4EGiNsnMhfVsBd2yzc= -go.opentelemetry.io/collector/consumer v0.66.1-0.20221128222955-4ff1ff379b90/go.mod h1:WtoRZa5SnxQO1ZEQdVxYpFcXCmq62rakv0oUSlPO0NQ= -go.opentelemetry.io/collector/featuregate v0.66.1-0.20221128222955-4ff1ff379b90 h1:UuJSFWbi9XxyNZsJKZuvpWg35BgRbcCGFH+38V2MAdw= -go.opentelemetry.io/collector/featuregate v0.66.1-0.20221128222955-4ff1ff379b90/go.mod h1:tewuFKJYalWBU0bmNKg++MC1ipINXUr6szYzOw2p1GI= -go.opentelemetry.io/collector/pdata v0.66.1-0.20221128222955-4ff1ff379b90 h1:Vu4S4jSNcd0VFPzxQNO4+UqGwnes1xJDoFLPRiWHm8I= -go.opentelemetry.io/collector/pdata v0.66.1-0.20221128222955-4ff1ff379b90/go.mod h1:pqyaznLzk21m+1KL6fwOsRryRELL+zNM0qiVSn0MbVc= -go.opentelemetry.io/collector/processor/batchprocessor v0.66.1-0.20221128222955-4ff1ff379b90 h1:K12L9juzjChBMfp7cQaQsToz7i7975tUYVzJ3Tpw/Cw= -go.opentelemetry.io/collector/semconv v0.66.1-0.20221128222955-4ff1ff379b90 h1:hFaTA68cggZKWMv7wQ3bKP8KGTbowh/5AQZKCHzHTqM= -go.opentelemetry.io/collector/semconv v0.66.1-0.20221128222955-4ff1ff379b90/go.mod h1:5o9yhOa+ABt7g2E5JABDxGZ1PQPbtfxrKNbYn+LOTXU= +go.opentelemetry.io/collector v0.66.1-0.20221202005155-1c54042beb70 h1:INB2CsOtqqrija2KvMuIpbBQ3qX1BECEeR+d0NJX+oM= +go.opentelemetry.io/collector v0.66.1-0.20221202005155-1c54042beb70/go.mod h1:d0NHkHyANJy3HDTvYE/PoylMShUmFIbiir89ieI0X0c= +go.opentelemetry.io/collector/component v0.66.1-0.20221202005155-1c54042beb70 h1:dEoJhzCmRShgmVro/kXm6pouGElgxkH2DsvanzCeZtU= +go.opentelemetry.io/collector/component v0.66.1-0.20221202005155-1c54042beb70/go.mod h1:OsVnvFFe38QSpcuZlQ8cvarDzcloCexgQ1/B2m80F6U= +go.opentelemetry.io/collector/confmap v0.0.0-20221201172708-2bdff61fa52a h1:2TscCXAQASO2kU9xHcMIUM/FP29fiQIRTilZmliq/7I= +go.opentelemetry.io/collector/confmap v0.0.0-20221201172708-2bdff61fa52a/go.mod h1:qJ3e8bA8h4wz/jYlbeEUafVHdrU7DkpStnmIUAz6VTQ= +go.opentelemetry.io/collector/consumer v0.66.1-0.20221202005155-1c54042beb70 h1:XwpVjI1KeKGPXOZBLefGILMziPYuNf6IzbmiIEsIyI0= +go.opentelemetry.io/collector/consumer v0.66.1-0.20221202005155-1c54042beb70/go.mod h1:EWVBcSGcIcmeDGTnIboc/aqa3agsBeH8/q7yFWG7xVc= +go.opentelemetry.io/collector/featuregate v0.66.1-0.20221202005155-1c54042beb70 h1:V0tf4ebciqIs07jFATfLGdUpLRaEsi+AiWuA/in0G8Y= +go.opentelemetry.io/collector/featuregate v0.66.1-0.20221202005155-1c54042beb70/go.mod h1:tewuFKJYalWBU0bmNKg++MC1ipINXUr6szYzOw2p1GI= +go.opentelemetry.io/collector/pdata v0.66.1-0.20221202005155-1c54042beb70 h1:TPOrxkEMvZzfBSwF3ct+kUUgKA5g8unkZZbKQvJweeA= +go.opentelemetry.io/collector/pdata v0.66.1-0.20221202005155-1c54042beb70/go.mod h1:pqyaznLzk21m+1KL6fwOsRryRELL+zNM0qiVSn0MbVc= +go.opentelemetry.io/collector/processor/batchprocessor v0.66.1-0.20221202005155-1c54042beb70 h1:Y4e8NnVevonnAgmjX9Z7QIMA32yMqHAOnAlh8SzTS8c= +go.opentelemetry.io/collector/semconv v0.66.1-0.20221202005155-1c54042beb70 h1:Q5L9Urod3c8as6ZYaoaqBjarx/HXxsxy34DFZIU2fO4= +go.opentelemetry.io/collector/semconv v0.66.1-0.20221202005155-1c54042beb70/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= @@ -653,8 +655,8 @@ go.uber.org/multierr v1.6.0/go.mod h1:cdWPpRnG4AhwMwsgIHip0KRBQjJy5kYEpYjJxpXp9i go.uber.org/multierr v1.8.0 h1:dg6GjLku4EH+249NNmoIciG9N/jURbDG+pFlTkhzIC8= go.uber.org/multierr v1.8.0/go.mod h1:7EAYxJLBy9rStEaz58O2t4Uvip6FSURkq8/ppBp95ak= go.uber.org/zap v1.17.0/go.mod h1:MXVU+bhUf/A7Xi2HNOnopQOrmycQ5Ih87HtOu4q5SSo= -go.uber.org/zap v1.23.0 h1:OjGQ5KQDEUawVHxNwQgPpiypGHOxo2mNZsOqTak4fFY= -go.uber.org/zap v1.23.0/go.mod h1:D+nX8jyLsMHMYrln8A0rJjFt/T/9/bGgIhAqxv5URuY= +go.uber.org/zap v1.24.0 h1:FiJd5l1UOLj0wCgbSE0rwwXHzEdAZS6hiiSnxJN/D60= +go.uber.org/zap v1.24.0/go.mod h1:2kMP+WWQ8aoFoedH3T2sq6iJ2yDWpHbP0f6MQbS9Gkg= golang.org/x/crypto v0.0.0-20180904163835-0709b304e793/go.mod h1:6SG95UA2DQfeDnfUPMdvaQW0Q7yPrPDi9nlGo2tz2b4= golang.org/x/crypto v0.0.0-20190308221718-c2843e01d9a2/go.mod h1:djNgcEr1/C05ACkg1iLfiJU5Ep61QUkGW8qpdssI0+w= golang.org/x/crypto v0.0.0-20190510104115-cbcb75029529/go.mod h1:yigFU9vqHzYiE8UmvKecakEJjdnWj3jj499lnFckfCI= diff --git a/receiver/prometheusexecreceiver/receiver.go b/receiver/prometheusexecreceiver/receiver.go index 446a59a089c4..0a1e55cd8ca0 100644 --- a/receiver/prometheusexecreceiver/receiver.go +++ b/receiver/prometheusexecreceiver/receiver.go @@ -76,12 +76,9 @@ type runResult struct { } // newPromExecReceiver returns a prometheusExecReceiver -func newPromExecReceiver(params component.ReceiverCreateSettings, config *Config, consumer consumer.Metrics) (*prometheusExecReceiver, error) { - if config.SubprocessConfig.Command == "" { - return nil, fmt.Errorf("no command to execute entered in config file for %v", config.ID()) - } +func newPromExecReceiver(params component.ReceiverCreateSettings, config *Config, consumer consumer.Metrics) *prometheusExecReceiver { subprocessConfig := getSubprocessConfig(config) - promReceiverConfig := getPromReceiverConfig(config) + promReceiverConfig := getPromReceiverConfig(params.ID, config) return &prometheusExecReceiver{ params: params, @@ -90,21 +87,21 @@ func newPromExecReceiver(params component.ReceiverCreateSettings, config *Config subprocessConfig: subprocessConfig, promReceiverConfig: promReceiverConfig, port: config.Port, - }, nil + } } // getPromReceiverConfig returns the Prometheus receiver config -func getPromReceiverConfig(cfg *Config) *prometheusreceiver.Config { +func getPromReceiverConfig(id component.ID, cfg *Config) *prometheusreceiver.Config { scrapeConfig := &promconfig.ScrapeConfig{} scrapeConfig.ScrapeInterval = model.Duration(cfg.ScrapeInterval) scrapeConfig.ScrapeTimeout = model.Duration(cfg.ScrapeTimeout) scrapeConfig.Scheme = "http" scrapeConfig.MetricsPath = defaultMetricsPath - jobName := cfg.ID().Name() + jobName := id.Name() if jobName == "" { // Fallback to type if no name - jobName = string(cfg.ID().Type()) + jobName = string(id.Type()) } scrapeConfig.JobName = jobName scrapeConfig.HonorLabels = false @@ -122,7 +119,7 @@ func getPromReceiverConfig(cfg *Config) *prometheusreceiver.Config { } return &prometheusreceiver.Config{ - ReceiverSettings: config.NewReceiverSettings(component.NewIDWithName(typeStr, cfg.ID().Name())), + ReceiverSettings: config.NewReceiverSettings(id), PrometheusConfig: &promconfig.Config{ ScrapeConfigs: []*promconfig.ScrapeConfig{scrapeConfig}, }, diff --git a/receiver/prometheusexecreceiver/receiver_test.go b/receiver/prometheusexecreceiver/receiver_test.go index 849bd45d0183..ad015b045613 100644 --- a/receiver/prometheusexecreceiver/receiver_test.go +++ b/receiver/prometheusexecreceiver/receiver_test.go @@ -37,50 +37,30 @@ import ( "github.com/open-telemetry/opentelemetry-collector-contrib/receiver/prometheusreceiver" ) -// loadConfigAssertNoError loads the test config and asserts there are no errors, and returns the receiver wanted -func loadConfigAssertNoError(t *testing.T, receiverConfigID component.ID) component.Config { +// 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") + cm, err := confmaptest.LoadConf(filepath.Join("testdata", "config.yaml")) require.NoError(t, err) factory := NewFactory() cfg := factory.CreateDefaultConfig() - sub, err := cm.Sub(receiverConfigID.String()) + sub, err := cm.Sub(component.NewIDWithName(typeStr, "end_to_end_test/2").String()) require.NoError(t, err) require.NoError(t, component.UnmarshalConfig(sub, cfg)) - return cfg -} - -// TestExecKeyMissing loads config and asserts there is an error with that config -func TestExecKeyMissing(t *testing.T) { - 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 component.Config) { - _, err := newPromExecReceiver(componenttest.NewNopReceiverCreateSettings(), errorReceiverConfig.(*Config), nil) - assert.Error(t, err, "newPromExecReceiver() didn't return an error") -} - -// 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, 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(t, cfg, "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 component.Config, testName string) { //nolint sink := new(consumertest.MetricsSink) - wrapper, err := newPromExecReceiver(componenttest.NewNopReceiverCreateSettings(), receiverConfig.(*Config), sink) - assert.NoError(t, err, "newPromExecReceiver() returned an error") + wrapper := newPromExecReceiver(componenttest.NewNopReceiverCreateSettings(), receiverConfig.(*Config), sink) ctx := context.Background() - err = wrapper.Start(ctx, componenttest.NewNopHost()) + err := wrapper.Start(ctx, componenttest.NewNopHost()) assert.NoError(t, err, "Start() returned an error") defer func() { assert.NoError(t, wrapper.Shutdown(ctx)) }() @@ -134,6 +114,7 @@ func TestConfigBuilderFunctions(t *testing.T) { configTests := []struct { name string customName string + id component.ID cfg *Config wantReceiverConfig *prometheusreceiver.Config wantSubprocessConfig *subprocessmanager.SubprocessConfig @@ -141,6 +122,7 @@ func TestConfigBuilderFunctions(t *testing.T) { }{ { name: "no command", + id: component.NewID(typeStr), cfg: &Config{ ReceiverSettings: config.NewReceiverSettings(component.NewID(typeStr)), ScrapeInterval: 60 * time.Second, @@ -183,6 +165,7 @@ func TestConfigBuilderFunctions(t *testing.T) { }, { name: "normal config", + id: component.NewIDWithName(typeStr, "mysqld"), cfg: &Config{ ReceiverSettings: config.NewReceiverSettings(component.NewIDWithName(typeStr, "mysqld")), ScrapeInterval: 90 * time.Second, @@ -236,6 +219,7 @@ func TestConfigBuilderFunctions(t *testing.T) { }, { name: "lots of defaults", + id: component.NewIDWithName(typeStr, "postgres/test"), cfg: &Config{ ReceiverSettings: config.NewReceiverSettings(component.NewIDWithName(typeStr, "postgres/test")), ScrapeInterval: 60 * time.Second, @@ -290,7 +274,7 @@ func TestConfigBuilderFunctions(t *testing.T) { for _, test := range configTests { t.Run(test.name, func(t *testing.T) { - got := getPromReceiverConfig(test.cfg) + got := getPromReceiverConfig(test.id, test.cfg) assert.Equal(t, test.wantReceiverConfig, got) }) } diff --git a/receiver/prometheusreceiver/go.mod b/receiver/prometheusreceiver/go.mod index 4047145c3da3..65fcbd63a444 100644 --- a/receiver/prometheusreceiver/go.mod +++ b/receiver/prometheusreceiver/go.mod @@ -12,15 +12,16 @@ 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.66.1-0.20221128222955-4ff1ff379b90 - go.opentelemetry.io/collector/component v0.66.1-0.20221128222955-4ff1ff379b90 - go.opentelemetry.io/collector/consumer v0.66.1-0.20221128222955-4ff1ff379b90 - go.opentelemetry.io/collector/featuregate v0.66.1-0.20221128222955-4ff1ff379b90 - go.opentelemetry.io/collector/pdata v0.66.1-0.20221128222955-4ff1ff379b90 - go.opentelemetry.io/collector/processor/batchprocessor v0.66.1-0.20221128222955-4ff1ff379b90 - go.opentelemetry.io/collector/semconv v0.66.1-0.20221128222955-4ff1ff379b90 + go.opentelemetry.io/collector v0.66.1-0.20221202005155-1c54042beb70 + go.opentelemetry.io/collector/component v0.66.1-0.20221202005155-1c54042beb70 + go.opentelemetry.io/collector/confmap v0.0.0-20221201172708-2bdff61fa52a + go.opentelemetry.io/collector/consumer v0.66.1-0.20221202005155-1c54042beb70 + go.opentelemetry.io/collector/featuregate v0.66.1-0.20221202005155-1c54042beb70 + go.opentelemetry.io/collector/pdata v0.66.1-0.20221202005155-1c54042beb70 + go.opentelemetry.io/collector/processor/batchprocessor v0.66.1-0.20221202005155-1c54042beb70 + go.opentelemetry.io/collector/semconv v0.66.1-0.20221202005155-1c54042beb70 go.uber.org/atomic v1.10.0 - go.uber.org/zap v1.23.0 + go.uber.org/zap v1.24.0 google.golang.org/protobuf v1.28.1 gopkg.in/yaml.v2 v2.4.0 ) @@ -144,8 +145,8 @@ require ( github.com/tidwall/pretty v1.2.0 // indirect github.com/tidwall/tinylru v1.1.0 // indirect github.com/tidwall/wal v1.1.7 // indirect - github.com/tklauser/go-sysconf v0.3.10 // indirect - github.com/tklauser/numcpus v0.4.0 // indirect + github.com/tklauser/go-sysconf v0.3.11 // indirect + github.com/tklauser/numcpus v0.6.0 // indirect github.com/vultr/govultr/v2 v2.17.2 // indirect github.com/yusufpapurcu/wmi v1.2.2 // indirect go.opencensus.io v0.24.0 // indirect diff --git a/receiver/prometheusreceiver/go.sum b/receiver/prometheusreceiver/go.sum index 37837e0e6a03..41814d31417d 100644 --- a/receiver/prometheusreceiver/go.sum +++ b/receiver/prometheusreceiver/go.sum @@ -623,10 +623,12 @@ github.com/tidwall/tinylru v1.1.0 h1:XY6IUfzVTU9rpwdhKUF6nQdChgCdGjkMfLzbWyiau6I github.com/tidwall/tinylru v1.1.0/go.mod h1:3+bX+TJ2baOLMWTnlyNWHh4QMnFyARg2TLTQ6OFbzw8= github.com/tidwall/wal v1.1.7 h1:emc1TRjIVsdKKSnpwGBAcsAGg0767SvUk8+ygx7Bb+4= github.com/tidwall/wal v1.1.7/go.mod h1:r6lR1j27W9EPalgHiB7zLJDYu3mzW5BQP5KrzBpYY/E= -github.com/tklauser/go-sysconf v0.3.10 h1:IJ1AZGZRWbY8T5Vfk04D9WOA5WSejdflXxP03OUqALw= github.com/tklauser/go-sysconf v0.3.10/go.mod h1:C8XykCvCb+Gn0oNCWPIlcb0RuglQTYaQ2hGm7jmxEFk= -github.com/tklauser/numcpus v0.4.0 h1:E53Dm1HjH1/R2/aoCtXtPgzmElmn51aOkhCFSuZq//o= +github.com/tklauser/go-sysconf v0.3.11 h1:89WgdJhk5SNwJfu+GKyYveZ4IaJ7xAkecBo+KdJV0CM= +github.com/tklauser/go-sysconf v0.3.11/go.mod h1:GqXfhXY3kiPa0nAXPDIQIWzJbMCB7AmcWpGR8lSZfqI= github.com/tklauser/numcpus v0.4.0/go.mod h1:1+UI3pD8NW14VMwdgJNJ1ESk2UnwhAnz5hMwiKKqXCQ= +github.com/tklauser/numcpus v0.6.0 h1:kebhY2Qt+3U6RNK7UqpYNA+tJ23IBEGKkB7JQBfDYms= +github.com/tklauser/numcpus v0.6.0/go.mod h1:FEZLMke0lhOUG6w2JadTzp0a+Nl8PF/GFkQ5UVIcaL4= github.com/tv42/httpunix v0.0.0-20150427012821-b75d8614f926/go.mod h1:9ESjWnEqriFuLhtthL60Sar/7RFoluCcXsuvEwTV5KM= github.com/vultr/govultr/v2 v2.17.2 h1:gej/rwr91Puc/tgh+j33p/BLR16UrIPnSr+AIwYWZQs= github.com/vultr/govultr/v2 v2.17.2/go.mod h1:ZFOKGWmgjytfyjeyAdhQlSWwTjh2ig+X49cAp50dzXI= @@ -649,21 +651,23 @@ go.opencensus.io v0.22.4/go.mod h1:yxeiOL68Rb0Xd1ddK5vPZ/oVn4vY4Ynel7k9FzqtOIw= go.opencensus.io v0.23.0/go.mod h1:XItmlyltB5F7CS4xOC1DcqMoFqwtC6OG2xF7mCv7P7E= go.opencensus.io v0.24.0 h1:y73uSU6J157QMP2kn2r30vwW1A2W2WFwSCGnAVxeaD0= go.opencensus.io v0.24.0/go.mod h1:vNK8G9p7aAivkbmorf4v+7Hgx+Zs0yY+0fOtgBfjQKo= -go.opentelemetry.io/collector v0.66.1-0.20221128222955-4ff1ff379b90 h1:yRe05/jMdzH4TFHfndZ5h2o2hKBK/79W72j8w51qNsI= -go.opentelemetry.io/collector v0.66.1-0.20221128222955-4ff1ff379b90/go.mod h1:hE6jCs+0rfiufCrVPucKZTMwfHit1okfDPnwPT2eW1I= -go.opentelemetry.io/collector/component v0.66.1-0.20221128222955-4ff1ff379b90 h1:AYSNTXbezhNg43EuYdVVcgxE/2gBVrm00FDx4DOmQVg= -go.opentelemetry.io/collector/component v0.66.1-0.20221128222955-4ff1ff379b90/go.mod h1:0c84EqXUhvYe6KW7hJfh76tiI/5yjWCH2amwyQ06XLM= -go.opentelemetry.io/collector/consumer v0.66.1-0.20221128222955-4ff1ff379b90 h1:nzNXVfC1FzXBXCLMzbMv+qK3E4EGiNsnMhfVsBd2yzc= -go.opentelemetry.io/collector/consumer v0.66.1-0.20221128222955-4ff1ff379b90/go.mod h1:WtoRZa5SnxQO1ZEQdVxYpFcXCmq62rakv0oUSlPO0NQ= -go.opentelemetry.io/collector/extension/zpagesextension v0.65.0 h1:T5JJIJ3cmClqdSMgkbjoIiP9p059AAvbfcd3houJkxM= -go.opentelemetry.io/collector/featuregate v0.66.1-0.20221128222955-4ff1ff379b90 h1:UuJSFWbi9XxyNZsJKZuvpWg35BgRbcCGFH+38V2MAdw= -go.opentelemetry.io/collector/featuregate v0.66.1-0.20221128222955-4ff1ff379b90/go.mod h1:tewuFKJYalWBU0bmNKg++MC1ipINXUr6szYzOw2p1GI= -go.opentelemetry.io/collector/pdata v0.66.1-0.20221128222955-4ff1ff379b90 h1:Vu4S4jSNcd0VFPzxQNO4+UqGwnes1xJDoFLPRiWHm8I= -go.opentelemetry.io/collector/pdata v0.66.1-0.20221128222955-4ff1ff379b90/go.mod h1:pqyaznLzk21m+1KL6fwOsRryRELL+zNM0qiVSn0MbVc= -go.opentelemetry.io/collector/processor/batchprocessor v0.66.1-0.20221128222955-4ff1ff379b90 h1:K12L9juzjChBMfp7cQaQsToz7i7975tUYVzJ3Tpw/Cw= -go.opentelemetry.io/collector/processor/batchprocessor v0.66.1-0.20221128222955-4ff1ff379b90/go.mod h1:XhGTsC1B/bq4gpg8IZ/QYBLXkzE4Gw3r7Xu2+ik8A1Q= -go.opentelemetry.io/collector/semconv v0.66.1-0.20221128222955-4ff1ff379b90 h1:hFaTA68cggZKWMv7wQ3bKP8KGTbowh/5AQZKCHzHTqM= -go.opentelemetry.io/collector/semconv v0.66.1-0.20221128222955-4ff1ff379b90/go.mod h1:5o9yhOa+ABt7g2E5JABDxGZ1PQPbtfxrKNbYn+LOTXU= +go.opentelemetry.io/collector v0.66.1-0.20221202005155-1c54042beb70 h1:INB2CsOtqqrija2KvMuIpbBQ3qX1BECEeR+d0NJX+oM= +go.opentelemetry.io/collector v0.66.1-0.20221202005155-1c54042beb70/go.mod h1:d0NHkHyANJy3HDTvYE/PoylMShUmFIbiir89ieI0X0c= +go.opentelemetry.io/collector/component v0.66.1-0.20221202005155-1c54042beb70 h1:dEoJhzCmRShgmVro/kXm6pouGElgxkH2DsvanzCeZtU= +go.opentelemetry.io/collector/component v0.66.1-0.20221202005155-1c54042beb70/go.mod h1:OsVnvFFe38QSpcuZlQ8cvarDzcloCexgQ1/B2m80F6U= +go.opentelemetry.io/collector/confmap v0.0.0-20221201172708-2bdff61fa52a h1:2TscCXAQASO2kU9xHcMIUM/FP29fiQIRTilZmliq/7I= +go.opentelemetry.io/collector/confmap v0.0.0-20221201172708-2bdff61fa52a/go.mod h1:qJ3e8bA8h4wz/jYlbeEUafVHdrU7DkpStnmIUAz6VTQ= +go.opentelemetry.io/collector/consumer v0.66.1-0.20221202005155-1c54042beb70 h1:XwpVjI1KeKGPXOZBLefGILMziPYuNf6IzbmiIEsIyI0= +go.opentelemetry.io/collector/consumer v0.66.1-0.20221202005155-1c54042beb70/go.mod h1:EWVBcSGcIcmeDGTnIboc/aqa3agsBeH8/q7yFWG7xVc= +go.opentelemetry.io/collector/extension/zpagesextension v0.66.0 h1:tPqSKH5K3VhTT0XXVoWL3woWBSTJqnXZQRt0ZLSCoCc= +go.opentelemetry.io/collector/featuregate v0.66.1-0.20221202005155-1c54042beb70 h1:V0tf4ebciqIs07jFATfLGdUpLRaEsi+AiWuA/in0G8Y= +go.opentelemetry.io/collector/featuregate v0.66.1-0.20221202005155-1c54042beb70/go.mod h1:tewuFKJYalWBU0bmNKg++MC1ipINXUr6szYzOw2p1GI= +go.opentelemetry.io/collector/pdata v0.66.1-0.20221202005155-1c54042beb70 h1:TPOrxkEMvZzfBSwF3ct+kUUgKA5g8unkZZbKQvJweeA= +go.opentelemetry.io/collector/pdata v0.66.1-0.20221202005155-1c54042beb70/go.mod h1:pqyaznLzk21m+1KL6fwOsRryRELL+zNM0qiVSn0MbVc= +go.opentelemetry.io/collector/processor/batchprocessor v0.66.1-0.20221202005155-1c54042beb70 h1:Y4e8NnVevonnAgmjX9Z7QIMA32yMqHAOnAlh8SzTS8c= +go.opentelemetry.io/collector/processor/batchprocessor v0.66.1-0.20221202005155-1c54042beb70/go.mod h1:Pi1CsKDQFoDrUP1i3+VdE6s2Xuji7bOGFBgqHK0J32E= +go.opentelemetry.io/collector/semconv v0.66.1-0.20221202005155-1c54042beb70 h1:Q5L9Urod3c8as6ZYaoaqBjarx/HXxsxy34DFZIU2fO4= +go.opentelemetry.io/collector/semconv v0.66.1-0.20221202005155-1c54042beb70/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= @@ -692,8 +696,8 @@ go.uber.org/multierr v1.6.0/go.mod h1:cdWPpRnG4AhwMwsgIHip0KRBQjJy5kYEpYjJxpXp9i go.uber.org/multierr v1.8.0 h1:dg6GjLku4EH+249NNmoIciG9N/jURbDG+pFlTkhzIC8= go.uber.org/multierr v1.8.0/go.mod h1:7EAYxJLBy9rStEaz58O2t4Uvip6FSURkq8/ppBp95ak= go.uber.org/zap v1.17.0/go.mod h1:MXVU+bhUf/A7Xi2HNOnopQOrmycQ5Ih87HtOu4q5SSo= -go.uber.org/zap v1.23.0 h1:OjGQ5KQDEUawVHxNwQgPpiypGHOxo2mNZsOqTak4fFY= -go.uber.org/zap v1.23.0/go.mod h1:D+nX8jyLsMHMYrln8A0rJjFt/T/9/bGgIhAqxv5URuY= +go.uber.org/zap v1.24.0 h1:FiJd5l1UOLj0wCgbSE0rwwXHzEdAZS6hiiSnxJN/D60= +go.uber.org/zap v1.24.0/go.mod h1:2kMP+WWQ8aoFoedH3T2sq6iJ2yDWpHbP0f6MQbS9Gkg= golang.org/x/crypto v0.0.0-20180904163835-0709b304e793/go.mod h1:6SG95UA2DQfeDnfUPMdvaQW0Q7yPrPDi9nlGo2tz2b4= golang.org/x/crypto v0.0.0-20190308221718-c2843e01d9a2/go.mod h1:djNgcEr1/C05ACkg1iLfiJU5Ep61QUkGW8qpdssI0+w= golang.org/x/crypto v0.0.0-20190510104115-cbcb75029529/go.mod h1:yigFU9vqHzYiE8UmvKecakEJjdnWj3jj499lnFckfCI= diff --git a/receiver/prometheusreceiver/internal/appendable.go b/receiver/prometheusreceiver/internal/appendable.go index 779a7ca9a1a5..8976bc0978b2 100644 --- a/receiver/prometheusreceiver/internal/appendable.go +++ b/receiver/prometheusreceiver/internal/appendable.go @@ -47,7 +47,6 @@ func NewAppendable( gcInterval time.Duration, useStartTimeMetric bool, startTimeMetricRegex *regexp.Regexp, - receiverID component.ID, externalLabels labels.Labels, registry *featuregate.Registry) (storage.Appendable, error) { var metricAdjuster MetricsAdjuster @@ -57,7 +56,7 @@ func NewAppendable( metricAdjuster = NewStartTimeMetricAdjuster(set.Logger, startTimeMetricRegex) } - obsrecv, err := obsreport.NewReceiver(obsreport.ReceiverSettings{ReceiverID: receiverID, Transport: transport, ReceiverCreateSettings: set}) + obsrecv, err := obsreport.NewReceiver(obsreport.ReceiverSettings{ReceiverID: set.ID, Transport: transport, ReceiverCreateSettings: set}) if err != nil { return nil, err } diff --git a/receiver/prometheusreceiver/metrics_receiver.go b/receiver/prometheusreceiver/metrics_receiver.go index 2473ea1d4a16..2b567989d8d9 100644 --- a/receiver/prometheusreceiver/metrics_receiver.go +++ b/receiver/prometheusreceiver/metrics_receiver.go @@ -273,7 +273,6 @@ func (r *pReceiver) initPrometheusComponents(ctx context.Context, host component gcInterval(r.cfg.PrometheusConfig), r.cfg.UseStartTimeMetric, startTimeMetricRegex, - r.cfg.ID(), r.cfg.PrometheusConfig.GlobalConfig.ExternalLabels, r.registry, ) diff --git a/receiver/promtailreceiver/go.mod b/receiver/promtailreceiver/go.mod index 2f7f75f5baa7..3bb15125e834 100644 --- a/receiver/promtailreceiver/go.mod +++ b/receiver/promtailreceiver/go.mod @@ -11,9 +11,10 @@ require ( github.com/prometheus/prometheus v0.39.1 github.com/stretchr/testify v1.8.1 github.com/weaveworks/common v0.0.0-20220916164235-da3fde973eec - go.opentelemetry.io/collector v0.66.1-0.20221128222955-4ff1ff379b90 - go.opentelemetry.io/collector/component v0.66.1-0.20221128222955-4ff1ff379b90 - go.uber.org/zap v1.23.0 + go.opentelemetry.io/collector v0.66.1-0.20221202005155-1c54042beb70 + go.opentelemetry.io/collector/component v0.66.1-0.20221202005155-1c54042beb70 + go.opentelemetry.io/collector/confmap v0.0.0-20221201172708-2bdff61fa52a + go.uber.org/zap v1.24.0 gopkg.in/yaml.v2 v2.4.0 ) @@ -190,9 +191,9 @@ require ( go.etcd.io/etcd/client/v3 v3.5.4 // indirect go.mongodb.org/mongo-driver v1.10.2 // indirect go.opencensus.io v0.24.0 // indirect - go.opentelemetry.io/collector/consumer v0.66.1-0.20221128222955-4ff1ff379b90 // indirect - go.opentelemetry.io/collector/featuregate v0.66.1-0.20221128222955-4ff1ff379b90 // indirect - go.opentelemetry.io/collector/pdata v0.66.1-0.20221128222955-4ff1ff379b90 // indirect + go.opentelemetry.io/collector/consumer v0.66.1-0.20221202005155-1c54042beb70 // indirect + go.opentelemetry.io/collector/featuregate v0.66.1-0.20221202005155-1c54042beb70 // indirect + go.opentelemetry.io/collector/pdata v0.66.1-0.20221202005155-1c54042beb70 // 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/promtailreceiver/go.sum b/receiver/promtailreceiver/go.sum index e470dff421af..f3336c357b24 100644 --- a/receiver/promtailreceiver/go.sum +++ b/receiver/promtailreceiver/go.sum @@ -1182,16 +1182,18 @@ go.opencensus.io v0.22.5/go.mod h1:5pWMHQbX5EPX2/62yrJeAkowc+lfs/XD7Uxpq3pI6kk= go.opencensus.io v0.23.0/go.mod h1:XItmlyltB5F7CS4xOC1DcqMoFqwtC6OG2xF7mCv7P7E= go.opencensus.io v0.24.0 h1:y73uSU6J157QMP2kn2r30vwW1A2W2WFwSCGnAVxeaD0= go.opencensus.io v0.24.0/go.mod h1:vNK8G9p7aAivkbmorf4v+7Hgx+Zs0yY+0fOtgBfjQKo= -go.opentelemetry.io/collector v0.66.1-0.20221128222955-4ff1ff379b90 h1:yRe05/jMdzH4TFHfndZ5h2o2hKBK/79W72j8w51qNsI= -go.opentelemetry.io/collector v0.66.1-0.20221128222955-4ff1ff379b90/go.mod h1:hE6jCs+0rfiufCrVPucKZTMwfHit1okfDPnwPT2eW1I= -go.opentelemetry.io/collector/component v0.66.1-0.20221128222955-4ff1ff379b90 h1:AYSNTXbezhNg43EuYdVVcgxE/2gBVrm00FDx4DOmQVg= -go.opentelemetry.io/collector/component v0.66.1-0.20221128222955-4ff1ff379b90/go.mod h1:0c84EqXUhvYe6KW7hJfh76tiI/5yjWCH2amwyQ06XLM= -go.opentelemetry.io/collector/consumer v0.66.1-0.20221128222955-4ff1ff379b90 h1:nzNXVfC1FzXBXCLMzbMv+qK3E4EGiNsnMhfVsBd2yzc= -go.opentelemetry.io/collector/consumer v0.66.1-0.20221128222955-4ff1ff379b90/go.mod h1:WtoRZa5SnxQO1ZEQdVxYpFcXCmq62rakv0oUSlPO0NQ= -go.opentelemetry.io/collector/featuregate v0.66.1-0.20221128222955-4ff1ff379b90 h1:UuJSFWbi9XxyNZsJKZuvpWg35BgRbcCGFH+38V2MAdw= -go.opentelemetry.io/collector/featuregate v0.66.1-0.20221128222955-4ff1ff379b90/go.mod h1:tewuFKJYalWBU0bmNKg++MC1ipINXUr6szYzOw2p1GI= -go.opentelemetry.io/collector/pdata v0.66.1-0.20221128222955-4ff1ff379b90 h1:Vu4S4jSNcd0VFPzxQNO4+UqGwnes1xJDoFLPRiWHm8I= -go.opentelemetry.io/collector/pdata v0.66.1-0.20221128222955-4ff1ff379b90/go.mod h1:pqyaznLzk21m+1KL6fwOsRryRELL+zNM0qiVSn0MbVc= +go.opentelemetry.io/collector v0.66.1-0.20221202005155-1c54042beb70 h1:INB2CsOtqqrija2KvMuIpbBQ3qX1BECEeR+d0NJX+oM= +go.opentelemetry.io/collector v0.66.1-0.20221202005155-1c54042beb70/go.mod h1:d0NHkHyANJy3HDTvYE/PoylMShUmFIbiir89ieI0X0c= +go.opentelemetry.io/collector/component v0.66.1-0.20221202005155-1c54042beb70 h1:dEoJhzCmRShgmVro/kXm6pouGElgxkH2DsvanzCeZtU= +go.opentelemetry.io/collector/component v0.66.1-0.20221202005155-1c54042beb70/go.mod h1:OsVnvFFe38QSpcuZlQ8cvarDzcloCexgQ1/B2m80F6U= +go.opentelemetry.io/collector/confmap v0.0.0-20221201172708-2bdff61fa52a h1:2TscCXAQASO2kU9xHcMIUM/FP29fiQIRTilZmliq/7I= +go.opentelemetry.io/collector/confmap v0.0.0-20221201172708-2bdff61fa52a/go.mod h1:qJ3e8bA8h4wz/jYlbeEUafVHdrU7DkpStnmIUAz6VTQ= +go.opentelemetry.io/collector/consumer v0.66.1-0.20221202005155-1c54042beb70 h1:XwpVjI1KeKGPXOZBLefGILMziPYuNf6IzbmiIEsIyI0= +go.opentelemetry.io/collector/consumer v0.66.1-0.20221202005155-1c54042beb70/go.mod h1:EWVBcSGcIcmeDGTnIboc/aqa3agsBeH8/q7yFWG7xVc= +go.opentelemetry.io/collector/featuregate v0.66.1-0.20221202005155-1c54042beb70 h1:V0tf4ebciqIs07jFATfLGdUpLRaEsi+AiWuA/in0G8Y= +go.opentelemetry.io/collector/featuregate v0.66.1-0.20221202005155-1c54042beb70/go.mod h1:tewuFKJYalWBU0bmNKg++MC1ipINXUr6szYzOw2p1GI= +go.opentelemetry.io/collector/pdata v0.66.1-0.20221202005155-1c54042beb70 h1:TPOrxkEMvZzfBSwF3ct+kUUgKA5g8unkZZbKQvJweeA= +go.opentelemetry.io/collector/pdata v0.66.1-0.20221202005155-1c54042beb70/go.mod h1:pqyaznLzk21m+1KL6fwOsRryRELL+zNM0qiVSn0MbVc= 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.0.0-RC1/go.mod h1:x9tRa9HK4hSSq7jf2TKbqFbtt58/TGk0f9XiEYISI1I= @@ -1239,8 +1241,8 @@ go.uber.org/multierr v1.8.0 h1:dg6GjLku4EH+249NNmoIciG9N/jURbDG+pFlTkhzIC8= go.uber.org/multierr v1.8.0/go.mod h1:7EAYxJLBy9rStEaz58O2t4Uvip6FSURkq8/ppBp95ak= go.uber.org/zap v1.10.0/go.mod h1:vwi/ZaCAaUcBkycHslxD9B2zi4UTXhF60s6SWpuDF0Q= go.uber.org/zap v1.17.0/go.mod h1:MXVU+bhUf/A7Xi2HNOnopQOrmycQ5Ih87HtOu4q5SSo= -go.uber.org/zap v1.23.0 h1:OjGQ5KQDEUawVHxNwQgPpiypGHOxo2mNZsOqTak4fFY= -go.uber.org/zap v1.23.0/go.mod h1:D+nX8jyLsMHMYrln8A0rJjFt/T/9/bGgIhAqxv5URuY= +go.uber.org/zap v1.24.0 h1:FiJd5l1UOLj0wCgbSE0rwwXHzEdAZS6hiiSnxJN/D60= +go.uber.org/zap v1.24.0/go.mod h1:2kMP+WWQ8aoFoedH3T2sq6iJ2yDWpHbP0f6MQbS9Gkg= go4.org/intern v0.0.0-20211027215823-ae77deb06f29 h1:UXLjNohABv4S58tHmeuIZDO6e3mHpW2Dx33gaNt03LE= go4.org/intern v0.0.0-20211027215823-ae77deb06f29/go.mod h1:cS2ma+47FKrLPdXFpr7CuxiTW3eyJbWew4qx0qtQWDA= go4.org/unsafe/assume-no-moving-gc v0.0.0-20211027215541-db492cf91b37/go.mod h1:FftLjUGFEDu5k8lt0ddY+HcrH/qU/0qk+H8j9/nTl3E= diff --git a/receiver/pulsarreceiver/go.mod b/receiver/pulsarreceiver/go.mod index 9593e755039e..30906881faac 100644 --- a/receiver/pulsarreceiver/go.mod +++ b/receiver/pulsarreceiver/go.mod @@ -11,12 +11,13 @@ require ( github.com/open-telemetry/opentelemetry-collector-contrib/pkg/translator/zipkin v0.66.0 github.com/openzipkin/zipkin-go v0.4.1 github.com/stretchr/testify v1.8.1 - go.opentelemetry.io/collector v0.66.1-0.20221128222955-4ff1ff379b90 - go.opentelemetry.io/collector/component v0.66.1-0.20221128222955-4ff1ff379b90 - go.opentelemetry.io/collector/consumer v0.66.1-0.20221128222955-4ff1ff379b90 - go.opentelemetry.io/collector/pdata v0.66.1-0.20221128222955-4ff1ff379b90 - go.opentelemetry.io/collector/semconv v0.66.1-0.20221128222955-4ff1ff379b90 - go.uber.org/zap v1.23.0 + go.opentelemetry.io/collector v0.66.1-0.20221202005155-1c54042beb70 + go.opentelemetry.io/collector/component v0.66.1-0.20221202005155-1c54042beb70 + go.opentelemetry.io/collector/confmap v0.0.0-20221201172708-2bdff61fa52a + go.opentelemetry.io/collector/consumer v0.66.1-0.20221202005155-1c54042beb70 + go.opentelemetry.io/collector/pdata v0.66.1-0.20221202005155-1c54042beb70 + go.opentelemetry.io/collector/semconv v0.66.1-0.20221202005155-1c54042beb70 + go.uber.org/zap v1.24.0 ) require ( @@ -62,7 +63,7 @@ require ( github.com/spaolacci/murmur3 v1.1.0 // indirect github.com/uber/jaeger-client-go v2.30.0+incompatible // indirect github.com/uber/jaeger-lib v2.4.1+incompatible // indirect - go.opentelemetry.io/collector/featuregate v0.66.1-0.20221128222955-4ff1ff379b90 // indirect + go.opentelemetry.io/collector/featuregate v0.66.1-0.20221202005155-1c54042beb70 // indirect go.opentelemetry.io/otel v1.11.1 // indirect go.opentelemetry.io/otel/metric v0.33.0 // indirect go.opentelemetry.io/otel/trace v1.11.1 // indirect diff --git a/receiver/pulsarreceiver/go.sum b/receiver/pulsarreceiver/go.sum index f23c8c5b18cc..23056e688fbd 100644 --- a/receiver/pulsarreceiver/go.sum +++ b/receiver/pulsarreceiver/go.sum @@ -486,18 +486,20 @@ 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.66.1-0.20221128222955-4ff1ff379b90 h1:yRe05/jMdzH4TFHfndZ5h2o2hKBK/79W72j8w51qNsI= -go.opentelemetry.io/collector v0.66.1-0.20221128222955-4ff1ff379b90/go.mod h1:hE6jCs+0rfiufCrVPucKZTMwfHit1okfDPnwPT2eW1I= -go.opentelemetry.io/collector/component v0.66.1-0.20221128222955-4ff1ff379b90 h1:AYSNTXbezhNg43EuYdVVcgxE/2gBVrm00FDx4DOmQVg= -go.opentelemetry.io/collector/component v0.66.1-0.20221128222955-4ff1ff379b90/go.mod h1:0c84EqXUhvYe6KW7hJfh76tiI/5yjWCH2amwyQ06XLM= -go.opentelemetry.io/collector/consumer v0.66.1-0.20221128222955-4ff1ff379b90 h1:nzNXVfC1FzXBXCLMzbMv+qK3E4EGiNsnMhfVsBd2yzc= -go.opentelemetry.io/collector/consumer v0.66.1-0.20221128222955-4ff1ff379b90/go.mod h1:WtoRZa5SnxQO1ZEQdVxYpFcXCmq62rakv0oUSlPO0NQ= -go.opentelemetry.io/collector/featuregate v0.66.1-0.20221128222955-4ff1ff379b90 h1:UuJSFWbi9XxyNZsJKZuvpWg35BgRbcCGFH+38V2MAdw= -go.opentelemetry.io/collector/featuregate v0.66.1-0.20221128222955-4ff1ff379b90/go.mod h1:tewuFKJYalWBU0bmNKg++MC1ipINXUr6szYzOw2p1GI= -go.opentelemetry.io/collector/pdata v0.66.1-0.20221128222955-4ff1ff379b90 h1:Vu4S4jSNcd0VFPzxQNO4+UqGwnes1xJDoFLPRiWHm8I= -go.opentelemetry.io/collector/pdata v0.66.1-0.20221128222955-4ff1ff379b90/go.mod h1:pqyaznLzk21m+1KL6fwOsRryRELL+zNM0qiVSn0MbVc= -go.opentelemetry.io/collector/semconv v0.66.1-0.20221128222955-4ff1ff379b90 h1:hFaTA68cggZKWMv7wQ3bKP8KGTbowh/5AQZKCHzHTqM= -go.opentelemetry.io/collector/semconv v0.66.1-0.20221128222955-4ff1ff379b90/go.mod h1:5o9yhOa+ABt7g2E5JABDxGZ1PQPbtfxrKNbYn+LOTXU= +go.opentelemetry.io/collector v0.66.1-0.20221202005155-1c54042beb70 h1:INB2CsOtqqrija2KvMuIpbBQ3qX1BECEeR+d0NJX+oM= +go.opentelemetry.io/collector v0.66.1-0.20221202005155-1c54042beb70/go.mod h1:d0NHkHyANJy3HDTvYE/PoylMShUmFIbiir89ieI0X0c= +go.opentelemetry.io/collector/component v0.66.1-0.20221202005155-1c54042beb70 h1:dEoJhzCmRShgmVro/kXm6pouGElgxkH2DsvanzCeZtU= +go.opentelemetry.io/collector/component v0.66.1-0.20221202005155-1c54042beb70/go.mod h1:OsVnvFFe38QSpcuZlQ8cvarDzcloCexgQ1/B2m80F6U= +go.opentelemetry.io/collector/confmap v0.0.0-20221201172708-2bdff61fa52a h1:2TscCXAQASO2kU9xHcMIUM/FP29fiQIRTilZmliq/7I= +go.opentelemetry.io/collector/confmap v0.0.0-20221201172708-2bdff61fa52a/go.mod h1:qJ3e8bA8h4wz/jYlbeEUafVHdrU7DkpStnmIUAz6VTQ= +go.opentelemetry.io/collector/consumer v0.66.1-0.20221202005155-1c54042beb70 h1:XwpVjI1KeKGPXOZBLefGILMziPYuNf6IzbmiIEsIyI0= +go.opentelemetry.io/collector/consumer v0.66.1-0.20221202005155-1c54042beb70/go.mod h1:EWVBcSGcIcmeDGTnIboc/aqa3agsBeH8/q7yFWG7xVc= +go.opentelemetry.io/collector/featuregate v0.66.1-0.20221202005155-1c54042beb70 h1:V0tf4ebciqIs07jFATfLGdUpLRaEsi+AiWuA/in0G8Y= +go.opentelemetry.io/collector/featuregate v0.66.1-0.20221202005155-1c54042beb70/go.mod h1:tewuFKJYalWBU0bmNKg++MC1ipINXUr6szYzOw2p1GI= +go.opentelemetry.io/collector/pdata v0.66.1-0.20221202005155-1c54042beb70 h1:TPOrxkEMvZzfBSwF3ct+kUUgKA5g8unkZZbKQvJweeA= +go.opentelemetry.io/collector/pdata v0.66.1-0.20221202005155-1c54042beb70/go.mod h1:pqyaznLzk21m+1KL6fwOsRryRELL+zNM0qiVSn0MbVc= +go.opentelemetry.io/collector/semconv v0.66.1-0.20221202005155-1c54042beb70 h1:Q5L9Urod3c8as6ZYaoaqBjarx/HXxsxy34DFZIU2fO4= +go.opentelemetry.io/collector/semconv v0.66.1-0.20221202005155-1c54042beb70/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= @@ -512,8 +514,8 @@ go.uber.org/multierr v1.6.0/go.mod h1:cdWPpRnG4AhwMwsgIHip0KRBQjJy5kYEpYjJxpXp9i go.uber.org/multierr v1.8.0 h1:dg6GjLku4EH+249NNmoIciG9N/jURbDG+pFlTkhzIC8= go.uber.org/multierr v1.8.0/go.mod h1:7EAYxJLBy9rStEaz58O2t4Uvip6FSURkq8/ppBp95ak= go.uber.org/zap v1.17.0/go.mod h1:MXVU+bhUf/A7Xi2HNOnopQOrmycQ5Ih87HtOu4q5SSo= -go.uber.org/zap v1.23.0 h1:OjGQ5KQDEUawVHxNwQgPpiypGHOxo2mNZsOqTak4fFY= -go.uber.org/zap v1.23.0/go.mod h1:D+nX8jyLsMHMYrln8A0rJjFt/T/9/bGgIhAqxv5URuY= +go.uber.org/zap v1.24.0 h1:FiJd5l1UOLj0wCgbSE0rwwXHzEdAZS6hiiSnxJN/D60= +go.uber.org/zap v1.24.0/go.mod h1:2kMP+WWQ8aoFoedH3T2sq6iJ2yDWpHbP0f6MQbS9Gkg= golang.org/x/crypto v0.0.0-20180904163835-0709b304e793/go.mod h1:6SG95UA2DQfeDnfUPMdvaQW0Q7yPrPDi9nlGo2tz2b4= golang.org/x/crypto v0.0.0-20181029021203-45a5f77698d3/go.mod h1:6SG95UA2DQfeDnfUPMdvaQW0Q7yPrPDi9nlGo2tz2b4= golang.org/x/crypto v0.0.0-20190308221718-c2843e01d9a2/go.mod h1:djNgcEr1/C05ACkg1iLfiJU5Ep61QUkGW8qpdssI0+w= diff --git a/receiver/pulsarreceiver/pulsar_receiver.go b/receiver/pulsarreceiver/pulsar_receiver.go index 838fa6bb4704..3299b5a47cea 100644 --- a/receiver/pulsarreceiver/pulsar_receiver.go +++ b/receiver/pulsarreceiver/pulsar_receiver.go @@ -31,7 +31,6 @@ var errUnrecognizedEncoding = errors.New("unrecognized encoding") const alreadyClosedError = "AlreadyClosedError" type pulsarTracesConsumer struct { - id component.ID tracesConsumer consumer.Traces topic string client pulsar.Client @@ -60,7 +59,6 @@ func newTracesReceiver(config Config, set component.ReceiverCreateSettings, unma } return &pulsarTracesConsumer{ - id: config.ID(), tracesConsumer: nextConsumer, topic: config.Topic, unmarshaler: unmarshaler, @@ -128,7 +126,6 @@ func (c *pulsarTracesConsumer) Shutdown(context.Context) error { } type pulsarMetricsConsumer struct { - id component.ID metricsConsumer consumer.Metrics unmarshaler MetricsUnmarshaler topic string @@ -157,7 +154,6 @@ func newMetricsReceiver(config Config, set component.ReceiverCreateSettings, unm } return &pulsarMetricsConsumer{ - id: config.ID(), metricsConsumer: nextConsumer, topic: config.Topic, unmarshaler: unmarshaler, @@ -228,7 +224,6 @@ func (c *pulsarMetricsConsumer) Shutdown(context.Context) error { } type pulsarLogsConsumer struct { - id component.ID logsConsumer consumer.Logs unmarshaler LogsUnmarshaler topic string @@ -257,7 +252,6 @@ func newLogsReceiver(config Config, set component.ReceiverCreateSettings, unmars } return &pulsarLogsConsumer{ - id: config.ID(), logsConsumer: nextConsumer, topic: config.Topic, cancel: nil, diff --git a/receiver/purefareceiver/go.mod b/receiver/purefareceiver/go.mod index 8f1ee3c0e00b..d462bcb8f500 100644 --- a/receiver/purefareceiver/go.mod +++ b/receiver/purefareceiver/go.mod @@ -8,9 +8,10 @@ require ( github.com/prometheus/common v0.37.0 github.com/prometheus/prometheus v0.39.1 github.com/stretchr/testify v1.8.1 - go.opentelemetry.io/collector v0.66.1-0.20221128222955-4ff1ff379b90 - go.opentelemetry.io/collector/component v0.66.1-0.20221128222955-4ff1ff379b90 - go.opentelemetry.io/collector/consumer v0.66.1-0.20221128222955-4ff1ff379b90 + go.opentelemetry.io/collector v0.66.1-0.20221202005155-1c54042beb70 + go.opentelemetry.io/collector/component v0.66.1-0.20221202005155-1c54042beb70 + go.opentelemetry.io/collector/confmap v0.0.0-20221201172708-2bdff61fa52a + go.opentelemetry.io/collector/consumer v0.66.1-0.20221202005155-1c54042beb70 ) require ( @@ -121,9 +122,9 @@ require ( github.com/spf13/pflag v1.0.5 // indirect github.com/vultr/govultr/v2 v2.17.2 // indirect go.opencensus.io v0.24.0 // indirect - go.opentelemetry.io/collector/featuregate v0.66.1-0.20221128222955-4ff1ff379b90 // indirect - go.opentelemetry.io/collector/pdata v0.66.1-0.20221128222955-4ff1ff379b90 // indirect - go.opentelemetry.io/collector/semconv v0.66.1-0.20221128222955-4ff1ff379b90 // indirect + go.opentelemetry.io/collector/featuregate v0.66.1-0.20221202005155-1c54042beb70 // indirect + go.opentelemetry.io/collector/pdata v0.66.1-0.20221202005155-1c54042beb70 // indirect + go.opentelemetry.io/collector/semconv v0.66.1-0.20221202005155-1c54042beb70 // 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 @@ -131,7 +132,7 @@ require ( go.uber.org/atomic v1.10.0 // indirect go.uber.org/goleak v1.2.0 // indirect go.uber.org/multierr v1.8.0 // indirect - go.uber.org/zap v1.23.0 // indirect + go.uber.org/zap v1.24.0 // indirect golang.org/x/crypto v0.1.0 // indirect golang.org/x/mod v0.6.0 // indirect golang.org/x/net v0.1.0 // indirect diff --git a/receiver/purefareceiver/go.sum b/receiver/purefareceiver/go.sum index 1e20f5670a4d..b8c49d2ca0b2 100644 --- a/receiver/purefareceiver/go.sum +++ b/receiver/purefareceiver/go.sum @@ -623,8 +623,8 @@ github.com/tidwall/match v1.1.1 h1:+Ho715JplO36QYgwN9PGYNhgZvoUSc9X2c80KVTi+GA= github.com/tidwall/pretty v1.2.0 h1:RWIZEg2iJ8/g6fDDYzMpobmaoGh5OLl4AXtGUGPcqCs= github.com/tidwall/tinylru v1.1.0 h1:XY6IUfzVTU9rpwdhKUF6nQdChgCdGjkMfLzbWyiau6I= github.com/tidwall/wal v1.1.7 h1:emc1TRjIVsdKKSnpwGBAcsAGg0767SvUk8+ygx7Bb+4= -github.com/tklauser/go-sysconf v0.3.10 h1:IJ1AZGZRWbY8T5Vfk04D9WOA5WSejdflXxP03OUqALw= -github.com/tklauser/numcpus v0.4.0 h1:E53Dm1HjH1/R2/aoCtXtPgzmElmn51aOkhCFSuZq//o= +github.com/tklauser/go-sysconf v0.3.11 h1:89WgdJhk5SNwJfu+GKyYveZ4IaJ7xAkecBo+KdJV0CM= +github.com/tklauser/numcpus v0.6.0 h1:kebhY2Qt+3U6RNK7UqpYNA+tJ23IBEGKkB7JQBfDYms= github.com/tv42/httpunix v0.0.0-20150427012821-b75d8614f926/go.mod h1:9ESjWnEqriFuLhtthL60Sar/7RFoluCcXsuvEwTV5KM= github.com/vultr/govultr/v2 v2.17.2 h1:gej/rwr91Puc/tgh+j33p/BLR16UrIPnSr+AIwYWZQs= github.com/vultr/govultr/v2 v2.17.2/go.mod h1:ZFOKGWmgjytfyjeyAdhQlSWwTjh2ig+X49cAp50dzXI= @@ -646,19 +646,21 @@ go.opencensus.io v0.22.4/go.mod h1:yxeiOL68Rb0Xd1ddK5vPZ/oVn4vY4Ynel7k9FzqtOIw= go.opencensus.io v0.22.5/go.mod h1:5pWMHQbX5EPX2/62yrJeAkowc+lfs/XD7Uxpq3pI6kk= go.opencensus.io v0.24.0 h1:y73uSU6J157QMP2kn2r30vwW1A2W2WFwSCGnAVxeaD0= go.opencensus.io v0.24.0/go.mod h1:vNK8G9p7aAivkbmorf4v+7Hgx+Zs0yY+0fOtgBfjQKo= -go.opentelemetry.io/collector v0.66.1-0.20221128222955-4ff1ff379b90 h1:yRe05/jMdzH4TFHfndZ5h2o2hKBK/79W72j8w51qNsI= -go.opentelemetry.io/collector v0.66.1-0.20221128222955-4ff1ff379b90/go.mod h1:hE6jCs+0rfiufCrVPucKZTMwfHit1okfDPnwPT2eW1I= -go.opentelemetry.io/collector/component v0.66.1-0.20221128222955-4ff1ff379b90 h1:AYSNTXbezhNg43EuYdVVcgxE/2gBVrm00FDx4DOmQVg= -go.opentelemetry.io/collector/component v0.66.1-0.20221128222955-4ff1ff379b90/go.mod h1:0c84EqXUhvYe6KW7hJfh76tiI/5yjWCH2amwyQ06XLM= -go.opentelemetry.io/collector/consumer v0.66.1-0.20221128222955-4ff1ff379b90 h1:nzNXVfC1FzXBXCLMzbMv+qK3E4EGiNsnMhfVsBd2yzc= -go.opentelemetry.io/collector/consumer v0.66.1-0.20221128222955-4ff1ff379b90/go.mod h1:WtoRZa5SnxQO1ZEQdVxYpFcXCmq62rakv0oUSlPO0NQ= -go.opentelemetry.io/collector/featuregate v0.66.1-0.20221128222955-4ff1ff379b90 h1:UuJSFWbi9XxyNZsJKZuvpWg35BgRbcCGFH+38V2MAdw= -go.opentelemetry.io/collector/featuregate v0.66.1-0.20221128222955-4ff1ff379b90/go.mod h1:tewuFKJYalWBU0bmNKg++MC1ipINXUr6szYzOw2p1GI= -go.opentelemetry.io/collector/pdata v0.66.1-0.20221128222955-4ff1ff379b90 h1:Vu4S4jSNcd0VFPzxQNO4+UqGwnes1xJDoFLPRiWHm8I= -go.opentelemetry.io/collector/pdata v0.66.1-0.20221128222955-4ff1ff379b90/go.mod h1:pqyaznLzk21m+1KL6fwOsRryRELL+zNM0qiVSn0MbVc= -go.opentelemetry.io/collector/processor/batchprocessor v0.66.1-0.20221128222955-4ff1ff379b90 h1:K12L9juzjChBMfp7cQaQsToz7i7975tUYVzJ3Tpw/Cw= -go.opentelemetry.io/collector/semconv v0.66.1-0.20221128222955-4ff1ff379b90 h1:hFaTA68cggZKWMv7wQ3bKP8KGTbowh/5AQZKCHzHTqM= -go.opentelemetry.io/collector/semconv v0.66.1-0.20221128222955-4ff1ff379b90/go.mod h1:5o9yhOa+ABt7g2E5JABDxGZ1PQPbtfxrKNbYn+LOTXU= +go.opentelemetry.io/collector v0.66.1-0.20221202005155-1c54042beb70 h1:INB2CsOtqqrija2KvMuIpbBQ3qX1BECEeR+d0NJX+oM= +go.opentelemetry.io/collector v0.66.1-0.20221202005155-1c54042beb70/go.mod h1:d0NHkHyANJy3HDTvYE/PoylMShUmFIbiir89ieI0X0c= +go.opentelemetry.io/collector/component v0.66.1-0.20221202005155-1c54042beb70 h1:dEoJhzCmRShgmVro/kXm6pouGElgxkH2DsvanzCeZtU= +go.opentelemetry.io/collector/component v0.66.1-0.20221202005155-1c54042beb70/go.mod h1:OsVnvFFe38QSpcuZlQ8cvarDzcloCexgQ1/B2m80F6U= +go.opentelemetry.io/collector/confmap v0.0.0-20221201172708-2bdff61fa52a h1:2TscCXAQASO2kU9xHcMIUM/FP29fiQIRTilZmliq/7I= +go.opentelemetry.io/collector/confmap v0.0.0-20221201172708-2bdff61fa52a/go.mod h1:qJ3e8bA8h4wz/jYlbeEUafVHdrU7DkpStnmIUAz6VTQ= +go.opentelemetry.io/collector/consumer v0.66.1-0.20221202005155-1c54042beb70 h1:XwpVjI1KeKGPXOZBLefGILMziPYuNf6IzbmiIEsIyI0= +go.opentelemetry.io/collector/consumer v0.66.1-0.20221202005155-1c54042beb70/go.mod h1:EWVBcSGcIcmeDGTnIboc/aqa3agsBeH8/q7yFWG7xVc= +go.opentelemetry.io/collector/featuregate v0.66.1-0.20221202005155-1c54042beb70 h1:V0tf4ebciqIs07jFATfLGdUpLRaEsi+AiWuA/in0G8Y= +go.opentelemetry.io/collector/featuregate v0.66.1-0.20221202005155-1c54042beb70/go.mod h1:tewuFKJYalWBU0bmNKg++MC1ipINXUr6szYzOw2p1GI= +go.opentelemetry.io/collector/pdata v0.66.1-0.20221202005155-1c54042beb70 h1:TPOrxkEMvZzfBSwF3ct+kUUgKA5g8unkZZbKQvJweeA= +go.opentelemetry.io/collector/pdata v0.66.1-0.20221202005155-1c54042beb70/go.mod h1:pqyaznLzk21m+1KL6fwOsRryRELL+zNM0qiVSn0MbVc= +go.opentelemetry.io/collector/processor/batchprocessor v0.66.1-0.20221202005155-1c54042beb70 h1:Y4e8NnVevonnAgmjX9Z7QIMA32yMqHAOnAlh8SzTS8c= +go.opentelemetry.io/collector/semconv v0.66.1-0.20221202005155-1c54042beb70 h1:Q5L9Urod3c8as6ZYaoaqBjarx/HXxsxy34DFZIU2fO4= +go.opentelemetry.io/collector/semconv v0.66.1-0.20221202005155-1c54042beb70/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= @@ -682,8 +684,8 @@ go.uber.org/multierr v1.6.0/go.mod h1:cdWPpRnG4AhwMwsgIHip0KRBQjJy5kYEpYjJxpXp9i go.uber.org/multierr v1.8.0 h1:dg6GjLku4EH+249NNmoIciG9N/jURbDG+pFlTkhzIC8= go.uber.org/multierr v1.8.0/go.mod h1:7EAYxJLBy9rStEaz58O2t4Uvip6FSURkq8/ppBp95ak= go.uber.org/zap v1.17.0/go.mod h1:MXVU+bhUf/A7Xi2HNOnopQOrmycQ5Ih87HtOu4q5SSo= -go.uber.org/zap v1.23.0 h1:OjGQ5KQDEUawVHxNwQgPpiypGHOxo2mNZsOqTak4fFY= -go.uber.org/zap v1.23.0/go.mod h1:D+nX8jyLsMHMYrln8A0rJjFt/T/9/bGgIhAqxv5URuY= +go.uber.org/zap v1.24.0 h1:FiJd5l1UOLj0wCgbSE0rwwXHzEdAZS6hiiSnxJN/D60= +go.uber.org/zap v1.24.0/go.mod h1:2kMP+WWQ8aoFoedH3T2sq6iJ2yDWpHbP0f6MQbS9Gkg= golang.org/x/crypto v0.0.0-20180904163835-0709b304e793/go.mod h1:6SG95UA2DQfeDnfUPMdvaQW0Q7yPrPDi9nlGo2tz2b4= golang.org/x/crypto v0.0.0-20190308221718-c2843e01d9a2/go.mod h1:djNgcEr1/C05ACkg1iLfiJU5Ep61QUkGW8qpdssI0+w= golang.org/x/crypto v0.0.0-20190510104115-cbcb75029529/go.mod h1:yigFU9vqHzYiE8UmvKecakEJjdnWj3jj499lnFckfCI= diff --git a/receiver/purefareceiver/internal/bearertoken_test.go b/receiver/purefareceiver/internal/bearertoken_test.go index 7fe2d54ef362..40920b15c277 100644 --- a/receiver/purefareceiver/internal/bearertoken_test.go +++ b/receiver/purefareceiver/internal/bearertoken_test.go @@ -21,8 +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/configauth" + "go.opentelemetry.io/collector/extension/extensiontest" "github.com/open-telemetry/opentelemetry-collector-contrib/extension/bearertokenauthextension" ) @@ -34,7 +34,7 @@ func TestBearerToken(t *testing.T) { baCfg := baFactory.CreateDefaultConfig().(*bearertokenauthextension.Config) baCfg.BearerToken = "the-token" - baExt, err := baFactory.CreateExtension(context.Background(), componenttest.NewNopExtensionCreateSettings(), baCfg) + baExt, err := baFactory.CreateExtension(context.Background(), extensiontest.NewNopCreateSettings(), baCfg) require.NoError(t, err) baComponentName := component.NewIDWithName("bearertokenauth", "array01") diff --git a/receiver/purefareceiver/internal/scraper_test.go b/receiver/purefareceiver/internal/scraper_test.go index 4a3b56351c04..08da715e06cb 100644 --- a/receiver/purefareceiver/internal/scraper_test.go +++ b/receiver/purefareceiver/internal/scraper_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/configauth" + "go.opentelemetry.io/collector/extension/extensiontest" "github.com/open-telemetry/opentelemetry-collector-contrib/extension/bearertokenauthextension" "github.com/open-telemetry/opentelemetry-collector-contrib/receiver/prometheusreceiver" @@ -37,7 +37,7 @@ func TestToPrometheusConfig(t *testing.T) { baCfg := baFactory.CreateDefaultConfig().(*bearertokenauthextension.Config) baCfg.BearerToken = "the-token" - baExt, err := baFactory.CreateExtension(context.Background(), componenttest.NewNopExtensionCreateSettings(), baCfg) + baExt, err := baFactory.CreateExtension(context.Background(), extensiontest.NewNopCreateSettings(), baCfg) require.NoError(t, err) host := &mockHost{ diff --git a/receiver/rabbitmqreceiver/go.mod b/receiver/rabbitmqreceiver/go.mod index 2b1a554134f1..a61b7a83d50b 100644 --- a/receiver/rabbitmqreceiver/go.mod +++ b/receiver/rabbitmqreceiver/go.mod @@ -6,12 +6,13 @@ require ( github.com/open-telemetry/opentelemetry-collector-contrib/internal/scrapertest v0.66.0 github.com/stretchr/testify v1.8.1 github.com/testcontainers/testcontainers-go v0.15.0 - go.opentelemetry.io/collector v0.66.1-0.20221128222955-4ff1ff379b90 - go.opentelemetry.io/collector/component v0.66.1-0.20221128222955-4ff1ff379b90 - go.opentelemetry.io/collector/consumer v0.66.1-0.20221128222955-4ff1ff379b90 - go.opentelemetry.io/collector/pdata v0.66.1-0.20221128222955-4ff1ff379b90 + go.opentelemetry.io/collector v0.66.1-0.20221202005155-1c54042beb70 + go.opentelemetry.io/collector/component v0.66.1-0.20221202005155-1c54042beb70 + go.opentelemetry.io/collector/confmap v0.0.0-20221201172708-2bdff61fa52a + go.opentelemetry.io/collector/consumer v0.66.1-0.20221202005155-1c54042beb70 + go.opentelemetry.io/collector/pdata v0.66.1-0.20221202005155-1c54042beb70 go.uber.org/multierr v1.8.0 - go.uber.org/zap v1.23.0 + go.uber.org/zap v1.24.0 ) require ( @@ -57,7 +58,7 @@ require ( github.com/sirupsen/logrus v1.8.1 // indirect github.com/stretchr/objx v0.5.0 // indirect go.opencensus.io v0.24.0 // indirect - go.opentelemetry.io/collector/featuregate v0.66.1-0.20221128222955-4ff1ff379b90 // indirect + go.opentelemetry.io/collector/featuregate v0.66.1-0.20221202005155-1c54042beb70 // 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 9544f45377d4..81897784aa59 100644 --- a/receiver/rabbitmqreceiver/go.sum +++ b/receiver/rabbitmqreceiver/go.sum @@ -829,16 +829,18 @@ go.opencensus.io v0.22.2/go.mod h1:yxeiOL68Rb0Xd1ddK5vPZ/oVn4vY4Ynel7k9FzqtOIw= go.opencensus.io v0.22.3/go.mod h1:yxeiOL68Rb0Xd1ddK5vPZ/oVn4vY4Ynel7k9FzqtOIw= go.opencensus.io v0.24.0 h1:y73uSU6J157QMP2kn2r30vwW1A2W2WFwSCGnAVxeaD0= go.opencensus.io v0.24.0/go.mod h1:vNK8G9p7aAivkbmorf4v+7Hgx+Zs0yY+0fOtgBfjQKo= -go.opentelemetry.io/collector v0.66.1-0.20221128222955-4ff1ff379b90 h1:yRe05/jMdzH4TFHfndZ5h2o2hKBK/79W72j8w51qNsI= -go.opentelemetry.io/collector v0.66.1-0.20221128222955-4ff1ff379b90/go.mod h1:hE6jCs+0rfiufCrVPucKZTMwfHit1okfDPnwPT2eW1I= -go.opentelemetry.io/collector/component v0.66.1-0.20221128222955-4ff1ff379b90 h1:AYSNTXbezhNg43EuYdVVcgxE/2gBVrm00FDx4DOmQVg= -go.opentelemetry.io/collector/component v0.66.1-0.20221128222955-4ff1ff379b90/go.mod h1:0c84EqXUhvYe6KW7hJfh76tiI/5yjWCH2amwyQ06XLM= -go.opentelemetry.io/collector/consumer v0.66.1-0.20221128222955-4ff1ff379b90 h1:nzNXVfC1FzXBXCLMzbMv+qK3E4EGiNsnMhfVsBd2yzc= -go.opentelemetry.io/collector/consumer v0.66.1-0.20221128222955-4ff1ff379b90/go.mod h1:WtoRZa5SnxQO1ZEQdVxYpFcXCmq62rakv0oUSlPO0NQ= -go.opentelemetry.io/collector/featuregate v0.66.1-0.20221128222955-4ff1ff379b90 h1:UuJSFWbi9XxyNZsJKZuvpWg35BgRbcCGFH+38V2MAdw= -go.opentelemetry.io/collector/featuregate v0.66.1-0.20221128222955-4ff1ff379b90/go.mod h1:tewuFKJYalWBU0bmNKg++MC1ipINXUr6szYzOw2p1GI= -go.opentelemetry.io/collector/pdata v0.66.1-0.20221128222955-4ff1ff379b90 h1:Vu4S4jSNcd0VFPzxQNO4+UqGwnes1xJDoFLPRiWHm8I= -go.opentelemetry.io/collector/pdata v0.66.1-0.20221128222955-4ff1ff379b90/go.mod h1:pqyaznLzk21m+1KL6fwOsRryRELL+zNM0qiVSn0MbVc= +go.opentelemetry.io/collector v0.66.1-0.20221202005155-1c54042beb70 h1:INB2CsOtqqrija2KvMuIpbBQ3qX1BECEeR+d0NJX+oM= +go.opentelemetry.io/collector v0.66.1-0.20221202005155-1c54042beb70/go.mod h1:d0NHkHyANJy3HDTvYE/PoylMShUmFIbiir89ieI0X0c= +go.opentelemetry.io/collector/component v0.66.1-0.20221202005155-1c54042beb70 h1:dEoJhzCmRShgmVro/kXm6pouGElgxkH2DsvanzCeZtU= +go.opentelemetry.io/collector/component v0.66.1-0.20221202005155-1c54042beb70/go.mod h1:OsVnvFFe38QSpcuZlQ8cvarDzcloCexgQ1/B2m80F6U= +go.opentelemetry.io/collector/confmap v0.0.0-20221201172708-2bdff61fa52a h1:2TscCXAQASO2kU9xHcMIUM/FP29fiQIRTilZmliq/7I= +go.opentelemetry.io/collector/confmap v0.0.0-20221201172708-2bdff61fa52a/go.mod h1:qJ3e8bA8h4wz/jYlbeEUafVHdrU7DkpStnmIUAz6VTQ= +go.opentelemetry.io/collector/consumer v0.66.1-0.20221202005155-1c54042beb70 h1:XwpVjI1KeKGPXOZBLefGILMziPYuNf6IzbmiIEsIyI0= +go.opentelemetry.io/collector/consumer v0.66.1-0.20221202005155-1c54042beb70/go.mod h1:EWVBcSGcIcmeDGTnIboc/aqa3agsBeH8/q7yFWG7xVc= +go.opentelemetry.io/collector/featuregate v0.66.1-0.20221202005155-1c54042beb70 h1:V0tf4ebciqIs07jFATfLGdUpLRaEsi+AiWuA/in0G8Y= +go.opentelemetry.io/collector/featuregate v0.66.1-0.20221202005155-1c54042beb70/go.mod h1:tewuFKJYalWBU0bmNKg++MC1ipINXUr6szYzOw2p1GI= +go.opentelemetry.io/collector/pdata v0.66.1-0.20221202005155-1c54042beb70 h1:TPOrxkEMvZzfBSwF3ct+kUUgKA5g8unkZZbKQvJweeA= +go.opentelemetry.io/collector/pdata v0.66.1-0.20221202005155-1c54042beb70/go.mod h1:pqyaznLzk21m+1KL6fwOsRryRELL+zNM0qiVSn0MbVc= 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= @@ -863,8 +865,8 @@ go.uber.org/multierr v1.8.0 h1:dg6GjLku4EH+249NNmoIciG9N/jURbDG+pFlTkhzIC8= go.uber.org/multierr v1.8.0/go.mod h1:7EAYxJLBy9rStEaz58O2t4Uvip6FSURkq8/ppBp95ak= go.uber.org/zap v1.10.0/go.mod h1:vwi/ZaCAaUcBkycHslxD9B2zi4UTXhF60s6SWpuDF0Q= go.uber.org/zap v1.17.0/go.mod h1:MXVU+bhUf/A7Xi2HNOnopQOrmycQ5Ih87HtOu4q5SSo= -go.uber.org/zap v1.23.0 h1:OjGQ5KQDEUawVHxNwQgPpiypGHOxo2mNZsOqTak4fFY= -go.uber.org/zap v1.23.0/go.mod h1:D+nX8jyLsMHMYrln8A0rJjFt/T/9/bGgIhAqxv5URuY= +go.uber.org/zap v1.24.0 h1:FiJd5l1UOLj0wCgbSE0rwwXHzEdAZS6hiiSnxJN/D60= +go.uber.org/zap v1.24.0/go.mod h1:2kMP+WWQ8aoFoedH3T2sq6iJ2yDWpHbP0f6MQbS9Gkg= golang.org/x/crypto v0.0.0-20171113213409-9f005a07e0d3/go.mod h1:6SG95UA2DQfeDnfUPMdvaQW0Q7yPrPDi9nlGo2tz2b4= golang.org/x/crypto v0.0.0-20180904163835-0709b304e793/go.mod h1:6SG95UA2DQfeDnfUPMdvaQW0Q7yPrPDi9nlGo2tz2b4= golang.org/x/crypto v0.0.0-20181009213950-7c1a557ab941/go.mod h1:6SG95UA2DQfeDnfUPMdvaQW0Q7yPrPDi9nlGo2tz2b4= diff --git a/receiver/receivercreator/go.mod b/receiver/receivercreator/go.mod index f3667841cdd2..11a7c08ea787 100644 --- a/receiver/receivercreator/go.mod +++ b/receiver/receivercreator/go.mod @@ -9,13 +9,14 @@ require ( github.com/open-telemetry/opentelemetry-collector-contrib/pkg/translator/opencensus v0.66.0 github.com/spf13/cast v1.5.0 github.com/stretchr/testify v1.8.1 - go.opentelemetry.io/collector v0.66.1-0.20221128222955-4ff1ff379b90 - go.opentelemetry.io/collector/component v0.66.1-0.20221128222955-4ff1ff379b90 - go.opentelemetry.io/collector/consumer v0.66.1-0.20221128222955-4ff1ff379b90 - go.opentelemetry.io/collector/pdata v0.66.1-0.20221128222955-4ff1ff379b90 - go.opentelemetry.io/collector/semconv v0.66.1-0.20221128222955-4ff1ff379b90 + go.opentelemetry.io/collector v0.66.1-0.20221202005155-1c54042beb70 + go.opentelemetry.io/collector/component v0.66.1-0.20221202005155-1c54042beb70 + go.opentelemetry.io/collector/confmap v0.0.0-20221201172708-2bdff61fa52a + go.opentelemetry.io/collector/consumer v0.66.1-0.20221202005155-1c54042beb70 + go.opentelemetry.io/collector/pdata v0.66.1-0.20221202005155-1c54042beb70 + go.opentelemetry.io/collector/semconv v0.66.1-0.20221202005155-1c54042beb70 go.uber.org/multierr v1.8.0 - go.uber.org/zap v1.23.0 + go.uber.org/zap v1.24.0 ) require ( @@ -54,12 +55,12 @@ require ( github.com/spf13/cobra v1.6.1 // indirect github.com/spf13/pflag v1.0.5 // indirect github.com/stretchr/objx v0.5.0 // indirect - github.com/tklauser/go-sysconf v0.3.10 // indirect - github.com/tklauser/numcpus v0.4.0 // indirect + github.com/tklauser/go-sysconf v0.3.11 // indirect + github.com/tklauser/numcpus v0.6.0 // indirect github.com/yusufpapurcu/wmi v1.2.2 // indirect go.opencensus.io v0.24.0 // indirect - go.opentelemetry.io/collector/featuregate v0.66.1-0.20221128222955-4ff1ff379b90 // indirect - go.opentelemetry.io/collector/processor/batchprocessor v0.66.1-0.20221128222955-4ff1ff379b90 // indirect + go.opentelemetry.io/collector/featuregate v0.66.1-0.20221202005155-1c54042beb70 // indirect + go.opentelemetry.io/collector/processor/batchprocessor v0.66.1-0.20221202005155-1c54042beb70 // 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 df65e4bace8f..d38024bf3e6b 100644 --- a/receiver/receivercreator/go.sum +++ b/receiver/receivercreator/go.sum @@ -394,10 +394,12 @@ github.com/stretchr/testify v1.8.0/go.mod h1:yNjHg4UonilssWZ8iaSj1OCr/vHnekPRkoO github.com/stretchr/testify v1.8.1 h1:w7B6lhMri9wdJUVmEZPGGhZzrYTPvgJArz7wNPgYKsk= github.com/stretchr/testify v1.8.1/go.mod h1:w2LPCIKwWwSfY2zedu0+kehJoqGctiVI29o6fzry7u4= github.com/stvp/go-udp-testing v0.0.0-20201019212854-469649b16807/go.mod h1:7jxmlfBCDBXRzr0eAQJ48XC1hBu1np4CS5+cHEYfwpc= -github.com/tklauser/go-sysconf v0.3.10 h1:IJ1AZGZRWbY8T5Vfk04D9WOA5WSejdflXxP03OUqALw= github.com/tklauser/go-sysconf v0.3.10/go.mod h1:C8XykCvCb+Gn0oNCWPIlcb0RuglQTYaQ2hGm7jmxEFk= -github.com/tklauser/numcpus v0.4.0 h1:E53Dm1HjH1/R2/aoCtXtPgzmElmn51aOkhCFSuZq//o= +github.com/tklauser/go-sysconf v0.3.11 h1:89WgdJhk5SNwJfu+GKyYveZ4IaJ7xAkecBo+KdJV0CM= +github.com/tklauser/go-sysconf v0.3.11/go.mod h1:GqXfhXY3kiPa0nAXPDIQIWzJbMCB7AmcWpGR8lSZfqI= github.com/tklauser/numcpus v0.4.0/go.mod h1:1+UI3pD8NW14VMwdgJNJ1ESk2UnwhAnz5hMwiKKqXCQ= +github.com/tklauser/numcpus v0.6.0 h1:kebhY2Qt+3U6RNK7UqpYNA+tJ23IBEGKkB7JQBfDYms= +github.com/tklauser/numcpus v0.6.0/go.mod h1:FEZLMke0lhOUG6w2JadTzp0a+Nl8PF/GFkQ5UVIcaL4= github.com/yuin/goldmark v1.1.25/go.mod h1:3hX8gzYuyVAZsxl0MRgGTJEmQBFcNTphYh9decYSb74= github.com/yuin/goldmark v1.1.27/go.mod h1:3hX8gzYuyVAZsxl0MRgGTJEmQBFcNTphYh9decYSb74= github.com/yuin/goldmark v1.1.32/go.mod h1:3hX8gzYuyVAZsxl0MRgGTJEmQBFcNTphYh9decYSb74= @@ -416,21 +418,23 @@ go.opencensus.io v0.22.4/go.mod h1:yxeiOL68Rb0Xd1ddK5vPZ/oVn4vY4Ynel7k9FzqtOIw= go.opencensus.io v0.23.0/go.mod h1:XItmlyltB5F7CS4xOC1DcqMoFqwtC6OG2xF7mCv7P7E= go.opencensus.io v0.24.0 h1:y73uSU6J157QMP2kn2r30vwW1A2W2WFwSCGnAVxeaD0= go.opencensus.io v0.24.0/go.mod h1:vNK8G9p7aAivkbmorf4v+7Hgx+Zs0yY+0fOtgBfjQKo= -go.opentelemetry.io/collector v0.66.1-0.20221128222955-4ff1ff379b90 h1:yRe05/jMdzH4TFHfndZ5h2o2hKBK/79W72j8w51qNsI= -go.opentelemetry.io/collector v0.66.1-0.20221128222955-4ff1ff379b90/go.mod h1:hE6jCs+0rfiufCrVPucKZTMwfHit1okfDPnwPT2eW1I= -go.opentelemetry.io/collector/component v0.66.1-0.20221128222955-4ff1ff379b90 h1:AYSNTXbezhNg43EuYdVVcgxE/2gBVrm00FDx4DOmQVg= -go.opentelemetry.io/collector/component v0.66.1-0.20221128222955-4ff1ff379b90/go.mod h1:0c84EqXUhvYe6KW7hJfh76tiI/5yjWCH2amwyQ06XLM= -go.opentelemetry.io/collector/consumer v0.66.1-0.20221128222955-4ff1ff379b90 h1:nzNXVfC1FzXBXCLMzbMv+qK3E4EGiNsnMhfVsBd2yzc= -go.opentelemetry.io/collector/consumer v0.66.1-0.20221128222955-4ff1ff379b90/go.mod h1:WtoRZa5SnxQO1ZEQdVxYpFcXCmq62rakv0oUSlPO0NQ= -go.opentelemetry.io/collector/extension/zpagesextension v0.65.0 h1:T5JJIJ3cmClqdSMgkbjoIiP9p059AAvbfcd3houJkxM= -go.opentelemetry.io/collector/featuregate v0.66.1-0.20221128222955-4ff1ff379b90 h1:UuJSFWbi9XxyNZsJKZuvpWg35BgRbcCGFH+38V2MAdw= -go.opentelemetry.io/collector/featuregate v0.66.1-0.20221128222955-4ff1ff379b90/go.mod h1:tewuFKJYalWBU0bmNKg++MC1ipINXUr6szYzOw2p1GI= -go.opentelemetry.io/collector/pdata v0.66.1-0.20221128222955-4ff1ff379b90 h1:Vu4S4jSNcd0VFPzxQNO4+UqGwnes1xJDoFLPRiWHm8I= -go.opentelemetry.io/collector/pdata v0.66.1-0.20221128222955-4ff1ff379b90/go.mod h1:pqyaznLzk21m+1KL6fwOsRryRELL+zNM0qiVSn0MbVc= -go.opentelemetry.io/collector/processor/batchprocessor v0.66.1-0.20221128222955-4ff1ff379b90 h1:K12L9juzjChBMfp7cQaQsToz7i7975tUYVzJ3Tpw/Cw= -go.opentelemetry.io/collector/processor/batchprocessor v0.66.1-0.20221128222955-4ff1ff379b90/go.mod h1:XhGTsC1B/bq4gpg8IZ/QYBLXkzE4Gw3r7Xu2+ik8A1Q= -go.opentelemetry.io/collector/semconv v0.66.1-0.20221128222955-4ff1ff379b90 h1:hFaTA68cggZKWMv7wQ3bKP8KGTbowh/5AQZKCHzHTqM= -go.opentelemetry.io/collector/semconv v0.66.1-0.20221128222955-4ff1ff379b90/go.mod h1:5o9yhOa+ABt7g2E5JABDxGZ1PQPbtfxrKNbYn+LOTXU= +go.opentelemetry.io/collector v0.66.1-0.20221202005155-1c54042beb70 h1:INB2CsOtqqrija2KvMuIpbBQ3qX1BECEeR+d0NJX+oM= +go.opentelemetry.io/collector v0.66.1-0.20221202005155-1c54042beb70/go.mod h1:d0NHkHyANJy3HDTvYE/PoylMShUmFIbiir89ieI0X0c= +go.opentelemetry.io/collector/component v0.66.1-0.20221202005155-1c54042beb70 h1:dEoJhzCmRShgmVro/kXm6pouGElgxkH2DsvanzCeZtU= +go.opentelemetry.io/collector/component v0.66.1-0.20221202005155-1c54042beb70/go.mod h1:OsVnvFFe38QSpcuZlQ8cvarDzcloCexgQ1/B2m80F6U= +go.opentelemetry.io/collector/confmap v0.0.0-20221201172708-2bdff61fa52a h1:2TscCXAQASO2kU9xHcMIUM/FP29fiQIRTilZmliq/7I= +go.opentelemetry.io/collector/confmap v0.0.0-20221201172708-2bdff61fa52a/go.mod h1:qJ3e8bA8h4wz/jYlbeEUafVHdrU7DkpStnmIUAz6VTQ= +go.opentelemetry.io/collector/consumer v0.66.1-0.20221202005155-1c54042beb70 h1:XwpVjI1KeKGPXOZBLefGILMziPYuNf6IzbmiIEsIyI0= +go.opentelemetry.io/collector/consumer v0.66.1-0.20221202005155-1c54042beb70/go.mod h1:EWVBcSGcIcmeDGTnIboc/aqa3agsBeH8/q7yFWG7xVc= +go.opentelemetry.io/collector/extension/zpagesextension v0.66.0 h1:tPqSKH5K3VhTT0XXVoWL3woWBSTJqnXZQRt0ZLSCoCc= +go.opentelemetry.io/collector/featuregate v0.66.1-0.20221202005155-1c54042beb70 h1:V0tf4ebciqIs07jFATfLGdUpLRaEsi+AiWuA/in0G8Y= +go.opentelemetry.io/collector/featuregate v0.66.1-0.20221202005155-1c54042beb70/go.mod h1:tewuFKJYalWBU0bmNKg++MC1ipINXUr6szYzOw2p1GI= +go.opentelemetry.io/collector/pdata v0.66.1-0.20221202005155-1c54042beb70 h1:TPOrxkEMvZzfBSwF3ct+kUUgKA5g8unkZZbKQvJweeA= +go.opentelemetry.io/collector/pdata v0.66.1-0.20221202005155-1c54042beb70/go.mod h1:pqyaznLzk21m+1KL6fwOsRryRELL+zNM0qiVSn0MbVc= +go.opentelemetry.io/collector/processor/batchprocessor v0.66.1-0.20221202005155-1c54042beb70 h1:Y4e8NnVevonnAgmjX9Z7QIMA32yMqHAOnAlh8SzTS8c= +go.opentelemetry.io/collector/processor/batchprocessor v0.66.1-0.20221202005155-1c54042beb70/go.mod h1:Pi1CsKDQFoDrUP1i3+VdE6s2Xuji7bOGFBgqHK0J32E= +go.opentelemetry.io/collector/semconv v0.66.1-0.20221202005155-1c54042beb70 h1:Q5L9Urod3c8as6ZYaoaqBjarx/HXxsxy34DFZIU2fO4= +go.opentelemetry.io/collector/semconv v0.66.1-0.20221202005155-1c54042beb70/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= @@ -454,8 +458,8 @@ go.uber.org/multierr v1.6.0/go.mod h1:cdWPpRnG4AhwMwsgIHip0KRBQjJy5kYEpYjJxpXp9i go.uber.org/multierr v1.8.0 h1:dg6GjLku4EH+249NNmoIciG9N/jURbDG+pFlTkhzIC8= go.uber.org/multierr v1.8.0/go.mod h1:7EAYxJLBy9rStEaz58O2t4Uvip6FSURkq8/ppBp95ak= go.uber.org/zap v1.17.0/go.mod h1:MXVU+bhUf/A7Xi2HNOnopQOrmycQ5Ih87HtOu4q5SSo= -go.uber.org/zap v1.23.0 h1:OjGQ5KQDEUawVHxNwQgPpiypGHOxo2mNZsOqTak4fFY= -go.uber.org/zap v1.23.0/go.mod h1:D+nX8jyLsMHMYrln8A0rJjFt/T/9/bGgIhAqxv5URuY= +go.uber.org/zap v1.24.0 h1:FiJd5l1UOLj0wCgbSE0rwwXHzEdAZS6hiiSnxJN/D60= +go.uber.org/zap v1.24.0/go.mod h1:2kMP+WWQ8aoFoedH3T2sq6iJ2yDWpHbP0f6MQbS9Gkg= golang.org/x/crypto v0.0.0-20180904163835-0709b304e793/go.mod h1:6SG95UA2DQfeDnfUPMdvaQW0Q7yPrPDi9nlGo2tz2b4= golang.org/x/crypto v0.0.0-20190308221718-c2843e01d9a2/go.mod h1:djNgcEr1/C05ACkg1iLfiJU5Ep61QUkGW8qpdssI0+w= golang.org/x/crypto v0.0.0-20190510104115-cbcb75029529/go.mod h1:yigFU9vqHzYiE8UmvKecakEJjdnWj3jj499lnFckfCI= diff --git a/receiver/receivercreator/observerhandler.go b/receiver/receivercreator/observerhandler.go index 12138e3f0837..be7fbe814496 100644 --- a/receiver/receivercreator/observerhandler.go +++ b/receiver/receivercreator/observerhandler.go @@ -18,6 +18,7 @@ import ( "fmt" "sync" + "go.opentelemetry.io/collector/component" "go.opentelemetry.io/collector/consumer" "go.uber.org/multierr" "go.uber.org/zap" @@ -33,7 +34,7 @@ var ( type observerHandler struct { sync.Mutex config *Config - logger *zap.Logger + params component.ReceiverCreateSettings // receiversByEndpointID is a map of endpoint IDs to a receiver instance. receiversByEndpointID receiverMap // nextConsumer is the receiver_creator's own consumer @@ -65,7 +66,7 @@ func (obs *observerHandler) shutdown() error { } func (obs *observerHandler) ID() observer.NotifyID { - return observer.NotifyID(obs.config.ID().String()) + return observer.NotifyID(obs.params.ID.String()) } // OnAdd responds to endpoint add notifications. @@ -76,28 +77,28 @@ func (obs *observerHandler) OnAdd(added []observer.Endpoint) { for _, e := range added { env, err := e.Env() if err != nil { - obs.logger.Error("unable to convert endpoint to environment map", zap.String("endpoint", string(e.ID)), zap.Error(err)) + obs.params.TelemetrySettings.Logger.Error("unable to convert endpoint to environment map", zap.String("endpoint", string(e.ID)), zap.Error(err)) continue } - obs.logger.Debug("handling added endpoint", zap.Any("env", env)) + obs.params.TelemetrySettings.Logger.Debug("handling added endpoint", zap.Any("env", env)) for _, template := range obs.config.receiverTemplates { if matches, err := template.rule.eval(env); err != nil { - obs.logger.Error("failed matching rule", zap.String("rule", template.Rule), zap.Error(err)) + obs.params.TelemetrySettings.Logger.Error("failed matching rule", zap.String("rule", template.Rule), zap.Error(err)) continue } else if !matches { continue } - obs.logger.Info("starting receiver", + obs.params.TelemetrySettings.Logger.Info("starting receiver", zap.String("name", template.id.String()), zap.String("endpoint", e.Target), zap.String("endpoint_id", string(e.ID))) resolvedConfig, err := expandMap(template.config, env) if err != nil { - obs.logger.Error("unable to resolve template config", zap.String("receiver", template.id.String()), zap.Error(err)) + obs.params.TelemetrySettings.Logger.Error("unable to resolve template config", zap.String("receiver", template.id.String()), zap.Error(err)) continue } @@ -111,7 +112,7 @@ func (obs *observerHandler) OnAdd(added []observer.Endpoint) { resolvedDiscoveredConfig, err := expandMap(discoveredConfig, env) if err != nil { - obs.logger.Error("unable to resolve discovered config", zap.String("receiver", template.id.String()), zap.Error(err)) + obs.params.TelemetrySettings.Logger.Error("unable to resolve discovered config", zap.String("receiver", template.id.String()), zap.Error(err)) continue } @@ -119,7 +120,7 @@ func (obs *observerHandler) OnAdd(added []observer.Endpoint) { for k, v := range template.ResourceAttributes { strVal, ok := v.(string) if !ok { - obs.logger.Info(fmt.Sprintf("ignoring unsupported `resource_attributes` %q value %v", k, v)) + obs.params.TelemetrySettings.Logger.Info(fmt.Sprintf("ignoring unsupported `resource_attributes` %q value %v", k, v)) continue } resAttrs[k] = strVal @@ -136,7 +137,7 @@ func (obs *observerHandler) OnAdd(added []observer.Endpoint) { ) if err != nil { - obs.logger.Error("failed creating resource enhancer", zap.String("receiver", template.id.String()), zap.Error(err)) + obs.params.TelemetrySettings.Logger.Error("failed creating resource enhancer", zap.String("receiver", template.id.String()), zap.Error(err)) continue } @@ -151,7 +152,7 @@ func (obs *observerHandler) OnAdd(added []observer.Endpoint) { ) if err != nil { - obs.logger.Error("failed to start receiver", zap.String("receiver", template.id.String()), zap.Error(err)) + obs.params.TelemetrySettings.Logger.Error("failed to start receiver", zap.String("receiver", template.id.String()), zap.Error(err)) continue } @@ -167,7 +168,7 @@ func (obs *observerHandler) OnRemove(removed []observer.Endpoint) { for _, e := range removed { // debug log the endpoint to improve usability - if ce := obs.logger.Check(zap.DebugLevel, "handling removed endpoint"); ce != nil { + if ce := obs.params.TelemetrySettings.Logger.Check(zap.DebugLevel, "handling removed endpoint"); ce != nil { env, err := e.Env() fields := []zap.Field{zap.String("endpoint_id", string(e.ID))} if err == nil { @@ -177,10 +178,10 @@ func (obs *observerHandler) OnRemove(removed []observer.Endpoint) { } for _, rcvr := range obs.receiversByEndpointID.Get(e.ID) { - obs.logger.Info("stopping receiver", zap.Reflect("receiver", rcvr), zap.String("endpoint_id", string(e.ID))) + obs.params.TelemetrySettings.Logger.Info("stopping receiver", zap.Reflect("receiver", rcvr), zap.String("endpoint_id", string(e.ID))) if err := obs.runner.shutdown(rcvr); err != nil { - obs.logger.Error("failed to stop receiver", zap.Reflect("receiver", rcvr), zap.Error(err)) + obs.params.TelemetrySettings.Logger.Error("failed to stop receiver", zap.Reflect("receiver", rcvr), zap.Error(err)) continue } } diff --git a/receiver/receivercreator/observerhandler_test.go b/receiver/receivercreator/observerhandler_test.go index 036cdba9c63a..5a2ada6b9247 100644 --- a/receiver/receivercreator/observerhandler_test.go +++ b/receiver/receivercreator/observerhandler_test.go @@ -20,8 +20,8 @@ import ( "github.com/stretchr/testify/assert" "github.com/stretchr/testify/mock" "go.opentelemetry.io/collector/component" + "go.opentelemetry.io/collector/component/componenttest" "go.opentelemetry.io/collector/consumer" - "go.uber.org/zap" "github.com/open-telemetry/opentelemetry-collector-contrib/extension/observer" ) @@ -49,14 +49,16 @@ var _ runner = (*mockRunner)(nil) func TestOnAdd(t *testing.T) { runner := &mockRunner{} - rcvrCfg := receiverConfig{id: component.NewIDWithName("name", "1"), config: userConfigMap{"foo": "bar"}, endpointID: portEndpoint.ID} + set := componenttest.NewNopReceiverCreateSettings() + set.ID = component.NewIDWithName("name", "1") + rcvrCfg := receiverConfig{id: set.ID, config: userConfigMap{"foo": "bar"}, endpointID: portEndpoint.ID} cfg := createDefaultConfig().(*Config) cfg.receiverTemplates = map[string]receiverTemplate{ "name/1": {rcvrCfg, "", map[string]interface{}{}, newRuleOrPanic(`type == "port"`)}, } handler := &observerHandler{ + params: set, config: cfg, - logger: zap.NewNop(), receiversByEndpointID: receiverMap{}, runner: runner, } @@ -80,9 +82,11 @@ func TestOnAdd(t *testing.T) { func TestOnRemove(t *testing.T) { runner := &mockRunner{} rcvr := &nopWithEndpointReceiver{} + set := componenttest.NewNopReceiverCreateSettings() + set.ID = component.NewID(typeStr) handler := &observerHandler{ + params: set, config: createDefaultConfig().(*Config), - logger: zap.NewNop(), receiversByEndpointID: receiverMap{}, runner: runner, } @@ -99,7 +103,9 @@ func TestOnRemove(t *testing.T) { func TestOnChange(t *testing.T) { runner := &mockRunner{} - rcvrCfg := receiverConfig{id: component.NewIDWithName("name", "1"), config: userConfigMap{"foo": "bar"}, endpointID: portEndpoint.ID} + set := componenttest.NewNopReceiverCreateSettings() + set.ID = component.NewIDWithName("name", "1") + rcvrCfg := receiverConfig{id: set.ID, config: userConfigMap{"foo": "bar"}, endpointID: portEndpoint.ID} oldRcvr := &nopWithEndpointReceiver{} newRcvr := &nopWithEndpointReceiver{} cfg := createDefaultConfig().(*Config) @@ -107,8 +113,8 @@ func TestOnChange(t *testing.T) { "name/1": {rcvrCfg, "", map[string]interface{}{}, newRuleOrPanic(`type == "port"`)}, } handler := &observerHandler{ + params: set, config: cfg, - logger: zap.NewNop(), receiversByEndpointID: receiverMap{}, runner: runner, } @@ -132,17 +138,19 @@ func TestOnChange(t *testing.T) { func TestDynamicConfig(t *testing.T) { runner := &mockRunner{} + set := componenttest.NewNopReceiverCreateSettings() + set.ID = component.NewIDWithName("name", "1") cfg := createDefaultConfig().(*Config) cfg.receiverTemplates = map[string]receiverTemplate{ "name/1": { - receiverConfig: receiverConfig{id: component.NewIDWithName("name", "1"), config: userConfigMap{"endpoint": "`endpoint`:6379"}, endpointID: podEndpoint.ID}, + receiverConfig: receiverConfig{id: set.ID, config: userConfigMap{"endpoint": "`endpoint`:6379"}, endpointID: podEndpoint.ID}, Rule: `type == "pod"`, rule: newRuleOrPanic("type == \"pod\""), }, } handler := &observerHandler{ + params: set, config: cfg, - logger: zap.NewNop(), receiversByEndpointID: receiverMap{}, runner: runner, } diff --git a/receiver/receivercreator/receiver.go b/receiver/receivercreator/receiver.go index 74f0b20e3d59..1e6b8017c1c5 100644 --- a/receiver/receivercreator/receiver.go +++ b/receiver/receivercreator/receiver.go @@ -67,12 +67,12 @@ var _ component.Host = (*loggingHost)(nil) func (rc *receiverCreator) Start(_ context.Context, host component.Host) error { rc.observerHandler = &observerHandler{ config: rc.cfg, - logger: rc.params.Logger, + params: rc.params, receiversByEndpointID: receiverMap{}, nextConsumer: rc.nextConsumer, runner: &receiverRunner{ params: rc.params, - idNamespace: rc.cfg.ID(), + idNamespace: rc.params.ID, host: &loggingHost{host, rc.params.Logger}, }, } diff --git a/receiver/receivercreator/receiver_test.go b/receiver/receivercreator/receiver_test.go index 85a78203739e..da9a61207c9f 100644 --- a/receiver/receivercreator/receiver_test.go +++ b/receiver/receivercreator/receiver_test.go @@ -31,6 +31,7 @@ import ( "go.opentelemetry.io/collector/component/componenttest" "go.opentelemetry.io/collector/confmap/confmaptest" "go.opentelemetry.io/collector/consumer/consumertest" + "go.opentelemetry.io/collector/extension" "go.uber.org/zap" zapObserver "go.uber.org/zap/zaptest/observer" @@ -56,7 +57,7 @@ func (m *mockObserver) Shutdown(ctx context.Context) error { return nil } -var _ component.Extension = (*mockObserver)(nil) +var _ extension.Extension = (*mockObserver)(nil) func (m *mockObserver) ListAndWatch(notify observer.Notify) { notify.OnAdd([]observer.Endpoint{portEndpoint}) diff --git a/receiver/receivercreator/runner.go b/receiver/receivercreator/runner.go index 6f794d5d95e7..82c0d1e3ecb0 100644 --- a/receiver/receivercreator/runner.go +++ b/receiver/receivercreator/runner.go @@ -56,17 +56,22 @@ func (run *receiverRunner) start( receiverFactory := factory.(component.ReceiverFactory) - cfg, err := run.loadRuntimeReceiverConfig(receiverFactory, receiver, discoveredConfig) + cfg, endpoint, err := run.loadRuntimeReceiverConfig(receiverFactory, receiver, discoveredConfig) if err != nil { return nil, err } - recvr, err := run.createRuntimeReceiver(receiverFactory, cfg, nextConsumer) + + // Sets dynamically created receiver to something like receiver_creator/1/redis{endpoint="localhost:6380"}/. + id := component.NewIDWithName(factory.Type(), fmt.Sprintf("%s/%s{endpoint=%q}/%s", receiver.id.Name(), run.idNamespace, endpoint, receiver.endpointID)) + cfg.SetIDName(id.Name()) //nolint:staticcheck + + recvr, err := run.createRuntimeReceiver(receiverFactory, id, cfg, nextConsumer) if err != nil { return nil, err } - if err := recvr.Start(context.Background(), run.host); err != nil { - return nil, fmt.Errorf("failed starting receiver %v: %w", cfg.ID(), err) + if err = recvr.Start(context.Background(), run.host); err != nil { + return nil, err } return recvr, nil @@ -83,33 +88,31 @@ func (run *receiverRunner) loadRuntimeReceiverConfig( factory component.ReceiverFactory, receiver receiverConfig, discoveredConfig userConfigMap, -) (component.Config, error) { +) (component.Config, string, error) { // Merge in the config values specified in the config file. mergedConfig := confmap.NewFromStringMap(receiver.config) // Merge in discoveredConfig containing values discovered at runtime. if err := mergedConfig.Merge(confmap.NewFromStringMap(discoveredConfig)); err != nil { - return nil, fmt.Errorf("failed to merge template config from discovered runtime values: %w", err) + return nil, "", fmt.Errorf("failed to merge template config from discovered runtime values: %w", err) } receiverCfg := factory.CreateDefaultConfig() - receiverCfg.SetIDName(receiver.id.Name()) - if err := component.UnmarshalConfig(mergedConfig, receiverCfg); err != nil { - return nil, fmt.Errorf("failed to load template config: %w", err) + 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"}/. - receiverCfg.SetIDName(fmt.Sprintf("%s/%s{endpoint=%q}/%s", receiver.id.Name(), run.idNamespace, cast.ToString(mergedConfig.Get(endpointConfigKey)), receiver.endpointID)) - return receiverCfg, nil + return receiverCfg, cast.ToString(mergedConfig.Get(endpointConfigKey)), nil } // createRuntimeReceiver creates a receiver that is discovered at runtime. func (run *receiverRunner) createRuntimeReceiver( factory component.ReceiverFactory, + id component.ID, cfg component.Config, nextConsumer consumer.Metrics, ) (component.MetricsReceiver, error) { runParams := run.params - runParams.Logger = runParams.Logger.With(zap.String("name", cfg.ID().String())) + runParams.Logger = runParams.Logger.With(zap.String("name", id.String())) + runParams.ID = id return factory.CreateMetricsReceiver(context.Background(), runParams, cfg, nextConsumer) } diff --git a/receiver/receivercreator/runner_test.go b/receiver/receivercreator/runner_test.go index 08f77134702d..e02571c40156 100644 --- a/receiver/receivercreator/runner_test.go +++ b/receiver/receivercreator/runner_test.go @@ -35,20 +35,24 @@ func Test_loadAndCreateRuntimeReceiver(t *testing.T) { template, err := newReceiverTemplate("nop/1", nil) require.NoError(t, err) - loadedConfig, err := run.loadRuntimeReceiverConfig(exampleFactory, template.receiverConfig, userConfigMap{ + loadedConfig, endpoint, err := run.loadRuntimeReceiverConfig(exampleFactory, template.receiverConfig, userConfigMap{ endpointConfigKey: "localhost:12345", }) require.NoError(t, err) + assert.Equal(t, "localhost:12345", endpoint) assert.NotNil(t, loadedConfig) nopConfig := loadedConfig.(*nopWithEndpointConfig) // Verify that the overridden endpoint is used instead of the one in the config file. assert.Equal(t, "localhost:12345", nopConfig.Endpoint) expectedID := `nop/1/receiver_creator/1{endpoint="localhost:12345"}/endpoint.id` - assert.Equal(t, expectedID, nopConfig.ID().String()) // Test that metric receiver can be created from loaded config and it logs its id for the "name" field. t.Run("test create receiver from loaded config", func(t *testing.T) { - recvr, err := run.createRuntimeReceiver(exampleFactory, loadedConfig, nil) + recvr, err := run.createRuntimeReceiver( + exampleFactory, + component.NewIDWithName("nop", "1/receiver_creator/1{endpoint=\"localhost:12345\"}/endpoint.id"), + loadedConfig, + nil) require.NoError(t, err) assert.NotNil(t, recvr) assert.IsType(t, &nopWithEndpointReceiver{}, recvr) diff --git a/receiver/redisreceiver/go.mod b/receiver/redisreceiver/go.mod index 30a1c0f143f8..e339b1c77de8 100644 --- a/receiver/redisreceiver/go.mod +++ b/receiver/redisreceiver/go.mod @@ -6,11 +6,12 @@ require ( github.com/go-redis/redis/v7 v7.4.1 github.com/stretchr/testify v1.8.1 github.com/testcontainers/testcontainers-go v0.15.0 - go.opentelemetry.io/collector v0.66.1-0.20221128222955-4ff1ff379b90 - go.opentelemetry.io/collector/component v0.66.1-0.20221128222955-4ff1ff379b90 - go.opentelemetry.io/collector/consumer v0.66.1-0.20221128222955-4ff1ff379b90 - go.opentelemetry.io/collector/pdata v0.66.1-0.20221128222955-4ff1ff379b90 - go.uber.org/zap v1.23.0 + go.opentelemetry.io/collector v0.66.1-0.20221202005155-1c54042beb70 + go.opentelemetry.io/collector/component v0.66.1-0.20221202005155-1c54042beb70 + go.opentelemetry.io/collector/confmap v0.0.0-20221201172708-2bdff61fa52a + go.opentelemetry.io/collector/consumer v0.66.1-0.20221202005155-1c54042beb70 + go.opentelemetry.io/collector/pdata v0.66.1-0.20221202005155-1c54042beb70 + go.uber.org/zap v1.24.0 ) require ( @@ -52,7 +53,7 @@ require ( github.com/pmezard/go-difflib v1.0.0 // indirect github.com/sirupsen/logrus v1.8.1 // indirect go.opencensus.io v0.24.0 // indirect - go.opentelemetry.io/collector/featuregate v0.66.1-0.20221128222955-4ff1ff379b90 // indirect + go.opentelemetry.io/collector/featuregate v0.66.1-0.20221202005155-1c54042beb70 // 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 8de5ee1180c2..176ac4521ce7 100644 --- a/receiver/redisreceiver/go.sum +++ b/receiver/redisreceiver/go.sum @@ -829,16 +829,18 @@ go.opencensus.io v0.22.2/go.mod h1:yxeiOL68Rb0Xd1ddK5vPZ/oVn4vY4Ynel7k9FzqtOIw= go.opencensus.io v0.22.3/go.mod h1:yxeiOL68Rb0Xd1ddK5vPZ/oVn4vY4Ynel7k9FzqtOIw= go.opencensus.io v0.24.0 h1:y73uSU6J157QMP2kn2r30vwW1A2W2WFwSCGnAVxeaD0= go.opencensus.io v0.24.0/go.mod h1:vNK8G9p7aAivkbmorf4v+7Hgx+Zs0yY+0fOtgBfjQKo= -go.opentelemetry.io/collector v0.66.1-0.20221128222955-4ff1ff379b90 h1:yRe05/jMdzH4TFHfndZ5h2o2hKBK/79W72j8w51qNsI= -go.opentelemetry.io/collector v0.66.1-0.20221128222955-4ff1ff379b90/go.mod h1:hE6jCs+0rfiufCrVPucKZTMwfHit1okfDPnwPT2eW1I= -go.opentelemetry.io/collector/component v0.66.1-0.20221128222955-4ff1ff379b90 h1:AYSNTXbezhNg43EuYdVVcgxE/2gBVrm00FDx4DOmQVg= -go.opentelemetry.io/collector/component v0.66.1-0.20221128222955-4ff1ff379b90/go.mod h1:0c84EqXUhvYe6KW7hJfh76tiI/5yjWCH2amwyQ06XLM= -go.opentelemetry.io/collector/consumer v0.66.1-0.20221128222955-4ff1ff379b90 h1:nzNXVfC1FzXBXCLMzbMv+qK3E4EGiNsnMhfVsBd2yzc= -go.opentelemetry.io/collector/consumer v0.66.1-0.20221128222955-4ff1ff379b90/go.mod h1:WtoRZa5SnxQO1ZEQdVxYpFcXCmq62rakv0oUSlPO0NQ= -go.opentelemetry.io/collector/featuregate v0.66.1-0.20221128222955-4ff1ff379b90 h1:UuJSFWbi9XxyNZsJKZuvpWg35BgRbcCGFH+38V2MAdw= -go.opentelemetry.io/collector/featuregate v0.66.1-0.20221128222955-4ff1ff379b90/go.mod h1:tewuFKJYalWBU0bmNKg++MC1ipINXUr6szYzOw2p1GI= -go.opentelemetry.io/collector/pdata v0.66.1-0.20221128222955-4ff1ff379b90 h1:Vu4S4jSNcd0VFPzxQNO4+UqGwnes1xJDoFLPRiWHm8I= -go.opentelemetry.io/collector/pdata v0.66.1-0.20221128222955-4ff1ff379b90/go.mod h1:pqyaznLzk21m+1KL6fwOsRryRELL+zNM0qiVSn0MbVc= +go.opentelemetry.io/collector v0.66.1-0.20221202005155-1c54042beb70 h1:INB2CsOtqqrija2KvMuIpbBQ3qX1BECEeR+d0NJX+oM= +go.opentelemetry.io/collector v0.66.1-0.20221202005155-1c54042beb70/go.mod h1:d0NHkHyANJy3HDTvYE/PoylMShUmFIbiir89ieI0X0c= +go.opentelemetry.io/collector/component v0.66.1-0.20221202005155-1c54042beb70 h1:dEoJhzCmRShgmVro/kXm6pouGElgxkH2DsvanzCeZtU= +go.opentelemetry.io/collector/component v0.66.1-0.20221202005155-1c54042beb70/go.mod h1:OsVnvFFe38QSpcuZlQ8cvarDzcloCexgQ1/B2m80F6U= +go.opentelemetry.io/collector/confmap v0.0.0-20221201172708-2bdff61fa52a h1:2TscCXAQASO2kU9xHcMIUM/FP29fiQIRTilZmliq/7I= +go.opentelemetry.io/collector/confmap v0.0.0-20221201172708-2bdff61fa52a/go.mod h1:qJ3e8bA8h4wz/jYlbeEUafVHdrU7DkpStnmIUAz6VTQ= +go.opentelemetry.io/collector/consumer v0.66.1-0.20221202005155-1c54042beb70 h1:XwpVjI1KeKGPXOZBLefGILMziPYuNf6IzbmiIEsIyI0= +go.opentelemetry.io/collector/consumer v0.66.1-0.20221202005155-1c54042beb70/go.mod h1:EWVBcSGcIcmeDGTnIboc/aqa3agsBeH8/q7yFWG7xVc= +go.opentelemetry.io/collector/featuregate v0.66.1-0.20221202005155-1c54042beb70 h1:V0tf4ebciqIs07jFATfLGdUpLRaEsi+AiWuA/in0G8Y= +go.opentelemetry.io/collector/featuregate v0.66.1-0.20221202005155-1c54042beb70/go.mod h1:tewuFKJYalWBU0bmNKg++MC1ipINXUr6szYzOw2p1GI= +go.opentelemetry.io/collector/pdata v0.66.1-0.20221202005155-1c54042beb70 h1:TPOrxkEMvZzfBSwF3ct+kUUgKA5g8unkZZbKQvJweeA= +go.opentelemetry.io/collector/pdata v0.66.1-0.20221202005155-1c54042beb70/go.mod h1:pqyaznLzk21m+1KL6fwOsRryRELL+zNM0qiVSn0MbVc= 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= @@ -861,8 +863,8 @@ go.uber.org/multierr v1.8.0 h1:dg6GjLku4EH+249NNmoIciG9N/jURbDG+pFlTkhzIC8= go.uber.org/multierr v1.8.0/go.mod h1:7EAYxJLBy9rStEaz58O2t4Uvip6FSURkq8/ppBp95ak= go.uber.org/zap v1.10.0/go.mod h1:vwi/ZaCAaUcBkycHslxD9B2zi4UTXhF60s6SWpuDF0Q= go.uber.org/zap v1.17.0/go.mod h1:MXVU+bhUf/A7Xi2HNOnopQOrmycQ5Ih87HtOu4q5SSo= -go.uber.org/zap v1.23.0 h1:OjGQ5KQDEUawVHxNwQgPpiypGHOxo2mNZsOqTak4fFY= -go.uber.org/zap v1.23.0/go.mod h1:D+nX8jyLsMHMYrln8A0rJjFt/T/9/bGgIhAqxv5URuY= +go.uber.org/zap v1.24.0 h1:FiJd5l1UOLj0wCgbSE0rwwXHzEdAZS6hiiSnxJN/D60= +go.uber.org/zap v1.24.0/go.mod h1:2kMP+WWQ8aoFoedH3T2sq6iJ2yDWpHbP0f6MQbS9Gkg= golang.org/x/crypto v0.0.0-20171113213409-9f005a07e0d3/go.mod h1:6SG95UA2DQfeDnfUPMdvaQW0Q7yPrPDi9nlGo2tz2b4= golang.org/x/crypto v0.0.0-20180904163835-0709b304e793/go.mod h1:6SG95UA2DQfeDnfUPMdvaQW0Q7yPrPDi9nlGo2tz2b4= golang.org/x/crypto v0.0.0-20181009213950-7c1a557ab941/go.mod h1:6SG95UA2DQfeDnfUPMdvaQW0Q7yPrPDi9nlGo2tz2b4= diff --git a/receiver/riakreceiver/go.mod b/receiver/riakreceiver/go.mod index 9610abf6a420..dfd474d32770 100644 --- a/receiver/riakreceiver/go.mod +++ b/receiver/riakreceiver/go.mod @@ -6,12 +6,13 @@ require ( github.com/open-telemetry/opentelemetry-collector-contrib/internal/scrapertest v0.66.0 github.com/stretchr/testify v1.8.1 github.com/testcontainers/testcontainers-go v0.15.0 - go.opentelemetry.io/collector v0.66.1-0.20221128222955-4ff1ff379b90 - go.opentelemetry.io/collector/component v0.66.1-0.20221128222955-4ff1ff379b90 - go.opentelemetry.io/collector/consumer v0.66.1-0.20221128222955-4ff1ff379b90 - go.opentelemetry.io/collector/pdata v0.66.1-0.20221128222955-4ff1ff379b90 + go.opentelemetry.io/collector v0.66.1-0.20221202005155-1c54042beb70 + go.opentelemetry.io/collector/component v0.66.1-0.20221202005155-1c54042beb70 + go.opentelemetry.io/collector/confmap v0.0.0-20221201172708-2bdff61fa52a + go.opentelemetry.io/collector/consumer v0.66.1-0.20221202005155-1c54042beb70 + go.opentelemetry.io/collector/pdata v0.66.1-0.20221202005155-1c54042beb70 go.uber.org/multierr v1.8.0 - go.uber.org/zap v1.23.0 + go.uber.org/zap v1.24.0 ) require ( @@ -57,7 +58,7 @@ require ( github.com/sirupsen/logrus v1.8.1 // indirect github.com/stretchr/objx v0.5.0 // indirect go.opencensus.io v0.24.0 // indirect - go.opentelemetry.io/collector/featuregate v0.66.1-0.20221128222955-4ff1ff379b90 // indirect + go.opentelemetry.io/collector/featuregate v0.66.1-0.20221202005155-1c54042beb70 // 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 9544f45377d4..81897784aa59 100644 --- a/receiver/riakreceiver/go.sum +++ b/receiver/riakreceiver/go.sum @@ -829,16 +829,18 @@ go.opencensus.io v0.22.2/go.mod h1:yxeiOL68Rb0Xd1ddK5vPZ/oVn4vY4Ynel7k9FzqtOIw= go.opencensus.io v0.22.3/go.mod h1:yxeiOL68Rb0Xd1ddK5vPZ/oVn4vY4Ynel7k9FzqtOIw= go.opencensus.io v0.24.0 h1:y73uSU6J157QMP2kn2r30vwW1A2W2WFwSCGnAVxeaD0= go.opencensus.io v0.24.0/go.mod h1:vNK8G9p7aAivkbmorf4v+7Hgx+Zs0yY+0fOtgBfjQKo= -go.opentelemetry.io/collector v0.66.1-0.20221128222955-4ff1ff379b90 h1:yRe05/jMdzH4TFHfndZ5h2o2hKBK/79W72j8w51qNsI= -go.opentelemetry.io/collector v0.66.1-0.20221128222955-4ff1ff379b90/go.mod h1:hE6jCs+0rfiufCrVPucKZTMwfHit1okfDPnwPT2eW1I= -go.opentelemetry.io/collector/component v0.66.1-0.20221128222955-4ff1ff379b90 h1:AYSNTXbezhNg43EuYdVVcgxE/2gBVrm00FDx4DOmQVg= -go.opentelemetry.io/collector/component v0.66.1-0.20221128222955-4ff1ff379b90/go.mod h1:0c84EqXUhvYe6KW7hJfh76tiI/5yjWCH2amwyQ06XLM= -go.opentelemetry.io/collector/consumer v0.66.1-0.20221128222955-4ff1ff379b90 h1:nzNXVfC1FzXBXCLMzbMv+qK3E4EGiNsnMhfVsBd2yzc= -go.opentelemetry.io/collector/consumer v0.66.1-0.20221128222955-4ff1ff379b90/go.mod h1:WtoRZa5SnxQO1ZEQdVxYpFcXCmq62rakv0oUSlPO0NQ= -go.opentelemetry.io/collector/featuregate v0.66.1-0.20221128222955-4ff1ff379b90 h1:UuJSFWbi9XxyNZsJKZuvpWg35BgRbcCGFH+38V2MAdw= -go.opentelemetry.io/collector/featuregate v0.66.1-0.20221128222955-4ff1ff379b90/go.mod h1:tewuFKJYalWBU0bmNKg++MC1ipINXUr6szYzOw2p1GI= -go.opentelemetry.io/collector/pdata v0.66.1-0.20221128222955-4ff1ff379b90 h1:Vu4S4jSNcd0VFPzxQNO4+UqGwnes1xJDoFLPRiWHm8I= -go.opentelemetry.io/collector/pdata v0.66.1-0.20221128222955-4ff1ff379b90/go.mod h1:pqyaznLzk21m+1KL6fwOsRryRELL+zNM0qiVSn0MbVc= +go.opentelemetry.io/collector v0.66.1-0.20221202005155-1c54042beb70 h1:INB2CsOtqqrija2KvMuIpbBQ3qX1BECEeR+d0NJX+oM= +go.opentelemetry.io/collector v0.66.1-0.20221202005155-1c54042beb70/go.mod h1:d0NHkHyANJy3HDTvYE/PoylMShUmFIbiir89ieI0X0c= +go.opentelemetry.io/collector/component v0.66.1-0.20221202005155-1c54042beb70 h1:dEoJhzCmRShgmVro/kXm6pouGElgxkH2DsvanzCeZtU= +go.opentelemetry.io/collector/component v0.66.1-0.20221202005155-1c54042beb70/go.mod h1:OsVnvFFe38QSpcuZlQ8cvarDzcloCexgQ1/B2m80F6U= +go.opentelemetry.io/collector/confmap v0.0.0-20221201172708-2bdff61fa52a h1:2TscCXAQASO2kU9xHcMIUM/FP29fiQIRTilZmliq/7I= +go.opentelemetry.io/collector/confmap v0.0.0-20221201172708-2bdff61fa52a/go.mod h1:qJ3e8bA8h4wz/jYlbeEUafVHdrU7DkpStnmIUAz6VTQ= +go.opentelemetry.io/collector/consumer v0.66.1-0.20221202005155-1c54042beb70 h1:XwpVjI1KeKGPXOZBLefGILMziPYuNf6IzbmiIEsIyI0= +go.opentelemetry.io/collector/consumer v0.66.1-0.20221202005155-1c54042beb70/go.mod h1:EWVBcSGcIcmeDGTnIboc/aqa3agsBeH8/q7yFWG7xVc= +go.opentelemetry.io/collector/featuregate v0.66.1-0.20221202005155-1c54042beb70 h1:V0tf4ebciqIs07jFATfLGdUpLRaEsi+AiWuA/in0G8Y= +go.opentelemetry.io/collector/featuregate v0.66.1-0.20221202005155-1c54042beb70/go.mod h1:tewuFKJYalWBU0bmNKg++MC1ipINXUr6szYzOw2p1GI= +go.opentelemetry.io/collector/pdata v0.66.1-0.20221202005155-1c54042beb70 h1:TPOrxkEMvZzfBSwF3ct+kUUgKA5g8unkZZbKQvJweeA= +go.opentelemetry.io/collector/pdata v0.66.1-0.20221202005155-1c54042beb70/go.mod h1:pqyaznLzk21m+1KL6fwOsRryRELL+zNM0qiVSn0MbVc= 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= @@ -863,8 +865,8 @@ go.uber.org/multierr v1.8.0 h1:dg6GjLku4EH+249NNmoIciG9N/jURbDG+pFlTkhzIC8= go.uber.org/multierr v1.8.0/go.mod h1:7EAYxJLBy9rStEaz58O2t4Uvip6FSURkq8/ppBp95ak= go.uber.org/zap v1.10.0/go.mod h1:vwi/ZaCAaUcBkycHslxD9B2zi4UTXhF60s6SWpuDF0Q= go.uber.org/zap v1.17.0/go.mod h1:MXVU+bhUf/A7Xi2HNOnopQOrmycQ5Ih87HtOu4q5SSo= -go.uber.org/zap v1.23.0 h1:OjGQ5KQDEUawVHxNwQgPpiypGHOxo2mNZsOqTak4fFY= -go.uber.org/zap v1.23.0/go.mod h1:D+nX8jyLsMHMYrln8A0rJjFt/T/9/bGgIhAqxv5URuY= +go.uber.org/zap v1.24.0 h1:FiJd5l1UOLj0wCgbSE0rwwXHzEdAZS6hiiSnxJN/D60= +go.uber.org/zap v1.24.0/go.mod h1:2kMP+WWQ8aoFoedH3T2sq6iJ2yDWpHbP0f6MQbS9Gkg= golang.org/x/crypto v0.0.0-20171113213409-9f005a07e0d3/go.mod h1:6SG95UA2DQfeDnfUPMdvaQW0Q7yPrPDi9nlGo2tz2b4= golang.org/x/crypto v0.0.0-20180904163835-0709b304e793/go.mod h1:6SG95UA2DQfeDnfUPMdvaQW0Q7yPrPDi9nlGo2tz2b4= golang.org/x/crypto v0.0.0-20181009213950-7c1a557ab941/go.mod h1:6SG95UA2DQfeDnfUPMdvaQW0Q7yPrPDi9nlGo2tz2b4= diff --git a/receiver/saphanareceiver/go.mod b/receiver/saphanareceiver/go.mod index ed5c31ef3a05..bcda88181f42 100644 --- a/receiver/saphanareceiver/go.mod +++ b/receiver/saphanareceiver/go.mod @@ -7,10 +7,11 @@ require ( github.com/google/go-cmp v0.5.9 github.com/open-telemetry/opentelemetry-collector-contrib/internal/scrapertest v0.66.0 github.com/stretchr/testify v1.8.1 - go.opentelemetry.io/collector v0.66.1-0.20221128222955-4ff1ff379b90 - go.opentelemetry.io/collector/component v0.66.1-0.20221128222955-4ff1ff379b90 - go.opentelemetry.io/collector/consumer v0.66.1-0.20221128222955-4ff1ff379b90 - go.opentelemetry.io/collector/pdata v0.66.1-0.20221128222955-4ff1ff379b90 + go.opentelemetry.io/collector v0.66.1-0.20221202005155-1c54042beb70 + go.opentelemetry.io/collector/component v0.66.1-0.20221202005155-1c54042beb70 + go.opentelemetry.io/collector/confmap v0.0.0-20221201172708-2bdff61fa52a + go.opentelemetry.io/collector/consumer v0.66.1-0.20221202005155-1c54042beb70 + go.opentelemetry.io/collector/pdata v0.66.1-0.20221202005155-1c54042beb70 go.uber.org/multierr v1.8.0 ) @@ -32,12 +33,12 @@ require ( github.com/rogpeppe/go-internal v1.6.1 // indirect github.com/stretchr/objx v0.5.0 // indirect go.opencensus.io v0.24.0 // indirect - go.opentelemetry.io/collector/featuregate v0.66.1-0.20221128222955-4ff1ff379b90 // indirect + go.opentelemetry.io/collector/featuregate v0.66.1-0.20221202005155-1c54042beb70 // 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 go.uber.org/atomic v1.10.0 // indirect - go.uber.org/zap v1.23.0 // indirect + go.uber.org/zap v1.24.0 // indirect golang.org/x/crypto v0.1.0 // indirect golang.org/x/exp v0.0.0-20221019170559-20944726eadf // indirect golang.org/x/net v0.1.0 // indirect diff --git a/receiver/saphanareceiver/go.sum b/receiver/saphanareceiver/go.sum index 9b19e043d1c8..9856764b5b7a 100644 --- a/receiver/saphanareceiver/go.sum +++ b/receiver/saphanareceiver/go.sum @@ -286,16 +286,18 @@ go.etcd.io/etcd/client/pkg/v3 v3.5.4/go.mod h1:IJHfcCEKxYu1Os13ZdwCwIUTUVGYTSAM3 go.etcd.io/etcd/client/v3 v3.5.4/go.mod h1:ZaRkVgBZC+L+dLCjTcF1hRXpgZXQPOvnA/Ak/gq3kiY= go.opencensus.io v0.24.0 h1:y73uSU6J157QMP2kn2r30vwW1A2W2WFwSCGnAVxeaD0= go.opencensus.io v0.24.0/go.mod h1:vNK8G9p7aAivkbmorf4v+7Hgx+Zs0yY+0fOtgBfjQKo= -go.opentelemetry.io/collector v0.66.1-0.20221128222955-4ff1ff379b90 h1:yRe05/jMdzH4TFHfndZ5h2o2hKBK/79W72j8w51qNsI= -go.opentelemetry.io/collector v0.66.1-0.20221128222955-4ff1ff379b90/go.mod h1:hE6jCs+0rfiufCrVPucKZTMwfHit1okfDPnwPT2eW1I= -go.opentelemetry.io/collector/component v0.66.1-0.20221128222955-4ff1ff379b90 h1:AYSNTXbezhNg43EuYdVVcgxE/2gBVrm00FDx4DOmQVg= -go.opentelemetry.io/collector/component v0.66.1-0.20221128222955-4ff1ff379b90/go.mod h1:0c84EqXUhvYe6KW7hJfh76tiI/5yjWCH2amwyQ06XLM= -go.opentelemetry.io/collector/consumer v0.66.1-0.20221128222955-4ff1ff379b90 h1:nzNXVfC1FzXBXCLMzbMv+qK3E4EGiNsnMhfVsBd2yzc= -go.opentelemetry.io/collector/consumer v0.66.1-0.20221128222955-4ff1ff379b90/go.mod h1:WtoRZa5SnxQO1ZEQdVxYpFcXCmq62rakv0oUSlPO0NQ= -go.opentelemetry.io/collector/featuregate v0.66.1-0.20221128222955-4ff1ff379b90 h1:UuJSFWbi9XxyNZsJKZuvpWg35BgRbcCGFH+38V2MAdw= -go.opentelemetry.io/collector/featuregate v0.66.1-0.20221128222955-4ff1ff379b90/go.mod h1:tewuFKJYalWBU0bmNKg++MC1ipINXUr6szYzOw2p1GI= -go.opentelemetry.io/collector/pdata v0.66.1-0.20221128222955-4ff1ff379b90 h1:Vu4S4jSNcd0VFPzxQNO4+UqGwnes1xJDoFLPRiWHm8I= -go.opentelemetry.io/collector/pdata v0.66.1-0.20221128222955-4ff1ff379b90/go.mod h1:pqyaznLzk21m+1KL6fwOsRryRELL+zNM0qiVSn0MbVc= +go.opentelemetry.io/collector v0.66.1-0.20221202005155-1c54042beb70 h1:INB2CsOtqqrija2KvMuIpbBQ3qX1BECEeR+d0NJX+oM= +go.opentelemetry.io/collector v0.66.1-0.20221202005155-1c54042beb70/go.mod h1:d0NHkHyANJy3HDTvYE/PoylMShUmFIbiir89ieI0X0c= +go.opentelemetry.io/collector/component v0.66.1-0.20221202005155-1c54042beb70 h1:dEoJhzCmRShgmVro/kXm6pouGElgxkH2DsvanzCeZtU= +go.opentelemetry.io/collector/component v0.66.1-0.20221202005155-1c54042beb70/go.mod h1:OsVnvFFe38QSpcuZlQ8cvarDzcloCexgQ1/B2m80F6U= +go.opentelemetry.io/collector/confmap v0.0.0-20221201172708-2bdff61fa52a h1:2TscCXAQASO2kU9xHcMIUM/FP29fiQIRTilZmliq/7I= +go.opentelemetry.io/collector/confmap v0.0.0-20221201172708-2bdff61fa52a/go.mod h1:qJ3e8bA8h4wz/jYlbeEUafVHdrU7DkpStnmIUAz6VTQ= +go.opentelemetry.io/collector/consumer v0.66.1-0.20221202005155-1c54042beb70 h1:XwpVjI1KeKGPXOZBLefGILMziPYuNf6IzbmiIEsIyI0= +go.opentelemetry.io/collector/consumer v0.66.1-0.20221202005155-1c54042beb70/go.mod h1:EWVBcSGcIcmeDGTnIboc/aqa3agsBeH8/q7yFWG7xVc= +go.opentelemetry.io/collector/featuregate v0.66.1-0.20221202005155-1c54042beb70 h1:V0tf4ebciqIs07jFATfLGdUpLRaEsi+AiWuA/in0G8Y= +go.opentelemetry.io/collector/featuregate v0.66.1-0.20221202005155-1c54042beb70/go.mod h1:tewuFKJYalWBU0bmNKg++MC1ipINXUr6szYzOw2p1GI= +go.opentelemetry.io/collector/pdata v0.66.1-0.20221202005155-1c54042beb70 h1:TPOrxkEMvZzfBSwF3ct+kUUgKA5g8unkZZbKQvJweeA= +go.opentelemetry.io/collector/pdata v0.66.1-0.20221202005155-1c54042beb70/go.mod h1:pqyaznLzk21m+1KL6fwOsRryRELL+zNM0qiVSn0MbVc= 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= @@ -314,8 +316,8 @@ go.uber.org/multierr v1.6.0/go.mod h1:cdWPpRnG4AhwMwsgIHip0KRBQjJy5kYEpYjJxpXp9i go.uber.org/multierr v1.8.0 h1:dg6GjLku4EH+249NNmoIciG9N/jURbDG+pFlTkhzIC8= go.uber.org/multierr v1.8.0/go.mod h1:7EAYxJLBy9rStEaz58O2t4Uvip6FSURkq8/ppBp95ak= go.uber.org/zap v1.17.0/go.mod h1:MXVU+bhUf/A7Xi2HNOnopQOrmycQ5Ih87HtOu4q5SSo= -go.uber.org/zap v1.23.0 h1:OjGQ5KQDEUawVHxNwQgPpiypGHOxo2mNZsOqTak4fFY= -go.uber.org/zap v1.23.0/go.mod h1:D+nX8jyLsMHMYrln8A0rJjFt/T/9/bGgIhAqxv5URuY= +go.uber.org/zap v1.24.0 h1:FiJd5l1UOLj0wCgbSE0rwwXHzEdAZS6hiiSnxJN/D60= +go.uber.org/zap v1.24.0/go.mod h1:2kMP+WWQ8aoFoedH3T2sq6iJ2yDWpHbP0f6MQbS9Gkg= golang.org/x/crypto v0.0.0-20180904163835-0709b304e793/go.mod h1:6SG95UA2DQfeDnfUPMdvaQW0Q7yPrPDi9nlGo2tz2b4= golang.org/x/crypto v0.0.0-20190308221718-c2843e01d9a2/go.mod h1:djNgcEr1/C05ACkg1iLfiJU5Ep61QUkGW8qpdssI0+w= golang.org/x/crypto v0.0.0-20190923035154-9ee001bba392/go.mod h1:/lpIB1dKB+9EgE3H3cr1v9wB50oz8l4C4h62xy7jSTY= diff --git a/receiver/sapmreceiver/go.mod b/receiver/sapmreceiver/go.mod index ad59ea89f402..bdb663e21f82 100644 --- a/receiver/sapmreceiver/go.mod +++ b/receiver/sapmreceiver/go.mod @@ -10,11 +10,12 @@ require ( github.com/open-telemetry/opentelemetry-collector-contrib/pkg/translator/jaeger v0.66.0 github.com/signalfx/sapm-proto v0.12.0 github.com/stretchr/testify v1.8.1 - go.opentelemetry.io/collector v0.66.1-0.20221128222955-4ff1ff379b90 - go.opentelemetry.io/collector/component v0.66.1-0.20221128222955-4ff1ff379b90 - go.opentelemetry.io/collector/consumer v0.66.1-0.20221128222955-4ff1ff379b90 - go.opentelemetry.io/collector/pdata v0.66.1-0.20221128222955-4ff1ff379b90 - go.opentelemetry.io/collector/semconv v0.66.1-0.20221128222955-4ff1ff379b90 + go.opentelemetry.io/collector v0.66.1-0.20221202005155-1c54042beb70 + go.opentelemetry.io/collector/component v0.66.1-0.20221202005155-1c54042beb70 + go.opentelemetry.io/collector/confmap v0.0.0-20221201172708-2bdff61fa52a + go.opentelemetry.io/collector/consumer v0.66.1-0.20221202005155-1c54042beb70 + go.opentelemetry.io/collector/pdata v0.66.1-0.20221202005155-1c54042beb70 + go.opentelemetry.io/collector/semconv v0.66.1-0.20221202005155-1c54042beb70 ) require ( @@ -42,14 +43,14 @@ require ( github.com/uber/jaeger-client-go v2.30.0+incompatible // indirect github.com/uber/jaeger-lib v2.4.1+incompatible // indirect go.opencensus.io v0.24.0 // indirect - go.opentelemetry.io/collector/featuregate v0.66.1-0.20221128222955-4ff1ff379b90 // indirect + go.opentelemetry.io/collector/featuregate v0.66.1-0.20221202005155-1c54042beb70 // 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 go.opentelemetry.io/otel/trace v1.11.1 // indirect go.uber.org/atomic v1.10.0 // indirect go.uber.org/multierr v1.8.0 // indirect - go.uber.org/zap v1.23.0 // indirect + go.uber.org/zap v1.24.0 // indirect golang.org/x/net v0.0.0-20221014081412-f15817d10f9b // indirect golang.org/x/sys v0.2.0 // indirect golang.org/x/text v0.4.0 // indirect diff --git a/receiver/sapmreceiver/go.sum b/receiver/sapmreceiver/go.sum index eb2c8d5aa9ee..f8a39d1c7d3c 100644 --- a/receiver/sapmreceiver/go.sum +++ b/receiver/sapmreceiver/go.sum @@ -300,18 +300,20 @@ go.etcd.io/etcd/client/pkg/v3 v3.5.4/go.mod h1:IJHfcCEKxYu1Os13ZdwCwIUTUVGYTSAM3 go.etcd.io/etcd/client/v3 v3.5.4/go.mod h1:ZaRkVgBZC+L+dLCjTcF1hRXpgZXQPOvnA/Ak/gq3kiY= go.opencensus.io v0.24.0 h1:y73uSU6J157QMP2kn2r30vwW1A2W2WFwSCGnAVxeaD0= go.opencensus.io v0.24.0/go.mod h1:vNK8G9p7aAivkbmorf4v+7Hgx+Zs0yY+0fOtgBfjQKo= -go.opentelemetry.io/collector v0.66.1-0.20221128222955-4ff1ff379b90 h1:yRe05/jMdzH4TFHfndZ5h2o2hKBK/79W72j8w51qNsI= -go.opentelemetry.io/collector v0.66.1-0.20221128222955-4ff1ff379b90/go.mod h1:hE6jCs+0rfiufCrVPucKZTMwfHit1okfDPnwPT2eW1I= -go.opentelemetry.io/collector/component v0.66.1-0.20221128222955-4ff1ff379b90 h1:AYSNTXbezhNg43EuYdVVcgxE/2gBVrm00FDx4DOmQVg= -go.opentelemetry.io/collector/component v0.66.1-0.20221128222955-4ff1ff379b90/go.mod h1:0c84EqXUhvYe6KW7hJfh76tiI/5yjWCH2amwyQ06XLM= -go.opentelemetry.io/collector/consumer v0.66.1-0.20221128222955-4ff1ff379b90 h1:nzNXVfC1FzXBXCLMzbMv+qK3E4EGiNsnMhfVsBd2yzc= -go.opentelemetry.io/collector/consumer v0.66.1-0.20221128222955-4ff1ff379b90/go.mod h1:WtoRZa5SnxQO1ZEQdVxYpFcXCmq62rakv0oUSlPO0NQ= -go.opentelemetry.io/collector/featuregate v0.66.1-0.20221128222955-4ff1ff379b90 h1:UuJSFWbi9XxyNZsJKZuvpWg35BgRbcCGFH+38V2MAdw= -go.opentelemetry.io/collector/featuregate v0.66.1-0.20221128222955-4ff1ff379b90/go.mod h1:tewuFKJYalWBU0bmNKg++MC1ipINXUr6szYzOw2p1GI= -go.opentelemetry.io/collector/pdata v0.66.1-0.20221128222955-4ff1ff379b90 h1:Vu4S4jSNcd0VFPzxQNO4+UqGwnes1xJDoFLPRiWHm8I= -go.opentelemetry.io/collector/pdata v0.66.1-0.20221128222955-4ff1ff379b90/go.mod h1:pqyaznLzk21m+1KL6fwOsRryRELL+zNM0qiVSn0MbVc= -go.opentelemetry.io/collector/semconv v0.66.1-0.20221128222955-4ff1ff379b90 h1:hFaTA68cggZKWMv7wQ3bKP8KGTbowh/5AQZKCHzHTqM= -go.opentelemetry.io/collector/semconv v0.66.1-0.20221128222955-4ff1ff379b90/go.mod h1:5o9yhOa+ABt7g2E5JABDxGZ1PQPbtfxrKNbYn+LOTXU= +go.opentelemetry.io/collector v0.66.1-0.20221202005155-1c54042beb70 h1:INB2CsOtqqrija2KvMuIpbBQ3qX1BECEeR+d0NJX+oM= +go.opentelemetry.io/collector v0.66.1-0.20221202005155-1c54042beb70/go.mod h1:d0NHkHyANJy3HDTvYE/PoylMShUmFIbiir89ieI0X0c= +go.opentelemetry.io/collector/component v0.66.1-0.20221202005155-1c54042beb70 h1:dEoJhzCmRShgmVro/kXm6pouGElgxkH2DsvanzCeZtU= +go.opentelemetry.io/collector/component v0.66.1-0.20221202005155-1c54042beb70/go.mod h1:OsVnvFFe38QSpcuZlQ8cvarDzcloCexgQ1/B2m80F6U= +go.opentelemetry.io/collector/confmap v0.0.0-20221201172708-2bdff61fa52a h1:2TscCXAQASO2kU9xHcMIUM/FP29fiQIRTilZmliq/7I= +go.opentelemetry.io/collector/confmap v0.0.0-20221201172708-2bdff61fa52a/go.mod h1:qJ3e8bA8h4wz/jYlbeEUafVHdrU7DkpStnmIUAz6VTQ= +go.opentelemetry.io/collector/consumer v0.66.1-0.20221202005155-1c54042beb70 h1:XwpVjI1KeKGPXOZBLefGILMziPYuNf6IzbmiIEsIyI0= +go.opentelemetry.io/collector/consumer v0.66.1-0.20221202005155-1c54042beb70/go.mod h1:EWVBcSGcIcmeDGTnIboc/aqa3agsBeH8/q7yFWG7xVc= +go.opentelemetry.io/collector/featuregate v0.66.1-0.20221202005155-1c54042beb70 h1:V0tf4ebciqIs07jFATfLGdUpLRaEsi+AiWuA/in0G8Y= +go.opentelemetry.io/collector/featuregate v0.66.1-0.20221202005155-1c54042beb70/go.mod h1:tewuFKJYalWBU0bmNKg++MC1ipINXUr6szYzOw2p1GI= +go.opentelemetry.io/collector/pdata v0.66.1-0.20221202005155-1c54042beb70 h1:TPOrxkEMvZzfBSwF3ct+kUUgKA5g8unkZZbKQvJweeA= +go.opentelemetry.io/collector/pdata v0.66.1-0.20221202005155-1c54042beb70/go.mod h1:pqyaznLzk21m+1KL6fwOsRryRELL+zNM0qiVSn0MbVc= +go.opentelemetry.io/collector/semconv v0.66.1-0.20221202005155-1c54042beb70 h1:Q5L9Urod3c8as6ZYaoaqBjarx/HXxsxy34DFZIU2fO4= +go.opentelemetry.io/collector/semconv v0.66.1-0.20221202005155-1c54042beb70/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= @@ -331,8 +333,8 @@ go.uber.org/multierr v1.6.0/go.mod h1:cdWPpRnG4AhwMwsgIHip0KRBQjJy5kYEpYjJxpXp9i go.uber.org/multierr v1.8.0 h1:dg6GjLku4EH+249NNmoIciG9N/jURbDG+pFlTkhzIC8= go.uber.org/multierr v1.8.0/go.mod h1:7EAYxJLBy9rStEaz58O2t4Uvip6FSURkq8/ppBp95ak= go.uber.org/zap v1.17.0/go.mod h1:MXVU+bhUf/A7Xi2HNOnopQOrmycQ5Ih87HtOu4q5SSo= -go.uber.org/zap v1.23.0 h1:OjGQ5KQDEUawVHxNwQgPpiypGHOxo2mNZsOqTak4fFY= -go.uber.org/zap v1.23.0/go.mod h1:D+nX8jyLsMHMYrln8A0rJjFt/T/9/bGgIhAqxv5URuY= +go.uber.org/zap v1.24.0 h1:FiJd5l1UOLj0wCgbSE0rwwXHzEdAZS6hiiSnxJN/D60= +go.uber.org/zap v1.24.0/go.mod h1:2kMP+WWQ8aoFoedH3T2sq6iJ2yDWpHbP0f6MQbS9Gkg= golang.org/x/crypto v0.0.0-20180904163835-0709b304e793/go.mod h1:6SG95UA2DQfeDnfUPMdvaQW0Q7yPrPDi9nlGo2tz2b4= golang.org/x/crypto v0.0.0-20190308221718-c2843e01d9a2/go.mod h1:djNgcEr1/C05ACkg1iLfiJU5Ep61QUkGW8qpdssI0+w= golang.org/x/crypto v0.0.0-20190923035154-9ee001bba392/go.mod h1:/lpIB1dKB+9EgE3H3cr1v9wB50oz8l4C4h62xy7jSTY= diff --git a/receiver/sapmreceiver/trace_receiver.go b/receiver/sapmreceiver/trace_receiver.go index 58c3e5f5ec05..b14514e796bc 100644 --- a/receiver/sapmreceiver/trace_receiver.go +++ b/receiver/sapmreceiver/trace_receiver.go @@ -212,14 +212,14 @@ func newReceiver( defaultResponse := &splunksapm.PostSpansResponse{} defaultResponseBytes, err := defaultResponse.Marshal() if err != nil { - return nil, fmt.Errorf("failed to marshal default response body for %v receiver: %w", config.ID(), err) + return nil, fmt.Errorf("failed to marshal default response body for %v receiver: %w", params.ID, err) } transport := "http" if config.TLSSetting != nil { transport = "https" } obsrecv, err := obsreport.NewReceiver(obsreport.ReceiverSettings{ - ReceiverID: config.ID(), + ReceiverID: params.ID, Transport: transport, ReceiverCreateSettings: params, }) diff --git a/receiver/signalfxreceiver/go.mod b/receiver/signalfxreceiver/go.mod index 6378d34cca09..1fce6bc1b2c6 100644 --- a/receiver/signalfxreceiver/go.mod +++ b/receiver/signalfxreceiver/go.mod @@ -11,12 +11,13 @@ require ( github.com/signalfx/com_signalfx_metrics_protobuf v0.0.3 github.com/stretchr/testify v1.8.1 go.opencensus.io v0.24.0 - go.opentelemetry.io/collector v0.66.1-0.20221128222955-4ff1ff379b90 - go.opentelemetry.io/collector/component v0.66.1-0.20221128222955-4ff1ff379b90 - go.opentelemetry.io/collector/consumer v0.66.1-0.20221128222955-4ff1ff379b90 - go.opentelemetry.io/collector/pdata v0.66.1-0.20221128222955-4ff1ff379b90 - go.opentelemetry.io/collector/semconv v0.66.1-0.20221128222955-4ff1ff379b90 - go.uber.org/zap v1.23.0 + go.opentelemetry.io/collector v0.66.1-0.20221202005155-1c54042beb70 + go.opentelemetry.io/collector/component v0.66.1-0.20221202005155-1c54042beb70 + go.opentelemetry.io/collector/confmap v0.0.0-20221201172708-2bdff61fa52a + go.opentelemetry.io/collector/consumer v0.66.1-0.20221202005155-1c54042beb70 + go.opentelemetry.io/collector/pdata v0.66.1-0.20221202005155-1c54042beb70 + go.opentelemetry.io/collector/semconv v0.66.1-0.20221202005155-1c54042beb70 + go.uber.org/zap v1.24.0 ) require ( @@ -57,12 +58,12 @@ require ( github.com/signalfx/golib/v3 v3.3.46 // indirect github.com/signalfx/sapm-proto v0.12.0 // indirect github.com/signalfx/signalfx-agent/pkg/apm v0.0.0-20220920175102-539ae8d8ba8e // indirect - github.com/tklauser/go-sysconf v0.3.10 // indirect - github.com/tklauser/numcpus v0.4.0 // indirect + github.com/tklauser/go-sysconf v0.3.11 // indirect + github.com/tklauser/numcpus v0.6.0 // indirect github.com/uber/jaeger-client-go v2.30.0+incompatible // indirect github.com/uber/jaeger-lib v2.4.1+incompatible // indirect github.com/yusufpapurcu/wmi v1.2.2 // indirect - go.opentelemetry.io/collector/featuregate v0.66.1-0.20221128222955-4ff1ff379b90 // indirect + go.opentelemetry.io/collector/featuregate v0.66.1-0.20221202005155-1c54042beb70 // indirect go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.36.4 // indirect go.opentelemetry.io/otel v1.11.1 // indirect go.opentelemetry.io/otel/metric v0.33.0 // indirect diff --git a/receiver/signalfxreceiver/go.sum b/receiver/signalfxreceiver/go.sum index be7ad9ea7e04..58cdc8bdec20 100644 --- a/receiver/signalfxreceiver/go.sum +++ b/receiver/signalfxreceiver/go.sum @@ -1142,10 +1142,12 @@ github.com/tdakkota/asciicheck v0.0.0-20200416200610-e657995f937b/go.mod h1:yHp0 github.com/tetafro/godot v1.4.4/go.mod h1:FVDd4JuKliW3UgjswZfJfHq4vAx0bD/Jd5brJjGeaz4= github.com/tidwall/pretty v1.0.0/go.mod h1:XNkn88O1ChpSDQmQeStsy+sBenx6DDtFZJxhVysOjyk= github.com/timakin/bodyclose v0.0.0-20200424151742-cb6215831a94/go.mod h1:Qimiffbc6q9tBWlVV6x0P9sat/ao1xEkREYPPj9hphk= -github.com/tklauser/go-sysconf v0.3.10 h1:IJ1AZGZRWbY8T5Vfk04D9WOA5WSejdflXxP03OUqALw= github.com/tklauser/go-sysconf v0.3.10/go.mod h1:C8XykCvCb+Gn0oNCWPIlcb0RuglQTYaQ2hGm7jmxEFk= -github.com/tklauser/numcpus v0.4.0 h1:E53Dm1HjH1/R2/aoCtXtPgzmElmn51aOkhCFSuZq//o= +github.com/tklauser/go-sysconf v0.3.11 h1:89WgdJhk5SNwJfu+GKyYveZ4IaJ7xAkecBo+KdJV0CM= +github.com/tklauser/go-sysconf v0.3.11/go.mod h1:GqXfhXY3kiPa0nAXPDIQIWzJbMCB7AmcWpGR8lSZfqI= github.com/tklauser/numcpus v0.4.0/go.mod h1:1+UI3pD8NW14VMwdgJNJ1ESk2UnwhAnz5hMwiKKqXCQ= +github.com/tklauser/numcpus v0.6.0 h1:kebhY2Qt+3U6RNK7UqpYNA+tJ23IBEGKkB7JQBfDYms= +github.com/tklauser/numcpus v0.6.0/go.mod h1:FEZLMke0lhOUG6w2JadTzp0a+Nl8PF/GFkQ5UVIcaL4= github.com/tmc/grpc-websocket-proxy v0.0.0-20170815181823-89b8d40f7ca8/go.mod h1:ncp9v5uamzpCO7NfCPTXjqaC+bZgJeR0sMTm6dMHP7U= github.com/tmc/grpc-websocket-proxy v0.0.0-20190109142713-0ad062ec5ee5/go.mod h1:ncp9v5uamzpCO7NfCPTXjqaC+bZgJeR0sMTm6dMHP7U= github.com/tomarrell/wrapcheck v0.0.0-20201130113247-1683564d9756/go.mod h1:yiFB6fFoV7saXirUGfuK+cPtUh4NX/Hf5y2WC2lehu0= @@ -1231,18 +1233,24 @@ go.opentelemetry.io/collector v0.52.0/go.mod h1:a9GvaOhyc0nVOUzqvdv5mxyWghCSso/W go.opentelemetry.io/collector v0.54.0/go.mod h1:FgNzyfb4sAGb5cqusB5znETJ8Pz4OQUBGbOeGIZ2rlQ= go.opentelemetry.io/collector v0.57.2/go.mod h1:9TwWyMRhbFNzaaGLtm/6poWNDJw+etvQMS6Fy+8/8Xs= go.opentelemetry.io/collector v0.65.0/go.mod h1:hE6jCs+0rfiufCrVPucKZTMwfHit1okfDPnwPT2eW1I= -go.opentelemetry.io/collector v0.66.1-0.20221128222955-4ff1ff379b90 h1:yRe05/jMdzH4TFHfndZ5h2o2hKBK/79W72j8w51qNsI= -go.opentelemetry.io/collector v0.66.1-0.20221128222955-4ff1ff379b90/go.mod h1:hE6jCs+0rfiufCrVPucKZTMwfHit1okfDPnwPT2eW1I= +go.opentelemetry.io/collector v0.66.1-0.20221202005155-1c54042beb70 h1:INB2CsOtqqrija2KvMuIpbBQ3qX1BECEeR+d0NJX+oM= +go.opentelemetry.io/collector v0.66.1-0.20221202005155-1c54042beb70/go.mod h1:d0NHkHyANJy3HDTvYE/PoylMShUmFIbiir89ieI0X0c= go.opentelemetry.io/collector/component v0.65.0/go.mod h1:0c84EqXUhvYe6KW7hJfh76tiI/5yjWCH2amwyQ06XLM= -go.opentelemetry.io/collector/component v0.66.1-0.20221128222955-4ff1ff379b90 h1:AYSNTXbezhNg43EuYdVVcgxE/2gBVrm00FDx4DOmQVg= -go.opentelemetry.io/collector/component v0.66.1-0.20221128222955-4ff1ff379b90/go.mod h1:0c84EqXUhvYe6KW7hJfh76tiI/5yjWCH2amwyQ06XLM= +go.opentelemetry.io/collector/component v0.66.0/go.mod h1:0c84EqXUhvYe6KW7hJfh76tiI/5yjWCH2amwyQ06XLM= +go.opentelemetry.io/collector/component v0.66.1-0.20221202005155-1c54042beb70 h1:dEoJhzCmRShgmVro/kXm6pouGElgxkH2DsvanzCeZtU= +go.opentelemetry.io/collector/component v0.66.1-0.20221202005155-1c54042beb70/go.mod h1:OsVnvFFe38QSpcuZlQ8cvarDzcloCexgQ1/B2m80F6U= +go.opentelemetry.io/collector/confmap v0.0.0-20221201172708-2bdff61fa52a h1:2TscCXAQASO2kU9xHcMIUM/FP29fiQIRTilZmliq/7I= +go.opentelemetry.io/collector/confmap v0.0.0-20221201172708-2bdff61fa52a/go.mod h1:qJ3e8bA8h4wz/jYlbeEUafVHdrU7DkpStnmIUAz6VTQ= go.opentelemetry.io/collector/consumer v0.65.0/go.mod h1:WtoRZa5SnxQO1ZEQdVxYpFcXCmq62rakv0oUSlPO0NQ= -go.opentelemetry.io/collector/consumer v0.66.1-0.20221128222955-4ff1ff379b90 h1:nzNXVfC1FzXBXCLMzbMv+qK3E4EGiNsnMhfVsBd2yzc= -go.opentelemetry.io/collector/consumer v0.66.1-0.20221128222955-4ff1ff379b90/go.mod h1:WtoRZa5SnxQO1ZEQdVxYpFcXCmq62rakv0oUSlPO0NQ= +go.opentelemetry.io/collector/consumer v0.66.0/go.mod h1:WtoRZa5SnxQO1ZEQdVxYpFcXCmq62rakv0oUSlPO0NQ= +go.opentelemetry.io/collector/consumer v0.66.1-0.20221202005155-1c54042beb70 h1:XwpVjI1KeKGPXOZBLefGILMziPYuNf6IzbmiIEsIyI0= +go.opentelemetry.io/collector/consumer v0.66.1-0.20221202005155-1c54042beb70/go.mod h1:EWVBcSGcIcmeDGTnIboc/aqa3agsBeH8/q7yFWG7xVc= go.opentelemetry.io/collector/extension/zpagesextension v0.65.0/go.mod h1:+IPas7AeffG0GMIXhZr8IzpTNhH1Ri/6S/9YFqbLsmQ= +go.opentelemetry.io/collector/extension/zpagesextension v0.66.0/go.mod h1:+IPas7AeffG0GMIXhZr8IzpTNhH1Ri/6S/9YFqbLsmQ= go.opentelemetry.io/collector/featuregate v0.65.0/go.mod h1:tewuFKJYalWBU0bmNKg++MC1ipINXUr6szYzOw2p1GI= -go.opentelemetry.io/collector/featuregate v0.66.1-0.20221128222955-4ff1ff379b90 h1:UuJSFWbi9XxyNZsJKZuvpWg35BgRbcCGFH+38V2MAdw= -go.opentelemetry.io/collector/featuregate v0.66.1-0.20221128222955-4ff1ff379b90/go.mod h1:tewuFKJYalWBU0bmNKg++MC1ipINXUr6szYzOw2p1GI= +go.opentelemetry.io/collector/featuregate v0.66.0/go.mod h1:tewuFKJYalWBU0bmNKg++MC1ipINXUr6szYzOw2p1GI= +go.opentelemetry.io/collector/featuregate v0.66.1-0.20221202005155-1c54042beb70 h1:V0tf4ebciqIs07jFATfLGdUpLRaEsi+AiWuA/in0G8Y= +go.opentelemetry.io/collector/featuregate v0.66.1-0.20221202005155-1c54042beb70/go.mod h1:tewuFKJYalWBU0bmNKg++MC1ipINXUr6szYzOw2p1GI= go.opentelemetry.io/collector/model v0.49.0/go.mod h1:nOYQv9KoFPs6ihJwOi24qB209EOhS9HkwhGj54YiEAw= go.opentelemetry.io/collector/pdata v0.49.0/go.mod h1:YwmKuiFhNgtmhRdpi8Q8FAWPa0AwJTCSlssSsAtuRcY= go.opentelemetry.io/collector/pdata v0.52.0/go.mod h1:GJUTfTv8mlYpHRjcmHXVbvJr48EW/q/P/HuBvpXAE58= @@ -1250,16 +1258,19 @@ 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.65.0/go.mod h1:pqyaznLzk21m+1KL6fwOsRryRELL+zNM0qiVSn0MbVc= -go.opentelemetry.io/collector/pdata v0.66.1-0.20221128222955-4ff1ff379b90 h1:Vu4S4jSNcd0VFPzxQNO4+UqGwnes1xJDoFLPRiWHm8I= -go.opentelemetry.io/collector/pdata v0.66.1-0.20221128222955-4ff1ff379b90/go.mod h1:pqyaznLzk21m+1KL6fwOsRryRELL+zNM0qiVSn0MbVc= +go.opentelemetry.io/collector/pdata v0.66.0/go.mod h1:pqyaznLzk21m+1KL6fwOsRryRELL+zNM0qiVSn0MbVc= +go.opentelemetry.io/collector/pdata v0.66.1-0.20221202005155-1c54042beb70 h1:TPOrxkEMvZzfBSwF3ct+kUUgKA5g8unkZZbKQvJweeA= +go.opentelemetry.io/collector/pdata v0.66.1-0.20221202005155-1c54042beb70/go.mod h1:pqyaznLzk21m+1KL6fwOsRryRELL+zNM0qiVSn0MbVc= go.opentelemetry.io/collector/processor/batchprocessor v0.65.0/go.mod h1:XhGTsC1B/bq4gpg8IZ/QYBLXkzE4Gw3r7Xu2+ik8A1Q= +go.opentelemetry.io/collector/processor/batchprocessor v0.66.0/go.mod h1:XhGTsC1B/bq4gpg8IZ/QYBLXkzE4Gw3r7Xu2+ik8A1Q= 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.65.0/go.mod h1:5o9yhOa+ABt7g2E5JABDxGZ1PQPbtfxrKNbYn+LOTXU= -go.opentelemetry.io/collector/semconv v0.66.1-0.20221128222955-4ff1ff379b90 h1:hFaTA68cggZKWMv7wQ3bKP8KGTbowh/5AQZKCHzHTqM= -go.opentelemetry.io/collector/semconv v0.66.1-0.20221128222955-4ff1ff379b90/go.mod h1:5o9yhOa+ABt7g2E5JABDxGZ1PQPbtfxrKNbYn+LOTXU= +go.opentelemetry.io/collector/semconv v0.66.0/go.mod h1:5o9yhOa+ABt7g2E5JABDxGZ1PQPbtfxrKNbYn+LOTXU= +go.opentelemetry.io/collector/semconv v0.66.1-0.20221202005155-1c54042beb70 h1:Q5L9Urod3c8as6ZYaoaqBjarx/HXxsxy34DFZIU2fO4= +go.opentelemetry.io/collector/semconv v0.66.1-0.20221202005155-1c54042beb70/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= @@ -1326,8 +1337,9 @@ go.uber.org/zap v1.17.0/go.mod h1:MXVU+bhUf/A7Xi2HNOnopQOrmycQ5Ih87HtOu4q5SSo= go.uber.org/zap v1.19.1/go.mod h1:j3DNczoxDZroyBnOT1L/Q79cfUMGZxlv/9dzN7SM1rI= go.uber.org/zap v1.21.0/go.mod h1:wjWOCqI0f2ZZrJF/UufIOkiC8ii6tm1iqIsLo76RfJw= go.uber.org/zap v1.22.0/go.mod h1:H4siCOZOrAolnUPJEkfaSjDqyP+BDS0DdDWzwcgt3+U= -go.uber.org/zap v1.23.0 h1:OjGQ5KQDEUawVHxNwQgPpiypGHOxo2mNZsOqTak4fFY= go.uber.org/zap v1.23.0/go.mod h1:D+nX8jyLsMHMYrln8A0rJjFt/T/9/bGgIhAqxv5URuY= +go.uber.org/zap v1.24.0 h1:FiJd5l1UOLj0wCgbSE0rwwXHzEdAZS6hiiSnxJN/D60= +go.uber.org/zap v1.24.0/go.mod h1:2kMP+WWQ8aoFoedH3T2sq6iJ2yDWpHbP0f6MQbS9Gkg= golang.org/x/crypto v0.0.0-20180904163835-0709b304e793/go.mod h1:6SG95UA2DQfeDnfUPMdvaQW0Q7yPrPDi9nlGo2tz2b4= golang.org/x/crypto v0.0.0-20181029021203-45a5f77698d3/go.mod h1:6SG95UA2DQfeDnfUPMdvaQW0Q7yPrPDi9nlGo2tz2b4= golang.org/x/crypto v0.0.0-20181203042331-505ab145d0a9/go.mod h1:6SG95UA2DQfeDnfUPMdvaQW0Q7yPrPDi9nlGo2tz2b4= diff --git a/receiver/signalfxreceiver/receiver.go b/receiver/signalfxreceiver/receiver.go index 05cce6a3cd41..9e12e8106c97 100644 --- a/receiver/signalfxreceiver/receiver.go +++ b/receiver/signalfxreceiver/receiver.go @@ -101,7 +101,7 @@ func newReceiver( transport = "https" } obsrecv, err := obsreport.NewReceiver(obsreport.ReceiverSettings{ - ReceiverID: config.ID(), + ReceiverID: settings.ID, Transport: transport, ReceiverCreateSettings: settings, }) @@ -330,7 +330,7 @@ func (r *sfxReceiver) failRequest( r.settings.Logger.Warn( "Error writing HTTP response message", zap.Error(writeErr), - zap.String("receiver", r.config.ID().String())) + zap.String("receiver", r.settings.ID.String())) } } diff --git a/receiver/simpleprometheusreceiver/go.mod b/receiver/simpleprometheusreceiver/go.mod index 49826f37e1a8..5a287cf696f7 100644 --- a/receiver/simpleprometheusreceiver/go.mod +++ b/receiver/simpleprometheusreceiver/go.mod @@ -7,9 +7,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.66.1-0.20221128222955-4ff1ff379b90 - go.opentelemetry.io/collector/component v0.66.1-0.20221128222955-4ff1ff379b90 - go.opentelemetry.io/collector/consumer v0.66.1-0.20221128222955-4ff1ff379b90 + go.opentelemetry.io/collector v0.66.1-0.20221202005155-1c54042beb70 + go.opentelemetry.io/collector/component v0.66.1-0.20221202005155-1c54042beb70 + go.opentelemetry.io/collector/confmap v0.0.0-20221201172708-2bdff61fa52a + go.opentelemetry.io/collector/consumer v0.66.1-0.20221202005155-1c54042beb70 k8s.io/client-go v0.25.4 ) @@ -121,9 +122,9 @@ require ( github.com/spf13/pflag v1.0.5 // indirect github.com/vultr/govultr/v2 v2.17.2 // indirect go.opencensus.io v0.24.0 // indirect - go.opentelemetry.io/collector/featuregate v0.66.1-0.20221128222955-4ff1ff379b90 // indirect - go.opentelemetry.io/collector/pdata v0.66.1-0.20221128222955-4ff1ff379b90 // indirect - go.opentelemetry.io/collector/semconv v0.66.1-0.20221128222955-4ff1ff379b90 // indirect + go.opentelemetry.io/collector/featuregate v0.66.1-0.20221202005155-1c54042beb70 // indirect + go.opentelemetry.io/collector/pdata v0.66.1-0.20221202005155-1c54042beb70 // indirect + go.opentelemetry.io/collector/semconv v0.66.1-0.20221202005155-1c54042beb70 // 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 @@ -131,7 +132,7 @@ require ( go.uber.org/atomic v1.10.0 // indirect go.uber.org/goleak v1.2.0 // indirect go.uber.org/multierr v1.8.0 // indirect - go.uber.org/zap v1.23.0 // indirect + go.uber.org/zap v1.24.0 // indirect golang.org/x/crypto v0.1.0 // indirect golang.org/x/mod v0.6.0 // indirect golang.org/x/net v0.1.0 // indirect diff --git a/receiver/simpleprometheusreceiver/go.sum b/receiver/simpleprometheusreceiver/go.sum index 67c42f254291..4ca9093426bb 100644 --- a/receiver/simpleprometheusreceiver/go.sum +++ b/receiver/simpleprometheusreceiver/go.sum @@ -600,8 +600,8 @@ github.com/tidwall/match v1.1.1 h1:+Ho715JplO36QYgwN9PGYNhgZvoUSc9X2c80KVTi+GA= github.com/tidwall/pretty v1.2.0 h1:RWIZEg2iJ8/g6fDDYzMpobmaoGh5OLl4AXtGUGPcqCs= github.com/tidwall/tinylru v1.1.0 h1:XY6IUfzVTU9rpwdhKUF6nQdChgCdGjkMfLzbWyiau6I= github.com/tidwall/wal v1.1.7 h1:emc1TRjIVsdKKSnpwGBAcsAGg0767SvUk8+ygx7Bb+4= -github.com/tklauser/go-sysconf v0.3.10 h1:IJ1AZGZRWbY8T5Vfk04D9WOA5WSejdflXxP03OUqALw= -github.com/tklauser/numcpus v0.4.0 h1:E53Dm1HjH1/R2/aoCtXtPgzmElmn51aOkhCFSuZq//o= +github.com/tklauser/go-sysconf v0.3.11 h1:89WgdJhk5SNwJfu+GKyYveZ4IaJ7xAkecBo+KdJV0CM= +github.com/tklauser/numcpus v0.6.0 h1:kebhY2Qt+3U6RNK7UqpYNA+tJ23IBEGKkB7JQBfDYms= github.com/tv42/httpunix v0.0.0-20150427012821-b75d8614f926/go.mod h1:9ESjWnEqriFuLhtthL60Sar/7RFoluCcXsuvEwTV5KM= github.com/vultr/govultr/v2 v2.17.2 h1:gej/rwr91Puc/tgh+j33p/BLR16UrIPnSr+AIwYWZQs= github.com/vultr/govultr/v2 v2.17.2/go.mod h1:ZFOKGWmgjytfyjeyAdhQlSWwTjh2ig+X49cAp50dzXI= @@ -622,19 +622,21 @@ go.opencensus.io v0.22.3/go.mod h1:yxeiOL68Rb0Xd1ddK5vPZ/oVn4vY4Ynel7k9FzqtOIw= go.opencensus.io v0.22.4/go.mod h1:yxeiOL68Rb0Xd1ddK5vPZ/oVn4vY4Ynel7k9FzqtOIw= go.opencensus.io v0.24.0 h1:y73uSU6J157QMP2kn2r30vwW1A2W2WFwSCGnAVxeaD0= go.opencensus.io v0.24.0/go.mod h1:vNK8G9p7aAivkbmorf4v+7Hgx+Zs0yY+0fOtgBfjQKo= -go.opentelemetry.io/collector v0.66.1-0.20221128222955-4ff1ff379b90 h1:yRe05/jMdzH4TFHfndZ5h2o2hKBK/79W72j8w51qNsI= -go.opentelemetry.io/collector v0.66.1-0.20221128222955-4ff1ff379b90/go.mod h1:hE6jCs+0rfiufCrVPucKZTMwfHit1okfDPnwPT2eW1I= -go.opentelemetry.io/collector/component v0.66.1-0.20221128222955-4ff1ff379b90 h1:AYSNTXbezhNg43EuYdVVcgxE/2gBVrm00FDx4DOmQVg= -go.opentelemetry.io/collector/component v0.66.1-0.20221128222955-4ff1ff379b90/go.mod h1:0c84EqXUhvYe6KW7hJfh76tiI/5yjWCH2amwyQ06XLM= -go.opentelemetry.io/collector/consumer v0.66.1-0.20221128222955-4ff1ff379b90 h1:nzNXVfC1FzXBXCLMzbMv+qK3E4EGiNsnMhfVsBd2yzc= -go.opentelemetry.io/collector/consumer v0.66.1-0.20221128222955-4ff1ff379b90/go.mod h1:WtoRZa5SnxQO1ZEQdVxYpFcXCmq62rakv0oUSlPO0NQ= -go.opentelemetry.io/collector/featuregate v0.66.1-0.20221128222955-4ff1ff379b90 h1:UuJSFWbi9XxyNZsJKZuvpWg35BgRbcCGFH+38V2MAdw= -go.opentelemetry.io/collector/featuregate v0.66.1-0.20221128222955-4ff1ff379b90/go.mod h1:tewuFKJYalWBU0bmNKg++MC1ipINXUr6szYzOw2p1GI= -go.opentelemetry.io/collector/pdata v0.66.1-0.20221128222955-4ff1ff379b90 h1:Vu4S4jSNcd0VFPzxQNO4+UqGwnes1xJDoFLPRiWHm8I= -go.opentelemetry.io/collector/pdata v0.66.1-0.20221128222955-4ff1ff379b90/go.mod h1:pqyaznLzk21m+1KL6fwOsRryRELL+zNM0qiVSn0MbVc= -go.opentelemetry.io/collector/processor/batchprocessor v0.66.1-0.20221128222955-4ff1ff379b90 h1:K12L9juzjChBMfp7cQaQsToz7i7975tUYVzJ3Tpw/Cw= -go.opentelemetry.io/collector/semconv v0.66.1-0.20221128222955-4ff1ff379b90 h1:hFaTA68cggZKWMv7wQ3bKP8KGTbowh/5AQZKCHzHTqM= -go.opentelemetry.io/collector/semconv v0.66.1-0.20221128222955-4ff1ff379b90/go.mod h1:5o9yhOa+ABt7g2E5JABDxGZ1PQPbtfxrKNbYn+LOTXU= +go.opentelemetry.io/collector v0.66.1-0.20221202005155-1c54042beb70 h1:INB2CsOtqqrija2KvMuIpbBQ3qX1BECEeR+d0NJX+oM= +go.opentelemetry.io/collector v0.66.1-0.20221202005155-1c54042beb70/go.mod h1:d0NHkHyANJy3HDTvYE/PoylMShUmFIbiir89ieI0X0c= +go.opentelemetry.io/collector/component v0.66.1-0.20221202005155-1c54042beb70 h1:dEoJhzCmRShgmVro/kXm6pouGElgxkH2DsvanzCeZtU= +go.opentelemetry.io/collector/component v0.66.1-0.20221202005155-1c54042beb70/go.mod h1:OsVnvFFe38QSpcuZlQ8cvarDzcloCexgQ1/B2m80F6U= +go.opentelemetry.io/collector/confmap v0.0.0-20221201172708-2bdff61fa52a h1:2TscCXAQASO2kU9xHcMIUM/FP29fiQIRTilZmliq/7I= +go.opentelemetry.io/collector/confmap v0.0.0-20221201172708-2bdff61fa52a/go.mod h1:qJ3e8bA8h4wz/jYlbeEUafVHdrU7DkpStnmIUAz6VTQ= +go.opentelemetry.io/collector/consumer v0.66.1-0.20221202005155-1c54042beb70 h1:XwpVjI1KeKGPXOZBLefGILMziPYuNf6IzbmiIEsIyI0= +go.opentelemetry.io/collector/consumer v0.66.1-0.20221202005155-1c54042beb70/go.mod h1:EWVBcSGcIcmeDGTnIboc/aqa3agsBeH8/q7yFWG7xVc= +go.opentelemetry.io/collector/featuregate v0.66.1-0.20221202005155-1c54042beb70 h1:V0tf4ebciqIs07jFATfLGdUpLRaEsi+AiWuA/in0G8Y= +go.opentelemetry.io/collector/featuregate v0.66.1-0.20221202005155-1c54042beb70/go.mod h1:tewuFKJYalWBU0bmNKg++MC1ipINXUr6szYzOw2p1GI= +go.opentelemetry.io/collector/pdata v0.66.1-0.20221202005155-1c54042beb70 h1:TPOrxkEMvZzfBSwF3ct+kUUgKA5g8unkZZbKQvJweeA= +go.opentelemetry.io/collector/pdata v0.66.1-0.20221202005155-1c54042beb70/go.mod h1:pqyaznLzk21m+1KL6fwOsRryRELL+zNM0qiVSn0MbVc= +go.opentelemetry.io/collector/processor/batchprocessor v0.66.1-0.20221202005155-1c54042beb70 h1:Y4e8NnVevonnAgmjX9Z7QIMA32yMqHAOnAlh8SzTS8c= +go.opentelemetry.io/collector/semconv v0.66.1-0.20221202005155-1c54042beb70 h1:Q5L9Urod3c8as6ZYaoaqBjarx/HXxsxy34DFZIU2fO4= +go.opentelemetry.io/collector/semconv v0.66.1-0.20221202005155-1c54042beb70/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= @@ -658,8 +660,8 @@ go.uber.org/multierr v1.6.0/go.mod h1:cdWPpRnG4AhwMwsgIHip0KRBQjJy5kYEpYjJxpXp9i go.uber.org/multierr v1.8.0 h1:dg6GjLku4EH+249NNmoIciG9N/jURbDG+pFlTkhzIC8= go.uber.org/multierr v1.8.0/go.mod h1:7EAYxJLBy9rStEaz58O2t4Uvip6FSURkq8/ppBp95ak= go.uber.org/zap v1.17.0/go.mod h1:MXVU+bhUf/A7Xi2HNOnopQOrmycQ5Ih87HtOu4q5SSo= -go.uber.org/zap v1.23.0 h1:OjGQ5KQDEUawVHxNwQgPpiypGHOxo2mNZsOqTak4fFY= -go.uber.org/zap v1.23.0/go.mod h1:D+nX8jyLsMHMYrln8A0rJjFt/T/9/bGgIhAqxv5URuY= +go.uber.org/zap v1.24.0 h1:FiJd5l1UOLj0wCgbSE0rwwXHzEdAZS6hiiSnxJN/D60= +go.uber.org/zap v1.24.0/go.mod h1:2kMP+WWQ8aoFoedH3T2sq6iJ2yDWpHbP0f6MQbS9Gkg= golang.org/x/crypto v0.0.0-20180904163835-0709b304e793/go.mod h1:6SG95UA2DQfeDnfUPMdvaQW0Q7yPrPDi9nlGo2tz2b4= golang.org/x/crypto v0.0.0-20190308221718-c2843e01d9a2/go.mod h1:djNgcEr1/C05ACkg1iLfiJU5Ep61QUkGW8qpdssI0+w= golang.org/x/crypto v0.0.0-20190510104115-cbcb75029529/go.mod h1:yigFU9vqHzYiE8UmvKecakEJjdnWj3jj499lnFckfCI= diff --git a/receiver/skywalkingreceiver/factory.go b/receiver/skywalkingreceiver/factory.go index 2cd371205033..68e021752d3b 100644 --- a/receiver/skywalkingreceiver/factory.go +++ b/receiver/skywalkingreceiver/factory.go @@ -99,7 +99,7 @@ func createTracesReceiver( } // Create the receiver. - return newSkywalkingReceiver(rCfg.ID(), &c, nextConsumer, set) + return newSkywalkingReceiver(&c, nextConsumer, set) } // extract the port number from string in "address:port" format. If the diff --git a/receiver/skywalkingreceiver/go.mod b/receiver/skywalkingreceiver/go.mod index e47e01fb59d0..127237a75c05 100644 --- a/receiver/skywalkingreceiver/go.mod +++ b/receiver/skywalkingreceiver/go.mod @@ -6,11 +6,12 @@ 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.66.1-0.20221128222955-4ff1ff379b90 - go.opentelemetry.io/collector/component v0.66.1-0.20221128222955-4ff1ff379b90 - go.opentelemetry.io/collector/consumer v0.66.1-0.20221128222955-4ff1ff379b90 - go.opentelemetry.io/collector/pdata v0.66.1-0.20221128222955-4ff1ff379b90 - go.opentelemetry.io/collector/semconv v0.66.1-0.20221128222955-4ff1ff379b90 + go.opentelemetry.io/collector v0.66.1-0.20221202005155-1c54042beb70 + go.opentelemetry.io/collector/component v0.66.1-0.20221202005155-1c54042beb70 + go.opentelemetry.io/collector/confmap v0.0.0-20221201172708-2bdff61fa52a + go.opentelemetry.io/collector/consumer v0.66.1-0.20221202005155-1c54042beb70 + go.opentelemetry.io/collector/pdata v0.66.1-0.20221202005155-1c54042beb70 + go.opentelemetry.io/collector/semconv v0.66.1-0.20221202005155-1c54042beb70 go.uber.org/multierr v1.8.0 google.golang.org/grpc v1.51.0 google.golang.org/protobuf v1.28.1 @@ -40,14 +41,14 @@ require ( github.com/pmezard/go-difflib v1.0.0 // indirect github.com/rs/cors v1.8.2 // indirect go.opencensus.io v0.24.0 // indirect - go.opentelemetry.io/collector/featuregate v0.66.1-0.20221128222955-4ff1ff379b90 // indirect + go.opentelemetry.io/collector/featuregate v0.66.1-0.20221202005155-1c54042beb70 // 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 go.opentelemetry.io/otel/metric v0.33.0 // indirect go.opentelemetry.io/otel/trace v1.11.1 // indirect go.uber.org/atomic v1.10.0 // indirect - go.uber.org/zap v1.23.0 // indirect + go.uber.org/zap v1.24.0 // indirect golang.org/x/net v0.0.0-20220722155237-a158d28d115b // indirect golang.org/x/oauth2 v0.0.0-20211104180415-d3ed0bb246c8 // indirect golang.org/x/sys v0.2.0 // indirect diff --git a/receiver/skywalkingreceiver/go.sum b/receiver/skywalkingreceiver/go.sum index 34b7c1f348ab..12c376938b81 100644 --- a/receiver/skywalkingreceiver/go.sum +++ b/receiver/skywalkingreceiver/go.sum @@ -418,18 +418,20 @@ go.opencensus.io v0.22.5/go.mod h1:5pWMHQbX5EPX2/62yrJeAkowc+lfs/XD7Uxpq3pI6kk= go.opencensus.io v0.23.0/go.mod h1:XItmlyltB5F7CS4xOC1DcqMoFqwtC6OG2xF7mCv7P7E= go.opencensus.io v0.24.0 h1:y73uSU6J157QMP2kn2r30vwW1A2W2WFwSCGnAVxeaD0= go.opencensus.io v0.24.0/go.mod h1:vNK8G9p7aAivkbmorf4v+7Hgx+Zs0yY+0fOtgBfjQKo= -go.opentelemetry.io/collector v0.66.1-0.20221128222955-4ff1ff379b90 h1:yRe05/jMdzH4TFHfndZ5h2o2hKBK/79W72j8w51qNsI= -go.opentelemetry.io/collector v0.66.1-0.20221128222955-4ff1ff379b90/go.mod h1:hE6jCs+0rfiufCrVPucKZTMwfHit1okfDPnwPT2eW1I= -go.opentelemetry.io/collector/component v0.66.1-0.20221128222955-4ff1ff379b90 h1:AYSNTXbezhNg43EuYdVVcgxE/2gBVrm00FDx4DOmQVg= -go.opentelemetry.io/collector/component v0.66.1-0.20221128222955-4ff1ff379b90/go.mod h1:0c84EqXUhvYe6KW7hJfh76tiI/5yjWCH2amwyQ06XLM= -go.opentelemetry.io/collector/consumer v0.66.1-0.20221128222955-4ff1ff379b90 h1:nzNXVfC1FzXBXCLMzbMv+qK3E4EGiNsnMhfVsBd2yzc= -go.opentelemetry.io/collector/consumer v0.66.1-0.20221128222955-4ff1ff379b90/go.mod h1:WtoRZa5SnxQO1ZEQdVxYpFcXCmq62rakv0oUSlPO0NQ= -go.opentelemetry.io/collector/featuregate v0.66.1-0.20221128222955-4ff1ff379b90 h1:UuJSFWbi9XxyNZsJKZuvpWg35BgRbcCGFH+38V2MAdw= -go.opentelemetry.io/collector/featuregate v0.66.1-0.20221128222955-4ff1ff379b90/go.mod h1:tewuFKJYalWBU0bmNKg++MC1ipINXUr6szYzOw2p1GI= -go.opentelemetry.io/collector/pdata v0.66.1-0.20221128222955-4ff1ff379b90 h1:Vu4S4jSNcd0VFPzxQNO4+UqGwnes1xJDoFLPRiWHm8I= -go.opentelemetry.io/collector/pdata v0.66.1-0.20221128222955-4ff1ff379b90/go.mod h1:pqyaznLzk21m+1KL6fwOsRryRELL+zNM0qiVSn0MbVc= -go.opentelemetry.io/collector/semconv v0.66.1-0.20221128222955-4ff1ff379b90 h1:hFaTA68cggZKWMv7wQ3bKP8KGTbowh/5AQZKCHzHTqM= -go.opentelemetry.io/collector/semconv v0.66.1-0.20221128222955-4ff1ff379b90/go.mod h1:5o9yhOa+ABt7g2E5JABDxGZ1PQPbtfxrKNbYn+LOTXU= +go.opentelemetry.io/collector v0.66.1-0.20221202005155-1c54042beb70 h1:INB2CsOtqqrija2KvMuIpbBQ3qX1BECEeR+d0NJX+oM= +go.opentelemetry.io/collector v0.66.1-0.20221202005155-1c54042beb70/go.mod h1:d0NHkHyANJy3HDTvYE/PoylMShUmFIbiir89ieI0X0c= +go.opentelemetry.io/collector/component v0.66.1-0.20221202005155-1c54042beb70 h1:dEoJhzCmRShgmVro/kXm6pouGElgxkH2DsvanzCeZtU= +go.opentelemetry.io/collector/component v0.66.1-0.20221202005155-1c54042beb70/go.mod h1:OsVnvFFe38QSpcuZlQ8cvarDzcloCexgQ1/B2m80F6U= +go.opentelemetry.io/collector/confmap v0.0.0-20221201172708-2bdff61fa52a h1:2TscCXAQASO2kU9xHcMIUM/FP29fiQIRTilZmliq/7I= +go.opentelemetry.io/collector/confmap v0.0.0-20221201172708-2bdff61fa52a/go.mod h1:qJ3e8bA8h4wz/jYlbeEUafVHdrU7DkpStnmIUAz6VTQ= +go.opentelemetry.io/collector/consumer v0.66.1-0.20221202005155-1c54042beb70 h1:XwpVjI1KeKGPXOZBLefGILMziPYuNf6IzbmiIEsIyI0= +go.opentelemetry.io/collector/consumer v0.66.1-0.20221202005155-1c54042beb70/go.mod h1:EWVBcSGcIcmeDGTnIboc/aqa3agsBeH8/q7yFWG7xVc= +go.opentelemetry.io/collector/featuregate v0.66.1-0.20221202005155-1c54042beb70 h1:V0tf4ebciqIs07jFATfLGdUpLRaEsi+AiWuA/in0G8Y= +go.opentelemetry.io/collector/featuregate v0.66.1-0.20221202005155-1c54042beb70/go.mod h1:tewuFKJYalWBU0bmNKg++MC1ipINXUr6szYzOw2p1GI= +go.opentelemetry.io/collector/pdata v0.66.1-0.20221202005155-1c54042beb70 h1:TPOrxkEMvZzfBSwF3ct+kUUgKA5g8unkZZbKQvJweeA= +go.opentelemetry.io/collector/pdata v0.66.1-0.20221202005155-1c54042beb70/go.mod h1:pqyaznLzk21m+1KL6fwOsRryRELL+zNM0qiVSn0MbVc= +go.opentelemetry.io/collector/semconv v0.66.1-0.20221202005155-1c54042beb70 h1:Q5L9Urod3c8as6ZYaoaqBjarx/HXxsxy34DFZIU2fO4= +go.opentelemetry.io/collector/semconv v0.66.1-0.20221202005155-1c54042beb70/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= @@ -452,8 +454,8 @@ go.uber.org/multierr v1.6.0/go.mod h1:cdWPpRnG4AhwMwsgIHip0KRBQjJy5kYEpYjJxpXp9i go.uber.org/multierr v1.8.0 h1:dg6GjLku4EH+249NNmoIciG9N/jURbDG+pFlTkhzIC8= go.uber.org/multierr v1.8.0/go.mod h1:7EAYxJLBy9rStEaz58O2t4Uvip6FSURkq8/ppBp95ak= go.uber.org/zap v1.17.0/go.mod h1:MXVU+bhUf/A7Xi2HNOnopQOrmycQ5Ih87HtOu4q5SSo= -go.uber.org/zap v1.23.0 h1:OjGQ5KQDEUawVHxNwQgPpiypGHOxo2mNZsOqTak4fFY= -go.uber.org/zap v1.23.0/go.mod h1:D+nX8jyLsMHMYrln8A0rJjFt/T/9/bGgIhAqxv5URuY= +go.uber.org/zap v1.24.0 h1:FiJd5l1UOLj0wCgbSE0rwwXHzEdAZS6hiiSnxJN/D60= +go.uber.org/zap v1.24.0/go.mod h1:2kMP+WWQ8aoFoedH3T2sq6iJ2yDWpHbP0f6MQbS9Gkg= golang.org/x/crypto v0.0.0-20180904163835-0709b304e793/go.mod h1:6SG95UA2DQfeDnfUPMdvaQW0Q7yPrPDi9nlGo2tz2b4= golang.org/x/crypto v0.0.0-20190308221718-c2843e01d9a2/go.mod h1:djNgcEr1/C05ACkg1iLfiJU5Ep61QUkGW8qpdssI0+w= golang.org/x/crypto v0.0.0-20190510104115-cbcb75029529/go.mod h1:yigFU9vqHzYiE8UmvKecakEJjdnWj3jj499lnFckfCI= diff --git a/receiver/skywalkingreceiver/trace_receiver.go b/receiver/skywalkingreceiver/trace_receiver.go index f79c5a025300..6fd93a88e1ae 100644 --- a/receiver/skywalkingreceiver/trace_receiver.go +++ b/receiver/skywalkingreceiver/trace_receiver.go @@ -52,7 +52,6 @@ type configuration struct { // This receiver is basically a Skywalking collector. type swReceiver struct { nextConsumer consumer.Traces - id component.ID config *configuration @@ -77,14 +76,13 @@ const ( // newSkywalkingReceiver creates a TracesReceiver that receives traffic as a Skywalking collector func newSkywalkingReceiver( - id component.ID, config *configuration, nextConsumer consumer.Traces, set component.ReceiverCreateSettings, ) (*swReceiver, error) { grpcObsrecv, err := obsreport.NewReceiver(obsreport.ReceiverSettings{ - ReceiverID: id, + ReceiverID: set.ID, Transport: grpcTransport, ReceiverCreateSettings: set, }) @@ -92,7 +90,7 @@ func newSkywalkingReceiver( return nil, err } httpObsrecv, err := obsreport.NewReceiver(obsreport.ReceiverSettings{ - ReceiverID: id, + ReceiverID: set.ID, Transport: collectorHTTPTransport, ReceiverCreateSettings: set, }) @@ -103,7 +101,6 @@ func newSkywalkingReceiver( return &swReceiver{ config: config, nextConsumer: nextConsumer, - id: id, settings: set, grpcObsrecv: grpcObsrecv, httpObsrecv: httpObsrecv, diff --git a/receiver/skywalkingreceiver/trace_receiver_test.go b/receiver/skywalkingreceiver/trace_receiver_test.go index 33b631dffa7c..f8ef31449dc7 100644 --- a/receiver/skywalkingreceiver/trace_receiver_test.go +++ b/receiver/skywalkingreceiver/trace_receiver_test.go @@ -39,7 +39,8 @@ var ( func TestTraceSource(t *testing.T) { set := componenttest.NewNopReceiverCreateSettings() - jr, err := newSkywalkingReceiver(skywalkingReceiver, &configuration{}, nil, set) + set.ID = skywalkingReceiver + jr, err := newSkywalkingReceiver(&configuration{}, nil, set) require.NoError(t, err) require.NotNil(t, jr) } @@ -55,7 +56,8 @@ func TestStartAndShutdown(t *testing.T) { sink := new(consumertest.TracesSink) set := componenttest.NewNopReceiverCreateSettings() - sr, err := newSkywalkingReceiver(skywalkingReceiver, config, sink, set) + set.ID = skywalkingReceiver + sr, err := newSkywalkingReceiver(config, sink, set) require.NoError(t, err) require.NoError(t, sr.Start(context.Background(), componenttest.NewNopHost())) @@ -71,8 +73,8 @@ func TestGRPCReception(t *testing.T) { sink := new(consumertest.TracesSink) set := componenttest.NewNopReceiverCreateSettings() - - swReceiver, err := newSkywalkingReceiver(skywalkingReceiver, config, sink, set) + set.ID = skywalkingReceiver + swReceiver, err := newSkywalkingReceiver(config, sink, set) require.NoError(t, err) require.NoError(t, swReceiver.Start(context.Background(), componenttest.NewNopHost())) diff --git a/receiver/snmpreceiver/go.mod b/receiver/snmpreceiver/go.mod index 52658ea5ccf5..1f44a80662c9 100644 --- a/receiver/snmpreceiver/go.mod +++ b/receiver/snmpreceiver/go.mod @@ -7,12 +7,13 @@ require ( github.com/open-telemetry/opentelemetry-collector-contrib/internal/scrapertest v0.66.0 github.com/stretchr/testify v1.8.1 github.com/testcontainers/testcontainers-go v0.15.0 - go.opentelemetry.io/collector v0.66.1-0.20221128222955-4ff1ff379b90 - go.opentelemetry.io/collector/component v0.66.1-0.20221128222955-4ff1ff379b90 - go.opentelemetry.io/collector/consumer v0.66.1-0.20221128222955-4ff1ff379b90 - go.opentelemetry.io/collector/pdata v0.66.1-0.20221128222955-4ff1ff379b90 + go.opentelemetry.io/collector v0.66.1-0.20221202005155-1c54042beb70 + go.opentelemetry.io/collector/component v0.66.1-0.20221202005155-1c54042beb70 + go.opentelemetry.io/collector/confmap v0.0.0-20221201172708-2bdff61fa52a + go.opentelemetry.io/collector/consumer v0.66.1-0.20221202005155-1c54042beb70 + go.opentelemetry.io/collector/pdata v0.66.1-0.20221202005155-1c54042beb70 go.uber.org/multierr v1.8.0 - go.uber.org/zap v1.23.0 + go.uber.org/zap v1.24.0 ) require ( @@ -70,13 +71,13 @@ require ( github.com/spf13/cobra v1.6.1 // indirect github.com/spf13/pflag v1.0.5 // indirect github.com/stretchr/objx v0.5.0 // indirect - github.com/tklauser/go-sysconf v0.3.10 // indirect - github.com/tklauser/numcpus v0.4.0 // indirect + github.com/tklauser/go-sysconf v0.3.11 // indirect + github.com/tklauser/numcpus v0.6.0 // indirect github.com/yusufpapurcu/wmi v1.2.2 // indirect go.opencensus.io v0.24.0 // indirect - go.opentelemetry.io/collector/featuregate v0.66.1-0.20221128222955-4ff1ff379b90 // indirect - go.opentelemetry.io/collector/processor/batchprocessor v0.66.1-0.20221128222955-4ff1ff379b90 // indirect - go.opentelemetry.io/collector/semconv v0.66.1-0.20221128222955-4ff1ff379b90 // indirect + go.opentelemetry.io/collector/featuregate v0.66.1-0.20221202005155-1c54042beb70 // indirect + go.opentelemetry.io/collector/processor/batchprocessor v0.66.1-0.20221202005155-1c54042beb70 // indirect + go.opentelemetry.io/collector/semconv v0.66.1-0.20221202005155-1c54042beb70 // indirect go.opentelemetry.io/contrib/propagators/b3 v1.11.1 // indirect go.opentelemetry.io/otel v1.11.1 // indirect go.opentelemetry.io/otel/exporters/prometheus v0.33.0 // indirect diff --git a/receiver/snmpreceiver/go.sum b/receiver/snmpreceiver/go.sum index 67cd48af5b90..650a57d266bb 100644 --- a/receiver/snmpreceiver/go.sum +++ b/receiver/snmpreceiver/go.sum @@ -828,10 +828,12 @@ github.com/syndtr/gocapability v0.0.0-20200815063812-42c35b437635/go.mod h1:hkRG github.com/tchap/go-patricia v2.2.6+incompatible/go.mod h1:bmLyhP68RS6kStMGxByiQ23RP/odRBOTVjwp2cDyi6I= github.com/testcontainers/testcontainers-go v0.15.0 h1:3Ex7PUGFv0b2bBsdOv6R42+SK2qoZnWBd21LvZYhUtQ= github.com/testcontainers/testcontainers-go v0.15.0/go.mod h1:PkohMRH2X8Hib0IWtifVexDfLPVT+tb5E9hsf7cW12w= -github.com/tklauser/go-sysconf v0.3.10 h1:IJ1AZGZRWbY8T5Vfk04D9WOA5WSejdflXxP03OUqALw= github.com/tklauser/go-sysconf v0.3.10/go.mod h1:C8XykCvCb+Gn0oNCWPIlcb0RuglQTYaQ2hGm7jmxEFk= -github.com/tklauser/numcpus v0.4.0 h1:E53Dm1HjH1/R2/aoCtXtPgzmElmn51aOkhCFSuZq//o= +github.com/tklauser/go-sysconf v0.3.11 h1:89WgdJhk5SNwJfu+GKyYveZ4IaJ7xAkecBo+KdJV0CM= +github.com/tklauser/go-sysconf v0.3.11/go.mod h1:GqXfhXY3kiPa0nAXPDIQIWzJbMCB7AmcWpGR8lSZfqI= github.com/tklauser/numcpus v0.4.0/go.mod h1:1+UI3pD8NW14VMwdgJNJ1ESk2UnwhAnz5hMwiKKqXCQ= +github.com/tklauser/numcpus v0.6.0 h1:kebhY2Qt+3U6RNK7UqpYNA+tJ23IBEGKkB7JQBfDYms= +github.com/tklauser/numcpus v0.6.0/go.mod h1:FEZLMke0lhOUG6w2JadTzp0a+Nl8PF/GFkQ5UVIcaL4= github.com/tmc/grpc-websocket-proxy v0.0.0-20170815181823-89b8d40f7ca8/go.mod h1:ncp9v5uamzpCO7NfCPTXjqaC+bZgJeR0sMTm6dMHP7U= github.com/tmc/grpc-websocket-proxy v0.0.0-20190109142713-0ad062ec5ee5/go.mod h1:ncp9v5uamzpCO7NfCPTXjqaC+bZgJeR0sMTm6dMHP7U= github.com/ugorji/go v1.1.4/go.mod h1:uQMGLiO92mf5W77hV/PUCpI3pbzQx3CRekS0kk+RGrc= @@ -879,21 +881,23 @@ go.opencensus.io v0.22.4/go.mod h1:yxeiOL68Rb0Xd1ddK5vPZ/oVn4vY4Ynel7k9FzqtOIw= go.opencensus.io v0.23.0/go.mod h1:XItmlyltB5F7CS4xOC1DcqMoFqwtC6OG2xF7mCv7P7E= go.opencensus.io v0.24.0 h1:y73uSU6J157QMP2kn2r30vwW1A2W2WFwSCGnAVxeaD0= go.opencensus.io v0.24.0/go.mod h1:vNK8G9p7aAivkbmorf4v+7Hgx+Zs0yY+0fOtgBfjQKo= -go.opentelemetry.io/collector v0.66.1-0.20221128222955-4ff1ff379b90 h1:yRe05/jMdzH4TFHfndZ5h2o2hKBK/79W72j8w51qNsI= -go.opentelemetry.io/collector v0.66.1-0.20221128222955-4ff1ff379b90/go.mod h1:hE6jCs+0rfiufCrVPucKZTMwfHit1okfDPnwPT2eW1I= -go.opentelemetry.io/collector/component v0.66.1-0.20221128222955-4ff1ff379b90 h1:AYSNTXbezhNg43EuYdVVcgxE/2gBVrm00FDx4DOmQVg= -go.opentelemetry.io/collector/component v0.66.1-0.20221128222955-4ff1ff379b90/go.mod h1:0c84EqXUhvYe6KW7hJfh76tiI/5yjWCH2amwyQ06XLM= -go.opentelemetry.io/collector/consumer v0.66.1-0.20221128222955-4ff1ff379b90 h1:nzNXVfC1FzXBXCLMzbMv+qK3E4EGiNsnMhfVsBd2yzc= -go.opentelemetry.io/collector/consumer v0.66.1-0.20221128222955-4ff1ff379b90/go.mod h1:WtoRZa5SnxQO1ZEQdVxYpFcXCmq62rakv0oUSlPO0NQ= -go.opentelemetry.io/collector/extension/zpagesextension v0.65.0 h1:T5JJIJ3cmClqdSMgkbjoIiP9p059AAvbfcd3houJkxM= -go.opentelemetry.io/collector/featuregate v0.66.1-0.20221128222955-4ff1ff379b90 h1:UuJSFWbi9XxyNZsJKZuvpWg35BgRbcCGFH+38V2MAdw= -go.opentelemetry.io/collector/featuregate v0.66.1-0.20221128222955-4ff1ff379b90/go.mod h1:tewuFKJYalWBU0bmNKg++MC1ipINXUr6szYzOw2p1GI= -go.opentelemetry.io/collector/pdata v0.66.1-0.20221128222955-4ff1ff379b90 h1:Vu4S4jSNcd0VFPzxQNO4+UqGwnes1xJDoFLPRiWHm8I= -go.opentelemetry.io/collector/pdata v0.66.1-0.20221128222955-4ff1ff379b90/go.mod h1:pqyaznLzk21m+1KL6fwOsRryRELL+zNM0qiVSn0MbVc= -go.opentelemetry.io/collector/processor/batchprocessor v0.66.1-0.20221128222955-4ff1ff379b90 h1:K12L9juzjChBMfp7cQaQsToz7i7975tUYVzJ3Tpw/Cw= -go.opentelemetry.io/collector/processor/batchprocessor v0.66.1-0.20221128222955-4ff1ff379b90/go.mod h1:XhGTsC1B/bq4gpg8IZ/QYBLXkzE4Gw3r7Xu2+ik8A1Q= -go.opentelemetry.io/collector/semconv v0.66.1-0.20221128222955-4ff1ff379b90 h1:hFaTA68cggZKWMv7wQ3bKP8KGTbowh/5AQZKCHzHTqM= -go.opentelemetry.io/collector/semconv v0.66.1-0.20221128222955-4ff1ff379b90/go.mod h1:5o9yhOa+ABt7g2E5JABDxGZ1PQPbtfxrKNbYn+LOTXU= +go.opentelemetry.io/collector v0.66.1-0.20221202005155-1c54042beb70 h1:INB2CsOtqqrija2KvMuIpbBQ3qX1BECEeR+d0NJX+oM= +go.opentelemetry.io/collector v0.66.1-0.20221202005155-1c54042beb70/go.mod h1:d0NHkHyANJy3HDTvYE/PoylMShUmFIbiir89ieI0X0c= +go.opentelemetry.io/collector/component v0.66.1-0.20221202005155-1c54042beb70 h1:dEoJhzCmRShgmVro/kXm6pouGElgxkH2DsvanzCeZtU= +go.opentelemetry.io/collector/component v0.66.1-0.20221202005155-1c54042beb70/go.mod h1:OsVnvFFe38QSpcuZlQ8cvarDzcloCexgQ1/B2m80F6U= +go.opentelemetry.io/collector/confmap v0.0.0-20221201172708-2bdff61fa52a h1:2TscCXAQASO2kU9xHcMIUM/FP29fiQIRTilZmliq/7I= +go.opentelemetry.io/collector/confmap v0.0.0-20221201172708-2bdff61fa52a/go.mod h1:qJ3e8bA8h4wz/jYlbeEUafVHdrU7DkpStnmIUAz6VTQ= +go.opentelemetry.io/collector/consumer v0.66.1-0.20221202005155-1c54042beb70 h1:XwpVjI1KeKGPXOZBLefGILMziPYuNf6IzbmiIEsIyI0= +go.opentelemetry.io/collector/consumer v0.66.1-0.20221202005155-1c54042beb70/go.mod h1:EWVBcSGcIcmeDGTnIboc/aqa3agsBeH8/q7yFWG7xVc= +go.opentelemetry.io/collector/extension/zpagesextension v0.66.0 h1:tPqSKH5K3VhTT0XXVoWL3woWBSTJqnXZQRt0ZLSCoCc= +go.opentelemetry.io/collector/featuregate v0.66.1-0.20221202005155-1c54042beb70 h1:V0tf4ebciqIs07jFATfLGdUpLRaEsi+AiWuA/in0G8Y= +go.opentelemetry.io/collector/featuregate v0.66.1-0.20221202005155-1c54042beb70/go.mod h1:tewuFKJYalWBU0bmNKg++MC1ipINXUr6szYzOw2p1GI= +go.opentelemetry.io/collector/pdata v0.66.1-0.20221202005155-1c54042beb70 h1:TPOrxkEMvZzfBSwF3ct+kUUgKA5g8unkZZbKQvJweeA= +go.opentelemetry.io/collector/pdata v0.66.1-0.20221202005155-1c54042beb70/go.mod h1:pqyaznLzk21m+1KL6fwOsRryRELL+zNM0qiVSn0MbVc= +go.opentelemetry.io/collector/processor/batchprocessor v0.66.1-0.20221202005155-1c54042beb70 h1:Y4e8NnVevonnAgmjX9Z7QIMA32yMqHAOnAlh8SzTS8c= +go.opentelemetry.io/collector/processor/batchprocessor v0.66.1-0.20221202005155-1c54042beb70/go.mod h1:Pi1CsKDQFoDrUP1i3+VdE6s2Xuji7bOGFBgqHK0J32E= +go.opentelemetry.io/collector/semconv v0.66.1-0.20221202005155-1c54042beb70 h1:Q5L9Urod3c8as6ZYaoaqBjarx/HXxsxy34DFZIU2fO4= +go.opentelemetry.io/collector/semconv v0.66.1-0.20221202005155-1c54042beb70/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= @@ -922,8 +926,8 @@ go.uber.org/multierr v1.8.0 h1:dg6GjLku4EH+249NNmoIciG9N/jURbDG+pFlTkhzIC8= go.uber.org/multierr v1.8.0/go.mod h1:7EAYxJLBy9rStEaz58O2t4Uvip6FSURkq8/ppBp95ak= go.uber.org/zap v1.10.0/go.mod h1:vwi/ZaCAaUcBkycHslxD9B2zi4UTXhF60s6SWpuDF0Q= go.uber.org/zap v1.17.0/go.mod h1:MXVU+bhUf/A7Xi2HNOnopQOrmycQ5Ih87HtOu4q5SSo= -go.uber.org/zap v1.23.0 h1:OjGQ5KQDEUawVHxNwQgPpiypGHOxo2mNZsOqTak4fFY= -go.uber.org/zap v1.23.0/go.mod h1:D+nX8jyLsMHMYrln8A0rJjFt/T/9/bGgIhAqxv5URuY= +go.uber.org/zap v1.24.0 h1:FiJd5l1UOLj0wCgbSE0rwwXHzEdAZS6hiiSnxJN/D60= +go.uber.org/zap v1.24.0/go.mod h1:2kMP+WWQ8aoFoedH3T2sq6iJ2yDWpHbP0f6MQbS9Gkg= golang.org/x/crypto v0.0.0-20171113213409-9f005a07e0d3/go.mod h1:6SG95UA2DQfeDnfUPMdvaQW0Q7yPrPDi9nlGo2tz2b4= golang.org/x/crypto v0.0.0-20180904163835-0709b304e793/go.mod h1:6SG95UA2DQfeDnfUPMdvaQW0Q7yPrPDi9nlGo2tz2b4= golang.org/x/crypto v0.0.0-20181009213950-7c1a557ab941/go.mod h1:6SG95UA2DQfeDnfUPMdvaQW0Q7yPrPDi9nlGo2tz2b4= diff --git a/receiver/solacereceiver/go.mod b/receiver/solacereceiver/go.mod index c12362463af0..016868ec85e1 100644 --- a/receiver/solacereceiver/go.mod +++ b/receiver/solacereceiver/go.mod @@ -20,12 +20,13 @@ require ( github.com/Azure/go-amqp v0.17.5 github.com/stretchr/testify v1.8.1 go.opencensus.io v0.24.0 - go.opentelemetry.io/collector v0.66.1-0.20221128222955-4ff1ff379b90 - go.opentelemetry.io/collector/component v0.66.1-0.20221128222955-4ff1ff379b90 - go.opentelemetry.io/collector/consumer v0.66.1-0.20221128222955-4ff1ff379b90 - go.opentelemetry.io/collector/pdata v0.66.1-0.20221128222955-4ff1ff379b90 + go.opentelemetry.io/collector v0.66.1-0.20221202005155-1c54042beb70 + go.opentelemetry.io/collector/component v0.66.1-0.20221202005155-1c54042beb70 + go.opentelemetry.io/collector/confmap v0.0.0-20221201172708-2bdff61fa52a + go.opentelemetry.io/collector/consumer v0.66.1-0.20221202005155-1c54042beb70 + go.opentelemetry.io/collector/pdata v0.66.1-0.20221202005155-1c54042beb70 go.uber.org/atomic v1.10.0 - go.uber.org/zap v1.23.0 + go.uber.org/zap v1.24.0 google.golang.org/protobuf v1.28.1 ) @@ -43,7 +44,7 @@ require ( github.com/modern-go/reflect2 v1.0.2 // indirect github.com/pelletier/go-toml v1.9.3 // indirect github.com/pmezard/go-difflib v1.0.0 // indirect - go.opentelemetry.io/collector/featuregate v0.66.1-0.20221128222955-4ff1ff379b90 // indirect + go.opentelemetry.io/collector/featuregate v0.66.1-0.20221202005155-1c54042beb70 // indirect go.opentelemetry.io/otel v1.11.1 // indirect go.opentelemetry.io/otel/metric v0.33.0 // indirect go.opentelemetry.io/otel/trace v1.11.1 // indirect diff --git a/receiver/solacereceiver/go.sum b/receiver/solacereceiver/go.sum index 5e222457f2db..136020e03676 100644 --- a/receiver/solacereceiver/go.sum +++ b/receiver/solacereceiver/go.sum @@ -273,16 +273,18 @@ go.etcd.io/etcd/client/pkg/v3 v3.5.4/go.mod h1:IJHfcCEKxYu1Os13ZdwCwIUTUVGYTSAM3 go.etcd.io/etcd/client/v3 v3.5.4/go.mod h1:ZaRkVgBZC+L+dLCjTcF1hRXpgZXQPOvnA/Ak/gq3kiY= go.opencensus.io v0.24.0 h1:y73uSU6J157QMP2kn2r30vwW1A2W2WFwSCGnAVxeaD0= go.opencensus.io v0.24.0/go.mod h1:vNK8G9p7aAivkbmorf4v+7Hgx+Zs0yY+0fOtgBfjQKo= -go.opentelemetry.io/collector v0.66.1-0.20221128222955-4ff1ff379b90 h1:yRe05/jMdzH4TFHfndZ5h2o2hKBK/79W72j8w51qNsI= -go.opentelemetry.io/collector v0.66.1-0.20221128222955-4ff1ff379b90/go.mod h1:hE6jCs+0rfiufCrVPucKZTMwfHit1okfDPnwPT2eW1I= -go.opentelemetry.io/collector/component v0.66.1-0.20221128222955-4ff1ff379b90 h1:AYSNTXbezhNg43EuYdVVcgxE/2gBVrm00FDx4DOmQVg= -go.opentelemetry.io/collector/component v0.66.1-0.20221128222955-4ff1ff379b90/go.mod h1:0c84EqXUhvYe6KW7hJfh76tiI/5yjWCH2amwyQ06XLM= -go.opentelemetry.io/collector/consumer v0.66.1-0.20221128222955-4ff1ff379b90 h1:nzNXVfC1FzXBXCLMzbMv+qK3E4EGiNsnMhfVsBd2yzc= -go.opentelemetry.io/collector/consumer v0.66.1-0.20221128222955-4ff1ff379b90/go.mod h1:WtoRZa5SnxQO1ZEQdVxYpFcXCmq62rakv0oUSlPO0NQ= -go.opentelemetry.io/collector/featuregate v0.66.1-0.20221128222955-4ff1ff379b90 h1:UuJSFWbi9XxyNZsJKZuvpWg35BgRbcCGFH+38V2MAdw= -go.opentelemetry.io/collector/featuregate v0.66.1-0.20221128222955-4ff1ff379b90/go.mod h1:tewuFKJYalWBU0bmNKg++MC1ipINXUr6szYzOw2p1GI= -go.opentelemetry.io/collector/pdata v0.66.1-0.20221128222955-4ff1ff379b90 h1:Vu4S4jSNcd0VFPzxQNO4+UqGwnes1xJDoFLPRiWHm8I= -go.opentelemetry.io/collector/pdata v0.66.1-0.20221128222955-4ff1ff379b90/go.mod h1:pqyaznLzk21m+1KL6fwOsRryRELL+zNM0qiVSn0MbVc= +go.opentelemetry.io/collector v0.66.1-0.20221202005155-1c54042beb70 h1:INB2CsOtqqrija2KvMuIpbBQ3qX1BECEeR+d0NJX+oM= +go.opentelemetry.io/collector v0.66.1-0.20221202005155-1c54042beb70/go.mod h1:d0NHkHyANJy3HDTvYE/PoylMShUmFIbiir89ieI0X0c= +go.opentelemetry.io/collector/component v0.66.1-0.20221202005155-1c54042beb70 h1:dEoJhzCmRShgmVro/kXm6pouGElgxkH2DsvanzCeZtU= +go.opentelemetry.io/collector/component v0.66.1-0.20221202005155-1c54042beb70/go.mod h1:OsVnvFFe38QSpcuZlQ8cvarDzcloCexgQ1/B2m80F6U= +go.opentelemetry.io/collector/confmap v0.0.0-20221201172708-2bdff61fa52a h1:2TscCXAQASO2kU9xHcMIUM/FP29fiQIRTilZmliq/7I= +go.opentelemetry.io/collector/confmap v0.0.0-20221201172708-2bdff61fa52a/go.mod h1:qJ3e8bA8h4wz/jYlbeEUafVHdrU7DkpStnmIUAz6VTQ= +go.opentelemetry.io/collector/consumer v0.66.1-0.20221202005155-1c54042beb70 h1:XwpVjI1KeKGPXOZBLefGILMziPYuNf6IzbmiIEsIyI0= +go.opentelemetry.io/collector/consumer v0.66.1-0.20221202005155-1c54042beb70/go.mod h1:EWVBcSGcIcmeDGTnIboc/aqa3agsBeH8/q7yFWG7xVc= +go.opentelemetry.io/collector/featuregate v0.66.1-0.20221202005155-1c54042beb70 h1:V0tf4ebciqIs07jFATfLGdUpLRaEsi+AiWuA/in0G8Y= +go.opentelemetry.io/collector/featuregate v0.66.1-0.20221202005155-1c54042beb70/go.mod h1:tewuFKJYalWBU0bmNKg++MC1ipINXUr6szYzOw2p1GI= +go.opentelemetry.io/collector/pdata v0.66.1-0.20221202005155-1c54042beb70 h1:TPOrxkEMvZzfBSwF3ct+kUUgKA5g8unkZZbKQvJweeA= +go.opentelemetry.io/collector/pdata v0.66.1-0.20221202005155-1c54042beb70/go.mod h1:pqyaznLzk21m+1KL6fwOsRryRELL+zNM0qiVSn0MbVc= 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= @@ -298,8 +300,8 @@ go.uber.org/multierr v1.6.0/go.mod h1:cdWPpRnG4AhwMwsgIHip0KRBQjJy5kYEpYjJxpXp9i go.uber.org/multierr v1.8.0 h1:dg6GjLku4EH+249NNmoIciG9N/jURbDG+pFlTkhzIC8= go.uber.org/multierr v1.8.0/go.mod h1:7EAYxJLBy9rStEaz58O2t4Uvip6FSURkq8/ppBp95ak= go.uber.org/zap v1.17.0/go.mod h1:MXVU+bhUf/A7Xi2HNOnopQOrmycQ5Ih87HtOu4q5SSo= -go.uber.org/zap v1.23.0 h1:OjGQ5KQDEUawVHxNwQgPpiypGHOxo2mNZsOqTak4fFY= -go.uber.org/zap v1.23.0/go.mod h1:D+nX8jyLsMHMYrln8A0rJjFt/T/9/bGgIhAqxv5URuY= +go.uber.org/zap v1.24.0 h1:FiJd5l1UOLj0wCgbSE0rwwXHzEdAZS6hiiSnxJN/D60= +go.uber.org/zap v1.24.0/go.mod h1:2kMP+WWQ8aoFoedH3T2sq6iJ2yDWpHbP0f6MQbS9Gkg= golang.org/x/crypto v0.0.0-20180904163835-0709b304e793/go.mod h1:6SG95UA2DQfeDnfUPMdvaQW0Q7yPrPDi9nlGo2tz2b4= golang.org/x/crypto v0.0.0-20190308221718-c2843e01d9a2/go.mod h1:djNgcEr1/C05ACkg1iLfiJU5Ep61QUkGW8qpdssI0+w= golang.org/x/crypto v0.0.0-20190923035154-9ee001bba392/go.mod h1:/lpIB1dKB+9EgE3H3cr1v9wB50oz8l4C4h62xy7jSTY= diff --git a/receiver/solacereceiver/receiver.go b/receiver/solacereceiver/receiver.go index c9b3c10349e1..ca5322217217 100644 --- a/receiver/solacereceiver/receiver.go +++ b/receiver/solacereceiver/receiver.go @@ -29,7 +29,6 @@ import ( // solaceTracesReceiver uses azure AMQP to consume and handle telemetry data from SOlace. Implements component.TracesReceiver type solaceTracesReceiver struct { - instanceID component.ID // config is the receiver.Config instance used to build the receiver config *Config @@ -49,36 +48,35 @@ type solaceTracesReceiver struct { } // newTracesReceiver creates a new solaceTraceReceiver as a component.TracesReceiver -func newTracesReceiver(config *Config, receiverCreateSettings component.ReceiverCreateSettings, nextConsumer consumer.Traces) (component.TracesReceiver, error) { +func newTracesReceiver(config *Config, set component.ReceiverCreateSettings, nextConsumer consumer.Traces) (component.TracesReceiver, error) { if nextConsumer == nil { - receiverCreateSettings.Logger.Warn("Next consumer in pipeline is null, stopping receiver") + set.Logger.Warn("Next consumer in pipeline is null, stopping receiver") return nil, component.ErrNilNextConsumer } if err := config.Validate(); err != nil { - receiverCreateSettings.Logger.Warn("Error validating configuration", zap.Any("error", err)) + set.Logger.Warn("Error validating configuration", zap.Any("error", err)) return nil, err } - factory, err := newAMQPMessagingServiceFactory(config, receiverCreateSettings.Logger) + factory, err := newAMQPMessagingServiceFactory(config, set.Logger) if err != nil { - receiverCreateSettings.Logger.Warn("Error validating messaging service configuration", zap.Any("error", err)) + set.Logger.Warn("Error validating messaging service configuration", zap.Any("error", err)) return nil, err } - metrics, err := newOpenCensusMetrics(config.ID().Name()) + metrics, err := newOpenCensusMetrics(set.ID.Name()) if err != nil { - receiverCreateSettings.Logger.Warn("Error registering metrics", zap.Any("error", err)) + set.Logger.Warn("Error registering metrics", zap.Any("error", err)) return nil, err } - unmarshaller := newTracesUnmarshaller(receiverCreateSettings.Logger, metrics) + unmarshaller := newTracesUnmarshaller(set.Logger, metrics) return &solaceTracesReceiver{ - instanceID: config.ID(), config: config, nextConsumer: nextConsumer, - settings: receiverCreateSettings, + settings: set, metrics: metrics, unmarshaller: unmarshaller, shutdownWaitGroup: &sync.WaitGroup{}, diff --git a/receiver/solacereceiver/receiver_test.go b/receiver/solacereceiver/receiver_test.go index 3bc4c3da4d0b..b866a81220fa 100644 --- a/receiver/solacereceiver/receiver_test.go +++ b/receiver/solacereceiver/receiver_test.go @@ -22,7 +22,6 @@ import ( "time" "github.com/stretchr/testify/assert" - "go.opentelemetry.io/collector/component" "go.opentelemetry.io/collector/component/componenttest" "go.opentelemetry.io/collector/consumer/consumererror" "go.opentelemetry.io/collector/consumer/consumertest" @@ -349,7 +348,6 @@ func newReceiver(t *testing.T) (*solaceTracesReceiver, *mockMessagingService, *m metrics := newTestMetrics(t) receiver := &solaceTracesReceiver{ settings: componenttest.NewNopReceiverCreateSettings(), - instanceID: component.NewID(component.Type(t.Name())), config: &Config{}, nextConsumer: consumertest.NewNop(), metrics: metrics, diff --git a/receiver/splunkhecreceiver/go.mod b/receiver/splunkhecreceiver/go.mod index a1a8a65e719b..5062c9503821 100644 --- a/receiver/splunkhecreceiver/go.mod +++ b/receiver/splunkhecreceiver/go.mod @@ -9,12 +9,13 @@ require ( github.com/open-telemetry/opentelemetry-collector-contrib/internal/common v0.66.0 github.com/open-telemetry/opentelemetry-collector-contrib/internal/splunk v0.66.0 github.com/stretchr/testify v1.8.1 - go.opentelemetry.io/collector v0.66.1-0.20221128222955-4ff1ff379b90 - go.opentelemetry.io/collector/component v0.66.1-0.20221128222955-4ff1ff379b90 - go.opentelemetry.io/collector/consumer v0.66.1-0.20221128222955-4ff1ff379b90 - go.opentelemetry.io/collector/pdata v0.66.1-0.20221128222955-4ff1ff379b90 - go.opentelemetry.io/collector/semconv v0.66.1-0.20221128222955-4ff1ff379b90 - go.uber.org/zap v1.23.0 + go.opentelemetry.io/collector v0.66.1-0.20221202005155-1c54042beb70 + go.opentelemetry.io/collector/component v0.66.1-0.20221202005155-1c54042beb70 + go.opentelemetry.io/collector/confmap v0.0.0-20221201172708-2bdff61fa52a + go.opentelemetry.io/collector/consumer v0.66.1-0.20221202005155-1c54042beb70 + go.opentelemetry.io/collector/pdata v0.66.1-0.20221202005155-1c54042beb70 + go.opentelemetry.io/collector/semconv v0.66.1-0.20221202005155-1c54042beb70 + go.uber.org/zap v1.24.0 ) require ( @@ -38,7 +39,7 @@ require ( github.com/pmezard/go-difflib v1.0.0 // indirect github.com/rs/cors v1.8.2 // indirect go.opencensus.io v0.24.0 // indirect - go.opentelemetry.io/collector/featuregate v0.66.1-0.20221128222955-4ff1ff379b90 // indirect + go.opentelemetry.io/collector/featuregate v0.66.1-0.20221202005155-1c54042beb70 // 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 5337a52e03d9..b55ae857ef7d 100644 --- a/receiver/splunkhecreceiver/go.sum +++ b/receiver/splunkhecreceiver/go.sum @@ -285,18 +285,20 @@ go.etcd.io/etcd/client/pkg/v3 v3.5.4/go.mod h1:IJHfcCEKxYu1Os13ZdwCwIUTUVGYTSAM3 go.etcd.io/etcd/client/v3 v3.5.4/go.mod h1:ZaRkVgBZC+L+dLCjTcF1hRXpgZXQPOvnA/Ak/gq3kiY= go.opencensus.io v0.24.0 h1:y73uSU6J157QMP2kn2r30vwW1A2W2WFwSCGnAVxeaD0= go.opencensus.io v0.24.0/go.mod h1:vNK8G9p7aAivkbmorf4v+7Hgx+Zs0yY+0fOtgBfjQKo= -go.opentelemetry.io/collector v0.66.1-0.20221128222955-4ff1ff379b90 h1:yRe05/jMdzH4TFHfndZ5h2o2hKBK/79W72j8w51qNsI= -go.opentelemetry.io/collector v0.66.1-0.20221128222955-4ff1ff379b90/go.mod h1:hE6jCs+0rfiufCrVPucKZTMwfHit1okfDPnwPT2eW1I= -go.opentelemetry.io/collector/component v0.66.1-0.20221128222955-4ff1ff379b90 h1:AYSNTXbezhNg43EuYdVVcgxE/2gBVrm00FDx4DOmQVg= -go.opentelemetry.io/collector/component v0.66.1-0.20221128222955-4ff1ff379b90/go.mod h1:0c84EqXUhvYe6KW7hJfh76tiI/5yjWCH2amwyQ06XLM= -go.opentelemetry.io/collector/consumer v0.66.1-0.20221128222955-4ff1ff379b90 h1:nzNXVfC1FzXBXCLMzbMv+qK3E4EGiNsnMhfVsBd2yzc= -go.opentelemetry.io/collector/consumer v0.66.1-0.20221128222955-4ff1ff379b90/go.mod h1:WtoRZa5SnxQO1ZEQdVxYpFcXCmq62rakv0oUSlPO0NQ= -go.opentelemetry.io/collector/featuregate v0.66.1-0.20221128222955-4ff1ff379b90 h1:UuJSFWbi9XxyNZsJKZuvpWg35BgRbcCGFH+38V2MAdw= -go.opentelemetry.io/collector/featuregate v0.66.1-0.20221128222955-4ff1ff379b90/go.mod h1:tewuFKJYalWBU0bmNKg++MC1ipINXUr6szYzOw2p1GI= -go.opentelemetry.io/collector/pdata v0.66.1-0.20221128222955-4ff1ff379b90 h1:Vu4S4jSNcd0VFPzxQNO4+UqGwnes1xJDoFLPRiWHm8I= -go.opentelemetry.io/collector/pdata v0.66.1-0.20221128222955-4ff1ff379b90/go.mod h1:pqyaznLzk21m+1KL6fwOsRryRELL+zNM0qiVSn0MbVc= -go.opentelemetry.io/collector/semconv v0.66.1-0.20221128222955-4ff1ff379b90 h1:hFaTA68cggZKWMv7wQ3bKP8KGTbowh/5AQZKCHzHTqM= -go.opentelemetry.io/collector/semconv v0.66.1-0.20221128222955-4ff1ff379b90/go.mod h1:5o9yhOa+ABt7g2E5JABDxGZ1PQPbtfxrKNbYn+LOTXU= +go.opentelemetry.io/collector v0.66.1-0.20221202005155-1c54042beb70 h1:INB2CsOtqqrija2KvMuIpbBQ3qX1BECEeR+d0NJX+oM= +go.opentelemetry.io/collector v0.66.1-0.20221202005155-1c54042beb70/go.mod h1:d0NHkHyANJy3HDTvYE/PoylMShUmFIbiir89ieI0X0c= +go.opentelemetry.io/collector/component v0.66.1-0.20221202005155-1c54042beb70 h1:dEoJhzCmRShgmVro/kXm6pouGElgxkH2DsvanzCeZtU= +go.opentelemetry.io/collector/component v0.66.1-0.20221202005155-1c54042beb70/go.mod h1:OsVnvFFe38QSpcuZlQ8cvarDzcloCexgQ1/B2m80F6U= +go.opentelemetry.io/collector/confmap v0.0.0-20221201172708-2bdff61fa52a h1:2TscCXAQASO2kU9xHcMIUM/FP29fiQIRTilZmliq/7I= +go.opentelemetry.io/collector/confmap v0.0.0-20221201172708-2bdff61fa52a/go.mod h1:qJ3e8bA8h4wz/jYlbeEUafVHdrU7DkpStnmIUAz6VTQ= +go.opentelemetry.io/collector/consumer v0.66.1-0.20221202005155-1c54042beb70 h1:XwpVjI1KeKGPXOZBLefGILMziPYuNf6IzbmiIEsIyI0= +go.opentelemetry.io/collector/consumer v0.66.1-0.20221202005155-1c54042beb70/go.mod h1:EWVBcSGcIcmeDGTnIboc/aqa3agsBeH8/q7yFWG7xVc= +go.opentelemetry.io/collector/featuregate v0.66.1-0.20221202005155-1c54042beb70 h1:V0tf4ebciqIs07jFATfLGdUpLRaEsi+AiWuA/in0G8Y= +go.opentelemetry.io/collector/featuregate v0.66.1-0.20221202005155-1c54042beb70/go.mod h1:tewuFKJYalWBU0bmNKg++MC1ipINXUr6szYzOw2p1GI= +go.opentelemetry.io/collector/pdata v0.66.1-0.20221202005155-1c54042beb70 h1:TPOrxkEMvZzfBSwF3ct+kUUgKA5g8unkZZbKQvJweeA= +go.opentelemetry.io/collector/pdata v0.66.1-0.20221202005155-1c54042beb70/go.mod h1:pqyaznLzk21m+1KL6fwOsRryRELL+zNM0qiVSn0MbVc= +go.opentelemetry.io/collector/semconv v0.66.1-0.20221202005155-1c54042beb70 h1:Q5L9Urod3c8as6ZYaoaqBjarx/HXxsxy34DFZIU2fO4= +go.opentelemetry.io/collector/semconv v0.66.1-0.20221202005155-1c54042beb70/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= @@ -316,8 +318,8 @@ go.uber.org/multierr v1.6.0/go.mod h1:cdWPpRnG4AhwMwsgIHip0KRBQjJy5kYEpYjJxpXp9i go.uber.org/multierr v1.8.0 h1:dg6GjLku4EH+249NNmoIciG9N/jURbDG+pFlTkhzIC8= go.uber.org/multierr v1.8.0/go.mod h1:7EAYxJLBy9rStEaz58O2t4Uvip6FSURkq8/ppBp95ak= go.uber.org/zap v1.17.0/go.mod h1:MXVU+bhUf/A7Xi2HNOnopQOrmycQ5Ih87HtOu4q5SSo= -go.uber.org/zap v1.23.0 h1:OjGQ5KQDEUawVHxNwQgPpiypGHOxo2mNZsOqTak4fFY= -go.uber.org/zap v1.23.0/go.mod h1:D+nX8jyLsMHMYrln8A0rJjFt/T/9/bGgIhAqxv5URuY= +go.uber.org/zap v1.24.0 h1:FiJd5l1UOLj0wCgbSE0rwwXHzEdAZS6hiiSnxJN/D60= +go.uber.org/zap v1.24.0/go.mod h1:2kMP+WWQ8aoFoedH3T2sq6iJ2yDWpHbP0f6MQbS9Gkg= golang.org/x/crypto v0.0.0-20180904163835-0709b304e793/go.mod h1:6SG95UA2DQfeDnfUPMdvaQW0Q7yPrPDi9nlGo2tz2b4= golang.org/x/crypto v0.0.0-20190308221718-c2843e01d9a2/go.mod h1:djNgcEr1/C05ACkg1iLfiJU5Ep61QUkGW8qpdssI0+w= golang.org/x/crypto v0.0.0-20190923035154-9ee001bba392/go.mod h1:/lpIB1dKB+9EgE3H3cr1v9wB50oz8l4C4h62xy7jSTY= diff --git a/receiver/splunkhecreceiver/receiver.go b/receiver/splunkhecreceiver/receiver.go index b38284584585..c5c742f1a487 100644 --- a/receiver/splunkhecreceiver/receiver.go +++ b/receiver/splunkhecreceiver/receiver.go @@ -107,7 +107,7 @@ func newMetricsReceiver( } obsrecv, err := obsreport.NewReceiver(obsreport.ReceiverSettings{ - ReceiverID: config.ID(), + ReceiverID: settings.ID, Transport: transport, ReceiverCreateSettings: settings, }) @@ -151,7 +151,7 @@ func newLogsReceiver( } obsrecv, err := obsreport.NewReceiver(obsreport.ReceiverSettings{ - ReceiverID: config.ID(), + ReceiverID: settings.ID, Transport: transport, ReceiverCreateSettings: settings, }) diff --git a/receiver/sqlqueryreceiver/go.mod b/receiver/sqlqueryreceiver/go.mod index 6e425716b998..82f82064ea03 100644 --- a/receiver/sqlqueryreceiver/go.mod +++ b/receiver/sqlqueryreceiver/go.mod @@ -12,12 +12,13 @@ require ( github.com/snowflakedb/gosnowflake v1.6.15 github.com/stretchr/testify v1.8.1 github.com/testcontainers/testcontainers-go v0.15.0 - go.opentelemetry.io/collector v0.66.1-0.20221128222955-4ff1ff379b90 - go.opentelemetry.io/collector/component v0.66.1-0.20221128222955-4ff1ff379b90 - go.opentelemetry.io/collector/consumer v0.66.1-0.20221128222955-4ff1ff379b90 - go.opentelemetry.io/collector/pdata v0.66.1-0.20221128222955-4ff1ff379b90 + go.opentelemetry.io/collector v0.66.1-0.20221202005155-1c54042beb70 + go.opentelemetry.io/collector/component v0.66.1-0.20221202005155-1c54042beb70 + go.opentelemetry.io/collector/confmap v0.0.0-20221201172708-2bdff61fa52a + go.opentelemetry.io/collector/consumer v0.66.1-0.20221202005155-1c54042beb70 + go.opentelemetry.io/collector/pdata v0.66.1-0.20221202005155-1c54042beb70 go.uber.org/multierr v1.8.0 - go.uber.org/zap v1.23.0 + go.uber.org/zap v1.24.0 ) require ( @@ -90,7 +91,7 @@ require ( github.com/rogpeppe/go-internal v1.8.1 // indirect github.com/sirupsen/logrus v1.9.0 // indirect go.opencensus.io v0.24.0 // indirect - go.opentelemetry.io/collector/featuregate v0.66.1-0.20221128222955-4ff1ff379b90 // indirect + go.opentelemetry.io/collector/featuregate v0.66.1-0.20221202005155-1c54042beb70 // 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 2b04bc0aa248..26be5e397dc2 100644 --- a/receiver/sqlqueryreceiver/go.sum +++ b/receiver/sqlqueryreceiver/go.sum @@ -958,16 +958,18 @@ go.opencensus.io v0.22.2/go.mod h1:yxeiOL68Rb0Xd1ddK5vPZ/oVn4vY4Ynel7k9FzqtOIw= go.opencensus.io v0.22.3/go.mod h1:yxeiOL68Rb0Xd1ddK5vPZ/oVn4vY4Ynel7k9FzqtOIw= go.opencensus.io v0.24.0 h1:y73uSU6J157QMP2kn2r30vwW1A2W2WFwSCGnAVxeaD0= go.opencensus.io v0.24.0/go.mod h1:vNK8G9p7aAivkbmorf4v+7Hgx+Zs0yY+0fOtgBfjQKo= -go.opentelemetry.io/collector v0.66.1-0.20221128222955-4ff1ff379b90 h1:yRe05/jMdzH4TFHfndZ5h2o2hKBK/79W72j8w51qNsI= -go.opentelemetry.io/collector v0.66.1-0.20221128222955-4ff1ff379b90/go.mod h1:hE6jCs+0rfiufCrVPucKZTMwfHit1okfDPnwPT2eW1I= -go.opentelemetry.io/collector/component v0.66.1-0.20221128222955-4ff1ff379b90 h1:AYSNTXbezhNg43EuYdVVcgxE/2gBVrm00FDx4DOmQVg= -go.opentelemetry.io/collector/component v0.66.1-0.20221128222955-4ff1ff379b90/go.mod h1:0c84EqXUhvYe6KW7hJfh76tiI/5yjWCH2amwyQ06XLM= -go.opentelemetry.io/collector/consumer v0.66.1-0.20221128222955-4ff1ff379b90 h1:nzNXVfC1FzXBXCLMzbMv+qK3E4EGiNsnMhfVsBd2yzc= -go.opentelemetry.io/collector/consumer v0.66.1-0.20221128222955-4ff1ff379b90/go.mod h1:WtoRZa5SnxQO1ZEQdVxYpFcXCmq62rakv0oUSlPO0NQ= -go.opentelemetry.io/collector/featuregate v0.66.1-0.20221128222955-4ff1ff379b90 h1:UuJSFWbi9XxyNZsJKZuvpWg35BgRbcCGFH+38V2MAdw= -go.opentelemetry.io/collector/featuregate v0.66.1-0.20221128222955-4ff1ff379b90/go.mod h1:tewuFKJYalWBU0bmNKg++MC1ipINXUr6szYzOw2p1GI= -go.opentelemetry.io/collector/pdata v0.66.1-0.20221128222955-4ff1ff379b90 h1:Vu4S4jSNcd0VFPzxQNO4+UqGwnes1xJDoFLPRiWHm8I= -go.opentelemetry.io/collector/pdata v0.66.1-0.20221128222955-4ff1ff379b90/go.mod h1:pqyaznLzk21m+1KL6fwOsRryRELL+zNM0qiVSn0MbVc= +go.opentelemetry.io/collector v0.66.1-0.20221202005155-1c54042beb70 h1:INB2CsOtqqrija2KvMuIpbBQ3qX1BECEeR+d0NJX+oM= +go.opentelemetry.io/collector v0.66.1-0.20221202005155-1c54042beb70/go.mod h1:d0NHkHyANJy3HDTvYE/PoylMShUmFIbiir89ieI0X0c= +go.opentelemetry.io/collector/component v0.66.1-0.20221202005155-1c54042beb70 h1:dEoJhzCmRShgmVro/kXm6pouGElgxkH2DsvanzCeZtU= +go.opentelemetry.io/collector/component v0.66.1-0.20221202005155-1c54042beb70/go.mod h1:OsVnvFFe38QSpcuZlQ8cvarDzcloCexgQ1/B2m80F6U= +go.opentelemetry.io/collector/confmap v0.0.0-20221201172708-2bdff61fa52a h1:2TscCXAQASO2kU9xHcMIUM/FP29fiQIRTilZmliq/7I= +go.opentelemetry.io/collector/confmap v0.0.0-20221201172708-2bdff61fa52a/go.mod h1:qJ3e8bA8h4wz/jYlbeEUafVHdrU7DkpStnmIUAz6VTQ= +go.opentelemetry.io/collector/consumer v0.66.1-0.20221202005155-1c54042beb70 h1:XwpVjI1KeKGPXOZBLefGILMziPYuNf6IzbmiIEsIyI0= +go.opentelemetry.io/collector/consumer v0.66.1-0.20221202005155-1c54042beb70/go.mod h1:EWVBcSGcIcmeDGTnIboc/aqa3agsBeH8/q7yFWG7xVc= +go.opentelemetry.io/collector/featuregate v0.66.1-0.20221202005155-1c54042beb70 h1:V0tf4ebciqIs07jFATfLGdUpLRaEsi+AiWuA/in0G8Y= +go.opentelemetry.io/collector/featuregate v0.66.1-0.20221202005155-1c54042beb70/go.mod h1:tewuFKJYalWBU0bmNKg++MC1ipINXUr6szYzOw2p1GI= +go.opentelemetry.io/collector/pdata v0.66.1-0.20221202005155-1c54042beb70 h1:TPOrxkEMvZzfBSwF3ct+kUUgKA5g8unkZZbKQvJweeA= +go.opentelemetry.io/collector/pdata v0.66.1-0.20221202005155-1c54042beb70/go.mod h1:pqyaznLzk21m+1KL6fwOsRryRELL+zNM0qiVSn0MbVc= 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= @@ -990,8 +992,8 @@ go.uber.org/multierr v1.8.0 h1:dg6GjLku4EH+249NNmoIciG9N/jURbDG+pFlTkhzIC8= go.uber.org/multierr v1.8.0/go.mod h1:7EAYxJLBy9rStEaz58O2t4Uvip6FSURkq8/ppBp95ak= go.uber.org/zap v1.10.0/go.mod h1:vwi/ZaCAaUcBkycHslxD9B2zi4UTXhF60s6SWpuDF0Q= go.uber.org/zap v1.17.0/go.mod h1:MXVU+bhUf/A7Xi2HNOnopQOrmycQ5Ih87HtOu4q5SSo= -go.uber.org/zap v1.23.0 h1:OjGQ5KQDEUawVHxNwQgPpiypGHOxo2mNZsOqTak4fFY= -go.uber.org/zap v1.23.0/go.mod h1:D+nX8jyLsMHMYrln8A0rJjFt/T/9/bGgIhAqxv5URuY= +go.uber.org/zap v1.24.0 h1:FiJd5l1UOLj0wCgbSE0rwwXHzEdAZS6hiiSnxJN/D60= +go.uber.org/zap v1.24.0/go.mod h1:2kMP+WWQ8aoFoedH3T2sq6iJ2yDWpHbP0f6MQbS9Gkg= golang.org/x/crypto v0.0.0-20171113213409-9f005a07e0d3/go.mod h1:6SG95UA2DQfeDnfUPMdvaQW0Q7yPrPDi9nlGo2tz2b4= golang.org/x/crypto v0.0.0-20180904163835-0709b304e793/go.mod h1:6SG95UA2DQfeDnfUPMdvaQW0Q7yPrPDi9nlGo2tz2b4= golang.org/x/crypto v0.0.0-20181009213950-7c1a557ab941/go.mod h1:6SG95UA2DQfeDnfUPMdvaQW0Q7yPrPDi9nlGo2tz2b4= diff --git a/receiver/sqlserverreceiver/go.mod b/receiver/sqlserverreceiver/go.mod index 412029edda1d..4f8c6582db63 100644 --- a/receiver/sqlserverreceiver/go.mod +++ b/receiver/sqlserverreceiver/go.mod @@ -6,12 +6,13 @@ require ( github.com/open-telemetry/opentelemetry-collector-contrib/internal/scrapertest v0.66.0 github.com/open-telemetry/opentelemetry-collector-contrib/pkg/winperfcounters v0.66.0 github.com/stretchr/testify v1.8.1 - go.opentelemetry.io/collector v0.66.1-0.20221128222955-4ff1ff379b90 - go.opentelemetry.io/collector/component v0.66.1-0.20221128222955-4ff1ff379b90 - go.opentelemetry.io/collector/consumer v0.66.1-0.20221128222955-4ff1ff379b90 - go.opentelemetry.io/collector/pdata v0.66.1-0.20221128222955-4ff1ff379b90 + go.opentelemetry.io/collector v0.66.1-0.20221202005155-1c54042beb70 + go.opentelemetry.io/collector/component v0.66.1-0.20221202005155-1c54042beb70 + go.opentelemetry.io/collector/confmap v0.0.0-20221201172708-2bdff61fa52a + go.opentelemetry.io/collector/consumer v0.66.1-0.20221202005155-1c54042beb70 + go.opentelemetry.io/collector/pdata v0.66.1-0.20221202005155-1c54042beb70 go.uber.org/multierr v1.8.0 - go.uber.org/zap v1.23.0 + go.uber.org/zap v1.24.0 ) require ( @@ -32,7 +33,7 @@ require ( github.com/rogpeppe/go-internal v1.8.1 // indirect github.com/stretchr/objx v0.5.0 // indirect go.opencensus.io v0.24.0 // indirect - go.opentelemetry.io/collector/featuregate v0.66.1-0.20221128222955-4ff1ff379b90 // indirect + go.opentelemetry.io/collector/featuregate v0.66.1-0.20221202005155-1c54042beb70 // 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 40f7294872af..35f7ad71dacd 100644 --- a/receiver/sqlserverreceiver/go.sum +++ b/receiver/sqlserverreceiver/go.sum @@ -284,16 +284,18 @@ go.etcd.io/etcd/client/pkg/v3 v3.5.4/go.mod h1:IJHfcCEKxYu1Os13ZdwCwIUTUVGYTSAM3 go.etcd.io/etcd/client/v3 v3.5.4/go.mod h1:ZaRkVgBZC+L+dLCjTcF1hRXpgZXQPOvnA/Ak/gq3kiY= go.opencensus.io v0.24.0 h1:y73uSU6J157QMP2kn2r30vwW1A2W2WFwSCGnAVxeaD0= go.opencensus.io v0.24.0/go.mod h1:vNK8G9p7aAivkbmorf4v+7Hgx+Zs0yY+0fOtgBfjQKo= -go.opentelemetry.io/collector v0.66.1-0.20221128222955-4ff1ff379b90 h1:yRe05/jMdzH4TFHfndZ5h2o2hKBK/79W72j8w51qNsI= -go.opentelemetry.io/collector v0.66.1-0.20221128222955-4ff1ff379b90/go.mod h1:hE6jCs+0rfiufCrVPucKZTMwfHit1okfDPnwPT2eW1I= -go.opentelemetry.io/collector/component v0.66.1-0.20221128222955-4ff1ff379b90 h1:AYSNTXbezhNg43EuYdVVcgxE/2gBVrm00FDx4DOmQVg= -go.opentelemetry.io/collector/component v0.66.1-0.20221128222955-4ff1ff379b90/go.mod h1:0c84EqXUhvYe6KW7hJfh76tiI/5yjWCH2amwyQ06XLM= -go.opentelemetry.io/collector/consumer v0.66.1-0.20221128222955-4ff1ff379b90 h1:nzNXVfC1FzXBXCLMzbMv+qK3E4EGiNsnMhfVsBd2yzc= -go.opentelemetry.io/collector/consumer v0.66.1-0.20221128222955-4ff1ff379b90/go.mod h1:WtoRZa5SnxQO1ZEQdVxYpFcXCmq62rakv0oUSlPO0NQ= -go.opentelemetry.io/collector/featuregate v0.66.1-0.20221128222955-4ff1ff379b90 h1:UuJSFWbi9XxyNZsJKZuvpWg35BgRbcCGFH+38V2MAdw= -go.opentelemetry.io/collector/featuregate v0.66.1-0.20221128222955-4ff1ff379b90/go.mod h1:tewuFKJYalWBU0bmNKg++MC1ipINXUr6szYzOw2p1GI= -go.opentelemetry.io/collector/pdata v0.66.1-0.20221128222955-4ff1ff379b90 h1:Vu4S4jSNcd0VFPzxQNO4+UqGwnes1xJDoFLPRiWHm8I= -go.opentelemetry.io/collector/pdata v0.66.1-0.20221128222955-4ff1ff379b90/go.mod h1:pqyaznLzk21m+1KL6fwOsRryRELL+zNM0qiVSn0MbVc= +go.opentelemetry.io/collector v0.66.1-0.20221202005155-1c54042beb70 h1:INB2CsOtqqrija2KvMuIpbBQ3qX1BECEeR+d0NJX+oM= +go.opentelemetry.io/collector v0.66.1-0.20221202005155-1c54042beb70/go.mod h1:d0NHkHyANJy3HDTvYE/PoylMShUmFIbiir89ieI0X0c= +go.opentelemetry.io/collector/component v0.66.1-0.20221202005155-1c54042beb70 h1:dEoJhzCmRShgmVro/kXm6pouGElgxkH2DsvanzCeZtU= +go.opentelemetry.io/collector/component v0.66.1-0.20221202005155-1c54042beb70/go.mod h1:OsVnvFFe38QSpcuZlQ8cvarDzcloCexgQ1/B2m80F6U= +go.opentelemetry.io/collector/confmap v0.0.0-20221201172708-2bdff61fa52a h1:2TscCXAQASO2kU9xHcMIUM/FP29fiQIRTilZmliq/7I= +go.opentelemetry.io/collector/confmap v0.0.0-20221201172708-2bdff61fa52a/go.mod h1:qJ3e8bA8h4wz/jYlbeEUafVHdrU7DkpStnmIUAz6VTQ= +go.opentelemetry.io/collector/consumer v0.66.1-0.20221202005155-1c54042beb70 h1:XwpVjI1KeKGPXOZBLefGILMziPYuNf6IzbmiIEsIyI0= +go.opentelemetry.io/collector/consumer v0.66.1-0.20221202005155-1c54042beb70/go.mod h1:EWVBcSGcIcmeDGTnIboc/aqa3agsBeH8/q7yFWG7xVc= +go.opentelemetry.io/collector/featuregate v0.66.1-0.20221202005155-1c54042beb70 h1:V0tf4ebciqIs07jFATfLGdUpLRaEsi+AiWuA/in0G8Y= +go.opentelemetry.io/collector/featuregate v0.66.1-0.20221202005155-1c54042beb70/go.mod h1:tewuFKJYalWBU0bmNKg++MC1ipINXUr6szYzOw2p1GI= +go.opentelemetry.io/collector/pdata v0.66.1-0.20221202005155-1c54042beb70 h1:TPOrxkEMvZzfBSwF3ct+kUUgKA5g8unkZZbKQvJweeA= +go.opentelemetry.io/collector/pdata v0.66.1-0.20221202005155-1c54042beb70/go.mod h1:pqyaznLzk21m+1KL6fwOsRryRELL+zNM0qiVSn0MbVc= 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= @@ -313,8 +315,8 @@ go.uber.org/multierr v1.6.0/go.mod h1:cdWPpRnG4AhwMwsgIHip0KRBQjJy5kYEpYjJxpXp9i go.uber.org/multierr v1.8.0 h1:dg6GjLku4EH+249NNmoIciG9N/jURbDG+pFlTkhzIC8= go.uber.org/multierr v1.8.0/go.mod h1:7EAYxJLBy9rStEaz58O2t4Uvip6FSURkq8/ppBp95ak= go.uber.org/zap v1.17.0/go.mod h1:MXVU+bhUf/A7Xi2HNOnopQOrmycQ5Ih87HtOu4q5SSo= -go.uber.org/zap v1.23.0 h1:OjGQ5KQDEUawVHxNwQgPpiypGHOxo2mNZsOqTak4fFY= -go.uber.org/zap v1.23.0/go.mod h1:D+nX8jyLsMHMYrln8A0rJjFt/T/9/bGgIhAqxv5URuY= +go.uber.org/zap v1.24.0 h1:FiJd5l1UOLj0wCgbSE0rwwXHzEdAZS6hiiSnxJN/D60= +go.uber.org/zap v1.24.0/go.mod h1:2kMP+WWQ8aoFoedH3T2sq6iJ2yDWpHbP0f6MQbS9Gkg= golang.org/x/crypto v0.0.0-20180904163835-0709b304e793/go.mod h1:6SG95UA2DQfeDnfUPMdvaQW0Q7yPrPDi9nlGo2tz2b4= golang.org/x/crypto v0.0.0-20190308221718-c2843e01d9a2/go.mod h1:djNgcEr1/C05ACkg1iLfiJU5Ep61QUkGW8qpdssI0+w= golang.org/x/crypto v0.0.0-20190923035154-9ee001bba392/go.mod h1:/lpIB1dKB+9EgE3H3cr1v9wB50oz8l4C4h62xy7jSTY= diff --git a/receiver/statsdreceiver/go.mod b/receiver/statsdreceiver/go.mod index 0515aad92f4d..7900fb10df33 100644 --- a/receiver/statsdreceiver/go.mod +++ b/receiver/statsdreceiver/go.mod @@ -8,13 +8,14 @@ require ( github.com/open-telemetry/opentelemetry-collector-contrib/internal/coreinternal v0.66.0 github.com/stretchr/testify v1.8.1 go.opencensus.io v0.24.0 - go.opentelemetry.io/collector v0.66.1-0.20221128222955-4ff1ff379b90 - go.opentelemetry.io/collector/component v0.66.1-0.20221128222955-4ff1ff379b90 - go.opentelemetry.io/collector/consumer v0.66.1-0.20221128222955-4ff1ff379b90 - go.opentelemetry.io/collector/pdata v0.66.1-0.20221128222955-4ff1ff379b90 + go.opentelemetry.io/collector v0.66.1-0.20221202005155-1c54042beb70 + go.opentelemetry.io/collector/component v0.66.1-0.20221202005155-1c54042beb70 + go.opentelemetry.io/collector/confmap v0.0.0-20221201172708-2bdff61fa52a + go.opentelemetry.io/collector/consumer v0.66.1-0.20221202005155-1c54042beb70 + go.opentelemetry.io/collector/pdata v0.66.1-0.20221202005155-1c54042beb70 go.opentelemetry.io/otel v1.11.1 go.uber.org/multierr v1.8.0 - go.uber.org/zap v1.23.0 + go.uber.org/zap v1.24.0 gonum.org/v1/gonum v0.12.0 ) @@ -45,7 +46,7 @@ require ( 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.opentelemetry.io/collector/featuregate v0.66.1-0.20221128222955-4ff1ff379b90 // indirect + go.opentelemetry.io/collector/featuregate v0.66.1-0.20221202005155-1c54042beb70 // indirect go.opentelemetry.io/otel/exporters/prometheus v0.33.0 // indirect go.opentelemetry.io/otel/metric v0.33.0 // indirect go.opentelemetry.io/otel/sdk v1.11.1 // indirect diff --git a/receiver/statsdreceiver/go.sum b/receiver/statsdreceiver/go.sum index de9443cdde87..65e10d3f6830 100644 --- a/receiver/statsdreceiver/go.sum +++ b/receiver/statsdreceiver/go.sum @@ -373,17 +373,19 @@ go.opencensus.io v0.22.4/go.mod h1:yxeiOL68Rb0Xd1ddK5vPZ/oVn4vY4Ynel7k9FzqtOIw= go.opencensus.io v0.23.0/go.mod h1:XItmlyltB5F7CS4xOC1DcqMoFqwtC6OG2xF7mCv7P7E= go.opencensus.io v0.24.0 h1:y73uSU6J157QMP2kn2r30vwW1A2W2WFwSCGnAVxeaD0= go.opencensus.io v0.24.0/go.mod h1:vNK8G9p7aAivkbmorf4v+7Hgx+Zs0yY+0fOtgBfjQKo= -go.opentelemetry.io/collector v0.66.1-0.20221128222955-4ff1ff379b90 h1:yRe05/jMdzH4TFHfndZ5h2o2hKBK/79W72j8w51qNsI= -go.opentelemetry.io/collector v0.66.1-0.20221128222955-4ff1ff379b90/go.mod h1:hE6jCs+0rfiufCrVPucKZTMwfHit1okfDPnwPT2eW1I= -go.opentelemetry.io/collector/component v0.66.1-0.20221128222955-4ff1ff379b90 h1:AYSNTXbezhNg43EuYdVVcgxE/2gBVrm00FDx4DOmQVg= -go.opentelemetry.io/collector/component v0.66.1-0.20221128222955-4ff1ff379b90/go.mod h1:0c84EqXUhvYe6KW7hJfh76tiI/5yjWCH2amwyQ06XLM= -go.opentelemetry.io/collector/consumer v0.66.1-0.20221128222955-4ff1ff379b90 h1:nzNXVfC1FzXBXCLMzbMv+qK3E4EGiNsnMhfVsBd2yzc= -go.opentelemetry.io/collector/consumer v0.66.1-0.20221128222955-4ff1ff379b90/go.mod h1:WtoRZa5SnxQO1ZEQdVxYpFcXCmq62rakv0oUSlPO0NQ= -go.opentelemetry.io/collector/featuregate v0.66.1-0.20221128222955-4ff1ff379b90 h1:UuJSFWbi9XxyNZsJKZuvpWg35BgRbcCGFH+38V2MAdw= -go.opentelemetry.io/collector/featuregate v0.66.1-0.20221128222955-4ff1ff379b90/go.mod h1:tewuFKJYalWBU0bmNKg++MC1ipINXUr6szYzOw2p1GI= -go.opentelemetry.io/collector/pdata v0.66.1-0.20221128222955-4ff1ff379b90 h1:Vu4S4jSNcd0VFPzxQNO4+UqGwnes1xJDoFLPRiWHm8I= -go.opentelemetry.io/collector/pdata v0.66.1-0.20221128222955-4ff1ff379b90/go.mod h1:pqyaznLzk21m+1KL6fwOsRryRELL+zNM0qiVSn0MbVc= -go.opentelemetry.io/collector/semconv v0.66.1-0.20221128222955-4ff1ff379b90 h1:hFaTA68cggZKWMv7wQ3bKP8KGTbowh/5AQZKCHzHTqM= +go.opentelemetry.io/collector v0.66.1-0.20221202005155-1c54042beb70 h1:INB2CsOtqqrija2KvMuIpbBQ3qX1BECEeR+d0NJX+oM= +go.opentelemetry.io/collector v0.66.1-0.20221202005155-1c54042beb70/go.mod h1:d0NHkHyANJy3HDTvYE/PoylMShUmFIbiir89ieI0X0c= +go.opentelemetry.io/collector/component v0.66.1-0.20221202005155-1c54042beb70 h1:dEoJhzCmRShgmVro/kXm6pouGElgxkH2DsvanzCeZtU= +go.opentelemetry.io/collector/component v0.66.1-0.20221202005155-1c54042beb70/go.mod h1:OsVnvFFe38QSpcuZlQ8cvarDzcloCexgQ1/B2m80F6U= +go.opentelemetry.io/collector/confmap v0.0.0-20221201172708-2bdff61fa52a h1:2TscCXAQASO2kU9xHcMIUM/FP29fiQIRTilZmliq/7I= +go.opentelemetry.io/collector/confmap v0.0.0-20221201172708-2bdff61fa52a/go.mod h1:qJ3e8bA8h4wz/jYlbeEUafVHdrU7DkpStnmIUAz6VTQ= +go.opentelemetry.io/collector/consumer v0.66.1-0.20221202005155-1c54042beb70 h1:XwpVjI1KeKGPXOZBLefGILMziPYuNf6IzbmiIEsIyI0= +go.opentelemetry.io/collector/consumer v0.66.1-0.20221202005155-1c54042beb70/go.mod h1:EWVBcSGcIcmeDGTnIboc/aqa3agsBeH8/q7yFWG7xVc= +go.opentelemetry.io/collector/featuregate v0.66.1-0.20221202005155-1c54042beb70 h1:V0tf4ebciqIs07jFATfLGdUpLRaEsi+AiWuA/in0G8Y= +go.opentelemetry.io/collector/featuregate v0.66.1-0.20221202005155-1c54042beb70/go.mod h1:tewuFKJYalWBU0bmNKg++MC1ipINXUr6szYzOw2p1GI= +go.opentelemetry.io/collector/pdata v0.66.1-0.20221202005155-1c54042beb70 h1:TPOrxkEMvZzfBSwF3ct+kUUgKA5g8unkZZbKQvJweeA= +go.opentelemetry.io/collector/pdata v0.66.1-0.20221202005155-1c54042beb70/go.mod h1:pqyaznLzk21m+1KL6fwOsRryRELL+zNM0qiVSn0MbVc= +go.opentelemetry.io/collector/semconv v0.66.1-0.20221202005155-1c54042beb70 h1:Q5L9Urod3c8as6ZYaoaqBjarx/HXxsxy34DFZIU2fO4= 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= @@ -404,8 +406,8 @@ go.uber.org/multierr v1.6.0/go.mod h1:cdWPpRnG4AhwMwsgIHip0KRBQjJy5kYEpYjJxpXp9i go.uber.org/multierr v1.8.0 h1:dg6GjLku4EH+249NNmoIciG9N/jURbDG+pFlTkhzIC8= go.uber.org/multierr v1.8.0/go.mod h1:7EAYxJLBy9rStEaz58O2t4Uvip6FSURkq8/ppBp95ak= go.uber.org/zap v1.17.0/go.mod h1:MXVU+bhUf/A7Xi2HNOnopQOrmycQ5Ih87HtOu4q5SSo= -go.uber.org/zap v1.23.0 h1:OjGQ5KQDEUawVHxNwQgPpiypGHOxo2mNZsOqTak4fFY= -go.uber.org/zap v1.23.0/go.mod h1:D+nX8jyLsMHMYrln8A0rJjFt/T/9/bGgIhAqxv5URuY= +go.uber.org/zap v1.24.0 h1:FiJd5l1UOLj0wCgbSE0rwwXHzEdAZS6hiiSnxJN/D60= +go.uber.org/zap v1.24.0/go.mod h1:2kMP+WWQ8aoFoedH3T2sq6iJ2yDWpHbP0f6MQbS9Gkg= golang.org/x/crypto v0.0.0-20180904163835-0709b304e793/go.mod h1:6SG95UA2DQfeDnfUPMdvaQW0Q7yPrPDi9nlGo2tz2b4= golang.org/x/crypto v0.0.0-20190308221718-c2843e01d9a2/go.mod h1:djNgcEr1/C05ACkg1iLfiJU5Ep61QUkGW8qpdssI0+w= golang.org/x/crypto v0.0.0-20190510104115-cbcb75029529/go.mod h1:yigFU9vqHzYiE8UmvKecakEJjdnWj3jj499lnFckfCI= diff --git a/receiver/statsdreceiver/receiver.go b/receiver/statsdreceiver/receiver.go index 2b89143b42e3..738c157bbfe6 100644 --- a/receiver/statsdreceiver/receiver.go +++ b/receiver/statsdreceiver/receiver.go @@ -63,7 +63,7 @@ func New( return nil, err } - rep, err := newReporter(config.ID(), set) + rep, err := newReporter(set) if err != nil { return nil, err } @@ -86,7 +86,7 @@ func buildTransportServer(config Config) (transport.Server, error) { return transport.NewUDPServer(config.NetAddr.Endpoint) } - return nil, fmt.Errorf("unsupported transport %q for receiver %v", config.NetAddr.Transport, config.ID()) + return nil, fmt.Errorf("unsupported transport %q", config.NetAddr.Transport) } // Start starts a UDP server that can process StatsD messages. diff --git a/receiver/statsdreceiver/receiver_test.go b/receiver/statsdreceiver/receiver_test.go index ea09fc9ccc39..43cb0e41ff00 100644 --- a/receiver/statsdreceiver/receiver_test.go +++ b/receiver/statsdreceiver/receiver_test.go @@ -67,7 +67,7 @@ func Test_statsdreceiver_New(t *testing.T) { }, nextConsumer: consumertest.NewNop(), }, - wantErr: errors.New("unsupported transport \"unknown\" for receiver statsd"), + wantErr: errors.New("unsupported transport \"unknown\""), }, } for _, tt := range tests { diff --git a/receiver/statsdreceiver/reporter.go b/receiver/statsdreceiver/reporter.go index dd635b10ac19..cc35bc6c912e 100644 --- a/receiver/statsdreceiver/reporter.go +++ b/receiver/statsdreceiver/reporter.go @@ -28,7 +28,6 @@ import ( // reporter struct implements the transport.Reporter interface to give consistent // observability per Collector metric observability package. type reporter struct { - id component.ID logger *zap.Logger sugaredLogger *zap.SugaredLogger // Used for generic debug logging obsrecv *obsreport.Receiver @@ -36,9 +35,9 @@ type reporter struct { var _ transport.Reporter = (*reporter)(nil) -func newReporter(receiverID component.ID, set component.ReceiverCreateSettings) (transport.Reporter, error) { +func newReporter(set component.ReceiverCreateSettings) (transport.Reporter, error) { obsrecv, err := obsreport.NewReceiver(obsreport.ReceiverSettings{ - ReceiverID: receiverID, + ReceiverID: set.ID, Transport: "tcp", ReceiverCreateSettings: set, }) @@ -46,7 +45,6 @@ func newReporter(receiverID component.ID, set component.ReceiverCreateSettings) return nil, err } return &reporter{ - id: receiverID, logger: set.Logger, sugaredLogger: set.Logger.Sugar(), obsrecv: obsrecv, diff --git a/receiver/statsdreceiver/reporter_test.go b/receiver/statsdreceiver/reporter_test.go index 0d1b5bcfd5d1..698c19d7adc2 100644 --- a/receiver/statsdreceiver/reporter_test.go +++ b/receiver/statsdreceiver/reporter_test.go @@ -25,14 +25,14 @@ import ( ) func TestReporterObservability(t *testing.T) { - tt, err := obsreporttest.SetupTelemetry() + receiverID := component.NewIDWithName(typeStr, "fake_receiver") + tt, err := obsreporttest.SetupTelemetryWithID(receiverID) require.NoError(t, err) defer func() { require.NoError(t, tt.Shutdown(context.Background())) }() - receiverID := component.NewIDWithName(typeStr, "fake_receiver") - reporter, err := newReporter(receiverID, tt.ToReceiverCreateSettings()) + reporter, err := newReporter(tt.ToReceiverCreateSettings()) require.NoError(t, err) ctx := reporter.OnDataReceived(context.Background()) diff --git a/receiver/syslogreceiver/go.mod b/receiver/syslogreceiver/go.mod index 6260ec432653..23447e128ca2 100644 --- a/receiver/syslogreceiver/go.mod +++ b/receiver/syslogreceiver/go.mod @@ -5,10 +5,11 @@ go 1.18 require ( github.com/open-telemetry/opentelemetry-collector-contrib/pkg/stanza v0.66.0 github.com/stretchr/testify v1.8.1 - go.opentelemetry.io/collector v0.66.1-0.20221128222955-4ff1ff379b90 - go.opentelemetry.io/collector/component v0.66.1-0.20221128222955-4ff1ff379b90 - go.opentelemetry.io/collector/consumer v0.66.1-0.20221128222955-4ff1ff379b90 - go.opentelemetry.io/collector/pdata v0.66.1-0.20221128222955-4ff1ff379b90 + go.opentelemetry.io/collector v0.66.1-0.20221202005155-1c54042beb70 + go.opentelemetry.io/collector/component v0.66.1-0.20221202005155-1c54042beb70 + go.opentelemetry.io/collector/confmap v0.0.0-20221201172708-2bdff61fa52a + go.opentelemetry.io/collector/consumer v0.66.1-0.20221202005155-1c54042beb70 + go.opentelemetry.io/collector/pdata v0.66.1-0.20221202005155-1c54042beb70 ) require ( @@ -33,13 +34,13 @@ require ( github.com/pmezard/go-difflib v1.0.0 // indirect github.com/rogpeppe/go-internal v1.8.1 // indirect go.opencensus.io v0.24.0 // indirect - go.opentelemetry.io/collector/featuregate v0.66.1-0.20221128222955-4ff1ff379b90 // indirect + go.opentelemetry.io/collector/featuregate v0.66.1-0.20221202005155-1c54042beb70 // 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 go.uber.org/atomic v1.10.0 // indirect go.uber.org/multierr v1.8.0 // indirect - go.uber.org/zap v1.23.0 // indirect + go.uber.org/zap v1.24.0 // indirect golang.org/x/net v0.0.0-20220722155237-a158d28d115b // indirect golang.org/x/sys v0.2.0 // indirect golang.org/x/text v0.4.0 // indirect diff --git a/receiver/syslogreceiver/go.sum b/receiver/syslogreceiver/go.sum index a791a4a0417b..cde41feece47 100644 --- a/receiver/syslogreceiver/go.sum +++ b/receiver/syslogreceiver/go.sum @@ -310,16 +310,18 @@ go.etcd.io/etcd/client/pkg/v3 v3.5.4/go.mod h1:IJHfcCEKxYu1Os13ZdwCwIUTUVGYTSAM3 go.etcd.io/etcd/client/v3 v3.5.4/go.mod h1:ZaRkVgBZC+L+dLCjTcF1hRXpgZXQPOvnA/Ak/gq3kiY= go.opencensus.io v0.24.0 h1:y73uSU6J157QMP2kn2r30vwW1A2W2WFwSCGnAVxeaD0= go.opencensus.io v0.24.0/go.mod h1:vNK8G9p7aAivkbmorf4v+7Hgx+Zs0yY+0fOtgBfjQKo= -go.opentelemetry.io/collector v0.66.1-0.20221128222955-4ff1ff379b90 h1:yRe05/jMdzH4TFHfndZ5h2o2hKBK/79W72j8w51qNsI= -go.opentelemetry.io/collector v0.66.1-0.20221128222955-4ff1ff379b90/go.mod h1:hE6jCs+0rfiufCrVPucKZTMwfHit1okfDPnwPT2eW1I= -go.opentelemetry.io/collector/component v0.66.1-0.20221128222955-4ff1ff379b90 h1:AYSNTXbezhNg43EuYdVVcgxE/2gBVrm00FDx4DOmQVg= -go.opentelemetry.io/collector/component v0.66.1-0.20221128222955-4ff1ff379b90/go.mod h1:0c84EqXUhvYe6KW7hJfh76tiI/5yjWCH2amwyQ06XLM= -go.opentelemetry.io/collector/consumer v0.66.1-0.20221128222955-4ff1ff379b90 h1:nzNXVfC1FzXBXCLMzbMv+qK3E4EGiNsnMhfVsBd2yzc= -go.opentelemetry.io/collector/consumer v0.66.1-0.20221128222955-4ff1ff379b90/go.mod h1:WtoRZa5SnxQO1ZEQdVxYpFcXCmq62rakv0oUSlPO0NQ= -go.opentelemetry.io/collector/featuregate v0.66.1-0.20221128222955-4ff1ff379b90 h1:UuJSFWbi9XxyNZsJKZuvpWg35BgRbcCGFH+38V2MAdw= -go.opentelemetry.io/collector/featuregate v0.66.1-0.20221128222955-4ff1ff379b90/go.mod h1:tewuFKJYalWBU0bmNKg++MC1ipINXUr6szYzOw2p1GI= -go.opentelemetry.io/collector/pdata v0.66.1-0.20221128222955-4ff1ff379b90 h1:Vu4S4jSNcd0VFPzxQNO4+UqGwnes1xJDoFLPRiWHm8I= -go.opentelemetry.io/collector/pdata v0.66.1-0.20221128222955-4ff1ff379b90/go.mod h1:pqyaznLzk21m+1KL6fwOsRryRELL+zNM0qiVSn0MbVc= +go.opentelemetry.io/collector v0.66.1-0.20221202005155-1c54042beb70 h1:INB2CsOtqqrija2KvMuIpbBQ3qX1BECEeR+d0NJX+oM= +go.opentelemetry.io/collector v0.66.1-0.20221202005155-1c54042beb70/go.mod h1:d0NHkHyANJy3HDTvYE/PoylMShUmFIbiir89ieI0X0c= +go.opentelemetry.io/collector/component v0.66.1-0.20221202005155-1c54042beb70 h1:dEoJhzCmRShgmVro/kXm6pouGElgxkH2DsvanzCeZtU= +go.opentelemetry.io/collector/component v0.66.1-0.20221202005155-1c54042beb70/go.mod h1:OsVnvFFe38QSpcuZlQ8cvarDzcloCexgQ1/B2m80F6U= +go.opentelemetry.io/collector/confmap v0.0.0-20221201172708-2bdff61fa52a h1:2TscCXAQASO2kU9xHcMIUM/FP29fiQIRTilZmliq/7I= +go.opentelemetry.io/collector/confmap v0.0.0-20221201172708-2bdff61fa52a/go.mod h1:qJ3e8bA8h4wz/jYlbeEUafVHdrU7DkpStnmIUAz6VTQ= +go.opentelemetry.io/collector/consumer v0.66.1-0.20221202005155-1c54042beb70 h1:XwpVjI1KeKGPXOZBLefGILMziPYuNf6IzbmiIEsIyI0= +go.opentelemetry.io/collector/consumer v0.66.1-0.20221202005155-1c54042beb70/go.mod h1:EWVBcSGcIcmeDGTnIboc/aqa3agsBeH8/q7yFWG7xVc= +go.opentelemetry.io/collector/featuregate v0.66.1-0.20221202005155-1c54042beb70 h1:V0tf4ebciqIs07jFATfLGdUpLRaEsi+AiWuA/in0G8Y= +go.opentelemetry.io/collector/featuregate v0.66.1-0.20221202005155-1c54042beb70/go.mod h1:tewuFKJYalWBU0bmNKg++MC1ipINXUr6szYzOw2p1GI= +go.opentelemetry.io/collector/pdata v0.66.1-0.20221202005155-1c54042beb70 h1:TPOrxkEMvZzfBSwF3ct+kUUgKA5g8unkZZbKQvJweeA= +go.opentelemetry.io/collector/pdata v0.66.1-0.20221202005155-1c54042beb70/go.mod h1:pqyaznLzk21m+1KL6fwOsRryRELL+zNM0qiVSn0MbVc= 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= @@ -338,8 +340,8 @@ go.uber.org/multierr v1.6.0/go.mod h1:cdWPpRnG4AhwMwsgIHip0KRBQjJy5kYEpYjJxpXp9i go.uber.org/multierr v1.8.0 h1:dg6GjLku4EH+249NNmoIciG9N/jURbDG+pFlTkhzIC8= go.uber.org/multierr v1.8.0/go.mod h1:7EAYxJLBy9rStEaz58O2t4Uvip6FSURkq8/ppBp95ak= go.uber.org/zap v1.17.0/go.mod h1:MXVU+bhUf/A7Xi2HNOnopQOrmycQ5Ih87HtOu4q5SSo= -go.uber.org/zap v1.23.0 h1:OjGQ5KQDEUawVHxNwQgPpiypGHOxo2mNZsOqTak4fFY= -go.uber.org/zap v1.23.0/go.mod h1:D+nX8jyLsMHMYrln8A0rJjFt/T/9/bGgIhAqxv5URuY= +go.uber.org/zap v1.24.0 h1:FiJd5l1UOLj0wCgbSE0rwwXHzEdAZS6hiiSnxJN/D60= +go.uber.org/zap v1.24.0/go.mod h1:2kMP+WWQ8aoFoedH3T2sq6iJ2yDWpHbP0f6MQbS9Gkg= golang.org/x/crypto v0.0.0-20180904163835-0709b304e793/go.mod h1:6SG95UA2DQfeDnfUPMdvaQW0Q7yPrPDi9nlGo2tz2b4= golang.org/x/crypto v0.0.0-20190308221718-c2843e01d9a2/go.mod h1:djNgcEr1/C05ACkg1iLfiJU5Ep61QUkGW8qpdssI0+w= golang.org/x/crypto v0.0.0-20190923035154-9ee001bba392/go.mod h1:/lpIB1dKB+9EgE3H3cr1v9wB50oz8l4C4h62xy7jSTY= diff --git a/receiver/tcplogreceiver/go.mod b/receiver/tcplogreceiver/go.mod index 50ee5c270661..4c78a87b2ce3 100644 --- a/receiver/tcplogreceiver/go.mod +++ b/receiver/tcplogreceiver/go.mod @@ -5,9 +5,10 @@ go 1.18 require ( github.com/open-telemetry/opentelemetry-collector-contrib/pkg/stanza v0.66.0 github.com/stretchr/testify v1.8.1 - go.opentelemetry.io/collector v0.66.1-0.20221128222955-4ff1ff379b90 - go.opentelemetry.io/collector/component v0.66.1-0.20221128222955-4ff1ff379b90 - go.opentelemetry.io/collector/consumer v0.66.1-0.20221128222955-4ff1ff379b90 + go.opentelemetry.io/collector v0.66.1-0.20221202005155-1c54042beb70 + go.opentelemetry.io/collector/component v0.66.1-0.20221202005155-1c54042beb70 + go.opentelemetry.io/collector/confmap v0.0.0-20221201172708-2bdff61fa52a + go.opentelemetry.io/collector/consumer v0.66.1-0.20221202005155-1c54042beb70 ) require ( @@ -30,14 +31,14 @@ require ( github.com/pmezard/go-difflib v1.0.0 // indirect github.com/rogpeppe/go-internal v1.8.1 // indirect go.opencensus.io v0.24.0 // indirect - go.opentelemetry.io/collector/featuregate v0.66.1-0.20221128222955-4ff1ff379b90 // indirect - go.opentelemetry.io/collector/pdata v0.66.1-0.20221128222955-4ff1ff379b90 // indirect + go.opentelemetry.io/collector/featuregate v0.66.1-0.20221202005155-1c54042beb70 // indirect + go.opentelemetry.io/collector/pdata v0.66.1-0.20221202005155-1c54042beb70 // 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 go.uber.org/atomic v1.10.0 // indirect go.uber.org/multierr v1.8.0 // indirect - go.uber.org/zap v1.23.0 // indirect + go.uber.org/zap v1.24.0 // indirect golang.org/x/net v0.0.0-20220722155237-a158d28d115b // indirect golang.org/x/sys v0.2.0 // indirect golang.org/x/text v0.4.0 // indirect diff --git a/receiver/tcplogreceiver/go.sum b/receiver/tcplogreceiver/go.sum index bc0a23252984..fec5d76c58df 100644 --- a/receiver/tcplogreceiver/go.sum +++ b/receiver/tcplogreceiver/go.sum @@ -306,16 +306,18 @@ go.etcd.io/etcd/client/pkg/v3 v3.5.4/go.mod h1:IJHfcCEKxYu1Os13ZdwCwIUTUVGYTSAM3 go.etcd.io/etcd/client/v3 v3.5.4/go.mod h1:ZaRkVgBZC+L+dLCjTcF1hRXpgZXQPOvnA/Ak/gq3kiY= go.opencensus.io v0.24.0 h1:y73uSU6J157QMP2kn2r30vwW1A2W2WFwSCGnAVxeaD0= go.opencensus.io v0.24.0/go.mod h1:vNK8G9p7aAivkbmorf4v+7Hgx+Zs0yY+0fOtgBfjQKo= -go.opentelemetry.io/collector v0.66.1-0.20221128222955-4ff1ff379b90 h1:yRe05/jMdzH4TFHfndZ5h2o2hKBK/79W72j8w51qNsI= -go.opentelemetry.io/collector v0.66.1-0.20221128222955-4ff1ff379b90/go.mod h1:hE6jCs+0rfiufCrVPucKZTMwfHit1okfDPnwPT2eW1I= -go.opentelemetry.io/collector/component v0.66.1-0.20221128222955-4ff1ff379b90 h1:AYSNTXbezhNg43EuYdVVcgxE/2gBVrm00FDx4DOmQVg= -go.opentelemetry.io/collector/component v0.66.1-0.20221128222955-4ff1ff379b90/go.mod h1:0c84EqXUhvYe6KW7hJfh76tiI/5yjWCH2amwyQ06XLM= -go.opentelemetry.io/collector/consumer v0.66.1-0.20221128222955-4ff1ff379b90 h1:nzNXVfC1FzXBXCLMzbMv+qK3E4EGiNsnMhfVsBd2yzc= -go.opentelemetry.io/collector/consumer v0.66.1-0.20221128222955-4ff1ff379b90/go.mod h1:WtoRZa5SnxQO1ZEQdVxYpFcXCmq62rakv0oUSlPO0NQ= -go.opentelemetry.io/collector/featuregate v0.66.1-0.20221128222955-4ff1ff379b90 h1:UuJSFWbi9XxyNZsJKZuvpWg35BgRbcCGFH+38V2MAdw= -go.opentelemetry.io/collector/featuregate v0.66.1-0.20221128222955-4ff1ff379b90/go.mod h1:tewuFKJYalWBU0bmNKg++MC1ipINXUr6szYzOw2p1GI= -go.opentelemetry.io/collector/pdata v0.66.1-0.20221128222955-4ff1ff379b90 h1:Vu4S4jSNcd0VFPzxQNO4+UqGwnes1xJDoFLPRiWHm8I= -go.opentelemetry.io/collector/pdata v0.66.1-0.20221128222955-4ff1ff379b90/go.mod h1:pqyaznLzk21m+1KL6fwOsRryRELL+zNM0qiVSn0MbVc= +go.opentelemetry.io/collector v0.66.1-0.20221202005155-1c54042beb70 h1:INB2CsOtqqrija2KvMuIpbBQ3qX1BECEeR+d0NJX+oM= +go.opentelemetry.io/collector v0.66.1-0.20221202005155-1c54042beb70/go.mod h1:d0NHkHyANJy3HDTvYE/PoylMShUmFIbiir89ieI0X0c= +go.opentelemetry.io/collector/component v0.66.1-0.20221202005155-1c54042beb70 h1:dEoJhzCmRShgmVro/kXm6pouGElgxkH2DsvanzCeZtU= +go.opentelemetry.io/collector/component v0.66.1-0.20221202005155-1c54042beb70/go.mod h1:OsVnvFFe38QSpcuZlQ8cvarDzcloCexgQ1/B2m80F6U= +go.opentelemetry.io/collector/confmap v0.0.0-20221201172708-2bdff61fa52a h1:2TscCXAQASO2kU9xHcMIUM/FP29fiQIRTilZmliq/7I= +go.opentelemetry.io/collector/confmap v0.0.0-20221201172708-2bdff61fa52a/go.mod h1:qJ3e8bA8h4wz/jYlbeEUafVHdrU7DkpStnmIUAz6VTQ= +go.opentelemetry.io/collector/consumer v0.66.1-0.20221202005155-1c54042beb70 h1:XwpVjI1KeKGPXOZBLefGILMziPYuNf6IzbmiIEsIyI0= +go.opentelemetry.io/collector/consumer v0.66.1-0.20221202005155-1c54042beb70/go.mod h1:EWVBcSGcIcmeDGTnIboc/aqa3agsBeH8/q7yFWG7xVc= +go.opentelemetry.io/collector/featuregate v0.66.1-0.20221202005155-1c54042beb70 h1:V0tf4ebciqIs07jFATfLGdUpLRaEsi+AiWuA/in0G8Y= +go.opentelemetry.io/collector/featuregate v0.66.1-0.20221202005155-1c54042beb70/go.mod h1:tewuFKJYalWBU0bmNKg++MC1ipINXUr6szYzOw2p1GI= +go.opentelemetry.io/collector/pdata v0.66.1-0.20221202005155-1c54042beb70 h1:TPOrxkEMvZzfBSwF3ct+kUUgKA5g8unkZZbKQvJweeA= +go.opentelemetry.io/collector/pdata v0.66.1-0.20221202005155-1c54042beb70/go.mod h1:pqyaznLzk21m+1KL6fwOsRryRELL+zNM0qiVSn0MbVc= 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= @@ -334,8 +336,8 @@ go.uber.org/multierr v1.6.0/go.mod h1:cdWPpRnG4AhwMwsgIHip0KRBQjJy5kYEpYjJxpXp9i go.uber.org/multierr v1.8.0 h1:dg6GjLku4EH+249NNmoIciG9N/jURbDG+pFlTkhzIC8= go.uber.org/multierr v1.8.0/go.mod h1:7EAYxJLBy9rStEaz58O2t4Uvip6FSURkq8/ppBp95ak= go.uber.org/zap v1.17.0/go.mod h1:MXVU+bhUf/A7Xi2HNOnopQOrmycQ5Ih87HtOu4q5SSo= -go.uber.org/zap v1.23.0 h1:OjGQ5KQDEUawVHxNwQgPpiypGHOxo2mNZsOqTak4fFY= -go.uber.org/zap v1.23.0/go.mod h1:D+nX8jyLsMHMYrln8A0rJjFt/T/9/bGgIhAqxv5URuY= +go.uber.org/zap v1.24.0 h1:FiJd5l1UOLj0wCgbSE0rwwXHzEdAZS6hiiSnxJN/D60= +go.uber.org/zap v1.24.0/go.mod h1:2kMP+WWQ8aoFoedH3T2sq6iJ2yDWpHbP0f6MQbS9Gkg= golang.org/x/crypto v0.0.0-20180904163835-0709b304e793/go.mod h1:6SG95UA2DQfeDnfUPMdvaQW0Q7yPrPDi9nlGo2tz2b4= golang.org/x/crypto v0.0.0-20190308221718-c2843e01d9a2/go.mod h1:djNgcEr1/C05ACkg1iLfiJU5Ep61QUkGW8qpdssI0+w= golang.org/x/crypto v0.0.0-20190923035154-9ee001bba392/go.mod h1:/lpIB1dKB+9EgE3H3cr1v9wB50oz8l4C4h62xy7jSTY= diff --git a/receiver/udplogreceiver/go.mod b/receiver/udplogreceiver/go.mod index ab854b63c281..f00a17be79c2 100644 --- a/receiver/udplogreceiver/go.mod +++ b/receiver/udplogreceiver/go.mod @@ -5,9 +5,10 @@ go 1.18 require ( github.com/open-telemetry/opentelemetry-collector-contrib/pkg/stanza v0.66.0 github.com/stretchr/testify v1.8.1 - go.opentelemetry.io/collector v0.66.1-0.20221128222955-4ff1ff379b90 - go.opentelemetry.io/collector/component v0.66.1-0.20221128222955-4ff1ff379b90 - go.opentelemetry.io/collector/consumer v0.66.1-0.20221128222955-4ff1ff379b90 + go.opentelemetry.io/collector v0.66.1-0.20221202005155-1c54042beb70 + go.opentelemetry.io/collector/component v0.66.1-0.20221202005155-1c54042beb70 + go.opentelemetry.io/collector/confmap v0.0.0-20221201172708-2bdff61fa52a + go.opentelemetry.io/collector/consumer v0.66.1-0.20221202005155-1c54042beb70 ) require ( @@ -29,14 +30,14 @@ require ( github.com/pmezard/go-difflib v1.0.0 // indirect github.com/rogpeppe/go-internal v1.8.1 // indirect go.opencensus.io v0.24.0 // indirect - go.opentelemetry.io/collector/featuregate v0.66.1-0.20221128222955-4ff1ff379b90 // indirect - go.opentelemetry.io/collector/pdata v0.66.1-0.20221128222955-4ff1ff379b90 // indirect + go.opentelemetry.io/collector/featuregate v0.66.1-0.20221202005155-1c54042beb70 // indirect + go.opentelemetry.io/collector/pdata v0.66.1-0.20221202005155-1c54042beb70 // 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 go.uber.org/atomic v1.10.0 // indirect go.uber.org/multierr v1.8.0 // indirect - go.uber.org/zap v1.23.0 // indirect + go.uber.org/zap v1.24.0 // indirect golang.org/x/net v0.0.0-20220722155237-a158d28d115b // indirect golang.org/x/sys v0.2.0 // indirect golang.org/x/text v0.4.0 // indirect diff --git a/receiver/udplogreceiver/go.sum b/receiver/udplogreceiver/go.sum index bc5848452b04..ab674d893c76 100644 --- a/receiver/udplogreceiver/go.sum +++ b/receiver/udplogreceiver/go.sum @@ -305,16 +305,18 @@ go.etcd.io/etcd/client/pkg/v3 v3.5.4/go.mod h1:IJHfcCEKxYu1Os13ZdwCwIUTUVGYTSAM3 go.etcd.io/etcd/client/v3 v3.5.4/go.mod h1:ZaRkVgBZC+L+dLCjTcF1hRXpgZXQPOvnA/Ak/gq3kiY= go.opencensus.io v0.24.0 h1:y73uSU6J157QMP2kn2r30vwW1A2W2WFwSCGnAVxeaD0= go.opencensus.io v0.24.0/go.mod h1:vNK8G9p7aAivkbmorf4v+7Hgx+Zs0yY+0fOtgBfjQKo= -go.opentelemetry.io/collector v0.66.1-0.20221128222955-4ff1ff379b90 h1:yRe05/jMdzH4TFHfndZ5h2o2hKBK/79W72j8w51qNsI= -go.opentelemetry.io/collector v0.66.1-0.20221128222955-4ff1ff379b90/go.mod h1:hE6jCs+0rfiufCrVPucKZTMwfHit1okfDPnwPT2eW1I= -go.opentelemetry.io/collector/component v0.66.1-0.20221128222955-4ff1ff379b90 h1:AYSNTXbezhNg43EuYdVVcgxE/2gBVrm00FDx4DOmQVg= -go.opentelemetry.io/collector/component v0.66.1-0.20221128222955-4ff1ff379b90/go.mod h1:0c84EqXUhvYe6KW7hJfh76tiI/5yjWCH2amwyQ06XLM= -go.opentelemetry.io/collector/consumer v0.66.1-0.20221128222955-4ff1ff379b90 h1:nzNXVfC1FzXBXCLMzbMv+qK3E4EGiNsnMhfVsBd2yzc= -go.opentelemetry.io/collector/consumer v0.66.1-0.20221128222955-4ff1ff379b90/go.mod h1:WtoRZa5SnxQO1ZEQdVxYpFcXCmq62rakv0oUSlPO0NQ= -go.opentelemetry.io/collector/featuregate v0.66.1-0.20221128222955-4ff1ff379b90 h1:UuJSFWbi9XxyNZsJKZuvpWg35BgRbcCGFH+38V2MAdw= -go.opentelemetry.io/collector/featuregate v0.66.1-0.20221128222955-4ff1ff379b90/go.mod h1:tewuFKJYalWBU0bmNKg++MC1ipINXUr6szYzOw2p1GI= -go.opentelemetry.io/collector/pdata v0.66.1-0.20221128222955-4ff1ff379b90 h1:Vu4S4jSNcd0VFPzxQNO4+UqGwnes1xJDoFLPRiWHm8I= -go.opentelemetry.io/collector/pdata v0.66.1-0.20221128222955-4ff1ff379b90/go.mod h1:pqyaznLzk21m+1KL6fwOsRryRELL+zNM0qiVSn0MbVc= +go.opentelemetry.io/collector v0.66.1-0.20221202005155-1c54042beb70 h1:INB2CsOtqqrija2KvMuIpbBQ3qX1BECEeR+d0NJX+oM= +go.opentelemetry.io/collector v0.66.1-0.20221202005155-1c54042beb70/go.mod h1:d0NHkHyANJy3HDTvYE/PoylMShUmFIbiir89ieI0X0c= +go.opentelemetry.io/collector/component v0.66.1-0.20221202005155-1c54042beb70 h1:dEoJhzCmRShgmVro/kXm6pouGElgxkH2DsvanzCeZtU= +go.opentelemetry.io/collector/component v0.66.1-0.20221202005155-1c54042beb70/go.mod h1:OsVnvFFe38QSpcuZlQ8cvarDzcloCexgQ1/B2m80F6U= +go.opentelemetry.io/collector/confmap v0.0.0-20221201172708-2bdff61fa52a h1:2TscCXAQASO2kU9xHcMIUM/FP29fiQIRTilZmliq/7I= +go.opentelemetry.io/collector/confmap v0.0.0-20221201172708-2bdff61fa52a/go.mod h1:qJ3e8bA8h4wz/jYlbeEUafVHdrU7DkpStnmIUAz6VTQ= +go.opentelemetry.io/collector/consumer v0.66.1-0.20221202005155-1c54042beb70 h1:XwpVjI1KeKGPXOZBLefGILMziPYuNf6IzbmiIEsIyI0= +go.opentelemetry.io/collector/consumer v0.66.1-0.20221202005155-1c54042beb70/go.mod h1:EWVBcSGcIcmeDGTnIboc/aqa3agsBeH8/q7yFWG7xVc= +go.opentelemetry.io/collector/featuregate v0.66.1-0.20221202005155-1c54042beb70 h1:V0tf4ebciqIs07jFATfLGdUpLRaEsi+AiWuA/in0G8Y= +go.opentelemetry.io/collector/featuregate v0.66.1-0.20221202005155-1c54042beb70/go.mod h1:tewuFKJYalWBU0bmNKg++MC1ipINXUr6szYzOw2p1GI= +go.opentelemetry.io/collector/pdata v0.66.1-0.20221202005155-1c54042beb70 h1:TPOrxkEMvZzfBSwF3ct+kUUgKA5g8unkZZbKQvJweeA= +go.opentelemetry.io/collector/pdata v0.66.1-0.20221202005155-1c54042beb70/go.mod h1:pqyaznLzk21m+1KL6fwOsRryRELL+zNM0qiVSn0MbVc= 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= @@ -333,8 +335,8 @@ go.uber.org/multierr v1.6.0/go.mod h1:cdWPpRnG4AhwMwsgIHip0KRBQjJy5kYEpYjJxpXp9i go.uber.org/multierr v1.8.0 h1:dg6GjLku4EH+249NNmoIciG9N/jURbDG+pFlTkhzIC8= go.uber.org/multierr v1.8.0/go.mod h1:7EAYxJLBy9rStEaz58O2t4Uvip6FSURkq8/ppBp95ak= go.uber.org/zap v1.17.0/go.mod h1:MXVU+bhUf/A7Xi2HNOnopQOrmycQ5Ih87HtOu4q5SSo= -go.uber.org/zap v1.23.0 h1:OjGQ5KQDEUawVHxNwQgPpiypGHOxo2mNZsOqTak4fFY= -go.uber.org/zap v1.23.0/go.mod h1:D+nX8jyLsMHMYrln8A0rJjFt/T/9/bGgIhAqxv5URuY= +go.uber.org/zap v1.24.0 h1:FiJd5l1UOLj0wCgbSE0rwwXHzEdAZS6hiiSnxJN/D60= +go.uber.org/zap v1.24.0/go.mod h1:2kMP+WWQ8aoFoedH3T2sq6iJ2yDWpHbP0f6MQbS9Gkg= golang.org/x/crypto v0.0.0-20180904163835-0709b304e793/go.mod h1:6SG95UA2DQfeDnfUPMdvaQW0Q7yPrPDi9nlGo2tz2b4= golang.org/x/crypto v0.0.0-20190308221718-c2843e01d9a2/go.mod h1:djNgcEr1/C05ACkg1iLfiJU5Ep61QUkGW8qpdssI0+w= golang.org/x/crypto v0.0.0-20190923035154-9ee001bba392/go.mod h1:/lpIB1dKB+9EgE3H3cr1v9wB50oz8l4C4h62xy7jSTY= diff --git a/receiver/vcenterreceiver/go.mod b/receiver/vcenterreceiver/go.mod index 25e2783e047d..c2be8affdb2e 100644 --- a/receiver/vcenterreceiver/go.mod +++ b/receiver/vcenterreceiver/go.mod @@ -8,12 +8,13 @@ require ( github.com/open-telemetry/opentelemetry-collector-contrib/internal/scrapertest v0.66.0 github.com/stretchr/testify v1.8.1 github.com/vmware/govmomi v0.29.0 - go.opentelemetry.io/collector v0.66.1-0.20221128222955-4ff1ff379b90 - go.opentelemetry.io/collector/component v0.66.1-0.20221128222955-4ff1ff379b90 - go.opentelemetry.io/collector/consumer v0.66.1-0.20221128222955-4ff1ff379b90 - go.opentelemetry.io/collector/pdata v0.66.1-0.20221128222955-4ff1ff379b90 + go.opentelemetry.io/collector v0.66.1-0.20221202005155-1c54042beb70 + go.opentelemetry.io/collector/component v0.66.1-0.20221202005155-1c54042beb70 + go.opentelemetry.io/collector/confmap v0.0.0-20221201172708-2bdff61fa52a + go.opentelemetry.io/collector/consumer v0.66.1-0.20221202005155-1c54042beb70 + go.opentelemetry.io/collector/pdata v0.66.1-0.20221202005155-1c54042beb70 go.uber.org/multierr v1.8.0 - go.uber.org/zap v1.23.0 + go.uber.org/zap v1.24.0 ) require ( @@ -34,7 +35,7 @@ require ( github.com/pmezard/go-difflib v1.0.0 // indirect github.com/rogpeppe/go-internal v1.8.0 // indirect go.opencensus.io v0.24.0 // indirect - go.opentelemetry.io/collector/featuregate v0.66.1-0.20221128222955-4ff1ff379b90 // indirect + go.opentelemetry.io/collector/featuregate v0.66.1-0.20221202005155-1c54042beb70 // 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 383099baa137..d6e205e4eccb 100644 --- a/receiver/vcenterreceiver/go.sum +++ b/receiver/vcenterreceiver/go.sum @@ -291,16 +291,18 @@ go.etcd.io/etcd/client/pkg/v3 v3.5.4/go.mod h1:IJHfcCEKxYu1Os13ZdwCwIUTUVGYTSAM3 go.etcd.io/etcd/client/v3 v3.5.4/go.mod h1:ZaRkVgBZC+L+dLCjTcF1hRXpgZXQPOvnA/Ak/gq3kiY= go.opencensus.io v0.24.0 h1:y73uSU6J157QMP2kn2r30vwW1A2W2WFwSCGnAVxeaD0= go.opencensus.io v0.24.0/go.mod h1:vNK8G9p7aAivkbmorf4v+7Hgx+Zs0yY+0fOtgBfjQKo= -go.opentelemetry.io/collector v0.66.1-0.20221128222955-4ff1ff379b90 h1:yRe05/jMdzH4TFHfndZ5h2o2hKBK/79W72j8w51qNsI= -go.opentelemetry.io/collector v0.66.1-0.20221128222955-4ff1ff379b90/go.mod h1:hE6jCs+0rfiufCrVPucKZTMwfHit1okfDPnwPT2eW1I= -go.opentelemetry.io/collector/component v0.66.1-0.20221128222955-4ff1ff379b90 h1:AYSNTXbezhNg43EuYdVVcgxE/2gBVrm00FDx4DOmQVg= -go.opentelemetry.io/collector/component v0.66.1-0.20221128222955-4ff1ff379b90/go.mod h1:0c84EqXUhvYe6KW7hJfh76tiI/5yjWCH2amwyQ06XLM= -go.opentelemetry.io/collector/consumer v0.66.1-0.20221128222955-4ff1ff379b90 h1:nzNXVfC1FzXBXCLMzbMv+qK3E4EGiNsnMhfVsBd2yzc= -go.opentelemetry.io/collector/consumer v0.66.1-0.20221128222955-4ff1ff379b90/go.mod h1:WtoRZa5SnxQO1ZEQdVxYpFcXCmq62rakv0oUSlPO0NQ= -go.opentelemetry.io/collector/featuregate v0.66.1-0.20221128222955-4ff1ff379b90 h1:UuJSFWbi9XxyNZsJKZuvpWg35BgRbcCGFH+38V2MAdw= -go.opentelemetry.io/collector/featuregate v0.66.1-0.20221128222955-4ff1ff379b90/go.mod h1:tewuFKJYalWBU0bmNKg++MC1ipINXUr6szYzOw2p1GI= -go.opentelemetry.io/collector/pdata v0.66.1-0.20221128222955-4ff1ff379b90 h1:Vu4S4jSNcd0VFPzxQNO4+UqGwnes1xJDoFLPRiWHm8I= -go.opentelemetry.io/collector/pdata v0.66.1-0.20221128222955-4ff1ff379b90/go.mod h1:pqyaznLzk21m+1KL6fwOsRryRELL+zNM0qiVSn0MbVc= +go.opentelemetry.io/collector v0.66.1-0.20221202005155-1c54042beb70 h1:INB2CsOtqqrija2KvMuIpbBQ3qX1BECEeR+d0NJX+oM= +go.opentelemetry.io/collector v0.66.1-0.20221202005155-1c54042beb70/go.mod h1:d0NHkHyANJy3HDTvYE/PoylMShUmFIbiir89ieI0X0c= +go.opentelemetry.io/collector/component v0.66.1-0.20221202005155-1c54042beb70 h1:dEoJhzCmRShgmVro/kXm6pouGElgxkH2DsvanzCeZtU= +go.opentelemetry.io/collector/component v0.66.1-0.20221202005155-1c54042beb70/go.mod h1:OsVnvFFe38QSpcuZlQ8cvarDzcloCexgQ1/B2m80F6U= +go.opentelemetry.io/collector/confmap v0.0.0-20221201172708-2bdff61fa52a h1:2TscCXAQASO2kU9xHcMIUM/FP29fiQIRTilZmliq/7I= +go.opentelemetry.io/collector/confmap v0.0.0-20221201172708-2bdff61fa52a/go.mod h1:qJ3e8bA8h4wz/jYlbeEUafVHdrU7DkpStnmIUAz6VTQ= +go.opentelemetry.io/collector/consumer v0.66.1-0.20221202005155-1c54042beb70 h1:XwpVjI1KeKGPXOZBLefGILMziPYuNf6IzbmiIEsIyI0= +go.opentelemetry.io/collector/consumer v0.66.1-0.20221202005155-1c54042beb70/go.mod h1:EWVBcSGcIcmeDGTnIboc/aqa3agsBeH8/q7yFWG7xVc= +go.opentelemetry.io/collector/featuregate v0.66.1-0.20221202005155-1c54042beb70 h1:V0tf4ebciqIs07jFATfLGdUpLRaEsi+AiWuA/in0G8Y= +go.opentelemetry.io/collector/featuregate v0.66.1-0.20221202005155-1c54042beb70/go.mod h1:tewuFKJYalWBU0bmNKg++MC1ipINXUr6szYzOw2p1GI= +go.opentelemetry.io/collector/pdata v0.66.1-0.20221202005155-1c54042beb70 h1:TPOrxkEMvZzfBSwF3ct+kUUgKA5g8unkZZbKQvJweeA= +go.opentelemetry.io/collector/pdata v0.66.1-0.20221202005155-1c54042beb70/go.mod h1:pqyaznLzk21m+1KL6fwOsRryRELL+zNM0qiVSn0MbVc= 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= @@ -319,8 +321,8 @@ go.uber.org/multierr v1.6.0/go.mod h1:cdWPpRnG4AhwMwsgIHip0KRBQjJy5kYEpYjJxpXp9i go.uber.org/multierr v1.8.0 h1:dg6GjLku4EH+249NNmoIciG9N/jURbDG+pFlTkhzIC8= go.uber.org/multierr v1.8.0/go.mod h1:7EAYxJLBy9rStEaz58O2t4Uvip6FSURkq8/ppBp95ak= go.uber.org/zap v1.17.0/go.mod h1:MXVU+bhUf/A7Xi2HNOnopQOrmycQ5Ih87HtOu4q5SSo= -go.uber.org/zap v1.23.0 h1:OjGQ5KQDEUawVHxNwQgPpiypGHOxo2mNZsOqTak4fFY= -go.uber.org/zap v1.23.0/go.mod h1:D+nX8jyLsMHMYrln8A0rJjFt/T/9/bGgIhAqxv5URuY= +go.uber.org/zap v1.24.0 h1:FiJd5l1UOLj0wCgbSE0rwwXHzEdAZS6hiiSnxJN/D60= +go.uber.org/zap v1.24.0/go.mod h1:2kMP+WWQ8aoFoedH3T2sq6iJ2yDWpHbP0f6MQbS9Gkg= golang.org/x/crypto v0.0.0-20180904163835-0709b304e793/go.mod h1:6SG95UA2DQfeDnfUPMdvaQW0Q7yPrPDi9nlGo2tz2b4= golang.org/x/crypto v0.0.0-20190308221718-c2843e01d9a2/go.mod h1:djNgcEr1/C05ACkg1iLfiJU5Ep61QUkGW8qpdssI0+w= golang.org/x/crypto v0.0.0-20190923035154-9ee001bba392/go.mod h1:/lpIB1dKB+9EgE3H3cr1v9wB50oz8l4C4h62xy7jSTY= diff --git a/receiver/wavefrontreceiver/go.mod b/receiver/wavefrontreceiver/go.mod index 000ce698da1c..012bea7bf449 100644 --- a/receiver/wavefrontreceiver/go.mod +++ b/receiver/wavefrontreceiver/go.mod @@ -9,9 +9,10 @@ require ( github.com/open-telemetry/opentelemetry-collector-contrib/receiver/carbonreceiver v0.66.0 github.com/open-telemetry/opentelemetry-collector-contrib/receiver/collectdreceiver v0.66.0 github.com/stretchr/testify v1.8.1 - go.opentelemetry.io/collector v0.66.1-0.20221128222955-4ff1ff379b90 - go.opentelemetry.io/collector/component v0.66.1-0.20221128222955-4ff1ff379b90 - go.opentelemetry.io/collector/consumer v0.66.1-0.20221128222955-4ff1ff379b90 + go.opentelemetry.io/collector v0.66.1-0.20221202005155-1c54042beb70 + go.opentelemetry.io/collector/component v0.66.1-0.20221202005155-1c54042beb70 + go.opentelemetry.io/collector/confmap v0.0.0-20221201172708-2bdff61fa52a + go.opentelemetry.io/collector/consumer v0.66.1-0.20221202005155-1c54042beb70 google.golang.org/protobuf v1.28.1 ) @@ -30,15 +31,15 @@ require ( github.com/open-telemetry/opentelemetry-collector-contrib/internal/coreinternal v0.66.0 // indirect github.com/pmezard/go-difflib v1.0.0 // indirect go.opencensus.io v0.24.0 // indirect - go.opentelemetry.io/collector/featuregate v0.66.1-0.20221128222955-4ff1ff379b90 // indirect - go.opentelemetry.io/collector/pdata v0.66.1-0.20221128222955-4ff1ff379b90 // indirect - go.opentelemetry.io/collector/semconv v0.66.1-0.20221128222955-4ff1ff379b90 // indirect + go.opentelemetry.io/collector/featuregate v0.66.1-0.20221202005155-1c54042beb70 // indirect + go.opentelemetry.io/collector/pdata v0.66.1-0.20221202005155-1c54042beb70 // indirect + go.opentelemetry.io/collector/semconv v0.66.1-0.20221202005155-1c54042beb70 // 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 go.uber.org/atomic v1.10.0 // indirect go.uber.org/multierr v1.8.0 // indirect - go.uber.org/zap v1.23.0 // indirect + go.uber.org/zap v1.24.0 // indirect golang.org/x/net v0.1.0 // indirect golang.org/x/sys v0.2.0 // indirect golang.org/x/text v0.4.0 // indirect diff --git a/receiver/wavefrontreceiver/go.sum b/receiver/wavefrontreceiver/go.sum index 95e6ac7d206c..abad7c05a90b 100644 --- a/receiver/wavefrontreceiver/go.sum +++ b/receiver/wavefrontreceiver/go.sum @@ -275,18 +275,20 @@ go.etcd.io/etcd/client/pkg/v3 v3.5.4/go.mod h1:IJHfcCEKxYu1Os13ZdwCwIUTUVGYTSAM3 go.etcd.io/etcd/client/v3 v3.5.4/go.mod h1:ZaRkVgBZC+L+dLCjTcF1hRXpgZXQPOvnA/Ak/gq3kiY= go.opencensus.io v0.24.0 h1:y73uSU6J157QMP2kn2r30vwW1A2W2WFwSCGnAVxeaD0= go.opencensus.io v0.24.0/go.mod h1:vNK8G9p7aAivkbmorf4v+7Hgx+Zs0yY+0fOtgBfjQKo= -go.opentelemetry.io/collector v0.66.1-0.20221128222955-4ff1ff379b90 h1:yRe05/jMdzH4TFHfndZ5h2o2hKBK/79W72j8w51qNsI= -go.opentelemetry.io/collector v0.66.1-0.20221128222955-4ff1ff379b90/go.mod h1:hE6jCs+0rfiufCrVPucKZTMwfHit1okfDPnwPT2eW1I= -go.opentelemetry.io/collector/component v0.66.1-0.20221128222955-4ff1ff379b90 h1:AYSNTXbezhNg43EuYdVVcgxE/2gBVrm00FDx4DOmQVg= -go.opentelemetry.io/collector/component v0.66.1-0.20221128222955-4ff1ff379b90/go.mod h1:0c84EqXUhvYe6KW7hJfh76tiI/5yjWCH2amwyQ06XLM= -go.opentelemetry.io/collector/consumer v0.66.1-0.20221128222955-4ff1ff379b90 h1:nzNXVfC1FzXBXCLMzbMv+qK3E4EGiNsnMhfVsBd2yzc= -go.opentelemetry.io/collector/consumer v0.66.1-0.20221128222955-4ff1ff379b90/go.mod h1:WtoRZa5SnxQO1ZEQdVxYpFcXCmq62rakv0oUSlPO0NQ= -go.opentelemetry.io/collector/featuregate v0.66.1-0.20221128222955-4ff1ff379b90 h1:UuJSFWbi9XxyNZsJKZuvpWg35BgRbcCGFH+38V2MAdw= -go.opentelemetry.io/collector/featuregate v0.66.1-0.20221128222955-4ff1ff379b90/go.mod h1:tewuFKJYalWBU0bmNKg++MC1ipINXUr6szYzOw2p1GI= -go.opentelemetry.io/collector/pdata v0.66.1-0.20221128222955-4ff1ff379b90 h1:Vu4S4jSNcd0VFPzxQNO4+UqGwnes1xJDoFLPRiWHm8I= -go.opentelemetry.io/collector/pdata v0.66.1-0.20221128222955-4ff1ff379b90/go.mod h1:pqyaznLzk21m+1KL6fwOsRryRELL+zNM0qiVSn0MbVc= -go.opentelemetry.io/collector/semconv v0.66.1-0.20221128222955-4ff1ff379b90 h1:hFaTA68cggZKWMv7wQ3bKP8KGTbowh/5AQZKCHzHTqM= -go.opentelemetry.io/collector/semconv v0.66.1-0.20221128222955-4ff1ff379b90/go.mod h1:5o9yhOa+ABt7g2E5JABDxGZ1PQPbtfxrKNbYn+LOTXU= +go.opentelemetry.io/collector v0.66.1-0.20221202005155-1c54042beb70 h1:INB2CsOtqqrija2KvMuIpbBQ3qX1BECEeR+d0NJX+oM= +go.opentelemetry.io/collector v0.66.1-0.20221202005155-1c54042beb70/go.mod h1:d0NHkHyANJy3HDTvYE/PoylMShUmFIbiir89ieI0X0c= +go.opentelemetry.io/collector/component v0.66.1-0.20221202005155-1c54042beb70 h1:dEoJhzCmRShgmVro/kXm6pouGElgxkH2DsvanzCeZtU= +go.opentelemetry.io/collector/component v0.66.1-0.20221202005155-1c54042beb70/go.mod h1:OsVnvFFe38QSpcuZlQ8cvarDzcloCexgQ1/B2m80F6U= +go.opentelemetry.io/collector/confmap v0.0.0-20221201172708-2bdff61fa52a h1:2TscCXAQASO2kU9xHcMIUM/FP29fiQIRTilZmliq/7I= +go.opentelemetry.io/collector/confmap v0.0.0-20221201172708-2bdff61fa52a/go.mod h1:qJ3e8bA8h4wz/jYlbeEUafVHdrU7DkpStnmIUAz6VTQ= +go.opentelemetry.io/collector/consumer v0.66.1-0.20221202005155-1c54042beb70 h1:XwpVjI1KeKGPXOZBLefGILMziPYuNf6IzbmiIEsIyI0= +go.opentelemetry.io/collector/consumer v0.66.1-0.20221202005155-1c54042beb70/go.mod h1:EWVBcSGcIcmeDGTnIboc/aqa3agsBeH8/q7yFWG7xVc= +go.opentelemetry.io/collector/featuregate v0.66.1-0.20221202005155-1c54042beb70 h1:V0tf4ebciqIs07jFATfLGdUpLRaEsi+AiWuA/in0G8Y= +go.opentelemetry.io/collector/featuregate v0.66.1-0.20221202005155-1c54042beb70/go.mod h1:tewuFKJYalWBU0bmNKg++MC1ipINXUr6szYzOw2p1GI= +go.opentelemetry.io/collector/pdata v0.66.1-0.20221202005155-1c54042beb70 h1:TPOrxkEMvZzfBSwF3ct+kUUgKA5g8unkZZbKQvJweeA= +go.opentelemetry.io/collector/pdata v0.66.1-0.20221202005155-1c54042beb70/go.mod h1:pqyaznLzk21m+1KL6fwOsRryRELL+zNM0qiVSn0MbVc= +go.opentelemetry.io/collector/semconv v0.66.1-0.20221202005155-1c54042beb70 h1:Q5L9Urod3c8as6ZYaoaqBjarx/HXxsxy34DFZIU2fO4= +go.opentelemetry.io/collector/semconv v0.66.1-0.20221202005155-1c54042beb70/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= @@ -304,8 +306,8 @@ go.uber.org/multierr v1.6.0/go.mod h1:cdWPpRnG4AhwMwsgIHip0KRBQjJy5kYEpYjJxpXp9i go.uber.org/multierr v1.8.0 h1:dg6GjLku4EH+249NNmoIciG9N/jURbDG+pFlTkhzIC8= go.uber.org/multierr v1.8.0/go.mod h1:7EAYxJLBy9rStEaz58O2t4Uvip6FSURkq8/ppBp95ak= go.uber.org/zap v1.17.0/go.mod h1:MXVU+bhUf/A7Xi2HNOnopQOrmycQ5Ih87HtOu4q5SSo= -go.uber.org/zap v1.23.0 h1:OjGQ5KQDEUawVHxNwQgPpiypGHOxo2mNZsOqTak4fFY= -go.uber.org/zap v1.23.0/go.mod h1:D+nX8jyLsMHMYrln8A0rJjFt/T/9/bGgIhAqxv5URuY= +go.uber.org/zap v1.24.0 h1:FiJd5l1UOLj0wCgbSE0rwwXHzEdAZS6hiiSnxJN/D60= +go.uber.org/zap v1.24.0/go.mod h1:2kMP+WWQ8aoFoedH3T2sq6iJ2yDWpHbP0f6MQbS9Gkg= golang.org/x/crypto v0.0.0-20180904163835-0709b304e793/go.mod h1:6SG95UA2DQfeDnfUPMdvaQW0Q7yPrPDi9nlGo2tz2b4= golang.org/x/crypto v0.0.0-20190308221718-c2843e01d9a2/go.mod h1:djNgcEr1/C05ACkg1iLfiJU5Ep61QUkGW8qpdssI0+w= golang.org/x/crypto v0.0.0-20190923035154-9ee001bba392/go.mod h1:/lpIB1dKB+9EgE3H3cr1v9wB50oz8l4C4h62xy7jSTY= diff --git a/receiver/windowseventlogreceiver/go.mod b/receiver/windowseventlogreceiver/go.mod index e46e9d15d144..0bba33e70bf8 100644 --- a/receiver/windowseventlogreceiver/go.mod +++ b/receiver/windowseventlogreceiver/go.mod @@ -5,9 +5,10 @@ go 1.18 require ( github.com/open-telemetry/opentelemetry-collector-contrib/pkg/stanza v0.66.0 github.com/stretchr/testify v1.8.1 - go.opentelemetry.io/collector v0.66.1-0.20221128222955-4ff1ff379b90 - go.opentelemetry.io/collector/component v0.66.1-0.20221128222955-4ff1ff379b90 - go.opentelemetry.io/collector/consumer v0.66.1-0.20221128222955-4ff1ff379b90 + go.opentelemetry.io/collector v0.66.1-0.20221202005155-1c54042beb70 + go.opentelemetry.io/collector/component v0.66.1-0.20221202005155-1c54042beb70 + go.opentelemetry.io/collector/confmap v0.0.0-20221201172708-2bdff61fa52a + go.opentelemetry.io/collector/consumer v0.66.1-0.20221202005155-1c54042beb70 golang.org/x/sys v0.2.0 ) @@ -30,14 +31,14 @@ require ( github.com/pmezard/go-difflib v1.0.0 // indirect github.com/rogpeppe/go-internal v1.8.1 // indirect go.opencensus.io v0.24.0 // indirect - go.opentelemetry.io/collector/featuregate v0.66.1-0.20221128222955-4ff1ff379b90 // indirect - go.opentelemetry.io/collector/pdata v0.66.1-0.20221128222955-4ff1ff379b90 // indirect + go.opentelemetry.io/collector/featuregate v0.66.1-0.20221202005155-1c54042beb70 // indirect + go.opentelemetry.io/collector/pdata v0.66.1-0.20221202005155-1c54042beb70 // 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 go.uber.org/atomic v1.10.0 // indirect go.uber.org/multierr v1.8.0 // indirect - go.uber.org/zap v1.23.0 // indirect + go.uber.org/zap v1.24.0 // indirect golang.org/x/net v0.0.0-20220722155237-a158d28d115b // indirect golang.org/x/text v0.4.0 // indirect gonum.org/v1/gonum v0.12.0 // indirect diff --git a/receiver/windowseventlogreceiver/go.sum b/receiver/windowseventlogreceiver/go.sum index 76e4a58bf95a..5b700ff790f9 100644 --- a/receiver/windowseventlogreceiver/go.sum +++ b/receiver/windowseventlogreceiver/go.sum @@ -304,16 +304,18 @@ go.etcd.io/etcd/client/pkg/v3 v3.5.4/go.mod h1:IJHfcCEKxYu1Os13ZdwCwIUTUVGYTSAM3 go.etcd.io/etcd/client/v3 v3.5.4/go.mod h1:ZaRkVgBZC+L+dLCjTcF1hRXpgZXQPOvnA/Ak/gq3kiY= go.opencensus.io v0.24.0 h1:y73uSU6J157QMP2kn2r30vwW1A2W2WFwSCGnAVxeaD0= go.opencensus.io v0.24.0/go.mod h1:vNK8G9p7aAivkbmorf4v+7Hgx+Zs0yY+0fOtgBfjQKo= -go.opentelemetry.io/collector v0.66.1-0.20221128222955-4ff1ff379b90 h1:yRe05/jMdzH4TFHfndZ5h2o2hKBK/79W72j8w51qNsI= -go.opentelemetry.io/collector v0.66.1-0.20221128222955-4ff1ff379b90/go.mod h1:hE6jCs+0rfiufCrVPucKZTMwfHit1okfDPnwPT2eW1I= -go.opentelemetry.io/collector/component v0.66.1-0.20221128222955-4ff1ff379b90 h1:AYSNTXbezhNg43EuYdVVcgxE/2gBVrm00FDx4DOmQVg= -go.opentelemetry.io/collector/component v0.66.1-0.20221128222955-4ff1ff379b90/go.mod h1:0c84EqXUhvYe6KW7hJfh76tiI/5yjWCH2amwyQ06XLM= -go.opentelemetry.io/collector/consumer v0.66.1-0.20221128222955-4ff1ff379b90 h1:nzNXVfC1FzXBXCLMzbMv+qK3E4EGiNsnMhfVsBd2yzc= -go.opentelemetry.io/collector/consumer v0.66.1-0.20221128222955-4ff1ff379b90/go.mod h1:WtoRZa5SnxQO1ZEQdVxYpFcXCmq62rakv0oUSlPO0NQ= -go.opentelemetry.io/collector/featuregate v0.66.1-0.20221128222955-4ff1ff379b90 h1:UuJSFWbi9XxyNZsJKZuvpWg35BgRbcCGFH+38V2MAdw= -go.opentelemetry.io/collector/featuregate v0.66.1-0.20221128222955-4ff1ff379b90/go.mod h1:tewuFKJYalWBU0bmNKg++MC1ipINXUr6szYzOw2p1GI= -go.opentelemetry.io/collector/pdata v0.66.1-0.20221128222955-4ff1ff379b90 h1:Vu4S4jSNcd0VFPzxQNO4+UqGwnes1xJDoFLPRiWHm8I= -go.opentelemetry.io/collector/pdata v0.66.1-0.20221128222955-4ff1ff379b90/go.mod h1:pqyaznLzk21m+1KL6fwOsRryRELL+zNM0qiVSn0MbVc= +go.opentelemetry.io/collector v0.66.1-0.20221202005155-1c54042beb70 h1:INB2CsOtqqrija2KvMuIpbBQ3qX1BECEeR+d0NJX+oM= +go.opentelemetry.io/collector v0.66.1-0.20221202005155-1c54042beb70/go.mod h1:d0NHkHyANJy3HDTvYE/PoylMShUmFIbiir89ieI0X0c= +go.opentelemetry.io/collector/component v0.66.1-0.20221202005155-1c54042beb70 h1:dEoJhzCmRShgmVro/kXm6pouGElgxkH2DsvanzCeZtU= +go.opentelemetry.io/collector/component v0.66.1-0.20221202005155-1c54042beb70/go.mod h1:OsVnvFFe38QSpcuZlQ8cvarDzcloCexgQ1/B2m80F6U= +go.opentelemetry.io/collector/confmap v0.0.0-20221201172708-2bdff61fa52a h1:2TscCXAQASO2kU9xHcMIUM/FP29fiQIRTilZmliq/7I= +go.opentelemetry.io/collector/confmap v0.0.0-20221201172708-2bdff61fa52a/go.mod h1:qJ3e8bA8h4wz/jYlbeEUafVHdrU7DkpStnmIUAz6VTQ= +go.opentelemetry.io/collector/consumer v0.66.1-0.20221202005155-1c54042beb70 h1:XwpVjI1KeKGPXOZBLefGILMziPYuNf6IzbmiIEsIyI0= +go.opentelemetry.io/collector/consumer v0.66.1-0.20221202005155-1c54042beb70/go.mod h1:EWVBcSGcIcmeDGTnIboc/aqa3agsBeH8/q7yFWG7xVc= +go.opentelemetry.io/collector/featuregate v0.66.1-0.20221202005155-1c54042beb70 h1:V0tf4ebciqIs07jFATfLGdUpLRaEsi+AiWuA/in0G8Y= +go.opentelemetry.io/collector/featuregate v0.66.1-0.20221202005155-1c54042beb70/go.mod h1:tewuFKJYalWBU0bmNKg++MC1ipINXUr6szYzOw2p1GI= +go.opentelemetry.io/collector/pdata v0.66.1-0.20221202005155-1c54042beb70 h1:TPOrxkEMvZzfBSwF3ct+kUUgKA5g8unkZZbKQvJweeA= +go.opentelemetry.io/collector/pdata v0.66.1-0.20221202005155-1c54042beb70/go.mod h1:pqyaznLzk21m+1KL6fwOsRryRELL+zNM0qiVSn0MbVc= 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= @@ -332,8 +334,8 @@ go.uber.org/multierr v1.6.0/go.mod h1:cdWPpRnG4AhwMwsgIHip0KRBQjJy5kYEpYjJxpXp9i go.uber.org/multierr v1.8.0 h1:dg6GjLku4EH+249NNmoIciG9N/jURbDG+pFlTkhzIC8= go.uber.org/multierr v1.8.0/go.mod h1:7EAYxJLBy9rStEaz58O2t4Uvip6FSURkq8/ppBp95ak= go.uber.org/zap v1.17.0/go.mod h1:MXVU+bhUf/A7Xi2HNOnopQOrmycQ5Ih87HtOu4q5SSo= -go.uber.org/zap v1.23.0 h1:OjGQ5KQDEUawVHxNwQgPpiypGHOxo2mNZsOqTak4fFY= -go.uber.org/zap v1.23.0/go.mod h1:D+nX8jyLsMHMYrln8A0rJjFt/T/9/bGgIhAqxv5URuY= +go.uber.org/zap v1.24.0 h1:FiJd5l1UOLj0wCgbSE0rwwXHzEdAZS6hiiSnxJN/D60= +go.uber.org/zap v1.24.0/go.mod h1:2kMP+WWQ8aoFoedH3T2sq6iJ2yDWpHbP0f6MQbS9Gkg= golang.org/x/crypto v0.0.0-20180904163835-0709b304e793/go.mod h1:6SG95UA2DQfeDnfUPMdvaQW0Q7yPrPDi9nlGo2tz2b4= golang.org/x/crypto v0.0.0-20190308221718-c2843e01d9a2/go.mod h1:djNgcEr1/C05ACkg1iLfiJU5Ep61QUkGW8qpdssI0+w= golang.org/x/crypto v0.0.0-20190923035154-9ee001bba392/go.mod h1:/lpIB1dKB+9EgE3H3cr1v9wB50oz8l4C4h62xy7jSTY= diff --git a/receiver/windowsperfcountersreceiver/factory_windows.go b/receiver/windowsperfcountersreceiver/factory_windows.go index 9519a9ab1f87..6ef7d7bc9f6a 100644 --- a/receiver/windowsperfcountersreceiver/factory_windows.go +++ b/receiver/windowsperfcountersreceiver/factory_windows.go @@ -36,7 +36,7 @@ func createMetricsReceiver( scraper := newScraper(oCfg, params.TelemetrySettings) scrp, err := scraperhelper.NewScraper( - cfg.ID().String(), + params.ID.String(), scraper.scrape, scraperhelper.WithStart(scraper.start), scraperhelper.WithShutdown(scraper.shutdown), diff --git a/receiver/windowsperfcountersreceiver/go.mod b/receiver/windowsperfcountersreceiver/go.mod index 869850cf988c..3abf9ddd340f 100644 --- a/receiver/windowsperfcountersreceiver/go.mod +++ b/receiver/windowsperfcountersreceiver/go.mod @@ -6,12 +6,13 @@ require ( github.com/open-telemetry/opentelemetry-collector-contrib/internal/scrapertest v0.66.0 github.com/open-telemetry/opentelemetry-collector-contrib/pkg/winperfcounters v0.66.0 github.com/stretchr/testify v1.8.1 - go.opentelemetry.io/collector v0.66.1-0.20221128222955-4ff1ff379b90 - go.opentelemetry.io/collector/component v0.66.1-0.20221128222955-4ff1ff379b90 - go.opentelemetry.io/collector/consumer v0.66.1-0.20221128222955-4ff1ff379b90 - go.opentelemetry.io/collector/pdata v0.66.1-0.20221128222955-4ff1ff379b90 + go.opentelemetry.io/collector v0.66.1-0.20221202005155-1c54042beb70 + go.opentelemetry.io/collector/component v0.66.1-0.20221202005155-1c54042beb70 + go.opentelemetry.io/collector/confmap v0.0.0-20221201172708-2bdff61fa52a + go.opentelemetry.io/collector/consumer v0.66.1-0.20221202005155-1c54042beb70 + go.opentelemetry.io/collector/pdata v0.66.1-0.20221202005155-1c54042beb70 go.uber.org/multierr v1.8.0 - go.uber.org/zap v1.23.0 + go.uber.org/zap v1.24.0 ) require ( @@ -30,7 +31,7 @@ require ( github.com/pelletier/go-toml v1.9.4 // indirect github.com/pmezard/go-difflib v1.0.0 // indirect go.opencensus.io v0.24.0 // indirect - go.opentelemetry.io/collector/featuregate v0.66.1-0.20221128222955-4ff1ff379b90 // indirect + go.opentelemetry.io/collector/featuregate v0.66.1-0.20221202005155-1c54042beb70 // indirect go.opentelemetry.io/otel v1.11.1 // indirect go.opentelemetry.io/otel/metric v0.33.0 // indirect go.opentelemetry.io/otel/trace v1.11.1 // indirect diff --git a/receiver/windowsperfcountersreceiver/go.sum b/receiver/windowsperfcountersreceiver/go.sum index 2721ce23ca70..19e8a0875b2c 100644 --- a/receiver/windowsperfcountersreceiver/go.sum +++ b/receiver/windowsperfcountersreceiver/go.sum @@ -281,16 +281,18 @@ go.etcd.io/etcd/client/pkg/v3 v3.5.4/go.mod h1:IJHfcCEKxYu1Os13ZdwCwIUTUVGYTSAM3 go.etcd.io/etcd/client/v3 v3.5.4/go.mod h1:ZaRkVgBZC+L+dLCjTcF1hRXpgZXQPOvnA/Ak/gq3kiY= go.opencensus.io v0.24.0 h1:y73uSU6J157QMP2kn2r30vwW1A2W2WFwSCGnAVxeaD0= go.opencensus.io v0.24.0/go.mod h1:vNK8G9p7aAivkbmorf4v+7Hgx+Zs0yY+0fOtgBfjQKo= -go.opentelemetry.io/collector v0.66.1-0.20221128222955-4ff1ff379b90 h1:yRe05/jMdzH4TFHfndZ5h2o2hKBK/79W72j8w51qNsI= -go.opentelemetry.io/collector v0.66.1-0.20221128222955-4ff1ff379b90/go.mod h1:hE6jCs+0rfiufCrVPucKZTMwfHit1okfDPnwPT2eW1I= -go.opentelemetry.io/collector/component v0.66.1-0.20221128222955-4ff1ff379b90 h1:AYSNTXbezhNg43EuYdVVcgxE/2gBVrm00FDx4DOmQVg= -go.opentelemetry.io/collector/component v0.66.1-0.20221128222955-4ff1ff379b90/go.mod h1:0c84EqXUhvYe6KW7hJfh76tiI/5yjWCH2amwyQ06XLM= -go.opentelemetry.io/collector/consumer v0.66.1-0.20221128222955-4ff1ff379b90 h1:nzNXVfC1FzXBXCLMzbMv+qK3E4EGiNsnMhfVsBd2yzc= -go.opentelemetry.io/collector/consumer v0.66.1-0.20221128222955-4ff1ff379b90/go.mod h1:WtoRZa5SnxQO1ZEQdVxYpFcXCmq62rakv0oUSlPO0NQ= -go.opentelemetry.io/collector/featuregate v0.66.1-0.20221128222955-4ff1ff379b90 h1:UuJSFWbi9XxyNZsJKZuvpWg35BgRbcCGFH+38V2MAdw= -go.opentelemetry.io/collector/featuregate v0.66.1-0.20221128222955-4ff1ff379b90/go.mod h1:tewuFKJYalWBU0bmNKg++MC1ipINXUr6szYzOw2p1GI= -go.opentelemetry.io/collector/pdata v0.66.1-0.20221128222955-4ff1ff379b90 h1:Vu4S4jSNcd0VFPzxQNO4+UqGwnes1xJDoFLPRiWHm8I= -go.opentelemetry.io/collector/pdata v0.66.1-0.20221128222955-4ff1ff379b90/go.mod h1:pqyaznLzk21m+1KL6fwOsRryRELL+zNM0qiVSn0MbVc= +go.opentelemetry.io/collector v0.66.1-0.20221202005155-1c54042beb70 h1:INB2CsOtqqrija2KvMuIpbBQ3qX1BECEeR+d0NJX+oM= +go.opentelemetry.io/collector v0.66.1-0.20221202005155-1c54042beb70/go.mod h1:d0NHkHyANJy3HDTvYE/PoylMShUmFIbiir89ieI0X0c= +go.opentelemetry.io/collector/component v0.66.1-0.20221202005155-1c54042beb70 h1:dEoJhzCmRShgmVro/kXm6pouGElgxkH2DsvanzCeZtU= +go.opentelemetry.io/collector/component v0.66.1-0.20221202005155-1c54042beb70/go.mod h1:OsVnvFFe38QSpcuZlQ8cvarDzcloCexgQ1/B2m80F6U= +go.opentelemetry.io/collector/confmap v0.0.0-20221201172708-2bdff61fa52a h1:2TscCXAQASO2kU9xHcMIUM/FP29fiQIRTilZmliq/7I= +go.opentelemetry.io/collector/confmap v0.0.0-20221201172708-2bdff61fa52a/go.mod h1:qJ3e8bA8h4wz/jYlbeEUafVHdrU7DkpStnmIUAz6VTQ= +go.opentelemetry.io/collector/consumer v0.66.1-0.20221202005155-1c54042beb70 h1:XwpVjI1KeKGPXOZBLefGILMziPYuNf6IzbmiIEsIyI0= +go.opentelemetry.io/collector/consumer v0.66.1-0.20221202005155-1c54042beb70/go.mod h1:EWVBcSGcIcmeDGTnIboc/aqa3agsBeH8/q7yFWG7xVc= +go.opentelemetry.io/collector/featuregate v0.66.1-0.20221202005155-1c54042beb70 h1:V0tf4ebciqIs07jFATfLGdUpLRaEsi+AiWuA/in0G8Y= +go.opentelemetry.io/collector/featuregate v0.66.1-0.20221202005155-1c54042beb70/go.mod h1:tewuFKJYalWBU0bmNKg++MC1ipINXUr6szYzOw2p1GI= +go.opentelemetry.io/collector/pdata v0.66.1-0.20221202005155-1c54042beb70 h1:TPOrxkEMvZzfBSwF3ct+kUUgKA5g8unkZZbKQvJweeA= +go.opentelemetry.io/collector/pdata v0.66.1-0.20221202005155-1c54042beb70/go.mod h1:pqyaznLzk21m+1KL6fwOsRryRELL+zNM0qiVSn0MbVc= 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= @@ -309,8 +311,8 @@ go.uber.org/multierr v1.6.0/go.mod h1:cdWPpRnG4AhwMwsgIHip0KRBQjJy5kYEpYjJxpXp9i go.uber.org/multierr v1.8.0 h1:dg6GjLku4EH+249NNmoIciG9N/jURbDG+pFlTkhzIC8= go.uber.org/multierr v1.8.0/go.mod h1:7EAYxJLBy9rStEaz58O2t4Uvip6FSURkq8/ppBp95ak= go.uber.org/zap v1.17.0/go.mod h1:MXVU+bhUf/A7Xi2HNOnopQOrmycQ5Ih87HtOu4q5SSo= -go.uber.org/zap v1.23.0 h1:OjGQ5KQDEUawVHxNwQgPpiypGHOxo2mNZsOqTak4fFY= -go.uber.org/zap v1.23.0/go.mod h1:D+nX8jyLsMHMYrln8A0rJjFt/T/9/bGgIhAqxv5URuY= +go.uber.org/zap v1.24.0 h1:FiJd5l1UOLj0wCgbSE0rwwXHzEdAZS6hiiSnxJN/D60= +go.uber.org/zap v1.24.0/go.mod h1:2kMP+WWQ8aoFoedH3T2sq6iJ2yDWpHbP0f6MQbS9Gkg= golang.org/x/crypto v0.0.0-20180904163835-0709b304e793/go.mod h1:6SG95UA2DQfeDnfUPMdvaQW0Q7yPrPDi9nlGo2tz2b4= golang.org/x/crypto v0.0.0-20190308221718-c2843e01d9a2/go.mod h1:djNgcEr1/C05ACkg1iLfiJU5Ep61QUkGW8qpdssI0+w= golang.org/x/crypto v0.0.0-20190923035154-9ee001bba392/go.mod h1:/lpIB1dKB+9EgE3H3cr1v9wB50oz8l4C4h62xy7jSTY= diff --git a/receiver/zipkinreceiver/go.mod b/receiver/zipkinreceiver/go.mod index 0156caf50068..b3bbcccd76d2 100644 --- a/receiver/zipkinreceiver/go.mod +++ b/receiver/zipkinreceiver/go.mod @@ -8,11 +8,12 @@ require ( github.com/open-telemetry/opentelemetry-collector-contrib/pkg/translator/zipkin v0.66.0 github.com/openzipkin/zipkin-go v0.4.1 github.com/stretchr/testify v1.8.1 - go.opentelemetry.io/collector v0.66.1-0.20221128222955-4ff1ff379b90 - go.opentelemetry.io/collector/component v0.66.1-0.20221128222955-4ff1ff379b90 - go.opentelemetry.io/collector/consumer v0.66.1-0.20221128222955-4ff1ff379b90 - go.opentelemetry.io/collector/pdata v0.66.1-0.20221128222955-4ff1ff379b90 - go.opentelemetry.io/collector/semconv v0.66.1-0.20221128222955-4ff1ff379b90 + go.opentelemetry.io/collector v0.66.1-0.20221202005155-1c54042beb70 + go.opentelemetry.io/collector/component v0.66.1-0.20221202005155-1c54042beb70 + go.opentelemetry.io/collector/confmap v0.0.0-20221201172708-2bdff61fa52a + go.opentelemetry.io/collector/consumer v0.66.1-0.20221202005155-1c54042beb70 + go.opentelemetry.io/collector/pdata v0.66.1-0.20221202005155-1c54042beb70 + go.opentelemetry.io/collector/semconv v0.66.1-0.20221202005155-1c54042beb70 google.golang.org/protobuf v1.28.1 ) @@ -39,14 +40,14 @@ require ( github.com/uber/jaeger-client-go v2.30.0+incompatible // indirect github.com/uber/jaeger-lib v2.4.1+incompatible // indirect go.opencensus.io v0.24.0 // indirect - go.opentelemetry.io/collector/featuregate v0.66.1-0.20221128222955-4ff1ff379b90 // indirect + go.opentelemetry.io/collector/featuregate v0.66.1-0.20221202005155-1c54042beb70 // 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 go.opentelemetry.io/otel/trace v1.11.1 // indirect go.uber.org/atomic v1.10.0 // indirect go.uber.org/multierr v1.8.0 // indirect - go.uber.org/zap v1.23.0 // indirect + go.uber.org/zap v1.24.0 // indirect golang.org/x/net v0.0.0-20221014081412-f15817d10f9b // indirect golang.org/x/sys v0.2.0 // indirect golang.org/x/text v0.4.0 // indirect diff --git a/receiver/zipkinreceiver/go.sum b/receiver/zipkinreceiver/go.sum index 98863a9510ef..b1395e6c30ea 100644 --- a/receiver/zipkinreceiver/go.sum +++ b/receiver/zipkinreceiver/go.sum @@ -296,18 +296,20 @@ go.etcd.io/etcd/client/pkg/v3 v3.5.4/go.mod h1:IJHfcCEKxYu1Os13ZdwCwIUTUVGYTSAM3 go.etcd.io/etcd/client/v3 v3.5.4/go.mod h1:ZaRkVgBZC+L+dLCjTcF1hRXpgZXQPOvnA/Ak/gq3kiY= go.opencensus.io v0.24.0 h1:y73uSU6J157QMP2kn2r30vwW1A2W2WFwSCGnAVxeaD0= go.opencensus.io v0.24.0/go.mod h1:vNK8G9p7aAivkbmorf4v+7Hgx+Zs0yY+0fOtgBfjQKo= -go.opentelemetry.io/collector v0.66.1-0.20221128222955-4ff1ff379b90 h1:yRe05/jMdzH4TFHfndZ5h2o2hKBK/79W72j8w51qNsI= -go.opentelemetry.io/collector v0.66.1-0.20221128222955-4ff1ff379b90/go.mod h1:hE6jCs+0rfiufCrVPucKZTMwfHit1okfDPnwPT2eW1I= -go.opentelemetry.io/collector/component v0.66.1-0.20221128222955-4ff1ff379b90 h1:AYSNTXbezhNg43EuYdVVcgxE/2gBVrm00FDx4DOmQVg= -go.opentelemetry.io/collector/component v0.66.1-0.20221128222955-4ff1ff379b90/go.mod h1:0c84EqXUhvYe6KW7hJfh76tiI/5yjWCH2amwyQ06XLM= -go.opentelemetry.io/collector/consumer v0.66.1-0.20221128222955-4ff1ff379b90 h1:nzNXVfC1FzXBXCLMzbMv+qK3E4EGiNsnMhfVsBd2yzc= -go.opentelemetry.io/collector/consumer v0.66.1-0.20221128222955-4ff1ff379b90/go.mod h1:WtoRZa5SnxQO1ZEQdVxYpFcXCmq62rakv0oUSlPO0NQ= -go.opentelemetry.io/collector/featuregate v0.66.1-0.20221128222955-4ff1ff379b90 h1:UuJSFWbi9XxyNZsJKZuvpWg35BgRbcCGFH+38V2MAdw= -go.opentelemetry.io/collector/featuregate v0.66.1-0.20221128222955-4ff1ff379b90/go.mod h1:tewuFKJYalWBU0bmNKg++MC1ipINXUr6szYzOw2p1GI= -go.opentelemetry.io/collector/pdata v0.66.1-0.20221128222955-4ff1ff379b90 h1:Vu4S4jSNcd0VFPzxQNO4+UqGwnes1xJDoFLPRiWHm8I= -go.opentelemetry.io/collector/pdata v0.66.1-0.20221128222955-4ff1ff379b90/go.mod h1:pqyaznLzk21m+1KL6fwOsRryRELL+zNM0qiVSn0MbVc= -go.opentelemetry.io/collector/semconv v0.66.1-0.20221128222955-4ff1ff379b90 h1:hFaTA68cggZKWMv7wQ3bKP8KGTbowh/5AQZKCHzHTqM= -go.opentelemetry.io/collector/semconv v0.66.1-0.20221128222955-4ff1ff379b90/go.mod h1:5o9yhOa+ABt7g2E5JABDxGZ1PQPbtfxrKNbYn+LOTXU= +go.opentelemetry.io/collector v0.66.1-0.20221202005155-1c54042beb70 h1:INB2CsOtqqrija2KvMuIpbBQ3qX1BECEeR+d0NJX+oM= +go.opentelemetry.io/collector v0.66.1-0.20221202005155-1c54042beb70/go.mod h1:d0NHkHyANJy3HDTvYE/PoylMShUmFIbiir89ieI0X0c= +go.opentelemetry.io/collector/component v0.66.1-0.20221202005155-1c54042beb70 h1:dEoJhzCmRShgmVro/kXm6pouGElgxkH2DsvanzCeZtU= +go.opentelemetry.io/collector/component v0.66.1-0.20221202005155-1c54042beb70/go.mod h1:OsVnvFFe38QSpcuZlQ8cvarDzcloCexgQ1/B2m80F6U= +go.opentelemetry.io/collector/confmap v0.0.0-20221201172708-2bdff61fa52a h1:2TscCXAQASO2kU9xHcMIUM/FP29fiQIRTilZmliq/7I= +go.opentelemetry.io/collector/confmap v0.0.0-20221201172708-2bdff61fa52a/go.mod h1:qJ3e8bA8h4wz/jYlbeEUafVHdrU7DkpStnmIUAz6VTQ= +go.opentelemetry.io/collector/consumer v0.66.1-0.20221202005155-1c54042beb70 h1:XwpVjI1KeKGPXOZBLefGILMziPYuNf6IzbmiIEsIyI0= +go.opentelemetry.io/collector/consumer v0.66.1-0.20221202005155-1c54042beb70/go.mod h1:EWVBcSGcIcmeDGTnIboc/aqa3agsBeH8/q7yFWG7xVc= +go.opentelemetry.io/collector/featuregate v0.66.1-0.20221202005155-1c54042beb70 h1:V0tf4ebciqIs07jFATfLGdUpLRaEsi+AiWuA/in0G8Y= +go.opentelemetry.io/collector/featuregate v0.66.1-0.20221202005155-1c54042beb70/go.mod h1:tewuFKJYalWBU0bmNKg++MC1ipINXUr6szYzOw2p1GI= +go.opentelemetry.io/collector/pdata v0.66.1-0.20221202005155-1c54042beb70 h1:TPOrxkEMvZzfBSwF3ct+kUUgKA5g8unkZZbKQvJweeA= +go.opentelemetry.io/collector/pdata v0.66.1-0.20221202005155-1c54042beb70/go.mod h1:pqyaznLzk21m+1KL6fwOsRryRELL+zNM0qiVSn0MbVc= +go.opentelemetry.io/collector/semconv v0.66.1-0.20221202005155-1c54042beb70 h1:Q5L9Urod3c8as6ZYaoaqBjarx/HXxsxy34DFZIU2fO4= +go.opentelemetry.io/collector/semconv v0.66.1-0.20221202005155-1c54042beb70/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= @@ -327,8 +329,8 @@ go.uber.org/multierr v1.6.0/go.mod h1:cdWPpRnG4AhwMwsgIHip0KRBQjJy5kYEpYjJxpXp9i go.uber.org/multierr v1.8.0 h1:dg6GjLku4EH+249NNmoIciG9N/jURbDG+pFlTkhzIC8= go.uber.org/multierr v1.8.0/go.mod h1:7EAYxJLBy9rStEaz58O2t4Uvip6FSURkq8/ppBp95ak= go.uber.org/zap v1.17.0/go.mod h1:MXVU+bhUf/A7Xi2HNOnopQOrmycQ5Ih87HtOu4q5SSo= -go.uber.org/zap v1.23.0 h1:OjGQ5KQDEUawVHxNwQgPpiypGHOxo2mNZsOqTak4fFY= -go.uber.org/zap v1.23.0/go.mod h1:D+nX8jyLsMHMYrln8A0rJjFt/T/9/bGgIhAqxv5URuY= +go.uber.org/zap v1.24.0 h1:FiJd5l1UOLj0wCgbSE0rwwXHzEdAZS6hiiSnxJN/D60= +go.uber.org/zap v1.24.0/go.mod h1:2kMP+WWQ8aoFoedH3T2sq6iJ2yDWpHbP0f6MQbS9Gkg= golang.org/x/crypto v0.0.0-20180904163835-0709b304e793/go.mod h1:6SG95UA2DQfeDnfUPMdvaQW0Q7yPrPDi9nlGo2tz2b4= golang.org/x/crypto v0.0.0-20190308221718-c2843e01d9a2/go.mod h1:djNgcEr1/C05ACkg1iLfiJU5Ep61QUkGW8qpdssI0+w= golang.org/x/crypto v0.0.0-20190923035154-9ee001bba392/go.mod h1:/lpIB1dKB+9EgE3H3cr1v9wB50oz8l4C4h62xy7jSTY= diff --git a/receiver/zipkinreceiver/trace_receiver.go b/receiver/zipkinreceiver/trace_receiver.go index adce923fc9c0..c22eee64bd4c 100644 --- a/receiver/zipkinreceiver/trace_receiver.go +++ b/receiver/zipkinreceiver/trace_receiver.go @@ -46,7 +46,6 @@ 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 component.ID shutdownWG sync.WaitGroup server *http.Server @@ -74,7 +73,7 @@ func newReceiver(config *Config, nextConsumer consumer.Traces, settings componen obsrecvrs := make(map[string]*obsreport.Receiver) for _, transport := range transports { obsrecv, err := obsreport.NewReceiver(obsreport.ReceiverSettings{ - ReceiverID: config.ID(), + ReceiverID: settings.ID, Transport: transport, ReceiverCreateSettings: settings, }) @@ -86,7 +85,6 @@ func newReceiver(config *Config, nextConsumer consumer.Traces, settings componen zr := &zipkinReceiver{ nextConsumer: nextConsumer, - id: config.ID(), config: config, v1ThriftUnmarshaler: zipkinv1.NewThriftTracesUnmarshaler(), v1JSONUnmarshaler: zipkinv1.NewJSONTracesUnmarshaler(config.ParseStringTags), diff --git a/receiver/zookeeperreceiver/go.mod b/receiver/zookeeperreceiver/go.mod index 5dd95a5ac147..e9b728f38221 100644 --- a/receiver/zookeeperreceiver/go.mod +++ b/receiver/zookeeperreceiver/go.mod @@ -7,11 +7,12 @@ require ( github.com/open-telemetry/opentelemetry-collector-contrib/internal/scrapertest v0.66.0 github.com/stretchr/testify v1.8.1 github.com/testcontainers/testcontainers-go v0.15.0 - go.opentelemetry.io/collector v0.66.1-0.20221128222955-4ff1ff379b90 - go.opentelemetry.io/collector/component v0.66.1-0.20221128222955-4ff1ff379b90 - go.opentelemetry.io/collector/consumer v0.66.1-0.20221128222955-4ff1ff379b90 - go.opentelemetry.io/collector/pdata v0.66.1-0.20221128222955-4ff1ff379b90 - go.uber.org/zap v1.23.0 + go.opentelemetry.io/collector v0.66.1-0.20221202005155-1c54042beb70 + go.opentelemetry.io/collector/component v0.66.1-0.20221202005155-1c54042beb70 + go.opentelemetry.io/collector/confmap v0.0.0-20221201172708-2bdff61fa52a + go.opentelemetry.io/collector/consumer v0.66.1-0.20221202005155-1c54042beb70 + go.opentelemetry.io/collector/pdata v0.66.1-0.20221202005155-1c54042beb70 + go.uber.org/zap v1.24.0 ) require ( @@ -52,7 +53,7 @@ require ( github.com/rogpeppe/go-internal v1.6.1 // indirect github.com/sirupsen/logrus v1.8.1 // indirect go.opencensus.io v0.24.0 // indirect - go.opentelemetry.io/collector/featuregate v0.66.1-0.20221128222955-4ff1ff379b90 // indirect + go.opentelemetry.io/collector/featuregate v0.66.1-0.20221202005155-1c54042beb70 // 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 aeed8158055d..9d6af86f644e 100644 --- a/receiver/zookeeperreceiver/go.sum +++ b/receiver/zookeeperreceiver/go.sum @@ -821,16 +821,18 @@ go.opencensus.io v0.22.2/go.mod h1:yxeiOL68Rb0Xd1ddK5vPZ/oVn4vY4Ynel7k9FzqtOIw= go.opencensus.io v0.22.3/go.mod h1:yxeiOL68Rb0Xd1ddK5vPZ/oVn4vY4Ynel7k9FzqtOIw= go.opencensus.io v0.24.0 h1:y73uSU6J157QMP2kn2r30vwW1A2W2WFwSCGnAVxeaD0= go.opencensus.io v0.24.0/go.mod h1:vNK8G9p7aAivkbmorf4v+7Hgx+Zs0yY+0fOtgBfjQKo= -go.opentelemetry.io/collector v0.66.1-0.20221128222955-4ff1ff379b90 h1:yRe05/jMdzH4TFHfndZ5h2o2hKBK/79W72j8w51qNsI= -go.opentelemetry.io/collector v0.66.1-0.20221128222955-4ff1ff379b90/go.mod h1:hE6jCs+0rfiufCrVPucKZTMwfHit1okfDPnwPT2eW1I= -go.opentelemetry.io/collector/component v0.66.1-0.20221128222955-4ff1ff379b90 h1:AYSNTXbezhNg43EuYdVVcgxE/2gBVrm00FDx4DOmQVg= -go.opentelemetry.io/collector/component v0.66.1-0.20221128222955-4ff1ff379b90/go.mod h1:0c84EqXUhvYe6KW7hJfh76tiI/5yjWCH2amwyQ06XLM= -go.opentelemetry.io/collector/consumer v0.66.1-0.20221128222955-4ff1ff379b90 h1:nzNXVfC1FzXBXCLMzbMv+qK3E4EGiNsnMhfVsBd2yzc= -go.opentelemetry.io/collector/consumer v0.66.1-0.20221128222955-4ff1ff379b90/go.mod h1:WtoRZa5SnxQO1ZEQdVxYpFcXCmq62rakv0oUSlPO0NQ= -go.opentelemetry.io/collector/featuregate v0.66.1-0.20221128222955-4ff1ff379b90 h1:UuJSFWbi9XxyNZsJKZuvpWg35BgRbcCGFH+38V2MAdw= -go.opentelemetry.io/collector/featuregate v0.66.1-0.20221128222955-4ff1ff379b90/go.mod h1:tewuFKJYalWBU0bmNKg++MC1ipINXUr6szYzOw2p1GI= -go.opentelemetry.io/collector/pdata v0.66.1-0.20221128222955-4ff1ff379b90 h1:Vu4S4jSNcd0VFPzxQNO4+UqGwnes1xJDoFLPRiWHm8I= -go.opentelemetry.io/collector/pdata v0.66.1-0.20221128222955-4ff1ff379b90/go.mod h1:pqyaznLzk21m+1KL6fwOsRryRELL+zNM0qiVSn0MbVc= +go.opentelemetry.io/collector v0.66.1-0.20221202005155-1c54042beb70 h1:INB2CsOtqqrija2KvMuIpbBQ3qX1BECEeR+d0NJX+oM= +go.opentelemetry.io/collector v0.66.1-0.20221202005155-1c54042beb70/go.mod h1:d0NHkHyANJy3HDTvYE/PoylMShUmFIbiir89ieI0X0c= +go.opentelemetry.io/collector/component v0.66.1-0.20221202005155-1c54042beb70 h1:dEoJhzCmRShgmVro/kXm6pouGElgxkH2DsvanzCeZtU= +go.opentelemetry.io/collector/component v0.66.1-0.20221202005155-1c54042beb70/go.mod h1:OsVnvFFe38QSpcuZlQ8cvarDzcloCexgQ1/B2m80F6U= +go.opentelemetry.io/collector/confmap v0.0.0-20221201172708-2bdff61fa52a h1:2TscCXAQASO2kU9xHcMIUM/FP29fiQIRTilZmliq/7I= +go.opentelemetry.io/collector/confmap v0.0.0-20221201172708-2bdff61fa52a/go.mod h1:qJ3e8bA8h4wz/jYlbeEUafVHdrU7DkpStnmIUAz6VTQ= +go.opentelemetry.io/collector/consumer v0.66.1-0.20221202005155-1c54042beb70 h1:XwpVjI1KeKGPXOZBLefGILMziPYuNf6IzbmiIEsIyI0= +go.opentelemetry.io/collector/consumer v0.66.1-0.20221202005155-1c54042beb70/go.mod h1:EWVBcSGcIcmeDGTnIboc/aqa3agsBeH8/q7yFWG7xVc= +go.opentelemetry.io/collector/featuregate v0.66.1-0.20221202005155-1c54042beb70 h1:V0tf4ebciqIs07jFATfLGdUpLRaEsi+AiWuA/in0G8Y= +go.opentelemetry.io/collector/featuregate v0.66.1-0.20221202005155-1c54042beb70/go.mod h1:tewuFKJYalWBU0bmNKg++MC1ipINXUr6szYzOw2p1GI= +go.opentelemetry.io/collector/pdata v0.66.1-0.20221202005155-1c54042beb70 h1:TPOrxkEMvZzfBSwF3ct+kUUgKA5g8unkZZbKQvJweeA= +go.opentelemetry.io/collector/pdata v0.66.1-0.20221202005155-1c54042beb70/go.mod h1:pqyaznLzk21m+1KL6fwOsRryRELL+zNM0qiVSn0MbVc= 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= @@ -853,8 +855,8 @@ go.uber.org/multierr v1.8.0 h1:dg6GjLku4EH+249NNmoIciG9N/jURbDG+pFlTkhzIC8= go.uber.org/multierr v1.8.0/go.mod h1:7EAYxJLBy9rStEaz58O2t4Uvip6FSURkq8/ppBp95ak= go.uber.org/zap v1.10.0/go.mod h1:vwi/ZaCAaUcBkycHslxD9B2zi4UTXhF60s6SWpuDF0Q= go.uber.org/zap v1.17.0/go.mod h1:MXVU+bhUf/A7Xi2HNOnopQOrmycQ5Ih87HtOu4q5SSo= -go.uber.org/zap v1.23.0 h1:OjGQ5KQDEUawVHxNwQgPpiypGHOxo2mNZsOqTak4fFY= -go.uber.org/zap v1.23.0/go.mod h1:D+nX8jyLsMHMYrln8A0rJjFt/T/9/bGgIhAqxv5URuY= +go.uber.org/zap v1.24.0 h1:FiJd5l1UOLj0wCgbSE0rwwXHzEdAZS6hiiSnxJN/D60= +go.uber.org/zap v1.24.0/go.mod h1:2kMP+WWQ8aoFoedH3T2sq6iJ2yDWpHbP0f6MQbS9Gkg= golang.org/x/crypto v0.0.0-20171113213409-9f005a07e0d3/go.mod h1:6SG95UA2DQfeDnfUPMdvaQW0Q7yPrPDi9nlGo2tz2b4= golang.org/x/crypto v0.0.0-20180904163835-0709b304e793/go.mod h1:6SG95UA2DQfeDnfUPMdvaQW0Q7yPrPDi9nlGo2tz2b4= golang.org/x/crypto v0.0.0-20181009213950-7c1a557ab941/go.mod h1:6SG95UA2DQfeDnfUPMdvaQW0Q7yPrPDi9nlGo2tz2b4= diff --git a/testbed/go.mod b/testbed/go.mod index 57a1895d792d..4a95d7c53151 100644 --- a/testbed/go.mod +++ b/testbed/go.mod @@ -27,22 +27,23 @@ 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.66.1-0.20221128222955-4ff1ff379b90 - go.opentelemetry.io/collector/component v0.66.1-0.20221128222955-4ff1ff379b90 - go.opentelemetry.io/collector/consumer v0.66.1-0.20221128222955-4ff1ff379b90 - go.opentelemetry.io/collector/exporter/loggingexporter v0.66.1-0.20221128222955-4ff1ff379b90 - go.opentelemetry.io/collector/exporter/otlpexporter v0.66.1-0.20221128222955-4ff1ff379b90 - go.opentelemetry.io/collector/exporter/otlphttpexporter v0.66.1-0.20221128222955-4ff1ff379b90 - go.opentelemetry.io/collector/extension/ballastextension v0.66.1-0.20221128222955-4ff1ff379b90 - go.opentelemetry.io/collector/extension/zpagesextension v0.66.1-0.20221128222955-4ff1ff379b90 - go.opentelemetry.io/collector/pdata v0.66.1-0.20221128222955-4ff1ff379b90 - go.opentelemetry.io/collector/processor/batchprocessor v0.66.1-0.20221128222955-4ff1ff379b90 - go.opentelemetry.io/collector/processor/memorylimiterprocessor v0.66.1-0.20221128222955-4ff1ff379b90 - go.opentelemetry.io/collector/receiver/otlpreceiver v0.66.1-0.20221128222955-4ff1ff379b90 - go.opentelemetry.io/collector/semconv v0.66.1-0.20221128222955-4ff1ff379b90 + go.opentelemetry.io/collector v0.66.1-0.20221202005155-1c54042beb70 + go.opentelemetry.io/collector/component v0.66.1-0.20221202005155-1c54042beb70 + go.opentelemetry.io/collector/confmap v0.0.0-20221201172708-2bdff61fa52a + go.opentelemetry.io/collector/consumer v0.66.1-0.20221202005155-1c54042beb70 + go.opentelemetry.io/collector/exporter/loggingexporter v0.66.1-0.20221202005155-1c54042beb70 + go.opentelemetry.io/collector/exporter/otlpexporter v0.66.1-0.20221202005155-1c54042beb70 + go.opentelemetry.io/collector/exporter/otlphttpexporter v0.66.1-0.20221202005155-1c54042beb70 + go.opentelemetry.io/collector/extension/ballastextension v0.66.1-0.20221202005155-1c54042beb70 + go.opentelemetry.io/collector/extension/zpagesextension v0.66.1-0.20221202005155-1c54042beb70 + go.opentelemetry.io/collector/pdata v0.66.1-0.20221202005155-1c54042beb70 + go.opentelemetry.io/collector/processor/batchprocessor v0.66.1-0.20221202005155-1c54042beb70 + go.opentelemetry.io/collector/processor/memorylimiterprocessor v0.66.1-0.20221202005155-1c54042beb70 + go.opentelemetry.io/collector/receiver/otlpreceiver v0.66.1-0.20221202005155-1c54042beb70 + go.opentelemetry.io/collector/semconv v0.66.1-0.20221202005155-1c54042beb70 go.uber.org/atomic v1.10.0 go.uber.org/multierr v1.8.0 - go.uber.org/zap v1.23.0 + go.uber.org/zap v1.24.0 golang.org/x/text v0.4.0 ) @@ -185,14 +186,14 @@ require ( github.com/spf13/cobra v1.6.1 // indirect github.com/spf13/pflag v1.0.5 // indirect github.com/tinylib/msgp v1.1.0 // indirect - github.com/tklauser/go-sysconf v0.3.10 // indirect - github.com/tklauser/numcpus v0.4.0 // indirect + github.com/tklauser/go-sysconf v0.3.11 // indirect + github.com/tklauser/numcpus v0.6.0 // indirect github.com/uber/jaeger-client-go v2.30.0+incompatible // indirect 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.24.0 // indirect - go.opentelemetry.io/collector/featuregate v0.66.1-0.20221128222955-4ff1ff379b90 // indirect + go.opentelemetry.io/collector/featuregate v0.66.1-0.20221202005155-1c54042beb70 // indirect go.opentelemetry.io/contrib/instrumentation/google.golang.org/grpc/otelgrpc v0.36.4 // indirect go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.36.4 // indirect go.opentelemetry.io/contrib/propagators/b3 v1.11.1 // indirect diff --git a/testbed/go.sum b/testbed/go.sum index 109272c1bf91..fe1e9f202d2c 100644 --- a/testbed/go.sum +++ b/testbed/go.sum @@ -1546,10 +1546,12 @@ github.com/tidwall/wal v1.1.7 h1:emc1TRjIVsdKKSnpwGBAcsAGg0767SvUk8+ygx7Bb+4= github.com/timakin/bodyclose v0.0.0-20200424151742-cb6215831a94/go.mod h1:Qimiffbc6q9tBWlVV6x0P9sat/ao1xEkREYPPj9hphk= github.com/tinylib/msgp v1.1.0 h1:9fQd+ICuRIu/ue4vxJZu6/LzxN0HwMds2nq/0cFvxHU= github.com/tinylib/msgp v1.1.0/go.mod h1:+d+yLhGm8mzTaHzB+wgMYrodPfmZrzkirds8fDWklFE= -github.com/tklauser/go-sysconf v0.3.10 h1:IJ1AZGZRWbY8T5Vfk04D9WOA5WSejdflXxP03OUqALw= github.com/tklauser/go-sysconf v0.3.10/go.mod h1:C8XykCvCb+Gn0oNCWPIlcb0RuglQTYaQ2hGm7jmxEFk= -github.com/tklauser/numcpus v0.4.0 h1:E53Dm1HjH1/R2/aoCtXtPgzmElmn51aOkhCFSuZq//o= +github.com/tklauser/go-sysconf v0.3.11 h1:89WgdJhk5SNwJfu+GKyYveZ4IaJ7xAkecBo+KdJV0CM= +github.com/tklauser/go-sysconf v0.3.11/go.mod h1:GqXfhXY3kiPa0nAXPDIQIWzJbMCB7AmcWpGR8lSZfqI= github.com/tklauser/numcpus v0.4.0/go.mod h1:1+UI3pD8NW14VMwdgJNJ1ESk2UnwhAnz5hMwiKKqXCQ= +github.com/tklauser/numcpus v0.6.0 h1:kebhY2Qt+3U6RNK7UqpYNA+tJ23IBEGKkB7JQBfDYms= +github.com/tklauser/numcpus v0.6.0/go.mod h1:FEZLMke0lhOUG6w2JadTzp0a+Nl8PF/GFkQ5UVIcaL4= github.com/tmc/grpc-websocket-proxy v0.0.0-20170815181823-89b8d40f7ca8/go.mod h1:ncp9v5uamzpCO7NfCPTXjqaC+bZgJeR0sMTm6dMHP7U= github.com/tmc/grpc-websocket-proxy v0.0.0-20190109142713-0ad062ec5ee5/go.mod h1:ncp9v5uamzpCO7NfCPTXjqaC+bZgJeR0sMTm6dMHP7U= github.com/tomarrell/wrapcheck v0.0.0-20201130113247-1683564d9756/go.mod h1:yiFB6fFoV7saXirUGfuK+cPtUh4NX/Hf5y2WC2lehu0= @@ -1637,50 +1639,59 @@ go.opencensus.io v0.24.0/go.mod h1:vNK8G9p7aAivkbmorf4v+7Hgx+Zs0yY+0fOtgBfjQKo= go.opentelemetry.io/collector v0.57.2/go.mod h1:9TwWyMRhbFNzaaGLtm/6poWNDJw+etvQMS6Fy+8/8Xs= go.opentelemetry.io/collector v0.64.1/go.mod h1:RxdEKzwxTEhBAgzC4wzyJEwSFgjWU73CHnLjKUKQDyo= go.opentelemetry.io/collector v0.65.0/go.mod h1:hE6jCs+0rfiufCrVPucKZTMwfHit1okfDPnwPT2eW1I= -go.opentelemetry.io/collector v0.66.1-0.20221128222955-4ff1ff379b90 h1:yRe05/jMdzH4TFHfndZ5h2o2hKBK/79W72j8w51qNsI= -go.opentelemetry.io/collector v0.66.1-0.20221128222955-4ff1ff379b90/go.mod h1:hE6jCs+0rfiufCrVPucKZTMwfHit1okfDPnwPT2eW1I= +go.opentelemetry.io/collector v0.66.1-0.20221202005155-1c54042beb70 h1:INB2CsOtqqrija2KvMuIpbBQ3qX1BECEeR+d0NJX+oM= +go.opentelemetry.io/collector v0.66.1-0.20221202005155-1c54042beb70/go.mod h1:d0NHkHyANJy3HDTvYE/PoylMShUmFIbiir89ieI0X0c= go.opentelemetry.io/collector/component v0.65.0/go.mod h1:0c84EqXUhvYe6KW7hJfh76tiI/5yjWCH2amwyQ06XLM= -go.opentelemetry.io/collector/component v0.66.1-0.20221128222955-4ff1ff379b90 h1:AYSNTXbezhNg43EuYdVVcgxE/2gBVrm00FDx4DOmQVg= -go.opentelemetry.io/collector/component v0.66.1-0.20221128222955-4ff1ff379b90/go.mod h1:0c84EqXUhvYe6KW7hJfh76tiI/5yjWCH2amwyQ06XLM= +go.opentelemetry.io/collector/component v0.66.0/go.mod h1:0c84EqXUhvYe6KW7hJfh76tiI/5yjWCH2amwyQ06XLM= +go.opentelemetry.io/collector/component v0.66.1-0.20221202005155-1c54042beb70 h1:dEoJhzCmRShgmVro/kXm6pouGElgxkH2DsvanzCeZtU= +go.opentelemetry.io/collector/component v0.66.1-0.20221202005155-1c54042beb70/go.mod h1:OsVnvFFe38QSpcuZlQ8cvarDzcloCexgQ1/B2m80F6U= +go.opentelemetry.io/collector/confmap v0.0.0-20221201172708-2bdff61fa52a h1:2TscCXAQASO2kU9xHcMIUM/FP29fiQIRTilZmliq/7I= +go.opentelemetry.io/collector/confmap v0.0.0-20221201172708-2bdff61fa52a/go.mod h1:qJ3e8bA8h4wz/jYlbeEUafVHdrU7DkpStnmIUAz6VTQ= go.opentelemetry.io/collector/consumer v0.65.0/go.mod h1:WtoRZa5SnxQO1ZEQdVxYpFcXCmq62rakv0oUSlPO0NQ= -go.opentelemetry.io/collector/consumer v0.66.1-0.20221128222955-4ff1ff379b90 h1:nzNXVfC1FzXBXCLMzbMv+qK3E4EGiNsnMhfVsBd2yzc= -go.opentelemetry.io/collector/consumer v0.66.1-0.20221128222955-4ff1ff379b90/go.mod h1:WtoRZa5SnxQO1ZEQdVxYpFcXCmq62rakv0oUSlPO0NQ= -go.opentelemetry.io/collector/exporter/loggingexporter v0.66.1-0.20221128222955-4ff1ff379b90 h1:kCxEnurhKpScV+wDU/7RDngmOFeqyEh7GZUqrBaYnUU= -go.opentelemetry.io/collector/exporter/loggingexporter v0.66.1-0.20221128222955-4ff1ff379b90/go.mod h1:X7fNHTbcgvOOio9QDEyVk0WbIm1JaVYby4z3VzsOc2k= -go.opentelemetry.io/collector/exporter/otlpexporter v0.66.1-0.20221128222955-4ff1ff379b90 h1:3+YgPEDEyNzwiI+V9J2YBVGyV9Qppu4VPbB3jHeN8Ns= -go.opentelemetry.io/collector/exporter/otlpexporter v0.66.1-0.20221128222955-4ff1ff379b90/go.mod h1:IOoHR1lsV1r2TFOVctPogn9RUXT4jiU7kH+IhfUlP1w= -go.opentelemetry.io/collector/exporter/otlphttpexporter v0.66.1-0.20221128222955-4ff1ff379b90 h1:KkI/to7/yvuL5zHzhviy7UXMZVZ7jbfnk+YCAwCiimA= -go.opentelemetry.io/collector/exporter/otlphttpexporter v0.66.1-0.20221128222955-4ff1ff379b90/go.mod h1:Gx9WIGE9pUv38Sm8IN0IPM7k+mX2hHGfRZI/65pOSIc= -go.opentelemetry.io/collector/extension/ballastextension v0.66.1-0.20221128222955-4ff1ff379b90 h1:JmfSDExgWNiFQJ4eF9UzjDaE9rfBhKxIu5khBbAScd0= -go.opentelemetry.io/collector/extension/ballastextension v0.66.1-0.20221128222955-4ff1ff379b90/go.mod h1:vjBno34PZB+byrW3QWzftLFqCI1G8PbgPrgPzpFXpQM= +go.opentelemetry.io/collector/consumer v0.66.0/go.mod h1:WtoRZa5SnxQO1ZEQdVxYpFcXCmq62rakv0oUSlPO0NQ= +go.opentelemetry.io/collector/consumer v0.66.1-0.20221202005155-1c54042beb70 h1:XwpVjI1KeKGPXOZBLefGILMziPYuNf6IzbmiIEsIyI0= +go.opentelemetry.io/collector/consumer v0.66.1-0.20221202005155-1c54042beb70/go.mod h1:EWVBcSGcIcmeDGTnIboc/aqa3agsBeH8/q7yFWG7xVc= +go.opentelemetry.io/collector/exporter/loggingexporter v0.66.1-0.20221202005155-1c54042beb70 h1:/C637mgJY6I0l/KFLXmL9I1foefM53aob20WF2Yh/0Y= +go.opentelemetry.io/collector/exporter/loggingexporter v0.66.1-0.20221202005155-1c54042beb70/go.mod h1:xxkHO5NrxffTV22dhCy3K8XZThGJ1ak7LZ1ctoiJp5k= +go.opentelemetry.io/collector/exporter/otlpexporter v0.66.1-0.20221202005155-1c54042beb70 h1:m9GPfziw/079Xt7/Pfby/5obJhtqR19WKkgQQ/VxNZo= +go.opentelemetry.io/collector/exporter/otlpexporter v0.66.1-0.20221202005155-1c54042beb70/go.mod h1:bCD3trc7OqeEVCgyQdO3kwGgogZMjcMu2tX49SFv1lU= +go.opentelemetry.io/collector/exporter/otlphttpexporter v0.66.1-0.20221202005155-1c54042beb70 h1:7rDNCZS1qfqZxnCLaBWItnX/TweYKC6NyULpelzXl4g= +go.opentelemetry.io/collector/exporter/otlphttpexporter v0.66.1-0.20221202005155-1c54042beb70/go.mod h1:vkFlRP0DDfDfSDVl96Gvy5Ah8L8sMcVAxMZn+0af2ew= +go.opentelemetry.io/collector/extension/ballastextension v0.66.1-0.20221202005155-1c54042beb70 h1:pSGZDMMURLRp7iSxeNlDNDxDgFQJqCYt+Fv7bZxC0JU= +go.opentelemetry.io/collector/extension/ballastextension v0.66.1-0.20221202005155-1c54042beb70/go.mod h1:+YdyZisEXLDE8rhZE7Ce4wli0ZVE164SFN0qg2mPjDU= go.opentelemetry.io/collector/extension/zpagesextension v0.64.1/go.mod h1:XenhQAUbOHgqNq5YQ/vQIcDHRcPUaDgZQxDC2qoI4Bc= go.opentelemetry.io/collector/extension/zpagesextension v0.65.0/go.mod h1:+IPas7AeffG0GMIXhZr8IzpTNhH1Ri/6S/9YFqbLsmQ= -go.opentelemetry.io/collector/extension/zpagesextension v0.66.1-0.20221128222955-4ff1ff379b90 h1:Hsvd2zNTCjHjYVsHt57zUgpKMrmESgndZItuuvvv2bA= -go.opentelemetry.io/collector/extension/zpagesextension v0.66.1-0.20221128222955-4ff1ff379b90/go.mod h1:+IPas7AeffG0GMIXhZr8IzpTNhH1Ri/6S/9YFqbLsmQ= +go.opentelemetry.io/collector/extension/zpagesextension v0.66.0/go.mod h1:+IPas7AeffG0GMIXhZr8IzpTNhH1Ri/6S/9YFqbLsmQ= +go.opentelemetry.io/collector/extension/zpagesextension v0.66.1-0.20221202005155-1c54042beb70 h1:+vq59gRJpiAcUshBVxhqhc9aXOc/8Z5wuWlyng5Hfm4= +go.opentelemetry.io/collector/extension/zpagesextension v0.66.1-0.20221202005155-1c54042beb70/go.mod h1:tejEMB1pDXsmEeyg7UHB+S++4Lvgtki7N5CVWk5rI4A= go.opentelemetry.io/collector/featuregate v0.65.0/go.mod h1:tewuFKJYalWBU0bmNKg++MC1ipINXUr6szYzOw2p1GI= -go.opentelemetry.io/collector/featuregate v0.66.1-0.20221128222955-4ff1ff379b90 h1:UuJSFWbi9XxyNZsJKZuvpWg35BgRbcCGFH+38V2MAdw= -go.opentelemetry.io/collector/featuregate v0.66.1-0.20221128222955-4ff1ff379b90/go.mod h1:tewuFKJYalWBU0bmNKg++MC1ipINXUr6szYzOw2p1GI= +go.opentelemetry.io/collector/featuregate v0.66.0/go.mod h1:tewuFKJYalWBU0bmNKg++MC1ipINXUr6szYzOw2p1GI= +go.opentelemetry.io/collector/featuregate v0.66.1-0.20221202005155-1c54042beb70 h1:V0tf4ebciqIs07jFATfLGdUpLRaEsi+AiWuA/in0G8Y= +go.opentelemetry.io/collector/featuregate v0.66.1-0.20221202005155-1c54042beb70/go.mod h1:tewuFKJYalWBU0bmNKg++MC1ipINXUr6szYzOw2p1GI= go.opentelemetry.io/collector/pdata v0.56.0/go.mod h1:mYcCREWiIJyHss0dbU+GSiz2tmGZ6u09vtfkKTciog4= go.opentelemetry.io/collector/pdata v0.57.2/go.mod h1:RU9I8lwBUxucwOsSYzHEcHi15M9QaX78hgQ2PRdSxV0= go.opentelemetry.io/collector/pdata v0.64.1/go.mod h1:IzvXUGQml2mrnvdb8zIlEW3qQs9oFLdD2hLwJdZ+pek= go.opentelemetry.io/collector/pdata v0.65.0/go.mod h1:pqyaznLzk21m+1KL6fwOsRryRELL+zNM0qiVSn0MbVc= -go.opentelemetry.io/collector/pdata v0.66.1-0.20221128222955-4ff1ff379b90 h1:Vu4S4jSNcd0VFPzxQNO4+UqGwnes1xJDoFLPRiWHm8I= -go.opentelemetry.io/collector/pdata v0.66.1-0.20221128222955-4ff1ff379b90/go.mod h1:pqyaznLzk21m+1KL6fwOsRryRELL+zNM0qiVSn0MbVc= +go.opentelemetry.io/collector/pdata v0.66.0/go.mod h1:pqyaznLzk21m+1KL6fwOsRryRELL+zNM0qiVSn0MbVc= +go.opentelemetry.io/collector/pdata v0.66.1-0.20221202005155-1c54042beb70 h1:TPOrxkEMvZzfBSwF3ct+kUUgKA5g8unkZZbKQvJweeA= +go.opentelemetry.io/collector/pdata v0.66.1-0.20221202005155-1c54042beb70/go.mod h1:pqyaznLzk21m+1KL6fwOsRryRELL+zNM0qiVSn0MbVc= go.opentelemetry.io/collector/processor/batchprocessor v0.64.1/go.mod h1:qVl0+aYokPfiq5y+JVAvlII2rrUFBDEqqiDbTSnax78= go.opentelemetry.io/collector/processor/batchprocessor v0.65.0/go.mod h1:XhGTsC1B/bq4gpg8IZ/QYBLXkzE4Gw3r7Xu2+ik8A1Q= -go.opentelemetry.io/collector/processor/batchprocessor v0.66.1-0.20221128222955-4ff1ff379b90 h1:K12L9juzjChBMfp7cQaQsToz7i7975tUYVzJ3Tpw/Cw= -go.opentelemetry.io/collector/processor/batchprocessor v0.66.1-0.20221128222955-4ff1ff379b90/go.mod h1:XhGTsC1B/bq4gpg8IZ/QYBLXkzE4Gw3r7Xu2+ik8A1Q= -go.opentelemetry.io/collector/processor/memorylimiterprocessor v0.66.1-0.20221128222955-4ff1ff379b90 h1:4+4M7itvIDswjFTjvVttC+XWy7eOU2lxjEBaUiq/MXk= -go.opentelemetry.io/collector/processor/memorylimiterprocessor v0.66.1-0.20221128222955-4ff1ff379b90/go.mod h1:KfHfOzND4tzQYewrYzi/NGzvOV3wR7jzWTkxSR00lRI= +go.opentelemetry.io/collector/processor/batchprocessor v0.66.0/go.mod h1:XhGTsC1B/bq4gpg8IZ/QYBLXkzE4Gw3r7Xu2+ik8A1Q= +go.opentelemetry.io/collector/processor/batchprocessor v0.66.1-0.20221202005155-1c54042beb70 h1:Y4e8NnVevonnAgmjX9Z7QIMA32yMqHAOnAlh8SzTS8c= +go.opentelemetry.io/collector/processor/batchprocessor v0.66.1-0.20221202005155-1c54042beb70/go.mod h1:Pi1CsKDQFoDrUP1i3+VdE6s2Xuji7bOGFBgqHK0J32E= +go.opentelemetry.io/collector/processor/memorylimiterprocessor v0.66.1-0.20221202005155-1c54042beb70 h1:l0005D1ERsXKno9Ax5Gr2A8FaysF7n40yer6r5qAMHQ= +go.opentelemetry.io/collector/processor/memorylimiterprocessor v0.66.1-0.20221202005155-1c54042beb70/go.mod h1:9CBysimj8fH0weF6Wu8S8nW7cG/XRanrMU1BWlIXeN4= go.opentelemetry.io/collector/receiver/otlpreceiver v0.64.1/go.mod h1:4rwNi9SeCKBP9XGLWNRFKPsWUV5NK4iqMvdj2WRMksQ= -go.opentelemetry.io/collector/receiver/otlpreceiver v0.66.1-0.20221128222955-4ff1ff379b90 h1:/+HfaoVPSXgHUZOTZSSriuKOQi8L/rgyb7TTRx5jzoo= -go.opentelemetry.io/collector/receiver/otlpreceiver v0.66.1-0.20221128222955-4ff1ff379b90/go.mod h1:pb+dcV+KJ44dP+CqV0N6L6dTeDDvCXB8StCqwlrrSkM= +go.opentelemetry.io/collector/receiver/otlpreceiver v0.66.1-0.20221202005155-1c54042beb70 h1:KBbbPVDV7o5w857g6ePphdu4MV87jrcQevFYDA1okUk= +go.opentelemetry.io/collector/receiver/otlpreceiver v0.66.1-0.20221202005155-1c54042beb70/go.mod h1:0Py8RNjNiFRH6/F+vM2uptdaw9hMj1FBdv0ySntM2gE= go.opentelemetry.io/collector/semconv v0.56.0/go.mod h1:EH1wbDvTyqKpKBBpoMIe0KQk2plCcFS66Mo17WtR7CQ= go.opentelemetry.io/collector/semconv v0.57.2/go.mod h1:84YnUjmm+nhGu4YTDLnHCbxnL74ooWpismPG79tFD7w= go.opentelemetry.io/collector/semconv v0.64.1/go.mod h1:5o9yhOa+ABt7g2E5JABDxGZ1PQPbtfxrKNbYn+LOTXU= go.opentelemetry.io/collector/semconv v0.65.0/go.mod h1:5o9yhOa+ABt7g2E5JABDxGZ1PQPbtfxrKNbYn+LOTXU= -go.opentelemetry.io/collector/semconv v0.66.1-0.20221128222955-4ff1ff379b90 h1:hFaTA68cggZKWMv7wQ3bKP8KGTbowh/5AQZKCHzHTqM= -go.opentelemetry.io/collector/semconv v0.66.1-0.20221128222955-4ff1ff379b90/go.mod h1:5o9yhOa+ABt7g2E5JABDxGZ1PQPbtfxrKNbYn+LOTXU= +go.opentelemetry.io/collector/semconv v0.66.0/go.mod h1:5o9yhOa+ABt7g2E5JABDxGZ1PQPbtfxrKNbYn+LOTXU= +go.opentelemetry.io/collector/semconv v0.66.1-0.20221202005155-1c54042beb70 h1:Q5L9Urod3c8as6ZYaoaqBjarx/HXxsxy34DFZIU2fO4= +go.opentelemetry.io/collector/semconv v0.66.1-0.20221202005155-1c54042beb70/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= @@ -1743,8 +1754,9 @@ go.uber.org/zap v1.17.0/go.mod h1:MXVU+bhUf/A7Xi2HNOnopQOrmycQ5Ih87HtOu4q5SSo= go.uber.org/zap v1.19.1/go.mod h1:j3DNczoxDZroyBnOT1L/Q79cfUMGZxlv/9dzN7SM1rI= go.uber.org/zap v1.21.0/go.mod h1:wjWOCqI0f2ZZrJF/UufIOkiC8ii6tm1iqIsLo76RfJw= go.uber.org/zap v1.22.0/go.mod h1:H4siCOZOrAolnUPJEkfaSjDqyP+BDS0DdDWzwcgt3+U= -go.uber.org/zap v1.23.0 h1:OjGQ5KQDEUawVHxNwQgPpiypGHOxo2mNZsOqTak4fFY= go.uber.org/zap v1.23.0/go.mod h1:D+nX8jyLsMHMYrln8A0rJjFt/T/9/bGgIhAqxv5URuY= +go.uber.org/zap v1.24.0 h1:FiJd5l1UOLj0wCgbSE0rwwXHzEdAZS6hiiSnxJN/D60= +go.uber.org/zap v1.24.0/go.mod h1:2kMP+WWQ8aoFoedH3T2sq6iJ2yDWpHbP0f6MQbS9Gkg= golang.org/x/crypto v0.0.0-20180904163835-0709b304e793/go.mod h1:6SG95UA2DQfeDnfUPMdvaQW0Q7yPrPDi9nlGo2tz2b4= golang.org/x/crypto v0.0.0-20181029021203-45a5f77698d3/go.mod h1:6SG95UA2DQfeDnfUPMdvaQW0Q7yPrPDi9nlGo2tz2b4= golang.org/x/crypto v0.0.0-20181203042331-505ab145d0a9/go.mod h1:6SG95UA2DQfeDnfUPMdvaQW0Q7yPrPDi9nlGo2tz2b4= diff --git a/testbed/mockdatareceivers/mockawsxrayreceiver/go.mod b/testbed/mockdatareceivers/mockawsxrayreceiver/go.mod index 877f53c67f3e..451c97403ff9 100644 --- a/testbed/mockdatareceivers/mockawsxrayreceiver/go.mod +++ b/testbed/mockdatareceivers/mockawsxrayreceiver/go.mod @@ -4,11 +4,11 @@ go 1.18 require ( github.com/gorilla/mux v1.8.0 - go.opentelemetry.io/collector v0.66.1-0.20221128222955-4ff1ff379b90 - go.opentelemetry.io/collector/component v0.66.1-0.20221128222955-4ff1ff379b90 - go.opentelemetry.io/collector/consumer v0.66.1-0.20221128222955-4ff1ff379b90 - go.opentelemetry.io/collector/pdata v0.66.1-0.20221128222955-4ff1ff379b90 - go.uber.org/zap v1.23.0 + go.opentelemetry.io/collector v0.66.1-0.20221202005155-1c54042beb70 + go.opentelemetry.io/collector/component v0.66.1-0.20221202005155-1c54042beb70 + go.opentelemetry.io/collector/consumer v0.66.1-0.20221202005155-1c54042beb70 + go.opentelemetry.io/collector/pdata v0.66.1-0.20221202005155-1c54042beb70 + go.uber.org/zap v1.24.0 ) require ( @@ -24,7 +24,8 @@ require ( github.com/modern-go/reflect2 v1.0.2 // indirect github.com/pelletier/go-toml v1.9.4 // indirect go.opencensus.io v0.24.0 // indirect - go.opentelemetry.io/collector/featuregate v0.66.1-0.20221128222955-4ff1ff379b90 // indirect + go.opentelemetry.io/collector/confmap v0.0.0-20221201172708-2bdff61fa52a // indirect + go.opentelemetry.io/collector/featuregate v0.66.1-0.20221202005155-1c54042beb70 // 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 d29a2382a180..831484dea6d0 100644 --- a/testbed/mockdatareceivers/mockawsxrayreceiver/go.sum +++ b/testbed/mockdatareceivers/mockawsxrayreceiver/go.sum @@ -278,16 +278,18 @@ go.etcd.io/etcd/client/pkg/v3 v3.5.4/go.mod h1:IJHfcCEKxYu1Os13ZdwCwIUTUVGYTSAM3 go.etcd.io/etcd/client/v3 v3.5.4/go.mod h1:ZaRkVgBZC+L+dLCjTcF1hRXpgZXQPOvnA/Ak/gq3kiY= go.opencensus.io v0.24.0 h1:y73uSU6J157QMP2kn2r30vwW1A2W2WFwSCGnAVxeaD0= go.opencensus.io v0.24.0/go.mod h1:vNK8G9p7aAivkbmorf4v+7Hgx+Zs0yY+0fOtgBfjQKo= -go.opentelemetry.io/collector v0.66.1-0.20221128222955-4ff1ff379b90 h1:yRe05/jMdzH4TFHfndZ5h2o2hKBK/79W72j8w51qNsI= -go.opentelemetry.io/collector v0.66.1-0.20221128222955-4ff1ff379b90/go.mod h1:hE6jCs+0rfiufCrVPucKZTMwfHit1okfDPnwPT2eW1I= -go.opentelemetry.io/collector/component v0.66.1-0.20221128222955-4ff1ff379b90 h1:AYSNTXbezhNg43EuYdVVcgxE/2gBVrm00FDx4DOmQVg= -go.opentelemetry.io/collector/component v0.66.1-0.20221128222955-4ff1ff379b90/go.mod h1:0c84EqXUhvYe6KW7hJfh76tiI/5yjWCH2amwyQ06XLM= -go.opentelemetry.io/collector/consumer v0.66.1-0.20221128222955-4ff1ff379b90 h1:nzNXVfC1FzXBXCLMzbMv+qK3E4EGiNsnMhfVsBd2yzc= -go.opentelemetry.io/collector/consumer v0.66.1-0.20221128222955-4ff1ff379b90/go.mod h1:WtoRZa5SnxQO1ZEQdVxYpFcXCmq62rakv0oUSlPO0NQ= -go.opentelemetry.io/collector/featuregate v0.66.1-0.20221128222955-4ff1ff379b90 h1:UuJSFWbi9XxyNZsJKZuvpWg35BgRbcCGFH+38V2MAdw= -go.opentelemetry.io/collector/featuregate v0.66.1-0.20221128222955-4ff1ff379b90/go.mod h1:tewuFKJYalWBU0bmNKg++MC1ipINXUr6szYzOw2p1GI= -go.opentelemetry.io/collector/pdata v0.66.1-0.20221128222955-4ff1ff379b90 h1:Vu4S4jSNcd0VFPzxQNO4+UqGwnes1xJDoFLPRiWHm8I= -go.opentelemetry.io/collector/pdata v0.66.1-0.20221128222955-4ff1ff379b90/go.mod h1:pqyaznLzk21m+1KL6fwOsRryRELL+zNM0qiVSn0MbVc= +go.opentelemetry.io/collector v0.66.1-0.20221202005155-1c54042beb70 h1:INB2CsOtqqrija2KvMuIpbBQ3qX1BECEeR+d0NJX+oM= +go.opentelemetry.io/collector v0.66.1-0.20221202005155-1c54042beb70/go.mod h1:d0NHkHyANJy3HDTvYE/PoylMShUmFIbiir89ieI0X0c= +go.opentelemetry.io/collector/component v0.66.1-0.20221202005155-1c54042beb70 h1:dEoJhzCmRShgmVro/kXm6pouGElgxkH2DsvanzCeZtU= +go.opentelemetry.io/collector/component v0.66.1-0.20221202005155-1c54042beb70/go.mod h1:OsVnvFFe38QSpcuZlQ8cvarDzcloCexgQ1/B2m80F6U= +go.opentelemetry.io/collector/confmap v0.0.0-20221201172708-2bdff61fa52a h1:2TscCXAQASO2kU9xHcMIUM/FP29fiQIRTilZmliq/7I= +go.opentelemetry.io/collector/confmap v0.0.0-20221201172708-2bdff61fa52a/go.mod h1:qJ3e8bA8h4wz/jYlbeEUafVHdrU7DkpStnmIUAz6VTQ= +go.opentelemetry.io/collector/consumer v0.66.1-0.20221202005155-1c54042beb70 h1:XwpVjI1KeKGPXOZBLefGILMziPYuNf6IzbmiIEsIyI0= +go.opentelemetry.io/collector/consumer v0.66.1-0.20221202005155-1c54042beb70/go.mod h1:EWVBcSGcIcmeDGTnIboc/aqa3agsBeH8/q7yFWG7xVc= +go.opentelemetry.io/collector/featuregate v0.66.1-0.20221202005155-1c54042beb70 h1:V0tf4ebciqIs07jFATfLGdUpLRaEsi+AiWuA/in0G8Y= +go.opentelemetry.io/collector/featuregate v0.66.1-0.20221202005155-1c54042beb70/go.mod h1:tewuFKJYalWBU0bmNKg++MC1ipINXUr6szYzOw2p1GI= +go.opentelemetry.io/collector/pdata v0.66.1-0.20221202005155-1c54042beb70 h1:TPOrxkEMvZzfBSwF3ct+kUUgKA5g8unkZZbKQvJweeA= +go.opentelemetry.io/collector/pdata v0.66.1-0.20221202005155-1c54042beb70/go.mod h1:pqyaznLzk21m+1KL6fwOsRryRELL+zNM0qiVSn0MbVc= 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= @@ -306,8 +308,8 @@ go.uber.org/multierr v1.6.0/go.mod h1:cdWPpRnG4AhwMwsgIHip0KRBQjJy5kYEpYjJxpXp9i go.uber.org/multierr v1.8.0 h1:dg6GjLku4EH+249NNmoIciG9N/jURbDG+pFlTkhzIC8= go.uber.org/multierr v1.8.0/go.mod h1:7EAYxJLBy9rStEaz58O2t4Uvip6FSURkq8/ppBp95ak= go.uber.org/zap v1.17.0/go.mod h1:MXVU+bhUf/A7Xi2HNOnopQOrmycQ5Ih87HtOu4q5SSo= -go.uber.org/zap v1.23.0 h1:OjGQ5KQDEUawVHxNwQgPpiypGHOxo2mNZsOqTak4fFY= -go.uber.org/zap v1.23.0/go.mod h1:D+nX8jyLsMHMYrln8A0rJjFt/T/9/bGgIhAqxv5URuY= +go.uber.org/zap v1.24.0 h1:FiJd5l1UOLj0wCgbSE0rwwXHzEdAZS6hiiSnxJN/D60= +go.uber.org/zap v1.24.0/go.mod h1:2kMP+WWQ8aoFoedH3T2sq6iJ2yDWpHbP0f6MQbS9Gkg= golang.org/x/crypto v0.0.0-20180904163835-0709b304e793/go.mod h1:6SG95UA2DQfeDnfUPMdvaQW0Q7yPrPDi9nlGo2tz2b4= golang.org/x/crypto v0.0.0-20190308221718-c2843e01d9a2/go.mod h1:djNgcEr1/C05ACkg1iLfiJU5Ep61QUkGW8qpdssI0+w= golang.org/x/crypto v0.0.0-20190923035154-9ee001bba392/go.mod h1:/lpIB1dKB+9EgE3H3cr1v9wB50oz8l4C4h62xy7jSTY= diff --git a/testbed/mockdatareceivers/mockawsxrayreceiver/trace_receiver.go b/testbed/mockdatareceivers/mockawsxrayreceiver/trace_receiver.go index 17356231a37f..9872e5094835 100644 --- a/testbed/mockdatareceivers/mockawsxrayreceiver/trace_receiver.go +++ b/testbed/mockdatareceivers/mockawsxrayreceiver/trace_receiver.go @@ -54,11 +54,11 @@ func New( return nil, component.ErrNilNextConsumer } - obsrecv, err := obsreport.NewReceiver(obsreport.ReceiverSettings{ReceiverID: config.ID(), Transport: "http"}) + obsrecv, err := obsreport.NewReceiver(obsreport.ReceiverSettings{ReceiverID: params.ID, Transport: "http", ReceiverCreateSettings: params}) if err != nil { return nil, err } - httpsObsrecv, err := obsreport.NewReceiver(obsreport.ReceiverSettings{ReceiverID: config.ID(), Transport: "https"}) + httpsObsrecv, err := obsreport.NewReceiver(obsreport.ReceiverSettings{ReceiverID: params.ID, Transport: "https", ReceiverCreateSettings: params}) if err != nil { return nil, err } diff --git a/testbed/testbed/components.go b/testbed/testbed/components.go index 08d9b124c0db..c0eebc4265a2 100644 --- a/testbed/testbed/components.go +++ b/testbed/testbed/components.go @@ -19,6 +19,7 @@ import ( "go.opentelemetry.io/collector/exporter/loggingexporter" "go.opentelemetry.io/collector/exporter/otlpexporter" "go.opentelemetry.io/collector/exporter/otlphttpexporter" + "go.opentelemetry.io/collector/extension" "go.opentelemetry.io/collector/extension/ballastextension" "go.opentelemetry.io/collector/extension/zpagesextension" "go.opentelemetry.io/collector/processor/batchprocessor" @@ -41,7 +42,7 @@ func Components() ( ) { var errs error - extensions, err := component.MakeExtensionFactoryMap( + extensions, err := extension.MakeFactoryMap( zpagesextension.NewFactory(), ballastextension.NewFactory(), )