From 357b3d7a477114cc24aac898be7ef792bc0cae46 Mon Sep 17 00:00:00 2001
From: Arne Juul <arnej@yahoo-inc.com>
Date: Thu, 7 Dec 2017 09:49:35 +0000
Subject: use metrics::Producer instead of SimpleMetricsProducer

---
 configd/src/apps/sentinel/config-handler.cpp | 5 ++---
 configd/src/apps/sentinel/state-api.h        | 7 ++++---
 2 files changed, 6 insertions(+), 6 deletions(-)

(limited to 'configd/src')

diff --git a/configd/src/apps/sentinel/config-handler.cpp b/configd/src/apps/sentinel/config-handler.cpp
index 03ea1da9617..67216954f51 100644
--- a/configd/src/apps/sentinel/config-handler.cpp
+++ b/configd/src/apps/sentinel/config-handler.cpp
@@ -56,7 +56,8 @@ ConfigHandler::ConfigHandler()
       _outputConnections(),
       _boundPort(0),
       _commandSocket(listen(0)),
-      _startMetrics()
+      _startMetrics(),
+      _stateApi(_startMetrics.producer)
 {
     _startMetrics.startedTime = time(nullptr);
 }
@@ -399,8 +400,6 @@ void
 ConfigHandler::updateMetrics()
 {
     _startMetrics.maybeLog();
-    _stateApi.myMetrics.setMetrics(_startMetrics.producer.getMetrics(""));
-    _stateApi.myMetrics.setTotalMetrics(_startMetrics.producer.getTotalMetrics(""));
 }
 
 void
diff --git a/configd/src/apps/sentinel/state-api.h b/configd/src/apps/sentinel/state-api.h
index 879563b79a5..ca080a35865 100644
--- a/configd/src/apps/sentinel/state-api.h
+++ b/configd/src/apps/sentinel/state-api.h
@@ -3,9 +3,9 @@
 #pragma once
 
 #include <vespa/vespalib/net/state_api.h>
-#include <vespa/vespalib/net/simple_metrics_producer.h>
 #include <vespa/vespalib/net/simple_health_producer.h>
 #include <vespa/vespalib/net/simple_component_config_producer.h>
+#include <vespa/vespalib/metrics/simple_metrics.h>
 
 namespace config {
 namespace sentinel {
@@ -13,11 +13,12 @@ namespace sentinel {
 struct StateApi {
     vespalib::string host_and_port;
     vespalib::SimpleHealthProducer myHealth;
-    vespalib::SimpleMetricsProducer myMetrics;
     vespalib::SimpleComponentConfigProducer myComponents;
     vespalib::StateApi myStateApi;
 
-    StateApi() : myStateApi(myHealth, myMetrics, myComponents) {}
+    StateApi(vespalib::metrics::Producer &myMetrics)
+        : myStateApi(myHealth, myMetrics, myComponents)
+    {}
 
     vespalib::string get(const char *path) const;
     void bound(int port);
-- 
cgit v1.2.3