Merge branch '3.2.x'

Closes gh-39603

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

@@ -23,13 +23,16 @@ import io.micrometer.core.instrument.MeterRegistry;
 import org.aspectj.weaver.Advice;
 
 import org.springframework.beans.factory.ObjectProvider;
+import org.springframework.boot.actuate.autoconfigure.metrics.MetricsAspectsAutoConfiguration.ObservationAnnotationsEnabledCondition;
 import org.springframework.boot.autoconfigure.AutoConfiguration;
 import org.springframework.boot.autoconfigure.EnableAutoConfiguration;
+import org.springframework.boot.autoconfigure.condition.AnyNestedCondition;
 import org.springframework.boot.autoconfigure.condition.ConditionalOnBean;
 import org.springframework.boot.autoconfigure.condition.ConditionalOnClass;
 import org.springframework.boot.autoconfigure.condition.ConditionalOnMissingBean;
 import org.springframework.boot.autoconfigure.condition.ConditionalOnProperty;
 import org.springframework.context.annotation.Bean;
+import org.springframework.context.annotation.Conditional;
 
 /**
  * {@link EnableAutoConfiguration Auto-configuration} for Micrometer-based metrics
@@ -40,7 +43,7 @@ import org.springframework.context.annotation.Bean;
  */
 @AutoConfiguration(after = { MetricsAutoConfiguration.class, CompositeMeterRegistryAutoConfiguration.class })
 @ConditionalOnClass({ MeterRegistry.class, Advice.class })
-@ConditionalOnProperty(prefix = "micrometer.observations.annotations", name = "enabled", havingValue = "true")
+@Conditional(ObservationAnnotationsEnabledCondition.class)
 @ConditionalOnBean(MeterRegistry.class)
 public class MetricsAspectsAutoConfiguration {
 
@@ -59,4 +62,22 @@ public class MetricsAspectsAutoConfiguration {
 		return timedAspect;
 	}
 
+	static final class ObservationAnnotationsEnabledCondition extends AnyNestedCondition {
+
+		ObservationAnnotationsEnabledCondition() {
+			super(ConfigurationPhase.PARSE_CONFIGURATION);
+		}
+
+		@ConditionalOnProperty(prefix = "micrometer.observations.annotations", name = "enabled", havingValue = "true")
+		static class MicrometerObservationsEnabledCondition {
+
+		}
+
+		@ConditionalOnProperty(prefix = "management.observations.annotations", name = "enabled", havingValue = "true")
+		static class ManagementObservationsEnabledCondition {
+
+		}
+
+	}
+
 }

spring-boot-project/spring-boot-actuator-autoconfigure/src/main/java/org/springframework/boot/actuate/autoconfigure/tracing/MicrometerTracingAutoConfiguration.java

@@ -33,11 +33,13 @@ import org.aspectj.weaver.Advice;
 import org.springframework.beans.factory.BeanFactory;
 import org.springframework.boot.autoconfigure.AutoConfiguration;
 import org.springframework.boot.autoconfigure.EnableAutoConfiguration;
+import org.springframework.boot.autoconfigure.condition.AnyNestedCondition;
 import org.springframework.boot.autoconfigure.condition.ConditionalOnBean;
 import org.springframework.boot.autoconfigure.condition.ConditionalOnClass;
 import org.springframework.boot.autoconfigure.condition.ConditionalOnMissingBean;
 import org.springframework.boot.autoconfigure.condition.ConditionalOnProperty;
 import org.springframework.context.annotation.Bean;
+import org.springframework.context.annotation.Conditional;
 import org.springframework.context.annotation.Configuration;
 import org.springframework.core.Ordered;
 import org.springframework.core.annotation.Order;
@@ -102,7 +104,7 @@ public class MicrometerTracingAutoConfiguration {
 
 	@Configuration(proxyBeanMethods = false)
 	@ConditionalOnClass(Advice.class)
-	@ConditionalOnProperty(prefix = "micrometer.observations.annotations", name = "enabled", havingValue = "true")
+	@Conditional(ObservationAnnotationsEnabledCondition.class)
 	static class SpanAspectConfiguration {
 
 		@Bean
@@ -150,4 +152,22 @@ public class MicrometerTracingAutoConfiguration {
 
 	}
 
+	static final class ObservationAnnotationsEnabledCondition extends AnyNestedCondition {
+
+		ObservationAnnotationsEnabledCondition() {
+			super(ConfigurationPhase.PARSE_CONFIGURATION);
+		}
+
+		@ConditionalOnProperty(prefix = "micrometer.observations.annotations", name = "enabled", havingValue = "true")
+		static class MicrometerObservationsEnabledCondition {
+
+		}
+
+		@ConditionalOnProperty(prefix = "management.observations.annotations", name = "enabled", havingValue = "true")
+		static class ManagementObservationsEnabledCondition {
+
+		}
+
+	}
+
 }

spring-boot-project/spring-boot-actuator-autoconfigure/src/main/resources/META-INF/additional-spring-configuration-metadata.json

@@ -2079,6 +2079,12 @@
         "level": "error"
       }
     },
+    {
+      "name": "management.observations.annotations.enabled",
+      "type": "java.lang.Boolean",
+      "description": "Whether auto-configuration of Micrometer annotations is enabled.",
+      "defaultValue": false
+    },
     {
       "name": "management.otlp.metrics.export.base-time-unit",
       "defaultValue": "milliseconds"
@@ -2251,8 +2257,10 @@
     {
       "name": "micrometer.observations.annotations.enabled",
       "type": "java.lang.Boolean",
-      "description": "Whether auto-configuration of Micrometer annotations is enabled.",
+      "deprecation": {
-      "defaultValue": false
+        "level": "error",
+        "replacement": "management.observations.annotations.enabled"
+      }
     }
   ],
   "hints": [

spring-boot-project/spring-boot-actuator-autoconfigure/src/test/java/org/springframework/boot/actuate/autoconfigure/metrics/MetricsAspectsAutoConfigurationTests.java

@@ -41,7 +41,7 @@ import static org.assertj.core.api.Assertions.assertThat;
 class MetricsAspectsAutoConfigurationTests {
 
 	private final ApplicationContextRunner contextRunner = new ApplicationContextRunner().with(MetricsRun.simple())
-		.withPropertyValues("micrometer.observations.annotations.enabled=true")
+		.withPropertyValues("management.observations.annotations.enabled=true")
 		.withConfiguration(AutoConfigurations.of(MetricsAspectsAutoConfiguration.class));
 
 	@Test
@@ -54,6 +54,17 @@ class MetricsAspectsAutoConfigurationTests {
 			});
 	}
 
+	@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) -> {

spring-boot-project/spring-boot-actuator-autoconfigure/src/test/java/org/springframework/boot/actuate/autoconfigure/tracing/MicrometerTracingAutoConfigurationTests.java

@@ -54,13 +54,12 @@ import static org.mockito.Mockito.mock;
 class MicrometerTracingAutoConfigurationTests {
 
 	private final ApplicationContextRunner contextRunner = new ApplicationContextRunner()
-		.withPropertyValues("micrometer.observations.annotations.enabled=true")
+		.withPropertyValues("management.observations.annotations.enabled=true")
 		.withConfiguration(AutoConfigurations.of(MicrometerTracingAutoConfiguration.class));
 
 	@Test
 	void shouldSupplyBeans() {
 		this.contextRunner.withUserConfiguration(TracerConfiguration.class, PropagatorConfiguration.class)
-			.withPropertyValues("micrometer.observations.annotations.enabled=true")
 			.run((context) -> {
 				assertThat(context).hasSingleBean(DefaultTracingObservationHandler.class);
 				assertThat(context).hasSingleBean(PropagatingReceiverTracingObservationHandler.class);
@@ -138,7 +137,7 @@ class MicrometerTracingAutoConfigurationTests {
 	@Test
 	void shouldNotSupplyAspectBeansIfPropertyIsDisabled() {
 		this.contextRunner.withUserConfiguration(TracerConfiguration.class, PropagatorConfiguration.class)
-			.withPropertyValues("micrometer.observations.annotations.enabled=false")
+			.withPropertyValues("management.observations.annotations.enabled=false")
 			.run((context) -> {
 				assertThat(context).doesNotHaveBean(DefaultNewSpanParser.class);
 				assertThat(context).doesNotHaveBean(ImperativeMethodInvocationProcessor.class);
@@ -146,6 +145,18 @@ class MicrometerTracingAutoConfigurationTests {
 			});
 	}
 
+	@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)

spring-boot-project/spring-boot-docs/src/docs/asciidoc/actuator/metrics.adoc

@@ -1067,7 +1067,7 @@ Metrics for Jetty's `Connector` instances are bound by using Micrometer's `Jetty
 
 [[actuator.metrics.supported.timed-annotation]]
 ==== @Timed Annotation Support
-To enable scanning of `@Timed` annotations, you will need to set the configprop:micrometer.observations.annotations.enabled[] property to `true`.
+To enable scanning of `@Timed` annotations, you will need to set the configprop:management.observations.annotations.enabled[] property to `true`.
 Please refer to the {micrometer-concepts-docs}#_the_timed_annotation[Micrometer documentation].
 
 

spring-boot-project/spring-boot-docs/src/docs/asciidoc/actuator/observability.adoc

@@ -92,5 +92,5 @@ The next sections will provide more details about logging, metrics and traces.
 
 [[actuator.observability.annotations]]
 === Micrometer Observation Annotations support
-To enable scanning of metrics and tracing annotations like `@Timed`, `@Counted`, `@MeterTag` and `@NewSpan` annotations, you will need to set the configprop:micrometer.observations.annotations.enabled[] property to `true`.
+To enable scanning of metrics and tracing annotations like `@Timed`, `@Counted`, `@MeterTag` and `@NewSpan` annotations, you will need to set the configprop:management.observations.annotations.enabled[] property to `true`.
 This feature is supported Micrometer directly, please refer to the {micrometer-concepts-docs}#_the_timed_annotation[Micrometer] and {micrometer-tracing-docs}/api.html#_aspect_oriented_programming[Micrometer Tracing] reference docs.