simon/ocaml-opentelemetry
1
0
Fork 0
mirror of https://github.com/ocaml-tracing/ocaml-opentelemetry.git synced 2026-03-09 20:33:36 -04:00
Code Issues Projects Releases Packages Wiki Activity Actions 2

update trace, fix opentelemetry.trace

Browse source
This commit is contained in:
Simon Cruanes 2026-01-21 22:00:08 -05:00
parent a3d375ce90
commit 4183254546
No known key found for this signature in database
GPG key ID: EBFFF6F283F3A2B4
1 changed files with 31 additions and 15 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

46
src/trace/opentelemetry_trace.ml
View file

@ -35,8 +35,9 @@ open struct
let k_span_ctx : OTEL.Span_ctx.t Ambient_context.Context.key = let k_span_ctx : OTEL.Span_ctx.t Ambient_context.Context.key =
Ambient_context.Context.new_key () Ambient_context.Context.new_key ()
let enter_span (self : state) ~__FUNCTION__ ~__FILE__ ~__LINE__ ~params:_ let enter_span (self : state) ~__FUNCTION__ ~__FILE__ ~__LINE__ ~level:_
~(data : (_ * Otrace.user_data) list) ~parent name : Otrace.span = ~params:_ ~(data : (_ * Otrace.user_data) list) ~parent name : Otrace.span
=
let start_time = OTEL.Clock.now self.clock in let start_time = OTEL.Clock.now self.clock in
let trace_id, parent_id = let trace_id, parent_id =
match parent with match parent with
@ -94,7 +95,18 @@ open struct
| Span_otel sp -> OTEL.Span.add_attrs sp data | Span_otel sp -> OTEL.Span.add_attrs sp data
| _ -> () | _ -> ()
let message (self : state) ~params:_ ~data ~span msg : unit = let severity_of_level : Trace_core.Level.t -> _ = function
| Trace -> OTEL.Log_record.Severity_number_trace
| Debug1 -> OTEL.Log_record.Severity_number_debug
| Debug2 -> OTEL.Log_record.Severity_number_debug2
| Debug3 -> OTEL.Log_record.Severity_number_debug3
| Error -> OTEL.Log_record.Severity_number_error
| Info -> OTEL.Log_record.Severity_number_info
| Warning -> OTEL.Log_record.Severity_number_warn
let message (self : state) ~(level : Trace_core.Level.t) ~params:_ ~data ~span
msg : unit =
let observed_time_unix_nano = OTEL.Clock.now self.clock in
let trace_id, span_id = let trace_id, span_id =
match span with match span with
| Some (Span_otel sp) -> | Some (Span_otel sp) ->
@ -106,24 +118,28 @@ open struct
| _ -> None, None) | _ -> None, None)
in in
let observed_time_unix_nano = OTEL.Clock.now self.clock in let severity = severity_of_level level in
let log = let log =
OTEL.Log_record.make ?trace_id ?span_id ~attrs:data OTEL.Log_record.make ~severity ?trace_id ?span_id ~attrs:data
~observed_time_unix_nano (`String msg) ~observed_time_unix_nano (`String msg)
in in
OTEL.Exporter.send_logs self.exporter [ log ] OTEL.Exporter.send_logs self.exporter [ log ]
let counter_int (self : state) ~params:_ ~data:attrs name cur_val : unit = let metric (self : state) ~level:_ ~params:_ ~data:attrs name v : unit =
let now = OTEL.Clock.now self.clock in let now = OTEL.Clock.now self.clock in
let m = OTEL.Metrics.(gauge ~name [ int ~attrs ~now cur_val ]) in let vals =
OTEL.Exporter.send_metrics self.exporter [ m ] match v with
| Trace_core.Core_ext.Metric_int i -> [ OTEL.Metrics.int ~attrs ~now i ]
| Trace_core.Core_ext.Metric_float v ->
[ OTEL.Metrics.float ~attrs ~now v ]
| _ -> []
in
if vals <> [] then (
let m = OTEL.Metrics.(gauge ~name vals) in
OTEL.Exporter.send_metrics self.exporter [ m ]
)
let counter_float (self : state) ~params:_ ~data:attrs name cur_val : unit = let extension (_self : state) ~level:_ ev =
let now = OTEL.Clock.now self.clock in
let m = OTEL.Metrics.(gauge ~name [ float ~attrs ~now cur_val ]) in
OTEL.Exporter.send_metrics self.exporter [ m ]
let extension (_self : state) ev =
match ev with match ev with
| Ev_link_span (Span_otel sp1, sc2) -> | Ev_link_span (Span_otel sp1, sc2) ->
OTEL.Span.add_links sp1 [ OTEL.Span_link.of_span_ctx sc2 ] OTEL.Span.add_links sp1 [ OTEL.Span_link.of_span_ctx sc2 ]
@ -141,7 +157,7 @@ open struct
let callbacks : state Otrace.Collector.Callbacks.t = let callbacks : state Otrace.Collector.Callbacks.t =
Otrace.Collector.Callbacks.make ~enter_span ~exit_span ~add_data_to_span Otrace.Collector.Callbacks.make ~enter_span ~exit_span ~add_data_to_span
~message ~counter_int ~counter_float ~extension ~shutdown () ~message ~metric ~extension ~shutdown ()
end end
let collector_of_exporter (exporter : OTEL.Exporter.t) : Trace_core.collector = let collector_of_exporter (exporter : OTEL.Exporter.t) : Trace_core.collector =