diff --git a/forkexec.opam b/forkexec.opam index c458ac94713..a3296ea9771 100644 --- a/forkexec.opam +++ b/forkexec.opam @@ -21,6 +21,7 @@ depends: [ "xapi-log" "xapi-stdext-pervasives" "xapi-stdext-unix" + "xapi-tracing" ] synopsis: "Sub-process control service for xapi" description: diff --git a/forkexec.opam.template b/forkexec.opam.template index 6e9cd4df453..cf537533421 100644 --- a/forkexec.opam.template +++ b/forkexec.opam.template @@ -19,6 +19,7 @@ depends: [ "xapi-log" "xapi-stdext-pervasives" "xapi-stdext-unix" + "xapi-tracing" ] synopsis: "Sub-process control service for xapi" description: diff --git a/ocaml/forkexecd/lib/dune b/ocaml/forkexecd/lib/dune index 3ed1d4eb891..3d132e8ed76 100644 --- a/ocaml/forkexecd/lib/dune +++ b/ocaml/forkexecd/lib/dune @@ -12,6 +12,7 @@ xapi-log xapi-stdext-pervasives xapi-stdext-unix + xapi-tracing ) (preprocess (pps ppx_deriving_rpc))) diff --git a/ocaml/forkexecd/lib/forkhelpers.ml b/ocaml/forkexecd/lib/forkhelpers.ml index f212ae7f03d..2c8041b9535 100644 --- a/ocaml/forkexecd/lib/forkhelpers.ml +++ b/ocaml/forkexecd/lib/forkhelpers.ml @@ -36,6 +36,10 @@ let test_path = let runtime_path = Option.value ~default:"/var" test_path +let _with_tracing ?tracing ~name f = + let name = Printf.sprintf "forkhelpers.%s" name in + Tracing.with_tracing ?parent:tracing ~name f + let finally = Xapi_stdext_pervasives.Pervasiveext.finally type pidty = Unix.file_descr * int diff --git a/ocaml/tests/test_observer.ml b/ocaml/tests/test_observer.ml index 6c08e5209f8..a6b943741b1 100644 --- a/ocaml/tests/test_observer.ml +++ b/ocaml/tests/test_observer.ml @@ -71,9 +71,7 @@ module TracerProvider = struct let find_provider_exn ~name = let providers = get_tracer_providers () in match - List.find_opt - (fun x -> TracerProvider.get_name_label x = name) - providers + List.find_opt (fun x -> TracerProvider.get_name_label x = name) providers with | Some provider -> provider