Repository navigation
NH-154949 Always detach token in case issue with requests.get - #921
Open
tammy-baylis-swi wants to merge 1 commit into
Open
tammy-baylis-swi wants to merge 1 commit into
tammy-baylis-swi wants to merge 1 commit into
Conversation
Contributor
There was a problem hiding this comment.
🟢 Approval recommended
No active review issues remain for the HTTP-request context-cleanup changes in the sampler and UAMS resource detector.
No open issues 🎉
What changed in this PR
This PR prevents instrumentation suppression from persisting after failed HTTP requests in the SolarWinds APM sampler and UAMS resource detector.
Changes:
- Wraps both HTTP requests in
try/finallyso context tokens are always detached. - Adds regression tests verifying cleanup after connection errors while preserving existing error behavior.
| File | Description |
|---|---|
tests/unit/test_uams.py |
Verifies context cleanup and an empty result after a connection error. |
tests/unit/test_oboe/test_http_sampler.py |
Verifies context cleanup while allowing the connection error to propagate. |
solarwinds_apm/uams.py |
Ensures context detachment when the UAMS request fails. |
solarwinds_apm/oboe/http_sampler.py |
Ensures context detachment when the collector request fails. |
Review effort: Balanced
tammy-baylis-swi
marked this pull request as ready for review
November 5, 2026 23:51
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
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.
An agent helped me find that context cleanup (explicit token detach) by APM Python HttpSampler and UAMS detector may not succeed and persist, if exception raised by
requests.get. This adds try-finally and updates unit tests.