Add queue size metric

3 files changed, 1 insertions, 18 deletions

diff --git a/metrics/src/vespa/metrics/countmetric.h b/metrics/src/vespa/metrics/countmetric.h
index 02a6827d1ce..1701071104e 100644
--- a/metrics/src/vespa/metrics/countmetric.h
+++ b/metrics/src/vespa/metrics/countmetric.h
@@ -105,7 +105,7 @@ public:
     void addToSnapshot(Metric&, std::vector<Metric::UP> &) const override;
 };
 
-typedef CountMetric<uint64_t, true> LongCountMetric;
+using LongCountMetric = CountMetric<uint64_t, true>;
 
 } // metrics
 
diff --git a/metrics/src/vespa/metrics/metricvalueset.h b/metrics/src/vespa/metrics/metricvalueset.h
index 2463990378e..c522876f5b1 100644
--- a/metrics/src/vespa/metrics/metricvalueset.h
+++ b/metrics/src/vespa/metrics/metricvalueset.h
@@ -76,12 +76,6 @@ public:
      */
     bool setValues(const ValueClass& values);
 
-    /**
-     * Retrieve and reset in a single operation, to minimize chance of
-     * alteration in the process.
-     */
-    ValueClass getValuesAndReset();
-
     void reset() {
         setFlag(RESET);
     }
@@ -105,9 +99,6 @@ public:
         _flags.store(_flags.load(std::memory_order_relaxed) & ~flags,
                      std::memory_order_relaxed);
     }
-    uint32_t getFlags() const {
-        return _flags.load(std::memory_order_relaxed);
-    }
 };
 
 } // metrics
diff --git a/metrics/src/vespa/metrics/metricvalueset.hpp b/metrics/src/vespa/metrics/metricvalueset.hpp
index 8c5b32afcf8..57b3e7f9901 100644
--- a/metrics/src/vespa/metrics/metricvalueset.hpp
+++ b/metrics/src/vespa/metrics/metricvalueset.hpp
@@ -70,14 +70,6 @@ MetricValueSet<ValueClass>::setValues(const ValueClass& values) {
 }
 
 template<typename ValueClass>
-ValueClass
-MetricValueSet<ValueClass>::getValuesAndReset() {
-    ValueClass result(getValues());
-    setFlag(RESET);
-    return result;
-}
-
-template<typename ValueClass>
 std::string
 MetricValueSet<ValueClass>::toString() {
     std::ostringstream ost;