Remove actuate from restructured metrics package names

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

@@ -41,8 +41,8 @@ import org.springframework.boot.actuate.autoconfigure.observation.web.servlet.We
 import org.springframework.boot.autoconfigure.ImportAutoConfiguration;
 import org.springframework.boot.http.converter.autoconfigure.HttpMessageConvertersAutoConfiguration;
 import org.springframework.boot.jackson.autoconfigure.JacksonAutoConfiguration;
-import org.springframework.boot.jdbc.actuate.metrics.autoconfigure.DataSourcePoolMetricsAutoConfiguration;
-import org.springframework.boot.jpa.hibernate.actuate.metrics.autoconfigure.HibernateMetricsAutoConfiguration;
+import org.springframework.boot.jdbc.metrics.autoconfigure.DataSourcePoolMetricsAutoConfiguration;
+import org.springframework.boot.jpa.hibernate.metrics.autoconfigure.HibernateMetricsAutoConfiguration;
 import org.springframework.boot.metrics.autoconfigure.MetricsAutoConfiguration;
 import org.springframework.boot.metrics.autoconfigure.jvm.JvmMetricsAutoConfiguration;
 import org.springframework.boot.metrics.autoconfigure.logging.logback.LogbackMetricsAutoConfiguration;

spring-boot-project/spring-boot-amqp/src/main/java/org/springframework/boot/amqp/metrics/RabbitMetrics.java

@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package org.springframework.boot.amqp.actuate.metrics;
+package org.springframework.boot.amqp.metrics;
 
 import java.util.Collections;
 

spring-boot-project/spring-boot-amqp/src/main/java/org/springframework/boot/amqp/metrics/autoconfigure/RabbitConnectionFactoryMetricsPostProcessor.java

@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package org.springframework.boot.amqp.actuate.metrics.autoconfigure;
+package org.springframework.boot.amqp.metrics.autoconfigure;
 
 import com.rabbitmq.client.ConnectionFactory;
 import com.rabbitmq.client.MetricsCollector;
@@ -23,7 +23,7 @@ import io.micrometer.core.instrument.Tags;
 
 import org.springframework.amqp.rabbit.connection.AbstractConnectionFactory;
 import org.springframework.beans.factory.config.BeanPostProcessor;
-import org.springframework.boot.amqp.actuate.metrics.RabbitMetrics;
+import org.springframework.boot.amqp.metrics.RabbitMetrics;
 import org.springframework.context.ApplicationContext;
 import org.springframework.core.Ordered;
 import org.springframework.util.StringUtils;

spring-boot-project/spring-boot-amqp/src/main/java/org/springframework/boot/amqp/metrics/autoconfigure/RabbitMetricsAutoConfiguration.java

@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package org.springframework.boot.amqp.actuate.metrics.autoconfigure;
+package org.springframework.boot.amqp.metrics.autoconfigure;
 
 import com.rabbitmq.client.ConnectionFactory;
 import io.micrometer.core.instrument.MeterRegistry;

spring-boot-project/spring-boot-amqp/src/main/java/org/springframework/boot/amqp/metrics/autoconfigure/package-info.java

@@ -17,4 +17,4 @@
 /**
  * Auto-configuration for RabbitMQ metrics.
  */
-package org.springframework.boot.amqp.actuate.metrics.autoconfigure;
+package org.springframework.boot.amqp.metrics.autoconfigure;

spring-boot-project/spring-boot-amqp/src/main/java/org/springframework/boot/amqp/metrics/package-info.java

@@ -17,4 +17,4 @@
 /**
  * Metrics for AMQP and RabbitMQ.
  */
-package org.springframework.boot.amqp.actuate.metrics;
+package org.springframework.boot.amqp.metrics;

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

@@ -1,3 +1,3 @@
 org.springframework.boot.amqp.actuate.health.autoconfigure.RabbitHealthContributorAutoConfiguration
-org.springframework.boot.amqp.actuate.metrics.autoconfigure.RabbitMetricsAutoConfiguration
 org.springframework.boot.amqp.autoconfigure.RabbitAutoConfiguration
+org.springframework.boot.amqp.metrics.autoconfigure.RabbitMetricsAutoConfiguration

spring-boot-project/spring-boot-amqp/src/test/java/org/springframework/boot/amqp/metrics/RabbitMetricsTests.java

@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package org.springframework.boot.amqp.actuate.metrics;
+package org.springframework.boot.amqp.metrics;
 
 import com.rabbitmq.client.ConnectionFactory;
 import io.micrometer.core.instrument.Tags;

spring-boot-project/spring-boot-amqp/src/test/java/org/springframework/boot/amqp/metrics/autoconfigure/RabbitMetricsAutoConfigurationMeterBinderCycleIntegrationTests.java

@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package org.springframework.boot.actuate.autoconfigure.metrics.amqp;
+package org.springframework.boot.amqp.metrics.autoconfigure;
 
 import io.micrometer.core.instrument.MeterRegistry;
 import io.micrometer.core.instrument.binder.MeterBinder;
@@ -22,7 +22,6 @@ import io.micrometer.core.instrument.simple.SimpleMeterRegistry;
 import org.junit.jupiter.api.Test;
 
 import org.springframework.amqp.rabbit.core.RabbitTemplate;
-import org.springframework.boot.amqp.actuate.metrics.autoconfigure.RabbitMetricsAutoConfiguration;
 import org.springframework.boot.amqp.autoconfigure.RabbitAutoConfiguration;
 import org.springframework.boot.metrics.autoconfigure.MetricsAutoConfiguration;
 import org.springframework.context.annotation.AnnotationConfigApplicationContext;

spring-boot-project/spring-boot-amqp/src/test/java/org/springframework/boot/amqp/metrics/autoconfigure/RabbitMetricsAutoConfigurationTests.java

@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package org.springframework.boot.actuate.autoconfigure.metrics.amqp;
+package org.springframework.boot.amqp.metrics.autoconfigure;
 
 import io.micrometer.core.instrument.MeterRegistry;
 import io.micrometer.core.instrument.simple.SimpleMeterRegistry;
@@ -22,7 +22,6 @@ import org.junit.jupiter.api.Test;
 
 import org.springframework.amqp.rabbit.connection.CachingConnectionFactory;
 import org.springframework.amqp.rabbit.connection.ConnectionFactory;
-import org.springframework.boot.amqp.actuate.metrics.autoconfigure.RabbitMetricsAutoConfiguration;
 import org.springframework.boot.amqp.autoconfigure.RabbitAutoConfiguration;
 import org.springframework.boot.autoconfigure.AutoConfigurations;
 import org.springframework.boot.metrics.autoconfigure.MetricsAutoConfiguration;

spring-boot-project/spring-boot-cache/src/dockerTest/java/org/springframework/boot/cache/metrics/RedisCacheMetricsTests.java

@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package org.springframework.boot.cache.actuate.metrics;
+package org.springframework.boot.cache.metrics;
 
 import java.util.UUID;
 import java.util.function.BiConsumer;

spring-boot-project/spring-boot-cache/src/main/java/org/springframework/boot/cache/metrics/Cache2kCacheMeterBinderProvider.java

@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package org.springframework.boot.cache.actuate.metrics;
+package org.springframework.boot.cache.metrics;
 
 import io.micrometer.core.instrument.Tag;
 import io.micrometer.core.instrument.binder.MeterBinder;

spring-boot-project/spring-boot-cache/src/main/java/org/springframework/boot/cache/metrics/CacheMeterBinderProvider.java

@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package org.springframework.boot.cache.actuate.metrics;
+package org.springframework.boot.cache.metrics;
 
 import io.micrometer.core.instrument.Tag;
 import io.micrometer.core.instrument.binder.MeterBinder;

spring-boot-project/spring-boot-cache/src/main/java/org/springframework/boot/cache/metrics/CacheMetricsRegistrar.java

@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package org.springframework.boot.cache.actuate.metrics;
+package org.springframework.boot.cache.metrics;
 
 import java.util.Collection;
 import java.util.Objects;

spring-boot-project/spring-boot-cache/src/main/java/org/springframework/boot/cache/metrics/CaffeineCacheMeterBinderProvider.java

@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package org.springframework.boot.cache.actuate.metrics;
+package org.springframework.boot.cache.metrics;
 
 import io.micrometer.core.instrument.Tag;
 import io.micrometer.core.instrument.binder.MeterBinder;

spring-boot-project/spring-boot-cache/src/main/java/org/springframework/boot/cache/metrics/HazelcastCacheMeterBinderProvider.java

@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package org.springframework.boot.cache.actuate.metrics;
+package org.springframework.boot.cache.metrics;
 
 import java.lang.reflect.Constructor;
 import java.lang.reflect.Method;
@@ -27,7 +27,7 @@ import io.micrometer.core.instrument.binder.cache.HazelcastCacheMetrics;
 import org.springframework.aot.hint.ExecutableMode;
 import org.springframework.aot.hint.RuntimeHints;
 import org.springframework.aot.hint.RuntimeHintsRegistrar;
-import org.springframework.boot.cache.actuate.metrics.HazelcastCacheMeterBinderProvider.HazelcastCacheMeterBinderProviderRuntimeHints;
+import org.springframework.boot.cache.metrics.HazelcastCacheMeterBinderProvider.HazelcastCacheMeterBinderProviderRuntimeHints;
 import org.springframework.context.annotation.ImportRuntimeHints;
 import org.springframework.util.Assert;
 import org.springframework.util.ReflectionUtils;

spring-boot-project/spring-boot-cache/src/main/java/org/springframework/boot/cache/metrics/JCacheCacheMeterBinderProvider.java

@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package org.springframework.boot.cache.actuate.metrics;
+package org.springframework.boot.cache.metrics;
 
 import io.micrometer.core.instrument.Tag;
 import io.micrometer.core.instrument.binder.MeterBinder;

spring-boot-project/spring-boot-cache/src/main/java/org/springframework/boot/cache/metrics/RedisCacheMeterBinderProvider.java

@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package org.springframework.boot.cache.actuate.metrics;
+package org.springframework.boot.cache.metrics;
 
 import io.micrometer.core.instrument.Tag;
 import io.micrometer.core.instrument.binder.MeterBinder;

spring-boot-project/spring-boot-cache/src/main/java/org/springframework/boot/cache/metrics/RedisCacheMetrics.java

@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package org.springframework.boot.cache.actuate.metrics;
+package org.springframework.boot.cache.metrics;
 
 import java.util.concurrent.TimeUnit;
 

spring-boot-project/spring-boot-cache/src/main/java/org/springframework/boot/cache/metrics/autoconfigure/CacheMeterBinderProvidersConfiguration.java

@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package org.springframework.boot.cache.actuate.metrics.autoconfigure;
+package org.springframework.boot.cache.metrics.autoconfigure;
 
 import com.hazelcast.core.Hazelcast;
 import com.hazelcast.spring.cache.HazelcastCache;
@@ -24,12 +24,12 @@ import org.cache2k.extra.micrometer.Cache2kCacheMetrics;
 import org.cache2k.extra.spring.SpringCache2kCache;
 
 import org.springframework.boot.autoconfigure.condition.ConditionalOnClass;
-import org.springframework.boot.cache.actuate.metrics.Cache2kCacheMeterBinderProvider;
-import org.springframework.boot.cache.actuate.metrics.CacheMeterBinderProvider;
-import org.springframework.boot.cache.actuate.metrics.CaffeineCacheMeterBinderProvider;
-import org.springframework.boot.cache.actuate.metrics.HazelcastCacheMeterBinderProvider;
-import org.springframework.boot.cache.actuate.metrics.JCacheCacheMeterBinderProvider;
-import org.springframework.boot.cache.actuate.metrics.RedisCacheMeterBinderProvider;
+import org.springframework.boot.cache.metrics.Cache2kCacheMeterBinderProvider;
+import org.springframework.boot.cache.metrics.CacheMeterBinderProvider;
+import org.springframework.boot.cache.metrics.CaffeineCacheMeterBinderProvider;
+import org.springframework.boot.cache.metrics.HazelcastCacheMeterBinderProvider;
+import org.springframework.boot.cache.metrics.JCacheCacheMeterBinderProvider;
+import org.springframework.boot.cache.metrics.RedisCacheMeterBinderProvider;
 import org.springframework.cache.caffeine.CaffeineCache;
 import org.springframework.cache.jcache.JCacheCache;
 import org.springframework.context.annotation.Bean;

spring-boot-project/spring-boot-cache/src/main/java/org/springframework/boot/cache/metrics/autoconfigure/CacheMetricsAutoConfiguration.java

@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package org.springframework.boot.cache.actuate.metrics.autoconfigure;
+package org.springframework.boot.cache.metrics.autoconfigure;
 
 import io.micrometer.core.instrument.MeterRegistry;
 

spring-boot-project/spring-boot-cache/src/main/java/org/springframework/boot/cache/metrics/autoconfigure/CacheMetricsRegistrarConfiguration.java

@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package org.springframework.boot.cache.actuate.metrics.autoconfigure;
+package org.springframework.boot.cache.metrics.autoconfigure;
 
 import java.util.Collection;
 import java.util.Map;
@@ -25,8 +25,8 @@ import io.micrometer.core.instrument.Tag;
 import org.springframework.beans.factory.config.ConfigurableListableBeanFactory;
 import org.springframework.beans.factory.support.SimpleAutowireCandidateResolver;
 import org.springframework.boot.autoconfigure.condition.ConditionalOnBean;
-import org.springframework.boot.cache.actuate.metrics.CacheMeterBinderProvider;
-import org.springframework.boot.cache.actuate.metrics.CacheMetricsRegistrar;
+import org.springframework.boot.cache.metrics.CacheMeterBinderProvider;
+import org.springframework.boot.cache.metrics.CacheMetricsRegistrar;
 import org.springframework.cache.Cache;
 import org.springframework.cache.CacheManager;
 import org.springframework.context.annotation.Bean;

spring-boot-project/spring-boot-cache/src/main/java/org/springframework/boot/cache/metrics/autoconfigure/package-info.java

@@ -17,4 +17,4 @@
 /**
  * Auto-configuration for cache metrics.
  */
-package org.springframework.boot.cache.actuate.metrics.autoconfigure;
+package org.springframework.boot.cache.metrics.autoconfigure;

spring-boot-project/spring-boot-cache/src/main/java/org/springframework/boot/cache/metrics/package-info.java

@@ -17,4 +17,4 @@
 /**
  * Metrics for caches.
  */
-package org.springframework.boot.cache.actuate.metrics;
+package org.springframework.boot.cache.metrics;

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

@@ -1,3 +1,3 @@
 org.springframework.boot.cache.actuate.endpoint.autoconfigure.CachesEndpointAutoConfiguration
-org.springframework.boot.cache.actuate.metrics.autoconfigure.CacheMetricsAutoConfiguration
 org.springframework.boot.cache.autoconfigure.CacheAutoConfiguration
+org.springframework.boot.cache.metrics.autoconfigure.CacheMetricsAutoConfiguration

spring-boot-project/spring-boot-cache/src/test/java/org/springframework/boot/actuate/autoconfigure/metrics/cache/CacheMetricsAutoConfigurationTests.java

@@ -25,8 +25,8 @@ import io.micrometer.core.instrument.simple.SimpleMeterRegistry;
 import org.junit.jupiter.api.Test;
 
 import org.springframework.boot.autoconfigure.AutoConfigurations;
-import org.springframework.boot.cache.actuate.metrics.autoconfigure.CacheMetricsAutoConfiguration;
 import org.springframework.boot.cache.autoconfigure.CacheAutoConfiguration;
+import org.springframework.boot.cache.metrics.autoconfigure.CacheMetricsAutoConfiguration;
 import org.springframework.boot.test.context.runner.ApplicationContextRunner;
 import org.springframework.cache.CacheManager;
 import org.springframework.cache.annotation.CachingConfigurer;

spring-boot-project/spring-boot-cache/src/test/java/org/springframework/boot/cache/metrics/Cache2kCacheMeterBinderProviderTests.java

@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package org.springframework.boot.cache.actuate.metrics;
+package org.springframework.boot.cache.metrics;
 
 import java.util.Collections;
 

spring-boot-project/spring-boot-cache/src/test/java/org/springframework/boot/cache/metrics/CacheMetricsRegistrarTests.java

@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package org.springframework.boot.cache.actuate.metrics;
+package org.springframework.boot.cache.metrics;
 
 import java.util.Collections;
 

spring-boot-project/spring-boot-cache/src/test/java/org/springframework/boot/cache/metrics/CaffeineCacheMeterBinderProviderTests.java

@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package org.springframework.boot.cache.actuate.metrics;
+package org.springframework.boot.cache.metrics;
 
 import java.util.Collections;
 

spring-boot-project/spring-boot-cache/src/test/java/org/springframework/boot/cache/metrics/HazelcastCacheMeterBinderProviderTests.java

@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package org.springframework.boot.cache.actuate.metrics;
+package org.springframework.boot.cache.metrics;
 
 import java.util.Collections;
 
@@ -26,7 +26,7 @@ import org.junit.jupiter.api.Test;
 
 import org.springframework.aot.hint.RuntimeHints;
 import org.springframework.aot.hint.predicate.RuntimeHintsPredicates;
-import org.springframework.boot.cache.actuate.metrics.HazelcastCacheMeterBinderProvider.HazelcastCacheMeterBinderProviderRuntimeHints;
+import org.springframework.boot.cache.metrics.HazelcastCacheMeterBinderProvider.HazelcastCacheMeterBinderProviderRuntimeHints;
 
 import static org.assertj.core.api.Assertions.assertThat;
 import static org.mockito.BDDMockito.given;

spring-boot-project/spring-boot-cache/src/test/java/org/springframework/boot/cache/metrics/JCacheCacheMeterBinderProviderTests.java

@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package org.springframework.boot.cache.actuate.metrics;
+package org.springframework.boot.cache.metrics;
 
 import java.net.URI;
 import java.net.URISyntaxException;

spring-boot-project/spring-boot-cache/src/test/java/org/springframework/boot/cache/metrics/RedisCacheMeterBinderProviderTests.java

@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package org.springframework.boot.cache.actuate.metrics;
+package org.springframework.boot.cache.metrics;
 
 import java.util.Collections;
 

spring-boot-project/spring-boot-data-redis/src/main/java/org/springframework/boot/data/redis/metrics/autoconfigure/LettuceMetricsAutoConfiguration.java

@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package org.springframework.boot.data.redis.actuate.metrics.autoconfigure;
+package org.springframework.boot.data.redis.metrics.autoconfigure;
 
 import io.lettuce.core.RedisClient;
 import io.lettuce.core.metrics.MicrometerCommandLatencyRecorder;

spring-boot-project/spring-boot-data-redis/src/main/java/org/springframework/boot/data/redis/metrics/autoconfigure/package-info.java

@@ -17,4 +17,4 @@
 /**
  * Auto-configuration for Redis metrics.
  */
-package org.springframework.boot.data.redis.actuate.metrics.autoconfigure;
+package org.springframework.boot.data.redis.metrics.autoconfigure;

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

@@ -1,6 +1,6 @@
 org.springframework.boot.data.redis.actuate.health.autoconfigure.RedisHealthContributorAutoConfiguration
 org.springframework.boot.data.redis.actuate.health.autoconfigure.RedisReactiveHealthContributorAutoConfiguration
-org.springframework.boot.data.redis.actuate.metrics.autoconfigure.LettuceMetricsAutoConfiguration
 org.springframework.boot.data.redis.autoconfigure.RedisAutoConfiguration
 org.springframework.boot.data.redis.autoconfigure.RedisReactiveAutoConfiguration
 org.springframework.boot.data.redis.autoconfigure.RedisRepositoriesAutoConfiguration
+org.springframework.boot.data.redis.metrics.autoconfigure.LettuceMetricsAutoConfiguration

spring-boot-project/spring-boot-data-redis/src/test/java/org/springframework/boot/data/redis/metrics/autoconfigure/LettuceMetricsAutoConfigurationTests.java

@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package org.springframework.boot.data.redis.actuate.metrics.autoconfigure;
+package org.springframework.boot.data.redis.metrics.autoconfigure;
 
 import io.lettuce.core.metrics.MicrometerCommandLatencyRecorder;
 import io.lettuce.core.metrics.MicrometerOptions;

spring-boot-project/spring-boot-integration/src/main/java/org/springframework/boot/integration/metrics/autoconfigure/IntegrationMetricsAutoConfiguration.java

@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package org.springframework.boot.integration.actuate.metrics.autoconfigure;
+package org.springframework.boot.integration.metrics.autoconfigure;
 
 import io.micrometer.core.instrument.MeterRegistry;
 

spring-boot-project/spring-boot-integration/src/main/java/org/springframework/boot/integration/metrics/autoconfigure/package-info.java

@@ -17,4 +17,4 @@
 /**
  * Auto-configuration for Spring Integration metrics.
  */
-package org.springframework.boot.integration.actuate.metrics.autoconfigure;
+package org.springframework.boot.integration.metrics.autoconfigure;

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

@@ -1,3 +1,3 @@
 org.springframework.boot.integration.actuate.endpoint.autoconfigure.IntegrationGraphEndpointAutoConfiguration
-org.springframework.boot.integration.actuate.metrics.autoconfigure.IntegrationMetricsAutoConfiguration
 org.springframework.boot.integration.autoconfigure.IntegrationAutoConfiguration
+org.springframework.boot.integration.metrics.autoconfigure.IntegrationMetricsAutoConfiguration

spring-boot-project/spring-boot-integration/src/test/java/org/springframework/boot/integration/metrics/autoconfigure/IntegrationMetricsAutoConfigurationTests.java

@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package org.springframework.boot.integration.actuate.metrics.autoconfigure;
+package org.springframework.boot.integration.metrics.autoconfigure;
 
 import io.micrometer.core.instrument.Gauge;
 import io.micrometer.core.instrument.MeterRegistry;

spring-boot-project/spring-boot-jdbc/src/main/java/org/springframework/boot/jdbc/metrics/DataSourcePoolMetrics.java

@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package org.springframework.boot.jdbc.actuate.metrics;
+package org.springframework.boot.jdbc.metrics;
 
 import java.util.Collection;
 import java.util.Map;

spring-boot-project/spring-boot-jdbc/src/main/java/org/springframework/boot/jdbc/metrics/autoconfigure/DataSourcePoolMetricsAutoConfiguration.java

@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package org.springframework.boot.jdbc.actuate.metrics.autoconfigure;
+package org.springframework.boot.jdbc.metrics.autoconfigure;
 
 import java.util.Collection;
 import java.util.Collections;
@@ -39,9 +39,9 @@ import org.springframework.boot.autoconfigure.EnableAutoConfiguration;
 import org.springframework.boot.autoconfigure.condition.ConditionalOnBean;
 import org.springframework.boot.autoconfigure.condition.ConditionalOnClass;
 import org.springframework.boot.jdbc.DataSourceUnwrapper;
-import org.springframework.boot.jdbc.actuate.metrics.DataSourcePoolMetrics;
 import org.springframework.boot.jdbc.autoconfigure.DataSourceAutoConfiguration;
 import org.springframework.boot.jdbc.metadata.DataSourcePoolMetadataProvider;
+import org.springframework.boot.jdbc.metrics.DataSourcePoolMetrics;
 import org.springframework.context.annotation.Bean;
 import org.springframework.context.annotation.Configuration;
 import org.springframework.core.log.LogMessage;

spring-boot-project/spring-boot-jdbc/src/main/java/org/springframework/boot/jdbc/metrics/autoconfigure/package-info.java

@@ -17,4 +17,4 @@
 /**
  * Auto-configuration for JPA metrics.
  */
-package org.springframework.boot.jdbc.actuate.metrics.autoconfigure;
+package org.springframework.boot.jdbc.metrics.autoconfigure;

spring-boot-project/spring-boot-jdbc/src/main/java/org/springframework/boot/jdbc/metrics/package-info.java

@@ -17,4 +17,4 @@
 /**
  * Metrics for JDBC.
  */
-package org.springframework.boot.jdbc.actuate.metrics;
+package org.springframework.boot.jdbc.metrics;

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

@@ -1,5 +1,4 @@
 org.springframework.boot.jdbc.actuate.health.autoconfigure.DataSourceHealthContributorAutoConfiguration
-org.springframework.boot.jdbc.actuate.metrics.autoconfigure.DataSourcePoolMetricsAutoConfiguration
 org.springframework.boot.jdbc.autoconfigure.DataSourceAutoConfiguration
 org.springframework.boot.jdbc.autoconfigure.DataSourceInitializationAutoConfiguration
 org.springframework.boot.jdbc.autoconfigure.DataSourceTransactionManagerAutoConfiguration
@@ -7,3 +6,4 @@ org.springframework.boot.jdbc.autoconfigure.JdbcClientAutoConfiguration
 org.springframework.boot.jdbc.autoconfigure.JdbcTemplateAutoConfiguration
 org.springframework.boot.jdbc.autoconfigure.JndiDataSourceAutoConfiguration
 org.springframework.boot.jdbc.autoconfigure.XADataSourceAutoConfiguration
+org.springframework.boot.jdbc.metrics.autoconfigure.DataSourcePoolMetricsAutoConfiguration

spring-boot-project/spring-boot-jdbc/src/test/java/org/springframework/boot/jdbc/metrics/DataSourcePoolMetricsTests.java

@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package org.springframework.boot.jdbc.actuate.metrics;
+package org.springframework.boot.jdbc.metrics;
 
 import java.util.Collection;
 import java.util.Collections;

spring-boot-project/spring-boot-jdbc/src/test/java/org/springframework/boot/jdbc/metrics/autoconfigure/DataSourcePoolMetricsAutoConfigurationTests.java

@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package org.springframework.boot.jdbc.actuate.metrics.autoconfigure;
+package org.springframework.boot.jdbc.metrics.autoconfigure;
 
 import java.sql.SQLException;
 import java.util.UUID;

spring-boot-project/spring-boot-jetty/src/main/java/org/springframework/boot/jetty/metrics/AbstractJettyMetricsBinder.java

@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package org.springframework.boot.jetty.actuate.metrics;
+package org.springframework.boot.jetty.metrics;
 
 import org.eclipse.jetty.server.Server;
 

spring-boot-project/spring-boot-jetty/src/main/java/org/springframework/boot/jetty/metrics/JettyConnectionMetricsBinder.java

@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package org.springframework.boot.jetty.actuate.metrics;
+package org.springframework.boot.jetty.metrics;
 
 import java.util.Collections;
 

spring-boot-project/spring-boot-jetty/src/main/java/org/springframework/boot/jetty/metrics/JettyServerThreadPoolMetricsBinder.java

@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package org.springframework.boot.jetty.actuate.metrics;
+package org.springframework.boot.jetty.metrics;
 
 import java.util.Collections;
 

spring-boot-project/spring-boot-jetty/src/main/java/org/springframework/boot/jetty/metrics/JettySslHandshakeMetricsBinder.java

@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package org.springframework.boot.jetty.actuate.metrics;
+package org.springframework.boot.jetty.metrics;
 
 import java.util.Collections;
 

spring-boot-project/spring-boot-jetty/src/main/java/org/springframework/boot/jetty/metrics/autoconfigure/JettyMetricsAutoConfiguration.java

@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package org.springframework.boot.jetty.actuate.metrics.autoconfigure;
+package org.springframework.boot.jetty.metrics.autoconfigure;
 
 import io.micrometer.core.instrument.MeterRegistry;
 import io.micrometer.core.instrument.binder.jetty.JettyConnectionMetrics;
@@ -29,9 +29,9 @@ import org.springframework.boot.autoconfigure.condition.ConditionalOnBooleanProp
 import org.springframework.boot.autoconfigure.condition.ConditionalOnClass;
 import org.springframework.boot.autoconfigure.condition.ConditionalOnMissingBean;
 import org.springframework.boot.autoconfigure.condition.ConditionalOnWebApplication;
-import org.springframework.boot.jetty.actuate.metrics.JettyConnectionMetricsBinder;
-import org.springframework.boot.jetty.actuate.metrics.JettyServerThreadPoolMetricsBinder;
-import org.springframework.boot.jetty.actuate.metrics.JettySslHandshakeMetricsBinder;
+import org.springframework.boot.jetty.metrics.JettyConnectionMetricsBinder;
+import org.springframework.boot.jetty.metrics.JettyServerThreadPoolMetricsBinder;
+import org.springframework.boot.jetty.metrics.JettySslHandshakeMetricsBinder;
 import org.springframework.context.annotation.Bean;
 
 /**

spring-boot-project/spring-boot-jetty/src/main/java/org/springframework/boot/jetty/metrics/autoconfigure/package-info.java

@@ -17,4 +17,4 @@
 /**
  * Auto-configuration for Jetty actuator metrics.
  */
-package org.springframework.boot.jetty.actuate.metrics.autoconfigure;
+package org.springframework.boot.jetty.metrics.autoconfigure;

spring-boot-project/spring-boot-jetty/src/main/java/org/springframework/boot/jetty/metrics/package-info.java

@@ -17,4 +17,4 @@
 /**
  * Actuator support for Jetty metrics.
  */
-package org.springframework.boot.jetty.actuate.metrics;
+package org.springframework.boot.jetty.metrics;

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

@@ -1,5 +1,5 @@
 org.springframework.boot.jetty.actuate.autoconfigure.web.server.JettyReactiveManagementContextAutoConfiguration
 org.springframework.boot.jetty.actuate.autoconfigure.web.server.JettyServletManagementContextAutoConfiguration
-org.springframework.boot.jetty.actuate.metrics.autoconfigure.JettyMetricsAutoConfiguration
 org.springframework.boot.jetty.autoconfigure.reactive.JettyReactiveWebServerAutoConfiguration
-org.springframework.boot.jetty.autoconfigure.servlet.JettyServletWebServerAutoConfiguration
+org.springframework.boot.jetty.autoconfigure.servlet.JettyServletWebServerAutoConfiguration
+org.springframework.boot.jetty.metrics.autoconfigure.JettyMetricsAutoConfiguration

spring-boot-project/spring-boot-jetty/src/test/java/org/springframework/boot/jetty/metrics/autoconfigure/JettyMetricsAutoConfigurationTests.java

@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package org.springframework.boot.jetty.actuate.metrics.autoconfigure;
+package org.springframework.boot.jetty.metrics.autoconfigure;
 
 import io.micrometer.core.instrument.MeterRegistry;
 import io.micrometer.core.instrument.Tags;
@@ -25,11 +25,11 @@ import org.junit.jupiter.api.Test;
 import org.springframework.boot.SpringApplication;
 import org.springframework.boot.autoconfigure.AutoConfigurations;
 import org.springframework.boot.context.event.ApplicationStartedEvent;
-import org.springframework.boot.jetty.actuate.metrics.JettyConnectionMetricsBinder;
-import org.springframework.boot.jetty.actuate.metrics.JettyServerThreadPoolMetricsBinder;
-import org.springframework.boot.jetty.actuate.metrics.JettySslHandshakeMetricsBinder;
 import org.springframework.boot.jetty.autoconfigure.reactive.JettyReactiveWebServerAutoConfiguration;
 import org.springframework.boot.jetty.autoconfigure.servlet.JettyServletWebServerAutoConfiguration;
+import org.springframework.boot.jetty.metrics.JettyConnectionMetricsBinder;
+import org.springframework.boot.jetty.metrics.JettyServerThreadPoolMetricsBinder;
+import org.springframework.boot.jetty.metrics.JettySslHandshakeMetricsBinder;
 import org.springframework.boot.jetty.reactive.JettyReactiveWebServerFactory;
 import org.springframework.boot.jetty.servlet.JettyServletWebServerFactory;
 import org.springframework.boot.test.context.runner.ReactiveWebApplicationContextRunner;

spring-boot-project/spring-boot-jpa/src/main/java/org/springframework/boot/jpa/hibernate/metrics/autoconfigure/HibernateMetricsAutoConfiguration.java

@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package org.springframework.boot.jpa.hibernate.actuate.metrics.autoconfigure;
+package org.springframework.boot.jpa.hibernate.metrics.autoconfigure;
 
 import java.util.Collections;
 import java.util.Map;

spring-boot-project/spring-boot-jpa/src/main/java/org/springframework/boot/jpa/hibernate/metrics/autoconfigure/package-info.java

@@ -17,4 +17,4 @@
 /**
  * Auto-configuration for Hibernate metrics.
  */
-package org.springframework.boot.jpa.hibernate.actuate.metrics.autoconfigure;
+package org.springframework.boot.jpa.hibernate.metrics.autoconfigure;

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

@@ -1,2 +1,2 @@
 org.springframework.boot.jpa.autoconfigure.hibernate.HibernateJpaAutoConfiguration
-org.springframework.boot.jpa.hibernate.actuate.metrics.autoconfigure.HibernateMetricsAutoConfiguration
+org.springframework.boot.jpa.hibernate.metrics.autoconfigure.HibernateMetricsAutoConfiguration

spring-boot-project/spring-boot-jpa/src/test/java/org/springframework/boot/jpa/hibernate/metrics/autoconfigure/HibernateMetricsAutoConfigurationTests.java

@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package org.springframework.boot.jpa.hibernate.actuate.metrics.autoconfigure;
+package org.springframework.boot.jpa.hibernate.metrics.autoconfigure;
 
 import java.util.Map;
 import java.util.function.Function;

spring-boot-project/spring-boot-kafka/src/main/java/org/springframework/boot/kafka/metrics/autoconfigure/KafkaMetricsAutoConfiguration.java

@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package org.springframework.boot.kafka.autoconfigure.metrics;
+package org.springframework.boot.kafka.metrics.autoconfigure;
 
 import io.micrometer.core.instrument.MeterRegistry;
 import io.micrometer.core.instrument.binder.kafka.KafkaClientMetrics;

spring-boot-project/spring-boot-kafka/src/main/java/org/springframework/boot/kafka/metrics/autoconfigure/package-info.java

@@ -17,4 +17,4 @@
 /**
  * Auto-configuration for Apache Kafka metrics.
  */
-package org.springframework.boot.kafka.autoconfigure.metrics;
+package org.springframework.boot.kafka.metrics.autoconfigure;

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

@@ -1,2 +1,2 @@
 org.springframework.boot.kafka.autoconfigure.KafkaAutoConfiguration
-org.springframework.boot.kafka.autoconfigure.metrics.KafkaMetricsAutoConfiguration
+org.springframework.boot.kafka.metrics.autoconfigure.KafkaMetricsAutoConfiguration

spring-boot-project/spring-boot-kafka/src/test/java/org/springframework/boot/kafka/metrics/autoconfigure/KafkaMetricsAutoConfigurationTests.java

@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package org.springframework.boot.kafka.autoconfigure.metrics;
+package org.springframework.boot.kafka.metrics.autoconfigure;
 
 import java.util.regex.Pattern;
 

spring-boot-project/spring-boot-mongodb/src/main/java/org/springframework/boot/mongodb/metrics/autoconfigure/MongoMetricsAutoConfiguration.java

@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package org.springframework.boot.mongodb.actuate.metrics.autoconfigure;
+package org.springframework.boot.mongodb.metrics.autoconfigure;
 
 import com.mongodb.MongoClientSettings;
 import io.micrometer.core.instrument.MeterRegistry;

spring-boot-project/spring-boot-mongodb/src/main/java/org/springframework/boot/mongodb/metrics/autoconfigure/package-info.java

@@ -17,4 +17,4 @@
 /**
  * Auto-configuration for MongoDB metrics.
  */
-package org.springframework.boot.mongodb.actuate.metrics.autoconfigure;
+package org.springframework.boot.mongodb.metrics.autoconfigure;

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

@@ -1,3 +1,3 @@
-org.springframework.boot.mongodb.actuate.metrics.autoconfigure.MongoMetricsAutoConfiguration
 org.springframework.boot.mongodb.autoconfigure.MongoAutoConfiguration
 org.springframework.boot.mongodb.autoconfigure.MongoReactiveAutoConfiguration
+org.springframework.boot.mongodb.metrics.autoconfigure.MongoMetricsAutoConfiguration

spring-boot-project/spring-boot-mongodb/src/test/java/org/springframework/boot/mongodb/metrics/autoconfigure/MongoMetricsAutoConfigurationTests.java

@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package org.springframework.boot.mongodb.actuate.metrics.autoconfigure;
+package org.springframework.boot.mongodb.metrics.autoconfigure;
 
 import java.util.List;
 

spring-boot-project/spring-boot-observation/build.gradle

@@ -0,0 +1,21 @@
+plugins {
+	id "java-library"
+	id "org.springframework.boot.auto-configuration"
+	id "org.springframework.boot.configuration-properties"
+	id "org.springframework.boot.deployed"
+	id "org.springframework.boot.optional-dependencies"
+}
+
+description = "Spring Boot Observation"
+
+dependencies {
+	api(project(":spring-boot-project:spring-boot"))
+	api("io.micrometer:micrometer-observation")
+
+	optional(project(":spring-boot-project:spring-boot-autoconfigure"))
+
+	testImplementation(project(":spring-boot-project:spring-boot-test"))
+	testImplementation(project(":spring-boot-project:spring-boot-tools:spring-boot-test-support"))
+
+	testRuntimeOnly("ch.qos.logback:logback-classic")
+}

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

@@ -0,0 +1,4 @@
+{
+  "groups": [],
+  "properties": []
+}

spring-boot-project/spring-boot-r2dbc/src/main/java/org/springframework/boot/r2dbc/metrics/ConnectionPoolMetrics.java

@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package org.springframework.boot.r2dbc.actuate.metrics;
+package org.springframework.boot.r2dbc.metrics;
 
 import io.micrometer.core.instrument.Gauge;
 import io.micrometer.core.instrument.Gauge.Builder;

spring-boot-project/spring-boot-r2dbc/src/main/java/org/springframework/boot/r2dbc/metrics/autoconfigure/ConnectionPoolMetricsAutoConfiguration.java

@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package org.springframework.boot.r2dbc.actuate.metrics.autoconfigure;
+package org.springframework.boot.r2dbc.metrics.autoconfigure;
 
 import io.micrometer.core.instrument.MeterRegistry;
 import io.micrometer.core.instrument.Tags;
@@ -29,8 +29,8 @@ 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.r2dbc.actuate.metrics.ConnectionPoolMetrics;
 import org.springframework.boot.r2dbc.autoconfigure.R2dbcAutoConfiguration;
+import org.springframework.boot.r2dbc.metrics.ConnectionPoolMetrics;
 
 /**
  * {@link EnableAutoConfiguration Auto-configuration} for metrics on all available

spring-boot-project/spring-boot-r2dbc/src/main/java/org/springframework/boot/r2dbc/metrics/autoconfigure/package-info.java

@@ -17,4 +17,4 @@
 /**
  * Auto-configuration for R2DBC metrics.
  */
-package org.springframework.boot.r2dbc.actuate.metrics.autoconfigure;
+package org.springframework.boot.r2dbc.metrics.autoconfigure;

spring-boot-project/spring-boot-r2dbc/src/main/java/org/springframework/boot/r2dbc/metrics/package-info.java

@@ -17,4 +17,4 @@
 /**
  * Metrics for R2DBC.
  */
-package org.springframework.boot.r2dbc.actuate.metrics;
+package org.springframework.boot.r2dbc.metrics;

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

@@ -1,5 +1,5 @@
-org.springframework.boot.r2dbc.actuate.metrics.autoconfigure.ConnectionPoolMetricsAutoConfiguration
 org.springframework.boot.r2dbc.autoconfigure.R2dbcAutoConfiguration
 org.springframework.boot.r2dbc.autoconfigure.R2dbcInitializationAutoConfiguration
 org.springframework.boot.r2dbc.autoconfigure.R2dbcProxyAutoConfiguration
 org.springframework.boot.r2dbc.autoconfigure.R2dbcTransactionManagerAutoConfiguration
+org.springframework.boot.r2dbc.metrics.autoconfigure.ConnectionPoolMetricsAutoConfiguration

spring-boot-project/spring-boot-r2dbc/src/test/java/org/springframework/boot/r2dbc/metrics/ConnectionPoolMetricsTests.java

@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package org.springframework.boot.r2dbc.actuate.metrics;
+package org.springframework.boot.r2dbc.metrics;
 
 import java.time.Duration;
 import java.util.Collections;

spring-boot-project/spring-boot-r2dbc/src/test/java/org/springframework/boot/r2dbc/metrics/autoconfigure/ConnectionPoolMetricsAutoConfigurationTests.java

@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package org.springframework.boot.r2dbc.actuate.metrics.autoconfigure;
+package org.springframework.boot.r2dbc.metrics.autoconfigure;
 
 import java.util.Collections;
 import java.util.UUID;

spring-boot-project/spring-boot-tomcat/src/main/java/org/springframework/boot/tomcat/metrics/TomcatMetricsBinder.java

@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package org.springframework.boot.tomcat.actuate.metrics;
+package org.springframework.boot.tomcat.metrics;
 
 import java.util.Collections;
 

spring-boot-project/spring-boot-tomcat/src/main/java/org/springframework/boot/tomcat/metrics/autoconfigure/TomcatMetricsAutoConfiguration.java

@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package org.springframework.boot.tomcat.actuate.metrics.autoconfigure;
+package org.springframework.boot.tomcat.metrics.autoconfigure;
 
 import io.micrometer.core.instrument.MeterRegistry;
 import io.micrometer.core.instrument.binder.tomcat.TomcatMetrics;
@@ -26,7 +26,7 @@ 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.ConditionalOnWebApplication;
-import org.springframework.boot.tomcat.actuate.metrics.TomcatMetricsBinder;
+import org.springframework.boot.tomcat.metrics.TomcatMetricsBinder;
 import org.springframework.context.annotation.Bean;
 
 /**

spring-boot-project/spring-boot-tomcat/src/main/java/org/springframework/boot/tomcat/metrics/autoconfigure/package-info.java

@@ -17,4 +17,4 @@
 /**
  * Auto-configuration for Tomcat actuator metrics.
  */
-package org.springframework.boot.tomcat.actuate.metrics.autoconfigure;
+package org.springframework.boot.tomcat.metrics.autoconfigure;

spring-boot-project/spring-boot-tomcat/src/main/java/org/springframework/boot/tomcat/metrics/package-info.java

@@ -17,4 +17,4 @@
 /**
  * Tomcat metrics.
  */
-package org.springframework.boot.tomcat.actuate.metrics;
+package org.springframework.boot.tomcat.metrics;

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

@@ -1,5 +1,5 @@
 org.springframework.boot.tomcat.actuate.autoconfigure.web.TomcatReactiveManagementContextAutoConfiguration
 org.springframework.boot.tomcat.actuate.autoconfigure.web.TomcatServletManagementContextAutoConfiguration
-org.springframework.boot.tomcat.actuate.metrics.autoconfigure.TomcatMetricsAutoConfiguration
 org.springframework.boot.tomcat.autoconfigure.reactive.TomcatReactiveWebServerAutoConfiguration
 org.springframework.boot.tomcat.autoconfigure.servlet.TomcatServletWebServerAutoConfiguration
+org.springframework.boot.tomcat.metrics.autoconfigure.TomcatMetricsAutoConfiguration

spring-boot-project/spring-boot-tomcat/src/test/java/org/springframework/boot/tomcat/metrics/TomcatMetricsBinderTests.java

@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package org.springframework.boot.tomcat.actuate.metrics;
+package org.springframework.boot.tomcat.metrics;
 
 import io.micrometer.core.instrument.MeterRegistry;
 import org.junit.jupiter.api.Test;

spring-boot-project/spring-boot-tomcat/src/test/java/org/springframework/boot/tomcat/metrics/autoconfigure/TomcatMetricsAutoConfigurationTests.java

@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package org.springframework.boot.tomcat.actuate.metrics.autoconfigure;
+package org.springframework.boot.tomcat.metrics.autoconfigure;
 
 import java.util.Collections;
 import java.util.concurrent.atomic.AtomicInteger;
@@ -31,9 +31,9 @@ import org.springframework.boot.context.event.ApplicationStartedEvent;
 import org.springframework.boot.test.context.runner.ReactiveWebApplicationContextRunner;
 import org.springframework.boot.test.context.runner.WebApplicationContextRunner;
 import org.springframework.boot.tomcat.TomcatWebServer;
-import org.springframework.boot.tomcat.actuate.metrics.TomcatMetricsBinder;
 import org.springframework.boot.tomcat.autoconfigure.reactive.TomcatReactiveWebServerAutoConfiguration;
 import org.springframework.boot.tomcat.autoconfigure.servlet.TomcatServletWebServerAutoConfiguration;
+import org.springframework.boot.tomcat.metrics.TomcatMetricsBinder;
 import org.springframework.boot.tomcat.reactive.TomcatReactiveWebServerFactory;
 import org.springframework.boot.tomcat.servlet.TomcatServletWebServerFactory;
 import org.springframework.boot.web.server.reactive.context.AnnotationConfigReactiveWebServerApplicationContext;