generated from amazon-archives/__template_Apache-2.0
-
Notifications
You must be signed in to change notification settings - Fork 28
Fix Gevent patch regression with correct import order #522
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
Merged
Conversation
This file contains hidden or 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
c55bbd8 to
54c1437
Compare
54c1437 to
5810288
Compare
41d8ccd to
b7b4ec1
Compare
b7b4ec1 to
a306fd4
Compare
thpierce
reviewed
Oct 29, 2025
aws-opentelemetry-distro/src/amazon/opentelemetry/distro/patches/_gevent_patches.py
Show resolved
Hide resolved
aws-opentelemetry-distro/src/amazon/opentelemetry/distro/patches/_gevent_patches.py
Show resolved
Hide resolved
aws-opentelemetry-distro/src/amazon/opentelemetry/distro/aws_opentelemetry_distro.py
Outdated
Show resolved
Hide resolved
aws-opentelemetry-distro/tests/amazon/opentelemetry/distro/patches/test_gevent_patches.py
Show resolved
Hide resolved
aws-opentelemetry-distro/tests/amazon/opentelemetry/distro/patches/test_gevent_patches.py
Show resolved
Hide resolved
aws-opentelemetry-distro/tests/amazon/opentelemetry/distro/patches/test_gevent_patches.py
Outdated
Show resolved
Hide resolved
Co-authored-by: Thomas Pierce <[email protected]>
thpierce
approved these changes
Oct 29, 2025
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.
Issue
This PR first fixed the Gevent monkey patching issue by calling the patch operation when the ADOT Python starts up and before the modules are loaded.
Later on in v0.10.0, this commit broke the above fix by adding
the line
from amazon.opentelemetry.distro.aws_opentelemetry_configuratorwhich transitively imports therequestslibrary before the gevent patch operation is called, causing inconsistencies in the patched libraries resulting in seeing theRecursionError: maximum recursion depth exceedederror reappearing.Changes
geventis installed) which was removed in this commit to unblock development.geventmodule and validate only the ADOT logic without running the gevent monkey patch. The actual behavior of the patch should be tested in a higher level test such as a contract test.Testing
Did a manual E2E testing using a sample flask application. Confirmed the following:
RecursionErrorin the application with ADOT Python v0.10.0Setup
Sample app
Running with problematic version (see the
MonkeyPatchWarning)Running with the fix
By submitting this pull request, I confirm that you can use, modify, copy, and redistribute this contribution, under the terms of your choice.