luciano/telemere
1
0
Fork 0
mirror of https://github.com/taoensso/telemere.git synced 2026-01-21 06:09:02 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

[mod] Remove Clj enc/pr-json

Browse source
This commit is contained in:
Peter Taoussanis 2024-04-05 15:32:03 +02:00
parent 21a02f286b
commit 99b2e0c0cb
3 changed files with 21 additions and 21 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
project.clj
View file

@ -48,8 +48,7 @@
[com.taoensso/slf4j-telemere "1.0.0-alpha2"] [com.taoensso/slf4j-telemere "1.0.0-alpha2"]
;; [org.slf4j/slf4j-simple "2.0.12"] ;; [org.slf4j/slf4j-simple "2.0.12"]
;; [org.slf4j/slf4j-nop "2.0.12"] ;; [org.slf4j/slf4j-nop "2.0.12"]
[io.opentelemetry/opentelemetry-api "1.36.0"] [io.opentelemetry/opentelemetry-api "1.36.0"]]
[metosin/jsonista "0.3.8"]]
:plugins :plugins
[[lein-pprint "1.3.2"] [[lein-pprint "1.3.2"]

15
src/taoensso/telemere/utils.cljc
View file

@ -50,7 +50,7 @@
;;;; Public misc ;;;; Public misc
(enc/defaliases enc/newline enc/pr-edn enc/pr-json) (enc/defaliases enc/newline enc/pr-edn #?(:cljs enc/pr-json))
#?(:clj (defn thread-name "Returns string name of current thread." ^String [] (.getName (Thread/currentThread)))) #?(:clj (defn thread-name "Returns string name of current thread." ^String [] (.getName (Thread/currentThread))))
#?(:clj (defn thread-id "Returns long id of current thread." ^long [] (.getId (Thread/currentThread)))) #?(:clj (defn thread-id "Returns long id of current thread." ^long [] (.getId (Thread/currentThread))))
@ -401,17 +401,18 @@
"Experimental, subject to change. "Experimental, subject to change.
Returns a (fn format->json [signal]) that: Returns a (fn format->json [signal]) that:
- Takes a Telemere signal. - Takes a Telemere signal.
- Returns JSON string of the (minified) signal." - Returns JSON string of the (minified) signal.
(Clj only): An appropriate `:pr-json-fn` MUST be provided."
([] (format-signal->json-fn nil)) ([] (format-signal->json-fn nil))
([{:keys [pr-json-fn prep-fn] ([{:keys [pr-json-fn prep-fn]
:or :or
{pr-json-fn pr-json {#?@(:cljs [pr-json-fn pr-json])
prep-fn (comp error-in-signal->maps minify-signal)}}] prep-fn (comp error-in-signal->maps minify-signal)}}]
(enc/try* (when-not pr-json-fn
(pr-json-fn "telemere/auto-test") (throw
(catch :all t (ex-info (str "No `" `format-signal->json-fn "` `:pr-json-fn` was provided") {})))
(throw (ex-info (str "`" `format-signal->json-fn "` `:pr-json` test failed") {} t))))
(fn format-signal->json [signal] (fn format-signal->json [signal]
(let [signal* (if prep-fn (prep-fn signal) signal)] (let [signal* (if prep-fn (prep-fn signal) signal)]

24
test/taoensso/telemere_tests.cljc
View file

@ -13,8 +13,7 @@
[taoensso.telemere.handlers :as handlers] [taoensso.telemere.handlers :as handlers]
#?(:clj [taoensso.telemere.handlers.file-handler :as fh]) #?(:clj [taoensso.telemere.handlers.file-handler :as fh])
#?(:clj [taoensso.telemere.slf4j :as slf4j]) #?(:clj [taoensso.telemere.slf4j :as slf4j])
#?(:clj [clojure.tools.logging :as ctl]) #?(:clj [clojure.tools.logging :as ctl])))
#?(:clj [jsonista.core :as jsonista])))
(comment (comment
(remove-ns 'taoensso.telemere-tests) (remove-ns 'taoensso.telemere-tests)
@ -673,16 +672,17 @@
:line pnat-int? :line pnat-int?
:column pnat-int?})))) :column pnat-int?}))))
(testing "format-signal->json-fn" #?(:cljs
(let [sig (with-sig (tel/event! ::ev-id {:inst t0})) (testing "format-signal->json-fn"
sig* (enc/read-json ((utils/format-signal->json-fn) sig))] (let [sig (with-sig (tel/event! ::ev-id {:inst t0}))
(is sig* (enc/read-json ((utils/format-signal->json-fn) sig))]
(enc/submap? sig* (is
{"schema" 1, "kind" "event", "id" "taoensso.telemere-tests/ev-id", (enc/submap? sig*
"level" "info", "ns" "taoensso.telemere-tests", {"schema" 1, "kind" "event", "id" "taoensso.telemere-tests/ev-id",
"inst" t0s "level" "info", "ns" "taoensso.telemere-tests",
"line" pnat-int? "inst" t0s
"column" pnat-int?})))) "line" pnat-int?
"column" pnat-int?})))))
(testing "format-signal->str-fn" (testing "format-signal->str-fn"
(let [sig (with-sig (tel/event! ::ev-id {:inst t0}))] (let [sig (with-sig (tel/event! ::ev-id {:inst t0}))]