ref(core): Store ipAddress as SDKProcessingMetadata (#14899)

Instead of picking this from the plain `request` in
`requestDartaIntegration`.

Extracted from #14806

Author: mydea

packages/core/src/integrations/requestdata.ts

@@ -69,14 +69,13 @@ const _requestDataIntegration = ((options: RequestDataIntegrationOptions = {}) =
       // that's happened, it will be easier to add this logic in without worrying about unexpected side effects.)
 
       const { sdkProcessingMetadata = {} } = event;
-      const { request, normalizedRequest } = sdkProcessingMetadata;
+      const { request, normalizedRequest, ipAddress } = sdkProcessingMetadata;
 
       const addRequestDataOptions = convertReqDataIntegrationOptsToAddReqDataOpts(_options);
 
       // If this is set, it takes precedence over the plain request object
       if (normalizedRequest) {
         // Some other data is not available in standard HTTP requests, but can sometimes be augmented by e.g. Express or Next.js
-        const ipAddress = request ? request.ip || (request.socket && request.socket.remoteAddress) : undefined;
         const user = request ? request.user : undefined;
 
         addNormalizedRequestDataToEvent(event, normalizedRequest, { ipAddress, user }, addRequestDataOptions);

packages/core/src/scope.ts

@@ -67,6 +67,7 @@ export interface SdkProcessingMetadata {
   capturedSpanScope?: Scope;
   capturedSpanIsolationScope?: Scope;
   spanCountBeforeProcessing?: number;
+  ipAddress?: string;
 }
 
 /**

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

@@ -155,13 +155,17 @@ export class SentryHttpInstrumentation extends InstrumentationBase<SentryHttpIns
 
         const normalizedRequest = httpRequestToRequestData(request);
 
+        // request.ip is non-standard but some frameworks set this
+        const ipAddress = (request as { ip?: string }).ip || request.socket?.remoteAddress;
+
         patchRequestToCaptureBody(request, isolationScope);
 
         // Update the isolation scope, isolate this request
         // TODO(v9): Stop setting `request`, we only rely on normalizedRequest anymore
         isolationScope.setSDKProcessingMetadata({
           request,
           normalizedRequest,
+          ipAddress,
         });
 
         // attempt to update the scope's `transactionName` based on the request URL