properly extract query_params

Author: mydea

packages/astro/src/server/middleware.ts

@@ -12,9 +12,10 @@ import {
   startSpan,
   withIsolationScope,
 } from '@sentry/node';
-import type { Scope, SpanAttributes } from '@sentry/types';
+import type { Request, Scope, SpanAttributes } from '@sentry/types';
 import {
   addNonEnumerableProperty,
+  extractQueryParamsFromUrl,
   logger,
   objectify,
   stripUrlQueryAndFragment,
@@ -111,7 +112,13 @@ async function instrumentRequest(
       getCurrentScope().setSDKProcessingMetadata({
         // We store the request on the current scope, not isolation scope,
         // because we may have multiple requests nested inside each other
-        normalizedRequest: isDynamicPageRequest ? winterCGRequestToRequestData(request) : { method, url: request.url },
+        normalizedRequest: (isDynamicPageRequest
+          ? winterCGRequestToRequestData(request)
+          : {
+              method,
+              url: request.url,
+              query_string: extractQueryParamsFromUrl(request.url),
+            }) satisfies Request,
       });
 
       if (options.trackClientIp && isDynamicPageRequest) {

packages/bun/src/integrations/bunserver.ts

@@ -10,7 +10,7 @@ import {
   withIsolationScope,
 } from '@sentry/core';
 import type { IntegrationFn, Request, SpanAttributes } from '@sentry/types';
-import { getSanitizedUrlString, parseUrl } from '@sentry/utils';
+import { extractQueryParamsFromUrl, getSanitizedUrlString, parseUrl } from '@sentry/utils';
 
 const INTEGRATION_NAME = 'BunServer';
 
@@ -80,6 +80,7 @@ function instrumentBunServeOptions(serveOptions: Parameters<typeof Bun.serve>[0]
             url,
             method: request.method,
             headers: request.headers.toJSON(),
+            query_string: extractQueryParamsFromUrl(url),
           } satisfies Request,
         });
 

packages/node/src/integrations/http/SentryHttpInstrumentation.ts

@@ -8,6 +8,7 @@ import { getRequestInfo } from '@opentelemetry/instrumentation-http';
 import { addBreadcrumb, getClient, getIsolationScope, withIsolationScope } from '@sentry/core';
 import type { PolymorphicRequest, Request, SanitizedRequestData } from '@sentry/types';
 import {
+  extractQueryParamsFromUrl,
   getBreadcrumbLogLevelFromHttpStatusCode,
   getSanitizedUrlString,
   headersToDict,
@@ -146,7 +147,7 @@ export class SentryHttpInstrumentation extends InstrumentationBase<SentryHttpIns
         const normalizedRequest: Request = {
           url: absoluteUrl,
           method: request.method,
-          query_string: extractQueryParams(request),
+          query_string: extractQueryParamsFromUrl(request.url || ''),
           headers: headersToDict(request.headers),
           cookies,
         };
@@ -440,19 +441,3 @@ function patchRequestToCaptureBody(req: IncomingMessage, normalizedRequest: Requ
     // ignore errors if we can't patch stuff
   }
 }
-
-function extractQueryParams(req: IncomingMessage): string | undefined {
-  // req.url is path and query string
-  if (!req.url) {
-    return;
-  }
-
-  try {
-    // The `URL` constructor can't handle internal URLs of the form `/some/path/here`, so stick a dummy protocol and
-    // hostname as the base. Since the point here is just to grab the query string, it doesn't matter what we use.
-    const queryParams = new URL(req.url, 'http://dogs.are.great').search.slice(1);
-    return queryParams.length ? queryParams : undefined;
-  } catch {
-    return undefined;
-  }
-}

packages/utils/src/requestdata.ts

@@ -462,10 +462,29 @@ export function winterCGRequestToRequestData(req: WebFetchRequest): Request {
   return {
     method: req.method,
     url: req.url,
+    query_string: extractQueryParamsFromUrl(req.url),
     headers,
+    // TODO: Can we extract body data from the request?
   };
 }
 
+/** Extract the query params from an URL. */
+export function extractQueryParamsFromUrl(url: string): string | undefined {
+  // url is path and query string
+  if (!url) {
+    return;
+  }
+
+  try {
+    // The `URL` constructor can't handle internal URLs of the form `/some/path/here`, so stick a dummy protocol and
+    // hostname as the base. Since the point here is just to grab the query string, it doesn't matter what we use.
+    const queryParams = new URL(url, 'http://dogs.are.great').search.slice(1);
+    return queryParams.length ? queryParams : undefined;
+  } catch {
+    return undefined;
+  }
+}
+
 function extractNormalizedRequestData(normalizedRequest: Request, { include }: { include: string[] }): Request {
   const includeKeys = include ? (Array.isArray(include) ? include : DEFAULT_REQUEST_INCLUDES) : [];