From 7762b98f1a6809b4000b63f0147ab27e6baf3c68 Mon Sep 17 00:00:00 2001 From: fossadvocate86 Date: Fri, 17 Jul 2026 00:16:46 +0530 Subject: [PATCH] testbed: use fluent assertThat and remove stale nanos TODO --- .../io/opentelemetry/opentracingshim/testbed/TestUtils.java | 1 - .../java/io/opentelemetry/sdk/trace/testbed/TestUtils.java | 5 ++--- 2 files changed, 2 insertions(+), 4 deletions(-) diff --git a/opentracing-shim/src/test/java/io/opentelemetry/opentracingshim/testbed/TestUtils.java b/opentracing-shim/src/test/java/io/opentelemetry/opentracingshim/testbed/TestUtils.java index c5ae9b180df..a8ccfde0a44 100644 --- a/opentracing-shim/src/test/java/io/opentelemetry/opentracingshim/testbed/TestUtils.java +++ b/opentracing-shim/src/test/java/io/opentelemetry/opentracingshim/testbed/TestUtils.java @@ -130,7 +130,6 @@ public static List sortByStartTime(List spans) { /** Asserts the specified {@code List} of {@code Span} belongs to the same trace. */ public static void assertSameTrace(List spans) { for (int i = 0; i < spans.size() - 1; i++) { - // TODO - Include nanos in this comparison. assertThat(spans.get(i).getEndEpochNanos()) .isLessThanOrEqualTo(spans.get(spans.size() - 1).getEndEpochNanos()); assertThat(spans.get(i).getTraceId()).isEqualTo(spans.get(spans.size() - 1).getTraceId()); diff --git a/sdk/trace/src/test/java/io/opentelemetry/sdk/trace/testbed/TestUtils.java b/sdk/trace/src/test/java/io/opentelemetry/sdk/trace/testbed/TestUtils.java index fdc70562a52..127ad323c3b 100644 --- a/sdk/trace/src/test/java/io/opentelemetry/sdk/trace/testbed/TestUtils.java +++ b/sdk/trace/src/test/java/io/opentelemetry/sdk/trace/testbed/TestUtils.java @@ -146,9 +146,8 @@ public static List sortByStartTime(List spans) { /** Asserts the specified {@code List} of {@code Span} belongs to the same trace. */ public static void assertSameTrace(List spans) { for (int i = 0; i < spans.size() - 1; i++) { - // TODO - Include nanos in this comparison. - assertThat(spans.get(spans.size() - 1).getEndEpochNanos() >= spans.get(i).getEndEpochNanos()) - .isTrue(); + assertThat(spans.get(spans.size() - 1).getEndEpochNanos()) + .isGreaterThanOrEqualTo(spans.get(i).getEndEpochNanos()); assertThat(spans.get(spans.size() - 1).getTraceId()).isEqualTo(spans.get(i).getTraceId()); assertThat(spans.get(spans.size() - 1).getSpanId()).isEqualTo(spans.get(i).getParentSpanId()); }