From e1b1a25021493f161bef163e68aba2537f6b85da Mon Sep 17 00:00:00 2001 From: Stephane Nicoll Date: Tue, 14 Sep 2021 09:32:47 +0200 Subject: [PATCH] Polish "Auto-configure Micrometer's Lettuce latency metrics" See gh-27865 --- .../src/main/resources/META-INF/spring.factories | 1 + .../redis/LettuceMetricsAutoConfigurationTests.java | 7 ++++++- .../src/docs/asciidoc/actuator/metrics.adoc | 4 ++-- .../spring-boot-docs/src/docs/asciidoc/attributes.adoc | 2 +- 4 files changed, 10 insertions(+), 4 deletions(-) diff --git a/spring-boot-project/spring-boot-actuator-autoconfigure/src/main/resources/META-INF/spring.factories b/spring-boot-project/spring-boot-actuator-autoconfigure/src/main/resources/META-INF/spring.factories index f0f203463f..554f906bf7 100644 --- a/spring-boot-project/spring-boot-actuator-autoconfigure/src/main/resources/META-INF/spring.factories +++ b/spring-boot-project/spring-boot-actuator-autoconfigure/src/main/resources/META-INF/spring.factories @@ -112,5 +112,6 @@ org.springframework.boot.actuate.autoconfigure.web.jersey.JerseyChildManagementC org.springframework.boot.actuate.autoconfigure.web.reactive.ReactiveManagementChildContextConfiguration,\ org.springframework.boot.actuate.autoconfigure.web.servlet.ServletManagementChildContextConfiguration,\ org.springframework.boot.actuate.autoconfigure.web.servlet.WebMvcEndpointChildContextConfiguration + org.springframework.boot.diagnostics.FailureAnalyzer=\ org.springframework.boot.actuate.autoconfigure.metrics.ValidationFailureAnalyzer diff --git a/spring-boot-project/spring-boot-actuator-autoconfigure/src/test/java/org/springframework/boot/actuate/autoconfigure/metrics/redis/LettuceMetricsAutoConfigurationTests.java b/spring-boot-project/spring-boot-actuator-autoconfigure/src/test/java/org/springframework/boot/actuate/autoconfigure/metrics/redis/LettuceMetricsAutoConfigurationTests.java index e1352dd80b..66c1d5fa42 100644 --- a/spring-boot-project/spring-boot-actuator-autoconfigure/src/test/java/org/springframework/boot/actuate/autoconfigure/metrics/redis/LettuceMetricsAutoConfigurationTests.java +++ b/spring-boot-project/spring-boot-actuator-autoconfigure/src/test/java/org/springframework/boot/actuate/autoconfigure/metrics/redis/LettuceMetricsAutoConfigurationTests.java @@ -28,6 +28,11 @@ import org.springframework.data.redis.connection.lettuce.LettuceConnectionFactor import static org.assertj.core.api.Assertions.assertThat; +/** + * Tests for {@link LettuceMetricsAutoConfiguration}. + * + * @author Antonin Arquey + */ class LettuceMetricsAutoConfigurationTests { private final ApplicationContextRunner contextRunner = new ApplicationContextRunner() @@ -39,7 +44,7 @@ class LettuceMetricsAutoConfigurationTests { .withConfiguration(AutoConfigurations.of(RedisAutoConfiguration.class)).run((context) -> { ClientResources clientResources = context.getBean(LettuceConnectionFactory.class) .getClientResources(); - assertThat(clientResources.commandLatencyRecorder()).isNotNull() + assertThat(clientResources.commandLatencyRecorder()) .isInstanceOf(MicrometerCommandLatencyRecorder.class); }); } diff --git a/spring-boot-project/spring-boot-docs/src/docs/asciidoc/actuator/metrics.adoc b/spring-boot-project/spring-boot-docs/src/docs/asciidoc/actuator/metrics.adoc index fc1e1973c7..21d637569d 100644 --- a/spring-boot-project/spring-boot-docs/src/docs/asciidoc/actuator/metrics.adoc +++ b/spring-boot-project/spring-boot-docs/src/docs/asciidoc/actuator/metrics.adoc @@ -1071,8 +1071,8 @@ Long task timers require a separate metric name and can be stacked with a short [[actuator.metrics.supported.redis]] ==== Redis Metrics -Auto-configuration will register a `MicrometerCommandLatencyRecorder` for the auto-configured `LettuceConnectionFactory`. -For more details refer to {lettuce-docs}#command.latency.metrics.micrometer[Micrometer Metrics] section of the Lettuce documentation. +Auto-configuration registers a `MicrometerCommandLatencyRecorder` for the auto-configured `LettuceConnectionFactory`. +For more details refer to the {lettuce-docs}#command.latency.metrics.micrometer[Micrometer Metrics section] of the Lettuce documentation. diff --git a/spring-boot-project/spring-boot-docs/src/docs/asciidoc/attributes.adoc b/spring-boot-project/spring-boot-docs/src/docs/asciidoc/attributes.adoc index a2c6842e40..3eb8c32455 100644 --- a/spring-boot-project/spring-boot-docs/src/docs/asciidoc/attributes.adoc +++ b/spring-boot-project/spring-boot-docs/src/docs/asciidoc/attributes.adoc @@ -101,8 +101,8 @@ :jooq-docs: https://www.jooq.org/doc/{jooq-version}/manual-single-page :junit5-docs: https://junit.org/junit5/docs/current/user-guide :kotlin-docs: https://kotlinlang.org/docs/reference/ +:lettuce-docs: https://lettuce.io/core/{lettuce-version}/reference/index.html :micrometer-docs: https://micrometer.io/docs :micrometer-concepts-docs: {micrometer-docs}/concepts :micrometer-registry-docs: {micrometer-docs}/registry :tomcat-docs: https://tomcat.apache.org/tomcat-9.0-doc -:lettuce-docs: https://lettuce.io/core/{lettuce-version}/reference/index.html \ No newline at end of file