Merge branch 'develop' into timfish/test/cloudflare-integration-tests

Author: timfish

packages/cloudflare/src/request.ts

@@ -18,6 +18,17 @@ interface RequestHandlerWrapperOptions {
   options: CloudflareOptions;
   request: Request<unknown, IncomingRequestCfProperties<unknown>>;
   context: ExecutionContext;
+  /**
+   * If true, errors will be captured, rethrown and sent to Sentry.
+   * Otherwise, errors are rethrown but not captured.
+   *
+   * You most likely don't want to set this to `false`, if you use `wrapRequestHandler` directly.
+   * This is primarily meant as an escape hatch for higher-level SDKs relying on additional error
+   * capturing mechanisms where this wrapper captures errors too early or too generally.
+   *
+   * @default true
+   */
+  captureErrors?: boolean;
 }
 
 /**
@@ -28,7 +39,7 @@ export function wrapRequestHandler(
   handler: (...args: unknown[]) => Response | Promise<Response>,
 ): Promise<Response> {
   return withIsolationScope(async isolationScope => {
-    const { options, request } = wrapperOptions;
+    const { options, request, captureErrors = true } = wrapperOptions;
 
     // In certain situations, the passed context can become undefined.
     // For example, for Astro while prerendering pages at build time.
@@ -67,7 +78,9 @@ export function wrapRequestHandler(
       try {
         return await handler();
       } catch (e) {
-        captureException(e, { mechanism: { handled: false, type: 'cloudflare' } });
+        if (captureErrors) {
+          captureException(e, { mechanism: { handled: false, type: 'cloudflare' } });
+        }
         throw e;
       } finally {
         waitUntil?.(flush(2000));
@@ -91,7 +104,9 @@ export function wrapRequestHandler(
               setHttpStatus(span, res.status);
               return res;
             } catch (e) {
-              captureException(e, { mechanism: { handled: false, type: 'cloudflare' } });
+              if (captureErrors) {
+                captureException(e, { mechanism: { handled: false, type: 'cloudflare' } });
+              }
               throw e;
             } finally {
               waitUntil?.(flush(2000));

packages/cloudflare/test/request.test.ts

@@ -212,6 +212,33 @@ describe('withSentry', () => {
 
       expect(thrownError).toBe(error);
     });
+
+    test("doesn't capture errors if `captureErrors` is false", async () => {
+      const captureExceptionSpy = vi.spyOn(SentryCore, 'captureException');
+      const error = new Error('test');
+
+      expect(captureExceptionSpy).not.toHaveBeenCalled();
+      let thrownError: Error | undefined;
+
+      try {
+        await wrapRequestHandler(
+          {
+            options: MOCK_OPTIONS,
+            request: new Request('https://example.com'),
+            context: createMockExecutionContext(),
+            captureErrors: false,
+          },
+          () => {
+            throw error;
+          },
+        );
+      } catch (e: any) {
+        thrownError = e;
+      }
+
+      expect(captureExceptionSpy).not.toHaveBeenCalled();
+      expect(thrownError).toBe(error);
+    });
   });
 
   describe('tracing instrumentation', () => {

packages/react-router/README.md

@@ -4,16 +4,14 @@
   </a>
 </p>
 
-# Official Sentry SDK for React Router Framework (EXPERIMENTAL)
+# Official Sentry SDK for React Router Framework (BETA)
 
 [![npm version](https://img.shields.io/npm/v/@sentry/react-router.svg)](https://www.npmjs.com/package/@sentry/react-router)
 [![npm dm](https://img.shields.io/npm/dm/@sentry/react-router.svg)](https://www.npmjs.com/package/@sentry/react-router)
 [![npm dt](https://img.shields.io/npm/dt/@sentry/react-router.svg)](https://www.npmjs.com/package/@sentry/react-router)
 
-> [!WARNING]
-> This SDK is considered ⚠️ **experimental and in an alpha state**. It may experience breaking changes. Please reach out
-> on [GitHub](https://github.com/getsentry/sentry-javascript/issues/) if you have any feedback or concerns. This
-> SDK is for [React Router (framework)](https://reactrouter.com/start/framework/installation). If you're using [React Router (library)](https://reactrouter.com/start/library/installation) see our
+> This SDK is currently in beta. Beta features are still in progress and may have bugs. Please reach out on [GitHub](https://github.com/getsentry/sentry-javascript/issues/) if you have any feedback or concerns.
+> This SDK is for [React Router (framework)](https://reactrouter.com/start/framework/installation). If you're using [React Router (library)](https://reactrouter.com/start/library/installation) see our
 > [React SDK here](https://docs.sentry.io/platforms/javascript/guides/react/features/react-router/v7/).
 
 ## Links

packages/sveltekit/src/worker/cloudflare.ts

@@ -37,6 +37,9 @@ export function initCloudflareSentryHandle(options: CloudflareOptions): Handle {
           request: event.request as Request<unknown, IncomingRequestCfProperties<unknown>>,
           // @ts-expect-error This will exist in Cloudflare
           context: event.platform.context,
+          // We don't want to capture errors here, as we want to capture them in the `sentryHandle` handler
+          // where we can distinguish between redirects and actual errors.
+          captureErrors: false,
         },
         () => resolve(event),
       );

packages/sveltekit/test/worker/cloudflare.test.ts

@@ -45,7 +45,7 @@ describe('initCloudflareSentryHandle', () => {
 
     expect(SentryCloudflare.wrapRequestHandler).toHaveBeenCalledTimes(1);
     expect(SentryCloudflare.wrapRequestHandler).toHaveBeenCalledWith(
-      { options: expect.objectContaining({ dsn: options.dsn }), request, context },
+      { options: expect.objectContaining({ dsn: options.dsn }), request, context, captureErrors: false },
       expect.any(Function),
     );