Merge pull request #11509 from vespa-engine/balder/use-system-time-in-trace

Balder/use system time in trace

2 files changed, 1 insertions, 3 deletions

diff --git a/fastos/src/vespa/fastos/timestamp.cpp b/fastos/src/vespa/fastos/timestamp.cpp
index deceaee4c65..977af69049c 100644
--- a/fastos/src/vespa/fastos/timestamp.cpp
+++ b/fastos/src/vespa/fastos/timestamp.cpp
@@ -76,7 +76,6 @@ ClockSteady::now()
 const SteadyTimeStamp SteadyTimeStamp::ZERO;
 const SteadyTimeStamp SteadyTimeStamp::FUTURE(TimeStamp::FUTURE);
 const UTCTimeStamp UTCTimeStamp::ZERO;
-const UTCTimeStamp UTCTimeStamp::FUTURE(TimeStamp::FUTURE);
 
 UTCTimeStamp
 SteadyTimeStamp::toUTC() const {
diff --git a/fastos/src/vespa/fastos/timestamp.h b/fastos/src/vespa/fastos/timestamp.h
index 79d6ef5eed6..f1a40272938 100644
--- a/fastos/src/vespa/fastos/timestamp.h
+++ b/fastos/src/vespa/fastos/timestamp.h
@@ -61,7 +61,6 @@ inline TimeStamp operator *(double a, TimeStamp b) { return TimeStamp(static_cas
 class UTCTimeStamp {
 public:
     static const UTCTimeStamp ZERO;
-    static const UTCTimeStamp FUTURE;
     UTCTimeStamp() : _timeStamp() { }
     explicit UTCTimeStamp(TimeStamp timeStamp) : _timeStamp(timeStamp) { }
 
@@ -92,7 +91,7 @@ public:
     friend bool operator >= (UTCTimeStamp a, UTCTimeStamp b) {
         return a._timeStamp >= b._timeStamp;
     }
-    TimeStamp timeSinceEpoch() const { return _timeStamp - ZERO._timeStamp; }
+    TimeStamp time_since_epoch() const { return _timeStamp - ZERO._timeStamp; }
     std::string toString() const { return _timeStamp.toString(); };
 private:
     TimeStamp _timeStamp;