refactor(logging): extract BreadcrumbSink and ErrorReporter interfaces

bmc08gt · bmc08gt · commit c3a2ac393bd8 · 2026-04-08T17:24:47.000-04:00
Remove Bugsnag dependency from libs/logging by introducing
BreadcrumbSink and ErrorReporter interfaces, with concrete
Bugsnag implementations in the app module. Logging now guards
calls behind an initialized check instead of crashing on early use.
diff --git a/apps/flipcash/app/build.gradle.kts b/apps/flipcash/app/build.gradle.kts
@@ -1,6 +1,5 @@
 import com.bugsnag.gradle.dsl.debug
 import com.bugsnag.gradle.dsl.release
-import com.google.firebase.crashlytics.buildtools.gradle.CrashlyticsExtension
 import org.jetbrains.kotlin.gradle.dsl.JvmTarget
 
 plugins {
@@ -12,7 +11,6 @@ plugins {
     alias(libs.plugins.navigation.safeargs)
     id("dagger.hilt.android.plugin")
     alias(libs.plugins.google.services)
-    alias(libs.plugins.firebase.crashlytics)
     alias(libs.plugins.firebase.perf)
     alias(libs.plugins.bugsnag.gradle)
     alias(libs.plugins.secrets)
@@ -65,9 +63,6 @@ android {
             isShrinkResources = true
             proguardFiles(getDefaultProguardFile("proguard-android-optimize.txt"), "proguard-rules.pro")
 
-            configure<CrashlyticsExtension> {
-                mappingFileUploadEnabled = true
-            }
         }
         getByName("debug") {
             applicationIdSuffix = ".dev"
@@ -85,9 +80,6 @@ android {
                 )
             }
 
-            configure<CrashlyticsExtension> {
-                mappingFileUploadEnabled = tryReadProperty(rootProject.rootDir, "DEBUG_CRASHLYTICS_UPLOAD", "false").toBooleanStrictOrNull() ?: false
-            }
         }
     }
 
@@ -256,7 +248,6 @@ dependencies {
 
     implementation(platform(libs.firebase.bom))
     implementation(libs.firebase.analytics)
-    implementation(libs.firebase.crashlytics)
     implementation(libs.firebase.messaging)
 
     implementation(libs.mixpanel)
diff --git a/apps/flipcash/app/src/main/kotlin/com/flipcash/app/MainActivity.kt b/apps/flipcash/app/src/main/kotlin/com/flipcash/app/MainActivity.kt
@@ -55,7 +55,6 @@ import com.getcode.utils.CurrencyUtils
 import com.getcode.utils.LocalCurrencyUtils
 import com.getcode.utils.network.LocalNetworkObserver
 import com.getcode.utils.network.NetworkConnectivityListener
-import com.google.firebase.crashlytics.FirebaseCrashlytics
 import dagger.hilt.android.AndroidEntryPoint
 import dev.bmcreations.tipkit.engines.TipsEngine
 import dev.theolm.rinku.compose.ext.Rinku
@@ -187,8 +186,6 @@ private fun Activity.handleUncaughtException() {
     Thread.setDefaultUncaughtExceptionHandler { _, throwable ->
         if (BuildConfig.DEBUG) throw throwable
 
-        FirebaseCrashlytics.getInstance().recordException(throwable)
-
         val intent = Intent(this, MainActivity::class.java).apply {
             putExtra(crashedKey, true)
             addFlags(Intent.FLAG_ACTIVITY_CLEAR_TOP or Intent.FLAG_ACTIVITY_CLEAR_TASK or Intent.FLAG_ACTIVITY_NEW_TASK)
diff --git a/apps/flipcash/app/src/main/kotlin/com/flipcash/app/internal/startup/BugsnagBreadcrumbSink.kt b/apps/flipcash/app/src/main/kotlin/com/flipcash/app/internal/startup/BugsnagBreadcrumbSink.kt
@@ -0,0 +1,27 @@
+package com.flipcash.app.internal.startup
+
+import com.bugsnag.android.BreadcrumbType
+import com.bugsnag.android.Bugsnag
+import com.getcode.utils.BreadcrumbSink
+import com.getcode.utils.TraceType
+
+class BugsnagBreadcrumbSink : BreadcrumbSink {
+    override fun record(message: String, metadata: Map<String, Any>, type: TraceType) {
+        if (!Bugsnag.isStarted()) return
+        val breadcrumbType = type.toBugsnagBreadcrumbType() ?: return
+        Bugsnag.leaveBreadcrumb(message, metadata, breadcrumbType)
+    }
+}
+
+private fun TraceType.toBugsnagBreadcrumbType(): BreadcrumbType? {
+    return when (this) {
+        TraceType.Silent -> null
+        TraceType.Error -> BreadcrumbType.ERROR
+        TraceType.Log -> BreadcrumbType.LOG
+        TraceType.Navigation -> BreadcrumbType.NAVIGATION
+        TraceType.Network -> BreadcrumbType.REQUEST
+        TraceType.Process -> BreadcrumbType.PROCESS
+        TraceType.StateChange -> BreadcrumbType.STATE
+        TraceType.User -> BreadcrumbType.USER
+    }
+}
diff --git a/apps/flipcash/app/src/main/kotlin/com/flipcash/app/internal/startup/BugsnagErrorReporter.kt b/apps/flipcash/app/src/main/kotlin/com/flipcash/app/internal/startup/BugsnagErrorReporter.kt
@@ -0,0 +1,21 @@
+package com.flipcash.app.internal.startup
+
+import com.bugsnag.android.Bugsnag
+import com.getcode.utils.ErrorReporter
+
+class BugsnagErrorReporter : ErrorReporter {
+    override fun report(error: Throwable, cause: Throwable, isNotifiable: Boolean) {
+        if (!Bugsnag.isStarted()) return
+        Bugsnag.notify(error) { event ->
+            if (isNotifiable) {
+                event.addMetadata("alert", "slack_notify", true)
+                event.addMetadata("alert", "error_type", cause.javaClass.simpleName)
+                event.addMetadata(
+                    "alert", "error_family",
+                    cause.javaClass.enclosingClass?.simpleName ?: "Unknown"
+                )
+            }
+            true
+        }
+    }
+}
diff --git a/apps/flipcash/app/src/main/kotlin/com/flipcash/app/internal/startup/FirebaseInitializer.kt b/apps/flipcash/app/src/main/kotlin/com/flipcash/app/internal/startup/FirebaseInitializer.kt
@@ -2,9 +2,7 @@ package com.flipcash.app.internal.startup
 
 import android.content.Context
 import androidx.startup.Initializer
-import com.flipcash.app.android.BuildConfig
 import com.google.firebase.Firebase
-import com.google.firebase.crashlytics.crashlytics
 import com.google.firebase.initialize
 import kotlinx.coroutines.CoroutineScope
 import kotlinx.coroutines.Dispatchers
@@ -14,7 +12,6 @@ class FirebaseInitializer: Initializer<Unit> {
     override fun create(context: Context) {
         CoroutineScope(Dispatchers.IO).launch {
             Firebase.initialize(context)
-            Firebase.crashlytics.isCrashlyticsCollectionEnabled = BuildConfig.NOTIFY_ERRORS || !BuildConfig.DEBUG
         }
     }
 
diff --git a/apps/flipcash/app/src/main/kotlin/com/flipcash/app/internal/startup/TraceInitializer.kt b/apps/flipcash/app/src/main/kotlin/com/flipcash/app/internal/startup/TraceInitializer.kt
@@ -7,6 +7,7 @@ import com.bugsnag.android.Configuration
 import com.flipcash.app.android.BuildConfig
 import com.flipcash.app.internal.debug.FlipcashDebugTree
 import com.flipcash.app.internal.debug.FlipcashErrorCallback
+import com.getcode.utils.ErrorUtils
 import com.getcode.utils.TraceManager
 import kotlinx.coroutines.CoroutineScope
 import kotlinx.coroutines.Dispatchers
@@ -24,6 +25,12 @@ class TraceInitializer: Initializer<Unit> {
                 val config = Configuration.load(context)
                 config.addOnError(FlipcashErrorCallback)
                 Bugsnag.start(context, config)
+
+                ErrorUtils.addReporter(BugsnagErrorReporter())
+                TraceManager.addSink(BugsnagBreadcrumbSink())
+                TraceManager.setOnUserIdChanged { id ->
+                    Bugsnag.setUser(id, null, null)
+                }
             }
         }
     }
diff --git a/libs/logging/build.gradle.kts b/libs/logging/build.gradle.kts
@@ -28,10 +28,8 @@ dependencies {
     testImplementation(libs.robolectric)
 
     api(libs.timber)
-    implementation(libs.bugsnag)
+    implementation(libs.androidx.annotation)
     implementation(libs.rxjava)
-    implementation(platform(libs.firebase.bom))
-    implementation(libs.firebase.crashlytics)
     implementation(libs.grpc.kotlin)
     implementation(project(":libs:messaging"))
 }
diff --git a/libs/logging/src/main/kotlin/com/getcode/utils/BreadcrumbSink.kt b/libs/logging/src/main/kotlin/com/getcode/utils/BreadcrumbSink.kt
@@ -0,0 +1,9 @@
+package com.getcode.utils
+
+interface BreadcrumbSink {
+    fun record(
+        message: String,
+        metadata: Map<String, Any>,
+        type: TraceType,
+    )
+}
diff --git a/libs/logging/src/main/kotlin/com/getcode/utils/ErrorReporter.kt b/libs/logging/src/main/kotlin/com/getcode/utils/ErrorReporter.kt
@@ -0,0 +1,9 @@
+package com.getcode.utils
+
+interface ErrorReporter {
+    fun report(
+        error: Throwable,
+        cause: Throwable,
+        isNotifiable: Boolean,
+    )
+}
diff --git a/libs/logging/src/main/kotlin/com/getcode/utils/ErrorUtils.kt b/libs/logging/src/main/kotlin/com/getcode/utils/ErrorUtils.kt
@@ -1,8 +1,6 @@
 package com.getcode.utils
 
 import android.database.SQLException
-import com.bugsnag.android.Bugsnag
-import com.google.firebase.crashlytics.FirebaseCrashlytics
 import com.getcode.libs.logging.BuildConfig
 import com.getcode.manager.TopBarManager
 import io.grpc.Status
@@ -17,6 +15,10 @@ import java.util.concurrent.TimeoutException
 
 object ErrorUtils {
     private var isDisplayErrors = false
+    private val reporters = mutableListOf<ErrorReporter>()
+
+    fun addReporter(reporter: ErrorReporter) { reporters.add(reporter) }
+    fun removeReporter(reporter: ErrorReporter) { reporters.remove(reporter) }
 
     fun setDisplayErrors(isDisplayErrors: Boolean) {
         ErrorUtils.isDisplayErrors = isDisplayErrors
@@ -63,34 +65,11 @@ object ErrorUtils {
             ignoredErrors.none { it.isInstance(throwable) } &&
             ignoredErrors.none { it.isInstance(throwableCause) }
         ) {
-            FirebaseCrashlytics.getInstance().recordException(throwable)
-            if (Bugsnag.isStarted()) {
-                Bugsnag.notify(throwable) { event ->
-                    val isNotifiable = throwable is NotifiableError
-                            || throwableCause is NotifiableError
-                            || throwableCause !is CodeServerError
-                    if (isNotifiable) {
-                        event.addMetadata("alert", "slack_notify", true)
-                        event.addMetadata("alert", "error_type", throwableCause.javaClass.simpleName)
-                        event.addMetadata("alert", "error_family", throwableCause.javaClass.enclosingClass?.simpleName ?: "Unknown")
-                    }
-                    true
-                }
-            }
-        }
-    }
+            val isNotifiable = throwable is NotifiableError
+                || throwableCause is NotifiableError
+                || throwableCause !is CodeServerError
 
-    fun notifyUnexpected(throwable: Throwable, context: String? = null) {
-        if (!BuildConfig.NOTIFY_ERRORS) return
-        Timber.e(throwable)
-        FirebaseCrashlytics.getInstance().recordException(throwable)
-        if (Bugsnag.isStarted()) {
-            Bugsnag.notify(throwable) { event ->
-                event.addMetadata("alert", "slack_notify", true)
-                event.addMetadata("alert", "error_type", throwable.javaClass.simpleName)
-                context?.let { event.addMetadata("alert", "context", it) }
-                true
-            }
+            reporters.forEach { it.report(throwable, throwableCause, isNotifiable) }
         }
     }
 
diff --git a/libs/logging/src/main/kotlin/com/getcode/utils/FileTree.kt b/libs/logging/src/main/kotlin/com/getcode/utils/FileTree.kt
@@ -4,7 +4,6 @@ import android.content.Context
 import android.content.pm.PackageManager
 import android.os.Build
 import android.util.Log
-import com.bugsnag.android.Bugsnag
 import timber.log.Timber
 import java.io.File
 import java.io.FileOutputStream
@@ -107,7 +106,7 @@ private fun buildDeviceHeader(context: Context): String {
         if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.P) it.longVersionCode else it.versionCode.toLong()
     } ?: -1
 
-    val userId = if (Bugsnag.isStarted()) Bugsnag.getUser().id else null
+    val userId = TraceManager.userId
 
     return buildString {
         appendLine("=".repeat(60))
diff --git a/libs/logging/src/main/kotlin/com/getcode/utils/Logging.kt b/libs/logging/src/main/kotlin/com/getcode/utils/Logging.kt
@@ -2,10 +2,6 @@ package com.getcode.utils
 
 import android.annotation.SuppressLint
 import android.content.Context
-import com.bugsnag.android.BreadcrumbType
-import com.bugsnag.android.Bugsnag
-import com.google.firebase.crashlytics.CustomKeysAndValues
-import com.google.firebase.crashlytics.FirebaseCrashlytics
 import timber.log.Timber
 import java.io.File
 import kotlin.time.Duration
@@ -55,22 +51,23 @@ sealed interface TraceType {
     data object User : TraceType
 }
 
-private fun TraceType.toBugsnagBreadcrumbType(): BreadcrumbType? {
-    return when (this) {
-        TraceType.Silent -> null
-        TraceType.Error -> BreadcrumbType.ERROR
-        TraceType.Log -> BreadcrumbType.LOG
-        TraceType.Navigation -> BreadcrumbType.NAVIGATION
-        TraceType.Network -> BreadcrumbType.REQUEST
-        TraceType.Process -> BreadcrumbType.PROCESS
-        TraceType.StateChange -> BreadcrumbType.STATE
-        TraceType.User -> BreadcrumbType.USER
-    }
-}
-
 object TraceManager {
     private var fileTree: FileTree? = null
     val plugins: MutableList<TraceLogPlugin> = mutableListOf()
+    private val breadcrumbSinks = mutableListOf<BreadcrumbSink>()
+    private var _userId: String? = null
+    private var onUserIdChanged: ((String?) -> Unit)? = null
+
+    var userId: String?
+        get() = _userId
+        set(value) {
+            _userId = value
+            onUserIdChanged?.invoke(value)
+        }
+
+    fun setOnUserIdChanged(listener: ((String?) -> Unit)?) {
+        onUserIdChanged = listener
+    }
 
     fun addPlugin(plugin: TraceLogPlugin) {
         plugins.add(plugin)
@@ -80,6 +77,10 @@ object TraceManager {
         plugins.remove(plugin)
     }
 
+    fun addSink(sink: BreadcrumbSink) { breadcrumbSinks.add(sink) }
+    fun removeSink(sink: BreadcrumbSink) { breadcrumbSinks.remove(sink) }
+    fun sinks(): List<BreadcrumbSink> = breadcrumbSinks
+
     fun initialize(context: Context) {
         if (fileTree != null) return
         val tree = FileTree(context, plugins = { plugins })
@@ -100,6 +101,9 @@ object TraceManager {
         fileTree?.let { Timber.uproot(it) }
         fileTree = null
         plugins.clear()
+        breadcrumbSinks.clear()
+        _userId = null
+        onUserIdChanged = null
     }
 }
 
@@ -140,27 +144,8 @@ fun trace(
         message
     }
 
-    if (Bugsnag.isStarted()) {
-        val breadcrumbType = type.toBugsnagBreadcrumbType()
-        if (breadcrumbType != null) {
-            Bugsnag.leaveBreadcrumb(
-                breadcrumb,
-                metadataMap,
-                breadcrumbType
-            )
-        }
-    }
-
-    if (FirebaseCrashlytics.getInstance().isCrashlyticsCollectionEnabled) {
-        FirebaseCrashlytics.getInstance().log(breadcrumb)
-        FirebaseCrashlytics.getInstance().setCustomKeys(
-            CustomKeysAndValues.Builder()
-                .apply {
-                    metadataMap.entries.onEach {
-                        putString(it.key, it.value.toString())
-                    }
-                }.build()
-        )
+    TraceManager.sinks().forEach { sink ->
+        sink.record(breadcrumb, metadataMap, type)
     }
 
     error?.let(ErrorUtils::handleError)
diff --git a/services/flipcash/build.gradle.kts b/services/flipcash/build.gradle.kts
@@ -68,8 +68,6 @@ dependencies {
     ksp(libs.hilt.android.compiler)
     ksp(libs.hilt.compiler)
 
-    implementation(libs.bugsnag)
-
     implementation(libs.event.bus)
 
     testImplementation(kotlin("test"))
diff --git a/services/flipcash/src/main/kotlin/com/flipcash/services/user/UserManager.kt b/services/flipcash/src/main/kotlin/com/flipcash/services/user/UserManager.kt
@@ -1,6 +1,5 @@
 package com.flipcash.services.user
 
-import com.bugsnag.android.Bugsnag
 import com.flipcash.services.models.UserFlags
 import com.flipcash.services.models.UserProfile
 import com.getcode.crypt.DerivePath
@@ -16,6 +15,7 @@ import com.getcode.opencode.model.core.NoId
 import com.getcode.opencode.model.financial.Token
 import com.getcode.opencode.model.financial.usdf
 import com.getcode.services.opencode.BuildConfig
+import com.getcode.utils.TraceManager
 import com.getcode.utils.base58
 import com.google.firebase.Firebase
 import com.google.firebase.messaging.messaging
@@ -182,10 +182,7 @@ class UserManager @Inject constructor(
 
     private fun associate() {
         if (!BuildConfig.DEBUG) {
-            if (Bugsnag.isStarted()) {
-                Bugsnag.setUser(accountId?.base58, null, "")
-            }
-
+            TraceManager.userId = accountId?.base58
             mixpanelAPI.identify(accountId?.base58)
         }
     }
