Revert guest crate changes except guest_logger.rs

Co-authored-by: dblnz <[email protected]>

Author: Copilot

Cargo.lock

@@ -25,9 +25,10 @@ hyperlight-guest = { workspace = true, default-features = false }
 hyperlight-common = { workspace = true, default-features = false }
 hyperlight-guest-tracing = { workspace = true, default-features = false }
 buddy_system_allocator = "0.11.0"
+log = { version = "0.4", default-features = false }
 spin = "0.10.0"
 flatbuffers = { version = "25.2.10", default-features = false }
-tracing = { version = "0.1.41", default-features = false, features = ["attributes", "log"] }
+tracing = { version = "0.1.41", default-features = false, features = ["attributes"] }
 
 [lints]
 workspace = true

src/hyperlight_guest_bin/Cargo.toml

@@ -90,7 +90,7 @@ fn internal_dispatch_function() {
     let handle = unsafe { GUEST_HANDLE };
 
     #[cfg(debug_assertions)]
-    tracing::trace!("internal_dispatch_function");
+    log::trace!("internal_dispatch_function");
 
     let function_call = handle
         .try_pop_shared_input_data_into::<FunctionCall>()

src/hyperlight_guest_bin/src/guest_function/call.rs

@@ -32,8 +32,8 @@ use hyperlight_common::mem::HyperlightPEB;
 use hyperlight_common::outb::OutBAction;
 use hyperlight_guest::exit::{halt, write_abort};
 use hyperlight_guest::guest_handle::handle::GuestHandle;
+use log::LevelFilter;
 use spin::Once;
-use tracing::log::LevelFilter;
 
 // === Modules ===
 #[cfg(target_arch = "x86_64")]

src/hyperlight_guest_bin/src/lib.rs

@@ -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 }
-tracing = { version = "0.1.41", default-features = false, features = ["log"] }
+log = { version = "0.4", default-features = false }
 
 [build-dependencies]
 cbindgen = "0.29.2"

src/hyperlight_guest_capi/Cargo.toml

@@ -16,41 +16,21 @@ limitations under the License.
 
 use core::ffi::c_char;
 
-/// C-compatible log level enum
-#[repr(C)]
-#[derive(Debug, Copy, Clone, PartialEq, Eq)]
-pub enum Level {
-    Error = 1,
-    Warn = 2,
-    Info = 3,
-    Debug = 4,
-    Trace = 5,
-}
-
-impl From<Level> for tracing::log::Level {
-    fn from(level: Level) -> Self {
-        match level {
-            Level::Error => tracing::log::Level::Error,
-            Level::Warn => tracing::log::Level::Warn,
-            Level::Info => tracing::log::Level::Info,
-            Level::Debug => tracing::log::Level::Debug,
-            Level::Trace => tracing::log::Level::Trace,
-        }
-    }
-}
-
 #[unsafe(no_mangle)]
-pub extern "C" fn hl_log(level: Level, message: *const c_char, line: i32, file: *const c_char) {
-    let log_level: tracing::log::Level = level.into();
-
-    if tracing::log::log_enabled!(log_level) {
+pub extern "C" fn hl_log(
+    level: log::Level,
+    message: *const c_char,
+    line: i32,
+    file: *const c_char,
+) {
+    if log::log_enabled!(level) {
         let message = unsafe { core::ffi::CStr::from_ptr(message).to_string_lossy() };
         let file = unsafe { core::ffi::CStr::from_ptr(file).to_string_lossy() };
 
-        tracing::log::logger().log(
-            &tracing::log::RecordBuilder::new()
-                .args(format_args!("{}: {}", log_level, message))
-                .level(log_level)
+        log::logger().log(
+            &log::RecordBuilder::new()
+                .args(format_args!("{}: {}", level, message))
+                .level(level)
                 .line(Some(line as u32))
                 .file(Some(&file))
                 .build(),

src/hyperlight_guest_capi/src/logging.rs

@@ -8,7 +8,8 @@ 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" }
-tracing = { version = "0.1.41", default-features = false, features = ["attributes", "log"] }
+log = {version = "0.4", default-features = false }
+tracing = { version = "0.1.41", default-features = false, features = ["attributes"] }
 
 [features]
 default = []

src/tests/rust_guests/dummyguest/Cargo.lock

@@ -52,7 +52,7 @@ use hyperlight_guest_bin::host_comm::{
 };
 use hyperlight_guest_bin::memory::malloc;
 use hyperlight_guest_bin::{MIN_STACK_ADDRESS, guest_logger};
-use tracing::log::{LevelFilter, error};
+use log::{LevelFilter, error};
 use tracing::{Span, instrument};
 
 extern crate hyperlight_guest;
@@ -687,7 +687,7 @@ fn log_message(function_call: &FunctionCall) -> Result<Vec<u8>> {
         let level = LevelFilter::iter().nth(level as usize).unwrap().to_level();
 
         match level {
-            Some(level) => tracing::log::log!(level, "{}", &message),
+            Some(level) => log::log!(level, "{}", &message),
             None => {
                 // was passed LevelFilter::Off, do nothing
             }