more stable trace ordering

open-telemetry · May 18, 2023 · 0806a6a · 0806a6a
1 parent f967945
commit 0806a6a
Show file tree

Hide file tree

Showing 5 changed files with 30 additions and 5 deletions.
diff --git a/...metry/javaagent/instrumentation/reactornetty/v1_0/AbstractReactorNettyHttpClientTest.java b/...metry/javaagent/instrumentation/reactornetty/v1_0/AbstractReactorNettyHttpClientTest.java
@@ -105,7 +105,7 @@ public void sendRequestWithCallback(
 
   @Override
   protected void configure(HttpClientTestOptions.Builder optionsBuilder) {
-//    optionsBuilder.disableTestRedirects();
+    //    optionsBuilder.disableTestRedirects();
     optionsBuilder.markAsLowLevelInstrumentation();
     optionsBuilder.setMaxRedirects(52);
 

diff --git a/...mon/src/main/java/io/opentelemetry/instrumentation/testing/InstrumentationTestRunner.java b/...mon/src/main/java/io/opentelemetry/instrumentation/testing/InstrumentationTestRunner.java
@@ -78,6 +78,12 @@ public final void waitAndAssertSortedTraces(
     waitAndAssertTraces(traceComparator, Arrays.asList(assertions), true);
   }
 
+  public final void waitAndAssertSortedTraces(
+      Comparator<List<SpanData>> traceComparator,
+      Iterable<? extends Consumer<TraceAssert>> assertions) {
+    waitAndAssertTraces(traceComparator, assertions, true);
+  }
+
   @SafeVarargs
   @SuppressWarnings("varargs")
   public final void waitAndAssertTracesWithoutScopeVersionVerification(

diff --git a/...rc/main/java/io/opentelemetry/instrumentation/testing/junit/InstrumentationExtension.java b/...rc/main/java/io/opentelemetry/instrumentation/testing/junit/InstrumentationExtension.java
@@ -139,6 +139,12 @@ public final void waitAndAssertSortedTraces(
     testRunner.waitAndAssertSortedTraces(traceComparator, assertions);
   }
 
+  public final void waitAndAssertSortedTraces(
+      Comparator<List<SpanData>> traceComparator,
+      Iterable<? extends Consumer<TraceAssert>> assertions) {
+    testRunner.waitAndAssertSortedTraces(traceComparator, assertions);
+  }
+
   @SafeVarargs
   @SuppressWarnings("varargs")
   public final void waitAndAssertTracesWithoutScopeVersionVerification(

diff --git a/...main/java/io/opentelemetry/instrumentation/testing/junit/http/AbstractHttpClientTest.java b/...main/java/io/opentelemetry/instrumentation/testing/junit/http/AbstractHttpClientTest.java
@@ -5,6 +5,7 @@
 
 package io.opentelemetry.instrumentation.testing.junit.http;
 
+import static io.opentelemetry.instrumentation.testing.util.TelemetryDataUtil.comparingRootSpanAttribute;
 import static io.opentelemetry.sdk.testing.assertj.OpenTelemetryAssertions.assertThat;
 import static io.opentelemetry.sdk.testing.assertj.OpenTelemetryAssertions.equalTo;
 import static io.opentelemetry.semconv.trace.attributes.SemanticAttributes.NetTransportValues.IP_TCP;
@@ -255,7 +256,8 @@ void basicRequestWith1Redirect() throws Exception {
     assertThat(responseCode).isEqualTo(200);
 
     if (options.isLowLevelInstrumentation()) {
-      testing.waitAndAssertTraces(
+      testing.waitAndAssertSortedTraces(
+          comparingRootSpanAttribute(SemanticAttributes.HTTP_RESEND_COUNT),
           trace -> {
             trace.hasSpansSatisfyingExactly(
                 span ->
@@ -294,7 +296,8 @@ void basicRequestWith2Redirects() throws Exception {
     assertThat(responseCode).isEqualTo(200);
 
     if (options.isLowLevelInstrumentation()) {
-      testing.waitAndAssertTraces(
+      testing.waitAndAssertSortedTraces(
+          comparingRootSpanAttribute(SemanticAttributes.HTTP_RESEND_COUNT),
           trace -> {
             trace.hasSpansSatisfyingExactly(
                 span ->
@@ -352,7 +355,8 @@ void circularRedirects() {
     Throwable clientError = options.getClientSpanErrorMapper().apply(uri, ex);
 
     if (options.isLowLevelInstrumentation()) {
-      testing.waitAndAssertTraces(
+      testing.waitAndAssertSortedTraces(
+          comparingRootSpanAttribute(SemanticAttributes.HTTP_RESEND_COUNT),
           IntStream.range(0, options.getMaxRedirects())
               .mapToObj(i -> makeCircularRedirectAssertForLolLevelTrace(uri, method, i))
               .collect(Collectors.toList()));
@@ -398,7 +402,8 @@ void redirectToSecuredCopiesAuthHeader() throws Exception {
     assertThat(responseCode).isEqualTo(200);
 
     if (options.isLowLevelInstrumentation()) {
-      testing.waitAndAssertTraces(
+      testing.waitAndAssertSortedTraces(
+          comparingRootSpanAttribute(SemanticAttributes.HTTP_RESEND_COUNT),
           trace -> {
             trace.hasSpansSatisfyingExactly(
                 span ->

diff --git a/...common/src/main/java/io/opentelemetry/instrumentation/testing/util/TelemetryDataUtil.java b/...common/src/main/java/io/opentelemetry/instrumentation/testing/util/TelemetryDataUtil.java
@@ -8,6 +8,7 @@
 import static java.util.stream.Collectors.toList;
 import static org.assertj.core.api.Assertions.assertThat;
 
+import io.opentelemetry.api.common.AttributeKey;
 import io.opentelemetry.api.trace.SpanId;
 import io.opentelemetry.api.trace.SpanKind;
 import io.opentelemetry.sdk.trace.data.SpanData;
@@ -34,6 +35,13 @@ public static Comparator<List<SpanData>> orderByRootSpanName(String... names) {
     return Comparator.comparing(span -> list.indexOf(span.get(0).getName()));
   }
 
+  public static <T extends Comparable<T>> Comparator<List<SpanData>> comparingRootSpanAttribute(
+      AttributeKey<T> key) {
+    return Comparator.comparing(
+        span -> span.get(0).getAttributes().get(key),
+        Comparator.nullsFirst(Comparator.naturalOrder()));
+  }
+
   public static List<List<SpanData>> groupTraces(List<SpanData> spans) {
     List<List<SpanData>> traces =
         new ArrayList<>(