See description

- Support observability
- Change project structure

Author: v1adhope

.env

@@ -3,3 +3,5 @@ POSTGRES_PASSWORD=postgres
 POSTGRES_USER=postgres
 POSTGRES_DB=zero2prod
 DATABASE_URL="postgres://${POSTGRES_USER}:${POSTGRES_PASSWORD}@${POSTGRES_HOST}/${POSTGRES_DB}"
+
+RUST_LOG=debug

Cargo.lock

@@ -15,10 +15,17 @@ reqwest = "0.12.23"
 
 [dependencies]
 actix-web = "4"
+tracing-actix-web = { version = "0.7", features = ["uuid_v7"] }
 tokio = { version = "1", features = ["full"] }
 serde = { version = "1", features = ["derive"] }
 config = "0.15"
 uuid = { version = "1", features = ["v7"] }
+tracing = { version = "0.1" }
+tracing-subscriber = { version = "0.3", features = ["env-filter", "registry"] }
+tracing-bunyan-formatter = "0.3"
+tracing-log = "0.2"
+once_cell = "1"
+secrecy = { version = "0.10", features = ["serde"] }
 
 [dependencies.sqlx]
 version = "0.8"

Cargo.toml

@@ -1,3 +1,5 @@
+use secrecy::{ExposeSecret, SecretString};
+
 #[derive(serde::Deserialize)]
 pub struct Settings {
     pub service: Service,
@@ -12,7 +14,7 @@ pub struct Service {
 #[derive(serde::Deserialize)]
 pub struct Database {
     pub username: String,
-    pub password: String,
+    pub password: SecretString,
     pub host: String,
     pub port: String,
     pub database_name: String,
@@ -27,17 +29,28 @@ pub fn get_config() -> Result<Settings, config::ConfigError> {
 }
 
 impl Database {
-    pub fn conn_str(&self) -> String {
-        format!(
-            "postgres://{}:{}@{}:{}/{}",
-            self.username, self.password, self.host, self.port, self.database_name
+    pub fn conn_str(&self) -> SecretString {
+        SecretString::new(
+            format!(
+                "postgres://{}:{}@{}:{}/{}",
+                self.username,
+                self.password.expose_secret(),
+                self.host,
+                self.port,
+                self.database_name
+            )
+            .into(),
         )
     }
 
-    pub fn conn_str_without_db(&self) -> String {
+    pub fn conn_str_without_db(&self) -> SecretString {
         format!(
             "postgres://{}:{}@{}:{}",
-            self.username, self.password, self.host, self.port
+            self.username,
+            self.password.expose_secret(),
+            self.host,
+            self.port
         )
+        .into()
     }
 }

src/config.rs

@@ -1,3 +1,4 @@
 pub mod config;
 pub mod routes;
 pub mod startup;
+pub mod telemetry;