🍒 12028 - Stamp _dd.apm.enabled on every exported chunk when APM tracing is disabled#12068
Merged
Merged
Conversation
…abled (#12028) Stamp _dd.apm.enabled on every exported chunk when APM tracing is disabled Co-Authored-By: Claude Opus 4.8 (1M context) <noreply@anthropic.com> Mark the root-most span of each exported chunk with _dd.apm.enabled:0 Co-Authored-By: Claude Opus 4.8 (1M context) <noreply@anthropic.com> Cover root-less chunk fallback in ApmTracingDisabledChunkMarkerTest Co-Authored-By: Claude Opus 4.8 (1M context) <noreply@anthropic.com> Correct getLocalRootSpanTags comment to say root-most span Co-Authored-By: Claude Opus 4.8 (1M context) <noreply@anthropic.com> add standalone tag on every single span Tighten smoke-test to every-span assertion and clarify apmTracingEnabled javadoc Co-Authored-By: Claude Opus 4.8 (1M context) <noreply@anthropic.com> Merge branch 'master' into clara.poncet/apm-enabled-service-entry-span fix late outbound controller formatting Co-authored-by: devflow.devflow-routing-intake <devflow.devflow-routing-intake@kubernetes.us1.ddbuild.io> (cherry picked from commit 6821684)
dd-octo-sts
Bot
added
the
tag: ai generated
Contributor
|
Hi! 👋 Thanks for your pull request! 🎉 To help us review it, please make sure to:
If you need help, please check our contributing guidelines. |
![datadog-datadog-prod-us1[bot]](https://avatars.githubusercontent.com/u/365230?s=60&v=4){kind=small}
Contributor
There was a problem hiding this comment.
More details
The export-path change correctly applies _dd.apm.enabled:0 after sampling to every span in every accepted chunk, including rootless late-child and partial-flush chunks, while leaving APM-enabled traces unchanged. The targeted test could not execute in this sandbox because Java 25 is unavailable and Gradle downloads are blocked; source review found no clear behavioral regression.
🤖 Datadog Autotest · Commit d514187 · What is Autotest? · @DataDog review to ask questions · Any feedback? Reach out in #autotest
Contributor
🟢 Java Benchmark SLOs — All performance SLOs passed
PR vs. master results
Commit: Load and DaCapo benchmarks can be triggered manually in the GitLab pipeline. Results will appear in the Benchmarking Platform UI after completion. |
PerfectSlayer
approved these changes
Jul 27, 2026
Comment on lines
+5171
to
+5174
| // The _dd.apm.enabled:0 billing marker is intentionally NOT set here. When APM tracing is | ||
| // disabled it is stamped on every span of each exported chunk (see CoreTracer.write), so that | ||
| // chunks flushed without their local root span (e.g. a late child span) still opt out of APM | ||
| // host billing. |
Contributor
There was a problem hiding this comment.
🎯 suggestion: This kind of comment should go to the tag declaration instead.
| * marker. To make sure no chunk gets flushed without the correct billing tag, it gets added to | ||
| * every single span. These tests lock that in. | ||
| */ | ||
| @WithConfig(key = "apm.tracing.enabled", value = "false") |
Contributor
There was a problem hiding this comment.
🔨 issue: Use the config name constant instead of string literal
Contributor
|
The CI is failing with: |
claponcet
added
type: bug fix
Co-Authored-By: Claude Opus 4.8 (1M context) <noreply@anthropic.com>
This comment has been minimized.
This comment has been minimized.
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
2 participants
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.
Backport #12028 to release/v1.64.x