File I/O on main thread (#2382)

Author: romtsn

CHANGELOG.md

@@ -7,6 +7,7 @@
 - Add time-to-initial-display span to Activity transactions ([#2369](https://github.com/getsentry/sentry-java/pull/2369))
 - Start a session after init if AutoSessionTracking is enabled ([#2356](https://github.com/getsentry/sentry-java/pull/2356))
 - Provide automatic breadcrumbs and transactions for click/scroll events for Compose ([#2390](https://github.com/getsentry/sentry-java/pull/2390))
+- Add `blocked_main_thread` and `call_stack` to File I/O spans to detect performance issues ([#2382](https://github.com/getsentry/sentry-java/pull/2382))
 
 ### Dependencies
 

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

@@ -5,7 +5,7 @@
 import androidx.core.app.FrameMetricsAggregator;
 import io.sentry.MeasurementUnit;
 import io.sentry.SentryLevel;
-import io.sentry.android.core.internal.util.MainThreadChecker;
+import io.sentry.android.core.internal.util.AndroidMainThreadChecker;
 import io.sentry.protocol.MeasurementValue;
 import io.sentry.protocol.SentryId;
 import java.util.HashMap;
@@ -208,7 +208,7 @@ public synchronized void stop() {
 
   private void runSafelyOnUiThread(final Runnable runnable, final String tag) {
     try {
-      if (MainThreadChecker.isMainThread()) {
+      if (AndroidMainThreadChecker.getInstance().isMainThread()) {
         runnable.run();
       } else {
         handler.post(

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

@@ -14,6 +14,7 @@
 import io.sentry.android.core.cache.AndroidEnvelopeCache;
 import io.sentry.android.core.internal.gestures.AndroidViewGestureTargetLocator;
 import io.sentry.android.core.internal.modules.AssetsModulesLoader;
+import io.sentry.android.core.internal.util.AndroidMainThreadChecker;
 import io.sentry.android.core.internal.util.SentryFrameMetricsCollector;
 import io.sentry.android.fragment.FragmentLifecycleIntegration;
 import io.sentry.android.timber.SentryTimberIntegration;
@@ -154,6 +155,7 @@ static void initializeIntegrationsAndProcessors(
       }
       options.setGestureTargetLocators(gestureTargetLocators);
     }
+    options.setMainThreadChecker(AndroidMainThreadChecker.getInstance());
   }
 
   private static void installDefaultIntegrations(

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

@@ -5,7 +5,7 @@
 import io.sentry.Integration;
 import io.sentry.SentryLevel;
 import io.sentry.SentryOptions;
-import io.sentry.android.core.internal.util.MainThreadChecker;
+import io.sentry.android.core.internal.util.AndroidMainThreadChecker;
 import io.sentry.util.Objects;
 import java.io.Closeable;
 import java.io.IOException;
@@ -56,7 +56,7 @@ public void register(final @NotNull IHub hub, final @NotNull SentryOptions optio
       try {
         Class.forName("androidx.lifecycle.DefaultLifecycleObserver");
         Class.forName("androidx.lifecycle.ProcessLifecycleOwner");
-        if (MainThreadChecker.isMainThread()) {
+        if (AndroidMainThreadChecker.getInstance().isMainThread()) {
           addObserver(hub);
         } else {
           // some versions of the androidx lifecycle-process require this to be executed on the main
@@ -115,7 +115,7 @@ private void removeObserver() {
   @Override
   public void close() throws IOException {
     if (watcher != null) {
-      if (MainThreadChecker.isMainThread()) {
+      if (AndroidMainThreadChecker.getInstance().isMainThread()) {
         removeObserver();
       } else {
         // some versions of the androidx lifecycle-process require this to be executed on the main

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

@@ -26,9 +26,9 @@
 import io.sentry.SentryBaseEvent;
 import io.sentry.SentryEvent;
 import io.sentry.SentryLevel;
+import io.sentry.android.core.internal.util.AndroidMainThreadChecker;
 import io.sentry.android.core.internal.util.ConnectivityChecker;
 import io.sentry.android.core.internal.util.DeviceOrientations;
-import io.sentry.android.core.internal.util.MainThreadChecker;
 import io.sentry.android.core.internal.util.RootChecker;
 import io.sentry.protocol.App;
 import io.sentry.protocol.Device;
@@ -217,7 +217,7 @@ private void setThreads(final @NotNull SentryEvent event) {
     if (event.getThreads() != null) {
       for (SentryThread thread : event.getThreads()) {
         if (thread.isCurrent() == null) {
-          thread.setCurrent(MainThreadChecker.isMainThread(thread));
+          thread.setCurrent(AndroidMainThreadChecker.getInstance().isMainThread(thread));
         }
       }
     }

sentry-android-core/src/main/java/io/sentry/android/core/internal/util/AndroidMainThreadChecker.java

@@ -0,0 +1,23 @@
+package io.sentry.android.core.internal.util;
+
+import android.os.Looper;
+import io.sentry.util.thread.IMainThreadChecker;
+import org.jetbrains.annotations.ApiStatus;
+
+/** Class that checks if a given thread is the Android Main/UI thread */
+@ApiStatus.Internal
+public final class AndroidMainThreadChecker implements IMainThreadChecker {
+
+  private static final AndroidMainThreadChecker instance = new AndroidMainThreadChecker();
+
+  public static AndroidMainThreadChecker getInstance() {
+    return instance;
+  }
+
+  private AndroidMainThreadChecker() {}
+
+  @Override
+  public boolean isMainThread(final long threadId) {
+    return Looper.getMainLooper().getThread().getId() == threadId;
+  }
+}

sentry-android-core/src/main/java/io/sentry/android/core/internal/util/MainThreadChecker.java

@@ -9,6 +9,7 @@ import io.sentry.MainEventProcessor
 import io.sentry.SentryOptions
 import io.sentry.android.core.cache.AndroidEnvelopeCache
 import io.sentry.android.core.internal.modules.AssetsModulesLoader
+import io.sentry.android.core.internal.util.AndroidMainThreadChecker
 import io.sentry.android.fragment.FragmentLifecycleIntegration
 import io.sentry.android.timber.SentryTimberIntegration
 import org.junit.runner.RunWith
@@ -447,4 +448,11 @@ class AndroidOptionsInitializerTest {
 
         assertTrue { fixture.sentryOptions.modulesLoader is AssetsModulesLoader }
     }
+
+    @Test
+    fun `AndroidMainThreadChecker is set to options`() {
+        fixture.initSut()
+
+        assertTrue { fixture.sentryOptions.mainThreadChecker is AndroidMainThreadChecker }
+    }
 }

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

@@ -8,23 +8,23 @@ import kotlin.test.assertFalse
 import kotlin.test.assertTrue
 
 @RunWith(AndroidJUnit4::class)
-class MainThreadCheckerTest {
+class AndroidMainThreadCheckerTest {
 
     @Test
     fun `When calling isMainThread from the same thread, it should return true`() {
-        assertTrue(MainThreadChecker.isMainThread())
+        assertTrue(AndroidMainThreadChecker.getInstance().isMainThread)
     }
 
     @Test
     fun `When calling isMainThread with the current thread, it should return true`() {
         val thread = Thread.currentThread()
-        assertTrue(MainThreadChecker.isMainThread(thread))
+        assertTrue(AndroidMainThreadChecker.getInstance().isMainThread(thread))
     }
 
     @Test
     fun `When calling isMainThread from a different thread, it should return false`() {
         val thread = Thread()
-        assertFalse(MainThreadChecker.isMainThread(thread))
+        assertFalse(AndroidMainThreadChecker.getInstance().isMainThread(thread))
     }
 
     @Test
@@ -33,7 +33,7 @@ class MainThreadCheckerTest {
         val sentryThread = SentryThread().apply {
             id = thread.id
         }
-        assertTrue(MainThreadChecker.isMainThread(sentryThread))
+        assertTrue(AndroidMainThreadChecker.getInstance().isMainThread(sentryThread))
     }
 
     @Test
@@ -42,6 +42,6 @@ class MainThreadCheckerTest {
         val sentryThread = SentryThread().apply {
             id = thread.id
         }
-        assertFalse(MainThreadChecker.isMainThread(sentryThread))
+        assertFalse(AndroidMainThreadChecker.getInstance().isMainThread(sentryThread))
     }
 }

sentry-android-core/src/test/java/io/sentry/android/core/internal/util/MainThreadCheckerTest.kt renamed to sentry-android-core/src/test/java/io/sentry/android/core/internal/util/AndroidMainThreadCheckerTest.kt

@@ -16,7 +16,6 @@
 # https://developer.android.com/studio/build/shrink-code#decode-stack-trace
 -keepattributes LineNumberTable,SourceFile
 
-
 # For native methods, see http://proguard.sourceforge.net/manual/examples.html#native
 -keepclasseswithmembernames,includedescriptorclasses class * {
     native <methods>;