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

fix(cloudflare): Guard context.waitUntil call in request handler #13549

Merged
merged 2 commits into from
Sep 4, 2024
Merged

fix(cloudflare): Guard context.waitUntil call in request handler #13549

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
e276461
fix(cloudflare): Guard `context.waitUntil` call in request handler
Lms24 Sep 2, 2024
c4143d1
adjust internal typing
Lms24 Sep 2, 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
10 changes: 8 additions & 2 deletions packages/cloudflare/src/request.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -31,7 +31,13 @@ export function wrapRequestHandler(
handler: (...args: unknown[]) => Response | Promise<Response>,
): Promise<Response> {
return withIsolationScope(async isolationScope => {
const { options, request, context } = wrapperOptions;
const { options, request } = wrapperOptions;

// In certain situations, the passed context can become undefined.
// For example, for Astro while prerendering pages at build time.
// see: https://github.com/getsentry/sentry-javascript/issues/13217
const context = wrapperOptions.context as ExecutionContext | undefined;

const client = init(options);
isolationScope.setClient(client);

Expand Down Expand Up @@ -89,7 +95,7 @@ export function wrapRequestHandler(
captureException(e, { mechanism: { handled: false, type: 'cloudflare' } });
throw e;
} finally {
context.waitUntil(flush(2000));
context?.waitUntil(flush(2000));
}
},
);
Expand Down
9 changes: 9 additions & 0 deletions packages/cloudflare/test/request.test.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -45,6 +45,15 @@ describe('withSentry', () => {
expect(context.waitUntil).toHaveBeenLastCalledWith(expect.any(Promise));
});

test("doesn't error if context is undefined", () => {
expect(() =>
wrapRequestHandler(
{ options: MOCK_OPTIONS, request: new Request('https://example.com'), context: undefined as any },
() => new Response('test'),
),
).not.toThrow();
});

test('creates a cloudflare client and sets it on the handler', async () => {
const initAndBindSpy = vi.spyOn(SentryCore, 'initAndBind');
await wrapRequestHandler(
Expand Down
Loading