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 ✨

(anr) Profile main thread when ANR and report ANR profiles to Sentry by markushi in #4899

Add strict trace continuation support by giortzisg in #5136

Bug Fixes 🐛

Remove the dependency on protobuf-lite for tombstones by supervacuus in #5157

_{🤖 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 ea9f456

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

Performance metrics 🚀

	Plain	With Sentry	Diff
Startup time	320.20 ms	367.52 ms	47.33 ms
Size	0 B	0 B	0 B

Baseline results on branch: main

Startup times

Revision	Plain	With Sentry	Diff
`ee747ae`	386.94 ms	431.43 ms	44.49 ms
`539ca63`	313.51 ms	355.43 ms	41.92 ms
`22f4345`	312.78 ms	347.40 ms	34.62 ms
`9fbb112`	401.87 ms	515.87 ms	114.00 ms
`fcec2f2`	357.47 ms	447.32 ms	89.85 ms
`d15471f`	361.89 ms	378.07 ms	16.18 ms
`d15471f`	303.49 ms	439.08 ms	135.59 ms
`0eaac1e`	320.04 ms	369.52 ms	49.48 ms
`a5ab36f`	320.47 ms	389.77 ms	69.30 ms
`27d7cf8`	369.82 ms	422.62 ms	52.80 ms

App size

Revision	Plain	With Sentry	Diff
`ee747ae`	1.58 MiB	2.10 MiB	530.95 KiB
`539ca63`	1.58 MiB	2.12 MiB	551.41 KiB
`22f4345`	1.58 MiB	2.29 MiB	719.83 KiB
`9fbb112`	1.58 MiB	2.11 MiB	539.18 KiB
`fcec2f2`	1.58 MiB	2.12 MiB	551.50 KiB
`d15471f`	1.58 MiB	2.13 MiB	559.54 KiB
`d15471f`	1.58 MiB	2.13 MiB	559.54 KiB
`0eaac1e`	1.58 MiB	2.19 MiB	619.17 KiB
`a5ab36f`	1.58 MiB	2.12 MiB	555.26 KiB
`27d7cf8`	1.58 MiB	2.12 MiB	549.42 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
`bbab8da`	309.58 ms	363.22 ms	53.64 ms

App size

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

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

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.

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

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

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

CHANGELOG.md

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>

…x OTel overload, add option tests, make Dsn.orgId final - Remove PropagationContext.fromHeaders overload without SentryOptions; all callers now pass options (or null) explicitly instead of relying on Sentry.getCurrentScopes() - Add SentryOptions parameter to the OTel-facing fromHeaders(SentryTraceHeader, Baggage, SpanId) overload so OpenTelemetry integrations also check orgId - Make Dsn.orgId final and remove the setter — orgId is only set during DSN parsing in the constructor - Add tests for strictTraceContinuation and orgId options in ExternalOptionsTest, SentryOptionsTest, and ManifestMetadataReaderTest - Improve CHANGELOG entry with customer-facing description - Update API declarations (apiDump) Co-Authored-By: Claude Opus 4.6 <noreply@anthropic.com>

Co-Authored-By: Claude Opus 4.6 <noreply@anthropic.com>

sentry · 2026-03-09T13:34:09Z

Sentry Build Distribution

App	Version	Configuration
SDK Size	8.34.1 (1)	release

adinauer

Please also change SentryAutoConfigurationTest.kt in all 3 spring boot modules.

I assume it's OK to not backfill org ID on a frozen baggage (i.e. incoming baggage without org ID).

adinauer · 2026-03-09T13:35:24Z

sentry/src/main/java/io/sentry/ExternalOptions.java

    }

+    options.setStrictTraceContinuation(
+        propertiesProvider.getBooleanProperty("strict-trace-continuation"));


Suggested change

propertiesProvider.getBooleanProperty("strict-trace-continuation"));

propertiesProvider.getBooleanProperty("enable-strict-trace-continuation"));

Newer options all have the enable prefix

adinauer · 2026-03-09T13:42:24Z

...try/sentry-opentelemetry-core/src/main/java/io/sentry/opentelemetry/SentrySpanProcessor.java

              : TransactionContext.fromPropagationContext(
                  PropagationContext.fromHeaders(
-                      traceData.getSentryTraceHeader(), traceData.getBaggage(), spanId));
+                      traceData.getSentryTraceHeader(), traceData.getBaggage(), spanId, scopes.getOptions()));


We should also update OtelSentrySpanProcessor

adinauer · 2026-03-09T13:43:34Z

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

    return sampleRand == null ? 0.0 : sampleRand;
  }
+
+  static boolean shouldContinueTrace(


Let's also handle empty/blank strings here. Otherwise we'd silently be breaking traces.

adinauer · 2026-03-09T13:56:56Z

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

      final @NotNull Baggage baggage = Baggage.fromHeader(baggageHeaderStrings, logger);
-      return fromHeaders(traceHeader, baggage, null);
+
+      if (options != null && !shouldContinueTrace(options, baggage)) {


this seems to be duplicated since we're already checking in the other overload that we call here too

adinauer · 2026-03-09T13:57:33Z

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

+      final @Nullable SpanId spanId,
+      final @Nullable SentryOptions options) {
+    if (options != null && !shouldContinueTrace(options, baggage)) {
+      return new PropagationContext();


Implementation above logs a debug message, this does not. We should log here to give a hint why traces aren't being continued.

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 5 commits March 4, 2026 14:20

fix: Move changelog entry to Unreleased section

4545735

Format code

61ada6a

fix: Add missing 8.34.1 changelog section

360fc94

Co-Authored-By: Claude Opus 4.6 <noreply@anthropic.com>

merge: Resolve changelog conflict with main

ea9f456

Co-Authored-By: Claude Opus 4.6 <noreply@anthropic.com>

Format code

58bfc8e

adinauer reviewed Mar 9, 2026

View reviewed changes

	propertiesProvider.getBooleanProperty("strict-trace-continuation"));
	propertiesProvider.getBooleanProperty("enable-strict-trace-continuation"));

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 ✨

Bug Fixes 🐛

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!

Uh oh!

adinauer Mar 3, 2026

Choose a reason for hiding this comment

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

sentry bot commented Mar 9, 2026

Sentry Build Distribution

Uh oh!

adinauer left a comment

Choose a reason for hiding this comment

Uh oh!

adinauer Mar 9, 2026

Choose a reason for hiding this comment

Uh oh!

adinauer Mar 9, 2026

Choose a reason for hiding this comment

Uh oh!

adinauer Mar 9, 2026

Choose a reason for hiding this comment

Uh oh!

adinauer Mar 9, 2026

Choose a reason for hiding this comment

Uh oh!

adinauer Mar 9, 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