Skip to content
Draft
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
25 changes: 25 additions & 0 deletions Cargo.lock

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

3 changes: 2 additions & 1 deletion Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -43,7 +43,8 @@ tabled = "0.16"
anyhow = "1.0.98"
toml = "0.9.2"
futures = "0.3.31"
tracing-subscriber = { version = "0.3.19", features = ["env-filter"] }
tracing-subscriber = { version = "0.3.19", features = ["env-filter", "json"] }
crossterm = { version = "0.28", default-features = false }
age = { version = "0.11", features = ["cli-common", "plugin"] }
rust-embed = { version = "8", features = ["deterministic-timestamps"] }
rustls = { version = "0.23.29", default-features = false, features = ["ring"] }
Expand Down
1 change: 1 addition & 0 deletions crates/e2e-tests/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -33,6 +33,7 @@ colored.workspace = true
rand.workspace = true
nix = { version = "0.26.4", features = ["signal"] }
tracing-subscriber.workspace = true
hashi-telemetry = { path = "../hashi-telemetry" }

[[bin]]
name = "hashi-localnet"
Expand Down
9 changes: 3 additions & 6 deletions crates/e2e-tests/src/main.rs
Original file line number Diff line number Diff line change
Expand Up @@ -279,13 +279,10 @@ async fn cmd_start(
tracing::level_filters::LevelFilter::OFF
};

tracing_subscriber::fmt()
.with_env_filter(
tracing_subscriber::EnvFilter::builder()
.with_default_directive(default_level.into())
.from_env_lossy(),
)
let _guard = hashi_telemetry::TelemetryConfig::new()
.with_default_level(default_level)
.with_target(false)
.with_env()
.init();

use std::io::Write;
Expand Down
1 change: 1 addition & 0 deletions crates/hashi-guardian/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -11,6 +11,7 @@ serde.workspace = true
serde_json.workspace = true
tracing.workspace = true
tracing-subscriber.workspace = true
hashi-telemetry = { path = "../hashi-telemetry" }
tonic.workspace = true
hashi-types = { path = "../hashi-types" }

Expand Down
27 changes: 5 additions & 22 deletions crates/hashi-guardian/src/main.rs
Original file line number Diff line number Diff line change
Expand Up @@ -102,7 +102,11 @@ pub struct EphemeralKeyPairs {
/// SETUP_MODE=false: all endpoints except setup_new_key are enabled.
#[tokio::main]
async fn main() -> Result<()> {
init_tracing_subscriber(true);
let _guard = hashi_telemetry::TelemetryConfig::new()
.with_file_line(true)
.with_service_name("hashi-guardian")
.with_env()
.init();

// Check if SETUP_MODE is enabled (defaults to false)
let setup_mode = std::env::var("SETUP_MODE")
Expand Down Expand Up @@ -537,27 +541,6 @@ impl Enclave {
}
}

// ---------------------------------
// Tracing utilities
// ---------------------------------

/// Initialize tracing subscriber with optional file/line number logging
pub fn init_tracing_subscriber(with_file_line: bool) {
let mut builder = tracing_subscriber::FmtSubscriber::builder().with_env_filter(
tracing_subscriber::EnvFilter::builder()
.with_default_directive(tracing::level_filters::LevelFilter::INFO.into())
.from_env_lossy(),
);

if with_file_line {
builder = builder.with_file(true).with_line_number(true);
}

let subscriber = builder.finish();
tracing::subscriber::set_global_default(subscriber)
.expect("unable to initialize tracing subscriber");
}

// ---------------------------------
// Tests and related utilities
// ---------------------------------
Expand Down
1 change: 1 addition & 0 deletions crates/hashi-monitor/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -22,6 +22,7 @@ tokio.workspace = true
tonic.workspace = true
tracing.workspace = true
tracing-subscriber.workspace = true
hashi-telemetry = { path = "../hashi-telemetry" }

[dev-dependencies]
e2e-tests = { path = "../e2e-tests" }
Expand Down
25 changes: 5 additions & 20 deletions crates/hashi-monitor/src/main.rs
Original file line number Diff line number Diff line change
Expand Up @@ -51,7 +51,11 @@ enum Command {

#[tokio::main]
async fn main() -> anyhow::Result<()> {
init_tracing_subscriber(false);
let _guard = hashi_telemetry::TelemetryConfig::new()
.with_service_name("hashi-monitor")
.with_target(false)
.with_env()
.init();

let cli = Cli::parse();

Expand All @@ -78,22 +82,3 @@ async fn main() -> anyhow::Result<()> {

Ok(())
}

pub fn init_tracing_subscriber(with_file_line: bool) {
let mut builder = tracing_subscriber::FmtSubscriber::builder().with_env_filter(
tracing_subscriber::EnvFilter::builder()
.with_default_directive(tracing::level_filters::LevelFilter::INFO.into())
.from_env_lossy(),
);

if with_file_line {
builder = builder
.with_file(true)
.with_line_number(true)
.with_target(false);
}

let subscriber = builder.finish();
tracing::subscriber::set_global_default(subscriber)
.expect("unable to initialize tracing subscriber");
}
1 change: 1 addition & 0 deletions crates/hashi-screener/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -11,6 +11,7 @@ thiserror.workspace = true
tokio.workspace = true
tracing.workspace = true
tracing-subscriber.workspace = true
hashi-telemetry = { path = "../hashi-telemetry" }
prometheus.workspace = true
axum.workspace = true
sui-http.workspace = true
Expand Down
20 changes: 5 additions & 15 deletions crates/hashi-screener/src/main.rs
Original file line number Diff line number Diff line change
Expand Up @@ -226,20 +226,6 @@ impl ScreenerService for ScreenerServiceImpl {
}
}

fn init_tracing_subscriber() {
let subscriber = tracing_subscriber::FmtSubscriber::builder()
.with_env_filter(
tracing_subscriber::EnvFilter::builder()
.with_default_directive(tracing::level_filters::LevelFilter::INFO.into())
.from_env_lossy(),
)
.with_file(true)
.with_line_number(true)
.finish();
tracing::subscriber::set_global_default(subscriber)
.expect("unable to initialize tracing subscriber");
}

fn start_metrics_server(registry: prometheus::Registry) -> sui_http::ServerHandle {
let addr: SocketAddr = "0.0.0.0:9184".parse().unwrap();
info!("Prometheus metrics server listening on {}", addr);
Expand All @@ -266,7 +252,11 @@ async fn metrics_handler(

#[tokio::main]
async fn main() -> Result<()> {
init_tracing_subscriber();
let _guard = hashi_telemetry::TelemetryConfig::new()
.with_file_line(true)
.with_service_name("hashi-screener")
.with_env()
.init();

let api_key = env::var("MERKLE_SCIENCE_API_KEY")
.map_err(|_| anyhow::anyhow!("MERKLE_SCIENCE_API_KEY environment variable is not set"))?;
Expand Down
10 changes: 10 additions & 0 deletions crates/hashi-telemetry/Cargo.toml
Original file line number Diff line number Diff line change
@@ -0,0 +1,10 @@
[package]
name = "hashi-telemetry"
version = "0.1.0"
edition = "2024"
publish = false

[dependencies]
tracing.workspace = true
tracing-subscriber.workspace = true
crossterm.workspace = true
Loading
Loading