diff options
Diffstat (limited to 'metrics')
-rw-r--r-- | metrics/src/vespa/metrics/metricmanager.cpp | 8 | ||||
-rw-r--r-- | metrics/src/vespa/metrics/metricmanager.h | 1 | ||||
-rw-r--r-- | metrics/src/vespa/metrics/state_api_adapter.cpp | 4 |
3 files changed, 4 insertions, 9 deletions
diff --git a/metrics/src/vespa/metrics/metricmanager.cpp b/metrics/src/vespa/metrics/metricmanager.cpp index db2e5affa03..40622b8c786 100644 --- a/metrics/src/vespa/metrics/metricmanager.cpp +++ b/metrics/src/vespa/metrics/metricmanager.cpp @@ -10,6 +10,7 @@ #include <vespa/vespalib/util/exceptions.h> #include <vespa/vespalib/stllike/asciistream.h> #include <vespa/vespalib/stllike/hashtable.hpp> +#include <vespa/fastos/timestamp.h> #include <sstream> #include <algorithm> @@ -24,13 +25,8 @@ MetricManager::ConsumerSpec::ConsumerSpec() = default; MetricManager::ConsumerSpec::~ConsumerSpec() = default; time_t -MetricManager::Timer::secondsSinceEpoch() { - return std::chrono::duration_cast<std::chrono::seconds>(std::chrono::system_clock::now().time_since_epoch()).count(); -} - -time_t MetricManager::Timer::getTime() const { - return secondsSinceEpoch(); + return fastos::time(); } void diff --git a/metrics/src/vespa/metrics/metricmanager.h b/metrics/src/vespa/metrics/metricmanager.h index 2edf39d67f1..f2b2926873f 100644 --- a/metrics/src/vespa/metrics/metricmanager.h +++ b/metrics/src/vespa/metrics/metricmanager.h @@ -70,7 +70,6 @@ public: struct Timer { virtual ~Timer() {} - static time_t secondsSinceEpoch(); virtual time_t getTime() const; virtual time_t getTimeInMilliSecs() const { return getTime() * 1000; } }; diff --git a/metrics/src/vespa/metrics/state_api_adapter.cpp b/metrics/src/vespa/metrics/state_api_adapter.cpp index 20421ebdbb2..f2e5108872e 100644 --- a/metrics/src/vespa/metrics/state_api_adapter.cpp +++ b/metrics/src/vespa/metrics/state_api_adapter.cpp @@ -3,7 +3,7 @@ #include "state_api_adapter.h" #include "metricmanager.h" #include <vespa/vespalib/stllike/asciistream.h> - +#include <vespa/fastos/timestamp.h> namespace metrics { @@ -30,7 +30,7 @@ StateApiAdapter::getTotalMetrics(const vespalib::string &consumer) _manager.updateMetrics(true); metrics::MetricLockGuard guard(_manager.getMetricLock()); _manager.checkMetricsAltered(guard); - time_t currentTime = MetricManager::Timer::secondsSinceEpoch(); + time_t currentTime = fastos::time(); auto generated = std::make_unique<metrics::MetricSnapshot>( "Total metrics from start until current time", 0, _manager.getTotalMetricSnapshot(guard).getMetrics(), |