Skip to content

feat(sveltekit): Update scope transactionName when handling server-side request #11511

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
Apr 9, 2024
Merged

feat(sveltekit): Update scope transactionName when handling server-side request #11511

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: 1 addition & 2 deletions dev-packages/e2e-tests/test-applications/sveltekit-2/test/errors.server.test.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -60,7 +60,6 @@ test.describe('server-side errors', () => {
}),
);

// TODO: Uncomment once we update the scope transaction name on the server side
// expect(errorEvent.transaction).toEqual('GET /server-route-error');
expect(errorEvent.transaction).toEqual('GET /server-route-error');
});
});
3 changes: 1 addition & 2 deletions dev-packages/e2e-tests/test-applications/sveltekit/test/errors.server.test.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -63,7 +63,6 @@ test.describe('server-side errors', () => {
}),
);

// TODO: Uncomment once we update the scope transaction name on the server side
// expect(errorEvent.transaction).toEqual('GET /server-route-error');
expect(errorEvent.transaction).toEqual('GET /server-route-error');
});
});
15 changes: 13 additions & 2 deletions packages/sveltekit/src/server/handle.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,8 @@ import {
SEMANTIC_ATTRIBUTE_SENTRY_ORIGIN,
SEMANTIC_ATTRIBUTE_SENTRY_SOURCE,
getActiveSpan,
getDefaultIsolationScope,
getIsolationScope,
getRootSpan,
setHttpStatus,
spanToTraceHeader,
Expand All @@ -10,11 +12,12 @@ import {
import { startSpan } from '@sentry/core';
import { captureException, continueTrace } from '@sentry/node';
import type { Span } from '@sentry/types';
import { dynamicSamplingContextToSentryBaggageHeader, objectify } from '@sentry/utils';
import { dynamicSamplingContextToSentryBaggageHeader, logger, objectify } from '@sentry/utils';
import type { Handle, ResolveOptions } from '@sveltejs/kit';

import { getDynamicSamplingContextFromSpan } from '@sentry/opentelemetry';

import { DEBUG_BUILD } from '../common/debug-build';
import { isHttpError, isRedirect } from '../common/utils';
import { flushIfServerless, getTracePropagationData } from './utils';

Expand Down Expand Up @@ -183,6 +186,14 @@ async function instrumentHandle(
return resolve(event);
}

const routeName = `${event.request.method} ${event.route?.id || event.url.pathname}`;

if (getIsolationScope() !== getDefaultIsolationScope()) {
getIsolationScope().setTransactionName(routeName);
} else {
DEBUG_BUILD && logger.warn('Isolation scope is default isolation scope - skipping setting transactionName');
}

try {
const resolveResult = await startSpan(
{
Expand All @@ -192,7 +203,7 @@ async function instrumentHandle(
[SEMANTIC_ATTRIBUTE_SENTRY_SOURCE]: event.route?.id ? 'route' : 'url',
'http.method': event.request.method,
},
name: `${event.request.method} ${event.route?.id || event.url.pathname}`,
name: routeName,
},
async (span?: Span) => {
const res = await resolve(event, {
Expand Down