Add metrics to lock attempts

3 files changed, 6 insertions, 4 deletions

diff --git a/zkfacade/src/test/java/com/yahoo/vespa/curator/CuratorTest.java b/zkfacade/src/test/java/com/yahoo/vespa/curator/CuratorTest.java
index 2bf40c4e2bb..06440098c52 100644
--- a/zkfacade/src/test/java/com/yahoo/vespa/curator/CuratorTest.java
+++ b/zkfacade/src/test/java/com/yahoo/vespa/curator/CuratorTest.java
@@ -99,7 +99,7 @@ public class CuratorTest {
     }
 
     private Curator createCurator(ConfigserverConfig configserverConfig)  {
-        return new Curator(configserverConfig, Optional.empty());
+        return new Curator(configserverConfig, Optional.empty(), Optional.empty());
     }
 
     private static class PortAllocator {
diff --git a/zkfacade/src/test/java/com/yahoo/vespa/curator/stats/LockAttemptSamplesTest.java b/zkfacade/src/test/java/com/yahoo/vespa/curator/stats/LockAttemptSamplesTest.java
index 14dbbad56ba..bc731169f96 100644
--- a/zkfacade/src/test/java/com/yahoo/vespa/curator/stats/LockAttemptSamplesTest.java
+++ b/zkfacade/src/test/java/com/yahoo/vespa/curator/stats/LockAttemptSamplesTest.java
@@ -6,6 +6,7 @@ import org.junit.Test;
 import java.time.Duration;
 import java.time.Instant;
 import java.util.Map;
+import java.util.Optional;
 import java.util.stream.Collectors;
 
 import static org.junit.Assert.assertEquals;
@@ -53,7 +54,8 @@ public class LockAttemptSamplesTest {
     }
 
     private boolean maybeSample(String lockPath, int secondsDuration) {
-        LockAttempt lockAttempt = LockAttempt.invokingAcquire(threadLockStats, lockPath, Duration.ofSeconds(1));
+        LockAttempt lockAttempt = LockAttempt.invokingAcquire(threadLockStats, lockPath, Duration.ofSeconds(1),
+                Optional.empty(), Optional.empty());
         Instant instant = lockAttempt.getTimeAcquiredWasInvoked().plus(Duration.ofSeconds(secondsDuration));
         lockAttempt.setTerminalState(LockAttempt.LockState.RELEASED, instant);
         return samples.maybeSample(lockAttempt);
diff --git a/zkfacade/src/test/java/com/yahoo/vespa/curator/stats/LockTest.java b/zkfacade/src/test/java/com/yahoo/vespa/curator/stats/LockTest.java
index a221975c120..a1f95dc0735 100644
--- a/zkfacade/src/test/java/com/yahoo/vespa/curator/stats/LockTest.java
+++ b/zkfacade/src/test/java/com/yahoo/vespa/curator/stats/LockTest.java
@@ -27,7 +27,7 @@ public class LockTest {
     private final InterProcessLock mutex = mock(InterProcessLock.class);
     private final String lockPath = "/lock/path";
     private final Duration acquireTimeout = Duration.ofSeconds(10);
-    private final Lock lock = new Lock(lockPath, mutex);
+    private final Lock lock = new Lock(lockPath, mutex, Optional.empty());
 
     @Before
     public void setUp() {
@@ -120,7 +120,7 @@ public class LockTest {
         when(mutex.acquire(anyLong(), any())).thenReturn(true);
 
         String lockPath2 = "/lock/path/2";
-        Lock lock2 = new Lock(lockPath2, mutex);
+        Lock lock2 = new Lock(lockPath2, mutex, Optional.empty());
 
         lock.acquire(acquireTimeout);
         lock2.acquire(acquireTimeout);