Update telemetry

Cargo.lock

@@ -17,19 +17,6 @@ version = "2.0.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "320119579fcad9c21884f5c4861d16174d0e06250625266f50fe6898340abefa"
 
-[[package]]
-name = "ahash"
-version = "0.8.12"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "5a15f179cd60c4584b8a8c596927aadc462e27f2ca70c04e0071964a73ba7a75"
-dependencies = [
- "cfg-if",
- "getrandom 0.3.3",
- "once_cell",
- "version_check",
- "zerocopy",
-]
-
 [[package]]
 name = "aho-corasick"
 version = "1.1.3"
@@ -966,16 +953,6 @@ dependencies = [
  "version_check",
 ]
 
-[[package]]
-name = "gethostname"
-version = "0.2.3"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "c1ebd34e35c46e00bb73e81363248d627782724609fe1b6396f553f68fe3862e"
-dependencies = [
- "libc",
- "winapi",
-]
-
 [[package]]
 name = "getrandom"
 version = "0.2.16"
@@ -3158,24 +3135,6 @@ dependencies = [
  "syn",
 ]
 
-[[package]]
-name = "tracing-bunyan-formatter"
-version = "0.3.10"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "2d637245a0d8774bd48df6482e086c59a8b5348a910c3b0579354045a9d82411"
-dependencies = [
- "ahash",
- "gethostname",
- "log",
- "serde",
- "serde_json",
- "time",
- "tracing",
- "tracing-core",
- "tracing-log 0.1.4",
- "tracing-subscriber",
-]
-
 [[package]]
 name = "tracing-core"
 version = "0.1.34"
@@ -3186,17 +3145,6 @@ dependencies = [
  "valuable",
 ]
 
-[[package]]
-name = "tracing-log"
-version = "0.1.4"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "f751112709b4e791d8ce53e32c4ed2d353565a795ce84da2285393f41557bdf2"
-dependencies = [
- "log",
- "once_cell",
- "tracing-core",
-]
-
 [[package]]
 name = "tracing-log"
 version = "0.2.0"
@@ -3223,7 +3171,7 @@ dependencies = [
  "thread_local",
  "tracing",
  "tracing-core",
- "tracing-log 0.2.0",
+ "tracing-log",
 ]
 
 [[package]]
@@ -3884,7 +3832,6 @@ dependencies = [
  "tower-sessions",
  "tower-sessions-redis-store",
  "tracing",
- "tracing-bunyan-formatter",
  "tracing-subscriber",
  "unicode-segmentation",
  "urlencoding",

Cargo.toml

@@ -44,7 +44,6 @@ tower-http = { version = "0.6.6", features = ["fs", "trace"] }
 tower-sessions = "0.14.0"
 tower-sessions-redis-store = "0.16.0"
 tracing = "0.1.41"
-tracing-bunyan-formatter = "0.3.10"
 tracing-subscriber = { version = "0.3.19", features = ["env-filter"] }
 unicode-segmentation = "1.12.0"
 urlencoding = "2.1.3"

src/authentication.rs

@@ -56,10 +56,7 @@ fn compute_pasword_hash(password: SecretString) -> Result<SecretString, anyhow::
     Ok(SecretString::from(password_hash))
 }
 
-#[tracing::instrument(
+#[tracing::instrument(name = "Validate credentials", skip_all)]
-    name = "Validate credentials",
-    skip(username, password, connection_pool)
-)]
 pub async fn validate_credentials(
     Credentials { username, password }: Credentials,
     connection_pool: &PgPool,
@@ -97,10 +94,7 @@ CWOrkoo7oJBQ/iyh7uJ0LO2aLEfrHwTWllSAxT0zRno"
         .map(|_| uuid)
 }
 
-#[tracing::instrument(
+#[tracing::instrument(name = "Verify password", skip_all)]
-    name = "Verify password",
-    skip(expected_password_hash, password_candidate)
-)]
 fn verify_password_hash(
     expected_password_hash: SecretString,
     password_candidate: SecretString,
@@ -115,7 +109,7 @@ fn verify_password_hash(
         .context("Password verification failed.")
 }
 
-#[tracing::instrument(name = "Get stored credentials", skip(username, connection_pool))]
+#[tracing::instrument(name = "Get stored credentials", skip(connection_pool))]
 async fn get_stored_credentials(
     username: &str,
     connection_pool: &PgPool,

src/idempotency/key.rs

@@ -1,3 +1,4 @@
+#[derive(Debug)]
 pub struct IdempotencyKey(String);
 
 impl TryFrom<String> for IdempotencyKey {

src/idempotency/persistance.rs

@@ -16,6 +16,10 @@ struct HeaderPairRecord {
     value: Vec<u8>,
 }
 
+#[tracing::instrument(
+    name = "Fetching saved response in database if it exists",
+    skip(connection_pool)
+)]
 pub async fn get_saved_response(
     connection_pool: &PgPool,
     idempotency_key: &IdempotencyKey,
@@ -53,6 +57,7 @@ pub async fn get_saved_response(
     }
 }
 
+#[tracing::instrument(name = "Saving response in database", skip(transaction, response))]
 pub async fn save_response(
     mut transaction: Transaction<'static, Postgres>,
     idempotency_key: &IdempotencyKey,

src/issue_delivery_worker.rs

@@ -56,7 +56,7 @@ pub async fn try_execute_task(
             let mut issue = get_issue(connection_pool, task.newsletter_issue_id).await?;
             issue.inject_unsubscribe_token(&task.unsubscribe_token);
             if task.kind == EmailType::NewPost.to_string() {
-                issue.create_tracking_info(&mut transaction).await?;
+                issue.inject_tracking_info(&mut transaction).await?;
             }
             if let Err(e) = email_client
                 .send_email(
@@ -68,14 +68,14 @@ pub async fn try_execute_task(
                 .await
             {
                 tracing::error!(
-                    error.message = %e,
+                    error = %e,
                     "Failed to deliver issue to confirmed subscriber. Skipping."
                 );
             }
         }
         Err(e) => {
             tracing::error!(
-                error.message = %e,
+                error = %e,
                 "Skipping a subscriber. Their stored contact details are invalid."
             );
         }
@@ -103,7 +103,7 @@ impl NewsletterIssue {
         self.html_content = self.html_content.replace("UNSUBSCRIBE_TOKEN", token);
     }
 
-    async fn create_tracking_info(
+    async fn inject_tracking_info(
         &mut self,
         transaction: &mut Transaction<'static, Postgres>,
     ) -> Result<(), anyhow::Error> {
@@ -126,7 +126,6 @@ impl NewsletterIssue {
     }
 }
 
-#[tracing::instrument(skip_all)]
 async fn get_issue(
     connection_pool: &PgPool,
     issue_id: Uuid,
@@ -152,7 +151,6 @@ pub struct Task {
     pub kind: String,
 }
 
-#[tracing::instrument(skip_all)]
 async fn dequeue_task(
     connection_pool: &PgPool,
 ) -> Result<Option<(Transaction<'static, Postgres>, Task)>, anyhow::Error> {
@@ -180,7 +178,6 @@ async fn dequeue_task(
     }
 }
 
-#[tracing::instrument(skip_all)]
 async fn delete_task(
     mut transaction: Transaction<'static, Postgres>,
     issue_id: Uuid,

src/routes.rs

@@ -160,12 +160,12 @@ impl From<AuthError> for AppError {
 }
 
 pub async fn not_found() -> Response {
-    (StatusCode::NOT_FOUND, not_found_html()).into_response()
+    not_found_html()
 }
 
 pub fn not_found_html() -> Response {
     let template = HtmlTemplate(NotFoundTemplate);
-    template.into_response()
+    (StatusCode::NOT_FOUND, template).into_response()
 }
 
 pub struct Path<T>(T);

src/routes/admin.rs

@@ -25,7 +25,7 @@ pub enum AdminError {
     #[error("Trying to access admin dashboard without authentication.")]
     NotAuthenticated,
     #[error("Updating password failed.")]
-    ChangePassword(String),
+    ChangePassword(anyhow::Error),
     #[error("Could not publish newsletter.")]
     Publish(#[source] anyhow::Error),
     #[error("The idempotency key was invalid.")]

src/routes/admin/change_password.rs

@@ -31,16 +31,16 @@ pub async fn change_password(
         password: form.current_password,
     };
     if form.new_password.expose_secret() != form.new_password_check.expose_secret() {
-        Err(AdminError::ChangePassword(
+        Err(AdminError::ChangePassword(anyhow::anyhow!(
-            "You entered two different passwords - the field values must match.".to_string(),
+            "You entered two different passwords - the field values must match."
-        )
+        ))
         .into())
     } else if let Err(e) = validate_credentials(credentials, &connection_pool).await {
         match e {
             AuthError::UnexpectedError(error) => Err(AdminError::UnexpectedError(error).into()),
-            AuthError::InvalidCredentials(_) => Err(AdminError::ChangePassword(
+            AuthError::InvalidCredentials(_) => Err(AdminError::ChangePassword(anyhow::anyhow!(
-                "The current password is incorrect.".to_string(),
+                "The current password is incorrect."
-            )
+            ))
             .into()),
         }
     } else if let Err(e) = verify_password(form.new_password.expose_secret()) {
@@ -48,7 +48,7 @@ pub async fn change_password(
     } else {
         authentication::change_password(user_id, form.new_password, &connection_pool)
             .await
-            .map_err(|e| AdminError::ChangePassword(e.to_string()))?;
+            .map_err(AdminError::ChangePassword)?;
         let template = MessageTemplate::Success {
             message: "Your password has been changed.".to_string(),
         };
@@ -56,9 +56,9 @@ pub async fn change_password(
     }
 }
 
-fn verify_password(password: &str) -> Result<(), String> {
+fn verify_password(password: &str) -> Result<(), anyhow::Error> {
     if password.len() < 12 || password.len() > 128 {
-        return Err("The password must contain between 12 and 128 characters.".into());
+        anyhow::bail!("The password must contain between 12 and 128 characters.");
     }
     Ok(())
 }

src/routes/admin/dashboard.rs

@@ -57,6 +57,7 @@ pub async fn admin_dashboard(
     Ok(Html(template.render().unwrap()).into_response())
 }
 
+#[tracing::instrument("Computing dashboard stats", skip_all)]
 async fn get_stats(connection_pool: &PgPool) -> Result<DashboardStats, anyhow::Error> {
     let subscribers =
         sqlx::query_scalar!("SELECT count(*) FROM subscriptions WHERE status = 'confirmed'")

src/routes/admin/newsletters.rs

@@ -1,5 +1,3 @@
-use std::fmt::Display;
-
 use crate::{
     authentication::AuthenticatedUser,
     idempotency::{IdempotencyKey, save_response, try_processing},
@@ -15,6 +13,7 @@ use axum::{
     response::{Html, IntoResponse, Response},
 };
 use sqlx::{Executor, Postgres, Transaction};
+use std::fmt::Display;
 use uuid::Uuid;
 
 #[derive(serde::Deserialize)]
@@ -25,13 +24,14 @@ pub struct BodyData {
     idempotency_key: String,
 }
 
-#[tracing::instrument(skip_all)]
+#[tracing::instrument(name = "Creating newsletter isue", skip_all, fields(issue_id = tracing::field::Empty))]
 pub async fn insert_newsletter_issue(
     transaction: &mut Transaction<'static, Postgres>,
     title: &str,
     email_template: &dyn EmailTemplate,
 ) -> Result<Uuid, sqlx::Error> {
     let newsletter_issue_id = Uuid::new_v4();
+    tracing::Span::current().record("issue_id", newsletter_issue_id.to_string());
     let query = sqlx::query!(
         r#"
         INSERT INTO newsletter_issues (
@@ -48,6 +48,7 @@ pub async fn insert_newsletter_issue(
     Ok(newsletter_issue_id)
 }
 
+#[derive(Debug)]
 pub enum EmailType {
     NewPost,
     Newsletter,
@@ -62,7 +63,7 @@ impl Display for EmailType {
     }
 }
 
-#[tracing::instrument(skip_all)]
+#[tracing::instrument(name = "Adding new task to queue", skip(transaction))]
 pub async fn enqueue_delivery_tasks(
     transaction: &mut Transaction<'static, Postgres>,
     newsletter_issue_id: Uuid,
@@ -87,7 +88,7 @@ pub async fn enqueue_delivery_tasks(
     Ok(())
 }
 
-#[tracing::instrument(name = "Publishing a newsletter", skip(connection_pool, form))]
+#[tracing::instrument(name = "Publishing a newsletter", skip_all, fields(title = %form.title))]
 pub async fn publish_newsletter(
     State(AppState {
         connection_pool,
@@ -134,12 +135,12 @@ pub async fn publish_newsletter(
     Ok(response)
 }
 
-fn validate_form(form: &BodyData) -> Result<(), &'static str> {
+fn validate_form(form: &BodyData) -> Result<(), anyhow::Error> {
     if form.title.is_empty() {
-        return Err("The title was empty.");
+        anyhow::bail!("The title was empty.");
     }
     if form.html.is_empty() || form.text.is_empty() {
-        return Err("The content was empty.");
+        anyhow::bail!("The content was empty.");
     }
     Ok(())
 }

src/routes/admin/posts.rs

@@ -33,7 +33,11 @@ fn validate_form(form: &CreatePostForm) -> Result<(), anyhow::Error> {
     }
 }
 
-#[tracing::instrument(name = "Creating a post", skip(connection_pool, form))]
+#[tracing::instrument(
+    name = "Publishing new blog post",
+    skip(connection_pool, base_url, form)
+    fields(title = %form.title)
+)]
 pub async fn create_post(
     State(AppState {
         connection_pool,
@@ -79,10 +83,7 @@ pub async fn create_post(
     Ok(response)
 }
 
-#[tracing::instrument(
+#[tracing::instrument(name = "Saving new blog post in the database", skip_all)]
-    name = "Saving new post in the database",
-    skip(transaction, title, content, author)
-)]
 pub async fn insert_post(
     transaction: &mut Transaction<'static, Postgres>,
     title: &str,
@@ -105,10 +106,7 @@ pub async fn insert_post(
     Ok(post_id)
 }
 
-#[tracing::instrument(
+#[tracing::instrument(name = "Creating newsletter for new post", skip_all)]
-    name = "Creating newsletter for new post",
-    skip(transaction, post_title, post_id)
-)]
 pub async fn create_newsletter(
     transaction: &mut Transaction<'static, Postgres>,
     base_url: &str,

src/routes/admin/subscribers.rs

@@ -15,6 +15,10 @@ use uuid::Uuid;
 
 const SUBS_PER_PAGE: i64 = 5;
 
+#[tracing::instrument(
+    name = "Retrieving most recent subscribers from database",
+    skip(connection_pool)
+)]
 pub async fn get_subscribers_page(
     State(AppState {
         connection_pool, ..
@@ -38,34 +42,52 @@ pub async fn get_subscribers_page(
     Ok(Html(template.render().unwrap()).into_response())
 }
 
+#[tracing::instrument(
+    name = "Deleting subscriber from database",
+    skip(connection_pool),
+    fields(email=tracing::field::Empty)
+)]
 pub async fn delete_subscriber(
     State(AppState {
         connection_pool, ..
     }): State<AppState>,
     Path(subscriber_id): Path<Uuid>,
 ) -> Result<Response, AppError> {
-    let res = sqlx::query!("DELETE FROM subscriptions WHERE id = $1", subscriber_id)
+    let res = sqlx::query!(
-        .execute(&connection_pool)
+        "DELETE FROM subscriptions WHERE id = $1 RETURNING email",
-        .await
+        subscriber_id
-        .context("Failed to delete subscriber from database.")
+    )
-        .map_err(AppError::unexpected_message)?;
+    .fetch_optional(&connection_pool)
-    if res.rows_affected() > 1 {
+    .await
+    .context("Failed to delete subscriber from database.")
+    .map_err(AppError::unexpected_message)?;
+    if let Some(record) = res {
+        tracing::Span::current().record("email", tracing::field::display(&record.email));
+        let template = MessageTemplate::Success {
+            message: format!(
+                "The subscriber with email '{}' has been deleted.",
+                record.email
+            ),
+        };
+        Ok(template.render().unwrap().into_response())
+    } else {
         Err(AppError::unexpected_message(anyhow::anyhow!(
             "We could not find the subscriber in the database."
         )))
-    } else {
-        let template = MessageTemplate::Success {
-            message: "The subscriber has been deleted.".into(),
-        };
-        Ok(template.render().unwrap().into_response())
     }
 }
 
+#[tracing::instrument(
+    name = "Retrieving next subscribers in database",
+    skip(connection_pool),
+    fields(offset = tracing::field::Empty)
+)]
 pub async fn get_subs(
     connection_pool: &PgPool,
     page: i64,
 ) -> Result<Vec<SubscriberEntry>, sqlx::Error> {
     let offset = (page - 1) * SUBS_PER_PAGE;
+    tracing::Span::current().record("offset", tracing::field::display(&offset));
     let subscribers = sqlx::query_as!(
         SubscriberEntry,
         "SELECT * FROM subscriptions ORDER BY subscribed_at DESC LIMIT $1 OFFSET $2",

src/routes/health_check.rs

@@ -1,5 +1,5 @@
-use axum::{http::StatusCode, response::IntoResponse};
+use axum::http::StatusCode;
 
-pub async fn health_check() -> impl IntoResponse {
+pub async fn health_check() -> StatusCode {
     StatusCode::OK
 }

src/routes/home.rs

@@ -1,8 +1,7 @@
-use askama::Template;
+use crate::templates::{HomeTemplate, HtmlTemplate};
-use axum::response::Html;
+use axum::response::{IntoResponse, Response};
 
-use crate::templates::HomeTemplate;
+pub async fn home() -> Response {
-
+    let template = HtmlTemplate(HomeTemplate);
-pub async fn home() -> Html<String> {
+    template.into_response()
-    Html(HomeTemplate.render().unwrap())
 }

src/routes/login.rs

@@ -35,6 +35,7 @@ pub async fn get_login(session: TypedSession) -> Result<Response, AppError> {
     }
 }
 
+#[tracing::instrument(name = "Authenticating user", skip_all, fields(name = %form.username))]
 pub async fn post_login(
     session: TypedSession,
     State(AppState {

src/routes/posts.rs

@@ -15,6 +15,7 @@ use uuid::Uuid;
 
 const NUM_PER_PAGE: i64 = 3;
 
+#[tracing::instrument(name = "Fetching most recent posts from database", skip_all)]
 pub async fn list_posts(
     State(AppState {
         connection_pool, ..
@@ -67,6 +68,7 @@ pub struct PostParams {
     origin: Option<Uuid>,
 }
 
+#[tracing::instrument(name = "Fetching post from database", skip(connection_pool, origin))]
 pub async fn see_post(
     State(AppState {
         connection_pool, ..
@@ -94,6 +96,7 @@ pub async fn see_post(
     }
 }
 
+#[tracing::instrument(name = "Mark email notification as opened", skip(connection_pool))]
 async fn mark_email_as_opened(connection_pool: &PgPool, email_id: Uuid) -> Result<(), AppError> {
     sqlx::query!(
         "UPDATE notifications_delivered SET opened = TRUE WHERE email_id = $1",
@@ -129,6 +132,7 @@ pub struct LoadMoreParams {
     page: i64,
 }
 
+#[tracing::instrument(name = "Fetching next posts in the database", skip(connection_pool))]
 pub async fn load_more(
     State(AppState {
         connection_pool, ..

src/routes/subscriptions.rs

@@ -19,9 +19,9 @@ use uuid::Uuid;
 
 #[tracing::instrument(
     name = "Adding a new subscriber",
-    skip(connection_pool, email_client, base_url, form),
+    skip_all,
     fields(
-        subscriber_email = %form.email,
+        email = %form.email,
     )
 )]
 pub async fn subscribe(
@@ -72,10 +72,7 @@ pub async fn subscribe(
     Ok(Html(template.render().unwrap()).into_response())
 }
 
-#[tracing::instrument(
+#[tracing::instrument(name = "Saving new subscriber details in the database", skip_all)]
-    name = "Saving new subscriber details in the database",
-    skip(transaction, new_subscriber)
-)]
 pub async fn insert_subscriber(
     transaction: &mut Transaction<'_, Postgres>,
     new_subscriber: &NewSubscriber,
@@ -123,10 +120,7 @@ async fn store_token(
     Ok(())
 }
 
-#[tracing::instrument(
+#[tracing::instrument(name = "Send confirmation email to the new subscriber", skip_all)]
-    name = "Send a confirmation email to a new subscriber",
-    skip(email_client, new_subscriber, base_url, subscription_token)
-)]
 pub async fn send_confirmation_email(
     email_client: &EmailClient,
     new_subscriber: &NewSubscriber,

src/routes/subscriptions_confirm.rs

@@ -1,48 +1,39 @@
 use crate::{
-    routes::{Query, generate_token},
+    routes::{AppError, Query, generate_token, not_found_html},
     startup::AppState,
-    templates::ConfirmTemplate,
+    templates::{ConfirmTemplate, HtmlTemplate},
 };
-use askama::Template;
+use anyhow::Context;
 use axum::{
     extract::State,
-    http::StatusCode,
+    response::{IntoResponse, Response},
-    response::{Html, IntoResponse, Response},
 };
 use serde::Deserialize;
 use sqlx::PgPool;
 use uuid::Uuid;
 
-#[tracing::instrument(name = "Confirming new subscriber", skip(params))]
+#[tracing::instrument(name = "Confirming new subscriber", skip_all)]
 pub async fn confirm(
     State(AppState {
         connection_pool, ..
     }): State<AppState>,
     Query(params): Query<Params>,
-) -> Response {
+) -> Result<Response, AppError> {
-    let Ok(subscriber_id) =
+    let subscriber_id = get_subscriber_id_from_token(&connection_pool, &params.subscription_token)
-        get_subscriber_id_from_token(&connection_pool, &params.subscription_token).await
+        .await
-    else {
+        .context("Could not fetch subscriber id given subscription token.")?;
-        return StatusCode::INTERNAL_SERVER_ERROR.into_response();
+    if let Some(id) = subscriber_id {
-    };
+        confirm_subscriber(&connection_pool, &id)
-    if let Some(subscriber_id) = subscriber_id {
-        if confirm_subscriber(&connection_pool, &subscriber_id)
             .await
-            .is_err()
+            .context("Failed to update subscriber status.")?;
-        {
+        let template = HtmlTemplate(ConfirmTemplate);
-            StatusCode::INTERNAL_SERVER_ERROR.into_response()
+        Ok(template.into_response())
-        } else {
-            Html(ConfirmTemplate.render().unwrap()).into_response()
-        }
     } else {
-        StatusCode::UNAUTHORIZED.into_response()
+        Ok(not_found_html())
     }
 }
 
-#[tracing::instrument(
+#[tracing::instrument(name = "Mark subscriber as confirmed", skip(connection_pool))]
-    name = "Mark subscriber as confirmed",
-    skip(connection_pool, subscriber_id)
-)]
 async fn confirm_subscriber(
     connection_pool: &PgPool,
     subscriber_id: &Uuid,
@@ -53,18 +44,11 @@ async fn confirm_subscriber(
         subscriber_id
     )
     .execute(connection_pool)
-    .await
+    .await?;
-    .map_err(|e| {
-        tracing::error!("Failed to execute query: {:?}", e);
-        e
-    })?;
     Ok(())
 }
 
-#[tracing::instrument(
+#[tracing::instrument(name = "Get subscriber id from token", skip(connection))]
-    name = "Get subscriber_id from token",
-    skip(connection, subscription_token)
-)]
 async fn get_subscriber_id_from_token(
     connection: &PgPool,
     subscription_token: &str,
@@ -74,11 +58,7 @@ async fn get_subscriber_id_from_token(
         subscription_token
     )
     .fetch_optional(connection)
-    .await
+    .await?;
-    .map_err(|e| {
-        tracing::error!("Failed to execute query: {:?}", e);
-        e
-    })?;
     Ok(saved.map(|r| r.subscriber_id))
 }
 

src/routes/unsubscribe.rs

@@ -31,6 +31,10 @@ pub struct UnsubFormData {
     email: String,
 }
 
+#[tracing::instrument(
+    name = "Removing subscriber from database",
+    skip(connection_pool, email_client, base_url)
+)]
 pub async fn post_unsubscribe(
     State(AppState {
         connection_pool,
@@ -54,7 +58,7 @@ pub async fn post_unsubscribe(
     Ok(Html(template.render().unwrap()).into_response())
 }
 
-#[tracing::instrument(name = "Fetching unsubscribe token from the database", skip_all)]
+#[tracing::instrument(name = "Fetching unsubscribe token from database", skip_all)]
 async fn fetch_unsubscribe_token(
     connection_pool: &PgPool,
     subscriber_email: &SubscriberEmail,
@@ -69,7 +73,7 @@ async fn fetch_unsubscribe_token(
     Ok(r.and_then(|r| r.unsubscribe_token))
 }
 
-#[tracing::instrument(name = "Send an unsubscribe confirmation email", skip_all)]
+#[tracing::instrument(name = "Send an confirmation email", skip_all)]
 pub async fn send_unsubscribe_email(
     email_client: &EmailClient,
     subscriber_email: &SubscriberEmail,
@@ -102,7 +106,7 @@ If you did not request this, you can safely ignore this email."#,
         .await
 }
 
-#[tracing::instrument(name = "Removing user from database if he exists", skip_all)]
+#[tracing::instrument(name = "Removing user from database", skip(connection_pool))]
 pub async fn unsubscribe_confirm(
     Query(UnsubQueryParams { token }): Query<UnsubQueryParams>,
     State(AppState {

src/startup.rs

@@ -87,7 +87,7 @@ impl Application {
     }
 
     pub async fn run_until_stopped(self) -> Result<(), std::io::Error> {
-        tracing::debug!("Listening on {}", self.local_addr());
+        tracing::debug!("listening on {}", self.local_addr());
         if let Some(tls_config) = self.tls_config {
             axum_server::from_tcp_rustls(self.listener, tls_config)
                 .serve(self.router.into_make_service())
@@ -156,7 +156,6 @@ pub fn app(
                     method = ?request.method(),
                     matched_path,
                     request_id,
-                    some_other_field = tracing::field::Empty,
                 )
             }),
         )
@@ -178,7 +177,7 @@ pub async fn favicon() -> Response {
                 .unwrap()
         }
         Err(e) => {
-            tracing::error!("Error while reading favicon.ico: {}", e);
+            tracing::error!(error = %e, "Error while reading favicon.ico.");
             StatusCode::NOT_FOUND.into_response()
         }
     }

src/telemetry.rs

@@ -1,12 +1,14 @@
 use tokio::task::JoinHandle;
-use tracing_bunyan_formatter::{BunyanFormattingLayer, JsonStorageLayer};
+use tracing_subscriber::{
-use tracing_subscriber::{fmt::MakeWriter, layer::SubscriberExt, util::SubscriberInitExt};
+    fmt::{MakeWriter, format::FmtSpan},
+    layer::SubscriberExt,
+    util::SubscriberInitExt,
+};
 
 pub fn init_subscriber<Sink>(sink: Sink)
 where
     Sink: for<'a> MakeWriter<'a> + Send + Sync + 'static,
 {
-    let formatting_layer = BunyanFormattingLayer::new(env!("CARGO_CRATE_NAME").into(), sink);
     tracing_subscriber::registry()
         .with(
             tracing_subscriber::EnvFilter::try_from_default_env().unwrap_or_else(|_| {
@@ -17,8 +19,12 @@ where
                 .into()
             }),
         )
-        .with(JsonStorageLayer)
+        .with(
-        .with(formatting_layer)
+            tracing_subscriber::fmt::layer()
+                .pretty()
+                .with_writer(sink)
+                .with_span_events(FmtSpan::NEW | FmtSpan::CLOSE),
+        )
         .init();
 }
 

tests/api/subscriptions_confirm.rs

@@ -3,13 +3,13 @@ use sqlx::PgPool;
 use wiremock::ResponseTemplate;
 
 #[sqlx::test]
-async fn confirmation_links_without_token_are_rejected_with_a_400(connection_pool: PgPool) {
+async fn confirmation_links_without_token_are_rejected_with_a_404(connection_pool: PgPool) {
     let app = TestApp::spawn(connection_pool).await;
 
     let response = reqwest::get(&format!("{}/subscriptions/confirm", &app.address))
         .await
         .unwrap();
-    assert_eq!(400, response.status().as_u16());
+    assert_eq!(404, response.status().as_u16());
 }
 
 #[sqlx::test]