feature(exitInfo) add pid check into exitinfo callback

bugsnag · Sep 25, 2023 · 217fc45 · 217fc45
1 parent 23c5062
commit 217fc45
Show file tree

Hide file tree

Showing 4 changed files with 15 additions and 7 deletions.
diff --git a/bugsnag-plugin-android-exitinfo/src/main/java/com/bugsnag/android/BugsnagExitInfoPlugin.kt b/bugsnag-plugin-android-exitinfo/src/main/java/com/bugsnag/android/BugsnagExitInfoPlugin.kt
@@ -40,8 +40,13 @@ class BugsnagExitInfoPlugin @JvmOverloads constructor(
             )
         }
 
+        val exitInfoPluginStore = ExitInfoPluginStore(client.immutableConfig)
+        val oldPid = exitInfoPluginStore.load()
+        exitInfoPluginStore.persist(android.os.Process.myPid())
+
         exitInfoCallback = ExitInfoCallback(
             client.appContext,
+            oldPid,
             TombstoneEventEnhancer(client.logger, listOpenFds, includeLogcat),
             TraceEventEnhancer(client.logger, client.immutableConfig.projectPackages)
         )

diff --git a/bugsnag-plugin-android-exitinfo/src/main/java/com/bugsnag/android/ExitInfoCallback.kt b/bugsnag-plugin-android-exitinfo/src/main/java/com/bugsnag/android/ExitInfoCallback.kt
@@ -8,6 +8,7 @@ import androidx.annotation.RequiresApi
 
 internal class ExitInfoCallback(
     private val context: Context,
+    private val pid: Int?,
     private val nativeEnhancer: (Event, ApplicationExitInfo) -> Unit,
     private val anrEventEnhancer: (Event, ApplicationExitInfo) -> Unit
 ) : OnSendCallback {
@@ -18,8 +19,10 @@ internal class ExitInfoCallback(
         val allExitInfo = am.getHistoricalProcessExitReasons(context.packageName, 0, MAX_EXIT_INFO)
         val sessionIdBytes = event.session?.id?.toByteArray() ?: return true
         val exitInfo =
-            allExitInfo.find { it.processStateSummary?.contentEquals(sessionIdBytes) == true }
-                ?: return true
+            allExitInfo.find {
+                it.processStateSummary?.contentEquals(sessionIdBytes) == true
+            }
+                ?: allExitInfo.find { it.pid == pid } ?: return true
 
         try {
             if (exitInfo.reason == ApplicationExitInfo.REASON_CRASH_NATIVE ||

diff --git a/bugsnag-plugin-android-exitinfo/src/main/java/com/bugsnag/android/TombstoneParser.kt b/bugsnag-plugin-android-exitinfo/src/main/java/com/bugsnag/android/TombstoneParser.kt
@@ -89,10 +89,10 @@ internal class TombstoneParser(
         values.forEach { thread ->
             val stacktrace = thread.currentBacktraceList.map { tombstoneTraceFrame ->
                 val stackFrame = Stackframe(
-                    tombstoneTraceFrame.functionName,
-                    tombstoneTraceFrame.fileName,
-                    tombstoneTraceFrame.relPc,
-                    null
+                    method = tombstoneTraceFrame.functionName,
+                    file = tombstoneTraceFrame.fileName,
+                    lineNumber = tombstoneTraceFrame.relPc,
+                    inProject = null
                 )
                 stackFrame.symbolAddress = tombstoneTraceFrame.functionOffset
                 stackFrame.loadAddress = tombstoneTraceFrame.fileMapOffset

diff --git a/bugsnag-plugin-android-exitinfo/src/test/java/com/bugsnag/android/ExitInfoCallbackTest.kt b/bugsnag-plugin-android-exitinfo/src/test/java/com/bugsnag/android/ExitInfoCallbackTest.kt
@@ -45,7 +45,7 @@ internal class ExitInfoCallbackTest {
 
     @Before
     fun setUp() {
-        exitInfoCallback = ExitInfoCallback(context, nativeEnhancer, anrEventEnhancer)
+        exitInfoCallback = ExitInfoCallback(context, 100, nativeEnhancer, anrEventEnhancer)
         exitInfos = listOf(exitInfo1)
         `when`(context.getSystemService(any())).thenReturn(am)
         `when`(am.getHistoricalProcessExitReasons(any(), anyInt(), anyInt()))