Merge a1fad41 into 4e260b3

getsentry · Dec 12, 2023 · 28ea623 · 28ea623
2 parents 4e260b3 + a1fad41
commit 28ea623
Show file tree

Hide file tree

Showing 3 changed files with 38 additions and 0 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -9,6 +9,7 @@
 ### Fixes
 
 - Send breadcrumbs and client error even without transactions ([#3087](https://github.com/getsentry/sentry-java/pull/3087))
+- (Android) Fix wrong activity transaction duration in case SDK init is deferred ([#3092](https://github.com/getsentry/sentry-java/pull/3092))
 
 ### Dependencies
 

diff --git a/sentry-android-core/src/main/java/io/sentry/android/core/ActivityLifecycleIntegration.java b/sentry-android-core/src/main/java/io/sentry/android/core/ActivityLifecycleIntegration.java
@@ -431,6 +431,10 @@ public void onActivityPostResumed(@NonNull Activity activity) {
   public void onActivityPrePaused(@NonNull Activity activity) {
     // only executed if API >= 29 otherwise it happens on onActivityPaused
     if (isAllActivityCallbacksAvailable) {
+      // as the SDK may gets (re-)initialized mid activity lifecycle, ensure we set the flag here as
+      // well
+      // this ensures any newly launched activity will not use the app start timestamp as txn start
+      firstActivityCreated = true;
       if (hub == null) {
         lastPausedTime = AndroidDateUtils.getCurrentSentryDateTime();
       } else {
@@ -443,6 +447,10 @@ public void onActivityPrePaused(@NonNull Activity activity) {
   public synchronized void onActivityPaused(final @NotNull Activity activity) {
     // only executed if API < 29 otherwise it happens on onActivityPrePaused
     if (!isAllActivityCallbacksAvailable) {
+      // as the SDK may gets (re-)initialized mid activity lifecycle, ensure we set the flag here as
+      // well
+      // this ensures any newly launched activity will not use the app start timestamp as txn start
+      firstActivityCreated = true;
       if (hub == null) {
         lastPausedTime = AndroidDateUtils.getCurrentSentryDateTime();
       } else {

diff --git a/sentry-android-core/src/test/java/io/sentry/android/core/ActivityLifecycleIntegrationTest.kt b/sentry-android-core/src/test/java/io/sentry/android/core/ActivityLifecycleIntegrationTest.kt
@@ -21,6 +21,7 @@ import io.sentry.Scope
 import io.sentry.ScopeCallback
 import io.sentry.Sentry
 import io.sentry.SentryDate
+import io.sentry.SentryDateProvider
 import io.sentry.SentryLevel
 import io.sentry.SentryNanotimeDate
 import io.sentry.SentryOptions
@@ -1479,6 +1480,34 @@ class ActivityLifecycleIntegrationTest {
         verify(fixture.activityFramesTracker).setMetrics(activity, fixture.transaction.eventId)
     }
 
+    @Test
+    fun `When sentry is initialized mid activity lifecycle, last paused time should be used in favor of app start time`() {
+        val sut = fixture.getSut(importance = RunningAppProcessInfo.IMPORTANCE_FOREGROUND)
+        val now = SentryNanotimeDate(Date(1234), 456)
+
+        fixture.options.tracesSampleRate = 1.0
+        fixture.options.dateProvider = SentryDateProvider { now }
+        sut.register(fixture.hub, fixture.options)
+
+        // usually done by SentryPerformanceProvider
+        val startDate = SentryNanotimeDate(Date(5678), 910)
+        setAppStartTime(startDate)
+        AppStartMetrics.getInstance().appStartType = AppStartType.COLD
+
+        // when activity is paused without being created
+        // indicating a delayed SDK init
+        val oldActivity = mock<Activity>()
+        sut.onActivityPrePaused(oldActivity)
+        sut.onActivityPaused(oldActivity)
+
+        // and the next activity is created
+        val newActivity = mock<Activity>()
+        sut.onActivityCreated(newActivity, null)
+
+        // then the transaction should start with the paused time
+        assertEquals(now.nanoTimestamp(), fixture.transaction.startDate.nanoTimestamp())
+    }
+
     private fun runFirstDraw(view: View) {
         // Removes OnDrawListener in the next OnGlobalLayout after onDraw
         view.viewTreeObserver.dispatchOnDraw()