Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -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

Expand Down
1 change: 1 addition & 0 deletions sentry-android-core/api/sentry-android-core.api
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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);
}

Copy link
Copy Markdown

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Late init misses warm start

Medium Severity

On API 29+, onActivityCreating only runs from onActivityPreCreated. The SDK_INT check treats that callback as always having run, but registerActivityLifecycleCallbacks during Activity.onCreate happens after PreCreated was already dispatched. onActivityCreated then skips classification and warm re-anchoring, so app start type stays unknown and the warm span is never restarted. This hits the SentryAndroid.init fallback when SentryPerformanceProvider is removed and Sentry is initialized in Activity.onCreate.

Additional Locations (1)
Fix in Cursor Fix in Web

Reviewed by Cursor Bugbot for commit 33c9028. Configure here.

}

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()) {
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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<Activity>()
metrics.onActivityPreCreated(coldActivity, null)
metrics.onActivityCreated(coldActivity, null)
metrics.onActivityDestroyed(coldActivity)

val warmActivity = mock<Activity>()
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()
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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<Activity>(), null)
val activity = mock<Activity>()
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)
Expand Down
Loading