fix: send trace origin correctly (#906)

Author: lcian

CHANGELOG.md

@@ -17,6 +17,8 @@
   - Previously, if a middleware were to process the request after the Sentry middleware and return an error, our middleware would always capture it and send it to Sentry, regardless if it was a client, server or some other kind of error.
   - With this change, we capture errors returned by middleware only if those errors can be classified as server errors.
   - There is no change in behavior when it comes to errors returned by services, in which case the Sentry middleware only captures server errors exclusively.
+- fix: send trace origin correctly ([#906](https://github.com/getsentry/sentry-rust/pull/906)) by @lcian
+  - `TraceContext` now has an additional field `origin`, used to report which integration created a transaction.
 
 ### Behavioral changes
 

sentry-actix/src/lib.rs

@@ -322,7 +322,7 @@ where
 
             let transaction = hub.start_transaction(ctx);
             transaction.set_request(sentry_req.clone());
-            transaction.set_data("origin", "auto.http.actix".into());
+            transaction.set_origin("auto.http.actix");
             Some(transaction)
         } else {
             None

sentry-core/src/performance.rs

@@ -819,6 +819,12 @@ impl Transaction {
         }
     }
 
+    /// Sets the origin for this transaction, indicating what created it.
+    pub fn set_origin(&self, origin: &str) {
+        let mut inner = self.inner.lock().unwrap();
+        inner.context.origin = Some(origin.to_owned());
+    }
+
     /// Returns the headers needed for distributed tracing.
     /// Use [`crate::Scope::iter_trace_propagation_headers`] to obtain the active
     /// trace's distributed tracing headers.

sentry-opentelemetry/src/processor.rs

@@ -174,8 +174,8 @@ impl SpanProcessor for SentrySpanProcessor {
         // TODO: read OTEL semantic convention span attributes and map them to the appropriate
         // Sentry span attributes/context values
 
-        if matches!(sentry_span, TransactionOrSpan::Transaction(_)) {
-            sentry_span.set_data("origin", "auto.otel".into())
+        if let TransactionOrSpan::Transaction(transaction) = &sentry_span {
+            transaction.set_origin("auto.otel");
         }
         sentry_span.set_status(convert_span_status(&data.status));
         sentry_span.finish_with_timestamp(data.end_time);

sentry-tower/src/http.rs

@@ -118,10 +118,10 @@ where
         if let Some((sentry_req, trx_ctx)) = slf.on_first_poll.take() {
             sentry_core::configure_scope(|scope| {
                 if let Some(trx_ctx) = trx_ctx {
-                    let transaction: sentry_core::TransactionOrSpan =
-                        sentry_core::start_transaction(trx_ctx).into();
+                    let transaction = sentry_core::start_transaction(trx_ctx);
+                    transaction.set_origin("auto.http.tower");
+                    let transaction: sentry_core::TransactionOrSpan = transaction.into();
                     transaction.set_request(sentry_req.clone());
-                    transaction.set_data("origin", "auto.http.tower".into());
                     let parent_span = scope.get_span();
                     scope.set_span(Some(transaction.clone()));
                     *slf.transaction = Some((transaction, parent_span));

sentry-tracing/src/layer.rs

@@ -322,7 +322,7 @@ where
                 };
 
                 let tx = sentry_core::start_transaction(ctx);
-                tx.set_data("origin", "auto.tracing".into());
+                tx.set_origin("auto.tracing");
                 tx.into()
             }
         };

sentry-tracing/tests/smoke.rs

@@ -34,7 +34,7 @@ fn should_instrument_function_with_event() {
     };
     assert_eq!(transaction.name, Some("function_with_tags".into()));
     assert_eq!(transaction.tags.len(), 1);
-    assert_eq!(trace.data.len(), 7);
+    assert_eq!(trace.data.len(), 6);
 
     let tag = transaction
         .tags

sentry-types/src/protocol/v7.rs

@@ -1504,6 +1504,10 @@ 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>,
+    /// Describes what created the transaction. See the [develop
+    /// docs](https://develop.sentry.dev/sdk/telemetry/traces/trace-origin/) for more information.
+    #[serde(default, skip_serializing_if = "Option::is_none")]
+    pub origin: Option<String>,
     /// Optional data attributes to be associated with the transaction.
     #[serde(default, skip_serializing_if = "Map::is_empty")]
     pub data: Map<String, Value>,