fix deprecated ip

Author: lucas-zimerman

packages/core/src/js/client.ts

@@ -52,6 +52,15 @@ export class ReactNativeClient extends Client<ReactNativeClientOptions> {
     ignoreRequireCycleLogs(ReactNativeLibraries.ReactNativeVersion?.version);
     options._metadata = options._metadata || {};
     options._metadata.sdk = options._metadata.sdk || defaultSdkInfo;
+
+    // Only allow IP inferral by Relay if sendDefaultPii is true
+    if (options._metadata?.sdk) {
+      options._metadata.sdk.settings = {
+        infer_ip: options.sendDefaultPii ? 'auto' : 'never',
+        ...options._metadata.sdk.settings,
+      };
+    }
+
     // We default this to true, as it is the safer scenario
     options.parentSpanIsAlwaysRootSpan =
       options.parentSpanIsAlwaysRootSpan === undefined ? true : options.parentSpanIsAlwaysRootSpan;
@@ -60,7 +69,6 @@ export class ReactNativeClient extends Client<ReactNativeClientOptions> {
     this._outcomesBuffer = [];
 
     if (options.sendDefaultPii === true) {
-      this.on('postprocessEvent', addAutoIpAddressToUser);
       this.on('beforeSendSession', addAutoIpAddressToSession);
     }
 

packages/core/test/client.test.ts

@@ -687,25 +687,45 @@ describe('Tests ReactNativeClient', () => {
       });
 
       expect(mockTransportSend.mock.calls[0][firstArg][envelopeItems][0][envelopeItemPayload].user).toEqual(
-        expect.objectContaining({ ip_address: '{{auto}}' }),
+        expect.objectContaining({ ip_address: undefined }),
+      );
+      expect(mockTransportSend.mock.calls[0][firstArg][envelopeItems][0][envelopeItemPayload].sdk).toEqual(
+        expect.objectContaining({
+          settings: {
+            infer_ip: 'never'
+          }
+        }
+        ),
       );
     });
 
-    test('adds ip_address {{auto}} to user if not set', () => {
+    test('adds ip_address undefined to user if not set', () => {
       client.captureEvent({
         user: {},
       });
 
-      expect(mockTransportSend.mock.calls[0][firstArg][envelopeItems][0][envelopeItemPayload].user).toEqual(
-        expect.objectContaining({ ip_address: '{{auto}}' }),
+      expect(mockTransportSend.mock.calls[0][firstArg][envelopeItems][0][envelopeItemPayload].user).toBeEmptyObject();
+      expect(mockTransportSend.mock.calls[0][firstArg][envelopeItems][0][envelopeItemPayload].sdk).toEqual(
+        expect.objectContaining({
+          settings: {
+            infer_ip: 'never'
+          }
+        }
+        ),
       );
     });
 
-    test('adds ip_address {{auto}} to undefined user', () => {
+    test('leaves ip_address undefined to undefined user', () => {
       client.captureEvent({});
 
-      expect(mockTransportSend.mock.calls[0][firstArg][envelopeItems][0][envelopeItemPayload].user).toEqual(
-        expect.objectContaining({ ip_address: '{{auto}}' }),
+      expect(mockTransportSend.mock.calls[0][firstArg][envelopeItems][0][envelopeItemPayload].user).toBeUndefined();
+      expect(mockTransportSend.mock.calls[0][firstArg][envelopeItems][0][envelopeItemPayload].sdk).toEqual(
+        expect.objectContaining({
+          settings: {
+            infer_ip: 'never'
+          }
+        }
+        ),
       );
     });
 
@@ -724,15 +744,14 @@ describe('Tests ReactNativeClient', () => {
       expect(
         mockTransportSend.mock.calls[0][firstArg][envelopeItems][0][envelopeItemPayload].user?.ip_address,
       ).toBeUndefined();
-    });
-
-    test('uses ip address hooks if sendDefaultPii is true', () => {
-      const { onSpy } = createClientWithSpy({
-        sendDefaultPii: true,
-      });
-
-      expect(onSpy).toHaveBeenCalledWith('postprocessEvent', addAutoIpAddressToUser);
-      expect(onSpy).toHaveBeenCalledWith('beforeSendSession', addAutoIpAddressToSession);
+      expect(mockTransportSend.mock.calls[0][firstArg][envelopeItems][0][envelopeItemPayload].sdk).toEqual(
+        expect.objectContaining({
+          settings: {
+            infer_ip: 'never'
+          }
+        }
+        ),
+      );
     });
 
     test('does not add ip_address {{auto}} to session if sendDefaultPii is false', () => {