SpringCloud/spring-cloud-sleuth
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Makes ScopePassingSpanSubscriber aware of pending spans

Browse Source 
without this change e.g. Reactor Netty spans are not treated as current in the reactor flow

with this change once Reactor Netty instrumentation creates a pending span it will be treated as a parent one in the reactor flow

fixes gh-2282
This commit is contained in:
Marcin Grzejszczak
2023-04-24 15:47:14 +02:00
parent 3d198306ea
commit 45bdd9a51a
4 changed files with 74 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

28
tests/common/src/main/java/org/springframework/cloud/sleuth/instrument/web/client/HttpClientBeanPostProcessorTest.java
View File

@@ -16,10 +16,13 @@
package org.springframework.cloud.sleuth.instrument.web.client;
import java.util.concurrent.TimeUnit;
import java.util.concurrent.atomic.AtomicBoolean;
import java.util.function.BiConsumer;
import io.netty.bootstrap.Bootstrap;
import org.assertj.core.api.Assertions;
import org.awaitility.Awaitility;
import org.junit.jupiter.api.BeforeEach;
import org.junit.jupiter.api.Test;
import org.junit.jupiter.api.extension.ExtendWith;
@@ -32,7 +35,6 @@ import reactor.core.scheduler.Schedulers;
import reactor.netty.Connection;
import org.springframework.cloud.sleuth.TraceContext;
import org.springframework.cloud.sleuth.instrument.web.client.HttpClientBeanPostProcessor.PendingSpan;
import org.springframework.cloud.sleuth.instrument.web.client.HttpClientBeanPostProcessor.TracingMapConnect;
@ExtendWith(MockitoExtension.class)
@@ -58,35 +60,51 @@ public abstract class HttpClientBeanPostProcessorTest {
@Test
void mapConnect_should_setup_reactor_context_currentTraceContext() {
TracingMapConnect tracingMapConnect = new TracingMapConnect(() -> traceContext);
AtomicBoolean assertionPassed = new AtomicBoolean();
Mono<Connection> original = Mono.just(connection)
.handle(new BiConsumer<Connection, SynchronousSink<Connection>>() {
@Override
public void accept(Connection t, SynchronousSink<Connection> ctx) {
Assertions.assertThat(ctx.currentContext().get(TraceContext.class)).isSameAs(traceContext);
Assertions.assertThat(ctx.currentContext().get(PendingSpan.class)).isNotNull();
try {
Assertions.assertThat(ctx.currentContext().get(TraceContext.class)).isSameAs(traceContext);
Assertions.assertThat((Object) ctx.currentContext().get("sleuth.pending-span")).isNotNull();
assertionPassed.set(true);
}
catch (AssertionError ae) {
}
}
});
// Wrap and run the assertions
tracingMapConnect.apply(original).log().subscribe();
Awaitility.await().atMost(1, TimeUnit.SECONDS).untilTrue(assertionPassed);
}
@Test
void mapConnect_should_setup_reactor_context_no_currentTraceContext() {
TracingMapConnect tracingMapConnect = new TracingMapConnect(() -> null);
AtomicBoolean assertionPassed = new AtomicBoolean();
Mono<Connection> original = Mono.just(connection)
.handle(new BiConsumer<Connection, SynchronousSink<Connection>>() {
@Override
public void accept(Connection t, SynchronousSink<Connection> ctx) {
Assertions.assertThat(ctx.currentContext().getOrEmpty(TraceContext.class)).isEmpty();
Assertions.assertThat(ctx.currentContext().get(PendingSpan.class)).isNotNull();
try {
Assertions.assertThat(ctx.currentContext().getOrEmpty(TraceContext.class)).isEmpty();
Assertions.assertThat((Object) ctx.currentContext().get("sleuth.pending-span")).isNotNull();
assertionPassed.set(true);
}
catch (AssertionError ae) {
}
}
});
// Wrap and run the assertions
tracingMapConnect.apply(original).log().subscribe();
Awaitility.await().atMost(1, TimeUnit.SECONDS).untilTrue(assertionPassed);
}
}