Initial implementation of ANRv2

sentry-android-core/.gitignore

@@ -1 +1,4 @@
 INSTALLATION
+last_crash
+.options-cache/
+.scope-cache/

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

@@ -55,6 +55,28 @@ public final class io/sentry/android/core/AnrIntegration : io/sentry/Integration
 	public final fun register (Lio/sentry/IHub;Lio/sentry/SentryOptions;)V
 }
 
+public final class io/sentry/android/core/AnrIntegrationFactory {
+	public fun <init> ()V
+	public static fun create (Landroid/content/Context;Lio/sentry/android/core/BuildInfoProvider;)Lio/sentry/Integration;
+}
+
+public final class io/sentry/android/core/AnrV2EventProcessor : io/sentry/BackfillingEventProcessor {
+	public fun <init> (Landroid/content/Context;Lio/sentry/android/core/SentryAndroidOptions;Lio/sentry/android/core/BuildInfoProvider;)V
+	public fun process (Lio/sentry/SentryEvent;Lio/sentry/Hint;)Lio/sentry/SentryEvent;
+}
+
+public class io/sentry/android/core/AnrV2Integration : io/sentry/Integration, java/io/Closeable {
+	public fun <init> (Landroid/content/Context;)V
+	public fun close ()V
+	public fun register (Lio/sentry/IHub;Lio/sentry/SentryOptions;)V
+}
+
+public final class io/sentry/android/core/AnrV2Integration$AnrV2Hint : io/sentry/hints/BlockingFlushHint, io/sentry/hints/Backfillable {
+	public fun <init> (JLio/sentry/ILogger;JZ)V
+	public fun shouldEnrich ()Z
+	public fun timestamp ()J
+}
+
 public final class io/sentry/android/core/AppComponentsBreadcrumbsIntegration : android/content/ComponentCallbacks2, io/sentry/Integration, java/io/Closeable {
 	public fun <init> (Landroid/content/Context;)V
 	public fun close ()V
@@ -271,9 +293,11 @@ 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_REPORT Ljava/lang/String;
 	public fun <init> (Lio/sentry/android/core/SentryAndroidOptions;)V
 	public fun getDirectory ()Ljava/io/File;
 	public static fun hasStartupCrashMarker (Lio/sentry/SentryOptions;)Z
+	public static fun lastReportedAnr (Lio/sentry/SentryOptions;)J
 	public fun store (Lio/sentry/SentryEnvelope;Lio/sentry/Hint;)V
 }
 

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

@@ -19,6 +19,8 @@
 import io.sentry.android.core.internal.util.SentryFrameMetricsCollector;
 import io.sentry.android.fragment.FragmentLifecycleIntegration;
 import io.sentry.android.timber.SentryTimberIntegration;
+import io.sentry.cache.PersistingOptionsObserver;
+import io.sentry.cache.PersistingScopeObserver;
 import io.sentry.compose.gestures.ComposeGestureTargetLocator;
 import io.sentry.internal.gestures.GestureTargetLocator;
 import io.sentry.transport.NoOpEnvelopeCache;
@@ -139,6 +141,7 @@ static void initializeIntegrationsAndProcessors(
     options.addEventProcessor(new PerformanceAndroidEventProcessor(options, activityFramesTracker));
     options.addEventProcessor(new ScreenshotEventProcessor(options, buildInfoProvider));
     options.addEventProcessor(new ViewHierarchyEventProcessor(options));
+    options.addEventProcessor(new AnrV2EventProcessor(context, options, buildInfoProvider));
     options.setTransportGate(new AndroidTransportGate(context, options.getLogger()));
     final SentryFrameMetricsCollector frameMetricsCollector =
         new SentryFrameMetricsCollector(context, options, buildInfoProvider);
@@ -170,6 +173,11 @@ static void initializeIntegrationsAndProcessors(
       options.addCollector(new AndroidCpuCollector(options.getLogger(), buildInfoProvider));
     }
     options.setTransactionPerformanceCollector(new DefaultTransactionPerformanceCollector(options));
+
+    if (options.getCacheDirPath() != null) {
+      options.addScopeObserver(new PersistingScopeObserver(options));
+      options.addOptionsObserver(new PersistingOptionsObserver(options));
+    }
   }
 
   private static void installDefaultIntegrations(
@@ -213,7 +221,7 @@ private static void installDefaultIntegrations(
     // AppLifecycleIntegration has to be installed before AnrIntegration, because AnrIntegration
     // relies on AppState set by it
     options.addIntegration(new AppLifecycleIntegration());
-    options.addIntegration(new AnrIntegration(context));
+    options.addIntegration(AnrIntegrationFactory.create(context, buildInfoProvider));
 
     // registerActivityLifecycleCallbacks is only available if Context is an AppContext
     if (context instanceof Application) {

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

@@ -0,0 +1,21 @@
+package io.sentry.android.core;
+
+import android.content.Context;
+import android.os.Build;
+import io.sentry.Integration;
+import org.jetbrains.annotations.ApiStatus;
+import org.jetbrains.annotations.NotNull;
+
+@ApiStatus.Internal
+public final class AnrIntegrationFactory {
+
+  @NotNull
+  public static Integration create(
+      final @NotNull Context context, final @NotNull BuildInfoProvider buildInfoProvider) {
+    if (buildInfoProvider.getSdkInfoVersion() >= Build.VERSION_CODES.R) {
+      return new AnrV2Integration(context);
+    } else {
+      return new AnrIntegration(context);
+    }
+  }
+}