1 files changed, 2 insertions, 3 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 b8beeb5c1d1..83136754c85 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
@@ -104,8 +104,7 @@ public class MetricsPacketsHandler extends AbstractRequestHandler {
             var metricSetId = queryMap.get("metric-set");
             var format = queryMap.get("format");
 
-            // TODO: Remove "array-formatted"
-            if ("array".equals(format) || queryMap.containsKey("array-formatted")) {
+            if ("array".equals(format)) {
                 return getMetricsArray(metricSetId);
             }
             if ("prometheus".equals(format)) {
@@ -126,7 +125,6 @@ public class MetricsPacketsHandler extends AbstractRequestHandler {
         ArrayNode jsonArray = jsonMapper.createArrayNode();
         getPacketsForSnapshot(getSnapshot(), metricSetId, applicationName, timer.currentTimeMillis())
                 .forEach(jsonArray::add);
-        MetricGatherer.getAdditionalMetrics().forEach(jsonArray::add);
         root.set("metrics", jsonArray);
         return jsonToString(root)
                 .getBytes(StandardCharsets.UTF_8);
@@ -198,6 +196,7 @@ public class MetricsPacketsHandler extends AbstractRequestHandler {
                 packets.add(packet);
             }
         }
+        packets.add(HostLifeGatherer.getHostLifePacket());
         return packets;
     }