From 4afd138bea5ef02265a87cd697d33807acbabe2f Mon Sep 17 00:00:00 2001
From: Piotr Orzechowski <piotr@orzechowski.tech>
Date: Sat, 13 Apr 2024 07:57:44 +0200
Subject: [PATCH] Add missing instrumentation and skip messages field

---
 src/routes/admin/newsletters/get.rs  | 1 +
 src/routes/admin/newsletters/post.rs | 2 +-
 src/routes/admin/password/get.rs     | 1 +
 src/routes/admin/password/post.rs    | 2 +-
 src/routes/login/get.rs              | 2 +-
 5 files changed, 5 insertions(+), 3 deletions(-)

diff --git a/src/routes/admin/newsletters/get.rs b/src/routes/admin/newsletters/get.rs
index 55a6899..d380752 100644
--- a/src/routes/admin/newsletters/get.rs
+++ b/src/routes/admin/newsletters/get.rs
@@ -1,6 +1,7 @@
 use askama_axum::Template;
 use axum_messages::Messages;
 
+#[tracing::instrument(name = "Get newsletter form", skip(messages))]
 pub(in crate::routes::admin) async fn newsletter_form(
     messages: Messages,
 ) -> NewsletterForm<'static> {
diff --git a/src/routes/admin/newsletters/post.rs b/src/routes/admin/newsletters/post.rs
index 24c8b1d..ce68a70 100644
--- a/src/routes/admin/newsletters/post.rs
+++ b/src/routes/admin/newsletters/post.rs
@@ -9,7 +9,7 @@ use axum_messages::Messages;
 use serde::Deserialize;
 use sqlx::PgPool;
 
-#[tracing::instrument(skip(app_state, form))]
+#[tracing::instrument(skip(app_state, messages, form))]
 pub(in crate::routes::admin) async fn publish_newsletter(
     State(app_state): State<AppState>,
     messages: Messages,
diff --git a/src/routes/admin/password/get.rs b/src/routes/admin/password/get.rs
index 67e6a35..7f09e0c 100644
--- a/src/routes/admin/password/get.rs
+++ b/src/routes/admin/password/get.rs
@@ -1,6 +1,7 @@
 use askama_axum::Template;
 use axum_messages::Messages;
 
+#[tracing::instrument(name = "Get change password form", skip(messages))]
 pub(in crate::routes::admin) async fn change_password_form(
     messages: Messages,
 ) -> ChangePasswordForm<'static> {
diff --git a/src/routes/admin/password/post.rs b/src/routes/admin/password/post.rs
index a813a29..cff0c1a 100644
--- a/src/routes/admin/password/post.rs
+++ b/src/routes/admin/password/post.rs
@@ -14,7 +14,7 @@ use axum_messages::Messages;
 use secrecy::{ExposeSecret, Secret};
 use serde::Deserialize;
 
-#[tracing::instrument(skip(app_state, user_id, form))]
+#[tracing::instrument(skip(app_state, user_id, messages, form))]
 pub(in crate::routes::admin) async fn change_password(
     State(app_state): State<AppState>,
     SessionUserId(user_id): SessionUserId,
diff --git a/src/routes/login/get.rs b/src/routes/login/get.rs
index 698b809..8b0cd46 100644
--- a/src/routes/login/get.rs
+++ b/src/routes/login/get.rs
@@ -1,7 +1,7 @@
 use askama_axum::Template;
 use axum_messages::Messages;
 
-#[tracing::instrument(skip(messages))]
+#[tracing::instrument(name = "Get login form", skip(messages))]
 pub(super) async fn login_form(messages: Messages) -> LoginForm<'static> {
     let flashes = messages.map(|m| m.message).collect();