Refactor ReceiveResourceSpans to share code with otelSpanToDDSpan fro…

cmd/serverless/dependencies_linux_amd64.txt

@@ -249,6 +249,7 @@ github.com/DataDog/datadog-agent/pkg/trace/stats
 github.com/DataDog/datadog-agent/pkg/trace/telemetry
 github.com/DataDog/datadog-agent/pkg/trace/timing
 github.com/DataDog/datadog-agent/pkg/trace/traceutil
+github.com/DataDog/datadog-agent/pkg/trace/transform
 github.com/DataDog/datadog-agent/pkg/trace/version
 github.com/DataDog/datadog-agent/pkg/trace/watchdog
 github.com/DataDog/datadog-agent/pkg/trace/writer

cmd/serverless/dependencies_linux_arm64.txt

@@ -249,6 +249,7 @@ github.com/DataDog/datadog-agent/pkg/trace/stats
 github.com/DataDog/datadog-agent/pkg/trace/telemetry
 github.com/DataDog/datadog-agent/pkg/trace/timing
 github.com/DataDog/datadog-agent/pkg/trace/traceutil
+github.com/DataDog/datadog-agent/pkg/trace/transform
 github.com/DataDog/datadog-agent/pkg/trace/version
 github.com/DataDog/datadog-agent/pkg/trace/watchdog
 github.com/DataDog/datadog-agent/pkg/trace/writer

comp/otelcol/otlp/components/exporter/datadogexporter/traces_exporter_test.go

@@ -48,6 +48,16 @@ func (c testComponent) SendStatsPayload(p *pb.StatsPayload) {
 var _ traceagent.Component = (*testComponent)(nil)
 
 func TestTraceExporter(t *testing.T) {
+	t.Run("ReceiveResourceSpansV1", func(t *testing.T) {
+		testTraceExporter(false, t)
+	})
+
+	t.Run("ReceiveResourceSpansV2", func(t *testing.T) {
+		testTraceExporter(true, t)
+	})
+}
+
+func testTraceExporter(enableReceiveResourceSpansV2 bool, t *testing.T) {
 	got := make(chan string, 1)
 	server := httptest.NewServer(http.HandlerFunc(func(rw http.ResponseWriter, req *http.Request) {
 		assert.Equal(t, "aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa", req.Header.Get("DD-Api-Key"))
@@ -77,6 +87,9 @@ func TestTraceExporter(t *testing.T) {
 	tcfg.TraceWriter.FlushPeriodSeconds = 0.1
 	tcfg.Endpoints[0].APIKey = "aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa"
 	tcfg.Endpoints[0].Host = server.URL
+	if enableReceiveResourceSpansV2 {
+		tcfg.Features["enable_receive_resource_spans_v2"] = struct{}{}
+	}
 	ctx := context.Background()
 	traceagent := pkgagent.NewAgent(ctx, tcfg, telemetry.NewNoopCollector(), &ddgostatsd.NoOpClient{}, gzip.NewComponent())
 
@@ -99,13 +112,26 @@ func TestTraceExporter(t *testing.T) {
 }
 
 func TestNewTracesExporter(t *testing.T) {
+	t.Run("ReceiveResourceSpansV1", func(t *testing.T) {
+		testNewTracesExporter(false, t)
+	})
+
+	t.Run("ReceiveResourceSpansV2", func(t *testing.T) {
+		testNewTracesExporter(true, t)
+	})
+}
+
+func testNewTracesExporter(enableReceiveResourceSpansV2 bool, t *testing.T) {
 	cfg := &Config{}
 	cfg.API.Key = "ddog_32_characters_long_api_key1"
 	params := exportertest.NewNopSettings()
 	tcfg := config.New()
 	tcfg.Endpoints[0].APIKey = "ddog_32_characters_long_api_key1"
 	ctx := context.Background()
 	tcfg.ReceiverEnabled = false
+	if enableReceiveResourceSpansV2 {
+		tcfg.Features["enable_receive_resource_spans_v2"] = struct{}{}
+	}
 	traceagent := pkgagent.NewAgent(ctx, tcfg, telemetry.NewNoopCollector(), &ddgostatsd.NoOpClient{}, gzip.NewComponent())
 
 	// The client should have been created correctly

comp/otelcol/otlp/components/statsprocessor/agent_test.go

@@ -44,11 +44,24 @@ func TestTraceAgentConfig(t *testing.T) {
 }
 
 func TestTraceAgent(t *testing.T) {
+	t.Run("ReceiveResourceSpansV1", func(t *testing.T) {
+		testTraceAgent(false, t)
+	})
+
+	t.Run("ReceiveResourceSpansV2", func(t *testing.T) {
+		testTraceAgent(true, t)
+	})
+}
+
+func testTraceAgent(enableReceiveResourceSpansV2 bool, t *testing.T) {
 	cfg := traceconfig.New()
 	attributesTranslator, err := attributes.NewTranslator(componenttest.NewNopTelemetrySettings())
 	require.NoError(t, err)
 	cfg.OTLPReceiver.AttributesTranslator = attributesTranslator
 	cfg.BucketInterval = 50 * time.Millisecond
+	if enableReceiveResourceSpansV2 {
+		cfg.Features["enable_receive_resource_spans_v2"] = struct{}{}
+	}
 	out := make(chan *pb.StatsPayload, 10)
 	ctx := context.Background()
 	_, metricClient, timingReporter := setupMetricClient()

pkg/config/config_template.yaml

@@ -1369,7 +1369,7 @@ api_key:
   ## The list of items available under apm_config.features is not guaranteed to persist across versions;
   ## a feature may eventually be promoted to its own configuration option on the agent, or dropped entirely.
   #
-  # features: ["error_rare_sample_tracer_drop","table_names","component2name","sql_cache","sqllexer","enable_otlp_compute_top_level_by_span_kind"]
+  # features: ["error_rare_sample_tracer_drop","table_names","component2name","sql_cache","sqllexer","enable_otlp_compute_top_level_by_span_kind","enable_receive_resource_spans_v2"]
 
   ## @param additional_endpoints - object - optional
   ## @env DD_APM_ADDITIONAL_ENDPOINTS - object - optional