feat: add better logging

Umatriz · Jul 13, 2024 · f93f986 · f93f986
1 parent 63007c8
commit f93f986
Show file tree

Hide file tree

Showing 2 changed files with 10 additions and 1 deletion.
diff --git a/crates/nomi-core/src/fs.rs b/crates/nomi-core/src/fs.rs
@@ -1,8 +1,11 @@
 use std::path::Path;
 
+use anyhow::anyhow;
 use serde::{de::DeserializeOwned, Serialize};
 use tokio::io::AsyncWriteExt;
+use tracing::Level;
 
+#[tracing::instrument(skip_all, fields(path = path.as_ref().to_string_lossy().to_string()))]
 pub async fn write_toml_config<T>(data: &T, path: impl AsRef<Path>) -> anyhow::Result<()>
 where
  T: Serialize + ?Sized,
@@ -16,6 +19,7 @@ where
  Ok(())
 }
 
+#[tracing::instrument(skip_all, fields(path = path.as_ref().to_string_lossy().to_string()))]
 pub async fn read_toml_config<T>(path: impl AsRef<Path>) -> anyhow::Result<T>
 where
  T: DeserializeOwned + ?Sized,
@@ -30,6 +34,7 @@ where
  Ok(body)
 }
 
+#[tracing::instrument(skip_all, fields(path = path.as_ref().to_string_lossy().to_string()))]
 pub fn read_toml_config_sync<T>(path: impl AsRef<Path>) -> anyhow::Result<T>
 where
  T: DeserializeOwned + ?Sized,
@@ -38,6 +43,7 @@ where
  runtime.block_on(read_toml_config::<T>(path))
 }
 
+#[tracing::instrument(skip_all, fields(path = path.as_ref().to_string_lossy().to_string()))]
 pub fn write_toml_config_sync<T>(data: &T, path: impl AsRef<Path>) -> anyhow::Result<()>
 where
  T: Serialize + ?Sized,
@@ -50,10 +56,12 @@ pub async fn read_json_config<T>(path: impl AsRef<Path>) -> anyhow::Result<T>
 where
  T: DeserializeOwned + ?Sized,
 {
+ let path = path.as_ref();
  let s = tokio::fs::read_to_string(path).await?;
  Ok(serde_json::from_str::<T>(&s)?)
 }
 
+#[tracing::instrument(skip_all, fields(path = path.as_ref().to_string_lossy().to_string()), level = Level::DEBUG)]
 pub async fn write_json_config<T>(data: &T, path: impl AsRef<Path>) -> anyhow::Result<()>
 where
  T: Serialize + ?Sized,
@@ -68,6 +76,7 @@ where
  Ok(())
 }
 
+#[tracing::instrument(skip_all, fields(path = path.as_ref().to_string_lossy().to_string()))]
 pub async fn write_to_file(data: &[u8], path: impl AsRef<Path>) -> anyhow::Result<()> {
  let path = path.as_ref();
  if let Some(dir) = path.parent() {

diff --git a/crates/nomi-core/src/instance/launch.rs b/crates/nomi-core/src/instance/launch.rs
@@ -53,7 +53,7 @@ pub struct LaunchInstance {
 }
 
 impl LaunchInstance {
- #[tracing::instrument(err)]
+ #[tracing::instrument(skip(self), err)]
  pub async fn delete(&self, delete_client: bool, delete_libraries: bool, delete_assets: bool) -> anyhow::Result<()> {
  let manifest = read_json_config::<Manifest>(&self.settings.manifest_file).await?;
  let arguments_builder = ArgumentsBuilder::new(self, &manifest).with_classpath();