Merge branch 'main' into antonis/bump-picomatch

Author: antonis

.github/workflows/e2e-v2.yml

@@ -205,7 +205,7 @@ jobs:
           MATCH_USERNAME: ${{ secrets.MATCH_USERNAME }}
       - name: Collect apps metrics
         if: ${{ steps.platform-check.outputs.skip != 'true' }}
-        uses: getsentry/action-app-sdk-overhead-metrics@ecce2e2718b6d97ad62220fca05627900b061ed5
+        uses: getsentry/action-app-sdk-overhead-metrics@44fb5489ac4ac252c87d84811972dc93a1e490b8
         with:
           name: ${{ matrix.name }} (${{ matrix.rn-architecture }})
           config: ./performance-tests/metrics-${{ matrix.platform }}.yml

CHANGELOG.md

@@ -6,6 +6,18 @@
 > 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))
+
+### Dependencies
+
+- Bump Android SDK from v8.36.0 to v8.37.1 ([#5884](https://github.com/getsentry/sentry-react-native/pull/5884))
+  - [changelog](https://github.com/getsentry/sentry-java/blob/main/CHANGELOG.md#8371)
+  - [diff](https://github.com/getsentry/sentry-java/compare/8.36.0...8.37.1)
+
 ## 8.6.0
 
 ### Fixes

packages/core/android/build.gradle

@@ -55,6 +55,6 @@ android {
 dependencies {
     compileOnly files('libs/replay-stubs.jar')
     implementation 'com.facebook.react:react-native:+'
-    api 'io.sentry:sentry-android:8.36.0'
-    debugImplementation 'io.sentry:sentry-spotlight:8.36.0'
+    api 'io.sentry:sentry-android:8.37.1'
+    debugImplementation 'io.sentry:sentry-spotlight:8.37.1'
 }

packages/core/android/expo-handler/build.gradle

@@ -16,5 +16,5 @@ android {
 
 dependencies {
     compileOnly project(':expo-modules-core')
-    compileOnly 'io.sentry:sentry-android:8.36.0'
+    compileOnly 'io.sentry:sentry-android:8.37.1'
 }

packages/core/android/libs/replay-stubs.jar

@@ -18,5 +18,5 @@ tasks.named('jar', Jar) {
 }
 
 dependencies {
-  compileOnly 'io.sentry:sentry:8.36.0'
+  compileOnly 'io.sentry:sentry:8.37.1'
 }

packages/core/android/replay-stubs/build.gradle

@@ -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/ios/RNSentryTimeToDisplay.m

@@ -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.

packages/core/plugin/src/withSentryAndroidGradlePlugin.ts

@@ -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")
     }
 }
 

samples/react-native/android/build.gradle

@@ -27,6 +27,12 @@ set-version)
     newContent=$(echo "$newContent" | sed -E "s/(io\.sentry:sentry-spotlight:)([0-9\.]+)/\1$2/g")
     echo "$newContent" >$file
 
+    # Update expo-handler to match
+    expoHandlerFile='expo-handler/build.gradle'
+    expoHandlerContent=$(cat $expoHandlerFile)
+    expoHandlerContent=$(echo "$expoHandlerContent" | sed -E "s/(io\.sentry:sentry-android:)([0-9\.]+)/\1$2/g")
+    echo "$expoHandlerContent" >$expoHandlerFile
+
     # Update replay-stubs to match
     cd $ORIGINAL_DIR
     ./update-android-stubs.sh set-version $2