Merge branch 'main' into antonis/rn-0.83.1

Author: antonis

CHANGELOG.md

@@ -6,7 +6,48 @@
 > make sure you follow our [migration guide](https://docs.sentry.io/platforms/react-native/migration/) first.
 <!-- prettier-ignore-end -->
 
-## Unreleased
+## 7.12.0
+
+### Features
+
+- Extends the experimental support of UI profiling to iOS ([#5611](https://github.com/getsentry/sentry-react-native/pull/5611))
+  ```js
+  Sentry.init({
+    _experiments: {
+      profilingOptions: {
+        profileSessionSampleRate: 1.0,
+        lifecycle: 'trace', // or 'manual'
+        startOnAppStart: true,
+      },
+    },
+  });
+  ```
+  - Note that the `androidProfilingOptions` key is now deprecated, and `profilingOptions` should be used instead
+- Add performance tracking for Expo Router route prefetching ([#5606](https://github.com/getsentry/sentry-react-native/pull/5606))
+  - New `wrapExpoRouter` utility to instrument manual `prefetch()` calls with performance spans
+  - New `enablePrefetchTracking` option for `reactNavigationIntegration` to automatically track PRELOAD actions
+  ```tsx
+  // Option 1: Wrap the router for manual prefetch tracking
+  import { wrapExpoRouter } from '@sentry/react-native';
+  import { useRouter } from 'expo-router';
+
+  const router = wrapExpoRouter(useRouter());
+  router.prefetch('/details'); // Creates a span measuring prefetch performance
+
+  // Option 2: Enable automatic prefetch tracking in the integration
+  Sentry.init({
+    integrations: [
+      Sentry.reactNavigationIntegration({
+        enablePrefetchTracking: true,
+      }),
+    ],
+  });
+  ```
+
+### Fixes
+
+- Fix `SENTRY_ALLOW_FAILURE` environment variable not being respected in Xcode build scripts ([#5616](https://github.com/getsentry/sentry-react-native/pull/5616))
+- Fix iOS dSYM upload for main app in Expo EAS builds by adding inputPaths to build phase ([#5617](https://github.com/getsentry/sentry-react-native/pull/5617))
 
 ### Dependencies
 

dev-packages/e2e-tests/package.json

@@ -1,6 +1,6 @@
 {
   "name": "sentry-react-native-e2e-tests",
-  "version": "7.11.0",
+  "version": "7.12.0",
   "private": true,
   "description": "Sentry React Native End to End Tests Library",
   "main": "dist/index.js",
@@ -14,7 +14,7 @@
     "@babel/preset-env": "^7.25.3",
     "@babel/preset-typescript": "^7.18.6",
     "@sentry/core": "10.38.0",
-    "@sentry/react-native": "7.11.0",
+    "@sentry/react-native": "7.12.0",
     "@types/node": "^20.9.3",
     "@types/react": "^18.2.64",
     "appium": "2.4.1",

dev-packages/e2e-tests/patch-scripts/rn.patch.app.js

@@ -27,9 +27,7 @@ Sentry.init({
   release: '${SENTRY_RELEASE}',
   dist: '${SENTRY_DIST}',
   dsn: 'https://1df17bd4e543fdb31351dee1768bb679@o447951.ingest.sentry.io/5428561',
-  _experiments: {
-    replaysOnErrorSampleRate: LaunchArguments.value().replaysOnErrorSampleRate,
-  },
+  replaysOnErrorSampleRate: LaunchArguments.value().replaysOnErrorSampleRate,
   integrations: [
     Sentry.mobileReplayIntegration(),
     Sentry.feedbackIntegration({

dev-packages/type-check/package.json

@@ -1,7 +1,7 @@
 {
   "name": "sentry-react-native-type-check",
   "private": true,
-  "version": "7.11.0",
+  "version": "7.12.0",
   "scripts": {
     "type-check": "./run-type-check.sh"
   }

dev-packages/utils/package.json

@@ -1,6 +1,6 @@
 {
   "name": "sentry-react-native-samples-utils",
-  "version": "7.11.0",
+  "version": "7.12.0",
   "description": "Internal Samples Utils",
   "main": "index.js",
   "license": "MIT",

lerna.json

@@ -1,6 +1,6 @@
 {
   "$schema": "node_modules/lerna/schemas/lerna-schema.json",
-  "version": "7.11.0",
+  "version": "7.12.0",
   "packages": [
     "packages/*",
     "dev-packages/*",

packages/core/android/src/main/java/io/sentry/react/RNSentryModuleImpl.java

@@ -494,47 +494,44 @@ private void configureAndroidProfiling(
     }
 
     @Nullable final ReadableMap experiments = rnOptions.getMap("_experiments");
-    if (experiments == null || !experiments.hasKey("androidProfilingOptions")) {
+    if (experiments == null || !experiments.hasKey("profilingOptions")) {
       return;
     }
 
-    @Nullable
-    final ReadableMap androidProfilingOptions = experiments.getMap("androidProfilingOptions");
-    if (androidProfilingOptions == null) {
+    @Nullable final ReadableMap profilingOptions = experiments.getMap("profilingOptions");
+    if (profilingOptions == null) {
       return;
     }
 
     // Set profile session sample rate
-    if (androidProfilingOptions.hasKey("profileSessionSampleRate")) {
+    if (profilingOptions.hasKey("profileSessionSampleRate")) {
       final double profileSessionSampleRate =
-          androidProfilingOptions.getDouble("profileSessionSampleRate");
+          profilingOptions.getDouble("profileSessionSampleRate");
       options.setProfileSessionSampleRate(profileSessionSampleRate);
       logger.log(
           SentryLevel.INFO,
           String.format(
-              "Android UI Profiling profileSessionSampleRate set to: %.2f",
-              profileSessionSampleRate));
+              "UI Profiling profileSessionSampleRate set to: %.2f", profileSessionSampleRate));
     }
 
     // Set profiling lifecycle mode
-    if (androidProfilingOptions.hasKey("lifecycle")) {
-      final String lifecycle = androidProfilingOptions.getString("lifecycle");
+    if (profilingOptions.hasKey("lifecycle")) {
+      final String lifecycle = profilingOptions.getString("lifecycle");
       if ("manual".equalsIgnoreCase(lifecycle)) {
         options.setProfileLifecycle(ProfileLifecycle.MANUAL);
-        logger.log(SentryLevel.INFO, "Android UI Profile Lifecycle set to MANUAL");
+        logger.log(SentryLevel.INFO, "UI Profile Lifecycle set to MANUAL");
       } else if ("trace".equalsIgnoreCase(lifecycle)) {
         options.setProfileLifecycle(ProfileLifecycle.TRACE);
-        logger.log(SentryLevel.INFO, "Android UI Profile Lifecycle set to TRACE");
+        logger.log(SentryLevel.INFO, "UI Profile Lifecycle set to TRACE");
       }
     }
 
     // Set start on app start
-    if (androidProfilingOptions.hasKey("startOnAppStart")) {
-      final boolean startOnAppStart = androidProfilingOptions.getBoolean("startOnAppStart");
+    if (profilingOptions.hasKey("startOnAppStart")) {
+      final boolean startOnAppStart = profilingOptions.getBoolean("startOnAppStart");
       options.setStartProfilerOnAppStart(startOnAppStart);
       logger.log(
-          SentryLevel.INFO,
-          String.format("Android UI Profiling startOnAppStart set to %b", startOnAppStart));
+          SentryLevel.INFO, String.format("Profiling startOnAppStart set to %b", startOnAppStart));
     }
   }
 

packages/core/android/src/main/java/io/sentry/react/RNSentryVersion.java

@@ -2,7 +2,7 @@
 
 class RNSentryVersion {
   static final String REACT_NATIVE_SDK_PACKAGE_NAME = "npm:@sentry/react-native";
-  static final String REACT_NATIVE_SDK_PACKAGE_VERSION = "7.11.0";
+  static final String REACT_NATIVE_SDK_PACKAGE_VERSION = "7.12.0";
   static final String NATIVE_SDK_NAME = "sentry.native.android.react-native";
   static final String ANDROID_SDK_NAME = "sentry.java.android.react-native";
   static final String REACT_NATIVE_SDK_NAME = "sentry.javascript.react-native";

packages/core/ios/RNSentryExperimentalOptions.h

@@ -37,6 +37,14 @@ NS_ASSUME_NONNULL_BEGIN
 + (void)setEnableSessionReplayInUnreliableEnvironment:(BOOL)enabled
                                         sentryOptions:(SentryOptions *)sentryOptions;
 
+/**
+ * Configures iOS UI profiling options on SentryOptions
+ * @param profilingOptions Dictionary containing profiling configuration
+ * @param sentryOptions The SentryOptions instance to configure
+ */
++ (void)configureProfilingWithOptions:(NSDictionary *)profilingOptions
+                        sentryOptions:(SentryOptions *)sentryOptions;
+
 @end
 
 NS_ASSUME_NONNULL_END

packages/core/ios/RNSentryExperimentalOptions.m

@@ -1,4 +1,5 @@
 #import "RNSentryExperimentalOptions.h"
+#import <Sentry/SentryProfilingConditionals.h>
 @import Sentry;
 
 @implementation RNSentryExperimentalOptions
@@ -36,4 +37,45 @@ + (void)setEnableSessionReplayInUnreliableEnvironment:(BOOL)enabled
     sentryOptions.experimental.enableSessionReplayInUnreliableEnvironment = enabled;
 }
 
++ (void)configureProfilingWithOptions:(NSDictionary *)profilingOptions
+                        sentryOptions:(SentryOptions *)sentryOptions
+{
+#if SENTRY_TARGET_PROFILING_SUPPORTED
+    if (sentryOptions == nil || profilingOptions == nil) {
+        return;
+    }
+
+    sentryOptions.configureProfiling = ^(SentryProfileOptions *_Nonnull profiling) {
+        // Set session sample rate
+        id profileSessionSampleRate = profilingOptions[@"profileSessionSampleRate"];
+        if (profileSessionSampleRate != nil &&
+            [profileSessionSampleRate isKindOfClass:[NSNumber class]]) {
+            profiling.sessionSampleRate = [profileSessionSampleRate floatValue];
+            NSLog(@"Sentry: UI Profiling sessionSampleRate set to: %.2f",
+                profiling.sessionSampleRate);
+        }
+
+        // Set lifecycle mode
+        NSString *lifecycle = profilingOptions[@"lifecycle"];
+        if ([lifecycle isKindOfClass:[NSString class]]) {
+            if ([lifecycle caseInsensitiveCompare:@"manual"] == NSOrderedSame) {
+                profiling.lifecycle = SentryProfileLifecycleManual;
+                NSLog(@"Sentry: UI Profiling Lifecycle set to MANUAL");
+            } else if ([lifecycle caseInsensitiveCompare:@"trace"] == NSOrderedSame) {
+                profiling.lifecycle = SentryProfileLifecycleTrace;
+                NSLog(@"Sentry: UI Profiling Lifecycle set to TRACE");
+            }
+        }
+
+        // Set profile app starts
+        id startOnAppStart = profilingOptions[@"startOnAppStart"];
+        if (startOnAppStart != nil && [startOnAppStart isKindOfClass:[NSNumber class]]) {
+            profiling.profileAppStarts = [startOnAppStart boolValue];
+            NSLog(@"Sentry: UI Profiling profileAppStarts set to %@",
+                profiling.profileAppStarts ? @"YES" : @"NO");
+        }
+    };
+#endif
+}
+
 @end