diff options
Diffstat (limited to 'lib/gitlab/usage_data_counters')
8 files changed, 39 insertions, 17 deletions
diff --git a/lib/gitlab/usage_data_counters/counter_events/package_events.yml b/lib/gitlab/usage_data_counters/counter_events/package_events.yml index dd66a40a48f..c72f487a442 100644 --- a/lib/gitlab/usage_data_counters/counter_events/package_events.yml +++ b/lib/gitlab/usage_data_counters/counter_events/package_events.yml @@ -21,6 +21,7 @@ - i_package_golang_delete_package - i_package_golang_pull_package - i_package_golang_push_package +- i_package_helm_pull_package - i_package_maven_delete_package - i_package_maven_pull_package - i_package_maven_push_package diff --git a/lib/gitlab/usage_data_counters/hll_redis_counter.rb b/lib/gitlab/usage_data_counters/hll_redis_counter.rb index 833eebd5d04..2a231f8fce0 100644 --- a/lib/gitlab/usage_data_counters/hll_redis_counter.rb +++ b/lib/gitlab/usage_data_counters/hll_redis_counter.rb @@ -38,6 +38,7 @@ module Gitlab # * Get unique counts per user: Gitlab::UsageDataCounters::HLLRedisCounter.unique_events(event_names: 'g_compliance_dashboard', start_date: 28.days.ago, end_date: Date.current) class << self include Gitlab::Utils::UsageData + include Gitlab::Usage::TimeFrame # Track unique events # @@ -98,14 +99,6 @@ module Gitlab end end - def weekly_time_range - { start_date: 7.days.ago.to_date, end_date: Date.current } - end - - def monthly_time_range - { start_date: 4.weeks.ago.to_date, end_date: Date.current } - end - def known_event?(event_name) event_for(event_name).present? end diff --git a/lib/gitlab/usage_data_counters/known_events/code_review_events.yml b/lib/gitlab/usage_data_counters/known_events/code_review_events.yml index cc89fbd5caf..5023161a9dd 100644 --- a/lib/gitlab/usage_data_counters/known_events/code_review_events.yml +++ b/lib/gitlab/usage_data_counters/known_events/code_review_events.yml @@ -164,6 +164,11 @@ category: code_review aggregation: weekly # Diff settings events +- name: i_code_review_click_diff_view_setting + redis_slot: code_review + category: code_review + aggregation: weekly + feature_flag: diff_settings_usage_data - name: i_code_review_click_single_file_mode_setting redis_slot: code_review category: code_review @@ -219,3 +224,11 @@ category: code_review aggregation: weekly feature_flag: diff_settings_usage_data +- name: i_code_review_user_load_conflict_ui + redis_slot: code_review + category: code_review + aggregation: weekly +- name: i_code_review_user_resolve_conflict + redis_slot: code_review + category: code_review + aggregation: weekly diff --git a/lib/gitlab/usage_data_counters/known_events/common.yml b/lib/gitlab/usage_data_counters/known_events/common.yml index f2504396cc4..f2e45a52434 100644 --- a/lib/gitlab/usage_data_counters/known_events/common.yml +++ b/lib/gitlab/usage_data_counters/known_events/common.yml @@ -180,7 +180,6 @@ category: testing redis_slot: testing aggregation: weekly - feature_flag: usage_data_i_testing_group_code_coverage_project_click_total - name: i_testing_load_performance_widget_total category: testing redis_slot: testing @@ -345,18 +344,15 @@ category: terraform redis_slot: terraform aggregation: weekly - feature_flag: usage_data_p_terraform_state_api_unique_users # Pipeline Authoring - name: o_pipeline_authoring_unique_users_committing_ciconfigfile category: pipeline_authoring redis_slot: pipeline_authoring aggregation: weekly - feature_flag: usage_data_unique_users_committing_ciconfigfile - name: o_pipeline_authoring_unique_users_pushing_mr_ciconfigfile category: pipeline_authoring redis_slot: pipeline_authoring aggregation: weekly - feature_flag: usage_data_o_pipeline_authoring_unique_users_pushing_mr_ciconfigfile # Merge request widgets - name: users_expanding_secure_security_report redis_slot: secure diff --git a/lib/gitlab/usage_data_counters/known_events/ecosystem.yml b/lib/gitlab/usage_data_counters/known_events/ecosystem.yml index adc5ba36ad7..f594c6a1b7c 100644 --- a/lib/gitlab/usage_data_counters/known_events/ecosystem.yml +++ b/lib/gitlab/usage_data_counters/known_events/ecosystem.yml @@ -4,22 +4,18 @@ category: ecosystem redis_slot: ecosystem aggregation: weekly - feature_flag: usage_data_track_ecosystem_jira_service - name: i_ecosystem_jira_service_cross_reference category: ecosystem redis_slot: ecosystem aggregation: weekly - feature_flag: usage_data_track_ecosystem_jira_service - name: i_ecosystem_jira_service_list_issues category: ecosystem redis_slot: ecosystem aggregation: weekly - feature_flag: usage_data_track_ecosystem_jira_service - name: i_ecosystem_jira_service_create_issue category: ecosystem redis_slot: ecosystem aggregation: weekly - feature_flag: usage_data_track_ecosystem_jira_service - name: i_ecosystem_slack_service_issue_notification category: ecosystem redis_slot: ecosystem diff --git a/lib/gitlab/usage_data_counters/known_events/epic_events.yml b/lib/gitlab/usage_data_counters/known_events/epic_events.yml index d1864cd569b..62b0d6dea86 100644 --- a/lib/gitlab/usage_data_counters/known_events/epic_events.yml +++ b/lib/gitlab/usage_data_counters/known_events/epic_events.yml @@ -182,3 +182,9 @@ redis_slot: project_management aggregation: daily feature_flag: track_epics_activity + +- name: g_project_management_users_epic_issue_added_from_epic + category: epics_usage + redis_slot: project_management + aggregation: daily + feature_flag: track_epics_activity diff --git a/lib/gitlab/usage_data_counters/known_events/package_events.yml b/lib/gitlab/usage_data_counters/known_events/package_events.yml index d8ad2b538d6..e5031599dd0 100644 --- a/lib/gitlab/usage_data_counters/known_events/package_events.yml +++ b/lib/gitlab/usage_data_counters/known_events/package_events.yml @@ -47,6 +47,14 @@ category: user_packages aggregation: weekly redis_slot: package +- name: i_package_helm_deploy_token + category: deploy_token_packages + aggregation: weekly + redis_slot: package +- name: i_package_helm_user + category: user_packages + aggregation: weekly + redis_slot: package - name: i_package_maven_deploy_token category: deploy_token_packages aggregation: weekly diff --git a/lib/gitlab/usage_data_counters/merge_request_activity_unique_counter.rb b/lib/gitlab/usage_data_counters/merge_request_activity_unique_counter.rb index eb28a387a97..0d6f4b93aee 100644 --- a/lib/gitlab/usage_data_counters/merge_request_activity_unique_counter.rb +++ b/lib/gitlab/usage_data_counters/merge_request_activity_unique_counter.rb @@ -44,6 +44,8 @@ module Gitlab MR_INCLUDING_CI_CONFIG_ACTION = 'o_pipeline_authoring_unique_users_pushing_mr_ciconfigfile' MR_MILESTONE_CHANGED_ACTION = 'i_code_review_user_milestone_changed' MR_LABELS_CHANGED_ACTION = 'i_code_review_user_labels_changed' + MR_LOAD_CONFLICT_UI_ACTION = 'i_code_review_user_load_conflict_ui' + MR_RESOLVE_CONFLICT_ACTION = 'i_code_review_user_resolve_conflict' class << self def track_mr_diffs_action(merge_request:) @@ -187,7 +189,6 @@ module Gitlab end def track_mr_including_ci_config(user:, merge_request:) - return unless Feature.enabled?(:usage_data_o_pipeline_authoring_unique_users_pushing_mr_ciconfigfile, user, default_enabled: :yaml) return unless merge_request.includes_ci_config? track_unique_action_by_user(MR_INCLUDING_CI_CONFIG_ACTION, user) @@ -201,6 +202,14 @@ module Gitlab track_unique_action_by_user(MR_LABELS_CHANGED_ACTION, user) end + def track_loading_conflict_ui_action(user:) + track_unique_action_by_user(MR_LOAD_CONFLICT_UI_ACTION, user) + end + + def track_resolve_conflict_action(user:) + track_unique_action_by_user(MR_RESOLVE_CONFLICT_ACTION, user) + end + private def track_unique_action_by_merge_request(action, merge_request) |