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

expose Scope.get_surrounding

Browse source
This commit is contained in:
Simon Cruanes 2022-09-19 16:04:37 -04:00
parent a2e273282c
commit e60e7754b3
No known key found for this signature in database
GPG key ID: EBFFF6F283F3A2B4
1 changed files with 15 additions and 10 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

25
src/opentelemetry.ml
View file

@ -512,18 +512,23 @@ module Scope = struct
let[@inline] add_attrs (scope : t) (attrs : unit -> key_value list) : unit = let[@inline] add_attrs (scope : t) (attrs : unit -> key_value list) : unit =
if Collector.has_backend () then if Collector.has_backend () then
scope.attrs <- List.rev_append (attrs ()) scope.attrs scope.attrs <- List.rev_append (attrs ()) scope.attrs
end
(* now. We use thread local storage to store the currently active scope, (**/**)
if any. *)
open struct
let global_scope : Scope.t Thread_local.t = Thread_local.create ()
(* access global scope if [scope=None] *) (* define this locally *)
let get_scope ?scope () = let _global_scope : t Thread_local.t = Thread_local.create ()
(**/**)
(** Obtain current scope from thread-local storage, if available *)
let get_surrounding ?scope () : t option =
match scope with match scope with
| Some _ -> scope | Some _ -> scope
| None -> Thread_local.get global_scope | None -> Thread_local.get _global_scope
end
open struct
let get_surrounding_scope = Scope.get_surrounding
end end
(** Span Link (** Span Link
@ -719,7 +724,7 @@ module Trace = struct
if force_new_trace_id then if force_new_trace_id then
None None
else else
get_scope ?scope () get_surrounding_scope ?scope ()
in in
let trace_id = let trace_id =
match trace_id, scope with match trace_id, scope with
@ -739,7 +744,7 @@ module Trace = struct
let span_id = Span_id.create () in let span_id = Span_id.create () in
let scope = { trace_id; span_id; events = []; attrs } in let scope = { trace_id; span_id; events = []; attrs } in
(* set global scope in this thread *) (* set global scope in this thread *)
Thread_local.with_ global_scope scope @@ fun _sc -> Thread_local.with_ Scope._global_scope scope @@ fun _sc ->
(* called once we're done, to emit a span *) (* called once we're done, to emit a span *)
let finally res = let finally res =
let status = let status =