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

Merge branch '2.1.x'

Browse Source
This commit is contained in:
Stephane Nicoll
2018-12-20 17:54:08 +01:00
parent 372284eb88 210d1f6d95
commit 9d67400afa
19 changed files with 80 additions and 236 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
spring-boot-project/spring-boot-actuator-autoconfigure/src/test/java/org/springframework/boot/actuate/autoconfigure/endpoint/web/documentation/PrometheusScrapeEndpointDocumentationTests.java
View File

@@ -18,7 +18,6 @@ package org.springframework.boot.actuate.autoconfigure.endpoint.web.documentatio
import io.micrometer.core.instrument.Clock;
import io.micrometer.core.instrument.binder.jvm.JvmMemoryMetrics;
import io.micrometer.prometheus.PrometheusConfig;
import io.micrometer.prometheus.PrometheusMeterRegistry;
import io.prometheus.client.CollectorRegistry;
import org.junit.Test;
@@ -54,14 +53,7 @@ public class PrometheusScrapeEndpointDocumentationTests
public PrometheusScrapeEndpoint endpoint() {
CollectorRegistry collectorRegistry = new CollectorRegistry(true);
PrometheusMeterRegistry meterRegistry = new PrometheusMeterRegistry(
new PrometheusConfig() {
@Override
public String get(String key) {
return null;
}
}, collectorRegistry, Clock.SYSTEM);
(key) -> null, collectorRegistry, Clock.SYSTEM);
new JvmMemoryMetrics().bindTo(meterRegistry);
return new PrometheusScrapeEndpoint(collectorRegistry);
}

10
spring-boot-project/spring-boot-actuator-autoconfigure/src/test/java/org/springframework/boot/actuate/autoconfigure/metrics/MissingRequiredConfigurationFailureAnalyzerTests.java
View File

@@ -17,7 +17,6 @@
package org.springframework.boot.actuate.autoconfigure.metrics;
import io.micrometer.core.instrument.Clock;
import io.micrometer.newrelic.NewRelicConfig;
import io.micrometer.newrelic.NewRelicMeterRegistry;
import org.junit.Test;
@@ -64,14 +63,7 @@ public class MissingRequiredConfigurationFailureAnalyzerTests {
@Bean
public NewRelicMeterRegistry meterRegistry() {
return new NewRelicMeterRegistry(new NewRelicConfig() {
@Override
public String get(String key) {
return null;
}
}, Clock.SYSTEM);
return new NewRelicMeterRegistry((key) -> null, Clock.SYSTEM);
}
}

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

@@ -107,14 +107,7 @@ public class AtlasMetricsExportAutoConfigurationTests {
@Bean
public AtlasConfig customConfig() {
return new AtlasConfig() {
@Override
public String get(String k) {
return null;
}
};
return (k) -> null;
}
}

13
spring-boot-project/spring-boot-actuator-autoconfigure/src/test/java/org/springframework/boot/actuate/autoconfigure/metrics/export/datadog/DatadogMetricsExportAutoConfigurationTests.java
View File

@@ -116,16 +116,11 @@ public class DatadogMetricsExportAutoConfigurationTests {
@Bean
public DatadogConfig customConfig() {
return new DatadogConfig() {
@Override
public String get(String k) {
if ("datadog.apiKey".equals(k)) {
return "12345";
}
return null;
return (k) -> {
if ("datadog.apiKey".equals(k)) {
return "12345";
}
return null;
};
}

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

@@ -107,14 +107,7 @@ public class GangliaMetricsExportAutoConfigurationTests {
@Bean
public GangliaConfig customConfig() {
return new GangliaConfig() {
@Override
public String get(String k) {
return null;
}
};
return (k) -> null;
}
}

13
spring-boot-project/spring-boot-actuator-autoconfigure/src/test/java/org/springframework/boot/actuate/autoconfigure/metrics/export/graphite/GraphiteMetricsExportAutoConfigurationTests.java
View File

@@ -124,16 +124,11 @@ public class GraphiteMetricsExportAutoConfigurationTests {
@Bean
public GraphiteConfig customConfig() {
return new GraphiteConfig() {
@Override
public String get(String k) {
if ("Graphite.apiKey".equals(k)) {
return "12345";
}
return null;
return (k) -> {
if ("Graphite.apiKey".equals(k)) {
return "12345";
}
return null;
};
}

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

@@ -109,14 +109,7 @@ public class HumioMetricsExportAutoConfigurationTests {
@Bean
public HumioConfig customConfig() {
return new HumioConfig() {
@Override
public String get(String k) {
return null;
}
};
return (k) -> null;
}
}

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

@@ -107,14 +107,7 @@ public class InfluxMetricsExportAutoConfigurationTests {
@Bean
public InfluxConfig customConfig() {
return new InfluxConfig() {
@Override
public String get(String k) {
return null;
}
};
return (k) -> null;
}
}

19
spring-boot-project/spring-boot-actuator-autoconfigure/src/test/java/org/springframework/boot/actuate/autoconfigure/metrics/export/newrelic/NewRelicMetricsExportAutoConfigurationTests.java
View File

@@ -129,19 +129,14 @@ public class NewRelicMetricsExportAutoConfigurationTests {
@Bean
public NewRelicConfig customConfig() {
return new NewRelicConfig() {
@Override
public String get(String k) {
if ("newrelic.accountId".equals(k)) {
return "abcde";
}
if ("newrelic.apiKey".equals(k)) {
return "12345";
}
return null;
return (k) -> {
if ("newrelic.accountId".equals(k)) {
return "abcde";
}
if ("newrelic.apiKey".equals(k)) {
return "12345";
}
return null;
};
}

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

@@ -157,14 +157,7 @@ public class PrometheusMetricsExportAutoConfigurationTests {
@Bean
public PrometheusConfig customConfig() {
return new PrometheusConfig() {
@Override
public String get(String k) {
return null;
}
};
return (k) -> null;
}
}

13
spring-boot-project/spring-boot-actuator-autoconfigure/src/test/java/org/springframework/boot/actuate/autoconfigure/metrics/export/signalfx/SignalFxMetricsExportAutoConfigurationTests.java
View File

@@ -124,16 +124,11 @@ public class SignalFxMetricsExportAutoConfigurationTests {
@Bean
public SignalFxConfig customConfig() {
return new SignalFxConfig() {
@Override
public String get(String k) {
if ("signalfx.accessToken".equals(k)) {
return "abcde";
}
return null;
return (k) -> {
if ("signalfx.accessToken".equals(k)) {
return "abcde";
}
return null;
};
}

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

@@ -90,14 +90,7 @@ public class SimpleMetricsExportAutoConfigurationTests {
@Bean
public SimpleConfig customConfig() {
return new SimpleConfig() {
@Override
public String get(String k) {
return null;
}
};
return (k) -> null;
}
}