fix(sveltekit): use the new unified continueTrace function

Author: SG60

packages/sveltekit/src/server-common/handle.ts

@@ -1,7 +1,8 @@
-import type { continueTrace, Span } from '@sentry/core';
+import type { Span } from '@sentry/core';
 import {
   SEMANTIC_ATTRIBUTE_SENTRY_ORIGIN,
   SEMANTIC_ATTRIBUTE_SENTRY_SOURCE,
+  continueTrace,
   getActiveSpan,
   getCurrentScope,
   getDefaultIsolationScope,
@@ -137,13 +138,18 @@ export async function instrumentHandle(
  * A SvelteKit handle function that wraps the request for Sentry error and
  * performance monitoring.
  *
- * Some environments require a different continueTrace function. E.g. Node can use
- * the Opentelemetry SDK, whereas Cloudflare cannot.
+ * Usage:
+ * ```
+ * // src/hooks.server.ts
+ * import { sentryHandle } from '@sentry/sveltekit';
+ *
+ * export const handle = sentryHandle();
+ *
+ * // Optionally use the `sequence` function to add additional handlers.
+ * // export const handle = sequence(sentryHandle(), yourCustomHandler);
+ * ```
  */
-export function sentryHandleGeneric(
-  continueTraceFunction: typeof continueTrace,
-  handlerOptions?: SentryHandleOptions,
-): Handle {
+export function sentryHandle(handlerOptions?: SentryHandleOptions): Handle {
   const options = {
     handleUnknownRoutes: false,
     injectFetchProxyScript: true,
@@ -173,7 +179,7 @@ export function sentryHandleGeneric(
       isolationScope.setSDKProcessingMetadata({
         normalizedRequest: winterCGRequestToRequestData(input.event.request.clone()),
       });
-      return continueTraceFunction(getTracePropagationData(input.event), () => instrumentHandle(input, options));
+      return continueTrace(getTracePropagationData(input.event), () => instrumentHandle(input, options));
     });
   };
 

packages/sveltekit/src/server/handle.ts

@@ -1,29 +1,5 @@
-import { continueTrace } from '@sentry/core';
 import type { Handle } from '@sveltejs/kit';
 
-import { sentryHandleGeneric, SentryHandleOptions } from '../server-common/handle';
-
-/**
- * A SvelteKit handle function that wraps the request for Sentry error and
- * performance monitoring.
- *
- * Usage:
- * ```
- * // src/hooks.server.ts
- * import { sentryHandle } from '@sentry/sveltekit';
- *
- * export const handle = sentryHandle();
- *
- * // Optionally use the `sequence` function to add additional handlers.
- * // export const handle = sequence(sentryHandle(), yourCustomHandler);
- * ```
- */
-export function sentryHandle(handlerOptions?: SentryHandleOptions): Handle {
-  const sentryRequestHandler = sentryHandleGeneric(continueTrace, handlerOptions);
-
-  return sentryRequestHandler;
-}
-
 /** Documented in `worker/handle.ts` */
 export function initCloudflareSentryHandle(_options: any): Handle {
   return ({ event, resolve }) => resolve(event);

packages/sveltekit/src/server/index.ts

@@ -132,7 +132,8 @@ export * from '@sentry/node';
 export { init } from './sdk';
 export { handleErrorWithSentry } from '../server-common/handleError';
 export { wrapLoadWithSentry, wrapServerLoadWithSentry } from '../server-common/load';
-export { sentryHandle, initCloudflareSentryHandle } from './handle';
+export { sentryHandle } from '../server-common/handle';
+export { initCloudflareSentryHandle } from './handle';
 export { wrapServerRouteWithSentry } from '../server-common/serverRoute';
 
 /**

packages/sveltekit/src/worker/handle.ts

@@ -1,33 +1,9 @@
-import { CloudflareOptions, continueTrace, wrapRequestHandler } from '@sentry/cloudflare';
+import { CloudflareOptions, wrapRequestHandler } from '@sentry/cloudflare';
 import { getDefaultIntegrations as getDefaultCloudflareIntegrations } from '@sentry/cloudflare';
 import type { Handle } from '@sveltejs/kit';
 
-import { sentryHandleGeneric, SentryHandleOptions } from '../server-common/handle';
 import { rewriteFramesIntegration } from '../server-common/rewriteFramesIntegration';
 
-/**
- * A SvelteKit handle function that wraps the request for Sentry error and
- * performance monitoring.
- *
- * This doesn't currently use OTEL, as it isn't available outside of Node
- *
- * Usage:
- * ```
- * // src/hooks.server.ts
- * import { sentryHandle } from '@sentry/sveltekit';
- *
- * export const handle = sentryHandle();
- *
- * // Optionally use the `sequence` function to add additional handlers.
- * // export const handle = sequence(sentryHandle(), yourCustomHandler);
- * ```
- */
-export function sentryHandle(handlerOptions?: SentryHandleOptions): Handle {
-  const sentryRequestHandler = sentryHandleGeneric(continueTrace, handlerOptions);
-
-  return sentryRequestHandler;
-}
-
 /** Initializes Sentry SvelteKit Cloudflare SDK
  *  This should be before the sentryHandle() call.
  *
@@ -43,14 +19,14 @@ export function initCloudflareSentryHandle(options: CloudflareOptions): Handle {
     // if event.platform exists (should be there in a cloudflare worker), then do the cloudflare sentry init
     return event.platform
       ? wrapRequestHandler(
-        {
-          options: opts,
-          request: event.request,
-          // @ts-expect-error This will exist in Cloudflare
-          context: event.platform.context,
-        },
-        () => resolve(event),
-      )
+          {
+            options: opts,
+            request: event.request,
+            // @ts-expect-error This will exist in Cloudflare
+            context: event.platform.context,
+          },
+          () => resolve(event),
+        )
       : resolve(event);
   };
 

packages/sveltekit/src/worker/index.ts

@@ -10,7 +10,8 @@
 // SvelteKit SDK exports:
 export { handleErrorWithSentry } from '../server-common/handleError';
 export { wrapLoadWithSentry, wrapServerLoadWithSentry } from '../server-common/load';
-export { sentryHandle, initCloudflareSentryHandle } from './handle';
+export { sentryHandle } from '../server-common/handle';
+export { initCloudflareSentryHandle } from './handle';
 export { wrapServerRouteWithSentry } from '../server-common/serverRoute';
 
 // Re-export some functions from Cloudflare SDK