Skip to content

Flask: Add context injection safeties #198

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

Merged
merged 1 commit into from
Nov 5, 2019
Merged

Flask: Add context injection safeties #198

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
5 changes: 4 additions & 1 deletion instana/instrumentation/flask/vanilla.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -112,7 +112,10 @@ def handle_user_exception_with_instana(wrapped, instance, argv, kwargs):

if hasattr(response, 'headers'):
tracer.inject(scope.span.context, opentracing.Format.HTTP_HEADERS, response.headers)
response.headers.add('Server-Timing', "intid;desc=%s" % scope.span.context.trace_id)
if hasattr(response.headers, 'add'):
response.headers.add('Server-Timing', "intid;desc=%s" % scope.span.context.trace_id)
elif type(response.headers) is dict or hasattr(response.headers, "__dict__"):
response.headers['Server-Timing'] = "intid;desc=%s" % scope.span.context.trace_id

scope.close()
flask.g.scope = None
Expand Down
8 changes: 6 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 @@ -102,13 +102,17 @@ def handle_user_exception_with_instana(wrapped, instance, argv, kwargs):

if hasattr(response, 'headers'):
tracer.inject(scope.span.context, opentracing.Format.HTTP_HEADERS, response.headers)
response.headers.add('Server-Timing', "intid;desc=%s" % scope.span.context.trace_id)
if hasattr(response.headers, 'add'):
response.headers.add('Server-Timing', "intid;desc=%s" % scope.span.context.trace_id)
elif type(response.headers) is dict or hasattr(response.headers, "__dict__"):
response.headers['Server-Timing'] = "intid;desc=%s" % scope.span.context.trace_id

scope.close()
flask.g.scope = None
return response
except Exception as e:
logger.debug("handle_user_exception_with_instana:", exc_info=True)
finally:
return response


def teardown_request_with_instana(*argv, **kwargs):
Expand Down