diff --git a/spring-boot-project/spring-boot-actuator-autoconfigure/src/main/java/org/springframework/boot/actuate/autoconfigure/metrics/export/appoptics/AppOpticsMetricsExportAutoConfiguration.java b/spring-boot-project/spring-boot-actuator-autoconfigure/src/main/java/org/springframework/boot/actuate/autoconfigure/metrics/export/appoptics/AppOpticsMetricsExportAutoConfiguration.java index 1aa3f587326..b2e73f40c91 100644 --- a/spring-boot-project/spring-boot-actuator-autoconfigure/src/main/java/org/springframework/boot/actuate/autoconfigure/metrics/export/appoptics/AppOpticsMetricsExportAutoConfiguration.java +++ b/spring-boot-project/spring-boot-actuator-autoconfigure/src/main/java/org/springframework/boot/actuate/autoconfigure/metrics/export/appoptics/AppOpticsMetricsExportAutoConfiguration.java @@ -52,20 +52,26 @@ import org.springframework.context.annotation.Configuration; @EnableConfigurationProperties(AppOpticsProperties.class) public class AppOpticsMetricsExportAutoConfiguration { + private final AppOpticsProperties properties; + + public AppOpticsMetricsExportAutoConfiguration(AppOpticsProperties properties) { + this.properties = properties; + } + @Bean @ConditionalOnMissingBean - public AppOpticsConfig appOpticsConfig(AppOpticsProperties appOpticsProperties) { - return new AppOpticsPropertiesConfigAdapter(appOpticsProperties); + public AppOpticsConfig appOpticsConfig() { + return new AppOpticsPropertiesConfigAdapter(this.properties); } @Bean @ConditionalOnMissingBean public AppOpticsMeterRegistry appOpticsMeterRegistry(AppOpticsConfig config, - Clock clock, AppOpticsProperties appOpticsProperties) { + Clock clock) { return AppOpticsMeterRegistry.builder(config).clock(clock) - .httpClient(new HttpUrlConnectionSender( - appOpticsProperties.getConnectTimeout(), - appOpticsProperties.getReadTimeout())) + .httpClient( + new HttpUrlConnectionSender(this.properties.getConnectTimeout(), + this.properties.getReadTimeout())) .build(); } diff --git a/spring-boot-project/spring-boot-actuator-autoconfigure/src/main/java/org/springframework/boot/actuate/autoconfigure/metrics/export/datadog/DatadogMetricsExportAutoConfiguration.java b/spring-boot-project/spring-boot-actuator-autoconfigure/src/main/java/org/springframework/boot/actuate/autoconfigure/metrics/export/datadog/DatadogMetricsExportAutoConfiguration.java index 7cb91d95826..54e4813f354 100644 --- a/spring-boot-project/spring-boot-actuator-autoconfigure/src/main/java/org/springframework/boot/actuate/autoconfigure/metrics/export/datadog/DatadogMetricsExportAutoConfiguration.java +++ b/spring-boot-project/spring-boot-actuator-autoconfigure/src/main/java/org/springframework/boot/actuate/autoconfigure/metrics/export/datadog/DatadogMetricsExportAutoConfiguration.java @@ -52,20 +52,26 @@ import org.springframework.context.annotation.Configuration; @EnableConfigurationProperties(DatadogProperties.class) public class DatadogMetricsExportAutoConfiguration { + private final DatadogProperties properties; + + public DatadogMetricsExportAutoConfiguration(DatadogProperties properties) { + this.properties = properties; + } + @Bean @ConditionalOnMissingBean - public DatadogConfig datadogConfig(DatadogProperties datadogProperties) { - return new DatadogPropertiesConfigAdapter(datadogProperties); + public DatadogConfig datadogConfig() { + return new DatadogPropertiesConfigAdapter(this.properties); } @Bean @ConditionalOnMissingBean public DatadogMeterRegistry datadogMeterRegistry(DatadogConfig datadogConfig, - Clock clock, DatadogProperties datadogProperties) { + Clock clock) { return DatadogMeterRegistry.builder(datadogConfig).clock(clock) .httpClient( - new HttpUrlConnectionSender(datadogProperties.getConnectTimeout(), - datadogProperties.getReadTimeout())) + new HttpUrlConnectionSender(this.properties.getConnectTimeout(), + this.properties.getReadTimeout())) .build(); } diff --git a/spring-boot-project/spring-boot-actuator-autoconfigure/src/main/java/org/springframework/boot/actuate/autoconfigure/metrics/export/dynatrace/DynatraceMetricsExportAutoConfiguration.java b/spring-boot-project/spring-boot-actuator-autoconfigure/src/main/java/org/springframework/boot/actuate/autoconfigure/metrics/export/dynatrace/DynatraceMetricsExportAutoConfiguration.java index 394d42b266b..79d84511abb 100644 --- a/spring-boot-project/spring-boot-actuator-autoconfigure/src/main/java/org/springframework/boot/actuate/autoconfigure/metrics/export/dynatrace/DynatraceMetricsExportAutoConfiguration.java +++ b/spring-boot-project/spring-boot-actuator-autoconfigure/src/main/java/org/springframework/boot/actuate/autoconfigure/metrics/export/dynatrace/DynatraceMetricsExportAutoConfiguration.java @@ -52,20 +52,26 @@ import org.springframework.context.annotation.Configuration; @EnableConfigurationProperties(DynatraceProperties.class) public class DynatraceMetricsExportAutoConfiguration { + private final DynatraceProperties properties; + + public DynatraceMetricsExportAutoConfiguration(DynatraceProperties properties) { + this.properties = properties; + } + @Bean @ConditionalOnMissingBean - public DynatraceConfig dynatraceConfig(DynatraceProperties dynatraceProperties) { - return new DynatracePropertiesConfigAdapter(dynatraceProperties); + public DynatraceConfig dynatraceConfig() { + return new DynatracePropertiesConfigAdapter(this.properties); } @Bean @ConditionalOnMissingBean public DynatraceMeterRegistry dynatraceMeterRegistry(DynatraceConfig dynatraceConfig, - Clock clock, DynatraceProperties dynatraceProperties) { + Clock clock) { return DynatraceMeterRegistry.builder(dynatraceConfig).clock(clock) - .httpClient(new HttpUrlConnectionSender( - dynatraceProperties.getConnectTimeout(), - dynatraceProperties.getReadTimeout())) + .httpClient( + new HttpUrlConnectionSender(this.properties.getConnectTimeout(), + this.properties.getReadTimeout())) .build(); } diff --git a/spring-boot-project/spring-boot-actuator-autoconfigure/src/main/java/org/springframework/boot/actuate/autoconfigure/metrics/export/elastic/ElasticMetricsExportAutoConfiguration.java b/spring-boot-project/spring-boot-actuator-autoconfigure/src/main/java/org/springframework/boot/actuate/autoconfigure/metrics/export/elastic/ElasticMetricsExportAutoConfiguration.java index 2478e3e370f..7d45e0a9cf4 100644 --- a/spring-boot-project/spring-boot-actuator-autoconfigure/src/main/java/org/springframework/boot/actuate/autoconfigure/metrics/export/elastic/ElasticMetricsExportAutoConfiguration.java +++ b/spring-boot-project/spring-boot-actuator-autoconfigure/src/main/java/org/springframework/boot/actuate/autoconfigure/metrics/export/elastic/ElasticMetricsExportAutoConfiguration.java @@ -52,20 +52,26 @@ import org.springframework.context.annotation.Configuration; @EnableConfigurationProperties(ElasticProperties.class) public class ElasticMetricsExportAutoConfiguration { + private final ElasticProperties properties; + + public ElasticMetricsExportAutoConfiguration(ElasticProperties properties) { + this.properties = properties; + } + @Bean @ConditionalOnMissingBean - public ElasticConfig elasticConfig(ElasticProperties elasticProperties) { - return new ElasticPropertiesConfigAdapter(elasticProperties); + public ElasticConfig elasticConfig() { + return new ElasticPropertiesConfigAdapter(this.properties); } @Bean @ConditionalOnMissingBean public ElasticMeterRegistry elasticMeterRegistry(ElasticConfig elasticConfig, - Clock clock, ElasticProperties elasticProperties) { + Clock clock) { return ElasticMeterRegistry.builder(elasticConfig).clock(clock) .httpClient( - new HttpUrlConnectionSender(elasticProperties.getConnectTimeout(), - elasticProperties.getReadTimeout())) + new HttpUrlConnectionSender(this.properties.getConnectTimeout(), + this.properties.getReadTimeout())) .build(); } diff --git a/spring-boot-project/spring-boot-actuator-autoconfigure/src/main/java/org/springframework/boot/actuate/autoconfigure/metrics/export/humio/HumioMetricsExportAutoConfiguration.java b/spring-boot-project/spring-boot-actuator-autoconfigure/src/main/java/org/springframework/boot/actuate/autoconfigure/metrics/export/humio/HumioMetricsExportAutoConfiguration.java index 135c5620a11..36ce667bd71 100644 --- a/spring-boot-project/spring-boot-actuator-autoconfigure/src/main/java/org/springframework/boot/actuate/autoconfigure/metrics/export/humio/HumioMetricsExportAutoConfiguration.java +++ b/spring-boot-project/spring-boot-actuator-autoconfigure/src/main/java/org/springframework/boot/actuate/autoconfigure/metrics/export/humio/HumioMetricsExportAutoConfiguration.java @@ -52,20 +52,25 @@ import org.springframework.context.annotation.Configuration; @EnableConfigurationProperties(HumioProperties.class) public class HumioMetricsExportAutoConfiguration { - @Bean - @ConditionalOnMissingBean - public HumioConfig humioConfig(HumioProperties humioProperties) { - return new HumioPropertiesConfigAdapter(humioProperties); + private final HumioProperties properties; + + public HumioMetricsExportAutoConfiguration(HumioProperties properties) { + this.properties = properties; } @Bean @ConditionalOnMissingBean - public HumioMeterRegistry humioMeterRegistry(HumioConfig humioConfig, Clock clock, - HumioProperties humioProperties) { + public HumioConfig humioConfig() { + return new HumioPropertiesConfigAdapter(this.properties); + } + + @Bean + @ConditionalOnMissingBean + public HumioMeterRegistry humioMeterRegistry(HumioConfig humioConfig, Clock clock) { return HumioMeterRegistry.builder(humioConfig).clock(clock) .httpClient( - new HttpUrlConnectionSender(humioProperties.getConnectTimeout(), - humioProperties.getReadTimeout())) + new HttpUrlConnectionSender(this.properties.getConnectTimeout(), + this.properties.getReadTimeout())) .build(); } diff --git a/spring-boot-project/spring-boot-actuator-autoconfigure/src/main/java/org/springframework/boot/actuate/autoconfigure/metrics/export/influx/InfluxMetricsExportAutoConfiguration.java b/spring-boot-project/spring-boot-actuator-autoconfigure/src/main/java/org/springframework/boot/actuate/autoconfigure/metrics/export/influx/InfluxMetricsExportAutoConfiguration.java index 15b3ef68044..48d3f4f7856 100644 --- a/spring-boot-project/spring-boot-actuator-autoconfigure/src/main/java/org/springframework/boot/actuate/autoconfigure/metrics/export/influx/InfluxMetricsExportAutoConfiguration.java +++ b/spring-boot-project/spring-boot-actuator-autoconfigure/src/main/java/org/springframework/boot/actuate/autoconfigure/metrics/export/influx/InfluxMetricsExportAutoConfiguration.java @@ -52,10 +52,16 @@ import org.springframework.context.annotation.Configuration; @EnableConfigurationProperties(InfluxProperties.class) public class InfluxMetricsExportAutoConfiguration { + private final InfluxProperties properties; + + public InfluxMetricsExportAutoConfiguration(InfluxProperties properties) { + this.properties = properties; + } + @Bean @ConditionalOnMissingBean - public InfluxConfig influxConfig(InfluxProperties influxProperties) { - return new InfluxPropertiesConfigAdapter(influxProperties); + public InfluxConfig influxConfig() { + return new InfluxPropertiesConfigAdapter(this.properties); } @Bean @@ -64,8 +70,8 @@ public class InfluxMetricsExportAutoConfiguration { InfluxProperties influxProperties) { return InfluxMeterRegistry.builder(influxConfig).clock(clock) .httpClient( - new HttpUrlConnectionSender(influxProperties.getConnectTimeout(), - influxProperties.getReadTimeout())) + new HttpUrlConnectionSender(this.properties.getConnectTimeout(), + this.properties.getReadTimeout())) .build(); } diff --git a/spring-boot-project/spring-boot-actuator-autoconfigure/src/main/java/org/springframework/boot/actuate/autoconfigure/metrics/export/kairos/KairosMetricsExportAutoConfiguration.java b/spring-boot-project/spring-boot-actuator-autoconfigure/src/main/java/org/springframework/boot/actuate/autoconfigure/metrics/export/kairos/KairosMetricsExportAutoConfiguration.java index 9000902bb4b..d053dad21f2 100644 --- a/spring-boot-project/spring-boot-actuator-autoconfigure/src/main/java/org/springframework/boot/actuate/autoconfigure/metrics/export/kairos/KairosMetricsExportAutoConfiguration.java +++ b/spring-boot-project/spring-boot-actuator-autoconfigure/src/main/java/org/springframework/boot/actuate/autoconfigure/metrics/export/kairos/KairosMetricsExportAutoConfiguration.java @@ -52,20 +52,26 @@ import org.springframework.context.annotation.Configuration; @EnableConfigurationProperties(KairosProperties.class) public class KairosMetricsExportAutoConfiguration { - @Bean - @ConditionalOnMissingBean - public KairosConfig kairosConfig(KairosProperties kairosProperties) { - return new KairosPropertiesConfigAdapter(kairosProperties); + private final KairosProperties properties; + + public KairosMetricsExportAutoConfiguration(KairosProperties properties) { + this.properties = properties; } @Bean @ConditionalOnMissingBean - public KairosMeterRegistry kairosMeterRegistry(KairosConfig kairosConfig, Clock clock, - KairosProperties kairosProperties) { + public KairosConfig kairosConfig() { + return new KairosPropertiesConfigAdapter(this.properties); + } + + @Bean + @ConditionalOnMissingBean + public KairosMeterRegistry kairosMeterRegistry(KairosConfig kairosConfig, + Clock clock) { return KairosMeterRegistry.builder(kairosConfig).clock(clock) .httpClient( - new HttpUrlConnectionSender(kairosProperties.getConnectTimeout(), - kairosProperties.getReadTimeout())) + new HttpUrlConnectionSender(this.properties.getConnectTimeout(), + this.properties.getReadTimeout())) .build(); } diff --git a/spring-boot-project/spring-boot-actuator-autoconfigure/src/main/java/org/springframework/boot/actuate/autoconfigure/metrics/export/newrelic/NewRelicMetricsExportAutoConfiguration.java b/spring-boot-project/spring-boot-actuator-autoconfigure/src/main/java/org/springframework/boot/actuate/autoconfigure/metrics/export/newrelic/NewRelicMetricsExportAutoConfiguration.java index 4a3e0e285f9..ddb07a84862 100644 --- a/spring-boot-project/spring-boot-actuator-autoconfigure/src/main/java/org/springframework/boot/actuate/autoconfigure/metrics/export/newrelic/NewRelicMetricsExportAutoConfiguration.java +++ b/spring-boot-project/spring-boot-actuator-autoconfigure/src/main/java/org/springframework/boot/actuate/autoconfigure/metrics/export/newrelic/NewRelicMetricsExportAutoConfiguration.java @@ -53,20 +53,26 @@ import org.springframework.context.annotation.Configuration; @EnableConfigurationProperties(NewRelicProperties.class) public class NewRelicMetricsExportAutoConfiguration { + private final NewRelicProperties properties; + + public NewRelicMetricsExportAutoConfiguration(NewRelicProperties properties) { + this.properties = properties; + } + @Bean @ConditionalOnMissingBean - public NewRelicConfig newRelicConfig(NewRelicProperties props) { - return new NewRelicPropertiesConfigAdapter(props); + public NewRelicConfig newRelicConfig() { + return new NewRelicPropertiesConfigAdapter(this.properties); } @Bean @ConditionalOnMissingBean public NewRelicMeterRegistry newRelicMeterRegistry(NewRelicConfig newRelicConfig, - Clock clock, NewRelicProperties newRelicProperties) { + Clock clock) { return NewRelicMeterRegistry.builder(newRelicConfig).clock(clock) - .httpClient(new HttpUrlConnectionSender( - newRelicProperties.getConnectTimeout(), - newRelicProperties.getReadTimeout())) + .httpClient( + new HttpUrlConnectionSender(this.properties.getConnectTimeout(), + this.properties.getReadTimeout())) .build(); } diff --git a/spring-boot-project/spring-boot-actuator-autoconfigure/src/main/java/org/springframework/boot/actuate/autoconfigure/metrics/export/wavefront/WavefrontMetricsExportAutoConfiguration.java b/spring-boot-project/spring-boot-actuator-autoconfigure/src/main/java/org/springframework/boot/actuate/autoconfigure/metrics/export/wavefront/WavefrontMetricsExportAutoConfiguration.java index fe7de604f5a..d5a59e1c86c 100644 --- a/spring-boot-project/spring-boot-actuator-autoconfigure/src/main/java/org/springframework/boot/actuate/autoconfigure/metrics/export/wavefront/WavefrontMetricsExportAutoConfiguration.java +++ b/spring-boot-project/spring-boot-actuator-autoconfigure/src/main/java/org/springframework/boot/actuate/autoconfigure/metrics/export/wavefront/WavefrontMetricsExportAutoConfiguration.java @@ -52,20 +52,26 @@ import org.springframework.context.annotation.Configuration; @EnableConfigurationProperties(WavefrontProperties.class) public class WavefrontMetricsExportAutoConfiguration { + private final WavefrontProperties properties; + + public WavefrontMetricsExportAutoConfiguration(WavefrontProperties properties) { + this.properties = properties; + } + @Bean @ConditionalOnMissingBean - public WavefrontConfig wavefrontConfig(WavefrontProperties props) { - return new WavefrontPropertiesConfigAdapter(props); + public WavefrontConfig wavefrontConfig() { + return new WavefrontPropertiesConfigAdapter(this.properties); } @Bean @ConditionalOnMissingBean public WavefrontMeterRegistry wavefrontMeterRegistry(WavefrontConfig wavefrontConfig, - Clock clock, WavefrontProperties wavefrontProperties) { + Clock clock) { return WavefrontMeterRegistry.builder(wavefrontConfig).clock(clock) - .httpClient(new HttpUrlConnectionSender( - wavefrontProperties.getConnectTimeout(), - wavefrontProperties.getReadTimeout())) + .httpClient( + new HttpUrlConnectionSender(this.properties.getConnectTimeout(), + this.properties.getReadTimeout())) .build(); }