Merge branch 'main' into capture-app-start-errors-v7

antonis · antonis · commit 3662a660bfe0 · 2026-01-16T14:42:45.000+01:00
# Conflicts:
#	packages/core/android/src/main/java/io/sentry/react/RNSentryModuleImpl.java
#	samples/react-native/android/app/build.gradle
diff --git a/.github/workflows/changelog-preview.yml b/.github/workflows/changelog-preview.yml
@@ -1,6 +1,6 @@
 name: Changelog Preview
 on:
-  pull_request:
+  pull_request_target:
     types:
     - opened
     - synchronize
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -6,7 +6,26 @@
 > make sure you follow our [migration guide](https://docs.sentry.io/platforms/react-native/migration/) first.
 <!-- prettier-ignore-end -->
 
-## Unreleased
+## 7.9.0
+
+### Features
+
+- Experimental support of UI profiling on Android ([#5518](https://github.com/getsentry/sentry-react-native/pull/5518))
+- Expose iOS options to ignore views from subtree traversal ([#5545](https://github.com/getsentry/sentry-react-native/pull/5545))
+  - Use `includedViewClasses` to only traverse specific view classes, or `excludedViewClasses` to skip problematic view classes during session replay and screenshot capture
+  ```js
+  import * as Sentry from '@sentry/react-native';
+
+  Sentry.init({
+    replaysSessionSampleRate: 1.0,
+    integrations: [
+      Sentry.mobileReplayIntegration({
+        includedViewClasses: ['UILabel', 'UIView', 'MyCustomView'],
+        excludedViewClasses: ['WKWebView', 'UIWebView'],
+      }),
+    ],
+  });
+  ```
 
 ### Features
 
diff --git a/dev-packages/e2e-tests/package.json b/dev-packages/e2e-tests/package.json
@@ -1,6 +1,6 @@
 {
   "name": "sentry-react-native-e2e-tests",
-  "version": "7.8.0",
+  "version": "7.9.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.34.0",
-    "@sentry/react-native": "7.8.0",
+    "@sentry/react-native": "7.9.0",
     "@types/node": "^20.9.3",
     "@types/react": "^18.2.64",
     "appium": "2.4.1",
diff --git a/dev-packages/type-check/package.json b/dev-packages/type-check/package.json
@@ -1,7 +1,7 @@
 {
   "name": "sentry-react-native-type-check",
   "private": true,
-  "version": "7.8.0",
+  "version": "7.9.0",
   "scripts": {
     "type-check": "./run-type-check.sh"
   }
diff --git a/dev-packages/utils/package.json b/dev-packages/utils/package.json
@@ -1,6 +1,6 @@
 {
   "name": "sentry-react-native-samples-utils",
-  "version": "7.8.0",
+  "version": "7.9.0",
   "description": "Internal Samples Utils",
   "main": "index.js",
   "license": "MIT",
diff --git a/lerna.json b/lerna.json
@@ -1,6 +1,6 @@
 {
   "$schema": "node_modules/lerna/schemas/lerna-schema.json",
-  "version": "7.8.0",
+  "version": "7.9.0",
   "packages": [
     "packages/*",
     "dev-packages/*",
diff --git a/packages/core/RNSentryCocoaTester/RNSentryCocoaTesterTests/RNSentryReplayOptionsTests.swift b/packages/core/RNSentryCocoaTester/RNSentryCocoaTesterTests/RNSentryReplayOptionsTests.swift
@@ -48,7 +48,7 @@ final class RNSentryReplayOptions: XCTestCase {
     }
 
     func assertAllDefaultReplayOptionsAreNotNil(replayOptions: [String: Any]) {
-        XCTAssertEqual(replayOptions.count, 9)
+        XCTAssertEqual(replayOptions.count, 11)
         XCTAssertNotNil(replayOptions["sessionSampleRate"])
         XCTAssertNotNil(replayOptions["errorSampleRate"])
         XCTAssertNotNil(replayOptions["maskAllImages"])
@@ -58,6 +58,8 @@ final class RNSentryReplayOptions: XCTestCase {
         XCTAssertNotNil(replayOptions["enableViewRendererV2"])
         XCTAssertNotNil(replayOptions["enableFastViewRendering"])
         XCTAssertNotNil(replayOptions["quality"])
+        XCTAssertNotNil(replayOptions["includedViewClasses"])
+        XCTAssertNotNil(replayOptions["excludedViewClasses"])
     }
 
     func testSessionSampleRate() {
@@ -318,4 +320,64 @@ final class RNSentryReplayOptions: XCTestCase {
 
         XCTAssertEqual(actualOptions.sessionReplay.quality, SentryReplayOptions.SentryReplayQuality.medium)
     }
+
+    func testIncludedViewClasses() {
+        let optionsDict = ([
+            "dsn": "https://abc@def.ingest.sentry.io/1234567",
+            "replaysOnErrorSampleRate": 0.75,
+            "mobileReplayOptions": [ "includedViewClasses": ["UILabel", "UIView", "UITextView"] ]
+        ] as NSDictionary).mutableCopy() as! NSMutableDictionary
+
+        RNSentryReplay.updateOptions(optionsDict)
+
+        let actualOptions = try! SentryOptionsInternal.initWithDict(optionsDict as! [String: Any])
+
+        let includedViewClasses = actualOptions.sessionReplay.includedViewClasses
+        XCTAssertEqual(includedViewClasses.count, 3)
+        XCTAssertTrue(includedViewClasses.contains("UILabel"))
+        XCTAssertTrue(includedViewClasses.contains("UIView"))
+        XCTAssertTrue(includedViewClasses.contains("UITextView"))
+    }
+
+    func testExcludedViewClasses() {
+        let optionsDict = ([
+            "dsn": "https://abc@def.ingest.sentry.io/1234567",
+            "replaysOnErrorSampleRate": 0.75,
+            "mobileReplayOptions": [ "excludedViewClasses": ["UICollectionView", "UITableView", "UIScrollView"] ]
+        ] as NSDictionary).mutableCopy() as! NSMutableDictionary
+
+        RNSentryReplay.updateOptions(optionsDict)
+
+        let actualOptions = try! SentryOptionsInternal.initWithDict(optionsDict as! [String: Any])
+
+        let excludedViewClasses = actualOptions.sessionReplay.excludedViewClasses
+        XCTAssertEqual(excludedViewClasses.count, 3)
+        XCTAssertTrue(excludedViewClasses.contains("UICollectionView"))
+        XCTAssertTrue(excludedViewClasses.contains("UITableView"))
+        XCTAssertTrue(excludedViewClasses.contains("UIScrollView"))
+    }
+
+    func testIncludedAndExcludedViewClasses() {
+        let optionsDict = ([
+            "dsn": "https://abc@def.ingest.sentry.io/1234567",
+            "replaysOnErrorSampleRate": 0.75,
+            "mobileReplayOptions": [
+                "includedViewClasses": ["UILabel", "UIView"],
+                "excludedViewClasses": ["UICollectionView"]
+            ]
+        ] as NSDictionary).mutableCopy() as! NSMutableDictionary
+
+        RNSentryReplay.updateOptions(optionsDict)
+
+        let actualOptions = try! SentryOptionsInternal.initWithDict(optionsDict as! [String: Any])
+
+        let includedViewClasses = actualOptions.sessionReplay.includedViewClasses
+        XCTAssertEqual(includedViewClasses.count, 2)
+        XCTAssertTrue(includedViewClasses.contains("UILabel"))
+        XCTAssertTrue(includedViewClasses.contains("UIView"))
+
+        let excludedViewClasses = actualOptions.sessionReplay.excludedViewClasses
+        XCTAssertEqual(excludedViewClasses.count, 1)
+        XCTAssertTrue(excludedViewClasses.contains("UICollectionView"))
+    }
 }
diff --git a/packages/core/android/src/main/java/io/sentry/react/RNSentryVersion.java b/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.8.0";
+  static final String REACT_NATIVE_SDK_PACKAGE_VERSION = "7.9.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";
diff --git a/packages/core/ios/RNSentryReplay.mm b/packages/core/ios/RNSentryReplay.mm
@@ -27,6 +27,9 @@ + (BOOL)updateOptions:(NSMutableDictionary *)options
 
     NSString *qualityString = options[@"replaysSessionQuality"];
 
+    NSArray *includedViewClasses = replayOptions[@"includedViewClasses"];
+    NSArray *excludedViewClasses = replayOptions[@"excludedViewClasses"];
+
     [options setValue:@{
         @"sessionSampleRate" : sessionSampleRate ?: [NSNull null],
         @"errorSampleRate" : errorSampleRate ?: [NSNull null],
@@ -36,6 +39,8 @@ + (BOOL)updateOptions:(NSMutableDictionary *)options
         @"enableViewRendererV2" : replayOptions[@"enableViewRendererV2"] ?: [NSNull null],
         @"enableFastViewRendering" : replayOptions[@"enableFastViewRendering"] ?: [NSNull null],
         @"maskedViewClasses" : [RNSentryReplay getReplayRNRedactClasses:replayOptions],
+        @"includedViewClasses" : includedViewClasses ?: [NSNull null],
+        @"excludedViewClasses" : excludedViewClasses ?: [NSNull null],
         @"sdkInfo" :
             @ { @"name" : REACT_NATIVE_SDK_NAME, @"version" : REACT_NATIVE_SDK_PACKAGE_VERSION }
     }
diff --git a/packages/core/ios/RNSentryVersion.m b/packages/core/ios/RNSentryVersion.m
@@ -3,4 +3,4 @@
 NSString *const NATIVE_SDK_NAME = @"sentry.cocoa.react-native";
 NSString *const REACT_NATIVE_SDK_NAME = @"sentry.javascript.react-native";
 NSString *const REACT_NATIVE_SDK_PACKAGE_NAME = @"npm:@sentry/react-native";
-NSString *const REACT_NATIVE_SDK_PACKAGE_VERSION = @"7.8.0";
+NSString *const REACT_NATIVE_SDK_PACKAGE_VERSION = @"7.9.0";
diff --git a/packages/core/package.json b/packages/core/package.json
@@ -2,7 +2,7 @@
   "name": "@sentry/react-native",
   "homepage": "https://github.com/getsentry/sentry-react-native",
   "repository": "https://github.com/getsentry/sentry-react-native",
-  "version": "7.8.0",
+  "version": "7.9.0",
   "description": "Official Sentry SDK for react-native",
   "typings": "dist/js/index.d.ts",
   "types": "dist/js/index.d.ts",
diff --git a/packages/core/src/js/replay/mobilereplay.ts b/packages/core/src/js/replay/mobilereplay.ts
@@ -81,6 +81,34 @@ export interface MobileReplayOptions {
    */
   enableFastViewRendering?: boolean;
 
+  /**
+   * Array of view class names to include in subtree traversal during session replay and screenshot capture on iOS.
+   *
+   * Only views that are instances of these classes (or subclasses) will be traversed.
+   * This helps prevent crashes when traversing problematic view hierarchies by allowing you to explicitly include only safe view classes.
+   *
+   * If both `includedViewClasses` and `excludedViewClasses` are set, `excludedViewClasses` takes precedence:
+   * views matching excluded classes won't be traversed even if they match an included class.
+   *
+   * @default undefined
+   * @platform ios
+   */
+  includedViewClasses?: string[];
+
+  /**
+   * Array of view class names to exclude from subtree traversal during session replay and screenshot capture on iOS.
+   *
+   * Views of these classes (or subclasses) will be skipped entirely, including all their children.
+   * This helps prevent crashes when traversing problematic view hierarchies by allowing you to explicitly exclude problematic view classes.
+   *
+   * If both `includedViewClasses` and `excludedViewClasses` are set, `excludedViewClasses` takes precedence:
+   * views matching excluded classes won't be traversed even if they match an included class.
+   *
+   * @default undefined
+   * @platform ios
+   */
+  excludedViewClasses?: string[];
+
   /**
    * Sets the screenshot strategy used by the Session Replay integration on Android.
    *
diff --git a/packages/core/src/js/version.ts b/packages/core/src/js/version.ts
@@ -1,3 +1,3 @@
 export const SDK_PACKAGE_NAME = 'npm:@sentry/react-native';
 export const SDK_NAME = 'sentry.javascript.react-native';
-export const SDK_VERSION = '7.8.0';
+export const SDK_VERSION = '7.9.0';
diff --git a/performance-tests/TestAppPlain/package.json b/performance-tests/TestAppPlain/package.json
@@ -1,6 +1,6 @@
 {
   "name": "TestAppPlain",
-  "version": "7.8.0",
+  "version": "7.9.0",
   "private": true,
   "scripts": {
     "android": "react-native run-android",
diff --git a/performance-tests/TestAppSentry/package.json b/performance-tests/TestAppSentry/package.json
@@ -1,6 +1,6 @@
 {
   "name": "TestAppSentry",
-  "version": "7.8.0",
+  "version": "7.9.0",
   "private": true,
   "scripts": {
     "android": "react-native run-android",
@@ -9,7 +9,7 @@
   },
   "dependencies": {
     "@react-native/new-app-screen": "0.80.2",
-    "@sentry/react-native": "7.8.0",
+    "@sentry/react-native": "7.9.0",
     "react": "19.1.0",
     "react-native": "0.80.2"
   },
diff --git a/samples/expo/app.json b/samples/expo/app.json
@@ -5,7 +5,7 @@
     "jsEngine": "hermes",
     "newArchEnabled": true,
     "scheme": "sentry-expo-sample",
-    "version": "7.8.0",
+    "version": "7.9.0",
     "orientation": "portrait",
     "icon": "./assets/icon.png",
     "userInterfaceStyle": "light",
@@ -14,19 +14,21 @@
       "resizeMode": "contain",
       "backgroundColor": "#ffffff"
     },
-    "assetBundlePatterns": ["**/*"],
+    "assetBundlePatterns": [
+      "**/*"
+    ],
     "ios": {
       "supportsTablet": true,
       "bundleIdentifier": "io.sentry.expo.sample",
-      "buildNumber": "66"
+      "buildNumber": "67"
     },
     "android": {
       "adaptiveIcon": {
         "foregroundImage": "./assets/adaptive-icon.png",
         "backgroundColor": "#ffffff"
       },
       "package": "io.sentry.expo.sample",
-      "versionCode": 66
+      "versionCode": 67
     },
     "web": {
       "bundler": "metro",
@@ -88,4 +90,4 @@
       "url": "https://u.expo.dev/00000000-0000-0000-0000-000000000000"
     }
   }
-}
+}
diff --git a/samples/expo/package.json b/samples/expo/package.json
@@ -1,6 +1,6 @@
 {
   "name": "sentry-react-native-expo-sample",
-  "version": "7.8.0",
+  "version": "7.9.0",
   "main": "expo-router/entry",
   "scripts": {
     "start": "expo start",
@@ -23,7 +23,7 @@
   },
   "dependencies": {
     "@sentry/core": "10.34.0",
-    "@sentry/react-native": "7.8.0",
+    "@sentry/react-native": "7.9.0",
     "@types/react": "~19.0.10",
     "expo": "^53.0.0",
     "expo-constants": "~17.1.5",
diff --git a/samples/react-native-macos/package.json b/samples/react-native-macos/package.json
@@ -1,6 +1,6 @@
 {
   "name": "sentry-react-native-macos-sample",
-  "version": "7.8.0",
+  "version": "7.9.0",
   "private": true,
   "scripts": {
     "start": "react-native start --experimental-debugger",
@@ -18,7 +18,7 @@
     "@react-navigation/stack": "^6.3.20",
     "@sentry/core": "10.34.0",
     "@sentry/react": "10.34.0",
-    "@sentry/react-native": "7.8.0",
+    "@sentry/react-native": "7.9.0",
     "delay": "^6.0.0",
     "react": "18.2.0",
     "react-native": "0.73.9",
diff --git a/samples/react-native/android/app/build.gradle b/samples/react-native/android/app/build.gradle
@@ -130,8 +130,8 @@ android {
         applicationId "io.sentry.reactnative.sample"
         minSdkVersion rootProject.ext.minSdkVersion
         targetSdkVersion rootProject.ext.targetSdkVersion
-        versionCode 68
-        versionName "7.8.0"
+        versionCode 69
+        versionName "7.9.0"
         buildConfigField "boolean", "SENTRY_DISABLE_NATIVE_START", System.getenv('SENTRY_DISABLE_NATIVE_START') ?: String.valueOf(sentryDisableNativeStart)
 
         // Detox
diff --git a/samples/react-native/ios/sentryreactnativesample/Info.plist b/samples/react-native/ios/sentryreactnativesample/Info.plist
@@ -19,11 +19,11 @@
 	<key>CFBundlePackageType</key>
 	<string>APPL</string>
 	<key>CFBundleShortVersionString</key>
-	<string>7.8.0</string>
+	<string>7.9.0</string>
 	<key>CFBundleSignature</key>
 	<string>????</string>
 	<key>CFBundleVersion</key>
-	<string>73</string>
+	<string>74</string>
 	<key>LSRequiresIPhoneOS</key>
 	<true />
 	<key>NSAppTransportSecurity</key>
diff --git a/samples/react-native/ios/sentryreactnativesampleTests/Info.plist b/samples/react-native/ios/sentryreactnativesampleTests/Info.plist
@@ -15,10 +15,10 @@
 	<key>CFBundlePackageType</key>
 	<string>BNDL</string>
 	<key>CFBundleShortVersionString</key>
-	<string>7.8.0</string>
+	<string>7.9.0</string>
 	<key>CFBundleSignature</key>
 	<string>????</string>
 	<key>CFBundleVersion</key>
-	<string>73</string>
+	<string>74</string>
 </dict>
 </plist>
diff --git a/samples/react-native/package.json b/samples/react-native/package.json
@@ -1,6 +1,6 @@
 {
   "name": "sentry-react-native-sample",
-  "version": "7.8.0",
+  "version": "7.9.0",
   "private": true,
   "scripts": {
     "android": "react-native run-android",
@@ -46,7 +46,7 @@
     "@reduxjs/toolkit": "^2.8.2",
     "@sentry/core": "10.34.0",
     "@sentry/react": "10.34.0",
-    "@sentry/react-native": "7.8.0",
+    "@sentry/react-native": "7.9.0",
     "@shopify/flash-list": "^2.0.2",
     "delay": "^6.0.0",
     "react": "19.1.0",
diff --git a/yarn.lock b/yarn.lock

Original file line number	Diff line number	Diff line change
`@@ -1,7 +1,7 @@`
`1`	`1`	`{`
`2`	`2`	`"name": "sentry-react-native-type-check",`
`3`	`3`	`"private": true,`
`4`		`- "version": "7.8.0",`
	`4`	`+ "version": "7.9.0",`
`5`	`5`	`"scripts": {`
`6`	`6`	`"type-check": "./run-type-check.sh"`
`7`	`7`	`}`
Original file line number	Diff line number	Diff line change
`@@ -1,6 +1,6 @@`
`1`	`1`	`{`
`2`	`2`	`"name": "sentry-react-native-samples-utils",`
`3`		`- "version": "7.8.0",`
	`3`	`+ "version": "7.9.0",`
`4`	`4`	`"description": "Internal Samples Utils",`
`5`	`5`	`"main": "index.js",`
`6`	`6`	`"license": "MIT",`
Original file line number	Diff line number	Diff line change
`@@ -1,6 +1,6 @@`
`1`	`1`	`{`
`2`	`2`	`"$schema": "node_modules/lerna/schemas/lerna-schema.json",`
`3`		`- "version": "7.8.0",`
	`3`	`+ "version": "7.9.0",`
`4`	`4`	`"packages": [`
`5`	`5`	`"packages/*",`
`6`	`6`	`"dev-packages/*",`