fix shim

Author: emdneto

exporter/opentelemetry-exporter-otlp/test-requirements.txt

@@ -6,7 +6,7 @@ pluggy==1.5.0
 py-cpuinfo==9.0.0
 pytest==7.4.4
 tomli==2.0.1
-typing_extensions==4.10.0
+typing_extensions==4.12.0
 wrapt==1.16.0
 zipp==3.19.2
 -e opentelemetry-api

opentelemetry-sdk/tests/logs/test_export.py

@@ -17,9 +17,7 @@
 import os
 import time
 import unittest
-from concurrent.futures import (
-    ThreadPoolExecutor,  # pylint: disable=no-name-in-module
-)
+from concurrent.futures import ThreadPoolExecutor
 from sys import version_info
 from unittest.mock import Mock, patch
 

shim/opentelemetry-opentracing-shim/tests/testbed/test_active_span_replacement/test_asyncio.py

@@ -21,9 +21,14 @@
 
 
 class TestAsyncio(OpenTelemetryTestCase):
-    def setUp(self):  # pylint: disable=invalid-name
+    def setUp(self):
         self.tracer = MockTracer()
-        self.loop = asyncio.get_event_loop()
+        self.loop = asyncio.new_event_loop()
+        asyncio.set_event_loop(self.loop)
+
+    def tearDown(self):
+        self.loop.close()
+        super().tearDown()
 
     def test_main(self):
         # Start an isolated task and query for its result -and finish it-

shim/opentelemetry-opentracing-shim/tests/testbed/test_client_server/test_asyncio.py

@@ -65,12 +65,17 @@ async def send(self):
 
 
 class TestAsyncio(OpenTelemetryTestCase):
-    def setUp(self):  # pylint: disable=invalid-name
+    def setUp(self):
         self.tracer = MockTracer()
         self.queue = asyncio.Queue()
-        self.loop = asyncio.get_event_loop()
+        self.loop = asyncio.new_event_loop()
+        asyncio.set_event_loop(self.loop)
         self.server = Server(tracer=self.tracer, queue=self.queue)
 
+    def tearDown(self):
+        self.loop.close()
+        super().tearDown()
+
     def test(self):
         client = Client(self.tracer, self.queue)
         self.loop.create_task(self.server.run())

shim/opentelemetry-opentracing-shim/tests/testbed/test_common_request_handler/test_asyncio.py

@@ -60,11 +60,16 @@ class TestAsyncio(OpenTelemetryTestCase):
     So one issue here is setting correct parent span.
     """
 
-    def setUp(self):  # pylint: disable=invalid-name
+    def setUp(self):
         self.tracer = MockTracer()
-        self.loop = asyncio.get_event_loop()
+        self.loop = asyncio.new_event_loop()
+        asyncio.set_event_loop(self.loop)
         self.client = Client(RequestHandler(self.tracer), self.loop)
 
+    def tearDown(self):
+        self.loop.close()
+        super().tearDown()
+
     def test_two_callbacks(self):
         res_future1 = self.loop.create_task(self.client.send("message1"))
         res_future2 = self.loop.create_task(self.client.send("message2"))

shim/opentelemetry-opentracing-shim/tests/testbed/test_late_span_finish/test_asyncio.py

@@ -23,9 +23,14 @@
 
 
 class TestAsyncio(OpenTelemetryTestCase):
-    def setUp(self):  # pylint: disable=invalid-name
+    def setUp(self):
         self.tracer = MockTracer()
-        self.loop = asyncio.get_event_loop()
+        self.loop = asyncio.new_event_loop()
+        asyncio.set_event_loop(self.loop)
+
+    def tearDown(self):
+        self.loop.close()
+        super().tearDown()
 
     def test_main(self):
         # Create a Span and use it as (explicit) parent of a pair of subtasks.

shim/opentelemetry-opentracing-shim/tests/testbed/test_listener_per_request/test_asyncio.py

@@ -43,9 +43,14 @@ def send_sync(self, message):
 
 
 class TestAsyncio(OpenTelemetryTestCase):
-    def setUp(self):  # pylint: disable=invalid-name
+    def setUp(self):
         self.tracer = MockTracer()
-        self.loop = asyncio.get_event_loop()
+        self.loop = asyncio.new_event_loop()
+        asyncio.set_event_loop(self.loop)
+
+    def tearDown(self):
+        self.loop.close()
+        super().tearDown()
 
     def test_main(self):
         client = Client(self.tracer, self.loop)

shim/opentelemetry-opentracing-shim/tests/testbed/test_multiple_callbacks/test_asyncio.py

@@ -25,9 +25,14 @@
 
 
 class TestAsyncio(OpenTelemetryTestCase):
-    def setUp(self):  # pylint: disable=invalid-name
+    def setUp(self):
         self.tracer = MockTracer()
-        self.loop = asyncio.get_event_loop()
+        self.loop = asyncio.new_event_loop()
+        asyncio.set_event_loop(self.loop)
+
+    def tearDown(self):
+        self.loop.close()
+        super().tearDown()
 
     def test_main(self):
         # Need to run within a Task, as the scope manager depends

shim/opentelemetry-opentracing-shim/tests/testbed/test_nested_callbacks/test_asyncio.py

@@ -21,9 +21,14 @@
 
 
 class TestAsyncio(OpenTelemetryTestCase):
-    def setUp(self):  # pylint: disable=invalid-name
+    def setUp(self):
         self.tracer = MockTracer()
-        self.loop = asyncio.get_event_loop()
+        self.loop = asyncio.new_event_loop()
+        asyncio.set_event_loop(self.loop)
+
+    def tearDown(self):
+        self.loop.close()
+        super().tearDown()
 
     def test_main(self):
         # Start a Span and let the callback-chain

shim/opentelemetry-opentracing-shim/tests/testbed/test_subtask_span_propagation/test_asyncio.py

@@ -20,9 +20,14 @@
 
 
 class TestAsyncio(OpenTelemetryTestCase):
-    def setUp(self):  # pylint: disable=invalid-name
+    def setUp(self):
         self.tracer = MockTracer()
-        self.loop = asyncio.get_event_loop()
+        self.loop = asyncio.new_event_loop()
+        asyncio.set_event_loop(self.loop)
+
+    def tearDown(self):
+        self.loop.close()
+        super().tearDown()
 
     def test_main(self):
         res = self.loop.run_until_complete(self.parent_task("message"))