Skip to content

Commit 351922c

Browse files
authored
feat: put step logs in a span (#746)
1 parent 9518f43 commit 351922c

File tree

2 files changed

+9
-5
lines changed

2 files changed

+9
-5
lines changed

src/runner.rs

+8
Original file line numberDiff line numberDiff line change
@@ -34,6 +34,14 @@ impl<'a> Runner<'a> {
3434
let key = key.into();
3535
debug!("Step {:?}", key);
3636

37+
// alter the `func` to put it in a span
38+
let func = || {
39+
let span =
40+
tracing::span!(parent: tracing::Span::none(), tracing::Level::TRACE, "step", step = ?step, key = %key);
41+
let _guard = span.enter();
42+
func()
43+
};
44+
3745
loop {
3846
match func() {
3947
Ok(()) => {

src/utils.rs

+1-5
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,6 @@ use std::process::Command;
77
use color_eyre::eyre::Result;
88

99
use tracing::{debug, error};
10-
use tracing_subscriber::fmt::format::FmtSpan;
1110
use tracing_subscriber::layer::SubscriberExt;
1211
use tracing_subscriber::reload::{Handle, Layer};
1312
use tracing_subscriber::util::SubscriberInitExt;
@@ -239,10 +238,7 @@ pub fn install_tracing(filter_directives: &str) -> Result<Handle<EnvFilter, Regi
239238
.or_else(|_| EnvFilter::try_from_default_env())
240239
.or_else(|_| EnvFilter::try_new(DEFAULT_LOG_LEVEL))?;
241240

242-
let fmt_layer = fmt::layer()
243-
.with_target(false)
244-
.with_span_events(FmtSpan::NEW | FmtSpan::CLOSE)
245-
.without_time();
241+
let fmt_layer = fmt::layer().with_target(false).without_time();
246242

247243
let (filter, reload_handle) = Layer::new(env_filter);
248244

0 commit comments

Comments
 (0)