diff --git a/ocaml/xapi-idl/lib/debug_info.ml b/ocaml/xapi-idl/lib/debug_info.ml
index edf3c4979a..e3845fa080 100644
--- a/ocaml/xapi-idl/lib/debug_info.ml
+++ b/ocaml/xapi-idl/lib/debug_info.ml
@@ -76,13 +76,14 @@ let to_log_string t = t.log
 
 (* Sets the logging context based on `dbg`.
    Also adds a new tracing span, linked to the parent span from `dbg`, if available. *)
-let with_dbg ?(with_thread = false) ?(module_name = "") ~name ~dbg f =
+let with_dbg ?attributes ?(with_thread = false) ?(module_name = "") ~name ~dbg f
+    =
   let di = of_string dbg in
   let f_with_trace () =
     let name =
       match module_name with "" -> name | _ -> module_name ^ "." ^ name
     in
-    Tracing.with_tracing ~parent:di.tracing ~name (fun span ->
+    Tracing.with_tracing ?attributes ~parent:di.tracing ~name (fun span ->
         match span with Some _ -> f {di with tracing= span} | None -> f di
     )
   in
diff --git a/ocaml/xapi-idl/lib/debug_info.mli b/ocaml/xapi-idl/lib/debug_info.mli
index 9db6347103..2b0244ac94 100644
--- a/ocaml/xapi-idl/lib/debug_info.mli
+++ b/ocaml/xapi-idl/lib/debug_info.mli
@@ -23,7 +23,8 @@ val to_string : t -> string
 val to_log_string : t -> string
 
 val with_dbg :
-     ?with_thread:bool
+     ?attributes:(string * string) list
+  -> ?with_thread:bool
   -> ?module_name:string
   -> name:string
   -> dbg:string
diff --git a/ocaml/xapi/context.ml b/ocaml/xapi/context.ml
index f03ce60e2a..a49c8ecd1b 100644
--- a/ocaml/xapi/context.ml
+++ b/ocaml/xapi/context.ml
@@ -532,11 +532,12 @@ let with_forwarded_task ?http_other_config ?session_id ?origin task_id f =
   in
   finally_destroy_context ~__context f
 
-let with_tracing ?originator ~__context name f =
+let with_tracing ?(attributes = []) ?originator ~__context name f =
   let open Tracing in
   let parent = __context.tracing in
   let span_attributes =
     Attributes.attr_of_originator originator
+    @ attributes
     @ make_attributes ~task_id:__context.task_id
         ?session_id:__context.session_id ()
   in
diff --git a/ocaml/xapi/context.mli b/ocaml/xapi/context.mli
index 281f67ca4b..ac3250f856 100644
--- a/ocaml/xapi/context.mli
+++ b/ocaml/xapi/context.mli
@@ -185,6 +185,11 @@ val with_forwarded_task :
     then ensure [__context] is destroyed.*)
 
 val with_tracing :
-  ?originator:string -> __context:t -> string -> (t -> 'a) -> 'a
+     ?attributes:(string * string) list
+  -> ?originator:string
+  -> __context:t
+  -> string
+  -> (t -> 'a)
+  -> 'a
 
 val set_client_span : t -> Tracing.Span.t option
diff --git a/ocaml/xapi/xapi_xenops.ml b/ocaml/xapi/xapi_xenops.ml
index dbefffb157..5d9a1cc0a4 100644
--- a/ocaml/xapi/xapi_xenops.ml
+++ b/ocaml/xapi/xapi_xenops.ml
@@ -33,7 +33,10 @@ let finally = Xapi_stdext_pervasives.Pervasiveext.finally
 
 let rpc_of t x = Rpcmarshal.marshal t.Rpc.Types.ty x
 
+let ( let@ ) f x = f x
+
 let check_power_state_is ~__context ~self ~expected =
+  let@ __context = Context.with_tracing ~__context __FUNCTION__ in
   if expected <> `Running then
     Xapi_vm_lifecycle.assert_final_power_state_is ~__context ~self ~expected
   else
@@ -48,6 +51,8 @@ let check_power_state_is ~__context ~self ~expected =
         (Record_util.vm_power_state_to_lowercase_string expected)
 
 let event_wait queue_name dbg ?from p =
+  Debug_info.with_dbg ~name:__FUNCTION__ ~dbg @@ fun di ->
+  let dbg = Debug_info.to_string di in
   let finished = ref false in
   let event_id = ref from in
   let module Client = (val make_client queue_name : XENOPS) in
@@ -58,6 +63,8 @@ let event_wait queue_name dbg ?from p =
   done
 
 let task_ended queue_name dbg id =
+  Debug_info.with_dbg ~name:__FUNCTION__ ~dbg @@ fun di ->
+  let dbg = Debug_info.to_string di in
   let module Client = (val make_client queue_name : XENOPS) in
   match (Client.TASK.stat dbg id).Task.state with
   | Task.Completed _ | Task.Failed _ ->
@@ -66,6 +73,8 @@ let task_ended queue_name dbg id =
       false
 
 let wait_for_task queue_name dbg id =
+  Debug_info.with_dbg ~name:__FUNCTION__ ~dbg @@ fun di ->
+  let dbg = Debug_info.to_string di in
   let module Client = (val make_client queue_name : XENOPS) in
   let finished = function
     | Dynamic.Task id' ->
@@ -106,6 +115,7 @@ let xenops_vdi_locator_of sr vdi =
     (Storage_interface.Vdi.string_of vdi)
 
 let xenops_vdi_locator ~__context ~self =
+  let@ __context = Context.with_tracing ~__context __FUNCTION__ in
   let sr = Db.VDI.get_SR ~__context ~self in
   let sr_uuid = Db.SR.get_uuid ~__context ~self:sr in
   let vdi_location = Db.VDI.get_location ~__context ~self in
@@ -114,9 +124,11 @@ let xenops_vdi_locator ~__context ~self =
     (Storage_interface.Vdi.of_string vdi_location)
 
 let disk_of_vdi ~__context ~self =
+  let@ __context = Context.with_tracing ~__context __FUNCTION__ in
   try Some (VDI (xenops_vdi_locator ~__context ~self)) with _ -> None
 
 let vdi_of_disk ~__context x =
+  let@ __context = Context.with_tracing ~__context __FUNCTION__ in
   match String.split ~limit:2 '/' x with
   | [sr_uuid; location] -> (
       let open Xapi_database.Db_filter_types in
@@ -151,6 +163,7 @@ let backend_of_network net =
 (* PR-1255 *)
 
 let backend_of_vif ~__context ~vif =
+  let@ __context = Context.with_tracing ~__context __FUNCTION__ in
   let vif_record = Db.VIF.get_record_internal ~__context ~self:vif in
   let net =
     Db.Network.get_record ~__context ~self:vif_record.Db_actions.vIF_network
@@ -255,6 +268,7 @@ let firmware_of_vm vm =
       default_firmware
 
 let varstore_rm_with_sandbox ~__context ~vm_uuid f =
+  let@ __context = Context.with_tracing ~__context __FUNCTION__ in
   let dbg = Context.string_of_task_and_tracing __context in
   let domid = 0 in
   let chroot, socket_path =
@@ -265,6 +279,7 @@ let varstore_rm_with_sandbox ~__context ~vm_uuid f =
     (fun () -> Xenops_sandbox.Varstore_guard.stop dbg ~domid ~vm_uuid)
 
 let nvram_post_clone ~__context ~self ~uuid =
+  let@ __context = Context.with_tracing ~__context __FUNCTION__ in
   match Db.VM.get_NVRAM ~__context ~self with
   | [] ->
       ()
@@ -292,6 +307,7 @@ let nvram_post_clone ~__context ~self ~uuid =
         debug "VM %s: NVRAM changed due to clone" uuid
 
 let rtc_timeoffset_of_vm ~__context (vm, vm_t) vbds =
+  let@ __context = Context.with_tracing ~__context __FUNCTION__ in
   let timeoffset = string vm_t.API.vM_platform "0" Vm_platform.timeoffset in
   (* If any VDI has on_boot = reset AND has a VDI.other_config:timeoffset
      	   then we override the platform/timeoffset. This is needed because windows
@@ -365,6 +381,7 @@ let kernel_path filename =
     Ok real_path
 
 let builder_of_vm ~__context (vmref, vm) timeoffset pci_passthrough vgpu =
+  let@ __context = Context.with_tracing ~__context __FUNCTION__ in
   let open Vm in
   let video_mode =
     if vgpu then
@@ -525,6 +542,7 @@ let builder_of_vm ~__context (vmref, vm) timeoffset pci_passthrough vgpu =
       Helpers.internal_error "invalid boot configuration"
 
 let list_net_sriov_vf_pcis ~__context ~vm =
+  let@ __context = Context.with_tracing ~__context __FUNCTION__ in
   vm.API.vM_VIFs
   |> List.filter (fun self -> Db.VIF.get_currently_attached ~__context ~self)
   |> List.filter_map (fun vif ->
@@ -539,6 +557,7 @@ module MD = struct
   (** Convert between xapi DB records and xenopsd records *)
 
   let of_vbd ~__context ~vm ~vbd =
+    let@ __context = Context.with_tracing ~__context __FUNCTION__ in
     let hvm =
       match vm.API.vM_domain_type with
       | `hvm ->
@@ -691,6 +710,7 @@ module MD = struct
     }
 
   let of_pvs_proxy ~__context vif proxy =
+    let@ __context = Context.with_tracing ~__context __FUNCTION__ in
     let site = Db.PVS_proxy.get_site ~__context ~self:proxy in
     let site_uuid = Db.PVS_site.get_uuid ~__context ~self:site in
     let servers = Db.PVS_site.get_servers ~__context ~self:site in
@@ -710,6 +730,7 @@ module MD = struct
     (site_uuid, servers, interface)
 
   let of_vif ~__context ~vm ~vif:(vif_ref, vif) =
+    let@ __context = Context.with_tracing ~__context __FUNCTION__ in
     let net = Db.Network.get_record ~__context ~self:vif.API.vIF_network in
     let net_mtu = Int64.to_int net.API.network_MTU in
     let mtu =
@@ -853,6 +874,7 @@ module MD = struct
     }
 
   let pcis_of_vm ~__context (vmref, vm) =
+    let@ __context = Context.with_tracing ~__context __FUNCTION__ in
     let vgpu_pcidevs = Vgpuops.list_pcis_for_passthrough ~__context ~vm:vmref in
     let devs =
       List.concat_map (fun (_, dev) -> dev) (Pciops.sort_pcidevs vgpu_pcidevs)
@@ -883,6 +905,7 @@ module MD = struct
       devs
 
   let get_target_pci_address ~__context vgpu =
+    let@ __context = Context.with_tracing ~__context __FUNCTION__ in
     let pgpu =
       if
         Db.is_valid_ref __context
@@ -911,6 +934,7 @@ module MD = struct
    * is passed trough completely.
    *)
   let sriov_vf ~__context vgpu =
+    let@ __context = Context.with_tracing ~__context __FUNCTION__ in
     let is_sriov () =
       let ty = vgpu.Db_actions.vGPU_type in
       match Db.VGPU_type.get_implementation ~__context ~self:ty with
@@ -931,6 +955,7 @@ module MD = struct
         Xenops_interface.Pci.address_of_string str |> fun addr -> Some addr
 
   let of_nvidia_vgpu ~__context vm vgpu =
+    let@ __context = Context.with_tracing ~__context __FUNCTION__ in
     let open Vgpu in
     (* Get the PCI address. *)
     let physical_pci_address = get_target_pci_address ~__context vgpu in
@@ -967,6 +992,7 @@ module MD = struct
     }
 
   let of_gvt_g_vgpu ~__context vm vgpu =
+    let@ __context = Context.with_tracing ~__context __FUNCTION__ in
     let open Vgpu in
     (* Get the PCI address. *)
     let physical_pci_address = get_target_pci_address ~__context vgpu in
@@ -1007,6 +1033,7 @@ module MD = struct
         failwith "Intel GVT-g settings invalid"
 
   let of_mxgpu_vgpu ~__context vm vgpu =
+    let@ __context = Context.with_tracing ~__context __FUNCTION__ in
     let open Vgpu in
     (* Get the PCI address. *)
     let physical_pci_address = get_target_pci_address ~__context vgpu in
@@ -1043,6 +1070,7 @@ module MD = struct
         failwith "AMD MxGPU settings invalid"
 
   let vgpus_of_vm ~__context (_, vm) =
+    let@ __context = Context.with_tracing ~__context __FUNCTION__ in
     List.fold_left
       (fun acc vgpu ->
         let vgpu_record = Db.VGPU.get_record_internal ~__context ~self:vgpu in
@@ -1064,6 +1092,7 @@ module MD = struct
       [] vm.API.vM_VGPUs
 
   let of_vusb ~__context ~vm ~pusb =
+    let@ __context = Context.with_tracing ~__context __FUNCTION__ in
     let open Vusb in
     try
       let path = pusb.API.pUSB_path in
@@ -1087,6 +1116,7 @@ module MD = struct
       raise e
 
   let vusbs_of_vm ~__context (_, vm) =
+    let@ __context = Context.with_tracing ~__context __FUNCTION__ in
     vm.API.vM_VUSBs
     |> List.map (fun self -> Db.VUSB.get_record ~__context ~self)
     |> List.filter (fun self -> self.API.vUSB_currently_attached)
@@ -1096,6 +1126,7 @@ module MD = struct
     |> List.map (fun pusb -> of_vusb ~__context ~vm ~pusb)
 
   let of_vm ~__context (vmref, vm) vbds pci_passthrough vgpu =
+    let@ __context = Context.with_tracing ~__context __FUNCTION__ in
     let on_action_behaviour = function
       | `preserve ->
           [Vm.Pause]
@@ -1351,6 +1382,7 @@ module Guest_agent_features = struct
     auto_update_enabled @ auto_update_url
 
   let of_config ~__context config =
+    let@ __context = Context.with_tracing ~__context __FUNCTION__ in
     let open Features in
     let vss =
       let name = Features.name_of_feature VSS in
@@ -1370,6 +1402,7 @@ module Guest_agent_features = struct
 end
 
 let apply_guest_agent_config ~__context config =
+  let@ __context = Context.with_tracing ~__context __FUNCTION__ in
   let dbg = Context.string_of_task_and_tracing __context in
   let features = Guest_agent_features.of_config ~__context config in
   let module Client = (val make_client (default_xenopsd ()) : XENOPS) in
@@ -1377,6 +1410,7 @@ let apply_guest_agent_config ~__context config =
 
 (* Create an instance of Metadata.t, suitable for uploading to the xenops service *)
 let create_metadata ~__context ~self =
+  let@ __context = Context.with_tracing ~__context __FUNCTION__ in
   let vm = Db.VM.get_record ~__context ~self in
   let vbds =
     List.filter
@@ -1419,6 +1453,8 @@ let id_of_vm ~__context ~self = Db.VM.get_uuid ~__context ~self
 let vm_of_id ~__context uuid = Db.VM.get_by_uuid ~__context ~uuid
 
 let vm_exists_in_xenopsd queue_name dbg id =
+  Debug_info.with_dbg ~name:__FUNCTION__ ~dbg @@ fun di ->
+  let dbg = Debug_info.to_string di in
   let module Client = (val make_client queue_name : XENOPS) in
   Client.VM.exists dbg id
 
@@ -1627,6 +1663,7 @@ module Xenopsd_metadata = struct
   (* If the VM has Xapi_globs.persist_xenopsd_md -> filename in its other_config,
      we persist the xenopsd metadata to a well-known location in the filesystem *)
   let maybe_persist_md ~__context ~self md =
+    let@ __context = Context.with_tracing ~__context __FUNCTION__ in
     let oc = Db.VM.get_other_config ~__context ~self in
     if List.mem_assoc Xapi_globs.persist_xenopsd_md oc then
       let file_path =
@@ -1647,6 +1684,7 @@ module Xenopsd_metadata = struct
       )
 
   let push ~__context ~self =
+    let@ __context = Context.with_tracing ~__context __FUNCTION__ in
     with_lock metadata_m (fun () ->
         let md = create_metadata ~__context ~self in
         let txt = md |> rpc_of Metadata.t |> Jsonrpc.to_string in
@@ -1663,6 +1701,7 @@ module Xenopsd_metadata = struct
     )
 
   let delete_nolock ~__context id =
+    let@ __context = Context.with_tracing ~__context __FUNCTION__ in
     let dbg = Context.string_of_task_and_tracing __context in
     info "xenops: VM.remove %s" id ;
     try
@@ -1687,6 +1726,7 @@ module Xenopsd_metadata = struct
 
   (* Unregisters a VM with xenopsd, and cleans up metadata and caches *)
   let pull ~__context id =
+    let@ __context = Context.with_tracing ~__context __FUNCTION__ in
     with_lock metadata_m (fun () ->
         info "xenops: VM.export_metadata %s" id ;
         let dbg = Context.string_of_task_and_tracing __context in
@@ -1717,9 +1757,11 @@ module Xenopsd_metadata = struct
     )
 
   let delete ~__context id =
+    let@ __context = Context.with_tracing ~__context __FUNCTION__ in
     with_lock metadata_m (fun () -> delete_nolock ~__context id)
 
   let update ~__context ~self =
+    let@ __context = Context.with_tracing ~__context __FUNCTION__ in
     let id = id_of_vm ~__context ~self in
     let queue_name = queue_of_vm ~__context ~self in
     with_lock metadata_m (fun () ->
@@ -1793,6 +1835,18 @@ module Events_from_xenopsd = struct
     let module Client = (val make_client queue_name : XENOPS) in
     let t = make () in
     let id = register t in
+    Debug_info.with_dbg
+      ~attributes:
+        [
+          ("messaging.operation.name", "subscribe")
+        ; ("messaging.system", "event")
+        ; ("messaging.destination.subscription.name", vm_id)
+        ; ("messaging.message.id", string_of_int id)
+        ]
+      ~name:("subscribe" ^ " " ^ queue_name)
+      ~dbg
+    @@ fun di ->
+    let dbg = Debug_info.to_string di in
     debug "Client.UPDATES.inject_barrier %d" id ;
     Client.UPDATES.inject_barrier dbg vm_id id ;
     with_lock t.m (fun () ->
@@ -1802,6 +1856,17 @@ module Events_from_xenopsd = struct
     )
 
   let wakeup queue_name dbg id =
+    Debug_info.with_dbg
+      ~attributes:
+        [
+          ("messaging.operation.name", "settle")
+        ; ("messaging.system", "event")
+        ; ("messaging.message.id", string_of_int id)
+        ]
+      ~name:("settle" ^ " " ^ queue_name)
+      ~dbg
+    @@ fun di ->
+    let dbg = Debug_info.to_string di in
     let module Client = (val make_client queue_name : XENOPS) in
     Client.UPDATES.remove_barrier dbg id ;
     let t =
@@ -2396,6 +2461,11 @@ let update_vm_internal ~__context ~id ~self ~previous ~info ~localhost =
     )
 
 let update_vm ~__context id =
+  let@ __context =
+    Context.with_tracing
+      ~attributes:[("xapi.event.on.vm", id)]
+      ~__context __FUNCTION__
+  in
   try
     if Events_from_xenopsd.are_suppressed id then
       debug "xenopsd event: ignoring event for VM (VM %s migrating away)" id
@@ -2418,6 +2488,11 @@ let update_vm ~__context id =
       (string_of_exn e)
 
 let update_vbd ~__context (id : string * string) =
+  let@ __context =
+    Context.with_tracing
+      ~attributes:[("xapi.event.on.vm", fst id); ("xapi.event.on.vbd", snd id)]
+      ~__context __FUNCTION__
+  in
   try
     if Events_from_xenopsd.are_suppressed (fst id) then
       debug "xenopsd event: ignoring event for VBD (VM %s migrating away)"
@@ -2520,6 +2595,11 @@ let update_vbd ~__context (id : string * string) =
     error "xenopsd event: Caught %s while updating VBD" (string_of_exn e)
 
 let update_vif ~__context id =
+  let@ __context =
+    Context.with_tracing
+      ~attributes:[("xapi.event.on.vm", fst id); ("xapi.event.on.vif", snd id)]
+      ~__context __FUNCTION__
+  in
   try
     if Events_from_xenopsd.are_suppressed (fst id) then
       debug "xenopsd event: ignoring event for VIF (VM %s migrating away)"
@@ -2628,6 +2708,11 @@ let update_vif ~__context id =
     error "xenopsd event: Caught %s while updating VIF" (string_of_exn e)
 
 let update_pci ~__context id =
+  let@ __context =
+    Context.with_tracing
+      ~attributes:[("xapi.event.on.vm", fst id); ("xapi.event.on.pci", snd id)]
+      ~__context __FUNCTION__
+  in
   try
     if Events_from_xenopsd.are_suppressed (fst id) then
       debug "xenopsd event: ignoring event for PCI (VM %s migrating away)"
@@ -2696,6 +2781,11 @@ let update_pci ~__context id =
     error "xenopsd event: Caught %s while updating PCI" (string_of_exn e)
 
 let update_vgpu ~__context id =
+  let@ __context =
+    Context.with_tracing
+      ~attributes:[("xapi.event.on.vm", fst id); ("xapi.event.on.vgpu", snd id)]
+      ~__context __FUNCTION__
+  in
   try
     if Events_from_xenopsd.are_suppressed (fst id) then
       debug "xenopsd event: ignoring event for VGPU (VM %s migrating away)"
@@ -2760,6 +2850,11 @@ let update_vgpu ~__context id =
     error "xenopsd event: Caught %s while updating VGPU" (string_of_exn e)
 
 let update_vusb ~__context (id : string * string) =
+  let@ __context =
+    Context.with_tracing
+      ~attributes:[("xapi.event.on.vm", fst id); ("xapi.event.on.vusb", snd id)]
+      ~__context __FUNCTION__
+  in
   try
     if Events_from_xenopsd.are_suppressed (fst id) then
       debug "xenopsd event: ignoring event for VUSB (VM %s migrating away)"
@@ -2815,14 +2910,21 @@ let unwrap x =
       raise Not_a_xenops_task
 
 let register_task __context ?cancellable queue_name id =
+  let@ __context = Context.with_tracing ~__context __FUNCTION__ in
   TaskHelper.register_task __context ?cancellable (wrap queue_name id) ;
   id
 
 let unregister_task __context queue_name id =
+  let@ __context = Context.with_tracing ~__context __FUNCTION__ in
   TaskHelper.unregister_task __context (wrap queue_name id) ;
   id
 
 let update_task ~__context queue_name id =
+  let@ __context =
+    Context.with_tracing
+      ~attributes:[("xapi.event.on.task", id)]
+      ~__context __FUNCTION__
+  in
   try
     let self = TaskHelper.id_to_task_exn (TaskHelper.Xenops (queue_name, id)) in
     (* throws Not_found *)
@@ -2856,59 +2958,65 @@ let update_task ~__context queue_name id =
       error "xenopsd event: Caught %s while updating task" (string_of_exn e)
 
 let rec events_watch ~__context cancel queue_name from =
-  let dbg = Context.string_of_task_and_tracing __context in
-  if Xapi_fist.delay_xenopsd_event_threads () then Thread.delay 30.0 ;
-  let module Client = (val make_client queue_name : XENOPS) in
-  let barriers, events, next = Client.UPDATES.get dbg from None in
-  if !cancel then
-    raise (Api_errors.Server_error (Api_errors.task_cancelled, [])) ;
-  let done_events = ref [] in
-  let already_done x = List.mem x !done_events in
-  let add_event x = done_events := x :: !done_events in
-  let do_updates l =
-    let open Dynamic in
-    List.iter
-      (fun ev ->
-        debug "Processing event: %s"
-          (ev |> Dynamic.rpc_of_id |> Jsonrpc.to_string) ;
-        if already_done ev then
-          debug "Skipping (already processed this round)"
-        else (
-          add_event ev ;
-          match ev with
-          | Vm id ->
-              debug "xenops event on VM %s" id ;
-              update_vm ~__context id
-          | Vbd id ->
-              debug "xenops event on VBD %s.%s" (fst id) (snd id) ;
-              update_vbd ~__context id
-          | Vif id ->
-              debug "xenops event on VIF %s.%s" (fst id) (snd id) ;
-              update_vif ~__context id
-          | Pci id ->
-              debug "xenops event on PCI %s.%s" (fst id) (snd id) ;
-              update_pci ~__context id
-          | Vgpu id ->
-              debug "xenops event on VGPU %s.%s" (fst id) (snd id) ;
-              update_vgpu ~__context id
-          | Vusb id ->
-              debug "xenops event on VUSB %s.%s" (fst id) (snd id) ;
-              update_vusb ~__context id
-          | Task id ->
-              debug "xenops event on Task %s" id ;
-              update_task ~__context queue_name id
-        )
-      )
-      l
-  in
-  List.iter
-    (fun (id, b_events) ->
-      debug "Processing barrier %d" id ;
-      do_updates b_events ;
-      Events_from_xenopsd.wakeup queue_name dbg id
+  Context.complete_tracing __context ;
+  let next =
+    Context.with_tracing ~__context __FUNCTION__ (fun __context ->
+        let dbg = Context.string_of_task_and_tracing __context in
+        if Xapi_fist.delay_xenopsd_event_threads () then Thread.delay 30.0 ;
+        let module Client = (val make_client queue_name : XENOPS) in
+        let barriers, events, next = Client.UPDATES.get dbg from None in
+        if !cancel then
+          raise (Api_errors.Server_error (Api_errors.task_cancelled, [])) ;
+        let done_events = ref [] in
+        let already_done x = List.mem x !done_events in
+        let add_event x = done_events := x :: !done_events in
+        let do_updates l =
+          let open Dynamic in
+          List.iter
+            (fun ev ->
+              debug "Processing event: %s"
+                (ev |> Dynamic.rpc_of_id |> Jsonrpc.to_string) ;
+              if already_done ev then
+                debug "Skipping (already processed this round)"
+              else (
+                add_event ev ;
+                match ev with
+                | Vm id ->
+                    debug "xenops event on VM %s" id ;
+                    update_vm ~__context id
+                | Vbd id ->
+                    debug "xenops event on VBD %s.%s" (fst id) (snd id) ;
+                    update_vbd ~__context id
+                | Vif id ->
+                    debug "xenops event on VIF %s.%s" (fst id) (snd id) ;
+                    update_vif ~__context id
+                | Pci id ->
+                    debug "xenops event on PCI %s.%s" (fst id) (snd id) ;
+                    update_pci ~__context id
+                | Vgpu id ->
+                    debug "xenops event on VGPU %s.%s" (fst id) (snd id) ;
+                    update_vgpu ~__context id
+                | Vusb id ->
+                    debug "xenops event on VUSB %s.%s" (fst id) (snd id) ;
+                    update_vusb ~__context id
+                | Task id ->
+                    debug "xenops event on Task %s" id ;
+                    update_task ~__context queue_name id
+              )
+            )
+            l
+        in
+        List.iter
+          (fun (id, b_events) ->
+            debug "Processing barrier %d" id ;
+            do_updates b_events ;
+            Events_from_xenopsd.wakeup queue_name dbg id
+          )
+          barriers ;
+        do_updates events ;
+        next
     )
-    barriers ;
-  do_updates events ;
+  in
   events_watch ~__context cancel queue_name (Some next)
 
 let events_from_xenopsd queue_name =
@@ -2923,6 +3031,7 @@ let events_from_xenopsd queue_name =
   )
 
 let refresh_vm ~__context ~self =
+  let@ __context = Context.with_tracing ~__context __FUNCTION__ in
   let id = id_of_vm ~__context ~self in
   info "xenops: UPDATES.refresh_vm %s" id ;
   let dbg = Context.string_of_task_and_tracing __context in
@@ -2932,6 +3041,7 @@ let refresh_vm ~__context ~self =
   Events_from_xenopsd.wait queue_name dbg id ()
 
 let resync_resident_on ~__context =
+  let@ __context = Context.with_tracing ~__context __FUNCTION__ in
   let dbg = Context.string_of_task_and_tracing __context in
   let localhost = Helpers.get_localhost ~__context in
   let domain0 = Helpers.get_domain_zero ~__context in
@@ -3074,6 +3184,7 @@ let resync_resident_on ~__context =
     xapi_vms_not_in_xenopsd
 
 let resync_all_vms ~__context =
+  let@ __context = Context.with_tracing ~__context __FUNCTION__ in
   (* This should now be correct *)
   let localhost = Helpers.get_localhost ~__context in
   let domain0 = Helpers.get_domain_zero ~__context in
@@ -3085,11 +3196,13 @@ let resync_all_vms ~__context =
 
 (* experimental feature for hard-pinning vcpus *)
 let hard_numa_enabled ~__context =
+  let@ __context = Context.with_tracing ~__context __FUNCTION__ in
   let pool = Helpers.get_pool ~__context in
   let restrictions = Db.Pool.get_restrictions ~__context ~self:pool in
   List.assoc_opt "restrict_hard_numa" restrictions = Some "false"
 
 let set_numa_affinity_policy ~__context ~value =
+  let@ __context = Context.with_tracing ~__context __FUNCTION__ in
   let dbg = Context.string_of_task __context in
   let open Xapi_xenops_queue in
   let module Client = (val make_client (default_xenopsd ()) : XENOPS) in
@@ -3108,6 +3221,7 @@ let set_numa_affinity_policy ~__context ~value =
   Client.HOST.set_numa_affinity_policy dbg value
 
 let on_xapi_restart ~__context =
+  let@ __context = Context.with_tracing ~__context __FUNCTION__ in
   let host = Helpers.get_localhost ~__context in
   let value = Db.Host.get_numa_affinity_policy ~__context ~self:host in
   info "Setting NUMA affinity policy in xenopsd on startup to %s"
@@ -3131,6 +3245,7 @@ let on_xapi_restart ~__context =
   apply_guest_agent_config ~__context config
 
 let assert_resident_on ~__context ~self =
+  let@ __context = Context.with_tracing ~__context __FUNCTION__ in
   let localhost = Helpers.get_localhost ~__context in
   if not (Db.VM.get_resident_on ~__context ~self = localhost) then
     Helpers.internal_error "the VM %s is not resident on this host"
@@ -3463,6 +3578,7 @@ let transform_xenops_exn ~__context ~vm queue_name f =
    should not be any other suppression going on. *)
 
 let set_resident_on ~__context ~self =
+  let@ __context = Context.with_tracing ~__context __FUNCTION__ in
   let id = id_of_vm ~__context ~self in
   debug "VM %s set_resident_on" id ;
   let localhost = Helpers.get_localhost ~__context in
@@ -3477,6 +3593,7 @@ let set_resident_on ~__context ~self =
   Xenopsd_metadata.update ~__context ~self
 
 let update_debug_info __context t =
+  let@ __context = Context.with_tracing ~__context __FUNCTION__ in
   let task = Context.get_task_id __context in
   let debug_info =
     List.map (fun (k, v) -> ("debug_info:" ^ k, v)) t.Task.debug_info
@@ -3491,6 +3608,7 @@ let update_debug_info __context t =
     debug_info
 
 let sync_with_task_result __context ?cancellable queue_name x =
+  let@ __context = Context.with_tracing ~__context __FUNCTION__ in
   let dbg = Context.string_of_task_and_tracing __context in
   x
   |> register_task __context ?cancellable queue_name
@@ -3502,6 +3620,7 @@ let sync_with_task __context ?cancellable queue_name x =
   sync_with_task_result __context ?cancellable queue_name x |> ignore
 
 let sync __context queue_name x =
+  let@ __context = Context.with_tracing ~__context __FUNCTION__ in
   let dbg = Context.string_of_task_and_tracing __context in
   x
   |> wait_for_task queue_name dbg
@@ -3509,6 +3628,7 @@ let sync __context queue_name x =
   |> ignore
 
 let pause ~__context ~self =
+  let@ __context = Context.with_tracing ~__context __FUNCTION__ in
   let queue_name = queue_of_vm ~__context ~self in
   transform_xenops_exn ~__context ~vm:self queue_name (fun () ->
       let id = id_of_vm ~__context ~self in
@@ -3522,6 +3642,7 @@ let pause ~__context ~self =
   )
 
 let unpause ~__context ~self =
+  let@ __context = Context.with_tracing ~__context __FUNCTION__ in
   let queue_name = queue_of_vm ~__context ~self in
   transform_xenops_exn ~__context ~vm:self queue_name (fun () ->
       let id = id_of_vm ~__context ~self in
@@ -3534,6 +3655,7 @@ let unpause ~__context ~self =
   )
 
 let request_rdp ~__context ~self enabled =
+  let@ __context = Context.with_tracing ~__context __FUNCTION__ in
   let queue_name = queue_of_vm ~__context ~self in
   transform_xenops_exn ~__context ~vm:self queue_name (fun () ->
       let id = id_of_vm ~__context ~self in
@@ -3546,6 +3668,7 @@ let request_rdp ~__context ~self enabled =
   )
 
 let run_script ~__context ~self script =
+  let@ __context = Context.with_tracing ~__context __FUNCTION__ in
   let queue_name = queue_of_vm ~__context ~self in
   transform_xenops_exn ~__context ~vm:self queue_name (fun () ->
       let id = id_of_vm ~__context ~self in
@@ -3562,6 +3685,7 @@ let run_script ~__context ~self script =
   )
 
 let set_xenstore_data ~__context ~self xsdata =
+  let@ __context = Context.with_tracing ~__context __FUNCTION__ in
   let queue_name = queue_of_vm ~__context ~self in
   transform_xenops_exn ~__context ~vm:self queue_name (fun () ->
       let id = id_of_vm ~__context ~self in
@@ -3573,6 +3697,7 @@ let set_xenstore_data ~__context ~self xsdata =
   )
 
 let set_vcpus ~__context ~self n =
+  let@ __context = Context.with_tracing ~__context __FUNCTION__ in
   let queue_name = queue_of_vm ~__context ~self in
   transform_xenops_exn ~__context ~vm:self queue_name (fun () ->
       let id = id_of_vm ~__context ~self in
@@ -3600,6 +3725,7 @@ let set_vcpus ~__context ~self n =
   )
 
 let set_shadow_multiplier ~__context ~self target =
+  let@ __context = Context.with_tracing ~__context __FUNCTION__ in
   let queue_name = queue_of_vm ~__context ~self in
   transform_xenops_exn ~__context ~vm:self queue_name (fun () ->
       let id = id_of_vm ~__context ~self in
@@ -3629,6 +3755,7 @@ let set_shadow_multiplier ~__context ~self target =
   )
 
 let set_memory_dynamic_range ~__context ~self min max =
+  let@ __context = Context.with_tracing ~__context __FUNCTION__ in
   let queue_name = queue_of_vm ~__context ~self in
   transform_xenops_exn ~__context ~vm:self queue_name (fun () ->
       let id = id_of_vm ~__context ~self in
@@ -3641,6 +3768,7 @@ let set_memory_dynamic_range ~__context ~self min max =
   )
 
 let maybe_refresh_vm ~__context ~self =
+  let@ __context = Context.with_tracing ~__context __FUNCTION__ in
   let dbg = Context.string_of_task_and_tracing __context in
   let queue_name = queue_of_vm ~__context ~self in
   let id = id_of_vm ~__context ~self in
@@ -3653,6 +3781,7 @@ let maybe_refresh_vm ~__context ~self =
   )
 
 let start ~__context ~self paused force =
+  let@ __context = Context.with_tracing ~__context __FUNCTION__ in
   let dbg = Context.string_of_task_and_tracing __context in
   let queue_name = queue_of_vm ~__context ~self in
   transform_xenops_exn ~__context ~vm:self queue_name (fun () ->
@@ -3714,6 +3843,7 @@ let start ~__context ~self paused force =
   )
 
 let start ~__context ~self paused force =
+  let@ __context = Context.with_tracing ~__context __FUNCTION__ in
   let queue_name = queue_of_vm ~__context ~self in
   transform_xenops_exn ~__context ~vm:self queue_name (fun () ->
       try start ~__context ~self paused force
@@ -3739,6 +3869,7 @@ let start ~__context ~self paused force =
   )
 
 let reboot ~__context ~self timeout =
+  let@ __context = Context.with_tracing ~__context __FUNCTION__ in
   let queue_name = queue_of_vm ~__context ~self in
   transform_xenops_exn ~__context ~vm:self queue_name (fun () ->
       assert_resident_on ~__context ~self ;
@@ -3761,6 +3892,7 @@ let reboot ~__context ~self timeout =
   )
 
 let shutdown ~__context ~self timeout =
+  let@ __context = Context.with_tracing ~__context __FUNCTION__ in
   let queue_name = queue_of_vm ~__context ~self in
   transform_xenops_exn ~__context ~vm:self queue_name (fun () ->
       assert_resident_on ~__context ~self ;
@@ -3794,6 +3926,7 @@ let shutdown ~__context ~self timeout =
   )
 
 let suspend ~__context ~self =
+  let@ __context = Context.with_tracing ~__context __FUNCTION__ in
   let queue_name = queue_of_vm ~__context ~self in
   transform_xenops_exn ~__context ~vm:self queue_name (fun () ->
       assert_resident_on ~__context ~self ;
@@ -3870,6 +4003,7 @@ let suspend ~__context ~self =
   )
 
 let resume ~__context ~self ~start_paused ~force:_ =
+  let@ __context = Context.with_tracing ~__context __FUNCTION__ in
   let dbg = Context.string_of_task_and_tracing __context in
   let queue_name = queue_of_vm ~__context ~self in
   let vm_id = id_of_vm ~__context ~self in
@@ -3923,6 +4057,7 @@ let resume ~__context ~self ~start_paused ~force:_ =
     ~expected:(if start_paused then `Paused else `Running)
 
 let s3suspend ~__context ~self =
+  let@ __context = Context.with_tracing ~__context __FUNCTION__ in
   let queue_name = queue_of_vm ~__context ~self in
   transform_xenops_exn ~__context ~vm:self queue_name (fun () ->
       let id = id_of_vm ~__context ~self in
@@ -3934,6 +4069,7 @@ let s3suspend ~__context ~self =
   )
 
 let s3resume ~__context ~self =
+  let@ __context = Context.with_tracing ~__context __FUNCTION__ in
   let queue_name = queue_of_vm ~__context ~self in
   transform_xenops_exn ~__context ~vm:self queue_name (fun () ->
       let id = id_of_vm ~__context ~self in
@@ -3945,12 +4081,14 @@ let s3resume ~__context ~self =
   )
 
 let md_of_vbd ~__context ~self =
+  let@ __context = Context.with_tracing ~__context __FUNCTION__ in
   let vm = Db.VBD.get_VM ~__context ~self in
   MD.of_vbd ~__context
     ~vm:(Db.VM.get_record ~__context ~self:vm)
     ~vbd:(Db.VBD.get_record ~__context ~self)
 
 let vbd_plug ~__context ~self =
+  let@ __context = Context.with_tracing ~__context __FUNCTION__ in
   let vm = Db.VBD.get_VM ~__context ~self in
   let vm_id = id_of_vm ~__context ~self:vm in
   let queue_name = queue_of_vm ~__context ~self:vm in
@@ -3977,6 +4115,7 @@ let vbd_plug ~__context ~self =
   )
 
 let vbd_unplug ~__context ~self force =
+  let@ __context = Context.with_tracing ~__context __FUNCTION__ in
   let vm = Db.VBD.get_VM ~__context ~self in
   let queue_name = queue_of_vm ~__context ~self:vm in
   transform_xenops_exn ~__context ~vm queue_name (fun () ->
@@ -4006,6 +4145,7 @@ let vbd_unplug ~__context ~self force =
   )
 
 let vbd_eject_hvm ~__context ~self =
+  let@ __context = Context.with_tracing ~__context __FUNCTION__ in
   let vm = Db.VBD.get_VM ~__context ~self in
   let queue_name = queue_of_vm ~__context ~self:vm in
   transform_xenops_exn ~__context ~vm queue_name (fun () ->
@@ -4028,6 +4168,7 @@ let vbd_eject_hvm ~__context ~self =
   )
 
 let vbd_insert_hvm ~__context ~self ~vdi =
+  let@ __context = Context.with_tracing ~__context __FUNCTION__ in
   let vm = Db.VBD.get_VM ~__context ~self in
   let queue_name = queue_of_vm ~__context ~self:vm in
   transform_xenops_exn ~__context ~vm queue_name (fun () ->
@@ -4053,6 +4194,7 @@ let vbd_insert_hvm ~__context ~self ~vdi =
   )
 
 let has_qemu ~__context ~vm =
+  let@ __context = Context.with_tracing ~__context __FUNCTION__ in
   let dbg = Context.string_of_task_and_tracing __context in
   let id = Db.VM.get_uuid ~__context ~self:vm in
   let queue_name = queue_of_vm ~__context ~self:vm in
@@ -4061,10 +4203,12 @@ let has_qemu ~__context ~vm =
   state.Vm.domain_type = Domain_HVM
 
 let ejectable ~__context ~self =
+  let@ __context = Context.with_tracing ~__context __FUNCTION__ in
   let vm = Db.VBD.get_VM ~__context ~self in
   has_qemu ~__context ~vm
 
 let vbd_eject ~__context ~self =
+  let@ __context = Context.with_tracing ~__context __FUNCTION__ in
   if ejectable ~__context ~self then
     vbd_eject_hvm ~__context ~self
   else (
@@ -4074,6 +4218,7 @@ let vbd_eject ~__context ~self =
   )
 
 let vbd_insert ~__context ~self ~vdi =
+  let@ __context = Context.with_tracing ~__context __FUNCTION__ in
   if ejectable ~__context ~self then
     vbd_insert_hvm ~__context ~self ~vdi
   else (
@@ -4083,12 +4228,14 @@ let vbd_insert ~__context ~self ~vdi =
   )
 
 let md_of_vif ~__context ~self =
+  let@ __context = Context.with_tracing ~__context __FUNCTION__ in
   let vm = Db.VIF.get_VM ~__context ~self in
   MD.of_vif ~__context
     ~vm:(Db.VM.get_record ~__context ~self:vm)
     ~vif:(self, Db.VIF.get_record ~__context ~self)
 
 let vif_plug ~__context ~self =
+  let@ __context = Context.with_tracing ~__context __FUNCTION__ in
   let vm = Db.VIF.get_VM ~__context ~self in
   let vm_id = id_of_vm ~__context ~self:vm in
   let queue_name = queue_of_vm ~__context ~self:vm in
@@ -4117,6 +4264,7 @@ let vif_plug ~__context ~self =
   )
 
 let vif_set_locking_mode ~__context ~self =
+  let@ __context = Context.with_tracing ~__context __FUNCTION__ in
   let vm = Db.VIF.get_VM ~__context ~self in
   let queue_name = queue_of_vm ~__context ~self:vm in
   transform_xenops_exn ~__context ~vm queue_name (fun () ->
@@ -4131,6 +4279,7 @@ let vif_set_locking_mode ~__context ~self =
   )
 
 let vif_set_pvs_proxy ~__context ~self creating =
+  let@ __context = Context.with_tracing ~__context __FUNCTION__ in
   let vm = Db.VIF.get_VM ~__context ~self in
   let queue_name = queue_of_vm ~__context ~self:vm in
   transform_xenops_exn ~__context ~vm queue_name (fun () ->
@@ -4146,6 +4295,7 @@ let vif_set_pvs_proxy ~__context ~self creating =
   )
 
 let vif_unplug ~__context ~self force =
+  let@ __context = Context.with_tracing ~__context __FUNCTION__ in
   let vm = Db.VIF.get_VM ~__context ~self in
   let queue_name = queue_of_vm ~__context ~self:vm in
   transform_xenops_exn ~__context ~vm queue_name (fun () ->
@@ -4168,6 +4318,7 @@ let vif_unplug ~__context ~self force =
   )
 
 let vif_move ~__context ~self _network =
+  let@ __context = Context.with_tracing ~__context __FUNCTION__ in
   let vm = Db.VIF.get_VM ~__context ~self in
   let queue_name = queue_of_vm ~__context ~self:vm in
   transform_xenops_exn ~__context ~vm queue_name (fun () ->
@@ -4194,6 +4345,7 @@ let vif_move ~__context ~self _network =
   )
 
 let vif_set_ipv4_configuration ~__context ~self =
+  let@ __context = Context.with_tracing ~__context __FUNCTION__ in
   let vm = Db.VIF.get_VM ~__context ~self in
   let queue_name = queue_of_vm ~__context ~self:vm in
   transform_xenops_exn ~__context ~vm queue_name (fun () ->
@@ -4210,6 +4362,7 @@ let vif_set_ipv4_configuration ~__context ~self =
   )
 
 let vif_set_ipv6_configuration ~__context ~self =
+  let@ __context = Context.with_tracing ~__context __FUNCTION__ in
   let vm = Db.VIF.get_VM ~__context ~self in
   let queue_name = queue_of_vm ~__context ~self:vm in
   transform_xenops_exn ~__context ~vm queue_name (fun () ->
@@ -4226,6 +4379,7 @@ let vif_set_ipv6_configuration ~__context ~self =
   )
 
 let task_cancel ~__context ~self =
+  let@ __context = Context.with_tracing ~__context __FUNCTION__ in
   try
     let queue_name, id = TaskHelper.task_to_id_exn self |> unwrap in
     let module Client = (val make_client queue_name : XENOPS) in
@@ -4241,6 +4395,7 @@ let task_cancel ~__context ~self =
       false
 
 let md_of_vusb ~__context ~self =
+  let@ __context = Context.with_tracing ~__context __FUNCTION__ in
   let vm = Db.VUSB.get_VM ~__context ~self in
   let usb_group = Db.VUSB.get_USB_group ~__context ~self in
   let pusb = Helpers.get_first_pusb ~__context usb_group in
@@ -4248,6 +4403,7 @@ let md_of_vusb ~__context ~self =
   MD.of_vusb ~__context ~vm:(Db.VM.get_record ~__context ~self:vm) ~pusb:pusbr
 
 let vusb_unplug_hvm ~__context ~self =
+  let@ __context = Context.with_tracing ~__context __FUNCTION__ in
   let vm = Db.VUSB.get_VM ~__context ~self in
   let queue_name = queue_of_vm ~__context ~self:vm in
   transform_xenops_exn ~__context ~vm queue_name (fun () ->
@@ -4264,10 +4420,12 @@ let vusb_unplug_hvm ~__context ~self =
   )
 
 let vusb_plugable ~__context ~self =
+  let@ __context = Context.with_tracing ~__context __FUNCTION__ in
   let vm = Db.VUSB.get_VM ~__context ~self in
   has_qemu ~__context ~vm
 
 let vusb_unplug ~__context ~self =
+  let@ __context = Context.with_tracing ~__context __FUNCTION__ in
   if vusb_plugable ~__context ~self then
     vusb_unplug_hvm ~__context ~self
   else
diff --git a/ocaml/xenopsd/lib/xenopsd.ml b/ocaml/xenopsd/lib/xenopsd.ml
index ccacea0ed8..5ad6401730 100644
--- a/ocaml/xenopsd/lib/xenopsd.ml
+++ b/ocaml/xenopsd/lib/xenopsd.ml
@@ -300,29 +300,74 @@ let json_path () = path () ^ ".json"
 
 let rpc_fn call =
   (* Upgrade import_metadata API call *)
-  let call' =
+  let call', call_name, span_parent =
     match (call.Rpc.name, call.Rpc.params) with
-    | "VM.import_metadata", [debug_info; metadata] ->
+    | ("VM.import_metadata" as call_name), [Rpc.String debug_info; metadata] ->
         debug "Upgrading VM.import_metadata" ;
-        Rpc.
-          {
-            name= "VM.import_metadata"
-          ; params=
-              [Rpc.Dict [("debug_info", debug_info); ("metadata", metadata)]]
-          ; is_notification= false
-          }
-    | "query", [debug_info; unit_p] ->
+        let span_parent =
+          let di = debug_info |> Debug_info.of_string in
+          di.tracing
+        in
+        ( Rpc.
+            {
+              name= "VM.import_metadata"
+            ; params=
+                [
+                  Rpc.Dict
+                    [
+                      ("debug_info", Rpc.String debug_info)
+                    ; ("metadata", metadata)
+                    ]
+                ]
+            ; is_notification= false
+            }
+        , call_name
+        , span_parent
+        )
+    | ("query" as call_name), [Rpc.String debug_info; unit_p] ->
         debug "Upgrading query" ;
-        Rpc.
-          {
-            name= "query"
-          ; params= [Rpc.Dict [("debug_info", debug_info); ("unit", unit_p)]]
-          ; is_notification= false
-          }
-    | _ ->
-        call
+        let span_parent =
+          let di = debug_info |> Debug_info.of_string in
+          di.tracing
+        in
+        ( Rpc.
+            {
+              name= "query"
+            ; params=
+                [
+                  Rpc.Dict
+                    [("debug_info", Rpc.String debug_info); ("unit", unit_p)]
+                ]
+            ; is_notification= false
+            }
+        , call_name
+        , span_parent
+        )
+    | call_name, [Rpc.Dict kv_list] ->
+        let span_parent =
+          kv_list
+          |> List.find_map (function
+               | "debug_info", Rpc.String debug_info ->
+                   let di = debug_info |> Debug_info.of_string in
+                   di.tracing
+               | _ ->
+                   None
+               )
+        in
+        (call, call_name, span_parent)
+    | call_name, _ ->
+        (call, call_name, None)
   in
-  Idl.Exn.server Xenops_server.Server.implementation call'
+  Tracing.with_tracing
+    ~attributes:
+      [
+        ("messaging.operation.name", "process")
+      ; ("messaging.system", "message-switch")
+      ; ("messaging.destination.name", !Xenops_interface.queue_name)
+      ]
+    ~span_kind:Tracing.SpanKind.Consumer ~parent:span_parent
+    ~name:("process" ^ " " ^ call_name)
+  @@ fun _ -> Idl.Exn.server Xenops_server.Server.implementation call'
 
 let handle_received_fd this_connection =
   let msg_size = 16384 in