Implement an Org Propagation Guard mechanism#11289
Open
amarziali wants to merge 6 commits into
Open
Conversation
36a2d96 to
58d4e2d
Compare
Contributor
|
Contributor
🟢 Java Benchmark SLOs — All performance SLOs passed
PR vs. master resultsStartup Time
Commit: Load and DaCapo benchmarks can be triggered manually in the GitLab pipeline. Results will appear in the Benchmarking Platform UI after completion. |
58d4e2d to
784f890
Compare
mcculls
reviewed
Jun 2, 2026
mcculls
reviewed
Jun 2, 2026
mcculls
reviewed
Jun 2, 2026
mcculls
approved these changes
Jun 2, 2026
Contributor
mcculls
left a comment
There was a problem hiding this comment.
Looks good - just some small suggestions
…/OrgGuardEnforcer.java Co-authored-by: Stuart McCulloch <stuart.mcculloch@datadoghq.com>
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
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.
What Does This Do
Adds the Org Propagation Guard (OPG): a propagation-layer check that prevents the part of the tracing context from leaking across organizational boundaries.
When enabled, every inbound trace is checked against the local Org Propagation Marker (OPM) reported by the Datadog Agent. If the inbound OPM doesn't match (or is absent in strict mode), sampling priority, origin, and
_dd.p.*propagation tags are dropped. Parent/trace IDs, W3C baggage, and non-ddvendor tracestate are kept. On the inject side, the local OPM is stamped onto outgoing requests so downstream services can do the same check.Off by default, with no overhead when disabled. When the agent hasn't reported a local OPM yet, enforcement is skipped entirely and the inbound context passes through unchanged, including any inbound OPM it carries.
Two additional knobs:
DD_TRACE_ORG_GUARD_STRICT=truealso enforces when the inbound OPM is absent (not just on mismatch)DD_TRACE_ORG_GUARD_TRUSTED_OPMSaccepts a comma-separated list of partner OPMs to allow throughEach enforcement emits an
org_guard.enforcemetric with areasontag (mismatchorstrict_missing).New configuration
DD_TRACE_ORG_GUARD_ENABLEDfalseDD_TRACE_ORG_GUARD_STRICTfalseDD_TRACE_ORG_GUARD_TRUSTED_OPMSMotivation
Additional Notes
System tests: DataDog/system-tests#6872
Contributor Checklist
type:and (comp:orinst:) labels in addition to any other useful labelsclose,fix, or any linking keywords when referencing an issueUse
solvesinstead, and assign the PR milestone to the issueJira ticket: [PROJ-IDENT]
Note: Once your PR is ready to merge, add it to the merge queue by commenting
/merge./merge -ccancels the queue request./merge -f --reason "reason"skips all merge queue checks; please use this judiciously, as some checks do not run at the PR-level. For more information, see this doc.