Pier Angelo Vendrame pushed to branch tor-browser-147.0a1-16.0-2 at The Tor Project / Applications / Tor Browser
Commits:
-
c7449fd1
by Dan Ballard at 2026-01-21T12:23:14-08:00
4 changed files:
- gradle/libs.versions.toml
- mobile/android/android-components/.buildconfig.yml
- mobile/android/fenix/app/build.gradle
- mobile/android/fenix/app/src/main/java/org/mozilla/fenix/components/Analytics.kt
Changes:
| ... | ... | @@ -101,7 +101,6 @@ disklrucache = "2.0.2" |
| 101 | 101 | jna = "5.18.1"
|
| 102 | 102 | okhttp = "4.12.0"
|
| 103 | 103 | okio = "3.15.0"
|
| 104 | -sentry = "8.27.1"
|
|
| 105 | 104 | zxing = "3.5.4"
|
| 106 | 105 | |
| 107 | 106 | [libraries]
|
| ... | ... | @@ -272,7 +271,6 @@ mockwebserver = { group = "com.squareup.okhttp3", name = "mockwebserver", versio |
| 272 | 271 | okhttp = { group = "com.squareup.okhttp3", name = "okhttp", version.ref = "okhttp" }
|
| 273 | 272 | okhttp-urlconnection = { group = "com.squareup.okhttp3", name = "okhttp-urlconnection", version.ref = "okhttp" }
|
| 274 | 273 | okio = { group = "com.squareup.okio", name = "okio", version.ref = "okio" }
|
| 275 | -sentry = { group = "io.sentry", name = "sentry-android", version.ref = "sentry" }
|
|
| 276 | 274 | zxing = { group = "com.google.zxing", name = "core", version.ref = "zxing" }
|
| 277 | 275 | |
| 278 | 276 | [plugins]
|
| ... | ... | @@ -1645,20 +1645,6 @@ projects: |
| 1645 | 1645 | - components:support-test
|
| 1646 | 1646 | - components:support-utils
|
| 1647 | 1647 | - components:tooling-lint
|
| 1648 | - components:lib-crash-sentry:
|
|
| 1649 | - description: A crash reporter for Sentry.io that that uses lib-crash.
|
|
| 1650 | - path: components/lib/crash-sentry
|
|
| 1651 | - publish: true
|
|
| 1652 | - upstream_dependencies:
|
|
| 1653 | - - components:concept-base
|
|
| 1654 | - - components:concept-fetch
|
|
| 1655 | - - components:lib-crash
|
|
| 1656 | - - components:lib-publicsuffixlist
|
|
| 1657 | - - components:support-base
|
|
| 1658 | - - components:support-ktx
|
|
| 1659 | - - components:support-test
|
|
| 1660 | - - components:support-utils
|
|
| 1661 | - - components:tooling-lint
|
|
| 1662 | 1648 | components:lib-dataprotect:
|
| 1663 | 1649 | description: A component using AndroidKeyStore to protect user data.
|
| 1664 | 1650 | path: components/lib/dataprotect
|
| ... | ... | @@ -666,7 +666,6 @@ dependencies { |
| 666 | 666 | implementation project(':components:ui-tabcounter')
|
| 667 | 667 | implementation project(':components:ui-widgets')
|
| 668 | 668 | implementation project(':components:lib-crash')
|
| 669 | - implementation project(':components:lib-crash-sentry')
|
|
| 670 | 669 | implementation project(':components:lib-dataprotect')
|
| 671 | 670 | implementation project(':components:lib-push-firebase')
|
| 672 | 671 | implementation project(':components:lib-state')
|
| ... | ... | @@ -727,7 +726,6 @@ dependencies { |
| 727 | 726 | implementation libs.play.review
|
| 728 | 727 | implementation libs.play.review.ktx
|
| 729 | 728 | implementation libs.protobuf.javalite
|
| 730 | - implementation libs.sentry
|
|
| 731 | 729 | |
| 732 | 730 | debugImplementation libs.androidx.compose.ui.tooling
|
| 733 | 731 | debugImplementation libs.leakcanary
|
| ... | ... | @@ -14,8 +14,6 @@ import mozilla.components.lib.crash.runtimetagproviders.BuildRuntimeTagProvider |
| 14 | 14 | import mozilla.components.lib.crash.runtimetagproviders.EnvironmentRuntimeProvider
|
| 15 | 15 | import mozilla.components.lib.crash.runtimetagproviders.ExperimentDataRuntimeTagProvider
|
| 16 | 16 | import mozilla.components.lib.crash.runtimetagproviders.VersionInfoProvider
|
| 17 | -import mozilla.components.lib.crash.sentry.SentryService
|
|
| 18 | -import mozilla.components.lib.crash.sentry.eventprocessors.CrashMetadataEventProcessor
|
|
| 19 | 17 | import mozilla.components.lib.crash.service.CrashReporterService
|
| 20 | 18 | import mozilla.components.lib.crash.service.GleanCrashReporterService
|
| 21 | 19 | import mozilla.components.lib.crash.service.socorro.MozillaSocorroService
|
| ... | ... | @@ -60,37 +58,9 @@ class Analytics( |
| 60 | 58 | val services = mutableListOf<CrashReporterService>()
|
| 61 | 59 | val distributionId = "Mozilla"
|
| 62 | 60 | |
| 63 | - if (isSentryEnabled()) {
|
|
| 64 | - // We treat caught exceptions similar to debug logging.
|
|
| 65 | - // On the release channel volume of these is too high for our Sentry instances, and
|
|
| 66 | - // we get most value out of nightly/beta logging anyway.
|
|
| 67 | - val shouldSendCaughtExceptions = when (Config.channel) {
|
|
| 68 | - ReleaseChannel.Release -> false
|
|
| 69 | - else -> true
|
|
| 70 | - }
|
|
| 71 | - val sentryService = SentryService(
|
|
| 72 | - context,
|
|
| 73 | - BuildConfig.SENTRY_TOKEN,
|
|
| 74 | - tags = mapOf(
|
|
| 75 | - "geckoview" to "$MOZ_APP_VERSION-$MOZ_APP_BUILDID",
|
|
| 76 | - "fenix.git" to BuildConfig.VCS_HASH,
|
|
| 77 | - ),
|
|
| 78 | - environment = BuildConfig.BUILD_TYPE,
|
|
| 79 | - sendEventForNativeCrashes = false, // Do not send native crashes to Sentry
|
|
| 80 | - sendCaughtExceptions = shouldSendCaughtExceptions,
|
|
| 81 | - sentryProjectUrl = getSentryProjectUrl(),
|
|
| 82 | - crashMetadataEventProcessor = CrashMetadataEventProcessor(),
|
|
| 83 | - )
|
|
| 84 | - |
|
| 85 | - // We only want to initialize Sentry on startup on the main process.
|
|
| 86 | - if (context.isMainProcess()) {
|
|
| 87 | - runWhenReadyQueue.runIfReadyOrQueue {
|
|
| 88 | - sentryService.initIfNeeded()
|
|
| 89 | - }
|
|
| 90 | - }
|
|
| 91 | - |
|
| 92 | - services.add(sentryService)
|
|
| 93 | - }
|
|
| 61 | + // Bug 44507: Drop Sentry as a dependency
|
|
| 62 | + // Since we've removed sentry and it's library (for defence in depth as well as spave saving)
|
|
| 63 | + // We can't keep any code that calls a now non existent library
|
|
| 94 | 64 | |
| 95 | 65 | // The name "Fenix" here matches the product name on Socorro and is unrelated to the actual app name:
|
| 96 | 66 | // https://bugzilla.mozilla.org/show_bug.cgi?id=1523284
|