Update core to latest, fix usage of config.ComponentID in obsreport (o…

…pen-telemetry#3324) Signed-off-by: Bogdan Drutu <[email protected]>
sakulali · May 5, 2021 · a1a184b · a1a184b
1 parent b2d3a11
commit a1a184b
Show file tree

Hide file tree

Showing 159 changed files with 253 additions and 254 deletions.
diff --git a/exporter/alibabacloudlogserviceexporter/go.mod b/exporter/alibabacloudlogserviceexporter/go.mod
@@ -8,7 +8,7 @@ require (
  github.com/gogo/protobuf v1.3.2
  github.com/pelletier/go-toml v1.8.0 // indirect
  github.com/stretchr/testify v1.7.0
- go.opentelemetry.io/collector v0.25.1-0.20210504151019-4603bad78ae7
+ go.opentelemetry.io/collector v0.25.1-0.20210504213219-970b76cc794a
  go.uber.org/zap v1.16.0
  gopkg.in/ini.v1 v1.57.0 // indirect
 )
diff --git a/exporter/alibabacloudlogserviceexporter/go.sum b/exporter/alibabacloudlogserviceexporter/go.sum
@@ -912,8 +912,8 @@ go.opencensus.io v0.22.4/go.mod h1:yxeiOL68Rb0Xd1ddK5vPZ/oVn4vY4Ynel7k9FzqtOIw=
 go.opencensus.io v0.22.5/go.mod h1:5pWMHQbX5EPX2/62yrJeAkowc+lfs/XD7Uxpq3pI6kk=
 go.opencensus.io v0.23.0 h1:gqCw0LfLxScz8irSi8exQc7fyQ0fKQU/qnC/X8+V/1M=
 go.opencensus.io v0.23.0/go.mod h1:XItmlyltB5F7CS4xOC1DcqMoFqwtC6OG2xF7mCv7P7E=
-go.opentelemetry.io/collector v0.25.1-0.20210504151019-4603bad78ae7 h1:PYYvkjl9+PSQcWc1kklY9fxhMamvzTWR1s03DZCViWQ=
-go.opentelemetry.io/collector v0.25.1-0.20210504151019-4603bad78ae7/go.mod h1:umsD61HigOQmEhlesNUobwjuEDh2lY6AvKY4SSx/fMA=
+go.opentelemetry.io/collector v0.25.1-0.20210504213219-970b76cc794a h1:7njBAE6NXg+v2WE9AKmys11W0GBqBGTvjznGCWVisNA=
+go.opentelemetry.io/collector v0.25.1-0.20210504213219-970b76cc794a/go.mod h1:umsD61HigOQmEhlesNUobwjuEDh2lY6AvKY4SSx/fMA=
 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
@@ -10,7 +10,7 @@ require (
  github.com/open-telemetry/opentelemetry-collector-contrib/internal/aws/awsutil v0.0.0-00010101000000-000000000000
  github.com/open-telemetry/opentelemetry-collector-contrib/internal/aws/metrics v0.0.0-00010101000000-000000000000
  github.com/stretchr/testify v1.7.0
- go.opentelemetry.io/collector v0.25.1-0.20210504151019-4603bad78ae7
+ go.opentelemetry.io/collector v0.25.1-0.20210504213219-970b76cc794a
  go.uber.org/zap v1.16.0
  google.golang.org/protobuf v1.26.0
 )

diff --git a/exporter/awsemfexporter/go.sum b/exporter/awsemfexporter/go.sum
@@ -1034,8 +1034,8 @@ go.opencensus.io v0.22.4/go.mod h1:yxeiOL68Rb0Xd1ddK5vPZ/oVn4vY4Ynel7k9FzqtOIw=
 go.opencensus.io v0.22.5/go.mod h1:5pWMHQbX5EPX2/62yrJeAkowc+lfs/XD7Uxpq3pI6kk=
 go.opencensus.io v0.23.0 h1:gqCw0LfLxScz8irSi8exQc7fyQ0fKQU/qnC/X8+V/1M=
 go.opencensus.io v0.23.0/go.mod h1:XItmlyltB5F7CS4xOC1DcqMoFqwtC6OG2xF7mCv7P7E=
-go.opentelemetry.io/collector v0.25.1-0.20210504151019-4603bad78ae7 h1:PYYvkjl9+PSQcWc1kklY9fxhMamvzTWR1s03DZCViWQ=
-go.opentelemetry.io/collector v0.25.1-0.20210504151019-4603bad78ae7/go.mod h1:umsD61HigOQmEhlesNUobwjuEDh2lY6AvKY4SSx/fMA=
+go.opentelemetry.io/collector v0.25.1-0.20210504213219-970b76cc794a h1:7njBAE6NXg+v2WE9AKmys11W0GBqBGTvjznGCWVisNA=
+go.opentelemetry.io/collector v0.25.1-0.20210504213219-970b76cc794a/go.mod h1:umsD61HigOQmEhlesNUobwjuEDh2lY6AvKY4SSx/fMA=
 go.opentelemetry.io/otel v0.20.0 h1:eaP0Fqu7SXHwvjiqDq83zImeehOHX8doTvU9AwXON8g=
 go.opentelemetry.io/otel v0.20.0/go.mod h1:Y3ugLH2oa81t5QO+Lty+zXf8zC9L26ax4Nzoxm/dooo=
 go.opentelemetry.io/otel/metric v0.20.0/go.mod h1:598I5tYlH1vzBjn+BTuhzTCSb/9debfNp6R3s7Pr1eU=

diff --git a/exporter/awskinesisexporter/go.mod b/exporter/awskinesisexporter/go.mod
@@ -12,7 +12,7 @@ require (
  github.com/pelletier/go-toml v1.8.0 // indirect
  github.com/signalfx/opencensus-go-exporter-kinesis v0.6.3
  github.com/stretchr/testify v1.7.0
- go.opentelemetry.io/collector v0.25.1-0.20210504151019-4603bad78ae7
+ go.opentelemetry.io/collector v0.25.1-0.20210504213219-970b76cc794a
  go.uber.org/zap v1.16.0
  gopkg.in/ini.v1 v1.57.0 // indirect
 )
diff --git a/exporter/awskinesisexporter/go.sum b/exporter/awskinesisexporter/go.sum
@@ -1084,8 +1084,8 @@ go.opencensus.io v0.22.4/go.mod h1:yxeiOL68Rb0Xd1ddK5vPZ/oVn4vY4Ynel7k9FzqtOIw=
 go.opencensus.io v0.22.5/go.mod h1:5pWMHQbX5EPX2/62yrJeAkowc+lfs/XD7Uxpq3pI6kk=
 go.opencensus.io v0.23.0 h1:gqCw0LfLxScz8irSi8exQc7fyQ0fKQU/qnC/X8+V/1M=
 go.opencensus.io v0.23.0/go.mod h1:XItmlyltB5F7CS4xOC1DcqMoFqwtC6OG2xF7mCv7P7E=
-go.opentelemetry.io/collector v0.25.1-0.20210504151019-4603bad78ae7 h1:PYYvkjl9+PSQcWc1kklY9fxhMamvzTWR1s03DZCViWQ=
-go.opentelemetry.io/collector v0.25.1-0.20210504151019-4603bad78ae7/go.mod h1:umsD61HigOQmEhlesNUobwjuEDh2lY6AvKY4SSx/fMA=
+go.opentelemetry.io/collector v0.25.1-0.20210504213219-970b76cc794a h1:7njBAE6NXg+v2WE9AKmys11W0GBqBGTvjznGCWVisNA=
+go.opentelemetry.io/collector v0.25.1-0.20210504213219-970b76cc794a/go.mod h1:umsD61HigOQmEhlesNUobwjuEDh2lY6AvKY4SSx/fMA=
 go.uber.org/atomic v1.3.2/go.mod h1:gD2HeocX3+yG+ygLZcrzQJaqmWj9AIm7n08wl/qW/PE=
 go.uber.org/atomic v1.4.0/go.mod h1:gD2HeocX3+yG+ygLZcrzQJaqmWj9AIm7n08wl/qW/PE=
 go.uber.org/atomic v1.5.0/go.mod h1:sABNBOSYdrvTF6hTgEIbc7YasKWGhgEQZyfxyTvoXHQ=

diff --git a/exporter/awsprometheusremotewriteexporter/go.mod b/exporter/awsprometheusremotewriteexporter/go.mod
@@ -13,7 +13,7 @@ require (
  github.com/onsi/gomega v1.10.2 // indirect
  github.com/pelletier/go-toml v1.8.0 // indirect
  github.com/stretchr/testify v1.7.0
- go.opentelemetry.io/collector v0.25.1-0.20210504151019-4603bad78ae7
+ go.opentelemetry.io/collector v0.25.1-0.20210504213219-970b76cc794a
  go.uber.org/zap v1.16.0
  gopkg.in/ini.v1 v1.57.0 // indirect
 )
diff --git a/exporter/awsprometheusremotewriteexporter/go.sum b/exporter/awsprometheusremotewriteexporter/go.sum
@@ -1054,8 +1054,8 @@ go.opencensus.io v0.22.4/go.mod h1:yxeiOL68Rb0Xd1ddK5vPZ/oVn4vY4Ynel7k9FzqtOIw=
 go.opencensus.io v0.22.5/go.mod h1:5pWMHQbX5EPX2/62yrJeAkowc+lfs/XD7Uxpq3pI6kk=
 go.opencensus.io v0.23.0 h1:gqCw0LfLxScz8irSi8exQc7fyQ0fKQU/qnC/X8+V/1M=
 go.opencensus.io v0.23.0/go.mod h1:XItmlyltB5F7CS4xOC1DcqMoFqwtC6OG2xF7mCv7P7E=
-go.opentelemetry.io/collector v0.25.1-0.20210504151019-4603bad78ae7 h1:PYYvkjl9+PSQcWc1kklY9fxhMamvzTWR1s03DZCViWQ=
-go.opentelemetry.io/collector v0.25.1-0.20210504151019-4603bad78ae7/go.mod h1:umsD61HigOQmEhlesNUobwjuEDh2lY6AvKY4SSx/fMA=
+go.opentelemetry.io/collector v0.25.1-0.20210504213219-970b76cc794a h1:7njBAE6NXg+v2WE9AKmys11W0GBqBGTvjznGCWVisNA=
+go.opentelemetry.io/collector v0.25.1-0.20210504213219-970b76cc794a/go.mod h1:umsD61HigOQmEhlesNUobwjuEDh2lY6AvKY4SSx/fMA=
 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
@@ -15,7 +15,7 @@ require (
  github.com/open-telemetry/opentelemetry-collector-contrib/internal/aws/xray v0.0.0-00010101000000-000000000000
  github.com/pelletier/go-toml v1.8.0 // indirect
  github.com/stretchr/testify v1.7.0
- go.opentelemetry.io/collector v0.25.1-0.20210504151019-4603bad78ae7
+ go.opentelemetry.io/collector v0.25.1-0.20210504213219-970b76cc794a
  go.uber.org/zap v1.16.0
  gopkg.in/ini.v1 v1.57.0 // indirect
 )

diff --git a/exporter/awsxrayexporter/go.sum b/exporter/awsxrayexporter/go.sum
@@ -1054,8 +1054,8 @@ go.opencensus.io v0.22.4/go.mod h1:yxeiOL68Rb0Xd1ddK5vPZ/oVn4vY4Ynel7k9FzqtOIw=
 go.opencensus.io v0.22.5/go.mod h1:5pWMHQbX5EPX2/62yrJeAkowc+lfs/XD7Uxpq3pI6kk=
 go.opencensus.io v0.23.0 h1:gqCw0LfLxScz8irSi8exQc7fyQ0fKQU/qnC/X8+V/1M=
 go.opencensus.io v0.23.0/go.mod h1:XItmlyltB5F7CS4xOC1DcqMoFqwtC6OG2xF7mCv7P7E=
-go.opentelemetry.io/collector v0.25.1-0.20210504151019-4603bad78ae7 h1:PYYvkjl9+PSQcWc1kklY9fxhMamvzTWR1s03DZCViWQ=
-go.opentelemetry.io/collector v0.25.1-0.20210504151019-4603bad78ae7/go.mod h1:umsD61HigOQmEhlesNUobwjuEDh2lY6AvKY4SSx/fMA=
+go.opentelemetry.io/collector v0.25.1-0.20210504213219-970b76cc794a h1:7njBAE6NXg+v2WE9AKmys11W0GBqBGTvjznGCWVisNA=
+go.opentelemetry.io/collector v0.25.1-0.20210504213219-970b76cc794a/go.mod h1:umsD61HigOQmEhlesNUobwjuEDh2lY6AvKY4SSx/fMA=
 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
@@ -15,7 +15,7 @@ require (
  github.com/pelletier/go-toml v1.8.0 // indirect
  github.com/stretchr/testify v1.7.0
  github.com/tedsuo/ifrit v0.0.0-20191009134036-9a97d0632f00 // indirect
- go.opentelemetry.io/collector v0.25.1-0.20210504151019-4603bad78ae7
+ go.opentelemetry.io/collector v0.25.1-0.20210504213219-970b76cc794a
  go.uber.org/zap v1.16.0
  golang.org/x/net v0.0.0-20210324051636-2c4c8ecb7826
  gopkg.in/ini.v1 v1.57.0 // indirect

diff --git a/exporter/azuremonitorexporter/go.sum b/exporter/azuremonitorexporter/go.sum
@@ -1064,8 +1064,8 @@ go.opencensus.io v0.22.4/go.mod h1:yxeiOL68Rb0Xd1ddK5vPZ/oVn4vY4Ynel7k9FzqtOIw=
 go.opencensus.io v0.22.5/go.mod h1:5pWMHQbX5EPX2/62yrJeAkowc+lfs/XD7Uxpq3pI6kk=
 go.opencensus.io v0.23.0 h1:gqCw0LfLxScz8irSi8exQc7fyQ0fKQU/qnC/X8+V/1M=
 go.opencensus.io v0.23.0/go.mod h1:XItmlyltB5F7CS4xOC1DcqMoFqwtC6OG2xF7mCv7P7E=
-go.opentelemetry.io/collector v0.25.1-0.20210504151019-4603bad78ae7 h1:PYYvkjl9+PSQcWc1kklY9fxhMamvzTWR1s03DZCViWQ=
-go.opentelemetry.io/collector v0.25.1-0.20210504151019-4603bad78ae7/go.mod h1:umsD61HigOQmEhlesNUobwjuEDh2lY6AvKY4SSx/fMA=
+go.opentelemetry.io/collector v0.25.1-0.20210504213219-970b76cc794a h1:7njBAE6NXg+v2WE9AKmys11W0GBqBGTvjznGCWVisNA=
+go.opentelemetry.io/collector v0.25.1-0.20210504213219-970b76cc794a/go.mod h1:umsD61HigOQmEhlesNUobwjuEDh2lY6AvKY4SSx/fMA=
 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
@@ -13,7 +13,7 @@ require (
  github.com/onsi/gomega v1.10.2 // indirect
  github.com/pelletier/go-toml v1.8.0 // indirect
  github.com/stretchr/testify v1.7.0
- go.opentelemetry.io/collector v0.25.1-0.20210504151019-4603bad78ae7
+ go.opentelemetry.io/collector v0.25.1-0.20210504213219-970b76cc794a
  go.uber.org/zap v1.16.0
  google.golang.org/protobuf v1.26.0
  gopkg.in/ini.v1 v1.57.0 // indirect

diff --git a/exporter/carbonexporter/go.sum b/exporter/carbonexporter/go.sum
@@ -1053,8 +1053,8 @@ go.opencensus.io v0.22.4/go.mod h1:yxeiOL68Rb0Xd1ddK5vPZ/oVn4vY4Ynel7k9FzqtOIw=
 go.opencensus.io v0.22.5/go.mod h1:5pWMHQbX5EPX2/62yrJeAkowc+lfs/XD7Uxpq3pI6kk=
 go.opencensus.io v0.23.0 h1:gqCw0LfLxScz8irSi8exQc7fyQ0fKQU/qnC/X8+V/1M=
 go.opencensus.io v0.23.0/go.mod h1:XItmlyltB5F7CS4xOC1DcqMoFqwtC6OG2xF7mCv7P7E=
-go.opentelemetry.io/collector v0.25.1-0.20210504151019-4603bad78ae7 h1:PYYvkjl9+PSQcWc1kklY9fxhMamvzTWR1s03DZCViWQ=
-go.opentelemetry.io/collector v0.25.1-0.20210504151019-4603bad78ae7/go.mod h1:umsD61HigOQmEhlesNUobwjuEDh2lY6AvKY4SSx/fMA=
+go.opentelemetry.io/collector v0.25.1-0.20210504213219-970b76cc794a h1:7njBAE6NXg+v2WE9AKmys11W0GBqBGTvjznGCWVisNA=
+go.opentelemetry.io/collector v0.25.1-0.20210504213219-970b76cc794a/go.mod h1:umsD61HigOQmEhlesNUobwjuEDh2lY6AvKY4SSx/fMA=
 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
@@ -20,7 +20,7 @@ require (
  github.com/stretchr/testify v1.7.0
  github.com/tinylib/msgp v1.1.5 // indirect
  github.com/zorkian/go-datadog-api v2.29.0+incompatible // indirect
- go.opentelemetry.io/collector v0.25.1-0.20210504151019-4603bad78ae7
+ go.opentelemetry.io/collector v0.25.1-0.20210504213219-970b76cc794a
  go.uber.org/zap v1.16.0
  gopkg.in/DataDog/dd-trace-go.v1 v1.30.0
  gopkg.in/ini.v1 v1.57.0 // indirect

diff --git a/exporter/datadogexporter/go.sum b/exporter/datadogexporter/go.sum
@@ -1092,8 +1092,8 @@ go.opencensus.io v0.22.4/go.mod h1:yxeiOL68Rb0Xd1ddK5vPZ/oVn4vY4Ynel7k9FzqtOIw=
 go.opencensus.io v0.22.5/go.mod h1:5pWMHQbX5EPX2/62yrJeAkowc+lfs/XD7Uxpq3pI6kk=
 go.opencensus.io v0.23.0 h1:gqCw0LfLxScz8irSi8exQc7fyQ0fKQU/qnC/X8+V/1M=
 go.opencensus.io v0.23.0/go.mod h1:XItmlyltB5F7CS4xOC1DcqMoFqwtC6OG2xF7mCv7P7E=
-go.opentelemetry.io/collector v0.25.1-0.20210504151019-4603bad78ae7 h1:PYYvkjl9+PSQcWc1kklY9fxhMamvzTWR1s03DZCViWQ=
-go.opentelemetry.io/collector v0.25.1-0.20210504151019-4603bad78ae7/go.mod h1:umsD61HigOQmEhlesNUobwjuEDh2lY6AvKY4SSx/fMA=
+go.opentelemetry.io/collector v0.25.1-0.20210504213219-970b76cc794a h1:7njBAE6NXg+v2WE9AKmys11W0GBqBGTvjznGCWVisNA=
+go.opentelemetry.io/collector v0.25.1-0.20210504213219-970b76cc794a/go.mod h1:umsD61HigOQmEhlesNUobwjuEDh2lY6AvKY4SSx/fMA=
 go.uber.org/atomic v1.3.2/go.mod h1:gD2HeocX3+yG+ygLZcrzQJaqmWj9AIm7n08wl/qW/PE=
 go.uber.org/atomic v1.4.0/go.mod h1:gD2HeocX3+yG+ygLZcrzQJaqmWj9AIm7n08wl/qW/PE=
 go.uber.org/atomic v1.5.0/go.mod h1:sABNBOSYdrvTF6hTgEIbc7YasKWGhgEQZyfxyTvoXHQ=

diff --git a/exporter/dynatraceexporter/go.mod b/exporter/dynatraceexporter/go.mod
@@ -12,7 +12,7 @@ require (
  github.com/onsi/gomega v1.10.2 // indirect
  github.com/pelletier/go-toml v1.8.0 // indirect
  github.com/stretchr/testify v1.7.0
- go.opentelemetry.io/collector v0.25.1-0.20210504151019-4603bad78ae7
+ go.opentelemetry.io/collector v0.25.1-0.20210504213219-970b76cc794a
  go.uber.org/zap v1.16.0
  gopkg.in/ini.v1 v1.57.0 // indirect
 )
diff --git a/exporter/dynatraceexporter/go.sum b/exporter/dynatraceexporter/go.sum
@@ -1053,8 +1053,8 @@ go.opencensus.io v0.22.4/go.mod h1:yxeiOL68Rb0Xd1ddK5vPZ/oVn4vY4Ynel7k9FzqtOIw=
 go.opencensus.io v0.22.5/go.mod h1:5pWMHQbX5EPX2/62yrJeAkowc+lfs/XD7Uxpq3pI6kk=
 go.opencensus.io v0.23.0 h1:gqCw0LfLxScz8irSi8exQc7fyQ0fKQU/qnC/X8+V/1M=
 go.opencensus.io v0.23.0/go.mod h1:XItmlyltB5F7CS4xOC1DcqMoFqwtC6OG2xF7mCv7P7E=
-go.opentelemetry.io/collector v0.25.1-0.20210504151019-4603bad78ae7 h1:PYYvkjl9+PSQcWc1kklY9fxhMamvzTWR1s03DZCViWQ=
-go.opentelemetry.io/collector v0.25.1-0.20210504151019-4603bad78ae7/go.mod h1:umsD61HigOQmEhlesNUobwjuEDh2lY6AvKY4SSx/fMA=
+go.opentelemetry.io/collector v0.25.1-0.20210504213219-970b76cc794a h1:7njBAE6NXg+v2WE9AKmys11W0GBqBGTvjznGCWVisNA=
+go.opentelemetry.io/collector v0.25.1-0.20210504213219-970b76cc794a/go.mod h1:umsD61HigOQmEhlesNUobwjuEDh2lY6AvKY4SSx/fMA=
 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/exporter_test.go b/exporter/elasticexporter/exporter_test.go
@@ -51,7 +51,7 @@ func TestTracesExporter(t *testing.T) {
 
  err = te.ConsumeTraces(context.Background(), traces)
  assert.NoError(t, err)
- obsreporttest.CheckExporterTraces(t, "elastic", 1, 0)
+ obsreporttest.CheckExporterTraces(t, cfg.ID(), 1, 0)
 
  payloads := recorder.Payloads()
  require.Len(t, payloads.Transactions, 1)
@@ -78,7 +78,7 @@ func TestMetricsExporter(t *testing.T) {
  payloads := recorder.Payloads()
  require.Len(t, payloads.Metrics, 2)
  assert.Contains(t, payloads.Metrics[0].Samples, "foobar")
- obsreporttest.CheckExporterMetrics(t, "elastic", 2, 0)
+ obsreporttest.CheckExporterMetrics(t, cfg.ID(), 2, 0)
 
  assert.NoError(t, me.Shutdown(context.Background()))
 }
@@ -100,7 +100,7 @@ func TestMetricsExporterSendError(t *testing.T) {
 
  err = me.ConsumeMetrics(context.Background(), sampleMetrics())
  assert.Error(t, err)
- obsreporttest.CheckExporterMetrics(t, "elastic", 0, 2)
+ obsreporttest.CheckExporterMetrics(t, cfg.ID(), 0, 2)
 
  assert.NoError(t, me.Shutdown(context.Background()))
 }

diff --git a/exporter/elasticexporter/go.mod b/exporter/elasticexporter/go.mod
@@ -16,7 +16,7 @@ require (
  github.com/stretchr/testify v1.7.0
  go.elastic.co/apm v1.9.1-0.20201218004853-18a8126106c6
  go.elastic.co/fastjson v1.1.0
- go.opentelemetry.io/collector v0.25.1-0.20210504151019-4603bad78ae7
+ go.opentelemetry.io/collector v0.25.1-0.20210504213219-970b76cc794a
  go.uber.org/zap v1.16.0
  gopkg.in/ini.v1 v1.57.0 // indirect
  howett.net/plist v0.0.0-20201026045517-117a925f2150 // indirect

diff --git a/exporter/elasticexporter/go.sum b/exporter/elasticexporter/go.sum
@@ -1072,8 +1072,8 @@ go.opencensus.io v0.22.4/go.mod h1:yxeiOL68Rb0Xd1ddK5vPZ/oVn4vY4Ynel7k9FzqtOIw=
 go.opencensus.io v0.22.5/go.mod h1:5pWMHQbX5EPX2/62yrJeAkowc+lfs/XD7Uxpq3pI6kk=
 go.opencensus.io v0.23.0 h1:gqCw0LfLxScz8irSi8exQc7fyQ0fKQU/qnC/X8+V/1M=
 go.opencensus.io v0.23.0/go.mod h1:XItmlyltB5F7CS4xOC1DcqMoFqwtC6OG2xF7mCv7P7E=
-go.opentelemetry.io/collector v0.25.1-0.20210504151019-4603bad78ae7 h1:PYYvkjl9+PSQcWc1kklY9fxhMamvzTWR1s03DZCViWQ=
-go.opentelemetry.io/collector v0.25.1-0.20210504151019-4603bad78ae7/go.mod h1:umsD61HigOQmEhlesNUobwjuEDh2lY6AvKY4SSx/fMA=
+go.opentelemetry.io/collector v0.25.1-0.20210504213219-970b76cc794a h1:7njBAE6NXg+v2WE9AKmys11W0GBqBGTvjznGCWVisNA=
+go.opentelemetry.io/collector v0.25.1-0.20210504213219-970b76cc794a/go.mod h1:umsD61HigOQmEhlesNUobwjuEDh2lY6AvKY4SSx/fMA=
 go.uber.org/atomic v1.3.2/go.mod h1:gD2HeocX3+yG+ygLZcrzQJaqmWj9AIm7n08wl/qW/PE=
 go.uber.org/atomic v1.4.0/go.mod h1:gD2HeocX3+yG+ygLZcrzQJaqmWj9AIm7n08wl/qW/PE=
 go.uber.org/atomic v1.5.0/go.mod h1:sABNBOSYdrvTF6hTgEIbc7YasKWGhgEQZyfxyTvoXHQ=

diff --git a/exporter/elasticsearchexporter/go.mod b/exporter/elasticsearchexporter/go.mod
@@ -14,7 +14,7 @@ require (
  github.com/onsi/gomega v1.10.2 // indirect
  github.com/pelletier/go-toml v1.8.0 // indirect
  github.com/stretchr/testify v1.7.0
- go.opentelemetry.io/collector v0.25.1-0.20210504151019-4603bad78ae7
+ go.opentelemetry.io/collector v0.25.1-0.20210504213219-970b76cc794a
  go.uber.org/zap v1.16.0
  gopkg.in/ini.v1 v1.57.0 // indirect
 )
diff --git a/exporter/elasticsearchexporter/go.sum b/exporter/elasticsearchexporter/go.sum
@@ -1055,8 +1055,8 @@ go.opencensus.io v0.22.4/go.mod h1:yxeiOL68Rb0Xd1ddK5vPZ/oVn4vY4Ynel7k9FzqtOIw=
 go.opencensus.io v0.22.5/go.mod h1:5pWMHQbX5EPX2/62yrJeAkowc+lfs/XD7Uxpq3pI6kk=
 go.opencensus.io v0.23.0 h1:gqCw0LfLxScz8irSi8exQc7fyQ0fKQU/qnC/X8+V/1M=
 go.opencensus.io v0.23.0/go.mod h1:XItmlyltB5F7CS4xOC1DcqMoFqwtC6OG2xF7mCv7P7E=
-go.opentelemetry.io/collector v0.25.1-0.20210504151019-4603bad78ae7 h1:PYYvkjl9+PSQcWc1kklY9fxhMamvzTWR1s03DZCViWQ=
-go.opentelemetry.io/collector v0.25.1-0.20210504151019-4603bad78ae7/go.mod h1:umsD61HigOQmEhlesNUobwjuEDh2lY6AvKY4SSx/fMA=
+go.opentelemetry.io/collector v0.25.1-0.20210504213219-970b76cc794a h1:7njBAE6NXg+v2WE9AKmys11W0GBqBGTvjznGCWVisNA=
+go.opentelemetry.io/collector v0.25.1-0.20210504213219-970b76cc794a/go.mod h1:umsD61HigOQmEhlesNUobwjuEDh2lY6AvKY4SSx/fMA=
 go.uber.org/atomic v1.3.2/go.mod h1:gD2HeocX3+yG+ygLZcrzQJaqmWj9AIm7n08wl/qW/PE=
 go.uber.org/atomic v1.4.0/go.mod h1:gD2HeocX3+yG+ygLZcrzQJaqmWj9AIm7n08wl/qW/PE=
 go.uber.org/atomic v1.5.0/go.mod h1:sABNBOSYdrvTF6hTgEIbc7YasKWGhgEQZyfxyTvoXHQ=

diff --git a/exporter/f5cloudexporter/go.mod b/exporter/f5cloudexporter/go.mod
@@ -12,7 +12,7 @@ require (
  github.com/onsi/gomega v1.10.2 // indirect
  github.com/pelletier/go-toml v1.8.0 // indirect
  github.com/stretchr/testify v1.7.0
- go.opentelemetry.io/collector v0.25.1-0.20210504151019-4603bad78ae7
+ go.opentelemetry.io/collector v0.25.1-0.20210504213219-970b76cc794a
  go.uber.org/zap v1.16.0
  golang.org/x/oauth2 v0.0.0-20210413134643-5e61552d6c78
  google.golang.org/api v0.45.0

diff --git a/exporter/f5cloudexporter/go.sum b/exporter/f5cloudexporter/go.sum
@@ -1055,8 +1055,8 @@ go.opencensus.io v0.22.4/go.mod h1:yxeiOL68Rb0Xd1ddK5vPZ/oVn4vY4Ynel7k9FzqtOIw=
 go.opencensus.io v0.22.5/go.mod h1:5pWMHQbX5EPX2/62yrJeAkowc+lfs/XD7Uxpq3pI6kk=
 go.opencensus.io v0.23.0 h1:gqCw0LfLxScz8irSi8exQc7fyQ0fKQU/qnC/X8+V/1M=
 go.opencensus.io v0.23.0/go.mod h1:XItmlyltB5F7CS4xOC1DcqMoFqwtC6OG2xF7mCv7P7E=
-go.opentelemetry.io/collector v0.25.1-0.20210504151019-4603bad78ae7 h1:PYYvkjl9+PSQcWc1kklY9fxhMamvzTWR1s03DZCViWQ=
-go.opentelemetry.io/collector v0.25.1-0.20210504151019-4603bad78ae7/go.mod h1:umsD61HigOQmEhlesNUobwjuEDh2lY6AvKY4SSx/fMA=
+go.opentelemetry.io/collector v0.25.1-0.20210504213219-970b76cc794a h1:7njBAE6NXg+v2WE9AKmys11W0GBqBGTvjznGCWVisNA=
+go.opentelemetry.io/collector v0.25.1-0.20210504213219-970b76cc794a/go.mod h1:umsD61HigOQmEhlesNUobwjuEDh2lY6AvKY4SSx/fMA=
 go.uber.org/atomic v1.3.2/go.mod h1:gD2HeocX3+yG+ygLZcrzQJaqmWj9AIm7n08wl/qW/PE=
 go.uber.org/atomic v1.4.0/go.mod h1:gD2HeocX3+yG+ygLZcrzQJaqmWj9AIm7n08wl/qW/PE=
 go.uber.org/atomic v1.5.0/go.mod h1:sABNBOSYdrvTF6hTgEIbc7YasKWGhgEQZyfxyTvoXHQ=

diff --git a/exporter/googlecloudexporter/go.mod b/exporter/googlecloudexporter/go.mod
@@ -16,7 +16,7 @@ require (
  github.com/pelletier/go-toml v1.8.0 // indirect
  github.com/stretchr/testify v1.7.0
  go.opencensus.io v0.23.0
- go.opentelemetry.io/collector v0.25.1-0.20210504151019-4603bad78ae7
+ go.opentelemetry.io/collector v0.25.1-0.20210504213219-970b76cc794a
  go.opentelemetry.io/otel v0.20.0
  go.opentelemetry.io/otel/sdk v0.20.0
  go.opentelemetry.io/otel/trace v0.20.0

diff --git a/exporter/googlecloudexporter/go.sum b/exporter/googlecloudexporter/go.sum
@@ -1063,8 +1063,8 @@ go.opencensus.io v0.22.4/go.mod h1:yxeiOL68Rb0Xd1ddK5vPZ/oVn4vY4Ynel7k9FzqtOIw=
 go.opencensus.io v0.22.5/go.mod h1:5pWMHQbX5EPX2/62yrJeAkowc+lfs/XD7Uxpq3pI6kk=
 go.opencensus.io v0.23.0 h1:gqCw0LfLxScz8irSi8exQc7fyQ0fKQU/qnC/X8+V/1M=
 go.opencensus.io v0.23.0/go.mod h1:XItmlyltB5F7CS4xOC1DcqMoFqwtC6OG2xF7mCv7P7E=
-go.opentelemetry.io/collector v0.25.1-0.20210504151019-4603bad78ae7 h1:PYYvkjl9+PSQcWc1kklY9fxhMamvzTWR1s03DZCViWQ=
-go.opentelemetry.io/collector v0.25.1-0.20210504151019-4603bad78ae7/go.mod h1:umsD61HigOQmEhlesNUobwjuEDh2lY6AvKY4SSx/fMA=
+go.opentelemetry.io/collector v0.25.1-0.20210504213219-970b76cc794a h1:7njBAE6NXg+v2WE9AKmys11W0GBqBGTvjznGCWVisNA=
+go.opentelemetry.io/collector v0.25.1-0.20210504213219-970b76cc794a/go.mod h1:umsD61HigOQmEhlesNUobwjuEDh2lY6AvKY4SSx/fMA=
 go.opentelemetry.io/contrib v0.20.0 h1:ubFQUn0VCZ0gPwIoJfBJVpeBlyRMxu8Mm/huKWYd9p0=
 go.opentelemetry.io/contrib v0.20.0/go.mod h1:G/EtFaa6qaN7+LxqfIAT3GiZa7Wv5DTBUzl5H4LY0Kc=
 go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.20.0 h1:Q3C9yzW6I9jqEc8sawxzxZmY48fs9u220KXq6d5s3XU=