Rename metric keys to be more user centric

- bump implemented to 13.11
- remove some code duplication

doc/development/usage_ping/dictionary.md

@@ -9884,6 +9884,30 @@ Status: `implemented`
 Tiers: `premium`, `ultimate`
+### `redis_hll_counters.epics_usage.g_project_management_users_updating_epic_descriptions_monthly`
+
+Counts of MAU changing epic descriptions
+
+[YAML definition](https://gitlab.com/gitlab-org/gitlab/-/blob/master/ee/config/metrics/counts_28d/20210312102051_g_project_management_users_updating_epic_descriptions_monthly.yml)
+
+Group: `group:product planning`
+
+Status: `implemented`
+
+Tiers: `premium`, `ultimate`
+
+### `redis_hll_counters.epics_usage.g_project_management_users_updating_epic_descriptions_weekly`
+
+Counts of WAU changing epic descriptions
+
+[YAML definition](https://gitlab.com/gitlab-org/gitlab/-/blob/master/ee/config/metrics/counts_7d/20210312101753_g_project_management_users_updating_epic_descriptions_weekly.yml)
+
+Group: `group:product planning`
+
+Status: `implemented`
+
+Tiers: `premium`, `ultimate`
+
 ### `redis_hll_counters.epics_usage.g_project_management_users_updating_epic_notes_monthly`
 Counts of MAU updating epic notes
@@ -9908,6 +9932,30 @@ Status: `implemented`
 Tiers: `premium`, `ultimate`
+### `redis_hll_counters.epics_usage.g_project_management_users_updating_epic_titles_monthly`
+
+Counts of MAU changing epic titles
+
+[YAML definition](https://gitlab.com/gitlab-org/gitlab/-/blob/master/ee/config/metrics/counts_28d/20210312101935_g_project_management_users_updating_epic_titles_monthly.yml)
+
+Group: `group:product planning`
+
+Status: `implemented`
+
+Tiers: `premium`, `ultimate`
+
+### `redis_hll_counters.epics_usage.g_project_management_users_updating_epic_titles_weekly`
+
+Counts of WAU changing epic titles
+
+[YAML definition](https://gitlab.com/gitlab-org/gitlab/-/blob/master/ee/config/metrics/counts_7d/20210312101826_g_project_management_users_updating_epic_titles_weekly.yml)
+
+Group: `group:product planning`
+
+Status: `implemented`
+
+Tiers: `premium`, `ultimate`
+
 ### `redis_hll_counters.ide_edit.g_edit_by_sfe_monthly`
 Missing description

ee/app/services/epics/update_service.rb

@@ -71,13 +71,11 @@ def saved_change_to_epic_dates?(epic)
     end
     def track_changes(epic)
-      changes = epic.saved_changes.keys.map(&:to_sym)
-
-      if changes.include?(:title)
+      if epic.saved_changes.key?('title')
         ::Gitlab::UsageDataCounters::EpicActivityUniqueCounter.track_epic_title_changed_action(author: current_user)
       end
-      if changes.include?(:description)
+      if epic.saved_changes.key?('description')
         ::Gitlab::UsageDataCounters::EpicActivityUniqueCounter.track_epic_description_changed_action(author: current_user)
       end
     end

ee/config/metrics/counts_28d/20210312101935_g_product_planning_epic_title_changed_monthly.yml → ee/config/metrics/counts_28d/20210312101935_g_project_management_users_updating_epic_titles_monthly.yml

@@ -2,7 +2,7 @@
 # Name of this metric contains g_project_management prefix
 # because we are using the same slot from issue_tracking to
 # allow data aggregation.
-key_path: g_project_management_epic_title_changed_monthly
+key_path: redis_hll_counters.epics_usage.g_project_management_users_updating_epic_titles_monthly
 description: Counts of MAU changing epic titles
 product_section: dev
 product_stage: plan
@@ -10,7 +10,7 @@ product_group: group:product planning
 product_category: epics_usage
 value_type: number
 status: implemented
-milestone: "13.10"
+milestone: "13.11"
 introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/56489
 time_frame: 28d
 data_source: redis_hll

ee/config/metrics/counts_28d/20210312102051_g_product_planning_epic_description_changed_monthly.yml → ee/config/metrics/counts_28d/20210312102051_g_project_management_users_updating_epic_descriptions_monthly.yml

@@ -2,7 +2,7 @@
 # Name of this metric contains g_project_management prefix
 # because we are using the same slot from issue_tracking to
 # allow data aggregation.
-key_path: g_project_management_epic_description_changed_monthly
+key_path: redis_hll_counters.epics_usage.g_project_management_users_updating_epic_descriptions_monthly
 description: Counts of MAU changing epic descriptions
 product_section: dev
 product_stage: plan
@@ -10,7 +10,7 @@ product_group: group:product planning
 product_category: epics_usage
 value_type: number
 status: implemented
-milestone: "13.10"
+milestone: "13.11"
 introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/56489
 time_frame: 28d
 data_source: redis_hll

ee/config/metrics/counts_7d/20210312101753_g_product_planning_epic_description_changed_weekly.yml → ee/config/metrics/counts_7d/20210312101753_g_project_management_users_updating_epic_descriptions_weekly.yml

@@ -2,7 +2,7 @@
 # Name of this metric contains g_project_management prefix
 # because we are using the same slot from issue_tracking to
 # allow data aggregation.
-key_path: g_project_management_epic_description_changed_weekly
+key_path: redis_hll_counters.epics_usage.g_project_management_users_updating_epic_descriptions_weekly
 description: Counts of WAU changing epic descriptions
 product_section: dev
 product_stage: plan
@@ -10,7 +10,7 @@ product_group: group:product planning
 product_category: epics_usage
 value_type: number
 status: implemented
-milestone: "13.10"
+milestone: "13.11"
 introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/56489
 time_frame: 7d
 data_source: redis_hll

ee/config/metrics/counts_7d/20210312101826_g_product_planning_epic_title_changed_weekly.yml → ee/config/metrics/counts_7d/20210312101826_g_project_management_users_updating_epic_titles_weekly.yml

@@ -2,7 +2,7 @@
 # Name of this metric contains g_project_management prefix
 # because we are using the same slot from issue_tracking to
 # allow data aggregation.
-key_path: g_project_management_epic_title_changed_weekly
+key_path: redis_hll_counters.epics_usage.g_project_management_users_updating_epic_titles_weekly
 description: Counts of WAU changing epic titles
 product_section: dev
 product_stage: plan
@@ -10,7 +10,7 @@ product_group: group:product planning
 product_category: epics_usage
 value_type: number
 status: implemented
-milestone: "13.10"
+milestone: "13.11"
 introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/56489
 time_frame: 7d
 data_source: redis_hll

ee/lib/gitlab/usage_data_counters/epic_activity_unique_counter.rb

@@ -8,8 +8,8 @@ module EpicActivityUniqueCounter
       # slot of issue events to allow data aggregation.
       # More information in: https://gitlab.com/gitlab-org/gitlab/-/issues/322405
       EPIC_CREATED = 'g_project_management_epic_created'
-      EPIC_TITLE_CHANGED = 'g_project_management_epic_title_changed'
-      EPIC_DESCRIPTION_CHANGED = 'g_project_management_epic_description_changed'
+      EPIC_TITLE_CHANGED = 'g_project_management_users_updating_epic_titles'
+      EPIC_DESCRIPTION_CHANGED = 'g_project_management_users_updating_epic_descriptions'
       EPIC_NOTE_UPDATED = 'g_project_management_users_updating_epic_notes'
       EPIC_NOTE_DESTROYED = 'g_project_management_users_destroying_epic_notes'
       EPIC_START_DATE_SET_AS_FIXED = 'g_project_management_users_setting_epic_start_date_as_fixed'
@@ -20,14 +20,6 @@ def track_epic_created_action(author:, time: Time.zone.now)
           track_unique_action(EPIC_CREATED, author, time)
         end
-        def track_epic_note_updated_action(author:, time: Time.zone.now)
-          track_unique_action(EPIC_NOTE_UPDATED, author, time)
-        end
-
-        def track_epic_note_destroyed_action(author:, time: Time.zone.now)
-          track_unique_action(EPIC_NOTE_DESTROYED, author, time)
-        end
-
         def track_epic_title_changed_action(author:, time: Time.zone.now)
           track_unique_action(EPIC_TITLE_CHANGED, author, time)
         end
@@ -36,6 +28,14 @@ def track_epic_description_changed_action(author:, time: Time.zone.now)
           track_unique_action(EPIC_DESCRIPTION_CHANGED, author, time)
         end
+        def track_epic_note_updated_action(author:, time: Time.zone.now)
+          track_unique_action(EPIC_NOTE_UPDATED, author, time)
+        end
+
+        def track_epic_note_destroyed_action(author:, time: Time.zone.now)
+          track_unique_action(EPIC_NOTE_DESTROYED, author, time)
+        end
+
         def track_epic_start_date_set_as_fixed_action(author:, time: Time.zone.now)
           track_unique_action(EPIC_START_DATE_SET_AS_FIXED, author, time)
         end

lib/gitlab/usage_data_counters/known_events/epic_events.yml

@@ -9,6 +9,18 @@
   aggregation: daily
   feature_flag: track_epics_activity
+- name: g_project_management_users_updating_epic_titles
+  category: epics_usage
+  redis_slot: project_management
+  aggregation: daily
+  feature_flag: track_epics_activity
+
+- name: g_project_management_users_updating_epic_descriptions
+  category: epics_usage
+  redis_slot: project_management
+  aggregation: daily
+  feature_flag: track_epics_activity
+
 - name: g_project_management_users_updating_epic_notes
   category: epics_usage
   redis_slot: project_management