From 53e872bf4cf737959187202b3d308ddb09e02c8a Mon Sep 17 00:00:00 2001 From: Jon Schneider Date: Mon, 19 Feb 2018 13:53:31 -0600 Subject: [PATCH 1/2] Bind StatsD queue gauges See gh-12124 --- .../export/statsd/StatsdMetricsExportAutoConfiguration.java | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/spring-boot-project/spring-boot-actuator-autoconfigure/src/main/java/org/springframework/boot/actuate/autoconfigure/metrics/export/statsd/StatsdMetricsExportAutoConfiguration.java b/spring-boot-project/spring-boot-actuator-autoconfigure/src/main/java/org/springframework/boot/actuate/autoconfigure/metrics/export/statsd/StatsdMetricsExportAutoConfiguration.java index 30da539934..ca39716f7b 100644 --- a/spring-boot-project/spring-boot-actuator-autoconfigure/src/main/java/org/springframework/boot/actuate/autoconfigure/metrics/export/statsd/StatsdMetricsExportAutoConfiguration.java +++ b/spring-boot-project/spring-boot-actuator-autoconfigure/src/main/java/org/springframework/boot/actuate/autoconfigure/metrics/export/statsd/StatsdMetricsExportAutoConfiguration.java @@ -20,6 +20,7 @@ import io.micrometer.core.instrument.Clock; import io.micrometer.core.instrument.util.HierarchicalNameMapper; import io.micrometer.statsd.StatsdConfig; import io.micrometer.statsd.StatsdMeterRegistry; +import io.micrometer.statsd.StatsdMetrics; import org.springframework.boot.actuate.autoconfigure.metrics.CompositeMeterRegistryAutoConfiguration; import org.springframework.boot.actuate.autoconfigure.metrics.MetricsAutoConfiguration; @@ -70,4 +71,8 @@ public class StatsdMetricsExportAutoConfiguration { return HierarchicalNameMapper.DEFAULT; } + @Bean + public StatsdMetrics statsdMetrics() { + return new StatsdMetrics(); + } } From 22bac1b54e1dcd0eb6ed34abadeaf0adf5370003 Mon Sep 17 00:00:00 2001 From: Andy Wilkinson Date: Mon, 19 Feb 2018 21:22:19 +0000 Subject: [PATCH 2/2] Polish "Bind StatsD queue gauges" Closes gh-12124 --- .../export/statsd/StatsdMetricsExportAutoConfiguration.java | 1 + .../statsd/StatsdMetricsExportAutoConfigurationTests.java | 5 +++-- 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/spring-boot-project/spring-boot-actuator-autoconfigure/src/main/java/org/springframework/boot/actuate/autoconfigure/metrics/export/statsd/StatsdMetricsExportAutoConfiguration.java b/spring-boot-project/spring-boot-actuator-autoconfigure/src/main/java/org/springframework/boot/actuate/autoconfigure/metrics/export/statsd/StatsdMetricsExportAutoConfiguration.java index ca39716f7b..0eeff49a10 100644 --- a/spring-boot-project/spring-boot-actuator-autoconfigure/src/main/java/org/springframework/boot/actuate/autoconfigure/metrics/export/statsd/StatsdMetricsExportAutoConfiguration.java +++ b/spring-boot-project/spring-boot-actuator-autoconfigure/src/main/java/org/springframework/boot/actuate/autoconfigure/metrics/export/statsd/StatsdMetricsExportAutoConfiguration.java @@ -75,4 +75,5 @@ public class StatsdMetricsExportAutoConfiguration { public StatsdMetrics statsdMetrics() { return new StatsdMetrics(); } + } diff --git a/spring-boot-project/spring-boot-actuator-autoconfigure/src/test/java/org/springframework/boot/actuate/autoconfigure/metrics/export/statsd/StatsdMetricsExportAutoConfigurationTests.java b/spring-boot-project/spring-boot-actuator-autoconfigure/src/test/java/org/springframework/boot/actuate/autoconfigure/metrics/export/statsd/StatsdMetricsExportAutoConfigurationTests.java index 53c4ea56b1..9348287e92 100644 --- a/spring-boot-project/spring-boot-actuator-autoconfigure/src/test/java/org/springframework/boot/actuate/autoconfigure/metrics/export/statsd/StatsdMetricsExportAutoConfigurationTests.java +++ b/spring-boot-project/spring-boot-actuator-autoconfigure/src/test/java/org/springframework/boot/actuate/autoconfigure/metrics/export/statsd/StatsdMetricsExportAutoConfigurationTests.java @@ -56,12 +56,13 @@ public class StatsdMetricsExportAutoConfigurationTests { } @Test - public void autoConfiguresItsConfigMeterRegistryAndNameMapper() { + public void autoConfiguresItsConfigMeterRegistryNameMapperAndMetrics() { this.contextRunner.withUserConfiguration(BaseConfiguration.class) .run((context) -> assertThat(context) .hasSingleBean(StatsdMeterRegistry.class) .hasSingleBean(StatsdConfig.class) - .hasSingleBean(HierarchicalNameMapper.class)); + .hasSingleBean(HierarchicalNameMapper.class) + .hasSingleBean(StatsdMetrics.class)); } @Test