Spring/spring-boot
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Move task metrics auto-configuration into spring-boot-metrics

Browse Source
This commit is contained in:
Andy Wilkinson
2025-05-30 12:44:54 +01:00
committed by Phillip Webb
parent 443f875a4d
commit 4171b8bf33
5 changed files with 12 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -14,7 +14,6 @@ org.springframework.boot.actuate.autoconfigure.env.EnvironmentEndpointAutoConfig
org.springframework.boot.actuate.autoconfigure.management.HeapDumpWebEndpointAutoConfiguration
org.springframework.boot.actuate.autoconfigure.management.ThreadDumpEndpointAutoConfiguration
org.springframework.boot.actuate.autoconfigure.metrics.data.RepositoryMetricsAutoConfiguration
org.springframework.boot.actuate.autoconfigure.metrics.task.TaskExecutorMetricsAutoConfiguration
org.springframework.boot.actuate.autoconfigure.observability.ObservabilityAutoConfiguration
org.springframework.boot.actuate.autoconfigure.sbom.SbomEndpointAutoConfiguration
org.springframework.boot.actuate.autoconfigure.scheduling.ScheduledTasksEndpointAutoConfiguration

4
spring-boot-project/spring-boot-actuator-autoconfigure-all/src/main/java/org/springframework/boot/actuate/autoconfigure/metrics/task/TaskExecutorMetricsAutoConfiguration.java → spring-boot-project/spring-boot-metrics/src/main/java/org/springframework/boot/metrics/autoconfigure/task/TaskExecutorMetricsAutoConfiguration.java
View File

@@ -14,7 +14,7 @@
* limitations under the License.
*/
package org.springframework.boot.actuate.autoconfigure.metrics.task;
package org.springframework.boot.metrics.autoconfigure.task;
import java.util.Collections;
import java.util.concurrent.Executor;
@@ -47,7 +47,7 @@ import org.springframework.scheduling.concurrent.ThreadPoolTaskScheduler;
*
* @author Stephane Nicoll
* @author Scott Frederick
* @since 2.6.0
* @since 4.0.0
*/
@AutoConfiguration(after = { MetricsAutoConfiguration.class, SimpleMetricsExportAutoConfiguration.class,
TaskExecutionAutoConfiguration.class, TaskSchedulingAutoConfiguration.class })

2
spring-boot-project/spring-boot-actuator-autoconfigure-all/src/main/java/org/springframework/boot/actuate/autoconfigure/metrics/task/package-info.java → spring-boot-project/spring-boot-metrics/src/main/java/org/springframework/boot/metrics/autoconfigure/task/package-info.java
View File

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

1
spring-boot-project/spring-boot-metrics/src/main/resources/META-INF/spring/org.springframework.boot.autoconfigure.AutoConfiguration.imports
View File

@@ -24,3 +24,4 @@ org.springframework.boot.metrics.autoconfigure.logging.log4j2.Log4J2MetricsAutoC
org.springframework.boot.metrics.autoconfigure.logging.logback.LogbackMetricsAutoConfiguration
org.springframework.boot.metrics.autoconfigure.startup.StartupTimeMetricsListenerAutoConfiguration
org.springframework.boot.metrics.autoconfigure.system.SystemMetricsAutoConfiguration
org.springframework.boot.metrics.autoconfigure.task.TaskExecutorMetricsAutoConfiguration

11
spring-boot-project/spring-boot-actuator-autoconfigure-all/src/test/java/org/springframework/boot/actuate/autoconfigure/metrics/task/TaskExecutorMetricsAutoConfigurationTests.java → spring-boot-project/spring-boot-metrics/src/test/java/org/springframework/boot/actuate/autoconfigure/metrics/task/TaskExecutorMetricsAutoConfigurationTests.java
View File

@@ -21,13 +21,15 @@ import java.util.Collection;
import io.micrometer.core.instrument.FunctionCounter;
import io.micrometer.core.instrument.MeterRegistry;
import io.micrometer.core.instrument.search.MeterNotFoundException;
import io.micrometer.core.instrument.simple.SimpleMeterRegistry;
import org.junit.jupiter.api.Test;
import org.springframework.boot.LazyInitializationBeanFactoryPostProcessor;
import org.springframework.boot.actuate.autoconfigure.metrics.test.MetricsRun;
import org.springframework.boot.autoconfigure.AutoConfigurations;
import org.springframework.boot.autoconfigure.task.TaskExecutionAutoConfiguration;
import org.springframework.boot.autoconfigure.task.TaskSchedulingAutoConfiguration;
import org.springframework.boot.metrics.autoconfigure.MetricsAutoConfiguration;
import org.springframework.boot.metrics.autoconfigure.task.TaskExecutorMetricsAutoConfiguration;
import org.springframework.boot.test.context.runner.ApplicationContextRunner;
import org.springframework.context.annotation.Bean;
import org.springframework.context.annotation.Configuration;
@@ -48,8 +50,11 @@ import static org.mockito.Mockito.mock;
*/
class TaskExecutorMetricsAutoConfigurationTests {
private final ApplicationContextRunner contextRunner = new ApplicationContextRunner().with(MetricsRun.simple())
.withConfiguration(AutoConfigurations.of(TaskExecutorMetricsAutoConfiguration.class));
private final ApplicationContextRunner contextRunner = new ApplicationContextRunner()
.withBean(SimpleMeterRegistry.class)
.withConfiguration(
AutoConfigurations.of(TaskExecutorMetricsAutoConfiguration.class, MetricsAutoConfiguration.class))
.withPropertyValues("management.metrics.use-global-registry=false");
@Test
void taskExecutorUsingAutoConfigurationIsInstrumented() {