Spring/spring-integration
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Optional io.micrometer:context-propagation (#8556)

Browse Source 
For better performance by default it is better to not pull
a `io.micrometer:context-propagation` a hard dependency.

* Remove `io.micrometer:context-propagation` dependency management
* It is pulled transitively by the `io.micrometer:micrometer-tracing-integration-test` in test scope
* Rework all the `ContextSnapshot` usage in the reactive code to respective recommended `handle()` API in `Flux` and `Mono`
This commit is contained in:
Artem Bilan
2023-02-21 12:02:15 -05:00
committed by GitHub
parent b482b002cb
commit ac577e9ef7
4 changed files with 34 additions and 40 deletions
Download Patch File Download Diff File Expand all files Collapse all files

29
spring-integration-webflux/src/main/java/org/springframework/integration/webflux/inbound/WebFluxInboundEndpoint.java
View File

@@ -27,7 +27,6 @@ import java.util.Set;
import java.util.function.Supplier;
import java.util.stream.Collectors;
import io.micrometer.context.ContextSnapshot;
import org.reactivestreams.Publisher;
import reactor.core.publisher.Flux;
import reactor.core.publisher.Mono;
@@ -152,20 +151,20 @@ public class WebFluxInboundEndpoint extends BaseHttpInboundEndpoint implements W
new RequestEntity<>(body, exchange.getRequest().getHeaders(),
exchange.getRequest().getMethod(), exchange.getRequest().getURI()))
.flatMap(entity -> buildMessage(entity, exchange))
.flatMap(requestTuple ->
Mono.deferContextual(contextView -> {
if (isExpectReply()) {
return sendAndReceiveMessageReactive(requestTuple.getT1())
.flatMap(replyMessage -> populateResponse(exchange, replyMessage));
}
else {
var scope = ContextSnapshot.setAllThreadLocalsFrom(contextView);
try (scope) {
send(requestTuple.getT1());
}
return setStatusCode(exchange, requestTuple.getT2());
}
}))
.flatMap(requestTuple -> {
if (isExpectReply()) {
return sendAndReceiveMessageReactive(requestTuple.getT1())
.flatMap(replyMessage -> populateResponse(exchange, replyMessage));
}
else {
return Mono.just(requestTuple.getT1())
.handle((objectMessage, synchronousSink) -> {
send(objectMessage);
synchronousSink.complete();
})
.then(setStatusCode(exchange, requestTuple.getT2()));
}
})
.doOnTerminate(this.activeCount::decrementAndGet);
}