Merge branch 'main' into antonis/oxlint

Author: antonis

CHANGELOG.md

@@ -6,6 +6,12 @@
 > make sure you follow our [migration guide](https://docs.sentry.io/platforms/react-native/migration/) first.
 <!-- prettier-ignore-end -->
 
+## Unreleased
+
+### Fixes
+
+- Fix iOS crash (EXC_BAD_ACCESS) in time-to-initial-display when navigating between screens ([#5887](https://github.com/getsentry/sentry-react-native/pull/5887))
+
 ## 8.6.0
 
 ### Fixes

packages/core/ios/RNSentryTimeToDisplay.m

@@ -2,6 +2,8 @@
 #import <QuartzCore/QuartzCore.h>
 #import <React/RCTLog.h>
 
+// All static state below is accessed from the main thread (CADisplayLink, UI) and from the
+// React Native bridge / JS thread (setActiveSpanId, pop). Synchronize every access.
 @implementation RNSentryTimeToDisplay {
     CADisplayLink *displayLink;
     RCTResponseSenderBlock resolveBlock;
@@ -13,6 +15,37 @@ @implementation RNSentryTimeToDisplay {
 
 static NSString *activeSpanId;
 
++ (void)putTimeToDisplayForLocked:(NSString *)screenId value:(NSNumber *)value
+{
+    if (!screenId) {
+        return;
+    }
+
+    // If key already exists, just update the value,
+    // this should never happen as TTD is recorded once per navigation
+    // We avoid updating the age to avoid the age array shift
+    if ([screenIdToRenderDuration objectForKey:screenId]) {
+        [screenIdToRenderDuration setObject:value forKey:screenId];
+        return;
+    }
+
+    // If we haven't reached capacity yet, just append
+    if (screenIdAge.count < TIME_TO_DISPLAY_ENTRIES_MAX_SIZE) {
+        [screenIdToRenderDuration setObject:value forKey:screenId];
+        [screenIdAge addObject:screenId];
+    } else {
+        // Remove oldest entry, in most case will already be removed by pop
+        NSString *oldestKey = screenIdAge[screenIdCurrentIndex];
+        [screenIdToRenderDuration removeObjectForKey:oldestKey];
+
+        [screenIdToRenderDuration setObject:value forKey:screenId];
+        screenIdAge[screenIdCurrentIndex] = screenId;
+
+        // Update circular index, point to the new oldest
+        screenIdCurrentIndex = (screenIdCurrentIndex + 1) % TIME_TO_DISPLAY_ENTRIES_MAX_SIZE;
+    }
+}
+
 + (void)initialize
 {
     if (self == [RNSentryTimeToDisplay class]) {
@@ -27,51 +60,34 @@ + (void)initialize
 
 + (void)setActiveSpanId:(NSString *)spanId
 {
-    activeSpanId = spanId;
+    @synchronized([RNSentryTimeToDisplay class]) {
+        activeSpanId = spanId != nil ? [spanId copy] : nil;
+    }
 }
 
 + (NSNumber *)popTimeToDisplayFor:(NSString *)screenId
 {
-    NSNumber *value = screenIdToRenderDuration[screenId];
-    [screenIdToRenderDuration removeObjectForKey:screenId];
-    return value;
+    @synchronized([RNSentryTimeToDisplay class]) {
+        NSNumber *value = screenIdToRenderDuration[screenId];
+        [screenIdToRenderDuration removeObjectForKey:screenId];
+        return value;
+    }
 }
 
 + (void)putTimeToInitialDisplayForActiveSpan:(NSNumber *)value
 {
-    if (activeSpanId != nil) {
-        NSString *prefixedSpanId = [@"ttid-navigation-" stringByAppendingString:activeSpanId];
-        [self putTimeToDisplayFor:prefixedSpanId value:value];
+    @synchronized([RNSentryTimeToDisplay class]) {
+        if (activeSpanId != nil) {
+            NSString *prefixedSpanId = [@"ttid-navigation-" stringByAppendingString:activeSpanId];
+            [self putTimeToDisplayForLocked:prefixedSpanId value:value];
+        }
     }
 }
 
 + (void)putTimeToDisplayFor:(NSString *)screenId value:(NSNumber *)value
 {
-    if (!screenId)
-        return;
-
-    // If key already exists, just update the value,
-    // this should never happen as TTD is recorded once per navigation
-    // We avoid updating the age to avoid the age array shift
-    if ([screenIdToRenderDuration objectForKey:screenId]) {
-        [screenIdToRenderDuration setObject:value forKey:screenId];
-        return;
-    }
-
-    // If we haven't reached capacity yet, just append
-    if (screenIdAge.count < TIME_TO_DISPLAY_ENTRIES_MAX_SIZE) {
-        [screenIdToRenderDuration setObject:value forKey:screenId];
-        [screenIdAge addObject:screenId];
-    } else {
-        // Remove oldest entry, in most case will already be removed by pop
-        NSString *oldestKey = screenIdAge[screenIdCurrentIndex];
-        [screenIdToRenderDuration removeObjectForKey:oldestKey];
-
-        [screenIdToRenderDuration setObject:value forKey:screenId];
-        screenIdAge[screenIdCurrentIndex] = screenId;
-
-        // Update circular index, point to the new oldest
-        screenIdCurrentIndex = (screenIdCurrentIndex + 1) % TIME_TO_DISPLAY_ENTRIES_MAX_SIZE;
+    @synchronized([RNSentryTimeToDisplay class]) {
+        [self putTimeToDisplayForLocked:screenId value:value];
     }
 }
 

packages/core/plugin/src/withSentryAndroidGradlePlugin.ts

@@ -13,7 +13,7 @@ export interface SentryAndroidGradlePluginOptions {
   includeSourceContext?: boolean;
 }
 
-export const sentryAndroidGradlePluginVersion = '6.2.0';
+export const sentryAndroidGradlePluginVersion = '6.3.0';
 
 /**
  * Adds the Sentry Android Gradle Plugin to the project.

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:6.2.0")
+        classpath("io.sentry:sentry-android-gradle-plugin:6.3.0")
     }
 }
 

yarn.lock

@@ -19025,20 +19025,20 @@ __metadata:
   linkType: hard
 
 "handlebars@npm:^4.7.7":
-  version: 4.7.8
-  resolution: "handlebars@npm:4.7.8"
-  dependencies:
-    minimist: "npm:^1.2.5"
-    neo-async: "npm:^2.6.2"
-    source-map: "npm:^0.6.1"
-    uglify-js: "npm:^3.1.4"
-    wordwrap: "npm:^1.0.0"
+  version: 4.7.9
+  resolution: "handlebars@npm:4.7.9"
+  dependencies:
+    minimist: ^1.2.5
+    neo-async: ^2.6.2
+    source-map: ^0.6.1
+    uglify-js: ^3.1.4
+    wordwrap: ^1.0.0
   dependenciesMeta:
     uglify-js:
       optional: true
   bin:
     handlebars: bin/handlebars
-  checksum: 00e68bb5c183fd7b8b63322e6234b5ac8fbb960d712cb3f25587d559c2951d9642df83c04a1172c918c41bcfc81bfbd7a7718bbce93b893e0135fc99edea93ff
+  checksum: ac39070fc1c3c76a654e4b526383eaf1601976eaa474547b263915b4806977f083600e586ca923709baeed7c82a42640bcc9cc04c37a7efd3fb444f49b8347d6
   languageName: node
   linkType: hard
 
@@ -24959,17 +24959,10 @@ __metadata:
   languageName: node
   linkType: hard
 
-"node-forge@npm:^1, node-forge@npm:^1.2.1, node-forge@npm:^1.3.1":
-  version: 1.3.2
-  resolution: "node-forge@npm:1.3.2"
-  checksum: b6f905b0fcc39a2d59598e12ca2c071bfd760e56a9163aab8da7f8d6622547f8db60cfb2aefc39277d5a13af32e58573674b38107a2d4df7c243e12794839546
-  languageName: node
-  linkType: hard
-
-"node-forge@npm:^1.3.3":
-  version: 1.3.3
-  resolution: "node-forge@npm:1.3.3"
-  checksum: 045b650d61eeba57588744b7be4671044e83871e2c4dc5d4a38a8eb5af7e55fa790c93ba9db1d1ee14a567d25fde41e97a5132e076cff738622e0916c77b48d2
+"node-forge@npm:^1, node-forge@npm:^1.2.1, node-forge@npm:^1.3.1, node-forge@npm:^1.3.3":
+  version: 1.4.0
+  resolution: "node-forge@npm:1.4.0"
+  checksum: c97c634d4d483aae815677db5b1bd14bfea4d873ab48817e020610a2b4d8bc6b3e77994860189b44151ff8e0842c0c4ba6faa80b9a6e6fbd6989865e8eb80b96
   languageName: node
   linkType: hard