Additional metrics test using multiple groups

2 files changed, 27 insertions, 20 deletions

diff --git a/spec/support/prometheus/additional_metrics_query_helper.rb b/spec/support/prometheus/additional_metrics_query_helper.rb
index d80beb066ff..84cbc24a301 100644
--- a/spec/support/prometheus/additional_metrics_query_helper.rb
+++ b/spec/support/prometheus/additional_metrics_query_helper.rb
@@ -4,26 +4,6 @@ module Prometheus
       %w{metric_a metric_b}
     end
 
-    def simple_queries
-      [{ query_range: 'query_range_a' }, { query_range: 'query_range_b', label: 'label', unit: 'unit' }]
-    end
-
-    def simple_query(suffix = 'a')
-      [{ query_range: "query_range_#{suffix}" }]
-    end
-
-    def simple_metrics
-      [
-        Gitlab::Prometheus::Metric.new('title', %w(metric_a metric_b), nil, nil, simple_queries),
-        Gitlab::Prometheus::Metric.new('title', %w{metric_a}, nil, nil, simple_query('empty')),
-        Gitlab::Prometheus::Metric.new('title', %w{metric_c}, nil, nil)
-      ]
-    end
-
-    def simple_metric_group(name = 'name', metrics = simple_metrics)
-      Gitlab::Prometheus::MetricGroup.new(name, 1, metrics)
-    end
-
     def query_result
       [
         {
diff --git a/spec/support/prometheus/metric_builders.rb b/spec/support/prometheus/metric_builders.rb
new file mode 100644
index 00000000000..2d54ecdfb5c
--- /dev/null
+++ b/spec/support/prometheus/metric_builders.rb
@@ -0,0 +1,27 @@
+module Prometheus
+  module MetricBuilders
+    def simple_query(suffix = 'a', **opts)
+      { query_range: "query_range_#{suffix}" }.merge(opts)
+    end
+
+    def simple_queries
+      [simple_query, simple_query('b', label: 'label', unit: 'unit')]
+    end
+
+    def simple_metric(title: 'title', required_metrics: [], queries: [])
+      Gitlab::Prometheus::Metric.new(title, required_metrics, nil, nil, queries)
+    end
+
+    def simple_metrics
+      [
+        simple_metric(required_metrics: %w(metric_a metric_b), queries: simple_queries),
+        simple_metric(required_metrics: %w{metric_a}, queries: [simple_query('empty')]),
+        simple_metric(required_metrics: %w{metric_c})
+      ]
+    end
+
+    def simple_metric_group(name = 'name', metrics = simple_metrics)
+      Gitlab::Prometheus::MetricGroup.new(name, 1, metrics)
+    end
+  end
+end
\ No newline at end of file