Update the runtime metrics test cases to check both gauges and distributions for metrics

Author: zacharycmontoya

tests/test_config_consistency.py

@@ -569,12 +569,21 @@ def setup_main(self):
     def test_main(self):
         assert self.req.status_code == 200
 
-        runtime_metrics = [
+        runtime_metrics_gauges = [
             metric
             for _, metric in interfaces.agent.get_metrics()
             if metric["metric"].startswith("runtime.") or metric["metric"].startswith("jvm.")
         ]
-        assert len(runtime_metrics) > 0
+        
+        runtime_metrics_sketches = [
+            metric
+            for _, metric in interfaces.agent.get_sketches()
+            if metric["metric"].startswith("runtime.") or metric["metric"].startswith("jvm.")
+        ]
+
+        assert len(runtime_metrics_gauges) > 0 or len(runtime_metrics_sketches) > 0
+
+        runtime_metrics = runtime_metrics_gauges if len(runtime_metrics_gauges) > 0 else runtime_metrics_sketches
 
         for metric in runtime_metrics:
             tags = {tag.split(":")[0]: tag.split(":")[1] for tag in metric["tags"]}
@@ -605,12 +614,21 @@ def setup_main(self):
     def test_main(self):
         assert self.req.status_code == 200
 
-        runtime_metrics = [
+        runtime_metrics_gauges = [
             metric
             for _, metric in interfaces.agent.get_metrics()
             if metric["metric"].startswith("runtime.") or metric["metric"].startswith("jvm.")
         ]
-        assert len(runtime_metrics) > 0
+        
+        runtime_metrics_sketches = [
+            metric
+            for _, metric in interfaces.agent.get_sketches()
+            if metric["metric"].startswith("runtime.") or metric["metric"].startswith("jvm.")
+        ]
+
+        assert len(runtime_metrics_gauges) > 0 or len(runtime_metrics_sketches) > 0
+
+        runtime_metrics = runtime_metrics_gauges if len(runtime_metrics_gauges) > 0 else runtime_metrics_sketches
 
         for metric in runtime_metrics:
             tags = {tag.split(":")[0]: tag.split(":")[1] for tag in metric["tags"]}
@@ -633,12 +651,19 @@ def setup_main(self):
     def test_main(self):
         assert self.req.status_code == 200
 
-        runtime_metrics = [
+        runtime_metrics_gauges = [
             metric
             for _, metric in interfaces.agent.get_metrics()
             if metric["metric"].startswith("runtime.") or metric["metric"].startswith("jvm.")
         ]
-        assert len(runtime_metrics) == 0
+        
+        runtime_metrics_sketches = [
+            metric
+            for _, metric in interfaces.agent.get_sketches()
+            if metric["metric"].startswith("runtime.") or metric["metric"].startswith("jvm.")
+        ]
+
+        assert len(runtime_metrics_gauges) == 0 and len(runtime_metrics_sketches) == 0
 
 
 # Parse the JSON-formatted log message from stdout and return the 'dd' object