From 7a446226ec0fb943345c3bd04ae8a9577cf98b5c Mon Sep 17 00:00:00 2001
From: trivernis <trivernis@protonmail.com>
Date: Sun, 4 Sep 2022 12:33:48 +0200
Subject: [PATCH] Fix tracing output

Signed-off-by: trivernis <trivernis@protonmail.com>
---
 src/logging/fmt_layer.rs |  4 ++--
 src/logging/handler.rs   | 10 ----------
 2 files changed, 2 insertions(+), 12 deletions(-)

diff --git a/src/logging/fmt_layer.rs b/src/logging/fmt_layer.rs
index 2c187c7..d573904 100644
--- a/src/logging/fmt_layer.rs
+++ b/src/logging/fmt_layer.rs
@@ -95,8 +95,8 @@ impl<S: Subscriber + for<'a> LookupSpan<'a>> Layer<S> for AmeFormatLayer {
         }
     }
 
-    fn on_exit(&self, id: &span::Id, ctx: tracing_subscriber::layer::Context<'_, S>) {
-        let span = ctx.span(id).unwrap();
+    fn on_close(&self, id: span::Id, ctx: tracing_subscriber::layer::Context<'_, S>) {
+        let span = ctx.span(&id).unwrap();
         let metadata = span.metadata();
 
         if self.is_enabled(metadata) {
diff --git a/src/logging/handler.rs b/src/logging/handler.rs
index f3cbcb0..9cf0c22 100644
--- a/src/logging/handler.rs
+++ b/src/logging/handler.rs
@@ -108,7 +108,6 @@ impl LogHandler {
         (*self.level.write()) = level;
     }
 
-    #[tracing::instrument(level = "trace", skip_all)]
     pub fn reset_output_type(&self) {
         self.set_output_type(OutputType::Stdout);
     }
@@ -141,7 +140,6 @@ impl LogHandler {
     }
 
     /// Creates a new progress spinner and registers it on the log handler
-    #[tracing::instrument(level = "trace", skip_all)]
     pub fn new_progress_spinner(&self) -> Arc<ProgressBar> {
         let pb = ProgressBar::new_spinner();
         pb.enable_steady_tick(Duration::from_millis(250));
@@ -158,7 +156,6 @@ impl LogHandler {
         }
     }
 
-    #[tracing::instrument(level = "trace", skip_all)]
     pub fn new_multi_progress(&self) -> Arc<MultiProgress> {
         let mp = Arc::new(MultiProgress::new());
         self.set_output_type(OutputType::MultiProgress(mp.clone()));
@@ -166,14 +163,7 @@ impl LogHandler {
         mp
     }
 
-    /// Registeres a progress bar on the log handler
-    #[tracing::instrument(level = "trace", skip_all)]
-    fn set_progress_bar(&self, pb: Arc<ProgressBar>) {
-        self.set_output_type(OutputType::Progress(pb))
-    }
-
     /// Sets the output type of the log handler to either stdout/stderr or a progress bar
-    #[tracing::instrument(level = "trace", skip_all)]
     pub fn set_output_type(&self, mut output: OutputType) {
         {
             let mut output_type = self.output_type.write();