all: remove MockMetricsRegistry in favor of the real one (#4427)

* all: replace mock metrics with real ones

Author: neysofu

Cargo.lock

@@ -3,7 +3,6 @@ members = [
     "core",
     "chain/*",
     "graphql",
-    "mock",
     "node",
     "runtime/*",
     "server/*",

Cargo.toml

@@ -25,9 +25,9 @@ graph-runtime-wasm = { path = "../../runtime/wasm" }
 graph-runtime-derive = { path = "../../runtime/derive" }
 
 [dev-dependencies]
+graph-core = { path = "../../core" }
 test-store = { path = "../../store/test-store" }
 base64 = "0.20.0"
-graph-mock = { path = "../../mock" }
 
 [build-dependencies]
 tonic-build = { workspace = true }

chain/ethereum/Cargo.toml

@@ -219,11 +219,12 @@ impl EthereumNetworks {
 
 #[cfg(test)]
 mod tests {
-    use std::sync::Arc;
-
-    use graph::{firehose::SubgraphLimit, prelude::MetricsRegistry, tokio, url::Url};
-    use graph_mock::MockMetricsRegistry;
+    use graph::{
+        firehose::SubgraphLimit, prelude::MetricsRegistry as MetricsRegistryTrait, tokio, url::Url,
+    };
+    use graph_core::MetricsRegistry;
     use http::HeaderMap;
+    use std::sync::Arc;
 
     use crate::{EthereumAdapter, EthereumNetworks, ProviderEthRpcMetrics, Transport};
 
@@ -288,7 +289,7 @@ mod tests {
     async fn adapter_selector_selects_eth_call() {
         let chain = "mainnet".to_string();
         let logger = graph::log::logger(true);
-        let mock_registry: Arc<dyn MetricsRegistry> = Arc::new(MockMetricsRegistry::new());
+        let mock_registry: Arc<dyn MetricsRegistryTrait> = Arc::new(MetricsRegistry::mock());
         let transport =
             Transport::new_rpc(Url::parse("http://127.0.0.1").unwrap(), HeaderMap::new());
         let provider_metrics = Arc::new(ProviderEthRpcMetrics::new(mock_registry.clone()));
@@ -391,7 +392,7 @@ mod tests {
     async fn adapter_selector_unlimited() {
         let chain = "mainnet".to_string();
         let logger = graph::log::logger(true);
-        let mock_registry: Arc<dyn MetricsRegistry> = Arc::new(MockMetricsRegistry::new());
+        let mock_registry: Arc<dyn MetricsRegistryTrait> = Arc::new(MetricsRegistry::mock());
         let transport =
             Transport::new_rpc(Url::parse("http://127.0.0.1").unwrap(), HeaderMap::new());
         let provider_metrics = Arc::new(ProviderEthRpcMetrics::new(mock_registry.clone()));
@@ -459,7 +460,7 @@ mod tests {
     async fn adapter_selector_disable_call_only_fallback() {
         let chain = "mainnet".to_string();
         let logger = graph::log::logger(true);
-        let mock_registry: Arc<dyn MetricsRegistry> = Arc::new(MockMetricsRegistry::new());
+        let mock_registry: Arc<dyn MetricsRegistryTrait> = Arc::new(MetricsRegistry::mock());
         let transport =
             Transport::new_rpc(Url::parse("http://127.0.0.1").unwrap(), HeaderMap::new());
         let provider_metrics = Arc::new(ProviderEthRpcMetrics::new(mock_registry.clone()));
@@ -525,7 +526,7 @@ mod tests {
     async fn adapter_selector_no_call_only_fallback() {
         let chain = "mainnet".to_string();
         let logger = graph::log::logger(true);
-        let mock_registry: Arc<dyn MetricsRegistry> = Arc::new(MockMetricsRegistry::new());
+        let mock_registry: Arc<dyn MetricsRegistryTrait> = Arc::new(MetricsRegistry::mock());
         let transport =
             Transport::new_rpc(Url::parse("http://127.0.0.1").unwrap(), HeaderMap::new());
         let provider_metrics = Arc::new(ProviderEthRpcMetrics::new(mock_registry.clone()));

chain/ethereum/src/network.rs

@@ -32,7 +32,6 @@ anyhow = "1.0"
 
 [dev-dependencies]
 tower-test = { git = "https://github.com/tower-rs/tower.git" }
-graph-mock = { path = "../mock" }
 test-store = { path = "../store/test-store" }
 hex = "0.4.3"
 graphql-parser = "0.4.0"

core/Cargo.toml

@@ -42,6 +42,10 @@ impl MetricsRegistry {
         }
     }
 
+    pub fn mock() -> Self {
+        MetricsRegistry::new(Logger::root(slog::Discard, o!()), Arc::new(Registry::new()))
+    }
+
     fn gen_register_errors_counter(registry: Arc<Registry>) -> Box<Counter> {
         let opts = Opts::new(
             String::from("metrics_register_errors"),

core/src/metrics/registry.rs

@@ -16,4 +16,3 @@ rand = "0.8.5"
 
 [dev-dependencies]
 test-store = { path = "../../store/test-store" }
-graph-mock = { path = "../../mock" }