fixup! some improvements

Author: szokeasaurusrex

sentry-core/src/performance.rs

@@ -586,6 +586,13 @@ impl TransactionOrSpan {
             TransactionOrSpan::Span(span) => span.finish(),
         }
     }
+
+    pub(crate) fn span_id(&self) -> SpanId {
+        match self {
+            TransactionOrSpan::Transaction(transaction) => transaction.get_trace_context().span_id,
+            TransactionOrSpan::Span(span) => span.get_span_id(),
+        }
+    }
 }
 
 #[derive(Debug)]

sentry-core/src/scope/real.rs

@@ -6,15 +6,15 @@ use std::sync::Mutex;
 use std::sync::{Arc, PoisonError, RwLock};
 
 use crate::performance::TransactionOrSpan;
-use crate::protocol::{
-    Attachment, Breadcrumb, Context, Event, Level, TraceContext, Transaction, User, Value,
-};
 #[cfg(feature = "logs")]
 use crate::protocol::Log;
 #[cfg(any(feature = "logs", feature = "metrics"))]
 use crate::protocol::LogAttribute;
 #[cfg(feature = "metrics")]
 use crate::protocol::Metric;
+use crate::protocol::{
+    Attachment, Breadcrumb, Context, Event, Level, TraceContext, Transaction, User, Value,
+};
 #[cfg(feature = "release-health")]
 use crate::session::Session;
 use crate::{Client, SentryTrace, TraceHeader, TraceHeadersIter};
@@ -408,52 +408,26 @@ impl Scope {
     /// `send_default_pii` is `true`.
     #[cfg(feature = "metrics")]
     pub fn apply_to_metric(&self, metric: &mut Metric, send_default_pii: bool) {
-        if let Some(span) = self.span.as_ref() {
-            metric.trace_id = span.get_trace_context().trace_id;
-        } else {
-            metric.trace_id = self.propagation_context.trace_id;
-        }
+        metric.trace_id = match self.span.as_ref().as_ref() {
+            Some(span) => span.get_trace_context().trace_id,
+            None => self.propagation_context.trace_id,
+        };
 
-        if metric.span_id.is_none() {
-            if let Some(span) = self.get_span() {
-                let span_id = match span {
-                    crate::TransactionOrSpan::Transaction(transaction) => {
-                        transaction.get_trace_context().span_id
-                    }
-                    crate::TransactionOrSpan::Span(span) => span.get_span_id(),
-                };
-                metric.span_id = Some(span_id);
-            }
-        }
+        metric.span_id = metric
+            .span_id
+            .or_else(|| self.get_span().map(|ts| ts.span_id()));
 
-        if send_default_pii {
-            if let Some(user) = self.user.as_ref() {
-                if !metric.attributes.contains_key("user.id") {
-                    if let Some(id) = user.id.as_ref() {
-                        metric
-                            .attributes
-                            .insert("user.id".to_owned(), LogAttribute(id.to_owned().into()));
-                    }
-                }
+        if !send_default_pii {
+            return;
+        }
 
-                if !metric.attributes.contains_key("user.name") {
-                    if let Some(name) = user.username.as_ref() {
-                        metric
-                            .attributes
-                            .insert("user.name".to_owned(), LogAttribute(name.to_owned().into()));
-                    }
-                }
+        let Some(user) = self.user.as_ref() else {
+            return;
+        };
 
-                if !metric.attributes.contains_key("user.email") {
-                    if let Some(email) = user.email.as_ref() {
-                        metric.attributes.insert(
-                            "user.email".to_owned(),
-                            LogAttribute(email.to_owned().into()),
-                        );
-                    }
-                }
-            }
-        }
+        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.
@@ -501,3 +475,22 @@ impl Scope {
         }
     }
 }
+
+#[cfg(feature = "metrics")]
+trait MetricExt {
+    fn insert_attribute<K, V>(&mut self, key: K, value: V)
+    where
+        K: Into<String>,
+        V: Into<Value>;
+}
+
+#[cfg(feature = "metrics")]
+impl MetricExt for Metric {
+    fn insert_attribute<K, V>(&mut self, key: K, value: V)
+    where
+        K: Into<String>,
+        V: Into<Value>,
+    {
+        self.attributes.insert(key, LogAttribute(value.into()));
+    }
+}