mirror of
https://github.com/sigp/lighthouse.git
synced 2026-03-06 18:21:45 +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:
@@ -14,7 +14,7 @@ regex = { workspace = true }
|
||||
rpassword = "5.0.0"
|
||||
serde = { workspace = true }
|
||||
serde_yaml = { workspace = true }
|
||||
slog = { workspace = true }
|
||||
tracing = { workspace = true }
|
||||
types = { workspace = true }
|
||||
validator_dir = { workspace = true }
|
||||
zeroize = { workspace = true }
|
||||
|
||||
@@ -7,11 +7,11 @@ use crate::{default_keystore_password_path, read_password_string, write_file_via
|
||||
use eth2_keystore::Keystore;
|
||||
use regex::Regex;
|
||||
use serde::{Deserialize, Serialize};
|
||||
use slog::{error, Logger};
|
||||
use std::collections::HashSet;
|
||||
use std::fs::{self, create_dir_all, File};
|
||||
use std::io;
|
||||
use std::path::{Path, PathBuf};
|
||||
use tracing::error;
|
||||
use types::{graffiti::GraffitiString, Address, PublicKey};
|
||||
use validator_dir::VOTING_KEYSTORE_FILE;
|
||||
use zeroize::Zeroizing;
|
||||
@@ -266,7 +266,6 @@ impl ValidatorDefinitions {
|
||||
&mut self,
|
||||
validators_dir: P,
|
||||
secrets_dir: P,
|
||||
log: &Logger,
|
||||
) -> Result<usize, Error> {
|
||||
let mut keystore_paths = vec![];
|
||||
recursively_find_voting_keystores(validators_dir, &mut keystore_paths)
|
||||
@@ -311,10 +310,9 @@ impl ValidatorDefinitions {
|
||||
Ok(keystore) => keystore,
|
||||
Err(e) => {
|
||||
error!(
|
||||
log,
|
||||
"Unable to read validator keystore";
|
||||
"error" => e,
|
||||
"keystore" => format!("{:?}", voting_keystore_path)
|
||||
error = ?e,
|
||||
keystore = ?voting_keystore_path,
|
||||
"Unable to read validator keystore"
|
||||
);
|
||||
return None;
|
||||
}
|
||||
@@ -336,9 +334,8 @@ impl ValidatorDefinitions {
|
||||
}
|
||||
None => {
|
||||
error!(
|
||||
log,
|
||||
"Invalid keystore public key";
|
||||
"keystore" => format!("{:?}", voting_keystore_path)
|
||||
keystore = ?voting_keystore_path,
|
||||
"Invalid keystore public key"
|
||||
);
|
||||
return None;
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user