Skip to content

fix(astro): waitUntil flush at end of request #14062

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 5 commits into from
Oct 31, 2024
Merged

fix(astro): waitUntil flush at end of request #14062

Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
ab208ca
add flush function
s1gr1d Oct 24, 2024
005a1c1
inline flush
s1gr1d Oct 24, 2024
d5c85cf
delete debug build
s1gr1d Oct 31, 2024
bbd6743
Merge branch 'develop' into sig/astro-waitUntil
s1gr1d Oct 31, 2024
53638f7
Merge branch 'develop' into sig/astro-waitUntil
s1gr1d Oct 31, 2024
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
14 changes: 14 additions & 0 deletions packages/astro/src/server/middleware.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,7 @@ import {
SEMANTIC_ATTRIBUTE_SENTRY_SOURCE,
captureException,
continueTrace,
flush,
getActiveSpan,
getClient,
getCurrentScope,
Expand All @@ -14,8 +15,10 @@ import {
import type { Scope, SpanAttributes } from '@sentry/types';
import {
addNonEnumerableProperty,
logger,
objectify,
stripUrlQueryAndFragment,
vercelWaitUntil,
winterCGRequestToRequestData,
} from '@sentry/utils';
import type { APIContext, MiddlewareResponseHandler } from 'astro';
Expand Down Expand Up @@ -188,6 +191,17 @@ async function instrumentRequest(
} catch (e) {
sendErrorToSentry(e);
throw e;
} finally {
vercelWaitUntil(
(async () => {
// Flushes pending Sentry events with a 2-second timeout and in a way that cannot create unhandled promise rejections.
try {
await flush(2000);
} catch (e) {
logger.log('Error while flushing events:\n', e);
}
})(),
);
}
// TODO: flush if serverless (first extract function)
},
Expand Down
Loading