Add latest changes from gitlab-org/gitlab@master

1 files changed, 11 insertions, 2 deletions

diff --git a/lib/gitlab/analytics/cycle_analytics/request_params.rb b/lib/gitlab/analytics/cycle_analytics/request_params.rb
index 623f9d8082d..af695c5cfa4 100644
--- a/lib/gitlab/analytics/cycle_analytics/request_params.rb
+++ b/lib/gitlab/analytics/cycle_analytics/request_params.rb
@@ -80,7 +80,7 @@ module Gitlab
             direction: direction&.to_sym,
             page: page,
             end_event_filter: end_event_filter.to_sym,
-            use_aggregated_data_collector: Feature.enabled?(:use_vsa_aggregated_tables, group || project, default_enabled: :yaml)
+            use_aggregated_data_collector: use_aggregated_backend?
           }.merge(attributes.symbolize_keys.slice(*FINDER_PARAM_NAMES))
         end
 
@@ -104,8 +104,13 @@ module Gitlab
 
         private
 
+        def use_aggregated_backend?
+          group.present? && # for now it's only available on the group-level
+            aggregation.enabled &&
+            Feature.enabled?(:use_vsa_aggregated_tables, group, default_enabled: :yaml)
+        end
+
         def aggregation_attributes
-          aggregation = ::Analytics::CycleAnalytics::Aggregation.safe_create_for_group(group)
           {
             enabled: aggregation.enabled.to_s,
             last_run_at: aggregation.last_incremental_run_at&.iso8601,
@@ -113,6 +118,10 @@ module Gitlab
           }
         end
 
+        def aggregation
+          @aggregation ||= ::Analytics::CycleAnalytics::Aggregation.safe_create_for_group(group)
+        end
+
         def group_data_attributes
           {
             id: group.id,