More cleanup

Author: Sushisource

Cargo.toml

@@ -8,7 +8,7 @@ license-file = "LICENSE.txt"
 
 [workspace.dependencies]
 derive_builder = "0.20"
-derive_more = { version = "2.0", features = ["constructor", "display", "from", "into", "debug"] }
+derive_more = { version = "2.0", features = ["constructor", "display", "from", "into", "debug", "try_into"] }
 thiserror = "2"
 tonic = "0.13"
 tonic-build = "0.13"

client/src/lib.rs

@@ -1673,6 +1673,15 @@ impl<T> RequestExt for tonic::Request<T> {
     }
 }
 
+macro_rules! dbg_panic {
+  ($($arg:tt)*) => {
+      use tracing::error;
+      error!($($arg)*);
+      debug_assert!(false, $($arg)*);
+  };
+}
+pub(crate) use dbg_panic;
+
 #[cfg(test)]
 mod tests {
     use super::*;

client/src/metrics.rs

@@ -1,4 +1,4 @@
-use crate::{AttachMetricLabels, CallType};
+use crate::{AttachMetricLabels, CallType, dbg_panic};
 use futures_util::{FutureExt, future::BoxFuture};
 use std::{
     sync::Arc,
@@ -89,27 +89,32 @@ impl MetricsContext {
             .meter
             .extend_attributes(self.kvs.clone(), new_kvs.into());
 
-        // TODO: elses
-        if let Ok(v) = self.instruments.svc_request.with_attributes(&self.kvs) {
-            self.instruments.svc_request = v;
-        }
-        if let Ok(v) = self.instruments.long_svc_request.with_attributes(&self.kvs) {
-            self.instruments.long_svc_request = v;
-        }
-        if let Ok(v) = self
-            .instruments
-            .svc_request_latency
-            .with_attributes(&self.kvs)
-        {
-            self.instruments.svc_request_latency = v;
-        }
-        if let Ok(v) = self
+        let _ = self
             .instruments
-            .long_svc_request_latency
+            .svc_request
             .with_attributes(&self.kvs)
-        {
-            self.instruments.long_svc_request_latency = v;
-        }
+            .and_then(|v| {
+                self.instruments.svc_request = v;
+                self.instruments.long_svc_request.with_attributes(&self.kvs)
+            })
+            .and_then(|v| {
+                self.instruments.long_svc_request = v;
+                self.instruments
+                    .svc_request_latency
+                    .with_attributes(&self.kvs)
+            })
+            .and_then(|v| {
+                self.instruments.svc_request_latency = v;
+                self.instruments
+                    .long_svc_request_latency
+                    .with_attributes(&self.kvs)
+            })
+            .map(|v| {
+                self.instruments.long_svc_request_latency = v;
+            })
+            .inspect_err(|e| {
+                dbg_panic!("Failed to extend client metrics attributes: {:?}", e);
+            });
     }
 
     pub(crate) fn set_is_long_poll(&mut self) {

core-api/Cargo.toml

@@ -15,15 +15,13 @@ categories = ["development-tools"]
 [features]
 otel_impls = ["dep:opentelemetry"]
 envconfig = ["dep:toml", "dep:serde", "dep:dirs"]
-prom_impls = ["dep:prometheus"]
 
 [dependencies]
 async-trait = "0.1"
 dirs = { version = "5.0", optional = true }
 derive_builder = { workspace = true }
 derive_more = { workspace = true }
 opentelemetry = { workspace = true, optional = true }
-prometheus = { version = "0.14", optional = true }
 prost = { workspace = true }
 serde = { version = "1.0", features = ["derive"], optional = true }
 serde_json = "1.0"

core-api/src/lib.rs

@@ -141,6 +141,7 @@ pub trait Worker: Send + Sync {
 
 macro_rules! dbg_panic {
   ($($arg:tt)*) => {
+      use tracing::error;
       error!($($arg)*);
       debug_assert!(false, $($arg)*);
   };