Address PR feedback

Author: markushi

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

@@ -560,11 +560,6 @@ public class io/sentry/android/core/anr/AnrCulpritIdentifier {
 	public static fun isSystemFrame (Ljava/lang/String;)Z
 }
 
-public class io/sentry/android/core/anr/AnrException : java/lang/Exception {
-	public fun <init> ()V
-	public fun <init> (Ljava/lang/String;)V
-}
-
 public class io/sentry/android/core/anr/AnrProfile {
 	public final field endTimeMs J
 	public final field stacks Ljava/util/List;

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

@@ -139,11 +139,18 @@ void reportANR(
       message = "Background " + message;
     }
 
-    final ApplicationNotResponding error = new ApplicationNotResponding(message, anr.getThread());
+    final @Nullable Thread thread = anr.getThread();
+    final @NotNull ApplicationNotResponding error;
+    if (thread == null) {
+      error = new ApplicationNotResponding(message);
+    } else {
+      error = new ApplicationNotResponding(message, anr.getThread());
+    }
+
     final Mechanism mechanism = new Mechanism();
     mechanism.setType("ANR");
 
-    return new ExceptionMechanismException(mechanism, error, error.getThread(), true);
+    return new ExceptionMechanismException(mechanism, error, thread, true);
   }
 
   @TestOnly

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

@@ -41,14 +41,14 @@
 import io.sentry.SpanContext;
 import io.sentry.android.core.anr.AggregatedStackTrace;
 import io.sentry.android.core.anr.AnrCulpritIdentifier;
-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.internal.util.CpuInfoUtils;
 import io.sentry.cache.PersistingOptionsObserver;
 import io.sentry.cache.PersistingScopeObserver;
+import io.sentry.exception.ExceptionMechanismException;
 import io.sentry.hints.AbnormalExit;
 import io.sentry.hints.Backfillable;
 import io.sentry.protocol.App;
@@ -871,25 +871,28 @@ private void applyAnrProfile(
       }
 
       // Capture profile chunk
-      final SentryId profilerId = captureAnrProfile(anrTimestamp, anrProfile);
+      final @Nullable SentryId profilerId = captureAnrProfile(anrTimestamp, anrProfile);
+      final @NotNull StackTraceElement[] stack = culprit.getStack();
 
-      final StackTraceElement[] stack = culprit.getStack();
       if (stack.length > 0) {
         final StackTraceElement stackTraceElement = stack[0];
         final String message =
             stackTraceElement.getClassName() + "." + stackTraceElement.getMethodName();
-        final AnrException exception = new AnrException(message);
+        final ApplicationNotResponding exception = new ApplicationNotResponding(message);
         exception.setStackTrace(stack);
 
+        final Mechanism mechanism = new Mechanism();
+        mechanism.setType("ANR");
+        final ExceptionMechanismException error =
+            new ExceptionMechanismException(mechanism, exception, null, false);
+
         final @NotNull List<SentryException> sentryException =
             sentryExceptionFactory.getSentryExceptions(exception);
-        for (final @NotNull SentryException e : sentryException) {
-          final Mechanism mechanism = new Mechanism();
-          mechanism.setType("ANR");
-          e.setMechanism(mechanism);
-        }
-        // Replaces the original ANR exception with the profile-derived one,
-        // as we assume the profiling stacktrace is more detailed
+
+        // Replace the original ANR exception with the profile-derived one,
+        // as we assume the profiling culprit identification is more valuable
+        // the event threads are kept as-is, so the original main thread stacktrace is still
+        // available
         event.setExceptions(sentryException);
 
         if (profilerId != null) {

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

@@ -17,15 +17,20 @@
 final class ApplicationNotResponding extends RuntimeException {
   private static final long serialVersionUID = 252541144579117016L;
 
-  private final @NotNull Thread thread;
+  private final @Nullable Thread thread;
+
+  ApplicationNotResponding(final @Nullable String message) {
+    super(message);
+    this.thread = null;
+  }
 
   ApplicationNotResponding(final @Nullable String message, final @NotNull Thread thread) {
     super(message);
     this.thread = Objects.requireNonNull(thread, "Thread must be provided.");
     setStackTrace(this.thread.getStackTrace());
   }
 
-  public @NotNull Thread getThread() {
+  public @Nullable Thread getThread() {
     return thread;
   }
 }

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

@@ -57,12 +57,12 @@ public void register(final @NotNull IScopes scopes, final @NotNull SentryOptions
             "SentryAndroidOptions is required");
     this.logger = options.getLogger();
 
-    if (options.getCacheDirPath() == null) {
-      logger.log(SentryLevel.WARNING, "ANR Profiling is enabled but cacheDirPath is not set");
-      return;
-    }
-
     if (((SentryAndroidOptions) options).isEnableAnrProfiling()) {
+      if (options.getCacheDirPath() == null) {
+        logger.log(SentryLevel.WARNING, "ANR Profiling is enabled but cacheDirPath is not set");
+        return;
+      }
+
       addIntegrationToSdkVersion("AnrProfiling");
       AppState.getInstance().addAppStateListener(this);
     }

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

@@ -58,8 +58,8 @@ class ANRWatchDogTest {
       } while (anr == null && waitCount++ < 100)
 
       assertNotNull(anr)
-      assertEquals(expectedState, anr!!.thread.state)
-      assertEquals(stacktrace.className, anr!!.stackTrace[0].className)
+      assertEquals(expectedState, anr.thread!!.state)
+      assertEquals(stacktrace.className, anr.stackTrace[0].className)
     } finally {
       sut.interrupt()
       es.shutdown()
@@ -137,8 +137,8 @@ class ANRWatchDogTest {
       } while (anr == null && waitCount++ < 100)
 
       assertNotNull(anr)
-      assertEquals(expectedState, anr!!.thread.state)
-      assertEquals(stacktrace.className, anr!!.stackTrace[0].className)
+      assertEquals(expectedState, anr.thread!!.state)
+      assertEquals(stacktrace.className, anr.stackTrace[0].className)
     } finally {
       sut.interrupt()
       es.shutdown()

sentry-android-core/src/test/java/io/sentry/android/core/ANRWatchDogTest.kt

@@ -174,9 +174,9 @@ Deque<SentryException> extractExceptionQueueInternal(
       final List<SentryStackFrame> frames =
           sentryStackTraceFactory.getStackFrames(
               currentThrowable.getStackTrace(), includeSentryFrames);
+      final @Nullable Long threadId = thread != null ? thread.getId() : null;
       SentryException exception =
-          getSentryException(
-              currentThrowable, exceptionMechanism, thread.getId(), frames, snapshot);
+          getSentryException(currentThrowable, exceptionMechanism, threadId, frames, snapshot);
       exceptions.addFirst(exception);
 
       if (exceptionMechanism.getType() == null) {

sentry/src/main/java/io/sentry/SentryExceptionFactory.java

@@ -4,6 +4,7 @@
 import io.sentry.util.Objects;
 import org.jetbrains.annotations.ApiStatus;
 import org.jetbrains.annotations.NotNull;
+import org.jetbrains.annotations.Nullable;
 
 /**
  * A throwable decorator that holds an {@link io.sentry.protocol.Mechanism} related to the decorated
@@ -15,7 +16,7 @@ public final class ExceptionMechanismException extends RuntimeException {
 
   private final @NotNull Mechanism exceptionMechanism;
   private final @NotNull Throwable throwable;
-  private final @NotNull Thread thread;
+  private final @Nullable Thread thread;
   private final boolean snapshot;
 
   /**
@@ -29,11 +30,11 @@ public final class ExceptionMechanismException extends RuntimeException {
   public ExceptionMechanismException(
       final @NotNull Mechanism mechanism,
       final @NotNull Throwable throwable,
-      final @NotNull Thread thread,
+      final @Nullable Thread thread,
       final boolean snapshot) {
     exceptionMechanism = Objects.requireNonNull(mechanism, "Mechanism is required.");
     this.throwable = Objects.requireNonNull(throwable, "Throwable is required.");
-    this.thread = Objects.requireNonNull(thread, "Thread is required.");
+    this.thread = thread;
     this.snapshot = snapshot;
   }
 
@@ -47,7 +48,7 @@ public ExceptionMechanismException(
   public ExceptionMechanismException(
       final @NotNull Mechanism mechanism,
       final @NotNull Throwable throwable,
-      final @NotNull Thread thread) {
+      final @Nullable Thread thread) {
     this(mechanism, throwable, thread, false);
   }
 
@@ -74,7 +75,7 @@ public ExceptionMechanismException(
    *
    * @return the Thread
    */
-  public @NotNull Thread getThread() {
+  public @Nullable Thread getThread() {
     return thread;
   }