diff --git a/Cargo.lock b/Cargo.lock index b3d0744fb1..bb1f314354 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -5651,7 +5651,6 @@ dependencies = [ "serde", "serde_derive", "smpl_jwt", - "solana-metrics", "solana-sdk", "solana-storage-proto", "solana-transaction-status", diff --git a/storage-bigtable/Cargo.toml b/storage-bigtable/Cargo.toml index 4f6611f371..af780bc6ae 100644 --- a/storage-bigtable/Cargo.toml +++ b/storage-bigtable/Cargo.toml @@ -24,7 +24,6 @@ rand_core = "0.6.2" serde = "1.0.122" serde_derive = "1.0.103" smpl_jwt = "0.6.0" -solana-metrics = { path = "../metrics", version = "=1.8.6" } solana-sdk = { path = "../sdk", version = "=1.8.6" } solana-storage-proto = { path = "../storage-proto", version = "=1.8.6" } solana-transaction-status = { path = "../transaction-status", version = "=1.8.6" } diff --git a/storage-bigtable/src/lib.rs b/storage-bigtable/src/lib.rs index 18c6c1d8a2..179677936f 100644 --- a/storage-bigtable/src/lib.rs +++ b/storage-bigtable/src/lib.rs @@ -2,7 +2,6 @@ use { log::*, serde::{Deserialize, Serialize}, - solana_metrics::inc_new_counter_debug, solana_sdk::{ clock::{Slot, UnixTimestamp}, deserialize_utils::default_on_eof, @@ -25,9 +24,6 @@ use { thiserror::Error, }; -#[macro_use] -extern crate solana_metrics; - #[macro_use] extern crate serde_derive; @@ -353,8 +349,6 @@ impl LedgerStorage { /// Return the available slot that contains a block pub async fn get_first_available_block(&self) -> Result> { - debug!("LedgerStorage::get_first_available_block request received"); - inc_new_counter_debug!("storage-bigtable-query", 1); let mut bigtable = self.connection.client(); let blocks = bigtable.get_row_keys("blocks", None, None, 1).await?; if blocks.is_empty() { @@ -369,11 +363,6 @@ impl LedgerStorage { /// limit: stop after this many slots have been found; if limit==0, all records in the table /// after start_slot will be read pub async fn get_confirmed_blocks(&self, start_slot: Slot, limit: usize) -> Result> { - debug!( - "LedgerStorage::get_confirmed_blocks request received: {:?} {:?}", - start_slot, limit - ); - inc_new_counter_debug!("storage-bigtable-query", 1); let mut bigtable = self.connection.client(); let blocks = bigtable .get_row_keys( @@ -388,11 +377,6 @@ impl LedgerStorage { /// Fetch the confirmed block from the desired slot pub async fn get_confirmed_block(&self, slot: Slot) -> Result { - debug!( - "LedgerStorage::get_confirmed_block request received: {:?}", - slot - ); - inc_new_counter_debug!("storage-bigtable-query", 1); let mut bigtable = self.connection.client(); let block_cell_data = bigtable .get_protobuf_or_bincode_cell::( @@ -413,11 +397,6 @@ impl LedgerStorage { } pub async fn get_signature_status(&self, signature: &Signature) -> Result { - debug!( - "LedgerStorage::get_signature_status request received: {:?}", - signature - ); - inc_new_counter_debug!("storage-bigtable-query", 1); let mut bigtable = self.connection.client(); let transaction_info = bigtable .get_bincode_cell::("tx", signature.to_string()) @@ -434,11 +413,6 @@ impl LedgerStorage { &self, signature: &Signature, ) -> Result> { - debug!( - "LedgerStorage::get_confirmed_transaction request received: {:?}", - signature - ); - inc_new_counter_debug!("storage-bigtable-query", 1); let mut bigtable = self.connection.client(); // Figure out which block the transaction is located in @@ -494,11 +468,6 @@ impl LedgerStorage { u32, /*slot index*/ )>, > { - debug!( - "LedgerStorage::get_confirmed_signatures_for_address request received: {:?}", - address - ); - inc_new_counter_debug!("storage-bigtable-query", 1); let mut bigtable = self.connection.client(); let address_prefix = format!("{}/", address);