Merge pull request #135 from mgaare/timer-3-arity

Use timer-with-reservoir for the 3-arity deftimer
clj-commons · Jul 17, 2018 · 4c14ad6 · 4c14ad6
2 parents db04e5e + 0e2c71a
commit 4c14ad6
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 1 deletion.
diff --git a/metrics-clojure-core/src/metrics/timers.clj b/metrics-clojure-core/src/metrics/timers.clj
@@ -50,7 +50,7 @@
      `(def ~s (timer ~reg '~title))))
   ([^MetricRegistry reg ^Reservoir reservoir title]
    (let [[s title] (desugared-title title)]
-     `(def ~s (timer ~reg ~reservoir '~title)))))
+     `(def ~s (timer-with-reservoir ~reg ~reservoir '~title)))))
 
 (defn rate-one
   [^Timer m]

diff --git a/metrics-clojure-core/test/metrics/test/timers_test.clj b/metrics-clojure-core/test/metrics/test/timers_test.clj
@@ -18,10 +18,14 @@
 
 (let [reg (mc/new-registry)]
   (mt/deftimer reg ["test" "timers" "deftimered"])
+  (mt/deftimer reg (mc/uniform-reservior) deftimered-3-arity)
 
   (deftest test-deftimer
     (is (= (mt/rate-mean deftimered) 0.0))
     (is (= (mt/time! deftimered (sleep-100)) 100))
+    (is (> (mt/rate-mean deftimered) 0.0))
+    (is (= (mt/rate-mean deftimered-3-arity) 0.0))
+    (is (= (mt/time! deftimered-3-arity (sleep-100))))
     (is (> (mt/rate-mean deftimered) 0.0))))