Merge branch 'main' into v7

antonis · antonis · commit cf9975bde9a9 · 2025-07-10T13:43:20.000+03:00
# Conflicts:
#	CHANGELOG.md
#	dev-packages/e2e-tests/package.json
#	dev-packages/type-check/package.json
#	dev-packages/utils/package.json
#	lerna.json
#	packages/core/android/build.gradle
#	packages/core/android/src/main/java/io/sentry/react/RNSentryVersion.java
#	packages/core/ios/RNSentryVersion.m
#	packages/core/package.json
#	packages/core/src/js/version.ts
#	performance-tests/TestAppPlain/package.json
#	performance-tests/TestAppSentry/package.json
#	samples/expo/app.json
#	samples/expo/package.json
#	samples/react-native-macos/package.json
#	samples/react-native/android/app/build.gradle
#	samples/react-native/ios/sentryreactnativesample/Info.plist
#	samples/react-native/ios/sentryreactnativesampleTests/Info.plist
#	samples/react-native/package.json
#	yarn.lock
diff --git a/.github/workflows/codeql-analysis.yml b/.github/workflows/codeql-analysis.yml
@@ -44,7 +44,7 @@ jobs:
 
       # Initializes the CodeQL tools for scanning.
       - name: Initialize CodeQL
-        uses: github/codeql-action/init@39edc492dbe16b1465b0cafca41432d857bdb31a # pin@v3.29.1
+        uses: github/codeql-action/init@181d5eefc20863364f96762470ba6f862bdef56b # pin@v3.29.2
         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@39edc492dbe16b1465b0cafca41432d857bdb31a # pin@v3.29.1
+        uses: github/codeql-action/autobuild@181d5eefc20863364f96762470ba6f862bdef56b # pin@v3.29.2
 
       # ℹ️ 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@39edc492dbe16b1465b0cafca41432d857bdb31a # pin@v3.29.1
+        uses: github/codeql-action/analyze@181d5eefc20863364f96762470ba6f862bdef56b # pin@v3.29.2
diff --git a/.github/workflows/update-deps.yml b/.github/workflows/update-deps.yml
@@ -86,3 +86,14 @@ jobs:
       changelog-entry: false
     secrets:
       api-token: ${{ secrets.CI_DEPLOY_KEY }}
+
+  sentry-android-gradle-plugin:
+    uses: getsentry/github-workflows/.github/workflows/updater.yml@v2
+    with:
+      path: scripts/update-sentry-android-gradle-plugin.sh
+      name: Sentry Android Gradle Plugin
+      pattern: '^[0-9.]+$'
+      pr-strategy: update
+      changelog-entry: false
+    secrets:
+      api-token: ${{ secrets.CI_DEPLOY_KEY }}
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -192,6 +192,31 @@ Version 7 of the SDK is compatible with Sentry self-hosted versions 24.4.2 or hi
   - [changelog](https://github.com/getsentry/sentry-java/blob/main/CHANGELOG.md#8132)
   - [diff](https://github.com/getsentry/sentry-java/compare/7.20.1...8.13.2)
 
+## 6.17.0
+
+### Features
+
+- Add experimental flag `enableUnhandledCPPExceptionsV2` on iOS ([#4975](https://github.com/getsentry/sentry-react-native/pull/4975))
+
+  ```js
+  import * as Sentry from '@sentry/react-native';
+
+  Sentry.init({
+    _experiments: {
+      enableUnhandledCPPExceptionsV2: true,
+    },
+  });
+  ```
+
+### Dependencies
+
+- Bump CLI from v2.46.0 to v2.47.0 ([#4979](https://github.com/getsentry/sentry-react-native/pull/4979))
+  - [changelog](https://github.com/getsentry/sentry-cli/blob/master/CHANGELOG.md#2470)
+  - [diff](https://github.com/getsentry/sentry-cli/compare/2.46.0...2.47.0)
+- Bump Android SDK from v7.22.5 to v7.22.6 ([#4985](https://github.com/getsentry/sentry-react-native/pull/4985))
+  - [changelog](https://github.com/getsentry/sentry-java/blob/main/CHANGELOG.md#7226)
+  - [diff](https://github.com/getsentry/sentry-java/compare/7.22.5...7.22.6)
+
 ## 6.16.1
 
 ### Fixes
diff --git a/package.json b/package.json
@@ -30,7 +30,7 @@
   "devDependencies": {
     "@expo/swiftlint": "^0.57.1",
     "@naturalcycles/ktlint": "^1.13.0",
-    "@sentry/cli": "2.46.0",
+    "@sentry/cli": "2.47.0",
     "clang-format": "^1.8.0",
     "downlevel-dts": "^0.11.0",
     "google-java-format": "^1.4.0",
diff --git a/packages/core/RNSentryCocoaTester/RNSentryCocoaTesterTests/RNSentryTests.mm b/packages/core/RNSentryCocoaTester/RNSentryCocoaTesterTests/RNSentryTests.mm
@@ -239,6 +239,82 @@ - (void)testCreateOptionsWithDictionarySpotlightZero
     XCTAssertFalse(actualOptions.enableSpotlight, @"Did not disable spotlight");
 }
 
+- (void)testCreateOptionsWithDictionaryEnableUnhandledCPPExceptionsV2Enabled
+{
+    RNSentry *rnSentry = [[RNSentry alloc] init];
+    NSError *error = nil;
+
+    NSDictionary *_Nonnull mockedReactNativeDictionary = @{
+        @"dsn" : @"https://abcd@efgh.ingest.sentry.io/123456",
+        @"_experiments" : @ {
+            @"enableUnhandledCPPExceptionsV2" : @YES,
+        },
+    };
+    SentryOptions *actualOptions = [rnSentry createOptionsWithDictionary:mockedReactNativeDictionary
+                                                                   error:&error];
+
+    XCTAssertNotNil(actualOptions, @"Did not create sentry options");
+    XCTAssertNil(error, @"Should not pass no error");
+
+    id experimentalOptions = [actualOptions valueForKey:@"experimental"];
+    XCTAssertNotNil(experimentalOptions, @"Experimental options should not be nil");
+
+    BOOL enableUnhandledCPPExceptions =
+        [[experimentalOptions valueForKey:@"enableUnhandledCPPExceptionsV2"] boolValue];
+    XCTAssertTrue(
+        enableUnhandledCPPExceptions, @"enableUnhandledCPPExceptionsV2 should be enabled");
+}
+
+- (void)testCreateOptionsWithDictionaryEnableUnhandledCPPExceptionsV2Disabled
+{
+    RNSentry *rnSentry = [[RNSentry alloc] init];
+    NSError *error = nil;
+
+    NSDictionary *_Nonnull mockedReactNativeDictionary = @{
+        @"dsn" : @"https://abcd@efgh.ingest.sentry.io/123456",
+        @"_experiments" : @ {
+            @"enableUnhandledCPPExceptionsV2" : @NO,
+        },
+    };
+    SentryOptions *actualOptions = [rnSentry createOptionsWithDictionary:mockedReactNativeDictionary
+                                                                   error:&error];
+
+    XCTAssertNotNil(actualOptions, @"Did not create sentry options");
+    XCTAssertNil(error, @"Should not pass no error");
+
+    id experimentalOptions = [actualOptions valueForKey:@"experimental"];
+    XCTAssertNotNil(experimentalOptions, @"Experimental options should not be nil");
+
+    BOOL enableUnhandledCPPExceptions =
+        [[experimentalOptions valueForKey:@"enableUnhandledCPPExceptionsV2"] boolValue];
+    XCTAssertFalse(
+        enableUnhandledCPPExceptions, @"enableUnhandledCPPExceptionsV2 should be disabled");
+}
+
+- (void)testCreateOptionsWithDictionaryEnableUnhandledCPPExceptionsV2Default
+{
+    RNSentry *rnSentry = [[RNSentry alloc] init];
+    NSError *error = nil;
+
+    NSDictionary *_Nonnull mockedReactNativeDictionary = @{
+        @"dsn" : @"https://abcd@efgh.ingest.sentry.io/123456",
+    };
+    SentryOptions *actualOptions = [rnSentry createOptionsWithDictionary:mockedReactNativeDictionary
+                                                                   error:&error];
+
+    XCTAssertNotNil(actualOptions, @"Did not create sentry options");
+    XCTAssertNil(error, @"Should not pass no error");
+
+    // Test that when no _experiments are provided, the experimental option defaults to false
+    id experimentalOptions = [actualOptions valueForKey:@"experimental"];
+    XCTAssertNotNil(experimentalOptions, @"Experimental options should not be nil");
+
+    BOOL enableUnhandledCPPExceptions =
+        [[experimentalOptions valueForKey:@"enableUnhandledCPPExceptionsV2"] boolValue];
+    XCTAssertFalse(
+        enableUnhandledCPPExceptions, @"enableUnhandledCPPExceptionsV2 should default to disabled");
+}
+
 - (void)testPassesErrorOnWrongDsn
 {
     RNSentry *rnSentry = [[RNSentry alloc] init];
diff --git a/packages/core/ios/RNSentry.mm b/packages/core/ios/RNSentry.mm
@@ -49,6 +49,7 @@
 #    import "RNSentryRNSScreen.h"
 #endif
 
+#import "RNSentryExperimentalOptions.h"
 #import "RNSentryVersion.h"
 
 @interface
@@ -305,6 +306,14 @@ - (SentryOptions *_Nullable)createOptionsWithDictionary:(NSDictionary *_Nonnull)
     // Failed requests can only be enabled in one SDK to avoid duplicates
     sentryOptions.enableCaptureFailedRequests = NO;
 
+    NSDictionary *experiments = options[@"_experiments"];
+    if (experiments != nil && [experiments isKindOfClass:[NSDictionary class]]) {
+        BOOL enableUnhandledCPPExceptions =
+            [experiments[@"enableUnhandledCPPExceptionsV2"] boolValue];
+        [RNSentryExperimentalOptions setEnableUnhandledCPPExceptionsV2:enableUnhandledCPPExceptions
+                                                         sentryOptions:sentryOptions];
+    }
+
     return sentryOptions;
 }
 
diff --git a/packages/core/ios/RNSentryExperimentalOptions.h b/packages/core/ios/RNSentryExperimentalOptions.h
@@ -0,0 +1,26 @@
+#import <Foundation/Foundation.h>
+
+@class SentryOptions;
+
+NS_ASSUME_NONNULL_BEGIN
+
+@interface RNSentryExperimentalOptions : NSObject
+
+/**
+ * Sets the enableUnhandledCPPExceptionsV2 experimental option on SentryOptions
+ * @param sentryOptions The SentryOptions instance to configure
+ * @param enabled Whether to enable unhandled C++ exceptions V2
+ */
++ (void)setEnableUnhandledCPPExceptionsV2:(BOOL)enabled
+                            sentryOptions:(SentryOptions *)sentryOptions;
+
+/**
+ * Gets the current value of enableUnhandledCPPExceptionsV2 experimental option
+ * @param sentryOptions The SentryOptions instance to read from
+ * @return The current value of enableUnhandledCPPExceptionsV2
+ */
++ (BOOL)getEnableUnhandledCPPExceptionsV2:(SentryOptions *)sentryOptions;
+
+@end
+
+NS_ASSUME_NONNULL_END
diff --git a/packages/core/ios/RNSentryExperimentalOptions.m b/packages/core/ios/RNSentryExperimentalOptions.m
@@ -0,0 +1,22 @@
+#import "RNSentryExperimentalOptions.h"
+@import Sentry;
+
+@implementation RNSentryExperimentalOptions
+
++ (void)setEnableUnhandledCPPExceptionsV2:(BOOL)enabled sentryOptions:(SentryOptions *)sentryOptions
+{
+    if (sentryOptions == nil) {
+        return;
+    }
+    sentryOptions.experimental.enableUnhandledCPPExceptionsV2 = enabled;
+}
+
++ (BOOL)getEnableUnhandledCPPExceptionsV2:(SentryOptions *)sentryOptions
+{
+    if (sentryOptions == nil) {
+        return NO;
+    }
+    return sentryOptions.experimental.enableUnhandledCPPExceptionsV2;
+}
+
+@end
diff --git a/packages/core/package.json b/packages/core/package.json
@@ -67,7 +67,7 @@
   "dependencies": {
     "@sentry/babel-plugin-component-annotate": "3.5.0",
     "@sentry/browser": "9.22.0",
-    "@sentry/cli": "2.46.0",
+    "@sentry/cli": "2.47.0",
     "@sentry/core": "9.22.0",
     "@sentry/react": "9.22.0",
     "@sentry/types": "9.22.0"
@@ -80,7 +80,7 @@
     "@sentry-internal/eslint-config-sdk": "9.22.0",
     "@sentry-internal/eslint-plugin-sdk": "9.22.0",
     "@sentry-internal/typescript": "9.22.0",
-    "@sentry/wizard": "5.1.0",
+    "@sentry/wizard": "5.3.0",
     "@testing-library/react-native": "^12.7.2",
     "@types/jest": "^29.5.13",
     "@types/node": "^20.9.3",
diff --git a/packages/core/plugin/src/withSentryAndroidGradlePlugin.ts b/packages/core/plugin/src/withSentryAndroidGradlePlugin.ts
@@ -12,6 +12,8 @@ export interface SentryAndroidGradlePluginOptions {
   includeSourceContext?: boolean;
 }
 
+export const sentryAndroidGradlePluginVersion = '5.8.0';
+
 /**
  * Adds the Sentry Android Gradle Plugin to the project.
  * https://docs.sentry.io/platforms/react-native/manual-setup/manual-setup/#enable-sentry-agp
@@ -28,8 +30,6 @@ export function withSentryAndroidGradlePlugin(
     includeSourceContext = false,
   }: SentryAndroidGradlePluginOptions = {},
 ): any {
-  const version = '4.14.1';
-
   // Modify android/build.gradle
   const withSentryProjectBuildGradle = (config: any): any => {
     return withProjectBuildGradle(config, (projectBuildGradle: any) => {
@@ -44,7 +44,7 @@ export function withSentryAndroidGradlePlugin(
         return config;
       }
 
-      const dependency = `classpath("io.sentry:sentry-android-gradle-plugin:${version}")`;
+      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)) {
diff --git a/packages/core/src/js/options.ts b/packages/core/src/js/options.ts
@@ -263,6 +263,17 @@ export interface BaseReactNativeOptions {
      * This will be removed in the next major version.
      */
     replaysOnErrorSampleRate?: number;
+
+    /**
+     * Experiment: A more reliable way to report unhandled C++ exceptions in iOS.
+     *
+     * This approach hooks into all instances of the `__cxa_throw` function, which provides a more comprehensive and consistent exception handling across an app’s runtime, regardless of the number of C++ modules or how they’re linked. It helps in obtaining accurate stack traces.
+     *
+     * - Note: The mechanism of hooking into `__cxa_throw` could cause issues with symbolication on iOS due to caching of symbol references.
+     *
+     * @default false
+     */
+    enableUnhandledCPPExceptionsV2?: boolean;
   };
 
   /**
diff --git a/packages/core/test/expo-plugin/withSentryAndroidGradlePlugin.test.ts b/packages/core/test/expo-plugin/withSentryAndroidGradlePlugin.test.ts
@@ -1,7 +1,10 @@
 import { withAppBuildGradle, withProjectBuildGradle } from '@expo/config-plugins';
 import { warnOnce } from '../../plugin/src/utils';
 import type { SentryAndroidGradlePluginOptions } from '../../plugin/src/withSentryAndroidGradlePlugin';
-import { withSentryAndroidGradlePlugin } from '../../plugin/src/withSentryAndroidGradlePlugin';
+import {
+  sentryAndroidGradlePluginVersion,
+  withSentryAndroidGradlePlugin,
+} from '../../plugin/src/withSentryAndroidGradlePlugin';
 
 jest.mock('@expo/config-plugins', () => ({
   withProjectBuildGradle: jest.fn(),
@@ -42,7 +45,6 @@ describe('withSentryAndroidGradlePlugin', () => {
   });
 
   it('adds the Sentry plugin to build.gradle when enableAndroidGradlePlugin is enabled', () => {
-    const version = '4.14.1';
     const options: SentryAndroidGradlePluginOptions = { enableAndroidGradlePlugin: true };
 
     (withProjectBuildGradle as jest.Mock).mockImplementation((config, callback) => {
@@ -64,13 +66,12 @@ describe('withSentryAndroidGradlePlugin', () => {
     });
 
     expect(modifiedGradle.modResults.contents).toContain(
-      `classpath("io.sentry:sentry-android-gradle-plugin:${version}")`,
+      `classpath("io.sentry:sentry-android-gradle-plugin:${sentryAndroidGradlePluginVersion}")`,
     );
   });
 
   it('warnOnce if the Sentry plugin is already included in build.gradle', () => {
-    const version = '4.14.1';
-    const includedBuildGradle = `dependencies { classpath("io.sentry:sentry-android-gradle-plugin:${version}")}`;
+    const includedBuildGradle = `dependencies { classpath("io.sentry:sentry-android-gradle-plugin:${sentryAndroidGradlePluginVersion}")}`;
     const options: SentryAndroidGradlePluginOptions = { enableAndroidGradlePlugin: true };
 
     (withProjectBuildGradle as jest.Mock).mockImplementation((config, callback) => {
diff --git a/samples/expo/app.json b/samples/expo/app.json
@@ -20,15 +20,15 @@
     "ios": {
       "supportsTablet": true,
       "bundleIdentifier": "io.sentry.expo.sample",
-      "buildNumber": "51"
+      "buildNumber": "52"
     },
     "android": {
       "adaptiveIcon": {
         "foregroundImage": "./assets/adaptive-icon.png",
         "backgroundColor": "#ffffff"
       },
       "package": "io.sentry.expo.sample",
-      "versionCode": 51
+      "versionCode": 52
     },
     "web": {
       "bundler": "metro",
diff --git a/samples/react-native/android/app/build.gradle b/samples/react-native/android/app/build.gradle
@@ -136,7 +136,7 @@ android {
         applicationId "io.sentry.reactnative.sample"
         minSdkVersion rootProject.ext.minSdkVersion
         targetSdkVersion rootProject.ext.targetSdkVersion
-        versionCode 53
+        versionCode 54
         versionName "7.0.0-beta.1"
     }
 
diff --git a/samples/react-native/android/build.gradle b/samples/react-native/android/build.gradle
@@ -16,7 +16,7 @@ buildscript {
         classpath("com.android.tools.build:gradle")
         classpath("com.facebook.react:react-native-gradle-plugin")
         classpath("org.jetbrains.kotlin:kotlin-gradle-plugin")
-        classpath("io.sentry:sentry-android-gradle-plugin:4.2.0")
+        classpath("io.sentry:sentry-android-gradle-plugin:5.8.0")
     }
 }
 
diff --git a/samples/react-native/ios/sentryreactnativesample/Info.plist b/samples/react-native/ios/sentryreactnativesample/Info.plist
@@ -23,7 +23,7 @@
 	<key>CFBundleSignature</key>
 	<string>????</string>
 	<key>CFBundleVersion</key>
-	<string>58</string>
+	<string>59</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
@@ -19,6 +19,6 @@
 	<key>CFBundleSignature</key>
 	<string>????</string>
 	<key>CFBundleVersion</key>
-	<string>58</string>
+	<string>59</string>
 </dict>
 </plist>
diff --git a/samples/react-native/src/App.tsx b/samples/react-native/src/App.tsx
@@ -86,6 +86,7 @@ Sentry.init({
     beforeSendLog: (log) => {
       return log;
     },
+    enableUnhandledCPPExceptionsV2: true,
   },
   enableUserInteractionTracing: true,
   integrations(integrations) {
diff --git a/scripts/update-sentry-android-gradle-plugin.sh b/scripts/update-sentry-android-gradle-plugin.sh
diff --git a/yarn.lock b/yarn.lock
