mirror of
https://github.com/taoensso/telemere.git
synced 2026-01-05 00:48:24 +00:00
[mod] Rename signal field: :runtime-nsecs -> :run-nsecs
This commit is contained in:
parent
d8ef32f088
commit
25ed34f022
3 changed files with 14 additions and 14 deletions
|
|
@ -15,10 +15,10 @@ Default keys:
|
|||
`:data` - Arb user-level data ?val (usu. a map) given to signal call
|
||||
`:error` - Arb user-level platform ?error [2] given to signal call
|
||||
|
||||
`:run-form` - Unevaluated ?form given to signal call as `:run`
|
||||
`:run-value` - Successful return ?val of `:run` ?form
|
||||
`:end-instant` - Platform ?instant [1] when `:run` ?form completed
|
||||
`:runtime-nsecs`- ?int nanosecs runtime of `:run` ?form
|
||||
`:run-form` - Unevaluated ?form given to signal call as `:run`
|
||||
`:run-value` - Successful return ?val of `:run` ?form
|
||||
`:run-nsecs` - ?int nanosecs runtime of `:run` ?form
|
||||
`:end-instant` - Platform ?instant [1] when `:run` ?form completed
|
||||
|
||||
`:ctx` - ?val of `*ctx*` (arb user-level state) when signal was created
|
||||
`:parent` - ?{:keys [id uid]} of parent signal, present in nested signals when tracing
|
||||
|
|
|
|||
|
|
@ -197,7 +197,7 @@
|
|||
location ns line column file,
|
||||
sample-rate, kind id level, ctx parent,
|
||||
data msg_ error run-form run-value,
|
||||
end-instant runtime-nsecs])
|
||||
end-instant run-nsecs])
|
||||
|
||||
(deftype #_defrecord WrappedSignal
|
||||
;; Internal type to implement `sigs/IFilterableSignal`,
|
||||
|
|
@ -316,7 +316,7 @@
|
|||
|
||||
;;;; Signal constructor
|
||||
|
||||
(deftype RunResult [value error ^long runtime-nsecs]
|
||||
(deftype RunResult [value error ^long run-nsecs]
|
||||
#?(:clj clojure.lang.IFn :cljs IFn)
|
||||
(#?(:clj invoke :cljs -invoke) [_] (if error (throw error) value)))
|
||||
|
||||
|
|
@ -332,10 +332,10 @@
|
|||
|
||||
(let [signal
|
||||
(if-let [^RunResult run-result run-result]
|
||||
(let [runtime-nsecs (.-runtime-nsecs run-result)
|
||||
(let [run-nsecs (.-run-nsecs run-result)
|
||||
end-instant
|
||||
#?(:clj (.plusNanos ^java.time.Instant instant runtime-nsecs)
|
||||
:cljs (js/Date. (+ (.getTime instant) (/ runtime-nsecs 1e6))))
|
||||
#?(:clj (.plusNanos ^java.time.Instant instant run-nsecs)
|
||||
:cljs (js/Date. (+ (.getTime instant) (/ run-nsecs 1e6))))
|
||||
|
||||
run-error (.-error run-result)
|
||||
run-value (.-value run-result)
|
||||
|
|
@ -349,7 +349,7 @@
|
|||
sample-rate, kind id level, ctx parent,
|
||||
data msg_,
|
||||
run-error run-form run-value,
|
||||
end-instant runtime-nsecs))
|
||||
end-instant run-nsecs))
|
||||
|
||||
(Signal. 1 instant uid,
|
||||
location ns line column file,
|
||||
|
|
|
|||
|
|
@ -67,8 +67,8 @@
|
|||
(let [[rv1 [sv1]] (ws (sig! {:level :info }))
|
||||
[rv2 [sv2]] (ws (sig! {:level :info, :run (+ 1 2)}))]
|
||||
|
||||
[(is (= rv1 true)) (is (sm? sv1 {:ns "taoensso.telemere-tests", :level :info, :run-form nil, :run-value nil, :runtime-nsecs nil}))
|
||||
(is (= rv2 3)) (is (sm? sv2 {:ns "taoensso.telemere-tests", :level :info, :run-form '(+ 1 2), :run-value 3, :runtime-nsecs (enc/pred nat-int?)}))])
|
||||
[(is (= rv1 true)) (is (sm? sv1 {:ns "taoensso.telemere-tests", :level :info, :run-form nil, :run-value nil, :run-nsecs nil}))
|
||||
(is (= rv2 3)) (is (sm? sv2 {:ns "taoensso.telemere-tests", :level :info, :run-form '(+ 1 2), :run-value 3, :run-nsecs (enc/pred nat-int?)}))])
|
||||
|
||||
(testing "Nested signals"
|
||||
(let [[[inner-rv [inner-sv]] [outer-sv]] (ws (sig! {:level :info, :run (ws (sig! {:level :warn, :run "inner-run"}))}))]
|
||||
|
|
@ -98,8 +98,8 @@
|
|||
[(is (enc/inst? start))
|
||||
(is (enc/inst? end))
|
||||
(is (= (inst-ms start) 0) "Respect custom instant")
|
||||
(is (> (inst-ms end) (inst-ms start)) "End instant is start + runtime-nsecs")
|
||||
(is (< (inst-ms end) 1e6) "End instant is start + runtime-nsecs")])]))
|
||||
(is (> (inst-ms end) (inst-ms start)) "End instant is start + run-nsecs")
|
||||
(is (< (inst-ms end) 1e6) "End instant is start + run-nsecs")])]))
|
||||
|
||||
(testing "User opts assoced directly to signal"
|
||||
(let [[rv [sv]] (ws (sig! {:level :info, :my-opt1 "v1", :my-opt2 "v2"}))]
|
||||
|
|
|
|||
Loading…
Reference in a new issue