Skip to content

Commit ee71120

Browse files
lauritzeitlinger
authored andcommitted
Allow grpc events to appear in any order (#11484)
1 parent 18a5a10 commit ee71120

File tree

1 file changed

+13
-5
lines changed

1 file changed

+13
-5
lines changed

instrumentation/grpc-1.6/testing/src/main/java/io/opentelemetry/instrumentation/grpc/v1_6/AbstractGrpcStreamingTest.java

+13-5
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,7 @@
2424
import io.opentelemetry.api.trace.Tracer;
2525
import io.opentelemetry.instrumentation.testing.junit.InstrumentationExtension;
2626
import io.opentelemetry.instrumentation.testing.util.ThrowingRunnable;
27-
import io.opentelemetry.sdk.testing.assertj.EventDataAssert;
27+
import io.opentelemetry.sdk.trace.data.EventData;
2828
import io.opentelemetry.semconv.NetworkAttributes;
2929
import io.opentelemetry.semconv.ServerAttributes;
3030
import io.opentelemetry.semconv.incubating.MessageIncubatingAttributes;
@@ -153,12 +153,12 @@ public void onCompleted() {
153153
.sorted()
154154
.collect(Collectors.toList()));
155155

156-
List<Consumer<EventDataAssert>> events = new ArrayList<>();
156+
List<Consumer<EventData>> events = new ArrayList<>();
157157
for (int i = 1; i <= clientMessageCount * serverMessageCount + clientMessageCount; i++) {
158158
long messageId = i;
159159
events.add(
160160
event ->
161-
event
161+
assertThat(event)
162162
.hasName("message")
163163
.hasAttributesSatisfying(
164164
attrs ->
@@ -192,7 +192,11 @@ public void onCompleted() {
192192
(long) Status.Code.OK.value()),
193193
equalTo(ServerAttributes.SERVER_ADDRESS, "localhost"),
194194
equalTo(ServerAttributes.SERVER_PORT, (long) server.getPort())))
195-
.hasEventsSatisfyingExactly(events.toArray(new Consumer[0])),
195+
.satisfies(
196+
spanData ->
197+
assertThat(spanData.getEvents())
198+
.satisfiesExactlyInAnyOrder(
199+
events.toArray(new Consumer[0]))),
196200
span ->
197201
span.hasName("example.Greeter/Conversation")
198202
.hasKind(SpanKind.SERVER)
@@ -211,7 +215,11 @@ public void onCompleted() {
211215
satisfies(
212216
NetworkAttributes.NETWORK_PEER_PORT,
213217
val -> assertThat(val).isNotNull()))
214-
.hasEventsSatisfyingExactly(events.toArray(new Consumer[0]))));
218+
.satisfies(
219+
spanData ->
220+
assertThat(spanData.getEvents())
221+
.satisfiesExactlyInAnyOrder(
222+
events.toArray(new Consumer[0])))));
215223
testing()
216224
.waitAndAssertMetrics(
217225
"io.opentelemetry.grpc-1.6",

0 commit comments

Comments
 (0)