Merge pull request #380 from near/cherry-metrics

cherry-pick removed metrics
near · Nov 26, 2024 · 244099f · 244099f
2 parents 940ded2 + 8a8d0f2
commit 244099f
Show file tree

Hide file tree

Showing 2 changed files with 0 additions and 70 deletions.
diff --git a/database/src/metrics.rs b/database/src/metrics.rs
@@ -38,10 +38,4 @@ lazy_static! {
         &["method_name", "table_name"]
     )
     .unwrap();
-    pub(crate) static ref ACCOUTS_DATABASE_READ_QUERIES: IntCounterVec = register_int_counter_vec(
-        "account_database_read_queries_counter",
-        "Total number of accounts database reads queries by method_name and table_name",
-        &["account_id", "shard_id", "method_name", "table_name"]
-    )
-    .unwrap();
 }
diff --git a/database/src/postgres/rpc_server.rs b/database/src/postgres/rpc_server.rs
@@ -69,14 +69,6 @@ impl crate::ReaderDbManager for crate::PostgresDBManager {
                 "state_changes_data",
             ])
             .inc();
-        crate::metrics::ACCOUTS_DATABASE_READ_QUERIES
-            .with_label_values(&[
-                account_id.as_ref(),
-                &shard_id_pool.shard_id.to_string(),
-                method_name,
-                "state_changes_data",
-            ])
-            .inc();
         let page_state = if let Some(page_state_token) = page_token {
             borsh::from_slice::<crate::postgres::PageState>(&hex::decode(page_state_token)?)?
         } else {
@@ -158,14 +150,6 @@ impl crate::ReaderDbManager for crate::PostgresDBManager {
                 "state_changes_data",
             ])
             .inc();
-        crate::metrics::ACCOUTS_DATABASE_READ_QUERIES
-            .with_label_values(&[
-                account_id.as_ref(),
-                &shard_id_pool.shard_id.to_string(),
-                method_name,
-                "state_changes_data",
-            ])
-            .inc();
         let mut items = std::collections::HashMap::new();
         let mut stream = sqlx::query_as::<_, (String, Vec<u8>)>(
             "
@@ -223,14 +207,6 @@ impl crate::ReaderDbManager for crate::PostgresDBManager {
                 "state_changes_data",
             ])
             .inc();
-        crate::metrics::ACCOUTS_DATABASE_READ_QUERIES
-            .with_label_values(&[
-                account_id.as_ref(),
-                &shard_id_pool.shard_id.to_string(),
-                method_name,
-                "state_changes_data",
-            ])
-            .inc();
         let mut items = std::collections::HashMap::new();
         let mut stream = sqlx::query_as::<_, (String, Vec<u8>)>(
             "
@@ -288,14 +264,6 @@ impl crate::ReaderDbManager for crate::PostgresDBManager {
                 "state_changes_data",
             ])
             .inc();
-        crate::metrics::ACCOUTS_DATABASE_READ_QUERIES
-            .with_label_values(&[
-                account_id.as_ref(),
-                &shard_id_pool.shard_id.to_string(),
-                method_name,
-                "state_changes_data",
-            ])
-            .inc();
         let (data_value,): (Vec<u8>,) = sqlx::query_as(
             "
                 SELECT data_value 
@@ -329,14 +297,6 @@ impl crate::ReaderDbManager for crate::PostgresDBManager {
                 "state_changes_account",
             ])
             .inc();
-        crate::metrics::ACCOUTS_DATABASE_READ_QUERIES
-            .with_label_values(&[
-                account_id.as_ref(),
-                &shard_id_pool.shard_id.to_string(),
-                method_name,
-                "state_changes_account",
-            ])
-            .inc();
         let (block_height, block_hash, data_value): (bigdecimal::BigDecimal, String, Vec<u8>) =
             sqlx::query_as(
                 "
@@ -374,14 +334,6 @@ impl crate::ReaderDbManager for crate::PostgresDBManager {
                 "state_changes_contract",
             ])
             .inc();
-        crate::metrics::ACCOUTS_DATABASE_READ_QUERIES
-            .with_label_values(&[
-                account_id.as_ref(),
-                &shard_id_pool.shard_id.to_string(),
-                method_name,
-                "state_changes_contract",
-            ])
-            .inc();
         let (block_height, block_hash, contract_code): (bigdecimal::BigDecimal, String, Vec<u8>) =
             sqlx::query_as(
                 "
@@ -420,14 +372,6 @@ impl crate::ReaderDbManager for crate::PostgresDBManager {
                 "state_changes_access_key",
             ])
             .inc();
-        crate::metrics::ACCOUTS_DATABASE_READ_QUERIES
-            .with_label_values(&[
-                account_id.as_ref(),
-                &shard_id_pool.shard_id.to_string(),
-                method_name,
-                "state_changes_access_key",
-            ])
-            .inc();
         let key_data = borsh::to_vec(&public_key)?;
         let (block_height, block_hash, data_value): (bigdecimal::BigDecimal, String, Vec<u8>) =
             sqlx::query_as(
@@ -468,14 +412,6 @@ impl crate::ReaderDbManager for crate::PostgresDBManager {
                 "state_changes_access_key",
             ])
             .inc();
-        crate::metrics::ACCOUTS_DATABASE_READ_QUERIES
-            .with_label_values(&[
-                account_id.as_ref(),
-                &shard_id_pool.shard_id.to_string(),
-                method_name,
-                "state_changes_access_key",
-            ])
-            .inc();
         let mut access_keys = vec![];
         let mut stream = sqlx::query_as::<_, (String, Vec<u8>, bigdecimal::BigDecimal)>(
             "