GitHub-Spring/spring-boot
1
0
Fork 0
mirror of https://github.com/spring-projects/spring-boot.git synced 2026-05-03 03:43:54 +01:00
Code Issues Projects Releases Wiki Activity

Merge branch '2.0.x'

Browse Source
This commit is contained in:
Stephane Nicoll
2018-08-03 09:25:15 +02:00
parent e233c32508 37be894844
commit 0e750f982b
1 changed files with 4 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files
spring-boot-project/spring-boot-actuator-autoconfigure/src/main/java/org/springframework/boot/actuate/autoconfigure/metrics/PropertiesMeterFilter.java
+4 -3
View File
@@ -43,8 +43,6 @@ import org.springframework.util.StringUtils;
*/
public class PropertiesMeterFilter implements MeterFilter {
private static final ServiceLevelAgreementBoundary[] EMPTY_SLA = {};
private final MetricsProperties properties;
private final MeterFilter mapFilter;
@@ -90,7 +88,10 @@ public class PropertiesMeterFilter implements MeterFilter {
}
private long[] convertSla(Meter.Type meterType, ServiceLevelAgreementBoundary[] sla) {
long[] converted = Arrays.stream((sla != null) ? sla : EMPTY_SLA)
if (sla == null) {
return null;
}
long[] converted = Arrays.stream(sla)
.map((candidate) -> candidate.getValue(meterType))
.filter(Objects::nonNull).mapToLong(Long::longValue).toArray();
return (converted.length != 0) ? converted : null;