Adapt to changes from micrometer-observation

- See micrometer-metrics/micrometer#3082

See gh-29666

Author: mhalbritter

build.gradle

@@ -25,6 +25,7 @@ allprojects {
 	group "org.springframework.boot"
 
 	repositories {
+		mavenLocal() // TODO MH: Remove
 		mavenCentral()
 		if (version.contains('-')) {
 			maven { url "https://repo.spring.io/milestone" }

spring-boot-project/spring-boot-actuator-autoconfigure/build.gradle

@@ -47,6 +47,7 @@ dependencies {
 	optional("com.zaxxer:HikariCP")
 	optional("io.dropwizard.metrics:metrics-jmx")
 	optional("io.lettuce:lettuce-core")
+	optional("io.micrometer:micrometer-observation")
 	optional("io.micrometer:micrometer-core")
 	optional("io.micrometer:micrometer-tracing-api")
 	optional("io.micrometer:micrometer-binders")

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

@@ -14,17 +14,17 @@
  * limitations under the License.
  */
 
-package org.springframework.boot.actuate.autoconfigure.metrics;
+package org.springframework.boot.actuate.autoconfigure.observation;
 
 import java.util.ArrayList;
 import java.util.List;
 
 import io.micrometer.core.instrument.observation.MeterObservationHandler;
-import io.micrometer.core.instrument.observation.Observation.GlobalTagsProvider;
-import io.micrometer.core.instrument.observation.ObservationHandler;
-import io.micrometer.core.instrument.observation.ObservationHandler.FirstMatchingCompositeObservationHandler;
-import io.micrometer.core.instrument.observation.ObservationPredicate;
-import io.micrometer.core.instrument.observation.ObservationRegistry;
+import io.micrometer.observation.Observation.GlobalTagsProvider;
+import io.micrometer.observation.ObservationHandler;
+import io.micrometer.observation.ObservationHandler.FirstMatchingCompositeObservationHandler;
+import io.micrometer.observation.ObservationPredicate;
+import io.micrometer.observation.ObservationRegistry;
 
 /**
  * Installs predicates, handlers and tag providers into a {@link ObservationRegistry}.

spring-boot-project/spring-boot-actuator-autoconfigure/src/main/java/org/springframework/boot/actuate/autoconfigure/metrics/NoTracingObservationRegistryCustomizer.java renamed to spring-boot-project/spring-boot-actuator-autoconfigure/src/main/java/org/springframework/boot/actuate/autoconfigure/observation/NoTracingObservationRegistryCustomizer.java

@@ -14,25 +14,25 @@
  * limitations under the License.
  */
 
-package org.springframework.boot.actuate.autoconfigure.metrics;
+package org.springframework.boot.actuate.autoconfigure.observation;
 
 import java.util.List;
 
 import io.micrometer.core.instrument.MeterRegistry;
-import io.micrometer.core.instrument.observation.Observation.GlobalTagsProvider;
-import io.micrometer.core.instrument.observation.ObservationHandler;
-import io.micrometer.core.instrument.observation.ObservationPredicate;
-import io.micrometer.core.instrument.observation.ObservationRegistry;
+import io.micrometer.observation.Observation.GlobalTagsProvider;
+import io.micrometer.observation.ObservationHandler;
+import io.micrometer.observation.ObservationPredicate;
+import io.micrometer.observation.ObservationRegistry;
 import io.micrometer.tracing.handler.TracingObservationHandler;
 
 import org.springframework.beans.factory.ObjectProvider;
+import org.springframework.boot.actuate.autoconfigure.metrics.CompositeMeterRegistryAutoConfiguration;
 import org.springframework.boot.autoconfigure.AutoConfiguration;
 import org.springframework.boot.autoconfigure.EnableAutoConfiguration;
 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.ConditionalOnMissingClass;
-import org.springframework.boot.context.properties.EnableConfigurationProperties;
 import org.springframework.context.annotation.Bean;
 import org.springframework.context.annotation.Configuration;
 
@@ -43,8 +43,7 @@
  * @since 3.0.0
  */
 @AutoConfiguration(after = CompositeMeterRegistryAutoConfiguration.class)
-@ConditionalOnBean(ObservationRegistry.class)
-@EnableConfigurationProperties(TimerObservationHandlerConfigurationProperties.class)
+@ConditionalOnClass(ObservationRegistry.class)
 public class ObservationAutoConfiguration {
 
 	@Bean
@@ -54,11 +53,21 @@ static ObservationRegistryPostProcessor observationRegistryPostProcessor(
 	}
 
 	@Bean
-	@ConditionalOnBean(MeterRegistry.class)
 	@ConditionalOnMissingBean
-	TimerObservationHandlerMeterRegistryCustomizer enableTimerObservationHandler(
-			TimerObservationHandlerConfigurationProperties configurationProperties) {
-		return new TimerObservationHandlerMeterRegistryCustomizer(configurationProperties);
+	ObservationRegistry observationRegistry() {
+		return ObservationRegistry.create();
+	}
+
+	@Configuration(proxyBeanMethods = false)
+	@ConditionalOnBean(MeterRegistry.class)
+	static class MetricsConfiguration {
+
+		@Bean
+		TimerObservationHandlerMeterRegistryCustomizer enableTimerObservationHandler(
+				ObservationRegistry observationRegistry) {
+			return new TimerObservationHandlerMeterRegistryCustomizer(observationRegistry);
+		}
+
 	}
 
 	@Configuration(proxyBeanMethods = false)

spring-boot-project/spring-boot-actuator-autoconfigure/src/main/java/org/springframework/boot/actuate/autoconfigure/metrics/ObservationAutoConfiguration.java renamed to spring-boot-project/spring-boot-actuator-autoconfigure/src/main/java/org/springframework/boot/actuate/autoconfigure/observation/ObservationAutoConfiguration.java

@@ -14,11 +14,11 @@
  * limitations under the License.
  */
 
-package org.springframework.boot.actuate.autoconfigure.metrics;
+package org.springframework.boot.actuate.autoconfigure.observation;
 
 import java.util.List;
 
-import io.micrometer.core.instrument.observation.ObservationRegistry;
+import io.micrometer.observation.ObservationRegistry;
 
 import org.springframework.beans.factory.ObjectProvider;
 import org.springframework.boot.util.LambdaSafe;

spring-boot-project/spring-boot-actuator-autoconfigure/src/main/java/org/springframework/boot/actuate/autoconfigure/metrics/ObservationRegistryConfigurer.java renamed to spring-boot-project/spring-boot-actuator-autoconfigure/src/main/java/org/springframework/boot/actuate/autoconfigure/observation/ObservationRegistryConfigurer.java

@@ -14,9 +14,9 @@
  * limitations under the License.
  */
 
-package org.springframework.boot.actuate.autoconfigure.metrics;
+package org.springframework.boot.actuate.autoconfigure.observation;
 
-import io.micrometer.core.instrument.observation.ObservationRegistry;
+import io.micrometer.observation.ObservationRegistry;
 
 /**
  * Callback interface that can be used to customize auto-configured

spring-boot-project/spring-boot-actuator-autoconfigure/src/main/java/org/springframework/boot/actuate/autoconfigure/metrics/ObservationRegistryCustomizer.java renamed to spring-boot-project/spring-boot-actuator-autoconfigure/src/main/java/org/springframework/boot/actuate/autoconfigure/observation/ObservationRegistryCustomizer.java

@@ -14,9 +14,9 @@
  * limitations under the License.
  */
 
-package org.springframework.boot.actuate.autoconfigure.metrics;
+package org.springframework.boot.actuate.autoconfigure.observation;
 
-import io.micrometer.core.instrument.observation.ObservationRegistry;
+import io.micrometer.observation.ObservationRegistry;
 
 import org.springframework.beans.BeansException;
 import org.springframework.beans.factory.ObjectProvider;

spring-boot-project/spring-boot-actuator-autoconfigure/src/main/java/org/springframework/boot/actuate/autoconfigure/metrics/ObservationRegistryPostProcessor.java renamed to spring-boot-project/spring-boot-actuator-autoconfigure/src/main/java/org/springframework/boot/actuate/autoconfigure/observation/ObservationRegistryPostProcessor.java

@@ -14,31 +14,30 @@
  * limitations under the License.
  */
 
-package org.springframework.boot.actuate.autoconfigure.metrics;
+package org.springframework.boot.actuate.autoconfigure.observation;
 
 import io.micrometer.core.instrument.MeterRegistry;
 import io.micrometer.core.instrument.observation.TimerObservationHandler;
+import io.micrometer.observation.ObservationRegistry;
+
+import org.springframework.boot.actuate.autoconfigure.metrics.MeterRegistryCustomizer;
 
 /**
- * Enables the {@link TimerObservationHandler} on a {@link MeterRegistry}.
+ * Registers the {@link TimerObservationHandler} with a {@link ObservationRegistry}.
  *
  * @author Moritz Halbritter
- * @since 3.0.0
  */
-public class TimerObservationHandlerMeterRegistryCustomizer implements MeterRegistryCustomizer<MeterRegistry> {
+class TimerObservationHandlerMeterRegistryCustomizer implements MeterRegistryCustomizer<MeterRegistry> {
 
-	private final TimerObservationHandlerConfigurationProperties configurationProperties;
+	private final ObservationRegistry observationRegistry;
 
-	public TimerObservationHandlerMeterRegistryCustomizer(
-			TimerObservationHandlerConfigurationProperties configurationProperties) {
-		this.configurationProperties = configurationProperties;
+	TimerObservationHandlerMeterRegistryCustomizer(ObservationRegistry observationRegistry) {
+		this.observationRegistry = observationRegistry;
 	}
 
 	@Override
 	public void customize(MeterRegistry registry) {
-		if (this.configurationProperties.isEnabled()) {
-			registry.withTimerObservationHandler();
-		}
+		this.observationRegistry.observationConfig().observationHandler(new TimerObservationHandler(registry));
 	}
 
 }

spring-boot-project/spring-boot-actuator-autoconfigure/src/main/java/org/springframework/boot/actuate/autoconfigure/metrics/TimerObservationHandlerMeterRegistryCustomizer.java renamed to spring-boot-project/spring-boot-actuator-autoconfigure/src/main/java/org/springframework/boot/actuate/autoconfigure/observation/TimerObservationHandlerMeterRegistryCustomizer.java

@@ -14,16 +14,16 @@
  * limitations under the License.
  */
 
-package org.springframework.boot.actuate.autoconfigure.metrics;
+package org.springframework.boot.actuate.autoconfigure.observation;
 
 import java.util.ArrayList;
 import java.util.List;
 
-import io.micrometer.core.instrument.observation.Observation.GlobalTagsProvider;
-import io.micrometer.core.instrument.observation.ObservationHandler;
-import io.micrometer.core.instrument.observation.ObservationHandler.FirstMatchingCompositeObservationHandler;
-import io.micrometer.core.instrument.observation.ObservationPredicate;
-import io.micrometer.core.instrument.observation.ObservationRegistry;
+import io.micrometer.observation.Observation.GlobalTagsProvider;
+import io.micrometer.observation.ObservationHandler;
+import io.micrometer.observation.ObservationHandler.FirstMatchingCompositeObservationHandler;
+import io.micrometer.observation.ObservationPredicate;
+import io.micrometer.observation.ObservationRegistry;
 import io.micrometer.tracing.handler.TracingObservationHandler;
 
 /**

spring-boot-project/spring-boot-actuator-autoconfigure/src/main/java/org/springframework/boot/actuate/autoconfigure/metrics/TracingObservationRegistryCustomizer.java renamed to spring-boot-project/spring-boot-actuator-autoconfigure/src/main/java/org/springframework/boot/actuate/autoconfigure/observation/TracingObservationRegistryCustomizer.java

@@ -44,7 +44,6 @@ org.springframework.boot.actuate.autoconfigure.metrics.Log4J2MetricsAutoConfigur
 org.springframework.boot.actuate.autoconfigure.metrics.LogbackMetricsAutoConfiguration
 org.springframework.boot.actuate.autoconfigure.metrics.MetricsAutoConfiguration
 org.springframework.boot.actuate.autoconfigure.metrics.MetricsEndpointAutoConfiguration
-org.springframework.boot.actuate.autoconfigure.metrics.ObservationAutoConfiguration
 org.springframework.boot.actuate.autoconfigure.metrics.SystemMetricsAutoConfiguration
 org.springframework.boot.actuate.autoconfigure.metrics.amqp.RabbitMetricsAutoConfiguration
 org.springframework.boot.actuate.autoconfigure.metrics.cache.CacheMetricsAutoConfiguration
@@ -82,6 +81,7 @@ org.springframework.boot.actuate.autoconfigure.metrics.web.tomcat.TomcatMetricsA
 org.springframework.boot.actuate.autoconfigure.mongo.MongoHealthContributorAutoConfiguration
 org.springframework.boot.actuate.autoconfigure.mongo.MongoReactiveHealthContributorAutoConfiguration
 org.springframework.boot.actuate.autoconfigure.neo4j.Neo4jHealthContributorAutoConfiguration
+org.springframework.boot.actuate.autoconfigure.observation.ObservationAutoConfiguration
 org.springframework.boot.actuate.autoconfigure.quartz.QuartzEndpointAutoConfiguration
 org.springframework.boot.actuate.autoconfigure.r2dbc.ConnectionFactoryHealthContributorAutoConfiguration
 org.springframework.boot.actuate.autoconfigure.redis.RedisHealthContributorAutoConfiguration

spring-boot-project/spring-boot-actuator-autoconfigure/src/main/resources/META-INF/spring/org.springframework.boot.autoconfigure.AutoConfiguration.imports

@@ -14,24 +14,24 @@
  * limitations under the License.
  */
 
-package org.springframework.boot.actuate.autoconfigure.metrics;
+package org.springframework.boot.actuate.autoconfigure.observation;
 
 import java.util.ArrayList;
 import java.util.List;
 
 import io.micrometer.core.instrument.MeterRegistry;
-import io.micrometer.core.instrument.Tag;
-import io.micrometer.core.instrument.Tags;
 import io.micrometer.core.instrument.observation.MeterObservationHandler;
-import io.micrometer.core.instrument.observation.Observation;
-import io.micrometer.core.instrument.observation.Observation.Context;
-import io.micrometer.core.instrument.observation.Observation.GlobalTagsProvider;
-import io.micrometer.core.instrument.observation.ObservationHandler;
-import io.micrometer.core.instrument.observation.ObservationHandler.AllMatchingCompositeObservationHandler;
-import io.micrometer.core.instrument.observation.ObservationHandler.FirstMatchingCompositeObservationHandler;
-import io.micrometer.core.instrument.observation.ObservationPredicate;
-import io.micrometer.core.instrument.observation.ObservationRegistry;
 import io.micrometer.core.instrument.search.MeterNotFoundException;
+import io.micrometer.observation.Observation;
+import io.micrometer.observation.Observation.Context;
+import io.micrometer.observation.Observation.GlobalTagsProvider;
+import io.micrometer.observation.ObservationHandler;
+import io.micrometer.observation.ObservationHandler.AllMatchingCompositeObservationHandler;
+import io.micrometer.observation.ObservationHandler.FirstMatchingCompositeObservationHandler;
+import io.micrometer.observation.ObservationPredicate;
+import io.micrometer.observation.ObservationRegistry;
+import io.micrometer.observation.Tag;
+import io.micrometer.observation.Tags;
 import io.micrometer.tracing.Tracer;
 import io.micrometer.tracing.handler.TracingObservationHandler;
 import org.junit.jupiter.api.Nested;
@@ -68,32 +68,31 @@ class NoTracingTests {
 		@Test
 		void autoConfiguresTimerObservationHandler() {
 			this.contextRunner.run((context) -> {
-				MeterRegistry meterRegistry = context.getBean(MeterRegistry.class);
-				Observation.start("test-observation", meterRegistry).stop();
+				ObservationRegistry observationRegistry = context.getBean(ObservationRegistry.class);
+				Observation.start("test-observation", observationRegistry).stop();
 				// When a TimerObservationHandler is registered, every stopped Observation
 				// leads to a timer
+				MeterRegistry meterRegistry = context.getBean(MeterRegistry.class);
 				assertThat(meterRegistry.get("test-observation").timer().count()).isEqualTo(1);
 			});
 		}
 
 		@Test
 		void allowsTimerObservationHandlerToBeDisabled() {
-			this.contextRunner.withPropertyValues("management.metrics.observation.enabled=false").run((context) -> {
-				MeterRegistry meterRegistry = context.getBean(MeterRegistry.class);
-				Observation.start("test-observation", meterRegistry).stop();
-				assertThatThrownBy(() -> meterRegistry.get("test-observation").timer())
-						.isInstanceOf(MeterNotFoundException.class);
-			});
+			this.contextRunner.withClassLoader(new FilteredClassLoader(MeterRegistry.class))
+					.run((context) -> assertThat(context)
+							.doesNotHaveBean(TimerObservationHandlerMeterRegistryCustomizer.class));
 		}
 
 		@Test
 		void autoConfiguresObservationPredicates() {
 			this.contextRunner.withUserConfiguration(ObservationPredicates.class).run((context) -> {
-				MeterRegistry meterRegistry = context.getBean(MeterRegistry.class);
+				ObservationRegistry observationRegistry = context.getBean(ObservationRegistry.class);
 				// This is allowed by ObservationPredicates.customPredicate
-				Observation.start("observation1", meterRegistry).start().stop();
+				Observation.start("observation1", observationRegistry).start().stop();
 				// This isn't allowed by ObservationPredicates.customPredicate
-				Observation.start("observation2", meterRegistry).start().stop();
+				Observation.start("observation2", observationRegistry).start().stop();
+				MeterRegistry meterRegistry = context.getBean(MeterRegistry.class);
 				assertThat(meterRegistry.get("observation1").timer().count()).isEqualTo(1);
 				assertThatThrownBy(() -> meterRegistry.get("observation2").timer())
 						.isInstanceOf(MeterNotFoundException.class);