Skip to content

Add tracing for xe calls in the CLI server #5249

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 2 commits into from
Nov 21, 2023
Merged

Add tracing for xe calls in the CLI server #5249

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
9508094
Add tracing for xe calls in the CLI server
robhoes Nov 15, 2023
1a694d7
Update datamodel lifecycle
robhoes Nov 20, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion ocaml/idl/datamodel_lifecycle.ml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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" ->
Expand Down
7 changes: 7 additions & 0 deletions ocaml/libs/tracing/tracing.mli
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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

Expand Down
3 changes: 2 additions & 1 deletion ocaml/xapi-cli-server/xapi_cli.ml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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 ->
Expand Down