Update collector dependency after consumererror changes (open-telemet…

…ry#2836) * Update otelcol to latest snapshot * Update references to changed consumererror functions and types * go mod tidy
sakulali · Mar 24, 2021 · 0f36d3f · 0f36d3f
1 parent f9507cd
commit 0f36d3f
Show file tree

Hide file tree

Showing 160 changed files with 257 additions and 297 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.23.0
+ go.opentelemetry.io/collector v0.23.1-0.20210323233523-a65a5a697891
  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
@@ -909,8 +909,8 @@ go.opencensus.io v0.22.4/go.mod h1:yxeiOL68Rb0Xd1ddK5vPZ/oVn4vY4Ynel7k9FzqtOIw=
 go.opencensus.io v0.22.5/go.mod h1:5pWMHQbX5EPX2/62yrJeAkowc+lfs/XD7Uxpq3pI6kk=
 go.opencensus.io v0.23.0 h1:gqCw0LfLxScz8irSi8exQc7fyQ0fKQU/qnC/X8+V/1M=
 go.opencensus.io v0.23.0/go.mod h1:XItmlyltB5F7CS4xOC1DcqMoFqwtC6OG2xF7mCv7P7E=
-go.opentelemetry.io/collector v0.23.0 h1:IdLOPZfTwiL+XndzOYOBEWgLGetuE8b3O2hw0m0wQXk=
-go.opentelemetry.io/collector v0.23.0/go.mod h1:wMTwy0/4xrFRZj/XX1UH5VAd0WAVts9Rq7ZKQldCIkU=
+go.opentelemetry.io/collector v0.23.1-0.20210323233523-a65a5a697891 h1:cMbD3VtEByqG+6hl7kIIF0sMVd0A0IkxK/L2u6CNSsc=
+go.opentelemetry.io/collector v0.23.1-0.20210323233523-a65a5a697891/go.mod h1:wMTwy0/4xrFRZj/XX1UH5VAd0WAVts9Rq7ZKQldCIkU=
 go.uber.org/atomic v1.3.2/go.mod h1:gD2HeocX3+yG+ygLZcrzQJaqmWj9AIm7n08wl/qW/PE=
 go.uber.org/atomic v1.4.0/go.mod h1:gD2HeocX3+yG+ygLZcrzQJaqmWj9AIm7n08wl/qW/PE=
 go.uber.org/atomic v1.5.0/go.mod h1:sABNBOSYdrvTF6hTgEIbc7YasKWGhgEQZyfxyTvoXHQ=

diff --git a/exporter/awsemfexporter/go.mod b/exporter/awsemfexporter/go.mod
@@ -17,7 +17,7 @@ require (
  github.com/open-telemetry/opentelemetry-collector-contrib/internal/aws v0.0.0-00010101000000-000000000000
  github.com/pelletier/go-toml v1.8.0 // indirect
  github.com/stretchr/testify v1.7.0
- go.opentelemetry.io/collector v0.23.0
+ go.opentelemetry.io/collector v0.23.1-0.20210323233523-a65a5a697891
  go.opentelemetry.io/otel v0.19.0
  go.uber.org/zap v1.16.0
  google.golang.org/protobuf v1.26.0

diff --git a/exporter/awsemfexporter/go.sum b/exporter/awsemfexporter/go.sum
@@ -1051,8 +1051,8 @@ go.opencensus.io v0.22.4/go.mod h1:yxeiOL68Rb0Xd1ddK5vPZ/oVn4vY4Ynel7k9FzqtOIw=
 go.opencensus.io v0.22.5/go.mod h1:5pWMHQbX5EPX2/62yrJeAkowc+lfs/XD7Uxpq3pI6kk=
 go.opencensus.io v0.23.0 h1:gqCw0LfLxScz8irSi8exQc7fyQ0fKQU/qnC/X8+V/1M=
 go.opencensus.io v0.23.0/go.mod h1:XItmlyltB5F7CS4xOC1DcqMoFqwtC6OG2xF7mCv7P7E=
-go.opentelemetry.io/collector v0.23.0 h1:IdLOPZfTwiL+XndzOYOBEWgLGetuE8b3O2hw0m0wQXk=
-go.opentelemetry.io/collector v0.23.0/go.mod h1:wMTwy0/4xrFRZj/XX1UH5VAd0WAVts9Rq7ZKQldCIkU=
+go.opentelemetry.io/collector v0.23.1-0.20210323233523-a65a5a697891 h1:cMbD3VtEByqG+6hl7kIIF0sMVd0A0IkxK/L2u6CNSsc=
+go.opentelemetry.io/collector v0.23.1-0.20210323233523-a65a5a697891/go.mod h1:wMTwy0/4xrFRZj/XX1UH5VAd0WAVts9Rq7ZKQldCIkU=
 go.opentelemetry.io/otel v0.19.0 h1:Lenfy7QHRXPZVsw/12CWpxX6d/JkrX8wrx2vO8G80Ng=
 go.opentelemetry.io/otel v0.19.0/go.mod h1:j9bF567N9EfomkSidSfmMwIwIBuP37AMAIzVW85OxSg=
 go.opentelemetry.io/otel/metric v0.19.0/go.mod h1:8f9fglJPRnXuskQmKpnad31lcLJ2VmNNqIsx/uIwBSc=

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.23.0
+ go.opentelemetry.io/collector v0.23.1-0.20210323233523-a65a5a697891
  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
@@ -1081,8 +1081,8 @@ go.opencensus.io v0.22.4/go.mod h1:yxeiOL68Rb0Xd1ddK5vPZ/oVn4vY4Ynel7k9FzqtOIw=
 go.opencensus.io v0.22.5/go.mod h1:5pWMHQbX5EPX2/62yrJeAkowc+lfs/XD7Uxpq3pI6kk=
 go.opencensus.io v0.23.0 h1:gqCw0LfLxScz8irSi8exQc7fyQ0fKQU/qnC/X8+V/1M=
 go.opencensus.io v0.23.0/go.mod h1:XItmlyltB5F7CS4xOC1DcqMoFqwtC6OG2xF7mCv7P7E=
-go.opentelemetry.io/collector v0.23.0 h1:IdLOPZfTwiL+XndzOYOBEWgLGetuE8b3O2hw0m0wQXk=
-go.opentelemetry.io/collector v0.23.0/go.mod h1:wMTwy0/4xrFRZj/XX1UH5VAd0WAVts9Rq7ZKQldCIkU=
+go.opentelemetry.io/collector v0.23.1-0.20210323233523-a65a5a697891 h1:cMbD3VtEByqG+6hl7kIIF0sMVd0A0IkxK/L2u6CNSsc=
+go.opentelemetry.io/collector v0.23.1-0.20210323233523-a65a5a697891/go.mod h1:wMTwy0/4xrFRZj/XX1UH5VAd0WAVts9Rq7ZKQldCIkU=
 go.uber.org/atomic v1.3.2/go.mod h1:gD2HeocX3+yG+ygLZcrzQJaqmWj9AIm7n08wl/qW/PE=
 go.uber.org/atomic v1.4.0/go.mod h1:gD2HeocX3+yG+ygLZcrzQJaqmWj9AIm7n08wl/qW/PE=
 go.uber.org/atomic v1.5.0/go.mod h1:sABNBOSYdrvTF6hTgEIbc7YasKWGhgEQZyfxyTvoXHQ=

diff --git a/exporter/awsprometheusremotewriteexporter/go.mod b/exporter/awsprometheusremotewriteexporter/go.mod
@@ -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.23.0
+ go.opentelemetry.io/collector v0.23.1-0.20210323233523-a65a5a697891
  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
@@ -1051,8 +1051,8 @@ go.opencensus.io v0.22.4/go.mod h1:yxeiOL68Rb0Xd1ddK5vPZ/oVn4vY4Ynel7k9FzqtOIw=
 go.opencensus.io v0.22.5/go.mod h1:5pWMHQbX5EPX2/62yrJeAkowc+lfs/XD7Uxpq3pI6kk=
 go.opencensus.io v0.23.0 h1:gqCw0LfLxScz8irSi8exQc7fyQ0fKQU/qnC/X8+V/1M=
 go.opencensus.io v0.23.0/go.mod h1:XItmlyltB5F7CS4xOC1DcqMoFqwtC6OG2xF7mCv7P7E=
-go.opentelemetry.io/collector v0.23.0 h1:IdLOPZfTwiL+XndzOYOBEWgLGetuE8b3O2hw0m0wQXk=
-go.opentelemetry.io/collector v0.23.0/go.mod h1:wMTwy0/4xrFRZj/XX1UH5VAd0WAVts9Rq7ZKQldCIkU=
+go.opentelemetry.io/collector v0.23.1-0.20210323233523-a65a5a697891 h1:cMbD3VtEByqG+6hl7kIIF0sMVd0A0IkxK/L2u6CNSsc=
+go.opentelemetry.io/collector v0.23.1-0.20210323233523-a65a5a697891/go.mod h1:wMTwy0/4xrFRZj/XX1UH5VAd0WAVts9Rq7ZKQldCIkU=
 go.uber.org/atomic v1.3.2/go.mod h1:gD2HeocX3+yG+ygLZcrzQJaqmWj9AIm7n08wl/qW/PE=
 go.uber.org/atomic v1.4.0/go.mod h1:gD2HeocX3+yG+ygLZcrzQJaqmWj9AIm7n08wl/qW/PE=
 go.uber.org/atomic v1.5.0/go.mod h1:sABNBOSYdrvTF6hTgEIbc7YasKWGhgEQZyfxyTvoXHQ=

diff --git a/exporter/awsxrayexporter/go.mod b/exporter/awsxrayexporter/go.mod
@@ -14,7 +14,7 @@ require (
  github.com/open-telemetry/opentelemetry-collector-contrib/internal/awsxray v0.0.0-00010101000000-000000000000
  github.com/pelletier/go-toml v1.8.0 // indirect
  github.com/stretchr/testify v1.7.0
- go.opentelemetry.io/collector v0.23.0
+ go.opentelemetry.io/collector v0.23.1-0.20210323233523-a65a5a697891
  go.uber.org/zap v1.16.0
  golang.org/x/net v0.0.0-20210119194325-5f4716e94777
  gopkg.in/ini.v1 v1.57.0 // indirect

diff --git a/exporter/awsxrayexporter/go.sum b/exporter/awsxrayexporter/go.sum
@@ -1051,8 +1051,8 @@ go.opencensus.io v0.22.4/go.mod h1:yxeiOL68Rb0Xd1ddK5vPZ/oVn4vY4Ynel7k9FzqtOIw=
 go.opencensus.io v0.22.5/go.mod h1:5pWMHQbX5EPX2/62yrJeAkowc+lfs/XD7Uxpq3pI6kk=
 go.opencensus.io v0.23.0 h1:gqCw0LfLxScz8irSi8exQc7fyQ0fKQU/qnC/X8+V/1M=
 go.opencensus.io v0.23.0/go.mod h1:XItmlyltB5F7CS4xOC1DcqMoFqwtC6OG2xF7mCv7P7E=
-go.opentelemetry.io/collector v0.23.0 h1:IdLOPZfTwiL+XndzOYOBEWgLGetuE8b3O2hw0m0wQXk=
-go.opentelemetry.io/collector v0.23.0/go.mod h1:wMTwy0/4xrFRZj/XX1UH5VAd0WAVts9Rq7ZKQldCIkU=
+go.opentelemetry.io/collector v0.23.1-0.20210323233523-a65a5a697891 h1:cMbD3VtEByqG+6hl7kIIF0sMVd0A0IkxK/L2u6CNSsc=
+go.opentelemetry.io/collector v0.23.1-0.20210323233523-a65a5a697891/go.mod h1:wMTwy0/4xrFRZj/XX1UH5VAd0WAVts9Rq7ZKQldCIkU=
 go.uber.org/atomic v1.3.2/go.mod h1:gD2HeocX3+yG+ygLZcrzQJaqmWj9AIm7n08wl/qW/PE=
 go.uber.org/atomic v1.4.0/go.mod h1:gD2HeocX3+yG+ygLZcrzQJaqmWj9AIm7n08wl/qW/PE=
 go.uber.org/atomic v1.5.0/go.mod h1:sABNBOSYdrvTF6hTgEIbc7YasKWGhgEQZyfxyTvoXHQ=

diff --git a/exporter/azuremonitorexporter/go.mod b/exporter/azuremonitorexporter/go.mod
@@ -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.23.0
+ go.opentelemetry.io/collector v0.23.1-0.20210323233523-a65a5a697891
  go.uber.org/zap v1.16.0
  golang.org/x/net v0.0.0-20210119194325-5f4716e94777
  gopkg.in/ini.v1 v1.57.0 // indirect

diff --git a/exporter/azuremonitorexporter/go.sum b/exporter/azuremonitorexporter/go.sum
@@ -1061,8 +1061,8 @@ go.opencensus.io v0.22.4/go.mod h1:yxeiOL68Rb0Xd1ddK5vPZ/oVn4vY4Ynel7k9FzqtOIw=
 go.opencensus.io v0.22.5/go.mod h1:5pWMHQbX5EPX2/62yrJeAkowc+lfs/XD7Uxpq3pI6kk=
 go.opencensus.io v0.23.0 h1:gqCw0LfLxScz8irSi8exQc7fyQ0fKQU/qnC/X8+V/1M=
 go.opencensus.io v0.23.0/go.mod h1:XItmlyltB5F7CS4xOC1DcqMoFqwtC6OG2xF7mCv7P7E=
-go.opentelemetry.io/collector v0.23.0 h1:IdLOPZfTwiL+XndzOYOBEWgLGetuE8b3O2hw0m0wQXk=
-go.opentelemetry.io/collector v0.23.0/go.mod h1:wMTwy0/4xrFRZj/XX1UH5VAd0WAVts9Rq7ZKQldCIkU=
+go.opentelemetry.io/collector v0.23.1-0.20210323233523-a65a5a697891 h1:cMbD3VtEByqG+6hl7kIIF0sMVd0A0IkxK/L2u6CNSsc=
+go.opentelemetry.io/collector v0.23.1-0.20210323233523-a65a5a697891/go.mod h1:wMTwy0/4xrFRZj/XX1UH5VAd0WAVts9Rq7ZKQldCIkU=
 go.uber.org/atomic v1.3.2/go.mod h1:gD2HeocX3+yG+ygLZcrzQJaqmWj9AIm7n08wl/qW/PE=
 go.uber.org/atomic v1.4.0/go.mod h1:gD2HeocX3+yG+ygLZcrzQJaqmWj9AIm7n08wl/qW/PE=
 go.uber.org/atomic v1.5.0/go.mod h1:sABNBOSYdrvTF6hTgEIbc7YasKWGhgEQZyfxyTvoXHQ=

diff --git a/exporter/carbonexporter/go.mod b/exporter/carbonexporter/go.mod
@@ -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.23.0
+ go.opentelemetry.io/collector v0.23.1-0.20210323233523-a65a5a697891
  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
@@ -1050,8 +1050,8 @@ go.opencensus.io v0.22.4/go.mod h1:yxeiOL68Rb0Xd1ddK5vPZ/oVn4vY4Ynel7k9FzqtOIw=
 go.opencensus.io v0.22.5/go.mod h1:5pWMHQbX5EPX2/62yrJeAkowc+lfs/XD7Uxpq3pI6kk=
 go.opencensus.io v0.23.0 h1:gqCw0LfLxScz8irSi8exQc7fyQ0fKQU/qnC/X8+V/1M=
 go.opencensus.io v0.23.0/go.mod h1:XItmlyltB5F7CS4xOC1DcqMoFqwtC6OG2xF7mCv7P7E=
-go.opentelemetry.io/collector v0.23.0 h1:IdLOPZfTwiL+XndzOYOBEWgLGetuE8b3O2hw0m0wQXk=
-go.opentelemetry.io/collector v0.23.0/go.mod h1:wMTwy0/4xrFRZj/XX1UH5VAd0WAVts9Rq7ZKQldCIkU=
+go.opentelemetry.io/collector v0.23.1-0.20210323233523-a65a5a697891 h1:cMbD3VtEByqG+6hl7kIIF0sMVd0A0IkxK/L2u6CNSsc=
+go.opentelemetry.io/collector v0.23.1-0.20210323233523-a65a5a697891/go.mod h1:wMTwy0/4xrFRZj/XX1UH5VAd0WAVts9Rq7ZKQldCIkU=
 go.uber.org/atomic v1.3.2/go.mod h1:gD2HeocX3+yG+ygLZcrzQJaqmWj9AIm7n08wl/qW/PE=
 go.uber.org/atomic v1.4.0/go.mod h1:gD2HeocX3+yG+ygLZcrzQJaqmWj9AIm7n08wl/qW/PE=
 go.uber.org/atomic v1.5.0/go.mod h1:sABNBOSYdrvTF6hTgEIbc7YasKWGhgEQZyfxyTvoXHQ=

diff --git a/exporter/datadogexporter/go.mod b/exporter/datadogexporter/go.mod
@@ -19,7 +19,7 @@ require (
  github.com/pelletier/go-toml v1.8.0 // indirect
  github.com/stretchr/testify v1.7.0
  github.com/zorkian/go-datadog-api v2.29.0+incompatible // indirect
- go.opentelemetry.io/collector v0.23.0
+ go.opentelemetry.io/collector v0.23.1-0.20210323233523-a65a5a697891
  go.uber.org/zap v1.16.0
  gopkg.in/DataDog/dd-trace-go.v1 v1.28.0
  gopkg.in/ini.v1 v1.57.0 // indirect

diff --git a/exporter/datadogexporter/go.sum b/exporter/datadogexporter/go.sum
@@ -1081,8 +1081,8 @@ go.opencensus.io v0.22.4/go.mod h1:yxeiOL68Rb0Xd1ddK5vPZ/oVn4vY4Ynel7k9FzqtOIw=
 go.opencensus.io v0.22.5/go.mod h1:5pWMHQbX5EPX2/62yrJeAkowc+lfs/XD7Uxpq3pI6kk=
 go.opencensus.io v0.23.0 h1:gqCw0LfLxScz8irSi8exQc7fyQ0fKQU/qnC/X8+V/1M=
 go.opencensus.io v0.23.0/go.mod h1:XItmlyltB5F7CS4xOC1DcqMoFqwtC6OG2xF7mCv7P7E=
-go.opentelemetry.io/collector v0.23.0 h1:IdLOPZfTwiL+XndzOYOBEWgLGetuE8b3O2hw0m0wQXk=
-go.opentelemetry.io/collector v0.23.0/go.mod h1:wMTwy0/4xrFRZj/XX1UH5VAd0WAVts9Rq7ZKQldCIkU=
+go.opentelemetry.io/collector v0.23.1-0.20210323233523-a65a5a697891 h1:cMbD3VtEByqG+6hl7kIIF0sMVd0A0IkxK/L2u6CNSsc=
+go.opentelemetry.io/collector v0.23.1-0.20210323233523-a65a5a697891/go.mod h1:wMTwy0/4xrFRZj/XX1UH5VAd0WAVts9Rq7ZKQldCIkU=
 go.uber.org/atomic v1.3.2/go.mod h1:gD2HeocX3+yG+ygLZcrzQJaqmWj9AIm7n08wl/qW/PE=
 go.uber.org/atomic v1.4.0/go.mod h1:gD2HeocX3+yG+ygLZcrzQJaqmWj9AIm7n08wl/qW/PE=
 go.uber.org/atomic v1.5.0/go.mod h1:sABNBOSYdrvTF6hTgEIbc7YasKWGhgEQZyfxyTvoXHQ=

diff --git a/exporter/dynatraceexporter/go.mod b/exporter/dynatraceexporter/go.mod
@@ -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.23.0
+ go.opentelemetry.io/collector v0.23.1-0.20210323233523-a65a5a697891
  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
@@ -1050,8 +1050,8 @@ go.opencensus.io v0.22.4/go.mod h1:yxeiOL68Rb0Xd1ddK5vPZ/oVn4vY4Ynel7k9FzqtOIw=
 go.opencensus.io v0.22.5/go.mod h1:5pWMHQbX5EPX2/62yrJeAkowc+lfs/XD7Uxpq3pI6kk=
 go.opencensus.io v0.23.0 h1:gqCw0LfLxScz8irSi8exQc7fyQ0fKQU/qnC/X8+V/1M=
 go.opencensus.io v0.23.0/go.mod h1:XItmlyltB5F7CS4xOC1DcqMoFqwtC6OG2xF7mCv7P7E=
-go.opentelemetry.io/collector v0.23.0 h1:IdLOPZfTwiL+XndzOYOBEWgLGetuE8b3O2hw0m0wQXk=
-go.opentelemetry.io/collector v0.23.0/go.mod h1:wMTwy0/4xrFRZj/XX1UH5VAd0WAVts9Rq7ZKQldCIkU=
+go.opentelemetry.io/collector v0.23.1-0.20210323233523-a65a5a697891 h1:cMbD3VtEByqG+6hl7kIIF0sMVd0A0IkxK/L2u6CNSsc=
+go.opentelemetry.io/collector v0.23.1-0.20210323233523-a65a5a697891/go.mod h1:wMTwy0/4xrFRZj/XX1UH5VAd0WAVts9Rq7ZKQldCIkU=
 go.uber.org/atomic v1.3.2/go.mod h1:gD2HeocX3+yG+ygLZcrzQJaqmWj9AIm7n08wl/qW/PE=
 go.uber.org/atomic v1.4.0/go.mod h1:gD2HeocX3+yG+ygLZcrzQJaqmWj9AIm7n08wl/qW/PE=
 go.uber.org/atomic v1.5.0/go.mod h1:sABNBOSYdrvTF6hTgEIbc7YasKWGhgEQZyfxyTvoXHQ=

diff --git a/exporter/elasticexporter/exporter.go b/exporter/elasticexporter/exporter.go
@@ -54,7 +54,7 @@ func newElasticTraceExporter(
  errs = append(errs, err)
  }
  }
- return consumererror.CombineErrors(errs)
+ return consumererror.Combine(errs)
  })
 }
 
@@ -76,7 +76,7 @@ func newElasticMetricsExporter(
  errs = append(errs, err)
  }
  }
- return consumererror.CombineErrors(errs)
+ return consumererror.Combine(errs)
  })
 }
 
@@ -149,7 +149,7 @@ func (e *elasticExporter) ExportResourceSpans(ctx context.Context, rs pdata.Reso
  if err := e.sendEvents(ctx, &w); err != nil {
  return count, err
  }
- return len(errs), consumererror.CombineErrors(errs)
+ return len(errs), consumererror.Combine(errs)
 }
 
 // ExportResourceMetrics exports OTLP metrics to Elastic APM Server,
@@ -175,7 +175,7 @@ func (e *elasticExporter) ExportResourceMetrics(ctx context.Context, rm pdata.Re
  if err := e.sendEvents(ctx, &w); err != nil {
  return totalDropped, err
  }
- return totalDropped, consumererror.CombineErrors(errs)
+ return totalDropped, consumererror.Combine(errs)
 }
 
 func (e *elasticExporter) sendEvents(ctx context.Context, w *fastjson.Writer) error {

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.23.0
+ go.opentelemetry.io/collector v0.23.1-0.20210323233523-a65a5a697891
  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
@@ -1069,8 +1069,8 @@ go.opencensus.io v0.22.4/go.mod h1:yxeiOL68Rb0Xd1ddK5vPZ/oVn4vY4Ynel7k9FzqtOIw=
 go.opencensus.io v0.22.5/go.mod h1:5pWMHQbX5EPX2/62yrJeAkowc+lfs/XD7Uxpq3pI6kk=
 go.opencensus.io v0.23.0 h1:gqCw0LfLxScz8irSi8exQc7fyQ0fKQU/qnC/X8+V/1M=
 go.opencensus.io v0.23.0/go.mod h1:XItmlyltB5F7CS4xOC1DcqMoFqwtC6OG2xF7mCv7P7E=
-go.opentelemetry.io/collector v0.23.0 h1:IdLOPZfTwiL+XndzOYOBEWgLGetuE8b3O2hw0m0wQXk=
-go.opentelemetry.io/collector v0.23.0/go.mod h1:wMTwy0/4xrFRZj/XX1UH5VAd0WAVts9Rq7ZKQldCIkU=
+go.opentelemetry.io/collector v0.23.1-0.20210323233523-a65a5a697891 h1:cMbD3VtEByqG+6hl7kIIF0sMVd0A0IkxK/L2u6CNSsc=
+go.opentelemetry.io/collector v0.23.1-0.20210323233523-a65a5a697891/go.mod h1:wMTwy0/4xrFRZj/XX1UH5VAd0WAVts9Rq7ZKQldCIkU=
 go.uber.org/atomic v1.3.2/go.mod h1:gD2HeocX3+yG+ygLZcrzQJaqmWj9AIm7n08wl/qW/PE=
 go.uber.org/atomic v1.4.0/go.mod h1:gD2HeocX3+yG+ygLZcrzQJaqmWj9AIm7n08wl/qW/PE=
 go.uber.org/atomic v1.5.0/go.mod h1:sABNBOSYdrvTF6hTgEIbc7YasKWGhgEQZyfxyTvoXHQ=

diff --git a/exporter/elasticsearchexporter/go.mod b/exporter/elasticsearchexporter/go.mod
@@ -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.23.0
+ go.opentelemetry.io/collector v0.23.1-0.20210323233523-a65a5a697891
  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
@@ -1052,8 +1052,8 @@ go.opencensus.io v0.22.4/go.mod h1:yxeiOL68Rb0Xd1ddK5vPZ/oVn4vY4Ynel7k9FzqtOIw=
 go.opencensus.io v0.22.5/go.mod h1:5pWMHQbX5EPX2/62yrJeAkowc+lfs/XD7Uxpq3pI6kk=
 go.opencensus.io v0.23.0 h1:gqCw0LfLxScz8irSi8exQc7fyQ0fKQU/qnC/X8+V/1M=
 go.opencensus.io v0.23.0/go.mod h1:XItmlyltB5F7CS4xOC1DcqMoFqwtC6OG2xF7mCv7P7E=
-go.opentelemetry.io/collector v0.23.0 h1:IdLOPZfTwiL+XndzOYOBEWgLGetuE8b3O2hw0m0wQXk=
-go.opentelemetry.io/collector v0.23.0/go.mod h1:wMTwy0/4xrFRZj/XX1UH5VAd0WAVts9Rq7ZKQldCIkU=
+go.opentelemetry.io/collector v0.23.1-0.20210323233523-a65a5a697891 h1:cMbD3VtEByqG+6hl7kIIF0sMVd0A0IkxK/L2u6CNSsc=
+go.opentelemetry.io/collector v0.23.1-0.20210323233523-a65a5a697891/go.mod h1:wMTwy0/4xrFRZj/XX1UH5VAd0WAVts9Rq7ZKQldCIkU=
 go.uber.org/atomic v1.3.2/go.mod h1:gD2HeocX3+yG+ygLZcrzQJaqmWj9AIm7n08wl/qW/PE=
 go.uber.org/atomic v1.4.0/go.mod h1:gD2HeocX3+yG+ygLZcrzQJaqmWj9AIm7n08wl/qW/PE=
 go.uber.org/atomic v1.5.0/go.mod h1:sABNBOSYdrvTF6hTgEIbc7YasKWGhgEQZyfxyTvoXHQ=

diff --git a/exporter/f5cloudexporter/go.mod b/exporter/f5cloudexporter/go.mod
@@ -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.23.0
+ go.opentelemetry.io/collector v0.23.1-0.20210323233523-a65a5a697891
  go.uber.org/zap v1.16.0
  golang.org/x/oauth2 v0.0.0-20210313182246-cd4f82c27b84
  google.golang.org/api v0.42.0

diff --git a/exporter/f5cloudexporter/go.sum b/exporter/f5cloudexporter/go.sum
@@ -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.23.0 h1:IdLOPZfTwiL+XndzOYOBEWgLGetuE8b3O2hw0m0wQXk=
-go.opentelemetry.io/collector v0.23.0/go.mod h1:wMTwy0/4xrFRZj/XX1UH5VAd0WAVts9Rq7ZKQldCIkU=
+go.opentelemetry.io/collector v0.23.1-0.20210323233523-a65a5a697891 h1:cMbD3VtEByqG+6hl7kIIF0sMVd0A0IkxK/L2u6CNSsc=
+go.opentelemetry.io/collector v0.23.1-0.20210323233523-a65a5a697891/go.mod h1:wMTwy0/4xrFRZj/XX1UH5VAd0WAVts9Rq7ZKQldCIkU=
 go.uber.org/atomic v1.3.2/go.mod h1:gD2HeocX3+yG+ygLZcrzQJaqmWj9AIm7n08wl/qW/PE=
 go.uber.org/atomic v1.4.0/go.mod h1:gD2HeocX3+yG+ygLZcrzQJaqmWj9AIm7n08wl/qW/PE=
 go.uber.org/atomic v1.5.0/go.mod h1:sABNBOSYdrvTF6hTgEIbc7YasKWGhgEQZyfxyTvoXHQ=

diff --git a/exporter/googlecloudexporter/go.mod b/exporter/googlecloudexporter/go.mod
@@ -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.23.0
+ go.opentelemetry.io/collector v0.23.1-0.20210323233523-a65a5a697891
  go.opentelemetry.io/otel v0.19.0
  go.opentelemetry.io/otel/sdk v0.19.0
  go.opentelemetry.io/otel/trace v0.19.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.23.0 h1:IdLOPZfTwiL+XndzOYOBEWgLGetuE8b3O2hw0m0wQXk=
-go.opentelemetry.io/collector v0.23.0/go.mod h1:wMTwy0/4xrFRZj/XX1UH5VAd0WAVts9Rq7ZKQldCIkU=
+go.opentelemetry.io/collector v0.23.1-0.20210323233523-a65a5a697891 h1:cMbD3VtEByqG+6hl7kIIF0sMVd0A0IkxK/L2u6CNSsc=
+go.opentelemetry.io/collector v0.23.1-0.20210323233523-a65a5a697891/go.mod h1:wMTwy0/4xrFRZj/XX1UH5VAd0WAVts9Rq7ZKQldCIkU=
 go.opentelemetry.io/otel v0.19.0 h1:Lenfy7QHRXPZVsw/12CWpxX6d/JkrX8wrx2vO8G80Ng=
 go.opentelemetry.io/otel v0.19.0/go.mod h1:j9bF567N9EfomkSidSfmMwIwIBuP37AMAIzVW85OxSg=
 go.opentelemetry.io/otel/metric v0.19.0 h1:dtZ1Ju44gkJkYvo+3qGqVXmf88tc+a42edOywypengg=

diff --git a/exporter/googlecloudexporter/googlecloud.go b/exporter/googlecloudexporter/googlecloud.go
@@ -238,7 +238,7 @@ func (te *traceExporter) pushTraces(ctx context.Context, td pdata.Traces) error
  if err != nil {
  errs = append(errs, err)
  }
- return consumererror.CombineErrors(errs)
+ return consumererror.Combine(errs)
 }
 
 func numPoints(metrics []*metricspb.Metric) int {

diff --git a/exporter/honeycombexporter/go.mod b/exporter/honeycombexporter/go.mod
@@ -16,7 +16,7 @@ require (
  github.com/onsi/gomega v1.10.2 // indirect
  github.com/pelletier/go-toml v1.8.0 // indirect
  github.com/stretchr/testify v1.7.0
- go.opentelemetry.io/collector v0.23.0
+ go.opentelemetry.io/collector v0.23.1-0.20210323233523-a65a5a697891
  go.uber.org/zap v1.16.0
  google.golang.org/protobuf v1.26.0
  gopkg.in/ini.v1 v1.57.0 // indirect