main/src/taoensso/telemere/timbre.cljc

@@ -35,21 +35,21 @@
                   (enc/format* pattern            vargs)
                   (enc/str-join " " (map arg-str) vargs)))]
 
-          [error msg vargs])
+          [error msg {:vargs vargs}])
 
         (let [md      (if (and (map? v0) (get (meta v0) :meta)) v0 nil)
-              error   (get    md :err)
+              error   (get md :err)
               md      (dissoc md :err)
-              vargs   (if     md (enc/vrest vargs) vargs)
-              pattern (if format-msg? (let [[v0]   vargs] v0) nil)
-              vargs   (if format-msg? (enc/vrest   vargs) vargs)
+              vargs   (if md (enc/vrest vargs) vargs)
+              pattern (if format-msg? (let [[v0] vargs] v0) nil)
+              vargs   (if format-msg? (enc/vrest vargs) vargs)
               msg
               (delay
                 (if format-msg?
                   (enc/format* pattern            vargs)
                   (enc/str-join " " (map arg-str) vargs)))]
 
-          [error msg (when-not (empty? vargs) vargs)])))))
+          [error msg (when-not (empty? vargs) {:vargs vargs})])))))
 
 (comment
   (parse-vargs true [                   "hello %s" "stu"])
@@ -63,13 +63,13 @@
      [level format-msg? vargs]
      (truss/keep-callsite
        `(when (impl/signal-allowed? {:kind :log, :level ~level, :id shim-id})
-          (let [[error# msg# vargs#] (parse-vargs ~format-msg? ~vargs)]
+          (let [[error# msg# data#] (parse-vargs ~format-msg? ~vargs)]
             (tel/log!
-              {:allow?       true
-               :level        ~level
-               :id           shim-id
-               :error        error#
-               :timbre/vargs vargs#}
+              {:allow? true
+               :level  ~level
+               :id     shim-id
+               :error  error#
+               :data   data#}
               msg#)
             nil)))))
 
@@ -190,10 +190,8 @@
    :min-level nil
    :fn
    (fn [data]
-     (let [{:keys [instant level context vargs #_?err #_output_
-                   ?ns-str ?file ?line ?column]} data
-
-           [error msg vargs] (parse-vargs vargs)]
+     (let [{:keys [instant level context ?err output_
+                   ?ns-str ?file ?line ?column]} data]
 
        (taoensso.telemere/signal!
          {:kind :timbre
@@ -205,6 +203,5 @@
           :coords (when ?line [?line ?column])
           :file   ?file ; Non-standard, goes to kvs
 
-          :error        error
-          :msg          msg
-          :timbre/vargs vargs})))})
+          :error  ?err
+          :msg    (force output_)})))})

main/test/taoensso/telemere_tests.cljc

@@ -754,15 +754,15 @@
 ;;;; Timbre shim
 
 (deftest _timbre-shim
-  [(is (sm? (with-sig (timbre/log :warn              "x1" nil "x2")) {:kind :log, :level :warn,  :id timbre/shim-id, :msg_ "x1 nil x2", :timbre/vargs ["x1" nil "x2"], :ns string?}))
-   (is (sm? (with-sig (timbre/info                   "x1" nil "x2")) {:kind :log, :level :info,  :id timbre/shim-id, :msg_ "x1 nil x2", :timbre/vargs ["x1" nil "x2"], :ns string?}))
-   (is (sm? (with-sig (timbre/error                  "x1" nil "x2")) {:kind :log, :level :error, :id timbre/shim-id, :msg_ "x1 nil x2", :timbre/vargs ["x1" nil "x2"], :ns string?}))
+  [(is (sm? (with-sig (timbre/log :warn              "x1" nil "x2")) {:kind :log, :level :warn,  :id timbre/shim-id, :msg_ "x1 nil x2", :data {:vargs ["x1" nil "x2"]}, :ns string?}))
+   (is (sm? (with-sig (timbre/info                   "x1" nil "x2")) {:kind :log, :level :info,  :id timbre/shim-id, :msg_ "x1 nil x2", :data {:vargs ["x1" nil "x2"]}, :ns string?}))
+   (is (sm? (with-sig (timbre/error                  "x1" nil "x2")) {:kind :log, :level :error, :id timbre/shim-id, :msg_ "x1 nil x2", :data {:vargs ["x1" nil "x2"]}, :ns string?}))
 
-   (is (sm? (with-sig (timbre/logf :warn  "%s %s %s" "x1" nil "x2")) {:kind :log, :level :warn,  :id timbre/shim-id, :msg_ "x1 nil x2", :timbre/vargs ["x1" nil "x2"], :ns string?}))
-   (is (sm? (with-sig (timbre/infof       "%s %s %s" "x1" nil "x2")) {:kind :log, :level :info,  :id timbre/shim-id, :msg_ "x1 nil x2", :timbre/vargs ["x1" nil "x2"], :ns string?}))
-   (is (sm? (with-sig (timbre/errorf      "%s %s %s" "x1" nil "x2")) {:kind :log, :level :error, :id timbre/shim-id, :msg_ "x1 nil x2", :timbre/vargs ["x1" nil "x2"], :ns string?}))
+   (is (sm? (with-sig (timbre/logf :warn  "%s %s %s" "x1" nil "x2")) {:kind :log, :level :warn,  :id timbre/shim-id, :msg_ "x1 nil x2", :data {:vargs ["x1" nil "x2"]}, :ns string?}))
+   (is (sm? (with-sig (timbre/infof       "%s %s %s" "x1" nil "x2")) {:kind :log, :level :info,  :id timbre/shim-id, :msg_ "x1 nil x2", :data {:vargs ["x1" nil "x2"]}, :ns string?}))
+   (is (sm? (with-sig (timbre/errorf      "%s %s %s" "x1" nil "x2")) {:kind :log, :level :error, :id timbre/shim-id, :msg_ "x1 nil x2", :data {:vargs ["x1" nil "x2"]}, :ns string?}))
 
-   (is (sm? (with-sig (timbre/info ex1 "x1" "x2")) {:kind :log, :level :info, :error ex1, :msg_ "x1 x2", :timbre/vargs ["x1" "x2"]}) "First-arg error")
+   (is (sm? (with-sig (timbre/info ex1 "x1" "x2")) {:kind :log, :level :info, :error ex1, :msg_ "x1 x2", :data {:vargs ["x1" "x2"]}}) "First-arg error")
 
    (is (sm?                            (with-sig (timbre/spy :info "my-name" (+ 1 2))) {:kind :spy, :level :info,  :id timbre/shim-id, :msg_ "my-name => 3", :ns string?}))
    (is (sm? (tel/with-min-level :debug (with-sig (timbre/spy (+ 1 2))))                {:kind :spy, :level :debug, :id timbre/shim-id, :msg_ "(+ 1 2) => 3", :ns string?}))