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

Sort names alphabetically in metrics list response

Browse Source 
Closes gh-19934
This commit is contained in:
Andy Wilkinson
2020-01-30 14:05:53 +00:00
parent 28442b5ca5
commit 6db5ca97d3
2 changed files with 14 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
spring-boot-project/spring-boot-actuator/src/main/java/org/springframework/boot/actuate/metrics/MetricsEndpoint.java
View File

@@ -1,5 +1,5 @@
/*
* Copyright 2012-2019 the original author or authors.
* Copyright 2012-2020 the original author or authors.
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
@@ -21,10 +21,10 @@ import java.util.Collections;
import java.util.HashMap;
import java.util.HashSet;
import java.util.LinkedHashMap;
import java.util.LinkedHashSet;
import java.util.List;
import java.util.Map;
import java.util.Set;
import java.util.TreeSet;
import java.util.function.BiFunction;
import java.util.stream.Collectors;
@@ -58,7 +58,7 @@ public class MetricsEndpoint {
@ReadOperation
public ListNamesResponse listNames() {
Set<String> names = new LinkedHashSet<>();
Set<String> names = new TreeSet<>();
collectNames(names, this.registry);
return new ListNamesResponse(names);
}

17
spring-boot-project/spring-boot-actuator/src/test/java/org/springframework/boot/actuate/metrics/MetricsEndpointTests.java
View File

@@ -1,5 +1,5 @@
/*
* Copyright 2012-2019 the original author or authors.
* Copyright 2012-2020 the original author or authors.
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
@@ -54,11 +54,16 @@ class MetricsEndpointTests {
@Test
void listNamesProducesListOfUniqueMeterNames() {
this.registry.counter("com.example.foo");
this.registry.counter("com.example.bar");
this.registry.counter("com.example.foo");
this.registry.counter("com.example.alpha");
this.registry.counter("com.example.charlie");
this.registry.counter("com.example.bravo");
this.registry.counter("com.example.delta");
this.registry.counter("com.example.delta");
this.registry.counter("com.example.echo");
this.registry.counter("com.example.bravo");
MetricsEndpoint.ListNamesResponse result = this.endpoint.listNames();
assertThat(result.getNames()).containsOnlyOnce("com.example.foo", "com.example.bar");
assertThat(result.getNames()).containsExactly("com.example.alpha", "com.example.bravo", "com.example.charlie",
"com.example.delta", "com.example.echo");
}
@Test
@@ -71,7 +76,7 @@ class MetricsEndpointTests {
reg1.counter("counter1").increment();
reg2.counter("counter2").increment();
MetricsEndpoint endpoint = new MetricsEndpoint(composite);
assertThat(endpoint.listNames().getNames()).containsOnly("counter1", "counter2");
assertThat(endpoint.listNames().getNames()).containsExactly("counter1", "counter2");
}
@Test