wip

Author: sentrivana

sentry_sdk/api.py

@@ -5,7 +5,7 @@
 from sentry_sdk._types import TYPE_CHECKING
 from sentry_sdk.consts import INSTRUMENTER
 from sentry_sdk.scope import Scope, _ScopeManager, new_scope, isolation_scope
-from sentry_sdk.tracing import NoOpSpan, Transaction
+from sentry_sdk.tracing import POTelSpan, Transaction
 
 if TYPE_CHECKING:
     from collections.abc import Mapping
@@ -286,14 +286,14 @@ def flush(
 def start_span(
     **kwargs,  # type: Any
 ):
-    # type: (...) -> Span
+    # type: (...) -> POTelSpan
     return tracing.start_span(**kwargs)
 
 
 def start_inactive_span(
     **kwargs,  # type: Any
 ):
-    # type: (...) -> Span
+    # type: (...) -> POTelSpan
     return tracing.start_inactive_span(**kwargs)
 
 
@@ -303,7 +303,7 @@ def start_transaction(
     custom_sampling_context=None,  # type: Optional[SamplingContext]
     **kwargs,  # type: Unpack[TransactionKwargs]
 ):
-    # type: (...) -> Union[Transaction, NoOpSpan]
+    # type: (...) -> POTelSpan
     """
     .. deprecated:: 3.0.0
         This function is deprecated and will be removed in a future release.

sentry_sdk/integrations/opentelemetry/consts.py

@@ -5,3 +5,12 @@
 SENTRY_BAGGAGE_KEY = create_key("sentry-baggage")
 OTEL_SENTRY_CONTEXT = "otel"
 SPAN_ORIGIN = "auto.otel"
+
+
+class SentrySpanAttribute:
+    # XXX better name
+    # XXX not all of these need separate attributes, we might just use
+    # existing otel attrs for some
+    DESCRIPTION = "sentry.description"
+    OP = "sentry.op"
+    ORIGIN = "sentry.origin"

sentry_sdk/integrations/opentelemetry/span_processor.py

@@ -3,7 +3,7 @@
 from typing import cast
 
 from opentelemetry.context import get_value
-from opentelemetry.sdk.trace import SpanProcessor, ReadableSpan as OTelSpan
+from opentelemetry.sdk.trace import SpanProcessor, Span as OTelSpan
 from opentelemetry.trace import (
     format_span_id,
     format_trace_id,

sentry_sdk/tracing.py

@@ -1170,7 +1170,7 @@ class POTelSpan:
     # XXX Maybe it makes sense to repurpose the existing Span class for this.
     # For now I'm keeping this class separate to have a clean slate.
 
-    # XXX The wrapper itself should have as little state as possible.
+    # XXX The wrapper itself should have as little state as possible
 
     def __init__(
         self,
@@ -1189,12 +1189,21 @@ def __init__(
         origin="manual",  # type: str
     ):
         # type: (...) -> None
-        self._otel_span = tracer.start_span(description or "")
+        from sentry_sdk.integrations.opentelemetry.consts import SentrySpanAttribute
+
+        self._otel_span = tracer.start_span(description or op or "")  # XXX
         self._active = active
-        # XXX
+
+        self._otel_span.set_attribute(SentrySpanAttribute.ORIGIN, origin)
+        if op is not None:
+            self._otel_span.set_attribute(SentrySpanAttribute.OP, op)
+        if description is not None:
+            self._otel_span.set_attribute(SentrySpanAttribute.DESCRIPTION, description)
 
     def __enter__(self):
         # type: () -> POTelSpan
+        # XXX use_span? https://github.com/open-telemetry/opentelemetry-python/blob/3836da8543ce9751051e38a110c0468724042e62/opentelemetry-api/src/opentelemetry/trace/__init__.py#L547
+        #
         # create a Context object with parent set as current span
         if self._active:
             ctx = otel_trace.set_span_in_context(self._otel_span)
@@ -1206,7 +1215,7 @@ def __enter__(self):
     def __exit__(self, ty, value, tb):
         # type: (Optional[Any], Optional[Any], Optional[Any]) -> None
         self._otel_span.end()
-
+        # XXX set status to error if unset and an exception occurred?
         if self._active:
             context.detach(self._ctx_token)