diff --git a/Cargo.lock b/Cargo.lock index dd38ba9b1..137b8eb4f 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -2139,7 +2139,6 @@ dependencies = [ "serde_derive 1.0.89 (registry+https://github.com/rust-lang/crates.io-index)", "serde_json 1.0.39 (registry+https://github.com/rust-lang/crates.io-index)", "solana-logger 0.13.0", - "solana-metrics 0.13.0", "solana-netutil 0.13.0", "solana-sdk 0.13.0", ] diff --git a/client/Cargo.toml b/client/Cargo.toml index 450b80532..35e555a75 100644 --- a/client/Cargo.toml +++ b/client/Cargo.toml @@ -17,7 +17,6 @@ reqwest = "0.9.11" serde = "1.0.89" serde_derive = "1.0.88" serde_json = "1.0.39" -solana-metrics = { path = "../metrics", version = "0.13.0" } solana-netutil = { path = "../netutil", version = "0.13.0" } solana-sdk = { path = "../sdk", version = "0.13.0" } diff --git a/client/src/thin_client.rs b/client/src/thin_client.rs index 7b311bf26..5cb1c1aa2 100644 --- a/client/src/thin_client.rs +++ b/client/src/thin_client.rs @@ -6,18 +6,15 @@ use crate::rpc_client::RpcClient; use bincode::serialize_into; use log::*; -use solana_metrics; -use solana_metrics::influxdb; use solana_sdk::hash::Hash; use solana_sdk::packet::PACKET_DATA_SIZE; use solana_sdk::pubkey::Pubkey; use solana_sdk::signature::{Keypair, Signature}; -use solana_sdk::timing; use solana_sdk::transaction::Transaction; use std::error; use std::io; use std::net::{SocketAddr, UdpSocket}; -use std::time::{Duration, Instant}; +use std::time::Duration; /// An object for querying and sending transactions to the network. pub struct ThinClient { @@ -145,19 +142,7 @@ impl ThinClient { } pub fn check_signature(&self, signature: &Signature) -> bool { - let now = Instant::now(); - let result = self.rpc_client.check_signature(signature); - - solana_metrics::submit( - influxdb::Point::new("thinclient") - .add_tag("op", influxdb::Value::String("check_signature".to_string())) - .add_field( - "duration_ms", - influxdb::Value::Integer(timing::duration_as_ms(&now.elapsed()) as i64), - ) - .to_owned(), - ); - result + self.rpc_client.check_signature(signature) } pub fn fullnode_exit(&self) -> io::Result { @@ -165,12 +150,6 @@ impl ThinClient { } } -impl Drop for ThinClient { - fn drop(&mut self) { - solana_metrics::flush(); - } -} - pub fn create_client((rpc, tpu): (SocketAddr, SocketAddr), range: (u16, u16)) -> ThinClient { let (_, transactions_socket) = solana_netutil::bind_in_range(range).unwrap(); ThinClient::new(rpc, tpu, transactions_socket)