Skip to content

fix(health): Use blocking IO for health indicator connection #114

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.

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

Merged
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
Original file line number Diff line number Diff line change
Expand Up @@ -2,30 +2,35 @@

import com.rabbitmq.client.Connection;
import com.rabbitmq.client.ConnectionFactory;
import lombok.RequiredArgsConstructor;
import lombok.SneakyThrows;
import lombok.extern.log4j.Log4j2;
import org.reactivecommons.async.rabbit.config.ConnectionFactoryProvider;
import org.reactivecommons.async.rabbit.config.ConnectionManager;
import org.springframework.boot.actuate.health.AbstractReactiveHealthIndicator;
import org.springframework.boot.actuate.health.Health;
import reactor.core.publisher.Mono;

import java.net.SocketException;
import java.util.Map;
import java.util.stream.Collectors;

@Log4j2
@RequiredArgsConstructor
public class DomainRabbitReactiveHealthIndicator extends AbstractReactiveHealthIndicator {
private static final String VERSION = "version";
private final ConnectionManager manager;
private final Map<String, ConnectionFactory> domainProviders;

public DomainRabbitReactiveHealthIndicator(ConnectionManager manager) {
this.domainProviders = manager.getProviders().entrySet().stream()
.collect(Collectors.toMap(Map.Entry::getKey, entry -> {
ConnectionFactory connection = entry.getValue().getProvider().getConnectionFactory().clone();
connection.useBlockingIo();
return connection;
}));
}

@Override
protected Mono<Health> doHealthCheck(Health.Builder builder) {
return Mono.zip(manager.getProviders()
.entrySet()
.stream()
.map(entry -> checkSingle(entry.getKey(), entry.getValue().getProvider()))
return Mono.zip(domainProviders.entrySet().stream()
.map(entry -> checkSingle(entry.getKey(), entry.getValue()))
.collect(Collectors.toList()), this::merge);
}

Expand All @@ -38,17 +43,11 @@ private Health merge(Object[] results) {
return builder.build();
}

private Mono<Status> checkSingle(String domain, ConnectionFactoryProvider provider) {
return Mono.defer(() -> getVersion(provider))
private Mono<Status> checkSingle(String domain, ConnectionFactory connectionFactory) {
return Mono.defer(() -> Mono.just(getRawVersion(connectionFactory)))
.map(version -> Status.builder().version(version).domain(domain).build());
}

private Mono<String> getVersion(ConnectionFactoryProvider provider) {
return Mono.just(provider)
.map(ConnectionFactoryProvider::getConnectionFactory)
.map(this::getRawVersion);
}

@SneakyThrows
private String getRawVersion(ConnectionFactory factory) {
Connection connection = null;
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -37,12 +37,14 @@ public class DomainRabbitReactiveHealthIndicatorTest {

@BeforeEach
void setup() {
when(provider.getConnectionFactory()).thenReturn(factory);
when(factory.clone()).thenReturn(factory);

ConnectionManager connectionManager = new ConnectionManager();
connectionManager.addDomain(DEFAULT_DOMAIN, null, null, provider);
connectionManager.addDomain("domain2", null, null, provider);
connectionManager.addDomain("domain3", null, null, provider);
indicator = new DomainRabbitReactiveHealthIndicator(connectionManager);
when(provider.getConnectionFactory()).thenReturn(factory);
}

@Test
Expand Down
Loading