cleanup

Author: Lms24

packages/node/src/integrations/http.ts

@@ -301,7 +301,7 @@ function _createWrappedRequestMethodFactory(
  */
 function addRequestBreadcrumb(
   event: string,
-  requestSpanData: RequestSpanData,
+  requestSpanData: SanitizedRequestData,
   req: http.ClientRequest,
   res?: http.IncomingMessage,
 ): void {
@@ -313,7 +313,6 @@ function addRequestBreadcrumb(
     {
       category: 'http',
       data: {
-        method: req.method,
         status_code: res && res.statusCode,
         ...requestSpanData,
       },

packages/sveltekit/src/client/load.ts

@@ -134,11 +134,15 @@ function instrumentSvelteKitFetch(originalFetch: SvelteKitFetch): SvelteKitFetch
       const [input, init] = args;
       const rawUrl = getFetchUrl(args);
       const urlObject = new URL(rawUrl);
-      const sanitizedUrl = getSanitizedUrlString(urlObject);
-      const method = getFetchMethod(args);
+      const requestData: SanitizedRequestData = {
+        url: getSanitizedUrlString(urlObject),
+        method: getFetchMethod(args),
+        'http.query': urlObject.search,
+        'http.fragment': urlObject.hash,
+      };
 
       // TODO: extract this to a util function (and use it in breadcrumbs integration as well)
-      if (rawUrl.match(/sentry_key/) && method === 'POST') {
+      if (rawUrl.match(/sentry_key/)) {
         // We don't create spans or breadcrumbs for fetch requests that contain `sentry_key` (internal sentry requests)
         return wrappingTarget.apply(thisArg, args);
       }
@@ -170,19 +174,12 @@ function instrumentSvelteKitFetch(originalFetch: SvelteKitFetch): SvelteKitFetch
 
       let fetchPromise: Promise<Response>;
 
-      const spanData: SanitizedRequestData = {
-        url: sanitizedUrl,
-        method,
-        'http.query': urlObject.search,
-        'http.fragment': urlObject.hash,
-      };
-
       if (createSpan) {
         fetchPromise = trace(
           {
-            name: `${method} ${sanitizedUrl}`, // this will become the description of the span
+            name: `${requestData.method} ${requestData.url}`, // this will become the description of the span
             op: 'http.client',
-            data: spanData,
+            data: requestData,
             parentSpanId: activeSpan && activeSpan.spanId,
           },
           async span => {
@@ -198,7 +195,7 @@ function instrumentSvelteKitFetch(originalFetch: SvelteKitFetch): SvelteKitFetch
       }
 
       if (shouldAddFetchBreadcrumbs) {
-        addFetchBreadcrumb(fetchPromise, spanData, args);
+        addFetchBreadcrumb(fetchPromise, requestData, args);
       }
 
       return fetchPromise;
@@ -209,7 +206,7 @@ function instrumentSvelteKitFetch(originalFetch: SvelteKitFetch): SvelteKitFetch
 /* Adds a breadcrumb for the given fetch result */
 function addFetchBreadcrumb(
   fetchResult: Promise<Response>,
-  spanData: SanitizedRequestData,
+  requestData: SanitizedRequestData,
   args: Parameters<SvelteKitFetch>,
 ): void {
   const breadcrumbStartTimestamp = Date.now();
@@ -220,7 +217,7 @@ function addFetchBreadcrumb(
           type: 'http',
           category: 'fetch',
           data: {
-            ...spanData,
+            ...requestData,
             status_code: response.status,
           },
         },
@@ -238,7 +235,7 @@ function addFetchBreadcrumb(
           type: 'http',
           category: 'fetch',
           level: 'error',
-          data: spanData,
+          data: requestData,
         },
         {
           input: args,