root
/
spring-boot
mirror of https://github.com/spring-projects/spring-boot.git
1
0
Fork 0
Code Issues Actions 12 Packages Projects Releases Wiki Activity

Polish "Handle StepRegistry connect/read timeout deprecation" 

Closes gh-14886
This commit is contained in:
Andy Wilkinson 2018-10-29 21:11:11 +00:00
parent fe63342f52
commit 290e8886c9
9 changed files with 107 additions and 54 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
spring-boot-project/spring-boot-actuator-autoconfigure/src/main/java/org/springframework/boot/actuate/autoconfigure/metrics/export/appoptics/AppOpticsMetricsExportAutoConfiguration.java
View File

@ -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();
}

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

@ -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();
}

18
spring-boot-project/spring-boot-actuator-autoconfigure/src/main/java/org/springframework/boot/actuate/autoconfigure/metrics/export/dynatrace/DynatraceMetricsExportAutoConfiguration.java
View File

@ -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();
}

16
spring-boot-project/spring-boot-actuator-autoconfigure/src/main/java/org/springframework/boot/actuate/autoconfigure/metrics/export/elastic/ElasticMetricsExportAutoConfiguration.java
View File

@ -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();
}

21
spring-boot-project/spring-boot-actuator-autoconfigure/src/main/java/org/springframework/boot/actuate/autoconfigure/metrics/export/humio/HumioMetricsExportAutoConfiguration.java
View File

@ -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();
}

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

@ -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();
}

22
spring-boot-project/spring-boot-actuator-autoconfigure/src/main/java/org/springframework/boot/actuate/autoconfigure/metrics/export/kairos/KairosMetricsExportAutoConfiguration.java
View File

@ -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();
}

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

@ -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();
}

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

@ -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();
}