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

Supports null result in function wrapping

Browse Source
This commit is contained in:
Marcin Grzejszczak
2020-08-26 14:28:31 +02:00
parent a7ffc92e9d
commit f37d9f4da0
2 changed files with 10 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
spring-cloud-sleuth-core/src/main/java/org/springframework/cloud/sleuth/instrument/messaging/TraceFunctionAutoConfiguration.java
View File

@@ -107,6 +107,12 @@ class TraceFunctionAroundWrapper extends FunctionAroundWrapper
traceMessageHandler.afterMessageHandled(wrappedInputMessage.childSpan,
throwable);
}
if (result == null) {
if (log.isDebugEnabled()) {
log.debug("Returned message is null - we have a consumer");
}
return null;
}
Message msgResult = toMessage(result);
MessageAndSpan wrappedOutputMessage = traceMessageHandler.wrapOutputMessage(
msgResult,

5
spring-cloud-sleuth-core/src/main/java/org/springframework/cloud/sleuth/instrument/messaging/TraceSpringIntegrationAutoConfiguration.java
View File

@@ -119,8 +119,10 @@ class OnEnableBindingCondition implements ConfigurationCondition {
@Override
public boolean matches(ConditionContext context, AnnotatedTypeMetadata metadata) {
return !ObjectUtils.isEmpty(context.getBeanFactory().getBeanNamesForAnnotation(EnableBinding.class));
return !ObjectUtils.isEmpty(
context.getBeanFactory().getBeanNamesForAnnotation(EnableBinding.class));
}
}
class OnEnableBindingMissingCondition extends OnEnableBindingCondition {
@@ -129,4 +131,5 @@ class OnEnableBindingMissingCondition extends OnEnableBindingCondition {
public boolean matches(ConditionContext context, AnnotatedTypeMetadata metadata) {
return !super.matches(context, metadata);
}
}