Skip to content

Add test for remote config tracing tags overriding DD_TAGS (OTLP trace/resource-level split) #12936

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
dougqh wants to merge 1 commit into
base: master
Choose a base branch
from
+51 −0
Open

Add test for remote config tracing tags overriding DD_TAGS (OTLP trace/resource-level split) #12936

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
51 changes: 51 additions & 0 deletions dd-trace-core/src/test/java/datadog/trace/core/CoreTracerTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -50,6 +50,7 @@
import java.util.LinkedHashMap;
import java.util.List;
import java.util.Map;
import java.util.Properties;
import java.util.concurrent.CopyOnWriteArrayList;
import java.util.concurrent.TimeUnit;
import okhttp3.HttpUrl;
Expand Down Expand Up @@ -597,6 +598,56 @@ void verifyConfigurationPollingWithCustomTags(
}
}

/**
* Remote config {@code tracing_tags} overrides the global tags ({@code DD_TAGS}), and removing
* the override restores them, matching system-tests' {@code
* TestDynamicConfigV2.test_tracing_client_tracing_tags}.
*/
@Test
void remoteConfigTracingTagsOverrideGlobalTags() throws Exception {
ParsedConfigKey key = ParsedConfigKey.parse("datadog/2/APM_TRACING/config_overrides/config");
ConfigurationPoller poller = mock(ConfigurationPoller.class);
SharedCommunicationObjects sco = createScoWithPoller(poller);

ProductListener[] capturedUpdater = {null};
doAnswer(
inv -> {
capturedUpdater[0] = inv.getArgument(1, ProductListener.class);
return null;
})
.when(poller)
.addListener(eq(Product.APM_TRACING), any(ProductListener.class));

Properties properties = new Properties();
properties.setProperty(GeneralConfig.TAGS, "local_key:local_val");
CoreTracer tracer =
CoreTracer.builder()
.withProperties(properties)

@mhlidd mhlidd Oct 20, 2026

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Nit: Can we avoid using .withProperties by using @WithConfig instead? The rest of this file uses @WithConfig and this would remove the need to import Properties.

.sharedCommunicationObjects(sco)
.pollForTracingConfiguration()
.build();
unclosedTracers.add(tracer);

try {
Map<String, String> localTags = buildStringMap("local_key", "local_val");
assertEquals(localTags, tracer.captureTraceConfig().mergedTracerTags);

String json = "{\"lib_config\":{\"tracing_tags\": [\"rc_key:rc_val\"]}}";
capturedUpdater[0].accept(key, json.getBytes(StandardCharsets.UTF_8), null);
capturedUpdater[0].commit(null);

assertEquals(
buildStringMap("rc_key", "rc_val"), tracer.captureTraceConfig().mergedTracerTags);

capturedUpdater[0].remove(key, null);
capturedUpdater[0].commit(null);

assertEquals(localTags, tracer.captureTraceConfig().mergedTracerTags);
} finally {
tracer.close();
}
}

static final String ACTION_JSON =
"'{\"action\": \"enable\", \"lib_config\":"
+ "{\"tracing_sampling_rate\": null,"
Expand Down
Loading