- Wire in the guard to make it evident that we have it when making changes that require it.

- Clean up some old members and code not used any more.

2 files changed, 6 insertions, 4 deletions

diff --git a/storage/src/tests/bucketdb/bucketmanagertest.cpp b/storage/src/tests/bucketdb/bucketmanagertest.cpp
index 8a508a2169d..89d82df62bd 100644
--- a/storage/src/tests/bucketdb/bucketmanagertest.cpp
+++ b/storage/src/tests/bucketdb/bucketmanagertest.cpp
@@ -14,6 +14,7 @@
 #include <vespa/storageapi/message/persistence.h>
 #include <vespa/storageapi/message/state.h>
 #include <vespa/storageapi/message/bucketsplitting.h>
+#include <vespa/metrics/updatehook.h>
 #include <tests/common/teststorageapp.h>
 #include <tests/common/dummystoragelink.h>
 #include <tests/common/testhelper.h>
diff --git a/storage/src/tests/distributor/distributortest.cpp b/storage/src/tests/distributor/distributortest.cpp
index 72115da8de6..928373d516b 100644
--- a/storage/src/tests/distributor/distributortest.cpp
+++ b/storage/src/tests/distributor/distributortest.cpp
@@ -16,6 +16,7 @@
 #include <vespa/storage/distributor/distributor_bucket_space.h>
 #include <vespa/storage/distributor/distributormetricsset.h>
 #include <vespa/vespalib/text/stringtokenizer.h>
+#include <vespa/metrics/updatehook.h>
 #include <thread>
 #include <vespa/vespalib/gtest/gtest.h>
 #include <gmock/gmock.h>
@@ -453,7 +454,7 @@ TEST_F(DistributorTest, metric_update_hook_updates_pending_maintenance_metrics)
 
     // Force trigger update hook
     std::mutex l;
-    distributor_metric_update_hook().updateMetrics(std::unique_lock(l));
+    distributor_metric_update_hook().updateMetrics(metrics::MetricLockGuard(l));
     // Metrics should now be updated to the last complete working state
     {
         const IdealStateMetricSet& metrics(getIdealStateManager().getMetrics());
@@ -482,7 +483,7 @@ TEST_F(DistributorTest, bucket_db_memory_usage_metrics_only_updated_at_fixed_tim
     tickDistributorNTimes(10);
 
     std::mutex l;
-    distributor_metric_update_hook().updateMetrics(std::unique_lock(l));
+    distributor_metric_update_hook().updateMetrics(metrics::MetricLockGuard(l));
     auto* m = getDistributor().getMetrics().mutable_dbs.memory_usage.getMetric("used_bytes");
     ASSERT_TRUE(m != nullptr);
     auto last_used = m->getLongValue("last");
@@ -496,7 +497,7 @@ TEST_F(DistributorTest, bucket_db_memory_usage_metrics_only_updated_at_fixed_tim
     const auto sample_interval_sec = db_sample_interval_sec(getDistributor());
     getClock().setAbsoluteTimeInSeconds(1000 + sample_interval_sec - 1); // Not there yet.
     tickDistributorNTimes(50);
-    distributor_metric_update_hook().updateMetrics(std::unique_lock(l));
+    distributor_metric_update_hook().updateMetrics(metrics::MetricLockGuard(l));
 
     m = getDistributor().getMetrics().mutable_dbs.memory_usage.getMetric("used_bytes");
     auto now_used = m->getLongValue("last");
@@ -504,7 +505,7 @@ TEST_F(DistributorTest, bucket_db_memory_usage_metrics_only_updated_at_fixed_tim
 
     getClock().setAbsoluteTimeInSeconds(1000 + sample_interval_sec + 1);
     tickDistributorNTimes(10);
-    distributor_metric_update_hook().updateMetrics(std::unique_lock(l));
+    distributor_metric_update_hook().updateMetrics(metrics::MetricLockGuard(l));
 
     m = getDistributor().getMetrics().mutable_dbs.memory_usage.getMetric("used_bytes");
     now_used = m->getLongValue("last");