Use common MemoryUsageMetrics in searchcore as well

3 files changed, 2 insertions, 46 deletions

diff --git a/searchcore/src/vespa/searchcore/proton/metrics/CMakeLists.txt b/searchcore/src/vespa/searchcore/proton/metrics/CMakeLists.txt
index 6077a6ddd87..8a1dd7ea101 100644
--- a/searchcore/src/vespa/searchcore/proton/metrics/CMakeLists.txt
+++ b/searchcore/src/vespa/searchcore/proton/metrics/CMakeLists.txt
@@ -12,7 +12,6 @@ vespa_add_library(searchcore_proton_metrics STATIC
     job_tracker.cpp
     job_tracked_flush_target.cpp
     job_tracked_flush_task.cpp
-    memory_usage_metrics.cpp
     metrics_engine.cpp
     resource_usage_metrics.cpp
     sessionmanager_metrics.cpp
diff --git a/searchcore/src/vespa/searchcore/proton/metrics/memory_usage_metrics.cpp b/searchcore/src/vespa/searchcore/proton/metrics/memory_usage_metrics.cpp
deleted file mode 100644
index 1f687d14969..00000000000
--- a/searchcore/src/vespa/searchcore/proton/metrics/memory_usage_metrics.cpp
+++ /dev/null
@@ -1,28 +0,0 @@
-// Copyright 2017 Yahoo Holdings. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root.
-
-#include "memory_usage_metrics.h"
-#include <vespa/vespalib/util/memoryusage.h>
-
-namespace proton {
-
-MemoryUsageMetrics::MemoryUsageMetrics(metrics::MetricSet *parent)
-    : metrics::MetricSet("memory_usage", {}, "The memory usage for a given component", parent),
-      _allocatedBytes("allocated_bytes", {}, "The number of allocated bytes", this),
-      _usedBytes("used_bytes", {}, "The number of used bytes (<= allocatedbytes)", this),
-      _deadBytes("dead_bytes", {}, "The number of dead bytes (<= usedbytes)", this),
-      _onHoldBytes("onhold_bytes", {}, "The number of bytes on hold", this)
-{
-}
-
-MemoryUsageMetrics::~MemoryUsageMetrics() {}
-
-void
-MemoryUsageMetrics::update(const vespalib::MemoryUsage &usage)
-{
-    _allocatedBytes.set(usage.allocatedBytes());
-    _usedBytes.set(usage.usedBytes());
-    _deadBytes.set(usage.deadBytes());
-    _onHoldBytes.set(usage.allocatedBytesOnHold());
-}
-
-}
diff --git a/searchcore/src/vespa/searchcore/proton/metrics/memory_usage_metrics.h b/searchcore/src/vespa/searchcore/proton/metrics/memory_usage_metrics.h
index 89177c3a359..e82e55848a5 100644
--- a/searchcore/src/vespa/searchcore/proton/metrics/memory_usage_metrics.h
+++ b/searchcore/src/vespa/searchcore/proton/metrics/memory_usage_metrics.h
@@ -2,27 +2,12 @@
 
 #pragma once
 
-#include <vespa/metrics/metrics.h>
+#include <vespa/metrics/common/memory_usage_metrics.h>
 
 namespace vespalib { class MemoryUsage; }
 
 namespace proton {
 
-/**
- * Metric set for memory usage metrics.
- */
-class MemoryUsageMetrics : public metrics::MetricSet
-{
-private:
-    metrics::LongValueMetric _allocatedBytes;
-    metrics::LongValueMetric _usedBytes;
-    metrics::LongValueMetric _deadBytes;
-    metrics::LongValueMetric _onHoldBytes;
-
-public:
-    MemoryUsageMetrics(metrics::MetricSet *parent);
-    ~MemoryUsageMetrics();
-    void update(const vespalib::MemoryUsage &usage);
-};
+using MemoryUsageMetrics = metrics::MemoryUsageMetrics;
 
 } // namespace proton