Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Avoid duplicate error logging when multiple destinations per binding #2998

Merged
merged 1 commit into from
Sep 5, 2024
+34 −5
Merged

Avoid duplicate error logging when multiple destinations per binding #2998

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
27 changes: 26 additions & 1 deletion ...ration-tests/src/test/java/org/springframework/cloud/stream/binder/ErrorBindingTests.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,6 +19,7 @@
import java.util.function.Consumer;
import java.util.function.Function;

import org.assertj.core.api.InstanceOfAssertFactories;
import org.junit.jupiter.api.Test;

import org.springframework.boot.WebApplicationType;
Expand All @@ -29,6 +30,9 @@
import org.springframework.cloud.stream.binder.test.TestChannelBinderConfiguration;
import org.springframework.context.ApplicationContext;
import org.springframework.context.annotation.Bean;
import org.springframework.integration.channel.AbstractMessageChannel;
import org.springframework.integration.context.IntegrationContextUtils;
import org.springframework.integration.handler.BridgeHandler;
import org.springframework.messaging.support.GenericMessage;

import static org.assertj.core.api.Assertions.assertThat;
Expand Down Expand Up @@ -99,7 +103,7 @@ void configurationWithoutBinderSpecificErrorHandler() {

@Test
void errorBindingWithMultipleDestinationPerBinding() {
new SpringApplicationBuilder(
ApplicationContext context = new SpringApplicationBuilder(
TestChannelBinderConfiguration.getCompleteConfiguration(NoErrorHandler.class))
.web(WebApplicationType.NONE)
.run("--spring.cloud.stream.bindings.process-in-0.consumer.max-attempts=1",
Expand All @@ -108,6 +112,27 @@ void errorBindingWithMultipleDestinationPerBinding() {
"--spring.jmx.enabled=false");

// must not fail GH-2599
InputDestination source = context.getBean(InputDestination.class);
source.send(new GenericMessage<byte[]>("Hello".getBytes()));
// We validate that error is logged only once : BridgeHandler to bean 'errorChannel' subscribed only once
BinderErrorChannel binderErrorChannel = context.getBean(BinderErrorChannel.class);
assertThat(binderErrorChannel.getSubscriberCount())
.isEqualTo(2); // binderProvidedErrorHandler and BridgeHandler to bean 'errorChannel'
// The BridgeHandler bean associated with this binding bridges to 'errorChannel' bean
assertThat(
context.getBeansOfType(BridgeHandler.class)
.entrySet()
.stream()
.filter(entry -> entry.getKey().endsWith("process-in-0.errors.bridge"))
.findAny())
.isPresent()
.get()
.satisfies(bridgeHandler -> assertThat(bridgeHandler.getValue().getOutputChannel())
.isNotNull()
.asInstanceOf(InstanceOfAssertFactories.type(AbstractMessageChannel.class))
.extracting(AbstractMessageChannel::getBeanName)
.isEqualTo(IntegrationContextUtils.ERROR_CHANNEL_BEAN_NAME)
);
}

@EnableAutoConfiguration
Expand Down
12 changes: 8 additions & 4 deletions ...m/src/main/java/org/springframework/cloud/stream/binder/AbstractMessageChannelBinder.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -886,10 +886,14 @@ protected final ErrorInfrastructure registerErrorInfrastructure(

// Setup a bridge to global errorChannel to ensure logging of errors could be controlled via standard SI way
if (this.getApplicationContext().containsBean(IntegrationContextUtils.ERROR_CHANNEL_BEAN_NAME) && this.isSubscribable(binderErrorChannel)) {
SubscribableChannel globalErrorChannel = this.getApplicationContext().getBean(IntegrationContextUtils.ERROR_CHANNEL_BEAN_NAME, SubscribableChannel.class);
BridgeHandler bridge = new BridgeHandler();
bridge.setOutputChannel(globalErrorChannel);
binderErrorChannel.subscribe(bridge);
String errorBridgeHandlerName = getErrorBridgeName(destination, group, consumerProperties);
if (!getApplicationContext().containsBean(errorBridgeHandlerName)) {
SubscribableChannel globalErrorChannel = this.getApplicationContext().getBean(IntegrationContextUtils.ERROR_CHANNEL_BEAN_NAME, SubscribableChannel.class);
BridgeHandler bridge = new BridgeHandler();
bridge.setOutputChannel(globalErrorChannel);
binderErrorChannel.subscribe(bridge);
((GenericApplicationContext) getApplicationContext()).registerBean(errorBridgeHandlerName, BridgeHandler.class, () -> bridge);
}
}
return new ErrorInfrastructure(binderErrorChannel, recoverer, binderProvidedErrorHandler);
}
Expand Down
Loading