Skip to content

Commit b632f3e

Browse files
authored
fix(health): show health error details (#161)
* fix(deps): update dependencies * fix(health): show health error details
1 parent 7256cf0 commit b632f3e

5 files changed

Lines changed: 7 additions & 11 deletions

File tree

build.gradle

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@ plugins {
1515
id 'org.sonarqube' version '7.2.2.6593'
1616
id 'org.springframework.boot' version '4.0.1' apply false
1717
id 'io.github.gradle-nexus.publish-plugin' version '2.0.0'
18-
id 'co.com.bancolombia.cleanArchitecture' version '4.0.4'
18+
id 'co.com.bancolombia.cleanArchitecture' version '4.0.5'
1919
}
2020

2121
repositories {

samples/async/async-sender-client/src/main/resources/application.yaml

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -15,5 +15,6 @@ management:
1515
include: health,prometheus
1616
app:
1717
async:
18-
createTopology: true
19-
listenReplies: true
18+
app:
19+
createTopology: true
20+
listenReplies: true

starters/async-commons-starter/src/main/java/org/reactivecommons/async/starter/config/health/ReactiveCommonsHealthIndicator.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -32,7 +32,7 @@ protected Mono<Health> doHealthCheck(Health.Builder builder) {
3232
private Health.Builder reduceHealth(Health.Builder builder, RCHealth health) {
3333
String domain = health.details().getOrDefault(DOMAIN, UNKNOWN).toString();
3434
if (health.status().equals(RCHealth.Status.DOWN)) {
35-
log.error("Broker of domain {} is down", domain);
35+
log.error("Broker of domain {} is down {}", domain, health.details());
3636
return builder.down().withDetail(domain, health.details());
3737
}
3838
return builder.withDetail(domain, health.details());

starters/async-rabbit-starter/src/main/java/org/reactivecommons/async/rabbit/health/RabbitReactiveHealthIndicator.java

Lines changed: 1 addition & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -2,14 +2,11 @@
22

33
import com.rabbitmq.client.Connection;
44
import com.rabbitmq.client.ConnectionFactory;
5-
import lombok.SneakyThrows;
65
import lombok.extern.log4j.Log4j2;
76
import org.reactivecommons.async.starter.config.health.RCHealth;
87
import org.reactivecommons.async.starter.config.health.RCHealthIndicator;
98
import reactor.core.publisher.Mono;
109

11-
import java.net.SocketException;
12-
1310
import static org.reactivecommons.async.starter.config.health.ReactiveCommonsHealthIndicator.DOMAIN;
1411
import static org.reactivecommons.async.starter.config.health.ReactiveCommonsHealthIndicator.VERSION;
1512

@@ -21,7 +18,6 @@ public class RabbitReactiveHealthIndicator extends RCHealthIndicator {
2118
public RabbitReactiveHealthIndicator(String domain, ConnectionFactory connectionFactory) {
2219
this.domain = domain;
2320
this.connectionFactory = connectionFactory.clone();
24-
this.connectionFactory.useBlockingIo();
2521
}
2622

2723
@Override
@@ -31,13 +27,12 @@ public Mono<RCHealth> doHealthCheck(RCHealth.RCHealthBuilder builder) {
3127
.map(status -> builder.up().withDetail(VERSION, status).build());
3228
}
3329

34-
@SneakyThrows
3530
private String getRawVersion(ConnectionFactory factory) {
3631
Connection connection = null;
3732
try {
3833
connection = factory.newConnection();
3934
return connection.getServerProperties().get(VERSION).toString();
40-
} catch (SocketException e) {
35+
} catch (Exception e) {
4136
log.warn("Identified error", e);
4237
throw new RabbitMQHealthException(e);
4338
} finally {

starters/async-rabbit-starter/src/test/java/org/reactivecommons/async/rabbit/health/RabbitReactiveHealthIndicatorTest.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -84,7 +84,7 @@ void shouldBeDown() throws IOException, TimeoutException {
8484
Mono<RCHealth> result = indicator.doHealthCheck(RCHealth.builder());
8585
// Assert
8686
StepVerifier.create(result)
87-
.expectError(TimeoutException.class)
87+
.expectError(RabbitMQHealthException.class)
8888
.verify();
8989
}
9090

0 commit comments

Comments
 (0)