add metrics ns

Author: ericdallo

src/eca/db.clj

@@ -6,6 +6,7 @@
    [cognitect.transit :as transit]
    [eca.config :as config :refer [get-env get-property]]
    [eca.logger :as logger]
+   [eca.metrics :as metrics]
    [eca.shared :as shared])
   (:import
    [java.io OutputStream]))
@@ -76,7 +77,7 @@
 
 (defn ^:private read-cache [cache-file]
   (try
-    (logger/logging-task
+    (metrics/task
      :db/read-cache
      (if (fs/exists? cache-file)
        (let [cache (with-open [is (io/input-stream cache-file)]
@@ -89,7 +90,7 @@
 
 (defn ^:private upsert-cache! [cache cache-file]
   (try
-    (logger/logging-task
+    (metrics/task
      :db/upsert-cache
      (io/make-parents cache-file)
       ;; https://github.com/cognitect/transit-clj/issues/43

src/eca/handlers.clj

@@ -8,13 +8,14 @@
    [eca.features.tools.mcp :as f.mcp]
    [eca.logger :as logger]
    [eca.messenger :as messenger]
+   [eca.metrics :as metrics]
    [eca.models :as models]
    [eca.shared :as shared]))
 
 (set! *warn-on-reflection* true)
 
 (defn initialize [{:keys [db*]} params]
-  (logger/logging-task
+  (metrics/task
    :eca/initialize
    (reset! config/initialization-config* (shared/map->camel-cased-map (:initialization-options params)))
    (let [config (config/all @db*)]
@@ -42,33 +43,36 @@
                                   (:welcomeMessage config))}))))
 
 (defn initialized [{:keys [db* messenger config]}]
-  (let [sync-models-and-notify! (fn [config]
-                                  (let [new-providers-hash (hash (:providers config))]
-                                    (when (not= (:providers-config-hash @db*) new-providers-hash)
-                                      (swap! db* assoc :providers-config-hash new-providers-hash)
-                                      (models/sync-models! db* config (fn [models]
-                                                                        (let [db @db*]
-                                                                          (config/notify-fields-changed-only!
-                                                                           {:chat
-                                                                            {:models (sort (keys models))
-                                                                             :behaviors (distinct (keys (:behavior config)))
-                                                                             :select-model (f.chat/default-model db config)
-                                                                             :select-behavior (config/validate-behavior-name
-                                                                                               (or (:defaultBehavior (:chat config)) ;;legacy
-                                                                                                   (:defaultBehavior config))
-                                                                                               config)
-                                                                             :welcome-message (or (:welcomeMessage (:chat config)) ;;legacy
-                                                                                                  (:welcomeMessage config))
-                                                                             ;; Deprecated, remove after changing emacs, vscode and intellij.
-                                                                             :default-model (f.chat/default-model db config)
-                                                                             :default-behavior (config/validate-behavior-name
-                                                                                                (or (:defaultBehavior (:chat config)) ;;legacy
-                                                                                                    (:defaultBehavior config))
-                                                                                                config)}}
-                                                                           messenger
-                                                                           db*)))))))]
-    (swap! db* assoc-in [:config-updated-fns :sync-models] #(sync-models-and-notify! %))
-    (sync-models-and-notify! config))
+  (metrics/task
+   :eca/initialized
+   (let [sync-models-and-notify!
+         (fn [config]
+           (let [new-providers-hash (hash (:providers config))]
+             (when (not= (:providers-config-hash @db*) new-providers-hash)
+               (swap! db* assoc :providers-config-hash new-providers-hash)
+               (models/sync-models! db* config (fn [models]
+                                                 (let [db @db*]
+                                                   (config/notify-fields-changed-only!
+                                                    {:chat
+                                                     {:models (sort (keys models))
+                                                      :behaviors (distinct (keys (:behavior config)))
+                                                      :select-model (f.chat/default-model db config)
+                                                      :select-behavior (config/validate-behavior-name
+                                                                        (or (:defaultBehavior (:chat config)) ;;legacy
+                                                                            (:defaultBehavior config))
+                                                                        config)
+                                                      :welcome-message (or (:welcomeMessage (:chat config)) ;;legacy
+                                                                           (:welcomeMessage config))
+                                                          ;; Deprecated, remove after changing emacs, vscode and intellij.
+                                                      :default-model (f.chat/default-model db config)
+                                                      :default-behavior (config/validate-behavior-name
+                                                                         (or (:defaultBehavior (:chat config)) ;;legacy
+                                                                             (:defaultBehavior config))
+                                                                         config)}}
+                                                    messenger
+                                                    db*)))))))]
+     (swap! db* assoc-in [:config-updated-fns :sync-models] #(sync-models-and-notify! %))
+     (sync-models-and-notify! config)))
   (future
     (Thread/sleep 1000) ;; wait chat window is open in some editors.
     (when-let [error (config/validation-error)]
@@ -83,57 +87,57 @@
     (f.tools/init-servers! db* messenger config)))
 
 (defn shutdown [{:keys [db*]}]
-  (logger/logging-task
+  (metrics/task
    :eca/shutdown
    (f.mcp/shutdown! db*)
    (swap! db* assoc :stopping true)
    nil))
 
 (defn chat-prompt [{:keys [messenger db* config]} params]
-  (logger/logging-task
+  (metrics/task
    :eca/chat-prompt
    (case (get-in @db* [:chats (:chat-id params) :status])
      :login (f.login/handle-step params db* messenger config)
      (f.chat/prompt params db* messenger config))))
 
 (defn chat-query-context [{:keys [db* config]} params]
-  (logger/logging-task
+  (metrics/task
    :eca/chat-query-context
    (f.chat/query-context params db* config)))
 
 (defn chat-query-commands [{:keys [db* config]} params]
-  (logger/logging-task
+  (metrics/task
    :eca/chat-query-commands
    (f.chat/query-commands params db* config)))
 
 (defn chat-tool-call-approve [{:keys [messenger db*]} params]
-  (logger/logging-task
+  (metrics/task
    :eca/chat-tool-call-approve
    (f.chat/tool-call-approve params db* messenger)))
 
 (defn chat-tool-call-reject [{:keys [messenger db*]} params]
-  (logger/logging-task
+  (metrics/task
    :eca/chat-tool-call-reject
    (f.chat/tool-call-reject params db* messenger)))
 
 (defn chat-prompt-stop [{:keys [db* messenger]} params]
-  (logger/logging-task
+  (metrics/task
    :eca/chat-prompt-stop
    (f.chat/prompt-stop params db* messenger)))
 
 (defn chat-delete [{:keys [db*]} params]
-  (logger/logging-task
+  (metrics/task
    :eca/chat-delete
    (f.chat/delete-chat params db*)
    {}))
 
 (defn mcp-stop-server [{:keys [db* messenger config]} params]
-  (logger/logging-task
+  (metrics/task
    :eca/mcp-stop-server
    (f.tools/stop-server! (:name params) db* messenger config)))
 
 (defn mcp-start-server [{:keys [db* messenger config]} params]
-  (logger/logging-task
+  (metrics/task
    :eca/mcp-start-server
    (f.tools/start-server! (:name params) db* messenger config)))
 
@@ -151,8 +155,10 @@
   "Switches model to the one defined in custom-behavior or to the default-one
    and updates tool status for the new behavior"
   [{:keys [db* messenger config]} {:keys [behavior]}]
-  (let [validated-behavior (config/validate-behavior-name behavior config)
-        behavior-config (get-in config [:behavior validated-behavior])
-        tool-status-fn (f.tools/make-tool-status-fn config validated-behavior)]
-    (update-behavior-model! behavior-config config messenger db*)
-    (f.tools/refresh-tool-servers! tool-status-fn db* messenger config)))
+  (metrics/task
+   :eca/chat-selected-behavior-changed
+   (let [validated-behavior (config/validate-behavior-name behavior config)
+         behavior-config (get-in config [:behavior validated-behavior])
+         tool-status-fn (f.tools/make-tool-status-fn config validated-behavior)]
+     (update-behavior-model! behavior-config config messenger db*)
+     (f.tools/refresh-tool-servers! tool-status-fn db* messenger config))))

src/eca/logger.clj

@@ -26,25 +26,3 @@
 
 (defn debug [& args]
   (apply stderr-print :debug args))
-
-(defn format-time-delta-ms [start-time end-time]
-  (format "%.0fms" (float (/ (- end-time start-time) 1000000))))
-
-(defn start-time->end-time-ms [start-time]
-  (format-time-delta-ms start-time (System/nanoTime)))
-
-(defmacro logging-time
-  "Executes `body` logging `message` formatted with the time spent
-  from body."
-  [message & body]
-  (let [start-sym (gensym "start-time")]
-    `(let [~start-sym (System/nanoTime)
-           result# (do ~@body)]
-       ~(with-meta
-          `(info (format ~message (start-time->end-time-ms ~start-sym)))
-          (meta &form))
-       result#)))
-
-(defmacro logging-task [task-id & body]
-  (with-meta `(logging-time (str ~task-id " %s") ~@body)
-    (meta &form)))

src/eca/metrics.clj

@@ -0,0 +1,29 @@
+(ns eca.metrics
+  (:require
+   [eca.logger :as logger]))
+
+(defn format-time-delta-ms [start-time end-time]
+  (format "%.0fms" (float (/ (- end-time start-time) 1000000))))
+
+(defn start-time->end-time-ms [start-time]
+  (format-time-delta-ms start-time (System/nanoTime)))
+
+(defn metrify-task [{:keys [task-id time]}]
+  (logger/info (str task-id " " time)))
+
+(defmacro task*
+  "Executes `body` logging `message` formatted with the time spent
+  from body."
+  [task-id & body]
+  (let [start-sym (gensym "start-time")]
+    `(let [~start-sym (System/nanoTime)
+           result# (do ~@body)]
+       ~(with-meta
+          `(metrify-task {:task-id ~task-id
+                          :time (start-time->end-time-ms ~start-sym)})
+          (meta &form))
+       result#)))
+
+(defmacro task [task-id & body]
+  (with-meta `(task* ~task-id ~@body)
+    (meta &form)))

src/eca/server.clj

@@ -6,6 +6,7 @@
    [eca.handlers :as handlers]
    [eca.logger :as logger]
    [eca.messenger :as messenger]
+   [eca.metrics :as metrics]
    [eca.nrepl :as nrepl]
    [eca.shared :as shared :refer [assoc-some]]
    [jsonrpc4clj.io-server :as io-server]
@@ -19,7 +20,7 @@
   (apply logger/info args))
 
 (defn ^:private exit [server]
-  (logger/logging-task
+  (metrics/task
    :eca/exit
    (jsonrpc.server/shutdown server) ;; blocks, waiting up to 10s for previously received messages to be processed
    (shutdown-agents)