Merge pull request #2103 from edx/fix/gprice/datadog-tags

Reviewed by cpennington: https://rbcommons.com/s/edx/r/2/
This commit is contained in:
Greg Price
2013-05-22 11:35:16 -07:00

View File

@@ -31,14 +31,9 @@ def merge_dict(dic1, dic2):
def perform_request(method, url, data_or_params=None, *args, **kwargs):
if data_or_params is None:
data_or_params = {}
tags = [
"{k}:{v}".format(k=k, v=v)
for (k, v) in data_or_params.items() + [("method", method), ("url", url)]
if k != 'api_key'
]
data_or_params['api_key'] = settings.API_KEY
try:
with dog_stats_api.timer('comment_client.request.time', tags=tags):
with dog_stats_api.timer('comment_client.request.time'):
if method in ['post', 'put', 'patch']:
response = requests.request(method, url, data=data_or_params, timeout=5)
else: