use guard

Author: SteveL-MSFT

dsc/src/util.rs

@@ -52,12 +52,14 @@ use std::collections::HashMap;
 use std::env;
 use std::io::{IsTerminal, Read, stdout, Write};
 use std::path::Path;
+use std::sync::{LazyLock, RwLock};
 use syntect::{
     easy::HighlightLines,
     highlighting::ThemeSet,
     parsing::SyntaxSet,
     util::{as_24_bit_terminal_escaped, LinesWithEndings}
 };
+use tokio::sync::OnceCell;
 use tracing::{Level, debug, error, info, warn, trace};
 use tracing_subscriber::{filter::EnvFilter, layer::SubscriberExt, Layer};
 use tracing_indicatif::IndicatifLayer;
@@ -307,6 +309,8 @@ pub fn write_object(json: &str, format: Option<&OutputFormat>, include_separator
     }
 }
 
+static TRACING_GUARD: LazyLock<RwLock<OnceCell<tracing::subscriber::DefaultGuard>>> = LazyLock::new(|| RwLock::new(OnceCell::new()));
+
 #[allow(clippy::too_many_lines)]
 pub fn enable_tracing(trace_level_arg: Option<&TraceLevel>, trace_format_arg: Option<&TraceFormat>) {
 
@@ -325,6 +329,7 @@ pub fn enable_tracing(trace_level_arg: Option<&TraceLevel>, trace_format_arg: Op
                 .boxed();
     let default_subscriber = tracing_subscriber::Registry::default().with(default_fmt).with(default_filter).with(default_indicatif_layer);
     let default_guard = tracing::subscriber::set_default(default_subscriber);
+    TRACING_GUARD.write().unwrap().set(default_guard).ok();
 
     // read setting/policy from files
     if let Ok(v) = get_setting("tracing") {
@@ -422,7 +427,6 @@ pub fn enable_tracing(trace_level_arg: Option<&TraceLevel>, trace_format_arg: Op
 
     let subscriber = tracing_subscriber::Registry::default().with(fmt).with(filter).with(indicatif_layer);
 
-    drop(default_guard);
     if tracing::subscriber::set_global_default(subscriber).is_err() {
         eprintln!("{}", t!("util.failedToSetTracing"));
     }
@@ -696,8 +700,9 @@ pub fn merge_parameters(file_params: &str, inline_params: &str) -> Result<String
 ///
 /// * `code` - The exit code to use when exiting the process
 pub fn exit(code: i32) -> ! {
-    // Small delay to ensure async writes complete
-    std::thread::sleep(std::time::Duration::from_millis(50));
+    // drop tracing guard to flush any pending trace logs before exiting
+    let guard = TRACING_GUARD.write().unwrap().take();
+    drop(guard);
 
     // Force any pending writes to complete
     if let Err(e) = std::io::stderr().flush() {