Loosen up the metrics stuff further.

2 files changed, 3 insertions, 1 deletions

diff --git a/memfilepersistence/src/vespa/memfilepersistence/spi/memfilepersistenceprovidermetrics.cpp b/memfilepersistence/src/vespa/memfilepersistence/spi/memfilepersistenceprovidermetrics.cpp
index 9e3a2b44eb0..638ff05fc60 100644
--- a/memfilepersistence/src/vespa/memfilepersistence/spi/memfilepersistenceprovidermetrics.cpp
+++ b/memfilepersistence/src/vespa/memfilepersistence/spi/memfilepersistenceprovidermetrics.cpp
@@ -45,7 +45,7 @@ MemFilePersistenceMetrics::~MemFilePersistenceMetrics() { }
 
 MemFilePersistenceThreadMetrics*
 MemFilePersistenceMetrics::addThreadMetrics() {
-    metrics::MetricLockGuard metricLock(_component.getMetricManagerLock());
+    vespalib::MonitorGuard metricLock(_component.getMetricManagerLock());
     vespalib::LockGuard guard(_threadMetricsLock);
 
     if (!_sumMetric.get()) {
diff --git a/memfilepersistence/src/vespa/memfilepersistence/spi/memfilepersistenceprovidermetrics.h b/memfilepersistence/src/vespa/memfilepersistence/spi/memfilepersistenceprovidermetrics.h
index 6c6e1d882d1..81c64142777 100644
--- a/memfilepersistence/src/vespa/memfilepersistence/spi/memfilepersistenceprovidermetrics.h
+++ b/memfilepersistence/src/vespa/memfilepersistence/spi/memfilepersistenceprovidermetrics.h
@@ -3,6 +3,8 @@
 
 #include <vespa/metrics/metrics.h>
 #include <vespa/memfilepersistence/mapper/serializationmetrics.h>
+#include <vespa/vespalib/util/sync.h>
+#include <list>
 
 namespace storage {