feat: Add strict trace continuation support by giortzisg · Pull Request #5136 · getsentry/sentry-java

giortzisg · 2026-03-02T15:11:29Z

Summary

Extract org ID from DSN host (e.g., o123.ingest.sentry.io → "123")
Add strictTraceContinuation (boolean, default false) and orgId (String) options to SentryOptions
Propagate sentry-org_id in baggage / Dynamic Sampling Context
Validate incoming traces per the decision matrix (mismatched org → new trace; strict mode rejects missing org)

Decision Matrix

Baggage org	SDK org	strict=false	strict=true
1	1	Continue	Continue
None	1	Continue	New trace
1	None	Continue	New trace
None	None	Continue	Continue
1	2	New trace	New trace

Changes

Dsn.java — org ID extraction from host using ^o(\d+)\. regex
SentryOptions.java — strictTraceContinuation, orgId, and getEffectiveOrgId()
Baggage.java — ORG_ID DSCKey, getter/setter, population in setValuesFromTransaction/setValuesFromScope/fromEvent
PropagationContext.java — shouldContinueTrace() logic in fromHeaders()
Scopes.java — pass options to fromHeaders()

Test plan

DSN org ID extraction tests (5 cases)
PropagationContext decision matrix tests (10 cases)

Closes #5128

🤖 Generated with Claude Code

github-actions · 2026-03-02T15:11:53Z

Semver Impact of This PR

🟡 Minor (new features)

📋 Changelog Preview

This is how your changes will appear in the changelog.
Entries from this PR are highlighted with a left border (blockquote style).

New Features ✨

Add strict trace continuation support by giortzisg in #5136

_{🤖 This preview updates automatically when you update the PR.}

github-actions · 2026-03-02T15:12:21Z

	Messages
📖	Do not forget to update Sentry-docs with your feature once the pull request gets approved.

Generated by 🚫 dangerJS against 61ada6a

github-actions · 2026-03-02T15:31:05Z

Performance metrics 🚀

	Plain	With Sentry	Diff
Startup time	309.58 ms	363.22 ms	53.64 ms
Size	1.58 MiB	2.29 MiB	723.51 KiB

Baseline results on branch: main

Startup times

Revision	Plain	With Sentry	Diff
`91bb874`	314.47 ms	440.00 ms	125.53 ms
`dba088c`	333.98 ms	381.16 ms	47.18 ms
`d15471f`	310.66 ms	368.19 ms	57.53 ms
`bbc35bb`	298.53 ms	372.17 ms	73.64 ms
`d15471f`	307.28 ms	381.85 ms	74.57 ms
`ad8da22`	362.98 ms	453.94 ms	90.96 ms
`cf708bd`	408.35 ms	458.98 ms	50.63 ms
`96449e8`	361.30 ms	423.39 ms	62.09 ms
`27d7cf8`	309.43 ms	364.27 ms	54.85 ms
`91bb874`	311.00 ms	363.47 ms	52.47 ms

App size

Revision	Plain	With Sentry	Diff
`91bb874`	1.58 MiB	2.13 MiB	559.07 KiB
`dba088c`	1.58 MiB	2.13 MiB	558.99 KiB
`d15471f`	1.58 MiB	2.13 MiB	559.54 KiB
`bbc35bb`	1.58 MiB	2.12 MiB	553.01 KiB
`d15471f`	1.58 MiB	2.13 MiB	559.54 KiB
`ad8da22`	1.58 MiB	2.29 MiB	719.83 KiB
`cf708bd`	1.58 MiB	2.11 MiB	539.71 KiB
`96449e8`	1.58 MiB	2.11 MiB	539.35 KiB
`27d7cf8`	1.58 MiB	2.12 MiB	549.42 KiB
`91bb874`	1.58 MiB	2.13 MiB	559.07 KiB

Previous results on branch: feat/strict-trace-continuation

Startup times

Revision	Plain	With Sentry	Diff
`79a9407`	348.85 ms	428.10 ms	79.25 ms

App size

Revision	Plain	With Sentry	Diff
`79a9407`	1.58 MiB	2.29 MiB	723.70 KiB

adinauer · 2026-03-03T11:25:54Z

sentry/src/test/java/io/sentry/PropagationContextTest.kt

+  fun `strict=false, mismatched orgs - starts new trace`() {
+    val options = makeOptions(dsnOrgId = "2", strict = false)
+    val pc =
+      PropagationContext.fromHeaders(


invocations expect a wrong signature; in the future we should make sure to compile test sources and tests pass

adinauer · 2026-03-03T11:28:55Z

sentry/src/main/java/io/sentry/PropagationContext.java

      final @NotNull ILogger logger,
      final @Nullable String sentryTraceHeaderString,
      final @Nullable List<String> baggageHeaderStrings) {
+    return fromHeaders(logger, sentryTraceHeaderString, baggageHeaderStrings, null);


We could use Sentry.getCurrentScopes().getOptions() here to default to the current options.
The better fix would probably be to replace call sites with passing in options and remove this overload.
Since PropagationContext is marked internal, we're free to change / replace / remove methods.

adinauer · 2026-03-03T11:30:27Z

sentry/src/main/java/io/sentry/PropagationContext.java

    }
  }

  public static @NotNull PropagationContext fromHeaders(


This overload isn't covered. This means our OpenTelemetry integrations would not check orgId.

adinauer · 2026-03-03T11:32:14Z

sentry/src/main/java/io/sentry/SentryOptions.java

+   * When false, a mismatch between present org IDs will still start a new trace, but missing org
+   * IDs on either side are tolerated.
+   */
+  private boolean strictTraceContinuation = false;


We should add both of these options to ExternalOptions and ManifestMetadataReader as well.
There's no tests for options.
We have https://github.com/getsentry/sentry-java/blob/main/.cursor/rules/options.mdc which explains details around options in this SDK.

adinauer · 2026-03-03T11:35:52Z

sentry/src/main/java/io/sentry/Dsn.java

  private final @Nullable String secretKey;
  private final @NotNull String publicKey;
  private final @NotNull URI sentryUri;
+  private @Nullable String orgId;


This should be final

adinauer · 2026-03-03T11:36:09Z

sentry/src/main/java/io/sentry/Dsn.java

+    return orgId;
+  }
+
+  void setOrgId(final @Nullable String orgId) {


No setter needed here.

adinauer · 2026-03-03T11:48:53Z

CHANGELOG.md


 ### Features

+- Add strict trace continuation support ([#5136](https://github.com/getsentry/sentry-java/pull/5136))


We should add some description here for customers to explain what this means for them.
We should also mention the new options.

Extract org ID from DSN host, add strictTraceContinuation and orgId options, propagate sentry-org_id in baggage, and validate incoming traces per the decision matrix. Closes #5128

Add public API declarations for new org ID and strict trace continuation methods on Baggage, PropagationContext, and SentryOptions. Co-Authored-By: Claude Opus 4.6 <noreply@anthropic.com>

- Make Dsn.orgId final, remove unnecessary setter - Fix test signatures to use List<String> for baggage headers - Add strictTraceContinuation and orgId to ExternalOptions and merge() - Add options to ManifestMetadataReader for Android manifest config - Use Sentry.getCurrentScopes().getOptions() in legacy fromHeaders overload - Improve CHANGELOG description with details about new options - Update API surface file for ExternalOptions changes Co-Authored-By: Claude Opus 4.6 <noreply@anthropic.com>

- Add comment to empty catch block in PropagationContext to satisfy -Werror - Add setOrgId setter to Dsn class (remove final modifier on orgId field) to support the existing test for org ID override Co-Authored-By: Claude Opus 4.6 <noreply@anthropic.com>

adinauer reviewed Mar 3, 2026

View reviewed changes

giortzisg and others added 6 commits March 4, 2026 14:01

feat: Add strict trace continuation support

dc8d319

Extract org ID from DSN host, add strictTraceContinuation and orgId options, propagate sentry-org_id in baggage, and validate incoming traces per the decision matrix. Closes #5128

Format code

e550ae3

Add changelog entry

c272ee4

Update API surface file for strict trace continuation

1cfc2ea

Add public API declarations for new org ID and strict trace continuation methods on Baggage, PropagationContext, and SentryOptions. Co-Authored-By: Claude Opus 4.6 <noreply@anthropic.com>

giortzisg force-pushed the feat/strict-trace-continuation branch from 457e177 to e30064c Compare March 4, 2026 13:14

giortzisg and others added 2 commits March 4, 2026 14:20

fix: Move changelog entry to Unreleased section

4545735

Format code

61ada6a


		### Features

		- Add strict trace continuation support ([#5136](https://github.com/getsentry/sentry-java/pull/5136))

Uh oh!

Conversation

giortzisg commented Mar 2, 2026

Summary

Decision Matrix

Changes

Test plan

Uh oh!

github-actions bot commented Mar 2, 2026 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Semver Impact of This PR

New Features ✨

Uh oh!

github-actions bot commented Mar 2, 2026 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Uh oh!

github-actions bot commented Mar 2, 2026 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Performance metrics 🚀

Baseline results on branch: main

Startup times

App size

Previous results on branch: feat/strict-trace-continuation

Startup times

App size

Uh oh!

adinauer Mar 3, 2026

Choose a reason for hiding this comment

Uh oh!

adinauer Mar 3, 2026

Choose a reason for hiding this comment

Uh oh!

adinauer Mar 3, 2026

Choose a reason for hiding this comment

Uh oh!

adinauer Mar 3, 2026

Choose a reason for hiding this comment

Uh oh!

adinauer Mar 3, 2026

Choose a reason for hiding this comment

Uh oh!

adinauer Mar 3, 2026

Choose a reason for hiding this comment

Uh oh!

adinauer Mar 3, 2026

Choose a reason for hiding this comment

Uh oh!

Reviewers

Assignees

Labels

Projects

Milestone

Development

Uh oh!

3 participants

github-actions bot commented Mar 2, 2026 •

edited

Loading

github-actions bot commented Mar 2, 2026 •

edited

Loading

github-actions bot commented Mar 2, 2026 •

edited

Loading