Bugfix/check future cancelled #2461
Merged
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
…is causing a CancelledError Calling the exception() method when future is in the cancelled state is causing a CancelledError. we should check the cancelled state first and call f.exception() only if it's not cancelled.
|
Could you please add a test? Also #2392 looks a different solution of the same issue, like they choose to always pass an exception |
aabmass
reviewed
Apr 26, 2024
.../opentelemetry-instrumentation-asyncio/src/opentelemetry/instrumentation/asyncio/__init__.py
Show resolved
Hide resolved
instrumentation/opentelemetry-instrumentation-asyncio/tests/test_asyncio_future_cancellation.py
Show resolved
Hide resolved
@xrmx |
aabmass
reviewed
Apr 29, 2024
.../opentelemetry-instrumentation-asyncio/src/opentelemetry/instrumentation/asyncio/__init__.py
Show resolved
Hide resolved
instrumentation/opentelemetry-instrumentation-asyncio/tests/test_asyncio_future_cancellation.py
Outdated
Show resolved
Hide resolved
instrumentation/opentelemetry-instrumentation-asyncio/tests/test_asyncio_future_cancellation.py
Outdated
Show resolved
Hide resolved
instrumentation/opentelemetry-instrumentation-asyncio/tests/test_asyncio_future_cancellation.py
Outdated
Show resolved
Hide resolved
aabmass
approved these changes
May 2, 2024
instrumentation/opentelemetry-instrumentation-asyncio/tests/test_asyncio_future_cancellation.py
Outdated
Show resolved
Hide resolved
instrumentation/opentelemetry-instrumentation-asyncio/tests/test_asyncio_future_cancellation.py
Show resolved
Hide resolved
9 tasks
xrmx
approved these changes
May 3, 2024
ocelotl
approved these changes
May 6, 2024
auto-merge was automatically disabled
May 6, 2024 16:59
Pull Request is not mergeable
shadchin
pushed a commit
to shadchin/opentelemetry-python-contrib
that referenced
this pull request
May 29, 2024
* Calling the exception() method when future is in the cancelled state is causing a CancelledError Calling the exception() method when future is in the cancelled state is causing a CancelledError. we should check the cancelled state first and call f.exception() only if it's not cancelled. * modify lint * modify lint * Update CHANGELOG.md * remove init() * add future cancelled test code * add future cancelled test code * add future cancelled test code * add future cancelled test code * add future cancelled test code * add future cancelled test code * lint * lint * remove if condition * modify test code * lint * lint * remove pytest --------- Co-authored-by: Diego Hurtado <ocelotl@users.noreply.github.com>
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Description
Please include a summary of the change and which issue is fixed. Please also include relevant motivation and context. List any dependencies that are required for this change.
Using python auto instrumentation version 0.44b0 the real trace source is being deprecated.
Calling the exception() method when future is in the cancelled state is causing a CancelledError
Fixes #2460
Type of change
Please delete options that are not relevant.
How Has This Been Tested?
Please describe the tests that you ran to verify your changes. Provide instructions so we can reproduce. Please also list any relevant details for your test configuration
Does This PR Require a Core Repo Change?
Checklist:
See contributing.md for styleguide, changelog guidelines, and more.