pezkuwichain/pezkuwi-subxt
1
0
Fork 0
mirror of https://github.com/pezkuwichain/pezkuwi-subxt.git synced 2026-06-12 21:41:12 +00:00
Code Issues Packages Projects Releases Wiki Activity

observability: tracing gum, automatically cross ref traceID (#5079)

Browse Source 
* add some gum

* bump expander

* gum

* fix all remaining issues

* last fixup

* Update node/gum/proc-macro/src/lib.rs

Co-authored-by: Bastian Köcher <bkchr@users.noreply.github.com>

* change

* netowrk

* fixins

* chore

* allow optional fmt str + args, prep for expr as kv field

* tracing -> gum rename fallout

* restrict further

* allow multiple levels of field accesses

* another round of docs and a slip of the pen

* update ADR

* fixup lock fiel

* use target: instead of target=

* minors

* fix

* chore

* Update node/gum/README.md

Co-authored-by: Andrei Sandu <54316454+sandreim@users.noreply.github.com>

Co-authored-by: Bastian Köcher <bkchr@users.noreply.github.com>
Co-authored-by: Andrei Sandu <54316454+sandreim@users.noreply.github.com>
This commit is contained in:
Bernhard Schuster
2022-03-15 12:05:16 +01:00
committed by GitHub
parent fa359fd1f7
commit d631f1dea8
130 changed files with 1708 additions and 808 deletions
Download Patch File Download Diff File Expand all files Collapse all files
polkadot/node/service/src/lib.rs
+3 -3
View File
@@ -36,6 +36,7 @@ mod tests;
use {
beefy_gadget::notification::{BeefyBestBlockSender, BeefySignedCommitmentSender},
grandpa::{self, FinalityProofProvider as GrandpaFinalityProofProvider},
gum::info,
polkadot_node_core_approval_voting::Config as ApprovalVotingConfig,
polkadot_node_core_av_store::Config as AvailabilityConfig,
polkadot_node_core_av_store::Error as AvailabilityError,
@@ -47,7 +48,6 @@ use {
polkadot_overseer::BlockInfo,
sc_client_api::{BlockBackend, ExecutorProvider},
sp_trie::PrefixedMemoryDB,
tracing::info,
};
pub use sp_core::traits::SpawnNamed;
@@ -975,7 +975,7 @@ where
};
if local_keystore.is_none() {
tracing::info!("Cannot run as validator without local keystore.");
gum::info!("Cannot run as validator without local keystore.");
}
let maybe_params =
@@ -1011,7 +1011,7 @@ where
},
)
.map_err(|e| {
tracing::error!("Failed to init overseer: {}", e);
gum::error!("Failed to init overseer: {}", e);
e
})?;
let handle = Handle::new(overseer_handle.clone());
polkadot/node/service/src/relay_chain_selection.rs
+16 -20
View File
@@ -153,7 +153,7 @@ where
{
/// Use the plain longest chain algorithm exclusively.
pub fn new_longest_chain(backend: Arc<B>) -> Self {
tracing::debug!(target: LOG_TARGET, "Using {} chain selection algorithm", "longest");
gum::debug!(target: LOG_TARGET, "Using {} chain selection algorithm", "longest");
Self {
longest_chain: sc_consensus::LongestChain::new(backend.clone()),
@@ -169,7 +169,7 @@ where
metrics: Metrics,
disputes_enabled: bool,
) -> Self {
tracing::debug!(
gum::debug!(
target: LOG_TARGET,
"Using {} chain selection algorithm",
if disputes_enabled {
@@ -351,7 +351,7 @@ where
.map_err(Error::LeavesCanceled)
.map_err(|e| ConsensusError::Other(Box::new(e)))?;
tracing::trace!(target: LOG_TARGET, ?leaves, "Chain selection leaves");
gum::trace!(target: LOG_TARGET, ?leaves, "Chain selection leaves");
Ok(leaves)
}
@@ -368,7 +368,7 @@ where
.ok_or_else(|| ConsensusError::Other(Box::new(Error::EmptyLeaves)))?
.clone();
tracing::trace!(target: LOG_TARGET, ?best_leaf, "Best chain");
gum::trace!(target: LOG_TARGET, ?best_leaf, "Best chain");
self.block_header(best_leaf)
}
@@ -389,7 +389,7 @@ where
maybe_max_number: Option<BlockNumber>,
) -> Result<Hash, ConsensusError> {
let mut overseer = self.overseer.clone();
tracing::trace!(target: LOG_TARGET, ?best_leaf, "Longest chain");
gum::trace!(target: LOG_TARGET, ?best_leaf, "Longest chain");
let subchain_head = if self.disputes_enabled {
let (tx, rx) = oneshot::channel();
@@ -405,7 +405,7 @@ where
.map_err(Error::BestLeafContainingCanceled)
.map_err(|e| ConsensusError::Other(Box::new(e)))?;
tracing::trace!(target: LOG_TARGET, ?best, "Best leaf containing");
gum::trace!(target: LOG_TARGET, ?best, "Best leaf containing");
match best {
// No viable leaves containing the block.
@@ -413,7 +413,7 @@ where
Some(best) => best,
}
} else {
tracing::trace!(target: LOG_TARGET, ?best_leaf, "Dummy disputes active");
gum::trace!(target: LOG_TARGET, ?best_leaf, "Dummy disputes active");
if best_leaf == target_hash {
return Ok(target_hash)
} else {
@@ -429,7 +429,7 @@ where
Some(max) => {
if max <= target_number {
if max < target_number {
tracing::warn!(
gum::warn!(
LOG_TARGET,
max_number = max,
target_number,
@@ -442,7 +442,7 @@ where
let subchain_header = self.block_header(subchain_head)?;
if subchain_header.number <= max {
tracing::trace!(target: LOG_TARGET, ?best_leaf, "Constrained sub-chain head",);
gum::trace!(target: LOG_TARGET, ?best_leaf, "Constrained sub-chain head",);
subchain_head
} else {
let (ancestor_hash, _) =
@@ -452,7 +452,7 @@ where
&subchain_header,
)
.map_err(|e| ConsensusError::ChainLookup(format!("{:?}", e)))?;
tracing::trace!(
gum::trace!(
target: LOG_TARGET,
?ancestor_hash,
"Grandpa walk backwards sub-chain head"
@@ -487,11 +487,7 @@ where
}
};
tracing::trace!(
target: LOG_TARGET,
?subchain_head,
"Ancestor approval restriction applied",
);
gum::trace!(target: LOG_TARGET, ?subchain_head, "Ancestor approval restriction applied",);
let lag = initial_leaf_number.saturating_sub(subchain_number);
self.metrics.note_approval_checking_finality_lag(lag);
@@ -501,7 +497,7 @@ where
if Some(subchain_block_descriptions.len() as _) !=
subchain_number.checked_sub(target_number)
{
tracing::error!(
gum::error!(
LOG_TARGET,
present_block_descriptions = subchain_block_descriptions.len(),
target_number,
@@ -536,7 +532,7 @@ where
(lag_disputes, subchain_head)
},
Err(e) => {
tracing::error!(
gum::error!(
target: LOG_TARGET,
error = ?e,
"Call to `DetermineUndisputedChain` failed",
@@ -552,7 +548,7 @@ where
(lag, subchain_head)
};
tracing::trace!(
gum::trace!(
target: LOG_TARGET,
?subchain_head,
"Disputed blocks in ancestry restriction applied",
@@ -565,7 +561,7 @@ where
let safe_target = initial_leaf_number - MAX_FINALITY_LAG;
if safe_target <= target_number {
tracing::warn!(target: LOG_TARGET, ?target_hash, "Safeguard enforced finalization");
gum::warn!(target: LOG_TARGET, ?target_hash, "Safeguard enforced finalization");
// Minimal vote needs to be on the target number.
Ok(target_hash)
} else {
@@ -578,7 +574,7 @@ where
)
.map_err(|e| ConsensusError::ChainLookup(format!("{:?}", e)))?;
tracing::warn!(
gum::warn!(
target: LOG_TARGET,
?forced_target,
"Safeguard enforced finalization of child"
polkadot/node/service/src/tests.rs
+7 -7
View File
@@ -115,7 +115,7 @@ async fn overseer_recv(overseer: &mut VirtualOverseer) -> AllMessages {
.await
.expect(&format!("{:?} is enough to receive messages.", TIMEOUT));
tracing::trace!("Received message:\n{:?}", &msg);
gum::trace!("Received message:\n{:?}", &msg);
msg
}
@@ -123,7 +123,7 @@ async fn overseer_recv_with_timeout(
overseer: &mut VirtualOverseer,
timeout: Duration,
) -> Option<AllMessages> {
tracing::trace!("Waiting for message...");
gum::trace!("Waiting for message...");
overseer.recv().timeout(timeout).await
}
@@ -353,7 +353,7 @@ async fn test_skeleton(
) {
let undisputed_chain = undisputed_chain.map(|x| (chain.number(x).unwrap().unwrap(), x));
tracing::trace!("best leaf response: {:?}", undisputed_chain);
gum::trace!("best leaf response: {:?}", undisputed_chain);
assert_matches!(
overseer_recv(
virtual_overseer
@@ -372,7 +372,7 @@ async fn test_skeleton(
return
}
tracing::trace!("approved ancestor response: {:?}", undisputed_chain);
gum::trace!("approved ancestor response: {:?}", undisputed_chain);
assert_matches!(
overseer_recv(
virtual_overseer
@@ -383,7 +383,7 @@ async fn test_skeleton(
}
);
tracing::trace!("determine undisputed chain response: {:?}", undisputed_chain);
gum::trace!("determine undisputed chain response: {:?}", undisputed_chain);
let target_block_number = chain.number(target_block_hash).unwrap().unwrap();
assert_matches!(
@@ -724,8 +724,8 @@ fn chain_6() -> CaseVars {
let chain = builder.init();
tracing::trace!(highest_approved = ?chain.highest_approved_ancestors(1, leaf));
tracing::trace!(undisputed = ?chain.undisputed_chain(1, approved));
gum::trace!(highest_approved = ?chain.highest_approved_ancestors(1, leaf));
gum::trace!(undisputed = ?chain.undisputed_chain(1, approved));
CaseVars {
chain,
target_block: b1,