Skip to content
This repository was archived by the owner on Dec 18, 2019. It is now read-only.
Open
Changes from all commits
Commits
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
16 changes: 0 additions & 16 deletions botocore/client.py
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,6 @@
import functools

from datadog import statsd
from ddtrace import tracer

from botocore import waiter, xform_name
from botocore.auth import AUTH_TYPE_MAPS
Expand Down Expand Up @@ -462,21 +461,7 @@ def _force_virtual_style_s3_addressing(self):
def _service_model(self):
return self.meta.service_model

@tracer.wrap('aws.api.request', service='aws')
def _make_api_call(self, operation_name, api_params):
span = tracer.current_span()
_endpoint_name = self._endpoint._endpoint_prefix
_region_name = self.meta.region_name
meta = {
'aws.agent': 'botocore',
'aws.operation': operation_name,
'aws.endpoint': _endpoint_name,
'aws.region': _region_name,
}
if operation_name != 'AssumeRole': # don't send sensitive information
meta['aws.api_params'] = str(api_params)
span.resource = '%s.%s.%s' % (operation_name, _endpoint_name, _region_name)
span.set_tags(meta)
statsd.increment('boto.request', tags=["action:%s" % operation_name])

operation_model = self._service_model.operation_model(operation_name)
Expand Down Expand Up @@ -510,7 +495,6 @@ def _make_api_call(self, operation_name, api_params):
)

if http.status_code >= 300:
span.set_traceback()
raise ClientError(parsed_response, operation_name)
else:
return parsed_response
Expand Down