Skip to content

Commit d005a64

Browse files
wilkinsonawilkinsona
committed
Revert "Rename CompositeMeterRegistryAutoConfiguration"
This reverts commit 9460d74. Fixes gh-23724
1 parent f0b0a07 commit d005a64

File tree

35 files changed

+67
-102
lines changed

35 files changed

+67
-102
lines changed

‎spring-boot-project/spring-boot-actuator-autoconfigure/src/main/java/org/springframework/boot/actuate/autoconfigure/metrics/CompositeMeterRegistryAutoConfiguration.java

Lines changed: 8 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -19,17 +19,20 @@
1919
import io.micrometer.core.instrument.composite.CompositeMeterRegistry;
2020

2121
import org.springframework.boot.autoconfigure.EnableAutoConfiguration;
22+
import org.springframework.boot.autoconfigure.condition.ConditionalOnClass;
23+
import org.springframework.context.annotation.Configuration;
24+
import org.springframework.context.annotation.Import;
2225

2326
/**
24-
* Deprecate {@link EnableAutoConfiguration Auto-configuration} for a
25-
* {@link CompositeMeterRegistry}. Provided only to issue a deprecation warning if used as
26-
* an exclude.
27+
* {@link EnableAutoConfiguration Auto-configuration} for a
28+
* {@link CompositeMeterRegistry}.
2729
*
2830
* @author Andy Wilkinson
2931
* @since 2.0.0
30-
* @deprecated since 2.4.0 in favor of {@link MeterRegistryAutoConfiguration}.
3132
*/
32-
@Deprecated
33+
@Configuration(proxyBeanMethods = false)
34+
@Import({ NoOpMeterRegistryConfiguration.class, CompositeMeterRegistryConfiguration.class })
35+
@ConditionalOnClass(CompositeMeterRegistry.class)
3336
public class CompositeMeterRegistryAutoConfiguration {
3437

3538
}

‎spring-boot-project/spring-boot-actuator-autoconfigure/src/main/java/org/springframework/boot/actuate/autoconfigure/metrics/JvmMetricsAutoConfiguration.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -37,7 +37,7 @@
3737
* @since 2.1.0
3838
*/
3939
@Configuration(proxyBeanMethods = false)
40-
@AutoConfigureAfter({ MetricsAutoConfiguration.class, MeterRegistryAutoConfiguration.class })
40+
@AutoConfigureAfter({ MetricsAutoConfiguration.class, CompositeMeterRegistryAutoConfiguration.class })
4141
@ConditionalOnClass(MeterRegistry.class)
4242
@ConditionalOnBean(MeterRegistry.class)
4343
public class JvmMetricsAutoConfiguration {

‎spring-boot-project/spring-boot-actuator-autoconfigure/src/main/java/org/springframework/boot/actuate/autoconfigure/metrics/KafkaMetricsAutoConfiguration.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -48,7 +48,7 @@
4848
*/
4949
@Configuration(proxyBeanMethods = false)
5050
@AutoConfigureBefore(KafkaAutoConfiguration.class)
51-
@AutoConfigureAfter({ MetricsAutoConfiguration.class, MeterRegistryAutoConfiguration.class })
51+
@AutoConfigureAfter({ MetricsAutoConfiguration.class, CompositeMeterRegistryAutoConfiguration.class })
5252
@ConditionalOnClass({ KafkaClientMetrics.class, ProducerFactory.class })
5353
@ConditionalOnBean(MeterRegistry.class)
5454
public class KafkaMetricsAutoConfiguration {

‎spring-boot-project/spring-boot-actuator-autoconfigure/src/main/java/org/springframework/boot/actuate/autoconfigure/metrics/Log4J2MetricsAutoConfiguration.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -41,7 +41,7 @@
4141
* @since 2.1.0
4242
*/
4343
@Configuration(proxyBeanMethods = false)
44-
@AutoConfigureAfter({ MetricsAutoConfiguration.class, MeterRegistryAutoConfiguration.class })
44+
@AutoConfigureAfter({ MetricsAutoConfiguration.class, CompositeMeterRegistryAutoConfiguration.class })
4545
@ConditionalOnClass(value = { Log4j2Metrics.class, LogManager.class },
4646
name = "org.apache.logging.log4j.core.LoggerContext")
4747
@ConditionalOnBean(MeterRegistry.class)

‎spring-boot-project/spring-boot-actuator-autoconfigure/src/main/java/org/springframework/boot/actuate/autoconfigure/metrics/LogbackMetricsAutoConfiguration.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -44,7 +44,7 @@
4444
* @since 2.1.0
4545
*/
4646
@Configuration(proxyBeanMethods = false)
47-
@AutoConfigureAfter({ MetricsAutoConfiguration.class, MeterRegistryAutoConfiguration.class })
47+
@AutoConfigureAfter({ MetricsAutoConfiguration.class, CompositeMeterRegistryAutoConfiguration.class })
4848
@ConditionalOnClass({ MeterRegistry.class, LoggerContext.class, LoggerFactory.class })
4949
@ConditionalOnBean(MeterRegistry.class)
5050
@Conditional(LogbackLoggingCondition.class)

‎spring-boot-project/spring-boot-actuator-autoconfigure/src/main/java/org/springframework/boot/actuate/autoconfigure/metrics/MeterRegistryAutoConfiguration.java

Lines changed: 0 additions & 38 deletions
This file was deleted.

‎spring-boot-project/spring-boot-actuator-autoconfigure/src/main/java/org/springframework/boot/actuate/autoconfigure/metrics/MetricsAutoConfiguration.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -42,7 +42,7 @@
4242
@Configuration(proxyBeanMethods = false)
4343
@ConditionalOnClass(Timed.class)
4444
@EnableConfigurationProperties(MetricsProperties.class)
45-
@AutoConfigureBefore(MeterRegistryAutoConfiguration.class)
45+
@AutoConfigureBefore(CompositeMeterRegistryAutoConfiguration.class)
4646
public class MetricsAutoConfiguration {
4747

4848
@Bean

‎spring-boot-project/spring-boot-actuator-autoconfigure/src/main/java/org/springframework/boot/actuate/autoconfigure/metrics/MetricsEndpointAutoConfiguration.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -38,7 +38,7 @@
3838
@Configuration(proxyBeanMethods = false)
3939
@ConditionalOnClass(Timed.class)
4040
@ConditionalOnAvailableEndpoint(endpoint = MetricsEndpoint.class)
41-
@AutoConfigureAfter({ MetricsAutoConfiguration.class, MeterRegistryAutoConfiguration.class })
41+
@AutoConfigureAfter({ MetricsAutoConfiguration.class, CompositeMeterRegistryAutoConfiguration.class })
4242
public class MetricsEndpointAutoConfiguration {
4343

4444
@Bean

‎spring-boot-project/spring-boot-actuator-autoconfigure/src/main/java/org/springframework/boot/actuate/autoconfigure/metrics/SystemMetricsAutoConfiguration.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -36,7 +36,7 @@
3636
* @since 2.1.0
3737
*/
3838
@Configuration(proxyBeanMethods = false)
39-
@AutoConfigureAfter({ MetricsAutoConfiguration.class, MeterRegistryAutoConfiguration.class })
39+
@AutoConfigureAfter({ MetricsAutoConfiguration.class, CompositeMeterRegistryAutoConfiguration.class })
4040
@ConditionalOnClass(MeterRegistry.class)
4141
@ConditionalOnBean(MeterRegistry.class)
4242
public class SystemMetricsAutoConfiguration {

‎spring-boot-project/spring-boot-actuator-autoconfigure/src/main/java/org/springframework/boot/actuate/autoconfigure/metrics/export/appoptics/AppOpticsMetricsExportAutoConfiguration.java

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@
2121
import io.micrometer.core.instrument.Clock;
2222
import io.micrometer.core.ipc.http.HttpUrlConnectionSender;
2323

24-
import org.springframework.boot.actuate.autoconfigure.metrics.MeterRegistryAutoConfiguration;
24+
import org.springframework.boot.actuate.autoconfigure.metrics.CompositeMeterRegistryAutoConfiguration;
2525
import org.springframework.boot.actuate.autoconfigure.metrics.MetricsAutoConfiguration;
2626
import org.springframework.boot.actuate.autoconfigure.metrics.export.ConditionalOnEnabledMetricsExport;
2727
import org.springframework.boot.actuate.autoconfigure.metrics.export.simple.SimpleMetricsExportAutoConfiguration;
@@ -43,7 +43,7 @@
4343
* @since 2.1.0
4444
*/
4545
@Configuration(proxyBeanMethods = false)
46-
@AutoConfigureBefore({ MeterRegistryAutoConfiguration.class, SimpleMetricsExportAutoConfiguration.class })
46+
@AutoConfigureBefore({ CompositeMeterRegistryAutoConfiguration.class, SimpleMetricsExportAutoConfiguration.class })
4747
@AutoConfigureAfter(MetricsAutoConfiguration.class)
4848
@ConditionalOnBean(Clock.class)
4949
@ConditionalOnClass(AppOpticsMeterRegistry.class)

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

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@
2020
import io.micrometer.atlas.AtlasMeterRegistry;
2121
import io.micrometer.core.instrument.Clock;
2222

23-
import org.springframework.boot.actuate.autoconfigure.metrics.MeterRegistryAutoConfiguration;
23+
import org.springframework.boot.actuate.autoconfigure.metrics.CompositeMeterRegistryAutoConfiguration;
2424
import org.springframework.boot.actuate.autoconfigure.metrics.MetricsAutoConfiguration;
2525
import org.springframework.boot.actuate.autoconfigure.metrics.export.ConditionalOnEnabledMetricsExport;
2626
import org.springframework.boot.actuate.autoconfigure.metrics.export.simple.SimpleMetricsExportAutoConfiguration;
@@ -42,7 +42,7 @@
4242
* @since 2.0.0
4343
*/
4444
@Configuration(proxyBeanMethods = false)
45-
@AutoConfigureBefore({ MeterRegistryAutoConfiguration.class, SimpleMetricsExportAutoConfiguration.class })
45+
@AutoConfigureBefore({ CompositeMeterRegistryAutoConfiguration.class, SimpleMetricsExportAutoConfiguration.class })
4646
@AutoConfigureAfter(MetricsAutoConfiguration.class)
4747
@ConditionalOnBean(Clock.class)
4848
@ConditionalOnClass(AtlasMeterRegistry.class)

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

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@
2121
import io.micrometer.datadog.DatadogConfig;
2222
import io.micrometer.datadog.DatadogMeterRegistry;
2323

24-
import org.springframework.boot.actuate.autoconfigure.metrics.MeterRegistryAutoConfiguration;
24+
import org.springframework.boot.actuate.autoconfigure.metrics.CompositeMeterRegistryAutoConfiguration;
2525
import org.springframework.boot.actuate.autoconfigure.metrics.MetricsAutoConfiguration;
2626
import org.springframework.boot.actuate.autoconfigure.metrics.export.ConditionalOnEnabledMetricsExport;
2727
import org.springframework.boot.actuate.autoconfigure.metrics.export.simple.SimpleMetricsExportAutoConfiguration;
@@ -43,7 +43,7 @@
4343
* @since 2.0.0
4444
*/
4545
@Configuration(proxyBeanMethods = false)
46-
@AutoConfigureBefore({ MeterRegistryAutoConfiguration.class, SimpleMetricsExportAutoConfiguration.class })
46+
@AutoConfigureBefore({ CompositeMeterRegistryAutoConfiguration.class, SimpleMetricsExportAutoConfiguration.class })
4747
@AutoConfigureAfter(MetricsAutoConfiguration.class)
4848
@ConditionalOnBean(Clock.class)
4949
@ConditionalOnClass(DatadogMeterRegistry.class)

‎spring-boot-project/spring-boot-actuator-autoconfigure/src/main/java/org/springframework/boot/actuate/autoconfigure/metrics/export/dynatrace/DynatraceMetricsExportAutoConfiguration.java

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@
2121
import io.micrometer.dynatrace.DynatraceConfig;
2222
import io.micrometer.dynatrace.DynatraceMeterRegistry;
2323

24-
import org.springframework.boot.actuate.autoconfigure.metrics.MeterRegistryAutoConfiguration;
24+
import org.springframework.boot.actuate.autoconfigure.metrics.CompositeMeterRegistryAutoConfiguration;
2525
import org.springframework.boot.actuate.autoconfigure.metrics.MetricsAutoConfiguration;
2626
import org.springframework.boot.actuate.autoconfigure.metrics.export.ConditionalOnEnabledMetricsExport;
2727
import org.springframework.boot.actuate.autoconfigure.metrics.export.simple.SimpleMetricsExportAutoConfiguration;
@@ -43,7 +43,7 @@
4343
* @since 2.1.0
4444
*/
4545
@Configuration(proxyBeanMethods = false)
46-
@AutoConfigureBefore({ MeterRegistryAutoConfiguration.class, SimpleMetricsExportAutoConfiguration.class })
46+
@AutoConfigureBefore({ CompositeMeterRegistryAutoConfiguration.class, SimpleMetricsExportAutoConfiguration.class })
4747
@AutoConfigureAfter(MetricsAutoConfiguration.class)
4848
@ConditionalOnBean(Clock.class)
4949
@ConditionalOnClass(DynatraceMeterRegistry.class)

‎spring-boot-project/spring-boot-actuator-autoconfigure/src/main/java/org/springframework/boot/actuate/autoconfigure/metrics/export/elastic/ElasticMetricsExportAutoConfiguration.java

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@
2121
import io.micrometer.elastic.ElasticConfig;
2222
import io.micrometer.elastic.ElasticMeterRegistry;
2323

24-
import org.springframework.boot.actuate.autoconfigure.metrics.MeterRegistryAutoConfiguration;
24+
import org.springframework.boot.actuate.autoconfigure.metrics.CompositeMeterRegistryAutoConfiguration;
2525
import org.springframework.boot.actuate.autoconfigure.metrics.MetricsAutoConfiguration;
2626
import org.springframework.boot.actuate.autoconfigure.metrics.export.ConditionalOnEnabledMetricsExport;
2727
import org.springframework.boot.actuate.autoconfigure.metrics.export.simple.SimpleMetricsExportAutoConfiguration;
@@ -43,7 +43,7 @@
4343
* @since 2.1.0
4444
*/
4545
@Configuration(proxyBeanMethods = false)
46-
@AutoConfigureBefore({ MeterRegistryAutoConfiguration.class, SimpleMetricsExportAutoConfiguration.class })
46+
@AutoConfigureBefore({ CompositeMeterRegistryAutoConfiguration.class, SimpleMetricsExportAutoConfiguration.class })
4747
@AutoConfigureAfter(MetricsAutoConfiguration.class)
4848
@ConditionalOnBean(Clock.class)
4949
@ConditionalOnClass(ElasticMeterRegistry.class)

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

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@
2020
import io.micrometer.ganglia.GangliaConfig;
2121
import io.micrometer.ganglia.GangliaMeterRegistry;
2222

23-
import org.springframework.boot.actuate.autoconfigure.metrics.MeterRegistryAutoConfiguration;
23+
import org.springframework.boot.actuate.autoconfigure.metrics.CompositeMeterRegistryAutoConfiguration;
2424
import org.springframework.boot.actuate.autoconfigure.metrics.MetricsAutoConfiguration;
2525
import org.springframework.boot.actuate.autoconfigure.metrics.export.ConditionalOnEnabledMetricsExport;
2626
import org.springframework.boot.actuate.autoconfigure.metrics.export.simple.SimpleMetricsExportAutoConfiguration;
@@ -41,7 +41,7 @@
4141
* @since 2.0.0
4242
*/
4343
@Configuration(proxyBeanMethods = false)
44-
@AutoConfigureBefore({ MeterRegistryAutoConfiguration.class, SimpleMetricsExportAutoConfiguration.class })
44+
@AutoConfigureBefore({ CompositeMeterRegistryAutoConfiguration.class, SimpleMetricsExportAutoConfiguration.class })
4545
@AutoConfigureAfter(MetricsAutoConfiguration.class)
4646
@ConditionalOnBean(Clock.class)
4747
@ConditionalOnClass(GangliaMeterRegistry.class)

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

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@
2020
import io.micrometer.graphite.GraphiteConfig;
2121
import io.micrometer.graphite.GraphiteMeterRegistry;
2222

23-
import org.springframework.boot.actuate.autoconfigure.metrics.MeterRegistryAutoConfiguration;
23+
import org.springframework.boot.actuate.autoconfigure.metrics.CompositeMeterRegistryAutoConfiguration;
2424
import org.springframework.boot.actuate.autoconfigure.metrics.MetricsAutoConfiguration;
2525
import org.springframework.boot.actuate.autoconfigure.metrics.export.ConditionalOnEnabledMetricsExport;
2626
import org.springframework.boot.actuate.autoconfigure.metrics.export.simple.SimpleMetricsExportAutoConfiguration;
@@ -41,7 +41,7 @@
4141
* @since 2.0.0
4242
*/
4343
@Configuration(proxyBeanMethods = false)
44-
@AutoConfigureBefore({ MeterRegistryAutoConfiguration.class, SimpleMetricsExportAutoConfiguration.class })
44+
@AutoConfigureBefore({ CompositeMeterRegistryAutoConfiguration.class, SimpleMetricsExportAutoConfiguration.class })
4545
@AutoConfigureAfter(MetricsAutoConfiguration.class)
4646
@ConditionalOnBean(Clock.class)
4747
@ConditionalOnClass(GraphiteMeterRegistry.class)

‎spring-boot-project/spring-boot-actuator-autoconfigure/src/main/java/org/springframework/boot/actuate/autoconfigure/metrics/export/humio/HumioMetricsExportAutoConfiguration.java

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@
2121
import io.micrometer.humio.HumioConfig;
2222
import io.micrometer.humio.HumioMeterRegistry;
2323

24-
import org.springframework.boot.actuate.autoconfigure.metrics.MeterRegistryAutoConfiguration;
24+
import org.springframework.boot.actuate.autoconfigure.metrics.CompositeMeterRegistryAutoConfiguration;
2525
import org.springframework.boot.actuate.autoconfigure.metrics.MetricsAutoConfiguration;
2626
import org.springframework.boot.actuate.autoconfigure.metrics.export.ConditionalOnEnabledMetricsExport;
2727
import org.springframework.boot.actuate.autoconfigure.metrics.export.simple.SimpleMetricsExportAutoConfiguration;
@@ -43,7 +43,7 @@
4343
* @since 2.1.0
4444
*/
4545
@Configuration(proxyBeanMethods = false)
46-
@AutoConfigureBefore({ MeterRegistryAutoConfiguration.class, SimpleMetricsExportAutoConfiguration.class })
46+
@AutoConfigureBefore({ CompositeMeterRegistryAutoConfiguration.class, SimpleMetricsExportAutoConfiguration.class })
4747
@AutoConfigureAfter(MetricsAutoConfiguration.class)
4848
@ConditionalOnBean(Clock.class)
4949
@ConditionalOnClass(HumioMeterRegistry.class)

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

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@
2121
import io.micrometer.influx.InfluxConfig;
2222
import io.micrometer.influx.InfluxMeterRegistry;
2323

24-
import org.springframework.boot.actuate.autoconfigure.metrics.MeterRegistryAutoConfiguration;
24+
import org.springframework.boot.actuate.autoconfigure.metrics.CompositeMeterRegistryAutoConfiguration;
2525
import org.springframework.boot.actuate.autoconfigure.metrics.MetricsAutoConfiguration;
2626
import org.springframework.boot.actuate.autoconfigure.metrics.export.ConditionalOnEnabledMetricsExport;
2727
import org.springframework.boot.actuate.autoconfigure.metrics.export.simple.SimpleMetricsExportAutoConfiguration;
@@ -43,7 +43,7 @@
4343
* @since 2.0.0
4444
*/
4545
@Configuration(proxyBeanMethods = false)
46-
@AutoConfigureBefore({ MeterRegistryAutoConfiguration.class, SimpleMetricsExportAutoConfiguration.class })
46+
@AutoConfigureBefore({ CompositeMeterRegistryAutoConfiguration.class, SimpleMetricsExportAutoConfiguration.class })
4747
@AutoConfigureAfter(MetricsAutoConfiguration.class)
4848
@ConditionalOnBean(Clock.class)
4949
@ConditionalOnClass(InfluxMeterRegistry.class)

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

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@
2020
import io.micrometer.jmx.JmxConfig;
2121
import io.micrometer.jmx.JmxMeterRegistry;
2222

23-
import org.springframework.boot.actuate.autoconfigure.metrics.MeterRegistryAutoConfiguration;
23+
import org.springframework.boot.actuate.autoconfigure.metrics.CompositeMeterRegistryAutoConfiguration;
2424
import org.springframework.boot.actuate.autoconfigure.metrics.MetricsAutoConfiguration;
2525
import org.springframework.boot.actuate.autoconfigure.metrics.export.ConditionalOnEnabledMetricsExport;
2626
import org.springframework.boot.actuate.autoconfigure.metrics.export.simple.SimpleMetricsExportAutoConfiguration;
@@ -41,7 +41,7 @@
4141
* @since 2.0.0
4242
*/
4343
@Configuration(proxyBeanMethods = false)
44-
@AutoConfigureBefore({ MeterRegistryAutoConfiguration.class, SimpleMetricsExportAutoConfiguration.class })
44+
@AutoConfigureBefore({ CompositeMeterRegistryAutoConfiguration.class, SimpleMetricsExportAutoConfiguration.class })
4545
@AutoConfigureAfter(MetricsAutoConfiguration.class)
4646
@ConditionalOnBean(Clock.class)
4747
@ConditionalOnClass(JmxMeterRegistry.class)

‎spring-boot-project/spring-boot-actuator-autoconfigure/src/main/java/org/springframework/boot/actuate/autoconfigure/metrics/export/kairos/KairosMetricsExportAutoConfiguration.java

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@
2121
import io.micrometer.kairos.KairosConfig;
2222
import io.micrometer.kairos.KairosMeterRegistry;
2323

24-
import org.springframework.boot.actuate.autoconfigure.metrics.MeterRegistryAutoConfiguration;
24+
import org.springframework.boot.actuate.autoconfigure.metrics.CompositeMeterRegistryAutoConfiguration;
2525
import org.springframework.boot.actuate.autoconfigure.metrics.MetricsAutoConfiguration;
2626
import org.springframework.boot.actuate.autoconfigure.metrics.export.ConditionalOnEnabledMetricsExport;
2727
import org.springframework.boot.actuate.autoconfigure.metrics.export.simple.SimpleMetricsExportAutoConfiguration;
@@ -43,7 +43,7 @@
4343
* @since 2.1.0
4444
*/
4545
@Configuration(proxyBeanMethods = false)
46-
@AutoConfigureBefore({ MeterRegistryAutoConfiguration.class, SimpleMetricsExportAutoConfiguration.class })
46+
@AutoConfigureBefore({ CompositeMeterRegistryAutoConfiguration.class, SimpleMetricsExportAutoConfiguration.class })
4747
@AutoConfigureAfter(MetricsAutoConfiguration.class)
4848
@ConditionalOnBean(Clock.class)
4949
@ConditionalOnClass(KairosMeterRegistry.class)

‎spring-boot-project/spring-boot-actuator-autoconfigure/src/main/java/org/springframework/boot/actuate/autoconfigure/metrics/export/newrelic/NewRelicMetricsExportAutoConfiguration.java

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,7 @@
2525
import io.micrometer.newrelic.NewRelicInsightsApiClientProvider;
2626
import io.micrometer.newrelic.NewRelicMeterRegistry;
2727

28-
import org.springframework.boot.actuate.autoconfigure.metrics.MeterRegistryAutoConfiguration;
28+
import org.springframework.boot.actuate.autoconfigure.metrics.CompositeMeterRegistryAutoConfiguration;
2929
import org.springframework.boot.actuate.autoconfigure.metrics.MetricsAutoConfiguration;
3030
import org.springframework.boot.actuate.autoconfigure.metrics.export.ConditionalOnEnabledMetricsExport;
3131
import org.springframework.boot.actuate.autoconfigure.metrics.export.simple.SimpleMetricsExportAutoConfiguration;
@@ -48,7 +48,7 @@
4848
* @since 2.0.0
4949
*/
5050
@Configuration(proxyBeanMethods = false)
51-
@AutoConfigureBefore({ MeterRegistryAutoConfiguration.class, SimpleMetricsExportAutoConfiguration.class })
51+
@AutoConfigureBefore({ CompositeMeterRegistryAutoConfiguration.class, SimpleMetricsExportAutoConfiguration.class })
5252
@AutoConfigureAfter(MetricsAutoConfiguration.class)
5353
@ConditionalOnBean(Clock.class)
5454
@ConditionalOnClass(NewRelicMeterRegistry.class)

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

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -31,7 +31,7 @@
3131
import org.apache.commons.logging.LogFactory;
3232

3333
import org.springframework.boot.actuate.autoconfigure.endpoint.condition.ConditionalOnAvailableEndpoint;
34-
import org.springframework.boot.actuate.autoconfigure.metrics.MeterRegistryAutoConfiguration;
34+
import org.springframework.boot.actuate.autoconfigure.metrics.CompositeMeterRegistryAutoConfiguration;
3535
import org.springframework.boot.actuate.autoconfigure.metrics.MetricsAutoConfiguration;
3636
import org.springframework.boot.actuate.autoconfigure.metrics.export.ConditionalOnEnabledMetricsExport;
3737
import org.springframework.boot.actuate.autoconfigure.metrics.export.simple.SimpleMetricsExportAutoConfiguration;
@@ -60,7 +60,7 @@
6060
* @author David J. M. Karlsen
6161
*/
6262
@Configuration(proxyBeanMethods = false)
63-
@AutoConfigureBefore({ MeterRegistryAutoConfiguration.class, SimpleMetricsExportAutoConfiguration.class })
63+
@AutoConfigureBefore({ CompositeMeterRegistryAutoConfiguration.class, SimpleMetricsExportAutoConfiguration.class })
6464
@AutoConfigureAfter(MetricsAutoConfiguration.class)
6565
@ConditionalOnBean(Clock.class)
6666
@ConditionalOnClass(PrometheusMeterRegistry.class)

‎spring-boot-project/spring-boot-actuator-autoconfigure/src/main/java/org/springframework/boot/actuate/autoconfigure/metrics/export/signalfx/SignalFxMetricsExportAutoConfiguration.java

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@
2020
import io.micrometer.signalfx.SignalFxConfig;
2121
import io.micrometer.signalfx.SignalFxMeterRegistry;
2222

23-
import org.springframework.boot.actuate.autoconfigure.metrics.MeterRegistryAutoConfiguration;
23+
import org.springframework.boot.actuate.autoconfigure.metrics.CompositeMeterRegistryAutoConfiguration;
2424
import org.springframework.boot.actuate.autoconfigure.metrics.MetricsAutoConfiguration;
2525
import org.springframework.boot.actuate.autoconfigure.metrics.export.ConditionalOnEnabledMetricsExport;
2626
import org.springframework.boot.actuate.autoconfigure.metrics.export.simple.SimpleMetricsExportAutoConfiguration;
@@ -42,7 +42,7 @@
4242
* @since 2.0.0
4343
*/
4444
@Configuration(proxyBeanMethods = false)
45-
@AutoConfigureBefore({ MeterRegistryAutoConfiguration.class, SimpleMetricsExportAutoConfiguration.class })
45+
@AutoConfigureBefore({ CompositeMeterRegistryAutoConfiguration.class, SimpleMetricsExportAutoConfiguration.class })
4646
@AutoConfigureAfter(MetricsAutoConfiguration.class)
4747
@ConditionalOnBean(Clock.class)
4848
@ConditionalOnClass(SignalFxMeterRegistry.class)

0 commit comments

Comments
 (0)