diff --git a/CHANGELOG.md b/CHANGELOG.md index 353beefb7e..34e3497f10 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -12,6 +12,7 @@ - Kotlin now sees `Attachment.getBytes()`, `Device.getArchs()`, `Spring.getActiveProfiles()` and `JsonSerializationUtils.bytesFrom(...)` as nullable, because `@Nullable` now annotates the returned array instead of its elements ([#6558](https://github.com/getsentry/sentry-java/pull/6558)) - Shake-to-report no longer leaks the first Activity that resumes after `Sentry.init` ([#6686](https://github.com/getsentry/sentry-java/pull/6686)) - Android app start: Reopening the app within a minute of process start is now reported as a warm start timed from the reopened screen, instead of reusing the cold start's timing. In standalone app start mode, this no longer sends the cold start a second time, as a warm start ([#6687](https://github.com/getsentry/sentry-java/pull/6687)) +- Android app start: On Android 10+, a warm start now begins when the screen starts being created, matching its `activity.load` span ([#6719](https://github.com/getsentry/sentry-java/pull/6719)) ## 8.65.0 diff --git a/sentry-android-core/api/sentry-android-core.api b/sentry-android-core/api/sentry-android-core.api index 712f981ecd..77ee452c42 100644 --- a/sentry-android-core/api/sentry-android-core.api +++ b/sentry-android-core/api/sentry-android-core.api @@ -857,6 +857,7 @@ public final class io/sentry/android/core/performance/AppStartMetrics : io/sentr public fun onActivityCreated (Landroid/app/Activity;Landroid/os/Bundle;)V public fun onActivityDestroyed (Landroid/app/Activity;)V public fun onActivityPaused (Landroid/app/Activity;)V + public fun onActivityPreCreated (Landroid/app/Activity;Landroid/os/Bundle;)V public fun onActivityResumed (Landroid/app/Activity;)V public fun onActivityStarted (Landroid/app/Activity;)V public fun onActivityStopped (Landroid/app/Activity;)V 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 index 4051ae6ebf..a28537869d 100644 --- 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 @@ -664,10 +664,25 @@ private void stopHeadlessAppStartAt(final long stopUptimeMs) { } } + @Override + public void onActivityPreCreated( + @NonNull Activity activity, @Nullable Bundle savedInstanceState) { + // ActivityLifecycleIntegration starts the activity.load span here, so a warm app start must not + // start any later than that. + onActivityCreating(savedInstanceState); + } + @Override public void onActivityCreated(@NonNull Activity activity, @Nullable Bundle savedInstanceState) { - final long activityCreatedUptimeMillis = SystemClock.uptimeMillis(); CurrentActivityHolder.getInstance().setActivity(activity); + // onActivityPreCreated is only dispatched on API 29+ + if (Build.VERSION.SDK_INT < Build.VERSION_CODES.Q) { + onActivityCreating(savedInstanceState); + } + } + + private void onActivityCreating(final @Nullable Bundle savedInstanceState) { + final long activityCreatedUptimeMillis = SystemClock.uptimeMillis(); // the first activity determines the app start type if (activeActivitiesCounter.incrementAndGet() == 1 && !firstDrawDone.get()) { 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 index ab7b942b09..628b66088d 100644 --- 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 @@ -596,6 +596,27 @@ class AppStartMetricsTest { assertThat(metrics.shouldSendStartMeasurements(false)).isTrue() } + @Test + @Config(sdk = [Build.VERSION_CODES.Q]) + fun `on API 29+ a warm start is timed from onActivityPreCreated`() { + val metrics = AppStartMetrics.getInstance() + metrics.appStartTimeSpan.setStartedAt(SystemClock.uptimeMillis()) + val coldActivity = mock() + metrics.onActivityPreCreated(coldActivity, null) + metrics.onActivityCreated(coldActivity, null) + metrics.onActivityDestroyed(coldActivity) + + val warmActivity = mock() + val preCreatedUptimeMs = SystemClock.uptimeMillis() + TimeUnit.SECONDS.toMillis(25) + SystemClock.setCurrentTimeMillis(preCreatedUptimeMs) + metrics.onActivityPreCreated(warmActivity, null) + SystemClock.setCurrentTimeMillis(preCreatedUptimeMs + 100) + metrics.onActivityCreated(warmActivity, null) + + assertThat(metrics.appStartType).isEqualTo(AppStartMetrics.AppStartType.WARM) + assertThat(metrics.appStartTimeSpan.startUptimeMs).isEqualTo(preCreatedUptimeMs) + } + @Test fun `provider sets both appstart and sdk init start + end times`() { val metrics = AppStartMetrics.getInstance() 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 index c89054e9ca..a751d2737f 100644 --- 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 @@ -367,7 +367,9 @@ class AppStartMetricsTestApi35 { // User opens the app 20s later (under the 1-minute warm threshold). val activityCreatedUptimeMs = 20_000L SystemClock.setCurrentTimeMillis(activityCreatedUptimeMs) - metrics.onActivityCreated(mock(), null) + val activity = mock() + metrics.onActivityPreCreated(activity, null) + metrics.onActivityCreated(activity, null) // Re-classified as a warm start re-anchored at activity creation. assertEquals(AppStartMetrics.AppStartType.WARM, metrics.appStartType)