Improve LLM request logs to include headers

Author: ericdallo

CHANGELOG.md

@@ -3,6 +3,7 @@
 ## Unreleased
 
 - Add workspaces to `/doctor`
+- Improve LLM request logs to include headers.
 
 ## 0.78.1
 

src/eca/llm_providers/anthropic.clj

@@ -70,21 +70,22 @@
   (let [url (str api-url (or url-relative-path messages-path))
         reason-id (str (random-uuid))
         oauth? (= :auth/oauth auth-type)
+        headers (assoc-some
+                 {"anthropic-version" "2023-06-01"
+                  "Content-Type" "application/json"}
+                 "x-api-key" (when-not oauth? api-key)
+                 "Authorization" (when oauth? (str "Bearer " api-key))
+                 "anthropic-beta" (when oauth? "oauth-2025-04-20"))
         response* (atom nil)
         on-error (if on-stream
                    on-error
                    (fn [error-data]
                      (llm-util/log-response logger-tag rid "response-error" body)
                      (reset! response* error-data)))]
-    (llm-util/log-request logger-tag rid url body)
+    (llm-util/log-request logger-tag rid url body headers)
     @(http/post
       url
-      {:headers (assoc-some
-                 {"anthropic-version" "2023-06-01"
-                  "Content-Type" "application/json"}
-                 "x-api-key" (when-not oauth? api-key)
-                 "Authorization" (when oauth? (str "Bearer " api-key))
-                 "anthropic-beta" (when oauth? "oauth-2025-04-20"))
+      {:headers headers
        :body (json/generate-string body)
        :throw-exceptions? false
        :async? true

src/eca/llm_providers/ollama.clj

@@ -60,7 +60,7 @@
                    (fn [error-data]
                      (llm-util/log-response logger-tag rid "response-error" body)
                      (reset! response* error-data)))]
-    (llm-util/log-request logger-tag rid url body)
+    (llm-util/log-request logger-tag rid url body {})
     @(http/post
       url
       {:body (json/generate-string body)

src/eca/llm_providers/openai.clj

@@ -37,21 +37,22 @@
         url (if oauth?
               codex-url
               (str api-url (or url-relative-path responses-path)))
+        headers (assoc-some
+                 {"Authorization" (str "Bearer " api-key)
+                  "Content-Type" "application/json"}
+                 "chatgpt-account-id" (jtw-token->account-id api-key)
+                 "OpenAI-Beta" (when oauth? "responses=experimental"),
+                 "Originator" (when oauth? "codex_cli_rs")
+                 "Session-ID" (when oauth? (str (random-uuid))))
         on-error (if on-stream
                    on-error
                    (fn [error-data]
                      (llm-util/log-response logger-tag rid "response-error" body)
                      {:error error-data}))]
-    (llm-util/log-request logger-tag rid url body)
+    (llm-util/log-request logger-tag rid url body headers)
     @(http/post
       url
-      {:headers (assoc-some
-                 {"Authorization" (str "Bearer " api-key)
-                  "Content-Type" "application/json"}
-                 "chatgpt-account-id" (jtw-token->account-id api-key)
-                 "OpenAI-Beta" (when oauth? "responses=experimental"),
-                 "Originator" (when oauth? "codex_cli_rs")
-                 "Session-ID" (when oauth? (str (random-uuid))))
+      {:headers headers
        :body (json/generate-string body)
        :throw-exceptions? false
        :async? true

src/eca/llm_providers/openai_chat.clj

@@ -94,13 +94,14 @@
                    on-error
                    (fn [error-data]
                      (llm-util/log-response logger-tag rid "response-error" error-data)
-                     {:error error-data}))]
-    (llm-util/log-request logger-tag rid url body)
+                     {:error error-data}))
+        headers (merge {"Authorization" (str "Bearer " api-key)
+                        "Content-Type" "application/json"}
+                       extra-headers)]
+    (llm-util/log-request logger-tag rid url body headers)
     @(http/post
       url
-      {:headers (merge {"Authorization" (str "Bearer " api-key)
-                        "Content-Type" "application/json"}
-                       extra-headers)
+      {:headers headers
        :body (json/generate-string body)
        :throw-exceptions? false
        :async? true

src/eca/llm_util.clj

@@ -4,7 +4,8 @@
    [clojure.string :as string]
    [eca.config :as config]
    [eca.logger :as logger]
-   [eca.secrets :as secrets])
+   [eca.secrets :as secrets]
+   [eca.shared :as shared])
   (:import
    [java.io BufferedReader]
    [java.nio.charset StandardCharsets]
@@ -60,8 +61,11 @@
    ""
    (-> result :output :contents)))
 
-(defn log-request [tag rid url body]
-  (logger/debug tag (format "[%s] Sending body: '%s', url: '%s'" rid body url)))
+(defn log-request [tag rid url body headers]
+  (let [obfuscated-headers (-> headers
+                               (shared/update-some "Authorization" #(shared/obfuscate % {:preserve-num 8}))
+                               (shared/update-some "x-api-key" shared/obfuscate))]
+    (logger/debug tag (format "[%s] Sending body: '%s', headers: '%s', url: '%s'" rid body obfuscated-headers url))))
 
 (defn log-response [tag rid event data]
   (logger/debug tag (format "[%s] %s %s" rid (or event "") data)))

src/eca/shared.clj

@@ -147,14 +147,15 @@
   "Obfuscate all but first 3 and last 3 characters of a string, minimum 5 characters.
    If the string is 4 characters or less, obfuscate all characters.
    Replace the middle part with asterisks, but always at least 5 asterisks."
-  [s]
+  [s & {:keys [preserve-num]
+        :or {preserve-num 3}}]
   (when s
     (string/replace
      (if (<= (count s) 4)
        (apply str (repeat (count s) "*"))
-       (str (subs s 0 3)
+       (str (subs s 0 preserve-num)
             (apply str (repeat (- (count s) 4) "*"))
-            (subs s (- (count s) 3))))
+            (subs s (- (count s) preserve-num))))
      (string/join "" (repeat (- (count s) 4) "*")) "*****")))
 
 (defn normalize-model-name [model]