Skip to content
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