From 0464bf753f70023e1df5c791413751cef84f1dd7 Mon Sep 17 00:00:00 2001 From: Andy Wilkinson Date: Wed, 28 May 2025 10:19:08 +0100 Subject: [PATCH] Remove actuate from restructured metrics package names --- .../metrics/test/MetricsIntegrationTests.java | 4 ++-- .../{actuate => }/metrics/RabbitMetrics.java | 2 +- ...ConnectionFactoryMetricsPostProcessor.java | 4 ++-- .../RabbitMetricsAutoConfiguration.java | 2 +- .../metrics/autoconfigure/package-info.java | 2 +- .../{actuate => }/metrics/package-info.java | 2 +- ...ot.autoconfigure.AutoConfiguration.imports | 2 +- .../metrics/RabbitMetricsTests.java | 2 +- ...ationMeterBinderCycleIntegrationTests.java | 3 +-- .../RabbitMetricsAutoConfigurationTests.java | 3 +-- .../metrics/RedisCacheMetricsTests.java | 2 +- .../Cache2kCacheMeterBinderProvider.java | 2 +- .../metrics/CacheMeterBinderProvider.java | 2 +- .../metrics/CacheMetricsRegistrar.java | 2 +- .../CaffeineCacheMeterBinderProvider.java | 2 +- .../HazelcastCacheMeterBinderProvider.java | 4 ++-- .../JCacheCacheMeterBinderProvider.java | 2 +- .../RedisCacheMeterBinderProvider.java | 2 +- .../metrics/RedisCacheMetrics.java | 2 +- ...acheMeterBinderProvidersConfiguration.java | 14 ++++++------ .../CacheMetricsAutoConfiguration.java | 2 +- .../CacheMetricsRegistrarConfiguration.java | 6 ++--- .../metrics/autoconfigure/package-info.java | 2 +- .../{actuate => }/metrics/package-info.java | 2 +- ...ot.autoconfigure.AutoConfiguration.imports | 2 +- .../CacheMetricsAutoConfigurationTests.java | 2 +- .../Cache2kCacheMeterBinderProviderTests.java | 2 +- .../metrics/CacheMetricsRegistrarTests.java | 2 +- ...CaffeineCacheMeterBinderProviderTests.java | 2 +- ...azelcastCacheMeterBinderProviderTests.java | 4 ++-- .../JCacheCacheMeterBinderProviderTests.java | 2 +- .../RedisCacheMeterBinderProviderTests.java | 2 +- .../LettuceMetricsAutoConfiguration.java | 2 +- .../metrics/autoconfigure/package-info.java | 2 +- ...ot.autoconfigure.AutoConfiguration.imports | 2 +- .../LettuceMetricsAutoConfigurationTests.java | 2 +- .../IntegrationMetricsAutoConfiguration.java | 2 +- .../metrics/autoconfigure/package-info.java | 2 +- ...ot.autoconfigure.AutoConfiguration.imports | 2 +- ...egrationMetricsAutoConfigurationTests.java | 2 +- .../metrics/DataSourcePoolMetrics.java | 2 +- ...ataSourcePoolMetricsAutoConfiguration.java | 4 ++-- .../metrics/autoconfigure/package-info.java | 2 +- .../{actuate => }/metrics/package-info.java | 2 +- ...ot.autoconfigure.AutoConfiguration.imports | 2 +- .../metrics/DataSourcePoolMetricsTests.java | 2 +- ...urcePoolMetricsAutoConfigurationTests.java | 2 +- .../metrics/AbstractJettyMetricsBinder.java | 2 +- .../metrics/JettyConnectionMetricsBinder.java | 2 +- .../JettyServerThreadPoolMetricsBinder.java | 2 +- .../JettySslHandshakeMetricsBinder.java | 2 +- .../JettyMetricsAutoConfiguration.java | 8 +++---- .../metrics/autoconfigure/package-info.java | 2 +- .../{actuate => }/metrics/package-info.java | 2 +- ...ot.autoconfigure.AutoConfiguration.imports | 4 ++-- .../JettyMetricsAutoConfigurationTests.java | 8 +++---- .../metrics/autoconfigure/test.jks | Bin .../HibernateMetricsAutoConfiguration.java | 2 +- .../metrics/autoconfigure/package-info.java | 2 +- ...ot.autoconfigure.AutoConfiguration.imports | 2 +- ...ibernateMetricsAutoConfigurationTests.java | 2 +- .../KafkaMetricsAutoConfiguration.java | 2 +- .../autoconfigure}/package-info.java | 2 +- ...ot.autoconfigure.AutoConfiguration.imports | 2 +- .../KafkaMetricsAutoConfigurationTests.java | 2 +- .../MongoMetricsAutoConfiguration.java | 2 +- .../metrics/autoconfigure/package-info.java | 2 +- ...ot.autoconfigure.AutoConfiguration.imports | 2 +- .../MongoMetricsAutoConfigurationTests.java | 2 +- .../spring-boot-observation/build.gradle | 21 ++++++++++++++++++ ...itional-spring-configuration-metadata.json | 4 ++++ ...ot.autoconfigure.AutoConfiguration.imports | 0 .../metrics/ConnectionPoolMetrics.java | 2 +- ...onnectionPoolMetricsAutoConfiguration.java | 4 ++-- .../metrics/autoconfigure/package-info.java | 2 +- .../{actuate => }/metrics/package-info.java | 2 +- ...ot.autoconfigure.AutoConfiguration.imports | 2 +- .../metrics/ConnectionPoolMetricsTests.java | 2 +- ...tionPoolMetricsAutoConfigurationTests.java | 2 +- .../metrics/TomcatMetricsBinder.java | 2 +- .../TomcatMetricsAutoConfiguration.java | 4 ++-- .../metrics/autoconfigure/package-info.java | 2 +- .../{actuate => }/metrics/package-info.java | 2 +- ...ot.autoconfigure.AutoConfiguration.imports | 2 +- .../metrics/TomcatMetricsBinderTests.java | 2 +- .../TomcatMetricsAutoConfigurationTests.java | 4 ++-- 86 files changed, 130 insertions(+), 107 deletions(-) rename spring-boot-project/spring-boot-amqp/src/main/java/org/springframework/boot/amqp/{actuate => }/metrics/RabbitMetrics.java (97%) rename spring-boot-project/spring-boot-amqp/src/main/java/org/springframework/boot/amqp/{actuate => }/metrics/autoconfigure/RabbitConnectionFactoryMetricsPostProcessor.java (95%) rename spring-boot-project/spring-boot-amqp/src/main/java/org/springframework/boot/amqp/{actuate => }/metrics/autoconfigure/RabbitMetricsAutoConfiguration.java (96%) rename spring-boot-project/spring-boot-amqp/src/main/java/org/springframework/boot/amqp/{actuate => }/metrics/autoconfigure/package-info.java (90%) rename spring-boot-project/spring-boot-amqp/src/main/java/org/springframework/boot/amqp/{actuate => }/metrics/package-info.java (92%) rename spring-boot-project/spring-boot-amqp/src/test/java/org/springframework/boot/amqp/{actuate => }/metrics/RabbitMetricsTests.java (96%) rename spring-boot-project/spring-boot-amqp/src/test/java/org/springframework/boot/{actuate/autoconfigure/metrics/amqp => amqp/metrics/autoconfigure}/RabbitMetricsAutoConfigurationMeterBinderCycleIntegrationTests.java (93%) rename spring-boot-project/spring-boot-amqp/src/test/java/org/springframework/boot/{actuate/autoconfigure/metrics/amqp => amqp/metrics/autoconfigure}/RabbitMetricsAutoConfigurationTests.java (94%) rename spring-boot-project/spring-boot-cache/src/dockerTest/java/org/springframework/boot/cache/{actuate => }/metrics/RedisCacheMetricsTests.java (99%) rename spring-boot-project/spring-boot-cache/src/main/java/org/springframework/boot/cache/{actuate => }/metrics/Cache2kCacheMeterBinderProvider.java (95%) rename spring-boot-project/spring-boot-cache/src/main/java/org/springframework/boot/cache/{actuate => }/metrics/CacheMeterBinderProvider.java (96%) rename spring-boot-project/spring-boot-cache/src/main/java/org/springframework/boot/cache/{actuate => }/metrics/CacheMetricsRegistrar.java (98%) rename spring-boot-project/spring-boot-cache/src/main/java/org/springframework/boot/cache/{actuate => }/metrics/CaffeineCacheMeterBinderProvider.java (95%) rename spring-boot-project/spring-boot-cache/src/main/java/org/springframework/boot/cache/{actuate => }/metrics/HazelcastCacheMeterBinderProvider.java (94%) rename spring-boot-project/spring-boot-cache/src/main/java/org/springframework/boot/cache/{actuate => }/metrics/JCacheCacheMeterBinderProvider.java (95%) rename spring-boot-project/spring-boot-cache/src/main/java/org/springframework/boot/cache/{actuate => }/metrics/RedisCacheMeterBinderProvider.java (95%) rename spring-boot-project/spring-boot-cache/src/main/java/org/springframework/boot/cache/{actuate => }/metrics/RedisCacheMetrics.java (97%) rename spring-boot-project/spring-boot-cache/src/main/java/org/springframework/boot/cache/{actuate => }/metrics/autoconfigure/CacheMeterBinderProvidersConfiguration.java (84%) rename spring-boot-project/spring-boot-cache/src/main/java/org/springframework/boot/cache/{actuate => }/metrics/autoconfigure/CacheMetricsAutoConfiguration.java (96%) rename spring-boot-project/spring-boot-cache/src/main/java/org/springframework/boot/cache/{actuate => }/metrics/autoconfigure/CacheMetricsRegistrarConfiguration.java (93%) rename spring-boot-project/spring-boot-cache/src/main/java/org/springframework/boot/cache/{actuate => }/metrics/autoconfigure/package-info.java (90%) rename spring-boot-project/spring-boot-cache/src/main/java/org/springframework/boot/cache/{actuate => }/metrics/package-info.java (92%) rename spring-boot-project/spring-boot-cache/src/test/java/org/springframework/boot/cache/{actuate => }/metrics/Cache2kCacheMeterBinderProviderTests.java (96%) rename spring-boot-project/spring-boot-cache/src/test/java/org/springframework/boot/cache/{actuate => }/metrics/CacheMetricsRegistrarTests.java (97%) rename spring-boot-project/spring-boot-cache/src/test/java/org/springframework/boot/cache/{actuate => }/metrics/CaffeineCacheMeterBinderProviderTests.java (96%) rename spring-boot-project/spring-boot-cache/src/test/java/org/springframework/boot/cache/{actuate => }/metrics/HazelcastCacheMeterBinderProviderTests.java (92%) rename spring-boot-project/spring-boot-cache/src/test/java/org/springframework/boot/cache/{actuate => }/metrics/JCacheCacheMeterBinderProviderTests.java (97%) rename spring-boot-project/spring-boot-cache/src/test/java/org/springframework/boot/cache/{actuate => }/metrics/RedisCacheMeterBinderProviderTests.java (96%) rename spring-boot-project/spring-boot-data-redis/src/main/java/org/springframework/boot/data/redis/{actuate => }/metrics/autoconfigure/LettuceMetricsAutoConfiguration.java (96%) rename spring-boot-project/spring-boot-data-redis/src/main/java/org/springframework/boot/data/redis/{actuate => }/metrics/autoconfigure/package-info.java (89%) rename spring-boot-project/spring-boot-data-redis/src/test/java/org/springframework/boot/data/redis/{actuate => }/metrics/autoconfigure/LettuceMetricsAutoConfigurationTests.java (98%) rename spring-boot-project/spring-boot-integration/src/main/java/org/springframework/boot/integration/{actuate => }/metrics/autoconfigure/IntegrationMetricsAutoConfiguration.java (94%) rename spring-boot-project/spring-boot-integration/src/main/java/org/springframework/boot/integration/{actuate => }/metrics/autoconfigure/package-info.java (90%) rename spring-boot-project/spring-boot-integration/src/test/java/org/springframework/boot/integration/{actuate => }/metrics/autoconfigure/IntegrationMetricsAutoConfigurationTests.java (96%) rename spring-boot-project/spring-boot-jdbc/src/main/java/org/springframework/boot/jdbc/{actuate => }/metrics/DataSourcePoolMetrics.java (98%) rename spring-boot-project/spring-boot-jdbc/src/main/java/org/springframework/boot/jdbc/{actuate => }/metrics/autoconfigure/DataSourcePoolMetricsAutoConfiguration.java (97%) rename spring-boot-project/spring-boot-jdbc/src/main/java/org/springframework/boot/jdbc/{actuate => }/metrics/autoconfigure/package-info.java (90%) rename spring-boot-project/spring-boot-jdbc/src/main/java/org/springframework/boot/jdbc/{actuate => }/metrics/package-info.java (92%) rename spring-boot-project/spring-boot-jdbc/src/test/java/org/springframework/boot/jdbc/{actuate => }/metrics/DataSourcePoolMetricsTests.java (97%) rename spring-boot-project/spring-boot-jdbc/src/test/java/org/springframework/boot/jdbc/{actuate => }/metrics/autoconfigure/DataSourcePoolMetricsAutoConfigurationTests.java (99%) rename spring-boot-project/spring-boot-jetty/src/main/java/org/springframework/boot/jetty/{actuate => }/metrics/AbstractJettyMetricsBinder.java (97%) rename spring-boot-project/spring-boot-jetty/src/main/java/org/springframework/boot/jetty/{actuate => }/metrics/JettyConnectionMetricsBinder.java (96%) rename spring-boot-project/spring-boot-jetty/src/main/java/org/springframework/boot/jetty/{actuate => }/metrics/JettyServerThreadPoolMetricsBinder.java (96%) rename spring-boot-project/spring-boot-jetty/src/main/java/org/springframework/boot/jetty/{actuate => }/metrics/JettySslHandshakeMetricsBinder.java (96%) rename spring-boot-project/spring-boot-jetty/src/main/java/org/springframework/boot/jetty/{actuate => }/metrics/autoconfigure/JettyMetricsAutoConfiguration.java (89%) rename spring-boot-project/spring-boot-jetty/src/main/java/org/springframework/boot/jetty/{actuate => }/metrics/autoconfigure/package-info.java (90%) rename spring-boot-project/spring-boot-jetty/src/main/java/org/springframework/boot/jetty/{actuate => }/metrics/package-info.java (92%) rename spring-boot-project/spring-boot-jetty/src/test/java/org/springframework/boot/jetty/{actuate => }/metrics/autoconfigure/JettyMetricsAutoConfigurationTests.java (97%) rename spring-boot-project/spring-boot-jetty/src/test/resources/org/springframework/boot/jetty/{actuate => }/metrics/autoconfigure/test.jks (100%) rename spring-boot-project/spring-boot-jpa/src/main/java/org/springframework/boot/jpa/hibernate/{actuate => }/metrics/autoconfigure/HibernateMetricsAutoConfiguration.java (98%) rename spring-boot-project/spring-boot-jpa/src/main/java/org/springframework/boot/jpa/hibernate/{actuate => }/metrics/autoconfigure/package-info.java (89%) rename spring-boot-project/spring-boot-jpa/src/test/java/org/springframework/boot/jpa/hibernate/{actuate => }/metrics/autoconfigure/HibernateMetricsAutoConfigurationTests.java (99%) rename spring-boot-project/spring-boot-kafka/src/main/java/org/springframework/boot/kafka/{autoconfigure/metrics => metrics/autoconfigure}/KafkaMetricsAutoConfiguration.java (98%) rename spring-boot-project/spring-boot-kafka/src/main/java/org/springframework/boot/kafka/{autoconfigure/metrics => metrics/autoconfigure}/package-info.java (91%) rename spring-boot-project/spring-boot-kafka/src/test/java/org/springframework/boot/kafka/{autoconfigure/metrics => metrics/autoconfigure}/KafkaMetricsAutoConfigurationTests.java (98%) rename spring-boot-project/spring-boot-mongodb/src/main/java/org/springframework/boot/mongodb/{actuate => }/metrics/autoconfigure/MongoMetricsAutoConfiguration.java (98%) rename spring-boot-project/spring-boot-mongodb/src/main/java/org/springframework/boot/mongodb/{actuate => }/metrics/autoconfigure/package-info.java (90%) rename spring-boot-project/spring-boot-mongodb/src/test/java/org/springframework/boot/mongodb/{actuate => }/metrics/autoconfigure/MongoMetricsAutoConfigurationTests.java (99%) create mode 100644 spring-boot-project/spring-boot-observation/build.gradle create mode 100644 spring-boot-project/spring-boot-observation/src/main/resources/META-INF/additional-spring-configuration-metadata.json create mode 100644 spring-boot-project/spring-boot-observation/src/main/resources/META-INF/spring/org.springframework.boot.autoconfigure.AutoConfiguration.imports rename spring-boot-project/spring-boot-r2dbc/src/main/java/org/springframework/boot/r2dbc/{actuate => }/metrics/ConnectionPoolMetrics.java (98%) rename spring-boot-project/spring-boot-r2dbc/src/main/java/org/springframework/boot/r2dbc/{actuate => }/metrics/autoconfigure/ConnectionPoolMetricsAutoConfiguration.java (94%) rename spring-boot-project/spring-boot-r2dbc/src/main/java/org/springframework/boot/r2dbc/{actuate => }/metrics/autoconfigure/package-info.java (90%) rename spring-boot-project/spring-boot-r2dbc/src/main/java/org/springframework/boot/r2dbc/{actuate => }/metrics/package-info.java (92%) rename spring-boot-project/spring-boot-r2dbc/src/test/java/org/springframework/boot/r2dbc/{actuate => }/metrics/ConnectionPoolMetricsTests.java (98%) rename spring-boot-project/spring-boot-r2dbc/src/test/java/org/springframework/boot/r2dbc/{actuate => }/metrics/autoconfigure/ConnectionPoolMetricsAutoConfigurationTests.java (99%) rename spring-boot-project/spring-boot-tomcat/src/main/java/org/springframework/boot/tomcat/{actuate => }/metrics/TomcatMetricsBinder.java (98%) rename spring-boot-project/spring-boot-tomcat/src/main/java/org/springframework/boot/tomcat/{actuate => }/metrics/autoconfigure/TomcatMetricsAutoConfiguration.java (93%) rename spring-boot-project/spring-boot-tomcat/src/main/java/org/springframework/boot/tomcat/{actuate => }/metrics/autoconfigure/package-info.java (90%) rename spring-boot-project/spring-boot-tomcat/src/main/java/org/springframework/boot/tomcat/{actuate => }/metrics/package-info.java (91%) rename spring-boot-project/spring-boot-tomcat/src/test/java/org/springframework/boot/tomcat/{actuate => }/metrics/TomcatMetricsBinderTests.java (94%) rename spring-boot-project/spring-boot-tomcat/src/test/java/org/springframework/boot/tomcat/{actuate => }/metrics/autoconfigure/TomcatMetricsAutoConfigurationTests.java (97%) diff --git a/spring-boot-project/spring-boot-actuator-autoconfigure-all/src/test/java/org/springframework/boot/actuate/autoconfigure/metrics/test/MetricsIntegrationTests.java b/spring-boot-project/spring-boot-actuator-autoconfigure-all/src/test/java/org/springframework/boot/actuate/autoconfigure/metrics/test/MetricsIntegrationTests.java index 3829aed899..3524900e16 100644 --- a/spring-boot-project/spring-boot-actuator-autoconfigure-all/src/test/java/org/springframework/boot/actuate/autoconfigure/metrics/test/MetricsIntegrationTests.java +++ b/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; diff --git a/spring-boot-project/spring-boot-amqp/src/main/java/org/springframework/boot/amqp/actuate/metrics/RabbitMetrics.java b/spring-boot-project/spring-boot-amqp/src/main/java/org/springframework/boot/amqp/metrics/RabbitMetrics.java similarity index 97% rename from spring-boot-project/spring-boot-amqp/src/main/java/org/springframework/boot/amqp/actuate/metrics/RabbitMetrics.java rename to spring-boot-project/spring-boot-amqp/src/main/java/org/springframework/boot/amqp/metrics/RabbitMetrics.java index cff010fbec..cce0c6871d 100644 --- a/spring-boot-project/spring-boot-amqp/src/main/java/org/springframework/boot/amqp/actuate/metrics/RabbitMetrics.java +++ b/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; diff --git a/spring-boot-project/spring-boot-amqp/src/main/java/org/springframework/boot/amqp/actuate/metrics/autoconfigure/RabbitConnectionFactoryMetricsPostProcessor.java b/spring-boot-project/spring-boot-amqp/src/main/java/org/springframework/boot/amqp/metrics/autoconfigure/RabbitConnectionFactoryMetricsPostProcessor.java similarity index 95% rename from spring-boot-project/spring-boot-amqp/src/main/java/org/springframework/boot/amqp/actuate/metrics/autoconfigure/RabbitConnectionFactoryMetricsPostProcessor.java rename to spring-boot-project/spring-boot-amqp/src/main/java/org/springframework/boot/amqp/metrics/autoconfigure/RabbitConnectionFactoryMetricsPostProcessor.java index 10a06428eb..e9e0ea7b79 100644 --- a/spring-boot-project/spring-boot-amqp/src/main/java/org/springframework/boot/amqp/actuate/metrics/autoconfigure/RabbitConnectionFactoryMetricsPostProcessor.java +++ b/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; diff --git a/spring-boot-project/spring-boot-amqp/src/main/java/org/springframework/boot/amqp/actuate/metrics/autoconfigure/RabbitMetricsAutoConfiguration.java b/spring-boot-project/spring-boot-amqp/src/main/java/org/springframework/boot/amqp/metrics/autoconfigure/RabbitMetricsAutoConfiguration.java similarity index 96% rename from spring-boot-project/spring-boot-amqp/src/main/java/org/springframework/boot/amqp/actuate/metrics/autoconfigure/RabbitMetricsAutoConfiguration.java rename to spring-boot-project/spring-boot-amqp/src/main/java/org/springframework/boot/amqp/metrics/autoconfigure/RabbitMetricsAutoConfiguration.java index 53f14a142f..b53ea0a74f 100644 --- a/spring-boot-project/spring-boot-amqp/src/main/java/org/springframework/boot/amqp/actuate/metrics/autoconfigure/RabbitMetricsAutoConfiguration.java +++ b/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; diff --git a/spring-boot-project/spring-boot-amqp/src/main/java/org/springframework/boot/amqp/actuate/metrics/autoconfigure/package-info.java b/spring-boot-project/spring-boot-amqp/src/main/java/org/springframework/boot/amqp/metrics/autoconfigure/package-info.java similarity index 90% rename from spring-boot-project/spring-boot-amqp/src/main/java/org/springframework/boot/amqp/actuate/metrics/autoconfigure/package-info.java rename to spring-boot-project/spring-boot-amqp/src/main/java/org/springframework/boot/amqp/metrics/autoconfigure/package-info.java index 3a5fa22bac..bb65396c62 100644 --- a/spring-boot-project/spring-boot-amqp/src/main/java/org/springframework/boot/amqp/actuate/metrics/autoconfigure/package-info.java +++ b/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; diff --git a/spring-boot-project/spring-boot-amqp/src/main/java/org/springframework/boot/amqp/actuate/metrics/package-info.java b/spring-boot-project/spring-boot-amqp/src/main/java/org/springframework/boot/amqp/metrics/package-info.java similarity index 92% rename from spring-boot-project/spring-boot-amqp/src/main/java/org/springframework/boot/amqp/actuate/metrics/package-info.java rename to spring-boot-project/spring-boot-amqp/src/main/java/org/springframework/boot/amqp/metrics/package-info.java index e0664883af..142e1db9fe 100644 --- a/spring-boot-project/spring-boot-amqp/src/main/java/org/springframework/boot/amqp/actuate/metrics/package-info.java +++ b/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; diff --git a/spring-boot-project/spring-boot-amqp/src/main/resources/META-INF/spring/org.springframework.boot.autoconfigure.AutoConfiguration.imports b/spring-boot-project/spring-boot-amqp/src/main/resources/META-INF/spring/org.springframework.boot.autoconfigure.AutoConfiguration.imports index 3fd08fe99a..8213969d29 100644 --- a/spring-boot-project/spring-boot-amqp/src/main/resources/META-INF/spring/org.springframework.boot.autoconfigure.AutoConfiguration.imports +++ b/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 diff --git a/spring-boot-project/spring-boot-amqp/src/test/java/org/springframework/boot/amqp/actuate/metrics/RabbitMetricsTests.java b/spring-boot-project/spring-boot-amqp/src/test/java/org/springframework/boot/amqp/metrics/RabbitMetricsTests.java similarity index 96% rename from spring-boot-project/spring-boot-amqp/src/test/java/org/springframework/boot/amqp/actuate/metrics/RabbitMetricsTests.java rename to spring-boot-project/spring-boot-amqp/src/test/java/org/springframework/boot/amqp/metrics/RabbitMetricsTests.java index 994abc7c89..5a2aed8bfa 100644 --- a/spring-boot-project/spring-boot-amqp/src/test/java/org/springframework/boot/amqp/actuate/metrics/RabbitMetricsTests.java +++ b/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; diff --git a/spring-boot-project/spring-boot-amqp/src/test/java/org/springframework/boot/actuate/autoconfigure/metrics/amqp/RabbitMetricsAutoConfigurationMeterBinderCycleIntegrationTests.java b/spring-boot-project/spring-boot-amqp/src/test/java/org/springframework/boot/amqp/metrics/autoconfigure/RabbitMetricsAutoConfigurationMeterBinderCycleIntegrationTests.java similarity index 93% rename from spring-boot-project/spring-boot-amqp/src/test/java/org/springframework/boot/actuate/autoconfigure/metrics/amqp/RabbitMetricsAutoConfigurationMeterBinderCycleIntegrationTests.java rename to spring-boot-project/spring-boot-amqp/src/test/java/org/springframework/boot/amqp/metrics/autoconfigure/RabbitMetricsAutoConfigurationMeterBinderCycleIntegrationTests.java index 20e5340a18..3b4aa61ab2 100644 --- a/spring-boot-project/spring-boot-amqp/src/test/java/org/springframework/boot/actuate/autoconfigure/metrics/amqp/RabbitMetricsAutoConfigurationMeterBinderCycleIntegrationTests.java +++ b/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; diff --git a/spring-boot-project/spring-boot-amqp/src/test/java/org/springframework/boot/actuate/autoconfigure/metrics/amqp/RabbitMetricsAutoConfigurationTests.java b/spring-boot-project/spring-boot-amqp/src/test/java/org/springframework/boot/amqp/metrics/autoconfigure/RabbitMetricsAutoConfigurationTests.java similarity index 94% rename from spring-boot-project/spring-boot-amqp/src/test/java/org/springframework/boot/actuate/autoconfigure/metrics/amqp/RabbitMetricsAutoConfigurationTests.java rename to spring-boot-project/spring-boot-amqp/src/test/java/org/springframework/boot/amqp/metrics/autoconfigure/RabbitMetricsAutoConfigurationTests.java index 45cf9bf1c5..95c845d3bc 100644 --- a/spring-boot-project/spring-boot-amqp/src/test/java/org/springframework/boot/actuate/autoconfigure/metrics/amqp/RabbitMetricsAutoConfigurationTests.java +++ b/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; diff --git a/spring-boot-project/spring-boot-cache/src/dockerTest/java/org/springframework/boot/cache/actuate/metrics/RedisCacheMetricsTests.java b/spring-boot-project/spring-boot-cache/src/dockerTest/java/org/springframework/boot/cache/metrics/RedisCacheMetricsTests.java similarity index 99% rename from spring-boot-project/spring-boot-cache/src/dockerTest/java/org/springframework/boot/cache/actuate/metrics/RedisCacheMetricsTests.java rename to spring-boot-project/spring-boot-cache/src/dockerTest/java/org/springframework/boot/cache/metrics/RedisCacheMetricsTests.java index b0e6fe71f6..cf5c80514c 100644 --- a/spring-boot-project/spring-boot-cache/src/dockerTest/java/org/springframework/boot/cache/actuate/metrics/RedisCacheMetricsTests.java +++ b/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; diff --git a/spring-boot-project/spring-boot-cache/src/main/java/org/springframework/boot/cache/actuate/metrics/Cache2kCacheMeterBinderProvider.java b/spring-boot-project/spring-boot-cache/src/main/java/org/springframework/boot/cache/metrics/Cache2kCacheMeterBinderProvider.java similarity index 95% rename from spring-boot-project/spring-boot-cache/src/main/java/org/springframework/boot/cache/actuate/metrics/Cache2kCacheMeterBinderProvider.java rename to spring-boot-project/spring-boot-cache/src/main/java/org/springframework/boot/cache/metrics/Cache2kCacheMeterBinderProvider.java index 2bd1372307..218f2c4fb5 100644 --- a/spring-boot-project/spring-boot-cache/src/main/java/org/springframework/boot/cache/actuate/metrics/Cache2kCacheMeterBinderProvider.java +++ b/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; diff --git a/spring-boot-project/spring-boot-cache/src/main/java/org/springframework/boot/cache/actuate/metrics/CacheMeterBinderProvider.java b/spring-boot-project/spring-boot-cache/src/main/java/org/springframework/boot/cache/metrics/CacheMeterBinderProvider.java similarity index 96% rename from spring-boot-project/spring-boot-cache/src/main/java/org/springframework/boot/cache/actuate/metrics/CacheMeterBinderProvider.java rename to spring-boot-project/spring-boot-cache/src/main/java/org/springframework/boot/cache/metrics/CacheMeterBinderProvider.java index 1e4704cc0e..3e6e00acec 100644 --- a/spring-boot-project/spring-boot-cache/src/main/java/org/springframework/boot/cache/actuate/metrics/CacheMeterBinderProvider.java +++ b/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; diff --git a/spring-boot-project/spring-boot-cache/src/main/java/org/springframework/boot/cache/actuate/metrics/CacheMetricsRegistrar.java b/spring-boot-project/spring-boot-cache/src/main/java/org/springframework/boot/cache/metrics/CacheMetricsRegistrar.java similarity index 98% rename from spring-boot-project/spring-boot-cache/src/main/java/org/springframework/boot/cache/actuate/metrics/CacheMetricsRegistrar.java rename to spring-boot-project/spring-boot-cache/src/main/java/org/springframework/boot/cache/metrics/CacheMetricsRegistrar.java index 9625c4d488..b50c95d6b8 100644 --- a/spring-boot-project/spring-boot-cache/src/main/java/org/springframework/boot/cache/actuate/metrics/CacheMetricsRegistrar.java +++ b/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; diff --git a/spring-boot-project/spring-boot-cache/src/main/java/org/springframework/boot/cache/actuate/metrics/CaffeineCacheMeterBinderProvider.java b/spring-boot-project/spring-boot-cache/src/main/java/org/springframework/boot/cache/metrics/CaffeineCacheMeterBinderProvider.java similarity index 95% rename from spring-boot-project/spring-boot-cache/src/main/java/org/springframework/boot/cache/actuate/metrics/CaffeineCacheMeterBinderProvider.java rename to spring-boot-project/spring-boot-cache/src/main/java/org/springframework/boot/cache/metrics/CaffeineCacheMeterBinderProvider.java index 2135b27b0f..edbb6fa545 100644 --- a/spring-boot-project/spring-boot-cache/src/main/java/org/springframework/boot/cache/actuate/metrics/CaffeineCacheMeterBinderProvider.java +++ b/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; diff --git a/spring-boot-project/spring-boot-cache/src/main/java/org/springframework/boot/cache/actuate/metrics/HazelcastCacheMeterBinderProvider.java b/spring-boot-project/spring-boot-cache/src/main/java/org/springframework/boot/cache/metrics/HazelcastCacheMeterBinderProvider.java similarity index 94% rename from spring-boot-project/spring-boot-cache/src/main/java/org/springframework/boot/cache/actuate/metrics/HazelcastCacheMeterBinderProvider.java rename to spring-boot-project/spring-boot-cache/src/main/java/org/springframework/boot/cache/metrics/HazelcastCacheMeterBinderProvider.java index 43ff0a4430..ac65fa3f6c 100644 --- a/spring-boot-project/spring-boot-cache/src/main/java/org/springframework/boot/cache/actuate/metrics/HazelcastCacheMeterBinderProvider.java +++ b/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; diff --git a/spring-boot-project/spring-boot-cache/src/main/java/org/springframework/boot/cache/actuate/metrics/JCacheCacheMeterBinderProvider.java b/spring-boot-project/spring-boot-cache/src/main/java/org/springframework/boot/cache/metrics/JCacheCacheMeterBinderProvider.java similarity index 95% rename from spring-boot-project/spring-boot-cache/src/main/java/org/springframework/boot/cache/actuate/metrics/JCacheCacheMeterBinderProvider.java rename to spring-boot-project/spring-boot-cache/src/main/java/org/springframework/boot/cache/metrics/JCacheCacheMeterBinderProvider.java index f31a117812..af532329e2 100644 --- a/spring-boot-project/spring-boot-cache/src/main/java/org/springframework/boot/cache/actuate/metrics/JCacheCacheMeterBinderProvider.java +++ b/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; diff --git a/spring-boot-project/spring-boot-cache/src/main/java/org/springframework/boot/cache/actuate/metrics/RedisCacheMeterBinderProvider.java b/spring-boot-project/spring-boot-cache/src/main/java/org/springframework/boot/cache/metrics/RedisCacheMeterBinderProvider.java similarity index 95% rename from spring-boot-project/spring-boot-cache/src/main/java/org/springframework/boot/cache/actuate/metrics/RedisCacheMeterBinderProvider.java rename to spring-boot-project/spring-boot-cache/src/main/java/org/springframework/boot/cache/metrics/RedisCacheMeterBinderProvider.java index c7c6f8829e..6880496ed3 100644 --- a/spring-boot-project/spring-boot-cache/src/main/java/org/springframework/boot/cache/actuate/metrics/RedisCacheMeterBinderProvider.java +++ b/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; diff --git a/spring-boot-project/spring-boot-cache/src/main/java/org/springframework/boot/cache/actuate/metrics/RedisCacheMetrics.java b/spring-boot-project/spring-boot-cache/src/main/java/org/springframework/boot/cache/metrics/RedisCacheMetrics.java similarity index 97% rename from spring-boot-project/spring-boot-cache/src/main/java/org/springframework/boot/cache/actuate/metrics/RedisCacheMetrics.java rename to spring-boot-project/spring-boot-cache/src/main/java/org/springframework/boot/cache/metrics/RedisCacheMetrics.java index 44ed425716..7607471be5 100644 --- a/spring-boot-project/spring-boot-cache/src/main/java/org/springframework/boot/cache/actuate/metrics/RedisCacheMetrics.java +++ b/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; diff --git a/spring-boot-project/spring-boot-cache/src/main/java/org/springframework/boot/cache/actuate/metrics/autoconfigure/CacheMeterBinderProvidersConfiguration.java b/spring-boot-project/spring-boot-cache/src/main/java/org/springframework/boot/cache/metrics/autoconfigure/CacheMeterBinderProvidersConfiguration.java similarity index 84% rename from spring-boot-project/spring-boot-cache/src/main/java/org/springframework/boot/cache/actuate/metrics/autoconfigure/CacheMeterBinderProvidersConfiguration.java rename to spring-boot-project/spring-boot-cache/src/main/java/org/springframework/boot/cache/metrics/autoconfigure/CacheMeterBinderProvidersConfiguration.java index 979b745234..f7c94a691d 100644 --- a/spring-boot-project/spring-boot-cache/src/main/java/org/springframework/boot/cache/actuate/metrics/autoconfigure/CacheMeterBinderProvidersConfiguration.java +++ b/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; diff --git a/spring-boot-project/spring-boot-cache/src/main/java/org/springframework/boot/cache/actuate/metrics/autoconfigure/CacheMetricsAutoConfiguration.java b/spring-boot-project/spring-boot-cache/src/main/java/org/springframework/boot/cache/metrics/autoconfigure/CacheMetricsAutoConfiguration.java similarity index 96% rename from spring-boot-project/spring-boot-cache/src/main/java/org/springframework/boot/cache/actuate/metrics/autoconfigure/CacheMetricsAutoConfiguration.java rename to spring-boot-project/spring-boot-cache/src/main/java/org/springframework/boot/cache/metrics/autoconfigure/CacheMetricsAutoConfiguration.java index fc12f322f8..e04ffd86d6 100644 --- a/spring-boot-project/spring-boot-cache/src/main/java/org/springframework/boot/cache/actuate/metrics/autoconfigure/CacheMetricsAutoConfiguration.java +++ b/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; diff --git a/spring-boot-project/spring-boot-cache/src/main/java/org/springframework/boot/cache/actuate/metrics/autoconfigure/CacheMetricsRegistrarConfiguration.java b/spring-boot-project/spring-boot-cache/src/main/java/org/springframework/boot/cache/metrics/autoconfigure/CacheMetricsRegistrarConfiguration.java similarity index 93% rename from spring-boot-project/spring-boot-cache/src/main/java/org/springframework/boot/cache/actuate/metrics/autoconfigure/CacheMetricsRegistrarConfiguration.java rename to spring-boot-project/spring-boot-cache/src/main/java/org/springframework/boot/cache/metrics/autoconfigure/CacheMetricsRegistrarConfiguration.java index bfaaa8f74b..e740d6c577 100644 --- a/spring-boot-project/spring-boot-cache/src/main/java/org/springframework/boot/cache/actuate/metrics/autoconfigure/CacheMetricsRegistrarConfiguration.java +++ b/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; diff --git a/spring-boot-project/spring-boot-cache/src/main/java/org/springframework/boot/cache/actuate/metrics/autoconfigure/package-info.java b/spring-boot-project/spring-boot-cache/src/main/java/org/springframework/boot/cache/metrics/autoconfigure/package-info.java similarity index 90% rename from spring-boot-project/spring-boot-cache/src/main/java/org/springframework/boot/cache/actuate/metrics/autoconfigure/package-info.java rename to spring-boot-project/spring-boot-cache/src/main/java/org/springframework/boot/cache/metrics/autoconfigure/package-info.java index 8a0eb484d2..cb0855656d 100644 --- a/spring-boot-project/spring-boot-cache/src/main/java/org/springframework/boot/cache/actuate/metrics/autoconfigure/package-info.java +++ b/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; diff --git a/spring-boot-project/spring-boot-cache/src/main/java/org/springframework/boot/cache/actuate/metrics/package-info.java b/spring-boot-project/spring-boot-cache/src/main/java/org/springframework/boot/cache/metrics/package-info.java similarity index 92% rename from spring-boot-project/spring-boot-cache/src/main/java/org/springframework/boot/cache/actuate/metrics/package-info.java rename to spring-boot-project/spring-boot-cache/src/main/java/org/springframework/boot/cache/metrics/package-info.java index 866e6bd01e..8cba072d9d 100644 --- a/spring-boot-project/spring-boot-cache/src/main/java/org/springframework/boot/cache/actuate/metrics/package-info.java +++ b/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; diff --git a/spring-boot-project/spring-boot-cache/src/main/resources/META-INF/spring/org.springframework.boot.autoconfigure.AutoConfiguration.imports b/spring-boot-project/spring-boot-cache/src/main/resources/META-INF/spring/org.springframework.boot.autoconfigure.AutoConfiguration.imports index 84053fbca1..d611528f57 100644 --- a/spring-boot-project/spring-boot-cache/src/main/resources/META-INF/spring/org.springframework.boot.autoconfigure.AutoConfiguration.imports +++ b/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 diff --git a/spring-boot-project/spring-boot-cache/src/test/java/org/springframework/boot/actuate/autoconfigure/metrics/cache/CacheMetricsAutoConfigurationTests.java b/spring-boot-project/spring-boot-cache/src/test/java/org/springframework/boot/actuate/autoconfigure/metrics/cache/CacheMetricsAutoConfigurationTests.java index 9760a81302..337b995061 100644 --- a/spring-boot-project/spring-boot-cache/src/test/java/org/springframework/boot/actuate/autoconfigure/metrics/cache/CacheMetricsAutoConfigurationTests.java +++ b/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; diff --git a/spring-boot-project/spring-boot-cache/src/test/java/org/springframework/boot/cache/actuate/metrics/Cache2kCacheMeterBinderProviderTests.java b/spring-boot-project/spring-boot-cache/src/test/java/org/springframework/boot/cache/metrics/Cache2kCacheMeterBinderProviderTests.java similarity index 96% rename from spring-boot-project/spring-boot-cache/src/test/java/org/springframework/boot/cache/actuate/metrics/Cache2kCacheMeterBinderProviderTests.java rename to spring-boot-project/spring-boot-cache/src/test/java/org/springframework/boot/cache/metrics/Cache2kCacheMeterBinderProviderTests.java index ff404f8bcd..e12f65d207 100644 --- a/spring-boot-project/spring-boot-cache/src/test/java/org/springframework/boot/cache/actuate/metrics/Cache2kCacheMeterBinderProviderTests.java +++ b/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; diff --git a/spring-boot-project/spring-boot-cache/src/test/java/org/springframework/boot/cache/actuate/metrics/CacheMetricsRegistrarTests.java b/spring-boot-project/spring-boot-cache/src/test/java/org/springframework/boot/cache/metrics/CacheMetricsRegistrarTests.java similarity index 97% rename from spring-boot-project/spring-boot-cache/src/test/java/org/springframework/boot/cache/actuate/metrics/CacheMetricsRegistrarTests.java rename to spring-boot-project/spring-boot-cache/src/test/java/org/springframework/boot/cache/metrics/CacheMetricsRegistrarTests.java index 23b4df8507..73ac03e3cb 100644 --- a/spring-boot-project/spring-boot-cache/src/test/java/org/springframework/boot/cache/actuate/metrics/CacheMetricsRegistrarTests.java +++ b/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; diff --git a/spring-boot-project/spring-boot-cache/src/test/java/org/springframework/boot/cache/actuate/metrics/CaffeineCacheMeterBinderProviderTests.java b/spring-boot-project/spring-boot-cache/src/test/java/org/springframework/boot/cache/metrics/CaffeineCacheMeterBinderProviderTests.java similarity index 96% rename from spring-boot-project/spring-boot-cache/src/test/java/org/springframework/boot/cache/actuate/metrics/CaffeineCacheMeterBinderProviderTests.java rename to spring-boot-project/spring-boot-cache/src/test/java/org/springframework/boot/cache/metrics/CaffeineCacheMeterBinderProviderTests.java index 25ddeb5161..4eb0b9b721 100644 --- a/spring-boot-project/spring-boot-cache/src/test/java/org/springframework/boot/cache/actuate/metrics/CaffeineCacheMeterBinderProviderTests.java +++ b/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; diff --git a/spring-boot-project/spring-boot-cache/src/test/java/org/springframework/boot/cache/actuate/metrics/HazelcastCacheMeterBinderProviderTests.java b/spring-boot-project/spring-boot-cache/src/test/java/org/springframework/boot/cache/metrics/HazelcastCacheMeterBinderProviderTests.java similarity index 92% rename from spring-boot-project/spring-boot-cache/src/test/java/org/springframework/boot/cache/actuate/metrics/HazelcastCacheMeterBinderProviderTests.java rename to spring-boot-project/spring-boot-cache/src/test/java/org/springframework/boot/cache/metrics/HazelcastCacheMeterBinderProviderTests.java index 6fdaaac11c..d7522f1e22 100644 --- a/spring-boot-project/spring-boot-cache/src/test/java/org/springframework/boot/cache/actuate/metrics/HazelcastCacheMeterBinderProviderTests.java +++ b/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; diff --git a/spring-boot-project/spring-boot-cache/src/test/java/org/springframework/boot/cache/actuate/metrics/JCacheCacheMeterBinderProviderTests.java b/spring-boot-project/spring-boot-cache/src/test/java/org/springframework/boot/cache/metrics/JCacheCacheMeterBinderProviderTests.java similarity index 97% rename from spring-boot-project/spring-boot-cache/src/test/java/org/springframework/boot/cache/actuate/metrics/JCacheCacheMeterBinderProviderTests.java rename to spring-boot-project/spring-boot-cache/src/test/java/org/springframework/boot/cache/metrics/JCacheCacheMeterBinderProviderTests.java index 809ad946bd..4a4ff70d31 100644 --- a/spring-boot-project/spring-boot-cache/src/test/java/org/springframework/boot/cache/actuate/metrics/JCacheCacheMeterBinderProviderTests.java +++ b/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; diff --git a/spring-boot-project/spring-boot-cache/src/test/java/org/springframework/boot/cache/actuate/metrics/RedisCacheMeterBinderProviderTests.java b/spring-boot-project/spring-boot-cache/src/test/java/org/springframework/boot/cache/metrics/RedisCacheMeterBinderProviderTests.java similarity index 96% rename from spring-boot-project/spring-boot-cache/src/test/java/org/springframework/boot/cache/actuate/metrics/RedisCacheMeterBinderProviderTests.java rename to spring-boot-project/spring-boot-cache/src/test/java/org/springframework/boot/cache/metrics/RedisCacheMeterBinderProviderTests.java index 44a9e9e0fb..7f4ddef29a 100644 --- a/spring-boot-project/spring-boot-cache/src/test/java/org/springframework/boot/cache/actuate/metrics/RedisCacheMeterBinderProviderTests.java +++ b/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; diff --git a/spring-boot-project/spring-boot-data-redis/src/main/java/org/springframework/boot/data/redis/actuate/metrics/autoconfigure/LettuceMetricsAutoConfiguration.java b/spring-boot-project/spring-boot-data-redis/src/main/java/org/springframework/boot/data/redis/metrics/autoconfigure/LettuceMetricsAutoConfiguration.java similarity index 96% rename from spring-boot-project/spring-boot-data-redis/src/main/java/org/springframework/boot/data/redis/actuate/metrics/autoconfigure/LettuceMetricsAutoConfiguration.java rename to spring-boot-project/spring-boot-data-redis/src/main/java/org/springframework/boot/data/redis/metrics/autoconfigure/LettuceMetricsAutoConfiguration.java index b81f8680d8..8449996f66 100644 --- a/spring-boot-project/spring-boot-data-redis/src/main/java/org/springframework/boot/data/redis/actuate/metrics/autoconfigure/LettuceMetricsAutoConfiguration.java +++ b/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; diff --git a/spring-boot-project/spring-boot-data-redis/src/main/java/org/springframework/boot/data/redis/actuate/metrics/autoconfigure/package-info.java b/spring-boot-project/spring-boot-data-redis/src/main/java/org/springframework/boot/data/redis/metrics/autoconfigure/package-info.java similarity index 89% rename from spring-boot-project/spring-boot-data-redis/src/main/java/org/springframework/boot/data/redis/actuate/metrics/autoconfigure/package-info.java rename to spring-boot-project/spring-boot-data-redis/src/main/java/org/springframework/boot/data/redis/metrics/autoconfigure/package-info.java index d26ae515c5..830b8b767b 100644 --- a/spring-boot-project/spring-boot-data-redis/src/main/java/org/springframework/boot/data/redis/actuate/metrics/autoconfigure/package-info.java +++ b/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; diff --git a/spring-boot-project/spring-boot-data-redis/src/main/resources/META-INF/spring/org.springframework.boot.autoconfigure.AutoConfiguration.imports b/spring-boot-project/spring-boot-data-redis/src/main/resources/META-INF/spring/org.springframework.boot.autoconfigure.AutoConfiguration.imports index 317fdd70ec..d875a4e022 100644 --- a/spring-boot-project/spring-boot-data-redis/src/main/resources/META-INF/spring/org.springframework.boot.autoconfigure.AutoConfiguration.imports +++ b/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 diff --git a/spring-boot-project/spring-boot-data-redis/src/test/java/org/springframework/boot/data/redis/actuate/metrics/autoconfigure/LettuceMetricsAutoConfigurationTests.java b/spring-boot-project/spring-boot-data-redis/src/test/java/org/springframework/boot/data/redis/metrics/autoconfigure/LettuceMetricsAutoConfigurationTests.java similarity index 98% rename from spring-boot-project/spring-boot-data-redis/src/test/java/org/springframework/boot/data/redis/actuate/metrics/autoconfigure/LettuceMetricsAutoConfigurationTests.java rename to spring-boot-project/spring-boot-data-redis/src/test/java/org/springframework/boot/data/redis/metrics/autoconfigure/LettuceMetricsAutoConfigurationTests.java index 5c8517c17b..0fff3bcfd9 100644 --- a/spring-boot-project/spring-boot-data-redis/src/test/java/org/springframework/boot/data/redis/actuate/metrics/autoconfigure/LettuceMetricsAutoConfigurationTests.java +++ b/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; diff --git a/spring-boot-project/spring-boot-integration/src/main/java/org/springframework/boot/integration/actuate/metrics/autoconfigure/IntegrationMetricsAutoConfiguration.java b/spring-boot-project/spring-boot-integration/src/main/java/org/springframework/boot/integration/metrics/autoconfigure/IntegrationMetricsAutoConfiguration.java similarity index 94% rename from spring-boot-project/spring-boot-integration/src/main/java/org/springframework/boot/integration/actuate/metrics/autoconfigure/IntegrationMetricsAutoConfiguration.java rename to spring-boot-project/spring-boot-integration/src/main/java/org/springframework/boot/integration/metrics/autoconfigure/IntegrationMetricsAutoConfiguration.java index c98f11a319..027ee5dd5e 100644 --- a/spring-boot-project/spring-boot-integration/src/main/java/org/springframework/boot/integration/actuate/metrics/autoconfigure/IntegrationMetricsAutoConfiguration.java +++ b/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; diff --git a/spring-boot-project/spring-boot-integration/src/main/java/org/springframework/boot/integration/actuate/metrics/autoconfigure/package-info.java b/spring-boot-project/spring-boot-integration/src/main/java/org/springframework/boot/integration/metrics/autoconfigure/package-info.java similarity index 90% rename from spring-boot-project/spring-boot-integration/src/main/java/org/springframework/boot/integration/actuate/metrics/autoconfigure/package-info.java rename to spring-boot-project/spring-boot-integration/src/main/java/org/springframework/boot/integration/metrics/autoconfigure/package-info.java index 53ca719197..91aeb16ed8 100644 --- a/spring-boot-project/spring-boot-integration/src/main/java/org/springframework/boot/integration/actuate/metrics/autoconfigure/package-info.java +++ b/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; diff --git a/spring-boot-project/spring-boot-integration/src/main/resources/META-INF/spring/org.springframework.boot.autoconfigure.AutoConfiguration.imports b/spring-boot-project/spring-boot-integration/src/main/resources/META-INF/spring/org.springframework.boot.autoconfigure.AutoConfiguration.imports index 89001f954f..78f5606cde 100644 --- a/spring-boot-project/spring-boot-integration/src/main/resources/META-INF/spring/org.springframework.boot.autoconfigure.AutoConfiguration.imports +++ b/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 diff --git a/spring-boot-project/spring-boot-integration/src/test/java/org/springframework/boot/integration/actuate/metrics/autoconfigure/IntegrationMetricsAutoConfigurationTests.java b/spring-boot-project/spring-boot-integration/src/test/java/org/springframework/boot/integration/metrics/autoconfigure/IntegrationMetricsAutoConfigurationTests.java similarity index 96% rename from spring-boot-project/spring-boot-integration/src/test/java/org/springframework/boot/integration/actuate/metrics/autoconfigure/IntegrationMetricsAutoConfigurationTests.java rename to spring-boot-project/spring-boot-integration/src/test/java/org/springframework/boot/integration/metrics/autoconfigure/IntegrationMetricsAutoConfigurationTests.java index fe467eba75..85e97aff96 100644 --- a/spring-boot-project/spring-boot-integration/src/test/java/org/springframework/boot/integration/actuate/metrics/autoconfigure/IntegrationMetricsAutoConfigurationTests.java +++ b/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; diff --git a/spring-boot-project/spring-boot-jdbc/src/main/java/org/springframework/boot/jdbc/actuate/metrics/DataSourcePoolMetrics.java b/spring-boot-project/spring-boot-jdbc/src/main/java/org/springframework/boot/jdbc/metrics/DataSourcePoolMetrics.java similarity index 98% rename from spring-boot-project/spring-boot-jdbc/src/main/java/org/springframework/boot/jdbc/actuate/metrics/DataSourcePoolMetrics.java rename to spring-boot-project/spring-boot-jdbc/src/main/java/org/springframework/boot/jdbc/metrics/DataSourcePoolMetrics.java index 493861313c..27abe613df 100644 --- a/spring-boot-project/spring-boot-jdbc/src/main/java/org/springframework/boot/jdbc/actuate/metrics/DataSourcePoolMetrics.java +++ b/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; diff --git a/spring-boot-project/spring-boot-jdbc/src/main/java/org/springframework/boot/jdbc/actuate/metrics/autoconfigure/DataSourcePoolMetricsAutoConfiguration.java b/spring-boot-project/spring-boot-jdbc/src/main/java/org/springframework/boot/jdbc/metrics/autoconfigure/DataSourcePoolMetricsAutoConfiguration.java similarity index 97% rename from spring-boot-project/spring-boot-jdbc/src/main/java/org/springframework/boot/jdbc/actuate/metrics/autoconfigure/DataSourcePoolMetricsAutoConfiguration.java rename to spring-boot-project/spring-boot-jdbc/src/main/java/org/springframework/boot/jdbc/metrics/autoconfigure/DataSourcePoolMetricsAutoConfiguration.java index ac17101ca2..212a2f671b 100644 --- a/spring-boot-project/spring-boot-jdbc/src/main/java/org/springframework/boot/jdbc/actuate/metrics/autoconfigure/DataSourcePoolMetricsAutoConfiguration.java +++ b/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; diff --git a/spring-boot-project/spring-boot-jdbc/src/main/java/org/springframework/boot/jdbc/actuate/metrics/autoconfigure/package-info.java b/spring-boot-project/spring-boot-jdbc/src/main/java/org/springframework/boot/jdbc/metrics/autoconfigure/package-info.java similarity index 90% rename from spring-boot-project/spring-boot-jdbc/src/main/java/org/springframework/boot/jdbc/actuate/metrics/autoconfigure/package-info.java rename to spring-boot-project/spring-boot-jdbc/src/main/java/org/springframework/boot/jdbc/metrics/autoconfigure/package-info.java index 492d161787..bcc28c1f71 100644 --- a/spring-boot-project/spring-boot-jdbc/src/main/java/org/springframework/boot/jdbc/actuate/metrics/autoconfigure/package-info.java +++ b/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; diff --git a/spring-boot-project/spring-boot-jdbc/src/main/java/org/springframework/boot/jdbc/actuate/metrics/package-info.java b/spring-boot-project/spring-boot-jdbc/src/main/java/org/springframework/boot/jdbc/metrics/package-info.java similarity index 92% rename from spring-boot-project/spring-boot-jdbc/src/main/java/org/springframework/boot/jdbc/actuate/metrics/package-info.java rename to spring-boot-project/spring-boot-jdbc/src/main/java/org/springframework/boot/jdbc/metrics/package-info.java index c8f2f9db87..58a0c7f5b6 100644 --- a/spring-boot-project/spring-boot-jdbc/src/main/java/org/springframework/boot/jdbc/actuate/metrics/package-info.java +++ b/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; diff --git a/spring-boot-project/spring-boot-jdbc/src/main/resources/META-INF/spring/org.springframework.boot.autoconfigure.AutoConfiguration.imports b/spring-boot-project/spring-boot-jdbc/src/main/resources/META-INF/spring/org.springframework.boot.autoconfigure.AutoConfiguration.imports index 2bcd2df17f..7c0d90ca47 100644 --- a/spring-boot-project/spring-boot-jdbc/src/main/resources/META-INF/spring/org.springframework.boot.autoconfigure.AutoConfiguration.imports +++ b/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 diff --git a/spring-boot-project/spring-boot-jdbc/src/test/java/org/springframework/boot/jdbc/actuate/metrics/DataSourcePoolMetricsTests.java b/spring-boot-project/spring-boot-jdbc/src/test/java/org/springframework/boot/jdbc/metrics/DataSourcePoolMetricsTests.java similarity index 97% rename from spring-boot-project/spring-boot-jdbc/src/test/java/org/springframework/boot/jdbc/actuate/metrics/DataSourcePoolMetricsTests.java rename to spring-boot-project/spring-boot-jdbc/src/test/java/org/springframework/boot/jdbc/metrics/DataSourcePoolMetricsTests.java index dfd6e63dc8..44d649f7e6 100644 --- a/spring-boot-project/spring-boot-jdbc/src/test/java/org/springframework/boot/jdbc/actuate/metrics/DataSourcePoolMetricsTests.java +++ b/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; diff --git a/spring-boot-project/spring-boot-jdbc/src/test/java/org/springframework/boot/jdbc/actuate/metrics/autoconfigure/DataSourcePoolMetricsAutoConfigurationTests.java b/spring-boot-project/spring-boot-jdbc/src/test/java/org/springframework/boot/jdbc/metrics/autoconfigure/DataSourcePoolMetricsAutoConfigurationTests.java similarity index 99% rename from spring-boot-project/spring-boot-jdbc/src/test/java/org/springframework/boot/jdbc/actuate/metrics/autoconfigure/DataSourcePoolMetricsAutoConfigurationTests.java rename to spring-boot-project/spring-boot-jdbc/src/test/java/org/springframework/boot/jdbc/metrics/autoconfigure/DataSourcePoolMetricsAutoConfigurationTests.java index 4817605d90..95cfd59fe3 100644 --- a/spring-boot-project/spring-boot-jdbc/src/test/java/org/springframework/boot/jdbc/actuate/metrics/autoconfigure/DataSourcePoolMetricsAutoConfigurationTests.java +++ b/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; diff --git a/spring-boot-project/spring-boot-jetty/src/main/java/org/springframework/boot/jetty/actuate/metrics/AbstractJettyMetricsBinder.java b/spring-boot-project/spring-boot-jetty/src/main/java/org/springframework/boot/jetty/metrics/AbstractJettyMetricsBinder.java similarity index 97% rename from spring-boot-project/spring-boot-jetty/src/main/java/org/springframework/boot/jetty/actuate/metrics/AbstractJettyMetricsBinder.java rename to spring-boot-project/spring-boot-jetty/src/main/java/org/springframework/boot/jetty/metrics/AbstractJettyMetricsBinder.java index 78d6c2ec5d..9a88ca4d13 100644 --- a/spring-boot-project/spring-boot-jetty/src/main/java/org/springframework/boot/jetty/actuate/metrics/AbstractJettyMetricsBinder.java +++ b/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; diff --git a/spring-boot-project/spring-boot-jetty/src/main/java/org/springframework/boot/jetty/actuate/metrics/JettyConnectionMetricsBinder.java b/spring-boot-project/spring-boot-jetty/src/main/java/org/springframework/boot/jetty/metrics/JettyConnectionMetricsBinder.java similarity index 96% rename from spring-boot-project/spring-boot-jetty/src/main/java/org/springframework/boot/jetty/actuate/metrics/JettyConnectionMetricsBinder.java rename to spring-boot-project/spring-boot-jetty/src/main/java/org/springframework/boot/jetty/metrics/JettyConnectionMetricsBinder.java index 415f547dc4..564d240e0c 100644 --- a/spring-boot-project/spring-boot-jetty/src/main/java/org/springframework/boot/jetty/actuate/metrics/JettyConnectionMetricsBinder.java +++ b/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; diff --git a/spring-boot-project/spring-boot-jetty/src/main/java/org/springframework/boot/jetty/actuate/metrics/JettyServerThreadPoolMetricsBinder.java b/spring-boot-project/spring-boot-jetty/src/main/java/org/springframework/boot/jetty/metrics/JettyServerThreadPoolMetricsBinder.java similarity index 96% rename from spring-boot-project/spring-boot-jetty/src/main/java/org/springframework/boot/jetty/actuate/metrics/JettyServerThreadPoolMetricsBinder.java rename to spring-boot-project/spring-boot-jetty/src/main/java/org/springframework/boot/jetty/metrics/JettyServerThreadPoolMetricsBinder.java index c2364c0bfc..f8224524c7 100644 --- a/spring-boot-project/spring-boot-jetty/src/main/java/org/springframework/boot/jetty/actuate/metrics/JettyServerThreadPoolMetricsBinder.java +++ b/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; diff --git a/spring-boot-project/spring-boot-jetty/src/main/java/org/springframework/boot/jetty/actuate/metrics/JettySslHandshakeMetricsBinder.java b/spring-boot-project/spring-boot-jetty/src/main/java/org/springframework/boot/jetty/metrics/JettySslHandshakeMetricsBinder.java similarity index 96% rename from spring-boot-project/spring-boot-jetty/src/main/java/org/springframework/boot/jetty/actuate/metrics/JettySslHandshakeMetricsBinder.java rename to spring-boot-project/spring-boot-jetty/src/main/java/org/springframework/boot/jetty/metrics/JettySslHandshakeMetricsBinder.java index ad5122ec25..cfdc46843c 100644 --- a/spring-boot-project/spring-boot-jetty/src/main/java/org/springframework/boot/jetty/actuate/metrics/JettySslHandshakeMetricsBinder.java +++ b/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; diff --git a/spring-boot-project/spring-boot-jetty/src/main/java/org/springframework/boot/jetty/actuate/metrics/autoconfigure/JettyMetricsAutoConfiguration.java b/spring-boot-project/spring-boot-jetty/src/main/java/org/springframework/boot/jetty/metrics/autoconfigure/JettyMetricsAutoConfiguration.java similarity index 89% rename from spring-boot-project/spring-boot-jetty/src/main/java/org/springframework/boot/jetty/actuate/metrics/autoconfigure/JettyMetricsAutoConfiguration.java rename to spring-boot-project/spring-boot-jetty/src/main/java/org/springframework/boot/jetty/metrics/autoconfigure/JettyMetricsAutoConfiguration.java index 6bd67465e2..882e79b0a7 100644 --- a/spring-boot-project/spring-boot-jetty/src/main/java/org/springframework/boot/jetty/actuate/metrics/autoconfigure/JettyMetricsAutoConfiguration.java +++ b/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; /** diff --git a/spring-boot-project/spring-boot-jetty/src/main/java/org/springframework/boot/jetty/actuate/metrics/autoconfigure/package-info.java b/spring-boot-project/spring-boot-jetty/src/main/java/org/springframework/boot/jetty/metrics/autoconfigure/package-info.java similarity index 90% rename from spring-boot-project/spring-boot-jetty/src/main/java/org/springframework/boot/jetty/actuate/metrics/autoconfigure/package-info.java rename to spring-boot-project/spring-boot-jetty/src/main/java/org/springframework/boot/jetty/metrics/autoconfigure/package-info.java index 2ebec5a568..5098f7d7a2 100644 --- a/spring-boot-project/spring-boot-jetty/src/main/java/org/springframework/boot/jetty/actuate/metrics/autoconfigure/package-info.java +++ b/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; diff --git a/spring-boot-project/spring-boot-jetty/src/main/java/org/springframework/boot/jetty/actuate/metrics/package-info.java b/spring-boot-project/spring-boot-jetty/src/main/java/org/springframework/boot/jetty/metrics/package-info.java similarity index 92% rename from spring-boot-project/spring-boot-jetty/src/main/java/org/springframework/boot/jetty/actuate/metrics/package-info.java rename to spring-boot-project/spring-boot-jetty/src/main/java/org/springframework/boot/jetty/metrics/package-info.java index a9ef1b79b4..46d57c91a9 100644 --- a/spring-boot-project/spring-boot-jetty/src/main/java/org/springframework/boot/jetty/actuate/metrics/package-info.java +++ b/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; diff --git a/spring-boot-project/spring-boot-jetty/src/main/resources/META-INF/spring/org.springframework.boot.autoconfigure.AutoConfiguration.imports b/spring-boot-project/spring-boot-jetty/src/main/resources/META-INF/spring/org.springframework.boot.autoconfigure.AutoConfiguration.imports index d639cf667d..663ad752ad 100644 --- a/spring-boot-project/spring-boot-jetty/src/main/resources/META-INF/spring/org.springframework.boot.autoconfigure.AutoConfiguration.imports +++ b/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 \ No newline at end of file +org.springframework.boot.jetty.autoconfigure.servlet.JettyServletWebServerAutoConfiguration +org.springframework.boot.jetty.metrics.autoconfigure.JettyMetricsAutoConfiguration diff --git a/spring-boot-project/spring-boot-jetty/src/test/java/org/springframework/boot/jetty/actuate/metrics/autoconfigure/JettyMetricsAutoConfigurationTests.java b/spring-boot-project/spring-boot-jetty/src/test/java/org/springframework/boot/jetty/metrics/autoconfigure/JettyMetricsAutoConfigurationTests.java similarity index 97% rename from spring-boot-project/spring-boot-jetty/src/test/java/org/springframework/boot/jetty/actuate/metrics/autoconfigure/JettyMetricsAutoConfigurationTests.java rename to spring-boot-project/spring-boot-jetty/src/test/java/org/springframework/boot/jetty/metrics/autoconfigure/JettyMetricsAutoConfigurationTests.java index bf4ff715d8..ca1fd18686 100644 --- a/spring-boot-project/spring-boot-jetty/src/test/java/org/springframework/boot/jetty/actuate/metrics/autoconfigure/JettyMetricsAutoConfigurationTests.java +++ b/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; diff --git a/spring-boot-project/spring-boot-jetty/src/test/resources/org/springframework/boot/jetty/actuate/metrics/autoconfigure/test.jks b/spring-boot-project/spring-boot-jetty/src/test/resources/org/springframework/boot/jetty/metrics/autoconfigure/test.jks similarity index 100% rename from spring-boot-project/spring-boot-jetty/src/test/resources/org/springframework/boot/jetty/actuate/metrics/autoconfigure/test.jks rename to spring-boot-project/spring-boot-jetty/src/test/resources/org/springframework/boot/jetty/metrics/autoconfigure/test.jks diff --git a/spring-boot-project/spring-boot-jpa/src/main/java/org/springframework/boot/jpa/hibernate/actuate/metrics/autoconfigure/HibernateMetricsAutoConfiguration.java b/spring-boot-project/spring-boot-jpa/src/main/java/org/springframework/boot/jpa/hibernate/metrics/autoconfigure/HibernateMetricsAutoConfiguration.java similarity index 98% rename from spring-boot-project/spring-boot-jpa/src/main/java/org/springframework/boot/jpa/hibernate/actuate/metrics/autoconfigure/HibernateMetricsAutoConfiguration.java rename to spring-boot-project/spring-boot-jpa/src/main/java/org/springframework/boot/jpa/hibernate/metrics/autoconfigure/HibernateMetricsAutoConfiguration.java index e8c79ba73e..b312408e66 100644 --- a/spring-boot-project/spring-boot-jpa/src/main/java/org/springframework/boot/jpa/hibernate/actuate/metrics/autoconfigure/HibernateMetricsAutoConfiguration.java +++ b/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; diff --git a/spring-boot-project/spring-boot-jpa/src/main/java/org/springframework/boot/jpa/hibernate/actuate/metrics/autoconfigure/package-info.java b/spring-boot-project/spring-boot-jpa/src/main/java/org/springframework/boot/jpa/hibernate/metrics/autoconfigure/package-info.java similarity index 89% rename from spring-boot-project/spring-boot-jpa/src/main/java/org/springframework/boot/jpa/hibernate/actuate/metrics/autoconfigure/package-info.java rename to spring-boot-project/spring-boot-jpa/src/main/java/org/springframework/boot/jpa/hibernate/metrics/autoconfigure/package-info.java index cfbb04f017..837191fdc9 100644 --- a/spring-boot-project/spring-boot-jpa/src/main/java/org/springframework/boot/jpa/hibernate/actuate/metrics/autoconfigure/package-info.java +++ b/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; diff --git a/spring-boot-project/spring-boot-jpa/src/main/resources/META-INF/spring/org.springframework.boot.autoconfigure.AutoConfiguration.imports b/spring-boot-project/spring-boot-jpa/src/main/resources/META-INF/spring/org.springframework.boot.autoconfigure.AutoConfiguration.imports index 05cd3c2975..df42f543e7 100644 --- a/spring-boot-project/spring-boot-jpa/src/main/resources/META-INF/spring/org.springframework.boot.autoconfigure.AutoConfiguration.imports +++ b/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 diff --git a/spring-boot-project/spring-boot-jpa/src/test/java/org/springframework/boot/jpa/hibernate/actuate/metrics/autoconfigure/HibernateMetricsAutoConfigurationTests.java b/spring-boot-project/spring-boot-jpa/src/test/java/org/springframework/boot/jpa/hibernate/metrics/autoconfigure/HibernateMetricsAutoConfigurationTests.java similarity index 99% rename from spring-boot-project/spring-boot-jpa/src/test/java/org/springframework/boot/jpa/hibernate/actuate/metrics/autoconfigure/HibernateMetricsAutoConfigurationTests.java rename to spring-boot-project/spring-boot-jpa/src/test/java/org/springframework/boot/jpa/hibernate/metrics/autoconfigure/HibernateMetricsAutoConfigurationTests.java index d84bd704d0..4c3320eeb9 100644 --- a/spring-boot-project/spring-boot-jpa/src/test/java/org/springframework/boot/jpa/hibernate/actuate/metrics/autoconfigure/HibernateMetricsAutoConfigurationTests.java +++ b/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; diff --git a/spring-boot-project/spring-boot-kafka/src/main/java/org/springframework/boot/kafka/autoconfigure/metrics/KafkaMetricsAutoConfiguration.java b/spring-boot-project/spring-boot-kafka/src/main/java/org/springframework/boot/kafka/metrics/autoconfigure/KafkaMetricsAutoConfiguration.java similarity index 98% rename from spring-boot-project/spring-boot-kafka/src/main/java/org/springframework/boot/kafka/autoconfigure/metrics/KafkaMetricsAutoConfiguration.java rename to spring-boot-project/spring-boot-kafka/src/main/java/org/springframework/boot/kafka/metrics/autoconfigure/KafkaMetricsAutoConfiguration.java index a71e3685d4..9c0b97c920 100644 --- a/spring-boot-project/spring-boot-kafka/src/main/java/org/springframework/boot/kafka/autoconfigure/metrics/KafkaMetricsAutoConfiguration.java +++ b/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; diff --git a/spring-boot-project/spring-boot-kafka/src/main/java/org/springframework/boot/kafka/autoconfigure/metrics/package-info.java b/spring-boot-project/spring-boot-kafka/src/main/java/org/springframework/boot/kafka/metrics/autoconfigure/package-info.java similarity index 91% rename from spring-boot-project/spring-boot-kafka/src/main/java/org/springframework/boot/kafka/autoconfigure/metrics/package-info.java rename to spring-boot-project/spring-boot-kafka/src/main/java/org/springframework/boot/kafka/metrics/autoconfigure/package-info.java index c0ff530834..492df16b2e 100644 --- a/spring-boot-project/spring-boot-kafka/src/main/java/org/springframework/boot/kafka/autoconfigure/metrics/package-info.java +++ b/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; diff --git a/spring-boot-project/spring-boot-kafka/src/main/resources/META-INF/spring/org.springframework.boot.autoconfigure.AutoConfiguration.imports b/spring-boot-project/spring-boot-kafka/src/main/resources/META-INF/spring/org.springframework.boot.autoconfigure.AutoConfiguration.imports index a38ec28810..f5f26a97e5 100644 --- a/spring-boot-project/spring-boot-kafka/src/main/resources/META-INF/spring/org.springframework.boot.autoconfigure.AutoConfiguration.imports +++ b/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 diff --git a/spring-boot-project/spring-boot-kafka/src/test/java/org/springframework/boot/kafka/autoconfigure/metrics/KafkaMetricsAutoConfigurationTests.java b/spring-boot-project/spring-boot-kafka/src/test/java/org/springframework/boot/kafka/metrics/autoconfigure/KafkaMetricsAutoConfigurationTests.java similarity index 98% rename from spring-boot-project/spring-boot-kafka/src/test/java/org/springframework/boot/kafka/autoconfigure/metrics/KafkaMetricsAutoConfigurationTests.java rename to spring-boot-project/spring-boot-kafka/src/test/java/org/springframework/boot/kafka/metrics/autoconfigure/KafkaMetricsAutoConfigurationTests.java index 8f0ec1f5ba..02569368e0 100644 --- a/spring-boot-project/spring-boot-kafka/src/test/java/org/springframework/boot/kafka/autoconfigure/metrics/KafkaMetricsAutoConfigurationTests.java +++ b/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; diff --git a/spring-boot-project/spring-boot-mongodb/src/main/java/org/springframework/boot/mongodb/actuate/metrics/autoconfigure/MongoMetricsAutoConfiguration.java b/spring-boot-project/spring-boot-mongodb/src/main/java/org/springframework/boot/mongodb/metrics/autoconfigure/MongoMetricsAutoConfiguration.java similarity index 98% rename from spring-boot-project/spring-boot-mongodb/src/main/java/org/springframework/boot/mongodb/actuate/metrics/autoconfigure/MongoMetricsAutoConfiguration.java rename to spring-boot-project/spring-boot-mongodb/src/main/java/org/springframework/boot/mongodb/metrics/autoconfigure/MongoMetricsAutoConfiguration.java index cca9cc25c0..5c80e3976a 100644 --- a/spring-boot-project/spring-boot-mongodb/src/main/java/org/springframework/boot/mongodb/actuate/metrics/autoconfigure/MongoMetricsAutoConfiguration.java +++ b/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; diff --git a/spring-boot-project/spring-boot-mongodb/src/main/java/org/springframework/boot/mongodb/actuate/metrics/autoconfigure/package-info.java b/spring-boot-project/spring-boot-mongodb/src/main/java/org/springframework/boot/mongodb/metrics/autoconfigure/package-info.java similarity index 90% rename from spring-boot-project/spring-boot-mongodb/src/main/java/org/springframework/boot/mongodb/actuate/metrics/autoconfigure/package-info.java rename to spring-boot-project/spring-boot-mongodb/src/main/java/org/springframework/boot/mongodb/metrics/autoconfigure/package-info.java index eb57efea0b..e0918a7a7d 100644 --- a/spring-boot-project/spring-boot-mongodb/src/main/java/org/springframework/boot/mongodb/actuate/metrics/autoconfigure/package-info.java +++ b/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; diff --git a/spring-boot-project/spring-boot-mongodb/src/main/resources/META-INF/spring/org.springframework.boot.autoconfigure.AutoConfiguration.imports b/spring-boot-project/spring-boot-mongodb/src/main/resources/META-INF/spring/org.springframework.boot.autoconfigure.AutoConfiguration.imports index effc4fb737..a5056ebaa0 100644 --- a/spring-boot-project/spring-boot-mongodb/src/main/resources/META-INF/spring/org.springframework.boot.autoconfigure.AutoConfiguration.imports +++ b/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 diff --git a/spring-boot-project/spring-boot-mongodb/src/test/java/org/springframework/boot/mongodb/actuate/metrics/autoconfigure/MongoMetricsAutoConfigurationTests.java b/spring-boot-project/spring-boot-mongodb/src/test/java/org/springframework/boot/mongodb/metrics/autoconfigure/MongoMetricsAutoConfigurationTests.java similarity index 99% rename from spring-boot-project/spring-boot-mongodb/src/test/java/org/springframework/boot/mongodb/actuate/metrics/autoconfigure/MongoMetricsAutoConfigurationTests.java rename to spring-boot-project/spring-boot-mongodb/src/test/java/org/springframework/boot/mongodb/metrics/autoconfigure/MongoMetricsAutoConfigurationTests.java index 1aea2d344c..d98afbeb99 100644 --- a/spring-boot-project/spring-boot-mongodb/src/test/java/org/springframework/boot/mongodb/actuate/metrics/autoconfigure/MongoMetricsAutoConfigurationTests.java +++ b/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; diff --git a/spring-boot-project/spring-boot-observation/build.gradle b/spring-boot-project/spring-boot-observation/build.gradle new file mode 100644 index 0000000000..f4f7a9de1d --- /dev/null +++ b/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") +} diff --git a/spring-boot-project/spring-boot-observation/src/main/resources/META-INF/additional-spring-configuration-metadata.json b/spring-boot-project/spring-boot-observation/src/main/resources/META-INF/additional-spring-configuration-metadata.json new file mode 100644 index 0000000000..671fd2520c --- /dev/null +++ b/spring-boot-project/spring-boot-observation/src/main/resources/META-INF/additional-spring-configuration-metadata.json @@ -0,0 +1,4 @@ +{ + "groups": [], + "properties": [] +} diff --git a/spring-boot-project/spring-boot-observation/src/main/resources/META-INF/spring/org.springframework.boot.autoconfigure.AutoConfiguration.imports b/spring-boot-project/spring-boot-observation/src/main/resources/META-INF/spring/org.springframework.boot.autoconfigure.AutoConfiguration.imports new file mode 100644 index 0000000000..e69de29bb2 diff --git a/spring-boot-project/spring-boot-r2dbc/src/main/java/org/springframework/boot/r2dbc/actuate/metrics/ConnectionPoolMetrics.java b/spring-boot-project/spring-boot-r2dbc/src/main/java/org/springframework/boot/r2dbc/metrics/ConnectionPoolMetrics.java similarity index 98% rename from spring-boot-project/spring-boot-r2dbc/src/main/java/org/springframework/boot/r2dbc/actuate/metrics/ConnectionPoolMetrics.java rename to spring-boot-project/spring-boot-r2dbc/src/main/java/org/springframework/boot/r2dbc/metrics/ConnectionPoolMetrics.java index c044c8f1e5..469ec3e616 100644 --- a/spring-boot-project/spring-boot-r2dbc/src/main/java/org/springframework/boot/r2dbc/actuate/metrics/ConnectionPoolMetrics.java +++ b/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; diff --git a/spring-boot-project/spring-boot-r2dbc/src/main/java/org/springframework/boot/r2dbc/actuate/metrics/autoconfigure/ConnectionPoolMetricsAutoConfiguration.java b/spring-boot-project/spring-boot-r2dbc/src/main/java/org/springframework/boot/r2dbc/metrics/autoconfigure/ConnectionPoolMetricsAutoConfiguration.java similarity index 94% rename from spring-boot-project/spring-boot-r2dbc/src/main/java/org/springframework/boot/r2dbc/actuate/metrics/autoconfigure/ConnectionPoolMetricsAutoConfiguration.java rename to spring-boot-project/spring-boot-r2dbc/src/main/java/org/springframework/boot/r2dbc/metrics/autoconfigure/ConnectionPoolMetricsAutoConfiguration.java index 5ba893cc8c..a165f866cd 100644 --- a/spring-boot-project/spring-boot-r2dbc/src/main/java/org/springframework/boot/r2dbc/actuate/metrics/autoconfigure/ConnectionPoolMetricsAutoConfiguration.java +++ b/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 diff --git a/spring-boot-project/spring-boot-r2dbc/src/main/java/org/springframework/boot/r2dbc/actuate/metrics/autoconfigure/package-info.java b/spring-boot-project/spring-boot-r2dbc/src/main/java/org/springframework/boot/r2dbc/metrics/autoconfigure/package-info.java similarity index 90% rename from spring-boot-project/spring-boot-r2dbc/src/main/java/org/springframework/boot/r2dbc/actuate/metrics/autoconfigure/package-info.java rename to spring-boot-project/spring-boot-r2dbc/src/main/java/org/springframework/boot/r2dbc/metrics/autoconfigure/package-info.java index 2f52846818..0a3fd09ad1 100644 --- a/spring-boot-project/spring-boot-r2dbc/src/main/java/org/springframework/boot/r2dbc/actuate/metrics/autoconfigure/package-info.java +++ b/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; diff --git a/spring-boot-project/spring-boot-r2dbc/src/main/java/org/springframework/boot/r2dbc/actuate/metrics/package-info.java b/spring-boot-project/spring-boot-r2dbc/src/main/java/org/springframework/boot/r2dbc/metrics/package-info.java similarity index 92% rename from spring-boot-project/spring-boot-r2dbc/src/main/java/org/springframework/boot/r2dbc/actuate/metrics/package-info.java rename to spring-boot-project/spring-boot-r2dbc/src/main/java/org/springframework/boot/r2dbc/metrics/package-info.java index 8bdbba3f56..f2fa3981ec 100644 --- a/spring-boot-project/spring-boot-r2dbc/src/main/java/org/springframework/boot/r2dbc/actuate/metrics/package-info.java +++ b/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; diff --git a/spring-boot-project/spring-boot-r2dbc/src/main/resources/META-INF/spring/org.springframework.boot.autoconfigure.AutoConfiguration.imports b/spring-boot-project/spring-boot-r2dbc/src/main/resources/META-INF/spring/org.springframework.boot.autoconfigure.AutoConfiguration.imports index a4b2ccc879..1feda01c51 100644 --- a/spring-boot-project/spring-boot-r2dbc/src/main/resources/META-INF/spring/org.springframework.boot.autoconfigure.AutoConfiguration.imports +++ b/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 diff --git a/spring-boot-project/spring-boot-r2dbc/src/test/java/org/springframework/boot/r2dbc/actuate/metrics/ConnectionPoolMetricsTests.java b/spring-boot-project/spring-boot-r2dbc/src/test/java/org/springframework/boot/r2dbc/metrics/ConnectionPoolMetricsTests.java similarity index 98% rename from spring-boot-project/spring-boot-r2dbc/src/test/java/org/springframework/boot/r2dbc/actuate/metrics/ConnectionPoolMetricsTests.java rename to spring-boot-project/spring-boot-r2dbc/src/test/java/org/springframework/boot/r2dbc/metrics/ConnectionPoolMetricsTests.java index 907344eaa7..02acf93f88 100644 --- a/spring-boot-project/spring-boot-r2dbc/src/test/java/org/springframework/boot/r2dbc/actuate/metrics/ConnectionPoolMetricsTests.java +++ b/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; diff --git a/spring-boot-project/spring-boot-r2dbc/src/test/java/org/springframework/boot/r2dbc/actuate/metrics/autoconfigure/ConnectionPoolMetricsAutoConfigurationTests.java b/spring-boot-project/spring-boot-r2dbc/src/test/java/org/springframework/boot/r2dbc/metrics/autoconfigure/ConnectionPoolMetricsAutoConfigurationTests.java similarity index 99% rename from spring-boot-project/spring-boot-r2dbc/src/test/java/org/springframework/boot/r2dbc/actuate/metrics/autoconfigure/ConnectionPoolMetricsAutoConfigurationTests.java rename to spring-boot-project/spring-boot-r2dbc/src/test/java/org/springframework/boot/r2dbc/metrics/autoconfigure/ConnectionPoolMetricsAutoConfigurationTests.java index a1e98cd6e6..6cff045d92 100644 --- a/spring-boot-project/spring-boot-r2dbc/src/test/java/org/springframework/boot/r2dbc/actuate/metrics/autoconfigure/ConnectionPoolMetricsAutoConfigurationTests.java +++ b/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; diff --git a/spring-boot-project/spring-boot-tomcat/src/main/java/org/springframework/boot/tomcat/actuate/metrics/TomcatMetricsBinder.java b/spring-boot-project/spring-boot-tomcat/src/main/java/org/springframework/boot/tomcat/metrics/TomcatMetricsBinder.java similarity index 98% rename from spring-boot-project/spring-boot-tomcat/src/main/java/org/springframework/boot/tomcat/actuate/metrics/TomcatMetricsBinder.java rename to spring-boot-project/spring-boot-tomcat/src/main/java/org/springframework/boot/tomcat/metrics/TomcatMetricsBinder.java index b126796893..945b082adc 100644 --- a/spring-boot-project/spring-boot-tomcat/src/main/java/org/springframework/boot/tomcat/actuate/metrics/TomcatMetricsBinder.java +++ b/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; diff --git a/spring-boot-project/spring-boot-tomcat/src/main/java/org/springframework/boot/tomcat/actuate/metrics/autoconfigure/TomcatMetricsAutoConfiguration.java b/spring-boot-project/spring-boot-tomcat/src/main/java/org/springframework/boot/tomcat/metrics/autoconfigure/TomcatMetricsAutoConfiguration.java similarity index 93% rename from spring-boot-project/spring-boot-tomcat/src/main/java/org/springframework/boot/tomcat/actuate/metrics/autoconfigure/TomcatMetricsAutoConfiguration.java rename to spring-boot-project/spring-boot-tomcat/src/main/java/org/springframework/boot/tomcat/metrics/autoconfigure/TomcatMetricsAutoConfiguration.java index 3f64a0cf1b..65f378094d 100644 --- a/spring-boot-project/spring-boot-tomcat/src/main/java/org/springframework/boot/tomcat/actuate/metrics/autoconfigure/TomcatMetricsAutoConfiguration.java +++ b/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; /** diff --git a/spring-boot-project/spring-boot-tomcat/src/main/java/org/springframework/boot/tomcat/actuate/metrics/autoconfigure/package-info.java b/spring-boot-project/spring-boot-tomcat/src/main/java/org/springframework/boot/tomcat/metrics/autoconfigure/package-info.java similarity index 90% rename from spring-boot-project/spring-boot-tomcat/src/main/java/org/springframework/boot/tomcat/actuate/metrics/autoconfigure/package-info.java rename to spring-boot-project/spring-boot-tomcat/src/main/java/org/springframework/boot/tomcat/metrics/autoconfigure/package-info.java index 4f162ba336..31e60158d3 100644 --- a/spring-boot-project/spring-boot-tomcat/src/main/java/org/springframework/boot/tomcat/actuate/metrics/autoconfigure/package-info.java +++ b/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; diff --git a/spring-boot-project/spring-boot-tomcat/src/main/java/org/springframework/boot/tomcat/actuate/metrics/package-info.java b/spring-boot-project/spring-boot-tomcat/src/main/java/org/springframework/boot/tomcat/metrics/package-info.java similarity index 91% rename from spring-boot-project/spring-boot-tomcat/src/main/java/org/springframework/boot/tomcat/actuate/metrics/package-info.java rename to spring-boot-project/spring-boot-tomcat/src/main/java/org/springframework/boot/tomcat/metrics/package-info.java index 08d77bcbf2..75a6b403aa 100644 --- a/spring-boot-project/spring-boot-tomcat/src/main/java/org/springframework/boot/tomcat/actuate/metrics/package-info.java +++ b/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; diff --git a/spring-boot-project/spring-boot-tomcat/src/main/resources/META-INF/spring/org.springframework.boot.autoconfigure.AutoConfiguration.imports b/spring-boot-project/spring-boot-tomcat/src/main/resources/META-INF/spring/org.springframework.boot.autoconfigure.AutoConfiguration.imports index ed8756e9f1..4bf61ccef4 100644 --- a/spring-boot-project/spring-boot-tomcat/src/main/resources/META-INF/spring/org.springframework.boot.autoconfigure.AutoConfiguration.imports +++ b/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 diff --git a/spring-boot-project/spring-boot-tomcat/src/test/java/org/springframework/boot/tomcat/actuate/metrics/TomcatMetricsBinderTests.java b/spring-boot-project/spring-boot-tomcat/src/test/java/org/springframework/boot/tomcat/metrics/TomcatMetricsBinderTests.java similarity index 94% rename from spring-boot-project/spring-boot-tomcat/src/test/java/org/springframework/boot/tomcat/actuate/metrics/TomcatMetricsBinderTests.java rename to spring-boot-project/spring-boot-tomcat/src/test/java/org/springframework/boot/tomcat/metrics/TomcatMetricsBinderTests.java index 17f1bd8dd4..5679f65560 100644 --- a/spring-boot-project/spring-boot-tomcat/src/test/java/org/springframework/boot/tomcat/actuate/metrics/TomcatMetricsBinderTests.java +++ b/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; diff --git a/spring-boot-project/spring-boot-tomcat/src/test/java/org/springframework/boot/tomcat/actuate/metrics/autoconfigure/TomcatMetricsAutoConfigurationTests.java b/spring-boot-project/spring-boot-tomcat/src/test/java/org/springframework/boot/tomcat/metrics/autoconfigure/TomcatMetricsAutoConfigurationTests.java similarity index 97% rename from spring-boot-project/spring-boot-tomcat/src/test/java/org/springframework/boot/tomcat/actuate/metrics/autoconfigure/TomcatMetricsAutoConfigurationTests.java rename to spring-boot-project/spring-boot-tomcat/src/test/java/org/springframework/boot/tomcat/metrics/autoconfigure/TomcatMetricsAutoConfigurationTests.java index 54ddc60744..2a78f46fe8 100644 --- a/spring-boot-project/spring-boot-tomcat/src/test/java/org/springframework/boot/tomcat/actuate/metrics/autoconfigure/TomcatMetricsAutoConfigurationTests.java +++ b/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;