diff --git a/bridges/relays/client-substrate/src/client.rs b/bridges/relays/client-substrate/src/client.rs index 0f9445a8d3..bb9f823005 100644 --- a/bridges/relays/client-substrate/src/client.rs +++ b/bridges/relays/client-substrate/src/client.rs @@ -187,6 +187,8 @@ impl Client { params.host, params.port, ); + log::info!(target: "bridge", "Connecting to {} node at {}", C::NAME, uri); + let client = tokio .spawn(async move { RpcClientBuilder::default() diff --git a/bridges/relays/lib-substrate-relay/src/on_demand/headers.rs b/bridges/relays/lib-substrate-relay/src/on_demand/headers.rs index 3d007de4db..f22ad96b63 100644 --- a/bridges/relays/lib-substrate-relay/src/on_demand/headers.rs +++ b/bridges/relays/lib-substrate-relay/src/on_demand/headers.rs @@ -95,9 +95,9 @@ impl OnDemandRelay> if required_header > *required_header_number { log::trace!( target: "bridge", - "More {} headers required in {} relay. Going to sync up to the {}", - SourceChain::NAME, + "[{}] More {} headers required. Going to sync up to the {}", self.relay_task_name, + SourceChain::NAME, required_header, ); @@ -184,7 +184,7 @@ async fn background_task( log::trace!( target: "bridge", - "Mandatory headers scan range in {}: ({:?}, {:?}, {:?}) -> {:?}", + "[{}] Mandatory headers scan range: ({:?}, {:?}, {:?}) -> {:?}", relay_task_name, required_header_number_value, best_finalized_source_header_at_source_fmt, @@ -213,18 +213,18 @@ async fn background_task( log::trace!( target: "bridge", - "No mandatory {} headers in the range {:?} of {} relay", + "[{}] No mandatory {} headers in the range {:?}", + relay_task_name, P::SourceChain::NAME, mandatory_scan_range, - relay_task_name, ); }, Err(e) => { log::warn!( target: "bridge", - "Failed to scan mandatory {} headers range in {} relay (range: {:?}): {:?}", - P::SourceChain::NAME, + "[{}] Failed to scan mandatory {} headers range ({:?}): {:?}", relay_task_name, + P::SourceChain::NAME, mandatory_scan_range, e, ); @@ -253,7 +253,7 @@ async fn background_task( log::info!( target: "bridge", - "Starting {} relay\n\t\ + "[{}] Starting on-demand relay task\n\t\ Only mandatory headers: {}\n\t\ Tx mortality: {:?} (~{}m)\n\t\ Stall timeout: {:?}", @@ -347,9 +347,9 @@ async fn relay_mandatory_header_from_range( log::trace!( target: "bridge", - "Too many {} headers missing at target in {} relay ({} vs {}). Going to sync up to the mandatory {}", - P::SourceChain::NAME, + "[{}] Too many {} headers missing at target ({} vs {}). Going to sync up to the mandatory {}", relay_task_name, + P::SourceChain::NAME, best_finalized_source_header_at_target, range.1, mandatory_source_header_number, @@ -369,7 +369,7 @@ async fn best_finalized_source_header_at_source( /// On-demand headers relay task name. fn on_demand_headers_relay_name() -> String { - format!("on-demand-{}-to-{}", SourceChain::NAME, TargetChain::NAME) + format!("{}-to-{}-on-demand-headers", SourceChain::NAME, TargetChain::NAME) } #[cfg(test)] diff --git a/bridges/relays/lib-substrate-relay/src/on_demand/parachains.rs b/bridges/relays/lib-substrate-relay/src/on_demand/parachains.rs index d8cc60ab29..579f3103e8 100644 --- a/bridges/relays/lib-substrate-relay/src/on_demand/parachains.rs +++ b/bridges/relays/lib-substrate-relay/src/on_demand/parachains.rs @@ -111,10 +111,10 @@ where if let Err(e) = self.required_header_number_sender.send(required_header).await { log::trace!( target: "bridge", - "Failed to request {} header {:?} in {:?}: {:?}", + "[{}] Failed to request {} header {:?}: {:?}", + self.relay_task_name, SourceParachain::NAME, required_header, - self.relay_task_name, e, ); } @@ -164,7 +164,7 @@ async fn background_task( Err(e) => { log::error!( target: "bridge", - "Background task of {} has exited with error: {:?}", + "[{}] Background task has exited with error: {:?}", relay_task_name, e, ); @@ -223,7 +223,7 @@ async fn background_task( relay_state = select_headers_to_relay(&relay_data, relay_state); log::trace!( target: "bridge", - "Selected new relay state in {}: {:?} using old state {:?} and data {:?}", + "[{}] Selected new relay state: {:?} using old state {:?} and data {:?}", relay_task_name, relay_state, prev_relay_state, @@ -266,7 +266,7 @@ async fn background_task( log::info!( target: "bridge", - "Starting {} relay\n\t\ + "[{}] Starting on-demand-relay task\n\t\ Tx mortality: {:?} (~{}m)\n\t\ Stall timeout: {:?}", relay_task_name, @@ -297,7 +297,7 @@ async fn background_task( /// On-demand parachains relay task name. fn on_demand_parachains_relay_name() -> String { - format!("on-demand-{}-to-{}", SourceChain::NAME, TargetChain::NAME) + format!("{}-to-{}-on-demand-parachain", SourceChain::NAME, TargetChain::NAME) } /// On-demand relay state. @@ -349,7 +349,7 @@ where let map_target_err = |e| { log::error!( target: "bridge", - "Failed to read {} relay data from {} client: {:?}", + "[{}] Failed to read relay data from {} client: {:?}", on_demand_parachains_relay_name::(), P::TargetChain::NAME, e, @@ -359,7 +359,7 @@ where let map_source_err = |e| { log::error!( target: "bridge", - "Failed to read {} relay data from {} client: {:?}", + "[{}] Failed to read relay data from {} client: {:?}", on_demand_parachains_relay_name::(), P::SourceRelayChain::NAME, e, diff --git a/bridges/relays/parachains/src/parachains_loop.rs b/bridges/relays/parachains/src/parachains_loop.rs index fd173f2d25..6e9cc5f1da 100644 --- a/bridges/relays/parachains/src/parachains_loop.rs +++ b/bridges/relays/parachains/src/parachains_loop.rs @@ -121,7 +121,7 @@ pub trait TargetClient: RelayClient { /// Return prefix that will be used by default to expose Prometheus metrics of the parachains /// sync loop. pub fn metrics_prefix() -> String { - format!("{}_to_{}_Sync", P::SourceChain::NAME, P::TargetChain::NAME) + format!("{}_to_{}_Parachains", P::SourceChain::NAME, P::TargetChain::NAME) } /// Run parachain heads synchronization.