Skip to content

Commit caa1396

Browse files
wilkinsonaphilwebb
authored andcommitted
Move scheduled task observation to spring-boot-observation
Issue: 46150
1 parent d7018f8 commit caa1396

File tree

6 files changed

+25
-16
lines changed

6 files changed

+25
-16
lines changed

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

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -56,7 +56,6 @@ dependencies {
5656
optional(project(":spring-boot-project:spring-boot-jsonb"))
5757
optional(project(":spring-boot-project:spring-boot-kafka"))
5858
optional(project(":spring-boot-project:spring-boot-metrics"))
59-
optional(project(":spring-boot-project:spring-boot-observation"))
6059
optional(project(":spring-boot-project:spring-boot-opentelemetry"))
6160
optional(project(":spring-boot-project:spring-boot-restclient"))
6261
optional(project(":spring-boot-project:spring-boot-security-oauth2-client"))

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

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,6 @@ org.springframework.boot.actuate.autoconfigure.metrics.task.TaskExecutorMetricsA
1818
org.springframework.boot.actuate.autoconfigure.observability.ObservabilityAutoConfiguration
1919
org.springframework.boot.actuate.autoconfigure.sbom.SbomEndpointAutoConfiguration
2020
org.springframework.boot.actuate.autoconfigure.scheduling.ScheduledTasksEndpointAutoConfiguration
21-
org.springframework.boot.actuate.autoconfigure.scheduling.ScheduledTasksObservabilityAutoConfiguration
2221
org.springframework.boot.actuate.autoconfigure.security.reactive.ReactiveManagementWebSecurityAutoConfiguration
2322
org.springframework.boot.actuate.autoconfigure.security.servlet.ManagementWebSecurityAutoConfiguration
2423
org.springframework.boot.actuate.autoconfigure.ssl.SslHealthContributorAutoConfiguration
Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@
1414
* limitations under the License.
1515
*/
1616

17-
package org.springframework.boot.actuate.autoconfigure.scheduling;
17+
package org.springframework.boot.observation.scheduling.autoconfigure;
1818

1919
import io.micrometer.observation.ObservationRegistry;
2020

@@ -33,7 +33,7 @@
3333
* scheduled tasks.
3434
*
3535
* @author Moritz Halbritter
36-
* @since 3.2.0
36+
* @since 4.0.0
3737
*/
3838
@AutoConfiguration(after = ObservationAutoConfiguration.class)
3939
@ConditionalOnBean(ObservationRegistry.class)
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,20 @@
1+
/*
2+
* Copyright 2012-present the original author or authors.
3+
*
4+
* Licensed under the Apache License, Version 2.0 (the "License");
5+
* you may not use this file except in compliance with the License.
6+
* You may obtain a copy of the License at
7+
*
8+
* https://www.apache.org/licenses/LICENSE-2.0
9+
*
10+
* Unless required by applicable law or agreed to in writing, software
11+
* distributed under the License is distributed on an "AS IS" BASIS,
12+
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
13+
* See the License for the specific language governing permissions and
14+
* limitations under the License.
15+
*/
16+
17+
/**
18+
* Auto-configuration for observation of scheduled tasks.
19+
*/
20+
package org.springframework.boot.observation.scheduling.autoconfigure;
Original file line numberDiff line numberDiff line change
@@ -1 +1,2 @@
11
org.springframework.boot.observation.autoconfigure.ObservationAutoConfiguration
2+
org.springframework.boot.observation.scheduling.autoconfigure.ScheduledTasksObservabilityAutoConfiguration
Lines changed: 2 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -14,18 +14,14 @@
1414
* limitations under the License.
1515
*/
1616

17-
package org.springframework.boot.actuate.autoconfigure.scheduling;
18-
19-
import java.util.List;
17+
package org.springframework.boot.observation.scheduling.autoconfigure;
2018

2119
import io.micrometer.observation.ObservationRegistry;
2220
import org.junit.jupiter.api.Test;
2321

24-
import org.springframework.boot.actuate.autoconfigure.scheduling.ScheduledTasksObservabilityAutoConfiguration.ObservabilitySchedulingConfigurer;
25-
import org.springframework.boot.autoconfigure.AutoConfiguration;
2622
import org.springframework.boot.autoconfigure.AutoConfigurations;
27-
import org.springframework.boot.context.annotation.ImportCandidates;
2823
import org.springframework.boot.observation.autoconfigure.ObservationAutoConfiguration;
24+
import org.springframework.boot.observation.scheduling.autoconfigure.ScheduledTasksObservabilityAutoConfiguration.ObservabilitySchedulingConfigurer;
2925
import org.springframework.boot.test.context.runner.ApplicationContextRunner;
3026
import org.springframework.scheduling.config.ScheduledTaskRegistrar;
3127

@@ -55,10 +51,4 @@ void observabilitySchedulingConfigurerShouldConfigureObservationRegistry() {
5551
assertThat(registrar.getObservationRegistry()).isEqualTo(observationRegistry);
5652
}
5753

58-
@Test
59-
void isRegisteredInAutoConfigurationsFile() {
60-
List<String> configurations = ImportCandidates.load(AutoConfiguration.class, null).getCandidates();
61-
assertThat(configurations).contains(ScheduledTasksObservabilityAutoConfiguration.class.getName());
62-
}
63-
6454
}

0 commit comments

Comments
 (0)