Merge 4d98e79 into fcbe8ce

getsentry · Nov 29, 2022 · 7bc0799 · 7bc0799
2 parents fcbe8ce + 4d98e79
commit 7bc0799
Show file tree

Hide file tree

Showing 284 changed files with 33,445 additions and 246 deletions.
diff --git a/.eslintignore b/.eslintignore
@@ -1,8 +1,10 @@
 # Ignore build generated dir
 dist
 
-# Ignore sample folder
+# Ignore standalone apps
 sample
+sample-new-architecture
+test/perf/TestApp*
 
 # Ignore dangerfile
-dangerfile.js
+dangerfile.js
diff --git a/.github/workflows/buildandtest.yml b/.github/workflows/buildandtest.yml
@@ -14,7 +14,8 @@ jobs:
  steps:
  - uses: actions/checkout@v3
  - uses: actions/setup-node@v3
-
+ with:
+ node-version: 14
  - uses: actions/cache@v3
  id: cache
  with:
@@ -42,12 +43,32 @@ jobs:
  - name: Lint
  run: yarn lint
 
+ job_lint_sample_new_arch:
+ name: Lint Sample
+ runs-on: ubuntu-latest
+ steps:
+ - uses: actions/checkout@v3
+ - uses: actions/cache@v3
+ id: cache
+ with:
+ path: sample-new-architecture/node_modules
+ key: ${{ runner.os }}-${{ github.sha }}
+ - name: Install Dependencies
+ if: steps.cache.outputs['cache-hit'] != 'true'
+ run: yarn install
+ working-directory: sample-new-architecture
+ - name: Lint Sample
+ run: yarn lint
+ working-directory: sample-new-architecture
+
  job_build:
  name: Build
  runs-on: ubuntu-latest
  steps:
  - uses: actions/checkout@v3
  - uses: actions/setup-node@v3
+ with:
+ node-version: 14
  - uses: actions/cache@v3
  id: cache
  with:

diff --git a/.github/workflows/codegen.yml b/.github/workflows/codegen.yml
@@ -0,0 +1,37 @@
+name: Codegen
+
+on:
+ push:
+ branches:
+ - main
+ - release/**
+ pull_request:
+
+jobs:
+ codegen:
+ runs-on: ubuntu-latest
+ strategy:
+ matrix:
+ platform: ["android"] # "ios" will be added after codegen is fixed
+ include:
+ - platform: android
+ command: |
+ cd sample-new-architecture/android
+ ./gradlew generateCodegenArtifactsFromSchema
+ steps:
+ - uses: actions/checkout@v3
+ - uses: actions/setup-node@v3
+ with:
+ node-version: 14
+ - uses: actions/cache@v3
+ id: cache
+ with:
+ path: sample-new-architecture/node_modules
+ key: ${{ runner.os }}-${{ github.sha }}
+ - name: Install Dependencies
+ if: steps.cache.outputs['cache-hit'] != 'true'
+ run: |
+ cd sample-new-architecture
+ yarn install
+ - name: Codegen
+ run: ${{ matrix.command }}
diff --git a/.github/workflows/e2e.yml b/.github/workflows/e2e.yml
@@ -140,3 +140,103 @@ jobs:
  path: |
  ./sample/*.log
  ./sample/*.png
+
+ metrics:
+ runs-on: macos-latest
+ strategy:
+ # we want that the matrix keeps running, default is to cancel them if it fails.
+ fail-fast: false
+ matrix:
+ platform: ["ios", "android"]
+ include:
+ - platform: ios
+ name: iOS
+ appPlain: test/perf/test-app-plain.ipa
+ - platform: android
+ name: Android
+ appPlain: test/perf/TestAppPlain/android/app/build/outputs/apk/release/app-release.apk
+ steps:
+ - uses: actions/checkout@v3
+ - uses: actions/setup-node@v3
+ with:
+ node-version: "14"
+ - uses: actions/setup-java@v3
+ with:
+ java-version: "11"
+ distribution: "adopt"
+ - name: Install Global Dependencies
+ run: yarn global add react-native-cli @sentry/cli yalc
+ - uses: actions/cache@v3
+ id: deps-cache
+ with:
+ path: |
+ node_modules
+ test/perf/TestAppSentry/node_modules
+ key: ${{ github.workflow }}-${{ github.job }}-${{ hashFiles('yarn.lock', 'test/perf/TestAppSentry/yarn.lock') }}
+ - name: Install Dependencies
+ if: steps.deps-cache.outputs['cache-hit'] != 'true'
+ run: yarn install
+ - name: Build SDK
+ run: yarn build
+ - name: Package SDK
+ run: yalc publish
+ - uses: actions/setup-node@v3
+ with:
+ node-version: "16"
+ - uses: actions/cache@v3
+ id: app-plain-cache
+ with:
+ path: ${{ matrix.appPlain }}
+ key: ${{ github.workflow }}-${{ github.job }}-appplain-${{ hashFiles('test/perf/TestAppPlain/**') }}
+ - name: Build app plain
+ if: steps.app-plain-cache.outputs['cache-hit'] != 'true'
+ working-directory: ./test/perf/TestAppPlain
+ run: |
+ yarn install
+ cd ${{ matrix.platform }}
+ if [[ "${{ matrix.platform }}" == "android" ]]; then
+ ./gradlew assembleRelease
+ else
+ pod install
+ cd ../..
+ fastlane build_perf_test_app_plain
+ fi
+ env:
+ APP_STORE_CONNECT_KEY_ID: ${{ secrets.APP_STORE_CONNECT_KEY_ID }}
+ APP_STORE_CONNECT_ISSUER_ID: ${{ secrets.APP_STORE_CONNECT_ISSUER_ID }}
+ APP_STORE_CONNECT_KEY: ${{ secrets.APP_STORE_CONNECT_KEY }}
+ FASTLANE_KEYCHAIN_PASSWORD: ${{ secrets.FASTLANE_KEYCHAIN_PASSWORD }}
+ MATCH_GIT_PRIVATE_KEY: ${{ secrets.MATCH_GIT_PRIVATE_KEY }}
+ MATCH_PASSWORD: ${{ secrets.MATCH_PASSWORD }}
+ MATCH_USERNAME: ${{ secrets.MATCH_USERNAME }}
+ - name: Build app with Sentry
+ working-directory: ./test/perf/TestAppSentry
+ run: |
+ yalc add @sentry/react-native
+ yarn install
+ cd ${{ matrix.platform }}
+ if [[ "${{ matrix.platform }}" == "android" ]]; then
+ ./gradlew assembleRelease
+ else
+ pod install
+ cd ../..
+ fastlane build_perf_test_app_sentry
+ cd TestAppSentry
+ fi
+ # Remove after build so that the cache isn't invaldiated due to the changes in yarn.lock.
+ yarn remove @sentry/react-native
+ env:
+ APP_STORE_CONNECT_KEY_ID: ${{ secrets.APP_STORE_CONNECT_KEY_ID }}
+ APP_STORE_CONNECT_ISSUER_ID: ${{ secrets.APP_STORE_CONNECT_ISSUER_ID }}
+ APP_STORE_CONNECT_KEY: ${{ secrets.APP_STORE_CONNECT_KEY }}
+ FASTLANE_KEYCHAIN_PASSWORD: ${{ secrets.FASTLANE_KEYCHAIN_PASSWORD }}
+ MATCH_GIT_PRIVATE_KEY: ${{ secrets.MATCH_GIT_PRIVATE_KEY }}
+ MATCH_PASSWORD: ${{ secrets.MATCH_PASSWORD }}
+ MATCH_USERNAME: ${{ secrets.MATCH_USERNAME }}
+ - name: Collect apps metrics
+ uses: getsentry/action-app-sdk-overhead-metrics@v1
+ with:
+ name: ${{ matrix.name }}
+ config: ./test/perf/metrics-${{ matrix.platform }}.yml
+ sauce-user: ${{ secrets.SAUCE_USERNAME }}
+ sauce-key: ${{ secrets.SAUCE_ACCESS_KEY }}
diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml
@@ -8,11 +8,14 @@ on:
  force:
  description: Force a release even when there are release-blockers (optional)
  required: false
+ merge_target:
+ description: Target branch to merge into. Uses the default branch as a fallback (optional)
+ required: false
 
 jobs:
  job_release:
  runs-on: ubuntu-latest
- name: 'Release a new version'
+ name: "Release a new version"
  steps:
  - name: Check out current commit (${{ github.sha }})
  uses: actions/checkout@v3
@@ -28,3 +31,4 @@ jobs:
  with:
  version: ${{ github.event.inputs.version }}
  force: ${{ github.event.inputs.force }}
+ merge_target: ${{ github.event.inputs.merge_target }}
diff --git a/.npmignore b/.npmignore
@@ -10,4 +10,5 @@
 !react-native.config.js
 !/ios/**/*
 !/android/**/*
+!src/js/NativeRNSentry.ts
 !scripts/collect-modules.sh
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,12 +1,12 @@
 # Changelog
 
-## Unreleased
+## 5.0.0-alpha.9
 
-### Dependencies
+- Latest changes from 4.10.0
+
+### Fixes
 
-- Bump Android SDK from v6.8.0 to v6.9.0 ([#2643](https://github.com/getsentry/sentry-react-native/pull/2643))
- - [changelog](https://github.com/getsentry/sentry-java/blob/main/CHANGELOG.md#690)
- - [diff](https://github.com/getsentry/sentry-java/compare/6.8.0...6.9.0)
+- Add missing source Spec for RNSentry Codegen. ([#2639](https://github.com/getsentry/sentry-react-native/pull/2639))
 
 ## 4.10.0
 
@@ -21,6 +21,10 @@
  - [changelog](https://github.com/getsentry/sentry-javascript/blob/master/CHANGELOG.md#7211)
  - [diff](https://github.com/getsentry/sentry-javascript/compare/7.20.1...7.21.1)
 
+## 5.0.0-alpha.8
+
+- Latest changes from 4.9.0
+
 ## 4.9.0
 
 ### Features
@@ -59,6 +63,30 @@
  - [changelog](https://github.com/getsentry/sentry-cocoa/blob/master/CHANGELOG.md#7290)
  - [diff](https://github.com/getsentry/sentry-cocoa/compare/7.28.0...7.29.0)
 
+## 5.0.0-alpha.7
+
+- Latest changes from 4.7.1
+
+### Fixes
+
+- Remove hardcoded Folly version ([#2558](https://github.com/getsentry/sentry-react-native/pull/2558))
+
+### Features
+
+- 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))
+
+### Dependencies
+
+- Bump CLI from v1.74.4 to v2.7.0 ([#2457](https://github.com/getsentry/sentry-react-native/pull/2457))
+ - [changelog](https://github.com/getsentry/sentry-cli/blob/master/CHANGELOG.md#270)
+ - [diff](https://github.com/getsentry/sentry-cli/compare/1.74.4...2.7.0)
+- Bump Android SDK from v6.5.0 to v6.6.0 ([#2572](https://github.com/getsentry/sentry-react-native/pull/2572))
+ - [changelog](https://github.com/getsentry/sentry-java/blob/main/CHANGELOG.md#660)
+ - [diff](https://github.com/getsentry/sentry-java/compare/6.5.0...6.6.0)
+- Bump Cocoa SDK from v7.28.0 to v7.29.0 ([#2571](https://github.com/getsentry/sentry-react-native/pull/2571))
+ - [changelog](https://github.com/getsentry/sentry-cocoa/blob/master/CHANGELOG.md#7290)
+ - [diff](https://github.com/getsentry/sentry-cocoa/compare/7.28.0...7.29.0)
+
 ## 4.7.1
 
 ### Fixes
@@ -80,6 +108,28 @@
  - [changelog](https://github.com/getsentry/sentry-cocoa/blob/master/CHANGELOG.md#7280)
  - [diff](https://github.com/getsentry/sentry-cocoa/compare/7.27.1...7.28.0)
 
+## 5.0.0-alpha.6
+
+- Latest changes from 4.6.1
+
+### Features
+
+- Add initial support for the RN New Architecture, backwards compatible RNSentry Turbo Module ([#2522](https://github.com/getsentry/sentry-react-native/pull/2522))
+
+### Breaking changes
+
+- New ReactNativeTracingOptions idleTimeoutMs and finalTimeoutMs replacing idleTimeout and maxTransactionDuration respectively ([#2481](https://github.com/getsentry/sentry-react-native/pull/2481))
+- 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))
+
+### Dependencies
+
+- Bump Android SDK from v6.4.3 to v6.5.0 ([#2535](https://github.com/getsentry/sentry-react-native/pull/2535))
+ - [changelog](https://github.com/getsentry/sentry-java/blob/main/CHANGELOG.md#650)
+ - [diff](https://github.com/getsentry/sentry-java/compare/6.4.3...6.5.0)
+- Bump JavaScript SDK from v7.14.2 to v7.15.0 ([#2536](https://github.com/getsentry/sentry-react-native/pull/2536))
+ - [changelog](https://github.com/getsentry/sentry-javascript/blob/master/CHANGELOG.md#7150)
+ - [diff](https://github.com/getsentry/sentry-javascript/compare/7.14.2...7.15.0)
+
 ## 4.6.1
 
 ### Fixes
@@ -100,6 +150,24 @@
  - [changelog](https://github.com/getsentry/sentry-java/blob/main/CHANGELOG.md#643)
  - [diff](https://github.com/getsentry/sentry-java/compare/6.4.2...6.4.3)
 
+## 5.0.0-alpha.5
+
+### Fixes
+
+- Make `configureScope` callback safe [#2510](https://github.com/getsentry/sentry-react-native/pull/2510)
+
+### Dependencies
+
+- Bump JavaScript SDK from v7.14.0 to v7.14.1 ([#2511](https://github.com/getsentry/sentry-react-native/pull/2511))
+ - [changelog](https://github.com/getsentry/sentry-javascript/blob/master/CHANGELOG.md#7141)
+ - [diff](https://github.com/getsentry/sentry-javascript/compare/7.14.0...7.14.1)
+- Bump Cocoa SDK from v7.27.0 to v7.27.1 ([#2521](https://github.com/getsentry/sentry-react-native/pull/2521))
+ - [changelog](https://github.com/getsentry/sentry-cocoa/blob/master/CHANGELOG.md#7271)
+ - [diff](https://github.com/getsentry/sentry-cocoa/compare/7.27.0...7.27.1)
+- Bump Android SDK from v6.4.2 to v6.4.3 ([#2520](https://github.com/getsentry/sentry-react-native/pull/2520))
+ - [changelog](https://github.com/getsentry/sentry-java/blob/main/CHANGELOG.md#643)
+ - [diff](https://github.com/getsentry/sentry-java/compare/6.4.2...6.4.3)
+
 ## 4.6.0
 
 ### Fixes
@@ -124,6 +192,14 @@
  - [changelog](https://github.com/getsentry/sentry-javascript/blob/master/CHANGELOG.md#7140)
  - [diff](https://github.com/getsentry/sentry-javascript/compare/7.13.0...7.14.0)
 
+## 5.0.0-alpha.4
+
+- Latest changes from 4.5.0
+
+### Breaking changes
+
+- New ReactNativeTracingOptions idleTimeoutMs and finalTimeoutMs replacing idleTimeout and maxTransactionDuration respectively ([#2481](https://github.com/getsentry/sentry-react-native/pull/2481))
+
 ## 4.5.0
 
 ### Features
@@ -164,6 +240,16 @@
  - [changelog](https://github.com/getsentry/sentry-cocoa/blob/master/CHANGELOG.md#7251)
  - [diff](https://github.com/getsentry/sentry-cocoa/compare/7.24.1...7.25.1)
 
+## 5.0.0-alpha.3
+
+- Latest changes from 4.3.x
+
+### Dependencies
+
+- Bump Wizard from v2.0.0 to v2.2.0 ([#2460](https://github.com/getsentry/sentry-react-native/pull/2460))
+ - [changelog](https://github.com/getsentry/sentry-wizard/blob/master/CHANGELOG.md#v220)
+ - [diff](https://github.com/getsentry/sentry-wizard/compare/v2.0.0...v2.2.0)
+
 ## 4.3.0
 
 ### Features
@@ -188,6 +274,16 @@
 
 - ReactNativeTracing wrongly marks transactions as deadline_exceeded when it reaches the idleTimeout ([#2427](https://github.com/getsentry/sentry-react-native/pull/2427))
 
+## 5.0.0-alpha.2
+
+- Latest changes from 4.2.x
+
+## 5.0.0-alpha.1
+
+### Fixes
+
+- Auto linking for RN >= 0.69 ([#2332](https://github.com/getsentry/sentry-react-native/pull/2332))
+
 ## 4.2.3
 
 ### Fixes