diff --git a/projects/main/src/taoensso/telemere.cljc b/projects/main/src/taoensso/telemere.cljc index cf13a8e..cc9798b 100644 --- a/projects/main/src/taoensso/telemere.cljc +++ b/projects/main/src/taoensso/telemere.cljc @@ -27,13 +27,12 @@ with-ctx with-ctx+ with-middleware with-middleware+]]))) (comment - (remove-ns 'taoensso.telemere) + (remove-ns (symbol (str *ns*))) (:api (enc/interns-overview))) (enc/assert-min-encore-version [3 127 0]) ;;;; TODO -;; - Solution and docs for lib authors ;; - Update Tufte (signal API, config API, signal keys, etc.) ;; - Update Timbre (signal API, config API, signal keys, backport improvements) @@ -46,7 +45,8 @@ :*sig-handlers* impl/*sig-handlers* :lib-dispatch-opts (assoc sigs/default-handler-dispatch-opts - :convey-bindings? false)}) + :convey-bindings? false ; Handled manually + )}) ;;;; Aliases @@ -87,7 +87,7 @@ ;;;; Unique ids (def ^:dynamic *uid-fn* - "Experimental, subject to change. + "Experimental, subject to change. Feedback welcome! (fn [root?]) used to generate signal `:uid` values (unique instance ids) when tracing. @@ -186,7 +186,9 @@ #?(:clj (def ^:dynamic ^:no-doc *otel-tracer* - "OpenTelemetry `Tracer` to use for Telemere's tracing signal creators + "Experimental, subject to change. Feedback welcome! + + OpenTelemetry `Tracer` to use for Telemere's tracing signal creators (`trace!`, `span!`, etc.), ∈ #{nil io.opentelemetry.api.trace.Tracer Delay}. Defaults to the provider in `otel-default-providers_`. diff --git a/projects/main/src/taoensso/telemere/consoles.cljc b/projects/main/src/taoensso/telemere/consoles.cljc index 4f96337..6b16ae0 100644 --- a/projects/main/src/taoensso/telemere/consoles.cljc +++ b/projects/main/src/taoensso/telemere/consoles.cljc @@ -7,7 +7,7 @@ (comment (require '[taoensso.telemere :as tel]) - (remove-ns 'taoensso.telemere.consoles) + (remove-ns (symbol (str *ns*))) (:api (enc/interns-overview))) #?(:clj diff --git a/projects/main/src/taoensso/telemere/files.clj b/projects/main/src/taoensso/telemere/files.clj index d4b9ebc..327cbb1 100644 --- a/projects/main/src/taoensso/telemere/files.clj +++ b/projects/main/src/taoensso/telemere/files.clj @@ -7,7 +7,7 @@ (comment (require '[taoensso.telemere :as tel]) - (remove-ns 'taoensso.telemere.files) + (remove-ns (symbol (str *ns*))) (:api (enc/interns-overview))) ;;;; Implementation diff --git a/projects/main/src/taoensso/telemere/impl.cljc b/projects/main/src/taoensso/telemere/impl.cljc index a8a7cfd..e2148e5 100644 --- a/projects/main/src/taoensso/telemere/impl.cljc +++ b/projects/main/src/taoensso/telemere/impl.cljc @@ -12,7 +12,7 @@ [taoensso.telemere.impl :refer [with-signal]]))) (comment - (remove-ns 'taoensso.telemere.impl) + (remove-ns (symbol (str *ns*))) (:api (enc/interns-overview))) #?(:clj diff --git a/projects/main/src/taoensso/telemere/open_telemetry.clj b/projects/main/src/taoensso/telemere/open_telemetry.clj index f4206df..03c4ce3 100644 --- a/projects/main/src/taoensso/telemere/open_telemetry.clj +++ b/projects/main/src/taoensso/telemere/open_telemetry.clj @@ -16,7 +16,7 @@ [io.opentelemetry.api.trace TracerProvider])) (comment - (remove-ns 'taoensso.telemere.open-telemetry) + (remove-ns (symbol (str *ns*))) (:api (enc/interns-overview))) (enc/declare-remote @@ -355,7 +355,7 @@ (when-let [^io.opentelemetry.context.Context tracing-context ?tracing-context] (.setContext lrb tracing-context)) ; Incl. traceId, spanId, etc. - (when-let [body + (when-let [^String body (or (force msg_) (when-let [error (get signal :error)] diff --git a/projects/main/src/taoensso/telemere/postal.clj b/projects/main/src/taoensso/telemere/postal.clj index 29b5b5e..40305fb 100644 --- a/projects/main/src/taoensso/telemere/postal.clj +++ b/projects/main/src/taoensso/telemere/postal.clj @@ -8,7 +8,7 @@ (comment (require '[taoensso.telemere :as tel]) - (remove-ns 'taoensso.telemere.postal) + (remove-ns (symbol (str *ns*))) (:api (enc/interns-overview))) (defn signal-subject-fn @@ -37,7 +37,7 @@ (when id (s+spc (utils/format-id nil id))) (when-let [msg (force msg_)] (s+spc "- " msg)) - (enc/get-substr-by-len (str sb) 0 max-len)))))) + (enc/substr (str sb) 0 max-len)))))) (comment ((signal-subject-fn) (tel/with-signal (tel/event! ::ev-id1 #_{:postal/subject "My subject"})))) diff --git a/projects/main/src/taoensso/telemere/slack.clj b/projects/main/src/taoensso/telemere/slack.clj index 6fb1cab..83d5da9 100644 --- a/projects/main/src/taoensso/telemere/slack.clj +++ b/projects/main/src/taoensso/telemere/slack.clj @@ -9,7 +9,7 @@ (comment (require '[taoensso.telemere :as tel]) - (remove-ns 'taoensso.telemere.slack) + (remove-ns (symbol (str *ns*))) (:api (enc/interns-overview))) (def default-dispatch-opts diff --git a/projects/main/src/taoensso/telemere/sockets.clj b/projects/main/src/taoensso/telemere/sockets.clj index b6e26c8..cffd4ea 100644 --- a/projects/main/src/taoensso/telemere/sockets.clj +++ b/projects/main/src/taoensso/telemere/sockets.clj @@ -11,7 +11,7 @@ (comment (require '[taoensso.telemere :as tel]) - (remove-ns 'taoensso.telemere.sockets) + (remove-ns (symbol (str *ns*))) (:api (enc/interns-overview))) (defn handler:tcp-socket diff --git a/projects/main/src/taoensso/telemere/timbre.cljc b/projects/main/src/taoensso/telemere/timbre.cljc index a560b0d..1de9df4 100644 --- a/projects/main/src/taoensso/telemere/timbre.cljc +++ b/projects/main/src/taoensso/telemere/timbre.cljc @@ -8,7 +8,7 @@ [taoensso.telemere :as tel])) (comment - (remove-ns 'taoensso.telemere.timbre) + (remove-ns (symbol (str *ns*))) (:api (enc/interns-overview))) (let [arg-str diff --git a/projects/main/src/taoensso/telemere/utils.cljc b/projects/main/src/taoensso/telemere/utils.cljc index 5fa5daa..a22516a 100644 --- a/projects/main/src/taoensso/telemere/utils.cljc +++ b/projects/main/src/taoensso/telemere/utils.cljc @@ -9,7 +9,7 @@ (comment (require '[taoensso.telemere :as tel]) - (remove-ns 'taoensso.telemere.utils) + (remove-ns (symbol (str *ns*))) (:api (enc/interns-overview))) ;;;; Private diff --git a/projects/shell/src/taoensso/telemere/shell.cljc b/projects/shell/src/taoensso/telemere/shell.cljc index ea0b7ea..e6e487b 100644 --- a/projects/shell/src/taoensso/telemere/shell.cljc +++ b/projects/shell/src/taoensso/telemere/shell.cljc @@ -9,7 +9,7 @@ (comment (require '[taoensso.telemere :as t] '[taoensso.encore :as enc]) - (remove-ns 'taoensso.telemere.shell) + (remove-ns (symbol (str *ns*))) (:api (enc/interns-overview))) ;;;; Private diff --git a/projects/slf4j/src/taoensso/telemere/slf4j.clj b/projects/slf4j/src/taoensso/telemere/slf4j.clj index adee5c5..9ada649 100644 --- a/projects/slf4j/src/taoensso/telemere/slf4j.clj +++ b/projects/slf4j/src/taoensso/telemere/slf4j.clj @@ -25,6 +25,8 @@ [org.slf4j Logger] [com.taoensso.telemere.slf4j TelemereLogger])) +(comment (remove-ns (symbol (str *ns*)))) + ;;;; Utils (defmacro ^:private when-debug [& body] (when #_true false `(do ~@body)))