From ca211b534ed42aed3ada8765067211b5eb2277cd Mon Sep 17 00:00:00 2001 From: Yang Song Date: Wed, 18 Dec 2024 17:42:58 -0500 Subject: [PATCH] fix merge conflict --- .../otel/otel-agent/testdata/no-dd-exporter-full-config.yml | 2 +- .../otel/otel-agent/testdata/no-dd-exporter-provided-config.yml | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/test/new-e2e/tests/otel/otel-agent/testdata/no-dd-exporter-full-config.yml b/test/new-e2e/tests/otel/otel-agent/testdata/no-dd-exporter-full-config.yml index c6b9b49a44110..e0276e1bb2aa3 100644 --- a/test/new-e2e/tests/otel/otel-agent/testdata/no-dd-exporter-full-config.yml +++ b/test/new-e2e/tests/otel/otel-agent/testdata/no-dd-exporter-full-config.yml @@ -85,7 +85,7 @@ exporters: peer_service_aggregation: false peer_tags: [] peer_tags_aggregation: false - span_name_as_resource_name: true + span_name_as_resource_name: false span_name_remappings: {} trace_buffer: 0 write_buffer_size: 0 diff --git a/test/new-e2e/tests/otel/otel-agent/testdata/no-dd-exporter-provided-config.yml b/test/new-e2e/tests/otel/otel-agent/testdata/no-dd-exporter-provided-config.yml index 6128f4ce1156e..b97863a32c71c 100644 --- a/test/new-e2e/tests/otel/otel-agent/testdata/no-dd-exporter-provided-config.yml +++ b/test/new-e2e/tests/otel/otel-agent/testdata/no-dd-exporter-provided-config.yml @@ -85,7 +85,7 @@ exporters: peer_service_aggregation: false peer_tags: [] peer_tags_aggregation: false - span_name_as_resource_name: true + span_name_as_resource_name: false span_name_remappings: {} trace_buffer: 0 write_buffer_size: 0