From 604aa4d51244c2b485dec22892258fd501a39b9f Mon Sep 17 00:00:00 2001 From: Andy Wilkinson Date: Thu, 3 Nov 2022 10:49:24 +0000 Subject: [PATCH] Align auto-configured Lettuce metrics with Lettuce's defaults Closes gh-32986 --- .../redis/LettuceMetricsAutoConfiguration.java | 2 +- .../LettuceMetricsAutoConfigurationTests.java | 14 ++++++++++++++ 2 files changed, 15 insertions(+), 1 deletion(-) diff --git a/spring-boot-project/spring-boot-actuator-autoconfigure/src/main/java/org/springframework/boot/actuate/autoconfigure/metrics/redis/LettuceMetricsAutoConfiguration.java b/spring-boot-project/spring-boot-actuator-autoconfigure/src/main/java/org/springframework/boot/actuate/autoconfigure/metrics/redis/LettuceMetricsAutoConfiguration.java index c51a7a294d4..3b7bc7a8024 100644 --- a/spring-boot-project/spring-boot-actuator-autoconfigure/src/main/java/org/springframework/boot/actuate/autoconfigure/metrics/redis/LettuceMetricsAutoConfiguration.java +++ b/spring-boot-project/spring-boot-actuator-autoconfigure/src/main/java/org/springframework/boot/actuate/autoconfigure/metrics/redis/LettuceMetricsAutoConfiguration.java @@ -47,7 +47,7 @@ public class LettuceMetricsAutoConfiguration { @Bean @ConditionalOnMissingBean MicrometerOptions micrometerOptions() { - return MicrometerOptions.builder().histogram(true).build(); + return MicrometerOptions.create(); } @Bean 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 df06304e692..85787016244 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 @@ -52,6 +52,20 @@ class LettuceMetricsAutoConfigurationTests { }); } + @Test + void autoConfiguredMicrometerOptionsUsesLettucesDefaults() { + this.contextRunner.with(MetricsRun.simple()) + .withConfiguration(AutoConfigurations.of(RedisAutoConfiguration.class)).run((context) -> { + MicrometerOptions micrometerOptions = context.getBean(MicrometerOptions.class); + assertThat(micrometerOptions.isEnabled()).isEqualTo(MicrometerOptions.DEFAULT_ENABLED); + assertThat(micrometerOptions.isHistogram()).isEqualTo(MicrometerOptions.DEFAULT_HISTOGRAM); + assertThat(micrometerOptions.localDistinction()) + .isEqualTo(MicrometerOptions.DEFAULT_LOCAL_DISTINCTION); + assertThat(micrometerOptions.maxLatency()).isEqualTo(MicrometerOptions.DEFAULT_MAX_LATENCY); + assertThat(micrometerOptions.minLatency()).isEqualTo(MicrometerOptions.DEFAULT_MIN_LATENCY); + }); + } + @Test void whenUserDefinesAMicrometerOptionsBeanThenCommandLatencyRecorderUsesIt() { this.contextRunner.with(MetricsRun.simple())