Spring/spring-boot
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Handle StepRegistry connect/read timeout deprecation

Browse Source 
See gh-14886
This commit is contained in:
artsiom
2018-10-18 13:43:42 +03:00
committed by Andy Wilkinson
parent a984453363
commit fe63342f52
12 changed files with 81 additions and 55 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -19,6 +19,7 @@ package org.springframework.boot.actuate.autoconfigure.metrics.export.appoptics;
import io.micrometer.appoptics.AppOpticsConfig;
import io.micrometer.appoptics.AppOpticsMeterRegistry;
import io.micrometer.core.instrument.Clock;
import io.micrometer.core.ipc.http.HttpUrlConnectionSender;
import org.springframework.boot.actuate.autoconfigure.metrics.CompositeMeterRegistryAutoConfiguration;
import org.springframework.boot.actuate.autoconfigure.metrics.MetricsAutoConfiguration;
@@ -38,6 +39,7 @@ import org.springframework.context.annotation.Configuration;
* {@link EnableAutoConfiguration Auto-configuration} for exporting metrics to AppOptics.
*
* @author Stephane Nicoll
* @author Artsiom Yudovin
* @since 2.1.0
*/
@Configuration
@@ -59,8 +61,12 @@ public class AppOpticsMetricsExportAutoConfiguration {
@Bean
@ConditionalOnMissingBean
public AppOpticsMeterRegistry appOpticsMeterRegistry(AppOpticsConfig config,
Clock clock) {
return new AppOpticsMeterRegistry(config, clock);
Clock clock, AppOpticsProperties appOpticsProperties) {
return AppOpticsMeterRegistry.builder(config).clock(clock)
.httpClient(new HttpUrlConnectionSender(
appOpticsProperties.getConnectTimeout(),
appOpticsProperties.getReadTimeout()))
.build();
}
}

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

@@ -17,6 +17,7 @@
package org.springframework.boot.actuate.autoconfigure.metrics.export.datadog;
import io.micrometer.core.instrument.Clock;
import io.micrometer.core.ipc.http.HttpUrlConnectionSender;
import io.micrometer.datadog.DatadogConfig;
import io.micrometer.datadog.DatadogMeterRegistry;
@@ -38,6 +39,7 @@ import org.springframework.context.annotation.Configuration;
* {@link EnableAutoConfiguration Auto-configuration} for exporting metrics to Datadog.
*
* @author Jon Schneider
* @author Artsiom Yudovin
* @since 2.0.0
*/
@Configuration
@@ -59,8 +61,12 @@ public class DatadogMetricsExportAutoConfiguration {
@Bean
@ConditionalOnMissingBean
public DatadogMeterRegistry datadogMeterRegistry(DatadogConfig datadogConfig,
Clock clock) {
return new DatadogMeterRegistry(datadogConfig, clock);
Clock clock, DatadogProperties datadogProperties) {
return DatadogMeterRegistry.builder(datadogConfig).clock(clock)
.httpClient(
new HttpUrlConnectionSender(datadogProperties.getConnectTimeout(),
datadogProperties.getReadTimeout()))
.build();
}
}

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

@@ -17,6 +17,7 @@
package org.springframework.boot.actuate.autoconfigure.metrics.export.dynatrace;
import io.micrometer.core.instrument.Clock;
import io.micrometer.core.ipc.http.HttpUrlConnectionSender;
import io.micrometer.dynatrace.DynatraceConfig;
import io.micrometer.dynatrace.DynatraceMeterRegistry;
@@ -38,6 +39,7 @@ import org.springframework.context.annotation.Configuration;
* {@link EnableAutoConfiguration Auto-configuration} for exporting metrics to Dynatrace.
*
* @author Andy Wilkinson
* @author Artsiom Yudovin
* @since 2.1.0
*/
@Configuration
@@ -59,8 +61,12 @@ public class DynatraceMetricsExportAutoConfiguration {
@Bean
@ConditionalOnMissingBean
public DynatraceMeterRegistry dynatraceMeterRegistry(DynatraceConfig dynatraceConfig,
Clock clock) {
return new DynatraceMeterRegistry(dynatraceConfig, clock);
Clock clock, DynatraceProperties dynatraceProperties) {
return DynatraceMeterRegistry.builder(dynatraceConfig).clock(clock)
.httpClient(new HttpUrlConnectionSender(
dynatraceProperties.getConnectTimeout(),
dynatraceProperties.getReadTimeout()))
.build();
}
}

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

@@ -17,6 +17,7 @@
package org.springframework.boot.actuate.autoconfigure.metrics.export.elastic;
import io.micrometer.core.instrument.Clock;
import io.micrometer.core.ipc.http.HttpUrlConnectionSender;
import io.micrometer.elastic.ElasticConfig;
import io.micrometer.elastic.ElasticMeterRegistry;
@@ -38,6 +39,7 @@ import org.springframework.context.annotation.Configuration;
* {@link EnableAutoConfiguration Auto-configuration} for exporting metrics to Elastic.
*
* @author Andy Wilkinson
* @author Artsiom Yudovin
* @since 2.1.0
*/
@Configuration
@@ -59,8 +61,12 @@ public class ElasticMetricsExportAutoConfiguration {
@Bean
@ConditionalOnMissingBean
public ElasticMeterRegistry elasticMeterRegistry(ElasticConfig elasticConfig,
Clock clock) {
return new ElasticMeterRegistry(elasticConfig, clock);
Clock clock, ElasticProperties elasticProperties) {
return ElasticMeterRegistry.builder(elasticConfig).clock(clock)
.httpClient(
new HttpUrlConnectionSender(elasticProperties.getConnectTimeout(),
elasticProperties.getReadTimeout()))
.build();
}
}

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

@@ -17,6 +17,7 @@
package org.springframework.boot.actuate.autoconfigure.metrics.export.humio;
import io.micrometer.core.instrument.Clock;
import io.micrometer.core.ipc.http.HttpUrlConnectionSender;
import io.micrometer.humio.HumioConfig;
import io.micrometer.humio.HumioMeterRegistry;
@@ -38,6 +39,7 @@ import org.springframework.context.annotation.Configuration;
* {@link EnableAutoConfiguration Auto-configuration} for exporting metrics to Humio.
*
* @author Andy Wilkinson
* @author Artsiom Yudovin
* @since 2.1.0
*/
@Configuration
@@ -58,8 +60,14 @@ public class HumioMetricsExportAutoConfiguration {
@Bean
@ConditionalOnMissingBean
public HumioMeterRegistry humioMeterRegistry(HumioConfig humioConfig, Clock clock) {
return new HumioMeterRegistry(humioConfig, clock);
public HumioMeterRegistry humioMeterRegistry(HumioConfig humioConfig, Clock clock,
HumioProperties humioProperties) {
return HumioMeterRegistry.builder(humioConfig).clock(clock)
.httpClient(
new HttpUrlConnectionSender(humioProperties.getConnectTimeout(),
humioProperties.getReadTimeout()))
.build();
}
}

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

@@ -17,6 +17,7 @@
package org.springframework.boot.actuate.autoconfigure.metrics.export.influx;
import io.micrometer.core.instrument.Clock;
import io.micrometer.core.ipc.http.HttpUrlConnectionSender;
import io.micrometer.influx.InfluxConfig;
import io.micrometer.influx.InfluxMeterRegistry;
@@ -38,6 +39,7 @@ import org.springframework.context.annotation.Configuration;
* {@link EnableAutoConfiguration Auto-configuration} for exporting metrics to Influx.
*
* @author Jon Schneider
* @author Artsiom Yudovin
* @since 2.0.0
*/
@Configuration
@@ -58,9 +60,14 @@ public class InfluxMetricsExportAutoConfiguration {
@Bean
@ConditionalOnMissingBean
public InfluxMeterRegistry influxMeterRegistry(InfluxConfig influxConfig,
Clock clock) {
return new InfluxMeterRegistry(influxConfig, clock);
public InfluxMeterRegistry influxMeterRegistry(InfluxConfig influxConfig, Clock clock,
InfluxProperties influxProperties) {
return InfluxMeterRegistry.builder(influxConfig).clock(clock)
.httpClient(
new HttpUrlConnectionSender(influxProperties.getConnectTimeout(),
influxProperties.getReadTimeout()))
.build();
}
}

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

@@ -17,6 +17,7 @@
package org.springframework.boot.actuate.autoconfigure.metrics.export.kairos;
import io.micrometer.core.instrument.Clock;
import io.micrometer.core.ipc.http.HttpUrlConnectionSender;
import io.micrometer.kairos.KairosConfig;
import io.micrometer.kairos.KairosMeterRegistry;
@@ -38,6 +39,7 @@ import org.springframework.context.annotation.Configuration;
* {@link EnableAutoConfiguration Auto-configuration} for exporting metrics to KairosDB.
*
* @author Stephane Nicoll
* @author Artsiom Yudovin
* @since 2.1.0
*/
@Configuration
@@ -58,9 +60,14 @@ public class KairosMetricsExportAutoConfiguration {
@Bean
@ConditionalOnMissingBean
public KairosMeterRegistry kairosMeterRegistry(KairosConfig kairosConfig,
Clock clock) {
return new KairosMeterRegistry(kairosConfig, clock);
public KairosMeterRegistry kairosMeterRegistry(KairosConfig kairosConfig, Clock clock,
KairosProperties kairosProperties) {
return KairosMeterRegistry.builder(kairosConfig).clock(clock)
.httpClient(
new HttpUrlConnectionSender(kairosProperties.getConnectTimeout(),
kairosProperties.getReadTimeout()))
.build();
}
}

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

@@ -17,6 +17,7 @@
package org.springframework.boot.actuate.autoconfigure.metrics.export.newrelic;
import io.micrometer.core.instrument.Clock;
import io.micrometer.core.ipc.http.HttpUrlConnectionSender;
import io.micrometer.newrelic.NewRelicConfig;
import io.micrometer.newrelic.NewRelicMeterRegistry;
@@ -39,6 +40,7 @@ import org.springframework.context.annotation.Configuration;
*
* @author Jon Schneider
* @author Andy Wilkinson
* @author Artsiom Yudovin
* @since 2.0.0
*/
@Configuration
@@ -60,8 +62,13 @@ public class NewRelicMetricsExportAutoConfiguration {
@Bean
@ConditionalOnMissingBean
public NewRelicMeterRegistry newRelicMeterRegistry(NewRelicConfig newRelicConfig,
Clock clock) {
return new NewRelicMeterRegistry(newRelicConfig, clock);
Clock clock, NewRelicProperties newRelicProperties) {
return NewRelicMeterRegistry.builder(newRelicConfig).clock(clock)
.httpClient(new HttpUrlConnectionSender(
newRelicProperties.getConnectTimeout(),
newRelicProperties.getReadTimeout()))
.build();
}
}

11
spring-boot-project/spring-boot-actuator-autoconfigure/src/main/java/org/springframework/boot/actuate/autoconfigure/metrics/export/properties/StepRegistryPropertiesConfigAdapter.java
View File

@@ -26,6 +26,7 @@ import io.micrometer.core.instrument.step.StepRegistryConfig;
* @param <T> the properties type
* @author Jon Schneider
* @author Phillip Webb
* @author Artsiom Yudovin
* @since 2.0.0
*/
public abstract class StepRegistryPropertiesConfigAdapter<T extends StepRegistryProperties>
@@ -55,16 +56,6 @@ public abstract class StepRegistryPropertiesConfigAdapter<T extends StepRegistry
return get(T::isEnabled, StepRegistryConfig.super::enabled);
}
@Override
public Duration connectTimeout() {
return get(T::getConnectTimeout, StepRegistryConfig.super::connectTimeout);
}
@Override
public Duration readTimeout() {
return get(T::getReadTimeout, StepRegistryConfig.super::readTimeout);
}
@Override
public int numThreads() {
return get(T::getNumThreads, StepRegistryConfig.super::numThreads);

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

@@ -17,6 +17,7 @@
package org.springframework.boot.actuate.autoconfigure.metrics.export.wavefront;
import io.micrometer.core.instrument.Clock;
import io.micrometer.core.ipc.http.HttpUrlConnectionSender;
import io.micrometer.wavefront.WavefrontConfig;
import io.micrometer.wavefront.WavefrontMeterRegistry;
@@ -38,6 +39,7 @@ import org.springframework.context.annotation.Configuration;
* {@link EnableAutoConfiguration Auto-configuration} for exporting metrics to Wavefront.
*
* @author Jon Schneider
* @author Artsiom Yudovin
* @since 2.0.0
*/
@Configuration
@@ -59,8 +61,12 @@ public class WavefrontMetricsExportAutoConfiguration {
@Bean
@ConditionalOnMissingBean
public WavefrontMeterRegistry wavefrontMeterRegistry(WavefrontConfig wavefrontConfig,
Clock clock) {
return new WavefrontMeterRegistry(wavefrontConfig, clock);
Clock clock, WavefrontProperties wavefrontProperties) {
return WavefrontMeterRegistry.builder(wavefrontConfig).clock(clock)
.httpClient(new HttpUrlConnectionSender(
wavefrontProperties.getConnectTimeout(),
wavefrontProperties.getReadTimeout()))
.build();
}
}

9
spring-boot-project/spring-boot-actuator-autoconfigure/src/test/java/org/springframework/boot/actuate/autoconfigure/metrics/export/humio/HumioPropertiesConfigAdapterTests.java
View File

@@ -16,7 +16,6 @@
package org.springframework.boot.actuate.autoconfigure.metrics.export.humio;
import java.time.Duration;
import java.util.Collections;
import org.junit.Test;
@@ -38,14 +37,6 @@ public class HumioPropertiesConfigAdapterTests {
.isEqualTo("ABC123");
}
@Test
public void whenPropertiesConnectTimeoutIsSetAdapterConnectTimeoutReturnsIt() {
HumioProperties properties = new HumioProperties();
properties.setConnectTimeout(Duration.ofSeconds(10));
assertThat(new HumioPropertiesConfigAdapter(properties).connectTimeout())
.isEqualTo(Duration.ofSeconds(10));
}
@Test
public void whenPropertiesRepositoryIsSetAdapterRepositoryReturnsIt() {
HumioProperties properties = new HumioProperties();

17
spring-boot-project/spring-boot-actuator-autoconfigure/src/test/java/org/springframework/boot/actuate/autoconfigure/metrics/export/properties/StepRegistryPropertiesConfigAdapterTests.java
View File

@@ -28,6 +28,7 @@ import static org.assertj.core.api.Assertions.assertThat;
* @param <P> properties used by the tests
* @param <A> adapter used by the tests
* @author Stephane Nicoll
* @author Artsiom Yudovin
*/
public abstract class StepRegistryPropertiesConfigAdapterTests<P extends StepRegistryProperties, A extends StepRegistryPropertiesConfigAdapter<P>> {
@@ -50,22 +51,6 @@ public abstract class StepRegistryPropertiesConfigAdapterTests<P extends StepReg
assertThat(createConfigAdapter(properties).enabled()).isFalse();
}
@Test
public void whenPropertiesConnectTimeoutIsSetAdapterConnectTimeoutReturnsIt() {
P properties = createProperties();
properties.setConnectTimeout(Duration.ofMinutes(42));
assertThat(createConfigAdapter(properties).connectTimeout())
.isEqualTo(Duration.ofMinutes(42));
}
@Test
public void whenPropertiesReadTimeoutIsSetAdapterReadTimeoutReturnsIt() {
P properties = createProperties();
properties.setReadTimeout(Duration.ofMillis(42));
assertThat(createConfigAdapter(properties).readTimeout())
.isEqualTo(Duration.ofMillis(42));
}
@Test
public void whenPropertiesNumThreadsIsSetAdapterNumThreadsReturnsIt() {
P properties = createProperties();