feat: add metrics to service

Signed-off-by: Gustavo Inacio <[email protected]>

Author: gusinacio

Cargo.lock

@@ -1,17 +1,26 @@
 // Copyright 2023-, Edge & Node, GraphOps, and Semiotic Labs.
 // SPDX-License-Identifier: Apache-2.0
 
+use lazy_static::lazy_static;
+use prometheus::{register_int_counter_vec, IntCounterVec};
 use std::{
     error::Error,
     fmt::{self, Display},
 };
 
 use tracing::warn;
 
-use crate::metrics;
-
 const ERROR_BASE_URL: &str = "https://github.com/graphprotocol/indexer/blob/main/docs/errors.md";
 
+lazy_static! {
+    /// Register indexer error metrics in Prometheus registry
+    pub static ref INDEXER_ERROR: IntCounterVec = register_int_counter_vec!(
+        "indexer_error",
+        "Indexer errors observed over time",
+        &["code"]
+    ).expect("Create indexer_error metrics");
+}
+
 #[derive(Debug, Clone)]
 pub enum IndexerErrorCode {
     IE001,
@@ -304,9 +313,7 @@ pub struct IndexerError {
 impl IndexerError {
     // Create Indexer Error and automatically increment counter by the error code
     pub fn new(code: IndexerErrorCode, cause: Option<IndexerErrorCause>) -> Self {
-        metrics::INDEXER_ERROR
-            .with_label_values(&[&code.to_string()])
-            .inc();
+        INDEXER_ERROR.with_label_values(&[&code.to_string()]).inc();
         let explanation = code.message();
         warn!(
             "Encountered error {}: {}. Cause: {:#?}",

common/src/indexer_errors.rs

@@ -6,6 +6,7 @@ use std::{
     time::Duration,
 };
 
+use alloy::dyn_abi::Eip712Domain;
 use alloy::sol_types::eip712_domain;
 use anyhow;
 use autometrics::prometheus_exporter;
@@ -33,11 +34,11 @@ use tower_governor::{governor::GovernorConfigBuilder, GovernorLayer};
 use tower_http::{cors, cors::CorsLayer, normalize_path::NormalizePath, trace::TraceLayer};
 use tracing::{info, info_span};
 
+use crate::escrow_accounts::EscrowAccounts;
+use crate::escrow_accounts::EscrowAccountsError;
 use crate::{
     address::public_key,
-    indexer_service::http::{
-        metrics::IndexerServiceMetrics, static_subgraph::static_subgraph_request_handler,
-    },
+    indexer_service::http::static_subgraph::static_subgraph_request_handler,
     prelude::{
         attestation_signers, dispute_manager, escrow_accounts, indexer_allocations,
         AttestationSigner, DeploymentDetails, SubgraphClient,
@@ -98,6 +99,12 @@ where
     FailedToSignAttestation,
     #[error("Failed to query subgraph: {0}")]
     FailedToQueryStaticSubgraph(anyhow::Error),
+
+    #[error("Could not decode signer: {0}")]
+    CouldNotDecodeSigner(tap_core::Error),
+
+    #[error("There was an error while accessing escrow account: {0}")]
+    EscrowAccount(EscrowAccountsError),
 }
 
 impl<E> IntoResponse for IndexerServiceError<E>
@@ -122,6 +129,8 @@ where
             ReceiptError(_)
             | InvalidRequest(_)
             | InvalidFreeQueryAuthToken
+            | CouldNotDecodeSigner(_)
+            | EscrowAccount(_)
             | ProcessingError(_) => StatusCode::BAD_REQUEST,
 
             FailedToQueryStaticSubgraph(_) => StatusCode::INTERNAL_SERVER_ERROR,
@@ -166,7 +175,6 @@ where
     pub config: IndexerServiceConfig,
     pub release: IndexerServiceRelease,
     pub url_namespace: &'static str,
-    pub metrics_prefix: &'static str,
     pub extra_routes: Router<Arc<IndexerServiceState<I>>>,
 }
 
@@ -178,7 +186,10 @@ where
     pub attestation_signers: Eventual<HashMap<Address, AttestationSigner>>,
     pub tap_manager: Manager<IndexerTapContext>,
     pub service_impl: Arc<I>,
-    pub metrics: IndexerServiceMetrics,
+
+    // tap
+    pub escrow_accounts: Eventual<EscrowAccounts>,
+    pub domain_separator: Eip712Domain,
 }
 
 pub struct IndexerService {}
@@ -188,8 +199,6 @@ impl IndexerService {
     where
         I: IndexerServiceImpl + Sync + Send + 'static,
     {
-        let metrics = IndexerServiceMetrics::new(options.metrics_prefix);
-
         let http_client = reqwest::Client::builder()
             .tcp_nodelay(true)
             .timeout(Duration::from_secs(30))
@@ -299,21 +308,26 @@ impl IndexerService {
         let checks = IndexerTapContext::get_checks(
             database,
             allocations,
-            escrow_accounts,
+            escrow_accounts.clone(),
             domain_separator.clone(),
             timestamp_error_tolerance,
             receipt_max_value,
         )
         .await;
 
-        let tap_manager = Manager::new(domain_separator, indexer_context, CheckList::new(checks));
+        let tap_manager = Manager::new(
+            domain_separator.clone(),
+            indexer_context,
+            CheckList::new(checks),
+        );
 
         let state = Arc::new(IndexerServiceState {
             config: options.config.clone(),
             attestation_signers,
             tap_manager,
             service_impl: Arc::new(options.service_impl),
-            metrics,
+            escrow_accounts,
+            domain_separator,
         });
 
         // Rate limits by allowing bursts of 10 requests and requiring 100ms of

common/src/indexer_service/http/indexer_service.rs

@@ -3,7 +3,6 @@
 
 mod config;
 mod indexer_service;
-mod metrics;
 mod request_handler;
 mod static_subgraph;
 mod tap_receipt_header;