Revert "Balder/enforce system time for snapshot"

2 files changed, 11 insertions, 8 deletions

diff --git a/metrics/src/tests/metricmanagertest.cpp b/metrics/src/tests/metricmanagertest.cpp
index e398e252a36..6d6f21ea7b0 100644
--- a/metrics/src/tests/metricmanagertest.cpp
+++ b/metrics/src/tests/metricmanagertest.cpp
@@ -29,7 +29,7 @@ struct MetricManagerTest : public ::testing::Test {
     // MetricManager that aren't accessible to "freestanding" fixtures. So we
     // get the test to do the necessary poking and prodding for us instead.
     void takeSnapshots(MetricManager& mm, time_t timeToProcess) {
-        mm.takeSnapshots(mm.getMetricLock(), system_time(vespalib::from_s(timeToProcess)));
+        mm.takeSnapshots(mm.getMetricLock(), timeToProcess);
     }
 };
 
@@ -547,7 +547,7 @@ TEST_F(MetricManagerTest, test_snapshots)
     ASSERT_VALUES(mm,  0 * 60, "6,5,5,2,8,11,2,2,10,3,13");
 
     // Test that reset works
-    mm.reset(system_time(1000s));
+    mm.reset(1000);
     ASSERT_VALUES(mm,      -1, "0,0,0,0,0,0,0,0,0,0,0");
     ASSERT_VALUES(mm,  5 * 60, "0,0,0,0,0,0,0,0,0,0,0");
     ASSERT_VALUES(mm, 60 * 60, "0,0,0,0,0,0,0,0,0,0,0");
@@ -902,7 +902,7 @@ TEST_F(MetricManagerTest, test_text_output)
                       "consumer[1].tags[1]\n"
                       "consumer[1].tags[0] snaptest\n"));
     std::string expected(
-        "snapshot \"Active metrics showing updates since last snapshot\" from 1970-01-01 00:16:40.000 UTC to 1970-01-01 00:00:00.000 UTC period 0\n"
+        "snapshot \"Active metrics showing updates since last snapshot\" from 1000 to 0 period 0\n"
         "temp.val6 average=2 last=2 min=2 max=2 count=1 total=2\n"
         "temp.sub.val1 average=4 last=4 min=4 max=4 count=1 total=4\n"
         "temp.sub.valsum average=4 last=4 min=4 max=4 count=1 total=4\n"
@@ -938,9 +938,11 @@ TEST_F(MetricManagerTest, text_output_supports_dimensions)
     fixture.takeSnapshotsOnce();
     std::string actual = fixture.renderLastSnapshotAsText("outer.*temp.*val");
     std::string expected(
-            "snapshot \"5 minute\" from 1970-01-01 00:16:40.000 UTC to 1970-01-01 00:21:40.000 UTC period 300\n"
-            "outer{fancy:stuff}.temp{bar:hyperbar,foo:megafoo}.val1 average=2 last=2 min=2 max=2 count=1 total=2\n"
-            "outer{fancy:stuff}.temp{bar:hyperbar,foo:megafoo}.val2{baz:superbaz} count=1");
+            "snapshot \"5 minute\" from 1000 to 1300 period 300\n"
+            "outer{fancy:stuff}.temp{bar:hyperbar,foo:megafoo}.val1 "
+                "average=2 last=2 min=2 max=2 count=1 total=2\n"
+            "outer{fancy:stuff}.temp{bar:hyperbar,foo:megafoo}.val2"
+                "{baz:superbaz} count=1");
     EXPECT_EQ(expected, actual);
 }
 
diff --git a/metrics/src/tests/summetrictest.cpp b/metrics/src/tests/summetrictest.cpp
index 8e988b65b96..09495ff038d 100644
--- a/metrics/src/tests/summetrictest.cpp
+++ b/metrics/src/tests/summetrictest.cpp
@@ -104,7 +104,8 @@ TEST(SumMetricTest, test_remove)
 TEST(SumMetricTest, test_start_value)
 {
     MetricSnapshot snapshot("active");
-    SumMetric<LongValueMetric> sum("foo", {}, "foodesc", &snapshot.getMetrics());
+    SumMetric<LongValueMetric> sum("foo", {}, "foodesc",
+                                   &snapshot.getMetrics());
     LongValueMetric start("start", {}, "", 0);
     start.set(50);
     sum.setStartValue(start);
@@ -114,7 +115,7 @@ TEST(SumMetricTest, test_start_value)
 
     MetricSnapshot copy("copy");
     copy.recreateSnapshot(snapshot.getMetrics(), true);
-    snapshot.addToSnapshot(copy, system_time(100s));
+    snapshot.addToSnapshot(copy, 100);
 
     LongValueMetric value("value", {}, "", &snapshot.getMetrics());
     sum.addMetricToSum(value);