feat: Add strict trace continuation support

[giortzisg]

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]

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]

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

Generated by 🚫 dangerJS against 25e71db

[github-actions]

Performance metrics 🚀

	Plain	With Sentry	Diff
Startup time	321.63 ms	391.84 ms	70.21 ms
Size	0 B	0 B	0 B

Baseline results on branch: main

Startup times

Revision	Plain	With Sentry	Diff
abfcc92	309.54 ms	380.32 ms	70.78 ms
b3d8889	371.84 ms	447.49 ms	75.65 ms
55aaf9b	341.96 ms	399.96 ms	58.00 ms
9139b91	351.35 ms	355.63 ms	4.28 ms
ee747ae	554.98 ms	611.50 ms	56.52 ms
674d437	355.28 ms	504.18 ms	148.90 ms
f064536	329.00 ms	395.62 ms	66.62 ms
ee747ae	415.92 ms	470.15 ms	54.23 ms
1df7eb6	397.04 ms	429.64 ms	32.60 ms
d217708	355.34 ms	381.39 ms	26.05 ms

App size

Revision	Plain	With Sentry	Diff
abfcc92	1.58 MiB	2.13 MiB	557.31 KiB
b3d8889	1.58 MiB	2.10 MiB	535.07 KiB
55aaf9b	0 B	0 B	0 B
9139b91	1.58 MiB	2.13 MiB	559.52 KiB
ee747ae	1.58 MiB	2.10 MiB	530.95 KiB
674d437	1.58 MiB	2.10 MiB	530.94 KiB
f064536	1.58 MiB	2.20 MiB	633.90 KiB
ee747ae	1.58 MiB	2.10 MiB	530.95 KiB
1df7eb6	1.58 MiB	2.10 MiB	532.97 KiB
d217708	1.58 MiB	2.10 MiB	532.97 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
455f13a	320.20 ms	367.52 ms	47.33 ms
f4b6f75	392.12 ms	440.69 ms	48.57 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
455f13a	0 B	0 B	0 B
f4b6f75	0 B	0 B	0 B
bbab8da	1.58 MiB	2.29 MiB	723.51 KiB

[sentry]

Sentry Build Distribution

App Name	App ID	Version	Configuration	Install Page
SDK Size	io.sentry.tests.size	8.37.0 (1)	release	Install Build

[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).

[sentry]

Sentry Build Distribution

App	Version	Configuration
SDK Size	8.34.1 (1)	release

[cursor]

Cursor Bugbot has reviewed your changes and found 1 potential issue.

Autofix Details

Bugbot Autofix prepared a fix for the issue found in the latest run.

• ✅ Fixed: Empty/blank orgId bypasses DSN fallback silently
  • getEffectiveOrgId() now treats empty or whitespace-only configured org IDs as unset so DSN org ID fallback is used, and a unit test was added to cover empty/blank inputs.

Or push these changes by commenting:

@cursor push 1b0f711f6d

Preview (1b0f711f6d)

diff --git a/sentry/src/main/java/io/sentry/SentryOptions.java b/sentry/src/main/java/io/sentry/SentryOptions.java
--- a/sentry/src/main/java/io/sentry/SentryOptions.java
+++ b/sentry/src/main/java/io/sentry/SentryOptions.java
@@ -2337,7 +2337,7 @@
    */
   @ApiStatus.Internal
   public @Nullable String getEffectiveOrgId() {
-    if (orgId != null) {
+    if (orgId != null && !orgId.trim().isEmpty()) {
       return orgId;
     }
     try {

diff --git a/sentry/src/test/java/io/sentry/SentryOptionsTest.kt b/sentry/src/test/java/io/sentry/SentryOptionsTest.kt
--- a/sentry/src/test/java/io/sentry/SentryOptionsTest.kt
+++ b/sentry/src/test/java/io/sentry/SentryOptionsTest.kt
@@ -1020,6 +1020,19 @@
   }
 
   @Test
+  fun `getEffectiveOrgId falls back to DSN org id when explicit orgId is empty or blank`() {
+    val emptyOrgIdOptions = SentryOptions()
+    emptyOrgIdOptions.dsn = "https://key@o123.ingest.sentry.io/456"
+    emptyOrgIdOptions.orgId = ""
+    assertEquals("123", emptyOrgIdOptions.effectiveOrgId)
+
+    val blankOrgIdOptions = SentryOptions()
+    blankOrgIdOptions.dsn = "https://key@o123.ingest.sentry.io/456"
+    blankOrgIdOptions.orgId = "   "
+    assertEquals("123", blankOrgIdOptions.effectiveOrgId)
+  }
+
+  @Test
   fun `getEffectiveOrgId falls back to DSN org id`() {
     val options = SentryOptions()
     options.dsn = "https://key@o123.ingest.sentry.io/456"

_{This Bugbot Autofix run was free. To enable autofix for future PRs, go to the Cursor dashboard.}

[cursor]

Cursor Bugbot has reviewed your changes and found 1 potential issue.

^{Bugbot Autofix is OFF. To automatically fix reported issues with cloud agents, enable autofix in the Cursor dashboard.}

[cursor]

Redundant trim of already-trimmed effective org ID

Low Severity

shouldContinueTrace re-trims and re-checks getEffectiveOrgId() for emptiness, but getEffectiveOrgId() already guarantees it returns either null or a trimmed, non-empty string. The defensive wrapping of rawSdkOrgId into sdkOrgId is wholly redundant — it can never produce a different result from simply using rawSdkOrgId directly.