fix oc conversion

open-telemetry · Mar 25, 2021 · 7a1e77a · 7a1e77a
1 parent 0e48800
commit 7a1e77a
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 1 deletion.
diff --git a/translator/internaldata/oc_to_resource.go b/translator/internaldata/oc_to_resource.go
@@ -19,6 +19,7 @@ import (
 
 	occommon "github.com/census-instrumentation/opencensus-proto/gen-go/agent/common/v1"
 	ocresource "github.com/census-instrumentation/opencensus-proto/gen-go/resource/v1"
+	"go.opencensus.io/resource/resourcekeys"
 
 	"go.opentelemetry.io/collector/consumer/pdata"
 	"go.opentelemetry.io/collector/translator/conventions"
@@ -122,7 +123,12 @@ func ocNodeResourceToInternal(ocNode *occommon.Node, ocResource *ocresource.Reso
 	if ocResource != nil {
 		// Copy resource Labels.
 		for k, v := range ocResource.Labels {
-			attrs.InsertString(k, v)
+			switch k {
+			case resourcekeys.CloudKeyZone:
+				attrs.InsertString(conventions.AttributeCloudAvailabilityZone, v)
+			default:
+				attrs.InsertString(k, v)
+			}
 		}
 		// Add special fields.
 		if ocResource.Type != "" {

diff --git a/translator/internaldata/resource_to_oc.go b/translator/internaldata/resource_to_oc.go
@@ -91,6 +91,8 @@ func internalResourceToOC(resource pdata.Resource) (*occommon.Node, *ocresource.
 		val := tracetranslator.AttributeValueToString(v, false)
 
 		switch k {
+		case conventions.AttributeCloudAvailabilityZone:
+			labels[resourcekeys.CloudKeyZone] = val
 		case conventions.OCAttributeResourceType:
 			ocResource.Type = val
 		case conventions.AttributeServiceName: