diff options
| author | Henning Baldersheim <balder@yahoo-inc.com> | 2019-12-19 14:27:19 +0000 |
|---|---|---|
| committer | Henning Baldersheim <balder@yahoo-inc.com> | 2019-12-19 14:27:19 +0000 |
| commit | d043d0587d15ddeb014cd95f7392294241fa7f05 (patch) | |
| tree | 5a54cc7a409155663df9b6f7590dae47df0dfb36 /metrics | |
| parent | c2ea426c8d955ff40873db1e7d06c482ca662e75 (diff) | |
Use vespalib::count_s
Diffstat (limited to 'metrics')
| -rw-r--r-- | metrics/src/vespa/metrics/metricmanager.cpp | 6 | ||||
| -rw-r--r-- | metrics/src/vespa/metrics/state_api_adapter.cpp | 2 |
2 files changed, 4 insertions, 4 deletions
diff --git a/metrics/src/vespa/metrics/metricmanager.cpp b/metrics/src/vespa/metrics/metricmanager.cpp index 41c8b52d731..fd1c0f10d27 100644 --- a/metrics/src/vespa/metrics/metricmanager.cpp +++ b/metrics/src/vespa/metrics/metricmanager.cpp @@ -26,7 +26,7 @@ MetricManager::ConsumerSpec::~ConsumerSpec() = default; time_t MetricManager::Timer::getTime() const { - return vespalib::to_s(vespalib::steady_clock::now().time_since_epoch()); + return vespalib::count_s(vespalib::steady_clock::now().time_since_epoch()); } void @@ -70,9 +70,9 @@ MetricManager::MetricManager(std::unique_ptr<Timer> timer) _consumerConfig(), _logPeriod(5 * 60, 0), _snapshots(), - _totalMetrics(MetricSnapshot::SP(new MetricSnapshot( + _totalMetrics(std::make_shared<MetricSnapshot>( "Empty metrics before init", 0, _activeMetrics.getMetrics(), - false))), + false)), _timer(std::move(timer)), _lastProcessedTime(0), _forceEventLogging(false), diff --git a/metrics/src/vespa/metrics/state_api_adapter.cpp b/metrics/src/vespa/metrics/state_api_adapter.cpp index 6abc4336446..ec5705eed91 100644 --- a/metrics/src/vespa/metrics/state_api_adapter.cpp +++ b/metrics/src/vespa/metrics/state_api_adapter.cpp @@ -29,7 +29,7 @@ StateApiAdapter::getTotalMetrics(const vespalib::string &consumer) _manager.updateMetrics(true); metrics::MetricLockGuard guard(_manager.getMetricLock()); _manager.checkMetricsAltered(guard); - time_t currentTime = vespalib::to_s(vespalib::steady_clock::now().time_since_epoch()); + time_t currentTime = vespalib::count_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(), |