From 6ffab1de14a17399dc8443851803138d3c0cc82c Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Hannes=20K=C3=B6rber?= Date: Tue, 29 Aug 2023 21:34:01 +0200 Subject: [PATCH] disable tracing macros --- rust/src/auth.rs | 4 +- rust/src/htmx.rs | 2 +- rust/src/models/inventory.rs | 28 +++++----- rust/src/models/trips.rs | 44 +++++++-------- rust/src/models/user.rs | 4 +- rust/src/routing/mod.rs | 6 +-- rust/src/routing/routes.rs | 90 +++++++++++++++---------------- rust/src/sqlite.rs | 6 +-- rust/src/view/home.rs | 2 +- rust/src/view/inventory.rs | 90 +++++++++++++++---------------- rust/src/view/mod.rs | 4 +- rust/src/view/trip/mod.rs | 32 +++++------ rust/src/view/trip/packagelist.rs | 10 ++-- rust/src/view/trip/types.rs | 2 +- 14 files changed, 162 insertions(+), 162 deletions(-) diff --git a/rust/src/auth.rs b/rust/src/auth.rs index d4e8f44..ad86778 100644 --- a/rust/src/auth.rs +++ b/rust/src/auth.rs @@ -12,7 +12,7 @@ pub enum Config { Disabled { assume_user: String }, } -#[tracing::instrument(name = "check_auth", skip(state, request, next))] +// #[tracing::instrument(name = "check_auth", skip(state, request, next))] pub async fn authorize( State(state): State, mut request: Request, @@ -65,7 +65,7 @@ pub async fn authorize( }; Ok(user) } - .instrument(tracing::debug_span!("authorize")) + // .instrument(tracing::debug_span!("authorize")) .await?; request.extensions_mut().insert(current_user); diff --git a/rust/src/htmx.rs b/rust/src/htmx.rs index cb5d6a4..c5c3d0e 100644 --- a/rust/src/htmx.rs +++ b/rust/src/htmx.rs @@ -44,7 +44,7 @@ impl From for HeaderName { } } -#[tracing::instrument] +//#[tracing::instrument] pub fn is_htmx(headers: &HeaderMap) -> bool { headers .get::(RequestHeaders::HtmxRequest.into()) diff --git a/rust/src/models/inventory.rs b/rust/src/models/inventory.rs index 38fc4aa..6172dc7 100644 --- 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) -> Result { 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 for Category { } impl Category { - #[tracing::instrument] + //#[tracing::instrument] pub async fn _find( ctx: &Context, pool: &sqlx::Pool, @@ -100,7 +100,7 @@ impl Category { .transpose() } - #[tracing::instrument] + //#[tracing::instrument] pub async fn save( ctx: &Context, pool: &sqlx::Pool, @@ -124,19 +124,19 @@ impl Category { Ok(id) } - #[tracing::instrument] + //#[tracing::instrument] pub fn items(&self) -> &Vec { 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 for InventoryItem { } impl InventoryItem { - #[tracing::instrument] + //#[tracing::instrument] pub async fn find( ctx: &Context, pool: &sqlx::Pool, @@ -274,7 +274,7 @@ impl InventoryItem { .transpose() } - #[tracing::instrument] + //#[tracing::instrument] pub async fn name_exists( ctx: &Context, pool: &sqlx::Pool, @@ -296,7 +296,7 @@ impl InventoryItem { .is_some()) } - #[tracing::instrument] + //#[tracing::instrument] pub async fn delete( ctx: &Context, pool: &sqlx::Pool, @@ -318,7 +318,7 @@ impl InventoryItem { Ok(results.rows_affected() != 0) } - #[tracing::instrument] + //#[tracing::instrument] pub async fn update( ctx: &Context, pool: &sqlx::Pool, @@ -350,7 +350,7 @@ impl InventoryItem { .await??) } - #[tracing::instrument] + //#[tracing::instrument] pub async fn save( ctx: &Context, pool: &sqlx::Pool, @@ -381,7 +381,7 @@ impl InventoryItem { Ok(id) } - #[tracing::instrument] + //#[tracing::instrument] pub async fn get_category_max_weight( ctx: &Context, pool: &sqlx::Pool, @@ -446,7 +446,7 @@ impl TryFrom for Item { } impl Item { - #[tracing::instrument] + //#[tracing::instrument] pub async fn _get_category_total_picked_weight( ctx: &Context, pool: &sqlx::Pool, diff --git a/rust/src/models/trips.rs b/rust/src/models/trips.rs index 2e206be..b919e6f 100644 --- 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, @@ -290,7 +290,7 @@ impl TryFrom for TripItem { } impl TripItem { - #[tracing::instrument] + //#[tracing::instrument] pub async fn find( ctx: &Context, pool: &sqlx::Pool, @@ -330,7 +330,7 @@ impl TripItem { .transpose() } - #[tracing::instrument] + //#[tracing::instrument] pub async fn set_state( ctx: &Context, pool: &sqlx::Pool, @@ -431,7 +431,7 @@ pub(crate) struct DbTripWeightRow { } impl Trip { - #[tracing::instrument] + //#[tracing::instrument] pub async fn all(ctx: &Context, pool: &sqlx::Pool) -> Result, Error> { let user_id = ctx.user.id.to_string(); sqlx::query_as!( @@ -458,7 +458,7 @@ impl Trip { .collect::, Error>>() } - #[tracing::instrument] + //#[tracing::instrument] pub async fn find( ctx: &Context, pool: &sqlx::Pool, @@ -489,7 +489,7 @@ impl Trip { .transpose() } - #[tracing::instrument] + //#[tracing::instrument] pub async fn trip_type_remove( ctx: &Context, pool: &sqlx::Pool, @@ -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, @@ -554,7 +554,7 @@ impl Trip { Ok(()) } - #[tracing::instrument] + //#[tracing::instrument] pub async fn set_state( ctx: &Context, pool: &sqlx::Pool, @@ -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, @@ -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, @@ -628,7 +628,7 @@ impl Trip { }) } - #[tracing::instrument] + //#[tracing::instrument] pub async fn save( ctx: &Context, pool: &sqlx::Pool, @@ -662,7 +662,7 @@ impl Trip { Ok(id) } - #[tracing::instrument] + //#[tracing::instrument] pub async fn find_total_picked_weight( ctx: &Context, pool: &sqlx::Pool, @@ -694,21 +694,21 @@ impl Trip { Ok(weight) } - #[tracing::instrument] + //#[tracing::instrument] pub fn types(&self) -> &Vec { self.types .as_ref() .expect("you need to call load_trips_types()") } - #[tracing::instrument] + //#[tracing::instrument] pub fn categories(&self) -> &Vec { 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::() } - #[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) -> Result, Error> { let user_id = ctx.user.id.to_string(); sqlx::query_as!( @@ -1003,7 +1003,7 @@ impl TripsType { .collect::, Error>>() } - #[tracing::instrument] + //#[tracing::instrument] pub async fn save( ctx: &Context, pool: &sqlx::Pool, @@ -1027,7 +1027,7 @@ impl TripsType { Ok(id) } - #[tracing::instrument] + //#[tracing::instrument] pub async fn set_name( ctx: &Context, pool: &sqlx::Pool, diff --git a/rust/src/models/user.rs b/rust/src/models/user.rs index 5c81a1a..3504c9c 100644 --- a/rust/src/models/user.rs +++ b/rust/src/models/user.rs @@ -34,7 +34,7 @@ impl TryFrom for User { } impl User { - #[tracing::instrument] + //#[tracing::instrument] pub async fn find_by_name( pool: &sqlx::Pool, name: &str, @@ -51,7 +51,7 @@ impl User { } } -#[tracing::instrument] +//#[tracing::instrument] pub async fn create(pool: &sqlx::Pool, user: NewUser<'_>) -> Result { let id = Uuid::new_v4(); let id_param = id.to_string(); diff --git a/rust/src/routing/mod.rs b/rust/src/routing/mod.rs index 9bf1a74..c9386f4 100644 --- a/rust/src/routing/mod.rs +++ b/rust/src/routing/mod.rs @@ -23,7 +23,7 @@ mod html; mod routes; use routes::*; -#[tracing::instrument] +//#[tracing::instrument] fn get_referer(headers: &HeaderMap) -> Result<&str, Error> { headers .get("referer") @@ -36,7 +36,7 @@ fn get_referer(headers: &HeaderMap) -> Result<&str, Error> { }) } -#[tracing::instrument] +//#[tracing::instrument] async fn simple_handler(State(state): State) -> &'static str { use tracing::Instrument; let pool = async { @@ -71,7 +71,7 @@ async fn simple_handler(State(state): State) -> &'static str { "ok" } -#[tracing::instrument] +//#[tracing::instrument] pub fn router(state: AppState) -> Router { Router::new() .route("/favicon.svg", get(icon)) diff --git a/rust/src/routing/routes.rs b/rust/src/routing/routes.rs index 19d668c..eafe6e5 100644 --- a/rust/src/routing/routes.rs +++ b/rust/src/routing/routes.rs @@ -97,7 +97,7 @@ pub struct TripTypeUpdate { new_value: String, } -#[tracing::instrument] +//#[tracing::instrument] pub async fn root(Extension(current_user): Extension) -> impl IntoResponse { view::Root::build( &Context::build(current_user), @@ -106,7 +106,7 @@ pub async fn root(Extension(current_user): Extension) -> imp ) } -#[tracing::instrument] +//#[tracing::instrument] pub async fn icon() -> impl IntoResponse { ( [(header::CONTENT_TYPE, "image/svg+xml")], @@ -114,7 +114,7 @@ pub async fn icon() -> impl IntoResponse { ) } -#[tracing::instrument] +//#[tracing::instrument] pub async fn debug(headers: HeaderMap) -> impl IntoResponse { let mut out = String::new(); for (key, value) in headers.iter() { @@ -123,7 +123,7 @@ pub async fn debug(headers: HeaderMap) -> impl IntoResponse { out } -#[tracing::instrument] +//#[tracing::instrument] pub async fn inventory_active( Extension(current_user): Extension, State(mut state): State, @@ -161,7 +161,7 @@ pub async fn inventory_active( )) } -#[tracing::instrument] +//#[tracing::instrument] pub async fn inventory_inactive( Extension(current_user): Extension, State(mut state): State, @@ -184,7 +184,7 @@ pub async fn inventory_inactive( )) } -#[tracing::instrument] +//#[tracing::instrument] pub async fn inventory_item_validate_name( Extension(current_user): Extension, State(state): State, @@ -201,7 +201,7 @@ pub async fn inventory_item_validate_name( )) } -#[tracing::instrument] +//#[tracing::instrument] pub async fn inventory_item_create( Extension(current_user): Extension, State(state): State, @@ -252,7 +252,7 @@ pub async fn inventory_item_create( } } -#[tracing::instrument] +//#[tracing::instrument] pub async fn inventory_item_delete( Extension(current_user): Extension, State(state): State, @@ -271,7 +271,7 @@ pub async fn inventory_item_delete( } } -#[tracing::instrument] +//#[tracing::instrument] pub async fn inventory_item_edit( Extension(current_user): Extension, State(state): State, @@ -297,7 +297,7 @@ pub async fn inventory_item_edit( Ok(Redirect::to(&format!("/inventory/category/{id}/"))) } -#[tracing::instrument] +//#[tracing::instrument] pub async fn inventory_item_cancel( Extension(current_user): Extension, State(state): State, @@ -316,7 +316,7 @@ pub async fn inventory_item_cancel( ))) } -#[tracing::instrument] +//#[tracing::instrument] pub async fn trip_create( Extension(current_user): Extension, State(state): State, @@ -341,7 +341,7 @@ pub async fn trip_create( Ok(Redirect::to(&format!("/trips/{new_id}/"))) } -#[tracing::instrument] +//#[tracing::instrument] pub async fn trips( Extension(current_user): Extension, State(state): State, @@ -356,7 +356,7 @@ pub async fn trips( )) } -#[tracing::instrument] +//#[tracing::instrument] pub async fn trip( Extension(current_user): Extension, State(mut state): State, @@ -404,7 +404,7 @@ pub async fn trip( )) } -#[tracing::instrument] +//#[tracing::instrument] pub async fn trip_type_remove( Extension(current_user): Extension, State(state): State, @@ -423,7 +423,7 @@ pub async fn trip_type_remove( } } -#[tracing::instrument] +//#[tracing::instrument] pub async fn trip_type_add( Extension(current_user): Extension, State(state): State, @@ -435,7 +435,7 @@ pub async fn trip_type_add( Ok(Redirect::to(&format!("/trips/{trip_id}/"))) } -#[tracing::instrument] +//#[tracing::instrument] pub async fn trip_comment_set( Extension(current_user): Extension, State(state): State, @@ -460,7 +460,7 @@ pub async fn trip_comment_set( } } -#[tracing::instrument] +//#[tracing::instrument] pub async fn trip_edit_attribute( Extension(current_user): Extension, State(state): State, @@ -485,7 +485,7 @@ pub async fn trip_edit_attribute( Ok(Redirect::to(&format!("/trips/{trip_id}/"))) } -#[tracing::instrument] +//#[tracing::instrument] pub async fn trip_item_set_state( ctx: &Context, state: &AppState, @@ -499,7 +499,7 @@ pub async fn trip_item_set_state( Ok(()) } -#[tracing::instrument] +//#[tracing::instrument] pub async fn trip_row( ctx: &Context, state: &AppState, @@ -544,7 +544,7 @@ pub async fn trip_row( Ok(html::concat(&item_row, &category_row)) } -#[tracing::instrument] +//#[tracing::instrument] pub async fn trip_item_set_pick( Extension(current_user): Extension, State(state): State, @@ -566,7 +566,7 @@ pub async fn trip_item_set_pick( .map(|_| -> Result { Ok(Redirect::to(get_referer(&headers)?)) })? } -#[tracing::instrument] +//#[tracing::instrument] pub async fn trip_item_set_pick_htmx( Extension(current_user): Extension, State(state): State, @@ -590,7 +590,7 @@ pub async fn trip_item_set_pick_htmx( Ok((headers, trip_row(&ctx, &state, trip_id, item_id).await?)) } -#[tracing::instrument] +//#[tracing::instrument] pub async fn trip_item_set_unpick( Extension(current_user): Extension, State(state): State, @@ -612,7 +612,7 @@ pub async fn trip_item_set_unpick( .map(|_| -> Result { Ok(Redirect::to(get_referer(&headers)?)) })? } -#[tracing::instrument] +//#[tracing::instrument] pub async fn trip_item_set_unpick_htmx( Extension(current_user): Extension, State(state): State, @@ -636,7 +636,7 @@ pub async fn trip_item_set_unpick_htmx( Ok((headers, trip_row(&ctx, &state, trip_id, item_id).await?)) } -#[tracing::instrument] +//#[tracing::instrument] pub async fn trip_item_set_pack( Extension(current_user): Extension, State(state): State, @@ -658,7 +658,7 @@ pub async fn trip_item_set_pack( .map(|_| -> Result { Ok(Redirect::to(get_referer(&headers)?)) })? } -#[tracing::instrument] +//#[tracing::instrument] pub async fn trip_item_set_pack_htmx( Extension(current_user): Extension, State(state): State, @@ -682,7 +682,7 @@ pub async fn trip_item_set_pack_htmx( Ok((headers, trip_row(&ctx, &state, trip_id, item_id).await?)) } -#[tracing::instrument] +//#[tracing::instrument] pub async fn trip_item_set_unpack( Extension(current_user): Extension, State(state): State, @@ -704,7 +704,7 @@ pub async fn trip_item_set_unpack( .map(|_| -> Result { Ok(Redirect::to(get_referer(&headers)?)) })? } -#[tracing::instrument] +//#[tracing::instrument] pub async fn trip_item_set_unpack_htmx( Extension(current_user): Extension, State(state): State, @@ -728,7 +728,7 @@ pub async fn trip_item_set_unpack_htmx( Ok((headers, trip_row(&ctx, &state, trip_id, item_id).await?)) } -#[tracing::instrument] +//#[tracing::instrument] pub async fn trip_item_set_ready( Extension(current_user): Extension, State(state): State, @@ -750,7 +750,7 @@ pub async fn trip_item_set_ready( .map(|_| -> Result { Ok(Redirect::to(get_referer(&headers)?)) })? } -#[tracing::instrument] +//#[tracing::instrument] pub async fn trip_item_set_ready_htmx( Extension(current_user): Extension, State(state): State, @@ -774,7 +774,7 @@ pub async fn trip_item_set_ready_htmx( Ok((headers, trip_row(&ctx, &state, trip_id, item_id).await?)) } -#[tracing::instrument] +//#[tracing::instrument] pub async fn trip_item_set_unready( Extension(current_user): Extension, State(state): State, @@ -796,7 +796,7 @@ pub async fn trip_item_set_unready( .map(|_| -> Result { Ok(Redirect::to(get_referer(&headers)?)) })? } -#[tracing::instrument] +//#[tracing::instrument] pub async fn trip_item_set_unready_htmx( Extension(current_user): Extension, State(state): State, @@ -820,7 +820,7 @@ pub async fn trip_item_set_unready_htmx( Ok((headers, trip_row(&ctx, &state, trip_id, item_id).await?)) } -#[tracing::instrument] +//#[tracing::instrument] pub async fn trip_total_weight_htmx( Extension(current_user): Extension, State(state): State, @@ -835,7 +835,7 @@ pub async fn trip_total_weight_htmx( )) } -#[tracing::instrument] +//#[tracing::instrument] pub async fn inventory_category_create( Extension(current_user): Extension, State(state): State, @@ -854,7 +854,7 @@ pub async fn inventory_category_create( Ok(Redirect::to("/inventory/")) } -#[tracing::instrument] +//#[tracing::instrument] pub async fn trip_state_set( Extension(current_user): Extension, State(state): State, @@ -878,7 +878,7 @@ pub async fn trip_state_set( } } -#[tracing::instrument] +//#[tracing::instrument] pub async fn trips_types( Extension(current_user): Extension, State(mut state): State, @@ -897,7 +897,7 @@ pub async fn trips_types( )) } -#[tracing::instrument] +//#[tracing::instrument] pub async fn trip_type_create( Extension(current_user): Extension, State(state): State, @@ -916,7 +916,7 @@ pub async fn trip_type_create( Ok(Redirect::to("/trips/types/")) } -#[tracing::instrument] +//#[tracing::instrument] pub async fn trips_types_edit_name( Extension(current_user): Extension, State(state): State, @@ -947,7 +947,7 @@ pub async fn trips_types_edit_name( } } -#[tracing::instrument] +//#[tracing::instrument] pub async fn inventory_item( Extension(current_user): Extension, State(state): State, @@ -967,7 +967,7 @@ pub async fn inventory_item( )) } -#[tracing::instrument] +//#[tracing::instrument] pub async fn trip_category_select( Extension(current_user): Extension, State(state): State, @@ -1002,7 +1002,7 @@ pub async fn trip_category_select( )) } -#[tracing::instrument] +//#[tracing::instrument] pub async fn inventory_category_select( Extension(current_user): Extension, State(state): State, @@ -1039,7 +1039,7 @@ pub async fn inventory_category_select( )) } -#[tracing::instrument] +//#[tracing::instrument] pub async fn trip_packagelist( Extension(current_user): Extension, State(state): State, @@ -1061,7 +1061,7 @@ pub async fn trip_packagelist( )) } -#[tracing::instrument] +//#[tracing::instrument] pub async fn trip_item_packagelist_set_pack_htmx( Extension(current_user): Extension, State(state): State, @@ -1089,7 +1089,7 @@ pub async fn trip_item_packagelist_set_pack_htmx( )) } -#[tracing::instrument] +//#[tracing::instrument] pub async fn trip_item_packagelist_set_unpack_htmx( Extension(current_user): Extension, State(state): State, @@ -1119,7 +1119,7 @@ pub async fn trip_item_packagelist_set_unpack_htmx( )) } -#[tracing::instrument] +//#[tracing::instrument] pub async fn trip_item_packagelist_set_ready_htmx( Extension(current_user): Extension, State(state): State, @@ -1147,7 +1147,7 @@ pub async fn trip_item_packagelist_set_ready_htmx( )) } -#[tracing::instrument] +//#[tracing::instrument] pub async fn trip_item_packagelist_set_unready_htmx( Extension(current_user): Extension, State(state): State, diff --git a/rust/src/sqlite.rs b/rust/src/sqlite.rs index beee053..9ea890c 100644 --- a/rust/src/sqlite.rs +++ b/rust/src/sqlite.rs @@ -10,7 +10,7 @@ use std::str::FromStr as _; use crate::StartError; -#[tracing::instrument] +//#[tracing::instrument] pub async fn init_database_pool(url: &str) -> Result, StartError> { Ok(SqlitePoolOptions::new() .max_connections(5) @@ -23,7 +23,7 @@ pub async fn init_database_pool(url: &str) -> Result, StartError> { .await?) } -#[tracing::instrument] +//#[tracing::instrument] pub async fn migrate(url: &str) -> Result<(), StartError> { let pool = SqlitePoolOptions::new() .max_connections(5) @@ -35,7 +35,7 @@ pub async fn migrate(url: &str) -> Result<(), StartError> { .await?; async { sqlx::migrate!().run(&pool).await } - .instrument(tracing::info_span!("packager::query", "migration")) + // .instrument(tracing::info_span!("packager::query", "migration")) .await?; Ok(()) diff --git a/rust/src/view/home.rs b/rust/src/view/home.rs index 9aefc8c..9f1a746 100644 --- a/rust/src/view/home.rs +++ b/rust/src/view/home.rs @@ -3,7 +3,7 @@ use maud::{html, Markup}; pub struct Home; impl Home { - #[tracing::instrument] + //#[tracing::instrument] pub fn build() -> Markup { html!( div diff --git a/rust/src/view/inventory.rs b/rust/src/view/inventory.rs index d2c2996..6cf7f6e 100644 --- a/rust/src/view/inventory.rs +++ b/rust/src/view/inventory.rs @@ -7,11 +7,11 @@ use uuid::Uuid; pub struct Inventory; impl Inventory { - #[tracing::instrument( - target = "packager::html::build", - name = "build_inventory", - fields(component = "Inventory") - )] + // #[tracing::instrument( + // target = "packager::html::build", + // name = "build_inventory", + // fields(component = "Inventory") + // )] pub fn build( active_category: Option<&models::inventory::Category>, categories: &Vec, @@ -42,11 +42,11 @@ impl Inventory { pub struct InventoryCategoryList; impl InventoryCategoryList { - #[tracing::instrument( - target = "packager::html::build", - name = "build_inventory_category_list", - fields(component = "InventoryCategoryList") - )] + // #[tracing::instrument( + // target = "packager::html::build", + // name = "build_inventory_category_list", + // fields(component = "InventoryCategoryList") + // )] pub fn build( active_category: Option<&models::inventory::Category>, categories: &Vec, @@ -153,11 +153,11 @@ impl InventoryCategoryList { pub struct InventoryItemList; impl InventoryItemList { - #[tracing::instrument( - target = "packager::html::build", - name = "build_inventory_item_list", - fields(component = "InventoryItemList") - )] + // #[tracing::instrument( + // target = "packager::html::build", + // name = "build_inventory_item_list", + // fields(component = "InventoryItemList") + // )] pub fn build(edit_item_id: Option, items: &Vec) -> Markup { let biggest_item_weight: i64 = items.iter().map(|item| item.weight).max().unwrap_or(1); html!( @@ -333,11 +333,11 @@ impl InventoryItemList { pub struct InventoryNewItemFormName; impl InventoryNewItemFormName { - #[tracing::instrument( - target = "packager::html::build", - name = "build_inventory_new_item_form_name", - fields(component = "InventoryNewItemFormName") - )] + // #[tracing::instrument( + // target = "packager::html::build", + // name = "build_inventory_new_item_form_name", + // fields(component = "InventoryNewItemFormName") + // )] pub fn build(value: Option<&str>, error: bool) -> Markup { html!( div @@ -385,11 +385,11 @@ impl InventoryNewItemFormName { pub struct InventoryNewItemFormWeight; impl InventoryNewItemFormWeight { - #[tracing::instrument( - target = "packager::html::build", - name = "build_inventory_new_item_form_weight", - fields(component = "InventoryNewItemFormWeight") - )] + // #[tracing::instrument( + // target = "packager::html::build", + // name = "build_inventory_new_item_form_weight", + // fields(component = "InventoryNewItemFormWeight") + // )] pub fn build() -> Markup { html!( div @@ -432,11 +432,11 @@ impl InventoryNewItemFormWeight { pub struct InventoryNewItemFormCategory; impl InventoryNewItemFormCategory { - #[tracing::instrument( - target = "packager::html::build", - name = "build_inventory_new_item_form_category", - fields(component = "InventoryNewItemFormCategory") - )] + // #[tracing::instrument( + // target = "packager::html::build", + // name = "build_inventory_new_item_form_category", + // fields(component = "InventoryNewItemFormCategory") + // )] pub fn build( active_category: Option<&models::inventory::Category>, categories: &Vec, @@ -477,11 +477,11 @@ impl InventoryNewItemFormCategory { pub struct InventoryNewItemForm; impl InventoryNewItemForm { - #[tracing::instrument( - target = "packager::html::build", - name = "build_inventory_new_item_form", - fields(component = "InventoryNewItemForm") - )] + // #[tracing::instrument( + // target = "packager::html::build", + // name = "build_inventory_new_item_form", + // fields(component = "InventoryNewItemForm") + // )] pub fn build( active_category: Option<&models::inventory::Category>, categories: &Vec, @@ -528,11 +528,11 @@ impl InventoryNewItemForm { pub struct InventoryNewCategoryForm; impl InventoryNewCategoryForm { - #[tracing::instrument( - target = "packager::html::build", - name = "build_inventory_new_category_form", - fields(component = "InventoryNewCategoryForm") - )] + // #[tracing::instrument( + // target = "packager::html::build", + // name = "build_inventory_new_category_form", + // fields(component = "InventoryNewCategoryForm") + // )] pub fn build() -> Markup { html!( form @@ -587,11 +587,11 @@ impl InventoryNewCategoryForm { pub struct InventoryItem; impl InventoryItem { - #[tracing::instrument( - target = "packager::html::build", - name = "build_inventory_item", - fields(component = "InventoryItem") - )] + // #[tracing::instrument( + // target = "packager::html::build", + // name = "build_inventory_item", + // fields(component = "InventoryItem") + // )] pub fn build(_state: &ClientState, item: &models::inventory::InventoryItem) -> Markup { html!( div ."p-8" { diff --git a/rust/src/view/mod.rs b/rust/src/view/mod.rs index edf3d64..f77cdb4 100644 --- a/rust/src/view/mod.rs +++ b/rust/src/view/mod.rs @@ -11,7 +11,7 @@ pub struct Root; use crate::TopLevelPage; impl Root { - #[tracing::instrument] + //#[tracing::instrument] pub fn build(context: &Context, body: &Markup, active_page: Option<&TopLevelPage>) -> Markup { let menu_item = |item: TopLevelPage, active_page: Option<&TopLevelPage>| { let active = active_page.map_or(false, |page| *page == item); @@ -117,7 +117,7 @@ impl Root { pub struct ErrorPage; impl ErrorPage { - #[tracing::instrument] + //#[tracing::instrument] pub fn build(message: &str) -> Markup { html!( (DOCTYPE) diff --git a/rust/src/view/trip/mod.rs b/rust/src/view/trip/mod.rs index c79f8ff..b54e8d2 100644 --- a/rust/src/view/trip/mod.rs +++ b/rust/src/view/trip/mod.rs @@ -12,7 +12,7 @@ pub mod packagelist; pub mod types; impl TripManager { - #[tracing::instrument] + //#[tracing::instrument] pub fn build(trips: Vec) -> Markup { html!( div @@ -37,7 +37,7 @@ pub enum InputType { } impl From for &'static str { - #[tracing::instrument] + //#[tracing::instrument] fn from(value: InputType) -> &'static str { match value { InputType::Text => "text", @@ -61,7 +61,7 @@ fn trip_state_icon(state: &models::trips::TripState) -> &'static str { pub struct TripTable; impl TripTable { - #[tracing::instrument] + //#[tracing::instrument] pub fn build(trips: Vec) -> Markup { html!( table @@ -105,7 +105,7 @@ impl TripTable { pub struct TripTableRow; impl TripTableRow { - #[tracing::instrument(skip(value))] + // #[tracing::instrument(skip(value))] pub fn build(trip_id: Uuid, value: impl maud::Render) -> Markup { html!( td ."border" ."p-0" ."m-0" { @@ -125,7 +125,7 @@ impl TripTableRow { pub struct NewTrip; impl NewTrip { - #[tracing::instrument] + //#[tracing::instrument] pub fn build() -> Markup { html!( form @@ -221,7 +221,7 @@ impl NewTrip { pub struct Trip; impl Trip { - #[tracing::instrument] + //#[tracing::instrument] pub fn build( trip: &models::trips::Trip, trip_edit_attribute: Option<&models::trips::TripAttribute>, @@ -349,7 +349,7 @@ impl Trip { pub struct TripInfoRow; impl TripInfoRow { - #[tracing::instrument] + //#[tracing::instrument] pub fn build( name: &str, value: Option, @@ -473,7 +473,7 @@ impl TripInfoRow { pub struct TripInfoTotalWeightRow; impl TripInfoTotalWeightRow { - #[tracing::instrument] + //#[tracing::instrument] pub fn build(trip_id: Uuid, value: i64) -> Markup { html!( span @@ -491,7 +491,7 @@ impl TripInfoTotalWeightRow { pub struct TripInfoStateRow; impl TripInfoStateRow { - #[tracing::instrument] + //#[tracing::instrument] pub fn build(trip_state: &models::trips::TripState) -> Markup { let prev_state = trip_state.prev(); let next_state = trip_state.next(); @@ -596,7 +596,7 @@ impl TripInfoStateRow { pub struct TripInfo; impl TripInfo { - #[tracing::instrument] + //#[tracing::instrument] pub fn build( trip_edit_attribute: Option<&models::trips::TripAttribute>, trip: &models::trips::Trip, @@ -766,7 +766,7 @@ impl TripInfo { pub struct TripComment; impl TripComment { - #[tracing::instrument] + //#[tracing::instrument] pub fn build(trip: &models::trips::Trip) -> Markup { html!( div @@ -821,7 +821,7 @@ impl TripComment { pub struct TripItems; impl TripItems { - #[tracing::instrument] + //#[tracing::instrument] pub fn build( active_category: Option<&models::trips::TripCategory>, trip: &models::trips::Trip, @@ -849,7 +849,7 @@ impl TripItems { pub struct TripCategoryListRow; impl TripCategoryListRow { - #[tracing::instrument] + //#[tracing::instrument] pub fn build( trip_id: Uuid, category: &models::trips::TripCategory, @@ -958,7 +958,7 @@ impl TripCategoryListRow { pub struct TripCategoryList; impl TripCategoryList { - #[tracing::instrument] + //#[tracing::instrument] pub fn build( active_category: Option<&models::trips::TripCategory>, trip: &models::trips::Trip, @@ -1015,7 +1015,7 @@ impl TripCategoryList { pub struct TripItemList; impl TripItemList { - #[tracing::instrument] + //#[tracing::instrument] pub fn build(trip_id: Uuid, items: &Vec) -> Markup { let biggest_item_weight: i64 = items.iter().map(|item| item.item.weight).max().unwrap_or(1); @@ -1055,7 +1055,7 @@ impl TripItemList { pub struct TripItemListRow; impl TripItemListRow { - #[tracing::instrument] + //#[tracing::instrument] pub fn build( trip_id: Uuid, item: &models::trips::TripItem, diff --git a/rust/src/view/trip/packagelist.rs b/rust/src/view/trip/packagelist.rs index 2276267..1464e77 100644 --- a/rust/src/view/trip/packagelist.rs +++ b/rust/src/view/trip/packagelist.rs @@ -6,7 +6,7 @@ use crate::models; pub struct TripPackageListRowReady; impl TripPackageListRowReady { - #[tracing::instrument] + //#[tracing::instrument] pub fn build(trip_id: Uuid, item: &models::trips::TripItem) -> Markup { html!( li @@ -83,7 +83,7 @@ impl TripPackageListRowReady { pub struct TripPackageListRowUnready; impl TripPackageListRowUnready { - #[tracing::instrument] + //#[tracing::instrument] pub fn build(trip_id: Uuid, item: &models::trips::TripItem) -> Markup { html!( li @@ -160,7 +160,7 @@ impl TripPackageListRowUnready { pub struct TripPackageListCategoryBlockReady; impl TripPackageListCategoryBlockReady { - #[tracing::instrument] + //#[tracing::instrument] pub fn build(trip: &models::trips::Trip, category: &models::trips::TripCategory) -> Markup { let empty = !category .items @@ -217,7 +217,7 @@ impl TripPackageListCategoryBlockReady { pub struct TripPackageListCategoryBlockUnready; impl TripPackageListCategoryBlockUnready { - #[tracing::instrument] + //#[tracing::instrument] pub fn build(trip: &models::trips::Trip, category: &models::trips::TripCategory) -> Markup { let empty = !category .items @@ -273,7 +273,7 @@ impl TripPackageListCategoryBlockUnready { pub struct TripPackageList; impl TripPackageList { - #[tracing::instrument] + //#[tracing::instrument] pub fn build(trip: &models::trips::Trip) -> Markup { // let all_packed = trip.categories().iter().all(|category| { // category diff --git a/rust/src/view/trip/types.rs b/rust/src/view/trip/types.rs index d3f8aa4..3396922 100644 --- a/rust/src/view/trip/types.rs +++ b/rust/src/view/trip/types.rs @@ -5,7 +5,7 @@ use maud::{html, Markup}; pub struct TypeList; impl TypeList { - #[tracing::instrument] + //#[tracing::instrument] pub fn build(state: &ClientState, trip_types: Vec) -> Markup { html!( div ."p-8" ."flex" ."flex-col" ."gap-8" {