From 118a2327340c2e176d776b7e01ef1ce6f5f4e3c3 Mon Sep 17 00:00:00 2001 From: Dalitso Banda Date: Mon, 22 May 2023 22:14:06 -0700 Subject: [PATCH] remove some comments and old lib --- rust_snuba/Cargo.lock | 11 +++++++++++ rust_snuba/Cargo.toml | 3 +-- rust_snuba/rust_arroyo/src/utils/metrics.rs | 9 ++------- .../src/utils/metrics/backends/abstract_backend.rs | 5 ----- rust_snuba/src/utils/metrics/backends/datadog.rs | 8 +++----- rust_snuba/src/utils/metrics/backends/testing.rs | 13 ++++++------- rust_snuba/src/utils/metrics/mod.rs | 2 -- 7 files changed, 23 insertions(+), 28 deletions(-) diff --git a/rust_snuba/Cargo.lock b/rust_snuba/Cargo.lock index b0f58aaeb68..1af216f4a02 100644 --- a/rust_snuba/Cargo.lock +++ b/rust_snuba/Cargo.lock @@ -302,6 +302,15 @@ dependencies = [ "uuid 1.3.1", ] +[[package]] +name = "dogstatsd" +version = "0.8.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "4609d1443932a4fcee5d2df820ef0597d039fa4154a5c60f798650a5b4f48e14" +dependencies = [ + "chrono", +] + [[package]] name = "encoding_rs" version = "0.8.32" @@ -1356,8 +1365,10 @@ version = "0.1.0" dependencies = [ "anyhow", "ctrlc", + "dogstatsd", "env_logger 0.10.0", "glob", + "lazy_static", "log", "pyo3", "rust_arroyo", diff --git a/rust_snuba/Cargo.toml b/rust_snuba/Cargo.toml index 54d588339df..781d8c54ebf 100644 --- a/rust_snuba/Cargo.toml +++ b/rust_snuba/Cargo.toml @@ -28,8 +28,7 @@ pyo3 = { version = "0.18.1", features = ["chrono", "extension-module"] } ctrlc = "3.2.5" sentry = "0.31.0" -# these are unofficial libs. haven't validated them yet +# unofficial lib. haven't validated it yet dogstatsd = "0.8.0" -cadence = "0.29.0" lazy_static = "1.4.0" diff --git a/rust_snuba/rust_arroyo/src/utils/metrics.rs b/rust_snuba/rust_arroyo/src/utils/metrics.rs index 69076e93956..c85628fff45 100644 --- a/rust_snuba/rust_arroyo/src/utils/metrics.rs +++ b/rust_snuba/rust_arroyo/src/utils/metrics.rs @@ -210,16 +210,11 @@ mod tests { fn test_metrics() { init("my_host", "0.0.0.0:8125"); - assert!(!METRICS_CLIENT - .read() - .clone() - .unwrap() - .should_sample(Some(0.0)),); assert!(METRICS_CLIENT .read() .clone() - .unwrap() - .should_sample(Some(1.0)),); + .is_some() + ); increment( "a", diff --git a/rust_snuba/src/utils/metrics/backends/abstract_backend.rs b/rust_snuba/src/utils/metrics/backends/abstract_backend.rs index a731eeeda7c..83820f31adf 100644 --- a/rust_snuba/src/utils/metrics/backends/abstract_backend.rs +++ b/rust_snuba/src/utils/metrics/backends/abstract_backend.rs @@ -1,9 +1,6 @@ use rust_arroyo::utils::metrics::MetricsClientTrait; pub trait MetricsBackend: MetricsClientTrait { - // fn increment(&self, name: &str, value: i64, tags: &[&str]); - // fn gauge(&self, name: &str, value: f64, tags: &[&str]); - // fn timing(&self, name: &str, value: i64, tags: &[&str]); fn events( &self, title: &str, @@ -12,6 +9,4 @@ pub trait MetricsBackend: MetricsClientTrait { priority: &str, tags: &[&str], ); - // fn counter(&self, name: &str, value: f64, tags: &[&str]) -> Result<(), Error>; - // fn histogram(&self, name: &str, value: f64, tags: &[&str]) -> Result<(), Error>; } diff --git a/rust_snuba/src/utils/metrics/backends/datadog.rs b/rust_snuba/src/utils/metrics/backends/datadog.rs index 8a9b7013219..a03aab5fb3a 100644 --- a/rust_snuba/src/utils/metrics/backends/datadog.rs +++ b/rust_snuba/src/utils/metrics/backends/datadog.rs @@ -101,14 +101,12 @@ mod tests { #[test] fn test_testing_backend() { - - let custom_options = Options::new("0.0.0.0:9000", "0.0.0.0:8125", "analytics", vec!(String::new())); - // let client = dogstatsd::Client::new(dogstatsd::Options::default()).unwrap(); - let client = dogstatsd::Client::new(custom_options).unwrap(); + // default client sends metrics to statsd daemon on localhost:8125 + let client = dogstatsd::Client::new(dogstatsd::Options::default()).unwrap(); let client_tags: Vec = Vec::new(); let testing_backend = DatadogMetricsBackend { client_sd: client, - tags: client_tag + tags: client_tags }; let mut tags: HashMap<&str, &str> = HashMap::new(); diff --git a/rust_snuba/src/utils/metrics/backends/testing.rs b/rust_snuba/src/utils/metrics/backends/testing.rs index c24ef60d8dc..6aeb52d89ea 100644 --- a/rust_snuba/src/utils/metrics/backends/testing.rs +++ b/rust_snuba/src/utils/metrics/backends/testing.rs @@ -1,4 +1,4 @@ -use std::{collections::HashMap, sync::{Arc, Mutex}}; +use std::{collections::HashMap, sync::{Mutex}}; use rust_arroyo::utils::metrics::MetricsClientTrait; @@ -6,19 +6,18 @@ use super::abstract_backend::MetricsBackend; use lazy_static::lazy_static; lazy_static! { - // static ref METRICS_CLIENT: RwLock>> = RwLock::new(None); static ref METRICS: Mutex>> = { - let mut m = HashMap::new(); + let m = HashMap::new(); Mutex::new(m) }; } -// static METRICS: Arc>> = Arc::new(HashMap::new()); pub struct MetricCall { value: String, tags: Vec, } + pub struct TestingMetricsBackend { } @@ -36,7 +35,7 @@ impl MetricsBackend for TestingMetricsBackend { } impl MetricsClientTrait for TestingMetricsBackend{ - fn counter(&self, name: &str, value: Option, tags: Option>, sample_rate: Option) { + fn counter(&self, name: &str, value: Option, tags: Option>, _sample_rate: Option) { let mut tags_vec = Vec::new(); if let Some(tags) = tags { for (k, v) in tags { @@ -51,7 +50,7 @@ impl MetricsClientTrait for TestingMetricsBackend{ }); } - fn gauge(&self, name: &str, value: u64, tags: Option>, sample_rate: Option) { + fn gauge(&self, name: &str, value: u64, tags: Option>, _sample_rate: Option) { let mut tags_vec = Vec::new(); if let Some(tags) = tags { for (k, v) in tags { @@ -67,7 +66,7 @@ impl MetricsClientTrait for TestingMetricsBackend{ }); } - fn time(&self, name: &str, value: u64, tags: Option>, sample_rate: Option) { + fn time(&self, name: &str, value: u64, tags: Option>, _sample_rate: Option) { let mut tags_vec = Vec::new(); if let Some(tags) = tags { for (k, v) in tags { diff --git a/rust_snuba/src/utils/metrics/mod.rs b/rust_snuba/src/utils/metrics/mod.rs index de9ee6ff27e..257edb5a630 100644 --- a/rust_snuba/src/utils/metrics/mod.rs +++ b/rust_snuba/src/utils/metrics/mod.rs @@ -1,3 +1 @@ -pub mod metrics; pub mod backends; -pub mod metrics_wrapper;