Update core for 0.35.0 release (#5172)

Signed-off-by: Anthony J Mirabella <a9@aneurysm9.com>
open-telemetry · Sep 9, 2021 · 932f17a · 932f17a
1 parent e43696b
commit 932f17a
Show file tree

Hide file tree

Showing 257 changed files with 772 additions and 890 deletions.
diff --git a/cmd/configschema/go.mod b/cmd/configschema/go.mod
@@ -8,8 +8,8 @@ require (
 	github.com/open-telemetry/opentelemetry-collector-contrib v0.34.0
 	github.com/open-telemetry/opentelemetry-collector-contrib/pkg/resourcetotelemetry v0.34.0
 	github.com/stretchr/testify v1.7.0
-	go.opentelemetry.io/collector v0.34.1-0.20210908172238-e8bd3be6d4c3
-	go.opentelemetry.io/collector/model v0.34.1-0.20210908172238-e8bd3be6d4c3
+	go.opentelemetry.io/collector v0.35.0
+	go.opentelemetry.io/collector/model v0.35.0
 	golang.org/x/mod v0.4.2
 )
 
@@ -112,9 +112,9 @@ require (
 	github.com/honeycombio/libhoney-go v1.15.4 // indirect
 	github.com/iancoleman/strcase v0.2.0 // indirect
 	github.com/imdario/mergo v0.3.11 // indirect
-	github.com/influxdata/influxdb-observability/common v0.2.6 // indirect
-	github.com/influxdata/influxdb-observability/influx2otel v0.2.6 // indirect
-	github.com/influxdata/influxdb-observability/otel2influx v0.2.6 // indirect
+	github.com/influxdata/influxdb-observability/common v0.2.7 // indirect
+	github.com/influxdata/influxdb-observability/influx2otel v0.2.7 // indirect
+	github.com/influxdata/influxdb-observability/otel2influx v0.2.7 // indirect
 	github.com/influxdata/line-protocol/v2 v2.0.0-20210520103755-6551a972d603 // indirect
 	github.com/jaegertracing/jaeger v1.26.0 // indirect
 	github.com/jcmturner/aescts/v2 v2.0.0 // indirect

diff --git a/cmd/configschema/go.sum b/cmd/configschema/go.sum
@@ -1133,12 +1133,12 @@ github.com/influxdata/httprouter v1.3.1-0.20191122104820-ee83e2772f69/go.mod h1:
 github.com/influxdata/influxdb v1.8.0/go.mod h1:SIzcnsjaHRFpmlxpJ4S3NT64qtEKYweNTUMb/vh0OMQ=
 github.com/influxdata/influxdb v1.8.4/go.mod h1:JugdFhsvvI8gadxOI6noqNeeBHvWNTbfYGtiAn+2jhI=
 github.com/influxdata/influxdb v1.9.2/go.mod h1:UEe3MeD9AaP5rlPIes102IhYua3FhIWZuOXNHxDjSrI=
-github.com/influxdata/influxdb-observability/common v0.2.6 h1:mo8JUPWSMrhPSad0B9/M2Mx5r7TFm7nZYpHrHkiRkGY=
-github.com/influxdata/influxdb-observability/common v0.2.6/go.mod h1:mycCRjnw99xT1swTcCmG5+PWDYeVUkeSJIUm2nz0Ltw=
-github.com/influxdata/influxdb-observability/influx2otel v0.2.6 h1:X4zDckD5yikm0BfKR0bsidUMyfFuf7vngcnciP6Uo7I=
-github.com/influxdata/influxdb-observability/influx2otel v0.2.6/go.mod h1:EazOEcALeyUn+H1OFMmkxQEgfrt3VeM7/gdwNvP5xUY=
-github.com/influxdata/influxdb-observability/otel2influx v0.2.6 h1:UP0bwSxxtTxfvSLsEMBHtFuwqC94q82eNK40KJVnSLk=
-github.com/influxdata/influxdb-observability/otel2influx v0.2.6/go.mod h1:oAGCp8sJBJqY1ZtNdUJy5SIlvuLxpgKs/8S+TF+jxtg=
+github.com/influxdata/influxdb-observability/common v0.2.7 h1:C+oDh8Kbw+Ykx9yog/uJXL27rwMN3hgTLQfAFg1eQO0=
+github.com/influxdata/influxdb-observability/common v0.2.7/go.mod h1:+8VMGrfWZnXjc1c/oP+N4O/sHoneWgN3ojAHwgYgV4A=
+github.com/influxdata/influxdb-observability/influx2otel v0.2.7 h1:YIXH+qNQgAtTA5U3s/wxDxxh5Vz+ylhZhyuRxtfTBqs=
+github.com/influxdata/influxdb-observability/influx2otel v0.2.7/go.mod h1:ASyDMoPChvIgbEOvghwc5NxngOgXThp9MFKs7efNLtQ=
+github.com/influxdata/influxdb-observability/otel2influx v0.2.7 h1:FACov3tcGCKfEGXsyUbgUOQx3zXffXaCFbN3ntAzh1E=
+github.com/influxdata/influxdb-observability/otel2influx v0.2.7/go.mod h1:tE3OSy4RyAHIjxYlFZBsWorEM3aqaUeqSx3mbacm8KI=
 github.com/influxdata/influxdb1-client v0.0.0-20191209144304-8bf82d3c094d/go.mod h1:qj24IKcXYK6Iy9ceXlo3Tc+vtHo9lIhSX5JddghvEPo=
 github.com/influxdata/influxdb1-client v0.0.0-20200827194710-b269163b24ab/go.mod h1:qj24IKcXYK6Iy9ceXlo3Tc+vtHo9lIhSX5JddghvEPo=
 github.com/influxdata/influxql v1.1.0/go.mod h1:KpVI7okXjK6PRi3Z5B+mtKZli+R1DnZgb3N+tzevNgo=
@@ -2035,13 +2035,12 @@ 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.28.0/go.mod h1:AP/BTXwo1eedoJO7V+HQ68CSvJU1lcdqOzJCgt1VsNs=
 go.opentelemetry.io/collector v0.30.1/go.mod h1:ER3czrkP35ADgO89Q31KGljiQpPW09FKWrXRH61X4BM=
-go.opentelemetry.io/collector v0.34.1-0.20210908172238-e8bd3be6d4c3 h1:U2VOoWzv/n5VUYD/Zkj0T3G9cJrvNYWWNbSvZIs7WA0=
-go.opentelemetry.io/collector v0.34.1-0.20210908172238-e8bd3be6d4c3/go.mod h1:mmEZXsT+Bwxgl/BxmowtggjoQ4Wr8n02026H5FjnGHI=
+go.opentelemetry.io/collector v0.35.0 h1:e7kutiBxbyk9Gc0DkFDYxnWrmW9sAPpXbgFoQmof/kE=
+go.opentelemetry.io/collector v0.35.0/go.mod h1:mMW4VJHhy8CwoTenV75axteKd0aZhWHDZjcZ59V53kc=
 go.opentelemetry.io/collector/model v0.30.0/go.mod h1:PcHNnM+RUl0uD8VkSn93PO78N7kQYhfqpI/eki57pl4=
 go.opentelemetry.io/collector/model v0.30.2-0.20210719230137-809cae954ed3/go.mod h1:PcHNnM+RUl0uD8VkSn93PO78N7kQYhfqpI/eki57pl4=
-go.opentelemetry.io/collector/model v0.34.0/go.mod h1:+7YCSjJG+MqiIFjauzt7oM2qkqBsaJWh5hcsO4fwsAc=
-go.opentelemetry.io/collector/model v0.34.1-0.20210908172238-e8bd3be6d4c3 h1:pn8VUQV13gFzlRn7/slb4cBvMVZUnBAXAqiqUCKNDhA=
-go.opentelemetry.io/collector/model v0.34.1-0.20210908172238-e8bd3be6d4c3/go.mod h1:+7YCSjJG+MqiIFjauzt7oM2qkqBsaJWh5hcsO4fwsAc=
+go.opentelemetry.io/collector/model v0.35.0 h1:NpKjghiqlei4ecwjOYOMhD6tj4gY8yiWHPJmbFs/ArI=
+go.opentelemetry.io/collector/model v0.35.0/go.mod h1:+7YCSjJG+MqiIFjauzt7oM2qkqBsaJWh5hcsO4fwsAc=
 go.opentelemetry.io/contrib v0.20.0/go.mod h1:G/EtFaa6qaN7+LxqfIAT3GiZa7Wv5DTBUzl5H4LY0Kc=
 go.opentelemetry.io/contrib v0.21.0/go.mod h1:EH4yDYeNoaTqn/8yCWQmfNB78VHfGX2Jt2bvnvzBlGM=
 go.opentelemetry.io/contrib v0.22.0 h1:0F7gDEjgb1WGn4ODIjaCAg75hmqF+UN0LiVgwxsCodc=

diff --git a/exporter/alibabacloudlogserviceexporter/go.mod b/exporter/alibabacloudlogserviceexporter/go.mod
@@ -7,8 +7,8 @@ require (
 	github.com/gogo/protobuf v1.3.2
 	github.com/open-telemetry/opentelemetry-collector-contrib/internal/coreinternal v0.34.0
 	github.com/stretchr/testify v1.7.0
-	go.opentelemetry.io/collector v0.34.1-0.20210908172238-e8bd3be6d4c3
-	go.opentelemetry.io/collector/model v0.34.1-0.20210908172238-e8bd3be6d4c3
+	go.opentelemetry.io/collector v0.35.0
+	go.opentelemetry.io/collector/model v0.35.0
 	go.uber.org/zap v1.19.0
 )
 

diff --git a/exporter/alibabacloudlogserviceexporter/go.sum b/exporter/alibabacloudlogserviceexporter/go.sum
@@ -513,11 +513,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.34.1-0.20210908172238-e8bd3be6d4c3 h1:U2VOoWzv/n5VUYD/Zkj0T3G9cJrvNYWWNbSvZIs7WA0=
-go.opentelemetry.io/collector v0.34.1-0.20210908172238-e8bd3be6d4c3/go.mod h1:mmEZXsT+Bwxgl/BxmowtggjoQ4Wr8n02026H5FjnGHI=
-go.opentelemetry.io/collector/model v0.34.0/go.mod h1:+7YCSjJG+MqiIFjauzt7oM2qkqBsaJWh5hcsO4fwsAc=
-go.opentelemetry.io/collector/model v0.34.1-0.20210908172238-e8bd3be6d4c3 h1:pn8VUQV13gFzlRn7/slb4cBvMVZUnBAXAqiqUCKNDhA=
-go.opentelemetry.io/collector/model v0.34.1-0.20210908172238-e8bd3be6d4c3/go.mod h1:+7YCSjJG+MqiIFjauzt7oM2qkqBsaJWh5hcsO4fwsAc=
+go.opentelemetry.io/collector v0.35.0 h1:e7kutiBxbyk9Gc0DkFDYxnWrmW9sAPpXbgFoQmof/kE=
+go.opentelemetry.io/collector v0.35.0/go.mod h1:mMW4VJHhy8CwoTenV75axteKd0aZhWHDZjcZ59V53kc=
+go.opentelemetry.io/collector/model v0.35.0 h1:NpKjghiqlei4ecwjOYOMhD6tj4gY8yiWHPJmbFs/ArI=
+go.opentelemetry.io/collector/model v0.35.0/go.mod h1:+7YCSjJG+MqiIFjauzt7oM2qkqBsaJWh5hcsO4fwsAc=
 go.opentelemetry.io/contrib v0.22.0/go.mod h1:EH4yDYeNoaTqn/8yCWQmfNB78VHfGX2Jt2bvnvzBlGM=
 go.opentelemetry.io/contrib/instrumentation/google.golang.org/grpc/otelgrpc v0.22.0/go.mod h1:KjqwX4uJNaj479ZjFpADOMJKOM4rBXq4kN7nbeuGKrY=
 go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.22.0/go.mod h1:o3MuU25bYroYnc2TOKe8mTk8f9X1oPFO6C5RCoPKtSU=

diff --git a/exporter/alibabacloudlogserviceexporter/logsdata_to_logservice.go b/exporter/alibabacloudlogserviceexporter/logsdata_to_logservice.go
@@ -125,7 +125,7 @@ func instrumentationLibraryToLogContents(instrumentationLibrary pdata.Instrument
 func mapLogRecordToLogService(lr pdata.LogRecord,
 	resourceContents,
 	instrumentationLibraryContents []*sls.LogContent) *sls.Log {
-	if lr.Body().Type() == pdata.AttributeValueTypeNull {
+	if lr.Body().Type() == pdata.AttributeValueTypeEmpty {
 		return nil
 	}
 	var slsLog sls.Log

diff --git a/exporter/awscloudwatchlogsexporter/exporter.go b/exporter/awscloudwatchlogsexporter/exporter.go
@@ -235,7 +235,7 @@ func attrValue(value pdata.AttributeValue) interface{} {
 			values[i] = attrValue(arrayVal.At(i))
 		}
 		return values
-	case pdata.AttributeValueTypeNull:
+	case pdata.AttributeValueTypeEmpty:
 		return nil
 	default:
 		return nil

diff --git a/exporter/awscloudwatchlogsexporter/exporter_test.go b/exporter/awscloudwatchlogsexporter/exporter_test.go
@@ -128,7 +128,7 @@ func TestAttrValue(t *testing.T) {
 		{
 			name: "null",
 			builder: func() pdata.AttributeValue {
-				return pdata.NewAttributeValueNull()
+				return pdata.NewAttributeValueEmpty()
 			},
 			want: nil,
 		},
@@ -183,7 +183,7 @@ func TestAttrValue(t *testing.T) {
 					pdata.NewAttributeValueDouble(1.6),
 					pdata.NewAttributeValueBool(true),
 					pdata.NewAttributeValueString("hello"),
-					pdata.NewAttributeValueNull(),
+					pdata.NewAttributeValueEmpty(),
 				} {
 					tgt := arr.AppendEmpty()
 					av.CopyTo(tgt)

diff --git a/exporter/awscloudwatchlogsexporter/go.mod b/exporter/awscloudwatchlogsexporter/go.mod
@@ -5,8 +5,8 @@ go 1.17
 require (
 	github.com/aws/aws-sdk-go v1.40.38
 	github.com/stretchr/testify v1.7.0
-	go.opentelemetry.io/collector v0.34.1-0.20210908172238-e8bd3be6d4c3
-	go.opentelemetry.io/collector/model v0.34.1-0.20210908172238-e8bd3be6d4c3
+	go.opentelemetry.io/collector v0.35.0
+	go.opentelemetry.io/collector/model v0.35.0
 	go.uber.org/zap v1.19.0
 	golang.org/x/text v0.3.7 // indirect
 	golang.org/x/tools v0.1.3 // indirect

diff --git a/exporter/awscloudwatchlogsexporter/go.sum b/exporter/awscloudwatchlogsexporter/go.sum
@@ -376,11 +376,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.34.1-0.20210908172238-e8bd3be6d4c3 h1:U2VOoWzv/n5VUYD/Zkj0T3G9cJrvNYWWNbSvZIs7WA0=
-go.opentelemetry.io/collector v0.34.1-0.20210908172238-e8bd3be6d4c3/go.mod h1:mmEZXsT+Bwxgl/BxmowtggjoQ4Wr8n02026H5FjnGHI=
-go.opentelemetry.io/collector/model v0.34.0/go.mod h1:+7YCSjJG+MqiIFjauzt7oM2qkqBsaJWh5hcsO4fwsAc=
-go.opentelemetry.io/collector/model v0.34.1-0.20210908172238-e8bd3be6d4c3 h1:pn8VUQV13gFzlRn7/slb4cBvMVZUnBAXAqiqUCKNDhA=
-go.opentelemetry.io/collector/model v0.34.1-0.20210908172238-e8bd3be6d4c3/go.mod h1:+7YCSjJG+MqiIFjauzt7oM2qkqBsaJWh5hcsO4fwsAc=
+go.opentelemetry.io/collector v0.35.0 h1:e7kutiBxbyk9Gc0DkFDYxnWrmW9sAPpXbgFoQmof/kE=
+go.opentelemetry.io/collector v0.35.0/go.mod h1:mMW4VJHhy8CwoTenV75axteKd0aZhWHDZjcZ59V53kc=
+go.opentelemetry.io/collector/model v0.35.0 h1:NpKjghiqlei4ecwjOYOMhD6tj4gY8yiWHPJmbFs/ArI=
+go.opentelemetry.io/collector/model v0.35.0/go.mod h1:+7YCSjJG+MqiIFjauzt7oM2qkqBsaJWh5hcsO4fwsAc=
 go.opentelemetry.io/contrib v0.22.0/go.mod h1:EH4yDYeNoaTqn/8yCWQmfNB78VHfGX2Jt2bvnvzBlGM=
 go.opentelemetry.io/contrib/instrumentation/google.golang.org/grpc/otelgrpc v0.22.0/go.mod h1:KjqwX4uJNaj479ZjFpADOMJKOM4rBXq4kN7nbeuGKrY=
 go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.22.0/go.mod h1:o3MuU25bYroYnc2TOKe8mTk8f9X1oPFO6C5RCoPKtSU=

diff --git a/exporter/awsemfexporter/go.mod b/exporter/awsemfexporter/go.mod
@@ -12,8 +12,8 @@ require (
 	github.com/open-telemetry/opentelemetry-collector-contrib/pkg/resourcetotelemetry v0.34.0
 	github.com/open-telemetry/opentelemetry-collector-contrib/pkg/translator/opencensus v0.34.0
 	github.com/stretchr/testify v1.7.0
-	go.opentelemetry.io/collector v0.34.1-0.20210908172238-e8bd3be6d4c3
-	go.opentelemetry.io/collector/model v0.34.1-0.20210908172238-e8bd3be6d4c3
+	go.opentelemetry.io/collector v0.35.0
+	go.opentelemetry.io/collector/model v0.35.0
 	go.uber.org/zap v1.19.0
 	golang.org/x/tools v0.1.4 // indirect
 	google.golang.org/protobuf v1.27.1

diff --git a/exporter/awsemfexporter/go.sum b/exporter/awsemfexporter/go.sum
@@ -401,11 +401,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.34.1-0.20210908172238-e8bd3be6d4c3 h1:U2VOoWzv/n5VUYD/Zkj0T3G9cJrvNYWWNbSvZIs7WA0=
-go.opentelemetry.io/collector v0.34.1-0.20210908172238-e8bd3be6d4c3/go.mod h1:mmEZXsT+Bwxgl/BxmowtggjoQ4Wr8n02026H5FjnGHI=
-go.opentelemetry.io/collector/model v0.34.0/go.mod h1:+7YCSjJG+MqiIFjauzt7oM2qkqBsaJWh5hcsO4fwsAc=
-go.opentelemetry.io/collector/model v0.34.1-0.20210908172238-e8bd3be6d4c3 h1:pn8VUQV13gFzlRn7/slb4cBvMVZUnBAXAqiqUCKNDhA=
-go.opentelemetry.io/collector/model v0.34.1-0.20210908172238-e8bd3be6d4c3/go.mod h1:+7YCSjJG+MqiIFjauzt7oM2qkqBsaJWh5hcsO4fwsAc=
+go.opentelemetry.io/collector v0.35.0 h1:e7kutiBxbyk9Gc0DkFDYxnWrmW9sAPpXbgFoQmof/kE=
+go.opentelemetry.io/collector v0.35.0/go.mod h1:mMW4VJHhy8CwoTenV75axteKd0aZhWHDZjcZ59V53kc=
+go.opentelemetry.io/collector/model v0.35.0 h1:NpKjghiqlei4ecwjOYOMhD6tj4gY8yiWHPJmbFs/ArI=
+go.opentelemetry.io/collector/model v0.35.0/go.mod h1:+7YCSjJG+MqiIFjauzt7oM2qkqBsaJWh5hcsO4fwsAc=
 go.opentelemetry.io/contrib v0.22.0 h1:0F7gDEjgb1WGn4ODIjaCAg75hmqF+UN0LiVgwxsCodc=
 go.opentelemetry.io/contrib v0.22.0/go.mod h1:EH4yDYeNoaTqn/8yCWQmfNB78VHfGX2Jt2bvnvzBlGM=
 go.opentelemetry.io/contrib/instrumentation/google.golang.org/grpc/otelgrpc v0.22.0 h1:TjqELdtCtlOJQrTnXd2y+RP6wXKZUnnJer0HR0CSo18=

diff --git a/exporter/awskinesisexporter/go.mod b/exporter/awskinesisexporter/go.mod
@@ -6,8 +6,8 @@ require (
 	github.com/open-telemetry/opentelemetry-collector-contrib/pkg/translator/jaeger v0.34.0
 	github.com/signalfx/opencensus-go-exporter-kinesis v0.6.3
 	github.com/stretchr/testify v1.7.0
-	go.opentelemetry.io/collector v0.34.1-0.20210908172238-e8bd3be6d4c3
-	go.opentelemetry.io/collector/model v0.34.1-0.20210908172238-e8bd3be6d4c3
+	go.opentelemetry.io/collector v0.35.0
+	go.opentelemetry.io/collector/model v0.35.0
 	go.uber.org/zap v1.19.0
 )
 

diff --git a/exporter/awskinesisexporter/go.sum b/exporter/awskinesisexporter/go.sum
@@ -1018,11 +1018,10 @@ 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.28.0/go.mod h1:AP/BTXwo1eedoJO7V+HQ68CSvJU1lcdqOzJCgt1VsNs=
-go.opentelemetry.io/collector v0.34.1-0.20210908172238-e8bd3be6d4c3 h1:U2VOoWzv/n5VUYD/Zkj0T3G9cJrvNYWWNbSvZIs7WA0=
-go.opentelemetry.io/collector v0.34.1-0.20210908172238-e8bd3be6d4c3/go.mod h1:mmEZXsT+Bwxgl/BxmowtggjoQ4Wr8n02026H5FjnGHI=
-go.opentelemetry.io/collector/model v0.34.0/go.mod h1:+7YCSjJG+MqiIFjauzt7oM2qkqBsaJWh5hcsO4fwsAc=
-go.opentelemetry.io/collector/model v0.34.1-0.20210908172238-e8bd3be6d4c3 h1:pn8VUQV13gFzlRn7/slb4cBvMVZUnBAXAqiqUCKNDhA=
-go.opentelemetry.io/collector/model v0.34.1-0.20210908172238-e8bd3be6d4c3/go.mod h1:+7YCSjJG+MqiIFjauzt7oM2qkqBsaJWh5hcsO4fwsAc=
+go.opentelemetry.io/collector v0.35.0 h1:e7kutiBxbyk9Gc0DkFDYxnWrmW9sAPpXbgFoQmof/kE=
+go.opentelemetry.io/collector v0.35.0/go.mod h1:mMW4VJHhy8CwoTenV75axteKd0aZhWHDZjcZ59V53kc=
+go.opentelemetry.io/collector/model v0.35.0 h1:NpKjghiqlei4ecwjOYOMhD6tj4gY8yiWHPJmbFs/ArI=
+go.opentelemetry.io/collector/model v0.35.0/go.mod h1:+7YCSjJG+MqiIFjauzt7oM2qkqBsaJWh5hcsO4fwsAc=
 go.opentelemetry.io/contrib v0.22.0 h1:0F7gDEjgb1WGn4ODIjaCAg75hmqF+UN0LiVgwxsCodc=
 go.opentelemetry.io/contrib v0.22.0/go.mod h1:EH4yDYeNoaTqn/8yCWQmfNB78VHfGX2Jt2bvnvzBlGM=
 go.opentelemetry.io/contrib/instrumentation/google.golang.org/grpc/otelgrpc v0.22.0 h1:TjqELdtCtlOJQrTnXd2y+RP6wXKZUnnJer0HR0CSo18=

diff --git a/exporter/awsprometheusremotewriteexporter/go.mod b/exporter/awsprometheusremotewriteexporter/go.mod
@@ -6,7 +6,7 @@ require (
 	github.com/aws/aws-sdk-go v1.40.38
 	github.com/open-telemetry/opentelemetry-collector-contrib/exporter/prometheusremotewriteexporter v0.34.0
 	github.com/stretchr/testify v1.7.0
-	go.opentelemetry.io/collector v0.34.1-0.20210908172238-e8bd3be6d4c3
+	go.opentelemetry.io/collector v0.35.0
 )
 
 require (
@@ -34,7 +34,7 @@ require (
 	github.com/tidwall/tinylru v1.0.2 // indirect
 	github.com/tidwall/wal v0.1.5 // indirect
 	go.opencensus.io v0.23.0 // indirect
-	go.opentelemetry.io/collector/model v0.34.1-0.20210908172238-e8bd3be6d4c3 // indirect
+	go.opentelemetry.io/collector/model v0.35.0 // indirect
 	go.opentelemetry.io/contrib v0.22.0 // indirect
 	go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.22.0 // indirect
 	go.opentelemetry.io/otel v1.0.0-RC3 // indirect

diff --git a/exporter/awsprometheusremotewriteexporter/go.sum b/exporter/awsprometheusremotewriteexporter/go.sum
@@ -984,11 +984,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.34.1-0.20210908172238-e8bd3be6d4c3 h1:U2VOoWzv/n5VUYD/Zkj0T3G9cJrvNYWWNbSvZIs7WA0=
-go.opentelemetry.io/collector v0.34.1-0.20210908172238-e8bd3be6d4c3/go.mod h1:mmEZXsT+Bwxgl/BxmowtggjoQ4Wr8n02026H5FjnGHI=
-go.opentelemetry.io/collector/model v0.34.0/go.mod h1:+7YCSjJG+MqiIFjauzt7oM2qkqBsaJWh5hcsO4fwsAc=
-go.opentelemetry.io/collector/model v0.34.1-0.20210908172238-e8bd3be6d4c3 h1:pn8VUQV13gFzlRn7/slb4cBvMVZUnBAXAqiqUCKNDhA=
-go.opentelemetry.io/collector/model v0.34.1-0.20210908172238-e8bd3be6d4c3/go.mod h1:+7YCSjJG+MqiIFjauzt7oM2qkqBsaJWh5hcsO4fwsAc=
+go.opentelemetry.io/collector v0.35.0 h1:e7kutiBxbyk9Gc0DkFDYxnWrmW9sAPpXbgFoQmof/kE=
+go.opentelemetry.io/collector v0.35.0/go.mod h1:mMW4VJHhy8CwoTenV75axteKd0aZhWHDZjcZ59V53kc=
+go.opentelemetry.io/collector/model v0.35.0 h1:NpKjghiqlei4ecwjOYOMhD6tj4gY8yiWHPJmbFs/ArI=
+go.opentelemetry.io/collector/model v0.35.0/go.mod h1:+7YCSjJG+MqiIFjauzt7oM2qkqBsaJWh5hcsO4fwsAc=
 go.opentelemetry.io/contrib v0.22.0 h1:0F7gDEjgb1WGn4ODIjaCAg75hmqF+UN0LiVgwxsCodc=
 go.opentelemetry.io/contrib v0.22.0/go.mod h1:EH4yDYeNoaTqn/8yCWQmfNB78VHfGX2Jt2bvnvzBlGM=
 go.opentelemetry.io/contrib/instrumentation/google.golang.org/grpc/otelgrpc v0.22.0 h1:TjqELdtCtlOJQrTnXd2y+RP6wXKZUnnJer0HR0CSo18=

diff --git a/exporter/awsxrayexporter/go.mod b/exporter/awsxrayexporter/go.mod
@@ -8,8 +8,8 @@ require (
 	github.com/open-telemetry/opentelemetry-collector-contrib/internal/aws/xray v0.34.0
 	github.com/stretchr/objx v0.2.0 // indirect
 	github.com/stretchr/testify v1.7.0
-	go.opentelemetry.io/collector v0.34.1-0.20210908172238-e8bd3be6d4c3
-	go.opentelemetry.io/collector/model v0.34.1-0.20210908172238-e8bd3be6d4c3
+	go.opentelemetry.io/collector v0.35.0
+	go.opentelemetry.io/collector/model v0.35.0
 	go.uber.org/zap v1.19.0
 	golang.org/x/text v0.3.7 // indirect
 )

diff --git a/exporter/awsxrayexporter/go.sum b/exporter/awsxrayexporter/go.sum
@@ -384,11 +384,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.34.1-0.20210908172238-e8bd3be6d4c3 h1:U2VOoWzv/n5VUYD/Zkj0T3G9cJrvNYWWNbSvZIs7WA0=
-go.opentelemetry.io/collector v0.34.1-0.20210908172238-e8bd3be6d4c3/go.mod h1:mmEZXsT+Bwxgl/BxmowtggjoQ4Wr8n02026H5FjnGHI=
-go.opentelemetry.io/collector/model v0.34.0/go.mod h1:+7YCSjJG+MqiIFjauzt7oM2qkqBsaJWh5hcsO4fwsAc=
-go.opentelemetry.io/collector/model v0.34.1-0.20210908172238-e8bd3be6d4c3 h1:pn8VUQV13gFzlRn7/slb4cBvMVZUnBAXAqiqUCKNDhA=
-go.opentelemetry.io/collector/model v0.34.1-0.20210908172238-e8bd3be6d4c3/go.mod h1:+7YCSjJG+MqiIFjauzt7oM2qkqBsaJWh5hcsO4fwsAc=
+go.opentelemetry.io/collector v0.35.0 h1:e7kutiBxbyk9Gc0DkFDYxnWrmW9sAPpXbgFoQmof/kE=
+go.opentelemetry.io/collector v0.35.0/go.mod h1:mMW4VJHhy8CwoTenV75axteKd0aZhWHDZjcZ59V53kc=
+go.opentelemetry.io/collector/model v0.35.0 h1:NpKjghiqlei4ecwjOYOMhD6tj4gY8yiWHPJmbFs/ArI=
+go.opentelemetry.io/collector/model v0.35.0/go.mod h1:+7YCSjJG+MqiIFjauzt7oM2qkqBsaJWh5hcsO4fwsAc=
 go.opentelemetry.io/contrib v0.22.0 h1:0F7gDEjgb1WGn4ODIjaCAg75hmqF+UN0LiVgwxsCodc=
 go.opentelemetry.io/contrib v0.22.0/go.mod h1:EH4yDYeNoaTqn/8yCWQmfNB78VHfGX2Jt2bvnvzBlGM=
 go.opentelemetry.io/contrib/instrumentation/google.golang.org/grpc/otelgrpc v0.22.0 h1:TjqELdtCtlOJQrTnXd2y+RP6wXKZUnnJer0HR0CSo18=

diff --git a/exporter/awsxrayexporter/internal/translator/aws.go b/exporter/awsxrayexporter/internal/translator/aws.go
@@ -129,7 +129,7 @@ func makeAws(attributes map[string]pdata.AttributeValue, resource pdata.Resource
 		case awsxray.AWSOperationAttribute:
 			operation = value.StringVal()
 		case awsxray.AWSAccountAttribute:
-			if value.Type() != pdata.AttributeValueTypeNull {
+			if value.Type() != pdata.AttributeValueTypeEmpty {
 				account = value.StringVal()
 			}
 		case awsxray.AWSRegionAttribute:

diff --git a/exporter/azuremonitorexporter/go.mod b/exporter/azuremonitorexporter/go.mod
@@ -8,8 +8,8 @@ require (
 	github.com/microsoft/ApplicationInsights-Go v0.4.4
 	github.com/stretchr/objx v0.2.0 // indirect
 	github.com/stretchr/testify v1.7.0
-	go.opentelemetry.io/collector v0.34.1-0.20210908172238-e8bd3be6d4c3
-	go.opentelemetry.io/collector/model v0.34.1-0.20210908172238-e8bd3be6d4c3
+	go.opentelemetry.io/collector v0.35.0
+	go.opentelemetry.io/collector/model v0.35.0
 	go.uber.org/zap v1.19.0
 	golang.org/x/net v0.0.0-20210614182718-04defd469f4e
 	golang.org/x/text v0.3.7 // indirect