Make tests happy

Author: markushi

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

@@ -155,7 +155,7 @@ public void onAppStartSpansSent() {
   }
 
   public boolean shouldSendStartMeasurements() {
-    return shouldSendStartMeasurements;
+    return shouldSendStartMeasurements && appLaunchedInForeground;
   }
 
   public void restartAppStart(final long uptimeMillis) {
@@ -344,7 +344,7 @@ public void onActivityDestroyed(@NonNull Activity activity) {
     // as the next Activity is considered like a new app start
     if (remainingActivities == 0 && !activity.isChangingConfigurations()) {
       appLaunchedInForeground = false;
-      shouldSendStartMeasurements = true;
+      shouldSendStartMeasurements = false;
       firstDrawDone.set(false);
     }
   }

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

@@ -54,7 +54,6 @@ import org.robolectric.shadow.api.Shadow
 import org.robolectric.shadows.ShadowActivityManager
 import java.util.Date
 import java.util.concurrent.Future
-import java.util.concurrent.TimeUnit
 import kotlin.test.AfterTest
 import kotlin.test.BeforeTest
 import kotlin.test.Test
@@ -94,7 +93,10 @@ class ActivityLifecycleIntegrationTest {
 
             whenever(hub.options).thenReturn(options)
 
-            AppStartMetrics.getInstance().isAppLaunchedInForeground = true
+            val metrics = AppStartMetrics.getInstance()
+            metrics.isAppLaunchedInForeground = true
+            metrics.appStartTimeSpan.start()
+
             // We let the ActivityLifecycleIntegration create the proper transaction here
             val optionCaptor = argumentCaptor<TransactionOptions>()
             val contextCaptor = argumentCaptor<TransactionContext>()
@@ -594,45 +596,6 @@ class ActivityLifecycleIntegrationTest {
         verify(ttfdReporter, never()).registerFullyDrawnListener(any())
     }
 
-    @Test
-    fun `App start is Cold when savedInstanceState is null`() {
-        val sut = fixture.getSut()
-        fixture.options.tracesSampleRate = 1.0
-        sut.register(fixture.hub, fixture.options)
-
-        val activity = mock<Activity>()
-        sut.onActivityCreated(activity, null)
-
-        assertEquals(AppStartType.COLD, AppStartMetrics.getInstance().appStartType)
-    }
-
-    @Test
-    fun `App start is Warm when savedInstanceState is not null`() {
-        val sut = fixture.getSut()
-        fixture.options.tracesSampleRate = 1.0
-        sut.register(fixture.hub, fixture.options)
-
-        val activity = mock<Activity>()
-        val bundle = Bundle()
-        sut.onActivityCreated(activity, bundle)
-
-        assertEquals(AppStartType.WARM, AppStartMetrics.getInstance().appStartType)
-    }
-
-    @Test
-    fun `Do not overwrite App start type after set`() {
-        val sut = fixture.getSut()
-        fixture.options.tracesSampleRate = 1.0
-        sut.register(fixture.hub, fixture.options)
-
-        val activity = mock<Activity>()
-        val bundle = Bundle()
-        sut.onActivityCreated(activity, bundle)
-        sut.onActivityCreated(activity, null)
-
-        assertEquals(AppStartType.WARM, AppStartMetrics.getInstance().appStartType)
-    }
-
     @Test
     fun `When firstActivityCreated is false, start transaction with given appStartTime`() {
         val sut = fixture.getSut()
@@ -883,86 +846,6 @@ class ActivityLifecycleIntegrationTest {
         )
     }
 
-    @Test
-    fun `When firstActivityCreated is false and bundle is not null, start app start warm span with given appStartTime`() {
-        val sut = fixture.getSut()
-        fixture.options.tracesSampleRate = 1.0
-        sut.register(fixture.hub, fixture.options)
-        sut.setFirstActivityCreated(false)
-
-        val date = SentryNanotimeDate(Date(1), 0)
-        setAppStartTime(date)
-
-        val activity = mock<Activity>()
-        sut.onActivityCreated(activity, fixture.bundle)
-
-        val span = fixture.transaction.children.first()
-        assertEquals(span.operation, "app.start.warm")
-        assertEquals(span.description, "Warm Start")
-        assertEquals(span.startDate.nanoTimestamp(), date.nanoTimestamp())
-    }
-
-    @Test
-    fun `When firstActivityCreated is false and bundle is not null, start app start cold span with given appStartTime`() {
-        val sut = fixture.getSut()
-        fixture.options.tracesSampleRate = 1.0
-        sut.register(fixture.hub, fixture.options)
-        sut.setFirstActivityCreated(false)
-
-        val date = SentryNanotimeDate(Date(1), 0)
-        setAppStartTime(date)
-
-        val activity = mock<Activity>()
-        sut.onActivityCreated(activity, null)
-
-        val span = fixture.transaction.children.first()
-        assertEquals(span.operation, "app.start.cold")
-        assertEquals(span.description, "Cold Start")
-        assertEquals(span.startDate.nanoTimestamp(), date.nanoTimestamp())
-    }
-
-    @Test
-    fun `When firstActivityCreated is false and app started more than 1 minute ago, start app with Warm start`() {
-        val sut = fixture.getSut()
-        fixture.options.tracesSampleRate = 1.0
-        sut.register(fixture.hub, fixture.options)
-        sut.setFirstActivityCreated(false)
-
-        val date = SentryNanotimeDate(Date(1), 0)
-        val duration = TimeUnit.MINUTES.toMillis(1) + 2
-        val durationNanos = TimeUnit.MILLISECONDS.toNanos(duration)
-        val stopDate = SentryNanotimeDate(Date(duration), durationNanos)
-        setAppStartTime(date, stopDate)
-
-        val activity = mock<Activity>()
-        sut.onActivityCreated(activity, null)
-
-        val span = fixture.transaction.children.first()
-        assertEquals(span.operation, "app.start.warm")
-        assertEquals(span.description, "Warm Start")
-        assertEquals(span.startDate.nanoTimestamp(), date.nanoTimestamp())
-    }
-
-    @Test
-    fun `When firstActivityCreated is false and app started in background, start app with Warm start`() {
-        val sut = fixture.getSut()
-        AppStartMetrics.getInstance().isAppLaunchedInForeground = false
-        fixture.options.tracesSampleRate = 1.0
-        sut.register(fixture.hub, fixture.options)
-        sut.setFirstActivityCreated(false)
-
-        val date = SentryNanotimeDate(Date(1), 0)
-        setAppStartTime(date)
-
-        val activity = mock<Activity>()
-        sut.onActivityCreated(activity, null)
-
-        val span = fixture.transaction.children.first()
-        assertEquals(span.operation, "app.start.warm")
-        assertEquals(span.description, "Warm Start")
-        assertEquals(span.startDate.nanoTimestamp(), date.nanoTimestamp())
-    }
-
     @Test
     fun `When firstActivityCreated is true, start transaction but not with given appStartTime`() {
         val sut = fixture.getSut()
@@ -1467,7 +1350,6 @@ class ActivityLifecycleIntegrationTest {
         assertEquals(startDate.nanoTimestamp(), sut.getProperty<SentryDate>("lastPausedTime").nanoTimestamp())
 
         sut.onActivityCreated(activity, null)
-        assertNotNull(sut.appStartSpan)
 
         sut.onActivityPostCreated(activity, null)
         assertTrue(activityLifecycleSpan.onCreate.hasStopped())
@@ -1556,15 +1438,6 @@ class ActivityLifecycleIntegrationTest {
         // lastPausedUptimeMillis is set to current SystemClock.uptimeMillis()
         val lastUptimeMillis = sut.getProperty<Long>("lastPausedUptimeMillis")
         assertNotEquals(0, lastUptimeMillis)
-
-        sut.onActivityCreated(activity, null)
-        // AppStartMetrics app start time is set to Activity preCreated timestamp
-        assertEquals(lastUptimeMillis, appStartMetrics.appStartTimeSpan.startUptimeMs)
-        // AppStart type is considered warm
-        assertEquals(AppStartType.WARM, appStartMetrics.appStartType)
-
-        // Activity appStart span timestamp is the same of AppStartMetrics.appStart timestamp
-        assertEquals(sut.appStartSpan!!.startDate.nanoTimestamp(), appStartMetrics.getAppStartTimeSpanWithFallback(fixture.options).startTimestamp!!.nanoTimestamp())
     }
 
     private fun SentryTracer.isFinishing() = getProperty<Any>("finishStatus").getProperty<Boolean>("isFinishing")
@@ -1578,6 +1451,9 @@ class ActivityLifecycleIntegrationTest {
 
     private fun setAppStartTime(date: SentryDate = SentryNanotimeDate(Date(1), 0), stopDate: SentryDate? = null) {
         // set by SentryPerformanceProvider so forcing it here
+        AppStartMetrics.getInstance().appStartType = AppStartType.COLD
+        AppStartMetrics.getInstance().isAppLaunchedInForeground = true
+
         val sdkAppStartTimeSpan = AppStartMetrics.getInstance().sdkInitTimeSpan
         val appStartTimeSpan = AppStartMetrics.getInstance().appStartTimeSpan
         val millis = DateUtils.nanosToMillis(date.nanoTimestamp().toDouble()).toLong()

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

@@ -75,7 +75,7 @@ class PerformanceAndroidEventProcessorTest {
         null,
         null
     ).also {
-        AppStartMetrics.getInstance().onActivityCreated(mock(), mock())
+        AppStartMetrics.getInstance().onActivityCreated(mock(), if (coldStart) null else mock())
     }
 
     @BeforeTest
@@ -225,6 +225,7 @@ class PerformanceAndroidEventProcessorTest {
     fun `adds app start metrics to app start txn`() {
         // given some app start metrics
         val appStartMetrics = AppStartMetrics.getInstance()
+        appStartMetrics.isAppLaunchedInForeground = true
         appStartMetrics.appStartType = AppStartType.COLD
         appStartMetrics.appStartTimeSpan.setStartedAt(123)
         appStartMetrics.appStartTimeSpan.setStoppedAt(456)

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

@@ -144,22 +144,6 @@ class AppStartMetricsTest {
         assertFalse(timeSpan.hasStarted())
     }
 
-    @Test
-    fun `if app is launched in background with perfV2, appStartTimeSpanWithFallback returns an empty span`() {
-        val appStartTimeSpan = AppStartMetrics.getInstance().appStartTimeSpan
-        appStartTimeSpan.start()
-        assertTrue(appStartTimeSpan.hasStarted())
-        AppStartMetrics.getInstance().isAppLaunchedInForeground = false
-        AppStartMetrics.getInstance().onActivityCreated(mock(), mock())
-
-        val options = SentryAndroidOptions().apply {
-            isEnablePerformanceV2 = true
-        }
-
-        val timeSpan = AppStartMetrics.getInstance().getAppStartTimeSpanWithFallback(options)
-        assertFalse(timeSpan.hasStarted())
-    }
-
     @Test
     fun `if app start span is at most 1 minute, appStartTimeSpanWithFallback returns the app start span`() {
         val appStartTimeSpan = AppStartMetrics.getInstance().appStartTimeSpan