diff options
author | Jon Marius Venstad <jonmv@users.noreply.github.com> | 2023-10-30 11:02:26 +0100 |
---|---|---|
committer | GitHub <noreply@github.com> | 2023-10-30 11:02:26 +0100 |
commit | 8c7f1f8febf12a5b8468819ba9ff1ede014143d1 (patch) | |
tree | 992e5ae415cc0bdab039456f09ad2e31c83203fc /container-core/src/test/java/com/yahoo/container | |
parent | b74e8dc450f9b14e53225775692ddd35e6ee0d5b (diff) | |
parent | 2137e53839cf0b7649b26ff5c2ebf7c598f0daf3 (diff) |
Merge pull request #29152 from vespa-engine/revert-29137-olaa/infrastructure-metric-sets-prometheus
Revert "Allow filtering prometheus metrics" MERGEOK
Diffstat (limited to 'container-core/src/test/java/com/yahoo/container')
-rw-r--r-- | container-core/src/test/java/com/yahoo/container/jdisc/state/MetricsPacketsHandlerTest.java | 25 |
1 files changed, 9 insertions, 16 deletions
diff --git a/container-core/src/test/java/com/yahoo/container/jdisc/state/MetricsPacketsHandlerTest.java b/container-core/src/test/java/com/yahoo/container/jdisc/state/MetricsPacketsHandlerTest.java index 160d6452473..807e58918da 100644 --- a/container-core/src/test/java/com/yahoo/container/jdisc/state/MetricsPacketsHandlerTest.java +++ b/container-core/src/test/java/com/yahoo/container/jdisc/state/MetricsPacketsHandlerTest.java @@ -7,8 +7,6 @@ import com.yahoo.container.jdisc.RequestHandlerTestDriver; import org.junit.jupiter.api.BeforeEach; import org.junit.jupiter.api.Test; -import java.nio.file.Files; -import java.nio.file.Path; import java.util.ArrayList; import java.util.List; import java.util.Map; @@ -148,22 +146,21 @@ public class MetricsPacketsHandlerTest extends StateHandlerTestBase { } @Test - public void prometheus_metrics() throws Exception { + public void prometheus_metrics() { var context = StateMetricContext.newInstance(Map.of("dim-1", "value1")); var snapshot = new MetricSnapshot(); snapshot.set(context, "gauge.metric", 0.2); snapshot.add(context, "counter.metric", 5); - snapshot.add(context, "configserver.requests", 120); - // Infrastructure set only contains max and average - snapshot.set(context, "lockAttempt.lockedLoad", 500); snapshotProvider.setSnapshot(snapshot); - var response = requestAsString("http://localhost/metrics-packets?format=prometheus"); - var expectedResponse = readFile("prometheus-unfiltered"); - assertEquals(expectedResponse, response); - - response = requestAsString("http://localhost/metrics-packets?format=prometheus&metric-set=infrastructure"); - expectedResponse = readFile("prometheus-filtered"); + var expectedResponse = """ + # HELP gauge_metric_last\s + # TYPE gauge_metric_last untyped + gauge_metric_last{dim_1="value1",vespa_service="state-handler-test-base",} 0.2 0 + # HELP counter_metric_count\s + # TYPE counter_metric_count untyped + counter_metric_count{dim_1="value1",vespa_service="state-handler-test-base",} 5 0 + """; assertEquals(expectedResponse, response); } @@ -265,8 +262,4 @@ public class MetricsPacketsHandlerTest extends StateHandlerTestBase { snapshotProvider.setSnapshot(snapshot); } - private String readFile(String fileName) throws Exception { - return Files.readString(Path.of("src/test/resources/metrics-packets-handler-responses/" + fileName + ".txt")); - } - } |