user0/rust
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

fix span for deferred command execution

Browse source
This commit is contained in:
bit-aloo 2025-07-12 14:52:34 +05:30
parent 855e0fe46e
commit acbbc18599
No known key found for this signature in database
1 changed files with 10 additions and 3 deletions
Download patch file Download diff file Expand all files Collapse all files

13
src/bootstrap/src/utils/exec.rs
View file

@ -593,6 +593,8 @@ enum CommandState<'a> {
executed_at: &'a Location<'a>,
fingerprint: CommandFingerprint,
start_time: Instant,
#[cfg(feature = "tracing")]
_span_guard: tracing::span::EnteredSpan,
},
}
@ -693,6 +695,9 @@ impl ExecutionContext {
) -> DeferredCommand<'a> {
let fingerprint = command.fingerprint();
#[cfg(feature = "tracing")]
let span_guard = trace_cmd!(command);
if let Some(cached_output) = self.command_cache.get(&fingerprint) {
command.mark_as_executed();
self.verbose(|| println!("Cache hit: {command:?}"));
@ -713,13 +718,12 @@ impl ExecutionContext {
executed_at,
fingerprint,
start_time: Instant::now(),
#[cfg(feature = "tracing")]
_span_guard: span_guard,
},
};
}
#[cfg(feature = "tracing")]
let _run_span = trace_cmd!(command);
self.verbose(|| {
println!("running: {command:?} (created at {created_at}, executed at {executed_at})")
});
@ -741,6 +745,8 @@ impl ExecutionContext {
executed_at,
fingerprint,
start_time,
#[cfg(feature = "tracing")]
_span_guard: span_guard,
},
}
}
@ -841,6 +847,7 @@ impl<'a> DeferredCommand<'a> {
executed_at,
fingerprint,
start_time,
..
} => {
let exec_ctx = exec_ctx.as_ref();