Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

asyncio integration #1671

Merged
merged 25 commits into from
Oct 17, 2022
Merged
Show file tree
Hide file tree
Changes from 11 commits
Commits
Show all changes
25 commits
Select commit Hold shift + click to select a range
a93565b
First version of asyncio integration
antonpirker Oct 10, 2022
18a02c5
Create a hub and span for each corotine run.
antonpirker Oct 10, 2022
82f0329
Fixed some typing
antonpirker Oct 10, 2022
00678e0
Fixed some typing
antonpirker Oct 10, 2022
e570c85
Merge branch 'antonpirker/asyncio-integration' of github.com:getsentr…
antonpirker Oct 10, 2022
5ed18da
Fixed linting
antonpirker Oct 10, 2022
d5800d9
Merge branch 'master' into antonpirker/asyncio-integration
antonpirker Oct 10, 2022
192b578
Merge branch 'master' into antonpirker/asyncio-integration
antonpirker Oct 11, 2022
64d8e1a
Added tests
antonpirker Oct 12, 2022
8f74a50
Moved fixtured into test because it uses modules that are not always …
antonpirker Oct 12, 2022
3fb9d11
Using constant
antonpirker Oct 12, 2022
3597375
Using the 'function' op.
antonpirker Oct 14, 2022
402b192
Wrap import with try except
antonpirker Oct 14, 2022
d37cfb1
Make sure to use custom task factory if there is one
antonpirker Oct 14, 2022
9b7e111
Merge branch 'master' into antonpirker/asyncio-integration
antonpirker Oct 14, 2022
7c60637
Update sentry_sdk/integrations/asyncio.py
antonpirker Oct 14, 2022
4b4fbdb
Merge branch 'master' into antonpirker/asyncio-integration
antonpirker Oct 14, 2022
2de0b43
Error handling
antonpirker Oct 14, 2022
ff17782
Merge branch 'master' into antonpirker/asyncio-integration
antonpirker Oct 14, 2022
e0a51c0
Merge branch 'master' into antonpirker/asyncio-integration
antonpirker Oct 14, 2022
380ca42
Merge branch 'master' into antonpirker/asyncio-integration
antonpirker Oct 17, 2022
26f7c80
Merge branch 'master' into antonpirker/asyncio-integration
antonpirker Oct 17, 2022
e7e5ebb
Update sentry_sdk/integrations/asyncio.py
antonpirker Oct 17, 2022
01a9fe6
Ignoring typing
antonpirker Oct 17, 2022
d138ba7
Merge branch 'master' into antonpirker/asyncio-integration
antonpirker Oct 17, 2022
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
1 change: 1 addition & 0 deletions sentry_sdk/consts.py
Original file line number Diff line number Diff line change
Expand Up @@ -108,6 +108,7 @@ def _get_default_options():


class OP:
ASYNCTASK = "asynctask"
antonpirker marked this conversation as resolved.
Show resolved Hide resolved
DB = "db"
DB_REDIS = "db.redis"
EVENT_DJANGO = "event.django"
Expand Down
52 changes: 52 additions & 0 deletions sentry_sdk/integrations/asyncio.py
Original file line number Diff line number Diff line change
@@ -0,0 +1,52 @@
from __future__ import absolute_import

import asyncio
antonpirker marked this conversation as resolved.
Show resolved Hide resolved
from asyncio.tasks import Task
from sentry_sdk.consts import OP


from sentry_sdk.hub import Hub
from sentry_sdk.integrations import Integration
from sentry_sdk._types import MYPY

if MYPY:
from typing import Any


def _sentry_task_factory(loop, coro):
# type: (Any, Any) -> Task[None]

async def _coro_creating_hub_and_span():
# type: () -> None
hub = Hub(Hub.current)
with hub:
with hub.start_span(op=OP.ASYNCTASK, description=coro.__qualname__):
await coro

# The default task factory in `asyncio`` does not have its own function
antonpirker marked this conversation as resolved.
Show resolved Hide resolved
# but is just a couple of lines in `asyncio.base_events.create_task()`
# Those lines are copied here.

# WARNING:
# If the default behavior of the task creation in asyncio changes,
# this will break!
task = Task(_coro_creating_hub_and_span(), loop=loop)
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

shouldn't this be

Suggested change
task = Task(_coro_creating_hub_and_span(), loop=loop)
task = Task(_coro_creating_hub_and_span, loop=loop)

Copy link
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Done.

Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

but how did it work before lol

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

How does it work now, actually 😄 The correct version is the first one.

In [1]: from asyncio import Task

In [2]: async def foo():
   ...:     print("test")
   ...: 

In [3]: await Task(foo)
---------------------------------------------------------------------------
TypeError                                 Traceback (most recent call last)
Input In [3], in <cell line: 1>()
----> 1 await Task(foo)

TypeError: a coroutine was expected, got <function foo at 0x7f7fb9241f30>

In [4]: await Task(foo())
test

Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I'm not sure, please test all cases @antonpirker
this is what cpython does
https://github.com/python/cpython/blob/main/Lib/asyncio/base_events.py#L436-L444

Copy link
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Ok, will test.

Copy link
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Really good catch @vmarkovtsev!
This lead to this fix: #1689

if task._source_traceback: # type: ignore
del task._source_traceback[-1] # type: ignore

return task


def patch_asyncio():
# type: () -> None
loop = asyncio.get_running_loop()
antonpirker marked this conversation as resolved.
Show resolved Hide resolved
loop.set_task_factory(_sentry_task_factory)


class AsyncioIntegration(Integration):
identifier = "asyncio"

@staticmethod
def setup_once():
# type: () -> None
patch_asyncio()
Empty file.
118 changes: 118 additions & 0 deletions tests/integrations/asyncio/test_asyncio.py
Original file line number Diff line number Diff line change
@@ -0,0 +1,118 @@
import asyncio
import sys

import pytest
import pytest_asyncio

import sentry_sdk
from sentry_sdk.consts import OP
from sentry_sdk.integrations.asyncio import AsyncioIntegration


minimum_python_36 = pytest.mark.skipif(
sys.version_info < (3, 6), reason="ASGI is only supported in Python >= 3.6"
)


async def foo():
await asyncio.sleep(0.01)


async def bar():
await asyncio.sleep(0.01)


@pytest_asyncio.fixture(scope="session")
def event_loop(request):
"""Create an instance of the default event loop for each test case."""
loop = asyncio.get_event_loop_policy().new_event_loop()
yield loop
loop.close()


@minimum_python_36
@pytest.mark.asyncio
async def test_create_task(
sentry_init,
capture_events,
event_loop,
):
sentry_init(
traces_sample_rate=1.0,
send_default_pii=True,
debug=True,
integrations=[
AsyncioIntegration(),
],
)

events = capture_events()

with sentry_sdk.start_transaction(name="test_transaction_for_create_task"):
with sentry_sdk.start_span(op="root", description="not so important"):
tasks = [event_loop.create_task(foo()), event_loop.create_task(bar())]
await asyncio.wait(tasks, return_when=asyncio.FIRST_EXCEPTION)

sentry_sdk.flush()

(transaction_event,) = events

assert transaction_event["spans"][0]["op"] == "root"
assert transaction_event["spans"][0]["description"] == "not so important"

assert transaction_event["spans"][1]["op"] == OP.ASYNCTASK
assert transaction_event["spans"][1]["description"] == "foo"
assert (
transaction_event["spans"][1]["parent_span_id"]
== transaction_event["spans"][0]["span_id"]
)

assert transaction_event["spans"][2]["op"] == OP.ASYNCTASK
assert transaction_event["spans"][2]["description"] == "bar"
assert (
transaction_event["spans"][2]["parent_span_id"]
== transaction_event["spans"][0]["span_id"]
)


@minimum_python_36
@pytest.mark.asyncio
async def test_gather(
sentry_init,
capture_events,
):
sentry_init(
traces_sample_rate=1.0,
send_default_pii=True,
debug=True,
integrations=[
AsyncioIntegration(),
],
)

events = capture_events()

with sentry_sdk.start_transaction(name="test_transaction_for_gather"):
with sentry_sdk.start_span(op="root", description="not so important"):
await asyncio.gather(foo(), bar(), return_exceptions=True)

sentry_sdk.flush()

(transaction_event,) = events

assert transaction_event["spans"][0]["op"] == "root"
assert transaction_event["spans"][0]["description"] == "not so important"

assert transaction_event["spans"][1]["op"] == OP.ASYNCTASK
assert transaction_event["spans"][1]["description"] == "foo"
assert (
transaction_event["spans"][1]["parent_span_id"]
== transaction_event["spans"][0]["span_id"]
)

assert transaction_event["spans"][2]["op"] == OP.ASYNCTASK
assert transaction_event["spans"][2]["description"] == "bar"
assert (
transaction_event["spans"][2]["parent_span_id"]
== transaction_event["spans"][0]["span_id"]
)