Added tracking to the different diff view settings

Adds tracking for when users change their diff view settings
and also for on page load so we can track what settings the user
currently has.

Closes https://gitlab.com/gitlab-org/gitlab/-/issues/327054

app/assets/javascripts/diffs/components/app.vue

@@ -3,6 +3,7 @@ import { GlLoadingIcon, GlPagination, GlSprintf } from '@gitlab/ui';
 import { GlBreakpointInstance as bp } from '@gitlab/ui/dist/utils';
 import Mousetrap from 'mousetrap';
 import { mapState, mapGetters, mapActions } from 'vuex';
+import api from '~/api';
 import {
   keysFor,
   MR_PREVIOUS_FILE_IN_DIFF,
@@ -30,6 +31,15 @@ import {
   ALERT_OVERFLOW_HIDDEN,
   ALERT_MERGE_CONFLICT,
   ALERT_COLLAPSED_FILES,
+  INLINE_DIFF_VIEW_TYPE,
+  TRACKING_DIFF_VIEW_INLINE,
+  TRACKING_DIFF_VIEW_PARALLEL,
+  TRACKING_FILE_BROWSER_TREE,
+  TRACKING_FILE_BROWSER_LIST,
+  TRACKING_WHITESPACE_SHOW,
+  TRACKING_WHITESPACE_HIDE,
+  TRACKING_SINGLE_FILE_MODE,
+  TRACKING_MULTIPLE_FILES_MODE,
 } from '../constants';
 
 import { reviewStatuses } from '../utils/file_reviews';
@@ -183,6 +193,8 @@ export default {
       'hasConflicts',
       'viewDiffsFileByFile',
       'mrReviews',
+      'renderTreeList',
+      'showWhitespace',
     ]),
     ...mapGetters('diffs', ['whichCollapsedTypes', 'isParallelView', 'currentDiffIndex']),
     ...mapGetters('batchComments', ['draftsCount']),
@@ -305,6 +317,32 @@ export default {
     if (id && id.indexOf('#note') !== 0) {
       this.setHighlightedRow(id.split('diff-content').pop().slice(1));
     }
+
+    if (window.gon?.features?.diffSettingsUsageData) {
+      if (this.renderTreeList) {
+        api.trackRedisHllUserEvent(TRACKING_FILE_BROWSER_TREE);
+      } else {
+        api.trackRedisHllUserEvent(TRACKING_FILE_BROWSER_LIST);
+      }
+
+      if (this.diffViewType === INLINE_DIFF_VIEW_TYPE) {
+        api.trackRedisHllUserEvent(TRACKING_DIFF_VIEW_INLINE);
+      } else {
+        api.trackRedisHllUserEvent(TRACKING_DIFF_VIEW_PARALLEL);
+      }
+
+      if (this.showWhitespace) {
+        api.trackRedisHllUserEvent(TRACKING_WHITESPACE_SHOW);
+      } else {
+        api.trackRedisHllUserEvent(TRACKING_WHITESPACE_HIDE);
+      }
+
+      if (this.viewDiffsFileByFile) {
+        api.trackRedisHllUserEvent(TRACKING_SINGLE_FILE_MODE);
+      } else {
+        api.trackRedisHllUserEvent(TRACKING_MULTIPLE_FILES_MODE);
+      }
+    }
   },
   beforeCreate() {
     diffsApp.instrument();

app/assets/javascripts/diffs/constants.js

@@ -114,3 +114,20 @@ export const CONFLICT_THEIR = 'conflict_their';
 export const CONFLICT_MARKER = 'conflict_marker';
 export const CONFLICT_MARKER_OUR = 'conflict_marker_our';
 export const CONFLICT_MARKER_THEIR = 'conflict_marker_their';
+
+// Tracking events
+export const TRACKING_CLICK_DIFF_VIEW_SETTING = 'i_code_review_click_diff_view_setting';
+export const TRACKING_DIFF_VIEW_INLINE = 'i_code_review_diff_view_inline';
+export const TRACKING_DIFF_VIEW_PARALLEL = 'i_code_review_diff_view_parallel';
+
+export const TRACKING_CLICK_FILE_BROWSER_SETTING = 'i_code_review_click_file_browser_setting';
+export const TRACKING_FILE_BROWSER_TREE = 'i_code_review_file_browser_tree_view';
+export const TRACKING_FILE_BROWSER_LIST = 'i_code_review_file_browser_list_view';
+
+export const TRACKING_CLICK_WHITESPACE_SETTING = 'i_code_review_click_whitespace_setting';
+export const TRACKING_WHITESPACE_SHOW = 'i_code_review_diff_show_whitespace';
+export const TRACKING_WHITESPACE_HIDE = 'i_code_review_diff_hide_whitespace';
+
+export const TRACKING_CLICK_SINGLE_FILE_SETTING = 'i_code_review_click_single_file_mode_setting';
+export const TRACKING_SINGLE_FILE_MODE = 'i_code_review_diff_single_file';
+export const TRACKING_MULTIPLE_FILES_MODE = 'i_code_review_diff_multiple_files';

app/assets/javascripts/diffs/store/actions.js

 import Cookies from 'js-cookie';
 import Vue from 'vue';
+import api from '~/api';
 import { deprecatedCreateFlash as createFlash } from '~/flash';
 import { diffViewerModes } from '~/ide/constants';
 import axios from '~/lib/utils/axios_utils';
@@ -36,6 +37,18 @@ import {
   DIFF_VIEW_FILE_BY_FILE,
   DIFF_VIEW_ALL_FILES,
   DIFF_FILE_BY_FILE_COOKIE_NAME,
+  TRACKING_CLICK_DIFF_VIEW_SETTING,
+  TRACKING_DIFF_VIEW_INLINE,
+  TRACKING_DIFF_VIEW_PARALLEL,
+  TRACKING_CLICK_FILE_BROWSER_SETTING,
+  TRACKING_FILE_BROWSER_TREE,
+  TRACKING_FILE_BROWSER_LIST,
+  TRACKING_CLICK_WHITESPACE_SETTING,
+  TRACKING_WHITESPACE_SHOW,
+  TRACKING_WHITESPACE_HIDE,
+  TRACKING_CLICK_SINGLE_FILE_SETTING,
+  TRACKING_SINGLE_FILE_MODE,
+  TRACKING_MULTIPLE_FILES_MODE,
 } from '../constants';
 import eventHub from '../event_hub';
 import { isCollapsed } from '../utils/diff_file';
@@ -352,6 +365,11 @@ export const setInlineDiffViewType = ({ commit }) => {
   Cookies.set(DIFF_VIEW_COOKIE_NAME, INLINE_DIFF_VIEW_TYPE);
   const url = mergeUrlParams({ view: INLINE_DIFF_VIEW_TYPE }, window.location.href);
   historyPushState(url);
+
+  if (window.gon?.features?.diffSettingsUsageData) {
+    api.trackRedisHllUserEvent(TRACKING_CLICK_DIFF_VIEW_SETTING);
+    api.trackRedisHllUserEvent(TRACKING_DIFF_VIEW_INLINE);
+  }
 };
 
 export const setParallelDiffViewType = ({ commit }) => {
@@ -360,6 +378,11 @@ export const setParallelDiffViewType = ({ commit }) => {
   Cookies.set(DIFF_VIEW_COOKIE_NAME, PARALLEL_DIFF_VIEW_TYPE);
   const url = mergeUrlParams({ view: PARALLEL_DIFF_VIEW_TYPE }, window.location.href);
   historyPushState(url);
+
+  if (window.gon?.features?.diffSettingsUsageData) {
+    api.trackRedisHllUserEvent(TRACKING_CLICK_DIFF_VIEW_SETTING);
+    api.trackRedisHllUserEvent(TRACKING_DIFF_VIEW_PARALLEL);
+  }
 };
 
 export const showCommentForm = ({ commit }, { lineCode, fileHash }) => {
@@ -527,6 +550,16 @@ export const setRenderTreeList = ({ commit }, renderTreeList) => {
   commit(types.SET_RENDER_TREE_LIST, renderTreeList);
 
   localStorage.setItem(TREE_LIST_STORAGE_KEY, renderTreeList);
+
+  if (window.gon?.features?.diffSettingsUsageData) {
+    api.trackRedisHllUserEvent(TRACKING_CLICK_FILE_BROWSER_SETTING);
+
+    if (renderTreeList) {
+      api.trackRedisHllUserEvent(TRACKING_FILE_BROWSER_TREE);
+    } else {
+      api.trackRedisHllUserEvent(TRACKING_FILE_BROWSER_LIST);
+    }
+  }
 };
 
 export const setShowWhitespace = ({ commit }, { showWhitespace, pushState = false }) => {
@@ -540,6 +573,16 @@ export const setShowWhitespace = ({ commit }, { showWhitespace, pushState = fals
   }
 
   notesEventHub.$emit('refetchDiffData');
+
+  if (window.gon?.features?.diffSettingsUsageData) {
+    api.trackRedisHllUserEvent(TRACKING_CLICK_WHITESPACE_SETTING);
+
+    if (showWhitespace) {
+      api.trackRedisHllUserEvent(TRACKING_WHITESPACE_SHOW);
+    } else {
+      api.trackRedisHllUserEvent(TRACKING_WHITESPACE_HIDE);
+    }
+  }
 };
 
 export const toggleFileFinder = ({ commit }, visible) => {
@@ -754,6 +797,16 @@ export const setFileByFile = ({ state, commit }, { fileByFile }) => {
   commit(types.SET_FILE_BY_FILE, fileByFile);
   Cookies.set(DIFF_FILE_BY_FILE_COOKIE_NAME, fileViewMode);
 
+  if (window.gon?.features?.diffSettingsUsageData) {
+    api.trackRedisHllUserEvent(TRACKING_CLICK_SINGLE_FILE_SETTING);
+
+    if (fileByFile) {
+      api.trackRedisHllUserEvent(TRACKING_SINGLE_FILE_MODE);
+    } else {
+      api.trackRedisHllUserEvent(TRACKING_MULTIPLE_FILES_MODE);
+    }
+  }
+
   return axios
     .put(state.endpointUpdateUser, {
       view_diffs_file_by_file: fileByFile,

app/controllers/projects/merge_requests_controller.rb

@@ -45,6 +45,7 @@ class Projects::MergeRequestsController < Projects::MergeRequests::ApplicationCo
 
     # Usage data feature flags
     push_frontend_feature_flag(:users_expanding_widgets_usage_data, @project, default_enabled: :yaml)
+    push_frontend_feature_flag(:diff_settings_usage_data, default_enabled: :yaml)
 
     record_experiment_user(:invite_members_version_b)
 

changelogs/unreleased/ph-327054-mrSettingsTracking.yml

+---
+title: Added tracking to diff view settings
+merge_request: 59979
+author:
+type: added

config/feature_flags/development/diff_settings_usage_data.yml

+---
+name: diff_settings_usage_data
+introduced_by_url:
+rollout_issue_url:
+milestone: '13.11'
+type: development
+group: group::code review
+default_enabled: true

config/metrics/aggregates/code_review.yml

@@ -52,6 +52,17 @@
     - 'i_code_review_user_reviewers_changed'
     - 'i_code_review_user_milestone_changed'
     - 'i_code_review_user_labels_changed'
+    - 'i_code_review_click_single_file_mode_setting'
+    - 'i_code_review_click_file_browser_setting'
+    - 'i_code_review_click_whitespace_setting'
+    - 'i_code_review_diff_view_inline'
+    - 'i_code_review_diff_view_parallel'
+    - 'i_code_review_file_browser_tree_view'
+    - 'i_code_review_file_browser_list_view'
+    - 'i_code_review_diff_show_whitespace'
+    - 'i_code_review_diff_hide_whitespace'
+    - 'i_code_review_diff_single_file'
+    - 'i_code_review_diff_multiple_files'
 - name: code_review_category_monthly_active_users
   operator: OR
   feature_flag: usage_data_code_review_aggregation
@@ -96,6 +107,17 @@
     - 'i_code_review_user_reviewers_changed'
     - 'i_code_review_user_milestone_changed'
     - 'i_code_review_user_labels_changed'
+    - 'i_code_review_click_single_file_mode_setting'
+    - 'i_code_review_click_file_browser_setting'
+    - 'i_code_review_click_whitespace_setting'
+    - 'i_code_review_diff_view_inline'
+    - 'i_code_review_diff_view_parallel'
+    - 'i_code_review_file_browser_tree_view'
+    - 'i_code_review_file_browser_list_view'
+    - 'i_code_review_diff_show_whitespace'
+    - 'i_code_review_diff_hide_whitespace'
+    - 'i_code_review_diff_single_file'
+    - 'i_code_review_diff_multiple_files'
 - name: code_review_extension_category_monthly_active_users
   operator: OR
   feature_flag: usage_data_code_review_aggregation

config/metrics/counts_28d/20210421144352_i_code_review_click_single_file_mode_setting_monthly.yml

+---
+key_path: redis_hll_counters.code_review.i_code_review_click_single_file_mode_setting_monthly
+description: Count of users clicking single file mode setting
+product_section: dev
+product_stage: create
+product_group: group::code review
+product_category: code_review
+value_type: number
+status: implemented
+milestone: '13.12'
+introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/59979
+time_frame: 28d
+data_source: redis_hll
+distribution:
+  - ce
+tier:
+  - free
+  - premium
+  - ultimate

config/metrics/counts_28d/20210421145818_i_code_review_click_file_browser_setting_monthly.yml

+---
+key_path: redis_hll_counters.code_review.i_code_review_click_file_browser_setting_monthly
+description: Count of users clicking merge request file browser setting
+product_section: dev
+product_stage: create
+product_group: group::code review
+product_category: code_review
+value_type: number
+status: implemented
+milestone: '13.12'
+introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/59979
+time_frame: 28d
+data_source: redis_hll
+distribution:
+  - ce
+tier:
+  - free
+  - premium
+  - ultimate

config/metrics/counts_28d/20210421145945_i_code_review_click_whitespace_setting_monthly.yml

+---
+key_path: redis_hll_counters.code_review.i_code_review_click_whitespace_setting_monthly
+description: Count of users clicking merge request whitespae setting
+product_section: dev
+product_stage: create
+product_group: group::code review
+product_category: code_review
+value_type: number
+status: implemented
+milestone: '13.12'
+introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/59979
+time_frame: 28d
+data_source: redis_hll
+distribution:
+  - ce
+tier:
+  - free
+  - premium
+  - ultimate

config/metrics/counts_28d/20210422101516_i_code_review_diff_view_inline_monthly.yml

+---
+key_path: redis_hll_counters.code_review.i_code_review_diff_view_inline_monthly
+description: Count of users with merge request view type as inline
+product_section: dev
+product_stage: create
+product_group: group::code review
+product_category: code_review
+value_type: number
+status: implemented
+milestone: '13.12'
+introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/59979
+time_frame: 28d
+data_source: redis_hll
+distribution:
+  - ce
+tier:
+  - free
+  - premium
+  - ultimate

config/metrics/counts_28d/20210422101613_i_code_review_diff_view_parallel_monthly.yml

+---
+key_path: redis_hll_counters.code_review.i_code_review_diff_view_parallel_monthly
+description: Count of users with merge request view type as parallel
+product_section: dev
+product_stage: create
+product_group: group::code review
+product_category: code_review
+value_type: number
+status: implemented
+milestone: '13.12'
+introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/59979
+time_frame: 28d
+data_source: redis_hll
+distribution:
+  - ce
+tier:
+  - free
+  - premium
+  - ultimate

config/metrics/counts_28d/20210422101753_i_code_review_file_browser_tree_view_monthly.yml

+---
+key_path: redis_hll_counters.code_review.i_code_review_file_browser_tree_view_monthly
+description: Count of users with merge request file tree setting
+product_section: dev
+product_stage: create
+product_group: group::code review
+product_category: code_review
+value_type: number
+status: implemented
+milestone: '13.12'
+introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/59979
+time_frame: 28d
+data_source: redis_hll
+distribution:
+  - ce
+tier:
+  - free
+  - premium
+  - ultimate

config/metrics/counts_28d/20210422101852_i_code_review_file_browser_list_view_monthly.yml

+---
+key_path: redis_hll_counters.code_review.i_code_review_file_browser_list_view_monthly
+description: Count of users with merge request file list setting
+product_section: dev
+product_stage: create
+product_group: group::code review
+product_category: code_review
+value_type: number
+status: implemented
+milestone: '13.12'
+introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/59979
+time_frame: 28d
+data_source: redis_hll
+distribution:
+  - ce
+tier:
+  - free
+  - premium
+  - ultimate

config/metrics/counts_28d/20210422101928_i_code_review_diff_show_whitespace_monthly.yml

+---
+key_path: redis_hll_counters.code_review.i_code_review_diff_show_whitespace_monthly
+description: Count of users with show whitespace enabled
+product_section: dev
+product_stage: create
+product_group: group::code review
+product_category: code_review
+value_type: number
+status: implemented
+milestone: '13.12'
+introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/59979
+time_frame: 28d
+data_source: redis_hll
+distribution:
+  - ce
+tier:
+  - free
+  - premium
+  - ultimate

config/metrics/counts_28d/20210422102010_i_code_review_diff_hide_whitespace_monthly.yml

+---
+key_path: redis_hll_counters.code_review.i_code_review_diff_hide_whitespace_monthly
+description: Count of users with show whitespace disabled
+product_section: dev
+product_stage: create
+product_group: group::code review
+product_category: code_review
+value_type: number
+status: implemented
+milestone: '13.12'
+introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/59979
+time_frame: 28d
+data_source: redis_hll
+distribution:
+  - ce
+tier:
+  - free
+  - premium
+  - ultimate

config/metrics/counts_28d/20210422102121_i_code_review_diff_single_file_monthly.yml

+---
+key_path: redis_hll_counters.code_review.i_code_review_diff_single_file_monthly
+description: Count of users with single file mode enabled
+product_section: dev
+product_stage: create
+product_group: group::code review
+product_category: code_review
+value_type: number
+status: implemented
+milestone: '13.12'
+introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/59979
+time_frame: 28d
+data_source: redis_hll
+distribution:
+  - ce
+tier:
+  - free
+  - premium
+  - ultimate

config/metrics/counts_28d/20210422102202_i_code_review_diff_multiple_files_monthly.yml

+---
+key_path: redis_hll_counters.code_review.i_code_review_diff_multiple_files_monthly
+description: Count of users with single mode disabled
+product_section: dev
+product_stage: create
+product_group: group::code review
+product_category: code_review
+value_type: number
+status: implemented
+milestone: '13.12'
+introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/59979
+time_frame: 28d
+data_source: redis_hll
+distribution:
+  - ce
+tier:
+  - free
+  - premium
+  - ultimate

config/metrics/counts_7d/20210421144349_i_code_review_click_single_file_mode_setting_weekly.yml

+---
+key_path: redis_hll_counters.code_review.i_code_review_click_single_file_mode_setting_weekly
+description: Count of users clicking single file mode setting
+product_section: dev
+product_stage: create
+product_group: group::code review
+product_category: code_review
+value_type: number
+status: implemented
+milestone: '13.12'
+introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/59979
+time_frame: 7d
+data_source: redis_hll
+distribution:
+  - ce
+tier:
+  - free
+  - premium
+  - ultimate

config/metrics/counts_7d/20210421145814_i_code_review_click_file_browser_setting_weekly.yml

+---
+key_path: redis_hll_counters.code_review.i_code_review_click_file_browser_setting_weekly
+description: Count of users with merge request file list setting
+product_section: dev
+product_stage: create
+product_group: group::code review
+product_category: code_review
+value_type: number
+status: implemented
+milestone: '13.12'
+introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/59979
+time_frame: 7d
+data_source: redis_hll
+distribution:
+  - ce
+tier:
+  - free
+  - premium
+  - ultimate

config/metrics/counts_7d/20210421145942_i_code_review_click_whitespace_setting_weekly.yml

+---
+key_path: redis_hll_counters.code_review.i_code_review_click_whitespace_setting_weekly
+description: Count of users clicking merge request whitespae setting
+product_section: dev
+product_stage: create
+product_group: group::code review
+product_category: code_review
+value_type: number
+status: implemented
+milestone: '13.12'
+introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/59979
+time_frame: 7d
+data_source: redis_hll
+distribution:
+  - ce
+tier:
+  - free
+  - premium
+  - ultimate

config/metrics/counts_7d/20210422101512_i_code_review_diff_view_inline_weekly.yml

+---
+key_path: redis_hll_counters.code_review.i_code_review_diff_view_inline_weekly
+description: Count of users with merge request view type as inline
+product_section: dev
+product_stage: create
+product_group: group::code review
+product_category: code_review
+value_type: number
+status: implemented
+milestone: '13.12'
+introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/59979
+time_frame: 7d
+data_source: redis_hll
+distribution:
+  - ce
+tier:
+  - free
+  - premium
+  - ultimate

config/metrics/counts_7d/20210422101609_i_code_review_diff_view_parallel_weekly.yml

+---
+key_path: redis_hll_counters.code_review.i_code_review_diff_view_parallel_weekly
+description: Count of users with merge request view type as parallel
+product_section: dev
+product_stage: create
+product_group: group::code review
+product_category: code_review
+value_type: number
+status: implemented
+milestone: '13.12'
+introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/59979
+time_frame: 7d
+data_source: redis_hll
+distribution:
+  - ce
+tier:
+  - free
+  - premium
+  - ultimate

config/metrics/counts_7d/20210422101750_i_code_review_file_browser_tree_view_weekly.yml

+---
+key_path: redis_hll_counters.code_review.i_code_review_file_browser_tree_view_weekly
+description: Count of users with merge request file tree setting
+product_section: dev
+product_stage: create
+product_group: group::code review
+product_category: code_review
+value_type: number
+status: implemented
+milestone: '13.12'
+introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/59979
+time_frame: 7d
+data_source: redis_hll
+distribution:
+  - ce
+tier:
+  - free
+  - premium
+  - ultimate

config/metrics/counts_7d/20210422101849_i_code_review_file_browser_list_view_weekly.yml

+---
+key_path: redis_hll_counters.code_review.i_code_review_file_browser_list_view_weekly
+description: Count of users with merge request file list setting
+product_section: dev
+product_stage: create
+product_group: group::code review
+product_category: code_review
+value_type: number
+status: implemented
+milestone: '13.12'
+introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/59979
+time_frame: 7d
+data_source: redis_hll
+distribution:
+  - ce
+tier:
+  - free
+  - premium
+  - ultimate

config/metrics/counts_7d/20210422101925_i_code_review_diff_show_whitespace_weekly.yml

+---
+key_path: redis_hll_counters.code_review.i_code_review_diff_show_whitespace_weekly
+description: Count of users with show whitespace enabled
+product_section: dev
+product_stage: create
+product_group: group::code review
+product_category: code_review
+value_type: number
+status: implemented
+milestone: '13.12'
+introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/59979
+time_frame: 7d
+data_source: redis_hll
+distribution:
+  - ce
+tier:
+  - free
+  - premium
+  - ultimate

config/metrics/counts_7d/20210422102007_i_code_review_diff_hide_whitespace_weekly.yml

+---
+key_path: redis_hll_counters.code_review.i_code_review_diff_hide_whitespace_weekly
+description: Count of users with show whitespace disabled
+product_section: dev
+product_stage: create
+product_group: group::code review
+product_category: code_review
+value_type: number
+status: implemented
+milestone: '13.12'
+introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/59979
+time_frame: 7d
+data_source: redis_hll
+distribution:
+  - ce
+tier:
+  - free
+  - premium
+  - ultimate

config/metrics/counts_7d/20210422102118_i_code_review_diff_single_file_weekly.yml

+---
+key_path: redis_hll_counters.code_review.i_code_review_diff_single_file_weekly
+description: Count of users with single file mode enabled
+product_section: dev
+product_stage: create
+product_group: group::code review
+product_category: code_review
+value_type: number
+status: implemented
+milestone: '13.12'
+introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/59979
+time_frame: 7d
+data_source: redis_hll
+distribution:
+  - ce
+tier:
+  - free
+  - premium
+  - ultimate

config/metrics/counts_7d/20210422102159_i_code_review_diff_multiple_files_weekly.yml

+---
+key_path: redis_hll_counters.code_review.i_code_review_diff_multiple_files_weekly
+description: Count of users with single mode disabled
+product_section: dev
+product_stage: create
+product_group: group::code review
+product_category: code_review
+value_type: number
+status: implemented
+milestone: '13.12'
+introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/59979
+time_frame: 7d
+data_source: redis_hll
+distribution:
+  - ce
+tier:
+  - free
+  - premium
+  - ultimate

doc/development/usage_ping/dictionary.md

@@ -6360,13 +6360,13 @@ Tiers: `free`
 
 The version of the PostgreSQL database.
 
-[YAML definition](https://gitlab.com/gitlab-org/gitlab/-/blob/master/config/metrics/license/20210216175609_version.yml)
+[YAML definition](https://gitlab.com/gitlab-org/gitlab/-/blob/master/config/metrics/settings/20210216175609_version.yml)
 
 Group: `group::distribution`
 
 Status: `data_available`
 
-Tiers: `free`
+Tiers: `free`, `premium`, `ultimate`
 
 ### `dependency_proxy_enabled`
 
@@ -6384,7 +6384,7 @@ Tiers: `free`
 
 Edition of GitLab such as EE or CE
 
-[YAML definition](https://gitlab.com/gitlab-org/gitlab/-/blob/master/config/metrics/license/20210216175604_edition.yml)
+[YAML definition](https://gitlab.com/gitlab-org/gitlab/-/blob/master/config/metrics/settings/20210216175604_edition.yml)
 
 Group: `group::distribution`
 
@@ -8024,6 +8024,222 @@ Status: `data_available`
 
 Tiers:
 
+### `redis_hll_counters.code_review.i_code_review_click_file_browser_setting_monthly`
+
+Count of users clicking merge request file browser setting
+
+[YAML definition](https://gitlab.com/gitlab-org/gitlab/-/blob/master/config/metrics/counts_28d/20210421145818_i_code_review_click_file_browser_setting_monthly.yml)
+
+Group: `group::code review`
+
+Status: `implemented`
+
+Tiers: `free`, `premium`, `ultimate`
+
+### `redis_hll_counters.code_review.i_code_review_click_file_browser_setting_weekly`
+
+Count of users with merge request file list setting
+
+[YAML definition](https://gitlab.com/gitlab-org/gitlab/-/blob/master/config/metrics/counts_7d/20210421145814_i_code_review_click_file_browser_setting_weekly.yml)
+
+Group: `group::code review`
+
+Status: `implemented`
+
+Tiers: `free`, `premium`, `ultimate`
+
+### `redis_hll_counters.code_review.i_code_review_click_single_file_mode_setting_monthly`
+
+Count of users clicking single file mode setting
+
+[YAML definition](https://gitlab.com/gitlab-org/gitlab/-/blob/master/config/metrics/counts_28d/20210421144352_i_code_review_click_single_file_mode_setting_monthly.yml)
+
+Group: `group::code review`
+
+Status: `implemented`
+
+Tiers: `free`, `premium`, `ultimate`
+
+### `redis_hll_counters.code_review.i_code_review_click_single_file_mode_setting_weekly`
+
+Count of users clicking single file mode setting
+
+[YAML definition](https://gitlab.com/gitlab-org/gitlab/-/blob/master/config/metrics/counts_7d/20210421144349_i_code_review_click_single_file_mode_setting_weekly.yml)
+
+Group: `group::code review`
+
+Status: `implemented`
+
+Tiers: `free`, `premium`, `ultimate`
+
+### `redis_hll_counters.code_review.i_code_review_click_whitespace_setting_monthly`
+
+Count of users clicking merge request whitespae setting
+
+[YAML definition](https://gitlab.com/gitlab-org/gitlab/-/blob/master/config/metrics/counts_28d/20210421145945_i_code_review_click_whitespace_setting_monthly.yml)
+
+Group: `group::code review`
+
+Status: `implemented`
+
+Tiers: `free`, `premium`, `ultimate`
+
+### `redis_hll_counters.code_review.i_code_review_click_whitespace_setting_weekly`
+
+Count of users clicking merge request whitespae setting
+
+[YAML definition](https://gitlab.com/gitlab-org/gitlab/-/blob/master/config/metrics/counts_7d/20210421145942_i_code_review_click_whitespace_setting_weekly.yml)
+
+Group: `group::code review`
+
+Status: `implemented`
+
+Tiers: `free`, `premium`, `ultimate`
+
+### `redis_hll_counters.code_review.i_code_review_diff_hide_whitespace_monthly`
+
+Count of users with show whitespace disabled
+
+[YAML definition](https://gitlab.com/gitlab-org/gitlab/-/blob/master/config/metrics/counts_28d/20210422102010_i_code_review_diff_hide_whitespace_monthly.yml)
+
+Group: `group::code review`
+
+Status: `implemented`
+
+Tiers: `free`, `premium`, `ultimate`
+
+### `redis_hll_counters.code_review.i_code_review_diff_hide_whitespace_weekly`
+
+Count of users with show whitespace disabled
+
+[YAML definition](https://gitlab.com/gitlab-org/gitlab/-/blob/master/config/metrics/counts_7d/20210422102007_i_code_review_diff_hide_whitespace_weekly.yml)
+
+Group: `group::code review`
+
+Status: `implemented`
+
+Tiers: `free`, `premium`, `ultimate`
+
+### `redis_hll_counters.code_review.i_code_review_diff_multiple_files_monthly`
+
+Count of users with single mode disabled
+
+[YAML definition](https://gitlab.com/gitlab-org/gitlab/-/blob/master/config/metrics/counts_28d/20210422102202_i_code_review_diff_multiple_files_monthly.yml)
+
+Group: `group::code review`
+
+Status: `implemented`
+
+Tiers: `free`, `premium`, `ultimate`
+
+### `redis_hll_counters.code_review.i_code_review_diff_multiple_files_weekly`
+
+Count of users with single mode disabled
+
+[YAML definition](https://gitlab.com/gitlab-org/gitlab/-/blob/master/config/metrics/counts_7d/20210422102159_i_code_review_diff_multiple_files_weekly.yml)
+
+Group: `group::code review`
+
+Status: `implemented`
+
+Tiers: `free`, `premium`, `ultimate`
+
+### `redis_hll_counters.code_review.i_code_review_diff_show_whitespace_monthly`
+
+Count of users with show whitespace enabled
+
+[YAML definition](https://gitlab.com/gitlab-org/gitlab/-/blob/master/config/metrics/counts_28d/20210422101928_i_code_review_diff_show_whitespace_monthly.yml)
+
+Group: `group::code review`
+
+Status: `implemented`
+
+Tiers: `free`, `premium`, `ultimate`
+
+### `redis_hll_counters.code_review.i_code_review_diff_show_whitespace_weekly`
+
+Count of users with show whitespace enabled
+
+[YAML definition](https://gitlab.com/gitlab-org/gitlab/-/blob/master/config/metrics/counts_7d/20210422101925_i_code_review_diff_show_whitespace_weekly.yml)
+
+Group: `group::code review`
+
+Status: `implemented`
+
+Tiers: `free`, `premium`, `ultimate`
+
+### `redis_hll_counters.code_review.i_code_review_diff_single_file_monthly`
+
+Count of users with single file mode enabled
+
+[YAML definition](https://gitlab.com/gitlab-org/gitlab/-/blob/master/config/metrics/counts_28d/20210422102121_i_code_review_diff_single_file_monthly.yml)
+
+Group: `group::code review`
+
+Status: `implemented`
+
+Tiers: `free`, `premium`, `ultimate`
+
+### `redis_hll_counters.code_review.i_code_review_diff_single_file_weekly`
+
+Count of users with single file mode enabled
+
+[YAML definition](https://gitlab.com/gitlab-org/gitlab/-/blob/master/config/metrics/counts_7d/20210422102118_i_code_review_diff_single_file_weekly.yml)
+
+Group: `group::code review`
+
+Status: `implemented`
+
+Tiers: `free`, `premium`, `ultimate`
+
+### `redis_hll_counters.code_review.i_code_review_diff_view_inline_monthly`
+
+Count of users with merge request view type as inline
+
+[YAML definition](https://gitlab.com/gitlab-org/gitlab/-/blob/master/config/metrics/counts_28d/20210422101516_i_code_review_diff_view_inline_monthly.yml)
+
+Group: `group::code review`
+
+Status: `implemented`
+
+Tiers: `free`, `premium`, `ultimate`
+
+### `redis_hll_counters.code_review.i_code_review_diff_view_inline_weekly`
+
+Count of users with merge request view type as inline
+
+[YAML definition](https://gitlab.com/gitlab-org/gitlab/-/blob/master/config/metrics/counts_7d/20210422101512_i_code_review_diff_view_inline_weekly.yml)
+
+Group: `group::code review`
+
+Status: `implemented`
+
+Tiers: `free`, `premium`, `ultimate`
+
+### `redis_hll_counters.code_review.i_code_review_diff_view_parallel_monthly`
+
+Count of users with merge request view type as parallel
+
+[YAML definition](https://gitlab.com/gitlab-org/gitlab/-/blob/master/config/metrics/counts_28d/20210422101613_i_code_review_diff_view_parallel_monthly.yml)
+
+Group: `group::code review`
+
+Status: `implemented`
+
+Tiers: `free`, `premium`, `ultimate`
+
+### `redis_hll_counters.code_review.i_code_review_diff_view_parallel_weekly`
+
+Count of users with merge request view type as parallel
+
+[YAML definition](https://gitlab.com/gitlab-org/gitlab/-/blob/master/config/metrics/counts_7d/20210422101609_i_code_review_diff_view_parallel_weekly.yml)
+
+Group: `group::code review`
+
+Status: `implemented`
+
+Tiers: `free`, `premium`, `ultimate`
+
 ### `redis_hll_counters.code_review.i_code_review_edit_mr_desc_monthly`
 
 Missing description
@@ -8072,6 +8288,54 @@ Status: `data_available`
 
 Tiers:
 
+### `redis_hll_counters.code_review.i_code_review_file_browser_list_view_monthly`
+
+Count of users with merge request file list setting
+
+[YAML definition](https://gitlab.com/gitlab-org/gitlab/-/blob/master/config/metrics/counts_28d/20210422101852_i_code_review_file_browser_list_view_monthly.yml)
+
+Group: `group::code review`
+
+Status: `implemented`
+
+Tiers: `free`, `premium`, `ultimate`
+
+### `redis_hll_counters.code_review.i_code_review_file_browser_list_view_weekly`
+
+Count of users with merge request file list setting
+
+[YAML definition](https://gitlab.com/gitlab-org/gitlab/-/blob/master/config/metrics/counts_7d/20210422101849_i_code_review_file_browser_list_view_weekly.yml)
+
+Group: `group::code review`
+
+Status: `implemented`
+
+Tiers: `free`, `premium`, `ultimate`
+
+### `redis_hll_counters.code_review.i_code_review_file_browser_tree_view_monthly`
+
+Count of users with merge request file tree setting
+
+[YAML definition](https://gitlab.com/gitlab-org/gitlab/-/blob/master/config/metrics/counts_28d/20210422101753_i_code_review_file_browser_tree_view_monthly.yml)
+
+Group: `group::code review`
+
+Status: `implemented`
+
+Tiers: `free`, `premium`, `ultimate`
+
+### `redis_hll_counters.code_review.i_code_review_file_browser_tree_view_weekly`
+
+Count of users with merge request file tree setting
+
+[YAML definition](https://gitlab.com/gitlab-org/gitlab/-/blob/master/config/metrics/counts_7d/20210422101750_i_code_review_file_browser_tree_view_weekly.yml)
+
+Group: `group::code review`
+
+Status: `implemented`
+
+Tiers: `free`, `premium`, `ultimate`
+
 ### `redis_hll_counters.code_review.i_code_review_mr_diffs_monthly`
 
 Count of unique merge requests per week|month with diffs viewed

lib/gitlab/usage_data_counters/known_events/code_review_events.yml

@@ -204,3 +204,59 @@
   category: code_review
   aggregation: weekly
   feature_flag: usage_data_i_code_review_user_labels_changed
+# Diff settings events
+- name: i_code_review_click_single_file_mode_setting
+  redis_slot: code_review
+  category: code_review
+  aggregation: weekly
+  feature_flag: diff_settings_usage_data
+- name: i_code_review_click_file_browser_setting
+  redis_slot: code_review
+  category: code_review
+  aggregation: weekly
+  feature_flag: diff_settings_usage_data
+- name: i_code_review_click_whitespace_setting
+  redis_slot: code_review
+  category: code_review
+  aggregation: weekly
+  feature_flag: diff_settings_usage_data
+- name: i_code_review_diff_view_inline
+  redis_slot: code_review
+  category: code_review
+  aggregation: weekly
+  feature_flag: diff_settings_usage_data
+- name: i_code_review_diff_view_parallel
+  redis_slot: code_review
+  category: code_review
+  aggregation: weekly
+  feature_flag: diff_settings_usage_data
+- name: i_code_review_file_browser_tree_view
+  redis_slot: code_review
+  category: code_review
+  aggregation: weekly
+  feature_flag: diff_settings_usage_data
+- name: i_code_review_file_browser_list_view
+  redis_slot: code_review
+  category: code_review
+  aggregation: weekly
+  feature_flag: diff_settings_usage_data
+- name: i_code_review_diff_show_whitespace
+  redis_slot: code_review
+  category: code_review
+  aggregation: weekly
+  feature_flag: diff_settings_usage_data
+- name: i_code_review_diff_hide_whitespace
+  redis_slot: code_review
+  category: code_review
+  aggregation: weekly
+  feature_flag: diff_settings_usage_data
+- name: i_code_review_diff_single_file
+  redis_slot: code_review
+  category: code_review
+  aggregation: weekly
+  feature_flag: diff_settings_usage_data
+- name: i_code_review_diff_multiple_files
+  redis_slot: code_review
+  category: code_review
+  aggregation: weekly
+  feature_flag: diff_settings_usage_data