fix 🐛(chore) sentry

LedgerHQ · Jan 23, 2025 · fd0f7d5 · fd0f7d5
1 parent 387a2a0
commit fd0f7d5
Show file tree

Hide file tree

Showing 16 changed files with 291 additions and 288 deletions.
diff --git a/.pnpmfile.cjs b/.pnpmfile.cjs
@@ -36,6 +36,7 @@ function readPackage(pkg, context) {
 
   if (!!pkg.devDependencies["metro"] && pkg.name.startsWith("@sentry/react-native")) {
     pkg.dependencies["metro"] = pkg.devDependencies["metro"];
+    pkg.dependencies["metro"] = "*";
     delete pkg.devDependencies["metro"];
   }
 

diff --git a/apps/ledger-live-mobile/.env.android.nightly b/apps/ledger-live-mobile/.env.android.nightly
@@ -1,6 +1,7 @@
 APP_NAME="LL [STAGING]"
 ANALYTICS_TOKEN=Yc026bN2XbyBhTCPDFY0VibJugAKnjmh
 SENTRY_DSN=https://[email protected]/6549924
+SENTRY_DISABLE_AUTO_UPLOAD=false
 BRAZE_ANDROID_API_KEY="4ef07be0-a4ea-4f73-81a9-760e473959f3"
 BRAZE_IOS_API_KEY="4d6c9f5b-823e-4ea0-8158-5359bdf89618"
-BRAZE_CUSTOM_ENDPOINT="sdk.fra-02.braze.eu"
+BRAZE_CUSTOM_ENDPOINT="sdk.fra-02.braze.eu"
diff --git a/apps/ledger-live-mobile/.env.android.prerelease b/apps/ledger-live-mobile/.env.android.prerelease
@@ -1,6 +1,7 @@
 APP_NAME="Ledger Live"
 SENTRY_DSN=https://[email protected]/6723478
+SENTRY_DISABLE_AUTO_UPLOAD=false
 ANALYTICS_TOKEN=jfUZbw28ig8JpEi9DZpTUc21dKUKu1e3
 BRAZE_ANDROID_API_KEY="b34d1245-04d6-4209-9580-eed4ec82cf17"
 BRAZE_IOS_API_KEY="93d6248d-f2e9-4255-84bc-6b551b7afcd2"
-BRAZE_CUSTOM_ENDPOINT="sdk.fra-02.braze.eu"
+BRAZE_CUSTOM_ENDPOINT="sdk.fra-02.braze.eu"
diff --git a/apps/ledger-live-mobile/.env.android.release b/apps/ledger-live-mobile/.env.android.release
@@ -1,6 +1,7 @@
 APP_NAME="Ledger Live"
 SENTRY_DSN=https://[email protected]/6505213
+SENTRY_DISABLE_AUTO_UPLOAD=false
 ANALYTICS_TOKEN=jfUZbw28ig8JpEi9DZpTUc21dKUKu1e3
 BRAZE_ANDROID_API_KEY="b34d1245-04d6-4209-9580-eed4ec82cf17"
 BRAZE_IOS_API_KEY="93d6248d-f2e9-4255-84bc-6b551b7afcd2"
-BRAZE_CUSTOM_ENDPOINT="sdk.fra-02.braze.eu"
+BRAZE_CUSTOM_ENDPOINT="sdk.fra-02.braze.eu"
diff --git a/apps/ledger-live-mobile/.env.android.staging b/apps/ledger-live-mobile/.env.android.staging
@@ -1,6 +1,7 @@
 APP_NAME="LL [STAGING]"
 SENTRY_DSN=https://[email protected]/6619343
 SENTRY_DISABLE_AUTO_UPLOAD=false
+
 ANALYTICS_TOKEN=Yc026bN2XbyBhTCPDFY0VibJugAKnjmh
 BRAZE_ANDROID_API_KEY="4ef07be0-a4ea-4f73-81a9-760e473959f3"
 BRAZE_IOS_API_KEY="4d6c9f5b-823e-4ea0-8158-5359bdf89618"

diff --git a/apps/ledger-live-mobile/.env.ios.nightly b/apps/ledger-live-mobile/.env.ios.nightly
@@ -1,7 +1,8 @@
 APP_NAME="LL [STAGING]"
 ANALYTICS_TOKEN=Yc026bN2XbyBhTCPDFY0VibJugAKnjmh
 GOOGLE_SERVICE_INFO_NAME="GoogleService-Info-Production"
+SENTRY_DISABLE_AUTO_UPLOAD=false
 SENTRY_DSN=https://[email protected]/6549925
 BRAZE_ANDROID_API_KEY="4ef07be0-a4ea-4f73-81a9-760e473959f3"
 BRAZE_IOS_API_KEY="4d6c9f5b-823e-4ea0-8158-5359bdf89618"
-BRAZE_CUSTOM_ENDPOINT="sdk.fra-02.braze.eu"
+BRAZE_CUSTOM_ENDPOINT="sdk.fra-02.braze.eu"
diff --git a/apps/ledger-live-mobile/.env.ios.prerelease b/apps/ledger-live-mobile/.env.ios.prerelease
@@ -1,7 +1,8 @@
 APP_NAME="Ledger Live"
 SENTRY_DSN=https://[email protected]/6723477
 ANALYTICS_TOKEN=jfUZbw28ig8JpEi9DZpTUc21dKUKu1e3
+SENTRY_DISABLE_AUTO_UPLOAD=false
 GOOGLE_SERVICE_INFO_NAME="GoogleService-Info-Production"
 BRAZE_ANDROID_API_KEY="b34d1245-04d6-4209-9580-eed4ec82cf17"
 BRAZE_IOS_API_KEY="93d6248d-f2e9-4255-84bc-6b551b7afcd2"
-BRAZE_CUSTOM_ENDPOINT="sdk.fra-02.braze.eu"
+BRAZE_CUSTOM_ENDPOINT="sdk.fra-02.braze.eu"
diff --git a/apps/ledger-live-mobile/.env.ios.release b/apps/ledger-live-mobile/.env.ios.release
@@ -1,7 +1,8 @@
 APP_NAME="Ledger Live"
 SENTRY_DSN=https://[email protected]/6505205
 ANALYTICS_TOKEN=jfUZbw28ig8JpEi9DZpTUc21dKUKu1e3
+SENTRY_DISABLE_AUTO_UPLOAD=false
 GOOGLE_SERVICE_INFO_NAME="GoogleService-Info-Production"
 BRAZE_ANDROID_API_KEY="b34d1245-04d6-4209-9580-eed4ec82cf17"
 BRAZE_IOS_API_KEY="93d6248d-f2e9-4255-84bc-6b551b7afcd2"
-BRAZE_CUSTOM_ENDPOINT="sdk.fra-02.braze.eu"
+BRAZE_CUSTOM_ENDPOINT="sdk.fra-02.braze.eu"
diff --git a/apps/ledger-live-mobile/android/app/build.gradle b/apps/ledger-live-mobile/android/app/build.gradle
@@ -197,35 +197,8 @@ android {
 
 apply from: "../../node_modules/@sentry/react-native/sentry.gradle"
 
-project.ext.sentryCli = [
-    logLevel: "debug",
-    sentryProperties: '../sentry.properties'
-]
 
 sentry {
-    // Enables or disables the automatic configuration of Native Symbols
-    // for Sentry. This executes sentry-cli automatically so
-    // you don't need to do it manually.
-    // Default is disabled.
-    uploadNativeSymbols = true
-
-    // Enables or disables the automatic upload of the app's native source code to Sentry.
-    // This executes sentry-cli with the --include-sources param automatically so
-    // you don't need to do it manually.
-    // This option has an effect only when [uploadNativeSymbols] is enabled.
-    // Default is disabled.
-    includeNativeSources = true
-
-     // `@sentry/react-native` ships with compatible `sentry-android`
-    // This option would install the latest version that ships with the SDK or SAGP (Sentry Android Gradle Plugin)
-    // which might be incompatible with the React Native SDK
-    // Enable auto-installation of Sentry components (sentry-android SDK and okhttp, timber and fragment integrations).
-    // Default is enabled.
-    autoInstallation {
-      enabled = false
-    }
-
-
     autoUploadProguardMapping = shouldSentryAutoUpload()
     uploadNativeSymbols = shouldSentryAutoUpload()
 }

diff --git a/apps/ledger-live-mobile/android/sentry.properties b/apps/ledger-live-mobile/android/sentry.properties
@@ -1,5 +1,4 @@
 defaults.url=https://sentry.io/
 defaults.org=ledger
-default.project=ledger-live-mobile
-cli.executable=../node_modules/@sentry/cli/bin/sentry-cli
+
 
diff --git a/apps/ledger-live-mobile/ios/Podfile.lock b/apps/ledger-live-mobile/ios/Podfile.lock
@@ -1983,11 +1983,29 @@ PODS:
     - ReactCommon/turbomodule/bridging
     - ReactCommon/turbomodule/core
     - Yoga
-  - RNSentry (5.24.3):
+  - RNSentry (6.5.0):
+    - DoubleConversion
+    - glog
     - hermes-engine
+    - RCT-Folly (= 2024.01.01.00)
+    - RCTRequired
+    - RCTTypeSafety
     - React-Core
+    - React-debug
+    - React-Fabric
+    - React-featureflags
+    - React-graphics
     - React-hermes
-    - Sentry/HybridSDK (= 8.36.0)
+    - React-ImageManager
+    - React-NativeModulesApple
+    - React-RCTFabric
+    - React-rendererdebug
+    - React-utils
+    - ReactCodegen
+    - ReactCommon/turbomodule/bridging
+    - ReactCommon/turbomodule/core
+    - Sentry/HybridSDK (= 8.43.0)
+    - Yoga
   - RNShare (10.1.0):
     - React-Core
   - RNSVG (13.14.0):
@@ -2022,7 +2040,7 @@ PODS:
   - segment-analytics-react-native (2.19.1):
     - React-Core
     - sovran-react-native
-  - Sentry/HybridSDK (8.36.0)
+  - Sentry/HybridSDK (8.43.0)
   - SocketRocket (0.7.0)
   - sovran-react-native (0.4.5):
     - React-Core
@@ -2576,14 +2594,14 @@ SPEC CHECKSUMS:
   RNReactNativeHapticFeedback: ec56a5f81c3941206fd85625fa669ffc7b4545f9
   RNReanimated: 82b558efb00a30a3b8ea1a3ca8975125e9400313
   RNScreens: 63500b789c1b5286972a55d4a7d73fc1123f51e4
-  RNSentry: e7e5d059d62d6c447d83e14800edc1812a594a5d
+  RNSentry: e1a16a23ada7d12686dff2f1eeaf55a08738585c
   RNShare: b674d9f1cb0dc11116983bebd8712908a226a3ee
   RNSVG: d00c8f91c3cbf6d476451313a18f04d220d4f396
   RNVectorIcons: 6382277afab3c54658e9d555ee0faa7a37827136
   SDWebImage: a7f831e1a65eb5e285e3fb046a23fcfbf08e696d
   SDWebImageWebPCoder: 908b83b6adda48effe7667cd2b7f78c897e5111d
   segment-analytics-react-native: 1c36d83c0a735795e304178241331e7701dc5d2a
-  Sentry: f8374b5415bc38dfb5645941b3ae31230fbeae57
+  Sentry: 532b281a53b1b45a523fd592f608956fb36e577c
   SocketRocket: abac6f5de4d4d62d24e11868d7a2f427e0ef940d
   sovran-react-native: fd3dc8f1a4b14acdc4ad25fc6b4ac4f52a2a2a15
   Storyly: 310297bcf4493d3d5b41e71834fba49502c8067a

diff --git a/apps/ledger-live-mobile/ios/ledgerlivemobile.xcodeproj/project.pbxproj b/apps/ledger-live-mobile/ios/ledgerlivemobile.xcodeproj/project.pbxproj
@@ -64,7 +64,7 @@
 		3407D5D8215D2AB800C9D40B /* NeededForBLE.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = NeededForBLE.swift; sourceTree = "<group>"; };
 		3B6982A2E67F482A8069215B /* Inter-Medium.otf */ = {isa = PBXFileReference; explicitFileType = undefined; fileEncoding = 9; includeInIndex = 0; lastKnownFileType = unknown; name = "Inter-Medium.otf"; path = "../node_modules/@ledgerhq/native-ui/lib/assets/fonts/inter/Inter-Medium.otf"; sourceTree = "<group>"; };
 		3E71666B2C4291351C2BA23C /* Pods-ledgerlivemobileTests.staging.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-ledgerlivemobileTests.staging.xcconfig"; path = "Target Support Files/Pods-ledgerlivemobileTests/Pods-ledgerlivemobileTests.staging.xcconfig"; sourceTree = "<group>"; };
-		3FF1B576B23156C611F7B818 /* PrivacyInfo.xcprivacy */ = {isa = PBXFileReference; includeInIndex = 1; name = PrivacyInfo.xcprivacy; path = ledgerlivemobile/PrivacyInfo.xcprivacy; sourceTree = "<group>"; };
+		3FF1B576B23156C611F7B818 /* PrivacyInfo.xcprivacy */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xml; name = PrivacyInfo.xcprivacy; path = ledgerlivemobile/PrivacyInfo.xcprivacy; sourceTree = "<group>"; };
 		44387CB2EE84464C83A75FD7 /* OpenSans-Regular.ttf */ = {isa = PBXFileReference; explicitFileType = undefined; fileEncoding = 9; includeInIndex = 0; lastKnownFileType = unknown; name = "OpenSans-Regular.ttf"; path = "../assets/fonts/OpenSans-Regular.ttf"; sourceTree = "<group>"; };
 		4BD106EA37CA467F9525D699 /* FontAwesome5_Pro_Brands.ttf */ = {isa = PBXFileReference; explicitFileType = undefined; fileEncoding = 9; includeInIndex = 0; lastKnownFileType = unknown; name = FontAwesome5_Pro_Brands.ttf; path = ../assets/fonts/FontAwesome5_Pro_Brands.ttf; sourceTree = "<group>"; };
 		4C2397DC873B4F8E91B750A8 /* Inter-Regular.otf */ = {isa = PBXFileReference; explicitFileType = undefined; fileEncoding = 9; includeInIndex = 0; lastKnownFileType = unknown; name = "Inter-Regular.otf"; path = "../assets/fonts/Inter-Regular.otf"; sourceTree = "<group>"; };

diff --git a/apps/ledger-live-mobile/package.json b/apps/ledger-live-mobile/package.json
@@ -129,7 +129,7 @@
     "@reduxjs/toolkit": "2.0.1",
     "@segment/analytics-react-native": "2.19.1",
     "@segment/sovran-react-native": "0.4.5",
-    "@sentry/react-native": "5.24.3",
+    "@sentry/react-native": "6.5.0",
     "@shopify/flash-list": "1.6.4",
     "@shopify/react-native-performance": "4.1.2",
     "@shopify/react-native-performance-navigation": "3.0.0",

diff --git a/apps/ledger-live-mobile/src/navigation/DeeplinksProvider.tsx b/apps/ledger-live-mobile/src/navigation/DeeplinksProvider.tsx
@@ -15,7 +15,6 @@ import { useFeature } from "@ledgerhq/live-common/featureFlags/index";
 import { BUY_SELL_UI_APP_ID } from "@ledgerhq/live-common/wallet-api/constants";
 import Braze from "@braze/react-native-sdk";
 import { LiveAppManifest } from "@ledgerhq/live-common/platform/types";
-import * as Sentry from "@sentry/react-native";
 import { hasCompletedOnboardingSelector } from "~/reducers/settings";
 import { navigationRef, isReadyRef } from "../rootnavigation";
 import { ScreenName, NavigatorName } from "~/const";
@@ -27,7 +26,7 @@ import { track } from "~/analytics";
 import { setEarnInfoModal } from "~/actions/earn";
 import { blockPasswordLock } from "../actions/appstate";
 import { useStorylyContext } from "~/components/StorylyStories/StorylyProvider";
-const routingInstrumentation = new Sentry.ReactNavigationInstrumentation();
+import { navigationIntegration } from "../sentry";
 const TRACKING_EVENT = "deeplink_clicked";
 
 const themes: {
@@ -674,7 +673,7 @@ export const DeeplinksProvider = ({
       onReady={() => {
         (isReadyRef as Writeable<typeof isReadyRef>).current = true;
         setTimeout(() => SplashScreen.hide(), 300);
-        routingInstrumentation.registerNavigationContainer(navigationRef);
+        navigationIntegration.registerNavigationContainer(navigationRef);
       }}
     >
       {children}