refacto: rename metrics

Author: sfauvel

mithril-aggregator/src/http_server/routes/statistics_routes.rs

@@ -120,7 +120,7 @@ mod handlers {
         metrics_service: Arc<MetricsService>,
     ) -> Result<impl warp::Reply, Infallible> {
         metrics_service
-            .get_cardano_database_immutable_files_restored()
+            .get_cardano_database_immutable_files_restored_since_startup()
             .increment_by(message.nb_immutable_files);
 
         Ok(reply::empty(StatusCode::CREATED))
@@ -131,7 +131,7 @@ mod handlers {
         metrics_service: Arc<MetricsService>,
     ) -> Result<impl warp::Reply, Infallible> {
         metrics_service
-            .get_cardano_database_ancillary_files_restored()
+            .get_cardano_database_ancillary_files_restored_since_startup()
             .increment();
 
         Ok(reply::empty(StatusCode::CREATED))
@@ -143,14 +143,14 @@ mod handlers {
         metrics_service: Arc<MetricsService>,
     ) -> Result<impl warp::Reply, Infallible> {
         metrics_service
-            .get_cardano_database_complete_restoration()
+            .get_cardano_database_complete_restoration_since_startup()
             .increment();
 
         let headers: Vec<(&str, &str)> = Vec::new();
         let message = EventMessage::new(
             "HTTP::statistics",
             "cardano_database_restoration",
-            &"full".to_string(),
+            &"complete".to_string(),
             headers,
         );
 
@@ -168,7 +168,7 @@ mod handlers {
         metrics_service: Arc<MetricsService>,
     ) -> Result<impl warp::Reply, Infallible> {
         metrics_service
-            .get_cardano_database_partial_restoration()
+            .get_cardano_database_partial_restoration_since_startup()
             .increment();
 
         let headers: Vec<(&str, &str)> = Vec::new();
@@ -323,7 +323,7 @@ mod tests {
             let dependency_manager = Arc::new(initialize_dependencies().await);
             let metric_counter = dependency_manager
                 .metrics_service
-                .get_cardano_database_immutable_files_restored();
+                .get_cardano_database_immutable_files_restored_since_startup();
             let message = CardanoDatabaseImmutableFilesRestoredMessage {
                 nb_immutable_files: 3,
             };
@@ -379,7 +379,7 @@ mod tests {
             let dependency_manager = Arc::new(initialize_dependencies().await);
             let metric_counter = dependency_manager
                 .metrics_service
-                .get_cardano_database_ancillary_files_restored();
+                .get_cardano_database_ancillary_files_restored_since_startup();
 
             let initial_counter_value = metric_counter.get();
 
@@ -478,15 +478,15 @@ mod tests {
             let message = rx.try_recv().unwrap();
             assert_eq!("HTTP::statistics", message.source);
             assert_eq!("cardano_database_restoration", message.action);
-            assert_eq!("full", message.content);
+            assert_eq!("complete", message.content);
         }
 
         #[tokio::test]
         async fn increments_metric() {
             let (dependency_manager, _rx) = setup_dependencies().await;
             let metric_counter = dependency_manager
                 .metrics_service
-                .get_cardano_database_complete_restoration();
+                .get_cardano_database_complete_restoration_since_startup();
 
             let initial_counter_value = metric_counter.get();
 
@@ -584,7 +584,7 @@ mod tests {
             let (dependency_manager, _rx) = setup_dependencies().await;
             let metric_counter = dependency_manager
                 .metrics_service
-                .get_cardano_database_partial_restoration();
+                .get_cardano_database_partial_restoration_since_startup();
 
             let initial_counter_value = metric_counter.get();
 

mithril-aggregator/src/metrics/service.rs

@@ -18,21 +18,21 @@ build_metrics_service!(
         "mithril_aggregator_cardano_db_total_restoration_since_startup",
         "Number of Cardano immutable files full restorations since startup on a Mithril aggregator node"
     ),
-    cardano_database_immutable_files_restored:MetricCounter(
-        "mithril_aggregator_cardano_db_immutable_files_restored",
-        "Number of Cardano immutable files restored on a Mithril aggregator node"
+    cardano_database_immutable_files_restored_since_startup:MetricCounter(
+        "mithril_aggregator_cardano_db_immutable_files_restored_since_startup",
+        "Number of Cardano immutable files restored since startup on a Mithril aggregator node"
     ),
-    cardano_database_ancillary_files_restored:MetricCounter(
-        "mithril_aggregator_cardano_db_ancillary_files_restored",
-        "Number of Cardano ancillary files restored on a Mithril aggregator node"
+    cardano_database_ancillary_files_restored_since_startup:MetricCounter(
+        "mithril_aggregator_cardano_db_ancillary_files_restored_since_startup",
+        "Number of Cardano ancillary files restored since startup on a Mithril aggregator node"
     ),
-    cardano_database_complete_restoration:MetricCounter(
-        "mithril_aggregator_cardano_db_complete_restoration",
-        "Number of complete Cardano database restoration on a Mithril aggregator node"
+    cardano_database_complete_restoration_since_startup:MetricCounter(
+        "mithril_aggregator_cardano_db_complete_restoration_since_startup",
+        "Number of complete Cardano database restoration since startup on a Mithril aggregator node"
     ),
-    cardano_database_partial_restoration:MetricCounter(
-        "mithril_aggregator_cardano_db_partial_restoration",
-        "Number of partial Cardano database restoration on a Mithril aggregator node"
+    cardano_database_partial_restoration_since_startup:MetricCounter(
+        "mithril_aggregator_cardano_db_partial_restoration_since_startup",
+        "Number of partial Cardano database restoration since startup on a Mithril aggregator node"
     ),
     artifact_detail_cardano_database_total_served_since_startup:MetricCounter(
         "mithril_aggregator_artifact_detail_cardano_database_total_served_since_startup",