fix: record metrics properly (#164)

This PR:
- fixes 404 metric recording
- fixes de-synced metrics on each GET to /metrics

crates/server/Cargo.toml

@@ -17,7 +17,7 @@ log = { workspace = true }
 dcl-crypto = { workspace = true }
 uuid = { workspace = true }
 
-actix-web-prom = "0.6.0"
+dcl-http-prom-metrics = "0.1.0"
 async-trait = "0.1.57"
 tracing = "0.1"
 tracing-log = "0.1"

crates/server/src/api/middlewares/mod.rs

@@ -1,9 +1,7 @@
 mod auth;
-mod metrics;
 mod metrics_token;
 mod tracing;
 
 pub use self::tracing::initialize_telemetry;
 pub use auth::dcl_auth_middleware;
-pub use metrics::metrics;
 pub use metrics_token::metrics_token;

crates/server/src/api/mod.rs

@@ -12,6 +12,7 @@ use actix_web::{
     web::Data,
     App, HttpServer,
 };
+use dcl_http_prom_metrics::HttpMetricsCollector;
 use quests_db::Database;
 use quests_message_broker::messages_queue::RedisMessagesQueue;
 use tracing_actix_web::TracingLogger;
@@ -20,13 +21,16 @@ pub async fn run_server(
     config: Data<Config>,
     database: Data<Database>,
     events_queue: Data<RedisMessagesQueue>,
+    metrics_collector: Data<HttpMetricsCollector>,
 ) -> Server {
     let server_address = format!("0.0.0.0:{}", config.http_server_port);
 
-    let server = HttpServer::new(move || get_app_router(&config, &database, &events_queue))
-        .bind(&server_address)
-        .unwrap() // Unwrap because if it's not able to bind, it doens't matter the panic
-        .run();
+    let server = HttpServer::new(move || {
+        get_app_router(&config, &database, &events_queue, &metrics_collector)
+    })
+    .bind(&server_address)
+    .unwrap() // Unwrap because if it's not able to bind, it doens't matter the panic
+    .run();
 
     log::info!("Quests REST API running at http://{}", server_address);
 
@@ -37,6 +41,7 @@ pub fn get_app_router(
     config: &Data<Config>,
     db: &Data<Database>,
     redis: &Data<RedisMessagesQueue>,
+    metrics_collector: &Data<HttpMetricsCollector>,
 ) -> App<
     impl ServiceFactory<
         actix_web::dev::ServiceRequest,
@@ -54,10 +59,7 @@ pub fn get_app_router(
         .app_data(config.clone())
         .app_data(db.clone())
         .app_data(redis.clone())
-        .wrap(cors)
-        .wrap(TracingLogger::default())
-        // .wrap(middlewares::metrics())
-        // .wrap(middlewares::metrics_token(&config.wkc_metrics_bearer_token))
+        .app_data(metrics_collector.clone())
         .wrap(middlewares::dcl_auth_middleware(
             [
                 "POST:/api/quests",
@@ -72,5 +74,9 @@ pub fn get_app_router(
                 "GET:/api/creators/{user_address}/quests",
             ],
         ))
+        .wrap(dcl_http_prom_metrics::metrics())
+        .wrap(middlewares::metrics_token(&config.wkc_metrics_bearer_token))
+        .wrap(TracingLogger::default())
+        .wrap(cors)
         .configure(routes::services)
 }

crates/server/src/configuration.rs

@@ -34,7 +34,7 @@ impl Config {
             .set_default("http_server_port", 3000)? // It's empty for local development
             .set_default("ws_server_port", 3001)? // default for local development
             .set_default("env", "dev")?
-            .set_default("wkc_metrics_bearer_token", "")?
+            .set_default("wkc_metrics_bearer_token", "DEV")?
             .set_default(
                 "database_url",
                 "postgres://postgres:postgres@localhost:5432/quests_db",

crates/server/src/lib.rs

@@ -6,6 +6,7 @@ pub mod rpc;
 use std::sync::Arc;
 
 use api::middlewares::initialize_telemetry;
+use dcl_http_prom_metrics::HttpMetricsCollectorBuilder;
 use env_logger::init as initialize_logger;
 use quests_db::create_quests_db_component;
 use quests_message_broker::{
@@ -44,6 +45,8 @@ pub async fn run_app() {
     ));
     let quests_channel_subscriber = RedisChannelSubscriber::new(redis.clone());
 
+    let http_metrics_collector = Arc::new(HttpMetricsCollectorBuilder::default().build());
+
     let (warp_websocket_server, rpc_server) = rpc::run_rpc_server((
         config.clone(),
         database.clone(),
@@ -59,8 +62,13 @@ pub async fn run_app() {
         quests_channel_publisher.clone(),
     );
 
-    let actix_rest_api_server =
-        api::run_server(config.into(), database.into(), events_queue.into()).await;
+    let actix_rest_api_server = api::run_server(
+        config.into(),
+        database.into(),
+        events_queue.into(),
+        http_metrics_collector.into(),
+    )
+    .await;
 
     select! {
         _ = tokio::signal::ctrl_c() => {

crates/server/tests/common/mod.rs

@@ -9,6 +9,7 @@ use actix_web::web::Data;
 use actix_web::App;
 use actix_web_lab::__reexports::serde_json;
 use dcl_crypto::Identity;
+use dcl_http_prom_metrics::HttpMetricsCollectorBuilder;
 use quests_db::core::ops::{Connect, GetConnection, Migrate};
 use quests_db::{create_quests_db_component, DatabaseOptions, Executor};
 use quests_message_broker::messages_queue::RedisMessagesQueue;
@@ -49,6 +50,7 @@ pub async fn build_app(
         &Data::new(config.clone()),
         &Data::new(db),
         &Data::new(events_queue),
+        &Data::new(HttpMetricsCollectorBuilder::default().build()),
     )
 }