Skip to content

Fix stale _dd.dsm.enabled tag after remote config toggles Data Streams #12939

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 2 commits into
base: master
Choose a base branch
from
+47 −1
Open

Fix stale _dd.dsm.enabled tag after remote config toggles Data Streams #12939

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
cbb0e82
Rebuild tracer tags when remote config toggles Data Streams
dougqh Oct 19, 2026
3b8dd31
Test that remote config DSM toggle updates tracer tags
dougqh Oct 19, 2026
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
4 changes: 3 additions & 1 deletion dd-trace-core/src/main/java/datadog/trace/core/CoreTracer.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2610,7 +2610,9 @@ protected ConfigSnapshot(
if (null == oldSnapshot) {
mergedTracerTags = CoreTracer.this.defaultSpanTags.immutableCopy();
this.mergedTracerTagsNeedsIntercept = CoreTracer.this.defaultSpanTagsNeedsIntercept;
} else if (getTracingTags().equals(oldSnapshot.getTracingTags())) {
} else if (getTracingTags().equals(oldSnapshot.getTracingTags())
// withTracerTags also depends on whether Data Streams Monitoring is enabled
&& isDataStreamsEnabled() == oldSnapshot.isDataStreamsEnabled()) {
mergedTracerTags = oldSnapshot.mergedTracerTags;
mergedTracerTagsNeedsIntercept = oldSnapshot.mergedTracerTagsNeedsIntercept;
} else {
Expand Down
44 changes: 44 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 @@ -597,6 +597,50 @@ void verifyConfigurationPollingWithCustomTags(
}
}

/**
* Remote config can enable Data Streams Monitoring without changing the tracing tags; the tags
* every span starts with must still pick up (and later drop) {@code _dd.dsm.enabled}.
*/
@Test
void remoteConfigDataStreamsToggleUpdatesTracerTags() 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));

CoreTracer tracer =
CoreTracer.builder().sharedCommunicationObjects(sco).pollForTracingConfiguration().build();
unclosedTracers.add(tracer);

try {
assertFalse(tracer.captureTraceConfig().isDataStreamsEnabled());
assertFalse(tracer.captureTraceConfig().mergedTracerTags.containsKey(DDTags.DSM_ENABLED));

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

ConfigSnapshot config = tracer.captureTraceConfig();
assertTrue(config.isDataStreamsEnabled());
assertEquals(1, config.mergedTracerTags.get(DDTags.DSM_ENABLED));

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

assertFalse(tracer.captureTraceConfig().mergedTracerTags.containsKey(DDTags.DSM_ENABLED));
} finally {
tracer.close();
}
}

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