TimerPair: add update, updateFailure and start methods

avast · Aug 8, 2018 · 17c1263 · 17c1263
1 parent eb8bec1
commit 17c1263
Show file tree

Hide file tree

Showing 5 changed files with 110 additions and 0 deletions.
diff --git a/api/src/main/java/com/avast/metrics/TimerPairImpl.java b/api/src/main/java/com/avast/metrics/TimerPairImpl.java
@@ -3,6 +3,7 @@
 import com.avast.metrics.api.Timer;
 import com.avast.metrics.api.TimerPair;
 
+import java.time.Duration;
 import java.util.concurrent.Callable;
 import java.util.concurrent.CompletableFuture;
 import java.util.concurrent.Executor;
@@ -17,6 +18,21 @@ public TimerPairImpl(Timer successTimer, Timer failureTimer) {
         this.failureTimer = failureTimer;
     }
 
+    @Override
+    public TimeContext start() {
+        return new Context(successTimer.start(), failureTimer.start());
+    }
+
+    @Override
+    public void update(Duration duration) {
+        successTimer.update(duration);
+    }
+
+    @Override
+    public void updateFailure(Duration duration) {
+        failureTimer.update(duration);
+    }
+
     public <T> T time(Callable<T> operation) throws Exception {
         Timer.TimeContext successContext = successTimer.start();
         Timer.TimeContext failureContext = failureTimer.start();
@@ -54,4 +70,25 @@ public <T> CompletableFuture<T> timeAsync(Callable<CompletableFuture<T>> operati
             throw ex;
         }
     }
+
+    private static class Context implements TimeContext {
+
+        private final Timer.TimeContext successContext;
+        private final Timer.TimeContext failureContext;
+
+        Context(Timer.TimeContext successContext, Timer.TimeContext failureContext) {
+            this.successContext = successContext;
+            this.failureContext = failureContext;
+        }
+
+        @Override
+        public void stop() {
+            successContext.stop();
+        }
+
+        @Override
+        public void stopFailure() {
+            failureContext.stop();
+        }
+    }
 }
diff --git a/api/src/main/java/com/avast/metrics/api/TimerPair.java b/api/src/main/java/com/avast/metrics/api/TimerPair.java
@@ -1,12 +1,31 @@
 package com.avast.metrics.api;
 
+import java.time.Duration;
 import java.util.concurrent.Callable;
 import java.util.concurrent.CompletableFuture;
 import java.util.concurrent.Executor;
 
 public interface TimerPair {
 
+    interface TimeContext extends AutoCloseable {
+        void stop();
+
+        void stopFailure();
+
+        @Override
+        default void close() {
+            stop();
+        }
+    }
+
+    TimeContext start();
+
+    void update(Duration duration);
+
+    void updateFailure(Duration duration);
+
     <T> T time(Callable<T> operation) throws Exception;
+
     <T> CompletableFuture<T> timeAsync(Callable<CompletableFuture<T>> operation, Executor executor) throws Exception;
 
 }
diff --git a/api/src/main/java/com/avast/metrics/test/NoOpMonitor.java b/api/src/main/java/com/avast/metrics/test/NoOpMonitor.java
@@ -140,6 +140,28 @@ public String getName() {
     @Override
     public TimerPair newTimerPair(String name) {
         return new TimerPair() {
+
+            @Override
+            public TimeContext start() {
+                return new TimeContext() {
+                    @Override
+                    public void stop() {
+                    }
+
+                    @Override
+                    public void stopFailure() {
+                    }
+                };
+            }
+
+            @Override
+            public void update(Duration duration) {
+            }
+
+            @Override
+            public void updateFailure(Duration duration) {
+            }
+
             @Override
             public <T> T time(Callable<T> operation) throws Exception {
                 return operation.call();

diff --git a/scala-api/src/main/scala/com/avast/metrics/scalaapi/TimerPair.scala b/scala-api/src/main/scala/com/avast/metrics/scalaapi/TimerPair.scala
@@ -1,9 +1,23 @@
 package com.avast.metrics.scalaapi
 
+
+import java.time.Duration
+
 import scala.concurrent.{ExecutionContext, Future}
 
 trait TimerPair {
 
+  trait TimeContext {
+    def stop(): Unit
+    def stopFailure(): Unit
+  }
+
+  def start(): TimeContext
+
+  def update(duration: Duration): Unit
+
+  def updateFailure(duration: Duration): Unit
+
   def time[A](block: => A): A
 
   def time[A](future: => Future[A])(implicit ec: ExecutionContext): Future[A]

diff --git a/scala-api/src/main/scala/com/avast/metrics/scalaapi/impl/TimerPairImpl.scala b/scala-api/src/main/scala/com/avast/metrics/scalaapi/impl/TimerPairImpl.scala
@@ -1,12 +1,30 @@
 package com.avast.metrics.scalaapi.impl
 
+import java.time.Duration
+
 import com.avast.metrics.scalaapi.{Timer, TimerPair}
 
 import scala.concurrent.{ExecutionContext, Future}
 import scala.util.control.NonFatal
 import scala.util.{Failure, Success}
 
 private class TimerPairImpl(success: Timer, failure: Timer) extends TimerPair {
+
+  override def start(): TimeContext = {
+    val succCtx = success.start()
+    val failCtx = failure.start()
+
+    new TimeContext {
+      override def stop(): Unit = succCtx.stop()
+
+      override def stopFailure(): Unit = failCtx.stop()
+    }
+  }
+
+  override def update(duration: Duration): Unit = success.update(duration)
+
+  override def updateFailure(duration: Duration): Unit = failure.update(duration)
+
   override def time[A](block: => A): A = {
     val succCtx = success.start()
     val failCtx = failure.start()