Update core to latest, fix breaking change in semantic conventions (o…

…pen-telemetry#2886) Signed-off-by: Bogdan Drutu <[email protected]>
sakulali · Mar 26, 2021 · bc3a4cd · bc3a4cd
1 parent 14926cd
commit bc3a4cd
Show file tree

Hide file tree

Showing 182 changed files with 469 additions and 256 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.1-0.20210325210122-725021f804a6
+ go.opentelemetry.io/collector v0.23.1-0.20210325231135-d8e9970acd95
  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
@@ -911,6 +911,8 @@ 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.1-0.20210325210122-725021f804a6 h1:1+hmdocmFB7xvH+wHvYW2tmpexLMj160XL26zate3lA=
 go.opentelemetry.io/collector v0.23.1-0.20210325210122-725021f804a6/go.mod h1:wMTwy0/4xrFRZj/XX1UH5VAd0WAVts9Rq7ZKQldCIkU=
+go.opentelemetry.io/collector v0.23.1-0.20210325231135-d8e9970acd95 h1:Jic+7EL6t5ydUcZ7p+NPswUZFSFg7GJvElqfxY+acbE=
+go.opentelemetry.io/collector v0.23.1-0.20210325231135-d8e9970acd95/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/alibabacloudlogserviceexporter/testdata/logservice_trace_data.json b/exporter/alibabacloudlogserviceexporter/testdata/logservice_trace_data.json
@@ -10,7 +10,7 @@
  },
  {
  "Key": "resource",
- "Value": "{\"cloud.account.id\":\"999999998\",\"cloud.provider\":\"aws\",\"cloud.region\":\"us-west-2\",\"cloud.zone\":\"us-west-1b\",\"container.image.name\":\"otel/signupaggregator\",\"container.image.tag\":\"v1\",\"container.name\":\"signup_aggregator\"}"
+ "Value": "{\"cloud.account.id\":\"999999998\",\"cloud.availability_zone\":\"us-west-1b\",\"cloud.provider\":\"aws\",\"cloud.region\":\"us-west-2\",\"container.image.name\":\"otel/signupaggregator\",\"container.image.tag\":\"v1\",\"container.name\":\"signup_aggregator\"}"
  },
  {
  "Key": "otlp.name",
@@ -88,7 +88,7 @@
  },
  {
  "Key": "resource",
- "Value": "{\"cloud.account.id\":\"999999998\",\"cloud.provider\":\"aws\",\"cloud.region\":\"us-west-2\",\"cloud.zone\":\"us-west-1b\",\"container.image.name\":\"otel/signupaggregator\",\"container.image.tag\":\"v1\",\"container.name\":\"signup_aggregator\"}"
+ "Value": "{\"cloud.account.id\":\"999999998\",\"cloud.availability_zone\":\"us-west-1b\",\"cloud.provider\":\"aws\",\"cloud.region\":\"us-west-2\",\"container.image.name\":\"otel/signupaggregator\",\"container.image.tag\":\"v1\",\"container.name\":\"signup_aggregator\"}"
  },
  {
  "Key": "otlp.name",
@@ -166,7 +166,7 @@
  },
  {
  "Key": "resource",
- "Value": "{\"cloud.account.id\":\"999999998\",\"cloud.provider\":\"aws\",\"cloud.region\":\"us-west-2\",\"cloud.zone\":\"us-west-1b\",\"container.image.name\":\"otel/signupaggregator\",\"container.image.tag\":\"v1\",\"container.name\":\"signup_aggregator\"}"
+ "Value": "{\"cloud.account.id\":\"999999998\",\"cloud.availability_zone\":\"us-west-1b\",\"cloud.provider\":\"aws\",\"cloud.region\":\"us-west-2\",\"container.image.name\":\"otel/signupaggregator\",\"container.image.tag\":\"v1\",\"container.name\":\"signup_aggregator\"}"
  },
  {
  "Key": "otlp.name",
@@ -244,7 +244,7 @@
  },
  {
  "Key": "resource",
- "Value": "{\"cloud.account.id\":\"999999998\",\"cloud.provider\":\"aws\",\"cloud.region\":\"us-west-2\",\"cloud.zone\":\"us-west-1b\",\"container.image.name\":\"otel/signupaggregator\",\"container.image.tag\":\"v1\",\"container.name\":\"signup_aggregator\"}"
+ "Value": "{\"cloud.account.id\":\"999999998\",\"cloud.availability_zone\":\"us-west-1b\",\"cloud.provider\":\"aws\",\"cloud.region\":\"us-west-2\",\"container.image.name\":\"otel/signupaggregator\",\"container.image.tag\":\"v1\",\"container.name\":\"signup_aggregator\"}"
  },
  {
  "Key": "otlp.name",

diff --git a/exporter/alibabacloudlogserviceexporter/tracedata_to_logservice_test.go b/exporter/alibabacloudlogserviceexporter/tracedata_to_logservice_test.go
@@ -106,7 +106,7 @@ func fillResource(resource pdata.Resource) {
  attrs.InsertString(semconventions.AttributeCloudProvider, semconventions.AttributeCloudProviderAWS)
  attrs.InsertString(semconventions.AttributeCloudAccount, "999999998")
  attrs.InsertString(semconventions.AttributeCloudRegion, "us-west-2")
- attrs.InsertString(semconventions.AttributeCloudZone, "us-west-1b")
+ attrs.InsertString(semconventions.AttributeCloudAvailabilityZone, "us-west-1b")
 }
 
 func fillHTTPClientSpan(span pdata.Span) {

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.1-0.20210325210122-725021f804a6
+ go.opentelemetry.io/collector v0.23.1-0.20210325231135-d8e9970acd95
  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/awsemfexporter/go.sum b/exporter/awsemfexporter/go.sum
@@ -1053,6 +1053,8 @@ 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.1-0.20210325210122-725021f804a6 h1:1+hmdocmFB7xvH+wHvYW2tmpexLMj160XL26zate3lA=
 go.opentelemetry.io/collector v0.23.1-0.20210325210122-725021f804a6/go.mod h1:wMTwy0/4xrFRZj/XX1UH5VAd0WAVts9Rq7ZKQldCIkU=
+go.opentelemetry.io/collector v0.23.1-0.20210325231135-d8e9970acd95 h1:Jic+7EL6t5ydUcZ7p+NPswUZFSFg7GJvElqfxY+acbE=
+go.opentelemetry.io/collector v0.23.1-0.20210325231135-d8e9970acd95/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.1-0.20210325210122-725021f804a6
+ go.opentelemetry.io/collector v0.23.1-0.20210325231135-d8e9970acd95
  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
@@ -1083,6 +1083,8 @@ 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.1-0.20210325210122-725021f804a6 h1:1+hmdocmFB7xvH+wHvYW2tmpexLMj160XL26zate3lA=
 go.opentelemetry.io/collector v0.23.1-0.20210325210122-725021f804a6/go.mod h1:wMTwy0/4xrFRZj/XX1UH5VAd0WAVts9Rq7ZKQldCIkU=
+go.opentelemetry.io/collector v0.23.1-0.20210325231135-d8e9970acd95 h1:Jic+7EL6t5ydUcZ7p+NPswUZFSFg7GJvElqfxY+acbE=
+go.opentelemetry.io/collector v0.23.1-0.20210325231135-d8e9970acd95/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.1-0.20210325210122-725021f804a6
+ go.opentelemetry.io/collector v0.23.1-0.20210325231135-d8e9970acd95
  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
@@ -1053,6 +1053,8 @@ 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.1-0.20210325210122-725021f804a6 h1:1+hmdocmFB7xvH+wHvYW2tmpexLMj160XL26zate3lA=
 go.opentelemetry.io/collector v0.23.1-0.20210325210122-725021f804a6/go.mod h1:wMTwy0/4xrFRZj/XX1UH5VAd0WAVts9Rq7ZKQldCIkU=
+go.opentelemetry.io/collector v0.23.1-0.20210325231135-d8e9970acd95 h1:Jic+7EL6t5ydUcZ7p+NPswUZFSFg7GJvElqfxY+acbE=
+go.opentelemetry.io/collector v0.23.1-0.20210325231135-d8e9970acd95/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/awsxray_test.go b/exporter/awsxrayexporter/awsxray_test.go
@@ -93,7 +93,7 @@ func constructResource() pdata.Resource {
  attrs.InsertString(semconventions.AttributeCloudProvider, semconventions.AttributeCloudProviderAWS)
  attrs.InsertString(semconventions.AttributeCloudAccount, "999999998")
  attrs.InsertString(semconventions.AttributeCloudRegion, "us-west-2")
- attrs.InsertString(semconventions.AttributeCloudZone, "us-west-1b")
+ attrs.InsertString(semconventions.AttributeCloudAvailabilityZone, "us-west-1b")
  attrs.CopyTo(resource.Attributes())
  return resource
 }

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.1-0.20210325210122-725021f804a6
+ go.opentelemetry.io/collector v0.23.1-0.20210325231135-d8e9970acd95
  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
@@ -1053,6 +1053,8 @@ 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.1-0.20210325210122-725021f804a6 h1:1+hmdocmFB7xvH+wHvYW2tmpexLMj160XL26zate3lA=
 go.opentelemetry.io/collector v0.23.1-0.20210325210122-725021f804a6/go.mod h1:wMTwy0/4xrFRZj/XX1UH5VAd0WAVts9Rq7ZKQldCIkU=
+go.opentelemetry.io/collector v0.23.1-0.20210325231135-d8e9970acd95 h1:Jic+7EL6t5ydUcZ7p+NPswUZFSFg7GJvElqfxY+acbE=
+go.opentelemetry.io/collector v0.23.1-0.20210325231135-d8e9970acd95/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/translator/aws.go b/exporter/awsxrayexporter/translator/aws.go
@@ -26,7 +26,7 @@ import (
 )
 
 const (
- attributeInfrastructureService = "cloud.infrastructure_service"
+ attributeInfrastructureService = "cloud.platform"
  awsEcsClusterArn = "aws.ecs.cluster.arn"
  awsEcsContainerArn = "aws.ecs.container.arn"
  awsEcsTaskArn = "aws.ecs.task.arn"
@@ -85,7 +85,7 @@ func makeAws(attributes map[string]string, resource pdata.Resource) (map[string]
  service = value.StringVal()
  case semconventions.AttributeCloudAccount:
  account = value.StringVal()
- case semconventions.AttributeCloudZone:
+ case semconventions.AttributeCloudAvailabilityZone:
  zone = value.StringVal()
  case semconventions.AttributeHostID:
  hostID = value.StringVal()

diff --git a/exporter/awsxrayexporter/translator/aws_test.go b/exporter/awsxrayexporter/translator/aws_test.go
@@ -34,7 +34,7 @@ func TestAwsFromEc2Resource(t *testing.T) {
  attrs.InsertString(semconventions.AttributeCloudProvider, semconventions.AttributeCloudProviderAWS)
  attrs.InsertString(attributeInfrastructureService, "EC2")
  attrs.InsertString(semconventions.AttributeCloudAccount, "123456789")
- attrs.InsertString(semconventions.AttributeCloudZone, "us-east-1c")
+ attrs.InsertString(semconventions.AttributeCloudAvailabilityZone, "us-east-1c")
  attrs.InsertString(semconventions.AttributeHostID, instanceID)
  attrs.InsertString(semconventions.AttributeHostType, hostType)
  attrs.InsertString(semconventions.AttributeHostImageID, imageID)
@@ -74,7 +74,7 @@ func TestAwsFromEcsResource(t *testing.T) {
  attrs.InsertString(semconventions.AttributeCloudProvider, semconventions.AttributeCloudProviderAWS)
  attrs.InsertString(attributeInfrastructureService, "ECS")
  attrs.InsertString(semconventions.AttributeCloudAccount, "123456789")
- attrs.InsertString(semconventions.AttributeCloudZone, az)
+ attrs.InsertString(semconventions.AttributeCloudAvailabilityZone, az)
  attrs.InsertString(semconventions.AttributeContainerImage, "otel/signupaggregator")
  attrs.InsertString(semconventions.AttributeContainerTag, "v1")
  attrs.InsertString(semconventions.AttributeK8sCluster, "production")
@@ -122,7 +122,7 @@ func TestAwsFromBeanstalkResource(t *testing.T) {
  attrs := pdata.NewAttributeMap()
  attrs.InsertString(semconventions.AttributeCloudProvider, semconventions.AttributeCloudProviderAWS)
  attrs.InsertString(semconventions.AttributeCloudAccount, "123456789")
- attrs.InsertString(semconventions.AttributeCloudZone, "us-east-1c")
+ attrs.InsertString(semconventions.AttributeCloudAvailabilityZone, "us-east-1c")
  attrs.InsertString(semconventions.AttributeServiceNamespace, "production")
  attrs.InsertString(semconventions.AttributeServiceInstance, deployID)
  attrs.InsertString(semconventions.AttributeServiceVersion, versionLabel)
@@ -153,7 +153,7 @@ func TestAwsFromEksResource(t *testing.T) {
  attrs := pdata.NewAttributeMap()
  attrs.InsertString(semconventions.AttributeCloudProvider, semconventions.AttributeCloudProviderAWS)
  attrs.InsertString(semconventions.AttributeCloudAccount, "123456789")
- attrs.InsertString(semconventions.AttributeCloudZone, "us-east-1c")
+ attrs.InsertString(semconventions.AttributeCloudAvailabilityZone, "us-east-1c")
  attrs.InsertString(semconventions.AttributeContainerImage, "otel/signupaggregator")
  attrs.InsertString(semconventions.AttributeContainerTag, "v1")
  attrs.InsertString(semconventions.AttributeK8sCluster, "production")
@@ -191,7 +191,7 @@ func TestAwsWithAwsSqsResources(t *testing.T) {
  attrs := pdata.NewAttributeMap()
  attrs.InsertString(semconventions.AttributeCloudProvider, semconventions.AttributeCloudProviderAWS)
  attrs.InsertString(semconventions.AttributeCloudAccount, "123456789")
- attrs.InsertString(semconventions.AttributeCloudZone, "us-east-1c")
+ attrs.InsertString(semconventions.AttributeCloudAvailabilityZone, "us-east-1c")
  attrs.InsertString(semconventions.AttributeContainerName, containerName)
  attrs.InsertString(semconventions.AttributeContainerImage, "otel/signupaggregator")
  attrs.InsertString(semconventions.AttributeContainerTag, "v1")
@@ -240,7 +240,7 @@ func TestAwsWithAwsDynamoDbResources(t *testing.T) {
  attrs := pdata.NewAttributeMap()
  attrs.InsertString(semconventions.AttributeCloudProvider, semconventions.AttributeCloudProviderAWS)
  attrs.InsertString(semconventions.AttributeCloudAccount, "123456789")
- attrs.InsertString(semconventions.AttributeCloudZone, "us-east-1c")
+ attrs.InsertString(semconventions.AttributeCloudAvailabilityZone, "us-east-1c")
  attrs.InsertString(semconventions.AttributeContainerName, "signup_aggregator")
  attrs.InsertString(semconventions.AttributeContainerImage, "otel/signupaggregator")
  attrs.InsertString(semconventions.AttributeContainerTag, "v1")

diff --git a/exporter/awsxrayexporter/translator/segment.go b/exporter/awsxrayexporter/translator/segment.go
@@ -220,9 +220,9 @@ func determineAwsOrigin(resource pdata.Resource) string {
  }
  }
 
- // TODO(willarmiros): Only use infrastructure_service for origin resolution once detectors for all AWS environments are
+ // TODO(willarmiros): Only use platform for origin resolution once detectors for all AWS environments are
  // implemented for robustness
- if is, present := resource.Attributes().Get("cloud.infrastructure_service"); present {
+ if is, present := resource.Attributes().Get(semconventions.AttributeCloudPlatform); present {
  switch is.StringVal() {
  case "EKS":
  return OriginEKS

diff --git a/exporter/awsxrayexporter/translator/segment_test.go b/exporter/awsxrayexporter/translator/segment_test.go
@@ -494,7 +494,7 @@ func TestOriginEc2(t *testing.T) {
  resource := pdata.NewResource()
  attrs := pdata.NewAttributeMap()
  attrs.InsertString(semconventions.AttributeCloudProvider, semconventions.AttributeCloudProviderAWS)
- attrs.InsertString("cloud.infrastructure_service", "EC2")
+ attrs.InsertString("cloud.platform", "EC2")
  attrs.InsertString(semconventions.AttributeHostID, "instance-123")
  attrs.CopyTo(resource.Attributes())
  span := constructServerSpan(parentSpanID, spanName, pdata.StatusCodeError, "OK", attributes)
@@ -512,7 +512,7 @@ func TestOriginEcs(t *testing.T) {
  resource := pdata.NewResource()
  attrs := pdata.NewAttributeMap()
  attrs.InsertString(semconventions.AttributeCloudProvider, semconventions.AttributeCloudProviderAWS)
- attrs.InsertString("cloud.infrastructure_service", "ECS")
+ attrs.InsertString("cloud.platform", "ECS")
  attrs.InsertString(semconventions.AttributeHostID, "instance-123")
  attrs.InsertString(semconventions.AttributeContainerName, "container-123")
  attrs.CopyTo(resource.Attributes())
@@ -531,7 +531,7 @@ func TestOriginEcsEc2(t *testing.T) {
  resource := pdata.NewResource()
  attrs := pdata.NewAttributeMap()
  attrs.InsertString(semconventions.AttributeCloudProvider, semconventions.AttributeCloudProviderAWS)
- attrs.InsertString("cloud.infrastructure_service", "ECS")
+ attrs.InsertString("cloud.platform", "ECS")
  attrs.InsertString("aws.ecs.launchtype", "ec2")
  attrs.InsertString(semconventions.AttributeHostID, "instance-123")
  attrs.InsertString(semconventions.AttributeContainerName, "container-123")
@@ -551,7 +551,7 @@ func TestOriginEcsFargate(t *testing.T) {
  resource := pdata.NewResource()
  attrs := pdata.NewAttributeMap()
  attrs.InsertString(semconventions.AttributeCloudProvider, semconventions.AttributeCloudProviderAWS)
- attrs.InsertString("cloud.infrastructure_service", "ECS")
+ attrs.InsertString("cloud.platform", "ECS")
  attrs.InsertString("aws.ecs.launchtype", "fargate")
  attrs.InsertString(semconventions.AttributeHostID, "instance-123")
  attrs.InsertString(semconventions.AttributeContainerName, "container-123")
@@ -606,7 +606,7 @@ func TestOriginPrefersInfraService(t *testing.T) {
  resource := pdata.NewResource()
  attrs := pdata.NewAttributeMap()
  attrs.InsertString(semconventions.AttributeCloudProvider, semconventions.AttributeCloudProviderAWS)
- attrs.InsertString("cloud.infrastructure_service", "EC2")
+ attrs.InsertString("cloud.platform", "EC2")
  attrs.InsertString(semconventions.AttributeK8sCluster, "cluster-123")
  attrs.InsertString(semconventions.AttributeHostID, "instance-123")
  attrs.InsertString(semconventions.AttributeContainerName, "container-123")
@@ -703,7 +703,7 @@ func constructDefaultResource() pdata.Resource {
  attrs.InsertString(semconventions.AttributeCloudProvider, semconventions.AttributeCloudProviderAWS)
  attrs.InsertString(semconventions.AttributeCloudAccount, "123456789")
  attrs.InsertString(semconventions.AttributeCloudRegion, "us-east-1")
- attrs.InsertString(semconventions.AttributeCloudZone, "us-east-1c")
+ attrs.InsertString(semconventions.AttributeCloudAvailabilityZone, "us-east-1c")
  attrs.InsertString(resourceStringKey, "string")
  attrs.InsertInt(resourceIntKey, 10)
  attrs.InsertDouble(resourceDoubleKey, 5.0)

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.1-0.20210325210122-725021f804a6
+ go.opentelemetry.io/collector v0.23.1-0.20210325231135-d8e9970acd95
  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
@@ -1063,6 +1063,8 @@ 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.1-0.20210325210122-725021f804a6 h1:1+hmdocmFB7xvH+wHvYW2tmpexLMj160XL26zate3lA=
 go.opentelemetry.io/collector v0.23.1-0.20210325210122-725021f804a6/go.mod h1:wMTwy0/4xrFRZj/XX1UH5VAd0WAVts9Rq7ZKQldCIkU=
+go.opentelemetry.io/collector v0.23.1-0.20210325231135-d8e9970acd95 h1:Jic+7EL6t5ydUcZ7p+NPswUZFSFg7GJvElqfxY+acbE=
+go.opentelemetry.io/collector v0.23.1-0.20210325231135-d8e9970acd95/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=