Added transaction info to scope (and events)

Author: antonpirker

sentry_sdk/integrations/flask.py

@@ -5,6 +5,7 @@
 from sentry_sdk.integrations import DidNotEnable, Integration
 from sentry_sdk.integrations._wsgi_common import RequestExtractor
 from sentry_sdk.integrations.wsgi import SentryWsgiMiddleware
+from sentry_sdk.scope import Scope
 from sentry_sdk.utils import (
     TRANSACTION_SOURCE_COMPONENT,
     TRANSACTION_SOURCE_ROUTE,
@@ -110,6 +111,7 @@ def _add_sentry_trace(sender, template, context, **extra):
 
 
 def _add_transaction(scope, style, request):
+    # type: (Scope, str, Request) -> Scope
     name_for_style = {
         "url": request.url_rule.rule,
         "endpoint": request.url_rule.endpoint,
@@ -119,8 +121,9 @@ def _add_transaction(scope, style, request):
         "endpoint": TRANSACTION_SOURCE_COMPONENT,
     }
 
-    scope.transaction = name_for_style[style]
-    scope.transaction_info = {"source": source_for_style[style]}
+    scope.set_transaction_name(
+        name_for_style.get(style), source=source_for_style.get(style)
+    )
 
     return scope
 

sentry_sdk/scope.py

@@ -81,6 +81,7 @@ class Scope(object):
         # note that for legacy reasons, _transaction is the transaction *name*,
         # not a Transaction object (the object is stored in _span)
         "_transaction",
+        "_transaction_info",
         "_user",
         "_tags",
         "_contexts",
@@ -109,6 +110,7 @@ def clear(self):
         self._level = None  # type: Optional[str]
         self._fingerprint = None  # type: Optional[List[str]]
         self._transaction = None  # type: Optional[str]
+        self._transaction_info = {}  # type: Dict[str, str]
         self._user = None  # type: Optional[Dict[str, Any]]
 
         self._tags = {}  # type: Dict[str, Any]
@@ -176,6 +178,17 @@ def transaction(self, value):
         if self._span and self._span.containing_transaction:
             self._span.containing_transaction.name = value
 
+    def set_transaction_name(self, name, source=None):
+        # type: (str, Optional[str]) -> None
+        """Set the transaction name and optionally the transaction source."""
+        self._transaction = name
+
+        if self._span and self._span.containing_transaction:
+            self._span.containing_transaction.name = name
+
+        if source:
+            self._transaction_info["source"] = source
+
     @_attr_setter
     def user(self, value):
         # type: (Optional[Dict[str, Any]]) -> None
@@ -363,6 +376,9 @@ def _drop(event, cause, ty):
         if event.get("transaction") is None and self._transaction is not None:
             event["transaction"] = self._transaction
 
+        if event.get("transaction_info") is None and self._transaction_info is not None:
+            event["transaction_info"] = self._transaction_info
+
         if event.get("fingerprint") is None and self._fingerprint is not None:
             event["fingerprint"] = self._fingerprint
 
@@ -406,6 +422,8 @@ def update_from_scope(self, scope):
             self._fingerprint = scope._fingerprint
         if scope._transaction is not None:
             self._transaction = scope._transaction
+        if scope._transaction_info is not None:
+            self._transaction_info.update(scope._transaction_info)
         if scope._user is not None:
             self._user = scope._user
         if scope._tags:
@@ -452,6 +470,7 @@ def __copy__(self):
         rv._name = self._name
         rv._fingerprint = self._fingerprint
         rv._transaction = self._transaction
+        rv._transaction_info = dict(self._transaction_info)
         rv._user = self._user
 
         rv._tags = dict(self._tags)