Merge pull request #5551 from GabrielBuica/private/dbuica/CP-48195-v2

CP-48195: Split `tracing` library to avoid future cyclic dependencies

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:

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:

ocaml/forkexecd/lib/dune

@@ -12,6 +12,7 @@
    xapi-log
    xapi-stdext-pervasives
    xapi-stdext-unix
+   xapi-tracing
  )
  (preprocess
   (pps ppx_deriving_rpc)))

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

ocaml/libs/tracing/dune

@@ -1,18 +1,26 @@
 (library
-  (name tracing)
-  (public_name xapi-tracing)
-  (libraries
-    cohttp
-    cohttp-posix
-    ptime
-    ptime.clock.os
-    rpclib.core
-    rpclib.json
-    xapi-log
-    xapi-open-uri
-    xapi-stdext-threads
-    xapi-stdext-unix
-    zstd
-  )
-  (preprocess (pps ppx_deriving_rpc))
-)
+ (name tracing)
+ (modules tracing)
+ (libraries re uri xapi-log xapi-stdext-threads)
+ (public_name xapi-tracing))
+
+(library
+ (name tracing_export)
+ (modules tracing_export)
+ (public_name xapi-tracing.export)
+ (libraries
+  cohttp
+  cohttp-posix
+  ptime
+  ptime.clock.os
+  rpclib.core
+  rpclib.json
+  tracing
+  uri
+  xapi-log
+  xapi-open-uri
+  xapi-stdext-threads
+  xapi-stdext-unix
+  zstd)
+ (preprocess
+  (pps ppx_deriving_rpc)))