add missing span.entered(), use span.in_scope

rust-lang · Mar 22, 2024 · 8b19841 · 8b19841
1 parent abc6683
commit 8b19841
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 6 deletions.
diff --git a/src/docbuilder/rustwide_builder.rs b/src/docbuilder/rustwide_builder.rs
@@ -407,12 +407,11 @@ impl RustwideBuilder {
         // fill up disk space.
         // This also prevents having multiple builders using the same rustwide workspace,
         // which we don't do. Currently our separate builders use a separate rustwide workspace.
-        {
-            let _span = info_span!("purge_all_build_dirs").entered();
+        info_span!("purge_all_build_dirs").in_scope(|| {
             self.workspace
                 .purge_all_build_dirs()
-                .map_err(FailureError::compat)?;
-        }
+                .map_err(FailureError::compat)
+        })?;
 
         let mut build_dir = self.workspace.build_dir(&format!("{name}-{version}"));
 

diff --git a/src/storage/mod.rs b/src/storage/mod.rs
@@ -405,7 +405,7 @@ impl AsyncStorage {
 
                     let mut zip_content = {
                         let _span =
-                            info_span!("create_zip_archive", %archive_path, root_dir=%root_dir.display());
+                            info_span!("create_zip_archive", %archive_path, root_dir=%root_dir.display()).entered();
 
                         let options = zip::write::FileOptions::default()
                             .compression_method(zip::CompressionMethod::Bzip2);
@@ -427,7 +427,7 @@ impl AsyncStorage {
                     let remote_index_path = format!("{}.index", &archive_path);
                     let alg = CompressionAlgorithm::default();
                     let compressed_index_content = {
-                        let _span = info_span!("create_archive_index", %remote_index_path);
+                        let _span = info_span!("create_archive_index", %remote_index_path).entered();
 
                         fs::create_dir_all(&temp_dir)?;
                         let local_index_path =