fix: tracing

Replaces custom logger with `tracing_subscriber`.

Signed-off-by: Jonathan Woollett-Light <[email protected]>

Author: Jonathan Woollett-Light

src/api_server/Cargo.toml

@@ -21,6 +21,7 @@ mmds = { path = "../mmds" }
 seccompiler = { path = "../seccompiler" }
 utils = { path = "../utils" }
 vmm = { path = "../vmm" }
+tracing = { version = "0.1.37", features = ["attributes"] }
 
 [dev-dependencies]
 libc = "0.2.117"

src/api_server/src/lib.rs

@@ -23,6 +23,7 @@ pub use micro_http::{
 };
 use seccompiler::BpfProgramRef;
 use serde_json::json;
+use tracing::{debug, error, info, warn};
 use utils::eventfd::EventFd;
 use vmm::rpc_interface::{VmmAction, VmmActionError, VmmData};
 use vmm::vmm_config::snapshot::SnapshotType;

src/api_server/src/parsed_request.rs

@@ -7,6 +7,7 @@ use logger::{error, info};
 use micro_http::{Body, Method, Request, Response, StatusCode, Version};
 use serde::ser::Serialize;
 use serde_json::Value;
+use tracing::{error, info};
 use vmm::rpc_interface::{VmmAction, VmmActionError};
 
 use super::VmmData;

src/api_server/src/request/logger.rs

@@ -2,7 +2,7 @@
 // SPDX-License-Identifier: Apache-2.0
 
 use logger::{IncMetric, METRICS};
-use vmm::vmm_config::logger::LoggerConfig;
+use vmm::vmm_config::LoggerConfig;
 
 use super::super::VmmAction;
 use crate::parsed_request::{Error, ParsedRequest};
@@ -22,25 +22,24 @@ pub(crate) fn parse_put_logger(body: &Body) -> Result<ParsedRequest, Error> {
 mod tests {
     use std::path::PathBuf;
 
-    use vmm::vmm_config::logger::LoggerLevel;
-
     use super::*;
     use crate::parsed_request::tests::vmm_action_from_request;
 
     #[test]
     fn test_parse_put_logger_request() {
         let mut body = r#"{
                 "log_path": "log",
-                "level": "Warning",
+                "level": "Warn",
                 "show_level": false,
                 "show_log_origin": false
               }"#;
 
         let mut expected_cfg = LoggerConfig {
-            log_path: PathBuf::from("log"),
-            level: LoggerLevel::Warning,
-            show_level: false,
-            show_log_origin: false,
+            log_path: Some(PathBuf::from("log")),
+            level: Some(log::Level::Warn),
+            show_level: Some(false),
+            show_log_origin: Some(false),
+            profile_file: None,
         };
         match vmm_action_from_request(parse_put_logger(&Body::new(body)).unwrap()) {
             VmmAction::ConfigureLogger(cfg) => assert_eq!(cfg, expected_cfg),
@@ -49,16 +48,17 @@ mod tests {
 
         body = r#"{
                 "log_path": "log",
-                "level": "DEBUG",
+                "level": "Debug",
                 "show_level": false,
                 "show_log_origin": false
               }"#;
 
         expected_cfg = LoggerConfig {
-            log_path: PathBuf::from("log"),
-            level: LoggerLevel::Debug,
-            show_level: false,
-            show_log_origin: false,
+            log_path: Some(PathBuf::from("log")),
+            level: Some(log::Level::Debug),
+            show_level: Some(false),
+            show_log_origin: Some(false),
+            profile_file: None,
         };
         match vmm_action_from_request(parse_put_logger(&Body::new(body)).unwrap()) {
             VmmAction::ConfigureLogger(cfg) => assert_eq!(cfg, expected_cfg),
@@ -67,7 +67,7 @@ mod tests {
 
         let invalid_body = r#"{
                 "invalid_field": "log",
-                "level": "Warning",
+                "level": "Warn",
                 "show_level": false,
                 "show_log_origin": false
               }"#;

src/cpu-template-helper/Cargo.toml

@@ -17,6 +17,7 @@ libc = "0.2.117"
 serde = { version = "1.0.136", features = ["derive"] }
 serde_json = "1.0.78"
 thiserror = "1.0.32"
+tracing = { version = "0.1.37", features = ["attributes"] }
 
 vmm = { path = "../vmm" }
 

src/dumbo/Cargo.toml

@@ -11,6 +11,7 @@ bench = false
 [dependencies]
 bitflags = "1.3.2"
 derive_more = { version = "0.99.17", default-features = false, features = ["from"] }
+tracing = { version = "0.1.37", features = ["attributes"] }
 
 logger = { path = "../logger" }
 micro_http = { git = "https://github.com/firecracker-microvm/micro-http", rev = "4b18a04" }

src/firecracker/Cargo.toml

@@ -17,6 +17,8 @@ event-manager = "0.3.0"
 libc = "0.2.117"
 serde_json = "1.0.78"
 timerfd = "1.3.0"
+tracing = { version = "0.1.37", features = ["attributes"] }
+tracing-subscriber = "0.3.17"
 
 api_server = { path = "../api_server" }
 logger = { path = "../logger" }

src/firecracker/src/api_server_adapter.rs

@@ -13,6 +13,7 @@ use api_server::{ApiRequest, ApiResponse, ApiServer, ServerError};
 use event_manager::{EventOps, Events, MutEventSubscriber, SubscriberOps};
 use logger::{error, warn, ProcessTimeReporter};
 use seccompiler::BpfThreadMap;
+use tracing::{error, warn};
 use utils::epoll::EventSet;
 use utils::eventfd::EventFd;
 use vmm::resources::VmResources;

src/firecracker/src/main.rs

@@ -6,13 +6,15 @@ mod metrics;
 
 use std::fs::{self, File};
 use std::path::PathBuf;
+use std::str::FromStr;
 use std::sync::{Arc, Mutex};
 use std::{io, panic, process};
 
 use event_manager::SubscriberOps;
 use logger::{error, info, ProcessTimeReporter, StoreMetric, LOGGER, METRICS};
 use seccompiler::BpfThreadMap;
 use snapshot::Snapshot;
+use tracing::{error, info};
 use utils::arg_parser::{ArgParser, Argument};
 use utils::terminal::Terminal;
 use utils::validators::validate_instance_id;
@@ -21,7 +23,6 @@ use vmm::seccomp_filters::{get_filters, SeccompConfig};
 use vmm::signal_handler::register_signal_handlers;
 use vmm::version_map::{FC_VERSION_TO_SNAP_VERSION, VERSION_MAP};
 use vmm::vmm_config::instance_info::{InstanceInfo, VmState};
-use vmm::vmm_config::logger::{init_logger, LoggerConfig, LoggerLevel};
 use vmm::vmm_config::metrics::{init_metrics, MetricsConfig};
 use vmm::{EventManager, FcExitCode, HTTP_MAX_PAYLOAD_SIZE};
 
@@ -279,29 +280,30 @@ fn main_exitable() -> FcExitCode {
 
     if let Some(log) = arguments.single_value("log-path") {
         // It's safe to unwrap here because the field's been provided with a default value.
-        let level = arguments.single_value("level").unwrap().to_owned();
-        let logger_level = match LoggerLevel::from_string(level) {
-            Ok(level) => level,
-            Err(err) => {
-                return generic_error_exit(&format!(
-                    "Invalid value for logger level: {}.Possible values: [Error, Warning, Info, \
-                     Debug]",
-                    err
-                ));
-            }
+        let logger_level = match arguments.single_value("level") {
+            None => None,
+            Some(s) => match log::Level::from_str(s) {
+                Ok(level) => Some(level),
+                Err(err) => {
+                    return generic_error_exit(&format!(
+                        "Invalid value for logger level: {}.Possible values: [Error, Warning, \
+                         Info, Debug]",
+                        err
+                    ));
+                }
+            },
         };
-        let show_level = arguments.flag_present("show-level");
-        let show_log_origin = arguments.flag_present("show-log-origin");
+        let show_level = Some(arguments.flag_present("show-level"));
+        let show_log_origin = Some(arguments.flag_present("show-log-origin"));
 
-        let logger_config = LoggerConfig {
-            log_path: PathBuf::from(log),
+        let logger_config = vmm::vmm_config::LoggerConfig {
+            log_path: Some(PathBuf::from(log)),
             level: logger_level,
             show_level,
             show_log_origin,
+            profile_file: None,
         };
-        if let Err(err) = init_logger(logger_config, &instance_info) {
-            return generic_error_exit(&format!("Could not initialize logger: {}", err));
-        };
+        logger_config.init();
     }
 
     if let Some(metrics_path) = arguments.single_value("metrics-path") {

src/firecracker/src/metrics.rs

@@ -7,6 +7,7 @@ use std::time::Duration;
 use event_manager::{EventOps, Events, MutEventSubscriber};
 use logger::{error, warn, IncMetric, METRICS};
 use timerfd::{ClockId, SetTimeFlags, TimerFd, TimerState};
+use tracing::{error, warn};
 use utils::epoll::EventSet;
 
 /// Metrics reporting period.