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

Fix previous commit

Browse Source
This commit is contained in:
Oleg Zhurakousky
2021-07-28 12:39:42 +02:00
parent bd4fcfd1cb
commit f1d72227c3
1 changed files with 8 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
spring-cloud-sleuth-instrumentation/src/main/java/org/springframework/cloud/sleuth/instrument/messaging/TraceFunctionAroundWrapper.java
View File

@@ -87,20 +87,18 @@ public class TraceFunctionAroundWrapper extends FunctionAroundWrapper
protected Object doApply(Message<byte[]> message, SimpleFunctionRegistry.FunctionInvocationWrapper targetFunction) {
/*
* This code is temporary to disable conditions for which this interceptor is not ready.
* For example,
* - it does not handle properly input or output of type Publisher
* - it wraps output in Message when function returns a Collection<Message> which it should not do.
* This code is temporary to disable conditions for which this interceptor is not
* ready. For example, - it does not handle properly input or output of type
* Publisher - it wraps output in Message when function returns a
* Collection<Message> which it should not do.
*
*/
if ( (!FunctionTypeUtils.isCollectionOfMessage(targetFunction.getOutputType()) && !targetFunction.isOutputTypePublisher())
|| (targetFunction.isSupplier() && !targetFunction.isOutputTypePublisher())
) {
return targetFunction.apply(message); // no instrumentation
if ((FunctionTypeUtils.isCollectionOfMessage(targetFunction.getOutputType())
|| targetFunction.isOutputTypePublisher())
|| (targetFunction.isSupplier() && targetFunction.isOutputTypePublisher())) {
return targetFunction.apply(message); // no instrumentation
}
MessageAndSpans invocationMessage = null;
Span span;
if (message == null && targetFunction.isSupplier()) { // Supplier