- 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.

1 files changed, 3 insertions, 1 deletions

diff --git a/storageframework/src/vespa/storageframework/generic/metric/metricupdatehook.h b/storageframework/src/vespa/storageframework/generic/metric/metricupdatehook.h
index fb9606f33e0..6292fe9a598 100644
--- a/storageframework/src/vespa/storageframework/generic/metric/metricupdatehook.h
+++ b/storageframework/src/vespa/storageframework/generic/metric/metricupdatehook.h
@@ -9,10 +9,12 @@
 
 #include <mutex>
 
+namespace metrics { class MetricLockGuard; }
+
 namespace storage::framework {
 
 struct MetricUpdateHook {
-    using MetricLockGuard = std::unique_lock<std::mutex>;
+    using MetricLockGuard = metrics::MetricLockGuard;
     virtual ~MetricUpdateHook() = default;
 
     virtual void updateMetrics(const MetricLockGuard &) = 0;