From 87e190c2fffa65bde8fa7085b57aa753554ae736 Mon Sep 17 00:00:00 2001 From: Nelson Osacky Date: Thu, 12 Nov 2026 09:28:57 +0100 Subject: [PATCH] ref(time): Read the epoch time from EpochClock (JAVA-836) The ApplicationExitInfo cutoff and okhttp's replay breadcrumb timestamps only need the current epoch time, which options.getEpochClock() gives. Moving them off CurrentDateProvider changes no values, and leaves fewer callers for v9 to touch when it removes ICurrentDateProvider. The three exit-info integrations no longer take a date provider: the dispatcher reads the clock from the options it already has. Timestamp.epochMillis() converts for the call sites that need millis. Fixes JAVA-836 Co-Authored-By: Claude Opus 5.5 --- .../sentry/android/core/AnrV2Integration.java | 13 +----------- .../ApplicationExitInfoHistoryDispatcher.java | 5 ++--- .../core/MemoryLimiterIntegration.java | 21 +------------------ .../android/core/TombstoneIntegration.java | 12 ----------- ...ApplicationExitInfoCrossIntegrationTest.kt | 12 ++--------- .../core/MemoryLimiterIntegrationTest.kt | 3 +-- .../io/sentry/okhttp/SentryOkHttpEvent.kt | 5 ++--- .../sentry/okhttp/SentryOkHttpInterceptor.kt | 5 ++--- sentry/api/sentry.api | 1 + .../main/java/io/sentry/time/Timestamp.java | 6 ++++++ .../test/java/io/sentry/time/TimestampTest.kt | 6 ++++++ 11 files changed, 24 insertions(+), 65 deletions(-) diff --git a/sentry-android-core/src/main/java/io/sentry/android/core/AnrV2Integration.java b/sentry-android-core/src/main/java/io/sentry/android/core/AnrV2Integration.java index c930bc96afb..1fafe4e0d9e 100644 --- a/sentry-android-core/src/main/java/io/sentry/android/core/AnrV2Integration.java +++ b/sentry-android-core/src/main/java/io/sentry/android/core/AnrV2Integration.java @@ -28,8 +28,6 @@ import io.sentry.protocol.Message; import io.sentry.protocol.SentryId; import io.sentry.protocol.SentryThread; -import io.sentry.transport.CurrentDateProvider; -import io.sentry.transport.ICurrentDateProvider; import io.sentry.util.HintUtils; import io.sentry.util.Objects; import java.io.BufferedReader; @@ -47,19 +45,10 @@ public final class AnrV2Integration implements Integration, Closeable { private final @NotNull Context context; - private final @NotNull ICurrentDateProvider dateProvider; private @Nullable SentryAndroidOptions options; public AnrV2Integration(final @NotNull Context context) { - // using CurrentDateProvider instead of AndroidCurrentDateProvider as AppExitInfo uses - // System.currentTimeMillis - this(context, CurrentDateProvider.getInstance()); - } - - AnrV2Integration( - final @NotNull Context context, final @NotNull ICurrentDateProvider dateProvider) { this.context = ContextUtils.getApplicationContext(context); - this.dateProvider = dateProvider; } @SuppressLint("NewApi") // we do the check in the AnrIntegrationFactory @@ -88,7 +77,7 @@ public void register(@NotNull IScopes scopes, @NotNull SentryOptions options) { .getExecutorService() .submit( new ApplicationExitInfoHistoryDispatcher( - context, scopes, this.options, dateProvider, new AnrV2Policy(this.options))); + context, scopes, this.options, new AnrV2Policy(this.options))); } catch (Throwable e) { options.getLogger().log(SentryLevel.DEBUG, "Failed to start ANR processor.", e); } diff --git a/sentry-android-core/src/main/java/io/sentry/android/core/ApplicationExitInfoHistoryDispatcher.java b/sentry-android-core/src/main/java/io/sentry/android/core/ApplicationExitInfoHistoryDispatcher.java index b60cd7e6914..88c9d377e4b 100644 --- a/sentry-android-core/src/main/java/io/sentry/android/core/ApplicationExitInfoHistoryDispatcher.java +++ b/sentry-android-core/src/main/java/io/sentry/android/core/ApplicationExitInfoHistoryDispatcher.java @@ -13,7 +13,6 @@ import io.sentry.cache.IEnvelopeCache; import io.sentry.hints.BlockingFlushHint; import io.sentry.protocol.SentryId; -import io.sentry.transport.ICurrentDateProvider; import io.sentry.util.HintUtils; import java.util.ArrayList; import java.util.Collections; @@ -57,13 +56,13 @@ final class ApplicationExitInfoHistoryDispatcher implements Runnable { final @NotNull Context context, final @NotNull IScopes scopes, final @NotNull SentryAndroidOptions options, - final @NotNull ICurrentDateProvider dateProvider, final @NotNull ApplicationExitInfoPolicy policy) { this.context = ContextUtils.getApplicationContext(context); this.scopes = scopes; this.options = options; this.policy = policy; - this.threshold = dateProvider.getCurrentTimeMillis() - NINETY_DAYS_THRESHOLD; + // ApplicationExitInfo timestamps are epoch millis, so the cutoff has to be on the wall clock. + this.threshold = options.getEpochClock().now().epochMillis() - NINETY_DAYS_THRESHOLD; } @RequiresApi(api = Build.VERSION_CODES.R) diff --git a/sentry-android-core/src/main/java/io/sentry/android/core/MemoryLimiterIntegration.java b/sentry-android-core/src/main/java/io/sentry/android/core/MemoryLimiterIntegration.java index 83f5b680fe7..c9f2eeb114c 100644 --- a/sentry-android-core/src/main/java/io/sentry/android/core/MemoryLimiterIntegration.java +++ b/sentry-android-core/src/main/java/io/sentry/android/core/MemoryLimiterIntegration.java @@ -27,8 +27,6 @@ import io.sentry.protocol.Message; import io.sentry.protocol.SentryException; import io.sentry.protocol.SentryId; -import io.sentry.transport.CurrentDateProvider; -import io.sentry.transport.ICurrentDateProvider; import io.sentry.util.ExceptionUtils; import io.sentry.util.HintUtils; import io.sentry.util.Objects; @@ -41,7 +39,6 @@ import org.jetbrains.annotations.ApiStatus; import org.jetbrains.annotations.NotNull; import org.jetbrains.annotations.Nullable; -import org.jetbrains.annotations.TestOnly; /** * Reports Android process deaths that the OS records as () whenever(buildInfoProvider.sdkInfoVersion).thenReturn(37) - MemoryLimiterIntegration( - fixture.context, - io.sentry.transport.CurrentDateProvider.getInstance(), - buildInfoProvider, - ) + MemoryLimiterIntegration(fixture.context, buildInfoProvider) .register(memoryLimiterScopes, memoryLimiterOptions) verify(memoryLimiterScopes) @@ -224,11 +220,7 @@ class ApplicationExitInfoCrossIntegrationTest { } val buildInfoProvider = mock() whenever(buildInfoProvider.sdkInfoVersion).thenReturn(37) - MemoryLimiterIntegration( - fixture.context, - io.sentry.transport.CurrentDateProvider.getInstance(), - buildInfoProvider, - ) + MemoryLimiterIntegration(fixture.context, buildInfoProvider) .register(memoryLimiterScopes, memoryLimiterOptions) verify(memoryLimiterScopes) diff --git a/sentry-android-core/src/test/java/io/sentry/android/core/MemoryLimiterIntegrationTest.kt b/sentry-android-core/src/test/java/io/sentry/android/core/MemoryLimiterIntegrationTest.kt index ed3bc431d85..f0227d91639 100644 --- a/sentry-android-core/src/test/java/io/sentry/android/core/MemoryLimiterIntegrationTest.kt +++ b/sentry-android-core/src/test/java/io/sentry/android/core/MemoryLimiterIntegrationTest.kt @@ -15,7 +15,6 @@ import io.sentry.android.core.cache.AndroidEnvelopeCache import io.sentry.cache.EnvelopeCache import io.sentry.protocol.SentryId import io.sentry.test.ImmediateExecutorService -import io.sentry.transport.CurrentDateProvider import io.sentry.util.HintUtils import java.io.File import kotlin.test.BeforeTest @@ -105,7 +104,7 @@ class MemoryLimiterIntegrationTest { whenever(scopes.captureEvent(any(), anyOrNull())).thenReturn(SentryId()) val buildInfoProvider = mock() whenever(buildInfoProvider.sdkInfoVersion).thenReturn(sdkVersion) - return MemoryLimiterIntegration(context, CurrentDateProvider.getInstance(), buildInfoProvider) + return MemoryLimiterIntegration(context, buildInfoProvider) } fun addAppExitInfo( diff --git a/sentry-okhttp/src/main/java/io/sentry/okhttp/SentryOkHttpEvent.kt b/sentry-okhttp/src/main/java/io/sentry/okhttp/SentryOkHttpEvent.kt index ee3ecf07461..2dcb371e3f6 100644 --- a/sentry-okhttp/src/main/java/io/sentry/okhttp/SentryOkHttpEvent.kt +++ b/sentry-okhttp/src/main/java/io/sentry/okhttp/SentryOkHttpEvent.kt @@ -8,7 +8,6 @@ import io.sentry.SentryDate import io.sentry.SpanDataConvention import io.sentry.SpanOptions import io.sentry.TypeCheckHint -import io.sentry.transport.CurrentDateProvider import io.sentry.util.Platform import io.sentry.util.UrlUtils import io.sentry.util.network.NetworkRequestData @@ -51,7 +50,7 @@ internal class SentryOkHttpEvent(private val scopes: IScopes, private val reques // needs this as unix timestamp for rrweb setData( SpanDataConvention.HTTP_START_TIMESTAMP, - CurrentDateProvider.getInstance().currentTimeMillis, + scopes.options.epochClock.now().epochMillis(), ) } @@ -177,7 +176,7 @@ internal class SentryOkHttpEvent(private val scopes: IScopes, private val reques // needs this as unix timestamp for rrweb breadcrumb.setData( SpanDataConvention.HTTP_END_TIMESTAMP, - CurrentDateProvider.getInstance().currentTimeMillis, + scopes.options.epochClock.now().epochMillis(), ) // We send the breadcrumb even without spans. scopes.addBreadcrumb(breadcrumb, hint) diff --git a/sentry-okhttp/src/main/java/io/sentry/okhttp/SentryOkHttpInterceptor.kt b/sentry-okhttp/src/main/java/io/sentry/okhttp/SentryOkHttpInterceptor.kt index b7c55b74d41..654b5182523 100644 --- a/sentry-okhttp/src/main/java/io/sentry/okhttp/SentryOkHttpInterceptor.kt +++ b/sentry-okhttp/src/main/java/io/sentry/okhttp/SentryOkHttpInterceptor.kt @@ -20,7 +20,6 @@ import io.sentry.TypeCheckHint.OKHTTP_REQUEST import io.sentry.TypeCheckHint.OKHTTP_RESPONSE import io.sentry.TypeCheckHint.SENTRY_REPLAY_NETWORK_DETAILS import io.sentry.clientreport.DiscardReason -import io.sentry.transport.CurrentDateProvider import io.sentry.util.ExceptionUtils import io.sentry.util.IntegrationUtils.addIntegrationToSdkVersion import io.sentry.util.Platform @@ -109,7 +108,7 @@ public open class SentryOkHttpInterceptor( ) } - val startTimestamp = CurrentDateProvider.getInstance().currentTimeMillis + val startTimestamp = scopes.options.epochClock.now().epochMillis() urlDetails.applyToSpan(span) @@ -269,7 +268,7 @@ public open class SentryOkHttpInterceptor( breadcrumb.setData(SpanDataConvention.HTTP_START_TIMESTAMP, startTimestamp) breadcrumb.setData( SpanDataConvention.HTTP_END_TIMESTAMP, - CurrentDateProvider.getInstance().currentTimeMillis, + scopes.options.epochClock.now().epochMillis(), ) scopes.addBreadcrumb(breadcrumb, hint) diff --git a/sentry/api/sentry.api b/sentry/api/sentry.api index 17ca4e62279..5caa7674c90 100644 --- a/sentry/api/sentry.api +++ b/sentry/api/sentry.api @@ -7773,6 +7773,7 @@ public final class io/sentry/time/SystemEpochClock : io/sentry/time/EpochClock { } public final class io/sentry/time/Timestamp { + public fun epochMillis ()J public fun epochNanos ()J public fun equals (Ljava/lang/Object;)Z public fun hashCode ()I diff --git a/sentry/src/main/java/io/sentry/time/Timestamp.java b/sentry/src/main/java/io/sentry/time/Timestamp.java index d703cfb9c9a..e462eddf81c 100644 --- a/sentry/src/main/java/io/sentry/time/Timestamp.java +++ b/sentry/src/main/java/io/sentry/time/Timestamp.java @@ -1,5 +1,6 @@ package io.sentry.time; +import java.util.concurrent.TimeUnit; import org.jetbrains.annotations.ApiStatus; import org.jetbrains.annotations.NotNull; import org.jetbrains.annotations.Nullable; @@ -34,6 +35,11 @@ public long epochNanos() { return epochNanos; } + /** Truncated to whole milliseconds, the precision of {@link java.util.Date} and most payloads. */ + public long epochMillis() { + return TimeUnit.NANOSECONDS.toMillis(epochNanos); + } + @Override public boolean equals(final @Nullable Object other) { if (this == other) { diff --git a/sentry/src/test/java/io/sentry/time/TimestampTest.kt b/sentry/src/test/java/io/sentry/time/TimestampTest.kt index 774a45ae66a..5510c7f0e4e 100644 --- a/sentry/src/test/java/io/sentry/time/TimestampTest.kt +++ b/sentry/src/test/java/io/sentry/time/TimestampTest.kt @@ -11,6 +11,12 @@ class TimestampTest { .isEqualTo(1_700_000_000_000_000_000) } + @Test + fun `truncates to whole milliseconds`() { + assertThat(Timestamp.ofEpochNanos(1_700_000_000_123_999_999).epochMillis()) + .isEqualTo(1_700_000_000_123) + } + @Test fun `compares by instant, whatever produced it`() { val anchored = AnchoredClock.create(FixedEpochClock(42), TestMonotonicTicker())