Skip to content

feat(astro): Add transactionName to isolation scope for requests #11786

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.

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 26, 2024
Merged
Changes from all commits
Commits
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
7 changes: 5 additions & 2 deletions packages/astro/src/server/middleware.ts
Original file line number Diff line number Diff line change
Expand Up @@ -66,8 +66,8 @@ export const handleRequest: (options?: MiddlewareOptions) => MiddlewareResponseH
if (getActiveSpan()) {
return instrumentRequest(ctx, next, handlerOptions);
}
return withIsolationScope(() => {
return instrumentRequest(ctx, next, handlerOptions);
return withIsolationScope(isolationScope => {
return instrumentRequest(ctx, next, handlerOptions, isolationScope);
});
};
};
Expand All @@ -76,6 +76,7 @@ async function instrumentRequest(
ctx: Parameters<MiddlewareResponseHandler>[0],
next: Parameters<MiddlewareResponseHandler>[1],
options: MiddlewareOptions,
isolationScope?: Scope,
): Promise<Response> {
// Make sure we don't accidentally double wrap (e.g. user added middleware and integration auto added it)
const locals = ctx.locals as AstroLocalsWithSentry;
Expand Down Expand Up @@ -121,6 +122,8 @@ async function instrumentRequest(
attributes['http.fragment'] = ctx.url.hash;
}

isolationScope?.setTransactionName(`${method} ${interpolatedRoute || ctx.url.pathname}`);

const res = await startSpan(
{
attributes,
Expand Down