Merge pull request #11038 from vespa-engine/revert-11036-hakonhall/add-orchestrator-application-lock-metrics

Revert "Add Orchestrator application lock metrics"

2 files changed, 0 insertions, 38 deletions

diff --git a/jdisc_core/src/main/java/com/yahoo/jdisc/core/SystemTimer.java b/jdisc_core/src/main/java/com/yahoo/jdisc/core/SystemTimer.java
index 40fce9fec54..15e234079b0 100644
--- a/jdisc_core/src/main/java/com/yahoo/jdisc/core/SystemTimer.java
+++ b/jdisc_core/src/main/java/com/yahoo/jdisc/core/SystemTimer.java
@@ -3,8 +3,6 @@ package com.yahoo.jdisc.core;
 
 import com.yahoo.jdisc.Timer;
 
-import java.time.Instant;
-
 /**
  * A timer which returns the System time
  *
@@ -16,9 +14,4 @@ public class SystemTimer implements Timer {
     public long currentTimeMillis() {
         return System.currentTimeMillis();
     }
-
-    @Override
-    public Instant currentTime() {
-        return Instant.now();
-    }
 }
diff --git a/jdisc_core/src/main/java/com/yahoo/jdisc/test/TestTimer.java b/jdisc_core/src/main/java/com/yahoo/jdisc/test/TestTimer.java
deleted file mode 100644
index 4d274a33a1f..00000000000
--- a/jdisc_core/src/main/java/com/yahoo/jdisc/test/TestTimer.java
+++ /dev/null
@@ -1,31 +0,0 @@
-// Copyright 2018 Yahoo Holdings. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root.
-package com.yahoo.jdisc.test;
-
-import com.yahoo.jdisc.Timer;
-
-import java.time.Duration;
-
-/**
- * A {@link Timer} to be used in tests when the advancement of time needs to be controlled.
- *
- * @author hakonhall
- */
-public class TestTimer implements Timer {
-    private Duration durationSinceEpoch = Duration.ZERO;
-
-    public void setMillis(long millisSinceEpoch) {
-        durationSinceEpoch = Duration.ofMillis(millisSinceEpoch);
-    }
-
-    public void advanceMillis(long millis) { advance(Duration.ofMillis(millis)); }
-    public void advanceSeconds(long seconds) { advance(Duration.ofSeconds(seconds)); }
-    public void advanceMinutes(long minutes) { advance(Duration.ofMinutes(minutes)); }
-    public void advance(Duration duration) {
-        durationSinceEpoch = durationSinceEpoch.plus(duration);
-    }
-
-    @Override
-    public long currentTimeMillis() {
-        return durationSinceEpoch.toMillis();
-    }
-}