diff --git a/spring-boot-project/spring-boot-actuator-autoconfigure-all/build.gradle b/spring-boot-project/spring-boot-actuator-autoconfigure-all/build.gradle index ef32c7a4d5..f76572a8b3 100644 --- a/spring-boot-project/spring-boot-actuator-autoconfigure-all/build.gradle +++ b/spring-boot-project/spring-boot-actuator-autoconfigure-all/build.gradle @@ -39,7 +39,6 @@ dependencies { optional(project(":spring-boot-project:spring-boot-jsonb")) optional(project(":spring-boot-project:spring-boot-kafka")) optional(project(":spring-boot-project:spring-boot-metrics")) - optional(project(":spring-boot-project:spring-boot-observation")) optional(project(":spring-boot-project:spring-boot-opentelemetry")) optional(project(":spring-boot-project:spring-boot-restclient")) optional(project(":spring-boot-project:spring-boot-security-oauth2-client")) diff --git a/spring-boot-project/spring-boot-actuator-autoconfigure-all/src/main/resources/META-INF/spring/org.springframework.boot.autoconfigure.AutoConfiguration.imports b/spring-boot-project/spring-boot-actuator-autoconfigure-all/src/main/resources/META-INF/spring/org.springframework.boot.autoconfigure.AutoConfiguration.imports index 2f4e7ddeed..13aff11c1a 100644 --- a/spring-boot-project/spring-boot-actuator-autoconfigure-all/src/main/resources/META-INF/spring/org.springframework.boot.autoconfigure.AutoConfiguration.imports +++ b/spring-boot-project/spring-boot-actuator-autoconfigure-all/src/main/resources/META-INF/spring/org.springframework.boot.autoconfigure.AutoConfiguration.imports @@ -18,7 +18,6 @@ org.springframework.boot.actuate.autoconfigure.metrics.task.TaskExecutorMetricsA org.springframework.boot.actuate.autoconfigure.observability.ObservabilityAutoConfiguration org.springframework.boot.actuate.autoconfigure.sbom.SbomEndpointAutoConfiguration org.springframework.boot.actuate.autoconfigure.scheduling.ScheduledTasksEndpointAutoConfiguration -org.springframework.boot.actuate.autoconfigure.scheduling.ScheduledTasksObservabilityAutoConfiguration org.springframework.boot.actuate.autoconfigure.security.reactive.ReactiveManagementWebSecurityAutoConfiguration org.springframework.boot.actuate.autoconfigure.security.servlet.ManagementWebSecurityAutoConfiguration org.springframework.boot.actuate.autoconfigure.ssl.SslHealthContributorAutoConfiguration diff --git a/spring-boot-project/spring-boot-actuator-autoconfigure-all/src/main/java/org/springframework/boot/actuate/autoconfigure/scheduling/ScheduledTasksObservabilityAutoConfiguration.java b/spring-boot-project/spring-boot-observation/src/main/java/org/springframework/boot/observation/scheduling/autoconfigure/ScheduledTasksObservabilityAutoConfiguration.java similarity index 96% rename from spring-boot-project/spring-boot-actuator-autoconfigure-all/src/main/java/org/springframework/boot/actuate/autoconfigure/scheduling/ScheduledTasksObservabilityAutoConfiguration.java rename to spring-boot-project/spring-boot-observation/src/main/java/org/springframework/boot/observation/scheduling/autoconfigure/ScheduledTasksObservabilityAutoConfiguration.java index 7dea96c051..46ca0982ac 100644 --- a/spring-boot-project/spring-boot-actuator-autoconfigure-all/src/main/java/org/springframework/boot/actuate/autoconfigure/scheduling/ScheduledTasksObservabilityAutoConfiguration.java +++ b/spring-boot-project/spring-boot-observation/src/main/java/org/springframework/boot/observation/scheduling/autoconfigure/ScheduledTasksObservabilityAutoConfiguration.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package org.springframework.boot.actuate.autoconfigure.scheduling; +package org.springframework.boot.observation.scheduling.autoconfigure; import io.micrometer.observation.ObservationRegistry; @@ -33,7 +33,7 @@ import org.springframework.scheduling.config.ScheduledTaskRegistrar; * scheduled tasks. * * @author Moritz Halbritter - * @since 3.2.0 + * @since 4.0.0 */ @AutoConfiguration(after = ObservationAutoConfiguration.class) @ConditionalOnBean(ObservationRegistry.class) diff --git a/spring-boot-project/spring-boot-observation/src/main/java/org/springframework/boot/observation/scheduling/autoconfigure/package-info.java b/spring-boot-project/spring-boot-observation/src/main/java/org/springframework/boot/observation/scheduling/autoconfigure/package-info.java new file mode 100644 index 0000000000..196cccb30c --- /dev/null +++ b/spring-boot-project/spring-boot-observation/src/main/java/org/springframework/boot/observation/scheduling/autoconfigure/package-info.java @@ -0,0 +1,20 @@ +/* + * Copyright 2012-2025 the original author or authors. + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * https://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ + +/** + * Auto-configuration for observation of scheduled tasks. + */ +package org.springframework.boot.observation.scheduling.autoconfigure; 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 index 2442037d53..d80e0e6fc6 100644 --- 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 @@ -1 +1,2 @@ org.springframework.boot.observation.autoconfigure.ObservationAutoConfiguration +org.springframework.boot.observation.scheduling.autoconfigure.ScheduledTasksObservabilityAutoConfiguration diff --git a/spring-boot-project/spring-boot-actuator-autoconfigure-all/src/test/java/org/springframework/boot/actuate/autoconfigure/scheduling/ScheduledTasksObservabilityAutoConfigurationTests.java b/spring-boot-project/spring-boot-observation/src/test/java/org/springframework/boot/observation/scheduling/autoconfigure/ScheduledTasksObservabilityAutoConfigurationTests.java similarity index 76% rename from spring-boot-project/spring-boot-actuator-autoconfigure-all/src/test/java/org/springframework/boot/actuate/autoconfigure/scheduling/ScheduledTasksObservabilityAutoConfigurationTests.java rename to spring-boot-project/spring-boot-observation/src/test/java/org/springframework/boot/observation/scheduling/autoconfigure/ScheduledTasksObservabilityAutoConfigurationTests.java index 3366be7d92..8c439f4891 100644 --- a/spring-boot-project/spring-boot-actuator-autoconfigure-all/src/test/java/org/springframework/boot/actuate/autoconfigure/scheduling/ScheduledTasksObservabilityAutoConfigurationTests.java +++ b/spring-boot-project/spring-boot-observation/src/test/java/org/springframework/boot/observation/scheduling/autoconfigure/ScheduledTasksObservabilityAutoConfigurationTests.java @@ -14,18 +14,14 @@ * limitations under the License. */ -package org.springframework.boot.actuate.autoconfigure.scheduling; - -import java.util.List; +package org.springframework.boot.observation.scheduling.autoconfigure; import io.micrometer.observation.ObservationRegistry; import org.junit.jupiter.api.Test; -import org.springframework.boot.actuate.autoconfigure.scheduling.ScheduledTasksObservabilityAutoConfiguration.ObservabilitySchedulingConfigurer; -import org.springframework.boot.autoconfigure.AutoConfiguration; import org.springframework.boot.autoconfigure.AutoConfigurations; -import org.springframework.boot.context.annotation.ImportCandidates; import org.springframework.boot.observation.autoconfigure.ObservationAutoConfiguration; +import org.springframework.boot.observation.scheduling.autoconfigure.ScheduledTasksObservabilityAutoConfiguration.ObservabilitySchedulingConfigurer; import org.springframework.boot.test.context.runner.ApplicationContextRunner; import org.springframework.scheduling.config.ScheduledTaskRegistrar; @@ -55,10 +51,4 @@ class ScheduledTasksObservabilityAutoConfigurationTests { assertThat(registrar.getObservationRegistry()).isEqualTo(observationRegistry); } - @Test - void isRegisteredInAutoConfigurationsFile() { - List configurations = ImportCandidates.load(AutoConfiguration.class, null).getCandidates(); - assertThat(configurations).contains(ScheduledTasksObservabilityAutoConfiguration.class.getName()); - } - }