9 files changed, 124 insertions, 11 deletions
diff --git a/crates/warden/Cargo.toml b/crates/warden/Cargo.toml
index cbe4656..d66c15e 100644
--- a/crates/warden/Cargo.toml
+++ b/crates/warden/Cargo.toml
@@ -12,10 +12,17 @@ anyhow.workspace = true
 axum = { workspace = true, features = ["macros"] }
 clap = { workspace = true, features = ["derive"] }
 config = { workspace = true, features = ["convert-case", "toml"] }
+metrics.workspace = true
+metrics-exporter-prometheus.workspace = true
 serde = { workspace = true, features = ["derive"] }
 serde_json.workspace = true
 time.workspace = true
 tokio = { workspace = true, features = ["macros", "rt-multi-thread", "signal"] }
+tower-http = { workspace = true, features = [
+    "timeout",
+    "trace",
+    "request-id",
+] }
 tracing.workspace = true
 utoipa = { workspace = true, features = ["axum_extras"] }
 utoipa-axum.workspace = true
diff --git a/crates/warden/src/main.rs b/crates/warden/src/main.rs
index ab7c4cf..b649280 100644
--- a/crates/warden/src/main.rs
+++ b/crates/warden/src/main.rs
@@ -42,7 +42,7 @@ async fn main() -> Result<(), error::AppError> {
         .loki(&config.application, &config.monitoring)?
         .build(&config.monitoring);
 
-      tokio::spawn(tracing.loki_task);
+    tokio::spawn(tracing.loki_task);
 
     let state = AppState::create(&config).await?;
 
diff --git a/crates/warden/src/server.rs b/crates/warden/src/server.rs
index a1968bb..ce01fb8 100644
--- a/crates/warden/src/server.rs
+++ b/crates/warden/src/server.rs
@@ -1,3 +1,4 @@
+mod middleware;
 mod routes;
 
 use axum::Router;
@@ -9,10 +10,13 @@ use utoipa_redoc::Servable;
 #[cfg(feature = "scalar")]
 use utoipa_scalar::Servable as _;
 
-use crate::{server::routes::ApiDoc, state::AppHandle};
+use crate::{
+    server::routes::{ApiDoc, metrics::metrics_app},
+    state::AppHandle,
+};
 
 pub fn router(state: AppHandle) -> Router {
-    let (router, api) = OpenApiRouter::with_openapi(ApiDoc::openapi())
+    let (router, _api) = OpenApiRouter::with_openapi(ApiDoc::openapi())
         .routes(routes!(health_check))
         .nest("/api", routes::processor::router(state.clone()))
         .split_for_parts();
@@ -20,22 +24,22 @@ pub fn router(state: AppHandle) -> Router {
     #[cfg(feature = "swagger")]
     let router = router.merge(
         utoipa_swagger_ui::SwaggerUi::new("/swagger-ui")
-            .url("/api-docs/swaggerdoc.json", api.clone()),
+            .url("/api-docs/swaggerdoc.json", _api.clone()),
     );
 
     #[cfg(feature = "redoc")]
-    let router = router.merge(utoipa_redoc::Redoc::with_url("/redoc", api.clone()));
+    let router = router.merge(utoipa_redoc::Redoc::with_url("/redoc", _api.clone()));
 
     #[cfg(feature = "rapidoc")]
     let router = router.merge(
-        utoipa_rapidoc::RapiDoc::with_openapi("/api-docs/rapidoc.json", api.clone())
+        utoipa_rapidoc::RapiDoc::with_openapi("/api-docs/rapidoc.json", _api.clone())
             .path("/rapidoc"),
     );
 
     #[cfg(feature = "scalar")]
-    let router = router.merge(utoipa_scalar::Scalar::with_url("/scalar", api));
+    let router = router.merge(utoipa_scalar::Scalar::with_url("/scalar", _api));
 
-    router
+    middleware::apply(router).merge(metrics_app())
 }
 
 /// Get health of the API.
diff --git a/crates/warden/src/server/middleware.rs b/crates/warden/src/server/middleware.rs
new file mode 100644
index 0000000..2118fcf
--- /dev/null
+++ b/crates/warden/src/server/middleware.rs
@@ -0,0 +1,22 @@
+mod metrics;
+mod trace_layer;
+
+pub use metrics::*;
+pub use trace_layer::*;
+
+use axum::{Router, http::HeaderName, middleware};
+use tower_http::request_id::{MakeRequestUuid, PropagateRequestIdLayer, SetRequestIdLayer};
+
+use crate::server::middleware::apply_metrics_middleware;
+
+pub const REQUEST_ID_HEADER: &str = "x-request-id";
+
+pub fn apply<T: Clone + Send + Sync + 'static>(router: Router<T>) -> Router<T> {
+    let x_request_id = HeaderName::from_static(REQUEST_ID_HEADER);
+
+    let router = router.layer(PropagateRequestIdLayer::new(x_request_id.clone()));
+
+    apply_trace_context_middleware(router)
+        .layer(SetRequestIdLayer::new(x_request_id, MakeRequestUuid))
+        .route_layer(middleware::from_fn(apply_metrics_middleware))
+}
diff --git a/crates/warden/src/server/middleware/metrics.rs b/crates/warden/src/server/middleware/metrics.rs
new file mode 100644
index 0000000..8644160
--- /dev/null
+++ b/crates/warden/src/server/middleware/metrics.rs
@@ -0,0 +1,33 @@
+use std::time::Instant;
+
+use axum::{
+    extract::{MatchedPath, Request},
+    middleware::Next,
+    response::IntoResponse,
+};
+
+pub async fn apply_metrics_middleware(req: Request, next: Next) -> impl IntoResponse {
+    let start = Instant::now();
+    let path = if let Some(matched_path) = req.extensions().get::<MatchedPath>() {
+        matched_path.as_str().to_owned()
+    } else {
+        req.uri().path().to_owned()
+    };
+    let method = req.method().clone();
+
+    let response = next.run(req).await;
+
+    let latency = start.elapsed().as_secs_f64();
+    let status = response.status().as_u16().to_string();
+
+    let labels = [
+        ("method", method.to_string()),
+        ("path", path),
+        ("status", status),
+    ];
+
+    metrics::counter!("http_requests_total", &labels).increment(1);
+    metrics::histogram!("http_requests_duration_seconds", &labels).record(latency);
+
+    response
+}
diff --git a/crates/warden/src/server/middleware/trace_layer.rs b/crates/warden/src/server/middleware/trace_layer.rs
new file mode 100644
index 0000000..5173e8d
--- /dev/null
+++ b/crates/warden/src/server/middleware/trace_layer.rs
@@ -0,0 +1,24 @@
+use axum::{Router, http::Request};
+use tower_http::trace::TraceLayer;
+use tracing::info_span;
+
+use super::REQUEST_ID_HEADER;
+
+pub fn apply_trace_context_middleware<T: Clone + Send + Sync + 'static>(
+    router: Router<T>,
+) -> Router<T> {
+    router.layer(
+        TraceLayer::new_for_http().make_span_with(|request: &Request<_>| {
+            let request_id = request
+                .headers()
+                .get(REQUEST_ID_HEADER)
+                .expect("should have been applied already");
+
+            info_span!(
+                "http_request",
+                request_id = ?request_id,
+                headers = ?request.headers()
+            )
+        }),
+    )
+}
diff --git a/crates/warden/src/server/routes.rs b/crates/warden/src/server/routes.rs
index 771784b..c03a972 100644
--- a/crates/warden/src/server/routes.rs
+++ b/crates/warden/src/server/routes.rs
@@ -1,3 +1,4 @@
+pub mod metrics;
 pub mod processor;
 
 use utoipa::OpenApi;
diff --git a/crates/warden/src/server/routes/metrics.rs b/crates/warden/src/server/routes/metrics.rs
new file mode 100644
index 0000000..9d4af72
--- /dev/null
+++ b/crates/warden/src/server/routes/metrics.rs
@@ -0,0 +1,24 @@
+use std::future::ready;
+
+use axum::{Router, routing::get};
+use metrics_exporter_prometheus::{Matcher, PrometheusBuilder, PrometheusHandle};
+
+pub fn metrics_app() -> Router {
+    let recorder_handle = setup_metrics_recorder();
+    Router::new().route("/metrics", get(move || ready(recorder_handle.render())))
+}
+
+fn setup_metrics_recorder() -> PrometheusHandle {
+    const EXPONENTIAL_SECONDS: &[f64] = &[
+        0.005, 0.01, 0.025, 0.05, 0.1, 0.25, 0.5, 1.0, 2.5, 5.0, 10.0,
+    ];
+
+    PrometheusBuilder::new()
+        .set_buckets_for_metric(
+            Matcher::Full("http_requests_duration_seconds".to_string()),
+            EXPONENTIAL_SECONDS,
+        )
+        .unwrap()
+        .install_recorder()
+        .unwrap()
+}
diff --git a/crates/warden/src/server/routes/processor/pacs008.rs b/crates/warden/src/server/routes/processor/pacs008.rs
index c0b2bb3..e241d38 100644
--- a/crates/warden/src/server/routes/processor/pacs008.rs
+++ b/crates/warden/src/server/routes/processor/pacs008.rs
@@ -61,9 +61,7 @@ pub(super) async fn post_pacs008(
     let end_to_end_id = cdt_trf_tx_inf
         .as_ref()
         .map(|value| value.pmt_id.end_to_end_id.as_str())
-        .ok_or_else(|| {
-            anyhow::anyhow!("missing end_to_end_id id")
-        })?;
+        .ok_or_else(|| anyhow::anyhow!("missing end_to_end_id id"))?;
 
     Ok(String::default())
 }