fix tests

Author: songy23

cmd/otel-agent/config/agent_config_test.go

@@ -60,7 +60,7 @@ func (suite *ConfigTestSuite) TestAgentConfig() {
 	assert.Equal(t, false, c.Get("apm_config.receiver_enabled"))
 	assert.Equal(t, 10, c.Get("apm_config.trace_buffer"))
 	assert.Equal(t, false, c.Get("otlp_config.traces.span_name_as_resource_name"))
-	assert.Equal(t, []string{"disable_operation_and_resource_name_logic_v2"}, c.Get("apm_config.features"))
+	assert.Equal(t, []string{}, c.Get("apm_config.features"))
 }
 
 func (suite *ConfigTestSuite) TestAgentConfigDefaults() {
@@ -82,12 +82,12 @@ func (suite *ConfigTestSuite) TestAgentConfigDefaults() {
 	assert.Equal(t, "https://trace.agent.datadoghq.com", c.Get("apm_config.apm_dd_url"))
 	assert.Equal(t, false, c.Get("apm_config.receiver_enabled"))
 	assert.Equal(t, false, c.Get("otlp_config.traces.span_name_as_resource_name"))
-	assert.Equal(t, []string{"disable_operation_and_resource_name_logic_v2", "enable_otlp_compute_top_level_by_span_kind"},
+	assert.Equal(t, []string{"enable_otlp_compute_top_level_by_span_kind"},
 		c.Get("apm_config.features"))
 }
 
-func (suite *ConfigTestSuite) TestOperationAndResourceNameV2FeatureGate() {
-	featuregate.GlobalRegistry().Set("datadog.EnableOperationAndResourceNameV2", true)
+func (suite *ConfigTestSuite) TestDisableOperationAndResourceNameV2FeatureGate() {
+	featuregate.GlobalRegistry().Set("datadog.EnableOperationAndResourceNameV2", false)
 	t := suite.T()
 	fileName := "testdata/config_default.yaml"
 	c, err := NewConfigComponent(context.Background(), "", []string{fileName})
@@ -106,7 +106,7 @@ func (suite *ConfigTestSuite) TestOperationAndResourceNameV2FeatureGate() {
 	assert.Equal(t, "https://trace.agent.datadoghq.com", c.Get("apm_config.apm_dd_url"))
 	assert.Equal(t, false, c.Get("apm_config.receiver_enabled"))
 	assert.Equal(t, false, c.Get("otlp_config.traces.span_name_as_resource_name"))
-	assert.Equal(t, []string{"enable_otlp_compute_top_level_by_span_kind"},
+	assert.Equal(t, []string{"disable_operation_and_resource_name_logic_v2", "enable_otlp_compute_top_level_by_span_kind"},
 		c.Get("apm_config.features"))
 }
 
@@ -165,7 +165,7 @@ func (suite *ConfigTestSuite) TestAgentConfigWithDatadogYamlDefaults() {
 	assert.Equal(t, "https://trace.agent.datadoghq.com", c.Get("apm_config.apm_dd_url"))
 	assert.Equal(t, false, c.Get("apm_config.receiver_enabled"))
 	assert.Equal(t, false, c.Get("otlp_config.traces.span_name_as_resource_name"))
-	assert.Equal(t, []string{"disable_operation_and_resource_name_logic_v2", "enable_otlp_compute_top_level_by_span_kind"}, c.Get("apm_config.features"))
+	assert.Equal(t, []string{"enable_otlp_compute_top_level_by_span_kind"}, c.Get("apm_config.features"))
 
 	// log_level from datadog.yaml takes precedence -> more verbose
 	assert.Equal(t, "debug", c.Get("log_level"))

comp/otelcol/ddflareextension/impl/testdata/simple-dd/config-enhanced-result.yaml

@@ -27,7 +27,7 @@ exporters:
         mode: distributions
         send_aggregation_metrics: false
         send_count_sum_metrics: false
-      instrumentation_scope_metadata_as_tags: false
+      instrumentation_scope_metadata_as_tags: true
       resource_attributes_as_tags: false
       summaries:
         mode: gauges

comp/otelcol/ddflareextension/impl/testdata/simple-dd/config-provided-result.yaml

@@ -27,7 +27,7 @@ exporters:
         mode: distributions
         send_aggregation_metrics: false
         send_count_sum_metrics: false
-      instrumentation_scope_metadata_as_tags: false
+      instrumentation_scope_metadata_as_tags: true
       resource_attributes_as_tags: false
       summaries:
         mode: gauges

comp/otelcol/otlp/components/exporter/serializerexporter/exporter_test.go

@@ -67,11 +67,12 @@ const (
 
 func Test_ConsumeMetrics_Tags(t *testing.T) {
 	tests := []struct {
-		name           string
-		genMetrics     func(t *testing.T) pmetric.Metrics
-		wantSketchTags tagset.CompositeTags
-		wantSerieTags  tagset.CompositeTags
-		extraTags      []string
+		name                               string
+		genMetrics                         func(t *testing.T) pmetric.Metrics
+		wantSketchTags                     tagset.CompositeTags
+		wantSerieTags                      tagset.CompositeTags
+		extraTags                          []string
+		instrumentationScopeMetadataAsTags bool
 	}{
 		{
 			name: "no tags",
@@ -176,6 +177,31 @@ func Test_ConsumeMetrics_Tags(t *testing.T) {
 				nil,
 			),
 		},
+		{
+			name: "instrumentation scope metadata as tags",
+			genMetrics: func(_ *testing.T) pmetric.Metrics {
+				h := pmetric.NewHistogramDataPoint()
+				h.BucketCounts().FromRaw([]uint64{100})
+				h.SetCount(100)
+				h.SetSum(0)
+
+				n := pmetric.NewNumberDataPoint()
+				n.SetIntValue(777)
+				md := newMetrics(histogramMetricName, h, numberMetricName, n)
+				scope := md.ResourceMetrics().At(0).ScopeMetrics().At(0).Scope()
+				scope.SetName("my_library")
+				scope.SetVersion("v1.0.0")
+				return md
+			},
+			extraTags: []string{},
+			wantSketchTags: tagset.NewCompositeTags([]string{
+				"instrumentation_scope:my_library", "instrumentation_scope_version:v1.0.0",
+			}, nil),
+			wantSerieTags: tagset.NewCompositeTags([]string{
+				"instrumentation_scope:my_library", "instrumentation_scope_version:v1.0.0",
+			}, nil),
+			instrumentationScopeMetadataAsTags: true,
+		},
 	}
 	for _, tt := range tests {
 		t.Run(tt.name, func(t *testing.T) {
@@ -185,6 +211,7 @@ func Test_ConsumeMetrics_Tags(t *testing.T) {
 				return "", nil
 			}, nil, otel.NewDisabledGatewayUsage())
 			cfg := f.CreateDefaultConfig().(*ExporterConfig)
+			cfg.Metrics.Metrics.ExporterConfig.InstrumentationScopeMetadataAsTags = tt.instrumentationScopeMetadataAsTags
 			cfg.Metrics.Tags = strings.Join(tt.extraTags, ",")
 			exp, err := f.CreateMetrics(
 				ctx,

test/new-e2e/tests/otel/otel-agent/testdata/minimal-full-config.yml

@@ -38,7 +38,7 @@ exporters:
         mode: distributions
         send_aggregation_metrics: false
         send_count_sum_metrics: false
-      instrumentation_scope_metadata_as_tags: false
+      instrumentation_scope_metadata_as_tags: true
       resource_attributes_as_tags: true
       summaries:
         mode: gauges

test/new-e2e/tests/otel/otel-agent/testdata/minimal-provided-config.yml

@@ -38,7 +38,7 @@ exporters:
         mode: distributions
         send_aggregation_metrics: false
         send_count_sum_metrics: false
-      instrumentation_scope_metadata_as_tags: false
+      instrumentation_scope_metadata_as_tags: true
       resource_attributes_as_tags: true
       summaries:
         mode: gauges

test/new-e2e/tests/otel/otel-agent/testdata/no-dd-exporter-full-config.yml

@@ -25,7 +25,7 @@ exporters:
         mode: distributions
         send_aggregation_metrics: false
         send_count_sum_metrics: false
-      instrumentation_scope_metadata_as_tags: false
+      instrumentation_scope_metadata_as_tags: true
       resource_attributes_as_tags: false
       summaries:
         mode: gauges

test/new-e2e/tests/otel/otel-agent/testdata/no-dd-exporter-provided-config.yml

@@ -25,7 +25,7 @@ exporters:
         mode: distributions
         send_aggregation_metrics: false
         send_count_sum_metrics: false
-      instrumentation_scope_metadata_as_tags: false
+      instrumentation_scope_metadata_as_tags: true
       resource_attributes_as_tags: false
       summaries:
         mode: gauges