Merge branch 'main' into feedback-ui-2

antonis · antonis · commit 469134dc511c · 2025-05-15T12:43:41.000+03:00
# Conflicts:
#	CHANGELOG.md
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -16,9 +16,20 @@
 
 ### Fixes
 
+- Fixes Feedback Widget accessibility issue on iOS ([#4739](https://github.com/getsentry/sentry-react-native/pull/4739))
+
+## 6.14.0
+
+### Fixes
+
 - Expo Updates Context is passed to native after native init to be available for crashes ([#4808](https://github.com/getsentry/sentry-react-native/pull/4808))
 - Expo Updates Context values should all be lowercase ([#4809](https://github.com/getsentry/sentry-react-native/pull/4809))
-- Fixes Feedback Widget accessibility issue on iOS ([#4739](https://github.com/getsentry/sentry-react-native/pull/4739))
+- Avoid duplicate network requests (fetch, xhr) by default ([#4816](https://github.com/getsentry/sentry-react-native/pull/4816))
+  - `traceFetch` is disabled by default on mobile as RN uses a polyfill which will be traced by `traceXHR`
+
+### Changes
+
+- Renames `enableExperimentalViewRenderer` to `enableViewRendererV2` which is enabled by default for up to 5x times more performance in Session Replay on iOS ([#4815](https://github.com/getsentry/sentry-react-native/pull/4815))
 
 ### Dependencies
 
@@ -28,14 +39,9 @@
 - Bump Bundler Plugins from v3.3.1 to v3.4.0 ([#4805](https://github.com/getsentry/sentry-react-native/pull/4805))
   - [changelog](https://github.com/getsentry/sentry-javascript-bundler-plugins/blob/main/CHANGELOG.md#340)
   - [diff](https://github.com/getsentry/sentry-javascript-bundler-plugins/compare/3.3.1...3.4.0)
-- Bump Cocoa SDK from v8.49.2 to v8.50.1 ([#4807](https://github.com/getsentry/sentry-react-native/pull/4807), [#4821](https://github.com/getsentry/sentry-react-native/pull/4821))
-  - [changelog](https://github.com/getsentry/sentry-cocoa/blob/main/CHANGELOG.md#8501)
-  - [diff](https://github.com/getsentry/sentry-cocoa/compare/8.49.2...8.50.1)
-
-### Fixes
-
-- Avoid duplicate network requests (fetch, xhr) by default ([#4816](https://github.com/getsentry/sentry-react-native/pull/4816))
-  - `traceFetch` is disabled by default on mobile as RN uses a polyfill which will be traced by `traceXHR`
+- Bump Cocoa SDK from v8.49.2 to v8.50.2 ([#4807](https://github.com/getsentry/sentry-react-native/pull/4807), [#4821](https://github.com/getsentry/sentry-react-native/pull/4821), [#4830](https://github.com/getsentry/sentry-react-native/pull/4830))
+  - [changelog](https://github.com/getsentry/sentry-cocoa/blob/main/CHANGELOG.md#8502)
+  - [diff](https://github.com/getsentry/sentry-cocoa/compare/8.49.2...8.50.2)
 
 ## 6.13.1
 
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": "6.13.1",
+  "version": "6.14.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": "8.54.0",
-    "@sentry/react-native": "6.13.1",
+    "@sentry/react-native": "6.14.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": "6.13.1",
+  "version": "6.14.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": "6.13.1",
+  "version": "6.14.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": "6.13.1",
+  "version": "6.14.0",
   "packages": [
     "packages/*",
     "dev-packages/*",
diff --git a/packages/core/RNSentry.podspec b/packages/core/RNSentry.podspec
@@ -37,7 +37,7 @@ Pod::Spec.new do |s|
 
   s.compiler_flags = other_cflags
 
-  s.dependency 'Sentry/HybridSDK', '8.50.1'
+  s.dependency 'Sentry/HybridSDK', '8.50.2'
 
   if defined? install_modules_dependencies
     # Default React Native dependencies for 0.71 and above (new and legacy architecture)
diff --git a/packages/core/RNSentryCocoaTester/RNSentryCocoaTesterTests/RNSentryReplayOptionsTests.swift b/packages/core/RNSentryCocoaTester/RNSentryCocoaTesterTests/RNSentryReplayOptionsTests.swift
@@ -55,7 +55,7 @@ final class RNSentryReplayOptions: XCTestCase {
         XCTAssertNotNil(replayOptions["maskAllText"])
         XCTAssertNotNil(replayOptions["maskedViewClasses"])
         XCTAssertNotNil(replayOptions["sdkInfo"])
-        XCTAssertNotNil(replayOptions["enableExperimentalViewRenderer"])
+        XCTAssertNotNil(replayOptions["enableViewRendererV2"])
         XCTAssertNotNil(replayOptions["enableFastViewRendering"])
     }
 
@@ -166,8 +166,8 @@ final class RNSentryReplayOptions: XCTestCase {
         XCTAssertEqual(actualOptions.sessionReplay.maskAllText, false)
         XCTAssertEqual(actualOptions.sessionReplay.maskedViewClasses.count, 0)
     }
-    
-    func testEnableExperimentalViewRendererDefault() {
+
+    func testEnableViewRendererV2Default() {
         let optionsDict = ([
             "dsn": "https://abc@def.ingest.sentry.io/1234567",
             "replaysOnErrorSampleRate": 0.75
@@ -177,37 +177,37 @@ final class RNSentryReplayOptions: XCTestCase {
 
         let actualOptions = try! Options(dict: optionsDict as! [String: Any])
 
-        XCTAssertFalse(actualOptions.sessionReplay.enableExperimentalViewRenderer)
+        XCTAssertTrue(actualOptions.sessionReplay.enableViewRendererV2)
     }
-    
-    func testEnableExperimentalViewRendererTrue() {
+
+    func testEnableViewRendererV2True() {
         let optionsDict = ([
             "dsn": "https://abc@def.ingest.sentry.io/1234567",
             "replaysOnErrorSampleRate": 0.75,
-            "mobileReplayOptions": [ "enableExperimentalViewRenderer": true ]
+            "mobileReplayOptions": [ "enableViewRendererV2": true ]
         ] as NSDictionary).mutableCopy() as! NSMutableDictionary
 
         RNSentryReplay.updateOptions(optionsDict)
 
         let actualOptions = try! Options(dict: optionsDict as! [String: Any])
 
-        XCTAssertTrue(actualOptions.sessionReplay.enableExperimentalViewRenderer)
+        XCTAssertTrue(actualOptions.sessionReplay.enableViewRendererV2)
     }
-    
-    func testEnableExperimentalViewRendererFalse() {
+
+    func testEnableViewRendererV2False() {
         let optionsDict = ([
             "dsn": "https://abc@def.ingest.sentry.io/1234567",
             "replaysOnErrorSampleRate": 0.75,
-            "mobileReplayOptions": [ "enableExperimentalViewRenderer": false ]
+            "mobileReplayOptions": [ "enableViewRendererV2": false ]
         ] as NSDictionary).mutableCopy() as! NSMutableDictionary
 
         RNSentryReplay.updateOptions(optionsDict)
 
         let actualOptions = try! Options(dict: optionsDict as! [String: Any])
 
-        XCTAssertFalse(actualOptions.sessionReplay.enableExperimentalViewRenderer)
+        XCTAssertFalse(actualOptions.sessionReplay.enableViewRendererV2)
     }
-    
+
     func testEnableFastViewRenderingDefault() {
         let optionsDict = ([
             "dsn": "https://abc@def.ingest.sentry.io/1234567",
@@ -220,7 +220,7 @@ final class RNSentryReplayOptions: XCTestCase {
 
         XCTAssertFalse(actualOptions.sessionReplay.enableFastViewRendering)
     }
-    
+
     func testEnableFastViewRenderingTrue() {
         let optionsDict = ([
             "dsn": "https://abc@def.ingest.sentry.io/1234567",
@@ -234,7 +234,7 @@ final class RNSentryReplayOptions: XCTestCase {
 
         XCTAssertTrue(actualOptions.sessionReplay.enableFastViewRendering)
     }
-    
+
     func testEnableFastViewRenderingFalse() {
         let optionsDict = ([
             "dsn": "https://abc@def.ingest.sentry.io/1234567",
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 = "6.13.1";
+  static final String REACT_NATIVE_SDK_PACKAGE_VERSION = "6.14.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,8 +27,7 @@ + (void)updateOptions:(NSMutableDictionary *)options
         @"errorSampleRate" : options[@"replaysOnErrorSampleRate"] ?: [NSNull null],
         @"maskAllImages" : replayOptions[@"maskAllImages"] ?: [NSNull null],
         @"maskAllText" : replayOptions[@"maskAllText"] ?: [NSNull null],
-        @"enableExperimentalViewRenderer" : replayOptions[@"enableExperimentalViewRenderer"]
-            ?: [NSNull null],
+        @"enableViewRendererV2" : replayOptions[@"enableViewRendererV2"] ?: [NSNull null],
         @"enableFastViewRendering" : replayOptions[@"enableFastViewRendering"] ?: [NSNull null],
         @"maskedViewClasses" : [RNSentryReplay getReplayRNRedactClasses:replayOptions],
         @"sdkInfo" :
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 = @"6.13.1";
+NSString *const REACT_NATIVE_SDK_PACKAGE_VERSION = @"6.14.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": "6.13.1",
+  "version": "6.14.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
@@ -40,10 +40,24 @@ export interface MobileReplayOptions {
    *
    * - Experiment: This is an experimental feature and is therefore disabled by default.
    *
-   * @default false
+   * @deprecated Use `enableViewRendererV2` instead.
    */
   enableExperimentalViewRenderer?: boolean;
 
+  /**
+   * Enables up to 5x faster new view renderer used by the Session Replay integration on iOS.
+   *
+   * Enabling this flag will reduce the amount of time it takes to render each frame of the session replay on the main thread, therefore reducing
+   * interruptions and visual lag. [Our benchmarks](https://github.com/getsentry/sentry-cocoa/pull/4940) have shown a significant improvement of
+   * **up to 4-5x faster rendering** (reducing `~160ms` to `~36ms` per frame) on older devices.
+   *
+   * - Experiment: In case you are noticing issues with the new view renderer, please report the issue on [GitHub](https://github.com/getsentry/sentry-cocoa).
+   *               Eventually, we will remove this feature flag and use the new view renderer by default.
+   *
+   * @default true
+   */
+  enableViewRendererV2?: boolean;
+
   /**
    * Enables up to 5x faster but incomplete view rendering used by the Session Replay integration on iOS.
    *
@@ -63,9 +77,23 @@ const defaultOptions: Required<MobileReplayOptions> = {
   maskAllImages: true,
   maskAllVectors: true,
   enableExperimentalViewRenderer: false,
+  enableViewRendererV2: true,
   enableFastViewRendering: false,
 };
 
+function mergeOptions(initOptions: Partial<MobileReplayOptions>): Required<MobileReplayOptions> {
+  const merged = {
+    ...defaultOptions,
+    ...initOptions,
+  };
+
+  if (initOptions.enableViewRendererV2 === undefined && initOptions.enableExperimentalViewRenderer !== undefined) {
+    merged.enableViewRendererV2 = initOptions.enableExperimentalViewRenderer;
+  }
+
+  return merged;
+}
+
 type MobileReplayIntegration = Integration & {
   options: Required<MobileReplayOptions>;
 };
@@ -100,7 +128,7 @@ export const mobileReplayIntegration = (initOptions: MobileReplayOptions = defau
     return mobileReplayIntegrationNoop();
   }
 
-  const options = { ...defaultOptions, ...initOptions };
+  const options = mergeOptions(initOptions);
 
   async function processEvent(event: Event): Promise<Event> {
     const hasException = event.exception && event.exception.values && event.exception.values.length > 0;
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 = '6.13.1';
+export const SDK_VERSION = '6.14.0';
diff --git a/performance-tests/TestAppPlain/package.json b/performance-tests/TestAppPlain/package.json
@@ -1,6 +1,6 @@
 {
   "name": "TestAppPlain",
-  "version": "6.13.1",
+  "version": "6.14.0",
   "private": true,
   "scripts": {
     "android": "react-native run-android",
diff --git a/performance-tests/TestAppSentry/package.json b/performance-tests/TestAppSentry/package.json
@@ -1,14 +1,14 @@
 {
   "name": "TestAppSentry",
-  "version": "6.13.1",
+  "version": "6.14.0",
   "private": true,
   "scripts": {
     "android": "react-native run-android",
     "ios": "react-native run-ios",
     "start": "react-native start"
   },
   "dependencies": {
-    "@sentry/react-native": "6.13.1",
+    "@sentry/react-native": "6.14.0",
     "react": "18.1.0",
     "react-native": "0.70.15"
   },
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": "6.13.1",
+    "version": "6.14.0",
     "orientation": "portrait",
     "icon": "./assets/icon.png",
     "userInterfaceStyle": "light",
@@ -20,15 +20,15 @@
     "ios": {
       "supportsTablet": true,
       "bundleIdentifier": "io.sentry.expo.sample",
-      "buildNumber": "46"
+      "buildNumber": "47"
     },
     "android": {
       "adaptiveIcon": {
         "foregroundImage": "./assets/adaptive-icon.png",
         "backgroundColor": "#ffffff"
       },
       "package": "io.sentry.expo.sample",
-      "versionCode": 46
+      "versionCode": 47
     },
     "web": {
       "bundler": "metro",
@@ -93,4 +93,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": "6.13.1",
+  "version": "6.14.0",
   "main": "expo-router/entry",
   "scripts": {
     "start": "expo start",
@@ -17,7 +17,7 @@
     "eas-build-pre-install": "npm i -g corepack && yarn install --no-immutable --inline-builds && yarn workspace @sentry/react-native build"
   },
   "dependencies": {
-    "@sentry/react-native": "6.13.1",
+    "@sentry/react-native": "6.14.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": "6.13.1",
+  "version": "6.14.0",
   "private": true,
   "scripts": {
     "start": "react-native start --experimental-debugger",
@@ -18,7 +18,7 @@
     "@react-navigation/stack": "^6.3.20",
     "@sentry/core": "8.54.0",
     "@sentry/react": "8.54.0",
-    "@sentry/react-native": "6.13.1",
+    "@sentry/react-native": "6.14.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
@@ -136,8 +136,8 @@ android {
         applicationId "io.sentry.reactnative.sample"
         minSdkVersion rootProject.ext.minSdkVersion
         targetSdkVersion rootProject.ext.targetSdkVersion
-        versionCode 48
-        versionName "6.13.1"
+        versionCode 49
+        versionName "6.14.0"
     }
 
     signingConfigs {
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>6.13.1</string>
+	<string>6.14.0</string>
 	<key>CFBundleSignature</key>
 	<string>????</string>
 	<key>CFBundleVersion</key>
-	<string>53</string>
+	<string>54</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
diff --git a/samples/react-native/package.json b/samples/react-native/package.json
diff --git a/samples/react-native/src/App.tsx b/samples/react-native/src/App.tsx
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": "6.13.1",`
	`4`	`+ "version": "6.14.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": "6.13.1",`
	`3`	`+ "version": "6.14.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": "6.13.1",`
	`3`	`+ "version": "6.14.0",`
`4`	`4`	`"packages": [`
`5`	`5`	`"packages/*",`
`6`	`6`	`"dev-packages/*",`