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

GH-1984 Fix applicationMetrics initialization

Browse Source 
Resolves #1984
This commit is contained in:
Oleg Zhurakousky
2020-06-22 11:09:19 +02:00
parent cc6a572a16
commit 49cc33fb4c
1 changed files with 12 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
spring-cloud-stream/src/main/java/org/springframework/cloud/stream/function/FunctionConfiguration.java
View File

@@ -326,9 +326,18 @@ public class FunctionConfiguration {
String functionDefinition = bindableProxyFactory instanceof BindableFunctionProxyFactory
? ((BindableFunctionProxyFactory) bindableProxyFactory).getFunctionDefinition()
: this.functionProperties.getDefinition();
FunctionInvocationWrapper function = functionCatalog.lookup(functionDefinition);
if (function != null && !function.isSupplier()) {
this.bindFunctionToDestinations(bindableProxyFactory, functionDefinition);
boolean shouldNotProcess = false;
if (!(bindableProxyFactory instanceof BindableFunctionProxyFactory)) {
Set<String> outputBindingNames = bindableProxyFactory.getOutputs();
shouldNotProcess = !CollectionUtils.isEmpty(outputBindingNames)
&& outputBindingNames.iterator().next().equals("applicationMetrics");
}
if (StringUtils.hasText(functionDefinition) && !shouldNotProcess) {
FunctionInvocationWrapper function = functionCatalog.lookup(functionDefinition);
if (function != null && !function.isSupplier()) {
this.bindFunctionToDestinations(bindableProxyFactory, functionDefinition);
}
}
}
}