fix(android): Gate headless app start end time

buenaflor · cursoragent · buenaflor · commit be261f69ff75 · 2026-05-18T15:30:16.000+02:00
Resolve the headless app start end timestamp only when standalone
headless tracing is active. This avoids stopping legacy app start
spans before a later foreground Activity can finish them.

Co-authored-by: Cursor &lt;cursoragent@cursor.com&gt;
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
@@ -445,10 +445,9 @@ private void handleHeadlessAppStartIfNeededOnMain() {
         appStartContinuousProfiler = null;
       }
 
-      resolveHeadlessAppStartEndTime();
-
       final @Nullable HeadlessAppStartListener listener = headlessAppStartListener;
       if (listener != null) {
+        resolveHeadlessAppStartEndTime();
         listener.onHeadlessAppStart();
       }
     }
diff --git a/sentry-android-core/src/test/java/io/sentry/android/core/performance/AppStartMetricsTest.kt b/sentry-android-core/src/test/java/io/sentry/android/core/performance/AppStartMetricsTest.kt
@@ -265,6 +265,7 @@ class AppStartMetricsTest {
   fun `resolveHeadlessAppStartEndTime uses applicationOnCreate stop when Gradle plugin instrumented`() {
     val metrics = AppStartMetrics.getInstance()
     metrics.appStartTimeSpan.setStartedAt(100)
+    metrics.setHeadlessAppStartListener {}
     metrics.applicationOnCreateTimeSpan.apply {
       setStartedAt(120)
       setStoppedAt(200)
@@ -281,6 +282,7 @@ class AppStartMetricsTest {
     val metrics = AppStartMetrics.getInstance()
     metrics.setClassLoadedUptimeMs(200)
     metrics.appStartTimeSpan.setStartedAt(100)
+    metrics.setHeadlessAppStartListener {}
 
     metrics.registerLifecycleCallbacks(mock<Application>())
     waitForMainLooperIdle()
@@ -295,6 +297,7 @@ class AppStartMetricsTest {
       setStartedAt(100)
       setStoppedAt(150)
     }
+    metrics.setHeadlessAppStartListener {}
     metrics.applicationOnCreateTimeSpan.apply {
       setStartedAt(120)
       setStoppedAt(200)
@@ -306,6 +309,17 @@ class AppStartMetricsTest {
     assertEquals(50, metrics.appStartTimeSpan.durationMs)
   }
 
+  @Test
+  fun `headless app start without listener does not stop sdkInitTimeSpan`() {
+    val metrics = AppStartMetrics.getInstance()
+    metrics.sdkInitTimeSpan.setStartedAt(100)
+
+    metrics.registerLifecycleCallbacks(mock<Application>())
+    waitForMainLooperIdle()
+
+    assertTrue(metrics.sdkInitTimeSpan.hasNotStopped())
+  }
+
   @Test
   fun `getAppStartTimeSpanForHeadless falls back to sdkInitTimeSpan when appStartSpan has not stopped`() {
     val metrics = AppStartMetrics.getInstance()

Original file line number	Diff line number	Diff line change
`@@ -445,10 +445,9 @@ private void handleHeadlessAppStartIfNeededOnMain() {`
`445`	`445`	`appStartContinuousProfiler = null;`
`446`	`446`	`}`
`447`	`447`
`448`		`- resolveHeadlessAppStartEndTime();`
`449`		`-`
`450`	`448`	`final @Nullable HeadlessAppStartListener listener = headlessAppStartListener;`
`451`	`449`	`if (listener != null) {`
	`450`	`+ resolveHeadlessAppStartEndTime();`
`452`	`451`	`listener.onHeadlessAppStart();`
`453`	`452`	`}`
`454`	`453`	`}`