Fix Tornado errors mapping to 500 #1048
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
nicholasgribanov
force-pushed
the
HH-148830
branch
3 times, most recently
from
6dbb031
to
ea8967c
Compare
lzchen
reviewed
Apr 11, 2022
| @@ -369,14 +369,15 @@ def _finish_span(tracer, handler, error=None): | |||
| status_code = error.status_code | |||
| if not ctx and status_code == 404: | |||
| ctx = _start_span(tracer, handler, _time_ns()) | |||
| if status_code != 404: | |||
There was a problem hiding this comment.
@owais
Was there a reason for explicitly checking for non-404s previously?
There was a problem hiding this comment.
If I undertood right, it was needed for not setting traceback if status equals 404, in other case do it. I've changed this behavior, and now traceback will be setted only for server errors - 500s
lzchen
reviewed
Apr 11, 2022
instrumentation/opentelemetry-instrumentation-tornado/tests/tornado_test_app.py
Outdated
Show resolved
Hide resolved
lzchen
reviewed
Apr 11, 2022
instrumentation/opentelemetry-instrumentation-tornado/tests/test_instrumentation.py
Outdated
Show resolved
Hide resolved
nicholasgribanov
force-pushed
the
HH-148830
branch
2 times, most recently
from
0f7d1be
to
1188986
Compare
owais
approved these changes
Apr 12, 2022
lzchen
approved these changes
Apr 12, 2022
|
@nicholasgribanov |
auto-merge was automatically disabled
April 13, 2022 07:05
Head branch was pushed to by a user without write access
nicholasgribanov
force-pushed
the
HH-148830
branch
from
1188986
to
d626e37
Compare
|
nicholasgribanov
force-pushed
the
HH-148830
branch
from
d626e37
to
dca157f
Compare
srikanthccv
reviewed
Apr 13, 2022
| @@ -6,7 +6,8 @@ The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/), | |||
| and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0.html). | |||
|
|
|||
| ## [Unreleased](https://github.com/open-telemetry/opentelemetry-python/compare/v1.10.0-0.29b0...HEAD) | |||
|
|
|||
| - `opentelemetry-instrumentation-tornado` Fix Tornado errors mapping to 500 | |||
| ([#1048])(https://github.com/open-telemetry/opentelemetry-python-contrib/pull/1048) | |||
There was a problem hiding this comment.
Please move this to Fixed section.
srikanthccv
reviewed
Apr 13, 2022
| @@ -6,7 +6,8 @@ The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/), | |||
| and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0.html). | |||
|
|
|||
| ## [Unreleased](https://github.com/open-telemetry/opentelemetry-python/compare/v1.10.0-0.29b0...HEAD) | |||
|
|
|||
| - `opentelemetry-instrumentation-tornado` Fix Tornado errors mapping to 500 | |||
| ([#1048])(https://github.com/open-telemetry/opentelemetry-python-contrib/pull/1048) | |||
There was a problem hiding this comment.
Please move this to Fixed section.
nicholasgribanov
force-pushed
the
HH-148830
branch
from
dca157f
to
87cfa62
Compare
srikanthccv
approved these changes
Apr 13, 2022
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
Fix bug in Tornado instrumentation. Current implementation erase http status codes and set 500 for any types of exceptions (tornado.web.HTTPError and others). But in Tornado implemantation setting http status 500 if exception not tornado.web.HTTPError. Otherwise, http status will set from exception. This fix repeat Tornado implementation logic.
Fixes #997
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.