Commit 4ab43985 authored by Johnny Lim's avatar Johnny Lim Committed by Stephane Nicoll

Remove destroyMethod attribute in @Bean for MeterRegistry

Closes gh-12725
parent 35680191
...@@ -142,7 +142,7 @@ public class AtlasMetricsExportAutoConfigurationTests { ...@@ -142,7 +142,7 @@ public class AtlasMetricsExportAutoConfigurationTests {
@Import(BaseConfiguration.class) @Import(BaseConfiguration.class)
static class CustomRegistryConfiguration { static class CustomRegistryConfiguration {
@Bean(destroyMethod = "stop") @Bean
public AtlasMeterRegistry customRegistry(AtlasConfig config, Clock clock) { public AtlasMeterRegistry customRegistry(AtlasConfig config, Clock clock) {
return new AtlasMeterRegistry(config, clock); return new AtlasMeterRegistry(config, clock);
} }
......
...@@ -154,7 +154,7 @@ public class DatadogMetricsExportAutoConfigurationTests { ...@@ -154,7 +154,7 @@ public class DatadogMetricsExportAutoConfigurationTests {
@Import(BaseConfiguration.class) @Import(BaseConfiguration.class)
static class CustomRegistryConfiguration { static class CustomRegistryConfiguration {
@Bean(destroyMethod = "stop") @Bean
public DatadogMeterRegistry customRegistry(DatadogConfig config, Clock clock) { public DatadogMeterRegistry customRegistry(DatadogConfig config, Clock clock) {
return new DatadogMeterRegistry(config, clock); return new DatadogMeterRegistry(config, clock);
} }
......
...@@ -142,7 +142,7 @@ public class GangliaMetricsExportAutoConfigurationTests { ...@@ -142,7 +142,7 @@ public class GangliaMetricsExportAutoConfigurationTests {
@Import(BaseConfiguration.class) @Import(BaseConfiguration.class)
static class CustomRegistryConfiguration { static class CustomRegistryConfiguration {
@Bean(destroyMethod = "stop") @Bean
public GangliaMeterRegistry customRegistry(GangliaConfig config, Clock clock) { public GangliaMeterRegistry customRegistry(GangliaConfig config, Clock clock) {
return new GangliaMeterRegistry(config, clock); return new GangliaMeterRegistry(config, clock);
} }
......
...@@ -145,7 +145,7 @@ public class GraphiteMetricsExportAutoConfigurationTests { ...@@ -145,7 +145,7 @@ public class GraphiteMetricsExportAutoConfigurationTests {
@Import(BaseConfiguration.class) @Import(BaseConfiguration.class)
static class CustomRegistryConfiguration { static class CustomRegistryConfiguration {
@Bean(destroyMethod = "stop") @Bean
public GraphiteMeterRegistry customRegistry(GraphiteConfig config, Clock clock) { public GraphiteMeterRegistry customRegistry(GraphiteConfig config, Clock clock) {
return new GraphiteMeterRegistry(config, clock); return new GraphiteMeterRegistry(config, clock);
} }
......
...@@ -142,7 +142,7 @@ public class InfluxMetricsExportAutoConfigurationTests { ...@@ -142,7 +142,7 @@ public class InfluxMetricsExportAutoConfigurationTests {
@Import(BaseConfiguration.class) @Import(BaseConfiguration.class)
static class CustomRegistryConfiguration { static class CustomRegistryConfiguration {
@Bean(destroyMethod = "stop") @Bean
public InfluxMeterRegistry customRegistry(InfluxConfig config, Clock clock) { public InfluxMeterRegistry customRegistry(InfluxConfig config, Clock clock) {
return new InfluxMeterRegistry(config, clock); return new InfluxMeterRegistry(config, clock);
} }
......
...@@ -158,7 +158,7 @@ public class JmxMetricsExportAutoConfigurationTests { ...@@ -158,7 +158,7 @@ public class JmxMetricsExportAutoConfigurationTests {
@Import(BaseConfiguration.class) @Import(BaseConfiguration.class)
static class CustomRegistryConfiguration { static class CustomRegistryConfiguration {
@Bean(destroyMethod = "stop") @Bean
public JmxMeterRegistry customRegistry(JmxConfig config, Clock clock) { public JmxMeterRegistry customRegistry(JmxConfig config, Clock clock) {
return new JmxMeterRegistry(config, clock); return new JmxMeterRegistry(config, clock);
} }
......
...@@ -172,7 +172,7 @@ public class NewRelicMetricsExportAutoConfigurationTests { ...@@ -172,7 +172,7 @@ public class NewRelicMetricsExportAutoConfigurationTests {
@Import(BaseConfiguration.class) @Import(BaseConfiguration.class)
static class CustomRegistryConfiguration { static class CustomRegistryConfiguration {
@Bean(destroyMethod = "stop") @Bean
public NewRelicMeterRegistry customRegistry(NewRelicConfig config, Clock clock) { public NewRelicMeterRegistry customRegistry(NewRelicConfig config, Clock clock) {
return new NewRelicMeterRegistry(config, clock); return new NewRelicMeterRegistry(config, clock);
} }
......
...@@ -164,7 +164,7 @@ public class SignalFxMetricsExportAutoConfigurationTests { ...@@ -164,7 +164,7 @@ public class SignalFxMetricsExportAutoConfigurationTests {
@Import(BaseConfiguration.class) @Import(BaseConfiguration.class)
static class CustomRegistryConfiguration { static class CustomRegistryConfiguration {
@Bean(destroyMethod = "stop") @Bean
public SignalFxMeterRegistry customRegistry(SignalFxConfig config, Clock clock) { public SignalFxMeterRegistry customRegistry(SignalFxConfig config, Clock clock) {
return new SignalFxMeterRegistry(config, clock); return new SignalFxMeterRegistry(config, clock);
} }
......
...@@ -160,7 +160,7 @@ public class StatsdMetricsExportAutoConfigurationTests { ...@@ -160,7 +160,7 @@ public class StatsdMetricsExportAutoConfigurationTests {
@Import(BaseConfiguration.class) @Import(BaseConfiguration.class)
static class CustomRegistryConfiguration { static class CustomRegistryConfiguration {
@Bean(destroyMethod = "stop") @Bean
public StatsdMeterRegistry customRegistry(StatsdConfig config, Clock clock) { public StatsdMeterRegistry customRegistry(StatsdConfig config, Clock clock) {
return new StatsdMeterRegistry(config, clock); return new StatsdMeterRegistry(config, clock);
} }
......
...@@ -146,7 +146,7 @@ public class WavefrontMetricsExportAutoConfigurationTests { ...@@ -146,7 +146,7 @@ public class WavefrontMetricsExportAutoConfigurationTests {
@Import(BaseConfiguration.class) @Import(BaseConfiguration.class)
static class CustomRegistryConfiguration { static class CustomRegistryConfiguration {
@Bean(destroyMethod = "stop") @Bean
public WavefrontMeterRegistry customRegistry(WavefrontConfig config, public WavefrontMeterRegistry customRegistry(WavefrontConfig config,
Clock clock) { Clock clock) {
return new WavefrontMeterRegistry(config, clock); return new WavefrontMeterRegistry(config, clock);
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment