Skip to content

add puttracesegments to boto whitelist avoid a catch 22 #210

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 2 commits into from
Mar 24, 2020
Merged

add puttracesegments to boto whitelist avoid a catch 22 #210

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
2076370
add puttracesegments to boto whitelist avoid a catch 22
kapilt Mar 19, 2020
9bf68f6
Merge branch 'master' into exempt-put-records
shengxil Mar 24, 2020
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
4 changes: 3 additions & 1 deletion aws_xray_sdk/ext/botocore/patch.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -31,7 +31,9 @@ def _xray_traced_botocore(wrapped, instance, args, kwargs):
service = instance._service_model.metadata["endpointPrefix"]
if service == 'xray':
# skip tracing for SDK built-in sampling pollers
if 'GetSamplingRules' in args or 'GetSamplingTargets' in args:
if ('GetSamplingRules' in args or
'GetSamplingTargets' in args or
'PutTraceSegments' in args):
return wrapped(*args, **kwargs)
return xray_recorder.record_subsegment(
wrapped, instance, args, kwargs,
Expand Down