Remove contextvars workaround (open-telemetry#2009)

owais · Aug 16, 2021 · 4e0642b · 4e0642b
1 parent 93fa54d
commit 4e0642b
Show file tree

Hide file tree

Showing 3 changed files with 4 additions and 103 deletions.
diff --git a/opentelemetry-api/src/opentelemetry/context/aiocontextvarsfix.py b/opentelemetry-api/src/opentelemetry/context/aiocontextvarsfix.py
diff --git a/opentelemetry-api/src/opentelemetry/context/contextvars_context.py b/opentelemetry-api/src/opentelemetry/context/contextvars_context.py
@@ -16,15 +16,10 @@
 
 from opentelemetry.context.context import Context, _RuntimeContext
 
-if (3, 5, 3) <= version_info < (3, 7):
-    import aiocontextvars  # type: ignore # pylint:disable=import-error
+if version_info < (3, 7):
+    import aiocontextvars  # type: ignore # pylint: disable=import-error
 
-    aiocontextvars  # pylint:disable=pointless-statement
-
-elif (3, 4) < version_info <= (3, 5, 2):
-    import opentelemetry.context.aiocontextvarsfix  # pylint:disable=wrong-import-position
-
-    opentelemetry.context.aiocontextvarsfix  # pylint:disable=pointless-statement
+    aiocontextvars  # pylint: disable=pointless-statement
 
 
 class ContextVarsRuntimeContext(_RuntimeContext):

diff --git a/opentelemetry-api/tests/context/test_contextvars_context.py b/opentelemetry-api/tests/context/test_contextvars_context.py
@@ -12,21 +12,13 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
-import unittest
-from sys import version_info
 from unittest.mock import patch
 
 from opentelemetry import context
+from opentelemetry.context.contextvars_context import ContextVarsRuntimeContext
 
 from .base_context import ContextTestCases
 
-if version_info.minor < 7:
-    raise unittest.SkipTest("contextvars not available")
-
-from opentelemetry.context.contextvars_context import (  # pylint:disable=wrong-import-position
-    ContextVarsRuntimeContext,
-)
-
 
 class TestContextVarsContext(ContextTestCases.BaseTest):
     def setUp(self) -> None: