Merge pull request #528 from bugsnag/release/v2.10.1

Release v2.10.1
bugsnag · Nov 12, 2024 · 2d3f196 · 2d3f196
2 parents 6bf8145 + 6fbfd02
commit 2d3f196
Show file tree

Hide file tree

Showing 38 changed files with 1,613 additions and 3,195 deletions.
diff --git a/.buildkite/browser-pipeline.full.yml b/.buildkite/browser-pipeline.full.yml
@@ -34,6 +34,11 @@ steps:
       artifacts#v1.5.0:
         upload:
           - "./test/browser/maze_output/failed/**/*"
+      test-collector#v1.10.2:
+        files: "reports/TEST-*.xml"
+        format: "junit"
+        branch: "^main|next$$"
+        api-token-env-name: "BROWSER_PERFORMANCE_BUILDKITE_ANALYTICS_TOKEN"
     concurrency: 2
     concurrency_group: "browserstack"
 

diff --git a/.buildkite/browser-pipeline.yml b/.buildkite/browser-pipeline.yml
@@ -54,6 +54,11 @@ steps:
           artifacts#v1.5.0:
             upload:
               - "./test/browser/maze_output/failed/**/*"
+          test-collector#v1.10.2:
+            files: "reports/TEST-*.xml"
+            format: "junit"
+            branch: "^main|next$$"
+            api-token-env-name: "BROWSER_PERFORMANCE_BUILDKITE_ANALYTICS_TOKEN"
         concurrency: 25
         concurrency_group: "bitbar"
         matrix:
@@ -78,6 +83,11 @@ steps:
           artifacts#v1.5.0:
             upload:
               - "./test/browser/maze_output/failed/**/*"
+          test-collector#v1.10.2:
+            files: "reports/TEST-*.xml"
+            format: "junit"
+            branch: "^main|next$$"
+            api-token-env-name: "BROWSER_PERFORMANCE_BUILDKITE_ANALYTICS_TOKEN"
         concurrency: 2
         concurrency_group: "browserstack"
         matrix:

diff --git a/.buildkite/react-native-navigation-pipeline.full.yml b/.buildkite/react-native-navigation-pipeline.full.yml
@@ -140,6 +140,11 @@ steps:
               - --appium-version=1.22
               - --no-tunnel
               - --aws-public-ip
+          test-collector#v1.10.2:
+            files: "reports/TEST-*.xml"
+            format: "junit"
+            branch: "^main|next$$"
+            api-token-env-name: "REACT_NATIVE_PERFORMANCE_BUILDKITE_ANALYTICS_TOKEN"
         retry:
           manual:
             permit_on_passed: true
@@ -177,6 +182,11 @@ steps:
               - --appium-version=1.22
               - --no-tunnel
               - --aws-public-ip
+          test-collector#v1.10.2:
+            files: "reports/TEST-*.xml"
+            format: "junit"
+            branch: "^main|next$$"
+            api-token-env-name: "REACT_NATIVE_PERFORMANCE_BUILDKITE_ANALYTICS_TOKEN"
         retry:
           manual:
             permit_on_passed: true
@@ -215,6 +225,11 @@ steps:
               - --appium-version=1.22
               - --no-tunnel
               - --aws-public-ip
+          test-collector#v1.10.2:
+            files: "reports/TEST-*.xml"
+            format: "junit"
+            branch: "^main|next$$"
+            api-token-env-name: "REACT_NATIVE_PERFORMANCE_BUILDKITE_ANALYTICS_TOKEN"
         retry:
           manual:
             permit_on_passed: true
@@ -252,6 +267,11 @@ steps:
               - --appium-version=1.22
               - --no-tunnel
               - --aws-public-ip
+          test-collector#v1.10.2:
+            files: "reports/TEST-*.xml"
+            format: "junit"
+            branch: "^main|next$$"
+            api-token-env-name: "REACT_NATIVE_PERFORMANCE_BUILDKITE_ANALYTICS_TOKEN"
         retry:
           manual:
             permit_on_passed: true

diff --git a/.buildkite/react-native-navigation-pipeline.yml b/.buildkite/react-native-navigation-pipeline.yml
@@ -139,6 +139,11 @@ steps:
               - --appium-version=1.22
               - --no-tunnel
               - --aws-public-ip
+          test-collector#v1.10.2:
+            files: "reports/TEST-*.xml"
+            format: "junit"
+            branch: "^main|next$$"
+            api-token-env-name: "REACT_NATIVE_PERFORMANCE_BUILDKITE_ANALYTICS_TOKEN"
         retry:
           manual:
             permit_on_passed: true
@@ -176,6 +181,11 @@ steps:
               - --appium-version=1.22
               - --no-tunnel
               - --aws-public-ip
+          test-collector#v1.10.2:
+            files: "reports/TEST-*.xml"
+            format: "junit"
+            branch: "^main|next$$"
+            api-token-env-name: "REACT_NATIVE_PERFORMANCE_BUILDKITE_ANALYTICS_TOKEN"
         retry:
           manual:
             permit_on_passed: true
@@ -214,6 +224,11 @@ steps:
               - --appium-version=1.22
               - --no-tunnel
               - --aws-public-ip
+          test-collector#v1.10.2:
+            files: "reports/TEST-*.xml"
+            format: "junit"
+            branch: "^main|next$$"
+            api-token-env-name: "REACT_NATIVE_PERFORMANCE_BUILDKITE_ANALYTICS_TOKEN"
         retry:
           manual:
             permit_on_passed: true
@@ -251,6 +266,11 @@ steps:
               - --appium-version=1.22
               - --no-tunnel
               - --aws-public-ip
+          test-collector#v1.10.2:
+            files: "reports/TEST-*.xml"
+            format: "junit"
+            branch: "^main|next$$"
+            api-token-env-name: "REACT_NATIVE_PERFORMANCE_BUILDKITE_ANALYTICS_TOKEN"
         retry:
           manual:
             permit_on_passed: true

diff --git a/.buildkite/react-native-pipeline.full.yml b/.buildkite/react-native-pipeline.full.yml
@@ -140,6 +140,11 @@ steps:
               - --appium-version=1.22
               - --no-tunnel
               - --aws-public-ip
+          test-collector#v1.10.2:
+            files: "reports/TEST-*.xml"
+            format: "junit"
+            branch: "^main|next$$"
+            api-token-env-name: "REACT_NATIVE_PERFORMANCE_BUILDKITE_ANALYTICS_TOKEN"
         retry:
           manual:
             permit_on_passed: true
@@ -173,6 +178,11 @@ steps:
               - --appium-version=1.22
               - --no-tunnel
               - --aws-public-ip
+          test-collector#v1.10.2:
+            files: "reports/TEST-*.xml"
+            format: "junit"
+            branch: "^main|next$$"
+            api-token-env-name: "REACT_NATIVE_PERFORMANCE_BUILDKITE_ANALYTICS_TOKEN"
         env:
           RCT_NEW_ARCH_ENABLED: "1"
         retry:
@@ -207,6 +217,11 @@ steps:
               - --appium-version=1.22
               - --no-tunnel
               - --aws-public-ip
+          test-collector#v1.10.2:
+            files: "reports/TEST-*.xml"
+            format: "junit"
+            branch: "^main|next$$"
+            api-token-env-name: "REACT_NATIVE_PERFORMANCE_BUILDKITE_ANALYTICS_TOKEN"
         retry:
           manual:
             permit_on_passed: true
@@ -240,6 +255,11 @@ steps:
               - --appium-version=1.22
               - --no-tunnel
               - --aws-public-ip
+          test-collector#v1.10.2:
+            files: "reports/TEST-*.xml"
+            format: "junit"
+            branch: "^main|next$$"
+            api-token-env-name: "REACT_NATIVE_PERFORMANCE_BUILDKITE_ANALYTICS_TOKEN"
         env:
           RCT_NEW_ARCH_ENABLED: "1"
         retry:

diff --git a/.buildkite/react-native-pipeline.yml b/.buildkite/react-native-pipeline.yml
@@ -125,6 +125,11 @@ steps:
               - --appium-version=1.22
               - --no-tunnel
               - --aws-public-ip
+          test-collector#v1.10.2:
+            files: "reports/TEST-*.xml"
+            format: "junit"
+            branch: "^main|next$$"
+            api-token-env-name: "REACT_NATIVE_PERFORMANCE_BUILDKITE_ANALYTICS_TOKEN"
         retry:
           manual:
             permit_on_passed: true
@@ -154,6 +159,11 @@ steps:
               - --appium-version=1.22
               - --no-tunnel
               - --aws-public-ip
+          test-collector#v1.10.2:
+            files: "reports/TEST-*.xml"
+            format: "junit"
+            branch: "^main|next$$"
+            api-token-env-name: "REACT_NATIVE_PERFORMANCE_BUILDKITE_ANALYTICS_TOKEN"
         env:
           RCT_NEW_ARCH_ENABLED: "1"
         retry:
@@ -185,6 +195,11 @@ steps:
               - --appium-version=1.22
               - --no-tunnel
               - --aws-public-ip
+          test-collector#v1.10.2:
+            files: "reports/TEST-*.xml"
+            format: "junit"
+            branch: "^main|next$$"
+            api-token-env-name: "REACT_NATIVE_PERFORMANCE_BUILDKITE_ANALYTICS_TOKEN"
         retry:
           manual:
             permit_on_passed: true
@@ -214,6 +229,11 @@ steps:
               - --appium-version=1.22
               - --no-tunnel
               - --aws-public-ip
+          test-collector#v1.10.2:
+            files: "reports/TEST-*.xml"
+            format: "junit"
+            branch: "^main|next$$"
+            api-token-env-name: "REACT_NATIVE_PERFORMANCE_BUILDKITE_ANALYTICS_TOKEN"
         env:
           RCT_NEW_ARCH_ENABLED: "1"
         retry:

diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,5 +1,15 @@
 # Changelog
 
+## [v2.10.1] (2024-11-12)
+
+### Fixed
+
+- (react-native) Prevent duplicate app start spans from being started [#524](https://github.com/bugsnag/bugsnag-js-performance/pull/524)
+
+### Changed
+
+- (browser) Update Span and Trace ID generator code to allow for modified `Array.from` API [#518](https://github.com/bugsnag/bugsnag-js-performance/pull/518)
+
 ## [v2.10.0] (2024-09-26)
 
 ### Added

diff --git a/bin/generate-react-native-fixture b/bin/generate-react-native-fixture
@@ -59,10 +59,10 @@ const DEPENDENCIES = [
   `react-native-file-access@${reactNativeFileAccessVersion}`
 ]
 
-const reactNavigationVersion = parseFloat(reactNativeVersion) <= 0.64 ? '6.1.18' : 'latest'
-const reactNavigationNativeStackVersion = parseFloat(reactNativeVersion) <= 0.64 ? '6.11.0' : 'latest'
-const reactNativeScreensVersion = parseFloat(reactNativeVersion) <= 0.64 ? '3.14.0' : 'latest'
-const reactNativeSafeAreaContextVersion = parseFloat(reactNativeVersion) <= 0.64 ? '4.1.0' : 'latest'
+const reactNavigationVersion = '6.1.18'
+const reactNavigationNativeStackVersion = '6.11.0'
+const reactNativeScreensVersion = parseFloat(reactNativeVersion) <= 0.64 ? '3.14.0' : '3.35.0'
+const reactNativeSafeAreaContextVersion = parseFloat(reactNativeVersion) <= 0.64 ? '4.1.0' : '4.14.0'
 const REACT_NAVIGATION_DEPENDENCIES = [
   `@react-navigation/native@${reactNavigationVersion}`,
   `@react-navigation/native-stack@${reactNavigationNativeStackVersion}`,
@@ -98,7 +98,7 @@ if (!process.env.SKIP_GENERATE_FIXTURE) {
   }
 
   // create the test fixture
-  const RNInitArgs = ['@react-native-community/cli@latest', 'init', 'reactnative', '--package-name', 'com.bugsnag.fixtures.reactnative.performance', '--directory', fixtureDir, '--version', reactNativeVersion, '--npm', '--skip-install']
+  const RNInitArgs = ['@react-native-community/cli@latest', 'init', 'reactnative', '--package-name', 'com.bugsnag.fixtures.reactnative.performance', '--directory', fixtureDir, '--version', reactNativeVersion, '--pm', 'npm', '--skip-install']
   execFileSync('npx', RNInitArgs, { stdio: 'inherit' })
 
   replaceGeneratedFixtureFiles()
@@ -127,7 +127,8 @@ if (process.env.BUILD_IOS === 'true' || process.env.BUILD_IOS === '1') {
   fs.rmSync(`${fixtureDir}/reactnative.xcarchive`, { recursive: true, force: true })
 
   // install pods
-  execFileSync('pod', ['install'], { cwd: `${fixtureDir}/ios`, stdio: 'inherit' })
+  execFileSync('bundle', ['install'], { cwd: `${fixtureDir}/ios`, stdio: 'inherit' })
+  execFileSync('bundle', ['exec', 'pod', 'install'], { cwd: `${fixtureDir}/ios`, stdio: 'inherit' })
 
   // build the iOS app
   const archiveArgs = [
@@ -222,6 +223,9 @@ function configureRN064Fixture(fixtureDir) {
   let yogaCpp = fs.readFileSync(yogaCppPath, 'utf8')
   yogaCpp = yogaCpp.replace('node->getLayout().hadOverflow() |', 'node->getLayout().hadOverflow() ||')
   fs.writeFileSync(yogaCppPath, yogaCpp)
+
+  // copy gemfile
+  fs.copyFileSync(resolve(ROOT_DIR, 'test/react-native/features/fixtures/app/Gemfile'), resolve(fixtureDir, 'Gemfile'))
 }
 
 /** Pack and install local packages from this repo */
@@ -302,4 +306,22 @@ function replaceGeneratedFixtureFiles() {
       resolve(fixtureDir, `android/app/src/main/java/com/bugsnag/fixtures/reactnative/performance/MainActivity.${fileExtension}`)
     )
   }
+
+  // disable Flipper
+  let podfileContents = fs.readFileSync(`${fixtureDir}/ios/Podfile`, 'utf8')
+  if (podfileContents.includes('use_flipper!')) {
+    podfileContents = podfileContents.replace(/use_flipper!/, '# use_flipper!')
+  } else if (podfileContents.includes(':flipper_configuration')) {
+    podfileContents = podfileContents.replace(/:flipper_configuration/, '# :flipper_configuration')
+  }
+
+  fs.writeFileSync(`${fixtureDir}/ios/Podfile`, podfileContents)
+
+  // pin xcodeproj version to < 1.26.0
+  const gemfilePath = resolve(fixtureDir, 'Gemfile')
+  if (fs.existsSync(gemfilePath)) {
+    let gemfileContents = fs.readFileSync(gemfilePath, 'utf8')
+    gemfileContents += `\ngem 'xcodeproj', '< 1.26.0'`
+    fs.writeFileSync(gemfilePath, gemfileContents)
+  }
 }
diff --git a/docker-compose.yml b/docker-compose.yml
@@ -18,6 +18,7 @@ x-common-environment: &common-environment
   MAZE_ASPECTO_REPEATER_API_KEY:
   MAZE_BUGSNAG_API_KEY:
   MAZE_REPEATER_API_KEY:
+  MAZE_NO_FAIL_FAST:
 
 services:
   license-finder:
@@ -40,8 +41,6 @@ services:
       BITBAR_ACCESS_KEY:
       HOST: "${HOST:-maze-runner}"
       API_HOST: "${API_HOST:-maze-runner}"
-    env_file:
-      - ${DOCKER_ENV_FILE:-test/browser/features/fixtures/null_env}
     networks:
       default:
         aliases:
@@ -52,6 +51,7 @@ services:
     volumes:
       - ./test/browser/maze_output:/app/test/browser/maze_output
       - /var/run/docker.sock:/var/run/docker.sock
+      - ./reports/:/app/test/browser/reports/
 
   browser-maze-runner-bs:
     build:
@@ -62,18 +62,17 @@ services:
         USE_CDN_BUILD:
     environment: &browser-maze-runner-environment
       <<: *common-environment
-      BROWSER_STACK_BROWSERS_USERNAME:
-      BROWSER_STACK_BROWSERS_ACCESS_KEY:
+      BROWSER_STACK_USERNAME:
+      BROWSER_STACK_ACCESS_KEY:
       HOST: "${HOST:-maze-runner}"
       API_HOST: "${API_HOST:-maze-runner}"
-    env_file:
-      - ${DOCKER_ENV_FILE:-test/browser/features/fixtures/null_env}
     networks:
       default:
         aliases:
           - maze-runner
     volumes:
       - ./test/browser/maze_output:/app/test/browser/maze_output
+      - ./reports/:/app/test/browser/reports/
 
   browser-maze-runner-legacy:
     build:
@@ -84,17 +83,16 @@ services:
         USE_CDN_BUILD:
     environment:
       <<: *common-environment
-      BROWSER_STACK_BROWSERS_USERNAME:
-      BROWSER_STACK_BROWSERS_ACCESS_KEY:
+      BROWSER_STACK_USERNAME:
+      BROWSER_STACK_ACCESS_KEY:
       USE_LEGACY_DRIVER: 1
-    env_file:
-      - ${DOCKER_ENV_FILE:-test/browser/features/fixtures/null_env}
     networks:
       default:
         aliases:
           - maze-runner
     volumes:
       - ./test/browser/maze_output:/app/test/browser/maze_output
+      - ./reports/:/app/test/browser/reports/
 
   react-native-maze-runner:
     image: 855461928731.dkr.ecr.us-west-1.amazonaws.com/maze-runner-releases:latest-v9-cli
@@ -115,6 +113,7 @@ services:
       - ./test/react-native/features/:/app/features
       - ./test/react-native/maze_output:/app/maze_output
       - /var/run/docker.sock:/var/run/docker.sock
+      - ./reports/:/app/reports
 
   release:
     build:

diff --git a/lerna.json b/lerna.json
@@ -1,5 +1,4 @@
 {
   "$schema": "node_modules/lerna/schemas/lerna-schema.json",
-  "useWorkspaces": true,
   "version": "2.10.0"
 }