From f522307ee056e7c09f9bb19da9c008fdb4fcebd9 Mon Sep 17 00:00:00 2001 From: Peter Taoussanis Date: Sat, 21 Dec 2024 17:32:42 +0100 Subject: [PATCH] [fix] Trace formatting: always include root info --- projects/main/src/taoensso/telemere/utils.cljc | 12 ++++-------- 1 file changed, 4 insertions(+), 8 deletions(-) diff --git a/projects/main/src/taoensso/telemere/utils.cljc b/projects/main/src/taoensso/telemere/utils.cljc index 84ec790..0642661 100644 --- a/projects/main/src/taoensso/telemere/utils.cljc +++ b/projects/main/src/taoensso/telemere/utils.cljc @@ -598,14 +598,10 @@ vf val-fn] (let [{:keys [ns uid parent root data kvs ctx #?@(:clj [host thread]) sample-rate]} signal] - (when sample-rate (af " sample: " (vf sample-rate))) - (when uid (af " uid: " (vf uid))) - (when parent - (if (= parent root) - (do (af " parent: " (vf (format-parent ns parent)) " (also root)")) ; {:keys [id uid]} - (do - (do (af " parent: " (vf (format-parent ns parent)))) ; {:keys [id uid]} - (when root (af " root: " (vf (format-parent ns root))))))) ; {:keys [id uid]} + (when sample-rate (af " sample: " (vf sample-rate))) + (when uid (af " uid: " (vf uid))) + (when (and parent (not= parent root)) (af " parent: " (vf (format-parent ns parent)))) ; {:keys [id uid]} + (when root (af " root: " (vf (format-parent ns root)))) ; {:keys [id uid]} #?(:clj (when (enc/and* host incl-host?) (af " host: " (vf host)))) ; {:keys [ name ip]} #?(:clj (when (enc/and* thread incl-thread?) (af " thread: " (vf thread)))) ; {:keys [group name id]}