Fix headless app-start idle scheduling

buenaflor · buenaflor · commit e0d714cbce71 · 2026-05-18T18:03:29.000+02:00
diff --git a/sentry-android-core/src/main/java/io/sentry/android/core/performance/AppStartMetrics.java b/sentry-android-core/src/main/java/io/sentry/android/core/performance/AppStartMetrics.java
@@ -89,6 +89,8 @@ public enum AppStartType {
   private boolean shouldSendStartMeasurements = true;
   private final AtomicInteger activeActivitiesCounter = new AtomicInteger();
   private final AtomicBoolean firstDrawDone = new AtomicBoolean(false);
+  private final AtomicBoolean headlessAppStartCheckScheduled = new AtomicBoolean(false);
+  private final AtomicBoolean headlessAppStartListenerNotified = new AtomicBoolean(false);
   private volatile @Nullable HeadlessAppStartListener headlessAppStartListener;
   private @Nullable SentryId appStartTraceId;
   private @Nullable ApplicationStartInfo cachedStartInfo;
@@ -171,6 +173,12 @@ public void setAppLaunchedInForeground(final boolean appLaunchedInForeground) {
 
   public void setHeadlessAppStartListener(final @Nullable HeadlessAppStartListener listener) {
     this.headlessAppStartListener = listener;
+    if (listener != null
+        && isCallbackRegistered
+        && activeActivitiesCounter.get() == 0
+        && !firstDrawDone.get()) {
+      scheduleHeadlessAppStartCheckOnMain();
+    }
   }
 
   /** Trace ID from a headless app start transaction, to be reused by a later activity. */
@@ -295,6 +303,8 @@ public void clear() {
     firstDrawDone.set(false);
     activeActivitiesCounter.set(0);
     firstIdle = -1;
+    headlessAppStartCheckScheduled.set(false);
+    headlessAppStartListenerNotified.set(false);
     headlessAppStartListener = null;
     appStartTraceId = null;
     cachedStartInfo = null;
@@ -398,16 +408,22 @@ public void registerLifecycleCallbacks(final @NotNull Application application) {
       }
     }
 
-    scheduleHeadlessAppStartCheckOnMain();
+    if (appStartType == AppStartType.UNKNOWN || headlessAppStartListener != null) {
+      scheduleHeadlessAppStartCheckOnMain();
+    }
   }
 
   private void scheduleHeadlessAppStartCheckOnMain() {
+    if (!headlessAppStartCheckScheduled.compareAndSet(false, true)) {
+      return;
+    }
     if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.M) {
       Looper.getMainLooper()
           .getQueue()
           .addIdleHandler(
               () -> {
                 firstIdle = SystemClock.uptimeMillis();
+                headlessAppStartCheckScheduled.set(false);
                 handleHeadlessAppStartIfNeededOnMain();
                 return false;
               });
@@ -416,7 +432,11 @@ private void scheduleHeadlessAppStartCheckOnMain() {
       handler.post(
           () -> {
             firstIdle = SystemClock.uptimeMillis();
-            handler.post(() -> handleHeadlessAppStartIfNeededOnMain());
+            handler.post(
+                () -> {
+                  headlessAppStartCheckScheduled.set(false);
+                  handleHeadlessAppStartIfNeededOnMain();
+                });
           });
     }
   }
@@ -446,7 +466,7 @@ private void handleHeadlessAppStartIfNeededOnMain() {
       }
 
       final @Nullable HeadlessAppStartListener listener = headlessAppStartListener;
-      if (listener != null) {
+      if (listener != null && headlessAppStartListenerNotified.compareAndSet(false, true)) {
         resolveHeadlessAppStartEndTime();
         listener.onHeadlessAppStart();
       }
diff --git a/sentry-android-core/src/test/java/io/sentry/android/core/performance/AppStartMetricsTestApi35.kt b/sentry-android-core/src/test/java/io/sentry/android/core/performance/AppStartMetricsTestApi35.kt
@@ -50,6 +50,22 @@ class AppStartMetricsTestApi35 {
     assertEquals(AppStartMetrics.AppStartType.COLD, AppStartMetrics.getInstance().appStartType)
   }
 
+  @Test
+  fun `known ApplicationStartInfo type without listener does not schedule headless check`() {
+    val mockStartInfo = mock<ApplicationStartInfo>()
+    whenever(mockStartInfo.startupState).thenReturn(ApplicationStartInfo.STARTUP_STATE_STARTED)
+    whenever(mockStartInfo.startType).thenReturn(ApplicationStartInfo.START_TYPE_COLD)
+    SentryShadowActivityManager.setHistoricalProcessStartReasons(listOf(mockStartInfo))
+    val metrics = AppStartMetrics.getInstance()
+
+    val app = ApplicationProvider.getApplicationContext<Application>()
+    metrics.registerLifecycleCallbacks(app)
+    waitForMainLooperIdle()
+
+    assertEquals(AppStartMetrics.AppStartType.COLD, metrics.appStartType)
+    assertEquals(-1, metrics.firstIdle)
+  }
+
   @Test
   fun `detects warm start using ApplicationStartInfo on API 35`() {
     val mockStartInfo = mock<ApplicationStartInfo>()
