From 27c6771999a4fee2a2b5882c46cd7d2871546f0b Mon Sep 17 00:00:00 2001 From: Nicholas Muesch Date: Mon, 10 Jun 2019 17:20:21 -0400 Subject: [PATCH 1/2] Revert "Merge pull request #397 from DataDog/nick/fix_headers" This reverts commit 8c50a4a74da32cc1007ce4263ede5e5f7bd1ba0c, reversing changes made to d22eec740c8f92550e561bc9a5f70db905fbd51d. --- datadog/api/api_client.py | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/datadog/api/api_client.py b/datadog/api/api_client.py index a38a308fa..d09460658 100644 --- a/datadog/api/api_client.py +++ b/datadog/api/api_client.py @@ -158,8 +158,7 @@ def submit(cls, method, path, api_version=None, body=None, attach_host_name=Fals response_obj = None if response_obj: - for response in response_obj: - response['response_headers'] = response_headers + response_obj['response_headers'] = response_headers if response_formatter is None: return response_obj From dac5c409c4fe14a2c341b47e595926a050f6cf1f Mon Sep 17 00:00:00 2001 From: Nicholas Muesch Date: Mon, 10 Jun 2019 17:25:35 -0400 Subject: [PATCH 2/2] Revert "Return Rate Limit Headers (#378)" This reverts commit 0c1365d184e116217cadcd6f3d1db4cbee9e29c0. --- datadog/api/api_client.py | 5 ----- tests/integration/api/test_api.py | 21 --------------------- 2 files changed, 26 deletions(-) diff --git a/datadog/api/api_client.py b/datadog/api/api_client.py index d09460658..8ad79a33e 100644 --- a/datadog/api/api_client.py +++ b/datadog/api/api_client.py @@ -141,7 +141,6 @@ def submit(cls, method, path, api_version=None, body=None, attach_host_name=Fals # Format response content content = result.content - response_headers = result.headers if content: try: @@ -156,10 +155,6 @@ def submit(cls, method, path, api_version=None, body=None, attach_host_name=Fals raise ApiError(response_obj) else: response_obj = None - - if response_obj: - response_obj['response_headers'] = response_headers - if response_formatter is None: return response_obj else: diff --git a/tests/integration/api/test_api.py b/tests/integration/api/test_api.py index a67782e97..1655b4c98 100644 --- a/tests/integration/api/test_api.py +++ b/tests/integration/api/test_api.py @@ -27,7 +27,6 @@ FAKE_PROXY = { "https": "http://user:pass@10.10.1.10:3128/", } -RATE_LIMIT_HEADERS = ['X-RateLimit-Limit', 'X-RateLimit-Period', 'X-RateLimit-Reset', 'X-RateLimit-Remaining'] class TestDatadog(unittest.TestCase): @@ -363,26 +362,6 @@ def test_metrics(self): dog.Metric.send(metric='matt.metric', points=matt_series, host="matt.metric.host") - @attr("metric") - def test_rate_limit_headers(self): - now = datetime.datetime.now() - now_ts = int(time.mktime(now.timetuple())) - metric_name = "test.metric." + str(now_ts) - host_name = "test.host." + str(now_ts) - - dog.Metric.send(metric=metric_name, points=1, host=host_name) - time.sleep(self.wait_time) - - metric_query = dog.Metric.query(start=now_ts - 3600, end=now_ts + 3600, - query="avg:%s{host:%s}" % (metric_name, host_name)) - assert len(metric_query['series']) == 1, metric_query - - headers = metric_query.get('response_headers') - assert headers - - for header in RATE_LIMIT_HEADERS: - assert header in headers - def test_type_check(self): dog.Metric.send(metric="test.metric", points=[(time.time() - 3600, 1.0)]) dog.Metric.send(metric="test.metric", points=1.0)