From 3bcdda39ba4c0ad3e6cdce60a0ce1f8e224ce644 Mon Sep 17 00:00:00 2001
From: Lorenzo Cian <lorenzo.cian@sentry.io>
Date: Thu, 6 Feb 2025 19:26:16 +0100
Subject: [PATCH] feat(core): `transaction.set_data` sets data on
 `TraceContext` (#739)

* change types that provide access to Transaction data to also access data attributes instead of extra

* change tests to reflect new API
---
 sentry-core/src/performance.rs  | 36 ++++++++++++++++++++-------------
 sentry-tracing/tests/smoke.rs   | 14 ++++++-------
 sentry-types/src/protocol/v7.rs |  3 +++
 3 files changed, 32 insertions(+), 21 deletions(-)

diff --git a/sentry-core/src/performance.rs b/sentry-core/src/performance.rs
index 0ebefd2e..740cd0ba 100644
--- a/sentry-core/src/performance.rs
+++ b/sentry-core/src/performance.rs
@@ -526,32 +526,32 @@ pub struct Transaction {
     pub(crate) inner: TransactionArc,
 }
 
-/// Iterable for a transaction's [`extra` field](protocol::Transaction::extra).
+/// Iterable for a transaction's [data attributes](protocol::TraceContext::data).
 pub struct TransactionData<'a>(MutexGuard<'a, TransactionInner>);
 
 impl<'a> TransactionData<'a> {
-    /// Iterate over the `extra` map
-    /// of the [transaction][protocol::Transaction].
+    /// Iterate over the [data attributes](protocol::TraceContext::data)
+    /// associated with this [transaction][protocol::Transaction].
     ///
-    /// If the transaction not sampled for sending,
-    /// the metadata will not be populated at all
+    /// If the transaction is not sampled for sending,
+    /// the metadata will not be populated at all,
     /// so the produced iterator is empty.
     pub fn iter(&self) -> Box<dyn Iterator<Item = (&String, &protocol::Value)> + '_> {
-        if let Some(ref rx) = self.0.transaction {
-            Box::new(rx.extra.iter())
+        if self.0.transaction.is_some() {
+            Box::new(self.0.context.data.iter())
         } else {
             Box::new(std::iter::empty())
         }
     }
 
-    /// Set some extra information to be sent with this Transaction.
+    /// Set a data attribute to be sent with this Transaction.
     pub fn set_data(&mut self, key: Cow<'a, str>, value: protocol::Value) {
-        if let Some(transaction) = self.0.transaction.as_mut() {
-            transaction.extra.insert(key.into(), value);
+        if self.0.transaction.is_some() {
+            self.0.context.data.insert(key.into(), value);
         }
     }
 
-    /// Set some extra information to be sent with this Transaction.
+    /// Set a tag to be sent with this Transaction.
     pub fn set_tag(&mut self, key: Cow<'_, str>, value: String) {
         if let Some(transaction) = self.0.transaction.as_mut() {
             transaction.tags.insert(key.into(), value);
@@ -610,8 +610,16 @@ impl Transaction {
         }
     }
 
-    /// Set some extra information to be sent with this Transaction.
+    /// Set a data attribute to be sent with this Transaction.
     pub fn set_data(&self, key: &str, value: protocol::Value) {
+        let mut inner = self.inner.lock().unwrap();
+        if inner.transaction.is_some() {
+            inner.context.data.insert(key.into(), value);
+        }
+    }
+
+    /// Set some extra information to be sent with this Transaction.
+    pub fn set_extra(&self, key: &str, value: protocol::Value) {
         let mut inner = self.inner.lock().unwrap();
         if let Some(transaction) = inner.transaction.as_mut() {
             transaction.extra.insert(key.into(), value);
@@ -627,10 +635,10 @@ impl Transaction {
     }
 
     /// Returns an iterating accessor to the transaction's
-    /// [`extra` field](protocol::Transaction::extra).
+    /// [data attributes](protocol::TraceContext::data).
     ///
     /// # Concurrency
-    /// In order to obtain any kind of reference to the `extra` field,
+    /// In order to obtain any kind of reference to the `TraceContext::data` field,
     /// a `Mutex` needs to be locked. The returned `TransactionData` holds on to this lock
     /// for as long as it lives. Therefore you must take care not to keep the returned
     /// `TransactionData` around too long or it will never relinquish the lock and you may run into
diff --git a/sentry-tracing/tests/smoke.rs b/sentry-tracing/tests/smoke.rs
index 5eb19c0f..22b3ad26 100644
--- a/sentry-tracing/tests/smoke.rs
+++ b/sentry-tracing/tests/smoke.rs
@@ -33,21 +33,21 @@ fn should_instrument_function_with_event() {
         unexpected => panic!("Expected transaction, but got {:#?}", unexpected),
     };
     assert_eq!(transaction.tags.len(), 1);
-    assert_eq!(transaction.extra.len(), 2);
+    assert_eq!(trace.data.len(), 2);
 
     let tag = transaction
         .tags
         .get("tag")
         .expect("to have tag with name 'tag'");
     assert_eq!(tag, "key");
-    let not_tag = transaction
-        .extra
+    let not_tag = trace
+        .data
         .get("not_tag")
-        .expect("to have extra with name 'not_tag'");
+        .expect("to have data attribute with name 'not_tag'");
     assert_eq!(not_tag, "value");
-    let value = transaction
-        .extra
+    let value = trace
+        .data
         .get("value")
-        .expect("to have extra with name 'value'");
+        .expect("to have data attribute with name 'value'");
     assert_eq!(value, 1);
 }
diff --git a/sentry-types/src/protocol/v7.rs b/sentry-types/src/protocol/v7.rs
index bdbb2fc1..badeaa0b 100644
--- a/sentry-types/src/protocol/v7.rs
+++ b/sentry-types/src/protocol/v7.rs
@@ -1435,6 +1435,9 @@ pub struct TraceContext {
     /// Describes the status of the span (e.g. `ok`, `cancelled`, etc.)
     #[serde(default, skip_serializing_if = "Option::is_none")]
     pub status: Option<SpanStatus>,
+    /// Optional data attributes to be associated with the transaction.
+    #[serde(default, skip_serializing_if = "Map::is_empty")]
+    pub data: Map<String, Value>,
 }
 
 macro_rules! into_context {