Use the Instant as a timestamp to make it clear what it is instead of just a generic long.

Make sure to use it correctly for the system metrics.

2 files changed, 4 insertions, 2 deletions

diff --git a/metrics-proxy/src/test/java/ai/vespa/metricsproxy/service/MetricsFetcherTest.java b/metrics-proxy/src/test/java/ai/vespa/metricsproxy/service/MetricsFetcherTest.java
index b30e871a543..b20126ea23f 100644
--- a/metrics-proxy/src/test/java/ai/vespa/metricsproxy/service/MetricsFetcherTest.java
+++ b/metrics-proxy/src/test/java/ai/vespa/metricsproxy/service/MetricsFetcherTest.java
@@ -7,6 +7,7 @@ import ai.vespa.metricsproxy.metric.Metrics;
 import org.junit.Test;
 
 import java.io.IOException;
+import java.time.Instant;
 
 import static ai.vespa.metricsproxy.metric.model.MetricId.toMetricId;
 import static org.junit.Assert.assertEquals;
@@ -41,7 +42,7 @@ public class MetricsFetcherTest {
         assertEquals(10, metrics.size());
         assertEquals(28, getMetric("query_hits.count", metrics).getValue());
         assertEquals(0.4667, getMetric("queries.rate", metrics).getValue());
-        assertEquals(1334134700L, metrics.getTimeStamp());
+        assertEquals(Instant.ofEpochSecond(1334134700L), metrics.getTimeStamp());
     }
 
     @Test
diff --git a/metrics-proxy/src/test/java/ai/vespa/metricsproxy/service/SystemPollerTest.java b/metrics-proxy/src/test/java/ai/vespa/metricsproxy/service/SystemPollerTest.java
index 76909e050d5..30145746e79 100644
--- a/metrics-proxy/src/test/java/ai/vespa/metricsproxy/service/SystemPollerTest.java
+++ b/metrics-proxy/src/test/java/ai/vespa/metricsproxy/service/SystemPollerTest.java
@@ -10,6 +10,7 @@ import org.junit.Test;
 import java.io.BufferedReader;
 import java.io.IOException;
 import java.io.StringReader;
+import java.time.Instant;
 import java.util.ArrayList;
 import java.util.HashMap;
 import java.util.List;
@@ -188,7 +189,7 @@ public class SystemPollerTest {
         List<VespaService> services = List.of(s1);
         lastCpuJiffiesMetrics.put(s1, SystemPoller.getPidJiffies(new BufferedReader(new StringReader(perProcStats[0]))));
 
-        SystemPoller.JiffiesAndCpus next = SystemPoller.updateMetrics(prev, 1,
+        SystemPoller.JiffiesAndCpus next = SystemPoller.updateMetrics(prev, Instant.ofEpochSecond(1),
                 new SystemPoller.GetJiffies() {
                     @Override
                     public SystemPoller.JiffiesAndCpus getTotalSystemJiffies() {