diff --git a/spring-boot-project/spring-boot-actuator-autoconfigure/src/main/java/org/springframework/boot/actuate/autoconfigure/metrics/MetricsAspectsAutoConfiguration.java b/spring-boot-project/spring-boot-actuator-autoconfigure/src/main/java/org/springframework/boot/actuate/autoconfigure/metrics/MetricsAspectsAutoConfiguration.java index 977ea6539cb7..6daf0ac09e25 100644 --- a/spring-boot-project/spring-boot-actuator-autoconfigure/src/main/java/org/springframework/boot/actuate/autoconfigure/metrics/MetricsAspectsAutoConfiguration.java +++ b/spring-boot-project/spring-boot-actuator-autoconfigure/src/main/java/org/springframework/boot/actuate/autoconfigure/metrics/MetricsAspectsAutoConfiguration.java @@ -68,11 +68,6 @@ static final class ObservationAnnotationsEnabledCondition extends AnyNestedCondi super(ConfigurationPhase.PARSE_CONFIGURATION); } - @ConditionalOnBooleanProperty("micrometer.observations.annotations.enabled") - static class MicrometerObservationsEnabledCondition { - - } - @ConditionalOnBooleanProperty("management.observations.annotations.enabled") static class ManagementObservationsEnabledCondition { diff --git a/spring-boot-project/spring-boot-actuator-autoconfigure/src/main/java/org/springframework/boot/actuate/autoconfigure/tracing/MicrometerTracingAutoConfiguration.java b/spring-boot-project/spring-boot-actuator-autoconfigure/src/main/java/org/springframework/boot/actuate/autoconfigure/tracing/MicrometerTracingAutoConfiguration.java index 781446b0c49c..bc8050d12b8c 100644 --- a/spring-boot-project/spring-boot-actuator-autoconfigure/src/main/java/org/springframework/boot/actuate/autoconfigure/tracing/MicrometerTracingAutoConfiguration.java +++ b/spring-boot-project/spring-boot-actuator-autoconfigure/src/main/java/org/springframework/boot/actuate/autoconfigure/tracing/MicrometerTracingAutoConfiguration.java @@ -158,11 +158,6 @@ static final class ObservationAnnotationsEnabledCondition extends AnyNestedCondi super(ConfigurationPhase.PARSE_CONFIGURATION); } - @ConditionalOnBooleanProperty("micrometer.observations.annotations.enabled") - static class MicrometerObservationsEnabledCondition { - - } - @ConditionalOnBooleanProperty("management.observations.annotations.enabled") static class ManagementObservationsEnabledCondition { diff --git a/spring-boot-project/spring-boot-actuator-autoconfigure/src/main/resources/META-INF/additional-spring-configuration-metadata.json b/spring-boot-project/spring-boot-actuator-autoconfigure/src/main/resources/META-INF/additional-spring-configuration-metadata.json index 98fb9552ce3e..a6e79482380e 100644 --- a/spring-boot-project/spring-boot-actuator-autoconfigure/src/main/resources/META-INF/additional-spring-configuration-metadata.json +++ b/spring-boot-project/spring-boot-actuator-autoconfigure/src/main/resources/META-INF/additional-spring-configuration-metadata.json @@ -2247,14 +2247,6 @@ "name": "management.zipkin.tracing.export.enabled", "type": "java.lang.Boolean", "description": "Whether auto-configuration of tracing is enabled to export Zipkin traces." - }, - { - "name": "micrometer.observations.annotations.enabled", - "type": "java.lang.Boolean", - "deprecation": { - "level": "error", - "replacement": "management.observations.annotations.enabled" - } } ], "hints": [ diff --git a/spring-boot-project/spring-boot-actuator-autoconfigure/src/test/java/org/springframework/boot/actuate/autoconfigure/metrics/MetricsAspectsAutoConfigurationTests.java b/spring-boot-project/spring-boot-actuator-autoconfigure/src/test/java/org/springframework/boot/actuate/autoconfigure/metrics/MetricsAspectsAutoConfigurationTests.java index 5371146e0f42..fe0530e96baf 100644 --- a/spring-boot-project/spring-boot-actuator-autoconfigure/src/test/java/org/springframework/boot/actuate/autoconfigure/metrics/MetricsAspectsAutoConfigurationTests.java +++ b/spring-boot-project/spring-boot-actuator-autoconfigure/src/test/java/org/springframework/boot/actuate/autoconfigure/metrics/MetricsAspectsAutoConfigurationTests.java @@ -54,17 +54,6 @@ void shouldNotConfigureAspectsByDefault() { }); } - @Test - void shouldConfigureAspectsWithLegacyProperty() { - new ApplicationContextRunner().with(MetricsRun.simple()) - .withConfiguration(AutoConfigurations.of(MetricsAspectsAutoConfiguration.class)) - .withPropertyValues("micrometer.observations.annotations.enabled=true") - .run((context) -> { - assertThat(context).hasSingleBean(CountedAspect.class); - assertThat(context).hasSingleBean(TimedAspect.class); - }); - } - @Test void shouldConfigureAspects() { this.contextRunner.run((context) -> { diff --git a/spring-boot-project/spring-boot-actuator-autoconfigure/src/test/java/org/springframework/boot/actuate/autoconfigure/tracing/MicrometerTracingAutoConfigurationTests.java b/spring-boot-project/spring-boot-actuator-autoconfigure/src/test/java/org/springframework/boot/actuate/autoconfigure/tracing/MicrometerTracingAutoConfigurationTests.java index 00a3a3977bbc..6043c274947b 100644 --- a/spring-boot-project/spring-boot-actuator-autoconfigure/src/test/java/org/springframework/boot/actuate/autoconfigure/tracing/MicrometerTracingAutoConfigurationTests.java +++ b/spring-boot-project/spring-boot-actuator-autoconfigure/src/test/java/org/springframework/boot/actuate/autoconfigure/tracing/MicrometerTracingAutoConfigurationTests.java @@ -145,18 +145,6 @@ void shouldNotSupplyAspectBeansIfPropertyIsDisabled() { }); } - @Test - void shouldSupplyAspectBeansIfLegacyPropertyIsEnabled() { - new ApplicationContextRunner().withPropertyValues("micrometer.observations.annotations.enabled=true") - .withConfiguration(AutoConfigurations.of(MicrometerTracingAutoConfiguration.class)) - .withUserConfiguration(TracerConfiguration.class, PropagatorConfiguration.class) - .run((context) -> { - assertThat(context).hasSingleBean(DefaultNewSpanParser.class); - assertThat(context).hasSingleBean(ImperativeMethodInvocationProcessor.class); - assertThat(context).hasSingleBean(SpanAspect.class); - }); - } - @Test void shouldNotSupplyBeansIfAspectjIsMissing() { this.contextRunner.withUserConfiguration(TracerConfiguration.class)