Skip to content

ref(sveltekit): Extract propagation context #8428

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 1 commit into from
Jun 30, 2023
Merged

ref(sveltekit): Extract propagation context #8428

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 2 additions & 1 deletion packages/sveltekit/src/server/handle.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -112,7 +112,8 @@ function instrumentHandle({ event, resolve }: Parameters<Handle>[0], options: Se
return resolve(event);
}

const { traceparentData, dynamicSamplingContext } = getTracePropagationData(event);
const { dynamicSamplingContext, traceparentData, propagationContext } = getTracePropagationData(event);
getCurrentHub().getScope().setPropagationContext(propagationContext);

return trace(
{
Expand Down
5 changes: 3 additions & 2 deletions packages/sveltekit/src/server/load.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
/* eslint-disable @sentry-internal/sdk/no-optional-chaining */
import { trace } from '@sentry/core';
import { getCurrentHub, trace } from '@sentry/core';
import { captureException } from '@sentry/node';
import type { TransactionContext } from '@sentry/types';
import { addExceptionMechanism, addNonEnumerableProperty, objectify } from '@sentry/utils';
Expand Down Expand Up @@ -121,7 +121,8 @@ export function wrapServerLoadWithSentry<T extends (...args: any) => any>(origSe

const routeId = event.route && event.route.id;

const { dynamicSamplingContext, traceparentData } = getTracePropagationData(event);
const { dynamicSamplingContext, traceparentData, propagationContext } = getTracePropagationData(event);
getCurrentHub().getScope().setPropagationContext(propagationContext);

const traceLoadContext: TransactionContext = {
op: 'function.sveltekit.server.load',
Expand Down
25 changes: 7 additions & 18 deletions packages/sveltekit/src/server/utils.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,12 +1,5 @@
import type { DynamicSamplingContext, StackFrame, TraceparentData } from '@sentry/types';
import {
baggageHeaderToDynamicSamplingContext,
basename,
escapeStringForRegex,
extractTraceparentData,
GLOBAL_OBJ,
join,
} from '@sentry/utils';
import type { StackFrame } from '@sentry/types';
import { basename, escapeStringForRegex, GLOBAL_OBJ, join, tracingContextFromHeaders } from '@sentry/utils';
import type { RequestEvent } from '@sveltejs/kit';

import { WRAPPED_MODULE_SUFFIX } from '../vite/autoInstrument';
Expand All @@ -15,17 +8,13 @@ import type { GlobalWithSentryValues } from '../vite/injectGlobalValues';
/**
* Takes a request event and extracts traceparent and DSC data
* from the `sentry-trace` and `baggage` DSC headers.
*
* Sets propagation context as a side effect.
*/
export function getTracePropagationData(event: RequestEvent): {
traceparentData?: TraceparentData;
dynamicSamplingContext?: Partial<DynamicSamplingContext>;
} {
const sentryTraceHeader = event.request.headers.get('sentry-trace');
export function getTracePropagationData(event: RequestEvent): ReturnType<typeof tracingContextFromHeaders> {
const sentryTraceHeader = event.request.headers.get('sentry-trace') || '';
const baggageHeader = event.request.headers.get('baggage');
const traceparentData = sentryTraceHeader ? extractTraceparentData(sentryTraceHeader) : undefined;
const dynamicSamplingContext = baggageHeaderToDynamicSamplingContext(baggageHeader);

return { traceparentData, dynamicSamplingContext };
return tracingContextFromHeaders(sentryTraceHeader, baggageHeader);
}

/**
Expand Down