ch4: replace Logger with TracingLogger

Signed-off-by: Jin Dong <jin.dong@databricks.com>

.github/workflows/audit.yaml

@@ -17,7 +17,7 @@ jobs:
   security_audit:
     runs-on: ubuntu-latest
     steps:
-      - uses: actions/checkout@v3
+      - uses: actions/checkout@v4
       - uses: taiki-e/install-action@cargo-deny
       - name: Scan for vulnerabilities
         run: cargo deny check advisories

Cargo.toml

@@ -23,6 +23,7 @@ secrecy = { version = "0.8.0", features = ["serde"] }
 serde = { version = "1.0.197", features = ["derive"] }
 tokio = { version = "1.36.0", features = ["macros", "rt-multi-thread"] }
 tracing = { version = "0.1.40", features = ["log"] }
+tracing-actix-web = "0.7.10"
 tracing-bunyan-formatter = "0.3.9"
 tracing-log = "0.2.0"
 tracing-subscriber = { version = "0.3.18", features = ["registry", "env-filter"] }

README.md

@@ -28,3 +28,5 @@ To disable a clippy warning: `#[allow(clippy::lint_name)]`
 ### Ch4
 
 - [ ] Understand all those tracing related crates (e.g., `tracing::instrument`).
+- [ ] Wire tracing with open telemetry (`tracing-opentelemetry`).
+- [ ] `tracing` v.s. `log`.

src/main.rs

@@ -14,7 +14,7 @@ async fn main() -> Result<(), std::io::Error> {
     let address = format!("127.0.0.1:{}", configuration.application_port);
     let listener = TcpListener::bind(address)?;
     let connection_pool =
-        PgPool::connect(&configuration.database.connection_string().expose_secret())
+        PgPool::connect(configuration.database.connection_string().expose_secret())
             .await
             .expect("Failed to connect to Postgres.");
 

src/routes/subscriptions.rs

@@ -13,7 +13,6 @@ pub struct FormData {
     name = "Adding a new subscriber", // span message, fn name by default
     skip(form, db_pool), // skip these two fields in the span
     fields(
-        request_id = %Uuid::new_v4(),
         subscriber_email = %form.email,
         subscriber_name = %form.name
     )

src/startup.rs

@@ -1,18 +1,18 @@
 use crate::routes::{health_check, subscribe};
 
 use actix_web::dev::Server;
-use actix_web::middleware::Logger;
 use actix_web::{web, App, HttpServer};
 use sqlx::PgPool;
 use std::net::TcpListener;
+use tracing_actix_web::TracingLogger;
 
 // `async` is no longer needed as we don't have .await calls.
 pub fn run(listener: TcpListener, db_pool: PgPool) -> Result<Server, std::io::Error> {
     // create a ARC pointer to the DB connection
     let db_pool = web::Data::new(db_pool);
     let server = HttpServer::new(move || {
         App::new()
-            .wrap(Logger::default())
+            .wrap(TracingLogger::default())
             // .route("/", web::get().to(greet))
             // .route("/{name}", web::get().to(greet))
             .route("/health_check", web::get().to(health_check))

tests/health_check.rs

@@ -52,7 +52,7 @@ async fn spawn_app() -> TestApp {
 async fn configure_database(config: &DatabseSettings) -> PgPool {
     // Create database
     let mut connection =
-        PgConnection::connect(&config.connection_string_without_db().expose_secret())
+        PgConnection::connect(config.connection_string_without_db().expose_secret())
             .await
             .expect("Failed to connect to Postgres.");
 
@@ -62,7 +62,7 @@ async fn configure_database(config: &DatabseSettings) -> PgPool {
         .await
         .expect("Failed to create database.");
 
-    let connection_pool = PgPool::connect(&config.connection_string().expose_secret())
+    let connection_pool = PgPool::connect(config.connection_string().expose_secret())
         .await
         .expect("Failed to connect to Postgres.");