Skip to content
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.

Sign up for GitHub

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

Reorder on_finish call order to correctly instrument all tornado work done during a request #499

Merged
merged 8 commits into from
Jun 7, 2021
Merged

Reorder on_finish call order to correctly instrument all tornado work done during a request #499

Changes from 1 commit
Commits
Show all changes
8 commits
Select commit Hold shift + click to select a range
36f1b25
Reorder on finish call order to correctly close traces
pitabwire May 16, 2021
9ae73ec
Merge branch 'open-telemetry:main' into main
pitabwire Jun 2, 2021
6036108
Test spans created in on_finish have correct parent span
pitabwire Jun 2, 2021
d7b609f
Show changes in changelog.md
pitabwire Jun 2, 2021
4bd0ab9
Merge branch 'main' into main
pitabwire Jun 3, 2021
23bb6e0
Merge branch 'main' into main
lzchen Jun 4, 2021
5ced339
Merge branch 'main' into main
pitabwire Jun 5, 2021
7ca068d
fix lint
Jun 7, 2021
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 2 additions & 1 deletion ...entelemetry-instrumentation-tornado/src/opentelemetry/instrumentation/tornado/__init__.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -208,8 +208,9 @@ def _prepare(tracer, request_hook, func, handler, args, kwargs):


def _on_finish(tracer, func, handler, args, kwargs):
response = func(*args, **kwargs)
_finish_span(tracer, handler)
return func(*args, **kwargs)
return response


def _log_exception(tracer, func, handler, args, kwargs):
Expand Down