1 files changed, 36 insertions, 1 deletions
diff --git a/app/controllers/concerns/product_analytics_tracking.rb b/app/controllers/concerns/product_analytics_tracking.rb
index dc7ba8295b9..260b433cc6f 100644
--- a/app/controllers/concerns/product_analytics_tracking.rb
+++ b/app/controllers/concerns/product_analytics_tracking.rb
@@ -13,6 +13,14 @@ module ProductAnalyticsTracking
         route_events_to(destinations, name, &block)
       end
     end
+
+    def track_custom_event(*controller_actions, name:, conditions: nil, action:, label:, destinations: [:redis_hll], &block)
+      custom_conditions = [:trackable_html_request?, *conditions]
+
+      after_action only: controller_actions, if: custom_conditions do
+        route_custom_events_to(destinations, name, action, label, &block)
+      end
+    end
   end
 
   private
@@ -25,13 +33,40 @@ module ProductAnalyticsTracking
     end
   end
 
+  def route_custom_events_to(destinations, name, action, label, &block)
+    track_unique_redis_hll_event(name, &block) if destinations.include?(:redis_hll)
+
+    return unless destinations.include?(:snowplow) && event_enabled?(name)
+
+    optional_arguments = {
+      namespace: tracking_namespace_source,
+      project: tracking_project_source
+    }.compact
+
+    Gitlab::Tracking.event(
+      self.class.to_s,
+      action,
+      user: current_user,
+      property: name,
+      label: label,
+      **optional_arguments
+    )
+  end
+
   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_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
     }
 
     Feature.enabled?(events_to_ff[event.to_sym], tracking_namespace_source)