Skip to content

testbed: use fluent assertThat and remove stale nanos TODO #8607

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

Merged
jack-berg merged 2 commits into from
Jul 16, 2026
+2 −4
Merged

testbed: use fluent assertThat and remove stale nanos TODO #8607

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
7762b98
testbed: use fluent assertThat and remove stale nanos TODO
fossadvocate86 Jul 16, 2026
6d0c9c5
Merge branch 'open-telemetry:main' into fossadvocate86/fix-assertSame…
fossadvocate86 Jul 16, 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
1 change: 0 additions & 1 deletion opentracing-shim/src/test/java/io/opentelemetry/opentracingshim/testbed/TestUtils.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -130,7 +130,6 @@ public static List<SpanData> sortByStartTime(List<SpanData> spans) {
/** Asserts the specified {@code List} of {@code Span} belongs to the same trace. */
public static void assertSameTrace(List<SpanData> 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());
Expand Down
5 changes: 2 additions & 3 deletions sdk/trace/src/test/java/io/opentelemetry/sdk/trace/testbed/TestUtils.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -146,9 +146,8 @@ public static List<SpanData> sortByStartTime(List<SpanData> spans) {
/** Asserts the specified {@code List} of {@code Span} belongs to the same trace. */
public static void assertSameTrace(List<SpanData> 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());
}
Expand Down
Loading