fix test issue & handle non-standard data

Author: mydea

packages/google-cloud-serverless/test/gcpfunction/http.test.ts

@@ -176,11 +176,12 @@ describe('GCPFunction', () => {
     expect(defaultIntegrations).toContain('RequestData');
 
     expect(mockScope.setSDKProcessingMetadata).toHaveBeenCalledWith({
-      request: {
+      normalizedRequest: {
         method: 'POST',
-        url: '/path?q=query',
+        url: 'http://hostname/path?q=query',
         headers: { host: 'hostname', 'content-type': 'application/json' },
-        body: { foo: 'bar' },
+        query_string: 'q=query',
+        data: { foo: 'bar' },
       },
     });
   });

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

@@ -5,7 +5,7 @@ import { VERSION } from '@opentelemetry/core';
 import type { InstrumentationConfig } from '@opentelemetry/instrumentation';
 import { InstrumentationBase, InstrumentationNodeModuleDefinition } from '@opentelemetry/instrumentation';
 import { getRequestInfo } from '@opentelemetry/instrumentation-http';
-import { addBreadcrumb, getClient, getIsolationScope, withIsolationScope } from '@sentry/core';
+import { addBreadcrumb, dropUndefinedKeys, getClient, getIsolationScope, withIsolationScope } from '@sentry/core';
 import {
   extractQueryParamsFromUrl,
   getBreadcrumbLogLevelFromHttpStatusCode,
@@ -439,16 +439,21 @@ export function httpRequestToRequestEventData(request: IncomingMessage): Request
   const originalUrl = request.url || '';
   const absoluteUrl = originalUrl.startsWith(protocol) ? originalUrl : `${protocol}://${host}${originalUrl}`;
 
+  // This is non-standard, but may be sometimes set
+  // It may be overwritten later by our own body handling
+  const data = (request as PolymorphicRequest).body;
+
   // This is non-standard, but may be set on e.g. Next.js or Express requests
   const cookies = (request as PolymorphicRequest).cookies;
 
-  const normalizedRequest: RequestEventData = {
+  const normalizedRequest: RequestEventData = dropUndefinedKeys({
     url: absoluteUrl,
     method: request.method,
     query_string: extractQueryParamsFromUrl(originalUrl),
     headers: headersToDict(headers),
     cookies,
-  };
+    data,
+  });
 
   return normalizedRequest;
 }