Skip to content

Commit 9460d74

Browse files
philwebbphilwebb
committed
Rename CompositeMeterRegistryAutoConfiguration
Rename `CompositeMeterRegistryAutoConfiguration` to `MeterRegistryAutoConfiguration` since it can also create non-composite registries. Closes gh-22988
1 parent 12bae2a commit 9460d74

File tree

36 files changed

+115
-80
lines changed

36 files changed

+115
-80
lines changed

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

Lines changed: 6 additions & 9 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,20 +19,17 @@
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;
2522

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

3835
}

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

Lines changed: 2 additions & 2 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.
@@ -37,7 +37,7 @@
3737
* @since 2.1.0
3838
*/
3939
@Configuration(proxyBeanMethods = false)
40-
@AutoConfigureAfter({ MetricsAutoConfiguration.class, CompositeMeterRegistryAutoConfiguration.class })
40+
@AutoConfigureAfter({ MetricsAutoConfiguration.class, MeterRegistryAutoConfiguration.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, CompositeMeterRegistryAutoConfiguration.class })
51+
@AutoConfigureAfter({ MetricsAutoConfiguration.class, MeterRegistryAutoConfiguration.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: 2 additions & 2 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.
@@ -41,7 +41,7 @@
4141
* @since 2.1.0
4242
*/
4343
@Configuration(proxyBeanMethods = false)
44-
@AutoConfigureAfter({ MetricsAutoConfiguration.class, CompositeMeterRegistryAutoConfiguration.class })
44+
@AutoConfigureAfter({ MetricsAutoConfiguration.class, MeterRegistryAutoConfiguration.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: 2 additions & 2 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.
@@ -44,7 +44,7 @@
4444
* @since 2.1.0
4545
*/
4646
@Configuration(proxyBeanMethods = false)
47-
@AutoConfigureAfter({ MetricsAutoConfiguration.class, CompositeMeterRegistryAutoConfiguration.class })
47+
@AutoConfigureAfter({ MetricsAutoConfiguration.class, MeterRegistryAutoConfiguration.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: 38 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,38 @@
1+
/*
2+
* Copyright 2012-2020 the original author or authors.
3+
*
4+
* Licensed under the Apache License, Version 2.0 (the "License");
5+
* you may not use this file except in compliance with the License.
6+
* You may obtain a copy of the License at
7+
*
8+
* https://www.apache.org/licenses/LICENSE-2.0
9+
*
10+
* Unless required by applicable law or agreed to in writing, software
11+
* distributed under the License is distributed on an "AS IS" BASIS,
12+
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
13+
* See the License for the specific language governing permissions and
14+
* limitations under the License.
15+
*/
16+
17+
package org.springframework.boot.actuate.autoconfigure.metrics;
18+
19+
import io.micrometer.core.instrument.composite.CompositeMeterRegistry;
20+
21+
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;
25+
26+
/**
27+
* {@link EnableAutoConfiguration Auto-configuration} for a
28+
* {@link CompositeMeterRegistry}.
29+
*
30+
* @author Andy Wilkinson
31+
* @since 2.4.0
32+
*/
33+
@Configuration(proxyBeanMethods = false)
34+
@Import({ NoOpMeterRegistryConfiguration.class, CompositeMeterRegistryConfiguration.class })
35+
@ConditionalOnClass(CompositeMeterRegistry.class)
36+
public class MeterRegistryAutoConfiguration {
37+
38+
}

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

Lines changed: 2 additions & 2 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.
@@ -42,7 +42,7 @@
4242
@Configuration(proxyBeanMethods = false)
4343
@ConditionalOnClass(Timed.class)
4444
@EnableConfigurationProperties(MetricsProperties.class)
45-
@AutoConfigureBefore(CompositeMeterRegistryAutoConfiguration.class)
45+
@AutoConfigureBefore(MeterRegistryAutoConfiguration.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: 2 additions & 2 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.
@@ -38,7 +38,7 @@
3838
@Configuration(proxyBeanMethods = false)
3939
@ConditionalOnClass(Timed.class)
4040
@ConditionalOnAvailableEndpoint(endpoint = MetricsEndpoint.class)
41-
@AutoConfigureAfter({ MetricsAutoConfiguration.class, CompositeMeterRegistryAutoConfiguration.class })
41+
@AutoConfigureAfter({ MetricsAutoConfiguration.class, MeterRegistryAutoConfiguration.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: 2 additions & 2 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.
@@ -36,7 +36,7 @@
3636
* @since 2.1.0
3737
*/
3838
@Configuration(proxyBeanMethods = false)
39-
@AutoConfigureAfter({ MetricsAutoConfiguration.class, CompositeMeterRegistryAutoConfiguration.class })
39+
@AutoConfigureAfter({ MetricsAutoConfiguration.class, MeterRegistryAutoConfiguration.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.CompositeMeterRegistryAutoConfiguration;
24+
import org.springframework.boot.actuate.autoconfigure.metrics.MeterRegistryAutoConfiguration;
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({ CompositeMeterRegistryAutoConfiguration.class, SimpleMetricsExportAutoConfiguration.class })
46+
@AutoConfigureBefore({ MeterRegistryAutoConfiguration.class, SimpleMetricsExportAutoConfiguration.class })
4747
@AutoConfigureAfter(MetricsAutoConfiguration.class)
4848
@ConditionalOnBean(Clock.class)
4949
@ConditionalOnClass(AppOpticsMeterRegistry.class)

0 commit comments

Comments
 (0)