From 450798832cfd12665f4add43371333af2188c9ab Mon Sep 17 00:00:00 2001
From: Peter Taoussanis <peter@taoensso.com>
Date: Tue, 5 Mar 2024 11:14:01 +0100
Subject: [PATCH] [nop] Misc housekeeping

---
 project.clj                       |  2 +-
 src/taoensso/telemere.cljc        | 11 +++++++++--
 src/taoensso/telemere/impl.cljc   |  7 ++++---
 test/taoensso/telemere_tests.cljc |  7 +++----
 4 files changed, 17 insertions(+), 10 deletions(-)

diff --git a/project.clj b/project.clj
index 8209369..2053d3b 100644
--- a/project.clj
+++ b/project.clj
@@ -8,7 +8,7 @@
    :url  "https://www.eclipse.org/legal/epl-v10.html"}
 
   :dependencies
-  [[com.taoensso/encore    "3.89.0"]
+  [[com.taoensso/encore    "3.90.0"]
    [org.clj-commons/pretty "2.2.1"]]
 
   :test-paths ["test" #_"src"]
diff --git a/src/taoensso/telemere.cljc b/src/taoensso/telemere.cljc
index 54709e7..fcd6827 100644
--- a/src/taoensso/telemere.cljc
+++ b/src/taoensso/telemere.cljc
@@ -19,7 +19,7 @@
   (remove-ns 'taoensso.telemere)
   (:api (enc/interns-overview)))
 
-(enc/assert-min-encore-version [3 89 0])
+(enc/assert-min-encore-version [3 90 0])
 
 ;;;; Roadmap
 ;; x Fundamentals
@@ -381,7 +381,7 @@
      (defn- interop-test! [msg form-fn]
        (let [msg (str "Interop test: " msg " (" (enc/uuid-str) ")")
              signal
-             (binding [impl/*rt-sig-filter* nil]
+             (without-filters
                (impl/with-signal {:stop-propagation? true, :return :signal}
                  (form-fn msg)))]
 
@@ -452,4 +452,11 @@
        (signal! {:level :info, :run "run", :allow? false})
        (signal! {:level :info, :run "run", :allow? true })
        (signal! {:level :info, :run "run", :trace? false})
+       (signal! {:level :info, :run "run"}))
+
+     ;; For README "performance" table
+     (enc/qb [8 1e6] ; [9.23 220.27 300.83 726.07]
+       (signal! {:level :info, :elide? true})
+       (signal! {:level :info})
+       (signal! {:level :info, :run "run", :trace? false})
        (signal! {:level :info, :run "run"}))]))
diff --git a/src/taoensso/telemere/impl.cljc b/src/taoensso/telemere/impl.cljc
index d61f690..c650da4 100644
--- a/src/taoensso/telemere/impl.cljc
+++ b/src/taoensso/telemere/impl.cljc
@@ -158,13 +158,14 @@
        (do                                                 form))))
 
 (comment
-  [(macroexpand '(with-tracing false :id1 :uid1 "form"))
+  [(enc/qb 1e6   (with-tracing true  :id1 :uid1 "form")) ; 302.2
+   (macroexpand '(with-tracing false :id1 :uid1 "form"))
    (macroexpand '(with-tracing true  :id1 :uid1 "form"))])
 
 ;;;; Main types
 
 (defrecord Signal
-  ;; Telemere's main public data type, we avoid field nesting and duplication
+  ;; Telemere's main public data type, we avoid nesting and duplication
   [^long schema-version instant uid,
    callsite-id location ns line column file,
    sample-rate, kind id level, ctx parent,
@@ -435,7 +436,7 @@
                 level-form   :level} opts
 
                trace?         (get opts :trace? (boolean run-form))
-               uid-form       (get opts :uid    (when trace? :auto/uuid-str))
+               uid-form       (get opts :uid    (when trace? :auto/uuid))
                ctx-form       (get opts :ctx                 `taoensso.telemere/*ctx*)
                parent-form    (get opts :parent (when trace? `taoensso.telemere.impl/*trace-parent*))
                instant-form   (get opts :instant  :auto)
diff --git a/test/taoensso/telemere_tests.cljc b/test/taoensso/telemere_tests.cljc
index 35b3bf0..02595a3 100644
--- a/test/taoensso/telemere_tests.cljc
+++ b/test/taoensso/telemere_tests.cljc
@@ -182,9 +182,9 @@
             (is (= rv6 10)) (is (= (force (get sv6 dk)) [:n 11, :c6 13]))
             (is (= @c  14)  "6x run + 4x let (2x suppressed) + 4x data (2x suppressed)")]))))
 
-   (testing "Manual `let` (unconditional) + `:data`"
+   (testing "Manual `let` (unconditional) + `:data`/`:my-opt`"
      (vec
-       (for [dk [:data #_:my-opt]]
+       (for [dk [:data :my-opt]]
          (let [c         (enc/counter)
                [rv1 sv1] (ws (let [n (c)] (sig! {:level :info, :run (c), dk        {:n n, :c1 (c)}})))
                [rv2 sv2] (ws (let [n (c)] (sig! {:level :info, :run (c), dk (delay {:n n, :c2 (c)})})))
@@ -193,8 +193,7 @@
                [rv5 sv5] (ws (let [n (c)] (sig! {:level :info, :run (c), dk        [:n n, :c5 (c)]})))
                [rv6 sv6] (ws (let [n (c)] (sig! {:level :info, :run (c), dk (delay [:n n, :c6 (c)])})))]
 
-           [
-            (is (= rv1 1))  (is (=        (get sv1 dk)  {:n 0, :c1 2}))
+           [(is (= rv1 1))  (is (=        (get sv1 dk)  {:n 0, :c1 2}))
             (is (= rv2 4))  (is (= (force (get sv2 dk)) {:n 3, :c2 14}))
             (is (= rv3 6))  (is (=        (get sv3 dk)  nil))
             (is (= rv4 8))  (is (= (force (get sv4 dk)) nil))