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

compat with trace 0.6

Browse source
This commit is contained in:
Simon Cruanes 2024-02-09 14:45:50 -05:00
parent b9f574d3b2
commit 97daf5b402
No known key found for this signature in database
GPG key ID: EBFFF6F283F3A2B4
1 changed files with 29 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

35
src/trace/opentelemetry_trace.ml
View file

@ -130,7 +130,7 @@ module Internal = struct
otrace_id, sb otrace_id, sb
let exit_span' otrace_id let exit_span_
{ {
id = otel_id; id = otel_id;
start_time; start_time;
@ -145,11 +145,7 @@ module Internal = struct
parent_scope = _; parent_scope = _;
} = } =
let open Otel in let open Otel in
let active_spans = Active_spans.get () in
Active_span_tbl.remove active_spans.tbl otrace_id;
let end_time = Timestamp_ns.now_unix_ns () in let end_time = Timestamp_ns.now_unix_ns () in
let kind, attrs = otel_attrs_of_otrace_data data in let kind, attrs = otel_attrs_of_otrace_data data in
let attrs = let attrs =
@ -176,6 +172,19 @@ module Internal = struct
~end_time ~attrs name ~end_time ~attrs name
|> fst |> fst
let exit_span' otrace_id otel_span_begin =
let active_spans = Active_spans.get () in
Active_span_tbl.remove active_spans.tbl otrace_id;
exit_span_ otel_span_begin
let exit_span_from_id otrace_id =
let active_spans = Active_spans.get () in
match Active_span_tbl.find_opt active_spans.tbl otrace_id with
| None -> None
| Some otel_span_begin ->
Active_span_tbl.remove active_spans.tbl otrace_id;
Some (exit_span_ otel_span_begin)
module M = struct module M = struct
let with_span ~__FUNCTION__ ~__FILE__ ~__LINE__ ~data name cb = let with_span ~__FUNCTION__ ~__FILE__ ~__LINE__ ~data name cb =
let otrace_id, sb = let otrace_id, sb =
@ -187,9 +196,23 @@ module Internal = struct
let otel_span = exit_span' otrace_id sb in let otel_span = exit_span' otrace_id sb in
Otel.Trace.emit [ otel_span ]; Otel.Trace.emit [ otel_span ];
rv rv
let enter_span ~__FUNCTION__ ~__FILE__ ~__LINE__ ~data name :
Trace_core.span =
let otrace_id, _sb =
enter_span' ~__FUNCTION__ ~__FILE__ ~__LINE__ ~data name
in
(* NOTE: we cannot enter ambient scope in a disjoint way
with the exit, because we only have [Ambient_context.with_binding],
no [set_binding] *)
otrace_id
let exit_span otrace_id =
match exit_span_from_id otrace_id with
| None -> ()
| Some otel_span -> Otel.Trace.emit [ otel_span ]
let enter_manual_span ~(parent : Otrace.explicit_span option) ~flavor:_ let enter_manual_span ~(parent : Otrace.explicit_span option) ~flavor:_
~__FUNCTION__ ~__FILE__ ~__LINE__ ~data name : Otrace.explicit_span = ~__FUNCTION__ ~__FILE__ ~__LINE__ ~data name : Otrace.explicit_span =
let otrace_id, sb = let otrace_id, sb =