Remove '.sum' form vds sum metrics.

Remove '.sum' from metric names for storage node and also remove the average metrics for the same.
Remove '.sum' from distributor metrics set and remove distributor average metrics.
GC '.sum' from distributor metric names.
Remove '.alldisks' from metric names and update tests.
GC '.alldisks' from filestor metrics.

12 files changed, 72 insertions, 112 deletions

diff --git a/storage/src/tests/common/metricstest.cpp b/storage/src/tests/common/metricstest.cpp
index cff62542434..a92cf121fab 100644
--- a/storage/src/tests/common/metricstest.cpp
+++ b/storage/src/tests/common/metricstest.cpp
@@ -133,7 +133,7 @@ void MetricsTest::createFakeLoad()
     _filestorMetrics->partitionEvents.inc(4);
     _filestorMetrics->diskEvents.inc(3);
     {
-        FileStorDiskMetrics& disk(*_filestorMetrics->disk);
+        FileStorMetrics& disk(*_filestorMetrics);
         disk.queueSize.addValue(4 * n);
         disk.averageQueueWaitingTime.addValue(10 * n);
         disk.pendingMerges.addValue(4 * n);
@@ -207,10 +207,10 @@ TEST_F(MetricsTest, filestor_metrics) {
     bool retVal = _metricsConsumer->reportStatus(ost, path);
     ASSERT_TRUE(retVal) << "_metricsConsumer->reportStatus failed";
     std::string s = ost.str();
-    EXPECT_THAT(s, HasSubstr("vds.filestor.alldisks.allthreads.get.sum.count count=60"));
-    EXPECT_THAT(s, HasSubstr("vds.filestor.alldisks.allthreads.put.sum.count count=50"));
-    EXPECT_THAT(s, HasSubstr("vds.filestor.alldisks.allthreads.remove.sum.count count=30"));
-    EXPECT_THAT(s, HasSubstr("vds.filestor.alldisks.allthreads.remove.sum.not_found count=5"));
+    EXPECT_THAT(s, HasSubstr("vds.filestor.allthreads.get.count count=60"));
+    EXPECT_THAT(s, HasSubstr("vds.filestor.allthreads.put.count count=50"));
+    EXPECT_THAT(s, HasSubstr("vds.filestor.allthreads.remove.count count=30"));
+    EXPECT_THAT(s, HasSubstr("vds.filestor.allthreads.remove.not_found count=5"));
 }
 
 #define ASSERT_METRIC(interval, metric, count) \
@@ -233,8 +233,7 @@ TEST_F(MetricsTest, filestor_metrics) {
 }
 
 TEST_F(MetricsTest, snapshot_presenting) {
-    FileStorDiskMetrics& disk0(*_filestorMetrics->disk);
-    FileStorThreadMetrics& thread0(*disk0.threads[0]);
+    FileStorThreadMetrics& thread0(*_filestorMetrics->threads[0]);
 
     LOG(debug, "Adding to get metric");
 
@@ -257,20 +256,20 @@ TEST_F(MetricsTest, snapshot_presenting) {
     thread0.put.count.inc(1);
 
     // Verify that active metrics have set put count but not get count
-    ASSERT_METRIC(-2, "vds.filestor.alldisks.allthreads.put.sum.count", 1);
-    ASSERT_METRIC(-2, "vds.filestor.alldisks.allthreads.get.sum.count", -1);
+    ASSERT_METRIC(-2, "vds.filestor.allthreads.put.count", 1);
+    ASSERT_METRIC(-2, "vds.filestor.allthreads.get.count", -1);
 
     // Verify that 5 min metrics have set get count but not put count
-    ASSERT_METRIC(300, "vds.filestor.alldisks.allthreads.put.sum.count", -1);
-    ASSERT_METRIC(300, "vds.filestor.alldisks.allthreads.get.sum.count", 1);
+    ASSERT_METRIC(300, "vds.filestor.allthreads.put.count", -1);
+    ASSERT_METRIC(300, "vds.filestor.allthreads.get.count", 1);
 
     // Verify that the total metrics is equal to 5 minute
-    ASSERT_METRIC(0, "vds.filestor.alldisks.allthreads.put.sum.count", -1);
-    ASSERT_METRIC(0, "vds.filestor.alldisks.allthreads.get.sum.count", 1);
+    ASSERT_METRIC(0, "vds.filestor.allthreads.put.count", -1);
+    ASSERT_METRIC(0, "vds.filestor.allthreads.get.count", 1);
 
     // Verify that total + active have set both
-    ASSERT_METRIC(-1, "vds.filestor.alldisks.allthreads.put.sum.count", 1);
-    ASSERT_METRIC(-1, "vds.filestor.alldisks.allthreads.get.sum.count", 1);
+    ASSERT_METRIC(-1, "vds.filestor.allthreads.put.count", 1);
+    ASSERT_METRIC(-1, "vds.filestor.allthreads.get.count", 1);
 }
 
 TEST_F(MetricsTest, html_metrics_report) {
diff --git a/storage/src/tests/persistence/active_operations_stats_test.cpp b/storage/src/tests/persistence/active_operations_stats_test.cpp
index 8caa84977ce..5b5a019f688 100644
--- a/storage/src/tests/persistence/active_operations_stats_test.cpp
+++ b/storage/src/tests/persistence/active_operations_stats_test.cpp
@@ -115,7 +115,7 @@ ActiveOperationsStatsTest::test_active_operations_stats()
     EXPECT_EQ(4, stats.get_total_size());
     EXPECT_LT(0.0, stats.get_total_latency());
     update_metrics();
-    auto &ao_metrics = metrics.disk->active_operations;
+    auto &ao_metrics = metrics.active_operations;
     EXPECT_DOUBLE_EQ(1.0, ao_metrics.size.getAverage());
     EXPECT_DOUBLE_EQ(0.0, ao_metrics.size.getMinimum());
     EXPECT_DOUBLE_EQ(2.0, ao_metrics.size.getMaximum());
diff --git a/storage/src/tests/persistence/filestorage/filestormanagertest.cpp b/storage/src/tests/persistence/filestorage/filestormanagertest.cpp
index 304720f52b7..4c1b1662f68 100644
--- a/storage/src/tests/persistence/filestorage/filestormanagertest.cpp
+++ b/storage/src/tests/persistence/filestorage/filestormanagertest.cpp
@@ -201,7 +201,7 @@ struct FileStorTestBase : Test {
                                  const Metric& metric);
 
     auto& thread_metrics_of(FileStorManager& manager) {
-        return manager.get_metrics().disk->threads[0];
+        return manager.get_metrics().threads[0];
     }
 };
 
@@ -304,7 +304,7 @@ struct PersistenceHandlerComponents : public FileStorHandlerComponents {
                 std::make_unique<PersistenceHandler>(executor, component, cfg,
                                                      test._node->getPersistenceProvider(),
                                                      *filestorHandler, bucketOwnershipNotifier,
-                                                     *metrics.disk->threads[0]);
+                                                     *metrics.threads[0]);
     }
     ~PersistenceHandlerComponents();
     std::unique_ptr<DiskThread> make_disk_thread() {
@@ -759,11 +759,11 @@ TEST_F(FileStorManagerTest, priority) {
     BucketOwnershipNotifier bucketOwnershipNotifier(component, c.messageSender);
     vespa::config::content::StorFilestorConfig cfg;
     PersistenceHandler persistenceHandler(_node->executor(), component, cfg, _node->getPersistenceProvider(),
-                                          filestorHandler, bucketOwnershipNotifier, *metrics.disk->threads[0]);
+                                          filestorHandler, bucketOwnershipNotifier, *metrics.threads[0]);
     std::unique_ptr<DiskThread> thread(createThread(persistenceHandler, filestorHandler, component));
 
     PersistenceHandler persistenceHandler2(_node->executor(), component, cfg, _node->getPersistenceProvider(),
-                                           filestorHandler, bucketOwnershipNotifier, *metrics.disk->threads[1]);
+                                           filestorHandler, bucketOwnershipNotifier, *metrics.threads[1]);
     std::unique_ptr<DiskThread> thread2(createThread(persistenceHandler2, filestorHandler, component));
 
     // Creating documents to test with. Different gids, 2 locations.
@@ -813,8 +813,8 @@ TEST_F(FileStorManagerTest, priority) {
 
     // Verify that thread 1 gets documents over 50 pri
     EXPECT_EQ(documents.size(),
-              metrics.disk->threads[0]->operations.getValue()
-              + metrics.disk->threads[1]->operations.getValue());
+              metrics.threads[0]->operations.getValue()
+              + metrics.threads[1]->operations.getValue());
     // Closing file stor handler before threads are deleted, such that
     // file stor threads getNextMessage calls returns.
     filestorHandler.close();
diff --git a/storage/src/tests/persistence/persistencetestutils.cpp b/storage/src/tests/persistence/persistencetestutils.cpp
index 940436307a1..de9caebbf11 100644
--- a/storage/src/tests/persistence/persistencetestutils.cpp
+++ b/storage/src/tests/persistence/persistencetestutils.cpp
@@ -58,7 +58,7 @@ PersistenceTestEnvironment::PersistenceTestEnvironment(const std::string & rootO
     _metrics.initDiskMetrics(1, 1);
     _handler = std::make_unique<FileStorHandlerImpl>(_messageKeeper, _metrics, _node.getComponentRegister());
     _diskEnv = std::make_unique<PersistenceUtil>(_component, *_handler,
-                                                 *_metrics.disk->threads[0], _node.getPersistenceProvider());
+                                                 *_metrics.threads[0], _node.getPersistenceProvider());
 }
 
 PersistenceTestEnvironment::~PersistenceTestEnvironment() {
diff --git a/storage/src/tests/storageserver/statereportertest.cpp b/storage/src/tests/storageserver/statereportertest.cpp
index 77192d24786..09df5063989 100644
--- a/storage/src/tests/storageserver/statereportertest.cpp
+++ b/storage/src/tests/storageserver/statereportertest.cpp
@@ -150,13 +150,11 @@ vespalib::Slime slime; \
     for (size_t j=0; j<metricCount; j++) { \
         const vespalib::string name = slime.get()["metrics"]["values"][j]["name"] \
                                  .asString().make_string(); \
-        if (name.compare("vds.filestor.alldisks.allthreads." \
-                         "get.sum.count") == 0) \
+        if (name.compare("vds.filestor.allthreads.get.count") == 0) \
         { \
             getCount = slime.get()["metrics"]["values"][j]["values"]["count"] \
                        .asDouble(); \
-        } else if (name.compare("vds.filestor.alldisks.allthreads." \
-                                "put.sum.count") == 0) \
+        } else if (name.compare("vds.filestor.allthreads.put.count") == 0) \
         { \
             putCount = slime.get()["metrics"]["values"][j]["values"]["count"] \
                        .asDouble(); \
@@ -217,8 +215,7 @@ TEST_F(StateReporterTest, report_health) {
 }
 
 TEST_F(StateReporterTest, report_metrics) {
-    FileStorDiskMetrics& disk0(*_filestorMetrics->disk);
-    FileStorThreadMetrics& thread0(*disk0.threads[0]);
+    FileStorThreadMetrics& thread0(*_filestorMetrics->threads[0]);
 
     LOG(debug, "Adding to get metric");
 
diff --git a/storage/src/vespa/storage/distributor/distributormetricsset.cpp b/storage/src/vespa/storage/distributor/distributormetricsset.cpp
index c3f94c4b281..fad44782dd4 100644
--- a/storage/src/vespa/storage/distributor/distributormetricsset.cpp
+++ b/storage/src/vespa/storage/distributor/distributormetricsset.cpp
@@ -13,17 +13,16 @@ BucketDbMetrics::BucketDbMetrics(const vespalib::string& db_type, metrics::Metri
 
 BucketDbMetrics::~BucketDbMetrics() = default;
 
-//TODO Vespa 8 all metrics with .sum in the name should have that removed.
 DistributorMetricSet::DistributorMetricSet()
     : MetricSet("distributor", {{"distributor"}}, ""),
-      puts("puts.sum", this),
+      puts("puts", this),
       updates(this),
       update_puts("update_puts", this),
       update_gets("update_gets", this),
       update_metadata_gets("update_metadata_gets", this),
-      removes("removes.sum", this),
-      removelocations("removelocations.sum", this),
-      gets("gets.sum", this),
+      removes("removes", this),
+      removelocations("removelocations", this),
+      gets("gets", this),
       stats("stats", this),
       getbucketlists("getbucketlists", this),
       visits(this),
diff --git a/storage/src/vespa/storage/persistence/filestorage/filestorhandlerimpl.cpp b/storage/src/vespa/storage/persistence/filestorage/filestorhandlerimpl.cpp
index df1c0de36cc..1c818233746 100644
--- a/storage/src/vespa/storage/persistence/filestorage/filestorhandlerimpl.cpp
+++ b/storage/src/vespa/storage/persistence/filestorage/filestorhandlerimpl.cpp
@@ -49,7 +49,7 @@ FileStorHandlerImpl::FileStorHandlerImpl(uint32_t numThreads, uint32_t numStripe
                                          const vespalib::SharedOperationThrottler::DynamicThrottleParams& dyn_throttle_params)
     : _component(compReg, "filestorhandlerimpl"),
       _state(FileStorHandler::AVAILABLE),
-      _metrics(nullptr),
+      _metrics(&metrics),
       _dynamic_operation_throttler(vespalib::SharedOperationThrottler::make_dynamic_throttler(dyn_throttle_params)),
       _unlimited_operation_throttler(vespalib::SharedOperationThrottler::make_unlimited_throttler()),
       _active_throttler(_unlimited_operation_throttler.get()), // Will be set by FileStorManager
@@ -67,8 +67,6 @@ FileStorHandlerImpl::FileStorHandlerImpl(uint32_t numThreads, uint32_t numStripe
         _stripes.emplace_back(*this, sender);
     }
 
-    _metrics = metrics.disk.get();
-    assert(_metrics != nullptr);
     uint32_t j(0);
     for (Stripe & stripe : _stripes) {
         stripe.setMetrics(_metrics->stripes[j++].get());
diff --git a/storage/src/vespa/storage/persistence/filestorage/filestorhandlerimpl.h b/storage/src/vespa/storage/persistence/filestorage/filestorhandlerimpl.h
index a3667e93fff..91b8dbe2f13 100644
--- a/storage/src/vespa/storage/persistence/filestorage/filestorhandlerimpl.h
+++ b/storage/src/vespa/storage/persistence/filestorage/filestorhandlerimpl.h
@@ -301,7 +301,7 @@ public:
 private:
     ServiceLayerComponent   _component;
     std::atomic<DiskState>  _state;
-    FileStorDiskMetrics   * _metrics;
+    FileStorMetrics       * _metrics;
     std::unique_ptr<vespalib::SharedOperationThrottler> _dynamic_operation_throttler;
     std::unique_ptr<vespalib::SharedOperationThrottler> _unlimited_operation_throttler;
     std::atomic<vespalib::SharedOperationThrottler*>    _active_throttler;
diff --git a/storage/src/vespa/storage/persistence/filestorage/filestormanager.cpp b/storage/src/vespa/storage/persistence/filestorage/filestormanager.cpp
index cab6c26f2a0..c7ee0ab97e0 100644
--- a/storage/src/vespa/storage/persistence/filestorage/filestormanager.cpp
+++ b/storage/src/vespa/storage/persistence/filestorage/filestormanager.cpp
@@ -187,11 +187,11 @@ FileStorManager::createRegisteredHandler(const ServiceLayerComponent & component
 {
     std::lock_guard guard(_lock);
     size_t index = _persistenceHandlers.size();
-    assert(index < _metrics->disk->threads.size());
+    assert(index < _metrics->threads.size());
     _persistenceHandlers.push_back(
             std::make_unique<PersistenceHandler>(*_sequencedExecutor, component,
                                                  *_config, *_provider, *_filestorHandler,
-                                                 *_bucketOwnershipNotifier, *_metrics->disk->threads[index]));
+                                                 *_bucketOwnershipNotifier, *_metrics->threads[index]));
     return *_persistenceHandlers.back();
 }
 
diff --git a/storage/src/vespa/storage/persistence/filestorage/filestormetrics.cpp b/storage/src/vespa/storage/persistence/filestorage/filestormetrics.cpp
index ee375b98a69..fec64765cad 100644
--- a/storage/src/vespa/storage/persistence/filestorage/filestormetrics.cpp
+++ b/storage/src/vespa/storage/persistence/filestorage/filestormetrics.cpp
@@ -7,7 +7,6 @@ namespace storage {
 
 using metrics::MetricSet;
 
-// TODO Vespa 8 all metrics with .sum in the name should have that removed.
 FileStorThreadMetrics::Op::Op(const std::string& id, const std::string& name, MetricSet* owner)
     : MetricSet(id, {}, name + " load in filestor thread", owner),
       _name(name),
@@ -108,7 +107,7 @@ FileStorThreadMetrics::OpWithNotFound::clone(std::vector<Metric::UP>& ownerList,
 }
 
 FileStorThreadMetrics::Update::Update(MetricSet* owner)
-    : OpWithTestAndSetFailed("update.sum", "Update", owner),
+    : OpWithTestAndSetFailed("update", "Update", owner),
       latencyRead("latency_read", {}, "Latency of the source read in the request.", this)
 { }
 
@@ -127,7 +126,7 @@ FileStorThreadMetrics::Update::clone(std::vector<Metric::UP>& ownerList,
 }
 
 FileStorThreadMetrics::Visitor::Visitor(MetricSet* owner)
-    : Op("visit.sum", "Visit", owner),
+    : Op("visit", "Visit", owner),
       documentsPerIterate("docs", {}, "Number of entries read per iterate call", this)
 { }
 
@@ -149,10 +148,10 @@ FileStorThreadMetrics::FileStorThreadMetrics(const std::string& name, const std:
     : MetricSet(name, {{"filestor"},{"partofsum"}}, desc),
       operations("operations", {}, "Number of operations processed.", this),
       failedOperations("failedoperations", {}, "Number of operations throwing exceptions.", this),
-      put("put.sum", "Put", this),
-      get("get.sum", "Get", this),
-      remove("remove.sum", "Remove", this),
-      removeLocation("remove_location.sum", "Remove location", this),
+      put("put", "Put", this),
+      get("get", "Get", this),
+      remove("remove", "Remove", this),
+      removeLocation("remove_location", "Remove location", this),
       statBucket("stat_bucket", "Stat bucket", this),
       update(this),
       revert("revert", "Revert", this),
@@ -202,29 +201,33 @@ FileStorStripeMetrics::FileStorStripeMetrics(const std::string& name, const std:
 
 FileStorStripeMetrics::~FileStorStripeMetrics() = default;
 
-FileStorDiskMetrics::FileStorDiskMetrics(const std::string& name, const std::string& description, MetricSet* owner)
-    : MetricSet(name, {{"partofsum"}}, description, owner),
+FileStorMetrics::FileStorMetrics()
+    : MetricSet("filestor", {{"filestor"}}, ""),
       sumThreads("allthreads", {{"sum"}}, "", this),
       sumStripes("allstripes", {{"sum"}}, "", this),
-      averageQueueWaitingTime("averagequeuewait.sum", {}, "Average time an operation spends in input queue.", this),
+      averageQueueWaitingTime("averagequeuewait", {}, "Average time an operation spends in input queue.", this),
       queueSize("queuesize", {}, "Size of input message queue.", this),
       pendingMerges("pendingmerge", {}, "Number of buckets currently being merged.", this),
       throttle_window_size("throttle_window_size", {}, "Current size of async operation throttler window size", this),
       throttle_waiting_threads("throttle_waiting_threads", {}, "Number of threads waiting to acquire a throttle token", this),
       throttle_active_tokens("throttle_active_tokens", {}, "Current number of active throttle tokens", this),
       waitingForLockHitRate("waitingforlockrate", {},
-              "Amount of times a filestor thread has needed to wait for "
-              "lock to take next message in queue.", this),
-      active_operations(this)
+                            "Amount of times a filestor thread has needed to wait for "
+                            "lock to take next message in queue.", this),
+      active_operations(this),
+      directoryEvents("directoryevents", {}, "Number of directory events received.", this),
+      partitionEvents("partitionevents", {}, "Number of partition events received.", this),
+      diskEvents("diskevents", {}, "Number of disk events received.", this),
+      bucket_db_init_latency("bucket_db_init_latency", {}, "Time taken (in ms) to initialize bucket databases with "
+                                                           "information from the persistence provider", this)
 {
     pendingMerges.unsetOnZeroValue();
     waitingForLockHitRate.unsetOnZeroValue();
 }
 
-FileStorDiskMetrics::~FileStorDiskMetrics() = default;
+FileStorMetrics::~FileStorMetrics() = default;
 
-void
-FileStorDiskMetrics::initDiskMetrics(uint32_t numStripes, uint32_t threadsPerDisk)
+void FileStorMetrics::initDiskMetrics(uint32_t numStripes, uint32_t threadsPerDisk)
 {
     threads.clear();
     threads.resize(threadsPerDisk);
@@ -250,26 +253,4 @@ FileStorDiskMetrics::initDiskMetrics(uint32_t numStripes, uint32_t threadsPerDis
     }
 }
 
-FileStorMetrics::FileStorMetrics()
-    : MetricSet("filestor", {{"filestor"}}, ""),
-      sum("alldisks", {{"sum"}}, "", this),
-      directoryEvents("directoryevents", {}, "Number of directory events received.", this),
-      partitionEvents("partitionevents", {}, "Number of partition events received.", this),
-      diskEvents("diskevents", {}, "Number of disk events received.", this),
-      bucket_db_init_latency("bucket_db_init_latency", {}, "Time taken (in ms) to initialize bucket databases with "
-                                                           "information from the persistence provider", this)
-{ }
-
-FileStorMetrics::~FileStorMetrics() = default;
-
-void FileStorMetrics::initDiskMetrics(uint32_t numStripes, uint32_t threadsPerDisk)
-{
-    assert( ! disk);
-    // Currently FileStorHandlerImpl expects metrics to exist for
-    // disks that are not in use too.
-    disk = std::make_shared<FileStorDiskMetrics>( "disk_0", "Disk 0", this);
-    sum.addMetricToSum(*disk);
-    disk->initDiskMetrics(numStripes, threadsPerDisk);
-}
-
 }
diff --git a/storage/src/vespa/storage/persistence/filestorage/filestormetrics.h b/storage/src/vespa/storage/persistence/filestorage/filestormetrics.h
index 24a4d508945..53bf087f036 100644
--- a/storage/src/vespa/storage/persistence/filestorage/filestormetrics.h
+++ b/storage/src/vespa/storage/persistence/filestorage/filestormetrics.h
@@ -136,38 +136,24 @@ public:
     ~FileStorStripeMetrics() override;
 };
 
-class FileStorDiskMetrics : public metrics::MetricSet
+struct FileStorMetrics : public metrics::MetricSet
 {
-public:
-    using SP = std::shared_ptr<FileStorDiskMetrics>;
-
     std::vector<FileStorThreadMetrics::SP> threads;
     std::vector<FileStorStripeMetrics::SP> stripes;
     metrics::SumMetric<MetricSet> sumThreads;
     metrics::SumMetric<MetricSet> sumStripes;
-    metrics::DoubleAverageMetric averageQueueWaitingTime;
-    metrics::LongAverageMetric queueSize;
-    metrics::LongAverageMetric pendingMerges;
-    metrics::LongAverageMetric throttle_window_size;
-    metrics::LongAverageMetric throttle_waiting_threads;
-    metrics::LongAverageMetric throttle_active_tokens;
-    metrics::DoubleAverageMetric waitingForLockHitRate;
-    ActiveOperationsMetrics      active_operations;
-
-    FileStorDiskMetrics(const std::string& name, const std::string& description, MetricSet* owner);
-    ~FileStorDiskMetrics() override;
-
-    void initDiskMetrics(uint32_t numStripes, uint32_t threadsPerDisk);
-};
-
-struct FileStorMetrics : public metrics::MetricSet
-{
-    FileStorDiskMetrics::SP disk;
-    metrics::SumMetric<MetricSet> sum;
-    metrics::LongCountMetric directoryEvents;
-    metrics::LongCountMetric partitionEvents;
-    metrics::LongCountMetric diskEvents;
-    metrics::LongAverageMetric bucket_db_init_latency;
+    metrics::DoubleAverageMetric  averageQueueWaitingTime;
+    metrics::LongAverageMetric    queueSize;
+    metrics::LongAverageMetric    pendingMerges;
+    metrics::LongAverageMetric    throttle_window_size;
+    metrics::LongAverageMetric    throttle_waiting_threads;
+    metrics::LongAverageMetric    throttle_active_tokens;
+    metrics::DoubleAverageMetric  waitingForLockHitRate;
+    ActiveOperationsMetrics       active_operations;
+    metrics::LongCountMetric      directoryEvents;
+    metrics::LongCountMetric      partitionEvents;
+    metrics::LongCountMetric      diskEvents;
+    metrics::LongAverageMetric    bucket_db_init_latency;
 
     FileStorMetrics();
     ~FileStorMetrics() override;
diff --git a/storage/src/vespa/storage/visiting/visitorthreadmetrics.cpp b/storage/src/vespa/storage/visiting/visitorthreadmetrics.cpp
index af871cc8296..158846d2d5b 100644
--- a/storage/src/vespa/storage/visiting/visitorthreadmetrics.cpp
+++ b/storage/src/vespa/storage/visiting/visitorthreadmetrics.cpp
@@ -8,15 +8,15 @@ namespace storage {
 VisitorThreadMetrics::VisitorThreadMetrics(const std::string& name, const std::string& desc)
     : metrics::MetricSet(name, {{"visitor"},{"partofsum"},{"thread"}}, desc),
       queueSize("queuesize", {}, "Size of input message queue.", this),
-      averageQueueWaitingTime("averagequeuewait.sum", {}, "Average time an operation spends in input queue.", this),
-      averageVisitorLifeTime("averagevisitorlifetime.sum", {}, "Average lifetime of a visitor", this),
+      averageQueueWaitingTime("averagequeuewait", {}, "Average time an operation spends in input queue.", this),
+      averageVisitorLifeTime("averagevisitorlifetime", {}, "Average lifetime of a visitor", this),
       averageVisitorCreationTime("averagevisitorcreationtime", {}, "Average time spent creating a visitor instance", this),
-      averageMessageSendTime("averagemessagesendtime.sum", {}, "Average time it takes for messages to be sent to their target (and be replied to)", this),
-      averageProcessingTime("averageprocessingtime.sum", {}, "Average time visitor uses in handleDocuments() call", this),
-      createdVisitors("created.sum", {}, "Number of visitors created.", this),
+      averageMessageSendTime("averagemessagesendtime", {}, "Average time it takes for messages to be sent to their target (and be replied to)", this),
+      averageProcessingTime("averageprocessingtime", {}, "Average time visitor uses in handleDocuments() call", this),
+      createdVisitors("created", {}, "Number of visitors created.", this),
       abortedVisitors("aborted", {}, "Number of visitors aborted.", this),
-      completedVisitors("completed.sum", {}, "Number of visitors completed", this),
-      failedVisitors("failed.sum", {}, "Number of visitors failed", this),
+      completedVisitors("completed", {}, "Number of visitors completed", this),
+      failedVisitors("failed", {}, "Number of visitors failed", this),
       visitorDestinationFailureReplies("destination_failure_replies", {},"Number of failure replies received from the visitor destination", this)
 {
     queueSize.unsetOnZeroValue();