From 385e1f98e275c1f9728997fafabdc5539d8718e8 Mon Sep 17 00:00:00 2001
From: Lucas Schwiderski <lucas@lschwiderski.de>
Date: Fri, 6 Jan 2023 13:32:16 +0100
Subject: [PATCH] bug: Fix tracing spans not being entered

---
 lib/sdk/src/bundle/file.rs |  4 +++-
 lib/sdk/src/bundle/mod.rs  | 12 ++++++++----
 2 files changed, 11 insertions(+), 5 deletions(-)

diff --git a/lib/sdk/src/bundle/file.rs b/lib/sdk/src/bundle/file.rs
index c7edd90..20fa0d0 100644
--- a/lib/sdk/src/bundle/file.rs
+++ b/lib/sdk/src/bundle/file.rs
@@ -414,7 +414,9 @@ impl BundleFile {
 
         let mut variants = Vec::with_capacity(header_count);
         for (i, header) in headers.into_iter().enumerate() {
-            let _span = tracing::trace_span!("Read file header {}", i, size = header.size);
+            let span = tracing::info_span!("Read file header {}", i, size = header.size);
+            let _enter = span.enter();
+
             let mut data = vec![0; header.size];
             r.read_exact(&mut data)
                 .wrap_err_with(|| format!("failed to read header {i}"))?;
diff --git a/lib/sdk/src/bundle/mod.rs b/lib/sdk/src/bundle/mod.rs
index dc8b594..d50f5f4 100644
--- a/lib/sdk/src/bundle/mod.rs
+++ b/lib/sdk/src/bundle/mod.rs
@@ -160,7 +160,8 @@ impl Bundle {
         let mut unpacked_size_tracked = unpacked_size;
 
         for (chunk_index, chunk_size) in chunk_sizes.into_iter().enumerate() {
-            let _span = tracing::debug_span!("Decompressing chunk", chunk_index, chunk_size);
+            let span = tracing::debug_span!("Decompressing chunk", chunk_index, chunk_size);
+            let _enter = span.enter();
 
             let inner_chunk_size = r.read_u32()? as usize;
 
@@ -239,7 +240,8 @@ impl Bundle {
         }
 
         let unpacked_data = {
-            let _span = tracing::trace_span!("Write bundle files");
+            let span = tracing::trace_span!("Write bundle files");
+            let _enter = span.enter();
             tracing::trace!(num_files = self.files.len());
 
             self.files
@@ -352,7 +354,8 @@ where
 
     // Pipe the header into the output
     {
-        let _span = tracing::debug_span!("Pipe file header", chunks_start);
+        let span = tracing::debug_span!("Pipe file header", chunks_start);
+        let _enter = span.enter();
         r.rewind()?;
 
         let mut buf = vec![0; chunks_start as usize];
@@ -363,7 +366,8 @@ where
     }
 
     for chunk_index in 0..num_chunks {
-        let _span = tracing::debug_span!("Decompressing chunk", chunk_index);
+        let span = tracing::debug_span!("Decompressing chunk", chunk_index);
+        let _enter = span.enter();
         let chunk_size = r.read_u32()? as usize;
 
         tracing::trace!(chunk_size);