Skip to content

Commit b515672

Browse files
authored
Remove metrics auto-config exclusions (spring-attic#5902)
This commit removes temporary auto-config exclusions that were in place to allow compiling against Boot 3.x prior to migrating to the newer Observation API.
1 parent 2a08167 commit b515672

File tree

1 file changed

+0
-15
lines changed

1 file changed

+0
-15
lines changed

spring-cloud-dataflow-server/src/main/java/org/springframework/cloud/dataflow/server/single/DataFlowServerApplication.java

Lines changed: 0 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -17,11 +17,7 @@
1717
package org.springframework.cloud.dataflow.server.single;
1818

1919
import org.springframework.boot.SpringApplication;
20-
import org.springframework.boot.actuate.autoconfigure.metrics.export.influx.InfluxMetricsExportAutoConfiguration;
21-
import org.springframework.boot.actuate.autoconfigure.metrics.export.wavefront.WavefrontMetricsExportAutoConfiguration;
22-
import org.springframework.boot.actuate.autoconfigure.observation.ObservationAutoConfiguration;
2320
import org.springframework.boot.actuate.autoconfigure.security.servlet.ManagementWebSecurityAutoConfiguration;
24-
import org.springframework.boot.actuate.autoconfigure.wavefront.WavefrontAutoConfiguration;
2521
import org.springframework.boot.autoconfigure.SpringBootApplication;
2622
import org.springframework.boot.autoconfigure.security.servlet.SecurityAutoConfiguration;
2723
import org.springframework.boot.autoconfigure.security.servlet.UserDetailsServiceAutoConfiguration;
@@ -30,7 +26,6 @@
3026
import org.springframework.cloud.deployer.spi.cloudfoundry.CloudFoundryDeployerAutoConfiguration;
3127
import org.springframework.cloud.deployer.spi.kubernetes.KubernetesAutoConfiguration;
3228
import org.springframework.cloud.deployer.spi.local.LocalDeployerAutoConfiguration;
33-
import org.springframework.cloud.task.configuration.observation.ObservationTaskAutoConfiguration;
3429
import org.springframework.cloud.task.configuration.SimpleTaskAutoConfiguration;
3530

3631
/**
@@ -40,17 +35,7 @@
4035
* @author Ilayaperumal Gopinathan
4136
* @author Janne Valkealahti
4237
*/
43-
//TODO: Boot3x followup - remove the following exclusions once we have identified the proper way to handle metrics:
44-
// WavefrontMetricsExportAutoConfiguration.class,
45-
// WavefrontAutoConfiguration.class,
46-
// ObservationAutoConfiguration.class,
47-
// InfluxMetricsExportAutoConfiguration.class,
4838
@SpringBootApplication(exclude = {
49-
WavefrontMetricsExportAutoConfiguration.class,
50-
WavefrontAutoConfiguration.class,
51-
ObservationAutoConfiguration.class,
52-
InfluxMetricsExportAutoConfiguration.class,
53-
ObservationTaskAutoConfiguration.class,
5439
SessionAutoConfiguration.class,
5540
SimpleTaskAutoConfiguration.class,
5641
ManagementWebSecurityAutoConfiguration.class,

0 commit comments

Comments
 (0)