-
Notifications
You must be signed in to change notification settings - Fork 651
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.
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
Use is_recording flag in flask, django, tornado, boto, botocore instrumentations #1164
Merged
Merged
Changes from all commits
Commits
Show all changes
10 commits
Select commit
Hold shift + click to select a range
86a5638
flask
lzchen 31f0378
falcon, django
lzchen 4270202
boto + botocore
lzchen 0cc81ee
lint
lzchen 8560f71
Update test_botocore_instrumentation.py
lzchen 553677d
Merge branch 'master' of https://github.com/open-telemetry/openteleme…
lzchen bf7f8a9
comments
lzchen ed54e80
Merge branch 'master' of https://github.com/open-telemetry/openteleme…
lzchen 8cde2ce
Update __init__.py
lzchen a68a44a
Merge branch 'master' into flask
lzchen File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
There are no files selected for viewing
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
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
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
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
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
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
Original file line number | Diff line number | Diff line change | ||||||||||||||||||
---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|
|
@@ -101,21 +101,23 @@ def process_request(self, request): | |||||||||||||||||||
|
||||||||||||||||||||
tracer = get_tracer(__name__, __version__) | ||||||||||||||||||||
|
||||||||||||||||||||
attributes = collect_request_attributes(environ) | ||||||||||||||||||||
for attr in self._traced_request_attrs: | ||||||||||||||||||||
value = getattr(request, attr, None) | ||||||||||||||||||||
if value is not None: | ||||||||||||||||||||
attributes[attr] = str(value) | ||||||||||||||||||||
|
||||||||||||||||||||
span = tracer.start_span( | ||||||||||||||||||||
self._get_span_name(request), | ||||||||||||||||||||
kind=SpanKind.SERVER, | ||||||||||||||||||||
attributes=attributes, | ||||||||||||||||||||
start_time=environ.get( | ||||||||||||||||||||
"opentelemetry-instrumentor-django.starttime_key" | ||||||||||||||||||||
), | ||||||||||||||||||||
) | ||||||||||||||||||||
|
||||||||||||||||||||
if span.is_recording(): | ||||||||||||||||||||
codeboten marked this conversation as resolved.
Show resolved
Hide resolved
|
||||||||||||||||||||
attributes = collect_request_attributes(environ) | ||||||||||||||||||||
for attr in self._traced_request_attrs: | ||||||||||||||||||||
value = getattr(request, attr, None) | ||||||||||||||||||||
if value is not None: | ||||||||||||||||||||
attributes[attr] = str(value) | ||||||||||||||||||||
Comment on lines
+113
to
+117
There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. @owais created a nifty utils function that you can use like this
Suggested change
It's still in PR though so no need to use it if this is ready first. |
||||||||||||||||||||
for key, value in attributes.items(): | ||||||||||||||||||||
span.set_attribute(key, value) | ||||||||||||||||||||
|
||||||||||||||||||||
activation = tracer.use_span(span, end_on_exit=True) | ||||||||||||||||||||
activation.__enter__() | ||||||||||||||||||||
|
||||||||||||||||||||
|
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
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
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
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
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
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.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
I wonder if it's worth adding a decorator as a convenience
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Possibly? I think the repetitive-ness of this task just seems obvious because we just didn't do it in the beginning. However, new instrumentations should be respecting this anyways, so I don't think it's that much overhead.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Was thinking a decorator may help folks building future instrumentations group all the actions that should not occur when a span is not recording more cleanly 🤷♂️
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
That would be nice. There are some instrumentations that have some interim steps that always must be regardless of is_recording (which occur between some set_attr... methods). A decorator would be difficult to use in those cases.