raise exception when openmetrics process fails so check reports it (#…

…5392) * raise exception when openmetrics process fails so check reports it, added a test * update flake8
DataDog · Jan 6, 2020 · 5d023de · 5d023de
1 parent ab6018d
commit 5d023de
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 0 deletions.
diff --git a/linkerd/datadog_checks/linkerd/linkerd.py b/linkerd/datadog_checks/linkerd/linkerd.py
@@ -32,5 +32,6 @@ def process(self, scraper_config, metric_transformers=None):
             super(LinkerdCheck, self).process(scraper_config, metric_transformers=metric_transformers)
         except Exception:
             self.gauge(self.HEALTH_METRIC, 1, tags=tags)
+            raise
         else:
             self.gauge(self.HEALTH_METRIC, 0, tags=tags)
diff --git a/linkerd/tests/test_linkerd.py b/linkerd/tests/test_linkerd.py
@@ -55,6 +55,14 @@ def test_linkerd_v2(aggregator):
     )
 
 
+def test_openmetrics_error(monkeypatch):
+    check = LinkerdCheck('linkerd', None, {}, [MOCK_INSTANCE])
+    with requests_mock.Mocker() as metric_request:
+        metric_request.get('http://fake.tld/prometheus', exc="Exception")
+        with pytest.raises(Exception):
+            check.check(MOCK_INSTANCE)
+
+
 @pytest.mark.e2e
 def test_e2e(dd_agent_check):
     aggregator = dd_agent_check(rate=True)