Skip to content

Commit 3942ba2

Browse files
committed
Consistently use the spring.metrics configuration property prefix
See gh-9970
1 parent 5efcbad commit 3942ba2

File tree

17 files changed

+36
-26
lines changed

17 files changed

+36
-26
lines changed

spring-boot-actuator-autoconfigure/src/main/java/org/springframework/boot/actuate/autoconfigure/metrics/export/atlas/AtlasExportConfiguration.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -44,7 +44,7 @@
4444
public class AtlasExportConfiguration {
4545

4646
@Bean
47-
@ConditionalOnProperty(value = "metrics.atlas.enabled", matchIfMissing = true)
47+
@ConditionalOnProperty(value = "spring.metrics.atlas.enabled", matchIfMissing = true)
4848
public MetricsExporter atlasExporter(AtlasConfig config, Clock clock) {
4949
return () -> new AtlasMeterRegistry(config, clock);
5050
}

spring-boot-actuator-autoconfigure/src/main/java/org/springframework/boot/actuate/autoconfigure/metrics/export/atlas/AtlasProperties.java

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -29,12 +29,12 @@
2929
* @since 2.0.0
3030
* @author Jon Schneider
3131
*/
32-
@ConfigurationProperties(prefix = "metrics.atlas")
32+
@ConfigurationProperties(prefix = "spring.metrics.atlas")
3333
public class AtlasProperties extends RegistryProperties implements AtlasConfig {
3434

3535
@Override
3636
protected String prefix() {
37-
return "atlas";
37+
return "spring.metrics.atlas";
3838
}
3939

4040
public void setStep(Duration step) {

spring-boot-actuator-autoconfigure/src/main/java/org/springframework/boot/actuate/autoconfigure/metrics/export/datadog/DatadogExportConfiguration.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -43,7 +43,7 @@
4343
public class DatadogExportConfiguration {
4444

4545
@Bean
46-
@ConditionalOnProperty(value = "metrics.datadog.enabled", matchIfMissing = true)
46+
@ConditionalOnProperty(value = "spring.metrics.datadog.enabled", matchIfMissing = true)
4747
public MetricsExporter datadogExporter(DatadogConfig config, Clock clock) {
4848
return () -> new DatadogMeterRegistry(config, clock);
4949
}

spring-boot-actuator-autoconfigure/src/main/java/org/springframework/boot/actuate/autoconfigure/metrics/export/datadog/DatadogProperties.java

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -27,12 +27,12 @@
2727
* @author Jon Schneider
2828
* @since 2.0.0
2929
*/
30-
@ConfigurationProperties(prefix = "metrics.datadog")
30+
@ConfigurationProperties(prefix = "spring.metrics.datadog")
3131
public class DatadogProperties extends StepRegistryProperties implements DatadogConfig {
3232

3333
@Override
3434
public String prefix() {
35-
return "metrics.datadog";
35+
return "spring.metrics.datadog";
3636
}
3737

3838
public DatadogProperties() {

spring-boot-actuator-autoconfigure/src/main/java/org/springframework/boot/actuate/autoconfigure/metrics/export/ganglia/GangliaExportConfiguration.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -44,7 +44,7 @@
4444
public class GangliaExportConfiguration {
4545

4646
@Bean
47-
@ConditionalOnProperty(value = "metrics.ganglia.enabled", matchIfMissing = true)
47+
@ConditionalOnProperty(value = "spring.metrics.ganglia.enabled", matchIfMissing = true)
4848
public MetricsExporter gangliaExporter(GangliaConfig config,
4949
HierarchicalNameMapper nameMapper, Clock clock) {
5050
return () -> new GangliaMeterRegistry(config, nameMapper, clock);

spring-boot-actuator-autoconfigure/src/main/java/org/springframework/boot/actuate/autoconfigure/metrics/export/ganglia/GangliaProperties.java

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -31,12 +31,12 @@
3131
* @author Jon Schneider
3232
* @since 2.0.0
3333
*/
34-
@ConfigurationProperties(prefix = "metrics.ganglia")
34+
@ConfigurationProperties(prefix = "spring.metrics.ganglia")
3535
public class GangliaProperties extends RegistryProperties implements GangliaConfig {
3636

3737
@Override
3838
public String prefix() {
39-
return "metrics.ganglia";
39+
return "spring.metrics.ganglia";
4040
}
4141

4242
public void setStep(Duration step) {

spring-boot-actuator-autoconfigure/src/main/java/org/springframework/boot/actuate/autoconfigure/metrics/export/graphite/GraphiteExportConfiguration.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -44,7 +44,7 @@
4444
public class GraphiteExportConfiguration {
4545

4646
@Bean
47-
@ConditionalOnProperty(value = "metrics.graphite.enabled", matchIfMissing = true)
47+
@ConditionalOnProperty(value = "spring.metrics.graphite.enabled", matchIfMissing = true)
4848
public MetricsExporter graphiteExporter(GraphiteConfig config,
4949
HierarchicalNameMapper nameMapper, Clock clock) {
5050
return () -> new GraphiteMeterRegistry(config, nameMapper, clock);

spring-boot-actuator-autoconfigure/src/main/java/org/springframework/boot/actuate/autoconfigure/metrics/export/graphite/GraphiteProperties.java

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -30,12 +30,12 @@
3030
* @author Jon Schneider
3131
* @since 2.0.0
3232
*/
33-
@ConfigurationProperties(prefix = "metrics.graphite")
33+
@ConfigurationProperties(prefix = "spring.metrics.graphite")
3434
public class GraphiteProperties extends RegistryProperties implements GraphiteConfig {
3535

3636
@Override
3737
public String prefix() {
38-
return "metrics.graphite";
38+
return "spring.metrics.graphite";
3939
}
4040

4141
public void setStep(Duration step) {

spring-boot-actuator-autoconfigure/src/main/java/org/springframework/boot/actuate/autoconfigure/metrics/export/influx/InfluxExportConfiguration.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -43,7 +43,7 @@
4343
public class InfluxExportConfiguration {
4444

4545
@Bean
46-
@ConditionalOnProperty(value = "metrics.influx.enabled", matchIfMissing = true)
46+
@ConditionalOnProperty(value = "spring.metrics.influx.enabled", matchIfMissing = true)
4747
public MetricsExporter influxExporter(InfluxConfig config, Clock clock) {
4848
return () -> new InfluxMeterRegistry(config, clock);
4949
}

spring-boot-actuator-autoconfigure/src/main/java/org/springframework/boot/actuate/autoconfigure/metrics/export/influx/InfluxProperties.java

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -28,12 +28,12 @@
2828
* @author Jon Schneider
2929
* @since 2.0.0
3030
*/
31-
@ConfigurationProperties(prefix = "metrics.influx")
31+
@ConfigurationProperties(prefix = "spring.metrics.influx")
3232
public class InfluxProperties extends StepRegistryProperties implements InfluxConfig {
3333

3434
@Override
3535
public String prefix() {
36-
return "metrics.influx";
36+
return "spring.metrics.influx";
3737
}
3838

3939
public void setDb(String db) {

0 commit comments

Comments
 (0)