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

Propagate Reactor context over headers (#8591)

Browse Source 
* Propagate Reactor context over headers

When we do something like `Flux.from(Publisher)`
and don't compose it with the one involved in the `Subscriber` context,
we lose this context.

* Provide a mechanism to propagate a Reactor context over message header
produce within that context.
* Restore this context in the `FluxMessageChannel` for a new publisher
we use in this channel

**Cherry-pick to `6.0.x`**

* Fix language in docs

Co-authored-by: Gary Russell <grussell@vmware.com>

---------

Co-authored-by: Gary Russell <grussell@vmware.com>
This commit is contained in:
Artem Bilan
2023-04-10 11:53:45 -04:00
committed by GitHub
parent 6dcdfa8fe4
commit 4f5250b470
6 changed files with 148 additions and 24 deletions
Download Patch File Download Diff File Expand all files Collapse all files

21
spring-integration-rsocket/src/main/java/org/springframework/integration/rsocket/inbound/RSocketInboundGateway.java
View File

@@ -22,6 +22,7 @@ import java.util.concurrent.atomic.AtomicReference;
import org.reactivestreams.Publisher;
import reactor.core.publisher.Flux;
import reactor.core.publisher.Mono;
import reactor.util.context.ContextView;
import org.springframework.core.ReactiveAdapter;
import org.springframework.core.ResolvableType;
@@ -29,6 +30,7 @@ import org.springframework.core.codec.Decoder;
import org.springframework.core.codec.Encoder;
import org.springframework.core.io.buffer.DataBuffer;
import org.springframework.core.io.buffer.DataBufferFactory;
import org.springframework.integration.IntegrationMessageHeaderAccessor;
import org.springframework.integration.gateway.MessagingGatewaySupport;
import org.springframework.integration.rsocket.AbstractRSocketConnector;
import org.springframework.integration.rsocket.ClientRSocketConnector;
@@ -151,7 +153,7 @@ public class RSocketInboundGateway extends MessagingGatewaySupport implements In
/**
* Specify the type of payload to be generated when the inbound RSocket request
* content is read by the converters/encoders.
* By default this value is null which means at runtime any "text" Content-Type will
* By default, this value is null which means at runtime any "text" Content-Type will
* result in String while all others default to {@code byte[].class}.
* @param requestElementType The payload type.
*/
@@ -212,11 +214,24 @@ public class RSocketInboundGateway extends MessagingGatewaySupport implements In
}
else {
return requestMono
.doOnNext(this::send)
.then();
.flatMap((message) ->
Mono.deferContextual((context) ->
Mono.just(message)
.handle((messageToSend, sink) ->
send(messageWithReactorContextIfAny(messageToSend, context)))));
}
}
private Message<?> messageWithReactorContextIfAny(Message<?> message, ContextView context) {
if (!context.isEmpty()) {
return getMessageBuilderFactory()
.fromMessage(message)
.setHeader(IntegrationMessageHeaderAccessor.REACTOR_CONTEXT, context)
.build();
}
return message;
}
private Mono<Message<?>> decodeRequestMessage(Message<?> requestMessage) {
Object data = decodePayload(requestMessage);
if (data == null) {