Merge branch 'v8' into antonis/cocoa-9.1.1

antonis · web-flow · commit 185e9090b188 · 2026-01-15T15:32:47.000+01:00
diff --git a/.claude/settings.json b/.claude/settings.json
@@ -0,0 +1,115 @@
+{
+  "permissions": {
+    "allow": [
+      "Bash(ls:*)",
+      "Bash(pwd:*)",
+      "Bash(file:*)",
+      "Bash(stat:*)",
+      "Bash(wc:*)",
+      "Bash(head:*)",
+      "Bash(tail:*)",
+      "Bash(cat:*)",
+      "Bash(tree:*)",
+      "Bash(find:*)",
+      "Bash(git status:*)",
+      "Bash(git log:*)",
+      "Bash(git diff:*)",
+      "Bash(git show:*)",
+      "Bash(git branch:*)",
+      "Bash(git remote:*)",
+      "Bash(git tag:*)",
+      "Bash(git stash list:*)",
+      "Bash(git rev-parse:*)",
+      "Bash(git fetch:*)",
+      "Bash(git ls-files:*)",
+      "Bash(git blame:*)",
+      "Bash(gh pr view:*)",
+      "Bash(gh pr list:*)",
+      "Bash(gh pr checks:*)",
+      "Bash(gh pr diff:*)",
+      "Bash(gh issue view:*)",
+      "Bash(gh issue list:*)",
+      "Bash(gh run view:*)",
+      "Bash(gh run list:*)",
+      "Bash(gh run logs:*)",
+      "Bash(gh repo view:*)",
+      "Bash(gh api:*)",
+      "Bash(yarn --version:*)",
+      "Bash(yarn install:*)",
+      "Bash(yarn build:*)",
+      "Bash(yarn test:*)",
+      "Bash(yarn lint:*)",
+      "Bash(yarn fix:*)",
+      "Bash(npm --version:*)",
+      "Bash(node --version:*)",
+      "Bash(npx --version:*)",
+      "Bash(npx expo prebuild)",
+      "Bash(react-native --version:*)",
+      "Bash(metro --version:*)",
+      "Bash(jest --version:*)",
+      "Bash(tsc --version:*)",
+      "Bash(typescript --version:*)",
+      "Bash(make --version:*)",
+      "Bash(make -n:*)",
+      "Bash(make help:*)",
+      "Bash(xcodebuild -version:*)",
+      "Bash(xcodebuild -showsdks:*)",
+      "Bash(xcodebuild -list:*)",
+      "Bash(xcrun --version:*)",
+      "Bash(xcrun --find:*)",
+      "Bash(xcrun --show-sdk-path:*)",
+      "Bash(swift --version:*)",
+      "Bash(swiftc --version:*)",
+      "Bash(pod --version:*)",
+      "Bash(pod list:*)",
+      "Bash(pod search:*)",
+      "Bash(ruby --version:*)",
+      "Bash(bundle --version:*)",
+      "Bash(bundle list:*)",
+      "Bash(bundle info:*)",
+      "Bash(bundle show:*)",
+      "Bash(swiftlint version:*)",
+      "Bash(python --version:*)",
+      "Bash(python3 --version:*)",
+      "Bash(clang-format --version:*)",
+      "Bash(rbenv --version:*)",
+      "Bash(rbenv versions:*)",
+      "Bash(brew --version:*)",
+      "Bash(brew list:*)",
+      "Bash(brew info:*)",
+      "Bash(fastlane --version:*)",
+      "Bash(slather version:*)",
+      "Bash(carthage version:*)",
+      "Bash(./gradlew --version:*)",
+      "Bash(./gradlew tasks:*)",
+      "Bash(./gradlew assembleRelease)",
+      "Bash(gradle --version:*)",
+      "Bash(java -version:*)",
+      "Bash(javac -version:*)",
+      "Bash(kotlinc -version:*)",
+      "Bash(ktlint --version:*)",
+      "Bash(lerna --version:*)",
+      "Bash(lerna list:*)",
+      "Bash(lerna changed:*)",
+      "Skill(sentry-skills:code-review)",
+      "Skill(sentry-skills:find-bugs)",
+      "Skill(sentry-skills:deslop)",
+      "Skill(sentry-skills:iterate-pr)",
+      "Skill(sentry-skills:claude-settings-audit)",
+      "Skill(sentry-skills:agents-md)",
+      "WebFetch(domain:docs.sentry.io)",
+      "WebFetch(domain:develop.sentry.dev)",
+      "WebFetch(domain:docs.github.com)",
+      "WebFetch(domain:cli.github.com)",
+      "WebFetch(domain:developer.apple.com)",
+      "WebFetch(domain:swift.org)",
+      "WebFetch(domain:cocoapods.org)",
+      "WebFetch(domain:guides.cocoapods.org)",
+      "WebFetch(domain:reactnative.dev)",
+      "WebFetch(domain:expo.dev)",
+      "WebFetch(domain:nodejs.org)",
+      "WebFetch(domain:typescriptlang.org)"
+    ],
+    "deny": []
+  }
+}
diff --git a/.github/workflows/skip-ci.yml b/.github/workflows/skip-ci.yml
@@ -45,7 +45,7 @@ jobs:
         if: steps.check-pr.outputs.is-pr == 'true'
         id: check_diff
         run: |
-          skipList=(".github/CODEOWNERS" ".prettierignore" ".github/workflows/update-deps.yml" ".github/workflows/skip-ci.yml")
+          skipList=(".github/CODEOWNERS" ".prettierignore" ".github/workflows/update-deps.yml" ".github/workflows/skip-ci.yml" ".claude/settings.json")
           skipRegList=("(.*/)?\.gitignore" "\.github/ISSUE_TEMPLATE.*")
 
           for s in "${skipRegList[@]}"; do
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -10,20 +10,31 @@
 
 ### Fixes
 
+- Fix duplicate error reporting on iOS with New Architecture ([#5532](https://github.com/getsentry/sentry-react-native/pull/5532))
 - Fix for missing `replay_id` from metrics ([#5483](https://github.com/getsentry/sentry-react-native/pull/5483))
 - Skip span ID check when standalone mode is enabled ([#5493](https://github.com/getsentry/sentry-react-native/pull/5493))
+- Fix traces not always being attached to replays with errors ([#5538](https://github.com/getsentry/sentry-react-native/pull/5538))
 
 ### Dependencies
 
 - Bump Cocoa SDK from v8.58.0 to v9.1.0 ([#5356](https://github.com/getsentry/sentry-react-native/pull/5356))
   - [changelog](https://github.com/getsentry/sentry-cocoa/blob/main/CHANGELOG.md#910)
   - [diff](https://github.com/getsentry/sentry-cocoa/compare/8.58.0...9.1.0)
-- Bump JavaScript SDK from v10.30.0 to v10.33.0 ([#5480](https://github.com/getsentry/sentry-react-native/pull/5480), [#5487](https://github.com/getsentry/sentry-react-native/pull/5487), [#5496](https://github.com/getsentry/sentry-react-native/pull/5496), [#5522](https://github.com/getsentry/sentry-react-native/pull/5522))
-  - [changelog](https://github.com/getsentry/sentry-javascript/blob/develop/CHANGELOG.md#10330)
-  - [diff](https://github.com/getsentry/sentry-javascript/compare/10.30.0...10.33.0)
+- Bump JavaScript SDK from v10.30.0 to v10.34.0 ([#5480](https://github.com/getsentry/sentry-react-native/pull/5480), [#5487](https://github.com/getsentry/sentry-react-native/pull/5487), [#5496](https://github.com/getsentry/sentry-react-native/pull/5496), [#5522](https://github.com/getsentry/sentry-react-native/pull/5522), [#5535](https://github.com/getsentry/sentry-react-native/pull/5535))
+  - [changelog](https://github.com/getsentry/sentry-javascript/blob/develop/CHANGELOG.md#10340)
+  - [diff](https://github.com/getsentry/sentry-javascript/compare/10.30.0...10.34.0)
 - Bump CLI from v2.58.4 to v3.1.0 ([#5523](https://github.com/getsentry/sentry-react-native/pull/5523), [#5471](https://github.com/getsentry/sentry-react-native/pull/5471), [#5514](https://github.com/getsentry/sentry-react-native/pull/5514), [#5502](https://github.com/getsentry/sentry-react-native/pull/5502))
   - [changelog](https://github.com/getsentry/sentry-cli/blob/master/CHANGELOG.md#310)
   - [diff](https://github.com/getsentry/sentry-cli/compare/2.58.4...3.1.0)
+- Bump Bundler Plugins from v4.6.1 to v4.6.2 ([#5536](https://github.com/getsentry/sentry-react-native/pull/5536))
+  - [changelog](https://github.com/getsentry/sentry-javascript-bundler-plugins/blob/main/CHANGELOG.md#462)
+  - [diff](https://github.com/getsentry/sentry-javascript-bundler-plugins/compare/4.6.1...4.6.2)
+- Bump Android SDK from v8.29.0 to v8.30.0 ([#5539](https://github.com/getsentry/sentry-react-native/pull/5539))
+  - [changelog](https://github.com/getsentry/sentry-java/blob/main/CHANGELOG.md#8300)
+  - [diff](https://github.com/getsentry/sentry-java/compare/8.29.0...8.30.0)
+- Bump Android SDK Stubs from v8.29.0 to v8.30.0 ([#5540](https://github.com/getsentry/sentry-react-native/pull/5540))
+  - [changelog](https://github.com/getsentry/sentry-java/blob/main/CHANGELOG.md#8300)
+  - [diff](https://github.com/getsentry/sentry-java/compare/8.29.0...8.30.0)
 
 ## 7.8.0
 
diff --git a/CLAUDE.md b/CLAUDE.md
@@ -0,0 +1 @@
+AGENTS.md
diff --git a/dev-packages/e2e-tests/package.json b/dev-packages/e2e-tests/package.json
@@ -13,7 +13,7 @@
   "devDependencies": {
     "@babel/preset-env": "^7.25.3",
     "@babel/preset-typescript": "^7.18.6",
-    "@sentry/core": "10.33.0",
+    "@sentry/core": "10.34.0",
     "@sentry/react-native": "7.8.0",
     "@types/node": "^20.9.3",
     "@types/react": "^18.2.64",
diff --git a/packages/core/RNSentryCocoaTester/RNSentryCocoaTesterTests/RNSentryTests.m b/packages/core/RNSentryCocoaTester/RNSentryCocoaTesterTests/RNSentryTests.m
@@ -768,6 +768,80 @@ - (void)testIgnoreErrorsRegexAndStringBothWork
     XCTAssertNotNil(result3, @"Event with non-matching error should not be dropped");
 }
 
+- (void)testBeforeSendFiltersOutUnhandledJSException
+{
+    RNSentry *rnSentry = [[RNSentry alloc] init];
+    NSError *error = nil;
+    NSMutableDictionary *mockedOptions = [@{
+        @"dsn" : @"https://abc@def.ingest.sentry.io/1234567",
+    } mutableCopy];
+    mockedOptions = [rnSentry prepareOptions:mockedOptions];
+    SentryOptions *options = [SentrySDKWrapper createOptionsWithDictionary:mockedOptions
+                                                    isSessionReplayEnabled:NO
+                                                                     error:&error];
+    XCTAssertNotNil(options);
+    XCTAssertNil(error);
+
+    SentryEvent *event = [[SentryEvent alloc] init];
+    SentryException *exception = [SentryException alloc];
+    exception.type = @"Unhandled JS Exception";
+    exception.value = @"Error: Test error";
+    event.exceptions = @[ exception ];
+    SentryEvent *result = options.beforeSend(event);
+    XCTAssertNil(result, @"Event with Unhandled JS Exception should be dropped");
+}
+
+- (void)testBeforeSendFiltersOutJSErrorCppException
+{
+    RNSentry *rnSentry = [[RNSentry alloc] init];
+    NSError *error = nil;
+    NSMutableDictionary *mockedOptions = [@{
+        @"dsn" : @"https://abc@def.ingest.sentry.io/1234567",
+    } mutableCopy];
+    mockedOptions = [rnSentry prepareOptions:mockedOptions];
+    SentryOptions *options = [SentrySDKWrapper createOptionsWithDictionary:mockedOptions
+                                                    isSessionReplayEnabled:NO
+                                                                     error:&error];
+    XCTAssertNotNil(options);
+    XCTAssertNil(error);
+
+    // Test C++ exception with ExceptionsManager.reportException in value (actual format from New
+    // Architecture) The exception type is "C++ Exception" and the value contains the mangled name
+    // and error message
+    SentryEvent *event1 = [[SentryEvent alloc] init];
+    SentryException *exception1 = [SentryException alloc];
+    exception1.type = @"C++ Exception";
+    exception1.value = @"N8facebook3jsi7JSErrorE: ExceptionsManager.reportException raised an "
+                       @"exception: Unhandled JS Exception: Error: Test error";
+    event1.exceptions = @[ exception1 ];
+    SentryEvent *result1 = options.beforeSend(event1);
+    XCTAssertNil(
+        result1, @"Event with ExceptionsManager.reportException in value should be dropped");
+
+    // Test exception value containing ExceptionsManager.reportException (alternative format)
+    SentryEvent *event2 = [[SentryEvent alloc] init];
+    SentryException *exception2 = [SentryException alloc];
+    exception2.type = @"SomeOtherException";
+    exception2.value = @"ExceptionsManager.reportException raised an exception: Unhandled JS "
+                       @"Exception: Error: Test";
+    event2.exceptions = @[ exception2 ];
+    SentryEvent *result2 = options.beforeSend(event2);
+    XCTAssertNil(
+        result2, @"Event with ExceptionsManager.reportException in value should be dropped");
+
+    // Test that legitimate C++ exceptions without ExceptionsManager.reportException are not
+    // filtered
+    SentryEvent *event3 = [[SentryEvent alloc] init];
+    SentryException *exception3 = [SentryException alloc];
+    exception3.type = @"C++ Exception";
+    exception3.value = @"std::runtime_error: Some other C++ error occurred";
+    event3.exceptions = @[ exception3 ];
+    SentryEvent *result3 = options.beforeSend(event3);
+    XCTAssertNotNil(result3,
+        @"Legitimate C++ exception without ExceptionsManager.reportException should not be "
+        @"dropped");
+}
+
 - (void)testCreateOptionsWithDictionaryEnableSessionReplayInUnreliableEnvironmentDefault
 {
     NSError *error = nil;
diff --git a/packages/core/android/build.gradle b/packages/core/android/build.gradle
@@ -55,5 +55,5 @@ android {
 dependencies {
     compileOnly files('libs/replay-stubs.jar')
     implementation 'com.facebook.react:react-native:+'
-    api 'io.sentry:sentry-android:8.29.0'
+    api 'io.sentry:sentry-android:8.30.0'
 }
diff --git a/packages/core/android/libs/replay-stubs.jar b/packages/core/android/libs/replay-stubs.jar
diff --git a/packages/core/android/replay-stubs/build.gradle b/packages/core/android/replay-stubs/build.gradle
@@ -18,5 +18,5 @@ tasks.named('jar', Jar) {
 }
 
 dependencies {
-  compileOnly 'io.sentry:sentry:8.29.0'
+  compileOnly 'io.sentry:sentry:8.30.0'
 }
diff --git a/packages/core/ios/RNSentry.mm b/packages/core/ios/RNSentry.mm
@@ -94,6 +94,19 @@ - (NSMutableDictionary *)prepareOptions:(NSDictionary *)options
             return nil;
         }
 
+        // With New Architecture, React Native wraps JS errors in C++ exceptions.
+        // These exceptions are caught by the native crash handler and should be filtered out
+        // since the JS error is already reported by the JS error handler.
+        // The key indicator is "ExceptionsManager.reportException" in the exception value,
+        // which is React Native's mechanism for reporting JS errors to the native layer.
+        for (SentryException *exception in event.exceptions) {
+            if (nil != exception.value &&
+                [exception.value rangeOfString:@"ExceptionsManager.reportException"].location
+                    != NSNotFound) {
+                return nil;
+            }
+        }
+
         // Regex and Str are set when one of them has value so we only need to check one of them.
         if (self->_ignoreErrorPatternsStr || self->_ignoreErrorPatternsRegex) {
             for (SentryException *exception in event.exceptions) {
diff --git a/packages/core/package.json b/packages/core/package.json
@@ -68,21 +68,21 @@
     "react-native": ">=0.65.0"
   },
   "dependencies": {
-    "@sentry/babel-plugin-component-annotate": "4.6.1",
-    "@sentry/browser": "10.33.0",
+    "@sentry/babel-plugin-component-annotate": "4.6.2",
+    "@sentry/browser": "10.34.0",
     "@sentry/cli": "3.1.0",
-    "@sentry/core": "10.33.0",
-    "@sentry/react": "10.33.0",
-    "@sentry/types": "10.33.0"
+    "@sentry/core": "10.34.0",
+    "@sentry/react": "10.34.0",
+    "@sentry/types": "10.34.0"
   },
   "devDependencies": {
     "@babel/core": "^7.26.7",
     "@expo/metro-config": "~0.20.0",
     "@mswjs/interceptors": "^0.25.15",
     "@react-native/babel-preset": "0.80.0",
-    "@sentry-internal/eslint-config-sdk": "10.33.0",
-    "@sentry-internal/eslint-plugin-sdk": "10.33.0",
-    "@sentry-internal/typescript": "10.33.0",
+    "@sentry-internal/eslint-config-sdk": "10.34.0",
+    "@sentry-internal/eslint-plugin-sdk": "10.34.0",
+    "@sentry-internal/typescript": "10.34.0",
     "@sentry/wizard": "6.11.0",
     "@testing-library/react-native": "^13.2.2",
     "@types/jest": "^29.5.13",
diff --git a/packages/core/src/js/replay/mobilereplay.ts b/packages/core/src/js/replay/mobilereplay.ts
@@ -216,6 +216,12 @@ export const mobileReplayIntegration = (initOptions: MobileReplayOptions = defau
       debug.log(
         `[Sentry] ${MOBILE_REPLAY_INTEGRATION_NAME} Captured recording replay ${replayId} for event ${event.event_id}.`,
       );
+      // Add replay_id to error event contexts to link replays to events/traces
+      event.contexts = event.contexts || {};
+      event.contexts.replay = {
+        ...event.contexts.replay,
+        replay_id: replayId,
+      };
     } else {
       // Check if there's an ongoing recording and update cache if found
       const recordingReplayId = NATIVE.getCurrentReplayId();
@@ -224,6 +230,12 @@ export const mobileReplayIntegration = (initOptions: MobileReplayOptions = defau
         debug.log(
           `[Sentry] ${MOBILE_REPLAY_INTEGRATION_NAME} assign already recording replay ${recordingReplayId} for event ${event.event_id}.`,
         );
+        // Add replay_id to error event contexts to link replays to events/traces
+        event.contexts = event.contexts || {};
+        event.contexts.replay = {
+          ...event.contexts.replay,
+          replay_id: recordingReplayId,
+        };
       } else {
         updateCachedReplayId(null);
         debug.log(`[Sentry] ${MOBILE_REPLAY_INTEGRATION_NAME} not sampled for event ${event.event_id}.`);
diff --git a/packages/core/test/replay/mobilereplay.test.ts b/packages/core/test/replay/mobilereplay.test.ts
@@ -258,6 +258,25 @@ describe('Mobile Replay Integration', () => {
 
       expect(mockCaptureReplay).toHaveBeenCalled();
     });
+
+    it('should add replay context to error events when replay is captured', async () => {
+      const integration = mobileReplayIntegration();
+      const replayId = 'test-replay-id';
+      mockCaptureReplay.mockResolvedValue(replayId);
+
+      const event: Event = {
+        event_id: 'test-event-id',
+        exception: {
+          values: [{ type: 'Error', value: 'Test error' }],
+        },
+      };
+      const hint: EventHint = {};
+
+      if (integration.processEvent) {
+        const processedEvent = await integration.processEvent(event, hint);
+        expect(processedEvent.contexts?.replay?.replay_id).toBe(replayId);
+      }
+    });
   });
 
   describe('platform checks', () => {
diff --git a/performance-tests/metrics-android.yml b/performance-tests/metrics-android.yml
@@ -13,4 +13,4 @@ startupTimeTest:
 
 binarySizeTest:
   diffMin: 1 MiB
-  diffMax: 5.0 MiB
+  diffMax: 5.5 MiB
diff --git a/samples/expo/package.json b/samples/expo/package.json
@@ -22,7 +22,7 @@
     "eas-build-development-android": "eas build --profile development --platform android"
   },
   "dependencies": {
-    "@sentry/core": "10.33.0",
+    "@sentry/core": "10.34.0",
     "@sentry/react-native": "7.8.0",
     "@types/react": "~19.0.10",
     "expo": "^53.0.0",
@@ -47,7 +47,7 @@
     "@babel/core": "^7.26.0",
     "@babel/preset-env": "^7.26.0",
     "@react-native/eslint-config": "0.79.1",
-    "@sentry/babel-plugin-component-annotate": "4.6.1",
+    "@sentry/babel-plugin-component-annotate": "4.6.2",
     "@types/node": "20.10.4",
     "@typescript-eslint/eslint-plugin": "^8.50.0",
     "@typescript-eslint/parser": "^8.50.0",
diff --git a/samples/react-native-macos/package.json b/samples/react-native-macos/package.json
diff --git a/samples/react-native/package.json b/samples/react-native/package.json
diff --git a/yarn.lock b/yarn.lock

Original file line number	Diff line number	Diff line change
`@@ -55,5 +55,5 @@ android {`
`55`	`55`	`dependencies {`
`56`	`56`	`compileOnly files('libs/replay-stubs.jar')`
`57`	`57`	`implementation 'com.facebook.react:react-native:+'`
`58`		`- api 'io.sentry:sentry-android:8.29.0'`
	`58`	`+ api 'io.sentry:sentry-android:8.30.0'`
`59`	`59`	`}`
Original file line number	Diff line number	Diff line change
`@@ -18,5 +18,5 @@ tasks.named('jar', Jar) {`
`18`	`18`	`}`
`19`	`19`
`20`	`20`	`dependencies {`
`21`		`- compileOnly 'io.sentry:sentry:8.29.0'`
	`21`	`+ compileOnly 'io.sentry:sentry:8.30.0'`
`22`	`22`	`}`