From 8b58be68a29f432b54b7fc86037824522a0f7417 Mon Sep 17 00:00:00 2001
From: Peter Taoussanis <peter@taoensso.com>
Date: Mon, 19 Aug 2024 15:38:19 +0200
Subject: [PATCH] [new] OpenTelemetry handler: auto capture signal context

---
 src/taoensso/telemere/impl.cljc          | 17 ++++++++++++-----
 src/taoensso/telemere/open_telemetry.clj |  1 +
 2 files changed, 13 insertions(+), 5 deletions(-)

diff --git a/src/taoensso/telemere/impl.cljc b/src/taoensso/telemere/impl.cljc
index 892232a..1bd6089 100644
--- a/src/taoensso/telemere/impl.cljc
+++ b/src/taoensso/telemere/impl.cljc
@@ -171,12 +171,19 @@
   [(enc/qb 1e6   (cond-binding true [*trace-parent* {:id :id1, :uid :uid1, :inst :inst1}] *trace-parent*)) ; 226.18
    (macroexpand '(cond-binding true [*trace-parent* {:id :id1, :uid :uid1, :inst :inst1}] *trace-parent*))])
 
+#?(:clj
+   (enc/compile-if               io.opentelemetry.context.Context/current
+     (defmacro otel-context [] `(io.opentelemetry.context.Context/current))
+     (defmacro otel-context [] nil)))
+
+(comment (enc/qb 1e6 (otel-context))) ; 20.43
+
 ;;;; Main types
 
 (defrecord Signal
   ;; Telemere's main public data type, we avoid nesting and duplication
   [^long schema inst uid,
-   location ns line column file, #?@(:clj [host thread]),
+   location ns line column file, #?@(:clj [host thread _otel-context]),
    sample-rate, kind id level, ctx parent root, data kvs msg_,
    error run-form run-val end-inst run-nsecs]
 
@@ -551,10 +558,10 @@
                      (let [record-form
                            (let [clause [(if run-form :run :no-run) (if clj? :clj :cljs)]]
                              (case clause
-                               [:run    :clj ]  `(Signal. 1 ~'__inst ~'__uid, ~location ~'__ns ~line-form ~column-form ~file-form, (enc/host-info) ~'__thread, ~sample-rate-form, ~'__kind ~'__id ~'__level, ~ctx-form ~parent-form ~'__root, ~data-form ~kvs-form ~'_msg_,   ~'_run-err  '~run-form ~'_run-val ~'_end-inst ~'_run-nsecs)
-                               [:run    :cljs]  `(Signal. 1 ~'__inst ~'__uid, ~location ~'__ns ~line-form ~column-form ~file-form,                             ~sample-rate-form, ~'__kind ~'__id ~'__level, ~ctx-form ~parent-form ~'__root, ~data-form ~kvs-form ~'_msg_,   ~'_run-err  '~run-form ~'_run-val ~'_end-inst ~'_run-nsecs)
-                               [:no-run :clj ]  `(Signal. 1 ~'__inst ~'__uid, ~location ~'__ns ~line-form ~column-form ~file-form, (enc/host-info) ~'__thread, ~sample-rate-form, ~'__kind ~'__id ~'__level, ~ctx-form ~parent-form ~'__root, ~data-form ~kvs-form ~msg-form, ~error-form nil        nil        nil         nil)
-                               [:no-run :cljs]  `(Signal. 1 ~'__inst ~'__uid, ~location ~'__ns ~line-form ~column-form ~file-form,                             ~sample-rate-form, ~'__kind ~'__id ~'__level, ~ctx-form ~parent-form ~'__root, ~data-form ~kvs-form ~msg-form, ~error-form nil        nil        nil         nil)
+                               [:run    :clj ]  `(Signal. 1 ~'__inst ~'__uid, ~location ~'__ns ~line-form ~column-form ~file-form, (enc/host-info) ~'__thread (otel-context), ~sample-rate-form, ~'__kind ~'__id ~'__level, ~ctx-form ~parent-form ~'__root, ~data-form ~kvs-form ~'_msg_,   ~'_run-err  '~run-form ~'_run-val ~'_end-inst ~'_run-nsecs)
+                               [:run    :cljs]  `(Signal. 1 ~'__inst ~'__uid, ~location ~'__ns ~line-form ~column-form ~file-form,                                            ~sample-rate-form, ~'__kind ~'__id ~'__level, ~ctx-form ~parent-form ~'__root, ~data-form ~kvs-form ~'_msg_,   ~'_run-err  '~run-form ~'_run-val ~'_end-inst ~'_run-nsecs)
+                               [:no-run :clj ]  `(Signal. 1 ~'__inst ~'__uid, ~location ~'__ns ~line-form ~column-form ~file-form, (enc/host-info) ~'__thread (otel-context), ~sample-rate-form, ~'__kind ~'__id ~'__level, ~ctx-form ~parent-form ~'__root, ~data-form ~kvs-form ~msg-form, ~error-form nil        nil        nil         nil)
+                               [:no-run :cljs]  `(Signal. 1 ~'__inst ~'__uid, ~location ~'__ns ~line-form ~column-form ~file-form,                                            ~sample-rate-form, ~'__kind ~'__id ~'__level, ~ctx-form ~parent-form ~'__root, ~data-form ~kvs-form ~msg-form, ~error-form nil        nil        nil         nil)
                                (enc/unexpected-arg! clause {:context :signal-constructor-args})))
 
                            record-form
diff --git a/src/taoensso/telemere/open_telemetry.clj b/src/taoensso/telemere/open_telemetry.clj
index b45de96..b18c91a 100644
--- a/src/taoensso/telemere/open_telemetry.clj
+++ b/src/taoensso/telemere/open_telemetry.clj
@@ -595,6 +595,7 @@
                 [^Tracer  tracer ?tracer
                  ^Context context
                  (enc/get* signal :otel/context ; Undocumented
+                   :_otel-context
                    #_(io.opentelemetry.context.Context/root)
                    (io.opentelemetry.context.Context/current))