introduce new module utils-prometheus

gear-tech · Jul 26, 2024 · d9fc798 · d9fc798
1 parent 06a794e
commit d9fc798
Show file tree

Hide file tree

Showing 13 changed files with 32 additions and 12 deletions.
diff --git a/Cargo.lock b/Cargo.lock
diff --git a/Cargo.toml b/Cargo.toml
@@ -9,6 +9,7 @@ members = [
     "ethereum-common",
     "gear-programs/*",
     "gear-programs/checkpoint-light-client/io",
+    "utils-prometheus",
 ]
 
 resolver = "2"
@@ -32,6 +33,7 @@ grc20_gateway = { path = "gear-programs/grc20-gateway" }
 bridging_payment = { path = "gear-programs/bridging-payment" }
 gear_proof_storage = { path = "gear-programs/proof-storage" }
 checkpoint_light_client-io = { path = "gear-programs/checkpoint-light-client/io", default-features = false }
+utils-prometheus = { path = "utils-prometheus" }
 
 plonky2 = { git = "https://github.com/gear-tech/plonky2.git", rev = "4a620f4d79efe9233d0e7682df5a2fc625b5420e" }
 plonky2_field = { git = "https://github.com/gear-tech/plonky2.git", rev = "4a620f4d79efe9233d0e7682df5a2fc625b5420e" }

diff --git a/relayer/Cargo.toml b/relayer/Cargo.toml
@@ -32,6 +32,7 @@ serde.workspace = true
 serde_json.workspace = true
 thiserror.workspace = true
 tokio.workspace = true
+utils-prometheus.workspace = true
 
 [build-dependencies]
 cgo_oligami = "0.3"
diff --git a/relayer/src/main.rs b/relayer/src/main.rs
@@ -6,13 +6,12 @@ use pretty_env_logger::env_logger::fmt::TimestampPrecision;
 use ethereum_client::EthApi;
 use gear_rpc_client::GearApi;
 use message_relayer::MessageRelayer;
-use metrics::MetricsBuilder;
+use utils_prometheus::MetricsBuilder;
 use proof_storage::{FileSystemProofStorage, GearProofStorage, ProofStorage};
 use prover::proving::GenesisConfig;
 use relay_merkle_roots::MerkleRootRelayer;
 
 mod message_relayer;
-mod metrics;
 mod proof_storage;
 mod prover_interface;
 mod relay_merkle_roots;

diff --git a/relayer/src/message_relayer/event_listener.rs b/relayer/src/message_relayer/event_listener.rs
@@ -10,7 +10,7 @@ use parity_scale_codec::Decode;
 use primitive_types::H256;
 use prometheus::{IntCounter, IntGauge};
 
-use crate::metrics::{impl_metered_service, MeteredService};
+use utils_prometheus::{impl_metered_service, MeteredService};
 
 use super::{BlockEvent, MessageInBlock};
 

diff --git a/relayer/src/message_relayer/merkle_root_listener.rs b/relayer/src/message_relayer/merkle_root_listener.rs
@@ -8,7 +8,7 @@ use ethereum_client::EthApi;
 use gear_rpc_client::GearApi;
 use prometheus::IntGauge;
 
-use crate::metrics::{impl_metered_service, MeteredService};
+use utils_prometheus::{impl_metered_service, MeteredService};
 
 use super::RelayedMerkleRoot;
 

diff --git a/relayer/src/message_relayer/message_processor.rs b/relayer/src/message_relayer/message_processor.rs
@@ -9,7 +9,7 @@ use gear_rpc_client::{dto::Message, GearApi};
 use primitive_types::H256;
 use prometheus::{Gauge, IntCounter, IntGauge};
 
-use crate::metrics::{impl_metered_service, MeteredService};
+use utils_prometheus::{impl_metered_service, MeteredService};
 
 use super::{AuthoritySetId, BlockEvent, BlockNumber, RelayedMerkleRoot};
 

diff --git a/relayer/src/message_relayer/mod.rs b/relayer/src/message_relayer/mod.rs
@@ -2,7 +2,7 @@ use ethereum_client::EthApi;
 use gear_rpc_client::{dto::Message, GearApi};
 use primitive_types::{H256, U256};
 
-use crate::metrics::MeteredService;
+use utils_prometheus::MeteredService;
 
 mod event_listener;
 mod merkle_root_listener;

diff --git a/relayer/src/proof_storage/gear.rs b/relayer/src/proof_storage/gear.rs
@@ -18,7 +18,7 @@ use prometheus::Gauge;
 use rand::RngCore;
 use serde::{Deserialize, Serialize};
 
-use crate::{impl_metered_service, metrics::MeteredService};
+use utils_prometheus::{impl_metered_service, MeteredService};
 
 use super::{AuthoritySetId, ProofStorage, ProofStorageError};
 use prover::proving::{CircuitData, Proof, ProofWithCircuitData};

diff --git a/relayer/src/prover_interface.rs b/relayer/src/prover_interface.rs
@@ -1,6 +1,6 @@
 use std::{str::FromStr, time::Instant};
 
-use crate::metrics::MeteredService;
+use utils_prometheus::MeteredService;
 
 use super::GENESIS_CONFIG;
 use gear_rpc_client::{dto, GearApi};

diff --git a/relayer/src/relay_merkle_roots.rs b/relayer/src/relay_merkle_roots.rs
@@ -5,7 +5,6 @@ use std::{
 };
 
 use crate::{
-    metrics::{impl_metered_service, MeteredService},
     proof_storage::ProofStorage,
     prover_interface::{self, FinalProof},
     GENESIS_CONFIG,
@@ -14,6 +13,8 @@ use crate::{
 use ethereum_client::{EthApi, TxHash, TxStatus};
 use gear_rpc_client::GearApi;
 
+use utils_prometheus::{impl_metered_service, MeteredService};
+
 const MIN_MAIN_LOOP_DURATION: Duration = Duration::from_secs(5);
 
 pub struct MerkleRootRelayer {

diff --git a/utils-prometheus/Cargo.toml b/utils-prometheus/Cargo.toml
@@ -0,0 +1,9 @@
+[package]
+name = "utils-prometheus"
+version.workspace = true
+edition.workspace = true
+
+[dependencies]
+axum.workspace = true
+prometheus.workspace = true
+tokio.workspace = true
diff --git a/relayer/src/metrics.rs → utils-prometheus/src/lib.rs b/relayer/src/metrics.rs → utils-prometheus/src/lib.rs
@@ -14,8 +14,6 @@ pub trait MeteredService {
     fn get_sources(&self) -> impl IntoIterator<Item = Box<dyn Collector>>;
 }
 
-pub use crate::impl_metered_service;
-
 #[macro_export]
 macro_rules! impl_metered_service {
     (
@@ -37,7 +35,7 @@ macro_rules! impl_metered_service {
             ),*
         }
 
-        impl $crate::metrics::MeteredService for $struct_name {
+        impl $crate::MeteredService for $struct_name {
             fn get_sources(&self) -> impl ::core::iter::IntoIterator<
                 Item = ::std::boxed::Box<dyn prometheus::core::Collector>
             > {