cleanup

Author: sentrivana

sentry_sdk/traces.py

@@ -230,7 +230,6 @@ class StreamedSpan:
         "_trace_id",
         "_parent_span_id",
         "_segment",
-        "_sampled",
         "_parent_sampled",
         "_start_timestamp",
         "_start_timestamp_monotonic_ns",
@@ -600,14 +599,6 @@ def __exit__(
     ) -> None:
         self._end()
 
-    @property
-    def name(self) -> str:
-        return ""
-
-    @name.setter
-    def name(self, value: str) -> None:
-        pass
-
     def _start(self) -> None:
         if self._scope is None:
             return
@@ -652,20 +643,20 @@ def finish(self, end_timestamp: "Optional[Union[float, datetime]]" = None) -> No
 
         self._end()
 
-    # XXX[span-first]: These default span_id and trace_id values will be used
-    # in outgoing requests if a noop span is active. Is that how it should be?
+    def get_attributes(self) -> "Attributes":
+        return {}
 
-    @property
-    def span_id(self) -> str:
-        return "0000000000000000"
+    def set_attribute(self, key: str, value: "AttributeValue") -> None:
+        pass
 
-    @property
-    def trace_id(self) -> str:
-        return "00000000000000000000000000000000"
+    def set_attributes(self, attributes: "Attributes") -> None:
+        pass
 
-    @property
-    def sampled(self) -> "Optional[bool]":
-        return False
+    def remove_attribute(self, key: str) -> None:
+        pass
+
+    def _is_segment(self) -> bool:
+        return self._scope is not None
 
     @property
     def status(self) -> "str":
@@ -676,30 +667,31 @@ def status(self, status: "Union[SpanStatus, str]") -> None:
         pass
 
     @property
-    def active(self) -> bool:
-        return True
-
-    def get_attributes(self) -> "Attributes":
-        return {}
+    def name(self) -> str:
+        return ""
 
-    def set_attribute(self, key: str, value: "AttributeValue") -> None:
+    @name.setter
+    def name(self, value: str) -> None:
         pass
 
-    def set_attributes(self, attributes: "Attributes") -> None:
-        pass
+    @property
+    def active(self) -> bool:
+        return True
 
-    def remove_attribute(self, key: str) -> None:
-        pass
+    # XXX[span-first]: These default span_id and trace_id values will be used
+    # in outgoing requests if a noop span is active. Is that how it should be?
 
-    def _is_segment(self) -> bool:
-        return self._scope is not None
+    @property
+    def span_id(self) -> str:
+        return "0000000000000000"
 
-    def _to_traceparent(self) -> str:
-        propagation_context = (
-            sentry_sdk.get_current_scope().get_active_propagation_context()
-        )
+    @property
+    def trace_id(self) -> str:
+        return "00000000000000000000000000000000"
 
-        return f"{propagation_context.trace_id}-{propagation_context.span_id}-0"
+    @property
+    def sampled(self) -> "Optional[bool]":
+        return False
 
     @property
     def start_timestamp(self) -> "Optional[datetime]":
@@ -709,6 +701,13 @@ def start_timestamp(self) -> "Optional[datetime]":
     def timestamp(self) -> "Optional[datetime]":
         return None
 
+    def _to_traceparent(self) -> str:
+        propagation_context = (
+            sentry_sdk.get_current_scope().get_active_propagation_context()
+        )
+
+        return f"{propagation_context.trace_id}-{propagation_context.span_id}-0"
+
 
 def trace(
     func: "Optional[Callable[P, R]]" = None,