Remove unused 'uptime' metric. Always add host-life in MetricsPacketsHandler

2 files changed, 5 insertions, 18 deletions

diff --git a/container-core/src/test/java/com/yahoo/container/jdisc/state/HostLifeGathererTest.java b/container-core/src/test/java/com/yahoo/container/jdisc/state/HostLifeGathererTest.java
index c394630cb40..28b4aff26fe 100644
--- a/container-core/src/test/java/com/yahoo/container/jdisc/state/HostLifeGathererTest.java
+++ b/container-core/src/test/java/com/yahoo/container/jdisc/state/HostLifeGathererTest.java
@@ -4,9 +4,8 @@ package com.yahoo.container.jdisc.state;
 import com.fasterxml.jackson.databind.JsonNode;
 import org.junit.jupiter.api.Test;
 
-import java.nio.file.Path;
-
 import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertTrue;
 
 
 /**
@@ -16,22 +15,10 @@ public class HostLifeGathererTest {
 
     @Test
     void host_is_alive() {
-        JsonNode packet = HostLifeGatherer.getHostLifePacket(new MockFileWrapper());
+        JsonNode packet = HostLifeGatherer.getHostLifePacket();
         JsonNode metrics = packet.get("metrics");
         assertEquals("host_life", packet.get("application").textValue());
-        assertEquals(0, packet.get("status_code").intValue());
-        assertEquals("OK", packet.get("status_msg").textValue());
-
-        assertEquals(123L, metrics.get("uptime").longValue());
         assertEquals(1, metrics.get("alive").intValue());
-
-    }
-
-    static class MockFileWrapper extends FileWrapper {
-
-        @Override
-        long getFileAgeInSeconds(Path path) {
-            return 123;
-        }
+        assertTrue(packet.get("dimensions").hasNonNull("vespaVersion"));
     }
 }
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 1aa4ee93ab6..ead26a0a898 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
@@ -203,7 +203,7 @@ public class MetricsPacketsHandlerTest extends StateHandlerTestBase {
                   }
                 }
                 """;
-        assertEquals(expectedResponse, response);
+        assertTrue(response.startsWith(expectedResponse));
 
         // With filtering
         response = requestAsString("http://localhost/metrics-packets?metric-set=infrastructure");
@@ -222,7 +222,7 @@ public class MetricsPacketsHandlerTest extends StateHandlerTestBase {
                   }
                 }
                 """;
-        assertEquals(expectedResponse, response);
+        assertTrue(response.startsWith(expectedResponse));
     }
     
     private List<JsonNode> incrementTimeAndGetJsonPackets() throws Exception {