Merge branch 'main' into lz/5098

Author: lucas-zimerman

.github/workflows/codeql-analysis.yml

@@ -44,7 +44,7 @@ jobs:
 
       # Initializes the CodeQL tools for scanning.
       - name: Initialize CodeQL
-        uses: github/codeql-action/init@76621b61decf072c1cee8dd1ce2d2a82d33c17ed # pin@v3.29.5
+        uses: github/codeql-action/init@3c3833e0f8c1c83d449a7478aa59c036a9165498 # pin@v3.29.5
         with:
           languages: ${{ matrix.language }}
           # If you wish to specify custom queries, you can do so here or in a config file.
@@ -55,7 +55,7 @@ jobs:
       # Autobuild attempts to build any compiled languages  (C/C++, C#, or Java).
       # If this step fails, then you should remove it and run the build manually (see below)
       - name: Autobuild
-        uses: github/codeql-action/autobuild@76621b61decf072c1cee8dd1ce2d2a82d33c17ed # pin@v3.29.5
+        uses: github/codeql-action/autobuild@3c3833e0f8c1c83d449a7478aa59c036a9165498 # pin@v3.29.5
 
       # ℹ️ Command-line programs to run using the OS shell.
       # 📚 https://docs.github.com/en/actions/reference/workflow-syntax-for-github-actions
@@ -66,4 +66,4 @@ jobs:
       #   make bootstrap
       #   make release
       - name: Perform CodeQL Analysis
-        uses: github/codeql-action/analyze@76621b61decf072c1cee8dd1ce2d2a82d33c17ed # pin@v3.29.5
+        uses: github/codeql-action/analyze@3c3833e0f8c1c83d449a7478aa59c036a9165498 # pin@v3.29.5

.github/workflows/e2e-v2.yml

@@ -313,7 +313,7 @@ jobs:
             runs-on: macos-14
           - platform: ios
             rn-version: '0.65.3'
-            runs-on: macos-15
+            runs-on: macos-14
           - platform: android
             runs-on: ubuntu-latest
         exclude:

.github/workflows/native-tests.yml

@@ -18,7 +18,7 @@ jobs:
 
   test-ios:
     name: ios
-    runs-on: macos-15
+    runs-on: macos-14
     needs: [diff_check]
     if: ${{ needs.diff_check.outputs.skip_ci != 'true' }}
     steps:

.github/workflows/release.yml

@@ -19,7 +19,7 @@ jobs:
     steps:
       - name: Get auth token
         id: token
-        uses: actions/create-github-app-token@0f859bf9e69e887678d5bbfbee594437cb440ffe # v2.1.0
+        uses: actions/create-github-app-token@a8d616148505b5069dccd32f177bb87d7f39123b # v2.1.1
         with:
           app-id: ${{ vars.SENTRY_RELEASE_BOT_CLIENT_ID }}
           private-key: ${{ secrets.SENTRY_RELEASE_BOT_PRIVATE_KEY }}

.github/workflows/testflight.yml

@@ -14,7 +14,7 @@ jobs:
 
   upload_to_testflight:
     name: Build and Upload React Native Sample to Testflight
-    runs-on: macos-15
+    runs-on: macos-14
     needs: [diff_check]
     if: ${{ needs.diff_check.outputs.skip_ci != 'true' }}
     steps:

CHANGELOG.md

@@ -8,9 +8,26 @@
 
 ## Unreleased
 
-### Fixes
+### Important Changes
+
+- **fix(browser): Ensure IP address is only inferred by Relay if `sendDefaultPii` is `true`** ([#5092](https://github.com/getsentry/sentry-react-native/pull/5092))
+
+This release includes a fix for a [behaviour change](https://docs.sentry.io/platforms/javascript/migration/v8-to-v9/#behavior-changes)
+that was originally introduced with v9 of the JavaScript SDK: User IP Addresses should only be added to Sentry events automatically,
+if `sendDefaultPii` was set to `true`.
+
+However, the change in v9 required further internal adjustment, which should have been included in v10 of the SDK.
+To avoid making a major bump, the fix was patched on the current version and not by bumping to V10.
+There is _no API_ breakage involved and hence it is safe to update.
+However, after updating the SDK, events (errors, traces, replays, etc.) sent from the browser, will only include
+user IP addresses, if you set `sendDefaultPii: true` in your `Sentry.init` options.
+
+We apologize for any inconvenience caused!
+
+## Fixes
 
 - Fix Expo prebuild failed on cached builds ([#5098](https://github.com/getsentry/sentry-react-native/pull/5098))
+- Remove the warning that used to indicate that Time To Initial Display and Time To Full Display are not supported ([#5081](https://github.com/getsentry/sentry-react-native/pull/5081))
 
 ## 6.20.0
 

packages/core/plugin/src/withSentryAndroid.ts

@@ -5,19 +5,19 @@ import * as path from 'path';
 import { warnOnce, writeSentryPropertiesTo } from './utils';
 
 export const withSentryAndroid: ConfigPlugin<string> = (config, sentryProperties: string) => {
-  const cfg = withAppBuildGradle(config, config => {
-    if (config.modResults.language === 'groovy') {
-      config.modResults.contents = modifyAppBuildGradle(config.modResults.contents);
+  const cfg = withAppBuildGradle(config, appBuildGradle => {
+    if (appBuildGradle.modResults.language === 'groovy') {
+      appBuildGradle.modResults.contents = modifyAppBuildGradle(appBuildGradle.modResults.contents);
     } else {
       throw new Error('Cannot configure Sentry in the app gradle because the build.gradle is not groovy');
     }
-    return config;
+    return appBuildGradle;
   });
   return withDangerousMod(cfg, [
     'android',
-    config => {
-      writeSentryPropertiesTo(path.resolve(config.modRequest.projectRoot, 'android'), sentryProperties);
-      return config;
+    dangerousMod => {
+      writeSentryPropertiesTo(path.resolve(dangerousMod.modRequest.projectRoot, 'android'), sentryProperties);
+      return dangerousMod;
     },
   ]);
 };

packages/core/plugin/src/withSentryAndroidGradlePlugin.ts

@@ -1,4 +1,5 @@
 import { withAppBuildGradle, withProjectBuildGradle } from '@expo/config-plugins';
+import type { ExpoConfig } from '@expo/config-types';
 
 import { warnOnce } from './utils';
 
@@ -20,7 +21,7 @@ export const sentryAndroidGradlePluginVersion = '5.9.0';
  * https://docs.sentry.io/platforms/react-native/manual-setup/manual-setup/#enable-sentry-agp
  */
 export function withSentryAndroidGradlePlugin(
-  config: any,
+  config: ExpoConfig,
   {
     includeProguardMapping = true,
     dexguardEnabled = false,
@@ -30,40 +31,34 @@ export function withSentryAndroidGradlePlugin(
     includeNativeSources = true,
     includeSourceContext = false,
   }: SentryAndroidGradlePluginOptions = {},
-): any {
+): ExpoConfig {
   // Modify android/build.gradle
-  const withSentryProjectBuildGradle = (config: any): any => {
-    return withProjectBuildGradle(config, (projectBuildGradle: any) => {
-      // eslint-disable-next-line @typescript-eslint/no-unsafe-member-access
+  const withSentryProjectBuildGradle = (config: ExpoConfig): ExpoConfig => {
+    return withProjectBuildGradle(config, projectBuildGradle => {
       if (!projectBuildGradle.modResults || !projectBuildGradle.modResults.contents) {
         warnOnce('android/build.gradle content is missing or undefined.');
-        return config;
+        return projectBuildGradle;
       }
-      // eslint-disable-next-line @typescript-eslint/no-unsafe-member-access
       if (projectBuildGradle.modResults.language !== 'groovy') {
         warnOnce('Cannot configure Sentry in android/build.gradle because it is not in Groovy.');
-        return config;
+        return projectBuildGradle;
       }
 
       const dependency = `classpath("io.sentry:sentry-android-gradle-plugin:${sentryAndroidGradlePluginVersion}")`;
 
-      // eslint-disable-next-line @typescript-eslint/no-unsafe-member-access
       if (projectBuildGradle.modResults.contents.includes(dependency)) {
         warnOnce('sentry-android-gradle-plugin dependency in already in android/build.gradle.');
-        return config;
+        return projectBuildGradle;
       }
 
       try {
-        // eslint-disable-next-line @typescript-eslint/no-unsafe-member-access
         const updatedContents = projectBuildGradle.modResults.contents.replace(
           /dependencies\s*{/,
           `dependencies {\n        ${dependency}`,
         );
-        // eslint-disable-next-line @typescript-eslint/no-unsafe-member-access
         if (updatedContents === projectBuildGradle.modResults.contents) {
           warnOnce('Failed to inject the dependency. Could not find `dependencies` in build.gradle.');
         } else {
-          // eslint-disable-next-line @typescript-eslint/no-unsafe-member-access
           projectBuildGradle.modResults.contents = updatedContents;
         }
       } catch (error) {
@@ -74,12 +69,11 @@ export function withSentryAndroidGradlePlugin(
   };
 
   // Modify android/app/build.gradle
-  const withSentryAppBuildGradle = (config: any): any => {
-    return withAppBuildGradle(config, (config: any) => {
-      // eslint-disable-next-line @typescript-eslint/no-unsafe-member-access
-      if (config.modResults.language !== 'groovy') {
+  const withSentryAppBuildGradle = (config: ExpoConfig): ExpoConfig => {
+    return withAppBuildGradle(config, appBuildGradle => {
+      if (appBuildGradle.modResults.language !== 'groovy') {
         warnOnce('Cannot configure Sentry in android/app/build.gradle because it is not in Groovy.');
-        return config;
+        return appBuildGradle;
       }
       const sentryPlugin = `apply plugin: "io.sentry.android.gradle"`;
       const sentryConfig = `
@@ -99,22 +93,18 @@ export function withSentryAndroidGradlePlugin(
       }
   }`;
 
-      // eslint-disable-next-line @typescript-eslint/no-unsafe-member-access
-      let contents = config.modResults.contents;
+      let contents = appBuildGradle.modResults.contents;
 
-      // eslint-disable-next-line @typescript-eslint/no-unsafe-member-access
       if (!contents.includes(sentryPlugin)) {
         contents = `${sentryPlugin}\n${contents}`;
       }
 
-      // eslint-disable-next-line @typescript-eslint/no-unsafe-member-access
       if (!contents.includes('sentry {')) {
         contents = `${contents}\n${sentryConfig}`;
       }
 
-      // eslint-disable-next-line @typescript-eslint/no-unsafe-member-access
-      config.modResults.contents = contents;
-      return config;
+      appBuildGradle.modResults.contents = contents;
+      return appBuildGradle;
     });
   };
 

packages/core/src/js/integrations/sdkinfo.ts

@@ -5,6 +5,13 @@ import { isExpoGo, notWeb } from '../utils/environment';
 import { SDK_NAME, SDK_PACKAGE_NAME, SDK_VERSION } from '../version';
 import { NATIVE } from '../wrapper';
 
+// TODO: Remove this on JS V10.
+interface IpPatchedSdkInfo extends SdkInfoType {
+  settings?: {
+    infer_ip?: 'auto' | 'never';
+  };
+}
+
 const INTEGRATION_NAME = 'SdkInfo';
 
 type DefaultSdkInfo = Pick<Required<SdkInfoType>, 'name' | 'packages' | 'version'>;
@@ -19,13 +26,25 @@ export const defaultSdkInfo: DefaultSdkInfo = {
   ],
   version: SDK_VERSION,
 };
+let DefaultPii: boolean | undefined = undefined;
 
 /** Default SdkInfo instrumentation */
 export const sdkInfoIntegration = (): Integration => {
   const fetchNativeSdkInfo = createCachedFetchNativeSdkInfo();
 
   return {
     name: INTEGRATION_NAME,
+    setup(client) {
+      const options = client.getOptions();
+      DefaultPii = options.sendDefaultPii;
+      if (DefaultPii) {
+        client.on('beforeSendEvent', event => {
+          if (event.user?.ip_address === '{{auto}}') {
+            delete event.user.ip_address;
+          }
+        });
+      }
+    },
     setupOnce: () => {
       // noop
     },
@@ -37,15 +56,24 @@ async function processEvent(event: Event, fetchNativeSdkInfo: () => Promise<Pack
   const nativeSdkPackage = await fetchNativeSdkInfo();
 
   event.platform = event.platform || 'javascript';
-  event.sdk = event.sdk || {};
-  event.sdk.name = event.sdk.name || defaultSdkInfo.name;
-  event.sdk.version = event.sdk.version || defaultSdkInfo.version;
-  event.sdk.packages = [
+  const sdk = (event.sdk || {}) as IpPatchedSdkInfo;
+  sdk.name = sdk.name || defaultSdkInfo.name;
+  sdk.version = sdk.version || defaultSdkInfo.version;
+  sdk.packages = [
     // default packages are added by baseclient and should not be added here
-    ...(event.sdk.packages || []),
+    ...(sdk.packages || []),
     ...((nativeSdkPackage && [nativeSdkPackage]) || []),
   ];
 
+  // Patch missing infer_ip.
+  sdk.settings = {
+    infer_ip: DefaultPii ? 'auto' : 'never',
+    // purposefully allowing already passed settings to override the default
+    ...sdk.settings,
+  };
+
+  event.sdk = sdk;
+
   return event;
 }
 

packages/core/src/js/tracing/timetodisplay.tsx

@@ -3,13 +3,10 @@ import { fill, getActiveSpan, getSpanDescendants, logger, SEMANTIC_ATTRIBUTE_SEN
 import * as React from 'react';
 import { useState } from 'react';
 
-import { isTurboModuleEnabled } from '../utils/environment';
 import { SPAN_ORIGIN_AUTO_UI_TIME_TO_DISPLAY, SPAN_ORIGIN_MANUAL_UI_TIME_TO_DISPLAY } from './origin';
-import { getRNSentryOnDrawReporter, nativeComponentExists } from './timetodisplaynative';
+import { getRNSentryOnDrawReporter } from './timetodisplaynative';
 import { setSpanDurationAsMeasurement, setSpanDurationAsMeasurementOnSpan } from './utils';
 
-let nativeComponentMissingLogged = false;
-
 /**
  * Flags of active spans with manual initial display.
  */
@@ -62,17 +59,6 @@ function TimeToDisplay(props: {
   parentSpanId?: string;
 }): React.ReactElement {
   const RNSentryOnDrawReporter = getRNSentryOnDrawReporter();
-  const isNewArchitecture = isTurboModuleEnabled();
-
-  if (__DEV__ && (isNewArchitecture || (!nativeComponentExists && !nativeComponentMissingLogged))){
-    nativeComponentMissingLogged = true;
-    // Using setTimeout with a delay of 0 milliseconds to defer execution and avoid printing the React stack trace.
-    setTimeout(() => {
-      logger.warn(
-          'TimeToInitialDisplay and TimeToFullDisplay are not supported on the web, Expo Go and New Architecture. Run native build or report an issue at https://github.com/getsentry/sentry-react-native');
-    }, 0);
-  }
-
   return (
     <>
       <RNSentryOnDrawReporter