simon/ocaml-trace
1
0
Fork 0
mirror of https://github.com/ocaml-tracing/ocaml-trace.git synced 2026-03-07 18:37:56 -05:00
Code Issues Projects Releases Packages Wiki Activity Actions

chore: depend on core in trace-tef

Browse source 
This changes trace-tef to depend on trace-core instead of trace, to
avoid clashing with the toplevel's Trace module when starting utop.
This commit is contained in:
Joseph Price 2023-07-30 10:11:31 -04:00 • committed by Simon Cruanes
parent c92a829022
commit f8cd53ec89
3 changed files with 12 additions and 12 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
src/tef/dune
View file

@ -3,4 +3,4 @@
(name trace_tef) (name trace_tef)
(public_name trace-tef) (public_name trace-tef)
(synopsis "Simple and lightweight tracing using TEF/Catapult format, in-process") (synopsis "Simple and lightweight tracing using TEF/Catapult format, in-process")
(libraries trace mtime mtime.clock.os unix threads)) (libraries trace.core mtime mtime.clock.os unix threads))

20
src/tef/trace_tef.ml
View file

@ -1,5 +1,5 @@
open Trace open Trace_core
module A = Trace.Internal_.Atomic_ module A = Trace_core.Internal_.Atomic_
module Mock_ = struct module Mock_ = struct
let enabled = ref false let enabled = ref false
@ -323,25 +323,25 @@ let collector ~out () : collector =
let setup ?(out = `Env) () = let setup ?(out = `Env) () =
match out with match out with
| `Stderr -> Trace.setup_collector @@ collector ~out:`Stderr () | `Stderr -> Trace_core.setup_collector @@ collector ~out:`Stderr ()
| `Stdout -> Trace.setup_collector @@ collector ~out:`Stdout () | `Stdout -> Trace_core.setup_collector @@ collector ~out:`Stdout ()
| `File path -> Trace.setup_collector @@ collector ~out:(`File path) () | `File path -> Trace_core.setup_collector @@ collector ~out:(`File path) ()
| `Env -> | `Env ->
(match Sys.getenv_opt "TRACE" with (match Sys.getenv_opt "TRACE" with
| Some "1" -> | Some "1" ->
let path = "trace.json" in let path = "trace.json" in
let c = collector ~out:(`File path) () in let c = collector ~out:(`File path) () in
Trace.setup_collector c Trace_core.setup_collector c
| Some "stdout" -> Trace.setup_collector @@ collector ~out:`Stdout () | Some "stdout" -> Trace_core.setup_collector @@ collector ~out:`Stdout ()
| Some "stderr" -> Trace.setup_collector @@ collector ~out:`Stderr () | Some "stderr" -> Trace_core.setup_collector @@ collector ~out:`Stderr ()
| Some path -> | Some path ->
let c = collector ~out:(`File path) () in let c = collector ~out:(`File path) () in
Trace.setup_collector c Trace_core.setup_collector c
| None -> ()) | None -> ())
let with_setup ?out () f = let with_setup ?out () f =
setup ?out (); setup ?out ();
protect ~finally:Trace.shutdown f protect ~finally:Trace_core.shutdown f
module Internal_ = struct module Internal_ = struct
let mock_all_ () = Mock_.enabled := true let mock_all_ () = Mock_.enabled := true

2
src/tef/trace_tef.mli
View file

@ -1,5 +1,5 @@
val collector : val collector :
out:[ `File of string | `Stderr | `Stdout ] -> unit -> Trace.collector out:[ `File of string | `Stderr | `Stdout ] -> unit -> Trace_core.collector
(** Make a collector that writes into the given output. (** Make a collector that writes into the given output.
See {!setup} for more details. *) See {!setup} for more details. *)