Merge branch '2.6.x' into 2.7.x

Closes gh-30842
pull/31139/head
Andy Wilkinson 3 years ago
commit 61cd05f74b

@ -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