mirror of
https://github.com/sigp/lighthouse.git
synced 2026-03-09 19:51:47 +00:00
Integrate tracing (#6339)
Tracing Integration
- [reference](5bbf1859e9/projects/project-ideas.md (L297))
- [x] replace slog & log with tracing throughout the codebase
- [x] implement custom crit log
- [x] make relevant changes in the formatter
- [x] replace sloggers
- [x] re-write SSE logging components
cc: @macladson @eserilev
This commit is contained in:
ThreeHrSleep
@@ -13,7 +13,6 @@ use eth2::{
|
||||
use fork_choice::ForkchoiceUpdateParameters;
|
||||
use parking_lot::RwLock;
|
||||
use sensitive_url::SensitiveUrl;
|
||||
use slog::{debug, error, info, warn, Logger};
|
||||
use ssz::Encode;
|
||||
use std::collections::HashMap;
|
||||
use std::fmt::Debug;
|
||||
@@ -24,6 +23,7 @@ use std::time::Duration;
|
||||
use task_executor::TaskExecutor;
|
||||
use tempfile::NamedTempFile;
|
||||
use tokio_stream::StreamExt;
|
||||
use tracing::{debug, error, info, warn};
|
||||
use tree_hash::TreeHash;
|
||||
use types::builder_bid::{
|
||||
BuilderBid, BuilderBidBellatrix, BuilderBidCapella, BuilderBidDeneb, BuilderBidElectra,
|
||||
@@ -309,7 +309,6 @@ pub struct MockBuilder<E: EthSpec> {
|
||||
max_bid: bool,
|
||||
/// A cache that stores the proposers index for a given epoch
|
||||
proposers_cache: Arc<RwLock<HashMap<Epoch, Vec<ProposerData>>>>,
|
||||
log: Logger,
|
||||
}
|
||||
|
||||
impl<E: EthSpec> MockBuilder<E> {
|
||||
@@ -331,8 +330,7 @@ impl<E: EthSpec> MockBuilder<E> {
|
||||
..Default::default()
|
||||
};
|
||||
|
||||
let el =
|
||||
ExecutionLayer::from_config(config, executor.clone(), executor.log().clone()).unwrap();
|
||||
let el = ExecutionLayer::from_config(config, executor.clone()).unwrap();
|
||||
|
||||
let builder = MockBuilder::new(
|
||||
el,
|
||||
@@ -342,7 +340,6 @@ impl<E: EthSpec> MockBuilder<E> {
|
||||
false,
|
||||
spec,
|
||||
None,
|
||||
executor.log().clone(),
|
||||
);
|
||||
let host: Ipv4Addr = Ipv4Addr::LOCALHOST;
|
||||
let port = 0;
|
||||
@@ -359,16 +356,12 @@ impl<E: EthSpec> MockBuilder<E> {
|
||||
max_bid: bool,
|
||||
spec: Arc<ChainSpec>,
|
||||
sk: Option<&[u8]>,
|
||||
log: Logger,
|
||||
) -> Self {
|
||||
let builder_sk = if let Some(sk_bytes) = sk {
|
||||
match SecretKey::deserialize(sk_bytes) {
|
||||
Ok(sk) => sk,
|
||||
Err(_) => {
|
||||
error!(
|
||||
log,
|
||||
"Invalid sk_bytes provided, generating random secret key"
|
||||
);
|
||||
error!("Invalid sk_bytes provided, generating random secret key");
|
||||
SecretKey::random()
|
||||
}
|
||||
}
|
||||
@@ -390,7 +383,6 @@ impl<E: EthSpec> MockBuilder<E> {
|
||||
apply_operations,
|
||||
max_bid,
|
||||
genesis_time: None,
|
||||
log,
|
||||
}
|
||||
}
|
||||
|
||||
@@ -425,18 +417,13 @@ impl<E: EthSpec> MockBuilder<E> {
|
||||
&self,
|
||||
registrations: Vec<SignedValidatorRegistrationData>,
|
||||
) -> Result<(), String> {
|
||||
info!(
|
||||
self.log,
|
||||
"Registering validators";
|
||||
"count" => registrations.len(),
|
||||
);
|
||||
info!(count = registrations.len(), "Registering validators");
|
||||
for registration in registrations {
|
||||
if !registration.verify_signature(&self.spec) {
|
||||
error!(
|
||||
self.log,
|
||||
"Failed to register validator";
|
||||
"error" => "invalid signature",
|
||||
"validator" => %registration.message.pubkey
|
||||
error = "invalid signature",
|
||||
validator = %registration.message.pubkey,
|
||||
"Failed to register validator"
|
||||
);
|
||||
return Err("invalid signature".to_string());
|
||||
}
|
||||
@@ -472,9 +459,8 @@ impl<E: EthSpec> MockBuilder<E> {
|
||||
}
|
||||
};
|
||||
info!(
|
||||
self.log,
|
||||
"Submitting blinded beacon block to builder";
|
||||
"block_hash" => %root
|
||||
block_hash = %root,
|
||||
"Submitting blinded beacon block to builder"
|
||||
);
|
||||
let payload = self
|
||||
.el
|
||||
@@ -486,10 +472,9 @@ impl<E: EthSpec> MockBuilder<E> {
|
||||
.try_into_full_block(Some(payload.clone()))
|
||||
.ok_or("Internal error, just provided a payload")?;
|
||||
debug!(
|
||||
self.log,
|
||||
"Got full payload, sending to local beacon node for propagation";
|
||||
"txs_count" => payload.transactions().len(),
|
||||
"blob_count" => blobs.as_ref().map(|b| b.commitments.len())
|
||||
txs_count = payload.transactions().len(),
|
||||
blob_count = blobs.as_ref().map(|b| b.commitments.len()),
|
||||
"Got full payload, sending to local beacon node for propagation"
|
||||
);
|
||||
let publish_block_request = PublishBlockRequest::new(
|
||||
Arc::new(full_block),
|
||||
@@ -508,7 +493,7 @@ impl<E: EthSpec> MockBuilder<E> {
|
||||
parent_hash: ExecutionBlockHash,
|
||||
pubkey: PublicKeyBytes,
|
||||
) -> Result<SignedBuilderBid<E>, String> {
|
||||
info!(self.log, "In get_header");
|
||||
info!("In get_header");
|
||||
// Check if the pubkey has registered with the builder if required
|
||||
if self.validate_pubkey && !self.val_registration_cache.read().contains_key(&pubkey) {
|
||||
return Err("validator not registered with builder".to_string());
|
||||
@@ -521,15 +506,12 @@ impl<E: EthSpec> MockBuilder<E> {
|
||||
let payload_parameters = match payload_parameters {
|
||||
Some(params) => params,
|
||||
None => {
|
||||
warn!(
|
||||
self.log,
|
||||
"Payload params not cached for parent_hash {}", parent_hash
|
||||
);
|
||||
warn!("Payload params not cached for parent_hash {}", parent_hash);
|
||||
self.get_payload_params(slot, None, pubkey, None).await?
|
||||
}
|
||||
};
|
||||
|
||||
info!(self.log, "Got payload params");
|
||||
info!("Got payload params");
|
||||
|
||||
let fork = self.fork_name_at_slot(slot);
|
||||
let payload_response_type = self
|
||||
@@ -545,7 +527,7 @@ impl<E: EthSpec> MockBuilder<E> {
|
||||
.await
|
||||
.map_err(|e| format!("couldn't get payload {:?}", e))?;
|
||||
|
||||
info!(self.log, "Got payload message, fork {}", fork);
|
||||
info!("Got payload message, fork {}", fork);
|
||||
|
||||
let mut message = match payload_response_type {
|
||||
crate::GetPayloadResponseType::Full(payload_response) => {
|
||||
@@ -616,10 +598,10 @@ impl<E: EthSpec> MockBuilder<E> {
|
||||
};
|
||||
|
||||
if self.apply_operations {
|
||||
info!(self.log, "Applying operations");
|
||||
info!("Applying operations");
|
||||
self.apply_operations(&mut message);
|
||||
}
|
||||
info!(self.log, "Signing builder message");
|
||||
info!("Signing builder message");
|
||||
|
||||
let mut signature = message.sign_builder_message(&self.builder_sk, &self.spec);
|
||||
|
||||
@@ -627,7 +609,7 @@ impl<E: EthSpec> MockBuilder<E> {
|
||||
signature = Signature::empty();
|
||||
};
|
||||
let signed_bid = SignedBuilderBid { message, signature };
|
||||
info!(self.log, "Builder bid {:?}", &signed_bid.message.value());
|
||||
info!("Builder bid {:?}", &signed_bid.message.value());
|
||||
Ok(signed_bid)
|
||||
}
|
||||
|
||||
@@ -648,10 +630,7 @@ impl<E: EthSpec> MockBuilder<E> {
|
||||
/// Prepare the execution layer for payload creation every slot for the correct
|
||||
/// proposer index
|
||||
pub async fn prepare_execution_layer(&self) -> Result<(), String> {
|
||||
info!(
|
||||
self.log,
|
||||
"Starting a task to prepare the execution layer";
|
||||
);
|
||||
info!("Starting a task to prepare the execution layer");
|
||||
let mut head_event_stream = self
|
||||
.beacon_client
|
||||
.get_events::<E>(&[EventTopic::Head])
|
||||
@@ -662,9 +641,8 @@ impl<E: EthSpec> MockBuilder<E> {
|
||||
match event {
|
||||
EventKind::Head(head) => {
|
||||
debug!(
|
||||
self.log,
|
||||
"Got a new head event";
|
||||
"block_hash" => %head.block
|
||||
block_hash = %head.block,
|
||||
"Got a new head event"
|
||||
);
|
||||
let next_slot = head.slot + 1;
|
||||
// Find the next proposer index from the cached data or through a beacon api call
|
||||
@@ -712,9 +690,8 @@ impl<E: EthSpec> MockBuilder<E> {
|
||||
}
|
||||
e => {
|
||||
warn!(
|
||||
self.log,
|
||||
"Got an unexpected event";
|
||||
"event" => %e.topic_name()
|
||||
event = %e.topic_name(),
|
||||
"Got an unexpected event"
|
||||
);
|
||||
}
|
||||
}
|
||||
@@ -812,7 +789,6 @@ impl<E: EthSpec> MockBuilder<E> {
|
||||
),
|
||||
None => {
|
||||
warn!(
|
||||
self.log,
|
||||
"Validator not registered {}, using default fee recipient and gas limits",
|
||||
pubkey
|
||||
);
|
||||
|
||||
Reference in New Issue
Block a user