Revert "disable tracing macros"

This reverts commit 14e0d286f1efcc989ce679e451159fede6330bdf.
2023-08-29 21:34:01 +02:00
parent 64b243ea82
commit d5fdf4fb48
14 changed files with 161 additions and 161 deletions
--- a/rust/src/models/inventory.rs
+++ b/rust/src/models/inventory.rs
@@ -11,7 +11,7 @@ pub struct Inventory {
 }

 impl Inventory {
-    //#[tracing::instrument]
+    #[tracing::instrument]
    pub async fn load(ctx: &Context, pool: &sqlx::Pool<sqlx::Sqlite>) -> Result<Self, Error> {
        let user_id = ctx.user.id.to_string();
        let categories = async {
@@ -38,7 +38,7 @@ impl Inventory {

            Ok::<_, Error>(categories)
        }
-        // .instrument(tracing::info_span!("packager::query", "query"))
+        .instrument(tracing::info_span!("packager::query", "query"))
        .await?;

        Ok(Self { categories })
@@ -73,7 +73,7 @@ impl TryFrom<DbCategoryRow> for Category {
 }

 impl Category {
-    //#[tracing::instrument]
+    #[tracing::instrument]
    pub async fn _find(
        ctx: &Context,
        pool: &sqlx::Pool<sqlx::Sqlite>,
@@ -100,7 +100,7 @@ impl Category {
        .transpose()
    }

-    //#[tracing::instrument]
+    #[tracing::instrument]
    pub async fn save(
        ctx: &Context,
        pool: &sqlx::Pool<sqlx::Sqlite>,
@@ -124,19 +124,19 @@ impl Category {
        Ok(id)
    }

-    //#[tracing::instrument]
+    #[tracing::instrument]
    pub fn items(&self) -> &Vec<Item> {
        self.items
            .as_ref()
            .expect("you need to call populate_items()")
    }

-    //#[tracing::instrument]
+    #[tracing::instrument]
    pub fn total_weight(&self) -> i64 {
        self.items().iter().map(|item| item.weight).sum()
    }

-    //#[tracing::instrument]
+    #[tracing::instrument]
    pub async fn populate_items(
        &mut self,
        ctx: &Context,
@@ -234,7 +234,7 @@ impl TryFrom<DbInventoryItemRow> for InventoryItem {
 }

 impl InventoryItem {
-    //#[tracing::instrument]
+    #[tracing::instrument]
    pub async fn find(
        ctx: &Context,
        pool: &sqlx::Pool<sqlx::Sqlite>,
@@ -274,7 +274,7 @@ impl InventoryItem {
        .transpose()
    }

-    //#[tracing::instrument]
+    #[tracing::instrument]
    pub async fn name_exists(
        ctx: &Context,
        pool: &sqlx::Pool<sqlx::Sqlite>,
@@ -296,7 +296,7 @@ impl InventoryItem {
        .is_some())
    }

-    //#[tracing::instrument]
+    #[tracing::instrument]
    pub async fn delete(
        ctx: &Context,
        pool: &sqlx::Pool<sqlx::Sqlite>,
@@ -318,7 +318,7 @@ impl InventoryItem {
        Ok(results.rows_affected() != 0)
    }

-    //#[tracing::instrument]
+    #[tracing::instrument]
    pub async fn update(
        ctx: &Context,
        pool: &sqlx::Pool<sqlx::Sqlite>,
@@ -350,7 +350,7 @@ impl InventoryItem {
        .await??)
    }

-    //#[tracing::instrument]
+    #[tracing::instrument]
    pub async fn save(
        ctx: &Context,
        pool: &sqlx::Pool<sqlx::Sqlite>,
@@ -381,7 +381,7 @@ impl InventoryItem {
        Ok(id)
    }

-    //#[tracing::instrument]
+    #[tracing::instrument]
    pub async fn get_category_max_weight(
        ctx: &Context,
        pool: &sqlx::Pool<sqlx::Sqlite>,
@@ -446,7 +446,7 @@ impl TryFrom<DbInventoryItemsRow> for Item {
 }

 impl Item {
-    //#[tracing::instrument]
+    #[tracing::instrument]
    pub async fn _get_category_total_picked_weight(
        ctx: &Context,
        pool: &sqlx::Pool<sqlx::Sqlite>,
--- a/rust/src/models/trips.rs
+++ b/rust/src/models/trips.rs
@@ -118,7 +118,7 @@ pub struct TripCategory {
 }

 impl TripCategory {
-    //#[tracing::instrument]
+    #[tracing::instrument]
    pub fn total_picked_weight(&self) -> i64 {
        self.items
            .as_ref()
@@ -129,7 +129,7 @@ impl TripCategory {
            .sum()
    }

-    //#[tracing::instrument]
+    #[tracing::instrument]
    pub async fn find(
        ctx: &Context,
        pool: &sqlx::Pool<sqlx::Sqlite>,
@@ -290,7 +290,7 @@ impl TryFrom<DbTripsItemsRow> for TripItem {
 }

 impl TripItem {
-    //#[tracing::instrument]
+    #[tracing::instrument]
    pub async fn find(
        ctx: &Context,
        pool: &sqlx::Pool<sqlx::Sqlite>,
@@ -330,7 +330,7 @@ impl TripItem {
        .transpose()
    }

-    //#[tracing::instrument]
+    #[tracing::instrument]
    pub async fn set_state(
        ctx: &Context,
        pool: &sqlx::Pool<sqlx::Sqlite>,
@@ -431,7 +431,7 @@ pub(crate) struct DbTripWeightRow {
 }

 impl Trip {
-    //#[tracing::instrument]
+    #[tracing::instrument]
    pub async fn all(ctx: &Context, pool: &sqlx::Pool<sqlx::Sqlite>) -> Result<Vec<Trip>, Error> {
        let user_id = ctx.user.id.to_string();
        sqlx::query_as!(
@@ -458,7 +458,7 @@ impl Trip {
        .collect::<Result<Vec<Trip>, Error>>()
    }

-    //#[tracing::instrument]
+    #[tracing::instrument]
    pub async fn find(
        ctx: &Context,
        pool: &sqlx::Pool<sqlx::Sqlite>,
@@ -489,7 +489,7 @@ impl Trip {
        .transpose()
    }

-    //#[tracing::instrument]
+    #[tracing::instrument]
    pub async fn trip_type_remove(
        ctx: &Context,
        pool: &sqlx::Pool<sqlx::Sqlite>,
@@ -520,7 +520,7 @@ impl Trip {
        Ok(results.rows_affected() != 0)
    }

-    //#[tracing::instrument]
+    #[tracing::instrument]
    pub async fn trip_type_add(
        ctx: &Context,
        pool: &sqlx::Pool<sqlx::Sqlite>,
@@ -554,7 +554,7 @@ impl Trip {
        Ok(())
    }

-    //#[tracing::instrument]
+    #[tracing::instrument]
    pub async fn set_state(
        ctx: &Context,
        pool: &sqlx::Pool<sqlx::Sqlite>,
@@ -577,7 +577,7 @@ impl Trip {
        Ok(result.rows_affected() != 0)
    }

-    //#[tracing::instrument]
+    #[tracing::instrument]
    pub async fn set_comment(
        ctx: &Context,
        pool: &sqlx::Pool<sqlx::Sqlite>,
@@ -600,7 +600,7 @@ impl Trip {
        Ok(result.rows_affected() != 0)
    }

-    //#[tracing::instrument]
+    #[tracing::instrument]
    pub async fn set_attribute(
        ctx: &Context,
        pool: &sqlx::Pool<sqlx::Sqlite>,
@@ -628,7 +628,7 @@ impl Trip {
        })
    }

-    //#[tracing::instrument]
+    #[tracing::instrument]
    pub async fn save(
        ctx: &Context,
        pool: &sqlx::Pool<sqlx::Sqlite>,
@@ -662,7 +662,7 @@ impl Trip {
        Ok(id)
    }

-    //#[tracing::instrument]
+    #[tracing::instrument]
    pub async fn find_total_picked_weight(
        ctx: &Context,
        pool: &sqlx::Pool<sqlx::Sqlite>,
@@ -694,21 +694,21 @@ impl Trip {
        Ok(weight)
    }

-    //#[tracing::instrument]
+    #[tracing::instrument]
    pub fn types(&self) -> &Vec<TripType> {
        self.types
            .as_ref()
            .expect("you need to call load_trips_types()")
    }

-    //#[tracing::instrument]
+    #[tracing::instrument]
    pub fn categories(&self) -> &Vec<TripCategory> {
        self.categories
            .as_ref()
            .expect("you need to call load_trips_types()")
    }

-    //#[tracing::instrument]
+    #[tracing::instrument]
    pub fn total_picked_weight(&self) -> i64 {
        self.categories()
            .iter()
@@ -724,7 +724,7 @@ impl Trip {
            .sum::<i64>()
    }

-    //#[tracing::instrument]
+    #[tracing::instrument]
    pub async fn load_trips_types(
        &mut self,
        ctx: &Context,
@@ -776,7 +776,7 @@ impl Trip {
        Ok(())
    }

-    //#[tracing::instrument]
+    #[tracing::instrument]
    pub async fn sync_trip_items_with_inventory(
        &mut self,
        ctx: &Context,
@@ -857,7 +857,7 @@ impl Trip {
        Ok(())
    }

-    //#[tracing::instrument]
+    #[tracing::instrument]
    pub async fn load_categories(
        &mut self,
        ctx: &Context,
@@ -983,7 +983,7 @@ pub struct TripType {
 }

 impl TripsType {
-    //#[tracing::instrument]
+    #[tracing::instrument]
    pub async fn all(ctx: &Context, pool: &sqlx::Pool<sqlx::Sqlite>) -> Result<Vec<Self>, Error> {
        let user_id = ctx.user.id.to_string();
        sqlx::query_as!(
@@ -1003,7 +1003,7 @@ impl TripsType {
        .collect::<Result<Vec<Self>, Error>>()
    }

-    //#[tracing::instrument]
+    #[tracing::instrument]
    pub async fn save(
        ctx: &Context,
        pool: &sqlx::Pool<sqlx::Sqlite>,
@@ -1027,7 +1027,7 @@ impl TripsType {
        Ok(id)
    }

-    //#[tracing::instrument]
+    #[tracing::instrument]
    pub async fn set_name(
        ctx: &Context,
        pool: &sqlx::Pool<sqlx::Sqlite>,
--- a/rust/src/models/user.rs
+++ b/rust/src/models/user.rs
@@ -34,7 +34,7 @@ impl TryFrom<DbUserRow> for User {
 }

 impl User {
-    //#[tracing::instrument]
+    #[tracing::instrument]
    pub async fn find_by_name(
        pool: &sqlx::Pool<sqlx::Sqlite>,
        name: &str,
@@ -51,7 +51,7 @@ impl User {
    }
 }

-//#[tracing::instrument]
+#[tracing::instrument]
 pub async fn create(pool: &sqlx::Pool<sqlx::Sqlite>, user: NewUser<'_>) -> Result<Uuid, Error> {
    let id = Uuid::new_v4();
    let id_param = id.to_string();