Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Trailing comma is no longer present in Micrometer Prometheus #1241

Merged
merged 1 commit into from
May 25, 2023
Merged

Trailing comma is no longer present in Micrometer Prometheus #1241

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
10 changes: 1 addition & 9 deletions ...ter-prometheus/src/test/java/io/quarkus/ts/micrometer/prometheus/HttpServerMetricsIT.java
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,6 @@
package io.quarkus.ts.micrometer.prometheus;

import static io.restassured.RestAssured.given;
import static io.restassured.RestAssured.when;
import static org.awaitility.Awaitility.await;
import static org.hamcrest.CoreMatchers.is;
import static org.junit.jupiter.api.Assertions.assertFalse;
Expand All @@ -23,14 +22,7 @@ public class HttpServerMetricsIT {

private static final int ASSERT_METRICS_TIMEOUT_MINUTES = 1;
private static final List<String> HTTP_SERVER_REQUESTS_METRICS_SUFFIX = Arrays.asList("count", "sum", "max");

/*
* In versions before 2.16 metrics have format '{a,b,}' (with trailing comma)
* Starting from 2.16 the format changed to '{a,b}'
* See https://github.com/quarkusio/quarkus/issues/30343 for details
* TODO: add '}' to the end, when this stabilizes
*/
private static final String HTTP_SERVER_REQUESTS_METRICS_FORMAT = "http_server_requests_seconds_%s{method=\"GET\",outcome=\"SUCCESS\",status=\"200\",uri=\"%s\"";
private static final String HTTP_SERVER_REQUESTS_METRICS_FORMAT = "http_server_requests_seconds_%s{method=\"GET\",outcome=\"SUCCESS\",status=\"200\",uri=\"%s\"}";
private static final String PING_PONG_ENDPOINT = "/without-metrics-pingpong";

@QuarkusApplication
Expand Down