naive impl

Author: sentrivana

sentry_sdk/api.py

@@ -1,7 +1,7 @@
 import inspect
 from contextlib import contextmanager
 
-from sentry_sdk import tracing_utils, Client
+from sentry_sdk import tracing, tracing_utils, Client
 from sentry_sdk._types import TYPE_CHECKING
 from sentry_sdk.consts import INSTRUMENTER
 from sentry_sdk.scope import Scope, _ScopeManager, new_scope, isolation_scope
@@ -282,15 +282,20 @@ def flush(
     return Scope.get_client().flush(timeout=timeout, callback=callback)
 
 
-@scopemethod
 def start_span(
     **kwargs,  # type: Any
 ):
     # type: (...) -> Span
-    return Scope.get_current_scope().start_span(**kwargs)
+    return tracing.start_span(**kwargs)
+
+
+def start_inactive_span(
+    **kwargs,  # type: Any
+):
+    # type: (...) -> Span
+    return tracing.start_inactive_span(**kwargs)
 
 
-@scopemethod
 def start_transaction(
     transaction=None,  # type: Optional[Transaction]
     instrumenter=INSTRUMENTER.SENTRY,  # type: str
@@ -299,6 +304,10 @@ def start_transaction(
 ):
     # type: (...) -> Union[Transaction, NoOpSpan]
     """
+    .. deprecated:: 3.0.0
+        This function is deprecated and will be removed in a future release.
+        Use :py:meth:`sentry_sdk.start_span` instead.
+
     Start and return a transaction on the current scope.
 
     Start an existing transaction if given, otherwise create and start a new
@@ -328,7 +337,7 @@ def start_transaction(
         constructor. See :py:class:`sentry_sdk.tracing.Transaction` for
         available arguments.
     """
-    return Scope.get_current_scope().start_transaction(
+    return tracing.start_transaction(
         transaction, instrumenter, custom_sampling_context, **kwargs
     )
 

sentry_sdk/tracing.py

@@ -2,6 +2,9 @@
 import random
 from datetime import datetime, timedelta, timezone
 
+from opentelemetry import trace as otel_trace, context
+from opentelemetry.sdk.trace import ReadableSpan
+
 import sentry_sdk
 from sentry_sdk.consts import INSTRUMENTER, SPANDATA
 from sentry_sdk.profiler.continuous_profiler import get_profiler_id
@@ -198,6 +201,7 @@ class Span:
     :param start_timestamp: The timestamp when the span started. If omitted, the current time
         will be used.
     :param scope: The scope to use for this span. If not provided, we use the current scope.
+    :param otel_span: The underlying OTel span this span is wrapping.
     """
 
     __slots__ = (
@@ -1156,6 +1160,35 @@ def _set_initial_sampling_decision(self, sampling_context):
         pass
 
 
+class OTelSpanWrapper:
+    """
+    Light-weight OTel span wrapper.
+
+    Meant for providing some level of compatibility with the old span interface.
+    """
+
+    def __init__(self, otel_span=None, **kwargs):
+        # type: (Optional[ReadableSpan]) -> None
+        self.description = kwargs.get("description")
+        self._otel_span = otel_span
+
+    def __enter__(self):
+        # type: () -> OTelSpanWrapper
+        # Creates a Context object with parent set as current span
+        ctx = otel_trace.set_span_in_context(self._otel_span)
+        # Set as the implicit current context
+        self._ctx_token = context.attach(ctx)
+        return self
+
+    def __exit__(self, ty, value, tb):
+        # type: (Optional[Any], Optional[Any], Optional[Any]) -> None
+        self._otel_span.end()
+        context.detach(self._ctx_token)
+
+    def start_child(self, **kwargs):
+        pass
+
+
 if TYPE_CHECKING:
 
     @overload
@@ -1198,6 +1231,21 @@ async def my_async_function():
         return start_child_span_decorator
 
 
+def start_span(**kwargs):
+    otel_span = otel_trace.get_tracer(__name__).start_span()
+    span = OTelSpanWrapper(otel_span=otel_span, **kwargs)
+    return span
+
+
+def start_inactive_span(**kwargs):
+    pass
+
+
+def start_transaction(**kwargs):
+    # XXX force_transaction?
+    pass
+
+
 # Circular imports
 
 from sentry_sdk.tracing_utils import (

setup.py

@@ -41,6 +41,7 @@ def get_file_text(file_name):
     install_requires=[
         "urllib3>=1.26.11",
         "certifi",
+        "opentelemetry-distro>=0.35b0",  # XXX check lower bound
     ],
     extras_require={
         "aiohttp": ["aiohttp>=3.5"],