Fix message logs (#1825)

rust/agents/relayer/src/msg/gas_payment/policies/meets_estimated_cost.rs

@@ -203,7 +203,7 @@ impl GasPaymentPolicy for GasPaymentPolicyMeetsEstimatedCost {
         let meets_requirement = *current_payment >= origin_token_tx_cost;
         if !meets_requirement {
             info!(
-                %message,
+                msg=%message,
                 ?tx_cost_estimate,
                 ?destination_token_tx_cost,
                 ?origin_token_tx_cost,
@@ -212,7 +212,7 @@ impl GasPaymentPolicy for GasPaymentPolicyMeetsEstimatedCost {
             );
         } else {
             debug!(
-                %message,
+                msg=%message,
                 ?tx_cost_estimate,
                 ?destination_token_tx_cost,
                 ?origin_token_tx_cost,

rust/agents/relayer/src/msg/gelato_submitter/sponsored_call_op.rs

@@ -66,7 +66,7 @@ impl SponsoredCallOp {
         Self(args)
     }
 
-    #[instrument(skip(self), fields(message=?self.message.message))]
+    #[instrument(skip(self), fields(msg=?self.message.message))]
     pub async fn run(&mut self) {
         loop {
             match self.tick().await {

rust/agents/relayer/src/msg/processor.rs

@@ -107,26 +107,26 @@ impl MessageProcessor {
     /// testing purposes.
     async fn tick(&mut self) -> Result<()> {
         // Scan until we find next nonce without delivery confirmation.
-        if let Some(message) = self.try_get_unprocessed_message()? {
-            debug!(?message, "Processor working on message");
+        if let Some(msg) = self.try_get_unprocessed_message()? {
+            debug!(?msg, "Processor working on message");
 
             // Skip if not whitelisted.
-            if !self.whitelist.msg_matches(&message, true) {
-                debug!(?message, whitelist=?self.whitelist, "Message not whitelisted, skipping");
+            if !self.whitelist.msg_matches(&msg, true) {
+                debug!(?msg, whitelist=?self.whitelist, "Message not whitelisted, skipping");
                 self.message_nonce += 1;
                 return Ok(());
             }
 
             // Skip if the message is blacklisted
-            if self.blacklist.msg_matches(&message, false) {
-                debug!(?message, blacklist=?self.blacklist, "Message blacklisted, skipping");
+            if self.blacklist.msg_matches(&msg, false) {
+                debug!(?msg, blacklist=?self.blacklist, "Message blacklisted, skipping");
                 self.message_nonce += 1;
                 return Ok(());
             }
 
             // Skip if the message is intended for a destination we do not service
-            if self.send_channels.get(&message.destination).is_none() {
-                debug!(?message, "Message destined for unknown domain, skipping");
+            if self.send_channels.get(&msg.destination).is_none() {
+                debug!(?msg, "Message destined for unknown domain, skipping");
                 self.message_nonce += 1;
                 return Ok(());
             }
@@ -135,15 +135,15 @@ impl MessageProcessor {
             self.prover_sync
                 .write()
                 .await
-                .update_to_index(message.nonce)
+                .update_to_index(msg.nonce)
                 .await?;
 
-            debug!(%message, "Sending message to submitter");
+            debug!(%msg, "Sending message to submitter");
 
             // Finally, build the submit arg and dispatch it to the submitter.
-            let submit_args = SubmitMessageArgs::new(message.clone());
+            let submit_args = SubmitMessageArgs::new(msg.clone());
             // Guaranteed to exist as we return early above if it does not.
-            let send_channel = self.send_channels.get(&message.destination).unwrap();
+            let send_channel = self.send_channels.get(&msg.destination).unwrap();
             send_channel.send(submit_args)?;
             self.message_nonce += 1;
         } else {

rust/agents/relayer/src/msg/serial_submitter.rs

@@ -228,17 +228,17 @@ impl SerialSubmitter {
 
         match self.process_message(&msg).await {
             Ok(true) => {
-                info!(message = %msg.message, "Message processed");
+                info!(msg=%msg.message, "Message processed");
                 self.record_message_process_success(&msg)?;
                 return Ok(());
             }
             Ok(false) => {
-                info!(message = %msg.message, "Message not processed");
+                info!(msg=%msg.message, "Message not processed");
             }
             // We expect this branch to be hit when there is unexpected behavior -
             // defined behavior like gas estimation failing will not hit this branch.
             Err(error) => {
-                error!(message = %msg.message, ?error, "Error occurred when attempting to process message");
+                error!(msg=%msg.message, ?error, "Error occurred when attempting to process message");
             }
         }
 
@@ -256,7 +256,7 @@ impl SerialSubmitter {
     /// been processed, Ok(true) is returned. If this message is unable to
     /// be processed, either due to failed gas estimation or an insufficient gas payment,
     /// Ok(false) is returned.
-    #[instrument(skip(self, msg), fields(message=?msg.message))]
+    #[instrument(skip(self, msg), fields(msg=?msg.message))]
     async fn process_message(&self, msg: &SubmitMessageArgs) -> Result<bool> {
         // If the message has already been processed, e.g. due to another relayer having already
         // processed, then mark it as already-processed, and move on to the next tick.

rust/chains/hyperlane-ethereum/src/mailbox.rs

@@ -302,7 +302,7 @@ where
         Ok(receipt.into())
     }
 
-    #[instrument(err, ret, skip(self), fields(message=%message, metadata=%fmt_bytes(metadata)))]
+    #[instrument(err, ret, skip(self), fields(msg=%message, metadata=%fmt_bytes(metadata)))]
     async fn process_estimate_costs(
         &self,
         message: &HyperlaneMessage,

rust/chains/hyperlane-fuel/src/mailbox.rs

@@ -124,7 +124,7 @@ impl Mailbox for FuelMailbox {
         todo!()
     }
 
-    #[instrument(err, ret, skip(self), fields(message=%message, metadata=%fmt_bytes(metadata)))]
+    #[instrument(err, ret, skip(self), fields(msg=%message, metadata=%fmt_bytes(metadata)))]
     async fn process_estimate_costs(
         &self,
         message: &HyperlaneMessage,

rust/hyperlane-core/src/db/hyperlane_db.rs

@@ -69,7 +69,7 @@ impl HyperlaneDB {
         // If this message is not building off the latest nonce, log it.
         if let Some(nonce) = self.retrieve_latest_nonce()? {
             if nonce != message.nonce - 1 {
-                debug!(%message, "Attempted to store message not building off latest nonce")
+                debug!(msg=%message, "Attempted to store message not building off latest nonce")
             }
         }
 
@@ -84,7 +84,7 @@ impl HyperlaneDB {
     pub fn store_message(&self, message: &HyperlaneMessage) -> Result<()> {
         let id = message.id();
 
-        info!(?message, "Storing new message in db",);
+        info!(msg=?message, "Storing new message in db",);
         self.store_message_id(message.nonce, message.destination, id)?;
         self.store_keyed_encodable(MESSAGE, &id, message)?;
         Ok(())