GC unused metrics

2 files changed, 1 insertions, 8 deletions

diff --git a/storage/src/vespa/storage/persistence/filestorage/filestormetrics.cpp b/storage/src/vespa/storage/persistence/filestorage/filestormetrics.cpp
index a10726c4f94..ee375b98a69 100644
--- a/storage/src/vespa/storage/persistence/filestorage/filestormetrics.cpp
+++ b/storage/src/vespa/storage/persistence/filestorage/filestormetrics.cpp
@@ -158,7 +158,6 @@ FileStorThreadMetrics::FileStorThreadMetrics(const std::string& name, const std:
       revert("revert", "Revert", this),
       createIterator("createiterator", {}, this),
       visit(this),
-      multiOp("multioperations", "The number of multioperations that have been created", this),
       createBuckets("createbuckets", "Number of buckets that has been created.", this),
       deleteBuckets("deletebuckets", "Number of buckets that has been deleted.", this),
       repairs("bucketverified", "Number of times buckets have been checked.", this),
@@ -181,9 +180,7 @@ FileStorThreadMetrics::FileStorThreadMetrics(const std::string& name, const std:
       applyBucketDiff("applybucketdiff", "Number of applybucketdiff commands that have been processed.", this),
       getBucketDiffReply("getbucketdiffreply", {}, "Number of getbucketdiff replies that have been processed.", this),
       applyBucketDiffReply("applybucketdiffreply", {}, "Number of applybucketdiff replies that have been processed.", this),
-      merge_handler_metrics(this),
-      batchingSize("batchingsize", {}, "Number of operations batched per bucket (only counts "
-                   "batches of size > 1)", this)
+      merge_handler_metrics(this)
 { }
 
 FileStorThreadMetrics::~FileStorThreadMetrics() = default;
@@ -218,7 +215,6 @@ FileStorDiskMetrics::FileStorDiskMetrics(const std::string& name, const std::str
       waitingForLockHitRate("waitingforlockrate", {},
               "Amount of times a filestor thread has needed to wait for "
               "lock to take next message in queue.", this),
-      lockWaitTime("lockwaittime", {}, "Amount of time waiting used waiting for lock.", this),
       active_operations(this)
 {
     pendingMerges.unsetOnZeroValue();
diff --git a/storage/src/vespa/storage/persistence/filestorage/filestormetrics.h b/storage/src/vespa/storage/persistence/filestorage/filestormetrics.h
index c2b5d29bcdd..24a4d508945 100644
--- a/storage/src/vespa/storage/persistence/filestorage/filestormetrics.h
+++ b/storage/src/vespa/storage/persistence/filestorage/filestormetrics.h
@@ -101,7 +101,6 @@ struct FileStorThreadMetrics : public metrics::MetricSet
     OpWithNotFound revert;
     Op createIterator;
     Visitor visit;
-    Op multiOp;
     Op createBuckets;
     Op deleteBuckets;
     Op repairs;
@@ -120,7 +119,6 @@ struct FileStorThreadMetrics : public metrics::MetricSet
     metrics::LongCountMetric getBucketDiffReply;
     metrics::LongCountMetric applyBucketDiffReply;
     MergeHandlerMetrics merge_handler_metrics;
-    metrics::LongAverageMetric batchingSize;
 
     FileStorThreadMetrics(const std::string& name, const std::string& desc);
     ~FileStorThreadMetrics() override;
@@ -154,7 +152,6 @@ public:
     metrics::LongAverageMetric throttle_waiting_threads;
     metrics::LongAverageMetric throttle_active_tokens;
     metrics::DoubleAverageMetric waitingForLockHitRate;
-    metrics::DoubleAverageMetric lockWaitTime; // unused
     ActiveOperationsMetrics      active_operations;
 
     FileStorDiskMetrics(const std::string& name, const std::string& description, MetricSet* owner);