use trace function

Author: AbhiPrasad

packages/sveltekit/src/server/load.ts

@@ -1,11 +1,10 @@
 /* eslint-disable @sentry-internal/sdk/no-optional-chaining */
-import type { Span } from '@sentry/core';
-import { captureException, getCurrentHub } from '@sentry/node';
+import { trace } from '@sentry/core';
+import { captureException } from '@sentry/node';
 import {
   addExceptionMechanism,
   baggageHeaderToDynamicSamplingContext,
   extractTraceparentData,
-  isThenable,
   objectify,
 } from '@sentry/utils';
 import type { HttpError, ServerLoad } from '@sveltejs/kit';
@@ -45,10 +44,6 @@ function sendErrorToSentry(e: unknown): unknown {
   return objectifiedErr;
 }
 
-function setSpan(span: Span | undefined): void {
-  getCurrentHub().getScope()?.setSpan(span);
-}
-
 /**
  * Wrap load function with Sentry
  *
@@ -58,34 +53,15 @@ export function wrapLoadWithSentry(origLoad: ServerLoad): ServerLoad {
   return new Proxy(origLoad, {
     apply: (wrappingTarget, thisArg, args: Parameters<ServerLoad>) => {
       return domain.create().bind(() => {
-        let maybePromiseResult;
-
         const [event] = args;
-        const hub = getCurrentHub();
-        const scope = hub.getScope();
-
-        const parentSpan = scope?.getSpan();
 
-        let activeSpan: Span | undefined = undefined;
-
-        function finishActiveSpan(): void {
-          activeSpan?.finish();
-          setSpan(parentSpan);
-        }
-
-        if (parentSpan) {
-          activeSpan = parentSpan.startChild({
-            op: 'function.sveltekit.load',
-            description: event.route.id || 'load',
-            status: 'ok',
-          });
-        } else {
-          const sentryTraceHeader = event.request.headers.get('sentry-trace');
-          const baggageHeader = event.request.headers.get('baggage');
-          const traceparentData = sentryTraceHeader ? extractTraceparentData(sentryTraceHeader) : undefined;
-          const dynamicSamplingContext = baggageHeaderToDynamicSamplingContext(baggageHeader);
+        const sentryTraceHeader = event.request.headers.get('sentry-trace');
+        const baggageHeader = event.request.headers.get('baggage');
+        const traceparentData = sentryTraceHeader ? extractTraceparentData(sentryTraceHeader) : undefined;
+        const dynamicSamplingContext = baggageHeaderToDynamicSamplingContext(baggageHeader);
 
-          activeSpan = hub.startTransaction({
+        return trace(
+          {
             op: 'function.sveltekit.load',
             name: event.route.id || 'load',
             status: 'ok',
@@ -94,36 +70,10 @@ export function wrapLoadWithSentry(origLoad: ServerLoad): ServerLoad {
               source: 'route',
               dynamicSamplingContext: traceparentData && !dynamicSamplingContext ? {} : dynamicSamplingContext,
             },
-          });
-        }
-
-        setSpan(activeSpan);
-
-        try {
-          maybePromiseResult = wrappingTarget.apply(thisArg, args);
-        } catch (e) {
-          activeSpan?.setStatus('internal_error');
-          const sentryError = sendErrorToSentry(e);
-          finishActiveSpan();
-          throw sentryError;
-        }
-
-        if (isThenable(maybePromiseResult)) {
-          Promise.resolve(maybePromiseResult).then(
-            () => {
-              finishActiveSpan();
-            },
-            e => {
-              activeSpan?.setStatus('internal_error');
-              sendErrorToSentry(e);
-              finishActiveSpan();
-            },
-          );
-        } else {
-          finishActiveSpan();
-        }
-
-        return maybePromiseResult;
+          },
+          () => wrappingTarget.apply(thisArg, args),
+          sendErrorToSentry,
+        );
       })();
     },
   });