Skip to content

Commit 23a194a

Browse files
runningcodeclaude
andcommitted
ref(android): Make AndroidElapsedRealtimeClock a singleton
It took a public constructor to match `new SentryAndroidDateProvider()` on the line beside it in AndroidOptionsInitializer. That line is gone now that SentryAndroidOptions overrides the getter, so the odd one out was the clock rather than the neighbour. With getInstance() it matches the two JVM clocks, and the field it was stored in disappears: both overrides are now the same single line returning a singleton. Co-Authored-By: Claude Opus 5 (1M context) <noreply@anthropic.com>
1 parent 9e2122d commit 23a194a

2 files changed

Lines changed: 10 additions & 4 deletions

File tree

‎sentry-android-core/src/main/java/io/sentry/android/core/SentryAndroidOptions.java‎

Lines changed: 1 addition & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -283,9 +283,6 @@ public interface BeforeCaptureCallback {
283283

284284
private boolean enableAnrFingerprinting = true;
285285

286-
private final @NotNull ElapsedRealtimeClock elapsedRealtimeClock =
287-
new AndroidElapsedRealtimeClock();
288-
289286
public SentryAndroidOptions() {
290287
setSentryClientName(BuildConfig.SENTRY_ANDROID_SDK_NAME + "/" + BuildConfig.VERSION_NAME);
291288
setSdkVersion(createSdkVersion());
@@ -872,7 +869,7 @@ public void setEnableAnrFingerprinting(final boolean enableAnrFingerprinting) {
872869
@Override
873870
@ApiStatus.Internal
874871
public @NotNull ElapsedRealtimeClock getElapsedRealtimeClock() {
875-
return elapsedRealtimeClock;
872+
return AndroidElapsedRealtimeClock.getInstance();
876873
}
877874

878875
static class AndroidUserFeedbackFormHandler implements SentryFeedbackOptions.IFormHandler {

‎sentry-android-core/src/main/java/io/sentry/android/core/internal/time/AndroidElapsedRealtimeClock.java‎

Lines changed: 9 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -3,6 +3,7 @@
33
import android.os.SystemClock;
44
import io.sentry.time.ElapsedRealtimeClock;
55
import org.jetbrains.annotations.ApiStatus;
6+
import org.jetbrains.annotations.NotNull;
67

78
/**
89
* {@link ElapsedRealtimeClock} backed by {@link SystemClock#elapsedRealtimeNanos()}.
@@ -13,6 +14,14 @@
1314
@ApiStatus.Internal
1415
public final class AndroidElapsedRealtimeClock implements ElapsedRealtimeClock {
1516

17+
private static final AndroidElapsedRealtimeClock instance = new AndroidElapsedRealtimeClock();
18+
19+
public static @NotNull ElapsedRealtimeClock getInstance() {
20+
return instance;
21+
}
22+
23+
private AndroidElapsedRealtimeClock() {}
24+
1625
@Override
1726
public long tickNanos() {
1827
return SystemClock.elapsedRealtimeNanos();

0 commit comments

Comments
 (0)