Skip to content

Commit f749882

Browse files
rlinozrlinoz
authored
Merge pull request Expensify#75816 from callstack-internal/sentry-enable-sourcemaps-2
[no QA] feat/sentry source maps
2 parents a65063a + b3a10bc commit f749882

File tree

12 files changed

+141
-289
lines changed

12 files changed

+141
-289
lines changed

‎.env.example‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -42,3 +42,4 @@ GITHUB_TOKEN=YOUR_TOKEN
4242
OPENAI_API_KEY=YOUR_TOKEN
4343

4444
SENTRY_AUTH_TOKEN=SENTRY_AUTH_TOKEN
45+
SENTRY_ALLOW_FAILURE=true

‎.github/workflows/deploy.yml‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -167,6 +167,7 @@ jobs:
167167
ANDROID_BUILD_TYPE: ${{ vars.ANDROID_BUILD_TYPE }}
168168
GITHUB_ACTOR: ${{ github.actor }}
169169
GITHUB_TOKEN: ${{ github.token }}
170+
SENTRY_AUTH_TOKEN: ${{ secrets.SENTRY_AUTH_TOKEN }}
170171

171172
- name: Upload Android app to Google Play
172173
if: ${{ fromJSON(env.SHOULD_BUILD_APP) }}
@@ -382,6 +383,7 @@ jobs:
382383
APPLE_SHARE_PROVISIONING_PROFILE_NAME: ${{ vars.APPLE_SHARE_PROVISIONING_PROFILE_NAME }}
383384
APPLE_NOTIFICATION_PROVISIONING_PROFILE_FILE: ${{ vars.APPLE_NOTIFICATION_PROVISIONING_PROFILE_FILE }}
384385
APPLE_NOTIFICATION_PROVISIONING_PROFILE_NAME: ${{ vars.APPLE_NOTIFICATION_PROVISIONING_PROFILE_NAME }}
386+
SENTRY_AUTH_TOKEN: ${{ secrets.SENTRY_AUTH_TOKEN }}
385387

386388
- name: Upload release build to TestFlight
387389
if: ${{ fromJSON(env.SHOULD_BUILD_APP) }}

‎.github/workflows/testBuild.yml‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -284,6 +284,7 @@ jobs:
284284
ANDROID_UPLOAD_KEY_PASSWORD: ${{ steps.load-credentials.outputs.ANDROID_UPLOAD_KEY_PASSWORD }}
285285
GITHUB_ACTOR: ${{ github.actor }}
286286
GITHUB_TOKEN: ${{ github.token }}
287+
SENTRY_AUTH_TOKEN: ${{ secrets.SENTRY_AUTH_TOKEN }}
287288
run: bundle exec fastlane android build_adhoc_hybrid
288289

289290
- name: Configure AWS Credentials

‎android/sentry.properties‎

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,3 @@
1+
defaults.org=expensify
2+
defaults.project=app
3+
defaults.url=https://sentry.io

‎ios/Podfile.lock‎

Lines changed: 23 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -524,6 +524,7 @@ PODS:
524524
- React-jsinspectorcdp
525525
- React-jsitooling
526526
- React-perflogger
527+
- React-rendererconsistency
527528
- React-runtimeexecutor
528529
- React-runtimescheduler
529530
- React-utils
@@ -549,6 +550,7 @@ PODS:
549550
- React-jsinspectorcdp
550551
- React-jsitooling
551552
- React-perflogger
553+
- React-rendererconsistency
552554
- React-runtimeexecutor
553555
- React-runtimescheduler
554556
- React-utils
@@ -573,6 +575,7 @@ PODS:
573575
- React-jsinspectorcdp
574576
- React-jsitooling
575577
- React-perflogger
578+
- React-rendererconsistency
576579
- React-runtimeexecutor
577580
- React-runtimescheduler
578581
- React-utils
@@ -599,6 +602,7 @@ PODS:
599602
- React-jsinspectorcdp
600603
- React-jsitooling
601604
- React-perflogger
605+
- React-rendererconsistency
602606
- React-runtimeexecutor
603607
- React-runtimescheduler
604608
- React-utils
@@ -624,6 +628,7 @@ PODS:
624628
- React-jsinspectorcdp
625629
- React-jsitooling
626630
- React-perflogger
631+
- React-rendererconsistency
627632
- React-runtimeexecutor
628633
- React-runtimescheduler
629634
- React-utils
@@ -649,6 +654,7 @@ PODS:
649654
- React-jsinspectorcdp
650655
- React-jsitooling
651656
- React-perflogger
657+
- React-rendererconsistency
652658
- React-runtimeexecutor
653659
- React-runtimescheduler
654660
- React-utils
@@ -674,6 +680,7 @@ PODS:
674680
- React-jsinspectorcdp
675681
- React-jsitooling
676682
- React-perflogger
683+
- React-rendererconsistency
677684
- React-runtimeexecutor
678685
- React-runtimescheduler
679686
- React-utils
@@ -699,6 +706,7 @@ PODS:
699706
- React-jsinspectorcdp
700707
- React-jsitooling
701708
- React-perflogger
709+
- React-rendererconsistency
702710
- React-runtimeexecutor
703711
- React-runtimescheduler
704712
- React-utils
@@ -724,6 +732,7 @@ PODS:
724732
- React-jsinspectorcdp
725733
- React-jsitooling
726734
- React-perflogger
735+
- React-rendererconsistency
727736
- React-runtimeexecutor
728737
- React-runtimescheduler
729738
- React-utils
@@ -749,6 +758,7 @@ PODS:
749758
- React-jsinspectorcdp
750759
- React-jsitooling
751760
- React-perflogger
761+
- React-rendererconsistency
752762
- React-runtimeexecutor
753763
- React-runtimescheduler
754764
- React-utils
@@ -774,6 +784,7 @@ PODS:
774784
- React-jsinspectorcdp
775785
- React-jsitooling
776786
- React-perflogger
787+
- React-rendererconsistency
777788
- React-runtimeexecutor
778789
- React-runtimescheduler
779790
- React-utils
@@ -799,6 +810,7 @@ PODS:
799810
- React-jsinspectorcdp
800811
- React-jsitooling
801812
- React-perflogger
813+
- React-rendererconsistency
802814
- React-runtimeexecutor
803815
- React-runtimescheduler
804816
- React-utils
@@ -824,6 +836,7 @@ PODS:
824836
- React-jsinspectorcdp
825837
- React-jsitooling
826838
- React-perflogger
839+
- React-rendererconsistency
827840
- React-runtimeexecutor
828841
- React-runtimescheduler
829842
- React-utils
@@ -849,6 +862,7 @@ PODS:
849862
- React-jsinspectorcdp
850863
- React-jsitooling
851864
- React-perflogger
865+
- React-rendererconsistency
852866
- React-runtimeexecutor
853867
- React-runtimescheduler
854868
- React-utils
@@ -3886,7 +3900,7 @@ PODS:
38863900
- ReactCommon/turbomodule/core
38873901
- SocketRocket
38883902
- Yoga
3889-
- RNSentry (7.4.0):
3903+
- RNSentry (7.6.0):
38903904
- boost
38913905
- DoubleConversion
38923906
- fast_float
@@ -3913,7 +3927,7 @@ PODS:
39133927
- ReactCodegen
39143928
- ReactCommon/turbomodule/bridging
39153929
- ReactCommon/turbomodule/core
3916-
- Sentry/HybridSDK (= 8.57.0)
3930+
- Sentry/HybridSDK (= 8.57.2)
39173931
- SocketRocket
39183932
- Yoga
39193933
- RNShare (11.0.2):
@@ -4129,7 +4143,7 @@ PODS:
41294143
- SDWebImageWebPCoder (0.14.6):
41304144
- libwebp (~> 1.0)
41314145
- SDWebImage/Core (~> 5.17)
4132-
- Sentry/HybridSDK (8.57.0)
4146+
- Sentry/HybridSDK (8.57.2)
41334147
- SocketRocket (0.7.1)
41344148
- Turf (2.8.0)
41354149
- TweetNacl (1.0.2)
@@ -4632,7 +4646,7 @@ SPEC CHECKSUMS:
46324646
AirshipServiceExtension: 50d11b2f62c4a490d4e81a1c36f70e2ecb70a27e
46334647
AppAuth: d4f13a8fe0baf391b2108511793e4b479691fb73
46344648
AppLogs: 3bc4e9b141dbf265b9464409caaa40416a9ee0e0
4635-
boost: 7e761d76ca2ce687f7cc98e698152abd03a18f90
4649+
boost: 659a89341ea4ab3df8259733813b52f26d8be9a5
46364650
DoubleConversion: cb417026b2400c8f53ae97020b2be961b59470cb
46374651
EXAV: ae28256069c4cdde93d185c007d8f68d92902c2e
46384652
EXConstants: a95804601ee4a6aa7800645f9b070d753b1142b3
@@ -4701,7 +4715,7 @@ SPEC CHECKSUMS:
47014715
React: 2073376f47c71b7e9a0af7535986a77522ce1049
47024716
React-callinvoker: 751b6f2c83347a0486391c3f266f291f0f53b27e
47034717
React-Codegen: 4b8b4817cea7a54b83851d4c1f91f79aa73de30a
4704-
React-Core: dff5d29973349b11dd6631c9498456d75f846d5e
4718+
React-Core: aeebd9b37ac383279f610f1e53f66b9931686a41
47054719
React-CoreModules: c0ae04452e4c5d30e06f8e94692a49107657f537
47064720
React-cxxreact: 376fd672c95dfb64ad5cc246e6a1e9edb78dec4c
47074721
React-debug: d4955c86870792887ed695df6ebf0e94e39dc7e1
@@ -4753,7 +4767,7 @@ SPEC CHECKSUMS:
47534767
react-native-webview: cdce419e8022d0ef6f07db21890631258e7a9e6e
47544768
React-NativeModulesApple: 8c7eb6057b00c191a11ad5ced41826ec5a0e4d78
47554769
React-oscompat: 93b5535ea7f7dff46aaee4f78309a70979bdde9d
4756-
React-perflogger: 5536d2df3d18fe0920263466f7b46a56351c0510
4770+
React-perflogger: e7dcbfcb796d346be7936b75740c3e27a4bb3977
47574771
React-performancetimeline: c6c9393c1a0453a51e1852e3531defe60790b36c
47584772
React-RCTActionSheet: 42195ae666e6d79b4af2346770f765b7c29435b9
47594773
React-RCTAnimation: fa103ccc3503b1ed8dedca7e62e7823937748843
@@ -4768,7 +4782,7 @@ SPEC CHECKSUMS:
47684782
React-RCTSettings: 71f5c7fd7b5f4e725a4e2114a4b4373d0e46048f
47694783
React-RCTText: b94d4699b49285bee22b8ebf768924d607eccee3
47704784
React-RCTVibration: 6e3993c4f6c36a3899059f9a9ead560ddaf5a7d7
4771-
React-rendererconsistency: 612d0f6603d9837bb1236d7fd5194203b35c8799
4785+
React-rendererconsistency: bef28690433e2b4bb00c2f884b22b86e61a430f2
47724786
React-renderercss: e5c2c3b84976f7a587cde8423c671db07a6a77da
47734787
React-rendererdebug: cc7a6131733605b8897754f72c0c35c79f77da9e
47744788
React-RuntimeApple: 3f96102fc1ebf738d36719cdce5422a5769293fb
@@ -4801,7 +4815,7 @@ SPEC CHECKSUMS:
48014815
RNReactNativeHapticFeedback: 5f1542065f0b24c9252bd8cf3e83bc9c548182e4
48024816
RNReanimated: c3de6d69dba4054d4f35562b14c84061699188e5
48034817
RNScreens: 4f2aed147a2775017923789d8a0a2d377712ec2e
4804-
RNSentry: e26e131780fc2a8b31b8fb030b7882af615d05ac
4818+
RNSentry: 4832a7acd1fe48982149f585e1802f4d9fc7b00a
48054819
RNShare: 1c1fde2c4134b9cf220ffebbd6df9c414036d382
48064820
RNSound: 80f864773ff8f670fc8f052a3e478cec201d9b43
48074821
RNSVG: 94a1be05fab4043354bcf7104f0f9b0e2231ef05
@@ -4810,7 +4824,7 @@ SPEC CHECKSUMS:
48104824
SDWebImageAVIFCoder: afe194a084e851f70228e4be35ef651df0fc5c57
48114825
SDWebImageSVGCoder: 15a300a97ec1c8ac958f009c02220ac0402e936c
48124826
SDWebImageWebPCoder: e38c0a70396191361d60c092933e22c20d5b1380
4813-
Sentry: e1b49e5f49367ff211b25c431a60e2bd83b792aa
4827+
Sentry: 83a3814c3ca042874b39c5c5bdffb6570d4d760e
48144828
SocketRocket: d4aabe649be1e368d1318fdf28a022d714d65748
48154829
Turf: aa2ede4298009639d10db36aba1a7ebaad072a5e
48164830
TweetNacl: 3abf4d1d2082b0114e7a67410e300892448951e6

‎metro.config.js‎

Lines changed: 7 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,12 @@ const {mergeConfig} = require('@react-native/metro-config');
55
const {wrapWithReanimatedMetroConfig} = require('react-native-reanimated/metro-config');
66
const {withSentryConfig} = require('@sentry/react-native/metro');
77
const {createSentryMetroSerializer} = require('@sentry/react-native/dist/js/tools/sentryMetroSerializer');
8-
require('dotenv').config();
8+
9+
const path = require('path');
10+
11+
// Prefer explicit ENVFILE (Fastlane/GHA set this), else fall back to local .env
12+
const envPath = process.env.ENVFILE ? (path.isAbsolute(process.env.ENVFILE) ? process.env.ENVFILE : path.join(__dirname, process.env.ENVFILE)) : path.join(__dirname, '.env');
13+
require('dotenv').config({path: envPath});
914

1015
const defaultConfig = getReactNativeDefaultConfig(__dirname);
1116
const expoConfig = getExpoDefaultConfig(__dirname);
@@ -14,6 +19,7 @@ const isE2ETesting = process.env.E2E_TESTING === 'true';
1419
const e2eSourceExts = ['e2e.js', 'e2e.ts', 'e2e.tsx'];
1520

1621
const isDev = process.env.ENVIRONMENT === undefined || process.env.ENVIRONMENT === 'development';
22+
1723
/**
1824
* Metro configuration
1925
* https://reactnative.dev/docs/metro

0 commit comments

Comments
 (0)