From c7721d45b452e3f29f24373c57e0b17507ae16d3 Mon Sep 17 00:00:00 2001
From: Henning Baldersheim <balder@yahoo-inc.com>
Date: Thu, 26 Nov 2020 11:15:00 +0000
Subject: Remove loadmetrics indirection.

---
 .../src/tests/proton/persistenceengine/persistenceengine_test.cpp    | 1 -
 searchcore/src/tests/proton/summaryengine/summaryengine.cpp          | 1 -
 searchcore/src/vespa/searchcore/proton/metrics/attribute_metrics.h   | 2 +-
 .../src/vespa/searchcore/proton/metrics/content_proton_metrics.h     | 1 -
 .../src/vespa/searchcore/proton/metrics/resource_usage_metrics.h     | 3 ++-
 .../src/vespa/searchcore/proton/metrics/trans_log_server_metrics.h   | 5 +++--
 .../vespa/searchcore/proton/persistenceengine/persistenceengine.cpp  | 1 -
 7 files changed, 6 insertions(+), 8 deletions(-)

(limited to 'searchcore')

diff --git a/searchcore/src/tests/proton/persistenceengine/persistenceengine_test.cpp b/searchcore/src/tests/proton/persistenceengine/persistenceengine_test.cpp
index 95a41a255ce..17859c74feb 100644
--- a/searchcore/src/tests/proton/persistenceengine/persistenceengine_test.cpp
+++ b/searchcore/src/tests/proton/persistenceengine/persistenceengine_test.cpp
@@ -14,7 +14,6 @@
 #include <vespa/searchcore/proton/persistenceengine/persistenceengine.h>
 #include <vespa/vdslib/distribution/distribution.h>
 #include <vespa/vdslib/state/clusterstate.h>
-#include <vespa/metrics/loadmetric.h>
 #include <vespa/vespalib/testkit/testapp.h>
 #include <algorithm>
 #include <set>
diff --git a/searchcore/src/tests/proton/summaryengine/summaryengine.cpp b/searchcore/src/tests/proton/summaryengine/summaryengine.cpp
index 7e5e3527b1d..f5f2cc7a2a5 100644
--- a/searchcore/src/tests/proton/summaryengine/summaryengine.cpp
+++ b/searchcore/src/tests/proton/summaryengine/summaryengine.cpp
@@ -13,7 +13,6 @@
 #include <vespa/fnet/frt/rpcrequest.h>
 
 #include <vespa/log/log.h>
-#include <vespa/metrics/metrics.h>
 
 LOG_SETUP("summaryengine_test");
 
diff --git a/searchcore/src/vespa/searchcore/proton/metrics/attribute_metrics.h b/searchcore/src/vespa/searchcore/proton/metrics/attribute_metrics.h
index 3f09489f804..f60f676c31c 100644
--- a/searchcore/src/vespa/searchcore/proton/metrics/attribute_metrics.h
+++ b/searchcore/src/vespa/searchcore/proton/metrics/attribute_metrics.h
@@ -2,8 +2,8 @@
 
 #pragma once
 
-#include <vespa/metrics/metrics.h>
 #include "memory_usage_metrics.h"
+#include <map>
 
 namespace proton {
 
diff --git a/searchcore/src/vespa/searchcore/proton/metrics/content_proton_metrics.h b/searchcore/src/vespa/searchcore/proton/metrics/content_proton_metrics.h
index ef66314f658..f99523db534 100644
--- a/searchcore/src/vespa/searchcore/proton/metrics/content_proton_metrics.h
+++ b/searchcore/src/vespa/searchcore/proton/metrics/content_proton_metrics.h
@@ -5,7 +5,6 @@
 #include "executor_metrics.h"
 #include "resource_usage_metrics.h"
 #include "trans_log_server_metrics.h"
-#include <vespa/metrics/metrics.h>
 
 namespace proton {
 
diff --git a/searchcore/src/vespa/searchcore/proton/metrics/resource_usage_metrics.h b/searchcore/src/vespa/searchcore/proton/metrics/resource_usage_metrics.h
index 8f7036ee832..1878cd4b7c9 100644
--- a/searchcore/src/vespa/searchcore/proton/metrics/resource_usage_metrics.h
+++ b/searchcore/src/vespa/searchcore/proton/metrics/resource_usage_metrics.h
@@ -2,7 +2,8 @@
 
 #pragma once
 
-#include <vespa/metrics/metrics.h>
+#include <vespa/metrics/metricset.h>
+#include <vespa/metrics/valuemetric.h>
 
 namespace proton {
 
diff --git a/searchcore/src/vespa/searchcore/proton/metrics/trans_log_server_metrics.h b/searchcore/src/vespa/searchcore/proton/metrics/trans_log_server_metrics.h
index 727b0c6304d..38b3abbbdcd 100644
--- a/searchcore/src/vespa/searchcore/proton/metrics/trans_log_server_metrics.h
+++ b/searchcore/src/vespa/searchcore/proton/metrics/trans_log_server_metrics.h
@@ -2,7 +2,8 @@
 
 #pragma once
 
-#include <vespa/metrics/metrics.h>
+#include <vespa/metrics/metricset.h>
+#include <vespa/metrics/valuemetric.h>
 #include <vespa/searchlib/transactionlog/domainconfig.h>
 
 namespace proton {
@@ -21,7 +22,7 @@ public:
 
         typedef std::unique_ptr<DomainMetrics> UP;
         DomainMetrics(metrics::MetricSet *parent, const vespalib::string &documentType);
-        ~DomainMetrics();
+        ~DomainMetrics() override;
         void update(const search::transactionlog::DomainInfo &stats);
     };
 
diff --git a/searchcore/src/vespa/searchcore/proton/persistenceengine/persistenceengine.cpp b/searchcore/src/vespa/searchcore/proton/persistenceengine/persistenceengine.cpp
index 02efd1ef11f..114024f60ff 100644
--- a/searchcore/src/vespa/searchcore/proton/persistenceengine/persistenceengine.cpp
+++ b/searchcore/src/vespa/searchcore/proton/persistenceengine/persistenceengine.cpp
@@ -3,7 +3,6 @@
 #include "persistenceengine.h"
 #include "ipersistenceengineowner.h"
 #include "transport_latch.h"
-#include <vespa/metrics/loadmetric.h>
 #include <vespa/vespalib/stllike/hash_set.h>
 #include <vespa/document/fieldvalue/document.h>
 #include <vespa/document/datatype/documenttype.h>
-- 
cgit v1.2.3