Skip to content

Commit 8c40e23

Browse files
committed
name[] rather than names[] for series filtering.
Fix vertx implementation.
1 parent 7a77d9e commit 8c40e23

6 files changed

Lines changed: 6 additions & 12 deletions

File tree

simpleclient_servlet/src/main/java/io/prometheus/client/exporter/MetricsServlet.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -48,7 +48,7 @@ protected void doGet(final HttpServletRequest req, final HttpServletResponse res
4848
}
4949

5050
private Set<String> parse(HttpServletRequest req) {
51-
String[] includedParam = req.getParameterValues("names[]");
51+
String[] includedParam = req.getParameterValues("name[]");
5252
if (includedParam == null) {
5353
return Collections.emptySet();
5454
} else {

simpleclient_servlet/src/test/java/io/prometheus/client/exporter/MetricsServletTest.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -30,7 +30,7 @@ public void testWriterFiltersBasedOnParameter() throws IOException, ServletExcep
3030
Gauge.build("c", "a help").register(registry);
3131

3232
HttpServletRequest req = mock(HttpServletRequest.class);
33-
when(req.getParameterValues("names[]")).thenReturn(new String[]{"a", "b", "oneTheDoesntExist", ""});
33+
when(req.getParameterValues("name[]")).thenReturn(new String[]{"a", "b", "oneTheDoesntExist", ""});
3434
HttpServletResponse resp = mock(HttpServletResponse.class);
3535
StringWriter stringWriter = new StringWriter();
3636
PrintWriter writer = new PrintWriter(stringWriter);

simpleclient_spring_boot/src/main/java/io/prometheus/client/spring/boot/PrometheusMvcEndpoint.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -28,7 +28,7 @@ public PrometheusMvcEndpoint(PrometheusEndpoint delegate) {
2828
)
2929
@ResponseBody
3030
public ResponseEntity value(
31-
@RequestParam(value = "names[]", required = false) Set<String> name) {
31+
@RequestParam(value = "name[]", required = false) Set<String> name) {
3232
if (!getDelegate().isEnabled()) {
3333
// Shouldn't happen - MVC endpoint shouldn't be registered when delegate's
3434
// disabled

simpleclient_spring_boot/src/test/java/io/prometheus/client/spring/boot/PrometheusEndpointTest.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -47,7 +47,7 @@ public void testMetricsExportedThroughPrometheusEndpoint() {
4747
// when:
4848
promCounter.labels("val1", "val2").inc(3);
4949
filteredCounter.labels("val1", "val2").inc(6);
50-
ResponseEntity<String> metricsResponse = template.getForEntity(getBaseUrl() + "/prometheus?names[]=foo_bar", String.class);
50+
ResponseEntity<String> metricsResponse = template.getForEntity(getBaseUrl() + "/prometheus?name[]=foo_bar", String.class);
5151

5252
// then:
5353
assertEquals(HttpStatus.OK, metricsResponse.getStatusCode());

simpleclient_vertx/src/main/java/io/prometheus/client/vertx/MetricsHandler.java

Lines changed: 1 addition & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,6 @@
1010
import java.io.IOException;
1111
import java.io.Writer;
1212
import java.util.Arrays;
13-
import java.util.Collections;
1413
import java.util.HashSet;
1514
import java.util.Set;
1615

@@ -85,11 +84,6 @@ public void handle(RoutingContext ctx) {
8584
}
8685

8786
private Set<String> parse(HttpServerRequest request) {
88-
String includedParam = request.getParam("names[]");
89-
if (includedParam == null) {
90-
return Collections.emptySet();
91-
} else {
92-
return new HashSet<String>(Arrays.asList(includedParam.split(",")));
93-
}
87+
return new HashSet(request.params().getAll("name[]"));
9488
}
9589
}

simpleclient_vertx/src/test/java/io/prometheus/client/exporter/MetricsHandlerTest.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -57,7 +57,7 @@ public void metricsRequest_shouldReturnMetrics() throws IOException {
5757

5858
@Test
5959
public void metricsRequest_shouldAllowFilteringMetrics() throws IOException {
60-
String out = makeRequest("/metrics?names[]=b,c");
60+
String out = makeRequest("/metrics?name[]=b&name[]=c");
6161

6262
assertThat(out).doesNotContain("a 0.0");
6363
assertThat(out).contains("b 0.0");

0 commit comments

Comments
 (0)