fix: Write description and op into trace

untitaker · untitaker · commit 9c2188940e65 · 2019-06-12T22:36:27.000+02:00
diff --git a/sentry_sdk/tracing.py b/sentry_sdk/tracing.py
@@ -65,6 +65,8 @@ def __init__(
         self.same_process_as_parent = same_process_as_parent
         self.sampled = sampled
         self.transaction = transaction
+        self.op = op
+        self.description = description
         self._tags = {}  # type: Dict[str, str]
         self._data = {}  # type: Dict[str, Any]
         self._finished_spans = []  # type: List[Span]
@@ -165,14 +167,21 @@ def to_json(self):
             "span_id": self.span_id,
             "parent_span_id": self.parent_span_id,
             "transaction": self.transaction,
+            "op": self.op,
+            "description": self.description,
             "tags": self._tags,
             "data": self._data,
             "start_timestamp": self.start_timestamp,
             "timestamp": self.timestamp,
         }
 
     def get_trace_context(self):
-        return {"trace_id": self.trace_id, "span_id": self.span_id}
+        return {
+            "trace_id": self.trace_id,
+            "span_id": self.span_id,
+            "op": self.op,
+            "description": self.description,
+        }
 
 
 @contextlib.contextmanager
diff --git a/tests/test_tracing.py b/tests/test_tracing.py
@@ -11,10 +11,10 @@ def test_basic(sentry_init, capture_events, sample_rate):
 
     with Hub.current.trace(transaction="hi"):
         with pytest.raises(ZeroDivisionError):
-            with Hub.current.span():
+            with Hub.current.span(op='foo', description='foodesc'):
                 1 / 0
 
-        with Hub.current.span():
+        with Hub.current.span(op='bar', description='bardesc'):
             pass
 
     if sample_rate:
@@ -23,7 +23,11 @@ def test_basic(sentry_init, capture_events, sample_rate):
         span1, span2 = event["spans"]
         parent_span = event
         assert span1["tags"]["error"]
+        assert span1['op'] == 'foo'
+        assert span1['description'] == 'foodesc'
         assert not span2["tags"]["error"]
+        assert span2['op'] == 'bar'
+        assert span2['description'] == 'bardesc'
         assert parent_span["transaction"] == "hi"
     else:
         assert not events
