convert youki to use tracing

Signed-off-by: yihuaf <yihuaf@unkies.org>

crates/libcgroups/Cargo.toml

@@ -22,7 +22,6 @@ cgroupsv2_devices = ["rbpf", "libbpf-sys", "errno", "libc"]
 [dependencies]
 nix = "0.26.2"
 procfs = "0.15.1"
-log = "0.4"
 oci-spec = { version = "^0.6.0", features = ["runtime"] }
 dbus = { version = "0.9.7", optional = true }
 fixedbitset = "0.4.2"
@@ -32,6 +31,7 @@ libbpf-sys = { version = "1.1.1", optional = true }
 errno = { version = "0.3.1", optional = true }
 libc = { version = "0.2.144", optional = true }
 thiserror = "1.0.40"
+tracing = { version = "0.1.37", features = ["attributes"]}
 
 [dev-dependencies]
 anyhow = "1.0"

crates/libcgroups/src/common.rs

@@ -349,7 +349,7 @@ pub fn create_cgroup_manager<P: Into<PathBuf>>(
 fn create_v1_cgroup_manager(
     cgroup_path: PathBuf,
 ) -> Result<v1::manager::Manager, v1::manager::V1ManagerError> {
-    log::info!("cgroup manager V1 will be used");
+    tracing::info!("cgroup manager V1 will be used");
     v1::manager::Manager::new(cgroup_path)
 }
 
@@ -362,7 +362,7 @@ fn create_v1_cgroup_manager(_cgroup_path: PathBuf) -> Result<Box<dyn CgroupManag
 fn create_v2_cgroup_manager(
     cgroup_path: PathBuf,
 ) -> Result<v2::manager::Manager, v2::manager::V2ManagerError> {
-    log::info!("cgroup manager V2 will be used");
+    tracing::info!("cgroup manager V2 will be used");
     v2::manager::Manager::new(DEFAULT_CGROUP_ROOT.into(), cgroup_path)
 }
 
@@ -384,7 +384,7 @@ fn create_systemd_cgroup_manager(
 
     let use_system = nix::unistd::geteuid().is_root();
 
-    log::info!(
+    tracing::info!(
         "systemd cgroup manager with system bus {} will be used",
         use_system
     );
@@ -405,7 +405,7 @@ fn create_systemd_cgroup_manager(
 }
 
 pub fn get_all_pids(path: &Path) -> Result<Vec<Pid>, WrappedIoError> {
-    log::debug!("scan pids in folder: {:?}", path);
+    tracing::debug!("scan pids in folder: {:?}", path);
     let mut result = vec![];
     walk_dir(path, &mut |p| {
         let file_path = p.join(CGROUP_PROCS);

crates/libcgroups/src/systemd/cpu.rs

@@ -28,7 +28,7 @@ impl Controller for Cpu {
         properties: &mut HashMap<&str, Box<dyn RefArg>>,
     ) -> Result<(), Self::Error> {
         if let Some(cpu) = options.resources.cpu() {
-            log::debug!("Applying cpu resource restrictions");
+            tracing::debug!("Applying cpu resource restrictions");
             Self::apply(cpu, properties)?;
         }
 

crates/libcgroups/src/systemd/cpuset.rs

@@ -32,7 +32,7 @@ impl Controller for CpuSet {
         properties: &mut HashMap<&str, Box<dyn RefArg>>,
     ) -> Result<(), Self::Error> {
         if let Some(cpu) = options.resources.cpu() {
-            log::debug!("Applying cpuset resource restrictions");
+            tracing::debug!("Applying cpuset resource restrictions");
             return Self::apply(cpu, systemd_version, properties);
         }
 

crates/libcgroups/src/systemd/dbus/client.rs

@@ -137,7 +137,7 @@ impl SystemdClient for Client {
         properties.push(("DefaultDependencies", Variant(Box::new(false))));
         properties.push(("PIDs", Variant(Box::new(vec![pid]))));
 
-        log::debug!("Starting transient unit: {:?}", properties);
+        tracing::debug!("Starting transient unit: {:?}", properties);
         proxy
             .start_transient_unit(unit_name, "replace", properties, vec![])
             .map_err(|err| SystemdClientError::FailedTransient {

crates/libcgroups/src/systemd/manager.rs

@@ -293,7 +293,7 @@ impl Manager {
         while let Some(component) = components.next() {
             current_path = current_path.join(component);
             if !current_path.exists() {
-                log::warn!(
+                tracing::warn!(
                     "{:?} does not exist. Resource restrictions might not work correctly",
                     current_path
                 );
@@ -357,7 +357,7 @@ impl CgroupManager for Manager {
             return Ok(());
         }
 
-        log::debug!("Starting {:?}", self.unit_name);
+        tracing::debug!("Starting {:?}", self.unit_name);
         self.client.start_transient_unit(
             &self.container_name,
             pid.as_raw() as u32,
@@ -394,7 +394,7 @@ impl CgroupManager for Manager {
         }
 
         Unified::apply(controller_opt, systemd_version, &mut properties)?;
-        log::debug!("{:?}", properties);
+        tracing::debug!("{:?}", properties);
 
         if !properties.is_empty() {
             self.ensure_controllers_attached()?;
@@ -407,7 +407,7 @@ impl CgroupManager for Manager {
     }
 
     fn remove(&self) -> Result<(), Self::Error> {
-        log::debug!("remove {}", self.unit_name);
+        tracing::debug!("remove {}", self.unit_name);
         if self.client.transient_unit_exists(&self.unit_name) {
             self.client.stop_transient_unit(&self.unit_name)?;
         }

crates/libcgroups/src/systemd/memory.rs

@@ -34,7 +34,7 @@ impl Controller for Memory {
         properties: &mut HashMap<&str, Box<dyn RefArg>>,
     ) -> Result<(), Self::Error> {
         if let Some(memory) = options.resources.memory() {
-            log::debug!("applying memory resource restrictions");
+            tracing::debug!("applying memory resource restrictions");
             return Self::apply(memory, properties);
         }
 

crates/libcgroups/src/systemd/pids.rs

@@ -20,7 +20,7 @@ impl Controller for Pids {
         properties: &mut HashMap<&str, Box<dyn RefArg>>,
     ) -> Result<(), Self::Error> {
         if let Some(pids) = options.resources.pids() {
-            log::debug!("Applying pids resource restrictions");
+            tracing::debug!("Applying pids resource restrictions");
             Self::apply(pids, properties);
         }
 

crates/libcgroups/src/systemd/unified.rs

@@ -44,7 +44,7 @@ impl Controller for Unified {
         properties: &mut HashMap<&str, Box<dyn RefArg>>,
     ) -> Result<(), Self::Error> {
         if let Some(unified) = options.resources.unified() {
-            log::debug!("applying unified resource restrictions");
+            tracing::debug!("applying unified resource restrictions");
             Self::apply(unified, systemd_version, properties)?;
         }
 
@@ -138,7 +138,7 @@ impl Unified {
                     properties.insert(pids::TASKS_MAX, Box::new(pids as u64));
                 }
 
-                unknown => log::warn!("could not apply {}. Unknown property.", unknown),
+                unknown => tracing::warn!("could not apply {}. Unknown property.", unknown),
             }
         }
 

crates/libcgroups/src/v1/blkio.rs

@@ -83,7 +83,7 @@ impl Controller for Blkio {
     type Resource = LinuxBlockIo;
 
     fn apply(controller_opt: &ControllerOpt, cgroup_root: &Path) -> Result<(), Self::Error> {
-        log::debug!("Apply blkio cgroup config");
+        tracing::debug!("Apply blkio cgroup config");
 
         if let Some(blkio) = Self::needs_to_handle(controller_opt) {
             Self::apply(cgroup_root, blkio)?;