Use hypractor::instrument instead of tracing::instrument (#2021)

Summary:
Pull Request resolved: #2021

The project uses `hypractor::instrument` mostly. We want to migrate remainly `tracing::instrument` to it so we can enforce a consistent behavior.

Reviewed By: shayne-fletcher

Differential Revision: D88077441

fbshipit-source-id: 5721f4cfbb5f2048d5eae13c98316e7bafa528ee

Author: pzhan9

hyperactor/src/host.rs

@@ -55,6 +55,7 @@ use tokio::process::Child;
 use tokio::process::Command;
 use tokio::sync::Mutex;
 
+use crate as hyperactor;
 use crate::Actor;
 use crate::ActorHandle;
 use crate::ActorId;
@@ -133,7 +134,7 @@ impl<M: ProcManager> Host<M> {
     /// Serve a host using the provided ProcManager, on the provided `addr`.
     /// On success, the host will multiplex messages for procs on the host
     /// on the address of the host.
-    #[tracing::instrument(skip(manager))]
+    #[crate::instrument(fields(addr=addr.to_string()))]
     pub async fn new(manager: M, addr: ChannelAddr) -> Result<Self, HostError> {
         let (frontend_addr, frontend_rx) = channel::serve(addr)?;
 
@@ -870,7 +871,7 @@ where
         ChannelTransport::Local
     }
 
-    #[tracing::instrument(skip(self, _config))]
+    #[crate::instrument(fields(proc_id=proc_id.to_string(), addr=forwarder_addr.to_string()))]
     async fn spawn(
         &self,
         proc_id: ProcId,
@@ -1048,7 +1049,7 @@ where
         ChannelTransport::Unix
     }
 
-    #[tracing::instrument(skip(self, _config))]
+    #[crate::instrument(fields(proc_id=proc_id.to_string(), addr=forwarder_addr.to_string()))]
     async fn spawn(
         &self,
         proc_id: ProcId,
@@ -1142,7 +1143,7 @@ where
 /// forwarding messages to the provided `backend_addr`,
 /// and returning the proc's address and agent actor on
 /// the provided `callback_addr`.
-#[tracing::instrument(skip(spawn))]
+#[crate::instrument(fields(proc_id=proc_id.to_string(), addr=backend_addr.to_string(), callback_addr=callback_addr.to_string()))]
 pub async fn spawn_proc<A, S, F>(
     proc_id: ProcId,
     backend_addr: ChannelAddr,

hyperactor_mesh/src/alloc/remoteprocess.rs

@@ -174,7 +174,7 @@ impl RemoteProcessAllocator {
     /// Start a remote process allocator with given allocator listening for
     /// RemoteProcessAllocatorMessage on serve_addr.
     /// Used for testing.
-    #[tracing::instrument(skip(self, process_allocator))]
+    #[hyperactor::instrument(fields(addr=serve_addr.to_string()))]
     pub async fn start_with_allocator<A: Allocator + Send + Sync + 'static>(
         &self,
         serve_addr: ChannelAddr,

hyperactor_mesh/src/bootstrap.rs

@@ -1848,7 +1848,7 @@ impl ProcManager for BootstrapProcManager {
     /// Returns a [`BootstrapProcHandle`] that exposes the child
     /// process's lifecycle (status, wait/ready, termination). Errors
     /// are surfaced as [`HostError`].
-    #[tracing::instrument(skip(self, config))]
+    #[hyperactor::instrument(fields(proc_id=proc_id.to_string(), addr=backend_addr.to_string()))]
     async fn spawn(
         &self,
         proc_id: ProcId,

hyperactor_mesh/src/proc_mesh.rs

@@ -274,7 +274,7 @@ impl ProcMesh {
         C.get_or_init(|| AtomicUsize::new(0))
     }
 
-    #[tracing::instrument(skip_all)]
+    #[hyperactor::instrument]
     #[hyperactor::observe_result("ProcMesh")]
     async fn allocate_boxed_inner(
         mut alloc: Box<dyn Alloc + Send + Sync>,

hyperactor_mesh/src/router.rs

@@ -57,7 +57,7 @@ impl Router {
     /// Servers are memoized, and we maintain only one per transport; thus
     /// subsequent calls using the same transport will return the same address.
     #[allow(dead_code)]
-    #[tracing::instrument(skip(self))]
+    #[hyperactor::instrument]
     pub async fn serve(&self, transport: &ChannelTransport) -> Result<ChannelAddr, ChannelError> {
         let mut servers = self.servers.lock().await;
         if let Some(addr) = servers.get(transport) {