From 49f2687d2de68b46b070fc9d9cbab5ecf365d8f4 Mon Sep 17 00:00:00 2001
From: Lauri Tulmin <ltulmin@splunk.com>
Date: Tue, 11 Jun 2024 18:20:05 +0300
Subject: [PATCH] Allow grpc events to appear in any order (#11484)

---
 .../grpc/v1_6/AbstractGrpcStreamingTest.java   | 18 +++++++++++++-----
 1 file changed, 13 insertions(+), 5 deletions(-)

diff --git a/instrumentation/grpc-1.6/testing/src/main/java/io/opentelemetry/instrumentation/grpc/v1_6/AbstractGrpcStreamingTest.java b/instrumentation/grpc-1.6/testing/src/main/java/io/opentelemetry/instrumentation/grpc/v1_6/AbstractGrpcStreamingTest.java
index e1544822a7..9153436ba9 100644
--- a/instrumentation/grpc-1.6/testing/src/main/java/io/opentelemetry/instrumentation/grpc/v1_6/AbstractGrpcStreamingTest.java
+++ b/instrumentation/grpc-1.6/testing/src/main/java/io/opentelemetry/instrumentation/grpc/v1_6/AbstractGrpcStreamingTest.java
@@ -24,7 +24,7 @@ import io.opentelemetry.api.trace.SpanKind;
 import io.opentelemetry.api.trace.Tracer;
 import io.opentelemetry.instrumentation.testing.junit.InstrumentationExtension;
 import io.opentelemetry.instrumentation.testing.util.ThrowingRunnable;
-import io.opentelemetry.sdk.testing.assertj.EventDataAssert;
+import io.opentelemetry.sdk.trace.data.EventData;
 import io.opentelemetry.semconv.NetworkAttributes;
 import io.opentelemetry.semconv.ServerAttributes;
 import io.opentelemetry.semconv.incubating.MessageIncubatingAttributes;
@@ -153,12 +153,12 @@ public abstract class AbstractGrpcStreamingTest {
                 .sorted()
                 .collect(Collectors.toList()));
 
-    List<Consumer<EventDataAssert>> events = new ArrayList<>();
+    List<Consumer<EventData>> events = new ArrayList<>();
     for (int i = 1; i <= clientMessageCount * serverMessageCount + clientMessageCount; i++) {
       long messageId = i;
       events.add(
           event ->
-              event
+              assertThat(event)
                   .hasName("message")
                   .hasAttributesSatisfying(
                       attrs ->
@@ -192,7 +192,11 @@ public abstract class AbstractGrpcStreamingTest {
                                         (long) Status.Code.OK.value()),
                                     equalTo(ServerAttributes.SERVER_ADDRESS, "localhost"),
                                     equalTo(ServerAttributes.SERVER_PORT, (long) server.getPort())))
-                            .hasEventsSatisfyingExactly(events.toArray(new Consumer[0])),
+                            .satisfies(
+                                spanData ->
+                                    assertThat(spanData.getEvents())
+                                        .satisfiesExactlyInAnyOrder(
+                                            events.toArray(new Consumer[0]))),
                     span ->
                         span.hasName("example.Greeter/Conversation")
                             .hasKind(SpanKind.SERVER)
@@ -211,7 +215,11 @@ public abstract class AbstractGrpcStreamingTest {
                                 satisfies(
                                     NetworkAttributes.NETWORK_PEER_PORT,
                                     val -> assertThat(val).isNotNull()))
-                            .hasEventsSatisfyingExactly(events.toArray(new Consumer[0]))));
+                            .satisfies(
+                                spanData ->
+                                    assertThat(spanData.getEvents())
+                                        .satisfiesExactlyInAnyOrder(
+                                            events.toArray(new Consumer[0])))));
     testing()
         .waitAndAssertMetrics(
             "io.opentelemetry.grpc-1.6",