add entity

exporter/awsemfexporter/internal/entity/entityattributes.go

@@ -1,9 +1,5 @@
 package entity
 
-import (
-	"go.opentelemetry.io/collector/pdata/pcommon"
-)
-
 const (
 	// Entity resource attributes in OTLP payload
 	AWSEntityPrefix                      = "com.amazonaws.cloudwatch.entity.internal."
@@ -49,22 +45,20 @@ var attributeEntityToFieldMap = map[string]string{
 	AttributeEntityServiceNameSource:     AWSServiceNameSource,
 }
 
-// AddEntity populates resource attributes with entity fields
-func AddEntity(am pcommon.Map) {
-	for internalAttr, entityField := range attributeEntityToFieldMap {
-		val, ok := am.Get(internalAttr)
-		if ok {
-			val.CopyTo(am.PutEmpty(entityField))
-		}
-	}
-
-	val, ok := am.Get(AttributeEntityK8sClusterName)
-	if ok {
-		switch val.Str() {
+// GetEntityField returns entity field for provided attribute
+func GetEntityField(attribute string, value string) string {
+	if attribute == AttributeEntityK8sClusterName {
+		switch value {
 		case AttributeEntityEKSPlatform:
-			val.CopyTo(am.PutEmpty(EksCluster))
+			return EksCluster
 		case AttributeEntityK8sPlatform:
-			val.CopyTo(am.PutEmpty(K8sCluster))
+			return K8sCluster
 		}
 	}
+
+	if field, ok := attributeEntityToFieldMap[attribute]; ok {
+		return field
+	}
+
+	return ""
 }

exporter/awsemfexporter/metric_translator.go

@@ -7,6 +7,7 @@ import (
 	"encoding/json"
 	"errors"
 	"fmt"
+	"github.com/open-telemetry/opentelemetry-collector-contrib/exporter/awsemfexporter/internal/entity"
 	"reflect"
 	"strings"
 	"time"
@@ -185,7 +186,11 @@ func translateGroupedMetricToCWMetric(groupedMetric *groupedMetric, config *Conf
 
 	// Add labels to fields
 	for k, v := range labels {
-		fields[k] = v
+		if strings.HasPrefix(k, entity.AWSEntityPrefix) {
+			fields[entity.GetEntityField(k, v)] = v
+		} else {
+			fields[k] = v
+		}
 	}
 	// Add metrics to fields
 	for metricName, metricInfo := range groupedMetric.metrics {
@@ -222,11 +227,13 @@ func groupedMetricToCWMeasurement(groupedMetric *groupedMetric, config *Config)
 	dimensionRollupOption := config.DimensionRollupOption
 
 	// Create a dimension set containing list of label names
-	dimSet := make([]string, len(labels))
+	dimSet := make([]string, 0, len(labels))
 	idx := 0
 	for labelName := range labels {
-		dimSet[idx] = labelName
-		idx++
+		if !strings.HasPrefix(labelName, entity.AWSEntityPrefix) {
+			dimSet[idx] = labelName
+			idx++
+		}
 	}
 	dimensions := [][]string{dimSet}
 
@@ -274,6 +281,13 @@ func groupedMetricToCWMeasurement(groupedMetric *groupedMetric, config *Config)
 func groupedMetricToCWMeasurementsWithFilters(groupedMetric *groupedMetric, config *Config) (cWMeasurements []cWMeasurement) {
 	labels := groupedMetric.labels
 
+	filteredLabels := make(map[string]string)
+	for k, v := range labels {
+		if !strings.HasPrefix(k, entity.AWSEntityPrefix) {
+			filteredLabels[k] = v
+		}
+	}
+
 	// Filter metric declarations by labels
 	metricDeclarations := make([]*MetricDeclaration, 0, len(config.MetricDeclarations))
 	for _, metricDeclaration := range config.MetricDeclarations {
@@ -343,15 +357,15 @@ func groupedMetricToCWMeasurementsWithFilters(groupedMetric *groupedMetric, conf
 	}
 
 	// Apply single/zero dimension rollup to labels
-	rollupDimensionArray := dimensionRollup(config.DimensionRollupOption, labels)
+	rollupDimensionArray := dimensionRollup(config.DimensionRollupOption, filteredLabels)
 
 	// Translate each group into a CW Measurement
 	cWMeasurements = make([]cWMeasurement, 0, len(metricDeclGroups))
 	for _, group := range metricDeclGroups {
 		var dimensions [][]string
 		// Extract dimensions from matched metric declarations
 		for _, metricDeclIdx := range group.metricDeclIdxList {
-			dims := metricDeclarations[metricDeclIdx].ExtractDimensions(labels)
+			dims := metricDeclarations[metricDeclIdx].ExtractDimensions(filteredLabels)
 			dimensions = append(dimensions, dims...)
 		}
 		dimensions = append(dimensions, rollupDimensionArray...)