Merge branch 'add-mr-analytics-to-usage-ping' into 'master'

Add merge request analytics to usage ping

See merge request gitlab-org/gitlab!40640

ee/app/controllers/groups/analytics/merge_request_analytics_controller.rb

 # frozen_string_literal: true
 
 class Groups::Analytics::MergeRequestAnalyticsController < Groups::Analytics::ApplicationController
+  include Analytics::UniqueVisitsHelper
+
   check_feature_flag Gitlab::Analytics::GROUP_MERGE_REQUEST_ANALYTICS_FEATURE_FLAG
 
   layout 'group'
@@ -13,6 +15,8 @@ class Groups::Analytics::MergeRequestAnalyticsController < Groups::Analytics::Ap
     authorize_view_by_action!(:read_group_merge_request_analytics)
   }
 
+  track_unique_visits :show, target_id: 'g_analytics_merge_request'
+
   def show
   end
 end

ee/app/controllers/projects/analytics/merge_request_analytics_controller.rb

 # frozen_string_literal: true
 
 class Projects::Analytics::MergeRequestAnalyticsController < Projects::ApplicationController
+  include Analytics::UniqueVisitsHelper
+
   before_action :authorize_read_project_merge_request_analytics!
 
+  track_unique_visits :show, target_id: 'p_analytics_merge_request'
+
   def show
   end
 end

ee/spec/controllers/groups/analytics/merge_request_analytics_controller_spec.rb

@@ -15,7 +15,7 @@ RSpec.describe Groups::Analytics::MergeRequestAnalyticsController do
     stub_licensed_features(feature_name => true)
   end
 
-  describe 'GET show' do
+  describe 'GET #show' do
     subject { get :show, params: { group_id: group } }
 
     before do
@@ -24,6 +24,11 @@ RSpec.describe Groups::Analytics::MergeRequestAnalyticsController do
 
     it { is_expected.to be_successful }
 
+    it_behaves_like 'tracking unique visits', :show do
+      let(:request_params) { { group_id: group } }
+      let(:target_id) { 'g_analytics_merge_request' }
+    end
+
     context 'when license is missing' do
       before do
         stub_licensed_features(feature_name => false)

ee/spec/controllers/projects/analytics/merge_request_analytics_controller_spec.rb

@@ -16,7 +16,7 @@ RSpec.describe Projects::Analytics::MergeRequestAnalyticsController do
     stub_licensed_features(feature_name => true)
   end
 
-  describe 'GET show' do
+  describe 'GET #show' do
     subject { get :show, params: { namespace_id: group, project_id: project } }
 
     before do
@@ -25,6 +25,11 @@ RSpec.describe Projects::Analytics::MergeRequestAnalyticsController do
 
     it { is_expected.to be_successful }
 
+    it_behaves_like 'tracking unique visits', :show do
+      let(:request_params) { { namespace_id: group, project_id: project } }
+      let(:target_id) { 'p_analytics_merge_request' }
+    end
+
     context 'when license is missing' do
       before do
         stub_licensed_features(feature_name => false)

lib/gitlab/usage_data_counters/known_events.yml

@@ -74,6 +74,14 @@
   category: analytics
   redis_slot: analytics
   aggregation: weekly
+- name: g_analytics_merge_request
+  category: analytics
+  redis_slot: analytics
+  aggregation: weekly
+- name: p_analytics_merge_request
+  category: analytics
+  redis_slot: analytics
+  aggregation: weekly
 - name: g_edit_by_web_ide
   category: ide_edit
   redis_slot: edit

spec/lib/gitlab/usage_data_spec.rb

@@ -1036,6 +1036,8 @@ RSpec.describe Gitlab::UsageData, :aggregate_failures do
           'p_analytics_repo' => 123,
           'i_analytics_cohorts' => 123,
           'i_analytics_dev_ops_score' => 123,
+          'p_analytics_merge_request' => 123,
+          'g_analytics_merge_request' => 123,
           'analytics_unique_visits_for_any_target' => 543,
           'analytics_unique_visits_for_any_target_monthly' => 987
         }