re-activate request object test

Author: Lms24

packages/sveltekit/src/client/load.ts

@@ -154,11 +154,11 @@ function instrumentSvelteKitFetch(originalFetch: SvelteKitFetch): SvelteKitFetch
       const activeSpan = getCurrentHub().getScope().getSpan();
       const activeTransaction = activeSpan && activeSpan.transaction;
 
-      const attachHeaders = activeTransaction && shouldAttachHeaders(rawUrl);
       const createSpan = activeTransaction && shouldCreateSpan(rawUrl);
+      const attachHeaders = createSpan && activeTransaction && shouldAttachHeaders(rawUrl);
 
       // only attach headers if we should create a span
-      if (attachHeaders && createSpan) {
+      if (attachHeaders) {
         const dsc = activeTransaction.getDynamicSamplingContext();
 
         const headers = addTracingHeadersToFetchRequest(
@@ -173,9 +173,9 @@ function instrumentSvelteKitFetch(originalFetch: SvelteKitFetch): SvelteKitFetch
               | Request['headers'];
           },
         ) as HeadersInit;
+
         patchedInit.headers = headers;
       }
-
       let fetchPromise: Promise<Response>;
 
       const patchedFetchArgs = [input, patchedInit];

packages/sveltekit/test/client/load.test.ts

@@ -30,7 +30,7 @@ const mockTrace = vi.fn();
 
 const mockedBrowserTracing = {
   options: {
-    tracePropagationTargets: ['example.com'],
+    tracePropagationTargets: ['example.com', /^\\/],
     traceFetch: true,
     shouldCreateSpanForRequest: undefined as undefined | (() => boolean),
   },
@@ -227,26 +227,23 @@ describe('wrapLoadWithSentry', () => {
           },
         },
       ],
-      // TODO: This case currently fails because we don't handle the Request API correctly.
-      // We need to fix this in our core fetch instrumentation and
-      // and adjust the test here as well, since both instrumentations
-      // rely on the same `getFetchUrl` and `getFetchMethod` utility functions.
-      // [
-      // 'fetch call with a Request object ',
-      //   [{ url: 'api/users?id=123', headers: { 'x-my-header': 'value' } } as unknown as Request],
-      //   {
-      //     op: 'http.client',
-      //     name: 'GET [object Object]',
-      //     data: {
-      //       method: 'GET',
-      //       url: '[object Object]',
-      //     },
-      //   },
-      // ],
+      [
+        'fetch call with a Request object ',
+        [{ url: '/api/users?id=123', headers: { 'x-my-header': 'value' } } as unknown as Request],
+        {
+          op: 'http.client',
+          name: 'GET /api/users',
+          data: {
+            method: 'GET',
+            url: '/api/users',
+            'http.query': 'id=123',
+          },
+        },
+      ],
     ])('instruments fetch (%s)', (_, originalFetchArgs, spanCtx) => {
       beforeEach(() => {
         mockedBrowserTracing.options = {
-          tracePropagationTargets: ['example.com'],
+          tracePropagationTargets: ['example.com', /^\//],
           traceFetch: true,
           shouldCreateSpanForRequest: undefined,
         };
@@ -259,7 +256,7 @@ describe('wrapLoadWithSentry', () => {
         };
       };
 
-      it('creates a fetch span and attaches tracing headers if event.fetch was called', async () => {
+      it('creates a fetch span and attaches tracing headers by default when event.fetch was called', async () => {
         const wrappedLoad = wrapLoadWithSentry(load);
         await wrappedLoad(MOCK_LOAD_ARGS);