Merge pull request #5249 from robhoes/oil2

Add tracing for xe calls in the CLI server

ocaml/idl/datamodel_lifecycle.ml

@@ -100,7 +100,7 @@ let prototyped_of_message = function
   | "host", "set_https_only" ->
       Some "22.27.0"
   | "VM", "restart_device_models" ->
-      Some "23.29.0-next"
+      Some "23.30.0"
   | "pool", "set_ext_auth_max_threads" ->
       Some "23.27.0"
   | "pool", "set_local_auth_max_threads" ->

ocaml/libs/tracing/tracing.mli

@@ -117,6 +117,13 @@ val get_tracer_providers : unit -> TracerProvider.t list
 
 val get_tracer : name:string -> Tracer.t
 
+val with_tracing :
+     ?attributes:(string * string) list
+  -> ?parent:Span.t option
+  -> name:string
+  -> (Span.t option -> 'a)
+  -> 'a
+
 module Export : sig
   val set_export_interval : float -> unit
 

ocaml/xapi-cli-server/xapi_cli.ml

@@ -137,7 +137,8 @@ let do_rpcs _req s username password minimal cmd session args =
   try
     let generic_rpc = get_rpc () in
     (* NB the request we've received is for the /cli. We need an XMLRPC request for the API *)
-    let req = Xmlrpc_client.xmlrpc ~version:"1.1" "/" in
+    Tracing.with_tracing ~name:("xe " ^ cmdname) @@ fun tracing ->
+    let req = Xmlrpc_client.xmlrpc ~version:"1.1" ~tracing "/" in
     let rpc = generic_rpc req s in
     if do_forward then
       with_session ~local:false rpc username password session (fun sess ->