Browse Source

Merge branch '2.7.x'

pull/30862/head
Andy Wilkinson 4 years ago
parent
commit
2cebbe10ce
  1. 3
      spring-boot-project/spring-boot-actuator-autoconfigure/src/main/java/org/springframework/boot/actuate/autoconfigure/metrics/export/influx/InfluxMetricsExportAutoConfiguration.java

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

@ -63,8 +63,7 @@ public class InfluxMetricsExportAutoConfiguration {
@Bean @Bean
@ConditionalOnMissingBean @ConditionalOnMissingBean
public InfluxMeterRegistry influxMeterRegistry(InfluxConfig influxConfig, Clock clock, public InfluxMeterRegistry influxMeterRegistry(InfluxConfig influxConfig, Clock clock) {
InfluxProperties influxProperties) {
return InfluxMeterRegistry.builder(influxConfig).clock(clock).httpClient( return InfluxMeterRegistry.builder(influxConfig).clock(clock).httpClient(
new HttpUrlConnectionSender(this.properties.getConnectTimeout(), this.properties.getReadTimeout())) new HttpUrlConnectionSender(this.properties.getConnectTimeout(), this.properties.getReadTimeout()))
.build(); .build();

Loading…
Cancel
Save