root
/
spring-boot
mirror of https://github.com/spring-projects/spring-boot.git
1
0
Fork 0
Code Issues Actions 15 Packages Projects Releases Wiki Activity

Align auto-configured Lettuce metrics with Lettuce's defaults 

Closes gh-32986
This commit is contained in:
Andy Wilkinson 2022-11-03 10:49:24 +00:00
parent 8e08931411
commit 604aa4d512
2 changed files with 15 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
spring-boot-project/spring-boot-actuator-autoconfigure/src/main/java/org/springframework/boot/actuate/autoconfigure/metrics/redis/LettuceMetricsAutoConfiguration.java
View File

@ -47,7 +47,7 @@ public class LettuceMetricsAutoConfiguration {
@Bean
@ConditionalOnMissingBean
MicrometerOptions micrometerOptions() {
return MicrometerOptions.builder().histogram(true).build();
return MicrometerOptions.create();
}
@Bean

14
spring-boot-project/spring-boot-actuator-autoconfigure/src/test/java/org/springframework/boot/actuate/autoconfigure/metrics/redis/LettuceMetricsAutoConfigurationTests.java
View File

@ -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())