fix(ci): Combine E2E flakiness fixes from #5752 and #5755

Merge both PRs that fix E2E test flakiness on Cirrus Labs Tart VMs:
- iOS E2E fixes: simulator warm-up, per-flow retries, crash-loop prevention (#5752)
- Sample app E2E fixes: increased timeouts, sorted envelopes, relaxed assertions (#5755)

Conflict resolution: kept Maestro 2.3.0 from main with 180s timeout from #5755.

Co-Authored-By: Claude Opus 4.6 (1M context) <noreply@anthropic.com>

Author: antonis

.github/workflows/sample-application.yml

@@ -14,7 +14,7 @@ concurrency:
 env:
   SENTRY_AUTH_TOKEN: ${{ secrets.SENTRY_AUTH_TOKEN }}
   MAESTRO_VERSION: '2.3.0'
-  MAESTRO_DRIVER_STARTUP_TIMEOUT: 90000 # Increase timeout from default 30s to 90s for CI stability
+  MAESTRO_DRIVER_STARTUP_TIMEOUT: 180000 # Increase timeout from default 30s to 180s for CI stability on Tart VMs
   RN_SENTRY_POD_NAME: RNSentry
   IOS_APP_ARCHIVE_PATH: sentry-react-native-sample.app.zip
   ANDROID_APP_ARCHIVE_PATH: sentry-react-native-sample.apk.zip
@@ -299,6 +299,18 @@ jobs:
         with:
           model: ${{ env.IOS_DEVICE }}
           os_version: ${{ env.IOS_VERSION }}
+          wait_for_boot: true
+          erase_before_boot: false
+
+      - name: Warm up iOS Simulator
+        if: ${{ matrix.platform == 'ios' }}
+        run: |
+          # Tart VMs are very slow right after boot.  Launch a stock app so
+          # that SpringBoard, backboardd, and other system services finish
+          # their post-boot initialisation before Maestro tries to connect.
+          xcrun simctl launch booted com.apple.Preferences || true
+          sleep 5
+          xcrun simctl terminate booted com.apple.Preferences || true
 
       - name: Run iOS Tests
         if: ${{ matrix.platform == 'ios' }}

packages/core/RNSentryCocoaTester/RNSentryCocoaTesterTests/RNSentryTests.m

@@ -1014,7 +1014,7 @@ - (void)testCreateUserWithPartialGeoDataCreatesSentryGeoObject
     NSDictionary *userKeys =
         @{ @"id" : @"456", @"geo" : @ { @"city" : @"New York", @"country_code" : @"US" } };
 
-    NSDictionary *userDataKeys = @{};
+    NSDictionary *userDataKeys = @{ };
 
     SentryUser *user = [RNSentry userFrom:userKeys otherUserKeys:userDataKeys];
 
@@ -1031,9 +1031,9 @@ - (void)testCreateUserWithPartialGeoDataCreatesSentryGeoObject
 
 - (void)testCreateUserWithEmptyGeoDataCreatesSentryGeoObject
 {
-    NSDictionary *userKeys = @{ @"id" : @"789", @"geo" : @ {} };
+    NSDictionary *userKeys = @{ @"id" : @"789", @"geo" : @ { } };
 
-    NSDictionary *userDataKeys = @{};
+    NSDictionary *userDataKeys = @{ };
 
     SentryUser *user = [RNSentry userFrom:userKeys otherUserKeys:userDataKeys];
 
@@ -1052,7 +1052,7 @@ - (void)testCreateUserWithoutGeoDataDoesNotCreateGeoObject
 {
     NSDictionary *userKeys = @{ @"id" : @"999", @"email" : @"test@example.com" };
 
-    NSDictionary *userDataKeys = @{};
+    NSDictionary *userDataKeys = @{ };
 
     SentryUser *user = [RNSentry userFrom:userKeys otherUserKeys:userDataKeys];
 

packages/core/RNSentryCocoaTester/RNSentryCocoaTesterTests/RNSentryUserTests.m

@@ -51,9 +51,9 @@ - (void)testNullUser
 - (void)testEmptyUser
 {
     SentryUser *expected = [[SentryUser alloc] init];
-    [expected setData:@{}];
+    [expected setData:@{ }];
 
-    SentryUser *actual = [RNSentry userFrom:@{} otherUserKeys:@{}];
+    SentryUser *actual = [RNSentry userFrom:@{ } otherUserKeys:@{ }];
     XCTAssertTrue([actual isEqualToUser:expected]);
 }
 
@@ -63,9 +63,9 @@ - (void)testInvalidUser
 
     SentryUser *actual = [RNSentry userFrom:@{
         @"id" : @123,
-        @"ip_address" : @ {},
-        @"email" : @ {},
-        @"username" : @ {},
+        @"ip_address" : @ { },
+        @"email" : @ { },
+        @"username" : @ { },
     }
                               otherUserKeys:nil];
 
@@ -79,9 +79,9 @@ - (void)testPartiallyInvalidUser
 
     SentryUser *actual = [RNSentry userFrom:@{
         @"id" : @"123",
-        @"ip_address" : @ {},
-        @"email" : @ {},
-        @"username" : @ {},
+        @"ip_address" : @ { },
+        @"email" : @ { },
+        @"username" : @ { },
     }
                               otherUserKeys:nil];
 
@@ -156,7 +156,7 @@ - (void)testUserWithEmptyGeo
     SentryGeo *expectedGeo = [SentryGeo alloc];
     [expected setGeo:expectedGeo];
 
-    SentryUser *actual = [RNSentry userFrom:@{ @"id" : @"123", @"geo" : @ {} } otherUserKeys:nil];
+    SentryUser *actual = [RNSentry userFrom:@{ @"id" : @"123", @"geo" : @ { } } otherUserKeys:nil];
 
     XCTAssertTrue([actual isEqualToUser:expected]);
 }

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

@@ -23,7 +23,7 @@ + (BOOL)updateOptions:(NSMutableDictionary *)options
     }
 
     NSLog(@"Setting up session replay");
-    NSDictionary *replayOptions = options[@"mobileReplayOptions"] ?: @{};
+    NSDictionary *replayOptions = options[@"mobileReplayOptions"] ?: @{ };
 
     NSString *qualityString = options[@"replaysSessionQuality"];
 

packages/core/ios/RNSentryReplay.mm

@@ -60,7 +60,7 @@ + (void)start:(NSString *)path configureOptions:(void (^)(SentryOptions *options
     if (options == nil) {
         // Fallback in case that options file could not be parsed.
         NSError *fallbackError = nil;
-        options = [PrivateSentrySDKOnly optionsWithDictionary:@{} didFailWithError:&fallbackError];
+        options = [PrivateSentrySDKOnly optionsWithDictionary:@{ } didFailWithError:&fallbackError];
         if (fallbackError != nil) {
             NSLog(@"[RNSentry] Failed to create fallback options with error: %@",
                 fallbackError.localizedDescription);

packages/core/ios/RNSentrySDK.m

@@ -13,9 +13,7 @@
       "resizeMode": "contain",
       "backgroundColor": "#ffffff"
     },
-    "assetBundlePatterns": [
-      "**/*"
-    ],
+    "assetBundlePatterns": ["**/*"],
     "ios": {
       "supportsTablet": true,
       "bundleIdentifier": "io.sentry.expo.sample",
@@ -108,4 +106,4 @@
       "url": "https://u.expo.dev/00000000-0000-0000-0000-000000000000"
     }
   }
-}
+}

samples/expo/app.json

@@ -9,7 +9,7 @@ - (void)applicationDidFinishLaunching:(NSNotification *)notification
     self.moduleName = @"sentry-react-native-sample";
     // You can add your custom initial props in the dictionary below.
     // They will be passed down to the ViewController used by React Native.
-    self.initialProps = @{};
+    self.initialProps = @{ };
 
     return [super applicationDidFinishLaunching:notification];
 }

samples/react-native-macos/macos/sentry-react-native-sample-macOS/AppDelegate.mm

@@ -31,15 +31,19 @@ describe('Capture Errors Screen Transaction', () => {
   });
 
   it('envelope contains transaction context', async () => {
-    const envelope = getErrorsEnvelope();
-
-    const items = envelope[1];
-    const transactions = items.filter(([header]) => header.type === 'transaction');
-    const appStartTransaction = transactions.find(([_header, payload]) => {
-      const event = payload as any;
-      return event.transaction === 'ErrorsScreen' &&
-            event.contexts?.trace?.origin === 'auto.app.start';
-    });
+    // Search all envelopes for the app start transaction, not just the first match.
+    // On slow Android emulators, the app start transaction may arrive in a different envelope.
+    const allErrorsEnvelopes = sentryServer.getAllEnvelopes(
+      containingTransactionWithName('ErrorsScreen'),
+    );
+    const appStartTransaction = allErrorsEnvelopes
+      .flatMap(env => env[1])
+      .filter(([header]) => (header as { type?: string }).type === 'transaction')
+      .find(([_header, payload]) => {
+        const event = payload as any;
+        return event.transaction === 'ErrorsScreen' &&
+              event.contexts?.trace?.origin === 'auto.app.start';
+      });
 
     expect(appStartTransaction).toBeDefined();
 

samples/react-native/e2e/tests/captureErrorScreenTransaction/captureErrorsScreenTransaction.test.ts

@@ -42,6 +42,13 @@ describe('Capture Spaceflight News Screen Transaction', () => {
     await waitForSpaceflightNewsTx;
 
     newsEnvelopes = sentryServer.getAllEnvelopes(containingNewsScreen);
+    // Sort by transaction timestamp to ensure consistent ordering regardless of arrival time.
+    // On slow CI VMs (e.g., Cirrus Labs Tart), envelopes may arrive out of order.
+    newsEnvelopes.sort((a, b) => {
+      const aItem = getItemOfTypeFrom<EventItem>(a, 'transaction');
+      const bItem = getItemOfTypeFrom<EventItem>(b, 'transaction');
+      return (aItem?.[1].timestamp ?? 0) - (bItem?.[1].timestamp ?? 0);
+    });
     allTransactionEnvelopes = sentryServer.getAllEnvelopes(
       containingTransaction,
     );
@@ -64,9 +71,12 @@ describe('Capture Spaceflight News Screen Transaction', () => {
     allTransactionEnvelopes
       .filter(envelope => {
         const item = getItemOfTypeFrom<EventItem>(envelope, 'transaction');
-        // Only check navigation transactions, not user interaction transactions
-        // User interaction transactions (ui.action.touch) don't have time-to-display measurements
-        return item?.[1]?.contexts?.trace?.op !== 'ui.action.touch';
+        const traceContext = item?.[1]?.contexts?.trace;
+        // Exclude user interaction transactions (no time-to-display measurements)
+        if (traceContext?.op === 'ui.action.touch') return false;
+        // Exclude app start transactions (have app_start_cold measurements, not time-to-display)
+        if (traceContext?.origin === 'auto.app.start') return false;
+        return true;
       })
       .forEach(envelope => {
         expectToContainTimeToDisplayMeasurements(
@@ -121,16 +131,18 @@ describe('Capture Spaceflight News Screen Transaction', () => {
     );
   });
 
-  it('contains exactly two articles requests spans', () => {
-    // This test ensures we are to tracing requests multiple times on different layers
+  it('contains articles requests spans', () => {
+    // This test ensures we are tracing requests on different layers
     // fetch > xhr > native
+    // On slow CI VMs, not all HTTP span layers may complete within the transaction,
+    // so we check for at least one HTTP span.
 
     const item = getFirstNewsEventItem();
     const spans = item?.[1].spans;
 
     const httpSpans = spans?.filter(
       span => span.data?.['sentry.op'] === 'http.client',
     );
-    expect(httpSpans).toHaveLength(2);
+    expect(httpSpans?.length ?? 0).toBeGreaterThanOrEqual(1);
   });
 });