luciano/telemere
1
0
Fork 0
mirror of https://github.com/taoensso/telemere.git synced 2026-01-27 08:40:35 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

[fix] Signal fields: define based on target (not macro) platform

Browse source 
Attempted fix for possible issue with "Electric Clojure"
This commit is contained in:
Peter Taoussanis 2024-09-06 10:33:21 +02:00
parent f52a04b4dc
commit 92a7aee530
1 changed files with 21 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

29
projects/main/src/taoensso/telemere/impl.cljc
View file

@ -9,7 +9,7 @@
#?(:cljs #?(:cljs
(:require-macros (:require-macros
[taoensso.telemere.impl :refer [with-signal]]))) [taoensso.telemere.impl :refer [with-signal def-signal-record]])))
(comment (comment
(remove-ns 'taoensso.telemere.impl) (remove-ns 'taoensso.telemere.impl)
@ -231,14 +231,27 @@
;;;; Main types ;;;; Main types
(defrecord Signal #?(:clj
;; Telemere's main public data type, we avoid nesting and duplication (defmacro def-signal-record
[^long schema inst uid, "Defines Telemere's main public data type, we avoid nesting and duplication."
location ns line column file, #?@(:clj [host thread _otel-context]), []
sample-rate, kind id level, ctx parent root, data kvs msg_, (let [fields
error run-form run-val end-inst run-nsecs] (if (:ns &env)
'[schema inst uid,
location ns line column file,
;; host thread _otel-context,
sample-rate, kind id level, ctx parent root, data kvs msg_,
error run-form run-val end-inst run-nsecs]
'[schema inst uid,
location ns line column file,
host thread _otel-context,
sample-rate, kind id level, ctx parent root, data kvs msg_,
error run-form run-val end-inst run-nsecs])]
Object (toString [sig] (str "#" `Signal (into {} sig)))) `(defrecord ~'Signal ~fields
~'Object (~'toString [sig#] (str "#taoensso.telemere.impl.Signal" (into {} sig#)))))))
(defonce __def-signal-record (def-signal-record))
(do (enc/def-print-impl [sig Signal] (str "#" `Signal (pr-str (into {} sig))))) (do (enc/def-print-impl [sig Signal] (str "#" `Signal (pr-str (into {} sig)))))
#?(:clj (enc/def-print-dup [sig Signal] (str "#" `Signal (pr-str (into {} sig))))) ; NB intentionally verbose, to support extra keys #?(:clj (enc/def-print-dup [sig Signal] (str "#" `Signal (pr-str (into {} sig))))) ; NB intentionally verbose, to support extra keys