set span status

Author: Lms24

packages/sveltekit/src/client/load.ts

@@ -1,7 +1,7 @@
 import type { BaseClient } from '@sentry/core';
 import { getCurrentHub, trace } from '@sentry/core';
 import type { Breadcrumbs, BrowserTracing } from '@sentry/svelte';
-import { captureException } from '@sentry/svelte';
+import { captureException, WINDOW } from '@sentry/svelte';
 import type { ClientOptions, SanitizedRequestData } from '@sentry/types';
 import {
   addExceptionMechanism,
@@ -133,12 +133,14 @@ function instrumentSvelteKitFetch(originalFetch: SvelteKitFetch): SvelteKitFetch
     apply: (wrappingTarget, thisArg, args: Parameters<LoadEvent['fetch']>) => {
       const [input, init] = args;
       const rawUrl = getFetchUrl(args);
-      const urlObject = new URL(rawUrl);
+
+      const urlObject = new URL(rawUrl, WINDOW.document.baseURI);
+
       const requestData: SanitizedRequestData = {
         url: getSanitizedUrlString(urlObject),
         method: getFetchMethod(args),
-        'http.query': urlObject.search,
-        'http.fragment': urlObject.hash,
+        ...(urlObject.search && { 'http.query': urlObject.search.substring(1) }),
+        ...(urlObject.hash && { 'http.hash': urlObject.hash.substring(1) }),
       };
 
       // TODO: extract this to a util function (and use it in breadcrumbs integration as well)
@@ -180,14 +182,13 @@ function instrumentSvelteKitFetch(originalFetch: SvelteKitFetch): SvelteKitFetch
             name: `${requestData.method} ${requestData.url}`, // this will become the description of the span
             op: 'http.client',
             data: requestData,
-            parentSpanId: activeSpan && activeSpan.spanId,
           },
-          async span => {
-            const fetchResult: Response = await wrappingTarget.apply(thisArg, [input, patchedInit]);
+          span => {
+            const promise: Promise<Response> = wrappingTarget.apply(thisArg, [input, patchedInit]);
             if (span) {
-              span.setHttpStatus(fetchResult.status);
+              promise.then(res => span.setHttpStatus(res.status)).catch(_ => span.setStatus('internal_error'));
             }
-            return fetchResult;
+            return promise;
           },
         );
       } else {