fix(sveltekit): provide a handle function to init cloudflare workers sdk in sveltekit

Also reexports the Cloudflare SDK.

Author: SG60

packages/sveltekit/package.json

@@ -42,6 +42,7 @@
     }
   },
   "dependencies": {
+    "@sentry/cloudflare": "9.0.0-alpha.0",
     "@sentry/core": "9.0.0-alpha.0",
     "@sentry/node": "9.0.0-alpha.0",
     "@sentry/opentelemetry": "9.0.0-alpha.0",

packages/sveltekit/src/worker/handle.ts

@@ -12,8 +12,8 @@ import {
   startSpan,
   winterCGRequestToRequestData,
   withIsolationScope,
-  continueTrace,
 } from '@sentry/core';
+import { CloudflareOptions, continueTrace, wrapRequestHandler } from '@sentry/cloudflare';
 import type { Handle, ResolveOptions } from '@sveltejs/kit';
 
 import { DEBUG_BUILD } from '../common/debug-build';
@@ -192,3 +192,27 @@ async function instrumentHandle(
     await flushIfServerless();
   }
 }
+
+/** Initializes Sentry SvelteKit Cloudflare SDK
+ *  This should be before the sentryHandle() call.
+ * */
+export function initCloudflareSentryHandle(handlerOptions: CloudflareOptions): Handle {
+  const options = { ...handlerOptions };
+
+  const handleInitSentry: Handle = ({ event, resolve }) => {
+    // if event.platform exists (should be there in a cloudflare worker), then do the cloudflare sentry init
+    return event.platform
+      ? wrapRequestHandler(
+        {
+          options,
+          request: event.request,
+          // @ts-expect-error This will exist in Cloudflare
+          context: event.platform.context,
+        },
+        () => resolve(event),
+      )
+      : resolve(event);
+  };
+
+  return handleInitSentry;
+}

packages/sveltekit/src/worker/handleError.ts

@@ -1,4 +1,5 @@
-import { consoleSandbox, captureException } from '@sentry/core';
+import { consoleSandbox } from '@sentry/core';
+import { captureException } from '@sentry/cloudflare';
 import type { HandleServerError } from '@sveltejs/kit';
 
 import { flushIfServerless } from './utils';

packages/sveltekit/src/worker/index.ts

@@ -10,41 +10,33 @@
 // SvelteKit SDK exports:
 export { handleErrorWithSentry } from './handleError';
 export { wrapLoadWithSentry, wrapServerLoadWithSentry } from './load';
-export { sentryHandle } from './handle';
+export { sentryHandle, initCloudflareSentryHandle } from './handle';
 export { wrapServerRouteWithSentry } from './serverRoute';
 
-// Re-export some functions from core SDK
+// Re-export some functions from Cloudflare SDK
 export {
   addBreadcrumb,
   addEventProcessor,
   addIntegration,
-  // eslint-disable-next-line deprecation/deprecation
-  addRequestDataToEvent,
   captureCheckIn,
   captureConsoleIntegration,
   captureEvent,
   captureException,
   captureFeedback,
   captureMessage,
-  captureSession,
   close,
   continueTrace,
   createTransport,
   // eslint-disable-next-line deprecation/deprecation
   debugIntegration,
   dedupeIntegration,
-  DEFAULT_USER_INCLUDES,
-  endSession,
-  // eslint-disable-next-line deprecation/deprecation
-  extractRequestData,
   extraErrorDataIntegration,
   flush,
   functionToStringIntegration,
   getActiveSpan,
   getClient,
-  // eslint-disable-next-line deprecation/deprecation
-  getCurrentHub,
   getCurrentScope,
+  getDefaultIntegrations,
   getGlobalScope,
   getIsolationScope,
   getRootSpan,
@@ -58,7 +50,6 @@ export {
   linkedErrorsIntegration,
   // eslint-disable-next-line deprecation/deprecation
   metrics,
-  parameterize,
   requestDataIntegration,
   rewriteFramesIntegration,
   Scope,
@@ -67,8 +58,6 @@ export {
   SEMANTIC_ATTRIBUTE_SENTRY_ORIGIN,
   SEMANTIC_ATTRIBUTE_SENTRY_SAMPLE_RATE,
   SEMANTIC_ATTRIBUTE_SENTRY_SOURCE,
-  // eslint-disable-next-line deprecation/deprecation
-  sessionTimingIntegration,
   setContext,
   setCurrentClient,
   setExtra,
@@ -84,7 +73,6 @@ export {
   startInactiveSpan,
   startNewTrace,
   suppressTracing,
-  startSession,
   startSpan,
   startSpanManual,
   trpcMiddleware,
@@ -93,7 +81,7 @@ export {
   withMonitor,
   withScope,
   zodErrorsIntegration,
-} from '@sentry/core';
+} from '@sentry/cloudflare';
 
 /**
  * Tracks the Svelte component's initialization and mounting operation as well as

packages/sveltekit/src/worker/load.ts

@@ -1,9 +1,5 @@
-import {
-  addNonEnumerableProperty,
-  SEMANTIC_ATTRIBUTE_SENTRY_ORIGIN,
-  SEMANTIC_ATTRIBUTE_SENTRY_SOURCE,
-  startSpan,
-} from '@sentry/core';
+import { addNonEnumerableProperty } from '@sentry/core';
+import { SEMANTIC_ATTRIBUTE_SENTRY_ORIGIN, SEMANTIC_ATTRIBUTE_SENTRY_SOURCE, startSpan } from '@sentry/cloudflare';
 import type { LoadEvent, ServerLoadEvent } from '@sveltejs/kit';
 
 import type { SentryWrappedFlag } from '../common/utils';

packages/sveltekit/src/worker/serverRoute.ts

@@ -1,9 +1,5 @@
-import {
-  addNonEnumerableProperty,
-  SEMANTIC_ATTRIBUTE_SENTRY_ORIGIN,
-  SEMANTIC_ATTRIBUTE_SENTRY_SOURCE,
-  startSpan,
-} from '@sentry/core';
+import { addNonEnumerableProperty } from '@sentry/core';
+import { SEMANTIC_ATTRIBUTE_SENTRY_ORIGIN, SEMANTIC_ATTRIBUTE_SENTRY_SOURCE, startSpan } from '@sentry/cloudflare';
 import type { RequestEvent } from '@sveltejs/kit';
 import { flushIfServerless, sendErrorToSentry } from './utils';
 

packages/sveltekit/src/worker/utils.ts

@@ -1,4 +1,5 @@
-import { logger, objectify, captureException, flush } from '@sentry/core';
+import { logger, objectify } from '@sentry/core';
+import { captureException, flush } from '@sentry/cloudflare';
 import type { RequestEvent } from '@sveltejs/kit';
 
 import { DEBUG_BUILD } from '../common/debug-build';