Skip to content

Commit 7bc0799

Browse files
authored
Merge 4d98e79 into fcbe8ce
2 parents fcbe8ce + 4d98e79 commit 7bc0799

File tree

284 files changed

+33445
-246
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

284 files changed

+33445
-246
lines changed

.eslintignore

+4-2
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,10 @@
11
# Ignore build generated dir
22
dist
33

4-
# Ignore sample folder
4+
# Ignore standalone apps
55
sample
6+
sample-new-architecture
7+
test/perf/TestApp*
68

79
# Ignore dangerfile
8-
dangerfile.js
10+
dangerfile.js

.github/workflows/buildandtest.yml

+22-1
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,8 @@ jobs:
1414
steps:
1515
- uses: actions/checkout@v3
1616
- uses: actions/setup-node@v3
17-
17+
with:
18+
node-version: 14
1819
- uses: actions/cache@v3
1920
id: cache
2021
with:
@@ -42,12 +43,32 @@ jobs:
4243
- name: Lint
4344
run: yarn lint
4445

46+
job_lint_sample_new_arch:
47+
name: Lint Sample
48+
runs-on: ubuntu-latest
49+
steps:
50+
- uses: actions/checkout@v3
51+
- uses: actions/cache@v3
52+
id: cache
53+
with:
54+
path: sample-new-architecture/node_modules
55+
key: ${{ runner.os }}-${{ github.sha }}
56+
- name: Install Dependencies
57+
if: steps.cache.outputs['cache-hit'] != 'true'
58+
run: yarn install
59+
working-directory: sample-new-architecture
60+
- name: Lint Sample
61+
run: yarn lint
62+
working-directory: sample-new-architecture
63+
4564
job_build:
4665
name: Build
4766
runs-on: ubuntu-latest
4867
steps:
4968
- uses: actions/checkout@v3
5069
- uses: actions/setup-node@v3
70+
with:
71+
node-version: 14
5172
- uses: actions/cache@v3
5273
id: cache
5374
with:

.github/workflows/codegen.yml

+37
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,37 @@
1+
name: Codegen
2+
3+
on:
4+
push:
5+
branches:
6+
- main
7+
- release/**
8+
pull_request:
9+
10+
jobs:
11+
codegen:
12+
runs-on: ubuntu-latest
13+
strategy:
14+
matrix:
15+
platform: ["android"] # "ios" will be added after codegen is fixed
16+
include:
17+
- platform: android
18+
command: |
19+
cd sample-new-architecture/android
20+
./gradlew generateCodegenArtifactsFromSchema
21+
steps:
22+
- uses: actions/checkout@v3
23+
- uses: actions/setup-node@v3
24+
with:
25+
node-version: 14
26+
- uses: actions/cache@v3
27+
id: cache
28+
with:
29+
path: sample-new-architecture/node_modules
30+
key: ${{ runner.os }}-${{ github.sha }}
31+
- name: Install Dependencies
32+
if: steps.cache.outputs['cache-hit'] != 'true'
33+
run: |
34+
cd sample-new-architecture
35+
yarn install
36+
- name: Codegen
37+
run: ${{ matrix.command }}

.github/workflows/e2e.yml

+100
Original file line numberDiff line numberDiff line change
@@ -140,3 +140,103 @@ jobs:
140140
path: |
141141
./sample/*.log
142142
./sample/*.png
143+
144+
metrics:
145+
runs-on: macos-latest
146+
strategy:
147+
# we want that the matrix keeps running, default is to cancel them if it fails.
148+
fail-fast: false
149+
matrix:
150+
platform: ["ios", "android"]
151+
include:
152+
- platform: ios
153+
name: iOS
154+
appPlain: test/perf/test-app-plain.ipa
155+
- platform: android
156+
name: Android
157+
appPlain: test/perf/TestAppPlain/android/app/build/outputs/apk/release/app-release.apk
158+
steps:
159+
- uses: actions/checkout@v3
160+
- uses: actions/setup-node@v3
161+
with:
162+
node-version: "14"
163+
- uses: actions/setup-java@v3
164+
with:
165+
java-version: "11"
166+
distribution: "adopt"
167+
- name: Install Global Dependencies
168+
run: yarn global add react-native-cli @sentry/cli yalc
169+
- uses: actions/cache@v3
170+
id: deps-cache
171+
with:
172+
path: |
173+
node_modules
174+
test/perf/TestAppSentry/node_modules
175+
key: ${{ github.workflow }}-${{ github.job }}-${{ hashFiles('yarn.lock', 'test/perf/TestAppSentry/yarn.lock') }}
176+
- name: Install Dependencies
177+
if: steps.deps-cache.outputs['cache-hit'] != 'true'
178+
run: yarn install
179+
- name: Build SDK
180+
run: yarn build
181+
- name: Package SDK
182+
run: yalc publish
183+
- uses: actions/setup-node@v3
184+
with:
185+
node-version: "16"
186+
- uses: actions/cache@v3
187+
id: app-plain-cache
188+
with:
189+
path: ${{ matrix.appPlain }}
190+
key: ${{ github.workflow }}-${{ github.job }}-appplain-${{ hashFiles('test/perf/TestAppPlain/**') }}
191+
- name: Build app plain
192+
if: steps.app-plain-cache.outputs['cache-hit'] != 'true'
193+
working-directory: ./test/perf/TestAppPlain
194+
run: |
195+
yarn install
196+
cd ${{ matrix.platform }}
197+
if [[ "${{ matrix.platform }}" == "android" ]]; then
198+
./gradlew assembleRelease
199+
else
200+
pod install
201+
cd ../..
202+
fastlane build_perf_test_app_plain
203+
fi
204+
env:
205+
APP_STORE_CONNECT_KEY_ID: ${{ secrets.APP_STORE_CONNECT_KEY_ID }}
206+
APP_STORE_CONNECT_ISSUER_ID: ${{ secrets.APP_STORE_CONNECT_ISSUER_ID }}
207+
APP_STORE_CONNECT_KEY: ${{ secrets.APP_STORE_CONNECT_KEY }}
208+
FASTLANE_KEYCHAIN_PASSWORD: ${{ secrets.FASTLANE_KEYCHAIN_PASSWORD }}
209+
MATCH_GIT_PRIVATE_KEY: ${{ secrets.MATCH_GIT_PRIVATE_KEY }}
210+
MATCH_PASSWORD: ${{ secrets.MATCH_PASSWORD }}
211+
MATCH_USERNAME: ${{ secrets.MATCH_USERNAME }}
212+
- name: Build app with Sentry
213+
working-directory: ./test/perf/TestAppSentry
214+
run: |
215+
yalc add @sentry/react-native
216+
yarn install
217+
cd ${{ matrix.platform }}
218+
if [[ "${{ matrix.platform }}" == "android" ]]; then
219+
./gradlew assembleRelease
220+
else
221+
pod install
222+
cd ../..
223+
fastlane build_perf_test_app_sentry
224+
cd TestAppSentry
225+
fi
226+
# Remove after build so that the cache isn't invaldiated due to the changes in yarn.lock.
227+
yarn remove @sentry/react-native
228+
env:
229+
APP_STORE_CONNECT_KEY_ID: ${{ secrets.APP_STORE_CONNECT_KEY_ID }}
230+
APP_STORE_CONNECT_ISSUER_ID: ${{ secrets.APP_STORE_CONNECT_ISSUER_ID }}
231+
APP_STORE_CONNECT_KEY: ${{ secrets.APP_STORE_CONNECT_KEY }}
232+
FASTLANE_KEYCHAIN_PASSWORD: ${{ secrets.FASTLANE_KEYCHAIN_PASSWORD }}
233+
MATCH_GIT_PRIVATE_KEY: ${{ secrets.MATCH_GIT_PRIVATE_KEY }}
234+
MATCH_PASSWORD: ${{ secrets.MATCH_PASSWORD }}
235+
MATCH_USERNAME: ${{ secrets.MATCH_USERNAME }}
236+
- name: Collect apps metrics
237+
uses: getsentry/action-app-sdk-overhead-metrics@v1
238+
with:
239+
name: ${{ matrix.name }}
240+
config: ./test/perf/metrics-${{ matrix.platform }}.yml
241+
sauce-user: ${{ secrets.SAUCE_USERNAME }}
242+
sauce-key: ${{ secrets.SAUCE_ACCESS_KEY }}

.github/workflows/release.yml

+5-1
Original file line numberDiff line numberDiff line change
@@ -8,11 +8,14 @@ on:
88
force:
99
description: Force a release even when there are release-blockers (optional)
1010
required: false
11+
merge_target:
12+
description: Target branch to merge into. Uses the default branch as a fallback (optional)
13+
required: false
1114

1215
jobs:
1316
job_release:
1417
runs-on: ubuntu-latest
15-
name: 'Release a new version'
18+
name: "Release a new version"
1619
steps:
1720
- name: Check out current commit (${{ github.sha }})
1821
uses: actions/checkout@v3
@@ -28,3 +31,4 @@ jobs:
2831
with:
2932
version: ${{ github.event.inputs.version }}
3033
force: ${{ github.event.inputs.force }}
34+
merge_target: ${{ github.event.inputs.merge_target }}

.npmignore

+1
Original file line numberDiff line numberDiff line change
@@ -10,4 +10,5 @@
1010
!react-native.config.js
1111
!/ios/**/*
1212
!/android/**/*
13+
!src/js/NativeRNSentry.ts
1314
!scripts/collect-modules.sh

CHANGELOG.md

+101-5
Original file line numberDiff line numberDiff line change
@@ -1,12 +1,12 @@
11
# Changelog
22

3-
## Unreleased
3+
## 5.0.0-alpha.9
44

5-
### Dependencies
5+
- Latest changes from 4.10.0
6+
7+
### Fixes
68

7-
- Bump Android SDK from v6.8.0 to v6.9.0 ([#2643](https://github.com/getsentry/sentry-react-native/pull/2643))
8-
- [changelog](https://github.com/getsentry/sentry-java/blob/main/CHANGELOG.md#690)
9-
- [diff](https://github.com/getsentry/sentry-java/compare/6.8.0...6.9.0)
9+
- Add missing source Spec for RNSentry Codegen. ([#2639](https://github.com/getsentry/sentry-react-native/pull/2639))
1010

1111
## 4.10.0
1212

@@ -21,6 +21,10 @@
2121
- [changelog](https://github.com/getsentry/sentry-javascript/blob/master/CHANGELOG.md#7211)
2222
- [diff](https://github.com/getsentry/sentry-javascript/compare/7.20.1...7.21.1)
2323

24+
## 5.0.0-alpha.8
25+
26+
- Latest changes from 4.9.0
27+
2428
## 4.9.0
2529

2630
### Features
@@ -59,6 +63,30 @@
5963
- [changelog](https://github.com/getsentry/sentry-cocoa/blob/master/CHANGELOG.md#7290)
6064
- [diff](https://github.com/getsentry/sentry-cocoa/compare/7.28.0...7.29.0)
6165

66+
## 5.0.0-alpha.7
67+
68+
- Latest changes from 4.7.1
69+
70+
### Fixes
71+
72+
- Remove hardcoded Folly version ([#2558](https://github.com/getsentry/sentry-react-native/pull/2558))
73+
74+
### Features
75+
76+
- Send react native js engine, turbo module, fabric flags and component stack in Event contexts ([#2552](https://github.com/getsentry/sentry-react-native/pull/2552))
77+
78+
### Dependencies
79+
80+
- Bump CLI from v1.74.4 to v2.7.0 ([#2457](https://github.com/getsentry/sentry-react-native/pull/2457))
81+
- [changelog](https://github.com/getsentry/sentry-cli/blob/master/CHANGELOG.md#270)
82+
- [diff](https://github.com/getsentry/sentry-cli/compare/1.74.4...2.7.0)
83+
- Bump Android SDK from v6.5.0 to v6.6.0 ([#2572](https://github.com/getsentry/sentry-react-native/pull/2572))
84+
- [changelog](https://github.com/getsentry/sentry-java/blob/main/CHANGELOG.md#660)
85+
- [diff](https://github.com/getsentry/sentry-java/compare/6.5.0...6.6.0)
86+
- Bump Cocoa SDK from v7.28.0 to v7.29.0 ([#2571](https://github.com/getsentry/sentry-react-native/pull/2571))
87+
- [changelog](https://github.com/getsentry/sentry-cocoa/blob/master/CHANGELOG.md#7290)
88+
- [diff](https://github.com/getsentry/sentry-cocoa/compare/7.28.0...7.29.0)
89+
6290
## 4.7.1
6391

6492
### Fixes
@@ -80,6 +108,28 @@
80108
- [changelog](https://github.com/getsentry/sentry-cocoa/blob/master/CHANGELOG.md#7280)
81109
- [diff](https://github.com/getsentry/sentry-cocoa/compare/7.27.1...7.28.0)
82110

111+
## 5.0.0-alpha.6
112+
113+
- Latest changes from 4.6.1
114+
115+
### Features
116+
117+
- Add initial support for the RN New Architecture, backwards compatible RNSentry Turbo Module ([#2522](https://github.com/getsentry/sentry-react-native/pull/2522))
118+
119+
### Breaking changes
120+
121+
- New ReactNativeTracingOptions idleTimeoutMs and finalTimeoutMs replacing idleTimeout and maxTransactionDuration respectively ([#2481](https://github.com/getsentry/sentry-react-native/pull/2481))
122+
- iOS min target 12.4, Android API min 21, min React Native version 0.70 ([#2522](https://github.com/getsentry/sentry-react-native/pull/2522))
123+
124+
### Dependencies
125+
126+
- Bump Android SDK from v6.4.3 to v6.5.0 ([#2535](https://github.com/getsentry/sentry-react-native/pull/2535))
127+
- [changelog](https://github.com/getsentry/sentry-java/blob/main/CHANGELOG.md#650)
128+
- [diff](https://github.com/getsentry/sentry-java/compare/6.4.3...6.5.0)
129+
- Bump JavaScript SDK from v7.14.2 to v7.15.0 ([#2536](https://github.com/getsentry/sentry-react-native/pull/2536))
130+
- [changelog](https://github.com/getsentry/sentry-javascript/blob/master/CHANGELOG.md#7150)
131+
- [diff](https://github.com/getsentry/sentry-javascript/compare/7.14.2...7.15.0)
132+
83133
## 4.6.1
84134

85135
### Fixes
@@ -100,6 +150,24 @@
100150
- [changelog](https://github.com/getsentry/sentry-java/blob/main/CHANGELOG.md#643)
101151
- [diff](https://github.com/getsentry/sentry-java/compare/6.4.2...6.4.3)
102152

153+
## 5.0.0-alpha.5
154+
155+
### Fixes
156+
157+
- Make `configureScope` callback safe [#2510](https://github.com/getsentry/sentry-react-native/pull/2510)
158+
159+
### Dependencies
160+
161+
- Bump JavaScript SDK from v7.14.0 to v7.14.1 ([#2511](https://github.com/getsentry/sentry-react-native/pull/2511))
162+
- [changelog](https://github.com/getsentry/sentry-javascript/blob/master/CHANGELOG.md#7141)
163+
- [diff](https://github.com/getsentry/sentry-javascript/compare/7.14.0...7.14.1)
164+
- Bump Cocoa SDK from v7.27.0 to v7.27.1 ([#2521](https://github.com/getsentry/sentry-react-native/pull/2521))
165+
- [changelog](https://github.com/getsentry/sentry-cocoa/blob/master/CHANGELOG.md#7271)
166+
- [diff](https://github.com/getsentry/sentry-cocoa/compare/7.27.0...7.27.1)
167+
- Bump Android SDK from v6.4.2 to v6.4.3 ([#2520](https://github.com/getsentry/sentry-react-native/pull/2520))
168+
- [changelog](https://github.com/getsentry/sentry-java/blob/main/CHANGELOG.md#643)
169+
- [diff](https://github.com/getsentry/sentry-java/compare/6.4.2...6.4.3)
170+
103171
## 4.6.0
104172

105173
### Fixes
@@ -124,6 +192,14 @@
124192
- [changelog](https://github.com/getsentry/sentry-javascript/blob/master/CHANGELOG.md#7140)
125193
- [diff](https://github.com/getsentry/sentry-javascript/compare/7.13.0...7.14.0)
126194

195+
## 5.0.0-alpha.4
196+
197+
- Latest changes from 4.5.0
198+
199+
### Breaking changes
200+
201+
- New ReactNativeTracingOptions idleTimeoutMs and finalTimeoutMs replacing idleTimeout and maxTransactionDuration respectively ([#2481](https://github.com/getsentry/sentry-react-native/pull/2481))
202+
127203
## 4.5.0
128204

129205
### Features
@@ -164,6 +240,16 @@
164240
- [changelog](https://github.com/getsentry/sentry-cocoa/blob/master/CHANGELOG.md#7251)
165241
- [diff](https://github.com/getsentry/sentry-cocoa/compare/7.24.1...7.25.1)
166242

243+
## 5.0.0-alpha.3
244+
245+
- Latest changes from 4.3.x
246+
247+
### Dependencies
248+
249+
- Bump Wizard from v2.0.0 to v2.2.0 ([#2460](https://github.com/getsentry/sentry-react-native/pull/2460))
250+
- [changelog](https://github.com/getsentry/sentry-wizard/blob/master/CHANGELOG.md#v220)
251+
- [diff](https://github.com/getsentry/sentry-wizard/compare/v2.0.0...v2.2.0)
252+
167253
## 4.3.0
168254

169255
### Features
@@ -188,6 +274,16 @@
188274

189275
- ReactNativeTracing wrongly marks transactions as deadline_exceeded when it reaches the idleTimeout ([#2427](https://github.com/getsentry/sentry-react-native/pull/2427))
190276

277+
## 5.0.0-alpha.2
278+
279+
- Latest changes from 4.2.x
280+
281+
## 5.0.0-alpha.1
282+
283+
### Fixes
284+
285+
- Auto linking for RN >= 0.69 ([#2332](https://github.com/getsentry/sentry-react-native/pull/2332))
286+
191287
## 4.2.3
192288

193289
### Fixes

0 commit comments

Comments
 (0)