From aa47d3b79864175a7165fd98d4e37412211ca7c2 Mon Sep 17 00:00:00 2001 From: Bogdan Drutu Date: Tue, 20 Oct 2020 10:41:46 -0700 Subject: [PATCH] Update to latest collector, update deprecated calls (#1308) Signed-off-by: Bogdan Drutu --- .../alibabacloudlogserviceexporter/go.mod | 2 +- .../alibabacloudlogserviceexporter/go.sum | 4 +-- exporter/awsemfexporter/go.mod | 2 +- exporter/awsemfexporter/go.sum | 4 +-- exporter/awsxrayexporter/go.mod | 4 +-- exporter/awsxrayexporter/go.sum | 8 +++--- 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/elasticexporter/go.mod | 2 +- exporter/elasticexporter/go.sum | 4 +-- exporter/honeycombexporter/go.mod | 2 +- exporter/honeycombexporter/go.sum | 4 +-- exporter/jaegerthrifthttpexporter/go.mod | 2 +- exporter/jaegerthrifthttpexporter/go.sum | 4 +-- exporter/kinesisexporter/go.mod | 2 +- exporter/kinesisexporter/go.sum | 4 +-- exporter/logzioexporter/go.mod | 2 +- exporter/logzioexporter/go.sum | 4 +-- exporter/newrelicexporter/go.mod | 2 +- exporter/newrelicexporter/go.sum | 4 +-- exporter/sapmexporter/go.mod | 2 +- exporter/sapmexporter/go.sum | 4 +-- exporter/sentryexporter/go.mod | 2 +- exporter/sentryexporter/go.sum | 4 +-- exporter/signalfxexporter/go.mod | 2 +- exporter/signalfxexporter/go.sum | 16 +++++------ exporter/splunkhecexporter/go.mod | 2 +- exporter/splunkhecexporter/go.sum | 4 +-- exporter/stackdriverexporter/go.mod | 2 +- exporter/stackdriverexporter/go.sum | 4 +-- extension/httpforwarder/go.mod | 2 +- extension/httpforwarder/go.sum | 4 +-- extension/jmxmetricsextension/go.mod | 2 +- extension/jmxmetricsextension/go.sum | 4 +-- extension/observer/hostobserver/go.mod | 2 +- extension/observer/hostobserver/go.sum | 4 +-- extension/observer/k8sobserver/go.mod | 8 +++--- extension/observer/k8sobserver/go.sum | 16 +++++------ go.mod | 2 +- go.sum | 21 ++++++++------ internal/common/go.mod | 2 +- internal/common/go.sum | 4 +-- processor/groupbytraceprocessor/go.mod | 2 +- processor/groupbytraceprocessor/go.sum | 5 ++-- processor/k8sprocessor/factory_test.go | 14 +++++----- processor/k8sprocessor/go.mod | 8 +++--- processor/k8sprocessor/go.sum | 16 +++++------ processor/k8sprocessor/processor_test.go | 22 +++++++-------- .../metricstransformprocessor/factory_test.go | 6 ++-- processor/metricstransformprocessor/go.mod | 2 +- processor/metricstransformprocessor/go.sum | 4 +-- .../metrics_transform_processor_test.go | 6 ++-- .../factory_test.go | 14 +++++----- processor/resourcedetectionprocessor/go.mod | 2 +- processor/resourcedetectionprocessor/go.sum | 4 +-- .../resourcedetection_processor_test.go | 14 +++++----- processor/routingprocessor/factory_test.go | 16 +++++------ processor/routingprocessor/go.mod | 2 +- processor/routingprocessor/go.sum | 4 +-- .../awsecscontainermetricsreceiver/go.mod | 2 +- .../awsecscontainermetricsreceiver/go.sum | 4 +-- .../receiver_test.go | 12 ++++---- receiver/awsxrayreceiver/go.mod | 4 +-- receiver/awsxrayreceiver/go.sum | 8 +++--- receiver/awsxrayreceiver/receiver_test.go | 14 +++++----- receiver/carbonreceiver/factory_test.go | 4 +-- receiver/carbonreceiver/go.mod | 2 +- receiver/carbonreceiver/go.sum | 4 +-- receiver/carbonreceiver/receiver_test.go | 16 +++++------ .../carbonreceiver/transport/server_test.go | 4 +-- receiver/collectdreceiver/factory_test.go | 4 +-- receiver/collectdreceiver/go.mod | 2 +- receiver/collectdreceiver/go.sum | 4 +-- receiver/collectdreceiver/receiver_test.go | 6 ++-- receiver/dockerstatsreceiver/go.mod | 2 +- receiver/dockerstatsreceiver/go.sum | 4 +-- .../dockerstatsreceiver/integration_test.go | 12 ++++---- receiver/k8sclusterreceiver/factory_test.go | 8 +++--- receiver/k8sclusterreceiver/go.mod | 2 +- receiver/k8sclusterreceiver/go.sum | 19 +++++++++---- .../k8sclusterreceiver/mock_exporter_test.go | 4 +-- receiver/k8sclusterreceiver/receiver_test.go | 10 +++---- receiver/kubeletstatsreceiver/go.mod | 8 +++--- receiver/kubeletstatsreceiver/go.sum | 16 +++++------ .../kubeletstatsreceiver/runnable_test.go | 16 +++++------ receiver/prometheusexecreceiver/factory.go | 2 +- receiver/prometheusexecreceiver/go.mod | 2 +- receiver/prometheusexecreceiver/go.sum | 4 +-- receiver/prometheusexecreceiver/receiver.go | 4 +-- .../prometheusexecreceiver/receiver_test.go | 12 ++++---- receiver/receivercreator/go.mod | 2 +- receiver/receivercreator/go.sum | 4 +-- receiver/redisreceiver/go.mod | 2 +- receiver/redisreceiver/go.sum | 4 +-- receiver/redisreceiver/redis_e2e_test.go | 4 +-- receiver/redisreceiver/redis_runnable_test.go | 4 +-- receiver/sapmreceiver/go.mod | 2 +- receiver/sapmreceiver/go.sum | 4 +-- receiver/sapmreceiver/trace_receiver_test.go | 8 +++--- receiver/signalfxreceiver/factory_test.go | 18 ++++++------ receiver/signalfxreceiver/go.mod | 2 +- receiver/signalfxreceiver/go.sum | 16 +++++------ receiver/signalfxreceiver/receiver_test.go | 18 ++++++------ receiver/simpleprometheusreceiver/go.mod | 2 +- receiver/simpleprometheusreceiver/go.sum | 4 +-- receiver/splunkhecreceiver/factory_test.go | 10 +++---- receiver/splunkhecreceiver/go.mod | 2 +- receiver/splunkhecreceiver/go.sum | 4 +-- receiver/splunkhecreceiver/receiver_test.go | 28 +++++++++---------- receiver/stanzareceiver/go.mod | 2 +- receiver/stanzareceiver/go.sum | 4 +-- receiver/statsdreceiver/factory_test.go | 4 +-- receiver/statsdreceiver/go.mod | 2 +- receiver/statsdreceiver/go.sum | 4 +-- receiver/statsdreceiver/receiver_test.go | 10 +++---- .../statsdreceiver/transport/server_test.go | 4 +-- receiver/wavefrontreceiver/factory_test.go | 4 +-- receiver/wavefrontreceiver/go.mod | 2 +- receiver/wavefrontreceiver/go.sum | 4 +-- receiver/wavefrontreceiver/receiver_test.go | 4 +-- testbed/go.mod | 2 +- testbed/go.sum | 16 +++++------ 126 files changed, 378 insertions(+), 369 deletions(-) diff --git a/exporter/alibabacloudlogserviceexporter/go.mod b/exporter/alibabacloudlogserviceexporter/go.mod index 2f6da24eeb849..a105c9aacf6f0 100644 --- a/exporter/alibabacloudlogserviceexporter/go.mod +++ b/exporter/alibabacloudlogserviceexporter/go.mod @@ -7,7 +7,7 @@ require ( github.com/census-instrumentation/opencensus-proto v0.3.0 github.com/gogo/protobuf v1.3.1 github.com/stretchr/testify v1.6.1 - go.opentelemetry.io/collector v0.13.0 + go.opentelemetry.io/collector v0.13.1-0.20201020144745-846222e6af7a go.uber.org/zap v1.16.0 google.golang.org/protobuf v1.25.0 ) diff --git a/exporter/alibabacloudlogserviceexporter/go.sum b/exporter/alibabacloudlogserviceexporter/go.sum index 2737bf1ead802..473cb6302448d 100644 --- a/exporter/alibabacloudlogserviceexporter/go.sum +++ b/exporter/alibabacloudlogserviceexporter/go.sum @@ -1025,8 +1025,8 @@ go.opencensus.io v0.22.2/go.mod h1:yxeiOL68Rb0Xd1ddK5vPZ/oVn4vY4Ynel7k9FzqtOIw= go.opencensus.io v0.22.3/go.mod h1:yxeiOL68Rb0Xd1ddK5vPZ/oVn4vY4Ynel7k9FzqtOIw= go.opencensus.io v0.22.4 h1:LYy1Hy3MJdrCdMwwzxA/dRok4ejH+RwNGbuoD9fCjto= go.opencensus.io v0.22.4/go.mod h1:yxeiOL68Rb0Xd1ddK5vPZ/oVn4vY4Ynel7k9FzqtOIw= -go.opentelemetry.io/collector v0.13.0 h1:w5DywMfxHIoGhomH382SJn95+TGQDTz5r9n4bBACe4Y= -go.opentelemetry.io/collector v0.13.0/go.mod h1:UB7wWD7RrEx8GFSaUR47TO1GAqxSi5+Kq68tI1icwJk= +go.opentelemetry.io/collector v0.13.1-0.20201020144745-846222e6af7a h1:eKbcrh2zBlQqQtrNCIDy3taW9si3b2DcILtLG8zd6hc= +go.opentelemetry.io/collector v0.13.1-0.20201020144745-846222e6af7a/go.mod h1:UB7wWD7RrEx8GFSaUR47TO1GAqxSi5+Kq68tI1icwJk= 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 5263780ef5ca7..fc845ed6def2e 100644 --- a/exporter/awsemfexporter/go.mod +++ b/exporter/awsemfexporter/go.mod @@ -8,6 +8,6 @@ require ( github.com/golang/protobuf v1.4.2 github.com/google/uuid v1.1.2 github.com/stretchr/testify v1.6.1 - go.opentelemetry.io/collector v0.13.0 + go.opentelemetry.io/collector v0.13.1-0.20201020144745-846222e6af7a go.uber.org/zap v1.16.0 ) diff --git a/exporter/awsemfexporter/go.sum b/exporter/awsemfexporter/go.sum index 792e988ad8d3b..41ab6b79264a0 100644 --- a/exporter/awsemfexporter/go.sum +++ b/exporter/awsemfexporter/go.sum @@ -1116,8 +1116,8 @@ go.opencensus.io v0.22.2/go.mod h1:yxeiOL68Rb0Xd1ddK5vPZ/oVn4vY4Ynel7k9FzqtOIw= go.opencensus.io v0.22.3/go.mod h1:yxeiOL68Rb0Xd1ddK5vPZ/oVn4vY4Ynel7k9FzqtOIw= go.opencensus.io v0.22.4 h1:LYy1Hy3MJdrCdMwwzxA/dRok4ejH+RwNGbuoD9fCjto= go.opencensus.io v0.22.4/go.mod h1:yxeiOL68Rb0Xd1ddK5vPZ/oVn4vY4Ynel7k9FzqtOIw= -go.opentelemetry.io/collector v0.13.0 h1:w5DywMfxHIoGhomH382SJn95+TGQDTz5r9n4bBACe4Y= -go.opentelemetry.io/collector v0.13.0/go.mod h1:UB7wWD7RrEx8GFSaUR47TO1GAqxSi5+Kq68tI1icwJk= +go.opentelemetry.io/collector v0.13.1-0.20201020144745-846222e6af7a h1:eKbcrh2zBlQqQtrNCIDy3taW9si3b2DcILtLG8zd6hc= +go.opentelemetry.io/collector v0.13.1-0.20201020144745-846222e6af7a/go.mod h1:UB7wWD7RrEx8GFSaUR47TO1GAqxSi5+Kq68tI1icwJk= 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 8ddde76a4e3bc..2d694f72d8b77 100644 --- a/exporter/awsxrayexporter/go.mod +++ b/exporter/awsxrayexporter/go.mod @@ -3,10 +3,10 @@ module github.com/open-telemetry/opentelemetry-collector-contrib/exporter/awsxra go 1.14 require ( - github.com/aws/aws-sdk-go v1.35.9 + github.com/aws/aws-sdk-go v1.35.10 github.com/open-telemetry/opentelemetry-collector-contrib/internal/awsxray v0.0.0-00010101000000-000000000000 github.com/stretchr/testify v1.6.1 - go.opentelemetry.io/collector v0.13.0 + go.opentelemetry.io/collector v0.13.1-0.20201020144745-846222e6af7a go.uber.org/zap v1.16.0 golang.org/x/net v0.0.0-20200822124328-c89045814202 google.golang.org/grpc/examples v0.0.0-20200728194956-1c32b02682df // indirect diff --git a/exporter/awsxrayexporter/go.sum b/exporter/awsxrayexporter/go.sum index 458e6d05e3e82..0325c5f8d8122 100644 --- a/exporter/awsxrayexporter/go.sum +++ b/exporter/awsxrayexporter/go.sum @@ -129,8 +129,8 @@ github.com/asaskevich/govalidator v0.0.0-20200108200545-475eaeb16496/go.mod h1:o github.com/aws/aws-lambda-go v1.13.3/go.mod h1:4UKl9IzQMoD+QF79YdCuzCwp8VbmG4VAQwij/eHl5CU= github.com/aws/aws-sdk-go v1.27.0/go.mod h1:KmX6BPdI08NWTb3/sm4ZGu5ShLoqVDhKgpiN924inxo= github.com/aws/aws-sdk-go v1.34.9/go.mod h1:5zCpMtNQVjRREroY7sYe8lOMRSxkhG6MZveU8YkpAk0= -github.com/aws/aws-sdk-go v1.35.9 h1:b1HiUpdkFLJyoOQ7zas36YHzjNHH0ivHx/G5lWBeg+U= -github.com/aws/aws-sdk-go v1.35.9/go.mod h1:tlPOdRjfxPBpNIwqDj61rmsnA85v9jc0Ps9+muhnW+k= +github.com/aws/aws-sdk-go v1.35.10 h1:FsJtrOS7P+Qmq1rPTGgS/+qC1Y9eGuAJHvAZpZlhmb4= +github.com/aws/aws-sdk-go v1.35.10/go.mod h1:tlPOdRjfxPBpNIwqDj61rmsnA85v9jc0Ps9+muhnW+k= github.com/aws/aws-sdk-go-v2 v0.18.0/go.mod h1:JWVYvqSMppoMJC0x5wdwiImzgXTI9FuZwxzkQq9wy+g= github.com/beorn7/perks v0.0.0-20180321164747-3a771d992973/go.mod h1:Dwedo/Wpr24TaqPxmxbtue+5NUziq4I4S80YR8gNf3Q= github.com/beorn7/perks v1.0.0/go.mod h1:KWe93zE9D1o94FZ5RNwFwVgaQK1VOXiVxmqh+CedLV8= @@ -1120,8 +1120,8 @@ go.opencensus.io v0.22.2/go.mod h1:yxeiOL68Rb0Xd1ddK5vPZ/oVn4vY4Ynel7k9FzqtOIw= go.opencensus.io v0.22.3/go.mod h1:yxeiOL68Rb0Xd1ddK5vPZ/oVn4vY4Ynel7k9FzqtOIw= go.opencensus.io v0.22.4 h1:LYy1Hy3MJdrCdMwwzxA/dRok4ejH+RwNGbuoD9fCjto= go.opencensus.io v0.22.4/go.mod h1:yxeiOL68Rb0Xd1ddK5vPZ/oVn4vY4Ynel7k9FzqtOIw= -go.opentelemetry.io/collector v0.13.0 h1:w5DywMfxHIoGhomH382SJn95+TGQDTz5r9n4bBACe4Y= -go.opentelemetry.io/collector v0.13.0/go.mod h1:UB7wWD7RrEx8GFSaUR47TO1GAqxSi5+Kq68tI1icwJk= +go.opentelemetry.io/collector v0.13.1-0.20201020144745-846222e6af7a h1:eKbcrh2zBlQqQtrNCIDy3taW9si3b2DcILtLG8zd6hc= +go.opentelemetry.io/collector v0.13.1-0.20201020144745-846222e6af7a/go.mod h1:UB7wWD7RrEx8GFSaUR47TO1GAqxSi5+Kq68tI1icwJk= 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 dd20db20d652b..9de0a1e4285b6 100644 --- a/exporter/azuremonitorexporter/go.mod +++ b/exporter/azuremonitorexporter/go.mod @@ -7,7 +7,7 @@ require ( github.com/microsoft/ApplicationInsights-Go v0.4.3 github.com/stretchr/testify v1.6.1 github.com/tedsuo/ifrit v0.0.0-20191009134036-9a97d0632f00 // indirect - go.opentelemetry.io/collector v0.13.0 + go.opentelemetry.io/collector v0.13.1-0.20201020144745-846222e6af7a go.uber.org/zap v1.16.0 golang.org/x/net v0.0.0-20200822124328-c89045814202 google.golang.org/grpc v1.32.0 diff --git a/exporter/azuremonitorexporter/go.sum b/exporter/azuremonitorexporter/go.sum index 6886b80cb72b0..9ad766706f39d 100644 --- a/exporter/azuremonitorexporter/go.sum +++ b/exporter/azuremonitorexporter/go.sum @@ -1126,8 +1126,8 @@ go.opencensus.io v0.22.2/go.mod h1:yxeiOL68Rb0Xd1ddK5vPZ/oVn4vY4Ynel7k9FzqtOIw= go.opencensus.io v0.22.3/go.mod h1:yxeiOL68Rb0Xd1ddK5vPZ/oVn4vY4Ynel7k9FzqtOIw= go.opencensus.io v0.22.4 h1:LYy1Hy3MJdrCdMwwzxA/dRok4ejH+RwNGbuoD9fCjto= go.opencensus.io v0.22.4/go.mod h1:yxeiOL68Rb0Xd1ddK5vPZ/oVn4vY4Ynel7k9FzqtOIw= -go.opentelemetry.io/collector v0.13.0 h1:w5DywMfxHIoGhomH382SJn95+TGQDTz5r9n4bBACe4Y= -go.opentelemetry.io/collector v0.13.0/go.mod h1:UB7wWD7RrEx8GFSaUR47TO1GAqxSi5+Kq68tI1icwJk= +go.opentelemetry.io/collector v0.13.1-0.20201020144745-846222e6af7a h1:eKbcrh2zBlQqQtrNCIDy3taW9si3b2DcILtLG8zd6hc= +go.opentelemetry.io/collector v0.13.1-0.20201020144745-846222e6af7a/go.mod h1:UB7wWD7RrEx8GFSaUR47TO1GAqxSi5+Kq68tI1icwJk= 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 0cbd570eab0ca..ba56277e757a2 100644 --- a/exporter/carbonexporter/go.mod +++ b/exporter/carbonexporter/go.mod @@ -5,7 +5,7 @@ go 1.14 require ( github.com/census-instrumentation/opencensus-proto v0.3.0 github.com/stretchr/testify v1.6.1 - go.opentelemetry.io/collector v0.13.0 + go.opentelemetry.io/collector v0.13.1-0.20201020144745-846222e6af7a go.uber.org/zap v1.16.0 google.golang.org/grpc/examples v0.0.0-20200728194956-1c32b02682df // indirect ) diff --git a/exporter/carbonexporter/go.sum b/exporter/carbonexporter/go.sum index 53960005fe126..9ae00a4751369 100644 --- a/exporter/carbonexporter/go.sum +++ b/exporter/carbonexporter/go.sum @@ -1116,8 +1116,8 @@ go.opencensus.io v0.22.2/go.mod h1:yxeiOL68Rb0Xd1ddK5vPZ/oVn4vY4Ynel7k9FzqtOIw= go.opencensus.io v0.22.3/go.mod h1:yxeiOL68Rb0Xd1ddK5vPZ/oVn4vY4Ynel7k9FzqtOIw= go.opencensus.io v0.22.4 h1:LYy1Hy3MJdrCdMwwzxA/dRok4ejH+RwNGbuoD9fCjto= go.opencensus.io v0.22.4/go.mod h1:yxeiOL68Rb0Xd1ddK5vPZ/oVn4vY4Ynel7k9FzqtOIw= -go.opentelemetry.io/collector v0.13.0 h1:w5DywMfxHIoGhomH382SJn95+TGQDTz5r9n4bBACe4Y= -go.opentelemetry.io/collector v0.13.0/go.mod h1:UB7wWD7RrEx8GFSaUR47TO1GAqxSi5+Kq68tI1icwJk= +go.opentelemetry.io/collector v0.13.1-0.20201020144745-846222e6af7a h1:eKbcrh2zBlQqQtrNCIDy3taW9si3b2DcILtLG8zd6hc= +go.opentelemetry.io/collector v0.13.1-0.20201020144745-846222e6af7a/go.mod h1:UB7wWD7RrEx8GFSaUR47TO1GAqxSi5+Kq68tI1icwJk= 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 9bb564e6e700c..f1e8a7b0618cb 100644 --- a/exporter/datadogexporter/go.mod +++ b/exporter/datadogexporter/go.mod @@ -12,7 +12,7 @@ require ( github.com/stretchr/testify v1.6.1 github.com/zorkian/go-datadog-api v2.29.0+incompatible // indirect go.opencensus.io v0.22.4 - go.opentelemetry.io/collector v0.13.0 + go.opentelemetry.io/collector v0.13.1-0.20201020144745-846222e6af7a go.uber.org/zap v1.16.0 gopkg.in/DataDog/dd-trace-go.v1 v1.26.0 gopkg.in/zorkian/go-datadog-api.v2 v2.29.0 diff --git a/exporter/datadogexporter/go.sum b/exporter/datadogexporter/go.sum index 4e6a0e8436e38..59afc574009a8 100644 --- a/exporter/datadogexporter/go.sum +++ b/exporter/datadogexporter/go.sum @@ -1135,8 +1135,8 @@ go.opencensus.io v0.22.2/go.mod h1:yxeiOL68Rb0Xd1ddK5vPZ/oVn4vY4Ynel7k9FzqtOIw= go.opencensus.io v0.22.3/go.mod h1:yxeiOL68Rb0Xd1ddK5vPZ/oVn4vY4Ynel7k9FzqtOIw= go.opencensus.io v0.22.4 h1:LYy1Hy3MJdrCdMwwzxA/dRok4ejH+RwNGbuoD9fCjto= go.opencensus.io v0.22.4/go.mod h1:yxeiOL68Rb0Xd1ddK5vPZ/oVn4vY4Ynel7k9FzqtOIw= -go.opentelemetry.io/collector v0.13.0 h1:w5DywMfxHIoGhomH382SJn95+TGQDTz5r9n4bBACe4Y= -go.opentelemetry.io/collector v0.13.0/go.mod h1:UB7wWD7RrEx8GFSaUR47TO1GAqxSi5+Kq68tI1icwJk= +go.opentelemetry.io/collector v0.13.1-0.20201020144745-846222e6af7a h1:eKbcrh2zBlQqQtrNCIDy3taW9si3b2DcILtLG8zd6hc= +go.opentelemetry.io/collector v0.13.1-0.20201020144745-846222e6af7a/go.mod h1:UB7wWD7RrEx8GFSaUR47TO1GAqxSi5+Kq68tI1icwJk= 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 64bb726f0c3f2..952611972f785 100644 --- a/exporter/elasticexporter/go.mod +++ b/exporter/elasticexporter/go.mod @@ -6,7 +6,7 @@ require ( github.com/stretchr/testify v1.6.1 go.elastic.co/apm v1.8.1-0.20200515083825-95e54b2e24ea go.elastic.co/fastjson v1.1.0 - go.opentelemetry.io/collector v0.13.0 + go.opentelemetry.io/collector v0.13.1-0.20201020144745-846222e6af7a go.uber.org/zap v1.16.0 google.golang.org/grpc/examples v0.0.0-20200728194956-1c32b02682df // indirect ) diff --git a/exporter/elasticexporter/go.sum b/exporter/elasticexporter/go.sum index 07d98ebdf7123..1f40be023f5b5 100644 --- a/exporter/elasticexporter/go.sum +++ b/exporter/elasticexporter/go.sum @@ -1133,8 +1133,8 @@ go.opencensus.io v0.22.2/go.mod h1:yxeiOL68Rb0Xd1ddK5vPZ/oVn4vY4Ynel7k9FzqtOIw= go.opencensus.io v0.22.3/go.mod h1:yxeiOL68Rb0Xd1ddK5vPZ/oVn4vY4Ynel7k9FzqtOIw= go.opencensus.io v0.22.4 h1:LYy1Hy3MJdrCdMwwzxA/dRok4ejH+RwNGbuoD9fCjto= go.opencensus.io v0.22.4/go.mod h1:yxeiOL68Rb0Xd1ddK5vPZ/oVn4vY4Ynel7k9FzqtOIw= -go.opentelemetry.io/collector v0.13.0 h1:w5DywMfxHIoGhomH382SJn95+TGQDTz5r9n4bBACe4Y= -go.opentelemetry.io/collector v0.13.0/go.mod h1:UB7wWD7RrEx8GFSaUR47TO1GAqxSi5+Kq68tI1icwJk= +go.opentelemetry.io/collector v0.13.1-0.20201020144745-846222e6af7a h1:eKbcrh2zBlQqQtrNCIDy3taW9si3b2DcILtLG8zd6hc= +go.opentelemetry.io/collector v0.13.1-0.20201020144745-846222e6af7a/go.mod h1:UB7wWD7RrEx8GFSaUR47TO1GAqxSi5+Kq68tI1icwJk= 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/honeycombexporter/go.mod b/exporter/honeycombexporter/go.mod index d58d2435b5942..a1992c7212d6c 100644 --- a/exporter/honeycombexporter/go.mod +++ b/exporter/honeycombexporter/go.mod @@ -8,7 +8,7 @@ require ( github.com/honeycombio/libhoney-go v1.14.1 github.com/klauspost/compress v1.11.1 github.com/stretchr/testify v1.6.1 - go.opentelemetry.io/collector v0.13.0 + go.opentelemetry.io/collector v0.13.1-0.20201020144745-846222e6af7a go.uber.org/zap v1.16.0 google.golang.org/grpc v1.32.0 google.golang.org/grpc/examples v0.0.0-20200728194956-1c32b02682df // indirect diff --git a/exporter/honeycombexporter/go.sum b/exporter/honeycombexporter/go.sum index b2976e1cb76ab..0beb1217ac64c 100644 --- a/exporter/honeycombexporter/go.sum +++ b/exporter/honeycombexporter/go.sum @@ -1138,8 +1138,8 @@ go.opencensus.io v0.22.2/go.mod h1:yxeiOL68Rb0Xd1ddK5vPZ/oVn4vY4Ynel7k9FzqtOIw= go.opencensus.io v0.22.3/go.mod h1:yxeiOL68Rb0Xd1ddK5vPZ/oVn4vY4Ynel7k9FzqtOIw= go.opencensus.io v0.22.4 h1:LYy1Hy3MJdrCdMwwzxA/dRok4ejH+RwNGbuoD9fCjto= go.opencensus.io v0.22.4/go.mod h1:yxeiOL68Rb0Xd1ddK5vPZ/oVn4vY4Ynel7k9FzqtOIw= -go.opentelemetry.io/collector v0.13.0 h1:w5DywMfxHIoGhomH382SJn95+TGQDTz5r9n4bBACe4Y= -go.opentelemetry.io/collector v0.13.0/go.mod h1:UB7wWD7RrEx8GFSaUR47TO1GAqxSi5+Kq68tI1icwJk= +go.opentelemetry.io/collector v0.13.1-0.20201020144745-846222e6af7a h1:eKbcrh2zBlQqQtrNCIDy3taW9si3b2DcILtLG8zd6hc= +go.opentelemetry.io/collector v0.13.1-0.20201020144745-846222e6af7a/go.mod h1:UB7wWD7RrEx8GFSaUR47TO1GAqxSi5+Kq68tI1icwJk= 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 49d166c0caa40..34d72b459d24e 100644 --- a/exporter/jaegerthrifthttpexporter/go.mod +++ b/exporter/jaegerthrifthttpexporter/go.mod @@ -8,7 +8,7 @@ require ( github.com/google/go-cmp v0.5.2 github.com/jaegertracing/jaeger v1.20.0 github.com/stretchr/testify v1.6.1 - go.opentelemetry.io/collector v0.13.0 + go.opentelemetry.io/collector v0.13.1-0.20201020144745-846222e6af7a go.uber.org/zap v1.16.0 google.golang.org/protobuf v1.25.0 ) diff --git a/exporter/jaegerthrifthttpexporter/go.sum b/exporter/jaegerthrifthttpexporter/go.sum index 792e988ad8d3b..41ab6b79264a0 100644 --- a/exporter/jaegerthrifthttpexporter/go.sum +++ b/exporter/jaegerthrifthttpexporter/go.sum @@ -1116,8 +1116,8 @@ go.opencensus.io v0.22.2/go.mod h1:yxeiOL68Rb0Xd1ddK5vPZ/oVn4vY4Ynel7k9FzqtOIw= go.opencensus.io v0.22.3/go.mod h1:yxeiOL68Rb0Xd1ddK5vPZ/oVn4vY4Ynel7k9FzqtOIw= go.opencensus.io v0.22.4 h1:LYy1Hy3MJdrCdMwwzxA/dRok4ejH+RwNGbuoD9fCjto= go.opencensus.io v0.22.4/go.mod h1:yxeiOL68Rb0Xd1ddK5vPZ/oVn4vY4Ynel7k9FzqtOIw= -go.opentelemetry.io/collector v0.13.0 h1:w5DywMfxHIoGhomH382SJn95+TGQDTz5r9n4bBACe4Y= -go.opentelemetry.io/collector v0.13.0/go.mod h1:UB7wWD7RrEx8GFSaUR47TO1GAqxSi5+Kq68tI1icwJk= +go.opentelemetry.io/collector v0.13.1-0.20201020144745-846222e6af7a h1:eKbcrh2zBlQqQtrNCIDy3taW9si3b2DcILtLG8zd6hc= +go.opentelemetry.io/collector v0.13.1-0.20201020144745-846222e6af7a/go.mod h1:UB7wWD7RrEx8GFSaUR47TO1GAqxSi5+Kq68tI1icwJk= 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/kinesisexporter/go.mod b/exporter/kinesisexporter/go.mod index 33b0880cd6d2e..f64d94e904b21 100644 --- a/exporter/kinesisexporter/go.mod +++ b/exporter/kinesisexporter/go.mod @@ -5,7 +5,7 @@ go 1.14 require ( github.com/signalfx/opencensus-go-exporter-kinesis v0.6.3 github.com/stretchr/testify v1.6.1 - go.opentelemetry.io/collector v0.13.0 + go.opentelemetry.io/collector v0.13.1-0.20201020144745-846222e6af7a go.uber.org/zap v1.16.0 google.golang.org/grpc/examples v0.0.0-20200728194956-1c32b02682df // indirect ) diff --git a/exporter/kinesisexporter/go.sum b/exporter/kinesisexporter/go.sum index aa7bc20ba02af..aa483a56ecf99 100644 --- a/exporter/kinesisexporter/go.sum +++ b/exporter/kinesisexporter/go.sum @@ -1147,8 +1147,8 @@ go.opencensus.io v0.22.2/go.mod h1:yxeiOL68Rb0Xd1ddK5vPZ/oVn4vY4Ynel7k9FzqtOIw= go.opencensus.io v0.22.3/go.mod h1:yxeiOL68Rb0Xd1ddK5vPZ/oVn4vY4Ynel7k9FzqtOIw= go.opencensus.io v0.22.4 h1:LYy1Hy3MJdrCdMwwzxA/dRok4ejH+RwNGbuoD9fCjto= go.opencensus.io v0.22.4/go.mod h1:yxeiOL68Rb0Xd1ddK5vPZ/oVn4vY4Ynel7k9FzqtOIw= -go.opentelemetry.io/collector v0.13.0 h1:w5DywMfxHIoGhomH382SJn95+TGQDTz5r9n4bBACe4Y= -go.opentelemetry.io/collector v0.13.0/go.mod h1:UB7wWD7RrEx8GFSaUR47TO1GAqxSi5+Kq68tI1icwJk= +go.opentelemetry.io/collector v0.13.1-0.20201020144745-846222e6af7a h1:eKbcrh2zBlQqQtrNCIDy3taW9si3b2DcILtLG8zd6hc= +go.opentelemetry.io/collector v0.13.1-0.20201020144745-846222e6af7a/go.mod h1:UB7wWD7RrEx8GFSaUR47TO1GAqxSi5+Kq68tI1icwJk= 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 fc156c2a7d82e..ef9f1d670aaf3 100644 --- a/exporter/logzioexporter/go.mod +++ b/exporter/logzioexporter/go.mod @@ -2,4 +2,4 @@ module github.com/open-telemetry/opentelemetry-collector-contrib/exporter/logzio go 1.14 -require go.opentelemetry.io/collector v0.13.0 +require go.opentelemetry.io/collector v0.13.1-0.20201020144745-846222e6af7a diff --git a/exporter/logzioexporter/go.sum b/exporter/logzioexporter/go.sum index cf32e38f7b28f..e6abead4a80d8 100644 --- a/exporter/logzioexporter/go.sum +++ b/exporter/logzioexporter/go.sum @@ -1013,8 +1013,8 @@ go.opencensus.io v0.22.2/go.mod h1:yxeiOL68Rb0Xd1ddK5vPZ/oVn4vY4Ynel7k9FzqtOIw= go.opencensus.io v0.22.3/go.mod h1:yxeiOL68Rb0Xd1ddK5vPZ/oVn4vY4Ynel7k9FzqtOIw= go.opencensus.io v0.22.4 h1:LYy1Hy3MJdrCdMwwzxA/dRok4ejH+RwNGbuoD9fCjto= go.opencensus.io v0.22.4/go.mod h1:yxeiOL68Rb0Xd1ddK5vPZ/oVn4vY4Ynel7k9FzqtOIw= -go.opentelemetry.io/collector v0.13.0 h1:w5DywMfxHIoGhomH382SJn95+TGQDTz5r9n4bBACe4Y= -go.opentelemetry.io/collector v0.13.0/go.mod h1:UB7wWD7RrEx8GFSaUR47TO1GAqxSi5+Kq68tI1icwJk= +go.opentelemetry.io/collector v0.13.1-0.20201020144745-846222e6af7a h1:eKbcrh2zBlQqQtrNCIDy3taW9si3b2DcILtLG8zd6hc= +go.opentelemetry.io/collector v0.13.1-0.20201020144745-846222e6af7a/go.mod h1:UB7wWD7RrEx8GFSaUR47TO1GAqxSi5+Kq68tI1icwJk= 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 d8d136142a60a..f8bb577a6cb1a 100644 --- a/exporter/newrelicexporter/go.mod +++ b/exporter/newrelicexporter/go.mod @@ -7,7 +7,7 @@ require ( github.com/newrelic/newrelic-telemetry-sdk-go v0.4.0 github.com/stretchr/testify v1.6.1 go.opencensus.io v0.22.5 - go.opentelemetry.io/collector v0.13.0 + go.opentelemetry.io/collector v0.13.1-0.20201020144745-846222e6af7a go.uber.org/zap v1.16.0 google.golang.org/grpc/examples v0.0.0-20200728194956-1c32b02682df // indirect google.golang.org/protobuf v1.25.0 diff --git a/exporter/newrelicexporter/go.sum b/exporter/newrelicexporter/go.sum index b813ddf1d1378..8da68c1f98e62 100644 --- a/exporter/newrelicexporter/go.sum +++ b/exporter/newrelicexporter/go.sum @@ -1119,8 +1119,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 h1:dntmOdLpSpHlVqbW5Eay97DelsZHe+55D+xC6i0dDS0= go.opencensus.io v0.22.5/go.mod h1:5pWMHQbX5EPX2/62yrJeAkowc+lfs/XD7Uxpq3pI6kk= -go.opentelemetry.io/collector v0.13.0 h1:w5DywMfxHIoGhomH382SJn95+TGQDTz5r9n4bBACe4Y= -go.opentelemetry.io/collector v0.13.0/go.mod h1:UB7wWD7RrEx8GFSaUR47TO1GAqxSi5+Kq68tI1icwJk= +go.opentelemetry.io/collector v0.13.1-0.20201020144745-846222e6af7a h1:eKbcrh2zBlQqQtrNCIDy3taW9si3b2DcILtLG8zd6hc= +go.opentelemetry.io/collector v0.13.1-0.20201020144745-846222e6af7a/go.mod h1:UB7wWD7RrEx8GFSaUR47TO1GAqxSi5+Kq68tI1icwJk= 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/go.mod b/exporter/sapmexporter/go.mod index ef9444c0ae2f4..0b71dbfa16f83 100644 --- a/exporter/sapmexporter/go.mod +++ b/exporter/sapmexporter/go.mod @@ -7,7 +7,7 @@ require ( github.com/signalfx/sapm-proto v0.6.2 github.com/signalfx/signalfx-agent/pkg/apm v0.0.0-20201015185032-52a4f97df2a4 github.com/stretchr/testify v1.6.1 - go.opentelemetry.io/collector v0.13.0 + go.opentelemetry.io/collector v0.13.1-0.20201020144745-846222e6af7a go.uber.org/zap v1.16.0 ) diff --git a/exporter/sapmexporter/go.sum b/exporter/sapmexporter/go.sum index e9ca54e87727d..045e029efbbf1 100644 --- a/exporter/sapmexporter/go.sum +++ b/exporter/sapmexporter/go.sum @@ -1155,8 +1155,8 @@ go.opencensus.io v0.22.2/go.mod h1:yxeiOL68Rb0Xd1ddK5vPZ/oVn4vY4Ynel7k9FzqtOIw= go.opencensus.io v0.22.3/go.mod h1:yxeiOL68Rb0Xd1ddK5vPZ/oVn4vY4Ynel7k9FzqtOIw= go.opencensus.io v0.22.4 h1:LYy1Hy3MJdrCdMwwzxA/dRok4ejH+RwNGbuoD9fCjto= go.opencensus.io v0.22.4/go.mod h1:yxeiOL68Rb0Xd1ddK5vPZ/oVn4vY4Ynel7k9FzqtOIw= -go.opentelemetry.io/collector v0.13.0 h1:w5DywMfxHIoGhomH382SJn95+TGQDTz5r9n4bBACe4Y= -go.opentelemetry.io/collector v0.13.0/go.mod h1:UB7wWD7RrEx8GFSaUR47TO1GAqxSi5+Kq68tI1icwJk= +go.opentelemetry.io/collector v0.13.1-0.20201020144745-846222e6af7a h1:eKbcrh2zBlQqQtrNCIDy3taW9si3b2DcILtLG8zd6hc= +go.opentelemetry.io/collector v0.13.1-0.20201020144745-846222e6af7a/go.mod h1:UB7wWD7RrEx8GFSaUR47TO1GAqxSi5+Kq68tI1icwJk= 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 75cc5c24bd6ea..1b2475a407350 100644 --- a/exporter/sentryexporter/go.mod +++ b/exporter/sentryexporter/go.mod @@ -6,7 +6,7 @@ require ( github.com/getsentry/sentry-go v0.6.2-0.20200707113342-e7c66ce62664 github.com/google/go-cmp v0.5.2 github.com/stretchr/testify v1.6.1 - go.opentelemetry.io/collector v0.13.0 + go.opentelemetry.io/collector v0.13.1-0.20201020144745-846222e6af7a go.uber.org/zap v1.16.0 google.golang.org/grpc/examples v0.0.0-20200728194956-1c32b02682df // indirect ) diff --git a/exporter/sentryexporter/go.sum b/exporter/sentryexporter/go.sum index 22063db44ec4b..ffa36a64e7edf 100644 --- a/exporter/sentryexporter/go.sum +++ b/exporter/sentryexporter/go.sum @@ -1191,8 +1191,8 @@ go.opencensus.io v0.22.2/go.mod h1:yxeiOL68Rb0Xd1ddK5vPZ/oVn4vY4Ynel7k9FzqtOIw= go.opencensus.io v0.22.3/go.mod h1:yxeiOL68Rb0Xd1ddK5vPZ/oVn4vY4Ynel7k9FzqtOIw= go.opencensus.io v0.22.4 h1:LYy1Hy3MJdrCdMwwzxA/dRok4ejH+RwNGbuoD9fCjto= go.opencensus.io v0.22.4/go.mod h1:yxeiOL68Rb0Xd1ddK5vPZ/oVn4vY4Ynel7k9FzqtOIw= -go.opentelemetry.io/collector v0.13.0 h1:w5DywMfxHIoGhomH382SJn95+TGQDTz5r9n4bBACe4Y= -go.opentelemetry.io/collector v0.13.0/go.mod h1:UB7wWD7RrEx8GFSaUR47TO1GAqxSi5+Kq68tI1icwJk= +go.opentelemetry.io/collector v0.13.1-0.20201020144745-846222e6af7a h1:eKbcrh2zBlQqQtrNCIDy3taW9si3b2DcILtLG8zd6hc= +go.opentelemetry.io/collector v0.13.1-0.20201020144745-846222e6af7a/go.mod h1:UB7wWD7RrEx8GFSaUR47TO1GAqxSi5+Kq68tI1icwJk= 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/go.mod b/exporter/signalfxexporter/go.mod index 710fdde6d3ecf..f9d0f1c0d5f5b 100644 --- a/exporter/signalfxexporter/go.mod +++ b/exporter/signalfxexporter/go.mod @@ -11,7 +11,7 @@ require ( github.com/shirou/gopsutil v2.20.9+incompatible github.com/signalfx/com_signalfx_metrics_protobuf v0.0.2 github.com/stretchr/testify v1.6.1 - go.opentelemetry.io/collector v0.13.0 + go.opentelemetry.io/collector v0.13.1-0.20201020144745-846222e6af7a go.uber.org/multierr v1.6.0 go.uber.org/zap v1.16.0 google.golang.org/protobuf v1.25.0 diff --git a/exporter/signalfxexporter/go.sum b/exporter/signalfxexporter/go.sum index a3903d66b1c79..0871ae0a9a687 100644 --- a/exporter/signalfxexporter/go.sum +++ b/exporter/signalfxexporter/go.sum @@ -1133,8 +1133,8 @@ go.opencensus.io v0.22.2/go.mod h1:yxeiOL68Rb0Xd1ddK5vPZ/oVn4vY4Ynel7k9FzqtOIw= go.opencensus.io v0.22.3/go.mod h1:yxeiOL68Rb0Xd1ddK5vPZ/oVn4vY4Ynel7k9FzqtOIw= go.opencensus.io v0.22.4 h1:LYy1Hy3MJdrCdMwwzxA/dRok4ejH+RwNGbuoD9fCjto= go.opencensus.io v0.22.4/go.mod h1:yxeiOL68Rb0Xd1ddK5vPZ/oVn4vY4Ynel7k9FzqtOIw= -go.opentelemetry.io/collector v0.13.0 h1:w5DywMfxHIoGhomH382SJn95+TGQDTz5r9n4bBACe4Y= -go.opentelemetry.io/collector v0.13.0/go.mod h1:UB7wWD7RrEx8GFSaUR47TO1GAqxSi5+Kq68tI1icwJk= +go.opentelemetry.io/collector v0.13.1-0.20201020144745-846222e6af7a h1:eKbcrh2zBlQqQtrNCIDy3taW9si3b2DcILtLG8zd6hc= +go.opentelemetry.io/collector v0.13.1-0.20201020144745-846222e6af7a/go.mod h1:UB7wWD7RrEx8GFSaUR47TO1GAqxSi5+Kq68tI1icwJk= 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= @@ -1577,14 +1577,14 @@ honnef.co/go/tools v0.0.1-2020.1.3/go.mod h1:X/FiERA/W4tHapMX5mGpAtMSVEeEUOyHaw9 honnef.co/go/tools v0.0.1-2020.1.5 h1:nI5egYTGJakVyOryqLs1cQO5dO0ksin5XXs2pspk75k= honnef.co/go/tools v0.0.1-2020.1.5/go.mod h1:X/FiERA/W4tHapMX5mGpAtMSVEeEUOyHaw9vFzvIQ3k= k8s.io/api v0.18.8/go.mod h1:d/CXqwWv+Z2XEG1LgceeDmHQwpUJhROPx16SlxJgERY= -k8s.io/api v0.19.2 h1:q+/krnHWKsL7OBZg/rxnycsl9569Pud76UJ77MvKXms= -k8s.io/api v0.19.2/go.mod h1:IQpK0zFQ1xc5iNIQPqzgoOwuFugaYHK4iCknlAQP9nI= +k8s.io/api v0.19.3 h1:GN6ntFnv44Vptj/b+OnMW7FmzkpDoIDLZRvKX3XH9aU= +k8s.io/api v0.19.3/go.mod h1:VF+5FT1B74Pw3KxMdKyinLo+zynBaMBiAfGMuldcNDs= k8s.io/apimachinery v0.18.8/go.mod h1:6sQd+iHEqmOtALqOFjSWp2KZ9F0wlU/nWm0ZgsYWMig= -k8s.io/apimachinery v0.19.2 h1:5Gy9vQpAGTKHPVOh5c4plE274X8D/6cuEiTO2zve7tc= -k8s.io/apimachinery v0.19.2/go.mod h1:DnPGDnARWFvYa3pMHgSxtbZb7gpzzAZ1pTfaUNDVlmA= +k8s.io/apimachinery v0.19.3 h1:bpIQXlKjB4cB/oNpnNnV+BybGPR7iP5oYpsOTEJ4hgc= +k8s.io/apimachinery v0.19.3/go.mod h1:DnPGDnARWFvYa3pMHgSxtbZb7gpzzAZ1pTfaUNDVlmA= k8s.io/client-go v0.18.8/go.mod h1:HqFqMllQ5NnQJNwjro9k5zMyfhZlOwpuTLVrxjkYSxU= -k8s.io/client-go v0.19.2 h1:gMJuU3xJZs86L1oQ99R4EViAADUPMHHtS9jFshasHSc= -k8s.io/client-go v0.19.2/go.mod h1:S5wPhCqyDNAlzM9CnEdgTGV4OqhsW3jGO1UM1epwfJA= +k8s.io/client-go v0.19.3 h1:ctqR1nQ52NUs6LpI0w+a5U+xjYwflFwA13OJKcicMxg= +k8s.io/client-go v0.19.3/go.mod h1:+eEMktZM+MG0KO+PTkci8xnbCZHvj9TqR6Q1XDUIJOM= k8s.io/gengo v0.0.0-20190128074634-0689ccc1d7d6/go.mod h1:ezvh/TsK7cY6rbqRK0oQQ8IAqLxYwwyPxAX1Pzy0ii0= k8s.io/gengo v0.0.0-20200413195148-3a45101e95ac/go.mod h1:ezvh/TsK7cY6rbqRK0oQQ8IAqLxYwwyPxAX1Pzy0ii0= k8s.io/klog v0.0.0-20181102134211-b9b56d5dfc92/go.mod h1:Gq+BEi5rUBO/HRz0bTSXDUcqjScdoY3a9IHpCEIOOfk= diff --git a/exporter/splunkhecexporter/go.mod b/exporter/splunkhecexporter/go.mod index 1bb58649aa874..ca59d9dc5fade 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/common v0.0.0-00010101000000-000000000000 github.com/stretchr/testify v1.6.1 - go.opentelemetry.io/collector v0.13.0 + go.opentelemetry.io/collector v0.13.1-0.20201020144745-846222e6af7a go.uber.org/zap v1.16.0 google.golang.org/grpc/examples v0.0.0-20200728194956-1c32b02682df // indirect google.golang.org/protobuf v1.25.0 diff --git a/exporter/splunkhecexporter/go.sum b/exporter/splunkhecexporter/go.sum index 29df70a3b3426..b36b1c89e9cda 100644 --- a/exporter/splunkhecexporter/go.sum +++ b/exporter/splunkhecexporter/go.sum @@ -1117,8 +1117,8 @@ go.opencensus.io v0.22.2/go.mod h1:yxeiOL68Rb0Xd1ddK5vPZ/oVn4vY4Ynel7k9FzqtOIw= go.opencensus.io v0.22.3/go.mod h1:yxeiOL68Rb0Xd1ddK5vPZ/oVn4vY4Ynel7k9FzqtOIw= go.opencensus.io v0.22.4 h1:LYy1Hy3MJdrCdMwwzxA/dRok4ejH+RwNGbuoD9fCjto= go.opencensus.io v0.22.4/go.mod h1:yxeiOL68Rb0Xd1ddK5vPZ/oVn4vY4Ynel7k9FzqtOIw= -go.opentelemetry.io/collector v0.13.0 h1:w5DywMfxHIoGhomH382SJn95+TGQDTz5r9n4bBACe4Y= -go.opentelemetry.io/collector v0.13.0/go.mod h1:UB7wWD7RrEx8GFSaUR47TO1GAqxSi5+Kq68tI1icwJk= +go.opentelemetry.io/collector v0.13.1-0.20201020144745-846222e6af7a h1:eKbcrh2zBlQqQtrNCIDy3taW9si3b2DcILtLG8zd6hc= +go.opentelemetry.io/collector v0.13.1-0.20201020144745-846222e6af7a/go.mod h1:UB7wWD7RrEx8GFSaUR47TO1GAqxSi5+Kq68tI1icwJk= 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 55c05c8dace03..2115a1d15190c 100644 --- a/exporter/stackdriverexporter/go.mod +++ b/exporter/stackdriverexporter/go.mod @@ -8,7 +8,7 @@ require ( github.com/census-instrumentation/opencensus-proto v0.3.0 github.com/stretchr/testify v1.6.1 go.opencensus.io v0.22.5 - go.opentelemetry.io/collector v0.13.0 + go.opentelemetry.io/collector v0.13.1-0.20201020144745-846222e6af7a go.opentelemetry.io/otel v0.12.0 go.opentelemetry.io/otel/sdk v0.12.0 go.uber.org/zap v1.16.0 diff --git a/exporter/stackdriverexporter/go.sum b/exporter/stackdriverexporter/go.sum index 037e33846410b..f6ce362162a9e 100644 --- a/exporter/stackdriverexporter/go.sum +++ b/exporter/stackdriverexporter/go.sum @@ -1143,8 +1143,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 h1:dntmOdLpSpHlVqbW5Eay97DelsZHe+55D+xC6i0dDS0= go.opencensus.io v0.22.5/go.mod h1:5pWMHQbX5EPX2/62yrJeAkowc+lfs/XD7Uxpq3pI6kk= -go.opentelemetry.io/collector v0.13.0 h1:w5DywMfxHIoGhomH382SJn95+TGQDTz5r9n4bBACe4Y= -go.opentelemetry.io/collector v0.13.0/go.mod h1:UB7wWD7RrEx8GFSaUR47TO1GAqxSi5+Kq68tI1icwJk= +go.opentelemetry.io/collector v0.13.1-0.20201020144745-846222e6af7a h1:eKbcrh2zBlQqQtrNCIDy3taW9si3b2DcILtLG8zd6hc= +go.opentelemetry.io/collector v0.13.1-0.20201020144745-846222e6af7a/go.mod h1:UB7wWD7RrEx8GFSaUR47TO1GAqxSi5+Kq68tI1icwJk= go.opentelemetry.io/otel v0.12.0 h1:bwWaPd/h2q+U6KdKaAiOS5GLwOMd1LDt9iNaeyIoAI8= go.opentelemetry.io/otel v0.12.0/go.mod h1:dlSNewoRYikTkotEnxdmuBHgzT+k/idJSfDv/FxEnOY= go.opentelemetry.io/otel/sdk v0.12.0 h1:YVUyDXsGvFWjhJxGXT4kBcGdfoTbo1vSGjbGRUdRh5U= diff --git a/extension/httpforwarder/go.mod b/extension/httpforwarder/go.mod index 8e5c4a998628f..9a41fabd8b3da 100644 --- a/extension/httpforwarder/go.mod +++ b/extension/httpforwarder/go.mod @@ -4,6 +4,6 @@ go 1.14 require ( github.com/stretchr/testify v1.6.1 - go.opentelemetry.io/collector v0.13.0 + go.opentelemetry.io/collector v0.13.1-0.20201020144745-846222e6af7a go.uber.org/zap v1.16.0 ) diff --git a/extension/httpforwarder/go.sum b/extension/httpforwarder/go.sum index c78e028e9da9a..1488e7d5a7e53 100644 --- a/extension/httpforwarder/go.sum +++ b/extension/httpforwarder/go.sum @@ -1006,8 +1006,8 @@ go.opencensus.io v0.22.0/go.mod h1:+kGneAE2xo2IficOXnaByMWTGM9T73dGwxeWcUqIpI8= go.opencensus.io v0.22.2/go.mod h1:yxeiOL68Rb0Xd1ddK5vPZ/oVn4vY4Ynel7k9FzqtOIw= go.opencensus.io v0.22.3/go.mod h1:yxeiOL68Rb0Xd1ddK5vPZ/oVn4vY4Ynel7k9FzqtOIw= go.opencensus.io v0.22.4/go.mod h1:yxeiOL68Rb0Xd1ddK5vPZ/oVn4vY4Ynel7k9FzqtOIw= -go.opentelemetry.io/collector v0.13.0 h1:w5DywMfxHIoGhomH382SJn95+TGQDTz5r9n4bBACe4Y= -go.opentelemetry.io/collector v0.13.0/go.mod h1:UB7wWD7RrEx8GFSaUR47TO1GAqxSi5+Kq68tI1icwJk= +go.opentelemetry.io/collector v0.13.1-0.20201020144745-846222e6af7a h1:eKbcrh2zBlQqQtrNCIDy3taW9si3b2DcILtLG8zd6hc= +go.opentelemetry.io/collector v0.13.1-0.20201020144745-846222e6af7a/go.mod h1:UB7wWD7RrEx8GFSaUR47TO1GAqxSi5+Kq68tI1icwJk= 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/jmxmetricsextension/go.mod b/extension/jmxmetricsextension/go.mod index 7d31d7a158a96..3ef0e96d7134c 100644 --- a/extension/jmxmetricsextension/go.mod +++ b/extension/jmxmetricsextension/go.mod @@ -5,7 +5,7 @@ go 1.14 require ( github.com/shirou/gopsutil v2.20.6+incompatible github.com/stretchr/testify v1.6.1 - go.opentelemetry.io/collector v0.13.0 + go.opentelemetry.io/collector v0.13.1-0.20201020144745-846222e6af7a go.uber.org/atomic v1.7.0 go.uber.org/zap v1.16.0 ) diff --git a/extension/jmxmetricsextension/go.sum b/extension/jmxmetricsextension/go.sum index 792e988ad8d3b..41ab6b79264a0 100644 --- a/extension/jmxmetricsextension/go.sum +++ b/extension/jmxmetricsextension/go.sum @@ -1116,8 +1116,8 @@ go.opencensus.io v0.22.2/go.mod h1:yxeiOL68Rb0Xd1ddK5vPZ/oVn4vY4Ynel7k9FzqtOIw= go.opencensus.io v0.22.3/go.mod h1:yxeiOL68Rb0Xd1ddK5vPZ/oVn4vY4Ynel7k9FzqtOIw= go.opencensus.io v0.22.4 h1:LYy1Hy3MJdrCdMwwzxA/dRok4ejH+RwNGbuoD9fCjto= go.opencensus.io v0.22.4/go.mod h1:yxeiOL68Rb0Xd1ddK5vPZ/oVn4vY4Ynel7k9FzqtOIw= -go.opentelemetry.io/collector v0.13.0 h1:w5DywMfxHIoGhomH382SJn95+TGQDTz5r9n4bBACe4Y= -go.opentelemetry.io/collector v0.13.0/go.mod h1:UB7wWD7RrEx8GFSaUR47TO1GAqxSi5+Kq68tI1icwJk= +go.opentelemetry.io/collector v0.13.1-0.20201020144745-846222e6af7a h1:eKbcrh2zBlQqQtrNCIDy3taW9si3b2DcILtLG8zd6hc= +go.opentelemetry.io/collector v0.13.1-0.20201020144745-846222e6af7a/go.mod h1:UB7wWD7RrEx8GFSaUR47TO1GAqxSi5+Kq68tI1icwJk= 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 19f66571fc85e..abfff4708ae61 100644 --- a/extension/observer/hostobserver/go.mod +++ b/extension/observer/hostobserver/go.mod @@ -6,7 +6,7 @@ require ( github.com/open-telemetry/opentelemetry-collector-contrib/extension/observer v0.0.0-00010101000000-000000000000 github.com/shirou/gopsutil v2.20.9+incompatible github.com/stretchr/testify v1.6.1 - go.opentelemetry.io/collector v0.13.0 + go.opentelemetry.io/collector v0.13.1-0.20201020144745-846222e6af7a go.uber.org/zap v1.16.0 google.golang.org/grpc/examples v0.0.0-20200728194956-1c32b02682df // indirect ) diff --git a/extension/observer/hostobserver/go.sum b/extension/observer/hostobserver/go.sum index baf929f5753ad..59904f262b3af 100644 --- a/extension/observer/hostobserver/go.sum +++ b/extension/observer/hostobserver/go.sum @@ -1117,8 +1117,8 @@ go.opencensus.io v0.22.2/go.mod h1:yxeiOL68Rb0Xd1ddK5vPZ/oVn4vY4Ynel7k9FzqtOIw= go.opencensus.io v0.22.3/go.mod h1:yxeiOL68Rb0Xd1ddK5vPZ/oVn4vY4Ynel7k9FzqtOIw= go.opencensus.io v0.22.4 h1:LYy1Hy3MJdrCdMwwzxA/dRok4ejH+RwNGbuoD9fCjto= go.opencensus.io v0.22.4/go.mod h1:yxeiOL68Rb0Xd1ddK5vPZ/oVn4vY4Ynel7k9FzqtOIw= -go.opentelemetry.io/collector v0.13.0 h1:w5DywMfxHIoGhomH382SJn95+TGQDTz5r9n4bBACe4Y= -go.opentelemetry.io/collector v0.13.0/go.mod h1:UB7wWD7RrEx8GFSaUR47TO1GAqxSi5+Kq68tI1icwJk= +go.opentelemetry.io/collector v0.13.1-0.20201020144745-846222e6af7a h1:eKbcrh2zBlQqQtrNCIDy3taW9si3b2DcILtLG8zd6hc= +go.opentelemetry.io/collector v0.13.1-0.20201020144745-846222e6af7a/go.mod h1:UB7wWD7RrEx8GFSaUR47TO1GAqxSi5+Kq68tI1icwJk= 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 1addc8bf67d8a..8c0283addc896 100644 --- a/extension/observer/k8sobserver/go.mod +++ b/extension/observer/k8sobserver/go.mod @@ -6,11 +6,11 @@ require ( github.com/open-telemetry/opentelemetry-collector-contrib/extension/observer v0.0.0-00010101000000-000000000000 github.com/open-telemetry/opentelemetry-collector-contrib/internal/k8sconfig v0.0.0-00010101000000-000000000000 github.com/stretchr/testify v1.6.1 - go.opentelemetry.io/collector v0.13.0 + go.opentelemetry.io/collector v0.13.1-0.20201020144745-846222e6af7a go.uber.org/zap v1.16.0 - k8s.io/api v0.19.2 - k8s.io/apimachinery v0.19.2 - k8s.io/client-go v0.19.2 + k8s.io/api v0.19.3 + k8s.io/apimachinery v0.19.3 + k8s.io/client-go v0.19.3 k8s.io/utils v0.0.0-20200821003339-5e75c0163111 ) diff --git a/extension/observer/k8sobserver/go.sum b/extension/observer/k8sobserver/go.sum index f78cb9d76c00d..8084993eb6365 100644 --- a/extension/observer/k8sobserver/go.sum +++ b/extension/observer/k8sobserver/go.sum @@ -1128,8 +1128,8 @@ go.opencensus.io v0.22.2/go.mod h1:yxeiOL68Rb0Xd1ddK5vPZ/oVn4vY4Ynel7k9FzqtOIw= go.opencensus.io v0.22.3/go.mod h1:yxeiOL68Rb0Xd1ddK5vPZ/oVn4vY4Ynel7k9FzqtOIw= go.opencensus.io v0.22.4 h1:LYy1Hy3MJdrCdMwwzxA/dRok4ejH+RwNGbuoD9fCjto= go.opencensus.io v0.22.4/go.mod h1:yxeiOL68Rb0Xd1ddK5vPZ/oVn4vY4Ynel7k9FzqtOIw= -go.opentelemetry.io/collector v0.13.0 h1:w5DywMfxHIoGhomH382SJn95+TGQDTz5r9n4bBACe4Y= -go.opentelemetry.io/collector v0.13.0/go.mod h1:UB7wWD7RrEx8GFSaUR47TO1GAqxSi5+Kq68tI1icwJk= +go.opentelemetry.io/collector v0.13.1-0.20201020144745-846222e6af7a h1:eKbcrh2zBlQqQtrNCIDy3taW9si3b2DcILtLG8zd6hc= +go.opentelemetry.io/collector v0.13.1-0.20201020144745-846222e6af7a/go.mod h1:UB7wWD7RrEx8GFSaUR47TO1GAqxSi5+Kq68tI1icwJk= 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= @@ -1572,14 +1572,14 @@ honnef.co/go/tools v0.0.1-2020.1.3/go.mod h1:X/FiERA/W4tHapMX5mGpAtMSVEeEUOyHaw9 honnef.co/go/tools v0.0.1-2020.1.5 h1:nI5egYTGJakVyOryqLs1cQO5dO0ksin5XXs2pspk75k= honnef.co/go/tools v0.0.1-2020.1.5/go.mod h1:X/FiERA/W4tHapMX5mGpAtMSVEeEUOyHaw9vFzvIQ3k= k8s.io/api v0.18.8/go.mod h1:d/CXqwWv+Z2XEG1LgceeDmHQwpUJhROPx16SlxJgERY= -k8s.io/api v0.19.2 h1:q+/krnHWKsL7OBZg/rxnycsl9569Pud76UJ77MvKXms= -k8s.io/api v0.19.2/go.mod h1:IQpK0zFQ1xc5iNIQPqzgoOwuFugaYHK4iCknlAQP9nI= +k8s.io/api v0.19.3 h1:GN6ntFnv44Vptj/b+OnMW7FmzkpDoIDLZRvKX3XH9aU= +k8s.io/api v0.19.3/go.mod h1:VF+5FT1B74Pw3KxMdKyinLo+zynBaMBiAfGMuldcNDs= k8s.io/apimachinery v0.18.8/go.mod h1:6sQd+iHEqmOtALqOFjSWp2KZ9F0wlU/nWm0ZgsYWMig= -k8s.io/apimachinery v0.19.2 h1:5Gy9vQpAGTKHPVOh5c4plE274X8D/6cuEiTO2zve7tc= -k8s.io/apimachinery v0.19.2/go.mod h1:DnPGDnARWFvYa3pMHgSxtbZb7gpzzAZ1pTfaUNDVlmA= +k8s.io/apimachinery v0.19.3 h1:bpIQXlKjB4cB/oNpnNnV+BybGPR7iP5oYpsOTEJ4hgc= +k8s.io/apimachinery v0.19.3/go.mod h1:DnPGDnARWFvYa3pMHgSxtbZb7gpzzAZ1pTfaUNDVlmA= k8s.io/client-go v0.18.8/go.mod h1:HqFqMllQ5NnQJNwjro9k5zMyfhZlOwpuTLVrxjkYSxU= -k8s.io/client-go v0.19.2 h1:gMJuU3xJZs86L1oQ99R4EViAADUPMHHtS9jFshasHSc= -k8s.io/client-go v0.19.2/go.mod h1:S5wPhCqyDNAlzM9CnEdgTGV4OqhsW3jGO1UM1epwfJA= +k8s.io/client-go v0.19.3 h1:ctqR1nQ52NUs6LpI0w+a5U+xjYwflFwA13OJKcicMxg= +k8s.io/client-go v0.19.3/go.mod h1:+eEMktZM+MG0KO+PTkci8xnbCZHvj9TqR6Q1XDUIJOM= k8s.io/gengo v0.0.0-20190128074634-0689ccc1d7d6/go.mod h1:ezvh/TsK7cY6rbqRK0oQQ8IAqLxYwwyPxAX1Pzy0ii0= k8s.io/gengo v0.0.0-20200413195148-3a45101e95ac/go.mod h1:ezvh/TsK7cY6rbqRK0oQQ8IAqLxYwwyPxAX1Pzy0ii0= k8s.io/klog v0.0.0-20181102134211-b9b56d5dfc92/go.mod h1:Gq+BEi5rUBO/HRz0bTSXDUcqjScdoY3a9IHpCEIOOfk= diff --git a/go.mod b/go.mod index e5316f9b46f87..1cefbe61739b7 100644 --- a/go.mod +++ b/go.mod @@ -49,7 +49,7 @@ require ( github.com/pavius/impi v0.0.3 github.com/stretchr/testify v1.6.1 github.com/tcnksm/ghr v0.13.0 - go.opentelemetry.io/collector v0.13.0 + go.opentelemetry.io/collector v0.13.1-0.20201020144745-846222e6af7a golang.org/x/sys v0.0.0-20201005172224-997123666555 honnef.co/go/tools v0.0.1-2020.1.6 ) diff --git a/go.sum b/go.sum index fb245f6e7fe2a..ee590e0643669 100644 --- a/go.sum +++ b/go.sum @@ -144,8 +144,8 @@ github.com/alecthomas/units v0.0.0-20151022065526-2efee857e7cf/go.mod h1:ybxpYRF github.com/alecthomas/units v0.0.0-20190717042225-c3de453c63f4/go.mod h1:ybxpYRFXyAe+OPACYpWeL0wqObRcbAqCMya13uyzqw0= github.com/alecthomas/units v0.0.0-20190924025748-f65c72e2690d h1:UQZhZ2O0vMHr2cI+DC1Mbh0TJxzA3RcLoMsFw+aXw7E= github.com/alecthomas/units v0.0.0-20190924025748-f65c72e2690d/go.mod h1:rBZYJk541a8SKzHPHnH3zbiI+7dagKZ0cgpgrD7Fyho= -github.com/aliyun/aliyun-log-go-sdk v0.1.13 h1:D/5MpzV1eh9I5pxu5iVIfnsD5HE52rjZRl9hYmrXtNs= -github.com/aliyun/aliyun-log-go-sdk v0.1.13/go.mod h1:arjbKu+pwifPdi8tMJSJtFszZlxs+6F34VPv+ecf3zA= +github.com/aliyun/aliyun-log-go-sdk v0.1.14 h1:p47Yslwpi/slIBTqSK7TtdwOTvOULsoifyw1Y3LPCqk= +github.com/aliyun/aliyun-log-go-sdk v0.1.14/go.mod h1:arjbKu+pwifPdi8tMJSJtFszZlxs+6F34VPv+ecf3zA= github.com/andreyvit/diff v0.0.0-20170406064948-c7f18ee00883/go.mod h1:rCTlJbsFo29Kk6CurOXKm700vrz8f0KW0JNfpkRJY/8= github.com/andybalholm/brotli v1.0.0/go.mod h1:loMXtMfwqflxFJPmdbJO0a3KNoPuLBgiu3qAvBg8x/Y= github.com/antihax/optional v0.0.0-20180407024304-ca021399b1a6/go.mod h1:V8iCPQYkqmusNa815XgQio277wI47sdRh1dUOLdyC6Q= @@ -174,8 +174,8 @@ github.com/aws/aws-sdk-go v1.23.20/go.mod h1:KmX6BPdI08NWTb3/sm4ZGu5ShLoqVDhKgpi github.com/aws/aws-sdk-go v1.27.0/go.mod h1:KmX6BPdI08NWTb3/sm4ZGu5ShLoqVDhKgpiN924inxo= github.com/aws/aws-sdk-go v1.34.9/go.mod h1:5zCpMtNQVjRREroY7sYe8lOMRSxkhG6MZveU8YkpAk0= github.com/aws/aws-sdk-go v1.35.2/go.mod h1:H7NKnBqNVzoTJpGfLrQkkD+ytBA93eiDYi/+8rV9s48= -github.com/aws/aws-sdk-go v1.35.9 h1:b1HiUpdkFLJyoOQ7zas36YHzjNHH0ivHx/G5lWBeg+U= -github.com/aws/aws-sdk-go v1.35.9/go.mod h1:tlPOdRjfxPBpNIwqDj61rmsnA85v9jc0Ps9+muhnW+k= +github.com/aws/aws-sdk-go v1.35.10 h1:FsJtrOS7P+Qmq1rPTGgS/+qC1Y9eGuAJHvAZpZlhmb4= +github.com/aws/aws-sdk-go v1.35.10/go.mod h1:tlPOdRjfxPBpNIwqDj61rmsnA85v9jc0Ps9+muhnW+k= github.com/aws/aws-sdk-go-v2 v0.18.0/go.mod h1:JWVYvqSMppoMJC0x5wdwiImzgXTI9FuZwxzkQq9wy+g= github.com/aymerick/raymond v2.0.3-0.20180322193309-b565731e1464+incompatible/go.mod h1:osfaiScAUVup+UC9Nfq76eWqDhXlp+4UYaA8uhTBO6g= github.com/benbjohnson/clock v1.0.3/go.mod h1:bGMdMPoPVvcYyt1gHDf4J2KE153Yf9BuiUKYMaxlTDM= @@ -1369,8 +1369,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 h1:dntmOdLpSpHlVqbW5Eay97DelsZHe+55D+xC6i0dDS0= go.opencensus.io v0.22.5/go.mod h1:5pWMHQbX5EPX2/62yrJeAkowc+lfs/XD7Uxpq3pI6kk= -go.opentelemetry.io/collector v0.13.0 h1:w5DywMfxHIoGhomH382SJn95+TGQDTz5r9n4bBACe4Y= -go.opentelemetry.io/collector v0.13.0/go.mod h1:UB7wWD7RrEx8GFSaUR47TO1GAqxSi5+Kq68tI1icwJk= +go.opentelemetry.io/collector v0.13.1-0.20201020144745-846222e6af7a h1:eKbcrh2zBlQqQtrNCIDy3taW9si3b2DcILtLG8zd6hc= +go.opentelemetry.io/collector v0.13.1-0.20201020144745-846222e6af7a/go.mod h1:UB7wWD7RrEx8GFSaUR47TO1GAqxSi5+Kq68tI1icwJk= go.opentelemetry.io/otel v0.12.0 h1:bwWaPd/h2q+U6KdKaAiOS5GLwOMd1LDt9iNaeyIoAI8= go.opentelemetry.io/otel v0.12.0/go.mod h1:dlSNewoRYikTkotEnxdmuBHgzT+k/idJSfDv/FxEnOY= go.opentelemetry.io/otel/sdk v0.12.0 h1:YVUyDXsGvFWjhJxGXT4kBcGdfoTbo1vSGjbGRUdRh5U= @@ -1901,14 +1901,17 @@ honnef.co/go/tools v0.0.1-2020.1.6/go.mod h1:pyyisuGw24ruLjrr1ddx39WE0y9OooInRzE howett.net/plist v0.0.0-20181124034731-591f970eefbb h1:jhnBjNi9UFpfpl8YZhA9CrOqpnJdvzuiHsl/dnxl11M= howett.net/plist v0.0.0-20181124034731-591f970eefbb/go.mod h1:vMygbs4qMhSZSc4lCUl2OEE+rDiIIJAIdR4m7MiMcm0= k8s.io/api v0.18.8/go.mod h1:d/CXqwWv+Z2XEG1LgceeDmHQwpUJhROPx16SlxJgERY= -k8s.io/api v0.19.2 h1:q+/krnHWKsL7OBZg/rxnycsl9569Pud76UJ77MvKXms= k8s.io/api v0.19.2/go.mod h1:IQpK0zFQ1xc5iNIQPqzgoOwuFugaYHK4iCknlAQP9nI= +k8s.io/api v0.19.3 h1:GN6ntFnv44Vptj/b+OnMW7FmzkpDoIDLZRvKX3XH9aU= +k8s.io/api v0.19.3/go.mod h1:VF+5FT1B74Pw3KxMdKyinLo+zynBaMBiAfGMuldcNDs= k8s.io/apimachinery v0.18.8/go.mod h1:6sQd+iHEqmOtALqOFjSWp2KZ9F0wlU/nWm0ZgsYWMig= -k8s.io/apimachinery v0.19.2 h1:5Gy9vQpAGTKHPVOh5c4plE274X8D/6cuEiTO2zve7tc= k8s.io/apimachinery v0.19.2/go.mod h1:DnPGDnARWFvYa3pMHgSxtbZb7gpzzAZ1pTfaUNDVlmA= +k8s.io/apimachinery v0.19.3 h1:bpIQXlKjB4cB/oNpnNnV+BybGPR7iP5oYpsOTEJ4hgc= +k8s.io/apimachinery v0.19.3/go.mod h1:DnPGDnARWFvYa3pMHgSxtbZb7gpzzAZ1pTfaUNDVlmA= k8s.io/client-go v0.18.8/go.mod h1:HqFqMllQ5NnQJNwjro9k5zMyfhZlOwpuTLVrxjkYSxU= -k8s.io/client-go v0.19.2 h1:gMJuU3xJZs86L1oQ99R4EViAADUPMHHtS9jFshasHSc= k8s.io/client-go v0.19.2/go.mod h1:S5wPhCqyDNAlzM9CnEdgTGV4OqhsW3jGO1UM1epwfJA= +k8s.io/client-go v0.19.3 h1:ctqR1nQ52NUs6LpI0w+a5U+xjYwflFwA13OJKcicMxg= +k8s.io/client-go v0.19.3/go.mod h1:+eEMktZM+MG0KO+PTkci8xnbCZHvj9TqR6Q1XDUIJOM= k8s.io/gengo v0.0.0-20190128074634-0689ccc1d7d6/go.mod h1:ezvh/TsK7cY6rbqRK0oQQ8IAqLxYwwyPxAX1Pzy0ii0= k8s.io/gengo v0.0.0-20200413195148-3a45101e95ac/go.mod h1:ezvh/TsK7cY6rbqRK0oQQ8IAqLxYwwyPxAX1Pzy0ii0= k8s.io/klog v0.0.0-20181102134211-b9b56d5dfc92/go.mod h1:Gq+BEi5rUBO/HRz0bTSXDUcqjScdoY3a9IHpCEIOOfk= diff --git a/internal/common/go.mod b/internal/common/go.mod index 95e424f334a02..0e4e3a169a456 100644 --- a/internal/common/go.mod +++ b/internal/common/go.mod @@ -8,5 +8,5 @@ require ( github.com/docker/docker v17.12.0-ce-rc1.0.20200706150819-a40b877fbb9e+incompatible github.com/docker/go-connections v0.4.0 github.com/stretchr/testify v1.6.1 - go.opentelemetry.io/collector v0.13.0 + go.opentelemetry.io/collector v0.13.1-0.20201020144745-846222e6af7a ) diff --git a/internal/common/go.sum b/internal/common/go.sum index ea11ac3e33e83..a6f700e9e60a0 100644 --- a/internal/common/go.sum +++ b/internal/common/go.sum @@ -1018,8 +1018,8 @@ go.opencensus.io v0.22.0/go.mod h1:+kGneAE2xo2IficOXnaByMWTGM9T73dGwxeWcUqIpI8= go.opencensus.io v0.22.2/go.mod h1:yxeiOL68Rb0Xd1ddK5vPZ/oVn4vY4Ynel7k9FzqtOIw= go.opencensus.io v0.22.3/go.mod h1:yxeiOL68Rb0Xd1ddK5vPZ/oVn4vY4Ynel7k9FzqtOIw= go.opencensus.io v0.22.4/go.mod h1:yxeiOL68Rb0Xd1ddK5vPZ/oVn4vY4Ynel7k9FzqtOIw= -go.opentelemetry.io/collector v0.13.0 h1:w5DywMfxHIoGhomH382SJn95+TGQDTz5r9n4bBACe4Y= -go.opentelemetry.io/collector v0.13.0/go.mod h1:UB7wWD7RrEx8GFSaUR47TO1GAqxSi5+Kq68tI1icwJk= +go.opentelemetry.io/collector v0.13.1-0.20201020144745-846222e6af7a h1:eKbcrh2zBlQqQtrNCIDy3taW9si3b2DcILtLG8zd6hc= +go.opentelemetry.io/collector v0.13.1-0.20201020144745-846222e6af7a/go.mod h1:UB7wWD7RrEx8GFSaUR47TO1GAqxSi5+Kq68tI1icwJk= 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/go.mod b/processor/groupbytraceprocessor/go.mod index 1cb9d4980183f..5708931ed0c4f 100644 --- a/processor/groupbytraceprocessor/go.mod +++ b/processor/groupbytraceprocessor/go.mod @@ -5,6 +5,6 @@ go 1.14 require ( github.com/stretchr/testify v1.6.1 go.opencensus.io v0.22.5 - go.opentelemetry.io/collector v0.13.0 + go.opentelemetry.io/collector v0.13.1-0.20201020144745-846222e6af7a go.uber.org/zap v1.16.0 ) diff --git a/processor/groupbytraceprocessor/go.sum b/processor/groupbytraceprocessor/go.sum index 950cff3184750..4dcd783ae15ef 100644 --- a/processor/groupbytraceprocessor/go.sum +++ b/processor/groupbytraceprocessor/go.sum @@ -1006,12 +1006,11 @@ go.opencensus.io v0.21.0/go.mod h1:mSImk1erAIZhrmZN+AvHh14ztQfjbGwt4TtuofqLduU= go.opencensus.io v0.22.0/go.mod h1:+kGneAE2xo2IficOXnaByMWTGM9T73dGwxeWcUqIpI8= go.opencensus.io v0.22.2/go.mod h1:yxeiOL68Rb0Xd1ddK5vPZ/oVn4vY4Ynel7k9FzqtOIw= go.opencensus.io v0.22.3/go.mod h1:yxeiOL68Rb0Xd1ddK5vPZ/oVn4vY4Ynel7k9FzqtOIw= -go.opencensus.io v0.22.4 h1:LYy1Hy3MJdrCdMwwzxA/dRok4ejH+RwNGbuoD9fCjto= go.opencensus.io v0.22.4/go.mod h1:yxeiOL68Rb0Xd1ddK5vPZ/oVn4vY4Ynel7k9FzqtOIw= go.opencensus.io v0.22.5 h1:dntmOdLpSpHlVqbW5Eay97DelsZHe+55D+xC6i0dDS0= go.opencensus.io v0.22.5/go.mod h1:5pWMHQbX5EPX2/62yrJeAkowc+lfs/XD7Uxpq3pI6kk= -go.opentelemetry.io/collector v0.13.0 h1:w5DywMfxHIoGhomH382SJn95+TGQDTz5r9n4bBACe4Y= -go.opentelemetry.io/collector v0.13.0/go.mod h1:UB7wWD7RrEx8GFSaUR47TO1GAqxSi5+Kq68tI1icwJk= +go.opentelemetry.io/collector v0.13.1-0.20201020144745-846222e6af7a h1:eKbcrh2zBlQqQtrNCIDy3taW9si3b2DcILtLG8zd6hc= +go.opentelemetry.io/collector v0.13.1-0.20201020144745-846222e6af7a/go.mod h1:UB7wWD7RrEx8GFSaUR47TO1GAqxSi5+Kq68tI1icwJk= 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/factory_test.go b/processor/k8sprocessor/factory_test.go index 661bf7b71d5b6..ab29103cf9e33 100644 --- a/processor/k8sprocessor/factory_test.go +++ b/processor/k8sprocessor/factory_test.go @@ -21,7 +21,7 @@ import ( "github.com/stretchr/testify/assert" "go.opentelemetry.io/collector/component" "go.opentelemetry.io/collector/config/configcheck" - "go.opentelemetry.io/collector/exporter/exportertest" + "go.opentelemetry.io/collector/consumer/consumertest" "go.uber.org/zap" ) @@ -41,30 +41,30 @@ func TestCreateProcessor(t *testing.T) { cfg := factory.CreateDefaultConfig() params := component.ProcessorCreateParams{Logger: zap.NewNop()} - tp, err := factory.CreateTraceProcessor(context.Background(), params, cfg, exportertest.NewNopTraceExporter()) + tp, err := factory.CreateTraceProcessor(context.Background(), params, cfg, consumertest.NewTracesNop()) assert.NotNil(t, tp) assert.NoError(t, err) - mp, err := factory.CreateMetricsProcessor(context.Background(), params, cfg, exportertest.NewNopMetricsExporter()) + mp, err := factory.CreateMetricsProcessor(context.Background(), params, cfg, consumertest.NewMetricsNop()) assert.NotNil(t, mp) assert.NoError(t, err) - lp, err := factory.CreateLogsProcessor(context.Background(), params, cfg, exportertest.NewNopLogsExporter()) + lp, err := factory.CreateLogsProcessor(context.Background(), params, cfg, consumertest.NewLogsNop()) assert.NotNil(t, lp) assert.NoError(t, err) oCfg := cfg.(*Config) oCfg.Passthrough = true - tp, err = factory.CreateTraceProcessor(context.Background(), params, cfg, exportertest.NewNopTraceExporter()) + tp, err = factory.CreateTraceProcessor(context.Background(), params, cfg, consumertest.NewTracesNop()) assert.NotNil(t, tp) assert.NoError(t, err) - mp, err = factory.CreateMetricsProcessor(context.Background(), params, cfg, exportertest.NewNopMetricsExporter()) + mp, err = factory.CreateMetricsProcessor(context.Background(), params, cfg, consumertest.NewMetricsNop()) assert.NotNil(t, mp) assert.NoError(t, err) - lp, err = factory.CreateLogsProcessor(context.Background(), params, cfg, exportertest.NewNopLogsExporter()) + lp, err = factory.CreateLogsProcessor(context.Background(), params, cfg, consumertest.NewLogsNop()) assert.NotNil(t, lp) assert.NoError(t, err) diff --git a/processor/k8sprocessor/go.mod b/processor/k8sprocessor/go.mod index dd4eed285b973..9ef92e3f6438a 100644 --- a/processor/k8sprocessor/go.mod +++ b/processor/k8sprocessor/go.mod @@ -6,11 +6,11 @@ require ( github.com/open-telemetry/opentelemetry-collector-contrib/internal/k8sconfig v0.0.0-00010101000000-000000000000 github.com/stretchr/testify v1.6.1 go.opencensus.io v0.22.5 - go.opentelemetry.io/collector v0.13.0 + go.opentelemetry.io/collector v0.13.1-0.20201020144745-846222e6af7a go.uber.org/zap v1.16.0 - k8s.io/api v0.19.2 - k8s.io/apimachinery v0.19.2 - k8s.io/client-go v0.19.2 + k8s.io/api v0.19.3 + k8s.io/apimachinery v0.19.3 + k8s.io/client-go v0.19.3 ) replace github.com/open-telemetry/opentelemetry-collector-contrib/internal/k8sconfig => ./../../internal/k8sconfig diff --git a/processor/k8sprocessor/go.sum b/processor/k8sprocessor/go.sum index ca219b5e52520..70aca22eebedf 100644 --- a/processor/k8sprocessor/go.sum +++ b/processor/k8sprocessor/go.sum @@ -1129,8 +1129,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 h1:dntmOdLpSpHlVqbW5Eay97DelsZHe+55D+xC6i0dDS0= go.opencensus.io v0.22.5/go.mod h1:5pWMHQbX5EPX2/62yrJeAkowc+lfs/XD7Uxpq3pI6kk= -go.opentelemetry.io/collector v0.13.0 h1:w5DywMfxHIoGhomH382SJn95+TGQDTz5r9n4bBACe4Y= -go.opentelemetry.io/collector v0.13.0/go.mod h1:UB7wWD7RrEx8GFSaUR47TO1GAqxSi5+Kq68tI1icwJk= +go.opentelemetry.io/collector v0.13.1-0.20201020144745-846222e6af7a h1:eKbcrh2zBlQqQtrNCIDy3taW9si3b2DcILtLG8zd6hc= +go.opentelemetry.io/collector v0.13.1-0.20201020144745-846222e6af7a/go.mod h1:UB7wWD7RrEx8GFSaUR47TO1GAqxSi5+Kq68tI1icwJk= 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= @@ -1573,14 +1573,14 @@ honnef.co/go/tools v0.0.1-2020.1.3/go.mod h1:X/FiERA/W4tHapMX5mGpAtMSVEeEUOyHaw9 honnef.co/go/tools v0.0.1-2020.1.5 h1:nI5egYTGJakVyOryqLs1cQO5dO0ksin5XXs2pspk75k= honnef.co/go/tools v0.0.1-2020.1.5/go.mod h1:X/FiERA/W4tHapMX5mGpAtMSVEeEUOyHaw9vFzvIQ3k= k8s.io/api v0.18.8/go.mod h1:d/CXqwWv+Z2XEG1LgceeDmHQwpUJhROPx16SlxJgERY= -k8s.io/api v0.19.2 h1:q+/krnHWKsL7OBZg/rxnycsl9569Pud76UJ77MvKXms= -k8s.io/api v0.19.2/go.mod h1:IQpK0zFQ1xc5iNIQPqzgoOwuFugaYHK4iCknlAQP9nI= +k8s.io/api v0.19.3 h1:GN6ntFnv44Vptj/b+OnMW7FmzkpDoIDLZRvKX3XH9aU= +k8s.io/api v0.19.3/go.mod h1:VF+5FT1B74Pw3KxMdKyinLo+zynBaMBiAfGMuldcNDs= k8s.io/apimachinery v0.18.8/go.mod h1:6sQd+iHEqmOtALqOFjSWp2KZ9F0wlU/nWm0ZgsYWMig= -k8s.io/apimachinery v0.19.2 h1:5Gy9vQpAGTKHPVOh5c4plE274X8D/6cuEiTO2zve7tc= -k8s.io/apimachinery v0.19.2/go.mod h1:DnPGDnARWFvYa3pMHgSxtbZb7gpzzAZ1pTfaUNDVlmA= +k8s.io/apimachinery v0.19.3 h1:bpIQXlKjB4cB/oNpnNnV+BybGPR7iP5oYpsOTEJ4hgc= +k8s.io/apimachinery v0.19.3/go.mod h1:DnPGDnARWFvYa3pMHgSxtbZb7gpzzAZ1pTfaUNDVlmA= k8s.io/client-go v0.18.8/go.mod h1:HqFqMllQ5NnQJNwjro9k5zMyfhZlOwpuTLVrxjkYSxU= -k8s.io/client-go v0.19.2 h1:gMJuU3xJZs86L1oQ99R4EViAADUPMHHtS9jFshasHSc= -k8s.io/client-go v0.19.2/go.mod h1:S5wPhCqyDNAlzM9CnEdgTGV4OqhsW3jGO1UM1epwfJA= +k8s.io/client-go v0.19.3 h1:ctqR1nQ52NUs6LpI0w+a5U+xjYwflFwA13OJKcicMxg= +k8s.io/client-go v0.19.3/go.mod h1:+eEMktZM+MG0KO+PTkci8xnbCZHvj9TqR6Q1XDUIJOM= k8s.io/gengo v0.0.0-20190128074634-0689ccc1d7d6/go.mod h1:ezvh/TsK7cY6rbqRK0oQQ8IAqLxYwwyPxAX1Pzy0ii0= k8s.io/gengo v0.0.0-20200413195148-3a45101e95ac/go.mod h1:ezvh/TsK7cY6rbqRK0oQQ8IAqLxYwwyPxAX1Pzy0ii0= k8s.io/klog v0.0.0-20181102134211-b9b56d5dfc92/go.mod h1:Gq+BEi5rUBO/HRz0bTSXDUcqjScdoY3a9IHpCEIOOfk= diff --git a/processor/k8sprocessor/processor_test.go b/processor/k8sprocessor/processor_test.go index 9534603753c44..aaaeebf77a9e1 100644 --- a/processor/k8sprocessor/processor_test.go +++ b/processor/k8sprocessor/processor_test.go @@ -27,8 +27,8 @@ import ( "go.opentelemetry.io/collector/component/componenttest" "go.opentelemetry.io/collector/config/configmodels" "go.opentelemetry.io/collector/consumer" + "go.opentelemetry.io/collector/consumer/consumertest" "go.opentelemetry.io/collector/consumer/pdata" - "go.opentelemetry.io/collector/exporter/exportertest" "go.opentelemetry.io/collector/translator/conventions" "go.uber.org/zap" @@ -91,9 +91,9 @@ type multiTest struct { mp component.MetricsProcessor lp component.LogsProcessor - nextTrace *exportertest.SinkTraceExporter - nextMetrics *exportertest.SinkMetricsExporter - nextLogs *exportertest.SinkLogsExporter + nextTrace *consumertest.TracesSink + nextMetrics *consumertest.MetricsSink + nextLogs *consumertest.LogsSink kpMetrics *kubernetesprocessor kpTrace *kubernetesprocessor @@ -108,9 +108,9 @@ func newMultiTest( ) *multiTest { m := &multiTest{ t: t, - nextTrace: &exportertest.SinkTraceExporter{}, - nextMetrics: &exportertest.SinkMetricsExporter{}, - nextLogs: &exportertest.SinkLogsExporter{}, + nextTrace: new(consumertest.TracesSink), + nextMetrics: new(consumertest.MetricsSink), + nextLogs: new(consumertest.LogsSink), } tp, err := newTraceProcessor(cfg, m.nextTrace, append(options, withExtractKubernetesProcessorInto(&m.kpTrace))...) @@ -577,7 +577,7 @@ func TestProcessorPicksUpPassthoughPodIp(t *testing.T) { } func TestMetricsProcessorHostname(t *testing.T) { - next := &exportertest.SinkMetricsExporter{} + next := new(consumertest.MetricsSink) var kp *kubernetesprocessor p, err := newMetricsProcessor( NewFactory().CreateDefaultConfig(), @@ -647,7 +647,7 @@ func TestMetricsProcessorHostname(t *testing.T) { } func TestPassthroughStart(t *testing.T) { - next := &exportertest.SinkTraceExporter{} + next := new(consumertest.TracesSink) opts := []Option{WithPassthrough()} p, err := newTraceProcessor( @@ -678,7 +678,7 @@ func TestRealClient(t *testing.T) { func TestCapabilities(t *testing.T) { p, err := newTraceProcessor( NewFactory().CreateDefaultConfig(), - exportertest.NewNopTraceExporter(), + consumertest.NewTracesNop(), ) assert.NoError(t, err) caps := p.GetCapabilities() @@ -689,7 +689,7 @@ func TestStartStop(t *testing.T) { var kp *kubernetesprocessor p, err := newTraceProcessor( NewFactory().CreateDefaultConfig(), - exportertest.NewNopTraceExporter(), + consumertest.NewTracesNop(), withExtractKubernetesProcessorInto(&kp), ) require.NoError(t, err) diff --git a/processor/metricstransformprocessor/factory_test.go b/processor/metricstransformprocessor/factory_test.go index a490c7c0cb0d4..5458fe75a2f3b 100644 --- a/processor/metricstransformprocessor/factory_test.go +++ b/processor/metricstransformprocessor/factory_test.go @@ -27,7 +27,7 @@ import ( "go.opentelemetry.io/collector/config/configcheck" "go.opentelemetry.io/collector/config/configmodels" "go.opentelemetry.io/collector/config/configtest" - "go.opentelemetry.io/collector/exporter/exportertest" + "go.opentelemetry.io/collector/consumer/consumertest" "go.uber.org/zap" ) @@ -92,7 +92,7 @@ func TestCreateProcessors(t *testing.T) { context.Background(), component.ProcessorCreateParams{Logger: zap.NewNop()}, cfg, - exportertest.NewNopTraceExporter()) + consumertest.NewTracesNop()) // Not implemented error assert.Error(t, tErr) assert.Nil(t, tp) @@ -101,7 +101,7 @@ func TestCreateProcessors(t *testing.T) { context.Background(), component.ProcessorCreateParams{Logger: zap.NewNop()}, cfg, - exportertest.NewNopMetricsExporter()) + consumertest.NewMetricsNop()) if test.succeed { assert.NotNil(t, mp) assert.NoError(t, mErr) diff --git a/processor/metricstransformprocessor/go.mod b/processor/metricstransformprocessor/go.mod index 01559fbdd860d..dfedeaf80f4c7 100644 --- a/processor/metricstransformprocessor/go.mod +++ b/processor/metricstransformprocessor/go.mod @@ -6,7 +6,7 @@ require ( github.com/census-instrumentation/opencensus-proto v0.3.0 github.com/google/go-cmp v0.5.2 github.com/stretchr/testify v1.6.1 - go.opentelemetry.io/collector v0.13.0 + go.opentelemetry.io/collector v0.13.1-0.20201020144745-846222e6af7a go.uber.org/zap v1.16.0 google.golang.org/grpc/examples v0.0.0-20200728194956-1c32b02682df // indirect google.golang.org/protobuf v1.25.0 diff --git a/processor/metricstransformprocessor/go.sum b/processor/metricstransformprocessor/go.sum index 53960005fe126..9ae00a4751369 100644 --- a/processor/metricstransformprocessor/go.sum +++ b/processor/metricstransformprocessor/go.sum @@ -1116,8 +1116,8 @@ go.opencensus.io v0.22.2/go.mod h1:yxeiOL68Rb0Xd1ddK5vPZ/oVn4vY4Ynel7k9FzqtOIw= go.opencensus.io v0.22.3/go.mod h1:yxeiOL68Rb0Xd1ddK5vPZ/oVn4vY4Ynel7k9FzqtOIw= go.opencensus.io v0.22.4 h1:LYy1Hy3MJdrCdMwwzxA/dRok4ejH+RwNGbuoD9fCjto= go.opencensus.io v0.22.4/go.mod h1:yxeiOL68Rb0Xd1ddK5vPZ/oVn4vY4Ynel7k9FzqtOIw= -go.opentelemetry.io/collector v0.13.0 h1:w5DywMfxHIoGhomH382SJn95+TGQDTz5r9n4bBACe4Y= -go.opentelemetry.io/collector v0.13.0/go.mod h1:UB7wWD7RrEx8GFSaUR47TO1GAqxSi5+Kq68tI1icwJk= +go.opentelemetry.io/collector v0.13.1-0.20201020144745-846222e6af7a h1:eKbcrh2zBlQqQtrNCIDy3taW9si3b2DcILtLG8zd6hc= +go.opentelemetry.io/collector v0.13.1-0.20201020144745-846222e6af7a/go.mod h1:UB7wWD7RrEx8GFSaUR47TO1GAqxSi5+Kq68tI1icwJk= 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/metricstransformprocessor/metrics_transform_processor_test.go b/processor/metricstransformprocessor/metrics_transform_processor_test.go index 1dbc92fa1ec37..17c5c16c6472b 100644 --- a/processor/metricstransformprocessor/metrics_transform_processor_test.go +++ b/processor/metricstransformprocessor/metrics_transform_processor_test.go @@ -25,7 +25,7 @@ import ( "github.com/stretchr/testify/require" "go.opentelemetry.io/collector/config/configmodels" "go.opentelemetry.io/collector/consumer/consumerdata" - "go.opentelemetry.io/collector/exporter/exportertest" + "go.opentelemetry.io/collector/consumer/consumertest" "go.opentelemetry.io/collector/processor/processorhelper" "go.opentelemetry.io/collector/translator/internaldata" "go.uber.org/zap" @@ -35,7 +35,7 @@ import ( func TestMetricsTransformProcessor(t *testing.T) { for _, test := range standardTests { t.Run(test.name, func(t *testing.T) { - next := &exportertest.SinkMetricsExporter{} + next := new(consumertest.MetricsSink) p := newMetricsTransformProcessor(zap.NewExample(), test.transforms) @@ -174,7 +174,7 @@ func BenchmarkMetricsTransformProcessorRenameMetrics(b *testing.B) { md := consumerdata.MetricsData{Metrics: in} p := newMetricsTransformProcessor(nil, transforms) - mtp, _ := processorhelper.NewMetricsProcessor(&Config{}, exportertest.NewNopMetricsExporter(), p) + mtp, _ := processorhelper.NewMetricsProcessor(&Config{}, consumertest.NewMetricsNop(), p) b.ResetTimer() diff --git a/processor/resourcedetectionprocessor/factory_test.go b/processor/resourcedetectionprocessor/factory_test.go index bfd49b19b44b0..00ae93144af94 100644 --- a/processor/resourcedetectionprocessor/factory_test.go +++ b/processor/resourcedetectionprocessor/factory_test.go @@ -21,7 +21,7 @@ import ( "github.com/stretchr/testify/assert" "go.opentelemetry.io/collector/component" "go.opentelemetry.io/collector/config/configcheck" - "go.opentelemetry.io/collector/exporter/exportertest" + "go.opentelemetry.io/collector/consumer/consumertest" ) func TestCreateDefaultConfig(t *testing.T) { @@ -34,15 +34,15 @@ func TestCreateProcessor(t *testing.T) { factory := NewFactory() cfg := factory.CreateDefaultConfig() - tp, err := factory.CreateTraceProcessor(context.Background(), component.ProcessorCreateParams{}, cfg, exportertest.NewNopTraceExporter()) + tp, err := factory.CreateTraceProcessor(context.Background(), component.ProcessorCreateParams{}, cfg, consumertest.NewTracesNop()) assert.NoError(t, err) assert.NotNil(t, tp) - mp, err := factory.CreateMetricsProcessor(context.Background(), component.ProcessorCreateParams{}, cfg, exportertest.NewNopMetricsExporter()) + mp, err := factory.CreateMetricsProcessor(context.Background(), component.ProcessorCreateParams{}, cfg, consumertest.NewMetricsNop()) assert.NoError(t, err) assert.NotNil(t, mp) - lp, err := factory.CreateLogsProcessor(context.Background(), component.ProcessorCreateParams{}, cfg, exportertest.NewNopLogsExporter()) + lp, err := factory.CreateLogsProcessor(context.Background(), component.ProcessorCreateParams{}, cfg, consumertest.NewLogsNop()) assert.NoError(t, err) assert.NotNil(t, lp) } @@ -53,15 +53,15 @@ func TestInvalidConfig(t *testing.T) { oCfg := cfg.(*Config) oCfg.Detectors = []string{"not-existing"} - tp, err := factory.CreateTraceProcessor(context.Background(), component.ProcessorCreateParams{}, cfg, exportertest.NewNopTraceExporter()) + tp, err := factory.CreateTraceProcessor(context.Background(), component.ProcessorCreateParams{}, cfg, consumertest.NewTracesNop()) assert.Error(t, err) assert.Nil(t, tp) - mp, err := factory.CreateMetricsProcessor(context.Background(), component.ProcessorCreateParams{}, cfg, exportertest.NewNopMetricsExporter()) + mp, err := factory.CreateMetricsProcessor(context.Background(), component.ProcessorCreateParams{}, cfg, consumertest.NewMetricsNop()) assert.Error(t, err) assert.Nil(t, mp) - lp, err := factory.CreateLogsProcessor(context.Background(), component.ProcessorCreateParams{}, cfg, exportertest.NewNopLogsExporter()) + lp, err := factory.CreateLogsProcessor(context.Background(), component.ProcessorCreateParams{}, cfg, consumertest.NewLogsNop()) assert.Error(t, err) assert.Nil(t, lp) } diff --git a/processor/resourcedetectionprocessor/go.mod b/processor/resourcedetectionprocessor/go.mod index 548c6a8a60def..213d592acc9f4 100644 --- a/processor/resourcedetectionprocessor/go.mod +++ b/processor/resourcedetectionprocessor/go.mod @@ -7,7 +7,7 @@ require ( github.com/aws/aws-sdk-go v1.35.2 github.com/census-instrumentation/opencensus-proto v0.3.0 github.com/stretchr/testify v1.6.1 - go.opentelemetry.io/collector v0.13.0 + go.opentelemetry.io/collector v0.13.1-0.20201020144745-846222e6af7a go.uber.org/zap v1.16.0 google.golang.org/grpc/examples v0.0.0-20200728194956-1c32b02682df // indirect ) diff --git a/processor/resourcedetectionprocessor/go.sum b/processor/resourcedetectionprocessor/go.sum index f40655bbf6d6e..20186821f5f35 100644 --- a/processor/resourcedetectionprocessor/go.sum +++ b/processor/resourcedetectionprocessor/go.sum @@ -1138,8 +1138,8 @@ go.opencensus.io v0.22.2/go.mod h1:yxeiOL68Rb0Xd1ddK5vPZ/oVn4vY4Ynel7k9FzqtOIw= go.opencensus.io v0.22.3/go.mod h1:yxeiOL68Rb0Xd1ddK5vPZ/oVn4vY4Ynel7k9FzqtOIw= go.opencensus.io v0.22.4 h1:LYy1Hy3MJdrCdMwwzxA/dRok4ejH+RwNGbuoD9fCjto= go.opencensus.io v0.22.4/go.mod h1:yxeiOL68Rb0Xd1ddK5vPZ/oVn4vY4Ynel7k9FzqtOIw= -go.opentelemetry.io/collector v0.13.0 h1:w5DywMfxHIoGhomH382SJn95+TGQDTz5r9n4bBACe4Y= -go.opentelemetry.io/collector v0.13.0/go.mod h1:UB7wWD7RrEx8GFSaUR47TO1GAqxSi5+Kq68tI1icwJk= +go.opentelemetry.io/collector v0.13.1-0.20201020144745-846222e6af7a h1:eKbcrh2zBlQqQtrNCIDy3taW9si3b2DcILtLG8zd6hc= +go.opentelemetry.io/collector v0.13.1-0.20201020144745-846222e6af7a/go.mod h1:UB7wWD7RrEx8GFSaUR47TO1GAqxSi5+Kq68tI1icwJk= 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/resourcedetection_processor_test.go b/processor/resourcedetectionprocessor/resourcedetection_processor_test.go index 1d5df10d7c44f..a1cbe98878d07 100644 --- a/processor/resourcedetectionprocessor/resourcedetection_processor_test.go +++ b/processor/resourcedetectionprocessor/resourcedetection_processor_test.go @@ -27,8 +27,8 @@ import ( "go.opentelemetry.io/collector/component" "go.opentelemetry.io/collector/component/componenttest" "go.opentelemetry.io/collector/consumer/consumerdata" + "go.opentelemetry.io/collector/consumer/consumertest" "go.opentelemetry.io/collector/consumer/pdata" - "go.opentelemetry.io/collector/exporter/exportertest" "go.opentelemetry.io/collector/translator/internaldata" "go.uber.org/zap" @@ -173,7 +173,7 @@ func TestResourceProcessor(t *testing.T) { cfg := &Config{Override: tt.override, Detectors: tt.detectorKeys, Timeout: time.Second} // Test trace consuner - ttn := &exportertest.SinkTraceExporter{} + ttn := new(consumertest.TracesSink) rtp, err := factory.createTraceProcessor(context.Background(), component.ProcessorCreateParams{Logger: zap.NewNop()}, cfg, ttn) if tt.expectedNewError != "" { @@ -207,7 +207,7 @@ func TestResourceProcessor(t *testing.T) { assert.Equal(t, tt.expectedResource, got) // Test metrics consumer - tmn := &exportertest.SinkMetricsExporter{} + tmn := new(consumertest.MetricsSink) rmp, err := factory.createMetricsProcessor(context.Background(), component.ProcessorCreateParams{Logger: zap.NewNop()}, cfg, tmn) if tt.expectedNewError != "" { @@ -240,7 +240,7 @@ func TestResourceProcessor(t *testing.T) { assert.Equal(t, tt.expectedResource, got) // Test logs consumer - tln := &exportertest.SinkLogsExporter{} + tln := new(consumertest.LogsSink) rlp, err := factory.createLogsProcessor(context.Background(), component.ProcessorCreateParams{Logger: zap.NewNop()}, cfg, tln) if tt.expectedNewError != "" { @@ -291,7 +291,7 @@ func oCensusResource(res pdata.Resource) *resourcepb.Resource { func benchmarkConsumeTraces(b *testing.B, cfg *Config) { factory := NewFactory() - sink := &exportertest.SinkTraceExporter{} + sink := new(consumertest.TracesSink) processor, _ := factory.CreateTraceProcessor(context.Background(), component.ProcessorCreateParams{Logger: zap.NewNop()}, cfg, sink) b.ResetTimer() @@ -313,7 +313,7 @@ func BenchmarkConsumeTracesAll(b *testing.B) { func benchmarkConsumeMetrics(b *testing.B, cfg *Config) { factory := NewFactory() - sink := &exportertest.SinkMetricsExporter{} + sink := new(consumertest.MetricsSink) processor, _ := factory.CreateMetricsProcessor(context.Background(), component.ProcessorCreateParams{Logger: zap.NewNop()}, cfg, sink) b.ResetTimer() @@ -335,7 +335,7 @@ func BenchmarkConsumeMetricsAll(b *testing.B) { func benchmarkConsumeLogs(b *testing.B, cfg *Config) { factory := NewFactory() - sink := &exportertest.SinkLogsExporter{} + sink := new(consumertest.LogsSink) processor, _ := factory.CreateLogsProcessor(context.Background(), component.ProcessorCreateParams{Logger: zap.NewNop()}, cfg, sink) b.ResetTimer() diff --git a/processor/routingprocessor/factory_test.go b/processor/routingprocessor/factory_test.go index d3beb79f67cc3..2fe84e4d16dac 100644 --- a/processor/routingprocessor/factory_test.go +++ b/processor/routingprocessor/factory_test.go @@ -23,8 +23,8 @@ import ( "github.com/stretchr/testify/require" "go.opentelemetry.io/collector/component" "go.opentelemetry.io/collector/config/configmodels" + "go.opentelemetry.io/collector/consumer/consumertest" "go.opentelemetry.io/collector/consumer/pdata" - "go.opentelemetry.io/collector/exporter/exportertest" "go.opentelemetry.io/collector/processor/processorhelper" "go.uber.org/zap" ) @@ -49,7 +49,7 @@ func TestProcessorGetsCreatedWithValidConfiguration(t *testing.T) { } // test - exp, err := factory.CreateTraceProcessor(context.Background(), creationParams, cfg, exportertest.NewNopTraceExporter()) + exp, err := factory.CreateTraceProcessor(context.Background(), creationParams, cfg, consumertest.NewTracesNop()) // verify assert.Nil(t, err) @@ -63,7 +63,7 @@ func TestFailOnEmptyConfiguration(t *testing.T) { cfg := factory.CreateDefaultConfig() // test - exp, err := factory.CreateTraceProcessor(context.Background(), creationParams, cfg, exportertest.NewNopTraceExporter()) + exp, err := factory.CreateTraceProcessor(context.Background(), creationParams, cfg, consumertest.NewTracesNop()) // verify assert.Error(t, err) @@ -89,7 +89,7 @@ func TestProcessorFailsToBeCreatedWhenRouteHasNoExporters(t *testing.T) { } // test - exp, err := factory.CreateTraceProcessor(context.Background(), creationParams, cfg, exportertest.NewNopTraceExporter()) + exp, err := factory.CreateTraceProcessor(context.Background(), creationParams, cfg, consumertest.NewTracesNop()) // verify assert.True(t, errors.Is(err, errNoExporters)) @@ -111,7 +111,7 @@ func TestProcessorFailsToBeCreatedWhenNoRoutesExist(t *testing.T) { } // test - exp, err := factory.CreateTraceProcessor(context.Background(), creationParams, cfg, exportertest.NewNopTraceExporter()) + exp, err := factory.CreateTraceProcessor(context.Background(), creationParams, cfg, consumertest.NewTracesNop()) // verify assert.True(t, errors.Is(err, errNoTableItems)) @@ -137,7 +137,7 @@ func TestProcessorFailsWithNoFromAttribute(t *testing.T) { } // test - exp, err := factory.CreateTraceProcessor(context.Background(), creationParams, cfg, exportertest.NewNopTraceExporter()) + exp, err := factory.CreateTraceProcessor(context.Background(), creationParams, cfg, consumertest.NewTracesNop()) // verify assert.True(t, errors.Is(err, errNoMissingFromAttribute)) @@ -162,7 +162,7 @@ func TestShouldNotFailWhenNextIsProcessor(t *testing.T) { }, }, } - next, err := processorhelper.NewTraceProcessor(cfg, exportertest.NewNopTraceExporter(), &mockProcessor{}) + next, err := processorhelper.NewTraceProcessor(cfg, consumertest.NewTracesNop(), &mockProcessor{}) require.NoError(t, err) // test @@ -192,7 +192,7 @@ func TestShutdown(t *testing.T) { }, } - exp, err := factory.CreateTraceProcessor(context.Background(), creationParams, cfg, exportertest.NewNopTraceExporter()) + exp, err := factory.CreateTraceProcessor(context.Background(), creationParams, cfg, consumertest.NewTracesNop()) require.Nil(t, err) require.NotNil(t, exp) diff --git a/processor/routingprocessor/go.mod b/processor/routingprocessor/go.mod index d0d576cc86619..ebe7145e6d3b8 100644 --- a/processor/routingprocessor/go.mod +++ b/processor/routingprocessor/go.mod @@ -4,7 +4,7 @@ go 1.14 require ( github.com/stretchr/testify v1.6.1 - go.opentelemetry.io/collector v0.13.0 + go.opentelemetry.io/collector v0.13.1-0.20201020144745-846222e6af7a go.uber.org/zap v1.16.0 google.golang.org/grpc v1.32.0 ) diff --git a/processor/routingprocessor/go.sum b/processor/routingprocessor/go.sum index 792e988ad8d3b..41ab6b79264a0 100644 --- a/processor/routingprocessor/go.sum +++ b/processor/routingprocessor/go.sum @@ -1116,8 +1116,8 @@ go.opencensus.io v0.22.2/go.mod h1:yxeiOL68Rb0Xd1ddK5vPZ/oVn4vY4Ynel7k9FzqtOIw= go.opencensus.io v0.22.3/go.mod h1:yxeiOL68Rb0Xd1ddK5vPZ/oVn4vY4Ynel7k9FzqtOIw= go.opencensus.io v0.22.4 h1:LYy1Hy3MJdrCdMwwzxA/dRok4ejH+RwNGbuoD9fCjto= go.opencensus.io v0.22.4/go.mod h1:yxeiOL68Rb0Xd1ddK5vPZ/oVn4vY4Ynel7k9FzqtOIw= -go.opentelemetry.io/collector v0.13.0 h1:w5DywMfxHIoGhomH382SJn95+TGQDTz5r9n4bBACe4Y= -go.opentelemetry.io/collector v0.13.0/go.mod h1:UB7wWD7RrEx8GFSaUR47TO1GAqxSi5+Kq68tI1icwJk= +go.opentelemetry.io/collector v0.13.1-0.20201020144745-846222e6af7a h1:eKbcrh2zBlQqQtrNCIDy3taW9si3b2DcILtLG8zd6hc= +go.opentelemetry.io/collector v0.13.1-0.20201020144745-846222e6af7a/go.mod h1:UB7wWD7RrEx8GFSaUR47TO1GAqxSi5+Kq68tI1icwJk= 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/go.mod b/receiver/awsecscontainermetricsreceiver/go.mod index b5bde83f8fe51..541580aca84ab 100644 --- a/receiver/awsecscontainermetricsreceiver/go.mod +++ b/receiver/awsecscontainermetricsreceiver/go.mod @@ -6,6 +6,6 @@ require ( github.com/census-instrumentation/opencensus-proto v0.3.0 github.com/golang/protobuf v1.4.2 github.com/stretchr/testify v1.6.1 - go.opentelemetry.io/collector v0.13.0 + go.opentelemetry.io/collector v0.13.1-0.20201020144745-846222e6af7a go.uber.org/zap v1.16.0 ) diff --git a/receiver/awsecscontainermetricsreceiver/go.sum b/receiver/awsecscontainermetricsreceiver/go.sum index 3c33c3654001c..84c3f090b43b4 100644 --- a/receiver/awsecscontainermetricsreceiver/go.sum +++ b/receiver/awsecscontainermetricsreceiver/go.sum @@ -1120,8 +1120,8 @@ go.opencensus.io v0.22.2/go.mod h1:yxeiOL68Rb0Xd1ddK5vPZ/oVn4vY4Ynel7k9FzqtOIw= go.opencensus.io v0.22.3/go.mod h1:yxeiOL68Rb0Xd1ddK5vPZ/oVn4vY4Ynel7k9FzqtOIw= go.opencensus.io v0.22.4 h1:LYy1Hy3MJdrCdMwwzxA/dRok4ejH+RwNGbuoD9fCjto= go.opencensus.io v0.22.4/go.mod h1:yxeiOL68Rb0Xd1ddK5vPZ/oVn4vY4Ynel7k9FzqtOIw= -go.opentelemetry.io/collector v0.13.0 h1:w5DywMfxHIoGhomH382SJn95+TGQDTz5r9n4bBACe4Y= -go.opentelemetry.io/collector v0.13.0/go.mod h1:UB7wWD7RrEx8GFSaUR47TO1GAqxSi5+Kq68tI1icwJk= +go.opentelemetry.io/collector v0.13.1-0.20201020144745-846222e6af7a h1:eKbcrh2zBlQqQtrNCIDy3taW9si3b2DcILtLG8zd6hc= +go.opentelemetry.io/collector v0.13.1-0.20201020144745-846222e6af7a/go.mod h1:UB7wWD7RrEx8GFSaUR47TO1GAqxSi5+Kq68tI1icwJk= 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_test.go b/receiver/awsecscontainermetricsreceiver/receiver_test.go index e529692bad945..980988c39f628 100644 --- a/receiver/awsecscontainermetricsreceiver/receiver_test.go +++ b/receiver/awsecscontainermetricsreceiver/receiver_test.go @@ -22,7 +22,7 @@ import ( "github.com/stretchr/testify/require" "go.opentelemetry.io/collector/component/componenttest" - "go.opentelemetry.io/collector/exporter/exportertest" + "go.opentelemetry.io/collector/consumer/consumertest" "go.uber.org/zap" ) @@ -46,7 +46,7 @@ func TestReceiver(t *testing.T) { metricsReceiver, err := New( zap.NewNop(), cfg, - exportertest.NewNopMetricsExporter(), + consumertest.NewMetricsNop(), &fakeRestClient{}, ) @@ -81,7 +81,7 @@ func TestCollectDataFromEndpoint(t *testing.T) { metricsReceiver, err := New( zap.NewNop(), cfg, - new(exportertest.SinkMetricsExporter), + new(consumertest.MetricsSink), &fakeRestClient{}, ) @@ -98,9 +98,9 @@ func TestCollectDataFromEndpoint(t *testing.T) { func TestCollectDataFromEndpointWithConsumerError(t *testing.T) { cfg := createDefaultConfig().(*Config) - sme := new(exportertest.SinkMetricsExporter) + sme := new(consumertest.MetricsSink) e := fmt.Errorf("Test Error for Metrics Consumer") - sme.SetConsumeMetricsError(e) + sme.SetConsumeError(e) metricsReceiver, err := New( zap.NewNop(), @@ -139,7 +139,7 @@ func TestCollectDataFromEndpointWithEndpointError(t *testing.T) { metricsReceiver, err := New( zap.NewNop(), cfg, - new(exportertest.SinkMetricsExporter), + new(consumertest.MetricsSink), &invalidFakeClient{}, ) diff --git a/receiver/awsxrayreceiver/go.mod b/receiver/awsxrayreceiver/go.mod index 51c7cf0ff7975..6142d2be66c48 100644 --- a/receiver/awsxrayreceiver/go.mod +++ b/receiver/awsxrayreceiver/go.mod @@ -3,11 +3,11 @@ module github.com/open-telemetry/opentelemetry-collector-contrib/receiver/awsxra go 1.14 require ( - github.com/aws/aws-sdk-go v1.35.9 + github.com/aws/aws-sdk-go v1.35.10 github.com/google/uuid v1.1.2 github.com/open-telemetry/opentelemetry-collector-contrib/internal/awsxray v0.0.0-00010101000000-000000000000 github.com/stretchr/testify v1.6.1 - go.opentelemetry.io/collector v0.13.0 + go.opentelemetry.io/collector v0.13.1-0.20201020144745-846222e6af7a go.uber.org/zap v1.16.0 ) diff --git a/receiver/awsxrayreceiver/go.sum b/receiver/awsxrayreceiver/go.sum index dec46077eda3a..282779930f76b 100644 --- a/receiver/awsxrayreceiver/go.sum +++ b/receiver/awsxrayreceiver/go.sum @@ -129,8 +129,8 @@ github.com/asaskevich/govalidator v0.0.0-20200108200545-475eaeb16496/go.mod h1:o github.com/aws/aws-lambda-go v1.13.3/go.mod h1:4UKl9IzQMoD+QF79YdCuzCwp8VbmG4VAQwij/eHl5CU= github.com/aws/aws-sdk-go v1.27.0/go.mod h1:KmX6BPdI08NWTb3/sm4ZGu5ShLoqVDhKgpiN924inxo= github.com/aws/aws-sdk-go v1.34.9/go.mod h1:5zCpMtNQVjRREroY7sYe8lOMRSxkhG6MZveU8YkpAk0= -github.com/aws/aws-sdk-go v1.35.9 h1:b1HiUpdkFLJyoOQ7zas36YHzjNHH0ivHx/G5lWBeg+U= -github.com/aws/aws-sdk-go v1.35.9/go.mod h1:tlPOdRjfxPBpNIwqDj61rmsnA85v9jc0Ps9+muhnW+k= +github.com/aws/aws-sdk-go v1.35.10 h1:FsJtrOS7P+Qmq1rPTGgS/+qC1Y9eGuAJHvAZpZlhmb4= +github.com/aws/aws-sdk-go v1.35.10/go.mod h1:tlPOdRjfxPBpNIwqDj61rmsnA85v9jc0Ps9+muhnW+k= github.com/aws/aws-sdk-go-v2 v0.18.0/go.mod h1:JWVYvqSMppoMJC0x5wdwiImzgXTI9FuZwxzkQq9wy+g= github.com/beorn7/perks v0.0.0-20180321164747-3a771d992973/go.mod h1:Dwedo/Wpr24TaqPxmxbtue+5NUziq4I4S80YR8gNf3Q= github.com/beorn7/perks v1.0.0/go.mod h1:KWe93zE9D1o94FZ5RNwFwVgaQK1VOXiVxmqh+CedLV8= @@ -1120,8 +1120,8 @@ go.opencensus.io v0.22.2/go.mod h1:yxeiOL68Rb0Xd1ddK5vPZ/oVn4vY4Ynel7k9FzqtOIw= go.opencensus.io v0.22.3/go.mod h1:yxeiOL68Rb0Xd1ddK5vPZ/oVn4vY4Ynel7k9FzqtOIw= go.opencensus.io v0.22.4 h1:LYy1Hy3MJdrCdMwwzxA/dRok4ejH+RwNGbuoD9fCjto= go.opencensus.io v0.22.4/go.mod h1:yxeiOL68Rb0Xd1ddK5vPZ/oVn4vY4Ynel7k9FzqtOIw= -go.opentelemetry.io/collector v0.13.0 h1:w5DywMfxHIoGhomH382SJn95+TGQDTz5r9n4bBACe4Y= -go.opentelemetry.io/collector v0.13.0/go.mod h1:UB7wWD7RrEx8GFSaUR47TO1GAqxSi5+Kq68tI1icwJk= +go.opentelemetry.io/collector v0.13.1-0.20201020144745-846222e6af7a h1:eKbcrh2zBlQqQtrNCIDy3taW9si3b2DcILtLG8zd6hc= +go.opentelemetry.io/collector v0.13.1-0.20201020144745-846222e6af7a/go.mod h1:UB7wWD7RrEx8GFSaUR47TO1GAqxSi5+Kq68tI1icwJk= 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_test.go b/receiver/awsxrayreceiver/receiver_test.go index ba821641f0912..25a292fb6b6e0 100644 --- a/receiver/awsxrayreceiver/receiver_test.go +++ b/receiver/awsxrayreceiver/receiver_test.go @@ -34,8 +34,8 @@ import ( "go.opentelemetry.io/collector/config/configmodels" "go.opentelemetry.io/collector/config/confignet" "go.opentelemetry.io/collector/consumer" + "go.opentelemetry.io/collector/consumer/consumertest" "go.opentelemetry.io/collector/consumer/pdata" - "go.opentelemetry.io/collector/exporter/exportertest" "go.opentelemetry.io/collector/obsreport/obsreporttest" "go.opentelemetry.io/collector/testutil" "go.uber.org/zap" @@ -78,7 +78,7 @@ func TestProxyCreationFailed(t *testing.T) { addr, err := findAvailableUDPAddress() assert.NoError(t, err, "there should be address available") - sink := new(exportertest.SinkTraceExporter) + sink := new(consumertest.TracesSink) _, err = newReceiver( &Config{ NetAddr: confignet.NetAddr{ @@ -98,7 +98,7 @@ func TestProxyCreationFailed(t *testing.T) { } func TestPollerCreationFailed(t *testing.T) { - sink := new(exportertest.SinkTraceExporter) + sink := new(consumertest.TracesSink) _, err := newReceiver( &Config{ NetAddr: confignet.NetAddr{ @@ -121,7 +121,7 @@ func TestCantStartAnInstanceTwice(t *testing.T) { assert.NoError(t, err, "there should be address available") tcpAddr := testutil.GetAvailableLocalAddress(t) - sink := new(exportertest.SinkTraceExporter) + sink := new(consumertest.TracesSink) rcvr, err := newReceiver( &Config{ NetAddr: confignet.NetAddr{ @@ -157,7 +157,7 @@ func TestCantStopAnInstanceTwice(t *testing.T) { assert.NoError(t, err, "there should be address available") tcpAddr := testutil.GetAvailableLocalAddress(t) - sink := new(exportertest.SinkTraceExporter) + sink := new(consumertest.TracesSink) rcvr, err := newReceiver( &Config{ NetAddr: confignet.NetAddr{ @@ -224,7 +224,7 @@ func TestSegmentsPassedToConsumer(t *testing.T) { err = writePacket(t, addr, segmentHeader+string(content)) assert.NoError(t, err, "can not write packet in the happy case") - sink := rcvr.(*xrayReceiver).consumer.(*exportertest.SinkTraceExporter) + sink := rcvr.(*xrayReceiver).consumer.(*consumertest.TracesSink) testutil.WaitFor(t, func() bool { got := sink.AllTraces() @@ -394,7 +394,7 @@ func createAndOptionallyStartReceiver( var sink consumer.TraceConsumer if csu == nil { - sink = new(exportertest.SinkTraceExporter) + sink = new(consumertest.TracesSink) } else { sink = csu } diff --git a/receiver/carbonreceiver/factory_test.go b/receiver/carbonreceiver/factory_test.go index 82c2e38232f27..a3dfaee09b21b 100644 --- a/receiver/carbonreceiver/factory_test.go +++ b/receiver/carbonreceiver/factory_test.go @@ -21,7 +21,7 @@ import ( "github.com/stretchr/testify/assert" "go.opentelemetry.io/collector/component" "go.opentelemetry.io/collector/config/configcheck" - "go.opentelemetry.io/collector/exporter/exportertest" + "go.opentelemetry.io/collector/consumer/consumertest" "go.uber.org/zap" ) @@ -37,7 +37,7 @@ func TestCreateReceiver(t *testing.T) { cfg.Endpoint = "localhost:0" // Endpoint is required, not going to be used here. params := component.ReceiverCreateParams{Logger: zap.NewNop()} - tReceiver, err := createMetricsReceiver(context.Background(), params, cfg, exportertest.NewNopMetricsExporter()) + tReceiver, err := createMetricsReceiver(context.Background(), params, cfg, consumertest.NewMetricsNop()) assert.NoError(t, err) assert.NotNil(t, tReceiver, "receiver creation failed") } diff --git a/receiver/carbonreceiver/go.mod b/receiver/carbonreceiver/go.mod index 08dac1f63e02d..fc7d89e203d73 100644 --- a/receiver/carbonreceiver/go.mod +++ b/receiver/carbonreceiver/go.mod @@ -7,7 +7,7 @@ require ( github.com/spf13/viper v1.7.1 github.com/stretchr/testify v1.6.1 go.opencensus.io v0.22.5 - go.opentelemetry.io/collector v0.13.0 + go.opentelemetry.io/collector v0.13.1-0.20201020144745-846222e6af7a go.uber.org/zap v1.16.0 google.golang.org/grpc/examples v0.0.0-20200728194956-1c32b02682df // indirect google.golang.org/protobuf v1.25.0 diff --git a/receiver/carbonreceiver/go.sum b/receiver/carbonreceiver/go.sum index 7ee8df233f244..92463502d92b8 100644 --- a/receiver/carbonreceiver/go.sum +++ b/receiver/carbonreceiver/go.sum @@ -1117,8 +1117,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 h1:dntmOdLpSpHlVqbW5Eay97DelsZHe+55D+xC6i0dDS0= go.opencensus.io v0.22.5/go.mod h1:5pWMHQbX5EPX2/62yrJeAkowc+lfs/XD7Uxpq3pI6kk= -go.opentelemetry.io/collector v0.13.0 h1:w5DywMfxHIoGhomH382SJn95+TGQDTz5r9n4bBACe4Y= -go.opentelemetry.io/collector v0.13.0/go.mod h1:UB7wWD7RrEx8GFSaUR47TO1GAqxSi5+Kq68tI1icwJk= +go.opentelemetry.io/collector v0.13.1-0.20201020144745-846222e6af7a h1:eKbcrh2zBlQqQtrNCIDy3taW9si3b2DcILtLG8zd6hc= +go.opentelemetry.io/collector v0.13.1-0.20201020144745-846222e6af7a/go.mod h1:UB7wWD7RrEx8GFSaUR47TO1GAqxSi5+Kq68tI1icwJk= 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_test.go b/receiver/carbonreceiver/receiver_test.go index 10e8343d717e9..fb4a58f3c8fd0 100644 --- a/receiver/carbonreceiver/receiver_test.go +++ b/receiver/carbonreceiver/receiver_test.go @@ -30,7 +30,7 @@ import ( "go.opentelemetry.io/collector/config/configmodels" "go.opentelemetry.io/collector/config/confignet" "go.opentelemetry.io/collector/consumer" - "go.opentelemetry.io/collector/exporter/exportertest" + "go.opentelemetry.io/collector/consumer/consumertest" "go.opentelemetry.io/collector/testutil" "go.opentelemetry.io/collector/translator/internaldata" "go.uber.org/zap" @@ -55,7 +55,7 @@ func Test_carbonreceiver_New(t *testing.T) { name: "default_config", args: args{ config: *defaultConfig, - nextConsumer: exportertest.NewNopMetricsExporter(), + nextConsumer: consumertest.NewMetricsNop(), }, }, { @@ -69,7 +69,7 @@ func Test_carbonreceiver_New(t *testing.T) { }, TCPIdleTimeout: defaultConfig.TCPIdleTimeout, }, - nextConsumer: exportertest.NewNopMetricsExporter(), + nextConsumer: consumertest.NewMetricsNop(), }, }, { @@ -85,7 +85,7 @@ func Test_carbonreceiver_New(t *testing.T) { config: Config{ ReceiverSettings: configmodels.ReceiverSettings{}, }, - nextConsumer: exportertest.NewNopMetricsExporter(), + nextConsumer: consumertest.NewMetricsNop(), }, wantErr: errEmptyEndpoint, }, @@ -105,7 +105,7 @@ func Test_carbonreceiver_New(t *testing.T) { Config: &protocol.PlaintextConfig{}, }, }, - nextConsumer: exportertest.NewNopMetricsExporter(), + nextConsumer: consumertest.NewMetricsNop(), }, wantErr: errors.New("unsupported transport \"unknown_transp\" for receiver \"invalid_transport_rcv\""), }, @@ -131,7 +131,7 @@ func Test_carbonreceiver_New(t *testing.T) { }, }, }, - nextConsumer: exportertest.NewNopMetricsExporter(), + nextConsumer: consumertest.NewMetricsNop(), }, }, { @@ -151,7 +151,7 @@ func Test_carbonreceiver_New(t *testing.T) { Config: &protocol.PlaintextConfig{}, }, }, - nextConsumer: exportertest.NewNopMetricsExporter(), + nextConsumer: consumertest.NewMetricsNop(), }, wantErr: errors.New("invalid idle timeout: -1s"), }, @@ -211,7 +211,7 @@ func Test_carbonreceiver_EndToEnd(t *testing.T) { t.Run(tt.name, func(t *testing.T) { cfg := tt.configFn() cfg.Endpoint = addr - sink := new(exportertest.SinkMetricsExporter) + sink := new(consumertest.MetricsSink) rcv, err := New(zap.NewNop(), *cfg, sink) require.NoError(t, err) r := rcv.(*carbonReceiver) diff --git a/receiver/carbonreceiver/transport/server_test.go b/receiver/carbonreceiver/transport/server_test.go index 86e80d0aba776..b9a3eb0e55b86 100644 --- a/receiver/carbonreceiver/transport/server_test.go +++ b/receiver/carbonreceiver/transport/server_test.go @@ -24,7 +24,7 @@ import ( "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" - "go.opentelemetry.io/collector/exporter/exportertest" + "go.opentelemetry.io/collector/consumer/consumertest" "go.opentelemetry.io/collector/testutil" "go.opentelemetry.io/collector/translator/internaldata" @@ -69,7 +69,7 @@ func Test_Server_ListenAndServe(t *testing.T) { port, err := strconv.Atoi(portStr) require.NoError(t, err) - mc := new(exportertest.SinkMetricsExporter) + mc := new(consumertest.MetricsSink) p, err := (&protocol.PlaintextConfig{}).BuildParser() require.NoError(t, err) mr := NewMockReporter(1) diff --git a/receiver/collectdreceiver/factory_test.go b/receiver/collectdreceiver/factory_test.go index 7face7303d57b..14b7d24097d95 100644 --- a/receiver/collectdreceiver/factory_test.go +++ b/receiver/collectdreceiver/factory_test.go @@ -21,7 +21,7 @@ import ( "github.com/stretchr/testify/assert" "go.opentelemetry.io/collector/component" "go.opentelemetry.io/collector/config/configcheck" - "go.opentelemetry.io/collector/exporter/exportertest" + "go.opentelemetry.io/collector/consumer/consumertest" "go.uber.org/zap" ) @@ -37,7 +37,7 @@ func TestCreateReceiver(t *testing.T) { cfg := factory.CreateDefaultConfig() params := component.ReceiverCreateParams{Logger: zap.NewNop()} - tReceiver, err := factory.CreateMetricsReceiver(context.Background(), params, cfg, exportertest.NewNopMetricsExporter()) + tReceiver, err := factory.CreateMetricsReceiver(context.Background(), params, cfg, consumertest.NewMetricsNop()) assert.NoError(t, err) assert.NotNil(t, tReceiver, "receiver creation failed") } diff --git a/receiver/collectdreceiver/go.mod b/receiver/collectdreceiver/go.mod index 647a75300b814..b7083f244e445 100644 --- a/receiver/collectdreceiver/go.mod +++ b/receiver/collectdreceiver/go.mod @@ -6,7 +6,7 @@ require ( github.com/census-instrumentation/opencensus-proto v0.3.0 github.com/stretchr/testify v1.6.1 go.opencensus.io v0.22.5 - go.opentelemetry.io/collector v0.13.0 + go.opentelemetry.io/collector v0.13.1-0.20201020144745-846222e6af7a go.uber.org/zap v1.16.0 google.golang.org/grpc/examples v0.0.0-20200728194956-1c32b02682df // indirect google.golang.org/protobuf v1.25.0 diff --git a/receiver/collectdreceiver/go.sum b/receiver/collectdreceiver/go.sum index 7ee8df233f244..92463502d92b8 100644 --- a/receiver/collectdreceiver/go.sum +++ b/receiver/collectdreceiver/go.sum @@ -1117,8 +1117,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 h1:dntmOdLpSpHlVqbW5Eay97DelsZHe+55D+xC6i0dDS0= go.opencensus.io v0.22.5/go.mod h1:5pWMHQbX5EPX2/62yrJeAkowc+lfs/XD7Uxpq3pI6kk= -go.opentelemetry.io/collector v0.13.0 h1:w5DywMfxHIoGhomH382SJn95+TGQDTz5r9n4bBACe4Y= -go.opentelemetry.io/collector v0.13.0/go.mod h1:UB7wWD7RrEx8GFSaUR47TO1GAqxSi5+Kq68tI1icwJk= +go.opentelemetry.io/collector v0.13.1-0.20201020144745-846222e6af7a h1:eKbcrh2zBlQqQtrNCIDy3taW9si3b2DcILtLG8zd6hc= +go.opentelemetry.io/collector v0.13.1-0.20201020144745-846222e6af7a/go.mod h1:UB7wWD7RrEx8GFSaUR47TO1GAqxSi5+Kq68tI1icwJk= 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_test.go b/receiver/collectdreceiver/receiver_test.go index e875016cd39d7..8c298958432cb 100644 --- a/receiver/collectdreceiver/receiver_test.go +++ b/receiver/collectdreceiver/receiver_test.go @@ -27,7 +27,7 @@ import ( "go.opentelemetry.io/collector/component/componenttest" "go.opentelemetry.io/collector/consumer" "go.opentelemetry.io/collector/consumer/consumerdata" - "go.opentelemetry.io/collector/exporter/exportertest" + "go.opentelemetry.io/collector/consumer/consumertest" "go.opentelemetry.io/collector/testutil" "go.opentelemetry.io/collector/translator/internaldata" "go.uber.org/zap" @@ -67,7 +67,7 @@ func TestNewReceiver(t *testing.T) { addr: ":0", timeout: defaultTimeout, attrsPrefix: "default_attr_", - nextConsumer: exportertest.NewNopMetricsExporter(), + nextConsumer: consumertest.NewMetricsNop(), }, }, } @@ -154,7 +154,7 @@ func TestCollectDServer(t *testing.T) { wantData: []consumerdata.MetricsData{}, }} - sink := new(exportertest.SinkMetricsExporter) + sink := new(consumertest.MetricsSink) logger := zap.NewNop() cdr, err := newCollectdReceiver(logger, endpoint, defaultTimeout, defaultAttrsPrefix, sink) diff --git a/receiver/dockerstatsreceiver/go.mod b/receiver/dockerstatsreceiver/go.mod index fbc19a8c944c9..32517bf1857a3 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.6.1 - go.opentelemetry.io/collector v0.13.0 + go.opentelemetry.io/collector v0.13.1-0.20201020144745-846222e6af7a go.uber.org/zap v1.16.0 ) diff --git a/receiver/dockerstatsreceiver/go.sum b/receiver/dockerstatsreceiver/go.sum index 36faf9c725cc9..ef30e568866ed 100644 --- a/receiver/dockerstatsreceiver/go.sum +++ b/receiver/dockerstatsreceiver/go.sum @@ -1121,8 +1121,8 @@ go.opencensus.io v0.22.2/go.mod h1:yxeiOL68Rb0Xd1ddK5vPZ/oVn4vY4Ynel7k9FzqtOIw= go.opencensus.io v0.22.3/go.mod h1:yxeiOL68Rb0Xd1ddK5vPZ/oVn4vY4Ynel7k9FzqtOIw= go.opencensus.io v0.22.4 h1:LYy1Hy3MJdrCdMwwzxA/dRok4ejH+RwNGbuoD9fCjto= go.opencensus.io v0.22.4/go.mod h1:yxeiOL68Rb0Xd1ddK5vPZ/oVn4vY4Ynel7k9FzqtOIw= -go.opentelemetry.io/collector v0.13.0 h1:w5DywMfxHIoGhomH382SJn95+TGQDTz5r9n4bBACe4Y= -go.opentelemetry.io/collector v0.13.0/go.mod h1:UB7wWD7RrEx8GFSaUR47TO1GAqxSi5+Kq68tI1icwJk= +go.opentelemetry.io/collector v0.13.1-0.20201020144745-846222e6af7a h1:eKbcrh2zBlQqQtrNCIDy3taW9si3b2DcILtLG8zd6hc= +go.opentelemetry.io/collector v0.13.1-0.20201020144745-846222e6af7a/go.mod h1:UB7wWD7RrEx8GFSaUR47TO1GAqxSi5+Kq68tI1icwJk= 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/integration_test.go b/receiver/dockerstatsreceiver/integration_test.go index f3228efea6764..972619eaa1a3c 100644 --- a/receiver/dockerstatsreceiver/integration_test.go +++ b/receiver/dockerstatsreceiver/integration_test.go @@ -26,7 +26,7 @@ import ( "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" "go.opentelemetry.io/collector/component" - "go.opentelemetry.io/collector/exporter/exportertest" + "go.opentelemetry.io/collector/consumer/consumertest" "go.opentelemetry.io/collector/translator/conventions" "go.uber.org/zap" "go.uber.org/zap/zaptest" @@ -65,7 +65,7 @@ func TestDefaultMetricsIntegration(t *testing.T) { d := container.New(t) d.StartImage("docker.io/library/nginx:1.17", container.WithPortReady(80)) - consumer := &exportertest.SinkMetricsExporter{} + consumer := new(consumertest.MetricsSink) f, config := factory() receiver, err := f.CreateMetricsReceiver(ctx, params, config, consumer) r := receiver.(*Receiver) @@ -86,7 +86,7 @@ func TestAllMetricsIntegration(t *testing.T) { d := container.New(t) d.StartImage("docker.io/library/nginx:1.17", container.WithPortReady(80)) - consumer := &exportertest.SinkMetricsExporter{} + consumer := new(consumertest.MetricsSink) f, config := factory() config.ProvidePerCoreCPUMetrics = true @@ -111,7 +111,7 @@ func TestAllMetricsIntegration(t *testing.T) { func TestMonitoringAddedContainerIntegration(t *testing.T) { params, ctx, cancel := paramsAndContext(t) defer cancel() - consumer := &exportertest.SinkMetricsExporter{} + consumer := new(consumertest.MetricsSink) f, config := factory() receiver, err := f.CreateMetricsReceiver(ctx, params, config, consumer) @@ -141,7 +141,7 @@ func TestExcludedImageProducesNoMetricsIntegration(t *testing.T) { f, config := factory() config.ExcludedImages = append(config.ExcludedImages, "*redis*") - consumer := &exportertest.SinkMetricsExporter{} + consumer := new(consumertest.MetricsSink) receiver, err := f.CreateMetricsReceiver(ctx, params, config, consumer) r := receiver.(*Receiver) @@ -175,7 +175,7 @@ func TestExcludedImageProducesNoMetricsIntegration(t *testing.T) { func TestRemovedContainerRemovesRecordsIntegration(t *testing.T) { params, ctx, cancel := paramsAndContext(t) defer cancel() - consumer := &exportertest.SinkMetricsExporter{} + consumer := new(consumertest.MetricsSink) f, config := factory() config.ExcludedImages = append(config.ExcludedImages, "!*nginx*") receiver, err := f.CreateMetricsReceiver(ctx, params, config, consumer) diff --git a/receiver/k8sclusterreceiver/factory_test.go b/receiver/k8sclusterreceiver/factory_test.go index 64cca3aec3da7..d0f6ef1f84395 100644 --- a/receiver/k8sclusterreceiver/factory_test.go +++ b/receiver/k8sclusterreceiver/factory_test.go @@ -22,7 +22,7 @@ import ( "github.com/stretchr/testify/require" "go.opentelemetry.io/collector/component" "go.opentelemetry.io/collector/config/configmodels" - "go.opentelemetry.io/collector/exporter/exportertest" + "go.opentelemetry.io/collector/consumer/consumertest" "go.uber.org/zap" "k8s.io/client-go/kubernetes" @@ -51,7 +51,7 @@ func TestFactory(t *testing.T) { r, err := f.CreateTraceReceiver( context.Background(), component.ReceiverCreateParams{}, - &configmodels.ReceiverSettings{}, &exportertest.SinkTraceExporter{}, + &configmodels.ReceiverSettings{}, consumertest.NewTracesNop(), ) require.Error(t, err) require.Nil(t, r) @@ -59,7 +59,7 @@ func TestFactory(t *testing.T) { // Fails with bad K8s Config. r, err = f.CreateMetricsReceiver( context.Background(), component.ReceiverCreateParams{}, - rCfg, &exportertest.SinkMetricsExporter{}, + rCfg, consumertest.NewMetricsNop(), ) require.Error(t, err) require.Nil(t, r) @@ -70,7 +70,7 @@ func TestFactory(t *testing.T) { } r, err = f.CreateMetricsReceiver( context.Background(), component.ReceiverCreateParams{Logger: zap.NewNop()}, - rCfg, &exportertest.SinkMetricsExporter{}, + rCfg, consumertest.NewMetricsNop(), ) require.NoError(t, err) require.NotNil(t, r) diff --git a/receiver/k8sclusterreceiver/go.mod b/receiver/k8sclusterreceiver/go.mod index 73a760b9da67f..2b2dada382bf9 100644 --- a/receiver/k8sclusterreceiver/go.mod +++ b/receiver/k8sclusterreceiver/go.mod @@ -7,7 +7,7 @@ require ( github.com/iancoleman/strcase v0.0.0-20171129010253-3de563c3dc08 github.com/open-telemetry/opentelemetry-collector-contrib/internal/k8sconfig v0.0.0-00010101000000-000000000000 github.com/stretchr/testify v1.6.1 - go.opentelemetry.io/collector v0.13.0 + go.opentelemetry.io/collector v0.13.1-0.20201020144745-846222e6af7a go.uber.org/atomic v1.7.0 go.uber.org/zap v1.16.0 google.golang.org/protobuf v1.25.0 diff --git a/receiver/k8sclusterreceiver/go.sum b/receiver/k8sclusterreceiver/go.sum index 2702156b272b9..9da8d45429510 100644 --- a/receiver/k8sclusterreceiver/go.sum +++ b/receiver/k8sclusterreceiver/go.sum @@ -450,8 +450,9 @@ github.com/google/go-github v17.0.0+incompatible/go.mod h1:zLgOLi98H3fifZn+44m+u github.com/google/go-querystring v1.0.0 h1:Xkwi/a1rcvNg1PPYe5vI8GbeBY/jrVuDX5ASuANWTrk= github.com/google/go-querystring v1.0.0/go.mod h1:odCYkC5MyYFN7vkCjXpyrEuKhc/BUO6wN/zVPAxq5ck= github.com/google/gofuzz v1.0.0/go.mod h1:dBl0BpW6vV/+mYPU4Po3pmUjxk6FQPldtuIdl/M65Eg= -github.com/google/gofuzz v1.1.0 h1:Hsa8mG0dQ46ij8Sl2AYJDUv1oA9/d6Vk+3LG99Oe02g= github.com/google/gofuzz v1.1.0/go.mod h1:dBl0BpW6vV/+mYPU4Po3pmUjxk6FQPldtuIdl/M65Eg= +github.com/google/gofuzz v1.2.0 h1:xRy4A+RhZaiKjJ1bPfwQ8sedCA+YS2YcCHW6ec7JMi0= +github.com/google/gofuzz v1.2.0/go.mod h1:dBl0BpW6vV/+mYPU4Po3pmUjxk6FQPldtuIdl/M65Eg= github.com/google/martian v2.1.0+incompatible/go.mod h1:9I4somxYTbIHy5NJKHRl3wXiIaQGbYVAs8BPL6v8lEs= github.com/google/pprof v0.0.0-20181206194817-3ea8567a2e57/go.mod h1:zfwlbNMJ+OItoe0UupaVj+oy1omPYYDuagoSzA8v9mc= github.com/google/pprof v0.0.0-20190515194954-54271f7e092f/go.mod h1:zfwlbNMJ+OItoe0UupaVj+oy1omPYYDuagoSzA8v9mc= @@ -469,8 +470,9 @@ github.com/googleapis/gax-go/v2 v2.0.5/go.mod h1:DWXyrwAJ9X0FpwwEdw+IPEYBICEFu5m github.com/googleapis/gnostic v0.0.0-20170729233727-0c5108395e2d/go.mod h1:sJBsCZ4ayReDTBIg8b9dl28c5xFWyhBTVRp3pOg5EKY= github.com/googleapis/gnostic v0.1.0/go.mod h1:sJBsCZ4ayReDTBIg8b9dl28c5xFWyhBTVRp3pOg5EKY= github.com/googleapis/gnostic v0.4.0/go.mod h1:on+2t9HRStVgn95RSsFWFz+6Q0Snyqv1awfrALZdbtU= -github.com/googleapis/gnostic v0.4.1 h1:DLJCy1n/vrD4HPjOvYcT8aYQXpPIzoRZONaYwyycI+I= github.com/googleapis/gnostic v0.4.1/go.mod h1:LRhVm6pbyptWbWbuZ38d1eyptfvIytN3ir6b65WBswg= +github.com/googleapis/gnostic v0.5.1 h1:A8Yhf6EtqTv9RMsU6MQTyrtV1TjWlR6xU9BsZIwuTCM= +github.com/googleapis/gnostic v0.5.1/go.mod h1:6U4PtQXGIEt/Z3h5MAT7FNofLnw9vXk2cUuW7uA/OeU= github.com/gookit/color v1.2.5 h1:s1gzb/fg3HhkSLKyWVUsZcVBUo+R1TwEYTmmxH8gGFg= github.com/gookit/color v1.2.5/go.mod h1:AhIE+pS6D4Ql0SQWbBeXPHw7gY0/sjHoA4s/n1KB7xg= github.com/gophercloud/gophercloud v0.1.0/go.mod h1:vxM41WHh5uqHVBMZHzuwNOHh8XEoIEcSTewFxm1c5g8= @@ -556,6 +558,8 @@ github.com/iancoleman/strcase v0.0.0-20171129010253-3de563c3dc08 h1:Fxy6TnPxpP9F github.com/iancoleman/strcase v0.0.0-20171129010253-3de563c3dc08/go.mod h1:SK73tn/9oHe+/Y0h39VT4UCxmurVJkR5NA7kMEAOgSE= github.com/ianlancetaylor/demangle v0.0.0-20181102032728-5e5cf60278f6/go.mod h1:aSSvb/t6k1mPoxDqO4vJh6VOCGPwU4O0C2/Eqndh1Sc= github.com/imdario/mergo v0.3.5/go.mod h1:2EnlNZ0deacrJVfApfmtdGgDfMuh/nq6Ok1EcJh5FfA= +github.com/imdario/mergo v0.3.11 h1:3tnifQM4i+fbajXKBHXWEH+KvNHqojZ778UH75j3bGA= +github.com/imdario/mergo v0.3.11/go.mod h1:jmQim1M+e3UYxmgPu/WyfjB3N3VflVyUjjjwH0dnCYA= github.com/inconshreveable/mousetrap v1.0.0 h1:Z8tu5sraLXCXIcARxBp/8cbvlwVa7Z1NHg9XEKhtSvM= github.com/inconshreveable/mousetrap v1.0.0/go.mod h1:PxqpIevigyE2G7u3NXJIT2ANytuPF1OarO4DADm73n8= github.com/influxdata/flux v0.65.0/go.mod h1:BwN2XG2lMszOoquQaFdPET8FRQfrXiZsWmcMO9rkaVY= @@ -941,6 +945,7 @@ github.com/spf13/viper v1.7.1 h1:pM5oEahlgWv/WnHXpgbKz7iLIxRf65tye2Ci+XFK5sk= github.com/spf13/viper v1.7.1/go.mod h1:8WkrPz2fc9jxqZNCJI/76HCieCp4Q8HaLFoCha5qpdg= github.com/ssgreg/nlreturn/v2 v2.1.0 h1:6/s4Rc49L6Uo6RLjhWZGBpWWjfzk2yrf1nIW8m4wgVA= github.com/ssgreg/nlreturn/v2 v2.1.0/go.mod h1:E/iiPB78hV7Szg2YfRgyIrk1AD6JVMTRkkxBiELzh2I= +github.com/stoewer/go-strcase v1.2.0/go.mod h1:IBiWB2sKIp3wVVQ3Y035++gc+knqhUQag1KpM8ahLw8= github.com/streadway/amqp v0.0.0-20190404075320-75d898a42a94/go.mod h1:AZpEONHx3DKn8O/DFsRAY58/XVQiIPMTMB1SddzLXVw= github.com/streadway/amqp v0.0.0-20190827072141-edfb9018d271/go.mod h1:AZpEONHx3DKn8O/DFsRAY58/XVQiIPMTMB1SddzLXVw= github.com/streadway/handy v0.0.0-20190108123426-d5acb3125c2a/go.mod h1:qNTQ5P5JnDBl6z3cMAg/SywNDC5ABu5ApDIw6lUbRmI= @@ -1025,8 +1030,8 @@ go.opencensus.io v0.22.2/go.mod h1:yxeiOL68Rb0Xd1ddK5vPZ/oVn4vY4Ynel7k9FzqtOIw= go.opencensus.io v0.22.3/go.mod h1:yxeiOL68Rb0Xd1ddK5vPZ/oVn4vY4Ynel7k9FzqtOIw= go.opencensus.io v0.22.4 h1:LYy1Hy3MJdrCdMwwzxA/dRok4ejH+RwNGbuoD9fCjto= go.opencensus.io v0.22.4/go.mod h1:yxeiOL68Rb0Xd1ddK5vPZ/oVn4vY4Ynel7k9FzqtOIw= -go.opentelemetry.io/collector v0.13.0 h1:w5DywMfxHIoGhomH382SJn95+TGQDTz5r9n4bBACe4Y= -go.opentelemetry.io/collector v0.13.0/go.mod h1:UB7wWD7RrEx8GFSaUR47TO1GAqxSi5+Kq68tI1icwJk= +go.opentelemetry.io/collector v0.13.1-0.20201020144745-846222e6af7a h1:eKbcrh2zBlQqQtrNCIDy3taW9si3b2DcILtLG8zd6hc= +go.opentelemetry.io/collector v0.13.1-0.20201020144745-846222e6af7a/go.mod h1:UB7wWD7RrEx8GFSaUR47TO1GAqxSi5+Kq68tI1icwJk= 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= @@ -1065,8 +1070,9 @@ golang.org/x/crypto v0.0.0-20191202143827-86a70503ff7e/go.mod h1:LzIPMQfyMNhhGPh golang.org/x/crypto v0.0.0-20191206172530-e9b2fee46413/go.mod h1:LzIPMQfyMNhhGPhUkYOs5KpL4U8rLKemX1yGLhDgUto= golang.org/x/crypto v0.0.0-20200220183623-bac4c82f6975/go.mod h1:LzIPMQfyMNhhGPhUkYOs5KpL4U8rLKemX1yGLhDgUto= golang.org/x/crypto v0.0.0-20200510223506-06a226fb4e37/go.mod h1:LzIPMQfyMNhhGPhUkYOs5KpL4U8rLKemX1yGLhDgUto= -golang.org/x/crypto v0.0.0-20200622213623-75b288015ac9 h1:psW17arqaxU48Z5kZ0CQnkZWQJsqcURM6tKiBApRjXI= golang.org/x/crypto v0.0.0-20200622213623-75b288015ac9/go.mod h1:LzIPMQfyMNhhGPhUkYOs5KpL4U8rLKemX1yGLhDgUto= +golang.org/x/crypto v0.0.0-20200820211705-5c72a883971a h1:vclmkQCjlDX5OydZ9wv8rBCcS0QyQY66Mpf/7BZbInM= +golang.org/x/crypto v0.0.0-20200820211705-5c72a883971a/go.mod h1:LzIPMQfyMNhhGPhUkYOs5KpL4U8rLKemX1yGLhDgUto= golang.org/x/exp v0.0.0-20180321215751-8460e604b9de/go.mod h1:CJ0aWSM057203Lf6IL+f9T1iT9GByDxfZKAQTCR3kQA= golang.org/x/exp v0.0.0-20180807140117-3d87b88a115f/go.mod h1:CJ0aWSM057203Lf6IL+f9T1iT9GByDxfZKAQTCR3kQA= golang.org/x/exp v0.0.0-20190121172915-509febef88a4/go.mod h1:CJ0aWSM057203Lf6IL+f9T1iT9GByDxfZKAQTCR3kQA= @@ -1479,8 +1485,9 @@ k8s.io/kube-openapi v0.0.0-20200805222855-6aeccd4b50c6 h1:+WnxoVtG8TMiudHBSEtrVL k8s.io/kube-openapi v0.0.0-20200805222855-6aeccd4b50c6/go.mod h1:UuqjUnNftUyPE5H64/qeyjQoUZhGpeFDVdxjTeEVN2o= k8s.io/utils v0.0.0-20200324210504-a9aa75ae1b89/go.mod h1:sZAwmy6armz5eXlNoLmJcl4F1QuKu7sr+mFQ0byX7Ew= k8s.io/utils v0.0.0-20200414100711-2df71ebbae66/go.mod h1:jPW/WVKK9YHAvNhRxK0md/EJ228hCsBRufyofKtW8HA= -k8s.io/utils v0.0.0-20200729134348-d5654de09c73 h1:uJmqzgNWG7XyClnU/mLPBWwfKKF1K8Hf8whTseBgJcg= k8s.io/utils v0.0.0-20200729134348-d5654de09c73/go.mod h1:jPW/WVKK9YHAvNhRxK0md/EJ228hCsBRufyofKtW8HA= +k8s.io/utils v0.0.0-20200821003339-5e75c0163111 h1:AChSIFe1D4vQ5XkklbH491v1ONSmnt8fnb235DsAw1U= +k8s.io/utils v0.0.0-20200821003339-5e75c0163111/go.mod h1:jPW/WVKK9YHAvNhRxK0md/EJ228hCsBRufyofKtW8HA= mvdan.cc/gofumpt v0.0.0-20200709182408-4fd085cb6d5f h1:gi7cb8HTDZ6q8VqsUpkdoFi3vxwHMneQ6+Q5Ap5hjPE= mvdan.cc/gofumpt v0.0.0-20200709182408-4fd085cb6d5f/go.mod h1:9VQ397fNXEnF84t90W4r4TRCQK+pg9f8ugVfyj+S26w= mvdan.cc/interfacer v0.0.0-20180901003855-c20040233aed h1:WX1yoOaKQfddO/mLzdV4wptyWgoH/6hwLs7QHTixo0I= diff --git a/receiver/k8sclusterreceiver/mock_exporter_test.go b/receiver/k8sclusterreceiver/mock_exporter_test.go index fc473f2f2699a..ad1211cd99fdd 100644 --- a/receiver/k8sclusterreceiver/mock_exporter_test.go +++ b/receiver/k8sclusterreceiver/mock_exporter_test.go @@ -18,7 +18,7 @@ import ( "context" "go.opentelemetry.io/collector/component" - "go.opentelemetry.io/collector/exporter/exportertest" + "go.opentelemetry.io/collector/consumer/consumertest" "github.com/open-telemetry/opentelemetry-collector-contrib/receiver/k8sclusterreceiver/collection" ) @@ -37,7 +37,7 @@ func (m MockExporter) Shutdown(context.Context) error { var _ component.Exporter = (*mockExporterWithK8sMetadata)(nil) type mockExporterWithK8sMetadata struct { - *exportertest.SinkMetricsExporter + *consumertest.MetricsSink } func (m mockExporterWithK8sMetadata) Start(context.Context, component.Host) error { diff --git a/receiver/k8sclusterreceiver/receiver_test.go b/receiver/k8sclusterreceiver/receiver_test.go index 0d59c7fd9e184..2dfacaa5cc545 100644 --- a/receiver/k8sclusterreceiver/receiver_test.go +++ b/receiver/k8sclusterreceiver/receiver_test.go @@ -22,7 +22,7 @@ import ( "github.com/stretchr/testify/require" "go.opentelemetry.io/collector/component/componenttest" "go.opentelemetry.io/collector/consumer" - "go.opentelemetry.io/collector/exporter/exportertest" + "go.opentelemetry.io/collector/consumer/consumertest" "go.uber.org/atomic" "go.uber.org/zap" corev1 "k8s.io/api/core/v1" @@ -34,7 +34,7 @@ import ( func TestReceiver(t *testing.T) { client := fake.NewSimpleClientset() - consumer := &exportertest.SinkMetricsExporter{} + consumer := new(consumertest.MetricsSink) r, err := setupReceiver(client, consumer, 10*time.Second) @@ -76,7 +76,7 @@ func TestReceiver(t *testing.T) { func TestReceiverTimesOutAfterStartup(t *testing.T) { client := fake.NewSimpleClientset() - consumer := &exportertest.SinkMetricsExporter{} + consumer := new(consumertest.MetricsSink) // Mock initial cache sync timing out, using a small timeout. r, err := setupReceiver(client, consumer, 1*time.Millisecond) @@ -94,7 +94,7 @@ func TestReceiverTimesOutAfterStartup(t *testing.T) { func TestReceiverWithManyResources(t *testing.T) { client := fake.NewSimpleClientset() - consumer := &exportertest.SinkMetricsExporter{} + consumer := new(consumertest.MetricsSink) r, err := setupReceiver(client, consumer, 10*time.Second) require.NoError(t, err) @@ -122,7 +122,7 @@ var consumeMetadataInvocation = func() { func TestReceiverWithMetadata(t *testing.T) { client := fake.NewSimpleClientset() - consumer := &mockExporterWithK8sMetadata{SinkMetricsExporter: &exportertest.SinkMetricsExporter{}} + consumer := &mockExporterWithK8sMetadata{MetricsSink: new(consumertest.MetricsSink)} numCalls = atomic.NewInt32(0) r, err := setupReceiver(client, consumer, 10*time.Second) diff --git a/receiver/kubeletstatsreceiver/go.mod b/receiver/kubeletstatsreceiver/go.mod index 07f5b1aba502d..d63182242c635 100644 --- a/receiver/kubeletstatsreceiver/go.mod +++ b/receiver/kubeletstatsreceiver/go.mod @@ -9,13 +9,13 @@ require ( github.com/pkg/errors v0.9.1 github.com/spf13/viper v1.7.1 github.com/stretchr/testify v1.6.1 - go.opentelemetry.io/collector v0.13.0 + go.opentelemetry.io/collector v0.13.1-0.20201020144745-846222e6af7a go.uber.org/zap v1.16.0 google.golang.org/protobuf v1.25.0 gopkg.in/yaml.v2 v2.3.0 - k8s.io/api v0.19.2 - k8s.io/apimachinery v0.19.2 - k8s.io/client-go v0.19.2 + k8s.io/api v0.19.3 + k8s.io/apimachinery v0.19.3 + k8s.io/client-go v0.19.3 k8s.io/kubernetes v1.12.0 ) diff --git a/receiver/kubeletstatsreceiver/go.sum b/receiver/kubeletstatsreceiver/go.sum index 65b84155fc58f..6eceba2ab1449 100644 --- a/receiver/kubeletstatsreceiver/go.sum +++ b/receiver/kubeletstatsreceiver/go.sum @@ -1135,8 +1135,8 @@ go.opencensus.io v0.22.2/go.mod h1:yxeiOL68Rb0Xd1ddK5vPZ/oVn4vY4Ynel7k9FzqtOIw= go.opencensus.io v0.22.3/go.mod h1:yxeiOL68Rb0Xd1ddK5vPZ/oVn4vY4Ynel7k9FzqtOIw= go.opencensus.io v0.22.4 h1:LYy1Hy3MJdrCdMwwzxA/dRok4ejH+RwNGbuoD9fCjto= go.opencensus.io v0.22.4/go.mod h1:yxeiOL68Rb0Xd1ddK5vPZ/oVn4vY4Ynel7k9FzqtOIw= -go.opentelemetry.io/collector v0.13.0 h1:w5DywMfxHIoGhomH382SJn95+TGQDTz5r9n4bBACe4Y= -go.opentelemetry.io/collector v0.13.0/go.mod h1:UB7wWD7RrEx8GFSaUR47TO1GAqxSi5+Kq68tI1icwJk= +go.opentelemetry.io/collector v0.13.1-0.20201020144745-846222e6af7a h1:eKbcrh2zBlQqQtrNCIDy3taW9si3b2DcILtLG8zd6hc= +go.opentelemetry.io/collector v0.13.1-0.20201020144745-846222e6af7a/go.mod h1:UB7wWD7RrEx8GFSaUR47TO1GAqxSi5+Kq68tI1icwJk= 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= @@ -1580,14 +1580,14 @@ honnef.co/go/tools v0.0.1-2020.1.3/go.mod h1:X/FiERA/W4tHapMX5mGpAtMSVEeEUOyHaw9 honnef.co/go/tools v0.0.1-2020.1.5 h1:nI5egYTGJakVyOryqLs1cQO5dO0ksin5XXs2pspk75k= honnef.co/go/tools v0.0.1-2020.1.5/go.mod h1:X/FiERA/W4tHapMX5mGpAtMSVEeEUOyHaw9vFzvIQ3k= k8s.io/api v0.18.8/go.mod h1:d/CXqwWv+Z2XEG1LgceeDmHQwpUJhROPx16SlxJgERY= -k8s.io/api v0.19.2 h1:q+/krnHWKsL7OBZg/rxnycsl9569Pud76UJ77MvKXms= -k8s.io/api v0.19.2/go.mod h1:IQpK0zFQ1xc5iNIQPqzgoOwuFugaYHK4iCknlAQP9nI= +k8s.io/api v0.19.3 h1:GN6ntFnv44Vptj/b+OnMW7FmzkpDoIDLZRvKX3XH9aU= +k8s.io/api v0.19.3/go.mod h1:VF+5FT1B74Pw3KxMdKyinLo+zynBaMBiAfGMuldcNDs= k8s.io/apimachinery v0.18.8/go.mod h1:6sQd+iHEqmOtALqOFjSWp2KZ9F0wlU/nWm0ZgsYWMig= -k8s.io/apimachinery v0.19.2 h1:5Gy9vQpAGTKHPVOh5c4plE274X8D/6cuEiTO2zve7tc= -k8s.io/apimachinery v0.19.2/go.mod h1:DnPGDnARWFvYa3pMHgSxtbZb7gpzzAZ1pTfaUNDVlmA= +k8s.io/apimachinery v0.19.3 h1:bpIQXlKjB4cB/oNpnNnV+BybGPR7iP5oYpsOTEJ4hgc= +k8s.io/apimachinery v0.19.3/go.mod h1:DnPGDnARWFvYa3pMHgSxtbZb7gpzzAZ1pTfaUNDVlmA= k8s.io/client-go v0.18.8/go.mod h1:HqFqMllQ5NnQJNwjro9k5zMyfhZlOwpuTLVrxjkYSxU= -k8s.io/client-go v0.19.2 h1:gMJuU3xJZs86L1oQ99R4EViAADUPMHHtS9jFshasHSc= -k8s.io/client-go v0.19.2/go.mod h1:S5wPhCqyDNAlzM9CnEdgTGV4OqhsW3jGO1UM1epwfJA= +k8s.io/client-go v0.19.3 h1:ctqR1nQ52NUs6LpI0w+a5U+xjYwflFwA13OJKcicMxg= +k8s.io/client-go v0.19.3/go.mod h1:+eEMktZM+MG0KO+PTkci8xnbCZHvj9TqR6Q1XDUIJOM= k8s.io/gengo v0.0.0-20190128074634-0689ccc1d7d6/go.mod h1:ezvh/TsK7cY6rbqRK0oQQ8IAqLxYwwyPxAX1Pzy0ii0= k8s.io/gengo v0.0.0-20200413195148-3a45101e95ac/go.mod h1:ezvh/TsK7cY6rbqRK0oQQ8IAqLxYwwyPxAX1Pzy0ii0= k8s.io/klog v0.0.0-20181102134211-b9b56d5dfc92/go.mod h1:Gq+BEi5rUBO/HRz0bTSXDUcqjScdoY3a9IHpCEIOOfk= diff --git a/receiver/kubeletstatsreceiver/runnable_test.go b/receiver/kubeletstatsreceiver/runnable_test.go index df94572b59d4b..71827080eea38 100644 --- a/receiver/kubeletstatsreceiver/runnable_test.go +++ b/receiver/kubeletstatsreceiver/runnable_test.go @@ -22,7 +22,7 @@ import ( "testing" "github.com/stretchr/testify/require" - "go.opentelemetry.io/collector/exporter/exportertest" + "go.opentelemetry.io/collector/consumer/consumertest" "go.opentelemetry.io/collector/translator/internaldata" "go.uber.org/zap" "go.uber.org/zap/zaptest/observer" @@ -56,7 +56,7 @@ var allMetricGroups = map[kubelet.MetricGroup]bool{ } func TestRunnable(t *testing.T) { - consumer := &exportertest.SinkMetricsExporter{} + consumer := new(consumertest.MetricsSink) options := &receiverOptions{ metricGroupsToCollect: allMetricGroups, } @@ -107,7 +107,7 @@ func TestRunnableWithMetadata(t *testing.T) { for _, tt := range tests { t.Run(tt.name, func(t *testing.T) { - consumer := &exportertest.SinkMetricsExporter{} + consumer := new(consumertest.MetricsSink) options := &receiverOptions{ extraMetadataLabels: tt.metadataLabels, metricGroupsToCollect: tt.metricGroups, @@ -189,7 +189,7 @@ func TestRunnableWithMetricGroups(t *testing.T) { } for _, test := range tests { t.Run(test.name, func(t *testing.T) { - consumer := &exportertest.SinkMetricsExporter{} + consumer := new(consumertest.MetricsSink) r := newRunnable( context.Background(), consumer, @@ -341,7 +341,7 @@ func TestRunnableWithPVCDetailedLabels(t *testing.T) { for _, test := range tests { t.Run(test.name, func(t *testing.T) { - consumer := &exportertest.SinkMetricsExporter{} + consumer := new(consumertest.MetricsSink) r := newRunnable( context.Background(), consumer, @@ -452,7 +452,7 @@ func TestClientErrors(t *testing.T) { } r := newRunnable( context.Background(), - &exportertest.SinkMetricsExporter{}, + new(consumertest.MetricsSink), &fakeRestClient{ statsSummaryFail: test.statsSummaryFail, podsFail: test.podsFail, @@ -485,9 +485,9 @@ func TestConsumerErrors(t *testing.T) { extraMetadataLabels: nil, metricGroupsToCollect: allMetricGroups, } - sink := &exportertest.SinkMetricsExporter{} + sink := new(consumertest.MetricsSink) if test.fail { - sink.SetConsumeMetricsError(errors.New("failed")) + sink.SetConsumeError(errors.New("failed")) } r := newRunnable( context.Background(), diff --git a/receiver/prometheusexecreceiver/factory.go b/receiver/prometheusexecreceiver/factory.go index 21d7f1f2aad84..538a840b1a27f 100644 --- a/receiver/prometheusexecreceiver/factory.go +++ b/receiver/prometheusexecreceiver/factory.go @@ -64,5 +64,5 @@ func createMetricsReceiver( nextConsumer consumer.MetricsConsumer, ) (component.MetricsReceiver, error) { rCfg := cfg.(*Config) - return new(params, rCfg, nextConsumer) + return newPromExecReceiver(params, rCfg, nextConsumer) } diff --git a/receiver/prometheusexecreceiver/go.mod b/receiver/prometheusexecreceiver/go.mod index c19f20c8d90eb..7746be3b67e4a 100644 --- a/receiver/prometheusexecreceiver/go.mod +++ b/receiver/prometheusexecreceiver/go.mod @@ -7,6 +7,6 @@ require ( github.com/prometheus/common v0.14.0 github.com/prometheus/prometheus v1.8.2-0.20200827201422-1195cc24e3c8 github.com/stretchr/testify v1.6.1 - go.opentelemetry.io/collector v0.13.0 + go.opentelemetry.io/collector v0.13.1-0.20201020144745-846222e6af7a go.uber.org/zap v1.16.0 ) diff --git a/receiver/prometheusexecreceiver/go.sum b/receiver/prometheusexecreceiver/go.sum index a2502192f7694..c6fc55e912d5b 100644 --- a/receiver/prometheusexecreceiver/go.sum +++ b/receiver/prometheusexecreceiver/go.sum @@ -1118,8 +1118,8 @@ go.opencensus.io v0.22.2/go.mod h1:yxeiOL68Rb0Xd1ddK5vPZ/oVn4vY4Ynel7k9FzqtOIw= go.opencensus.io v0.22.3/go.mod h1:yxeiOL68Rb0Xd1ddK5vPZ/oVn4vY4Ynel7k9FzqtOIw= go.opencensus.io v0.22.4 h1:LYy1Hy3MJdrCdMwwzxA/dRok4ejH+RwNGbuoD9fCjto= go.opencensus.io v0.22.4/go.mod h1:yxeiOL68Rb0Xd1ddK5vPZ/oVn4vY4Ynel7k9FzqtOIw= -go.opentelemetry.io/collector v0.13.0 h1:w5DywMfxHIoGhomH382SJn95+TGQDTz5r9n4bBACe4Y= -go.opentelemetry.io/collector v0.13.0/go.mod h1:UB7wWD7RrEx8GFSaUR47TO1GAqxSi5+Kq68tI1icwJk= +go.opentelemetry.io/collector v0.13.1-0.20201020144745-846222e6af7a h1:eKbcrh2zBlQqQtrNCIDy3taW9si3b2DcILtLG8zd6hc= +go.opentelemetry.io/collector v0.13.1-0.20201020144745-846222e6af7a/go.mod h1:UB7wWD7RrEx8GFSaUR47TO1GAqxSi5+Kq68tI1icwJk= 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 2d4374eb61399..80f04e108ce09 100644 --- a/receiver/prometheusexecreceiver/receiver.go +++ b/receiver/prometheusexecreceiver/receiver.go @@ -77,8 +77,8 @@ type runResult struct { subprocessErr error } -// new returns a prometheusExecReceiver -func new(params component.ReceiverCreateParams, config *Config, consumer consumer.MetricsConsumer) (*prometheusExecReceiver, error) { +// newPromExecReceiver returns a prometheusExecReceiver +func newPromExecReceiver(params component.ReceiverCreateParams, config *Config, consumer consumer.MetricsConsumer) (*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/prometheusexecreceiver/receiver_test.go b/receiver/prometheusexecreceiver/receiver_test.go index a4d7fc57b5bad..e47be7dcb90a2 100644 --- a/receiver/prometheusexecreceiver/receiver_test.go +++ b/receiver/prometheusexecreceiver/receiver_test.go @@ -29,8 +29,8 @@ import ( "go.opentelemetry.io/collector/component/componenttest" "go.opentelemetry.io/collector/config/configmodels" "go.opentelemetry.io/collector/config/configtest" + "go.opentelemetry.io/collector/consumer/consumertest" "go.opentelemetry.io/collector/consumer/pdata" - "go.opentelemetry.io/collector/exporter/exportertest" "go.opentelemetry.io/collector/receiver/prometheusreceiver" "go.opentelemetry.io/collector/translator/internaldata" "go.uber.org/zap" @@ -63,8 +63,8 @@ func TestExecKeyMissing(t *testing.T) { // assertErrorWhenExecKeyMissing makes sure the config passed throws an error, since it's missing the exec key func assertErrorWhenExecKeyMissing(t *testing.T, errorReceiverConfig configmodels.Receiver) { - _, err := new(component.ReceiverCreateParams{Logger: zap.NewNop()}, errorReceiverConfig.(*Config), nil) - assert.Error(t, err, "new() didn't return an error") + _, err := newPromExecReceiver(component.ReceiverCreateParams{Logger: zap.NewNop()}, errorReceiverConfig.(*Config), nil) + assert.Error(t, err, "newPromExecReceiver() didn't return an error") } // TestEndToEnd loads the test config and completes an 2e2 test where Prometheus metrics are scrapped twice from `test_prometheus_exporter.go` @@ -77,9 +77,9 @@ func TestEndToEnd(t *testing.T) { // endToEndScrapeTest creates a receiver that invokes `go run test_prometheus_exporter.go` and waits until it has scraped the /metrics endpoint twice - the application will crash between each scrape func endToEndScrapeTest(t *testing.T, receiverConfig configmodels.Receiver, testName string) { - sink := &exportertest.SinkMetricsExporter{} - wrapper, err := new(component.ReceiverCreateParams{Logger: zap.NewNop()}, receiverConfig.(*Config), sink) - assert.NoError(t, err, "new() returned an error") + sink := new(consumertest.MetricsSink) + wrapper, err := newPromExecReceiver(component.ReceiverCreateParams{Logger: zap.NewNop()}, receiverConfig.(*Config), sink) + assert.NoError(t, err, "newPromExecReceiver() returned an error") ctx := context.Background() err = wrapper.Start(ctx, componenttest.NewNopHost()) diff --git a/receiver/receivercreator/go.mod b/receiver/receivercreator/go.mod index 250123e100148..a2860f2ebc7a2 100644 --- a/receiver/receivercreator/go.mod +++ b/receiver/receivercreator/go.mod @@ -9,7 +9,7 @@ require ( github.com/spf13/cast v1.3.1 github.com/spf13/viper v1.7.1 github.com/stretchr/testify v1.6.1 - go.opentelemetry.io/collector v0.13.0 + go.opentelemetry.io/collector v0.13.1-0.20201020144745-846222e6af7a go.uber.org/zap v1.16.0 google.golang.org/grpc/examples v0.0.0-20200728194956-1c32b02682df // indirect k8s.io/utils v0.0.0-20200724153422-f32512634ab7 // indirect diff --git a/receiver/receivercreator/go.sum b/receiver/receivercreator/go.sum index fd6863b24c413..3ce5c6a8c7ae6 100644 --- a/receiver/receivercreator/go.sum +++ b/receiver/receivercreator/go.sum @@ -1130,8 +1130,8 @@ go.opencensus.io v0.22.2/go.mod h1:yxeiOL68Rb0Xd1ddK5vPZ/oVn4vY4Ynel7k9FzqtOIw= go.opencensus.io v0.22.3/go.mod h1:yxeiOL68Rb0Xd1ddK5vPZ/oVn4vY4Ynel7k9FzqtOIw= go.opencensus.io v0.22.4 h1:LYy1Hy3MJdrCdMwwzxA/dRok4ejH+RwNGbuoD9fCjto= go.opencensus.io v0.22.4/go.mod h1:yxeiOL68Rb0Xd1ddK5vPZ/oVn4vY4Ynel7k9FzqtOIw= -go.opentelemetry.io/collector v0.13.0 h1:w5DywMfxHIoGhomH382SJn95+TGQDTz5r9n4bBACe4Y= -go.opentelemetry.io/collector v0.13.0/go.mod h1:UB7wWD7RrEx8GFSaUR47TO1GAqxSi5+Kq68tI1icwJk= +go.opentelemetry.io/collector v0.13.1-0.20201020144745-846222e6af7a h1:eKbcrh2zBlQqQtrNCIDy3taW9si3b2DcILtLG8zd6hc= +go.opentelemetry.io/collector v0.13.1-0.20201020144745-846222e6af7a/go.mod h1:UB7wWD7RrEx8GFSaUR47TO1GAqxSi5+Kq68tI1icwJk= 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/go.mod b/receiver/redisreceiver/go.mod index 57a905024c8ad..f276a5b417851 100644 --- a/receiver/redisreceiver/go.mod +++ b/receiver/redisreceiver/go.mod @@ -7,7 +7,7 @@ require ( github.com/go-redis/redis/v7 v7.4.0 github.com/open-telemetry/opentelemetry-collector-contrib/internal/common v0.0.0-00010101000000-000000000000 github.com/stretchr/testify v1.6.1 - go.opentelemetry.io/collector v0.13.0 + go.opentelemetry.io/collector v0.13.1-0.20201020144745-846222e6af7a go.uber.org/zap v1.16.0 google.golang.org/protobuf v1.25.0 ) diff --git a/receiver/redisreceiver/go.sum b/receiver/redisreceiver/go.sum index a05f36ae863e9..60acda05327f4 100644 --- a/receiver/redisreceiver/go.sum +++ b/receiver/redisreceiver/go.sum @@ -1024,8 +1024,8 @@ go.opencensus.io v0.22.2/go.mod h1:yxeiOL68Rb0Xd1ddK5vPZ/oVn4vY4Ynel7k9FzqtOIw= go.opencensus.io v0.22.3/go.mod h1:yxeiOL68Rb0Xd1ddK5vPZ/oVn4vY4Ynel7k9FzqtOIw= go.opencensus.io v0.22.4 h1:LYy1Hy3MJdrCdMwwzxA/dRok4ejH+RwNGbuoD9fCjto= go.opencensus.io v0.22.4/go.mod h1:yxeiOL68Rb0Xd1ddK5vPZ/oVn4vY4Ynel7k9FzqtOIw= -go.opentelemetry.io/collector v0.13.0 h1:w5DywMfxHIoGhomH382SJn95+TGQDTz5r9n4bBACe4Y= -go.opentelemetry.io/collector v0.13.0/go.mod h1:UB7wWD7RrEx8GFSaUR47TO1GAqxSi5+Kq68tI1icwJk= +go.opentelemetry.io/collector v0.13.1-0.20201020144745-846222e6af7a h1:eKbcrh2zBlQqQtrNCIDy3taW9si3b2DcILtLG8zd6hc= +go.opentelemetry.io/collector v0.13.1-0.20201020144745-846222e6af7a/go.mod h1:UB7wWD7RrEx8GFSaUR47TO1GAqxSi5+Kq68tI1icwJk= 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/redis_e2e_test.go b/receiver/redisreceiver/redis_e2e_test.go index 30f8b390249ab..265c2e3b1648d 100644 --- a/receiver/redisreceiver/redis_e2e_test.go +++ b/receiver/redisreceiver/redis_e2e_test.go @@ -24,7 +24,7 @@ import ( "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" "go.opentelemetry.io/collector/component" - "go.opentelemetry.io/collector/exporter/exportertest" + "go.opentelemetry.io/collector/consumer/consumertest" "go.uber.org/zap/zaptest" "github.com/open-telemetry/opentelemetry-collector-contrib/internal/common/testing/container" @@ -50,7 +50,7 @@ func TestIntegration(t *testing.T) { cfg := f.CreateDefaultConfig().(*config) cfg.Endpoint = c.AddrForPort(6379) - consumer := &exportertest.SinkMetricsExporter{} + consumer := new(consumertest.MetricsSink) params := component.ReceiverCreateParams{Logger: zaptest.NewLogger(t)} rcvr, err := f.CreateMetricsReceiver(context.Background(), params, cfg, consumer) diff --git a/receiver/redisreceiver/redis_runnable_test.go b/receiver/redisreceiver/redis_runnable_test.go index 5cb614a11ca57..a5beeb44242a2 100644 --- a/receiver/redisreceiver/redis_runnable_test.go +++ b/receiver/redisreceiver/redis_runnable_test.go @@ -19,12 +19,12 @@ import ( "testing" "github.com/stretchr/testify/require" - "go.opentelemetry.io/collector/exporter/exportertest" + "go.opentelemetry.io/collector/consumer/consumertest" "go.uber.org/zap" ) func TestRedisRunnable(t *testing.T) { - consumer := &exportertest.SinkMetricsExporter{} + consumer := new(consumertest.MetricsSink) logger, _ := zap.NewDevelopment() runner := newRedisRunnable(context.Background(), newFakeClient(), "", consumer, logger) err := runner.Setup() diff --git a/receiver/sapmreceiver/go.mod b/receiver/sapmreceiver/go.mod index 58b2ce8a88793..fb27ba077730d 100644 --- a/receiver/sapmreceiver/go.mod +++ b/receiver/sapmreceiver/go.mod @@ -9,7 +9,7 @@ require ( github.com/signalfx/sapm-proto v0.6.2 github.com/stretchr/testify v1.6.1 go.opencensus.io v0.22.4 - go.opentelemetry.io/collector v0.13.0 + go.opentelemetry.io/collector v0.13.1-0.20201020144745-846222e6af7a go.uber.org/zap v1.16.0 ) diff --git a/receiver/sapmreceiver/go.sum b/receiver/sapmreceiver/go.sum index e6225b828a320..708efff523be8 100644 --- a/receiver/sapmreceiver/go.sum +++ b/receiver/sapmreceiver/go.sum @@ -1122,8 +1122,8 @@ go.opencensus.io v0.22.2/go.mod h1:yxeiOL68Rb0Xd1ddK5vPZ/oVn4vY4Ynel7k9FzqtOIw= go.opencensus.io v0.22.3/go.mod h1:yxeiOL68Rb0Xd1ddK5vPZ/oVn4vY4Ynel7k9FzqtOIw= go.opencensus.io v0.22.4 h1:LYy1Hy3MJdrCdMwwzxA/dRok4ejH+RwNGbuoD9fCjto= go.opencensus.io v0.22.4/go.mod h1:yxeiOL68Rb0Xd1ddK5vPZ/oVn4vY4Ynel7k9FzqtOIw= -go.opentelemetry.io/collector v0.13.0 h1:w5DywMfxHIoGhomH382SJn95+TGQDTz5r9n4bBACe4Y= -go.opentelemetry.io/collector v0.13.0/go.mod h1:UB7wWD7RrEx8GFSaUR47TO1GAqxSi5+Kq68tI1icwJk= +go.opentelemetry.io/collector v0.13.1-0.20201020144745-846222e6af7a h1:eKbcrh2zBlQqQtrNCIDy3taW9si3b2DcILtLG8zd6hc= +go.opentelemetry.io/collector v0.13.1-0.20201020144745-846222e6af7a/go.mod h1:UB7wWD7RrEx8GFSaUR47TO1GAqxSi5+Kq68tI1icwJk= 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_test.go b/receiver/sapmreceiver/trace_receiver_test.go index 8059f979ed4d1..9da6d04d3d90e 100644 --- a/receiver/sapmreceiver/trace_receiver_test.go +++ b/receiver/sapmreceiver/trace_receiver_test.go @@ -37,8 +37,8 @@ import ( "go.opentelemetry.io/collector/component/componenttest" "go.opentelemetry.io/collector/config/confighttp" "go.opentelemetry.io/collector/config/configtls" + "go.opentelemetry.io/collector/consumer/consumertest" "go.opentelemetry.io/collector/consumer/pdata" - "go.opentelemetry.io/collector/exporter/exportertest" "go.opentelemetry.io/collector/testutil" "go.opentelemetry.io/collector/translator/conventions" tracetranslator "go.opentelemetry.io/collector/translator/trace" @@ -211,7 +211,7 @@ func sendSapm(endpoint string, sapm *splunksapm.PostSpansRequest, zipped bool, t return resp, nil } -func setupReceiver(t *testing.T, config *Config, sink *exportertest.SinkTraceExporter) component.TraceReceiver { +func setupReceiver(t *testing.T, config *Config, sink *consumertest.TracesSink) component.TraceReceiver { params := component.ReceiverCreateParams{Logger: zap.NewNop()} sr, err := New(context.Background(), params, config, sink) assert.NoError(t, err, "should not have failed to create the SAPM receiver") @@ -300,7 +300,7 @@ func TestReception(t *testing.T) { for _, tt := range tests { t.Run(tt.name, func(t *testing.T) { - sink := new(exportertest.SinkTraceExporter) + sink := new(consumertest.TracesSink) sr := setupReceiver(t, tt.args.config, sink) defer sr.Shutdown(context.Background()) @@ -364,7 +364,7 @@ func TestAccessTokenPassthrough(t *testing.T) { Batches: []*model.Batch{grpcFixture(time.Now().UTC(), time.Minute*10, time.Second*2)}, } - sink := new(exportertest.SinkTraceExporter) + sink := new(consumertest.TracesSink) sr := setupReceiver(t, config, sink) defer sr.Shutdown(context.Background()) diff --git a/receiver/signalfxreceiver/factory_test.go b/receiver/signalfxreceiver/factory_test.go index a966c3b76f095..ebd0145f2f13a 100644 --- a/receiver/signalfxreceiver/factory_test.go +++ b/receiver/signalfxreceiver/factory_test.go @@ -22,7 +22,7 @@ import ( "go.opentelemetry.io/collector/component" "go.opentelemetry.io/collector/config/configcheck" "go.opentelemetry.io/collector/config/configerror" - "go.opentelemetry.io/collector/exporter/exportertest" + "go.opentelemetry.io/collector/consumer/consumertest" "go.uber.org/zap" ) @@ -39,14 +39,14 @@ func TestCreateReceiverMetricsFirst(t *testing.T) { cfg.Endpoint = "localhost:1" // Endpoint is required, not going to be used here. params := component.ReceiverCreateParams{Logger: zap.NewNop()} - mReceiver, err := factory.CreateMetricsReceiver(context.Background(), params, cfg, exportertest.NewNopMetricsExporter()) + mReceiver, err := factory.CreateMetricsReceiver(context.Background(), params, cfg, consumertest.NewMetricsNop()) assert.Nil(t, err, "receiver creation failed") assert.NotNil(t, mReceiver, "receiver creation failed") _, err = factory.CreateTraceReceiver(context.Background(), component.ReceiverCreateParams{Logger: zap.NewNop()}, cfg, nil) assert.Equal(t, err, configerror.ErrDataTypeIsNotSupported) - lReceiver, err := factory.CreateLogsReceiver(context.Background(), component.ReceiverCreateParams{Logger: zap.NewNop()}, cfg, new(exportertest.SinkLogsExporter)) + lReceiver, err := factory.CreateLogsReceiver(context.Background(), component.ReceiverCreateParams{Logger: zap.NewNop()}, cfg, consumertest.NewLogsNop()) assert.Nil(t, err, "receiver creation failed") assert.NotNil(t, lReceiver, "receiver creation failed") @@ -58,12 +58,12 @@ func TestCreateReceiverLogsFirst(t *testing.T) { cfg := factory.CreateDefaultConfig().(*Config) cfg.Endpoint = "localhost:1" // Endpoint is required, not going to be used here. - lReceiver, err := factory.CreateLogsReceiver(context.Background(), component.ReceiverCreateParams{Logger: zap.NewNop()}, cfg, new(exportertest.SinkLogsExporter)) + lReceiver, err := factory.CreateLogsReceiver(context.Background(), component.ReceiverCreateParams{Logger: zap.NewNop()}, cfg, consumertest.NewLogsNop()) assert.Nil(t, err, "receiver creation failed") assert.NotNil(t, lReceiver, "receiver creation failed") params := component.ReceiverCreateParams{Logger: zap.NewNop()} - mReceiver, err := factory.CreateMetricsReceiver(context.Background(), params, cfg, exportertest.NewNopMetricsExporter()) + mReceiver, err := factory.CreateMetricsReceiver(context.Background(), params, cfg, consumertest.NewMetricsNop()) assert.Nil(t, err, "receiver creation failed") assert.NotNil(t, mReceiver, "receiver creation failed") @@ -76,11 +76,11 @@ func TestCreateInvalidHTTPEndpoint(t *testing.T) { cfg.Endpoint = "" params := component.ReceiverCreateParams{Logger: zap.NewNop()} - tReceiver, err := factory.CreateMetricsReceiver(context.Background(), params, cfg, exportertest.NewNopMetricsExporter()) + tReceiver, err := factory.CreateMetricsReceiver(context.Background(), params, cfg, consumertest.NewMetricsNop()) assert.Error(t, err, "endpoint is not formatted correctly: missing port in address") assert.Nil(t, tReceiver) - tReceiver, err = factory.CreateLogsReceiver(context.Background(), component.ReceiverCreateParams{Logger: zap.NewNop()}, cfg, new(exportertest.SinkLogsExporter)) + tReceiver, err = factory.CreateLogsReceiver(context.Background(), component.ReceiverCreateParams{Logger: zap.NewNop()}, cfg, consumertest.NewLogsNop()) assert.Error(t, err, "endpoint is not formatted correctly: missing port in address") assert.Nil(t, tReceiver) } @@ -91,7 +91,7 @@ func TestCreateNoPort(t *testing.T) { cfg.Endpoint = "localhost:" params := component.ReceiverCreateParams{Logger: zap.NewNop()} - tReceiver, err := factory.CreateMetricsReceiver(context.Background(), params, cfg, exportertest.NewNopMetricsExporter()) + tReceiver, err := factory.CreateMetricsReceiver(context.Background(), params, cfg, consumertest.NewMetricsNop()) assert.Error(t, err, "endpoint port is not a number: strconv.ParseInt: parsing \"\": invalid syntax") assert.Nil(t, tReceiver) } @@ -102,7 +102,7 @@ func TestCreateLargePort(t *testing.T) { cfg.Endpoint = "localhost:65536" params := component.ReceiverCreateParams{Logger: zap.NewNop()} - tReceiver, err := factory.CreateMetricsReceiver(context.Background(), params, cfg, exportertest.NewNopMetricsExporter()) + tReceiver, err := factory.CreateMetricsReceiver(context.Background(), params, cfg, consumertest.NewMetricsNop()) assert.Error(t, err, "port number must be between 1 and 65535") assert.Nil(t, tReceiver) } diff --git a/receiver/signalfxreceiver/go.mod b/receiver/signalfxreceiver/go.mod index 97e23a3c4a714..fbf68ce7a3c06 100644 --- a/receiver/signalfxreceiver/go.mod +++ b/receiver/signalfxreceiver/go.mod @@ -10,7 +10,7 @@ require ( github.com/signalfx/com_signalfx_metrics_protobuf v0.0.2 github.com/stretchr/testify v1.6.1 go.opencensus.io v0.22.4 - go.opentelemetry.io/collector v0.13.0 + go.opentelemetry.io/collector v0.13.1-0.20201020144745-846222e6af7a go.uber.org/zap v1.16.0 google.golang.org/protobuf v1.25.0 ) diff --git a/receiver/signalfxreceiver/go.sum b/receiver/signalfxreceiver/go.sum index a3903d66b1c79..0871ae0a9a687 100644 --- a/receiver/signalfxreceiver/go.sum +++ b/receiver/signalfxreceiver/go.sum @@ -1133,8 +1133,8 @@ go.opencensus.io v0.22.2/go.mod h1:yxeiOL68Rb0Xd1ddK5vPZ/oVn4vY4Ynel7k9FzqtOIw= go.opencensus.io v0.22.3/go.mod h1:yxeiOL68Rb0Xd1ddK5vPZ/oVn4vY4Ynel7k9FzqtOIw= go.opencensus.io v0.22.4 h1:LYy1Hy3MJdrCdMwwzxA/dRok4ejH+RwNGbuoD9fCjto= go.opencensus.io v0.22.4/go.mod h1:yxeiOL68Rb0Xd1ddK5vPZ/oVn4vY4Ynel7k9FzqtOIw= -go.opentelemetry.io/collector v0.13.0 h1:w5DywMfxHIoGhomH382SJn95+TGQDTz5r9n4bBACe4Y= -go.opentelemetry.io/collector v0.13.0/go.mod h1:UB7wWD7RrEx8GFSaUR47TO1GAqxSi5+Kq68tI1icwJk= +go.opentelemetry.io/collector v0.13.1-0.20201020144745-846222e6af7a h1:eKbcrh2zBlQqQtrNCIDy3taW9si3b2DcILtLG8zd6hc= +go.opentelemetry.io/collector v0.13.1-0.20201020144745-846222e6af7a/go.mod h1:UB7wWD7RrEx8GFSaUR47TO1GAqxSi5+Kq68tI1icwJk= 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= @@ -1577,14 +1577,14 @@ honnef.co/go/tools v0.0.1-2020.1.3/go.mod h1:X/FiERA/W4tHapMX5mGpAtMSVEeEUOyHaw9 honnef.co/go/tools v0.0.1-2020.1.5 h1:nI5egYTGJakVyOryqLs1cQO5dO0ksin5XXs2pspk75k= honnef.co/go/tools v0.0.1-2020.1.5/go.mod h1:X/FiERA/W4tHapMX5mGpAtMSVEeEUOyHaw9vFzvIQ3k= k8s.io/api v0.18.8/go.mod h1:d/CXqwWv+Z2XEG1LgceeDmHQwpUJhROPx16SlxJgERY= -k8s.io/api v0.19.2 h1:q+/krnHWKsL7OBZg/rxnycsl9569Pud76UJ77MvKXms= -k8s.io/api v0.19.2/go.mod h1:IQpK0zFQ1xc5iNIQPqzgoOwuFugaYHK4iCknlAQP9nI= +k8s.io/api v0.19.3 h1:GN6ntFnv44Vptj/b+OnMW7FmzkpDoIDLZRvKX3XH9aU= +k8s.io/api v0.19.3/go.mod h1:VF+5FT1B74Pw3KxMdKyinLo+zynBaMBiAfGMuldcNDs= k8s.io/apimachinery v0.18.8/go.mod h1:6sQd+iHEqmOtALqOFjSWp2KZ9F0wlU/nWm0ZgsYWMig= -k8s.io/apimachinery v0.19.2 h1:5Gy9vQpAGTKHPVOh5c4plE274X8D/6cuEiTO2zve7tc= -k8s.io/apimachinery v0.19.2/go.mod h1:DnPGDnARWFvYa3pMHgSxtbZb7gpzzAZ1pTfaUNDVlmA= +k8s.io/apimachinery v0.19.3 h1:bpIQXlKjB4cB/oNpnNnV+BybGPR7iP5oYpsOTEJ4hgc= +k8s.io/apimachinery v0.19.3/go.mod h1:DnPGDnARWFvYa3pMHgSxtbZb7gpzzAZ1pTfaUNDVlmA= k8s.io/client-go v0.18.8/go.mod h1:HqFqMllQ5NnQJNwjro9k5zMyfhZlOwpuTLVrxjkYSxU= -k8s.io/client-go v0.19.2 h1:gMJuU3xJZs86L1oQ99R4EViAADUPMHHtS9jFshasHSc= -k8s.io/client-go v0.19.2/go.mod h1:S5wPhCqyDNAlzM9CnEdgTGV4OqhsW3jGO1UM1epwfJA= +k8s.io/client-go v0.19.3 h1:ctqR1nQ52NUs6LpI0w+a5U+xjYwflFwA13OJKcicMxg= +k8s.io/client-go v0.19.3/go.mod h1:+eEMktZM+MG0KO+PTkci8xnbCZHvj9TqR6Q1XDUIJOM= k8s.io/gengo v0.0.0-20190128074634-0689ccc1d7d6/go.mod h1:ezvh/TsK7cY6rbqRK0oQQ8IAqLxYwwyPxAX1Pzy0ii0= k8s.io/gengo v0.0.0-20200413195148-3a45101e95ac/go.mod h1:ezvh/TsK7cY6rbqRK0oQQ8IAqLxYwwyPxAX1Pzy0ii0= k8s.io/klog v0.0.0-20181102134211-b9b56d5dfc92/go.mod h1:Gq+BEi5rUBO/HRz0bTSXDUcqjScdoY3a9IHpCEIOOfk= diff --git a/receiver/signalfxreceiver/receiver_test.go b/receiver/signalfxreceiver/receiver_test.go index f57735c0d4655..d485d4c004b87 100644 --- a/receiver/signalfxreceiver/receiver_test.go +++ b/receiver/signalfxreceiver/receiver_test.go @@ -42,7 +42,7 @@ import ( "go.opentelemetry.io/collector/config/configtls" "go.opentelemetry.io/collector/consumer" "go.opentelemetry.io/collector/consumer/consumerdata" - "go.opentelemetry.io/collector/exporter/exportertest" + "go.opentelemetry.io/collector/consumer/consumertest" "go.opentelemetry.io/collector/testutil" "go.opentelemetry.io/collector/testutil/metricstestutil" "go.opentelemetry.io/collector/translator/internaldata" @@ -74,7 +74,7 @@ func Test_signalfxeceiver_New(t *testing.T) { name: "default_endpoint", args: args{ config: *defaultConfig, - nextConsumer: exportertest.NewNopMetricsExporter(), + nextConsumer: consumertest.NewMetricsNop(), }, }, { @@ -85,7 +85,7 @@ func Test_signalfxeceiver_New(t *testing.T) { Endpoint: "localhost:1234", }, }, - nextConsumer: exportertest.NewNopMetricsExporter(), + nextConsumer: consumertest.NewMetricsNop(), }, }, } @@ -106,7 +106,7 @@ func Test_signalfxeceiver_EndToEnd(t *testing.T) { addr := fmt.Sprintf("localhost:%d", port) cfg := createDefaultConfig().(*Config) cfg.Endpoint = addr - sink := new(exportertest.SinkMetricsExporter) + sink := new(consumertest.MetricsSink) r := newReceiver(zap.NewNop(), *cfg) r.RegisterMetricsConsumer(sink) @@ -311,7 +311,7 @@ func Test_sfxReceiver_handleReq(t *testing.T) { for _, tt := range tests { t.Run(tt.name, func(t *testing.T) { - sink := new(exportertest.SinkMetricsExporter) + sink := new(consumertest.MetricsSink) rcv := newReceiver(zap.NewNop(), *config) rcv.RegisterMetricsConsumer(sink) @@ -468,7 +468,7 @@ func Test_sfxReceiver_handleEventReq(t *testing.T) { for _, tt := range tests { t.Run(tt.name, func(t *testing.T) { - sink := new(exportertest.SinkLogsExporter) + sink := new(consumertest.LogsSink) rcv := newReceiver(zap.NewNop(), *config) rcv.RegisterLogsConsumer(sink) @@ -497,7 +497,7 @@ func Test_sfxReceiver_TLS(t *testing.T) { KeyFile: "./testdata/testkey.key", }, } - sink := new(exportertest.SinkMetricsExporter) + sink := new(consumertest.MetricsSink) r := newReceiver(zap.NewNop(), *cfg) r.RegisterMetricsConsumer(sink) defer r.Shutdown(context.Background()) @@ -624,7 +624,7 @@ func Test_sfxReceiver_DatapointAccessTokenPassthrough(t *testing.T) { config.Endpoint = "localhost:0" config.AccessTokenPassthrough = tt.passthrough - sink := new(exportertest.SinkMetricsExporter) + sink := new(consumertest.MetricsSink) rcv := newReceiver(zap.NewNop(), *config) rcv.RegisterMetricsConsumer(sink) @@ -702,7 +702,7 @@ func Test_sfxReceiver_EventAccessTokenPassthrough(t *testing.T) { config.Endpoint = "localhost:0" config.AccessTokenPassthrough = tt.passthrough - sink := new(exportertest.SinkLogsExporter) + sink := new(consumertest.LogsSink) rcv := newReceiver(zap.NewNop(), *config) rcv.RegisterLogsConsumer(sink) diff --git a/receiver/simpleprometheusreceiver/go.mod b/receiver/simpleprometheusreceiver/go.mod index 891bb16577117..92dc397dde3bc 100644 --- a/receiver/simpleprometheusreceiver/go.mod +++ b/receiver/simpleprometheusreceiver/go.mod @@ -6,7 +6,7 @@ require ( github.com/prometheus/common v0.14.0 github.com/prometheus/prometheus v1.8.2-0.20200827201422-1195cc24e3c8 github.com/stretchr/testify v1.6.1 - go.opentelemetry.io/collector v0.13.0 + go.opentelemetry.io/collector v0.13.1-0.20201020144745-846222e6af7a go.uber.org/zap v1.16.0 google.golang.org/grpc/examples v0.0.0-20200728194956-1c32b02682df // indirect k8s.io/client-go v0.19.2 diff --git a/receiver/simpleprometheusreceiver/go.sum b/receiver/simpleprometheusreceiver/go.sum index 5e44b2c808e06..1faac6282f827 100644 --- a/receiver/simpleprometheusreceiver/go.sum +++ b/receiver/simpleprometheusreceiver/go.sum @@ -1127,8 +1127,8 @@ go.opencensus.io v0.22.2/go.mod h1:yxeiOL68Rb0Xd1ddK5vPZ/oVn4vY4Ynel7k9FzqtOIw= go.opencensus.io v0.22.3/go.mod h1:yxeiOL68Rb0Xd1ddK5vPZ/oVn4vY4Ynel7k9FzqtOIw= go.opencensus.io v0.22.4 h1:LYy1Hy3MJdrCdMwwzxA/dRok4ejH+RwNGbuoD9fCjto= go.opencensus.io v0.22.4/go.mod h1:yxeiOL68Rb0Xd1ddK5vPZ/oVn4vY4Ynel7k9FzqtOIw= -go.opentelemetry.io/collector v0.13.0 h1:w5DywMfxHIoGhomH382SJn95+TGQDTz5r9n4bBACe4Y= -go.opentelemetry.io/collector v0.13.0/go.mod h1:UB7wWD7RrEx8GFSaUR47TO1GAqxSi5+Kq68tI1icwJk= +go.opentelemetry.io/collector v0.13.1-0.20201020144745-846222e6af7a h1:eKbcrh2zBlQqQtrNCIDy3taW9si3b2DcILtLG8zd6hc= +go.opentelemetry.io/collector v0.13.1-0.20201020144745-846222e6af7a/go.mod h1:UB7wWD7RrEx8GFSaUR47TO1GAqxSi5+Kq68tI1icwJk= 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/factory_test.go b/receiver/splunkhecreceiver/factory_test.go index 7df2862bc7877..669bf46f9ca27 100644 --- a/receiver/splunkhecreceiver/factory_test.go +++ b/receiver/splunkhecreceiver/factory_test.go @@ -23,7 +23,7 @@ import ( "go.opentelemetry.io/collector/config/configcheck" "go.opentelemetry.io/collector/config/configerror" "go.opentelemetry.io/collector/config/configmodels" - "go.opentelemetry.io/collector/exporter/exportertest" + "go.opentelemetry.io/collector/consumer/consumertest" "go.uber.org/zap" ) @@ -37,17 +37,17 @@ func TestCreateReceiver(t *testing.T) { cfg := createDefaultConfig().(*Config) cfg.Endpoint = "localhost:1" // Endpoint is required, not going to be used here. - mockLogsConsumer := exportertest.NewNopLogsExporter() + mockLogsConsumer := consumertest.NewLogsNop() lReceiver, err := createLogsReceiver(context.Background(), component.ReceiverCreateParams{Logger: zap.NewNop()}, cfg, mockLogsConsumer) assert.Nil(t, err, "receiver creation failed") assert.NotNil(t, lReceiver, "receiver creation failed") - mockMetricsConsumer := exportertest.NewNopMetricsExporter() + mockMetricsConsumer := consumertest.NewMetricsNop() mReceiver, err := createMetricsReceiver(context.Background(), component.ReceiverCreateParams{Logger: zap.NewNop()}, cfg, mockMetricsConsumer) assert.Nil(t, err, "receiver creation failed") assert.NotNil(t, mReceiver, "receiver creation failed") - mockTracesConsumer := exportertest.NewNopTraceExporter() + mockTracesConsumer := consumertest.NewTracesNop() tReceiver, err := createTraceReceiver(context.Background(), component.ReceiverCreateParams{Logger: zap.NewNop()}, cfg, mockTracesConsumer) assert.Equal(t, err, configerror.ErrDataTypeIsNotSupported) assert.Nil(t, tReceiver) @@ -106,7 +106,7 @@ func TestCreateBadEndpoint(t *testing.T) { cfg := createDefaultConfig().(*Config) cfg.Endpoint = "localhost:abc" - mockLogsConsumer := exportertest.NewNopLogsExporter() + mockLogsConsumer := consumertest.NewLogsNop() mReceiver, err := createLogsReceiver(context.Background(), component.ReceiverCreateParams{Logger: zap.NewNop()}, cfg, mockLogsConsumer) assert.EqualError(t, err, "endpoint port is not a number: strconv.ParseInt: parsing \"abc\": invalid syntax") assert.Nil(t, mReceiver, "receiver creation failed") diff --git a/receiver/splunkhecreceiver/go.mod b/receiver/splunkhecreceiver/go.mod index f4cd122583530..8e67502677094 100644 --- a/receiver/splunkhecreceiver/go.mod +++ b/receiver/splunkhecreceiver/go.mod @@ -7,7 +7,7 @@ require ( github.com/open-telemetry/opentelemetry-collector-contrib/internal/common v0.0.0-00010101000000-000000000000 github.com/stretchr/testify v1.6.1 go.opencensus.io v0.22.4 - go.opentelemetry.io/collector v0.13.0 + go.opentelemetry.io/collector v0.13.1-0.20201020144745-846222e6af7a go.uber.org/zap v1.16.0 google.golang.org/grpc/examples v0.0.0-20200728194956-1c32b02682df // indirect ) diff --git a/receiver/splunkhecreceiver/go.sum b/receiver/splunkhecreceiver/go.sum index 29df70a3b3426..b36b1c89e9cda 100644 --- a/receiver/splunkhecreceiver/go.sum +++ b/receiver/splunkhecreceiver/go.sum @@ -1117,8 +1117,8 @@ go.opencensus.io v0.22.2/go.mod h1:yxeiOL68Rb0Xd1ddK5vPZ/oVn4vY4Ynel7k9FzqtOIw= go.opencensus.io v0.22.3/go.mod h1:yxeiOL68Rb0Xd1ddK5vPZ/oVn4vY4Ynel7k9FzqtOIw= go.opencensus.io v0.22.4 h1:LYy1Hy3MJdrCdMwwzxA/dRok4ejH+RwNGbuoD9fCjto= go.opencensus.io v0.22.4/go.mod h1:yxeiOL68Rb0Xd1ddK5vPZ/oVn4vY4Ynel7k9FzqtOIw= -go.opentelemetry.io/collector v0.13.0 h1:w5DywMfxHIoGhomH382SJn95+TGQDTz5r9n4bBACe4Y= -go.opentelemetry.io/collector v0.13.0/go.mod h1:UB7wWD7RrEx8GFSaUR47TO1GAqxSi5+Kq68tI1icwJk= +go.opentelemetry.io/collector v0.13.1-0.20201020144745-846222e6af7a h1:eKbcrh2zBlQqQtrNCIDy3taW9si3b2DcILtLG8zd6hc= +go.opentelemetry.io/collector v0.13.1-0.20201020144745-846222e6af7a/go.mod h1:UB7wWD7RrEx8GFSaUR47TO1GAqxSi5+Kq68tI1icwJk= 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_test.go b/receiver/splunkhecreceiver/receiver_test.go index 14dd6313b19e9..db76c8a5e6c2d 100644 --- a/receiver/splunkhecreceiver/receiver_test.go +++ b/receiver/splunkhecreceiver/receiver_test.go @@ -36,8 +36,8 @@ import ( "go.opentelemetry.io/collector/config/confighttp" "go.opentelemetry.io/collector/config/configtls" "go.opentelemetry.io/collector/consumer" + "go.opentelemetry.io/collector/consumer/consumertest" "go.opentelemetry.io/collector/consumer/pdata" - "go.opentelemetry.io/collector/exporter/exportertest" "go.opentelemetry.io/collector/testutil" "go.uber.org/zap" @@ -68,7 +68,7 @@ func Test_splunkhecreceiver_NewLogsReceiver(t *testing.T) { name: "empty_endpoint", args: args{ config: *emptyEndpointConfig, - logsConsumer: new(exportertest.SinkLogsExporter), + logsConsumer: new(consumertest.LogsSink), }, wantErr: errEmptyEndpoint, }, @@ -76,7 +76,7 @@ func Test_splunkhecreceiver_NewLogsReceiver(t *testing.T) { name: "default_endpoint", args: args{ config: *defaultConfig, - logsConsumer: exportertest.NewNopLogsExporter(), + logsConsumer: consumertest.NewLogsNop(), }, }, { @@ -87,7 +87,7 @@ func Test_splunkhecreceiver_NewLogsReceiver(t *testing.T) { Endpoint: "localhost:1234", }, }, - logsConsumer: exportertest.NewNopLogsExporter(), + logsConsumer: consumertest.NewLogsNop(), }, }, } @@ -128,7 +128,7 @@ func Test_splunkhecreceiver_NewMetricsReceiver(t *testing.T) { name: "empty_endpoint", args: args{ config: *emptyEndpointConfig, - metricsConsumer: new(exportertest.SinkMetricsExporter), + metricsConsumer: new(consumertest.MetricsSink), }, wantErr: errEmptyEndpoint, }, @@ -136,7 +136,7 @@ func Test_splunkhecreceiver_NewMetricsReceiver(t *testing.T) { name: "default_endpoint", args: args{ config: *defaultConfig, - metricsConsumer: exportertest.NewNopMetricsExporter(), + metricsConsumer: consumertest.NewMetricsNop(), }, }, { @@ -147,7 +147,7 @@ func Test_splunkhecreceiver_NewMetricsReceiver(t *testing.T) { Endpoint: "localhost:1234", }, }, - metricsConsumer: exportertest.NewNopMetricsExporter(), + metricsConsumer: consumertest.NewMetricsNop(), }, }, } @@ -305,7 +305,7 @@ func Test_splunkhecReceiver_handleReq(t *testing.T) { for _, tt := range tests { t.Run(tt.name, func(t *testing.T) { - sink := new(exportertest.SinkLogsExporter) + sink := new(consumertest.LogsSink) rcv, err := NewLogsReceiver(zap.NewNop(), *config, sink) assert.NoError(t, err) @@ -330,8 +330,8 @@ func Test_consumer_err(t *testing.T) { splunkMsg := buildSplunkHecMsg(currentTime, "foo", 3) config := createDefaultConfig().(*Config) config.Endpoint = "localhost:0" // Actually not creating the endpoint - sink := new(exportertest.SinkLogsExporter) - sink.SetConsumeLogError(errors.New("bad consumer")) + sink := new(consumertest.LogsSink) + sink.SetConsumeError(errors.New("bad consumer")) rcv, err := NewLogsReceiver(zap.NewNop(), *config, sink) assert.NoError(t, err) @@ -360,8 +360,8 @@ func Test_consumer_err_metrics(t *testing.T) { assert.True(t, splunkMsg.IsMetric()) config := createDefaultConfig().(*Config) config.Endpoint = "localhost:0" // Actually not creating the endpoint - sink := new(exportertest.SinkMetricsExporter) - sink.SetConsumeMetricsError(errors.New("bad consumer")) + sink := new(consumertest.MetricsSink) + sink.SetConsumeError(errors.New("bad consumer")) rcv, err := NewMetricsReceiver(zap.NewNop(), *config, sink) assert.NoError(t, err) @@ -394,7 +394,7 @@ func Test_splunkhecReceiver_TLS(t *testing.T) { KeyFile: "./testdata/testkey.key", }, } - sink := new(exportertest.SinkLogsExporter) + sink := new(consumertest.LogsSink) r, err := NewLogsReceiver(zap.NewNop(), *cfg, sink) require.NoError(t, err) defer r.Shutdown(context.Background()) @@ -500,7 +500,7 @@ func Test_splunkhecReceiver_AccessTokenPassthrough(t *testing.T) { config.Endpoint = "localhost:0" config.AccessTokenPassthrough = tt.passthrough - sink := new(exportertest.SinkLogsExporter) + sink := new(consumertest.LogsSink) rcv, err := NewLogsReceiver(zap.NewNop(), *config, sink) assert.NoError(t, err) diff --git a/receiver/stanzareceiver/go.mod b/receiver/stanzareceiver/go.mod index 9a5f4a5d2d3a1..5a73f94981cdd 100644 --- a/receiver/stanzareceiver/go.mod +++ b/receiver/stanzareceiver/go.mod @@ -5,6 +5,6 @@ go 1.14 require ( github.com/observiq/stanza v0.12.0 github.com/stretchr/testify v1.6.1 - go.opentelemetry.io/collector v0.13.0 + go.opentelemetry.io/collector v0.13.1-0.20201020144745-846222e6af7a go.uber.org/zap v1.16.0 ) diff --git a/receiver/stanzareceiver/go.sum b/receiver/stanzareceiver/go.sum index 81615b328f3f9..f41583fd6316f 100644 --- a/receiver/stanzareceiver/go.sum +++ b/receiver/stanzareceiver/go.sum @@ -1139,8 +1139,8 @@ go.opencensus.io v0.22.2/go.mod h1:yxeiOL68Rb0Xd1ddK5vPZ/oVn4vY4Ynel7k9FzqtOIw= go.opencensus.io v0.22.3/go.mod h1:yxeiOL68Rb0Xd1ddK5vPZ/oVn4vY4Ynel7k9FzqtOIw= go.opencensus.io v0.22.4 h1:LYy1Hy3MJdrCdMwwzxA/dRok4ejH+RwNGbuoD9fCjto= go.opencensus.io v0.22.4/go.mod h1:yxeiOL68Rb0Xd1ddK5vPZ/oVn4vY4Ynel7k9FzqtOIw= -go.opentelemetry.io/collector v0.13.0 h1:w5DywMfxHIoGhomH382SJn95+TGQDTz5r9n4bBACe4Y= -go.opentelemetry.io/collector v0.13.0/go.mod h1:UB7wWD7RrEx8GFSaUR47TO1GAqxSi5+Kq68tI1icwJk= +go.opentelemetry.io/collector v0.13.1-0.20201020144745-846222e6af7a h1:eKbcrh2zBlQqQtrNCIDy3taW9si3b2DcILtLG8zd6hc= +go.opentelemetry.io/collector v0.13.1-0.20201020144745-846222e6af7a/go.mod h1:UB7wWD7RrEx8GFSaUR47TO1GAqxSi5+Kq68tI1icwJk= 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/statsdreceiver/factory_test.go b/receiver/statsdreceiver/factory_test.go index 7d15616d59137..1ba2a2c48bee8 100644 --- a/receiver/statsdreceiver/factory_test.go +++ b/receiver/statsdreceiver/factory_test.go @@ -21,7 +21,7 @@ import ( "github.com/stretchr/testify/assert" "go.opentelemetry.io/collector/component" "go.opentelemetry.io/collector/config/configcheck" - "go.opentelemetry.io/collector/exporter/exportertest" + "go.opentelemetry.io/collector/consumer/consumertest" "go.uber.org/zap" ) @@ -37,7 +37,7 @@ func TestCreateReceiver(t *testing.T) { cfg.NetAddr.Endpoint = "localhost:0" // Endpoint is required, not going to be used here. params := component.ReceiverCreateParams{Logger: zap.NewNop()} - tReceiver, err := createMetricsReceiver(context.Background(), params, cfg, exportertest.NewNopMetricsExporter()) + tReceiver, err := createMetricsReceiver(context.Background(), params, cfg, consumertest.NewMetricsNop()) assert.NoError(t, err) assert.NotNil(t, tReceiver, "receiver creation failed") } diff --git a/receiver/statsdreceiver/go.mod b/receiver/statsdreceiver/go.mod index b5b105c8a1702..42eee0e06e70a 100644 --- a/receiver/statsdreceiver/go.mod +++ b/receiver/statsdreceiver/go.mod @@ -6,7 +6,7 @@ require ( github.com/census-instrumentation/opencensus-proto v0.3.0 github.com/stretchr/testify v1.6.1 go.opencensus.io v0.22.5 - go.opentelemetry.io/collector v0.13.0 + go.opentelemetry.io/collector v0.13.1-0.20201020144745-846222e6af7a go.uber.org/zap v1.16.0 google.golang.org/protobuf v1.25.0 ) diff --git a/receiver/statsdreceiver/go.sum b/receiver/statsdreceiver/go.sum index 5615c95c471a4..d8f47f69e347e 100644 --- a/receiver/statsdreceiver/go.sum +++ b/receiver/statsdreceiver/go.sum @@ -1117,8 +1117,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 h1:dntmOdLpSpHlVqbW5Eay97DelsZHe+55D+xC6i0dDS0= go.opencensus.io v0.22.5/go.mod h1:5pWMHQbX5EPX2/62yrJeAkowc+lfs/XD7Uxpq3pI6kk= -go.opentelemetry.io/collector v0.13.0 h1:w5DywMfxHIoGhomH382SJn95+TGQDTz5r9n4bBACe4Y= -go.opentelemetry.io/collector v0.13.0/go.mod h1:UB7wWD7RrEx8GFSaUR47TO1GAqxSi5+Kq68tI1icwJk= +go.opentelemetry.io/collector v0.13.1-0.20201020144745-846222e6af7a h1:eKbcrh2zBlQqQtrNCIDy3taW9si3b2DcILtLG8zd6hc= +go.opentelemetry.io/collector v0.13.1-0.20201020144745-846222e6af7a/go.mod h1:UB7wWD7RrEx8GFSaUR47TO1GAqxSi5+Kq68tI1icwJk= 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/statsdreceiver/receiver_test.go b/receiver/statsdreceiver/receiver_test.go index fc5dfc323c35a..4897e76869cae 100644 --- a/receiver/statsdreceiver/receiver_test.go +++ b/receiver/statsdreceiver/receiver_test.go @@ -28,7 +28,7 @@ import ( "go.opentelemetry.io/collector/component/componenttest" "go.opentelemetry.io/collector/config/confignet" "go.opentelemetry.io/collector/consumer" - "go.opentelemetry.io/collector/exporter/exportertest" + "go.opentelemetry.io/collector/consumer/consumertest" "go.opentelemetry.io/collector/testutil" "go.opentelemetry.io/collector/translator/internaldata" "go.uber.org/zap" @@ -52,7 +52,7 @@ func Test_statsdreceiver_New(t *testing.T) { name: "default_config", args: args{ config: *defaultConfig, - nextConsumer: exportertest.NewNopMetricsExporter(), + nextConsumer: consumertest.NewMetricsNop(), }, }, { @@ -68,7 +68,7 @@ func Test_statsdreceiver_New(t *testing.T) { config: Config{ ReceiverSettings: defaultConfig.ReceiverSettings, }, - nextConsumer: exportertest.NewNopMetricsExporter(), + nextConsumer: consumertest.NewMetricsNop(), }, }, { @@ -81,7 +81,7 @@ func Test_statsdreceiver_New(t *testing.T) { Transport: "unknown", }, }, - nextConsumer: exportertest.NewNopMetricsExporter(), + nextConsumer: consumertest.NewMetricsNop(), }, wantErr: errors.New("unsupported transport \"unknown\" for receiver \"statsd\""), }, @@ -128,7 +128,7 @@ func Test_statsdreceiver_EndToEnd(t *testing.T) { t.Run(tt.name, func(t *testing.T) { cfg := tt.configFn() cfg.NetAddr.Endpoint = addr - sink := new(exportertest.SinkMetricsExporter) + sink := new(consumertest.MetricsSink) rcv, err := New(zap.NewNop(), *cfg, sink) require.NoError(t, err) r := rcv.(*statsdReceiver) diff --git a/receiver/statsdreceiver/transport/server_test.go b/receiver/statsdreceiver/transport/server_test.go index 94773a055ba3a..8512bf45c187a 100644 --- a/receiver/statsdreceiver/transport/server_test.go +++ b/receiver/statsdreceiver/transport/server_test.go @@ -23,7 +23,7 @@ import ( "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" - "go.opentelemetry.io/collector/exporter/exportertest" + "go.opentelemetry.io/collector/consumer/consumertest" "go.opentelemetry.io/collector/testutil" "go.opentelemetry.io/collector/translator/internaldata" @@ -59,7 +59,7 @@ func Test_Server_ListenAndServe(t *testing.T) { port, err := strconv.Atoi(portStr) require.NoError(t, err) - mc := new(exportertest.SinkMetricsExporter) + mc := new(consumertest.MetricsSink) p := &protocol.StatsDParser{} require.NoError(t, err) mr := NewMockReporter(1) diff --git a/receiver/wavefrontreceiver/factory_test.go b/receiver/wavefrontreceiver/factory_test.go index 773ed10277796..76d450b695139 100644 --- a/receiver/wavefrontreceiver/factory_test.go +++ b/receiver/wavefrontreceiver/factory_test.go @@ -21,7 +21,7 @@ import ( "github.com/stretchr/testify/assert" "go.opentelemetry.io/collector/component" "go.opentelemetry.io/collector/config/configcheck" - "go.opentelemetry.io/collector/exporter/exportertest" + "go.opentelemetry.io/collector/consumer/consumertest" "go.uber.org/zap" ) @@ -37,7 +37,7 @@ func TestCreateReceiver(t *testing.T) { cfg.Endpoint = "localhost:0" // Endpoint is required, not going to be used here. params := component.ReceiverCreateParams{Logger: zap.NewNop()} - tReceiver, err := createMetricsReceiver(context.Background(), params, cfg, exportertest.NewNopMetricsExporter()) + tReceiver, err := createMetricsReceiver(context.Background(), params, cfg, consumertest.NewMetricsNop()) assert.NoError(t, err) assert.NotNil(t, tReceiver, "receiver creation failed") } diff --git a/receiver/wavefrontreceiver/go.mod b/receiver/wavefrontreceiver/go.mod index 59fb3594da455..3912e6cf52e5f 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.6.1 - go.opentelemetry.io/collector v0.13.0 + go.opentelemetry.io/collector v0.13.1-0.20201020144745-846222e6af7a go.uber.org/zap v1.16.0 google.golang.org/protobuf v1.25.0 ) diff --git a/receiver/wavefrontreceiver/go.sum b/receiver/wavefrontreceiver/go.sum index 7ee8df233f244..92463502d92b8 100644 --- a/receiver/wavefrontreceiver/go.sum +++ b/receiver/wavefrontreceiver/go.sum @@ -1117,8 +1117,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 h1:dntmOdLpSpHlVqbW5Eay97DelsZHe+55D+xC6i0dDS0= go.opencensus.io v0.22.5/go.mod h1:5pWMHQbX5EPX2/62yrJeAkowc+lfs/XD7Uxpq3pI6kk= -go.opentelemetry.io/collector v0.13.0 h1:w5DywMfxHIoGhomH382SJn95+TGQDTz5r9n4bBACe4Y= -go.opentelemetry.io/collector v0.13.0/go.mod h1:UB7wWD7RrEx8GFSaUR47TO1GAqxSi5+Kq68tI1icwJk= +go.opentelemetry.io/collector v0.13.1-0.20201020144745-846222e6af7a h1:eKbcrh2zBlQqQtrNCIDy3taW9si3b2DcILtLG8zd6hc= +go.opentelemetry.io/collector v0.13.1-0.20201020144745-846222e6af7a/go.mod h1:UB7wWD7RrEx8GFSaUR47TO1GAqxSi5+Kq68tI1icwJk= 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/receiver_test.go b/receiver/wavefrontreceiver/receiver_test.go index ea1639925f630..feefe3d000882 100644 --- a/receiver/wavefrontreceiver/receiver_test.go +++ b/receiver/wavefrontreceiver/receiver_test.go @@ -27,7 +27,7 @@ import ( "github.com/stretchr/testify/require" "go.opentelemetry.io/collector/component" "go.opentelemetry.io/collector/component/componenttest" - "go.opentelemetry.io/collector/exporter/exportertest" + "go.opentelemetry.io/collector/consumer/consumertest" "go.opentelemetry.io/collector/testutil" "go.opentelemetry.io/collector/translator/internaldata" "go.uber.org/zap" @@ -41,7 +41,7 @@ func Test_wavefrontreceiver_EndToEnd(t *testing.T) { addr := testutil.GetAvailableLocalAddress(t) rCfg.Endpoint = addr - sink := new(exportertest.SinkMetricsExporter) + sink := new(consumertest.MetricsSink) params := component.ReceiverCreateParams{Logger: zap.NewNop()} rcvr, err := createMetricsReceiver(context.Background(), params, rCfg, sink) require.NoError(t, err) diff --git a/testbed/go.mod b/testbed/go.mod index 2c291ec0f04e2..31605e3b793cd 100644 --- a/testbed/go.mod +++ b/testbed/go.mod @@ -10,7 +10,7 @@ require ( github.com/open-telemetry/opentelemetry-collector-contrib/receiver/carbonreceiver v0.0.0-00010101000000-000000000000 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 - go.opentelemetry.io/collector v0.13.0 + go.opentelemetry.io/collector v0.13.1-0.20201020144745-846222e6af7a go.uber.org/zap v1.16.0 ) diff --git a/testbed/go.sum b/testbed/go.sum index f8da2d520cfb9..1a8083f513200 100644 --- a/testbed/go.sum +++ b/testbed/go.sum @@ -1175,8 +1175,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 h1:dntmOdLpSpHlVqbW5Eay97DelsZHe+55D+xC6i0dDS0= go.opencensus.io v0.22.5/go.mod h1:5pWMHQbX5EPX2/62yrJeAkowc+lfs/XD7Uxpq3pI6kk= -go.opentelemetry.io/collector v0.13.0 h1:w5DywMfxHIoGhomH382SJn95+TGQDTz5r9n4bBACe4Y= -go.opentelemetry.io/collector v0.13.0/go.mod h1:UB7wWD7RrEx8GFSaUR47TO1GAqxSi5+Kq68tI1icwJk= +go.opentelemetry.io/collector v0.13.1-0.20201020144745-846222e6af7a h1:eKbcrh2zBlQqQtrNCIDy3taW9si3b2DcILtLG8zd6hc= +go.opentelemetry.io/collector v0.13.1-0.20201020144745-846222e6af7a/go.mod h1:UB7wWD7RrEx8GFSaUR47TO1GAqxSi5+Kq68tI1icwJk= 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= @@ -1624,14 +1624,14 @@ honnef.co/go/tools v0.0.1-2020.1.3/go.mod h1:X/FiERA/W4tHapMX5mGpAtMSVEeEUOyHaw9 honnef.co/go/tools v0.0.1-2020.1.5 h1:nI5egYTGJakVyOryqLs1cQO5dO0ksin5XXs2pspk75k= honnef.co/go/tools v0.0.1-2020.1.5/go.mod h1:X/FiERA/W4tHapMX5mGpAtMSVEeEUOyHaw9vFzvIQ3k= k8s.io/api v0.18.8/go.mod h1:d/CXqwWv+Z2XEG1LgceeDmHQwpUJhROPx16SlxJgERY= -k8s.io/api v0.19.2 h1:q+/krnHWKsL7OBZg/rxnycsl9569Pud76UJ77MvKXms= -k8s.io/api v0.19.2/go.mod h1:IQpK0zFQ1xc5iNIQPqzgoOwuFugaYHK4iCknlAQP9nI= +k8s.io/api v0.19.3 h1:GN6ntFnv44Vptj/b+OnMW7FmzkpDoIDLZRvKX3XH9aU= +k8s.io/api v0.19.3/go.mod h1:VF+5FT1B74Pw3KxMdKyinLo+zynBaMBiAfGMuldcNDs= k8s.io/apimachinery v0.18.8/go.mod h1:6sQd+iHEqmOtALqOFjSWp2KZ9F0wlU/nWm0ZgsYWMig= -k8s.io/apimachinery v0.19.2 h1:5Gy9vQpAGTKHPVOh5c4plE274X8D/6cuEiTO2zve7tc= -k8s.io/apimachinery v0.19.2/go.mod h1:DnPGDnARWFvYa3pMHgSxtbZb7gpzzAZ1pTfaUNDVlmA= +k8s.io/apimachinery v0.19.3 h1:bpIQXlKjB4cB/oNpnNnV+BybGPR7iP5oYpsOTEJ4hgc= +k8s.io/apimachinery v0.19.3/go.mod h1:DnPGDnARWFvYa3pMHgSxtbZb7gpzzAZ1pTfaUNDVlmA= k8s.io/client-go v0.18.8/go.mod h1:HqFqMllQ5NnQJNwjro9k5zMyfhZlOwpuTLVrxjkYSxU= -k8s.io/client-go v0.19.2 h1:gMJuU3xJZs86L1oQ99R4EViAADUPMHHtS9jFshasHSc= -k8s.io/client-go v0.19.2/go.mod h1:S5wPhCqyDNAlzM9CnEdgTGV4OqhsW3jGO1UM1epwfJA= +k8s.io/client-go v0.19.3 h1:ctqR1nQ52NUs6LpI0w+a5U+xjYwflFwA13OJKcicMxg= +k8s.io/client-go v0.19.3/go.mod h1:+eEMktZM+MG0KO+PTkci8xnbCZHvj9TqR6Q1XDUIJOM= k8s.io/gengo v0.0.0-20190128074634-0689ccc1d7d6/go.mod h1:ezvh/TsK7cY6rbqRK0oQQ8IAqLxYwwyPxAX1Pzy0ii0= k8s.io/gengo v0.0.0-20200413195148-3a45101e95ac/go.mod h1:ezvh/TsK7cY6rbqRK0oQQ8IAqLxYwwyPxAX1Pzy0ii0= k8s.io/klog v0.0.0-20181102134211-b9b56d5dfc92/go.mod h1:Gq+BEi5rUBO/HRz0bTSXDUcqjScdoY3a9IHpCEIOOfk=