mirror of
https://github.com/taoensso/telemere.git
synced 2025-12-18 10:11:10 +00:00
[mod] Rename OpenTelemetry handler option: :extra-attrs-key -> :attrs-key
This commit is contained in:
parent
5f98e7304f
commit
1b41bf2336
1 changed files with 11 additions and 9 deletions
|
|
@ -106,7 +106,7 @@
|
||||||
(defn signal->attrs-map
|
(defn signal->attrs-map
|
||||||
"Returns attributes map for given signal,
|
"Returns attributes map for given signal,
|
||||||
Ref. <https://opentelemetry.io/docs/specs/otel/logs/data-model/>."
|
Ref. <https://opentelemetry.io/docs/specs/otel/logs/data-model/>."
|
||||||
[extra-attrs-key signal]
|
[attrs-key signal]
|
||||||
(let [attrs-map
|
(let [attrs-map
|
||||||
(let [{:keys [ns line file, kind level id uid parent,
|
(let [{:keys [ns line file, kind level id uid parent,
|
||||||
run-form run-val run-nsecs, sample-rate]}
|
run-form run-val run-nsecs, sample-rate]}
|
||||||
|
|
@ -145,13 +145,13 @@
|
||||||
|
|
||||||
kvs (get signal :kvs)
|
kvs (get signal :kvs)
|
||||||
attr-kvs
|
attr-kvs
|
||||||
(when extra-attrs-key
|
(when attrs-key
|
||||||
(when-let [kvs (get signal extra-attrs-key)]
|
(when-let [kvs (get signal attrs-key)]
|
||||||
(not-empty kvs)))
|
(not-empty kvs)))
|
||||||
|
|
||||||
kvs
|
kvs
|
||||||
(if attr-kvs
|
(if attr-kvs
|
||||||
(dissoc kvs extra-attrs-key)
|
(dissoc kvs attrs-key)
|
||||||
(do kvs))
|
(do kvs))
|
||||||
|
|
||||||
attrs-map
|
attrs-map
|
||||||
|
|
@ -190,12 +190,14 @@
|
||||||
returned by given `io.opentelemetry.api.logs.LoggerProvider`."
|
returned by given `io.opentelemetry.api.logs.LoggerProvider`."
|
||||||
|
|
||||||
([] (handler:open-telemetry-logger nil))
|
([] (handler:open-telemetry-logger nil))
|
||||||
([{:keys [^LoggerProvider logger-provider
|
([{:keys
|
||||||
extra-attrs-key ; Undocumented
|
[^LoggerProvider logger-provider
|
||||||
]
|
attrs-key ; Advanced, undocumented
|
||||||
|
]
|
||||||
|
|
||||||
:or
|
:or
|
||||||
{logger-provider (get-default-logger-provider)
|
{logger-provider (get-default-logger-provider)
|
||||||
extra-attrs-key :open-telemetry-attrs}}]
|
attrs-key :open-telemetry-attrs}}]
|
||||||
|
|
||||||
(let []
|
(let []
|
||||||
(fn a-handler:open-telemetry-logger
|
(fn a-handler:open-telemetry-logger
|
||||||
|
|
@ -205,7 +207,7 @@
|
||||||
logger (.get logger-provider (or ns "default"))
|
logger (.get logger-provider (or ns "default"))
|
||||||
severity (level->severity level)
|
severity (level->severity level)
|
||||||
msg (force msg_)
|
msg (force msg_)
|
||||||
attrs-map (signal->attrs-map extra-attrs-key signal)
|
attrs-map (signal->attrs-map attrs-key signal)
|
||||||
attrs (as-attrs attrs-map)]
|
attrs (as-attrs attrs-map)]
|
||||||
|
|
||||||
(.emit
|
(.emit
|
||||||
|
|
|
||||||
Loading…
Reference in a new issue