Skip to content

Fix middlewares metric #2

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
ericdallo merged 4 commits into from
Jan 14, 2026
Merged

Fix middlewares metric #2

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
8dead73
Fix middlwares metric
ericdallo Jan 12, 2026
9504169
Use middleware when available
ericdallo Jan 14, 2026
c5f3598
Fix tests
ericdallo Jan 14, 2026
c74db85
Check response instead of payload
ericdallo Jan 14, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
24 changes: 16 additions & 8 deletions src/metrepl/metrics.clj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,15 +5,14 @@
[clojure.string :as string]
[metrepl.config :as config]
[metrepl.exporters :as exporters]
[metrepl.transport :as m.transport]
[nrepl.middleware.dynamic-loader :as nrepl.dynamic-loader])
[metrepl.transport :as m.transport])
(:import
[java.lang.management ManagementFactory]
[java.util.jar JarFile]))

(defonce first-load-file?* (atom true))

(defn ^:private msg->payload [{:keys [op] :as msg}]
(defn ^:private msg->initial-payload [{:keys [op] :as msg}]
(merge {:op op}
(case op
"clone" (select-keys msg [:client-name :client-version])
Expand All @@ -24,6 +23,15 @@
"close" {:session-time-ms (.getUptime (ManagementFactory/getRuntimeMXBean))}
nil)))

(defn ^:private initial-payload->final-payload [initial-payload response end-time]
(cond-> initial-payload

(and (= "describe" (:op initial-payload)) (get response :middleware))
(assoc :middleware (vec (get response :middleware)))

:always
(assoc :time-ms end-time)))

(defn metrify* [metric content-fn]
(try
(exporters/export! {:metric metric
Expand All @@ -40,8 +48,8 @@
(metrify* metric (constantly content)))

(defn metrify-op-task [msg]
(let [payload (msg->payload msg)
_ (metrify :event/op-requested payload)
(let [initial-payload (msg->initial-payload msg)
_ (metrify :event/op-requested initial-payload)
start-time (System/currentTimeMillis)]
(when (and (= "load-file" (:op msg))
@first-load-file?*)
Expand All @@ -51,8 +59,9 @@
{:on-before-send
(fn [response]
(when (contains? (:status response) :done)
(let [end-time (- (System/currentTimeMillis) start-time)]
(metrify :event/op-completed (assoc payload :time-ms end-time)))))})))
(let [end-time (- (System/currentTimeMillis) start-time)
final-payload (initial-payload->final-payload initial-payload response end-time)]
(metrify :event/op-completed final-payload))))})))

(def ^:private type-by-file
{"project.clj" "lein"
Expand All @@ -78,5 +87,4 @@
(classpath/classpath-jarfiles))]
{:startup-time-ms startup-time-ms
:project-types project-types
:middlewares (some->> nrepl.dynamic-loader/*state* deref :stack (mapv #(subs (str %) 2)))
:dependencies dependencies}))))
23 changes: 20 additions & 3 deletions test/metrepl/metrics_test.clj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -134,7 +134,25 @@
metric))))]
(-> (metrics/metrify-op-task {:op "close" :transport mock-transport})
:transport
(.send {:status #{:done}})))))
(.send {:status #{:done}}))))
(testing "describe op"
(with-redefs [exporters/export! (fn [metric]
(case (:metric metric)
:event/op-requested
(is (match? {:metric :event/op-requested
:payload {:op "describe"}}
metric))
:event/op-completed
(is (match? {:metric :event/op-completed
:payload {:op "describe"
:middleware ["some-middleware"]
:time-ms int?}}
metric))))]
(-> (metrics/metrify-op-task {:op "describe"
:transport mock-transport})
:transport
(.send {:status #{:done}
:middleware ["some-middleware"]})))))

(deftest metrify-repl-ready-test
(with-redefs [nrepl.dynamic-loader/*state* (atom {:stack [#'op-metrics/wrap-op-metrics]})
Expand All @@ -143,7 +161,6 @@
:info/repl-ready
(is (match? {:metric :info/repl-ready
:payload {:startup-time-ms 123
:project-types (matchers/in-any-order ["deps" "babashka"])
:middlewares (matchers/embeds ["metrepl.middleware.op-metrics/wrap-op-metrics"])}}
:project-types (matchers/in-any-order ["deps" "babashka"])}}
metric))))]
(metrics/metrify-repl-ready 123)))
Loading