Remove instrument macros (#5368)

* Remove instrument macros

* shear

* revert test change

* clippy, another unused function

Cargo.lock

@@ -2633,7 +2633,6 @@ dependencies = [
  "serde",
  "serde_json",
  "serde_with",
- "tracing",
  "url",
  "uuid",
 ]

Cargo.toml

@@ -105,7 +105,7 @@ actix-web = { version = "4.9.0", default-features = false, features = [
   "macros",
   "rustls-0_23",
 ] }
-tracing = "0.1.41"
+tracing = { version = "0.1.41", default-features = false }
 tracing-actix-web = { version = "0.7.15", default-features = false }
 tracing-subscriber = { version = "0.3.19", features = ["env-filter"] }
 url = { version = "2.5.4", features = ["serde"] }

crates/api/src/comment/distinguish.rs

@@ -11,7 +11,6 @@ use lemmy_db_schema::{
 use lemmy_db_views::structs::{CommentView, LocalUserView};
 use lemmy_utils::error::{LemmyErrorExt, LemmyErrorType, LemmyResult};
 
-#[tracing::instrument(skip(context))]
 pub async fn distinguish_comment(
   data: Json<DistinguishComment>,
   context: Data<LemmyContext>,

crates/api/src/comment/like.rs

@@ -20,7 +20,6 @@ use lemmy_db_views::structs::{CommentView, LocalUserView};
 use lemmy_utils::error::{LemmyErrorExt, LemmyErrorType, LemmyResult};
 use std::ops::Deref;
 
-#[tracing::instrument(skip(context))]
 pub async fn like_comment(
   data: Json<CreateCommentLike>,
   context: Data<LemmyContext>,

crates/api/src/comment/list_comment_likes.rs

@@ -8,7 +8,6 @@ use lemmy_db_views::structs::{CommentView, LocalUserView, VoteView};
 use lemmy_utils::error::LemmyResult;
 
 /// Lists likes for a comment
-#[tracing::instrument(skip(context))]
 pub async fn list_comment_likes(
   data: Query<ListCommentLikes>,
   context: Data<LemmyContext>,

crates/api/src/comment/save.rs

@@ -10,7 +10,6 @@ use lemmy_db_schema::{
 use lemmy_db_views::structs::{CommentView, LocalUserView};
 use lemmy_utils::error::{LemmyErrorExt, LemmyErrorType, LemmyResult};
 
-#[tracing::instrument(skip(context))]
 pub async fn save_comment(
   data: Json<SaveComment>,
   context: Data<LemmyContext>,

crates/api/src/community/add_mod.rs

@@ -17,7 +17,6 @@ use lemmy_db_schema::{
 use lemmy_db_views::structs::{CommunityModeratorView, LocalUserView};
 use lemmy_utils::error::{LemmyErrorExt, LemmyErrorType, LemmyResult};
 
-#[tracing::instrument(skip(context))]
 pub async fn add_mod_to_community(
   data: Json<AddModToCommunity>,
   context: Data<LemmyContext>,

crates/api/src/community/ban.rs

@@ -30,7 +30,6 @@ use lemmy_utils::{
   utils::validation::is_valid_body_field,
 };
 
-#[tracing::instrument(skip(context))]
 pub async fn ban_from_community(
   data: Json<BanFromCommunity>,
   context: Data<LemmyContext>,

crates/api/src/community/block.rs

@@ -15,7 +15,6 @@ use lemmy_db_schema::{
 use lemmy_db_views::structs::{CommunityView, LocalUserView};
 use lemmy_utils::error::{LemmyErrorExt, LemmyErrorType, LemmyResult};
 
-#[tracing::instrument(skip(context))]
 pub async fn user_block_community(
   data: Json<BlockCommunity>,
   context: Data<LemmyContext>,

crates/api/src/community/follow.rs

@@ -17,7 +17,6 @@ use lemmy_db_schema::{
 use lemmy_db_views::structs::{CommunityPersonBanView, CommunityView, LocalUserView};
 use lemmy_utils::error::{LemmyErrorExt, LemmyErrorType, LemmyResult};
 
-#[tracing::instrument(skip(context))]
 pub async fn follow_community(
   data: Json<FollowCommunity>,
   context: Data<LemmyContext>,

crates/api/src/community/hide.rs

@@ -17,7 +17,6 @@ use lemmy_db_schema::{
 use lemmy_db_views::structs::LocalUserView;
 use lemmy_utils::error::{LemmyErrorExt, LemmyErrorType, LemmyResult};
 
-#[tracing::instrument(skip(context))]
 pub async fn hide_community(
   data: Json<HideCommunity>,
   context: Data<LemmyContext>,

crates/api/src/community/random.rs

@@ -13,7 +13,6 @@ use lemmy_db_schema::source::{
 use lemmy_db_views::structs::{CommunityView, LocalUserView};
 use lemmy_utils::error::LemmyResult;
 
-#[tracing::instrument(skip(context))]
 pub async fn get_random_community(
   data: Query<GetRandomCommunity>,
   context: Data<LemmyContext>,

crates/api/src/community/transfer.rs

@@ -20,7 +20,7 @@ use lemmy_utils::{
 
 // TODO: we dont do anything for federation here, it should be updated the next time the community
 //       gets fetched. i hope we can get rid of the community creator role soon.
-#[tracing::instrument(skip(context))]
+
 pub async fn transfer_community(
   data: Json<TransferCommunity>,
   context: Data<LemmyContext>,

crates/api/src/lib.rs

@@ -146,7 +146,6 @@ fn build_totp_2fa(hostname: &str, username: &str, secret: &str) -> LemmyResult<T
 /// So when doing a site ban for a non-local user, you need to federate/send a
 /// community ban for every local community they've participated in.
 /// See https://github.com/LemmyNet/lemmy/issues/4118
-#[tracing::instrument(skip_all)]
 pub(crate) async fn ban_nonlocal_user_from_local_communities(
   local_user_view: &LocalUserView,
   target: &Person,

crates/api/src/local_user/add_admin.rs

@@ -14,7 +14,6 @@ use lemmy_db_schema::{
 use lemmy_db_views::structs::{LocalUserView, PersonView};
 use lemmy_utils::error::{LemmyErrorExt, LemmyErrorType, LemmyResult};
 
-#[tracing::instrument(skip(context))]
 pub async fn add_admin(
   data: Json<AddAdmin>,
   context: Data<LemmyContext>,

crates/api/src/local_user/ban_person.rs

@@ -22,7 +22,6 @@ use lemmy_utils::{
   utils::validation::is_valid_body_field,
 };
 
-#[tracing::instrument(skip(context))]
 pub async fn ban_from_site(
   data: Json<BanPerson>,
   context: Data<LemmyContext>,

crates/api/src/local_user/block.rs

@@ -10,7 +10,6 @@ use lemmy_db_schema::{
 use lemmy_db_views::structs::{LocalUserView, PersonView};
 use lemmy_utils::error::{LemmyErrorExt, LemmyErrorType, LemmyResult};
 
-#[tracing::instrument(skip(context))]
 pub async fn user_block_person(
   data: Json<BlockPerson>,
   context: Data<LemmyContext>,

crates/api/src/local_user/change_password.rs

@@ -13,7 +13,6 @@ use lemmy_db_schema::source::{local_user::LocalUser, login_token::LoginToken};
 use lemmy_db_views::structs::LocalUserView;
 use lemmy_utils::error::{LemmyErrorType, LemmyResult};
 
-#[tracing::instrument(skip(context))]
 pub async fn change_password(
   data: Json<ChangePassword>,
   req: HttpRequest,

crates/api/src/local_user/change_password_after_reset.rs

@@ -12,7 +12,6 @@ use lemmy_db_schema::source::{
 };
 use lemmy_utils::error::{LemmyErrorType, LemmyResult};
 
-#[tracing::instrument(skip(context))]
 pub async fn change_password_after_reset(
   data: Json<PasswordChangeAfterReset>,
   context: Data<LemmyContext>,

crates/api/src/local_user/generate_totp_secret.rs

@@ -11,7 +11,6 @@ use lemmy_utils::error::{LemmyErrorType, LemmyResult};
 
 /// Generate a new secret for two-factor-authentication. Afterwards you need to call [toggle_totp]
 /// to enable it. This can only be called if 2FA is currently disabled.
-#[tracing::instrument(skip(context))]
 pub async fn generate_totp_secret(
   local_user_view: LocalUserView,
   context: Data<LemmyContext>,

crates/api/src/local_user/get_captcha.rs

@@ -20,7 +20,6 @@ use lemmy_db_schema::source::{
 };
 use lemmy_utils::error::LemmyResult;
 
-#[tracing::instrument(skip(context))]
 pub async fn get_captcha(context: Data<LemmyContext>) -> LemmyResult<HttpResponse> {
   let local_site = LocalSite::read(&mut context.pool()).await?;
   let mut res = HttpResponseBuilder::new(StatusCode::OK);

crates/api/src/local_user/list_media.rs

@@ -6,7 +6,6 @@ use lemmy_api_common::{
 use lemmy_db_views::structs::{LocalImageView, LocalUserView};
 use lemmy_utils::error::LemmyResult;
 
-#[tracing::instrument(skip(context))]
 pub async fn list_media(
   data: Query<ListMedia>,
   context: Data<LemmyContext>,

crates/api/src/local_user/list_saved.rs

@@ -11,7 +11,6 @@ use lemmy_db_views::{
 };
 use lemmy_utils::error::LemmyResult;
 
-#[tracing::instrument(skip(context))]
 pub async fn list_person_saved(
   data: Query<ListPersonSaved>,
   context: Data<LemmyContext>,

crates/api/src/local_user/login.rs

@@ -13,7 +13,6 @@ use lemmy_api_common::{
 use lemmy_db_views::structs::{LocalUserView, SiteView};
 use lemmy_utils::error::{LemmyErrorType, LemmyResult};
 
-#[tracing::instrument(skip(context))]
 pub async fn login(
   data: Json<Login>,
   req: HttpRequest,

crates/api/src/local_user/logout.rs

@@ -9,7 +9,6 @@ use lemmy_db_schema::source::login_token::LoginToken;
 use lemmy_db_views::structs::LocalUserView;
 use lemmy_utils::error::{LemmyErrorType, LemmyResult};
 
-#[tracing::instrument(skip(context))]
 pub async fn logout(
   req: HttpRequest,
   // require login

crates/api/src/local_user/notifications/list_inbox.rs

@@ -6,7 +6,6 @@ use lemmy_api_common::{
 use lemmy_db_views::{combined::inbox_combined_view::InboxCombinedQuery, structs::LocalUserView};
 use lemmy_utils::error::LemmyResult;
 
-#[tracing::instrument(skip(context))]
 pub async fn list_inbox(
   data: Query<ListInbox>,
   context: Data<LemmyContext>,

crates/api/src/local_user/notifications/mark_all_read.rs

@@ -9,7 +9,6 @@ use lemmy_db_schema::source::{
 use lemmy_db_views::structs::LocalUserView;
 use lemmy_utils::error::{LemmyErrorExt, LemmyErrorType, LemmyResult};
 
-#[tracing::instrument(skip(context))]
 pub async fn mark_all_notifications_read(
   context: Data<LemmyContext>,
   local_user_view: LocalUserView,

crates/api/src/local_user/notifications/mark_comment_mention_read.rs

@@ -11,7 +11,6 @@ use lemmy_db_schema::{
 use lemmy_db_views::structs::LocalUserView;
 use lemmy_utils::error::{LemmyErrorExt, LemmyErrorType, LemmyResult};
 
-#[tracing::instrument(skip(context))]
 pub async fn mark_comment_mention_as_read(
   data: Json<MarkPersonCommentMentionAsRead>,
   context: Data<LemmyContext>,

crates/api/src/local_user/notifications/mark_post_mention_read.rs

@@ -11,7 +11,6 @@ use lemmy_db_schema::{
 use lemmy_db_views::structs::LocalUserView;
 use lemmy_utils::error::{LemmyErrorExt, LemmyErrorType, LemmyResult};
 
-#[tracing::instrument(skip(context))]
 pub async fn mark_post_mention_as_read(
   data: Json<MarkPersonPostMentionAsRead>,
   context: Data<LemmyContext>,

crates/api/src/local_user/notifications/mark_reply_read.rs

@@ -7,7 +7,6 @@ use lemmy_db_schema::{
 use lemmy_db_views::structs::LocalUserView;
 use lemmy_utils::error::{LemmyErrorExt, LemmyErrorType, LemmyResult};
 
-#[tracing::instrument(skip(context))]
 pub async fn mark_reply_as_read(
   data: Json<MarkCommentReplyAsRead>,
   context: Data<LemmyContext>,

crates/api/src/local_user/notifications/unread_count.rs

@@ -3,7 +3,6 @@ use lemmy_api_common::{context::LemmyContext, person::GetUnreadCountResponse};
 use lemmy_db_views::structs::{InboxCombinedViewInternal, LocalUserView};
 use lemmy_utils::error::LemmyResult;
 
-#[tracing::instrument(skip(context))]
 pub async fn unread_count(
   context: Data<LemmyContext>,
   local_user_view: LocalUserView,

crates/api/src/local_user/report_count.rs

@@ -7,7 +7,6 @@ use lemmy_api_common::{
 use lemmy_db_views::structs::{LocalUserView, ReportCombinedViewInternal};
 use lemmy_utils::error::LemmyResult;
 
-#[tracing::instrument(skip(context))]
 pub async fn report_count(
   data: Query<GetReportCount>,
   context: Data<LemmyContext>,

crates/api/src/local_user/reset_password.rs

@@ -9,7 +9,6 @@ use lemmy_db_views::structs::{LocalUserView, SiteView};
 use lemmy_utils::error::LemmyResult;
 use tracing::error;
 
-#[tracing::instrument(skip(context))]
 pub async fn reset_password(
   data: Json<PasswordReset>,
   context: Data<LemmyContext>,

crates/api/src/local_user/save_settings.rs

@@ -28,7 +28,6 @@ use lemmy_utils::{
 };
 use std::ops::Deref;
 
-#[tracing::instrument(skip(context))]
 pub async fn save_user_settings(
   data: Json<SaveUserSettings>,
   context: Data<LemmyContext>,

crates/api/src/local_user/update_totp.rs

@@ -16,7 +16,6 @@ use lemmy_utils::error::LemmyResult;
 ///
 /// Disabling is only possible if 2FA was previously enabled. Again it is necessary to pass a valid
 /// token.
-#[tracing::instrument(skip(context))]
 pub async fn update_totp(
   data: Json<UpdateTotp>,
   local_user_view: LocalUserView,

crates/api/src/local_user/user_block_instance.rs

@@ -8,7 +8,6 @@ use lemmy_db_schema::{
 use lemmy_db_views::structs::LocalUserView;
 use lemmy_utils::error::{LemmyErrorExt, LemmyErrorType, LemmyResult};
 
-#[tracing::instrument(skip(context))]
 pub async fn user_block_instance(
   data: Json<UserBlockInstanceParams>,
   local_user_view: LocalUserView,

crates/api/src/local_user/validate_auth.rs

@@ -11,7 +11,6 @@ use lemmy_utils::error::{LemmyErrorType, LemmyResult};
 
 /// Returns an error message if the auth token is invalid for any reason. Necessary because other
 /// endpoints silently treat any call with invalid auth as unauthenticated.
-#[tracing::instrument(skip(context))]
 pub async fn validate_auth(
   req: HttpRequest,
   context: Data<LemmyContext>,

crates/api/src/post/feature.rs

@@ -19,7 +19,6 @@ use lemmy_db_schema::{
 use lemmy_db_views::structs::LocalUserView;
 use lemmy_utils::error::LemmyResult;
 
-#[tracing::instrument(skip(context))]
 pub async fn feature_post(
   data: Json<FeaturePost>,
   context: Data<LemmyContext>,

crates/api/src/post/get_link_metadata.rs

@@ -8,7 +8,6 @@ use lemmy_db_views::structs::LocalUserView;
 use lemmy_utils::error::{LemmyErrorExt, LemmyErrorType, LemmyResult};
 use url::Url;
 
-#[tracing::instrument(skip(context))]
 pub async fn get_link_metadata(
   data: Query<GetSiteMetadata>,
   context: Data<LemmyContext>,

crates/api/src/post/hide.rs

@@ -7,7 +7,6 @@ use lemmy_db_schema::source::post::PostHide;
 use lemmy_db_views::structs::{LocalUserView, PostView};
 use lemmy_utils::error::{LemmyErrorExt, LemmyErrorType, LemmyResult};
 
-#[tracing::instrument(skip(context))]
 pub async fn hide_post(
   data: Json<HidePost>,
   context: Data<LemmyContext>,

crates/api/src/post/like.rs

@@ -19,7 +19,6 @@ use lemmy_db_views::structs::{LocalUserView, PostView};
 use lemmy_utils::error::{LemmyErrorExt, LemmyErrorType, LemmyResult};
 use std::ops::Deref;
 
-#[tracing::instrument(skip(context))]
 pub async fn like_post(
   data: Json<CreatePostLike>,
   context: Data<LemmyContext>,

crates/api/src/post/list_post_likes.rs

@@ -9,7 +9,6 @@ use lemmy_db_views::structs::{LocalUserView, VoteView};
 use lemmy_utils::error::LemmyResult;
 
 /// Lists likes for a post
-#[tracing::instrument(skip(context))]
 pub async fn list_post_likes(
   data: Query<ListPostLikes>,
   context: Data<LemmyContext>,

crates/api/src/post/lock.rs

@@ -17,7 +17,6 @@ use lemmy_db_schema::{
 use lemmy_db_views::structs::{LocalUserView, PostView};
 use lemmy_utils::error::LemmyResult;
 
-#[tracing::instrument(skip(context))]
 pub async fn lock_post(
   data: Json<LockPost>,
   context: Data<LemmyContext>,

crates/api/src/post/mark_many_read.rs

@@ -4,7 +4,6 @@ use lemmy_db_schema::source::post::PostRead;
 use lemmy_db_views::structs::LocalUserView;
 use lemmy_utils::error::{LemmyErrorType, LemmyResult, MAX_API_PARAM_ELEMENTS};
 
-#[tracing::instrument(skip(context))]
 pub async fn mark_posts_as_read(
   data: Json<MarkManyPostsAsRead>,
   context: Data<LemmyContext>,

crates/api/src/post/mark_read.rs

@@ -7,7 +7,6 @@ use lemmy_db_schema::source::post::{PostRead, PostReadForm};
 use lemmy_db_views::structs::{LocalUserView, PostView};
 use lemmy_utils::error::LemmyResult;
 
-#[tracing::instrument(skip(context))]
 pub async fn mark_post_as_read(
   data: Json<MarkPostAsRead>,
   context: Data<LemmyContext>,

crates/api/src/post/save.rs

@@ -10,7 +10,6 @@ use lemmy_db_schema::{
 use lemmy_db_views::structs::{LocalUserView, PostView};
 use lemmy_utils::error::{LemmyErrorExt, LemmyErrorType, LemmyResult};
 
-#[tracing::instrument(skip(context))]
 pub async fn save_post(
   data: Json<SavePost>,
   context: Data<LemmyContext>,

crates/api/src/private_message/mark_read.rs

@@ -11,7 +11,6 @@ use lemmy_db_schema::{
 use lemmy_db_views::structs::LocalUserView;
 use lemmy_utils::error::{LemmyErrorExt, LemmyErrorType, LemmyResult};
 
-#[tracing::instrument(skip(context))]
 pub async fn mark_pm_as_read(
   data: Json<MarkPrivateMessageAsRead>,
   context: Data<LemmyContext>,

crates/api/src/reports/comment_report/create.rs

@@ -22,7 +22,6 @@ use lemmy_db_views::structs::{CommentReportView, CommentView, LocalUserView};
 use lemmy_utils::error::{LemmyErrorExt, LemmyErrorType, LemmyResult};
 
 /// Creates a comment report and notifies the moderators of the community
-#[tracing::instrument(skip(context))]
 pub async fn create_comment_report(
   data: Json<CreateCommentReport>,
   context: Data<LemmyContext>,

crates/api/src/reports/comment_report/resolve.rs

@@ -9,7 +9,6 @@ use lemmy_db_views::structs::{CommentReportView, LocalUserView};
 use lemmy_utils::error::{LemmyErrorExt, LemmyErrorType, LemmyResult};
 
 /// Resolves or unresolves a comment report and notifies the moderators of the community
-#[tracing::instrument(skip(context))]
 pub async fn resolve_comment_report(
   data: Json<ResolveCommentReport>,
   context: Data<LemmyContext>,

crates/api/src/reports/post_report/create.rs

@@ -22,7 +22,6 @@ use lemmy_db_views::structs::{LocalUserView, PostReportView, PostView};
 use lemmy_utils::error::{LemmyErrorExt, LemmyErrorType, LemmyResult};
 
 /// Creates a post report and notifies the moderators of the community
-#[tracing::instrument(skip(context))]
 pub async fn create_post_report(
   data: Json<CreatePostReport>,
   context: Data<LemmyContext>,

crates/api/src/reports/post_report/resolve.rs

@@ -9,7 +9,6 @@ use lemmy_db_views::structs::{LocalUserView, PostReportView};
 use lemmy_utils::error::{LemmyErrorExt, LemmyErrorType, LemmyResult};
 
 /// Resolves or unresolves a post report and notifies the moderators of the community
-#[tracing::instrument(skip(context))]
 pub async fn resolve_post_report(
   data: Json<ResolvePostReport>,
   context: Data<LemmyContext>,

crates/api/src/reports/private_message_report/create.rs

@@ -16,7 +16,6 @@ use lemmy_db_schema::{
 use lemmy_db_views::structs::{LocalUserView, PrivateMessageReportView};
 use lemmy_utils::error::{LemmyErrorExt, LemmyErrorType, LemmyResult};
 
-#[tracing::instrument(skip(context))]
 pub async fn create_pm_report(
   data: Json<CreatePrivateMessageReport>,
   context: Data<LemmyContext>,

crates/api/src/reports/private_message_report/resolve.rs

@@ -8,7 +8,6 @@ use lemmy_db_schema::{source::private_message_report::PrivateMessageReport, trai
 use lemmy_db_views::structs::{LocalUserView, PrivateMessageReportView};
 use lemmy_utils::error::{LemmyErrorExt, LemmyErrorType, LemmyResult};
 
-#[tracing::instrument(skip(context))]
 pub async fn resolve_pm_report(
   data: Json<ResolvePrivateMessageReport>,
   context: Data<LemmyContext>,

crates/api/src/reports/report_combined/list.rs

@@ -9,7 +9,6 @@ use lemmy_utils::error::LemmyResult;
 
 /// Lists reports for a community if an id is supplied
 /// or returns all reports for communities a user moderates
-#[tracing::instrument(skip(context))]
 pub async fn list_reports(
   data: Query<ListReports>,
   context: Data<LemmyContext>,

crates/api/src/site/admin_allow_instance.rs

@@ -18,7 +18,6 @@ use lemmy_db_schema::{
 use lemmy_db_views::structs::LocalUserView;
 use lemmy_utils::error::LemmyResult;
 
-#[tracing::instrument(skip(context))]
 pub async fn admin_allow_instance(
   data: Json<AdminAllowInstanceParams>,
   local_user_view: LocalUserView,

crates/api/src/site/admin_block_instance.rs

@@ -18,7 +18,6 @@ use lemmy_db_schema::{
 use lemmy_db_views::structs::LocalUserView;
 use lemmy_utils::error::LemmyResult;
 
-#[tracing::instrument(skip(context))]
 pub async fn admin_block_instance(
   data: Json<AdminBlockInstanceParams>,
   local_user_view: LocalUserView,

crates/api/src/site/federated_instances.rs

@@ -7,7 +7,6 @@ use lemmy_api_common::{
 use lemmy_db_views::structs::SiteView;
 use lemmy_utils::error::LemmyResult;
 
-#[tracing::instrument(skip(context))]
 pub async fn get_federated_instances(
   context: Data<LemmyContext>,
 ) -> LemmyResult<Json<GetFederatedInstancesResponse>> {

crates/api/src/site/leave_admin.rs

@@ -18,7 +18,6 @@ use lemmy_utils::{
   VERSION,
 };
 
-#[tracing::instrument(skip(context))]
 pub async fn leave_admin(
   context: Data<LemmyContext>,
   local_user_view: LocalUserView,

crates/api/src/site/list_all_media.rs

@@ -7,7 +7,6 @@ use lemmy_api_common::{
 use lemmy_db_views::structs::{LocalImageView, LocalUserView};
 use lemmy_utils::error::LemmyResult;
 
-#[tracing::instrument(skip(context))]
 pub async fn list_all_media(
   data: Query<ListMedia>,
   context: Data<LemmyContext>,

crates/api/src/site/mod_log.rs

@@ -8,7 +8,6 @@ use lemmy_db_schema::source::local_site::LocalSite;
 use lemmy_db_views::{combined::modlog_combined_view::ModlogCombinedQuery, structs::LocalUserView};
 use lemmy_utils::error::LemmyResult;
 
-#[tracing::instrument(skip(context))]
 pub async fn get_mod_log(
   data: Query<GetModlog>,
   context: Data<LemmyContext>,

crates/api/src/site/purge/comment.rs

@@ -18,7 +18,6 @@ use lemmy_db_schema::{
 use lemmy_db_views::structs::{CommentView, LocalUserView};
 use lemmy_utils::error::LemmyResult;
 
-#[tracing::instrument(skip(context))]
 pub async fn purge_comment(
   data: Json<PurgeComment>,
   context: Data<LemmyContext>,

crates/api/src/site/purge/community.rs

@@ -20,7 +20,6 @@ use lemmy_db_schema::{
 use lemmy_db_views::structs::{CommunityModeratorView, LocalUserView};
 use lemmy_utils::error::LemmyResult;
 
-#[tracing::instrument(skip(context))]
 pub async fn purge_community(
   data: Json<PurgeCommunity>,
   context: Data<LemmyContext>,

crates/api/src/site/purge/person.rs

@@ -19,7 +19,6 @@ use lemmy_db_schema::{
 use lemmy_db_views::structs::LocalUserView;
 use lemmy_utils::error::LemmyResult;
 
-#[tracing::instrument(skip(context))]
 pub async fn purge_person(
   data: Json<PurgePerson>,
   context: Data<LemmyContext>,

crates/api/src/site/purge/post.rs

@@ -19,7 +19,6 @@ use lemmy_db_schema::{
 use lemmy_db_views::structs::LocalUserView;
 use lemmy_utils::error::LemmyResult;
 
-#[tracing::instrument(skip(context))]
 pub async fn purge_post(
   data: Json<PurgePost>,
   context: Data<LemmyContext>,

crates/api_common/src/build_response.rs

@@ -91,7 +91,7 @@ pub async fn build_post_response(
 }
 
 // TODO: this function is a mess and should be split up to handle email separately
-#[tracing::instrument(skip_all)]
+
 pub async fn send_local_notifs(
   mentions: Vec<MentionData>,
   post_or_comment_id: PostOrCommentId,

crates/api_common/src/request.rs

@@ -49,7 +49,6 @@ pub fn client_builder(settings: &Settings) -> ClientBuilder {
 }
 
 /// Fetches metadata for the given link and optionally generates thumbnail.
-#[tracing::instrument(skip_all)]
 pub async fn fetch_link_metadata(
   url: &Url,
   context: &LemmyContext,
@@ -422,7 +421,6 @@ pub async fn delete_image_from_pictrs(alias: &str, context: &LemmyContext) -> Le
 }
 
 /// Retrieves the image with local pict-rs and generates a thumbnail. Returns the thumbnail url.
-#[tracing::instrument(skip_all)]
 async fn generate_pictrs_thumbnail(image_url: &Url, context: &LemmyContext) -> LemmyResult<Url> {
   let pictrs_config = context.settings().pictrs()?;
 
@@ -476,7 +474,6 @@ async fn generate_pictrs_thumbnail(image_url: &Url, context: &LemmyContext) -> L
 /// Fetches the image details for pictrs proxied images
 ///
 /// We don't need to check for image mode, as that's already been done
-#[tracing::instrument(skip_all)]
 pub async fn fetch_pictrs_proxied_image_details(
   image_url: &Url,
   context: &LemmyContext,
@@ -512,7 +509,7 @@ pub async fn fetch_pictrs_proxied_image_details(
 }
 
 // TODO: get rid of this by reading content type from db
-#[tracing::instrument(skip_all)]
+
 async fn is_image_content_type(client: &ClientWithMiddleware, url: &Url) -> LemmyResult<()> {
   let response = client.get(url.as_str()).send().await?;
   if response

crates/api_common/src/utils.rs

@@ -86,7 +86,6 @@ use webmention::{Webmention, WebmentionError};
 
 pub const AUTH_COOKIE_NAME: &str = "jwt";
 
-#[tracing::instrument(skip_all)]
 pub async fn is_mod_or_admin(
   pool: &mut DbPool<'_>,
   person: &Person,
@@ -96,7 +95,6 @@ pub async fn is_mod_or_admin(
   CommunityView::check_is_mod_or_admin(pool, person.id, community_id).await
 }
 
-#[tracing::instrument(skip_all)]
 pub async fn is_mod_or_admin_opt(
   pool: &mut DbPool<'_>,
   local_user_view: Option<&LocalUserView>,
@@ -116,7 +114,6 @@ pub async fn is_mod_or_admin_opt(
 /// Check that a person is either a mod of any community, or an admin
 ///
 /// Should only be used for read operations
-#[tracing::instrument(skip_all)]
 pub async fn check_community_mod_of_any_or_admin_action(
   local_user_view: &LocalUserView,
   pool: &mut DbPool<'_>,
@@ -154,7 +151,6 @@ pub fn is_top_mod(
 }
 
 /// Updates the read comment count for a post. Usually done when reading or creating a new comment.
-#[tracing::instrument(skip_all)]
 pub async fn update_read_comments(
   person_id: PersonId,
   post_id: PostId,
@@ -285,7 +281,6 @@ pub fn check_comment_deleted_or_removed(comment: &Comment) -> LemmyResult<()> {
   }
 }
 
-#[tracing::instrument(skip_all)]
 pub async fn check_person_instance_community_block(
   my_id: PersonId,
   potential_blocker_id: PersonId,
@@ -299,7 +294,6 @@ pub async fn check_person_instance_community_block(
   Ok(())
 }
 
-#[tracing::instrument(skip_all)]
 pub async fn check_local_vote_mode(
   score: i16,
   post_or_comment_id: PostOrCommentId,
@@ -328,7 +322,6 @@ pub async fn check_local_vote_mode(
 }
 
 /// Dont allow bots to do certain actions, like voting
-#[tracing::instrument(skip_all)]
 pub fn check_bot_account(person: &Person) -> LemmyResult<()> {
   if person.bot_account {
     Err(LemmyErrorType::InvalidBotAction)?
@@ -337,7 +330,6 @@ pub fn check_bot_account(person: &Person) -> LemmyResult<()> {
   }
 }
 
-#[tracing::instrument(skip_all)]
 pub fn check_private_instance(
   local_user_view: &Option<LocalUserView>,
   local_site: &LocalSite,
@@ -350,7 +342,6 @@ pub fn check_private_instance(
 }
 
 /// If private messages are disabled, dont allow them to be sent / received
-#[tracing::instrument(skip_all)]
 pub fn check_private_messages_enabled(local_user_view: &LocalUserView) -> Result<(), LemmyError> {
   if !local_user_view.local_user.enable_private_messages {
     Err(LemmyErrorType::CouldntCreatePrivateMessage)?
@@ -359,7 +350,6 @@ pub fn check_private_messages_enabled(local_user_view: &LocalUserView) -> Result
   }
 }
 
-#[tracing::instrument(skip_all)]
 pub async fn build_federated_instances(
   local_site: &LocalSite,
   pool: &mut DbPool<'_>,
@@ -1037,7 +1027,6 @@ fn limit_expire_time(expires: DateTime<Utc>) -> LemmyResult<Option<DateTime<Utc>
   }
 }
 
-#[tracing::instrument(skip_all)]
 pub fn check_conflicting_like_filters(
   liked_only: Option<bool>,
   disliked_only: Option<bool>,
@@ -1153,7 +1142,6 @@ fn build_proxied_image_url(
   ))
 }
 
-#[tracing::instrument(skip_all)]
 pub async fn local_user_view_from_jwt(
   jwt: &str,
   context: &LemmyContext,

crates/api_crud/Cargo.toml

@@ -20,7 +20,6 @@ lemmy_api_common = { workspace = true, features = ["full"] }
 activitypub_federation = { workspace = true }
 bcrypt = { workspace = true }
 actix-web = { workspace = true }
-tracing = { workspace = true }
 url = { workspace = true }
 futures.workspace = true
 uuid = { workspace = true }

crates/api_crud/src/comment/create.rs

@@ -33,7 +33,6 @@ use lemmy_utils::{
   MAX_COMMENT_DEPTH_LIMIT,
 };
 
-#[tracing::instrument(skip(context))]
 pub async fn create_comment(
   data: Json<CreateComment>,
   context: Data<LemmyContext>,

crates/api_crud/src/comment/delete.rs

@@ -15,7 +15,6 @@ use lemmy_db_schema::{
 use lemmy_db_views::structs::{CommentView, LocalUserView};
 use lemmy_utils::error::{LemmyErrorExt, LemmyErrorType, LemmyResult};
 
-#[tracing::instrument(skip(context))]
 pub async fn delete_comment(
   data: Json<DeleteComment>,
   context: Data<LemmyContext>,

crates/api_crud/src/comment/read.rs

@@ -9,7 +9,6 @@ use lemmy_db_schema::source::local_site::LocalSite;
 use lemmy_db_views::structs::LocalUserView;
 use lemmy_utils::error::LemmyResult;
 
-#[tracing::instrument(skip(context))]
 pub async fn get_comment(
   data: Query<GetComment>,
   context: Data<LemmyContext>,

crates/api_crud/src/comment/remove.rs

@@ -20,7 +20,6 @@ use lemmy_db_schema::{
 use lemmy_db_views::structs::{CommentView, LocalUserView};
 use lemmy_utils::error::{LemmyErrorExt, LemmyErrorType, LemmyResult};
 
-#[tracing::instrument(skip(context))]
 pub async fn remove_comment(
   data: Json<RemoveComment>,
   context: Data<LemmyContext>,

crates/api_crud/src/comment/update.rs

@@ -28,7 +28,6 @@ use lemmy_utils::{
   utils::{mention::scrape_text_for_mentions, validation::is_valid_body_field},
 };
 
-#[tracing::instrument(skip(context))]
 pub async fn update_comment(
   data: Json<EditComment>,
   context: Data<LemmyContext>,

crates/api_crud/src/community/create.rs

@@ -44,7 +44,6 @@ use lemmy_utils::{
   },
 };
 
-#[tracing::instrument(skip(context))]
 pub async fn create_community(
   data: Json<CreateCommunity>,
   context: Data<LemmyContext>,

crates/api_crud/src/community/delete.rs

@@ -14,7 +14,6 @@ use lemmy_db_schema::{
 use lemmy_db_views::structs::{CommunityModeratorView, LocalUserView};
 use lemmy_utils::error::{LemmyErrorExt, LemmyErrorType, LemmyResult};
 
-#[tracing::instrument(skip(context))]
 pub async fn delete_community(
   data: Json<DeleteCommunity>,
   context: Data<LemmyContext>,

crates/api_crud/src/community/list.rs

@@ -10,7 +10,6 @@ use lemmy_db_views::{
 };
 use lemmy_utils::error::LemmyResult;
 
-#[tracing::instrument(skip(context))]
 pub async fn list_communities(
   data: Query<ListCommunities>,
   context: Data<LemmyContext>,

crates/api_crud/src/community/remove.rs

@@ -17,7 +17,6 @@ use lemmy_db_schema::{
 use lemmy_db_views::structs::LocalUserView;
 use lemmy_utils::error::{LemmyErrorExt, LemmyErrorType, LemmyResult};
 
-#[tracing::instrument(skip(context))]
 pub async fn remove_community(
   data: Json<RemoveCommunity>,
   context: Data<LemmyContext>,

crates/api_crud/src/community/update.rs

@@ -29,7 +29,6 @@ use lemmy_utils::{
   utils::{slurs::check_slurs_opt, validation::is_valid_body_field},
 };
 
-#[tracing::instrument(skip(context))]
 pub async fn update_community(
   data: Json<EditCommunity>,
   context: Data<LemmyContext>,

crates/api_crud/src/custom_emoji/create.rs

@@ -15,7 +15,6 @@ use lemmy_db_schema::{
 use lemmy_db_views::structs::{CustomEmojiView, LocalUserView};
 use lemmy_utils::error::LemmyResult;
 
-#[tracing::instrument(skip(context))]
 pub async fn create_custom_emoji(
   data: Json<CreateCustomEmoji>,
   context: Data<LemmyContext>,

crates/api_crud/src/custom_emoji/delete.rs

@@ -10,7 +10,6 @@ use lemmy_db_schema::{source::custom_emoji::CustomEmoji, traits::Crud};
 use lemmy_db_views::structs::LocalUserView;
 use lemmy_utils::error::LemmyResult;
 
-#[tracing::instrument(skip(context))]
 pub async fn delete_custom_emoji(
   data: Json<DeleteCustomEmoji>,
   context: Data<LemmyContext>,

crates/api_crud/src/custom_emoji/list.rs

@@ -3,13 +3,11 @@ use lemmy_api_common::{
   context::LemmyContext,
   custom_emoji::{ListCustomEmojis, ListCustomEmojisResponse},
 };
-use lemmy_db_views::structs::{CustomEmojiView, LocalUserView};
+use lemmy_db_views::structs::CustomEmojiView;
 use lemmy_utils::error::LemmyError;
 
-#[tracing::instrument(skip(context))]
 pub async fn list_custom_emojis(
   data: Query<ListCustomEmojis>,
-  local_user_view: Option<LocalUserView>,
   context: Data<LemmyContext>,
 ) -> Result<Json<ListCustomEmojisResponse>, LemmyError> {
   let custom_emojis = CustomEmojiView::list(

crates/api_crud/src/custom_emoji/update.rs

@@ -15,7 +15,6 @@ use lemmy_db_schema::{
 use lemmy_db_views::structs::{CustomEmojiView, LocalUserView};
 use lemmy_utils::error::LemmyResult;
 
-#[tracing::instrument(skip(context))]
 pub async fn update_custom_emoji(
   data: Json<EditCustomEmoji>,
   context: Data<LemmyContext>,

crates/api_crud/src/oauth_provider/create.rs

@@ -13,7 +13,6 @@ use lemmy_db_views::structs::LocalUserView;
 use lemmy_utils::error::LemmyError;
 use url::Url;
 
-#[tracing::instrument(skip(context))]
 pub async fn create_oauth_provider(
   data: Json<CreateOAuthProvider>,
   context: Data<LemmyContext>,

crates/api_crud/src/oauth_provider/delete.rs

@@ -10,7 +10,6 @@ use lemmy_db_schema::{source::oauth_provider::OAuthProvider, traits::Crud};
 use lemmy_db_views::structs::LocalUserView;
 use lemmy_utils::error::{LemmyError, LemmyErrorExt, LemmyErrorType};
 
-#[tracing::instrument(skip(context))]
 pub async fn delete_oauth_provider(
   data: Json<DeleteOAuthProvider>,
   context: Data<LemmyContext>,

crates/api_crud/src/oauth_provider/update.rs

@@ -10,7 +10,6 @@ use lemmy_db_schema::{
 use lemmy_db_views::structs::LocalUserView;
 use lemmy_utils::error::LemmyError;
 
-#[tracing::instrument(skip(context))]
 pub async fn update_oauth_provider(
   data: Json<EditOAuthProvider>,
   context: Data<LemmyContext>,

crates/api_crud/src/post/create.rs

@@ -43,7 +43,6 @@ use lemmy_utils::{
   },
 };
 
-#[tracing::instrument(skip(context))]
 pub async fn create_post(
   data: Json<CreatePost>,
   context: Data<LemmyContext>,

crates/api_crud/src/post/delete.rs

@@ -17,7 +17,6 @@ use lemmy_db_schema::{
 use lemmy_db_views::structs::LocalUserView;
 use lemmy_utils::error::{LemmyErrorType, LemmyResult};
 
-#[tracing::instrument(skip(context))]
 pub async fn delete_post(
   data: Json<DeletePost>,
   context: Data<LemmyContext>,

crates/api_crud/src/post/read.rs

@@ -17,7 +17,6 @@ use lemmy_db_views::{
 };
 use lemmy_utils::error::{LemmyErrorType, LemmyResult};
 
-#[tracing::instrument(skip(context))]
 pub async fn get_post(
   data: Query<GetPost>,
   context: Data<LemmyContext>,

crates/api_crud/src/post/remove.rs

@@ -20,7 +20,6 @@ use lemmy_db_schema::{
 use lemmy_db_views::structs::LocalUserView;
 use lemmy_utils::error::LemmyResult;
 
-#[tracing::instrument(skip(context))]
 pub async fn remove_post(
   data: Json<RemovePost>,
   context: Data<LemmyContext>,

crates/api_crud/src/post/update.rs

@@ -44,7 +44,6 @@ use lemmy_utils::{
 };
 use std::ops::Deref;
 
-#[tracing::instrument(skip(context))]
 pub async fn update_post(
   data: Json<EditPost>,
   context: Data<LemmyContext>,

crates/api_crud/src/private_message/create.rs

@@ -27,7 +27,6 @@ use lemmy_utils::{
   utils::{markdown::markdown_to_html, validation::is_valid_body_field},
 };
 
-#[tracing::instrument(skip(context))]
 pub async fn create_private_message(
   data: Json<CreatePrivateMessage>,
   context: Data<LemmyContext>,

crates/api_crud/src/private_message/delete.rs

@@ -12,7 +12,6 @@ use lemmy_db_schema::{
 use lemmy_db_views::structs::{LocalUserView, PrivateMessageView};
 use lemmy_utils::error::{LemmyErrorExt, LemmyErrorType, LemmyResult};
 
-#[tracing::instrument(skip(context))]
 pub async fn delete_private_message(
   data: Json<DeletePrivateMessage>,
   context: Data<LemmyContext>,

crates/api_crud/src/private_message/update.rs

@@ -20,7 +20,6 @@ use lemmy_utils::{
   utils::validation::is_valid_body_field,
 };
 
-#[tracing::instrument(skip(context))]
 pub async fn update_private_message(
   data: Json<EditPrivateMessage>,
   context: Data<LemmyContext>,

crates/api_crud/src/site/create.rs

@@ -41,7 +41,6 @@ use lemmy_utils::{
 };
 use url::Url;
 
-#[tracing::instrument(skip(context))]
 pub async fn create_site(
   data: Json<CreateSite>,
   context: Data<LemmyContext>,

crates/api_crud/src/site/read.rs

@@ -12,7 +12,6 @@ use lemmy_db_views::structs::{LocalUserView, PersonView, SiteView};
 use lemmy_utils::{build_cache, error::LemmyResult, CacheLock, VERSION};
 use std::sync::LazyLock;
 
-#[tracing::instrument(skip(context))]
 pub async fn get_site_v3(
   local_user_view: Option<LocalUserView>,
   context: Data<LemmyContext>,
@@ -24,7 +23,6 @@ pub async fn get_site_v3(
   Ok(site)
 }
 
-#[tracing::instrument(skip(context))]
 pub async fn get_site_v4(
   local_user_view: Option<LocalUserView>,
   context: Data<LemmyContext>,

crates/api_crud/src/site/update.rs

@@ -43,7 +43,6 @@ use lemmy_utils::{
   },
 };
 
-#[tracing::instrument(skip(context))]
 pub async fn update_site(
   data: Json<EditSite>,
   context: Data<LemmyContext>,

crates/api_crud/src/tagline/create.rs

@@ -15,7 +15,6 @@ use lemmy_db_schema::{
 use lemmy_db_views::structs::LocalUserView;
 use lemmy_utils::error::LemmyError;
 
-#[tracing::instrument(skip(context))]
 pub async fn create_tagline(
   data: Json<CreateTagline>,
   context: Data<LemmyContext>,

crates/api_crud/src/tagline/delete.rs

@@ -10,7 +10,6 @@ use lemmy_db_schema::{source::tagline::Tagline, traits::Crud};
 use lemmy_db_views::structs::LocalUserView;
 use lemmy_utils::error::LemmyError;
 
-#[tracing::instrument(skip(context))]
 pub async fn delete_tagline(
   data: Json<DeleteTagline>,
   context: Data<LemmyContext>,

crates/api_crud/src/tagline/list.rs

@@ -4,13 +4,10 @@ use lemmy_api_common::{
   tagline::{ListTaglines, ListTaglinesResponse},
 };
 use lemmy_db_schema::source::tagline::Tagline;
-use lemmy_db_views::structs::LocalUserView;
 use lemmy_utils::error::LemmyError;
 
-#[tracing::instrument(skip(context))]
 pub async fn list_taglines(
   data: Query<ListTaglines>,
-  local_user_view: Option<LocalUserView>,
   context: Data<LemmyContext>,
 ) -> Result<Json<ListTaglinesResponse>, LemmyError> {
   let taglines = Tagline::list(&mut context.pool(), data.page, data.limit).await?;

crates/api_crud/src/tagline/update.rs

@@ -16,7 +16,6 @@ use lemmy_db_schema::{
 use lemmy_db_views::structs::LocalUserView;
 use lemmy_utils::error::LemmyError;
 
-#[tracing::instrument(skip(context))]
 pub async fn update_tagline(
   data: Json<UpdateTagline>,
   context: Data<LemmyContext>,