1 files changed, 35 insertions, 33 deletions

diff --git a/app/controllers/concerns/product_analytics_tracking.rb b/app/controllers/concerns/product_analytics_tracking.rb
index dfa159ccfd7..b01320ce3ec 100644
--- a/app/controllers/concerns/product_analytics_tracking.rb
+++ b/app/controllers/concerns/product_analytics_tracking.rb
@@ -16,7 +16,7 @@ module ProductAnalyticsTracking
       end
     end
 
-    def track_custom_event(*controller_actions, name:, conditions: nil, action:, label:, destinations: [:redis_hll], &block)
+    def track_custom_event(*controller_actions, name:, action:, label:, conditions: nil, destinations: [:redis_hll], &block)
       custom_conditions = [:trackable_html_request?, *conditions]
 
       after_action only: controller_actions, if: custom_conditions do
@@ -30,15 +30,15 @@ module ProductAnalyticsTracking
   def route_events_to(destinations, name, &block)
     track_unique_redis_hll_event(name, &block) if destinations.include?(:redis_hll)
 
-    if destinations.include?(:snowplow) && event_enabled?(name)
-      Gitlab::Tracking.event(
-        self.class.to_s,
-        name,
-        namespace: tracking_namespace_source,
-        user: current_user,
-        context: [Gitlab::Tracking::ServicePingContext.new(data_source: :redis_hll, event: name).to_context]
-      )
-    end
+    return unless destinations.include?(:snowplow) && event_enabled?(name)
+
+    Gitlab::Tracking.event(
+      self.class.to_s,
+      name,
+      namespace: tracking_namespace_source,
+      user: current_user,
+      context: [Gitlab::Tracking::ServicePingContext.new(data_source: :redis_hll, event: name).to_context]
+    )
   end
 
   def route_custom_events_to(destinations, name, action, label, &block)
@@ -64,30 +64,32 @@ module ProductAnalyticsTracking
 
   def event_enabled?(event)
     events_to_ff = {
-      g_analytics_valuestream: :route_hll_to_snowplow,
-
-      i_search_paid: :route_hll_to_snowplow_phase2,
-      i_search_total: :route_hll_to_snowplow_phase2,
-      i_search_advanced: :route_hll_to_snowplow_phase2,
-      i_ecosystem_jira_service_list_issues: :route_hll_to_snowplow_phase2,
-      users_viewing_analytics_group_devops_adoption: :route_hll_to_snowplow_phase2,
-      i_analytics_dev_ops_adoption: :route_hll_to_snowplow_phase2,
-      i_analytics_dev_ops_score: :route_hll_to_snowplow_phase2,
-      p_analytics_merge_request: :route_hll_to_snowplow_phase2,
-      i_analytics_instance_statistics: :route_hll_to_snowplow_phase2,
-      g_analytics_contribution: :route_hll_to_snowplow_phase2,
-      p_analytics_pipelines: :route_hll_to_snowplow_phase2,
-      p_analytics_code_reviews: :route_hll_to_snowplow_phase2,
-      p_analytics_valuestream: :route_hll_to_snowplow_phase2,
-      p_analytics_insights: :route_hll_to_snowplow_phase2,
-      p_analytics_issues: :route_hll_to_snowplow_phase2,
-      p_analytics_repo: :route_hll_to_snowplow_phase2,
-      g_analytics_insights: :route_hll_to_snowplow_phase2,
-      g_analytics_issues: :route_hll_to_snowplow_phase2,
-      g_analytics_productivity: :route_hll_to_snowplow_phase2,
-      i_analytics_cohorts: :route_hll_to_snowplow_phase2
+      g_analytics_valuestream: '',
+
+      i_search_paid: :_phase2,
+      i_search_total: :_phase2,
+      i_search_advanced: :_phase2,
+      i_ecosystem_jira_service_list_issues: :_phase2,
+      users_viewing_analytics_group_devops_adoption: :_phase2,
+      i_analytics_dev_ops_adoption: :_phase2,
+      i_analytics_dev_ops_score: :_phase2,
+      p_analytics_merge_request: :_phase2,
+      i_analytics_instance_statistics: :_phase2,
+      g_analytics_contribution: :_phase2,
+      p_analytics_pipelines: :_phase2,
+      p_analytics_code_reviews: :_phase2,
+      p_analytics_valuestream: :_phase2,
+      p_analytics_insights: :_phase2,
+      p_analytics_issues: :_phase2,
+      p_analytics_repo: :_phase2,
+      g_analytics_insights: :_phase2,
+      g_analytics_issues: :_phase2,
+      g_analytics_productivity: :_phase2,
+      i_analytics_cohorts: :_phase2,
+
+      g_compliance_dashboard: :_phase4
     }
 
-    Feature.enabled?(events_to_ff[event.to_sym], tracking_namespace_source)
+    Feature.enabled?("route_hll_to_snowplow#{events_to_ff[event.to_sym]}", tracking_namespace_source)
   end
 end