Merge branch 'develop' into abhi-fix-fastify-errors

Author: AbhiPrasad

.craft.yml

@@ -183,6 +183,8 @@ targets:
             format: base64
       'npm:@sentry/bun':
         onlyIfPresent: /^sentry-bun-\d.*\.tgz$/
+      'npm:@sentry/cloudflare':
+        onlyIfPresent: /^sentry-cloudflare-\d.*\.tgz$/
       'npm:@sentry/deno':
         onlyIfPresent: /^sentry-deno-\d.*\.tgz$/
       'npm:@sentry/ember':

CHANGELOG.md

@@ -9,6 +9,8 @@
 
 - "You miss 100 percent of the chances you don't take. — Wayne Gretzky" — Michael Scott
 
+Work in this release was contributed by @horochx. Thank you for your contribution!
+
 ## 8.22.0
 
 ### Important Changes

dev-packages/browser-integration-tests/utils/staticAssets.ts

@@ -27,7 +27,16 @@ export function addStaticAssetSymlink(localOutPath: string, originalPath: string
 
   // Only copy files once
   if (!fs.existsSync(newPath)) {
-    fs.symlinkSync(originalPath, newPath);
+    try {
+      fs.symlinkSync(originalPath, newPath);
+    } catch (error) {
+      // There must be some race condition here as some of our tests flakey
+      // because the file already exists. Let's catch and ignore
+      // only ignore these kind of errors
+      if (!`${error}`.includes('file already exists')) {
+        throw error;
+      }
+    }
   }
 
   symlinkAsset(newPath, path.join(localOutPath, fileName));

dev-packages/node-integration-tests/suites/express/without-tracing/test.ts

@@ -23,24 +23,7 @@ test('correctly applies isolation scope even without tracing', done => {
         },
       },
     })
-    .expect({
-      event: {
-        transaction: 'GET /test/isolationScope/2',
-        tags: {
-          global: 'tag',
-          'isolation-scope': 'tag',
-          'isolation-scope-2': '2',
-        },
-        // Request is correctly set
-        request: {
-          url: expect.stringContaining('/test/isolationScope/2'),
-          headers: {
-            'user-agent': expect.stringContaining(''),
-          },
-        },
-      },
-    })
     .start(done);
 
-  runner.makeRequest('get', '/test/isolationScope/1').then(() => runner.makeRequest('get', '/test/isolationScope/2'));
+  runner.makeRequest('get', '/test/isolationScope/1');
 });

packages/cloudflare/README.md

@@ -15,7 +15,7 @@
 - [Official SDK Docs](https://docs.sentry.io/quickstart/)
 - [TypeDoc](http://getsentry.github.io/sentry-javascript/)
 
-**Note: This SDK is unreleased. Please follow the
+**Note: This SDK is in an alpha state. Please follow the
 [tracking GH issue](https://github.com/getsentry/sentry-javascript/issues/12620) for updates.**
 
 ## Install
@@ -72,6 +72,37 @@ export const onRequest = [
 ];
 ```
 
+If you need to access the `context` object (for example to grab environmental variables), you can pass a function to
+`sentryPagesPlugin` that takes the `context` object as an argument and returns `init` options:
+
+```javascript
+export const onRequest = Sentry.sentryPagesPlugin(context => ({
+  dsn: context.env.SENTRY_DSN,
+  tracesSampleRate: 1.0,
+}));
+```
+
+If you do not have access to the `onRequest` middleware API, you can use the `wrapRequestHandler` API instead.
+
+Here is an example with SvelteKit:
+
+```javascript
+// hooks.server.js
+import * as Sentry from '@sentry/cloudflare';
+
+export const handle = ({ event, resolve }) => {
+  const requestHandlerOptions = {
+    options: {
+      dsn: event.platform.env.SENTRY_DSN,
+      tracesSampleRate: 1.0,
+    },
+    request: event.request,
+    context: event.platform.ctx,
+  };
+  return Sentry.wrapRequestHandler(requestHandlerOptions, () => resolve(event));
+};
+```
+
 ## Setup (Cloudflare Workers)
 
 To use this SDK, wrap your handler with the `withSentry` function. This will initialize the SDK and hook into the
@@ -143,8 +174,50 @@ You can use the `instrumentD1WithSentry` method to instrument [Cloudflare D1](ht
 Cloudflare's serverless SQL database with Sentry.
 
 ```javascript
+import * as Sentry from '@sentry/cloudflare';
+
 // env.DB is the D1 DB binding configured in your `wrangler.toml`
-const db = instrumentD1WithSentry(env.DB);
+const db = Sentry.instrumentD1WithSentry(env.DB);
 // Now you can use the database as usual
 await db.prepare('SELECT * FROM table WHERE id = ?').bind(1).run();
 ```
+
+## Cron Monitoring (Cloudflare Workers)
+
+[Sentry Crons](https://docs.sentry.io/product/crons/) allows you to monitor the uptime and performance of any scheduled,
+recurring job in your application.
+
+To instrument your cron triggers, use the `Sentry.withMonitor` API in your
+[`Scheduled` handler](https://developers.cloudflare.com/workers/runtime-apis/handlers/scheduled/).
+
+```js
+export default {
+  async scheduled(event, env, ctx) {
+    ctx.waitUntil(
+      Sentry.withMonitor('your-cron-name', () => {
+        return doSomeTaskOnASchedule();
+      }),
+    );
+  },
+};
+```
+
+You can also use supply a monitor config to upsert cron monitors with additional metadata:
+
+```js
+const monitorConfig = {
+  schedule: {
+    type: 'crontab',
+    value: '* * * * *',
+  },
+  checkinMargin: 2, // In minutes. Optional.
+  maxRuntime: 10, // In minutes. Optional.
+  timezone: 'America/Los_Angeles', // Optional.
+};
+
+export default {
+  async scheduled(event, env, ctx) {
+    Sentry.withMonitor('your-cron-name', () => doSomeTaskOnASchedule(), monitorConfig);
+  },
+};
+```

packages/cloudflare/package.json

@@ -47,10 +47,9 @@
     "@cloudflare/workers-types": "^4.x"
   },
   "devDependencies": {
-    "@cloudflare/workers-types": "^4.20240722.0",
+    "@cloudflare/workers-types": "^4.20240725.0",
     "@types/node": "^14.18.0",
-    "miniflare": "^3.20240718.0",
-    "wrangler": "^3.65.1"
+    "wrangler": "^3.67.1"
   },
   "scripts": {
     "build": "run-p build:transpile build:types",

packages/cloudflare/src/handler.ts

@@ -1,7 +1,21 @@
-import type { ExportedHandler, ExportedHandlerFetchHandler } from '@cloudflare/workers-types';
-import type { Options } from '@sentry/types';
+import type {
+  ExportedHandler,
+  ExportedHandlerFetchHandler,
+  ExportedHandlerScheduledHandler,
+} from '@cloudflare/workers-types';
+import {
+  SEMANTIC_ATTRIBUTE_SENTRY_ORIGIN,
+  SEMANTIC_ATTRIBUTE_SENTRY_SOURCE,
+  captureException,
+  flush,
+  startSpan,
+  withIsolationScope,
+} from '@sentry/core';
 import { setAsyncLocalStorageAsyncContextStrategy } from './async';
+import type { CloudflareOptions } from './client';
 import { wrapRequestHandler } from './request';
+import { addCloudResourceContext } from './scope-utils';
+import { init } from './sdk';
 
 /**
  * Extract environment generic from exported handler.
@@ -21,7 +35,7 @@ type ExtractEnv<P> = P extends ExportedHandler<infer Env> ? Env : never;
  */
 // eslint-disable-next-line @typescript-eslint/no-explicit-any
 export function withSentry<E extends ExportedHandler<any>>(
-  optionsCallback: (env: ExtractEnv<E>) => Options,
+  optionsCallback: (env: ExtractEnv<E>) => CloudflareOptions,
   handler: E,
 ): E {
   setAsyncLocalStorageAsyncContextStrategy();
@@ -40,5 +54,52 @@ export function withSentry<E extends ExportedHandler<any>>(
     (handler.fetch as any).__SENTRY_INSTRUMENTED__ = true;
   }
 
+  if (
+    'scheduled' in handler &&
+    typeof handler.scheduled === 'function' &&
+    // eslint-disable-next-line @typescript-eslint/no-unsafe-member-access, @typescript-eslint/no-explicit-any
+    !(handler.scheduled as any).__SENTRY_INSTRUMENTED__
+  ) {
+    handler.scheduled = new Proxy(handler.scheduled, {
+      apply(target, thisArg, args: Parameters<ExportedHandlerScheduledHandler<ExtractEnv<E>>>) {
+        const [event, env, context] = args;
+        return withIsolationScope(isolationScope => {
+          const options = optionsCallback(env);
+          const client = init(options);
+          isolationScope.setClient(client);
+
+          addCloudResourceContext(isolationScope);
+
+          return startSpan(
+            {
+              op: 'faas.cron',
+              name: `Scheduled Cron ${event.cron}`,
+              attributes: {
+                'faas.cron': event.cron,
+                'faas.time': new Date(event.scheduledTime).toISOString(),
+                'faas.trigger': 'timer',
+                [SEMANTIC_ATTRIBUTE_SENTRY_ORIGIN]: 'auto.faas.cloudflare',
+                [SEMANTIC_ATTRIBUTE_SENTRY_SOURCE]: 'task',
+              },
+            },
+            async () => {
+              try {
+                return await (target.apply(thisArg, args) as ReturnType<typeof target>);
+              } catch (e) {
+                captureException(e, { mechanism: { handled: false, type: 'cloudflare' } });
+                throw e;
+              } finally {
+                context.waitUntil(flush(2000));
+              }
+            },
+          );
+        });
+      },
+    });
+
+    // eslint-disable-next-line @typescript-eslint/no-unsafe-member-access, @typescript-eslint/no-explicit-any
+    (handler.scheduled as any).__SENTRY_INSTRUMENTED__ = true;
+  }
+
   return handler;
 }

packages/cloudflare/src/index.ts

@@ -88,6 +88,8 @@ export {
 export { withSentry } from './handler';
 export { sentryPagesPlugin } from './pages-plugin';
 
+export { wrapRequestHandler } from './request';
+
 export { CloudflareClient } from './client';
 export { getDefaultIntegrations } from './sdk';
 

packages/cloudflare/src/pages-plugin.ts

@@ -7,23 +7,48 @@ import { wrapRequestHandler } from './request';
  *
  * Initializes the SDK and wraps cloudflare pages requests with SDK instrumentation.
  *
- * @example
+ * @example Simple usage
+ *
  * ```javascript
  * // functions/_middleware.js
  * import * as Sentry from '@sentry/cloudflare';
  *
  * export const onRequest = Sentry.sentryPagesPlugin({
- *  dsn: process.env.SENTRY_DSN,
- *  tracesSampleRate: 1.0,
+ *   dsn: process.env.SENTRY_DSN,
+ *   tracesSampleRate: 1.0,
  * });
  * ```
+ *
+ * @example Usage with handler function to access context for environmental variables
+ *
+ * ```javascript
+ * import * as Sentry from '@sentry/cloudflare';
+ *
+ * const const onRequest = Sentry.sentryPagesPlugin((context) => ({
+ *   dsn: context.env.SENTRY_DSN,
+ *   tracesSampleRate: 1.0,
+ * })
+ * ```
+ *
+ * @param handlerOrOptions Configuration options or a function that returns configuration options.
+ * @returns A plugin function that can be used in Cloudflare Pages.
  */
 export function sentryPagesPlugin<
   Env = unknown,
   // eslint-disable-next-line @typescript-eslint/no-explicit-any
   Params extends string = any,
   Data extends Record<string, unknown> = Record<string, unknown>,
->(options: CloudflareOptions): PagesPluginFunction<Env, Params, Data, CloudflareOptions> {
+  // Although it is not ideal to use `any` here, it makes usage more flexible for different setups.
+  // eslint-disable-next-line @typescript-eslint/no-explicit-any
+  PluginParams = any,
+>(
+  handlerOrOptions:
+    | CloudflareOptions
+    | ((context: EventPluginContext<Env, Params, Data, PluginParams>) => CloudflareOptions),
+): PagesPluginFunction<Env, Params, Data, PluginParams> {
   setAsyncLocalStorageAsyncContextStrategy();
-  return context => wrapRequestHandler({ options, request: context.request, context }, () => context.next());
+  return context => {
+    const options = typeof handlerOrOptions === 'function' ? handlerOrOptions(context) : handlerOrOptions;
+    return wrapRequestHandler({ options, request: context.request, context }, () => context.next());
+  };
 }

packages/cloudflare/src/request.ts

@@ -11,9 +11,10 @@ import {
   startSpan,
   withIsolationScope,
 } from '@sentry/core';
-import type { Scope, SpanAttributes } from '@sentry/types';
-import { stripUrlQueryAndFragment, winterCGRequestToRequestData } from '@sentry/utils';
+import type { SpanAttributes } from '@sentry/types';
+import { stripUrlQueryAndFragment } from '@sentry/utils';
 import type { CloudflareOptions } from './client';
+import { addCloudResourceContext, addCultureContext, addRequest } from './scope-utils';
 import { init } from './sdk';
 
 interface RequestHandlerWrapperOptions {
@@ -96,28 +97,3 @@ export function wrapRequestHandler(
     );
   });
 }
-
-/**
- * Set cloud resource context on scope.
- */
-function addCloudResourceContext(scope: Scope): void {
-  scope.setContext('cloud_resource', {
-    'cloud.provider': 'cloudflare',
-  });
-}
-
-/**
- * Set culture context on scope
- */
-function addCultureContext(scope: Scope, cf: IncomingRequestCfProperties): void {
-  scope.setContext('culture', {
-    timezone: cf.timezone,
-  });
-}
-
-/**
- * Set request data on scope
- */
-function addRequest(scope: Scope, request: Request): void {
-  scope.setSDKProcessingMetadata({ request: winterCGRequestToRequestData(request) });
-}