Use more tracing fields instead of string interpolation

rust-lang · Nov 23, 2024 · 97ed594 · 97ed594
1 parent a73d186
commit 97ed594
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 9 deletions.
diff --git a/compiler/base/orchestrator/src/coordinator.rs b/compiler/base/orchestrator/src/coordinator.rs
@@ -1831,7 +1831,7 @@ impl Container {
                             already_cancelled = true;
 
                             let msg = CoordinatorMessage::Kill;
-                            trace!("processing {msg:?}");
+                            trace!(msg_name = msg.as_ref(), "processing");
                             to_worker_tx.send(msg).await.context(KillSnafu)?;
                         },
 
@@ -1847,12 +1847,12 @@ impl Container {
                                 }
                             };
 
-                            trace!("processing {msg:?}");
+                            trace!(msg_name = msg.as_ref(), "processing");
                             to_worker_tx.send(msg).await.context(StdinSnafu)?;
                         },
 
                         Some(container_msg) = from_worker_rx.recv() => {
-                            trace!("processing {container_msg:?}");
+                            trace!(msg_name = container_msg.as_ref(), "processing");
 
                             match container_msg {
                                 WorkerMessage::ExecuteCommand(resp) => {
@@ -2382,13 +2382,13 @@ impl Commander {
                 Command(Some((ack_tx, command))) => {
                     match command {
                         DemultiplexCommand::Listen(job_id, waiter) => {
-                            trace!("adding listener for {job_id:?}");
+                            trace!(job_id, "adding listener (many)");
                             let old = waiting.insert(job_id, waiter);
                             ensure!(old.is_none(), DuplicateDemultiplexerClientSnafu { job_id });
                         }
 
                         DemultiplexCommand::ListenOnce(job_id, waiter) => {
-                            trace!("adding listener for {job_id:?}");
+                            trace!(job_id, "adding listener (once)");
                             let old = waiting_once.insert(job_id, waiter);
                             ensure!(old.is_none(), DuplicateDemultiplexerClientSnafu { job_id });
                         }
@@ -2400,18 +2400,18 @@ impl Commander {
                 FromWorker(None) => break,
                 FromWorker(Some(Multiplexed(job_id, msg))) => {
                     if let Some(waiter) = waiting_once.remove(&job_id) {
-                        trace!("notifying listener for {job_id:?}");
+                        trace!(job_id, "notifying listener (once)");
                         waiter.send(msg).ok(/* Don't care about it */);
                         continue;
                     }
 
                     if let Some(waiter) = waiting.get(&job_id) {
-                        trace!("notifying listener for {job_id:?}");
+                        trace!(job_id, "notifying listener (many)");
                         waiter.send(msg).await.ok(/* Don't care about it */);
                         continue;
                     }
 
-                    warn!("no listener for {job_id:?}");
+                    warn!(job_id, "no listener to notify");
                 }
 
                 Gc => {

diff --git a/compiler/base/orchestrator/src/message.rs b/compiler/base/orchestrator/src/message.rs
@@ -22,7 +22,7 @@ macro_rules! impl_narrow_to_broad {
 #[derive(Debug, Serialize, Deserialize)]
 pub struct Multiplexed<T>(pub JobId, pub T);
 
-#[derive(Debug, Serialize, Deserialize)]
+#[derive(Debug, Serialize, Deserialize, strum_macros::AsRefStr)]
 pub enum CoordinatorMessage {
     WriteFile(WriteFileRequest),
     DeleteFile(DeleteFileRequest),