Replace log crate with tracing crate in dependencies and code

Copilot · jsturtevant · Copilot · commit cb4f261219df · 2025-12-16T22:37:07.000Z
Co-authored-by: jsturtevant &lt;648372+jsturtevant@users.noreply.github.com&gt;
diff --git a/src/hyperlight_common/Cargo.toml b/src/hyperlight_common/Cargo.toml
@@ -17,7 +17,6 @@ workspace = true
 [dependencies]
 flatbuffers = { version = "25.9.23", default-features = false }
 anyhow = { version = "1.0.100", default-features = false }
-log = "0.4.29"
 tracing = { version = "0.1.43", optional = true }
 arbitrary = {version = "1.4.2", optional = true, features = ["derive"]}
 spin = "0.10.0"
@@ -29,7 +28,7 @@ tracing = ["dep:tracing"]
 fuzzing = ["dep:arbitrary"]
 trace_guest = []
 mem_profile = []
-std = ["thiserror/std", "log/std", "tracing/std"]
+std = ["thiserror/std", "tracing/std"]
 
 [lib]
 bench = false # see https://bheisler.github.io/criterion.rs/book/faq.html#cargo-bench-gives-unrecognized-option-errors-for-valid-command-line-options
diff --git a/src/hyperlight_component_util/Cargo.toml b/src/hyperlight_component_util/Cargo.toml
@@ -21,4 +21,4 @@ proc-macro2 = { version = "1.0.103" }
 syn = { version = "2.0.111" }
 itertools = { version = "0.14.0" }
 prettyplease = { version = "0.2.37" }
-log = { version = "0.4" }
+tracing = { version = "0.1.43" }
diff --git a/src/hyperlight_component_util/src/emit.rs b/src/hyperlight_component_util/src/emit.rs
@@ -416,7 +416,7 @@ impl<'a, 'b> State<'a, 'b> {
         let Some(ref mut cnvs) = self.cur_needs_vars else {
             return;
         };
-        log::debug!("debug varref: recording {:?} for var {:?}", cnvs.iter(), un);
+        tracing::debug!("debug varref: recording {:?} for var {:?}", cnvs.iter(), un);
         self.vars_needs_vars[un].extend(cnvs.iter());
     }
     /// Get a list of all the variables needed by a var, given its absolute
@@ -426,7 +426,7 @@ impl<'a, 'b> State<'a, 'b> {
         if self.vars_needs_vars.len() < un + 1 {
             return BTreeSet::new();
         };
-        log::debug!(
+        tracing::debug!(
             "debug varref: looking up {:?} for var {:?}",
             self.vars_needs_vars[un].iter(),
             un
@@ -559,7 +559,7 @@ impl<'a, 'b> State<'a, 'b> {
             Defined::Handleable(Handleable::Var(tv)) => match tv {
                 Tyvar::Bound(n) => {
                     let bv = &self.bound_vars[self.var_offset + (*n as usize)];
-                    log::debug!("checking an origin {:?} {:?}", bv.origin, self.origin);
+                    tracing::debug!("checking an origin {:?} {:?}", bv.origin, self.origin);
                     if bv.origin.matches(self.origin.iter()) {
                         Some((*n, bv.bound.clone()))
                     } else {
@@ -588,7 +588,7 @@ impl<'a, 'b> State<'a, 'b> {
     ///
     /// Precondition: all named traits/modules must exist
     pub fn resolve_trait_immut(&self, absolute: bool, path: &[Ident]) -> &Trait {
-        log::debug!("resolving trait {:?} {:?}", absolute, path);
+        tracing::debug!("resolving trait {:?} {:?}", absolute, path);
         let mut m = if absolute {
             &*self.root_mod
         } else {
@@ -611,7 +611,7 @@ impl<'a, 'b> State<'a, 'b> {
             .enumerate()
             .for_each(|(i, vs)| {
                 *vs = vs.iter().map(|v| v + n).collect();
-                log::debug!("updated {:?} to {:?}", i, *vs);
+                tracing::debug!("updated {:?} to {:?}", i, *vs);
             });
         for _ in 0..n {
             self.vars_needs_vars.push_front(BTreeSet::new());
diff --git a/src/hyperlight_component_util/src/guest.rs b/src/hyperlight_component_util/src/guest.rs
@@ -344,7 +344,7 @@ fn emit_component<'a, 'b, 'c>(
 /// - functions when given a type that implements the `Guest` trait
 pub fn emit_toplevel<'a, 'b, 'c>(s: &'c mut State<'a, 'b>, n: &str, ct: &'c Component<'b>) {
     s.is_impl = true;
-    log::debug!("\n\n=== starting guest emit ===\n");
+    tracing::debug!("\n\n=== starting guest emit ===\n");
     let wn = split_wit_name(n);
 
     let ns = wn.namespace_path();
diff --git a/src/hyperlight_component_util/src/hl.rs b/src/hyperlight_component_util/src/hl.rs
@@ -298,7 +298,7 @@ pub fn emit_hl_unmarshal_value(s: &mut State, id: Ident, vt: &Value) -> TokenStr
         }
         Value::Own(ht) => {
             let vi = resolve_handleable_to_resource(s, ht);
-            log::debug!("resolved ht to r (1) {:?} {:?}", ht, vi);
+            tracing::debug!("resolved ht to r (1) {:?} {:?}", ht, vi);
             if s.is_guest {
                 let rid = format_ident!("HostResource{}", vi);
                 if s.is_wasmtime_guest {
@@ -326,7 +326,7 @@ pub fn emit_hl_unmarshal_value(s: &mut State, id: Ident, vt: &Value) -> TokenStr
         }
         Value::Borrow(ht) => {
             let vi = resolve_handleable_to_resource(s, ht);
-            log::debug!("resolved ht to r (2) {:?} {:?}", ht, vi);
+            tracing::debug!("resolved ht to r (2) {:?} {:?}", ht, vi);
             if s.is_guest {
                 let rid = format_ident!("HostResource{}", vi);
                 if s.is_wasmtime_guest {
@@ -624,7 +624,7 @@ pub fn emit_hl_marshal_value(s: &mut State, id: Ident, vt: &Value) -> TokenStrea
         }
         Value::Own(ht) => {
             let vi = resolve_handleable_to_resource(s, ht);
-            log::debug!("resolved ht to r (3) {:?} {:?}", ht, vi);
+            tracing::debug!("resolved ht to r (3) {:?} {:?}", ht, vi);
             if s.is_guest {
                 let call = if s.is_wasmtime_guest {
                     quote! { () }
@@ -645,7 +645,7 @@ pub fn emit_hl_marshal_value(s: &mut State, id: Ident, vt: &Value) -> TokenStrea
         }
         Value::Borrow(ht) => {
             let vi = resolve_handleable_to_resource(s, ht);
-            log::debug!("resolved ht to r (6) {:?} {:?}", ht, vi);
+            tracing::debug!("resolved ht to r (6) {:?} {:?}", ht, vi);
             if s.is_guest {
                 let call = if s.is_wasmtime_guest {
                     quote! { () }
diff --git a/src/hyperlight_component_util/src/host.rs b/src/hyperlight_component_util/src/host.rs
@@ -202,7 +202,7 @@ fn emit_import_extern_decl<'a, 'b, 'c>(
         ExternDesc::CoreModule(_) => panic!("core module (im/ex)ports are not supported"),
         ExternDesc::Func(ft) => {
             let hln = emit_fn_hl_name(s, ed.kebab_name);
-            log::debug!("providing host function {}", hln);
+            tracing::debug!("providing host function {}", hln);
             let (pds, pus) = ft
                 .params
                 .iter()
@@ -382,7 +382,7 @@ fn emit_component<'a, 'b, 'c>(s: &'c mut State<'a, 'b>, wn: WitName, ct: &'c Com
 /// See [`emit_component`]
 pub fn emit_toplevel<'a, 'b, 'c>(s: &'c mut State<'a, 'b>, n: &str, ct: &'c Component<'b>) {
     s.is_impl = true;
-    log::debug!("\n\n=== starting host emit ===\n");
+    tracing::debug!("\n\n=== starting host emit ===\n");
     let wn = split_wit_name(n);
     emit_component(s, wn, ct)
 }
diff --git a/src/hyperlight_component_util/src/rtypes.rs b/src/hyperlight_component_util/src/rtypes.rs
@@ -164,7 +164,7 @@ fn try_find_local_var_id(
                 return Some(emit_resource_ref(s, n, path));
             }
         }
-        log::debug!("path is {:?}\n", path);
+        tracing::debug!("path is {:?}\n", path);
         let mut path = path.iter().rev();
         let name = kebab_to_type(path.next().unwrap().name());
         let owner = path.next();
@@ -216,7 +216,7 @@ pub fn emit_var_ref_value(s: &mut State, tv: &Tyvar) -> TokenStream {
 ///   the bound variable being referenced
 /// - `is_value`: whether this is a value (e.g. constructor) or type context.
 pub fn emit_var_ref_noff(s: &mut State, n: u32, is_value: bool) -> TokenStream {
-    log::debug!("var_ref {:?} {:?}", &s.bound_vars[n as usize], s.origin);
+    tracing::debug!("var_ref {:?} {:?}", &s.bound_vars[n as usize], s.origin);
     // if the variable was defined locally, try to reference it directly
     let id = try_find_local_var_id(s, n);
     let id = match id {
@@ -317,7 +317,7 @@ pub fn emit_value(s: &mut State, vt: &Value) -> TokenStream {
                         wrap(emit_var_ref(s, tv))
                     } else {
                         let n = crate::hl::resolve_handleable_to_resource(s, ht);
-                        log::debug!("resolved ht to r (4) {:?} {:?}", ht, n);
+                        tracing::debug!("resolved ht to r (4) {:?} {:?}", ht, n);
                         let id = format_ident!("HostResource{}", n);
                         wrap(quote! { #id })
                     }
@@ -339,7 +339,7 @@ pub fn emit_value(s: &mut State, vt: &Value) -> TokenStream {
                         wrap(emit_var_ref(s, tv))
                     } else {
                         let n = crate::hl::resolve_handleable_to_resource(s, ht);
-                        log::debug!("resolved ht to r (5) {:?} {:?}", ht, n);
+                        tracing::debug!("resolved ht to r (5) {:?} {:?}", ht, n);
                         let id = format_ident!("HostResource{}", n);
                         wrap(quote! { #id })
                     }
@@ -619,7 +619,7 @@ fn emit_extern_decl<'a, 'b, 'c>(
     s: &'c mut State<'a, 'b>,
     ed: &'c ExternDecl<'b>,
 ) -> TokenStream {
-    log::debug!("  emitting decl {:?}", ed.kebab_name);
+    tracing::debug!("  emitting decl {:?}", ed.kebab_name);
     match &ed.desc {
         ExternDesc::CoreModule(_) => panic!("core module (im/ex)ports are not supported"),
         ExternDesc::Func(ft) => {
@@ -749,7 +749,7 @@ fn emit_extern_decl<'a, 'b, 'c>(
 /// Emit (via mutating `s`) a Rust trait declaration corresponding to
 /// this instance type
 fn emit_instance<'a, 'b, 'c>(s: &'c mut State<'a, 'b>, wn: WitName, it: &'c Instance<'b>) {
-    log::debug!("emitting instance {:?}", wn);
+    tracing::debug!("emitting instance {:?}", wn);
     let mut s = s.with_cursor(wn.namespace_idents());
 
     let name = kebab_to_type(wn.name);
@@ -801,7 +801,7 @@ fn emit_instance<'a, 'b, 'c>(s: &'c mut State<'a, 'b>, wn: WitName, it: &'c Inst
     }
 
     drop(sv);
-    log::debug!("after exports, ncur_needs_vars is {:?}", needs_vars);
+    tracing::debug!("after exports, ncur_needs_vars is {:?}", needs_vars);
     for v in needs_vars {
         let id = s.noff_var_id(v);
         s.cur_trait().tvs.insert(id, (Some(v), TokenStream::new()));
diff --git a/src/hyperlight_component_util/src/util.rs b/src/hyperlight_component_util/src/util.rs
@@ -47,7 +47,7 @@ pub fn read_wit_type_from_file<R, F: FnMut(String, &etypes::Component) -> R>(
     let ExternDesc::Component(ct) = &export.desc else {
         panic!("malformed component type container: does not contain component type");
     };
-    log::debug!("hcm: considering component type {:?}", ct);
+    tracing::debug!("hcm: considering component type {:?}", ct);
     cb(export.kebab_name.to_string(), ct)
 }
 
diff --git a/src/hyperlight_guest_bin/Cargo.toml b/src/hyperlight_guest_bin/Cargo.toml
@@ -27,7 +27,6 @@ hyperlight-common = { workspace = true, default-features = false }
 hyperlight-guest-tracing = { workspace = true, default-features = false }
 hyperlight-guest-macro = { workspace = true, default-features = false, optional = true }
 buddy_system_allocator = "0.11.0"
-log = { version = "0.4", default-features = false }
 linkme = { version = "0.3.35", optional = true }
 spin = "0.10.0"
 flatbuffers = { version = "25.2.10", default-features = false }
diff --git a/src/hyperlight_guest_capi/Cargo.toml b/src/hyperlight_guest_capi/Cargo.toml
@@ -17,7 +17,7 @@ hyperlight-guest-bin = { workspace = true, default-features = true }
 hyperlight-common = { workspace = true, default-features = false }
 
 flatbuffers = { version = "25.2.10", default-features = false }
-log = { version = "0.4", default-features = false }
+tracing = { version = "0.1.43", default-features = false }
 
 [build-dependencies]
 cbindgen = "0.29.2"
diff --git a/src/hyperlight_host/Cargo.toml b/src/hyperlight_host/Cargo.toml
@@ -34,7 +34,6 @@ blake3 = "1.8.2"
 page_size = "0.6.0"
 termcolor = "1.2.0"
 bitflags = "2.10.0"
-log = "0.4.29"
 opentelemetry = { version = "0.31.0", optional = true }
 tracing = { version = "0.1.43", features = ["log"] }
 tracing-log = "0.2.0"
diff --git a/src/hyperlight_host/src/hypervisor/hyperlight_vm.rs b/src/hyperlight_host/src/hypervisor/hyperlight_vm.rs
@@ -25,7 +25,7 @@ use std::sync::atomic::AtomicU8;
 use std::sync::atomic::AtomicU64;
 use std::sync::{Arc, Mutex};
 
-use log::LevelFilter;
+use tracing::level_filters::LevelFilter;
 use tracing::{Span, instrument};
 #[cfg(feature = "trace_guest")]
 use tracing_opentelemetry::OpenTelemetrySpanExt;
diff --git a/src/hyperlight_host/src/hypervisor/mod.rs b/src/hyperlight_host/src/hypervisor/mod.rs
@@ -14,7 +14,7 @@ See the License for the specific language governing permissions and
 limitations under the License.
 */
 
-use log::LevelFilter;
+use tracing::level_filters::LevelFilter;
 
 use crate::Result;
 use crate::hypervisor::regs::{CommonFpu, CommonRegisters, CommonSpecialRegisters};
@@ -628,7 +628,7 @@ pub(crate) mod tests {
         let seed = 12345u64; // Random seed
         let page_size = 4096u32; // Standard page size
         let host_funcs = Arc::new(Mutex::new(FunctionRegistry::default()));
-        let guest_max_log_level = Some(log::LevelFilter::Error);
+        let guest_max_log_level = Some(tracing::level_filters::LevelFilter::ERROR);
 
         #[cfg(gdb)]
         let dbg_mem_access_fn = Arc::new(Mutex::new(mem_mgr.clone()));
diff --git a/src/hyperlight_host/src/lib.rs b/src/hyperlight_host/src/lib.rs
@@ -145,7 +145,7 @@ static LOG_ONCE: Once = Once::new();
 
 #[cfg(feature = "build-metadata")]
 pub(crate) fn log_build_details() {
-    use log::info;
+    use tracing::info;
     LOG_ONCE.call_once(|| {
         info!("Package name: {}", built_info::PKG_NAME);
         info!("Package version: {}", built_info::PKG_VERSION);
diff --git a/src/hyperlight_host/src/sandbox/outb.rs b/src/hyperlight_host/src/sandbox/outb.rs
@@ -20,9 +20,10 @@ use hyperlight_common::flatbuffer_wrappers::function_types::{FunctionCallResult,
 use hyperlight_common::flatbuffer_wrappers::guest_error::{ErrorCode, GuestError};
 use hyperlight_common::flatbuffer_wrappers::guest_log_data::GuestLogData;
 use hyperlight_common::outb::{Exception, OutBAction};
-use log::{Level, Record};
 use tracing::{Span, instrument};
-use tracing_log::format_trace;
+use tracing_log::{LogTracer, format_trace, log};
+
+use log::{Level, Record};
 
 use super::host_funcs::FunctionRegistry;
 #[cfg(feature = "mem_profile")]
@@ -197,7 +198,7 @@ pub(crate) fn handle_outb(
 mod tests {
     use hyperlight_common::flatbuffer_wrappers::guest_log_level::LogLevel;
     use hyperlight_testing::logger::{LOGGER, Logger};
-    use log::Level;
+    use tracing_log::log::{Level, LevelFilter};
     use tracing_core::callsite::rebuild_interest_cache;
 
     use super::outb_log;
@@ -224,7 +225,7 @@ mod tests {
     #[ignore]
     fn test_log_outb_log() {
         Logger::initialize_test_logger();
-        LOGGER.set_max_level(log::LevelFilter::Off);
+        LOGGER.set_max_level(LevelFilter::Off);
 
         let sandbox_cfg = SandboxConfiguration::default();
 
@@ -271,7 +272,7 @@ mod tests {
         }
         {
             // now, test logging
-            LOGGER.set_max_level(log::LevelFilter::Trace);
+            LOGGER.set_max_level(LevelFilter::Trace);
             let mut mgr = new_mgr();
             LOGGER.clear_log_calls();
 
diff --git a/src/hyperlight_host/src/sandbox/uninitialized.rs b/src/hyperlight_host/src/sandbox/uninitialized.rs
@@ -19,7 +19,7 @@ use std::option::Option;
 use std::path::Path;
 use std::sync::{Arc, Mutex};
 
-use log::LevelFilter;
+use tracing::level_filters::LevelFilter;
 use tracing::{Span, instrument};
 
 use super::host_funcs::{FunctionRegistry, default_writer_func};
@@ -906,12 +906,12 @@ mod tests {
         use std::path::PathBuf;
 
         use hyperlight_testing::logger::{LOGGER as TEST_LOGGER, Logger as TestLogger};
-        use log::Level;
+        use tracing_log::log::Level;
         use tracing_core::callsite::rebuild_interest_cache;
 
         {
             TestLogger::initialize_test_logger();
-            TEST_LOGGER.set_max_level(log::LevelFilter::Trace);
+            TEST_LOGGER.set_max_level(tracing_log::log::LevelFilter::Trace);
 
             // This makes sure that the metadata interest cache is rebuilt so that
             // the log records are emitted for the trace records
@@ -983,7 +983,7 @@ mod tests {
         {
             // test to ensure an invalid binary logs & traces properly
             TEST_LOGGER.clear_log_calls();
-            TEST_LOGGER.set_max_level(log::LevelFilter::Info);
+            TEST_LOGGER.set_max_level(tracing_log::log::LevelFilter::Info);
 
             let mut valid_binary_path = PathBuf::from(env!("CARGO_MANIFEST_DIR"));
             valid_binary_path.push("src");
@@ -1022,7 +1022,7 @@ mod tests {
         }
         {
             TEST_LOGGER.clear_log_calls();
-            TEST_LOGGER.set_max_level(log::LevelFilter::Error);
+            TEST_LOGGER.set_max_level(tracing_log::log::LevelFilter::Error);
 
             let sbox = {
                 let res = UninitializedSandbox::new(
diff --git a/src/hyperlight_host/tests/integration_test.rs b/src/hyperlight_host/tests/integration_test.rs
@@ -25,7 +25,7 @@ use hyperlight_host::sandbox::SandboxConfiguration;
 use hyperlight_host::{GuestBinary, HyperlightError, MultiUseSandbox, UninitializedSandbox};
 use hyperlight_testing::simplelogger::{LOGGER, SimpleLogger};
 use hyperlight_testing::{c_simple_guest_as_string, simple_guest_as_string};
-use log::LevelFilter;
+use tracing::level_filters::LevelFilter;
 
 pub mod common; // pub to disable dead_code warning
 use crate::common::{new_uninit, new_uninit_c, new_uninit_rust};
diff --git a/src/hyperlight_testing/Cargo.toml b/src/hyperlight_testing/Cargo.toml
@@ -4,7 +4,6 @@ edition = "2021"
 
 [dependencies]
 anyhow = "1.0.100"
-log = "0.4"
 once_cell = "1.21"
 tracing = { version = "0.1.43", features = ["log"] }
 tracing-log = "0.2.0"
diff --git a/src/hyperlight_testing/src/logger.rs b/src/hyperlight_testing/src/logger.rs
@@ -18,7 +18,7 @@ use std::cell::RefCell;
 use std::sync::Once;
 use std::thread::current;
 
-use log::{Level, LevelFilter, Log, Metadata, Record, set_logger, set_max_level};
+use tracing_log::log::{Level, LevelFilter, Log, Metadata, Record, set_logger, set_max_level};
 use once_cell::sync::Lazy;
 use tracing_log::LogTracer;
 
diff --git a/src/hyperlight_testing/src/simplelogger.rs b/src/hyperlight_testing/src/simplelogger.rs
@@ -21,7 +21,7 @@ limitations under the License.
 use std::sync::Once;
 use std::thread::current;
 
-use log::{Level, Log, Metadata, Record, set_logger, set_max_level};
+use tracing_log::log::{Level, Log, Metadata, Record, set_logger, set_max_level};
 
 pub static LOGGER: SimpleLogger = SimpleLogger {};
 static INITLOGGER: Once = Once::new();
diff --git a/src/tests/rust_guests/simpleguest/Cargo.toml b/src/tests/rust_guests/simpleguest/Cargo.toml
@@ -8,7 +8,6 @@ hyperlight-guest = { path = "../../../hyperlight_guest" }
 hyperlight-guest-bin = { path = "../../../hyperlight_guest_bin" }
 hyperlight-common = { path = "../../../hyperlight_common", default-features = false }
 hyperlight-guest-tracing = { path = "../../../hyperlight_guest_tracing" }
-log = {version = "0.4", default-features = false }
 tracing = { version = "0.1.41", default-features = false, features = ["log", "attributes"] }
 
 [features]
diff --git a/src/tests/rust_guests/simpleguest/src/main.rs b/src/tests/rust_guests/simpleguest/src/main.rs

Original file line number	Diff line number	Diff line change
`@@ -47,7 +47,7 @@ pub fn read_wit_type_from_file<R, F: FnMut(String, &etypes::Component) -> R>(`
`47`	`47`	`let ExternDesc::Component(ct) = &export.desc else {`
`48`	`48`	`panic!("malformed component type container: does not contain component type");`
`49`	`49`	`};`
`50`		`- log::debug!("hcm: considering component type {:?}", ct);`
	`50`	`+ tracing::debug!("hcm: considering component type {:?}", ct);`
`51`	`51`	`cb(export.kebab_name.to_string(), ct)`
`52`	`52`	`}`
`53`	`53`