Skip to content

Commit 508aac0

Browse files
committed
Rename all Micrometer Clock beans: clock -> micrometerClock
Closes gh-10436
1 parent 2bb54f1 commit 508aac0

File tree

7 files changed

+7
-7
lines changed

7 files changed

+7
-7
lines changed

spring-boot-project/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
@@ -57,7 +57,7 @@ public MetricsExporter atlasExporter(AtlasConfig atlasConfig, Clock clock) {
5757

5858
@Bean
5959
@ConditionalOnMissingBean
60-
public Clock clock() {
60+
public Clock micrometerClock() {
6161
return Clock.SYSTEM;
6262
}
6363

spring-boot-project/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
@@ -57,7 +57,7 @@ public MetricsExporter datadogExporter(DatadogConfig datadogConfig, Clock clock)
5757

5858
@Bean
5959
@ConditionalOnMissingBean
60-
public Clock clock() {
60+
public Clock micrometerClock() {
6161
return Clock.SYSTEM;
6262
}
6363

spring-boot-project/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
@@ -58,7 +58,7 @@ public MetricsExporter gangliaExporter(GangliaConfig gangliaConfig,
5858

5959
@Bean
6060
@ConditionalOnMissingBean
61-
public Clock clock() {
61+
public Clock micrometerClock() {
6262
return Clock.SYSTEM;
6363
}
6464

spring-boot-project/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
@@ -58,7 +58,7 @@ public MetricsExporter graphiteExporter(GraphiteConfig graphiteConfig,
5858

5959
@Bean
6060
@ConditionalOnMissingBean
61-
public Clock clock() {
61+
public Clock micrometerClock() {
6262
return Clock.SYSTEM;
6363
}
6464

spring-boot-project/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
@@ -56,7 +56,7 @@ public MetricsExporter influxExporter(InfluxConfig influxConfig, Clock clock) {
5656

5757
@Bean
5858
@ConditionalOnMissingBean
59-
public Clock clock() {
59+
public Clock micrometerClock() {
6060
return Clock.SYSTEM;
6161
}
6262

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -45,7 +45,7 @@ public MetricsExporter jmxExporter(HierarchicalNameMapper nameMapper, Clock cloc
4545

4646
@Bean
4747
@ConditionalOnMissingBean
48-
public Clock clock() {
48+
public Clock micrometerClock() {
4949
return Clock.SYSTEM;
5050
}
5151

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -64,7 +64,7 @@ public CollectorRegistry collectorRegistry() {
6464

6565
@Bean
6666
@ConditionalOnMissingBean
67-
public Clock clock() {
67+
public Clock micrometerClock() {
6868
return Clock.SYSTEM;
6969
}
7070

0 commit comments

Comments
 (0)