From 492bc264281826b7ebaf1fc3b4f2ce513661448a Mon Sep 17 00:00:00 2001 From: Luca Palmieri <20745048+LukeMathWalker@users.noreply.github.com> Date: Sun, 28 Apr 2024 18:05:13 +0200 Subject: [PATCH] Use different file names. --- libs/pavex_cli/src/main.rs | 19 ++++++++++++++++--- libs/pavexc_cli/src/main.rs | 17 +++++++++++++++-- 2 files changed, 31 insertions(+), 5 deletions(-) diff --git a/libs/pavex_cli/src/main.rs b/libs/pavex_cli/src/main.rs index eaae785d..8ab370d9 100644 --- a/libs/pavex_cli/src/main.rs +++ b/libs/pavex_cli/src/main.rs @@ -41,7 +41,7 @@ static PAVEX_CACHED_KEYSET: &str = include_str!("../jwks.json"); fn main() -> Result { let cli = Cli::parse(); init_miette_hook(&cli); - let _guard = init_telemetry(cli.log_filter, cli.log, cli.perf_profile); + let _guard = init_telemetry(cli.log_filter.clone(), cli.log, cli.perf_profile); let client = pavexc_client(&cli); let system_home_dir = xdg_home::home_dir().ok_or_else(|| { @@ -501,6 +501,13 @@ fn init_telemetry( }); let base = tracing_subscriber::registry().with(filter_layer); let mut chrome_guard = None; + let trace_filename = format!( + "./trace-pavex-{}.json", + std::time::SystemTime::UNIX_EPOCH + .elapsed() + .unwrap() + .as_millis() + ); match console_logging { true => { @@ -510,7 +517,10 @@ fn init_telemetry( .with_span_events(FmtSpan::NEW | FmtSpan::CLOSE) .with_timer(tracing_subscriber::fmt::time::uptime()); if profiling { - let (chrome_layer, guard) = ChromeLayerBuilder::new().include_args(true).build(); + let (chrome_layer, guard) = ChromeLayerBuilder::new() + .file(trace_filename) + .include_args(true) + .build(); chrome_guard = Some(guard); base.with(fmt_layer).with(chrome_layer).init(); } else { @@ -519,7 +529,10 @@ fn init_telemetry( } false => { if profiling { - let (chrome_layer, guard) = ChromeLayerBuilder::new().include_args(true).build(); + let (chrome_layer, guard) = ChromeLayerBuilder::new() + .file(trace_filename) + .include_args(true) + .build(); chrome_guard = Some(guard); base.with(chrome_layer).init() } diff --git a/libs/pavexc_cli/src/main.rs b/libs/pavexc_cli/src/main.rs index cfb5050e..3619f3bf 100644 --- a/libs/pavexc_cli/src/main.rs +++ b/libs/pavexc_cli/src/main.rs @@ -138,6 +138,13 @@ fn init_telemetry( }); let base = tracing_subscriber::registry().with(filter_layer); let mut chrome_guard = None; + let trace_filename = format!( + "./trace-pavexc-{}.json", + std::time::SystemTime::UNIX_EPOCH + .elapsed() + .unwrap() + .as_millis() + ); match console_logging { true => { @@ -147,7 +154,10 @@ fn init_telemetry( .with_span_events(FmtSpan::NEW | FmtSpan::CLOSE) .with_timer(tracing_subscriber::fmt::time::uptime()); if profiling { - let (chrome_layer, guard) = ChromeLayerBuilder::new().include_args(true).build(); + let (chrome_layer, guard) = ChromeLayerBuilder::new() + .file(trace_filename) + .include_args(true) + .build(); chrome_guard = Some(guard); base.with(fmt_layer).with(chrome_layer).init(); } else { @@ -156,7 +166,10 @@ fn init_telemetry( } false => { if profiling { - let (chrome_layer, guard) = ChromeLayerBuilder::new().include_args(true).build(); + let (chrome_layer, guard) = ChromeLayerBuilder::new() + .file(trace_filename) + .include_args(true) + .build(); chrome_guard = Some(guard); base.with(chrome_layer).init() }