fix: replaced contextmanager by my own agnosticcontextmanager

opentelemetry-api/src/opentelemetry/trace/__init__.py

@@ -74,6 +74,9 @@
 """
 
 
+import asyncio
+import contextlib
+import functools
 import os
 import typing
 from abc import ABC, abstractmethod
@@ -116,6 +119,34 @@
 logger = getLogger(__name__)
 
 
+class _AgnosticContextManager(contextlib._GeneratorContextManager):
+    def __call__(self, func):
+        if asyncio.iscoroutinefunction(func):
+
+            @functools.wraps(func)
+            async def async_wrapper(*args, **kwargs):
+                with self._recreate_cm():
+                    return await func(*args, **kwargs)
+
+            return async_wrapper
+        else:
+
+            @functools.wraps(func)
+            def wrapper(*args, **kwargs):
+                with self._recreate_cm():
+                    return func(*args, **kwargs)
+
+            return wrapper
+
+
+def agnosticcontextmanager(func):
+    @functools.wraps(func)
+    def helper(*args, **kwds):
+        return _AgnosticContextManager(func, args, kwds)
+
+    return helper
+
+
 class _LinkBase(ABC):
     def __init__(self, context: "SpanContext") -> None:
         self._context = context
@@ -327,7 +358,7 @@ def start_span(
             The newly-created span.
         """
 
-    @contextmanager
+    @agnosticcontextmanager
     @abstractmethod
     def start_as_current_span(
         self,
@@ -434,7 +465,7 @@ def _tracer(self) -> Tracer:
     def start_span(self, *args, **kwargs) -> Span:  # type: ignore
         return self._tracer.start_span(*args, **kwargs)  # type: ignore
 
-    @contextmanager  # type: ignore
+    @agnosticcontextmanager  # type: ignore
     def start_as_current_span(self, *args, **kwargs) -> Iterator[Span]:  # type: ignore
         with self._tracer.start_as_current_span(*args, **kwargs) as span:  # type: ignore
             yield span
@@ -460,7 +491,7 @@ def start_span(
         # pylint: disable=unused-argument,no-self-use
         return INVALID_SPAN
 
-    @contextmanager
+    @agnosticcontextmanager
     def start_as_current_span(
         self,
         name: str,

opentelemetry-api/tests/trace/test_proxy.py

@@ -15,7 +15,6 @@
 # pylint: disable=W0212,W0222,W0221
 import typing
 import unittest
-from contextlib import contextmanager
 
 from opentelemetry import trace
 from opentelemetry.test.globals_test import TraceGlobalsTest
@@ -40,7 +39,7 @@ class TestTracer(trace.NoOpTracer):
     def start_span(self, *args, **kwargs):
         return TestSpan(INVALID_SPAN_CONTEXT)
 
-    @contextmanager
+    @trace.agnosticcontextmanager
     def start_as_current_span(self, *args, **kwargs):  # type: ignore
         with trace.use_span(self.start_span(*args, **kwargs)) as span:  # type: ignore
             yield span

opentelemetry-api/tests/trace/test_tracer.py

@@ -13,9 +13,8 @@
 # limitations under the License.
 
 
-import time
 import asyncio
-from contextlib import contextmanager
+import time
 from unittest import TestCase
 from unittest.mock import Mock
 
@@ -24,6 +23,7 @@
     NoOpTracer,
     Span,
     Tracer,
+    agnosticcontextmanager,
     get_current_span,
 )
 
@@ -47,7 +47,7 @@ class MockTracer(Tracer):
             def start_span(self, *args, **kwargs):
                 return INVALID_SPAN
 
-            @contextmanager
+            @agnosticcontextmanager
             def start_as_current_span(self, *args, **kwargs):  # type: ignore
                 mock_call()
                 yield INVALID_SPAN
@@ -80,7 +80,7 @@ class MockTracer(Tracer):
             def start_span(self, *args, **kwargs):
                 return INVALID_SPAN
 
-            @contextmanager
+            @agnosticcontextmanager
             def start_as_current_span(self, *args, **kwargs):  # type: ignore
                 mock_call()
                 i = time.monotonic()

opentelemetry-sdk/src/opentelemetry/sdk/trace/__init__.py

@@ -21,7 +21,6 @@
 import threading
 import traceback
 import typing
-from contextlib import contextmanager
 from os import environ
 from time import time_ns
 from types import MappingProxyType, TracebackType
@@ -1014,7 +1013,7 @@ def __init__(
         self._span_limits = span_limits
         self._instrumentation_scope = instrumentation_scope
 
-    @contextmanager
+    @trace_api.agnosticcontextmanager
     def start_as_current_span(
         self,
         name: str,