Move entity field removal logic

exporter/awsemfexporter/datapoint.go

@@ -7,6 +7,7 @@ import (
 	"fmt"
 	"math"
 	"strconv"
+	"strings"
 	"time"
 
 	"go.opentelemetry.io/collector/pdata/pcommon"
@@ -18,6 +19,7 @@ import (
 )
 
 const (
+	AWSEntityPrefix    = "com.amazonaws.cloudwatch.entity.internal."
 	summaryCountSuffix = "_count"
 	summarySumSuffix   = "_sum"
 )
@@ -534,6 +536,9 @@ func createLabels(attributes pcommon.Map) map[string]string {
 		labels[k] = v.AsString()
 		return true
 	})
+	attributes.RemoveIf(func(k string, _ pcommon.Value) bool {
+		return strings.HasPrefix(k, AWSEntityPrefix)
+	})
 
 	return labels
 }

exporter/awsemfexporter/emf_exporter.go

@@ -26,8 +26,6 @@ import (
 )
 
 const (
-	AWSEntityPrefix = "com.amazonaws.cloudwatch.entity.internal."
-
 	// OutputDestination Options
 	outputDestinationCloudWatch = "cloudwatch"
 	outputDestinationStdout     = "stdout"
@@ -93,7 +91,6 @@ func (emf *emfExporter) pushMetricsData(_ context.Context, md pmetric.Metrics) e
 	for i := 0; i < rms.Len(); i++ {
 		rm := rms.At(i)
 		am := rm.Resource().Attributes()
-		removeEntityFields(am)
 		if am.Len() > 0 {
 			am.Range(func(k string, v pcommon.Value) bool {
 				labels[k] = v.Str()
@@ -248,10 +245,3 @@ func wrapErrorIfBadRequest(err error) error {
 	}
 	return err
 }
-
-// removeEntityFields so that it is not tagged as a dimension, and reduces the size of the PMD payload.
-func removeEntityFields(mutableResourceAttributes pcommon.Map) {
-	mutableResourceAttributes.RemoveIf(func(s string, _ pcommon.Value) bool {
-		return strings.HasPrefix(s, AWSEntityPrefix)
-	})
-}