Skip to content

Commit a9d63e8

Browse files
committed
HBASE-26472 Adhere to semantic conventions regarding table data operations (addendum)
Ensure table data operations emit one and only one span.
1 parent 351caa5 commit a9d63e8

File tree

1 file changed

+7
-3
lines changed

1 file changed

+7
-3
lines changed

hbase-client/src/test/java/org/apache/hadoop/hbase/client/TestAsyncTableTracing.java

Lines changed: 7 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -29,6 +29,7 @@
2929
import static org.hamcrest.Matchers.allOf;
3030
import static org.hamcrest.Matchers.containsString;
3131
import static org.hamcrest.Matchers.hasItem;
32+
import static org.hamcrest.Matchers.hasSize;
3233
import static org.junit.Assert.fail;
3334
import static org.mockito.ArgumentMatchers.any;
3435
import static org.mockito.ArgumentMatchers.anyInt;
@@ -41,9 +42,11 @@
4142
import io.opentelemetry.sdk.trace.data.SpanData;
4243
import java.io.IOException;
4344
import java.util.Arrays;
45+
import java.util.List;
4446
import java.util.concurrent.CompletableFuture;
4547
import java.util.concurrent.ForkJoinPool;
4648
import java.util.concurrent.atomic.AtomicInteger;
49+
import java.util.stream.Collectors;
4750
import org.apache.hadoop.conf.Configuration;
4851
import org.apache.hadoop.hbase.Cell;
4952
import org.apache.hadoop.hbase.Cell.Type;
@@ -251,11 +254,12 @@ private void assertTrace(String tableOperation, Matcher<SpanData> matcher) {
251254
Waiter.waitFor(CONF, 1000, new MatcherPredicate<>(
252255
"waiting for span to emit",
253256
() -> traceRule.getSpans(), hasItem(spanLocator)));
254-
SpanData data = traceRule.getSpans()
257+
List<SpanData> candidateSpans = traceRule.getSpans()
255258
.stream()
256259
.filter(spanLocator::matches)
257-
.findFirst()
258-
.orElseThrow(AssertionError::new);
260+
.collect(Collectors.toList());
261+
assertThat(candidateSpans, hasSize(1));
262+
SpanData data = candidateSpans.iterator().next();
259263
assertThat(data, allOf(
260264
hasName(expectedName),
261265
hasKind(SpanKind.CLIENT),

0 commit comments

Comments
 (0)