From 690f5a8558b0d3396ed42d197fe75837bf8ff256 Mon Sep 17 00:00:00 2001 From: Bogdan Drutu Date: Tue, 23 Mar 2021 08:54:56 -0700 Subject: [PATCH] Update core to latest, fix breaking change consumer rename Signed-off-by: Bogdan Drutu --- exporter/alibabacloudlogserviceexporter/go.mod | 2 +- exporter/alibabacloudlogserviceexporter/go.sum | 4 ++-- exporter/awsemfexporter/go.mod | 2 +- exporter/awsemfexporter/go.sum | 4 ++-- exporter/awskinesisexporter/go.mod | 2 +- exporter/awskinesisexporter/go.sum | 4 ++-- exporter/awsprometheusremotewriteexporter/go.mod | 2 +- exporter/awsprometheusremotewriteexporter/go.sum | 4 ++-- exporter/awsxrayexporter/go.mod | 2 +- exporter/awsxrayexporter/go.sum | 4 ++-- exporter/azuremonitorexporter/go.mod | 2 +- exporter/azuremonitorexporter/go.sum | 4 ++-- exporter/carbonexporter/go.mod | 2 +- exporter/carbonexporter/go.sum | 4 ++-- exporter/datadogexporter/go.mod | 2 +- exporter/datadogexporter/go.sum | 4 ++-- exporter/dynatraceexporter/go.mod | 2 +- exporter/dynatraceexporter/go.sum | 4 ++-- exporter/elasticexporter/go.mod | 2 +- exporter/elasticexporter/go.sum | 4 ++-- exporter/elasticsearchexporter/go.mod | 2 +- exporter/elasticsearchexporter/go.sum | 4 ++-- exporter/f5cloudexporter/go.mod | 2 +- exporter/f5cloudexporter/go.sum | 4 ++-- exporter/googlecloudexporter/go.mod | 2 +- exporter/googlecloudexporter/go.sum | 4 ++-- exporter/honeycombexporter/go.mod | 2 +- exporter/honeycombexporter/go.sum | 4 ++-- exporter/jaegerthrifthttpexporter/go.mod | 2 +- exporter/jaegerthrifthttpexporter/go.sum | 4 ++-- exporter/loadbalancingexporter/go.mod | 2 +- exporter/loadbalancingexporter/go.sum | 4 ++-- exporter/logzioexporter/go.mod | 2 +- exporter/logzioexporter/go.sum | 4 ++-- exporter/lokiexporter/go.mod | 2 +- exporter/lokiexporter/go.sum | 4 ++-- exporter/newrelicexporter/go.mod | 2 +- exporter/newrelicexporter/go.sum | 4 ++-- exporter/sapmexporter/exporter.go | 6 +++--- exporter/sapmexporter/go.mod | 2 +- exporter/sapmexporter/go.sum | 4 ++-- exporter/sentryexporter/go.mod | 2 +- exporter/sentryexporter/go.sum | 4 ++-- exporter/signalfxexporter/exporter.go | 4 ++-- exporter/signalfxexporter/factory.go | 8 ++++---- exporter/signalfxexporter/go.mod | 2 +- exporter/signalfxexporter/go.sum | 4 ++-- exporter/splunkhecexporter/go.mod | 2 +- exporter/splunkhecexporter/go.sum | 4 ++-- exporter/stackdriverexporter/go.mod | 2 +- exporter/stackdriverexporter/go.sum | 4 ++-- exporter/sumologicexporter/go.mod | 2 +- exporter/sumologicexporter/go.sum | 4 ++-- exporter/uptraceexporter/go.mod | 2 +- exporter/uptraceexporter/go.sum | 4 ++-- extension/fluentbitextension/go.mod | 2 +- extension/fluentbitextension/go.sum | 4 ++-- extension/httpforwarder/go.mod | 2 +- extension/httpforwarder/go.sum | 4 ++-- extension/observer/hostobserver/go.mod | 2 +- extension/observer/hostobserver/go.sum | 4 ++-- extension/observer/k8sobserver/go.mod | 2 +- extension/observer/k8sobserver/go.sum | 4 ++-- go.mod | 2 +- go.sum | 4 ++-- internal/splunk/go.mod | 2 +- internal/splunk/go.sum | 4 ++-- internal/stanza/factory.go | 2 +- internal/stanza/go.mod | 2 +- internal/stanza/go.sum | 4 ++-- internal/stanza/receiver.go | 2 +- pkg/batchperresourceattr/batchperresourceattr.go | 12 ++++++------ pkg/batchperresourceattr/go.mod | 2 +- pkg/batchperresourceattr/go.sum | 4 ++-- pkg/batchpersignal/go.mod | 2 +- pkg/batchpersignal/go.sum | 4 ++-- pkg/batchpertrace/go.mod | 2 +- pkg/batchpertrace/go.sum | 4 ++-- processor/groupbyattrsprocessor/factory.go | 4 ++-- processor/groupbyattrsprocessor/go.mod | 2 +- processor/groupbyattrsprocessor/go.sum | 4 ++-- processor/groupbytraceprocessor/factory.go | 2 +- processor/groupbytraceprocessor/go.mod | 2 +- processor/groupbytraceprocessor/go.sum | 4 ++-- processor/groupbytraceprocessor/processor.go | 4 ++-- processor/groupbytraceprocessor/processor_test.go | 2 +- processor/k8sprocessor/factory.go | 12 ++++++------ processor/k8sprocessor/go.mod | 2 +- processor/k8sprocessor/go.sum | 4 ++-- processor/k8sprocessor/processor_test.go | 6 +++--- processor/metricstransformprocessor/factory.go | 2 +- processor/metricstransformprocessor/go.mod | 2 +- processor/metricstransformprocessor/go.sum | 4 ++-- processor/resourcedetectionprocessor/factory.go | 6 +++--- processor/resourcedetectionprocessor/go.mod | 2 +- processor/resourcedetectionprocessor/go.sum | 4 ++-- processor/routingprocessor/factory.go | 2 +- processor/routingprocessor/go.mod | 2 +- processor/routingprocessor/go.sum | 4 ++-- processor/spanmetricsprocessor/factory.go | 2 +- processor/spanmetricsprocessor/go.mod | 2 +- processor/spanmetricsprocessor/go.sum | 4 ++-- processor/spanmetricsprocessor/processor.go | 6 +++--- processor/tailsamplingprocessor/factory.go | 2 +- processor/tailsamplingprocessor/go.mod | 2 +- processor/tailsamplingprocessor/go.sum | 4 ++-- processor/tailsamplingprocessor/processor.go | 4 ++-- receiver/awsecscontainermetricsreceiver/factory.go | 2 +- receiver/awsecscontainermetricsreceiver/go.mod | 2 +- receiver/awsecscontainermetricsreceiver/go.sum | 4 ++-- receiver/awsecscontainermetricsreceiver/receiver.go | 4 ++-- receiver/awsxrayreceiver/factory.go | 2 +- receiver/awsxrayreceiver/factory_test.go | 2 +- receiver/awsxrayreceiver/go.mod | 2 +- receiver/awsxrayreceiver/go.sum | 4 ++-- receiver/awsxrayreceiver/receiver.go | 4 ++-- receiver/awsxrayreceiver/receiver_test.go | 4 ++-- receiver/carbonreceiver/factory.go | 2 +- receiver/carbonreceiver/go.mod | 2 +- receiver/carbonreceiver/go.sum | 4 ++-- receiver/carbonreceiver/receiver.go | 4 ++-- receiver/carbonreceiver/receiver_test.go | 2 +- receiver/carbonreceiver/transport/server.go | 2 +- receiver/carbonreceiver/transport/tcp_server.go | 4 ++-- receiver/carbonreceiver/transport/udp_server.go | 4 ++-- receiver/collectdreceiver/factory.go | 2 +- receiver/collectdreceiver/go.mod | 2 +- receiver/collectdreceiver/go.sum | 4 ++-- receiver/collectdreceiver/receiver.go | 4 ++-- receiver/collectdreceiver/receiver_test.go | 2 +- receiver/dockerstatsreceiver/factory.go | 2 +- receiver/dockerstatsreceiver/go.mod | 2 +- receiver/dockerstatsreceiver/go.sum | 4 ++-- receiver/dockerstatsreceiver/receiver.go | 4 ++-- receiver/dotnetdiagnosticsreceiver/factory.go | 2 +- receiver/dotnetdiagnosticsreceiver/go.mod | 2 +- receiver/dotnetdiagnosticsreceiver/go.sum | 4 ++-- receiver/dotnetdiagnosticsreceiver/metrics/sender.go | 6 +++--- receiver/dotnetdiagnosticsreceiver/receiver.go | 4 ++-- receiver/filelogreceiver/go.mod | 2 +- receiver/filelogreceiver/go.sum | 4 ++-- receiver/jmxreceiver/factory.go | 2 +- receiver/jmxreceiver/go.mod | 2 +- receiver/jmxreceiver/go.sum | 4 ++-- receiver/jmxreceiver/receiver.go | 4 ++-- receiver/k8sclusterreceiver/factory.go | 2 +- receiver/k8sclusterreceiver/go.mod | 2 +- receiver/k8sclusterreceiver/go.sum | 4 ++-- receiver/k8sclusterreceiver/receiver.go | 4 ++-- receiver/k8sclusterreceiver/receiver_test.go | 2 +- receiver/kafkametricsreceiver/factory.go | 2 +- receiver/kafkametricsreceiver/factory_test.go | 2 +- receiver/kafkametricsreceiver/go.mod | 2 +- receiver/kafkametricsreceiver/go.sum | 4 ++-- receiver/kafkametricsreceiver/receiver.go | 2 +- receiver/kubeletstatsreceiver/factory.go | 2 +- receiver/kubeletstatsreceiver/go.mod | 2 +- receiver/kubeletstatsreceiver/go.sum | 4 ++-- receiver/kubeletstatsreceiver/receiver.go | 4 ++-- receiver/kubeletstatsreceiver/runnable.go | 4 ++-- receiver/memcachedreceiver/factory.go | 2 +- receiver/memcachedreceiver/go.mod | 2 +- receiver/memcachedreceiver/go.sum | 4 ++-- receiver/nginxreceiver/factory.go | 2 +- receiver/nginxreceiver/go.mod | 2 +- receiver/nginxreceiver/go.sum | 4 ++-- receiver/prometheusexecreceiver/factory.go | 2 +- receiver/prometheusexecreceiver/go.mod | 2 +- receiver/prometheusexecreceiver/go.sum | 4 ++-- receiver/prometheusexecreceiver/receiver.go | 4 ++-- receiver/receivercreator/config_test.go | 8 ++++---- receiver/receivercreator/factory.go | 2 +- receiver/receivercreator/go.mod | 2 +- receiver/receivercreator/go.sum | 4 ++-- receiver/receivercreator/observerhandler.go | 2 +- receiver/receivercreator/observerhandler_test.go | 2 +- receiver/receivercreator/receiver.go | 6 +++--- receiver/receivercreator/receiver_test.go | 4 ++-- receiver/receivercreator/resourceenhancer.go | 6 +++--- receiver/receivercreator/resourceenhancer_test.go | 2 +- receiver/receivercreator/runner.go | 6 +++--- receiver/redisreceiver/factory.go | 2 +- receiver/redisreceiver/go.mod | 2 +- receiver/redisreceiver/go.sum | 4 ++-- receiver/redisreceiver/receiver.go | 4 ++-- receiver/redisreceiver/redis_runnable.go | 4 ++-- receiver/sapmreceiver/factory.go | 2 +- receiver/sapmreceiver/go.mod | 2 +- receiver/sapmreceiver/go.sum | 4 ++-- receiver/sapmreceiver/trace_receiver.go | 4 ++-- receiver/signalfxreceiver/factory.go | 4 ++-- receiver/signalfxreceiver/go.mod | 2 +- receiver/signalfxreceiver/go.sum | 4 ++-- receiver/signalfxreceiver/receiver.go | 8 ++++---- receiver/signalfxreceiver/receiver_test.go | 2 +- receiver/simpleprometheusreceiver/factory.go | 2 +- receiver/simpleprometheusreceiver/go.mod | 2 +- receiver/simpleprometheusreceiver/go.sum | 4 ++-- receiver/simpleprometheusreceiver/receiver.go | 4 ++-- receiver/splunkhecreceiver/factory.go | 6 +++--- receiver/splunkhecreceiver/go.mod | 2 +- receiver/splunkhecreceiver/go.sum | 4 ++-- receiver/splunkhecreceiver/receiver.go | 8 ++++---- receiver/splunkhecreceiver/receiver_test.go | 4 ++-- receiver/statsdreceiver/factory.go | 2 +- receiver/statsdreceiver/go.mod | 2 +- receiver/statsdreceiver/go.sum | 4 ++-- receiver/statsdreceiver/receiver.go | 6 +++--- receiver/statsdreceiver/receiver_test.go | 2 +- receiver/statsdreceiver/transport/server.go | 2 +- receiver/statsdreceiver/transport/udp_server.go | 2 +- receiver/syslogreceiver/go.mod | 2 +- receiver/syslogreceiver/go.sum | 4 ++-- receiver/wavefrontreceiver/factory.go | 2 +- receiver/wavefrontreceiver/go.mod | 2 +- receiver/wavefrontreceiver/go.sum | 4 ++-- .../windowsperfcountersreceiver/factory_others.go | 2 +- .../windowsperfcountersreceiver/factory_windows.go | 2 +- receiver/windowsperfcountersreceiver/go.mod | 2 +- receiver/windowsperfcountersreceiver/go.sum | 4 ++-- receiver/zookeeperreceiver/factory.go | 2 +- receiver/zookeeperreceiver/go.mod | 2 +- receiver/zookeeperreceiver/go.sum | 4 ++-- testbed/datareceivers/carbon.go | 2 +- testbed/datareceivers/mockawsxraydatareceiver.go | 2 +- testbed/datareceivers/sapm.go | 2 +- testbed/datareceivers/signalfx.go | 2 +- testbed/datasenders/carbon.go | 4 ++-- testbed/datasenders/sapm.go | 4 ++-- testbed/datasenders/signalfx.go | 4 ++-- testbed/go.mod | 2 +- testbed/go.sum | 4 ++-- .../mockdatareceivers/mockawsxrayreceiver/factory.go | 2 +- testbed/mockdatareceivers/mockawsxrayreceiver/go.mod | 2 +- testbed/mockdatareceivers/mockawsxrayreceiver/go.sum | 4 ++-- .../mockawsxrayreceiver/trace_receiver.go | 4 ++-- 236 files changed, 378 insertions(+), 378 deletions(-) diff --git a/exporter/alibabacloudlogserviceexporter/go.mod b/exporter/alibabacloudlogserviceexporter/go.mod index 4b82f57b68617..b30c61f20a831 100644 --- a/exporter/alibabacloudlogserviceexporter/go.mod +++ b/exporter/alibabacloudlogserviceexporter/go.mod @@ -8,7 +8,7 @@ require ( github.com/gogo/protobuf v1.3.2 github.com/pelletier/go-toml v1.8.0 // indirect github.com/stretchr/testify v1.7.0 - go.opentelemetry.io/collector v0.22.1-0.20210322181726-3b1392387bf2 + go.opentelemetry.io/collector v0.22.1-0.20210323150444-0c6757ec71a5 go.uber.org/zap v1.16.0 gopkg.in/ini.v1 v1.57.0 // indirect ) diff --git a/exporter/alibabacloudlogserviceexporter/go.sum b/exporter/alibabacloudlogserviceexporter/go.sum index 180bd308f64fe..a892dced9b095 100644 --- a/exporter/alibabacloudlogserviceexporter/go.sum +++ b/exporter/alibabacloudlogserviceexporter/go.sum @@ -909,8 +909,8 @@ 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.22.1-0.20210322181726-3b1392387bf2 h1:EHW+2owVU4hg5f0sDhxdsIXYmUJSmV6H1KAMwLOC8LM= -go.opentelemetry.io/collector v0.22.1-0.20210322181726-3b1392387bf2/go.mod h1:wMTwy0/4xrFRZj/XX1UH5VAd0WAVts9Rq7ZKQldCIkU= +go.opentelemetry.io/collector v0.22.1-0.20210323150444-0c6757ec71a5 h1:uYfkVpGK++c0AmXdCWh9jhAZ3PiFvhe+7lcyF4eqdqc= +go.opentelemetry.io/collector v0.22.1-0.20210323150444-0c6757ec71a5/go.mod h1:wMTwy0/4xrFRZj/XX1UH5VAd0WAVts9Rq7ZKQldCIkU= go.uber.org/atomic v1.3.2/go.mod h1:gD2HeocX3+yG+ygLZcrzQJaqmWj9AIm7n08wl/qW/PE= go.uber.org/atomic v1.4.0/go.mod h1:gD2HeocX3+yG+ygLZcrzQJaqmWj9AIm7n08wl/qW/PE= go.uber.org/atomic v1.5.0/go.mod h1:sABNBOSYdrvTF6hTgEIbc7YasKWGhgEQZyfxyTvoXHQ= diff --git a/exporter/awsemfexporter/go.mod b/exporter/awsemfexporter/go.mod index 57e59e8a3809f..8133be3e14977 100644 --- a/exporter/awsemfexporter/go.mod +++ b/exporter/awsemfexporter/go.mod @@ -17,7 +17,7 @@ require ( github.com/open-telemetry/opentelemetry-collector-contrib/internal/aws v0.0.0-00010101000000-000000000000 github.com/pelletier/go-toml v1.8.0 // indirect github.com/stretchr/testify v1.7.0 - go.opentelemetry.io/collector v0.22.1-0.20210322181726-3b1392387bf2 + go.opentelemetry.io/collector v0.22.1-0.20210323150444-0c6757ec71a5 go.opentelemetry.io/otel v0.18.0 go.uber.org/zap v1.16.0 google.golang.org/protobuf v1.26.0 diff --git a/exporter/awsemfexporter/go.sum b/exporter/awsemfexporter/go.sum index f638b68d5c24b..a7604b60ba5e3 100644 --- a/exporter/awsemfexporter/go.sum +++ b/exporter/awsemfexporter/go.sum @@ -1051,8 +1051,8 @@ 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.22.1-0.20210322181726-3b1392387bf2 h1:EHW+2owVU4hg5f0sDhxdsIXYmUJSmV6H1KAMwLOC8LM= -go.opentelemetry.io/collector v0.22.1-0.20210322181726-3b1392387bf2/go.mod h1:wMTwy0/4xrFRZj/XX1UH5VAd0WAVts9Rq7ZKQldCIkU= +go.opentelemetry.io/collector v0.22.1-0.20210323150444-0c6757ec71a5 h1:uYfkVpGK++c0AmXdCWh9jhAZ3PiFvhe+7lcyF4eqdqc= +go.opentelemetry.io/collector v0.22.1-0.20210323150444-0c6757ec71a5/go.mod h1:wMTwy0/4xrFRZj/XX1UH5VAd0WAVts9Rq7ZKQldCIkU= go.opentelemetry.io/otel v0.18.0 h1:d5Of7+Zw4ANFOJB+TIn2K3QWsgS2Ht7OU9DqZHI6qu8= go.opentelemetry.io/otel v0.18.0/go.mod h1:PT5zQj4lTsR1YeARt8YNKcFb88/c2IKoSABK9mX0r78= go.opentelemetry.io/otel/metric v0.18.0/go.mod h1:kEH2QtzAyBy3xDVQfGZKIcok4ZZFvd5xyKPfPcuK6pE= diff --git a/exporter/awskinesisexporter/go.mod b/exporter/awskinesisexporter/go.mod index 14f1a61cef1d5..3a299c9a26317 100644 --- a/exporter/awskinesisexporter/go.mod +++ b/exporter/awskinesisexporter/go.mod @@ -12,7 +12,7 @@ require ( github.com/pelletier/go-toml v1.8.0 // indirect github.com/signalfx/opencensus-go-exporter-kinesis v0.6.3 github.com/stretchr/testify v1.7.0 - go.opentelemetry.io/collector v0.22.1-0.20210322181726-3b1392387bf2 + go.opentelemetry.io/collector v0.22.1-0.20210323150444-0c6757ec71a5 go.uber.org/zap v1.16.0 gopkg.in/ini.v1 v1.57.0 // indirect ) diff --git a/exporter/awskinesisexporter/go.sum b/exporter/awskinesisexporter/go.sum index ea7925d61a5cf..b542c168d60a1 100644 --- a/exporter/awskinesisexporter/go.sum +++ b/exporter/awskinesisexporter/go.sum @@ -1081,8 +1081,8 @@ 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.22.1-0.20210322181726-3b1392387bf2 h1:EHW+2owVU4hg5f0sDhxdsIXYmUJSmV6H1KAMwLOC8LM= -go.opentelemetry.io/collector v0.22.1-0.20210322181726-3b1392387bf2/go.mod h1:wMTwy0/4xrFRZj/XX1UH5VAd0WAVts9Rq7ZKQldCIkU= +go.opentelemetry.io/collector v0.22.1-0.20210323150444-0c6757ec71a5 h1:uYfkVpGK++c0AmXdCWh9jhAZ3PiFvhe+7lcyF4eqdqc= +go.opentelemetry.io/collector v0.22.1-0.20210323150444-0c6757ec71a5/go.mod h1:wMTwy0/4xrFRZj/XX1UH5VAd0WAVts9Rq7ZKQldCIkU= go.uber.org/atomic v1.3.2/go.mod h1:gD2HeocX3+yG+ygLZcrzQJaqmWj9AIm7n08wl/qW/PE= go.uber.org/atomic v1.4.0/go.mod h1:gD2HeocX3+yG+ygLZcrzQJaqmWj9AIm7n08wl/qW/PE= go.uber.org/atomic v1.5.0/go.mod h1:sABNBOSYdrvTF6hTgEIbc7YasKWGhgEQZyfxyTvoXHQ= diff --git a/exporter/awsprometheusremotewriteexporter/go.mod b/exporter/awsprometheusremotewriteexporter/go.mod index 6e8078740551f..3147b1019a2f8 100644 --- a/exporter/awsprometheusremotewriteexporter/go.mod +++ b/exporter/awsprometheusremotewriteexporter/go.mod @@ -13,7 +13,7 @@ require ( github.com/onsi/gomega v1.10.2 // indirect github.com/pelletier/go-toml v1.8.0 // indirect github.com/stretchr/testify v1.7.0 - go.opentelemetry.io/collector v0.22.1-0.20210322181726-3b1392387bf2 + go.opentelemetry.io/collector v0.22.1-0.20210323150444-0c6757ec71a5 go.uber.org/zap v1.16.0 gopkg.in/ini.v1 v1.57.0 // indirect ) diff --git a/exporter/awsprometheusremotewriteexporter/go.sum b/exporter/awsprometheusremotewriteexporter/go.sum index e10a736c7d4ae..49867bc9cf7bf 100644 --- a/exporter/awsprometheusremotewriteexporter/go.sum +++ b/exporter/awsprometheusremotewriteexporter/go.sum @@ -1051,8 +1051,8 @@ 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.22.1-0.20210322181726-3b1392387bf2 h1:EHW+2owVU4hg5f0sDhxdsIXYmUJSmV6H1KAMwLOC8LM= -go.opentelemetry.io/collector v0.22.1-0.20210322181726-3b1392387bf2/go.mod h1:wMTwy0/4xrFRZj/XX1UH5VAd0WAVts9Rq7ZKQldCIkU= +go.opentelemetry.io/collector v0.22.1-0.20210323150444-0c6757ec71a5 h1:uYfkVpGK++c0AmXdCWh9jhAZ3PiFvhe+7lcyF4eqdqc= +go.opentelemetry.io/collector v0.22.1-0.20210323150444-0c6757ec71a5/go.mod h1:wMTwy0/4xrFRZj/XX1UH5VAd0WAVts9Rq7ZKQldCIkU= go.uber.org/atomic v1.3.2/go.mod h1:gD2HeocX3+yG+ygLZcrzQJaqmWj9AIm7n08wl/qW/PE= go.uber.org/atomic v1.4.0/go.mod h1:gD2HeocX3+yG+ygLZcrzQJaqmWj9AIm7n08wl/qW/PE= go.uber.org/atomic v1.5.0/go.mod h1:sABNBOSYdrvTF6hTgEIbc7YasKWGhgEQZyfxyTvoXHQ= diff --git a/exporter/awsxrayexporter/go.mod b/exporter/awsxrayexporter/go.mod index 38696276b1e85..53b919e7b7fa4 100644 --- a/exporter/awsxrayexporter/go.mod +++ b/exporter/awsxrayexporter/go.mod @@ -14,7 +14,7 @@ require ( github.com/open-telemetry/opentelemetry-collector-contrib/internal/awsxray v0.0.0-00010101000000-000000000000 github.com/pelletier/go-toml v1.8.0 // indirect github.com/stretchr/testify v1.7.0 - go.opentelemetry.io/collector v0.22.1-0.20210322181726-3b1392387bf2 + go.opentelemetry.io/collector v0.22.1-0.20210323150444-0c6757ec71a5 go.uber.org/zap v1.16.0 golang.org/x/net v0.0.0-20210119194325-5f4716e94777 gopkg.in/ini.v1 v1.57.0 // indirect diff --git a/exporter/awsxrayexporter/go.sum b/exporter/awsxrayexporter/go.sum index e10a736c7d4ae..49867bc9cf7bf 100644 --- a/exporter/awsxrayexporter/go.sum +++ b/exporter/awsxrayexporter/go.sum @@ -1051,8 +1051,8 @@ 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.22.1-0.20210322181726-3b1392387bf2 h1:EHW+2owVU4hg5f0sDhxdsIXYmUJSmV6H1KAMwLOC8LM= -go.opentelemetry.io/collector v0.22.1-0.20210322181726-3b1392387bf2/go.mod h1:wMTwy0/4xrFRZj/XX1UH5VAd0WAVts9Rq7ZKQldCIkU= +go.opentelemetry.io/collector v0.22.1-0.20210323150444-0c6757ec71a5 h1:uYfkVpGK++c0AmXdCWh9jhAZ3PiFvhe+7lcyF4eqdqc= +go.opentelemetry.io/collector v0.22.1-0.20210323150444-0c6757ec71a5/go.mod h1:wMTwy0/4xrFRZj/XX1UH5VAd0WAVts9Rq7ZKQldCIkU= go.uber.org/atomic v1.3.2/go.mod h1:gD2HeocX3+yG+ygLZcrzQJaqmWj9AIm7n08wl/qW/PE= go.uber.org/atomic v1.4.0/go.mod h1:gD2HeocX3+yG+ygLZcrzQJaqmWj9AIm7n08wl/qW/PE= go.uber.org/atomic v1.5.0/go.mod h1:sABNBOSYdrvTF6hTgEIbc7YasKWGhgEQZyfxyTvoXHQ= diff --git a/exporter/azuremonitorexporter/go.mod b/exporter/azuremonitorexporter/go.mod index ffed2a51c586e..103274c911f3d 100644 --- a/exporter/azuremonitorexporter/go.mod +++ b/exporter/azuremonitorexporter/go.mod @@ -15,7 +15,7 @@ require ( github.com/pelletier/go-toml v1.8.0 // indirect github.com/stretchr/testify v1.7.0 github.com/tedsuo/ifrit v0.0.0-20191009134036-9a97d0632f00 // indirect - go.opentelemetry.io/collector v0.22.1-0.20210322181726-3b1392387bf2 + go.opentelemetry.io/collector v0.22.1-0.20210323150444-0c6757ec71a5 go.uber.org/zap v1.16.0 golang.org/x/net v0.0.0-20210119194325-5f4716e94777 gopkg.in/ini.v1 v1.57.0 // indirect diff --git a/exporter/azuremonitorexporter/go.sum b/exporter/azuremonitorexporter/go.sum index c51dc192747b8..d4d6d895724f0 100644 --- a/exporter/azuremonitorexporter/go.sum +++ b/exporter/azuremonitorexporter/go.sum @@ -1061,8 +1061,8 @@ 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.22.1-0.20210322181726-3b1392387bf2 h1:EHW+2owVU4hg5f0sDhxdsIXYmUJSmV6H1KAMwLOC8LM= -go.opentelemetry.io/collector v0.22.1-0.20210322181726-3b1392387bf2/go.mod h1:wMTwy0/4xrFRZj/XX1UH5VAd0WAVts9Rq7ZKQldCIkU= +go.opentelemetry.io/collector v0.22.1-0.20210323150444-0c6757ec71a5 h1:uYfkVpGK++c0AmXdCWh9jhAZ3PiFvhe+7lcyF4eqdqc= +go.opentelemetry.io/collector v0.22.1-0.20210323150444-0c6757ec71a5/go.mod h1:wMTwy0/4xrFRZj/XX1UH5VAd0WAVts9Rq7ZKQldCIkU= go.uber.org/atomic v1.3.2/go.mod h1:gD2HeocX3+yG+ygLZcrzQJaqmWj9AIm7n08wl/qW/PE= go.uber.org/atomic v1.4.0/go.mod h1:gD2HeocX3+yG+ygLZcrzQJaqmWj9AIm7n08wl/qW/PE= go.uber.org/atomic v1.5.0/go.mod h1:sABNBOSYdrvTF6hTgEIbc7YasKWGhgEQZyfxyTvoXHQ= diff --git a/exporter/carbonexporter/go.mod b/exporter/carbonexporter/go.mod index bf6933c0bda98..f78aead05bb3c 100644 --- a/exporter/carbonexporter/go.mod +++ b/exporter/carbonexporter/go.mod @@ -13,7 +13,7 @@ require ( github.com/onsi/gomega v1.10.2 // indirect github.com/pelletier/go-toml v1.8.0 // indirect github.com/stretchr/testify v1.7.0 - go.opentelemetry.io/collector v0.22.1-0.20210322181726-3b1392387bf2 + go.opentelemetry.io/collector v0.22.1-0.20210323150444-0c6757ec71a5 go.uber.org/zap v1.16.0 google.golang.org/protobuf v1.26.0 gopkg.in/ini.v1 v1.57.0 // indirect diff --git a/exporter/carbonexporter/go.sum b/exporter/carbonexporter/go.sum index d027be7f19525..7ba6c61b2829b 100644 --- a/exporter/carbonexporter/go.sum +++ b/exporter/carbonexporter/go.sum @@ -1050,8 +1050,8 @@ 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.22.1-0.20210322181726-3b1392387bf2 h1:EHW+2owVU4hg5f0sDhxdsIXYmUJSmV6H1KAMwLOC8LM= -go.opentelemetry.io/collector v0.22.1-0.20210322181726-3b1392387bf2/go.mod h1:wMTwy0/4xrFRZj/XX1UH5VAd0WAVts9Rq7ZKQldCIkU= +go.opentelemetry.io/collector v0.22.1-0.20210323150444-0c6757ec71a5 h1:uYfkVpGK++c0AmXdCWh9jhAZ3PiFvhe+7lcyF4eqdqc= +go.opentelemetry.io/collector v0.22.1-0.20210323150444-0c6757ec71a5/go.mod h1:wMTwy0/4xrFRZj/XX1UH5VAd0WAVts9Rq7ZKQldCIkU= go.uber.org/atomic v1.3.2/go.mod h1:gD2HeocX3+yG+ygLZcrzQJaqmWj9AIm7n08wl/qW/PE= go.uber.org/atomic v1.4.0/go.mod h1:gD2HeocX3+yG+ygLZcrzQJaqmWj9AIm7n08wl/qW/PE= go.uber.org/atomic v1.5.0/go.mod h1:sABNBOSYdrvTF6hTgEIbc7YasKWGhgEQZyfxyTvoXHQ= diff --git a/exporter/datadogexporter/go.mod b/exporter/datadogexporter/go.mod index 4168756dc1187..ed4b8a32888c8 100644 --- a/exporter/datadogexporter/go.mod +++ b/exporter/datadogexporter/go.mod @@ -19,7 +19,7 @@ require ( github.com/pelletier/go-toml v1.8.0 // indirect github.com/stretchr/testify v1.7.0 github.com/zorkian/go-datadog-api v2.29.0+incompatible // indirect - go.opentelemetry.io/collector v0.22.1-0.20210322181726-3b1392387bf2 + go.opentelemetry.io/collector v0.22.1-0.20210323150444-0c6757ec71a5 go.uber.org/zap v1.16.0 gopkg.in/DataDog/dd-trace-go.v1 v1.28.0 gopkg.in/ini.v1 v1.57.0 // indirect diff --git a/exporter/datadogexporter/go.sum b/exporter/datadogexporter/go.sum index 392ed3cfbbb2f..29cf5a5ea6ab0 100644 --- a/exporter/datadogexporter/go.sum +++ b/exporter/datadogexporter/go.sum @@ -1081,8 +1081,8 @@ 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.22.1-0.20210322181726-3b1392387bf2 h1:EHW+2owVU4hg5f0sDhxdsIXYmUJSmV6H1KAMwLOC8LM= -go.opentelemetry.io/collector v0.22.1-0.20210322181726-3b1392387bf2/go.mod h1:wMTwy0/4xrFRZj/XX1UH5VAd0WAVts9Rq7ZKQldCIkU= +go.opentelemetry.io/collector v0.22.1-0.20210323150444-0c6757ec71a5 h1:uYfkVpGK++c0AmXdCWh9jhAZ3PiFvhe+7lcyF4eqdqc= +go.opentelemetry.io/collector v0.22.1-0.20210323150444-0c6757ec71a5/go.mod h1:wMTwy0/4xrFRZj/XX1UH5VAd0WAVts9Rq7ZKQldCIkU= go.uber.org/atomic v1.3.2/go.mod h1:gD2HeocX3+yG+ygLZcrzQJaqmWj9AIm7n08wl/qW/PE= go.uber.org/atomic v1.4.0/go.mod h1:gD2HeocX3+yG+ygLZcrzQJaqmWj9AIm7n08wl/qW/PE= go.uber.org/atomic v1.5.0/go.mod h1:sABNBOSYdrvTF6hTgEIbc7YasKWGhgEQZyfxyTvoXHQ= diff --git a/exporter/dynatraceexporter/go.mod b/exporter/dynatraceexporter/go.mod index ffa38b24c7427..c7ad2c5a5d850 100644 --- a/exporter/dynatraceexporter/go.mod +++ b/exporter/dynatraceexporter/go.mod @@ -12,7 +12,7 @@ require ( github.com/onsi/gomega v1.10.2 // indirect github.com/pelletier/go-toml v1.8.0 // indirect github.com/stretchr/testify v1.7.0 - go.opentelemetry.io/collector v0.22.1-0.20210322181726-3b1392387bf2 + go.opentelemetry.io/collector v0.22.1-0.20210323150444-0c6757ec71a5 go.uber.org/zap v1.16.0 gopkg.in/ini.v1 v1.57.0 // indirect ) diff --git a/exporter/dynatraceexporter/go.sum b/exporter/dynatraceexporter/go.sum index d027be7f19525..7ba6c61b2829b 100644 --- a/exporter/dynatraceexporter/go.sum +++ b/exporter/dynatraceexporter/go.sum @@ -1050,8 +1050,8 @@ 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.22.1-0.20210322181726-3b1392387bf2 h1:EHW+2owVU4hg5f0sDhxdsIXYmUJSmV6H1KAMwLOC8LM= -go.opentelemetry.io/collector v0.22.1-0.20210322181726-3b1392387bf2/go.mod h1:wMTwy0/4xrFRZj/XX1UH5VAd0WAVts9Rq7ZKQldCIkU= +go.opentelemetry.io/collector v0.22.1-0.20210323150444-0c6757ec71a5 h1:uYfkVpGK++c0AmXdCWh9jhAZ3PiFvhe+7lcyF4eqdqc= +go.opentelemetry.io/collector v0.22.1-0.20210323150444-0c6757ec71a5/go.mod h1:wMTwy0/4xrFRZj/XX1UH5VAd0WAVts9Rq7ZKQldCIkU= go.uber.org/atomic v1.3.2/go.mod h1:gD2HeocX3+yG+ygLZcrzQJaqmWj9AIm7n08wl/qW/PE= go.uber.org/atomic v1.4.0/go.mod h1:gD2HeocX3+yG+ygLZcrzQJaqmWj9AIm7n08wl/qW/PE= go.uber.org/atomic v1.5.0/go.mod h1:sABNBOSYdrvTF6hTgEIbc7YasKWGhgEQZyfxyTvoXHQ= diff --git a/exporter/elasticexporter/go.mod b/exporter/elasticexporter/go.mod index 540731543df38..de09b71c161cd 100644 --- a/exporter/elasticexporter/go.mod +++ b/exporter/elasticexporter/go.mod @@ -16,7 +16,7 @@ require ( github.com/stretchr/testify v1.7.0 go.elastic.co/apm v1.9.1-0.20201218004853-18a8126106c6 go.elastic.co/fastjson v1.1.0 - go.opentelemetry.io/collector v0.22.1-0.20210322181726-3b1392387bf2 + go.opentelemetry.io/collector v0.22.1-0.20210323150444-0c6757ec71a5 go.uber.org/zap v1.16.0 gopkg.in/ini.v1 v1.57.0 // indirect howett.net/plist v0.0.0-20201026045517-117a925f2150 // indirect diff --git a/exporter/elasticexporter/go.sum b/exporter/elasticexporter/go.sum index a5506b2c59b88..93761db5f52d9 100644 --- a/exporter/elasticexporter/go.sum +++ b/exporter/elasticexporter/go.sum @@ -1069,8 +1069,8 @@ 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.22.1-0.20210322181726-3b1392387bf2 h1:EHW+2owVU4hg5f0sDhxdsIXYmUJSmV6H1KAMwLOC8LM= -go.opentelemetry.io/collector v0.22.1-0.20210322181726-3b1392387bf2/go.mod h1:wMTwy0/4xrFRZj/XX1UH5VAd0WAVts9Rq7ZKQldCIkU= +go.opentelemetry.io/collector v0.22.1-0.20210323150444-0c6757ec71a5 h1:uYfkVpGK++c0AmXdCWh9jhAZ3PiFvhe+7lcyF4eqdqc= +go.opentelemetry.io/collector v0.22.1-0.20210323150444-0c6757ec71a5/go.mod h1:wMTwy0/4xrFRZj/XX1UH5VAd0WAVts9Rq7ZKQldCIkU= go.uber.org/atomic v1.3.2/go.mod h1:gD2HeocX3+yG+ygLZcrzQJaqmWj9AIm7n08wl/qW/PE= go.uber.org/atomic v1.4.0/go.mod h1:gD2HeocX3+yG+ygLZcrzQJaqmWj9AIm7n08wl/qW/PE= go.uber.org/atomic v1.5.0/go.mod h1:sABNBOSYdrvTF6hTgEIbc7YasKWGhgEQZyfxyTvoXHQ= diff --git a/exporter/elasticsearchexporter/go.mod b/exporter/elasticsearchexporter/go.mod index bd996bde4fb51..72f97e47f4ff2 100644 --- a/exporter/elasticsearchexporter/go.mod +++ b/exporter/elasticsearchexporter/go.mod @@ -14,7 +14,7 @@ require ( github.com/onsi/gomega v1.10.2 // indirect github.com/pelletier/go-toml v1.8.0 // indirect github.com/stretchr/testify v1.7.0 - go.opentelemetry.io/collector v0.22.1-0.20210322181726-3b1392387bf2 + go.opentelemetry.io/collector v0.22.1-0.20210323150444-0c6757ec71a5 go.uber.org/zap v1.16.0 gopkg.in/ini.v1 v1.57.0 // indirect ) diff --git a/exporter/elasticsearchexporter/go.sum b/exporter/elasticsearchexporter/go.sum index f846cdfd6b0d7..ac5bd8ed5c664 100644 --- a/exporter/elasticsearchexporter/go.sum +++ b/exporter/elasticsearchexporter/go.sum @@ -1052,8 +1052,8 @@ 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.22.1-0.20210322181726-3b1392387bf2 h1:EHW+2owVU4hg5f0sDhxdsIXYmUJSmV6H1KAMwLOC8LM= -go.opentelemetry.io/collector v0.22.1-0.20210322181726-3b1392387bf2/go.mod h1:wMTwy0/4xrFRZj/XX1UH5VAd0WAVts9Rq7ZKQldCIkU= +go.opentelemetry.io/collector v0.22.1-0.20210323150444-0c6757ec71a5 h1:uYfkVpGK++c0AmXdCWh9jhAZ3PiFvhe+7lcyF4eqdqc= +go.opentelemetry.io/collector v0.22.1-0.20210323150444-0c6757ec71a5/go.mod h1:wMTwy0/4xrFRZj/XX1UH5VAd0WAVts9Rq7ZKQldCIkU= go.uber.org/atomic v1.3.2/go.mod h1:gD2HeocX3+yG+ygLZcrzQJaqmWj9AIm7n08wl/qW/PE= go.uber.org/atomic v1.4.0/go.mod h1:gD2HeocX3+yG+ygLZcrzQJaqmWj9AIm7n08wl/qW/PE= go.uber.org/atomic v1.5.0/go.mod h1:sABNBOSYdrvTF6hTgEIbc7YasKWGhgEQZyfxyTvoXHQ= diff --git a/exporter/f5cloudexporter/go.mod b/exporter/f5cloudexporter/go.mod index 21a75ca41a128..c7513b19bcb11 100644 --- a/exporter/f5cloudexporter/go.mod +++ b/exporter/f5cloudexporter/go.mod @@ -12,7 +12,7 @@ require ( github.com/onsi/gomega v1.10.2 // indirect github.com/pelletier/go-toml v1.8.0 // indirect github.com/stretchr/testify v1.7.0 - go.opentelemetry.io/collector v0.22.1-0.20210322181726-3b1392387bf2 + go.opentelemetry.io/collector v0.22.1-0.20210323150444-0c6757ec71a5 go.uber.org/zap v1.16.0 golang.org/x/oauth2 v0.0.0-20210313182246-cd4f82c27b84 google.golang.org/api v0.42.0 diff --git a/exporter/f5cloudexporter/go.sum b/exporter/f5cloudexporter/go.sum index e859e8be65a54..cd47523d05a7b 100644 --- a/exporter/f5cloudexporter/go.sum +++ b/exporter/f5cloudexporter/go.sum @@ -1055,8 +1055,8 @@ 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.22.1-0.20210322181726-3b1392387bf2 h1:EHW+2owVU4hg5f0sDhxdsIXYmUJSmV6H1KAMwLOC8LM= -go.opentelemetry.io/collector v0.22.1-0.20210322181726-3b1392387bf2/go.mod h1:wMTwy0/4xrFRZj/XX1UH5VAd0WAVts9Rq7ZKQldCIkU= +go.opentelemetry.io/collector v0.22.1-0.20210323150444-0c6757ec71a5 h1:uYfkVpGK++c0AmXdCWh9jhAZ3PiFvhe+7lcyF4eqdqc= +go.opentelemetry.io/collector v0.22.1-0.20210323150444-0c6757ec71a5/go.mod h1:wMTwy0/4xrFRZj/XX1UH5VAd0WAVts9Rq7ZKQldCIkU= go.uber.org/atomic v1.3.2/go.mod h1:gD2HeocX3+yG+ygLZcrzQJaqmWj9AIm7n08wl/qW/PE= go.uber.org/atomic v1.4.0/go.mod h1:gD2HeocX3+yG+ygLZcrzQJaqmWj9AIm7n08wl/qW/PE= go.uber.org/atomic v1.5.0/go.mod h1:sABNBOSYdrvTF6hTgEIbc7YasKWGhgEQZyfxyTvoXHQ= diff --git a/exporter/googlecloudexporter/go.mod b/exporter/googlecloudexporter/go.mod index 4ad617133168d..ca003ba25c16f 100644 --- a/exporter/googlecloudexporter/go.mod +++ b/exporter/googlecloudexporter/go.mod @@ -16,7 +16,7 @@ require ( github.com/pelletier/go-toml v1.8.0 // indirect github.com/stretchr/testify v1.7.0 go.opencensus.io v0.23.0 - go.opentelemetry.io/collector v0.22.1-0.20210322181726-3b1392387bf2 + go.opentelemetry.io/collector v0.22.1-0.20210323150444-0c6757ec71a5 go.opentelemetry.io/otel v0.18.0 go.opentelemetry.io/otel/sdk v0.18.0 go.opentelemetry.io/otel/trace v0.18.0 diff --git a/exporter/googlecloudexporter/go.sum b/exporter/googlecloudexporter/go.sum index 5286867f937f2..f0331579a8ead 100644 --- a/exporter/googlecloudexporter/go.sum +++ b/exporter/googlecloudexporter/go.sum @@ -1063,8 +1063,8 @@ 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.22.1-0.20210322181726-3b1392387bf2 h1:EHW+2owVU4hg5f0sDhxdsIXYmUJSmV6H1KAMwLOC8LM= -go.opentelemetry.io/collector v0.22.1-0.20210322181726-3b1392387bf2/go.mod h1:wMTwy0/4xrFRZj/XX1UH5VAd0WAVts9Rq7ZKQldCIkU= +go.opentelemetry.io/collector v0.22.1-0.20210323150444-0c6757ec71a5 h1:uYfkVpGK++c0AmXdCWh9jhAZ3PiFvhe+7lcyF4eqdqc= +go.opentelemetry.io/collector v0.22.1-0.20210323150444-0c6757ec71a5/go.mod h1:wMTwy0/4xrFRZj/XX1UH5VAd0WAVts9Rq7ZKQldCIkU= go.opentelemetry.io/otel v0.18.0 h1:d5Of7+Zw4ANFOJB+TIn2K3QWsgS2Ht7OU9DqZHI6qu8= go.opentelemetry.io/otel v0.18.0/go.mod h1:PT5zQj4lTsR1YeARt8YNKcFb88/c2IKoSABK9mX0r78= go.opentelemetry.io/otel/metric v0.18.0 h1:yuZCmY9e1ZTaMlZXLrrbAPmYW6tW1A5ozOZeOYGaTaY= diff --git a/exporter/honeycombexporter/go.mod b/exporter/honeycombexporter/go.mod index 12c489887811b..847073493cb76 100644 --- a/exporter/honeycombexporter/go.mod +++ b/exporter/honeycombexporter/go.mod @@ -16,7 +16,7 @@ require ( github.com/onsi/gomega v1.10.2 // indirect github.com/pelletier/go-toml v1.8.0 // indirect github.com/stretchr/testify v1.7.0 - go.opentelemetry.io/collector v0.22.1-0.20210322181726-3b1392387bf2 + go.opentelemetry.io/collector v0.22.1-0.20210323150444-0c6757ec71a5 go.uber.org/zap v1.16.0 google.golang.org/protobuf v1.26.0 gopkg.in/ini.v1 v1.57.0 // indirect diff --git a/exporter/honeycombexporter/go.sum b/exporter/honeycombexporter/go.sum index 3e475869ee038..62bf14791f042 100644 --- a/exporter/honeycombexporter/go.sum +++ b/exporter/honeycombexporter/go.sum @@ -1072,8 +1072,8 @@ 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.22.1-0.20210322181726-3b1392387bf2 h1:EHW+2owVU4hg5f0sDhxdsIXYmUJSmV6H1KAMwLOC8LM= -go.opentelemetry.io/collector v0.22.1-0.20210322181726-3b1392387bf2/go.mod h1:wMTwy0/4xrFRZj/XX1UH5VAd0WAVts9Rq7ZKQldCIkU= +go.opentelemetry.io/collector v0.22.1-0.20210323150444-0c6757ec71a5 h1:uYfkVpGK++c0AmXdCWh9jhAZ3PiFvhe+7lcyF4eqdqc= +go.opentelemetry.io/collector v0.22.1-0.20210323150444-0c6757ec71a5/go.mod h1:wMTwy0/4xrFRZj/XX1UH5VAd0WAVts9Rq7ZKQldCIkU= go.uber.org/atomic v1.3.2/go.mod h1:gD2HeocX3+yG+ygLZcrzQJaqmWj9AIm7n08wl/qW/PE= go.uber.org/atomic v1.4.0/go.mod h1:gD2HeocX3+yG+ygLZcrzQJaqmWj9AIm7n08wl/qW/PE= go.uber.org/atomic v1.5.0/go.mod h1:sABNBOSYdrvTF6hTgEIbc7YasKWGhgEQZyfxyTvoXHQ= diff --git a/exporter/jaegerthrifthttpexporter/go.mod b/exporter/jaegerthrifthttpexporter/go.mod index 4723ea28e512c..fa81956371f2e 100644 --- a/exporter/jaegerthrifthttpexporter/go.mod +++ b/exporter/jaegerthrifthttpexporter/go.mod @@ -16,7 +16,7 @@ require ( github.com/onsi/gomega v1.10.2 // indirect github.com/pelletier/go-toml v1.8.0 // indirect github.com/stretchr/testify v1.7.0 - go.opentelemetry.io/collector v0.22.1-0.20210322181726-3b1392387bf2 + go.opentelemetry.io/collector v0.22.1-0.20210323150444-0c6757ec71a5 go.uber.org/zap v1.16.0 google.golang.org/protobuf v1.26.0 gopkg.in/ini.v1 v1.57.0 // indirect diff --git a/exporter/jaegerthrifthttpexporter/go.sum b/exporter/jaegerthrifthttpexporter/go.sum index d027be7f19525..7ba6c61b2829b 100644 --- a/exporter/jaegerthrifthttpexporter/go.sum +++ b/exporter/jaegerthrifthttpexporter/go.sum @@ -1050,8 +1050,8 @@ 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.22.1-0.20210322181726-3b1392387bf2 h1:EHW+2owVU4hg5f0sDhxdsIXYmUJSmV6H1KAMwLOC8LM= -go.opentelemetry.io/collector v0.22.1-0.20210322181726-3b1392387bf2/go.mod h1:wMTwy0/4xrFRZj/XX1UH5VAd0WAVts9Rq7ZKQldCIkU= +go.opentelemetry.io/collector v0.22.1-0.20210323150444-0c6757ec71a5 h1:uYfkVpGK++c0AmXdCWh9jhAZ3PiFvhe+7lcyF4eqdqc= +go.opentelemetry.io/collector v0.22.1-0.20210323150444-0c6757ec71a5/go.mod h1:wMTwy0/4xrFRZj/XX1UH5VAd0WAVts9Rq7ZKQldCIkU= go.uber.org/atomic v1.3.2/go.mod h1:gD2HeocX3+yG+ygLZcrzQJaqmWj9AIm7n08wl/qW/PE= go.uber.org/atomic v1.4.0/go.mod h1:gD2HeocX3+yG+ygLZcrzQJaqmWj9AIm7n08wl/qW/PE= go.uber.org/atomic v1.5.0/go.mod h1:sABNBOSYdrvTF6hTgEIbc7YasKWGhgEQZyfxyTvoXHQ= diff --git a/exporter/loadbalancingexporter/go.mod b/exporter/loadbalancingexporter/go.mod index fde1c91854aac..35663125820a8 100644 --- a/exporter/loadbalancingexporter/go.mod +++ b/exporter/loadbalancingexporter/go.mod @@ -6,7 +6,7 @@ require ( github.com/open-telemetry/opentelemetry-collector-contrib/pkg/batchpersignal v0.0.0-00010101000000-000000000000 github.com/stretchr/testify v1.7.0 go.opencensus.io v0.23.0 - go.opentelemetry.io/collector v0.22.1-0.20210322181726-3b1392387bf2 + go.opentelemetry.io/collector v0.22.1-0.20210323150444-0c6757ec71a5 go.uber.org/zap v1.16.0 ) diff --git a/exporter/loadbalancingexporter/go.sum b/exporter/loadbalancingexporter/go.sum index 3fbabe7cadd8b..975295b6a3a40 100644 --- a/exporter/loadbalancingexporter/go.sum +++ b/exporter/loadbalancingexporter/go.sum @@ -1030,8 +1030,8 @@ 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.22.1-0.20210322181726-3b1392387bf2 h1:EHW+2owVU4hg5f0sDhxdsIXYmUJSmV6H1KAMwLOC8LM= -go.opentelemetry.io/collector v0.22.1-0.20210322181726-3b1392387bf2/go.mod h1:wMTwy0/4xrFRZj/XX1UH5VAd0WAVts9Rq7ZKQldCIkU= +go.opentelemetry.io/collector v0.22.1-0.20210323150444-0c6757ec71a5 h1:uYfkVpGK++c0AmXdCWh9jhAZ3PiFvhe+7lcyF4eqdqc= +go.opentelemetry.io/collector v0.22.1-0.20210323150444-0c6757ec71a5/go.mod h1:wMTwy0/4xrFRZj/XX1UH5VAd0WAVts9Rq7ZKQldCIkU= go.uber.org/atomic v1.3.2/go.mod h1:gD2HeocX3+yG+ygLZcrzQJaqmWj9AIm7n08wl/qW/PE= go.uber.org/atomic v1.4.0/go.mod h1:gD2HeocX3+yG+ygLZcrzQJaqmWj9AIm7n08wl/qW/PE= go.uber.org/atomic v1.5.0/go.mod h1:sABNBOSYdrvTF6hTgEIbc7YasKWGhgEQZyfxyTvoXHQ= diff --git a/exporter/logzioexporter/go.mod b/exporter/logzioexporter/go.mod index b2be5cb26784c..6e739847b658c 100644 --- a/exporter/logzioexporter/go.mod +++ b/exporter/logzioexporter/go.mod @@ -16,7 +16,7 @@ require ( github.com/onsi/gomega v1.10.2 // indirect github.com/pelletier/go-toml v1.8.0 // indirect github.com/stretchr/testify v1.7.0 - go.opentelemetry.io/collector v0.22.1-0.20210322181726-3b1392387bf2 + go.opentelemetry.io/collector v0.22.1-0.20210323150444-0c6757ec71a5 go.uber.org/zap v1.16.0 google.golang.org/protobuf v1.26.0 gopkg.in/ini.v1 v1.57.0 // indirect diff --git a/exporter/logzioexporter/go.sum b/exporter/logzioexporter/go.sum index f50d2c1ace241..8adb212ea5ae9 100644 --- a/exporter/logzioexporter/go.sum +++ b/exporter/logzioexporter/go.sum @@ -1081,8 +1081,8 @@ 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.22.1-0.20210322181726-3b1392387bf2 h1:EHW+2owVU4hg5f0sDhxdsIXYmUJSmV6H1KAMwLOC8LM= -go.opentelemetry.io/collector v0.22.1-0.20210322181726-3b1392387bf2/go.mod h1:wMTwy0/4xrFRZj/XX1UH5VAd0WAVts9Rq7ZKQldCIkU= +go.opentelemetry.io/collector v0.22.1-0.20210323150444-0c6757ec71a5 h1:uYfkVpGK++c0AmXdCWh9jhAZ3PiFvhe+7lcyF4eqdqc= +go.opentelemetry.io/collector v0.22.1-0.20210323150444-0c6757ec71a5/go.mod h1:wMTwy0/4xrFRZj/XX1UH5VAd0WAVts9Rq7ZKQldCIkU= go.uber.org/atomic v1.3.2/go.mod h1:gD2HeocX3+yG+ygLZcrzQJaqmWj9AIm7n08wl/qW/PE= go.uber.org/atomic v1.4.0/go.mod h1:gD2HeocX3+yG+ygLZcrzQJaqmWj9AIm7n08wl/qW/PE= go.uber.org/atomic v1.5.0/go.mod h1:sABNBOSYdrvTF6hTgEIbc7YasKWGhgEQZyfxyTvoXHQ= diff --git a/exporter/lokiexporter/go.mod b/exporter/lokiexporter/go.mod index edcb1d00de787..9efb043daf9f0 100644 --- a/exporter/lokiexporter/go.mod +++ b/exporter/lokiexporter/go.mod @@ -16,7 +16,7 @@ require ( github.com/prometheus/common v0.19.0 github.com/prometheus/prometheus v1.8.2-0.20210217141258-a6be548dbc17 github.com/stretchr/testify v1.7.0 - go.opentelemetry.io/collector v0.22.1-0.20210322181726-3b1392387bf2 + go.opentelemetry.io/collector v0.22.1-0.20210323150444-0c6757ec71a5 go.uber.org/zap v1.16.0 google.golang.org/grpc v1.36.0 gopkg.in/ini.v1 v1.57.0 // indirect diff --git a/exporter/lokiexporter/go.sum b/exporter/lokiexporter/go.sum index d027be7f19525..7ba6c61b2829b 100644 --- a/exporter/lokiexporter/go.sum +++ b/exporter/lokiexporter/go.sum @@ -1050,8 +1050,8 @@ 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.22.1-0.20210322181726-3b1392387bf2 h1:EHW+2owVU4hg5f0sDhxdsIXYmUJSmV6H1KAMwLOC8LM= -go.opentelemetry.io/collector v0.22.1-0.20210322181726-3b1392387bf2/go.mod h1:wMTwy0/4xrFRZj/XX1UH5VAd0WAVts9Rq7ZKQldCIkU= +go.opentelemetry.io/collector v0.22.1-0.20210323150444-0c6757ec71a5 h1:uYfkVpGK++c0AmXdCWh9jhAZ3PiFvhe+7lcyF4eqdqc= +go.opentelemetry.io/collector v0.22.1-0.20210323150444-0c6757ec71a5/go.mod h1:wMTwy0/4xrFRZj/XX1UH5VAd0WAVts9Rq7ZKQldCIkU= go.uber.org/atomic v1.3.2/go.mod h1:gD2HeocX3+yG+ygLZcrzQJaqmWj9AIm7n08wl/qW/PE= go.uber.org/atomic v1.4.0/go.mod h1:gD2HeocX3+yG+ygLZcrzQJaqmWj9AIm7n08wl/qW/PE= go.uber.org/atomic v1.5.0/go.mod h1:sABNBOSYdrvTF6hTgEIbc7YasKWGhgEQZyfxyTvoXHQ= diff --git a/exporter/newrelicexporter/go.mod b/exporter/newrelicexporter/go.mod index bd49bf72c0923..bb65d13a3be0f 100644 --- a/exporter/newrelicexporter/go.mod +++ b/exporter/newrelicexporter/go.mod @@ -15,7 +15,7 @@ require ( github.com/onsi/gomega v1.10.2 // indirect github.com/pelletier/go-toml v1.8.0 // indirect github.com/stretchr/testify v1.7.0 - go.opentelemetry.io/collector v0.22.1-0.20210322181726-3b1392387bf2 + go.opentelemetry.io/collector v0.22.1-0.20210323150444-0c6757ec71a5 go.uber.org/zap v1.16.0 google.golang.org/genproto v0.0.0-20210302174412-5ede27ff9881 google.golang.org/grpc v1.36.0 diff --git a/exporter/newrelicexporter/go.sum b/exporter/newrelicexporter/go.sum index 20f057f474df0..3a38a4324b9d6 100644 --- a/exporter/newrelicexporter/go.sum +++ b/exporter/newrelicexporter/go.sum @@ -1052,8 +1052,8 @@ 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.22.1-0.20210322181726-3b1392387bf2 h1:EHW+2owVU4hg5f0sDhxdsIXYmUJSmV6H1KAMwLOC8LM= -go.opentelemetry.io/collector v0.22.1-0.20210322181726-3b1392387bf2/go.mod h1:wMTwy0/4xrFRZj/XX1UH5VAd0WAVts9Rq7ZKQldCIkU= +go.opentelemetry.io/collector v0.22.1-0.20210323150444-0c6757ec71a5 h1:uYfkVpGK++c0AmXdCWh9jhAZ3PiFvhe+7lcyF4eqdqc= +go.opentelemetry.io/collector v0.22.1-0.20210323150444-0c6757ec71a5/go.mod h1:wMTwy0/4xrFRZj/XX1UH5VAd0WAVts9Rq7ZKQldCIkU= go.uber.org/atomic v1.3.2/go.mod h1:gD2HeocX3+yG+ygLZcrzQJaqmWj9AIm7n08wl/qW/PE= go.uber.org/atomic v1.4.0/go.mod h1:gD2HeocX3+yG+ygLZcrzQJaqmWj9AIm7n08wl/qW/PE= go.uber.org/atomic v1.5.0/go.mod h1:sABNBOSYdrvTF6hTgEIbc7YasKWGhgEQZyfxyTvoXHQ= diff --git a/exporter/sapmexporter/exporter.go b/exporter/sapmexporter/exporter.go index 085fdfefa900d..ef1770c2b6414 100644 --- a/exporter/sapmexporter/exporter.go +++ b/exporter/sapmexporter/exporter.go @@ -35,7 +35,7 @@ import ( // TODO: Find a place for this to be shared. type baseTracesExporter struct { component.Component - consumer.TracesConsumer + consumer.Traces } // sapmExporter is a wrapper struct of SAPM exporter @@ -92,8 +92,8 @@ func newSAPMTraceExporter(cfg *Config, params component.ExporterCreateParams) (c // this ensures that we get batches of data for the same token when pushing to the backend. if cfg.AccessTokenPassthrough { te = &baseTracesExporter{ - Component: te, - TracesConsumer: batchperresourceattr.NewBatchPerResourceTraces(splunk.SFxAccessTokenLabel, te), + Component: te, + Traces: batchperresourceattr.NewBatchPerResourceTraces(splunk.SFxAccessTokenLabel, te), } } return te, nil diff --git a/exporter/sapmexporter/go.mod b/exporter/sapmexporter/go.mod index 2cdac73b31676..03a7c738721ac 100644 --- a/exporter/sapmexporter/go.mod +++ b/exporter/sapmexporter/go.mod @@ -8,7 +8,7 @@ require ( github.com/open-telemetry/opentelemetry-collector-contrib/pkg/batchperresourceattr v0.0.0-00010101000000-000000000000 github.com/signalfx/sapm-proto v0.7.0 github.com/stretchr/testify v1.7.0 - go.opentelemetry.io/collector v0.22.1-0.20210322181726-3b1392387bf2 + go.opentelemetry.io/collector v0.22.1-0.20210323150444-0c6757ec71a5 go.uber.org/zap v1.16.0 ) diff --git a/exporter/sapmexporter/go.sum b/exporter/sapmexporter/go.sum index 5aa10f0e1c37d..489757486ec97 100644 --- a/exporter/sapmexporter/go.sum +++ b/exporter/sapmexporter/go.sum @@ -1161,8 +1161,8 @@ 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.22.1-0.20210322181726-3b1392387bf2 h1:EHW+2owVU4hg5f0sDhxdsIXYmUJSmV6H1KAMwLOC8LM= -go.opentelemetry.io/collector v0.22.1-0.20210322181726-3b1392387bf2/go.mod h1:wMTwy0/4xrFRZj/XX1UH5VAd0WAVts9Rq7ZKQldCIkU= +go.opentelemetry.io/collector v0.22.1-0.20210323150444-0c6757ec71a5 h1:uYfkVpGK++c0AmXdCWh9jhAZ3PiFvhe+7lcyF4eqdqc= +go.opentelemetry.io/collector v0.22.1-0.20210323150444-0c6757ec71a5/go.mod h1:wMTwy0/4xrFRZj/XX1UH5VAd0WAVts9Rq7ZKQldCIkU= go.uber.org/atomic v1.3.2/go.mod h1:gD2HeocX3+yG+ygLZcrzQJaqmWj9AIm7n08wl/qW/PE= go.uber.org/atomic v1.4.0/go.mod h1:gD2HeocX3+yG+ygLZcrzQJaqmWj9AIm7n08wl/qW/PE= go.uber.org/atomic v1.5.0/go.mod h1:sABNBOSYdrvTF6hTgEIbc7YasKWGhgEQZyfxyTvoXHQ= diff --git a/exporter/sentryexporter/go.mod b/exporter/sentryexporter/go.mod index 8a8b81a29f546..0b711e5f6c18f 100644 --- a/exporter/sentryexporter/go.mod +++ b/exporter/sentryexporter/go.mod @@ -14,7 +14,7 @@ require ( github.com/onsi/gomega v1.10.2 // indirect github.com/pelletier/go-toml v1.8.0 // indirect github.com/stretchr/testify v1.7.0 - go.opentelemetry.io/collector v0.22.1-0.20210322181726-3b1392387bf2 + go.opentelemetry.io/collector v0.22.1-0.20210323150444-0c6757ec71a5 go.uber.org/zap v1.16.0 gopkg.in/ini.v1 v1.57.0 // indirect ) diff --git a/exporter/sentryexporter/go.sum b/exporter/sentryexporter/go.sum index 936da775b5982..a6e33c3db62ee 100644 --- a/exporter/sentryexporter/go.sum +++ b/exporter/sentryexporter/go.sum @@ -1123,8 +1123,8 @@ 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.22.1-0.20210322181726-3b1392387bf2 h1:EHW+2owVU4hg5f0sDhxdsIXYmUJSmV6H1KAMwLOC8LM= -go.opentelemetry.io/collector v0.22.1-0.20210322181726-3b1392387bf2/go.mod h1:wMTwy0/4xrFRZj/XX1UH5VAd0WAVts9Rq7ZKQldCIkU= +go.opentelemetry.io/collector v0.22.1-0.20210323150444-0c6757ec71a5 h1:uYfkVpGK++c0AmXdCWh9jhAZ3PiFvhe+7lcyF4eqdqc= +go.opentelemetry.io/collector v0.22.1-0.20210323150444-0c6757ec71a5/go.mod h1:wMTwy0/4xrFRZj/XX1UH5VAd0WAVts9Rq7ZKQldCIkU= go.uber.org/atomic v1.3.2/go.mod h1:gD2HeocX3+yG+ygLZcrzQJaqmWj9AIm7n08wl/qW/PE= go.uber.org/atomic v1.4.0/go.mod h1:gD2HeocX3+yG+ygLZcrzQJaqmWj9AIm7n08wl/qW/PE= go.uber.org/atomic v1.5.0/go.mod h1:sABNBOSYdrvTF6hTgEIbc7YasKWGhgEQZyfxyTvoXHQ= diff --git a/exporter/signalfxexporter/exporter.go b/exporter/signalfxexporter/exporter.go index c53d28633be29..113e24dff61a4 100644 --- a/exporter/signalfxexporter/exporter.go +++ b/exporter/signalfxexporter/exporter.go @@ -38,13 +38,13 @@ import ( // TODO: Find a place for this to be shared. type baseMetricsExporter struct { component.Component - consumer.MetricsConsumer + consumer.Metrics } // TODO: Find a place for this to be shared. type baseLogsExporter struct { component.Component - consumer.LogsConsumer + consumer.Logs } type signalfMetadataExporter struct { diff --git a/exporter/signalfxexporter/factory.go b/exporter/signalfxexporter/factory.go index 8e43516cbccf6..8afe8de72f50a 100644 --- a/exporter/signalfxexporter/factory.go +++ b/exporter/signalfxexporter/factory.go @@ -156,8 +156,8 @@ func createMetricsExporter( // this ensures that we get batches of data for the same token when pushing to the backend. if expCfg.AccessTokenPassthrough { me = &baseMetricsExporter{ - Component: me, - MetricsConsumer: batchperresourceattr.NewBatchPerResourceMetrics(splunk.SFxAccessTokenLabel, me), + Component: me, + Metrics: batchperresourceattr.NewBatchPerResourceMetrics(splunk.SFxAccessTokenLabel, me), } } @@ -236,8 +236,8 @@ func createLogsExporter( // this ensures that we get batches of data for the same token when pushing to the backend. if expCfg.AccessTokenPassthrough { le = &baseLogsExporter{ - Component: le, - LogsConsumer: batchperresourceattr.NewBatchPerResourceLogs(splunk.SFxAccessTokenLabel, le), + Component: le, + Logs: batchperresourceattr.NewBatchPerResourceLogs(splunk.SFxAccessTokenLabel, le), } } diff --git a/exporter/signalfxexporter/go.mod b/exporter/signalfxexporter/go.mod index c2aae60d02966..845d4d17d3017 100644 --- a/exporter/signalfxexporter/go.mod +++ b/exporter/signalfxexporter/go.mod @@ -15,7 +15,7 @@ require ( github.com/signalfx/signalfx-agent/pkg/apm v0.0.0-20201202163743-65b4fa925fc8 github.com/spf13/viper v1.7.1 github.com/stretchr/testify v1.7.0 - go.opentelemetry.io/collector v0.22.1-0.20210322181726-3b1392387bf2 + go.opentelemetry.io/collector v0.22.1-0.20210323150444-0c6757ec71a5 go.uber.org/multierr v1.6.0 // indirect go.uber.org/zap v1.16.0 google.golang.org/protobuf v1.26.0 diff --git a/exporter/signalfxexporter/go.sum b/exporter/signalfxexporter/go.sum index e622b3f39d7f4..9d71bf17676d7 100644 --- a/exporter/signalfxexporter/go.sum +++ b/exporter/signalfxexporter/go.sum @@ -1075,8 +1075,8 @@ 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.22.1-0.20210322181726-3b1392387bf2 h1:EHW+2owVU4hg5f0sDhxdsIXYmUJSmV6H1KAMwLOC8LM= -go.opentelemetry.io/collector v0.22.1-0.20210322181726-3b1392387bf2/go.mod h1:wMTwy0/4xrFRZj/XX1UH5VAd0WAVts9Rq7ZKQldCIkU= +go.opentelemetry.io/collector v0.22.1-0.20210323150444-0c6757ec71a5 h1:uYfkVpGK++c0AmXdCWh9jhAZ3PiFvhe+7lcyF4eqdqc= +go.opentelemetry.io/collector v0.22.1-0.20210323150444-0c6757ec71a5/go.mod h1:wMTwy0/4xrFRZj/XX1UH5VAd0WAVts9Rq7ZKQldCIkU= go.uber.org/atomic v1.3.2/go.mod h1:gD2HeocX3+yG+ygLZcrzQJaqmWj9AIm7n08wl/qW/PE= go.uber.org/atomic v1.4.0/go.mod h1:gD2HeocX3+yG+ygLZcrzQJaqmWj9AIm7n08wl/qW/PE= go.uber.org/atomic v1.5.0/go.mod h1:sABNBOSYdrvTF6hTgEIbc7YasKWGhgEQZyfxyTvoXHQ= diff --git a/exporter/splunkhecexporter/go.mod b/exporter/splunkhecexporter/go.mod index 970fb8b4142dc..b8853951df8e8 100644 --- a/exporter/splunkhecexporter/go.mod +++ b/exporter/splunkhecexporter/go.mod @@ -6,7 +6,7 @@ require ( github.com/census-instrumentation/opencensus-proto v0.3.0 github.com/open-telemetry/opentelemetry-collector-contrib/internal/splunk v0.0.0-00010101000000-000000000000 github.com/stretchr/testify v1.7.0 - go.opentelemetry.io/collector v0.22.1-0.20210322181726-3b1392387bf2 + go.opentelemetry.io/collector v0.22.1-0.20210323150444-0c6757ec71a5 go.uber.org/zap v1.16.0 google.golang.org/protobuf v1.26.0 diff --git a/exporter/splunkhecexporter/go.sum b/exporter/splunkhecexporter/go.sum index 7a890302a52c7..c57597e44c14f 100644 --- a/exporter/splunkhecexporter/go.sum +++ b/exporter/splunkhecexporter/go.sum @@ -1031,8 +1031,8 @@ 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.22.1-0.20210322181726-3b1392387bf2 h1:EHW+2owVU4hg5f0sDhxdsIXYmUJSmV6H1KAMwLOC8LM= -go.opentelemetry.io/collector v0.22.1-0.20210322181726-3b1392387bf2/go.mod h1:wMTwy0/4xrFRZj/XX1UH5VAd0WAVts9Rq7ZKQldCIkU= +go.opentelemetry.io/collector v0.22.1-0.20210323150444-0c6757ec71a5 h1:uYfkVpGK++c0AmXdCWh9jhAZ3PiFvhe+7lcyF4eqdqc= +go.opentelemetry.io/collector v0.22.1-0.20210323150444-0c6757ec71a5/go.mod h1:wMTwy0/4xrFRZj/XX1UH5VAd0WAVts9Rq7ZKQldCIkU= go.uber.org/atomic v1.3.2/go.mod h1:gD2HeocX3+yG+ygLZcrzQJaqmWj9AIm7n08wl/qW/PE= go.uber.org/atomic v1.4.0/go.mod h1:gD2HeocX3+yG+ygLZcrzQJaqmWj9AIm7n08wl/qW/PE= go.uber.org/atomic v1.5.0/go.mod h1:sABNBOSYdrvTF6hTgEIbc7YasKWGhgEQZyfxyTvoXHQ= diff --git a/exporter/stackdriverexporter/go.mod b/exporter/stackdriverexporter/go.mod index 9a357485d6fe0..f3f79c4e08e05 100644 --- a/exporter/stackdriverexporter/go.mod +++ b/exporter/stackdriverexporter/go.mod @@ -5,7 +5,7 @@ go 1.16 require ( github.com/open-telemetry/opentelemetry-collector-contrib/exporter/googlecloudexporter v0.0.0-00010101000000-000000000000 github.com/stretchr/testify v1.7.0 - go.opentelemetry.io/collector v0.22.1-0.20210322181726-3b1392387bf2 + go.opentelemetry.io/collector v0.22.1-0.20210323150444-0c6757ec71a5 go.uber.org/zap v1.16.0 ) diff --git a/exporter/stackdriverexporter/go.sum b/exporter/stackdriverexporter/go.sum index a0ff6be61afc6..db7790e6bed45 100644 --- a/exporter/stackdriverexporter/go.sum +++ b/exporter/stackdriverexporter/go.sum @@ -1026,8 +1026,8 @@ 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.22.1-0.20210322181726-3b1392387bf2 h1:EHW+2owVU4hg5f0sDhxdsIXYmUJSmV6H1KAMwLOC8LM= -go.opentelemetry.io/collector v0.22.1-0.20210322181726-3b1392387bf2/go.mod h1:wMTwy0/4xrFRZj/XX1UH5VAd0WAVts9Rq7ZKQldCIkU= +go.opentelemetry.io/collector v0.22.1-0.20210323150444-0c6757ec71a5 h1:uYfkVpGK++c0AmXdCWh9jhAZ3PiFvhe+7lcyF4eqdqc= +go.opentelemetry.io/collector v0.22.1-0.20210323150444-0c6757ec71a5/go.mod h1:wMTwy0/4xrFRZj/XX1UH5VAd0WAVts9Rq7ZKQldCIkU= go.opentelemetry.io/otel v0.18.0 h1:d5Of7+Zw4ANFOJB+TIn2K3QWsgS2Ht7OU9DqZHI6qu8= go.opentelemetry.io/otel v0.18.0/go.mod h1:PT5zQj4lTsR1YeARt8YNKcFb88/c2IKoSABK9mX0r78= go.opentelemetry.io/otel/metric v0.18.0 h1:yuZCmY9e1ZTaMlZXLrrbAPmYW6tW1A5ozOZeOYGaTaY= diff --git a/exporter/sumologicexporter/go.mod b/exporter/sumologicexporter/go.mod index a562c397f55b2..916c4c22a98dc 100644 --- a/exporter/sumologicexporter/go.mod +++ b/exporter/sumologicexporter/go.mod @@ -12,6 +12,6 @@ require ( github.com/onsi/gomega v1.10.2 // indirect github.com/pelletier/go-toml v1.8.0 // indirect github.com/stretchr/testify v1.7.0 - go.opentelemetry.io/collector v0.22.1-0.20210322181726-3b1392387bf2 + go.opentelemetry.io/collector v0.22.1-0.20210323150444-0c6757ec71a5 gopkg.in/ini.v1 v1.57.0 // indirect ) diff --git a/exporter/sumologicexporter/go.sum b/exporter/sumologicexporter/go.sum index d027be7f19525..7ba6c61b2829b 100644 --- a/exporter/sumologicexporter/go.sum +++ b/exporter/sumologicexporter/go.sum @@ -1050,8 +1050,8 @@ 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.22.1-0.20210322181726-3b1392387bf2 h1:EHW+2owVU4hg5f0sDhxdsIXYmUJSmV6H1KAMwLOC8LM= -go.opentelemetry.io/collector v0.22.1-0.20210322181726-3b1392387bf2/go.mod h1:wMTwy0/4xrFRZj/XX1UH5VAd0WAVts9Rq7ZKQldCIkU= +go.opentelemetry.io/collector v0.22.1-0.20210323150444-0c6757ec71a5 h1:uYfkVpGK++c0AmXdCWh9jhAZ3PiFvhe+7lcyF4eqdqc= +go.opentelemetry.io/collector v0.22.1-0.20210323150444-0c6757ec71a5/go.mod h1:wMTwy0/4xrFRZj/XX1UH5VAd0WAVts9Rq7ZKQldCIkU= go.uber.org/atomic v1.3.2/go.mod h1:gD2HeocX3+yG+ygLZcrzQJaqmWj9AIm7n08wl/qW/PE= go.uber.org/atomic v1.4.0/go.mod h1:gD2HeocX3+yG+ygLZcrzQJaqmWj9AIm7n08wl/qW/PE= go.uber.org/atomic v1.5.0/go.mod h1:sABNBOSYdrvTF6hTgEIbc7YasKWGhgEQZyfxyTvoXHQ= diff --git a/exporter/uptraceexporter/go.mod b/exporter/uptraceexporter/go.mod index 9fb10e7900121..901338f086808 100644 --- a/exporter/uptraceexporter/go.mod +++ b/exporter/uptraceexporter/go.mod @@ -15,7 +15,7 @@ require ( github.com/stretchr/testify v1.7.0 github.com/uptrace/uptrace-go v0.9.0 github.com/vmihailenco/msgpack/v5 v5.3.0 - go.opentelemetry.io/collector v0.22.1-0.20210322181726-3b1392387bf2 + go.opentelemetry.io/collector v0.22.1-0.20210323150444-0c6757ec71a5 go.opentelemetry.io/otel v0.18.0 go.uber.org/zap v1.16.0 gopkg.in/ini.v1 v1.57.0 // indirect diff --git a/exporter/uptraceexporter/go.sum b/exporter/uptraceexporter/go.sum index 3930511637a0e..f08c04cda1a0c 100644 --- a/exporter/uptraceexporter/go.sum +++ b/exporter/uptraceexporter/go.sum @@ -1060,8 +1060,8 @@ 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.22.1-0.20210322181726-3b1392387bf2 h1:EHW+2owVU4hg5f0sDhxdsIXYmUJSmV6H1KAMwLOC8LM= -go.opentelemetry.io/collector v0.22.1-0.20210322181726-3b1392387bf2/go.mod h1:wMTwy0/4xrFRZj/XX1UH5VAd0WAVts9Rq7ZKQldCIkU= +go.opentelemetry.io/collector v0.22.1-0.20210323150444-0c6757ec71a5 h1:uYfkVpGK++c0AmXdCWh9jhAZ3PiFvhe+7lcyF4eqdqc= +go.opentelemetry.io/collector v0.22.1-0.20210323150444-0c6757ec71a5/go.mod h1:wMTwy0/4xrFRZj/XX1UH5VAd0WAVts9Rq7ZKQldCIkU= go.opentelemetry.io/contrib v0.18.0 h1:uqBh0brileIvG6luvBjdxzoFL8lxDGuhxJWsvK3BveI= go.opentelemetry.io/contrib v0.18.0/go.mod h1:G/EtFaa6qaN7+LxqfIAT3GiZa7Wv5DTBUzl5H4LY0Kc= go.opentelemetry.io/contrib/instrumentation/net/http/httptrace/otelhttptrace v0.18.0 h1:Qc7uU8GzpQ0Gak2oOmEcpiL9uRaVhatxkE1EzNhJW00= diff --git a/extension/fluentbitextension/go.mod b/extension/fluentbitextension/go.mod index d17c7961f1882..a95234d66bfc8 100644 --- a/extension/fluentbitextension/go.mod +++ b/extension/fluentbitextension/go.mod @@ -6,6 +6,6 @@ require ( github.com/davecgh/go-spew v1.1.1 github.com/shirou/gopsutil v3.21.2+incompatible github.com/stretchr/testify v1.7.0 - go.opentelemetry.io/collector v0.22.1-0.20210322181726-3b1392387bf2 + go.opentelemetry.io/collector v0.22.1-0.20210323150444-0c6757ec71a5 go.uber.org/zap v1.16.0 ) diff --git a/extension/fluentbitextension/go.sum b/extension/fluentbitextension/go.sum index 3fbabe7cadd8b..975295b6a3a40 100644 --- a/extension/fluentbitextension/go.sum +++ b/extension/fluentbitextension/go.sum @@ -1030,8 +1030,8 @@ 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.22.1-0.20210322181726-3b1392387bf2 h1:EHW+2owVU4hg5f0sDhxdsIXYmUJSmV6H1KAMwLOC8LM= -go.opentelemetry.io/collector v0.22.1-0.20210322181726-3b1392387bf2/go.mod h1:wMTwy0/4xrFRZj/XX1UH5VAd0WAVts9Rq7ZKQldCIkU= +go.opentelemetry.io/collector v0.22.1-0.20210323150444-0c6757ec71a5 h1:uYfkVpGK++c0AmXdCWh9jhAZ3PiFvhe+7lcyF4eqdqc= +go.opentelemetry.io/collector v0.22.1-0.20210323150444-0c6757ec71a5/go.mod h1:wMTwy0/4xrFRZj/XX1UH5VAd0WAVts9Rq7ZKQldCIkU= go.uber.org/atomic v1.3.2/go.mod h1:gD2HeocX3+yG+ygLZcrzQJaqmWj9AIm7n08wl/qW/PE= go.uber.org/atomic v1.4.0/go.mod h1:gD2HeocX3+yG+ygLZcrzQJaqmWj9AIm7n08wl/qW/PE= go.uber.org/atomic v1.5.0/go.mod h1:sABNBOSYdrvTF6hTgEIbc7YasKWGhgEQZyfxyTvoXHQ= diff --git a/extension/httpforwarder/go.mod b/extension/httpforwarder/go.mod index 38429f7939f6c..64c89d81805f5 100644 --- a/extension/httpforwarder/go.mod +++ b/extension/httpforwarder/go.mod @@ -5,7 +5,7 @@ go 1.14 require ( github.com/pelletier/go-toml v1.8.0 // indirect github.com/stretchr/testify v1.7.0 - go.opentelemetry.io/collector v0.22.1-0.20210322181726-3b1392387bf2 + go.opentelemetry.io/collector v0.22.1-0.20210323150444-0c6757ec71a5 go.uber.org/zap v1.16.0 gopkg.in/ini.v1 v1.57.0 // indirect ) diff --git a/extension/httpforwarder/go.sum b/extension/httpforwarder/go.sum index 63b3ba00264d4..0d24dc2d08af8 100644 --- a/extension/httpforwarder/go.sum +++ b/extension/httpforwarder/go.sum @@ -891,8 +891,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.22.1-0.20210322181726-3b1392387bf2 h1:EHW+2owVU4hg5f0sDhxdsIXYmUJSmV6H1KAMwLOC8LM= -go.opentelemetry.io/collector v0.22.1-0.20210322181726-3b1392387bf2/go.mod h1:wMTwy0/4xrFRZj/XX1UH5VAd0WAVts9Rq7ZKQldCIkU= +go.opentelemetry.io/collector v0.22.1-0.20210323150444-0c6757ec71a5 h1:uYfkVpGK++c0AmXdCWh9jhAZ3PiFvhe+7lcyF4eqdqc= +go.opentelemetry.io/collector v0.22.1-0.20210323150444-0c6757ec71a5/go.mod h1:wMTwy0/4xrFRZj/XX1UH5VAd0WAVts9Rq7ZKQldCIkU= go.uber.org/atomic v1.3.2/go.mod h1:gD2HeocX3+yG+ygLZcrzQJaqmWj9AIm7n08wl/qW/PE= go.uber.org/atomic v1.4.0/go.mod h1:gD2HeocX3+yG+ygLZcrzQJaqmWj9AIm7n08wl/qW/PE= go.uber.org/atomic v1.5.0/go.mod h1:sABNBOSYdrvTF6hTgEIbc7YasKWGhgEQZyfxyTvoXHQ= diff --git a/extension/observer/hostobserver/go.mod b/extension/observer/hostobserver/go.mod index 1272b3dab853f..cb1421a3f386b 100644 --- a/extension/observer/hostobserver/go.mod +++ b/extension/observer/hostobserver/go.mod @@ -14,7 +14,7 @@ require ( github.com/pelletier/go-toml v1.8.0 // indirect github.com/shirou/gopsutil v3.21.2+incompatible github.com/stretchr/testify v1.7.0 - go.opentelemetry.io/collector v0.22.1-0.20210322181726-3b1392387bf2 + go.opentelemetry.io/collector v0.22.1-0.20210323150444-0c6757ec71a5 go.uber.org/zap v1.16.0 gopkg.in/ini.v1 v1.57.0 // indirect ) diff --git a/extension/observer/hostobserver/go.sum b/extension/observer/hostobserver/go.sum index d027be7f19525..7ba6c61b2829b 100644 --- a/extension/observer/hostobserver/go.sum +++ b/extension/observer/hostobserver/go.sum @@ -1050,8 +1050,8 @@ 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.22.1-0.20210322181726-3b1392387bf2 h1:EHW+2owVU4hg5f0sDhxdsIXYmUJSmV6H1KAMwLOC8LM= -go.opentelemetry.io/collector v0.22.1-0.20210322181726-3b1392387bf2/go.mod h1:wMTwy0/4xrFRZj/XX1UH5VAd0WAVts9Rq7ZKQldCIkU= +go.opentelemetry.io/collector v0.22.1-0.20210323150444-0c6757ec71a5 h1:uYfkVpGK++c0AmXdCWh9jhAZ3PiFvhe+7lcyF4eqdqc= +go.opentelemetry.io/collector v0.22.1-0.20210323150444-0c6757ec71a5/go.mod h1:wMTwy0/4xrFRZj/XX1UH5VAd0WAVts9Rq7ZKQldCIkU= go.uber.org/atomic v1.3.2/go.mod h1:gD2HeocX3+yG+ygLZcrzQJaqmWj9AIm7n08wl/qW/PE= go.uber.org/atomic v1.4.0/go.mod h1:gD2HeocX3+yG+ygLZcrzQJaqmWj9AIm7n08wl/qW/PE= go.uber.org/atomic v1.5.0/go.mod h1:sABNBOSYdrvTF6hTgEIbc7YasKWGhgEQZyfxyTvoXHQ= diff --git a/extension/observer/k8sobserver/go.mod b/extension/observer/k8sobserver/go.mod index 6e7006ffe6ec6..86bf3ea49c8bf 100644 --- a/extension/observer/k8sobserver/go.mod +++ b/extension/observer/k8sobserver/go.mod @@ -14,7 +14,7 @@ require ( github.com/open-telemetry/opentelemetry-collector-contrib/internal/k8sconfig v0.0.0-00010101000000-000000000000 github.com/pelletier/go-toml v1.8.0 // indirect github.com/stretchr/testify v1.7.0 - go.opentelemetry.io/collector v0.22.1-0.20210322181726-3b1392387bf2 + go.opentelemetry.io/collector v0.22.1-0.20210323150444-0c6757ec71a5 go.uber.org/zap v1.16.0 gopkg.in/ini.v1 v1.57.0 // indirect k8s.io/api v0.20.5 diff --git a/extension/observer/k8sobserver/go.sum b/extension/observer/k8sobserver/go.sum index 5cf60c5017418..0e4d17ba604e9 100644 --- a/extension/observer/k8sobserver/go.sum +++ b/extension/observer/k8sobserver/go.sum @@ -1055,8 +1055,8 @@ 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.22.1-0.20210322181726-3b1392387bf2 h1:EHW+2owVU4hg5f0sDhxdsIXYmUJSmV6H1KAMwLOC8LM= -go.opentelemetry.io/collector v0.22.1-0.20210322181726-3b1392387bf2/go.mod h1:wMTwy0/4xrFRZj/XX1UH5VAd0WAVts9Rq7ZKQldCIkU= +go.opentelemetry.io/collector v0.22.1-0.20210323150444-0c6757ec71a5 h1:uYfkVpGK++c0AmXdCWh9jhAZ3PiFvhe+7lcyF4eqdqc= +go.opentelemetry.io/collector v0.22.1-0.20210323150444-0c6757ec71a5/go.mod h1:wMTwy0/4xrFRZj/XX1UH5VAd0WAVts9Rq7ZKQldCIkU= go.uber.org/atomic v1.3.2/go.mod h1:gD2HeocX3+yG+ygLZcrzQJaqmWj9AIm7n08wl/qW/PE= go.uber.org/atomic v1.4.0/go.mod h1:gD2HeocX3+yG+ygLZcrzQJaqmWj9AIm7n08wl/qW/PE= go.uber.org/atomic v1.5.0/go.mod h1:sABNBOSYdrvTF6hTgEIbc7YasKWGhgEQZyfxyTvoXHQ= diff --git a/go.mod b/go.mod index f6bf7c3140b47..51a2c9b5c5304 100644 --- a/go.mod +++ b/go.mod @@ -61,7 +61,7 @@ require ( github.com/open-telemetry/opentelemetry-collector-contrib/receiver/windowsperfcountersreceiver v0.0.0-00010101000000-000000000000 github.com/open-telemetry/opentelemetry-collector-contrib/receiver/zookeeperreceiver v0.0.0-00010101000000-000000000000 github.com/stretchr/testify v1.7.0 - go.opentelemetry.io/collector v0.22.1-0.20210322181726-3b1392387bf2 + go.opentelemetry.io/collector v0.22.1-0.20210323150444-0c6757ec71a5 golang.org/x/sys v0.0.0-20210315160823-c6e025ad8005 ) diff --git a/go.sum b/go.sum index eca3a92481fbc..195f7401a8f68 100644 --- a/go.sum +++ b/go.sum @@ -1487,8 +1487,8 @@ 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.22.0/go.mod h1:sBkAGYUQSh1f+owCK0aPV2uLcUB6rPHEOWjdvuE2SdQ= -go.opentelemetry.io/collector v0.22.1-0.20210322181726-3b1392387bf2 h1:EHW+2owVU4hg5f0sDhxdsIXYmUJSmV6H1KAMwLOC8LM= -go.opentelemetry.io/collector v0.22.1-0.20210322181726-3b1392387bf2/go.mod h1:wMTwy0/4xrFRZj/XX1UH5VAd0WAVts9Rq7ZKQldCIkU= +go.opentelemetry.io/collector v0.22.1-0.20210323150444-0c6757ec71a5 h1:uYfkVpGK++c0AmXdCWh9jhAZ3PiFvhe+7lcyF4eqdqc= +go.opentelemetry.io/collector v0.22.1-0.20210323150444-0c6757ec71a5/go.mod h1:wMTwy0/4xrFRZj/XX1UH5VAd0WAVts9Rq7ZKQldCIkU= go.opentelemetry.io/otel v0.18.0 h1:d5Of7+Zw4ANFOJB+TIn2K3QWsgS2Ht7OU9DqZHI6qu8= go.opentelemetry.io/otel v0.18.0/go.mod h1:PT5zQj4lTsR1YeARt8YNKcFb88/c2IKoSABK9mX0r78= go.opentelemetry.io/otel/metric v0.18.0 h1:yuZCmY9e1ZTaMlZXLrrbAPmYW6tW1A5ozOZeOYGaTaY= diff --git a/internal/splunk/go.mod b/internal/splunk/go.mod index b92e963b88017..0ee3fbb83e7a9 100644 --- a/internal/splunk/go.mod +++ b/internal/splunk/go.mod @@ -5,6 +5,6 @@ go 1.15 require ( github.com/pelletier/go-toml v1.8.0 // indirect github.com/stretchr/testify v1.7.0 - go.opentelemetry.io/collector v0.22.1-0.20210322181726-3b1392387bf2 + go.opentelemetry.io/collector v0.22.1-0.20210323150444-0c6757ec71a5 gopkg.in/ini.v1 v1.57.0 // indirect ) diff --git a/internal/splunk/go.sum b/internal/splunk/go.sum index 1f54f882ccb07..418d71d2a5f01 100644 --- a/internal/splunk/go.sum +++ b/internal/splunk/go.sum @@ -897,8 +897,8 @@ 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.22.1-0.20210322181726-3b1392387bf2 h1:EHW+2owVU4hg5f0sDhxdsIXYmUJSmV6H1KAMwLOC8LM= -go.opentelemetry.io/collector v0.22.1-0.20210322181726-3b1392387bf2/go.mod h1:wMTwy0/4xrFRZj/XX1UH5VAd0WAVts9Rq7ZKQldCIkU= +go.opentelemetry.io/collector v0.22.1-0.20210323150444-0c6757ec71a5 h1:uYfkVpGK++c0AmXdCWh9jhAZ3PiFvhe+7lcyF4eqdqc= +go.opentelemetry.io/collector v0.22.1-0.20210323150444-0c6757ec71a5/go.mod h1:wMTwy0/4xrFRZj/XX1UH5VAd0WAVts9Rq7ZKQldCIkU= go.uber.org/atomic v1.3.2/go.mod h1:gD2HeocX3+yG+ygLZcrzQJaqmWj9AIm7n08wl/qW/PE= go.uber.org/atomic v1.4.0/go.mod h1:gD2HeocX3+yG+ygLZcrzQJaqmWj9AIm7n08wl/qW/PE= go.uber.org/atomic v1.5.0/go.mod h1:sABNBOSYdrvTF6hTgEIbc7YasKWGhgEQZyfxyTvoXHQ= diff --git a/internal/stanza/factory.go b/internal/stanza/factory.go index 9c4e1b67fbc84..1900091e64b2f 100644 --- a/internal/stanza/factory.go +++ b/internal/stanza/factory.go @@ -47,7 +47,7 @@ func createLogsReceiver(logReceiverType LogReceiverType) receiverhelper.CreateLo ctx context.Context, params component.ReceiverCreateParams, cfg configmodels.Receiver, - nextConsumer consumer.LogsConsumer, + nextConsumer consumer.Logs, ) (component.LogsReceiver, error) { inputCfg, err := logReceiverType.DecodeInputConfig(cfg) if err != nil { diff --git a/internal/stanza/go.mod b/internal/stanza/go.mod index ebadc0ec99638..54d0bbaa2083e 100644 --- a/internal/stanza/go.mod +++ b/internal/stanza/go.mod @@ -5,7 +5,7 @@ go 1.14 require ( github.com/open-telemetry/opentelemetry-log-collection v0.16.1-0.20210315170618-aa8d82509c31 github.com/stretchr/testify v1.7.0 - go.opentelemetry.io/collector v0.22.1-0.20210322181726-3b1392387bf2 + go.opentelemetry.io/collector v0.22.1-0.20210323150444-0c6757ec71a5 go.uber.org/zap v1.16.0 gopkg.in/yaml.v2 v2.4.0 ) diff --git a/internal/stanza/go.sum b/internal/stanza/go.sum index 8122874663dd7..a142035250161 100644 --- a/internal/stanza/go.sum +++ b/internal/stanza/go.sum @@ -935,8 +935,8 @@ 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.22.0/go.mod h1:sBkAGYUQSh1f+owCK0aPV2uLcUB6rPHEOWjdvuE2SdQ= -go.opentelemetry.io/collector v0.22.1-0.20210322181726-3b1392387bf2 h1:EHW+2owVU4hg5f0sDhxdsIXYmUJSmV6H1KAMwLOC8LM= -go.opentelemetry.io/collector v0.22.1-0.20210322181726-3b1392387bf2/go.mod h1:wMTwy0/4xrFRZj/XX1UH5VAd0WAVts9Rq7ZKQldCIkU= +go.opentelemetry.io/collector v0.22.1-0.20210323150444-0c6757ec71a5 h1:uYfkVpGK++c0AmXdCWh9jhAZ3PiFvhe+7lcyF4eqdqc= +go.opentelemetry.io/collector v0.22.1-0.20210323150444-0c6757ec71a5/go.mod h1:wMTwy0/4xrFRZj/XX1UH5VAd0WAVts9Rq7ZKQldCIkU= go.uber.org/atomic v1.3.2/go.mod h1:gD2HeocX3+yG+ygLZcrzQJaqmWj9AIm7n08wl/qW/PE= go.uber.org/atomic v1.4.0/go.mod h1:gD2HeocX3+yG+ygLZcrzQJaqmWj9AIm7n08wl/qW/PE= go.uber.org/atomic v1.5.0/go.mod h1:sABNBOSYdrvTF6hTgEIbc7YasKWGhgEQZyfxyTvoXHQ= diff --git a/internal/stanza/receiver.go b/internal/stanza/receiver.go index c909ecbb5b642..5475985bdeac0 100644 --- a/internal/stanza/receiver.go +++ b/internal/stanza/receiver.go @@ -35,7 +35,7 @@ type receiver struct { agent *agent.LogAgent emitter *LogEmitter - consumer consumer.LogsConsumer + consumer consumer.Logs logger *zap.Logger } diff --git a/pkg/batchperresourceattr/batchperresourceattr.go b/pkg/batchperresourceattr/batchperresourceattr.go index 387b3ebbbd95f..9ff47f5b5384d 100644 --- a/pkg/batchperresourceattr/batchperresourceattr.go +++ b/pkg/batchperresourceattr/batchperresourceattr.go @@ -24,10 +24,10 @@ import ( type batchTraces struct { attrKey string - next consumer.TracesConsumer + next consumer.Traces } -func NewBatchPerResourceTraces(attrKey string, next consumer.TracesConsumer) consumer.TracesConsumer { +func NewBatchPerResourceTraces(attrKey string, next consumer.Traces) consumer.Traces { return &batchTraces{ attrKey: attrKey, next: next, @@ -71,10 +71,10 @@ func (bt *batchTraces) ConsumeTraces(ctx context.Context, td pdata.Traces) error type batchMetrics struct { attrKey string - next consumer.MetricsConsumer + next consumer.Metrics } -func NewBatchPerResourceMetrics(attrKey string, next consumer.MetricsConsumer) consumer.MetricsConsumer { +func NewBatchPerResourceMetrics(attrKey string, next consumer.Metrics) consumer.Metrics { return &batchMetrics{ attrKey: attrKey, next: next, @@ -118,10 +118,10 @@ func (bt *batchMetrics) ConsumeMetrics(ctx context.Context, td pdata.Metrics) er type batchLogs struct { attrKey string - next consumer.LogsConsumer + next consumer.Logs } -func NewBatchPerResourceLogs(attrKey string, next consumer.LogsConsumer) consumer.LogsConsumer { +func NewBatchPerResourceLogs(attrKey string, next consumer.Logs) consumer.Logs { return &batchLogs{ attrKey: attrKey, next: next, diff --git a/pkg/batchperresourceattr/go.mod b/pkg/batchperresourceattr/go.mod index 495c1bd75fb5a..8de90759ffe3b 100644 --- a/pkg/batchperresourceattr/go.mod +++ b/pkg/batchperresourceattr/go.mod @@ -4,5 +4,5 @@ go 1.14 require ( github.com/stretchr/testify v1.7.0 - go.opentelemetry.io/collector v0.22.1-0.20210322181726-3b1392387bf2 + go.opentelemetry.io/collector v0.22.1-0.20210323150444-0c6757ec71a5 ) diff --git a/pkg/batchperresourceattr/go.sum b/pkg/batchperresourceattr/go.sum index 9be62c326cde2..94882061fd529 100644 --- a/pkg/batchperresourceattr/go.sum +++ b/pkg/batchperresourceattr/go.sum @@ -872,8 +872,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.22.1-0.20210322181726-3b1392387bf2 h1:EHW+2owVU4hg5f0sDhxdsIXYmUJSmV6H1KAMwLOC8LM= -go.opentelemetry.io/collector v0.22.1-0.20210322181726-3b1392387bf2/go.mod h1:wMTwy0/4xrFRZj/XX1UH5VAd0WAVts9Rq7ZKQldCIkU= +go.opentelemetry.io/collector v0.22.1-0.20210323150444-0c6757ec71a5 h1:uYfkVpGK++c0AmXdCWh9jhAZ3PiFvhe+7lcyF4eqdqc= +go.opentelemetry.io/collector v0.22.1-0.20210323150444-0c6757ec71a5/go.mod h1:wMTwy0/4xrFRZj/XX1UH5VAd0WAVts9Rq7ZKQldCIkU= go.uber.org/atomic v1.3.2/go.mod h1:gD2HeocX3+yG+ygLZcrzQJaqmWj9AIm7n08wl/qW/PE= go.uber.org/atomic v1.4.0/go.mod h1:gD2HeocX3+yG+ygLZcrzQJaqmWj9AIm7n08wl/qW/PE= go.uber.org/atomic v1.5.0/go.mod h1:sABNBOSYdrvTF6hTgEIbc7YasKWGhgEQZyfxyTvoXHQ= diff --git a/pkg/batchpersignal/go.mod b/pkg/batchpersignal/go.mod index ca0fcfd5ebcf9..8e476f0ff7a69 100644 --- a/pkg/batchpersignal/go.mod +++ b/pkg/batchpersignal/go.mod @@ -4,5 +4,5 @@ go 1.14 require ( github.com/stretchr/testify v1.7.0 - go.opentelemetry.io/collector v0.22.1-0.20210322181726-3b1392387bf2 + go.opentelemetry.io/collector v0.22.1-0.20210323150444-0c6757ec71a5 ) diff --git a/pkg/batchpersignal/go.sum b/pkg/batchpersignal/go.sum index 9be62c326cde2..94882061fd529 100644 --- a/pkg/batchpersignal/go.sum +++ b/pkg/batchpersignal/go.sum @@ -872,8 +872,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.22.1-0.20210322181726-3b1392387bf2 h1:EHW+2owVU4hg5f0sDhxdsIXYmUJSmV6H1KAMwLOC8LM= -go.opentelemetry.io/collector v0.22.1-0.20210322181726-3b1392387bf2/go.mod h1:wMTwy0/4xrFRZj/XX1UH5VAd0WAVts9Rq7ZKQldCIkU= +go.opentelemetry.io/collector v0.22.1-0.20210323150444-0c6757ec71a5 h1:uYfkVpGK++c0AmXdCWh9jhAZ3PiFvhe+7lcyF4eqdqc= +go.opentelemetry.io/collector v0.22.1-0.20210323150444-0c6757ec71a5/go.mod h1:wMTwy0/4xrFRZj/XX1UH5VAd0WAVts9Rq7ZKQldCIkU= go.uber.org/atomic v1.3.2/go.mod h1:gD2HeocX3+yG+ygLZcrzQJaqmWj9AIm7n08wl/qW/PE= go.uber.org/atomic v1.4.0/go.mod h1:gD2HeocX3+yG+ygLZcrzQJaqmWj9AIm7n08wl/qW/PE= go.uber.org/atomic v1.5.0/go.mod h1:sABNBOSYdrvTF6hTgEIbc7YasKWGhgEQZyfxyTvoXHQ= diff --git a/pkg/batchpertrace/go.mod b/pkg/batchpertrace/go.mod index 26a051472fa44..68d757fedc0bb 100644 --- a/pkg/batchpertrace/go.mod +++ b/pkg/batchpertrace/go.mod @@ -5,7 +5,7 @@ go 1.14 require ( github.com/open-telemetry/opentelemetry-collector-contrib/pkg/batchpersignal v0.0.0-00010101000000-000000000000 github.com/stretchr/testify v1.7.0 - go.opentelemetry.io/collector v0.22.1-0.20210322181726-3b1392387bf2 + go.opentelemetry.io/collector v0.22.1-0.20210323150444-0c6757ec71a5 ) replace github.com/open-telemetry/opentelemetry-collector-contrib/pkg/batchpersignal => ../batchpersignal diff --git a/pkg/batchpertrace/go.sum b/pkg/batchpertrace/go.sum index 9be62c326cde2..94882061fd529 100644 --- a/pkg/batchpertrace/go.sum +++ b/pkg/batchpertrace/go.sum @@ -872,8 +872,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.22.1-0.20210322181726-3b1392387bf2 h1:EHW+2owVU4hg5f0sDhxdsIXYmUJSmV6H1KAMwLOC8LM= -go.opentelemetry.io/collector v0.22.1-0.20210322181726-3b1392387bf2/go.mod h1:wMTwy0/4xrFRZj/XX1UH5VAd0WAVts9Rq7ZKQldCIkU= +go.opentelemetry.io/collector v0.22.1-0.20210323150444-0c6757ec71a5 h1:uYfkVpGK++c0AmXdCWh9jhAZ3PiFvhe+7lcyF4eqdqc= +go.opentelemetry.io/collector v0.22.1-0.20210323150444-0c6757ec71a5/go.mod h1:wMTwy0/4xrFRZj/XX1UH5VAd0WAVts9Rq7ZKQldCIkU= go.uber.org/atomic v1.3.2/go.mod h1:gD2HeocX3+yG+ygLZcrzQJaqmWj9AIm7n08wl/qW/PE= go.uber.org/atomic v1.4.0/go.mod h1:gD2HeocX3+yG+ygLZcrzQJaqmWj9AIm7n08wl/qW/PE= go.uber.org/atomic v1.5.0/go.mod h1:sABNBOSYdrvTF6hTgEIbc7YasKWGhgEQZyfxyTvoXHQ= diff --git a/processor/groupbyattrsprocessor/factory.go b/processor/groupbyattrsprocessor/factory.go index a6e8a921058e0..341435ca185b5 100644 --- a/processor/groupbyattrsprocessor/factory.go +++ b/processor/groupbyattrsprocessor/factory.go @@ -92,7 +92,7 @@ func createTraceProcessor( _ context.Context, params component.ProcessorCreateParams, cfg configmodels.Processor, - nextConsumer consumer.TracesConsumer) (component.TracesProcessor, error) { + nextConsumer consumer.Traces) (component.TracesProcessor, error) { oCfg := cfg.(*Config) gap, err := createGroupByAttrsProcessor(params.Logger, oCfg.GroupByKeys) @@ -112,7 +112,7 @@ func createLogsProcessor( _ context.Context, params component.ProcessorCreateParams, cfg configmodels.Processor, - nextConsumer consumer.LogsConsumer) (component.LogsProcessor, error) { + nextConsumer consumer.Logs) (component.LogsProcessor, error) { oCfg := cfg.(*Config) gap, err := createGroupByAttrsProcessor(params.Logger, oCfg.GroupByKeys) diff --git a/processor/groupbyattrsprocessor/go.mod b/processor/groupbyattrsprocessor/go.mod index 2a96cb5d1220f..d0b2c5b01564d 100644 --- a/processor/groupbyattrsprocessor/go.mod +++ b/processor/groupbyattrsprocessor/go.mod @@ -13,7 +13,7 @@ require ( github.com/pelletier/go-toml v1.8.0 // indirect github.com/stretchr/testify v1.7.0 go.opencensus.io v0.23.0 - go.opentelemetry.io/collector v0.22.1-0.20210322181726-3b1392387bf2 + go.opentelemetry.io/collector v0.22.1-0.20210323150444-0c6757ec71a5 go.uber.org/zap v1.16.0 gopkg.in/ini.v1 v1.57.0 // indirect ) diff --git a/processor/groupbyattrsprocessor/go.sum b/processor/groupbyattrsprocessor/go.sum index d027be7f19525..7ba6c61b2829b 100644 --- a/processor/groupbyattrsprocessor/go.sum +++ b/processor/groupbyattrsprocessor/go.sum @@ -1050,8 +1050,8 @@ 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.22.1-0.20210322181726-3b1392387bf2 h1:EHW+2owVU4hg5f0sDhxdsIXYmUJSmV6H1KAMwLOC8LM= -go.opentelemetry.io/collector v0.22.1-0.20210322181726-3b1392387bf2/go.mod h1:wMTwy0/4xrFRZj/XX1UH5VAd0WAVts9Rq7ZKQldCIkU= +go.opentelemetry.io/collector v0.22.1-0.20210323150444-0c6757ec71a5 h1:uYfkVpGK++c0AmXdCWh9jhAZ3PiFvhe+7lcyF4eqdqc= +go.opentelemetry.io/collector v0.22.1-0.20210323150444-0c6757ec71a5/go.mod h1:wMTwy0/4xrFRZj/XX1UH5VAd0WAVts9Rq7ZKQldCIkU= go.uber.org/atomic v1.3.2/go.mod h1:gD2HeocX3+yG+ygLZcrzQJaqmWj9AIm7n08wl/qW/PE= go.uber.org/atomic v1.4.0/go.mod h1:gD2HeocX3+yG+ygLZcrzQJaqmWj9AIm7n08wl/qW/PE= go.uber.org/atomic v1.5.0/go.mod h1:sABNBOSYdrvTF6hTgEIbc7YasKWGhgEQZyfxyTvoXHQ= diff --git a/processor/groupbytraceprocessor/factory.go b/processor/groupbytraceprocessor/factory.go index bd621bc20d585..aaf718eeaf1f0 100644 --- a/processor/groupbytraceprocessor/factory.go +++ b/processor/groupbytraceprocessor/factory.go @@ -73,7 +73,7 @@ func createTraceProcessor( _ context.Context, params component.ProcessorCreateParams, cfg configmodels.Processor, - nextConsumer consumer.TracesConsumer) (component.TracesProcessor, error) { + nextConsumer consumer.Traces) (component.TracesProcessor, error) { oCfg := cfg.(*Config) diff --git a/processor/groupbytraceprocessor/go.mod b/processor/groupbytraceprocessor/go.mod index d656223503943..914475b696963 100644 --- a/processor/groupbytraceprocessor/go.mod +++ b/processor/groupbytraceprocessor/go.mod @@ -6,7 +6,7 @@ require ( github.com/pelletier/go-toml v1.8.0 // indirect github.com/stretchr/testify v1.7.0 go.opencensus.io v0.23.0 - go.opentelemetry.io/collector v0.22.1-0.20210322181726-3b1392387bf2 + go.opentelemetry.io/collector v0.22.1-0.20210323150444-0c6757ec71a5 go.uber.org/zap v1.16.0 gopkg.in/ini.v1 v1.57.0 // indirect ) diff --git a/processor/groupbytraceprocessor/go.sum b/processor/groupbytraceprocessor/go.sum index 23115868ec39b..8f64706353a58 100644 --- a/processor/groupbytraceprocessor/go.sum +++ b/processor/groupbytraceprocessor/go.sum @@ -892,8 +892,8 @@ 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.22.1-0.20210322181726-3b1392387bf2 h1:EHW+2owVU4hg5f0sDhxdsIXYmUJSmV6H1KAMwLOC8LM= -go.opentelemetry.io/collector v0.22.1-0.20210322181726-3b1392387bf2/go.mod h1:wMTwy0/4xrFRZj/XX1UH5VAd0WAVts9Rq7ZKQldCIkU= +go.opentelemetry.io/collector v0.22.1-0.20210323150444-0c6757ec71a5 h1:uYfkVpGK++c0AmXdCWh9jhAZ3PiFvhe+7lcyF4eqdqc= +go.opentelemetry.io/collector v0.22.1-0.20210323150444-0c6757ec71a5/go.mod h1:wMTwy0/4xrFRZj/XX1UH5VAd0WAVts9Rq7ZKQldCIkU= go.uber.org/atomic v1.3.2/go.mod h1:gD2HeocX3+yG+ygLZcrzQJaqmWj9AIm7n08wl/qW/PE= go.uber.org/atomic v1.4.0/go.mod h1:gD2HeocX3+yG+ygLZcrzQJaqmWj9AIm7n08wl/qW/PE= go.uber.org/atomic v1.5.0/go.mod h1:sABNBOSYdrvTF6hTgEIbc7YasKWGhgEQZyfxyTvoXHQ= diff --git a/processor/groupbytraceprocessor/processor.go b/processor/groupbytraceprocessor/processor.go index 0c5e5e1805b43..a9e8bc4544228 100644 --- a/processor/groupbytraceprocessor/processor.go +++ b/processor/groupbytraceprocessor/processor.go @@ -38,7 +38,7 @@ import ( // This processor uses also a ring buffer to hold the in-flight trace IDs, so that we don't hold more than the given maximum number // of traces in memory/storage. Items that are evicted from the buffer are discarded without warning. type groupByTraceProcessor struct { - nextConsumer consumer.TracesConsumer + nextConsumer consumer.Traces config Config logger *zap.Logger @@ -55,7 +55,7 @@ type groupByTraceProcessor struct { var _ component.TracesProcessor = (*groupByTraceProcessor)(nil) // newGroupByTraceProcessor returns a new processor. -func newGroupByTraceProcessor(logger *zap.Logger, st storage, nextConsumer consumer.TracesConsumer, config Config) *groupByTraceProcessor { +func newGroupByTraceProcessor(logger *zap.Logger, st storage, nextConsumer consumer.Traces, config Config) *groupByTraceProcessor { // the event machine will buffer up to N concurrent events before blocking eventMachine := newEventMachine(logger, 10000) diff --git a/processor/groupbytraceprocessor/processor_test.go b/processor/groupbytraceprocessor/processor_test.go index dc0a96fd2f93a..0517f105c50e8 100644 --- a/processor/groupbytraceprocessor/processor_test.go +++ b/processor/groupbytraceprocessor/processor_test.go @@ -722,7 +722,7 @@ type blockingConsumer struct { blockCh <-chan struct{} } -var _ consumer.TracesConsumer = (*blockingConsumer)(nil) +var _ consumer.Traces = (*blockingConsumer)(nil) func (b *blockingConsumer) ConsumeTraces(context.Context, pdata.Traces) error { <-b.blockCh diff --git a/processor/k8sprocessor/factory.go b/processor/k8sprocessor/factory.go index be25047e340c5..0400968fe8d5e 100644 --- a/processor/k8sprocessor/factory.go +++ b/processor/k8sprocessor/factory.go @@ -59,7 +59,7 @@ func createTraceProcessor( ctx context.Context, params component.ProcessorCreateParams, cfg configmodels.Processor, - next consumer.TracesConsumer, + next consumer.Traces, ) (component.TracesProcessor, error) { return createTraceProcessorWithOptions(ctx, params, cfg, next) } @@ -68,7 +68,7 @@ func createLogsProcessor( ctx context.Context, params component.ProcessorCreateParams, cfg configmodels.Processor, - nextLogsConsumer consumer.LogsConsumer, + nextLogsConsumer consumer.Logs, ) (component.LogsProcessor, error) { return createLogsProcessorWithOptions(ctx, params, cfg, nextLogsConsumer) } @@ -77,7 +77,7 @@ func createMetricsProcessor( ctx context.Context, params component.ProcessorCreateParams, cfg configmodels.Processor, - nextMetricsConsumer consumer.MetricsConsumer, + nextMetricsConsumer consumer.Metrics, ) (component.MetricsProcessor, error) { return createMetricsProcessorWithOptions(ctx, params, cfg, nextMetricsConsumer) } @@ -86,7 +86,7 @@ func createTraceProcessorWithOptions( _ context.Context, params component.ProcessorCreateParams, cfg configmodels.Processor, - next consumer.TracesConsumer, + next consumer.Traces, options ...Option, ) (component.TracesProcessor, error) { kp, err := createKubernetesProcessor(params, cfg, options...) @@ -107,7 +107,7 @@ func createMetricsProcessorWithOptions( _ context.Context, params component.ProcessorCreateParams, cfg configmodels.Processor, - nextMetricsConsumer consumer.MetricsConsumer, + nextMetricsConsumer consumer.Metrics, options ...Option, ) (component.MetricsProcessor, error) { kp, err := createKubernetesProcessor(params, cfg, options...) @@ -128,7 +128,7 @@ func createLogsProcessorWithOptions( _ context.Context, params component.ProcessorCreateParams, cfg configmodels.Processor, - nextLogsConsumer consumer.LogsConsumer, + nextLogsConsumer consumer.Logs, options ...Option, ) (component.LogsProcessor, error) { kp, err := createKubernetesProcessor(params, cfg, options...) diff --git a/processor/k8sprocessor/go.mod b/processor/k8sprocessor/go.mod index 433ad22ad458c..9ba19dfe16132 100644 --- a/processor/k8sprocessor/go.mod +++ b/processor/k8sprocessor/go.mod @@ -14,7 +14,7 @@ require ( github.com/pelletier/go-toml v1.8.0 // indirect github.com/stretchr/testify v1.7.0 go.opencensus.io v0.23.0 - go.opentelemetry.io/collector v0.22.1-0.20210322181726-3b1392387bf2 + go.opentelemetry.io/collector v0.22.1-0.20210323150444-0c6757ec71a5 go.uber.org/zap v1.16.0 gopkg.in/ini.v1 v1.57.0 // indirect k8s.io/api v0.20.5 diff --git a/processor/k8sprocessor/go.sum b/processor/k8sprocessor/go.sum index 5cf60c5017418..0e4d17ba604e9 100644 --- a/processor/k8sprocessor/go.sum +++ b/processor/k8sprocessor/go.sum @@ -1055,8 +1055,8 @@ 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.22.1-0.20210322181726-3b1392387bf2 h1:EHW+2owVU4hg5f0sDhxdsIXYmUJSmV6H1KAMwLOC8LM= -go.opentelemetry.io/collector v0.22.1-0.20210322181726-3b1392387bf2/go.mod h1:wMTwy0/4xrFRZj/XX1UH5VAd0WAVts9Rq7ZKQldCIkU= +go.opentelemetry.io/collector v0.22.1-0.20210323150444-0c6757ec71a5 h1:uYfkVpGK++c0AmXdCWh9jhAZ3PiFvhe+7lcyF4eqdqc= +go.opentelemetry.io/collector v0.22.1-0.20210323150444-0c6757ec71a5/go.mod h1:wMTwy0/4xrFRZj/XX1UH5VAd0WAVts9Rq7ZKQldCIkU= go.uber.org/atomic v1.3.2/go.mod h1:gD2HeocX3+yG+ygLZcrzQJaqmWj9AIm7n08wl/qW/PE= go.uber.org/atomic v1.4.0/go.mod h1:gD2HeocX3+yG+ygLZcrzQJaqmWj9AIm7n08wl/qW/PE= go.uber.org/atomic v1.5.0/go.mod h1:sABNBOSYdrvTF6hTgEIbc7YasKWGhgEQZyfxyTvoXHQ= diff --git a/processor/k8sprocessor/processor_test.go b/processor/k8sprocessor/processor_test.go index 9662749223da0..824328f36650f 100644 --- a/processor/k8sprocessor/processor_test.go +++ b/processor/k8sprocessor/processor_test.go @@ -36,7 +36,7 @@ import ( "github.com/open-telemetry/opentelemetry-collector-contrib/processor/k8sprocessor/kube" ) -func newTraceProcessor(cfg configmodels.Processor, next consumer.TracesConsumer, options ...Option) (component.TracesProcessor, error) { +func newTraceProcessor(cfg configmodels.Processor, next consumer.Traces, options ...Option) (component.TracesProcessor, error) { opts := append(options, withKubeClientProvider(newFakeClient)) return createTraceProcessorWithOptions( context.Background(), @@ -47,7 +47,7 @@ func newTraceProcessor(cfg configmodels.Processor, next consumer.TracesConsumer, ) } -func newMetricsProcessor(cfg configmodels.Processor, nextMetricsConsumer consumer.MetricsConsumer, options ...Option) (component.MetricsProcessor, error) { +func newMetricsProcessor(cfg configmodels.Processor, nextMetricsConsumer consumer.Metrics, options ...Option) (component.MetricsProcessor, error) { opts := append(options, withKubeClientProvider(newFakeClient)) return createMetricsProcessorWithOptions( context.Background(), @@ -58,7 +58,7 @@ func newMetricsProcessor(cfg configmodels.Processor, nextMetricsConsumer consume ) } -func newLogsProcessor(cfg configmodels.Processor, nextLogsConsumer consumer.LogsConsumer, options ...Option) (component.LogsProcessor, error) { +func newLogsProcessor(cfg configmodels.Processor, nextLogsConsumer consumer.Logs, options ...Option) (component.LogsProcessor, error) { opts := append(options, withKubeClientProvider(newFakeClient)) return createLogsProcessorWithOptions( context.Background(), diff --git a/processor/metricstransformprocessor/factory.go b/processor/metricstransformprocessor/factory.go index 09061faeab5c2..b06e245e7be31 100644 --- a/processor/metricstransformprocessor/factory.go +++ b/processor/metricstransformprocessor/factory.go @@ -54,7 +54,7 @@ func createMetricsProcessor( ctx context.Context, params component.ProcessorCreateParams, cfg configmodels.Processor, - nextConsumer consumer.MetricsConsumer, + nextConsumer consumer.Metrics, ) (component.MetricsProcessor, error) { oCfg := cfg.(*Config) if err := validateConfiguration(oCfg); err != nil { diff --git a/processor/metricstransformprocessor/go.mod b/processor/metricstransformprocessor/go.mod index e0e7b5f9db13f..7ae9a9fe8ef3d 100644 --- a/processor/metricstransformprocessor/go.mod +++ b/processor/metricstransformprocessor/go.mod @@ -14,7 +14,7 @@ require ( github.com/onsi/gomega v1.10.2 // indirect github.com/pelletier/go-toml v1.8.0 // indirect github.com/stretchr/testify v1.7.0 - go.opentelemetry.io/collector v0.22.1-0.20210322181726-3b1392387bf2 + go.opentelemetry.io/collector v0.22.1-0.20210323150444-0c6757ec71a5 go.uber.org/zap v1.16.0 google.golang.org/protobuf v1.26.0 gopkg.in/ini.v1 v1.57.0 // indirect diff --git a/processor/metricstransformprocessor/go.sum b/processor/metricstransformprocessor/go.sum index d027be7f19525..7ba6c61b2829b 100644 --- a/processor/metricstransformprocessor/go.sum +++ b/processor/metricstransformprocessor/go.sum @@ -1050,8 +1050,8 @@ 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.22.1-0.20210322181726-3b1392387bf2 h1:EHW+2owVU4hg5f0sDhxdsIXYmUJSmV6H1KAMwLOC8LM= -go.opentelemetry.io/collector v0.22.1-0.20210322181726-3b1392387bf2/go.mod h1:wMTwy0/4xrFRZj/XX1UH5VAd0WAVts9Rq7ZKQldCIkU= +go.opentelemetry.io/collector v0.22.1-0.20210323150444-0c6757ec71a5 h1:uYfkVpGK++c0AmXdCWh9jhAZ3PiFvhe+7lcyF4eqdqc= +go.opentelemetry.io/collector v0.22.1-0.20210323150444-0c6757ec71a5/go.mod h1:wMTwy0/4xrFRZj/XX1UH5VAd0WAVts9Rq7ZKQldCIkU= go.uber.org/atomic v1.3.2/go.mod h1:gD2HeocX3+yG+ygLZcrzQJaqmWj9AIm7n08wl/qW/PE= go.uber.org/atomic v1.4.0/go.mod h1:gD2HeocX3+yG+ygLZcrzQJaqmWj9AIm7n08wl/qW/PE= go.uber.org/atomic v1.5.0/go.mod h1:sABNBOSYdrvTF6hTgEIbc7YasKWGhgEQZyfxyTvoXHQ= diff --git a/processor/resourcedetectionprocessor/factory.go b/processor/resourcedetectionprocessor/factory.go index c648f8db8b7a7..a4b64d37ec9ca 100644 --- a/processor/resourcedetectionprocessor/factory.go +++ b/processor/resourcedetectionprocessor/factory.go @@ -97,7 +97,7 @@ func (f *factory) createTraceProcessor( _ context.Context, params component.ProcessorCreateParams, cfg configmodels.Processor, - nextConsumer consumer.TracesConsumer, + nextConsumer consumer.Traces, ) (component.TracesProcessor, error) { rdp, err := f.getResourceDetectionProcessor(params, cfg) if err != nil { @@ -116,7 +116,7 @@ func (f *factory) createMetricsProcessor( _ context.Context, params component.ProcessorCreateParams, cfg configmodels.Processor, - nextConsumer consumer.MetricsConsumer, + nextConsumer consumer.Metrics, ) (component.MetricsProcessor, error) { rdp, err := f.getResourceDetectionProcessor(params, cfg) if err != nil { @@ -135,7 +135,7 @@ func (f *factory) createLogsProcessor( _ context.Context, params component.ProcessorCreateParams, cfg configmodels.Processor, - nextConsumer consumer.LogsConsumer, + nextConsumer consumer.Logs, ) (component.LogsProcessor, error) { rdp, err := f.getResourceDetectionProcessor(params, cfg) if err != nil { diff --git a/processor/resourcedetectionprocessor/go.mod b/processor/resourcedetectionprocessor/go.mod index 3541028ebcd4f..ddd285fdac98b 100644 --- a/processor/resourcedetectionprocessor/go.mod +++ b/processor/resourcedetectionprocessor/go.mod @@ -16,7 +16,7 @@ require ( github.com/onsi/gomega v1.10.2 // indirect github.com/pelletier/go-toml v1.8.0 // indirect github.com/stretchr/testify v1.7.0 - go.opentelemetry.io/collector v0.22.1-0.20210322181726-3b1392387bf2 + go.opentelemetry.io/collector v0.22.1-0.20210323150444-0c6757ec71a5 go.uber.org/zap v1.16.0 gopkg.in/ini.v1 v1.57.0 // indirect ) diff --git a/processor/resourcedetectionprocessor/go.sum b/processor/resourcedetectionprocessor/go.sum index e28eb15f81837..513ddb11fe955 100644 --- a/processor/resourcedetectionprocessor/go.sum +++ b/processor/resourcedetectionprocessor/go.sum @@ -1055,8 +1055,8 @@ 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.22.1-0.20210322181726-3b1392387bf2 h1:EHW+2owVU4hg5f0sDhxdsIXYmUJSmV6H1KAMwLOC8LM= -go.opentelemetry.io/collector v0.22.1-0.20210322181726-3b1392387bf2/go.mod h1:wMTwy0/4xrFRZj/XX1UH5VAd0WAVts9Rq7ZKQldCIkU= +go.opentelemetry.io/collector v0.22.1-0.20210323150444-0c6757ec71a5 h1:uYfkVpGK++c0AmXdCWh9jhAZ3PiFvhe+7lcyF4eqdqc= +go.opentelemetry.io/collector v0.22.1-0.20210323150444-0c6757ec71a5/go.mod h1:wMTwy0/4xrFRZj/XX1UH5VAd0WAVts9Rq7ZKQldCIkU= go.uber.org/atomic v1.3.2/go.mod h1:gD2HeocX3+yG+ygLZcrzQJaqmWj9AIm7n08wl/qW/PE= go.uber.org/atomic v1.4.0/go.mod h1:gD2HeocX3+yG+ygLZcrzQJaqmWj9AIm7n08wl/qW/PE= go.uber.org/atomic v1.5.0/go.mod h1:sABNBOSYdrvTF6hTgEIbc7YasKWGhgEQZyfxyTvoXHQ= diff --git a/processor/routingprocessor/factory.go b/processor/routingprocessor/factory.go index 47b0a9282c4d5..c5c0742da066d 100644 --- a/processor/routingprocessor/factory.go +++ b/processor/routingprocessor/factory.go @@ -46,7 +46,7 @@ func createDefaultConfig() configmodels.Processor { } } -func createTraceProcessor(_ context.Context, params component.ProcessorCreateParams, cfg configmodels.Processor, nextConsumer consumer.TracesConsumer) (component.TracesProcessor, error) { +func createTraceProcessor(_ context.Context, params component.ProcessorCreateParams, cfg configmodels.Processor, nextConsumer consumer.Traces) (component.TracesProcessor, error) { _, ok := nextConsumer.(component.Processor) if ok { params.Logger.Warn("another processor has been defined after the routing processor: it will NOT receive any data!") diff --git a/processor/routingprocessor/go.mod b/processor/routingprocessor/go.mod index 8dc9dd13d2997..307588973524d 100644 --- a/processor/routingprocessor/go.mod +++ b/processor/routingprocessor/go.mod @@ -12,7 +12,7 @@ require ( github.com/onsi/gomega v1.10.2 // indirect github.com/pelletier/go-toml v1.8.0 // indirect github.com/stretchr/testify v1.7.0 - go.opentelemetry.io/collector v0.22.1-0.20210322181726-3b1392387bf2 + go.opentelemetry.io/collector v0.22.1-0.20210323150444-0c6757ec71a5 go.uber.org/zap v1.16.0 google.golang.org/grpc v1.36.0 gopkg.in/ini.v1 v1.57.0 // indirect diff --git a/processor/routingprocessor/go.sum b/processor/routingprocessor/go.sum index d027be7f19525..7ba6c61b2829b 100644 --- a/processor/routingprocessor/go.sum +++ b/processor/routingprocessor/go.sum @@ -1050,8 +1050,8 @@ 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.22.1-0.20210322181726-3b1392387bf2 h1:EHW+2owVU4hg5f0sDhxdsIXYmUJSmV6H1KAMwLOC8LM= -go.opentelemetry.io/collector v0.22.1-0.20210322181726-3b1392387bf2/go.mod h1:wMTwy0/4xrFRZj/XX1UH5VAd0WAVts9Rq7ZKQldCIkU= +go.opentelemetry.io/collector v0.22.1-0.20210323150444-0c6757ec71a5 h1:uYfkVpGK++c0AmXdCWh9jhAZ3PiFvhe+7lcyF4eqdqc= +go.opentelemetry.io/collector v0.22.1-0.20210323150444-0c6757ec71a5/go.mod h1:wMTwy0/4xrFRZj/XX1UH5VAd0WAVts9Rq7ZKQldCIkU= go.uber.org/atomic v1.3.2/go.mod h1:gD2HeocX3+yG+ygLZcrzQJaqmWj9AIm7n08wl/qW/PE= go.uber.org/atomic v1.4.0/go.mod h1:gD2HeocX3+yG+ygLZcrzQJaqmWj9AIm7n08wl/qW/PE= go.uber.org/atomic v1.5.0/go.mod h1:sABNBOSYdrvTF6hTgEIbc7YasKWGhgEQZyfxyTvoXHQ= diff --git a/processor/spanmetricsprocessor/factory.go b/processor/spanmetricsprocessor/factory.go index a2b6af60293e6..dd3c06b60cbf2 100644 --- a/processor/spanmetricsprocessor/factory.go +++ b/processor/spanmetricsprocessor/factory.go @@ -46,6 +46,6 @@ func createDefaultConfig() configmodels.Processor { } } -func createTraceProcessor(_ context.Context, params component.ProcessorCreateParams, cfg configmodels.Processor, nextConsumer consumer.TracesConsumer) (component.TracesProcessor, error) { +func createTraceProcessor(_ context.Context, params component.ProcessorCreateParams, cfg configmodels.Processor, nextConsumer consumer.Traces) (component.TracesProcessor, error) { return newProcessor(params.Logger, cfg, nextConsumer), nil } diff --git a/processor/spanmetricsprocessor/go.mod b/processor/spanmetricsprocessor/go.mod index 0ddeaf5648b8e..3d18e4342e8c6 100644 --- a/processor/spanmetricsprocessor/go.mod +++ b/processor/spanmetricsprocessor/go.mod @@ -12,7 +12,7 @@ require ( github.com/onsi/gomega v1.10.2 // indirect github.com/pelletier/go-toml v1.8.0 // indirect github.com/stretchr/testify v1.7.0 - go.opentelemetry.io/collector v0.22.1-0.20210322181726-3b1392387bf2 + go.opentelemetry.io/collector v0.22.1-0.20210323150444-0c6757ec71a5 go.uber.org/zap v1.16.0 google.golang.org/grpc v1.36.0 gopkg.in/ini.v1 v1.57.0 // indirect diff --git a/processor/spanmetricsprocessor/go.sum b/processor/spanmetricsprocessor/go.sum index d027be7f19525..7ba6c61b2829b 100644 --- a/processor/spanmetricsprocessor/go.sum +++ b/processor/spanmetricsprocessor/go.sum @@ -1050,8 +1050,8 @@ 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.22.1-0.20210322181726-3b1392387bf2 h1:EHW+2owVU4hg5f0sDhxdsIXYmUJSmV6H1KAMwLOC8LM= -go.opentelemetry.io/collector v0.22.1-0.20210322181726-3b1392387bf2/go.mod h1:wMTwy0/4xrFRZj/XX1UH5VAd0WAVts9Rq7ZKQldCIkU= +go.opentelemetry.io/collector v0.22.1-0.20210323150444-0c6757ec71a5 h1:uYfkVpGK++c0AmXdCWh9jhAZ3PiFvhe+7lcyF4eqdqc= +go.opentelemetry.io/collector v0.22.1-0.20210323150444-0c6757ec71a5/go.mod h1:wMTwy0/4xrFRZj/XX1UH5VAd0WAVts9Rq7ZKQldCIkU= go.uber.org/atomic v1.3.2/go.mod h1:gD2HeocX3+yG+ygLZcrzQJaqmWj9AIm7n08wl/qW/PE= go.uber.org/atomic v1.4.0/go.mod h1:gD2HeocX3+yG+ygLZcrzQJaqmWj9AIm7n08wl/qW/PE= go.uber.org/atomic v1.5.0/go.mod h1:sABNBOSYdrvTF6hTgEIbc7YasKWGhgEQZyfxyTvoXHQ= diff --git a/processor/spanmetricsprocessor/processor.go b/processor/spanmetricsprocessor/processor.go index c1dd290b3e6b2..c797f63d92ff2 100644 --- a/processor/spanmetricsprocessor/processor.go +++ b/processor/spanmetricsprocessor/processor.go @@ -60,7 +60,7 @@ type processorImp struct { config Config metricsExporter component.MetricsExporter - nextConsumer consumer.TracesConsumer + nextConsumer consumer.Traces // Additional dimensions to add to metrics. dimensions []Dimension @@ -82,7 +82,7 @@ type processorImp struct { metricKeyToDimensions map[metricKey]dimKV } -func newProcessor(logger *zap.Logger, config configmodels.Exporter, nextConsumer consumer.TracesConsumer) *processorImp { +func newProcessor(logger *zap.Logger, config configmodels.Exporter, nextConsumer consumer.Traces) *processorImp { logger.Info("Building spanmetricsprocessor") pConfig := config.(*Config) @@ -167,7 +167,7 @@ func (p *processorImp) GetCapabilities() component.ProcessorCapabilities { return component.ProcessorCapabilities{MutatesConsumedData: false} } -// ConsumeTraces implements the consumer.TracesConsumer interface. +// ConsumeTraces implements the consumer.Traces interface. // It aggregates the trace data to generate metrics, forwarding these metrics to the discovered metrics exporter. // The original input trace data will be forwarded to the next consumer, unmodified. func (p *processorImp) ConsumeTraces(ctx context.Context, traces pdata.Traces) error { diff --git a/processor/tailsamplingprocessor/factory.go b/processor/tailsamplingprocessor/factory.go index 899b6b77f964a..6cb455933cd8f 100644 --- a/processor/tailsamplingprocessor/factory.go +++ b/processor/tailsamplingprocessor/factory.go @@ -62,7 +62,7 @@ func createTraceProcessor( _ context.Context, params component.ProcessorCreateParams, cfg configmodels.Processor, - nextConsumer consumer.TracesConsumer, + nextConsumer consumer.Traces, ) (component.TracesProcessor, error) { tCfg := cfg.(*Config) return newTraceProcessor(params.Logger, nextConsumer, *tCfg) diff --git a/processor/tailsamplingprocessor/go.mod b/processor/tailsamplingprocessor/go.mod index a8b8650faa7ed..ee0e0cfce5da6 100644 --- a/processor/tailsamplingprocessor/go.mod +++ b/processor/tailsamplingprocessor/go.mod @@ -14,7 +14,7 @@ require ( github.com/pelletier/go-toml v1.8.0 // indirect github.com/stretchr/testify v1.7.0 go.opencensus.io v0.23.0 - go.opentelemetry.io/collector v0.22.1-0.20210322181726-3b1392387bf2 + go.opentelemetry.io/collector v0.22.1-0.20210323150444-0c6757ec71a5 go.uber.org/zap v1.16.0 gopkg.in/ini.v1 v1.57.0 // indirect ) diff --git a/processor/tailsamplingprocessor/go.sum b/processor/tailsamplingprocessor/go.sum index d027be7f19525..7ba6c61b2829b 100644 --- a/processor/tailsamplingprocessor/go.sum +++ b/processor/tailsamplingprocessor/go.sum @@ -1050,8 +1050,8 @@ 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.22.1-0.20210322181726-3b1392387bf2 h1:EHW+2owVU4hg5f0sDhxdsIXYmUJSmV6H1KAMwLOC8LM= -go.opentelemetry.io/collector v0.22.1-0.20210322181726-3b1392387bf2/go.mod h1:wMTwy0/4xrFRZj/XX1UH5VAd0WAVts9Rq7ZKQldCIkU= +go.opentelemetry.io/collector v0.22.1-0.20210323150444-0c6757ec71a5 h1:uYfkVpGK++c0AmXdCWh9jhAZ3PiFvhe+7lcyF4eqdqc= +go.opentelemetry.io/collector v0.22.1-0.20210323150444-0c6757ec71a5/go.mod h1:wMTwy0/4xrFRZj/XX1UH5VAd0WAVts9Rq7ZKQldCIkU= go.uber.org/atomic v1.3.2/go.mod h1:gD2HeocX3+yG+ygLZcrzQJaqmWj9AIm7n08wl/qW/PE= go.uber.org/atomic v1.4.0/go.mod h1:gD2HeocX3+yG+ygLZcrzQJaqmWj9AIm7n08wl/qW/PE= go.uber.org/atomic v1.5.0/go.mod h1:sABNBOSYdrvTF6hTgEIbc7YasKWGhgEQZyfxyTvoXHQ= diff --git a/processor/tailsamplingprocessor/processor.go b/processor/tailsamplingprocessor/processor.go index 24ca869b55389..cdd6a6c7bfa40 100644 --- a/processor/tailsamplingprocessor/processor.go +++ b/processor/tailsamplingprocessor/processor.go @@ -49,7 +49,7 @@ type Policy struct { // policy to sample traces. type tailSamplingSpanProcessor struct { ctx context.Context - nextConsumer consumer.TracesConsumer + nextConsumer consumer.Traces start sync.Once maxNumTraces uint64 policies []*Policy @@ -67,7 +67,7 @@ const ( // newTraceProcessor returns a processor.TraceProcessor that will perform tail sampling according to the given // configuration. -func newTraceProcessor(logger *zap.Logger, nextConsumer consumer.TracesConsumer, cfg Config) (component.TracesProcessor, error) { +func newTraceProcessor(logger *zap.Logger, nextConsumer consumer.Traces, cfg Config) (component.TracesProcessor, error) { if nextConsumer == nil { return nil, componenterror.ErrNilNextConsumer } diff --git a/receiver/awsecscontainermetricsreceiver/factory.go b/receiver/awsecscontainermetricsreceiver/factory.go index 802a65ce32fca..b8acd7239d598 100644 --- a/receiver/awsecscontainermetricsreceiver/factory.go +++ b/receiver/awsecscontainermetricsreceiver/factory.go @@ -63,7 +63,7 @@ func createMetricsReceiver( ctx context.Context, params component.ReceiverCreateParams, baseCfg configmodels.Receiver, - consumer consumer.MetricsConsumer, + consumer consumer.Metrics, ) (component.MetricsReceiver, error) { ecsTaskMetadataEndpointV4 := os.Getenv(awsecscontainermetrics.EndpointEnvKey) if ecsTaskMetadataEndpointV4 == "" { diff --git a/receiver/awsecscontainermetricsreceiver/go.mod b/receiver/awsecscontainermetricsreceiver/go.mod index 0e48f9365e00a..69d9beb5f8d56 100644 --- a/receiver/awsecscontainermetricsreceiver/go.mod +++ b/receiver/awsecscontainermetricsreceiver/go.mod @@ -13,7 +13,7 @@ require ( github.com/onsi/gomega v1.10.2 // indirect github.com/pelletier/go-toml v1.8.0 // indirect github.com/stretchr/testify v1.7.0 - go.opentelemetry.io/collector v0.22.1-0.20210322181726-3b1392387bf2 + go.opentelemetry.io/collector v0.22.1-0.20210323150444-0c6757ec71a5 go.uber.org/zap v1.16.0 google.golang.org/protobuf v1.26.0 gopkg.in/ini.v1 v1.57.0 // indirect diff --git a/receiver/awsecscontainermetricsreceiver/go.sum b/receiver/awsecscontainermetricsreceiver/go.sum index c7a9ebd343c67..27cf62a6569e7 100644 --- a/receiver/awsecscontainermetricsreceiver/go.sum +++ b/receiver/awsecscontainermetricsreceiver/go.sum @@ -1054,8 +1054,8 @@ 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.22.1-0.20210322181726-3b1392387bf2 h1:EHW+2owVU4hg5f0sDhxdsIXYmUJSmV6H1KAMwLOC8LM= -go.opentelemetry.io/collector v0.22.1-0.20210322181726-3b1392387bf2/go.mod h1:wMTwy0/4xrFRZj/XX1UH5VAd0WAVts9Rq7ZKQldCIkU= +go.opentelemetry.io/collector v0.22.1-0.20210323150444-0c6757ec71a5 h1:uYfkVpGK++c0AmXdCWh9jhAZ3PiFvhe+7lcyF4eqdqc= +go.opentelemetry.io/collector v0.22.1-0.20210323150444-0c6757ec71a5/go.mod h1:wMTwy0/4xrFRZj/XX1UH5VAd0WAVts9Rq7ZKQldCIkU= go.uber.org/atomic v1.3.2/go.mod h1:gD2HeocX3+yG+ygLZcrzQJaqmWj9AIm7n08wl/qW/PE= go.uber.org/atomic v1.4.0/go.mod h1:gD2HeocX3+yG+ygLZcrzQJaqmWj9AIm7n08wl/qW/PE= go.uber.org/atomic v1.5.0/go.mod h1:sABNBOSYdrvTF6hTgEIbc7YasKWGhgEQZyfxyTvoXHQ= diff --git a/receiver/awsecscontainermetricsreceiver/receiver.go b/receiver/awsecscontainermetricsreceiver/receiver.go index 3c22b3c9a7761..f2459be3917d1 100644 --- a/receiver/awsecscontainermetricsreceiver/receiver.go +++ b/receiver/awsecscontainermetricsreceiver/receiver.go @@ -32,7 +32,7 @@ var _ component.MetricsReceiver = (*awsEcsContainerMetricsReceiver)(nil) // awsEcsContainerMetricsReceiver implements the component.MetricsReceiver for aws ecs container metrics. type awsEcsContainerMetricsReceiver struct { logger *zap.Logger - nextConsumer consumer.MetricsConsumer + nextConsumer consumer.Metrics config *Config cancel context.CancelFunc restClient awsecscontainermetrics.RestClient @@ -43,7 +43,7 @@ type awsEcsContainerMetricsReceiver struct { func New( logger *zap.Logger, config *Config, - nextConsumer consumer.MetricsConsumer, + nextConsumer consumer.Metrics, rest awsecscontainermetrics.RestClient) (component.MetricsReceiver, error) { if nextConsumer == nil { return nil, componenterror.ErrNilNextConsumer diff --git a/receiver/awsxrayreceiver/factory.go b/receiver/awsxrayreceiver/factory.go index c5fe5d6388663..1d6c3a79f022f 100644 --- a/receiver/awsxrayreceiver/factory.go +++ b/receiver/awsxrayreceiver/factory.go @@ -59,7 +59,7 @@ func createTraceReceiver( ctx context.Context, params component.ReceiverCreateParams, cfg configmodels.Receiver, - consumer consumer.TracesConsumer) (component.TracesReceiver, error) { + consumer consumer.Traces) (component.TracesReceiver, error) { rcfg := cfg.(*Config) return newReceiver(rcfg, consumer, params.Logger) } diff --git a/receiver/awsxrayreceiver/factory_test.go b/receiver/awsxrayreceiver/factory_test.go index 3d38f690ef6e1..750afd27f3dc3 100644 --- a/receiver/awsxrayreceiver/factory_test.go +++ b/receiver/awsxrayreceiver/factory_test.go @@ -37,7 +37,7 @@ import ( type mockMetricsConsumer struct { } -var _ (consumer.MetricsConsumer) = (*mockMetricsConsumer)(nil) +var _ (consumer.Metrics) = (*mockMetricsConsumer)(nil) func (m *mockMetricsConsumer) ConsumeMetrics(ctx context.Context, md pdata.Metrics) error { return nil diff --git a/receiver/awsxrayreceiver/go.mod b/receiver/awsxrayreceiver/go.mod index 814409d861164..c58c14091eb3c 100644 --- a/receiver/awsxrayreceiver/go.mod +++ b/receiver/awsxrayreceiver/go.mod @@ -15,7 +15,7 @@ require ( github.com/open-telemetry/opentelemetry-collector-contrib/internal/awsxray v0.0.0-00010101000000-000000000000 github.com/pelletier/go-toml v1.8.0 // indirect github.com/stretchr/testify v1.7.0 - go.opentelemetry.io/collector v0.22.1-0.20210322181726-3b1392387bf2 + go.opentelemetry.io/collector v0.22.1-0.20210323150444-0c6757ec71a5 go.uber.org/zap v1.16.0 gopkg.in/ini.v1 v1.57.0 // indirect ) diff --git a/receiver/awsxrayreceiver/go.sum b/receiver/awsxrayreceiver/go.sum index e10a736c7d4ae..49867bc9cf7bf 100644 --- a/receiver/awsxrayreceiver/go.sum +++ b/receiver/awsxrayreceiver/go.sum @@ -1051,8 +1051,8 @@ 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.22.1-0.20210322181726-3b1392387bf2 h1:EHW+2owVU4hg5f0sDhxdsIXYmUJSmV6H1KAMwLOC8LM= -go.opentelemetry.io/collector v0.22.1-0.20210322181726-3b1392387bf2/go.mod h1:wMTwy0/4xrFRZj/XX1UH5VAd0WAVts9Rq7ZKQldCIkU= +go.opentelemetry.io/collector v0.22.1-0.20210323150444-0c6757ec71a5 h1:uYfkVpGK++c0AmXdCWh9jhAZ3PiFvhe+7lcyF4eqdqc= +go.opentelemetry.io/collector v0.22.1-0.20210323150444-0c6757ec71a5/go.mod h1:wMTwy0/4xrFRZj/XX1UH5VAd0WAVts9Rq7ZKQldCIkU= go.uber.org/atomic v1.3.2/go.mod h1:gD2HeocX3+yG+ygLZcrzQJaqmWj9AIm7n08wl/qW/PE= go.uber.org/atomic v1.4.0/go.mod h1:gD2HeocX3+yG+ygLZcrzQJaqmWj9AIm7n08wl/qW/PE= go.uber.org/atomic v1.5.0/go.mod h1:sABNBOSYdrvTF6hTgEIbc7YasKWGhgEQZyfxyTvoXHQ= diff --git a/receiver/awsxrayreceiver/receiver.go b/receiver/awsxrayreceiver/receiver.go index 561a675c7210c..d0068b2f8c1df 100644 --- a/receiver/awsxrayreceiver/receiver.go +++ b/receiver/awsxrayreceiver/receiver.go @@ -44,14 +44,14 @@ type xrayReceiver struct { poller udppoller.Poller server proxy.Server logger *zap.Logger - consumer consumer.TracesConsumer + consumer consumer.Traces longLivedCtx context.Context startOnce sync.Once stopOnce sync.Once } func newReceiver(config *Config, - consumer consumer.TracesConsumer, + consumer consumer.Traces, logger *zap.Logger) (component.TracesReceiver, error) { if consumer == nil { diff --git a/receiver/awsxrayreceiver/receiver_test.go b/receiver/awsxrayreceiver/receiver_test.go index cd08e64b182c7..f30c5b7df1687 100644 --- a/receiver/awsxrayreceiver/receiver_test.go +++ b/receiver/awsxrayreceiver/receiver_test.go @@ -386,13 +386,13 @@ func (m *mockProxy) Close() error { func createAndOptionallyStartReceiver( t *testing.T, receiverName string, - csu consumer.TracesConsumer, + csu consumer.Traces, start bool) (string, component.TracesReceiver, *observer.ObservedLogs) { addr, err := findAvailableUDPAddress() assert.NoError(t, err, "there should be address available") tcpAddr := testutil.GetAvailableLocalAddress(t) - var sink consumer.TracesConsumer + var sink consumer.Traces if csu == nil { sink = new(consumertest.TracesSink) } else { diff --git a/receiver/carbonreceiver/factory.go b/receiver/carbonreceiver/factory.go index 155725465b4e5..ac351fd8ca855 100644 --- a/receiver/carbonreceiver/factory.go +++ b/receiver/carbonreceiver/factory.go @@ -101,7 +101,7 @@ func createMetricsReceiver( _ context.Context, params component.ReceiverCreateParams, cfg configmodels.Receiver, - consumer consumer.MetricsConsumer, + consumer consumer.Metrics, ) (component.MetricsReceiver, error) { rCfg := cfg.(*Config) diff --git a/receiver/carbonreceiver/go.mod b/receiver/carbonreceiver/go.mod index 1ce185ca59b1d..25bc5cadca253 100644 --- a/receiver/carbonreceiver/go.mod +++ b/receiver/carbonreceiver/go.mod @@ -15,7 +15,7 @@ require ( github.com/spf13/viper v1.7.1 github.com/stretchr/testify v1.7.0 go.opencensus.io v0.23.0 - go.opentelemetry.io/collector v0.22.1-0.20210322181726-3b1392387bf2 + go.opentelemetry.io/collector v0.22.1-0.20210323150444-0c6757ec71a5 go.uber.org/zap v1.16.0 google.golang.org/protobuf v1.26.0 gopkg.in/ini.v1 v1.57.0 // indirect diff --git a/receiver/carbonreceiver/go.sum b/receiver/carbonreceiver/go.sum index d027be7f19525..7ba6c61b2829b 100644 --- a/receiver/carbonreceiver/go.sum +++ b/receiver/carbonreceiver/go.sum @@ -1050,8 +1050,8 @@ 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.22.1-0.20210322181726-3b1392387bf2 h1:EHW+2owVU4hg5f0sDhxdsIXYmUJSmV6H1KAMwLOC8LM= -go.opentelemetry.io/collector v0.22.1-0.20210322181726-3b1392387bf2/go.mod h1:wMTwy0/4xrFRZj/XX1UH5VAd0WAVts9Rq7ZKQldCIkU= +go.opentelemetry.io/collector v0.22.1-0.20210323150444-0c6757ec71a5 h1:uYfkVpGK++c0AmXdCWh9jhAZ3PiFvhe+7lcyF4eqdqc= +go.opentelemetry.io/collector v0.22.1-0.20210323150444-0c6757ec71a5/go.mod h1:wMTwy0/4xrFRZj/XX1UH5VAd0WAVts9Rq7ZKQldCIkU= go.uber.org/atomic v1.3.2/go.mod h1:gD2HeocX3+yG+ygLZcrzQJaqmWj9AIm7n08wl/qW/PE= go.uber.org/atomic v1.4.0/go.mod h1:gD2HeocX3+yG+ygLZcrzQJaqmWj9AIm7n08wl/qW/PE= go.uber.org/atomic v1.5.0/go.mod h1:sABNBOSYdrvTF6hTgEIbc7YasKWGhgEQZyfxyTvoXHQ= diff --git a/receiver/carbonreceiver/receiver.go b/receiver/carbonreceiver/receiver.go index 68328d1cab7d4..ee4e2c60eb19c 100644 --- a/receiver/carbonreceiver/receiver.go +++ b/receiver/carbonreceiver/receiver.go @@ -45,7 +45,7 @@ type carbonReceiver struct { server transport.Server reporter transport.Reporter parser protocol.Parser - nextConsumer consumer.MetricsConsumer + nextConsumer consumer.Metrics startOnce sync.Once stopOnce sync.Once @@ -57,7 +57,7 @@ var _ component.MetricsReceiver = (*carbonReceiver)(nil) func New( logger *zap.Logger, config Config, - nextConsumer consumer.MetricsConsumer, + nextConsumer consumer.Metrics, ) (component.MetricsReceiver, error) { if nextConsumer == nil { diff --git a/receiver/carbonreceiver/receiver_test.go b/receiver/carbonreceiver/receiver_test.go index fb4a58f3c8fd0..aefb02757d8a3 100644 --- a/receiver/carbonreceiver/receiver_test.go +++ b/receiver/carbonreceiver/receiver_test.go @@ -44,7 +44,7 @@ func Test_carbonreceiver_New(t *testing.T) { defaultConfig := createDefaultConfig().(*Config) type args struct { config Config - nextConsumer consumer.MetricsConsumer + nextConsumer consumer.Metrics } tests := []struct { name string diff --git a/receiver/carbonreceiver/transport/server.go b/receiver/carbonreceiver/transport/server.go index 4b6b3861a137e..4666e5dc5bffd 100644 --- a/receiver/carbonreceiver/transport/server.go +++ b/receiver/carbonreceiver/transport/server.go @@ -36,7 +36,7 @@ type Server interface { // the Parser and passed to the next consumer. ListenAndServe( p protocol.Parser, - mc consumer.MetricsConsumer, + mc consumer.Metrics, r Reporter, ) error diff --git a/receiver/carbonreceiver/transport/tcp_server.go b/receiver/carbonreceiver/transport/tcp_server.go index 0c6939f44485b..25ab6d80b2cc2 100644 --- a/receiver/carbonreceiver/transport/tcp_server.go +++ b/receiver/carbonreceiver/transport/tcp_server.go @@ -73,7 +73,7 @@ func NewTCPServer( func (t *tcpServer) ListenAndServe( parser protocol.Parser, - nextConsumer consumer.MetricsConsumer, + nextConsumer consumer.Metrics, reporter Reporter, ) error { if parser == nil || nextConsumer == nil || reporter == nil { @@ -140,7 +140,7 @@ func (t *tcpServer) Close() error { func (t *tcpServer) handleConnection( p protocol.Parser, - nextConsumer consumer.MetricsConsumer, + nextConsumer consumer.Metrics, conn net.Conn, ) { defer conn.Close() diff --git a/receiver/carbonreceiver/transport/udp_server.go b/receiver/carbonreceiver/transport/udp_server.go index 2afd9fb2202cb..1555fb5f63488 100644 --- a/receiver/carbonreceiver/transport/udp_server.go +++ b/receiver/carbonreceiver/transport/udp_server.go @@ -52,7 +52,7 @@ func NewUDPServer(addr string) (Server, error) { func (u *udpServer) ListenAndServe( parser protocol.Parser, - nextConsumer consumer.MetricsConsumer, + nextConsumer consumer.Metrics, reporter Reporter, ) error { if parser == nil || nextConsumer == nil || reporter == nil { @@ -96,7 +96,7 @@ func (u *udpServer) Close() error { func (u *udpServer) handlePacket( p protocol.Parser, - nextConsumer consumer.MetricsConsumer, + nextConsumer consumer.Metrics, data []byte, ) { ctx := u.reporter.OnDataReceived(context.Background()) diff --git a/receiver/collectdreceiver/factory.go b/receiver/collectdreceiver/factory.go index 4479fd7788c2e..8eb50cbc68b2b 100644 --- a/receiver/collectdreceiver/factory.go +++ b/receiver/collectdreceiver/factory.go @@ -61,7 +61,7 @@ func createMetricsReceiver( _ context.Context, params component.ReceiverCreateParams, cfg configmodels.Receiver, - nextConsumer consumer.MetricsConsumer, + nextConsumer consumer.Metrics, ) (component.MetricsReceiver, error) { c := cfg.(*Config) c.Encoding = strings.ToLower(c.Encoding) diff --git a/receiver/collectdreceiver/go.mod b/receiver/collectdreceiver/go.mod index 99e08b073cd66..e99e734971bbf 100644 --- a/receiver/collectdreceiver/go.mod +++ b/receiver/collectdreceiver/go.mod @@ -14,7 +14,7 @@ require ( github.com/pelletier/go-toml v1.8.0 // indirect github.com/stretchr/testify v1.7.0 go.opencensus.io v0.23.0 - go.opentelemetry.io/collector v0.22.1-0.20210322181726-3b1392387bf2 + go.opentelemetry.io/collector v0.22.1-0.20210323150444-0c6757ec71a5 go.uber.org/zap v1.16.0 google.golang.org/protobuf v1.26.0 gopkg.in/ini.v1 v1.57.0 // indirect diff --git a/receiver/collectdreceiver/go.sum b/receiver/collectdreceiver/go.sum index d027be7f19525..7ba6c61b2829b 100644 --- a/receiver/collectdreceiver/go.sum +++ b/receiver/collectdreceiver/go.sum @@ -1050,8 +1050,8 @@ 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.22.1-0.20210322181726-3b1392387bf2 h1:EHW+2owVU4hg5f0sDhxdsIXYmUJSmV6H1KAMwLOC8LM= -go.opentelemetry.io/collector v0.22.1-0.20210322181726-3b1392387bf2/go.mod h1:wMTwy0/4xrFRZj/XX1UH5VAd0WAVts9Rq7ZKQldCIkU= +go.opentelemetry.io/collector v0.22.1-0.20210323150444-0c6757ec71a5 h1:uYfkVpGK++c0AmXdCWh9jhAZ3PiFvhe+7lcyF4eqdqc= +go.opentelemetry.io/collector v0.22.1-0.20210323150444-0c6757ec71a5/go.mod h1:wMTwy0/4xrFRZj/XX1UH5VAd0WAVts9Rq7ZKQldCIkU= go.uber.org/atomic v1.3.2/go.mod h1:gD2HeocX3+yG+ygLZcrzQJaqmWj9AIm7n08wl/qW/PE= go.uber.org/atomic v1.4.0/go.mod h1:gD2HeocX3+yG+ygLZcrzQJaqmWj9AIm7n08wl/qW/PE= go.uber.org/atomic v1.5.0/go.mod h1:sABNBOSYdrvTF6hTgEIbc7YasKWGhgEQZyfxyTvoXHQ= diff --git a/receiver/collectdreceiver/receiver.go b/receiver/collectdreceiver/receiver.go index 8d2242ba9363f..af5fe30de9c72 100644 --- a/receiver/collectdreceiver/receiver.go +++ b/receiver/collectdreceiver/receiver.go @@ -46,7 +46,7 @@ type collectdReceiver struct { addr string server *http.Server defaultAttrsPrefix string - nextConsumer consumer.MetricsConsumer + nextConsumer consumer.Metrics startOnce sync.Once stopOnce sync.Once @@ -58,7 +58,7 @@ func newCollectdReceiver( addr string, timeout time.Duration, defaultAttrsPrefix string, - nextConsumer consumer.MetricsConsumer) (component.MetricsReceiver, error) { + nextConsumer consumer.Metrics) (component.MetricsReceiver, error) { if nextConsumer == nil { return nil, errNilNextConsumer } diff --git a/receiver/collectdreceiver/receiver_test.go b/receiver/collectdreceiver/receiver_test.go index d2eaa297f32b4..295b9c9174d14 100644 --- a/receiver/collectdreceiver/receiver_test.go +++ b/receiver/collectdreceiver/receiver_test.go @@ -44,7 +44,7 @@ func TestNewReceiver(t *testing.T) { addr string timeout time.Duration attrsPrefix string - nextConsumer consumer.MetricsConsumer + nextConsumer consumer.Metrics } tests := []struct { name string diff --git a/receiver/dockerstatsreceiver/factory.go b/receiver/dockerstatsreceiver/factory.go index b2d13a3ba069d..dba93abaadd81 100644 --- a/receiver/dockerstatsreceiver/factory.go +++ b/receiver/dockerstatsreceiver/factory.go @@ -51,7 +51,7 @@ func createMetricsReceiver( ctx context.Context, params component.ReceiverCreateParams, config configmodels.Receiver, - consumer consumer.MetricsConsumer, + consumer consumer.Metrics, ) (component.MetricsReceiver, error) { dockerConfig := config.(*Config) diff --git a/receiver/dockerstatsreceiver/go.mod b/receiver/dockerstatsreceiver/go.mod index 77a8df422af6f..358167afc942a 100644 --- a/receiver/dockerstatsreceiver/go.mod +++ b/receiver/dockerstatsreceiver/go.mod @@ -10,7 +10,7 @@ require ( github.com/open-telemetry/opentelemetry-collector-contrib/internal/common v0.0.0-00010101000000-000000000000 github.com/open-telemetry/opentelemetry-collector-contrib/receiver/redisreceiver v0.0.0-00010101000000-000000000000 github.com/stretchr/testify v1.7.0 - go.opentelemetry.io/collector v0.22.1-0.20210322181726-3b1392387bf2 + go.opentelemetry.io/collector v0.22.1-0.20210323150444-0c6757ec71a5 go.uber.org/zap v1.16.0 google.golang.org/protobuf v1.26.0 ) diff --git a/receiver/dockerstatsreceiver/go.sum b/receiver/dockerstatsreceiver/go.sum index 273604ee54573..f3f9bd8c1ceb5 100644 --- a/receiver/dockerstatsreceiver/go.sum +++ b/receiver/dockerstatsreceiver/go.sum @@ -1046,8 +1046,8 @@ 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.22.1-0.20210322181726-3b1392387bf2 h1:EHW+2owVU4hg5f0sDhxdsIXYmUJSmV6H1KAMwLOC8LM= -go.opentelemetry.io/collector v0.22.1-0.20210322181726-3b1392387bf2/go.mod h1:wMTwy0/4xrFRZj/XX1UH5VAd0WAVts9Rq7ZKQldCIkU= +go.opentelemetry.io/collector v0.22.1-0.20210323150444-0c6757ec71a5 h1:uYfkVpGK++c0AmXdCWh9jhAZ3PiFvhe+7lcyF4eqdqc= +go.opentelemetry.io/collector v0.22.1-0.20210323150444-0c6757ec71a5/go.mod h1:wMTwy0/4xrFRZj/XX1UH5VAd0WAVts9Rq7ZKQldCIkU= go.uber.org/atomic v1.3.2/go.mod h1:gD2HeocX3+yG+ygLZcrzQJaqmWj9AIm7n08wl/qW/PE= go.uber.org/atomic v1.4.0/go.mod h1:gD2HeocX3+yG+ygLZcrzQJaqmWj9AIm7n08wl/qW/PE= go.uber.org/atomic v1.5.0/go.mod h1:sABNBOSYdrvTF6hTgEIbc7YasKWGhgEQZyfxyTvoXHQ= diff --git a/receiver/dockerstatsreceiver/receiver.go b/receiver/dockerstatsreceiver/receiver.go index 8088c0a1ae979..4b233f70b2bc1 100644 --- a/receiver/dockerstatsreceiver/receiver.go +++ b/receiver/dockerstatsreceiver/receiver.go @@ -35,7 +35,7 @@ var _ interval.Runnable = (*Receiver)(nil) type Receiver struct { config *Config logger *zap.Logger - nextConsumer consumer.MetricsConsumer + nextConsumer consumer.Metrics client *dockerClient runner *interval.Runner obsCtx context.Context @@ -49,7 +49,7 @@ func NewReceiver( _ context.Context, logger *zap.Logger, config *Config, - nextConsumer consumer.MetricsConsumer, + nextConsumer consumer.Metrics, ) (component.MetricsReceiver, error) { err := config.Validate() if err != nil { diff --git a/receiver/dotnetdiagnosticsreceiver/factory.go b/receiver/dotnetdiagnosticsreceiver/factory.go index f8db893afd89a..bf1169b8d1408 100644 --- a/receiver/dotnetdiagnosticsreceiver/factory.go +++ b/receiver/dotnetdiagnosticsreceiver/factory.go @@ -58,7 +58,7 @@ func createMetricsReceiver( ctx context.Context, params component.ReceiverCreateParams, baseConfig configmodels.Receiver, - consumer consumer.MetricsConsumer, + consumer consumer.Metrics, ) (component.MetricsReceiver, error) { cfg := baseConfig.(*Config) bw := network.NewBlobWriter(cfg.LocalDebugDir, cfg.MaxLocalDebugFiles, params.Logger) diff --git a/receiver/dotnetdiagnosticsreceiver/go.mod b/receiver/dotnetdiagnosticsreceiver/go.mod index 37494ca9ba744..5dbd0c2b58ec7 100644 --- a/receiver/dotnetdiagnosticsreceiver/go.mod +++ b/receiver/dotnetdiagnosticsreceiver/go.mod @@ -12,7 +12,7 @@ require ( github.com/onsi/gomega v1.10.2 // indirect github.com/pelletier/go-toml v1.8.0 // indirect github.com/stretchr/testify v1.7.0 - go.opentelemetry.io/collector v0.22.1-0.20210322181726-3b1392387bf2 + go.opentelemetry.io/collector v0.22.1-0.20210323150444-0c6757ec71a5 go.uber.org/zap v1.16.0 gopkg.in/ini.v1 v1.57.0 // indirect ) diff --git a/receiver/dotnetdiagnosticsreceiver/go.sum b/receiver/dotnetdiagnosticsreceiver/go.sum index d027be7f19525..7ba6c61b2829b 100644 --- a/receiver/dotnetdiagnosticsreceiver/go.sum +++ b/receiver/dotnetdiagnosticsreceiver/go.sum @@ -1050,8 +1050,8 @@ 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.22.1-0.20210322181726-3b1392387bf2 h1:EHW+2owVU4hg5f0sDhxdsIXYmUJSmV6H1KAMwLOC8LM= -go.opentelemetry.io/collector v0.22.1-0.20210322181726-3b1392387bf2/go.mod h1:wMTwy0/4xrFRZj/XX1UH5VAd0WAVts9Rq7ZKQldCIkU= +go.opentelemetry.io/collector v0.22.1-0.20210323150444-0c6757ec71a5 h1:uYfkVpGK++c0AmXdCWh9jhAZ3PiFvhe+7lcyF4eqdqc= +go.opentelemetry.io/collector v0.22.1-0.20210323150444-0c6757ec71a5/go.mod h1:wMTwy0/4xrFRZj/XX1UH5VAd0WAVts9Rq7ZKQldCIkU= go.uber.org/atomic v1.3.2/go.mod h1:gD2HeocX3+yG+ygLZcrzQJaqmWj9AIm7n08wl/qW/PE= go.uber.org/atomic v1.4.0/go.mod h1:gD2HeocX3+yG+ygLZcrzQJaqmWj9AIm7n08wl/qW/PE= go.uber.org/atomic v1.5.0/go.mod h1:sABNBOSYdrvTF6hTgEIbc7YasKWGhgEQZyfxyTvoXHQ= diff --git a/receiver/dotnetdiagnosticsreceiver/metrics/sender.go b/receiver/dotnetdiagnosticsreceiver/metrics/sender.go index 16ad9cbcf2ddb..19dfa7140fd18 100644 --- a/receiver/dotnetdiagnosticsreceiver/metrics/sender.go +++ b/receiver/dotnetdiagnosticsreceiver/metrics/sender.go @@ -24,15 +24,15 @@ import ( "github.com/open-telemetry/opentelemetry-collector-contrib/receiver/dotnetdiagnosticsreceiver/dotnet" ) -// Sender wraps a consumer.MetricsConsumer, and has a Send method which +// Sender wraps a consumer.Metrics, and has a Send method which // conforms to dotnet.MetricsConsumer so it can be passed into a Parser. type Sender struct { - next consumer.MetricsConsumer + next consumer.Metrics logger *zap.Logger prevSendTime time.Time } -func NewSender(next consumer.MetricsConsumer, logger *zap.Logger) *Sender { +func NewSender(next consumer.Metrics, logger *zap.Logger) *Sender { return &Sender{next: next, logger: logger} } diff --git a/receiver/dotnetdiagnosticsreceiver/receiver.go b/receiver/dotnetdiagnosticsreceiver/receiver.go index 260ffb33e1854..6cebaa9314431 100644 --- a/receiver/dotnetdiagnosticsreceiver/receiver.go +++ b/receiver/dotnetdiagnosticsreceiver/receiver.go @@ -28,7 +28,7 @@ import ( ) type receiver struct { - nextConsumer consumer.MetricsConsumer + nextConsumer consumer.Metrics connect connectionSupplier counters []string intervalSec int @@ -44,7 +44,7 @@ type connectionSupplier func() (io.ReadWriter, error) // testing. func NewReceiver( _ context.Context, - mc consumer.MetricsConsumer, + mc consumer.Metrics, connect connectionSupplier, counters []string, intervalSec int, diff --git a/receiver/filelogreceiver/go.mod b/receiver/filelogreceiver/go.mod index edd912068c752..eb1a9c12c63aa 100644 --- a/receiver/filelogreceiver/go.mod +++ b/receiver/filelogreceiver/go.mod @@ -7,7 +7,7 @@ require ( github.com/open-telemetry/opentelemetry-collector-contrib/internal/stanza v0.0.0-00010101000000-000000000000 github.com/open-telemetry/opentelemetry-log-collection v0.16.1-0.20210315170618-aa8d82509c31 github.com/stretchr/testify v1.7.0 - go.opentelemetry.io/collector v0.22.1-0.20210322181726-3b1392387bf2 + go.opentelemetry.io/collector v0.22.1-0.20210323150444-0c6757ec71a5 go.uber.org/zap v1.16.0 gopkg.in/yaml.v2 v2.4.0 ) diff --git a/receiver/filelogreceiver/go.sum b/receiver/filelogreceiver/go.sum index 1922a1a4f629e..0dc546c063538 100644 --- a/receiver/filelogreceiver/go.sum +++ b/receiver/filelogreceiver/go.sum @@ -1072,8 +1072,8 @@ 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.22.0/go.mod h1:sBkAGYUQSh1f+owCK0aPV2uLcUB6rPHEOWjdvuE2SdQ= -go.opentelemetry.io/collector v0.22.1-0.20210322181726-3b1392387bf2 h1:EHW+2owVU4hg5f0sDhxdsIXYmUJSmV6H1KAMwLOC8LM= -go.opentelemetry.io/collector v0.22.1-0.20210322181726-3b1392387bf2/go.mod h1:wMTwy0/4xrFRZj/XX1UH5VAd0WAVts9Rq7ZKQldCIkU= +go.opentelemetry.io/collector v0.22.1-0.20210323150444-0c6757ec71a5 h1:uYfkVpGK++c0AmXdCWh9jhAZ3PiFvhe+7lcyF4eqdqc= +go.opentelemetry.io/collector v0.22.1-0.20210323150444-0c6757ec71a5/go.mod h1:wMTwy0/4xrFRZj/XX1UH5VAd0WAVts9Rq7ZKQldCIkU= go.uber.org/atomic v1.3.2/go.mod h1:gD2HeocX3+yG+ygLZcrzQJaqmWj9AIm7n08wl/qW/PE= go.uber.org/atomic v1.4.0/go.mod h1:gD2HeocX3+yG+ygLZcrzQJaqmWj9AIm7n08wl/qW/PE= go.uber.org/atomic v1.5.0/go.mod h1:sABNBOSYdrvTF6hTgEIbc7YasKWGhgEQZyfxyTvoXHQ= diff --git a/receiver/jmxreceiver/factory.go b/receiver/jmxreceiver/factory.go index 8c1511f0c944e..b7602e193e27e 100644 --- a/receiver/jmxreceiver/factory.go +++ b/receiver/jmxreceiver/factory.go @@ -58,7 +58,7 @@ func createReceiver( _ context.Context, params component.ReceiverCreateParams, cfg configmodels.Receiver, - consumer consumer.MetricsConsumer, + consumer consumer.Metrics, ) (component.MetricsReceiver, error) { jmxConfig := cfg.(*config) if err := jmxConfig.validate(); err != nil { diff --git a/receiver/jmxreceiver/go.mod b/receiver/jmxreceiver/go.mod index 22075a4b9299c..a7b628402786d 100644 --- a/receiver/jmxreceiver/go.mod +++ b/receiver/jmxreceiver/go.mod @@ -14,7 +14,7 @@ require ( github.com/shirou/gopsutil v3.21.2+incompatible github.com/stretchr/testify v1.7.0 github.com/testcontainers/testcontainers-go v0.9.0 - go.opentelemetry.io/collector v0.22.1-0.20210322181726-3b1392387bf2 + go.opentelemetry.io/collector v0.22.1-0.20210323150444-0c6757ec71a5 go.uber.org/atomic v1.7.0 go.uber.org/zap v1.16.0 gopkg.in/ini.v1 v1.57.0 // indirect diff --git a/receiver/jmxreceiver/go.sum b/receiver/jmxreceiver/go.sum index 5e92d959b51a0..9108a870fdaf4 100644 --- a/receiver/jmxreceiver/go.sum +++ b/receiver/jmxreceiver/go.sum @@ -1075,8 +1075,8 @@ 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.22.1-0.20210322181726-3b1392387bf2 h1:EHW+2owVU4hg5f0sDhxdsIXYmUJSmV6H1KAMwLOC8LM= -go.opentelemetry.io/collector v0.22.1-0.20210322181726-3b1392387bf2/go.mod h1:wMTwy0/4xrFRZj/XX1UH5VAd0WAVts9Rq7ZKQldCIkU= +go.opentelemetry.io/collector v0.22.1-0.20210323150444-0c6757ec71a5 h1:uYfkVpGK++c0AmXdCWh9jhAZ3PiFvhe+7lcyF4eqdqc= +go.opentelemetry.io/collector v0.22.1-0.20210323150444-0c6757ec71a5/go.mod h1:wMTwy0/4xrFRZj/XX1UH5VAd0WAVts9Rq7ZKQldCIkU= go.uber.org/atomic v1.3.2/go.mod h1:gD2HeocX3+yG+ygLZcrzQJaqmWj9AIm7n08wl/qW/PE= go.uber.org/atomic v1.4.0/go.mod h1:gD2HeocX3+yG+ygLZcrzQJaqmWj9AIm7n08wl/qW/PE= go.uber.org/atomic v1.5.0/go.mod h1:sABNBOSYdrvTF6hTgEIbc7YasKWGhgEQZyfxyTvoXHQ= diff --git a/receiver/jmxreceiver/receiver.go b/receiver/jmxreceiver/receiver.go index a9ff53b1a8f26..279369f41a28b 100644 --- a/receiver/jmxreceiver/receiver.go +++ b/receiver/jmxreceiver/receiver.go @@ -39,13 +39,13 @@ type jmxMetricReceiver struct { subprocess *subprocess.Subprocess params component.ReceiverCreateParams otlpReceiver component.MetricsReceiver - nextConsumer consumer.MetricsConsumer + nextConsumer consumer.Metrics } func newJMXMetricReceiver( params component.ReceiverCreateParams, config *config, - nextConsumer consumer.MetricsConsumer, + nextConsumer consumer.Metrics, ) *jmxMetricReceiver { return &jmxMetricReceiver{ logger: params.Logger, diff --git a/receiver/k8sclusterreceiver/factory.go b/receiver/k8sclusterreceiver/factory.go index 3321a65e98821..2889ceb7d4449 100644 --- a/receiver/k8sclusterreceiver/factory.go +++ b/receiver/k8sclusterreceiver/factory.go @@ -52,7 +52,7 @@ func createDefaultConfig() configmodels.Receiver { func createMetricsReceiver( _ context.Context, params component.ReceiverCreateParams, cfg configmodels.Receiver, - consumer consumer.MetricsConsumer) (component.MetricsReceiver, error) { + consumer consumer.Metrics) (component.MetricsReceiver, error) { rCfg := cfg.(*Config) k8sClient, err := rCfg.getK8sClient() diff --git a/receiver/k8sclusterreceiver/go.mod b/receiver/k8sclusterreceiver/go.mod index 7ad515df1d169..9ccdef1371eac 100644 --- a/receiver/k8sclusterreceiver/go.mod +++ b/receiver/k8sclusterreceiver/go.mod @@ -12,7 +12,7 @@ require ( github.com/open-telemetry/opentelemetry-collector-contrib/pkg/experimentalmetricmetadata v0.0.0-00010101000000-000000000000 github.com/pelletier/go-toml v1.8.0 // indirect github.com/stretchr/testify v1.7.0 - go.opentelemetry.io/collector v0.22.1-0.20210322181726-3b1392387bf2 + go.opentelemetry.io/collector v0.22.1-0.20210323150444-0c6757ec71a5 go.uber.org/atomic v1.7.0 go.uber.org/zap v1.16.0 google.golang.org/protobuf v1.26.0 diff --git a/receiver/k8sclusterreceiver/go.sum b/receiver/k8sclusterreceiver/go.sum index 02532ffadfc27..ba4ca87e4e729 100644 --- a/receiver/k8sclusterreceiver/go.sum +++ b/receiver/k8sclusterreceiver/go.sum @@ -925,8 +925,8 @@ 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.22.1-0.20210322181726-3b1392387bf2 h1:EHW+2owVU4hg5f0sDhxdsIXYmUJSmV6H1KAMwLOC8LM= -go.opentelemetry.io/collector v0.22.1-0.20210322181726-3b1392387bf2/go.mod h1:wMTwy0/4xrFRZj/XX1UH5VAd0WAVts9Rq7ZKQldCIkU= +go.opentelemetry.io/collector v0.22.1-0.20210323150444-0c6757ec71a5 h1:uYfkVpGK++c0AmXdCWh9jhAZ3PiFvhe+7lcyF4eqdqc= +go.opentelemetry.io/collector v0.22.1-0.20210323150444-0c6757ec71a5/go.mod h1:wMTwy0/4xrFRZj/XX1UH5VAd0WAVts9Rq7ZKQldCIkU= go.uber.org/atomic v1.3.2/go.mod h1:gD2HeocX3+yG+ygLZcrzQJaqmWj9AIm7n08wl/qW/PE= go.uber.org/atomic v1.4.0/go.mod h1:gD2HeocX3+yG+ygLZcrzQJaqmWj9AIm7n08wl/qW/PE= go.uber.org/atomic v1.5.0/go.mod h1:sABNBOSYdrvTF6hTgEIbc7YasKWGhgEQZyfxyTvoXHQ= diff --git a/receiver/k8sclusterreceiver/receiver.go b/receiver/k8sclusterreceiver/receiver.go index eee33ab0fddaf..025313b92b022 100644 --- a/receiver/k8sclusterreceiver/receiver.go +++ b/receiver/k8sclusterreceiver/receiver.go @@ -41,7 +41,7 @@ type kubernetesReceiver struct { config *Config logger *zap.Logger - consumer consumer.MetricsConsumer + consumer consumer.Metrics cancel context.CancelFunc } @@ -111,7 +111,7 @@ func (kr *kubernetesReceiver) dispatchMetrics(ctx context.Context) { // newReceiver creates the Kubernetes cluster receiver with the given configuration. func newReceiver( - logger *zap.Logger, config *Config, consumer consumer.MetricsConsumer, + logger *zap.Logger, config *Config, consumer consumer.Metrics, client kubernetes.Interface) (component.MetricsReceiver, error) { resourceWatcher := newResourceWatcher(logger, client, config.NodeConditionTypesToReport, defaultInitialSyncTimeout) diff --git a/receiver/k8sclusterreceiver/receiver_test.go b/receiver/k8sclusterreceiver/receiver_test.go index 1ecbc44db83ba..5599dc148a505 100644 --- a/receiver/k8sclusterreceiver/receiver_test.go +++ b/receiver/k8sclusterreceiver/receiver_test.go @@ -166,7 +166,7 @@ func getUpdatedPod(pod *corev1.Pod) interface{} { func setupReceiver( client *fake.Clientset, - consumer consumer.MetricsConsumer, + consumer consumer.Metrics, initialSyncTimeout time.Duration) *kubernetesReceiver { logger := zap.NewNop() diff --git a/receiver/kafkametricsreceiver/factory.go b/receiver/kafkametricsreceiver/factory.go index 08bc7aae1e491..471df1b18229f 100644 --- a/receiver/kafkametricsreceiver/factory.go +++ b/receiver/kafkametricsreceiver/factory.go @@ -54,7 +54,7 @@ func createMetricsReceiver( ctx context.Context, params component.ReceiverCreateParams, cfg configmodels.Receiver, - nextConsumer consumer.MetricsConsumer) (component.MetricsReceiver, error) { + nextConsumer consumer.Metrics) (component.MetricsReceiver, error) { c := cfg.(*Config) r, err := newMetricsReceiver(ctx, *c, params, nextConsumer) if err != nil { diff --git a/receiver/kafkametricsreceiver/factory_test.go b/receiver/kafkametricsreceiver/factory_test.go index 89a01e73bda5e..48493363539ab 100644 --- a/receiver/kafkametricsreceiver/factory_test.go +++ b/receiver/kafkametricsreceiver/factory_test.go @@ -44,7 +44,7 @@ func TestCreateMetricsReceiver_errors(t *testing.T) { func TestCreateMetricsReceiver(t *testing.T) { prev := newMetricsReceiver - newMetricsReceiver = func(ctx context.Context, config Config, params component.ReceiverCreateParams, consumer consumer.MetricsConsumer) (component.MetricsReceiver, error) { + newMetricsReceiver = func(ctx context.Context, config Config, params component.ReceiverCreateParams, consumer consumer.Metrics) (component.MetricsReceiver, error) { return nil, nil } factory := NewFactory() diff --git a/receiver/kafkametricsreceiver/go.mod b/receiver/kafkametricsreceiver/go.mod index b9080f1baf7da..9bd05b5ae6a3b 100644 --- a/receiver/kafkametricsreceiver/go.mod +++ b/receiver/kafkametricsreceiver/go.mod @@ -5,6 +5,6 @@ go 1.14 require ( github.com/Shopify/sarama v1.28.0 github.com/stretchr/testify v1.7.0 - go.opentelemetry.io/collector v0.22.1-0.20210322181726-3b1392387bf2 + go.opentelemetry.io/collector v0.22.1-0.20210323150444-0c6757ec71a5 go.uber.org/zap v1.16.0 ) diff --git a/receiver/kafkametricsreceiver/go.sum b/receiver/kafkametricsreceiver/go.sum index 3fbabe7cadd8b..975295b6a3a40 100644 --- a/receiver/kafkametricsreceiver/go.sum +++ b/receiver/kafkametricsreceiver/go.sum @@ -1030,8 +1030,8 @@ 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.22.1-0.20210322181726-3b1392387bf2 h1:EHW+2owVU4hg5f0sDhxdsIXYmUJSmV6H1KAMwLOC8LM= -go.opentelemetry.io/collector v0.22.1-0.20210322181726-3b1392387bf2/go.mod h1:wMTwy0/4xrFRZj/XX1UH5VAd0WAVts9Rq7ZKQldCIkU= +go.opentelemetry.io/collector v0.22.1-0.20210323150444-0c6757ec71a5 h1:uYfkVpGK++c0AmXdCWh9jhAZ3PiFvhe+7lcyF4eqdqc= +go.opentelemetry.io/collector v0.22.1-0.20210323150444-0c6757ec71a5/go.mod h1:wMTwy0/4xrFRZj/XX1UH5VAd0WAVts9Rq7ZKQldCIkU= go.uber.org/atomic v1.3.2/go.mod h1:gD2HeocX3+yG+ygLZcrzQJaqmWj9AIm7n08wl/qW/PE= go.uber.org/atomic v1.4.0/go.mod h1:gD2HeocX3+yG+ygLZcrzQJaqmWj9AIm7n08wl/qW/PE= go.uber.org/atomic v1.5.0/go.mod h1:sABNBOSYdrvTF6hTgEIbc7YasKWGhgEQZyfxyTvoXHQ= diff --git a/receiver/kafkametricsreceiver/receiver.go b/receiver/kafkametricsreceiver/receiver.go index 377b963eb819c..8695b278b58b6 100644 --- a/receiver/kafkametricsreceiver/receiver.go +++ b/receiver/kafkametricsreceiver/receiver.go @@ -36,7 +36,7 @@ var newMetricsReceiver = func( ctx context.Context, config Config, params component.ReceiverCreateParams, - consumer consumer.MetricsConsumer, + consumer consumer.Metrics, ) (component.MetricsReceiver, error) { sc := sarama.NewConfig() sc.ClientID = config.ClientID diff --git a/receiver/kubeletstatsreceiver/factory.go b/receiver/kubeletstatsreceiver/factory.go index 26b5a177dc306..386a3fea44348 100644 --- a/receiver/kubeletstatsreceiver/factory.go +++ b/receiver/kubeletstatsreceiver/factory.go @@ -69,7 +69,7 @@ func createMetricsReceiver( ctx context.Context, params component.ReceiverCreateParams, baseCfg configmodels.Receiver, - consumer consumer.MetricsConsumer, + consumer consumer.Metrics, ) (component.MetricsReceiver, error) { cfg := baseCfg.(*Config) rOptions, err := cfg.getReceiverOptions() diff --git a/receiver/kubeletstatsreceiver/go.mod b/receiver/kubeletstatsreceiver/go.mod index 40d1e026abbff..705fb9d5199ad 100644 --- a/receiver/kubeletstatsreceiver/go.mod +++ b/receiver/kubeletstatsreceiver/go.mod @@ -8,7 +8,7 @@ require ( github.com/open-telemetry/opentelemetry-collector-contrib/receiver/redisreceiver v0.0.0-00010101000000-000000000000 github.com/spf13/viper v1.7.1 github.com/stretchr/testify v1.7.0 - go.opentelemetry.io/collector v0.22.1-0.20210322181726-3b1392387bf2 + go.opentelemetry.io/collector v0.22.1-0.20210323150444-0c6757ec71a5 go.uber.org/zap v1.16.0 google.golang.org/protobuf v1.26.0 gopkg.in/yaml.v2 v2.4.0 diff --git a/receiver/kubeletstatsreceiver/go.sum b/receiver/kubeletstatsreceiver/go.sum index 17b64133c277c..47108b8192690 100644 --- a/receiver/kubeletstatsreceiver/go.sum +++ b/receiver/kubeletstatsreceiver/go.sum @@ -1052,8 +1052,8 @@ 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.22.1-0.20210322181726-3b1392387bf2 h1:EHW+2owVU4hg5f0sDhxdsIXYmUJSmV6H1KAMwLOC8LM= -go.opentelemetry.io/collector v0.22.1-0.20210322181726-3b1392387bf2/go.mod h1:wMTwy0/4xrFRZj/XX1UH5VAd0WAVts9Rq7ZKQldCIkU= +go.opentelemetry.io/collector v0.22.1-0.20210323150444-0c6757ec71a5 h1:uYfkVpGK++c0AmXdCWh9jhAZ3PiFvhe+7lcyF4eqdqc= +go.opentelemetry.io/collector v0.22.1-0.20210323150444-0c6757ec71a5/go.mod h1:wMTwy0/4xrFRZj/XX1UH5VAd0WAVts9Rq7ZKQldCIkU= go.uber.org/atomic v1.3.2/go.mod h1:gD2HeocX3+yG+ygLZcrzQJaqmWj9AIm7n08wl/qW/PE= go.uber.org/atomic v1.4.0/go.mod h1:gD2HeocX3+yG+ygLZcrzQJaqmWj9AIm7n08wl/qW/PE= go.uber.org/atomic v1.5.0/go.mod h1:sABNBOSYdrvTF6hTgEIbc7YasKWGhgEQZyfxyTvoXHQ= diff --git a/receiver/kubeletstatsreceiver/receiver.go b/receiver/kubeletstatsreceiver/receiver.go index d76c35187fefb..146bdc989e9f9 100644 --- a/receiver/kubeletstatsreceiver/receiver.go +++ b/receiver/kubeletstatsreceiver/receiver.go @@ -32,7 +32,7 @@ var _ component.MetricsReceiver = (*receiver)(nil) type receiver struct { options *receiverOptions logger *zap.Logger - consumer consumer.MetricsConsumer + consumer consumer.Metrics runner *interval.Runner rest kubelet.RestClient } @@ -47,7 +47,7 @@ type receiverOptions struct { func newReceiver(rOptions *receiverOptions, logger *zap.Logger, rest kubelet.RestClient, - next consumer.MetricsConsumer) *receiver { + next consumer.Metrics) *receiver { return &receiver{ options: rOptions, logger: logger, diff --git a/receiver/kubeletstatsreceiver/runnable.go b/receiver/kubeletstatsreceiver/runnable.go index c6b4c28332970..7d38d9a74e8cc 100644 --- a/receiver/kubeletstatsreceiver/runnable.go +++ b/receiver/kubeletstatsreceiver/runnable.go @@ -38,7 +38,7 @@ type runnable struct { receiverName string statsProvider *kubelet.StatsProvider metadataProvider *kubelet.MetadataProvider - consumer consumer.MetricsConsumer + consumer consumer.Metrics logger *zap.Logger restClient kubelet.RestClient extraMetadataLabels []kubelet.MetadataLabel @@ -49,7 +49,7 @@ type runnable struct { func newRunnable( ctx context.Context, - consumer consumer.MetricsConsumer, + consumer consumer.Metrics, restClient kubelet.RestClient, logger *zap.Logger, rOptions *receiverOptions, diff --git a/receiver/memcachedreceiver/factory.go b/receiver/memcachedreceiver/factory.go index e4df5457b9920..125d4f7de2aea 100644 --- a/receiver/memcachedreceiver/factory.go +++ b/receiver/memcachedreceiver/factory.go @@ -60,7 +60,7 @@ func createMetricsReceiver( _ context.Context, params component.ReceiverCreateParams, rConf configmodels.Receiver, - consumer consumer.MetricsConsumer, + consumer consumer.Metrics, ) (component.MetricsReceiver, error) { cfg := rConf.(*Config) diff --git a/receiver/memcachedreceiver/go.mod b/receiver/memcachedreceiver/go.mod index 383fc960e3e1d..83609a4430278 100644 --- a/receiver/memcachedreceiver/go.mod +++ b/receiver/memcachedreceiver/go.mod @@ -14,7 +14,7 @@ require ( github.com/open-telemetry/opentelemetry-collector-contrib/internal/common v0.0.0-00010101000000-000000000000 github.com/pelletier/go-toml v1.8.0 // indirect github.com/stretchr/testify v1.7.0 - go.opentelemetry.io/collector v0.22.1-0.20210322181726-3b1392387bf2 + go.opentelemetry.io/collector v0.22.1-0.20210323150444-0c6757ec71a5 go.uber.org/zap v1.16.0 gopkg.in/ini.v1 v1.57.0 // indirect ) diff --git a/receiver/memcachedreceiver/go.sum b/receiver/memcachedreceiver/go.sum index 66f08ec6437a8..c163ae0dd9086 100644 --- a/receiver/memcachedreceiver/go.sum +++ b/receiver/memcachedreceiver/go.sum @@ -1058,8 +1058,8 @@ 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.22.1-0.20210322181726-3b1392387bf2 h1:EHW+2owVU4hg5f0sDhxdsIXYmUJSmV6H1KAMwLOC8LM= -go.opentelemetry.io/collector v0.22.1-0.20210322181726-3b1392387bf2/go.mod h1:wMTwy0/4xrFRZj/XX1UH5VAd0WAVts9Rq7ZKQldCIkU= +go.opentelemetry.io/collector v0.22.1-0.20210323150444-0c6757ec71a5 h1:uYfkVpGK++c0AmXdCWh9jhAZ3PiFvhe+7lcyF4eqdqc= +go.opentelemetry.io/collector v0.22.1-0.20210323150444-0c6757ec71a5/go.mod h1:wMTwy0/4xrFRZj/XX1UH5VAd0WAVts9Rq7ZKQldCIkU= go.uber.org/atomic v1.3.2/go.mod h1:gD2HeocX3+yG+ygLZcrzQJaqmWj9AIm7n08wl/qW/PE= go.uber.org/atomic v1.4.0/go.mod h1:gD2HeocX3+yG+ygLZcrzQJaqmWj9AIm7n08wl/qW/PE= go.uber.org/atomic v1.5.0/go.mod h1:sABNBOSYdrvTF6hTgEIbc7YasKWGhgEQZyfxyTvoXHQ= diff --git a/receiver/nginxreceiver/factory.go b/receiver/nginxreceiver/factory.go index 093f55737ced4..a314ac07a91c3 100644 --- a/receiver/nginxreceiver/factory.go +++ b/receiver/nginxreceiver/factory.go @@ -60,7 +60,7 @@ func createMetricsReceiver( _ context.Context, params component.ReceiverCreateParams, rConf configmodels.Receiver, - consumer consumer.MetricsConsumer, + consumer consumer.Metrics, ) (component.MetricsReceiver, error) { cfg := rConf.(*config) diff --git a/receiver/nginxreceiver/go.mod b/receiver/nginxreceiver/go.mod index 56af0d93f9d5d..05c96800a7247 100644 --- a/receiver/nginxreceiver/go.mod +++ b/receiver/nginxreceiver/go.mod @@ -13,7 +13,7 @@ require ( github.com/onsi/gomega v1.10.2 // indirect github.com/pelletier/go-toml v1.8.0 // indirect github.com/stretchr/testify v1.7.0 - go.opentelemetry.io/collector v0.22.1-0.20210322181726-3b1392387bf2 + go.opentelemetry.io/collector v0.22.1-0.20210323150444-0c6757ec71a5 go.uber.org/zap v1.16.0 gopkg.in/ini.v1 v1.57.0 // indirect ) diff --git a/receiver/nginxreceiver/go.sum b/receiver/nginxreceiver/go.sum index 04591b3ac408d..571a2d3890655 100644 --- a/receiver/nginxreceiver/go.sum +++ b/receiver/nginxreceiver/go.sum @@ -1057,8 +1057,8 @@ 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.22.1-0.20210322181726-3b1392387bf2 h1:EHW+2owVU4hg5f0sDhxdsIXYmUJSmV6H1KAMwLOC8LM= -go.opentelemetry.io/collector v0.22.1-0.20210322181726-3b1392387bf2/go.mod h1:wMTwy0/4xrFRZj/XX1UH5VAd0WAVts9Rq7ZKQldCIkU= +go.opentelemetry.io/collector v0.22.1-0.20210323150444-0c6757ec71a5 h1:uYfkVpGK++c0AmXdCWh9jhAZ3PiFvhe+7lcyF4eqdqc= +go.opentelemetry.io/collector v0.22.1-0.20210323150444-0c6757ec71a5/go.mod h1:wMTwy0/4xrFRZj/XX1UH5VAd0WAVts9Rq7ZKQldCIkU= go.uber.org/atomic v1.3.2/go.mod h1:gD2HeocX3+yG+ygLZcrzQJaqmWj9AIm7n08wl/qW/PE= go.uber.org/atomic v1.4.0/go.mod h1:gD2HeocX3+yG+ygLZcrzQJaqmWj9AIm7n08wl/qW/PE= go.uber.org/atomic v1.5.0/go.mod h1:sABNBOSYdrvTF6hTgEIbc7YasKWGhgEQZyfxyTvoXHQ= diff --git a/receiver/prometheusexecreceiver/factory.go b/receiver/prometheusexecreceiver/factory.go index 538a840b1a27f..3a3a0b5ebcd24 100644 --- a/receiver/prometheusexecreceiver/factory.go +++ b/receiver/prometheusexecreceiver/factory.go @@ -61,7 +61,7 @@ func createMetricsReceiver( ctx context.Context, params component.ReceiverCreateParams, cfg configmodels.Receiver, - nextConsumer consumer.MetricsConsumer, + nextConsumer consumer.Metrics, ) (component.MetricsReceiver, error) { rCfg := cfg.(*Config) return newPromExecReceiver(params, rCfg, nextConsumer) diff --git a/receiver/prometheusexecreceiver/go.mod b/receiver/prometheusexecreceiver/go.mod index 83e475f8b7386..81541f2e704f3 100644 --- a/receiver/prometheusexecreceiver/go.mod +++ b/receiver/prometheusexecreceiver/go.mod @@ -15,7 +15,7 @@ require ( github.com/prometheus/common v0.19.0 github.com/prometheus/prometheus v1.8.2-0.20210217141258-a6be548dbc17 github.com/stretchr/testify v1.7.0 - go.opentelemetry.io/collector v0.22.1-0.20210322181726-3b1392387bf2 + go.opentelemetry.io/collector v0.22.1-0.20210323150444-0c6757ec71a5 go.uber.org/zap v1.16.0 gopkg.in/ini.v1 v1.57.0 // indirect ) diff --git a/receiver/prometheusexecreceiver/go.sum b/receiver/prometheusexecreceiver/go.sum index d799ee8dfb798..ea93e71088841 100644 --- a/receiver/prometheusexecreceiver/go.sum +++ b/receiver/prometheusexecreceiver/go.sum @@ -1052,8 +1052,8 @@ 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.22.1-0.20210322181726-3b1392387bf2 h1:EHW+2owVU4hg5f0sDhxdsIXYmUJSmV6H1KAMwLOC8LM= -go.opentelemetry.io/collector v0.22.1-0.20210322181726-3b1392387bf2/go.mod h1:wMTwy0/4xrFRZj/XX1UH5VAd0WAVts9Rq7ZKQldCIkU= +go.opentelemetry.io/collector v0.22.1-0.20210323150444-0c6757ec71a5 h1:uYfkVpGK++c0AmXdCWh9jhAZ3PiFvhe+7lcyF4eqdqc= +go.opentelemetry.io/collector v0.22.1-0.20210323150444-0c6757ec71a5/go.mod h1:wMTwy0/4xrFRZj/XX1UH5VAd0WAVts9Rq7ZKQldCIkU= go.uber.org/atomic v1.3.2/go.mod h1:gD2HeocX3+yG+ygLZcrzQJaqmWj9AIm7n08wl/qW/PE= go.uber.org/atomic v1.4.0/go.mod h1:gD2HeocX3+yG+ygLZcrzQJaqmWj9AIm7n08wl/qW/PE= go.uber.org/atomic v1.5.0/go.mod h1:sABNBOSYdrvTF6hTgEIbc7YasKWGhgEQZyfxyTvoXHQ= diff --git a/receiver/prometheusexecreceiver/receiver.go b/receiver/prometheusexecreceiver/receiver.go index 07e977ed15528..3d1ff3315634f 100644 --- a/receiver/prometheusexecreceiver/receiver.go +++ b/receiver/prometheusexecreceiver/receiver.go @@ -56,7 +56,7 @@ const ( type prometheusExecReceiver struct { params component.ReceiverCreateParams config *Config - consumer consumer.MetricsConsumer + consumer consumer.Metrics // Prometheus receiver config promReceiverConfig *prometheusreceiver.Config @@ -78,7 +78,7 @@ type runResult struct { } // newPromExecReceiver returns a prometheusExecReceiver -func newPromExecReceiver(params component.ReceiverCreateParams, config *Config, consumer consumer.MetricsConsumer) (*prometheusExecReceiver, error) { +func newPromExecReceiver(params component.ReceiverCreateParams, config *Config, consumer consumer.Metrics) (*prometheusExecReceiver, error) { if config.SubprocessConfig.Command == "" { return nil, fmt.Errorf("no command to execute entered in config file for %v", config.Name()) } diff --git a/receiver/receivercreator/config_test.go b/receiver/receivercreator/config_test.go index 100ea233b5587..c2991f3dcff55 100644 --- a/receiver/receivercreator/config_test.go +++ b/receiver/receivercreator/config_test.go @@ -104,7 +104,7 @@ type nopWithEndpointFactory struct { type nopWithEndpointReceiver struct { component.Component - consumer.MetricsConsumer + consumer.Metrics } func (*nopWithEndpointFactory) CreateDefaultConfig() configmodels.Receiver { @@ -119,9 +119,9 @@ func (*nopWithEndpointFactory) CreateMetricsReceiver( ctx context.Context, _ component.ReceiverCreateParams, _ configmodels.Receiver, - nextConsumer consumer.MetricsConsumer) (component.MetricsReceiver, error) { + nextConsumer consumer.Metrics) (component.MetricsReceiver, error) { return &nopWithEndpointReceiver{ - Component: componenthelper.NewComponent(componenthelper.DefaultComponentSettings()), - MetricsConsumer: nextConsumer, + Component: componenthelper.NewComponent(componenthelper.DefaultComponentSettings()), + Metrics: nextConsumer, }, nil } diff --git a/receiver/receivercreator/factory.go b/receiver/receivercreator/factory.go index 7fad8f43215e5..9478b07445a23 100644 --- a/receiver/receivercreator/factory.go +++ b/receiver/receivercreator/factory.go @@ -70,7 +70,7 @@ func createMetricsReceiver( ctx context.Context, params component.ReceiverCreateParams, cfg configmodels.Receiver, - consumer consumer.MetricsConsumer, + consumer consumer.Metrics, ) (component.MetricsReceiver, error) { return newReceiverCreator(params, cfg.(*Config), consumer) } diff --git a/receiver/receivercreator/go.mod b/receiver/receivercreator/go.mod index da443cb6dbb8b..b09f8f7821e2e 100644 --- a/receiver/receivercreator/go.mod +++ b/receiver/receivercreator/go.mod @@ -16,7 +16,7 @@ require ( github.com/pelletier/go-toml v1.8.0 // indirect github.com/spf13/viper v1.7.1 github.com/stretchr/testify v1.7.0 - go.opentelemetry.io/collector v0.22.1-0.20210322181726-3b1392387bf2 + go.opentelemetry.io/collector v0.22.1-0.20210323150444-0c6757ec71a5 go.uber.org/zap v1.16.0 gopkg.in/ini.v1 v1.57.0 // indirect ) diff --git a/receiver/receivercreator/go.sum b/receiver/receivercreator/go.sum index d027be7f19525..7ba6c61b2829b 100644 --- a/receiver/receivercreator/go.sum +++ b/receiver/receivercreator/go.sum @@ -1050,8 +1050,8 @@ 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.22.1-0.20210322181726-3b1392387bf2 h1:EHW+2owVU4hg5f0sDhxdsIXYmUJSmV6H1KAMwLOC8LM= -go.opentelemetry.io/collector v0.22.1-0.20210322181726-3b1392387bf2/go.mod h1:wMTwy0/4xrFRZj/XX1UH5VAd0WAVts9Rq7ZKQldCIkU= +go.opentelemetry.io/collector v0.22.1-0.20210323150444-0c6757ec71a5 h1:uYfkVpGK++c0AmXdCWh9jhAZ3PiFvhe+7lcyF4eqdqc= +go.opentelemetry.io/collector v0.22.1-0.20210323150444-0c6757ec71a5/go.mod h1:wMTwy0/4xrFRZj/XX1UH5VAd0WAVts9Rq7ZKQldCIkU= go.uber.org/atomic v1.3.2/go.mod h1:gD2HeocX3+yG+ygLZcrzQJaqmWj9AIm7n08wl/qW/PE= go.uber.org/atomic v1.4.0/go.mod h1:gD2HeocX3+yG+ygLZcrzQJaqmWj9AIm7n08wl/qW/PE= go.uber.org/atomic v1.5.0/go.mod h1:sABNBOSYdrvTF6hTgEIbc7YasKWGhgEQZyfxyTvoXHQ= diff --git a/receiver/receivercreator/observerhandler.go b/receiver/receivercreator/observerhandler.go index 2f886011d8dac..8173dc454cf41 100644 --- a/receiver/receivercreator/observerhandler.go +++ b/receiver/receivercreator/observerhandler.go @@ -37,7 +37,7 @@ type observerHandler struct { // receiversByEndpointID is a map of endpoint IDs to a receiver instance. receiversByEndpointID receiverMap // nextConsumer is the receiver_creator's own consumer - nextConsumer consumer.MetricsConsumer + nextConsumer consumer.Metrics // runner starts and stops receiver instances. runner runner } diff --git a/receiver/receivercreator/observerhandler_test.go b/receiver/receivercreator/observerhandler_test.go index 237b3d559c2b8..81f6e518e727e 100644 --- a/receiver/receivercreator/observerhandler_test.go +++ b/receiver/receivercreator/observerhandler_test.go @@ -34,7 +34,7 @@ type mockRunner struct { func (run *mockRunner) start( receiver receiverConfig, discoveredConfig userConfigMap, - nextConsumer consumer.MetricsConsumer, + nextConsumer consumer.Metrics, ) (component.Receiver, error) { args := run.Called(receiver, discoveredConfig, nextConsumer) return args.Get(0).(component.Receiver), args.Error(1) diff --git a/receiver/receivercreator/receiver.go b/receiver/receivercreator/receiver.go index 3c4529116d0ec..7f9e4393552ba 100644 --- a/receiver/receivercreator/receiver.go +++ b/receiver/receivercreator/receiver.go @@ -33,16 +33,16 @@ var ( var _ component.MetricsReceiver = (*receiverCreator)(nil) -// receiverCreator implements consumer.MetricsConsumer. +// receiverCreator implements consumer.Metrics. type receiverCreator struct { params component.ReceiverCreateParams cfg *Config - nextConsumer consumer.MetricsConsumer + nextConsumer consumer.Metrics observerHandler observerHandler } // newReceiverCreator creates the receiver_creator with the given parameters. -func newReceiverCreator(params component.ReceiverCreateParams, cfg *Config, nextConsumer consumer.MetricsConsumer) (component.MetricsReceiver, error) { +func newReceiverCreator(params component.ReceiverCreateParams, cfg *Config, nextConsumer consumer.Metrics) (component.MetricsReceiver, error) { if nextConsumer == nil { return nil, errNilNextConsumer } diff --git a/receiver/receivercreator/receiver_test.go b/receiver/receivercreator/receiver_test.go index 2a2ae098ad87c..568d247ba4bfc 100644 --- a/receiver/receivercreator/receiver_test.go +++ b/receiver/receivercreator/receiver_test.go @@ -51,7 +51,7 @@ type mockMetricsConsumer struct { TotalMetrics int } -var _ consumer.MetricsConsumer = &mockMetricsConsumer{} +var _ consumer.Metrics = &mockMetricsConsumer{} func (p *mockMetricsConsumer) ConsumeMetrics(ctx context.Context, md pdata.Metrics) error { p.Metrics = append(p.Metrics, md) @@ -138,7 +138,7 @@ func TestMockedEndToEnd(t *testing.T) { }, }, }) - assert.NoError(t, example.MetricsConsumer.ConsumeMetrics(context.Background(), md)) + assert.NoError(t, example.ConsumeMetrics(context.Background(), md)) } // TODO: Will have to rework once receivers are started asynchronously to Start(). diff --git a/receiver/receivercreator/resourceenhancer.go b/receiver/receivercreator/resourceenhancer.go index 281d3eaa32657..a3212a8fe408e 100644 --- a/receiver/receivercreator/resourceenhancer.go +++ b/receiver/receivercreator/resourceenhancer.go @@ -24,13 +24,13 @@ import ( "github.com/open-telemetry/opentelemetry-collector-contrib/extension/observer" ) -var _ consumer.MetricsConsumer = (*resourceEnhancer)(nil) +var _ consumer.Metrics = (*resourceEnhancer)(nil) // resourceEnhancer adds additional resource attribute entries // from the given endpoint environment. The added attributes vary based on the type // of the endpoint. type resourceEnhancer struct { - nextConsumer consumer.MetricsConsumer + nextConsumer consumer.Metrics attrs map[string]string } @@ -38,7 +38,7 @@ func newResourceEnhancer( resources resourceAttributes, env observer.EndpointEnv, endpoint observer.Endpoint, - nextConsumer consumer.MetricsConsumer, + nextConsumer consumer.Metrics, ) (*resourceEnhancer, error) { attrs := map[string]string{} diff --git a/receiver/receivercreator/resourceenhancer_test.go b/receiver/receivercreator/resourceenhancer_test.go index 98b9abf793fde..9c4acaf52d59a 100644 --- a/receiver/receivercreator/resourceenhancer_test.go +++ b/receiver/receivercreator/resourceenhancer_test.go @@ -42,7 +42,7 @@ func Test_newResourceEnhancer(t *testing.T) { resources resourceAttributes env observer.EndpointEnv endpoint observer.Endpoint - nextConsumer consumer.MetricsConsumer + nextConsumer consumer.Metrics } tests := []struct { name string diff --git a/receiver/receivercreator/runner.go b/receiver/receivercreator/runner.go index 12e4f16847764..5a7a27fabcc21 100644 --- a/receiver/receivercreator/runner.go +++ b/receiver/receivercreator/runner.go @@ -27,7 +27,7 @@ import ( // runner starts and stops receiver instances. type runner interface { // start a receiver instance from its static config and discovered config. - start(receiver receiverConfig, discoveredConfig userConfigMap, nextConsumer consumer.MetricsConsumer) (component.Receiver, error) + start(receiver receiverConfig, discoveredConfig userConfigMap, nextConsumer consumer.Metrics) (component.Receiver, error) // shutdown a receiver. shutdown(rcvr component.Receiver) error } @@ -45,7 +45,7 @@ var _ runner = (*receiverRunner)(nil) func (run *receiverRunner) start( receiver receiverConfig, discoveredConfig userConfigMap, - nextConsumer consumer.MetricsConsumer, + nextConsumer consumer.Metrics, ) (component.Receiver, error) { factory := run.host.GetFactory(component.KindReceiver, receiver.typeStr) @@ -109,7 +109,7 @@ func (run *receiverRunner) loadRuntimeReceiverConfig( func (run *receiverRunner) createRuntimeReceiver( factory component.ReceiverFactory, cfg configmodels.Receiver, - nextConsumer consumer.MetricsConsumer, + nextConsumer consumer.Metrics, ) (component.MetricsReceiver, error) { return factory.CreateMetricsReceiver(context.Background(), run.params, cfg, nextConsumer) } diff --git a/receiver/redisreceiver/factory.go b/receiver/redisreceiver/factory.go index 840d77a7b46c2..4bc873e6ca02d 100644 --- a/receiver/redisreceiver/factory.go +++ b/receiver/redisreceiver/factory.go @@ -50,7 +50,7 @@ func createMetricsReceiver( ctx context.Context, params component.ReceiverCreateParams, cfg configmodels.Receiver, - consumer consumer.MetricsConsumer, + consumer consumer.Metrics, ) (component.MetricsReceiver, error) { oCfg := cfg.(*config) diff --git a/receiver/redisreceiver/go.mod b/receiver/redisreceiver/go.mod index 8ac259433c5b6..6274f6d831ee4 100644 --- a/receiver/redisreceiver/go.mod +++ b/receiver/redisreceiver/go.mod @@ -9,7 +9,7 @@ require ( github.com/open-telemetry/opentelemetry-collector-contrib/internal/common v0.0.0-00010101000000-000000000000 github.com/pelletier/go-toml v1.8.0 // indirect github.com/stretchr/testify v1.7.0 - go.opentelemetry.io/collector v0.22.1-0.20210322181726-3b1392387bf2 + go.opentelemetry.io/collector v0.22.1-0.20210323150444-0c6757ec71a5 go.uber.org/zap v1.16.0 gopkg.in/ini.v1 v1.57.0 // indirect ) diff --git a/receiver/redisreceiver/go.sum b/receiver/redisreceiver/go.sum index 713c283fd25ad..65f395f9838db 100644 --- a/receiver/redisreceiver/go.sum +++ b/receiver/redisreceiver/go.sum @@ -922,8 +922,8 @@ 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.22.1-0.20210322181726-3b1392387bf2 h1:EHW+2owVU4hg5f0sDhxdsIXYmUJSmV6H1KAMwLOC8LM= -go.opentelemetry.io/collector v0.22.1-0.20210322181726-3b1392387bf2/go.mod h1:wMTwy0/4xrFRZj/XX1UH5VAd0WAVts9Rq7ZKQldCIkU= +go.opentelemetry.io/collector v0.22.1-0.20210323150444-0c6757ec71a5 h1:uYfkVpGK++c0AmXdCWh9jhAZ3PiFvhe+7lcyF4eqdqc= +go.opentelemetry.io/collector v0.22.1-0.20210323150444-0c6757ec71a5/go.mod h1:wMTwy0/4xrFRZj/XX1UH5VAd0WAVts9Rq7ZKQldCIkU= go.uber.org/atomic v1.3.2/go.mod h1:gD2HeocX3+yG+ygLZcrzQJaqmWj9AIm7n08wl/qW/PE= go.uber.org/atomic v1.4.0/go.mod h1:gD2HeocX3+yG+ygLZcrzQJaqmWj9AIm7n08wl/qW/PE= go.uber.org/atomic v1.5.0/go.mod h1:sABNBOSYdrvTF6hTgEIbc7YasKWGhgEQZyfxyTvoXHQ= diff --git a/receiver/redisreceiver/receiver.go b/receiver/redisreceiver/receiver.go index f2a2e135a5e66..d693d0697163b 100644 --- a/receiver/redisreceiver/receiver.go +++ b/receiver/redisreceiver/receiver.go @@ -28,14 +28,14 @@ import ( type redisReceiver struct { logger *zap.Logger config *config - consumer consumer.MetricsConsumer + consumer consumer.Metrics intervalRunner *interval.Runner } func newRedisReceiver( logger *zap.Logger, config *config, - consumer consumer.MetricsConsumer, + consumer consumer.Metrics, ) *redisReceiver { return &redisReceiver{ logger: logger, diff --git a/receiver/redisreceiver/redis_runnable.go b/receiver/redisreceiver/redis_runnable.go index db1a9f59cdf61..18a63d522ac71 100644 --- a/receiver/redisreceiver/redis_runnable.go +++ b/receiver/redisreceiver/redis_runnable.go @@ -32,7 +32,7 @@ var _ interval.Runnable = (*redisRunnable)(nil) // and feeding them to a metricsConsumer. type redisRunnable struct { ctx context.Context - metricsConsumer consumer.MetricsConsumer + metricsConsumer consumer.Metrics redisSvc *redisSvc redisMetrics []*redisMetric logger *zap.Logger @@ -44,7 +44,7 @@ func newRedisRunnable( ctx context.Context, client client, serviceName string, - metricsConsumer consumer.MetricsConsumer, + metricsConsumer consumer.Metrics, logger *zap.Logger, ) *redisRunnable { return &redisRunnable{ diff --git a/receiver/sapmreceiver/factory.go b/receiver/sapmreceiver/factory.go index 46ca6c7143ab1..723d2ea6bd0c2 100644 --- a/receiver/sapmreceiver/factory.go +++ b/receiver/sapmreceiver/factory.go @@ -89,7 +89,7 @@ func createTraceReceiver( ctx context.Context, params component.ReceiverCreateParams, cfg configmodels.Receiver, - nextConsumer consumer.TracesConsumer, + nextConsumer consumer.Traces, ) (component.TracesReceiver, error) { // assert config is SAPM config rCfg := cfg.(*Config) diff --git a/receiver/sapmreceiver/go.mod b/receiver/sapmreceiver/go.mod index 75d2bc9877411..22d2a2617c5ea 100644 --- a/receiver/sapmreceiver/go.mod +++ b/receiver/sapmreceiver/go.mod @@ -9,7 +9,7 @@ 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.22.1-0.20210322181726-3b1392387bf2 + go.opentelemetry.io/collector v0.22.1-0.20210323150444-0c6757ec71a5 go.uber.org/zap v1.16.0 ) diff --git a/receiver/sapmreceiver/go.sum b/receiver/sapmreceiver/go.sum index 5aa10f0e1c37d..489757486ec97 100644 --- a/receiver/sapmreceiver/go.sum +++ b/receiver/sapmreceiver/go.sum @@ -1161,8 +1161,8 @@ 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.22.1-0.20210322181726-3b1392387bf2 h1:EHW+2owVU4hg5f0sDhxdsIXYmUJSmV6H1KAMwLOC8LM= -go.opentelemetry.io/collector v0.22.1-0.20210322181726-3b1392387bf2/go.mod h1:wMTwy0/4xrFRZj/XX1UH5VAd0WAVts9Rq7ZKQldCIkU= +go.opentelemetry.io/collector v0.22.1-0.20210323150444-0c6757ec71a5 h1:uYfkVpGK++c0AmXdCWh9jhAZ3PiFvhe+7lcyF4eqdqc= +go.opentelemetry.io/collector v0.22.1-0.20210323150444-0c6757ec71a5/go.mod h1:wMTwy0/4xrFRZj/XX1UH5VAd0WAVts9Rq7ZKQldCIkU= go.uber.org/atomic v1.3.2/go.mod h1:gD2HeocX3+yG+ygLZcrzQJaqmWj9AIm7n08wl/qW/PE= go.uber.org/atomic v1.4.0/go.mod h1:gD2HeocX3+yG+ygLZcrzQJaqmWj9AIm7n08wl/qW/PE= go.uber.org/atomic v1.5.0/go.mod h1:sABNBOSYdrvTF6hTgEIbc7YasKWGhgEQZyfxyTvoXHQ= diff --git a/receiver/sapmreceiver/trace_receiver.go b/receiver/sapmreceiver/trace_receiver.go index 5a38ce1de97ca..609bd58c2ab45 100644 --- a/receiver/sapmreceiver/trace_receiver.go +++ b/receiver/sapmreceiver/trace_receiver.go @@ -54,7 +54,7 @@ type sapmReceiver struct { config *Config server *http.Server - nextConsumer consumer.TracesConsumer + nextConsumer consumer.Traces // defaultResponse is a placeholder. For now this receiver returns an empty sapm response. // This defaultResponse is an optimization so we don't have to proto.Marshal the response @@ -218,7 +218,7 @@ func New( ctx context.Context, params component.ReceiverCreateParams, config *Config, - nextConsumer consumer.TracesConsumer, + nextConsumer consumer.Traces, ) (component.TracesReceiver, error) { // build the response message defaultResponse := &splunksapm.PostSpansResponse{} diff --git a/receiver/signalfxreceiver/factory.go b/receiver/signalfxreceiver/factory.go index 1765793ac8d84..77f766c60e9cd 100644 --- a/receiver/signalfxreceiver/factory.go +++ b/receiver/signalfxreceiver/factory.go @@ -94,7 +94,7 @@ func createMetricsReceiver( _ context.Context, params component.ReceiverCreateParams, cfg configmodels.Receiver, - consumer consumer.MetricsConsumer, + consumer consumer.Metrics, ) (component.MetricsReceiver, error) { rCfg := cfg.(*Config) @@ -121,7 +121,7 @@ func createLogsReceiver( _ context.Context, params component.ReceiverCreateParams, cfg configmodels.Receiver, - consumer consumer.LogsConsumer, + consumer consumer.Logs, ) (component.LogsReceiver, error) { rCfg := cfg.(*Config) diff --git a/receiver/signalfxreceiver/go.mod b/receiver/signalfxreceiver/go.mod index 64c71eee23b8b..87bd3bcf8253e 100644 --- a/receiver/signalfxreceiver/go.mod +++ b/receiver/signalfxreceiver/go.mod @@ -9,7 +9,7 @@ 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.22.1-0.20210322181726-3b1392387bf2 + go.opentelemetry.io/collector v0.22.1-0.20210323150444-0c6757ec71a5 go.uber.org/zap v1.16.0 ) diff --git a/receiver/signalfxreceiver/go.sum b/receiver/signalfxreceiver/go.sum index e622b3f39d7f4..9d71bf17676d7 100644 --- a/receiver/signalfxreceiver/go.sum +++ b/receiver/signalfxreceiver/go.sum @@ -1075,8 +1075,8 @@ 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.22.1-0.20210322181726-3b1392387bf2 h1:EHW+2owVU4hg5f0sDhxdsIXYmUJSmV6H1KAMwLOC8LM= -go.opentelemetry.io/collector v0.22.1-0.20210322181726-3b1392387bf2/go.mod h1:wMTwy0/4xrFRZj/XX1UH5VAd0WAVts9Rq7ZKQldCIkU= +go.opentelemetry.io/collector v0.22.1-0.20210323150444-0c6757ec71a5 h1:uYfkVpGK++c0AmXdCWh9jhAZ3PiFvhe+7lcyF4eqdqc= +go.opentelemetry.io/collector v0.22.1-0.20210323150444-0c6757ec71a5/go.mod h1:wMTwy0/4xrFRZj/XX1UH5VAd0WAVts9Rq7ZKQldCIkU= go.uber.org/atomic v1.3.2/go.mod h1:gD2HeocX3+yG+ygLZcrzQJaqmWj9AIm7n08wl/qW/PE= go.uber.org/atomic v1.4.0/go.mod h1:gD2HeocX3+yG+ygLZcrzQJaqmWj9AIm7n08wl/qW/PE= go.uber.org/atomic v1.5.0/go.mod h1:sABNBOSYdrvTF6hTgEIbc7YasKWGhgEQZyfxyTvoXHQ= diff --git a/receiver/signalfxreceiver/receiver.go b/receiver/signalfxreceiver/receiver.go index 1f2330b00994d..582e6956ab2be 100644 --- a/receiver/signalfxreceiver/receiver.go +++ b/receiver/signalfxreceiver/receiver.go @@ -83,8 +83,8 @@ type sfxReceiver struct { sync.Mutex logger *zap.Logger config *Config - metricsConsumer consumer.MetricsConsumer - logsConsumer consumer.LogsConsumer + metricsConsumer consumer.Metrics + logsConsumer consumer.Logs server *http.Server startOnce sync.Once @@ -106,14 +106,14 @@ func newReceiver( return r } -func (r *sfxReceiver) RegisterMetricsConsumer(mc consumer.MetricsConsumer) { +func (r *sfxReceiver) RegisterMetricsConsumer(mc consumer.Metrics) { r.Lock() defer r.Unlock() r.metricsConsumer = mc } -func (r *sfxReceiver) RegisterLogsConsumer(lc consumer.LogsConsumer) { +func (r *sfxReceiver) RegisterLogsConsumer(lc consumer.Logs) { r.Lock() defer r.Unlock() diff --git a/receiver/signalfxreceiver/receiver_test.go b/receiver/signalfxreceiver/receiver_test.go index 28ee3f264ce50..cd2f2188bd698 100644 --- a/receiver/signalfxreceiver/receiver_test.go +++ b/receiver/signalfxreceiver/receiver_test.go @@ -53,7 +53,7 @@ func Test_signalfxeceiver_New(t *testing.T) { defaultConfig := createDefaultConfig().(*Config) type args struct { config Config - nextConsumer consumer.MetricsConsumer + nextConsumer consumer.Metrics } tests := []struct { name string diff --git a/receiver/simpleprometheusreceiver/factory.go b/receiver/simpleprometheusreceiver/factory.go index 8b5d92cae812a..0118f1215a291 100644 --- a/receiver/simpleprometheusreceiver/factory.go +++ b/receiver/simpleprometheusreceiver/factory.go @@ -62,7 +62,7 @@ func createMetricsReceiver( _ context.Context, params component.ReceiverCreateParams, cfg configmodels.Receiver, - nextConsumer consumer.MetricsConsumer, + nextConsumer consumer.Metrics, ) (component.MetricsReceiver, error) { rCfg := cfg.(*Config) return new(params, rCfg, nextConsumer), nil diff --git a/receiver/simpleprometheusreceiver/go.mod b/receiver/simpleprometheusreceiver/go.mod index f3a85852437f6..d42bda106da43 100644 --- a/receiver/simpleprometheusreceiver/go.mod +++ b/receiver/simpleprometheusreceiver/go.mod @@ -14,7 +14,7 @@ require ( github.com/prometheus/common v0.19.0 github.com/prometheus/prometheus v1.8.2-0.20210217141258-a6be548dbc17 github.com/stretchr/testify v1.7.0 - go.opentelemetry.io/collector v0.22.1-0.20210322181726-3b1392387bf2 + go.opentelemetry.io/collector v0.22.1-0.20210323150444-0c6757ec71a5 go.uber.org/zap v1.16.0 gopkg.in/ini.v1 v1.57.0 // indirect k8s.io/client-go v0.20.5 diff --git a/receiver/simpleprometheusreceiver/go.sum b/receiver/simpleprometheusreceiver/go.sum index daa6e9a6117ec..d04fce314b769 100644 --- a/receiver/simpleprometheusreceiver/go.sum +++ b/receiver/simpleprometheusreceiver/go.sum @@ -1054,8 +1054,8 @@ 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.22.1-0.20210322181726-3b1392387bf2 h1:EHW+2owVU4hg5f0sDhxdsIXYmUJSmV6H1KAMwLOC8LM= -go.opentelemetry.io/collector v0.22.1-0.20210322181726-3b1392387bf2/go.mod h1:wMTwy0/4xrFRZj/XX1UH5VAd0WAVts9Rq7ZKQldCIkU= +go.opentelemetry.io/collector v0.22.1-0.20210323150444-0c6757ec71a5 h1:uYfkVpGK++c0AmXdCWh9jhAZ3PiFvhe+7lcyF4eqdqc= +go.opentelemetry.io/collector v0.22.1-0.20210323150444-0c6757ec71a5/go.mod h1:wMTwy0/4xrFRZj/XX1UH5VAd0WAVts9Rq7ZKQldCIkU= go.uber.org/atomic v1.3.2/go.mod h1:gD2HeocX3+yG+ygLZcrzQJaqmWj9AIm7n08wl/qW/PE= go.uber.org/atomic v1.4.0/go.mod h1:gD2HeocX3+yG+ygLZcrzQJaqmWj9AIm7n08wl/qW/PE= go.uber.org/atomic v1.5.0/go.mod h1:sABNBOSYdrvTF6hTgEIbc7YasKWGhgEQZyfxyTvoXHQ= diff --git a/receiver/simpleprometheusreceiver/receiver.go b/receiver/simpleprometheusreceiver/receiver.go index 5c83ed7d03740..fa571ffd1ac5b 100644 --- a/receiver/simpleprometheusreceiver/receiver.go +++ b/receiver/simpleprometheusreceiver/receiver.go @@ -32,12 +32,12 @@ import ( type prometheusReceiverWrapper struct { params component.ReceiverCreateParams config *Config - consumer consumer.MetricsConsumer + consumer consumer.Metrics prometheusRecever component.MetricsReceiver } // new returns a prometheusReceiverWrapper -func new(params component.ReceiverCreateParams, cfg *Config, consumer consumer.MetricsConsumer) *prometheusReceiverWrapper { +func new(params component.ReceiverCreateParams, cfg *Config, consumer consumer.Metrics) *prometheusReceiverWrapper { return &prometheusReceiverWrapper{params: params, config: cfg, consumer: consumer} } diff --git a/receiver/splunkhecreceiver/factory.go b/receiver/splunkhecreceiver/factory.go index 54a1324d58f0c..183abf66c9cb4 100644 --- a/receiver/splunkhecreceiver/factory.go +++ b/receiver/splunkhecreceiver/factory.go @@ -67,7 +67,7 @@ func createTraceReceiver( ctx context.Context, params component.ReceiverCreateParams, cfg configmodels.Receiver, - consumer consumer.TracesConsumer, + consumer consumer.Traces, ) (component.TracesReceiver, error) { return nil, configerror.ErrDataTypeIsNotSupported @@ -78,7 +78,7 @@ func createMetricsReceiver( _ context.Context, params component.ReceiverCreateParams, cfg configmodels.Receiver, - consumer consumer.MetricsConsumer, + consumer consumer.Metrics, ) (component.MetricsReceiver, error) { rCfg := cfg.(*Config) @@ -96,7 +96,7 @@ func createLogsReceiver( _ context.Context, params component.ReceiverCreateParams, cfg configmodels.Receiver, - consumer consumer.LogsConsumer, + consumer consumer.Logs, ) (component.LogsReceiver, error) { rCfg := cfg.(*Config) diff --git a/receiver/splunkhecreceiver/go.mod b/receiver/splunkhecreceiver/go.mod index 8ece2bb2100c7..6833cc801436d 100644 --- a/receiver/splunkhecreceiver/go.mod +++ b/receiver/splunkhecreceiver/go.mod @@ -9,7 +9,7 @@ require ( github.com/open-telemetry/opentelemetry-collector-contrib/internal/splunk v0.0.0-00010101000000-000000000000 github.com/stretchr/testify v1.7.0 go.opencensus.io v0.23.0 - go.opentelemetry.io/collector v0.22.1-0.20210322181726-3b1392387bf2 + go.opentelemetry.io/collector v0.22.1-0.20210323150444-0c6757ec71a5 go.uber.org/zap v1.16.0 ) diff --git a/receiver/splunkhecreceiver/go.sum b/receiver/splunkhecreceiver/go.sum index c2ba4b5219935..19c8332db9fb3 100644 --- a/receiver/splunkhecreceiver/go.sum +++ b/receiver/splunkhecreceiver/go.sum @@ -1033,8 +1033,8 @@ 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.22.1-0.20210322181726-3b1392387bf2 h1:EHW+2owVU4hg5f0sDhxdsIXYmUJSmV6H1KAMwLOC8LM= -go.opentelemetry.io/collector v0.22.1-0.20210322181726-3b1392387bf2/go.mod h1:wMTwy0/4xrFRZj/XX1UH5VAd0WAVts9Rq7ZKQldCIkU= +go.opentelemetry.io/collector v0.22.1-0.20210323150444-0c6757ec71a5 h1:uYfkVpGK++c0AmXdCWh9jhAZ3PiFvhe+7lcyF4eqdqc= +go.opentelemetry.io/collector v0.22.1-0.20210323150444-0c6757ec71a5/go.mod h1:wMTwy0/4xrFRZj/XX1UH5VAd0WAVts9Rq7ZKQldCIkU= go.uber.org/atomic v1.3.2/go.mod h1:gD2HeocX3+yG+ygLZcrzQJaqmWj9AIm7n08wl/qW/PE= go.uber.org/atomic v1.4.0/go.mod h1:gD2HeocX3+yG+ygLZcrzQJaqmWj9AIm7n08wl/qW/PE= go.uber.org/atomic v1.5.0/go.mod h1:sABNBOSYdrvTF6hTgEIbc7YasKWGhgEQZyfxyTvoXHQ= diff --git a/receiver/splunkhecreceiver/receiver.go b/receiver/splunkhecreceiver/receiver.go index d41c151d97c11..38ee00906072a 100644 --- a/receiver/splunkhecreceiver/receiver.go +++ b/receiver/splunkhecreceiver/receiver.go @@ -76,8 +76,8 @@ type splunkReceiver struct { sync.Mutex logger *zap.Logger config *Config - logsConsumer consumer.LogsConsumer - metricsConsumer consumer.MetricsConsumer + logsConsumer consumer.Logs + metricsConsumer consumer.Metrics server *http.Server } @@ -87,7 +87,7 @@ var _ component.MetricsReceiver = (*splunkReceiver)(nil) func NewMetricsReceiver( logger *zap.Logger, config Config, - nextConsumer consumer.MetricsConsumer, + nextConsumer consumer.Metrics, ) (component.MetricsReceiver, error) { if nextConsumer == nil { return nil, errNilNextMetricsConsumer @@ -117,7 +117,7 @@ func NewMetricsReceiver( func NewLogsReceiver( logger *zap.Logger, config Config, - nextConsumer consumer.LogsConsumer, + nextConsumer consumer.Logs, ) (component.LogsReceiver, error) { if nextConsumer == nil { return nil, errNilNextLogsConsumer diff --git a/receiver/splunkhecreceiver/receiver_test.go b/receiver/splunkhecreceiver/receiver_test.go index 767329c72a53f..e451485228a36 100644 --- a/receiver/splunkhecreceiver/receiver_test.go +++ b/receiver/splunkhecreceiver/receiver_test.go @@ -52,7 +52,7 @@ func Test_splunkhecreceiver_NewLogsReceiver(t *testing.T) { emptyEndpointConfig.Endpoint = "" type args struct { config Config - logsConsumer consumer.LogsConsumer + logsConsumer consumer.Logs } tests := []struct { name string @@ -112,7 +112,7 @@ func Test_splunkhecreceiver_NewMetricsReceiver(t *testing.T) { emptyEndpointConfig.Endpoint = "" type args struct { config Config - metricsConsumer consumer.MetricsConsumer + metricsConsumer consumer.Metrics } tests := []struct { name string diff --git a/receiver/statsdreceiver/factory.go b/receiver/statsdreceiver/factory.go index f05db89f57775..32d1950a07ed3 100644 --- a/receiver/statsdreceiver/factory.go +++ b/receiver/statsdreceiver/factory.go @@ -62,7 +62,7 @@ func createMetricsReceiver( _ context.Context, params component.ReceiverCreateParams, cfg configmodels.Receiver, - consumer consumer.MetricsConsumer, + consumer consumer.Metrics, ) (component.MetricsReceiver, error) { c := cfg.(*Config) return New(params.Logger, *c, consumer) diff --git a/receiver/statsdreceiver/go.mod b/receiver/statsdreceiver/go.mod index bf9c42ce6d1b5..fdc939ff51ded 100644 --- a/receiver/statsdreceiver/go.mod +++ b/receiver/statsdreceiver/go.mod @@ -13,7 +13,7 @@ require ( github.com/pelletier/go-toml v1.8.0 // indirect github.com/stretchr/testify v1.7.0 go.opencensus.io v0.23.0 - go.opentelemetry.io/collector v0.22.1-0.20210322181726-3b1392387bf2 + go.opentelemetry.io/collector v0.22.1-0.20210323150444-0c6757ec71a5 go.opentelemetry.io/otel v0.18.0 go.uber.org/zap v1.16.0 gopkg.in/ini.v1 v1.57.0 // indirect diff --git a/receiver/statsdreceiver/go.sum b/receiver/statsdreceiver/go.sum index 46f0ac88454ea..99fefd1cae653 100644 --- a/receiver/statsdreceiver/go.sum +++ b/receiver/statsdreceiver/go.sum @@ -1050,8 +1050,8 @@ 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.22.1-0.20210322181726-3b1392387bf2 h1:EHW+2owVU4hg5f0sDhxdsIXYmUJSmV6H1KAMwLOC8LM= -go.opentelemetry.io/collector v0.22.1-0.20210322181726-3b1392387bf2/go.mod h1:wMTwy0/4xrFRZj/XX1UH5VAd0WAVts9Rq7ZKQldCIkU= +go.opentelemetry.io/collector v0.22.1-0.20210323150444-0c6757ec71a5 h1:uYfkVpGK++c0AmXdCWh9jhAZ3PiFvhe+7lcyF4eqdqc= +go.opentelemetry.io/collector v0.22.1-0.20210323150444-0c6757ec71a5/go.mod h1:wMTwy0/4xrFRZj/XX1UH5VAd0WAVts9Rq7ZKQldCIkU= go.opentelemetry.io/otel v0.18.0 h1:d5Of7+Zw4ANFOJB+TIn2K3QWsgS2Ht7OU9DqZHI6qu8= go.opentelemetry.io/otel v0.18.0/go.mod h1:PT5zQj4lTsR1YeARt8YNKcFb88/c2IKoSABK9mX0r78= go.opentelemetry.io/otel/metric v0.18.0/go.mod h1:kEH2QtzAyBy3xDVQfGZKIcok4ZZFvd5xyKPfPcuK6pE= diff --git a/receiver/statsdreceiver/receiver.go b/receiver/statsdreceiver/receiver.go index 5117de98bedb4..40f16b87c9f43 100644 --- a/receiver/statsdreceiver/receiver.go +++ b/receiver/statsdreceiver/receiver.go @@ -42,7 +42,7 @@ type statsdReceiver struct { server transport.Server reporter transport.Reporter parser protocol.Parser - nextConsumer consumer.MetricsConsumer + nextConsumer consumer.Metrics cancel context.CancelFunc startOnce sync.Once @@ -53,7 +53,7 @@ type statsdReceiver struct { func New( logger *zap.Logger, config Config, - nextConsumer consumer.MetricsConsumer, + nextConsumer consumer.Metrics, ) (component.MetricsReceiver, error) { if nextConsumer == nil { return nil, componenterror.ErrNilNextConsumer @@ -140,7 +140,7 @@ func (r *statsdReceiver) Shutdown(context.Context) error { return err } -func (r *statsdReceiver) Flush(ctx context.Context, metrics pdata.Metrics, nextConsumer consumer.MetricsConsumer) error { +func (r *statsdReceiver) Flush(ctx context.Context, metrics pdata.Metrics, nextConsumer consumer.Metrics) error { error := nextConsumer.ConsumeMetrics(ctx, metrics) if error != nil { return error diff --git a/receiver/statsdreceiver/receiver_test.go b/receiver/statsdreceiver/receiver_test.go index 908d41c7e0a8f..a4dacd7a649e7 100644 --- a/receiver/statsdreceiver/receiver_test.go +++ b/receiver/statsdreceiver/receiver_test.go @@ -43,7 +43,7 @@ func Test_statsdreceiver_New(t *testing.T) { defaultConfig := createDefaultConfig().(*Config) type args struct { config Config - nextConsumer consumer.MetricsConsumer + nextConsumer consumer.Metrics } tests := []struct { name string diff --git a/receiver/statsdreceiver/transport/server.go b/receiver/statsdreceiver/transport/server.go index f616a3b86c1b6..8cba0332a6ae3 100644 --- a/receiver/statsdreceiver/transport/server.go +++ b/receiver/statsdreceiver/transport/server.go @@ -35,7 +35,7 @@ type Server interface { // the Parser and passed to the next consumer. ListenAndServe( p protocol.Parser, - mc consumer.MetricsConsumer, + mc consumer.Metrics, r Reporter, transferChan chan<- string, ) error diff --git a/receiver/statsdreceiver/transport/udp_server.go b/receiver/statsdreceiver/transport/udp_server.go index 46c176d1dbb3d..95436809fb4f8 100644 --- a/receiver/statsdreceiver/transport/udp_server.go +++ b/receiver/statsdreceiver/transport/udp_server.go @@ -47,7 +47,7 @@ func NewUDPServer(addr string) (Server, error) { func (u *udpServer) ListenAndServe( parser protocol.Parser, - nextConsumer consumer.MetricsConsumer, + nextConsumer consumer.Metrics, reporter Reporter, transferChan chan<- string, ) error { diff --git a/receiver/syslogreceiver/go.mod b/receiver/syslogreceiver/go.mod index d84bb552f9436..115dde26857b5 100644 --- a/receiver/syslogreceiver/go.mod +++ b/receiver/syslogreceiver/go.mod @@ -6,7 +6,7 @@ require ( github.com/open-telemetry/opentelemetry-collector-contrib/internal/stanza v0.0.0-00010101000000-000000000000 github.com/open-telemetry/opentelemetry-log-collection v0.16.1-0.20210315170618-aa8d82509c31 github.com/stretchr/testify v1.7.0 - go.opentelemetry.io/collector v0.22.1-0.20210322181726-3b1392387bf2 + go.opentelemetry.io/collector v0.22.1-0.20210323150444-0c6757ec71a5 go.uber.org/zap v1.16.0 gopkg.in/yaml.v2 v2.4.0 ) diff --git a/receiver/syslogreceiver/go.sum b/receiver/syslogreceiver/go.sum index 7ebc85d537e05..9fae7f8d2327c 100644 --- a/receiver/syslogreceiver/go.sum +++ b/receiver/syslogreceiver/go.sum @@ -943,8 +943,8 @@ 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.22.0/go.mod h1:sBkAGYUQSh1f+owCK0aPV2uLcUB6rPHEOWjdvuE2SdQ= -go.opentelemetry.io/collector v0.22.1-0.20210322181726-3b1392387bf2 h1:EHW+2owVU4hg5f0sDhxdsIXYmUJSmV6H1KAMwLOC8LM= -go.opentelemetry.io/collector v0.22.1-0.20210322181726-3b1392387bf2/go.mod h1:wMTwy0/4xrFRZj/XX1UH5VAd0WAVts9Rq7ZKQldCIkU= +go.opentelemetry.io/collector v0.22.1-0.20210323150444-0c6757ec71a5 h1:uYfkVpGK++c0AmXdCWh9jhAZ3PiFvhe+7lcyF4eqdqc= +go.opentelemetry.io/collector v0.22.1-0.20210323150444-0c6757ec71a5/go.mod h1:wMTwy0/4xrFRZj/XX1UH5VAd0WAVts9Rq7ZKQldCIkU= go.uber.org/atomic v1.3.2/go.mod h1:gD2HeocX3+yG+ygLZcrzQJaqmWj9AIm7n08wl/qW/PE= go.uber.org/atomic v1.4.0/go.mod h1:gD2HeocX3+yG+ygLZcrzQJaqmWj9AIm7n08wl/qW/PE= go.uber.org/atomic v1.5.0/go.mod h1:sABNBOSYdrvTF6hTgEIbc7YasKWGhgEQZyfxyTvoXHQ= diff --git a/receiver/wavefrontreceiver/factory.go b/receiver/wavefrontreceiver/factory.go index e932d1adbde9e..5044ba76ed7f3 100644 --- a/receiver/wavefrontreceiver/factory.go +++ b/receiver/wavefrontreceiver/factory.go @@ -60,7 +60,7 @@ func createMetricsReceiver( ctx context.Context, params component.ReceiverCreateParams, cfg configmodels.Receiver, - consumer consumer.MetricsConsumer, + consumer consumer.Metrics, ) (component.MetricsReceiver, error) { rCfg := cfg.(*Config) diff --git a/receiver/wavefrontreceiver/go.mod b/receiver/wavefrontreceiver/go.mod index 7b2f37268eec8..88c13589c9bbc 100644 --- a/receiver/wavefrontreceiver/go.mod +++ b/receiver/wavefrontreceiver/go.mod @@ -7,7 +7,7 @@ require ( github.com/open-telemetry/opentelemetry-collector-contrib/receiver/carbonreceiver v0.0.0-00010101000000-000000000000 github.com/open-telemetry/opentelemetry-collector-contrib/receiver/collectdreceiver v0.0.0-00010101000000-000000000000 github.com/stretchr/testify v1.7.0 - go.opentelemetry.io/collector v0.22.1-0.20210322181726-3b1392387bf2 + go.opentelemetry.io/collector v0.22.1-0.20210323150444-0c6757ec71a5 go.uber.org/zap v1.16.0 google.golang.org/protobuf v1.26.0 ) diff --git a/receiver/wavefrontreceiver/go.sum b/receiver/wavefrontreceiver/go.sum index d027be7f19525..7ba6c61b2829b 100644 --- a/receiver/wavefrontreceiver/go.sum +++ b/receiver/wavefrontreceiver/go.sum @@ -1050,8 +1050,8 @@ 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.22.1-0.20210322181726-3b1392387bf2 h1:EHW+2owVU4hg5f0sDhxdsIXYmUJSmV6H1KAMwLOC8LM= -go.opentelemetry.io/collector v0.22.1-0.20210322181726-3b1392387bf2/go.mod h1:wMTwy0/4xrFRZj/XX1UH5VAd0WAVts9Rq7ZKQldCIkU= +go.opentelemetry.io/collector v0.22.1-0.20210323150444-0c6757ec71a5 h1:uYfkVpGK++c0AmXdCWh9jhAZ3PiFvhe+7lcyF4eqdqc= +go.opentelemetry.io/collector v0.22.1-0.20210323150444-0c6757ec71a5/go.mod h1:wMTwy0/4xrFRZj/XX1UH5VAd0WAVts9Rq7ZKQldCIkU= go.uber.org/atomic v1.3.2/go.mod h1:gD2HeocX3+yG+ygLZcrzQJaqmWj9AIm7n08wl/qW/PE= go.uber.org/atomic v1.4.0/go.mod h1:gD2HeocX3+yG+ygLZcrzQJaqmWj9AIm7n08wl/qW/PE= go.uber.org/atomic v1.5.0/go.mod h1:sABNBOSYdrvTF6hTgEIbc7YasKWGhgEQZyfxyTvoXHQ= diff --git a/receiver/windowsperfcountersreceiver/factory_others.go b/receiver/windowsperfcountersreceiver/factory_others.go index b954a12089e00..ed01a0ab02672 100644 --- a/receiver/windowsperfcountersreceiver/factory_others.go +++ b/receiver/windowsperfcountersreceiver/factory_others.go @@ -30,7 +30,7 @@ func createMetricsReceiver( ctx context.Context, params component.ReceiverCreateParams, cfg configmodels.Receiver, - consumer consumer.MetricsConsumer, + consumer consumer.Metrics, ) (component.MetricsReceiver, error) { return nil, errors.New("the windows perf counters receiver is only supported on Windows") } diff --git a/receiver/windowsperfcountersreceiver/factory_windows.go b/receiver/windowsperfcountersreceiver/factory_windows.go index 8abe89fa57afa..6265d83bb22f6 100644 --- a/receiver/windowsperfcountersreceiver/factory_windows.go +++ b/receiver/windowsperfcountersreceiver/factory_windows.go @@ -30,7 +30,7 @@ func createMetricsReceiver( ctx context.Context, params component.ReceiverCreateParams, cfg configmodels.Receiver, - consumer consumer.MetricsConsumer, + consumer consumer.Metrics, ) (component.MetricsReceiver, error) { oCfg := cfg.(*Config) scraper, err := newScraper(oCfg, params.Logger) diff --git a/receiver/windowsperfcountersreceiver/go.mod b/receiver/windowsperfcountersreceiver/go.mod index 0b5c4cf4d7ace..563acd8fcbe67 100644 --- a/receiver/windowsperfcountersreceiver/go.mod +++ b/receiver/windowsperfcountersreceiver/go.mod @@ -13,7 +13,7 @@ require ( github.com/pelletier/go-toml v1.8.0 // indirect github.com/spf13/viper v1.7.1 github.com/stretchr/testify v1.7.0 - go.opentelemetry.io/collector v0.22.1-0.20210322181726-3b1392387bf2 + go.opentelemetry.io/collector v0.22.1-0.20210323150444-0c6757ec71a5 go.uber.org/zap v1.16.0 golang.org/x/sys v0.0.0-20210309074719-68d13333faf2 gopkg.in/ini.v1 v1.57.0 // indirect diff --git a/receiver/windowsperfcountersreceiver/go.sum b/receiver/windowsperfcountersreceiver/go.sum index d027be7f19525..7ba6c61b2829b 100644 --- a/receiver/windowsperfcountersreceiver/go.sum +++ b/receiver/windowsperfcountersreceiver/go.sum @@ -1050,8 +1050,8 @@ 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.22.1-0.20210322181726-3b1392387bf2 h1:EHW+2owVU4hg5f0sDhxdsIXYmUJSmV6H1KAMwLOC8LM= -go.opentelemetry.io/collector v0.22.1-0.20210322181726-3b1392387bf2/go.mod h1:wMTwy0/4xrFRZj/XX1UH5VAd0WAVts9Rq7ZKQldCIkU= +go.opentelemetry.io/collector v0.22.1-0.20210323150444-0c6757ec71a5 h1:uYfkVpGK++c0AmXdCWh9jhAZ3PiFvhe+7lcyF4eqdqc= +go.opentelemetry.io/collector v0.22.1-0.20210323150444-0c6757ec71a5/go.mod h1:wMTwy0/4xrFRZj/XX1UH5VAd0WAVts9Rq7ZKQldCIkU= go.uber.org/atomic v1.3.2/go.mod h1:gD2HeocX3+yG+ygLZcrzQJaqmWj9AIm7n08wl/qW/PE= go.uber.org/atomic v1.4.0/go.mod h1:gD2HeocX3+yG+ygLZcrzQJaqmWj9AIm7n08wl/qW/PE= go.uber.org/atomic v1.5.0/go.mod h1:sABNBOSYdrvTF6hTgEIbc7YasKWGhgEQZyfxyTvoXHQ= diff --git a/receiver/zookeeperreceiver/factory.go b/receiver/zookeeperreceiver/factory.go index 83ca701ffb7a9..752c12468b0df 100644 --- a/receiver/zookeeperreceiver/factory.go +++ b/receiver/zookeeperreceiver/factory.go @@ -62,7 +62,7 @@ func createMetricsReceiver( _ context.Context, params component.ReceiverCreateParams, config configmodels.Receiver, - consumer consumer.MetricsConsumer, + consumer consumer.Metrics, ) (component.MetricsReceiver, error) { rConfig := config.(*Config) zms, err := newZookeeperMetricsScraper(params.Logger, rConfig) diff --git a/receiver/zookeeperreceiver/go.mod b/receiver/zookeeperreceiver/go.mod index 868436fd504a8..86ee08b2b6772 100644 --- a/receiver/zookeeperreceiver/go.mod +++ b/receiver/zookeeperreceiver/go.mod @@ -13,7 +13,7 @@ require ( github.com/open-telemetry/opentelemetry-collector-contrib/internal/common v0.0.0-00010101000000-000000000000 github.com/pelletier/go-toml v1.8.0 // indirect github.com/stretchr/testify v1.7.0 - go.opentelemetry.io/collector v0.22.1-0.20210322181726-3b1392387bf2 + go.opentelemetry.io/collector v0.22.1-0.20210323150444-0c6757ec71a5 go.uber.org/zap v1.16.0 gopkg.in/ini.v1 v1.57.0 // indirect ) diff --git a/receiver/zookeeperreceiver/go.sum b/receiver/zookeeperreceiver/go.sum index 5281cdc53fbd1..820725b2ab27d 100644 --- a/receiver/zookeeperreceiver/go.sum +++ b/receiver/zookeeperreceiver/go.sum @@ -1056,8 +1056,8 @@ 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.22.1-0.20210322181726-3b1392387bf2 h1:EHW+2owVU4hg5f0sDhxdsIXYmUJSmV6H1KAMwLOC8LM= -go.opentelemetry.io/collector v0.22.1-0.20210322181726-3b1392387bf2/go.mod h1:wMTwy0/4xrFRZj/XX1UH5VAd0WAVts9Rq7ZKQldCIkU= +go.opentelemetry.io/collector v0.22.1-0.20210323150444-0c6757ec71a5 h1:uYfkVpGK++c0AmXdCWh9jhAZ3PiFvhe+7lcyF4eqdqc= +go.opentelemetry.io/collector v0.22.1-0.20210323150444-0c6757ec71a5/go.mod h1:wMTwy0/4xrFRZj/XX1UH5VAd0WAVts9Rq7ZKQldCIkU= go.uber.org/atomic v1.3.2/go.mod h1:gD2HeocX3+yG+ygLZcrzQJaqmWj9AIm7n08wl/qW/PE= go.uber.org/atomic v1.4.0/go.mod h1:gD2HeocX3+yG+ygLZcrzQJaqmWj9AIm7n08wl/qW/PE= go.uber.org/atomic v1.5.0/go.mod h1:sABNBOSYdrvTF6hTgEIbc7YasKWGhgEQZyfxyTvoXHQ= diff --git a/testbed/datareceivers/carbon.go b/testbed/datareceivers/carbon.go index 9d5a0877b16cc..460bc477876f3 100644 --- a/testbed/datareceivers/carbon.go +++ b/testbed/datareceivers/carbon.go @@ -44,7 +44,7 @@ func NewCarbonDataReceiver(port int) *CarbonDataReceiver { } // Start the receiver. -func (cr *CarbonDataReceiver) Start(_ consumer.TracesConsumer, mc consumer.MetricsConsumer, _ consumer.LogsConsumer) error { +func (cr *CarbonDataReceiver) Start(_ consumer.Traces, mc consumer.Metrics, _ consumer.Logs) error { addr := fmt.Sprintf("localhost:%d", cr.Port) config := carbonreceiver.Config{ NetAddr: confignet.NetAddr{ diff --git a/testbed/datareceivers/mockawsxraydatareceiver.go b/testbed/datareceivers/mockawsxraydatareceiver.go index b60729ee89508..8aae9db09c3a1 100644 --- a/testbed/datareceivers/mockawsxraydatareceiver.go +++ b/testbed/datareceivers/mockawsxraydatareceiver.go @@ -43,7 +43,7 @@ func NewMockAwsXrayDataReceiver(port int) *MockAwsXrayDataReceiver { } //Start listening on the specified port -func (ar *MockAwsXrayDataReceiver) Start(tc consumer.TracesConsumer, _ consumer.MetricsConsumer, _ consumer.LogsConsumer) error { +func (ar *MockAwsXrayDataReceiver) Start(tc consumer.Traces, _ consumer.Metrics, _ consumer.Logs) error { var err error os.Setenv("AWS_ACCESS_KEY_ID", "AWS_ACCESS_KEY_ID") os.Setenv("AWS_SECRET_ACCESS_KEY", "AWS_SECRET_ACCESS_KEY") diff --git a/testbed/datareceivers/sapm.go b/testbed/datareceivers/sapm.go index 84ba5daccc6a1..a0bb052d53744 100644 --- a/testbed/datareceivers/sapm.go +++ b/testbed/datareceivers/sapm.go @@ -40,7 +40,7 @@ func NewSapmDataReceiver(port int) *SapmDataReceiver { } // Start the receiver. -func (sr *SapmDataReceiver) Start(tc consumer.TracesConsumer, _ consumer.MetricsConsumer, _ consumer.LogsConsumer) error { +func (sr *SapmDataReceiver) Start(tc consumer.Traces, _ consumer.Metrics, _ consumer.Logs) error { sapmCfg := sapmreceiver.Config{ HTTPServerSettings: confighttp.HTTPServerSettings{ Endpoint: fmt.Sprintf("localhost:%d", sr.Port), diff --git a/testbed/datareceivers/signalfx.go b/testbed/datareceivers/signalfx.go index 44d6ee8593987..9769e0718bf26 100644 --- a/testbed/datareceivers/signalfx.go +++ b/testbed/datareceivers/signalfx.go @@ -43,7 +43,7 @@ func NewSFxMetricsDataReceiver(port int) *SFxMetricsDataReceiver { } // Start the receiver. -func (sr *SFxMetricsDataReceiver) Start(_ consumer.TracesConsumer, mc consumer.MetricsConsumer, _ consumer.LogsConsumer) error { +func (sr *SFxMetricsDataReceiver) Start(_ consumer.Traces, mc consumer.Metrics, _ consumer.Logs) error { config := signalfxreceiver.Config{ HTTPServerSettings: confighttp.HTTPServerSettings{ Endpoint: fmt.Sprintf("localhost:%d", sr.Port), diff --git a/testbed/datasenders/carbon.go b/testbed/datasenders/carbon.go index a6aff67e20150..3bf579d771e45 100644 --- a/testbed/datasenders/carbon.go +++ b/testbed/datasenders/carbon.go @@ -30,7 +30,7 @@ import ( // CarbonDataSender implements MetricDataSender for Carbon metrics protocol. type CarbonDataSender struct { testbed.DataSenderBase - consumer.MetricsConsumer + consumer.Metrics } // Ensure CarbonDataSender implements MetricDataSenderOld. @@ -62,7 +62,7 @@ func (cs *CarbonDataSender) Start() error { return err } - cs.MetricsConsumer = exporter + cs.Metrics = exporter return nil } diff --git a/testbed/datasenders/sapm.go b/testbed/datasenders/sapm.go index ffbcefb431f6f..0f429a6889d3d 100644 --- a/testbed/datasenders/sapm.go +++ b/testbed/datasenders/sapm.go @@ -29,7 +29,7 @@ import ( // SapmDataSender implements TraceDataSender for SAPM protocol. type SapmDataSender struct { testbed.DataSenderBase - consumer.TracesConsumer + consumer.Traces } // Ensure SapmDataSender implements TraceDataSenderOld. @@ -63,7 +63,7 @@ func (je *SapmDataSender) Start() error { return err } - je.TracesConsumer = exporter + je.Traces = exporter return err } diff --git a/testbed/datasenders/signalfx.go b/testbed/datasenders/signalfx.go index 6e055e037c6cd..06890226f9145 100644 --- a/testbed/datasenders/signalfx.go +++ b/testbed/datasenders/signalfx.go @@ -29,7 +29,7 @@ import ( // SFxMetricsDataSender implements MetricDataSender for SignalFx metrics protocol. type SFxMetricsDataSender struct { testbed.DataSenderBase - consumer.MetricsConsumer + consumer.Metrics } // Ensure SFxMetricsDataSender implements MetricDataSenderOld. @@ -62,7 +62,7 @@ func (sf *SFxMetricsDataSender) Start() error { return err } - sf.MetricsConsumer = exporter + sf.Metrics = exporter return nil } diff --git a/testbed/go.mod b/testbed/go.mod index d4128e0742dd9..0ae4b94a6e953 100644 --- a/testbed/go.mod +++ b/testbed/go.mod @@ -11,7 +11,7 @@ require ( github.com/open-telemetry/opentelemetry-collector-contrib/receiver/sapmreceiver v0.0.0-00010101000000-000000000000 github.com/open-telemetry/opentelemetry-collector-contrib/receiver/signalfxreceiver v0.0.0-00010101000000-000000000000 github.com/open-telemetry/opentelemetry-collector-contrib/testbed/mockdatareceivers/mockawsxrayreceiver v0.0.0-00010101000000-000000000000 - go.opentelemetry.io/collector v0.22.1-0.20210322181726-3b1392387bf2 + go.opentelemetry.io/collector v0.22.1-0.20210323150444-0c6757ec71a5 go.uber.org/zap v1.16.0 ) diff --git a/testbed/go.sum b/testbed/go.sum index a6099bfe051ba..9964f86499f1a 100644 --- a/testbed/go.sum +++ b/testbed/go.sum @@ -1220,8 +1220,8 @@ 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.22.1-0.20210322181726-3b1392387bf2 h1:EHW+2owVU4hg5f0sDhxdsIXYmUJSmV6H1KAMwLOC8LM= -go.opentelemetry.io/collector v0.22.1-0.20210322181726-3b1392387bf2/go.mod h1:wMTwy0/4xrFRZj/XX1UH5VAd0WAVts9Rq7ZKQldCIkU= +go.opentelemetry.io/collector v0.22.1-0.20210323150444-0c6757ec71a5 h1:uYfkVpGK++c0AmXdCWh9jhAZ3PiFvhe+7lcyF4eqdqc= +go.opentelemetry.io/collector v0.22.1-0.20210323150444-0c6757ec71a5/go.mod h1:wMTwy0/4xrFRZj/XX1UH5VAd0WAVts9Rq7ZKQldCIkU= go.uber.org/atomic v1.3.2/go.mod h1:gD2HeocX3+yG+ygLZcrzQJaqmWj9AIm7n08wl/qW/PE= go.uber.org/atomic v1.4.0/go.mod h1:gD2HeocX3+yG+ygLZcrzQJaqmWj9AIm7n08wl/qW/PE= go.uber.org/atomic v1.5.0/go.mod h1:sABNBOSYdrvTF6hTgEIbc7YasKWGhgEQZyfxyTvoXHQ= diff --git a/testbed/mockdatareceivers/mockawsxrayreceiver/factory.go b/testbed/mockdatareceivers/mockawsxrayreceiver/factory.go index 4bc27f6c720cc..acaf3a24a9714 100644 --- a/testbed/mockdatareceivers/mockawsxrayreceiver/factory.go +++ b/testbed/mockdatareceivers/mockawsxrayreceiver/factory.go @@ -57,7 +57,7 @@ func createTraceReceiver( ctx context.Context, params component.ReceiverCreateParams, cfg configmodels.Receiver, - nextConsumer consumer.TracesConsumer, + nextConsumer consumer.Traces, ) (component.TracesReceiver, error) { rCfg := cfg.(*Config) return New(nextConsumer, params, rCfg) diff --git a/testbed/mockdatareceivers/mockawsxrayreceiver/go.mod b/testbed/mockdatareceivers/mockawsxrayreceiver/go.mod index 92da230b34352..b3a06eaf63908 100644 --- a/testbed/mockdatareceivers/mockawsxrayreceiver/go.mod +++ b/testbed/mockdatareceivers/mockawsxrayreceiver/go.mod @@ -5,7 +5,7 @@ go 1.14 require ( github.com/gorilla/mux v1.8.0 github.com/pelletier/go-toml v1.8.0 // indirect - go.opentelemetry.io/collector v0.22.1-0.20210322181726-3b1392387bf2 + go.opentelemetry.io/collector v0.22.1-0.20210323150444-0c6757ec71a5 go.uber.org/zap v1.16.0 gopkg.in/ini.v1 v1.57.0 // indirect ) diff --git a/testbed/mockdatareceivers/mockawsxrayreceiver/go.sum b/testbed/mockdatareceivers/mockawsxrayreceiver/go.sum index d605fed9be060..55bd43ce49042 100644 --- a/testbed/mockdatareceivers/mockawsxrayreceiver/go.sum +++ b/testbed/mockdatareceivers/mockawsxrayreceiver/go.sum @@ -893,8 +893,8 @@ 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.22.1-0.20210322181726-3b1392387bf2 h1:EHW+2owVU4hg5f0sDhxdsIXYmUJSmV6H1KAMwLOC8LM= -go.opentelemetry.io/collector v0.22.1-0.20210322181726-3b1392387bf2/go.mod h1:wMTwy0/4xrFRZj/XX1UH5VAd0WAVts9Rq7ZKQldCIkU= +go.opentelemetry.io/collector v0.22.1-0.20210323150444-0c6757ec71a5 h1:uYfkVpGK++c0AmXdCWh9jhAZ3PiFvhe+7lcyF4eqdqc= +go.opentelemetry.io/collector v0.22.1-0.20210323150444-0c6757ec71a5/go.mod h1:wMTwy0/4xrFRZj/XX1UH5VAd0WAVts9Rq7ZKQldCIkU= go.uber.org/atomic v1.3.2/go.mod h1:gD2HeocX3+yG+ygLZcrzQJaqmWj9AIm7n08wl/qW/PE= go.uber.org/atomic v1.4.0/go.mod h1:gD2HeocX3+yG+ygLZcrzQJaqmWj9AIm7n08wl/qW/PE= go.uber.org/atomic v1.5.0/go.mod h1:sABNBOSYdrvTF6hTgEIbc7YasKWGhgEQZyfxyTvoXHQ= diff --git a/testbed/mockdatareceivers/mockawsxrayreceiver/trace_receiver.go b/testbed/mockdatareceivers/mockawsxrayreceiver/trace_receiver.go index 161220e8c8850..9645354ae6410 100644 --- a/testbed/mockdatareceivers/mockawsxrayreceiver/trace_receiver.go +++ b/testbed/mockdatareceivers/mockawsxrayreceiver/trace_receiver.go @@ -43,12 +43,12 @@ type MockAwsXrayReceiver struct { config *Config server *http.Server - nextConsumer consumer.TracesConsumer + nextConsumer consumer.Traces } // New creates a new awsxrayreceiver.MockAwsXrayReceiver reference. func New( - nextConsumer consumer.TracesConsumer, + nextConsumer consumer.Traces, params component.ReceiverCreateParams, config *Config) (*MockAwsXrayReceiver, error) { if nextConsumer == nil {