Refactor global labels removal in metrics aggregation process

Signed-off-by: Up Neck <[email protected]>

x-pack/apm-server/aggregation/lsm.go

@@ -81,7 +81,12 @@ func (a *Aggregator) Stop(ctx context.Context) error {
 // so that aggregator can consume events from intake.
 func (a *Aggregator) ProcessBatch(ctx context.Context, b *modelpb.Batch) error {
 	for _, e := range *b {
-		removeRUMGlobalLabels(e)
+		// Remove global labels for RUM services to avoid explosion of metric groups
+		// to track for servicetxmetrics.
+		// For consistency, this will remove labels for other aggregated metrics as well.
+		if isRumAgent(e.Agent.GetName()) {
+			removeGlobalLabels(e)
+		}
 	}
 	return a.baseaggregator.AggregateBatch(ctx, [16]byte{}, b)
 }
@@ -108,17 +113,17 @@ func wrapNextProcessor(processor modelpb.BatchProcessor) aggregators.Processor {
 	}
 }
 
-func removeRUMGlobalLabels(event *modelpb.APMEvent) {
-	// Remove global labels for RUM services to avoid explosion of metric groups
-	// to track for servicetxmetrics.
-	// For consistency, this will remove labels for other aggregated metrics as well.
-	switch event.GetAgent().GetName() {
+// Check Elastic Agent belongs to rum-services
+func isRumAgent(name string) bool {
+	switch name {
 	case "rum-js", "js-base", "android/java", "iOS/swift":
-	default:
-		return
+		return true
 	}
+	return false
+}
 
-	// Setting the labels to non-global so that they are ignored by the aggregator.
+// Setting the labels to non-global so that they are ignored by the aggregator.
+func removeGlobalLabels(event *modelpb.APMEvent) {
 	for _, v := range event.Labels {
 		v.Global = false
 	}

x-pack/apm-server/aggregation/lsm_test.go

@@ -0,0 +1,28 @@
+package aggregation
+
+import (
+	"testing"
+
+	"github.com/stretchr/testify/assert"
+)
+
+func TestIsRumAgent(t *testing.T) {
+	cases := []struct {
+		name   string
+		expect bool
+	}{
+		{"rum-js", true},
+		{"js-base", true},
+		{"android/java", true},
+		{"iOS/swift", true},
+		{"nodejs", false},
+		{"python", false},
+		{"java", false},
+		{"dotnet", false},
+	}
+
+	for _, tt := range cases {
+		got := isRumAgent(tt.name)
+		assert.Equal(t, tt.expect, got)
+	}
+}