Populate scope attributes from 'otel_scope_' labels. Deprecate otel_scope_info

Signed-off-by: Arthur Silva Sens <[email protected]>

Author: ArthurSens

receiver/prometheusreceiver/internal/metricfamily.go

@@ -360,6 +360,13 @@ func populateAttributes(mType pmetric.MetricType, ls labels.Labels, dest pcommon
 		if j < len(names) && l.Name == names[j] {
 			return
 		}
+
+		// When removeScopeInfo feature gate is enabled, filter out otel_scope_ prefixed labels
+		// as they are now extracted as scope attributes instead of datapoint attributes
+		if RemoveScopeInfoGate.IsEnabled() && strings.HasPrefix(l.Name, "otel_scope_") {
+			return
+		}
+
 		if l.Value == "" {
 			// empty label values should be omitted
 			return

receiver/prometheusreceiver/internal/metricfamily_test.go

@@ -5,6 +5,7 @@ package internal
 
 import (
 	"math"
+	"strings"
 	"testing"
 	"time"
 
@@ -17,6 +18,8 @@ import (
 	"go.opentelemetry.io/collector/pdata/pcommon"
 	"go.opentelemetry.io/collector/pdata/pmetric"
 	"go.uber.org/zap"
+
+	"github.com/open-telemetry/opentelemetry-collector-contrib/internal/common/testutil"
 )
 
 type testMetadataStore map[string]scrape.MetricMetadata
@@ -773,6 +776,93 @@ func TestMetricGroupData_toSummaryUnitTest(t *testing.T) {
 	}
 }
 
+func TestPopulateAttributes_ScopeLabelFiltering(t *testing.T) {
+	tests := []struct {
+		name           string
+		labels         labels.Labels
+		featureEnabled bool
+		wantAttrs      map[string]string
+	}{
+		{
+			name: "feature_disabled_keeps_scope_labels",
+			labels: labels.FromStrings(
+				"__name__", "test_metric",
+				"job", "test-job",
+				"instance", "localhost:8080",
+				"method", "GET",
+				"otel_scope_animal", "bear",
+				"otel_scope_color", "blue",
+			),
+			featureEnabled: false,
+			wantAttrs: map[string]string{
+				"method":            "GET",
+				"otel_scope_animal": "bear",
+				"otel_scope_color":  "blue",
+			},
+		},
+		{
+			name: "feature_enabled_filters_scope_labels",
+			labels: labels.FromStrings(
+				"__name__", "test_metric",
+				"job", "test-job",
+				"instance", "localhost:8080",
+				"method", "GET",
+				"otel_scope_animal", "bear",
+				"otel_scope_color", "blue",
+			),
+			featureEnabled: true,
+			wantAttrs: map[string]string{
+				"method": "GET",
+				// otel_scope_* labels should be filtered out
+			},
+		},
+		{
+			name: "feature_enabled_keeps_standard_scope_labels_filtered",
+			labels: labels.FromStrings(
+				"__name__", "test_metric",
+				"job", "test-job",
+				"instance", "localhost:8080",
+				"method", "GET",
+				"otel_scope_name", "my-scope",
+				"otel_scope_version", "1.0.0",
+				"otel_scope_animal", "bear",
+			),
+			featureEnabled: true,
+			wantAttrs: map[string]string{
+				"method": "GET",
+				// All otel_scope_* labels should be filtered out
+			},
+		},
+	}
+
+	for _, tt := range tests {
+		t.Run(tt.name, func(t *testing.T) {
+			defer testutil.SetFeatureGateForTest(t, RemoveScopeInfoGate, tt.featureEnabled)()
+
+			attrs := pcommon.NewMap()
+			populateAttributes(pmetric.MetricTypeGauge, tt.labels, attrs)
+
+			// Verify expected attributes
+			require.Equal(t, len(tt.wantAttrs), attrs.Len(), "Unexpected number of attributes")
+
+			for key, expectedValue := range tt.wantAttrs {
+				actualValue, exists := attrs.Get(key)
+				require.True(t, exists, "Expected attribute %s not found", key)
+				require.Equal(t, expectedValue, actualValue.AsString(), "Unexpected value for attribute %s", key)
+			}
+
+			// Verify no otel_scope_ attributes when feature is enabled
+			if tt.featureEnabled {
+				attrs.Range(func(k string, _ pcommon.Value) bool {
+					require.False(t, strings.HasPrefix(k, "otel_scope_"),
+						"Found otel_scope_ prefixed attribute %s when feature gate is enabled", k)
+					return true
+				})
+			}
+		})
+	}
+}
+
 func TestMetricGroupData_toNumberDataUnitTest(t *testing.T) {
 	type scrape struct {
 		at     int64