Skip to content

ref(tracing): Tidy forceFinish's return annotation and Timestamp.hashCode #6091

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. Weโ€™ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Closed
runningcode wants to merge 9 commits into from
+2 โˆ’2
Closed

ref(tracing): Tidy forceFinish's return annotation and Timestamp.hashCode #6091

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
9 commits
Select commit Hold shift + click to select a range
b9fe709
fix(tracing): End timed-out transactions when the timeout fell due (Jโ€ฆ
runningcode Sep 10, 2026
be1bb70
changelog
runningcode Sep 10, 2026
a33769c
ref(tracing): Decide timeout expiry on a monotonic Deadline
runningcode Sep 10, 2026
154e04f
ref(tracing): Say why a timeout's end instant stays a SentryDate
runningcode Sep 10, 2026
f84e7ab
ref(tracing): Hold a timeout's end instant as a Timestamp
runningcode Sep 10, 2026
14631c5
test(tracing): Drive the timeout tests off the shared clock fakes
runningcode Sep 10, 2026
8ee49a6
ref(tracing): Read the timeout bridge as a property from Kotlin
runningcode Sep 10, 2026
edd56b0
docs(tracing): Trim the Expiry javadoc
runningcode Sep 10, 2026
429c0eb
revert: fix(tracing): End timed-out transactions when the timeout felโ€ฆ
runningcode Sep 15, 2026
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
2 changes: 1 addition & 1 deletion sentry/src/main/java/io/sentry/SentryTracer.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -154,7 +154,7 @@ private void onDeadlineTimeoutReached() {
}

@Override
public @NotNull void forceFinish(
public void forceFinish(
final @NotNull SpanStatus status, final boolean dropIfNoChildren, final @Nullable Hint hint) {
if (isFinished()) {
return;
Expand Down
2 changes: 1 addition & 1 deletion sentry/src/main/java/io/sentry/time/Timestamp.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -47,7 +47,7 @@ public boolean equals(final @Nullable Object other) {

@Override
public int hashCode() {
return (int) (epochNanos ^ (epochNanos >>> 32));
return Long.hashCode(epochNanos);
}

@Override
Expand Down
Loading