This repository was archived by the owner on Apr 26, 2024. It is now read-only.
Fix error reporting when using opentracing.trace#7961
Merged
erikjohnston merged 3 commits intodevelopfrom Jul 27, 2020
Merged
Conversation
richvdh
reviewed
Jul 27, 2020
changelog.d/7961.bugfix
Outdated
| @@ -0,0 +1 @@ | |||
| Fix sometimes returning 500 instead of the actual error response when using opentracing. | |||
Member
There was a problem hiding this comment.
Suggested change
| Fix sometimes returning 500 instead of the actual error response when using opentracing. | |
| Fix a bug which could cause `500 Internal Server Error` to be returned instead of the actual response when an error was returned from REST APIs and opentracing was enabled.. |
richvdh
reviewed
Jul 27, 2020
| @@ -0,0 +1 @@ | |||
| Fix a long standing bug where the tracing of async functions with opentracing was broken. | |||
clokep
reviewed
Jul 27, 2020
Comment on lines
740
to
741
| async def _trace_inner(*args, **kwargs): | ||
| if opentracing is None: | ||
| with start_active_span(_opname): | ||
| return await func(*args, **kwargs) |
Member
There was a problem hiding this comment.
I tried to remove this earlier and it caused issues: #7872
I think the case this protects against is having opentracing installed, but disabled via the config.
Member
Author
There was a problem hiding this comment.
Did you also remove the explicit scope.span.set_tag(...)?
anoadragon453
added a commit
that referenced
this pull request
Jul 28, 2020
…rove_test_times * 'develop' of github.com:matrix-org/synapse: (148 commits) Add script for finding files with unix line terminators (#7965) Convert the remaining media repo code to async / await. (#7947) Convert a synapse.events to async/await. (#7949) Convert groups and visibility code to async / await. (#7951) Convert push to async/await. (#7948) update changelog 1.18.0rc1 Fix error reporting when using `opentracing.trace` (#7961) Fix typing replication not being handled on master (#7959) Remove hacky error handling for inlineDeferreds. (#7950) Convert tests/rest/admin/test_room.py to unix file endings (#7953) Support oEmbed for media previews. (#7920) Convert state resolution to async/await (#7942) Fix up types and comments that refer to Deferreds. (#7945) Do not convert async functions to Deferreds in the interactive_auth_handler (#7944) Convert more of the media code to async/await (#7873) Return an empty body for OPTIONS requests. (#7886) Downgrade warning on client disconnect to INFO (#7928) Convert presence handler helpers to async/await. (#7939) Update the auth providers to be async. (#7935) ...
babolivier
pushed a commit
that referenced
this pull request
Sep 1, 2021
* commit 'f88c48f3b': 1.18.0rc1 Fix error reporting when using `opentracing.trace` (#7961) Fix typing replication not being handled on master (#7959) Remove hacky error handling for inlineDeferreds. (#7950) Convert tests/rest/admin/test_room.py to unix file endings (#7953) Support oEmbed for media previews. (#7920) Convert state resolution to async/await (#7942) Fix up types and comments that refer to Deferreds. (#7945) Do not convert async functions to Deferreds in the interactive_auth_handler (#7944) Convert more of the media code to async/await (#7873) Return an empty body for OPTIONS requests. (#7886) Downgrade warning on client disconnect to INFO (#7928) Convert presence handler helpers to async/await. (#7939) Update the auth providers to be async. (#7935) Put a cache on `/state_ids` (#7931)
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 subscribe to this conversation on GitHub.
Already have an account?
Sign in.
3 participants
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.
In particular
start_active_spanreturns a scope, which is meant to be a context manager that returns itself, but it didn't. This fixes that.We also clean some other stuff up, we don't actually need to set
error=Truetag manually, that happens for us, and there is no point having the if opentracing guard there given we both have it up a layer andstart_active_spanreturns a null context manager anyway.Broke in #7872
Stack trace: