diff options
| author | Henning Baldersheim <balder@yahoo-inc.com> | 2019-12-10 00:54:16 +0000 |
|---|---|---|
| committer | Henning Baldersheim <balder@yahoo-inc.com> | 2019-12-16 23:48:46 +0000 |
| commit | c2ea426c8d955ff40873db1e7d06c482ca662e75 (patch) | |
| tree | 3f1ef7843ca4c984048a4d1cf7ef333b07d9ffb5 /metrics | |
| parent | 6a807615c7ee6364362a9a14d725165e948c5585 (diff) | |
Drop timestamp.h
Diffstat (limited to 'metrics')
| -rw-r--r-- | metrics/src/vespa/metrics/metricmanager.cpp | 4 | ||||
| -rw-r--r-- | metrics/src/vespa/metrics/metricsnapshot.h | 1 | ||||
| -rw-r--r-- | metrics/src/vespa/metrics/state_api_adapter.cpp | 3 |
3 files changed, 4 insertions, 4 deletions
diff --git a/metrics/src/vespa/metrics/metricmanager.cpp b/metrics/src/vespa/metrics/metricmanager.cpp index 74842801909..41c8b52d731 100644 --- a/metrics/src/vespa/metrics/metricmanager.cpp +++ b/metrics/src/vespa/metrics/metricmanager.cpp @@ -8,9 +8,9 @@ #include <vespa/vespalib/text/stringtokenizer.h> #include <vespa/vespalib/util/stringfmt.h> #include <vespa/vespalib/util/exceptions.h> +#include <vespa/vespalib/util/time.h> #include <vespa/vespalib/stllike/asciistream.h> #include <vespa/vespalib/stllike/hashtable.hpp> -#include <vespa/fastos/timestamp.h> #include <sstream> #include <algorithm> @@ -26,7 +26,7 @@ MetricManager::ConsumerSpec::~ConsumerSpec() = default; time_t MetricManager::Timer::getTime() const { - return fastos::time(); + return vespalib::to_s(vespalib::steady_clock::now().time_since_epoch()); } void diff --git a/metrics/src/vespa/metrics/metricsnapshot.h b/metrics/src/vespa/metrics/metricsnapshot.h index b00c001505c..7c9fe492ac1 100644 --- a/metrics/src/vespa/metrics/metricsnapshot.h +++ b/metrics/src/vespa/metrics/metricsnapshot.h @@ -11,6 +11,7 @@ #include <map> #include <vespa/metrics/metric.h> #include <vespa/metrics/metricset.h> +#include <vespa/vespalib/util/time.h> namespace metrics { diff --git a/metrics/src/vespa/metrics/state_api_adapter.cpp b/metrics/src/vespa/metrics/state_api_adapter.cpp index f2e5108872e..6abc4336446 100644 --- a/metrics/src/vespa/metrics/state_api_adapter.cpp +++ b/metrics/src/vespa/metrics/state_api_adapter.cpp @@ -3,7 +3,6 @@ #include "state_api_adapter.h" #include "metricmanager.h" #include <vespa/vespalib/stllike/asciistream.h> -#include <vespa/fastos/timestamp.h> namespace metrics { @@ -30,7 +29,7 @@ StateApiAdapter::getTotalMetrics(const vespalib::string &consumer) _manager.updateMetrics(true); metrics::MetricLockGuard guard(_manager.getMetricLock()); _manager.checkMetricsAltered(guard); - time_t currentTime = fastos::time(); + time_t currentTime = vespalib::to_s(vespalib::steady_clock::now().time_since_epoch()); auto generated = std::make_unique<metrics::MetricSnapshot>( "Total metrics from start until current time", 0, _manager.getTotalMetricSnapshot(guard).getMetrics(), |