PR feedback

Author: mydea

packages/core/src/integrations/requestdata.ts

@@ -84,7 +84,8 @@ const _requestDataIntegration = ((options: RequestDataIntegrationOptions = {}) =
         const ipAddress = request ? request.ip || (request.socket && request.socket.remoteAddress) : undefined;
         const user = request ? request.user : undefined;
 
-        return addNormalizedRequestDataToEvent(event, normalizedRequest, { ipAddress, user }, addRequestDataOptions);
+        addNormalizedRequestDataToEvent(event, normalizedRequest, { ipAddress, user }, addRequestDataOptions);
+        return event;
       }
 
       if (!request) {

packages/node/src/integrations/http.ts

@@ -175,8 +175,7 @@ export const instrumentHttp = Object.assign(
         patchRequestToCaptureBody(req, normalizedRequest);
 
         // Update the isolation scope, isolate this request
-        isolationScope.setSDKProcessingMetadata({ normalizedRequest });
-        isolationScope.setSDKProcessingMetadata({ request: req });
+        isolationScope.setSDKProcessingMetadata({ request: req, normalizedRequest });
 
         const client = getClient<NodeClient>();
         if (client && client.getOptions().autoSessionTracking) {
@@ -353,7 +352,7 @@ function patchRequestToCaptureBody(req: HTTPModuleRequestIncomingMessage, normal
     // eslint-disable-next-line @typescript-eslint/unbound-method
     req.on = new Proxy(req.on, {
       apply: (target, thisArg, args: Parameters<typeof req.on>) => {
-        const [event, listener] = args;
+        const [event, listener, ...restArgs] = args;
 
         if (event === 'data') {
           const callback = new Proxy(listener, {
@@ -366,7 +365,7 @@ function patchRequestToCaptureBody(req: HTTPModuleRequestIncomingMessage, normal
 
           callbackMap.set(listener, callback);
 
-          return Reflect.apply(target, thisArg, [event, callback]);
+          return Reflect.apply(target, thisArg, [event, callback, ...restArgs]);
         }
 
         if (event === 'end') {
@@ -389,7 +388,7 @@ function patchRequestToCaptureBody(req: HTTPModuleRequestIncomingMessage, normal
 
           callbackMap.set(listener, callback);
 
-          return Reflect.apply(target, thisArg, [event, callback]);
+          return Reflect.apply(target, thisArg, [event, callback, ...restArgs]);
         }
 
         return Reflect.apply(target, thisArg, args);

packages/utils/src/requestdata.ts

@@ -268,14 +268,15 @@ export function extractRequestData(
 
 /**
  * Add already normalized request data to an event.
+ * This mutates the passed in event.
  */
 export function addNormalizedRequestDataToEvent(
   event: Event,
   req: Request,
   // This is non-standard data that is not part of the regular HTTP request
   additionalData: { ipAddress?: string; user?: Record<string, unknown> },
   options: AddRequestDataToEventOptions,
-): Event {
+): void {
   const include = {
     ...DEFAULT_INCLUDES,
     ...(options && options.include),
@@ -318,8 +319,6 @@ export function addNormalizedRequestDataToEvent(
       };
     }
   }
-
-  return event;
 }
 
 /**