Skip to content

fix: Handle asyncio.cancellederror and raise to propagate back #293

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.

Sign up for GitHub

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

Merged
rajeshvelicheti merged 6 commits into from
Jul 10, 2025
Merged

fix: Handle asyncio.cancellederror and raise to propagate back #293

Changes from all commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
c550f48
Handle asyncio.cancellederror and raise it so it propagates back
rajeshvelicheti Jul 10, 2025
390be5f
Do not treat cancellation as span error
rajeshvelicheti Jul 10, 2025
db60f81
Fix: exception order
rajeshvelicheti Jul 10, 2025
fcd7297
Fix: exception order
rajeshvelicheti Jul 10, 2025
3f22768
Fix: exception order
rajeshvelicheti Jul 10, 2025
a570f4f
Merge branch 'main' into handle_cancelled_error
rajeshvelicheti Jul 10, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
7 changes: 7 additions & 0 deletions src/a2a/utils/telemetry.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -53,6 +53,7 @@
```
"""

import asyncio
import functools
import inspect
import logging
Expand Down Expand Up @@ -162,23 +163,29 @@
span.set_status(StatusCode.OK)
return result

# asyncio.CancelledError extends from BaseException
except asyncio.CancelledError as ce:
exception = None
logger.debug(f'CancelledError in span {actual_span_name}')
span.record_exception(ce)
raise
except Exception as e:
exception = e
span.record_exception(e)
span.set_status(StatusCode.ERROR, description=str(e))
raise
finally:
if attribute_extractor:
try:
attribute_extractor(
span, args, kwargs, result, exception
)
except Exception as attr_e:
logger.error(
f'attribute_extractor error in span {actual_span_name}: {attr_e}'
)

@functools.wraps(func)

Check notice on line 188 in src/a2a/utils/telemetry.py

View workflow job for this annotation

GitHub Actions / Lint Code Base

Copy/pasted code 

see src/a2a/utils/telemetry.py (206-222)
def sync_wrapper(*args, **kwargs) -> Any:
"""Sync Wrapper for the decorator."""
tracer = trace.get_tracer(INSTRUMENTING_MODULE_NAME)
Expand Down
Loading