fixup! simplify

Author: szokeasaurusrex

sentry-core/src/client.rs

@@ -68,7 +68,7 @@ pub struct Client {
     #[cfg(feature = "logs")]
     default_log_attributes: Option<BTreeMap<String, LogAttribute>>,
     #[cfg(feature = "metrics")]
-    default_metric_attributes: Option<BTreeMap<Cow<'static, str>, LogAttribute>>,
+    default_metric_attributes: BTreeMap<Cow<'static, str>, LogAttribute>,
     integrations: Vec<(TypeId, Arc<dyn Integration>)>,
     pub(crate) sdk_info: ClientSdkInfo,
 }
@@ -215,7 +215,7 @@ impl Client {
             #[cfg(feature = "logs")]
             default_log_attributes: None,
             #[cfg(feature = "metrics")]
-            default_metric_attributes: None,
+            default_metric_attributes: Default::default(),
             integrations,
             sdk_info,
         };
@@ -282,31 +282,24 @@ impl Client {
 
     #[cfg(feature = "metrics")]
     fn cache_default_metric_attributes(&mut self) {
-        let mut attributes = BTreeMap::new();
-
-        if let Some(environment) = self.options.environment.as_ref() {
-            attributes.insert("sentry.environment".into(), environment.clone().into());
-        }
-
-        if let Some(release) = self.options.release.as_ref() {
-            attributes.insert("sentry.release".into(), release.clone().into());
-        }
-
-        attributes.insert(
-            "sentry.sdk.name".into(),
-            self.sdk_info.name.to_owned().into(),
-        );
-
-        attributes.insert(
-            "sentry.sdk.version".into(),
-            self.sdk_info.version.to_owned().into(),
-        );
-
-        if let Some(server) = &self.options.server_name {
-            attributes.insert("server.address".into(), server.clone().into());
-        }
-
-        self.default_metric_attributes = Some(attributes);
+        let always_present_attributes = [
+            ("sentry.sdk.name", &self.sdk_info.name),
+            ("sentry.sdk.version", &self.sdk_info.version),
+        ]
+        .into_iter()
+        .map(|(name, value)| (name.into(), value.as_str().into()));
+
+        let maybe_present_attributes = [
+            ("sentry.environment", &self.options.environment),
+            ("sentry.release", &self.options.release),
+            ("server.address", &self.options.server_name),
+        ]
+        .into_iter()
+        .filter_map(|(name, value)| value.clone().map(|value| (name.into(), value.into())));
+
+        self.default_metric_attributes = maybe_present_attributes
+            .chain(always_present_attributes)
+            .collect();
     }
 
     pub(crate) fn get_integration<I>(&self) -> Option<&I>
@@ -565,11 +558,13 @@ impl Client {
     /// Captures a metric and sends it to Sentry.
     #[cfg(feature = "metrics")]
     pub fn capture_metric(&self, metric: Metric, scope: &Scope) {
-        if !self.options.enable_metrics {
-            return;
-        }
         if let Some(metric) = self.prepare_metric(metric, scope) {
-            if let Some(ref batcher) = *self.metrics_batcher.read().unwrap() {
+            if let Some(batcher) = self
+                .metrics_batcher
+                .read()
+                .expect("metrics batcher lock could not be acquired")
+                .as_ref()
+            {
                 batcher.enqueue(metric);
             }
         }
@@ -581,10 +576,8 @@ impl Client {
     fn prepare_metric(&self, mut metric: Metric, scope: &Scope) -> Option<Metric> {
         scope.apply_to_metric(&mut metric, self.options.send_default_pii);
 
-        if let Some(default_attributes) = self.default_metric_attributes.as_ref() {
-            for (key, val) in default_attributes.iter() {
-                metric.attributes.entry(key.clone()).or_insert(val.clone());
-            }
+        for (key, val) in &self.default_metric_attributes {
+            metric.attributes.entry(key.clone()).or_insert(val.clone());
         }
 
         if let Some(ref func) = self.options.before_send_metric {

sentry-core/src/clientoptions.rs

@@ -240,6 +240,12 @@ impl fmt::Debug for ClientOptions {
             struct BeforeSendLog;
             self.before_send_log.as_ref().map(|_| BeforeSendLog)
         };
+        #[cfg(feature = "metrics")]
+        let before_send_metric = {
+            #[derive(Debug)]
+            struct BeforeSendMetric;
+            self.before_send_metric.as_ref().map(|_| BeforeSendMetric)
+        };
         #[derive(Debug)]
         struct TransportFactory;
 
@@ -287,16 +293,9 @@ impl fmt::Debug for ClientOptions {
             .field("before_send_log", &before_send_log);
 
         #[cfg(feature = "metrics")]
-        {
-            let before_send_metric = {
-                #[derive(Debug)]
-                struct BeforeSendMetric;
-                self.before_send_metric.as_ref().map(|_| BeforeSendMetric)
-            };
-            debug_struct
-                .field("enable_metrics", &self.enable_metrics)
-                .field("before_send_metric", &before_send_metric);
-        }
+        debug_struct
+            .field("enable_metrics", &self.enable_metrics)
+            .field("before_send_metric", &before_send_metric);
 
         debug_struct.field("user_agent", &self.user_agent).finish()
     }

sentry-core/src/lib.rs

@@ -163,6 +163,3 @@ pub use sentry_types::protocol::v7::{Breadcrumb, Envelope, Level, User};
 
 // utilities reused across integrations
 pub mod utils;
-
-// telemtry types (limited to metrics for now)
-pub mod telemetry;

sentry-core/src/scope/real.rs

@@ -408,26 +408,19 @@ impl Scope {
     /// `send_default_pii` is `true`.
     #[cfg(feature = "metrics")]
     pub fn apply_to_metric(&self, metric: &mut Metric, send_default_pii: bool) {
-        metric.trace_id = match self.span.as_ref().as_ref() {
-            Some(span) => span.get_trace_context().trace_id,
-            None => self.propagation_context.trace_id,
-        };
-
-        metric.span_id = metric
-            .span_id
-            .or_else(|| self.get_span().map(|ts| ts.span_id()));
-
-        if !send_default_pii {
-            return;
+        metric.trace_id = (*self.span)
+            .as_ref()
+            .map(|span| span.get_trace_context().trace_id)
+            .unwrap_or(self.propagation_context.trace_id);
+
+        metric.span_id = self.get_span().map(|ts| ts.span_id());
+
+        // Apply user data if send_default_pii is true
+        if let Some(user) = send_default_pii.then_some(self.user.as_ref()).flatten() {
+            metric.insert_attribute("user.id", user.id.as_deref());
+            metric.insert_attribute("user.name", user.username.as_deref());
+            metric.insert_attribute("user.email", user.email.as_deref());
         }
-
-        let Some(user) = self.user.as_ref() else {
-            return;
-        };
-
-        metric.insert_attribute("user.id", user.id.as_deref());
-        metric.insert_attribute("user.name", user.username.as_deref());
-        metric.insert_attribute("user.email", user.email.as_deref());
     }
 
     /// Set the given [`TransactionOrSpan`] as the active span for this scope.