fix: tracing

Replaces custom logger with `tracing_subscriber`.

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

Author: Jonathan Woollett-Light

Cargo.lock

@@ -21,6 +21,8 @@ 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"
+log = "0.4.19"

src/api_server/Cargo.toml

@@ -14,15 +14,14 @@ use std::fmt::Debug;
 use std::path::PathBuf;
 use std::sync::mpsc;
 
-use logger::{
-    debug, error, info, update_metric_with_elapsed_time, warn, ProcessTimeReporter, METRICS,
-};
+use logger::{update_metric_with_elapsed_time, ProcessTimeReporter, METRICS};
 pub use micro_http::{
     Body, HttpServer, Method, Request, RequestError, Response, ServerError, ServerRequest,
     ServerResponse, StatusCode, Version,
 };
 use seccompiler::BpfProgramRef;
 use serde_json::json;
+use tracing::{debug, error, info, warn};
 use utils::eventfd::EventFd;
 use vmm::rpc_interface::{ApiRequest, ApiResponse, VmmAction, VmmData};
 use vmm::vmm_config::snapshot::SnapshotType;

src/api_server/src/lib.rs

@@ -3,10 +3,10 @@
 
 use std::fmt::Debug;
 
-use logger::{error, info, log_enabled, Level};
 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;
@@ -229,19 +229,7 @@ fn log_received_api_request(api_description: String) {
 fn describe(method: Method, path: &str, body: Option<&Body>) -> String {
     match (path, body) {
         ("/mmds", Some(_)) | (_, None) => format!("{:?} request on {:?}", method, path),
-        ("/cpu-config", Some(payload_value)) => {
-            // If the log level is at Debug or higher, include the CPU template in
-            // the log line.
-            if log_enabled!(Level::Debug) {
-                describe_with_body(method, path, payload_value)
-            } else {
-                format!(
-                    "{:?} request on {:?}. To view the CPU template received by the API, \
-                     configure log-level to DEBUG",
-                    method, path
-                )
-            }
-        }
+        ("/cpu-config", Some(payload_value)) => describe_with_body(method, path, payload_value),
         (_, Some(payload_value)) => describe_with_body(method, path, payload_value),
     }
 }

src/api_server/src/parsed_request.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,7 +22,7 @@ pub(crate) fn parse_put_logger(body: &Body) -> Result<ParsedRequest, Error> {
 mod tests {
     use std::path::PathBuf;
 
-    use vmm::vmm_config::logger::LoggerLevel;
+    use vmm::vmm_config::Level;
 
     use super::*;
     use crate::parsed_request::tests::vmm_action_from_request;
@@ -38,9 +38,10 @@ mod tests {
 
         let mut expected_cfg = LoggerConfig {
             log_path: PathBuf::from("log"),
-            level: LoggerLevel::Warning,
-            show_level: false,
-            show_log_origin: false,
+            level: Some(Level::Warn),
+            show_level: Some(false),
+            show_log_origin: Some(false),
+            new_format: None,
         };
         match vmm_action_from_request(parse_put_logger(&Body::new(body)).unwrap()) {
             VmmAction::ConfigureLogger(cfg) => assert_eq!(cfg, expected_cfg),
@@ -56,9 +57,10 @@ mod tests {
 
         expected_cfg = LoggerConfig {
             log_path: PathBuf::from("log"),
-            level: LoggerLevel::Debug,
-            show_level: false,
-            show_log_origin: false,
+            level: Some(Level::Debug),
+            show_level: Some(false),
+            show_log_origin: Some(false),
+            new_format: None,
         };
         match vmm_action_from_request(parse_put_logger(&Body::new(body)).unwrap()) {
             VmmAction::ConfigureLogger(cfg) => assert_eq!(cfg, expected_cfg),