Make richer latency stats

Makes a LatencyStats which provides some useful metrics, best explained there
and in LatencyMetrics.  This includes latency metrics, the "QPS" (e.g. the
number of acquire() per second), and load metrics.

Unfortunately I had to move from atomics to synchronized to accomplish this,
but I see no other way.

1 files changed, 0 insertions, 7 deletions

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 a7715eb9756..d673655c798 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
@@ -86,9 +86,6 @@ public class LockTest {
         assertEquals(expected.getAndResetAcquireSucceededCount(), actual.getAndResetAcquireSucceededCount());
         assertEquals(expected.getAndResetReleaseCount(), actual.getAndResetReleaseCount());
         assertEquals(expected.getAndResetReleaseFailedCount(), actual.getAndResetReleaseFailedCount());
-
-        assertEquals(expected.getAcquiringNow(), actual.getAcquiringNow());
-        assertEquals(expected.getLockedNow(), actual.getLockedNow());
     }
 
     @Test
@@ -121,7 +118,6 @@ public class LockTest {
         expectedMetrics.setCumulativeAcquireCount(1);
         expectedMetrics.setAcquireSucceededCount(1);
         expectedMetrics.setCumulativeAcquireSucceededCount(1);
-        expectedMetrics.setLockedNow(1);
         assertLockMetrics(expectedMetrics);
 
         // reenter
@@ -131,7 +127,6 @@ public class LockTest {
         expectedMetrics.setCumulativeAcquireCount(2);
         expectedMetrics.setAcquireSucceededCount(1); // reset to 0 above, +1
         expectedMetrics.setCumulativeAcquireSucceededCount(2);
-        expectedMetrics.setLockedNow(2);
         assertLockMetrics(expectedMetrics);
 
         // inner-most closes
@@ -140,14 +135,12 @@ public class LockTest {
         expectedMetrics.setAcquireSucceededCount(0); // reset to 0 above
         expectedMetrics.setReleaseCount(1);
         expectedMetrics.setCumulativeReleaseCount(1);
-        expectedMetrics.setLockedNow(1);
         assertLockMetrics(expectedMetrics);
 
         // outer-most closes
         lock.close();
         expectedMetrics.setReleaseCount(1);  // reset to 0 above, +1
         expectedMetrics.setCumulativeReleaseCount(2);
-        expectedMetrics.setLockedNow(0);
         assertLockMetrics(expectedMetrics);
     }