Revert "Merge pull request #29152 from vespa-engine/revert-29137-olaa/infrastructure-metric-sets-prometheus"

This reverts commit 8c7f1f8febf12a5b8468819ba9ff1ede014143d1, reversing
changes made to b74e8dc450f9b14e53225775692ddd35e6ee0d5b.

3 files changed, 70 insertions, 9 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 807e58918da..160d6452473 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,6 +7,8 @@ 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;
@@ -146,21 +148,22 @@ public class MetricsPacketsHandlerTest extends StateHandlerTestBase {
     }
 
     @Test
-    public void prometheus_metrics() {
+    public void prometheus_metrics() throws Exception {
         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 = """
-                # 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
-                """;
+        var expectedResponse = readFile("prometheus-unfiltered");
+        assertEquals(expectedResponse, response);
+
+        response = requestAsString("http://localhost/metrics-packets?format=prometheus&metric-set=infrastructure");
+        expectedResponse = readFile("prometheus-filtered");
         assertEquals(expectedResponse, response);
     }
 
@@ -262,4 +265,8 @@ 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"));
+    }
+
 }
diff --git a/container-core/src/test/resources/metrics-packets-handler-responses/prometheus-filtered.txt b/container-core/src/test/resources/metrics-packets-handler-responses/prometheus-filtered.txt
new file mode 100644
index 00000000000..73b825b2712
--- /dev/null
+++ b/container-core/src/test/resources/metrics-packets-handler-responses/prometheus-filtered.txt
@@ -0,0 +1,12 @@
+# HELP configserver_requests_count
+# TYPE configserver_requests_count untyped
+configserver_requests_count{dim_1="value1",host="some-hostname",vespa_service="state-handler-test-base",} 120 0
+# HELP lockAttempt_lockedLoad_average
+# TYPE lockAttempt_lockedLoad_average untyped
+lockAttempt_lockedLoad_average{dim_1="value1",host="some-hostname",vespa_service="state-handler-test-base",} 500.0 0
+# HELP lockAttempt_lockedLoad_max
+# TYPE lockAttempt_lockedLoad_max untyped
+lockAttempt_lockedLoad_max{dim_1="value1",host="some-hostname",vespa_service="state-handler-test-base",} 500.0 0
+# HELP alive
+# TYPE alive untyped
+alive{vespaVersion="8.0.0",vespa_service="host_life",} 1 0
diff --git a/container-core/src/test/resources/metrics-packets-handler-responses/prometheus-unfiltered.txt b/container-core/src/test/resources/metrics-packets-handler-responses/prometheus-unfiltered.txt
new file mode 100644
index 00000000000..1fa14284bf5
--- /dev/null
+++ b/container-core/src/test/resources/metrics-packets-handler-responses/prometheus-unfiltered.txt
@@ -0,0 +1,42 @@
+# HELP gauge_metric_average
+# TYPE gauge_metric_average untyped
+gauge_metric_average{dim_1="value1",host="some-hostname",vespa_service="state-handler-test-base",} 0.2 0
+# HELP gauge_metric_last
+# TYPE gauge_metric_last untyped
+gauge_metric_last{dim_1="value1",host="some-hostname",vespa_service="state-handler-test-base",} 0.2 0
+# HELP gauge_metric_max
+# TYPE gauge_metric_max untyped
+gauge_metric_max{dim_1="value1",host="some-hostname",vespa_service="state-handler-test-base",} 0.2 0
+# HELP gauge_metric_min
+# TYPE gauge_metric_min untyped
+gauge_metric_min{dim_1="value1",host="some-hostname",vespa_service="state-handler-test-base",} 0.2 0
+# HELP gauge_metric_sum
+# TYPE gauge_metric_sum untyped
+gauge_metric_sum{dim_1="value1",host="some-hostname",vespa_service="state-handler-test-base",} 0.2 0
+# HELP gauge_metric_count
+# TYPE gauge_metric_count untyped
+gauge_metric_count{dim_1="value1",host="some-hostname",vespa_service="state-handler-test-base",} 1 0
+# HELP configserver_requests_count
+# TYPE configserver_requests_count untyped
+configserver_requests_count{dim_1="value1",host="some-hostname",vespa_service="state-handler-test-base",} 120 0
+# HELP lockAttempt_lockedLoad_average
+# TYPE lockAttempt_lockedLoad_average untyped
+lockAttempt_lockedLoad_average{dim_1="value1",host="some-hostname",vespa_service="state-handler-test-base",} 500.0 0
+# HELP lockAttempt_lockedLoad_last
+# TYPE lockAttempt_lockedLoad_last untyped
+lockAttempt_lockedLoad_last{dim_1="value1",host="some-hostname",vespa_service="state-handler-test-base",} 500.0 0
+# HELP lockAttempt_lockedLoad_max
+# TYPE lockAttempt_lockedLoad_max untyped
+lockAttempt_lockedLoad_max{dim_1="value1",host="some-hostname",vespa_service="state-handler-test-base",} 500.0 0
+# HELP lockAttempt_lockedLoad_min
+# TYPE lockAttempt_lockedLoad_min untyped
+lockAttempt_lockedLoad_min{dim_1="value1",host="some-hostname",vespa_service="state-handler-test-base",} 500.0 0
+# HELP lockAttempt_lockedLoad_sum
+# TYPE lockAttempt_lockedLoad_sum untyped
+lockAttempt_lockedLoad_sum{dim_1="value1",host="some-hostname",vespa_service="state-handler-test-base",} 500.0 0
+# HELP lockAttempt_lockedLoad_count
+# TYPE lockAttempt_lockedLoad_count untyped
+lockAttempt_lockedLoad_count{dim_1="value1",host="some-hostname",vespa_service="state-handler-test-base",} 1 0
+# HELP counter_metric_count
+# TYPE counter_metric_count untyped
+counter_metric_count{dim_1="value1",host="some-hostname",vespa_service="state-handler-test-base",} 5 0