fix merge conflict

DataDog · Dec 18, 2024 · ca211b5 · ca211b5
1 parent f409fc1
commit ca211b5
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 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
@@ -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
@@ -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