uniform hash in logs

input-output-hk · Sep 24, 2021 · 7419ff1 · 7419ff1
1 parent 830c868
commit 7419ff1
Show file tree

Hide file tree

Showing 2 changed files with 11 additions and 14 deletions.
diff --git a/jormungandr/src/blockchain/process.rs b/jormungandr/src/blockchain/process.rs
@@ -31,9 +31,6 @@ type GetNextBlockScheduler = FireForgetScheduler<HeaderHash, Address, ()>;
 
 const TIP_UPDATE_QUEUE_SIZE: usize = 5;
 
-// it's a bit unnecessary to display the whole hash in logs
-const HASH_LOG_LENGTH: usize = 7;
-
 const DEFAULT_TIMEOUT_PROCESS_LEADERSHIP: u64 = 5;
 const DEFAULT_TIMEOUT_PROCESS_ANNOUNCEMENT: u64 = 5;
 const DEFAULT_TIMEOUT_PROCESS_BLOCKS: u64 = 60;
@@ -211,9 +208,9 @@ impl Process {
                     parent: self.service_info.span(),
                     Level::DEBUG,
                     "process_leadership_block",
-                    hash = %leadership_block.block.header.description(),
-                    parent = %leadership_block.block.header.parent_id().to_string()[..HASH_LOG_LENGTH],
-                    date = %leadership_block.block.header.block_date().to_string()
+                    hash = %leadership_block.block.header.hash(),
+                    parent = %leadership_block.block.header.parent_id(),
+                    date = %leadership_block.block.header.block_date()
                 );
                 let _enter = span.enter();
                 tracing::info!("receiving block from leadership service");
@@ -236,10 +233,10 @@ impl Process {
                     parent: self.service_info.span(),
                     Level::DEBUG,
                     "process_announced_block",
-                    hash = %header.description(),
-                    parent = %header.parent_id().to_string()[..HASH_LOG_LENGTH],
-                    date = %header.block_date().to_string(),
-                    peer = %node_id.to_string()
+                    hash = %header.hash(),
+                    parent = %header.parent_id(),
+                    date = %header.block_date(),
+                    peer = %node_id
                 );
                 let _enter = span.enter();
                 tracing::info!("received block announcement from network");
@@ -325,7 +322,7 @@ async fn process_and_propagate_new_ref(
     mut network_msg_box: MessageBox<NetworkMsg>,
 ) -> chain::Result<()> {
     let header = new_block_ref.header().clone();
-    let span = span!(Level::DEBUG, "process_and_propagate_new_ref", block = %header.description());
+    let span = span!(Level::DEBUG, "process_and_propagate_new_ref", block = %header.hash());
 
     async {
         tracing::debug!("processing the new block and propagating");
@@ -506,8 +503,8 @@ async fn process_network_block(
     let span = tracing::span!(
         Level::DEBUG,
         "network_block",
-        block = %header.description(),
-        parent = %header.parent_id().to_string()[..HASH_LOG_LENGTH],
+        block = %header.hash(),
+        parent = %header.parent_id(),
         date = %header.block_date(),
     );
 

diff --git a/jormungandr/src/network/mod.rs b/jormungandr/src/network/mod.rs
@@ -398,7 +398,7 @@ async fn handle_propagation_msg(
             .await?
         }
         PropagateMsg::Fragment(fragment) => {
-            Span::current().record("hash", &format_args!("{:.8}", fragment.hash()));
+            Span::current().record("hash", &format_args!("{}", fragment.hash()));
             tracing::debug!(hash = %fragment.hash(), "fragment to propagate");
             let fragment = fragment.encode();
             propagate_message(