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

Polish

Browse Source
This commit is contained in:
Andy Wilkinson
2018-01-29 20:20:58 +00:00
parent f5102516fa
commit e834b25ef1
3 changed files with 6 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
spring-boot-project/spring-boot-actuator-autoconfigure/src/test/java/org/springframework/boot/actuate/autoconfigure/logging/LoggersEndpointAutoConfigurationTests.java
View File

@@ -58,9 +58,8 @@ public class LoggersEndpointAutoConfigurationTests {
this.contextRunner
.withSystemProperties(
"org.springframework.boot.logging.LoggingSystem=none")
.run((context) -> {
assertThat(context).doesNotHaveBean(LoggersEndpoint.class);
});
.run((context) -> assertThat(context)
.doesNotHaveBean(LoggersEndpoint.class));
}
@Configuration

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

@@ -75,7 +75,7 @@ public final class MetricsRun {
propertyValues.add("management.metrics.use-global-registry=false");
List<String> keep = Arrays.asList(implementations);
IMPLEMENTATIONS.stream()
.filter((implementation) -> !keep.contains(implementations))
.filter((implementation) -> !keep.contains(implementation))
.map(MetricsRun::disableExport).forEach(propertyValues::add);
return propertyValues.toArray(new String[0]);
}

8
spring-boot-project/spring-boot-actuator/src/main/java/org/springframework/boot/actuate/metrics/web/reactive/server/RouterFunctionMetrics.java
View File

@@ -127,11 +127,9 @@ public class RouterFunctionMetrics {
public Mono<ServerResponse> filter(ServerRequest request,
HandlerFunction<ServerResponse> next) {
long start = System.nanoTime();
return next.handle(request).doOnSuccess((response) -> {
timer(start, request, response);
}).doOnError((error) -> {
timer(start, request, null);
});
return next.handle(request)
.doOnSuccess((response) -> timer(start, request, response))
.doOnError((error) -> timer(start, request, null));
}
private Iterable<Tag> getDefaultTags(ServerRequest request,