From 33385ff511508dbf742160a0c85269393b0e2990 Mon Sep 17 00:00:00 2001
From: s1gr1d <sigrid.huemer@posteo.at>
Date: Fri, 16 May 2025 11:20:21 +0200
Subject: [PATCH 01/14] feat(core): Implement `strictTraceContinuation`

---
 packages/core/src/tracing/trace.ts           |  43 ++++++
 packages/core/src/types-hoist/options.ts     |  12 ++
 packages/core/test/lib/tracing/trace.test.ts | 146 +++++++++++++++++++
 3 files changed, 201 insertions(+)

diff --git a/packages/core/src/tracing/trace.ts b/packages/core/src/tracing/trace.ts
index a96159692ac3..41f3fae23a12 100644
--- a/packages/core/src/tracing/trace.ts
+++ b/packages/core/src/tracing/trace.ts
@@ -16,6 +16,8 @@ import { hasSpansEnabled } from '../utils/hasSpansEnabled';
 import { parseSampleRate } from '../utils/parseSampleRate';
 import { _getSpanForScope, _setSpanForScope } from '../utils/spanOnScope';
 import { addChildSpanToSpan, getRootSpan, spanIsSampled, spanTimeInputToSeconds, spanToJSON } from '../utils/spanUtils';
+import { baggageHeaderToDynamicSamplingContext } from '../utils-hoist/baggage';
+import { extractOrgIdFromDsnHost } from '../utils-hoist/dsn';
 import { logger } from '../utils-hoist/logger';
 import { generateTraceId } from '../utils-hoist/propagationContext';
 import { propagationContextFromHeaders } from '../utils-hoist/tracing';
@@ -215,6 +217,47 @@ export const continueTrace = <V>(
   }
 
   const { sentryTrace, baggage } = options;
+  const client = getClient();
+
+  const clientOptions = client?.getOptions();
+  const strictTraceContinuation = clientOptions?.strictTraceContinuation || false; // default for `strictTraceContinuation` is `false` todo(v10): set default to `true`
+
+  const incomingDsc = baggageHeaderToDynamicSamplingContext(baggage);
+  const baggageOrgId = incomingDsc?.org_id;
+
+  let sdkOrgId: string | undefined;
+  const dsn = client?.getDsn();
+  if (dsn?.host) {
+    sdkOrgId = extractOrgIdFromDsnHost(dsn.host);
+  }
+
+  const shouldStartNewTrace = (): boolean => {
+    // Case: baggage org ID and SDK org ID don't match - always start new trace
+    if (baggageOrgId && sdkOrgId && baggageOrgId !== sdkOrgId) {
+      DEBUG_BUILD &&
+        logger.info(`Starting a new trace because org IDs don't match (incoming: ${baggageOrgId}, sdk: ${sdkOrgId})`);
+      return true;
+    }
+
+    if (strictTraceContinuation) {
+      // With strict continuation enabled, start new trace if:
+      // - Baggage has org ID but SDK doesn't have one
+      // - SDK has org ID but baggage doesn't have one
+      if ((baggageOrgId && !sdkOrgId) || (!baggageOrgId && sdkOrgId)) {
+        DEBUG_BUILD &&
+          logger.info(
+            `Starting a new trace because strict trace continuation is enabled and one org ID is missing (incoming: ${baggageOrgId}, sdk: ${sdkOrgId})`,
+          );
+        return true;
+      }
+    }
+
+    return false;
+  };
+
+  if (shouldStartNewTrace()) {
+    return startNewTrace(callback);
+  }
 
   return withScope(scope => {
     const propagationContext = propagationContextFromHeaders(sentryTrace, baggage);
diff --git a/packages/core/src/types-hoist/options.ts b/packages/core/src/types-hoist/options.ts
index 09dab550be4c..a308405a7174 100644
--- a/packages/core/src/types-hoist/options.ts
+++ b/packages/core/src/types-hoist/options.ts
@@ -320,6 +320,18 @@ export interface ClientOptions<TO extends BaseTransportOptions = BaseTransportOp
    */
   tracePropagationTargets?: TracePropagationTargets;
 
+  /**
+   * Controls whether trace continuation should be strict about matching organization IDs.
+   *
+   * When set to `true`, the SDK will only continue a trace if the organization ID in the incoming baggage
+   * matches the organization ID of the current SDK (extracted from the DSN).
+   *
+   * If there is no match, the SDK will start a new trace instead of continuing the incoming one.
+   *
+   * @default false
+   */
+  strictTraceContinuation?: boolean;
+
   /**
    * The organization ID of the current SDK. The organization ID is a string containing only numbers. This ID is used to
    * propagate traces to other Sentry services.
diff --git a/packages/core/test/lib/tracing/trace.test.ts b/packages/core/test/lib/tracing/trace.test.ts
index 0e0d16fb6ec4..fd040d37dd68 100644
--- a/packages/core/test/lib/tracing/trace.test.ts
+++ b/packages/core/test/lib/tracing/trace.test.ts
@@ -31,6 +31,7 @@ import type { Span } from '../../../src/types-hoist/span';
 import type { StartSpanOptions } from '../../../src/types-hoist/startSpanOptions';
 import { _setSpanForScope } from '../../../src/utils/spanOnScope';
 import { getActiveSpan, getRootSpan, getSpanDescendants, spanIsSampled } from '../../../src/utils/spanUtils';
+import { extractOrgIdFromDsnHost } from '../../../src/utils-hoist/dsn';
 import { getDefaultTestClientOptions, TestClient } from '../../mocks/client';
 
 const enum Type {
@@ -1733,6 +1734,151 @@ describe('continueTrace', () => {
 
     expect(result).toEqual('aha');
   });
+
+  describe('strictTraceContinuation', () => {
+    const creatOrgIdInDsn = (orgId: number) => {
+      vi.spyOn(client, 'getDsn').mockReturnValue({
+        host: `o${orgId}.ingest.sentry.io`,
+        protocol: 'https',
+        projectId: 'projId',
+      });
+    };
+
+    afterEach(() => {
+      vi.clearAllMocks();
+    });
+
+    it('continues trace when org IDs match', () => {
+      creatOrgIdInDsn(123);
+
+      const scope = continueTrace(
+        {
+          sentryTrace: '12312012123120121231201212312012-1121201211212012-1',
+          baggage: 'sentry-org_id=123',
+        },
+        () => {
+          return getCurrentScope();
+        },
+      );
+
+      expect(scope.getPropagationContext().traceId).toBe('12312012123120121231201212312012');
+      expect(scope.getPropagationContext().parentSpanId).toBe('1121201211212012');
+    });
+
+    it('starts new trace when both SDK and baggage org IDs are set and do not match', () => {
+      creatOrgIdInDsn(123);
+
+      const scope = continueTrace(
+        {
+          sentryTrace: '12312012123120121231201212312012-1121201211212012-1',
+          baggage: 'sentry-org_id=456',
+        },
+        () => {
+          return getCurrentScope();
+        },
+      );
+
+      // Should start a new trace with a different trace ID
+      expect(scope.getPropagationContext().traceId).not.toBe('12312012123120121231201212312012');
+      expect(scope.getPropagationContext().parentSpanId).toBeUndefined();
+    });
+
+    describe('when strictTraceContinuation is true', () => {
+      it('starts new trace when baggage org ID is missing', () => {
+        client.getOptions().strictTraceContinuation = true;
+
+        creatOrgIdInDsn(123);
+
+        const scope = continueTrace(
+          {
+            sentryTrace: '12312012123120121231201212312012-1121201211212012-1',
+            baggage: 'sentry-environment=production',
+          },
+          () => {
+            return getCurrentScope();
+          },
+        );
+
+        // Should start a new trace with a different trace ID
+        expect(scope.getPropagationContext().traceId).not.toBe('12312012123120121231201212312012');
+        expect(scope.getPropagationContext().parentSpanId).toBeUndefined();
+      });
+
+      it('starts new trace when SDK org ID is missing', () => {
+        client.getOptions().strictTraceContinuation = true;
+
+        const scope = continueTrace(
+          {
+            sentryTrace: '12312012123120121231201212312012-1121201211212012-1',
+            baggage: 'sentry-org_id=123',
+          },
+          () => {
+            return getCurrentScope();
+          },
+        );
+
+        // Should start a new trace with a different trace ID
+        expect(scope.getPropagationContext().traceId).not.toBe('12312012123120121231201212312012');
+        expect(scope.getPropagationContext().parentSpanId).toBeUndefined();
+      });
+
+      it('continues trace when both org IDs are missing', () => {
+        client.getOptions().strictTraceContinuation = true;
+
+        const scope = continueTrace(
+          {
+            sentryTrace: '12312012123120121231201212312012-1121201211212012-1',
+            baggage: 'sentry-environment=production',
+          },
+          () => {
+            return getCurrentScope();
+          },
+        );
+
+        // Should continue the trace
+        expect(scope.getPropagationContext().traceId).toBe('12312012123120121231201212312012');
+        expect(scope.getPropagationContext().parentSpanId).toBe('1121201211212012');
+      });
+    });
+
+    describe('when strictTraceContinuation is false', () => {
+      it('continues trace when baggage org ID is missing', () => {
+        client.getOptions().strictTraceContinuation = false;
+
+        creatOrgIdInDsn(123);
+
+        const scope = continueTrace(
+          {
+            sentryTrace: '12312012123120121231201212312012-1121201211212012-1',
+            baggage: 'sentry-environment=production',
+          },
+          () => {
+            return getCurrentScope();
+          },
+        );
+
+        expect(scope.getPropagationContext().traceId).toBe('12312012123120121231201212312012');
+        expect(scope.getPropagationContext().parentSpanId).toBe('1121201211212012');
+      });
+
+      it('SDK org ID is missing', () => {
+        client.getOptions().strictTraceContinuation = false;
+
+        const scope = continueTrace(
+          {
+            sentryTrace: '12312012123120121231201212312012-1121201211212012-1',
+            baggage: 'sentry-org_id=123',
+          },
+          () => {
+            return getCurrentScope();
+          },
+        );
+
+        expect(scope.getPropagationContext().traceId).toBe('12312012123120121231201212312012');
+        expect(scope.getPropagationContext().parentSpanId).toBe('1121201211212012');
+      });
+    });
+  });
 });
 
 describe('getActiveSpan', () => {

From e2dd6a693172cd82cb4085116da8ac08ae775e18 Mon Sep 17 00:00:00 2001
From: s1gr1d <sigrid.huemer@posteo.at>
Date: Fri, 16 May 2025 14:24:53 +0200
Subject: [PATCH 02/14] create utility function for getting org id

---
 .../src/tracing/dynamicSamplingContext.ts     | 14 ++---
 packages/core/src/tracing/trace.ts            |  9 +---
 packages/core/src/tracing/utils.ts            | 23 ++++++++
 packages/core/test/lib/tracing/utils.test.ts  | 53 +++++++++++++++++++
 packages/core/tsconfig.test.json              |  1 +
 5 files changed, 82 insertions(+), 18 deletions(-)
 create mode 100644 packages/core/test/lib/tracing/utils.test.ts

diff --git a/packages/core/src/tracing/dynamicSamplingContext.ts b/packages/core/src/tracing/dynamicSamplingContext.ts
index 5f10f11db19c..e5858fdd135e 100644
--- a/packages/core/src/tracing/dynamicSamplingContext.ts
+++ b/packages/core/src/tracing/dynamicSamplingContext.ts
@@ -15,9 +15,8 @@ import {
   baggageHeaderToDynamicSamplingContext,
   dynamicSamplingContextToSentryBaggageHeader,
 } from '../utils-hoist/baggage';
-import { extractOrgIdFromDsnHost } from '../utils-hoist/dsn';
 import { addNonEnumerableProperty } from '../utils-hoist/object';
-import { getCapturedScopesOnSpan } from './utils';
+import { deriveOrgIdFromClient, getCapturedScopesOnSpan } from './utils';
 
 /**
  * If you change this value, also update the terser plugin config to
@@ -45,14 +44,7 @@ export function freezeDscOnSpan(span: Span, dsc: Partial<DynamicSamplingContext>
 export function getDynamicSamplingContextFromClient(trace_id: string, client: Client): DynamicSamplingContext {
   const options = client.getOptions();
 
-  const { publicKey: public_key, host } = client.getDsn() || {};
-
-  let org_id: string | undefined;
-  if (options.orgId) {
-    org_id = String(options.orgId);
-  } else if (host) {
-    org_id = extractOrgIdFromDsnHost(host);
-  }
+  const { publicKey: public_key } = client.getDsn() || {};
 
   // Instead of conditionally adding non-undefined values, we add them and then remove them if needed
   // otherwise, the order of baggage entries changes, which "breaks" a bunch of tests etc.
@@ -61,7 +53,7 @@ export function getDynamicSamplingContextFromClient(trace_id: string, client: Cl
     release: options.release,
     public_key,
     trace_id,
-    org_id,
+    org_id: deriveOrgIdFromClient(client),
   };
 
   client.emit('createDsc', dsc);
diff --git a/packages/core/src/tracing/trace.ts b/packages/core/src/tracing/trace.ts
index 41f3fae23a12..6a84f4db31da 100644
--- a/packages/core/src/tracing/trace.ts
+++ b/packages/core/src/tracing/trace.ts
@@ -17,7 +17,6 @@ import { parseSampleRate } from '../utils/parseSampleRate';
 import { _getSpanForScope, _setSpanForScope } from '../utils/spanOnScope';
 import { addChildSpanToSpan, getRootSpan, spanIsSampled, spanTimeInputToSeconds, spanToJSON } from '../utils/spanUtils';
 import { baggageHeaderToDynamicSamplingContext } from '../utils-hoist/baggage';
-import { extractOrgIdFromDsnHost } from '../utils-hoist/dsn';
 import { logger } from '../utils-hoist/logger';
 import { generateTraceId } from '../utils-hoist/propagationContext';
 import { propagationContextFromHeaders } from '../utils-hoist/tracing';
@@ -27,7 +26,7 @@ import { sampleSpan } from './sampling';
 import { SentryNonRecordingSpan } from './sentryNonRecordingSpan';
 import { SentrySpan } from './sentrySpan';
 import { SPAN_STATUS_ERROR } from './spanstatus';
-import { setCapturedScopesOnSpan } from './utils';
+import { deriveOrgIdFromClient, setCapturedScopesOnSpan } from './utils';
 
 const SUPPRESS_TRACING_KEY = '__SENTRY_SUPPRESS_TRACING__';
 
@@ -225,11 +224,7 @@ export const continueTrace = <V>(
   const incomingDsc = baggageHeaderToDynamicSamplingContext(baggage);
   const baggageOrgId = incomingDsc?.org_id;
 
-  let sdkOrgId: string | undefined;
-  const dsn = client?.getDsn();
-  if (dsn?.host) {
-    sdkOrgId = extractOrgIdFromDsnHost(dsn.host);
-  }
+  const sdkOrgId = deriveOrgIdFromClient(client);
 
   const shouldStartNewTrace = (): boolean => {
     // Case: baggage org ID and SDK org ID don't match - always start new trace
diff --git a/packages/core/src/tracing/utils.ts b/packages/core/src/tracing/utils.ts
index f7e3d4924b35..4ffae4ad9113 100644
--- a/packages/core/src/tracing/utils.ts
+++ b/packages/core/src/tracing/utils.ts
@@ -1,5 +1,7 @@
+import type { Client } from '../client';
 import type { Scope } from '../scope';
 import type { Span } from '../types-hoist/span';
+import { extractOrgIdFromDsnHost } from '../utils-hoist/dsn';
 import { addNonEnumerableProperty } from '../utils-hoist/object';
 
 const SCOPE_ON_START_SPAN_FIELD = '_sentryScope';
@@ -27,3 +29,24 @@ export function getCapturedScopesOnSpan(span: Span): { scope?: Scope; isolationS
     isolationScope: (span as SpanWithScopes)[ISOLATION_SCOPE_ON_START_SPAN_FIELD],
   };
 }
+
+/**
+ *  Returns the organization ID of the client.
+ *
+ *  The organization ID is extracted from the DSN. If the client options include a `orgId`, this will always take precedence.
+ */
+export function deriveOrgIdFromClient(client: Client | undefined): string | undefined {
+  const options = client?.getOptions();
+
+  const { host } = client?.getDsn() || {};
+
+  let org_id: string | undefined;
+
+  if (options?.orgId) {
+    org_id = String(options.orgId);
+  } else if (host) {
+    org_id = extractOrgIdFromDsnHost(host);
+  }
+
+  return org_id;
+}
diff --git a/packages/core/test/lib/tracing/utils.test.ts b/packages/core/test/lib/tracing/utils.test.ts
new file mode 100644
index 000000000000..7fbb624644a8
--- /dev/null
+++ b/packages/core/test/lib/tracing/utils.test.ts
@@ -0,0 +1,53 @@
+import { beforeEach, describe, expect, test, vi } from 'vitest';
+import { deriveOrgIdFromClient } from '../../../src/tracing/utils';
+import { getDefaultTestClientOptions, TestClient } from '../../mocks/client';
+
+describe('deriveOrgIdFromClient', () => {
+  let client: TestClient;
+
+  beforeEach(() => {
+    vi.clearAllMocks();
+  });
+
+  test('returns orgId from client options when available', () => {
+    client = new TestClient(
+      getDefaultTestClientOptions({
+        orgId: '00222111',
+        dsn: 'https://public@sentry.example.com/1',
+      }),
+    );
+
+    const result = deriveOrgIdFromClient(client);
+    expect(result).toBe('00222111');
+  });
+
+  test('converts non-string orgId to string', () => {
+    client = new TestClient(
+      getDefaultTestClientOptions({
+        orgId: 12345,
+        dsn: 'https://public@sentry.example.com/1',
+      }),
+    );
+
+    const result = deriveOrgIdFromClient(client);
+    expect(result).toBe('12345');
+  });
+
+  test('extracts orgId from DSN host when options.orgId is not available', () => {
+    client = new TestClient(
+      getDefaultTestClientOptions({
+        dsn: 'https://public@o012300.example.com/1',
+      }),
+    );
+
+    const result = deriveOrgIdFromClient(client);
+    expect(result).toBe('012300');
+  });
+
+  test('returns undefined when neither options.orgId nor DSN host are available', () => {
+    client = new TestClient(getDefaultTestClientOptions({}));
+
+    const result = deriveOrgIdFromClient(client);
+    expect(result).toBeUndefined();
+  });
+});
diff --git a/packages/core/tsconfig.test.json b/packages/core/tsconfig.test.json
index c2b522d04ee1..0db9ad3bf16c 100644
--- a/packages/core/tsconfig.test.json
+++ b/packages/core/tsconfig.test.json
@@ -5,6 +5,7 @@
 
   "compilerOptions": {
     "lib": ["DOM", "ES2018"],
+    "module": "ESNext", // support dynamic import()
     // should include all types from `./tsconfig.json` plus types for all test frameworks used
     "types": ["node"]
 

From cd60e47f8365667f7a9323fcf474645486724110 Mon Sep 17 00:00:00 2001
From: s1gr1d <sigrid.huemer@posteo.at>
Date: Fri, 16 May 2025 15:03:34 +0200
Subject: [PATCH 03/14] add `shouldContinueTrace` util function

---
 packages/core/src/index.ts                    |  1 +
 packages/core/src/tracing/trace.ts            | 35 +---------
 packages/core/src/utils-hoist/tracing.ts      | 41 +++++++++++
 .../core/test/utils-hoist/tracing.test.ts     | 69 ++++++++++++++++++-
 4 files changed, 112 insertions(+), 34 deletions(-)

diff --git a/packages/core/src/index.ts b/packages/core/src/index.ts
index 6d281fde0ac9..99a52b9566dc 100644
--- a/packages/core/src/index.ts
+++ b/packages/core/src/index.ts
@@ -216,6 +216,7 @@ export {
   extractTraceparentData,
   generateSentryTraceHeader,
   propagationContextFromHeaders,
+  shouldContinueTrace,
 } from './utils-hoist/tracing';
 export { getSDKSource, isBrowserBundle } from './utils-hoist/env';
 export type { SdkSource } from './utils-hoist/env';
diff --git a/packages/core/src/tracing/trace.ts b/packages/core/src/tracing/trace.ts
index 6a84f4db31da..51b08c6f0e68 100644
--- a/packages/core/src/tracing/trace.ts
+++ b/packages/core/src/tracing/trace.ts
@@ -19,7 +19,7 @@ import { addChildSpanToSpan, getRootSpan, spanIsSampled, spanTimeInputToSeconds,
 import { baggageHeaderToDynamicSamplingContext } from '../utils-hoist/baggage';
 import { logger } from '../utils-hoist/logger';
 import { generateTraceId } from '../utils-hoist/propagationContext';
-import { propagationContextFromHeaders } from '../utils-hoist/tracing';
+import { propagationContextFromHeaders, shouldContinueTrace } from '../utils-hoist/tracing';
 import { freezeDscOnSpan, getDynamicSamplingContextFromSpan } from './dynamicSamplingContext';
 import { logSpanStart } from './logSpans';
 import { sampleSpan } from './sampling';
@@ -216,41 +216,10 @@ export const continueTrace = <V>(
   }
 
   const { sentryTrace, baggage } = options;
-  const client = getClient();
-
-  const clientOptions = client?.getOptions();
-  const strictTraceContinuation = clientOptions?.strictTraceContinuation || false; // default for `strictTraceContinuation` is `false` todo(v10): set default to `true`
 
   const incomingDsc = baggageHeaderToDynamicSamplingContext(baggage);
-  const baggageOrgId = incomingDsc?.org_id;
-
-  const sdkOrgId = deriveOrgIdFromClient(client);
-
-  const shouldStartNewTrace = (): boolean => {
-    // Case: baggage org ID and SDK org ID don't match - always start new trace
-    if (baggageOrgId && sdkOrgId && baggageOrgId !== sdkOrgId) {
-      DEBUG_BUILD &&
-        logger.info(`Starting a new trace because org IDs don't match (incoming: ${baggageOrgId}, sdk: ${sdkOrgId})`);
-      return true;
-    }
-
-    if (strictTraceContinuation) {
-      // With strict continuation enabled, start new trace if:
-      // - Baggage has org ID but SDK doesn't have one
-      // - SDK has org ID but baggage doesn't have one
-      if ((baggageOrgId && !sdkOrgId) || (!baggageOrgId && sdkOrgId)) {
-        DEBUG_BUILD &&
-          logger.info(
-            `Starting a new trace because strict trace continuation is enabled and one org ID is missing (incoming: ${baggageOrgId}, sdk: ${sdkOrgId})`,
-          );
-        return true;
-      }
-    }
-
-    return false;
-  };
 
-  if (shouldStartNewTrace()) {
+  if (shouldContinueTrace(getClient(), incomingDsc?.org_id)) {
     return startNewTrace(callback);
   }
 
diff --git a/packages/core/src/utils-hoist/tracing.ts b/packages/core/src/utils-hoist/tracing.ts
index a3add28426f7..affc57bd6f8c 100644
--- a/packages/core/src/utils-hoist/tracing.ts
+++ b/packages/core/src/utils-hoist/tracing.ts
@@ -1,7 +1,11 @@
+import type { Client } from '../client';
+import { DEBUG_BUILD } from '../debug-build';
+import { deriveOrgIdFromClient } from '../tracing/utils';
 import type { DynamicSamplingContext } from '../types-hoist/envelope';
 import type { PropagationContext } from '../types-hoist/tracing';
 import type { TraceparentData } from '../types-hoist/transaction';
 import { parseSampleRate } from '../utils/parseSampleRate';
+import { logger } from '../utils-hoist/logger';
 import { baggageHeaderToDynamicSamplingContext } from './baggage';
 import { generateSpanId, generateTraceId } from './propagationContext';
 
@@ -124,3 +128,40 @@ function getSampleRandFromTraceparentAndDsc(
     return Math.random();
   }
 }
+
+/**
+ * Determines whether a new trace should be continued based on the provided client and baggage org ID.
+ * If the trace should not be continued, a new trace will be started.
+ *
+ * The result is dependent on the `strictTraceContinuation` option in the client.
+ * See https://develop.sentry.dev/sdk/telemetry/traces/#stricttracecontinuation
+ */
+export function shouldContinueTrace(client: Client | undefined, baggageOrgId?: string): boolean {
+  const sdkOptionOrgId = deriveOrgIdFromClient(client);
+
+  // Case: baggage org ID and SDK org ID don't match - always start new trace
+  if (baggageOrgId && sdkOptionOrgId && baggageOrgId !== sdkOptionOrgId) {
+    DEBUG_BUILD &&
+      logger.info(
+        `Starting a new trace because org IDs don't match (incoming baggage: ${baggageOrgId}, SDK options: ${sdkOptionOrgId})`,
+      );
+    return false;
+  }
+
+  const strictTraceContinuation = client?.getOptions()?.strictTraceContinuation || false; // default for `strictTraceContinuation` is `false` todo(v10): set default to `true`
+
+  if (strictTraceContinuation) {
+    // With strict continuation enabled, start new trace if:
+    // - Baggage has org ID but SDK doesn't have one
+    // - SDK has org ID but baggage doesn't have one
+    if ((baggageOrgId && !sdkOptionOrgId) || (!baggageOrgId && sdkOptionOrgId)) {
+      DEBUG_BUILD &&
+        logger.info(
+          `Starting a new trace because strict trace continuation is enabled and one org ID is missing (incoming baggage: ${baggageOrgId}, SDK options: ${sdkOptionOrgId})`,
+        );
+      return false;
+    }
+  }
+
+  return true;
+}
diff --git a/packages/core/test/utils-hoist/tracing.test.ts b/packages/core/test/utils-hoist/tracing.test.ts
index 851ee7b109c4..4e23c7567c79 100644
--- a/packages/core/test/utils-hoist/tracing.test.ts
+++ b/packages/core/test/utils-hoist/tracing.test.ts
@@ -1,5 +1,10 @@
 import { describe, expect, it, test } from 'vitest';
-import { extractTraceparentData, propagationContextFromHeaders } from '../../src/utils-hoist/tracing';
+import {
+  extractTraceparentData,
+  propagationContextFromHeaders,
+  shouldContinueTrace,
+} from '../../src/utils-hoist/tracing';
+import { getDefaultTestClientOptions, TestClient } from '../mocks/client';
 
 const EXAMPLE_SENTRY_TRACE = '12312012123120121231201212312012-1121201211212012-1';
 const EXAMPLE_BAGGAGE = 'sentry-release=1.2.3,sentry-foo=bar,other=baz,sentry-sample_rand=0.42';
@@ -124,3 +129,65 @@ describe('extractTraceparentData', () => {
     expect(extractTraceparentData('aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa-bbbbbbbbbbbbbbbb-x')).toBeUndefined();
   });
 });
+
+describe('shouldContinueTrace', () => {
+  test('returns true when both baggage and SDK org IDs are undefined', () => {
+    const client = new TestClient(getDefaultTestClientOptions({}));
+
+    const result = shouldContinueTrace(client, undefined);
+    expect(result).toBe(true);
+  });
+
+  test('returns true when org IDs match', () => {
+    const orgId = '123456';
+    const client = new TestClient(getDefaultTestClientOptions({ orgId }));
+
+    const result = shouldContinueTrace(client, orgId);
+    expect(result).toBe(true);
+  });
+
+  test('returns false when org IDs do not match', () => {
+    const client = new TestClient(getDefaultTestClientOptions({ orgId: '123456' }));
+
+    const result = shouldContinueTrace(client, '654321');
+    expect(result).toBe(false);
+  });
+
+  test('returns true when baggage org ID is undefined and strictTraceContinuation is false', () => {
+    const client = new TestClient(getDefaultTestClientOptions({ orgId: '123456', strictTraceContinuation: false }));
+
+    const result = shouldContinueTrace(client, undefined);
+    expect(result).toBe(true);
+  });
+
+  test('returns true when SDK org ID is undefined and strictTraceContinuation is false', () => {
+    const client = new TestClient(getDefaultTestClientOptions({ strictTraceContinuation: false }));
+
+    const result = shouldContinueTrace(client, '123456');
+    expect(result).toBe(true);
+  });
+
+  test('returns false when baggage org ID is undefined and strictTraceContinuation is true', () => {
+    const client = new TestClient(getDefaultTestClientOptions({ orgId: '123456', strictTraceContinuation: true }));
+
+    const result = shouldContinueTrace(client, undefined);
+    expect(result).toBe(false);
+  });
+
+  test('returns false when SDK org ID is undefined and strictTraceContinuation is true', () => {
+    const client = new TestClient(getDefaultTestClientOptions({ strictTraceContinuation: true }));
+
+    const result = shouldContinueTrace(client, '123456');
+    expect(result).toBe(false);
+  });
+
+  test('returns true when client is undefined', () => {
+    const result = shouldContinueTrace(undefined, '123456');
+    expect(result).toBe(true);
+  });
+
+  test('returns true when both org IDs and client are undefined', () => {
+    const result = shouldContinueTrace(undefined, undefined);
+    expect(result).toBe(true);
+  });
+});

From 484aedf89aad1ef862f95fe2e9925d24c3d56e4a Mon Sep 17 00:00:00 2001
From: s1gr1d <sigrid.huemer@posteo.at>
Date: Fri, 16 May 2025 15:30:38 +0200
Subject: [PATCH 04/14] shuffle around util functions

---
 packages/core/src/index.ts                    |  2 +-
 .../src/tracing/dynamicSamplingContext.ts     |  3 ++-
 packages/core/src/tracing/trace.ts            |  2 +-
 packages/core/src/tracing/utils.ts            | 23 -------------------
 packages/core/src/utils-hoist/dsn.ts          | 22 ++++++++++++++++++
 packages/core/src/utils-hoist/tracing.ts      |  2 +-
 packages/opentelemetry/src/propagator.ts      |  5 +++-
 packages/opentelemetry/src/trace.ts           |  2 +-
 8 files changed, 32 insertions(+), 29 deletions(-)

diff --git a/packages/core/src/index.ts b/packages/core/src/index.ts
index 99a52b9566dc..4cfeb4fab387 100644
--- a/packages/core/src/index.ts
+++ b/packages/core/src/index.ts
@@ -127,7 +127,7 @@ export type { FeatureFlag } from './featureFlags';
 export { applyAggregateErrorsToEvent } from './utils-hoist/aggregate-errors';
 export { getBreadcrumbLogLevelFromHttpStatusCode } from './utils-hoist/breadcrumb-log-level';
 export { getComponentName, getLocationHref, htmlTreeAsString } from './utils-hoist/browser';
-export { dsnFromString, dsnToString, makeDsn } from './utils-hoist/dsn';
+export { dsnFromString, dsnToString, makeDsn, deriveOrgIdFromClient } from './utils-hoist/dsn';
 // eslint-disable-next-line deprecation/deprecation
 export { SentryError } from './utils-hoist/error';
 export { GLOBAL_OBJ } from './utils-hoist/worldwide';
diff --git a/packages/core/src/tracing/dynamicSamplingContext.ts b/packages/core/src/tracing/dynamicSamplingContext.ts
index e5858fdd135e..e5a5389f394f 100644
--- a/packages/core/src/tracing/dynamicSamplingContext.ts
+++ b/packages/core/src/tracing/dynamicSamplingContext.ts
@@ -15,8 +15,9 @@ import {
   baggageHeaderToDynamicSamplingContext,
   dynamicSamplingContextToSentryBaggageHeader,
 } from '../utils-hoist/baggage';
+import { deriveOrgIdFromClient } from '../utils-hoist/dsn';
 import { addNonEnumerableProperty } from '../utils-hoist/object';
-import { deriveOrgIdFromClient, getCapturedScopesOnSpan } from './utils';
+import { getCapturedScopesOnSpan } from './utils';
 
 /**
  * If you change this value, also update the terser plugin config to
diff --git a/packages/core/src/tracing/trace.ts b/packages/core/src/tracing/trace.ts
index 51b08c6f0e68..15cc19dc4739 100644
--- a/packages/core/src/tracing/trace.ts
+++ b/packages/core/src/tracing/trace.ts
@@ -26,7 +26,7 @@ import { sampleSpan } from './sampling';
 import { SentryNonRecordingSpan } from './sentryNonRecordingSpan';
 import { SentrySpan } from './sentrySpan';
 import { SPAN_STATUS_ERROR } from './spanstatus';
-import { deriveOrgIdFromClient, setCapturedScopesOnSpan } from './utils';
+import { setCapturedScopesOnSpan } from './utils';
 
 const SUPPRESS_TRACING_KEY = '__SENTRY_SUPPRESS_TRACING__';
 
diff --git a/packages/core/src/tracing/utils.ts b/packages/core/src/tracing/utils.ts
index 4ffae4ad9113..f7e3d4924b35 100644
--- a/packages/core/src/tracing/utils.ts
+++ b/packages/core/src/tracing/utils.ts
@@ -1,7 +1,5 @@
-import type { Client } from '../client';
 import type { Scope } from '../scope';
 import type { Span } from '../types-hoist/span';
-import { extractOrgIdFromDsnHost } from '../utils-hoist/dsn';
 import { addNonEnumerableProperty } from '../utils-hoist/object';
 
 const SCOPE_ON_START_SPAN_FIELD = '_sentryScope';
@@ -29,24 +27,3 @@ export function getCapturedScopesOnSpan(span: Span): { scope?: Scope; isolationS
     isolationScope: (span as SpanWithScopes)[ISOLATION_SCOPE_ON_START_SPAN_FIELD],
   };
 }
-
-/**
- *  Returns the organization ID of the client.
- *
- *  The organization ID is extracted from the DSN. If the client options include a `orgId`, this will always take precedence.
- */
-export function deriveOrgIdFromClient(client: Client | undefined): string | undefined {
-  const options = client?.getOptions();
-
-  const { host } = client?.getDsn() || {};
-
-  let org_id: string | undefined;
-
-  if (options?.orgId) {
-    org_id = String(options.orgId);
-  } else if (host) {
-    org_id = extractOrgIdFromDsnHost(host);
-  }
-
-  return org_id;
-}
diff --git a/packages/core/src/utils-hoist/dsn.ts b/packages/core/src/utils-hoist/dsn.ts
index e26cbb4c8bf1..bff1461a29ab 100644
--- a/packages/core/src/utils-hoist/dsn.ts
+++ b/packages/core/src/utils-hoist/dsn.ts
@@ -1,3 +1,4 @@
+import type { Client } from '../client';
 import type { DsnComponents, DsnLike, DsnProtocol } from '../types-hoist/dsn';
 import { DEBUG_BUILD } from './../debug-build';
 import { consoleSandbox, logger } from './logger';
@@ -129,6 +130,27 @@ export function extractOrgIdFromDsnHost(host: string): string | undefined {
   return match?.[1];
 }
 
+/**
+ *  Returns the organization ID of the client.
+ *
+ *  The organization ID is extracted from the DSN. If the client options include a `orgId`, this will always take precedence.
+ */
+export function deriveOrgIdFromClient(client: Client | undefined): string | undefined {
+  const options = client?.getOptions();
+
+  const { host } = client?.getDsn() || {};
+
+  let org_id: string | undefined;
+
+  if (options?.orgId) {
+    org_id = String(options.orgId);
+  } else if (host) {
+    org_id = extractOrgIdFromDsnHost(host);
+  }
+
+  return org_id;
+}
+
 /**
  * Creates a valid Sentry Dsn object, identifying a Sentry instance and project.
  * @returns a valid DsnComponents object or `undefined` if @param from is an invalid DSN source
diff --git a/packages/core/src/utils-hoist/tracing.ts b/packages/core/src/utils-hoist/tracing.ts
index affc57bd6f8c..53209e574569 100644
--- a/packages/core/src/utils-hoist/tracing.ts
+++ b/packages/core/src/utils-hoist/tracing.ts
@@ -1,10 +1,10 @@
 import type { Client } from '../client';
 import { DEBUG_BUILD } from '../debug-build';
-import { deriveOrgIdFromClient } from '../tracing/utils';
 import type { DynamicSamplingContext } from '../types-hoist/envelope';
 import type { PropagationContext } from '../types-hoist/tracing';
 import type { TraceparentData } from '../types-hoist/transaction';
 import { parseSampleRate } from '../utils/parseSampleRate';
+import { deriveOrgIdFromClient } from '../utils-hoist/dsn';
 import { logger } from '../utils-hoist/logger';
 import { baggageHeaderToDynamicSamplingContext } from './baggage';
 import { generateSpanId, generateTraceId } from './propagationContext';
diff --git a/packages/opentelemetry/src/propagator.ts b/packages/opentelemetry/src/propagator.ts
index b5e493b31fd8..1c3b122ef466 100644
--- a/packages/opentelemetry/src/propagator.ts
+++ b/packages/opentelemetry/src/propagator.ts
@@ -15,9 +15,11 @@ import {
   parseBaggageHeader,
   propagationContextFromHeaders,
   SENTRY_BAGGAGE_KEY_PREFIX,
+  shouldContinueTrace,
   spanToJSON,
   stringMatchesSomePattern,
 } from '@sentry/core';
+import { baggageHeaderToDynamicSamplingContext } from '@sentry/core/src';
 import { SENTRY_BAGGAGE_HEADER, SENTRY_TRACE_HEADER, SENTRY_TRACE_STATE_URL } from './constants';
 import { DEBUG_BUILD } from './debug-build';
 import { getScopesFromContext, setScopesOnContext } from './utils/contextData';
@@ -210,10 +212,11 @@ function getContextWithRemoteActiveSpan(
   const propagationContext = propagationContextFromHeaders(sentryTrace, baggage);
 
   const { traceId, parentSpanId, sampled, dsc } = propagationContext;
+  const incomingDsc = baggageHeaderToDynamicSamplingContext(baggage);
 
   // We only want to set the virtual span if we are continuing a concrete trace
   // Otherwise, we ignore the incoming trace here, e.g. if we have no trace headers
-  if (!parentSpanId) {
+  if (!parentSpanId || !shouldContinueTrace(getClient(), incomingDsc?.org_id)) {
     return ctx;
   }
 
diff --git a/packages/opentelemetry/src/trace.ts b/packages/opentelemetry/src/trace.ts
index e604d83bd4d8..c30377fe7763 100644
--- a/packages/opentelemetry/src/trace.ts
+++ b/packages/opentelemetry/src/trace.ts
@@ -259,7 +259,7 @@ export function continueTrace<T>(options: Parameters<typeof baseContinueTrace>[0
 
 /**
  * Get the trace context for a given scope.
- * We have a custom implemention here because we need an OTEL-specific way to get the span from a scope.
+ * We have a custom implementation here because we need an OTEL-specific way to get the span from a scope.
  */
 export function getTraceContextForScope(
   client: Client,

From 452c3532338fa61b1aa90a2fe255f5806585ae3e Mon Sep 17 00:00:00 2001
From: s1gr1d <sigrid.huemer@posteo.at>
Date: Mon, 21 Jul 2025 16:52:50 +0200
Subject: [PATCH 05/14] fix imports

---
 .../src/tracing/dynamicSamplingContext.ts     |  7 +--
 packages/core/src/tracing/trace.ts            |  7 +--
 packages/core/src/utils/tracing.ts            | 20 +++----
 packages/core/test/lib/tracing/trace.test.ts  |  1 -
 packages/core/test/lib/tracing/utils.test.ts  | 53 -------------------
 packages/core/test/lib/utils/dsn.test.ts      | 53 ++++++++++++++++++-
 packages/core/test/lib/utils/tracing.test.ts  |  8 +--
 7 files changed, 65 insertions(+), 84 deletions(-)
 delete mode 100644 packages/core/test/lib/tracing/utils.test.ts

diff --git a/packages/core/src/tracing/dynamicSamplingContext.ts b/packages/core/src/tracing/dynamicSamplingContext.ts
index 837d6daf7e71..31f0ad638112 100644
--- a/packages/core/src/tracing/dynamicSamplingContext.ts
+++ b/packages/core/src/tracing/dynamicSamplingContext.ts
@@ -10,15 +10,10 @@ import {
 import type { DynamicSamplingContext } from '../types-hoist/envelope';
 import type { Span } from '../types-hoist/span';
 import { baggageHeaderToDynamicSamplingContext, dynamicSamplingContextToSentryBaggageHeader } from '../utils/baggage';
-import { extractOrgIdFromDsnHost } from '../utils/dsn';
+import { deriveOrgIdFromClient } from '../utils/dsn';
 import { hasSpansEnabled } from '../utils/hasSpansEnabled';
 import { addNonEnumerableProperty } from '../utils/object';
 import { getRootSpan, spanIsSampled, spanToJSON } from '../utils/spanUtils';
-import {
-  baggageHeaderToDynamicSamplingContext,
-  dynamicSamplingContextToSentryBaggageHeader,
-} from '../utils-hoist/baggage';
-import { deriveOrgIdFromClient } from '../utils-hoist/dsn'
 import { getCapturedScopesOnSpan } from './utils';
 
 /**
diff --git a/packages/core/src/tracing/trace.ts b/packages/core/src/tracing/trace.ts
index 0d3fb9be215a..3bafb6865067 100644
--- a/packages/core/src/tracing/trace.ts
+++ b/packages/core/src/tracing/trace.ts
@@ -11,6 +11,7 @@ import type { DynamicSamplingContext } from '../types-hoist/envelope';
 import type { ClientOptions } from '../types-hoist/options';
 import type { SentrySpanArguments, Span, SpanTimeInput } from '../types-hoist/span';
 import type { StartSpanOptions } from '../types-hoist/startSpanOptions';
+import { baggageHeaderToDynamicSamplingContext } from '../utils/baggage';
 import { debug } from '../utils/debug-logger';
 import { handleCallbackErrors } from '../utils/handleCallbackErrors';
 import { hasSpansEnabled } from '../utils/hasSpansEnabled';
@@ -18,11 +19,7 @@ import { parseSampleRate } from '../utils/parseSampleRate';
 import { generateTraceId } from '../utils/propagationContext';
 import { _getSpanForScope, _setSpanForScope } from '../utils/spanOnScope';
 import { addChildSpanToSpan, getRootSpan, spanIsSampled, spanTimeInputToSeconds, spanToJSON } from '../utils/spanUtils';
-import { propagationContextFromHeaders } from '../utils/tracing';
-import { baggageHeaderToDynamicSamplingContext } from '../utils-hoist/baggage';
-import { logger } from '../utils-hoist/logger';
-import { generateTraceId } from '../utils-hoist/propagationContext';
-import { propagationContextFromHeaders, shouldContinueTrace } from '../utils-hoist/tracing';
+import { propagationContextFromHeaders, shouldContinueTrace } from '../utils/tracing';
 import { freezeDscOnSpan, getDynamicSamplingContextFromSpan } from './dynamicSamplingContext';
 import { logSpanStart } from './logSpans';
 import { sampleSpan } from './sampling';
diff --git a/packages/core/src/utils/tracing.ts b/packages/core/src/utils/tracing.ts
index fc959c7f45ae..ebda4a646eb9 100644
--- a/packages/core/src/utils/tracing.ts
+++ b/packages/core/src/utils/tracing.ts
@@ -1,12 +1,10 @@
 import type { Client } from '../client';
-import { DEBUG_BUILD } from '../debug-build';
 import type { DynamicSamplingContext } from '../types-hoist/envelope';
 import type { PropagationContext } from '../types-hoist/tracing';
 import type { TraceparentData } from '../types-hoist/transaction';
-import { parseSampleRate } from '../utils/parseSampleRate';
-import { deriveOrgIdFromClient } from '../utils-hoist/dsn';
-import { logger } from '../utils-hoist/logger';
+import { debug } from '../utils/debug-logger';
 import { baggageHeaderToDynamicSamplingContext } from './baggage';
+import { deriveOrgIdFromClient } from './dsn';
 import { parseSampleRate } from './parseSampleRate';
 import { generateSpanId, generateTraceId } from './propagationContext';
 
@@ -142,10 +140,9 @@ export function shouldContinueTrace(client: Client | undefined, baggageOrgId?: s
 
   // Case: baggage org ID and SDK org ID don't match - always start new trace
   if (baggageOrgId && sdkOptionOrgId && baggageOrgId !== sdkOptionOrgId) {
-    DEBUG_BUILD &&
-      logger.info(
-        `Starting a new trace because org IDs don't match (incoming baggage: ${baggageOrgId}, SDK options: ${sdkOptionOrgId})`,
-      );
+    debug.log(
+      `Starting a new trace because org IDs don't match (incoming baggage: ${baggageOrgId}, SDK options: ${sdkOptionOrgId})`,
+    );
     return false;
   }
 
@@ -156,10 +153,9 @@ export function shouldContinueTrace(client: Client | undefined, baggageOrgId?: s
     // - Baggage has org ID but SDK doesn't have one
     // - SDK has org ID but baggage doesn't have one
     if ((baggageOrgId && !sdkOptionOrgId) || (!baggageOrgId && sdkOptionOrgId)) {
-      DEBUG_BUILD &&
-        logger.info(
-          `Starting a new trace because strict trace continuation is enabled and one org ID is missing (incoming baggage: ${baggageOrgId}, SDK options: ${sdkOptionOrgId})`,
-        );
+      debug.log(
+        `Starting a new trace because strict trace continuation is enabled and one org ID is missing (incoming baggage: ${baggageOrgId}, SDK options: ${sdkOptionOrgId})`,
+      );
       return false;
     }
   }
diff --git a/packages/core/test/lib/tracing/trace.test.ts b/packages/core/test/lib/tracing/trace.test.ts
index 764d58d9318a..a1d786dfdd10 100644
--- a/packages/core/test/lib/tracing/trace.test.ts
+++ b/packages/core/test/lib/tracing/trace.test.ts
@@ -31,7 +31,6 @@ import type { Span } from '../../../src/types-hoist/span';
 import type { StartSpanOptions } from '../../../src/types-hoist/startSpanOptions';
 import { _setSpanForScope } from '../../../src/utils/spanOnScope';
 import { getActiveSpan, getRootSpan, getSpanDescendants, spanIsSampled } from '../../../src/utils/spanUtils';
-import { extractOrgIdFromDsnHost } from '../../../src/utils-hoist/dsn';
 import { getDefaultTestClientOptions, TestClient } from '../../mocks/client';
 
 const enum Type {
diff --git a/packages/core/test/lib/tracing/utils.test.ts b/packages/core/test/lib/tracing/utils.test.ts
deleted file mode 100644
index 7fbb624644a8..000000000000
--- a/packages/core/test/lib/tracing/utils.test.ts
+++ /dev/null
@@ -1,53 +0,0 @@
-import { beforeEach, describe, expect, test, vi } from 'vitest';
-import { deriveOrgIdFromClient } from '../../../src/tracing/utils';
-import { getDefaultTestClientOptions, TestClient } from '../../mocks/client';
-
-describe('deriveOrgIdFromClient', () => {
-  let client: TestClient;
-
-  beforeEach(() => {
-    vi.clearAllMocks();
-  });
-
-  test('returns orgId from client options when available', () => {
-    client = new TestClient(
-      getDefaultTestClientOptions({
-        orgId: '00222111',
-        dsn: 'https://public@sentry.example.com/1',
-      }),
-    );
-
-    const result = deriveOrgIdFromClient(client);
-    expect(result).toBe('00222111');
-  });
-
-  test('converts non-string orgId to string', () => {
-    client = new TestClient(
-      getDefaultTestClientOptions({
-        orgId: 12345,
-        dsn: 'https://public@sentry.example.com/1',
-      }),
-    );
-
-    const result = deriveOrgIdFromClient(client);
-    expect(result).toBe('12345');
-  });
-
-  test('extracts orgId from DSN host when options.orgId is not available', () => {
-    client = new TestClient(
-      getDefaultTestClientOptions({
-        dsn: 'https://public@o012300.example.com/1',
-      }),
-    );
-
-    const result = deriveOrgIdFromClient(client);
-    expect(result).toBe('012300');
-  });
-
-  test('returns undefined when neither options.orgId nor DSN host are available', () => {
-    client = new TestClient(getDefaultTestClientOptions({}));
-
-    const result = deriveOrgIdFromClient(client);
-    expect(result).toBeUndefined();
-  });
-});
diff --git a/packages/core/test/lib/utils/dsn.test.ts b/packages/core/test/lib/utils/dsn.test.ts
index 5d1cfbe2b538..2c6a02b2cc05 100644
--- a/packages/core/test/lib/utils/dsn.test.ts
+++ b/packages/core/test/lib/utils/dsn.test.ts
@@ -1,7 +1,8 @@
 import { beforeEach, describe, expect, it, test, vi } from 'vitest';
 import { DEBUG_BUILD } from '../../../src/debug-build';
 import { debug } from '../../../src/utils/debug-logger';
-import { dsnToString, extractOrgIdFromDsnHost, makeDsn } from '../../../src/utils/dsn';
+import { deriveOrgIdFromClient, dsnToString, extractOrgIdFromDsnHost, makeDsn } from '../../../src/utils/dsn';
+import { getDefaultTestClientOptions, TestClient } from '../../mocks/client';
 
 function testIf(condition: boolean) {
   return condition ? test : test.skip;
@@ -247,3 +248,53 @@ describe('extractOrgIdFromDsnHost', () => {
     expect(extractOrgIdFromDsnHost('')).toBeUndefined();
   });
 });
+
+describe('deriveOrgIdFromClient', () => {
+  let client: TestClient;
+
+  beforeEach(() => {
+    vi.clearAllMocks();
+  });
+
+  test('returns orgId from client options when available', () => {
+    client = new TestClient(
+      getDefaultTestClientOptions({
+        orgId: '00222111',
+        dsn: 'https://public@sentry.example.com/1',
+      }),
+    );
+
+    const result = deriveOrgIdFromClient(client);
+    expect(result).toBe('00222111');
+  });
+
+  test('converts non-string orgId to string', () => {
+    client = new TestClient(
+      getDefaultTestClientOptions({
+        orgId: 12345,
+        dsn: 'https://public@sentry.example.com/1',
+      }),
+    );
+
+    const result = deriveOrgIdFromClient(client);
+    expect(result).toBe('12345');
+  });
+
+  test('extracts orgId from DSN host when options.orgId is not available', () => {
+    client = new TestClient(
+      getDefaultTestClientOptions({
+        dsn: 'https://public@o012300.example.com/1',
+      }),
+    );
+
+    const result = deriveOrgIdFromClient(client);
+    expect(result).toBe('012300');
+  });
+
+  test('returns undefined when neither options.orgId nor DSN host are available', () => {
+    client = new TestClient(getDefaultTestClientOptions({}));
+
+    const result = deriveOrgIdFromClient(client);
+    expect(result).toBeUndefined();
+  });
+});
diff --git a/packages/core/test/lib/utils/tracing.test.ts b/packages/core/test/lib/utils/tracing.test.ts
index 2defb7d6f91b..a34e8356264b 100644
--- a/packages/core/test/lib/utils/tracing.test.ts
+++ b/packages/core/test/lib/utils/tracing.test.ts
@@ -1,10 +1,6 @@
 import { describe, expect, it, test } from 'vitest';
-import {
-  extractTraceparentData,
-  propagationContextFromHeaders,
-  shouldContinueTrace,
-} from '../../../src/utils/tracing';
-import { getDefaultTestClientOptions, TestClient } from '../mocks/client';
+import { extractTraceparentData, propagationContextFromHeaders, shouldContinueTrace } from '../../../src/utils/tracing';
+import { getDefaultTestClientOptions, TestClient } from '../../mocks/client';
 
 const EXAMPLE_SENTRY_TRACE = '12312012123120121231201212312012-1121201211212012-1';
 const EXAMPLE_BAGGAGE = 'sentry-release=1.2.3,sentry-foo=bar,other=baz,sentry-sample_rand=0.42';

From 08569aaaa7dfa81313e36f838ffb2df3fb079c23 Mon Sep 17 00:00:00 2001
From: s1gr1d <sigrid.huemer@posteo.at>
Date: Thu, 24 Jul 2025 14:20:42 +0200
Subject: [PATCH 06/14] delete wrong imports

---
 packages/core/src/index.ts | 14 --------------
 1 file changed, 14 deletions(-)

diff --git a/packages/core/src/index.ts b/packages/core/src/index.ts
index bec822247745..ace67c267fd4 100644
--- a/packages/core/src/index.ts
+++ b/packages/core/src/index.ts
@@ -123,20 +123,6 @@ export { OPENAI_INTEGRATION_NAME } from './utils/openai/constants';
 export type { OpenAiClient, OpenAiOptions, InstrumentedMethod } from './utils/openai/types';
 export type { FeatureFlag } from './utils/featureFlags';
 
-export type { FeatureFlag } from './featureFlags';
-
-export { applyAggregateErrorsToEvent } from './utils-hoist/aggregate-errors';
-export { getBreadcrumbLogLevelFromHttpStatusCode } from './utils-hoist/breadcrumb-log-level';
-export { getComponentName, getLocationHref, htmlTreeAsString } from './utils-hoist/browser';
-export { dsnFromString, dsnToString, makeDsn, deriveOrgIdFromClient } from './utils-hoist/dsn';
-// eslint-disable-next-line deprecation/deprecation
-export { SentryError } from './utils-hoist/error';
-export { GLOBAL_OBJ } from './utils-hoist/worldwide';
-export type { InternalGlobal } from './utils-hoist/worldwide';
-export { addConsoleInstrumentationHandler } from './utils-hoist/instrument/console';
-export { addFetchEndInstrumentationHandler, addFetchInstrumentationHandler } from './utils-hoist/instrument/fetch';
-export { addGlobalErrorInstrumentationHandler } from './utils-hoist/instrument/globalError';
-export { addGlobalUnhandledRejectionInstrumentationHandler } from './utils-hoist/instrument/globalUnhandledRejection';
 export {
   _INTERNAL_copyFlagsFromScopeToEvent,
   _INTERNAL_insertFlagToScope,

From d4e5cc4232e905da966fab4de7a19e9f41a0f5ce Mon Sep 17 00:00:00 2001
From: s1gr1d <sigrid.huemer@posteo.at>
Date: Thu, 24 Jul 2025 14:33:00 +0200
Subject: [PATCH 07/14] change wrong import

---
 packages/opentelemetry/src/propagator.ts | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/packages/opentelemetry/src/propagator.ts b/packages/opentelemetry/src/propagator.ts
index b3a5f66183a5..7bf1969977c1 100644
--- a/packages/opentelemetry/src/propagator.ts
+++ b/packages/opentelemetry/src/propagator.ts
@@ -4,6 +4,7 @@ import { isTracingSuppressed, W3CBaggagePropagator } from '@opentelemetry/core';
 import { ATTR_URL_FULL, SEMATTRS_HTTP_URL } from '@opentelemetry/semantic-conventions';
 import type { Client, continueTrace, DynamicSamplingContext, Options, Scope } from '@sentry/core';
 import {
+  baggageHeaderToDynamicSamplingContext,
   debug,
   generateSentryTraceHeader,
   getClient,
@@ -19,7 +20,6 @@ import {
   spanToJSON,
   stringMatchesSomePattern,
 } from '@sentry/core';
-import { baggageHeaderToDynamicSamplingContext } from '@sentry/core/src';
 import { SENTRY_BAGGAGE_HEADER, SENTRY_TRACE_HEADER, SENTRY_TRACE_STATE_URL } from './constants';
 import { DEBUG_BUILD } from './debug-build';
 import { getScopesFromContext, setScopesOnContext } from './utils/contextData';

From 780720e683517a0b8ee715261f6e8af16da84243 Mon Sep 17 00:00:00 2001
From: s1gr1d <sigrid.huemer@posteo.at>
Date: Thu, 24 Jul 2025 16:04:36 +0200
Subject: [PATCH 08/14] fix test

---
 packages/core/src/tracing/trace.ts | 2 +-
 packages/core/src/utils/tracing.ts | 8 ++++----
 2 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/packages/core/src/tracing/trace.ts b/packages/core/src/tracing/trace.ts
index 3bafb6865067..03bf228ff6b9 100644
--- a/packages/core/src/tracing/trace.ts
+++ b/packages/core/src/tracing/trace.ts
@@ -219,7 +219,7 @@ export const continueTrace = <V>(
 
   const incomingDsc = baggageHeaderToDynamicSamplingContext(baggage);
 
-  if (shouldContinueTrace(getClient(), incomingDsc?.org_id)) {
+  if (!shouldContinueTrace(getClient(), incomingDsc?.org_id)) {
     return startNewTrace(callback);
   }
 
diff --git a/packages/core/src/utils/tracing.ts b/packages/core/src/utils/tracing.ts
index ebda4a646eb9..bb5b4545a5d4 100644
--- a/packages/core/src/utils/tracing.ts
+++ b/packages/core/src/utils/tracing.ts
@@ -138,7 +138,7 @@ function getSampleRandFromTraceparentAndDsc(
 export function shouldContinueTrace(client: Client | undefined, baggageOrgId?: string): boolean {
   const sdkOptionOrgId = deriveOrgIdFromClient(client);
 
-  // Case: baggage org ID and SDK org ID don't match - always start new trace
+  // Case: baggage orgID and SDK orgID don't match - always start new trace
   if (baggageOrgId && sdkOptionOrgId && baggageOrgId !== sdkOptionOrgId) {
     debug.log(
       `Starting a new trace because org IDs don't match (incoming baggage: ${baggageOrgId}, SDK options: ${sdkOptionOrgId})`,
@@ -146,12 +146,12 @@ export function shouldContinueTrace(client: Client | undefined, baggageOrgId?: s
     return false;
   }
 
-  const strictTraceContinuation = client?.getOptions()?.strictTraceContinuation || false; // default for `strictTraceContinuation` is `false` todo(v10): set default to `true`
+  const strictTraceContinuation = client?.getOptions()?.strictTraceContinuation || false; // default for `strictTraceContinuation` is `false`
 
   if (strictTraceContinuation) {
     // With strict continuation enabled, start new trace if:
-    // - Baggage has org ID but SDK doesn't have one
-    // - SDK has org ID but baggage doesn't have one
+    // - Baggage has orgID, but SDK doesn't have one
+    // - SDK has orgID, but baggage doesn't have one
     if ((baggageOrgId && !sdkOptionOrgId) || (!baggageOrgId && sdkOptionOrgId)) {
       debug.log(
         `Starting a new trace because strict trace continuation is enabled and one org ID is missing (incoming baggage: ${baggageOrgId}, SDK options: ${sdkOptionOrgId})`,

From 20b67c65ea6696d729061bdb14b3c555bc06e3bc Mon Sep 17 00:00:00 2001
From: s1gr1d <sigrid.huemer@posteo.at>
Date: Thu, 24 Jul 2025 16:05:49 +0200
Subject: [PATCH 09/14] raise node size limit

---
 .size-limit.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.size-limit.js b/.size-limit.js
index 13b963bacd8d..a46d905fe89f 100644
--- a/.size-limit.js
+++ b/.size-limit.js
@@ -233,7 +233,7 @@ module.exports = [
     import: createImport('init'),
     ignore: [...builtinModules, ...nodePrefixedBuiltinModules],
     gzip: true,
-    limit: '144 KB',
+    limit: '146 KB',
   },
   {
     name: '@sentry/node - without tracing',

From 8e43a3f0391aa3f417dbe934510307bce0e788d1 Mon Sep 17 00:00:00 2001
From: s1gr1d <sigrid.huemer@posteo.at>
Date: Fri, 25 Jul 2025 09:35:06 +0200
Subject: [PATCH 10/14] always expect client, change some comments

---
 packages/core/src/utils/dsn.ts               |  6 +++---
 packages/core/src/utils/tracing.ts           | 14 +++++++-------
 packages/core/test/lib/utils/tracing.test.ts | 10 ----------
 3 files changed, 10 insertions(+), 20 deletions(-)

diff --git a/packages/core/src/utils/dsn.ts b/packages/core/src/utils/dsn.ts
index 569d03901d1a..2c50a9338b38 100644
--- a/packages/core/src/utils/dsn.ts
+++ b/packages/core/src/utils/dsn.ts
@@ -135,10 +135,10 @@ export function extractOrgIdFromDsnHost(host: string): string | undefined {
  *
  *  The organization ID is extracted from the DSN. If the client options include a `orgId`, this will always take precedence.
  */
-export function deriveOrgIdFromClient(client: Client | undefined): string | undefined {
-  const options = client?.getOptions();
+export function deriveOrgIdFromClient(client: Client): string | undefined {
+  const options = client.getOptions();
 
-  const { host } = client?.getDsn() || {};
+  const { host } = client.getDsn() || {};
 
   let org_id: string | undefined;
 
diff --git a/packages/core/src/utils/tracing.ts b/packages/core/src/utils/tracing.ts
index bb5b4545a5d4..ca7b4c35e0ce 100644
--- a/packages/core/src/utils/tracing.ts
+++ b/packages/core/src/utils/tracing.ts
@@ -129,16 +129,16 @@ function getSampleRandFromTraceparentAndDsc(
 }
 
 /**
- * Determines whether a new trace should be continued based on the provided client and baggage org ID.
+ * Determines whether a new trace should be continued based on the provided baggage org ID and the client's `strictTraceContinuation` option.
  * If the trace should not be continued, a new trace will be started.
  *
  * The result is dependent on the `strictTraceContinuation` option in the client.
  * See https://develop.sentry.dev/sdk/telemetry/traces/#stricttracecontinuation
  */
-export function shouldContinueTrace(client: Client | undefined, baggageOrgId?: string): boolean {
+export function shouldContinueTrace(client: Client, baggageOrgId?: string): boolean {
   const sdkOptionOrgId = deriveOrgIdFromClient(client);
 
-  // Case: baggage orgID and SDK orgID don't match - always start new trace
+  // Case: baggage orgID and Client orgID don't match - always start new trace
   if (baggageOrgId && sdkOptionOrgId && baggageOrgId !== sdkOptionOrgId) {
     debug.log(
       `Starting a new trace because org IDs don't match (incoming baggage: ${baggageOrgId}, SDK options: ${sdkOptionOrgId})`,
@@ -146,15 +146,15 @@ export function shouldContinueTrace(client: Client | undefined, baggageOrgId?: s
     return false;
   }
 
-  const strictTraceContinuation = client?.getOptions()?.strictTraceContinuation || false; // default for `strictTraceContinuation` is `false`
+  const strictTraceContinuation = client.getOptions()?.strictTraceContinuation || false; // default for `strictTraceContinuation` is `false`
 
   if (strictTraceContinuation) {
     // With strict continuation enabled, start new trace if:
-    // - Baggage has orgID, but SDK doesn't have one
-    // - SDK has orgID, but baggage doesn't have one
+    // - Baggage has orgID, but Client doesn't have one
+    // - Client has orgID, but baggage doesn't have one
     if ((baggageOrgId && !sdkOptionOrgId) || (!baggageOrgId && sdkOptionOrgId)) {
       debug.log(
-        `Starting a new trace because strict trace continuation is enabled and one org ID is missing (incoming baggage: ${baggageOrgId}, SDK options: ${sdkOptionOrgId})`,
+        `Starting a new trace because strict trace continuation is enabled but one org ID is missing (incoming baggage: ${baggageOrgId}, SDK options: ${sdkOptionOrgId})`,
       );
       return false;
     }
diff --git a/packages/core/test/lib/utils/tracing.test.ts b/packages/core/test/lib/utils/tracing.test.ts
index a34e8356264b..ea41190f3bb3 100644
--- a/packages/core/test/lib/utils/tracing.test.ts
+++ b/packages/core/test/lib/utils/tracing.test.ts
@@ -176,14 +176,4 @@ describe('shouldContinueTrace', () => {
     const result = shouldContinueTrace(client, '123456');
     expect(result).toBe(false);
   });
-
-  test('returns true when client is undefined', () => {
-    const result = shouldContinueTrace(undefined, '123456');
-    expect(result).toBe(true);
-  });
-
-  test('returns true when both org IDs and client are undefined', () => {
-    const result = shouldContinueTrace(undefined, undefined);
-    expect(result).toBe(true);
-  });
 });

From 78023e3a44f30485ffed971dd4b4b37f75fac22f Mon Sep 17 00:00:00 2001
From: s1gr1d <sigrid.huemer@posteo.at>
Date: Fri, 25 Jul 2025 10:22:29 +0200
Subject: [PATCH 11/14] extract client

---
 packages/core/src/tracing/trace.ts | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/packages/core/src/tracing/trace.ts b/packages/core/src/tracing/trace.ts
index 03bf228ff6b9..98c3a33a8a79 100644
--- a/packages/core/src/tracing/trace.ts
+++ b/packages/core/src/tracing/trace.ts
@@ -217,9 +217,9 @@ export const continueTrace = <V>(
 
   const { sentryTrace, baggage } = options;
 
+  const client = getClient();
   const incomingDsc = baggageHeaderToDynamicSamplingContext(baggage);
-
-  if (!shouldContinueTrace(getClient(), incomingDsc?.org_id)) {
+  if (client && !shouldContinueTrace(client, incomingDsc?.org_id)) {
     return startNewTrace(callback);
   }
 

From e70507eb13a33b11901ba6f3caf4d25e9ad0d81d Mon Sep 17 00:00:00 2001
From: s1gr1d <sigrid.huemer@posteo.at>
Date: Fri, 25 Jul 2025 10:31:44 +0200
Subject: [PATCH 12/14] client check

---
 packages/opentelemetry/src/propagator.ts | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/packages/opentelemetry/src/propagator.ts b/packages/opentelemetry/src/propagator.ts
index 7bf1969977c1..7dc005521aa7 100644
--- a/packages/opentelemetry/src/propagator.ts
+++ b/packages/opentelemetry/src/propagator.ts
@@ -213,11 +213,13 @@ function getContextWithRemoteActiveSpan(
   const propagationContext = propagationContextFromHeaders(sentryTrace, baggage);
 
   const { traceId, parentSpanId, sampled, dsc } = propagationContext;
+
+  const client = getClient();
   const incomingDsc = baggageHeaderToDynamicSamplingContext(baggage);
 
   // We only want to set the virtual span if we are continuing a concrete trace
   // Otherwise, we ignore the incoming trace here, e.g. if we have no trace headers
-  if (!parentSpanId || !shouldContinueTrace(getClient(), incomingDsc?.org_id)) {
+  if (!parentSpanId || (client && !shouldContinueTrace(client, incomingDsc?.org_id))) {
     return ctx;
   }
 

From 3b51968db8597994e52883970e5fc655b43de761 Mon Sep 17 00:00:00 2001
From: s1gr1d <sigrid.huemer@posteo.at>
Date: Fri, 25 Jul 2025 10:59:42 +0200
Subject: [PATCH 13/14] reword and rename stuff to clarify it

---
 packages/core/src/types-hoist/options.ts | 15 ++++++++-------
 packages/core/src/utils/tracing.ts       | 12 ++++++------
 2 files changed, 14 insertions(+), 13 deletions(-)

diff --git a/packages/core/src/types-hoist/options.ts b/packages/core/src/types-hoist/options.ts
index a70735e95d5c..ce0851f940a5 100644
--- a/packages/core/src/types-hoist/options.ts
+++ b/packages/core/src/types-hoist/options.ts
@@ -302,22 +302,23 @@ export interface ClientOptions<TO extends BaseTransportOptions = BaseTransportOp
   tracePropagationTargets?: TracePropagationTargets;
 
   /**
-   * Controls whether trace continuation should be strict about matching organization IDs.
+   * If set to `true`, the SDK will only continue a trace if the `organization ID` of the incoming trace found in the
+   * `baggage` header matches the `organization ID` of the current Sentry client.
    *
-   * When set to `true`, the SDK will only continue a trace if the organization ID in the incoming baggage
-   * matches the organization ID of the current SDK (extracted from the DSN).
+   * The client's organization ID is extracted from the DSN or can be set with the `orgId` option.
    *
-   * If there is no match, the SDK will start a new trace instead of continuing the incoming one.
+   * If the organization IDs do not match, the SDK will start a new trace instead of continuing the incoming one.
+   * This is useful to prevent traces of unknown third-party services from being continued in your application.
    *
    * @default false
    */
   strictTraceContinuation?: boolean;
 
   /**
-   * The organization ID of the current SDK. The organization ID is a string containing only numbers. This ID is used to
-   * propagate traces to other Sentry services.
+   * The organization ID for your Sentry project.
    *
-   * The SDK tries to automatically extract the organization ID from the DSN. With this option, you can override it.
+   * The SDK will try to extract the organization ID from the DSN. If it cannot be found, or if you need to override it,
+   * you can provide the ID with this option. The organization ID is used for trace propagation and for features like `strictTraceContinuation`.
    */
   orgId?: `${number}` | number;
 
diff --git a/packages/core/src/utils/tracing.ts b/packages/core/src/utils/tracing.ts
index ca7b4c35e0ce..c87c5aeeabf5 100644
--- a/packages/core/src/utils/tracing.ts
+++ b/packages/core/src/utils/tracing.ts
@@ -136,12 +136,12 @@ function getSampleRandFromTraceparentAndDsc(
  * See https://develop.sentry.dev/sdk/telemetry/traces/#stricttracecontinuation
  */
 export function shouldContinueTrace(client: Client, baggageOrgId?: string): boolean {
-  const sdkOptionOrgId = deriveOrgIdFromClient(client);
+  const clientOrgId = deriveOrgIdFromClient(client);
 
   // Case: baggage orgID and Client orgID don't match - always start new trace
-  if (baggageOrgId && sdkOptionOrgId && baggageOrgId !== sdkOptionOrgId) {
+  if (baggageOrgId && clientOrgId && baggageOrgId !== clientOrgId) {
     debug.log(
-      `Starting a new trace because org IDs don't match (incoming baggage: ${baggageOrgId}, SDK options: ${sdkOptionOrgId})`,
+      `Won't continue trace because org IDs don't match (incoming baggage: ${baggageOrgId}, SDK options: ${clientOrgId})`,
     );
     return false;
   }
@@ -149,12 +149,12 @@ export function shouldContinueTrace(client: Client, baggageOrgId?: string): bool
   const strictTraceContinuation = client.getOptions()?.strictTraceContinuation || false; // default for `strictTraceContinuation` is `false`
 
   if (strictTraceContinuation) {
-    // With strict continuation enabled, start new trace if:
+    // With strict continuation enabled, don't continue trace if:
     // - Baggage has orgID, but Client doesn't have one
     // - Client has orgID, but baggage doesn't have one
-    if ((baggageOrgId && !sdkOptionOrgId) || (!baggageOrgId && sdkOptionOrgId)) {
+    if ((baggageOrgId && !clientOrgId) || (!baggageOrgId && clientOrgId)) {
       debug.log(
-        `Starting a new trace because strict trace continuation is enabled but one org ID is missing (incoming baggage: ${baggageOrgId}, SDK options: ${sdkOptionOrgId})`,
+        `Starting a new trace because strict trace continuation is enabled but one org ID is missing (incoming baggage: ${baggageOrgId}, Sentry client: ${clientOrgId})`,
       );
       return false;
     }

From 19c5afc8c90af535aa9b0260e805fa258d095cfd Mon Sep 17 00:00:00 2001
From: s1gr1d <sigrid.huemer@posteo.at>
Date: Fri, 25 Jul 2025 11:35:03 +0200
Subject: [PATCH 14/14] rename function, delete optional chaining

---
 packages/core/src/tracing/dynamicSamplingContext.ts |  4 ++--
 packages/core/src/utils/dsn.ts                      |  4 ++--
 packages/core/src/utils/tracing.ts                  |  6 +++---
 packages/core/test/lib/utils/dsn.test.ts            | 12 ++++++------
 4 files changed, 13 insertions(+), 13 deletions(-)

diff --git a/packages/core/src/tracing/dynamicSamplingContext.ts b/packages/core/src/tracing/dynamicSamplingContext.ts
index 31f0ad638112..47d5657a7d87 100644
--- a/packages/core/src/tracing/dynamicSamplingContext.ts
+++ b/packages/core/src/tracing/dynamicSamplingContext.ts
@@ -10,7 +10,7 @@ import {
 import type { DynamicSamplingContext } from '../types-hoist/envelope';
 import type { Span } from '../types-hoist/span';
 import { baggageHeaderToDynamicSamplingContext, dynamicSamplingContextToSentryBaggageHeader } from '../utils/baggage';
-import { deriveOrgIdFromClient } from '../utils/dsn';
+import { extractOrgIdFromClient } from '../utils/dsn';
 import { hasSpansEnabled } from '../utils/hasSpansEnabled';
 import { addNonEnumerableProperty } from '../utils/object';
 import { getRootSpan, spanIsSampled, spanToJSON } from '../utils/spanUtils';
@@ -51,7 +51,7 @@ export function getDynamicSamplingContextFromClient(trace_id: string, client: Cl
     release: options.release,
     public_key,
     trace_id,
-    org_id: deriveOrgIdFromClient(client),
+    org_id: extractOrgIdFromClient(client),
   };
 
   client.emit('createDsc', dsc);
diff --git a/packages/core/src/utils/dsn.ts b/packages/core/src/utils/dsn.ts
index 2c50a9338b38..492f2398c390 100644
--- a/packages/core/src/utils/dsn.ts
+++ b/packages/core/src/utils/dsn.ts
@@ -135,14 +135,14 @@ export function extractOrgIdFromDsnHost(host: string): string | undefined {
  *
  *  The organization ID is extracted from the DSN. If the client options include a `orgId`, this will always take precedence.
  */
-export function deriveOrgIdFromClient(client: Client): string | undefined {
+export function extractOrgIdFromClient(client: Client): string | undefined {
   const options = client.getOptions();
 
   const { host } = client.getDsn() || {};
 
   let org_id: string | undefined;
 
-  if (options?.orgId) {
+  if (options.orgId) {
     org_id = String(options.orgId);
   } else if (host) {
     org_id = extractOrgIdFromDsnHost(host);
diff --git a/packages/core/src/utils/tracing.ts b/packages/core/src/utils/tracing.ts
index c87c5aeeabf5..509fff5acde0 100644
--- a/packages/core/src/utils/tracing.ts
+++ b/packages/core/src/utils/tracing.ts
@@ -4,7 +4,7 @@ import type { PropagationContext } from '../types-hoist/tracing';
 import type { TraceparentData } from '../types-hoist/transaction';
 import { debug } from '../utils/debug-logger';
 import { baggageHeaderToDynamicSamplingContext } from './baggage';
-import { deriveOrgIdFromClient } from './dsn';
+import { extractOrgIdFromClient } from './dsn';
 import { parseSampleRate } from './parseSampleRate';
 import { generateSpanId, generateTraceId } from './propagationContext';
 
@@ -136,7 +136,7 @@ function getSampleRandFromTraceparentAndDsc(
  * See https://develop.sentry.dev/sdk/telemetry/traces/#stricttracecontinuation
  */
 export function shouldContinueTrace(client: Client, baggageOrgId?: string): boolean {
-  const clientOrgId = deriveOrgIdFromClient(client);
+  const clientOrgId = extractOrgIdFromClient(client);
 
   // Case: baggage orgID and Client orgID don't match - always start new trace
   if (baggageOrgId && clientOrgId && baggageOrgId !== clientOrgId) {
@@ -146,7 +146,7 @@ export function shouldContinueTrace(client: Client, baggageOrgId?: string): bool
     return false;
   }
 
-  const strictTraceContinuation = client.getOptions()?.strictTraceContinuation || false; // default for `strictTraceContinuation` is `false`
+  const strictTraceContinuation = client.getOptions().strictTraceContinuation || false; // default for `strictTraceContinuation` is `false`
 
   if (strictTraceContinuation) {
     // With strict continuation enabled, don't continue trace if:
diff --git a/packages/core/test/lib/utils/dsn.test.ts b/packages/core/test/lib/utils/dsn.test.ts
index 2c6a02b2cc05..0555ae583c02 100644
--- a/packages/core/test/lib/utils/dsn.test.ts
+++ b/packages/core/test/lib/utils/dsn.test.ts
@@ -1,7 +1,7 @@
 import { beforeEach, describe, expect, it, test, vi } from 'vitest';
 import { DEBUG_BUILD } from '../../../src/debug-build';
 import { debug } from '../../../src/utils/debug-logger';
-import { deriveOrgIdFromClient, dsnToString, extractOrgIdFromDsnHost, makeDsn } from '../../../src/utils/dsn';
+import { dsnToString, extractOrgIdFromClient, extractOrgIdFromDsnHost, makeDsn } from '../../../src/utils/dsn';
 import { getDefaultTestClientOptions, TestClient } from '../../mocks/client';
 
 function testIf(condition: boolean) {
@@ -249,7 +249,7 @@ describe('extractOrgIdFromDsnHost', () => {
   });
 });
 
-describe('deriveOrgIdFromClient', () => {
+describe('extractOrgIdFromClient', () => {
   let client: TestClient;
 
   beforeEach(() => {
@@ -264,7 +264,7 @@ describe('deriveOrgIdFromClient', () => {
       }),
     );
 
-    const result = deriveOrgIdFromClient(client);
+    const result = extractOrgIdFromClient(client);
     expect(result).toBe('00222111');
   });
 
@@ -276,7 +276,7 @@ describe('deriveOrgIdFromClient', () => {
       }),
     );
 
-    const result = deriveOrgIdFromClient(client);
+    const result = extractOrgIdFromClient(client);
     expect(result).toBe('12345');
   });
 
@@ -287,14 +287,14 @@ describe('deriveOrgIdFromClient', () => {
       }),
     );
 
-    const result = deriveOrgIdFromClient(client);
+    const result = extractOrgIdFromClient(client);
     expect(result).toBe('012300');
   });
 
   test('returns undefined when neither options.orgId nor DSN host are available', () => {
     client = new TestClient(getDefaultTestClientOptions({}));
 
-    const result = deriveOrgIdFromClient(client);
+    const result = extractOrgIdFromClient(client);
     expect(result).toBeUndefined();
   });
 });