1 files changed, 4 insertions, 4 deletions
diff --git a/container-core/src/main/java/com/yahoo/container/jdisc/state/MetricsPacketsHandler.java b/container-core/src/main/java/com/yahoo/container/jdisc/state/MetricsPacketsHandler.java
index 13584082ab8..b94fadec213 100644
--- a/container-core/src/main/java/com/yahoo/container/jdisc/state/MetricsPacketsHandler.java
+++ b/container-core/src/main/java/com/yahoo/container/jdisc/state/MetricsPacketsHandler.java
@@ -28,7 +28,6 @@ import java.util.Collections;
 import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
-import java.util.Optional;
 import java.util.Set;
 import java.util.concurrent.TimeUnit;
 import java.util.stream.Collectors;
@@ -108,7 +107,7 @@ public class MetricsPacketsHandler extends AbstractRequestHandler {
                 return getMetricsArray(metricSetId);
             }
             if ("prometheus".equals(format)) {
-                return buildPrometheusOutput();
+                return buildPrometheusOutput(metricSetId);
             }
 
             String output = getAllMetricsPackets(metricSetId) + "\n";
@@ -133,8 +132,9 @@ public class MetricsPacketsHandler extends AbstractRequestHandler {
     /**
      * Returns metrics in Prometheus format
      */
-    private byte[] buildPrometheusOutput() throws IOException {
-        return PrometheusHelper.buildPrometheusOutput(getSnapshot(), applicationName, timer.currentTimeMillis());
+    private byte[] buildPrometheusOutput(String metricSetId) throws IOException {
+        var metrics = getPacketsForSnapshot(getSnapshot(), metricSetId, applicationName, timer.currentTimeMillis());
+        return PrometheusHelper.buildPrometheusOutput(metrics, timer.currentTimeMillis());
     }
 
     private static String jsonToString(JsonNode jsonObject) throws JsonProcessingException {