fix(jsonrpc): Fix metrics usage and signature to prevent fails (#4070)

Fixes #4063 wrong usage of metrics
near · Mar 11, 2021 · 48fa528 · 48fa528
1 parent 8034c99
commit 48fa528
Show file tree

Hide file tree

Showing 7 changed files with 11 additions and 10 deletions.
diff --git a/chain/jsonrpc-primitives/src/metrics.rs b/chain/jsonrpc-primitives/src/metrics.rs
@@ -5,7 +5,7 @@ lazy_static! {
     pub static ref RPC_UNREACHABLE_ERROR_COUNT: near_metrics::Result<IntCounterVec> =
         near_metrics::try_create_int_counter_vec(
             "near_rpc_unreachable_errors_total",
-            "Total count of Unreachable RPC errors returned, by method",
-            &["method"]
+            "Total count of Unreachable RPC errors returned, by target error enum",
+            &["target_error_enum"]
         );
 }
diff --git a/chain/jsonrpc-primitives/src/types/blocks.rs b/chain/jsonrpc-primitives/src/types/blocks.rs
@@ -68,7 +68,7 @@ impl From<near_client_primitives::types::GetBlockError> for RpcBlockError {
                 tracing::warn!(target: "jsonrpc", "Unreachable error occurred: {}", &error_message);
                 near_metrics::inc_counter_vec(
                     &crate::metrics::RPC_UNREACHABLE_ERROR_COUNT,
-                    &["RpcBlockError", &error_message],
+                    &["RpcBlockError"],
                 );
                 Self::Unreachable(error_message)
             }

diff --git a/chain/jsonrpc-primitives/src/types/chunks.rs b/chain/jsonrpc-primitives/src/types/chunks.rs
@@ -97,7 +97,7 @@ impl From<near_client_primitives::types::GetChunkError> for RpcChunkError {
                 tracing::warn!(target: "jsonrpc", "Unreachable error occurred: {}", &error_message);
                 near_metrics::inc_counter_vec(
                     &crate::metrics::RPC_UNREACHABLE_ERROR_COUNT,
-                    &["RpcChunkError", &error_message],
+                    &["RpcChunkError"],
                 );
                 Self::Unreachable(error_message)
             }

diff --git a/chain/jsonrpc-primitives/src/types/config.rs b/chain/jsonrpc-primitives/src/types/config.rs
@@ -50,7 +50,7 @@ impl From<near_client_primitives::types::GetProtocolConfigError> for RpcProtocol
                 tracing::warn!(target: "jsonrpc", "Unreachable error occurred: {}", &error_message);
                 near_metrics::inc_counter_vec(
                     &crate::metrics::RPC_UNREACHABLE_ERROR_COUNT,
-                    &["RpcProtocolConfigError", &error_message],
+                    &["RpcProtocolConfigError"],
                 );
                 Self::Unreachable(error_message)
             }

diff --git a/chain/jsonrpc-primitives/src/types/query.rs b/chain/jsonrpc-primitives/src/types/query.rs
@@ -194,7 +194,7 @@ impl From<near_client_primitives::types::QueryError> for RpcQueryError {
                 tracing::warn!(target: "jsonrpc", "Unreachable error occurred: {}", &error_message);
                 near_metrics::inc_counter_vec(
                     &crate::metrics::RPC_UNREACHABLE_ERROR_COUNT,
-                    &["RpcQueryError", &error_message],
+                    &["RpcQueryError"],
                 );
                 Self::Unreachable { error_message }
             }

diff --git a/chain/jsonrpc-primitives/src/types/receipts.rs b/chain/jsonrpc-primitives/src/types/receipts.rs
@@ -56,7 +56,7 @@ impl From<near_client_primitives::types::GetReceiptError> for RpcReceiptError {
                 tracing::warn!(target: "jsonrpc", "Unreachable error occurred: {}", &error_message);
                 near_metrics::inc_counter_vec(
                     &crate::metrics::RPC_UNREACHABLE_ERROR_COUNT,
-                    &["RpcReceiptError", &error_message],
+                    &["RpcReceiptError"],
                 );
                 Self::Unreachable(error_message)
             }

diff --git a/chain/jsonrpc-primitives/src/types/validator.rs b/chain/jsonrpc-primitives/src/types/validator.rs
@@ -43,12 +43,13 @@ impl From<near_client_primitives::types::GetValidatorInfoError> for RpcValidator
             near_client_primitives::types::GetValidatorInfoError::IOError(s) => {
                 Self::InternalError(s)
             }
-            near_client_primitives::types::GetValidatorInfoError::Unreachable(s) => {
+            near_client_primitives::types::GetValidatorInfoError::Unreachable(error_message) => {
+                tracing::warn!(target: "jsonrpc", "Unreachable error occurred: {}", &error_message);
                 near_metrics::inc_counter_vec(
                     &crate::metrics::RPC_UNREACHABLE_ERROR_COUNT,
-                    &["RpcValidatorError", &s],
+                    &["RpcValidatorError"],
                 );
-                Self::Unreachable(s)
+                Self::Unreachable(error_message)
             }
         }
     }