Deduplicate ApplicationExitInfo handling for corresponding Integrations via HistoryDispatcher

* also update api dumps and formatting for sentry changes

Author: supervacuus

sentry-android-core/api/sentry-android-core.api

@@ -339,6 +339,7 @@ public final class io/sentry/android/core/SentryAndroidOptions : io/sentry/Sentr
 	public fun isEnableSystemEventBreadcrumbs ()Z
 	public fun isEnableSystemEventBreadcrumbsExtras ()Z
 	public fun isReportHistoricalAnrs ()Z
+	public fun isReportHistoricalTombstones ()Z
 	public fun isTombstoneEnabled ()Z
 	public fun setAnrEnabled (Z)V
 	public fun setAnrReportInDebug (Z)V
@@ -368,6 +369,7 @@ public final class io/sentry/android/core/SentryAndroidOptions : io/sentry/Sentr
 	public fun setNativeHandlerStrategy (Lio/sentry/android/core/NdkHandlerStrategy;)V
 	public fun setNativeSdkName (Ljava/lang/String;)V
 	public fun setReportHistoricalAnrs (Z)V
+	public fun setReportHistoricalTombstones (Z)V
 	public fun setTombstoneEnabled (Z)V
 }
 
@@ -467,9 +469,21 @@ public class io/sentry/android/core/TombstoneIntegration : io/sentry/Integration
 	public fun register (Lio/sentry/IScopes;Lio/sentry/SentryOptions;)V
 }
 
-public class io/sentry/android/core/TombstoneIntegration$TombstoneProcessor : java/lang/Runnable {
-	public fun <init> (Landroid/content/Context;Lio/sentry/IScopes;Lio/sentry/android/core/SentryAndroidOptions;Lio/sentry/transport/ICurrentDateProvider;)V
-	public fun run ()V
+public final class io/sentry/android/core/TombstoneIntegration$TombstoneHint : io/sentry/hints/BlockingFlushHint, io/sentry/hints/Backfillable, io/sentry/hints/NativeCrashExit {
+	public fun <init> (JLio/sentry/ILogger;JZ)V
+	public fun isFlushable (Lio/sentry/protocol/SentryId;)Z
+	public fun setFlushable (Lio/sentry/protocol/SentryId;)V
+	public fun shouldEnrich ()Z
+	public fun timestamp ()Ljava/lang/Long;
+}
+
+public class io/sentry/android/core/TombstoneIntegration$TombstonePolicy : io/sentry/android/core/ApplicationExitInfoHistoryDispatcher$ApplicationExitInfoPolicy {
+	public fun <init> (Lio/sentry/android/core/SentryAndroidOptions;)V
+	public fun buildReport (Landroid/app/ApplicationExitInfo;Z)Lio/sentry/android/core/ApplicationExitInfoHistoryDispatcher$Report;
+	public fun getLabel ()Ljava/lang/String;
+	public fun getLastReportedTimestamp ()Ljava/lang/Long;
+	public fun getTargetReason ()I
+	public fun shouldReportHistorical ()Z
 }
 
 public final class io/sentry/android/core/UserInteractionIntegration : android/app/Application$ActivityLifecycleCallbacks, io/sentry/Integration, java/io/Closeable {
@@ -498,7 +512,9 @@ public final class io/sentry/android/core/ViewHierarchyEventProcessor : io/sentr
 }
 
 public final class io/sentry/android/core/cache/AndroidEnvelopeCache : io/sentry/cache/EnvelopeCache {
+	public static final field LAST_ANR_MARKER_LABEL Ljava/lang/String;
 	public static final field LAST_ANR_REPORT Ljava/lang/String;
+	public static final field LAST_TOMBSTONE_MARKER_LABEL Ljava/lang/String;
 	public static final field LAST_TOMBSTONE_REPORT Ljava/lang/String;
 	public fun <init> (Lio/sentry/android/core/SentryAndroidOptions;)V
 	public fun getDirectory ()Ljava/io/File;

sentry-android-core/src/main/java/io/sentry/android/core/AnrV2Integration.java

@@ -18,8 +18,6 @@
 import io.sentry.android.core.cache.AndroidEnvelopeCache;
 import io.sentry.android.core.internal.threaddump.Lines;
 import io.sentry.android.core.internal.threaddump.ThreadDumpParser;
-import io.sentry.cache.EnvelopeCache;
-import io.sentry.cache.IEnvelopeCache;
 import io.sentry.hints.AbnormalExit;
 import io.sentry.hints.Backfillable;
 import io.sentry.hints.BlockingFlushHint;
@@ -39,20 +37,14 @@
 import java.io.IOException;
 import java.io.InputStream;
 import java.io.InputStreamReader;
-import java.util.ArrayList;
-import java.util.Collections;
 import java.util.List;
-import java.util.concurrent.TimeUnit;
 import org.jetbrains.annotations.ApiStatus;
 import org.jetbrains.annotations.NotNull;
 import org.jetbrains.annotations.Nullable;
 
 @SuppressLint("NewApi") // we check this in AnrIntegrationFactory
 public class AnrV2Integration implements Integration, Closeable {
 
-  // using 91 to avoid timezone change hassle, 90 days is how long Sentry keeps the events
-  static final long NINETY_DAYS_THRESHOLD = TimeUnit.DAYS.toMillis(91);
-
   private final @NotNull Context context;
   private final @NotNull ICurrentDateProvider dateProvider;
   private @Nullable SentryAndroidOptions options;
@@ -92,9 +84,11 @@ public void register(@NotNull IScopes scopes, @NotNull SentryOptions options) {
       try {
         options
             .getExecutorService()
-            .submit(new AnrProcessor(context, scopes, this.options, dateProvider));
+            .submit(
+                new ApplicationExitInfoHistoryDispatcher(
+                    context, scopes, this.options, dateProvider, new AnrV2Policy(this.options)));
       } catch (Throwable e) {
-        options.getLogger().log(SentryLevel.DEBUG, "Failed to start AnrProcessor.", e);
+        options.getLogger().log(SentryLevel.DEBUG, "Failed to start ANR processor.", e);
       }
       options.getLogger().log(SentryLevel.DEBUG, "AnrV2Integration installed.");
       addIntegrationToSdkVersion("AnrV2");
@@ -108,132 +102,37 @@ public void close() throws IOException {
     }
   }
 
-  static class AnrProcessor implements Runnable {
+  private static final class AnrV2Policy
+      implements ApplicationExitInfoHistoryDispatcher.ApplicationExitInfoPolicy {
 
-    private final @NotNull Context context;
-    private final @NotNull IScopes scopes;
     private final @NotNull SentryAndroidOptions options;
-    private final long threshold;
-
-    AnrProcessor(
-        final @NotNull Context context,
-        final @NotNull IScopes scopes,
-        final @NotNull SentryAndroidOptions options,
-        final @NotNull ICurrentDateProvider dateProvider) {
-      this.context = context;
-      this.scopes = scopes;
+
+    AnrV2Policy(final @NotNull SentryAndroidOptions options) {
       this.options = options;
-      this.threshold = dateProvider.getCurrentTimeMillis() - NINETY_DAYS_THRESHOLD;
     }
 
-    @SuppressLint("NewApi") // we check this in AnrIntegrationFactory
     @Override
-    public void run() {
-      final ActivityManager activityManager =
-          (ActivityManager) context.getSystemService(Context.ACTIVITY_SERVICE);
-
-      final List<ApplicationExitInfo> applicationExitInfoList =
-          activityManager.getHistoricalProcessExitReasons(null, 0, 0);
-      if (applicationExitInfoList.size() == 0) {
-        options.getLogger().log(SentryLevel.DEBUG, "No records in historical exit reasons.");
-        return;
-      }
-
-      final IEnvelopeCache cache = options.getEnvelopeDiskCache();
-      if (cache instanceof EnvelopeCache) {
-        if (options.isEnableAutoSessionTracking()
-            && !((EnvelopeCache) cache).waitPreviousSessionFlush()) {
-          options
-              .getLogger()
-              .log(
-                  SentryLevel.WARNING,
-                  "Timed out waiting to flush previous session to its own file.");
-
-          // if we timed out waiting here, we can already flush the latch, because the timeout is
-          // big
-          // enough to wait for it only once and we don't have to wait again in
-          // PreviousSessionFinalizer
-          ((EnvelopeCache) cache).flushPreviousSession();
-        }
-      }
-
-      // making a deep copy as we're modifying the list
-      final List<ApplicationExitInfo> exitInfos = new ArrayList<>(applicationExitInfoList);
-      final @Nullable Long lastReportedAnrTimestamp = AndroidEnvelopeCache.lastReportedAnr(options);
-
-      // search for the latest ANR to report it separately as we're gonna enrich it. The latest
-      // ANR will be first in the list, as it's filled last-to-first in order of appearance
-      ApplicationExitInfo latestAnr = null;
-      for (ApplicationExitInfo applicationExitInfo : exitInfos) {
-        if (applicationExitInfo.getReason() == ApplicationExitInfo.REASON_ANR) {
-          latestAnr = applicationExitInfo;
-          // remove it, so it's not reported twice
-          exitInfos.remove(applicationExitInfo);
-          break;
-        }
-      }
-
-      if (latestAnr == null) {
-        options
-            .getLogger()
-            .log(SentryLevel.DEBUG, "No ANRs have been found in the historical exit reasons list.");
-        return;
-      }
-
-      if (latestAnr.getTimestamp() < threshold) {
-        options
-            .getLogger()
-            .log(SentryLevel.DEBUG, "Latest ANR happened too long ago, returning early.");
-        return;
-      }
-
-      if (lastReportedAnrTimestamp != null
-          && latestAnr.getTimestamp() <= lastReportedAnrTimestamp) {
-        options
-            .getLogger()
-            .log(SentryLevel.DEBUG, "Latest ANR has already been reported, returning early.");
-        return;
-      }
+    public @NotNull String getLabel() {
+      return "ANR";
+    }
 
-      if (options.isReportHistoricalAnrs()) {
-        // report the remainder without enriching
-        reportNonEnrichedHistoricalAnrs(exitInfos, lastReportedAnrTimestamp);
-      }
+    @Override
+    public int getTargetReason() {
+      return ApplicationExitInfo.REASON_ANR;
+    }
 
-      // report the latest ANR with enriching, if contexts are available, otherwise report it
-      // non-enriched
-      reportAsSentryEvent(latestAnr, true);
+    @Override
+    public boolean shouldReportHistorical() {
+      return options.isReportHistoricalAnrs();
     }
 
-    private void reportNonEnrichedHistoricalAnrs(
-        final @NotNull List<ApplicationExitInfo> exitInfos, final @Nullable Long lastReportedAnr) {
-      // we reverse the list, because the OS puts errors in order of appearance, last-to-first
-      // and we want to write a marker file after each ANR has been processed, so in case the app
-      // gets killed meanwhile, we can proceed from the last reported ANR and not process the entire
-      // list again
-      Collections.reverse(exitInfos);
-      for (ApplicationExitInfo applicationExitInfo : exitInfos) {
-        if (applicationExitInfo.getReason() == ApplicationExitInfo.REASON_ANR) {
-          if (applicationExitInfo.getTimestamp() < threshold) {
-            options
-                .getLogger()
-                .log(SentryLevel.DEBUG, "ANR happened too long ago %s.", applicationExitInfo);
-            continue;
-          }
-
-          if (lastReportedAnr != null && applicationExitInfo.getTimestamp() <= lastReportedAnr) {
-            options
-                .getLogger()
-                .log(SentryLevel.DEBUG, "ANR has already been reported %s.", applicationExitInfo);
-            continue;
-          }
-
-          reportAsSentryEvent(applicationExitInfo, false); // do not enrich past events
-        }
-      }
+    @Override
+    public @Nullable Long getLastReportedTimestamp() {
+      return AndroidEnvelopeCache.lastReportedAnr(options);
     }
 
-    private void reportAsSentryEvent(
+    @Override
+    public @Nullable ApplicationExitInfoHistoryDispatcher.Report buildReport(
         final @NotNull ApplicationExitInfo exitInfo, final boolean shouldEnrich) {
       final long anrTimestamp = exitInfo.getTimestamp();
       final boolean isBackground =
@@ -247,7 +146,7 @@ private void reportAsSentryEvent(
                 SentryLevel.WARNING,
                 "Not reporting ANR event as there was no thread dump for the ANR %s",
                 exitInfo.toString());
-        return;
+        return null;
       }
       final AnrV2Hint anrHint =
           new AnrV2Hint(
@@ -284,19 +183,7 @@ private void reportAsSentryEvent(
         }
       }
 
-      final @NotNull SentryId sentryId = scopes.captureEvent(event, hint);
-      final boolean isEventDropped = sentryId.equals(SentryId.EMPTY_ID);
-      if (!isEventDropped) {
-        // Block until the event is flushed to disk and the last_reported_anr marker is updated
-        if (!anrHint.waitFlush()) {
-          options
-              .getLogger()
-              .log(
-                  SentryLevel.WARNING,
-                  "Timed out waiting to flush ANR event to disk. Event: %s",
-                  event.getEventId());
-        }
-      }
+      return new ApplicationExitInfoHistoryDispatcher.Report(event, hint, anrHint);
     }
 
     private @NotNull ParseResult parseThreadDump(
@@ -379,6 +266,7 @@ public boolean ignoreCurrentThread() {
       return false;
     }
 
+    @NotNull
     @Override
     public Long timestamp() {
       return timestamp;