fix: Address review comments — pass options to PropagationContext, fi…

…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>

CHANGELOG.md

@@ -4,11 +4,10 @@
 
 ### Features
 
-- Add strict trace continuation support ([#5136](https://github.com/getsentry/sentry-java/pull/5136))
-  - The SDK now extracts `org_id` from the DSN host and propagates it via `sentry-org_id` in the baggage header.
-  - When an incoming trace has a mismatched `org_id`, the SDK starts a new trace instead of continuing the foreign one.
-  - New option `strictTraceContinuation` (default `false`): when enabled, both the SDK's org ID and the incoming baggage org ID must be present and match for a trace to be continued.
-  - New option `orgId`: allows explicitly setting the organization ID for self-hosted and Relay setups where it cannot be extracted from the DSN.
+- Prevent cross-organization trace continuation ([#5136](https://github.com/getsentry/sentry-java/pull/5136))
+  - By default, the SDK now extracts the organization ID from the DSN (e.g. `o123.ingest.sentry.io`) and compares it with the `sentry-org_id` value in incoming baggage headers. When the two differ, the SDK starts a fresh trace instead of continuing the foreign one. This guards against accidentally linking traces across organizations.
+  - New option `strictTraceContinuation` (default `false`): when enabled, both the SDK's org ID **and** the incoming baggage org ID must be present and match for a trace to be continued. Traces with a missing org ID on either side are rejected.
+  - New option `orgId`: allows explicitly setting the organization ID for self-hosted and Relay setups where it cannot be extracted from the DSN. Configurable via code, `sentry.properties` (`org-id`), or Android manifest (`io.sentry.org-id`).
 
 ## 8.34.0
 

sentry-android-core/src/test/java/io/sentry/android/core/ManifestMetadataReaderTest.kt

@@ -2386,4 +2386,54 @@ class ManifestMetadataReaderTest {
     // maskAllImages should also add WebView
     assertTrue(fixture.options.screenshot.maskViewClasses.contains("android.webkit.WebView"))
   }
+
+  @Test
+  fun `applyMetadata reads strictTraceContinuation and keeps default value if not found`() {
+    // Arrange
+    val context = fixture.getContext()
+
+    // Act
+    ManifestMetadataReader.applyMetadata(context, fixture.options, fixture.buildInfoProvider)
+
+    // Assert
+    assertFalse(fixture.options.isStrictTraceContinuation)
+  }
+
+  @Test
+  fun `applyMetadata reads strictTraceContinuation to options`() {
+    // Arrange
+    val bundle = bundleOf(ManifestMetadataReader.STRICT_TRACE_CONTINUATION to true)
+    val context = fixture.getContext(metaData = bundle)
+
+    // Act
+    ManifestMetadataReader.applyMetadata(context, fixture.options, fixture.buildInfoProvider)
+
+    // Assert
+    assertTrue(fixture.options.isStrictTraceContinuation)
+  }
+
+  @Test
+  fun `applyMetadata reads orgId and keeps null if not found`() {
+    // Arrange
+    val context = fixture.getContext()
+
+    // Act
+    ManifestMetadataReader.applyMetadata(context, fixture.options, fixture.buildInfoProvider)
+
+    // Assert
+    assertNull(fixture.options.orgId)
+  }
+
+  @Test
+  fun `applyMetadata reads orgId to options`() {
+    // Arrange
+    val bundle = bundleOf(ManifestMetadataReader.ORG_ID to "12345")
+    val context = fixture.getContext(metaData = bundle)
+
+    // Act
+    ManifestMetadataReader.applyMetadata(context, fixture.options, fixture.buildInfoProvider)
+
+    // Assert
+    assertEquals("12345", fixture.options.orgId)
+  }
 }

sentry-opentelemetry/sentry-opentelemetry-core/src/main/java/io/sentry/opentelemetry/SentrySampler.java

@@ -91,7 +91,7 @@ public SamplingResult shouldSample(
     final @NotNull PropagationContext propagationContext =
         sentryTraceHeader == null
             ? new PropagationContext(new SentryId(traceId), randomSpanId, null, baggage, null)
-            : PropagationContext.fromHeaders(sentryTraceHeader, baggage, randomSpanId);
+            : PropagationContext.fromHeaders(sentryTraceHeader, baggage, randomSpanId, scopes.getOptions());
 
     final @NotNull TransactionContext transactionContext =
         TransactionContext.fromPropagationContext(propagationContext);

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

@@ -127,7 +127,7 @@ public void onStart(final @NotNull Context parentContext, final @NotNull ReadWri
                   new SentryId(traceData.getTraceId()), spanId, null, null, null)
               : TransactionContext.fromPropagationContext(
                   PropagationContext.fromHeaders(
-                      traceData.getSentryTraceHeader(), traceData.getBaggage(), spanId));
+                      traceData.getSentryTraceHeader(), traceData.getBaggage(), spanId, scopes.getOptions()));
       ;
       transactionContext.setName(transactionName);
       transactionContext.setTransactionNameSource(transactionNameSource);

sentry-spring-7/src/test/kotlin/io/sentry/spring7/tracing/SentryTracingFilterTest.kt

@@ -96,6 +96,7 @@ class SentryTracingFilterTest {
             logger,
             it.arguments[0] as String?,
             it.arguments[1] as List<String>?,
+            null,
           )
         )
       }

sentry-spring-7/src/test/kotlin/io/sentry/spring7/webflux/SentryWebFluxTracingFilterTest.kt

@@ -98,6 +98,7 @@ class SentryWebFluxTracingFilterTest {
             logger,
             it.arguments[0] as String?,
             it.arguments[1] as List<String>?,
+            null,
           )
         )
       }

sentry-spring-jakarta/src/test/kotlin/io/sentry/spring/jakarta/tracing/SentryTracingFilterTest.kt

@@ -96,6 +96,7 @@ class SentryTracingFilterTest {
             logger,
             it.arguments[0] as String?,
             it.arguments[1] as List<String>?,
+            null,
           )
         )
       }

sentry-spring-jakarta/src/test/kotlin/io/sentry/spring/jakarta/webflux/SentryWebFluxTracingFilterTest.kt

@@ -98,6 +98,7 @@ class SentryWebFluxTracingFilterTest {
             logger,
             it.arguments[0] as String?,
             it.arguments[1] as List<String>?,
+            null,
           )
         )
       }

sentry-spring/src/test/kotlin/io/sentry/spring/tracing/SentryTracingFilterTest.kt

@@ -96,6 +96,7 @@ class SentryTracingFilterTest {
             logger,
             it.arguments[0] as String?,
             it.arguments[1] as List<String>?,
+            null,
           )
         )
       }

sentry-spring/src/test/kotlin/io/sentry/spring/webflux/SentryWebFluxTracingFilterTest.kt

@@ -98,6 +98,7 @@ class SentryWebFluxTracingFilterTest {
             logger,
             it.arguments[0] as String?,
             it.arguments[1] as List<String>?,
+            null,
           )
         )
       }

sentry/api/sentry.api

@@ -2272,10 +2272,9 @@ public final class io/sentry/PropagationContext {
 	public fun <init> (Lio/sentry/PropagationContext;)V
 	public fun <init> (Lio/sentry/protocol/SentryId;Lio/sentry/SpanId;Lio/sentry/SpanId;Lio/sentry/Baggage;Ljava/lang/Boolean;)V
 	public static fun fromExistingTrace (Ljava/lang/String;Ljava/lang/String;Ljava/lang/Double;Ljava/lang/Double;)Lio/sentry/PropagationContext;
-	public static fun fromHeaders (Lio/sentry/ILogger;Ljava/lang/String;Ljava/lang/String;)Lio/sentry/PropagationContext;
-	public static fun fromHeaders (Lio/sentry/ILogger;Ljava/lang/String;Ljava/util/List;)Lio/sentry/PropagationContext;
+	public static fun fromHeaders (Lio/sentry/ILogger;Ljava/lang/String;Ljava/lang/String;Lio/sentry/SentryOptions;)Lio/sentry/PropagationContext;
 	public static fun fromHeaders (Lio/sentry/ILogger;Ljava/lang/String;Ljava/util/List;Lio/sentry/SentryOptions;)Lio/sentry/PropagationContext;
-	public static fun fromHeaders (Lio/sentry/SentryTraceHeader;Lio/sentry/Baggage;Lio/sentry/SpanId;)Lio/sentry/PropagationContext;
+	public static fun fromHeaders (Lio/sentry/SentryTraceHeader;Lio/sentry/Baggage;Lio/sentry/SpanId;Lio/sentry/SentryOptions;)Lio/sentry/PropagationContext;
 	public fun getBaggage ()Lio/sentry/Baggage;
 	public fun getParentSpanId ()Lio/sentry/SpanId;
 	public fun getSampleRand ()Ljava/lang/Double;

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

@@ -15,7 +15,7 @@ final class Dsn {
   private final @Nullable String secretKey;
   private final @NotNull String publicKey;
   private final @NotNull URI sentryUri;
-  private @Nullable String orgId;
+  private final @Nullable String orgId;
 
   /*
   / The project ID which the authenticated user is bound to.
@@ -112,7 +112,4 @@ URI getSentryUri() {
     return orgId;
   }
 
-  public void setOrgId(final @Nullable String orgId) {
-    this.orgId = orgId;
-  }
 }

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

@@ -15,21 +15,9 @@ public final class PropagationContext {
   public static PropagationContext fromHeaders(
       final @NotNull ILogger logger,
       final @Nullable String sentryTraceHeader,
-      final @Nullable String baggageHeader) {
-    return fromHeaders(logger, sentryTraceHeader, Arrays.asList(baggageHeader));
-  }
-
-  public static @NotNull PropagationContext fromHeaders(
-      final @NotNull ILogger logger,
-      final @Nullable String sentryTraceHeaderString,
-      final @Nullable List<String> baggageHeaderStrings) {
-    @Nullable SentryOptions options = null;
-    try {
-      options = Sentry.getCurrentScopes().getOptions();
-    } catch (Throwable ignored) {
-      // options may not be available if Sentry is not initialized
-    }
-    return fromHeaders(logger, sentryTraceHeaderString, baggageHeaderStrings, options);
+      final @Nullable String baggageHeader,
+      final @Nullable SentryOptions options) {
+    return fromHeaders(logger, sentryTraceHeader, Arrays.asList(baggageHeader), options);
   }
 
   public static @NotNull PropagationContext fromHeaders(
@@ -50,7 +38,7 @@ public static PropagationContext fromHeaders(
         return new PropagationContext();
       }
 
-      return fromHeaders(traceHeader, baggage, null);
+      return fromHeaders(traceHeader, baggage, null, null);
     } catch (InvalidSentryTraceHeaderException e) {
       logger.log(SentryLevel.DEBUG, e, "Failed to parse Sentry trace header: %s", e.getMessage());
       return new PropagationContext();
@@ -60,7 +48,12 @@ public static PropagationContext fromHeaders(
   public static @NotNull PropagationContext fromHeaders(
       final @NotNull SentryTraceHeader sentryTraceHeader,
       final @Nullable Baggage baggage,
-      final @Nullable SpanId spanId) {
+      final @Nullable SpanId spanId,
+      final @Nullable SentryOptions options) {
+    if (options != null && !shouldContinueTrace(options, baggage)) {
+      return new PropagationContext();
+    }
+
     final @NotNull SpanId spanIdToUse = spanId == null ? new SpanId() : spanId;
 
     return new PropagationContext(

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

@@ -146,11 +146,4 @@ class DsnTest {
     assertNull(dsn.orgId)
   }
 
-  @Test
-  fun `org id can be overridden via setter`() {
-    val dsn = Dsn("https://key@o123.ingest.sentry.io/456")
-    assertEquals("123", dsn.orgId)
-    dsn.setOrgId("999")
-    assertEquals("999", dsn.orgId)
-  }
 }

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

@@ -435,6 +435,37 @@ class ExternalOptionsTest {
     }
   }
 
+  @Test
+  fun `creates options with strictTraceContinuation set to true`() {
+    withPropertiesFile("strict-trace-continuation=true") { options ->
+      assertTrue(options.isStrictTraceContinuation == true)
+    }
+  }
+
+  @Test
+  fun `creates options with strictTraceContinuation set to false`() {
+    withPropertiesFile("strict-trace-continuation=false") { options ->
+      assertTrue(options.isStrictTraceContinuation == false)
+    }
+  }
+
+  @Test
+  fun `creates options with strictTraceContinuation set to null when not set`() {
+    withPropertiesFile { assertNull(it.isStrictTraceContinuation) }
+  }
+
+  @Test
+  fun `creates options with orgId using external properties`() {
+    withPropertiesFile("org-id=12345") { options ->
+      assertEquals("12345", options.orgId)
+    }
+  }
+
+  @Test
+  fun `creates options with orgId set to null when not set`() {
+    withPropertiesFile { assertNull(it.orgId) }
+  }
+
   private fun withPropertiesFile(
     textLines: List<String> = emptyList(),
     logger: ILogger = mock(),

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

@@ -15,6 +15,7 @@ class PropagationContextTest {
         NoOpLogger.getInstance(),
         "2722d9f6ec019ade60c776169d9a8904-cedf5b7571cb4972-1",
         "sentry-trace_id=a,sentry-transaction=sentryTransaction",
+        null,
       )
     assertFalse(propagationContext.baggage.isMutable)
     assertTrue(propagationContext.baggage.isShouldFreeze)
@@ -27,6 +28,7 @@ class PropagationContextTest {
         NoOpLogger.getInstance(),
         "2722d9f6ec019ade60c776169d9a8904-cedf5b7571cb4972-1",
         "a=b",
+        null,
       )
     assertTrue(propagationContext.baggage.isMutable)
     assertFalse(propagationContext.baggage.isShouldFreeze)
@@ -39,6 +41,7 @@ class PropagationContextTest {
         NoOpLogger.getInstance(),
         "2722d9f6ec019ade60c776169d9a8904-cedf5b7571cb4972-1",
         null as? String?,
+        null,
       )
     assertNotNull(propagationContext.baggage)
     assertTrue(propagationContext.baggage.isMutable)

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

@@ -960,4 +960,72 @@ class SentryOptionsTest {
     options.logs.loggerBatchProcessorFactory = mock
     assertSame(mock, options.logs.loggerBatchProcessorFactory)
   }
+
+  @Test
+  fun `when options is initialized, strictTraceContinuation is false`() {
+    assertFalse(SentryOptions().isStrictTraceContinuation)
+  }
+
+  @Test
+  fun `when options is initialized, orgId is null`() {
+    assertNull(SentryOptions().orgId)
+  }
+
+  @Test
+  fun `merging options applies strictTraceContinuation`() {
+    val externalOptions = ExternalOptions()
+    externalOptions.setStrictTraceContinuation(true)
+    val options = SentryOptions()
+    options.merge(externalOptions)
+    assertTrue(options.isStrictTraceContinuation)
+  }
+
+  @Test
+  fun `merging options when strictTraceContinuation is not set preserves the previous value`() {
+    val externalOptions = ExternalOptions()
+    val options = SentryOptions()
+    options.isStrictTraceContinuation = true
+    options.merge(externalOptions)
+    assertTrue(options.isStrictTraceContinuation)
+  }
+
+  @Test
+  fun `merging options applies orgId`() {
+    val externalOptions = ExternalOptions()
+    externalOptions.setOrgId("12345")
+    val options = SentryOptions()
+    options.merge(externalOptions)
+    assertEquals("12345", options.orgId)
+  }
+
+  @Test
+  fun `merging options when orgId is not set preserves the previous value`() {
+    val externalOptions = ExternalOptions()
+    val options = SentryOptions()
+    options.orgId = "original"
+    options.merge(externalOptions)
+    assertEquals("original", options.orgId)
+  }
+
+  @Test
+  fun `getEffectiveOrgId prefers explicit orgId over DSN`() {
+    val options = SentryOptions()
+    options.dsn = "https://key@o123.ingest.sentry.io/456"
+    options.orgId = "999"
+    assertEquals("999", options.effectiveOrgId)
+  }
+
+  @Test
+  fun `getEffectiveOrgId falls back to DSN org id`() {
+    val options = SentryOptions()
+    options.dsn = "https://key@o123.ingest.sentry.io/456"
+    assertEquals("123", options.effectiveOrgId)
+  }
+
+  @Test
+  fun `getEffectiveOrgId returns null when no orgId configured`() {
+    val options = SentryOptions()
+    options.dsn = "https://key@sentry.io/456"
+    assertNull(options.effectiveOrgId)
+  }
 }

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

@@ -31,6 +31,7 @@ class TransactionContextTest {
         logger,
         SentryTraceHeader(SentryId(), SpanId(), false).value,
         "sentry-trace_id=a,sentry-transaction=sentryTransaction,sentry-sample_rate=0.3",
+        null,
       )
     val context = TransactionContext.fromPropagationContext(propagationContext)
     assertNull(context.sampled)
@@ -48,6 +49,7 @@ class TransactionContextTest {
         logger,
         SentryTraceHeader(SentryId(), SpanId(), false).value,
         "sentry-trace_id=a,sentry-transaction=sentryTransaction",
+        null,
       )
     val context = TransactionContext.fromPropagationContext(propagationContext)
     assertNull(context.sampled)
@@ -65,6 +67,7 @@ class TransactionContextTest {
         logger,
         SentryTraceHeader(SentryId(), SpanId(), true).value,
         "sentry-trace_id=a,sentry-transaction=sentryTransaction,sentry-sample_rate=0.3",
+        null,
       )
     val context = TransactionContext.fromPropagationContext(propagationContext)
     assertNull(context.sampled)
@@ -82,6 +85,7 @@ class TransactionContextTest {
         logger,
         SentryTraceHeader(SentryId(), SpanId(), true).value,
         "sentry-trace_id=a,sentry-transaction=sentryTransaction",
+        null,
       )
     val context = TransactionContext.fromPropagationContext(propagationContext)
     assertNull(context.sampled)