fixup

Author: vitkyrka

fluxcd/tests/test_e2e.py

@@ -13,25 +13,29 @@
 
 from .common import EXPECTED_METRICS
 
-# These require an actual reconcile/workqueue event to fire, which doesn't happen against an
-# idle test cluster with no GitRepository/Kustomization/HelmRelease objects configured.
-IGNORED_METRICS = {
-    'fluxcd.controller.runtime.reconcile.count',
-    'fluxcd.controller.runtime.reconcile.errors.count',
-    'fluxcd.controller.runtime.reconcile.time.seconds.bucket',
-    'fluxcd.controller.runtime.reconcile.time.seconds.count',
-    'fluxcd.controller.runtime.reconcile.time.seconds.sum',
-    'fluxcd.gotk.reconcile.condition',
-    'fluxcd.gotk.reconcile.duration.seconds.bucket',
-    'fluxcd.gotk.reconcile.duration.seconds.count',
-    'fluxcd.gotk.reconcile.duration.seconds.sum',
-    # Emitted by kube-state-metrics (Flux 2.1+), not Flux controller /metrics endpoints.
-    'fluxcd.gotk.resource.info',
-    'fluxcd.gotk.suspend.status',
-    'fluxcd.process.cpu_seconds.count',
-    'fluxcd.workqueue.adds.count',
-    'fluxcd.workqueue.retries.count',
-}
+
+def assert_metrics(aggregator):
+    IGNORED_METRICS = {
+        'fluxcd.controller.runtime.reconcile.count',
+        'fluxcd.controller.runtime.reconcile.errors.count',
+        'fluxcd.controller.runtime.reconcile.time.seconds.bucket',
+        'fluxcd.controller.runtime.reconcile.time.seconds.count',
+        'fluxcd.controller.runtime.reconcile.time.seconds.sum',
+        'fluxcd.gotk.reconcile.condition',
+        'fluxcd.gotk.reconcile.duration.seconds.bucket',
+        'fluxcd.gotk.reconcile.duration.seconds.count',
+        'fluxcd.gotk.reconcile.duration.seconds.sum',
+        # Emitted by kube-state-metrics (Flux 2.1+), not Flux controller /metrics endpoints.
+        'fluxcd.gotk.resource.info',
+        'fluxcd.gotk.suspend.status',
+        'fluxcd.process.cpu_seconds.count',
+        'fluxcd.workqueue.adds.count',
+        'fluxcd.workqueue.retries.count',
+    }
+    for metric_name in set(EXPECTED_METRICS['v2']) - IGNORED_METRICS:
+        aggregator.assert_metric(metric_name)
+    aggregator.assert_all_metrics_covered()
+    aggregator.assert_metrics_using_metadata(get_metadata_metrics())
 
 
 def test_source_controller_metrics(dd_agent_check):
@@ -41,22 +45,15 @@ def test_source_controller_metrics(dd_agent_check):
     Version 1 is in maintenance mode, all our users are on version 2.
     """
     aggregator = dd_agent_check()
-    for metric_name in set(EXPECTED_METRICS['v2']) - IGNORED_METRICS:
-        aggregator.assert_metric(metric_name)
-    aggregator.assert_all_metrics_covered()
-    aggregator.assert_metrics_using_metadata(get_metadata_metrics())
+    assert_metrics(aggregator)
 
 
 @pytest.mark.e2e
 def test_e2e_discovery(aggregator, datadog_agent):
     # Kubelet Autodiscovery is expected to find all four flux-system controller pods exercised by
     # the non-discovery E2E test above (source, helm, kustomize, notification-controller).
     run_discovery_check_kubernetes(aggregator, datadog_agent, discovery_min_instances=4)
-
-    for metric_name in set(EXPECTED_METRICS['v2']) - IGNORED_METRICS:
-        aggregator.assert_metric(metric_name)
-    aggregator.assert_all_metrics_covered()
-    aggregator.assert_metrics_using_metadata(get_metadata_metrics())
+    assert_metrics(aggregator)
 
 
 @pytest.mark.e2e