ref(tracing): Extract trace continuation decision into TracingUtils

Move strict trace continuation org-id validation logic to TracingUtils
so it can be reused by tracing entry points.

Update PropagationContext to call the shared helper and add dedicated
TracingUtils tests for strict/non-strict org-id continuation outcomes.

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

Author: adinauer

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

@@ -45,7 +45,7 @@ public static PropagationContext fromHeaders(
       final @Nullable Baggage baggage,
       final @Nullable SpanId spanId,
       final @Nullable SentryOptions options) {
-    if (options != null && !shouldContinueTrace(options, baggage)) {
+    if (options != null && !TracingUtils.shouldContinueTrace(options, baggage)) {
       options
           .getLogger()
           .log(
@@ -163,30 +163,4 @@ public void setSampled(final @Nullable Boolean sampled) {
     return sampleRand == null ? 0.0 : sampleRand;
   }
 
-  static boolean shouldContinueTrace(
-      final @NotNull SentryOptions options, final @Nullable Baggage baggage) {
-    final @Nullable String rawSdkOrgId = options.getEffectiveOrgId();
-    final @Nullable String sdkOrgId =
-        (rawSdkOrgId != null && !rawSdkOrgId.trim().isEmpty()) ? rawSdkOrgId.trim() : null;
-    final @Nullable String rawBaggageOrgId = baggage != null ? baggage.getOrgId() : null;
-    final @Nullable String baggageOrgId =
-        (rawBaggageOrgId != null && !rawBaggageOrgId.trim().isEmpty())
-            ? rawBaggageOrgId.trim()
-            : null;
-
-    // Mismatched org IDs always reject regardless of strict mode
-    if (sdkOrgId != null && baggageOrgId != null && !sdkOrgId.equals(baggageOrgId)) {
-      return false;
-    }
-
-    // In strict mode, both must be present and match (unless both are missing)
-    if (options.isStrictTraceContinuation()) {
-      if (sdkOrgId == null && baggageOrgId == null) {
-        return true;
-      }
-      return sdkOrgId != null && sdkOrgId.equals(baggageOrgId);
-    }
-
-    return true;
-  }
 }

sentry/src/main/java/io/sentry/util/TracingUtils.java

@@ -196,6 +196,34 @@ public static boolean isIgnored(
     return false;
   }
 
+  @ApiStatus.Internal
+  public static boolean shouldContinueTrace(
+      final @NotNull SentryOptions options, final @Nullable Baggage baggage) {
+    final @Nullable String rawSdkOrgId = options.getEffectiveOrgId();
+    final @Nullable String sdkOrgId =
+        (rawSdkOrgId != null && !rawSdkOrgId.trim().isEmpty()) ? rawSdkOrgId.trim() : null;
+    final @Nullable String rawBaggageOrgId = baggage != null ? baggage.getOrgId() : null;
+    final @Nullable String baggageOrgId =
+        (rawBaggageOrgId != null && !rawBaggageOrgId.trim().isEmpty())
+            ? rawBaggageOrgId.trim()
+            : null;
+
+    // Mismatched org IDs always reject regardless of strict mode
+    if (sdkOrgId != null && baggageOrgId != null && !sdkOrgId.equals(baggageOrgId)) {
+      return false;
+    }
+
+    // In strict mode, both must be present and match (unless both are missing)
+    if (options.isStrictTraceContinuation()) {
+      if (sdkOrgId == null && baggageOrgId == null) {
+        return true;
+      }
+      return sdkOrgId != null && sdkOrgId.equals(baggageOrgId);
+    }
+
+    return true;
+  }
+
   /**
    * Ensures a non null baggage instance is present by creating a new Baggage instance if null is
    * passed in.

sentry/src/test/java/io/sentry/util/TracingUtilsTest.kt

@@ -510,4 +510,60 @@ class TracingUtilsTest {
     assertEquals(fixture.scope.propagationContext.spanId.toString(), parts[2])
     assertEquals("00", parts[3])
   }
+
+  private fun makeOptions(
+    dsnOrgId: String?,
+    explicitOrgId: String? = null,
+    strict: Boolean = false,
+  ): SentryOptions {
+    val options = SentryOptions()
+    if (dsnOrgId != null) {
+      options.dsn = "https://key@o$dsnOrgId.ingest.sentry.io/123"
+    } else {
+      options.dsn = "https://key@sentry.io/123"
+    }
+    options.orgId = explicitOrgId
+    options.isStrictTraceContinuation = strict
+    return options
+  }
+
+  private fun makeBaggage(orgId: String?): Baggage {
+    val raw =
+      if (orgId != null) {
+        "sentry-trace_id=bc6d53f15eb88f4320054569b8c553d4,sentry-org_id=$orgId"
+      } else {
+        "sentry-trace_id=bc6d53f15eb88f4320054569b8c553d4"
+      }
+    return Baggage.fromHeader(raw, NoOpLogger.getInstance())
+  }
+
+  @Test
+  fun `shouldContinueTrace strict=false matching org ids returns true`() {
+    val options = makeOptions(dsnOrgId = "1", strict = false)
+    assertTrue(TracingUtils.shouldContinueTrace(options, makeBaggage("1")))
+  }
+
+  @Test
+  fun `shouldContinueTrace strict=false mismatched org ids returns false`() {
+    val options = makeOptions(dsnOrgId = "2", strict = false)
+    assertFalse(TracingUtils.shouldContinueTrace(options, makeBaggage("1")))
+  }
+
+  @Test
+  fun `shouldContinueTrace strict=true matching org ids returns true`() {
+    val options = makeOptions(dsnOrgId = "1", strict = true)
+    assertTrue(TracingUtils.shouldContinueTrace(options, makeBaggage("1")))
+  }
+
+  @Test
+  fun `shouldContinueTrace strict=true missing baggage org id returns false`() {
+    val options = makeOptions(dsnOrgId = "1", strict = true)
+    assertFalse(TracingUtils.shouldContinueTrace(options, makeBaggage(null)))
+  }
+
+  @Test
+  fun `shouldContinueTrace strict=true both missing org ids returns true`() {
+    val options = makeOptions(dsnOrgId = null, strict = true)
+    assertTrue(TracingUtils.shouldContinueTrace(options, makeBaggage(null)))
+  }
 }