Address review comments for strict trace continuation

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

CHANGELOG.md

@@ -10,6 +10,10 @@
 - Support collections and arrays in attribute type inference ([#5124](https://github.com/getsentry/sentry-java/pull/5124))
 - Add support for `SENTRY_SAMPLE_RATE` environment variable / `sample-rate` property ([#5112](https://github.com/getsentry/sentry-java/pull/5112))
 - 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.
 - Create `sentry-opentelemetry-otlp` and `sentry-opentelemetry-otlp-spring` modules for combining OpenTelemetry SDK OTLP export with Sentry SDK ([#5100](https://github.com/getsentry/sentry-java/pull/5100))
   - OpenTelemetry is configured to send spans to Sentry directly using an OTLP endpoint.
   - Sentry only uses trace and span ID from OpenTelemetry (via `OpenTelemetryOtlpEventProcessor`) but will not send spans through OpenTelemetry nor use OpenTelemetry `Context` for `Scopes` propagation.

sentry-android-core/src/main/java/io/sentry/android/core/ManifestMetadataReader.java

@@ -167,6 +167,9 @@ final class ManifestMetadataReader {
 
   static final String FEEDBACK_SHOW_BRANDING = "io.sentry.feedback.show-branding";
 
+  static final String STRICT_TRACE_CONTINUATION = "io.sentry.strict-trace-continuation";
+  static final String ORG_ID = "io.sentry.org-id";
+
   static final String SPOTLIGHT_ENABLE = "io.sentry.spotlight.enable";
 
   static final String SPOTLIGHT_CONNECTION_URL = "io.sentry.spotlight.url";
@@ -658,6 +661,18 @@ static void applyMetadata(
         feedbackOptions.setShowBranding(
             readBool(metadata, logger, FEEDBACK_SHOW_BRANDING, feedbackOptions.isShowBranding()));
 
+        options.setStrictTraceContinuation(
+            readBool(
+                metadata,
+                logger,
+                STRICT_TRACE_CONTINUATION,
+                options.isStrictTraceContinuation()));
+
+        final @Nullable String orgId = readString(metadata, logger, ORG_ID, null);
+        if (orgId != null) {
+          options.setOrgId(orgId);
+        }
+
         options.setEnableSpotlight(
             readBool(metadata, logger, SPOTLIGHT_ENABLE, options.isEnableSpotlight()));
 

sentry/api/sentry.api

@@ -504,6 +504,7 @@ public final class io/sentry/ExternalOptions {
 	public fun getInAppExcludes ()Ljava/util/List;
 	public fun getInAppIncludes ()Ljava/util/List;
 	public fun getMaxRequestBodySize ()Lio/sentry/SentryOptions$RequestSize;
+	public fun getOrgId ()Ljava/lang/String;
 	public fun getPrintUncaughtStackTrace ()Ljava/lang/Boolean;
 	public fun getProfileLifecycle ()Lio/sentry/ProfileLifecycle;
 	public fun getProfileSessionSampleRate ()Ljava/lang/Double;
@@ -531,6 +532,7 @@ public final class io/sentry/ExternalOptions {
 	public fun isGlobalHubMode ()Ljava/lang/Boolean;
 	public fun isSendDefaultPii ()Ljava/lang/Boolean;
 	public fun isSendModules ()Ljava/lang/Boolean;
+	public fun isStrictTraceContinuation ()Ljava/lang/Boolean;
 	public fun setCaptureOpenTelemetryEvents (Ljava/lang/Boolean;)V
 	public fun setCron (Lio/sentry/SentryOptions$Cron;)V
 	public fun setDebug (Ljava/lang/Boolean;)V
@@ -553,6 +555,7 @@ public final class io/sentry/ExternalOptions {
 	public fun setIgnoredErrors (Ljava/util/List;)V
 	public fun setIgnoredTransactions (Ljava/util/List;)V
 	public fun setMaxRequestBodySize (Lio/sentry/SentryOptions$RequestSize;)V
+	public fun setOrgId (Ljava/lang/String;)V
 	public fun setPrintUncaughtStackTrace (Ljava/lang/Boolean;)V
 	public fun setProfileLifecycle (Lio/sentry/ProfileLifecycle;)V
 	public fun setProfileSessionSampleRate (Ljava/lang/Double;)V
@@ -567,6 +570,7 @@ public final class io/sentry/ExternalOptions {
 	public fun setSendModules (Ljava/lang/Boolean;)V
 	public fun setServerName (Ljava/lang/String;)V
 	public fun setSpotlightConnectionUrl (Ljava/lang/String;)V
+	public fun setStrictTraceContinuation (Ljava/lang/Boolean;)V
 	public fun setTag (Ljava/lang/String;Ljava/lang/String;)V
 	public fun setTracesSampleRate (Ljava/lang/Double;)V
 }

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.
@@ -94,13 +94,15 @@ URI getSentryUri() {
               scheme, null, uri.getHost(), uri.getPort(), path + "api/" + projectId, null, null);
 
       // Extract org ID from host (e.g., "o123.ingest.sentry.io" -> "123")
+      String extractedOrgId = null;
       final String host = uri.getHost();
       if (host != null) {
         final Matcher matcher = ORG_ID_PATTERN.matcher(host);
         if (matcher.find()) {
-          orgId = matcher.group(1);
+          extractedOrgId = matcher.group(1);
         }
       }
+      orgId = extractedOrgId;
     } catch (Throwable e) {
       throw new IllegalArgumentException(e);
     }
@@ -109,8 +111,4 @@ URI getSentryUri() {
   public @Nullable String getOrgId() {
     return orgId;
   }
-
-  void setOrgId(final @Nullable String orgId) {
-    this.orgId = orgId;
-  }
 }

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

@@ -63,6 +63,9 @@ public final class ExternalOptions {
   private @Nullable String profilingTracesDirPath;
   private @Nullable ProfileLifecycle profileLifecycle;
 
+  private @Nullable Boolean strictTraceContinuation;
+  private @Nullable String orgId;
+
   private @Nullable SentryOptions.Cron cron;
 
   @SuppressWarnings("unchecked")
@@ -213,6 +216,10 @@ public final class ExternalOptions {
       options.setCron(cron);
     }
 
+    options.setStrictTraceContinuation(
+        propertiesProvider.getBooleanProperty("strict-trace-continuation"));
+    options.setOrgId(propertiesProvider.getProperty("org-id"));
+
     options.setEnableSpotlight(propertiesProvider.getBooleanProperty("enable-spotlight"));
     options.setSpotlightConnectionUrl(propertiesProvider.getProperty("spotlight-connection-url"));
     options.setProfileSessionSampleRate(
@@ -589,6 +596,22 @@ public void setProfilingTracesDirPath(@Nullable String profilingTracesDirPath) {
     this.profilingTracesDirPath = profilingTracesDirPath;
   }
 
+  public @Nullable Boolean isStrictTraceContinuation() {
+    return strictTraceContinuation;
+  }
+
+  public void setStrictTraceContinuation(final @Nullable Boolean strictTraceContinuation) {
+    this.strictTraceContinuation = strictTraceContinuation;
+  }
+
+  public @Nullable String getOrgId() {
+    return orgId;
+  }
+
+  public void setOrgId(final @Nullable String orgId) {
+    this.orgId = orgId;
+  }
+
   public @Nullable ProfileLifecycle getProfileLifecycle() {
     return profileLifecycle;
   }

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

@@ -23,7 +23,12 @@ public static PropagationContext fromHeaders(
       final @NotNull ILogger logger,
       final @Nullable String sentryTraceHeaderString,
       final @Nullable List<String> baggageHeaderStrings) {
-    return fromHeaders(logger, sentryTraceHeaderString, baggageHeaderStrings, null);
+    @Nullable SentryOptions options = null;
+    try {
+      options = Sentry.getCurrentScopes().getOptions();
+    } catch (Throwable ignored) {
+    }
+    return fromHeaders(logger, sentryTraceHeaderString, baggageHeaderStrings, options);
   }
 
   public static @NotNull PropagationContext fromHeaders(

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

@@ -3571,6 +3571,12 @@ public void merge(final @NotNull ExternalOptions options) {
     if (options.getProfileLifecycle() != null) {
       setProfileLifecycle(options.getProfileLifecycle());
     }
+    if (options.isStrictTraceContinuation() != null) {
+      setStrictTraceContinuation(options.isStrictTraceContinuation());
+    }
+    if (options.getOrgId() != null) {
+      setOrgId(options.getOrgId());
+    }
   }
 
   private @NotNull SdkVersion createSdkVersion() {

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

@@ -81,7 +81,7 @@ class PropagationContextTest {
       PropagationContext.fromHeaders(
         NoOpLogger.getInstance(),
         sentryTrace,
-        makeBaggage("1"),
+        listOf(makeBaggage("1")),
         options,
       )
     assertEquals(incomingTraceId, pc.traceId.toString())
@@ -94,7 +94,7 @@ class PropagationContextTest {
       PropagationContext.fromHeaders(
         NoOpLogger.getInstance(),
         sentryTrace,
-        makeBaggage(null),
+        listOf(makeBaggage(null)),
         options,
       )
     assertEquals(incomingTraceId, pc.traceId.toString())
@@ -107,7 +107,7 @@ class PropagationContextTest {
       PropagationContext.fromHeaders(
         NoOpLogger.getInstance(),
         sentryTrace,
-        makeBaggage("1"),
+        listOf(makeBaggage("1")),
         options,
       )
     assertEquals(incomingTraceId, pc.traceId.toString())
@@ -120,7 +120,7 @@ class PropagationContextTest {
       PropagationContext.fromHeaders(
         NoOpLogger.getInstance(),
         sentryTrace,
-        makeBaggage(null),
+        listOf(makeBaggage(null)),
         options,
       )
     assertEquals(incomingTraceId, pc.traceId.toString())
@@ -133,7 +133,7 @@ class PropagationContextTest {
       PropagationContext.fromHeaders(
         NoOpLogger.getInstance(),
         sentryTrace,
-        makeBaggage("1"),
+        listOf(makeBaggage("1")),
         options,
       )
     assertNotEquals(incomingTraceId, pc.traceId.toString())
@@ -146,7 +146,7 @@ class PropagationContextTest {
       PropagationContext.fromHeaders(
         NoOpLogger.getInstance(),
         sentryTrace,
-        makeBaggage("1"),
+        listOf(makeBaggage("1")),
         options,
       )
     assertEquals(incomingTraceId, pc.traceId.toString())
@@ -159,7 +159,7 @@ class PropagationContextTest {
       PropagationContext.fromHeaders(
         NoOpLogger.getInstance(),
         sentryTrace,
-        makeBaggage(null),
+        listOf(makeBaggage(null)),
         options,
       )
     assertNotEquals(incomingTraceId, pc.traceId.toString())
@@ -172,7 +172,7 @@ class PropagationContextTest {
       PropagationContext.fromHeaders(
         NoOpLogger.getInstance(),
         sentryTrace,
-        makeBaggage("1"),
+        listOf(makeBaggage("1")),
         options,
       )
     assertNotEquals(incomingTraceId, pc.traceId.toString())
@@ -185,7 +185,7 @@ class PropagationContextTest {
       PropagationContext.fromHeaders(
         NoOpLogger.getInstance(),
         sentryTrace,
-        makeBaggage(null),
+        listOf(makeBaggage(null)),
         options,
       )
     assertEquals(incomingTraceId, pc.traceId.toString())
@@ -198,7 +198,7 @@ class PropagationContextTest {
       PropagationContext.fromHeaders(
         NoOpLogger.getInstance(),
         sentryTrace,
-        makeBaggage("1"),
+        listOf(makeBaggage("1")),
         options,
       )
     assertNotEquals(incomingTraceId, pc.traceId.toString())