add request to transaction

sentry-core/src/performance.rs

@@ -202,6 +202,14 @@ impl TransactionOrSpan {
         }
     }
 
+    /// Set the HTTP request information for this Transaction/Span.
+    pub fn set_request(&self, request: protocol::Request) {
+        match self {
+            TransactionOrSpan::Transaction(transaction) => transaction.set_request(request),
+            TransactionOrSpan::Span(span) => span.set_request(request),
+        }
+    }
+
     /// Returns the headers needed for distributed tracing.
     pub fn iter_headers(&self) -> TraceHeadersIter {
         match self {
@@ -355,6 +363,14 @@ impl Transaction {
         inner.context.status = Some(status);
     }
 
+    /// Set the HTTP request information for this Transaction.
+    pub fn set_request(&self, request: protocol::Request) {
+        let mut inner = self.inner.lock().unwrap();
+        if let Some(transaction) = inner.transaction.as_mut() {
+            transaction.request = Some(request);
+        }
+    }
+
     /// Returns the headers needed for distributed tracing.
     pub fn iter_headers(&self) -> TraceHeadersIter {
         let inner = self.inner.lock().unwrap();
@@ -454,6 +470,41 @@ impl Span {
         span.status = Some(status);
     }
 
+    /// Set the HTTP request information for this Span.
+    pub fn set_request(&self, request: protocol::Request) {
+        let mut span = self.span.lock().unwrap();
+        // Extract values from the request to be used as data in the span.
+        if let Some(method) = request.method {
+            span.data.insert("method".into(), method.into());
+        }
+        if let Some(url) = request.url {
+            span.data.insert("url".into(), url.to_string().into());
+        }
+        if let Some(data) = request.data {
+            if let Ok(data) = serde_json::from_str::<serde_json::Value>(&data) {
+                span.data.insert("data".into(), data);
+            } else {
+                span.data.insert("data".into(), data.into());
+            }
+        }
+        if let Some(query_string) = request.query_string {
+            span.data.insert("query_string".into(), query_string.into());
+        }
+        if let Some(cookies) = request.cookies {
+            span.data.insert("cookies".into(), cookies.into());
+        }
+        if !request.headers.is_empty() {
+            if let Ok(headers) = serde_json::to_value(request.headers) {
+                span.data.insert("headers".into(), headers);
+            }
+        }
+        if !request.env.is_empty() {
+            if let Ok(env) = serde_json::to_value(request.env) {
+                span.data.insert("env".into(), env);
+            }
+        }
+    }
+
     /// Returns the headers needed for distributed tracing.
     pub fn iter_headers(&self) -> TraceHeadersIter {
         let span = self.span.lock().unwrap();

sentry-types/src/protocol/v7.rs

@@ -15,7 +15,7 @@ use std::ops;
 use std::str;
 use std::time::SystemTime;
 
-use ::debugid::{CodeId, DebugId};
+use self::debugid::{CodeId, DebugId};
 use serde::Serializer;
 use serde::{Deserialize, Serialize};
 use thiserror::Error;
@@ -1737,6 +1737,9 @@ pub struct Span {
     /// Optional extra information to be sent with the span.
     #[serde(default, skip_serializing_if = "Map::is_empty")]
     pub data: Map<String, Value>,
+    /// Optionally HTTP request data to be sent along.
+    #[serde(default, skip_serializing_if = "Option::is_none")]
+    pub request: Option<Request>,
 }
 
 impl Default for Span {
@@ -1753,6 +1756,7 @@ impl Default for Span {
             same_process_as_parent: Default::default(),
             op: Default::default(),
             data: Default::default(),
+            request: Default::default(),
         }
     }
 }
@@ -1942,6 +1946,9 @@ pub struct Transaction<'a> {
     /// Optional contexts.
     #[serde(default, skip_serializing_if = "Map::is_empty")]
     pub contexts: Map<String, Context>,
+    /// Optionally HTTP request data to be sent along.
+    #[serde(default, skip_serializing_if = "Option::is_none")]
+    pub request: Option<Request>,
 }
 
 impl<'a> Default for Transaction<'a> {
@@ -1959,6 +1966,7 @@ impl<'a> Default for Transaction<'a> {
             start_timestamp: SystemTime::now(),
             spans: Default::default(),
             contexts: Default::default(),
+            request: Default::default(),
         }
     }
 }
@@ -1984,6 +1992,7 @@ impl<'a> Transaction<'a> {
             start_timestamp: self.start_timestamp,
             spans: self.spans,
             contexts: self.contexts,
+            request: self.request,
         }
     }