From 5ef17e9b92e0c142bca520371f1f37eb17592b8e Mon Sep 17 00:00:00 2001
From: Katya Ryazantseva <sibkatya@gmail.com>
Date: Wed, 23 Oct 2024 17:33:42 +0200
Subject: [PATCH 1/2] Add 'beacon_' prefix to PeerDAS metrics names

---
 beacon_node/beacon_chain/src/metrics.rs | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

diff --git a/beacon_node/beacon_chain/src/metrics.rs b/beacon_node/beacon_chain/src/metrics.rs
index 0b5608f0843..23ed889dffd 100644
--- a/beacon_node/beacon_chain/src/metrics.rs
+++ b/beacon_node/beacon_chain/src/metrics.rs
@@ -1649,7 +1649,7 @@ pub static BLOB_SIDECAR_INCLUSION_PROOF_COMPUTATION: LazyLock<Result<Histogram>>
     });
 pub static DATA_COLUMN_SIDECAR_COMPUTATION: LazyLock<Result<HistogramVec>> = LazyLock::new(|| {
     try_create_histogram_vec_with_buckets(
-        "data_column_sidecar_computation_seconds",
+        "beacon_data_column_sidecar_computation_seconds",
         "Time taken to compute data column sidecar, including cells, proofs and inclusion proof",
         Ok(vec![0.1, 0.15, 0.25, 0.35, 0.5, 0.7, 1.0, 2.5, 5.0, 10.0]),
         &["blob_count"],
@@ -1658,7 +1658,7 @@ pub static DATA_COLUMN_SIDECAR_COMPUTATION: LazyLock<Result<HistogramVec>> = Laz
 pub static DATA_COLUMN_SIDECAR_INCLUSION_PROOF_VERIFICATION: LazyLock<Result<Histogram>> =
     LazyLock::new(|| {
         try_create_histogram(
-            "data_column_sidecar_inclusion_proof_verification_seconds",
+            "beacon_data_column_sidecar_inclusion_proof_verification_seconds",
             "Time taken to verify data_column sidecar inclusion proof",
         )
     });
@@ -1812,7 +1812,7 @@ pub static KZG_VERIFICATION_BATCH_TIMES: LazyLock<Result<Histogram>> = LazyLock:
 pub static KZG_VERIFICATION_DATA_COLUMN_SINGLE_TIMES: LazyLock<Result<Histogram>> =
     LazyLock::new(|| {
         try_create_histogram_with_buckets(
-            "kzg_verification_data_column_single_seconds",
+            "beacon_kzg_verification_data_column_single_seconds",
             "Runtime of single data column kzg verification",
             Ok(vec![
                 0.0005, 0.001, 0.0015, 0.002, 0.003, 0.004, 0.005, 0.007, 0.01, 0.02, 0.05,
@@ -1822,7 +1822,7 @@ pub static KZG_VERIFICATION_DATA_COLUMN_SINGLE_TIMES: LazyLock<Result<Histogram>
 pub static KZG_VERIFICATION_DATA_COLUMN_BATCH_TIMES: LazyLock<Result<Histogram>> =
     LazyLock::new(|| {
         try_create_histogram_with_buckets(
-            "kzg_verification_data_column_batch_seconds",
+            "beacon_kzg_verification_data_column_batch_seconds",
             "Runtime of batched data column kzg verification",
             Ok(vec![
                 0.002, 0.004, 0.006, 0.008, 0.01, 0.012, 0.015, 0.02, 0.03, 0.05, 0.07,
@@ -1875,14 +1875,14 @@ pub static DATA_AVAILABILITY_OVERFLOW_STORE_CACHE_SIZE: LazyLock<Result<IntGauge
 pub static DATA_AVAILABILITY_RECONSTRUCTION_TIME: LazyLock<Result<Histogram>> =
     LazyLock::new(|| {
         try_create_histogram(
-            "data_availability_reconstruction_time_seconds",
+            "beacon_data_availability_reconstruction_time_seconds",
             "Time taken to reconstruct columns",
         )
     });
 pub static DATA_AVAILABILITY_RECONSTRUCTED_COLUMNS: LazyLock<Result<IntCounter>> =
     LazyLock::new(|| {
         try_create_int_counter(
-            "data_availability_reconstructed_columns_total",
+            "beacon_data_availability_reconstructed_columns_total",
             "Total count of reconstructed columns",
         )
     });

From b4def7bc7378f32d96d4563d22573359fe00cbd3 Mon Sep 17 00:00:00 2001
From: Katya Ryazantseva <sibkatya@gmail.com>
Date: Fri, 20 Dec 2024 19:49:29 +0100
Subject: [PATCH 2/2] Add 'beacon_' prefix to 'kzg_data_column' metrics

---
 beacon_node/beacon_chain/src/metrics.rs | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/beacon_node/beacon_chain/src/metrics.rs b/beacon_node/beacon_chain/src/metrics.rs
index eb90767a8c3..8d71e895c93 100644
--- a/beacon_node/beacon_chain/src/metrics.rs
+++ b/beacon_node/beacon_chain/src/metrics.rs
@@ -1925,7 +1925,7 @@ pub static DATA_AVAILABILITY_RECONSTRUCTED_COLUMNS: LazyLock<Result<IntCounter>>
 pub static KZG_DATA_COLUMN_RECONSTRUCTION_ATTEMPTS: LazyLock<Result<IntCounter>> =
     LazyLock::new(|| {
         try_create_int_counter(
-            "kzg_data_column_reconstruction_attempts",
+            "beacon_kzg_data_column_reconstruction_attempts",
             "Count of times data column reconstruction has been attempted",
         )
     });
@@ -1933,7 +1933,7 @@ pub static KZG_DATA_COLUMN_RECONSTRUCTION_ATTEMPTS: LazyLock<Result<IntCounter>>
 pub static KZG_DATA_COLUMN_RECONSTRUCTION_FAILURES: LazyLock<Result<IntCounter>> =
     LazyLock::new(|| {
         try_create_int_counter(
-            "kzg_data_column_reconstruction_failures",
+            "beacon_kzg_data_column_reconstruction_failures",
             "Count of times data column reconstruction has failed",
         )
     });
@@ -1941,7 +1941,7 @@ pub static KZG_DATA_COLUMN_RECONSTRUCTION_FAILURES: LazyLock<Result<IntCounter>>
 pub static KZG_DATA_COLUMN_RECONSTRUCTION_INCOMPLETE_TOTAL: LazyLock<Result<IntCounterVec>> =
     LazyLock::new(|| {
         try_create_int_counter_vec(
-            "kzg_data_column_reconstruction_incomplete_total",
+            "beacon_kzg_data_column_reconstruction_incomplete_total",
             "Count of times data column reconstruction attempts did not result in an import",
             &["reason"],
         )