Fix span trimming logic

getsentry · Feb 1, 2023 · 81f1ba5 · 81f1ba5
1 parent aa9f166
commit 81f1ba5
Show file tree

Hide file tree

Showing 2 changed files with 10 additions and 2 deletions.
diff --git a/sentry/src/main/java/io/sentry/SentryDate.java b/sentry/src/main/java/io/sentry/SentryDate.java
@@ -37,6 +37,14 @@ public long diff(final @NotNull SentryDate otherDate) {
     return nanoTimestamp() - otherDate.nanoTimestamp();
   }
 
+  public boolean beforeOrEqual(final @NotNull SentryDate otherDate) {
+    return diff(otherDate) <= 0;
+  }
+
+  public boolean afterOrEqual(final @NotNull SentryDate otherDate) {
+    return diff(otherDate) >= 0;
+  }
+
   @Override
   public int compareTo(@NotNull SentryDate otherDate) {
     return Long.valueOf(nanoTimestamp()).compareTo(otherDate.nanoTimestamp());

diff --git a/sentry/src/main/java/io/sentry/SentryTracer.java b/sentry/src/main/java/io/sentry/SentryTracer.java
@@ -421,11 +421,11 @@ public void finish(@Nullable SpanStatus status, @Nullable SentryDate finishDate)
       for (Span child : children) {
         if (child.getParentSpanId() != null && child.getParentSpanId().equals(span.getSpanId())) {
           childCount++;
-          if (minChildStart == null || minChildStart.diff(child.getStartDate()) < 0) {
+          if (minChildStart == null || child.getStartDate().beforeOrEqual(minChildStart)) {
             minChildStart = child.getStartDate();
           }
           if (maxChildEnd == null
-              || (child.getFinishDate() != null && maxChildEnd.diff(child.getFinishDate()) < 0)) {
+              || (child.getFinishDate() != null && child.getFinishDate().afterOrEqual(maxChildEnd))) {
             maxChildEnd = child.getFinishDate();
           }
         }