fix: metrics (#281)

Cargo.toml

@@ -12,7 +12,6 @@ config = "0.13"
 serde = "1.0.136"
 log = "0.4.16"
 env_logger = "0.9.0"
-actix-web-prom = "0.6.0"
 async-trait = "0.1.57"
 tracing = "0.1"
 tracing-log = "0.1"
@@ -44,6 +43,7 @@ warp = "0.3"
 tokio-tungstenite = "0.18.0"
 urlencoding = "2.1.2"
 prometheus = { version = "0.13.3", features = ["process"] }
+dcl-http-prom-metrics = "0.1.0"
 
 [build-dependencies]
 dcl-rpc = "2.3.5"

src/api/app.rs

@@ -2,11 +2,11 @@ use actix_web::body::MessageBody;
 use actix_web::dev::{Server, ServiceFactory};
 use actix_web::middleware;
 use actix_web::{web::Data, App, HttpServer};
+use dcl_http_prom_metrics::HttpMetricsCollector;
 use tracing_actix_web::TracingLogger;
 
 use crate::components::app::AppComponents;
 use crate::components::configuration::Config;
-use crate::components::metrics::initialize_metrics;
 use crate::components::tracing::init_telemetry;
 
 use super::middlewares::check_auth::CheckAuthToken;
@@ -27,7 +27,10 @@ pub fn run_service(data: Data<AppComponents>) -> Result<Server, std::io::Error>
     init_telemetry();
     let server_port = data.config.server.port;
 
-    let server = HttpServer::new(move || get_app_router(&data))
+    let http_metrics_collector =
+        Data::new(dcl_http_prom_metrics::HttpMetricsCollectorBuilder::default().build());
+
+    let server = HttpServer::new(move || get_app_router(&data, &http_metrics_collector))
         .bind(("0.0.0.0", server_port))?
         .run();
 
@@ -47,6 +50,7 @@ const ROUTES_NEED_AUTH_TOKEN: [&str; 3] = [
 
 pub fn get_app_router(
     data: &Data<AppComponents>,
+    http_metrics_collector: &Data<HttpMetricsCollector>,
 ) -> App<
     impl ServiceFactory<
         actix_web::dev::ServiceRequest,
@@ -63,13 +67,14 @@ pub fn get_app_router(
 
     App::new()
         .app_data(data.clone())
-        .wrap(TracingLogger::default())
-        // .wrap(initialize_metrics(data.config.env.clone()))
-        // .wrap(CheckMetricsToken::new(
-        //     data.config.wkc_metrics_bearer_token.clone(),
-        // ))
+        .app_data(http_metrics_collector.clone())
         .wrap(CheckAuthToken::new(protected_routes))
+        .wrap(dcl_http_prom_metrics::metrics())
+        .wrap(CheckMetricsToken::new(
+            data.config.wkc_metrics_bearer_token.clone(),
+        ))
         .wrap(middleware::NormalizePath::trim())
+        .wrap(TracingLogger::default())
         .service(live)
         .service(health)
         .service(version)

src/components/mod.rs

@@ -2,7 +2,6 @@ pub mod app;
 pub mod configuration;
 pub mod database;
 pub mod health;
-pub mod metrics;
 pub mod notifications;
 pub mod redis;
 pub mod synapse;

tests/common/mod.rs

@@ -1,6 +1,7 @@
 use std::collections::HashMap;
 
 use actix_web::{body::MessageBody, dev::ServiceFactory, web::Data, App};
+use dcl_http_prom_metrics::HttpMetricsCollectorBuilder;
 use social_service::{
     api::app::get_app_router,
     components::{
@@ -37,7 +38,10 @@ pub async fn get_app(
 > {
     let app_components = components.unwrap_or(AppComponents::new(Some(config)).await);
     let app_data = Data::new(app_components);
-    get_app_router(&app_data)
+
+    let http_metrics_collector = Data::new(HttpMetricsCollectorBuilder::default().build());
+
+    get_app_router(&app_data, &http_metrics_collector)
 }
 
 /// We need this to avoid conccurency issues in Tests

tests/route_synapse.rs

@@ -1,5 +1,6 @@
 mod common;
 pub use common::*;
+use dcl_http_prom_metrics::HttpMetricsCollectorBuilder;
 
 use std::collections::HashMap;
 use wiremock::{
@@ -51,7 +52,9 @@ async fn should_be_200_and_has_user_in_cache() {
     let app_components = AppComponents::new(Some(config)).await;
     let app_data = Data::new(app_components);
 
-    let router = get_app_router(&app_data);
+    let http_metrics_collector = Data::new(HttpMetricsCollectorBuilder::default().build());
+
+    let router = get_app_router(&app_data, &http_metrics_collector);
 
     let app = test::init_service(router).await;
 
@@ -121,7 +124,9 @@ async fn should_be_500_and_not_user_in_cache() {
     let app_components = AppComponents::new(Some(config)).await;
     let app_data = Data::new(app_components);
 
-    let router = get_app_router(&app_data);
+    let http_metrics_collector = Data::new(HttpMetricsCollectorBuilder::default().build());
+
+    let router = get_app_router(&app_data, &http_metrics_collector);
 
     let app = test::init_service(router).await;
 

tests/routes/v1/friendships/get.rs

@@ -2,6 +2,7 @@ use std::collections::HashMap;
 
 use actix_http::StatusCode;
 use actix_web::{test, web::Data};
+use dcl_http_prom_metrics::HttpMetricsCollectorBuilder;
 use social_service::{
     api::{app::get_app_router, routes::v1::friendships::types::FriendshipsResponse},
     components::{app::AppComponents, database::DatabaseComponentImplementation},
@@ -28,7 +29,9 @@ async fn test_get_friendships_me_when_active() {
     let app_components = AppComponents::new(Some(config)).await;
     let app_data = Data::new(app_components);
 
-    let router = get_app_router(&app_data);
+    let http_metrics_collector = Data::new(HttpMetricsCollectorBuilder::default().build());
+
+    let router = get_app_router(&app_data, &http_metrics_collector);
 
     let app = test::init_service(router).await;
 
@@ -74,7 +77,9 @@ async fn test_get_friends_when_active() {
     let app_components = AppComponents::new(Some(config)).await;
     let app_data = Data::new(app_components);
 
-    let router = get_app_router(&app_data);
+    let http_metrics_collector = Data::new(HttpMetricsCollectorBuilder::default().build());
+
+    let router = get_app_router(&app_data, &http_metrics_collector);
 
     let app = test::init_service(router).await;
 
@@ -120,7 +125,9 @@ async fn test_get_friends_when_inactive() {
     let app_components = AppComponents::new(Some(config)).await;
     let app_data = Data::new(app_components);
 
-    let router = get_app_router(&app_data);
+    let http_metrics_collector = Data::new(HttpMetricsCollectorBuilder::default().build());
+
+    let router = get_app_router(&app_data, &http_metrics_collector);
 
     let app = test::init_service(router).await;
 
@@ -188,7 +195,9 @@ async fn test_get_user_friends_database_error_should_return_unknown_error() {
     let app_components = AppComponents::new(Some(config)).await;
     let app_data = Data::new(app_components);
 
-    let router = get_app_router(&app_data);
+    let http_metrics_collector = Data::new(HttpMetricsCollectorBuilder::default().build());
+
+    let router = get_app_router(&app_data, &http_metrics_collector);
 
     app_data.db.close().await;
     let app = test::init_service(router).await;
@@ -224,7 +233,9 @@ async fn test_get_user_friends_should_return_the_address_list() {
     let app_components = AppComponents::new(Some(config)).await;
     let app_data = Data::new(app_components);
 
-    let router = get_app_router(&app_data);
+    let http_metrics_collector = Data::new(HttpMetricsCollectorBuilder::default().build());
+
+    let router = get_app_router(&app_data, &http_metrics_collector);
 
     let app = test::init_service(router).await;
 

tests/routes/v1/friendships/mutuals.rs

@@ -3,6 +3,7 @@ use std::collections::HashMap;
 use actix_http::StatusCode;
 
 use actix_web::{test, web::Data};
+use dcl_http_prom_metrics::HttpMetricsCollectorBuilder;
 use social_service::{
     api::{
         app::get_app_router,
@@ -36,7 +37,9 @@ async fn test_get_mutual_friends() {
     let app_components = AppComponents::new(Some(config)).await;
     let app_data = Data::new(app_components);
 
-    let router = get_app_router(&app_data);
+    let http_metrics_collector = Data::new(HttpMetricsCollectorBuilder::default().build());
+
+    let router = get_app_router(&app_data, &http_metrics_collector);
 
     let app = test::init_service(router).await;