From b907d6f4cf750118a097b35aef3ea98c9c19af37 Mon Sep 17 00:00:00 2001
From: Arpad Borsos <arpad.borsos@sentry.io>
Date: Thu, 13 Jan 2022 14:16:26 +0100
Subject: [PATCH] fix: Use correct Transaction props (#405)

The transaction data is called `extra`, and its status is part of the trace context.
---
 sentry-core/src/performance.rs  |  8 +++-----
 sentry-types/src/protocol/v7.rs | 11 +++--------
 2 files changed, 6 insertions(+), 13 deletions(-)

diff --git a/sentry-core/src/performance.rs b/sentry-core/src/performance.rs
index 8cb7ac38..58741661 100644
--- a/sentry-core/src/performance.rs
+++ b/sentry-core/src/performance.rs
@@ -298,22 +298,20 @@ impl Transaction {
     pub fn set_data(&self, key: &str, value: protocol::Value) {
         let mut inner = self.inner.lock().unwrap();
         if let Some(transaction) = inner.transaction.as_mut() {
-            transaction.data.insert(key.into(), value);
+            transaction.extra.insert(key.into(), value);
         }
     }
 
     /// Get the status of the Transaction.
     pub fn get_status(&self) -> Option<protocol::SpanStatus> {
         let inner = self.inner.lock().unwrap();
-        inner.transaction.as_ref().and_then(|tx| tx.status)
+        inner.context.status
     }
 
     /// Set the status of the Transaction.
     pub fn set_status(&self, status: protocol::SpanStatus) {
         let mut inner = self.inner.lock().unwrap();
-        if let Some(transaction) = inner.transaction.as_mut() {
-            transaction.status = Some(status);
-        }
+        inner.context.status = Some(status);
     }
 
     /// Returns the headers needed for distributed tracing.
diff --git a/sentry-types/src/protocol/v7.rs b/sentry-types/src/protocol/v7.rs
index 465e4882..198b737e 100644
--- a/sentry-types/src/protocol/v7.rs
+++ b/sentry-types/src/protocol/v7.rs
@@ -1832,7 +1832,7 @@ pub struct Transaction<'a> {
     pub tags: Map<String, String>,
     /// Optional extra information to be sent with the event.
     #[serde(default, skip_serializing_if = "Map::is_empty")]
-    pub data: Map<String, Value>,
+    pub extra: Map<String, Value>,
     /// SDK metadata
     #[serde(default, skip_serializing_if = "Option::is_none")]
     pub sdk: Option<Cow<'a, ClientSdkInfo>>,
@@ -1848,9 +1848,6 @@ pub struct Transaction<'a> {
     /// The start time of the transaction.
     #[serde(default = "event::default_timestamp", with = "ts_seconds_float")]
     pub start_timestamp: DateTime<Utc>,
-    /// Describes the status of the span (e.g. `ok`, `cancelled`, etc.)
-    #[serde(default, skip_serializing_if = "Option::is_none")]
-    pub status: Option<SpanStatus>,
     /// The collection of finished spans part of this transaction.
     pub spans: Vec<Span>,
     /// Optional contexts.
@@ -1864,14 +1861,13 @@ impl<'a> Default for Transaction<'a> {
             event_id: event::default_id(),
             name: Default::default(),
             tags: Default::default(),
-            data: Default::default(),
+            extra: Default::default(),
             release: Default::default(),
             environment: Default::default(),
             sdk: Default::default(),
             platform: event::default_platform(),
             timestamp: Default::default(),
             start_timestamp: event::default_timestamp(),
-            status: Default::default(),
             spans: Default::default(),
             contexts: Default::default(),
         }
@@ -1890,14 +1886,13 @@ impl<'a> Transaction<'a> {
             event_id: self.event_id,
             name: self.name,
             tags: self.tags,
-            data: self.data,
+            extra: self.extra,
             release: self.release.map(|x| Cow::Owned(x.into_owned())),
             environment: self.environment.map(|x| Cow::Owned(x.into_owned())),
             sdk: self.sdk.map(|x| Cow::Owned(x.into_owned())),
             platform: Cow::Owned(self.platform.into_owned()),
             timestamp: self.timestamp,
             start_timestamp: self.start_timestamp,
-            status: self.status,
             spans: self.spans,
             contexts: self.contexts,
         }