From 2e231cea5c4e8e0e8bd5860b609edc9bc1dd0569 Mon Sep 17 00:00:00 2001 From: Duncan Harvey Date: Fri, 17 Jul 2026 10:50:29 -0400 Subject: [PATCH 1/2] fix clippy warnings --- crates/dogstatsd/src/datadog/shipping.rs | 4 ++-- crates/dogstatsd/src/util.rs | 5 ++--- 2 files changed, 4 insertions(+), 5 deletions(-) diff --git a/crates/dogstatsd/src/datadog/shipping.rs b/crates/dogstatsd/src/datadog/shipping.rs index 4ee6d53a..fe442899 100644 --- a/crates/dogstatsd/src/datadog/shipping.rs +++ b/crates/dogstatsd/src/datadog/shipping.rs @@ -43,7 +43,7 @@ impl DdApi { /// Ship a serialized series to the API, blocking pub async fn ship_series(&self, series: &Series) -> Result { - let url = format!("{}/api/v2/series", &self.metrics_intake_url_prefix); + let url = format!("{}/api/v2/series", self.metrics_intake_url_prefix); let safe_body = serde_json::to_vec(&series) .map_err(|e| ShippingError::Payload(format!("Failed to serialize series: {e}")))?; trace!("Sending body: {:?}", &series); @@ -54,7 +54,7 @@ impl DdApi { &self, sketches: &SketchPayload, ) -> Result { - let url = format!("{}/api/beta/sketches", &self.metrics_intake_url_prefix); + let url = format!("{}/api/beta/sketches", self.metrics_intake_url_prefix); let safe_body = sketches .write_to_bytes() .map_err(|e| ShippingError::Payload(format!("Failed to serialize series: {e}")))?; diff --git a/crates/dogstatsd/src/util.rs b/crates/dogstatsd/src/util.rs index 8a16ef0b..c06be42a 100644 --- a/crates/dogstatsd/src/util.rs +++ b/crates/dogstatsd/src/util.rs @@ -40,7 +40,8 @@ pub fn parse_metric_namespace(namespace: &str) -> Option { let mut chars = trimmed.chars(); // Check first character is a letter - if let Some(first_char) = chars.next() { + { + let first_char = chars.next()?; if !first_char.is_ascii_alphabetic() { tracing::error!( "DD_STATSD_METRIC_NAMESPACE must start with a letter, got: '{}'. Ignoring namespace.", @@ -48,8 +49,6 @@ pub fn parse_metric_namespace(namespace: &str) -> Option { ); return None; } - } else { - return None; } // Check remaining characters are valid (alphanumeric, underscore, or period) From 0a78084f3f0ab256aedc5964519fd007eff2b9ac Mon Sep 17 00:00:00 2001 From: Duncan Harvey Date: Fri, 17 Jul 2026 11:03:11 -0400 Subject: [PATCH 2/2] update error when serializing sketches --- crates/dogstatsd/src/datadog/shipping.rs | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/crates/dogstatsd/src/datadog/shipping.rs b/crates/dogstatsd/src/datadog/shipping.rs index fe442899..a8841b50 100644 --- a/crates/dogstatsd/src/datadog/shipping.rs +++ b/crates/dogstatsd/src/datadog/shipping.rs @@ -57,7 +57,7 @@ impl DdApi { let url = format!("{}/api/beta/sketches", self.metrics_intake_url_prefix); let safe_body = sketches .write_to_bytes() - .map_err(|e| ShippingError::Payload(format!("Failed to serialize series: {e}")))?; + .map_err(|e| ShippingError::Payload(format!("Failed to serialize sketches: {e}")))?; trace!("Sending distributions: {:?}", &sketches); self.ship_data(url, safe_body, "application/x-protobuf") .await