Skip to content

Commit

Permalink
Remove metrics auto-config exclusions (#5902)
Browse files Browse the repository at this point in the history
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.
  • Loading branch information
onobc authored Aug 22, 2024
1 parent 2a08167 commit b515672
Showing 1 changed file with 0 additions and 15 deletions.
Original file line number Diff line number Diff line change
Expand Up @@ -17,11 +17,7 @@
package org.springframework.cloud.dataflow.server.single;

import org.springframework.boot.SpringApplication;
import org.springframework.boot.actuate.autoconfigure.metrics.export.influx.InfluxMetricsExportAutoConfiguration;
import org.springframework.boot.actuate.autoconfigure.metrics.export.wavefront.WavefrontMetricsExportAutoConfiguration;
import org.springframework.boot.actuate.autoconfigure.observation.ObservationAutoConfiguration;
import org.springframework.boot.actuate.autoconfigure.security.servlet.ManagementWebSecurityAutoConfiguration;
import org.springframework.boot.actuate.autoconfigure.wavefront.WavefrontAutoConfiguration;
import org.springframework.boot.autoconfigure.SpringBootApplication;
import org.springframework.boot.autoconfigure.security.servlet.SecurityAutoConfiguration;
import org.springframework.boot.autoconfigure.security.servlet.UserDetailsServiceAutoConfiguration;
Expand All @@ -30,7 +26,6 @@
import org.springframework.cloud.deployer.spi.cloudfoundry.CloudFoundryDeployerAutoConfiguration;
import org.springframework.cloud.deployer.spi.kubernetes.KubernetesAutoConfiguration;
import org.springframework.cloud.deployer.spi.local.LocalDeployerAutoConfiguration;
import org.springframework.cloud.task.configuration.observation.ObservationTaskAutoConfiguration;
import org.springframework.cloud.task.configuration.SimpleTaskAutoConfiguration;

/**
Expand All @@ -40,17 +35,7 @@
* @author Ilayaperumal Gopinathan
* @author Janne Valkealahti
*/
//TODO: Boot3x followup - remove the following exclusions once we have identified the proper way to handle metrics:
// WavefrontMetricsExportAutoConfiguration.class,
// WavefrontAutoConfiguration.class,
// ObservationAutoConfiguration.class,
// InfluxMetricsExportAutoConfiguration.class,
@SpringBootApplication(exclude = {
WavefrontMetricsExportAutoConfiguration.class,
WavefrontAutoConfiguration.class,
ObservationAutoConfiguration.class,
InfluxMetricsExportAutoConfiguration.class,
ObservationTaskAutoConfiguration.class,
SessionAutoConfiguration.class,
SimpleTaskAutoConfiguration.class,
ManagementWebSecurityAutoConfiguration.class,
Expand Down

0 comments on commit b515672

Please sign in to comment.