Always stop timers when exiting the 'Timer.time' block

lib/java/AdapterLibrary/src/main/kotlin/com/vmware/aria/operations/Timer.kt

@@ -58,6 +58,15 @@ class Timer constructor(val name: String) {
     }
 }
 
+/**
+ * Functional interface for Java Interoperability that allows throwing an exception
+ * from the closure.
+ */
+fun interface ThrowingFn<T> {
+    @Throws(Exception::class)
+    fun execute(): T?
+}
+
 /**
  * Times the function / closure. The time is not returned but can be graphed using the
  * [graph] function.
@@ -66,11 +75,13 @@ class Timer constructor(val name: String) {
  * @param fn The function or closure to time
  * @return The result of [fn]
  */
-fun <T> time(name: String, fn: () -> T?): T? {
+fun <T> time(name: String, fn: ThrowingFn<T>): T? {
     val timer = Timer(name)
-    val returnValue = fn()
-    timer.stop()
-    return returnValue
+    try {
+        return fn.execute()
+    } finally {
+        timer.stop()
+    }
 }
 
 private enum class LineStyle(val horizontalChar: String, val junctionChar: String) {

lib/java/AdapterLibrary/src/test/java/com/vmware/aria/operations/TimerKtTest.java

@@ -3,6 +3,7 @@
 import org.junit.jupiter.api.*;
 
 import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertNotNull;
 import static org.junit.jupiter.api.Assertions.assertTrue;
 
 class TimerKtTest {
@@ -27,6 +28,23 @@ public void time() {
         assertEquals(5, i);
     }
 
+    @Test
+    public void timeException() {
+        // This adds a timer to the graph, but we can't access the timer directly
+        try {
+            Integer i = Timing.time("Timer 1", () -> {
+                sleep(sleep1Duration);
+                throw new Exception("exception");
+            });
+        } catch (Exception e) {
+            // do nothing
+        }
+        Timer.Companion.getTimers$integration_sdk_adapter_library().forEach((item) -> {
+            assertNotNull(item.getEndTime$integration_sdk_adapter_library());
+        });
+
+    }
+
     @Test
     public void getDuration() {
         Timer timer = new Timer("Timer");