diff --git a/src/taoensso/telemere/impl.cljc b/src/taoensso/telemere/impl.cljc index d923e43..cd48c11 100644 --- a/src/taoensso/telemere/impl.cljc +++ b/src/taoensso/telemere/impl.cljc @@ -314,7 +314,7 @@ '([{:as opts :keys [#_defaults #_elide? #_allow? #_callsite-id, elidable? location instant uid middleware, - sample-rate ns kind id level filter when rate-limit, + sample-rate ns kind id level when rate-limit, ctx parent trace?, do let data msg error run & user-opts]}]) :log! ; [msg] [level-or-opts msg] => @@ -323,7 +323,7 @@ [{:as opts :keys [#_defaults #_elide? #_allow? #_callsite-id, elidable? location instant uid middleware, - sample-rate ns kind id level filter when rate-limit, + sample-rate ns kind id level when rate-limit, ctx parent trace?, do let data msg error #_run & user-opts]} msg]) @@ -333,7 +333,7 @@ [{:as opts :keys [#_defaults #_elide? #_allow? #_callsite-id, elidable? location instant uid middleware, - sample-rate ns kind id level filter when rate-limit, + sample-rate ns kind id level when rate-limit, ctx parent trace?, do let data msg error #_run & user-opts]} id]) @@ -343,7 +343,7 @@ [{:as opts :keys [#_defaults #_elide? #_allow? #_callsite-id, elidable? location instant uid middleware, - sample-rate ns kind id level filter when rate-limit, + sample-rate ns kind id level when rate-limit, ctx parent trace?, do let data msg error #_run & user-opts]} error]) @@ -353,7 +353,7 @@ [{:as opts :keys [#_defaults #_elide? #_allow? #_callsite-id, elidable? location instant uid middleware, - sample-rate ns kind id level filter when rate-limit, + sample-rate ns kind id level when rate-limit, ctx parent trace?, do let data msg error run & user-opts]} form]) @@ -363,7 +363,7 @@ [{:as opts :keys [#_defaults #_elide? #_allow? #_callsite-id, rethrow? catch-val, elidable? location instant uid middleware, - sample-rate ns kind id level filter when rate-limit, + sample-rate ns kind id level when rate-limit, ctx parent trace?, do let data msg error #_run & user-opts]} form]) @@ -373,7 +373,7 @@ [{:as opts :keys [#_defaults #_elide? #_allow? #_callsite-id, elidable? location instant uid middleware, - sample-rate ns kind id level filter when rate-limit, + sample-rate ns kind id level when rate-limit, ctx parent trace?, do let data msg error #_run & user-opts]}]) (enc/unexpected-arg! macro-id)))) diff --git a/test/taoensso/telemere_tests.cljc b/test/taoensso/telemere_tests.cljc index 75f000c..5a2cc3d 100644 --- a/test/taoensso/telemere_tests.cljc +++ b/test/taoensso/telemere_tests.cljc @@ -283,7 +283,7 @@ {:async nil, :error-fn (fn [x] (reset! error_ x)), :rl-error nil, :middleware [(fn [sv] (if *throwing-handler-middleware?* (throw ex1) sv))]} - [(is (->> (sig! {:level :info, :filter (throw ex1)}) (throws? :ex-info "TestEx")) "`~filterable-expansion/allow` throws at call") + [(is (->> (sig! {:level :info, :when (throw ex1)}) (throws? :ex-info "TestEx")) "`~filterable-expansion/allow` throws at call") (is (->> (sig! {:level :info, :instant (throw ex1)}) (throws? :ex-info "TestEx")) "`~instant-form` throws at call") (is (->> (sig! {:level :info, :id (throw ex1)}) (throws? :ex-info "TestEx")) "`~id-form` throws at call") (is (->> (sig! {:level :info, :uid (throw ex1)}) (throws? :ex-info "TestEx")) "`~uid-form` throws at call")