Skip to content

Commit 2d3f196

Browse files
yousif-bugsnagyousif-bugsnag
authored
Merge pull request #528 from bugsnag/release/v2.10.1
Release v2.10.1
2 parents 6bf8145 + 6fbfd02 commit 2d3f196

38 files changed

+1613
-3195
lines changed

‎.buildkite/browser-pipeline.full.yml‎

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -34,6 +34,11 @@ steps:
3434
artifacts#v1.5.0:
3535
upload:
3636
- "./test/browser/maze_output/failed/**/*"
37+
test-collector#v1.10.2:
38+
files: "reports/TEST-*.xml"
39+
format: "junit"
40+
branch: "^main|next$$"
41+
api-token-env-name: "BROWSER_PERFORMANCE_BUILDKITE_ANALYTICS_TOKEN"
3742
concurrency: 2
3843
concurrency_group: "browserstack"
3944

‎.buildkite/browser-pipeline.yml‎

Lines changed: 10 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -54,6 +54,11 @@ steps:
5454
artifacts#v1.5.0:
5555
upload:
5656
- "./test/browser/maze_output/failed/**/*"
57+
test-collector#v1.10.2:
58+
files: "reports/TEST-*.xml"
59+
format: "junit"
60+
branch: "^main|next$$"
61+
api-token-env-name: "BROWSER_PERFORMANCE_BUILDKITE_ANALYTICS_TOKEN"
5762
concurrency: 25
5863
concurrency_group: "bitbar"
5964
matrix:
@@ -78,6 +83,11 @@ steps:
7883
artifacts#v1.5.0:
7984
upload:
8085
- "./test/browser/maze_output/failed/**/*"
86+
test-collector#v1.10.2:
87+
files: "reports/TEST-*.xml"
88+
format: "junit"
89+
branch: "^main|next$$"
90+
api-token-env-name: "BROWSER_PERFORMANCE_BUILDKITE_ANALYTICS_TOKEN"
8191
concurrency: 2
8292
concurrency_group: "browserstack"
8393
matrix:

‎.buildkite/react-native-navigation-pipeline.full.yml‎

Lines changed: 20 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -140,6 +140,11 @@ steps:
140140
- --appium-version=1.22
141141
- --no-tunnel
142142
- --aws-public-ip
143+
test-collector#v1.10.2:
144+
files: "reports/TEST-*.xml"
145+
format: "junit"
146+
branch: "^main|next$$"
147+
api-token-env-name: "REACT_NATIVE_PERFORMANCE_BUILDKITE_ANALYTICS_TOKEN"
143148
retry:
144149
manual:
145150
permit_on_passed: true
@@ -177,6 +182,11 @@ steps:
177182
- --appium-version=1.22
178183
- --no-tunnel
179184
- --aws-public-ip
185+
test-collector#v1.10.2:
186+
files: "reports/TEST-*.xml"
187+
format: "junit"
188+
branch: "^main|next$$"
189+
api-token-env-name: "REACT_NATIVE_PERFORMANCE_BUILDKITE_ANALYTICS_TOKEN"
180190
retry:
181191
manual:
182192
permit_on_passed: true
@@ -215,6 +225,11 @@ steps:
215225
- --appium-version=1.22
216226
- --no-tunnel
217227
- --aws-public-ip
228+
test-collector#v1.10.2:
229+
files: "reports/TEST-*.xml"
230+
format: "junit"
231+
branch: "^main|next$$"
232+
api-token-env-name: "REACT_NATIVE_PERFORMANCE_BUILDKITE_ANALYTICS_TOKEN"
218233
retry:
219234
manual:
220235
permit_on_passed: true
@@ -252,6 +267,11 @@ steps:
252267
- --appium-version=1.22
253268
- --no-tunnel
254269
- --aws-public-ip
270+
test-collector#v1.10.2:
271+
files: "reports/TEST-*.xml"
272+
format: "junit"
273+
branch: "^main|next$$"
274+
api-token-env-name: "REACT_NATIVE_PERFORMANCE_BUILDKITE_ANALYTICS_TOKEN"
255275
retry:
256276
manual:
257277
permit_on_passed: true

‎.buildkite/react-native-navigation-pipeline.yml‎

Lines changed: 20 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -139,6 +139,11 @@ steps:
139139
- --appium-version=1.22
140140
- --no-tunnel
141141
- --aws-public-ip
142+
test-collector#v1.10.2:
143+
files: "reports/TEST-*.xml"
144+
format: "junit"
145+
branch: "^main|next$$"
146+
api-token-env-name: "REACT_NATIVE_PERFORMANCE_BUILDKITE_ANALYTICS_TOKEN"
142147
retry:
143148
manual:
144149
permit_on_passed: true
@@ -176,6 +181,11 @@ steps:
176181
- --appium-version=1.22
177182
- --no-tunnel
178183
- --aws-public-ip
184+
test-collector#v1.10.2:
185+
files: "reports/TEST-*.xml"
186+
format: "junit"
187+
branch: "^main|next$$"
188+
api-token-env-name: "REACT_NATIVE_PERFORMANCE_BUILDKITE_ANALYTICS_TOKEN"
179189
retry:
180190
manual:
181191
permit_on_passed: true
@@ -214,6 +224,11 @@ steps:
214224
- --appium-version=1.22
215225
- --no-tunnel
216226
- --aws-public-ip
227+
test-collector#v1.10.2:
228+
files: "reports/TEST-*.xml"
229+
format: "junit"
230+
branch: "^main|next$$"
231+
api-token-env-name: "REACT_NATIVE_PERFORMANCE_BUILDKITE_ANALYTICS_TOKEN"
217232
retry:
218233
manual:
219234
permit_on_passed: true
@@ -251,6 +266,11 @@ steps:
251266
- --appium-version=1.22
252267
- --no-tunnel
253268
- --aws-public-ip
269+
test-collector#v1.10.2:
270+
files: "reports/TEST-*.xml"
271+
format: "junit"
272+
branch: "^main|next$$"
273+
api-token-env-name: "REACT_NATIVE_PERFORMANCE_BUILDKITE_ANALYTICS_TOKEN"
254274
retry:
255275
manual:
256276
permit_on_passed: true

‎.buildkite/react-native-pipeline.full.yml‎

Lines changed: 20 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -140,6 +140,11 @@ steps:
140140
- --appium-version=1.22
141141
- --no-tunnel
142142
- --aws-public-ip
143+
test-collector#v1.10.2:
144+
files: "reports/TEST-*.xml"
145+
format: "junit"
146+
branch: "^main|next$$"
147+
api-token-env-name: "REACT_NATIVE_PERFORMANCE_BUILDKITE_ANALYTICS_TOKEN"
143148
retry:
144149
manual:
145150
permit_on_passed: true
@@ -173,6 +178,11 @@ steps:
173178
- --appium-version=1.22
174179
- --no-tunnel
175180
- --aws-public-ip
181+
test-collector#v1.10.2:
182+
files: "reports/TEST-*.xml"
183+
format: "junit"
184+
branch: "^main|next$$"
185+
api-token-env-name: "REACT_NATIVE_PERFORMANCE_BUILDKITE_ANALYTICS_TOKEN"
176186
env:
177187
RCT_NEW_ARCH_ENABLED: "1"
178188
retry:
@@ -207,6 +217,11 @@ steps:
207217
- --appium-version=1.22
208218
- --no-tunnel
209219
- --aws-public-ip
220+
test-collector#v1.10.2:
221+
files: "reports/TEST-*.xml"
222+
format: "junit"
223+
branch: "^main|next$$"
224+
api-token-env-name: "REACT_NATIVE_PERFORMANCE_BUILDKITE_ANALYTICS_TOKEN"
210225
retry:
211226
manual:
212227
permit_on_passed: true
@@ -240,6 +255,11 @@ steps:
240255
- --appium-version=1.22
241256
- --no-tunnel
242257
- --aws-public-ip
258+
test-collector#v1.10.2:
259+
files: "reports/TEST-*.xml"
260+
format: "junit"
261+
branch: "^main|next$$"
262+
api-token-env-name: "REACT_NATIVE_PERFORMANCE_BUILDKITE_ANALYTICS_TOKEN"
243263
env:
244264
RCT_NEW_ARCH_ENABLED: "1"
245265
retry:

‎.buildkite/react-native-pipeline.yml‎

Lines changed: 20 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -125,6 +125,11 @@ steps:
125125
- --appium-version=1.22
126126
- --no-tunnel
127127
- --aws-public-ip
128+
test-collector#v1.10.2:
129+
files: "reports/TEST-*.xml"
130+
format: "junit"
131+
branch: "^main|next$$"
132+
api-token-env-name: "REACT_NATIVE_PERFORMANCE_BUILDKITE_ANALYTICS_TOKEN"
128133
retry:
129134
manual:
130135
permit_on_passed: true
@@ -154,6 +159,11 @@ steps:
154159
- --appium-version=1.22
155160
- --no-tunnel
156161
- --aws-public-ip
162+
test-collector#v1.10.2:
163+
files: "reports/TEST-*.xml"
164+
format: "junit"
165+
branch: "^main|next$$"
166+
api-token-env-name: "REACT_NATIVE_PERFORMANCE_BUILDKITE_ANALYTICS_TOKEN"
157167
env:
158168
RCT_NEW_ARCH_ENABLED: "1"
159169
retry:
@@ -185,6 +195,11 @@ steps:
185195
- --appium-version=1.22
186196
- --no-tunnel
187197
- --aws-public-ip
198+
test-collector#v1.10.2:
199+
files: "reports/TEST-*.xml"
200+
format: "junit"
201+
branch: "^main|next$$"
202+
api-token-env-name: "REACT_NATIVE_PERFORMANCE_BUILDKITE_ANALYTICS_TOKEN"
188203
retry:
189204
manual:
190205
permit_on_passed: true
@@ -214,6 +229,11 @@ steps:
214229
- --appium-version=1.22
215230
- --no-tunnel
216231
- --aws-public-ip
232+
test-collector#v1.10.2:
233+
files: "reports/TEST-*.xml"
234+
format: "junit"
235+
branch: "^main|next$$"
236+
api-token-env-name: "REACT_NATIVE_PERFORMANCE_BUILDKITE_ANALYTICS_TOKEN"
217237
env:
218238
RCT_NEW_ARCH_ENABLED: "1"
219239
retry:

‎CHANGELOG.md‎

Lines changed: 10 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,15 @@
11
# Changelog
22

3+
## [v2.10.1] (2024-11-12)
4+
5+
### Fixed
6+
7+
- (react-native) Prevent duplicate app start spans from being started [#524](https://github.com/bugsnag/bugsnag-js-performance/pull/524)
8+
9+
### Changed
10+
11+
- (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)
12+
313
## [v2.10.0] (2024-09-26)
414

515
### Added

‎bin/generate-react-native-fixture‎

Lines changed: 28 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -59,10 +59,10 @@ const DEPENDENCIES = [
5959
`react-native-file-access@${reactNativeFileAccessVersion}`
6060
]
6161

62-
const reactNavigationVersion = parseFloat(reactNativeVersion) <= 0.64 ? '6.1.18' : 'latest'
63-
const reactNavigationNativeStackVersion = parseFloat(reactNativeVersion) <= 0.64 ? '6.11.0' : 'latest'
64-
const reactNativeScreensVersion = parseFloat(reactNativeVersion) <= 0.64 ? '3.14.0' : 'latest'
65-
const reactNativeSafeAreaContextVersion = parseFloat(reactNativeVersion) <= 0.64 ? '4.1.0' : 'latest'
62+
const reactNavigationVersion = '6.1.18'
63+
const reactNavigationNativeStackVersion = '6.11.0'
64+
const reactNativeScreensVersion = parseFloat(reactNativeVersion) <= 0.64 ? '3.14.0' : '3.35.0'
65+
const reactNativeSafeAreaContextVersion = parseFloat(reactNativeVersion) <= 0.64 ? '4.1.0' : '4.14.0'
6666
const REACT_NAVIGATION_DEPENDENCIES = [
6767
`@react-navigation/native@${reactNavigationVersion}`,
6868
`@react-navigation/native-stack@${reactNavigationNativeStackVersion}`,
@@ -98,7 +98,7 @@ if (!process.env.SKIP_GENERATE_FIXTURE) {
9898
}
9999

100100
// create the test fixture
101-
const RNInitArgs = ['@react-native-community/cli@latest', 'init', 'reactnative', '--package-name', 'com.bugsnag.fixtures.reactnative.performance', '--directory', fixtureDir, '--version', reactNativeVersion, '--npm', '--skip-install']
101+
const RNInitArgs = ['@react-native-community/cli@latest', 'init', 'reactnative', '--package-name', 'com.bugsnag.fixtures.reactnative.performance', '--directory', fixtureDir, '--version', reactNativeVersion, '--pm', 'npm', '--skip-install']
102102
execFileSync('npx', RNInitArgs, { stdio: 'inherit' })
103103

104104
replaceGeneratedFixtureFiles()
@@ -127,7 +127,8 @@ if (process.env.BUILD_IOS === 'true' || process.env.BUILD_IOS === '1') {
127127
fs.rmSync(`${fixtureDir}/reactnative.xcarchive`, { recursive: true, force: true })
128128

129129
// install pods
130-
execFileSync('pod', ['install'], { cwd: `${fixtureDir}/ios`, stdio: 'inherit' })
130+
execFileSync('bundle', ['install'], { cwd: `${fixtureDir}/ios`, stdio: 'inherit' })
131+
execFileSync('bundle', ['exec', 'pod', 'install'], { cwd: `${fixtureDir}/ios`, stdio: 'inherit' })
131132

132133
// build the iOS app
133134
const archiveArgs = [
@@ -222,6 +223,9 @@ function configureRN064Fixture(fixtureDir) {
222223
let yogaCpp = fs.readFileSync(yogaCppPath, 'utf8')
223224
yogaCpp = yogaCpp.replace('node->getLayout().hadOverflow() |', 'node->getLayout().hadOverflow() ||')
224225
fs.writeFileSync(yogaCppPath, yogaCpp)
226+
227+
// copy gemfile
228+
fs.copyFileSync(resolve(ROOT_DIR, 'test/react-native/features/fixtures/app/Gemfile'), resolve(fixtureDir, 'Gemfile'))
225229
}
226230

227231
/** Pack and install local packages from this repo */
@@ -302,4 +306,22 @@ function replaceGeneratedFixtureFiles() {
302306
resolve(fixtureDir, `android/app/src/main/java/com/bugsnag/fixtures/reactnative/performance/MainActivity.${fileExtension}`)
303307
)
304308
}
309+
310+
// disable Flipper
311+
let podfileContents = fs.readFileSync(`${fixtureDir}/ios/Podfile`, 'utf8')
312+
if (podfileContents.includes('use_flipper!')) {
313+
podfileContents = podfileContents.replace(/use_flipper!/, '# use_flipper!')
314+
} else if (podfileContents.includes(':flipper_configuration')) {
315+
podfileContents = podfileContents.replace(/:flipper_configuration/, '# :flipper_configuration')
316+
}
317+
318+
fs.writeFileSync(`${fixtureDir}/ios/Podfile`, podfileContents)
319+
320+
// pin xcodeproj version to < 1.26.0
321+
const gemfilePath = resolve(fixtureDir, 'Gemfile')
322+
if (fs.existsSync(gemfilePath)) {
323+
let gemfileContents = fs.readFileSync(gemfilePath, 'utf8')
324+
gemfileContents += `\ngem 'xcodeproj', '< 1.26.0'`
325+
fs.writeFileSync(gemfilePath, gemfileContents)
326+
}
305327
}

‎docker-compose.yml‎

Lines changed: 9 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -18,6 +18,7 @@ x-common-environment: &common-environment
1818
MAZE_ASPECTO_REPEATER_API_KEY:
1919
MAZE_BUGSNAG_API_KEY:
2020
MAZE_REPEATER_API_KEY:
21+
MAZE_NO_FAIL_FAST:
2122

2223
services:
2324
license-finder:
@@ -40,8 +41,6 @@ services:
4041
BITBAR_ACCESS_KEY:
4142
HOST: "${HOST:-maze-runner}"
4243
API_HOST: "${API_HOST:-maze-runner}"
43-
env_file:
44-
- ${DOCKER_ENV_FILE:-test/browser/features/fixtures/null_env}
4544
networks:
4645
default:
4746
aliases:
@@ -52,6 +51,7 @@ services:
5251
volumes:
5352
- ./test/browser/maze_output:/app/test/browser/maze_output
5453
- /var/run/docker.sock:/var/run/docker.sock
54+
- ./reports/:/app/test/browser/reports/
5555

5656
browser-maze-runner-bs:
5757
build:
@@ -62,18 +62,17 @@ services:
6262
USE_CDN_BUILD:
6363
environment: &browser-maze-runner-environment
6464
<<: *common-environment
65-
BROWSER_STACK_BROWSERS_USERNAME:
66-
BROWSER_STACK_BROWSERS_ACCESS_KEY:
65+
BROWSER_STACK_USERNAME:
66+
BROWSER_STACK_ACCESS_KEY:
6767
HOST: "${HOST:-maze-runner}"
6868
API_HOST: "${API_HOST:-maze-runner}"
69-
env_file:
70-
- ${DOCKER_ENV_FILE:-test/browser/features/fixtures/null_env}
7169
networks:
7270
default:
7371
aliases:
7472
- maze-runner
7573
volumes:
7674
- ./test/browser/maze_output:/app/test/browser/maze_output
75+
- ./reports/:/app/test/browser/reports/
7776

7877
browser-maze-runner-legacy:
7978
build:
@@ -84,17 +83,16 @@ services:
8483
USE_CDN_BUILD:
8584
environment:
8685
<<: *common-environment
87-
BROWSER_STACK_BROWSERS_USERNAME:
88-
BROWSER_STACK_BROWSERS_ACCESS_KEY:
86+
BROWSER_STACK_USERNAME:
87+
BROWSER_STACK_ACCESS_KEY:
8988
USE_LEGACY_DRIVER: 1
90-
env_file:
91-
- ${DOCKER_ENV_FILE:-test/browser/features/fixtures/null_env}
9289
networks:
9390
default:
9491
aliases:
9592
- maze-runner
9693
volumes:
9794
- ./test/browser/maze_output:/app/test/browser/maze_output
95+
- ./reports/:/app/test/browser/reports/
9896

9997
react-native-maze-runner:
10098
image: 855461928731.dkr.ecr.us-west-1.amazonaws.com/maze-runner-releases:latest-v9-cli
@@ -115,6 +113,7 @@ services:
115113
- ./test/react-native/features/:/app/features
116114
- ./test/react-native/maze_output:/app/maze_output
117115
- /var/run/docker.sock:/var/run/docker.sock
116+
- ./reports/:/app/reports
118117

119118
release:
120119
build:

‎lerna.json‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,4 @@
11
{
22
"$schema": "node_modules/lerna/schemas/lerna-schema.json",
3-
"useWorkspaces": true,
43
"version": "2.10.0"
54
}

0 commit comments

Comments
 (0)