Prometheus log fixes (linera-io#1160)

* Don't clone the whole certificate to log it. * Log actual fuel used per block, not per user action.
MathieuDutSik · Oct 26, 2023 · 7d8562d · 7d8562d
1 parent 09e1ce8
commit 7d8562d
Show file tree

Hide file tree

Showing 7 changed files with 19 additions and 23 deletions.
diff --git a/Cargo.lock b/Cargo.lock
diff --git a/examples/Cargo.lock b/examples/Cargo.lock
diff --git a/linera-chain/src/chain.rs b/linera-chain/src/chain.rs
@@ -49,6 +49,7 @@ pub static NUM_BLOCKS_EXECUTED: Lazy<IntCounterVec> = Lazy::new(|| {
     )
     .expect("Counter creation should not fail")
 });
+
 pub static BLOCK_EXECUTION_LATENCY: Lazy<HistogramVec> = Lazy::new(|| {
     register_histogram_vec!(
         "block_execution_latency",
@@ -59,6 +60,16 @@ pub static BLOCK_EXECUTION_LATENCY: Lazy<HistogramVec> = Lazy::new(|| {
     .expect("Counter creation should not fail")
 });
 
+pub static WASM_FUEL_USED_PER_BLOCK: Lazy<HistogramVec> = Lazy::new(|| {
+    register_histogram_vec!(
+        "wasm_fuel_used_per_block",
+        "Wasm fuel used per block",
+        // Can add labels here
+        &[]
+    )
+    .expect("Counter can be created")
+});
+
 /// A view accessing the state of a chain.
 #[derive(Debug, RootView, GraphQLView)]
 pub struct ChainStateView<C> {
@@ -563,6 +574,9 @@ where
         BLOCK_EXECUTION_LATENCY
             .with_label_values(&[])
             .observe(start_time.elapsed().as_secs_f64());
+        WASM_FUEL_USED_PER_BLOCK
+            .with_label_values(&[])
+            .observe(used_fuel as f64);
         Ok(BlockExecutionOutcome {
             messages,
             message_counts,

diff --git a/linera-chain/src/data_types.rs b/linera-chain/src/data_types.rs
@@ -561,7 +561,7 @@ impl CertificateValue {
             .map(|executed_block| &executed_block.block)
     }
 
-    pub fn to_log_str(&self) -> &str {
+    pub fn to_log_str(&self) -> &'static str {
         match self {
             CertificateValue::ConfirmedBlock { .. } => "confirmed_block",
             CertificateValue::ValidatedBlock { .. } => "validated_block",

diff --git a/linera-core/src/worker.rs b/linera-core/src/worker.rs
@@ -1091,7 +1091,8 @@ where
             }
         );
 
-        let certificate_for_logging = certificate.clone();
+        let round = certificate.round;
+        let log_str = certificate.value().to_log_str();
         let mut duplicated = false;
         let (info, actions) = match certificate.value() {
             CertificateValue::ValidatedBlock { .. } => {
@@ -1117,8 +1118,8 @@ where
 
         if !duplicated {
             NUM_ROUNDS_IN_CERTIFICATE
-                .with_label_values(&[certificate_for_logging.value().to_log_str()])
-                .observe(certificate_for_logging.round.0 as f64);
+                .with_label_values(&[log_str])
+                .observe(round.0 as f64);
         }
         Ok((info, actions))
     }

diff --git a/linera-execution/Cargo.toml b/linera-execution/Cargo.toml
@@ -35,7 +35,6 @@ linera-views = { workspace = true, features = ["metrics"] }
 linera-views-derive = { workspace = true }
 lru = { workspace = true }
 once_cell = { workspace = true }
-prometheus = { workspace = true }
 serde = { workspace = true }
 serde_bytes = { workspace = true }
 serde_json = { workspace = true }

diff --git a/linera-execution/src/execution.rs b/linera-execution/src/execution.rs
@@ -20,8 +20,6 @@ use linera_views::{
     views::{View, ViewError},
 };
 use linera_views_derive::CryptoHashView;
-use once_cell::sync::Lazy;
-use prometheus::{register_histogram_vec, HistogramVec};
 
 #[cfg(any(test, feature = "test"))]
 use {
@@ -32,16 +30,6 @@ use {
     std::sync::Arc,
 };
 
-pub static WASM_FUEL_USED_PER_BLOCK: Lazy<HistogramVec> = Lazy::new(|| {
-    register_histogram_vec!(
-        "wasm_fuel_used_per_block",
-        "Wasm fuel used per block",
-        // Can add labels here
-        &[]
-    )
-    .expect("Counter can be created")
-});
-
 /// A view accessing the execution state of a chain.
 #[derive(Debug, CryptoHashView)]
 pub struct ExecutionStateView<C> {
@@ -177,7 +165,6 @@ where
         action: UserAction<'_>,
         remaining_fuel: &mut u64,
     ) -> Result<Vec<ExecutionResult>, ExecutionError> {
-        let initial_remaining_fuel = *remaining_fuel;
         // Try to load the application. This may fail if the corresponding
         // bytecode-publishing certificate doesn't exist yet on this validator.
         let description = self
@@ -233,9 +220,6 @@ where
         // Set the authenticated signer to be used in outgoing messages.
         result.authenticated_signer = signer;
         *remaining_fuel = runtime.remaining_fuel();
-        WASM_FUEL_USED_PER_BLOCK
-            .with_label_values(&[])
-            .observe((initial_remaining_fuel - *remaining_fuel) as f64);
 
         // Check that applications were correctly stacked and unstacked.
         assert_eq!(applications.len(), 1);