Merge 9dc857f into 4b886a8

Author: loewenheim

sentry-core/src/performance.rs

@@ -571,7 +571,7 @@ impl Transaction {
                         .contexts
                         .insert("trace".into(), inner.context.clone().into());
 
-                    // TODO: apply the scope to the transaction, whatever that means
+                    Hub::current().with_current_scope(|scope| scope.apply_to_transaction(&mut transaction));
                     let opts = client.options();
                     transaction.release = opts.release.clone();
                     transaction.environment = opts.environment.clone();

sentry-core/src/scope/real.rs

@@ -4,7 +4,7 @@ use std::fmt;
 use std::sync::{Arc, Mutex, PoisonError, RwLock};
 
 use crate::performance::TransactionOrSpan;
-use crate::protocol::{Attachment, Breadcrumb, Context, Event, Level, User, Value};
+use crate::protocol::{Attachment, Breadcrumb, Context, Event, Level, Transaction, User, Value};
 use crate::session::Session;
 use crate::Client;
 
@@ -302,6 +302,21 @@ impl Scope {
         Some(event)
     }
 
+    /// Applies the contained scoped data to fill a transaction.
+    pub fn apply_to_transaction(&self, transaction: &mut Transaction<'static>) {
+        transaction
+            .extra
+            .extend(self.extra.iter().map(|(k, v)| (k.to_owned(), v.to_owned())));
+        transaction
+            .tags
+            .extend(self.tags.iter().map(|(k, v)| (k.to_owned(), v.to_owned())));
+        transaction.contexts.extend(
+            self.contexts
+                .iter()
+                .map(|(k, v)| (k.to_owned(), v.to_owned())),
+        );
+    }
+
     /// Set the given [`TransactionOrSpan`] as the active span for this scope.
     pub fn set_span(&mut self, span: Option<TransactionOrSpan>) {
         self.span = Arc::new(span);