Reduce code visibility and include only what you need from config library.

2 files changed, 8 insertions, 7 deletions

diff --git a/metrics/src/vespa/metrics/metricmanager.cpp b/metrics/src/vespa/metrics/metricmanager.cpp
index 6336672ac08..2fd09094f4c 100644
--- a/metrics/src/vespa/metrics/metricmanager.cpp
+++ b/metrics/src/vespa/metrics/metricmanager.cpp
@@ -11,8 +11,9 @@
 #include <vespa/vespalib/util/time.h>
 #include <vespa/vespalib/stllike/asciistream.h>
 #include <vespa/vespalib/stllike/hashtable.hpp>
+#include <vespa/config/subscription/configsubscriber.hpp>
+#include <set>
 #include <sstream>
-#include <algorithm>
 #include <cassert>
 
 #include <vespa/log/bufferedlogger.h>
@@ -160,8 +161,7 @@ MetricManager::isInitialized() const {
 }
 
 void
-MetricManager::init(const config::ConfigUri & uri, FastOS_ThreadPool& pool,
-                    bool startThread)
+MetricManager::init(const config::ConfigUri & uri, FastOS_ThreadPool& pool, bool startThread)
 {
     if (isInitialized()) {
         throw vespalib::IllegalStateException(
@@ -452,7 +452,7 @@ MetricManager::createSnapshotPeriods(const Config& config)
 void
 MetricManager::configure(const MetricLockGuard & , std::unique_ptr<Config> config)
 {
-    assert(config.get() != 0);
+    assert(config);
     if (LOG_WOULD_LOG(debug)) {
         std::ostringstream ost;
         config::OstreamConfigWriter w(ost);
diff --git a/metrics/src/vespa/metrics/metricmanager.h b/metrics/src/vespa/metrics/metricmanager.h
index 300604d1f9f..0efbe1b091a 100644
--- a/metrics/src/vespa/metrics/metricmanager.h
+++ b/metrics/src/vespa/metrics/metricmanager.h
@@ -43,7 +43,6 @@
  */
 #pragma once
 
-#include <vespa/metrics/config-metricsmanager.h>
 #include "metricset.h"
 #include "metricsnapshot.h"
 #include "memoryconsumption.h"
@@ -52,7 +51,9 @@
 #include <vespa/vespalib/stllike/hash_set.h>
 #include <vespa/vespalib/util/document_runnable.h>
 #include <vespa/vespalib/util/jsonwriter.h>
-#include <vespa/config/config.h>
+#include <vespa/metrics/config-metricsmanager.h>
+#include <vespa/config/subscription/configsubscriber.h>
+#include <vespa/config/subscription/configuri.h>
 #include <map>
 #include <list>
 
@@ -96,7 +97,7 @@ public:
 private:
     MetricSnapshot _activeMetrics;
     std::unique_ptr<config::ConfigSubscriber> _configSubscriber;
-    config::ConfigHandle<MetricsmanagerConfig>::UP _configHandle;
+    std::unique_ptr<config::ConfigHandle<MetricsmanagerConfig>> _configHandle;
     std::unique_ptr<MetricsmanagerConfig> _config;
     std::map<Metric::String, ConsumerSpec::SP> _consumerConfig;
     std::list<UpdateHook*> _periodicUpdateHooks;