This is an automated email from the ASF dual-hosted git repository.
rcordier pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/james-project.git
commit 9e1fa03a17f13171decdc89f29785d58f9b30353
Author: Quan Tran <hqt...@linagora.com>
AuthorDate: Thu Dec 28 14:09:09 2023 +0700
JAMES-3817 Only perform JMAP event bus dead letter health check if JMAP is
used
---
...tMQJmapEventBusDeadLetterQueueHealthCheck.java} | 18 +++++-------
...MailboxEventBusDeadLetterQueueHealthCheck.java} | 12 ++++----
...mapEventBusDeadLetterQueueHealthCheckTest.java} | 34 ++++------------------
...boxEventBusDeadLetterQueueHealthCheckTest.java} | 31 +++-----------------
.../james/modules/event/JMAPEventBusModule.java | 6 ++++
.../modules/event/RabbitMQEventBusModule.java | 4 +--
...itMQWebAdminServerIntegrationImmutableTest.java | 5 ++--
7 files changed, 32 insertions(+), 78 deletions(-)
diff --git
a/event-bus/distributed/src/main/java/org/apache/james/events/RabbitMQEventBusDeadLetterQueueHealthCheck.java
b/event-bus/distributed/src/main/java/org/apache/james/events/RabbitMQJmapEventBusDeadLetterQueueHealthCheck.java
similarity index 70%
copy from
event-bus/distributed/src/main/java/org/apache/james/events/RabbitMQEventBusDeadLetterQueueHealthCheck.java
copy to
event-bus/distributed/src/main/java/org/apache/james/events/RabbitMQJmapEventBusDeadLetterQueueHealthCheck.java
index 736a02126c..26d028a022 100644
---
a/event-bus/distributed/src/main/java/org/apache/james/events/RabbitMQEventBusDeadLetterQueueHealthCheck.java
+++
b/event-bus/distributed/src/main/java/org/apache/james/events/RabbitMQJmapEventBusDeadLetterQueueHealthCheck.java
@@ -30,18 +30,16 @@ import org.apache.james.core.healthcheck.Result;
import reactor.core.publisher.Mono;
import reactor.core.scheduler.Schedulers;
-public class RabbitMQEventBusDeadLetterQueueHealthCheck implements HealthCheck
{
- public static final ComponentName COMPONENT_NAME = new
ComponentName("RabbitMQEventBusDeadLetterQueueHealthCheck");
+public class RabbitMQJmapEventBusDeadLetterQueueHealthCheck implements
HealthCheck {
+ public static final ComponentName COMPONENT_NAME = new
ComponentName("RabbitMQJmapEventBusDeadLetterQueueHealthCheck");
private static final String DEFAULT_VHOST = "/";
private final RabbitMQConfiguration configuration;
- private final NamingStrategy mailboxEventNamingStrategy;
private final RabbitMQManagementAPI api;
@Inject
- public RabbitMQEventBusDeadLetterQueueHealthCheck(RabbitMQConfiguration
configuration, NamingStrategy mailboxEventNamingStrategy) {
+ public
RabbitMQJmapEventBusDeadLetterQueueHealthCheck(RabbitMQConfiguration
configuration) {
this.configuration = configuration;
- this.mailboxEventNamingStrategy = mailboxEventNamingStrategy;
this.api = RabbitMQManagementAPI.from(configuration);
}
@@ -52,16 +50,14 @@ public class RabbitMQEventBusDeadLetterQueueHealthCheck
implements HealthCheck {
@Override
public Mono<Result> check() {
- return Mono.fromCallable(() ->
api.queueDetails(configuration.getVhost().orElse(DEFAULT_VHOST),
mailboxEventNamingStrategy.deadLetterQueue().getName()).getQueueLength())
- .mergeWith(Mono.fromCallable(() ->
api.queueDetails(configuration.getVhost().orElse(DEFAULT_VHOST),
NamingStrategy.JMAP_NAMING_STRATEGY.deadLetterQueue().getName()).getQueueLength()))
- .reduce(Long::sum)
+ return Mono.fromCallable(() ->
api.queueDetails(configuration.getVhost().orElse(DEFAULT_VHOST),
NamingStrategy.JMAP_NAMING_STRATEGY.deadLetterQueue().getName()).getQueueLength())
.map(queueSize -> {
if (queueSize != 0) {
- return Result.degraded(COMPONENT_NAME, "RabbitMQ dead
letter queue of the event bus contain events. This might indicate transient
failure on event processing.");
+ return Result.degraded(COMPONENT_NAME, "RabbitMQ dead
letter queue of the JMAP event bus contain events. This might indicate
transient failure on event processing.");
}
return Result.healthy(COMPONENT_NAME);
})
- .onErrorResume(e -> Mono.just(Result.unhealthy(COMPONENT_NAME,
"Error checking RabbitMQEventBusDeadLetterHealthCheck", e)))
- .subscribeOn(Schedulers.boundedElastic()); // Reading the
management API is blocking
+ .onErrorResume(e -> Mono.just(Result.unhealthy(COMPONENT_NAME,
"Error checking RabbitMQJmapEventBusDeadLetterQueueHealthCheck", e)))
+ .subscribeOn(Schedulers.boundedElastic());
}
}
diff --git
a/event-bus/distributed/src/main/java/org/apache/james/events/RabbitMQEventBusDeadLetterQueueHealthCheck.java
b/event-bus/distributed/src/main/java/org/apache/james/events/RabbitMQMailboxEventBusDeadLetterQueueHealthCheck.java
similarity index 80%
rename from
event-bus/distributed/src/main/java/org/apache/james/events/RabbitMQEventBusDeadLetterQueueHealthCheck.java
rename to
event-bus/distributed/src/main/java/org/apache/james/events/RabbitMQMailboxEventBusDeadLetterQueueHealthCheck.java
index 736a02126c..5e0ef9da0e 100644
---
a/event-bus/distributed/src/main/java/org/apache/james/events/RabbitMQEventBusDeadLetterQueueHealthCheck.java
+++
b/event-bus/distributed/src/main/java/org/apache/james/events/RabbitMQMailboxEventBusDeadLetterQueueHealthCheck.java
@@ -30,8 +30,8 @@ import org.apache.james.core.healthcheck.Result;
import reactor.core.publisher.Mono;
import reactor.core.scheduler.Schedulers;
-public class RabbitMQEventBusDeadLetterQueueHealthCheck implements HealthCheck
{
- public static final ComponentName COMPONENT_NAME = new
ComponentName("RabbitMQEventBusDeadLetterQueueHealthCheck");
+public class RabbitMQMailboxEventBusDeadLetterQueueHealthCheck implements
HealthCheck {
+ public static final ComponentName COMPONENT_NAME = new
ComponentName("RabbitMQMailboxEventBusDeadLetterQueueHealthCheck");
private static final String DEFAULT_VHOST = "/";
private final RabbitMQConfiguration configuration;
@@ -39,7 +39,7 @@ public class RabbitMQEventBusDeadLetterQueueHealthCheck
implements HealthCheck {
private final RabbitMQManagementAPI api;
@Inject
- public RabbitMQEventBusDeadLetterQueueHealthCheck(RabbitMQConfiguration
configuration, NamingStrategy mailboxEventNamingStrategy) {
+ public
RabbitMQMailboxEventBusDeadLetterQueueHealthCheck(RabbitMQConfiguration
configuration, NamingStrategy mailboxEventNamingStrategy) {
this.configuration = configuration;
this.mailboxEventNamingStrategy = mailboxEventNamingStrategy;
this.api = RabbitMQManagementAPI.from(configuration);
@@ -53,15 +53,13 @@ public class RabbitMQEventBusDeadLetterQueueHealthCheck
implements HealthCheck {
@Override
public Mono<Result> check() {
return Mono.fromCallable(() ->
api.queueDetails(configuration.getVhost().orElse(DEFAULT_VHOST),
mailboxEventNamingStrategy.deadLetterQueue().getName()).getQueueLength())
- .mergeWith(Mono.fromCallable(() ->
api.queueDetails(configuration.getVhost().orElse(DEFAULT_VHOST),
NamingStrategy.JMAP_NAMING_STRATEGY.deadLetterQueue().getName()).getQueueLength()))
- .reduce(Long::sum)
.map(queueSize -> {
if (queueSize != 0) {
- return Result.degraded(COMPONENT_NAME, "RabbitMQ dead
letter queue of the event bus contain events. This might indicate transient
failure on event processing.");
+ return Result.degraded(COMPONENT_NAME, "RabbitMQ dead
letter queue of the mailbox event bus contain events. This might indicate
transient failure on event processing.");
}
return Result.healthy(COMPONENT_NAME);
})
- .onErrorResume(e -> Mono.just(Result.unhealthy(COMPONENT_NAME,
"Error checking RabbitMQEventBusDeadLetterHealthCheck", e)))
+ .onErrorResume(e -> Mono.just(Result.unhealthy(COMPONENT_NAME,
"Error checking RabbitMQMailboxEventBusDeadLetterQueueHealthCheck", e)))
.subscribeOn(Schedulers.boundedElastic()); // Reading the
management API is blocking
}
}
diff --git
a/event-bus/distributed/src/test/java/org/apache/james/events/RabbitMQEventBusDeadLetterQueueHealthCheckTest.java
b/event-bus/distributed/src/test/java/org/apache/james/events/RabbitMQJmapEventBusDeadLetterQueueHealthCheckTest.java
similarity index 75%
copy from
event-bus/distributed/src/test/java/org/apache/james/events/RabbitMQEventBusDeadLetterQueueHealthCheckTest.java
copy to
event-bus/distributed/src/test/java/org/apache/james/events/RabbitMQJmapEventBusDeadLetterQueueHealthCheckTest.java
index 8ed0340eed..472d713a53 100644
---
a/event-bus/distributed/src/test/java/org/apache/james/events/RabbitMQEventBusDeadLetterQueueHealthCheckTest.java
+++
b/event-bus/distributed/src/test/java/org/apache/james/events/RabbitMQJmapEventBusDeadLetterQueueHealthCheckTest.java
@@ -47,19 +47,17 @@ import com.rabbitmq.client.Channel;
import com.rabbitmq.client.Connection;
import com.rabbitmq.client.ConnectionFactory;
-class RabbitMQEventBusDeadLetterQueueHealthCheckTest {
+class RabbitMQJmapEventBusDeadLetterQueueHealthCheckTest {
@RegisterExtension
RabbitMQExtension rabbitMQExtension = RabbitMQExtension.singletonRabbitMQ()
.isolationPolicy(RabbitMQExtension.IsolationPolicy.STRONG);
public static final ImmutableMap<String, Object>
NO_QUEUE_DECLARE_ARGUMENTS = ImmutableMap.of();
- public static final NamingStrategy MAILBOX_EVENTS_NAMING_STRATEGY = new
NamingStrategy(new EventBusName("mailboxEvents"));
- public static final String ROUTING_KEY_MAILBOX_EVENTS_EVENT_BUS =
"mailboxEventsRoutingKey";
- public static final String ROUTING_KEY_JMAP_EVENTS_EVENT_BUS =
"mailboxEventsRoutingKey";
+ public static final String ROUTING_KEY_JMAP_EVENTS_EVENT_BUS =
"jmapEventsRoutingKey";
private Connection connection;
private Channel channel;
- private RabbitMQEventBusDeadLetterQueueHealthCheck testee;
+ private RabbitMQJmapEventBusDeadLetterQueueHealthCheck testee;
@BeforeEach
void setup(DockerRabbitMQ rabbitMQ) throws IOException, TimeoutException,
URISyntaxException {
@@ -67,7 +65,7 @@ class RabbitMQEventBusDeadLetterQueueHealthCheckTest {
connectionFactory.setNetworkRecoveryInterval(1000);
connection = connectionFactory.newConnection();
channel = connection.createChannel();
- testee = new
RabbitMQEventBusDeadLetterQueueHealthCheck(rabbitMQ.getConfiguration(),
MAILBOX_EVENTS_NAMING_STRATEGY);
+ testee = new
RabbitMQJmapEventBusDeadLetterQueueHealthCheck(rabbitMQ.getConfiguration());
}
@AfterEach
@@ -84,8 +82,7 @@ class RabbitMQEventBusDeadLetterQueueHealthCheckTest {
}
@Test
- void healthCheckShouldReturnHealthyWhenDeadLetterQueuesAreEmpty() throws
Exception {
- createDeadLetterQueue(channel, MAILBOX_EVENTS_NAMING_STRATEGY,
ROUTING_KEY_MAILBOX_EVENTS_EVENT_BUS);
+ void
healthCheckShouldReturnHealthyWhenJmapEventBusDeadLetterQueueIsEmpty() throws
Exception {
createDeadLetterQueue(channel, NamingStrategy.JMAP_NAMING_STRATEGY,
ROUTING_KEY_JMAP_EVENTS_EVENT_BUS);
assertThat(testee.check().block().isHealthy()).isTrue();
@@ -96,30 +93,9 @@ class RabbitMQEventBusDeadLetterQueueHealthCheckTest {
assertThat(testee.check().block().isUnHealthy()).isTrue();
}
- @Test
- void
healthCheckShouldReturnDegradedWhenMailboxEventBusDeadLetterQueueIsNotEmpty()
throws Exception {
- createDeadLetterQueue(channel, MAILBOX_EVENTS_NAMING_STRATEGY,
ROUTING_KEY_MAILBOX_EVENTS_EVENT_BUS);
- createDeadLetterQueue(channel, NamingStrategy.JMAP_NAMING_STRATEGY,
ROUTING_KEY_JMAP_EVENTS_EVENT_BUS);
- publishAMessage(channel, ROUTING_KEY_MAILBOX_EVENTS_EVENT_BUS);
-
- awaitAtMostOneMinute.until(() -> testee.check().block().isDegraded());
- }
-
@Test
void
healthCheckShouldReturnDegradedWhenJmapEventBusDeadLetterQueueIsNotEmpty()
throws Exception {
- createDeadLetterQueue(channel, MAILBOX_EVENTS_NAMING_STRATEGY,
ROUTING_KEY_MAILBOX_EVENTS_EVENT_BUS);
- createDeadLetterQueue(channel, NamingStrategy.JMAP_NAMING_STRATEGY,
ROUTING_KEY_JMAP_EVENTS_EVENT_BUS);
- publishAMessage(channel, ROUTING_KEY_JMAP_EVENTS_EVENT_BUS);
-
- awaitAtMostOneMinute.until(() -> testee.check().block().isDegraded());
- }
-
- @Test
- void healthCheckShouldReturnDegradedWhenDeadLetterQueuesAreNotEmpty()
throws Exception {
- createDeadLetterQueue(channel, MAILBOX_EVENTS_NAMING_STRATEGY,
ROUTING_KEY_MAILBOX_EVENTS_EVENT_BUS);
createDeadLetterQueue(channel, NamingStrategy.JMAP_NAMING_STRATEGY,
ROUTING_KEY_JMAP_EVENTS_EVENT_BUS);
-
- publishAMessage(channel, ROUTING_KEY_MAILBOX_EVENTS_EVENT_BUS);
publishAMessage(channel, ROUTING_KEY_JMAP_EVENTS_EVENT_BUS);
awaitAtMostOneMinute.until(() -> testee.check().block().isDegraded());
diff --git
a/event-bus/distributed/src/test/java/org/apache/james/events/RabbitMQEventBusDeadLetterQueueHealthCheckTest.java
b/event-bus/distributed/src/test/java/org/apache/james/events/RabbitMQMailboxEventBusDeadLetterQueueHealthCheckTest.java
similarity index 77%
rename from
event-bus/distributed/src/test/java/org/apache/james/events/RabbitMQEventBusDeadLetterQueueHealthCheckTest.java
rename to
event-bus/distributed/src/test/java/org/apache/james/events/RabbitMQMailboxEventBusDeadLetterQueueHealthCheckTest.java
index 8ed0340eed..b80c9edf3f 100644
---
a/event-bus/distributed/src/test/java/org/apache/james/events/RabbitMQEventBusDeadLetterQueueHealthCheckTest.java
+++
b/event-bus/distributed/src/test/java/org/apache/james/events/RabbitMQMailboxEventBusDeadLetterQueueHealthCheckTest.java
@@ -47,7 +47,7 @@ import com.rabbitmq.client.Channel;
import com.rabbitmq.client.Connection;
import com.rabbitmq.client.ConnectionFactory;
-class RabbitMQEventBusDeadLetterQueueHealthCheckTest {
+class RabbitMQMailboxEventBusDeadLetterQueueHealthCheckTest {
@RegisterExtension
RabbitMQExtension rabbitMQExtension = RabbitMQExtension.singletonRabbitMQ()
.isolationPolicy(RabbitMQExtension.IsolationPolicy.STRONG);
@@ -55,11 +55,10 @@ class RabbitMQEventBusDeadLetterQueueHealthCheckTest {
public static final ImmutableMap<String, Object>
NO_QUEUE_DECLARE_ARGUMENTS = ImmutableMap.of();
public static final NamingStrategy MAILBOX_EVENTS_NAMING_STRATEGY = new
NamingStrategy(new EventBusName("mailboxEvents"));
public static final String ROUTING_KEY_MAILBOX_EVENTS_EVENT_BUS =
"mailboxEventsRoutingKey";
- public static final String ROUTING_KEY_JMAP_EVENTS_EVENT_BUS =
"mailboxEventsRoutingKey";
private Connection connection;
private Channel channel;
- private RabbitMQEventBusDeadLetterQueueHealthCheck testee;
+ private RabbitMQMailboxEventBusDeadLetterQueueHealthCheck testee;
@BeforeEach
void setup(DockerRabbitMQ rabbitMQ) throws IOException, TimeoutException,
URISyntaxException {
@@ -67,7 +66,7 @@ class RabbitMQEventBusDeadLetterQueueHealthCheckTest {
connectionFactory.setNetworkRecoveryInterval(1000);
connection = connectionFactory.newConnection();
channel = connection.createChannel();
- testee = new
RabbitMQEventBusDeadLetterQueueHealthCheck(rabbitMQ.getConfiguration(),
MAILBOX_EVENTS_NAMING_STRATEGY);
+ testee = new
RabbitMQMailboxEventBusDeadLetterQueueHealthCheck(rabbitMQ.getConfiguration(),
MAILBOX_EVENTS_NAMING_STRATEGY);
}
@AfterEach
@@ -84,9 +83,8 @@ class RabbitMQEventBusDeadLetterQueueHealthCheckTest {
}
@Test
- void healthCheckShouldReturnHealthyWhenDeadLetterQueuesAreEmpty() throws
Exception {
+ void
healthCheckShouldReturnHealthyWhenMailboxEventBusDeadLetterQueueIsEmpty()
throws Exception {
createDeadLetterQueue(channel, MAILBOX_EVENTS_NAMING_STRATEGY,
ROUTING_KEY_MAILBOX_EVENTS_EVENT_BUS);
- createDeadLetterQueue(channel, NamingStrategy.JMAP_NAMING_STRATEGY,
ROUTING_KEY_JMAP_EVENTS_EVENT_BUS);
assertThat(testee.check().block().isHealthy()).isTrue();
}
@@ -99,32 +97,11 @@ class RabbitMQEventBusDeadLetterQueueHealthCheckTest {
@Test
void
healthCheckShouldReturnDegradedWhenMailboxEventBusDeadLetterQueueIsNotEmpty()
throws Exception {
createDeadLetterQueue(channel, MAILBOX_EVENTS_NAMING_STRATEGY,
ROUTING_KEY_MAILBOX_EVENTS_EVENT_BUS);
- createDeadLetterQueue(channel, NamingStrategy.JMAP_NAMING_STRATEGY,
ROUTING_KEY_JMAP_EVENTS_EVENT_BUS);
publishAMessage(channel, ROUTING_KEY_MAILBOX_EVENTS_EVENT_BUS);
awaitAtMostOneMinute.until(() -> testee.check().block().isDegraded());
}
- @Test
- void
healthCheckShouldReturnDegradedWhenJmapEventBusDeadLetterQueueIsNotEmpty()
throws Exception {
- createDeadLetterQueue(channel, MAILBOX_EVENTS_NAMING_STRATEGY,
ROUTING_KEY_MAILBOX_EVENTS_EVENT_BUS);
- createDeadLetterQueue(channel, NamingStrategy.JMAP_NAMING_STRATEGY,
ROUTING_KEY_JMAP_EVENTS_EVENT_BUS);
- publishAMessage(channel, ROUTING_KEY_JMAP_EVENTS_EVENT_BUS);
-
- awaitAtMostOneMinute.until(() -> testee.check().block().isDegraded());
- }
-
- @Test
- void healthCheckShouldReturnDegradedWhenDeadLetterQueuesAreNotEmpty()
throws Exception {
- createDeadLetterQueue(channel, MAILBOX_EVENTS_NAMING_STRATEGY,
ROUTING_KEY_MAILBOX_EVENTS_EVENT_BUS);
- createDeadLetterQueue(channel, NamingStrategy.JMAP_NAMING_STRATEGY,
ROUTING_KEY_JMAP_EVENTS_EVENT_BUS);
-
- publishAMessage(channel, ROUTING_KEY_MAILBOX_EVENTS_EVENT_BUS);
- publishAMessage(channel, ROUTING_KEY_JMAP_EVENTS_EVENT_BUS);
-
- awaitAtMostOneMinute.until(() -> testee.check().block().isDegraded());
- }
-
private void createDeadLetterQueue(Channel channel, NamingStrategy
namingStrategy, String routingKey) throws IOException {
channel.exchangeDeclare(EXCHANGE_NAME, DIRECT_EXCHANGE, DURABLE);
channel.queueDeclare(namingStrategy.deadLetterQueue().getName(),
DURABLE, !EXCLUSIVE, AUTO_DELETE, NO_QUEUE_DECLARE_ARGUMENTS).getQueue();
diff --git
a/server/container/guice/distributed/src/main/java/org/apache/james/modules/event/JMAPEventBusModule.java
b/server/container/guice/distributed/src/main/java/org/apache/james/modules/event/JMAPEventBusModule.java
index 429a23ed5d..803b099bbc 100644
---
a/server/container/guice/distributed/src/main/java/org/apache/james/modules/event/JMAPEventBusModule.java
+++
b/server/container/guice/distributed/src/main/java/org/apache/james/modules/event/JMAPEventBusModule.java
@@ -35,6 +35,7 @@ import org.apache.james.events.EventDeadLetters;
import org.apache.james.events.KeyReconnectionHandler;
import org.apache.james.events.RabbitEventBusConsumerHealthCheck;
import org.apache.james.events.RabbitMQEventBus;
+import org.apache.james.events.RabbitMQJmapEventBusDeadLetterQueueHealthCheck;
import org.apache.james.events.RetryBackoffConfiguration;
import org.apache.james.events.RoutingKeyConverter;
import org.apache.james.jmap.InjectionKeys;
@@ -87,6 +88,11 @@ public class JMAPEventBusModule extends AbstractModule {
return new RabbitEventBusConsumerHealthCheck(eventBus,
JMAP_NAMING_STRATEGY, connectionPool);
}
+ @ProvidesIntoSet
+ HealthCheck jmapEventBusDeadLetterQueueHealthCheck(RabbitMQConfiguration
rabbitMQConfiguration) {
+ return new
RabbitMQJmapEventBusDeadLetterQueueHealthCheck(rabbitMQConfiguration);
+ }
+
@Provides
@Singleton
@Named(InjectionKeys.JMAP)
diff --git
a/server/container/guice/distributed/src/main/java/org/apache/james/modules/event/RabbitMQEventBusModule.java
b/server/container/guice/distributed/src/main/java/org/apache/james/modules/event/RabbitMQEventBusModule.java
index 9ac96c4619..599eb666a1 100644
---
a/server/container/guice/distributed/src/main/java/org/apache/james/modules/event/RabbitMQEventBusModule.java
+++
b/server/container/guice/distributed/src/main/java/org/apache/james/modules/event/RabbitMQEventBusModule.java
@@ -32,7 +32,7 @@ import org.apache.james.events.KeyReconnectionHandler;
import org.apache.james.events.NamingStrategy;
import org.apache.james.events.RabbitEventBusConsumerHealthCheck;
import org.apache.james.events.RabbitMQEventBus;
-import org.apache.james.events.RabbitMQEventBusDeadLetterQueueHealthCheck;
+import
org.apache.james.events.RabbitMQMailboxEventBusDeadLetterQueueHealthCheck;
import org.apache.james.events.RegistrationKey;
import org.apache.james.events.RetryBackoffConfiguration;
import org.apache.james.mailbox.events.MailboxIdRegistrationKey;
@@ -70,7 +70,7 @@ public class RabbitMQEventBusModule extends AbstractModule {
reconnectionHandlerMultibinder.addBinding().to(EventBusReconnectionHandler.class);
Multibinder.newSetBinder(binder(), HealthCheck.class)
- .addBinding().to(RabbitMQEventBusDeadLetterQueueHealthCheck.class);
+
.addBinding().to(RabbitMQMailboxEventBusDeadLetterQueueHealthCheck.class);
}
@ProvidesIntoSet
diff --git
a/server/protocols/webadmin-integration-test/distributed-webadmin-integration-test/src/test/java/org/apache/james/webadmin/integration/rabbitmq/RabbitMQWebAdminServerIntegrationImmutableTest.java
b/server/protocols/webadmin-integration-test/distributed-webadmin-integration-test/src/test/java/org/apache/james/webadmin/integration/rabbitmq/RabbitMQWebAdminServerIntegrationImmutableTest.java
index af29f002f1..63f7f71a23 100644
---
a/server/protocols/webadmin-integration-test/distributed-webadmin-integration-test/src/test/java/org/apache/james/webadmin/integration/rabbitmq/RabbitMQWebAdminServerIntegrationImmutableTest.java
+++
b/server/protocols/webadmin-integration-test/distributed-webadmin-integration-test/src/test/java/org/apache/james/webadmin/integration/rabbitmq/RabbitMQWebAdminServerIntegrationImmutableTest.java
@@ -136,9 +136,10 @@ class RabbitMQWebAdminServerIntegrationImmutableTest
extends WebAdminServerInteg
assertThat(listComponentNames).containsOnly("Guice application
lifecycle", "EmptyErrorMailRepository",
"RabbitMQ backend", "RabbitMQMailQueueDeadLetterQueueHealthCheck",
- "RabbitMQEventBusDeadLetterQueueHealthCheck", "MailReceptionCheck",
+ "RabbitMQMailboxEventBusDeadLetterQueueHealthCheck",
"MailReceptionCheck",
"Cassandra backend", "EventDeadLettersHealthCheck",
"MessageFastViewProjection",
"RabbitMQMailQueue BrowseStart", "OpenSearch Backend",
"ObjectStorage", "DistributedTaskManagerConsumers",
- "EventbusConsumers-jmapEvent", "MailQueueConsumers",
"EventbusConsumers-mailboxEvent");
+ "EventbusConsumers-jmapEvent", "MailQueueConsumers",
"EventbusConsumers-mailboxEvent",
+ "RabbitMQJmapEventBusDeadLetterQueueHealthCheck");
}
}
---------------------------------------------------------------------
To unsubscribe, e-mail: notifications-unsubscr...@james.apache.org
For additional commands, e-mail: notifications-h...@james.apache.org
