Skip to content

Commit 42b409a

Browse files
committed
fix NPE
1 parent 69d139b commit 42b409a

File tree

1 file changed

+12
-6
lines changed

1 file changed

+12
-6
lines changed

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

+12-6
Original file line numberDiff line numberDiff line change
@@ -115,8 +115,6 @@
115115
(all-metrics)
116116
(filter-metrics filter))))))
117117
(defn- serve-metrics*
118-
([request registry]
119-
(serve-metrics* request registry false))
120118
([request registry {:keys [pretty-print? filter rate-unit duration-unit]}]
121119
(let [metrics-map (render-metrics registry filter (unit/build-options rate-unit duration-unit))
122120
json (generate-string metrics-map {:pretty pretty-print?})]
@@ -125,11 +123,19 @@
125123

126124
(defn serve-metrics
127125
([request]
128-
(serve-metrics* request default-registry))
126+
(let [^String filter (get-in request [:params :filter])]
127+
(serve-metrics* request default-registry {:pretty-print? false
128+
:filter filter
129+
:rate-unit TimeUnit/SECONDS
130+
:duration-unit TimeUnit/NANOSECONDS})))
129131
([request respond raise]
130-
(try
131-
(respond (serve-metrics* request default-registry))
132-
(catch Exception e (raise e)))))
132+
(let [^String filter (get-in request [:params :filter])]
133+
(try
134+
(serve-metrics* request default-registry {:pretty-print? false
135+
:filter filter
136+
:rate-unit TimeUnit/SECONDS
137+
:duration-unit TimeUnit/NANOSECONDS})
138+
(catch Exception e (raise e))))))
133139

134140

135141
(defn expose-metrics-as-json

0 commit comments

Comments
 (0)