feat(core): Implement `strictTraceContinuation` #16313

s1gr1d · 2025-05-16T09:31:56Z

This implements strictTraceContinuation based on those docs: https://develop.sentry.dev/sdk/telemetry/traces/#stricttracecontinuation

closes #16291

github-actions · 2025-05-16T09:38:17Z

size-limit report 📦

Path	Size	% Change	Change
@sentry/browser	23.76 kB	+0.06%	+14 B 🔺
@sentry/browser - with treeshaking flags	22.35 kB	+0.09%	+18 B 🔺
@sentry/browser (incl. Tracing)	39.41 kB	+0.06%	+21 B 🔺
@sentry/browser (incl. Tracing, Replay)	77.52 kB	-0.01%	-2 B 🔽
@sentry/browser (incl. Tracing, Replay) - with treeshaking flags	67.39 kB	+0.04%	+22 B 🔺
@sentry/browser (incl. Tracing, Replay with Canvas)	82.23 kB	+0.01%	+5 B 🔺
@sentry/browser (incl. Tracing, Replay, Feedback)	94.35 kB	+0.02%	+13 B 🔺
@sentry/browser (incl. Feedback)	40.45 kB	+0.03%	+9 B 🔺
@sentry/browser (incl. sendFeedback)	28.44 kB	+0.1%	+26 B 🔺
@sentry/browser (incl. FeedbackAsync)	33.34 kB	+0.04%	+11 B 🔺
@sentry/react	25.5 kB	+0.02%	+5 B 🔺
@sentry/react (incl. Tracing)	41.38 kB	-0.01%	-3 B 🔽
@sentry/vue	28.2 kB	+0.08%	+21 B 🔺
@sentry/vue (incl. Tracing)	41.21 kB	+0.02%	+6 B 🔺
@sentry/svelte	23.79 kB	+0.08%	+19 B 🔺
CDN Bundle	25.28 kB	+0.45%	+113 B 🔺
CDN Bundle (incl. Tracing)	39.28 kB	+0.22%	+83 B 🔺
CDN Bundle (incl. Tracing, Replay)	75.39 kB	+0.27%	+197 B 🔺
CDN Bundle (incl. Tracing, Replay, Feedback)	80.82 kB	+0.24%	+189 B 🔺
CDN Bundle - uncompressed	73.86 kB	+0.6%	+438 B 🔺
CDN Bundle (incl. Tracing) - uncompressed	116.29 kB	+0.19%	+211 B 🔺
CDN Bundle (incl. Tracing, Replay) - uncompressed	230.53 kB	+0.21%	+470 B 🔺
CDN Bundle (incl. Tracing, Replay, Feedback) - uncompressed	243.35 kB	+0.2%	+470 B 🔺
@sentry/nextjs (client)	43.44 kB	+0.06%	+23 B 🔺
@sentry/sveltekit (client)	39.84 kB	+0.05%	+17 B 🔺
@sentry/node-core	47.48 kB	+0.35%	+165 B 🔺
@sentry/node	144.12 kB	+0.13%	+180 B 🔺
@sentry/node - without tracing	91.58 kB	+0.2%	+176 B 🔺
@sentry/aws-serverless	103.03 kB	+0.19%	+188 B 🔺

View base workflow run

mydea · 2025-05-16T09:40:48Z

packages/core/src/tracing/trace.ts

+  const incomingDsc = baggageHeaderToDynamicSamplingContext(baggage);
+  const baggageOrgId = incomingDsc?.org_id;
+
+  let sdkOrgId: string | undefined;


m: I think we should use the same logic here as for injecting the org id, which is use the specified one if defined, else extract it from dsn? We may also put this into a reusable utility, I suppose!

mydea · 2025-05-16T09:42:20Z

packages/core/src/tracing/trace.ts

+    sdkOrgId = extractOrgIdFromDsnHost(dsn.host);
+  }
+
+  const shouldStartNewTrace = (): boolean => {


l: Let's maybe make this a separate function that takes arguments instead of inlining this function? No strong feelings, but this is how we usually do this I suppose 🤔

yeah no strong opinions about this. Just thought it's not a lot of logic and when inlining this it does not disrupt you from the code-reading flow but it still keeps this part of the code separated :D

# Conflicts: # packages/core/src/index.ts # packages/core/src/tracing/dynamicSamplingContext.ts # packages/core/src/tracing/trace.ts # packages/core/src/utils/dsn.ts # packages/core/src/utils/tracing.ts # packages/core/test/lib/utils/tracing.test.ts

mydea · 2025-07-24T14:58:35Z

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 { extractOrgIdFromDsnHost } from '../utils/dsn';
+import { deriveOrgIdFromClient } from '../utils/dsn';


l: why did we change this? IMHO derive is not easier to understand/grasp as extract...? 😅

with change, I mean re-word :D I would just go with extractOrgIdFromClient or something like this?

It's a different function :D
I extracted the logic of getting the org ID.

extractOrgIdFromDsnHost is still available: https://github.com/getsentry/sentry-javascript/pull/16313/files#diff-b6e0f71bb87e888ddb45cd78dcf2cb7efdf9c80b6d596c0224648b1f78bdcb29R148

The one function is doing extractOrIdFromDsnHost, which is really just looking at the host string and extracting it from there. And deriveOrgIdFromClient is looking at different cues (either the org ID or the host on the client) to get the org ID.

yeah, right, that makes sense of course - what I mean is that I think derive is a non-ideal term/prefix for the function name :D we do not use it anywhere in the code, rather we always use e.g. extractXX or getXX or something like this, so I'd rather use something along these lines for consistency - it is a different method of course :)

ah got you, that makes sense of course 👍

mydea · 2025-07-24T15:01:06Z

packages/core/src/utils/dsn.ts

+ *  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();


l: I would re-organize this a bit and either:

Enforce that client is not undefined - imho this is likely the nicer API, and then check at call-site if the client is undefined.

Or else check at the top of the function if client is defined and return undefined early, avoiding repeated optional chaining below.

re 1: it is a bit weird to have an API deriveXXFromY and allow no Y to be passed in :D

mydea · 2025-07-24T15:02:25Z

packages/core/src/utils/tracing.ts

+ * 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 {


Also here, do we need to allow empty client? IMHO we never want to continue a trace if we have no client, so we can probably just check this at call site as well?

packages/core/src/utils/tracing.ts

packages/opentelemetry/src/propagator.ts

mydea · 2025-07-25T09:29:32Z

packages/core/src/utils/dsn.ts

+
+  let org_id: string | undefined;
+
+  if (options?.orgId) {


Suggested change

if (options?.orgId) {

if (options.orgId) {

I think this always exists now?

mydea · 2025-07-25T09:30:08Z

packages/core/src/utils/tracing.ts

+    return false;
+  }
+
+  const strictTraceContinuation = client.getOptions()?.strictTraceContinuation || false; // default for `strictTraceContinuation` is `false`


Suggested change

const strictTraceContinuation = client.getOptions()?.strictTraceContinuation || false; // default for `strictTraceContinuation` is `false`

const strictTraceContinuation = client.getOptions().strictTraceContinuation || false; // default for `strictTraceContinuation` is `false`

mydea

small nits but overall looks great! 👍

## DESCRIBE YOUR PR Docs for `strictTraceContinuation` and `orgId` ([related PR](getsentry/sentry-javascript#16313)). I'm not 100% sure where I should put the `orgId` as it does not 100% fit into the "Tracing Options" section but it's currently only used for tracing. closes getsentry/sentry-javascript#16308 ## IS YOUR CHANGE URGENT? Help us prioritize incoming PRs by letting us know when the change needs to go live. - [ ] Urgent deadline (GA date, etc.):  - [ ] Other deadline:  - [ ] None: Not urgent, can wait up to 1 week+ ## SLA - Teamwork makes the dream work, so please add a reviewer to your PRs. - Please give the docs team up to 1 week to review your PR unless you've added an urgent due date to it. Thanks in advance for your help! ## PRE-MERGE CHECKLIST *Make sure you've checked the following before merging your changes:* - [ ] Checked Vercel preview for correctness, including links - [ ] PR was reviewed and approved by any necessary SMEs (subject matter experts) - [ ] PR was reviewed and approved by a member of the [Sentry docs team](https://github.com/orgs/getsentry/teams/docs)

feat(core): Implement strictTraceContinuation

33385ff

s1gr1d requested review from mydea and Lms24 May 16, 2025 09:32

mydea reviewed May 16, 2025

View reviewed changes

s1gr1d marked this pull request as draft May 16, 2025 09:47

s1gr1d added 9 commits May 16, 2025 14:24

create utility function for getting org id

e2dd6a6

add shouldContinueTrace util function

cd60e47

shuffle around util functions

484aedf

fix imports

452c353

delete wrong imports

08569aa

change wrong import

d4e5cc4

fix test

780720e

raise node size limit

20b67c6

s1gr1d marked this pull request as ready for review July 24, 2025 14:06

Merge branch 'develop' into sig/strictTraceContinuation

d8ec911

s1gr1d requested review from andreiborza and cleptric July 24, 2025 14:25

mydea reviewed Jul 24, 2025

View reviewed changes

always expect client, change some comments

8e43a3f

cursor bot reviewed Jul 25, 2025

View reviewed changes

packages/core/src/utils/tracing.ts Outdated Show resolved Hide resolved

s1gr1d requested a review from mydea July 25, 2025 08:14

extract client

78023e3

cursor bot reviewed Jul 25, 2025

View reviewed changes

packages/opentelemetry/src/propagator.ts Outdated Show resolved Hide resolved

s1gr1d added 2 commits July 25, 2025 10:31

client check

e70507e

reword and rename stuff to clarify it

3b51968

mydea reviewed Jul 25, 2025

View reviewed changes

mydea approved these changes Jul 25, 2025

View reviewed changes

s1gr1d mentioned this pull request Jul 25, 2025

docs(js): Add docs for strictTraceContinuation and orgId getsentry/sentry-docs#14459

Merged

6 tasks

rename function, delete optional chaining

19c5afc

s1gr1d merged commit b0909cd into develop Jul 25, 2025
171 checks passed

s1gr1d deleted the sig/strictTraceContinuation branch July 25, 2025 11:32

github-actions bot mentioned this pull request Jul 31, 2025

Implement strictTraceContinuation handling #16291

Closed

	const strictTraceContinuation = client.getOptions()?.strictTraceContinuation \|\| false; // default for `strictTraceContinuation` is `false`
	const strictTraceContinuation = client.getOptions().strictTraceContinuation \|\| false; // default for `strictTraceContinuation` is `false`

Uh oh!

feat(core): Implement strictTraceContinuation #16313

feat(core): Implement strictTraceContinuation #16313

Uh oh!

Conversation

s1gr1d commented May 16, 2025 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Uh oh!

github-actions bot commented May 16, 2025 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

size-limit report 📦

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

s1gr1d Jul 25, 2025 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Uh oh!

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

mydea left a comment

Choose a reason for hiding this comment

Uh oh!

Uh oh!

Uh oh!

feat(core): Implement `strictTraceContinuation` #16313

feat(core): Implement `strictTraceContinuation` #16313

s1gr1d commented May 16, 2025 •

edited

Loading

github-actions bot commented May 16, 2025 •

edited

Loading

s1gr1d Jul 25, 2025 •

edited

Loading