[starnix] Use Rust log instead of tracing

Context at: http://go/fuchsia-rust-log

Bug: 344980783
Change-Id: I41c7236637b5ffbf7c27328c6014ffee9082167e
Reviewed-on: https://fuchsia-review.googlesource.com/c/fuchsia/+/1178822
Fuchsia-Auto-Submit: Miguel Flores <[email protected]>
Reviewed-by: Adam Perry <[email protected]>
Commit-Queue: Auto-Submit <[email protected]>

Author: miguelfrde

src/starnix/examples/hello_debian/BUILD.gn

@@ -42,6 +42,6 @@ rustc_binary("hello_debian_verifier") {
     "//third_party/rust_crates:argh",
     "//third_party/rust_crates:assert_matches",
     "//third_party/rust_crates:futures",
-    "//third_party/rust_crates:tracing",
+    "//third_party/rust_crates:log",
   ]
 }

src/starnix/examples/hello_debian/hello_debian_verifier.rs

@@ -9,7 +9,7 @@ use component_events::matcher::EventMatcher;
 use diagnostics_reader::{ArchiveReader, Logs};
 use fuchsia_component_test::ScopedInstance;
 use futures::StreamExt;
-use tracing::info;
+use log::info;
 
 /// verify the launch behavior of a hello debian binary
 #[derive(Debug, FromArgs)]

src/starnix/examples/hello_starnix/BUILD.gn

@@ -50,7 +50,7 @@ rustc_binary("hello_starnix_integration_test_bin") {
     "//src/sys/lib/component-events",
     "//third_party/rust_crates:assert_matches",
     "//third_party/rust_crates:futures",
-    "//third_party/rust_crates:tracing",
+    "//third_party/rust_crates:log",
   ]
 }
 

src/starnix/examples/hello_starnix/test.rs

@@ -8,7 +8,7 @@ use component_events::matcher::EventMatcher;
 use diagnostics_reader::{ArchiveReader, Logs};
 use fuchsia_component_test::ScopedInstance;
 use futures::StreamExt;
-use tracing::info;
+use log::info;
 
 #[fuchsia::main]
 async fn main() {

src/starnix/fakes/fake_lutex_controller/BUILD.gn

@@ -21,7 +21,7 @@ rustc_binary("bin") {
     "//src/lib/fuchsia-sync",
     "//third_party/rust_crates:anyhow",
     "//third_party/rust_crates:futures",
-    "//third_party/rust_crates:tracing",
+    "//third_party/rust_crates:log",
   ]
   configs += [ "//src/starnix/config:starnix_clippy_lints" ]
 }

src/starnix/fakes/fake_lutex_controller/src/main.rs

@@ -7,10 +7,10 @@ use fuchsia_component::server::ServiceFs;
 use fuchsia_sync::Mutex;
 use futures::channel::oneshot;
 use futures::{pin_mut, select, FutureExt, StreamExt, TryFutureExt, TryStreamExt};
+use log::{error, warn};
 use std::collections::BTreeMap;
 use std::future::Future;
 use std::sync::Arc;
-use tracing::{error, warn};
 use {
     fidl_fuchsia_posix as fposix, fidl_fuchsia_starnix_binder as fbinder, fuchsia_async as fasync,
     zx,

src/starnix/kernel/BUILD.gn

@@ -532,7 +532,6 @@ rustc_library("starnix_kernel_runner") {
     "//third_party/rust_crates:bstr",
     "//third_party/rust_crates:futures",
     "//third_party/rust_crates:rand",
-    "//third_party/rust_crates:tracing",
   ]
 
   test_deps = [ "//src/lib/fuchsia" ]
@@ -568,8 +567,8 @@ rustc_library("starnix_logging") {
     "//third_party/rust_crates:anyhow",
     "//third_party/rust_crates:bstr",
     "//third_party/rust_crates:futures",
+    "//third_party/rust_crates:log",
     "//third_party/rust_crates:regex",
-    "//third_party/rust_crates:tracing",
   ]
 
   test_deps = [ "//third_party/rust_crates:pretty_assertions" ]

src/starnix/kernel/device/mem.rs

@@ -379,21 +379,21 @@ impl FileOps for DevKmsg {
         let bytes = data.read_all()?;
         let extract_result = syslog::extract_level(&bytes);
         let (level, msg_bytes) = match extract_result {
-            None => (Level::INFO, bytes.as_slice()),
+            None => (Level::Info, bytes.as_slice()),
             Some((level, bytes_after_level)) => match level {
                 // An error but keep the <level> str.
                 KmsgLevel::Emergency | KmsgLevel::Alert | KmsgLevel::Critical => {
-                    (Level::ERROR, bytes.as_slice())
+                    (Level::Error, bytes.as_slice())
                 }
-                KmsgLevel::Error => (Level::ERROR, bytes_after_level),
-                KmsgLevel::Warning => (Level::WARN, bytes_after_level),
+                KmsgLevel::Error => (Level::Error, bytes_after_level),
+                KmsgLevel::Warning => (Level::Warn, bytes_after_level),
                 // Log as info but show the <level>.
-                KmsgLevel::Notice => (Level::INFO, bytes.as_slice()),
-                KmsgLevel::Info => (Level::INFO, bytes_after_level),
-                KmsgLevel::Debug => (Level::DEBUG, bytes_after_level),
+                KmsgLevel::Notice => (Level::Info, bytes.as_slice()),
+                KmsgLevel::Info => (Level::Info, bytes_after_level),
+                KmsgLevel::Debug => (Level::Debug, bytes_after_level),
             },
         };
-        log!(level, tag = "kmsg", "{}", String::from_utf8_lossy(msg_bytes).trim_end_matches('\n'));
+        log!(level, tag = "kmsg"; "{}", String::from_utf8_lossy(msg_bytes).trim_end_matches('\n'));
         Ok(bytes.len())
     }
 }

src/starnix/kernel/execution/crash_reporter.rs

@@ -142,10 +142,10 @@ impl CrashReporter {
                     match reporter.file_report(crash_report).await {
                         Ok(Ok(_)) => (),
                         Ok(Err(filing_error)) => {
-                            log_error!(?filing_error, "Couldn't file crash report.");
+                            log_error!(filing_error:?; "Couldn't file crash report.");
                         }
                         Err(fidl_error) => log_warn!(
-                            ?fidl_error,
+                            fidl_error:?;
                             "Couldn't file crash report due to error on underlying channel."
                         ),
                     };
@@ -155,12 +155,12 @@ impl CrashReporter {
                 });
             } else {
                 log_info!(
-                    ?crash_report,
+                    crash_report:?;
                     "Skipping sending crash report, too many already in-flight."
                 );
             }
         } else {
-            log_info!(?crash_report, "no crash reporter available for crash");
+            log_info!(crash_report:?; "no crash reporter available for crash");
         }
     }
 

src/starnix/kernel/execution/executor.rs

@@ -601,7 +601,7 @@ where
     // Now that the task has a thread handle, update the thread's role using the policy configured.
     drop(task_thread_guard);
     if let Err(err) = ref_task.sync_scheduler_policy_to_role() {
-        log_warn!(?err, "Couldn't update freshly spawned thread's profile.");
+        log_warn!(err:?; "Couldn't update freshly spawned thread's profile.");
     }
 
     Ok(())