diff options
Diffstat (limited to 'metrics/src/vespa/metrics/state_api_adapter.cpp')
| -rw-r--r-- | metrics/src/vespa/metrics/state_api_adapter.cpp | 20 |
1 files changed, 8 insertions, 12 deletions
diff --git a/metrics/src/vespa/metrics/state_api_adapter.cpp b/metrics/src/vespa/metrics/state_api_adapter.cpp index ebb4fb4fd49..20421ebdbb2 100644 --- a/metrics/src/vespa/metrics/state_api_adapter.cpp +++ b/metrics/src/vespa/metrics/state_api_adapter.cpp @@ -15,8 +15,7 @@ StateApiAdapter::getMetrics(const vespalib::string &consumer) if (periods.empty()) { return ""; // no configuration yet } - const metrics::MetricSnapshot &snapshot( - _manager.getMetricSnapshot(guard, periods[0])); + const metrics::MetricSnapshot &snapshot(_manager.getMetricSnapshot(guard, periods[0])); vespalib::asciistream json; vespalib::JsonStream stream(json); metrics::JsonWriter metricJsonWriter(stream); @@ -31,16 +30,13 @@ StateApiAdapter::getTotalMetrics(const vespalib::string &consumer) _manager.updateMetrics(true); metrics::MetricLockGuard guard(_manager.getMetricLock()); _manager.checkMetricsAltered(guard); - time_t currentTime = time(0); - std::unique_ptr<metrics::MetricSnapshot> generated( - new metrics::MetricSnapshot( - "Total metrics from start until current time", 0, - _manager.getTotalMetricSnapshot(guard).getMetrics(), - true)); - _manager.getActiveMetrics(guard) - .addToSnapshot(*generated, false, currentTime); - generated->setFromTime( - _manager.getTotalMetricSnapshot(guard).getFromTime()); + time_t currentTime = MetricManager::Timer::secondsSinceEpoch(); + auto generated = std::make_unique<metrics::MetricSnapshot>( + "Total metrics from start until current time", 0, + _manager.getTotalMetricSnapshot(guard).getMetrics(), + true); + _manager.getActiveMetrics(guard).addToSnapshot(*generated, false, currentTime); + generated->setFromTime(_manager.getTotalMetricSnapshot(guard).getFromTime()); const metrics::MetricSnapshot &snapshot = *generated; vespalib::asciistream json; vespalib::JsonStream stream(json); |