Use consistent timer instance, and set meaningful message timestamps

1 files changed, 1 insertions, 9 deletions

diff --git a/vespajlib/src/main/java/com/yahoo/concurrent/Timer.java b/vespajlib/src/main/java/com/yahoo/concurrent/Timer.java
index 46d72f6d5ad..9328039aae6 100644
--- a/vespajlib/src/main/java/com/yahoo/concurrent/Timer.java
+++ b/vespajlib/src/main/java/com/yahoo/concurrent/Timer.java
@@ -22,14 +22,6 @@ public interface Timer {
     long milliTime();
     long creationNanos = System.nanoTime(); // Avoid monotonic timer overflow for the first 146 years of JVM uptime.
     Timer monotonic = () -> TimeUnit.NANOSECONDS.toMillis(System.nanoTime() - creationNanos);
-    static Timer wrap(Clock original) {
-        return new Timer() {
-            private final Clock clock = original;
-
-            @Override
-            public long milliTime() {
-                return clock.millis();
-            }
-        }; }
+    static Timer wrap(Clock original) { return original::millis; }
     default Instant instant() { return Instant.ofEpochMilli(milliTime()); }
 }