Skip to content

Fix for issue 172 #173

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

Closed
wants to merge 2 commits into from
Closed

Fix for issue 172 #173

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
11559fc
Fix for issue 172
steveww Jun 20, 2019
9fe0fdb
check for handler
steveww Jun 25, 2019
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
7 changes: 5 additions & 2 deletions instana/instrumentation/flask/vanilla.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -74,15 +74,18 @@ def after_request_with_instana(response):
@wrapt.patch_function_wrapper('flask', 'Flask.handle_user_exception')
def handle_user_exception_with_instana(wrapped, instance, argv, kwargs):
exc = argv[0]
handler = instance._find_error_handler(exc)

if hasattr(flask.g, 'scope'):
scope = flask.g.scope
span = scope.span

if not hasattr(exc, 'code'):
span.log_exception(argv[0])
span.log_exception(exc)
span.set_tag(ext.HTTP_STATUS_CODE, 500)
scope.close()
# Issue 172 - leave scope open for downstream error handlers
if handler is None:
scope.close()

return wrapped(*argv, **kwargs)

Expand Down
7 changes: 5 additions & 2 deletions instana/instrumentation/flask/with_blinker.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -86,6 +86,7 @@ def log_exception_with_instana(sender, exception, **extra):
@wrapt.patch_function_wrapper('flask', 'Flask.handle_user_exception')
def handle_user_exception_with_instana(wrapped, instance, argv, kwargs):
exc = argv[0]
handler = instance._find_error_handler(exc)

if hasattr(flask.g, 'scope'):
scope = flask.g.scope
Expand All @@ -94,8 +95,10 @@ def handle_user_exception_with_instana(wrapped, instance, argv, kwargs):
if not hasattr(exc, 'code'):
span.log_exception(exc)
span.set_tag(ext.HTTP_STATUS_CODE, 500)
scope.close()
flask.g.scope = None
# Issue 172 - leave scope open for downstream error handlers
if handler is None:
scope.close()
flask.g.scope = None

return wrapped(*argv, **kwargs)

Expand Down