instrumentation/asyncio: catch CancelledError exception in tests (#2690)

* instrumentation/asyncio: catch CancelledError exception in tests

After a29242f49386c097defce500b138dc00f06ce300 we are re-raising the
CancelledError so we need to catch it on the caller side.

Fix #2688

* instrument/asyncio: don't test anext on python < 3.10

Since it's not available there.

* instrumentation/asyncio: use unittest.skipIf instead of reimplementing it

---------

Co-authored-by: Leighton Chen <lechen@microsoft.com>
This commit is contained in:
Riccardo Magliocchetti
2024-07-10 20:34:39 +02:00
committed by GitHub
parent 0b20c955fa
commit 60fb936b7e
4 changed files with 42 additions and 36 deletions

View File

@ -13,6 +13,7 @@
# limitations under the License.
import asyncio
import sys
from unittest import skipIf
from unittest.mock import patch
# pylint: disable=no-name-in-module
@ -40,34 +41,34 @@ class TestAsyncioToThread(TestBase):
super().tearDown()
AsyncioInstrumentor().uninstrument()
@skipIf(
sys.version_info < (3, 9), "to_thread is only available in Python 3.9+"
)
def test_to_thread(self):
# to_thread is only available in Python 3.9+
if sys.version_info >= (3, 9):
def multiply(x, y):
return x * y
def multiply(x, y):
return x * y
async def to_thread():
result = await asyncio.to_thread(multiply, 2, 3)
assert result == 6
async def to_thread():
result = await asyncio.to_thread(multiply, 2, 3)
assert result == 6
with self._tracer.start_as_current_span("root"):
asyncio.run(to_thread())
spans = self.memory_exporter.get_finished_spans()
with self._tracer.start_as_current_span("root"):
asyncio.run(to_thread())
spans = self.memory_exporter.get_finished_spans()
self.assertEqual(len(spans), 2)
assert spans[0].name == "asyncio to_thread-multiply"
for metric in (
self.memory_metrics_reader.get_metrics_data()
.resource_metrics[0]
.scope_metrics[0]
.metrics
):
if metric.name == "asyncio.process.duration":
for point in metric.data.data_points:
self.assertEqual(point.attributes["type"], "to_thread")
self.assertEqual(point.attributes["name"], "multiply")
if metric.name == "asyncio.process.created":
for point in metric.data.data_points:
self.assertEqual(point.attributes["type"], "to_thread")
self.assertEqual(point.attributes["name"], "multiply")
self.assertEqual(len(spans), 2)
assert spans[0].name == "asyncio to_thread-multiply"
for metric in (
self.memory_metrics_reader.get_metrics_data()
.resource_metrics[0]
.scope_metrics[0]
.metrics
):
if metric.name == "asyncio.process.duration":
for point in metric.data.data_points:
self.assertEqual(point.attributes["type"], "to_thread")
self.assertEqual(point.attributes["name"], "multiply")
if metric.name == "asyncio.process.created":
for point in metric.data.data_points:
self.assertEqual(point.attributes["type"], "to_thread")
self.assertEqual(point.attributes["name"], "multiply")