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

Remove skipConversion in FunctionAroundWrapper

Browse Source 
Currently, the `FunctionAroundWrapper` set `targetFunction.setSkipOutputConversion(true);`
which is not what expected by the `TraceFunctionAroundWrapper`.
This one has a logic based on the `Message` as an output from the target function
and its headers to correlate tracing headers.

* Remove the `setSkipOutputConversion(true)` from the `FunctionAroundWrapper`
to satisfy `TraceFunctionAroundWrapper` expectation - we cannot enforce
all the end-user function to always return a `Message<?>` for us.
* Some other refactoring in the `FunctionAroundWrapper` for cleaner code

**Cherry-pick to `3.2.x`**
This commit is contained in:
Artem Bilan
2022-02-02 12:07:55 -05:00
committed by Oleg Zhurakousky
parent 4a0f686b36
commit d4aa4f0e41
1 changed files with 7 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

19
spring-cloud-function-context/src/main/java/org/springframework/cloud/function/context/catalog/FunctionAroundWrapper.java
View File

@@ -1,5 +1,5 @@
/* /*
* Copyright 2020-2020 the original author or authors. * Copyright 2020-2022 the original author or authors.
* *
* Licensed under the Apache License, Version 2.0 (the "License"); * Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License. * you may not use this file except in compliance with the License.
@@ -27,10 +27,11 @@ import org.springframework.util.StringUtils;
* If registered as bean it will be autowired into {@link FunctionInvocationWrapper}. * If registered as bean it will be autowired into {@link FunctionInvocationWrapper}.
* Keep in mind that it only affects imperative invocations where input is {@link Message} * Keep in mind that it only affects imperative invocations where input is {@link Message}
* *
* NOTE: This API is experimental and and could change without notice. It is * NOTE: This API is experimental and could change without notice. It is
* intended for internal use only (e.g., spring-cloud-sleuth) * intended for internal use only (e.g., spring-cloud-sleuth)
* *
* @author Oleg Zhurakousky * @author Oleg Zhurakousky
* @author Artem Bilan
* @since 3.1 * @since 3.1
*/ */
public abstract class FunctionAroundWrapper implements BiFunction<Object, FunctionInvocationWrapper, Object> { public abstract class FunctionAroundWrapper implements BiFunction<Object, FunctionInvocationWrapper, Object> {
@@ -38,17 +39,10 @@ public abstract class FunctionAroundWrapper implements BiFunction<Object, Functi
@Override @Override
public final Object apply(Object input, FunctionInvocationWrapper targetFunction) { public final Object apply(Object input, FunctionInvocationWrapper targetFunction) {
String functionalTracingEnabledStr = System.getProperty("spring.sleuth.function.enabled"); String functionalTracingEnabledStr = System.getProperty("spring.sleuth.function.enabled");
boolean functionalTracingEnabled = StringUtils.hasText(functionalTracingEnabledStr) boolean functionalTracingEnabled =
? Boolean.parseBoolean(functionalTracingEnabledStr) : true; !StringUtils.hasText(functionalTracingEnabledStr) || Boolean.parseBoolean(functionalTracingEnabledStr);
if (functionalTracingEnabled) { if (functionalTracingEnabled) {
boolean isSkipOutputConversion = targetFunction.isSkipOutputConversion(); return this.doApply(input, targetFunction);
targetFunction.setSkipOutputConversion(true);
try {
return this.doApply(input, targetFunction);
}
finally {
targetFunction.setSkipOutputConversion(isSkipOutputConversion);
}
} }
else { else {
return targetFunction.apply(input); return targetFunction.apply(input);
@@ -56,4 +50,5 @@ public abstract class FunctionAroundWrapper implements BiFunction<Object, Functi
} }
protected abstract Object doApply(Object input, FunctionInvocationWrapper targetFunction); protected abstract Object doApply(Object input, FunctionInvocationWrapper targetFunction);
} }