Browse Source

Remove destroy methods from auto-configured MeterRegistry beans

Closes gh-12121
pull/12124/head
Jon Schneider 8 years ago committed by Andy Wilkinson
parent
commit
9934285bca
  1. 2
      spring-boot-project/spring-boot-actuator-autoconfigure/src/main/java/org/springframework/boot/actuate/autoconfigure/metrics/export/atlas/AtlasMetricsExportAutoConfiguration.java
  2. 2
      spring-boot-project/spring-boot-actuator-autoconfigure/src/main/java/org/springframework/boot/actuate/autoconfigure/metrics/export/datadog/DatadogMetricsExportAutoConfiguration.java
  3. 2
      spring-boot-project/spring-boot-actuator-autoconfigure/src/main/java/org/springframework/boot/actuate/autoconfigure/metrics/export/ganglia/GangliaMetricsExportAutoConfiguration.java
  4. 2
      spring-boot-project/spring-boot-actuator-autoconfigure/src/main/java/org/springframework/boot/actuate/autoconfigure/metrics/export/graphite/GraphiteMetricsExportAutoConfiguration.java
  5. 2
      spring-boot-project/spring-boot-actuator-autoconfigure/src/main/java/org/springframework/boot/actuate/autoconfigure/metrics/export/influx/InfluxMetricsExportAutoConfiguration.java
  6. 2
      spring-boot-project/spring-boot-actuator-autoconfigure/src/main/java/org/springframework/boot/actuate/autoconfigure/metrics/export/jmx/JmxMetricsExportAutoConfiguration.java
  7. 2
      spring-boot-project/spring-boot-actuator-autoconfigure/src/main/java/org/springframework/boot/actuate/autoconfigure/metrics/export/newrelic/NewRelicMetricsExportAutoConfiguration.java
  8. 2
      spring-boot-project/spring-boot-actuator-autoconfigure/src/main/java/org/springframework/boot/actuate/autoconfigure/metrics/export/signalfx/SignalFxMetricsExportAutoConfiguration.java
  9. 2
      spring-boot-project/spring-boot-actuator-autoconfigure/src/main/java/org/springframework/boot/actuate/autoconfigure/metrics/export/statsd/StatsdMetricsExportAutoConfiguration.java
  10. 2
      spring-boot-project/spring-boot-actuator-autoconfigure/src/main/java/org/springframework/boot/actuate/autoconfigure/metrics/export/wavefront/WavefrontMetricsExportAutoConfiguration.java

2
spring-boot-project/spring-boot-actuator-autoconfigure/src/main/java/org/springframework/boot/actuate/autoconfigure/metrics/export/atlas/AtlasMetricsExportAutoConfiguration.java

@ -57,7 +57,7 @@ public class AtlasMetricsExportAutoConfiguration { @@ -57,7 +57,7 @@ public class AtlasMetricsExportAutoConfiguration {
return new AtlasPropertiesConfigAdapter(atlasProperties);
}
@Bean(destroyMethod = "stop")
@Bean
@ConditionalOnMissingBean
public AtlasMeterRegistry atlasMeterRegistry(AtlasConfig atlasConfig, Clock clock) {
return new AtlasMeterRegistry(atlasConfig, clock);

2
spring-boot-project/spring-boot-actuator-autoconfigure/src/main/java/org/springframework/boot/actuate/autoconfigure/metrics/export/datadog/DatadogMetricsExportAutoConfiguration.java

@ -56,7 +56,7 @@ public class DatadogMetricsExportAutoConfiguration { @@ -56,7 +56,7 @@ public class DatadogMetricsExportAutoConfiguration {
return new DatadogPropertiesConfigAdapter(datadogProperties);
}
@Bean(destroyMethod = "stop")
@Bean
@ConditionalOnMissingBean
public DatadogMeterRegistry datadogMeterRegistry(DatadogConfig datadogConfig,
Clock clock) {

2
spring-boot-project/spring-boot-actuator-autoconfigure/src/main/java/org/springframework/boot/actuate/autoconfigure/metrics/export/ganglia/GangliaMetricsExportAutoConfiguration.java

@ -57,7 +57,7 @@ public class GangliaMetricsExportAutoConfiguration { @@ -57,7 +57,7 @@ public class GangliaMetricsExportAutoConfiguration {
return new GangliaPropertiesConfigAdapter(gangliaProperties);
}
@Bean(destroyMethod = "stop")
@Bean
@ConditionalOnMissingBean
public GangliaMeterRegistry gangliaMeterRegistry(GangliaConfig gangliaConfig,
HierarchicalNameMapper nameMapper, Clock clock) {

2
spring-boot-project/spring-boot-actuator-autoconfigure/src/main/java/org/springframework/boot/actuate/autoconfigure/metrics/export/graphite/GraphiteMetricsExportAutoConfiguration.java

@ -57,7 +57,7 @@ public class GraphiteMetricsExportAutoConfiguration { @@ -57,7 +57,7 @@ public class GraphiteMetricsExportAutoConfiguration {
return new GraphitePropertiesConfigAdapter(graphiteProperties);
}
@Bean(destroyMethod = "stop")
@Bean
@ConditionalOnMissingBean
public GraphiteMeterRegistry graphiteMeterRegistry(GraphiteConfig graphiteConfig,
HierarchicalNameMapper nameMapper, Clock clock) {

2
spring-boot-project/spring-boot-actuator-autoconfigure/src/main/java/org/springframework/boot/actuate/autoconfigure/metrics/export/influx/InfluxMetricsExportAutoConfiguration.java

@ -56,7 +56,7 @@ public class InfluxMetricsExportAutoConfiguration { @@ -56,7 +56,7 @@ public class InfluxMetricsExportAutoConfiguration {
return new InfluxPropertiesConfigAdapter(influxProperties);
}
@Bean(destroyMethod = "stop")
@Bean
@ConditionalOnMissingBean
public InfluxMeterRegistry influxMeterRegistry(InfluxConfig influxConfig,
Clock clock) {

2
spring-boot-project/spring-boot-actuator-autoconfigure/src/main/java/org/springframework/boot/actuate/autoconfigure/metrics/export/jmx/JmxMetricsExportAutoConfiguration.java

@ -57,7 +57,7 @@ public class JmxMetricsExportAutoConfiguration { @@ -57,7 +57,7 @@ public class JmxMetricsExportAutoConfiguration {
return new JmxPropertiesConfigAdapter(jmxProperties);
}
@Bean(destroyMethod = "stop")
@Bean
@ConditionalOnMissingBean
public JmxMeterRegistry jmxMeterRegistry(JmxConfig config,
HierarchicalNameMapper nameMapper, Clock clock) {

2
spring-boot-project/spring-boot-actuator-autoconfigure/src/main/java/org/springframework/boot/actuate/autoconfigure/metrics/export/newrelic/NewRelicMetricsExportAutoConfiguration.java

@ -57,7 +57,7 @@ public class NewRelicMetricsExportAutoConfiguration { @@ -57,7 +57,7 @@ public class NewRelicMetricsExportAutoConfiguration {
return new NewRelicPropertiesConfigAdapter(props);
}
@Bean(destroyMethod = "stop")
@Bean
@ConditionalOnMissingBean
public NewRelicMeterRegistry newRelicMeterRegistry(NewRelicConfig config,
Clock clock) {

2
spring-boot-project/spring-boot-actuator-autoconfigure/src/main/java/org/springframework/boot/actuate/autoconfigure/metrics/export/signalfx/SignalFxMetricsExportAutoConfiguration.java

@ -57,7 +57,7 @@ public class SignalFxMetricsExportAutoConfiguration { @@ -57,7 +57,7 @@ public class SignalFxMetricsExportAutoConfiguration {
return new SignalFxPropertiesConfigAdapter(props);
}
@Bean(destroyMethod = "stop")
@Bean
@ConditionalOnMissingBean
public SignalFxMeterRegistry signalFxMeterRegistry(SignalFxConfig config,
Clock clock) {

2
spring-boot-project/spring-boot-actuator-autoconfigure/src/main/java/org/springframework/boot/actuate/autoconfigure/metrics/export/statsd/StatsdMetricsExportAutoConfiguration.java

@ -57,7 +57,7 @@ public class StatsdMetricsExportAutoConfiguration { @@ -57,7 +57,7 @@ public class StatsdMetricsExportAutoConfiguration {
return new StatsdPropertiesConfigAdapter(statsdProperties);
}
@Bean(destroyMethod = "stop")
@Bean
@ConditionalOnMissingBean
public StatsdMeterRegistry statsdMeterRegistry(StatsdConfig statsdConfig,
HierarchicalNameMapper hierarchicalNameMapper, Clock clock) {

2
spring-boot-project/spring-boot-actuator-autoconfigure/src/main/java/org/springframework/boot/actuate/autoconfigure/metrics/export/wavefront/WavefrontMetricsExportAutoConfiguration.java

@ -56,7 +56,7 @@ public class WavefrontMetricsExportAutoConfiguration { @@ -56,7 +56,7 @@ public class WavefrontMetricsExportAutoConfiguration {
return new WavefrontPropertiesConfigAdapter(props);
}
@Bean(destroyMethod = "stop")
@Bean
@ConditionalOnMissingBean
public WavefrontMeterRegistry wavefrontMeterRegistry(WavefrontConfig config,
Clock clock) {

Loading…
Cancel
Save