Skip to content

Commit 1bbe8ee

Browse files
committed
Add tests for async handler versions
1 parent f75fb44 commit 1bbe8ee

File tree

2 files changed

+28
-6
lines changed

2 files changed

+28
-6
lines changed

metrics-clojure-ring/src/metrics/ring/instrument.clj

+1-1
Original file line numberDiff line numberDiff line change
@@ -128,4 +128,4 @@
128128
([request respond raise]
129129
(handle-request handler
130130
(metrics-for metrics-db (metrics-prefix request) reg)
131-
request respond raise))))))
131+
request respond raise))))))

metrics-clojure-ring/test/metrics/test/instrument_test.clj

+27-5
Original file line numberDiff line numberDiff line change
@@ -8,6 +8,9 @@
88
(def dummy-handler (fn [req]
99
req))
1010

11+
(def dummy-handler-async (fn [req respond raise]
12+
(respond req)))
13+
1114
(defn tracked? [^MetricRegistry reg metric]
1215
(->> (.getMetrics reg)
1316
(map (fn [[k v]] k))
@@ -54,6 +57,15 @@
5457

5558
(app (mock/request :get "/yolo" {}))
5659

60+
(doseq [m expected-metrics]
61+
(is (tracked? reg m)))))
62+
63+
(testing "instrument without custom prefix and async handler"
64+
(let [reg (MetricRegistry. )
65+
app (instrument dummy-handler-async reg)]
66+
67+
(app (mock/request :get "/yolo" {}) identity identity)
68+
5769
(doseq [m expected-metrics]
5870
(is (tracked? reg m))))))
5971

@@ -64,10 +76,20 @@
6476
(uri-prefix (mock/request :get "/foo/bar/baz")))))
6577

6678
(deftest test-instrument-by-uri-prefix
67-
(let [reg (MetricRegistry.)
68-
app (instrument-by dummy-handler reg uri-prefix)]
79+
(testing "instrument by uri prefix"
80+
(let [reg (MetricRegistry.)
81+
app (instrument-by dummy-handler reg uri-prefix)]
6982

70-
(app (mock/request :get "/yolo" {}))
83+
(app (mock/request :get "/yolo" {}))
84+
85+
(doseq [m expected-metrics]
86+
(is (tracked? reg (str "yolo." m))))))
7187

72-
(doseq [m expected-metrics]
73-
(is (tracked? reg (str "yolo." m))))))
88+
(testing "instrument by uri prefix and async handler"
89+
(let [reg (MetricRegistry.)
90+
app (instrument-by dummy-handler-async reg uri-prefix)]
91+
92+
(app (mock/request :get "/yolo" {}) identity identity)
93+
94+
(doseq [m expected-metrics]
95+
(is (tracked? reg (str "yolo." m)))))))

0 commit comments

Comments
 (0)