From 62ffbc12b614032fea650c995aaad2bc0c2fc3c9 Mon Sep 17 00:00:00 2001
From: Oleg Zhurakousky <ozhurakousky@vmware.com>
Date: Thu, 27 Oct 2022 15:16:45 +0200
Subject: [PATCH] SLEUTH-2051 Ensure that sleuth is not applied when reactive
 and non-message inputs are used

---
 .../cloud/function/context/catalog/FunctionAroundWrapper.java  | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/spring-cloud-function-context/src/main/java/org/springframework/cloud/function/context/catalog/FunctionAroundWrapper.java b/spring-cloud-function-context/src/main/java/org/springframework/cloud/function/context/catalog/FunctionAroundWrapper.java
index 49ff7454a..92a364dad 100644
--- a/spring-cloud-function-context/src/main/java/org/springframework/cloud/function/context/catalog/FunctionAroundWrapper.java
+++ b/spring-cloud-function-context/src/main/java/org/springframework/cloud/function/context/catalog/FunctionAroundWrapper.java
@@ -40,7 +40,8 @@ public abstract class FunctionAroundWrapper implements BiFunction<Object, Functi
 		String functionalTracingEnabledStr = System.getProperty("spring.sleuth.function.enabled");
 		boolean functionalTracingEnabled = StringUtils.hasText(functionalTracingEnabledStr)
 				? Boolean.parseBoolean(functionalTracingEnabledStr) : true;
-		if (functionalTracingEnabled) {
+		if (functionalTracingEnabled && !targetFunction.isInputTypePublisher() &&
+				input instanceof Message && !FunctionTypeUtils.isCollectionOfMessage(targetFunction.getOutputType())) {
 			boolean isSkipOutputConversion = targetFunction.isSkipOutputConversion();
 			targetFunction.setSkipOutputConversion(true);
 			try {