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

Merge pull request #12124 from Jon Schneider 

* gh-12124:
  Polish "Bind StatsD queue gauges"
  Bind StatsD queue gauges
This commit is contained in:
Andy Wilkinson 2018-02-19 21:24:32 +00:00
parent c7fafacb8d 22bac1b54e
commit ef19b04206
2 changed files with 9 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
spring-boot-project/spring-boot-actuator-autoconfigure/src/main/java/org/springframework/boot/actuate/autoconfigure/metrics/export/statsd/StatsdMetricsExportAutoConfiguration.java
View File

@ -20,6 +20,7 @@ import io.micrometer.core.instrument.Clock;
import io.micrometer.core.instrument.util.HierarchicalNameMapper; import io.micrometer.core.instrument.util.HierarchicalNameMapper;
import io.micrometer.statsd.StatsdConfig; import io.micrometer.statsd.StatsdConfig;
import io.micrometer.statsd.StatsdMeterRegistry; 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.CompositeMeterRegistryAutoConfiguration;
import org.springframework.boot.actuate.autoconfigure.metrics.MetricsAutoConfiguration; import org.springframework.boot.actuate.autoconfigure.metrics.MetricsAutoConfiguration;
@ -70,4 +71,9 @@ public class StatsdMetricsExportAutoConfiguration {
return HierarchicalNameMapper.DEFAULT; return HierarchicalNameMapper.DEFAULT;
} }
@Bean
public StatsdMetrics statsdMetrics() {
return new StatsdMetrics();
}
} }

5
spring-boot-project/spring-boot-actuator-autoconfigure/src/test/java/org/springframework/boot/actuate/autoconfigure/metrics/export/statsd/StatsdMetricsExportAutoConfigurationTests.java
View File

@ -56,12 +56,13 @@ public class StatsdMetricsExportAutoConfigurationTests {
} }
@Test @Test
public void autoConfiguresItsConfigMeterRegistryAndNameMapper() { public void autoConfiguresItsConfigMeterRegistryNameMapperAndMetrics() {
this.contextRunner.withUserConfiguration(BaseConfiguration.class) this.contextRunner.withUserConfiguration(BaseConfiguration.class)
.run((context) -> assertThat(context) .run((context) -> assertThat(context)
.hasSingleBean(StatsdMeterRegistry.class) .hasSingleBean(StatsdMeterRegistry.class)
.hasSingleBean(StatsdConfig.class) .hasSingleBean(StatsdConfig.class)
.hasSingleBean(HierarchicalNameMapper.class)); .hasSingleBean(HierarchicalNameMapper.class)
.hasSingleBean(StatsdMetrics.class));
} }
@Test @Test