From 1d7c98d0cbf751d995ccfa1b00277b8b6833a5e1 Mon Sep 17 00:00:00 2001 From: Davide Depau Date: Sun, 28 Jun 2026 23:41:58 +0200 Subject: [PATCH] feat: auto downgrade environmental issues to warnings --- .../depau/etchdroid/plugins/telemetry/Telemetry.kt | 14 ++++++++++++++ .../utils/exception/base/RecoverableException.kt | 14 ++++++++++++++ 2 files changed, 28 insertions(+) diff --git a/app/src/gplay/java/eu/depau/etchdroid/plugins/telemetry/Telemetry.kt b/app/src/gplay/java/eu/depau/etchdroid/plugins/telemetry/Telemetry.kt index 9669a63..8e05626 100644 --- a/app/src/gplay/java/eu/depau/etchdroid/plugins/telemetry/Telemetry.kt +++ b/app/src/gplay/java/eu/depau/etchdroid/plugins/telemetry/Telemetry.kt @@ -13,10 +13,12 @@ import com.google.firebase.crashlytics.CustomKeysAndValues import com.google.firebase.crashlytics.FirebaseCrashlytics import com.google.firebase.crashlytics.crashlytics import eu.depau.etchdroid.BuildConfig +import eu.depau.etchdroid.utils.exception.base.isEnvironmentalFault import io.sentry.Breadcrumb import io.sentry.IScope import io.sentry.Sentry import io.sentry.SentryLevel +import io.sentry.SentryOptions import io.sentry.android.core.SentryAndroid import io.sentry.compose.SentryModifier.sentryTag import io.sentry.compose.SentryTraced @@ -162,6 +164,18 @@ object Telemetry : ITelemetry { it.profilesSampleRate = SAMPLE_RATE it.sessionReplay.sessionSampleRate = SAMPLE_RATE it.sessionReplay.onErrorSampleRate = ERROR_SAMPLE_RATE + + // Recoverable, environmental failures (USB stalls/unplugs, init + // failures, libusb errors) aren't app bugs: keep them for + // visibility but downgrade to WARNING + tag so they don't pollute + // the error page. + it.beforeSend = SentryOptions.BeforeSendCallback { event, _ -> + if (event.throwable.isEnvironmentalFault()) { + event.level = SentryLevel.WARNING + event.setTag("recoverable", "true") + } + event + } } } } catch (e: Throwable) { diff --git a/app/src/main/java/eu/depau/etchdroid/utils/exception/base/RecoverableException.kt b/app/src/main/java/eu/depau/etchdroid/utils/exception/base/RecoverableException.kt index 2dfbc7e..4d9c91d 100644 --- a/app/src/main/java/eu/depau/etchdroid/utils/exception/base/RecoverableException.kt +++ b/app/src/main/java/eu/depau/etchdroid/utils/exception/base/RecoverableException.kt @@ -9,3 +9,17 @@ abstract class RecoverableException(message: String, cause: Throwable? = null) : val RecoverableException.isUnplugged: Boolean get() = rootCause is LibusbException && (rootCause as LibusbException).libusbError == LibusbError.NO_DEVICE + +/** + * A known non-app-fault: a recoverable EtchDroid error or a libusb hardware error + * anywhere in the cause chain. Used to de-prioritize such failures in telemetry. + */ +fun Throwable?.isEnvironmentalFault(): Boolean { + var t = this + val seen = HashSet() + while (t != null && seen.add(t)) { + if (t is RecoverableException || t is LibusbException) return true + t = t.cause + } + return false +}