refactor: Re-export logging macros

Re-exports logging macros from `logger` to allow more atomic changes
in `logger`.

Signed-off-by: Jonathan Woollett-Light <jcawl@amazon.co.uk>

Author: Jonathan Woollett-Light

src/logger/src/metrics.rs

@@ -67,13 +67,13 @@ use std::ops::Deref;
 use std::sync::atomic::{AtomicUsize, Ordering};
 use std::sync::{Mutex, OnceLock};
 
-#[cfg(target_arch = "aarch64")]
-use log::warn;
 use serde::{Serialize, Serializer};
 #[cfg(target_arch = "aarch64")]
 use vm_superio::rtc_pl031::RtcEvents;
 
 use super::FcLineWriter;
+#[cfg(target_arch = "aarch64")]
+use crate::warn;
 
 /// Static instance used for handling metrics.
 pub static METRICS: Metrics<FirecrackerMetrics, FcLineWriter> =

src/vmm/src/arch/aarch64/cache_info.rs

@@ -4,7 +4,7 @@
 use std::path::{Path, PathBuf};
 use std::{fs, io};
 
-use log::warn;
+use logger::warn;
 
 // Based on https://elixir.free-electrons.com/linux/v4.9.62/source/arch/arm64/kernel/cacheinfo.c#L29.
 const MAX_CACHE_LEVEL: u8 = 7;

src/vmm/src/builder.rs

@@ -17,7 +17,7 @@ use linux_loader::loader::elf::Elf as Loader;
 #[cfg(target_arch = "aarch64")]
 use linux_loader::loader::pe::PE as Loader;
 use linux_loader::loader::KernelLoader;
-use log::error;
+use logger::error;
 use seccompiler::BpfThreadMap;
 use snapshot::Persist;
 use userfaultfd::Uffd;

src/vmm/src/device_manager/mmio.rs

@@ -11,7 +11,7 @@ use std::sync::{Arc, Mutex};
 
 use kvm_ioctls::{IoEventAddress, VmFd};
 use linux_loader::cmdline as kernel_cmdline;
-use log::info;
+use logger::info;
 #[cfg(target_arch = "x86_64")]
 use utils::vm_memory::GuestAddress;
 use versionize::{VersionMap, Versionize, VersionizeResult};

src/vmm/src/device_manager/persist.rs

@@ -8,7 +8,7 @@ use std::sync::{Arc, Mutex};
 
 use event_manager::{MutEventSubscriber, SubscriberOps};
 use kvm_ioctls::VmFd;
-use log::{error, warn};
+use logger::{error, warn};
 use mmds::data_store::MmdsVersion;
 use snapshot::Persist;
 use utils::vm_memory::GuestMemoryMmap;

src/vmm/src/devices/legacy/i8042.rs

@@ -8,8 +8,7 @@
 use std::io;
 use std::num::Wrapping;
 
-use log::warn;
-use logger::{IncMetric, METRICS};
+use logger::{warn, IncMetric, METRICS};
 use utils::eventfd::EventFd;
 
 /// Errors thrown by the i8042 device.
@@ -228,7 +227,7 @@ impl I8042Device {
                 // our exit event fd. Meaning Firecracker will be exiting as soon as the VMM
                 // thread wakes up to handle this event.
                 if let Err(err) = self.reset_evt.write(1) {
-                    log::error!("Failed to trigger i8042 reset event: {:?}", err);
+                    logger::error!("Failed to trigger i8042 reset event: {:?}", err);
                     METRICS.i8042.error_count.inc();
                 }
                 METRICS.i8042.reset_count.inc();

src/vmm/src/devices/legacy/serial.rs

@@ -12,8 +12,7 @@ use std::io::{Read, Write};
 use std::os::unix::io::{AsRawFd, RawFd};
 
 use event_manager::{EventOps, Events, MutEventSubscriber};
-use log::{error, warn};
-use logger::{IncMetric, METRICS};
+use logger::{error, warn, IncMetric, METRICS};
 use utils::epoll::EventSet;
 use vm_superio::serial::{Error as SerialError, SerialEvents};
 use vm_superio::{Serial, Trigger};

src/vmm/src/devices/mod.rs

@@ -15,8 +15,7 @@ pub mod pseudo;
 pub mod virtio;
 
 pub use bus::{Bus, BusDevice, BusError};
-use log::error;
-use logger::{IncMetric, METRICS};
+use logger::{error, IncMetric, METRICS};
 
 use crate::devices::virtio::{QueueError, VsockError};
 

src/vmm/src/devices/pseudo/boot_timer.rs

@@ -23,7 +23,7 @@ impl BootTimer {
 
             let boot_time_us = now_tm_us.time_us - self.start_ts.time_us;
             let boot_time_cpu_us = now_tm_us.cputime_us - self.start_ts.cputime_us;
-            log::info!(
+            logger::info!(
                 "Guest-boot-time = {:>6} us {} ms, {:>6} CPU us {} CPU ms",
                 boot_time_us,
                 boot_time_us / 1000,

src/vmm/src/devices/virtio/balloon/device.rs

@@ -7,8 +7,7 @@ use std::sync::Arc;
 use std::time::Duration;
 use std::{cmp, fmt};
 
-use log::error;
-use logger::{IncMetric, METRICS};
+use logger::{error, IncMetric, METRICS};
 use serde::Serialize;
 use timerfd::{ClockId, SetTimeFlags, TimerFd, TimerState};
 use utils::eventfd::EventFd;