From f6aeccd4cac7fd814a639dd6bd75a756d99d9c0e Mon Sep 17 00:00:00 2001 From: Bogdan Drutu Date: Mon, 18 Oct 2021 11:21:07 -0700 Subject: [PATCH] Upgrade to core latest PR, switch some scrapers to the new interface (#5782) Signed-off-by: Bogdan Drutu --- cmd/configschema/go.mod | 7 +-- cmd/configschema/go.sum | 8 ++-- .../alibabacloudlogserviceexporter/go.mod | 4 +- .../alibabacloudlogserviceexporter/go.sum | 7 +-- exporter/awscloudwatchlogsexporter/go.mod | 4 +- exporter/awscloudwatchlogsexporter/go.sum | 7 +-- exporter/awsemfexporter/go.mod | 4 +- exporter/awsemfexporter/go.sum | 7 +-- exporter/awskinesisexporter/go.mod | 4 +- exporter/awskinesisexporter/go.sum | 7 +-- .../awsprometheusremotewriteexporter/go.mod | 6 +-- .../awsprometheusremotewriteexporter/go.sum | 7 +-- exporter/awsxrayexporter/go.mod | 4 +- exporter/awsxrayexporter/go.sum | 7 +-- exporter/azuremonitorexporter/go.mod | 4 +- exporter/azuremonitorexporter/go.sum | 7 +-- exporter/carbonexporter/go.mod | 4 +- exporter/carbonexporter/go.sum | 7 +-- exporter/datadogexporter/go.mod | 6 +-- exporter/datadogexporter/go.sum | 7 +-- exporter/dynatraceexporter/go.mod | 5 +- exporter/dynatraceexporter/go.sum | 7 +-- exporter/elasticexporter/go.mod | 4 +- exporter/elasticexporter/go.sum | 7 +-- exporter/elasticsearchexporter/go.mod | 4 +- exporter/elasticsearchexporter/go.sum | 7 +-- exporter/f5cloudexporter/go.mod | 4 +- exporter/f5cloudexporter/go.sum | 7 +-- exporter/fileexporter/go.mod | 4 +- exporter/fileexporter/go.sum | 7 +-- exporter/googlecloudexporter/go.mod | 4 +- exporter/googlecloudexporter/go.sum | 7 +-- exporter/googlecloudpubsubexporter/go.mod | 4 +- exporter/googlecloudpubsubexporter/go.sum | 7 +-- exporter/honeycombexporter/go.mod | 4 +- exporter/honeycombexporter/go.sum | 7 +-- exporter/humioexporter/go.mod | 4 +- exporter/humioexporter/go.sum | 7 +-- exporter/influxdbexporter/go.mod | 4 +- exporter/influxdbexporter/go.sum | 7 +-- exporter/jaegerexporter/go.mod | 7 +-- exporter/jaegerexporter/go.sum | 7 +-- exporter/kafkaexporter/go.mod | 4 +- exporter/kafkaexporter/go.sum | 7 +-- exporter/loadbalancingexporter/go.mod | 4 +- exporter/loadbalancingexporter/go.sum | 7 +-- exporter/logzioexporter/go.mod | 4 +- exporter/logzioexporter/go.sum | 7 +-- exporter/lokiexporter/go.mod | 4 +- exporter/lokiexporter/go.sum | 7 +-- exporter/newrelicexporter/go.mod | 4 +- exporter/newrelicexporter/go.sum | 7 +-- exporter/observiqexporter/go.mod | 4 +- exporter/observiqexporter/go.sum | 7 +-- exporter/opencensusexporter/go.mod | 4 +- exporter/opencensusexporter/go.sum | 7 +-- exporter/prometheusexporter/go.mod | 4 +- exporter/prometheusexporter/go.sum | 7 +-- exporter/prometheusremotewriteexporter/go.mod | 4 +- exporter/prometheusremotewriteexporter/go.sum | 7 +-- exporter/sapmexporter/go.mod | 4 +- exporter/sapmexporter/go.sum | 7 +-- exporter/sentryexporter/go.mod | 4 +- exporter/sentryexporter/go.sum | 7 +-- exporter/signalfxexporter/go.mod | 5 +- exporter/signalfxexporter/go.sum | 7 +-- exporter/skywalkingexporter/go.mod | 4 +- exporter/skywalkingexporter/go.sum | 7 +-- exporter/splunkhecexporter/go.mod | 4 +- exporter/splunkhecexporter/go.sum | 7 +-- exporter/stackdriverexporter/go.mod | 4 +- exporter/stackdriverexporter/go.sum | 7 +-- exporter/sumologicexporter/go.mod | 4 +- exporter/sumologicexporter/go.sum | 7 +-- exporter/tanzuobservabilityexporter/go.mod | 4 +- exporter/tanzuobservabilityexporter/go.sum | 7 +-- exporter/zipkinexporter/go.mod | 4 +- exporter/zipkinexporter/go.sum | 7 +-- extension/awsxrayproxy/go.mod | 4 +- extension/awsxrayproxy/go.sum | 7 +-- extension/bearertokenauthextension/go.mod | 4 +- extension/bearertokenauthextension/go.sum | 7 +-- extension/fluentbitextension/go.mod | 4 +- extension/fluentbitextension/go.sum | 7 +-- extension/healthcheckextension/go.mod | 4 +- extension/healthcheckextension/go.sum | 7 +-- extension/httpforwarder/go.mod | 4 +- extension/httpforwarder/go.sum | 7 +-- extension/oauth2clientauthextension/go.mod | 4 +- extension/oauth2clientauthextension/go.sum | 7 +-- extension/observer/dockerobserver/go.mod | 4 +- extension/observer/dockerobserver/go.sum | 7 +-- extension/observer/ecsobserver/go.mod | 4 +- extension/observer/ecsobserver/go.sum | 7 +-- extension/observer/hostobserver/go.mod | 4 +- extension/observer/hostobserver/go.sum | 7 +-- extension/observer/k8sobserver/go.mod | 4 +- extension/observer/k8sobserver/go.sum | 7 +-- extension/oidcauthextension/go.mod | 4 +- extension/oidcauthextension/go.sum | 7 +-- extension/pprofextension/go.mod | 4 +- extension/pprofextension/go.sum | 7 +-- extension/storage/go.mod | 4 +- extension/storage/go.sum | 7 +-- go.mod | 7 +-- go.sum | 7 +-- internal/aws/proxy/go.mod | 4 +- internal/aws/proxy/go.sum | 5 +- internal/coreinternal/go.mod | 4 +- internal/coreinternal/go.sum | 7 +-- internal/kubelet/go.mod | 2 +- internal/kubelet/go.sum | 4 +- internal/splunk/go.mod | 4 +- internal/splunk/go.sum | 7 +-- internal/stanza/go.mod | 4 +- internal/stanza/go.sum | 7 +-- pkg/batchperresourceattr/go.mod | 4 +- pkg/batchperresourceattr/go.sum | 7 +-- pkg/resourcetotelemetry/go.mod | 4 +- pkg/resourcetotelemetry/go.sum | 7 +-- pkg/translator/jaeger/go.mod | 2 +- pkg/translator/jaeger/go.sum | 7 +-- pkg/translator/opencensus/go.mod | 2 +- pkg/translator/opencensus/go.sum | 7 +-- pkg/translator/zipkin/go.mod | 2 +- pkg/translator/zipkin/go.sum | 7 +-- processor/attributesprocessor/go.mod | 4 +- processor/attributesprocessor/go.sum | 7 +-- processor/cumulativetodeltaprocessor/go.mod | 4 +- processor/cumulativetodeltaprocessor/go.sum | 7 +-- processor/deltatorateprocessor/go.mod | 4 +- processor/deltatorateprocessor/go.sum | 7 +-- processor/filterprocessor/go.mod | 4 +- processor/filterprocessor/go.sum | 7 +-- processor/groupbyattrsprocessor/go.mod | 4 +- processor/groupbyattrsprocessor/go.sum | 7 +-- processor/groupbytraceprocessor/go.mod | 4 +- processor/groupbytraceprocessor/go.sum | 7 +-- processor/k8sattributesprocessor/go.mod | 4 +- processor/k8sattributesprocessor/go.sum | 7 +-- processor/metricsgenerationprocessor/go.mod | 4 +- processor/metricsgenerationprocessor/go.sum | 7 +-- processor/metricstransformprocessor/go.mod | 4 +- processor/metricstransformprocessor/go.sum | 7 +-- .../probabilisticsamplerprocessor/go.mod | 4 +- .../probabilisticsamplerprocessor/go.sum | 7 +-- processor/resourcedetectionprocessor/go.mod | 4 +- processor/resourcedetectionprocessor/go.sum | 7 +-- processor/resourceprocessor/go.mod | 4 +- processor/resourceprocessor/go.sum | 7 +-- processor/routingprocessor/go.mod | 7 ++- processor/routingprocessor/go.sum | 7 +-- processor/spanmetricsprocessor/go.mod | 4 +- processor/spanmetricsprocessor/go.sum | 7 +-- processor/spanprocessor/go.mod | 4 +- processor/spanprocessor/go.sum | 7 +-- processor/tailsamplingprocessor/go.mod | 4 +- processor/tailsamplingprocessor/go.sum | 7 +-- receiver/awscontainerinsightreceiver/go.mod | 4 +- receiver/awscontainerinsightreceiver/go.sum | 7 +-- .../awsecscontainermetricsreceiver/go.mod | 4 +- .../awsecscontainermetricsreceiver/go.sum | 7 +-- receiver/awsxrayreceiver/go.mod | 4 +- receiver/awsxrayreceiver/go.sum | 7 +-- receiver/carbonreceiver/go.mod | 4 +- receiver/carbonreceiver/go.sum | 7 +-- receiver/cloudfoundryreceiver/go.mod | 4 +- receiver/cloudfoundryreceiver/go.sum | 7 +-- receiver/collectdreceiver/go.mod | 4 +- receiver/collectdreceiver/go.sum | 7 +-- receiver/dockerstatsreceiver/go.mod | 4 +- receiver/dockerstatsreceiver/go.sum | 7 +-- receiver/dotnetdiagnosticsreceiver/config.go | 2 +- receiver/dotnetdiagnosticsreceiver/factory.go | 2 +- receiver/dotnetdiagnosticsreceiver/go.mod | 10 ++-- receiver/dotnetdiagnosticsreceiver/go.sum | 7 +-- receiver/filelogreceiver/go.mod | 4 +- receiver/filelogreceiver/go.sum | 7 +-- receiver/fluentforwardreceiver/go.mod | 4 +- receiver/fluentforwardreceiver/go.sum | 7 +-- receiver/googlecloudpubsubreceiver/go.mod | 4 +- receiver/googlecloudpubsubreceiver/go.sum | 7 +-- receiver/googlecloudspannerreceiver/go.mod | 4 +- receiver/googlecloudspannerreceiver/go.sum | 7 +-- receiver/hostmetricsreceiver/config.go | 2 +- receiver/hostmetricsreceiver/config_test.go | 2 +- receiver/hostmetricsreceiver/factory.go | 2 +- receiver/hostmetricsreceiver/go.mod | 7 +-- receiver/hostmetricsreceiver/go.sum | 7 +-- .../hostmetrics_receiver_test.go | 6 +-- .../hostmetricsreceiver/internal/scraper.go | 3 +- .../internal/scraper/cpuscraper/config.go | 4 +- .../scraper/cpuscraper/cpu_scraper.go | 9 ++-- .../scraper/cpuscraper/cpu_scraper_test.go | 5 +- .../internal/scraper/cpuscraper/factory.go | 6 +-- .../diskscraper/disk_scraper_others.go | 9 ++-- .../scraper/diskscraper/disk_scraper_test.go | 5 +- .../diskscraper/disk_scraper_windows.go | 13 +++--- .../internal/scraper/diskscraper/factory.go | 6 +-- .../scraper/filesystemscraper/factory.go | 6 +-- .../filesystemscraper/filesystem_scraper.go | 9 ++-- .../filesystem_scraper_test.go | 7 +-- .../internal/scraper/loadscraper/factory.go | 6 +-- .../scraper/loadscraper/load_scraper.go | 9 ++-- .../scraper/loadscraper/load_scraper_test.go | 5 +- .../internal/scraper/memoryscraper/factory.go | 6 +-- .../scraper/memoryscraper/memory_scraper.go | 9 ++-- .../memoryscraper/memory_scraper_test.go | 5 +- .../scraper/networkscraper/factory.go | 6 +-- .../scraper/networkscraper/network_scraper.go | 8 ++-- .../networkscraper/network_scraper_test.go | 5 +- .../internal/scraper/pagingscraper/factory.go | 6 +-- .../pagingscraper/paging_scraper_others.go | 7 +-- .../pagingscraper/paging_scraper_test.go | 5 +- .../pagingscraper/paging_scraper_windows.go | 7 +-- .../paging_scraper_windows_test.go | 3 +- .../scraper/processesscraper/factory.go | 6 +-- .../processesscraper/processes_scraper.go | 9 ++-- .../processes_scraper_test.go | 5 +- .../scraper/processscraper/factory.go | 9 ++-- .../scraper/processscraper/process_scraper.go | 9 ++-- .../processscraper/process_scraper_test.go | 32 ++++++------- receiver/httpdreceiver/factory.go | 5 +- receiver/httpdreceiver/go.mod | 4 +- receiver/httpdreceiver/go.sum | 7 +-- receiver/httpdreceiver/scraper.go | 13 +++--- receiver/httpdreceiver/scraper_test.go | 5 +- receiver/influxdbreceiver/go.mod | 4 +- receiver/influxdbreceiver/go.sum | 7 +-- receiver/jaegerreceiver/go.mod | 4 +- receiver/jaegerreceiver/go.sum | 7 +-- receiver/jmxreceiver/go.mod | 4 +- receiver/jmxreceiver/go.sum | 7 +-- receiver/journaldreceiver/go.mod | 4 +- receiver/journaldreceiver/go.sum | 7 +-- receiver/k8sclusterreceiver/go.mod | 4 +- receiver/k8sclusterreceiver/go.sum | 7 +-- .../kafkametricsreceiver/broker_scraper.go | 16 +++---- .../broker_scraper_test.go | 31 ++++++------- receiver/kafkametricsreceiver/config.go | 3 +- receiver/kafkametricsreceiver/config_test.go | 2 +- .../kafkametricsreceiver/consumer_scraper.go | 23 +++++----- .../consumer_scraper_test.go | 46 +++++++++---------- receiver/kafkametricsreceiver/factory.go | 3 +- receiver/kafkametricsreceiver/go.mod | 7 +-- receiver/kafkametricsreceiver/go.sum | 7 +-- receiver/kafkametricsreceiver/receiver.go | 2 +- .../kafkametricsreceiver/receiver_test.go | 2 +- .../kafkametricsreceiver/topic_scraper.go | 19 ++++---- .../topic_scraper_test.go | 8 ++-- receiver/kafkareceiver/go.mod | 4 +- receiver/kafkareceiver/go.sum | 7 +-- receiver/kubeletstatsreceiver/go.mod | 4 +- receiver/kubeletstatsreceiver/go.sum | 7 +-- receiver/memcachedreceiver/config.go | 3 +- receiver/memcachedreceiver/factory.go | 8 ++-- receiver/memcachedreceiver/factory_test.go | 3 +- receiver/memcachedreceiver/go.mod | 9 ++-- receiver/memcachedreceiver/go.sum | 7 +-- receiver/memcachedreceiver/scraper.go | 18 ++++---- receiver/mongodbatlasreceiver/go.mod | 4 +- receiver/mongodbatlasreceiver/go.sum | 7 +-- receiver/mysqlreceiver/factory.go | 6 ++- receiver/mysqlreceiver/go.mod | 4 +- receiver/mysqlreceiver/go.sum | 7 +-- receiver/mysqlreceiver/scraper.go | 12 ++--- receiver/mysqlreceiver/scraper_test.go | 5 +- receiver/nginxreceiver/config.go | 3 +- receiver/nginxreceiver/factory.go | 8 ++-- receiver/nginxreceiver/factory_test.go | 3 +- receiver/nginxreceiver/go.mod | 9 ++-- receiver/nginxreceiver/go.sum | 7 +-- receiver/nginxreceiver/integration_test.go | 8 ++-- receiver/nginxreceiver/scraper.go | 12 ++--- receiver/nginxreceiver/scraper_test.go | 6 +-- receiver/opencensusreceiver/go.mod | 4 +- receiver/opencensusreceiver/go.sum | 7 +-- receiver/podmanreceiver/config.go | 3 +- receiver/podmanreceiver/factory.go | 3 +- receiver/podmanreceiver/go.mod | 14 +++--- receiver/podmanreceiver/go.sum | 7 +-- receiver/podmanreceiver/receiver_test.go | 3 +- receiver/prometheusexecreceiver/go.mod | 4 +- receiver/prometheusexecreceiver/go.sum | 7 +-- receiver/prometheusreceiver/go.mod | 4 +- receiver/prometheusreceiver/go.sum | 7 +-- receiver/receivercreator/go.mod | 4 +- receiver/receivercreator/go.sum | 7 +-- receiver/redisreceiver/go.mod | 4 +- receiver/redisreceiver/go.sum | 7 +-- receiver/sapmreceiver/go.mod | 4 +- receiver/sapmreceiver/go.sum | 7 +-- receiver/scraperhelper/go.mod | 4 +- receiver/scraperhelper/go.sum | 7 +-- receiver/signalfxreceiver/go.mod | 5 +- receiver/signalfxreceiver/go.sum | 7 +-- receiver/simpleprometheusreceiver/go.mod | 4 +- receiver/simpleprometheusreceiver/go.sum | 7 +-- receiver/splunkhecreceiver/go.mod | 4 +- receiver/splunkhecreceiver/go.sum | 7 +-- receiver/statsdreceiver/go.mod | 4 +- receiver/statsdreceiver/go.sum | 7 +-- receiver/syslogreceiver/go.mod | 4 +- receiver/syslogreceiver/go.sum | 7 +-- receiver/tcplogreceiver/go.mod | 4 +- receiver/tcplogreceiver/go.sum | 7 +-- receiver/udplogreceiver/go.mod | 4 +- receiver/udplogreceiver/go.sum | 7 +-- receiver/wavefrontreceiver/go.mod | 4 +- receiver/wavefrontreceiver/go.sum | 7 +-- .../windowsperfcountersreceiver/config.go | 3 +- .../config_test.go | 3 +- .../windowsperfcountersreceiver/factory.go | 3 +- .../factory_windows.go | 22 +++++---- receiver/windowsperfcountersreceiver/go.mod | 10 ++-- receiver/windowsperfcountersreceiver/go.sum | 7 +-- .../windowsperfcounters_scraper.go | 8 ++-- .../windowsperfcounters_scraper_test.go | 6 +-- receiver/zipkinreceiver/go.mod | 4 +- receiver/zipkinreceiver/go.sum | 7 +-- receiver/zookeeperreceiver/config.go | 3 +- receiver/zookeeperreceiver/factory.go | 20 ++++---- receiver/zookeeperreceiver/go.mod | 7 +-- receiver/zookeeperreceiver/go.sum | 7 +-- receiver/zookeeperreceiver/scraper.go | 10 ++-- receiver/zookeeperreceiver/scraper_test.go | 8 ++-- testbed/go.mod | 4 +- testbed/go.sum | 7 +-- .../mockawsxrayreceiver/go.mod | 4 +- .../mockawsxrayreceiver/go.sum | 7 +-- 330 files changed, 1071 insertions(+), 986 deletions(-) diff --git a/cmd/configschema/go.mod b/cmd/configschema/go.mod index 527decb740fb..164677ae5ac5 100644 --- a/cmd/configschema/go.mod +++ b/cmd/configschema/go.mod @@ -8,8 +8,8 @@ require ( github.com/open-telemetry/opentelemetry-collector-contrib v0.37.1 github.com/open-telemetry/opentelemetry-collector-contrib/pkg/resourcetotelemetry v0.37.1 github.com/stretchr/testify v1.7.0 - go.opentelemetry.io/collector v0.37.0 - go.opentelemetry.io/collector/model v0.37.0 + go.opentelemetry.io/collector v0.37.1-0.20211015233822-bd87fb628058 + go.opentelemetry.io/collector/model v0.37.1-0.20211015233822-bd87fb628058 golang.org/x/mod v0.4.2 ) @@ -261,7 +261,6 @@ require ( github.com/open-telemetry/opentelemetry-collector-contrib/receiver/receivercreator v0.37.1 // indirect github.com/open-telemetry/opentelemetry-collector-contrib/receiver/redisreceiver v0.37.1 // indirect github.com/open-telemetry/opentelemetry-collector-contrib/receiver/sapmreceiver v0.37.1 // indirect - github.com/open-telemetry/opentelemetry-collector-contrib/receiver/scraperhelper v0.37.1 // indirect github.com/open-telemetry/opentelemetry-collector-contrib/receiver/signalfxreceiver v0.37.1 // indirect github.com/open-telemetry/opentelemetry-collector-contrib/receiver/simpleprometheusreceiver v0.37.1 // indirect github.com/open-telemetry/opentelemetry-collector-contrib/receiver/splunkhecreceiver v0.37.1 // indirect @@ -565,8 +564,6 @@ replace github.com/open-telemetry/opentelemetry-collector-contrib/receiver/kafka replace github.com/open-telemetry/opentelemetry-collector-contrib/receiver/hostmetricsreceiver => ../../receiver/hostmetricsreceiver -replace github.com/open-telemetry/opentelemetry-collector-contrib/receiver/scraperhelper => ../../receiver/scraperhelper - replace github.com/open-telemetry/opentelemetry-collector-contrib/receiver/syslogreceiver => ../../receiver/syslogreceiver replace github.com/open-telemetry/opentelemetry-collector-contrib/receiver/tcplogreceiver => ../../receiver/tcplogreceiver diff --git a/cmd/configschema/go.sum b/cmd/configschema/go.sum index dedd9c946134..e2f2a6412e63 100644 --- a/cmd/configschema/go.sum +++ b/cmd/configschema/go.sum @@ -2053,16 +2053,16 @@ go.opencensus.io v0.22.6/go.mod h1:XItmlyltB5F7CS4xOC1DcqMoFqwtC6OG2xF7mCv7P7E= go.opencensus.io v0.23.0 h1:gqCw0LfLxScz8irSi8exQc7fyQ0fKQU/qnC/X8+V/1M= go.opencensus.io v0.23.0/go.mod h1:XItmlyltB5F7CS4xOC1DcqMoFqwtC6OG2xF7mCv7P7E= go.opentelemetry.io/collector v0.35.0/go.mod h1:mMW4VJHhy8CwoTenV75axteKd0aZhWHDZjcZ59V53kc= -go.opentelemetry.io/collector v0.37.0 h1:X83+uWk11kW83BTkdKNt1Sk7gXyRv36wA6piT0FYfME= -go.opentelemetry.io/collector v0.37.0/go.mod h1:zbLWBJVy7bmiZHlHjCrV28vxXA/sAkCLtH5thD8ZahA= +go.opentelemetry.io/collector v0.37.1-0.20211015233822-bd87fb628058 h1:6v0ba4ruY/W2cJLElDZEHDwShlSWUjK2MiBMvwfAIN0= +go.opentelemetry.io/collector v0.37.1-0.20211015233822-bd87fb628058/go.mod h1:zbLWBJVy7bmiZHlHjCrV28vxXA/sAkCLtH5thD8ZahA= go.opentelemetry.io/collector/model v0.30.2-0.20210719230137-809cae954ed3/go.mod h1:PcHNnM+RUl0uD8VkSn93PO78N7kQYhfqpI/eki57pl4= go.opentelemetry.io/collector/model v0.35.0/go.mod h1:+7YCSjJG+MqiIFjauzt7oM2qkqBsaJWh5hcsO4fwsAc= go.opentelemetry.io/collector/model v0.36.0/go.mod h1:+7YCSjJG+MqiIFjauzt7oM2qkqBsaJWh5hcsO4fwsAc= go.opentelemetry.io/collector/model v0.36.1-0.20210927193005-ebb0fbd6f23e/go.mod h1:ESh1oWDNdS4fTg9sTFoYuiuvs8QuaX8yNGTPix3JZc8= -go.opentelemetry.io/collector/model v0.37.0 h1:K1G6bgzBZ5kKSjZ1+EY9MhCOYsac4Q1K85fBUgpTVH8= go.opentelemetry.io/collector/model v0.37.0/go.mod h1:ESh1oWDNdS4fTg9sTFoYuiuvs8QuaX8yNGTPix3JZc8= +go.opentelemetry.io/collector/model v0.37.1-0.20211015233822-bd87fb628058 h1:jDw0pFIkDbvNRkkdCz1+gsBXIKbtY3GtRMPqzBeOfs4= +go.opentelemetry.io/collector/model v0.37.1-0.20211015233822-bd87fb628058/go.mod h1:ESh1oWDNdS4fTg9sTFoYuiuvs8QuaX8yNGTPix3JZc8= go.opentelemetry.io/contrib v0.20.0/go.mod h1:G/EtFaa6qaN7+LxqfIAT3GiZa7Wv5DTBUzl5H4LY0Kc= -go.opentelemetry.io/contrib v0.21.0 h1:RMJ6GlUVzLYp/zmItxTTdAmr1gnpO/HHMFmvjAhvJQM= go.opentelemetry.io/contrib v0.21.0/go.mod h1:EH4yDYeNoaTqn/8yCWQmfNB78VHfGX2Jt2bvnvzBlGM= go.opentelemetry.io/contrib v0.22.0 h1:0F7gDEjgb1WGn4ODIjaCAg75hmqF+UN0LiVgwxsCodc= go.opentelemetry.io/contrib v0.22.0/go.mod h1:EH4yDYeNoaTqn/8yCWQmfNB78VHfGX2Jt2bvnvzBlGM= diff --git a/exporter/alibabacloudlogserviceexporter/go.mod b/exporter/alibabacloudlogserviceexporter/go.mod index 3d155a5ac578..7804c40e1730 100644 --- a/exporter/alibabacloudlogserviceexporter/go.mod +++ b/exporter/alibabacloudlogserviceexporter/go.mod @@ -7,8 +7,8 @@ require ( github.com/gogo/protobuf v1.3.2 github.com/open-telemetry/opentelemetry-collector-contrib/internal/coreinternal v0.37.1 github.com/stretchr/testify v1.7.0 - go.opentelemetry.io/collector v0.37.0 - go.opentelemetry.io/collector/model v0.37.0 + go.opentelemetry.io/collector v0.37.1-0.20211015233822-bd87fb628058 + go.opentelemetry.io/collector/model v0.37.1-0.20211015233822-bd87fb628058 go.uber.org/zap v1.19.1 ) diff --git a/exporter/alibabacloudlogserviceexporter/go.sum b/exporter/alibabacloudlogserviceexporter/go.sum index c66259d5c8b5..8a4af1d180ea 100644 --- a/exporter/alibabacloudlogserviceexporter/go.sum +++ b/exporter/alibabacloudlogserviceexporter/go.sum @@ -517,10 +517,11 @@ go.opencensus.io v0.22.4/go.mod h1:yxeiOL68Rb0Xd1ddK5vPZ/oVn4vY4Ynel7k9FzqtOIw= go.opencensus.io v0.22.5/go.mod h1:5pWMHQbX5EPX2/62yrJeAkowc+lfs/XD7Uxpq3pI6kk= go.opencensus.io v0.23.0 h1:gqCw0LfLxScz8irSi8exQc7fyQ0fKQU/qnC/X8+V/1M= go.opencensus.io v0.23.0/go.mod h1:XItmlyltB5F7CS4xOC1DcqMoFqwtC6OG2xF7mCv7P7E= -go.opentelemetry.io/collector v0.37.0 h1:X83+uWk11kW83BTkdKNt1Sk7gXyRv36wA6piT0FYfME= -go.opentelemetry.io/collector v0.37.0/go.mod h1:zbLWBJVy7bmiZHlHjCrV28vxXA/sAkCLtH5thD8ZahA= -go.opentelemetry.io/collector/model v0.37.0 h1:K1G6bgzBZ5kKSjZ1+EY9MhCOYsac4Q1K85fBUgpTVH8= +go.opentelemetry.io/collector v0.37.1-0.20211015233822-bd87fb628058 h1:6v0ba4ruY/W2cJLElDZEHDwShlSWUjK2MiBMvwfAIN0= +go.opentelemetry.io/collector v0.37.1-0.20211015233822-bd87fb628058/go.mod h1:zbLWBJVy7bmiZHlHjCrV28vxXA/sAkCLtH5thD8ZahA= go.opentelemetry.io/collector/model v0.37.0/go.mod h1:ESh1oWDNdS4fTg9sTFoYuiuvs8QuaX8yNGTPix3JZc8= +go.opentelemetry.io/collector/model v0.37.1-0.20211015233822-bd87fb628058 h1:jDw0pFIkDbvNRkkdCz1+gsBXIKbtY3GtRMPqzBeOfs4= +go.opentelemetry.io/collector/model v0.37.1-0.20211015233822-bd87fb628058/go.mod h1:ESh1oWDNdS4fTg9sTFoYuiuvs8QuaX8yNGTPix3JZc8= go.opentelemetry.io/contrib/instrumentation/google.golang.org/grpc/otelgrpc v0.25.0/go.mod h1:E5NNboN0UqSAki0Atn9kVwaN7I+l25gGxDqBueo/74E= go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.25.0/go.mod h1:NyB05cd+yPX6W5SiRNuJ90w7PV2+g2cgRbsPL7MvpME= go.opentelemetry.io/contrib/zpages v0.25.0/go.mod h1:cXBK0CNcIBD9Iiw1Hv3DvS+E8N2rtr+k+OoPs+sP0T4= diff --git a/exporter/awscloudwatchlogsexporter/go.mod b/exporter/awscloudwatchlogsexporter/go.mod index 47f4cf7b4ae9..460b9901acfd 100644 --- a/exporter/awscloudwatchlogsexporter/go.mod +++ b/exporter/awscloudwatchlogsexporter/go.mod @@ -5,8 +5,8 @@ go 1.17 require ( github.com/aws/aws-sdk-go v1.41.1 github.com/stretchr/testify v1.7.0 - go.opentelemetry.io/collector v0.37.0 - go.opentelemetry.io/collector/model v0.37.0 + go.opentelemetry.io/collector v0.37.1-0.20211015233822-bd87fb628058 + go.opentelemetry.io/collector/model v0.37.1-0.20211015233822-bd87fb628058 go.uber.org/zap v1.19.1 ) diff --git a/exporter/awscloudwatchlogsexporter/go.sum b/exporter/awscloudwatchlogsexporter/go.sum index 852ec234519d..feb0a91d08ea 100644 --- a/exporter/awscloudwatchlogsexporter/go.sum +++ b/exporter/awscloudwatchlogsexporter/go.sum @@ -380,10 +380,11 @@ go.opencensus.io v0.22.4/go.mod h1:yxeiOL68Rb0Xd1ddK5vPZ/oVn4vY4Ynel7k9FzqtOIw= go.opencensus.io v0.22.5/go.mod h1:5pWMHQbX5EPX2/62yrJeAkowc+lfs/XD7Uxpq3pI6kk= go.opencensus.io v0.23.0 h1:gqCw0LfLxScz8irSi8exQc7fyQ0fKQU/qnC/X8+V/1M= go.opencensus.io v0.23.0/go.mod h1:XItmlyltB5F7CS4xOC1DcqMoFqwtC6OG2xF7mCv7P7E= -go.opentelemetry.io/collector v0.37.0 h1:X83+uWk11kW83BTkdKNt1Sk7gXyRv36wA6piT0FYfME= -go.opentelemetry.io/collector v0.37.0/go.mod h1:zbLWBJVy7bmiZHlHjCrV28vxXA/sAkCLtH5thD8ZahA= -go.opentelemetry.io/collector/model v0.37.0 h1:K1G6bgzBZ5kKSjZ1+EY9MhCOYsac4Q1K85fBUgpTVH8= +go.opentelemetry.io/collector v0.37.1-0.20211015233822-bd87fb628058 h1:6v0ba4ruY/W2cJLElDZEHDwShlSWUjK2MiBMvwfAIN0= +go.opentelemetry.io/collector v0.37.1-0.20211015233822-bd87fb628058/go.mod h1:zbLWBJVy7bmiZHlHjCrV28vxXA/sAkCLtH5thD8ZahA= go.opentelemetry.io/collector/model v0.37.0/go.mod h1:ESh1oWDNdS4fTg9sTFoYuiuvs8QuaX8yNGTPix3JZc8= +go.opentelemetry.io/collector/model v0.37.1-0.20211015233822-bd87fb628058 h1:jDw0pFIkDbvNRkkdCz1+gsBXIKbtY3GtRMPqzBeOfs4= +go.opentelemetry.io/collector/model v0.37.1-0.20211015233822-bd87fb628058/go.mod h1:ESh1oWDNdS4fTg9sTFoYuiuvs8QuaX8yNGTPix3JZc8= go.opentelemetry.io/contrib/instrumentation/google.golang.org/grpc/otelgrpc v0.25.0/go.mod h1:E5NNboN0UqSAki0Atn9kVwaN7I+l25gGxDqBueo/74E= go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.25.0/go.mod h1:NyB05cd+yPX6W5SiRNuJ90w7PV2+g2cgRbsPL7MvpME= go.opentelemetry.io/contrib/zpages v0.25.0/go.mod h1:cXBK0CNcIBD9Iiw1Hv3DvS+E8N2rtr+k+OoPs+sP0T4= diff --git a/exporter/awsemfexporter/go.mod b/exporter/awsemfexporter/go.mod index 393b1587ed5a..990192702698 100644 --- a/exporter/awsemfexporter/go.mod +++ b/exporter/awsemfexporter/go.mod @@ -12,8 +12,8 @@ require ( github.com/open-telemetry/opentelemetry-collector-contrib/pkg/resourcetotelemetry v0.37.1 github.com/open-telemetry/opentelemetry-collector-contrib/pkg/translator/opencensus v0.37.1 github.com/stretchr/testify v1.7.0 - go.opentelemetry.io/collector v0.37.0 - go.opentelemetry.io/collector/model v0.37.0 + go.opentelemetry.io/collector v0.37.1-0.20211015233822-bd87fb628058 + go.opentelemetry.io/collector/model v0.37.1-0.20211015233822-bd87fb628058 go.uber.org/zap v1.19.1 google.golang.org/protobuf v1.27.1 ) diff --git a/exporter/awsemfexporter/go.sum b/exporter/awsemfexporter/go.sum index 4fda891c5bea..5a6a9c28c567 100644 --- a/exporter/awsemfexporter/go.sum +++ b/exporter/awsemfexporter/go.sum @@ -399,10 +399,11 @@ go.opencensus.io v0.22.4/go.mod h1:yxeiOL68Rb0Xd1ddK5vPZ/oVn4vY4Ynel7k9FzqtOIw= go.opencensus.io v0.22.5/go.mod h1:5pWMHQbX5EPX2/62yrJeAkowc+lfs/XD7Uxpq3pI6kk= go.opencensus.io v0.23.0 h1:gqCw0LfLxScz8irSi8exQc7fyQ0fKQU/qnC/X8+V/1M= go.opencensus.io v0.23.0/go.mod h1:XItmlyltB5F7CS4xOC1DcqMoFqwtC6OG2xF7mCv7P7E= -go.opentelemetry.io/collector v0.37.0 h1:X83+uWk11kW83BTkdKNt1Sk7gXyRv36wA6piT0FYfME= -go.opentelemetry.io/collector v0.37.0/go.mod h1:zbLWBJVy7bmiZHlHjCrV28vxXA/sAkCLtH5thD8ZahA= -go.opentelemetry.io/collector/model v0.37.0 h1:K1G6bgzBZ5kKSjZ1+EY9MhCOYsac4Q1K85fBUgpTVH8= +go.opentelemetry.io/collector v0.37.1-0.20211015233822-bd87fb628058 h1:6v0ba4ruY/W2cJLElDZEHDwShlSWUjK2MiBMvwfAIN0= +go.opentelemetry.io/collector v0.37.1-0.20211015233822-bd87fb628058/go.mod h1:zbLWBJVy7bmiZHlHjCrV28vxXA/sAkCLtH5thD8ZahA= go.opentelemetry.io/collector/model v0.37.0/go.mod h1:ESh1oWDNdS4fTg9sTFoYuiuvs8QuaX8yNGTPix3JZc8= +go.opentelemetry.io/collector/model v0.37.1-0.20211015233822-bd87fb628058 h1:jDw0pFIkDbvNRkkdCz1+gsBXIKbtY3GtRMPqzBeOfs4= +go.opentelemetry.io/collector/model v0.37.1-0.20211015233822-bd87fb628058/go.mod h1:ESh1oWDNdS4fTg9sTFoYuiuvs8QuaX8yNGTPix3JZc8= go.opentelemetry.io/contrib/instrumentation/google.golang.org/grpc/otelgrpc v0.25.0/go.mod h1:E5NNboN0UqSAki0Atn9kVwaN7I+l25gGxDqBueo/74E= go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.25.0/go.mod h1:NyB05cd+yPX6W5SiRNuJ90w7PV2+g2cgRbsPL7MvpME= go.opentelemetry.io/contrib/zpages v0.25.0/go.mod h1:cXBK0CNcIBD9Iiw1Hv3DvS+E8N2rtr+k+OoPs+sP0T4= diff --git a/exporter/awskinesisexporter/go.mod b/exporter/awskinesisexporter/go.mod index 3618a36e4025..64a5e8bb0dc7 100644 --- a/exporter/awskinesisexporter/go.mod +++ b/exporter/awskinesisexporter/go.mod @@ -7,8 +7,8 @@ require ( github.com/open-telemetry/opentelemetry-collector-contrib/pkg/translator/jaeger v0.37.1 github.com/open-telemetry/opentelemetry-collector-contrib/pkg/translator/zipkin v0.37.1 github.com/stretchr/testify v1.7.0 - go.opentelemetry.io/collector v0.37.0 - go.opentelemetry.io/collector/model v0.37.0 + go.opentelemetry.io/collector v0.37.1-0.20211015233822-bd87fb628058 + go.opentelemetry.io/collector/model v0.37.1-0.20211015233822-bd87fb628058 go.uber.org/zap v1.19.1 ) diff --git a/exporter/awskinesisexporter/go.sum b/exporter/awskinesisexporter/go.sum index 2f1f7b2d5f74..e371ca4a5a11 100644 --- a/exporter/awskinesisexporter/go.sum +++ b/exporter/awskinesisexporter/go.sum @@ -757,11 +757,12 @@ go.opencensus.io v0.22.4/go.mod h1:yxeiOL68Rb0Xd1ddK5vPZ/oVn4vY4Ynel7k9FzqtOIw= go.opencensus.io v0.22.5/go.mod h1:5pWMHQbX5EPX2/62yrJeAkowc+lfs/XD7Uxpq3pI6kk= go.opencensus.io v0.23.0 h1:gqCw0LfLxScz8irSi8exQc7fyQ0fKQU/qnC/X8+V/1M= go.opencensus.io v0.23.0/go.mod h1:XItmlyltB5F7CS4xOC1DcqMoFqwtC6OG2xF7mCv7P7E= -go.opentelemetry.io/collector v0.37.0 h1:X83+uWk11kW83BTkdKNt1Sk7gXyRv36wA6piT0FYfME= -go.opentelemetry.io/collector v0.37.0/go.mod h1:zbLWBJVy7bmiZHlHjCrV28vxXA/sAkCLtH5thD8ZahA= +go.opentelemetry.io/collector v0.37.1-0.20211015233822-bd87fb628058 h1:6v0ba4ruY/W2cJLElDZEHDwShlSWUjK2MiBMvwfAIN0= +go.opentelemetry.io/collector v0.37.1-0.20211015233822-bd87fb628058/go.mod h1:zbLWBJVy7bmiZHlHjCrV28vxXA/sAkCLtH5thD8ZahA= go.opentelemetry.io/collector/model v0.36.0/go.mod h1:+7YCSjJG+MqiIFjauzt7oM2qkqBsaJWh5hcsO4fwsAc= -go.opentelemetry.io/collector/model v0.37.0 h1:K1G6bgzBZ5kKSjZ1+EY9MhCOYsac4Q1K85fBUgpTVH8= go.opentelemetry.io/collector/model v0.37.0/go.mod h1:ESh1oWDNdS4fTg9sTFoYuiuvs8QuaX8yNGTPix3JZc8= +go.opentelemetry.io/collector/model v0.37.1-0.20211015233822-bd87fb628058 h1:jDw0pFIkDbvNRkkdCz1+gsBXIKbtY3GtRMPqzBeOfs4= +go.opentelemetry.io/collector/model v0.37.1-0.20211015233822-bd87fb628058/go.mod h1:ESh1oWDNdS4fTg9sTFoYuiuvs8QuaX8yNGTPix3JZc8= go.opentelemetry.io/contrib/instrumentation/google.golang.org/grpc/otelgrpc v0.25.0/go.mod h1:E5NNboN0UqSAki0Atn9kVwaN7I+l25gGxDqBueo/74E= go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.25.0/go.mod h1:NyB05cd+yPX6W5SiRNuJ90w7PV2+g2cgRbsPL7MvpME= go.opentelemetry.io/contrib/zpages v0.25.0/go.mod h1:cXBK0CNcIBD9Iiw1Hv3DvS+E8N2rtr+k+OoPs+sP0T4= diff --git a/exporter/awsprometheusremotewriteexporter/go.mod b/exporter/awsprometheusremotewriteexporter/go.mod index 81773360dbce..1c5b2026c9b9 100644 --- a/exporter/awsprometheusremotewriteexporter/go.mod +++ b/exporter/awsprometheusremotewriteexporter/go.mod @@ -6,7 +6,7 @@ require ( github.com/aws/aws-sdk-go v1.41.1 github.com/open-telemetry/opentelemetry-collector-contrib/exporter/prometheusremotewriteexporter v0.37.1 github.com/stretchr/testify v1.7.0 - go.opentelemetry.io/collector v0.37.0 + go.opentelemetry.io/collector v0.37.1-0.20211015233822-bd87fb628058 ) require ( @@ -24,11 +24,9 @@ require ( github.com/mitchellh/mapstructure v1.4.2 // indirect github.com/mitchellh/reflectwalk v1.0.2 // indirect github.com/open-telemetry/opentelemetry-collector-contrib/pkg/resourcetotelemetry v0.37.1 // indirect - github.com/pelletier/go-toml v1.9.3 // indirect github.com/pmezard/go-difflib v1.0.0 // indirect github.com/prometheus/common v0.31.1 // indirect github.com/prometheus/prometheus v1.8.2-0.20210621150501-ff58416a0b02 // indirect - github.com/rogpeppe/go-internal v1.6.1 // indirect github.com/rs/cors v1.8.0 // indirect github.com/spf13/cast v1.4.1 // indirect github.com/tidwall/gjson v1.8.1 // indirect @@ -37,7 +35,7 @@ require ( github.com/tidwall/tinylru v1.0.2 // indirect github.com/tidwall/wal v0.1.5 // indirect go.opencensus.io v0.23.0 // indirect - go.opentelemetry.io/collector/model v0.37.0 // indirect + go.opentelemetry.io/collector/model v0.37.1-0.20211015233822-bd87fb628058 // indirect go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.25.0 // indirect go.opentelemetry.io/otel v1.0.1 // indirect go.opentelemetry.io/otel/internal/metric v0.24.0 // indirect diff --git a/exporter/awsprometheusremotewriteexporter/go.sum b/exporter/awsprometheusremotewriteexporter/go.sum index 8d936345a470..af5231d5f85d 100644 --- a/exporter/awsprometheusremotewriteexporter/go.sum +++ b/exporter/awsprometheusremotewriteexporter/go.sum @@ -984,10 +984,11 @@ go.opencensus.io v0.22.4/go.mod h1:yxeiOL68Rb0Xd1ddK5vPZ/oVn4vY4Ynel7k9FzqtOIw= go.opencensus.io v0.22.5/go.mod h1:5pWMHQbX5EPX2/62yrJeAkowc+lfs/XD7Uxpq3pI6kk= go.opencensus.io v0.23.0 h1:gqCw0LfLxScz8irSi8exQc7fyQ0fKQU/qnC/X8+V/1M= go.opencensus.io v0.23.0/go.mod h1:XItmlyltB5F7CS4xOC1DcqMoFqwtC6OG2xF7mCv7P7E= -go.opentelemetry.io/collector v0.37.0 h1:X83+uWk11kW83BTkdKNt1Sk7gXyRv36wA6piT0FYfME= -go.opentelemetry.io/collector v0.37.0/go.mod h1:zbLWBJVy7bmiZHlHjCrV28vxXA/sAkCLtH5thD8ZahA= -go.opentelemetry.io/collector/model v0.37.0 h1:K1G6bgzBZ5kKSjZ1+EY9MhCOYsac4Q1K85fBUgpTVH8= +go.opentelemetry.io/collector v0.37.1-0.20211015233822-bd87fb628058 h1:6v0ba4ruY/W2cJLElDZEHDwShlSWUjK2MiBMvwfAIN0= +go.opentelemetry.io/collector v0.37.1-0.20211015233822-bd87fb628058/go.mod h1:zbLWBJVy7bmiZHlHjCrV28vxXA/sAkCLtH5thD8ZahA= go.opentelemetry.io/collector/model v0.37.0/go.mod h1:ESh1oWDNdS4fTg9sTFoYuiuvs8QuaX8yNGTPix3JZc8= +go.opentelemetry.io/collector/model v0.37.1-0.20211015233822-bd87fb628058 h1:jDw0pFIkDbvNRkkdCz1+gsBXIKbtY3GtRMPqzBeOfs4= +go.opentelemetry.io/collector/model v0.37.1-0.20211015233822-bd87fb628058/go.mod h1:ESh1oWDNdS4fTg9sTFoYuiuvs8QuaX8yNGTPix3JZc8= go.opentelemetry.io/contrib/instrumentation/google.golang.org/grpc/otelgrpc v0.25.0/go.mod h1:E5NNboN0UqSAki0Atn9kVwaN7I+l25gGxDqBueo/74E= go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.25.0 h1:FIbb8m2PtTWjvXLHOEnXAoSmkaiXbg3fuvoZAjsAT3Q= go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.25.0/go.mod h1:NyB05cd+yPX6W5SiRNuJ90w7PV2+g2cgRbsPL7MvpME= diff --git a/exporter/awsxrayexporter/go.mod b/exporter/awsxrayexporter/go.mod index 8a4ee13231fa..0f926d3d64ce 100644 --- a/exporter/awsxrayexporter/go.mod +++ b/exporter/awsxrayexporter/go.mod @@ -7,8 +7,8 @@ require ( github.com/open-telemetry/opentelemetry-collector-contrib/internal/aws/awsutil v0.37.1 github.com/open-telemetry/opentelemetry-collector-contrib/internal/aws/xray v0.37.1 github.com/stretchr/testify v1.7.0 - go.opentelemetry.io/collector v0.37.0 - go.opentelemetry.io/collector/model v0.37.0 + go.opentelemetry.io/collector v0.37.1-0.20211015233822-bd87fb628058 + go.opentelemetry.io/collector/model v0.37.1-0.20211015233822-bd87fb628058 go.uber.org/zap v1.19.1 ) diff --git a/exporter/awsxrayexporter/go.sum b/exporter/awsxrayexporter/go.sum index 4c05e09f6e30..10ea0a20a48c 100644 --- a/exporter/awsxrayexporter/go.sum +++ b/exporter/awsxrayexporter/go.sum @@ -382,10 +382,11 @@ go.opencensus.io v0.22.4/go.mod h1:yxeiOL68Rb0Xd1ddK5vPZ/oVn4vY4Ynel7k9FzqtOIw= go.opencensus.io v0.22.5/go.mod h1:5pWMHQbX5EPX2/62yrJeAkowc+lfs/XD7Uxpq3pI6kk= go.opencensus.io v0.23.0 h1:gqCw0LfLxScz8irSi8exQc7fyQ0fKQU/qnC/X8+V/1M= go.opencensus.io v0.23.0/go.mod h1:XItmlyltB5F7CS4xOC1DcqMoFqwtC6OG2xF7mCv7P7E= -go.opentelemetry.io/collector v0.37.0 h1:X83+uWk11kW83BTkdKNt1Sk7gXyRv36wA6piT0FYfME= -go.opentelemetry.io/collector v0.37.0/go.mod h1:zbLWBJVy7bmiZHlHjCrV28vxXA/sAkCLtH5thD8ZahA= -go.opentelemetry.io/collector/model v0.37.0 h1:K1G6bgzBZ5kKSjZ1+EY9MhCOYsac4Q1K85fBUgpTVH8= +go.opentelemetry.io/collector v0.37.1-0.20211015233822-bd87fb628058 h1:6v0ba4ruY/W2cJLElDZEHDwShlSWUjK2MiBMvwfAIN0= +go.opentelemetry.io/collector v0.37.1-0.20211015233822-bd87fb628058/go.mod h1:zbLWBJVy7bmiZHlHjCrV28vxXA/sAkCLtH5thD8ZahA= go.opentelemetry.io/collector/model v0.37.0/go.mod h1:ESh1oWDNdS4fTg9sTFoYuiuvs8QuaX8yNGTPix3JZc8= +go.opentelemetry.io/collector/model v0.37.1-0.20211015233822-bd87fb628058 h1:jDw0pFIkDbvNRkkdCz1+gsBXIKbtY3GtRMPqzBeOfs4= +go.opentelemetry.io/collector/model v0.37.1-0.20211015233822-bd87fb628058/go.mod h1:ESh1oWDNdS4fTg9sTFoYuiuvs8QuaX8yNGTPix3JZc8= go.opentelemetry.io/contrib/instrumentation/google.golang.org/grpc/otelgrpc v0.25.0/go.mod h1:E5NNboN0UqSAki0Atn9kVwaN7I+l25gGxDqBueo/74E= go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.25.0/go.mod h1:NyB05cd+yPX6W5SiRNuJ90w7PV2+g2cgRbsPL7MvpME= go.opentelemetry.io/contrib/zpages v0.25.0/go.mod h1:cXBK0CNcIBD9Iiw1Hv3DvS+E8N2rtr+k+OoPs+sP0T4= diff --git a/exporter/azuremonitorexporter/go.mod b/exporter/azuremonitorexporter/go.mod index 45ea6a557b9d..171cc7a78bca 100644 --- a/exporter/azuremonitorexporter/go.mod +++ b/exporter/azuremonitorexporter/go.mod @@ -5,8 +5,8 @@ go 1.17 require ( github.com/microsoft/ApplicationInsights-Go v0.4.4 github.com/stretchr/testify v1.7.0 - go.opentelemetry.io/collector v0.37.0 - go.opentelemetry.io/collector/model v0.37.0 + go.opentelemetry.io/collector v0.37.1-0.20211015233822-bd87fb628058 + go.opentelemetry.io/collector/model v0.37.1-0.20211015233822-bd87fb628058 go.uber.org/zap v1.19.1 golang.org/x/net v0.0.0-20210614182718-04defd469f4e ) diff --git a/exporter/azuremonitorexporter/go.sum b/exporter/azuremonitorexporter/go.sum index cb882a6b9f8c..e3f282a95844 100644 --- a/exporter/azuremonitorexporter/go.sum +++ b/exporter/azuremonitorexporter/go.sum @@ -390,10 +390,11 @@ go.opencensus.io v0.22.4/go.mod h1:yxeiOL68Rb0Xd1ddK5vPZ/oVn4vY4Ynel7k9FzqtOIw= go.opencensus.io v0.22.5/go.mod h1:5pWMHQbX5EPX2/62yrJeAkowc+lfs/XD7Uxpq3pI6kk= go.opencensus.io v0.23.0 h1:gqCw0LfLxScz8irSi8exQc7fyQ0fKQU/qnC/X8+V/1M= go.opencensus.io v0.23.0/go.mod h1:XItmlyltB5F7CS4xOC1DcqMoFqwtC6OG2xF7mCv7P7E= -go.opentelemetry.io/collector v0.37.0 h1:X83+uWk11kW83BTkdKNt1Sk7gXyRv36wA6piT0FYfME= -go.opentelemetry.io/collector v0.37.0/go.mod h1:zbLWBJVy7bmiZHlHjCrV28vxXA/sAkCLtH5thD8ZahA= -go.opentelemetry.io/collector/model v0.37.0 h1:K1G6bgzBZ5kKSjZ1+EY9MhCOYsac4Q1K85fBUgpTVH8= +go.opentelemetry.io/collector v0.37.1-0.20211015233822-bd87fb628058 h1:6v0ba4ruY/W2cJLElDZEHDwShlSWUjK2MiBMvwfAIN0= +go.opentelemetry.io/collector v0.37.1-0.20211015233822-bd87fb628058/go.mod h1:zbLWBJVy7bmiZHlHjCrV28vxXA/sAkCLtH5thD8ZahA= go.opentelemetry.io/collector/model v0.37.0/go.mod h1:ESh1oWDNdS4fTg9sTFoYuiuvs8QuaX8yNGTPix3JZc8= +go.opentelemetry.io/collector/model v0.37.1-0.20211015233822-bd87fb628058 h1:jDw0pFIkDbvNRkkdCz1+gsBXIKbtY3GtRMPqzBeOfs4= +go.opentelemetry.io/collector/model v0.37.1-0.20211015233822-bd87fb628058/go.mod h1:ESh1oWDNdS4fTg9sTFoYuiuvs8QuaX8yNGTPix3JZc8= go.opentelemetry.io/contrib/instrumentation/google.golang.org/grpc/otelgrpc v0.25.0/go.mod h1:E5NNboN0UqSAki0Atn9kVwaN7I+l25gGxDqBueo/74E= go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.25.0/go.mod h1:NyB05cd+yPX6W5SiRNuJ90w7PV2+g2cgRbsPL7MvpME= go.opentelemetry.io/contrib/zpages v0.25.0/go.mod h1:cXBK0CNcIBD9Iiw1Hv3DvS+E8N2rtr+k+OoPs+sP0T4= diff --git a/exporter/carbonexporter/go.mod b/exporter/carbonexporter/go.mod index 0090a1705d7b..88e4f032aba7 100644 --- a/exporter/carbonexporter/go.mod +++ b/exporter/carbonexporter/go.mod @@ -7,8 +7,8 @@ require ( github.com/open-telemetry/opentelemetry-collector-contrib/internal/coreinternal v0.37.1 github.com/open-telemetry/opentelemetry-collector-contrib/pkg/translator/opencensus v0.37.1 github.com/stretchr/testify v1.7.0 - go.opentelemetry.io/collector v0.37.0 - go.opentelemetry.io/collector/model v0.37.0 + go.opentelemetry.io/collector v0.37.1-0.20211015233822-bd87fb628058 + go.opentelemetry.io/collector/model v0.37.1-0.20211015233822-bd87fb628058 google.golang.org/protobuf v1.27.1 ) diff --git a/exporter/carbonexporter/go.sum b/exporter/carbonexporter/go.sum index 755c39eedf57..3c3eefd4dcf5 100644 --- a/exporter/carbonexporter/go.sum +++ b/exporter/carbonexporter/go.sum @@ -391,10 +391,11 @@ go.opencensus.io v0.22.4/go.mod h1:yxeiOL68Rb0Xd1ddK5vPZ/oVn4vY4Ynel7k9FzqtOIw= go.opencensus.io v0.22.5/go.mod h1:5pWMHQbX5EPX2/62yrJeAkowc+lfs/XD7Uxpq3pI6kk= go.opencensus.io v0.23.0 h1:gqCw0LfLxScz8irSi8exQc7fyQ0fKQU/qnC/X8+V/1M= go.opencensus.io v0.23.0/go.mod h1:XItmlyltB5F7CS4xOC1DcqMoFqwtC6OG2xF7mCv7P7E= -go.opentelemetry.io/collector v0.37.0 h1:X83+uWk11kW83BTkdKNt1Sk7gXyRv36wA6piT0FYfME= -go.opentelemetry.io/collector v0.37.0/go.mod h1:zbLWBJVy7bmiZHlHjCrV28vxXA/sAkCLtH5thD8ZahA= -go.opentelemetry.io/collector/model v0.37.0 h1:K1G6bgzBZ5kKSjZ1+EY9MhCOYsac4Q1K85fBUgpTVH8= +go.opentelemetry.io/collector v0.37.1-0.20211015233822-bd87fb628058 h1:6v0ba4ruY/W2cJLElDZEHDwShlSWUjK2MiBMvwfAIN0= +go.opentelemetry.io/collector v0.37.1-0.20211015233822-bd87fb628058/go.mod h1:zbLWBJVy7bmiZHlHjCrV28vxXA/sAkCLtH5thD8ZahA= go.opentelemetry.io/collector/model v0.37.0/go.mod h1:ESh1oWDNdS4fTg9sTFoYuiuvs8QuaX8yNGTPix3JZc8= +go.opentelemetry.io/collector/model v0.37.1-0.20211015233822-bd87fb628058 h1:jDw0pFIkDbvNRkkdCz1+gsBXIKbtY3GtRMPqzBeOfs4= +go.opentelemetry.io/collector/model v0.37.1-0.20211015233822-bd87fb628058/go.mod h1:ESh1oWDNdS4fTg9sTFoYuiuvs8QuaX8yNGTPix3JZc8= go.opentelemetry.io/contrib/instrumentation/google.golang.org/grpc/otelgrpc v0.25.0/go.mod h1:E5NNboN0UqSAki0Atn9kVwaN7I+l25gGxDqBueo/74E= go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.25.0/go.mod h1:NyB05cd+yPX6W5SiRNuJ90w7PV2+g2cgRbsPL7MvpME= go.opentelemetry.io/contrib/zpages v0.25.0/go.mod h1:cXBK0CNcIBD9Iiw1Hv3DvS+E8N2rtr+k+OoPs+sP0T4= diff --git a/exporter/datadogexporter/go.mod b/exporter/datadogexporter/go.mod index a0673eaf8a24..6fb439ab1a83 100644 --- a/exporter/datadogexporter/go.mod +++ b/exporter/datadogexporter/go.mod @@ -16,8 +16,8 @@ require ( github.com/stretchr/testify v1.7.0 github.com/tinylib/msgp v1.1.5 // indirect github.com/zorkian/go-datadog-api v2.29.0+incompatible // indirect - go.opentelemetry.io/collector v0.37.0 - go.opentelemetry.io/collector/model v0.37.0 + go.opentelemetry.io/collector v0.37.1-0.20211015233822-bd87fb628058 + go.opentelemetry.io/collector/model v0.37.1-0.20211015233822-bd87fb628058 go.uber.org/zap v1.19.1 gopkg.in/DataDog/dd-trace-go.v1 v1.33.0 gopkg.in/zorkian/go-datadog-api.v2 v2.30.0 @@ -46,7 +46,6 @@ require ( github.com/pmezard/go-difflib v1.0.0 // indirect github.com/shirou/gopsutil v3.21.9+incompatible // indirect github.com/spf13/cast v1.4.1 // indirect - github.com/stretchr/objx v0.1.1 // indirect github.com/tklauser/go-sysconf v0.3.9 // indirect github.com/tklauser/numcpus v0.3.0 // indirect go.opencensus.io v0.23.0 // indirect @@ -59,7 +58,6 @@ require ( golang.org/x/sys v0.0.0-20210816074244-15123e1e1f71 // indirect golang.org/x/text v0.3.6 // indirect golang.org/x/time v0.0.0-20200630173020-3af7569d3a1e // indirect - google.golang.org/appengine v1.6.7 // indirect google.golang.org/genproto v0.0.0-20210604141403-392c879c8b08 // indirect google.golang.org/grpc v1.41.0 // indirect google.golang.org/protobuf v1.27.1 // indirect diff --git a/exporter/datadogexporter/go.sum b/exporter/datadogexporter/go.sum index 42eefe19f944..e2e77d35e89f 100644 --- a/exporter/datadogexporter/go.sum +++ b/exporter/datadogexporter/go.sum @@ -455,10 +455,11 @@ go.opencensus.io v0.22.4/go.mod h1:yxeiOL68Rb0Xd1ddK5vPZ/oVn4vY4Ynel7k9FzqtOIw= go.opencensus.io v0.22.5/go.mod h1:5pWMHQbX5EPX2/62yrJeAkowc+lfs/XD7Uxpq3pI6kk= go.opencensus.io v0.23.0 h1:gqCw0LfLxScz8irSi8exQc7fyQ0fKQU/qnC/X8+V/1M= go.opencensus.io v0.23.0/go.mod h1:XItmlyltB5F7CS4xOC1DcqMoFqwtC6OG2xF7mCv7P7E= -go.opentelemetry.io/collector v0.37.0 h1:X83+uWk11kW83BTkdKNt1Sk7gXyRv36wA6piT0FYfME= -go.opentelemetry.io/collector v0.37.0/go.mod h1:zbLWBJVy7bmiZHlHjCrV28vxXA/sAkCLtH5thD8ZahA= -go.opentelemetry.io/collector/model v0.37.0 h1:K1G6bgzBZ5kKSjZ1+EY9MhCOYsac4Q1K85fBUgpTVH8= +go.opentelemetry.io/collector v0.37.1-0.20211015233822-bd87fb628058 h1:6v0ba4ruY/W2cJLElDZEHDwShlSWUjK2MiBMvwfAIN0= +go.opentelemetry.io/collector v0.37.1-0.20211015233822-bd87fb628058/go.mod h1:zbLWBJVy7bmiZHlHjCrV28vxXA/sAkCLtH5thD8ZahA= go.opentelemetry.io/collector/model v0.37.0/go.mod h1:ESh1oWDNdS4fTg9sTFoYuiuvs8QuaX8yNGTPix3JZc8= +go.opentelemetry.io/collector/model v0.37.1-0.20211015233822-bd87fb628058 h1:jDw0pFIkDbvNRkkdCz1+gsBXIKbtY3GtRMPqzBeOfs4= +go.opentelemetry.io/collector/model v0.37.1-0.20211015233822-bd87fb628058/go.mod h1:ESh1oWDNdS4fTg9sTFoYuiuvs8QuaX8yNGTPix3JZc8= go.opentelemetry.io/contrib/instrumentation/google.golang.org/grpc/otelgrpc v0.25.0/go.mod h1:E5NNboN0UqSAki0Atn9kVwaN7I+l25gGxDqBueo/74E= go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.25.0/go.mod h1:NyB05cd+yPX6W5SiRNuJ90w7PV2+g2cgRbsPL7MvpME= go.opentelemetry.io/contrib/zpages v0.25.0/go.mod h1:cXBK0CNcIBD9Iiw1Hv3DvS+E8N2rtr+k+OoPs+sP0T4= diff --git a/exporter/dynatraceexporter/go.mod b/exporter/dynatraceexporter/go.mod index 5de517640737..4c0a62f366e0 100644 --- a/exporter/dynatraceexporter/go.mod +++ b/exporter/dynatraceexporter/go.mod @@ -7,8 +7,8 @@ require ( github.com/open-telemetry/opentelemetry-collector-contrib/internal/common v0.37.1 github.com/open-telemetry/opentelemetry-collector-contrib/pkg/resourcetotelemetry v0.37.1 github.com/stretchr/testify v1.7.0 - go.opentelemetry.io/collector v0.37.0 - go.opentelemetry.io/collector/model v0.37.0 + go.opentelemetry.io/collector v0.37.1-0.20211015233822-bd87fb628058 + go.opentelemetry.io/collector/model v0.37.1-0.20211015233822-bd87fb628058 go.uber.org/zap v1.19.1 ) @@ -24,7 +24,6 @@ require ( github.com/mitchellh/copystructure v1.2.0 // indirect github.com/mitchellh/mapstructure v1.4.2 // indirect github.com/mitchellh/reflectwalk v1.0.2 // indirect - github.com/pelletier/go-toml v1.9.3 // indirect github.com/pmezard/go-difflib v1.0.0 // indirect github.com/rogpeppe/go-internal v1.8.0 // indirect github.com/rs/cors v1.8.0 // indirect diff --git a/exporter/dynatraceexporter/go.sum b/exporter/dynatraceexporter/go.sum index 1bbaf13cc170..0696efd28a7e 100644 --- a/exporter/dynatraceexporter/go.sum +++ b/exporter/dynatraceexporter/go.sum @@ -785,10 +785,11 @@ go.opencensus.io v0.22.4/go.mod h1:yxeiOL68Rb0Xd1ddK5vPZ/oVn4vY4Ynel7k9FzqtOIw= go.opencensus.io v0.22.5/go.mod h1:5pWMHQbX5EPX2/62yrJeAkowc+lfs/XD7Uxpq3pI6kk= go.opencensus.io v0.23.0 h1:gqCw0LfLxScz8irSi8exQc7fyQ0fKQU/qnC/X8+V/1M= go.opencensus.io v0.23.0/go.mod h1:XItmlyltB5F7CS4xOC1DcqMoFqwtC6OG2xF7mCv7P7E= -go.opentelemetry.io/collector v0.37.0 h1:X83+uWk11kW83BTkdKNt1Sk7gXyRv36wA6piT0FYfME= -go.opentelemetry.io/collector v0.37.0/go.mod h1:zbLWBJVy7bmiZHlHjCrV28vxXA/sAkCLtH5thD8ZahA= -go.opentelemetry.io/collector/model v0.37.0 h1:K1G6bgzBZ5kKSjZ1+EY9MhCOYsac4Q1K85fBUgpTVH8= +go.opentelemetry.io/collector v0.37.1-0.20211015233822-bd87fb628058 h1:6v0ba4ruY/W2cJLElDZEHDwShlSWUjK2MiBMvwfAIN0= +go.opentelemetry.io/collector v0.37.1-0.20211015233822-bd87fb628058/go.mod h1:zbLWBJVy7bmiZHlHjCrV28vxXA/sAkCLtH5thD8ZahA= go.opentelemetry.io/collector/model v0.37.0/go.mod h1:ESh1oWDNdS4fTg9sTFoYuiuvs8QuaX8yNGTPix3JZc8= +go.opentelemetry.io/collector/model v0.37.1-0.20211015233822-bd87fb628058 h1:jDw0pFIkDbvNRkkdCz1+gsBXIKbtY3GtRMPqzBeOfs4= +go.opentelemetry.io/collector/model v0.37.1-0.20211015233822-bd87fb628058/go.mod h1:ESh1oWDNdS4fTg9sTFoYuiuvs8QuaX8yNGTPix3JZc8= go.opentelemetry.io/contrib/instrumentation/google.golang.org/grpc/otelgrpc v0.25.0/go.mod h1:E5NNboN0UqSAki0Atn9kVwaN7I+l25gGxDqBueo/74E= go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.25.0 h1:FIbb8m2PtTWjvXLHOEnXAoSmkaiXbg3fuvoZAjsAT3Q= go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.25.0/go.mod h1:NyB05cd+yPX6W5SiRNuJ90w7PV2+g2cgRbsPL7MvpME= diff --git a/exporter/elasticexporter/go.mod b/exporter/elasticexporter/go.mod index e116f0276231..5609f0312915 100644 --- a/exporter/elasticexporter/go.mod +++ b/exporter/elasticexporter/go.mod @@ -6,8 +6,8 @@ require ( github.com/stretchr/testify v1.7.0 go.elastic.co/apm v1.14.0 go.elastic.co/fastjson v1.1.0 - go.opentelemetry.io/collector v0.37.0 - go.opentelemetry.io/collector/model v0.37.0 + go.opentelemetry.io/collector v0.37.1-0.20211015233822-bd87fb628058 + go.opentelemetry.io/collector/model v0.37.1-0.20211015233822-bd87fb628058 go.uber.org/multierr v1.7.0 go.uber.org/zap v1.19.1 ) diff --git a/exporter/elasticexporter/go.sum b/exporter/elasticexporter/go.sum index b381bcf691d8..111f71c97312 100644 --- a/exporter/elasticexporter/go.sum +++ b/exporter/elasticexporter/go.sum @@ -395,10 +395,11 @@ go.opencensus.io v0.22.4/go.mod h1:yxeiOL68Rb0Xd1ddK5vPZ/oVn4vY4Ynel7k9FzqtOIw= go.opencensus.io v0.22.5/go.mod h1:5pWMHQbX5EPX2/62yrJeAkowc+lfs/XD7Uxpq3pI6kk= go.opencensus.io v0.23.0 h1:gqCw0LfLxScz8irSi8exQc7fyQ0fKQU/qnC/X8+V/1M= go.opencensus.io v0.23.0/go.mod h1:XItmlyltB5F7CS4xOC1DcqMoFqwtC6OG2xF7mCv7P7E= -go.opentelemetry.io/collector v0.37.0 h1:X83+uWk11kW83BTkdKNt1Sk7gXyRv36wA6piT0FYfME= -go.opentelemetry.io/collector v0.37.0/go.mod h1:zbLWBJVy7bmiZHlHjCrV28vxXA/sAkCLtH5thD8ZahA= -go.opentelemetry.io/collector/model v0.37.0 h1:K1G6bgzBZ5kKSjZ1+EY9MhCOYsac4Q1K85fBUgpTVH8= +go.opentelemetry.io/collector v0.37.1-0.20211015233822-bd87fb628058 h1:6v0ba4ruY/W2cJLElDZEHDwShlSWUjK2MiBMvwfAIN0= +go.opentelemetry.io/collector v0.37.1-0.20211015233822-bd87fb628058/go.mod h1:zbLWBJVy7bmiZHlHjCrV28vxXA/sAkCLtH5thD8ZahA= go.opentelemetry.io/collector/model v0.37.0/go.mod h1:ESh1oWDNdS4fTg9sTFoYuiuvs8QuaX8yNGTPix3JZc8= +go.opentelemetry.io/collector/model v0.37.1-0.20211015233822-bd87fb628058 h1:jDw0pFIkDbvNRkkdCz1+gsBXIKbtY3GtRMPqzBeOfs4= +go.opentelemetry.io/collector/model v0.37.1-0.20211015233822-bd87fb628058/go.mod h1:ESh1oWDNdS4fTg9sTFoYuiuvs8QuaX8yNGTPix3JZc8= go.opentelemetry.io/contrib/instrumentation/google.golang.org/grpc/otelgrpc v0.25.0/go.mod h1:E5NNboN0UqSAki0Atn9kVwaN7I+l25gGxDqBueo/74E= go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.25.0/go.mod h1:NyB05cd+yPX6W5SiRNuJ90w7PV2+g2cgRbsPL7MvpME= go.opentelemetry.io/contrib/zpages v0.25.0/go.mod h1:cXBK0CNcIBD9Iiw1Hv3DvS+E8N2rtr+k+OoPs+sP0T4= diff --git a/exporter/elasticsearchexporter/go.mod b/exporter/elasticsearchexporter/go.mod index 1d3e7544f26d..8389b55f38cd 100644 --- a/exporter/elasticsearchexporter/go.mod +++ b/exporter/elasticsearchexporter/go.mod @@ -7,8 +7,8 @@ require ( github.com/elastic/go-elasticsearch/v7 v7.15.0 github.com/elastic/go-structform v0.0.9 github.com/stretchr/testify v1.7.0 - go.opentelemetry.io/collector v0.37.0 - go.opentelemetry.io/collector/model v0.37.0 + go.opentelemetry.io/collector v0.37.1-0.20211015233822-bd87fb628058 + go.opentelemetry.io/collector/model v0.37.1-0.20211015233822-bd87fb628058 go.uber.org/multierr v1.7.0 go.uber.org/zap v1.19.1 diff --git a/exporter/elasticsearchexporter/go.sum b/exporter/elasticsearchexporter/go.sum index a0c1ed00470f..b21e37c83fc5 100644 --- a/exporter/elasticsearchexporter/go.sum +++ b/exporter/elasticsearchexporter/go.sum @@ -378,10 +378,11 @@ go.opencensus.io v0.22.4/go.mod h1:yxeiOL68Rb0Xd1ddK5vPZ/oVn4vY4Ynel7k9FzqtOIw= go.opencensus.io v0.22.5/go.mod h1:5pWMHQbX5EPX2/62yrJeAkowc+lfs/XD7Uxpq3pI6kk= go.opencensus.io v0.23.0 h1:gqCw0LfLxScz8irSi8exQc7fyQ0fKQU/qnC/X8+V/1M= go.opencensus.io v0.23.0/go.mod h1:XItmlyltB5F7CS4xOC1DcqMoFqwtC6OG2xF7mCv7P7E= -go.opentelemetry.io/collector v0.37.0 h1:X83+uWk11kW83BTkdKNt1Sk7gXyRv36wA6piT0FYfME= -go.opentelemetry.io/collector v0.37.0/go.mod h1:zbLWBJVy7bmiZHlHjCrV28vxXA/sAkCLtH5thD8ZahA= -go.opentelemetry.io/collector/model v0.37.0 h1:K1G6bgzBZ5kKSjZ1+EY9MhCOYsac4Q1K85fBUgpTVH8= +go.opentelemetry.io/collector v0.37.1-0.20211015233822-bd87fb628058 h1:6v0ba4ruY/W2cJLElDZEHDwShlSWUjK2MiBMvwfAIN0= +go.opentelemetry.io/collector v0.37.1-0.20211015233822-bd87fb628058/go.mod h1:zbLWBJVy7bmiZHlHjCrV28vxXA/sAkCLtH5thD8ZahA= go.opentelemetry.io/collector/model v0.37.0/go.mod h1:ESh1oWDNdS4fTg9sTFoYuiuvs8QuaX8yNGTPix3JZc8= +go.opentelemetry.io/collector/model v0.37.1-0.20211015233822-bd87fb628058 h1:jDw0pFIkDbvNRkkdCz1+gsBXIKbtY3GtRMPqzBeOfs4= +go.opentelemetry.io/collector/model v0.37.1-0.20211015233822-bd87fb628058/go.mod h1:ESh1oWDNdS4fTg9sTFoYuiuvs8QuaX8yNGTPix3JZc8= go.opentelemetry.io/contrib/instrumentation/google.golang.org/grpc/otelgrpc v0.25.0/go.mod h1:E5NNboN0UqSAki0Atn9kVwaN7I+l25gGxDqBueo/74E= go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.25.0/go.mod h1:NyB05cd+yPX6W5SiRNuJ90w7PV2+g2cgRbsPL7MvpME= go.opentelemetry.io/contrib/zpages v0.25.0/go.mod h1:cXBK0CNcIBD9Iiw1Hv3DvS+E8N2rtr+k+OoPs+sP0T4= diff --git a/exporter/f5cloudexporter/go.mod b/exporter/f5cloudexporter/go.mod index 707142bd937e..38ce2f04f048 100644 --- a/exporter/f5cloudexporter/go.mod +++ b/exporter/f5cloudexporter/go.mod @@ -5,7 +5,7 @@ go 1.17 require ( github.com/open-telemetry/opentelemetry-collector-contrib/internal/coreinternal v0.37.1 github.com/stretchr/testify v1.7.0 - go.opentelemetry.io/collector v0.37.0 + go.opentelemetry.io/collector v0.37.1-0.20211015233822-bd87fb628058 golang.org/x/oauth2 v0.0.0-20210819190943-2bc19b11175f google.golang.org/api v0.58.0 @@ -30,7 +30,7 @@ require ( github.com/rs/cors v1.8.0 // indirect github.com/spf13/cast v1.4.1 // indirect go.opencensus.io v0.23.0 // indirect - go.opentelemetry.io/collector/model v0.37.0 // indirect + go.opentelemetry.io/collector/model v0.37.1-0.20211015233822-bd87fb628058 // indirect go.opentelemetry.io/contrib/instrumentation/google.golang.org/grpc/otelgrpc v0.25.0 // indirect go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.25.0 // indirect go.opentelemetry.io/otel v1.0.1 // indirect diff --git a/exporter/f5cloudexporter/go.sum b/exporter/f5cloudexporter/go.sum index b83c788b4ed5..d264d5c2fa72 100644 --- a/exporter/f5cloudexporter/go.sum +++ b/exporter/f5cloudexporter/go.sum @@ -408,10 +408,11 @@ go.opencensus.io v0.22.4/go.mod h1:yxeiOL68Rb0Xd1ddK5vPZ/oVn4vY4Ynel7k9FzqtOIw= go.opencensus.io v0.22.5/go.mod h1:5pWMHQbX5EPX2/62yrJeAkowc+lfs/XD7Uxpq3pI6kk= go.opencensus.io v0.23.0 h1:gqCw0LfLxScz8irSi8exQc7fyQ0fKQU/qnC/X8+V/1M= go.opencensus.io v0.23.0/go.mod h1:XItmlyltB5F7CS4xOC1DcqMoFqwtC6OG2xF7mCv7P7E= -go.opentelemetry.io/collector v0.37.0 h1:X83+uWk11kW83BTkdKNt1Sk7gXyRv36wA6piT0FYfME= -go.opentelemetry.io/collector v0.37.0/go.mod h1:zbLWBJVy7bmiZHlHjCrV28vxXA/sAkCLtH5thD8ZahA= -go.opentelemetry.io/collector/model v0.37.0 h1:K1G6bgzBZ5kKSjZ1+EY9MhCOYsac4Q1K85fBUgpTVH8= +go.opentelemetry.io/collector v0.37.1-0.20211015233822-bd87fb628058 h1:6v0ba4ruY/W2cJLElDZEHDwShlSWUjK2MiBMvwfAIN0= +go.opentelemetry.io/collector v0.37.1-0.20211015233822-bd87fb628058/go.mod h1:zbLWBJVy7bmiZHlHjCrV28vxXA/sAkCLtH5thD8ZahA= go.opentelemetry.io/collector/model v0.37.0/go.mod h1:ESh1oWDNdS4fTg9sTFoYuiuvs8QuaX8yNGTPix3JZc8= +go.opentelemetry.io/collector/model v0.37.1-0.20211015233822-bd87fb628058 h1:jDw0pFIkDbvNRkkdCz1+gsBXIKbtY3GtRMPqzBeOfs4= +go.opentelemetry.io/collector/model v0.37.1-0.20211015233822-bd87fb628058/go.mod h1:ESh1oWDNdS4fTg9sTFoYuiuvs8QuaX8yNGTPix3JZc8= go.opentelemetry.io/contrib/instrumentation/google.golang.org/grpc/otelgrpc v0.25.0 h1:Wx7nFnvCaissIUZxPkBqDz2963Z+Cl+PkYbDKzTxDqQ= go.opentelemetry.io/contrib/instrumentation/google.golang.org/grpc/otelgrpc v0.25.0/go.mod h1:E5NNboN0UqSAki0Atn9kVwaN7I+l25gGxDqBueo/74E= go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.25.0 h1:FIbb8m2PtTWjvXLHOEnXAoSmkaiXbg3fuvoZAjsAT3Q= diff --git a/exporter/fileexporter/go.mod b/exporter/fileexporter/go.mod index 7ad334153abd..eb3717fa2f84 100644 --- a/exporter/fileexporter/go.mod +++ b/exporter/fileexporter/go.mod @@ -5,8 +5,8 @@ go 1.17 require ( github.com/open-telemetry/opentelemetry-collector-contrib/internal/coreinternal v0.37.1 github.com/stretchr/testify v1.7.0 - go.opentelemetry.io/collector v0.37.0 - go.opentelemetry.io/collector/model v0.37.0 + go.opentelemetry.io/collector v0.37.1-0.20211015233822-bd87fb628058 + go.opentelemetry.io/collector/model v0.37.1-0.20211015233822-bd87fb628058 ) require ( diff --git a/exporter/fileexporter/go.sum b/exporter/fileexporter/go.sum index 2ffd540cece4..947b2a0e77d5 100644 --- a/exporter/fileexporter/go.sum +++ b/exporter/fileexporter/go.sum @@ -389,10 +389,11 @@ go.opencensus.io v0.22.4/go.mod h1:yxeiOL68Rb0Xd1ddK5vPZ/oVn4vY4Ynel7k9FzqtOIw= go.opencensus.io v0.22.5/go.mod h1:5pWMHQbX5EPX2/62yrJeAkowc+lfs/XD7Uxpq3pI6kk= go.opencensus.io v0.23.0 h1:gqCw0LfLxScz8irSi8exQc7fyQ0fKQU/qnC/X8+V/1M= go.opencensus.io v0.23.0/go.mod h1:XItmlyltB5F7CS4xOC1DcqMoFqwtC6OG2xF7mCv7P7E= -go.opentelemetry.io/collector v0.37.0 h1:X83+uWk11kW83BTkdKNt1Sk7gXyRv36wA6piT0FYfME= -go.opentelemetry.io/collector v0.37.0/go.mod h1:zbLWBJVy7bmiZHlHjCrV28vxXA/sAkCLtH5thD8ZahA= -go.opentelemetry.io/collector/model v0.37.0 h1:K1G6bgzBZ5kKSjZ1+EY9MhCOYsac4Q1K85fBUgpTVH8= +go.opentelemetry.io/collector v0.37.1-0.20211015233822-bd87fb628058 h1:6v0ba4ruY/W2cJLElDZEHDwShlSWUjK2MiBMvwfAIN0= +go.opentelemetry.io/collector v0.37.1-0.20211015233822-bd87fb628058/go.mod h1:zbLWBJVy7bmiZHlHjCrV28vxXA/sAkCLtH5thD8ZahA= go.opentelemetry.io/collector/model v0.37.0/go.mod h1:ESh1oWDNdS4fTg9sTFoYuiuvs8QuaX8yNGTPix3JZc8= +go.opentelemetry.io/collector/model v0.37.1-0.20211015233822-bd87fb628058 h1:jDw0pFIkDbvNRkkdCz1+gsBXIKbtY3GtRMPqzBeOfs4= +go.opentelemetry.io/collector/model v0.37.1-0.20211015233822-bd87fb628058/go.mod h1:ESh1oWDNdS4fTg9sTFoYuiuvs8QuaX8yNGTPix3JZc8= go.opentelemetry.io/contrib/instrumentation/google.golang.org/grpc/otelgrpc v0.25.0/go.mod h1:E5NNboN0UqSAki0Atn9kVwaN7I+l25gGxDqBueo/74E= go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.25.0/go.mod h1:NyB05cd+yPX6W5SiRNuJ90w7PV2+g2cgRbsPL7MvpME= go.opentelemetry.io/contrib/zpages v0.25.0/go.mod h1:cXBK0CNcIBD9Iiw1Hv3DvS+E8N2rtr+k+OoPs+sP0T4= diff --git a/exporter/googlecloudexporter/go.mod b/exporter/googlecloudexporter/go.mod index 851e40b3b797..9ec1553999c4 100644 --- a/exporter/googlecloudexporter/go.mod +++ b/exporter/googlecloudexporter/go.mod @@ -10,8 +10,8 @@ require ( github.com/open-telemetry/opentelemetry-collector-contrib/pkg/translator/opencensus v0.37.1 github.com/stretchr/testify v1.7.0 go.opencensus.io v0.23.0 - go.opentelemetry.io/collector v0.37.0 - go.opentelemetry.io/collector/model v0.37.0 + go.opentelemetry.io/collector v0.37.1-0.20211015233822-bd87fb628058 + go.opentelemetry.io/collector/model v0.37.1-0.20211015233822-bd87fb628058 go.opentelemetry.io/otel v1.0.1 go.opentelemetry.io/otel/sdk v1.0.1 go.opentelemetry.io/otel/trace v1.0.1 diff --git a/exporter/googlecloudexporter/go.sum b/exporter/googlecloudexporter/go.sum index b9919b59b689..09c9fd462a13 100644 --- a/exporter/googlecloudexporter/go.sum +++ b/exporter/googlecloudexporter/go.sum @@ -432,10 +432,11 @@ go.opencensus.io v0.22.5/go.mod h1:5pWMHQbX5EPX2/62yrJeAkowc+lfs/XD7Uxpq3pI6kk= go.opencensus.io v0.22.6/go.mod h1:XItmlyltB5F7CS4xOC1DcqMoFqwtC6OG2xF7mCv7P7E= go.opencensus.io v0.23.0 h1:gqCw0LfLxScz8irSi8exQc7fyQ0fKQU/qnC/X8+V/1M= go.opencensus.io v0.23.0/go.mod h1:XItmlyltB5F7CS4xOC1DcqMoFqwtC6OG2xF7mCv7P7E= -go.opentelemetry.io/collector v0.37.0 h1:X83+uWk11kW83BTkdKNt1Sk7gXyRv36wA6piT0FYfME= -go.opentelemetry.io/collector v0.37.0/go.mod h1:zbLWBJVy7bmiZHlHjCrV28vxXA/sAkCLtH5thD8ZahA= -go.opentelemetry.io/collector/model v0.37.0 h1:K1G6bgzBZ5kKSjZ1+EY9MhCOYsac4Q1K85fBUgpTVH8= +go.opentelemetry.io/collector v0.37.1-0.20211015233822-bd87fb628058 h1:6v0ba4ruY/W2cJLElDZEHDwShlSWUjK2MiBMvwfAIN0= +go.opentelemetry.io/collector v0.37.1-0.20211015233822-bd87fb628058/go.mod h1:zbLWBJVy7bmiZHlHjCrV28vxXA/sAkCLtH5thD8ZahA= go.opentelemetry.io/collector/model v0.37.0/go.mod h1:ESh1oWDNdS4fTg9sTFoYuiuvs8QuaX8yNGTPix3JZc8= +go.opentelemetry.io/collector/model v0.37.1-0.20211015233822-bd87fb628058 h1:jDw0pFIkDbvNRkkdCz1+gsBXIKbtY3GtRMPqzBeOfs4= +go.opentelemetry.io/collector/model v0.37.1-0.20211015233822-bd87fb628058/go.mod h1:ESh1oWDNdS4fTg9sTFoYuiuvs8QuaX8yNGTPix3JZc8= go.opentelemetry.io/contrib v0.21.0 h1:RMJ6GlUVzLYp/zmItxTTdAmr1gnpO/HHMFmvjAhvJQM= go.opentelemetry.io/contrib v0.21.0/go.mod h1:EH4yDYeNoaTqn/8yCWQmfNB78VHfGX2Jt2bvnvzBlGM= go.opentelemetry.io/contrib/instrumentation/google.golang.org/grpc/otelgrpc v0.25.0/go.mod h1:E5NNboN0UqSAki0Atn9kVwaN7I+l25gGxDqBueo/74E= diff --git a/exporter/googlecloudpubsubexporter/go.mod b/exporter/googlecloudpubsubexporter/go.mod index dea88e84d12c..ad08bdbcd8c6 100644 --- a/exporter/googlecloudpubsubexporter/go.mod +++ b/exporter/googlecloudpubsubexporter/go.mod @@ -4,8 +4,8 @@ go 1.17 require ( github.com/stretchr/testify v1.7.0 - go.opentelemetry.io/collector v0.37.0 - go.opentelemetry.io/collector/model v0.37.0 + go.opentelemetry.io/collector v0.37.1-0.20211015233822-bd87fb628058 + go.opentelemetry.io/collector/model v0.37.1-0.20211015233822-bd87fb628058 go.uber.org/zap v1.19.1 ) diff --git a/exporter/googlecloudpubsubexporter/go.sum b/exporter/googlecloudpubsubexporter/go.sum index b0a8d318b16d..bf8f01171235 100644 --- a/exporter/googlecloudpubsubexporter/go.sum +++ b/exporter/googlecloudpubsubexporter/go.sum @@ -374,10 +374,11 @@ go.opencensus.io v0.22.4/go.mod h1:yxeiOL68Rb0Xd1ddK5vPZ/oVn4vY4Ynel7k9FzqtOIw= go.opencensus.io v0.22.5/go.mod h1:5pWMHQbX5EPX2/62yrJeAkowc+lfs/XD7Uxpq3pI6kk= go.opencensus.io v0.23.0 h1:gqCw0LfLxScz8irSi8exQc7fyQ0fKQU/qnC/X8+V/1M= go.opencensus.io v0.23.0/go.mod h1:XItmlyltB5F7CS4xOC1DcqMoFqwtC6OG2xF7mCv7P7E= -go.opentelemetry.io/collector v0.37.0 h1:X83+uWk11kW83BTkdKNt1Sk7gXyRv36wA6piT0FYfME= -go.opentelemetry.io/collector v0.37.0/go.mod h1:zbLWBJVy7bmiZHlHjCrV28vxXA/sAkCLtH5thD8ZahA= -go.opentelemetry.io/collector/model v0.37.0 h1:K1G6bgzBZ5kKSjZ1+EY9MhCOYsac4Q1K85fBUgpTVH8= +go.opentelemetry.io/collector v0.37.1-0.20211015233822-bd87fb628058 h1:6v0ba4ruY/W2cJLElDZEHDwShlSWUjK2MiBMvwfAIN0= +go.opentelemetry.io/collector v0.37.1-0.20211015233822-bd87fb628058/go.mod h1:zbLWBJVy7bmiZHlHjCrV28vxXA/sAkCLtH5thD8ZahA= go.opentelemetry.io/collector/model v0.37.0/go.mod h1:ESh1oWDNdS4fTg9sTFoYuiuvs8QuaX8yNGTPix3JZc8= +go.opentelemetry.io/collector/model v0.37.1-0.20211015233822-bd87fb628058 h1:jDw0pFIkDbvNRkkdCz1+gsBXIKbtY3GtRMPqzBeOfs4= +go.opentelemetry.io/collector/model v0.37.1-0.20211015233822-bd87fb628058/go.mod h1:ESh1oWDNdS4fTg9sTFoYuiuvs8QuaX8yNGTPix3JZc8= go.opentelemetry.io/contrib/instrumentation/google.golang.org/grpc/otelgrpc v0.25.0/go.mod h1:E5NNboN0UqSAki0Atn9kVwaN7I+l25gGxDqBueo/74E= go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.25.0/go.mod h1:NyB05cd+yPX6W5SiRNuJ90w7PV2+g2cgRbsPL7MvpME= go.opentelemetry.io/contrib/zpages v0.25.0/go.mod h1:cXBK0CNcIBD9Iiw1Hv3DvS+E8N2rtr+k+OoPs+sP0T4= diff --git a/exporter/honeycombexporter/go.mod b/exporter/honeycombexporter/go.mod index c8d301c96d32..b6fcbb75d19d 100644 --- a/exporter/honeycombexporter/go.mod +++ b/exporter/honeycombexporter/go.mod @@ -7,8 +7,8 @@ require ( github.com/honeycombio/libhoney-go v1.15.5 github.com/klauspost/compress v1.13.6 github.com/stretchr/testify v1.7.0 - go.opentelemetry.io/collector v0.37.0 - go.opentelemetry.io/collector/model v0.37.0 + go.opentelemetry.io/collector v0.37.1-0.20211015233822-bd87fb628058 + go.opentelemetry.io/collector/model v0.37.1-0.20211015233822-bd87fb628058 go.uber.org/multierr v1.7.0 go.uber.org/zap v1.19.1 google.golang.org/protobuf v1.27.1 diff --git a/exporter/honeycombexporter/go.sum b/exporter/honeycombexporter/go.sum index b333eba9567a..7ae24c6fbe58 100644 --- a/exporter/honeycombexporter/go.sum +++ b/exporter/honeycombexporter/go.sum @@ -397,10 +397,11 @@ go.opencensus.io v0.22.4/go.mod h1:yxeiOL68Rb0Xd1ddK5vPZ/oVn4vY4Ynel7k9FzqtOIw= go.opencensus.io v0.22.5/go.mod h1:5pWMHQbX5EPX2/62yrJeAkowc+lfs/XD7Uxpq3pI6kk= go.opencensus.io v0.23.0 h1:gqCw0LfLxScz8irSi8exQc7fyQ0fKQU/qnC/X8+V/1M= go.opencensus.io v0.23.0/go.mod h1:XItmlyltB5F7CS4xOC1DcqMoFqwtC6OG2xF7mCv7P7E= -go.opentelemetry.io/collector v0.37.0 h1:X83+uWk11kW83BTkdKNt1Sk7gXyRv36wA6piT0FYfME= -go.opentelemetry.io/collector v0.37.0/go.mod h1:zbLWBJVy7bmiZHlHjCrV28vxXA/sAkCLtH5thD8ZahA= -go.opentelemetry.io/collector/model v0.37.0 h1:K1G6bgzBZ5kKSjZ1+EY9MhCOYsac4Q1K85fBUgpTVH8= +go.opentelemetry.io/collector v0.37.1-0.20211015233822-bd87fb628058 h1:6v0ba4ruY/W2cJLElDZEHDwShlSWUjK2MiBMvwfAIN0= +go.opentelemetry.io/collector v0.37.1-0.20211015233822-bd87fb628058/go.mod h1:zbLWBJVy7bmiZHlHjCrV28vxXA/sAkCLtH5thD8ZahA= go.opentelemetry.io/collector/model v0.37.0/go.mod h1:ESh1oWDNdS4fTg9sTFoYuiuvs8QuaX8yNGTPix3JZc8= +go.opentelemetry.io/collector/model v0.37.1-0.20211015233822-bd87fb628058 h1:jDw0pFIkDbvNRkkdCz1+gsBXIKbtY3GtRMPqzBeOfs4= +go.opentelemetry.io/collector/model v0.37.1-0.20211015233822-bd87fb628058/go.mod h1:ESh1oWDNdS4fTg9sTFoYuiuvs8QuaX8yNGTPix3JZc8= go.opentelemetry.io/contrib/instrumentation/google.golang.org/grpc/otelgrpc v0.25.0/go.mod h1:E5NNboN0UqSAki0Atn9kVwaN7I+l25gGxDqBueo/74E= go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.25.0/go.mod h1:NyB05cd+yPX6W5SiRNuJ90w7PV2+g2cgRbsPL7MvpME= go.opentelemetry.io/contrib/zpages v0.25.0/go.mod h1:cXBK0CNcIBD9Iiw1Hv3DvS+E8N2rtr+k+OoPs+sP0T4= diff --git a/exporter/humioexporter/go.mod b/exporter/humioexporter/go.mod index 7653fe39b99f..6533006dfb81 100644 --- a/exporter/humioexporter/go.mod +++ b/exporter/humioexporter/go.mod @@ -4,8 +4,8 @@ go 1.17 require ( github.com/stretchr/testify v1.7.0 - go.opentelemetry.io/collector v0.37.0 - go.opentelemetry.io/collector/model v0.37.0 + go.opentelemetry.io/collector v0.37.1-0.20211015233822-bd87fb628058 + go.opentelemetry.io/collector/model v0.37.1-0.20211015233822-bd87fb628058 go.uber.org/zap v1.19.1 ) diff --git a/exporter/humioexporter/go.sum b/exporter/humioexporter/go.sum index c8ae169e1249..06c186b3a72a 100644 --- a/exporter/humioexporter/go.sum +++ b/exporter/humioexporter/go.sum @@ -376,10 +376,11 @@ go.opencensus.io v0.22.4/go.mod h1:yxeiOL68Rb0Xd1ddK5vPZ/oVn4vY4Ynel7k9FzqtOIw= go.opencensus.io v0.22.5/go.mod h1:5pWMHQbX5EPX2/62yrJeAkowc+lfs/XD7Uxpq3pI6kk= go.opencensus.io v0.23.0 h1:gqCw0LfLxScz8irSi8exQc7fyQ0fKQU/qnC/X8+V/1M= go.opencensus.io v0.23.0/go.mod h1:XItmlyltB5F7CS4xOC1DcqMoFqwtC6OG2xF7mCv7P7E= -go.opentelemetry.io/collector v0.37.0 h1:X83+uWk11kW83BTkdKNt1Sk7gXyRv36wA6piT0FYfME= -go.opentelemetry.io/collector v0.37.0/go.mod h1:zbLWBJVy7bmiZHlHjCrV28vxXA/sAkCLtH5thD8ZahA= -go.opentelemetry.io/collector/model v0.37.0 h1:K1G6bgzBZ5kKSjZ1+EY9MhCOYsac4Q1K85fBUgpTVH8= +go.opentelemetry.io/collector v0.37.1-0.20211015233822-bd87fb628058 h1:6v0ba4ruY/W2cJLElDZEHDwShlSWUjK2MiBMvwfAIN0= +go.opentelemetry.io/collector v0.37.1-0.20211015233822-bd87fb628058/go.mod h1:zbLWBJVy7bmiZHlHjCrV28vxXA/sAkCLtH5thD8ZahA= go.opentelemetry.io/collector/model v0.37.0/go.mod h1:ESh1oWDNdS4fTg9sTFoYuiuvs8QuaX8yNGTPix3JZc8= +go.opentelemetry.io/collector/model v0.37.1-0.20211015233822-bd87fb628058 h1:jDw0pFIkDbvNRkkdCz1+gsBXIKbtY3GtRMPqzBeOfs4= +go.opentelemetry.io/collector/model v0.37.1-0.20211015233822-bd87fb628058/go.mod h1:ESh1oWDNdS4fTg9sTFoYuiuvs8QuaX8yNGTPix3JZc8= go.opentelemetry.io/contrib/instrumentation/google.golang.org/grpc/otelgrpc v0.25.0/go.mod h1:E5NNboN0UqSAki0Atn9kVwaN7I+l25gGxDqBueo/74E= go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.25.0 h1:FIbb8m2PtTWjvXLHOEnXAoSmkaiXbg3fuvoZAjsAT3Q= go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.25.0/go.mod h1:NyB05cd+yPX6W5SiRNuJ90w7PV2+g2cgRbsPL7MvpME= diff --git a/exporter/influxdbexporter/go.mod b/exporter/influxdbexporter/go.mod index dbb885accdbf..b71e5ed9ae2a 100644 --- a/exporter/influxdbexporter/go.mod +++ b/exporter/influxdbexporter/go.mod @@ -7,8 +7,8 @@ require ( github.com/influxdata/influxdb-observability/otel2influx v0.0.0-20210927215436-943f6419116a github.com/influxdata/line-protocol/v2 v2.0.0-20210520103755-6551a972d603 github.com/stretchr/testify v1.7.0 - go.opentelemetry.io/collector v0.37.0 - go.opentelemetry.io/collector/model v0.37.0 + go.opentelemetry.io/collector v0.37.1-0.20211015233822-bd87fb628058 + go.opentelemetry.io/collector/model v0.37.1-0.20211015233822-bd87fb628058 go.uber.org/zap v1.19.1 ) diff --git a/exporter/influxdbexporter/go.sum b/exporter/influxdbexporter/go.sum index fcfd7a1db3ca..d326d88a892a 100644 --- a/exporter/influxdbexporter/go.sum +++ b/exporter/influxdbexporter/go.sum @@ -390,12 +390,13 @@ go.opencensus.io v0.22.4/go.mod h1:yxeiOL68Rb0Xd1ddK5vPZ/oVn4vY4Ynel7k9FzqtOIw= go.opencensus.io v0.22.5/go.mod h1:5pWMHQbX5EPX2/62yrJeAkowc+lfs/XD7Uxpq3pI6kk= go.opencensus.io v0.23.0 h1:gqCw0LfLxScz8irSi8exQc7fyQ0fKQU/qnC/X8+V/1M= go.opencensus.io v0.23.0/go.mod h1:XItmlyltB5F7CS4xOC1DcqMoFqwtC6OG2xF7mCv7P7E= -go.opentelemetry.io/collector v0.37.0 h1:X83+uWk11kW83BTkdKNt1Sk7gXyRv36wA6piT0FYfME= -go.opentelemetry.io/collector v0.37.0/go.mod h1:zbLWBJVy7bmiZHlHjCrV28vxXA/sAkCLtH5thD8ZahA= +go.opentelemetry.io/collector v0.37.1-0.20211015233822-bd87fb628058 h1:6v0ba4ruY/W2cJLElDZEHDwShlSWUjK2MiBMvwfAIN0= +go.opentelemetry.io/collector v0.37.1-0.20211015233822-bd87fb628058/go.mod h1:zbLWBJVy7bmiZHlHjCrV28vxXA/sAkCLtH5thD8ZahA= go.opentelemetry.io/collector/model v0.35.0/go.mod h1:+7YCSjJG+MqiIFjauzt7oM2qkqBsaJWh5hcsO4fwsAc= go.opentelemetry.io/collector/model v0.36.1-0.20210927193005-ebb0fbd6f23e/go.mod h1:ESh1oWDNdS4fTg9sTFoYuiuvs8QuaX8yNGTPix3JZc8= -go.opentelemetry.io/collector/model v0.37.0 h1:K1G6bgzBZ5kKSjZ1+EY9MhCOYsac4Q1K85fBUgpTVH8= go.opentelemetry.io/collector/model v0.37.0/go.mod h1:ESh1oWDNdS4fTg9sTFoYuiuvs8QuaX8yNGTPix3JZc8= +go.opentelemetry.io/collector/model v0.37.1-0.20211015233822-bd87fb628058 h1:jDw0pFIkDbvNRkkdCz1+gsBXIKbtY3GtRMPqzBeOfs4= +go.opentelemetry.io/collector/model v0.37.1-0.20211015233822-bd87fb628058/go.mod h1:ESh1oWDNdS4fTg9sTFoYuiuvs8QuaX8yNGTPix3JZc8= go.opentelemetry.io/contrib/instrumentation/google.golang.org/grpc/otelgrpc v0.25.0/go.mod h1:E5NNboN0UqSAki0Atn9kVwaN7I+l25gGxDqBueo/74E= go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.25.0 h1:FIbb8m2PtTWjvXLHOEnXAoSmkaiXbg3fuvoZAjsAT3Q= go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.25.0/go.mod h1:NyB05cd+yPX6W5SiRNuJ90w7PV2+g2cgRbsPL7MvpME= diff --git a/exporter/jaegerexporter/go.mod b/exporter/jaegerexporter/go.mod index cc45fa7377a5..8343b56caf44 100644 --- a/exporter/jaegerexporter/go.mod +++ b/exporter/jaegerexporter/go.mod @@ -8,14 +8,13 @@ require ( github.com/open-telemetry/opentelemetry-collector-contrib/pkg/translator/jaeger v0.37.1 github.com/stretchr/testify v1.7.0 go.opencensus.io v0.23.0 - go.opentelemetry.io/collector v0.37.0 - go.opentelemetry.io/collector/model v0.37.0 + go.opentelemetry.io/collector v0.37.1-0.20211015233822-bd87fb628058 + go.opentelemetry.io/collector/model v0.37.1-0.20211015233822-bd87fb628058 go.uber.org/zap v1.19.1 google.golang.org/grpc v1.41.0 ) require ( - cloud.google.com/go v0.93.3 // indirect github.com/apache/thrift v0.15.0 // indirect github.com/cenkalti/backoff/v4 v4.1.1 // indirect github.com/davecgh/go-spew v1.1.1 // indirect @@ -40,10 +39,8 @@ require ( go.uber.org/atomic v1.9.0 // indirect go.uber.org/multierr v1.7.0 // indirect golang.org/x/net v0.0.0-20210917221730-978cfadd31cf // indirect - golang.org/x/oauth2 v0.0.0-20210819190943-2bc19b11175f // indirect golang.org/x/sys v0.0.0-20210823070655-63515b42dcdf // indirect golang.org/x/text v0.3.7 // indirect - google.golang.org/appengine v1.6.7 // indirect google.golang.org/genproto v0.0.0-20210828152312-66f60bf46e71 // indirect google.golang.org/protobuf v1.27.1 // indirect gopkg.in/yaml.v2 v2.4.0 // indirect diff --git a/exporter/jaegerexporter/go.sum b/exporter/jaegerexporter/go.sum index b3a6e22d17fc..c875e3c076c3 100644 --- a/exporter/jaegerexporter/go.sum +++ b/exporter/jaegerexporter/go.sum @@ -753,11 +753,12 @@ go.opencensus.io v0.22.4/go.mod h1:yxeiOL68Rb0Xd1ddK5vPZ/oVn4vY4Ynel7k9FzqtOIw= go.opencensus.io v0.22.5/go.mod h1:5pWMHQbX5EPX2/62yrJeAkowc+lfs/XD7Uxpq3pI6kk= go.opencensus.io v0.23.0 h1:gqCw0LfLxScz8irSi8exQc7fyQ0fKQU/qnC/X8+V/1M= go.opencensus.io v0.23.0/go.mod h1:XItmlyltB5F7CS4xOC1DcqMoFqwtC6OG2xF7mCv7P7E= -go.opentelemetry.io/collector v0.37.0 h1:X83+uWk11kW83BTkdKNt1Sk7gXyRv36wA6piT0FYfME= -go.opentelemetry.io/collector v0.37.0/go.mod h1:zbLWBJVy7bmiZHlHjCrV28vxXA/sAkCLtH5thD8ZahA= +go.opentelemetry.io/collector v0.37.1-0.20211015233822-bd87fb628058 h1:6v0ba4ruY/W2cJLElDZEHDwShlSWUjK2MiBMvwfAIN0= +go.opentelemetry.io/collector v0.37.1-0.20211015233822-bd87fb628058/go.mod h1:zbLWBJVy7bmiZHlHjCrV28vxXA/sAkCLtH5thD8ZahA= go.opentelemetry.io/collector/model v0.36.0/go.mod h1:+7YCSjJG+MqiIFjauzt7oM2qkqBsaJWh5hcsO4fwsAc= -go.opentelemetry.io/collector/model v0.37.0 h1:K1G6bgzBZ5kKSjZ1+EY9MhCOYsac4Q1K85fBUgpTVH8= go.opentelemetry.io/collector/model v0.37.0/go.mod h1:ESh1oWDNdS4fTg9sTFoYuiuvs8QuaX8yNGTPix3JZc8= +go.opentelemetry.io/collector/model v0.37.1-0.20211015233822-bd87fb628058 h1:jDw0pFIkDbvNRkkdCz1+gsBXIKbtY3GtRMPqzBeOfs4= +go.opentelemetry.io/collector/model v0.37.1-0.20211015233822-bd87fb628058/go.mod h1:ESh1oWDNdS4fTg9sTFoYuiuvs8QuaX8yNGTPix3JZc8= go.opentelemetry.io/contrib/instrumentation/google.golang.org/grpc/otelgrpc v0.25.0 h1:Wx7nFnvCaissIUZxPkBqDz2963Z+Cl+PkYbDKzTxDqQ= go.opentelemetry.io/contrib/instrumentation/google.golang.org/grpc/otelgrpc v0.25.0/go.mod h1:E5NNboN0UqSAki0Atn9kVwaN7I+l25gGxDqBueo/74E= go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.25.0/go.mod h1:NyB05cd+yPX6W5SiRNuJ90w7PV2+g2cgRbsPL7MvpME= diff --git a/exporter/kafkaexporter/go.mod b/exporter/kafkaexporter/go.mod index 59bacd1fae2f..089b0d5e6127 100644 --- a/exporter/kafkaexporter/go.mod +++ b/exporter/kafkaexporter/go.mod @@ -10,8 +10,8 @@ require ( github.com/open-telemetry/opentelemetry-collector-contrib/pkg/translator/jaeger v0.37.1 github.com/stretchr/testify v1.7.0 github.com/xdg-go/scram v1.0.2 - go.opentelemetry.io/collector v0.37.0 - go.opentelemetry.io/collector/model v0.37.0 + go.opentelemetry.io/collector v0.37.1-0.20211015233822-bd87fb628058 + go.opentelemetry.io/collector/model v0.37.1-0.20211015233822-bd87fb628058 go.uber.org/multierr v1.7.0 go.uber.org/zap v1.19.1 ) diff --git a/exporter/kafkaexporter/go.sum b/exporter/kafkaexporter/go.sum index 773116cdbf42..51beeed50ee3 100644 --- a/exporter/kafkaexporter/go.sum +++ b/exporter/kafkaexporter/go.sum @@ -773,11 +773,12 @@ go.opencensus.io v0.22.4/go.mod h1:yxeiOL68Rb0Xd1ddK5vPZ/oVn4vY4Ynel7k9FzqtOIw= go.opencensus.io v0.22.5/go.mod h1:5pWMHQbX5EPX2/62yrJeAkowc+lfs/XD7Uxpq3pI6kk= go.opencensus.io v0.23.0 h1:gqCw0LfLxScz8irSi8exQc7fyQ0fKQU/qnC/X8+V/1M= go.opencensus.io v0.23.0/go.mod h1:XItmlyltB5F7CS4xOC1DcqMoFqwtC6OG2xF7mCv7P7E= -go.opentelemetry.io/collector v0.37.0 h1:X83+uWk11kW83BTkdKNt1Sk7gXyRv36wA6piT0FYfME= -go.opentelemetry.io/collector v0.37.0/go.mod h1:zbLWBJVy7bmiZHlHjCrV28vxXA/sAkCLtH5thD8ZahA= +go.opentelemetry.io/collector v0.37.1-0.20211015233822-bd87fb628058 h1:6v0ba4ruY/W2cJLElDZEHDwShlSWUjK2MiBMvwfAIN0= +go.opentelemetry.io/collector v0.37.1-0.20211015233822-bd87fb628058/go.mod h1:zbLWBJVy7bmiZHlHjCrV28vxXA/sAkCLtH5thD8ZahA= go.opentelemetry.io/collector/model v0.36.0/go.mod h1:+7YCSjJG+MqiIFjauzt7oM2qkqBsaJWh5hcsO4fwsAc= -go.opentelemetry.io/collector/model v0.37.0 h1:K1G6bgzBZ5kKSjZ1+EY9MhCOYsac4Q1K85fBUgpTVH8= go.opentelemetry.io/collector/model v0.37.0/go.mod h1:ESh1oWDNdS4fTg9sTFoYuiuvs8QuaX8yNGTPix3JZc8= +go.opentelemetry.io/collector/model v0.37.1-0.20211015233822-bd87fb628058 h1:jDw0pFIkDbvNRkkdCz1+gsBXIKbtY3GtRMPqzBeOfs4= +go.opentelemetry.io/collector/model v0.37.1-0.20211015233822-bd87fb628058/go.mod h1:ESh1oWDNdS4fTg9sTFoYuiuvs8QuaX8yNGTPix3JZc8= go.opentelemetry.io/contrib/instrumentation/google.golang.org/grpc/otelgrpc v0.25.0/go.mod h1:E5NNboN0UqSAki0Atn9kVwaN7I+l25gGxDqBueo/74E= go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.25.0/go.mod h1:NyB05cd+yPX6W5SiRNuJ90w7PV2+g2cgRbsPL7MvpME= go.opentelemetry.io/contrib/zpages v0.25.0/go.mod h1:cXBK0CNcIBD9Iiw1Hv3DvS+E8N2rtr+k+OoPs+sP0T4= diff --git a/exporter/loadbalancingexporter/go.mod b/exporter/loadbalancingexporter/go.mod index 2c15c91c8c00..9c899bbf7f56 100644 --- a/exporter/loadbalancingexporter/go.mod +++ b/exporter/loadbalancingexporter/go.mod @@ -6,8 +6,8 @@ require ( github.com/open-telemetry/opentelemetry-collector-contrib/pkg/batchpersignal v0.37.1 github.com/stretchr/testify v1.7.0 go.opencensus.io v0.23.0 - go.opentelemetry.io/collector v0.37.0 - go.opentelemetry.io/collector/model v0.37.0 + go.opentelemetry.io/collector v0.37.1-0.20211015233822-bd87fb628058 + go.opentelemetry.io/collector/model v0.37.1-0.20211015233822-bd87fb628058 go.uber.org/multierr v1.7.0 go.uber.org/zap v1.19.1 ) diff --git a/exporter/loadbalancingexporter/go.sum b/exporter/loadbalancingexporter/go.sum index 0492cfd16dc9..38abc05aa578 100644 --- a/exporter/loadbalancingexporter/go.sum +++ b/exporter/loadbalancingexporter/go.sum @@ -379,11 +379,12 @@ go.opencensus.io v0.22.4/go.mod h1:yxeiOL68Rb0Xd1ddK5vPZ/oVn4vY4Ynel7k9FzqtOIw= go.opencensus.io v0.22.5/go.mod h1:5pWMHQbX5EPX2/62yrJeAkowc+lfs/XD7Uxpq3pI6kk= go.opencensus.io v0.23.0 h1:gqCw0LfLxScz8irSi8exQc7fyQ0fKQU/qnC/X8+V/1M= go.opencensus.io v0.23.0/go.mod h1:XItmlyltB5F7CS4xOC1DcqMoFqwtC6OG2xF7mCv7P7E= -go.opentelemetry.io/collector v0.37.0 h1:X83+uWk11kW83BTkdKNt1Sk7gXyRv36wA6piT0FYfME= -go.opentelemetry.io/collector v0.37.0/go.mod h1:zbLWBJVy7bmiZHlHjCrV28vxXA/sAkCLtH5thD8ZahA= +go.opentelemetry.io/collector v0.37.1-0.20211015233822-bd87fb628058 h1:6v0ba4ruY/W2cJLElDZEHDwShlSWUjK2MiBMvwfAIN0= +go.opentelemetry.io/collector v0.37.1-0.20211015233822-bd87fb628058/go.mod h1:zbLWBJVy7bmiZHlHjCrV28vxXA/sAkCLtH5thD8ZahA= go.opentelemetry.io/collector/model v0.30.2-0.20210719230137-809cae954ed3/go.mod h1:PcHNnM+RUl0uD8VkSn93PO78N7kQYhfqpI/eki57pl4= -go.opentelemetry.io/collector/model v0.37.0 h1:K1G6bgzBZ5kKSjZ1+EY9MhCOYsac4Q1K85fBUgpTVH8= go.opentelemetry.io/collector/model v0.37.0/go.mod h1:ESh1oWDNdS4fTg9sTFoYuiuvs8QuaX8yNGTPix3JZc8= +go.opentelemetry.io/collector/model v0.37.1-0.20211015233822-bd87fb628058 h1:jDw0pFIkDbvNRkkdCz1+gsBXIKbtY3GtRMPqzBeOfs4= +go.opentelemetry.io/collector/model v0.37.1-0.20211015233822-bd87fb628058/go.mod h1:ESh1oWDNdS4fTg9sTFoYuiuvs8QuaX8yNGTPix3JZc8= go.opentelemetry.io/contrib/instrumentation/google.golang.org/grpc/otelgrpc v0.25.0 h1:Wx7nFnvCaissIUZxPkBqDz2963Z+Cl+PkYbDKzTxDqQ= go.opentelemetry.io/contrib/instrumentation/google.golang.org/grpc/otelgrpc v0.25.0/go.mod h1:E5NNboN0UqSAki0Atn9kVwaN7I+l25gGxDqBueo/74E= go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.25.0/go.mod h1:NyB05cd+yPX6W5SiRNuJ90w7PV2+g2cgRbsPL7MvpME= diff --git a/exporter/logzioexporter/go.mod b/exporter/logzioexporter/go.mod index 67c58f0b8eaa..c8ff5655fbff 100644 --- a/exporter/logzioexporter/go.mod +++ b/exporter/logzioexporter/go.mod @@ -8,8 +8,8 @@ require ( github.com/logzio/jaeger-logzio v1.0.4 github.com/open-telemetry/opentelemetry-collector-contrib/pkg/translator/jaeger v0.37.1 github.com/stretchr/testify v1.7.0 - go.opentelemetry.io/collector v0.37.0 - go.opentelemetry.io/collector/model v0.37.0 + go.opentelemetry.io/collector v0.37.1-0.20211015233822-bd87fb628058 + go.opentelemetry.io/collector/model v0.37.1-0.20211015233822-bd87fb628058 go.uber.org/zap v1.19.1 ) diff --git a/exporter/logzioexporter/go.sum b/exporter/logzioexporter/go.sum index 9ae9cf7c6192..09bd03023c06 100644 --- a/exporter/logzioexporter/go.sum +++ b/exporter/logzioexporter/go.sum @@ -900,11 +900,12 @@ go.opencensus.io v0.22.4/go.mod h1:yxeiOL68Rb0Xd1ddK5vPZ/oVn4vY4Ynel7k9FzqtOIw= go.opencensus.io v0.22.5/go.mod h1:5pWMHQbX5EPX2/62yrJeAkowc+lfs/XD7Uxpq3pI6kk= go.opencensus.io v0.23.0 h1:gqCw0LfLxScz8irSi8exQc7fyQ0fKQU/qnC/X8+V/1M= go.opencensus.io v0.23.0/go.mod h1:XItmlyltB5F7CS4xOC1DcqMoFqwtC6OG2xF7mCv7P7E= -go.opentelemetry.io/collector v0.37.0 h1:X83+uWk11kW83BTkdKNt1Sk7gXyRv36wA6piT0FYfME= -go.opentelemetry.io/collector v0.37.0/go.mod h1:zbLWBJVy7bmiZHlHjCrV28vxXA/sAkCLtH5thD8ZahA= +go.opentelemetry.io/collector v0.37.1-0.20211015233822-bd87fb628058 h1:6v0ba4ruY/W2cJLElDZEHDwShlSWUjK2MiBMvwfAIN0= +go.opentelemetry.io/collector v0.37.1-0.20211015233822-bd87fb628058/go.mod h1:zbLWBJVy7bmiZHlHjCrV28vxXA/sAkCLtH5thD8ZahA= go.opentelemetry.io/collector/model v0.36.0/go.mod h1:+7YCSjJG+MqiIFjauzt7oM2qkqBsaJWh5hcsO4fwsAc= -go.opentelemetry.io/collector/model v0.37.0 h1:K1G6bgzBZ5kKSjZ1+EY9MhCOYsac4Q1K85fBUgpTVH8= go.opentelemetry.io/collector/model v0.37.0/go.mod h1:ESh1oWDNdS4fTg9sTFoYuiuvs8QuaX8yNGTPix3JZc8= +go.opentelemetry.io/collector/model v0.37.1-0.20211015233822-bd87fb628058 h1:jDw0pFIkDbvNRkkdCz1+gsBXIKbtY3GtRMPqzBeOfs4= +go.opentelemetry.io/collector/model v0.37.1-0.20211015233822-bd87fb628058/go.mod h1:ESh1oWDNdS4fTg9sTFoYuiuvs8QuaX8yNGTPix3JZc8= go.opentelemetry.io/contrib/instrumentation/google.golang.org/grpc/otelgrpc v0.25.0/go.mod h1:E5NNboN0UqSAki0Atn9kVwaN7I+l25gGxDqBueo/74E= go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.25.0/go.mod h1:NyB05cd+yPX6W5SiRNuJ90w7PV2+g2cgRbsPL7MvpME= go.opentelemetry.io/contrib/zpages v0.25.0/go.mod h1:cXBK0CNcIBD9Iiw1Hv3DvS+E8N2rtr+k+OoPs+sP0T4= diff --git a/exporter/lokiexporter/go.mod b/exporter/lokiexporter/go.mod index c56a50bccd7d..752fd97c8cca 100644 --- a/exporter/lokiexporter/go.mod +++ b/exporter/lokiexporter/go.mod @@ -9,8 +9,8 @@ require ( github.com/prometheus/common v0.31.1 github.com/prometheus/prometheus v1.8.2-0.20210621150501-ff58416a0b02 github.com/stretchr/testify v1.7.0 - go.opentelemetry.io/collector v0.37.0 - go.opentelemetry.io/collector/model v0.37.0 + go.opentelemetry.io/collector v0.37.1-0.20211015233822-bd87fb628058 + go.opentelemetry.io/collector/model v0.37.1-0.20211015233822-bd87fb628058 go.uber.org/zap v1.19.1 google.golang.org/grpc v1.41.0 diff --git a/exporter/lokiexporter/go.sum b/exporter/lokiexporter/go.sum index c2941db4cd45..27b3ae70bb0a 100644 --- a/exporter/lokiexporter/go.sum +++ b/exporter/lokiexporter/go.sum @@ -972,10 +972,11 @@ go.opencensus.io v0.22.4/go.mod h1:yxeiOL68Rb0Xd1ddK5vPZ/oVn4vY4Ynel7k9FzqtOIw= go.opencensus.io v0.22.5/go.mod h1:5pWMHQbX5EPX2/62yrJeAkowc+lfs/XD7Uxpq3pI6kk= go.opencensus.io v0.23.0 h1:gqCw0LfLxScz8irSi8exQc7fyQ0fKQU/qnC/X8+V/1M= go.opencensus.io v0.23.0/go.mod h1:XItmlyltB5F7CS4xOC1DcqMoFqwtC6OG2xF7mCv7P7E= -go.opentelemetry.io/collector v0.37.0 h1:X83+uWk11kW83BTkdKNt1Sk7gXyRv36wA6piT0FYfME= -go.opentelemetry.io/collector v0.37.0/go.mod h1:zbLWBJVy7bmiZHlHjCrV28vxXA/sAkCLtH5thD8ZahA= -go.opentelemetry.io/collector/model v0.37.0 h1:K1G6bgzBZ5kKSjZ1+EY9MhCOYsac4Q1K85fBUgpTVH8= +go.opentelemetry.io/collector v0.37.1-0.20211015233822-bd87fb628058 h1:6v0ba4ruY/W2cJLElDZEHDwShlSWUjK2MiBMvwfAIN0= +go.opentelemetry.io/collector v0.37.1-0.20211015233822-bd87fb628058/go.mod h1:zbLWBJVy7bmiZHlHjCrV28vxXA/sAkCLtH5thD8ZahA= go.opentelemetry.io/collector/model v0.37.0/go.mod h1:ESh1oWDNdS4fTg9sTFoYuiuvs8QuaX8yNGTPix3JZc8= +go.opentelemetry.io/collector/model v0.37.1-0.20211015233822-bd87fb628058 h1:jDw0pFIkDbvNRkkdCz1+gsBXIKbtY3GtRMPqzBeOfs4= +go.opentelemetry.io/collector/model v0.37.1-0.20211015233822-bd87fb628058/go.mod h1:ESh1oWDNdS4fTg9sTFoYuiuvs8QuaX8yNGTPix3JZc8= go.opentelemetry.io/contrib/instrumentation/google.golang.org/grpc/otelgrpc v0.25.0/go.mod h1:E5NNboN0UqSAki0Atn9kVwaN7I+l25gGxDqBueo/74E= go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.25.0 h1:FIbb8m2PtTWjvXLHOEnXAoSmkaiXbg3fuvoZAjsAT3Q= go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.25.0/go.mod h1:NyB05cd+yPX6W5SiRNuJ90w7PV2+g2cgRbsPL7MvpME= diff --git a/exporter/newrelicexporter/go.mod b/exporter/newrelicexporter/go.mod index bc26b466305b..c49f8f9da41c 100644 --- a/exporter/newrelicexporter/go.mod +++ b/exporter/newrelicexporter/go.mod @@ -9,8 +9,8 @@ require ( github.com/open-telemetry/opentelemetry-collector-contrib/pkg/translator/opencensus v0.37.1 github.com/stretchr/testify v1.7.0 go.opencensus.io v0.23.0 - go.opentelemetry.io/collector v0.37.0 - go.opentelemetry.io/collector/model v0.37.0 + go.opentelemetry.io/collector v0.37.1-0.20211015233822-bd87fb628058 + go.opentelemetry.io/collector/model v0.37.1-0.20211015233822-bd87fb628058 go.uber.org/multierr v1.7.0 go.uber.org/zap v1.19.1 google.golang.org/genproto v0.0.0-20210604141403-392c879c8b08 diff --git a/exporter/newrelicexporter/go.sum b/exporter/newrelicexporter/go.sum index 2f83953d93bc..e76bb8e864d6 100644 --- a/exporter/newrelicexporter/go.sum +++ b/exporter/newrelicexporter/go.sum @@ -393,10 +393,11 @@ go.opencensus.io v0.22.4/go.mod h1:yxeiOL68Rb0Xd1ddK5vPZ/oVn4vY4Ynel7k9FzqtOIw= go.opencensus.io v0.22.5/go.mod h1:5pWMHQbX5EPX2/62yrJeAkowc+lfs/XD7Uxpq3pI6kk= go.opencensus.io v0.23.0 h1:gqCw0LfLxScz8irSi8exQc7fyQ0fKQU/qnC/X8+V/1M= go.opencensus.io v0.23.0/go.mod h1:XItmlyltB5F7CS4xOC1DcqMoFqwtC6OG2xF7mCv7P7E= -go.opentelemetry.io/collector v0.37.0 h1:X83+uWk11kW83BTkdKNt1Sk7gXyRv36wA6piT0FYfME= -go.opentelemetry.io/collector v0.37.0/go.mod h1:zbLWBJVy7bmiZHlHjCrV28vxXA/sAkCLtH5thD8ZahA= -go.opentelemetry.io/collector/model v0.37.0 h1:K1G6bgzBZ5kKSjZ1+EY9MhCOYsac4Q1K85fBUgpTVH8= +go.opentelemetry.io/collector v0.37.1-0.20211015233822-bd87fb628058 h1:6v0ba4ruY/W2cJLElDZEHDwShlSWUjK2MiBMvwfAIN0= +go.opentelemetry.io/collector v0.37.1-0.20211015233822-bd87fb628058/go.mod h1:zbLWBJVy7bmiZHlHjCrV28vxXA/sAkCLtH5thD8ZahA= go.opentelemetry.io/collector/model v0.37.0/go.mod h1:ESh1oWDNdS4fTg9sTFoYuiuvs8QuaX8yNGTPix3JZc8= +go.opentelemetry.io/collector/model v0.37.1-0.20211015233822-bd87fb628058 h1:jDw0pFIkDbvNRkkdCz1+gsBXIKbtY3GtRMPqzBeOfs4= +go.opentelemetry.io/collector/model v0.37.1-0.20211015233822-bd87fb628058/go.mod h1:ESh1oWDNdS4fTg9sTFoYuiuvs8QuaX8yNGTPix3JZc8= go.opentelemetry.io/contrib/instrumentation/google.golang.org/grpc/otelgrpc v0.25.0/go.mod h1:E5NNboN0UqSAki0Atn9kVwaN7I+l25gGxDqBueo/74E= go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.25.0/go.mod h1:NyB05cd+yPX6W5SiRNuJ90w7PV2+g2cgRbsPL7MvpME= go.opentelemetry.io/contrib/zpages v0.25.0/go.mod h1:cXBK0CNcIBD9Iiw1Hv3DvS+E8N2rtr+k+OoPs+sP0T4= diff --git a/exporter/observiqexporter/go.mod b/exporter/observiqexporter/go.mod index 0e1a1c8384cc..e7096f486e90 100644 --- a/exporter/observiqexporter/go.mod +++ b/exporter/observiqexporter/go.mod @@ -5,8 +5,8 @@ go 1.17 require ( github.com/google/uuid v1.3.0 github.com/stretchr/testify v1.7.0 - go.opentelemetry.io/collector v0.37.0 - go.opentelemetry.io/collector/model v0.37.0 + go.opentelemetry.io/collector v0.37.1-0.20211015233822-bd87fb628058 + go.opentelemetry.io/collector/model v0.37.1-0.20211015233822-bd87fb628058 go.uber.org/multierr v1.7.0 go.uber.org/zap v1.19.1 ) diff --git a/exporter/observiqexporter/go.sum b/exporter/observiqexporter/go.sum index 2eb2e1005db0..dababf5d3c11 100644 --- a/exporter/observiqexporter/go.sum +++ b/exporter/observiqexporter/go.sum @@ -375,10 +375,11 @@ go.opencensus.io v0.22.4/go.mod h1:yxeiOL68Rb0Xd1ddK5vPZ/oVn4vY4Ynel7k9FzqtOIw= go.opencensus.io v0.22.5/go.mod h1:5pWMHQbX5EPX2/62yrJeAkowc+lfs/XD7Uxpq3pI6kk= go.opencensus.io v0.23.0 h1:gqCw0LfLxScz8irSi8exQc7fyQ0fKQU/qnC/X8+V/1M= go.opencensus.io v0.23.0/go.mod h1:XItmlyltB5F7CS4xOC1DcqMoFqwtC6OG2xF7mCv7P7E= -go.opentelemetry.io/collector v0.37.0 h1:X83+uWk11kW83BTkdKNt1Sk7gXyRv36wA6piT0FYfME= -go.opentelemetry.io/collector v0.37.0/go.mod h1:zbLWBJVy7bmiZHlHjCrV28vxXA/sAkCLtH5thD8ZahA= -go.opentelemetry.io/collector/model v0.37.0 h1:K1G6bgzBZ5kKSjZ1+EY9MhCOYsac4Q1K85fBUgpTVH8= +go.opentelemetry.io/collector v0.37.1-0.20211015233822-bd87fb628058 h1:6v0ba4ruY/W2cJLElDZEHDwShlSWUjK2MiBMvwfAIN0= +go.opentelemetry.io/collector v0.37.1-0.20211015233822-bd87fb628058/go.mod h1:zbLWBJVy7bmiZHlHjCrV28vxXA/sAkCLtH5thD8ZahA= go.opentelemetry.io/collector/model v0.37.0/go.mod h1:ESh1oWDNdS4fTg9sTFoYuiuvs8QuaX8yNGTPix3JZc8= +go.opentelemetry.io/collector/model v0.37.1-0.20211015233822-bd87fb628058 h1:jDw0pFIkDbvNRkkdCz1+gsBXIKbtY3GtRMPqzBeOfs4= +go.opentelemetry.io/collector/model v0.37.1-0.20211015233822-bd87fb628058/go.mod h1:ESh1oWDNdS4fTg9sTFoYuiuvs8QuaX8yNGTPix3JZc8= go.opentelemetry.io/contrib/instrumentation/google.golang.org/grpc/otelgrpc v0.25.0/go.mod h1:E5NNboN0UqSAki0Atn9kVwaN7I+l25gGxDqBueo/74E= go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.25.0/go.mod h1:NyB05cd+yPX6W5SiRNuJ90w7PV2+g2cgRbsPL7MvpME= go.opentelemetry.io/contrib/zpages v0.25.0/go.mod h1:cXBK0CNcIBD9Iiw1Hv3DvS+E8N2rtr+k+OoPs+sP0T4= diff --git a/exporter/opencensusexporter/go.mod b/exporter/opencensusexporter/go.mod index 7cb7a4adc9fa..153d51492034 100644 --- a/exporter/opencensusexporter/go.mod +++ b/exporter/opencensusexporter/go.mod @@ -8,8 +8,8 @@ require ( github.com/open-telemetry/opentelemetry-collector-contrib/pkg/translator/opencensus v0.37.1 github.com/open-telemetry/opentelemetry-collector-contrib/receiver/opencensusreceiver v0.37.1 github.com/stretchr/testify v1.7.0 - go.opentelemetry.io/collector v0.37.0 - go.opentelemetry.io/collector/model v0.37.0 + go.opentelemetry.io/collector v0.37.1-0.20211015233822-bd87fb628058 + go.opentelemetry.io/collector/model v0.37.1-0.20211015233822-bd87fb628058 google.golang.org/grpc v1.41.0 ) diff --git a/exporter/opencensusexporter/go.sum b/exporter/opencensusexporter/go.sum index b9b60c668f7c..47828142004f 100644 --- a/exporter/opencensusexporter/go.sum +++ b/exporter/opencensusexporter/go.sum @@ -395,10 +395,11 @@ go.opencensus.io v0.22.4/go.mod h1:yxeiOL68Rb0Xd1ddK5vPZ/oVn4vY4Ynel7k9FzqtOIw= go.opencensus.io v0.22.5/go.mod h1:5pWMHQbX5EPX2/62yrJeAkowc+lfs/XD7Uxpq3pI6kk= go.opencensus.io v0.23.0 h1:gqCw0LfLxScz8irSi8exQc7fyQ0fKQU/qnC/X8+V/1M= go.opencensus.io v0.23.0/go.mod h1:XItmlyltB5F7CS4xOC1DcqMoFqwtC6OG2xF7mCv7P7E= -go.opentelemetry.io/collector v0.37.0 h1:X83+uWk11kW83BTkdKNt1Sk7gXyRv36wA6piT0FYfME= -go.opentelemetry.io/collector v0.37.0/go.mod h1:zbLWBJVy7bmiZHlHjCrV28vxXA/sAkCLtH5thD8ZahA= -go.opentelemetry.io/collector/model v0.37.0 h1:K1G6bgzBZ5kKSjZ1+EY9MhCOYsac4Q1K85fBUgpTVH8= +go.opentelemetry.io/collector v0.37.1-0.20211015233822-bd87fb628058 h1:6v0ba4ruY/W2cJLElDZEHDwShlSWUjK2MiBMvwfAIN0= +go.opentelemetry.io/collector v0.37.1-0.20211015233822-bd87fb628058/go.mod h1:zbLWBJVy7bmiZHlHjCrV28vxXA/sAkCLtH5thD8ZahA= go.opentelemetry.io/collector/model v0.37.0/go.mod h1:ESh1oWDNdS4fTg9sTFoYuiuvs8QuaX8yNGTPix3JZc8= +go.opentelemetry.io/collector/model v0.37.1-0.20211015233822-bd87fb628058 h1:jDw0pFIkDbvNRkkdCz1+gsBXIKbtY3GtRMPqzBeOfs4= +go.opentelemetry.io/collector/model v0.37.1-0.20211015233822-bd87fb628058/go.mod h1:ESh1oWDNdS4fTg9sTFoYuiuvs8QuaX8yNGTPix3JZc8= go.opentelemetry.io/contrib/instrumentation/google.golang.org/grpc/otelgrpc v0.25.0 h1:Wx7nFnvCaissIUZxPkBqDz2963Z+Cl+PkYbDKzTxDqQ= go.opentelemetry.io/contrib/instrumentation/google.golang.org/grpc/otelgrpc v0.25.0/go.mod h1:E5NNboN0UqSAki0Atn9kVwaN7I+l25gGxDqBueo/74E= go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.25.0/go.mod h1:NyB05cd+yPX6W5SiRNuJ90w7PV2+g2cgRbsPL7MvpME= diff --git a/exporter/prometheusexporter/go.mod b/exporter/prometheusexporter/go.mod index 82276caa8dc2..02e89d4ef398 100644 --- a/exporter/prometheusexporter/go.mod +++ b/exporter/prometheusexporter/go.mod @@ -10,8 +10,8 @@ require ( github.com/prometheus/client_model v0.2.0 github.com/prometheus/prometheus v1.8.2-0.20210621150501-ff58416a0b02 github.com/stretchr/testify v1.7.0 - go.opentelemetry.io/collector v0.37.0 - go.opentelemetry.io/collector/model v0.37.0 + go.opentelemetry.io/collector v0.37.1-0.20211015233822-bd87fb628058 + go.opentelemetry.io/collector/model v0.37.1-0.20211015233822-bd87fb628058 go.uber.org/zap v1.19.1 gopkg.in/yaml.v2 v2.4.0 ) diff --git a/exporter/prometheusexporter/go.sum b/exporter/prometheusexporter/go.sum index eb985b264e23..267258ecd5e5 100644 --- a/exporter/prometheusexporter/go.sum +++ b/exporter/prometheusexporter/go.sum @@ -1379,10 +1379,11 @@ go.opencensus.io v0.22.4/go.mod h1:yxeiOL68Rb0Xd1ddK5vPZ/oVn4vY4Ynel7k9FzqtOIw= go.opencensus.io v0.22.5/go.mod h1:5pWMHQbX5EPX2/62yrJeAkowc+lfs/XD7Uxpq3pI6kk= go.opencensus.io v0.23.0 h1:gqCw0LfLxScz8irSi8exQc7fyQ0fKQU/qnC/X8+V/1M= go.opencensus.io v0.23.0/go.mod h1:XItmlyltB5F7CS4xOC1DcqMoFqwtC6OG2xF7mCv7P7E= -go.opentelemetry.io/collector v0.37.0 h1:X83+uWk11kW83BTkdKNt1Sk7gXyRv36wA6piT0FYfME= -go.opentelemetry.io/collector v0.37.0/go.mod h1:zbLWBJVy7bmiZHlHjCrV28vxXA/sAkCLtH5thD8ZahA= -go.opentelemetry.io/collector/model v0.37.0 h1:K1G6bgzBZ5kKSjZ1+EY9MhCOYsac4Q1K85fBUgpTVH8= +go.opentelemetry.io/collector v0.37.1-0.20211015233822-bd87fb628058 h1:6v0ba4ruY/W2cJLElDZEHDwShlSWUjK2MiBMvwfAIN0= +go.opentelemetry.io/collector v0.37.1-0.20211015233822-bd87fb628058/go.mod h1:zbLWBJVy7bmiZHlHjCrV28vxXA/sAkCLtH5thD8ZahA= go.opentelemetry.io/collector/model v0.37.0/go.mod h1:ESh1oWDNdS4fTg9sTFoYuiuvs8QuaX8yNGTPix3JZc8= +go.opentelemetry.io/collector/model v0.37.1-0.20211015233822-bd87fb628058 h1:jDw0pFIkDbvNRkkdCz1+gsBXIKbtY3GtRMPqzBeOfs4= +go.opentelemetry.io/collector/model v0.37.1-0.20211015233822-bd87fb628058/go.mod h1:ESh1oWDNdS4fTg9sTFoYuiuvs8QuaX8yNGTPix3JZc8= go.opentelemetry.io/contrib/instrumentation/google.golang.org/grpc/otelgrpc v0.25.0/go.mod h1:E5NNboN0UqSAki0Atn9kVwaN7I+l25gGxDqBueo/74E= go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.25.0 h1:FIbb8m2PtTWjvXLHOEnXAoSmkaiXbg3fuvoZAjsAT3Q= go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.25.0/go.mod h1:NyB05cd+yPX6W5SiRNuJ90w7PV2+g2cgRbsPL7MvpME= diff --git a/exporter/prometheusremotewriteexporter/go.mod b/exporter/prometheusremotewriteexporter/go.mod index d9756a5919f0..333c111d60e6 100644 --- a/exporter/prometheusremotewriteexporter/go.mod +++ b/exporter/prometheusremotewriteexporter/go.mod @@ -11,8 +11,8 @@ require ( github.com/prometheus/prometheus v1.8.2-0.20210621150501-ff58416a0b02 github.com/stretchr/testify v1.7.0 github.com/tidwall/wal v0.1.5 - go.opentelemetry.io/collector v0.37.0 - go.opentelemetry.io/collector/model v0.37.0 + go.opentelemetry.io/collector v0.37.1-0.20211015233822-bd87fb628058 + go.opentelemetry.io/collector/model v0.37.1-0.20211015233822-bd87fb628058 go.uber.org/multierr v1.7.0 ) diff --git a/exporter/prometheusremotewriteexporter/go.sum b/exporter/prometheusremotewriteexporter/go.sum index 819524dd6262..9af2941abbd9 100644 --- a/exporter/prometheusremotewriteexporter/go.sum +++ b/exporter/prometheusremotewriteexporter/go.sum @@ -980,10 +980,11 @@ go.opencensus.io v0.22.4/go.mod h1:yxeiOL68Rb0Xd1ddK5vPZ/oVn4vY4Ynel7k9FzqtOIw= go.opencensus.io v0.22.5/go.mod h1:5pWMHQbX5EPX2/62yrJeAkowc+lfs/XD7Uxpq3pI6kk= go.opencensus.io v0.23.0 h1:gqCw0LfLxScz8irSi8exQc7fyQ0fKQU/qnC/X8+V/1M= go.opencensus.io v0.23.0/go.mod h1:XItmlyltB5F7CS4xOC1DcqMoFqwtC6OG2xF7mCv7P7E= -go.opentelemetry.io/collector v0.37.0 h1:X83+uWk11kW83BTkdKNt1Sk7gXyRv36wA6piT0FYfME= -go.opentelemetry.io/collector v0.37.0/go.mod h1:zbLWBJVy7bmiZHlHjCrV28vxXA/sAkCLtH5thD8ZahA= -go.opentelemetry.io/collector/model v0.37.0 h1:K1G6bgzBZ5kKSjZ1+EY9MhCOYsac4Q1K85fBUgpTVH8= +go.opentelemetry.io/collector v0.37.1-0.20211015233822-bd87fb628058 h1:6v0ba4ruY/W2cJLElDZEHDwShlSWUjK2MiBMvwfAIN0= +go.opentelemetry.io/collector v0.37.1-0.20211015233822-bd87fb628058/go.mod h1:zbLWBJVy7bmiZHlHjCrV28vxXA/sAkCLtH5thD8ZahA= go.opentelemetry.io/collector/model v0.37.0/go.mod h1:ESh1oWDNdS4fTg9sTFoYuiuvs8QuaX8yNGTPix3JZc8= +go.opentelemetry.io/collector/model v0.37.1-0.20211015233822-bd87fb628058 h1:jDw0pFIkDbvNRkkdCz1+gsBXIKbtY3GtRMPqzBeOfs4= +go.opentelemetry.io/collector/model v0.37.1-0.20211015233822-bd87fb628058/go.mod h1:ESh1oWDNdS4fTg9sTFoYuiuvs8QuaX8yNGTPix3JZc8= go.opentelemetry.io/contrib/instrumentation/google.golang.org/grpc/otelgrpc v0.25.0/go.mod h1:E5NNboN0UqSAki0Atn9kVwaN7I+l25gGxDqBueo/74E= go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.25.0 h1:FIbb8m2PtTWjvXLHOEnXAoSmkaiXbg3fuvoZAjsAT3Q= go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.25.0/go.mod h1:NyB05cd+yPX6W5SiRNuJ90w7PV2+g2cgRbsPL7MvpME= diff --git a/exporter/sapmexporter/go.mod b/exporter/sapmexporter/go.mod index af277be7ed91..054c246e6f2f 100644 --- a/exporter/sapmexporter/go.mod +++ b/exporter/sapmexporter/go.mod @@ -9,8 +9,8 @@ require ( github.com/open-telemetry/opentelemetry-collector-contrib/pkg/translator/jaeger v0.37.1 github.com/signalfx/sapm-proto v0.7.0 github.com/stretchr/testify v1.7.0 - go.opentelemetry.io/collector v0.37.0 - go.opentelemetry.io/collector/model v0.37.0 + go.opentelemetry.io/collector v0.37.1-0.20211015233822-bd87fb628058 + go.opentelemetry.io/collector/model v0.37.1-0.20211015233822-bd87fb628058 go.uber.org/zap v1.19.1 ) diff --git a/exporter/sapmexporter/go.sum b/exporter/sapmexporter/go.sum index ef1d9f0abfb8..a6d5c48dcfa0 100644 --- a/exporter/sapmexporter/go.sum +++ b/exporter/sapmexporter/go.sum @@ -1022,11 +1022,12 @@ go.opencensus.io v0.22.4/go.mod h1:yxeiOL68Rb0Xd1ddK5vPZ/oVn4vY4Ynel7k9FzqtOIw= go.opencensus.io v0.22.5/go.mod h1:5pWMHQbX5EPX2/62yrJeAkowc+lfs/XD7Uxpq3pI6kk= go.opencensus.io v0.23.0 h1:gqCw0LfLxScz8irSi8exQc7fyQ0fKQU/qnC/X8+V/1M= go.opencensus.io v0.23.0/go.mod h1:XItmlyltB5F7CS4xOC1DcqMoFqwtC6OG2xF7mCv7P7E= -go.opentelemetry.io/collector v0.37.0 h1:X83+uWk11kW83BTkdKNt1Sk7gXyRv36wA6piT0FYfME= -go.opentelemetry.io/collector v0.37.0/go.mod h1:zbLWBJVy7bmiZHlHjCrV28vxXA/sAkCLtH5thD8ZahA= +go.opentelemetry.io/collector v0.37.1-0.20211015233822-bd87fb628058 h1:6v0ba4ruY/W2cJLElDZEHDwShlSWUjK2MiBMvwfAIN0= +go.opentelemetry.io/collector v0.37.1-0.20211015233822-bd87fb628058/go.mod h1:zbLWBJVy7bmiZHlHjCrV28vxXA/sAkCLtH5thD8ZahA= go.opentelemetry.io/collector/model v0.36.0/go.mod h1:+7YCSjJG+MqiIFjauzt7oM2qkqBsaJWh5hcsO4fwsAc= -go.opentelemetry.io/collector/model v0.37.0 h1:K1G6bgzBZ5kKSjZ1+EY9MhCOYsac4Q1K85fBUgpTVH8= go.opentelemetry.io/collector/model v0.37.0/go.mod h1:ESh1oWDNdS4fTg9sTFoYuiuvs8QuaX8yNGTPix3JZc8= +go.opentelemetry.io/collector/model v0.37.1-0.20211015233822-bd87fb628058 h1:jDw0pFIkDbvNRkkdCz1+gsBXIKbtY3GtRMPqzBeOfs4= +go.opentelemetry.io/collector/model v0.37.1-0.20211015233822-bd87fb628058/go.mod h1:ESh1oWDNdS4fTg9sTFoYuiuvs8QuaX8yNGTPix3JZc8= go.opentelemetry.io/contrib/instrumentation/google.golang.org/grpc/otelgrpc v0.25.0/go.mod h1:E5NNboN0UqSAki0Atn9kVwaN7I+l25gGxDqBueo/74E= go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.25.0/go.mod h1:NyB05cd+yPX6W5SiRNuJ90w7PV2+g2cgRbsPL7MvpME= go.opentelemetry.io/contrib/zpages v0.25.0/go.mod h1:cXBK0CNcIBD9Iiw1Hv3DvS+E8N2rtr+k+OoPs+sP0T4= diff --git a/exporter/sentryexporter/go.mod b/exporter/sentryexporter/go.mod index 801443f08a74..4e9a53dfa143 100644 --- a/exporter/sentryexporter/go.mod +++ b/exporter/sentryexporter/go.mod @@ -6,8 +6,8 @@ require ( github.com/getsentry/sentry-go v0.11.0 github.com/google/go-cmp v0.5.6 github.com/stretchr/testify v1.7.0 - go.opentelemetry.io/collector v0.37.0 - go.opentelemetry.io/collector/model v0.37.0 + go.opentelemetry.io/collector v0.37.1-0.20211015233822-bd87fb628058 + go.opentelemetry.io/collector/model v0.37.1-0.20211015233822-bd87fb628058 ) require ( diff --git a/exporter/sentryexporter/go.sum b/exporter/sentryexporter/go.sum index 174a96159d82..0a72f5396c38 100644 --- a/exporter/sentryexporter/go.sum +++ b/exporter/sentryexporter/go.sum @@ -472,10 +472,11 @@ go.opencensus.io v0.22.4/go.mod h1:yxeiOL68Rb0Xd1ddK5vPZ/oVn4vY4Ynel7k9FzqtOIw= go.opencensus.io v0.22.5/go.mod h1:5pWMHQbX5EPX2/62yrJeAkowc+lfs/XD7Uxpq3pI6kk= go.opencensus.io v0.23.0 h1:gqCw0LfLxScz8irSi8exQc7fyQ0fKQU/qnC/X8+V/1M= go.opencensus.io v0.23.0/go.mod h1:XItmlyltB5F7CS4xOC1DcqMoFqwtC6OG2xF7mCv7P7E= -go.opentelemetry.io/collector v0.37.0 h1:X83+uWk11kW83BTkdKNt1Sk7gXyRv36wA6piT0FYfME= -go.opentelemetry.io/collector v0.37.0/go.mod h1:zbLWBJVy7bmiZHlHjCrV28vxXA/sAkCLtH5thD8ZahA= -go.opentelemetry.io/collector/model v0.37.0 h1:K1G6bgzBZ5kKSjZ1+EY9MhCOYsac4Q1K85fBUgpTVH8= +go.opentelemetry.io/collector v0.37.1-0.20211015233822-bd87fb628058 h1:6v0ba4ruY/W2cJLElDZEHDwShlSWUjK2MiBMvwfAIN0= +go.opentelemetry.io/collector v0.37.1-0.20211015233822-bd87fb628058/go.mod h1:zbLWBJVy7bmiZHlHjCrV28vxXA/sAkCLtH5thD8ZahA= go.opentelemetry.io/collector/model v0.37.0/go.mod h1:ESh1oWDNdS4fTg9sTFoYuiuvs8QuaX8yNGTPix3JZc8= +go.opentelemetry.io/collector/model v0.37.1-0.20211015233822-bd87fb628058 h1:jDw0pFIkDbvNRkkdCz1+gsBXIKbtY3GtRMPqzBeOfs4= +go.opentelemetry.io/collector/model v0.37.1-0.20211015233822-bd87fb628058/go.mod h1:ESh1oWDNdS4fTg9sTFoYuiuvs8QuaX8yNGTPix3JZc8= go.opentelemetry.io/contrib/instrumentation/google.golang.org/grpc/otelgrpc v0.25.0/go.mod h1:E5NNboN0UqSAki0Atn9kVwaN7I+l25gGxDqBueo/74E= go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.25.0/go.mod h1:NyB05cd+yPX6W5SiRNuJ90w7PV2+g2cgRbsPL7MvpME= go.opentelemetry.io/contrib/zpages v0.25.0/go.mod h1:cXBK0CNcIBD9Iiw1Hv3DvS+E8N2rtr+k+OoPs+sP0T4= diff --git a/exporter/signalfxexporter/go.mod b/exporter/signalfxexporter/go.mod index 931dee61208e..870dca6edb40 100644 --- a/exporter/signalfxexporter/go.mod +++ b/exporter/signalfxexporter/go.mod @@ -13,8 +13,8 @@ require ( github.com/signalfx/com_signalfx_metrics_protobuf v0.0.2 github.com/signalfx/signalfx-agent/pkg/apm v0.0.0-20201202163743-65b4fa925fc8 github.com/stretchr/testify v1.7.0 - go.opentelemetry.io/collector v0.37.0 - go.opentelemetry.io/collector/model v0.37.0 + go.opentelemetry.io/collector v0.37.1-0.20211015233822-bd87fb628058 + go.opentelemetry.io/collector/model v0.37.1-0.20211015233822-bd87fb628058 go.uber.org/multierr v1.7.0 go.uber.org/zap v1.19.1 ) @@ -43,7 +43,6 @@ require ( github.com/signalfx/gohistogram v0.0.0-20160107210732-1ccfd2ff5083 // indirect github.com/signalfx/golib/v3 v3.3.13 // indirect github.com/signalfx/sapm-proto v0.4.0 // indirect - github.com/smartystreets/goconvey v1.6.4 // indirect github.com/spf13/cast v1.4.1 // indirect github.com/tklauser/go-sysconf v0.3.9 // indirect github.com/tklauser/numcpus v0.3.0 // indirect diff --git a/exporter/signalfxexporter/go.sum b/exporter/signalfxexporter/go.sum index b14eddf684cd..c668d1c4470a 100644 --- a/exporter/signalfxexporter/go.sum +++ b/exporter/signalfxexporter/go.sum @@ -821,10 +821,11 @@ go.opencensus.io v0.22.4/go.mod h1:yxeiOL68Rb0Xd1ddK5vPZ/oVn4vY4Ynel7k9FzqtOIw= go.opencensus.io v0.22.5/go.mod h1:5pWMHQbX5EPX2/62yrJeAkowc+lfs/XD7Uxpq3pI6kk= go.opencensus.io v0.23.0 h1:gqCw0LfLxScz8irSi8exQc7fyQ0fKQU/qnC/X8+V/1M= go.opencensus.io v0.23.0/go.mod h1:XItmlyltB5F7CS4xOC1DcqMoFqwtC6OG2xF7mCv7P7E= -go.opentelemetry.io/collector v0.37.0 h1:X83+uWk11kW83BTkdKNt1Sk7gXyRv36wA6piT0FYfME= -go.opentelemetry.io/collector v0.37.0/go.mod h1:zbLWBJVy7bmiZHlHjCrV28vxXA/sAkCLtH5thD8ZahA= -go.opentelemetry.io/collector/model v0.37.0 h1:K1G6bgzBZ5kKSjZ1+EY9MhCOYsac4Q1K85fBUgpTVH8= +go.opentelemetry.io/collector v0.37.1-0.20211015233822-bd87fb628058 h1:6v0ba4ruY/W2cJLElDZEHDwShlSWUjK2MiBMvwfAIN0= +go.opentelemetry.io/collector v0.37.1-0.20211015233822-bd87fb628058/go.mod h1:zbLWBJVy7bmiZHlHjCrV28vxXA/sAkCLtH5thD8ZahA= go.opentelemetry.io/collector/model v0.37.0/go.mod h1:ESh1oWDNdS4fTg9sTFoYuiuvs8QuaX8yNGTPix3JZc8= +go.opentelemetry.io/collector/model v0.37.1-0.20211015233822-bd87fb628058 h1:jDw0pFIkDbvNRkkdCz1+gsBXIKbtY3GtRMPqzBeOfs4= +go.opentelemetry.io/collector/model v0.37.1-0.20211015233822-bd87fb628058/go.mod h1:ESh1oWDNdS4fTg9sTFoYuiuvs8QuaX8yNGTPix3JZc8= go.opentelemetry.io/contrib/instrumentation/google.golang.org/grpc/otelgrpc v0.25.0/go.mod h1:E5NNboN0UqSAki0Atn9kVwaN7I+l25gGxDqBueo/74E= go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.25.0 h1:FIbb8m2PtTWjvXLHOEnXAoSmkaiXbg3fuvoZAjsAT3Q= go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.25.0/go.mod h1:NyB05cd+yPX6W5SiRNuJ90w7PV2+g2cgRbsPL7MvpME= diff --git a/exporter/skywalkingexporter/go.mod b/exporter/skywalkingexporter/go.mod index f2b7d757be1c..adb8cd0702ae 100644 --- a/exporter/skywalkingexporter/go.mod +++ b/exporter/skywalkingexporter/go.mod @@ -4,8 +4,8 @@ go 1.17 require ( github.com/stretchr/testify v1.7.0 - go.opentelemetry.io/collector v0.37.0 - go.opentelemetry.io/collector/model v0.37.0 + go.opentelemetry.io/collector v0.37.1-0.20211015233822-bd87fb628058 + go.opentelemetry.io/collector/model v0.37.1-0.20211015233822-bd87fb628058 ) require ( diff --git a/exporter/skywalkingexporter/go.sum b/exporter/skywalkingexporter/go.sum index da2070e241d1..1dcfa0455642 100644 --- a/exporter/skywalkingexporter/go.sum +++ b/exporter/skywalkingexporter/go.sum @@ -377,10 +377,11 @@ go.opencensus.io v0.22.4/go.mod h1:yxeiOL68Rb0Xd1ddK5vPZ/oVn4vY4Ynel7k9FzqtOIw= go.opencensus.io v0.22.5/go.mod h1:5pWMHQbX5EPX2/62yrJeAkowc+lfs/XD7Uxpq3pI6kk= go.opencensus.io v0.23.0 h1:gqCw0LfLxScz8irSi8exQc7fyQ0fKQU/qnC/X8+V/1M= go.opencensus.io v0.23.0/go.mod h1:XItmlyltB5F7CS4xOC1DcqMoFqwtC6OG2xF7mCv7P7E= -go.opentelemetry.io/collector v0.37.0 h1:X83+uWk11kW83BTkdKNt1Sk7gXyRv36wA6piT0FYfME= -go.opentelemetry.io/collector v0.37.0/go.mod h1:zbLWBJVy7bmiZHlHjCrV28vxXA/sAkCLtH5thD8ZahA= -go.opentelemetry.io/collector/model v0.37.0 h1:K1G6bgzBZ5kKSjZ1+EY9MhCOYsac4Q1K85fBUgpTVH8= +go.opentelemetry.io/collector v0.37.1-0.20211015233822-bd87fb628058 h1:6v0ba4ruY/W2cJLElDZEHDwShlSWUjK2MiBMvwfAIN0= +go.opentelemetry.io/collector v0.37.1-0.20211015233822-bd87fb628058/go.mod h1:zbLWBJVy7bmiZHlHjCrV28vxXA/sAkCLtH5thD8ZahA= go.opentelemetry.io/collector/model v0.37.0/go.mod h1:ESh1oWDNdS4fTg9sTFoYuiuvs8QuaX8yNGTPix3JZc8= +go.opentelemetry.io/collector/model v0.37.1-0.20211015233822-bd87fb628058 h1:jDw0pFIkDbvNRkkdCz1+gsBXIKbtY3GtRMPqzBeOfs4= +go.opentelemetry.io/collector/model v0.37.1-0.20211015233822-bd87fb628058/go.mod h1:ESh1oWDNdS4fTg9sTFoYuiuvs8QuaX8yNGTPix3JZc8= go.opentelemetry.io/contrib/instrumentation/google.golang.org/grpc/otelgrpc v0.25.0 h1:Wx7nFnvCaissIUZxPkBqDz2963Z+Cl+PkYbDKzTxDqQ= go.opentelemetry.io/contrib/instrumentation/google.golang.org/grpc/otelgrpc v0.25.0/go.mod h1:E5NNboN0UqSAki0Atn9kVwaN7I+l25gGxDqBueo/74E= go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.25.0/go.mod h1:NyB05cd+yPX6W5SiRNuJ90w7PV2+g2cgRbsPL7MvpME= diff --git a/exporter/splunkhecexporter/go.mod b/exporter/splunkhecexporter/go.mod index f02855644b5f..b5d90981df23 100644 --- a/exporter/splunkhecexporter/go.mod +++ b/exporter/splunkhecexporter/go.mod @@ -8,8 +8,8 @@ require ( github.com/open-telemetry/opentelemetry-collector-contrib/internal/splunk v0.37.1 github.com/open-telemetry/opentelemetry-collector-contrib/pkg/translator/opencensus v0.37.1 github.com/stretchr/testify v1.7.0 - go.opentelemetry.io/collector v0.37.0 - go.opentelemetry.io/collector/model v0.37.0 + go.opentelemetry.io/collector v0.37.1-0.20211015233822-bd87fb628058 + go.opentelemetry.io/collector/model v0.37.1-0.20211015233822-bd87fb628058 go.uber.org/multierr v1.7.0 go.uber.org/zap v1.19.1 google.golang.org/protobuf v1.27.1 diff --git a/exporter/splunkhecexporter/go.sum b/exporter/splunkhecexporter/go.sum index 755c39eedf57..3c3eefd4dcf5 100644 --- a/exporter/splunkhecexporter/go.sum +++ b/exporter/splunkhecexporter/go.sum @@ -391,10 +391,11 @@ go.opencensus.io v0.22.4/go.mod h1:yxeiOL68Rb0Xd1ddK5vPZ/oVn4vY4Ynel7k9FzqtOIw= go.opencensus.io v0.22.5/go.mod h1:5pWMHQbX5EPX2/62yrJeAkowc+lfs/XD7Uxpq3pI6kk= go.opencensus.io v0.23.0 h1:gqCw0LfLxScz8irSi8exQc7fyQ0fKQU/qnC/X8+V/1M= go.opencensus.io v0.23.0/go.mod h1:XItmlyltB5F7CS4xOC1DcqMoFqwtC6OG2xF7mCv7P7E= -go.opentelemetry.io/collector v0.37.0 h1:X83+uWk11kW83BTkdKNt1Sk7gXyRv36wA6piT0FYfME= -go.opentelemetry.io/collector v0.37.0/go.mod h1:zbLWBJVy7bmiZHlHjCrV28vxXA/sAkCLtH5thD8ZahA= -go.opentelemetry.io/collector/model v0.37.0 h1:K1G6bgzBZ5kKSjZ1+EY9MhCOYsac4Q1K85fBUgpTVH8= +go.opentelemetry.io/collector v0.37.1-0.20211015233822-bd87fb628058 h1:6v0ba4ruY/W2cJLElDZEHDwShlSWUjK2MiBMvwfAIN0= +go.opentelemetry.io/collector v0.37.1-0.20211015233822-bd87fb628058/go.mod h1:zbLWBJVy7bmiZHlHjCrV28vxXA/sAkCLtH5thD8ZahA= go.opentelemetry.io/collector/model v0.37.0/go.mod h1:ESh1oWDNdS4fTg9sTFoYuiuvs8QuaX8yNGTPix3JZc8= +go.opentelemetry.io/collector/model v0.37.1-0.20211015233822-bd87fb628058 h1:jDw0pFIkDbvNRkkdCz1+gsBXIKbtY3GtRMPqzBeOfs4= +go.opentelemetry.io/collector/model v0.37.1-0.20211015233822-bd87fb628058/go.mod h1:ESh1oWDNdS4fTg9sTFoYuiuvs8QuaX8yNGTPix3JZc8= go.opentelemetry.io/contrib/instrumentation/google.golang.org/grpc/otelgrpc v0.25.0/go.mod h1:E5NNboN0UqSAki0Atn9kVwaN7I+l25gGxDqBueo/74E= go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.25.0/go.mod h1:NyB05cd+yPX6W5SiRNuJ90w7PV2+g2cgRbsPL7MvpME= go.opentelemetry.io/contrib/zpages v0.25.0/go.mod h1:cXBK0CNcIBD9Iiw1Hv3DvS+E8N2rtr+k+OoPs+sP0T4= diff --git a/exporter/stackdriverexporter/go.mod b/exporter/stackdriverexporter/go.mod index 5abe7f54c3f2..c9ec17187c96 100644 --- a/exporter/stackdriverexporter/go.mod +++ b/exporter/stackdriverexporter/go.mod @@ -5,7 +5,7 @@ go 1.17 require ( github.com/open-telemetry/opentelemetry-collector-contrib/exporter/googlecloudexporter v0.37.1 github.com/stretchr/testify v1.7.0 - go.opentelemetry.io/collector v0.37.0 + go.opentelemetry.io/collector v0.37.1-0.20211015233822-bd87fb628058 go.uber.org/zap v1.19.1 ) @@ -37,7 +37,7 @@ require ( github.com/pmezard/go-difflib v1.0.0 // indirect github.com/spf13/cast v1.4.1 // indirect go.opencensus.io v0.23.0 // indirect - go.opentelemetry.io/collector/model v0.37.0 // indirect + go.opentelemetry.io/collector/model v0.37.1-0.20211015233822-bd87fb628058 // indirect go.opentelemetry.io/otel v1.0.1 // indirect go.opentelemetry.io/otel/metric v0.24.0 // indirect go.opentelemetry.io/otel/sdk v1.0.1 // indirect diff --git a/exporter/stackdriverexporter/go.sum b/exporter/stackdriverexporter/go.sum index b9919b59b689..09c9fd462a13 100644 --- a/exporter/stackdriverexporter/go.sum +++ b/exporter/stackdriverexporter/go.sum @@ -432,10 +432,11 @@ go.opencensus.io v0.22.5/go.mod h1:5pWMHQbX5EPX2/62yrJeAkowc+lfs/XD7Uxpq3pI6kk= go.opencensus.io v0.22.6/go.mod h1:XItmlyltB5F7CS4xOC1DcqMoFqwtC6OG2xF7mCv7P7E= go.opencensus.io v0.23.0 h1:gqCw0LfLxScz8irSi8exQc7fyQ0fKQU/qnC/X8+V/1M= go.opencensus.io v0.23.0/go.mod h1:XItmlyltB5F7CS4xOC1DcqMoFqwtC6OG2xF7mCv7P7E= -go.opentelemetry.io/collector v0.37.0 h1:X83+uWk11kW83BTkdKNt1Sk7gXyRv36wA6piT0FYfME= -go.opentelemetry.io/collector v0.37.0/go.mod h1:zbLWBJVy7bmiZHlHjCrV28vxXA/sAkCLtH5thD8ZahA= -go.opentelemetry.io/collector/model v0.37.0 h1:K1G6bgzBZ5kKSjZ1+EY9MhCOYsac4Q1K85fBUgpTVH8= +go.opentelemetry.io/collector v0.37.1-0.20211015233822-bd87fb628058 h1:6v0ba4ruY/W2cJLElDZEHDwShlSWUjK2MiBMvwfAIN0= +go.opentelemetry.io/collector v0.37.1-0.20211015233822-bd87fb628058/go.mod h1:zbLWBJVy7bmiZHlHjCrV28vxXA/sAkCLtH5thD8ZahA= go.opentelemetry.io/collector/model v0.37.0/go.mod h1:ESh1oWDNdS4fTg9sTFoYuiuvs8QuaX8yNGTPix3JZc8= +go.opentelemetry.io/collector/model v0.37.1-0.20211015233822-bd87fb628058 h1:jDw0pFIkDbvNRkkdCz1+gsBXIKbtY3GtRMPqzBeOfs4= +go.opentelemetry.io/collector/model v0.37.1-0.20211015233822-bd87fb628058/go.mod h1:ESh1oWDNdS4fTg9sTFoYuiuvs8QuaX8yNGTPix3JZc8= go.opentelemetry.io/contrib v0.21.0 h1:RMJ6GlUVzLYp/zmItxTTdAmr1gnpO/HHMFmvjAhvJQM= go.opentelemetry.io/contrib v0.21.0/go.mod h1:EH4yDYeNoaTqn/8yCWQmfNB78VHfGX2Jt2bvnvzBlGM= go.opentelemetry.io/contrib/instrumentation/google.golang.org/grpc/otelgrpc v0.25.0/go.mod h1:E5NNboN0UqSAki0Atn9kVwaN7I+l25gGxDqBueo/74E= diff --git a/exporter/sumologicexporter/go.mod b/exporter/sumologicexporter/go.mod index 7796133d0a19..9be1357be7a5 100644 --- a/exporter/sumologicexporter/go.mod +++ b/exporter/sumologicexporter/go.mod @@ -4,8 +4,8 @@ go 1.17 require ( github.com/stretchr/testify v1.7.0 - go.opentelemetry.io/collector v0.37.0 - go.opentelemetry.io/collector/model v0.37.0 + go.opentelemetry.io/collector v0.37.1-0.20211015233822-bd87fb628058 + go.opentelemetry.io/collector/model v0.37.1-0.20211015233822-bd87fb628058 go.uber.org/multierr v1.7.0 ) diff --git a/exporter/sumologicexporter/go.sum b/exporter/sumologicexporter/go.sum index c8ae169e1249..06c186b3a72a 100644 --- a/exporter/sumologicexporter/go.sum +++ b/exporter/sumologicexporter/go.sum @@ -376,10 +376,11 @@ go.opencensus.io v0.22.4/go.mod h1:yxeiOL68Rb0Xd1ddK5vPZ/oVn4vY4Ynel7k9FzqtOIw= go.opencensus.io v0.22.5/go.mod h1:5pWMHQbX5EPX2/62yrJeAkowc+lfs/XD7Uxpq3pI6kk= go.opencensus.io v0.23.0 h1:gqCw0LfLxScz8irSi8exQc7fyQ0fKQU/qnC/X8+V/1M= go.opencensus.io v0.23.0/go.mod h1:XItmlyltB5F7CS4xOC1DcqMoFqwtC6OG2xF7mCv7P7E= -go.opentelemetry.io/collector v0.37.0 h1:X83+uWk11kW83BTkdKNt1Sk7gXyRv36wA6piT0FYfME= -go.opentelemetry.io/collector v0.37.0/go.mod h1:zbLWBJVy7bmiZHlHjCrV28vxXA/sAkCLtH5thD8ZahA= -go.opentelemetry.io/collector/model v0.37.0 h1:K1G6bgzBZ5kKSjZ1+EY9MhCOYsac4Q1K85fBUgpTVH8= +go.opentelemetry.io/collector v0.37.1-0.20211015233822-bd87fb628058 h1:6v0ba4ruY/W2cJLElDZEHDwShlSWUjK2MiBMvwfAIN0= +go.opentelemetry.io/collector v0.37.1-0.20211015233822-bd87fb628058/go.mod h1:zbLWBJVy7bmiZHlHjCrV28vxXA/sAkCLtH5thD8ZahA= go.opentelemetry.io/collector/model v0.37.0/go.mod h1:ESh1oWDNdS4fTg9sTFoYuiuvs8QuaX8yNGTPix3JZc8= +go.opentelemetry.io/collector/model v0.37.1-0.20211015233822-bd87fb628058 h1:jDw0pFIkDbvNRkkdCz1+gsBXIKbtY3GtRMPqzBeOfs4= +go.opentelemetry.io/collector/model v0.37.1-0.20211015233822-bd87fb628058/go.mod h1:ESh1oWDNdS4fTg9sTFoYuiuvs8QuaX8yNGTPix3JZc8= go.opentelemetry.io/contrib/instrumentation/google.golang.org/grpc/otelgrpc v0.25.0/go.mod h1:E5NNboN0UqSAki0Atn9kVwaN7I+l25gGxDqBueo/74E= go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.25.0 h1:FIbb8m2PtTWjvXLHOEnXAoSmkaiXbg3fuvoZAjsAT3Q= go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.25.0/go.mod h1:NyB05cd+yPX6W5SiRNuJ90w7PV2+g2cgRbsPL7MvpME= diff --git a/exporter/tanzuobservabilityexporter/go.mod b/exporter/tanzuobservabilityexporter/go.mod index b0bdfc81439d..5682a6b9c0ce 100644 --- a/exporter/tanzuobservabilityexporter/go.mod +++ b/exporter/tanzuobservabilityexporter/go.mod @@ -7,8 +7,8 @@ require ( github.com/open-telemetry/opentelemetry-collector-contrib/internal/coreinternal v0.37.1 github.com/stretchr/testify v1.7.0 github.com/wavefronthq/wavefront-sdk-go v0.9.9 - go.opentelemetry.io/collector v0.37.0 - go.opentelemetry.io/collector/model v0.37.0 + go.opentelemetry.io/collector v0.37.1-0.20211015233822-bd87fb628058 + go.opentelemetry.io/collector/model v0.37.1-0.20211015233822-bd87fb628058 go.uber.org/multierr v1.7.0 go.uber.org/zap v1.19.1 ) diff --git a/exporter/tanzuobservabilityexporter/go.sum b/exporter/tanzuobservabilityexporter/go.sum index c8023f82bbbf..856202076ce9 100644 --- a/exporter/tanzuobservabilityexporter/go.sum +++ b/exporter/tanzuobservabilityexporter/go.sum @@ -402,10 +402,11 @@ go.opencensus.io v0.22.4/go.mod h1:yxeiOL68Rb0Xd1ddK5vPZ/oVn4vY4Ynel7k9FzqtOIw= go.opencensus.io v0.22.5/go.mod h1:5pWMHQbX5EPX2/62yrJeAkowc+lfs/XD7Uxpq3pI6kk= go.opencensus.io v0.23.0 h1:gqCw0LfLxScz8irSi8exQc7fyQ0fKQU/qnC/X8+V/1M= go.opencensus.io v0.23.0/go.mod h1:XItmlyltB5F7CS4xOC1DcqMoFqwtC6OG2xF7mCv7P7E= -go.opentelemetry.io/collector v0.37.0 h1:X83+uWk11kW83BTkdKNt1Sk7gXyRv36wA6piT0FYfME= -go.opentelemetry.io/collector v0.37.0/go.mod h1:zbLWBJVy7bmiZHlHjCrV28vxXA/sAkCLtH5thD8ZahA= -go.opentelemetry.io/collector/model v0.37.0 h1:K1G6bgzBZ5kKSjZ1+EY9MhCOYsac4Q1K85fBUgpTVH8= +go.opentelemetry.io/collector v0.37.1-0.20211015233822-bd87fb628058 h1:6v0ba4ruY/W2cJLElDZEHDwShlSWUjK2MiBMvwfAIN0= +go.opentelemetry.io/collector v0.37.1-0.20211015233822-bd87fb628058/go.mod h1:zbLWBJVy7bmiZHlHjCrV28vxXA/sAkCLtH5thD8ZahA= go.opentelemetry.io/collector/model v0.37.0/go.mod h1:ESh1oWDNdS4fTg9sTFoYuiuvs8QuaX8yNGTPix3JZc8= +go.opentelemetry.io/collector/model v0.37.1-0.20211015233822-bd87fb628058 h1:jDw0pFIkDbvNRkkdCz1+gsBXIKbtY3GtRMPqzBeOfs4= +go.opentelemetry.io/collector/model v0.37.1-0.20211015233822-bd87fb628058/go.mod h1:ESh1oWDNdS4fTg9sTFoYuiuvs8QuaX8yNGTPix3JZc8= go.opentelemetry.io/contrib/instrumentation/google.golang.org/grpc/otelgrpc v0.25.0/go.mod h1:E5NNboN0UqSAki0Atn9kVwaN7I+l25gGxDqBueo/74E= go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.25.0 h1:FIbb8m2PtTWjvXLHOEnXAoSmkaiXbg3fuvoZAjsAT3Q= go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.25.0/go.mod h1:NyB05cd+yPX6W5SiRNuJ90w7PV2+g2cgRbsPL7MvpME= diff --git a/exporter/zipkinexporter/go.mod b/exporter/zipkinexporter/go.mod index 72a38151ff44..498dc904f6a4 100644 --- a/exporter/zipkinexporter/go.mod +++ b/exporter/zipkinexporter/go.mod @@ -8,8 +8,8 @@ require ( github.com/open-telemetry/opentelemetry-collector-contrib/receiver/zipkinreceiver v0.37.1 github.com/openzipkin/zipkin-go v0.2.5 github.com/stretchr/testify v1.7.0 - go.opentelemetry.io/collector v0.37.0 - go.opentelemetry.io/collector/model v0.37.0 + go.opentelemetry.io/collector v0.37.1-0.20211015233822-bd87fb628058 + go.opentelemetry.io/collector/model v0.37.1-0.20211015233822-bd87fb628058 ) require ( diff --git a/exporter/zipkinexporter/go.sum b/exporter/zipkinexporter/go.sum index cf7d9e6eea13..7b41a30afce2 100644 --- a/exporter/zipkinexporter/go.sum +++ b/exporter/zipkinexporter/go.sum @@ -756,11 +756,12 @@ go.opencensus.io v0.22.4/go.mod h1:yxeiOL68Rb0Xd1ddK5vPZ/oVn4vY4Ynel7k9FzqtOIw= go.opencensus.io v0.22.5/go.mod h1:5pWMHQbX5EPX2/62yrJeAkowc+lfs/XD7Uxpq3pI6kk= go.opencensus.io v0.23.0 h1:gqCw0LfLxScz8irSi8exQc7fyQ0fKQU/qnC/X8+V/1M= go.opencensus.io v0.23.0/go.mod h1:XItmlyltB5F7CS4xOC1DcqMoFqwtC6OG2xF7mCv7P7E= -go.opentelemetry.io/collector v0.37.0 h1:X83+uWk11kW83BTkdKNt1Sk7gXyRv36wA6piT0FYfME= -go.opentelemetry.io/collector v0.37.0/go.mod h1:zbLWBJVy7bmiZHlHjCrV28vxXA/sAkCLtH5thD8ZahA= +go.opentelemetry.io/collector v0.37.1-0.20211015233822-bd87fb628058 h1:6v0ba4ruY/W2cJLElDZEHDwShlSWUjK2MiBMvwfAIN0= +go.opentelemetry.io/collector v0.37.1-0.20211015233822-bd87fb628058/go.mod h1:zbLWBJVy7bmiZHlHjCrV28vxXA/sAkCLtH5thD8ZahA= go.opentelemetry.io/collector/model v0.36.0/go.mod h1:+7YCSjJG+MqiIFjauzt7oM2qkqBsaJWh5hcsO4fwsAc= -go.opentelemetry.io/collector/model v0.37.0 h1:K1G6bgzBZ5kKSjZ1+EY9MhCOYsac4Q1K85fBUgpTVH8= go.opentelemetry.io/collector/model v0.37.0/go.mod h1:ESh1oWDNdS4fTg9sTFoYuiuvs8QuaX8yNGTPix3JZc8= +go.opentelemetry.io/collector/model v0.37.1-0.20211015233822-bd87fb628058 h1:jDw0pFIkDbvNRkkdCz1+gsBXIKbtY3GtRMPqzBeOfs4= +go.opentelemetry.io/collector/model v0.37.1-0.20211015233822-bd87fb628058/go.mod h1:ESh1oWDNdS4fTg9sTFoYuiuvs8QuaX8yNGTPix3JZc8= go.opentelemetry.io/contrib/instrumentation/google.golang.org/grpc/otelgrpc v0.25.0/go.mod h1:E5NNboN0UqSAki0Atn9kVwaN7I+l25gGxDqBueo/74E= go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.25.0 h1:FIbb8m2PtTWjvXLHOEnXAoSmkaiXbg3fuvoZAjsAT3Q= go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.25.0/go.mod h1:NyB05cd+yPX6W5SiRNuJ90w7PV2+g2cgRbsPL7MvpME= diff --git a/extension/awsxrayproxy/go.mod b/extension/awsxrayproxy/go.mod index 83312b00fe29..e8498dca7959 100644 --- a/extension/awsxrayproxy/go.mod +++ b/extension/awsxrayproxy/go.mod @@ -6,7 +6,7 @@ require ( github.com/open-telemetry/opentelemetry-collector-contrib/internal/aws/proxy v0.37.1 github.com/open-telemetry/opentelemetry-collector-contrib/internal/coreinternal v0.37.1 github.com/stretchr/testify v1.7.0 - go.opentelemetry.io/collector v0.37.0 + go.opentelemetry.io/collector v0.37.1-0.20211015233822-bd87fb628058 go.uber.org/zap v1.19.1 ) @@ -24,7 +24,7 @@ require ( github.com/mitchellh/reflectwalk v1.0.2 // indirect github.com/pmezard/go-difflib v1.0.0 // indirect github.com/spf13/cast v1.4.1 // indirect - go.opentelemetry.io/collector/model v0.37.0 // indirect + go.opentelemetry.io/collector/model v0.37.1-0.20211015233822-bd87fb628058 // indirect go.opentelemetry.io/otel v1.0.1 // indirect go.opentelemetry.io/otel/metric v0.24.0 // indirect go.opentelemetry.io/otel/trace v1.0.1 // indirect diff --git a/extension/awsxrayproxy/go.sum b/extension/awsxrayproxy/go.sum index 02ab82ebf3c1..62d7c24c1ad4 100644 --- a/extension/awsxrayproxy/go.sum +++ b/extension/awsxrayproxy/go.sum @@ -394,10 +394,11 @@ go.opencensus.io v0.22.4/go.mod h1:yxeiOL68Rb0Xd1ddK5vPZ/oVn4vY4Ynel7k9FzqtOIw= go.opencensus.io v0.22.5/go.mod h1:5pWMHQbX5EPX2/62yrJeAkowc+lfs/XD7Uxpq3pI6kk= go.opencensus.io v0.23.0 h1:gqCw0LfLxScz8irSi8exQc7fyQ0fKQU/qnC/X8+V/1M= go.opencensus.io v0.23.0/go.mod h1:XItmlyltB5F7CS4xOC1DcqMoFqwtC6OG2xF7mCv7P7E= -go.opentelemetry.io/collector v0.37.0 h1:X83+uWk11kW83BTkdKNt1Sk7gXyRv36wA6piT0FYfME= -go.opentelemetry.io/collector v0.37.0/go.mod h1:zbLWBJVy7bmiZHlHjCrV28vxXA/sAkCLtH5thD8ZahA= -go.opentelemetry.io/collector/model v0.37.0 h1:K1G6bgzBZ5kKSjZ1+EY9MhCOYsac4Q1K85fBUgpTVH8= +go.opentelemetry.io/collector v0.37.1-0.20211015233822-bd87fb628058 h1:6v0ba4ruY/W2cJLElDZEHDwShlSWUjK2MiBMvwfAIN0= +go.opentelemetry.io/collector v0.37.1-0.20211015233822-bd87fb628058/go.mod h1:zbLWBJVy7bmiZHlHjCrV28vxXA/sAkCLtH5thD8ZahA= go.opentelemetry.io/collector/model v0.37.0/go.mod h1:ESh1oWDNdS4fTg9sTFoYuiuvs8QuaX8yNGTPix3JZc8= +go.opentelemetry.io/collector/model v0.37.1-0.20211015233822-bd87fb628058 h1:jDw0pFIkDbvNRkkdCz1+gsBXIKbtY3GtRMPqzBeOfs4= +go.opentelemetry.io/collector/model v0.37.1-0.20211015233822-bd87fb628058/go.mod h1:ESh1oWDNdS4fTg9sTFoYuiuvs8QuaX8yNGTPix3JZc8= go.opentelemetry.io/contrib/instrumentation/google.golang.org/grpc/otelgrpc v0.25.0/go.mod h1:E5NNboN0UqSAki0Atn9kVwaN7I+l25gGxDqBueo/74E= go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.25.0/go.mod h1:NyB05cd+yPX6W5SiRNuJ90w7PV2+g2cgRbsPL7MvpME= go.opentelemetry.io/contrib/zpages v0.25.0/go.mod h1:cXBK0CNcIBD9Iiw1Hv3DvS+E8N2rtr+k+OoPs+sP0T4= diff --git a/extension/bearertokenauthextension/go.mod b/extension/bearertokenauthextension/go.mod index 4ab1034cb700..0bbfab952a8d 100644 --- a/extension/bearertokenauthextension/go.mod +++ b/extension/bearertokenauthextension/go.mod @@ -4,7 +4,7 @@ go 1.17 require ( github.com/stretchr/testify v1.7.0 - go.opentelemetry.io/collector v0.37.0 + go.opentelemetry.io/collector v0.37.1-0.20211015233822-bd87fb628058 go.uber.org/zap v1.19.1 google.golang.org/grpc v1.41.0 ) @@ -24,7 +24,7 @@ require ( github.com/pmezard/go-difflib v1.0.0 // indirect github.com/rogpeppe/go-internal v1.6.1 // indirect github.com/spf13/cast v1.4.1 // indirect - go.opentelemetry.io/collector/model v0.37.0 // indirect + go.opentelemetry.io/collector/model v0.37.1-0.20211015233822-bd87fb628058 // indirect go.opentelemetry.io/otel v1.0.1 // indirect go.opentelemetry.io/otel/metric v0.24.0 // indirect go.opentelemetry.io/otel/trace v1.0.1 // indirect diff --git a/extension/bearertokenauthextension/go.sum b/extension/bearertokenauthextension/go.sum index 1c27989fc032..cd0f7a222fd4 100644 --- a/extension/bearertokenauthextension/go.sum +++ b/extension/bearertokenauthextension/go.sum @@ -373,10 +373,11 @@ go.opencensus.io v0.22.4/go.mod h1:yxeiOL68Rb0Xd1ddK5vPZ/oVn4vY4Ynel7k9FzqtOIw= go.opencensus.io v0.22.5/go.mod h1:5pWMHQbX5EPX2/62yrJeAkowc+lfs/XD7Uxpq3pI6kk= go.opencensus.io v0.23.0 h1:gqCw0LfLxScz8irSi8exQc7fyQ0fKQU/qnC/X8+V/1M= go.opencensus.io v0.23.0/go.mod h1:XItmlyltB5F7CS4xOC1DcqMoFqwtC6OG2xF7mCv7P7E= -go.opentelemetry.io/collector v0.37.0 h1:X83+uWk11kW83BTkdKNt1Sk7gXyRv36wA6piT0FYfME= -go.opentelemetry.io/collector v0.37.0/go.mod h1:zbLWBJVy7bmiZHlHjCrV28vxXA/sAkCLtH5thD8ZahA= -go.opentelemetry.io/collector/model v0.37.0 h1:K1G6bgzBZ5kKSjZ1+EY9MhCOYsac4Q1K85fBUgpTVH8= +go.opentelemetry.io/collector v0.37.1-0.20211015233822-bd87fb628058 h1:6v0ba4ruY/W2cJLElDZEHDwShlSWUjK2MiBMvwfAIN0= +go.opentelemetry.io/collector v0.37.1-0.20211015233822-bd87fb628058/go.mod h1:zbLWBJVy7bmiZHlHjCrV28vxXA/sAkCLtH5thD8ZahA= go.opentelemetry.io/collector/model v0.37.0/go.mod h1:ESh1oWDNdS4fTg9sTFoYuiuvs8QuaX8yNGTPix3JZc8= +go.opentelemetry.io/collector/model v0.37.1-0.20211015233822-bd87fb628058 h1:jDw0pFIkDbvNRkkdCz1+gsBXIKbtY3GtRMPqzBeOfs4= +go.opentelemetry.io/collector/model v0.37.1-0.20211015233822-bd87fb628058/go.mod h1:ESh1oWDNdS4fTg9sTFoYuiuvs8QuaX8yNGTPix3JZc8= go.opentelemetry.io/contrib/instrumentation/google.golang.org/grpc/otelgrpc v0.25.0/go.mod h1:E5NNboN0UqSAki0Atn9kVwaN7I+l25gGxDqBueo/74E= go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.25.0/go.mod h1:NyB05cd+yPX6W5SiRNuJ90w7PV2+g2cgRbsPL7MvpME= go.opentelemetry.io/contrib/zpages v0.25.0/go.mod h1:cXBK0CNcIBD9Iiw1Hv3DvS+E8N2rtr+k+OoPs+sP0T4= diff --git a/extension/fluentbitextension/go.mod b/extension/fluentbitextension/go.mod index acc7d86cd77e..13ae385cb401 100644 --- a/extension/fluentbitextension/go.mod +++ b/extension/fluentbitextension/go.mod @@ -6,7 +6,7 @@ require ( github.com/davecgh/go-spew v1.1.1 github.com/shirou/gopsutil/v3 v3.21.9 github.com/stretchr/testify v1.7.0 - go.opentelemetry.io/collector v0.37.0 + go.opentelemetry.io/collector v0.37.1-0.20211015233822-bd87fb628058 go.uber.org/zap v1.19.1 ) @@ -29,7 +29,7 @@ require ( github.com/spf13/cast v1.4.1 // indirect github.com/tklauser/go-sysconf v0.3.9 // indirect github.com/tklauser/numcpus v0.3.0 // indirect - go.opentelemetry.io/collector/model v0.37.0 // indirect + go.opentelemetry.io/collector/model v0.37.1-0.20211015233822-bd87fb628058 // indirect go.opentelemetry.io/otel v1.0.1 // indirect go.opentelemetry.io/otel/metric v0.24.0 // indirect go.opentelemetry.io/otel/trace v1.0.1 // indirect diff --git a/extension/fluentbitextension/go.sum b/extension/fluentbitextension/go.sum index b692e5838df0..1d8b594a81b9 100644 --- a/extension/fluentbitextension/go.sum +++ b/extension/fluentbitextension/go.sum @@ -378,10 +378,11 @@ go.opencensus.io v0.22.4/go.mod h1:yxeiOL68Rb0Xd1ddK5vPZ/oVn4vY4Ynel7k9FzqtOIw= go.opencensus.io v0.22.5/go.mod h1:5pWMHQbX5EPX2/62yrJeAkowc+lfs/XD7Uxpq3pI6kk= go.opencensus.io v0.23.0 h1:gqCw0LfLxScz8irSi8exQc7fyQ0fKQU/qnC/X8+V/1M= go.opencensus.io v0.23.0/go.mod h1:XItmlyltB5F7CS4xOC1DcqMoFqwtC6OG2xF7mCv7P7E= -go.opentelemetry.io/collector v0.37.0 h1:X83+uWk11kW83BTkdKNt1Sk7gXyRv36wA6piT0FYfME= -go.opentelemetry.io/collector v0.37.0/go.mod h1:zbLWBJVy7bmiZHlHjCrV28vxXA/sAkCLtH5thD8ZahA= -go.opentelemetry.io/collector/model v0.37.0 h1:K1G6bgzBZ5kKSjZ1+EY9MhCOYsac4Q1K85fBUgpTVH8= +go.opentelemetry.io/collector v0.37.1-0.20211015233822-bd87fb628058 h1:6v0ba4ruY/W2cJLElDZEHDwShlSWUjK2MiBMvwfAIN0= +go.opentelemetry.io/collector v0.37.1-0.20211015233822-bd87fb628058/go.mod h1:zbLWBJVy7bmiZHlHjCrV28vxXA/sAkCLtH5thD8ZahA= go.opentelemetry.io/collector/model v0.37.0/go.mod h1:ESh1oWDNdS4fTg9sTFoYuiuvs8QuaX8yNGTPix3JZc8= +go.opentelemetry.io/collector/model v0.37.1-0.20211015233822-bd87fb628058 h1:jDw0pFIkDbvNRkkdCz1+gsBXIKbtY3GtRMPqzBeOfs4= +go.opentelemetry.io/collector/model v0.37.1-0.20211015233822-bd87fb628058/go.mod h1:ESh1oWDNdS4fTg9sTFoYuiuvs8QuaX8yNGTPix3JZc8= go.opentelemetry.io/contrib/instrumentation/google.golang.org/grpc/otelgrpc v0.25.0/go.mod h1:E5NNboN0UqSAki0Atn9kVwaN7I+l25gGxDqBueo/74E= go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.25.0/go.mod h1:NyB05cd+yPX6W5SiRNuJ90w7PV2+g2cgRbsPL7MvpME= go.opentelemetry.io/contrib/zpages v0.25.0/go.mod h1:cXBK0CNcIBD9Iiw1Hv3DvS+E8N2rtr+k+OoPs+sP0T4= diff --git a/extension/healthcheckextension/go.mod b/extension/healthcheckextension/go.mod index 1c1057589129..18503a27bc95 100644 --- a/extension/healthcheckextension/go.mod +++ b/extension/healthcheckextension/go.mod @@ -6,7 +6,7 @@ require ( github.com/jaegertracing/jaeger v1.27.0 github.com/open-telemetry/opentelemetry-collector-contrib/internal/coreinternal v0.37.1 github.com/stretchr/testify v1.7.0 - go.opentelemetry.io/collector v0.37.0 + go.opentelemetry.io/collector v0.37.1-0.20211015233822-bd87fb628058 go.uber.org/zap v1.19.1 ) @@ -23,7 +23,7 @@ require ( github.com/mitchellh/reflectwalk v1.0.2 // indirect github.com/pmezard/go-difflib v1.0.0 // indirect github.com/spf13/cast v1.4.1 // indirect - go.opentelemetry.io/collector/model v0.37.0 // indirect + go.opentelemetry.io/collector/model v0.37.1-0.20211015233822-bd87fb628058 // indirect go.opentelemetry.io/otel v1.0.1 // indirect go.opentelemetry.io/otel/metric v0.24.0 // indirect go.opentelemetry.io/otel/trace v1.0.1 // indirect diff --git a/extension/healthcheckextension/go.sum b/extension/healthcheckextension/go.sum index 3e3f44e9a1d3..e5e2121dc2ac 100644 --- a/extension/healthcheckextension/go.sum +++ b/extension/healthcheckextension/go.sum @@ -744,11 +744,12 @@ go.opencensus.io v0.22.4/go.mod h1:yxeiOL68Rb0Xd1ddK5vPZ/oVn4vY4Ynel7k9FzqtOIw= go.opencensus.io v0.22.5/go.mod h1:5pWMHQbX5EPX2/62yrJeAkowc+lfs/XD7Uxpq3pI6kk= go.opencensus.io v0.23.0 h1:gqCw0LfLxScz8irSi8exQc7fyQ0fKQU/qnC/X8+V/1M= go.opencensus.io v0.23.0/go.mod h1:XItmlyltB5F7CS4xOC1DcqMoFqwtC6OG2xF7mCv7P7E= -go.opentelemetry.io/collector v0.37.0 h1:X83+uWk11kW83BTkdKNt1Sk7gXyRv36wA6piT0FYfME= -go.opentelemetry.io/collector v0.37.0/go.mod h1:zbLWBJVy7bmiZHlHjCrV28vxXA/sAkCLtH5thD8ZahA= +go.opentelemetry.io/collector v0.37.1-0.20211015233822-bd87fb628058 h1:6v0ba4ruY/W2cJLElDZEHDwShlSWUjK2MiBMvwfAIN0= +go.opentelemetry.io/collector v0.37.1-0.20211015233822-bd87fb628058/go.mod h1:zbLWBJVy7bmiZHlHjCrV28vxXA/sAkCLtH5thD8ZahA= go.opentelemetry.io/collector/model v0.36.0/go.mod h1:+7YCSjJG+MqiIFjauzt7oM2qkqBsaJWh5hcsO4fwsAc= -go.opentelemetry.io/collector/model v0.37.0 h1:K1G6bgzBZ5kKSjZ1+EY9MhCOYsac4Q1K85fBUgpTVH8= go.opentelemetry.io/collector/model v0.37.0/go.mod h1:ESh1oWDNdS4fTg9sTFoYuiuvs8QuaX8yNGTPix3JZc8= +go.opentelemetry.io/collector/model v0.37.1-0.20211015233822-bd87fb628058 h1:jDw0pFIkDbvNRkkdCz1+gsBXIKbtY3GtRMPqzBeOfs4= +go.opentelemetry.io/collector/model v0.37.1-0.20211015233822-bd87fb628058/go.mod h1:ESh1oWDNdS4fTg9sTFoYuiuvs8QuaX8yNGTPix3JZc8= go.opentelemetry.io/contrib/instrumentation/google.golang.org/grpc/otelgrpc v0.25.0/go.mod h1:E5NNboN0UqSAki0Atn9kVwaN7I+l25gGxDqBueo/74E= go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.25.0/go.mod h1:NyB05cd+yPX6W5SiRNuJ90w7PV2+g2cgRbsPL7MvpME= go.opentelemetry.io/contrib/zpages v0.25.0/go.mod h1:cXBK0CNcIBD9Iiw1Hv3DvS+E8N2rtr+k+OoPs+sP0T4= diff --git a/extension/httpforwarder/go.mod b/extension/httpforwarder/go.mod index 7c836f16736a..265540ed2be3 100644 --- a/extension/httpforwarder/go.mod +++ b/extension/httpforwarder/go.mod @@ -5,7 +5,7 @@ go 1.17 require ( github.com/open-telemetry/opentelemetry-collector-contrib/internal/coreinternal v0.37.1 github.com/stretchr/testify v1.7.0 - go.opentelemetry.io/collector v0.37.0 + go.opentelemetry.io/collector v0.37.1-0.20211015233822-bd87fb628058 go.uber.org/zap v1.19.1 ) @@ -23,7 +23,7 @@ require ( github.com/pmezard/go-difflib v1.0.0 // indirect github.com/rs/cors v1.8.0 // indirect github.com/spf13/cast v1.4.1 // indirect - go.opentelemetry.io/collector/model v0.37.0 // indirect + go.opentelemetry.io/collector/model v0.37.1-0.20211015233822-bd87fb628058 // indirect go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.25.0 // indirect go.opentelemetry.io/otel v1.0.1 // indirect go.opentelemetry.io/otel/internal/metric v0.24.0 // indirect diff --git a/extension/httpforwarder/go.sum b/extension/httpforwarder/go.sum index a11553afa283..5feae3165f57 100644 --- a/extension/httpforwarder/go.sum +++ b/extension/httpforwarder/go.sum @@ -387,10 +387,11 @@ 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.37.0 h1:X83+uWk11kW83BTkdKNt1Sk7gXyRv36wA6piT0FYfME= -go.opentelemetry.io/collector v0.37.0/go.mod h1:zbLWBJVy7bmiZHlHjCrV28vxXA/sAkCLtH5thD8ZahA= -go.opentelemetry.io/collector/model v0.37.0 h1:K1G6bgzBZ5kKSjZ1+EY9MhCOYsac4Q1K85fBUgpTVH8= +go.opentelemetry.io/collector v0.37.1-0.20211015233822-bd87fb628058 h1:6v0ba4ruY/W2cJLElDZEHDwShlSWUjK2MiBMvwfAIN0= +go.opentelemetry.io/collector v0.37.1-0.20211015233822-bd87fb628058/go.mod h1:zbLWBJVy7bmiZHlHjCrV28vxXA/sAkCLtH5thD8ZahA= go.opentelemetry.io/collector/model v0.37.0/go.mod h1:ESh1oWDNdS4fTg9sTFoYuiuvs8QuaX8yNGTPix3JZc8= +go.opentelemetry.io/collector/model v0.37.1-0.20211015233822-bd87fb628058 h1:jDw0pFIkDbvNRkkdCz1+gsBXIKbtY3GtRMPqzBeOfs4= +go.opentelemetry.io/collector/model v0.37.1-0.20211015233822-bd87fb628058/go.mod h1:ESh1oWDNdS4fTg9sTFoYuiuvs8QuaX8yNGTPix3JZc8= go.opentelemetry.io/contrib/instrumentation/google.golang.org/grpc/otelgrpc v0.25.0/go.mod h1:E5NNboN0UqSAki0Atn9kVwaN7I+l25gGxDqBueo/74E= go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.25.0 h1:FIbb8m2PtTWjvXLHOEnXAoSmkaiXbg3fuvoZAjsAT3Q= go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.25.0/go.mod h1:NyB05cd+yPX6W5SiRNuJ90w7PV2+g2cgRbsPL7MvpME= diff --git a/extension/oauth2clientauthextension/go.mod b/extension/oauth2clientauthextension/go.mod index 5cff35e3340c..46f9338a1636 100644 --- a/extension/oauth2clientauthextension/go.mod +++ b/extension/oauth2clientauthextension/go.mod @@ -4,7 +4,7 @@ go 1.17 require ( github.com/stretchr/testify v1.7.0 - go.opentelemetry.io/collector v0.37.0 + go.opentelemetry.io/collector v0.37.1-0.20211015233822-bd87fb628058 go.uber.org/zap v1.19.1 golang.org/x/oauth2 v0.0.0-20210615190721-d04028783cf1 google.golang.org/grpc v1.41.0 @@ -26,7 +26,7 @@ require ( github.com/pmezard/go-difflib v1.0.0 // indirect github.com/rogpeppe/go-internal v1.6.1 // indirect github.com/spf13/cast v1.4.1 // indirect - go.opentelemetry.io/collector/model v0.37.0 // indirect + go.opentelemetry.io/collector/model v0.37.1-0.20211015233822-bd87fb628058 // indirect go.opentelemetry.io/otel v1.0.1 // indirect go.opentelemetry.io/otel/metric v0.24.0 // indirect go.opentelemetry.io/otel/trace v1.0.1 // indirect diff --git a/extension/oauth2clientauthextension/go.sum b/extension/oauth2clientauthextension/go.sum index 3063a3e5749a..6355958e55b9 100644 --- a/extension/oauth2clientauthextension/go.sum +++ b/extension/oauth2clientauthextension/go.sum @@ -378,10 +378,11 @@ go.opencensus.io v0.22.4/go.mod h1:yxeiOL68Rb0Xd1ddK5vPZ/oVn4vY4Ynel7k9FzqtOIw= go.opencensus.io v0.22.5/go.mod h1:5pWMHQbX5EPX2/62yrJeAkowc+lfs/XD7Uxpq3pI6kk= go.opencensus.io v0.23.0 h1:gqCw0LfLxScz8irSi8exQc7fyQ0fKQU/qnC/X8+V/1M= go.opencensus.io v0.23.0/go.mod h1:XItmlyltB5F7CS4xOC1DcqMoFqwtC6OG2xF7mCv7P7E= -go.opentelemetry.io/collector v0.37.0 h1:X83+uWk11kW83BTkdKNt1Sk7gXyRv36wA6piT0FYfME= -go.opentelemetry.io/collector v0.37.0/go.mod h1:zbLWBJVy7bmiZHlHjCrV28vxXA/sAkCLtH5thD8ZahA= -go.opentelemetry.io/collector/model v0.37.0 h1:K1G6bgzBZ5kKSjZ1+EY9MhCOYsac4Q1K85fBUgpTVH8= +go.opentelemetry.io/collector v0.37.1-0.20211015233822-bd87fb628058 h1:6v0ba4ruY/W2cJLElDZEHDwShlSWUjK2MiBMvwfAIN0= +go.opentelemetry.io/collector v0.37.1-0.20211015233822-bd87fb628058/go.mod h1:zbLWBJVy7bmiZHlHjCrV28vxXA/sAkCLtH5thD8ZahA= go.opentelemetry.io/collector/model v0.37.0/go.mod h1:ESh1oWDNdS4fTg9sTFoYuiuvs8QuaX8yNGTPix3JZc8= +go.opentelemetry.io/collector/model v0.37.1-0.20211015233822-bd87fb628058 h1:jDw0pFIkDbvNRkkdCz1+gsBXIKbtY3GtRMPqzBeOfs4= +go.opentelemetry.io/collector/model v0.37.1-0.20211015233822-bd87fb628058/go.mod h1:ESh1oWDNdS4fTg9sTFoYuiuvs8QuaX8yNGTPix3JZc8= go.opentelemetry.io/contrib/instrumentation/google.golang.org/grpc/otelgrpc v0.25.0/go.mod h1:E5NNboN0UqSAki0Atn9kVwaN7I+l25gGxDqBueo/74E= go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.25.0/go.mod h1:NyB05cd+yPX6W5SiRNuJ90w7PV2+g2cgRbsPL7MvpME= go.opentelemetry.io/contrib/zpages v0.25.0/go.mod h1:cXBK0CNcIBD9Iiw1Hv3DvS+E8N2rtr+k+OoPs+sP0T4= diff --git a/extension/observer/dockerobserver/go.mod b/extension/observer/dockerobserver/go.mod index 37cd9580ace8..8f338cd8886f 100644 --- a/extension/observer/dockerobserver/go.mod +++ b/extension/observer/dockerobserver/go.mod @@ -7,7 +7,7 @@ require ( github.com/docker/go-connections v0.4.0 github.com/open-telemetry/opentelemetry-collector-contrib/extension/observer v0.37.1 github.com/stretchr/testify v1.7.0 - go.opentelemetry.io/collector v0.37.0 + go.opentelemetry.io/collector v0.37.1-0.20211015233822-bd87fb628058 go.uber.org/zap v1.19.1 ) @@ -30,7 +30,7 @@ require ( github.com/pmezard/go-difflib v1.0.0 // indirect github.com/rogpeppe/go-internal v1.6.1 // indirect github.com/spf13/cast v1.4.1 // indirect - go.opentelemetry.io/collector/model v0.37.0 // indirect + go.opentelemetry.io/collector/model v0.37.1-0.20211015233822-bd87fb628058 // indirect go.opentelemetry.io/otel v1.0.1 // indirect go.opentelemetry.io/otel/metric v0.24.0 // indirect go.opentelemetry.io/otel/trace v1.0.1 // indirect diff --git a/extension/observer/dockerobserver/go.sum b/extension/observer/dockerobserver/go.sum index e0e552e128bf..377040daeee6 100644 --- a/extension/observer/dockerobserver/go.sum +++ b/extension/observer/dockerobserver/go.sum @@ -384,10 +384,11 @@ go.opencensus.io v0.22.4/go.mod h1:yxeiOL68Rb0Xd1ddK5vPZ/oVn4vY4Ynel7k9FzqtOIw= go.opencensus.io v0.22.5/go.mod h1:5pWMHQbX5EPX2/62yrJeAkowc+lfs/XD7Uxpq3pI6kk= go.opencensus.io v0.23.0 h1:gqCw0LfLxScz8irSi8exQc7fyQ0fKQU/qnC/X8+V/1M= go.opencensus.io v0.23.0/go.mod h1:XItmlyltB5F7CS4xOC1DcqMoFqwtC6OG2xF7mCv7P7E= -go.opentelemetry.io/collector v0.37.0 h1:X83+uWk11kW83BTkdKNt1Sk7gXyRv36wA6piT0FYfME= -go.opentelemetry.io/collector v0.37.0/go.mod h1:zbLWBJVy7bmiZHlHjCrV28vxXA/sAkCLtH5thD8ZahA= -go.opentelemetry.io/collector/model v0.37.0 h1:K1G6bgzBZ5kKSjZ1+EY9MhCOYsac4Q1K85fBUgpTVH8= +go.opentelemetry.io/collector v0.37.1-0.20211015233822-bd87fb628058 h1:6v0ba4ruY/W2cJLElDZEHDwShlSWUjK2MiBMvwfAIN0= +go.opentelemetry.io/collector v0.37.1-0.20211015233822-bd87fb628058/go.mod h1:zbLWBJVy7bmiZHlHjCrV28vxXA/sAkCLtH5thD8ZahA= go.opentelemetry.io/collector/model v0.37.0/go.mod h1:ESh1oWDNdS4fTg9sTFoYuiuvs8QuaX8yNGTPix3JZc8= +go.opentelemetry.io/collector/model v0.37.1-0.20211015233822-bd87fb628058 h1:jDw0pFIkDbvNRkkdCz1+gsBXIKbtY3GtRMPqzBeOfs4= +go.opentelemetry.io/collector/model v0.37.1-0.20211015233822-bd87fb628058/go.mod h1:ESh1oWDNdS4fTg9sTFoYuiuvs8QuaX8yNGTPix3JZc8= go.opentelemetry.io/contrib/instrumentation/google.golang.org/grpc/otelgrpc v0.25.0/go.mod h1:E5NNboN0UqSAki0Atn9kVwaN7I+l25gGxDqBueo/74E= go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.25.0/go.mod h1:NyB05cd+yPX6W5SiRNuJ90w7PV2+g2cgRbsPL7MvpME= go.opentelemetry.io/contrib/zpages v0.25.0/go.mod h1:cXBK0CNcIBD9Iiw1Hv3DvS+E8N2rtr+k+OoPs+sP0T4= diff --git a/extension/observer/ecsobserver/go.mod b/extension/observer/ecsobserver/go.mod index 94c4f7d7ecfb..3a1624e70c19 100644 --- a/extension/observer/ecsobserver/go.mod +++ b/extension/observer/ecsobserver/go.mod @@ -6,7 +6,7 @@ require ( github.com/aws/aws-sdk-go v1.41.1 github.com/hashicorp/golang-lru v0.5.4 github.com/stretchr/testify v1.7.0 - go.opentelemetry.io/collector v0.37.0 + go.opentelemetry.io/collector v0.37.1-0.20211015233822-bd87fb628058 go.uber.org/multierr v1.7.0 go.uber.org/zap v1.19.1 gopkg.in/yaml.v2 v2.4.0 @@ -27,7 +27,7 @@ require ( github.com/pmezard/go-difflib v1.0.0 // indirect github.com/rogpeppe/go-internal v1.6.1 // indirect github.com/spf13/cast v1.4.1 // indirect - go.opentelemetry.io/collector/model v0.37.0 // indirect + go.opentelemetry.io/collector/model v0.37.1-0.20211015233822-bd87fb628058 // indirect go.opentelemetry.io/otel v1.0.1 // indirect go.opentelemetry.io/otel/metric v0.24.0 // indirect go.opentelemetry.io/otel/trace v1.0.1 // indirect diff --git a/extension/observer/ecsobserver/go.sum b/extension/observer/ecsobserver/go.sum index 953fae9c9877..c7814c61ec00 100644 --- a/extension/observer/ecsobserver/go.sum +++ b/extension/observer/ecsobserver/go.sum @@ -381,10 +381,11 @@ go.opencensus.io v0.22.4/go.mod h1:yxeiOL68Rb0Xd1ddK5vPZ/oVn4vY4Ynel7k9FzqtOIw= go.opencensus.io v0.22.5/go.mod h1:5pWMHQbX5EPX2/62yrJeAkowc+lfs/XD7Uxpq3pI6kk= go.opencensus.io v0.23.0 h1:gqCw0LfLxScz8irSi8exQc7fyQ0fKQU/qnC/X8+V/1M= go.opencensus.io v0.23.0/go.mod h1:XItmlyltB5F7CS4xOC1DcqMoFqwtC6OG2xF7mCv7P7E= -go.opentelemetry.io/collector v0.37.0 h1:X83+uWk11kW83BTkdKNt1Sk7gXyRv36wA6piT0FYfME= -go.opentelemetry.io/collector v0.37.0/go.mod h1:zbLWBJVy7bmiZHlHjCrV28vxXA/sAkCLtH5thD8ZahA= -go.opentelemetry.io/collector/model v0.37.0 h1:K1G6bgzBZ5kKSjZ1+EY9MhCOYsac4Q1K85fBUgpTVH8= +go.opentelemetry.io/collector v0.37.1-0.20211015233822-bd87fb628058 h1:6v0ba4ruY/W2cJLElDZEHDwShlSWUjK2MiBMvwfAIN0= +go.opentelemetry.io/collector v0.37.1-0.20211015233822-bd87fb628058/go.mod h1:zbLWBJVy7bmiZHlHjCrV28vxXA/sAkCLtH5thD8ZahA= go.opentelemetry.io/collector/model v0.37.0/go.mod h1:ESh1oWDNdS4fTg9sTFoYuiuvs8QuaX8yNGTPix3JZc8= +go.opentelemetry.io/collector/model v0.37.1-0.20211015233822-bd87fb628058 h1:jDw0pFIkDbvNRkkdCz1+gsBXIKbtY3GtRMPqzBeOfs4= +go.opentelemetry.io/collector/model v0.37.1-0.20211015233822-bd87fb628058/go.mod h1:ESh1oWDNdS4fTg9sTFoYuiuvs8QuaX8yNGTPix3JZc8= go.opentelemetry.io/contrib/instrumentation/google.golang.org/grpc/otelgrpc v0.25.0/go.mod h1:E5NNboN0UqSAki0Atn9kVwaN7I+l25gGxDqBueo/74E= go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.25.0/go.mod h1:NyB05cd+yPX6W5SiRNuJ90w7PV2+g2cgRbsPL7MvpME= go.opentelemetry.io/contrib/zpages v0.25.0/go.mod h1:cXBK0CNcIBD9Iiw1Hv3DvS+E8N2rtr+k+OoPs+sP0T4= diff --git a/extension/observer/hostobserver/go.mod b/extension/observer/hostobserver/go.mod index eb03d6bb01f6..ce3b59c93ca8 100644 --- a/extension/observer/hostobserver/go.mod +++ b/extension/observer/hostobserver/go.mod @@ -6,7 +6,7 @@ require ( github.com/open-telemetry/opentelemetry-collector-contrib/extension/observer v0.37.1 github.com/shirou/gopsutil/v3 v3.21.9 github.com/stretchr/testify v1.7.0 - go.opentelemetry.io/collector v0.37.0 + go.opentelemetry.io/collector v0.37.1-0.20211015233822-bd87fb628058 go.uber.org/zap v1.19.1 ) @@ -30,7 +30,7 @@ require ( github.com/spf13/cast v1.4.1 // indirect github.com/tklauser/go-sysconf v0.3.9 // indirect github.com/tklauser/numcpus v0.3.0 // indirect - go.opentelemetry.io/collector/model v0.37.0 // indirect + go.opentelemetry.io/collector/model v0.37.1-0.20211015233822-bd87fb628058 // indirect go.opentelemetry.io/otel v1.0.1 // indirect go.opentelemetry.io/otel/metric v0.24.0 // indirect go.opentelemetry.io/otel/trace v1.0.1 // indirect diff --git a/extension/observer/hostobserver/go.sum b/extension/observer/hostobserver/go.sum index b692e5838df0..1d8b594a81b9 100644 --- a/extension/observer/hostobserver/go.sum +++ b/extension/observer/hostobserver/go.sum @@ -378,10 +378,11 @@ go.opencensus.io v0.22.4/go.mod h1:yxeiOL68Rb0Xd1ddK5vPZ/oVn4vY4Ynel7k9FzqtOIw= go.opencensus.io v0.22.5/go.mod h1:5pWMHQbX5EPX2/62yrJeAkowc+lfs/XD7Uxpq3pI6kk= go.opencensus.io v0.23.0 h1:gqCw0LfLxScz8irSi8exQc7fyQ0fKQU/qnC/X8+V/1M= go.opencensus.io v0.23.0/go.mod h1:XItmlyltB5F7CS4xOC1DcqMoFqwtC6OG2xF7mCv7P7E= -go.opentelemetry.io/collector v0.37.0 h1:X83+uWk11kW83BTkdKNt1Sk7gXyRv36wA6piT0FYfME= -go.opentelemetry.io/collector v0.37.0/go.mod h1:zbLWBJVy7bmiZHlHjCrV28vxXA/sAkCLtH5thD8ZahA= -go.opentelemetry.io/collector/model v0.37.0 h1:K1G6bgzBZ5kKSjZ1+EY9MhCOYsac4Q1K85fBUgpTVH8= +go.opentelemetry.io/collector v0.37.1-0.20211015233822-bd87fb628058 h1:6v0ba4ruY/W2cJLElDZEHDwShlSWUjK2MiBMvwfAIN0= +go.opentelemetry.io/collector v0.37.1-0.20211015233822-bd87fb628058/go.mod h1:zbLWBJVy7bmiZHlHjCrV28vxXA/sAkCLtH5thD8ZahA= go.opentelemetry.io/collector/model v0.37.0/go.mod h1:ESh1oWDNdS4fTg9sTFoYuiuvs8QuaX8yNGTPix3JZc8= +go.opentelemetry.io/collector/model v0.37.1-0.20211015233822-bd87fb628058 h1:jDw0pFIkDbvNRkkdCz1+gsBXIKbtY3GtRMPqzBeOfs4= +go.opentelemetry.io/collector/model v0.37.1-0.20211015233822-bd87fb628058/go.mod h1:ESh1oWDNdS4fTg9sTFoYuiuvs8QuaX8yNGTPix3JZc8= go.opentelemetry.io/contrib/instrumentation/google.golang.org/grpc/otelgrpc v0.25.0/go.mod h1:E5NNboN0UqSAki0Atn9kVwaN7I+l25gGxDqBueo/74E= go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.25.0/go.mod h1:NyB05cd+yPX6W5SiRNuJ90w7PV2+g2cgRbsPL7MvpME= go.opentelemetry.io/contrib/zpages v0.25.0/go.mod h1:cXBK0CNcIBD9Iiw1Hv3DvS+E8N2rtr+k+OoPs+sP0T4= diff --git a/extension/observer/k8sobserver/go.mod b/extension/observer/k8sobserver/go.mod index 1abb50a344d3..6ecd37a89eb2 100644 --- a/extension/observer/k8sobserver/go.mod +++ b/extension/observer/k8sobserver/go.mod @@ -6,7 +6,7 @@ require ( github.com/open-telemetry/opentelemetry-collector-contrib/extension/observer v0.37.1 github.com/open-telemetry/opentelemetry-collector-contrib/internal/k8sconfig v0.37.1 github.com/stretchr/testify v1.7.0 - go.opentelemetry.io/collector v0.37.0 + go.opentelemetry.io/collector v0.37.1-0.20211015233822-bd87fb628058 go.uber.org/zap v1.19.1 k8s.io/api v0.22.2 k8s.io/apimachinery v0.22.2 @@ -38,7 +38,7 @@ require ( github.com/rogpeppe/go-internal v1.6.1 // indirect github.com/spf13/cast v1.4.1 // indirect github.com/spf13/pflag v1.0.5 // indirect - go.opentelemetry.io/collector/model v0.37.0 // indirect + go.opentelemetry.io/collector/model v0.37.1-0.20211015233822-bd87fb628058 // indirect go.opentelemetry.io/otel v1.0.1 // indirect go.opentelemetry.io/otel/metric v0.24.0 // indirect go.opentelemetry.io/otel/trace v1.0.1 // indirect diff --git a/extension/observer/k8sobserver/go.sum b/extension/observer/k8sobserver/go.sum index bb744d5ec892..132ce4478a50 100644 --- a/extension/observer/k8sobserver/go.sum +++ b/extension/observer/k8sobserver/go.sum @@ -456,10 +456,11 @@ go.opencensus.io v0.22.4/go.mod h1:yxeiOL68Rb0Xd1ddK5vPZ/oVn4vY4Ynel7k9FzqtOIw= go.opencensus.io v0.22.5/go.mod h1:5pWMHQbX5EPX2/62yrJeAkowc+lfs/XD7Uxpq3pI6kk= go.opencensus.io v0.23.0 h1:gqCw0LfLxScz8irSi8exQc7fyQ0fKQU/qnC/X8+V/1M= go.opencensus.io v0.23.0/go.mod h1:XItmlyltB5F7CS4xOC1DcqMoFqwtC6OG2xF7mCv7P7E= -go.opentelemetry.io/collector v0.37.0 h1:X83+uWk11kW83BTkdKNt1Sk7gXyRv36wA6piT0FYfME= -go.opentelemetry.io/collector v0.37.0/go.mod h1:zbLWBJVy7bmiZHlHjCrV28vxXA/sAkCLtH5thD8ZahA= -go.opentelemetry.io/collector/model v0.37.0 h1:K1G6bgzBZ5kKSjZ1+EY9MhCOYsac4Q1K85fBUgpTVH8= +go.opentelemetry.io/collector v0.37.1-0.20211015233822-bd87fb628058 h1:6v0ba4ruY/W2cJLElDZEHDwShlSWUjK2MiBMvwfAIN0= +go.opentelemetry.io/collector v0.37.1-0.20211015233822-bd87fb628058/go.mod h1:zbLWBJVy7bmiZHlHjCrV28vxXA/sAkCLtH5thD8ZahA= go.opentelemetry.io/collector/model v0.37.0/go.mod h1:ESh1oWDNdS4fTg9sTFoYuiuvs8QuaX8yNGTPix3JZc8= +go.opentelemetry.io/collector/model v0.37.1-0.20211015233822-bd87fb628058 h1:jDw0pFIkDbvNRkkdCz1+gsBXIKbtY3GtRMPqzBeOfs4= +go.opentelemetry.io/collector/model v0.37.1-0.20211015233822-bd87fb628058/go.mod h1:ESh1oWDNdS4fTg9sTFoYuiuvs8QuaX8yNGTPix3JZc8= go.opentelemetry.io/contrib/instrumentation/google.golang.org/grpc/otelgrpc v0.25.0/go.mod h1:E5NNboN0UqSAki0Atn9kVwaN7I+l25gGxDqBueo/74E= go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.25.0/go.mod h1:NyB05cd+yPX6W5SiRNuJ90w7PV2+g2cgRbsPL7MvpME= go.opentelemetry.io/contrib/zpages v0.25.0/go.mod h1:cXBK0CNcIBD9Iiw1Hv3DvS+E8N2rtr+k+OoPs+sP0T4= diff --git a/extension/oidcauthextension/go.mod b/extension/oidcauthextension/go.mod index 07362f259344..b4a8eef3ce15 100644 --- a/extension/oidcauthextension/go.mod +++ b/extension/oidcauthextension/go.mod @@ -5,7 +5,7 @@ go 1.17 require ( github.com/coreos/go-oidc v2.2.1+incompatible github.com/stretchr/testify v1.7.0 - go.opentelemetry.io/collector v0.37.0 + go.opentelemetry.io/collector v0.37.1-0.20211015233822-bd87fb628058 go.uber.org/zap v1.19.1 google.golang.org/grpc v1.41.0 ) @@ -26,7 +26,7 @@ require ( github.com/pquerna/cachecontrol v0.1.0 // indirect github.com/rogpeppe/go-internal v1.6.1 // indirect github.com/spf13/cast v1.4.1 // indirect - go.opentelemetry.io/collector/model v0.37.0 // indirect + go.opentelemetry.io/collector/model v0.37.1-0.20211015233822-bd87fb628058 // indirect go.opentelemetry.io/otel v1.0.1 // indirect go.opentelemetry.io/otel/metric v0.24.0 // indirect go.opentelemetry.io/otel/trace v1.0.1 // indirect diff --git a/extension/oidcauthextension/go.sum b/extension/oidcauthextension/go.sum index e0f01fac96ff..4e9ef2ea6b03 100644 --- a/extension/oidcauthextension/go.sum +++ b/extension/oidcauthextension/go.sum @@ -377,10 +377,11 @@ go.opencensus.io v0.22.4/go.mod h1:yxeiOL68Rb0Xd1ddK5vPZ/oVn4vY4Ynel7k9FzqtOIw= go.opencensus.io v0.22.5/go.mod h1:5pWMHQbX5EPX2/62yrJeAkowc+lfs/XD7Uxpq3pI6kk= go.opencensus.io v0.23.0 h1:gqCw0LfLxScz8irSi8exQc7fyQ0fKQU/qnC/X8+V/1M= go.opencensus.io v0.23.0/go.mod h1:XItmlyltB5F7CS4xOC1DcqMoFqwtC6OG2xF7mCv7P7E= -go.opentelemetry.io/collector v0.37.0 h1:X83+uWk11kW83BTkdKNt1Sk7gXyRv36wA6piT0FYfME= -go.opentelemetry.io/collector v0.37.0/go.mod h1:zbLWBJVy7bmiZHlHjCrV28vxXA/sAkCLtH5thD8ZahA= -go.opentelemetry.io/collector/model v0.37.0 h1:K1G6bgzBZ5kKSjZ1+EY9MhCOYsac4Q1K85fBUgpTVH8= +go.opentelemetry.io/collector v0.37.1-0.20211015233822-bd87fb628058 h1:6v0ba4ruY/W2cJLElDZEHDwShlSWUjK2MiBMvwfAIN0= +go.opentelemetry.io/collector v0.37.1-0.20211015233822-bd87fb628058/go.mod h1:zbLWBJVy7bmiZHlHjCrV28vxXA/sAkCLtH5thD8ZahA= go.opentelemetry.io/collector/model v0.37.0/go.mod h1:ESh1oWDNdS4fTg9sTFoYuiuvs8QuaX8yNGTPix3JZc8= +go.opentelemetry.io/collector/model v0.37.1-0.20211015233822-bd87fb628058 h1:jDw0pFIkDbvNRkkdCz1+gsBXIKbtY3GtRMPqzBeOfs4= +go.opentelemetry.io/collector/model v0.37.1-0.20211015233822-bd87fb628058/go.mod h1:ESh1oWDNdS4fTg9sTFoYuiuvs8QuaX8yNGTPix3JZc8= go.opentelemetry.io/contrib/instrumentation/google.golang.org/grpc/otelgrpc v0.25.0/go.mod h1:E5NNboN0UqSAki0Atn9kVwaN7I+l25gGxDqBueo/74E= go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.25.0/go.mod h1:NyB05cd+yPX6W5SiRNuJ90w7PV2+g2cgRbsPL7MvpME= go.opentelemetry.io/contrib/zpages v0.25.0/go.mod h1:cXBK0CNcIBD9Iiw1Hv3DvS+E8N2rtr+k+OoPs+sP0T4= diff --git a/extension/pprofextension/go.mod b/extension/pprofextension/go.mod index 07c2f64aff66..f0ab86ceb3a2 100644 --- a/extension/pprofextension/go.mod +++ b/extension/pprofextension/go.mod @@ -5,7 +5,7 @@ go 1.17 require ( github.com/open-telemetry/opentelemetry-collector-contrib/internal/coreinternal v0.37.1 github.com/stretchr/testify v1.7.0 - go.opentelemetry.io/collector v0.37.0 + go.opentelemetry.io/collector v0.37.1-0.20211015233822-bd87fb628058 go.uber.org/zap v1.19.1 ) @@ -21,7 +21,7 @@ require ( github.com/mitchellh/reflectwalk v1.0.2 // indirect github.com/pmezard/go-difflib v1.0.0 // indirect github.com/spf13/cast v1.4.1 // indirect - go.opentelemetry.io/collector/model v0.37.0 // indirect + go.opentelemetry.io/collector/model v0.37.1-0.20211015233822-bd87fb628058 // indirect go.opentelemetry.io/otel v1.0.1 // indirect go.opentelemetry.io/otel/metric v0.24.0 // indirect go.opentelemetry.io/otel/trace v1.0.1 // indirect diff --git a/extension/pprofextension/go.sum b/extension/pprofextension/go.sum index 56dbfc4caf4d..4c9ec8dc1854 100644 --- a/extension/pprofextension/go.sum +++ b/extension/pprofextension/go.sum @@ -388,10 +388,11 @@ go.opencensus.io v0.22.4/go.mod h1:yxeiOL68Rb0Xd1ddK5vPZ/oVn4vY4Ynel7k9FzqtOIw= go.opencensus.io v0.22.5/go.mod h1:5pWMHQbX5EPX2/62yrJeAkowc+lfs/XD7Uxpq3pI6kk= go.opencensus.io v0.23.0 h1:gqCw0LfLxScz8irSi8exQc7fyQ0fKQU/qnC/X8+V/1M= go.opencensus.io v0.23.0/go.mod h1:XItmlyltB5F7CS4xOC1DcqMoFqwtC6OG2xF7mCv7P7E= -go.opentelemetry.io/collector v0.37.0 h1:X83+uWk11kW83BTkdKNt1Sk7gXyRv36wA6piT0FYfME= -go.opentelemetry.io/collector v0.37.0/go.mod h1:zbLWBJVy7bmiZHlHjCrV28vxXA/sAkCLtH5thD8ZahA= -go.opentelemetry.io/collector/model v0.37.0 h1:K1G6bgzBZ5kKSjZ1+EY9MhCOYsac4Q1K85fBUgpTVH8= +go.opentelemetry.io/collector v0.37.1-0.20211015233822-bd87fb628058 h1:6v0ba4ruY/W2cJLElDZEHDwShlSWUjK2MiBMvwfAIN0= +go.opentelemetry.io/collector v0.37.1-0.20211015233822-bd87fb628058/go.mod h1:zbLWBJVy7bmiZHlHjCrV28vxXA/sAkCLtH5thD8ZahA= go.opentelemetry.io/collector/model v0.37.0/go.mod h1:ESh1oWDNdS4fTg9sTFoYuiuvs8QuaX8yNGTPix3JZc8= +go.opentelemetry.io/collector/model v0.37.1-0.20211015233822-bd87fb628058 h1:jDw0pFIkDbvNRkkdCz1+gsBXIKbtY3GtRMPqzBeOfs4= +go.opentelemetry.io/collector/model v0.37.1-0.20211015233822-bd87fb628058/go.mod h1:ESh1oWDNdS4fTg9sTFoYuiuvs8QuaX8yNGTPix3JZc8= go.opentelemetry.io/contrib/instrumentation/google.golang.org/grpc/otelgrpc v0.25.0/go.mod h1:E5NNboN0UqSAki0Atn9kVwaN7I+l25gGxDqBueo/74E= go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.25.0/go.mod h1:NyB05cd+yPX6W5SiRNuJ90w7PV2+g2cgRbsPL7MvpME= go.opentelemetry.io/contrib/zpages v0.25.0/go.mod h1:cXBK0CNcIBD9Iiw1Hv3DvS+E8N2rtr+k+OoPs+sP0T4= diff --git a/extension/storage/go.mod b/extension/storage/go.mod index f8a01acae09a..a5fffcfb8354 100644 --- a/extension/storage/go.mod +++ b/extension/storage/go.mod @@ -5,7 +5,7 @@ go 1.17 require ( github.com/stretchr/testify v1.7.0 go.etcd.io/bbolt v1.3.6 - go.opentelemetry.io/collector v0.37.0 + go.opentelemetry.io/collector v0.37.1-0.20211015233822-bd87fb628058 go.uber.org/zap v1.19.1 ) @@ -25,7 +25,7 @@ require ( github.com/pmezard/go-difflib v1.0.0 // indirect github.com/rogpeppe/go-internal v1.6.1 // indirect github.com/spf13/cast v1.4.1 // indirect - go.opentelemetry.io/collector/model v0.37.0 // indirect + go.opentelemetry.io/collector/model v0.37.1-0.20211015233822-bd87fb628058 // indirect go.opentelemetry.io/otel v1.0.1 // indirect go.opentelemetry.io/otel/metric v0.24.0 // indirect go.opentelemetry.io/otel/trace v1.0.1 // indirect diff --git a/extension/storage/go.sum b/extension/storage/go.sum index 05d1ed492b3a..cfc0d54dd944 100644 --- a/extension/storage/go.sum +++ b/extension/storage/go.sum @@ -375,10 +375,11 @@ go.opencensus.io v0.22.4/go.mod h1:yxeiOL68Rb0Xd1ddK5vPZ/oVn4vY4Ynel7k9FzqtOIw= go.opencensus.io v0.22.5/go.mod h1:5pWMHQbX5EPX2/62yrJeAkowc+lfs/XD7Uxpq3pI6kk= go.opencensus.io v0.23.0 h1:gqCw0LfLxScz8irSi8exQc7fyQ0fKQU/qnC/X8+V/1M= go.opencensus.io v0.23.0/go.mod h1:XItmlyltB5F7CS4xOC1DcqMoFqwtC6OG2xF7mCv7P7E= -go.opentelemetry.io/collector v0.37.0 h1:X83+uWk11kW83BTkdKNt1Sk7gXyRv36wA6piT0FYfME= -go.opentelemetry.io/collector v0.37.0/go.mod h1:zbLWBJVy7bmiZHlHjCrV28vxXA/sAkCLtH5thD8ZahA= -go.opentelemetry.io/collector/model v0.37.0 h1:K1G6bgzBZ5kKSjZ1+EY9MhCOYsac4Q1K85fBUgpTVH8= +go.opentelemetry.io/collector v0.37.1-0.20211015233822-bd87fb628058 h1:6v0ba4ruY/W2cJLElDZEHDwShlSWUjK2MiBMvwfAIN0= +go.opentelemetry.io/collector v0.37.1-0.20211015233822-bd87fb628058/go.mod h1:zbLWBJVy7bmiZHlHjCrV28vxXA/sAkCLtH5thD8ZahA= go.opentelemetry.io/collector/model v0.37.0/go.mod h1:ESh1oWDNdS4fTg9sTFoYuiuvs8QuaX8yNGTPix3JZc8= +go.opentelemetry.io/collector/model v0.37.1-0.20211015233822-bd87fb628058 h1:jDw0pFIkDbvNRkkdCz1+gsBXIKbtY3GtRMPqzBeOfs4= +go.opentelemetry.io/collector/model v0.37.1-0.20211015233822-bd87fb628058/go.mod h1:ESh1oWDNdS4fTg9sTFoYuiuvs8QuaX8yNGTPix3JZc8= go.opentelemetry.io/contrib/instrumentation/google.golang.org/grpc/otelgrpc v0.25.0/go.mod h1:E5NNboN0UqSAki0Atn9kVwaN7I+l25gGxDqBueo/74E= go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.25.0/go.mod h1:NyB05cd+yPX6W5SiRNuJ90w7PV2+g2cgRbsPL7MvpME= go.opentelemetry.io/contrib/zpages v0.25.0/go.mod h1:cXBK0CNcIBD9Iiw1Hv3DvS+E8N2rtr+k+OoPs+sP0T4= diff --git a/go.mod b/go.mod index fc01e5fde186..b3bbd9395248 100644 --- a/go.mod +++ b/go.mod @@ -100,7 +100,7 @@ require ( github.com/open-telemetry/opentelemetry-collector-contrib/receiver/zookeeperreceiver v0.37.1 github.com/prometheus/prometheus v1.8.2-0.20210621150501-ff58416a0b02 github.com/stretchr/testify v1.7.0 - go.opentelemetry.io/collector v0.37.0 + go.opentelemetry.io/collector v0.37.1-0.20211015233822-bd87fb628058 golang.org/x/sys v0.0.0-20210927094055-39ccf1dd6fa6 ) @@ -272,7 +272,6 @@ require ( github.com/open-telemetry/opentelemetry-collector-contrib/pkg/translator/jaeger v0.37.1 // indirect github.com/open-telemetry/opentelemetry-collector-contrib/pkg/translator/opencensus v0.37.1 // indirect github.com/open-telemetry/opentelemetry-collector-contrib/pkg/translator/zipkin v0.37.1 // indirect - github.com/open-telemetry/opentelemetry-collector-contrib/receiver/scraperhelper v0.37.1 // indirect github.com/open-telemetry/opentelemetry-log-collection v0.22.0 // indirect github.com/opencontainers/go-digest v1.0.0 // indirect github.com/opencontainers/image-spec v1.0.2-0.20190823105129-775207bd45b6 // indirect @@ -336,7 +335,7 @@ require ( go.etcd.io/bbolt v1.3.6 // indirect go.mongodb.org/atlas v0.12.0 // indirect go.opencensus.io v0.23.0 // indirect - go.opentelemetry.io/collector/model v0.37.0 // indirect + go.opentelemetry.io/collector/model v0.37.1-0.20211015233822-bd87fb628058 // indirect go.opentelemetry.io/contrib/instrumentation/google.golang.org/grpc/otelgrpc v0.25.0 // indirect go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.25.0 // indirect go.opentelemetry.io/contrib/zpages v0.25.0 // indirect @@ -573,8 +572,6 @@ replace github.com/open-telemetry/opentelemetry-collector-contrib/receiver/kafka replace github.com/open-telemetry/opentelemetry-collector-contrib/receiver/hostmetricsreceiver => ./receiver/hostmetricsreceiver -replace github.com/open-telemetry/opentelemetry-collector-contrib/receiver/scraperhelper => ./receiver/scraperhelper - replace github.com/open-telemetry/opentelemetry-collector-contrib/receiver/syslogreceiver => ./receiver/syslogreceiver replace github.com/open-telemetry/opentelemetry-collector-contrib/receiver/tcplogreceiver => ./receiver/tcplogreceiver diff --git a/go.sum b/go.sum index 091688fa80ec..71d44abdf4c2 100644 --- a/go.sum +++ b/go.sum @@ -2048,14 +2048,15 @@ go.opencensus.io v0.22.6/go.mod h1:XItmlyltB5F7CS4xOC1DcqMoFqwtC6OG2xF7mCv7P7E= go.opencensus.io v0.23.0 h1:gqCw0LfLxScz8irSi8exQc7fyQ0fKQU/qnC/X8+V/1M= go.opencensus.io v0.23.0/go.mod h1:XItmlyltB5F7CS4xOC1DcqMoFqwtC6OG2xF7mCv7P7E= go.opentelemetry.io/collector v0.35.0/go.mod h1:mMW4VJHhy8CwoTenV75axteKd0aZhWHDZjcZ59V53kc= -go.opentelemetry.io/collector v0.37.0 h1:X83+uWk11kW83BTkdKNt1Sk7gXyRv36wA6piT0FYfME= -go.opentelemetry.io/collector v0.37.0/go.mod h1:zbLWBJVy7bmiZHlHjCrV28vxXA/sAkCLtH5thD8ZahA= +go.opentelemetry.io/collector v0.37.1-0.20211015233822-bd87fb628058 h1:6v0ba4ruY/W2cJLElDZEHDwShlSWUjK2MiBMvwfAIN0= +go.opentelemetry.io/collector v0.37.1-0.20211015233822-bd87fb628058/go.mod h1:zbLWBJVy7bmiZHlHjCrV28vxXA/sAkCLtH5thD8ZahA= go.opentelemetry.io/collector/model v0.30.2-0.20210719230137-809cae954ed3/go.mod h1:PcHNnM+RUl0uD8VkSn93PO78N7kQYhfqpI/eki57pl4= go.opentelemetry.io/collector/model v0.35.0/go.mod h1:+7YCSjJG+MqiIFjauzt7oM2qkqBsaJWh5hcsO4fwsAc= go.opentelemetry.io/collector/model v0.36.0/go.mod h1:+7YCSjJG+MqiIFjauzt7oM2qkqBsaJWh5hcsO4fwsAc= go.opentelemetry.io/collector/model v0.36.1-0.20210927193005-ebb0fbd6f23e/go.mod h1:ESh1oWDNdS4fTg9sTFoYuiuvs8QuaX8yNGTPix3JZc8= -go.opentelemetry.io/collector/model v0.37.0 h1:K1G6bgzBZ5kKSjZ1+EY9MhCOYsac4Q1K85fBUgpTVH8= go.opentelemetry.io/collector/model v0.37.0/go.mod h1:ESh1oWDNdS4fTg9sTFoYuiuvs8QuaX8yNGTPix3JZc8= +go.opentelemetry.io/collector/model v0.37.1-0.20211015233822-bd87fb628058 h1:jDw0pFIkDbvNRkkdCz1+gsBXIKbtY3GtRMPqzBeOfs4= +go.opentelemetry.io/collector/model v0.37.1-0.20211015233822-bd87fb628058/go.mod h1:ESh1oWDNdS4fTg9sTFoYuiuvs8QuaX8yNGTPix3JZc8= go.opentelemetry.io/contrib v0.20.0/go.mod h1:G/EtFaa6qaN7+LxqfIAT3GiZa7Wv5DTBUzl5H4LY0Kc= go.opentelemetry.io/contrib v0.21.0/go.mod h1:EH4yDYeNoaTqn/8yCWQmfNB78VHfGX2Jt2bvnvzBlGM= go.opentelemetry.io/contrib v0.22.0 h1:0F7gDEjgb1WGn4ODIjaCAg75hmqF+UN0LiVgwxsCodc= diff --git a/internal/aws/proxy/go.mod b/internal/aws/proxy/go.mod index 98180bcdc33b..24d7bce88956 100644 --- a/internal/aws/proxy/go.mod +++ b/internal/aws/proxy/go.mod @@ -6,7 +6,7 @@ require ( github.com/aws/aws-sdk-go v1.41.1 github.com/open-telemetry/opentelemetry-collector-contrib/internal/coreinternal v0.37.1 github.com/stretchr/testify v1.7.0 - go.opentelemetry.io/collector v0.37.0 + go.opentelemetry.io/collector v0.37.1-0.20211015233822-bd87fb628058 go.uber.org/zap v1.19.1 ) @@ -14,11 +14,9 @@ require ( require ( github.com/davecgh/go-spew v1.1.1 // indirect github.com/jmespath/go-jmespath v0.4.0 // indirect - github.com/kr/text v0.2.0 // indirect github.com/pmezard/go-difflib v1.0.0 // indirect go.uber.org/atomic v1.9.0 // indirect go.uber.org/multierr v1.7.0 // indirect - gopkg.in/check.v1 v1.0.0-20201130134442-10cb98267c6c // indirect gopkg.in/yaml.v3 v3.0.0-20210107192922-496545a6307b // indirect ) diff --git a/internal/aws/proxy/go.sum b/internal/aws/proxy/go.sum index 1a02c676e11f..4cd1e37d3ce5 100644 --- a/internal/aws/proxy/go.sum +++ b/internal/aws/proxy/go.sum @@ -378,9 +378,10 @@ 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.37.0 h1:X83+uWk11kW83BTkdKNt1Sk7gXyRv36wA6piT0FYfME= -go.opentelemetry.io/collector v0.37.0/go.mod h1:zbLWBJVy7bmiZHlHjCrV28vxXA/sAkCLtH5thD8ZahA= +go.opentelemetry.io/collector v0.37.1-0.20211015233822-bd87fb628058 h1:6v0ba4ruY/W2cJLElDZEHDwShlSWUjK2MiBMvwfAIN0= +go.opentelemetry.io/collector v0.37.1-0.20211015233822-bd87fb628058/go.mod h1:zbLWBJVy7bmiZHlHjCrV28vxXA/sAkCLtH5thD8ZahA= go.opentelemetry.io/collector/model v0.37.0/go.mod h1:ESh1oWDNdS4fTg9sTFoYuiuvs8QuaX8yNGTPix3JZc8= +go.opentelemetry.io/collector/model v0.37.1-0.20211015233822-bd87fb628058/go.mod h1:ESh1oWDNdS4fTg9sTFoYuiuvs8QuaX8yNGTPix3JZc8= go.opentelemetry.io/contrib/instrumentation/google.golang.org/grpc/otelgrpc v0.25.0/go.mod h1:E5NNboN0UqSAki0Atn9kVwaN7I+l25gGxDqBueo/74E= go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.25.0/go.mod h1:NyB05cd+yPX6W5SiRNuJ90w7PV2+g2cgRbsPL7MvpME= go.opentelemetry.io/contrib/zpages v0.25.0/go.mod h1:cXBK0CNcIBD9Iiw1Hv3DvS+E8N2rtr+k+OoPs+sP0T4= diff --git a/internal/coreinternal/go.mod b/internal/coreinternal/go.mod index 03517bb31293..683f312dc1a5 100644 --- a/internal/coreinternal/go.mod +++ b/internal/coreinternal/go.mod @@ -8,8 +8,8 @@ require ( github.com/golang/groupcache v0.0.0-20210331224755-41bb18bfe9da github.com/spf13/cast v1.4.1 github.com/stretchr/testify v1.7.0 - go.opentelemetry.io/collector v0.37.0 - go.opentelemetry.io/collector/model v0.37.0 + go.opentelemetry.io/collector v0.37.1-0.20211015233822-bd87fb628058 + go.opentelemetry.io/collector/model v0.37.1-0.20211015233822-bd87fb628058 google.golang.org/protobuf v1.27.1 ) diff --git a/internal/coreinternal/go.sum b/internal/coreinternal/go.sum index f87c56bc9004..e70644081315 100644 --- a/internal/coreinternal/go.sum +++ b/internal/coreinternal/go.sum @@ -388,10 +388,11 @@ 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.37.0 h1:X83+uWk11kW83BTkdKNt1Sk7gXyRv36wA6piT0FYfME= -go.opentelemetry.io/collector v0.37.0/go.mod h1:zbLWBJVy7bmiZHlHjCrV28vxXA/sAkCLtH5thD8ZahA= -go.opentelemetry.io/collector/model v0.37.0 h1:K1G6bgzBZ5kKSjZ1+EY9MhCOYsac4Q1K85fBUgpTVH8= +go.opentelemetry.io/collector v0.37.1-0.20211015233822-bd87fb628058 h1:6v0ba4ruY/W2cJLElDZEHDwShlSWUjK2MiBMvwfAIN0= +go.opentelemetry.io/collector v0.37.1-0.20211015233822-bd87fb628058/go.mod h1:zbLWBJVy7bmiZHlHjCrV28vxXA/sAkCLtH5thD8ZahA= go.opentelemetry.io/collector/model v0.37.0/go.mod h1:ESh1oWDNdS4fTg9sTFoYuiuvs8QuaX8yNGTPix3JZc8= +go.opentelemetry.io/collector/model v0.37.1-0.20211015233822-bd87fb628058 h1:jDw0pFIkDbvNRkkdCz1+gsBXIKbtY3GtRMPqzBeOfs4= +go.opentelemetry.io/collector/model v0.37.1-0.20211015233822-bd87fb628058/go.mod h1:ESh1oWDNdS4fTg9sTFoYuiuvs8QuaX8yNGTPix3JZc8= go.opentelemetry.io/contrib/instrumentation/google.golang.org/grpc/otelgrpc v0.25.0/go.mod h1:E5NNboN0UqSAki0Atn9kVwaN7I+l25gGxDqBueo/74E= go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.25.0/go.mod h1:NyB05cd+yPX6W5SiRNuJ90w7PV2+g2cgRbsPL7MvpME= go.opentelemetry.io/contrib/zpages v0.25.0/go.mod h1:cXBK0CNcIBD9Iiw1Hv3DvS+E8N2rtr+k+OoPs+sP0T4= diff --git a/internal/kubelet/go.mod b/internal/kubelet/go.mod index d2aedee347fb..8493fa0bf3a6 100644 --- a/internal/kubelet/go.mod +++ b/internal/kubelet/go.mod @@ -5,7 +5,7 @@ go 1.17 require ( github.com/open-telemetry/opentelemetry-collector-contrib/internal/k8sconfig v0.37.1 github.com/stretchr/testify v1.7.0 - go.opentelemetry.io/collector v0.37.0 + go.opentelemetry.io/collector v0.37.1-0.20211015233822-bd87fb628058 go.uber.org/zap v1.19.1 ) diff --git a/internal/kubelet/go.sum b/internal/kubelet/go.sum index 86bd586b271f..4c582395a94e 100644 --- a/internal/kubelet/go.sum +++ b/internal/kubelet/go.sum @@ -443,8 +443,8 @@ 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.37.0 h1:X83+uWk11kW83BTkdKNt1Sk7gXyRv36wA6piT0FYfME= -go.opentelemetry.io/collector v0.37.0/go.mod h1:zbLWBJVy7bmiZHlHjCrV28vxXA/sAkCLtH5thD8ZahA= +go.opentelemetry.io/collector v0.37.1-0.20211015233822-bd87fb628058 h1:6v0ba4ruY/W2cJLElDZEHDwShlSWUjK2MiBMvwfAIN0= +go.opentelemetry.io/collector v0.37.1-0.20211015233822-bd87fb628058/go.mod h1:zbLWBJVy7bmiZHlHjCrV28vxXA/sAkCLtH5thD8ZahA= go.opentelemetry.io/collector/model v0.37.0/go.mod h1:ESh1oWDNdS4fTg9sTFoYuiuvs8QuaX8yNGTPix3JZc8= go.opentelemetry.io/contrib/instrumentation/google.golang.org/grpc/otelgrpc v0.25.0/go.mod h1:E5NNboN0UqSAki0Atn9kVwaN7I+l25gGxDqBueo/74E= go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.25.0/go.mod h1:NyB05cd+yPX6W5SiRNuJ90w7PV2+g2cgRbsPL7MvpME= diff --git a/internal/splunk/go.mod b/internal/splunk/go.mod index b66f4837c923..ad9263bf181d 100644 --- a/internal/splunk/go.mod +++ b/internal/splunk/go.mod @@ -4,8 +4,8 @@ go 1.17 require ( github.com/stretchr/testify v1.7.0 - go.opentelemetry.io/collector v0.37.0 - go.opentelemetry.io/collector/model v0.37.0 + go.opentelemetry.io/collector v0.37.1-0.20211015233822-bd87fb628058 + go.opentelemetry.io/collector/model v0.37.1-0.20211015233822-bd87fb628058 go.uber.org/multierr v1.7.0 ) diff --git a/internal/splunk/go.sum b/internal/splunk/go.sum index f4abc893fd4d..618b5398472a 100644 --- a/internal/splunk/go.sum +++ b/internal/splunk/go.sum @@ -373,10 +373,11 @@ go.opencensus.io v0.22.4/go.mod h1:yxeiOL68Rb0Xd1ddK5vPZ/oVn4vY4Ynel7k9FzqtOIw= go.opencensus.io v0.22.5/go.mod h1:5pWMHQbX5EPX2/62yrJeAkowc+lfs/XD7Uxpq3pI6kk= go.opencensus.io v0.23.0 h1:gqCw0LfLxScz8irSi8exQc7fyQ0fKQU/qnC/X8+V/1M= go.opencensus.io v0.23.0/go.mod h1:XItmlyltB5F7CS4xOC1DcqMoFqwtC6OG2xF7mCv7P7E= -go.opentelemetry.io/collector v0.37.0 h1:X83+uWk11kW83BTkdKNt1Sk7gXyRv36wA6piT0FYfME= -go.opentelemetry.io/collector v0.37.0/go.mod h1:zbLWBJVy7bmiZHlHjCrV28vxXA/sAkCLtH5thD8ZahA= -go.opentelemetry.io/collector/model v0.37.0 h1:K1G6bgzBZ5kKSjZ1+EY9MhCOYsac4Q1K85fBUgpTVH8= +go.opentelemetry.io/collector v0.37.1-0.20211015233822-bd87fb628058 h1:6v0ba4ruY/W2cJLElDZEHDwShlSWUjK2MiBMvwfAIN0= +go.opentelemetry.io/collector v0.37.1-0.20211015233822-bd87fb628058/go.mod h1:zbLWBJVy7bmiZHlHjCrV28vxXA/sAkCLtH5thD8ZahA= go.opentelemetry.io/collector/model v0.37.0/go.mod h1:ESh1oWDNdS4fTg9sTFoYuiuvs8QuaX8yNGTPix3JZc8= +go.opentelemetry.io/collector/model v0.37.1-0.20211015233822-bd87fb628058 h1:jDw0pFIkDbvNRkkdCz1+gsBXIKbtY3GtRMPqzBeOfs4= +go.opentelemetry.io/collector/model v0.37.1-0.20211015233822-bd87fb628058/go.mod h1:ESh1oWDNdS4fTg9sTFoYuiuvs8QuaX8yNGTPix3JZc8= go.opentelemetry.io/contrib/instrumentation/google.golang.org/grpc/otelgrpc v0.25.0/go.mod h1:E5NNboN0UqSAki0Atn9kVwaN7I+l25gGxDqBueo/74E= go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.25.0/go.mod h1:NyB05cd+yPX6W5SiRNuJ90w7PV2+g2cgRbsPL7MvpME= go.opentelemetry.io/contrib/zpages v0.25.0/go.mod h1:cXBK0CNcIBD9Iiw1Hv3DvS+E8N2rtr+k+OoPs+sP0T4= diff --git a/internal/stanza/go.mod b/internal/stanza/go.mod index c1a19a50f5ac..3c109d92f117 100644 --- a/internal/stanza/go.mod +++ b/internal/stanza/go.mod @@ -6,8 +6,8 @@ require ( github.com/open-telemetry/opentelemetry-collector-contrib/extension/storage v0.37.1 github.com/open-telemetry/opentelemetry-log-collection v0.22.0 github.com/stretchr/testify v1.7.0 - go.opentelemetry.io/collector v0.37.0 - go.opentelemetry.io/collector/model v0.37.0 + go.opentelemetry.io/collector v0.37.1-0.20211015233822-bd87fb628058 + go.opentelemetry.io/collector/model v0.37.1-0.20211015233822-bd87fb628058 go.uber.org/multierr v1.7.0 go.uber.org/zap v1.19.1 gopkg.in/yaml.v2 v2.4.0 diff --git a/internal/stanza/go.sum b/internal/stanza/go.sum index bd4bb6e739a0..7379a1f49813 100644 --- a/internal/stanza/go.sum +++ b/internal/stanza/go.sum @@ -473,11 +473,12 @@ 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.35.0/go.mod h1:mMW4VJHhy8CwoTenV75axteKd0aZhWHDZjcZ59V53kc= -go.opentelemetry.io/collector v0.37.0 h1:X83+uWk11kW83BTkdKNt1Sk7gXyRv36wA6piT0FYfME= -go.opentelemetry.io/collector v0.37.0/go.mod h1:zbLWBJVy7bmiZHlHjCrV28vxXA/sAkCLtH5thD8ZahA= +go.opentelemetry.io/collector v0.37.1-0.20211015233822-bd87fb628058 h1:6v0ba4ruY/W2cJLElDZEHDwShlSWUjK2MiBMvwfAIN0= +go.opentelemetry.io/collector v0.37.1-0.20211015233822-bd87fb628058/go.mod h1:zbLWBJVy7bmiZHlHjCrV28vxXA/sAkCLtH5thD8ZahA= go.opentelemetry.io/collector/model v0.35.0/go.mod h1:+7YCSjJG+MqiIFjauzt7oM2qkqBsaJWh5hcsO4fwsAc= -go.opentelemetry.io/collector/model v0.37.0 h1:K1G6bgzBZ5kKSjZ1+EY9MhCOYsac4Q1K85fBUgpTVH8= go.opentelemetry.io/collector/model v0.37.0/go.mod h1:ESh1oWDNdS4fTg9sTFoYuiuvs8QuaX8yNGTPix3JZc8= +go.opentelemetry.io/collector/model v0.37.1-0.20211015233822-bd87fb628058 h1:jDw0pFIkDbvNRkkdCz1+gsBXIKbtY3GtRMPqzBeOfs4= +go.opentelemetry.io/collector/model v0.37.1-0.20211015233822-bd87fb628058/go.mod h1:ESh1oWDNdS4fTg9sTFoYuiuvs8QuaX8yNGTPix3JZc8= go.opentelemetry.io/contrib v0.22.0/go.mod h1:EH4yDYeNoaTqn/8yCWQmfNB78VHfGX2Jt2bvnvzBlGM= go.opentelemetry.io/contrib/instrumentation/google.golang.org/grpc/otelgrpc v0.22.0/go.mod h1:KjqwX4uJNaj479ZjFpADOMJKOM4rBXq4kN7nbeuGKrY= go.opentelemetry.io/contrib/instrumentation/google.golang.org/grpc/otelgrpc v0.25.0/go.mod h1:E5NNboN0UqSAki0Atn9kVwaN7I+l25gGxDqBueo/74E= diff --git a/pkg/batchperresourceattr/go.mod b/pkg/batchperresourceattr/go.mod index 4a5eff69c4ee..ce202c0ab637 100644 --- a/pkg/batchperresourceattr/go.mod +++ b/pkg/batchperresourceattr/go.mod @@ -4,8 +4,8 @@ go 1.17 require ( github.com/stretchr/testify v1.7.0 - go.opentelemetry.io/collector v0.37.0 - go.opentelemetry.io/collector/model v0.37.0 + go.opentelemetry.io/collector v0.37.1-0.20211015233822-bd87fb628058 + go.opentelemetry.io/collector/model v0.37.1-0.20211015233822-bd87fb628058 go.uber.org/multierr v1.7.0 ) diff --git a/pkg/batchperresourceattr/go.sum b/pkg/batchperresourceattr/go.sum index 1c2e9ec5517f..34f1c0cdb982 100644 --- a/pkg/batchperresourceattr/go.sum +++ b/pkg/batchperresourceattr/go.sum @@ -358,10 +358,11 @@ 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.37.0 h1:X83+uWk11kW83BTkdKNt1Sk7gXyRv36wA6piT0FYfME= -go.opentelemetry.io/collector v0.37.0/go.mod h1:zbLWBJVy7bmiZHlHjCrV28vxXA/sAkCLtH5thD8ZahA= -go.opentelemetry.io/collector/model v0.37.0 h1:K1G6bgzBZ5kKSjZ1+EY9MhCOYsac4Q1K85fBUgpTVH8= +go.opentelemetry.io/collector v0.37.1-0.20211015233822-bd87fb628058 h1:6v0ba4ruY/W2cJLElDZEHDwShlSWUjK2MiBMvwfAIN0= +go.opentelemetry.io/collector v0.37.1-0.20211015233822-bd87fb628058/go.mod h1:zbLWBJVy7bmiZHlHjCrV28vxXA/sAkCLtH5thD8ZahA= go.opentelemetry.io/collector/model v0.37.0/go.mod h1:ESh1oWDNdS4fTg9sTFoYuiuvs8QuaX8yNGTPix3JZc8= +go.opentelemetry.io/collector/model v0.37.1-0.20211015233822-bd87fb628058 h1:jDw0pFIkDbvNRkkdCz1+gsBXIKbtY3GtRMPqzBeOfs4= +go.opentelemetry.io/collector/model v0.37.1-0.20211015233822-bd87fb628058/go.mod h1:ESh1oWDNdS4fTg9sTFoYuiuvs8QuaX8yNGTPix3JZc8= go.opentelemetry.io/contrib/instrumentation/google.golang.org/grpc/otelgrpc v0.25.0/go.mod h1:E5NNboN0UqSAki0Atn9kVwaN7I+l25gGxDqBueo/74E= go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.25.0/go.mod h1:NyB05cd+yPX6W5SiRNuJ90w7PV2+g2cgRbsPL7MvpME= go.opentelemetry.io/contrib/zpages v0.25.0/go.mod h1:cXBK0CNcIBD9Iiw1Hv3DvS+E8N2rtr+k+OoPs+sP0T4= diff --git a/pkg/resourcetotelemetry/go.mod b/pkg/resourcetotelemetry/go.mod index 2cea86301ba2..9c8eb2b98341 100644 --- a/pkg/resourcetotelemetry/go.mod +++ b/pkg/resourcetotelemetry/go.mod @@ -5,8 +5,8 @@ go 1.17 require ( github.com/open-telemetry/opentelemetry-collector-contrib/internal/coreinternal v0.37.1 github.com/stretchr/testify v1.7.0 - go.opentelemetry.io/collector v0.37.0 - go.opentelemetry.io/collector/model v0.37.0 + go.opentelemetry.io/collector v0.37.1-0.20211015233822-bd87fb628058 + go.opentelemetry.io/collector/model v0.37.1-0.20211015233822-bd87fb628058 ) require ( diff --git a/pkg/resourcetotelemetry/go.sum b/pkg/resourcetotelemetry/go.sum index 82364d8a3a4e..e13322ffe4f2 100644 --- a/pkg/resourcetotelemetry/go.sum +++ b/pkg/resourcetotelemetry/go.sum @@ -385,10 +385,11 @@ 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.37.0 h1:X83+uWk11kW83BTkdKNt1Sk7gXyRv36wA6piT0FYfME= -go.opentelemetry.io/collector v0.37.0/go.mod h1:zbLWBJVy7bmiZHlHjCrV28vxXA/sAkCLtH5thD8ZahA= -go.opentelemetry.io/collector/model v0.37.0 h1:K1G6bgzBZ5kKSjZ1+EY9MhCOYsac4Q1K85fBUgpTVH8= +go.opentelemetry.io/collector v0.37.1-0.20211015233822-bd87fb628058 h1:6v0ba4ruY/W2cJLElDZEHDwShlSWUjK2MiBMvwfAIN0= +go.opentelemetry.io/collector v0.37.1-0.20211015233822-bd87fb628058/go.mod h1:zbLWBJVy7bmiZHlHjCrV28vxXA/sAkCLtH5thD8ZahA= go.opentelemetry.io/collector/model v0.37.0/go.mod h1:ESh1oWDNdS4fTg9sTFoYuiuvs8QuaX8yNGTPix3JZc8= +go.opentelemetry.io/collector/model v0.37.1-0.20211015233822-bd87fb628058 h1:jDw0pFIkDbvNRkkdCz1+gsBXIKbtY3GtRMPqzBeOfs4= +go.opentelemetry.io/collector/model v0.37.1-0.20211015233822-bd87fb628058/go.mod h1:ESh1oWDNdS4fTg9sTFoYuiuvs8QuaX8yNGTPix3JZc8= go.opentelemetry.io/contrib/instrumentation/google.golang.org/grpc/otelgrpc v0.25.0/go.mod h1:E5NNboN0UqSAki0Atn9kVwaN7I+l25gGxDqBueo/74E= go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.25.0/go.mod h1:NyB05cd+yPX6W5SiRNuJ90w7PV2+g2cgRbsPL7MvpME= go.opentelemetry.io/contrib/zpages v0.25.0/go.mod h1:cXBK0CNcIBD9Iiw1Hv3DvS+E8N2rtr+k+OoPs+sP0T4= diff --git a/pkg/translator/jaeger/go.mod b/pkg/translator/jaeger/go.mod index 74aae1cc36fd..1f89cdecdeda 100644 --- a/pkg/translator/jaeger/go.mod +++ b/pkg/translator/jaeger/go.mod @@ -6,7 +6,7 @@ require ( github.com/jaegertracing/jaeger v1.27.0 github.com/open-telemetry/opentelemetry-collector-contrib/internal/coreinternal v0.37.1 github.com/stretchr/testify v1.7.0 - go.opentelemetry.io/collector/model v0.37.0 + go.opentelemetry.io/collector/model v0.37.1-0.20211015233822-bd87fb628058 ) require ( diff --git a/pkg/translator/jaeger/go.sum b/pkg/translator/jaeger/go.sum index bd9d7609c3db..d67666f4d49e 100644 --- a/pkg/translator/jaeger/go.sum +++ b/pkg/translator/jaeger/go.sum @@ -736,11 +736,12 @@ go.opencensus.io v0.22.3/go.mod h1:yxeiOL68Rb0Xd1ddK5vPZ/oVn4vY4Ynel7k9FzqtOIw= go.opencensus.io v0.22.4/go.mod h1:yxeiOL68Rb0Xd1ddK5vPZ/oVn4vY4Ynel7k9FzqtOIw= go.opencensus.io v0.22.5/go.mod h1:5pWMHQbX5EPX2/62yrJeAkowc+lfs/XD7Uxpq3pI6kk= go.opencensus.io v0.23.0/go.mod h1:XItmlyltB5F7CS4xOC1DcqMoFqwtC6OG2xF7mCv7P7E= -go.opentelemetry.io/collector v0.37.0 h1:X83+uWk11kW83BTkdKNt1Sk7gXyRv36wA6piT0FYfME= -go.opentelemetry.io/collector v0.37.0/go.mod h1:zbLWBJVy7bmiZHlHjCrV28vxXA/sAkCLtH5thD8ZahA= +go.opentelemetry.io/collector v0.37.1-0.20211015233822-bd87fb628058 h1:6v0ba4ruY/W2cJLElDZEHDwShlSWUjK2MiBMvwfAIN0= +go.opentelemetry.io/collector v0.37.1-0.20211015233822-bd87fb628058/go.mod h1:zbLWBJVy7bmiZHlHjCrV28vxXA/sAkCLtH5thD8ZahA= go.opentelemetry.io/collector/model v0.36.0/go.mod h1:+7YCSjJG+MqiIFjauzt7oM2qkqBsaJWh5hcsO4fwsAc= -go.opentelemetry.io/collector/model v0.37.0 h1:K1G6bgzBZ5kKSjZ1+EY9MhCOYsac4Q1K85fBUgpTVH8= go.opentelemetry.io/collector/model v0.37.0/go.mod h1:ESh1oWDNdS4fTg9sTFoYuiuvs8QuaX8yNGTPix3JZc8= +go.opentelemetry.io/collector/model v0.37.1-0.20211015233822-bd87fb628058 h1:jDw0pFIkDbvNRkkdCz1+gsBXIKbtY3GtRMPqzBeOfs4= +go.opentelemetry.io/collector/model v0.37.1-0.20211015233822-bd87fb628058/go.mod h1:ESh1oWDNdS4fTg9sTFoYuiuvs8QuaX8yNGTPix3JZc8= go.opentelemetry.io/contrib/instrumentation/google.golang.org/grpc/otelgrpc v0.25.0/go.mod h1:E5NNboN0UqSAki0Atn9kVwaN7I+l25gGxDqBueo/74E= go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.25.0/go.mod h1:NyB05cd+yPX6W5SiRNuJ90w7PV2+g2cgRbsPL7MvpME= go.opentelemetry.io/contrib/zpages v0.25.0/go.mod h1:cXBK0CNcIBD9Iiw1Hv3DvS+E8N2rtr+k+OoPs+sP0T4= diff --git a/pkg/translator/opencensus/go.mod b/pkg/translator/opencensus/go.mod index 9133ae045213..8dc79de72ddc 100644 --- a/pkg/translator/opencensus/go.mod +++ b/pkg/translator/opencensus/go.mod @@ -9,7 +9,7 @@ require ( github.com/open-telemetry/opentelemetry-collector-contrib/internal/coreinternal v0.37.1 github.com/stretchr/testify v1.7.0 go.opencensus.io v0.23.0 - go.opentelemetry.io/collector/model v0.37.0 + go.opentelemetry.io/collector/model v0.37.1-0.20211015233822-bd87fb628058 google.golang.org/protobuf v1.27.1 ) diff --git a/pkg/translator/opencensus/go.sum b/pkg/translator/opencensus/go.sum index 364244979cd2..a14f63964b7f 100644 --- a/pkg/translator/opencensus/go.sum +++ b/pkg/translator/opencensus/go.sum @@ -377,10 +377,11 @@ go.opencensus.io v0.22.4/go.mod h1:yxeiOL68Rb0Xd1ddK5vPZ/oVn4vY4Ynel7k9FzqtOIw= go.opencensus.io v0.22.5/go.mod h1:5pWMHQbX5EPX2/62yrJeAkowc+lfs/XD7Uxpq3pI6kk= go.opencensus.io v0.23.0 h1:gqCw0LfLxScz8irSi8exQc7fyQ0fKQU/qnC/X8+V/1M= go.opencensus.io v0.23.0/go.mod h1:XItmlyltB5F7CS4xOC1DcqMoFqwtC6OG2xF7mCv7P7E= -go.opentelemetry.io/collector v0.37.0 h1:X83+uWk11kW83BTkdKNt1Sk7gXyRv36wA6piT0FYfME= -go.opentelemetry.io/collector v0.37.0/go.mod h1:zbLWBJVy7bmiZHlHjCrV28vxXA/sAkCLtH5thD8ZahA= -go.opentelemetry.io/collector/model v0.37.0 h1:K1G6bgzBZ5kKSjZ1+EY9MhCOYsac4Q1K85fBUgpTVH8= +go.opentelemetry.io/collector v0.37.1-0.20211015233822-bd87fb628058 h1:6v0ba4ruY/W2cJLElDZEHDwShlSWUjK2MiBMvwfAIN0= +go.opentelemetry.io/collector v0.37.1-0.20211015233822-bd87fb628058/go.mod h1:zbLWBJVy7bmiZHlHjCrV28vxXA/sAkCLtH5thD8ZahA= go.opentelemetry.io/collector/model v0.37.0/go.mod h1:ESh1oWDNdS4fTg9sTFoYuiuvs8QuaX8yNGTPix3JZc8= +go.opentelemetry.io/collector/model v0.37.1-0.20211015233822-bd87fb628058 h1:jDw0pFIkDbvNRkkdCz1+gsBXIKbtY3GtRMPqzBeOfs4= +go.opentelemetry.io/collector/model v0.37.1-0.20211015233822-bd87fb628058/go.mod h1:ESh1oWDNdS4fTg9sTFoYuiuvs8QuaX8yNGTPix3JZc8= go.opentelemetry.io/contrib/instrumentation/google.golang.org/grpc/otelgrpc v0.25.0/go.mod h1:E5NNboN0UqSAki0Atn9kVwaN7I+l25gGxDqBueo/74E= go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.25.0/go.mod h1:NyB05cd+yPX6W5SiRNuJ90w7PV2+g2cgRbsPL7MvpME= go.opentelemetry.io/contrib/zpages v0.25.0/go.mod h1:cXBK0CNcIBD9Iiw1Hv3DvS+E8N2rtr+k+OoPs+sP0T4= diff --git a/pkg/translator/zipkin/go.mod b/pkg/translator/zipkin/go.mod index 98f3e8614052..79102aa4ec8f 100644 --- a/pkg/translator/zipkin/go.mod +++ b/pkg/translator/zipkin/go.mod @@ -10,7 +10,7 @@ require ( github.com/open-telemetry/opentelemetry-collector-contrib/pkg/translator/opencensus v0.37.1 github.com/openzipkin/zipkin-go v0.2.5 github.com/stretchr/testify v1.7.0 - go.opentelemetry.io/collector/model v0.37.0 + go.opentelemetry.io/collector/model v0.37.1-0.20211015233822-bd87fb628058 google.golang.org/protobuf v1.27.1 ) diff --git a/pkg/translator/zipkin/go.sum b/pkg/translator/zipkin/go.sum index 95a2d2fc524f..e5b2029b3cfd 100644 --- a/pkg/translator/zipkin/go.sum +++ b/pkg/translator/zipkin/go.sum @@ -741,11 +741,12 @@ go.opencensus.io v0.22.4/go.mod h1:yxeiOL68Rb0Xd1ddK5vPZ/oVn4vY4Ynel7k9FzqtOIw= go.opencensus.io v0.22.5/go.mod h1:5pWMHQbX5EPX2/62yrJeAkowc+lfs/XD7Uxpq3pI6kk= go.opencensus.io v0.23.0 h1:gqCw0LfLxScz8irSi8exQc7fyQ0fKQU/qnC/X8+V/1M= go.opencensus.io v0.23.0/go.mod h1:XItmlyltB5F7CS4xOC1DcqMoFqwtC6OG2xF7mCv7P7E= -go.opentelemetry.io/collector v0.37.0 h1:X83+uWk11kW83BTkdKNt1Sk7gXyRv36wA6piT0FYfME= -go.opentelemetry.io/collector v0.37.0/go.mod h1:zbLWBJVy7bmiZHlHjCrV28vxXA/sAkCLtH5thD8ZahA= +go.opentelemetry.io/collector v0.37.1-0.20211015233822-bd87fb628058 h1:6v0ba4ruY/W2cJLElDZEHDwShlSWUjK2MiBMvwfAIN0= +go.opentelemetry.io/collector v0.37.1-0.20211015233822-bd87fb628058/go.mod h1:zbLWBJVy7bmiZHlHjCrV28vxXA/sAkCLtH5thD8ZahA= go.opentelemetry.io/collector/model v0.36.0/go.mod h1:+7YCSjJG+MqiIFjauzt7oM2qkqBsaJWh5hcsO4fwsAc= -go.opentelemetry.io/collector/model v0.37.0 h1:K1G6bgzBZ5kKSjZ1+EY9MhCOYsac4Q1K85fBUgpTVH8= go.opentelemetry.io/collector/model v0.37.0/go.mod h1:ESh1oWDNdS4fTg9sTFoYuiuvs8QuaX8yNGTPix3JZc8= +go.opentelemetry.io/collector/model v0.37.1-0.20211015233822-bd87fb628058 h1:jDw0pFIkDbvNRkkdCz1+gsBXIKbtY3GtRMPqzBeOfs4= +go.opentelemetry.io/collector/model v0.37.1-0.20211015233822-bd87fb628058/go.mod h1:ESh1oWDNdS4fTg9sTFoYuiuvs8QuaX8yNGTPix3JZc8= go.opentelemetry.io/contrib/instrumentation/google.golang.org/grpc/otelgrpc v0.25.0/go.mod h1:E5NNboN0UqSAki0Atn9kVwaN7I+l25gGxDqBueo/74E= go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.25.0/go.mod h1:NyB05cd+yPX6W5SiRNuJ90w7PV2+g2cgRbsPL7MvpME= go.opentelemetry.io/contrib/zpages v0.25.0/go.mod h1:cXBK0CNcIBD9Iiw1Hv3DvS+E8N2rtr+k+OoPs+sP0T4= diff --git a/processor/attributesprocessor/go.mod b/processor/attributesprocessor/go.mod index a23df0691d7e..2bf5b2365bd4 100644 --- a/processor/attributesprocessor/go.mod +++ b/processor/attributesprocessor/go.mod @@ -5,8 +5,8 @@ go 1.17 require ( github.com/open-telemetry/opentelemetry-collector-contrib/internal/coreinternal v0.37.1 github.com/stretchr/testify v1.7.0 - go.opentelemetry.io/collector v0.37.0 - go.opentelemetry.io/collector/model v0.37.0 + go.opentelemetry.io/collector v0.37.1-0.20211015233822-bd87fb628058 + go.opentelemetry.io/collector/model v0.37.1-0.20211015233822-bd87fb628058 ) require ( diff --git a/processor/attributesprocessor/go.sum b/processor/attributesprocessor/go.sum index 92559a2daa16..242c3536b646 100644 --- a/processor/attributesprocessor/go.sum +++ b/processor/attributesprocessor/go.sum @@ -389,10 +389,11 @@ go.opencensus.io v0.22.4/go.mod h1:yxeiOL68Rb0Xd1ddK5vPZ/oVn4vY4Ynel7k9FzqtOIw= go.opencensus.io v0.22.5/go.mod h1:5pWMHQbX5EPX2/62yrJeAkowc+lfs/XD7Uxpq3pI6kk= go.opencensus.io v0.23.0 h1:gqCw0LfLxScz8irSi8exQc7fyQ0fKQU/qnC/X8+V/1M= go.opencensus.io v0.23.0/go.mod h1:XItmlyltB5F7CS4xOC1DcqMoFqwtC6OG2xF7mCv7P7E= -go.opentelemetry.io/collector v0.37.0 h1:X83+uWk11kW83BTkdKNt1Sk7gXyRv36wA6piT0FYfME= -go.opentelemetry.io/collector v0.37.0/go.mod h1:zbLWBJVy7bmiZHlHjCrV28vxXA/sAkCLtH5thD8ZahA= -go.opentelemetry.io/collector/model v0.37.0 h1:K1G6bgzBZ5kKSjZ1+EY9MhCOYsac4Q1K85fBUgpTVH8= +go.opentelemetry.io/collector v0.37.1-0.20211015233822-bd87fb628058 h1:6v0ba4ruY/W2cJLElDZEHDwShlSWUjK2MiBMvwfAIN0= +go.opentelemetry.io/collector v0.37.1-0.20211015233822-bd87fb628058/go.mod h1:zbLWBJVy7bmiZHlHjCrV28vxXA/sAkCLtH5thD8ZahA= go.opentelemetry.io/collector/model v0.37.0/go.mod h1:ESh1oWDNdS4fTg9sTFoYuiuvs8QuaX8yNGTPix3JZc8= +go.opentelemetry.io/collector/model v0.37.1-0.20211015233822-bd87fb628058 h1:jDw0pFIkDbvNRkkdCz1+gsBXIKbtY3GtRMPqzBeOfs4= +go.opentelemetry.io/collector/model v0.37.1-0.20211015233822-bd87fb628058/go.mod h1:ESh1oWDNdS4fTg9sTFoYuiuvs8QuaX8yNGTPix3JZc8= go.opentelemetry.io/contrib/instrumentation/google.golang.org/grpc/otelgrpc v0.25.0/go.mod h1:E5NNboN0UqSAki0Atn9kVwaN7I+l25gGxDqBueo/74E= go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.25.0/go.mod h1:NyB05cd+yPX6W5SiRNuJ90w7PV2+g2cgRbsPL7MvpME= go.opentelemetry.io/contrib/zpages v0.25.0/go.mod h1:cXBK0CNcIBD9Iiw1Hv3DvS+E8N2rtr+k+OoPs+sP0T4= diff --git a/processor/cumulativetodeltaprocessor/go.mod b/processor/cumulativetodeltaprocessor/go.mod index f5f03b0738c1..7d1dd1a6cc0a 100644 --- a/processor/cumulativetodeltaprocessor/go.mod +++ b/processor/cumulativetodeltaprocessor/go.mod @@ -5,8 +5,8 @@ go 1.17 require ( github.com/open-telemetry/opentelemetry-collector-contrib/internal/aws/metrics v0.37.1 github.com/stretchr/testify v1.7.0 - go.opentelemetry.io/collector v0.37.0 - go.opentelemetry.io/collector/model v0.37.0 + go.opentelemetry.io/collector v0.37.1-0.20211015233822-bd87fb628058 + go.opentelemetry.io/collector/model v0.37.1-0.20211015233822-bd87fb628058 go.uber.org/zap v1.19.1 ) diff --git a/processor/cumulativetodeltaprocessor/go.sum b/processor/cumulativetodeltaprocessor/go.sum index 3b68786073d2..b0cec89e7990 100644 --- a/processor/cumulativetodeltaprocessor/go.sum +++ b/processor/cumulativetodeltaprocessor/go.sum @@ -374,10 +374,11 @@ go.opencensus.io v0.22.4/go.mod h1:yxeiOL68Rb0Xd1ddK5vPZ/oVn4vY4Ynel7k9FzqtOIw= go.opencensus.io v0.22.5/go.mod h1:5pWMHQbX5EPX2/62yrJeAkowc+lfs/XD7Uxpq3pI6kk= go.opencensus.io v0.23.0 h1:gqCw0LfLxScz8irSi8exQc7fyQ0fKQU/qnC/X8+V/1M= go.opencensus.io v0.23.0/go.mod h1:XItmlyltB5F7CS4xOC1DcqMoFqwtC6OG2xF7mCv7P7E= -go.opentelemetry.io/collector v0.37.0 h1:X83+uWk11kW83BTkdKNt1Sk7gXyRv36wA6piT0FYfME= -go.opentelemetry.io/collector v0.37.0/go.mod h1:zbLWBJVy7bmiZHlHjCrV28vxXA/sAkCLtH5thD8ZahA= -go.opentelemetry.io/collector/model v0.37.0 h1:K1G6bgzBZ5kKSjZ1+EY9MhCOYsac4Q1K85fBUgpTVH8= +go.opentelemetry.io/collector v0.37.1-0.20211015233822-bd87fb628058 h1:6v0ba4ruY/W2cJLElDZEHDwShlSWUjK2MiBMvwfAIN0= +go.opentelemetry.io/collector v0.37.1-0.20211015233822-bd87fb628058/go.mod h1:zbLWBJVy7bmiZHlHjCrV28vxXA/sAkCLtH5thD8ZahA= go.opentelemetry.io/collector/model v0.37.0/go.mod h1:ESh1oWDNdS4fTg9sTFoYuiuvs8QuaX8yNGTPix3JZc8= +go.opentelemetry.io/collector/model v0.37.1-0.20211015233822-bd87fb628058 h1:jDw0pFIkDbvNRkkdCz1+gsBXIKbtY3GtRMPqzBeOfs4= +go.opentelemetry.io/collector/model v0.37.1-0.20211015233822-bd87fb628058/go.mod h1:ESh1oWDNdS4fTg9sTFoYuiuvs8QuaX8yNGTPix3JZc8= go.opentelemetry.io/contrib/instrumentation/google.golang.org/grpc/otelgrpc v0.25.0/go.mod h1:E5NNboN0UqSAki0Atn9kVwaN7I+l25gGxDqBueo/74E= go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.25.0/go.mod h1:NyB05cd+yPX6W5SiRNuJ90w7PV2+g2cgRbsPL7MvpME= go.opentelemetry.io/contrib/zpages v0.25.0/go.mod h1:cXBK0CNcIBD9Iiw1Hv3DvS+E8N2rtr+k+OoPs+sP0T4= diff --git a/processor/deltatorateprocessor/go.mod b/processor/deltatorateprocessor/go.mod index 5c65a770e091..ebd12efa7575 100644 --- a/processor/deltatorateprocessor/go.mod +++ b/processor/deltatorateprocessor/go.mod @@ -4,8 +4,8 @@ go 1.17 require ( github.com/stretchr/testify v1.7.0 - go.opentelemetry.io/collector v0.37.0 - go.opentelemetry.io/collector/model v0.37.0 + go.opentelemetry.io/collector v0.37.1-0.20211015233822-bd87fb628058 + go.opentelemetry.io/collector/model v0.37.1-0.20211015233822-bd87fb628058 go.uber.org/zap v1.19.1 ) diff --git a/processor/deltatorateprocessor/go.sum b/processor/deltatorateprocessor/go.sum index 3b68786073d2..b0cec89e7990 100644 --- a/processor/deltatorateprocessor/go.sum +++ b/processor/deltatorateprocessor/go.sum @@ -374,10 +374,11 @@ go.opencensus.io v0.22.4/go.mod h1:yxeiOL68Rb0Xd1ddK5vPZ/oVn4vY4Ynel7k9FzqtOIw= go.opencensus.io v0.22.5/go.mod h1:5pWMHQbX5EPX2/62yrJeAkowc+lfs/XD7Uxpq3pI6kk= go.opencensus.io v0.23.0 h1:gqCw0LfLxScz8irSi8exQc7fyQ0fKQU/qnC/X8+V/1M= go.opencensus.io v0.23.0/go.mod h1:XItmlyltB5F7CS4xOC1DcqMoFqwtC6OG2xF7mCv7P7E= -go.opentelemetry.io/collector v0.37.0 h1:X83+uWk11kW83BTkdKNt1Sk7gXyRv36wA6piT0FYfME= -go.opentelemetry.io/collector v0.37.0/go.mod h1:zbLWBJVy7bmiZHlHjCrV28vxXA/sAkCLtH5thD8ZahA= -go.opentelemetry.io/collector/model v0.37.0 h1:K1G6bgzBZ5kKSjZ1+EY9MhCOYsac4Q1K85fBUgpTVH8= +go.opentelemetry.io/collector v0.37.1-0.20211015233822-bd87fb628058 h1:6v0ba4ruY/W2cJLElDZEHDwShlSWUjK2MiBMvwfAIN0= +go.opentelemetry.io/collector v0.37.1-0.20211015233822-bd87fb628058/go.mod h1:zbLWBJVy7bmiZHlHjCrV28vxXA/sAkCLtH5thD8ZahA= go.opentelemetry.io/collector/model v0.37.0/go.mod h1:ESh1oWDNdS4fTg9sTFoYuiuvs8QuaX8yNGTPix3JZc8= +go.opentelemetry.io/collector/model v0.37.1-0.20211015233822-bd87fb628058 h1:jDw0pFIkDbvNRkkdCz1+gsBXIKbtY3GtRMPqzBeOfs4= +go.opentelemetry.io/collector/model v0.37.1-0.20211015233822-bd87fb628058/go.mod h1:ESh1oWDNdS4fTg9sTFoYuiuvs8QuaX8yNGTPix3JZc8= go.opentelemetry.io/contrib/instrumentation/google.golang.org/grpc/otelgrpc v0.25.0/go.mod h1:E5NNboN0UqSAki0Atn9kVwaN7I+l25gGxDqBueo/74E= go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.25.0/go.mod h1:NyB05cd+yPX6W5SiRNuJ90w7PV2+g2cgRbsPL7MvpME= go.opentelemetry.io/contrib/zpages v0.25.0/go.mod h1:cXBK0CNcIBD9Iiw1Hv3DvS+E8N2rtr+k+OoPs+sP0T4= diff --git a/processor/filterprocessor/go.mod b/processor/filterprocessor/go.mod index 1ed83b0a0ae8..d11a6e86ef9c 100644 --- a/processor/filterprocessor/go.mod +++ b/processor/filterprocessor/go.mod @@ -5,8 +5,8 @@ go 1.17 require ( github.com/open-telemetry/opentelemetry-collector-contrib/internal/coreinternal v0.37.1 github.com/stretchr/testify v1.7.0 - go.opentelemetry.io/collector v0.37.0 - go.opentelemetry.io/collector/model v0.37.0 + go.opentelemetry.io/collector v0.37.1-0.20211015233822-bd87fb628058 + go.opentelemetry.io/collector/model v0.37.1-0.20211015233822-bd87fb628058 go.uber.org/zap v1.19.1 ) diff --git a/processor/filterprocessor/go.sum b/processor/filterprocessor/go.sum index e196cb793e2b..6cedd6f642c0 100644 --- a/processor/filterprocessor/go.sum +++ b/processor/filterprocessor/go.sum @@ -390,10 +390,11 @@ go.opencensus.io v0.22.4/go.mod h1:yxeiOL68Rb0Xd1ddK5vPZ/oVn4vY4Ynel7k9FzqtOIw= go.opencensus.io v0.22.5/go.mod h1:5pWMHQbX5EPX2/62yrJeAkowc+lfs/XD7Uxpq3pI6kk= go.opencensus.io v0.23.0 h1:gqCw0LfLxScz8irSi8exQc7fyQ0fKQU/qnC/X8+V/1M= go.opencensus.io v0.23.0/go.mod h1:XItmlyltB5F7CS4xOC1DcqMoFqwtC6OG2xF7mCv7P7E= -go.opentelemetry.io/collector v0.37.0 h1:X83+uWk11kW83BTkdKNt1Sk7gXyRv36wA6piT0FYfME= -go.opentelemetry.io/collector v0.37.0/go.mod h1:zbLWBJVy7bmiZHlHjCrV28vxXA/sAkCLtH5thD8ZahA= -go.opentelemetry.io/collector/model v0.37.0 h1:K1G6bgzBZ5kKSjZ1+EY9MhCOYsac4Q1K85fBUgpTVH8= +go.opentelemetry.io/collector v0.37.1-0.20211015233822-bd87fb628058 h1:6v0ba4ruY/W2cJLElDZEHDwShlSWUjK2MiBMvwfAIN0= +go.opentelemetry.io/collector v0.37.1-0.20211015233822-bd87fb628058/go.mod h1:zbLWBJVy7bmiZHlHjCrV28vxXA/sAkCLtH5thD8ZahA= go.opentelemetry.io/collector/model v0.37.0/go.mod h1:ESh1oWDNdS4fTg9sTFoYuiuvs8QuaX8yNGTPix3JZc8= +go.opentelemetry.io/collector/model v0.37.1-0.20211015233822-bd87fb628058 h1:jDw0pFIkDbvNRkkdCz1+gsBXIKbtY3GtRMPqzBeOfs4= +go.opentelemetry.io/collector/model v0.37.1-0.20211015233822-bd87fb628058/go.mod h1:ESh1oWDNdS4fTg9sTFoYuiuvs8QuaX8yNGTPix3JZc8= go.opentelemetry.io/contrib/instrumentation/google.golang.org/grpc/otelgrpc v0.25.0/go.mod h1:E5NNboN0UqSAki0Atn9kVwaN7I+l25gGxDqBueo/74E= go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.25.0/go.mod h1:NyB05cd+yPX6W5SiRNuJ90w7PV2+g2cgRbsPL7MvpME= go.opentelemetry.io/contrib/zpages v0.25.0/go.mod h1:cXBK0CNcIBD9Iiw1Hv3DvS+E8N2rtr+k+OoPs+sP0T4= diff --git a/processor/groupbyattrsprocessor/go.mod b/processor/groupbyattrsprocessor/go.mod index c0f6465bf0f6..6864e499fb47 100644 --- a/processor/groupbyattrsprocessor/go.mod +++ b/processor/groupbyattrsprocessor/go.mod @@ -5,8 +5,8 @@ go 1.17 require ( github.com/stretchr/testify v1.7.0 go.opencensus.io v0.23.0 - go.opentelemetry.io/collector v0.37.0 - go.opentelemetry.io/collector/model v0.37.0 + go.opentelemetry.io/collector v0.37.1-0.20211015233822-bd87fb628058 + go.opentelemetry.io/collector/model v0.37.1-0.20211015233822-bd87fb628058 go.uber.org/zap v1.19.1 ) diff --git a/processor/groupbyattrsprocessor/go.sum b/processor/groupbyattrsprocessor/go.sum index b0a8d318b16d..bf8f01171235 100644 --- a/processor/groupbyattrsprocessor/go.sum +++ b/processor/groupbyattrsprocessor/go.sum @@ -374,10 +374,11 @@ go.opencensus.io v0.22.4/go.mod h1:yxeiOL68Rb0Xd1ddK5vPZ/oVn4vY4Ynel7k9FzqtOIw= go.opencensus.io v0.22.5/go.mod h1:5pWMHQbX5EPX2/62yrJeAkowc+lfs/XD7Uxpq3pI6kk= go.opencensus.io v0.23.0 h1:gqCw0LfLxScz8irSi8exQc7fyQ0fKQU/qnC/X8+V/1M= go.opencensus.io v0.23.0/go.mod h1:XItmlyltB5F7CS4xOC1DcqMoFqwtC6OG2xF7mCv7P7E= -go.opentelemetry.io/collector v0.37.0 h1:X83+uWk11kW83BTkdKNt1Sk7gXyRv36wA6piT0FYfME= -go.opentelemetry.io/collector v0.37.0/go.mod h1:zbLWBJVy7bmiZHlHjCrV28vxXA/sAkCLtH5thD8ZahA= -go.opentelemetry.io/collector/model v0.37.0 h1:K1G6bgzBZ5kKSjZ1+EY9MhCOYsac4Q1K85fBUgpTVH8= +go.opentelemetry.io/collector v0.37.1-0.20211015233822-bd87fb628058 h1:6v0ba4ruY/W2cJLElDZEHDwShlSWUjK2MiBMvwfAIN0= +go.opentelemetry.io/collector v0.37.1-0.20211015233822-bd87fb628058/go.mod h1:zbLWBJVy7bmiZHlHjCrV28vxXA/sAkCLtH5thD8ZahA= go.opentelemetry.io/collector/model v0.37.0/go.mod h1:ESh1oWDNdS4fTg9sTFoYuiuvs8QuaX8yNGTPix3JZc8= +go.opentelemetry.io/collector/model v0.37.1-0.20211015233822-bd87fb628058 h1:jDw0pFIkDbvNRkkdCz1+gsBXIKbtY3GtRMPqzBeOfs4= +go.opentelemetry.io/collector/model v0.37.1-0.20211015233822-bd87fb628058/go.mod h1:ESh1oWDNdS4fTg9sTFoYuiuvs8QuaX8yNGTPix3JZc8= go.opentelemetry.io/contrib/instrumentation/google.golang.org/grpc/otelgrpc v0.25.0/go.mod h1:E5NNboN0UqSAki0Atn9kVwaN7I+l25gGxDqBueo/74E= go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.25.0/go.mod h1:NyB05cd+yPX6W5SiRNuJ90w7PV2+g2cgRbsPL7MvpME= go.opentelemetry.io/contrib/zpages v0.25.0/go.mod h1:cXBK0CNcIBD9Iiw1Hv3DvS+E8N2rtr+k+OoPs+sP0T4= diff --git a/processor/groupbytraceprocessor/go.mod b/processor/groupbytraceprocessor/go.mod index e08d65a7bd3e..ad68e01ffbdc 100644 --- a/processor/groupbytraceprocessor/go.mod +++ b/processor/groupbytraceprocessor/go.mod @@ -6,8 +6,8 @@ require ( github.com/open-telemetry/opentelemetry-collector-contrib/pkg/batchpersignal v0.37.1 github.com/stretchr/testify v1.7.0 go.opencensus.io v0.23.0 - go.opentelemetry.io/collector v0.37.0 - go.opentelemetry.io/collector/model v0.37.0 + go.opentelemetry.io/collector v0.37.1-0.20211015233822-bd87fb628058 + go.opentelemetry.io/collector/model v0.37.1-0.20211015233822-bd87fb628058 go.uber.org/multierr v1.7.0 go.uber.org/zap v1.19.1 ) diff --git a/processor/groupbytraceprocessor/go.sum b/processor/groupbytraceprocessor/go.sum index 187d491f5b5c..2ed0cc6e8c6e 100644 --- a/processor/groupbytraceprocessor/go.sum +++ b/processor/groupbytraceprocessor/go.sum @@ -372,11 +372,12 @@ go.opencensus.io v0.22.4/go.mod h1:yxeiOL68Rb0Xd1ddK5vPZ/oVn4vY4Ynel7k9FzqtOIw= go.opencensus.io v0.22.5/go.mod h1:5pWMHQbX5EPX2/62yrJeAkowc+lfs/XD7Uxpq3pI6kk= go.opencensus.io v0.23.0 h1:gqCw0LfLxScz8irSi8exQc7fyQ0fKQU/qnC/X8+V/1M= go.opencensus.io v0.23.0/go.mod h1:XItmlyltB5F7CS4xOC1DcqMoFqwtC6OG2xF7mCv7P7E= -go.opentelemetry.io/collector v0.37.0 h1:X83+uWk11kW83BTkdKNt1Sk7gXyRv36wA6piT0FYfME= -go.opentelemetry.io/collector v0.37.0/go.mod h1:zbLWBJVy7bmiZHlHjCrV28vxXA/sAkCLtH5thD8ZahA= +go.opentelemetry.io/collector v0.37.1-0.20211015233822-bd87fb628058 h1:6v0ba4ruY/W2cJLElDZEHDwShlSWUjK2MiBMvwfAIN0= +go.opentelemetry.io/collector v0.37.1-0.20211015233822-bd87fb628058/go.mod h1:zbLWBJVy7bmiZHlHjCrV28vxXA/sAkCLtH5thD8ZahA= go.opentelemetry.io/collector/model v0.30.2-0.20210719230137-809cae954ed3/go.mod h1:PcHNnM+RUl0uD8VkSn93PO78N7kQYhfqpI/eki57pl4= -go.opentelemetry.io/collector/model v0.37.0 h1:K1G6bgzBZ5kKSjZ1+EY9MhCOYsac4Q1K85fBUgpTVH8= go.opentelemetry.io/collector/model v0.37.0/go.mod h1:ESh1oWDNdS4fTg9sTFoYuiuvs8QuaX8yNGTPix3JZc8= +go.opentelemetry.io/collector/model v0.37.1-0.20211015233822-bd87fb628058 h1:jDw0pFIkDbvNRkkdCz1+gsBXIKbtY3GtRMPqzBeOfs4= +go.opentelemetry.io/collector/model v0.37.1-0.20211015233822-bd87fb628058/go.mod h1:ESh1oWDNdS4fTg9sTFoYuiuvs8QuaX8yNGTPix3JZc8= go.opentelemetry.io/contrib/instrumentation/google.golang.org/grpc/otelgrpc v0.25.0/go.mod h1:E5NNboN0UqSAki0Atn9kVwaN7I+l25gGxDqBueo/74E= go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.25.0/go.mod h1:NyB05cd+yPX6W5SiRNuJ90w7PV2+g2cgRbsPL7MvpME= go.opentelemetry.io/contrib/zpages v0.25.0/go.mod h1:cXBK0CNcIBD9Iiw1Hv3DvS+E8N2rtr+k+OoPs+sP0T4= diff --git a/processor/k8sattributesprocessor/go.mod b/processor/k8sattributesprocessor/go.mod index d41d63c4db6a..e1e0bd2be1ac 100644 --- a/processor/k8sattributesprocessor/go.mod +++ b/processor/k8sattributesprocessor/go.mod @@ -6,8 +6,8 @@ require ( github.com/open-telemetry/opentelemetry-collector-contrib/internal/k8sconfig v0.37.1 github.com/stretchr/testify v1.7.0 go.opencensus.io v0.23.0 - go.opentelemetry.io/collector v0.37.0 - go.opentelemetry.io/collector/model v0.37.0 + go.opentelemetry.io/collector v0.37.1-0.20211015233822-bd87fb628058 + go.opentelemetry.io/collector/model v0.37.1-0.20211015233822-bd87fb628058 go.uber.org/zap v1.19.1 k8s.io/api v0.22.2 k8s.io/apimachinery v0.22.2 diff --git a/processor/k8sattributesprocessor/go.sum b/processor/k8sattributesprocessor/go.sum index 80710fe982ad..ea02b8af9beb 100644 --- a/processor/k8sattributesprocessor/go.sum +++ b/processor/k8sattributesprocessor/go.sum @@ -463,10 +463,11 @@ go.opencensus.io v0.22.4/go.mod h1:yxeiOL68Rb0Xd1ddK5vPZ/oVn4vY4Ynel7k9FzqtOIw= go.opencensus.io v0.22.5/go.mod h1:5pWMHQbX5EPX2/62yrJeAkowc+lfs/XD7Uxpq3pI6kk= go.opencensus.io v0.23.0 h1:gqCw0LfLxScz8irSi8exQc7fyQ0fKQU/qnC/X8+V/1M= go.opencensus.io v0.23.0/go.mod h1:XItmlyltB5F7CS4xOC1DcqMoFqwtC6OG2xF7mCv7P7E= -go.opentelemetry.io/collector v0.37.0 h1:X83+uWk11kW83BTkdKNt1Sk7gXyRv36wA6piT0FYfME= -go.opentelemetry.io/collector v0.37.0/go.mod h1:zbLWBJVy7bmiZHlHjCrV28vxXA/sAkCLtH5thD8ZahA= -go.opentelemetry.io/collector/model v0.37.0 h1:K1G6bgzBZ5kKSjZ1+EY9MhCOYsac4Q1K85fBUgpTVH8= +go.opentelemetry.io/collector v0.37.1-0.20211015233822-bd87fb628058 h1:6v0ba4ruY/W2cJLElDZEHDwShlSWUjK2MiBMvwfAIN0= +go.opentelemetry.io/collector v0.37.1-0.20211015233822-bd87fb628058/go.mod h1:zbLWBJVy7bmiZHlHjCrV28vxXA/sAkCLtH5thD8ZahA= go.opentelemetry.io/collector/model v0.37.0/go.mod h1:ESh1oWDNdS4fTg9sTFoYuiuvs8QuaX8yNGTPix3JZc8= +go.opentelemetry.io/collector/model v0.37.1-0.20211015233822-bd87fb628058 h1:jDw0pFIkDbvNRkkdCz1+gsBXIKbtY3GtRMPqzBeOfs4= +go.opentelemetry.io/collector/model v0.37.1-0.20211015233822-bd87fb628058/go.mod h1:ESh1oWDNdS4fTg9sTFoYuiuvs8QuaX8yNGTPix3JZc8= go.opentelemetry.io/contrib/instrumentation/google.golang.org/grpc/otelgrpc v0.25.0/go.mod h1:E5NNboN0UqSAki0Atn9kVwaN7I+l25gGxDqBueo/74E= go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.25.0/go.mod h1:NyB05cd+yPX6W5SiRNuJ90w7PV2+g2cgRbsPL7MvpME= go.opentelemetry.io/contrib/zpages v0.25.0/go.mod h1:cXBK0CNcIBD9Iiw1Hv3DvS+E8N2rtr+k+OoPs+sP0T4= diff --git a/processor/metricsgenerationprocessor/go.mod b/processor/metricsgenerationprocessor/go.mod index 9e639adee999..0ea0c2a21532 100644 --- a/processor/metricsgenerationprocessor/go.mod +++ b/processor/metricsgenerationprocessor/go.mod @@ -4,8 +4,8 @@ go 1.17 require ( github.com/stretchr/testify v1.7.0 - go.opentelemetry.io/collector v0.37.0 - go.opentelemetry.io/collector/model v0.37.0 + go.opentelemetry.io/collector v0.37.1-0.20211015233822-bd87fb628058 + go.opentelemetry.io/collector/model v0.37.1-0.20211015233822-bd87fb628058 go.uber.org/zap v1.19.1 ) diff --git a/processor/metricsgenerationprocessor/go.sum b/processor/metricsgenerationprocessor/go.sum index 3b68786073d2..b0cec89e7990 100644 --- a/processor/metricsgenerationprocessor/go.sum +++ b/processor/metricsgenerationprocessor/go.sum @@ -374,10 +374,11 @@ go.opencensus.io v0.22.4/go.mod h1:yxeiOL68Rb0Xd1ddK5vPZ/oVn4vY4Ynel7k9FzqtOIw= go.opencensus.io v0.22.5/go.mod h1:5pWMHQbX5EPX2/62yrJeAkowc+lfs/XD7Uxpq3pI6kk= go.opencensus.io v0.23.0 h1:gqCw0LfLxScz8irSi8exQc7fyQ0fKQU/qnC/X8+V/1M= go.opencensus.io v0.23.0/go.mod h1:XItmlyltB5F7CS4xOC1DcqMoFqwtC6OG2xF7mCv7P7E= -go.opentelemetry.io/collector v0.37.0 h1:X83+uWk11kW83BTkdKNt1Sk7gXyRv36wA6piT0FYfME= -go.opentelemetry.io/collector v0.37.0/go.mod h1:zbLWBJVy7bmiZHlHjCrV28vxXA/sAkCLtH5thD8ZahA= -go.opentelemetry.io/collector/model v0.37.0 h1:K1G6bgzBZ5kKSjZ1+EY9MhCOYsac4Q1K85fBUgpTVH8= +go.opentelemetry.io/collector v0.37.1-0.20211015233822-bd87fb628058 h1:6v0ba4ruY/W2cJLElDZEHDwShlSWUjK2MiBMvwfAIN0= +go.opentelemetry.io/collector v0.37.1-0.20211015233822-bd87fb628058/go.mod h1:zbLWBJVy7bmiZHlHjCrV28vxXA/sAkCLtH5thD8ZahA= go.opentelemetry.io/collector/model v0.37.0/go.mod h1:ESh1oWDNdS4fTg9sTFoYuiuvs8QuaX8yNGTPix3JZc8= +go.opentelemetry.io/collector/model v0.37.1-0.20211015233822-bd87fb628058 h1:jDw0pFIkDbvNRkkdCz1+gsBXIKbtY3GtRMPqzBeOfs4= +go.opentelemetry.io/collector/model v0.37.1-0.20211015233822-bd87fb628058/go.mod h1:ESh1oWDNdS4fTg9sTFoYuiuvs8QuaX8yNGTPix3JZc8= go.opentelemetry.io/contrib/instrumentation/google.golang.org/grpc/otelgrpc v0.25.0/go.mod h1:E5NNboN0UqSAki0Atn9kVwaN7I+l25gGxDqBueo/74E= go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.25.0/go.mod h1:NyB05cd+yPX6W5SiRNuJ90w7PV2+g2cgRbsPL7MvpME= go.opentelemetry.io/contrib/zpages v0.25.0/go.mod h1:cXBK0CNcIBD9Iiw1Hv3DvS+E8N2rtr+k+OoPs+sP0T4= diff --git a/processor/metricstransformprocessor/go.mod b/processor/metricstransformprocessor/go.mod index 2115b944bfd4..ea094b1602d8 100644 --- a/processor/metricstransformprocessor/go.mod +++ b/processor/metricstransformprocessor/go.mod @@ -7,8 +7,8 @@ require ( github.com/google/go-cmp v0.5.6 github.com/open-telemetry/opentelemetry-collector-contrib/pkg/translator/opencensus v0.37.1 github.com/stretchr/testify v1.7.0 - go.opentelemetry.io/collector v0.37.0 - go.opentelemetry.io/collector/model v0.37.0 + go.opentelemetry.io/collector v0.37.1-0.20211015233822-bd87fb628058 + go.opentelemetry.io/collector/model v0.37.1-0.20211015233822-bd87fb628058 go.uber.org/zap v1.19.1 google.golang.org/protobuf v1.27.1 diff --git a/processor/metricstransformprocessor/go.sum b/processor/metricstransformprocessor/go.sum index 0bfffbf3799f..5c0cc08c4eaa 100644 --- a/processor/metricstransformprocessor/go.sum +++ b/processor/metricstransformprocessor/go.sum @@ -391,10 +391,11 @@ go.opencensus.io v0.22.4/go.mod h1:yxeiOL68Rb0Xd1ddK5vPZ/oVn4vY4Ynel7k9FzqtOIw= go.opencensus.io v0.22.5/go.mod h1:5pWMHQbX5EPX2/62yrJeAkowc+lfs/XD7Uxpq3pI6kk= go.opencensus.io v0.23.0 h1:gqCw0LfLxScz8irSi8exQc7fyQ0fKQU/qnC/X8+V/1M= go.opencensus.io v0.23.0/go.mod h1:XItmlyltB5F7CS4xOC1DcqMoFqwtC6OG2xF7mCv7P7E= -go.opentelemetry.io/collector v0.37.0 h1:X83+uWk11kW83BTkdKNt1Sk7gXyRv36wA6piT0FYfME= -go.opentelemetry.io/collector v0.37.0/go.mod h1:zbLWBJVy7bmiZHlHjCrV28vxXA/sAkCLtH5thD8ZahA= -go.opentelemetry.io/collector/model v0.37.0 h1:K1G6bgzBZ5kKSjZ1+EY9MhCOYsac4Q1K85fBUgpTVH8= +go.opentelemetry.io/collector v0.37.1-0.20211015233822-bd87fb628058 h1:6v0ba4ruY/W2cJLElDZEHDwShlSWUjK2MiBMvwfAIN0= +go.opentelemetry.io/collector v0.37.1-0.20211015233822-bd87fb628058/go.mod h1:zbLWBJVy7bmiZHlHjCrV28vxXA/sAkCLtH5thD8ZahA= go.opentelemetry.io/collector/model v0.37.0/go.mod h1:ESh1oWDNdS4fTg9sTFoYuiuvs8QuaX8yNGTPix3JZc8= +go.opentelemetry.io/collector/model v0.37.1-0.20211015233822-bd87fb628058 h1:jDw0pFIkDbvNRkkdCz1+gsBXIKbtY3GtRMPqzBeOfs4= +go.opentelemetry.io/collector/model v0.37.1-0.20211015233822-bd87fb628058/go.mod h1:ESh1oWDNdS4fTg9sTFoYuiuvs8QuaX8yNGTPix3JZc8= go.opentelemetry.io/contrib/instrumentation/google.golang.org/grpc/otelgrpc v0.25.0/go.mod h1:E5NNboN0UqSAki0Atn9kVwaN7I+l25gGxDqBueo/74E= go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.25.0/go.mod h1:NyB05cd+yPX6W5SiRNuJ90w7PV2+g2cgRbsPL7MvpME= go.opentelemetry.io/contrib/zpages v0.25.0/go.mod h1:cXBK0CNcIBD9Iiw1Hv3DvS+E8N2rtr+k+OoPs+sP0T4= diff --git a/processor/probabilisticsamplerprocessor/go.mod b/processor/probabilisticsamplerprocessor/go.mod index 80c8a308ce8e..bf5308cdda99 100644 --- a/processor/probabilisticsamplerprocessor/go.mod +++ b/processor/probabilisticsamplerprocessor/go.mod @@ -5,8 +5,8 @@ go 1.17 require ( github.com/open-telemetry/opentelemetry-collector-contrib/internal/coreinternal v0.37.1 github.com/stretchr/testify v1.7.0 - go.opentelemetry.io/collector v0.37.0 - go.opentelemetry.io/collector/model v0.37.0 + go.opentelemetry.io/collector v0.37.1-0.20211015233822-bd87fb628058 + go.opentelemetry.io/collector/model v0.37.1-0.20211015233822-bd87fb628058 ) require ( diff --git a/processor/probabilisticsamplerprocessor/go.sum b/processor/probabilisticsamplerprocessor/go.sum index 92559a2daa16..242c3536b646 100644 --- a/processor/probabilisticsamplerprocessor/go.sum +++ b/processor/probabilisticsamplerprocessor/go.sum @@ -389,10 +389,11 @@ go.opencensus.io v0.22.4/go.mod h1:yxeiOL68Rb0Xd1ddK5vPZ/oVn4vY4Ynel7k9FzqtOIw= go.opencensus.io v0.22.5/go.mod h1:5pWMHQbX5EPX2/62yrJeAkowc+lfs/XD7Uxpq3pI6kk= go.opencensus.io v0.23.0 h1:gqCw0LfLxScz8irSi8exQc7fyQ0fKQU/qnC/X8+V/1M= go.opencensus.io v0.23.0/go.mod h1:XItmlyltB5F7CS4xOC1DcqMoFqwtC6OG2xF7mCv7P7E= -go.opentelemetry.io/collector v0.37.0 h1:X83+uWk11kW83BTkdKNt1Sk7gXyRv36wA6piT0FYfME= -go.opentelemetry.io/collector v0.37.0/go.mod h1:zbLWBJVy7bmiZHlHjCrV28vxXA/sAkCLtH5thD8ZahA= -go.opentelemetry.io/collector/model v0.37.0 h1:K1G6bgzBZ5kKSjZ1+EY9MhCOYsac4Q1K85fBUgpTVH8= +go.opentelemetry.io/collector v0.37.1-0.20211015233822-bd87fb628058 h1:6v0ba4ruY/W2cJLElDZEHDwShlSWUjK2MiBMvwfAIN0= +go.opentelemetry.io/collector v0.37.1-0.20211015233822-bd87fb628058/go.mod h1:zbLWBJVy7bmiZHlHjCrV28vxXA/sAkCLtH5thD8ZahA= go.opentelemetry.io/collector/model v0.37.0/go.mod h1:ESh1oWDNdS4fTg9sTFoYuiuvs8QuaX8yNGTPix3JZc8= +go.opentelemetry.io/collector/model v0.37.1-0.20211015233822-bd87fb628058 h1:jDw0pFIkDbvNRkkdCz1+gsBXIKbtY3GtRMPqzBeOfs4= +go.opentelemetry.io/collector/model v0.37.1-0.20211015233822-bd87fb628058/go.mod h1:ESh1oWDNdS4fTg9sTFoYuiuvs8QuaX8yNGTPix3JZc8= go.opentelemetry.io/contrib/instrumentation/google.golang.org/grpc/otelgrpc v0.25.0/go.mod h1:E5NNboN0UqSAki0Atn9kVwaN7I+l25gGxDqBueo/74E= go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.25.0/go.mod h1:NyB05cd+yPX6W5SiRNuJ90w7PV2+g2cgRbsPL7MvpME= go.opentelemetry.io/contrib/zpages v0.25.0/go.mod h1:cXBK0CNcIBD9Iiw1Hv3DvS+E8N2rtr+k+OoPs+sP0T4= diff --git a/processor/resourcedetectionprocessor/go.mod b/processor/resourcedetectionprocessor/go.mod index 2bd1bd81c53f..8719d30c00c3 100644 --- a/processor/resourcedetectionprocessor/go.mod +++ b/processor/resourcedetectionprocessor/go.mod @@ -10,8 +10,8 @@ require ( github.com/docker/docker v20.10.9+incompatible github.com/open-telemetry/opentelemetry-collector-contrib/pkg/translator/opencensus v0.37.1 github.com/stretchr/testify v1.7.0 - go.opentelemetry.io/collector v0.37.0 - go.opentelemetry.io/collector/model v0.37.0 + go.opentelemetry.io/collector v0.37.1-0.20211015233822-bd87fb628058 + go.opentelemetry.io/collector/model v0.37.1-0.20211015233822-bd87fb628058 go.uber.org/multierr v1.7.0 go.uber.org/zap v1.19.1 ) diff --git a/processor/resourcedetectionprocessor/go.sum b/processor/resourcedetectionprocessor/go.sum index a5eef86f8181..e6cf35be8ba2 100644 --- a/processor/resourcedetectionprocessor/go.sum +++ b/processor/resourcedetectionprocessor/go.sum @@ -819,10 +819,11 @@ go.opencensus.io v0.22.4/go.mod h1:yxeiOL68Rb0Xd1ddK5vPZ/oVn4vY4Ynel7k9FzqtOIw= go.opencensus.io v0.22.5/go.mod h1:5pWMHQbX5EPX2/62yrJeAkowc+lfs/XD7Uxpq3pI6kk= go.opencensus.io v0.23.0 h1:gqCw0LfLxScz8irSi8exQc7fyQ0fKQU/qnC/X8+V/1M= go.opencensus.io v0.23.0/go.mod h1:XItmlyltB5F7CS4xOC1DcqMoFqwtC6OG2xF7mCv7P7E= -go.opentelemetry.io/collector v0.37.0 h1:X83+uWk11kW83BTkdKNt1Sk7gXyRv36wA6piT0FYfME= -go.opentelemetry.io/collector v0.37.0/go.mod h1:zbLWBJVy7bmiZHlHjCrV28vxXA/sAkCLtH5thD8ZahA= -go.opentelemetry.io/collector/model v0.37.0 h1:K1G6bgzBZ5kKSjZ1+EY9MhCOYsac4Q1K85fBUgpTVH8= +go.opentelemetry.io/collector v0.37.1-0.20211015233822-bd87fb628058 h1:6v0ba4ruY/W2cJLElDZEHDwShlSWUjK2MiBMvwfAIN0= +go.opentelemetry.io/collector v0.37.1-0.20211015233822-bd87fb628058/go.mod h1:zbLWBJVy7bmiZHlHjCrV28vxXA/sAkCLtH5thD8ZahA= go.opentelemetry.io/collector/model v0.37.0/go.mod h1:ESh1oWDNdS4fTg9sTFoYuiuvs8QuaX8yNGTPix3JZc8= +go.opentelemetry.io/collector/model v0.37.1-0.20211015233822-bd87fb628058 h1:jDw0pFIkDbvNRkkdCz1+gsBXIKbtY3GtRMPqzBeOfs4= +go.opentelemetry.io/collector/model v0.37.1-0.20211015233822-bd87fb628058/go.mod h1:ESh1oWDNdS4fTg9sTFoYuiuvs8QuaX8yNGTPix3JZc8= go.opentelemetry.io/contrib/instrumentation/google.golang.org/grpc/otelgrpc v0.25.0/go.mod h1:E5NNboN0UqSAki0Atn9kVwaN7I+l25gGxDqBueo/74E= go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.25.0/go.mod h1:NyB05cd+yPX6W5SiRNuJ90w7PV2+g2cgRbsPL7MvpME= go.opentelemetry.io/contrib/zpages v0.25.0/go.mod h1:cXBK0CNcIBD9Iiw1Hv3DvS+E8N2rtr+k+OoPs+sP0T4= diff --git a/processor/resourceprocessor/go.mod b/processor/resourceprocessor/go.mod index 99439bec3ed4..fc108e0733d9 100644 --- a/processor/resourceprocessor/go.mod +++ b/processor/resourceprocessor/go.mod @@ -5,8 +5,8 @@ go 1.17 require ( github.com/open-telemetry/opentelemetry-collector-contrib/internal/coreinternal v0.37.1 github.com/stretchr/testify v1.7.0 - go.opentelemetry.io/collector v0.37.0 - go.opentelemetry.io/collector/model v0.37.0 + go.opentelemetry.io/collector v0.37.1-0.20211015233822-bd87fb628058 + go.opentelemetry.io/collector/model v0.37.1-0.20211015233822-bd87fb628058 ) require ( diff --git a/processor/resourceprocessor/go.sum b/processor/resourceprocessor/go.sum index 92559a2daa16..242c3536b646 100644 --- a/processor/resourceprocessor/go.sum +++ b/processor/resourceprocessor/go.sum @@ -389,10 +389,11 @@ go.opencensus.io v0.22.4/go.mod h1:yxeiOL68Rb0Xd1ddK5vPZ/oVn4vY4Ynel7k9FzqtOIw= go.opencensus.io v0.22.5/go.mod h1:5pWMHQbX5EPX2/62yrJeAkowc+lfs/XD7Uxpq3pI6kk= go.opencensus.io v0.23.0 h1:gqCw0LfLxScz8irSi8exQc7fyQ0fKQU/qnC/X8+V/1M= go.opencensus.io v0.23.0/go.mod h1:XItmlyltB5F7CS4xOC1DcqMoFqwtC6OG2xF7mCv7P7E= -go.opentelemetry.io/collector v0.37.0 h1:X83+uWk11kW83BTkdKNt1Sk7gXyRv36wA6piT0FYfME= -go.opentelemetry.io/collector v0.37.0/go.mod h1:zbLWBJVy7bmiZHlHjCrV28vxXA/sAkCLtH5thD8ZahA= -go.opentelemetry.io/collector/model v0.37.0 h1:K1G6bgzBZ5kKSjZ1+EY9MhCOYsac4Q1K85fBUgpTVH8= +go.opentelemetry.io/collector v0.37.1-0.20211015233822-bd87fb628058 h1:6v0ba4ruY/W2cJLElDZEHDwShlSWUjK2MiBMvwfAIN0= +go.opentelemetry.io/collector v0.37.1-0.20211015233822-bd87fb628058/go.mod h1:zbLWBJVy7bmiZHlHjCrV28vxXA/sAkCLtH5thD8ZahA= go.opentelemetry.io/collector/model v0.37.0/go.mod h1:ESh1oWDNdS4fTg9sTFoYuiuvs8QuaX8yNGTPix3JZc8= +go.opentelemetry.io/collector/model v0.37.1-0.20211015233822-bd87fb628058 h1:jDw0pFIkDbvNRkkdCz1+gsBXIKbtY3GtRMPqzBeOfs4= +go.opentelemetry.io/collector/model v0.37.1-0.20211015233822-bd87fb628058/go.mod h1:ESh1oWDNdS4fTg9sTFoYuiuvs8QuaX8yNGTPix3JZc8= go.opentelemetry.io/contrib/instrumentation/google.golang.org/grpc/otelgrpc v0.25.0/go.mod h1:E5NNboN0UqSAki0Atn9kVwaN7I+l25gGxDqBueo/74E= go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.25.0/go.mod h1:NyB05cd+yPX6W5SiRNuJ90w7PV2+g2cgRbsPL7MvpME= go.opentelemetry.io/contrib/zpages v0.25.0/go.mod h1:cXBK0CNcIBD9Iiw1Hv3DvS+E8N2rtr+k+OoPs+sP0T4= diff --git a/processor/routingprocessor/go.mod b/processor/routingprocessor/go.mod index 5e947938db30..3efe7860ab13 100644 --- a/processor/routingprocessor/go.mod +++ b/processor/routingprocessor/go.mod @@ -5,13 +5,14 @@ go 1.17 require ( github.com/open-telemetry/opentelemetry-collector-contrib/exporter/jaegerexporter v0.37.1 github.com/stretchr/testify v1.7.0 - go.opentelemetry.io/collector v0.37.0 - go.opentelemetry.io/collector/model v0.37.0 + go.opentelemetry.io/collector v0.37.1-0.20211015233822-bd87fb628058 + go.opentelemetry.io/collector/model v0.37.1-0.20211015233822-bd87fb628058 go.uber.org/zap v1.19.1 google.golang.org/grpc v1.41.0 ) require ( + cloud.google.com/go v0.93.3 // indirect github.com/apache/thrift v0.15.0 // indirect github.com/cenkalti/backoff/v4 v4.1.1 // indirect github.com/davecgh/go-spew v1.1.1 // indirect @@ -40,8 +41,10 @@ require ( go.uber.org/atomic v1.9.0 // indirect go.uber.org/multierr v1.7.0 // indirect golang.org/x/net v0.0.0-20210917221730-978cfadd31cf // indirect + golang.org/x/oauth2 v0.0.0-20210819190943-2bc19b11175f // indirect golang.org/x/sys v0.0.0-20210823070655-63515b42dcdf // indirect golang.org/x/text v0.3.7 // indirect + google.golang.org/appengine v1.6.7 // indirect google.golang.org/genproto v0.0.0-20210828152312-66f60bf46e71 // indirect google.golang.org/protobuf v1.27.1 // indirect gopkg.in/yaml.v2 v2.4.0 // indirect diff --git a/processor/routingprocessor/go.sum b/processor/routingprocessor/go.sum index b3a6e22d17fc..c875e3c076c3 100644 --- a/processor/routingprocessor/go.sum +++ b/processor/routingprocessor/go.sum @@ -753,11 +753,12 @@ go.opencensus.io v0.22.4/go.mod h1:yxeiOL68Rb0Xd1ddK5vPZ/oVn4vY4Ynel7k9FzqtOIw= go.opencensus.io v0.22.5/go.mod h1:5pWMHQbX5EPX2/62yrJeAkowc+lfs/XD7Uxpq3pI6kk= go.opencensus.io v0.23.0 h1:gqCw0LfLxScz8irSi8exQc7fyQ0fKQU/qnC/X8+V/1M= go.opencensus.io v0.23.0/go.mod h1:XItmlyltB5F7CS4xOC1DcqMoFqwtC6OG2xF7mCv7P7E= -go.opentelemetry.io/collector v0.37.0 h1:X83+uWk11kW83BTkdKNt1Sk7gXyRv36wA6piT0FYfME= -go.opentelemetry.io/collector v0.37.0/go.mod h1:zbLWBJVy7bmiZHlHjCrV28vxXA/sAkCLtH5thD8ZahA= +go.opentelemetry.io/collector v0.37.1-0.20211015233822-bd87fb628058 h1:6v0ba4ruY/W2cJLElDZEHDwShlSWUjK2MiBMvwfAIN0= +go.opentelemetry.io/collector v0.37.1-0.20211015233822-bd87fb628058/go.mod h1:zbLWBJVy7bmiZHlHjCrV28vxXA/sAkCLtH5thD8ZahA= go.opentelemetry.io/collector/model v0.36.0/go.mod h1:+7YCSjJG+MqiIFjauzt7oM2qkqBsaJWh5hcsO4fwsAc= -go.opentelemetry.io/collector/model v0.37.0 h1:K1G6bgzBZ5kKSjZ1+EY9MhCOYsac4Q1K85fBUgpTVH8= go.opentelemetry.io/collector/model v0.37.0/go.mod h1:ESh1oWDNdS4fTg9sTFoYuiuvs8QuaX8yNGTPix3JZc8= +go.opentelemetry.io/collector/model v0.37.1-0.20211015233822-bd87fb628058 h1:jDw0pFIkDbvNRkkdCz1+gsBXIKbtY3GtRMPqzBeOfs4= +go.opentelemetry.io/collector/model v0.37.1-0.20211015233822-bd87fb628058/go.mod h1:ESh1oWDNdS4fTg9sTFoYuiuvs8QuaX8yNGTPix3JZc8= go.opentelemetry.io/contrib/instrumentation/google.golang.org/grpc/otelgrpc v0.25.0 h1:Wx7nFnvCaissIUZxPkBqDz2963Z+Cl+PkYbDKzTxDqQ= go.opentelemetry.io/contrib/instrumentation/google.golang.org/grpc/otelgrpc v0.25.0/go.mod h1:E5NNboN0UqSAki0Atn9kVwaN7I+l25gGxDqBueo/74E= go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.25.0/go.mod h1:NyB05cd+yPX6W5SiRNuJ90w7PV2+g2cgRbsPL7MvpME= diff --git a/processor/spanmetricsprocessor/go.mod b/processor/spanmetricsprocessor/go.mod index 516459756dfc..6f3c6d26a27e 100644 --- a/processor/spanmetricsprocessor/go.mod +++ b/processor/spanmetricsprocessor/go.mod @@ -7,8 +7,8 @@ require ( github.com/open-telemetry/opentelemetry-collector-contrib/exporter/prometheusexporter v0.37.1 github.com/open-telemetry/opentelemetry-collector-contrib/receiver/jaegerreceiver v0.37.1 github.com/stretchr/testify v1.7.0 - go.opentelemetry.io/collector v0.37.0 - go.opentelemetry.io/collector/model v0.37.0 + go.opentelemetry.io/collector v0.37.1-0.20211015233822-bd87fb628058 + go.opentelemetry.io/collector/model v0.37.1-0.20211015233822-bd87fb628058 go.uber.org/zap v1.19.1 google.golang.org/grpc v1.41.0 ) diff --git a/processor/spanmetricsprocessor/go.sum b/processor/spanmetricsprocessor/go.sum index c8979a187fe1..d23876c9eb47 100644 --- a/processor/spanmetricsprocessor/go.sum +++ b/processor/spanmetricsprocessor/go.sum @@ -1456,11 +1456,12 @@ go.opencensus.io v0.22.4/go.mod h1:yxeiOL68Rb0Xd1ddK5vPZ/oVn4vY4Ynel7k9FzqtOIw= go.opencensus.io v0.22.5/go.mod h1:5pWMHQbX5EPX2/62yrJeAkowc+lfs/XD7Uxpq3pI6kk= go.opencensus.io v0.23.0 h1:gqCw0LfLxScz8irSi8exQc7fyQ0fKQU/qnC/X8+V/1M= go.opencensus.io v0.23.0/go.mod h1:XItmlyltB5F7CS4xOC1DcqMoFqwtC6OG2xF7mCv7P7E= -go.opentelemetry.io/collector v0.37.0 h1:X83+uWk11kW83BTkdKNt1Sk7gXyRv36wA6piT0FYfME= -go.opentelemetry.io/collector v0.37.0/go.mod h1:zbLWBJVy7bmiZHlHjCrV28vxXA/sAkCLtH5thD8ZahA= +go.opentelemetry.io/collector v0.37.1-0.20211015233822-bd87fb628058 h1:6v0ba4ruY/W2cJLElDZEHDwShlSWUjK2MiBMvwfAIN0= +go.opentelemetry.io/collector v0.37.1-0.20211015233822-bd87fb628058/go.mod h1:zbLWBJVy7bmiZHlHjCrV28vxXA/sAkCLtH5thD8ZahA= go.opentelemetry.io/collector/model v0.36.0/go.mod h1:+7YCSjJG+MqiIFjauzt7oM2qkqBsaJWh5hcsO4fwsAc= -go.opentelemetry.io/collector/model v0.37.0 h1:K1G6bgzBZ5kKSjZ1+EY9MhCOYsac4Q1K85fBUgpTVH8= go.opentelemetry.io/collector/model v0.37.0/go.mod h1:ESh1oWDNdS4fTg9sTFoYuiuvs8QuaX8yNGTPix3JZc8= +go.opentelemetry.io/collector/model v0.37.1-0.20211015233822-bd87fb628058 h1:jDw0pFIkDbvNRkkdCz1+gsBXIKbtY3GtRMPqzBeOfs4= +go.opentelemetry.io/collector/model v0.37.1-0.20211015233822-bd87fb628058/go.mod h1:ESh1oWDNdS4fTg9sTFoYuiuvs8QuaX8yNGTPix3JZc8= go.opentelemetry.io/contrib/instrumentation/google.golang.org/grpc/otelgrpc v0.25.0 h1:Wx7nFnvCaissIUZxPkBqDz2963Z+Cl+PkYbDKzTxDqQ= go.opentelemetry.io/contrib/instrumentation/google.golang.org/grpc/otelgrpc v0.25.0/go.mod h1:E5NNboN0UqSAki0Atn9kVwaN7I+l25gGxDqBueo/74E= go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.25.0 h1:FIbb8m2PtTWjvXLHOEnXAoSmkaiXbg3fuvoZAjsAT3Q= diff --git a/processor/spanprocessor/go.mod b/processor/spanprocessor/go.mod index 525ec585d8df..2951e5cf6447 100644 --- a/processor/spanprocessor/go.mod +++ b/processor/spanprocessor/go.mod @@ -5,8 +5,8 @@ go 1.17 require ( github.com/open-telemetry/opentelemetry-collector-contrib/internal/coreinternal v0.37.1 github.com/stretchr/testify v1.7.0 - go.opentelemetry.io/collector v0.37.0 - go.opentelemetry.io/collector/model v0.37.0 + go.opentelemetry.io/collector v0.37.1-0.20211015233822-bd87fb628058 + go.opentelemetry.io/collector/model v0.37.1-0.20211015233822-bd87fb628058 ) require ( diff --git a/processor/spanprocessor/go.sum b/processor/spanprocessor/go.sum index 92559a2daa16..242c3536b646 100644 --- a/processor/spanprocessor/go.sum +++ b/processor/spanprocessor/go.sum @@ -389,10 +389,11 @@ go.opencensus.io v0.22.4/go.mod h1:yxeiOL68Rb0Xd1ddK5vPZ/oVn4vY4Ynel7k9FzqtOIw= go.opencensus.io v0.22.5/go.mod h1:5pWMHQbX5EPX2/62yrJeAkowc+lfs/XD7Uxpq3pI6kk= go.opencensus.io v0.23.0 h1:gqCw0LfLxScz8irSi8exQc7fyQ0fKQU/qnC/X8+V/1M= go.opencensus.io v0.23.0/go.mod h1:XItmlyltB5F7CS4xOC1DcqMoFqwtC6OG2xF7mCv7P7E= -go.opentelemetry.io/collector v0.37.0 h1:X83+uWk11kW83BTkdKNt1Sk7gXyRv36wA6piT0FYfME= -go.opentelemetry.io/collector v0.37.0/go.mod h1:zbLWBJVy7bmiZHlHjCrV28vxXA/sAkCLtH5thD8ZahA= -go.opentelemetry.io/collector/model v0.37.0 h1:K1G6bgzBZ5kKSjZ1+EY9MhCOYsac4Q1K85fBUgpTVH8= +go.opentelemetry.io/collector v0.37.1-0.20211015233822-bd87fb628058 h1:6v0ba4ruY/W2cJLElDZEHDwShlSWUjK2MiBMvwfAIN0= +go.opentelemetry.io/collector v0.37.1-0.20211015233822-bd87fb628058/go.mod h1:zbLWBJVy7bmiZHlHjCrV28vxXA/sAkCLtH5thD8ZahA= go.opentelemetry.io/collector/model v0.37.0/go.mod h1:ESh1oWDNdS4fTg9sTFoYuiuvs8QuaX8yNGTPix3JZc8= +go.opentelemetry.io/collector/model v0.37.1-0.20211015233822-bd87fb628058 h1:jDw0pFIkDbvNRkkdCz1+gsBXIKbtY3GtRMPqzBeOfs4= +go.opentelemetry.io/collector/model v0.37.1-0.20211015233822-bd87fb628058/go.mod h1:ESh1oWDNdS4fTg9sTFoYuiuvs8QuaX8yNGTPix3JZc8= go.opentelemetry.io/contrib/instrumentation/google.golang.org/grpc/otelgrpc v0.25.0/go.mod h1:E5NNboN0UqSAki0Atn9kVwaN7I+l25gGxDqBueo/74E= go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.25.0/go.mod h1:NyB05cd+yPX6W5SiRNuJ90w7PV2+g2cgRbsPL7MvpME= go.opentelemetry.io/contrib/zpages v0.25.0/go.mod h1:cXBK0CNcIBD9Iiw1Hv3DvS+E8N2rtr+k+OoPs+sP0T4= diff --git a/processor/tailsamplingprocessor/go.mod b/processor/tailsamplingprocessor/go.mod index 48ae243f2b7e..da2f40c3de0a 100644 --- a/processor/tailsamplingprocessor/go.mod +++ b/processor/tailsamplingprocessor/go.mod @@ -7,8 +7,8 @@ require ( github.com/google/uuid v1.3.0 github.com/stretchr/testify v1.7.0 go.opencensus.io v0.23.0 - go.opentelemetry.io/collector v0.37.0 - go.opentelemetry.io/collector/model v0.37.0 + go.opentelemetry.io/collector v0.37.1-0.20211015233822-bd87fb628058 + go.opentelemetry.io/collector/model v0.37.1-0.20211015233822-bd87fb628058 go.uber.org/zap v1.19.1 ) diff --git a/processor/tailsamplingprocessor/go.sum b/processor/tailsamplingprocessor/go.sum index 2eb2e1005db0..dababf5d3c11 100644 --- a/processor/tailsamplingprocessor/go.sum +++ b/processor/tailsamplingprocessor/go.sum @@ -375,10 +375,11 @@ go.opencensus.io v0.22.4/go.mod h1:yxeiOL68Rb0Xd1ddK5vPZ/oVn4vY4Ynel7k9FzqtOIw= go.opencensus.io v0.22.5/go.mod h1:5pWMHQbX5EPX2/62yrJeAkowc+lfs/XD7Uxpq3pI6kk= go.opencensus.io v0.23.0 h1:gqCw0LfLxScz8irSi8exQc7fyQ0fKQU/qnC/X8+V/1M= go.opencensus.io v0.23.0/go.mod h1:XItmlyltB5F7CS4xOC1DcqMoFqwtC6OG2xF7mCv7P7E= -go.opentelemetry.io/collector v0.37.0 h1:X83+uWk11kW83BTkdKNt1Sk7gXyRv36wA6piT0FYfME= -go.opentelemetry.io/collector v0.37.0/go.mod h1:zbLWBJVy7bmiZHlHjCrV28vxXA/sAkCLtH5thD8ZahA= -go.opentelemetry.io/collector/model v0.37.0 h1:K1G6bgzBZ5kKSjZ1+EY9MhCOYsac4Q1K85fBUgpTVH8= +go.opentelemetry.io/collector v0.37.1-0.20211015233822-bd87fb628058 h1:6v0ba4ruY/W2cJLElDZEHDwShlSWUjK2MiBMvwfAIN0= +go.opentelemetry.io/collector v0.37.1-0.20211015233822-bd87fb628058/go.mod h1:zbLWBJVy7bmiZHlHjCrV28vxXA/sAkCLtH5thD8ZahA= go.opentelemetry.io/collector/model v0.37.0/go.mod h1:ESh1oWDNdS4fTg9sTFoYuiuvs8QuaX8yNGTPix3JZc8= +go.opentelemetry.io/collector/model v0.37.1-0.20211015233822-bd87fb628058 h1:jDw0pFIkDbvNRkkdCz1+gsBXIKbtY3GtRMPqzBeOfs4= +go.opentelemetry.io/collector/model v0.37.1-0.20211015233822-bd87fb628058/go.mod h1:ESh1oWDNdS4fTg9sTFoYuiuvs8QuaX8yNGTPix3JZc8= go.opentelemetry.io/contrib/instrumentation/google.golang.org/grpc/otelgrpc v0.25.0/go.mod h1:E5NNboN0UqSAki0Atn9kVwaN7I+l25gGxDqBueo/74E= go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.25.0/go.mod h1:NyB05cd+yPX6W5SiRNuJ90w7PV2+g2cgRbsPL7MvpME= go.opentelemetry.io/contrib/zpages v0.25.0/go.mod h1:cXBK0CNcIBD9Iiw1Hv3DvS+E8N2rtr+k+OoPs+sP0T4= diff --git a/receiver/awscontainerinsightreceiver/go.mod b/receiver/awscontainerinsightreceiver/go.mod index 674e438730aa..036bfe9bacdc 100644 --- a/receiver/awscontainerinsightreceiver/go.mod +++ b/receiver/awscontainerinsightreceiver/go.mod @@ -13,8 +13,8 @@ require ( github.com/open-telemetry/opentelemetry-collector-contrib/internal/kubelet v0.37.1 github.com/shirou/gopsutil/v3 v3.21.9 github.com/stretchr/testify v1.7.0 - go.opentelemetry.io/collector v0.37.0 - go.opentelemetry.io/collector/model v0.37.0 + go.opentelemetry.io/collector v0.37.1-0.20211015233822-bd87fb628058 + go.opentelemetry.io/collector/model v0.37.1-0.20211015233822-bd87fb628058 go.uber.org/zap v1.19.1 k8s.io/api v0.22.2 k8s.io/apimachinery v0.22.2 diff --git a/receiver/awscontainerinsightreceiver/go.sum b/receiver/awscontainerinsightreceiver/go.sum index 13e0c3d32b2f..40254cee1142 100644 --- a/receiver/awscontainerinsightreceiver/go.sum +++ b/receiver/awscontainerinsightreceiver/go.sum @@ -863,11 +863,12 @@ go.opencensus.io v0.22.4/go.mod h1:yxeiOL68Rb0Xd1ddK5vPZ/oVn4vY4Ynel7k9FzqtOIw= go.opencensus.io v0.22.5/go.mod h1:5pWMHQbX5EPX2/62yrJeAkowc+lfs/XD7Uxpq3pI6kk= go.opencensus.io v0.23.0 h1:gqCw0LfLxScz8irSi8exQc7fyQ0fKQU/qnC/X8+V/1M= go.opencensus.io v0.23.0/go.mod h1:XItmlyltB5F7CS4xOC1DcqMoFqwtC6OG2xF7mCv7P7E= -go.opentelemetry.io/collector v0.37.0 h1:X83+uWk11kW83BTkdKNt1Sk7gXyRv36wA6piT0FYfME= -go.opentelemetry.io/collector v0.37.0/go.mod h1:zbLWBJVy7bmiZHlHjCrV28vxXA/sAkCLtH5thD8ZahA= +go.opentelemetry.io/collector v0.37.1-0.20211015233822-bd87fb628058 h1:6v0ba4ruY/W2cJLElDZEHDwShlSWUjK2MiBMvwfAIN0= +go.opentelemetry.io/collector v0.37.1-0.20211015233822-bd87fb628058/go.mod h1:zbLWBJVy7bmiZHlHjCrV28vxXA/sAkCLtH5thD8ZahA= go.opentelemetry.io/collector/model v0.30.2-0.20210723184018-3b7d6ce4830c/go.mod h1:PcHNnM+RUl0uD8VkSn93PO78N7kQYhfqpI/eki57pl4= -go.opentelemetry.io/collector/model v0.37.0 h1:K1G6bgzBZ5kKSjZ1+EY9MhCOYsac4Q1K85fBUgpTVH8= go.opentelemetry.io/collector/model v0.37.0/go.mod h1:ESh1oWDNdS4fTg9sTFoYuiuvs8QuaX8yNGTPix3JZc8= +go.opentelemetry.io/collector/model v0.37.1-0.20211015233822-bd87fb628058 h1:jDw0pFIkDbvNRkkdCz1+gsBXIKbtY3GtRMPqzBeOfs4= +go.opentelemetry.io/collector/model v0.37.1-0.20211015233822-bd87fb628058/go.mod h1:ESh1oWDNdS4fTg9sTFoYuiuvs8QuaX8yNGTPix3JZc8= go.opentelemetry.io/contrib/instrumentation/google.golang.org/grpc/otelgrpc v0.25.0/go.mod h1:E5NNboN0UqSAki0Atn9kVwaN7I+l25gGxDqBueo/74E= go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.25.0 h1:FIbb8m2PtTWjvXLHOEnXAoSmkaiXbg3fuvoZAjsAT3Q= go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.25.0/go.mod h1:NyB05cd+yPX6W5SiRNuJ90w7PV2+g2cgRbsPL7MvpME= diff --git a/receiver/awsecscontainermetricsreceiver/go.mod b/receiver/awsecscontainermetricsreceiver/go.mod index 7253565712d9..84dc08dfe828 100644 --- a/receiver/awsecscontainermetricsreceiver/go.mod +++ b/receiver/awsecscontainermetricsreceiver/go.mod @@ -6,8 +6,8 @@ require ( github.com/census-instrumentation/opencensus-proto v0.3.0 github.com/open-telemetry/opentelemetry-collector-contrib/internal/coreinternal v0.37.1 github.com/stretchr/testify v1.7.0 - go.opentelemetry.io/collector v0.37.0 - go.opentelemetry.io/collector/model v0.37.0 + go.opentelemetry.io/collector v0.37.1-0.20211015233822-bd87fb628058 + go.opentelemetry.io/collector/model v0.37.1-0.20211015233822-bd87fb628058 go.uber.org/zap v1.19.1 google.golang.org/protobuf v1.27.1 diff --git a/receiver/awsecscontainermetricsreceiver/go.sum b/receiver/awsecscontainermetricsreceiver/go.sum index acb03493fde2..ecd5f64b560e 100644 --- a/receiver/awsecscontainermetricsreceiver/go.sum +++ b/receiver/awsecscontainermetricsreceiver/go.sum @@ -389,10 +389,11 @@ go.opencensus.io v0.22.4/go.mod h1:yxeiOL68Rb0Xd1ddK5vPZ/oVn4vY4Ynel7k9FzqtOIw= go.opencensus.io v0.22.5/go.mod h1:5pWMHQbX5EPX2/62yrJeAkowc+lfs/XD7Uxpq3pI6kk= go.opencensus.io v0.23.0 h1:gqCw0LfLxScz8irSi8exQc7fyQ0fKQU/qnC/X8+V/1M= go.opencensus.io v0.23.0/go.mod h1:XItmlyltB5F7CS4xOC1DcqMoFqwtC6OG2xF7mCv7P7E= -go.opentelemetry.io/collector v0.37.0 h1:X83+uWk11kW83BTkdKNt1Sk7gXyRv36wA6piT0FYfME= -go.opentelemetry.io/collector v0.37.0/go.mod h1:zbLWBJVy7bmiZHlHjCrV28vxXA/sAkCLtH5thD8ZahA= -go.opentelemetry.io/collector/model v0.37.0 h1:K1G6bgzBZ5kKSjZ1+EY9MhCOYsac4Q1K85fBUgpTVH8= +go.opentelemetry.io/collector v0.37.1-0.20211015233822-bd87fb628058 h1:6v0ba4ruY/W2cJLElDZEHDwShlSWUjK2MiBMvwfAIN0= +go.opentelemetry.io/collector v0.37.1-0.20211015233822-bd87fb628058/go.mod h1:zbLWBJVy7bmiZHlHjCrV28vxXA/sAkCLtH5thD8ZahA= go.opentelemetry.io/collector/model v0.37.0/go.mod h1:ESh1oWDNdS4fTg9sTFoYuiuvs8QuaX8yNGTPix3JZc8= +go.opentelemetry.io/collector/model v0.37.1-0.20211015233822-bd87fb628058 h1:jDw0pFIkDbvNRkkdCz1+gsBXIKbtY3GtRMPqzBeOfs4= +go.opentelemetry.io/collector/model v0.37.1-0.20211015233822-bd87fb628058/go.mod h1:ESh1oWDNdS4fTg9sTFoYuiuvs8QuaX8yNGTPix3JZc8= go.opentelemetry.io/contrib/instrumentation/google.golang.org/grpc/otelgrpc v0.25.0/go.mod h1:E5NNboN0UqSAki0Atn9kVwaN7I+l25gGxDqBueo/74E= go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.25.0/go.mod h1:NyB05cd+yPX6W5SiRNuJ90w7PV2+g2cgRbsPL7MvpME= go.opentelemetry.io/contrib/zpages v0.25.0/go.mod h1:cXBK0CNcIBD9Iiw1Hv3DvS+E8N2rtr+k+OoPs+sP0T4= diff --git a/receiver/awsxrayreceiver/go.mod b/receiver/awsxrayreceiver/go.mod index 917d3bdfa583..27329a3c6290 100644 --- a/receiver/awsxrayreceiver/go.mod +++ b/receiver/awsxrayreceiver/go.mod @@ -9,8 +9,8 @@ require ( github.com/open-telemetry/opentelemetry-collector-contrib/internal/aws/xray v0.37.1 github.com/open-telemetry/opentelemetry-collector-contrib/internal/coreinternal v0.37.1 github.com/stretchr/testify v1.7.0 - go.opentelemetry.io/collector v0.37.0 - go.opentelemetry.io/collector/model v0.37.0 + go.opentelemetry.io/collector v0.37.1-0.20211015233822-bd87fb628058 + go.opentelemetry.io/collector/model v0.37.1-0.20211015233822-bd87fb628058 go.uber.org/zap v1.19.1 ) diff --git a/receiver/awsxrayreceiver/go.sum b/receiver/awsxrayreceiver/go.sum index b5cbffc199b6..838e14d4e23b 100644 --- a/receiver/awsxrayreceiver/go.sum +++ b/receiver/awsxrayreceiver/go.sum @@ -396,10 +396,11 @@ go.opencensus.io v0.22.4/go.mod h1:yxeiOL68Rb0Xd1ddK5vPZ/oVn4vY4Ynel7k9FzqtOIw= go.opencensus.io v0.22.5/go.mod h1:5pWMHQbX5EPX2/62yrJeAkowc+lfs/XD7Uxpq3pI6kk= go.opencensus.io v0.23.0 h1:gqCw0LfLxScz8irSi8exQc7fyQ0fKQU/qnC/X8+V/1M= go.opencensus.io v0.23.0/go.mod h1:XItmlyltB5F7CS4xOC1DcqMoFqwtC6OG2xF7mCv7P7E= -go.opentelemetry.io/collector v0.37.0 h1:X83+uWk11kW83BTkdKNt1Sk7gXyRv36wA6piT0FYfME= -go.opentelemetry.io/collector v0.37.0/go.mod h1:zbLWBJVy7bmiZHlHjCrV28vxXA/sAkCLtH5thD8ZahA= -go.opentelemetry.io/collector/model v0.37.0 h1:K1G6bgzBZ5kKSjZ1+EY9MhCOYsac4Q1K85fBUgpTVH8= +go.opentelemetry.io/collector v0.37.1-0.20211015233822-bd87fb628058 h1:6v0ba4ruY/W2cJLElDZEHDwShlSWUjK2MiBMvwfAIN0= +go.opentelemetry.io/collector v0.37.1-0.20211015233822-bd87fb628058/go.mod h1:zbLWBJVy7bmiZHlHjCrV28vxXA/sAkCLtH5thD8ZahA= go.opentelemetry.io/collector/model v0.37.0/go.mod h1:ESh1oWDNdS4fTg9sTFoYuiuvs8QuaX8yNGTPix3JZc8= +go.opentelemetry.io/collector/model v0.37.1-0.20211015233822-bd87fb628058 h1:jDw0pFIkDbvNRkkdCz1+gsBXIKbtY3GtRMPqzBeOfs4= +go.opentelemetry.io/collector/model v0.37.1-0.20211015233822-bd87fb628058/go.mod h1:ESh1oWDNdS4fTg9sTFoYuiuvs8QuaX8yNGTPix3JZc8= go.opentelemetry.io/contrib/instrumentation/google.golang.org/grpc/otelgrpc v0.25.0/go.mod h1:E5NNboN0UqSAki0Atn9kVwaN7I+l25gGxDqBueo/74E= go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.25.0/go.mod h1:NyB05cd+yPX6W5SiRNuJ90w7PV2+g2cgRbsPL7MvpME= go.opentelemetry.io/contrib/zpages v0.25.0/go.mod h1:cXBK0CNcIBD9Iiw1Hv3DvS+E8N2rtr+k+OoPs+sP0T4= diff --git a/receiver/carbonreceiver/go.mod b/receiver/carbonreceiver/go.mod index 325c5b9e33ff..482b9b8b7ced 100644 --- a/receiver/carbonreceiver/go.mod +++ b/receiver/carbonreceiver/go.mod @@ -8,7 +8,7 @@ require ( github.com/open-telemetry/opentelemetry-collector-contrib/pkg/translator/opencensus v0.37.1 github.com/stretchr/testify v1.7.0 go.opencensus.io v0.23.0 - go.opentelemetry.io/collector v0.37.0 + go.opentelemetry.io/collector v0.37.1-0.20211015233822-bd87fb628058 go.uber.org/zap v1.19.1 google.golang.org/protobuf v1.27.1 @@ -27,7 +27,7 @@ require ( github.com/mitchellh/reflectwalk v1.0.2 // indirect github.com/pmezard/go-difflib v1.0.0 // indirect github.com/spf13/cast v1.4.1 // indirect - go.opentelemetry.io/collector/model v0.37.0 // indirect + go.opentelemetry.io/collector/model v0.37.1-0.20211015233822-bd87fb628058 // indirect go.opentelemetry.io/otel v1.0.1 // indirect go.opentelemetry.io/otel/metric v0.24.0 // indirect go.opentelemetry.io/otel/sdk v1.0.1 // indirect diff --git a/receiver/carbonreceiver/go.sum b/receiver/carbonreceiver/go.sum index 755c39eedf57..3c3eefd4dcf5 100644 --- a/receiver/carbonreceiver/go.sum +++ b/receiver/carbonreceiver/go.sum @@ -391,10 +391,11 @@ go.opencensus.io v0.22.4/go.mod h1:yxeiOL68Rb0Xd1ddK5vPZ/oVn4vY4Ynel7k9FzqtOIw= go.opencensus.io v0.22.5/go.mod h1:5pWMHQbX5EPX2/62yrJeAkowc+lfs/XD7Uxpq3pI6kk= go.opencensus.io v0.23.0 h1:gqCw0LfLxScz8irSi8exQc7fyQ0fKQU/qnC/X8+V/1M= go.opencensus.io v0.23.0/go.mod h1:XItmlyltB5F7CS4xOC1DcqMoFqwtC6OG2xF7mCv7P7E= -go.opentelemetry.io/collector v0.37.0 h1:X83+uWk11kW83BTkdKNt1Sk7gXyRv36wA6piT0FYfME= -go.opentelemetry.io/collector v0.37.0/go.mod h1:zbLWBJVy7bmiZHlHjCrV28vxXA/sAkCLtH5thD8ZahA= -go.opentelemetry.io/collector/model v0.37.0 h1:K1G6bgzBZ5kKSjZ1+EY9MhCOYsac4Q1K85fBUgpTVH8= +go.opentelemetry.io/collector v0.37.1-0.20211015233822-bd87fb628058 h1:6v0ba4ruY/W2cJLElDZEHDwShlSWUjK2MiBMvwfAIN0= +go.opentelemetry.io/collector v0.37.1-0.20211015233822-bd87fb628058/go.mod h1:zbLWBJVy7bmiZHlHjCrV28vxXA/sAkCLtH5thD8ZahA= go.opentelemetry.io/collector/model v0.37.0/go.mod h1:ESh1oWDNdS4fTg9sTFoYuiuvs8QuaX8yNGTPix3JZc8= +go.opentelemetry.io/collector/model v0.37.1-0.20211015233822-bd87fb628058 h1:jDw0pFIkDbvNRkkdCz1+gsBXIKbtY3GtRMPqzBeOfs4= +go.opentelemetry.io/collector/model v0.37.1-0.20211015233822-bd87fb628058/go.mod h1:ESh1oWDNdS4fTg9sTFoYuiuvs8QuaX8yNGTPix3JZc8= go.opentelemetry.io/contrib/instrumentation/google.golang.org/grpc/otelgrpc v0.25.0/go.mod h1:E5NNboN0UqSAki0Atn9kVwaN7I+l25gGxDqBueo/74E= go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.25.0/go.mod h1:NyB05cd+yPX6W5SiRNuJ90w7PV2+g2cgRbsPL7MvpME= go.opentelemetry.io/contrib/zpages v0.25.0/go.mod h1:cXBK0CNcIBD9Iiw1Hv3DvS+E8N2rtr+k+OoPs+sP0T4= diff --git a/receiver/cloudfoundryreceiver/go.mod b/receiver/cloudfoundryreceiver/go.mod index 40b1d185f9d4..434da2eac86b 100644 --- a/receiver/cloudfoundryreceiver/go.mod +++ b/receiver/cloudfoundryreceiver/go.mod @@ -4,7 +4,7 @@ go 1.17 require ( github.com/stretchr/testify v1.7.0 - go.opentelemetry.io/collector v0.37.0 + go.opentelemetry.io/collector v0.37.1-0.20211015233822-bd87fb628058 go.uber.org/zap v1.19.1 ) @@ -23,7 +23,7 @@ require ( github.com/pmezard/go-difflib v1.0.0 // indirect github.com/rogpeppe/go-internal v1.6.1 // indirect github.com/spf13/cast v1.4.1 // indirect - go.opentelemetry.io/collector/model v0.37.0 // indirect + go.opentelemetry.io/collector/model v0.37.1-0.20211015233822-bd87fb628058 // indirect go.opentelemetry.io/otel v1.0.1 // indirect go.opentelemetry.io/otel/metric v0.24.0 // indirect go.opentelemetry.io/otel/trace v1.0.1 // indirect diff --git a/receiver/cloudfoundryreceiver/go.sum b/receiver/cloudfoundryreceiver/go.sum index dc817990e0a6..40e354a8c891 100644 --- a/receiver/cloudfoundryreceiver/go.sum +++ b/receiver/cloudfoundryreceiver/go.sum @@ -373,10 +373,11 @@ go.opencensus.io v0.22.4/go.mod h1:yxeiOL68Rb0Xd1ddK5vPZ/oVn4vY4Ynel7k9FzqtOIw= go.opencensus.io v0.22.5/go.mod h1:5pWMHQbX5EPX2/62yrJeAkowc+lfs/XD7Uxpq3pI6kk= go.opencensus.io v0.23.0 h1:gqCw0LfLxScz8irSi8exQc7fyQ0fKQU/qnC/X8+V/1M= go.opencensus.io v0.23.0/go.mod h1:XItmlyltB5F7CS4xOC1DcqMoFqwtC6OG2xF7mCv7P7E= -go.opentelemetry.io/collector v0.37.0 h1:X83+uWk11kW83BTkdKNt1Sk7gXyRv36wA6piT0FYfME= -go.opentelemetry.io/collector v0.37.0/go.mod h1:zbLWBJVy7bmiZHlHjCrV28vxXA/sAkCLtH5thD8ZahA= -go.opentelemetry.io/collector/model v0.37.0 h1:K1G6bgzBZ5kKSjZ1+EY9MhCOYsac4Q1K85fBUgpTVH8= +go.opentelemetry.io/collector v0.37.1-0.20211015233822-bd87fb628058 h1:6v0ba4ruY/W2cJLElDZEHDwShlSWUjK2MiBMvwfAIN0= +go.opentelemetry.io/collector v0.37.1-0.20211015233822-bd87fb628058/go.mod h1:zbLWBJVy7bmiZHlHjCrV28vxXA/sAkCLtH5thD8ZahA= go.opentelemetry.io/collector/model v0.37.0/go.mod h1:ESh1oWDNdS4fTg9sTFoYuiuvs8QuaX8yNGTPix3JZc8= +go.opentelemetry.io/collector/model v0.37.1-0.20211015233822-bd87fb628058 h1:jDw0pFIkDbvNRkkdCz1+gsBXIKbtY3GtRMPqzBeOfs4= +go.opentelemetry.io/collector/model v0.37.1-0.20211015233822-bd87fb628058/go.mod h1:ESh1oWDNdS4fTg9sTFoYuiuvs8QuaX8yNGTPix3JZc8= go.opentelemetry.io/contrib/instrumentation/google.golang.org/grpc/otelgrpc v0.25.0/go.mod h1:E5NNboN0UqSAki0Atn9kVwaN7I+l25gGxDqBueo/74E= go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.25.0/go.mod h1:NyB05cd+yPX6W5SiRNuJ90w7PV2+g2cgRbsPL7MvpME= go.opentelemetry.io/contrib/zpages v0.25.0/go.mod h1:cXBK0CNcIBD9Iiw1Hv3DvS+E8N2rtr+k+OoPs+sP0T4= diff --git a/receiver/collectdreceiver/go.mod b/receiver/collectdreceiver/go.mod index cab952274b26..5771bdaa3e1e 100644 --- a/receiver/collectdreceiver/go.mod +++ b/receiver/collectdreceiver/go.mod @@ -7,7 +7,7 @@ require ( github.com/open-telemetry/opentelemetry-collector-contrib/pkg/translator/opencensus v0.37.1 github.com/stretchr/testify v1.7.0 go.opencensus.io v0.23.0 - go.opentelemetry.io/collector v0.37.0 + go.opentelemetry.io/collector v0.37.1-0.20211015233822-bd87fb628058 go.uber.org/zap v1.19.1 google.golang.org/protobuf v1.27.1 @@ -28,7 +28,7 @@ require ( github.com/open-telemetry/opentelemetry-collector-contrib/internal/coreinternal v0.37.1 // indirect github.com/pmezard/go-difflib v1.0.0 // indirect github.com/spf13/cast v1.4.1 // indirect - go.opentelemetry.io/collector/model v0.37.0 // indirect + go.opentelemetry.io/collector/model v0.37.1-0.20211015233822-bd87fb628058 // indirect go.opentelemetry.io/otel v1.0.1 // indirect go.opentelemetry.io/otel/metric v0.24.0 // indirect go.opentelemetry.io/otel/trace v1.0.1 // indirect diff --git a/receiver/collectdreceiver/go.sum b/receiver/collectdreceiver/go.sum index 0bfffbf3799f..5c0cc08c4eaa 100644 --- a/receiver/collectdreceiver/go.sum +++ b/receiver/collectdreceiver/go.sum @@ -391,10 +391,11 @@ go.opencensus.io v0.22.4/go.mod h1:yxeiOL68Rb0Xd1ddK5vPZ/oVn4vY4Ynel7k9FzqtOIw= go.opencensus.io v0.22.5/go.mod h1:5pWMHQbX5EPX2/62yrJeAkowc+lfs/XD7Uxpq3pI6kk= go.opencensus.io v0.23.0 h1:gqCw0LfLxScz8irSi8exQc7fyQ0fKQU/qnC/X8+V/1M= go.opencensus.io v0.23.0/go.mod h1:XItmlyltB5F7CS4xOC1DcqMoFqwtC6OG2xF7mCv7P7E= -go.opentelemetry.io/collector v0.37.0 h1:X83+uWk11kW83BTkdKNt1Sk7gXyRv36wA6piT0FYfME= -go.opentelemetry.io/collector v0.37.0/go.mod h1:zbLWBJVy7bmiZHlHjCrV28vxXA/sAkCLtH5thD8ZahA= -go.opentelemetry.io/collector/model v0.37.0 h1:K1G6bgzBZ5kKSjZ1+EY9MhCOYsac4Q1K85fBUgpTVH8= +go.opentelemetry.io/collector v0.37.1-0.20211015233822-bd87fb628058 h1:6v0ba4ruY/W2cJLElDZEHDwShlSWUjK2MiBMvwfAIN0= +go.opentelemetry.io/collector v0.37.1-0.20211015233822-bd87fb628058/go.mod h1:zbLWBJVy7bmiZHlHjCrV28vxXA/sAkCLtH5thD8ZahA= go.opentelemetry.io/collector/model v0.37.0/go.mod h1:ESh1oWDNdS4fTg9sTFoYuiuvs8QuaX8yNGTPix3JZc8= +go.opentelemetry.io/collector/model v0.37.1-0.20211015233822-bd87fb628058 h1:jDw0pFIkDbvNRkkdCz1+gsBXIKbtY3GtRMPqzBeOfs4= +go.opentelemetry.io/collector/model v0.37.1-0.20211015233822-bd87fb628058/go.mod h1:ESh1oWDNdS4fTg9sTFoYuiuvs8QuaX8yNGTPix3JZc8= go.opentelemetry.io/contrib/instrumentation/google.golang.org/grpc/otelgrpc v0.25.0/go.mod h1:E5NNboN0UqSAki0Atn9kVwaN7I+l25gGxDqBueo/74E= go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.25.0/go.mod h1:NyB05cd+yPX6W5SiRNuJ90w7PV2+g2cgRbsPL7MvpME= go.opentelemetry.io/contrib/zpages v0.25.0/go.mod h1:cXBK0CNcIBD9Iiw1Hv3DvS+E8N2rtr+k+OoPs+sP0T4= diff --git a/receiver/dockerstatsreceiver/go.mod b/receiver/dockerstatsreceiver/go.mod index c90920af2f37..cd2a93d8c5a3 100644 --- a/receiver/dockerstatsreceiver/go.mod +++ b/receiver/dockerstatsreceiver/go.mod @@ -8,8 +8,8 @@ require ( github.com/open-telemetry/opentelemetry-collector-contrib/internal/docker v0.37.1 github.com/open-telemetry/opentelemetry-collector-contrib/internal/interval v0.37.1 github.com/stretchr/testify v1.7.0 - go.opentelemetry.io/collector v0.37.0 - go.opentelemetry.io/collector/model v0.37.0 + go.opentelemetry.io/collector v0.37.1-0.20211015233822-bd87fb628058 + go.opentelemetry.io/collector/model v0.37.1-0.20211015233822-bd87fb628058 go.uber.org/zap v1.19.1 ) diff --git a/receiver/dockerstatsreceiver/go.sum b/receiver/dockerstatsreceiver/go.sum index c1c64558d629..f02b4009b8f4 100644 --- a/receiver/dockerstatsreceiver/go.sum +++ b/receiver/dockerstatsreceiver/go.sum @@ -781,10 +781,11 @@ go.opencensus.io v0.22.4/go.mod h1:yxeiOL68Rb0Xd1ddK5vPZ/oVn4vY4Ynel7k9FzqtOIw= go.opencensus.io v0.22.5/go.mod h1:5pWMHQbX5EPX2/62yrJeAkowc+lfs/XD7Uxpq3pI6kk= go.opencensus.io v0.23.0 h1:gqCw0LfLxScz8irSi8exQc7fyQ0fKQU/qnC/X8+V/1M= go.opencensus.io v0.23.0/go.mod h1:XItmlyltB5F7CS4xOC1DcqMoFqwtC6OG2xF7mCv7P7E= -go.opentelemetry.io/collector v0.37.0 h1:X83+uWk11kW83BTkdKNt1Sk7gXyRv36wA6piT0FYfME= -go.opentelemetry.io/collector v0.37.0/go.mod h1:zbLWBJVy7bmiZHlHjCrV28vxXA/sAkCLtH5thD8ZahA= -go.opentelemetry.io/collector/model v0.37.0 h1:K1G6bgzBZ5kKSjZ1+EY9MhCOYsac4Q1K85fBUgpTVH8= +go.opentelemetry.io/collector v0.37.1-0.20211015233822-bd87fb628058 h1:6v0ba4ruY/W2cJLElDZEHDwShlSWUjK2MiBMvwfAIN0= +go.opentelemetry.io/collector v0.37.1-0.20211015233822-bd87fb628058/go.mod h1:zbLWBJVy7bmiZHlHjCrV28vxXA/sAkCLtH5thD8ZahA= go.opentelemetry.io/collector/model v0.37.0/go.mod h1:ESh1oWDNdS4fTg9sTFoYuiuvs8QuaX8yNGTPix3JZc8= +go.opentelemetry.io/collector/model v0.37.1-0.20211015233822-bd87fb628058 h1:jDw0pFIkDbvNRkkdCz1+gsBXIKbtY3GtRMPqzBeOfs4= +go.opentelemetry.io/collector/model v0.37.1-0.20211015233822-bd87fb628058/go.mod h1:ESh1oWDNdS4fTg9sTFoYuiuvs8QuaX8yNGTPix3JZc8= go.opentelemetry.io/contrib/instrumentation/google.golang.org/grpc/otelgrpc v0.25.0/go.mod h1:E5NNboN0UqSAki0Atn9kVwaN7I+l25gGxDqBueo/74E= go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.25.0/go.mod h1:NyB05cd+yPX6W5SiRNuJ90w7PV2+g2cgRbsPL7MvpME= go.opentelemetry.io/contrib/zpages v0.25.0/go.mod h1:cXBK0CNcIBD9Iiw1Hv3DvS+E8N2rtr+k+OoPs+sP0T4= diff --git a/receiver/dotnetdiagnosticsreceiver/config.go b/receiver/dotnetdiagnosticsreceiver/config.go index 29fd4e109c9e..4dc13595cf48 100644 --- a/receiver/dotnetdiagnosticsreceiver/config.go +++ b/receiver/dotnetdiagnosticsreceiver/config.go @@ -15,7 +15,7 @@ package dotnetdiagnosticsreceiver import ( - "github.com/open-telemetry/opentelemetry-collector-contrib/receiver/scraperhelper" + "go.opentelemetry.io/collector/receiver/scraperhelper" ) type Config struct { diff --git a/receiver/dotnetdiagnosticsreceiver/factory.go b/receiver/dotnetdiagnosticsreceiver/factory.go index ebf74ac18d3a..b84377b8fcca 100644 --- a/receiver/dotnetdiagnosticsreceiver/factory.go +++ b/receiver/dotnetdiagnosticsreceiver/factory.go @@ -26,9 +26,9 @@ import ( "go.opentelemetry.io/collector/config" "go.opentelemetry.io/collector/consumer" "go.opentelemetry.io/collector/receiver/receiverhelper" + "go.opentelemetry.io/collector/receiver/scraperhelper" "github.com/open-telemetry/opentelemetry-collector-contrib/receiver/dotnetdiagnosticsreceiver/network" - "github.com/open-telemetry/opentelemetry-collector-contrib/receiver/scraperhelper" ) const typeStr = "dotnet_diagnostics" diff --git a/receiver/dotnetdiagnosticsreceiver/go.mod b/receiver/dotnetdiagnosticsreceiver/go.mod index 0d0f1522a7f5..8f3bc3763792 100644 --- a/receiver/dotnetdiagnosticsreceiver/go.mod +++ b/receiver/dotnetdiagnosticsreceiver/go.mod @@ -3,10 +3,9 @@ module github.com/open-telemetry/opentelemetry-collector-contrib/receiver/dotnet go 1.17 require ( - github.com/open-telemetry/opentelemetry-collector-contrib/receiver/scraperhelper v0.37.1 github.com/stretchr/testify v1.7.0 - go.opentelemetry.io/collector v0.37.0 - go.opentelemetry.io/collector/model v0.37.0 + go.opentelemetry.io/collector v0.37.1-0.20211015233822-bd87fb628058 + go.opentelemetry.io/collector/model v0.37.1-0.20211015233822-bd87fb628058 go.uber.org/zap v1.19.1 ) @@ -20,7 +19,10 @@ require ( github.com/mitchellh/copystructure v1.2.0 // indirect github.com/mitchellh/mapstructure v1.4.2 // indirect github.com/mitchellh/reflectwalk v1.0.2 // indirect + github.com/pelletier/go-toml v1.9.3 // indirect + github.com/pkg/errors v0.9.1 // indirect github.com/pmezard/go-difflib v1.0.0 // indirect + github.com/rogpeppe/go-internal v1.6.1 // indirect github.com/spf13/cast v1.4.1 // indirect go.opencensus.io v0.23.0 // indirect go.opentelemetry.io/otel v1.0.1 // indirect @@ -37,5 +39,3 @@ require ( gopkg.in/yaml.v2 v2.4.0 // indirect gopkg.in/yaml.v3 v3.0.0-20210107192922-496545a6307b // indirect ) - -replace github.com/open-telemetry/opentelemetry-collector-contrib/receiver/scraperhelper => ../scraperhelper diff --git a/receiver/dotnetdiagnosticsreceiver/go.sum b/receiver/dotnetdiagnosticsreceiver/go.sum index b0a8d318b16d..bf8f01171235 100644 --- a/receiver/dotnetdiagnosticsreceiver/go.sum +++ b/receiver/dotnetdiagnosticsreceiver/go.sum @@ -374,10 +374,11 @@ go.opencensus.io v0.22.4/go.mod h1:yxeiOL68Rb0Xd1ddK5vPZ/oVn4vY4Ynel7k9FzqtOIw= go.opencensus.io v0.22.5/go.mod h1:5pWMHQbX5EPX2/62yrJeAkowc+lfs/XD7Uxpq3pI6kk= go.opencensus.io v0.23.0 h1:gqCw0LfLxScz8irSi8exQc7fyQ0fKQU/qnC/X8+V/1M= go.opencensus.io v0.23.0/go.mod h1:XItmlyltB5F7CS4xOC1DcqMoFqwtC6OG2xF7mCv7P7E= -go.opentelemetry.io/collector v0.37.0 h1:X83+uWk11kW83BTkdKNt1Sk7gXyRv36wA6piT0FYfME= -go.opentelemetry.io/collector v0.37.0/go.mod h1:zbLWBJVy7bmiZHlHjCrV28vxXA/sAkCLtH5thD8ZahA= -go.opentelemetry.io/collector/model v0.37.0 h1:K1G6bgzBZ5kKSjZ1+EY9MhCOYsac4Q1K85fBUgpTVH8= +go.opentelemetry.io/collector v0.37.1-0.20211015233822-bd87fb628058 h1:6v0ba4ruY/W2cJLElDZEHDwShlSWUjK2MiBMvwfAIN0= +go.opentelemetry.io/collector v0.37.1-0.20211015233822-bd87fb628058/go.mod h1:zbLWBJVy7bmiZHlHjCrV28vxXA/sAkCLtH5thD8ZahA= go.opentelemetry.io/collector/model v0.37.0/go.mod h1:ESh1oWDNdS4fTg9sTFoYuiuvs8QuaX8yNGTPix3JZc8= +go.opentelemetry.io/collector/model v0.37.1-0.20211015233822-bd87fb628058 h1:jDw0pFIkDbvNRkkdCz1+gsBXIKbtY3GtRMPqzBeOfs4= +go.opentelemetry.io/collector/model v0.37.1-0.20211015233822-bd87fb628058/go.mod h1:ESh1oWDNdS4fTg9sTFoYuiuvs8QuaX8yNGTPix3JZc8= go.opentelemetry.io/contrib/instrumentation/google.golang.org/grpc/otelgrpc v0.25.0/go.mod h1:E5NNboN0UqSAki0Atn9kVwaN7I+l25gGxDqBueo/74E= go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.25.0/go.mod h1:NyB05cd+yPX6W5SiRNuJ90w7PV2+g2cgRbsPL7MvpME= go.opentelemetry.io/contrib/zpages v0.25.0/go.mod h1:cXBK0CNcIBD9Iiw1Hv3DvS+E8N2rtr+k+OoPs+sP0T4= diff --git a/receiver/filelogreceiver/go.mod b/receiver/filelogreceiver/go.mod index c4f9f028a4bd..634c26e394b2 100644 --- a/receiver/filelogreceiver/go.mod +++ b/receiver/filelogreceiver/go.mod @@ -8,8 +8,8 @@ require ( github.com/open-telemetry/opentelemetry-collector-contrib/internal/stanza v0.37.1 github.com/open-telemetry/opentelemetry-log-collection v0.22.0 github.com/stretchr/testify v1.7.0 - go.opentelemetry.io/collector v0.37.0 - go.opentelemetry.io/collector/model v0.37.0 + go.opentelemetry.io/collector v0.37.1-0.20211015233822-bd87fb628058 + go.opentelemetry.io/collector/model v0.37.1-0.20211015233822-bd87fb628058 gopkg.in/yaml.v2 v2.4.0 ) diff --git a/receiver/filelogreceiver/go.sum b/receiver/filelogreceiver/go.sum index e7628c491c89..f9550f0ddbf9 100644 --- a/receiver/filelogreceiver/go.sum +++ b/receiver/filelogreceiver/go.sum @@ -477,11 +477,12 @@ go.opencensus.io v0.22.5/go.mod h1:5pWMHQbX5EPX2/62yrJeAkowc+lfs/XD7Uxpq3pI6kk= go.opencensus.io v0.23.0 h1:gqCw0LfLxScz8irSi8exQc7fyQ0fKQU/qnC/X8+V/1M= go.opencensus.io v0.23.0/go.mod h1:XItmlyltB5F7CS4xOC1DcqMoFqwtC6OG2xF7mCv7P7E= go.opentelemetry.io/collector v0.35.0/go.mod h1:mMW4VJHhy8CwoTenV75axteKd0aZhWHDZjcZ59V53kc= -go.opentelemetry.io/collector v0.37.0 h1:X83+uWk11kW83BTkdKNt1Sk7gXyRv36wA6piT0FYfME= -go.opentelemetry.io/collector v0.37.0/go.mod h1:zbLWBJVy7bmiZHlHjCrV28vxXA/sAkCLtH5thD8ZahA= +go.opentelemetry.io/collector v0.37.1-0.20211015233822-bd87fb628058 h1:6v0ba4ruY/W2cJLElDZEHDwShlSWUjK2MiBMvwfAIN0= +go.opentelemetry.io/collector v0.37.1-0.20211015233822-bd87fb628058/go.mod h1:zbLWBJVy7bmiZHlHjCrV28vxXA/sAkCLtH5thD8ZahA= go.opentelemetry.io/collector/model v0.35.0/go.mod h1:+7YCSjJG+MqiIFjauzt7oM2qkqBsaJWh5hcsO4fwsAc= -go.opentelemetry.io/collector/model v0.37.0 h1:K1G6bgzBZ5kKSjZ1+EY9MhCOYsac4Q1K85fBUgpTVH8= go.opentelemetry.io/collector/model v0.37.0/go.mod h1:ESh1oWDNdS4fTg9sTFoYuiuvs8QuaX8yNGTPix3JZc8= +go.opentelemetry.io/collector/model v0.37.1-0.20211015233822-bd87fb628058 h1:jDw0pFIkDbvNRkkdCz1+gsBXIKbtY3GtRMPqzBeOfs4= +go.opentelemetry.io/collector/model v0.37.1-0.20211015233822-bd87fb628058/go.mod h1:ESh1oWDNdS4fTg9sTFoYuiuvs8QuaX8yNGTPix3JZc8= go.opentelemetry.io/contrib v0.22.0/go.mod h1:EH4yDYeNoaTqn/8yCWQmfNB78VHfGX2Jt2bvnvzBlGM= go.opentelemetry.io/contrib/instrumentation/google.golang.org/grpc/otelgrpc v0.22.0/go.mod h1:KjqwX4uJNaj479ZjFpADOMJKOM4rBXq4kN7nbeuGKrY= go.opentelemetry.io/contrib/instrumentation/google.golang.org/grpc/otelgrpc v0.25.0/go.mod h1:E5NNboN0UqSAki0Atn9kVwaN7I+l25gGxDqBueo/74E= diff --git a/receiver/fluentforwardreceiver/go.mod b/receiver/fluentforwardreceiver/go.mod index f2174b1b2222..501e1399aebe 100644 --- a/receiver/fluentforwardreceiver/go.mod +++ b/receiver/fluentforwardreceiver/go.mod @@ -6,8 +6,8 @@ require ( github.com/stretchr/testify v1.7.0 github.com/tinylib/msgp v1.1.6 go.opencensus.io v0.23.0 - go.opentelemetry.io/collector v0.37.0 - go.opentelemetry.io/collector/model v0.37.0 + go.opentelemetry.io/collector v0.37.1-0.20211015233822-bd87fb628058 + go.opentelemetry.io/collector/model v0.37.1-0.20211015233822-bd87fb628058 go.uber.org/zap v1.19.1 ) diff --git a/receiver/fluentforwardreceiver/go.sum b/receiver/fluentforwardreceiver/go.sum index 5f1a76e2cf3d..433138f063ad 100644 --- a/receiver/fluentforwardreceiver/go.sum +++ b/receiver/fluentforwardreceiver/go.sum @@ -378,10 +378,11 @@ go.opencensus.io v0.22.4/go.mod h1:yxeiOL68Rb0Xd1ddK5vPZ/oVn4vY4Ynel7k9FzqtOIw= go.opencensus.io v0.22.5/go.mod h1:5pWMHQbX5EPX2/62yrJeAkowc+lfs/XD7Uxpq3pI6kk= go.opencensus.io v0.23.0 h1:gqCw0LfLxScz8irSi8exQc7fyQ0fKQU/qnC/X8+V/1M= go.opencensus.io v0.23.0/go.mod h1:XItmlyltB5F7CS4xOC1DcqMoFqwtC6OG2xF7mCv7P7E= -go.opentelemetry.io/collector v0.37.0 h1:X83+uWk11kW83BTkdKNt1Sk7gXyRv36wA6piT0FYfME= -go.opentelemetry.io/collector v0.37.0/go.mod h1:zbLWBJVy7bmiZHlHjCrV28vxXA/sAkCLtH5thD8ZahA= -go.opentelemetry.io/collector/model v0.37.0 h1:K1G6bgzBZ5kKSjZ1+EY9MhCOYsac4Q1K85fBUgpTVH8= +go.opentelemetry.io/collector v0.37.1-0.20211015233822-bd87fb628058 h1:6v0ba4ruY/W2cJLElDZEHDwShlSWUjK2MiBMvwfAIN0= +go.opentelemetry.io/collector v0.37.1-0.20211015233822-bd87fb628058/go.mod h1:zbLWBJVy7bmiZHlHjCrV28vxXA/sAkCLtH5thD8ZahA= go.opentelemetry.io/collector/model v0.37.0/go.mod h1:ESh1oWDNdS4fTg9sTFoYuiuvs8QuaX8yNGTPix3JZc8= +go.opentelemetry.io/collector/model v0.37.1-0.20211015233822-bd87fb628058 h1:jDw0pFIkDbvNRkkdCz1+gsBXIKbtY3GtRMPqzBeOfs4= +go.opentelemetry.io/collector/model v0.37.1-0.20211015233822-bd87fb628058/go.mod h1:ESh1oWDNdS4fTg9sTFoYuiuvs8QuaX8yNGTPix3JZc8= go.opentelemetry.io/contrib/instrumentation/google.golang.org/grpc/otelgrpc v0.25.0/go.mod h1:E5NNboN0UqSAki0Atn9kVwaN7I+l25gGxDqBueo/74E= go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.25.0/go.mod h1:NyB05cd+yPX6W5SiRNuJ90w7PV2+g2cgRbsPL7MvpME= go.opentelemetry.io/contrib/zpages v0.25.0/go.mod h1:cXBK0CNcIBD9Iiw1Hv3DvS+E8N2rtr+k+OoPs+sP0T4= diff --git a/receiver/googlecloudpubsubreceiver/go.mod b/receiver/googlecloudpubsubreceiver/go.mod index d876bcb1aba2..048cab439e14 100644 --- a/receiver/googlecloudpubsubreceiver/go.mod +++ b/receiver/googlecloudpubsubreceiver/go.mod @@ -4,7 +4,7 @@ go 1.17 require ( github.com/stretchr/testify v1.7.0 - go.opentelemetry.io/collector v0.37.0 + go.opentelemetry.io/collector v0.37.1-0.20211015233822-bd87fb628058 go.uber.org/zap v1.19.1 ) @@ -26,7 +26,7 @@ require ( github.com/rogpeppe/go-internal v1.6.1 // indirect github.com/spf13/cast v1.4.1 // indirect go.opencensus.io v0.23.0 // indirect - go.opentelemetry.io/collector/model v0.37.0 // indirect + go.opentelemetry.io/collector/model v0.37.1-0.20211015233822-bd87fb628058 // indirect go.opentelemetry.io/otel v1.0.1 // indirect go.opentelemetry.io/otel/metric v0.24.0 // indirect go.opentelemetry.io/otel/trace v1.0.1 // indirect diff --git a/receiver/googlecloudpubsubreceiver/go.sum b/receiver/googlecloudpubsubreceiver/go.sum index b0a8d318b16d..bf8f01171235 100644 --- a/receiver/googlecloudpubsubreceiver/go.sum +++ b/receiver/googlecloudpubsubreceiver/go.sum @@ -374,10 +374,11 @@ go.opencensus.io v0.22.4/go.mod h1:yxeiOL68Rb0Xd1ddK5vPZ/oVn4vY4Ynel7k9FzqtOIw= go.opencensus.io v0.22.5/go.mod h1:5pWMHQbX5EPX2/62yrJeAkowc+lfs/XD7Uxpq3pI6kk= go.opencensus.io v0.23.0 h1:gqCw0LfLxScz8irSi8exQc7fyQ0fKQU/qnC/X8+V/1M= go.opencensus.io v0.23.0/go.mod h1:XItmlyltB5F7CS4xOC1DcqMoFqwtC6OG2xF7mCv7P7E= -go.opentelemetry.io/collector v0.37.0 h1:X83+uWk11kW83BTkdKNt1Sk7gXyRv36wA6piT0FYfME= -go.opentelemetry.io/collector v0.37.0/go.mod h1:zbLWBJVy7bmiZHlHjCrV28vxXA/sAkCLtH5thD8ZahA= -go.opentelemetry.io/collector/model v0.37.0 h1:K1G6bgzBZ5kKSjZ1+EY9MhCOYsac4Q1K85fBUgpTVH8= +go.opentelemetry.io/collector v0.37.1-0.20211015233822-bd87fb628058 h1:6v0ba4ruY/W2cJLElDZEHDwShlSWUjK2MiBMvwfAIN0= +go.opentelemetry.io/collector v0.37.1-0.20211015233822-bd87fb628058/go.mod h1:zbLWBJVy7bmiZHlHjCrV28vxXA/sAkCLtH5thD8ZahA= go.opentelemetry.io/collector/model v0.37.0/go.mod h1:ESh1oWDNdS4fTg9sTFoYuiuvs8QuaX8yNGTPix3JZc8= +go.opentelemetry.io/collector/model v0.37.1-0.20211015233822-bd87fb628058 h1:jDw0pFIkDbvNRkkdCz1+gsBXIKbtY3GtRMPqzBeOfs4= +go.opentelemetry.io/collector/model v0.37.1-0.20211015233822-bd87fb628058/go.mod h1:ESh1oWDNdS4fTg9sTFoYuiuvs8QuaX8yNGTPix3JZc8= go.opentelemetry.io/contrib/instrumentation/google.golang.org/grpc/otelgrpc v0.25.0/go.mod h1:E5NNboN0UqSAki0Atn9kVwaN7I+l25gGxDqBueo/74E= go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.25.0/go.mod h1:NyB05cd+yPX6W5SiRNuJ90w7PV2+g2cgRbsPL7MvpME= go.opentelemetry.io/contrib/zpages v0.25.0/go.mod h1:cXBK0CNcIBD9Iiw1Hv3DvS+E8N2rtr+k+OoPs+sP0T4= diff --git a/receiver/googlecloudspannerreceiver/go.mod b/receiver/googlecloudspannerreceiver/go.mod index b3f469443cce..030fcb22fdd5 100644 --- a/receiver/googlecloudspannerreceiver/go.mod +++ b/receiver/googlecloudspannerreceiver/go.mod @@ -5,8 +5,8 @@ go 1.17 require ( cloud.google.com/go/spanner v1.25.0 github.com/stretchr/testify v1.7.0 - go.opentelemetry.io/collector v0.37.0 - go.opentelemetry.io/collector/model v0.37.0 + go.opentelemetry.io/collector v0.37.1-0.20211015233822-bd87fb628058 + go.opentelemetry.io/collector/model v0.37.1-0.20211015233822-bd87fb628058 go.uber.org/zap v1.19.1 google.golang.org/api v0.58.0 gopkg.in/yaml.v3 v3.0.0-20210107192922-496545a6307b diff --git a/receiver/googlecloudspannerreceiver/go.sum b/receiver/googlecloudspannerreceiver/go.sum index 0bb3fe0a4fc1..b19041fc750f 100644 --- a/receiver/googlecloudspannerreceiver/go.sum +++ b/receiver/googlecloudspannerreceiver/go.sum @@ -392,10 +392,11 @@ go.opencensus.io v0.22.4/go.mod h1:yxeiOL68Rb0Xd1ddK5vPZ/oVn4vY4Ynel7k9FzqtOIw= go.opencensus.io v0.22.5/go.mod h1:5pWMHQbX5EPX2/62yrJeAkowc+lfs/XD7Uxpq3pI6kk= go.opencensus.io v0.23.0 h1:gqCw0LfLxScz8irSi8exQc7fyQ0fKQU/qnC/X8+V/1M= go.opencensus.io v0.23.0/go.mod h1:XItmlyltB5F7CS4xOC1DcqMoFqwtC6OG2xF7mCv7P7E= -go.opentelemetry.io/collector v0.37.0 h1:X83+uWk11kW83BTkdKNt1Sk7gXyRv36wA6piT0FYfME= -go.opentelemetry.io/collector v0.37.0/go.mod h1:zbLWBJVy7bmiZHlHjCrV28vxXA/sAkCLtH5thD8ZahA= -go.opentelemetry.io/collector/model v0.37.0 h1:K1G6bgzBZ5kKSjZ1+EY9MhCOYsac4Q1K85fBUgpTVH8= +go.opentelemetry.io/collector v0.37.1-0.20211015233822-bd87fb628058 h1:6v0ba4ruY/W2cJLElDZEHDwShlSWUjK2MiBMvwfAIN0= +go.opentelemetry.io/collector v0.37.1-0.20211015233822-bd87fb628058/go.mod h1:zbLWBJVy7bmiZHlHjCrV28vxXA/sAkCLtH5thD8ZahA= go.opentelemetry.io/collector/model v0.37.0/go.mod h1:ESh1oWDNdS4fTg9sTFoYuiuvs8QuaX8yNGTPix3JZc8= +go.opentelemetry.io/collector/model v0.37.1-0.20211015233822-bd87fb628058 h1:jDw0pFIkDbvNRkkdCz1+gsBXIKbtY3GtRMPqzBeOfs4= +go.opentelemetry.io/collector/model v0.37.1-0.20211015233822-bd87fb628058/go.mod h1:ESh1oWDNdS4fTg9sTFoYuiuvs8QuaX8yNGTPix3JZc8= go.opentelemetry.io/contrib/instrumentation/google.golang.org/grpc/otelgrpc v0.25.0/go.mod h1:E5NNboN0UqSAki0Atn9kVwaN7I+l25gGxDqBueo/74E= go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.25.0/go.mod h1:NyB05cd+yPX6W5SiRNuJ90w7PV2+g2cgRbsPL7MvpME= go.opentelemetry.io/contrib/zpages v0.25.0/go.mod h1:cXBK0CNcIBD9Iiw1Hv3DvS+E8N2rtr+k+OoPs+sP0T4= diff --git a/receiver/hostmetricsreceiver/config.go b/receiver/hostmetricsreceiver/config.go index 5bb4a30d0587..47cac8bcf522 100644 --- a/receiver/hostmetricsreceiver/config.go +++ b/receiver/hostmetricsreceiver/config.go @@ -19,9 +19,9 @@ import ( "fmt" "go.opentelemetry.io/collector/config" + "go.opentelemetry.io/collector/receiver/scraperhelper" "github.com/open-telemetry/opentelemetry-collector-contrib/receiver/hostmetricsreceiver/internal" - "github.com/open-telemetry/opentelemetry-collector-contrib/receiver/scraperhelper" ) const ( diff --git a/receiver/hostmetricsreceiver/config_test.go b/receiver/hostmetricsreceiver/config_test.go index eb8934b07039..735cb2a2df1d 100644 --- a/receiver/hostmetricsreceiver/config_test.go +++ b/receiver/hostmetricsreceiver/config_test.go @@ -24,6 +24,7 @@ import ( "go.opentelemetry.io/collector/component/componenttest" "go.opentelemetry.io/collector/config" "go.opentelemetry.io/collector/config/configtest" + "go.opentelemetry.io/collector/receiver/scraperhelper" "github.com/open-telemetry/opentelemetry-collector-contrib/internal/coreinternal/processor/filterset" "github.com/open-telemetry/opentelemetry-collector-contrib/receiver/hostmetricsreceiver/internal" @@ -36,7 +37,6 @@ import ( "github.com/open-telemetry/opentelemetry-collector-contrib/receiver/hostmetricsreceiver/internal/scraper/pagingscraper" "github.com/open-telemetry/opentelemetry-collector-contrib/receiver/hostmetricsreceiver/internal/scraper/processesscraper" "github.com/open-telemetry/opentelemetry-collector-contrib/receiver/hostmetricsreceiver/internal/scraper/processscraper" - "github.com/open-telemetry/opentelemetry-collector-contrib/receiver/scraperhelper" ) func TestLoadConfig(t *testing.T) { diff --git a/receiver/hostmetricsreceiver/factory.go b/receiver/hostmetricsreceiver/factory.go index 42e38d8aea5f..088ff66ab0c9 100644 --- a/receiver/hostmetricsreceiver/factory.go +++ b/receiver/hostmetricsreceiver/factory.go @@ -22,6 +22,7 @@ import ( "go.opentelemetry.io/collector/config" "go.opentelemetry.io/collector/consumer" "go.opentelemetry.io/collector/receiver/receiverhelper" + "go.opentelemetry.io/collector/receiver/scraperhelper" "go.uber.org/zap" "github.com/open-telemetry/opentelemetry-collector-contrib/receiver/hostmetricsreceiver/internal" @@ -34,7 +35,6 @@ import ( "github.com/open-telemetry/opentelemetry-collector-contrib/receiver/hostmetricsreceiver/internal/scraper/pagingscraper" "github.com/open-telemetry/opentelemetry-collector-contrib/receiver/hostmetricsreceiver/internal/scraper/processesscraper" "github.com/open-telemetry/opentelemetry-collector-contrib/receiver/hostmetricsreceiver/internal/scraper/processscraper" - "github.com/open-telemetry/opentelemetry-collector-contrib/receiver/scraperhelper" ) // This file implements Factory for HostMetrics receiver. diff --git a/receiver/hostmetricsreceiver/go.mod b/receiver/hostmetricsreceiver/go.mod index 536f16e31549..9fbd23d3d88f 100644 --- a/receiver/hostmetricsreceiver/go.mod +++ b/receiver/hostmetricsreceiver/go.mod @@ -5,11 +5,10 @@ go 1.17 require ( github.com/leoluk/perflib_exporter v0.1.0 github.com/open-telemetry/opentelemetry-collector-contrib/internal/coreinternal v0.37.1 - github.com/open-telemetry/opentelemetry-collector-contrib/receiver/scraperhelper v0.37.1 github.com/shirou/gopsutil v3.21.9+incompatible github.com/stretchr/testify v1.7.0 - go.opentelemetry.io/collector v0.37.0 - go.opentelemetry.io/collector/model v0.37.0 + go.opentelemetry.io/collector v0.37.1-0.20211015233822-bd87fb628058 + go.opentelemetry.io/collector/model v0.37.1-0.20211015233822-bd87fb628058 go.uber.org/zap v1.19.1 golang.org/x/sys v0.0.0-20210816074244-15123e1e1f71 @@ -48,6 +47,4 @@ require ( gopkg.in/yaml.v3 v3.0.0-20210107192922-496545a6307b // indirect ) -replace github.com/open-telemetry/opentelemetry-collector-contrib/receiver/scraperhelper => ../scraperhelper - replace github.com/open-telemetry/opentelemetry-collector-contrib/internal/coreinternal => ../../internal/coreinternal diff --git a/receiver/hostmetricsreceiver/go.sum b/receiver/hostmetricsreceiver/go.sum index afed6602f3c6..3ebccd623deb 100644 --- a/receiver/hostmetricsreceiver/go.sum +++ b/receiver/hostmetricsreceiver/go.sum @@ -402,10 +402,11 @@ go.opencensus.io v0.22.4/go.mod h1:yxeiOL68Rb0Xd1ddK5vPZ/oVn4vY4Ynel7k9FzqtOIw= go.opencensus.io v0.22.5/go.mod h1:5pWMHQbX5EPX2/62yrJeAkowc+lfs/XD7Uxpq3pI6kk= go.opencensus.io v0.23.0 h1:gqCw0LfLxScz8irSi8exQc7fyQ0fKQU/qnC/X8+V/1M= go.opencensus.io v0.23.0/go.mod h1:XItmlyltB5F7CS4xOC1DcqMoFqwtC6OG2xF7mCv7P7E= -go.opentelemetry.io/collector v0.37.0 h1:X83+uWk11kW83BTkdKNt1Sk7gXyRv36wA6piT0FYfME= -go.opentelemetry.io/collector v0.37.0/go.mod h1:zbLWBJVy7bmiZHlHjCrV28vxXA/sAkCLtH5thD8ZahA= -go.opentelemetry.io/collector/model v0.37.0 h1:K1G6bgzBZ5kKSjZ1+EY9MhCOYsac4Q1K85fBUgpTVH8= +go.opentelemetry.io/collector v0.37.1-0.20211015233822-bd87fb628058 h1:6v0ba4ruY/W2cJLElDZEHDwShlSWUjK2MiBMvwfAIN0= +go.opentelemetry.io/collector v0.37.1-0.20211015233822-bd87fb628058/go.mod h1:zbLWBJVy7bmiZHlHjCrV28vxXA/sAkCLtH5thD8ZahA= go.opentelemetry.io/collector/model v0.37.0/go.mod h1:ESh1oWDNdS4fTg9sTFoYuiuvs8QuaX8yNGTPix3JZc8= +go.opentelemetry.io/collector/model v0.37.1-0.20211015233822-bd87fb628058 h1:jDw0pFIkDbvNRkkdCz1+gsBXIKbtY3GtRMPqzBeOfs4= +go.opentelemetry.io/collector/model v0.37.1-0.20211015233822-bd87fb628058/go.mod h1:ESh1oWDNdS4fTg9sTFoYuiuvs8QuaX8yNGTPix3JZc8= go.opentelemetry.io/contrib/instrumentation/google.golang.org/grpc/otelgrpc v0.25.0/go.mod h1:E5NNboN0UqSAki0Atn9kVwaN7I+l25gGxDqBueo/74E= go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.25.0/go.mod h1:NyB05cd+yPX6W5SiRNuJ90w7PV2+g2cgRbsPL7MvpME= go.opentelemetry.io/contrib/zpages v0.25.0/go.mod h1:cXBK0CNcIBD9Iiw1Hv3DvS+E8N2rtr+k+OoPs+sP0T4= diff --git a/receiver/hostmetricsreceiver/hostmetrics_receiver_test.go b/receiver/hostmetricsreceiver/hostmetrics_receiver_test.go index bbdf64055d00..0b27d2cbd43b 100644 --- a/receiver/hostmetricsreceiver/hostmetrics_receiver_test.go +++ b/receiver/hostmetricsreceiver/hostmetrics_receiver_test.go @@ -30,6 +30,7 @@ import ( "go.opentelemetry.io/collector/consumer" "go.opentelemetry.io/collector/consumer/consumertest" "go.opentelemetry.io/collector/model/pdata" + "go.opentelemetry.io/collector/receiver/scraperhelper" "go.uber.org/zap" "github.com/open-telemetry/opentelemetry-collector-contrib/receiver/hostmetricsreceiver/internal" @@ -42,7 +43,6 @@ import ( "github.com/open-telemetry/opentelemetry-collector-contrib/receiver/hostmetricsreceiver/internal/scraper/pagingscraper" "github.com/open-telemetry/opentelemetry-collector-contrib/receiver/hostmetricsreceiver/internal/scraper/processesscraper" "github.com/open-telemetry/opentelemetry-collector-contrib/receiver/hostmetricsreceiver/internal/scraper/processscraper" - "github.com/open-telemetry/opentelemetry-collector-contrib/receiver/scraperhelper" ) var standardMetrics = []string{ @@ -221,7 +221,7 @@ func (m *mockFactory) CreateMetricsScraper(context.Context, *zap.Logger, interna func (m *mockScraper) ID() config.ComponentID { return config.NewComponentID("") } func (m *mockScraper) Start(context.Context, component.Host) error { return nil } func (m *mockScraper) Shutdown(context.Context) error { return nil } -func (m *mockScraper) Scrape(context.Context, config.ComponentID, component.ReceiverCreateSettings) (pdata.Metrics, error) { +func (m *mockScraper) Scrape(context.Context) (pdata.Metrics, error) { return pdata.NewMetrics(), errors.New("err1") } @@ -237,7 +237,7 @@ func (m *mockResourceFactory) CreateResourceMetricsScraper(context.Context, *zap func (m *mockResourceScraper) ID() config.ComponentID { return config.NewComponentID("") } func (m *mockResourceScraper) Start(context.Context, component.Host) error { return nil } func (m *mockResourceScraper) Shutdown(context.Context) error { return nil } -func (m *mockResourceScraper) Scrape(context.Context, config.ComponentID, component.ReceiverCreateSettings) (pdata.Metrics, error) { +func (m *mockResourceScraper) Scrape(context.Context) (pdata.Metrics, error) { return pdata.NewMetrics(), errors.New("err2") } diff --git a/receiver/hostmetricsreceiver/internal/scraper.go b/receiver/hostmetricsreceiver/internal/scraper.go index cc8c577232d3..d140769f655f 100644 --- a/receiver/hostmetricsreceiver/internal/scraper.go +++ b/receiver/hostmetricsreceiver/internal/scraper.go @@ -17,9 +17,8 @@ package internal import ( "context" + "go.opentelemetry.io/collector/receiver/scraperhelper" "go.uber.org/zap" - - "github.com/open-telemetry/opentelemetry-collector-contrib/receiver/scraperhelper" ) // BaseFactory for creating Scrapers. diff --git a/receiver/hostmetricsreceiver/internal/scraper/cpuscraper/config.go b/receiver/hostmetricsreceiver/internal/scraper/cpuscraper/config.go index 9eb724c49c85..db5b4da417a2 100644 --- a/receiver/hostmetricsreceiver/internal/scraper/cpuscraper/config.go +++ b/receiver/hostmetricsreceiver/internal/scraper/cpuscraper/config.go @@ -14,7 +14,9 @@ package cpuscraper -import "github.com/open-telemetry/opentelemetry-collector-contrib/receiver/hostmetricsreceiver/internal" +import ( + "github.com/open-telemetry/opentelemetry-collector-contrib/receiver/hostmetricsreceiver/internal" +) // Config relating to CPU Metric Scraper. type Config struct { diff --git a/receiver/hostmetricsreceiver/internal/scraper/cpuscraper/cpu_scraper.go b/receiver/hostmetricsreceiver/internal/scraper/cpuscraper/cpu_scraper.go index ef3b736de596..86e2ac943beb 100644 --- a/receiver/hostmetricsreceiver/internal/scraper/cpuscraper/cpu_scraper.go +++ b/receiver/hostmetricsreceiver/internal/scraper/cpuscraper/cpu_scraper.go @@ -54,17 +54,18 @@ func (s *scraper) start(context.Context, component.Host) error { return nil } -func (s *scraper) scrape(_ context.Context) (pdata.MetricSlice, error) { - metrics := pdata.NewMetricSlice() +func (s *scraper) scrape(_ context.Context) (pdata.Metrics, error) { + md := pdata.NewMetrics() + metrics := md.ResourceMetrics().AppendEmpty().InstrumentationLibraryMetrics().AppendEmpty().Metrics() now := pdata.NewTimestampFromTime(time.Now()) cpuTimes, err := s.times( /*percpu=*/ true) if err != nil { - return metrics, scrapererror.NewPartialScrapeError(err, metricsLen) + return md, scrapererror.NewPartialScrapeError(err, metricsLen) } initializeCPUTimeMetric(metrics.AppendEmpty(), s.startTime, now, cpuTimes) - return metrics, nil + return md, nil } func initializeCPUTimeMetric(metric pdata.Metric, startTime, now pdata.Timestamp, cpuTimes []cpu.TimesStat) { diff --git a/receiver/hostmetricsreceiver/internal/scraper/cpuscraper/cpu_scraper_test.go b/receiver/hostmetricsreceiver/internal/scraper/cpuscraper/cpu_scraper_test.go index 349a6b97d729..bd6fa7bb62fd 100644 --- a/receiver/hostmetricsreceiver/internal/scraper/cpuscraper/cpu_scraper_test.go +++ b/receiver/hostmetricsreceiver/internal/scraper/cpuscraper/cpu_scraper_test.go @@ -79,7 +79,7 @@ func TestScrape(t *testing.T) { } require.NoError(t, err, "Failed to initialize cpu scraper: %v", err) - metrics, err := scraper.scrape(context.Background()) + md, err := scraper.scrape(context.Background()) if test.expectedErr != "" { assert.EqualError(t, err, test.expectedErr) @@ -93,8 +93,9 @@ func TestScrape(t *testing.T) { } require.NoError(t, err, "Failed to scrape metrics: %v", err) - assert.Equal(t, 1, metrics.Len()) + assert.Equal(t, 1, md.MetricCount()) + metrics := md.ResourceMetrics().At(0).InstrumentationLibraryMetrics().At(0).Metrics() assertCPUMetricValid(t, metrics.At(0), metadata.Metrics.SystemCPUTime.New(), test.expectedStartTime) if runtime.GOOS == "linux" { diff --git a/receiver/hostmetricsreceiver/internal/scraper/cpuscraper/factory.go b/receiver/hostmetricsreceiver/internal/scraper/cpuscraper/factory.go index d3ac8efd716d..b1ab8d1e1e4e 100644 --- a/receiver/hostmetricsreceiver/internal/scraper/cpuscraper/factory.go +++ b/receiver/hostmetricsreceiver/internal/scraper/cpuscraper/factory.go @@ -17,10 +17,10 @@ package cpuscraper import ( "context" + "go.opentelemetry.io/collector/receiver/scraperhelper" "go.uber.org/zap" "github.com/open-telemetry/opentelemetry-collector-contrib/receiver/hostmetricsreceiver/internal" - "github.com/open-telemetry/opentelemetry-collector-contrib/receiver/scraperhelper" ) // This file implements Factory for CPU scraper. @@ -48,11 +48,9 @@ func (f *Factory) CreateMetricsScraper( cfg := config.(*Config) s := newCPUScraper(ctx, cfg) - ms := scraperhelper.NewMetricsScraper( + return scraperhelper.NewScraper( TypeStr, s.scrape, scraperhelper.WithStart(s.start), ) - - return ms, nil } diff --git a/receiver/hostmetricsreceiver/internal/scraper/diskscraper/disk_scraper_others.go b/receiver/hostmetricsreceiver/internal/scraper/diskscraper/disk_scraper_others.go index 49f91b7a77dc..d5d3dc2c37c0 100644 --- a/receiver/hostmetricsreceiver/internal/scraper/diskscraper/disk_scraper_others.go +++ b/receiver/hostmetricsreceiver/internal/scraper/diskscraper/disk_scraper_others.go @@ -82,13 +82,14 @@ func (s *scraper) start(context.Context, component.Host) error { return nil } -func (s *scraper) scrape(_ context.Context) (pdata.MetricSlice, error) { - metrics := pdata.NewMetricSlice() +func (s *scraper) scrape(_ context.Context) (pdata.Metrics, error) { + md := pdata.NewMetrics() + metrics := md.ResourceMetrics().AppendEmpty().InstrumentationLibraryMetrics().AppendEmpty().Metrics() now := pdata.NewTimestampFromTime(time.Now()) ioCounters, err := s.ioCounters() if err != nil { - return metrics, scrapererror.NewPartialScrapeError(err, metricsLen) + return md, scrapererror.NewPartialScrapeError(err, metricsLen) } // filter devices by name @@ -104,7 +105,7 @@ func (s *scraper) scrape(_ context.Context) (pdata.MetricSlice, error) { appendSystemSpecificMetrics(metrics, s.startTime, now, ioCounters) } - return metrics, nil + return md, nil } func initializeDiskIOMetric(metric pdata.Metric, startTime, now pdata.Timestamp, ioCounters map[string]disk.IOCountersStat) { diff --git a/receiver/hostmetricsreceiver/internal/scraper/diskscraper/disk_scraper_test.go b/receiver/hostmetricsreceiver/internal/scraper/diskscraper/disk_scraper_test.go index 7d96d6af41e8..4f24825e7f98 100644 --- a/receiver/hostmetricsreceiver/internal/scraper/diskscraper/disk_scraper_test.go +++ b/receiver/hostmetricsreceiver/internal/scraper/diskscraper/disk_scraper_test.go @@ -95,14 +95,15 @@ func TestScrape(t *testing.T) { } require.NoError(t, err, "Failed to initialize disk scraper: %v", err) - metrics, err := scraper.scrape(context.Background()) + md, err := scraper.scrape(context.Background()) require.NoError(t, err, "Failed to scrape metrics: %v", err) if !test.expectMetrics { - assert.Equal(t, 0, metrics.Len()) + assert.Equal(t, 0, md.MetricCount()) return } + metrics := md.ResourceMetrics().At(0).InstrumentationLibraryMetrics().At(0).Metrics() assert.Equal(t, metricsLen, metrics.Len()) assertInt64DiskMetricValid(t, metrics.At(0), metadata.Metrics.SystemDiskIo.New(), test.expectedStartTime) diff --git a/receiver/hostmetricsreceiver/internal/scraper/diskscraper/disk_scraper_windows.go b/receiver/hostmetricsreceiver/internal/scraper/diskscraper/disk_scraper_windows.go index 1004846b3ba8..f8533f2a258c 100644 --- a/receiver/hostmetricsreceiver/internal/scraper/diskscraper/disk_scraper_windows.go +++ b/receiver/hostmetricsreceiver/internal/scraper/diskscraper/disk_scraper_windows.go @@ -95,19 +95,20 @@ func (s *scraper) start(context.Context, component.Host) error { return s.perfCounterScraper.Initialize(logicalDisk) } -func (s *scraper) scrape(ctx context.Context) (pdata.MetricSlice, error) { - metrics := pdata.NewMetricSlice() +func (s *scraper) scrape(ctx context.Context) (pdata.Metrics, error) { + md := pdata.NewMetrics() + metrics := md.ResourceMetrics().AppendEmpty().InstrumentationLibraryMetrics().AppendEmpty().Metrics() now := pdata.NewTimestampFromTime(time.Now()) counters, err := s.perfCounterScraper.Scrape() if err != nil { - return metrics, scrapererror.NewPartialScrapeError(err, metricsLen) + return md, scrapererror.NewPartialScrapeError(err, metricsLen) } logicalDiskObject, err := counters.GetObject(logicalDisk) if err != nil { - return metrics, scrapererror.NewPartialScrapeError(err, metricsLen) + return md, scrapererror.NewPartialScrapeError(err, metricsLen) } // filter devices by name @@ -115,7 +116,7 @@ func (s *scraper) scrape(ctx context.Context) (pdata.MetricSlice, error) { logicalDiskCounterValues, err := logicalDiskObject.GetValues(readsPerSec, writesPerSec, readBytesPerSec, writeBytesPerSec, idleTime, avgDiskSecsPerRead, avgDiskSecsPerWrite, queueLength) if err != nil { - return metrics, scrapererror.NewPartialScrapeError(err, metricsLen) + return md, scrapererror.NewPartialScrapeError(err, metricsLen) } if len(logicalDiskCounterValues) > 0 { @@ -127,7 +128,7 @@ func (s *scraper) scrape(ctx context.Context) (pdata.MetricSlice, error) { initializeDiskPendingOperationsMetric(metrics.AppendEmpty(), now, logicalDiskCounterValues) } - return metrics, nil + return md, nil } func initializeDiskIOMetric(metric pdata.Metric, startTime, now pdata.Timestamp, logicalDiskCounterValues []*perfcounters.CounterValues) { diff --git a/receiver/hostmetricsreceiver/internal/scraper/diskscraper/factory.go b/receiver/hostmetricsreceiver/internal/scraper/diskscraper/factory.go index 7a6afd23691f..bc64ec53ed4d 100644 --- a/receiver/hostmetricsreceiver/internal/scraper/diskscraper/factory.go +++ b/receiver/hostmetricsreceiver/internal/scraper/diskscraper/factory.go @@ -17,10 +17,10 @@ package diskscraper import ( "context" + "go.opentelemetry.io/collector/receiver/scraperhelper" "go.uber.org/zap" "github.com/open-telemetry/opentelemetry-collector-contrib/receiver/hostmetricsreceiver/internal" - "github.com/open-telemetry/opentelemetry-collector-contrib/receiver/scraperhelper" ) // This file implements Factory for Disk scraper. @@ -51,11 +51,9 @@ func (f *Factory) CreateMetricsScraper( return nil, err } - ms := scraperhelper.NewMetricsScraper( + return scraperhelper.NewScraper( TypeStr, s.scrape, scraperhelper.WithStart(s.start), ) - - return ms, nil } diff --git a/receiver/hostmetricsreceiver/internal/scraper/filesystemscraper/factory.go b/receiver/hostmetricsreceiver/internal/scraper/filesystemscraper/factory.go index e6caecd6fb19..65bd69512c20 100644 --- a/receiver/hostmetricsreceiver/internal/scraper/filesystemscraper/factory.go +++ b/receiver/hostmetricsreceiver/internal/scraper/filesystemscraper/factory.go @@ -17,10 +17,10 @@ package filesystemscraper import ( "context" + "go.opentelemetry.io/collector/receiver/scraperhelper" "go.uber.org/zap" "github.com/open-telemetry/opentelemetry-collector-contrib/receiver/hostmetricsreceiver/internal" - "github.com/open-telemetry/opentelemetry-collector-contrib/receiver/scraperhelper" ) // This file implements Factory for FileSystem scraper. @@ -56,7 +56,5 @@ func (f *Factory) CreateMetricsScraper( return nil, err } - ms := scraperhelper.NewMetricsScraper(TypeStr, s.Scrape) - - return ms, nil + return scraperhelper.NewScraper(TypeStr, s.Scrape) } diff --git a/receiver/hostmetricsreceiver/internal/scraper/filesystemscraper/filesystem_scraper.go b/receiver/hostmetricsreceiver/internal/scraper/filesystemscraper/filesystem_scraper.go index 00245ca0f608..f6471902a1d7 100644 --- a/receiver/hostmetricsreceiver/internal/scraper/filesystemscraper/filesystem_scraper.go +++ b/receiver/hostmetricsreceiver/internal/scraper/filesystemscraper/filesystem_scraper.go @@ -57,15 +57,16 @@ func newFileSystemScraper(_ context.Context, cfg *Config) (*scraper, error) { return scraper, nil } -func (s *scraper) Scrape(_ context.Context) (pdata.MetricSlice, error) { - metrics := pdata.NewMetricSlice() +func (s *scraper) Scrape(_ context.Context) (pdata.Metrics, error) { + md := pdata.NewMetrics() + metrics := md.ResourceMetrics().AppendEmpty().InstrumentationLibraryMetrics().AppendEmpty().Metrics() now := pdata.NewTimestampFromTime(time.Now()) // omit logical (virtual) filesystems (not relevant for windows) partitions, err := s.partitions( /*all=*/ false) if err != nil { - return metrics, scrapererror.NewPartialScrapeError(err, metricsLen) + return md, scrapererror.NewPartialScrapeError(err, metricsLen) } var errors scrapererror.ScrapeErrors @@ -94,7 +95,7 @@ func (s *scraper) Scrape(_ context.Context) (pdata.MetricSlice, error) { err = scrapererror.NewPartialScrapeError(err, metricsLen) } - return metrics, err + return md, err } func initializeFileSystemUsageMetric(metric pdata.Metric, now pdata.Timestamp, deviceUsages []*deviceUsage) { diff --git a/receiver/hostmetricsreceiver/internal/scraper/filesystemscraper/filesystem_scraper_test.go b/receiver/hostmetricsreceiver/internal/scraper/filesystemscraper/filesystem_scraper_test.go index a57af2afb3c3..48671544e0bd 100644 --- a/receiver/hostmetricsreceiver/internal/scraper/filesystemscraper/filesystem_scraper_test.go +++ b/receiver/hostmetricsreceiver/internal/scraper/filesystemscraper/filesystem_scraper_test.go @@ -193,7 +193,7 @@ func TestScrape(t *testing.T) { scraper.usage = test.usageFunc } - metrics, err := scraper.Scrape(context.Background()) + md, err := scraper.Scrape(context.Background()) if test.expectedErr != "" { assert.Contains(t, err.Error(), test.expectedErr) @@ -208,12 +208,13 @@ func TestScrape(t *testing.T) { require.NoError(t, err, "Failed to scrape metrics: %v", err) if !test.expectMetrics { - assert.Equal(t, 0, metrics.Len()) + assert.Equal(t, 0, md.MetricCount()) return } - assert.GreaterOrEqual(t, metrics.Len(), 1) + assert.GreaterOrEqual(t, md.MetricCount(), 1) + metrics := md.ResourceMetrics().At(0).InstrumentationLibraryMetrics().At(0).Metrics() assertFileSystemUsageMetricValid( t, metrics.At(0), diff --git a/receiver/hostmetricsreceiver/internal/scraper/loadscraper/factory.go b/receiver/hostmetricsreceiver/internal/scraper/loadscraper/factory.go index 00dea4c48081..89506d0268f2 100644 --- a/receiver/hostmetricsreceiver/internal/scraper/loadscraper/factory.go +++ b/receiver/hostmetricsreceiver/internal/scraper/loadscraper/factory.go @@ -17,10 +17,10 @@ package loadscraper import ( "context" + "go.opentelemetry.io/collector/receiver/scraperhelper" "go.uber.org/zap" "github.com/open-telemetry/opentelemetry-collector-contrib/receiver/hostmetricsreceiver/internal" - "github.com/open-telemetry/opentelemetry-collector-contrib/receiver/scraperhelper" ) // This file implements Factory for Load scraper. @@ -48,12 +48,10 @@ func (f *Factory) CreateMetricsScraper( cfg := config.(*Config) s := newLoadScraper(ctx, logger, cfg) - ms := scraperhelper.NewMetricsScraper( + return scraperhelper.NewScraper( TypeStr, s.scrape, scraperhelper.WithStart(s.start), scraperhelper.WithShutdown(s.shutdown), ) - - return ms, nil } diff --git a/receiver/hostmetricsreceiver/internal/scraper/loadscraper/load_scraper.go b/receiver/hostmetricsreceiver/internal/scraper/loadscraper/load_scraper.go index 9301c3eebff5..5e9091212916 100644 --- a/receiver/hostmetricsreceiver/internal/scraper/loadscraper/load_scraper.go +++ b/receiver/hostmetricsreceiver/internal/scraper/loadscraper/load_scraper.go @@ -54,13 +54,14 @@ func (s *scraper) shutdown(ctx context.Context) error { } // scrape -func (s *scraper) scrape(_ context.Context) (pdata.MetricSlice, error) { - metrics := pdata.NewMetricSlice() +func (s *scraper) scrape(_ context.Context) (pdata.Metrics, error) { + md := pdata.NewMetrics() + metrics := md.ResourceMetrics().AppendEmpty().InstrumentationLibraryMetrics().AppendEmpty().Metrics() now := pdata.NewTimestampFromTime(time.Now()) avgLoadValues, err := s.load() if err != nil { - return metrics, scrapererror.NewPartialScrapeError(err, metricsLen) + return md, scrapererror.NewPartialScrapeError(err, metricsLen) } metrics.EnsureCapacity(metricsLen) @@ -68,7 +69,7 @@ func (s *scraper) scrape(_ context.Context) (pdata.MetricSlice, error) { initializeLoadMetric(metrics.AppendEmpty(), metadata.Metrics.SystemCPULoadAverage1m, now, avgLoadValues.Load1) initializeLoadMetric(metrics.AppendEmpty(), metadata.Metrics.SystemCPULoadAverage5m, now, avgLoadValues.Load5) initializeLoadMetric(metrics.AppendEmpty(), metadata.Metrics.SystemCPULoadAverage15m, now, avgLoadValues.Load15) - return metrics, nil + return md, nil } func initializeLoadMetric(metric pdata.Metric, metricDescriptor metadata.MetricIntf, now pdata.Timestamp, value float64) { diff --git a/receiver/hostmetricsreceiver/internal/scraper/loadscraper/load_scraper_test.go b/receiver/hostmetricsreceiver/internal/scraper/loadscraper/load_scraper_test.go index 35ca7eb6b486..3496a2dc6ad5 100644 --- a/receiver/hostmetricsreceiver/internal/scraper/loadscraper/load_scraper_test.go +++ b/receiver/hostmetricsreceiver/internal/scraper/loadscraper/load_scraper_test.go @@ -60,7 +60,7 @@ func TestScrape(t *testing.T) { require.NoError(t, err, "Failed to initialize load scraper: %v", err) defer func() { assert.NoError(t, scraper.shutdown(context.Background())) }() - metrics, err := scraper.scrape(context.Background()) + md, err := scraper.scrape(context.Background()) if test.expectedErr != "" { assert.EqualError(t, err, test.expectedErr) @@ -75,8 +75,9 @@ func TestScrape(t *testing.T) { require.NoError(t, err, "Failed to scrape metrics: %v", err) // expect 3 metrics - assert.Equal(t, 3, metrics.Len()) + assert.Equal(t, 3, md.MetricCount()) + metrics := md.ResourceMetrics().At(0).InstrumentationLibraryMetrics().At(0).Metrics() // expect a single datapoint for 1m, 5m & 15m load metrics assertMetricHasSingleDatapoint(t, metrics.At(0), metadata.Metrics.SystemCPULoadAverage1m.New()) assertMetricHasSingleDatapoint(t, metrics.At(1), metadata.Metrics.SystemCPULoadAverage5m.New()) diff --git a/receiver/hostmetricsreceiver/internal/scraper/memoryscraper/factory.go b/receiver/hostmetricsreceiver/internal/scraper/memoryscraper/factory.go index e60dcd035876..b20651acb882 100644 --- a/receiver/hostmetricsreceiver/internal/scraper/memoryscraper/factory.go +++ b/receiver/hostmetricsreceiver/internal/scraper/memoryscraper/factory.go @@ -17,10 +17,10 @@ package memoryscraper import ( "context" + "go.opentelemetry.io/collector/receiver/scraperhelper" "go.uber.org/zap" "github.com/open-telemetry/opentelemetry-collector-contrib/receiver/hostmetricsreceiver/internal" - "github.com/open-telemetry/opentelemetry-collector-contrib/receiver/scraperhelper" ) // This file implements Factory for Memory scraper. @@ -48,7 +48,5 @@ func (f *Factory) CreateMetricsScraper( cfg := config.(*Config) s := newMemoryScraper(ctx, cfg) - ms := scraperhelper.NewMetricsScraper(TypeStr, s.Scrape) - - return ms, nil + return scraperhelper.NewScraper(TypeStr, s.Scrape) } diff --git a/receiver/hostmetricsreceiver/internal/scraper/memoryscraper/memory_scraper.go b/receiver/hostmetricsreceiver/internal/scraper/memoryscraper/memory_scraper.go index 813d92139295..ed4cd64bdbeb 100644 --- a/receiver/hostmetricsreceiver/internal/scraper/memoryscraper/memory_scraper.go +++ b/receiver/hostmetricsreceiver/internal/scraper/memoryscraper/memory_scraper.go @@ -40,18 +40,19 @@ func newMemoryScraper(_ context.Context, cfg *Config) *scraper { return &scraper{config: cfg, virtualMemory: mem.VirtualMemory} } -func (s *scraper) Scrape(_ context.Context) (pdata.MetricSlice, error) { - metrics := pdata.NewMetricSlice() +func (s *scraper) Scrape(_ context.Context) (pdata.Metrics, error) { + md := pdata.NewMetrics() + metrics := md.ResourceMetrics().AppendEmpty().InstrumentationLibraryMetrics().AppendEmpty().Metrics() now := pdata.NewTimestampFromTime(time.Now()) memInfo, err := s.virtualMemory() if err != nil { - return metrics, scrapererror.NewPartialScrapeError(err, metricsLen) + return md, scrapererror.NewPartialScrapeError(err, metricsLen) } metrics.EnsureCapacity(metricsLen) initializeMemoryUsageMetric(metrics.AppendEmpty(), now, memInfo) - return metrics, nil + return md, nil } func initializeMemoryUsageMetric(metric pdata.Metric, now pdata.Timestamp, memInfo *mem.VirtualMemoryStat) { diff --git a/receiver/hostmetricsreceiver/internal/scraper/memoryscraper/memory_scraper_test.go b/receiver/hostmetricsreceiver/internal/scraper/memoryscraper/memory_scraper_test.go index ed2d12d65e17..8d847e3b28fc 100644 --- a/receiver/hostmetricsreceiver/internal/scraper/memoryscraper/memory_scraper_test.go +++ b/receiver/hostmetricsreceiver/internal/scraper/memoryscraper/memory_scraper_test.go @@ -55,7 +55,7 @@ func TestScrape(t *testing.T) { scraper.virtualMemory = test.virtualMemoryFunc } - metrics, err := scraper.Scrape(context.Background()) + md, err := scraper.Scrape(context.Background()) if test.expectedErr != "" { assert.EqualError(t, err, test.expectedErr) @@ -69,8 +69,9 @@ func TestScrape(t *testing.T) { } require.NoError(t, err, "Failed to scrape metrics: %v", err) - assert.Equal(t, 1, metrics.Len()) + assert.Equal(t, 1, md.MetricCount()) + metrics := md.ResourceMetrics().At(0).InstrumentationLibraryMetrics().At(0).Metrics() assertMemoryUsageMetricValid(t, metrics.At(0), metadata.Metrics.SystemMemoryUsage.New()) if runtime.GOOS == "linux" { diff --git a/receiver/hostmetricsreceiver/internal/scraper/networkscraper/factory.go b/receiver/hostmetricsreceiver/internal/scraper/networkscraper/factory.go index 53079f99f6a9..f1df12dcb212 100644 --- a/receiver/hostmetricsreceiver/internal/scraper/networkscraper/factory.go +++ b/receiver/hostmetricsreceiver/internal/scraper/networkscraper/factory.go @@ -17,10 +17,10 @@ package networkscraper import ( "context" + "go.opentelemetry.io/collector/receiver/scraperhelper" "go.uber.org/zap" "github.com/open-telemetry/opentelemetry-collector-contrib/receiver/hostmetricsreceiver/internal" - "github.com/open-telemetry/opentelemetry-collector-contrib/receiver/scraperhelper" ) // This file implements Factory for Network scraper. @@ -51,11 +51,9 @@ func (f *Factory) CreateMetricsScraper( return nil, err } - ms := scraperhelper.NewMetricsScraper( + return scraperhelper.NewScraper( TypeStr, s.scrape, scraperhelper.WithStart(s.start), ) - - return ms, nil } diff --git a/receiver/hostmetricsreceiver/internal/scraper/networkscraper/network_scraper.go b/receiver/hostmetricsreceiver/internal/scraper/networkscraper/network_scraper.go index fad06c15284a..6e395aabe729 100644 --- a/receiver/hostmetricsreceiver/internal/scraper/networkscraper/network_scraper.go +++ b/receiver/hostmetricsreceiver/internal/scraper/networkscraper/network_scraper.go @@ -80,9 +80,9 @@ func (s *scraper) start(context.Context, component.Host) error { return nil } -func (s *scraper) scrape(_ context.Context) (pdata.MetricSlice, error) { - metrics := pdata.NewMetricSlice() - +func (s *scraper) scrape(_ context.Context) (pdata.Metrics, error) { + md := pdata.NewMetrics() + metrics := md.ResourceMetrics().AppendEmpty().InstrumentationLibraryMetrics().AppendEmpty().Metrics() var errors scrapererror.ScrapeErrors err := s.scrapeAndAppendNetworkCounterMetrics(metrics, s.startTime) @@ -95,7 +95,7 @@ func (s *scraper) scrape(_ context.Context) (pdata.MetricSlice, error) { errors.AddPartial(connectionsMetricsLen, err) } - return metrics, errors.Combine() + return md, errors.Combine() } func (s *scraper) scrapeAndAppendNetworkCounterMetrics(metrics pdata.MetricSlice, startTime pdata.Timestamp) error { diff --git a/receiver/hostmetricsreceiver/internal/scraper/networkscraper/network_scraper_test.go b/receiver/hostmetricsreceiver/internal/scraper/networkscraper/network_scraper_test.go index 363dd6b8f193..b6f6bbca28e2 100644 --- a/receiver/hostmetricsreceiver/internal/scraper/networkscraper/network_scraper_test.go +++ b/receiver/hostmetricsreceiver/internal/scraper/networkscraper/network_scraper_test.go @@ -118,7 +118,7 @@ func TestScrape(t *testing.T) { } require.NoError(t, err, "Failed to initialize network scraper: %v", err) - metrics, err := scraper.scrape(context.Background()) + md, err := scraper.scrape(context.Background()) if test.expectedErr != "" { assert.EqualError(t, err, test.expectedErr) @@ -136,8 +136,9 @@ func TestScrape(t *testing.T) { if test.expectNetworkMetrics { expectedMetricCount += 4 } - assert.Equal(t, expectedMetricCount, metrics.Len()) + assert.Equal(t, expectedMetricCount, md.MetricCount()) + metrics := md.ResourceMetrics().At(0).InstrumentationLibraryMetrics().At(0).Metrics() idx := 0 if test.expectNetworkMetrics { assertNetworkIOMetricValid(t, metrics.At(idx+0), metadata.Metrics.SystemNetworkPackets.New(), test.expectedStartTime) diff --git a/receiver/hostmetricsreceiver/internal/scraper/pagingscraper/factory.go b/receiver/hostmetricsreceiver/internal/scraper/pagingscraper/factory.go index 22ae31452665..8ec4586bbcb3 100644 --- a/receiver/hostmetricsreceiver/internal/scraper/pagingscraper/factory.go +++ b/receiver/hostmetricsreceiver/internal/scraper/pagingscraper/factory.go @@ -17,10 +17,10 @@ package pagingscraper import ( "context" + "go.opentelemetry.io/collector/receiver/scraperhelper" "go.uber.org/zap" "github.com/open-telemetry/opentelemetry-collector-contrib/receiver/hostmetricsreceiver/internal" - "github.com/open-telemetry/opentelemetry-collector-contrib/receiver/scraperhelper" ) // This file implements Factory for Paging scraper. @@ -48,11 +48,9 @@ func (f *Factory) CreateMetricsScraper( cfg := config.(*Config) s := newPagingScraper(ctx, cfg) - ms := scraperhelper.NewMetricsScraper( + return scraperhelper.NewScraper( TypeStr, s.scrape, scraperhelper.WithStart(s.start), ) - - return ms, nil } diff --git a/receiver/hostmetricsreceiver/internal/scraper/pagingscraper/paging_scraper_others.go b/receiver/hostmetricsreceiver/internal/scraper/pagingscraper/paging_scraper_others.go index 5fb03679e238..819637345e44 100644 --- a/receiver/hostmetricsreceiver/internal/scraper/pagingscraper/paging_scraper_others.go +++ b/receiver/hostmetricsreceiver/internal/scraper/pagingscraper/paging_scraper_others.go @@ -61,8 +61,9 @@ func (s *scraper) start(context.Context, component.Host) error { return nil } -func (s *scraper) scrape(_ context.Context) (pdata.MetricSlice, error) { - metrics := pdata.NewMetricSlice() +func (s *scraper) scrape(_ context.Context) (pdata.Metrics, error) { + md := pdata.NewMetrics() + metrics := md.ResourceMetrics().AppendEmpty().InstrumentationLibraryMetrics().AppendEmpty().Metrics() var errors scrapererror.ScrapeErrors @@ -76,7 +77,7 @@ func (s *scraper) scrape(_ context.Context) (pdata.MetricSlice, error) { errors.AddPartial(pagingMetricsLen, err) } - return metrics, errors.Combine() + return md, errors.Combine() } func (s *scraper) scrapeAndAppendPagingUsageMetric(metrics pdata.MetricSlice) error { diff --git a/receiver/hostmetricsreceiver/internal/scraper/pagingscraper/paging_scraper_test.go b/receiver/hostmetricsreceiver/internal/scraper/pagingscraper/paging_scraper_test.go index b3252816d314..854341c1a8c8 100644 --- a/receiver/hostmetricsreceiver/internal/scraper/pagingscraper/paging_scraper_test.go +++ b/receiver/hostmetricsreceiver/internal/scraper/pagingscraper/paging_scraper_test.go @@ -67,15 +67,16 @@ func TestScrape(t *testing.T) { } require.NoError(t, err, "Failed to initialize paging scraper: %v", err) - metrics, err := scraper.scrape(context.Background()) + md, err := scraper.scrape(context.Background()) require.NoError(t, err) + metrics := md.ResourceMetrics().At(0).InstrumentationLibraryMetrics().At(0).Metrics() // expect 3 metrics (windows does not currently support the faults metric) expectedMetrics := 3 if runtime.GOOS == "windows" { expectedMetrics = 2 } - assert.Equal(t, expectedMetrics, metrics.Len()) + assert.Equal(t, expectedMetrics, md.MetricCount()) assertPagingUsageMetricValid(t, metrics.At(0)) internal.AssertSameTimeStampForMetrics(t, metrics, 0, 1) diff --git a/receiver/hostmetricsreceiver/internal/scraper/pagingscraper/paging_scraper_windows.go b/receiver/hostmetricsreceiver/internal/scraper/pagingscraper/paging_scraper_windows.go index b48bc7c6ef04..35b6ac483419 100644 --- a/receiver/hostmetricsreceiver/internal/scraper/pagingscraper/paging_scraper_windows.go +++ b/receiver/hostmetricsreceiver/internal/scraper/pagingscraper/paging_scraper_windows.go @@ -68,8 +68,9 @@ func (s *scraper) start(context.Context, component.Host) error { return s.perfCounterScraper.Initialize(memory) } -func (s *scraper) scrape(context.Context) (pdata.MetricSlice, error) { - metrics := pdata.NewMetricSlice() +func (s *scraper) scrape(context.Context) (pdata.Metrics, error) { + md := pdata.NewMetrics() + metrics := md.ResourceMetrics().AppendEmpty().InstrumentationLibraryMetrics().AppendEmpty().Metrics() var errors scrapererror.ScrapeErrors @@ -83,7 +84,7 @@ func (s *scraper) scrape(context.Context) (pdata.MetricSlice, error) { errors.AddPartial(pagingMetricsLen, err) } - return metrics, errors.Combine() + return md, errors.Combine() } func (s *scraper) scrapeAndAppendPagingUsageMetric(metrics pdata.MetricSlice) error { diff --git a/receiver/hostmetricsreceiver/internal/scraper/pagingscraper/paging_scraper_windows_test.go b/receiver/hostmetricsreceiver/internal/scraper/pagingscraper/paging_scraper_windows_test.go index 5a96c7e756da..8e31c790c9a0 100644 --- a/receiver/hostmetricsreceiver/internal/scraper/pagingscraper/paging_scraper_windows_test.go +++ b/receiver/hostmetricsreceiver/internal/scraper/pagingscraper/paging_scraper_windows_test.go @@ -111,7 +111,7 @@ func TestScrape_Errors(t *testing.T) { err := scraper.start(context.Background(), componenttest.NewNopHost()) require.NoError(t, err, "Failed to initialize paging scraper: %v", err) - metrics, err := scraper.scrape(context.Background()) + md, err := scraper.scrape(context.Background()) if test.expectedErr != "" { assert.EqualError(t, err, test.expectedErr) @@ -126,6 +126,7 @@ func TestScrape_Errors(t *testing.T) { assert.NoError(t, err) + metrics := md.ResourceMetrics().At(0).InstrumentationLibraryMetrics().At(0).Metrics() pagingUsageMetric := metrics.At(0) assert.Equal(t, test.expectedUsedValue, pagingUsageMetric.Sum().DataPoints().At(0).IntVal()) assert.Equal(t, test.expectedFreeValue, pagingUsageMetric.Sum().DataPoints().At(1).IntVal()) diff --git a/receiver/hostmetricsreceiver/internal/scraper/processesscraper/factory.go b/receiver/hostmetricsreceiver/internal/scraper/processesscraper/factory.go index 2c9d7566aa6b..de5f412b1815 100644 --- a/receiver/hostmetricsreceiver/internal/scraper/processesscraper/factory.go +++ b/receiver/hostmetricsreceiver/internal/scraper/processesscraper/factory.go @@ -17,10 +17,10 @@ package processesscraper import ( "context" + "go.opentelemetry.io/collector/receiver/scraperhelper" "go.uber.org/zap" "github.com/open-telemetry/opentelemetry-collector-contrib/receiver/hostmetricsreceiver/internal" - "github.com/open-telemetry/opentelemetry-collector-contrib/receiver/scraperhelper" ) // This file implements Factory for Processes scraper. @@ -48,11 +48,9 @@ func (f *Factory) CreateMetricsScraper( cfg := config.(*Config) s := newProcessesScraper(ctx, cfg) - ms := scraperhelper.NewMetricsScraper( + return scraperhelper.NewScraper( TypeStr, s.scrape, scraperhelper.WithStart(s.start), ) - - return ms, nil } diff --git a/receiver/hostmetricsreceiver/internal/scraper/processesscraper/processes_scraper.go b/receiver/hostmetricsreceiver/internal/scraper/processesscraper/processes_scraper.go index 636bde631e41..4db2bbe7b853 100644 --- a/receiver/hostmetricsreceiver/internal/scraper/processesscraper/processes_scraper.go +++ b/receiver/hostmetricsreceiver/internal/scraper/processesscraper/processes_scraper.go @@ -85,15 +85,16 @@ func (s *scraper) start(context.Context, component.Host) error { return nil } -func (s *scraper) scrape(_ context.Context) (pdata.MetricSlice, error) { +func (s *scraper) scrape(_ context.Context) (pdata.Metrics, error) { now := pdata.NewTimestampFromTime(time.Now()) - metrics := pdata.NewMetricSlice() + md := pdata.NewMetrics() + metrics := md.ResourceMetrics().AppendEmpty().InstrumentationLibraryMetrics().AppendEmpty().Metrics() metrics.EnsureCapacity(metricsLength) processMetadata, err := s.getProcessesMetadata() if err != nil { - return pdata.MetricSlice{}, scrapererror.NewPartialScrapeError(err, metricsLength) + return md, scrapererror.NewPartialScrapeError(err, metricsLength) } if enableProcessesCount && processMetadata.countByStatus != nil { @@ -104,7 +105,7 @@ func (s *scraper) scrape(_ context.Context) (pdata.MetricSlice, error) { setProcessesCreatedMetric(metrics.AppendEmpty(), s.startTime, now, *processMetadata.processesCreated) } - return metrics, err + return md, err } func setProcessesCountMetric(metric pdata.Metric, startTime, now pdata.Timestamp, countByStatus map[string]int64) { diff --git a/receiver/hostmetricsreceiver/internal/scraper/processesscraper/processes_scraper_test.go b/receiver/hostmetricsreceiver/internal/scraper/processesscraper/processes_scraper_test.go index 0c5c2c85eb1f..ec78fb102c67 100644 --- a/receiver/hostmetricsreceiver/internal/scraper/processesscraper/processes_scraper_test.go +++ b/receiver/hostmetricsreceiver/internal/scraper/processesscraper/processes_scraper_test.go @@ -86,7 +86,7 @@ func TestScrape(t *testing.T) { } scraper.startTime = startTime - metrics, err := scraper.scrape(context.Background()) + md, err := scraper.scrape(context.Background()) expectedMetricCount := 0 if expectProcessesCountMetric { @@ -112,8 +112,9 @@ func TestScrape(t *testing.T) { assert.NoErrorf(err, "Failed to scrape metrics: %v", err) } - assert.Equal(expectedMetricCount, metrics.Len()) + assert.Equal(expectedMetricCount, md.MetricCount()) + metrics := md.ResourceMetrics().At(0).InstrumentationLibraryMetrics().At(0).Metrics() if test.validate != nil { test.validate(t, metrics) } diff --git a/receiver/hostmetricsreceiver/internal/scraper/processscraper/factory.go b/receiver/hostmetricsreceiver/internal/scraper/processscraper/factory.go index 354445925b8a..63766098480e 100644 --- a/receiver/hostmetricsreceiver/internal/scraper/processscraper/factory.go +++ b/receiver/hostmetricsreceiver/internal/scraper/processscraper/factory.go @@ -19,11 +19,10 @@ import ( "errors" "runtime" - "go.opentelemetry.io/collector/config" + "go.opentelemetry.io/collector/receiver/scraperhelper" "go.uber.org/zap" "github.com/open-telemetry/opentelemetry-collector-contrib/receiver/hostmetricsreceiver/internal" - "github.com/open-telemetry/opentelemetry-collector-contrib/receiver/scraperhelper" ) // This file implements Factory for Process scraper. @@ -57,11 +56,9 @@ func (f *Factory) CreateResourceMetricsScraper( return nil, err } - ms := scraperhelper.NewResourceMetricsScraper( - config.NewComponentID(TypeStr), + return scraperhelper.NewScraper( + TypeStr, s.scrape, scraperhelper.WithStart(s.start), ) - - return ms, nil } diff --git a/receiver/hostmetricsreceiver/internal/scraper/processscraper/process_scraper.go b/receiver/hostmetricsreceiver/internal/scraper/processscraper/process_scraper.go index 3ae6fb7efe8e..30c2c2cdc71b 100644 --- a/receiver/hostmetricsreceiver/internal/scraper/processscraper/process_scraper.go +++ b/receiver/hostmetricsreceiver/internal/scraper/processscraper/process_scraper.go @@ -83,8 +83,9 @@ func (s *scraper) start(context.Context, component.Host) error { return nil } -func (s *scraper) scrape(_ context.Context) (pdata.ResourceMetricsSlice, error) { - rms := pdata.NewResourceMetricsSlice() +func (s *scraper) scrape(_ context.Context) (pdata.Metrics, error) { + md := pdata.NewMetrics() + rms := md.ResourceMetrics() var errs scrapererror.ScrapeErrors @@ -92,7 +93,7 @@ func (s *scraper) scrape(_ context.Context) (pdata.ResourceMetricsSlice, error) if err != nil { partialErr, isPartial := err.(scrapererror.PartialScrapeError) if !isPartial { - return rms, err + return md, err } errs.AddPartial(partialErr.Failed, partialErr) @@ -119,7 +120,7 @@ func (s *scraper) scrape(_ context.Context) (pdata.ResourceMetricsSlice, error) } } - return rms, errs.Combine() + return md, errs.Combine() } // getProcessMetadata returns a slice of processMetadata, including handles, diff --git a/receiver/hostmetricsreceiver/internal/scraper/processscraper/process_scraper_test.go b/receiver/hostmetricsreceiver/internal/scraper/processscraper/process_scraper_test.go index ddb487cb3b5a..f5db999dee10 100644 --- a/receiver/hostmetricsreceiver/internal/scraper/processscraper/process_scraper_test.go +++ b/receiver/hostmetricsreceiver/internal/scraper/processscraper/process_scraper_test.go @@ -54,7 +54,7 @@ func TestScrape(t *testing.T) { err = scraper.start(context.Background(), componenttest.NewNopHost()) require.NoError(t, err, "Failed to initialize process scraper: %v", err) - resourceMetrics, err := scraper.scrape(context.Background()) + md, err := scraper.scrape(context.Background()) // may receive some partial errors as a result of attempting to: // a) read native system processes on Windows (e.g. Registry process) @@ -63,19 +63,19 @@ func TestScrape(t *testing.T) { // so validate that we have at some errors & some valid data if err != nil { require.True(t, scrapererror.IsPartialScrapeError(err)) - noProcessesScraped := resourceMetrics.Len() + noProcessesScraped := md.ResourceMetrics().Len() noProcessesErrored := err.(scrapererror.PartialScrapeError).Failed require.Lessf(t, 0, noProcessesErrored, "Failed to scrape metrics - : error, but 0 failed process %v", err) require.Lessf(t, 0, noProcessesScraped, "Failed to scrape metrics - : 0 successful scrapes %v", err) } - require.Greater(t, resourceMetrics.Len(), 1) - assertProcessResourceAttributesExist(t, resourceMetrics) - assertCPUTimeMetricValid(t, resourceMetrics, expectedStartTime) - assertMemoryUsageMetricValid(t, metadata.Metrics.ProcessMemoryPhysicalUsage.New(), resourceMetrics) - assertMemoryUsageMetricValid(t, metadata.Metrics.ProcessMemoryVirtualUsage.New(), resourceMetrics) - assertDiskIOMetricValid(t, resourceMetrics, expectedStartTime) - assertSameTimeStampForAllMetricsWithinResource(t, resourceMetrics) + require.Greater(t, md.ResourceMetrics().Len(), 1) + assertProcessResourceAttributesExist(t, md.ResourceMetrics()) + assertCPUTimeMetricValid(t, md.ResourceMetrics(), expectedStartTime) + assertMemoryUsageMetricValid(t, metadata.Metrics.ProcessMemoryPhysicalUsage.New(), md.ResourceMetrics()) + assertMemoryUsageMetricValid(t, metadata.Metrics.ProcessMemoryVirtualUsage.New(), md.ResourceMetrics()) + assertDiskIOMetricValid(t, md.ResourceMetrics(), expectedStartTime) + assertSameTimeStampForAllMetricsWithinResource(t, md.ResourceMetrics()) } func assertProcessResourceAttributesExist(t *testing.T, resourceMetrics pdata.ResourceMetricsSlice) { @@ -171,9 +171,9 @@ func TestScrapeMetrics_GetProcessesError(t *testing.T) { err = scraper.start(context.Background(), componenttest.NewNopHost()) require.NoError(t, err, "Failed to initialize process scraper: %v", err) - metrics, err := scraper.scrape(context.Background()) + md, err := scraper.scrape(context.Background()) assert.EqualError(t, err, "err1") - assert.Equal(t, 0, metrics.Len()) + assert.Equal(t, 0, md.ResourceMetrics().Len()) assert.False(t, scrapererror.IsPartialScrapeError(err)) } @@ -327,12 +327,12 @@ func TestScrapeMetrics_Filtered(t *testing.T) { return &processHandlesMock{handles: handles}, nil } - resourceMetrics, err := scraper.scrape(context.Background()) + md, err := scraper.scrape(context.Background()) require.NoError(t, err) - assert.Equal(t, len(test.expectedNames), resourceMetrics.Len()) + assert.Equal(t, len(test.expectedNames), md.ResourceMetrics().Len()) for i, expectedName := range test.expectedNames { - rm := resourceMetrics.At(i) + rm := md.ResourceMetrics().At(i) name, _ := rm.Resource().Attributes().Get(conventions.AttributeProcessExecutableName) assert.Equal(t, expectedName, name.StringVal()) } @@ -438,10 +438,8 @@ func TestScrapeMetrics_ProcessErrors(t *testing.T) { return &processHandlesMock{handles: []*processHandleMock{handleMock}}, nil } - resourceMetrics, err := scraper.scrape(context.Background()) + md, err := scraper.scrape(context.Background()) - md := pdata.NewMetrics() - resourceMetrics.MoveAndAppendTo(md.ResourceMetrics()) expectedResourceMetricsLen, expectedMetricsLen := getExpectedLengthOfReturnedMetrics(test.nameError, test.exeError, test.timesError, test.memoryInfoError, test.ioCountersError) assert.Equal(t, expectedResourceMetricsLen, md.ResourceMetrics().Len()) assert.Equal(t, expectedMetricsLen, md.MetricCount()) diff --git a/receiver/httpdreceiver/factory.go b/receiver/httpdreceiver/factory.go index 44d95a2fad1e..9e47de1b64e5 100644 --- a/receiver/httpdreceiver/factory.go +++ b/receiver/httpdreceiver/factory.go @@ -62,7 +62,10 @@ func createMetricsReceiver( cfg := rConf.(*Config) ns := newHttpdScraper(params.Logger, cfg) - scraper := scraperhelper.NewResourceMetricsScraper(cfg.ID(), ns.scrape, scraperhelper.WithStart(ns.start)) + scraper, err := scraperhelper.NewScraper(typeStr, ns.scrape, scraperhelper.WithStart(ns.start)) + if err != nil { + return nil, err + } return scraperhelper.NewScraperControllerReceiver( &cfg.ScraperControllerSettings, params, consumer, diff --git a/receiver/httpdreceiver/go.mod b/receiver/httpdreceiver/go.mod index 6c0e74c2d83d..388ba1f2aa24 100644 --- a/receiver/httpdreceiver/go.mod +++ b/receiver/httpdreceiver/go.mod @@ -4,8 +4,8 @@ go 1.17 require ( github.com/stretchr/testify v1.7.0 - go.opentelemetry.io/collector v0.37.0 - go.opentelemetry.io/collector/model v0.37.0 + go.opentelemetry.io/collector v0.37.1-0.20211015233822-bd87fb628058 + go.opentelemetry.io/collector/model v0.37.1-0.20211015233822-bd87fb628058 go.uber.org/zap v1.19.1 ) diff --git a/receiver/httpdreceiver/go.sum b/receiver/httpdreceiver/go.sum index d7bae3dad823..109c747c0f56 100644 --- a/receiver/httpdreceiver/go.sum +++ b/receiver/httpdreceiver/go.sum @@ -376,10 +376,11 @@ go.opencensus.io v0.22.4/go.mod h1:yxeiOL68Rb0Xd1ddK5vPZ/oVn4vY4Ynel7k9FzqtOIw= go.opencensus.io v0.22.5/go.mod h1:5pWMHQbX5EPX2/62yrJeAkowc+lfs/XD7Uxpq3pI6kk= go.opencensus.io v0.23.0 h1:gqCw0LfLxScz8irSi8exQc7fyQ0fKQU/qnC/X8+V/1M= go.opencensus.io v0.23.0/go.mod h1:XItmlyltB5F7CS4xOC1DcqMoFqwtC6OG2xF7mCv7P7E= -go.opentelemetry.io/collector v0.37.0 h1:X83+uWk11kW83BTkdKNt1Sk7gXyRv36wA6piT0FYfME= -go.opentelemetry.io/collector v0.37.0/go.mod h1:zbLWBJVy7bmiZHlHjCrV28vxXA/sAkCLtH5thD8ZahA= -go.opentelemetry.io/collector/model v0.37.0 h1:K1G6bgzBZ5kKSjZ1+EY9MhCOYsac4Q1K85fBUgpTVH8= +go.opentelemetry.io/collector v0.37.1-0.20211015233822-bd87fb628058 h1:6v0ba4ruY/W2cJLElDZEHDwShlSWUjK2MiBMvwfAIN0= +go.opentelemetry.io/collector v0.37.1-0.20211015233822-bd87fb628058/go.mod h1:zbLWBJVy7bmiZHlHjCrV28vxXA/sAkCLtH5thD8ZahA= go.opentelemetry.io/collector/model v0.37.0/go.mod h1:ESh1oWDNdS4fTg9sTFoYuiuvs8QuaX8yNGTPix3JZc8= +go.opentelemetry.io/collector/model v0.37.1-0.20211015233822-bd87fb628058 h1:jDw0pFIkDbvNRkkdCz1+gsBXIKbtY3GtRMPqzBeOfs4= +go.opentelemetry.io/collector/model v0.37.1-0.20211015233822-bd87fb628058/go.mod h1:ESh1oWDNdS4fTg9sTFoYuiuvs8QuaX8yNGTPix3JZc8= go.opentelemetry.io/contrib/instrumentation/google.golang.org/grpc/otelgrpc v0.25.0/go.mod h1:E5NNboN0UqSAki0Atn9kVwaN7I+l25gGxDqBueo/74E= go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.25.0 h1:FIbb8m2PtTWjvXLHOEnXAoSmkaiXbg3fuvoZAjsAT3Q= go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.25.0/go.mod h1:NyB05cd+yPX6W5SiRNuJ90w7PV2+g2cgRbsPL7MvpME= diff --git a/receiver/httpdreceiver/scraper.go b/receiver/httpdreceiver/scraper.go index 87fb86e53199..4ee47f170cf4 100644 --- a/receiver/httpdreceiver/scraper.go +++ b/receiver/httpdreceiver/scraper.go @@ -70,19 +70,18 @@ func addToIntMetric(metric pdata.NumberDataPointSlice, labels pdata.AttributeMap } } -func (r *httpdScraper) scrape(context.Context) (pdata.ResourceMetricsSlice, error) { +func (r *httpdScraper) scrape(context.Context) (pdata.Metrics, error) { if r.httpClient == nil { - return pdata.ResourceMetricsSlice{}, errors.New("failed to connect to Apache HTTPd") + return pdata.Metrics{}, errors.New("failed to connect to Apache HTTPd") } stats, err := r.GetStats() if err != nil { r.logger.Error("failed to fetch HTTPd stats", zap.Error(err)) - return pdata.ResourceMetricsSlice{}, err + return pdata.Metrics{}, err } - - rms := pdata.NewResourceMetricsSlice() - ilm := rms.AppendEmpty().InstrumentationLibraryMetrics().AppendEmpty() + md := pdata.NewMetrics() + ilm := md.ResourceMetrics().AppendEmpty().InstrumentationLibraryMetrics().AppendEmpty() ilm.InstrumentationLibrary().SetName("otel/httpd") now := pdata.NewTimestampFromTime(time.Now()) @@ -134,7 +133,7 @@ func (r *httpdScraper) scrape(context.Context) (pdata.ResourceMetricsSlice, erro } } - return rms, nil + return md, nil } // GetStats collects metric stats by making a get request at an endpoint. diff --git a/receiver/httpdreceiver/scraper_test.go b/receiver/httpdreceiver/scraper_test.go index c139135f1ebd..cb8010c3c786 100644 --- a/receiver/httpdreceiver/scraper_test.go +++ b/receiver/httpdreceiver/scraper_test.go @@ -63,11 +63,8 @@ Scoreboard: S_DD_L_GGG_____W__IIII_C________________W___________________________ require.NoError(t, err) assert.NotNil(t, sc.httpClient) - actualMetrics := pdata.NewMetrics() - rms := actualMetrics.ResourceMetrics() - scrapedRMS, err := sc.scrape(context.Background()) + actualMetrics, err := sc.scrape(context.Background()) require.NoError(t, err) - scrapedRMS.CopyTo(rms) expectedFile := filepath.Join("testdata", "scraper", "expected.json") expectedFileBytes, err := ioutil.ReadFile(expectedFile) diff --git a/receiver/influxdbreceiver/go.mod b/receiver/influxdbreceiver/go.mod index 490975fa057f..5917e87caea8 100644 --- a/receiver/influxdbreceiver/go.mod +++ b/receiver/influxdbreceiver/go.mod @@ -6,7 +6,7 @@ require ( github.com/influxdata/influxdb-observability/common v0.2.7 github.com/influxdata/influxdb-observability/influx2otel v0.0.0-20210927215436-943f6419116a github.com/influxdata/line-protocol/v2 v2.0.0-20210520103755-6551a972d603 - go.opentelemetry.io/collector v0.37.0 + go.opentelemetry.io/collector v0.37.1-0.20211015233822-bd87fb628058 go.uber.org/zap v1.19.1 ) @@ -25,7 +25,7 @@ require ( github.com/rogpeppe/go-internal v1.6.1 // indirect github.com/rs/cors v1.8.0 // indirect github.com/spf13/cast v1.4.1 // indirect - go.opentelemetry.io/collector/model v0.37.0 // indirect + go.opentelemetry.io/collector/model v0.37.1-0.20211015233822-bd87fb628058 // indirect go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.25.0 // indirect go.opentelemetry.io/otel v1.0.1 // indirect go.opentelemetry.io/otel/internal/metric v0.24.0 // indirect diff --git a/receiver/influxdbreceiver/go.sum b/receiver/influxdbreceiver/go.sum index d5fc5e57dfac..53cc9ddd0e43 100644 --- a/receiver/influxdbreceiver/go.sum +++ b/receiver/influxdbreceiver/go.sum @@ -386,12 +386,13 @@ 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.37.0 h1:X83+uWk11kW83BTkdKNt1Sk7gXyRv36wA6piT0FYfME= -go.opentelemetry.io/collector v0.37.0/go.mod h1:zbLWBJVy7bmiZHlHjCrV28vxXA/sAkCLtH5thD8ZahA= +go.opentelemetry.io/collector v0.37.1-0.20211015233822-bd87fb628058 h1:6v0ba4ruY/W2cJLElDZEHDwShlSWUjK2MiBMvwfAIN0= +go.opentelemetry.io/collector v0.37.1-0.20211015233822-bd87fb628058/go.mod h1:zbLWBJVy7bmiZHlHjCrV28vxXA/sAkCLtH5thD8ZahA= go.opentelemetry.io/collector/model v0.35.0/go.mod h1:+7YCSjJG+MqiIFjauzt7oM2qkqBsaJWh5hcsO4fwsAc= go.opentelemetry.io/collector/model v0.36.1-0.20210927193005-ebb0fbd6f23e/go.mod h1:ESh1oWDNdS4fTg9sTFoYuiuvs8QuaX8yNGTPix3JZc8= -go.opentelemetry.io/collector/model v0.37.0 h1:K1G6bgzBZ5kKSjZ1+EY9MhCOYsac4Q1K85fBUgpTVH8= go.opentelemetry.io/collector/model v0.37.0/go.mod h1:ESh1oWDNdS4fTg9sTFoYuiuvs8QuaX8yNGTPix3JZc8= +go.opentelemetry.io/collector/model v0.37.1-0.20211015233822-bd87fb628058 h1:jDw0pFIkDbvNRkkdCz1+gsBXIKbtY3GtRMPqzBeOfs4= +go.opentelemetry.io/collector/model v0.37.1-0.20211015233822-bd87fb628058/go.mod h1:ESh1oWDNdS4fTg9sTFoYuiuvs8QuaX8yNGTPix3JZc8= go.opentelemetry.io/contrib/instrumentation/google.golang.org/grpc/otelgrpc v0.25.0/go.mod h1:E5NNboN0UqSAki0Atn9kVwaN7I+l25gGxDqBueo/74E= go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.25.0 h1:FIbb8m2PtTWjvXLHOEnXAoSmkaiXbg3fuvoZAjsAT3Q= go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.25.0/go.mod h1:NyB05cd+yPX6W5SiRNuJ90w7PV2+g2cgRbsPL7MvpME= diff --git a/receiver/jaegerreceiver/go.mod b/receiver/jaegerreceiver/go.mod index 18e1cd93c7a6..f355a90753d8 100644 --- a/receiver/jaegerreceiver/go.mod +++ b/receiver/jaegerreceiver/go.mod @@ -10,8 +10,8 @@ require ( github.com/open-telemetry/opentelemetry-collector-contrib/pkg/translator/jaeger v0.37.1 github.com/stretchr/testify v1.7.0 github.com/uber/jaeger-lib v2.4.1+incompatible - go.opentelemetry.io/collector v0.37.0 - go.opentelemetry.io/collector/model v0.37.0 + go.opentelemetry.io/collector v0.37.1-0.20211015233822-bd87fb628058 + go.opentelemetry.io/collector/model v0.37.1-0.20211015233822-bd87fb628058 go.uber.org/multierr v1.7.0 go.uber.org/zap v1.19.1 google.golang.org/grpc v1.41.0 diff --git a/receiver/jaegerreceiver/go.sum b/receiver/jaegerreceiver/go.sum index be4c254a816b..e78085bb4949 100644 --- a/receiver/jaegerreceiver/go.sum +++ b/receiver/jaegerreceiver/go.sum @@ -774,11 +774,12 @@ go.opencensus.io v0.22.4/go.mod h1:yxeiOL68Rb0Xd1ddK5vPZ/oVn4vY4Ynel7k9FzqtOIw= go.opencensus.io v0.22.5/go.mod h1:5pWMHQbX5EPX2/62yrJeAkowc+lfs/XD7Uxpq3pI6kk= go.opencensus.io v0.23.0 h1:gqCw0LfLxScz8irSi8exQc7fyQ0fKQU/qnC/X8+V/1M= go.opencensus.io v0.23.0/go.mod h1:XItmlyltB5F7CS4xOC1DcqMoFqwtC6OG2xF7mCv7P7E= -go.opentelemetry.io/collector v0.37.0 h1:X83+uWk11kW83BTkdKNt1Sk7gXyRv36wA6piT0FYfME= -go.opentelemetry.io/collector v0.37.0/go.mod h1:zbLWBJVy7bmiZHlHjCrV28vxXA/sAkCLtH5thD8ZahA= +go.opentelemetry.io/collector v0.37.1-0.20211015233822-bd87fb628058 h1:6v0ba4ruY/W2cJLElDZEHDwShlSWUjK2MiBMvwfAIN0= +go.opentelemetry.io/collector v0.37.1-0.20211015233822-bd87fb628058/go.mod h1:zbLWBJVy7bmiZHlHjCrV28vxXA/sAkCLtH5thD8ZahA= go.opentelemetry.io/collector/model v0.36.0/go.mod h1:+7YCSjJG+MqiIFjauzt7oM2qkqBsaJWh5hcsO4fwsAc= -go.opentelemetry.io/collector/model v0.37.0 h1:K1G6bgzBZ5kKSjZ1+EY9MhCOYsac4Q1K85fBUgpTVH8= go.opentelemetry.io/collector/model v0.37.0/go.mod h1:ESh1oWDNdS4fTg9sTFoYuiuvs8QuaX8yNGTPix3JZc8= +go.opentelemetry.io/collector/model v0.37.1-0.20211015233822-bd87fb628058 h1:jDw0pFIkDbvNRkkdCz1+gsBXIKbtY3GtRMPqzBeOfs4= +go.opentelemetry.io/collector/model v0.37.1-0.20211015233822-bd87fb628058/go.mod h1:ESh1oWDNdS4fTg9sTFoYuiuvs8QuaX8yNGTPix3JZc8= go.opentelemetry.io/contrib/instrumentation/google.golang.org/grpc/otelgrpc v0.25.0 h1:Wx7nFnvCaissIUZxPkBqDz2963Z+Cl+PkYbDKzTxDqQ= go.opentelemetry.io/contrib/instrumentation/google.golang.org/grpc/otelgrpc v0.25.0/go.mod h1:E5NNboN0UqSAki0Atn9kVwaN7I+l25gGxDqBueo/74E= go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.25.0 h1:FIbb8m2PtTWjvXLHOEnXAoSmkaiXbg3fuvoZAjsAT3Q= diff --git a/receiver/jmxreceiver/go.mod b/receiver/jmxreceiver/go.mod index 788bacab4625..be05882c8ef3 100644 --- a/receiver/jmxreceiver/go.mod +++ b/receiver/jmxreceiver/go.mod @@ -7,8 +7,8 @@ require ( github.com/shirou/gopsutil/v3 v3.21.9 github.com/stretchr/testify v1.7.0 github.com/testcontainers/testcontainers-go v0.11.1 - go.opentelemetry.io/collector v0.37.0 - go.opentelemetry.io/collector/model v0.37.0 + go.opentelemetry.io/collector v0.37.1-0.20211015233822-bd87fb628058 + go.opentelemetry.io/collector/model v0.37.1-0.20211015233822-bd87fb628058 go.uber.org/atomic v1.9.0 go.uber.org/zap v1.19.1 diff --git a/receiver/jmxreceiver/go.sum b/receiver/jmxreceiver/go.sum index bd6d682594bb..f360254a0d2d 100644 --- a/receiver/jmxreceiver/go.sum +++ b/receiver/jmxreceiver/go.sum @@ -817,10 +817,11 @@ go.opencensus.io v0.22.4/go.mod h1:yxeiOL68Rb0Xd1ddK5vPZ/oVn4vY4Ynel7k9FzqtOIw= go.opencensus.io v0.22.5/go.mod h1:5pWMHQbX5EPX2/62yrJeAkowc+lfs/XD7Uxpq3pI6kk= go.opencensus.io v0.23.0 h1:gqCw0LfLxScz8irSi8exQc7fyQ0fKQU/qnC/X8+V/1M= go.opencensus.io v0.23.0/go.mod h1:XItmlyltB5F7CS4xOC1DcqMoFqwtC6OG2xF7mCv7P7E= -go.opentelemetry.io/collector v0.37.0 h1:X83+uWk11kW83BTkdKNt1Sk7gXyRv36wA6piT0FYfME= -go.opentelemetry.io/collector v0.37.0/go.mod h1:zbLWBJVy7bmiZHlHjCrV28vxXA/sAkCLtH5thD8ZahA= -go.opentelemetry.io/collector/model v0.37.0 h1:K1G6bgzBZ5kKSjZ1+EY9MhCOYsac4Q1K85fBUgpTVH8= +go.opentelemetry.io/collector v0.37.1-0.20211015233822-bd87fb628058 h1:6v0ba4ruY/W2cJLElDZEHDwShlSWUjK2MiBMvwfAIN0= +go.opentelemetry.io/collector v0.37.1-0.20211015233822-bd87fb628058/go.mod h1:zbLWBJVy7bmiZHlHjCrV28vxXA/sAkCLtH5thD8ZahA= go.opentelemetry.io/collector/model v0.37.0/go.mod h1:ESh1oWDNdS4fTg9sTFoYuiuvs8QuaX8yNGTPix3JZc8= +go.opentelemetry.io/collector/model v0.37.1-0.20211015233822-bd87fb628058 h1:jDw0pFIkDbvNRkkdCz1+gsBXIKbtY3GtRMPqzBeOfs4= +go.opentelemetry.io/collector/model v0.37.1-0.20211015233822-bd87fb628058/go.mod h1:ESh1oWDNdS4fTg9sTFoYuiuvs8QuaX8yNGTPix3JZc8= go.opentelemetry.io/contrib/instrumentation/google.golang.org/grpc/otelgrpc v0.25.0 h1:Wx7nFnvCaissIUZxPkBqDz2963Z+Cl+PkYbDKzTxDqQ= go.opentelemetry.io/contrib/instrumentation/google.golang.org/grpc/otelgrpc v0.25.0/go.mod h1:E5NNboN0UqSAki0Atn9kVwaN7I+l25gGxDqBueo/74E= go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.25.0 h1:FIbb8m2PtTWjvXLHOEnXAoSmkaiXbg3fuvoZAjsAT3Q= diff --git a/receiver/journaldreceiver/go.mod b/receiver/journaldreceiver/go.mod index 253ff6181e2f..2fe6dabb62b0 100644 --- a/receiver/journaldreceiver/go.mod +++ b/receiver/journaldreceiver/go.mod @@ -6,7 +6,7 @@ require ( github.com/open-telemetry/opentelemetry-collector-contrib/internal/stanza v0.37.1 github.com/open-telemetry/opentelemetry-log-collection v0.22.0 github.com/stretchr/testify v1.7.0 - go.opentelemetry.io/collector v0.37.0 + go.opentelemetry.io/collector v0.37.1-0.20211015233822-bd87fb628058 gopkg.in/yaml.v2 v2.4.0 ) @@ -28,7 +28,7 @@ require ( github.com/pelletier/go-toml v1.9.3 // indirect github.com/pmezard/go-difflib v1.0.0 // indirect github.com/spf13/cast v1.4.1 // indirect - go.opentelemetry.io/collector/model v0.37.0 // indirect + go.opentelemetry.io/collector/model v0.37.1-0.20211015233822-bd87fb628058 // indirect go.opentelemetry.io/otel v1.0.1 // indirect go.opentelemetry.io/otel/metric v0.24.0 // indirect go.opentelemetry.io/otel/trace v1.0.1 // indirect diff --git a/receiver/journaldreceiver/go.sum b/receiver/journaldreceiver/go.sum index 9aa7917d64fc..b47e9ec206d1 100644 --- a/receiver/journaldreceiver/go.sum +++ b/receiver/journaldreceiver/go.sum @@ -475,11 +475,12 @@ go.opencensus.io v0.22.5/go.mod h1:5pWMHQbX5EPX2/62yrJeAkowc+lfs/XD7Uxpq3pI6kk= go.opencensus.io v0.23.0 h1:gqCw0LfLxScz8irSi8exQc7fyQ0fKQU/qnC/X8+V/1M= go.opencensus.io v0.23.0/go.mod h1:XItmlyltB5F7CS4xOC1DcqMoFqwtC6OG2xF7mCv7P7E= go.opentelemetry.io/collector v0.35.0/go.mod h1:mMW4VJHhy8CwoTenV75axteKd0aZhWHDZjcZ59V53kc= -go.opentelemetry.io/collector v0.37.0 h1:X83+uWk11kW83BTkdKNt1Sk7gXyRv36wA6piT0FYfME= -go.opentelemetry.io/collector v0.37.0/go.mod h1:zbLWBJVy7bmiZHlHjCrV28vxXA/sAkCLtH5thD8ZahA= +go.opentelemetry.io/collector v0.37.1-0.20211015233822-bd87fb628058 h1:6v0ba4ruY/W2cJLElDZEHDwShlSWUjK2MiBMvwfAIN0= +go.opentelemetry.io/collector v0.37.1-0.20211015233822-bd87fb628058/go.mod h1:zbLWBJVy7bmiZHlHjCrV28vxXA/sAkCLtH5thD8ZahA= go.opentelemetry.io/collector/model v0.35.0/go.mod h1:+7YCSjJG+MqiIFjauzt7oM2qkqBsaJWh5hcsO4fwsAc= -go.opentelemetry.io/collector/model v0.37.0 h1:K1G6bgzBZ5kKSjZ1+EY9MhCOYsac4Q1K85fBUgpTVH8= go.opentelemetry.io/collector/model v0.37.0/go.mod h1:ESh1oWDNdS4fTg9sTFoYuiuvs8QuaX8yNGTPix3JZc8= +go.opentelemetry.io/collector/model v0.37.1-0.20211015233822-bd87fb628058 h1:jDw0pFIkDbvNRkkdCz1+gsBXIKbtY3GtRMPqzBeOfs4= +go.opentelemetry.io/collector/model v0.37.1-0.20211015233822-bd87fb628058/go.mod h1:ESh1oWDNdS4fTg9sTFoYuiuvs8QuaX8yNGTPix3JZc8= go.opentelemetry.io/contrib v0.22.0/go.mod h1:EH4yDYeNoaTqn/8yCWQmfNB78VHfGX2Jt2bvnvzBlGM= go.opentelemetry.io/contrib/instrumentation/google.golang.org/grpc/otelgrpc v0.22.0/go.mod h1:KjqwX4uJNaj479ZjFpADOMJKOM4rBXq4kN7nbeuGKrY= go.opentelemetry.io/contrib/instrumentation/google.golang.org/grpc/otelgrpc v0.25.0/go.mod h1:E5NNboN0UqSAki0Atn9kVwaN7I+l25gGxDqBueo/74E= diff --git a/receiver/k8sclusterreceiver/go.mod b/receiver/k8sclusterreceiver/go.mod index 3c761875f24a..6948b26e0620 100644 --- a/receiver/k8sclusterreceiver/go.mod +++ b/receiver/k8sclusterreceiver/go.mod @@ -12,8 +12,8 @@ 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.7.0 - go.opentelemetry.io/collector v0.37.0 - go.opentelemetry.io/collector/model v0.37.0 + go.opentelemetry.io/collector v0.37.1-0.20211015233822-bd87fb628058 + go.opentelemetry.io/collector/model v0.37.1-0.20211015233822-bd87fb628058 go.uber.org/atomic v1.9.0 go.uber.org/zap v1.19.1 google.golang.org/protobuf v1.27.1 diff --git a/receiver/k8sclusterreceiver/go.sum b/receiver/k8sclusterreceiver/go.sum index 9d545e999e9d..3ec4d11ac29b 100644 --- a/receiver/k8sclusterreceiver/go.sum +++ b/receiver/k8sclusterreceiver/go.sum @@ -818,10 +818,11 @@ go.opencensus.io v0.22.4/go.mod h1:yxeiOL68Rb0Xd1ddK5vPZ/oVn4vY4Ynel7k9FzqtOIw= go.opencensus.io v0.22.5/go.mod h1:5pWMHQbX5EPX2/62yrJeAkowc+lfs/XD7Uxpq3pI6kk= go.opencensus.io v0.23.0 h1:gqCw0LfLxScz8irSi8exQc7fyQ0fKQU/qnC/X8+V/1M= go.opencensus.io v0.23.0/go.mod h1:XItmlyltB5F7CS4xOC1DcqMoFqwtC6OG2xF7mCv7P7E= -go.opentelemetry.io/collector v0.37.0 h1:X83+uWk11kW83BTkdKNt1Sk7gXyRv36wA6piT0FYfME= -go.opentelemetry.io/collector v0.37.0/go.mod h1:zbLWBJVy7bmiZHlHjCrV28vxXA/sAkCLtH5thD8ZahA= -go.opentelemetry.io/collector/model v0.37.0 h1:K1G6bgzBZ5kKSjZ1+EY9MhCOYsac4Q1K85fBUgpTVH8= +go.opentelemetry.io/collector v0.37.1-0.20211015233822-bd87fb628058 h1:6v0ba4ruY/W2cJLElDZEHDwShlSWUjK2MiBMvwfAIN0= +go.opentelemetry.io/collector v0.37.1-0.20211015233822-bd87fb628058/go.mod h1:zbLWBJVy7bmiZHlHjCrV28vxXA/sAkCLtH5thD8ZahA= go.opentelemetry.io/collector/model v0.37.0/go.mod h1:ESh1oWDNdS4fTg9sTFoYuiuvs8QuaX8yNGTPix3JZc8= +go.opentelemetry.io/collector/model v0.37.1-0.20211015233822-bd87fb628058 h1:jDw0pFIkDbvNRkkdCz1+gsBXIKbtY3GtRMPqzBeOfs4= +go.opentelemetry.io/collector/model v0.37.1-0.20211015233822-bd87fb628058/go.mod h1:ESh1oWDNdS4fTg9sTFoYuiuvs8QuaX8yNGTPix3JZc8= go.opentelemetry.io/contrib/instrumentation/google.golang.org/grpc/otelgrpc v0.25.0/go.mod h1:E5NNboN0UqSAki0Atn9kVwaN7I+l25gGxDqBueo/74E= go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.25.0/go.mod h1:NyB05cd+yPX6W5SiRNuJ90w7PV2+g2cgRbsPL7MvpME= go.opentelemetry.io/contrib/zpages v0.25.0/go.mod h1:cXBK0CNcIBD9Iiw1Hv3DvS+E8N2rtr+k+OoPs+sP0T4= diff --git a/receiver/kafkametricsreceiver/broker_scraper.go b/receiver/kafkametricsreceiver/broker_scraper.go index e532eb47f878..0c0101d2e71d 100644 --- a/receiver/kafkametricsreceiver/broker_scraper.go +++ b/receiver/kafkametricsreceiver/broker_scraper.go @@ -21,12 +21,11 @@ import ( "github.com/Shopify/sarama" "go.opentelemetry.io/collector/component" - "go.opentelemetry.io/collector/config" "go.opentelemetry.io/collector/model/pdata" + "go.opentelemetry.io/collector/receiver/scraperhelper" "go.uber.org/zap" "github.com/open-telemetry/opentelemetry-collector-contrib/receiver/kafkametricsreceiver/internal/metadata" - "github.com/open-telemetry/opentelemetry-collector-contrib/receiver/scraperhelper" ) type brokerScraper struct { @@ -56,15 +55,15 @@ func (s *brokerScraper) shutdown(context.Context) error { return nil } -func (s *brokerScraper) scrape(context.Context) (pdata.ResourceMetricsSlice, error) { +func (s *brokerScraper) scrape(context.Context) (pdata.Metrics, error) { brokers := s.client.Brokers() - rms := pdata.NewResourceMetricsSlice() - ilm := rms.AppendEmpty().InstrumentationLibraryMetrics().AppendEmpty() + md := pdata.NewMetrics() + ilm := md.ResourceMetrics().AppendEmpty().InstrumentationLibraryMetrics().AppendEmpty() ilm.InstrumentationLibrary().SetName(instrumentationLibName) addIntGauge(ilm.Metrics(), metadata.M.KafkaBrokers.Name(), pdata.NewTimestampFromTime(time.Now()), pdata.NewAttributeMap(), int64(len(brokers))) - return rms, nil + return md, nil } func createBrokerScraper(_ context.Context, cfg Config, saramaConfig *sarama.Config, logger *zap.Logger) (scraperhelper.Scraper, error) { @@ -73,11 +72,10 @@ func createBrokerScraper(_ context.Context, cfg Config, saramaConfig *sarama.Con config: cfg, saramaConfig: saramaConfig, } - ms := scraperhelper.NewResourceMetricsScraper( - config.NewComponentID(config.Type(s.Name())), + return scraperhelper.NewScraper( + s.Name(), s.scrape, scraperhelper.WithShutdown(s.shutdown), scraperhelper.WithStart(s.start), ) - return ms, nil } diff --git a/receiver/kafkametricsreceiver/broker_scraper_test.go b/receiver/kafkametricsreceiver/broker_scraper_test.go index df292ff54d1c..d5ec3c2b8dbc 100644 --- a/receiver/kafkametricsreceiver/broker_scraper_test.go +++ b/receiver/kafkametricsreceiver/broker_scraper_test.go @@ -62,19 +62,18 @@ func TestBrokerScraper_Name(t *testing.T) { func TestBrokerScraper_createBrokerScraper(t *testing.T) { sc := sarama.NewConfig() newSaramaClient = mockNewSaramaClient - ms, err := createBrokerScraper(context.Background(), Config{}, sc, zap.NewNop()) + bs, err := createBrokerScraper(context.Background(), Config{}, sc, zap.NewNop()) assert.NoError(t, err) - assert.NotNil(t, ms) + assert.NotNil(t, bs) } func TestBrokerScraperStart(t *testing.T) { newSaramaClient = mockNewSaramaClient sc := sarama.NewConfig() - ms, err := createBrokerScraper(context.Background(), Config{}, sc, zap.NewNop()) - assert.NotNil(t, ms) - assert.Nil(t, err) - err = ms.Start(context.Background(), nil) + bs, err := createBrokerScraper(context.Background(), Config{}, sc, zap.NewNop()) assert.NoError(t, err) + assert.NotNil(t, bs) + assert.NoError(t, bs.Start(context.Background(), nil)) } func TestBrokerScraper_startBrokerScraper_handles_client_error(t *testing.T) { @@ -82,11 +81,10 @@ func TestBrokerScraper_startBrokerScraper_handles_client_error(t *testing.T) { return nil, fmt.Errorf("new client failed") } sc := sarama.NewConfig() - ms, err := createBrokerScraper(context.Background(), Config{}, sc, zap.NewNop()) - assert.NotNil(t, ms) - assert.Nil(t, err) - err = ms.Start(context.Background(), nil) - assert.Error(t, err) + bs, err := createBrokerScraper(context.Background(), Config{}, sc, zap.NewNop()) + assert.NoError(t, err) + assert.NotNil(t, bs) + assert.Error(t, bs.Start(context.Background(), nil)) } func TestBrokerScraper_scrape(t *testing.T) { @@ -97,19 +95,18 @@ func TestBrokerScraper_scrape(t *testing.T) { logger: zap.NewNop(), config: Config{}, } - ms, err := bs.scrape(context.Background()) - assert.Nil(t, err) + md, err := bs.scrape(context.Background()) + assert.NoError(t, err) expectedDp := int64(len(testBrokers)) - receivedMetrics := ms.At(0).InstrumentationLibraryMetrics().At(0).Metrics().At(0) + receivedMetrics := md.ResourceMetrics().At(0).InstrumentationLibraryMetrics().At(0).Metrics().At(0) receivedDp := receivedMetrics.Gauge().DataPoints().At(0).IntVal() assert.Equal(t, expectedDp, receivedDp) - assert.NotNil(t, ms) } func TestBrokersScraper_createBrokerScraper(t *testing.T) { sc := sarama.NewConfig() newSaramaClient = mockNewSaramaClient - ms, err := createBrokerScraper(context.Background(), Config{}, sc, zap.NewNop()) + bs, err := createBrokerScraper(context.Background(), Config{}, sc, zap.NewNop()) assert.NoError(t, err) - assert.NotNil(t, ms) + assert.NotNil(t, bs) } diff --git a/receiver/kafkametricsreceiver/config.go b/receiver/kafkametricsreceiver/config.go index 1b576af3ab74..0e92ce5869ae 100644 --- a/receiver/kafkametricsreceiver/config.go +++ b/receiver/kafkametricsreceiver/config.go @@ -15,8 +15,9 @@ package kafkametricsreceiver import ( + "go.opentelemetry.io/collector/receiver/scraperhelper" + "github.com/open-telemetry/opentelemetry-collector-contrib/exporter/kafkaexporter" - "github.com/open-telemetry/opentelemetry-collector-contrib/receiver/scraperhelper" ) // Config represents user settings for kafkametrics receiver diff --git a/receiver/kafkametricsreceiver/config_test.go b/receiver/kafkametricsreceiver/config_test.go index 4756dd622869..7e3d6cda2424 100644 --- a/receiver/kafkametricsreceiver/config_test.go +++ b/receiver/kafkametricsreceiver/config_test.go @@ -24,9 +24,9 @@ import ( "go.opentelemetry.io/collector/config" "go.opentelemetry.io/collector/config/configtest" "go.opentelemetry.io/collector/config/configtls" + "go.opentelemetry.io/collector/receiver/scraperhelper" "github.com/open-telemetry/opentelemetry-collector-contrib/exporter/kafkaexporter" - "github.com/open-telemetry/opentelemetry-collector-contrib/receiver/scraperhelper" ) func TestLoadConfig(t *testing.T) { diff --git a/receiver/kafkametricsreceiver/consumer_scraper.go b/receiver/kafkametricsreceiver/consumer_scraper.go index fedc9a562b46..0b1974156b1d 100644 --- a/receiver/kafkametricsreceiver/consumer_scraper.go +++ b/receiver/kafkametricsreceiver/consumer_scraper.go @@ -22,13 +22,12 @@ import ( "github.com/Shopify/sarama" "go.opentelemetry.io/collector/component" - "go.opentelemetry.io/collector/config" "go.opentelemetry.io/collector/model/pdata" + "go.opentelemetry.io/collector/receiver/scraperhelper" "go.uber.org/multierr" "go.uber.org/zap" "github.com/open-telemetry/opentelemetry-collector-contrib/receiver/kafkametricsreceiver/internal/metadata" - "github.com/open-telemetry/opentelemetry-collector-contrib/receiver/scraperhelper" ) type consumerScraper struct { @@ -69,10 +68,10 @@ func (s *consumerScraper) shutdown(_ context.Context) error { return nil } -func (s *consumerScraper) scrape(context.Context) (pdata.ResourceMetricsSlice, error) { +func (s *consumerScraper) scrape(context.Context) (pdata.Metrics, error) { cgs, listErr := s.clusterAdmin.ListConsumerGroups() if listErr != nil { - return pdata.ResourceMetricsSlice{}, listErr + return pdata.Metrics{}, listErr } var matchedGrpIds []string @@ -84,7 +83,7 @@ func (s *consumerScraper) scrape(context.Context) (pdata.ResourceMetricsSlice, e allTopics, listErr := s.clusterAdmin.ListTopics() if listErr != nil { - return pdata.ResourceMetricsSlice{}, listErr + return pdata.Metrics{}, listErr } matchedTopics := map[string]sarama.TopicDetail{} @@ -118,12 +117,12 @@ func (s *consumerScraper) scrape(context.Context) (pdata.ResourceMetricsSlice, e } consumerGroups, listErr := s.clusterAdmin.DescribeConsumerGroups(matchedGrpIds) if listErr != nil { - return pdata.ResourceMetricsSlice{}, listErr + return pdata.Metrics{}, listErr } now := pdata.NewTimestampFromTime(time.Now()) - rms := pdata.NewResourceMetricsSlice() - ilm := rms.AppendEmpty().InstrumentationLibraryMetrics().AppendEmpty() + md := pdata.NewMetrics() + ilm := md.ResourceMetrics().AppendEmpty().InstrumentationLibraryMetrics().AppendEmpty() ilm.InstrumentationLibrary().SetName(instrumentationLibName) for _, group := range consumerGroups { labels := pdata.NewAttributeMap() @@ -171,7 +170,7 @@ func (s *consumerScraper) scrape(context.Context) (pdata.ResourceMetricsSlice, e } } - return rms, scrapeError + return md, scrapeError } func createConsumerScraper(_ context.Context, cfg Config, saramaConfig *sarama.Config, logger *zap.Logger) (scraperhelper.Scraper, error) { @@ -190,10 +189,10 @@ func createConsumerScraper(_ context.Context, cfg Config, saramaConfig *sarama.C config: cfg, saramaConfig: saramaConfig, } - return scraperhelper.NewResourceMetricsScraper( - config.NewComponentID(config.Type(s.Name())), + return scraperhelper.NewScraper( + s.Name(), s.scrape, scraperhelper.WithShutdown(s.shutdown), scraperhelper.WithStart(s.start), - ), nil + ) } diff --git a/receiver/kafkametricsreceiver/consumer_scraper_test.go b/receiver/kafkametricsreceiver/consumer_scraper_test.go index 1c0d7be25ca0..9932c90b69e6 100644 --- a/receiver/kafkametricsreceiver/consumer_scraper_test.go +++ b/receiver/kafkametricsreceiver/consumer_scraper_test.go @@ -60,9 +60,9 @@ func TestConsumerScraper_createConsumerScraper(t *testing.T) { sc := sarama.NewConfig() newSaramaClient = mockNewSaramaClient newClusterAdmin = mockNewClusterAdmin - ms, err := createConsumerScraper(context.Background(), Config{}, sc, zap.NewNop()) + cs, err := createConsumerScraper(context.Background(), Config{}, sc, zap.NewNop()) assert.NoError(t, err) - assert.NotNil(t, ms) + assert.NotNil(t, cs) } func TestConsumerScraper_startScraper_handles_client_error(t *testing.T) { @@ -70,10 +70,10 @@ func TestConsumerScraper_startScraper_handles_client_error(t *testing.T) { return nil, fmt.Errorf("new client failed") } sc := sarama.NewConfig() - ms, err := createConsumerScraper(context.Background(), Config{}, sc, zap.NewNop()) - assert.NotNil(t, ms) - assert.Nil(t, err) - err = ms.Start(context.Background(), nil) + cs, err := createConsumerScraper(context.Background(), Config{}, sc, zap.NewNop()) + assert.NoError(t, err) + assert.NotNil(t, cs) + err = cs.Start(context.Background(), nil) assert.Error(t, err) } @@ -88,10 +88,10 @@ func TestConsumerScraper_startScraper_handles_clusterAdmin_error(t *testing.T) { return nil, fmt.Errorf("new cluster admin failed") } sc := sarama.NewConfig() - ms, err := createConsumerScraper(context.Background(), Config{}, sc, zap.NewNop()) - assert.Nil(t, err) - assert.NotNil(t, ms) - err = ms.Start(context.Background(), nil) + cs, err := createConsumerScraper(context.Background(), Config{}, sc, zap.NewNop()) + assert.NoError(t, err) + assert.NotNil(t, cs) + err = cs.Start(context.Background(), nil) assert.Error(t, err) } @@ -99,10 +99,10 @@ func TestConsumerScraperStart(t *testing.T) { newSaramaClient = mockNewSaramaClient newClusterAdmin = mockNewClusterAdmin sc := sarama.NewConfig() - ms, err := createConsumerScraper(context.Background(), Config{}, sc, zap.NewNop()) - assert.Nil(t, err) - assert.NotNil(t, ms) - err = ms.Start(context.Background(), nil) + cs, err := createConsumerScraper(context.Background(), Config{}, sc, zap.NewNop()) + assert.NoError(t, err) + assert.NotNil(t, cs) + err = cs.Start(context.Background(), nil) assert.NoError(t, err) } @@ -110,22 +110,22 @@ func TestConsumerScraper_createScraper_handles_invalid_topic_match(t *testing.T) newSaramaClient = mockNewSaramaClient newClusterAdmin = mockNewClusterAdmin sc := sarama.NewConfig() - ms, err := createConsumerScraper(context.Background(), Config{ + cs, err := createConsumerScraper(context.Background(), Config{ TopicMatch: "[", }, sc, zap.NewNop()) assert.Error(t, err) - assert.Nil(t, ms) + assert.Nil(t, cs) } func TestConsumerScraper_createScraper_handles_invalid_group_match(t *testing.T) { newSaramaClient = mockNewSaramaClient newClusterAdmin = mockNewClusterAdmin sc := sarama.NewConfig() - ms, err := createConsumerScraper(context.Background(), Config{ + cs, err := createConsumerScraper(context.Background(), Config{ GroupMatch: "[", }, sc, zap.NewNop()) assert.Error(t, err) - assert.Nil(t, ms) + assert.Nil(t, cs) } func TestConsumerScraper_scrape(t *testing.T) { @@ -137,9 +137,9 @@ func TestConsumerScraper_scrape(t *testing.T) { topicFilter: filter, groupFilter: filter, } - ms, err := cs.scrape(context.Background()) + md, err := cs.scrape(context.Background()) assert.NoError(t, err) - assert.NotNil(t, ms) + assert.NotNil(t, md) } func TestConsumerScraper_scrape_handlesListTopicError(t *testing.T) { @@ -201,8 +201,7 @@ func TestConsumerScraper_scrape_handlesOffsetPartialError(t *testing.T) { topicFilter: filter, clusterAdmin: clusterAdmin, } - s, err := cs.scrape(context.Background()) - assert.NotNil(t, s) + _, err := cs.scrape(context.Background()) assert.Error(t, err) } @@ -219,7 +218,6 @@ func TestConsumerScraper_scrape_handlesPartitionPartialError(t *testing.T) { topicFilter: filter, clusterAdmin: clusterAdmin, } - s, err := cs.scrape(context.Background()) - assert.NotNil(t, s) + _, err := cs.scrape(context.Background()) assert.Error(t, err) } diff --git a/receiver/kafkametricsreceiver/factory.go b/receiver/kafkametricsreceiver/factory.go index 9807927cd333..d6c1962efb98 100644 --- a/receiver/kafkametricsreceiver/factory.go +++ b/receiver/kafkametricsreceiver/factory.go @@ -21,8 +21,7 @@ import ( "go.opentelemetry.io/collector/config" "go.opentelemetry.io/collector/consumer" "go.opentelemetry.io/collector/receiver/receiverhelper" - - "github.com/open-telemetry/opentelemetry-collector-contrib/receiver/scraperhelper" + "go.opentelemetry.io/collector/receiver/scraperhelper" ) const ( diff --git a/receiver/kafkametricsreceiver/go.mod b/receiver/kafkametricsreceiver/go.mod index 3c52ca1bf787..23eccfcc1017 100644 --- a/receiver/kafkametricsreceiver/go.mod +++ b/receiver/kafkametricsreceiver/go.mod @@ -6,10 +6,9 @@ require ( github.com/Shopify/sarama v1.30.0 github.com/open-telemetry/opentelemetry-collector-contrib/exporter/kafkaexporter v0.37.1 github.com/open-telemetry/opentelemetry-collector-contrib/internal/common v0.37.1 - github.com/open-telemetry/opentelemetry-collector-contrib/receiver/scraperhelper v0.37.1 github.com/stretchr/testify v1.7.0 - go.opentelemetry.io/collector v0.37.0 - go.opentelemetry.io/collector/model v0.37.0 + go.opentelemetry.io/collector v0.37.1-0.20211015233822-bd87fb628058 + go.opentelemetry.io/collector/model v0.37.1-0.20211015233822-bd87fb628058 go.uber.org/zap v1.19.1 ) @@ -85,5 +84,3 @@ replace github.com/open-telemetry/opentelemetry-collector-contrib/internal/commo replace github.com/open-telemetry/opentelemetry-collector-contrib/internal/coreinternal => ../../internal/coreinternal replace github.com/open-telemetry/opentelemetry-collector-contrib/pkg/translator/jaeger => ./../../pkg/translator/jaeger - -replace github.com/open-telemetry/opentelemetry-collector-contrib/receiver/scraperhelper => ../scraperhelper diff --git a/receiver/kafkametricsreceiver/go.sum b/receiver/kafkametricsreceiver/go.sum index 742e73659f25..917f8d68149f 100644 --- a/receiver/kafkametricsreceiver/go.sum +++ b/receiver/kafkametricsreceiver/go.sum @@ -1131,11 +1131,12 @@ go.opencensus.io v0.22.4/go.mod h1:yxeiOL68Rb0Xd1ddK5vPZ/oVn4vY4Ynel7k9FzqtOIw= go.opencensus.io v0.22.5/go.mod h1:5pWMHQbX5EPX2/62yrJeAkowc+lfs/XD7Uxpq3pI6kk= go.opencensus.io v0.23.0 h1:gqCw0LfLxScz8irSi8exQc7fyQ0fKQU/qnC/X8+V/1M= go.opencensus.io v0.23.0/go.mod h1:XItmlyltB5F7CS4xOC1DcqMoFqwtC6OG2xF7mCv7P7E= -go.opentelemetry.io/collector v0.37.0 h1:X83+uWk11kW83BTkdKNt1Sk7gXyRv36wA6piT0FYfME= -go.opentelemetry.io/collector v0.37.0/go.mod h1:zbLWBJVy7bmiZHlHjCrV28vxXA/sAkCLtH5thD8ZahA= +go.opentelemetry.io/collector v0.37.1-0.20211015233822-bd87fb628058 h1:6v0ba4ruY/W2cJLElDZEHDwShlSWUjK2MiBMvwfAIN0= +go.opentelemetry.io/collector v0.37.1-0.20211015233822-bd87fb628058/go.mod h1:zbLWBJVy7bmiZHlHjCrV28vxXA/sAkCLtH5thD8ZahA= go.opentelemetry.io/collector/model v0.36.0/go.mod h1:+7YCSjJG+MqiIFjauzt7oM2qkqBsaJWh5hcsO4fwsAc= -go.opentelemetry.io/collector/model v0.37.0 h1:K1G6bgzBZ5kKSjZ1+EY9MhCOYsac4Q1K85fBUgpTVH8= go.opentelemetry.io/collector/model v0.37.0/go.mod h1:ESh1oWDNdS4fTg9sTFoYuiuvs8QuaX8yNGTPix3JZc8= +go.opentelemetry.io/collector/model v0.37.1-0.20211015233822-bd87fb628058 h1:jDw0pFIkDbvNRkkdCz1+gsBXIKbtY3GtRMPqzBeOfs4= +go.opentelemetry.io/collector/model v0.37.1-0.20211015233822-bd87fb628058/go.mod h1:ESh1oWDNdS4fTg9sTFoYuiuvs8QuaX8yNGTPix3JZc8= go.opentelemetry.io/contrib/instrumentation/google.golang.org/grpc/otelgrpc v0.25.0/go.mod h1:E5NNboN0UqSAki0Atn9kVwaN7I+l25gGxDqBueo/74E= go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.25.0/go.mod h1:NyB05cd+yPX6W5SiRNuJ90w7PV2+g2cgRbsPL7MvpME= go.opentelemetry.io/contrib/zpages v0.25.0/go.mod h1:cXBK0CNcIBD9Iiw1Hv3DvS+E8N2rtr+k+OoPs+sP0T4= diff --git a/receiver/kafkametricsreceiver/receiver.go b/receiver/kafkametricsreceiver/receiver.go index 40ed0183d7f6..fdf85c6d0b2c 100644 --- a/receiver/kafkametricsreceiver/receiver.go +++ b/receiver/kafkametricsreceiver/receiver.go @@ -21,10 +21,10 @@ import ( "github.com/Shopify/sarama" "go.opentelemetry.io/collector/component" "go.opentelemetry.io/collector/consumer" + "go.opentelemetry.io/collector/receiver/scraperhelper" "go.uber.org/zap" "github.com/open-telemetry/opentelemetry-collector-contrib/exporter/kafkaexporter" - "github.com/open-telemetry/opentelemetry-collector-contrib/receiver/scraperhelper" ) const ( diff --git a/receiver/kafkametricsreceiver/receiver_test.go b/receiver/kafkametricsreceiver/receiver_test.go index 6c268a98d76c..a117c08335d7 100644 --- a/receiver/kafkametricsreceiver/receiver_test.go +++ b/receiver/kafkametricsreceiver/receiver_test.go @@ -24,10 +24,10 @@ import ( "go.opentelemetry.io/collector/component/componenttest" "go.opentelemetry.io/collector/config/configtls" "go.opentelemetry.io/collector/consumer/consumertest" + "go.opentelemetry.io/collector/receiver/scraperhelper" "go.uber.org/zap" "github.com/open-telemetry/opentelemetry-collector-contrib/exporter/kafkaexporter" - "github.com/open-telemetry/opentelemetry-collector-contrib/receiver/scraperhelper" ) func TestNewReceiver_invalid_version_err(t *testing.T) { diff --git a/receiver/kafkametricsreceiver/topic_scraper.go b/receiver/kafkametricsreceiver/topic_scraper.go index 8bd6e7ec28c2..db64e5c972e8 100644 --- a/receiver/kafkametricsreceiver/topic_scraper.go +++ b/receiver/kafkametricsreceiver/topic_scraper.go @@ -22,13 +22,12 @@ import ( "github.com/Shopify/sarama" "go.opentelemetry.io/collector/component" - "go.opentelemetry.io/collector/config" "go.opentelemetry.io/collector/model/pdata" "go.opentelemetry.io/collector/receiver/scrapererror" + "go.opentelemetry.io/collector/receiver/scraperhelper" "go.uber.org/zap" "github.com/open-telemetry/opentelemetry-collector-contrib/receiver/kafkametricsreceiver/internal/metadata" - "github.com/open-telemetry/opentelemetry-collector-contrib/receiver/scraperhelper" ) type topicScraper struct { @@ -59,18 +58,18 @@ func (s *topicScraper) shutdown(context.Context) error { return nil } -func (s *topicScraper) scrape(context.Context) (pdata.ResourceMetricsSlice, error) { +func (s *topicScraper) scrape(context.Context) (pdata.Metrics, error) { topics, err := s.client.Topics() if err != nil { s.logger.Error("Error fetching cluster topics ", zap.Error(err)) - return pdata.ResourceMetricsSlice{}, err + return pdata.Metrics{}, err } var scrapeErrors = scrapererror.ScrapeErrors{} now := pdata.NewTimestampFromTime(time.Now()) - rms := pdata.NewResourceMetricsSlice() - ilm := rms.AppendEmpty().InstrumentationLibraryMetrics().AppendEmpty() + md := pdata.NewMetrics() + ilm := md.ResourceMetrics().AppendEmpty().InstrumentationLibraryMetrics().AppendEmpty() ilm.InstrumentationLibrary().SetName(instrumentationLibName) for _, topic := range topics { if !s.topicFilter.MatchString(topic) { @@ -112,7 +111,7 @@ func (s *topicScraper) scrape(context.Context) (pdata.ResourceMetricsSlice, erro } } } - return rms, scrapeErrors.Combine() + return md, scrapeErrors.Combine() } func createTopicsScraper(_ context.Context, cfg Config, saramaConfig *sarama.Config, logger *zap.Logger) (scraperhelper.Scraper, error) { @@ -126,12 +125,12 @@ func createTopicsScraper(_ context.Context, cfg Config, saramaConfig *sarama.Con saramaConfig: saramaConfig, config: cfg, } - return scraperhelper.NewResourceMetricsScraper( - config.NewComponentID(config.Type(s.Name())), + return scraperhelper.NewScraper( + s.Name(), s.scrape, scraperhelper.WithShutdown(s.shutdown), scraperhelper.WithStart(s.start), - ), nil + ) } func addIntGauge(ms pdata.MetricSlice, name string, now pdata.Timestamp, labels pdata.AttributeMap, value int64) { diff --git a/receiver/kafkametricsreceiver/topic_scraper_test.go b/receiver/kafkametricsreceiver/topic_scraper_test.go index 8d2de55eda48..c8bfb06ab1d4 100644 --- a/receiver/kafkametricsreceiver/topic_scraper_test.go +++ b/receiver/kafkametricsreceiver/topic_scraper_test.go @@ -114,11 +114,11 @@ func TestTopicScraper_scrapes(t *testing.T) { logger: zap.NewNop(), topicFilter: match, } - rm, err := scraper.scrape(context.Background()) + md, err := scraper.scrape(context.Background()) assert.NoError(t, err) - require.Equal(t, 1, rm.Len()) - require.Equal(t, 1, rm.At(0).InstrumentationLibraryMetrics().Len()) - ms := rm.At(0).InstrumentationLibraryMetrics().At(0).Metrics() + require.Equal(t, 1, md.ResourceMetrics().Len()) + require.Equal(t, 1, md.ResourceMetrics().At(0).InstrumentationLibraryMetrics().Len()) + ms := md.ResourceMetrics().At(0).InstrumentationLibraryMetrics().At(0).Metrics() for i := 0; i < ms.Len(); i++ { m := ms.At(i) dp := m.Gauge().DataPoints().At(0) diff --git a/receiver/kafkareceiver/go.mod b/receiver/kafkareceiver/go.mod index 3cae09421cb9..312333cc3b04 100644 --- a/receiver/kafkareceiver/go.mod +++ b/receiver/kafkareceiver/go.mod @@ -14,8 +14,8 @@ require ( github.com/openzipkin/zipkin-go v0.2.5 github.com/stretchr/testify v1.7.0 go.opencensus.io v0.23.0 - go.opentelemetry.io/collector v0.37.0 - go.opentelemetry.io/collector/model v0.37.0 + go.opentelemetry.io/collector v0.37.1-0.20211015233822-bd87fb628058 + go.opentelemetry.io/collector/model v0.37.1-0.20211015233822-bd87fb628058 go.uber.org/zap v1.19.1 ) diff --git a/receiver/kafkareceiver/go.sum b/receiver/kafkareceiver/go.sum index fea2d2df0925..98b50c7466ce 100644 --- a/receiver/kafkareceiver/go.sum +++ b/receiver/kafkareceiver/go.sum @@ -776,11 +776,12 @@ go.opencensus.io v0.22.4/go.mod h1:yxeiOL68Rb0Xd1ddK5vPZ/oVn4vY4Ynel7k9FzqtOIw= go.opencensus.io v0.22.5/go.mod h1:5pWMHQbX5EPX2/62yrJeAkowc+lfs/XD7Uxpq3pI6kk= go.opencensus.io v0.23.0 h1:gqCw0LfLxScz8irSi8exQc7fyQ0fKQU/qnC/X8+V/1M= go.opencensus.io v0.23.0/go.mod h1:XItmlyltB5F7CS4xOC1DcqMoFqwtC6OG2xF7mCv7P7E= -go.opentelemetry.io/collector v0.37.0 h1:X83+uWk11kW83BTkdKNt1Sk7gXyRv36wA6piT0FYfME= -go.opentelemetry.io/collector v0.37.0/go.mod h1:zbLWBJVy7bmiZHlHjCrV28vxXA/sAkCLtH5thD8ZahA= +go.opentelemetry.io/collector v0.37.1-0.20211015233822-bd87fb628058 h1:6v0ba4ruY/W2cJLElDZEHDwShlSWUjK2MiBMvwfAIN0= +go.opentelemetry.io/collector v0.37.1-0.20211015233822-bd87fb628058/go.mod h1:zbLWBJVy7bmiZHlHjCrV28vxXA/sAkCLtH5thD8ZahA= go.opentelemetry.io/collector/model v0.36.0/go.mod h1:+7YCSjJG+MqiIFjauzt7oM2qkqBsaJWh5hcsO4fwsAc= -go.opentelemetry.io/collector/model v0.37.0 h1:K1G6bgzBZ5kKSjZ1+EY9MhCOYsac4Q1K85fBUgpTVH8= go.opentelemetry.io/collector/model v0.37.0/go.mod h1:ESh1oWDNdS4fTg9sTFoYuiuvs8QuaX8yNGTPix3JZc8= +go.opentelemetry.io/collector/model v0.37.1-0.20211015233822-bd87fb628058 h1:jDw0pFIkDbvNRkkdCz1+gsBXIKbtY3GtRMPqzBeOfs4= +go.opentelemetry.io/collector/model v0.37.1-0.20211015233822-bd87fb628058/go.mod h1:ESh1oWDNdS4fTg9sTFoYuiuvs8QuaX8yNGTPix3JZc8= go.opentelemetry.io/contrib/instrumentation/google.golang.org/grpc/otelgrpc v0.25.0/go.mod h1:E5NNboN0UqSAki0Atn9kVwaN7I+l25gGxDqBueo/74E= go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.25.0/go.mod h1:NyB05cd+yPX6W5SiRNuJ90w7PV2+g2cgRbsPL7MvpME= go.opentelemetry.io/contrib/zpages v0.25.0/go.mod h1:cXBK0CNcIBD9Iiw1Hv3DvS+E8N2rtr+k+OoPs+sP0T4= diff --git a/receiver/kubeletstatsreceiver/go.mod b/receiver/kubeletstatsreceiver/go.mod index 68825e03b1d2..e21098cf6d9d 100644 --- a/receiver/kubeletstatsreceiver/go.mod +++ b/receiver/kubeletstatsreceiver/go.mod @@ -7,8 +7,8 @@ require ( github.com/open-telemetry/opentelemetry-collector-contrib/internal/k8sconfig v0.37.1 github.com/open-telemetry/opentelemetry-collector-contrib/internal/kubelet v0.37.1 github.com/stretchr/testify v1.7.0 - go.opentelemetry.io/collector v0.37.0 - go.opentelemetry.io/collector/model v0.37.0 + go.opentelemetry.io/collector v0.37.1-0.20211015233822-bd87fb628058 + go.opentelemetry.io/collector/model v0.37.1-0.20211015233822-bd87fb628058 go.uber.org/zap v1.19.1 gopkg.in/yaml.v2 v2.4.0 k8s.io/api v0.22.2 diff --git a/receiver/kubeletstatsreceiver/go.sum b/receiver/kubeletstatsreceiver/go.sum index a855fb991cf9..10392bad7a66 100644 --- a/receiver/kubeletstatsreceiver/go.sum +++ b/receiver/kubeletstatsreceiver/go.sum @@ -503,10 +503,11 @@ go.opencensus.io v0.22.4/go.mod h1:yxeiOL68Rb0Xd1ddK5vPZ/oVn4vY4Ynel7k9FzqtOIw= go.opencensus.io v0.22.5/go.mod h1:5pWMHQbX5EPX2/62yrJeAkowc+lfs/XD7Uxpq3pI6kk= go.opencensus.io v0.23.0 h1:gqCw0LfLxScz8irSi8exQc7fyQ0fKQU/qnC/X8+V/1M= go.opencensus.io v0.23.0/go.mod h1:XItmlyltB5F7CS4xOC1DcqMoFqwtC6OG2xF7mCv7P7E= -go.opentelemetry.io/collector v0.37.0 h1:X83+uWk11kW83BTkdKNt1Sk7gXyRv36wA6piT0FYfME= -go.opentelemetry.io/collector v0.37.0/go.mod h1:zbLWBJVy7bmiZHlHjCrV28vxXA/sAkCLtH5thD8ZahA= -go.opentelemetry.io/collector/model v0.37.0 h1:K1G6bgzBZ5kKSjZ1+EY9MhCOYsac4Q1K85fBUgpTVH8= +go.opentelemetry.io/collector v0.37.1-0.20211015233822-bd87fb628058 h1:6v0ba4ruY/W2cJLElDZEHDwShlSWUjK2MiBMvwfAIN0= +go.opentelemetry.io/collector v0.37.1-0.20211015233822-bd87fb628058/go.mod h1:zbLWBJVy7bmiZHlHjCrV28vxXA/sAkCLtH5thD8ZahA= go.opentelemetry.io/collector/model v0.37.0/go.mod h1:ESh1oWDNdS4fTg9sTFoYuiuvs8QuaX8yNGTPix3JZc8= +go.opentelemetry.io/collector/model v0.37.1-0.20211015233822-bd87fb628058 h1:jDw0pFIkDbvNRkkdCz1+gsBXIKbtY3GtRMPqzBeOfs4= +go.opentelemetry.io/collector/model v0.37.1-0.20211015233822-bd87fb628058/go.mod h1:ESh1oWDNdS4fTg9sTFoYuiuvs8QuaX8yNGTPix3JZc8= go.opentelemetry.io/contrib v0.20.0/go.mod h1:G/EtFaa6qaN7+LxqfIAT3GiZa7Wv5DTBUzl5H4LY0Kc= go.opentelemetry.io/contrib/instrumentation/google.golang.org/grpc/otelgrpc v0.25.0/go.mod h1:E5NNboN0UqSAki0Atn9kVwaN7I+l25gGxDqBueo/74E= go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.20.0/go.mod h1:2AboqHi0CiIZU0qwhtUfCYD1GeUzvvIXWNkhDt7ZMG4= diff --git a/receiver/memcachedreceiver/config.go b/receiver/memcachedreceiver/config.go index adcd97cfb0fb..23616666cec8 100644 --- a/receiver/memcachedreceiver/config.go +++ b/receiver/memcachedreceiver/config.go @@ -18,8 +18,7 @@ import ( "time" "go.opentelemetry.io/collector/config/confignet" - - "github.com/open-telemetry/opentelemetry-collector-contrib/receiver/scraperhelper" + "go.opentelemetry.io/collector/receiver/scraperhelper" ) type Config struct { diff --git a/receiver/memcachedreceiver/factory.go b/receiver/memcachedreceiver/factory.go index 99a734c66216..66633cb5c3b5 100644 --- a/receiver/memcachedreceiver/factory.go +++ b/receiver/memcachedreceiver/factory.go @@ -25,8 +25,7 @@ import ( "go.opentelemetry.io/collector/config/confignet" "go.opentelemetry.io/collector/consumer" "go.opentelemetry.io/collector/receiver/receiverhelper" - - "github.com/open-telemetry/opentelemetry-collector-contrib/receiver/scraperhelper" + "go.opentelemetry.io/collector/receiver/scraperhelper" ) const ( @@ -62,7 +61,10 @@ func createMetricsReceiver( ) (component.MetricsReceiver, error) { cfg := rConf.(*Config) - scraper := newMemcachedScraper(params.Logger, cfg) + scraper, err := newMemcachedScraper(params.Logger, cfg) + if err != nil { + return nil, err + } return scraperhelper.NewScraperControllerReceiver( &cfg.ScraperControllerSettings, params, consumer, diff --git a/receiver/memcachedreceiver/factory_test.go b/receiver/memcachedreceiver/factory_test.go index 79fdbfeddfc6..d2a235c00c8a 100644 --- a/receiver/memcachedreceiver/factory_test.go +++ b/receiver/memcachedreceiver/factory_test.go @@ -23,8 +23,7 @@ import ( "go.opentelemetry.io/collector/component/componenttest" "go.opentelemetry.io/collector/config/configtest" "go.opentelemetry.io/collector/consumer/consumertest" - - "github.com/open-telemetry/opentelemetry-collector-contrib/receiver/scraperhelper" + "go.opentelemetry.io/collector/receiver/scraperhelper" ) func TestType(t *testing.T) { diff --git a/receiver/memcachedreceiver/go.mod b/receiver/memcachedreceiver/go.mod index aa508e42117b..38d40233440f 100644 --- a/receiver/memcachedreceiver/go.mod +++ b/receiver/memcachedreceiver/go.mod @@ -5,10 +5,9 @@ go 1.17 require ( github.com/grobie/gomemcache v0.0.0-20180201122607-1f779c573665 github.com/open-telemetry/opentelemetry-collector-contrib/internal/common v0.37.1 - github.com/open-telemetry/opentelemetry-collector-contrib/receiver/scraperhelper v0.37.1 github.com/stretchr/testify v1.7.0 - go.opentelemetry.io/collector v0.37.0 - go.opentelemetry.io/collector/model v0.37.0 + go.opentelemetry.io/collector v0.37.1-0.20211015233822-bd87fb628058 + go.opentelemetry.io/collector/model v0.37.1-0.20211015233822-bd87fb628058 go.uber.org/zap v1.19.1 ) @@ -31,8 +30,10 @@ require ( github.com/mitchellh/reflectwalk v1.0.2 // indirect github.com/opencontainers/go-digest v1.0.0 // indirect github.com/opencontainers/image-spec v1.0.1 // indirect + github.com/pelletier/go-toml v1.9.3 // indirect github.com/pkg/errors v0.9.1 // indirect github.com/pmezard/go-difflib v1.0.0 // indirect + github.com/rogpeppe/go-internal v1.6.1 // indirect github.com/sirupsen/logrus v1.8.1 // indirect github.com/spf13/cast v1.4.1 // indirect go.opencensus.io v0.23.0 // indirect @@ -52,5 +53,3 @@ require ( ) replace github.com/open-telemetry/opentelemetry-collector-contrib/internal/common => ../../internal/common - -replace github.com/open-telemetry/opentelemetry-collector-contrib/receiver/scraperhelper => ../scraperhelper diff --git a/receiver/memcachedreceiver/go.sum b/receiver/memcachedreceiver/go.sum index a558c46e01a7..ccefda62f340 100644 --- a/receiver/memcachedreceiver/go.sum +++ b/receiver/memcachedreceiver/go.sum @@ -779,10 +779,11 @@ go.opencensus.io v0.22.4/go.mod h1:yxeiOL68Rb0Xd1ddK5vPZ/oVn4vY4Ynel7k9FzqtOIw= go.opencensus.io v0.22.5/go.mod h1:5pWMHQbX5EPX2/62yrJeAkowc+lfs/XD7Uxpq3pI6kk= go.opencensus.io v0.23.0 h1:gqCw0LfLxScz8irSi8exQc7fyQ0fKQU/qnC/X8+V/1M= go.opencensus.io v0.23.0/go.mod h1:XItmlyltB5F7CS4xOC1DcqMoFqwtC6OG2xF7mCv7P7E= -go.opentelemetry.io/collector v0.37.0 h1:X83+uWk11kW83BTkdKNt1Sk7gXyRv36wA6piT0FYfME= -go.opentelemetry.io/collector v0.37.0/go.mod h1:zbLWBJVy7bmiZHlHjCrV28vxXA/sAkCLtH5thD8ZahA= -go.opentelemetry.io/collector/model v0.37.0 h1:K1G6bgzBZ5kKSjZ1+EY9MhCOYsac4Q1K85fBUgpTVH8= +go.opentelemetry.io/collector v0.37.1-0.20211015233822-bd87fb628058 h1:6v0ba4ruY/W2cJLElDZEHDwShlSWUjK2MiBMvwfAIN0= +go.opentelemetry.io/collector v0.37.1-0.20211015233822-bd87fb628058/go.mod h1:zbLWBJVy7bmiZHlHjCrV28vxXA/sAkCLtH5thD8ZahA= go.opentelemetry.io/collector/model v0.37.0/go.mod h1:ESh1oWDNdS4fTg9sTFoYuiuvs8QuaX8yNGTPix3JZc8= +go.opentelemetry.io/collector/model v0.37.1-0.20211015233822-bd87fb628058 h1:jDw0pFIkDbvNRkkdCz1+gsBXIKbtY3GtRMPqzBeOfs4= +go.opentelemetry.io/collector/model v0.37.1-0.20211015233822-bd87fb628058/go.mod h1:ESh1oWDNdS4fTg9sTFoYuiuvs8QuaX8yNGTPix3JZc8= go.opentelemetry.io/contrib/instrumentation/google.golang.org/grpc/otelgrpc v0.25.0/go.mod h1:E5NNboN0UqSAki0Atn9kVwaN7I+l25gGxDqBueo/74E= go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.25.0/go.mod h1:NyB05cd+yPX6W5SiRNuJ90w7PV2+g2cgRbsPL7MvpME= go.opentelemetry.io/contrib/zpages v0.25.0/go.mod h1:cXBK0CNcIBD9Iiw1Hv3DvS+E8N2rtr+k+OoPs+sP0T4= diff --git a/receiver/memcachedreceiver/scraper.go b/receiver/memcachedreceiver/scraper.go index 8d71fb866e10..addff9c63c4b 100644 --- a/receiver/memcachedreceiver/scraper.go +++ b/receiver/memcachedreceiver/scraper.go @@ -20,10 +20,10 @@ import ( "github.com/grobie/gomemcache/memcache" "go.opentelemetry.io/collector/model/pdata" + "go.opentelemetry.io/collector/receiver/scraperhelper" "go.uber.org/zap" "github.com/open-telemetry/opentelemetry-collector-contrib/receiver/memcachedreceiver/internal/metadata" - "github.com/open-telemetry/opentelemetry-collector-contrib/receiver/scraperhelper" ) type memcachedScraper struct { @@ -36,15 +36,15 @@ type memcachedScraper struct { func newMemcachedScraper( logger *zap.Logger, config *Config, -) scraperhelper.Scraper { +) (scraperhelper.Scraper, error) { ms := &memcachedScraper{ logger: logger, config: config, } - return scraperhelper.NewResourceMetricsScraper(config.ID(), ms.scrape) + return scraperhelper.NewScraper(typeStr, ms.scrape) } -func (r *memcachedScraper) scrape(_ context.Context) (pdata.ResourceMetricsSlice, error) { +func (r *memcachedScraper) scrape(_ context.Context) (pdata.Metrics, error) { // Init client in scrape method in case there are transient errors in the // constructor. if r.client == nil { @@ -52,7 +52,7 @@ func (r *memcachedScraper) scrape(_ context.Context) (pdata.ResourceMetricsSlice r.client, err = memcache.New(r.config.Endpoint) if err != nil { r.client = nil - return pdata.ResourceMetricsSlice{}, err + return pdata.Metrics{}, err } r.client.Timeout = r.config.Timeout @@ -61,12 +61,12 @@ func (r *memcachedScraper) scrape(_ context.Context) (pdata.ResourceMetricsSlice stats, err := r.client.Stats() if err != nil { r.logger.Error("Failed to fetch memcached stats", zap.Error(err)) - return pdata.ResourceMetricsSlice{}, err + return pdata.Metrics{}, err } now := pdata.NewTimestampFromTime(time.Now()) - metrics := pdata.NewResourceMetricsSlice() - ilm := metrics.AppendEmpty().InstrumentationLibraryMetrics().AppendEmpty() + md := pdata.NewMetrics() + ilm := md.ResourceMetrics().AppendEmpty().InstrumentationLibraryMetrics().AppendEmpty() ilm.InstrumentationLibrary().SetName("otelcol/memcached") for _, stats := range stats { @@ -86,7 +86,7 @@ func (r *memcachedScraper) scrape(_ context.Context) (pdata.ResourceMetricsSlice } } - return metrics, nil + return md, nil } func addIntGauge(metrics pdata.MetricSlice, initFunc func(pdata.Metric), now pdata.Timestamp, value int64) { diff --git a/receiver/mongodbatlasreceiver/go.mod b/receiver/mongodbatlasreceiver/go.mod index c1cd05aceae0..a0d9e1bf9610 100644 --- a/receiver/mongodbatlasreceiver/go.mod +++ b/receiver/mongodbatlasreceiver/go.mod @@ -6,7 +6,7 @@ require ( github.com/mongodb-forks/digest v1.0.3 github.com/open-telemetry/opentelemetry-collector-contrib/internal/interval v0.37.1 go.mongodb.org/atlas v0.12.0 - go.opentelemetry.io/collector v0.37.0 + go.opentelemetry.io/collector v0.37.1-0.20211015233822-bd87fb628058 go.uber.org/zap v1.19.1 ) @@ -24,7 +24,7 @@ require ( github.com/pkg/errors v0.9.1 // indirect github.com/rogpeppe/go-internal v1.6.1 // indirect github.com/spf13/cast v1.4.1 // indirect - go.opentelemetry.io/collector/model v0.37.0 // indirect + go.opentelemetry.io/collector/model v0.37.1-0.20211015233822-bd87fb628058 // indirect go.opentelemetry.io/otel v1.0.1 // indirect go.opentelemetry.io/otel/metric v0.24.0 // indirect go.opentelemetry.io/otel/trace v1.0.1 // indirect diff --git a/receiver/mongodbatlasreceiver/go.sum b/receiver/mongodbatlasreceiver/go.sum index f3d129932a1d..dae4482994e5 100644 --- a/receiver/mongodbatlasreceiver/go.sum +++ b/receiver/mongodbatlasreceiver/go.sum @@ -380,10 +380,11 @@ 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.37.0 h1:X83+uWk11kW83BTkdKNt1Sk7gXyRv36wA6piT0FYfME= -go.opentelemetry.io/collector v0.37.0/go.mod h1:zbLWBJVy7bmiZHlHjCrV28vxXA/sAkCLtH5thD8ZahA= -go.opentelemetry.io/collector/model v0.37.0 h1:K1G6bgzBZ5kKSjZ1+EY9MhCOYsac4Q1K85fBUgpTVH8= +go.opentelemetry.io/collector v0.37.1-0.20211015233822-bd87fb628058 h1:6v0ba4ruY/W2cJLElDZEHDwShlSWUjK2MiBMvwfAIN0= +go.opentelemetry.io/collector v0.37.1-0.20211015233822-bd87fb628058/go.mod h1:zbLWBJVy7bmiZHlHjCrV28vxXA/sAkCLtH5thD8ZahA= go.opentelemetry.io/collector/model v0.37.0/go.mod h1:ESh1oWDNdS4fTg9sTFoYuiuvs8QuaX8yNGTPix3JZc8= +go.opentelemetry.io/collector/model v0.37.1-0.20211015233822-bd87fb628058 h1:jDw0pFIkDbvNRkkdCz1+gsBXIKbtY3GtRMPqzBeOfs4= +go.opentelemetry.io/collector/model v0.37.1-0.20211015233822-bd87fb628058/go.mod h1:ESh1oWDNdS4fTg9sTFoYuiuvs8QuaX8yNGTPix3JZc8= go.opentelemetry.io/contrib/instrumentation/google.golang.org/grpc/otelgrpc v0.25.0/go.mod h1:E5NNboN0UqSAki0Atn9kVwaN7I+l25gGxDqBueo/74E= go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.25.0/go.mod h1:NyB05cd+yPX6W5SiRNuJ90w7PV2+g2cgRbsPL7MvpME= go.opentelemetry.io/contrib/zpages v0.25.0/go.mod h1:cXBK0CNcIBD9Iiw1Hv3DvS+E8N2rtr+k+OoPs+sP0T4= diff --git a/receiver/mysqlreceiver/factory.go b/receiver/mysqlreceiver/factory.go index 75910ca3f5da..0f6cb57826b9 100644 --- a/receiver/mysqlreceiver/factory.go +++ b/receiver/mysqlreceiver/factory.go @@ -57,9 +57,13 @@ func createMetricsReceiver( cfg := rConf.(*Config) ns := newMySQLScraper(params.Logger, cfg) - scraper := scraperhelper.NewResourceMetricsScraper(cfg.ID(), ns.scrape, scraperhelper.WithStart(ns.start), + scraper, err := scraperhelper.NewScraper(typeStr, ns.scrape, scraperhelper.WithStart(ns.start), scraperhelper.WithShutdown(ns.shutdown)) + if err != nil { + return nil, err + } + return scraperhelper.NewScraperControllerReceiver( &cfg.ScraperControllerSettings, params, consumer, scraperhelper.AddScraper(scraper), diff --git a/receiver/mysqlreceiver/go.mod b/receiver/mysqlreceiver/go.mod index ef68ddd9e4cc..89b4d9e84c10 100644 --- a/receiver/mysqlreceiver/go.mod +++ b/receiver/mysqlreceiver/go.mod @@ -5,8 +5,8 @@ go 1.17 require ( github.com/go-sql-driver/mysql v1.6.0 github.com/stretchr/testify v1.7.0 - go.opentelemetry.io/collector v0.37.0 - go.opentelemetry.io/collector/model v0.37.0 + go.opentelemetry.io/collector v0.37.1-0.20211015233822-bd87fb628058 + go.opentelemetry.io/collector/model v0.37.1-0.20211015233822-bd87fb628058 go.uber.org/multierr v1.7.0 go.uber.org/zap v1.19.1 ) diff --git a/receiver/mysqlreceiver/go.sum b/receiver/mysqlreceiver/go.sum index 087c16409340..afc92b86b3ad 100644 --- a/receiver/mysqlreceiver/go.sum +++ b/receiver/mysqlreceiver/go.sum @@ -374,10 +374,11 @@ go.opencensus.io v0.22.4/go.mod h1:yxeiOL68Rb0Xd1ddK5vPZ/oVn4vY4Ynel7k9FzqtOIw= go.opencensus.io v0.22.5/go.mod h1:5pWMHQbX5EPX2/62yrJeAkowc+lfs/XD7Uxpq3pI6kk= go.opencensus.io v0.23.0 h1:gqCw0LfLxScz8irSi8exQc7fyQ0fKQU/qnC/X8+V/1M= go.opencensus.io v0.23.0/go.mod h1:XItmlyltB5F7CS4xOC1DcqMoFqwtC6OG2xF7mCv7P7E= -go.opentelemetry.io/collector v0.37.0 h1:X83+uWk11kW83BTkdKNt1Sk7gXyRv36wA6piT0FYfME= -go.opentelemetry.io/collector v0.37.0/go.mod h1:zbLWBJVy7bmiZHlHjCrV28vxXA/sAkCLtH5thD8ZahA= -go.opentelemetry.io/collector/model v0.37.0 h1:K1G6bgzBZ5kKSjZ1+EY9MhCOYsac4Q1K85fBUgpTVH8= +go.opentelemetry.io/collector v0.37.1-0.20211015233822-bd87fb628058 h1:6v0ba4ruY/W2cJLElDZEHDwShlSWUjK2MiBMvwfAIN0= +go.opentelemetry.io/collector v0.37.1-0.20211015233822-bd87fb628058/go.mod h1:zbLWBJVy7bmiZHlHjCrV28vxXA/sAkCLtH5thD8ZahA= go.opentelemetry.io/collector/model v0.37.0/go.mod h1:ESh1oWDNdS4fTg9sTFoYuiuvs8QuaX8yNGTPix3JZc8= +go.opentelemetry.io/collector/model v0.37.1-0.20211015233822-bd87fb628058 h1:jDw0pFIkDbvNRkkdCz1+gsBXIKbtY3GtRMPqzBeOfs4= +go.opentelemetry.io/collector/model v0.37.1-0.20211015233822-bd87fb628058/go.mod h1:ESh1oWDNdS4fTg9sTFoYuiuvs8QuaX8yNGTPix3JZc8= go.opentelemetry.io/contrib/instrumentation/google.golang.org/grpc/otelgrpc v0.25.0/go.mod h1:E5NNboN0UqSAki0Atn9kVwaN7I+l25gGxDqBueo/74E= go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.25.0/go.mod h1:NyB05cd+yPX6W5SiRNuJ90w7PV2+g2cgRbsPL7MvpME= go.opentelemetry.io/contrib/zpages v0.25.0/go.mod h1:cXBK0CNcIBD9Iiw1Hv3DvS+E8N2rtr+k+OoPs+sP0T4= diff --git a/receiver/mysqlreceiver/scraper.go b/receiver/mysqlreceiver/scraper.go index 9ff022a8b4ff..3ee1be2e3942 100644 --- a/receiver/mysqlreceiver/scraper.go +++ b/receiver/mysqlreceiver/scraper.go @@ -99,15 +99,15 @@ func addToIntMetric(metric pdata.NumberDataPointSlice, labels pdata.AttributeMap } // scrape scrapes the mysql db metric stats, transforms them and labels them into a metric slices. -func (m *mySQLScraper) scrape(context.Context) (pdata.ResourceMetricsSlice, error) { +func (m *mySQLScraper) scrape(context.Context) (pdata.Metrics, error) { if m.client == nil { - return pdata.ResourceMetricsSlice{}, errors.New("failed to connect to http client") + return pdata.Metrics{}, errors.New("failed to connect to http client") } // metric initialization - rms := pdata.NewResourceMetricsSlice() - ilm := rms.AppendEmpty().InstrumentationLibraryMetrics().AppendEmpty() + md := pdata.NewMetrics() + ilm := md.ResourceMetrics().AppendEmpty().InstrumentationLibraryMetrics().AppendEmpty() ilm.InstrumentationLibrary().SetName("otel/mysql") now := pdata.NewTimestampFromTime(time.Now()) @@ -147,7 +147,7 @@ func (m *mySQLScraper) scrape(context.Context) (pdata.ResourceMetricsSlice, erro globalStats, err := m.client.getGlobalStats() if err != nil { m.logger.Error("Failed to fetch global stats", zap.Error(err)) - return pdata.ResourceMetricsSlice{}, err + return pdata.Metrics{}, err } for k, v := range globalStats { @@ -513,7 +513,7 @@ func (m *mySQLScraper) scrape(context.Context) (pdata.ResourceMetricsSlice, erro } } } - return rms, nil + return md, nil } // parseFloat converts string to float64. diff --git a/receiver/mysqlreceiver/scraper_test.go b/receiver/mysqlreceiver/scraper_test.go index c38c4928cf29..87e795cb6db5 100644 --- a/receiver/mysqlreceiver/scraper_test.go +++ b/receiver/mysqlreceiver/scraper_test.go @@ -35,11 +35,8 @@ func TestScrape(t *testing.T) { }) sc.client = &mysqlMock - actualMetrics := pdata.NewMetrics() - rms := actualMetrics.ResourceMetrics() - scrapedRMS, err := sc.scrape(context.Background()) + actualMetrics, err := sc.scrape(context.Background()) require.NoError(t, err) - scrapedRMS.CopyTo(rms) expectedFileBytes, err := ioutil.ReadFile("./testdata/scraper/expected.json") require.NoError(t, err) diff --git a/receiver/nginxreceiver/config.go b/receiver/nginxreceiver/config.go index fe7194272715..43f8b2ef3d8f 100644 --- a/receiver/nginxreceiver/config.go +++ b/receiver/nginxreceiver/config.go @@ -16,8 +16,7 @@ package nginxreceiver import ( "go.opentelemetry.io/collector/config/confighttp" - - "github.com/open-telemetry/opentelemetry-collector-contrib/receiver/scraperhelper" + "go.opentelemetry.io/collector/receiver/scraperhelper" ) type Config struct { diff --git a/receiver/nginxreceiver/factory.go b/receiver/nginxreceiver/factory.go index 8d54b5a6debe..1572eaf50bfe 100644 --- a/receiver/nginxreceiver/factory.go +++ b/receiver/nginxreceiver/factory.go @@ -25,8 +25,7 @@ import ( "go.opentelemetry.io/collector/config/confighttp" "go.opentelemetry.io/collector/consumer" "go.opentelemetry.io/collector/receiver/receiverhelper" - - "github.com/open-telemetry/opentelemetry-collector-contrib/receiver/scraperhelper" + "go.opentelemetry.io/collector/receiver/scraperhelper" ) const ( @@ -63,7 +62,10 @@ func createMetricsReceiver( cfg := rConf.(*Config) ns := newNginxScraper(params.Logger, cfg) - scraper := scraperhelper.NewResourceMetricsScraper(cfg.ID(), ns.scrape, scraperhelper.WithStart(ns.start)) + scraper, err := scraperhelper.NewScraper(typeStr, ns.scrape, scraperhelper.WithStart(ns.start)) + if err != nil { + return nil, err + } return scraperhelper.NewScraperControllerReceiver( &cfg.ScraperControllerSettings, params, consumer, diff --git a/receiver/nginxreceiver/factory_test.go b/receiver/nginxreceiver/factory_test.go index 0986edef6e16..4adc1e0f9f95 100644 --- a/receiver/nginxreceiver/factory_test.go +++ b/receiver/nginxreceiver/factory_test.go @@ -23,8 +23,7 @@ import ( "go.opentelemetry.io/collector/component/componenttest" "go.opentelemetry.io/collector/config/configtest" "go.opentelemetry.io/collector/consumer/consumertest" - - "github.com/open-telemetry/opentelemetry-collector-contrib/receiver/scraperhelper" + "go.opentelemetry.io/collector/receiver/scraperhelper" ) func TestType(t *testing.T) { diff --git a/receiver/nginxreceiver/go.mod b/receiver/nginxreceiver/go.mod index 286f47fb12a7..468e5068f886 100644 --- a/receiver/nginxreceiver/go.mod +++ b/receiver/nginxreceiver/go.mod @@ -5,11 +5,10 @@ go 1.17 require ( github.com/morikuni/aec v1.0.0 // indirect github.com/nginxinc/nginx-prometheus-exporter v0.8.1-0.20201110005315-f5a5f8086c19 - github.com/open-telemetry/opentelemetry-collector-contrib/receiver/scraperhelper v0.37.1 github.com/stretchr/testify v1.7.0 github.com/testcontainers/testcontainers-go v0.11.1 - go.opentelemetry.io/collector v0.37.0 - go.opentelemetry.io/collector/model v0.37.0 + go.opentelemetry.io/collector v0.37.1-0.20211015233822-bd87fb628058 + go.opentelemetry.io/collector/model v0.37.1-0.20211015233822-bd87fb628058 go.uber.org/zap v1.19.1 golang.org/x/time v0.0.0-20210611083556-38a9dc6acbc6 // indirect @@ -44,8 +43,10 @@ require ( github.com/opencontainers/go-digest v1.0.0 // indirect github.com/opencontainers/image-spec v1.0.1 // indirect github.com/opencontainers/runc v1.0.2 // indirect + github.com/pelletier/go-toml v1.9.3 // indirect github.com/pkg/errors v0.9.1 // indirect github.com/pmezard/go-difflib v1.0.0 // indirect + github.com/rogpeppe/go-internal v1.6.1 // indirect github.com/rs/cors v1.8.0 // indirect github.com/sirupsen/logrus v1.8.1 // indirect github.com/spf13/cast v1.4.1 // indirect @@ -66,5 +67,3 @@ require ( gopkg.in/yaml.v2 v2.4.0 // indirect gopkg.in/yaml.v3 v3.0.0-20210107192922-496545a6307b // indirect ) - -replace github.com/open-telemetry/opentelemetry-collector-contrib/receiver/scraperhelper => ../scraperhelper diff --git a/receiver/nginxreceiver/go.sum b/receiver/nginxreceiver/go.sum index 303cb332c1e9..0ca7e910564c 100644 --- a/receiver/nginxreceiver/go.sum +++ b/receiver/nginxreceiver/go.sum @@ -804,10 +804,11 @@ go.opencensus.io v0.22.4/go.mod h1:yxeiOL68Rb0Xd1ddK5vPZ/oVn4vY4Ynel7k9FzqtOIw= go.opencensus.io v0.22.5/go.mod h1:5pWMHQbX5EPX2/62yrJeAkowc+lfs/XD7Uxpq3pI6kk= go.opencensus.io v0.23.0 h1:gqCw0LfLxScz8irSi8exQc7fyQ0fKQU/qnC/X8+V/1M= go.opencensus.io v0.23.0/go.mod h1:XItmlyltB5F7CS4xOC1DcqMoFqwtC6OG2xF7mCv7P7E= -go.opentelemetry.io/collector v0.37.0 h1:X83+uWk11kW83BTkdKNt1Sk7gXyRv36wA6piT0FYfME= -go.opentelemetry.io/collector v0.37.0/go.mod h1:zbLWBJVy7bmiZHlHjCrV28vxXA/sAkCLtH5thD8ZahA= -go.opentelemetry.io/collector/model v0.37.0 h1:K1G6bgzBZ5kKSjZ1+EY9MhCOYsac4Q1K85fBUgpTVH8= +go.opentelemetry.io/collector v0.37.1-0.20211015233822-bd87fb628058 h1:6v0ba4ruY/W2cJLElDZEHDwShlSWUjK2MiBMvwfAIN0= +go.opentelemetry.io/collector v0.37.1-0.20211015233822-bd87fb628058/go.mod h1:zbLWBJVy7bmiZHlHjCrV28vxXA/sAkCLtH5thD8ZahA= go.opentelemetry.io/collector/model v0.37.0/go.mod h1:ESh1oWDNdS4fTg9sTFoYuiuvs8QuaX8yNGTPix3JZc8= +go.opentelemetry.io/collector/model v0.37.1-0.20211015233822-bd87fb628058 h1:jDw0pFIkDbvNRkkdCz1+gsBXIKbtY3GtRMPqzBeOfs4= +go.opentelemetry.io/collector/model v0.37.1-0.20211015233822-bd87fb628058/go.mod h1:ESh1oWDNdS4fTg9sTFoYuiuvs8QuaX8yNGTPix3JZc8= go.opentelemetry.io/contrib/instrumentation/google.golang.org/grpc/otelgrpc v0.25.0/go.mod h1:E5NNboN0UqSAki0Atn9kVwaN7I+l25gGxDqBueo/74E= go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.25.0 h1:FIbb8m2PtTWjvXLHOEnXAoSmkaiXbg3fuvoZAjsAT3Q= go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.25.0/go.mod h1:NyB05cd+yPX6W5SiRNuJ90w7PV2+g2cgRbsPL7MvpME= diff --git a/receiver/nginxreceiver/integration_test.go b/receiver/nginxreceiver/integration_test.go index 3a89a23c081c..390f386f3454 100644 --- a/receiver/nginxreceiver/integration_test.go +++ b/receiver/nginxreceiver/integration_test.go @@ -30,10 +30,10 @@ import ( "github.com/testcontainers/testcontainers-go/wait" "go.opentelemetry.io/collector/component/componenttest" "go.opentelemetry.io/collector/config/confighttp" + "go.opentelemetry.io/collector/receiver/scraperhelper" "go.uber.org/zap" "github.com/open-telemetry/opentelemetry-collector-contrib/receiver/nginxreceiver/internal/metadata" - "github.com/open-telemetry/opentelemetry-collector-contrib/receiver/scraperhelper" ) type NginxIntegrationSuite struct { @@ -85,11 +85,11 @@ func (suite *NginxIntegrationSuite) TestNginxScraperHappyPath() { sc := newNginxScraper(zap.NewNop(), cfg) err = sc.start(context.Background(), componenttest.NewNopHost()) require.NoError(t, err) - rms, err := sc.scrape(context.Background()) + md, err := sc.scrape(context.Background()) require.Nil(t, err) - require.Equal(t, 1, rms.Len()) - rm := rms.At(0) + require.Equal(t, 1, md.ResourceMetrics().Len()) + rm := md.ResourceMetrics().At(0) ilms := rm.InstrumentationLibraryMetrics() require.Equal(t, 1, ilms.Len()) diff --git a/receiver/nginxreceiver/scraper.go b/receiver/nginxreceiver/scraper.go index 40e40c76dfe0..3b64a60e6f06 100644 --- a/receiver/nginxreceiver/scraper.go +++ b/receiver/nginxreceiver/scraper.go @@ -55,7 +55,7 @@ func (r *nginxScraper) start(_ context.Context, host component.Host) error { return nil } -func (r *nginxScraper) scrape(context.Context) (pdata.ResourceMetricsSlice, error) { +func (r *nginxScraper) scrape(context.Context) (pdata.Metrics, error) { // Init client in scrape method in case there are transient errors in the // constructor. if r.client == nil { @@ -63,19 +63,19 @@ func (r *nginxScraper) scrape(context.Context) (pdata.ResourceMetricsSlice, erro r.client, err = client.NewNginxClient(r.httpClient, r.cfg.HTTPClientSettings.Endpoint) if err != nil { r.client = nil - return pdata.ResourceMetricsSlice{}, err + return pdata.Metrics{}, err } } stats, err := r.client.GetStubStats() if err != nil { r.logger.Error("Failed to fetch nginx stats", zap.Error(err)) - return pdata.ResourceMetricsSlice{}, err + return pdata.Metrics{}, err } now := pdata.NewTimestampFromTime(time.Now()) - metrics := pdata.NewResourceMetricsSlice() - ilm := metrics.AppendEmpty().InstrumentationLibraryMetrics().AppendEmpty() + md := pdata.NewMetrics() + ilm := md.ResourceMetrics().AppendEmpty().InstrumentationLibraryMetrics().AppendEmpty() ilm.InstrumentationLibrary().SetName("otelcol/nginx") addIntSum(ilm.Metrics(), metadata.M.NginxRequests.Init, now, stats.Requests) @@ -90,7 +90,7 @@ func (r *nginxScraper) scrape(context.Context) (pdata.ResourceMetricsSlice, erro addCurrentConnectionDataPoint(dps, metadata.LabelState.Writing, now, stats.Connections.Writing) addCurrentConnectionDataPoint(dps, metadata.LabelState.Waiting, now, stats.Connections.Waiting) - return metrics, nil + return md, nil } func addIntSum(metrics pdata.MetricSlice, initFunc func(pdata.Metric), now pdata.Timestamp, value int64) { diff --git a/receiver/nginxreceiver/scraper_test.go b/receiver/nginxreceiver/scraper_test.go index 058390630462..5ffd74670c35 100644 --- a/receiver/nginxreceiver/scraper_test.go +++ b/receiver/nginxreceiver/scraper_test.go @@ -52,11 +52,11 @@ Reading: 6 Writing: 179 Waiting: 106 }) err := sc.start(context.Background(), componenttest.NewNopHost()) require.NoError(t, err) - rms, err := sc.scrape(context.Background()) + md, err := sc.scrape(context.Background()) require.Nil(t, err) - require.Equal(t, 1, rms.Len()) - rm := rms.At(0) + require.Equal(t, 1, md.ResourceMetrics().Len()) + rm := md.ResourceMetrics().At(0) ilms := rm.InstrumentationLibraryMetrics() require.Equal(t, 1, ilms.Len()) diff --git a/receiver/opencensusreceiver/go.mod b/receiver/opencensusreceiver/go.mod index d793b30a2afa..fa398ecffd23 100644 --- a/receiver/opencensusreceiver/go.mod +++ b/receiver/opencensusreceiver/go.mod @@ -10,8 +10,8 @@ require ( github.com/rs/cors v1.8.0 github.com/soheilhy/cmux v0.1.5 github.com/stretchr/testify v1.7.0 - go.opentelemetry.io/collector v0.37.0 - go.opentelemetry.io/collector/model v0.37.0 + go.opentelemetry.io/collector v0.37.1-0.20211015233822-bd87fb628058 + go.opentelemetry.io/collector/model v0.37.1-0.20211015233822-bd87fb628058 go.opentelemetry.io/contrib/instrumentation/google.golang.org/grpc/otelgrpc v0.25.0 go.opentelemetry.io/otel v1.0.1 go.opentelemetry.io/otel/trace v1.0.1 diff --git a/receiver/opencensusreceiver/go.sum b/receiver/opencensusreceiver/go.sum index b9b60c668f7c..47828142004f 100644 --- a/receiver/opencensusreceiver/go.sum +++ b/receiver/opencensusreceiver/go.sum @@ -395,10 +395,11 @@ go.opencensus.io v0.22.4/go.mod h1:yxeiOL68Rb0Xd1ddK5vPZ/oVn4vY4Ynel7k9FzqtOIw= go.opencensus.io v0.22.5/go.mod h1:5pWMHQbX5EPX2/62yrJeAkowc+lfs/XD7Uxpq3pI6kk= go.opencensus.io v0.23.0 h1:gqCw0LfLxScz8irSi8exQc7fyQ0fKQU/qnC/X8+V/1M= go.opencensus.io v0.23.0/go.mod h1:XItmlyltB5F7CS4xOC1DcqMoFqwtC6OG2xF7mCv7P7E= -go.opentelemetry.io/collector v0.37.0 h1:X83+uWk11kW83BTkdKNt1Sk7gXyRv36wA6piT0FYfME= -go.opentelemetry.io/collector v0.37.0/go.mod h1:zbLWBJVy7bmiZHlHjCrV28vxXA/sAkCLtH5thD8ZahA= -go.opentelemetry.io/collector/model v0.37.0 h1:K1G6bgzBZ5kKSjZ1+EY9MhCOYsac4Q1K85fBUgpTVH8= +go.opentelemetry.io/collector v0.37.1-0.20211015233822-bd87fb628058 h1:6v0ba4ruY/W2cJLElDZEHDwShlSWUjK2MiBMvwfAIN0= +go.opentelemetry.io/collector v0.37.1-0.20211015233822-bd87fb628058/go.mod h1:zbLWBJVy7bmiZHlHjCrV28vxXA/sAkCLtH5thD8ZahA= go.opentelemetry.io/collector/model v0.37.0/go.mod h1:ESh1oWDNdS4fTg9sTFoYuiuvs8QuaX8yNGTPix3JZc8= +go.opentelemetry.io/collector/model v0.37.1-0.20211015233822-bd87fb628058 h1:jDw0pFIkDbvNRkkdCz1+gsBXIKbtY3GtRMPqzBeOfs4= +go.opentelemetry.io/collector/model v0.37.1-0.20211015233822-bd87fb628058/go.mod h1:ESh1oWDNdS4fTg9sTFoYuiuvs8QuaX8yNGTPix3JZc8= go.opentelemetry.io/contrib/instrumentation/google.golang.org/grpc/otelgrpc v0.25.0 h1:Wx7nFnvCaissIUZxPkBqDz2963Z+Cl+PkYbDKzTxDqQ= go.opentelemetry.io/contrib/instrumentation/google.golang.org/grpc/otelgrpc v0.25.0/go.mod h1:E5NNboN0UqSAki0Atn9kVwaN7I+l25gGxDqBueo/74E= go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.25.0/go.mod h1:NyB05cd+yPX6W5SiRNuJ90w7PV2+g2cgRbsPL7MvpME= diff --git a/receiver/podmanreceiver/config.go b/receiver/podmanreceiver/config.go index 065c064aa23a..dd00f333ed95 100644 --- a/receiver/podmanreceiver/config.go +++ b/receiver/podmanreceiver/config.go @@ -18,8 +18,7 @@ import ( "errors" "go.opentelemetry.io/collector/config" - - "github.com/open-telemetry/opentelemetry-collector-contrib/receiver/scraperhelper" + "go.opentelemetry.io/collector/receiver/scraperhelper" ) var _ config.Receiver = (*Config)(nil) diff --git a/receiver/podmanreceiver/factory.go b/receiver/podmanreceiver/factory.go index 59ea2dc60c27..5132833e7981 100644 --- a/receiver/podmanreceiver/factory.go +++ b/receiver/podmanreceiver/factory.go @@ -22,8 +22,7 @@ import ( "go.opentelemetry.io/collector/config" "go.opentelemetry.io/collector/consumer" "go.opentelemetry.io/collector/receiver/receiverhelper" - - "github.com/open-telemetry/opentelemetry-collector-contrib/receiver/scraperhelper" + "go.opentelemetry.io/collector/receiver/scraperhelper" ) const ( diff --git a/receiver/podmanreceiver/go.mod b/receiver/podmanreceiver/go.mod index fd15cd7732f8..07858803b341 100644 --- a/receiver/podmanreceiver/go.mod +++ b/receiver/podmanreceiver/go.mod @@ -4,10 +4,9 @@ go 1.17 require ( github.com/open-telemetry/opentelemetry-collector-contrib/internal/interval v0.37.1 - github.com/open-telemetry/opentelemetry-collector-contrib/receiver/scraperhelper v0.37.1 github.com/stretchr/testify v1.7.0 - go.opentelemetry.io/collector v0.37.0 - go.opentelemetry.io/collector/model v0.37.0 + go.opentelemetry.io/collector v0.37.1-0.20211015233822-bd87fb628058 + go.opentelemetry.io/collector/model v0.37.1-0.20211015233822-bd87fb628058 go.uber.org/zap v1.19.1 golang.org/x/crypto v0.0.0-20200622213623-75b288015ac9 ) @@ -22,7 +21,10 @@ require ( github.com/mitchellh/copystructure v1.2.0 // indirect github.com/mitchellh/mapstructure v1.4.2 // indirect github.com/mitchellh/reflectwalk v1.0.2 // indirect + github.com/pelletier/go-toml v1.9.3 // indirect + github.com/pkg/errors v0.9.1 // indirect github.com/pmezard/go-difflib v1.0.0 // indirect + github.com/rogpeppe/go-internal v1.6.1 // indirect github.com/spf13/cast v1.4.1 // indirect go.opencensus.io v0.23.0 // indirect go.opentelemetry.io/otel v1.0.1 // indirect @@ -40,8 +42,4 @@ require ( gopkg.in/yaml.v3 v3.0.0-20210107192922-496545a6307b // indirect ) -replace ( - github.com/open-telemetry/opentelemetry-collector-contrib/internal/common => ../../internal/common - github.com/open-telemetry/opentelemetry-collector-contrib/internal/interval => ../../internal/interval - github.com/open-telemetry/opentelemetry-collector-contrib/receiver/scraperhelper => ../scraperhelper -) +replace github.com/open-telemetry/opentelemetry-collector-contrib/internal/interval => ../../internal/interval diff --git a/receiver/podmanreceiver/go.sum b/receiver/podmanreceiver/go.sum index 057af86ab6ca..1685c2d00be6 100644 --- a/receiver/podmanreceiver/go.sum +++ b/receiver/podmanreceiver/go.sum @@ -374,10 +374,11 @@ go.opencensus.io v0.22.4/go.mod h1:yxeiOL68Rb0Xd1ddK5vPZ/oVn4vY4Ynel7k9FzqtOIw= go.opencensus.io v0.22.5/go.mod h1:5pWMHQbX5EPX2/62yrJeAkowc+lfs/XD7Uxpq3pI6kk= go.opencensus.io v0.23.0 h1:gqCw0LfLxScz8irSi8exQc7fyQ0fKQU/qnC/X8+V/1M= go.opencensus.io v0.23.0/go.mod h1:XItmlyltB5F7CS4xOC1DcqMoFqwtC6OG2xF7mCv7P7E= -go.opentelemetry.io/collector v0.37.0 h1:X83+uWk11kW83BTkdKNt1Sk7gXyRv36wA6piT0FYfME= -go.opentelemetry.io/collector v0.37.0/go.mod h1:zbLWBJVy7bmiZHlHjCrV28vxXA/sAkCLtH5thD8ZahA= -go.opentelemetry.io/collector/model v0.37.0 h1:K1G6bgzBZ5kKSjZ1+EY9MhCOYsac4Q1K85fBUgpTVH8= +go.opentelemetry.io/collector v0.37.1-0.20211015233822-bd87fb628058 h1:6v0ba4ruY/W2cJLElDZEHDwShlSWUjK2MiBMvwfAIN0= +go.opentelemetry.io/collector v0.37.1-0.20211015233822-bd87fb628058/go.mod h1:zbLWBJVy7bmiZHlHjCrV28vxXA/sAkCLtH5thD8ZahA= go.opentelemetry.io/collector/model v0.37.0/go.mod h1:ESh1oWDNdS4fTg9sTFoYuiuvs8QuaX8yNGTPix3JZc8= +go.opentelemetry.io/collector/model v0.37.1-0.20211015233822-bd87fb628058 h1:jDw0pFIkDbvNRkkdCz1+gsBXIKbtY3GtRMPqzBeOfs4= +go.opentelemetry.io/collector/model v0.37.1-0.20211015233822-bd87fb628058/go.mod h1:ESh1oWDNdS4fTg9sTFoYuiuvs8QuaX8yNGTPix3JZc8= go.opentelemetry.io/contrib/instrumentation/google.golang.org/grpc/otelgrpc v0.25.0/go.mod h1:E5NNboN0UqSAki0Atn9kVwaN7I+l25gGxDqBueo/74E= go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.25.0/go.mod h1:NyB05cd+yPX6W5SiRNuJ90w7PV2+g2cgRbsPL7MvpME= go.opentelemetry.io/contrib/zpages v0.25.0/go.mod h1:cXBK0CNcIBD9Iiw1Hv3DvS+E8N2rtr+k+OoPs+sP0T4= diff --git a/receiver/podmanreceiver/receiver_test.go b/receiver/podmanreceiver/receiver_test.go index cac83be3470f..6f410a36ad7e 100644 --- a/receiver/podmanreceiver/receiver_test.go +++ b/receiver/podmanreceiver/receiver_test.go @@ -29,9 +29,8 @@ import ( "go.opentelemetry.io/collector/consumer" "go.opentelemetry.io/collector/consumer/consumertest" "go.opentelemetry.io/collector/model/pdata" + "go.opentelemetry.io/collector/receiver/scraperhelper" "go.uber.org/zap" - - "github.com/open-telemetry/opentelemetry-collector-contrib/receiver/scraperhelper" ) func TestNewReceiver(t *testing.T) { diff --git a/receiver/prometheusexecreceiver/go.mod b/receiver/prometheusexecreceiver/go.mod index d193b8272c2e..d0736fabf1a3 100644 --- a/receiver/prometheusexecreceiver/go.mod +++ b/receiver/prometheusexecreceiver/go.mod @@ -8,8 +8,8 @@ require ( github.com/prometheus/common v0.31.1 github.com/prometheus/prometheus v1.8.2-0.20210621150501-ff58416a0b02 github.com/stretchr/testify v1.7.0 - go.opentelemetry.io/collector v0.37.0 - go.opentelemetry.io/collector/model v0.37.0 + go.opentelemetry.io/collector v0.37.1-0.20211015233822-bd87fb628058 + go.opentelemetry.io/collector/model v0.37.1-0.20211015233822-bd87fb628058 go.uber.org/zap v1.19.1 ) diff --git a/receiver/prometheusexecreceiver/go.sum b/receiver/prometheusexecreceiver/go.sum index 4ef99e89d727..a63de4f24d61 100644 --- a/receiver/prometheusexecreceiver/go.sum +++ b/receiver/prometheusexecreceiver/go.sum @@ -1382,10 +1382,11 @@ go.opencensus.io v0.22.4/go.mod h1:yxeiOL68Rb0Xd1ddK5vPZ/oVn4vY4Ynel7k9FzqtOIw= go.opencensus.io v0.22.5/go.mod h1:5pWMHQbX5EPX2/62yrJeAkowc+lfs/XD7Uxpq3pI6kk= go.opencensus.io v0.23.0 h1:gqCw0LfLxScz8irSi8exQc7fyQ0fKQU/qnC/X8+V/1M= go.opencensus.io v0.23.0/go.mod h1:XItmlyltB5F7CS4xOC1DcqMoFqwtC6OG2xF7mCv7P7E= -go.opentelemetry.io/collector v0.37.0 h1:X83+uWk11kW83BTkdKNt1Sk7gXyRv36wA6piT0FYfME= -go.opentelemetry.io/collector v0.37.0/go.mod h1:zbLWBJVy7bmiZHlHjCrV28vxXA/sAkCLtH5thD8ZahA= -go.opentelemetry.io/collector/model v0.37.0 h1:K1G6bgzBZ5kKSjZ1+EY9MhCOYsac4Q1K85fBUgpTVH8= +go.opentelemetry.io/collector v0.37.1-0.20211015233822-bd87fb628058 h1:6v0ba4ruY/W2cJLElDZEHDwShlSWUjK2MiBMvwfAIN0= +go.opentelemetry.io/collector v0.37.1-0.20211015233822-bd87fb628058/go.mod h1:zbLWBJVy7bmiZHlHjCrV28vxXA/sAkCLtH5thD8ZahA= go.opentelemetry.io/collector/model v0.37.0/go.mod h1:ESh1oWDNdS4fTg9sTFoYuiuvs8QuaX8yNGTPix3JZc8= +go.opentelemetry.io/collector/model v0.37.1-0.20211015233822-bd87fb628058 h1:jDw0pFIkDbvNRkkdCz1+gsBXIKbtY3GtRMPqzBeOfs4= +go.opentelemetry.io/collector/model v0.37.1-0.20211015233822-bd87fb628058/go.mod h1:ESh1oWDNdS4fTg9sTFoYuiuvs8QuaX8yNGTPix3JZc8= go.opentelemetry.io/contrib/instrumentation/google.golang.org/grpc/otelgrpc v0.25.0/go.mod h1:E5NNboN0UqSAki0Atn9kVwaN7I+l25gGxDqBueo/74E= go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.25.0 h1:FIbb8m2PtTWjvXLHOEnXAoSmkaiXbg3fuvoZAjsAT3Q= go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.25.0/go.mod h1:NyB05cd+yPX6W5SiRNuJ90w7PV2+g2cgRbsPL7MvpME= diff --git a/receiver/prometheusreceiver/go.mod b/receiver/prometheusreceiver/go.mod index abd4b4cfb603..01727ec7e7da 100644 --- a/receiver/prometheusreceiver/go.mod +++ b/receiver/prometheusreceiver/go.mod @@ -13,8 +13,8 @@ require ( github.com/prometheus/common v0.31.1 github.com/prometheus/prometheus v1.8.2-0.20210621150501-ff58416a0b02 github.com/stretchr/testify v1.7.0 - go.opentelemetry.io/collector v0.37.0 - go.opentelemetry.io/collector/model v0.37.0 + go.opentelemetry.io/collector v0.37.1-0.20211015233822-bd87fb628058 + go.opentelemetry.io/collector/model v0.37.1-0.20211015233822-bd87fb628058 go.uber.org/zap v1.19.1 google.golang.org/protobuf v1.27.1 gopkg.in/yaml.v2 v2.4.0 diff --git a/receiver/prometheusreceiver/go.sum b/receiver/prometheusreceiver/go.sum index bbdb7aec803c..aabea21c8c11 100644 --- a/receiver/prometheusreceiver/go.sum +++ b/receiver/prometheusreceiver/go.sum @@ -1379,10 +1379,11 @@ go.opencensus.io v0.22.4/go.mod h1:yxeiOL68Rb0Xd1ddK5vPZ/oVn4vY4Ynel7k9FzqtOIw= go.opencensus.io v0.22.5/go.mod h1:5pWMHQbX5EPX2/62yrJeAkowc+lfs/XD7Uxpq3pI6kk= go.opencensus.io v0.23.0 h1:gqCw0LfLxScz8irSi8exQc7fyQ0fKQU/qnC/X8+V/1M= go.opencensus.io v0.23.0/go.mod h1:XItmlyltB5F7CS4xOC1DcqMoFqwtC6OG2xF7mCv7P7E= -go.opentelemetry.io/collector v0.37.0 h1:X83+uWk11kW83BTkdKNt1Sk7gXyRv36wA6piT0FYfME= -go.opentelemetry.io/collector v0.37.0/go.mod h1:zbLWBJVy7bmiZHlHjCrV28vxXA/sAkCLtH5thD8ZahA= -go.opentelemetry.io/collector/model v0.37.0 h1:K1G6bgzBZ5kKSjZ1+EY9MhCOYsac4Q1K85fBUgpTVH8= +go.opentelemetry.io/collector v0.37.1-0.20211015233822-bd87fb628058 h1:6v0ba4ruY/W2cJLElDZEHDwShlSWUjK2MiBMvwfAIN0= +go.opentelemetry.io/collector v0.37.1-0.20211015233822-bd87fb628058/go.mod h1:zbLWBJVy7bmiZHlHjCrV28vxXA/sAkCLtH5thD8ZahA= go.opentelemetry.io/collector/model v0.37.0/go.mod h1:ESh1oWDNdS4fTg9sTFoYuiuvs8QuaX8yNGTPix3JZc8= +go.opentelemetry.io/collector/model v0.37.1-0.20211015233822-bd87fb628058 h1:jDw0pFIkDbvNRkkdCz1+gsBXIKbtY3GtRMPqzBeOfs4= +go.opentelemetry.io/collector/model v0.37.1-0.20211015233822-bd87fb628058/go.mod h1:ESh1oWDNdS4fTg9sTFoYuiuvs8QuaX8yNGTPix3JZc8= go.opentelemetry.io/contrib/instrumentation/google.golang.org/grpc/otelgrpc v0.25.0 h1:Wx7nFnvCaissIUZxPkBqDz2963Z+Cl+PkYbDKzTxDqQ= go.opentelemetry.io/contrib/instrumentation/google.golang.org/grpc/otelgrpc v0.25.0/go.mod h1:E5NNboN0UqSAki0Atn9kVwaN7I+l25gGxDqBueo/74E= go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.25.0 h1:FIbb8m2PtTWjvXLHOEnXAoSmkaiXbg3fuvoZAjsAT3Q= diff --git a/receiver/receivercreator/go.mod b/receiver/receivercreator/go.mod index 33e8d0ea242d..855960ec3114 100644 --- a/receiver/receivercreator/go.mod +++ b/receiver/receivercreator/go.mod @@ -9,8 +9,8 @@ require ( github.com/open-telemetry/opentelemetry-collector-contrib/pkg/translator/opencensus v0.37.1 github.com/spf13/cast v1.4.1 github.com/stretchr/testify v1.7.0 - go.opentelemetry.io/collector v0.37.0 - go.opentelemetry.io/collector/model v0.37.0 + go.opentelemetry.io/collector v0.37.1-0.20211015233822-bd87fb628058 + go.opentelemetry.io/collector/model v0.37.1-0.20211015233822-bd87fb628058 go.uber.org/multierr v1.7.0 go.uber.org/zap v1.19.1 ) diff --git a/receiver/receivercreator/go.sum b/receiver/receivercreator/go.sum index b0c3982f98e7..5f40cf7aa8b5 100644 --- a/receiver/receivercreator/go.sum +++ b/receiver/receivercreator/go.sum @@ -393,10 +393,11 @@ go.opencensus.io v0.22.4/go.mod h1:yxeiOL68Rb0Xd1ddK5vPZ/oVn4vY4Ynel7k9FzqtOIw= go.opencensus.io v0.22.5/go.mod h1:5pWMHQbX5EPX2/62yrJeAkowc+lfs/XD7Uxpq3pI6kk= go.opencensus.io v0.23.0 h1:gqCw0LfLxScz8irSi8exQc7fyQ0fKQU/qnC/X8+V/1M= go.opencensus.io v0.23.0/go.mod h1:XItmlyltB5F7CS4xOC1DcqMoFqwtC6OG2xF7mCv7P7E= -go.opentelemetry.io/collector v0.37.0 h1:X83+uWk11kW83BTkdKNt1Sk7gXyRv36wA6piT0FYfME= -go.opentelemetry.io/collector v0.37.0/go.mod h1:zbLWBJVy7bmiZHlHjCrV28vxXA/sAkCLtH5thD8ZahA= -go.opentelemetry.io/collector/model v0.37.0 h1:K1G6bgzBZ5kKSjZ1+EY9MhCOYsac4Q1K85fBUgpTVH8= +go.opentelemetry.io/collector v0.37.1-0.20211015233822-bd87fb628058 h1:6v0ba4ruY/W2cJLElDZEHDwShlSWUjK2MiBMvwfAIN0= +go.opentelemetry.io/collector v0.37.1-0.20211015233822-bd87fb628058/go.mod h1:zbLWBJVy7bmiZHlHjCrV28vxXA/sAkCLtH5thD8ZahA= go.opentelemetry.io/collector/model v0.37.0/go.mod h1:ESh1oWDNdS4fTg9sTFoYuiuvs8QuaX8yNGTPix3JZc8= +go.opentelemetry.io/collector/model v0.37.1-0.20211015233822-bd87fb628058 h1:jDw0pFIkDbvNRkkdCz1+gsBXIKbtY3GtRMPqzBeOfs4= +go.opentelemetry.io/collector/model v0.37.1-0.20211015233822-bd87fb628058/go.mod h1:ESh1oWDNdS4fTg9sTFoYuiuvs8QuaX8yNGTPix3JZc8= go.opentelemetry.io/contrib/instrumentation/google.golang.org/grpc/otelgrpc v0.25.0/go.mod h1:E5NNboN0UqSAki0Atn9kVwaN7I+l25gGxDqBueo/74E= go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.25.0/go.mod h1:NyB05cd+yPX6W5SiRNuJ90w7PV2+g2cgRbsPL7MvpME= go.opentelemetry.io/contrib/zpages v0.25.0/go.mod h1:cXBK0CNcIBD9Iiw1Hv3DvS+E8N2rtr+k+OoPs+sP0T4= diff --git a/receiver/redisreceiver/go.mod b/receiver/redisreceiver/go.mod index 7551cd24940e..1756657dd6dd 100644 --- a/receiver/redisreceiver/go.mod +++ b/receiver/redisreceiver/go.mod @@ -7,8 +7,8 @@ require ( github.com/open-telemetry/opentelemetry-collector-contrib/internal/common v0.37.1 github.com/open-telemetry/opentelemetry-collector-contrib/internal/interval v0.37.1 github.com/stretchr/testify v1.7.0 - go.opentelemetry.io/collector v0.37.0 - go.opentelemetry.io/collector/model v0.37.0 + go.opentelemetry.io/collector v0.37.1-0.20211015233822-bd87fb628058 + go.opentelemetry.io/collector/model v0.37.1-0.20211015233822-bd87fb628058 go.uber.org/zap v1.19.1 ) diff --git a/receiver/redisreceiver/go.sum b/receiver/redisreceiver/go.sum index 5c74b44505cb..04618d83c8f6 100644 --- a/receiver/redisreceiver/go.sum +++ b/receiver/redisreceiver/go.sum @@ -783,10 +783,11 @@ go.opencensus.io v0.22.4/go.mod h1:yxeiOL68Rb0Xd1ddK5vPZ/oVn4vY4Ynel7k9FzqtOIw= go.opencensus.io v0.22.5/go.mod h1:5pWMHQbX5EPX2/62yrJeAkowc+lfs/XD7Uxpq3pI6kk= go.opencensus.io v0.23.0 h1:gqCw0LfLxScz8irSi8exQc7fyQ0fKQU/qnC/X8+V/1M= go.opencensus.io v0.23.0/go.mod h1:XItmlyltB5F7CS4xOC1DcqMoFqwtC6OG2xF7mCv7P7E= -go.opentelemetry.io/collector v0.37.0 h1:X83+uWk11kW83BTkdKNt1Sk7gXyRv36wA6piT0FYfME= -go.opentelemetry.io/collector v0.37.0/go.mod h1:zbLWBJVy7bmiZHlHjCrV28vxXA/sAkCLtH5thD8ZahA= -go.opentelemetry.io/collector/model v0.37.0 h1:K1G6bgzBZ5kKSjZ1+EY9MhCOYsac4Q1K85fBUgpTVH8= +go.opentelemetry.io/collector v0.37.1-0.20211015233822-bd87fb628058 h1:6v0ba4ruY/W2cJLElDZEHDwShlSWUjK2MiBMvwfAIN0= +go.opentelemetry.io/collector v0.37.1-0.20211015233822-bd87fb628058/go.mod h1:zbLWBJVy7bmiZHlHjCrV28vxXA/sAkCLtH5thD8ZahA= go.opentelemetry.io/collector/model v0.37.0/go.mod h1:ESh1oWDNdS4fTg9sTFoYuiuvs8QuaX8yNGTPix3JZc8= +go.opentelemetry.io/collector/model v0.37.1-0.20211015233822-bd87fb628058 h1:jDw0pFIkDbvNRkkdCz1+gsBXIKbtY3GtRMPqzBeOfs4= +go.opentelemetry.io/collector/model v0.37.1-0.20211015233822-bd87fb628058/go.mod h1:ESh1oWDNdS4fTg9sTFoYuiuvs8QuaX8yNGTPix3JZc8= go.opentelemetry.io/contrib/instrumentation/google.golang.org/grpc/otelgrpc v0.25.0/go.mod h1:E5NNboN0UqSAki0Atn9kVwaN7I+l25gGxDqBueo/74E= go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.25.0/go.mod h1:NyB05cd+yPX6W5SiRNuJ90w7PV2+g2cgRbsPL7MvpME= go.opentelemetry.io/contrib/zpages v0.25.0/go.mod h1:cXBK0CNcIBD9Iiw1Hv3DvS+E8N2rtr+k+OoPs+sP0T4= diff --git a/receiver/sapmreceiver/go.mod b/receiver/sapmreceiver/go.mod index 04641dc77c98..66638605ab37 100644 --- a/receiver/sapmreceiver/go.mod +++ b/receiver/sapmreceiver/go.mod @@ -11,8 +11,8 @@ require ( github.com/signalfx/sapm-proto v0.7.0 github.com/stretchr/testify v1.7.0 go.opencensus.io v0.23.0 - go.opentelemetry.io/collector v0.37.0 - go.opentelemetry.io/collector/model v0.37.0 + go.opentelemetry.io/collector v0.37.1-0.20211015233822-bd87fb628058 + go.opentelemetry.io/collector/model v0.37.1-0.20211015233822-bd87fb628058 ) require ( diff --git a/receiver/sapmreceiver/go.sum b/receiver/sapmreceiver/go.sum index 6377617f4301..7664bd790c10 100644 --- a/receiver/sapmreceiver/go.sum +++ b/receiver/sapmreceiver/go.sum @@ -1025,11 +1025,12 @@ go.opencensus.io v0.22.4/go.mod h1:yxeiOL68Rb0Xd1ddK5vPZ/oVn4vY4Ynel7k9FzqtOIw= go.opencensus.io v0.22.5/go.mod h1:5pWMHQbX5EPX2/62yrJeAkowc+lfs/XD7Uxpq3pI6kk= go.opencensus.io v0.23.0 h1:gqCw0LfLxScz8irSi8exQc7fyQ0fKQU/qnC/X8+V/1M= go.opencensus.io v0.23.0/go.mod h1:XItmlyltB5F7CS4xOC1DcqMoFqwtC6OG2xF7mCv7P7E= -go.opentelemetry.io/collector v0.37.0 h1:X83+uWk11kW83BTkdKNt1Sk7gXyRv36wA6piT0FYfME= -go.opentelemetry.io/collector v0.37.0/go.mod h1:zbLWBJVy7bmiZHlHjCrV28vxXA/sAkCLtH5thD8ZahA= +go.opentelemetry.io/collector v0.37.1-0.20211015233822-bd87fb628058 h1:6v0ba4ruY/W2cJLElDZEHDwShlSWUjK2MiBMvwfAIN0= +go.opentelemetry.io/collector v0.37.1-0.20211015233822-bd87fb628058/go.mod h1:zbLWBJVy7bmiZHlHjCrV28vxXA/sAkCLtH5thD8ZahA= go.opentelemetry.io/collector/model v0.36.0/go.mod h1:+7YCSjJG+MqiIFjauzt7oM2qkqBsaJWh5hcsO4fwsAc= -go.opentelemetry.io/collector/model v0.37.0 h1:K1G6bgzBZ5kKSjZ1+EY9MhCOYsac4Q1K85fBUgpTVH8= go.opentelemetry.io/collector/model v0.37.0/go.mod h1:ESh1oWDNdS4fTg9sTFoYuiuvs8QuaX8yNGTPix3JZc8= +go.opentelemetry.io/collector/model v0.37.1-0.20211015233822-bd87fb628058 h1:jDw0pFIkDbvNRkkdCz1+gsBXIKbtY3GtRMPqzBeOfs4= +go.opentelemetry.io/collector/model v0.37.1-0.20211015233822-bd87fb628058/go.mod h1:ESh1oWDNdS4fTg9sTFoYuiuvs8QuaX8yNGTPix3JZc8= go.opentelemetry.io/contrib/instrumentation/google.golang.org/grpc/otelgrpc v0.25.0/go.mod h1:E5NNboN0UqSAki0Atn9kVwaN7I+l25gGxDqBueo/74E= go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.25.0 h1:FIbb8m2PtTWjvXLHOEnXAoSmkaiXbg3fuvoZAjsAT3Q= go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.25.0/go.mod h1:NyB05cd+yPX6W5SiRNuJ90w7PV2+g2cgRbsPL7MvpME= diff --git a/receiver/scraperhelper/go.mod b/receiver/scraperhelper/go.mod index f2006bbd9af1..5e82020bbc29 100644 --- a/receiver/scraperhelper/go.mod +++ b/receiver/scraperhelper/go.mod @@ -4,8 +4,8 @@ go 1.17 require ( github.com/stretchr/testify v1.7.0 - go.opentelemetry.io/collector v0.37.0 - go.opentelemetry.io/collector/model v0.37.0 + go.opentelemetry.io/collector v0.37.1-0.20211015233822-bd87fb628058 + go.opentelemetry.io/collector/model v0.37.1-0.20211015233822-bd87fb628058 go.opentelemetry.io/otel v1.0.1 go.opentelemetry.io/otel/sdk v1.0.1 go.uber.org/multierr v1.7.0 diff --git a/receiver/scraperhelper/go.sum b/receiver/scraperhelper/go.sum index 3d2e2c8a3807..a627adff39a6 100644 --- a/receiver/scraperhelper/go.sum +++ b/receiver/scraperhelper/go.sum @@ -372,10 +372,11 @@ go.opencensus.io v0.22.4/go.mod h1:yxeiOL68Rb0Xd1ddK5vPZ/oVn4vY4Ynel7k9FzqtOIw= go.opencensus.io v0.22.5/go.mod h1:5pWMHQbX5EPX2/62yrJeAkowc+lfs/XD7Uxpq3pI6kk= go.opencensus.io v0.23.0 h1:gqCw0LfLxScz8irSi8exQc7fyQ0fKQU/qnC/X8+V/1M= go.opencensus.io v0.23.0/go.mod h1:XItmlyltB5F7CS4xOC1DcqMoFqwtC6OG2xF7mCv7P7E= -go.opentelemetry.io/collector v0.37.0 h1:X83+uWk11kW83BTkdKNt1Sk7gXyRv36wA6piT0FYfME= -go.opentelemetry.io/collector v0.37.0/go.mod h1:zbLWBJVy7bmiZHlHjCrV28vxXA/sAkCLtH5thD8ZahA= -go.opentelemetry.io/collector/model v0.37.0 h1:K1G6bgzBZ5kKSjZ1+EY9MhCOYsac4Q1K85fBUgpTVH8= +go.opentelemetry.io/collector v0.37.1-0.20211015233822-bd87fb628058 h1:6v0ba4ruY/W2cJLElDZEHDwShlSWUjK2MiBMvwfAIN0= +go.opentelemetry.io/collector v0.37.1-0.20211015233822-bd87fb628058/go.mod h1:zbLWBJVy7bmiZHlHjCrV28vxXA/sAkCLtH5thD8ZahA= go.opentelemetry.io/collector/model v0.37.0/go.mod h1:ESh1oWDNdS4fTg9sTFoYuiuvs8QuaX8yNGTPix3JZc8= +go.opentelemetry.io/collector/model v0.37.1-0.20211015233822-bd87fb628058 h1:jDw0pFIkDbvNRkkdCz1+gsBXIKbtY3GtRMPqzBeOfs4= +go.opentelemetry.io/collector/model v0.37.1-0.20211015233822-bd87fb628058/go.mod h1:ESh1oWDNdS4fTg9sTFoYuiuvs8QuaX8yNGTPix3JZc8= go.opentelemetry.io/contrib/instrumentation/google.golang.org/grpc/otelgrpc v0.25.0/go.mod h1:E5NNboN0UqSAki0Atn9kVwaN7I+l25gGxDqBueo/74E= go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.25.0/go.mod h1:NyB05cd+yPX6W5SiRNuJ90w7PV2+g2cgRbsPL7MvpME= go.opentelemetry.io/contrib/zpages v0.25.0/go.mod h1:cXBK0CNcIBD9Iiw1Hv3DvS+E8N2rtr+k+OoPs+sP0T4= diff --git a/receiver/signalfxreceiver/go.mod b/receiver/signalfxreceiver/go.mod index 05ab6dfaabc0..64e52c25bf50 100644 --- a/receiver/signalfxreceiver/go.mod +++ b/receiver/signalfxreceiver/go.mod @@ -10,8 +10,8 @@ require ( github.com/signalfx/com_signalfx_metrics_protobuf v0.0.2 github.com/stretchr/testify v1.7.0 go.opencensus.io v0.23.0 - go.opentelemetry.io/collector v0.37.0 - go.opentelemetry.io/collector/model v0.37.0 + go.opentelemetry.io/collector v0.37.1-0.20211015233822-bd87fb628058 + go.opentelemetry.io/collector/model v0.37.1-0.20211015233822-bd87fb628058 go.uber.org/zap v1.19.1 ) @@ -48,6 +48,7 @@ require ( github.com/signalfx/golib/v3 v3.3.13 // indirect github.com/signalfx/sapm-proto v0.4.0 // indirect github.com/signalfx/signalfx-agent/pkg/apm v0.0.0-20201202163743-65b4fa925fc8 // indirect + github.com/smartystreets/goconvey v1.6.4 // indirect github.com/spf13/cast v1.4.1 // indirect github.com/tklauser/go-sysconf v0.3.9 // indirect github.com/tklauser/numcpus v0.3.0 // indirect diff --git a/receiver/signalfxreceiver/go.sum b/receiver/signalfxreceiver/go.sum index 1d5b6a237b49..4fd3282ea767 100644 --- a/receiver/signalfxreceiver/go.sum +++ b/receiver/signalfxreceiver/go.sum @@ -837,10 +837,11 @@ go.opencensus.io v0.22.4/go.mod h1:yxeiOL68Rb0Xd1ddK5vPZ/oVn4vY4Ynel7k9FzqtOIw= go.opencensus.io v0.22.5/go.mod h1:5pWMHQbX5EPX2/62yrJeAkowc+lfs/XD7Uxpq3pI6kk= go.opencensus.io v0.23.0 h1:gqCw0LfLxScz8irSi8exQc7fyQ0fKQU/qnC/X8+V/1M= go.opencensus.io v0.23.0/go.mod h1:XItmlyltB5F7CS4xOC1DcqMoFqwtC6OG2xF7mCv7P7E= -go.opentelemetry.io/collector v0.37.0 h1:X83+uWk11kW83BTkdKNt1Sk7gXyRv36wA6piT0FYfME= -go.opentelemetry.io/collector v0.37.0/go.mod h1:zbLWBJVy7bmiZHlHjCrV28vxXA/sAkCLtH5thD8ZahA= -go.opentelemetry.io/collector/model v0.37.0 h1:K1G6bgzBZ5kKSjZ1+EY9MhCOYsac4Q1K85fBUgpTVH8= +go.opentelemetry.io/collector v0.37.1-0.20211015233822-bd87fb628058 h1:6v0ba4ruY/W2cJLElDZEHDwShlSWUjK2MiBMvwfAIN0= +go.opentelemetry.io/collector v0.37.1-0.20211015233822-bd87fb628058/go.mod h1:zbLWBJVy7bmiZHlHjCrV28vxXA/sAkCLtH5thD8ZahA= go.opentelemetry.io/collector/model v0.37.0/go.mod h1:ESh1oWDNdS4fTg9sTFoYuiuvs8QuaX8yNGTPix3JZc8= +go.opentelemetry.io/collector/model v0.37.1-0.20211015233822-bd87fb628058 h1:jDw0pFIkDbvNRkkdCz1+gsBXIKbtY3GtRMPqzBeOfs4= +go.opentelemetry.io/collector/model v0.37.1-0.20211015233822-bd87fb628058/go.mod h1:ESh1oWDNdS4fTg9sTFoYuiuvs8QuaX8yNGTPix3JZc8= go.opentelemetry.io/contrib/instrumentation/google.golang.org/grpc/otelgrpc v0.25.0/go.mod h1:E5NNboN0UqSAki0Atn9kVwaN7I+l25gGxDqBueo/74E= go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.25.0 h1:FIbb8m2PtTWjvXLHOEnXAoSmkaiXbg3fuvoZAjsAT3Q= go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.25.0/go.mod h1:NyB05cd+yPX6W5SiRNuJ90w7PV2+g2cgRbsPL7MvpME= diff --git a/receiver/simpleprometheusreceiver/go.mod b/receiver/simpleprometheusreceiver/go.mod index 910bde3b1670..b2231e1f6a52 100644 --- a/receiver/simpleprometheusreceiver/go.mod +++ b/receiver/simpleprometheusreceiver/go.mod @@ -7,7 +7,7 @@ require ( github.com/prometheus/common v0.31.1 github.com/prometheus/prometheus v1.8.2-0.20210621150501-ff58416a0b02 github.com/stretchr/testify v1.7.0 - go.opentelemetry.io/collector v0.37.0 + go.opentelemetry.io/collector v0.37.1-0.20211015233822-bd87fb628058 k8s.io/client-go v0.22.2 ) @@ -94,7 +94,7 @@ require ( github.com/spf13/cast v1.4.1 // indirect github.com/spf13/pflag v1.0.5 // indirect go.opencensus.io v0.23.0 // indirect - go.opentelemetry.io/collector/model v0.37.0 // indirect + go.opentelemetry.io/collector/model v0.37.1-0.20211015233822-bd87fb628058 // indirect go.opentelemetry.io/otel v1.0.1 // indirect go.opentelemetry.io/otel/metric v0.24.0 // indirect go.opentelemetry.io/otel/trace v1.0.1 // indirect diff --git a/receiver/simpleprometheusreceiver/go.sum b/receiver/simpleprometheusreceiver/go.sum index 3a5e45c94821..c164f7555f7a 100644 --- a/receiver/simpleprometheusreceiver/go.sum +++ b/receiver/simpleprometheusreceiver/go.sum @@ -1389,10 +1389,11 @@ go.opencensus.io v0.22.4/go.mod h1:yxeiOL68Rb0Xd1ddK5vPZ/oVn4vY4Ynel7k9FzqtOIw= go.opencensus.io v0.22.5/go.mod h1:5pWMHQbX5EPX2/62yrJeAkowc+lfs/XD7Uxpq3pI6kk= go.opencensus.io v0.23.0 h1:gqCw0LfLxScz8irSi8exQc7fyQ0fKQU/qnC/X8+V/1M= go.opencensus.io v0.23.0/go.mod h1:XItmlyltB5F7CS4xOC1DcqMoFqwtC6OG2xF7mCv7P7E= -go.opentelemetry.io/collector v0.37.0 h1:X83+uWk11kW83BTkdKNt1Sk7gXyRv36wA6piT0FYfME= -go.opentelemetry.io/collector v0.37.0/go.mod h1:zbLWBJVy7bmiZHlHjCrV28vxXA/sAkCLtH5thD8ZahA= -go.opentelemetry.io/collector/model v0.37.0 h1:K1G6bgzBZ5kKSjZ1+EY9MhCOYsac4Q1K85fBUgpTVH8= +go.opentelemetry.io/collector v0.37.1-0.20211015233822-bd87fb628058 h1:6v0ba4ruY/W2cJLElDZEHDwShlSWUjK2MiBMvwfAIN0= +go.opentelemetry.io/collector v0.37.1-0.20211015233822-bd87fb628058/go.mod h1:zbLWBJVy7bmiZHlHjCrV28vxXA/sAkCLtH5thD8ZahA= go.opentelemetry.io/collector/model v0.37.0/go.mod h1:ESh1oWDNdS4fTg9sTFoYuiuvs8QuaX8yNGTPix3JZc8= +go.opentelemetry.io/collector/model v0.37.1-0.20211015233822-bd87fb628058 h1:jDw0pFIkDbvNRkkdCz1+gsBXIKbtY3GtRMPqzBeOfs4= +go.opentelemetry.io/collector/model v0.37.1-0.20211015233822-bd87fb628058/go.mod h1:ESh1oWDNdS4fTg9sTFoYuiuvs8QuaX8yNGTPix3JZc8= go.opentelemetry.io/contrib/instrumentation/google.golang.org/grpc/otelgrpc v0.25.0/go.mod h1:E5NNboN0UqSAki0Atn9kVwaN7I+l25gGxDqBueo/74E= go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.25.0 h1:FIbb8m2PtTWjvXLHOEnXAoSmkaiXbg3fuvoZAjsAT3Q= go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.25.0/go.mod h1:NyB05cd+yPX6W5SiRNuJ90w7PV2+g2cgRbsPL7MvpME= diff --git a/receiver/splunkhecreceiver/go.mod b/receiver/splunkhecreceiver/go.mod index 84331198e7a3..c1ed834b9b72 100644 --- a/receiver/splunkhecreceiver/go.mod +++ b/receiver/splunkhecreceiver/go.mod @@ -8,8 +8,8 @@ require ( github.com/open-telemetry/opentelemetry-collector-contrib/internal/coreinternal v0.37.1 github.com/open-telemetry/opentelemetry-collector-contrib/internal/splunk v0.37.1 github.com/stretchr/testify v1.7.0 - go.opentelemetry.io/collector v0.37.0 - go.opentelemetry.io/collector/model v0.37.0 + go.opentelemetry.io/collector v0.37.1-0.20211015233822-bd87fb628058 + go.opentelemetry.io/collector/model v0.37.1-0.20211015233822-bd87fb628058 go.uber.org/zap v1.19.1 ) diff --git a/receiver/splunkhecreceiver/go.sum b/receiver/splunkhecreceiver/go.sum index 3e3fa5159f42..3bab0712003e 100644 --- a/receiver/splunkhecreceiver/go.sum +++ b/receiver/splunkhecreceiver/go.sum @@ -394,10 +394,11 @@ go.opencensus.io v0.22.4/go.mod h1:yxeiOL68Rb0Xd1ddK5vPZ/oVn4vY4Ynel7k9FzqtOIw= go.opencensus.io v0.22.5/go.mod h1:5pWMHQbX5EPX2/62yrJeAkowc+lfs/XD7Uxpq3pI6kk= go.opencensus.io v0.23.0 h1:gqCw0LfLxScz8irSi8exQc7fyQ0fKQU/qnC/X8+V/1M= go.opencensus.io v0.23.0/go.mod h1:XItmlyltB5F7CS4xOC1DcqMoFqwtC6OG2xF7mCv7P7E= -go.opentelemetry.io/collector v0.37.0 h1:X83+uWk11kW83BTkdKNt1Sk7gXyRv36wA6piT0FYfME= -go.opentelemetry.io/collector v0.37.0/go.mod h1:zbLWBJVy7bmiZHlHjCrV28vxXA/sAkCLtH5thD8ZahA= -go.opentelemetry.io/collector/model v0.37.0 h1:K1G6bgzBZ5kKSjZ1+EY9MhCOYsac4Q1K85fBUgpTVH8= +go.opentelemetry.io/collector v0.37.1-0.20211015233822-bd87fb628058 h1:6v0ba4ruY/W2cJLElDZEHDwShlSWUjK2MiBMvwfAIN0= +go.opentelemetry.io/collector v0.37.1-0.20211015233822-bd87fb628058/go.mod h1:zbLWBJVy7bmiZHlHjCrV28vxXA/sAkCLtH5thD8ZahA= go.opentelemetry.io/collector/model v0.37.0/go.mod h1:ESh1oWDNdS4fTg9sTFoYuiuvs8QuaX8yNGTPix3JZc8= +go.opentelemetry.io/collector/model v0.37.1-0.20211015233822-bd87fb628058 h1:jDw0pFIkDbvNRkkdCz1+gsBXIKbtY3GtRMPqzBeOfs4= +go.opentelemetry.io/collector/model v0.37.1-0.20211015233822-bd87fb628058/go.mod h1:ESh1oWDNdS4fTg9sTFoYuiuvs8QuaX8yNGTPix3JZc8= go.opentelemetry.io/contrib/instrumentation/google.golang.org/grpc/otelgrpc v0.25.0/go.mod h1:E5NNboN0UqSAki0Atn9kVwaN7I+l25gGxDqBueo/74E= go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.25.0 h1:FIbb8m2PtTWjvXLHOEnXAoSmkaiXbg3fuvoZAjsAT3Q= go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.25.0/go.mod h1:NyB05cd+yPX6W5SiRNuJ90w7PV2+g2cgRbsPL7MvpME= diff --git a/receiver/statsdreceiver/go.mod b/receiver/statsdreceiver/go.mod index 28dcb9c81944..4d3bc0ab3919 100644 --- a/receiver/statsdreceiver/go.mod +++ b/receiver/statsdreceiver/go.mod @@ -7,8 +7,8 @@ require ( github.com/open-telemetry/opentelemetry-collector-contrib/internal/coreinternal v0.37.1 github.com/stretchr/testify v1.7.0 go.opencensus.io v0.23.0 - go.opentelemetry.io/collector v0.37.0 - go.opentelemetry.io/collector/model v0.37.0 + go.opentelemetry.io/collector v0.37.1-0.20211015233822-bd87fb628058 + go.opentelemetry.io/collector/model v0.37.1-0.20211015233822-bd87fb628058 go.opentelemetry.io/otel v1.0.1 go.uber.org/multierr v1.7.0 go.uber.org/zap v1.19.1 diff --git a/receiver/statsdreceiver/go.sum b/receiver/statsdreceiver/go.sum index 91bfe412b112..7f9b6d022dac 100644 --- a/receiver/statsdreceiver/go.sum +++ b/receiver/statsdreceiver/go.sum @@ -391,10 +391,11 @@ go.opencensus.io v0.22.4/go.mod h1:yxeiOL68Rb0Xd1ddK5vPZ/oVn4vY4Ynel7k9FzqtOIw= go.opencensus.io v0.22.5/go.mod h1:5pWMHQbX5EPX2/62yrJeAkowc+lfs/XD7Uxpq3pI6kk= go.opencensus.io v0.23.0 h1:gqCw0LfLxScz8irSi8exQc7fyQ0fKQU/qnC/X8+V/1M= go.opencensus.io v0.23.0/go.mod h1:XItmlyltB5F7CS4xOC1DcqMoFqwtC6OG2xF7mCv7P7E= -go.opentelemetry.io/collector v0.37.0 h1:X83+uWk11kW83BTkdKNt1Sk7gXyRv36wA6piT0FYfME= -go.opentelemetry.io/collector v0.37.0/go.mod h1:zbLWBJVy7bmiZHlHjCrV28vxXA/sAkCLtH5thD8ZahA= -go.opentelemetry.io/collector/model v0.37.0 h1:K1G6bgzBZ5kKSjZ1+EY9MhCOYsac4Q1K85fBUgpTVH8= +go.opentelemetry.io/collector v0.37.1-0.20211015233822-bd87fb628058 h1:6v0ba4ruY/W2cJLElDZEHDwShlSWUjK2MiBMvwfAIN0= +go.opentelemetry.io/collector v0.37.1-0.20211015233822-bd87fb628058/go.mod h1:zbLWBJVy7bmiZHlHjCrV28vxXA/sAkCLtH5thD8ZahA= go.opentelemetry.io/collector/model v0.37.0/go.mod h1:ESh1oWDNdS4fTg9sTFoYuiuvs8QuaX8yNGTPix3JZc8= +go.opentelemetry.io/collector/model v0.37.1-0.20211015233822-bd87fb628058 h1:jDw0pFIkDbvNRkkdCz1+gsBXIKbtY3GtRMPqzBeOfs4= +go.opentelemetry.io/collector/model v0.37.1-0.20211015233822-bd87fb628058/go.mod h1:ESh1oWDNdS4fTg9sTFoYuiuvs8QuaX8yNGTPix3JZc8= go.opentelemetry.io/contrib/instrumentation/google.golang.org/grpc/otelgrpc v0.25.0/go.mod h1:E5NNboN0UqSAki0Atn9kVwaN7I+l25gGxDqBueo/74E= go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.25.0/go.mod h1:NyB05cd+yPX6W5SiRNuJ90w7PV2+g2cgRbsPL7MvpME= go.opentelemetry.io/contrib/zpages v0.25.0/go.mod h1:cXBK0CNcIBD9Iiw1Hv3DvS+E8N2rtr+k+OoPs+sP0T4= diff --git a/receiver/syslogreceiver/go.mod b/receiver/syslogreceiver/go.mod index a9c44abc3ea1..29b162aafed2 100644 --- a/receiver/syslogreceiver/go.mod +++ b/receiver/syslogreceiver/go.mod @@ -6,8 +6,8 @@ require ( github.com/open-telemetry/opentelemetry-collector-contrib/internal/stanza v0.37.1 github.com/open-telemetry/opentelemetry-log-collection v0.22.0 github.com/stretchr/testify v1.7.0 - go.opentelemetry.io/collector v0.37.0 - go.opentelemetry.io/collector/model v0.37.0 + go.opentelemetry.io/collector v0.37.1-0.20211015233822-bd87fb628058 + go.opentelemetry.io/collector/model v0.37.1-0.20211015233822-bd87fb628058 gopkg.in/yaml.v2 v2.4.0 ) diff --git a/receiver/syslogreceiver/go.sum b/receiver/syslogreceiver/go.sum index ff5dcb9fd3ee..1da302f43df0 100644 --- a/receiver/syslogreceiver/go.sum +++ b/receiver/syslogreceiver/go.sum @@ -477,11 +477,12 @@ go.opencensus.io v0.22.5/go.mod h1:5pWMHQbX5EPX2/62yrJeAkowc+lfs/XD7Uxpq3pI6kk= go.opencensus.io v0.23.0 h1:gqCw0LfLxScz8irSi8exQc7fyQ0fKQU/qnC/X8+V/1M= go.opencensus.io v0.23.0/go.mod h1:XItmlyltB5F7CS4xOC1DcqMoFqwtC6OG2xF7mCv7P7E= go.opentelemetry.io/collector v0.35.0/go.mod h1:mMW4VJHhy8CwoTenV75axteKd0aZhWHDZjcZ59V53kc= -go.opentelemetry.io/collector v0.37.0 h1:X83+uWk11kW83BTkdKNt1Sk7gXyRv36wA6piT0FYfME= -go.opentelemetry.io/collector v0.37.0/go.mod h1:zbLWBJVy7bmiZHlHjCrV28vxXA/sAkCLtH5thD8ZahA= +go.opentelemetry.io/collector v0.37.1-0.20211015233822-bd87fb628058 h1:6v0ba4ruY/W2cJLElDZEHDwShlSWUjK2MiBMvwfAIN0= +go.opentelemetry.io/collector v0.37.1-0.20211015233822-bd87fb628058/go.mod h1:zbLWBJVy7bmiZHlHjCrV28vxXA/sAkCLtH5thD8ZahA= go.opentelemetry.io/collector/model v0.35.0/go.mod h1:+7YCSjJG+MqiIFjauzt7oM2qkqBsaJWh5hcsO4fwsAc= -go.opentelemetry.io/collector/model v0.37.0 h1:K1G6bgzBZ5kKSjZ1+EY9MhCOYsac4Q1K85fBUgpTVH8= go.opentelemetry.io/collector/model v0.37.0/go.mod h1:ESh1oWDNdS4fTg9sTFoYuiuvs8QuaX8yNGTPix3JZc8= +go.opentelemetry.io/collector/model v0.37.1-0.20211015233822-bd87fb628058 h1:jDw0pFIkDbvNRkkdCz1+gsBXIKbtY3GtRMPqzBeOfs4= +go.opentelemetry.io/collector/model v0.37.1-0.20211015233822-bd87fb628058/go.mod h1:ESh1oWDNdS4fTg9sTFoYuiuvs8QuaX8yNGTPix3JZc8= go.opentelemetry.io/contrib v0.22.0/go.mod h1:EH4yDYeNoaTqn/8yCWQmfNB78VHfGX2Jt2bvnvzBlGM= go.opentelemetry.io/contrib/instrumentation/google.golang.org/grpc/otelgrpc v0.22.0/go.mod h1:KjqwX4uJNaj479ZjFpADOMJKOM4rBXq4kN7nbeuGKrY= go.opentelemetry.io/contrib/instrumentation/google.golang.org/grpc/otelgrpc v0.25.0/go.mod h1:E5NNboN0UqSAki0Atn9kVwaN7I+l25gGxDqBueo/74E= diff --git a/receiver/tcplogreceiver/go.mod b/receiver/tcplogreceiver/go.mod index 873bc883b8b8..43b61db0567d 100644 --- a/receiver/tcplogreceiver/go.mod +++ b/receiver/tcplogreceiver/go.mod @@ -6,7 +6,7 @@ require ( github.com/open-telemetry/opentelemetry-collector-contrib/internal/stanza v0.37.1 github.com/open-telemetry/opentelemetry-log-collection v0.22.0 github.com/stretchr/testify v1.7.0 - go.opentelemetry.io/collector v0.37.0 + go.opentelemetry.io/collector v0.37.1-0.20211015233822-bd87fb628058 gopkg.in/yaml.v2 v2.4.0 ) @@ -29,7 +29,7 @@ require ( github.com/pelletier/go-toml v1.9.3 // indirect github.com/pmezard/go-difflib v1.0.0 // indirect github.com/spf13/cast v1.4.1 // indirect - go.opentelemetry.io/collector/model v0.37.0 // indirect + go.opentelemetry.io/collector/model v0.37.1-0.20211015233822-bd87fb628058 // indirect go.opentelemetry.io/otel v1.0.1 // indirect go.opentelemetry.io/otel/metric v0.24.0 // indirect go.opentelemetry.io/otel/trace v1.0.1 // indirect diff --git a/receiver/tcplogreceiver/go.sum b/receiver/tcplogreceiver/go.sum index b0fd34e8a8f3..fbbd85274c6b 100644 --- a/receiver/tcplogreceiver/go.sum +++ b/receiver/tcplogreceiver/go.sum @@ -476,11 +476,12 @@ go.opencensus.io v0.22.5/go.mod h1:5pWMHQbX5EPX2/62yrJeAkowc+lfs/XD7Uxpq3pI6kk= go.opencensus.io v0.23.0 h1:gqCw0LfLxScz8irSi8exQc7fyQ0fKQU/qnC/X8+V/1M= go.opencensus.io v0.23.0/go.mod h1:XItmlyltB5F7CS4xOC1DcqMoFqwtC6OG2xF7mCv7P7E= go.opentelemetry.io/collector v0.35.0/go.mod h1:mMW4VJHhy8CwoTenV75axteKd0aZhWHDZjcZ59V53kc= -go.opentelemetry.io/collector v0.37.0 h1:X83+uWk11kW83BTkdKNt1Sk7gXyRv36wA6piT0FYfME= -go.opentelemetry.io/collector v0.37.0/go.mod h1:zbLWBJVy7bmiZHlHjCrV28vxXA/sAkCLtH5thD8ZahA= +go.opentelemetry.io/collector v0.37.1-0.20211015233822-bd87fb628058 h1:6v0ba4ruY/W2cJLElDZEHDwShlSWUjK2MiBMvwfAIN0= +go.opentelemetry.io/collector v0.37.1-0.20211015233822-bd87fb628058/go.mod h1:zbLWBJVy7bmiZHlHjCrV28vxXA/sAkCLtH5thD8ZahA= go.opentelemetry.io/collector/model v0.35.0/go.mod h1:+7YCSjJG+MqiIFjauzt7oM2qkqBsaJWh5hcsO4fwsAc= -go.opentelemetry.io/collector/model v0.37.0 h1:K1G6bgzBZ5kKSjZ1+EY9MhCOYsac4Q1K85fBUgpTVH8= go.opentelemetry.io/collector/model v0.37.0/go.mod h1:ESh1oWDNdS4fTg9sTFoYuiuvs8QuaX8yNGTPix3JZc8= +go.opentelemetry.io/collector/model v0.37.1-0.20211015233822-bd87fb628058 h1:jDw0pFIkDbvNRkkdCz1+gsBXIKbtY3GtRMPqzBeOfs4= +go.opentelemetry.io/collector/model v0.37.1-0.20211015233822-bd87fb628058/go.mod h1:ESh1oWDNdS4fTg9sTFoYuiuvs8QuaX8yNGTPix3JZc8= go.opentelemetry.io/contrib v0.22.0/go.mod h1:EH4yDYeNoaTqn/8yCWQmfNB78VHfGX2Jt2bvnvzBlGM= go.opentelemetry.io/contrib/instrumentation/google.golang.org/grpc/otelgrpc v0.22.0/go.mod h1:KjqwX4uJNaj479ZjFpADOMJKOM4rBXq4kN7nbeuGKrY= go.opentelemetry.io/contrib/instrumentation/google.golang.org/grpc/otelgrpc v0.25.0/go.mod h1:E5NNboN0UqSAki0Atn9kVwaN7I+l25gGxDqBueo/74E= diff --git a/receiver/udplogreceiver/go.mod b/receiver/udplogreceiver/go.mod index 51dc8a5b0a3c..1213a5b25d08 100644 --- a/receiver/udplogreceiver/go.mod +++ b/receiver/udplogreceiver/go.mod @@ -6,7 +6,7 @@ require ( github.com/open-telemetry/opentelemetry-collector-contrib/internal/stanza v0.37.1 github.com/open-telemetry/opentelemetry-log-collection v0.22.0 github.com/stretchr/testify v1.7.0 - go.opentelemetry.io/collector v0.37.0 + go.opentelemetry.io/collector v0.37.1-0.20211015233822-bd87fb628058 gopkg.in/yaml.v2 v2.4.0 ) @@ -28,7 +28,7 @@ require ( github.com/pelletier/go-toml v1.9.3 // indirect github.com/pmezard/go-difflib v1.0.0 // indirect github.com/spf13/cast v1.4.1 // indirect - go.opentelemetry.io/collector/model v0.37.0 // indirect + go.opentelemetry.io/collector/model v0.37.1-0.20211015233822-bd87fb628058 // indirect go.opentelemetry.io/otel v1.0.1 // indirect go.opentelemetry.io/otel/metric v0.24.0 // indirect go.opentelemetry.io/otel/trace v1.0.1 // indirect diff --git a/receiver/udplogreceiver/go.sum b/receiver/udplogreceiver/go.sum index 9aa7917d64fc..b47e9ec206d1 100644 --- a/receiver/udplogreceiver/go.sum +++ b/receiver/udplogreceiver/go.sum @@ -475,11 +475,12 @@ go.opencensus.io v0.22.5/go.mod h1:5pWMHQbX5EPX2/62yrJeAkowc+lfs/XD7Uxpq3pI6kk= go.opencensus.io v0.23.0 h1:gqCw0LfLxScz8irSi8exQc7fyQ0fKQU/qnC/X8+V/1M= go.opencensus.io v0.23.0/go.mod h1:XItmlyltB5F7CS4xOC1DcqMoFqwtC6OG2xF7mCv7P7E= go.opentelemetry.io/collector v0.35.0/go.mod h1:mMW4VJHhy8CwoTenV75axteKd0aZhWHDZjcZ59V53kc= -go.opentelemetry.io/collector v0.37.0 h1:X83+uWk11kW83BTkdKNt1Sk7gXyRv36wA6piT0FYfME= -go.opentelemetry.io/collector v0.37.0/go.mod h1:zbLWBJVy7bmiZHlHjCrV28vxXA/sAkCLtH5thD8ZahA= +go.opentelemetry.io/collector v0.37.1-0.20211015233822-bd87fb628058 h1:6v0ba4ruY/W2cJLElDZEHDwShlSWUjK2MiBMvwfAIN0= +go.opentelemetry.io/collector v0.37.1-0.20211015233822-bd87fb628058/go.mod h1:zbLWBJVy7bmiZHlHjCrV28vxXA/sAkCLtH5thD8ZahA= go.opentelemetry.io/collector/model v0.35.0/go.mod h1:+7YCSjJG+MqiIFjauzt7oM2qkqBsaJWh5hcsO4fwsAc= -go.opentelemetry.io/collector/model v0.37.0 h1:K1G6bgzBZ5kKSjZ1+EY9MhCOYsac4Q1K85fBUgpTVH8= go.opentelemetry.io/collector/model v0.37.0/go.mod h1:ESh1oWDNdS4fTg9sTFoYuiuvs8QuaX8yNGTPix3JZc8= +go.opentelemetry.io/collector/model v0.37.1-0.20211015233822-bd87fb628058 h1:jDw0pFIkDbvNRkkdCz1+gsBXIKbtY3GtRMPqzBeOfs4= +go.opentelemetry.io/collector/model v0.37.1-0.20211015233822-bd87fb628058/go.mod h1:ESh1oWDNdS4fTg9sTFoYuiuvs8QuaX8yNGTPix3JZc8= go.opentelemetry.io/contrib v0.22.0/go.mod h1:EH4yDYeNoaTqn/8yCWQmfNB78VHfGX2Jt2bvnvzBlGM= go.opentelemetry.io/contrib/instrumentation/google.golang.org/grpc/otelgrpc v0.22.0/go.mod h1:KjqwX4uJNaj479ZjFpADOMJKOM4rBXq4kN7nbeuGKrY= go.opentelemetry.io/contrib/instrumentation/google.golang.org/grpc/otelgrpc v0.25.0/go.mod h1:E5NNboN0UqSAki0Atn9kVwaN7I+l25gGxDqBueo/74E= diff --git a/receiver/wavefrontreceiver/go.mod b/receiver/wavefrontreceiver/go.mod index c4648ee56b18..41b29e080cc7 100644 --- a/receiver/wavefrontreceiver/go.mod +++ b/receiver/wavefrontreceiver/go.mod @@ -9,7 +9,7 @@ require ( github.com/open-telemetry/opentelemetry-collector-contrib/receiver/carbonreceiver v0.37.1 github.com/open-telemetry/opentelemetry-collector-contrib/receiver/collectdreceiver v0.37.1 github.com/stretchr/testify v1.7.0 - go.opentelemetry.io/collector v0.37.0 + go.opentelemetry.io/collector v0.37.1-0.20211015233822-bd87fb628058 google.golang.org/protobuf v1.27.1 ) @@ -27,7 +27,7 @@ require ( github.com/pmezard/go-difflib v1.0.0 // indirect github.com/spf13/cast v1.4.1 // indirect go.opencensus.io v0.23.0 // indirect - go.opentelemetry.io/collector/model v0.37.0 // indirect + go.opentelemetry.io/collector/model v0.37.1-0.20211015233822-bd87fb628058 // indirect go.opentelemetry.io/otel v1.0.1 // indirect go.opentelemetry.io/otel/metric v0.24.0 // indirect go.opentelemetry.io/otel/trace v1.0.1 // indirect diff --git a/receiver/wavefrontreceiver/go.sum b/receiver/wavefrontreceiver/go.sum index 755c39eedf57..3c3eefd4dcf5 100644 --- a/receiver/wavefrontreceiver/go.sum +++ b/receiver/wavefrontreceiver/go.sum @@ -391,10 +391,11 @@ go.opencensus.io v0.22.4/go.mod h1:yxeiOL68Rb0Xd1ddK5vPZ/oVn4vY4Ynel7k9FzqtOIw= go.opencensus.io v0.22.5/go.mod h1:5pWMHQbX5EPX2/62yrJeAkowc+lfs/XD7Uxpq3pI6kk= go.opencensus.io v0.23.0 h1:gqCw0LfLxScz8irSi8exQc7fyQ0fKQU/qnC/X8+V/1M= go.opencensus.io v0.23.0/go.mod h1:XItmlyltB5F7CS4xOC1DcqMoFqwtC6OG2xF7mCv7P7E= -go.opentelemetry.io/collector v0.37.0 h1:X83+uWk11kW83BTkdKNt1Sk7gXyRv36wA6piT0FYfME= -go.opentelemetry.io/collector v0.37.0/go.mod h1:zbLWBJVy7bmiZHlHjCrV28vxXA/sAkCLtH5thD8ZahA= -go.opentelemetry.io/collector/model v0.37.0 h1:K1G6bgzBZ5kKSjZ1+EY9MhCOYsac4Q1K85fBUgpTVH8= +go.opentelemetry.io/collector v0.37.1-0.20211015233822-bd87fb628058 h1:6v0ba4ruY/W2cJLElDZEHDwShlSWUjK2MiBMvwfAIN0= +go.opentelemetry.io/collector v0.37.1-0.20211015233822-bd87fb628058/go.mod h1:zbLWBJVy7bmiZHlHjCrV28vxXA/sAkCLtH5thD8ZahA= go.opentelemetry.io/collector/model v0.37.0/go.mod h1:ESh1oWDNdS4fTg9sTFoYuiuvs8QuaX8yNGTPix3JZc8= +go.opentelemetry.io/collector/model v0.37.1-0.20211015233822-bd87fb628058 h1:jDw0pFIkDbvNRkkdCz1+gsBXIKbtY3GtRMPqzBeOfs4= +go.opentelemetry.io/collector/model v0.37.1-0.20211015233822-bd87fb628058/go.mod h1:ESh1oWDNdS4fTg9sTFoYuiuvs8QuaX8yNGTPix3JZc8= go.opentelemetry.io/contrib/instrumentation/google.golang.org/grpc/otelgrpc v0.25.0/go.mod h1:E5NNboN0UqSAki0Atn9kVwaN7I+l25gGxDqBueo/74E= go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.25.0/go.mod h1:NyB05cd+yPX6W5SiRNuJ90w7PV2+g2cgRbsPL7MvpME= go.opentelemetry.io/contrib/zpages v0.25.0/go.mod h1:cXBK0CNcIBD9Iiw1Hv3DvS+E8N2rtr+k+OoPs+sP0T4= diff --git a/receiver/windowsperfcountersreceiver/config.go b/receiver/windowsperfcountersreceiver/config.go index 9eb7b595570c..e1e381468e65 100644 --- a/receiver/windowsperfcountersreceiver/config.go +++ b/receiver/windowsperfcountersreceiver/config.go @@ -17,9 +17,8 @@ package windowsperfcountersreceiver import ( "fmt" + "go.opentelemetry.io/collector/receiver/scraperhelper" "go.uber.org/multierr" - - "github.com/open-telemetry/opentelemetry-collector-contrib/receiver/scraperhelper" ) // Config defines configuration for WindowsPerfCounters receiver. diff --git a/receiver/windowsperfcountersreceiver/config_test.go b/receiver/windowsperfcountersreceiver/config_test.go index 76fdb88e7aa7..19e95c0402a8 100644 --- a/receiver/windowsperfcountersreceiver/config_test.go +++ b/receiver/windowsperfcountersreceiver/config_test.go @@ -25,8 +25,7 @@ import ( "go.opentelemetry.io/collector/component/componenttest" "go.opentelemetry.io/collector/config" "go.opentelemetry.io/collector/config/configtest" - - "github.com/open-telemetry/opentelemetry-collector-contrib/receiver/scraperhelper" + "go.opentelemetry.io/collector/receiver/scraperhelper" ) func TestLoadConfig(t *testing.T) { diff --git a/receiver/windowsperfcountersreceiver/factory.go b/receiver/windowsperfcountersreceiver/factory.go index 141048adbce9..2b8fa461ef7b 100644 --- a/receiver/windowsperfcountersreceiver/factory.go +++ b/receiver/windowsperfcountersreceiver/factory.go @@ -20,8 +20,7 @@ import ( "go.opentelemetry.io/collector/component" "go.opentelemetry.io/collector/config" "go.opentelemetry.io/collector/receiver/receiverhelper" - - "github.com/open-telemetry/opentelemetry-collector-contrib/receiver/scraperhelper" + "go.opentelemetry.io/collector/receiver/scraperhelper" ) // This file implements Factory for WindowsPerfCounters receiver. diff --git a/receiver/windowsperfcountersreceiver/factory_windows.go b/receiver/windowsperfcountersreceiver/factory_windows.go index 0c68f7d53d6b..f99ef9a004e8 100644 --- a/receiver/windowsperfcountersreceiver/factory_windows.go +++ b/receiver/windowsperfcountersreceiver/factory_windows.go @@ -23,8 +23,7 @@ import ( "go.opentelemetry.io/collector/component" "go.opentelemetry.io/collector/config" "go.opentelemetry.io/collector/consumer" - - "github.com/open-telemetry/opentelemetry-collector-contrib/receiver/scraperhelper" + "go.opentelemetry.io/collector/receiver/scraperhelper" ) // createMetricsReceiver creates a metrics receiver based on provided config. @@ -40,17 +39,20 @@ func createMetricsReceiver( return nil, err } + scrp, err := scraperhelper.NewScraper( + cfg.ID().String(), + scraper.scrape, + scraperhelper.WithStart(scraper.start), + scraperhelper.WithShutdown(scraper.shutdown), + ) + if err != nil { + return nil, err + } + return scraperhelper.NewScraperControllerReceiver( &oCfg.ScraperControllerSettings, params, consumer, - scraperhelper.AddScraper( - scraperhelper.NewMetricsScraper( - cfg.ID().String(), - scraper.scrape, - scraperhelper.WithStart(scraper.start), - scraperhelper.WithShutdown(scraper.shutdown), - ), - ), + scraperhelper.AddScraper(scrp), ) } diff --git a/receiver/windowsperfcountersreceiver/go.mod b/receiver/windowsperfcountersreceiver/go.mod index 03fa20547234..3e52f4318ba4 100644 --- a/receiver/windowsperfcountersreceiver/go.mod +++ b/receiver/windowsperfcountersreceiver/go.mod @@ -3,10 +3,9 @@ module github.com/open-telemetry/opentelemetry-collector-contrib/receiver/window go 1.17 require ( - github.com/open-telemetry/opentelemetry-collector-contrib/receiver/scraperhelper v0.37.1 github.com/stretchr/testify v1.7.0 - go.opentelemetry.io/collector v0.37.0 - go.opentelemetry.io/collector/model v0.37.0 + go.opentelemetry.io/collector v0.37.1-0.20211015233822-bd87fb628058 + go.opentelemetry.io/collector/model v0.37.1-0.20211015233822-bd87fb628058 go.uber.org/multierr v1.7.0 go.uber.org/zap v1.19.1 golang.org/x/sys v0.0.0-20210816074244-15123e1e1f71 @@ -22,7 +21,10 @@ require ( github.com/mitchellh/copystructure v1.2.0 // indirect github.com/mitchellh/mapstructure v1.4.2 // indirect github.com/mitchellh/reflectwalk v1.0.2 // indirect + github.com/pelletier/go-toml v1.9.3 // indirect + github.com/pkg/errors v0.9.1 // indirect github.com/pmezard/go-difflib v1.0.0 // indirect + github.com/rogpeppe/go-internal v1.6.1 // indirect github.com/spf13/cast v1.4.1 // indirect go.opencensus.io v0.23.0 // indirect go.opentelemetry.io/otel v1.0.1 // indirect @@ -37,5 +39,3 @@ require ( gopkg.in/yaml.v2 v2.4.0 // indirect gopkg.in/yaml.v3 v3.0.0-20210107192922-496545a6307b // indirect ) - -replace github.com/open-telemetry/opentelemetry-collector-contrib/receiver/scraperhelper => ../scraperhelper diff --git a/receiver/windowsperfcountersreceiver/go.sum b/receiver/windowsperfcountersreceiver/go.sum index b0a8d318b16d..bf8f01171235 100644 --- a/receiver/windowsperfcountersreceiver/go.sum +++ b/receiver/windowsperfcountersreceiver/go.sum @@ -374,10 +374,11 @@ go.opencensus.io v0.22.4/go.mod h1:yxeiOL68Rb0Xd1ddK5vPZ/oVn4vY4Ynel7k9FzqtOIw= go.opencensus.io v0.22.5/go.mod h1:5pWMHQbX5EPX2/62yrJeAkowc+lfs/XD7Uxpq3pI6kk= go.opencensus.io v0.23.0 h1:gqCw0LfLxScz8irSi8exQc7fyQ0fKQU/qnC/X8+V/1M= go.opencensus.io v0.23.0/go.mod h1:XItmlyltB5F7CS4xOC1DcqMoFqwtC6OG2xF7mCv7P7E= -go.opentelemetry.io/collector v0.37.0 h1:X83+uWk11kW83BTkdKNt1Sk7gXyRv36wA6piT0FYfME= -go.opentelemetry.io/collector v0.37.0/go.mod h1:zbLWBJVy7bmiZHlHjCrV28vxXA/sAkCLtH5thD8ZahA= -go.opentelemetry.io/collector/model v0.37.0 h1:K1G6bgzBZ5kKSjZ1+EY9MhCOYsac4Q1K85fBUgpTVH8= +go.opentelemetry.io/collector v0.37.1-0.20211015233822-bd87fb628058 h1:6v0ba4ruY/W2cJLElDZEHDwShlSWUjK2MiBMvwfAIN0= +go.opentelemetry.io/collector v0.37.1-0.20211015233822-bd87fb628058/go.mod h1:zbLWBJVy7bmiZHlHjCrV28vxXA/sAkCLtH5thD8ZahA= go.opentelemetry.io/collector/model v0.37.0/go.mod h1:ESh1oWDNdS4fTg9sTFoYuiuvs8QuaX8yNGTPix3JZc8= +go.opentelemetry.io/collector/model v0.37.1-0.20211015233822-bd87fb628058 h1:jDw0pFIkDbvNRkkdCz1+gsBXIKbtY3GtRMPqzBeOfs4= +go.opentelemetry.io/collector/model v0.37.1-0.20211015233822-bd87fb628058/go.mod h1:ESh1oWDNdS4fTg9sTFoYuiuvs8QuaX8yNGTPix3JZc8= go.opentelemetry.io/contrib/instrumentation/google.golang.org/grpc/otelgrpc v0.25.0/go.mod h1:E5NNboN0UqSAki0Atn9kVwaN7I+l25gGxDqBueo/74E= go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.25.0/go.mod h1:NyB05cd+yPX6W5SiRNuJ90w7PV2+g2cgRbsPL7MvpME= go.opentelemetry.io/contrib/zpages v0.25.0/go.mod h1:cXBK0CNcIBD9Iiw1Hv3DvS+E8N2rtr+k+OoPs+sP0T4= diff --git a/receiver/windowsperfcountersreceiver/windowsperfcounters_scraper.go b/receiver/windowsperfcountersreceiver/windowsperfcounters_scraper.go index 4bca576a80e4..ce5daa10173a 100644 --- a/receiver/windowsperfcountersreceiver/windowsperfcounters_scraper.go +++ b/receiver/windowsperfcountersreceiver/windowsperfcounters_scraper.go @@ -102,9 +102,9 @@ func (s *scraper) shutdown(context.Context) error { return errs } -func (s *scraper) scrape(context.Context) (pdata.MetricSlice, error) { - metrics := pdata.NewMetricSlice() - +func (s *scraper) scrape(context.Context) (pdata.Metrics, error) { + md := pdata.NewMetrics() + metrics := md.ResourceMetrics().AppendEmpty().InstrumentationLibraryMetrics().AppendEmpty().Metrics() now := pdata.NewTimestampFromTime(time.Now()) var errs error @@ -120,7 +120,7 @@ func (s *scraper) scrape(context.Context) (pdata.MetricSlice, error) { initializeDoubleGaugeMetric(metrics.AppendEmpty(), now, counter.Path(), counterValues) } - return metrics, errs + return md, errs } func initializeDoubleGaugeMetric(metric pdata.Metric, now pdata.Timestamp, name string, counterValues []win_perf_counters.CounterValue) { diff --git a/receiver/windowsperfcountersreceiver/windowsperfcounters_scraper_test.go b/receiver/windowsperfcountersreceiver/windowsperfcounters_scraper_test.go index 41ed2670f614..504eaae3341f 100644 --- a/receiver/windowsperfcountersreceiver/windowsperfcounters_scraper_test.go +++ b/receiver/windowsperfcountersreceiver/windowsperfcounters_scraper_test.go @@ -26,11 +26,11 @@ import ( "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" "go.opentelemetry.io/collector/component/componenttest" + "go.opentelemetry.io/collector/receiver/scraperhelper" "go.uber.org/zap" "go.uber.org/zap/zapcore" "go.uber.org/zap/zaptest/observer" - "github.com/open-telemetry/opentelemetry-collector-contrib/receiver/scraperhelper" "github.com/open-telemetry/opentelemetry-collector-contrib/receiver/windowsperfcountersreceiver/internal/third_party/telegraf/win_perf_counters" ) @@ -167,13 +167,13 @@ func Test_WindowsPerfCounterScraper(t *testing.T) { } } - metrics, err := scraper.scrape(context.Background()) + md, err := scraper.scrape(context.Background()) if test.scrapeErr != nil { assert.Equal(t, err, test.scrapeErr) } else { require.NoError(t, err) } - + metrics := md.ResourceMetrics().At(0).InstrumentationLibraryMetrics().At(0).Metrics() require.Equal(t, len(test.expectedMetrics), metrics.Len()) for i, e := range test.expectedMetrics { metric := metrics.At(i) diff --git a/receiver/zipkinreceiver/go.mod b/receiver/zipkinreceiver/go.mod index 6574ec8a9f32..a35b3109a33b 100644 --- a/receiver/zipkinreceiver/go.mod +++ b/receiver/zipkinreceiver/go.mod @@ -8,8 +8,8 @@ require ( github.com/open-telemetry/opentelemetry-collector-contrib/pkg/translator/zipkin v0.37.1 github.com/openzipkin/zipkin-go v0.2.5 github.com/stretchr/testify v1.7.0 - go.opentelemetry.io/collector v0.37.0 - go.opentelemetry.io/collector/model v0.37.0 + go.opentelemetry.io/collector v0.37.1-0.20211015233822-bd87fb628058 + go.opentelemetry.io/collector/model v0.37.1-0.20211015233822-bd87fb628058 google.golang.org/protobuf v1.27.1 ) diff --git a/receiver/zipkinreceiver/go.sum b/receiver/zipkinreceiver/go.sum index cf7d9e6eea13..7b41a30afce2 100644 --- a/receiver/zipkinreceiver/go.sum +++ b/receiver/zipkinreceiver/go.sum @@ -756,11 +756,12 @@ go.opencensus.io v0.22.4/go.mod h1:yxeiOL68Rb0Xd1ddK5vPZ/oVn4vY4Ynel7k9FzqtOIw= go.opencensus.io v0.22.5/go.mod h1:5pWMHQbX5EPX2/62yrJeAkowc+lfs/XD7Uxpq3pI6kk= go.opencensus.io v0.23.0 h1:gqCw0LfLxScz8irSi8exQc7fyQ0fKQU/qnC/X8+V/1M= go.opencensus.io v0.23.0/go.mod h1:XItmlyltB5F7CS4xOC1DcqMoFqwtC6OG2xF7mCv7P7E= -go.opentelemetry.io/collector v0.37.0 h1:X83+uWk11kW83BTkdKNt1Sk7gXyRv36wA6piT0FYfME= -go.opentelemetry.io/collector v0.37.0/go.mod h1:zbLWBJVy7bmiZHlHjCrV28vxXA/sAkCLtH5thD8ZahA= +go.opentelemetry.io/collector v0.37.1-0.20211015233822-bd87fb628058 h1:6v0ba4ruY/W2cJLElDZEHDwShlSWUjK2MiBMvwfAIN0= +go.opentelemetry.io/collector v0.37.1-0.20211015233822-bd87fb628058/go.mod h1:zbLWBJVy7bmiZHlHjCrV28vxXA/sAkCLtH5thD8ZahA= go.opentelemetry.io/collector/model v0.36.0/go.mod h1:+7YCSjJG+MqiIFjauzt7oM2qkqBsaJWh5hcsO4fwsAc= -go.opentelemetry.io/collector/model v0.37.0 h1:K1G6bgzBZ5kKSjZ1+EY9MhCOYsac4Q1K85fBUgpTVH8= go.opentelemetry.io/collector/model v0.37.0/go.mod h1:ESh1oWDNdS4fTg9sTFoYuiuvs8QuaX8yNGTPix3JZc8= +go.opentelemetry.io/collector/model v0.37.1-0.20211015233822-bd87fb628058 h1:jDw0pFIkDbvNRkkdCz1+gsBXIKbtY3GtRMPqzBeOfs4= +go.opentelemetry.io/collector/model v0.37.1-0.20211015233822-bd87fb628058/go.mod h1:ESh1oWDNdS4fTg9sTFoYuiuvs8QuaX8yNGTPix3JZc8= go.opentelemetry.io/contrib/instrumentation/google.golang.org/grpc/otelgrpc v0.25.0/go.mod h1:E5NNboN0UqSAki0Atn9kVwaN7I+l25gGxDqBueo/74E= go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.25.0 h1:FIbb8m2PtTWjvXLHOEnXAoSmkaiXbg3fuvoZAjsAT3Q= go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.25.0/go.mod h1:NyB05cd+yPX6W5SiRNuJ90w7PV2+g2cgRbsPL7MvpME= diff --git a/receiver/zookeeperreceiver/config.go b/receiver/zookeeperreceiver/config.go index 31b586e7a935..8863a01525c6 100644 --- a/receiver/zookeeperreceiver/config.go +++ b/receiver/zookeeperreceiver/config.go @@ -18,8 +18,7 @@ import ( "time" "go.opentelemetry.io/collector/config/confignet" - - "github.com/open-telemetry/opentelemetry-collector-contrib/receiver/scraperhelper" + "go.opentelemetry.io/collector/receiver/scraperhelper" ) type Config struct { diff --git a/receiver/zookeeperreceiver/factory.go b/receiver/zookeeperreceiver/factory.go index 198407b3076e..d1fa6f0fd726 100644 --- a/receiver/zookeeperreceiver/factory.go +++ b/receiver/zookeeperreceiver/factory.go @@ -23,8 +23,7 @@ import ( "go.opentelemetry.io/collector/config/confignet" "go.opentelemetry.io/collector/consumer" "go.opentelemetry.io/collector/receiver/receiverhelper" - - "github.com/open-telemetry/opentelemetry-collector-contrib/receiver/scraperhelper" + "go.opentelemetry.io/collector/receiver/scraperhelper" ) const ( @@ -68,16 +67,19 @@ func createMetricsReceiver( return nil, err } + scrp, err := scraperhelper.NewScraper( + typeStr, + zms.scrape, + scraperhelper.WithShutdown(zms.shutdown), + ) + if err != nil { + return nil, err + } + return scraperhelper.NewScraperControllerReceiver( &rConfig.ScraperControllerSettings, params, consumer, - scraperhelper.AddScraper( - scraperhelper.NewResourceMetricsScraper( - rConfig.ID(), - zms.scrape, - scraperhelper.WithShutdown(zms.shutdown), - ), - ), + scraperhelper.AddScraper(scrp), ) } diff --git a/receiver/zookeeperreceiver/go.mod b/receiver/zookeeperreceiver/go.mod index bbfc3d027eff..e53bb2406481 100644 --- a/receiver/zookeeperreceiver/go.mod +++ b/receiver/zookeeperreceiver/go.mod @@ -5,10 +5,9 @@ go 1.17 require ( github.com/open-telemetry/opentelemetry-collector-contrib/internal/common v0.37.1 github.com/open-telemetry/opentelemetry-collector-contrib/internal/coreinternal v0.37.1 - github.com/open-telemetry/opentelemetry-collector-contrib/receiver/scraperhelper v0.37.1 github.com/stretchr/testify v1.7.0 - go.opentelemetry.io/collector v0.37.0 - go.opentelemetry.io/collector/model v0.37.0 + go.opentelemetry.io/collector v0.37.1-0.20211015233822-bd87fb628058 + go.opentelemetry.io/collector/model v0.37.1-0.20211015233822-bd87fb628058 go.uber.org/zap v1.19.1 ) @@ -54,5 +53,3 @@ require ( replace github.com/open-telemetry/opentelemetry-collector-contrib/internal/common => ../../internal/common replace github.com/open-telemetry/opentelemetry-collector-contrib/internal/coreinternal => ../../internal/coreinternal - -replace github.com/open-telemetry/opentelemetry-collector-contrib/receiver/scraperhelper => ../scraperhelper diff --git a/receiver/zookeeperreceiver/go.sum b/receiver/zookeeperreceiver/go.sum index b06fe0da6add..0043135d3340 100644 --- a/receiver/zookeeperreceiver/go.sum +++ b/receiver/zookeeperreceiver/go.sum @@ -791,10 +791,11 @@ go.opencensus.io v0.22.4/go.mod h1:yxeiOL68Rb0Xd1ddK5vPZ/oVn4vY4Ynel7k9FzqtOIw= go.opencensus.io v0.22.5/go.mod h1:5pWMHQbX5EPX2/62yrJeAkowc+lfs/XD7Uxpq3pI6kk= go.opencensus.io v0.23.0 h1:gqCw0LfLxScz8irSi8exQc7fyQ0fKQU/qnC/X8+V/1M= go.opencensus.io v0.23.0/go.mod h1:XItmlyltB5F7CS4xOC1DcqMoFqwtC6OG2xF7mCv7P7E= -go.opentelemetry.io/collector v0.37.0 h1:X83+uWk11kW83BTkdKNt1Sk7gXyRv36wA6piT0FYfME= -go.opentelemetry.io/collector v0.37.0/go.mod h1:zbLWBJVy7bmiZHlHjCrV28vxXA/sAkCLtH5thD8ZahA= -go.opentelemetry.io/collector/model v0.37.0 h1:K1G6bgzBZ5kKSjZ1+EY9MhCOYsac4Q1K85fBUgpTVH8= +go.opentelemetry.io/collector v0.37.1-0.20211015233822-bd87fb628058 h1:6v0ba4ruY/W2cJLElDZEHDwShlSWUjK2MiBMvwfAIN0= +go.opentelemetry.io/collector v0.37.1-0.20211015233822-bd87fb628058/go.mod h1:zbLWBJVy7bmiZHlHjCrV28vxXA/sAkCLtH5thD8ZahA= go.opentelemetry.io/collector/model v0.37.0/go.mod h1:ESh1oWDNdS4fTg9sTFoYuiuvs8QuaX8yNGTPix3JZc8= +go.opentelemetry.io/collector/model v0.37.1-0.20211015233822-bd87fb628058 h1:jDw0pFIkDbvNRkkdCz1+gsBXIKbtY3GtRMPqzBeOfs4= +go.opentelemetry.io/collector/model v0.37.1-0.20211015233822-bd87fb628058/go.mod h1:ESh1oWDNdS4fTg9sTFoYuiuvs8QuaX8yNGTPix3JZc8= go.opentelemetry.io/contrib/instrumentation/google.golang.org/grpc/otelgrpc v0.25.0/go.mod h1:E5NNboN0UqSAki0Atn9kVwaN7I+l25gGxDqBueo/74E= go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.25.0/go.mod h1:NyB05cd+yPX6W5SiRNuJ90w7PV2+g2cgRbsPL7MvpME= go.opentelemetry.io/contrib/zpages v0.25.0/go.mod h1:cXBK0CNcIBD9Iiw1Hv3DvS+E8N2rtr+k+OoPs+sP0T4= diff --git a/receiver/zookeeperreceiver/scraper.go b/receiver/zookeeperreceiver/scraper.go index c04d1db4954f..6b0b91fb140f 100644 --- a/receiver/zookeeperreceiver/scraper.go +++ b/receiver/zookeeperreceiver/scraper.go @@ -75,7 +75,7 @@ func (z *zookeeperMetricsScraper) shutdown(_ context.Context) error { return nil } -func (z *zookeeperMetricsScraper) scrape(ctx context.Context) (pdata.ResourceMetricsSlice, error) { +func (z *zookeeperMetricsScraper) scrape(ctx context.Context) (pdata.Metrics, error) { var ctxWithTimeout context.Context ctxWithTimeout, z.cancel = context.WithTimeout(ctx, z.config.Timeout) @@ -85,7 +85,7 @@ func (z *zookeeperMetricsScraper) scrape(ctx context.Context) (pdata.ResourceMet zap.String("endpoint", z.config.Endpoint), zap.Error(err), ) - return pdata.NewResourceMetricsSlice(), err + return pdata.NewMetrics(), err } defer func() { if closeErr := z.closeConnection(conn); closeErr != nil { @@ -103,19 +103,19 @@ func (z *zookeeperMetricsScraper) scrape(ctx context.Context) (pdata.ResourceMet return z.getResourceMetrics(conn) } -func (z *zookeeperMetricsScraper) getResourceMetrics(conn net.Conn) (pdata.ResourceMetricsSlice, error) { +func (z *zookeeperMetricsScraper) getResourceMetrics(conn net.Conn) (pdata.Metrics, error) { scanner, err := z.sendCmd(conn, mntrCommand) if err != nil { z.logger.Error("failed to send command", zap.Error(err), zap.String("command", mntrCommand), ) - return pdata.NewResourceMetricsSlice(), err + return pdata.NewMetrics(), err } md := pdata.NewMetrics() z.appendMetrics(scanner, md.ResourceMetrics()) - return md.ResourceMetrics(), nil + return md, nil } func (z *zookeeperMetricsScraper) appendMetrics(scanner *bufio.Scanner, rms pdata.ResourceMetricsSlice) { diff --git a/receiver/zookeeperreceiver/scraper_test.go b/receiver/zookeeperreceiver/scraper_test.go index 245bbae57f5b..499436e0666a 100644 --- a/receiver/zookeeperreceiver/scraper_test.go +++ b/receiver/zookeeperreceiver/scraper_test.go @@ -234,22 +234,22 @@ func TestZookeeperMetricsScraperScrape(t *testing.T) { if tt.wantErr { require.Error(t, err) - require.Equal(t, pdata.NewResourceMetricsSlice(), got) + require.Equal(t, pdata.NewMetrics(), got) require.NoError(t, z.shutdown(ctx)) return } - require.Equal(t, tt.expectedNumResourceMetrics, got.Len()) + require.Equal(t, tt.expectedNumResourceMetrics, got.ResourceMetrics().Len()) for i := 0; i < tt.expectedNumResourceMetrics; i++ { - resource := got.At(i).Resource() + resource := got.ResourceMetrics().At(i).Resource() require.Equal(t, len(tt.expectedResourceAttributes), resource.Attributes().Len()) resource.Attributes().Range(func(k string, v pdata.AttributeValue) bool { require.Equal(t, tt.expectedResourceAttributes[k], v.StringVal()) return true }) - ilms := got.At(0).InstrumentationLibraryMetrics() + ilms := got.ResourceMetrics().At(0).InstrumentationLibraryMetrics() require.Equal(t, 1, ilms.Len()) metrics := ilms.At(0).Metrics() diff --git a/testbed/go.mod b/testbed/go.mod index 92b4409fac8a..9e0151644092 100644 --- a/testbed/go.mod +++ b/testbed/go.mod @@ -26,8 +26,8 @@ require ( github.com/prometheus/prometheus v1.8.2-0.20210621150501-ff58416a0b02 github.com/shirou/gopsutil/v3 v3.21.9 github.com/stretchr/testify v1.7.0 - go.opentelemetry.io/collector v0.37.0 - go.opentelemetry.io/collector/model v0.37.0 + go.opentelemetry.io/collector v0.37.1-0.20211015233822-bd87fb628058 + go.opentelemetry.io/collector/model v0.37.1-0.20211015233822-bd87fb628058 go.uber.org/atomic v1.9.0 go.uber.org/zap v1.19.1 golang.org/x/text v0.3.7 diff --git a/testbed/go.sum b/testbed/go.sum index 37285fc05eb4..09a7249b8e6d 100644 --- a/testbed/go.sum +++ b/testbed/go.sum @@ -1723,11 +1723,12 @@ go.opencensus.io v0.22.4/go.mod h1:yxeiOL68Rb0Xd1ddK5vPZ/oVn4vY4Ynel7k9FzqtOIw= go.opencensus.io v0.22.5/go.mod h1:5pWMHQbX5EPX2/62yrJeAkowc+lfs/XD7Uxpq3pI6kk= go.opencensus.io v0.23.0 h1:gqCw0LfLxScz8irSi8exQc7fyQ0fKQU/qnC/X8+V/1M= go.opencensus.io v0.23.0/go.mod h1:XItmlyltB5F7CS4xOC1DcqMoFqwtC6OG2xF7mCv7P7E= -go.opentelemetry.io/collector v0.37.0 h1:X83+uWk11kW83BTkdKNt1Sk7gXyRv36wA6piT0FYfME= -go.opentelemetry.io/collector v0.37.0/go.mod h1:zbLWBJVy7bmiZHlHjCrV28vxXA/sAkCLtH5thD8ZahA= +go.opentelemetry.io/collector v0.37.1-0.20211015233822-bd87fb628058 h1:6v0ba4ruY/W2cJLElDZEHDwShlSWUjK2MiBMvwfAIN0= +go.opentelemetry.io/collector v0.37.1-0.20211015233822-bd87fb628058/go.mod h1:zbLWBJVy7bmiZHlHjCrV28vxXA/sAkCLtH5thD8ZahA= go.opentelemetry.io/collector/model v0.36.0/go.mod h1:+7YCSjJG+MqiIFjauzt7oM2qkqBsaJWh5hcsO4fwsAc= -go.opentelemetry.io/collector/model v0.37.0 h1:K1G6bgzBZ5kKSjZ1+EY9MhCOYsac4Q1K85fBUgpTVH8= go.opentelemetry.io/collector/model v0.37.0/go.mod h1:ESh1oWDNdS4fTg9sTFoYuiuvs8QuaX8yNGTPix3JZc8= +go.opentelemetry.io/collector/model v0.37.1-0.20211015233822-bd87fb628058 h1:jDw0pFIkDbvNRkkdCz1+gsBXIKbtY3GtRMPqzBeOfs4= +go.opentelemetry.io/collector/model v0.37.1-0.20211015233822-bd87fb628058/go.mod h1:ESh1oWDNdS4fTg9sTFoYuiuvs8QuaX8yNGTPix3JZc8= go.opentelemetry.io/contrib/instrumentation/google.golang.org/grpc/otelgrpc v0.25.0 h1:Wx7nFnvCaissIUZxPkBqDz2963Z+Cl+PkYbDKzTxDqQ= go.opentelemetry.io/contrib/instrumentation/google.golang.org/grpc/otelgrpc v0.25.0/go.mod h1:E5NNboN0UqSAki0Atn9kVwaN7I+l25gGxDqBueo/74E= go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.25.0 h1:FIbb8m2PtTWjvXLHOEnXAoSmkaiXbg3fuvoZAjsAT3Q= diff --git a/testbed/mockdatareceivers/mockawsxrayreceiver/go.mod b/testbed/mockdatareceivers/mockawsxrayreceiver/go.mod index 6c8e71174002..351af469af3a 100644 --- a/testbed/mockdatareceivers/mockawsxrayreceiver/go.mod +++ b/testbed/mockdatareceivers/mockawsxrayreceiver/go.mod @@ -4,8 +4,8 @@ go 1.17 require ( github.com/gorilla/mux v1.8.0 - go.opentelemetry.io/collector v0.37.0 - go.opentelemetry.io/collector/model v0.37.0 + go.opentelemetry.io/collector v0.37.1-0.20211015233822-bd87fb628058 + go.opentelemetry.io/collector/model v0.37.1-0.20211015233822-bd87fb628058 go.uber.org/zap v1.19.1 ) diff --git a/testbed/mockdatareceivers/mockawsxrayreceiver/go.sum b/testbed/mockdatareceivers/mockawsxrayreceiver/go.sum index 2f6059b89ace..f5f0b8864e01 100644 --- a/testbed/mockdatareceivers/mockawsxrayreceiver/go.sum +++ b/testbed/mockdatareceivers/mockawsxrayreceiver/go.sum @@ -373,10 +373,11 @@ go.opencensus.io v0.22.4/go.mod h1:yxeiOL68Rb0Xd1ddK5vPZ/oVn4vY4Ynel7k9FzqtOIw= go.opencensus.io v0.22.5/go.mod h1:5pWMHQbX5EPX2/62yrJeAkowc+lfs/XD7Uxpq3pI6kk= go.opencensus.io v0.23.0 h1:gqCw0LfLxScz8irSi8exQc7fyQ0fKQU/qnC/X8+V/1M= go.opencensus.io v0.23.0/go.mod h1:XItmlyltB5F7CS4xOC1DcqMoFqwtC6OG2xF7mCv7P7E= -go.opentelemetry.io/collector v0.37.0 h1:X83+uWk11kW83BTkdKNt1Sk7gXyRv36wA6piT0FYfME= -go.opentelemetry.io/collector v0.37.0/go.mod h1:zbLWBJVy7bmiZHlHjCrV28vxXA/sAkCLtH5thD8ZahA= -go.opentelemetry.io/collector/model v0.37.0 h1:K1G6bgzBZ5kKSjZ1+EY9MhCOYsac4Q1K85fBUgpTVH8= +go.opentelemetry.io/collector v0.37.1-0.20211015233822-bd87fb628058 h1:6v0ba4ruY/W2cJLElDZEHDwShlSWUjK2MiBMvwfAIN0= +go.opentelemetry.io/collector v0.37.1-0.20211015233822-bd87fb628058/go.mod h1:zbLWBJVy7bmiZHlHjCrV28vxXA/sAkCLtH5thD8ZahA= go.opentelemetry.io/collector/model v0.37.0/go.mod h1:ESh1oWDNdS4fTg9sTFoYuiuvs8QuaX8yNGTPix3JZc8= +go.opentelemetry.io/collector/model v0.37.1-0.20211015233822-bd87fb628058 h1:jDw0pFIkDbvNRkkdCz1+gsBXIKbtY3GtRMPqzBeOfs4= +go.opentelemetry.io/collector/model v0.37.1-0.20211015233822-bd87fb628058/go.mod h1:ESh1oWDNdS4fTg9sTFoYuiuvs8QuaX8yNGTPix3JZc8= go.opentelemetry.io/contrib/instrumentation/google.golang.org/grpc/otelgrpc v0.25.0/go.mod h1:E5NNboN0UqSAki0Atn9kVwaN7I+l25gGxDqBueo/74E= go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.25.0/go.mod h1:NyB05cd+yPX6W5SiRNuJ90w7PV2+g2cgRbsPL7MvpME= go.opentelemetry.io/contrib/zpages v0.25.0/go.mod h1:cXBK0CNcIBD9Iiw1Hv3DvS+E8N2rtr+k+OoPs+sP0T4=