Merge branch 'main' into antonis/add-breadcrumb-origin

# Conflicts: # CHANGELOG.md
getsentry · Oct 31, 2024 · fb0057d · fb0057d
2 parents 5d2711c + 1faf8e3
commit fb0057d
Show file tree

Hide file tree

Showing 64 changed files with 1,169 additions and 2,905 deletions.
diff --git a/.github/workflows/e2e.yml b/.github/workflows/e2e.yml
@@ -14,6 +14,8 @@ concurrency:
 
 env:
   SENTRY_AUTH_TOKEN: ${{ secrets.SENTRY_AUTH_TOKEN }}
+  MAESTRO_VERSION: '1.39.0'
+  IOS_DEVICE: 'iPhone 14'
 
 jobs:
   diff_check:
@@ -157,28 +159,26 @@ jobs:
     strategy:
       fail-fast: false # keeps matrix running if one fails
       matrix:
-        rn-version: ['0.65.3', '0.75.4']
+        rn-version: ['0.65.3', '0.76.0']
         rn-architecture: ['legacy', 'new']
         platform: ['android', 'ios']
         build-type: ['production']
         ios-use-frameworks: ['no', 'static', 'dynamic']
         engine: ['hermes', 'jsc']
         include:
           - platform: ios
-            rn-version: '0.75.4'
+            rn-version: '0.76.0'
             runs-on: macos-14 # uses m1 https://github.blog/changelog/2024-01-30-github-actions-macos-14-sonoma-is-now-available/
             runtime: 'latest'
-            device: 'iPhone 14'
           - platform: ios
             rn-version: '0.65.3'
             runs-on: macos-13
             runtime: 'latest'
-            device: 'iPhone 14'
           - platform: android
             runs-on: ubuntu-latest
         exclude:
           # exclude JSC for new RN versions (keeping the matrix manageable)
-          - rn-version: '0.75.4'
+          - rn-version: '0.76.0'
             engine: 'jsc'
           # exclude all rn versions lower than 0.70.0 for new architecture
           - rn-version: '0.65.3'
@@ -297,23 +297,21 @@ jobs:
     strategy:
       fail-fast: false # keeps matrix running if one fails
       matrix:
-        rn-version: ['0.65.3', '0.75.4']
+        rn-version: ['0.65.3', '0.76.0']
         rn-architecture: ['legacy', 'new']
         platform: ['android', 'ios']
         build-type: ['production']
         ios-use-frameworks: ['no'] # test only no framworks
         engine: ['hermes', 'jsc']
         include:
           - platform: ios
-            rn-version: '0.75.4'
+            rn-version: '0.76.0'
             runs-on: macos-14 # uses m1 https://github.blog/changelog/2024-01-30-github-actions-macos-14-sonoma-is-now-available/
             runtime: 'latest'
-            device: 'iPhone 14'
           - platform: ios
             rn-version: '0.65.3'
             runs-on: macos-latest
             runtime: 'latest'
-            device: 'iPhone 14'
           - platform: android
             runs-on: ubuntu-latest
         exclude:
@@ -323,18 +321,24 @@ jobs:
           # e2e test only the default combinations
           - rn-version: '0.65.3'
             engine: 'hermes'
-          - rn-version: '0.75.4'
+          - rn-version: '0.76.0'
             engine: 'jsc'
           # E2E timeout due to a race condition https://github.com/facebook/react-native/issues/42123#issuecomment-1881203719
-          - rn-version: '0.75.4'
+          - rn-version: '0.76.0'
             platform: 'ios'
             rn-architecture: 'new'
-    env:
-      PLATFORM: ${{ matrix.platform }}
-      DEVICE: ${{ matrix.device }}
     steps:
       - uses: actions/checkout@v4
 
+      - name: Install Maestro
+        uses: dniHze/maestro-test-action@bda8a93211c86d0a05b7a4597c5ad134566fbde4 # pin@v1.0.0
+        with:
+          version: ${{env.MAESTRO_VERSION}}
+
+      - name: Install iDB Companion
+        if: ${{ matrix.platform == 'ios' }}
+        run: brew tap facebook/fb && brew install facebook/fb/idb-companion
+
       - uses: ./.github/actions/disk-cleanup
         if: ${{ matrix.platform == 'android' }}
 
@@ -400,11 +404,10 @@ jobs:
             -timezone US/Pacific
           script: ./dev-packages/e2e-tests/cli.mjs ${{ matrix.platform }} --test
 
-      - uses: actions/cache@v4
+      - uses: futureware-tech/simulator-action@bfa03d93ec9de6dacb0c5553bbf8da8afc6c2ee9 # pin@v3
         if: ${{ matrix.platform == 'ios' }}
         with:
-          path: test/e2e/DerivedData/Build/Products/Debug-iphonesimulator/WebDriverAgentRunner-Runner.app
-          key: appium-webdriveragent-${{ hashFiles('test/e2e/yarn.lock') }}
+          model: ${{ env.IOS_DEVICE }}
 
       - name: Run tests on iOS
         if: ${{ matrix.platform == 'ios' }}
@@ -415,6 +418,4 @@ jobs:
         uses: actions/upload-artifact@v4
         with:
           name: ${{ matrix.rn-version }}-${{ matrix.rn-architecture }}-${{ matrix.engine }}-${{ matrix.platform }}-${{ matrix.build-type }}-${{ matrix.ios-use-frameworks }}-logs
-          path: |
-            test/e2e/*.log
-            test/e2e/*.png
+          path: ./dev-packages/e2e-tests/maestro-logs
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -11,15 +11,23 @@
 ### Fixes
 
 - Adds breadcrumb origin field to prevent exception capture context from being overwritten by native scope sync ([#4124](https://github.com/getsentry/sentry-react-native/pull/4124))
+- Skips ignoring require cycle logs for RN 0.70 or newer ([#4214](https://github.com/getsentry/sentry-react-native/pull/4214))
+- Enhanced accuracy of time-to-display spans. ([#4189](https://github.com/getsentry/sentry-react-native/pull/4189))
 
 ### Dependencies
 
 - Bump JavaScript SDK from v8.34.0 to v8.35.0 ([#4196](https://github.com/getsentry/sentry-react-native/pull/4196))
   - [changelog](https://github.com/getsentry/sentry-javascript/blob/develop/CHANGELOG.md#8350)
   - [diff](https://github.com/getsentry/sentry-javascript/compare/8.34.0...8.35.0)
-- Bump CLI from v2.37.0 to v2.38.0 ([#4200](https://github.com/getsentry/sentry-react-native/pull/4200))
-  - [changelog](https://github.com/getsentry/sentry-cli/blob/master/CHANGELOG.md#2380)
-  - [diff](https://github.com/getsentry/sentry-cli/compare/2.37.0...2.38.0)
+- Bump CLI from v2.37.0 to v2.38.1 ([#4200](https://github.com/getsentry/sentry-react-native/pull/4200), [#4220](https://github.com/getsentry/sentry-react-native/pull/4220))
+  - [changelog](https://github.com/getsentry/sentry-cli/blob/master/CHANGELOG.md#2381)
+  - [diff](https://github.com/getsentry/sentry-cli/compare/2.37.0...2.38.1)
+- Bump Android SDK from v7.15.0 to v7.16.0 ([#4202](https://github.com/getsentry/sentry-react-native/pull/4202))
+  - [changelog](https://github.com/getsentry/sentry-java/blob/main/CHANGELOG.md#7160)
+  - [diff](https://github.com/getsentry/sentry-java/compare/7.15.0...7.16.0)
+- Bump Cocoa SDK from v8.38.0 to v8.39.0 ([#4212](https://github.com/getsentry/sentry-react-native/pull/4212))
+  - [changelog](https://github.com/getsentry/sentry-cocoa/blob/main/CHANGELOG.md#8390)
+  - [diff](https://github.com/getsentry/sentry-cocoa/compare/8.38.0...8.39.0)
 
 ## 6.1.0
 

diff --git a/dev-packages/e2e-tests/.gitignore b/dev-packages/e2e-tests/.gitignore
@@ -2,3 +2,6 @@
 *.log
 *.app
 *.apk
+
+/react-native-versions
+/maestro-logs
diff --git a/dev-packages/e2e-tests/cli.mjs b/dev-packages/e2e-tests/cli.mjs
@@ -1,7 +1,7 @@
 #!/usr/bin/env node
 'use strict';
 
-import { execSync, spawn } from 'child_process';
+import { execSync, execFileSync, spawn } from 'child_process';
 import * as fs from 'fs';
 import * as path from 'path';
 import { argv, env } from 'process';
@@ -64,8 +64,9 @@ const appRepoDir = `${e2eDir}/react-native-versions/${RNVersion}`;
 const appName = 'RnDiffApp';
 const appDir = `${appRepoDir}/${appName}`;
 const testAppName = `${appName}.${platform == 'ios' ? 'app' : 'apk'}`;
-const runtime = env.IOS_RUNTIME ? env.IOS_RUNTIME : 'latest';
-const device = env.IOS_DEVICE ? env.IOS_DEVICE : 'iPhone 15';
+const testApp = `${e2eDir}/${testAppName}`;
+const appId = platform === 'ios' ? 'org.reactjs.native.example.RnDiffApp' : 'com.rndiffapp';
+const sentryAuthToken = env.SENTRY_AUTH_TOKEN;
 
 // Build and publish the SDK - we only need to do this once in CI.
 // Locally, we may want to get updates from the latest build so do it on every app build.
@@ -112,9 +113,12 @@ if (actions.includes('create')) {
     env: Object.assign(env, { YARN_ENABLE_IMMUTABLE_INSTALLS: false }),
   });
 
-  console.log(`done`);
-
-  console.log(`done2`);
+  execSync(`yarn add react-native-launch-arguments@4.0.2`, {
+    stdio: 'inherit',
+    cwd: appDir,
+    // yarn v3 run immutable install by default in CI
+    env: Object.assign(env, { YARN_ENABLE_IMMUTABLE_INSTALLS: false }),
+  });
 
   // Patch the app
   execSync(`patch --verbose --strip=0 --force --ignore-whitespace --fuzz 4 < ${patchScriptsDir}/rn.patch`, {
@@ -138,7 +142,6 @@ if (actions.includes('create')) {
       cwd: `${appDir}/ios`,
       env: env,
     });
-    console.log(`done3`);
 
     if (fs.existsSync(`${appDir}/Gemfile`)) {
       execSync(`bundle install`, { stdio: 'inherit', cwd: appDir, env: env });
@@ -185,7 +188,8 @@ if (actions.includes('build')) {
                   -workspace ${appName}.xcworkspace \
                   -configuration ${buildType} \
                   -scheme ${appName} \
-                  -destination 'platform=iOS Simulator,OS=${runtime},name=${device}' \
+                  -sdk 'iphonesimulator' \
+                  -destination 'generic/platform=iOS Simulator' \
                   ONLY_ACTIVE_ARCH=yes \
                   -derivedDataPath DerivedData \
                   build | tee xcodebuild.log | xcbeautify`,
@@ -202,123 +206,40 @@ if (actions.includes('build')) {
     appProduct = `${appDir}/android/app/build/outputs/apk/release/app-release.apk`;
   }
 
-  var testApp = `${e2eDir}/${testAppName}`;
   console.log(`Moving ${appProduct} to ${testApp}`);
   if (fs.existsSync(testApp)) fs.rmSync(testApp, { recursive: true });
   fs.renameSync(appProduct, testApp);
 }
 
 if (actions.includes('test')) {
-  if (
-    platform == 'ios' &&
-    !fs.existsSync(`${e2eDir}/DerivedData/Build/Products/Debug-iphonesimulator/WebDriverAgentRunner-Runner.app`)
-  ) {
-    // Build iOS WebDriverAgent
-    execSync(
-      `set -o pipefail && xcodebuild \
-                  -project node_modules/appium-webdriveragent/WebDriverAgent.xcodeproj \
-                  -scheme WebDriverAgentRunner \
-                  -destination 'platform=iOS Simulator,OS=${runtime},name=${device}' \
-                  GCC_TREAT_WARNINGS_AS_ERRORS=0 \
-                  COMPILER_INDEX_STORE_ENABLE=NO \
-                  ONLY_ACTIVE_ARCH=yes \
-                  -derivedDataPath DerivedData \
-                  build | tee xcodebuild-agent.log | xcbeautify`,
-      { stdio: 'inherit', cwd: e2eDir, env: env },
-    );
-  }
-
-  // Start the appium server.
-  var processesToKill = {};
-  async function newProcess(name, process) {
-    await new Promise((resolve, reject) => {
-      process.on('error', e => {
-        console.error(`Failed to start process '${name}': ${e}`);
-        reject(e);
-      });
-      process.on('spawn', () => {
-        console.log(`Process '${name}' (${process.pid}) started`);
-        resolve();
-      });
-    });
-
-    processesToKill[name] = {
-      process: process,
-      complete: new Promise((resolve, _reject) => {
-        process.on('close', resolve);
-      }),
-    };
-  }
-  await newProcess(
-    'appium',
-    spawn('node_modules/.bin/appium', ['--log-timestamp', '--log-no-colors', '--log', `appium${platform}.log`], {
-      stdio: 'inherit',
-      cwd: e2eDir,
-      env: env,
-      shell: false,
-    }),
-  );
-
-  try {
-    await waitForAppium();
-
-    // Run e2e tests
-    const testEnv = env;
-    testEnv.PLATFORM = platform;
-    testEnv.APPIUM_APP = `./${testAppName}`;
-
-    if (platform == 'ios') {
-      testEnv.APPIUM_DERIVED_DATA = 'DerivedData';
-    } else if (platform == 'android') {
-      execSync(`adb devices -l`, { stdio: 'inherit', cwd: e2eDir, env: env });
-
-      execSync(`adb logcat -c`, { stdio: 'inherit', cwd: e2eDir, env: env });
-
-      var adbLogStream = fs.createWriteStream(`${e2eDir}/adb.log`);
-      const adbLogProcess = spawn('adb', ['logcat'], { cwd: e2eDir, env: env, shell: false });
-      adbLogProcess.stdout.pipe(adbLogStream);
-      adbLogProcess.stderr.pipe(adbLogStream);
-      adbLogProcess.on('close', () => adbLogStream.close());
-      await newProcess('adb logcat', adbLogProcess);
-    }
-
-    execSync(`yarn test:e2e:runner --verbose`, { stdio: 'inherit', cwd: e2eDir, env: testEnv });
-  } finally {
-    for (const [name, info] of Object.entries(processesToKill)) {
-      console.log(`Sending termination signal to process '${name}' (${info.process.pid})`);
-
-      // Send SIGTERM first to allow graceful shutdown.
-      info.process.kill(15);
-
-      // Also send SIGKILL after 10 seconds.
-      const killTimeout = setTimeout(() => process.kill(9), '10000');
-
-      // Wait for the process to exit (either via SIGTERM or SIGKILL).
-      const code = await info.complete;
-
-      // Successfully exited now, no need to kill (if it hasn't run yet).
-      clearTimeout(killTimeout);
-
-      console.log(`Process '${name}' (${info.process.pid}) exited with code ${code}`);
+  // Run e2e tests
+  if (platform == 'ios') {
+    try {
+      execSync('xcrun simctl list devices | grep -q "(Booted)"');
+    } catch (error) {
+      throw new Error('No simulator is currently booted. Please boot a simulator before running this script.');
     }
-  }
-}
 
-async function waitForAppium() {
-  console.log('Waiting for Appium server to start...');
-  for (let i = 0; i < 60; i++) {
+    execFileSync('xcrun', ['simctl', 'install', 'booted', testApp]);
+  } else if (platform == 'android') {
     try {
-      await fetch('http://127.0.0.1:4723/sessions', { method: 'HEAD' });
-      console.log('Appium server started');
-      return;
+      execSync('adb devices | grep -q "emulator"');
     } catch (error) {
-      console.log(`Appium server hasn't started yet (${error})...`);
-      await sleep(1000);
+      throw new Error('No Android emulator is currently running. Please start an emulator before running this script.');
     }
+
+    execFileSync('adb', ['install', '-r', '-d', testApp]);
   }
-  throw new Error('Appium server failed to start');
-}
 
-async function sleep(millis) {
-  return new Promise(resolve => setTimeout(resolve, millis));
+  execSync(
+    `maestro test maestro \
+      --env=APP_ID="${appId}" \
+      --env=SENTRY_AUTH_TOKEN="${sentryAuthToken}" \
+      --debug-output maestro-logs \
+      --flatten-debug-output`,
+    {
+      stdio: 'inherit',
+      cwd: e2eDir,
+    },
+  );
 }
diff --git a/dev-packages/e2e-tests/maestro/captureException.yml b/dev-packages/e2e-tests/maestro/captureException.yml
@@ -0,0 +1,5 @@
+appId: ${APP_ID}
+---
+- runFlow: utils/launchTestAppClear.yml
+- tapOn: "Capture Exception"
+- runFlow: utils/assertEventIdVisible.yml
diff --git a/dev-packages/e2e-tests/maestro/captureMessage.yml b/dev-packages/e2e-tests/maestro/captureMessage.yml
@@ -0,0 +1,5 @@
+appId: ${APP_ID}
+---
+- runFlow: utils/launchTestAppClear.yml
+- tapOn: "Capture Message"
+- runFlow: utils/assertEventIdVisible.yml
diff --git a/dev-packages/e2e-tests/maestro/captureUnhandledPromiseRejection.yml b/dev-packages/e2e-tests/maestro/captureUnhandledPromiseRejection.yml
@@ -0,0 +1,5 @@
+appId: ${APP_ID}
+---
+- runFlow: utils/launchTestAppClear.yml
+- tapOn: "Unhandled Promise Rejection"
+- runFlow: utils/assertEventIdVisible.yml
diff --git a/dev-packages/e2e-tests/maestro/close.yml b/dev-packages/e2e-tests/maestro/close.yml
@@ -0,0 +1,7 @@
+appId: ${APP_ID}
+---
+- runFlow: utils/launchTestAppClear.yml
+- tapOn: "Close"
+
+- assertNotVisible:
+    id: "eventId"
diff --git a/dev-packages/e2e-tests/maestro/crash.yml b/dev-packages/e2e-tests/maestro/crash.yml
@@ -0,0 +1,7 @@
+appId: ${APP_ID}
+---
+- runFlow: utils/launchTestAppClear.yml
+- tapOn: "Crash"
+
+- launchApp
+- assertVisible: "E2E Tests Ready"
diff --git a/dev-packages/e2e-tests/maestro/utils/assertEventIdVisible.yml b/dev-packages/e2e-tests/maestro/utils/assertEventIdVisible.yml
@@ -0,0 +1,10 @@
+appId: ${APP_ID}
+---
+- extendedWaitUntil:
+    visible:
+      id: "eventId"
+    timeout: 600_000 # 10 minutes
+
+- copyTextFrom:
+    id: "eventId"
+- assertTrue: ${maestro.copiedText}
-Original file line number
+Diff line change
@@ Expand Up / @@ -2,3 +2,6 @@ @@
     *.log
     *.app
     *.apk
+    /react-native-versions
+    /maestro-logs