From 0c3f685734a39825c97c7a88fc91075da02cbf0a Mon Sep 17 00:00:00 2001
From: Peter Taoussanis <peter@taoensso.com>
Date: Tue, 9 Apr 2024 13:27:54 +0200
Subject: [PATCH] [nop] Misc housekeeping

---
 src/taoensso/telemere.cljc        | 13 ++++++++-----
 src/taoensso/telemere/utils.cljc  | 24 ++++++++++++------------
 test/taoensso/telemere_tests.cljc |  1 -
 3 files changed, 20 insertions(+), 18 deletions(-)

diff --git a/src/taoensso/telemere.cljc b/src/taoensso/telemere.cljc
index c9606e1..8415ff3 100644
--- a/src/taoensso/telemere.cljc
+++ b/src/taoensso/telemere.cljc
@@ -38,7 +38,7 @@
 ;; - Review, TODOs, missing docstrings
 ;; - Reading plan, wiki docs, explainer/demo video
 ;;
-;; - First OpenTelemetry tools
+;; - Next OpenTelemetry tools (traces, etc.)
 ;; - Update Tufte  (signal API, config API, signal keys, etc.)
 ;; - Update Timbre (signal API, config API, signal keys, backport improvements)
 
@@ -51,9 +51,12 @@
    :*rt-sig-filter* impl/*rt-sig-filter*})
 
 (comment
-  [level-aliases]
-  [help:handlers get-handlers add-handler! remove-handler! with-handler with-handler+]
-  [help:filtering get-filters get-min-level
+  [level-aliases
+
+   help:handlers get-handlers add-handler! remove-handler!
+   with-handler with-handler+ shut-down-handlers!
+
+   help:filtering get-filters get-min-level
    set-kind-filter! set-ns-filter! set-id-filter! set-min-level!
    with-kind-filter with-ns-filter with-id-filter with-min-level])
 
@@ -350,7 +353,7 @@
 #?(:clj
    (enc/compile-when
      (do (require '[taoensso.telemere.tools-logging :as ttl]) true)
-     (enc/defaliases ttl/tools-logging->telemere!)
+     (enc/defalias ttl/tools-logging->telemere!)
      (when (enc/get-env {:as :bool} :clojure.tools.logging->telemere?)
        (ttl/tools-logging->telemere!))))
 
diff --git a/src/taoensso/telemere/utils.cljc b/src/taoensso/telemere/utils.cljc
index 639744a..8b65fb6 100644
--- a/src/taoensso/telemere/utils.cljc
+++ b/src/taoensso/telemere/utils.cljc
@@ -96,7 +96,7 @@
   "Experimental, subject to change.
   Returns true iff given signal has an `:error` value, or a `:kind` or `:level`
   that indicates that it's an error."
-  #?(:cljs {:tag 'string})
+  #?(:cljs {:tag 'boolean})
   [signal]
   (and signal
     (boolean
@@ -273,10 +273,10 @@
                s+ (partial enc/sb-append sb)
                {:keys [chain trace]} em]
 
-           (let [s++ (enc/sb-appender sb (str nls "Caused: "))]
+           (let [s+cause (enc/sb-appender sb (str nls "Caused: "))]
              (s+ "  Root: ")
              (doseq [{:keys [type msg data]} (rseq chain)]
-               (s++ type " - " msg)
+               (s+cause type " - " msg)
                (when data
                  (s+ nl "  data: " (enc/pr-edn* data)))))
 
@@ -307,14 +307,14 @@
 
    (fn format-signal-prelude [signal]
      (let [{:keys [inst level kind ns id msg_]} signal
-           sb (enc/str-builder)
-           s+ (enc/sb-appender sb " ")]
+           sb    (enc/str-builder)
+           s+spc (enc/sb-appender sb " ")]
 
-       (when inst  (when-let [ff format-inst-fn] (s+ (ff inst))))
-       (when level (s+ (format-level level)))
+       (when inst  (when-let [ff format-inst-fn] (s+spc (ff inst))))
+       (when level (s+spc (format-level level)))
 
-       (if kind (s+ (upper-qn kind)) (s+ "DEFAULT"))
-       #?(:clj  (s+ (hostname)))
+       (if kind (s+spc (upper-qn kind)) (s+spc "DEFAULT"))
+       #?(:clj  (s+spc (hostname)))
 
        ;; "<ns>:(<line>,<column>)"
        (when-let [base (or ns (get signal :file))]
@@ -325,8 +325,8 @@
              (when-let [c (get signal :column)] (s+ "," c))
              (s+ ")"))))
 
-       (when id (s+ (format-id ns id)))
-       (when-let [msg (force msg_)] (s+ "- " msg))
+       (when id (s+spc (format-id ns id)))
+       (when-let [msg (force msg_)] (s+spc "- " msg))
        (str sb)))))
 
 (comment ((format-signal-prelude-fn) (tel/with-signal (tel/event! ::ev-id))))
@@ -445,7 +445,7 @@
              s++ (partial enc/sb-append sb (str newline " "))]
 
          (when-let [ff format-signal-prelude-fn] (s+ (ff signal))) ; Prelude
-         (signal-content-handler signal s++ enc/pr-edn) ; Content
+         (signal-content-handler signal s++ enc/pr-edn*) ; Content
          (str sb))))))
 
 (comment
diff --git a/test/taoensso/telemere_tests.cljc b/test/taoensso/telemere_tests.cljc
index b5cb6b9..867c225 100644
--- a/test/taoensso/telemere_tests.cljc
+++ b/test/taoensso/telemere_tests.cljc
@@ -39,7 +39,6 @@
   (def pstr?     (enc/pred string?))
   (def pnat-int? (enc/pred enc/nat-int?)))
 
-;; (tel/remove-handler! :default/console)
 (let [sig-handlers_ (atom nil)]
   (test/use-fixtures :once
     (enc/test-fixtures