Skip to content

Commit d84e2b9

Browse files
committed
Fix wrong usage of ManagementContextConfiguration
Closes gh-13366
1 parent b4f8361 commit d84e2b9

File tree

2 files changed

+2
-4
lines changed

2 files changed

+2
-4
lines changed

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

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,6 @@
2525
import org.springframework.boot.actuate.autoconfigure.metrics.CompositeMeterRegistryAutoConfiguration;
2626
import org.springframework.boot.actuate.autoconfigure.metrics.MetricsAutoConfiguration;
2727
import org.springframework.boot.actuate.autoconfigure.metrics.export.simple.SimpleMetricsExportAutoConfiguration;
28-
import org.springframework.boot.actuate.autoconfigure.web.ManagementContextConfiguration;
2928
import org.springframework.boot.actuate.metrics.export.prometheus.PrometheusScrapeEndpoint;
3029
import org.springframework.boot.autoconfigure.AutoConfigureAfter;
3130
import org.springframework.boot.autoconfigure.AutoConfigureBefore;
@@ -74,7 +73,7 @@ public CollectorRegistry collectorRegistry() {
7473
return new CollectorRegistry(true);
7574
}
7675

77-
@ManagementContextConfiguration
76+
@Configuration
7877
public static class PrometheusScrapeEndpointConfiguration {
7978

8079
@Bean

spring-boot-project/spring-boot-actuator-autoconfigure/src/main/java/org/springframework/boot/actuate/autoconfigure/web/mappings/MappingsEndpointAutoConfiguration.java

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,6 @@
2121

2222
import org.springframework.beans.factory.ObjectProvider;
2323
import org.springframework.boot.actuate.autoconfigure.endpoint.condition.ConditionalOnEnabledEndpoint;
24-
import org.springframework.boot.actuate.autoconfigure.web.ManagementContextConfiguration;
2524
import org.springframework.boot.actuate.web.mappings.MappingDescriptionProvider;
2625
import org.springframework.boot.actuate.web.mappings.MappingsEndpoint;
2726
import org.springframework.boot.actuate.web.mappings.reactive.DispatcherHandlersMappingDescriptionProvider;
@@ -45,7 +44,7 @@
4544
* @author Andy Wilkinson
4645
* @since 2.0.0
4746
*/
48-
@ManagementContextConfiguration
47+
@Configuration
4948
public class MappingsEndpointAutoConfiguration {
5049

5150
@Bean

0 commit comments

Comments
 (0)