open-telemetry
/
opentelemetry-java-instrumentation
mirror of https://github.com/open-telemetry/opentelemetry-java-instrumentation.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Allow grpc events to appear in any order (#11484)

This commit is contained in:
Lauri Tulmin 2024-06-11 18:20:05 +03:00 committed by GitHub
parent f2648e7d95
commit 49f2687d2d
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
1 changed files with 13 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

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