diff --git a/rust/abacus-base/src/contract_sync/metrics.rs b/rust/abacus-base/src/contract_sync/metrics.rs index d989af86d..12cde1407 100644 --- a/rust/abacus-base/src/contract_sync/metrics.rs +++ b/rust/abacus-base/src/contract_sync/metrics.rs @@ -24,7 +24,7 @@ impl ContractSyncMetrics { .new_int_gauge( "contract_sync_block_height", "Height of a recently observed block", - &["data_type", "contract_name", "agent"], + &["data_type", "contract_name"], ) .expect("failed to register block_height metric"); @@ -32,7 +32,7 @@ impl ContractSyncMetrics { .new_int_gauge( "contract_sync_stored_events", "Number of events stored into db", - &["data_type", "contract_name", "agent"], + &["data_type", "contract_name"], ) .expect("failed to register stored_events metric"); @@ -40,7 +40,7 @@ impl ContractSyncMetrics { .new_int_counter( "contract_sync_missed_events", "Number of unique occasions when agent missed an event", - &["data_type", "contract_name", "agent"], + &["data_type", "contract_name"], ) .expect("failed to register missed_events metric"); diff --git a/rust/abacus-base/src/contract_sync/mod.rs b/rust/abacus-base/src/contract_sync/mod.rs index 9f9f46c63..5b5839f92 100644 --- a/rust/abacus-base/src/contract_sync/mod.rs +++ b/rust/abacus-base/src/contract_sync/mod.rs @@ -30,7 +30,6 @@ const MESSAGES_LABEL: &str = "messages"; /// db up-to-date. #[derive(Debug)] pub struct ContractSync { - agent_name: String, contract_name: String, db: AbacusDB, indexer: Arc, @@ -41,7 +40,6 @@ pub struct ContractSync { impl ContractSync { /// Instantiate new ContractSync pub fn new( - agent_name: String, contract_name: String, db: AbacusDB, indexer: Arc, @@ -49,7 +47,6 @@ impl ContractSync { metrics: ContractSyncMetrics, ) -> Self { Self { - agent_name, contract_name, db, indexer, @@ -86,23 +83,23 @@ where let db = self.db.clone(); let indexer = self.indexer.clone(); - let indexed_height = self.metrics.indexed_height.clone().with_label_values(&[ - MESSAGES_LABEL, - &self.contract_name, - &self.agent_name, - ]); - - let stored_messages = self.metrics.stored_events.clone().with_label_values(&[ - MESSAGES_LABEL, - &self.contract_name, - &self.agent_name, - ]); - - let missed_messages = self.metrics.missed_events.clone().with_label_values(&[ - MESSAGES_LABEL, - &self.contract_name, - &self.agent_name, - ]); + let indexed_height = self + .metrics + .indexed_height + .clone() + .with_label_values(&[MESSAGES_LABEL, &self.contract_name]); + + let stored_messages = self + .metrics + .stored_events + .clone() + .with_label_values(&[MESSAGES_LABEL, &self.contract_name]); + + let missed_messages = self + .metrics + .missed_events + .clone() + .with_label_values(&[MESSAGES_LABEL, &self.contract_name]); let message_leaf_index = self.metrics.message_leaf_index.clone(); @@ -519,7 +516,6 @@ mod test { let sync_metrics = ContractSyncMetrics::new(metrics, None); let contract_sync = ContractSync::new( - "agent".to_owned(), "outbox_1".to_owned(), abacus_db.clone(), indexer.clone(), @@ -822,7 +818,6 @@ mod test { let sync_metrics = ContractSyncMetrics::new(metrics, None); let contract_sync = ContractSync::new( - "agent".to_owned(), "outbox_1".to_owned(), abacus_db.clone(), indexer.clone(), diff --git a/rust/abacus-base/src/inbox.rs b/rust/abacus-base/src/inbox.rs index 9e4680d69..941f4bb28 100644 --- a/rust/abacus-base/src/inbox.rs +++ b/rust/abacus-base/src/inbox.rs @@ -50,14 +50,12 @@ impl CachingInbox { /// data pub fn sync( &self, - agent_name: String, index_settings: IndexSettings, metrics: ContractSyncMetrics, ) -> Instrumented>> { let span = info_span!("InboxContractSync", self = %self); let sync = ContractSync::new( - agent_name, String::from_str(self.inbox.name()).expect("!string"), self.db.clone(), self.indexer.clone(), diff --git a/rust/abacus-base/src/outbox.rs b/rust/abacus-base/src/outbox.rs index 499f3e922..9b6598f41 100644 --- a/rust/abacus-base/src/outbox.rs +++ b/rust/abacus-base/src/outbox.rs @@ -57,14 +57,12 @@ impl CachingOutbox { /// data pub fn sync( &self, - agent_name: String, index_settings: IndexSettings, metrics: ContractSyncMetrics, ) -> Instrumented>> { let span = info_span!("OutboxContractSync", self = %self); let sync = ContractSync::new( - agent_name, String::from_str(self.outbox.name()).expect("!string"), self.db.clone(), self.indexer.clone(), diff --git a/rust/agents/relayer/src/relayer.rs b/rust/agents/relayer/src/relayer.rs index 6e42034e5..f39edbcac 100644 --- a/rust/agents/relayer/src/relayer.rs +++ b/rust/agents/relayer/src/relayer.rs @@ -86,11 +86,9 @@ impl Relayer { let outbox_name = outbox.name(); let sync_metrics = ContractSyncMetrics::new(self.metrics(), Some(&["dispatch", outbox_name, "unknown"])); - let sync = self.outbox().sync( - Self::AGENT_NAME.to_string(), - self.as_ref().indexer.clone(), - sync_metrics, - ); + let sync = self + .outbox() + .sync(self.as_ref().indexer.clone(), sync_metrics); sync }