also do for replay

Author: mydea

dev-packages/browser-integration-tests/suites/feedback/captureFeedbackAndReplay/hasSampling/test.ts

@@ -103,6 +103,9 @@ sentryTest('should capture feedback', async ({ forceFlushReplay, getLocalTestUrl
         'User-Agent': expect.stringContaining(''),
       },
     },
+    user: {
+      ip_address: '{{auto}}',
+    },
     platform: 'javascript',
   });
 });

dev-packages/browser-integration-tests/suites/public-api/startSpan/standalone-mixed-transaction/test.ts

@@ -103,6 +103,9 @@ sentryTest(
         headers: expect.any(Object),
         url: expect.any(String),
       },
+      user: {
+        ip_address: '{{auto}}',
+      },
       sdk: expect.any(Object),
       spans: [
         {

dev-packages/browser-integration-tests/suites/public-api/withScope/nested_scopes/test.ts

@@ -10,22 +10,22 @@ sentryTest('should allow nested scoping', async ({ getLocalTestUrl, page }) => {
   const eventData = await getMultipleSentryEnvelopeRequests<Event>(page, 5, { url });
 
   expect(eventData[0].message).toBe('root_before');
-  expect(eventData[0].user).toEqual({ id: 'qux' });
+  expect(eventData[0].user).toEqual({ id: 'qux', ip_address: '{{auto}}' });
   expect(eventData[0].tags).toBeUndefined();
 
   expect(eventData[1].message).toBe('outer_before');
-  expect(eventData[1].user).toEqual({ id: 'qux' });
+  expect(eventData[1].user).toEqual({ id: 'qux', ip_address: '{{auto}}' });
   expect(eventData[1].tags).toMatchObject({ foo: false });
 
   expect(eventData[2].message).toBe('inner');
-  expect(eventData[2].user).toBeUndefined();
+  expect(eventData[2].user).toEqual({ ip_address: '{{auto}}' });
   expect(eventData[2].tags).toMatchObject({ foo: false, bar: 10 });
 
   expect(eventData[3].message).toBe('outer_after');
-  expect(eventData[3].user).toEqual({ id: 'baz' });
+  expect(eventData[3].user).toEqual({ id: 'baz', ip_address: '{{auto}}' });
   expect(eventData[3].tags).toMatchObject({ foo: false });
 
   expect(eventData[4].message).toBe('root_after');
-  expect(eventData[4].user).toEqual({ id: 'qux' });
+  expect(eventData[4].user).toEqual({ id: 'qux', ip_address: '{{auto}}' });
   expect(eventData[4].tags).toBeUndefined();
 });

dev-packages/browser-integration-tests/suites/replay/captureReplay/test.ts

@@ -55,6 +55,9 @@ sentryTest('should capture replays (@sentry/browser export)', async ({ getLocalT
         'User-Agent': expect.stringContaining(''),
       },
     },
+    user: {
+      ip_address: '{{auto}}',
+    },
     platform: 'javascript',
   });
 

dev-packages/browser-integration-tests/suites/replay/captureReplayFromReplayPackage/test.ts

@@ -55,6 +55,9 @@ sentryTest('should capture replays (@sentry-internal/replay export)', async ({ g
         'User-Agent': expect.stringContaining(''),
       },
     },
+    user: {
+      ip_address: '{{auto}}',
+    },
     platform: 'javascript',
   });
 

dev-packages/browser-integration-tests/utils/replayEventTemplates.ts

@@ -37,6 +37,9 @@ const DEFAULT_REPLAY_EVENT = {
       'User-Agent': expect.any(String),
     },
   },
+  user: {
+    ip_address: '{{auto}}',
+  },
   platform: 'javascript',
 };
 

packages/replay-internal/src/util/prepareReplayEvent.ts

@@ -55,5 +55,15 @@ export async function prepareReplayEvent({
     version: version || '0.0.0',
   };
 
+  // By default, we want to infer the IP address, unless this is explicitly set to `null`
+  // We do this after all other processing is done
+  // If `ip_address` is explicitly set to `null` or a value, we leave it as is
+  if (preparedEvent.user?.ip_address === undefined) {
+    preparedEvent.user = {
+      ...preparedEvent.user,
+      ip_address: '{{auto}}',
+    };
+  }
+
   return preparedEvent;
 }