Upgrade to latest core, fix after ReceiverContext removal (#4120)

Signed-off-by: Bogdan Drutu <[email protected]>
open-telemetry · Jul 5, 2021 · 0e6a714 · 0e6a714
1 parent 598d8d8
commit 0e6a714
Show file tree

Hide file tree

Showing 186 changed files with 552 additions and 592 deletions.
diff --git a/exporter/alibabacloudlogserviceexporter/go.mod b/exporter/alibabacloudlogserviceexporter/go.mod
@@ -7,9 +7,9 @@ require (
 	github.com/census-instrumentation/opencensus-proto v0.3.0
 	github.com/gogo/protobuf v1.3.2
 	github.com/stretchr/testify v1.7.0
-	go.opentelemetry.io/collector v0.29.1-0.20210702174635-c64d1f096bda
+	go.opentelemetry.io/collector v0.29.1-0.20210702192737-aaa6d7d6b859
 	go.opentelemetry.io/collector/model v0.0.0-00010101000000-000000000000
 	go.uber.org/zap v1.18.1
 )
 
-replace go.opentelemetry.io/collector/model => go.opentelemetry.io/collector/model v0.0.0-20210702174635-c64d1f096bda
+replace go.opentelemetry.io/collector/model => go.opentelemetry.io/collector/model v0.0.0-20210702192737-aaa6d7d6b859
diff --git a/exporter/alibabacloudlogserviceexporter/go.sum b/exporter/alibabacloudlogserviceexporter/go.sum
@@ -1082,10 +1082,10 @@ 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.29.1-0.20210702174635-c64d1f096bda h1:a3IzQxCBnGwJsrJ5U9IXQfaeESqG/+M4os7ZnBHk0ZE=
-go.opentelemetry.io/collector v0.29.1-0.20210702174635-c64d1f096bda/go.mod h1:Nq+2WfnBdPjYwqe7neiuzXy16ldeqrcZ68Sqnd3KOQM=
-go.opentelemetry.io/collector/model v0.0.0-20210702174635-c64d1f096bda h1:SLeiLJff6F0l+4i035YgOYtVdiZ6teVgNTa0Bj/Bfm4=
-go.opentelemetry.io/collector/model v0.0.0-20210702174635-c64d1f096bda/go.mod h1:PcHNnM+RUl0uD8VkSn93PO78N7kQYhfqpI/eki57pl4=
+go.opentelemetry.io/collector v0.29.1-0.20210702192737-aaa6d7d6b859 h1:ozVB9FzXlaFJ1NvaDFu9oZdRYXYUjuarA/T7wKK6o7I=
+go.opentelemetry.io/collector v0.29.1-0.20210702192737-aaa6d7d6b859/go.mod h1:Nq+2WfnBdPjYwqe7neiuzXy16ldeqrcZ68Sqnd3KOQM=
+go.opentelemetry.io/collector/model v0.0.0-20210702192737-aaa6d7d6b859 h1:hj4y9jjhkscidSdWMsCDGCo9gCMIOgeqOCBiH/AoSFs=
+go.opentelemetry.io/collector/model v0.0.0-20210702192737-aaa6d7d6b859/go.mod h1:PcHNnM+RUl0uD8VkSn93PO78N7kQYhfqpI/eki57pl4=
 go.opentelemetry.io/proto/otlp v0.7.0/go.mod h1:PqfVotwruBrMGOCsRd/89rSnXhoiJIqeYNgFYFoEGnI=
 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=

diff --git a/exporter/awscloudwatchlogsexporter/go.mod b/exporter/awscloudwatchlogsexporter/go.mod
@@ -5,9 +5,9 @@ go 1.14
 require (
 	github.com/aws/aws-sdk-go v1.38.60
 	github.com/stretchr/testify v1.7.0
-	go.opentelemetry.io/collector v0.29.1-0.20210702174635-c64d1f096bda
+	go.opentelemetry.io/collector v0.29.1-0.20210702192737-aaa6d7d6b859
 	go.opentelemetry.io/collector/model v0.0.0-00010101000000-000000000000
 	go.uber.org/zap v1.18.1
 )
 
-replace go.opentelemetry.io/collector/model => go.opentelemetry.io/collector/model v0.0.0-20210702174635-c64d1f096bda
+replace go.opentelemetry.io/collector/model => go.opentelemetry.io/collector/model v0.0.0-20210702192737-aaa6d7d6b859
diff --git a/exporter/awscloudwatchlogsexporter/go.sum b/exporter/awscloudwatchlogsexporter/go.sum
@@ -1063,10 +1063,10 @@ 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.29.1-0.20210702174635-c64d1f096bda h1:a3IzQxCBnGwJsrJ5U9IXQfaeESqG/+M4os7ZnBHk0ZE=
-go.opentelemetry.io/collector v0.29.1-0.20210702174635-c64d1f096bda/go.mod h1:Nq+2WfnBdPjYwqe7neiuzXy16ldeqrcZ68Sqnd3KOQM=
-go.opentelemetry.io/collector/model v0.0.0-20210702174635-c64d1f096bda h1:SLeiLJff6F0l+4i035YgOYtVdiZ6teVgNTa0Bj/Bfm4=
-go.opentelemetry.io/collector/model v0.0.0-20210702174635-c64d1f096bda/go.mod h1:PcHNnM+RUl0uD8VkSn93PO78N7kQYhfqpI/eki57pl4=
+go.opentelemetry.io/collector v0.29.1-0.20210702192737-aaa6d7d6b859 h1:ozVB9FzXlaFJ1NvaDFu9oZdRYXYUjuarA/T7wKK6o7I=
+go.opentelemetry.io/collector v0.29.1-0.20210702192737-aaa6d7d6b859/go.mod h1:Nq+2WfnBdPjYwqe7neiuzXy16ldeqrcZ68Sqnd3KOQM=
+go.opentelemetry.io/collector/model v0.0.0-20210702192737-aaa6d7d6b859 h1:hj4y9jjhkscidSdWMsCDGCo9gCMIOgeqOCBiH/AoSFs=
+go.opentelemetry.io/collector/model v0.0.0-20210702192737-aaa6d7d6b859/go.mod h1:PcHNnM+RUl0uD8VkSn93PO78N7kQYhfqpI/eki57pl4=
 go.opentelemetry.io/proto/otlp v0.7.0/go.mod h1:PqfVotwruBrMGOCsRd/89rSnXhoiJIqeYNgFYFoEGnI=
 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=

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.29.1-0.20210702174635-c64d1f096bda
+	go.opentelemetry.io/collector v0.29.1-0.20210702192737-aaa6d7d6b859
 	go.opentelemetry.io/collector/model v0.0.0-00010101000000-000000000000
 	go.uber.org/zap v1.18.1
 	google.golang.org/protobuf v1.27.1
@@ -21,4 +21,4 @@ replace github.com/open-telemetry/opentelemetry-collector-contrib/internal/aws/m
 
 replace github.com/open-telemetry/opentelemetry-collector-contrib/internal/aws/awsutil => ./../../internal/aws/awsutil
 
-replace go.opentelemetry.io/collector/model => go.opentelemetry.io/collector/model v0.0.0-20210702174635-c64d1f096bda
+replace go.opentelemetry.io/collector/model => go.opentelemetry.io/collector/model v0.0.0-20210702192737-aaa6d7d6b859
diff --git a/exporter/awsemfexporter/go.sum b/exporter/awsemfexporter/go.sum
@@ -1175,10 +1175,10 @@ 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.29.1-0.20210702174635-c64d1f096bda h1:a3IzQxCBnGwJsrJ5U9IXQfaeESqG/+M4os7ZnBHk0ZE=
-go.opentelemetry.io/collector v0.29.1-0.20210702174635-c64d1f096bda/go.mod h1:Nq+2WfnBdPjYwqe7neiuzXy16ldeqrcZ68Sqnd3KOQM=
-go.opentelemetry.io/collector/model v0.0.0-20210702174635-c64d1f096bda h1:SLeiLJff6F0l+4i035YgOYtVdiZ6teVgNTa0Bj/Bfm4=
-go.opentelemetry.io/collector/model v0.0.0-20210702174635-c64d1f096bda/go.mod h1:PcHNnM+RUl0uD8VkSn93PO78N7kQYhfqpI/eki57pl4=
+go.opentelemetry.io/collector v0.29.1-0.20210702192737-aaa6d7d6b859 h1:ozVB9FzXlaFJ1NvaDFu9oZdRYXYUjuarA/T7wKK6o7I=
+go.opentelemetry.io/collector v0.29.1-0.20210702192737-aaa6d7d6b859/go.mod h1:Nq+2WfnBdPjYwqe7neiuzXy16ldeqrcZ68Sqnd3KOQM=
+go.opentelemetry.io/collector/model v0.0.0-20210702192737-aaa6d7d6b859 h1:hj4y9jjhkscidSdWMsCDGCo9gCMIOgeqOCBiH/AoSFs=
+go.opentelemetry.io/collector/model v0.0.0-20210702192737-aaa6d7d6b859/go.mod h1:PcHNnM+RUl0uD8VkSn93PO78N7kQYhfqpI/eki57pl4=
 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
@@ -6,10 +6,10 @@ require (
 	github.com/mattn/go-colorable v0.1.7 // indirect
 	github.com/signalfx/opencensus-go-exporter-kinesis v0.6.3
 	github.com/stretchr/testify v1.7.0
-	go.opentelemetry.io/collector v0.29.1-0.20210702174635-c64d1f096bda
+	go.opentelemetry.io/collector v0.29.1-0.20210702192737-aaa6d7d6b859
 	go.opentelemetry.io/collector/model v0.0.0-00010101000000-000000000000
 	go.uber.org/zap v1.18.1
 	gopkg.in/square/go-jose.v2 v2.5.1 // indirect
 )
 
-replace go.opentelemetry.io/collector/model => go.opentelemetry.io/collector/model v0.0.0-20210702174635-c64d1f096bda
+replace go.opentelemetry.io/collector/model => go.opentelemetry.io/collector/model v0.0.0-20210702192737-aaa6d7d6b859
diff --git a/exporter/awskinesisexporter/go.sum b/exporter/awskinesisexporter/go.sum
@@ -1206,10 +1206,10 @@ 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.29.1-0.20210702174635-c64d1f096bda h1:a3IzQxCBnGwJsrJ5U9IXQfaeESqG/+M4os7ZnBHk0ZE=
-go.opentelemetry.io/collector v0.29.1-0.20210702174635-c64d1f096bda/go.mod h1:Nq+2WfnBdPjYwqe7neiuzXy16ldeqrcZ68Sqnd3KOQM=
-go.opentelemetry.io/collector/model v0.0.0-20210702174635-c64d1f096bda h1:SLeiLJff6F0l+4i035YgOYtVdiZ6teVgNTa0Bj/Bfm4=
-go.opentelemetry.io/collector/model v0.0.0-20210702174635-c64d1f096bda/go.mod h1:PcHNnM+RUl0uD8VkSn93PO78N7kQYhfqpI/eki57pl4=
+go.opentelemetry.io/collector v0.29.1-0.20210702192737-aaa6d7d6b859 h1:ozVB9FzXlaFJ1NvaDFu9oZdRYXYUjuarA/T7wKK6o7I=
+go.opentelemetry.io/collector v0.29.1-0.20210702192737-aaa6d7d6b859/go.mod h1:Nq+2WfnBdPjYwqe7neiuzXy16ldeqrcZ68Sqnd3KOQM=
+go.opentelemetry.io/collector/model v0.0.0-20210702192737-aaa6d7d6b859 h1:hj4y9jjhkscidSdWMsCDGCo9gCMIOgeqOCBiH/AoSFs=
+go.opentelemetry.io/collector/model v0.0.0-20210702192737-aaa6d7d6b859/go.mod h1:PcHNnM+RUl0uD8VkSn93PO78N7kQYhfqpI/eki57pl4=
 go.opentelemetry.io/proto/otlp v0.7.0/go.mod h1:PqfVotwruBrMGOCsRd/89rSnXhoiJIqeYNgFYFoEGnI=
 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=

diff --git a/exporter/awsprometheusremotewriteexporter/go.mod b/exporter/awsprometheusremotewriteexporter/go.mod
@@ -6,9 +6,9 @@ require (
 	github.com/aws/aws-sdk-go v1.38.69
 	github.com/mattn/go-colorable v0.1.7 // indirect
 	github.com/stretchr/testify v1.7.0
-	go.opentelemetry.io/collector v0.29.1-0.20210702174635-c64d1f096bda
+	go.opentelemetry.io/collector v0.29.1-0.20210702192737-aaa6d7d6b859
 	go.uber.org/zap v1.18.1
 	gopkg.in/square/go-jose.v2 v2.5.1 // indirect
 )
 
-replace go.opentelemetry.io/collector/model => go.opentelemetry.io/collector/model v0.0.0-20210702174635-c64d1f096bda
+replace go.opentelemetry.io/collector/model => go.opentelemetry.io/collector/model v0.0.0-20210702192737-aaa6d7d6b859
diff --git a/exporter/awsprometheusremotewriteexporter/go.sum b/exporter/awsprometheusremotewriteexporter/go.sum
@@ -1174,10 +1174,10 @@ 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.29.1-0.20210702174635-c64d1f096bda h1:a3IzQxCBnGwJsrJ5U9IXQfaeESqG/+M4os7ZnBHk0ZE=
-go.opentelemetry.io/collector v0.29.1-0.20210702174635-c64d1f096bda/go.mod h1:Nq+2WfnBdPjYwqe7neiuzXy16ldeqrcZ68Sqnd3KOQM=
-go.opentelemetry.io/collector/model v0.0.0-20210702174635-c64d1f096bda h1:SLeiLJff6F0l+4i035YgOYtVdiZ6teVgNTa0Bj/Bfm4=
-go.opentelemetry.io/collector/model v0.0.0-20210702174635-c64d1f096bda/go.mod h1:PcHNnM+RUl0uD8VkSn93PO78N7kQYhfqpI/eki57pl4=
+go.opentelemetry.io/collector v0.29.1-0.20210702192737-aaa6d7d6b859 h1:ozVB9FzXlaFJ1NvaDFu9oZdRYXYUjuarA/T7wKK6o7I=
+go.opentelemetry.io/collector v0.29.1-0.20210702192737-aaa6d7d6b859/go.mod h1:Nq+2WfnBdPjYwqe7neiuzXy16ldeqrcZ68Sqnd3KOQM=
+go.opentelemetry.io/collector/model v0.0.0-20210702192737-aaa6d7d6b859 h1:hj4y9jjhkscidSdWMsCDGCo9gCMIOgeqOCBiH/AoSFs=
+go.opentelemetry.io/collector/model v0.0.0-20210702192737-aaa6d7d6b859/go.mod h1:PcHNnM+RUl0uD8VkSn93PO78N7kQYhfqpI/eki57pl4=
 go.opentelemetry.io/proto/otlp v0.7.0/go.mod h1:PqfVotwruBrMGOCsRd/89rSnXhoiJIqeYNgFYFoEGnI=
 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=

diff --git a/exporter/awsxrayexporter/go.mod b/exporter/awsxrayexporter/go.mod
@@ -8,7 +8,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/xray v0.0.0-00010101000000-000000000000
 	github.com/stretchr/testify v1.7.0
-	go.opentelemetry.io/collector v0.29.1-0.20210702174635-c64d1f096bda
+	go.opentelemetry.io/collector v0.29.1-0.20210702192737-aaa6d7d6b859
 	go.opentelemetry.io/collector/model v0.0.0-00010101000000-000000000000
 	go.uber.org/zap v1.18.1
 	gopkg.in/square/go-jose.v2 v2.5.1 // indirect
@@ -18,4 +18,4 @@ replace github.com/open-telemetry/opentelemetry-collector-contrib/internal/aws/x
 
 replace github.com/open-telemetry/opentelemetry-collector-contrib/internal/aws/awsutil => ./../../internal/aws/awsutil
 
-replace go.opentelemetry.io/collector/model => go.opentelemetry.io/collector/model v0.0.0-20210702174635-c64d1f096bda
+replace go.opentelemetry.io/collector/model => go.opentelemetry.io/collector/model v0.0.0-20210702192737-aaa6d7d6b859
diff --git a/exporter/awsxrayexporter/go.sum b/exporter/awsxrayexporter/go.sum
@@ -1175,10 +1175,10 @@ 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.29.1-0.20210702174635-c64d1f096bda h1:a3IzQxCBnGwJsrJ5U9IXQfaeESqG/+M4os7ZnBHk0ZE=
-go.opentelemetry.io/collector v0.29.1-0.20210702174635-c64d1f096bda/go.mod h1:Nq+2WfnBdPjYwqe7neiuzXy16ldeqrcZ68Sqnd3KOQM=
-go.opentelemetry.io/collector/model v0.0.0-20210702174635-c64d1f096bda h1:SLeiLJff6F0l+4i035YgOYtVdiZ6teVgNTa0Bj/Bfm4=
-go.opentelemetry.io/collector/model v0.0.0-20210702174635-c64d1f096bda/go.mod h1:PcHNnM+RUl0uD8VkSn93PO78N7kQYhfqpI/eki57pl4=
+go.opentelemetry.io/collector v0.29.1-0.20210702192737-aaa6d7d6b859 h1:ozVB9FzXlaFJ1NvaDFu9oZdRYXYUjuarA/T7wKK6o7I=
+go.opentelemetry.io/collector v0.29.1-0.20210702192737-aaa6d7d6b859/go.mod h1:Nq+2WfnBdPjYwqe7neiuzXy16ldeqrcZ68Sqnd3KOQM=
+go.opentelemetry.io/collector/model v0.0.0-20210702192737-aaa6d7d6b859 h1:hj4y9jjhkscidSdWMsCDGCo9gCMIOgeqOCBiH/AoSFs=
+go.opentelemetry.io/collector/model v0.0.0-20210702192737-aaa6d7d6b859/go.mod h1:PcHNnM+RUl0uD8VkSn93PO78N7kQYhfqpI/eki57pl4=
 go.opentelemetry.io/proto/otlp v0.7.0/go.mod h1:PqfVotwruBrMGOCsRd/89rSnXhoiJIqeYNgFYFoEGnI=
 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=

diff --git a/exporter/azuremonitorexporter/go.mod b/exporter/azuremonitorexporter/go.mod
@@ -7,11 +7,11 @@ require (
 	github.com/mattn/go-colorable v0.1.7 // indirect
 	github.com/microsoft/ApplicationInsights-Go v0.4.4
 	github.com/stretchr/testify v1.7.0
-	go.opentelemetry.io/collector v0.29.1-0.20210702174635-c64d1f096bda
+	go.opentelemetry.io/collector v0.29.1-0.20210702192737-aaa6d7d6b859
 	go.opentelemetry.io/collector/model v0.0.0-00010101000000-000000000000
 	go.uber.org/zap v1.18.1
 	golang.org/x/net v0.0.0-20210614182718-04defd469f4e
 	gopkg.in/square/go-jose.v2 v2.5.1 // indirect
 )
 
-replace go.opentelemetry.io/collector/model => go.opentelemetry.io/collector/model v0.0.0-20210702174635-c64d1f096bda
+replace go.opentelemetry.io/collector/model => go.opentelemetry.io/collector/model v0.0.0-20210702192737-aaa6d7d6b859
diff --git a/exporter/azuremonitorexporter/go.sum b/exporter/azuremonitorexporter/go.sum
@@ -1182,10 +1182,10 @@ 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.29.1-0.20210702174635-c64d1f096bda h1:a3IzQxCBnGwJsrJ5U9IXQfaeESqG/+M4os7ZnBHk0ZE=
-go.opentelemetry.io/collector v0.29.1-0.20210702174635-c64d1f096bda/go.mod h1:Nq+2WfnBdPjYwqe7neiuzXy16ldeqrcZ68Sqnd3KOQM=
-go.opentelemetry.io/collector/model v0.0.0-20210702174635-c64d1f096bda h1:SLeiLJff6F0l+4i035YgOYtVdiZ6teVgNTa0Bj/Bfm4=
-go.opentelemetry.io/collector/model v0.0.0-20210702174635-c64d1f096bda/go.mod h1:PcHNnM+RUl0uD8VkSn93PO78N7kQYhfqpI/eki57pl4=
+go.opentelemetry.io/collector v0.29.1-0.20210702192737-aaa6d7d6b859 h1:ozVB9FzXlaFJ1NvaDFu9oZdRYXYUjuarA/T7wKK6o7I=
+go.opentelemetry.io/collector v0.29.1-0.20210702192737-aaa6d7d6b859/go.mod h1:Nq+2WfnBdPjYwqe7neiuzXy16ldeqrcZ68Sqnd3KOQM=
+go.opentelemetry.io/collector/model v0.0.0-20210702192737-aaa6d7d6b859 h1:hj4y9jjhkscidSdWMsCDGCo9gCMIOgeqOCBiH/AoSFs=
+go.opentelemetry.io/collector/model v0.0.0-20210702192737-aaa6d7d6b859/go.mod h1:PcHNnM+RUl0uD8VkSn93PO78N7kQYhfqpI/eki57pl4=
 go.opentelemetry.io/proto/otlp v0.7.0/go.mod h1:PqfVotwruBrMGOCsRd/89rSnXhoiJIqeYNgFYFoEGnI=
 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=

diff --git a/exporter/carbonexporter/go.mod b/exporter/carbonexporter/go.mod
@@ -6,11 +6,11 @@ require (
 	github.com/census-instrumentation/opencensus-proto v0.3.0
 	github.com/mattn/go-colorable v0.1.7 // indirect
 	github.com/stretchr/testify v1.7.0
-	go.opentelemetry.io/collector v0.29.1-0.20210702174635-c64d1f096bda
+	go.opentelemetry.io/collector v0.29.1-0.20210702192737-aaa6d7d6b859
 	go.opentelemetry.io/collector/model v0.0.0-00010101000000-000000000000
 	go.uber.org/zap v1.18.1
 	google.golang.org/protobuf v1.27.1
 	gopkg.in/square/go-jose.v2 v2.5.1 // indirect
 )
 
-replace go.opentelemetry.io/collector/model => go.opentelemetry.io/collector/model v0.0.0-20210702174635-c64d1f096bda
+replace go.opentelemetry.io/collector/model => go.opentelemetry.io/collector/model v0.0.0-20210702192737-aaa6d7d6b859
diff --git a/exporter/carbonexporter/go.sum b/exporter/carbonexporter/go.sum
@@ -1172,10 +1172,10 @@ 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.29.1-0.20210702174635-c64d1f096bda h1:a3IzQxCBnGwJsrJ5U9IXQfaeESqG/+M4os7ZnBHk0ZE=
-go.opentelemetry.io/collector v0.29.1-0.20210702174635-c64d1f096bda/go.mod h1:Nq+2WfnBdPjYwqe7neiuzXy16ldeqrcZ68Sqnd3KOQM=
-go.opentelemetry.io/collector/model v0.0.0-20210702174635-c64d1f096bda h1:SLeiLJff6F0l+4i035YgOYtVdiZ6teVgNTa0Bj/Bfm4=
-go.opentelemetry.io/collector/model v0.0.0-20210702174635-c64d1f096bda/go.mod h1:PcHNnM+RUl0uD8VkSn93PO78N7kQYhfqpI/eki57pl4=
+go.opentelemetry.io/collector v0.29.1-0.20210702192737-aaa6d7d6b859 h1:ozVB9FzXlaFJ1NvaDFu9oZdRYXYUjuarA/T7wKK6o7I=
+go.opentelemetry.io/collector v0.29.1-0.20210702192737-aaa6d7d6b859/go.mod h1:Nq+2WfnBdPjYwqe7neiuzXy16ldeqrcZ68Sqnd3KOQM=
+go.opentelemetry.io/collector/model v0.0.0-20210702192737-aaa6d7d6b859 h1:hj4y9jjhkscidSdWMsCDGCo9gCMIOgeqOCBiH/AoSFs=
+go.opentelemetry.io/collector/model v0.0.0-20210702192737-aaa6d7d6b859/go.mod h1:PcHNnM+RUl0uD8VkSn93PO78N7kQYhfqpI/eki57pl4=
 go.opentelemetry.io/proto/otlp v0.7.0/go.mod h1:PqfVotwruBrMGOCsRd/89rSnXhoiJIqeYNgFYFoEGnI=
 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=

diff --git a/exporter/datadogexporter/go.mod b/exporter/datadogexporter/go.mod
@@ -13,7 +13,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.29.1-0.20210702174635-c64d1f096bda
+	go.opentelemetry.io/collector v0.29.1-0.20210702192737-aaa6d7d6b859
 	go.opentelemetry.io/collector/model v0.0.0-00010101000000-000000000000
 	go.uber.org/zap v1.18.1
 	gopkg.in/DataDog/dd-trace-go.v1 v1.31.1
@@ -23,4 +23,4 @@ require (
 
 replace github.com/open-telemetry/opentelemetry-collector-contrib/internal/common => ../../internal/common
 
-replace go.opentelemetry.io/collector/model => go.opentelemetry.io/collector/model v0.0.0-20210702174635-c64d1f096bda
+replace go.opentelemetry.io/collector/model => go.opentelemetry.io/collector/model v0.0.0-20210702192737-aaa6d7d6b859