more structured logging

chronicle/src/lib.rs

@@ -115,7 +115,12 @@ pub async fn run_chronicle(
 		}
 	};
 
-	tracing::info!("Target wallet address: {:?}", task_spawner.target_address());
+	event!(
+		target: TW_LOG,
+		Level::INFO,
+		"Target wallet address: {:?}",
+		task_spawner.target_address()
+	);
 
 	// Run the main application loop with the initialized task spawner.
 	run_chronicle_with_spawner(

chronicle/src/network/protocol.rs

@@ -5,6 +5,7 @@ use futures::{Future, FutureExt, SinkExt};
 use peernet::{Endpoint, NotificationHandler, Protocol, ProtocolHandler};
 use std::pin::Pin;
 use std::time::Duration;
+use tracing::field;
 
 pub struct TssEndpoint {
 	endpoint: Endpoint,
@@ -65,7 +66,10 @@ impl TssEndpoint {
 		let endpoint = builder.build().await?;
 		let peer_id = endpoint.peer_id();
 		loop {
-			tracing::info!("waiting for peer id to be registered");
+			tracing::info!(
+				peer_id = field::display(peer_id.clone()),
+				"waiting for peer id to be registered",
+			);
 			let Ok(addr) = endpoint.resolve(peer_id).await else {
 				tokio::time::sleep(Duration::from_secs(1)).await;
 				continue;
@@ -74,7 +78,7 @@ impl TssEndpoint {
 				tokio::time::sleep(Duration::from_secs(1)).await;
 				continue;
 			}
-			tracing::info!("peer id registered");
+			tracing::info!(peer_id = field::display(peer_id.clone()), "peer id registered",);
 			break;
 		}
 		Ok(Self { endpoint })

chronicle/src/shards/service.rs

@@ -410,7 +410,13 @@ where
 						event!(target: TW_LOG, parent: span, Level::INFO, "submitted heartbeat");
 					}
 					if let Err(e) = self.on_finality(span, block_hash, block_number).await {
-						tracing::error!("Error running on_finality {:?}", e);
+						event!(
+							target: TW_LOG,
+							parent: span,
+							Level::ERROR,
+							"Error running on_finality {:?}",
+							e
+						);
 					}
 				},
 				tss_request = self.tss_request.next().fuse() => {

chronicle/src/tasks/executor.rs

@@ -368,12 +368,25 @@ where
 		shard_id: ShardId,
 		block_hash: BlockHash,
 	) -> Result<Option<GmpParams>> {
+		let span = span!(
+			target: TW_LOG,
+			Level::ERROR,
+			"gmp_params",
+			block = block_hash.to_string(),
+			shard_id,
+		);
 		let Some(gateway_contract) = self.substrate.get_gateway(self.network).await? else {
 			return Ok(None);
 		};
 		let Some(commitment) = self.substrate.get_shard_commitment(block_hash, shard_id).await?
 		else {
-			tracing::error!(target: "chronicle", "shard commitment is empty for shard: {shard_id}");
+			event!(
+				target: TW_LOG,
+				parent: &span,
+				Level::ERROR,
+				shard_id,
+				"empty shard commitment",
+			);
 			return Ok(None);
 		};
 		Ok(Some(GmpParams {