Skip to content

Commit 333ac27

Browse files
committed
Stop auto-configuring a StatsdMetrics bean
StatsD no longer publishes metrics about itself and StatsDMetrics is deprecated as a result. This commit removes the auto-configuration of it. Closes gh-20836
1 parent 30201a4 commit 333ac27

File tree

2 files changed

+4
-12
lines changed

2 files changed

+4
-12
lines changed

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

Lines changed: 1 addition & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
/*
2-
* Copyright 2012-2019 the original author or authors.
2+
* Copyright 2012-2020 the original author or authors.
33
*
44
* Licensed under the Apache License, Version 2.0 (the "License");
55
* you may not use this file except in compliance with the License.
@@ -19,7 +19,6 @@
1919
import io.micrometer.core.instrument.Clock;
2020
import io.micrometer.statsd.StatsdConfig;
2121
import io.micrometer.statsd.StatsdMeterRegistry;
22-
import io.micrometer.statsd.StatsdMetrics;
2322

2423
import org.springframework.boot.actuate.autoconfigure.metrics.CompositeMeterRegistryAutoConfiguration;
2524
import org.springframework.boot.actuate.autoconfigure.metrics.MetricsAutoConfiguration;
@@ -63,9 +62,4 @@ public StatsdMeterRegistry statsdMeterRegistry(StatsdConfig statsdConfig, Clock
6362
return new StatsdMeterRegistry(statsdConfig, clock);
6463
}
6564

66-
@Bean
67-
public StatsdMetrics statsdMetrics() {
68-
return new StatsdMetrics();
69-
}
70-
7165
}

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

Lines changed: 3 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
/*
2-
* Copyright 2012-2019 the original author or authors.
2+
* Copyright 2012-2020 the original author or authors.
33
*
44
* Licensed under the Apache License, Version 2.0 (the "License");
55
* you may not use this file except in compliance with the License.
@@ -19,7 +19,6 @@
1919
import io.micrometer.core.instrument.Clock;
2020
import io.micrometer.statsd.StatsdConfig;
2121
import io.micrometer.statsd.StatsdMeterRegistry;
22-
import io.micrometer.statsd.StatsdMetrics;
2322
import org.junit.jupiter.api.Test;
2423

2524
import org.springframework.boot.autoconfigure.AutoConfigurations;
@@ -47,9 +46,8 @@ void backsOffWithoutAClock() {
4746

4847
@Test
4948
void autoConfiguresItsConfigMeterRegistryAndMetrics() {
50-
this.contextRunner.withUserConfiguration(BaseConfiguration.class)
51-
.run((context) -> assertThat(context).hasSingleBean(StatsdMeterRegistry.class)
52-
.hasSingleBean(StatsdConfig.class).hasSingleBean(StatsdMetrics.class));
49+
this.contextRunner.withUserConfiguration(BaseConfiguration.class).run((context) -> assertThat(context)
50+
.hasSingleBean(StatsdMeterRegistry.class).hasSingleBean(StatsdConfig.class));
5351
}
5452

5553
@Test

0 commit comments

Comments
 (0)