Skip to content

RabbitHealthIndicator reports an error when version is missing from the connection's server properties #48484

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

Closed
youngledo wants to merge 1 commit into from
+12 −2
Closed

RabbitHealthIndicator reports an error when version is missing from the connection's server properties #48484

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
3 changes: 1 addition & 2 deletions ...g-boot-amqp/src/main/java/org/springframework/boot/amqp/health/RabbitHealthIndicator.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -52,8 +52,7 @@ protected void doHealthCheck(Health.Builder builder) throws Exception {

private @Nullable String getVersion() {
return this.rabbitTemplate.execute((channel) -> {
Object version = channel.getConnection().getServerProperties().get("version");
Assert.state(version != null, "'version' must not be null");
Object version = channel.getConnection().getServerProperties().getOrDefault("version", "unknown");
return version.toString();
});
}
Expand Down
11 changes: 11 additions & 0 deletions ...t-amqp/src/test/java/org/springframework/boot/amqp/health/RabbitHealthIndicatorTests.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -78,6 +78,17 @@ void healthWhenConnectionFailsShouldReturnDown() {
assertThat(health.getStatus()).isEqualTo(Status.DOWN);
}

@Test
void healthWhenVersionIsMissingShouldReturnUpWithUnknownVersion() {
givenTemplateExecutionWillInvokeCallback();
Connection connection = mock(Connection.class);
given(this.channel.getConnection()).willReturn(connection);
given(connection.getServerProperties()).willReturn(Collections.emptyMap());
Health health = new RabbitHealthIndicator(this.rabbitTemplate).health();
assertThat(health.getStatus()).isEqualTo(Status.UP);
assertThat(health.getDetails()).containsEntry("version", "unknown");
}

private void givenTemplateExecutionWillInvokeCallback() {
given(this.rabbitTemplate.execute(any())).willAnswer((invocation) -> {
ChannelCallback<?> callback = invocation.getArgument(0);
Expand Down
Loading