refactor(anr): Implement lazy file rotation for ANR profiling

Author: markushi

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

@@ -507,12 +507,21 @@ public class io/sentry/android/core/anr/AnrProfile {
 
 public class io/sentry/android/core/anr/AnrProfileManager : java/io/Closeable {
 	public fun <init> (Lio/sentry/SentryOptions;)V
+	public fun <init> (Lio/sentry/SentryOptions;Ljava/io/File;)V
 	public fun add (Lio/sentry/android/core/anr/AnrStackTrace;)V
 	public fun clear ()V
 	public fun close ()V
 	public fun load ()Lio/sentry/android/core/anr/AnrProfile;
 }
 
+public class io/sentry/android/core/anr/AnrProfileRotationHelper {
+	public fun <init> ()V
+	public static fun deleteLastFile (Ljava/io/File;)Z
+	public static fun getCurrentFile (Ljava/io/File;)Ljava/io/File;
+	public static fun getLastFile (Ljava/io/File;)Ljava/io/File;
+	public static fun rotate ()V
+}
+
 public class io/sentry/android/core/anr/AnrProfilingIntegration : io/sentry/Integration, io/sentry/android/core/AppState$AppStateListener, java/io/Closeable, java/lang/Runnable {
 	public static final field POLLING_INTERVAL_MS J
 	public static final field THRESHOLD_ANR_MS J

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

@@ -25,6 +25,7 @@
 import io.sentry.SendFireAndForgetOutboxSender;
 import io.sentry.SentryLevel;
 import io.sentry.SentryOpenTelemetryMode;
+import io.sentry.android.core.anr.AnrProfileRotationHelper;
 import io.sentry.android.core.anr.AnrProfilingIntegration;
 import io.sentry.android.core.cache.AndroidEnvelopeCache;
 import io.sentry.android.core.internal.debugmeta.AssetsDebugMetaLoader;
@@ -138,6 +139,8 @@ static void loadDefaultAndMetadataOptions(
             .getRuntimeManager()
             .runWithRelaxedPolicy(() -> getCacheDir(finalContext).getAbsolutePath()));
 
+    AnrProfileRotationHelper.rotate();
+
     readDefaultOptionValues(options, finalContext, buildInfoProvider);
     AppState.getInstance().registerLifecycleObserver(options);
   }

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

@@ -24,6 +24,7 @@
 import io.sentry.android.core.anr.AnrException;
 import io.sentry.android.core.anr.AnrProfile;
 import io.sentry.android.core.anr.AnrProfileManager;
+import io.sentry.android.core.anr.AnrProfileRotationHelper;
 import io.sentry.android.core.anr.StackTraceConverter;
 import io.sentry.android.core.cache.AndroidEnvelopeCache;
 import io.sentry.android.core.internal.threaddump.Lines;
@@ -47,6 +48,7 @@
 import java.io.ByteArrayInputStream;
 import java.io.ByteArrayOutputStream;
 import java.io.Closeable;
+import java.io.File;
 import java.io.IOException;
 import java.io.InputStream;
 import java.io.InputStreamReader;
@@ -322,10 +324,25 @@ private void applyAnrProfile(
       }
 
       @Nullable AnrProfile anrProfile = null;
-      try (final AnrProfileManager provider = new AnrProfileManager(options)) {
-        anrProfile = provider.load();
+      final File cacheDir = new File(options.getCacheDirPath());
+
+      try {
+        final File lastFile = AnrProfileRotationHelper.getLastFile(cacheDir);
+
+        if (lastFile.exists()) {
+          options.getLogger().log(SentryLevel.DEBUG, "Reading ANR profile from rotated file");
+          try (final AnrProfileManager provider = new AnrProfileManager(options, lastFile)) {
+            anrProfile = provider.load();
+          }
+        } else {
+          options.getLogger().log(SentryLevel.DEBUG, "No ANR profile file found");
+        }
       } catch (Throwable t) {
-        options.getLogger().log(SentryLevel.INFO, "Could not retrieve ANR profile");
+        options.getLogger().log(SentryLevel.INFO, "Could not retrieve ANR profile", t);
+      } finally {
+        if (AnrProfileRotationHelper.deleteLastFile(cacheDir)) {
+          options.getLogger().log(SentryLevel.DEBUG, "Deleted old ANR profile file");
+        }
       }
 
       if (anrProfile != null) {
@@ -342,8 +359,6 @@ private void applyAnrProfile(
                   ProfileChunk.PLATFORM_JAVA,
                   options);
           chunk.setSentryProfile(profile);
-
-          options.getLogger().log(SentryLevel.DEBUG, "");
           scopes.captureProfileChunk(chunk);
 
           final @Nullable AggregatedStackTrace culprit =

sentry-android-core/src/main/java/io/sentry/android/core/anr/AnrProfileManager.java

@@ -28,8 +28,10 @@ public class AnrProfileManager implements Closeable {
   @NotNull private final ObjectQueue<AnrStackTrace> queue;
 
   public AnrProfileManager(final @NotNull SentryOptions options) {
+    this(options, new File(options.getCacheDirPath(), "anr_profile"));
+  }
 
-    final @NotNull File file = new File(options.getCacheDirPath(), "anr_profile");
+  public AnrProfileManager(final @NotNull SentryOptions options, final @NotNull File file) {
     final @NotNull ILogger logger = options.getLogger();
 
     @Nullable QueueFile queueFile = null;

sentry-android-core/src/main/java/io/sentry/android/core/anr/AnrProfileRotationHelper.java

@@ -0,0 +1,66 @@
+package io.sentry.android.core.anr;
+
+import java.io.File;
+import java.util.concurrent.atomic.AtomicBoolean;
+import org.jetbrains.annotations.ApiStatus;
+import org.jetbrains.annotations.NotNull;
+
+/**
+ * Coordinates file rotation between AnrProfilingIntegration and AnrV2Integration to prevent
+ * concurrent access to the same QueueFile.
+ */
+@ApiStatus.Internal
+public class AnrProfileRotationHelper {
+
+  private static final String CURRENT_FILE_NAME = "anr_profile";
+  private static final String OLD_FILE_NAME = "anr_profile_old";
+
+  private static final AtomicBoolean shouldRotate = new AtomicBoolean(false);
+  private static final Object rotationLock = new Object();
+
+  public static void rotate() {
+    shouldRotate.set(true);
+  }
+
+  private static void performRotationIfNeeded(final @NotNull File cacheDir) {
+    if (!shouldRotate.get()) {
+      return;
+    }
+
+    synchronized (rotationLock) {
+      if (!shouldRotate.get()) {
+        return;
+      }
+
+      final File currentFile = new File(cacheDir, CURRENT_FILE_NAME);
+      final File oldFile = new File(cacheDir, OLD_FILE_NAME);
+
+      if (oldFile.exists()) {
+        oldFile.delete();
+      }
+
+      if (currentFile.exists()) {
+        currentFile.renameTo(oldFile);
+      }
+
+      shouldRotate.set(false);
+    }
+  }
+
+  @NotNull
+  public static File getCurrentFile(final @NotNull File cacheDir) {
+    performRotationIfNeeded(cacheDir);
+    return new File(cacheDir, CURRENT_FILE_NAME);
+  }
+
+  @NotNull
+  public static File getLastFile(final @NotNull File cacheDir) {
+    performRotationIfNeeded(cacheDir);
+    return new File(cacheDir, OLD_FILE_NAME);
+  }
+
+  public static boolean deleteLastFile(final @NotNull File cacheDir) {
+    final File oldFile = new File(cacheDir, OLD_FILE_NAME);
+    return oldFile.exists() && oldFile.delete();
+  }
+}

sentry-android-core/src/main/java/io/sentry/android/core/anr/AnrProfilingIntegration.java

@@ -15,6 +15,7 @@
 import io.sentry.util.AutoClosableReentrantLock;
 import io.sentry.util.Objects;
 import java.io.Closeable;
+import java.io.File;
 import java.io.IOException;
 import java.util.concurrent.atomic.AtomicBoolean;
 import org.jetbrains.annotations.ApiStatus;
@@ -178,16 +179,15 @@ protected MainThreadState getState() {
   @NonNull
   protected AnrProfileManager getProfileManager() {
     try (final @NotNull ISentryLifecycleToken ignored = profileManagerLock.acquire()) {
-      final @Nullable AnrProfileManager r = profileManager;
-      if (r != null) {
-        return r;
-      } else {
-
-        final AnrProfileManager newManager =
-            new AnrProfileManager(Objects.requireNonNull(options, "Options can't be null"));
-        profileManager = newManager;
-        return newManager;
+      if (profileManager == null) {
+        final @NotNull SentryOptions opts =
+            Objects.requireNonNull(options, "Options can't be null");
+        final @NotNull File currentFile =
+            AnrProfileRotationHelper.getCurrentFile(new File(opts.getCacheDirPath()));
+        profileManager = new AnrProfileManager(opts, currentFile);
       }
+
+      return profileManager;
     }
   }