Merge branch 'michold-rm-action_monthly-metrics' into 'master'

Remove action_monthly_active_users metrics

See merge request https://gitlab.com/gitlab-org/gitlab/-/merge_requests/113551



Merged-by: Kassio Borges <kborges@gitlab.com>
Approved-by: Piotr Skorupa <pskorupa@gitlab.com>
Approved-by: Valery Sizov <valery@gitlab.com>
Approved-by: Kassio Borges <kborges@gitlab.com>
Approved-by: Gregory Havenga <11164960-ghavenga@users.noreply.gitlab.com>
Co-authored-by: michold <mwielich@gitlab.com>

config/metrics/counts_28d/20210216180321_action_monthly_active_users_sfe_edit.yml

@@ -7,7 +7,9 @@ product_stage: create
 product_group: editor
 product_category: web_ide
 value_type: number
-status: active
+status: removed
+removed_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/113551
+milestone_removed: 15.10
 time_frame: 28d
 data_source: redis_hll
 distribution:

config/metrics/counts_28d/20210216180323_action_monthly_active_users_snippet_editor_edit.yml

@@ -7,7 +7,9 @@ product_stage: create
 product_group: editor
 product_category: snippets
 value_type: number
-status: active
+status: removed
+removed_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/113551
+milestone_removed: 15.10
 time_frame: 28d
 data_source: redis_hll
 distribution:

lib/gitlab/usage_data.rb

@@ -448,10 +448,7 @@ def usage_activity_by_stage_create(time_period)
           remote_mirrors: distinct_count(::Project.with_remote_mirrors.where(time_period), :creator_id),
           snippets: distinct_count(::Snippet.where(time_period), :author_id)
         }.tap do |h|
-          if time_period.present?
-            h[:merge_requests_users] = merge_requests_users(time_period)
-            h.merge!(action_monthly_active_users(time_period))
-          end
+          h[:merge_requests_users] = merge_requests_users(time_period) if time_period.present?
         end
       end
       # rubocop: enable CodeReuse/ActiveRecord
@@ -565,16 +562,6 @@ def usage_activity_by_stage_secure(time_period)
         {}
       end
 
-      def action_monthly_active_users(time_period)
-        counter = Gitlab::UsageDataCounters::EditorUniqueCounter
-        date_range = { date_from: time_period[:created_at].first, date_to: time_period[:created_at].last }
-
-        {
-          action_monthly_active_users_sfe_edit: redis_usage_data { counter.count_sfe_edit_actions(**date_range) },
-          action_monthly_active_users_snippet_editor_edit: redis_usage_data { counter.count_snippet_editor_edit_actions(**date_range) }
-        }
-      end
-
       def with_metadata
         result = nil
         error = nil

spec/lib/gitlab/usage_data_spec.rb

@@ -1047,41 +1047,6 @@ def for_defined_days_back(days: [31, 3])
     end
   end
 
-  describe '#action_monthly_active_users', :clean_gitlab_redis_shared_state do
-    let(:time_period) { { created_at: 2.days.ago..time } }
-    let(:time) { Time.zone.now }
-    let(:user1) { build(:user, id: 1) }
-    let(:user2) { build(:user, id: 2) }
-    let(:user3) { build(:user, id: 3) }
-    let(:user4) { build(:user, id: 4) }
-    let(:project) { build(:project) }
-
-    before do
-      counter = Gitlab::UsageDataCounters::EditorUniqueCounter
-
-      counter.track_web_ide_edit_action(author: user1, project: project)
-      counter.track_web_ide_edit_action(author: user1, project: project)
-      counter.track_sfe_edit_action(author: user1, project: project)
-      counter.track_snippet_editor_edit_action(author: user1, project: project)
-      counter.track_snippet_editor_edit_action(author: user1, time: time - 3.days, project: project)
-
-      counter.track_web_ide_edit_action(author: user2, project: project)
-      counter.track_sfe_edit_action(author: user2, project: project)
-
-      counter.track_web_ide_edit_action(author: user3, time: time - 3.days, project: project)
-      counter.track_snippet_editor_edit_action(author: user3, project: project)
-    end
-
-    it 'returns the distinct count of user actions within the specified time period' do
-      expect(described_class.action_monthly_active_users(time_period)).to eq(
-        {
-          action_monthly_active_users_sfe_edit: 2,
-          action_monthly_active_users_snippet_editor_edit: 2
-        }
-      )
-    end
-  end
-
   describe '.service_desk_counts' do
     subject { described_class.send(:service_desk_counts) }