[andr] Fatal Issue reporter code cleanup (#572)

* Simplify logger to remove the need for two clientAttributes

* Make AppExitLoggerTest run in gradle+AS

* fmt

* version missmatch fix

Author: murki

platform/jvm/capture/build.gradle.kts

@@ -37,6 +37,7 @@ dependencies {
     testImplementation(libs.assertj.core)
     testImplementation(libs.mockito.core)
     testImplementation(libs.mockito.kotlin)
+    testImplementation(libs.mockito.kotlin.inline)
     testImplementation(libs.androidx.test.core)
     testImplementation(libs.robolectric)
     testImplementation(libs.mockwebserver)

platform/jvm/capture/src/main/kotlin/io/bitdrift/capture/Capture.kt

@@ -9,9 +9,8 @@ package io.bitdrift.capture
 
 import android.content.Context
 import android.util.Log
-import androidx.lifecycle.ProcessLifecycleOwner
+import io.bitdrift.capture.Capture.Logger.startSpan
 import io.bitdrift.capture.LoggerImpl.SdkConfiguredDuration
-import io.bitdrift.capture.attributes.ClientAttributes
 import io.bitdrift.capture.common.MainThreadHandler
 import io.bitdrift.capture.events.span.Span
 import io.bitdrift.capture.events.span.SpanResult
@@ -21,8 +20,6 @@ import io.bitdrift.capture.providers.DateProvider
 import io.bitdrift.capture.providers.FieldProvider
 import io.bitdrift.capture.providers.SystemDateProvider
 import io.bitdrift.capture.providers.session.SessionStrategy
-import io.bitdrift.capture.reports.FatalIssueReporterFactory
-import io.bitdrift.capture.reports.IFatalIssueReporter
 import okhttp3.HttpUrl
 import java.util.UUID
 import java.util.concurrent.atomic.AtomicReference
@@ -108,9 +105,10 @@ object Capture {
          * @return the version as a String
          */
         @JvmStatic
-        val sdkVersion: String get() {
-            return BuildConstants.SDK_VERSION
-        }
+        val sdkVersion: String
+            get() {
+                return BuildConstants.SDK_VERSION
+            }
 
         /**
          * Initializes the Capture SDK with the specified API key, providers, and configuration.
@@ -152,6 +150,8 @@ object Capture {
             )
         }
 
+        // Note that we need to use @Synchronized to prevent multiple loggers from being initialized,
+        // while subsequent logger access relies on volatile reads.
         @Synchronized
         @JvmStatic
         @JvmOverloads
@@ -165,9 +165,6 @@ object Capture {
             bridge: IBridge,
             context: Context? = null,
         ) {
-            // Note that we need to use @Synchronized to prevent multiple loggers from being initialized,
-            // while subsequent logger access relies on volatile reads.
-
             // There's nothing we can do if we don't have yet access to the application context.
             if (hasInvalidContext(context)) {
                 Log.w(
@@ -514,39 +511,27 @@ object Capture {
 
             val appContext = context?.applicationContext ?: ContextHolder.APP_CONTEXT
 
-            val clientAttributes =
-                ClientAttributes(
-                    appContext,
-                    ProcessLifecycleOwner.get(),
-                )
-
             val nativeLoadDuration =
                 measureTime {
                     CaptureJniLibrary.load()
                 }
 
-            val fatalIssueReporter: IFatalIssueReporter? = FatalIssueReporterFactory.create(configuration)
-
             val (loggerImpl, loggerImplBuildDuration) =
                 measureTimedValue {
                     LoggerImpl(
                         apiKey = apiKey,
                         apiUrl = apiUrl,
                         context = appContext,
-                        clientAttributes = clientAttributes,
                         fieldProviders = fieldProviders,
                         dateProvider = dateProvider ?: SystemDateProvider(),
                         configuration = configuration,
                         sessionStrategy = sessionStrategy,
                         bridge = bridge,
-                        fatalIssueReporter = fatalIssueReporter,
                     )
                 }
 
             default.set(LoggerState.Started(loggerImpl))
 
-            fatalIssueReporter?.initBuiltInMode(appContext, clientAttributes, loggerImpl)
-
             val sdkConfiguredDuration =
                 SdkConfiguredDuration(
                     wholeStartDuration = startSdkTimer.elapsedNow(),

platform/jvm/capture/src/main/kotlin/io/bitdrift/capture/LoggerImpl.kt

@@ -47,6 +47,7 @@ import io.bitdrift.capture.providers.MetadataProvider
 import io.bitdrift.capture.providers.session.SessionStrategy
 import io.bitdrift.capture.providers.toFieldValue
 import io.bitdrift.capture.providers.toFields
+import io.bitdrift.capture.reports.FatalIssueReporter
 import io.bitdrift.capture.reports.IFatalIssueReporter
 import io.bitdrift.capture.reports.processor.ICompletedReportsProcessor
 import io.bitdrift.capture.threading.CaptureDispatchers
@@ -83,7 +84,12 @@ internal class LoggerImpl(
     bridge: IBridge = CaptureJniLibrary,
     private val eventListenerDispatcher: CaptureDispatchers.CommonBackground = CaptureDispatchers.CommonBackground,
     windowManager: IWindowManager = WindowManager(errorHandler),
-    private val fatalIssueReporter: IFatalIssueReporter?,
+    private val fatalIssueReporter: IFatalIssueReporter? =
+        if (configuration.enableFatalIssueReporting) {
+            FatalIssueReporter(configuration.enableNativeCrashReporting)
+        } else {
+            null
+        },
 ) : ILogger,
     ICompletedReportsProcessor {
     private val metadataProvider: MetadataProvider
@@ -249,7 +255,7 @@ internal class LoggerImpl(
                 runtime,
                 errorHandler,
                 memoryMetricsProvider = memoryMetricsProvider,
-                fatalIssueReporter = fatalIssueReporter,
+                isFatalIssueReporterEnabled = configuration.enableFatalIssueReporting,
             )
 
         // Install the app exit logger before the Capture logger is started to ensure
@@ -258,6 +264,9 @@ internal class LoggerImpl(
         appExitLogger.installAppExitLogger()
 
         CaptureJniLibrary.startLogger(this.loggerId)
+
+        // fatal issue reporter needs to be initialized after appExitLogger and the jniLogger
+        fatalIssueReporter?.initBuiltInMode(context, clientAttributes, this)
     }
 
     override fun processCrashReports() {

platform/jvm/capture/src/main/kotlin/io/bitdrift/capture/events/lifecycle/AppExitLogger.kt

@@ -26,8 +26,6 @@ import io.bitdrift.capture.common.Runtime
 import io.bitdrift.capture.common.RuntimeFeature
 import io.bitdrift.capture.events.performance.IMemoryMetricsProvider
 import io.bitdrift.capture.providers.toFields
-import io.bitdrift.capture.reports.FatalIssueMechanism
-import io.bitdrift.capture.reports.IFatalIssueReporter
 import io.bitdrift.capture.reports.exitinfo.ILatestAppExitInfoProvider
 import io.bitdrift.capture.reports.exitinfo.LatestAppExitInfoProvider
 import io.bitdrift.capture.reports.exitinfo.LatestAppExitReasonResult
@@ -49,7 +47,7 @@ internal class AppExitLogger(
     private val backgroundThreadHandler: IBackgroundThreadHandler = CaptureDispatchers.CommonBackground,
     private val latestAppExitInfoProvider: ILatestAppExitInfoProvider = LatestAppExitInfoProvider,
     private val captureUncaughtExceptionHandler: ICaptureUncaughtExceptionHandler = CaptureUncaughtExceptionHandler,
-    private val fatalIssueReporter: IFatalIssueReporter?,
+    private val isFatalIssueReporterEnabled: Boolean,
 ) : IJvmCrashListener {
     companion object {
         private const val APP_EXIT_EVENT_NAME = "AppExit"
@@ -138,8 +136,7 @@ internal class AppExitLogger(
         throwable: Throwable,
     ) {
         // When FatalIssueMechanism.BuiltIn is configured will rely on shared-core to emit the related JVM crash log
-        if (!runtime.isEnabled(RuntimeFeature.APP_EXIT_EVENTS) ||
-            fatalIssueReporter?.getReportingMechanism() == FatalIssueMechanism.BuiltIn
+        if (!runtime.isEnabled(RuntimeFeature.APP_EXIT_EVENTS) || isFatalIssueReporterEnabled
         ) {
             return
         }

platform/jvm/capture/src/main/kotlin/io/bitdrift/capture/reports/FatalIssueReporterFactory.kt

@@ -25,7 +25,6 @@ import io.bitdrift.capture.LoggerImpl
 import io.bitdrift.capture.common.Runtime
 import io.bitdrift.capture.common.RuntimeFeature
 import io.bitdrift.capture.fakes.FakeBackgroundThreadHandler
-import io.bitdrift.capture.fakes.FakeFatalIssueReporter
 import io.bitdrift.capture.fakes.FakeLatestAppExitInfoProvider
 import io.bitdrift.capture.fakes.FakeLatestAppExitInfoProvider.Companion.FAKE_EXCEPTION
 import io.bitdrift.capture.fakes.FakeLatestAppExitInfoProvider.Companion.SESSION_ID
@@ -34,7 +33,6 @@ import io.bitdrift.capture.fakes.FakeMemoryMetricsProvider
 import io.bitdrift.capture.fakes.FakeMemoryMetricsProvider.Companion.DEFAULT_MEMORY_ATTRIBUTES_MAP
 import io.bitdrift.capture.providers.FieldValue
 import io.bitdrift.capture.providers.toFields
-import io.bitdrift.capture.reports.FatalIssueMechanism
 import io.bitdrift.capture.reports.exitinfo.LatestAppExitInfoProvider.EXIT_REASON_EMPTY_LIST_MESSAGE
 import io.bitdrift.capture.reports.exitinfo.LatestAppExitInfoProvider.EXIT_REASON_EXCEPTION_MESSAGE
 import io.bitdrift.capture.reports.exitinfo.LatestAppExitInfoProvider.EXIT_REASON_UNMATCHED_PROCESS_NAME_MESSAGE
@@ -283,7 +281,7 @@ class AppExitLoggerTest {
 
     @Test
     fun onJvmCrash_whenBuiltInFatalIssueMechanism_shouldNotSendAppExitCrashLog() {
-        val appExitLogger = buildAppExitLogger(FatalIssueMechanism.BuiltIn)
+        val appExitLogger = buildAppExitLogger(isFatalIssueReporterEnabled = true)
         whenever(runtime.isEnabled(RuntimeFeature.LOGGER_FLUSHING_ON_CRASH)).thenReturn(true)
 
         appExitLogger.onJvmCrash(Thread.currentThread(), IllegalStateException("Simulated Crash"))
@@ -300,7 +298,7 @@ class AppExitLoggerTest {
         verify(logger, never()).flush(any())
     }
 
-    private fun buildAppExitLogger(fatalIssueMechanism: FatalIssueMechanism = FatalIssueMechanism.None) =
+    private fun buildAppExitLogger(isFatalIssueReporterEnabled: Boolean = false) =
         AppExitLogger(
             logger,
             activityManager,
@@ -311,7 +309,7 @@ class AppExitLoggerTest {
             backgroundThreadHandler,
             lastExitInfo,
             captureUncaughtExceptionHandler,
-            FakeFatalIssueReporter(fatalIssueMechanism),
+            isFatalIssueReporterEnabled,
         )
 
     private fun buildExpectedAnrFields(): Map<String, FieldValue> =

platform/jvm/capture/src/test/kotlin/io/bitdrift/capture/events/lifecycle/AppExitLoggerTest.kt

@@ -17,7 +17,7 @@ kotlinResultJvm         = "1.1.18"
 lifecycleCommon         = "2.8.7"
 material3Android        = "1.2.1"
 mavenPublishPlugin      = "0.28.0"
-mockitoCore             = "4.9.0"
+mockitoCore             = "4.11.0"
 mockitoKotlin           = "2.2.0"
 mockitoKotlinVersion    = "4.1.0"
 okhttp                  = "4.12.0"
@@ -49,6 +49,7 @@ kotlin-mockito-kotlin      = { module = "org.mockito.kotlin:mockito-kotlin", ver
 kotlin-result-jvm          = { module = "com.michael-bull.kotlin-result:kotlin-result-jvm", version.ref = "kotlinResultJvm" }
 mockito-core               = { module = "org.mockito:mockito-core", version.ref = "mockitoCore" }
 mockito-kotlin             = { module = "com.nhaarman.mockitokotlin2:mockito-kotlin", version.ref = "mockitoKotlin" }
+mockito-kotlin-inline      = { module = "org.mockito:mockito-inline", version.ref = "mockitoCore" }
 mockwebserver              = { module = "com.squareup.okhttp3:mockwebserver", version.ref = "okhttp" }
 okhttp                     = { module = "com.squareup.okhttp3:okhttp", version.ref = "okhttp" }
 performance                = { module = "androidx.metrics:metrics-performance", version.ref = "performance" }