Merge branch 'main' into alwx/feat/app-loaded-api

Author: alwx

.github/workflows/e2e-v2.yml

@@ -508,12 +508,26 @@ jobs:
         with:
           model: ${{ env.IOS_DEVICE }}
           os_version: ${{ env.IOS_VERSION }}
+          wait_for_boot: true
+          erase_before_boot: false
+
+      - name: Wait for iOS simulator to be fully ready
+        if: ${{ steps.platform-check.outputs.skip != 'true' && matrix.platform == 'ios' }}
+        run: |
+          # Wait for boot to complete at the system level
+          xcrun simctl bootstatus booted -b
+          # Launch and dismiss Settings.app to ensure SpringBoard and system services
+          # are fully initialized — this avoids Maestro connecting to a half-booted
+          # simulator on Cirrus Labs Tart VMs.
+          xcrun simctl launch booted com.apple.Preferences
+          sleep 5
+          xcrun simctl terminate booted com.apple.Preferences
 
       - name: Run tests on iOS
         if: ${{ steps.platform-check.outputs.skip != 'true' && matrix.platform == 'ios' }}
         env:
           # Increase timeout for Maestro iOS driver startup (default is 60s, some CI runners need more time)
-          MAESTRO_DRIVER_STARTUP_TIMEOUT: 120000
+          MAESTRO_DRIVER_STARTUP_TIMEOUT: 180000
         run: ./dev-packages/e2e-tests/cli.mjs ${{ matrix.platform }} --test
 
       - name: Upload logs

.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
   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
@@ -337,6 +337,35 @@ jobs:
         with:
           model: ${{ env.IOS_DEVICE }}
           os_version: ${{ env.IOS_VERSION }}
+          wait_for_boot: true
+          erase_before_boot: false
+
+      - name: Wait for iOS simulator to be fully ready
+        run: |
+          xcrun simctl bootstatus booted -b
+          xcrun simctl launch booted com.apple.Preferences
+          sleep 5
+          xcrun simctl terminate booted com.apple.Preferences
+
+      - name: Warm up Maestro driver on iOS
+        continue-on-error: true
+        working-directory: ${{ env.REACT_NATIVE_SAMPLE_PATH }}
+        run: |
+          xcrun simctl install booted sentryreactnativesample.app
+          WARMUP=$(mktemp /tmp/maestro-warmup-XXXXXX.yml)
+          cat > "$WARMUP" << 'YML'
+          appId: io.sentry.reactnative.sample
+          ---
+          - launchApp:
+              clearState: true
+          - extendedWaitUntil:
+              visible: "Sentry React Native Sample"
+              timeout: 120000
+          - killApp
+          YML
+          sed -i '' 's/^          //' "$WARMUP"
+          maestro test "$WARMUP" || true
+          rm -f "$WARMUP"
 
       - name: Run iOS Tests
         working-directory: ${{ env.REACT_NATIVE_SAMPLE_PATH }}

.github/workflows/validate-pr.yml

@@ -10,7 +10,7 @@ jobs:
     permissions:
       pull-requests: write
     steps:
-      - uses: getsentry/github-workflows/validate-pr@0b52fc6a867b744dcbdf5d25c18bc8d1c95710e1
+      - uses: getsentry/github-workflows/validate-pr@71588ddf95134f804e82c5970a8098588e2eaecd
         with:
           app-id: ${{ vars.SDK_MAINTAINER_BOT_APP_ID }}
           private-key: ${{ secrets.SDK_MAINTAINER_BOT_PRIVATE_KEY }}

CHANGELOG.md

@@ -11,12 +11,15 @@
 ### Features
 
 - Add `Sentry.appLoaded()` API to explicitly signal app start end ([#5940](https://github.com/getsentry/sentry-react-native/pull/5940))
+- Add `frames.delay` span data from native SDKs to app start, TTID/TTFD, and JS API spans ([#5907](https://github.com/getsentry/sentry-react-native/pull/5907))
 - Rename `FeedbackWidget` to `FeedbackForm` and `showFeedbackWidget` to `showFeedbackForm` ([#5931](https://github.com/getsentry/sentry-react-native/pull/5931))
   - The old names are deprecated but still work
 - Deprecate `FeedbackButton`, `showFeedbackButton`, and `hideFeedbackButton` ([#5933](https://github.com/getsentry/sentry-react-native/pull/5933))
 
 ### Fixes
 
+- Fix inflated `http.client` span durations on iOS when the app backgrounds during a request ([#5944](https://github.com/getsentry/sentry-react-native/pull/5944))
+- Fix crash caused by nullish response in supabase PostgREST handler ([#5938](https://github.com/getsentry/sentry-react-native/pull/5938))
 - 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

dev-packages/e2e-tests/cli.mjs

@@ -290,35 +290,108 @@ if (actions.includes('test')) {
   if (!sentryAuthToken) {
     console.log('Skipping maestro test due to unavailable or empty SENTRY_AUTH_TOKEN');
   } else {
+    const maestroDir = path.join(e2eDir, 'maestro');
+    const flowFiles = fs.readdirSync(maestroDir)
+      .filter(f => f.endsWith('.yml') && !f.startsWith('utils'))
+      .sort((a, b) => {
+        // Run crash.yml last — it kills the app via nativeCrash(), and
+        // post-crash simulator state can be flaky on Cirrus Labs Tart VMs.
+        if (a === 'crash.yml') return 1;
+        if (b === 'crash.yml') return -1;
+        return a.localeCompare(b);
+      });
+
+    console.log(`Discovered ${flowFiles.length} Maestro flows: ${flowFiles.join(', ')}`);
+
+    // Warm up Maestro's driver connection before running test flows.
+    // The first Maestro launchApp after simulator boot can fail on Cirrus
+    // Labs Tart VMs because the IDB/XCUITest driver isn't fully connected.
+    // Running a lightweight warmup flow ensures the driver is ready.
+    const warmupFlow = path.join('maestro', 'utils', 'warmup.yml');
+    console.log('Warming up Maestro driver...');
     try {
-      execSync(
-        `maestro test maestro \
-          --env=APP_ID="${appId}" \
-          --env=SENTRY_AUTH_TOKEN="${sentryAuthToken}" \
-          --debug-output maestro-logs \
-          --flatten-debug-output`,
-        {
-          stdio: 'inherit',
-          cwd: e2eDir,
-        },
-      );
-    } finally {
-      // Always redact sensitive data, even if the test fails
-      const redactScript = `
-        if [[ "$(uname)" == "Darwin" ]]; then
-          find ./maestro-logs -type f -exec sed -i '' "s/${sentryAuthToken}/[REDACTED]/g" {} +
-          echo 'Redacted sensitive data from logs on MacOS'
-        else
-          find ./maestro-logs -type f -exec sed -i "s/${sentryAuthToken}/[REDACTED]/g" {} +
-          echo 'Redacted sensitive data from logs on Ubuntu'
-        fi
-      `;
+      execFileSync('maestro', [
+        'test',
+        warmupFlow,
+        '--env', `APP_ID=${appId}`,
+        '--env', `SENTRY_AUTH_TOKEN=${sentryAuthToken}`,
+      ], {
+        stdio: 'pipe',
+        cwd: e2eDir,
+      });
+    } catch (error) {
+      console.warn('Maestro driver warm-up failed (non-fatal, continuing with tests)');
+    }
 
+    const results = [];
+
+    // Run each flow in its own process to prevent crash cascade —
+    // when crash.yml kills the app, a shared Maestro session would fail
+    // all subsequent flows.
+    console.log('Waiting for flows to complete...');
+    for (const flow of flowFiles) {
+      const flowPath = path.join('maestro', flow);
+      const startTime = Date.now();
       try {
-        execSync(redactScript, { stdio: 'inherit', cwd: e2eDir, shell: '/bin/bash' });
+        execFileSync('maestro', [
+          'test',
+          flowPath,
+          '--env', `APP_ID=${appId}`,
+          '--env', `SENTRY_AUTH_TOKEN=${sentryAuthToken}`,
+          '--debug-output', 'maestro-logs',
+          '--flatten-debug-output',
+        ], {
+          stdio: 'pipe',
+          cwd: e2eDir,
+        });
+        const elapsed = Math.round((Date.now() - startTime) / 1000);
+        const name = flow.replace('.yml', '');
+        results.push({ name, passed: true, elapsed });
+        console.log(`[Passed] ${name} (${elapsed}s)`);
       } catch (error) {
-        console.warn('Failed to redact sensitive data from logs:', error.message);
+        const elapsed = Math.round((Date.now() - startTime) / 1000);
+        const name = flow.replace('.yml', '');
+        const output = (error.stdout?.toString() || '') + (error.stderr?.toString() || '');
+        const detail = output.split('\n').find(l =>
+          l.includes('App crashed') || l.includes('Element not found') || l.includes('FAILED')) || '';
+        results.push({ name, passed: false, elapsed, detail });
+        console.log(`[Failed] ${name} (${elapsed}s)${detail ? ` (${detail.trim()})` : ''}`);
+        // Dump Maestro output for failed flows to aid debugging
+        if (output) {
+          console.log(`\n--- ${name} output ---\n${output.trim()}\n--- end ${name} output ---\n`);
+        }
       }
     }
+
+    const failedFlows = results.filter(r => !r.passed).map(r => r.name);
+
+    // Always redact sensitive data, even if some tests failed
+    try {
+      const logDir = path.join(e2eDir, 'maestro-logs');
+      if (fs.existsSync(logDir)) {
+        const redactFiles = (dir) => {
+          for (const entry of fs.readdirSync(dir, { withFileTypes: true })) {
+            const fullPath = path.join(dir, entry.name);
+            if (entry.isDirectory()) {
+              redactFiles(fullPath);
+            } else {
+              const content = fs.readFileSync(fullPath, 'utf8');
+              if (content.includes(sentryAuthToken)) {
+                fs.writeFileSync(fullPath, content.replaceAll(sentryAuthToken, '[REDACTED]'));
+              }
+            }
+          }
+        };
+        redactFiles(logDir);
+        console.log('Redacted sensitive data from logs');
+      }
+    } catch (error) {
+      console.warn('Failed to redact sensitive data from logs:', error.message);
+    }
+
+    if (failedFlows.length > 0) {
+      console.error(`\nFailed flows: ${failedFlows.join(', ')}`);
+      process.exit(1);
+    }
   }
 }

dev-packages/e2e-tests/maestro/crash.yml

@@ -2,8 +2,4 @@ appId: ${APP_ID}
 jsEngine: graaljs
 ---
 - runFlow: utils/launchTestAppClear.yml
-- tapOn: "Crash"
-
-- launchApp
-
-- runFlow: utils/assertTestReady.yml
+- tapOn: 'Crash'

dev-packages/e2e-tests/maestro/feedback/captureFlow-android.yml

@@ -7,7 +7,10 @@ jsEngine: graaljs
 # Show feedback button
 - tapOn: 'Feedback'
 
-# Open feedback widget
+# Wait for feedback widget button to appear, then open it
+- extendedWaitUntil:
+    visible: 'Report a Bug'
+    timeout: 10_000
 - tapOn: 'Report a Bug'
 
 # Assert that the feedback form is visible

dev-packages/e2e-tests/maestro/feedback/happyFlow-android.yml

@@ -7,13 +7,11 @@ jsEngine: graaljs
 # Show feedback button
 - tapOn: 'Feedback'
 
-# Open feedback widget
-- tapOn: 'Report a Bug'
-
-# Assert that the feedback form is visible
+# Wait for feedback widget button to appear, then open it
 - extendedWaitUntil:
     visible: 'Report a Bug'
-    timeout: 5_000
+    timeout: 10_000
+- tapOn: 'Report a Bug'
 
 # Fill out name field
 - tapOn: 'Your Name'

dev-packages/e2e-tests/maestro/utils/sentryApi.js

@@ -62,8 +62,16 @@ switch (fetch) {
     break;
   }
   case 'replay': {
+    // The replay_id is set by the SDK on the event before sending (in
+    // contexts.replay.replay_id or _dsc.replay_id). It should be present
+    // when the event is fetched from the API.
     const event = json(fetchFromSentry(`${baseUrl}/events/${eventId}/json/`));
-    const replayId = event._dsc.replay_id.replace(/\-/g, '');
+    const rawReplayId = (event.contexts && event.contexts.replay && event.contexts.replay.replay_id)
+      || (event._dsc && event._dsc.replay_id);
+    if (!rawReplayId) {
+      throw new Error('replay_id not available on the event');
+    }
+    const replayId = rawReplayId.replace(/\-/g, '');
     const replay = json(fetchFromSentry(`${baseUrl}/replays/${replayId}/`));
     const segment = fetchFromSentry(`${baseUrl}/replays/${replayId}/videos/0/`);
 

dev-packages/e2e-tests/maestro/utils/warmup.yml

@@ -0,0 +1,13 @@
+appId: ${APP_ID}
+jsEngine: graaljs
+---
+# Warm up Maestro's IDB/XCUITest driver connection on the simulator.
+# The very first Maestro launchApp after simulator boot can fail on Cirrus
+# Labs Tart VMs — running a lightweight flow first ensures the driver is
+# fully connected before real test flows start.
+- launchApp:
+    clearState: true
+- extendedWaitUntil:
+    visible: "E2E Tests Ready"
+    timeout: 300_000 # 5 minutes
+- killApp