Merge 7016a16 into d4b1f82

Author: stefanosiano

CHANGELOG.md

@@ -4,6 +4,7 @@
 
 ### Fixes
 
+- Avoid stopping appStartProfiler after application creation ([#3630](https://github.com/getsentry/sentry-java/pull/3630))
 - Avoid ArrayIndexOutOfBoundsException on Android cpu data collection ([#3598](https://github.com/getsentry/sentry-java/pull/3598))
 - Fix lazy select queries instrumentation ([#3604](https://github.com/getsentry/sentry-java/pull/3604))
 

sentry-android-core/src/main/java/io/sentry/android/core/performance/AppStartMetrics.java

@@ -247,13 +247,14 @@ public void registerApplicationForegroundCheck(final @NotNull Application applic
               // if no activity has ever been created, app was launched in background
               if (onCreateTime == null) {
                 appLaunchedInForeground = false;
+
+                // we stop the app start profiler, as it's useless and likely to timeout
+                if (appStartProfiler != null && appStartProfiler.isRunning()) {
+                  appStartProfiler.close();
+                  appStartProfiler = null;
+                }
               }
               application.unregisterActivityLifecycleCallbacks(instance);
-              // we stop the app start profiler, as it's useless and likely to timeout
-              if (appStartProfiler != null && appStartProfiler.isRunning()) {
-                appStartProfiler.close();
-                appStartProfiler = null;
-              }
             });
   }
 

sentry-android-core/src/test/java/io/sentry/android/core/performance/AppStartMetricsTest.kt

@@ -196,6 +196,20 @@ class AppStartMetricsTest {
         verify(profiler).close()
     }
 
+    @Test
+    fun `if activity is started, does not stop app start profiler if running`() {
+        val profiler = mock<ITransactionProfiler>()
+        whenever(profiler.isRunning).thenReturn(true)
+        AppStartMetrics.getInstance().appStartProfiler = profiler
+        AppStartMetrics.getInstance().onActivityCreated(mock(), mock())
+
+        AppStartMetrics.getInstance().registerApplicationForegroundCheck(mock())
+        // Job on main thread checks if activity was launched
+        Shadows.shadowOf(Looper.getMainLooper()).idle()
+
+        verify(profiler, never()).close()
+    }
+
     @Test
     fun `if app start span is longer than 1 minute, appStartTimeSpanWithFallback returns an empty span`() {
         val appStartTimeSpan = AppStartMetrics.getInstance().appStartTimeSpan