Skip to content

Use FlushWriter to ensure traces are flushed #1556

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Closed
SteveL-MSFT wants to merge 2 commits into from
+34 −2
Closed

Use FlushWriter to ensure traces are flushed #1556

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
9739de2
Use FlushWriter to ensure traces are flushed
SteveL-MSFT Jun 1, 2026
d0e9285
Potential fix for pull request finding
SteveL-MSFT Jun 1, 2026
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
36 changes: 34 additions & 2 deletions dsc/src/util.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -325,6 +325,38 @@ pub fn write_object(json: &str, format: Option<&OutputFormat>, include_separator
}
}

struct FlushWriter<W>(W);

impl<W: Write> Write for FlushWriter<W> {
fn write(&mut self, buf: &[u8]) -> std::io::Result<usize> {
let n = self.0.write(buf)?;
self.0.flush()?;
Ok(n)
}

fn write_all(&mut self, buf: &[u8]) -> std::io::Result<()> {
self.0.write_all(buf)?;
self.0.flush()
}

fn flush(&mut self) -> std::io::Result<()> {
self.0.flush()
}
}
Comment thread
SteveL-MSFT marked this conversation as resolved.

struct MakeFlushWriter<M>(M);

impl<'a, M> tracing_subscriber::fmt::MakeWriter<'a> for MakeFlushWriter<M>
where
M: tracing_subscriber::fmt::MakeWriter<'a>,
{
type Writer = FlushWriter<M::Writer>;

fn make_writer(&'a self) -> Self::Writer {
FlushWriter(self.0.make_writer())
}
}

#[allow(clippy::too_many_lines)]
pub fn enable_tracing(trace_level_arg: Option<&TraceLevel>, trace_format_arg: Option<&TraceFormat>) {

Expand All @@ -336,7 +368,7 @@ pub fn enable_tracing(trace_level_arg: Option<&TraceLevel>, trace_format_arg: Op
.unwrap_or_default()
.add_directive(Level::WARN.into());
let default_indicatif_layer = IndicatifLayer::new();
let default_layer = tracing_subscriber::fmt::Layer::default().with_writer(default_indicatif_layer.get_stderr_writer());
let default_layer = tracing_subscriber::fmt::Layer::default().with_writer(MakeFlushWriter(default_indicatif_layer.get_stderr_writer()));
let default_fmt = default_layer
.with_ansi(true)
.with_level(true)
Expand Down Expand Up @@ -406,7 +438,7 @@ pub fn enable_tracing(trace_level_arg: Option<&TraceLevel>, trace_format_arg: Op
.unwrap_or_default()
.add_directive(tracing_level.into());
let indicatif_layer = IndicatifLayer::new();
let layer = tracing_subscriber::fmt::Layer::default().with_writer(indicatif_layer.get_stderr_writer());
let layer = tracing_subscriber::fmt::Layer::default().with_writer(MakeFlushWriter(indicatif_layer.get_stderr_writer()));
let with_source = tracing_level == Level::DEBUG || tracing_level == Level::TRACE;
let fmt = match tracing_setting.format {
TraceFormat::Default => {
Expand Down
Loading