From 7000b83c6fe563d02bf536603eeb3800957ba48d Mon Sep 17 00:00:00 2001 From: Georgii Troitskii Date: Thu, 25 May 2023 10:55:43 +0200 Subject: [PATCH] Trailing comma is no longer present in Micrometer Prometheus See https://github.com/quarkusio/quarkus/issues/30343 for details --- .../ts/micrometer/prometheus/HttpServerMetricsIT.java | 10 +--------- 1 file changed, 1 insertion(+), 9 deletions(-) diff --git a/monitoring/micrometer-prometheus/src/test/java/io/quarkus/ts/micrometer/prometheus/HttpServerMetricsIT.java b/monitoring/micrometer-prometheus/src/test/java/io/quarkus/ts/micrometer/prometheus/HttpServerMetricsIT.java index bb703fa9a..6e7964341 100644 --- a/monitoring/micrometer-prometheus/src/test/java/io/quarkus/ts/micrometer/prometheus/HttpServerMetricsIT.java +++ b/monitoring/micrometer-prometheus/src/test/java/io/quarkus/ts/micrometer/prometheus/HttpServerMetricsIT.java @@ -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; @@ -23,14 +22,7 @@ public class HttpServerMetricsIT { private static final int ASSERT_METRICS_TIMEOUT_MINUTES = 1; private static final List 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