Merge branch '333117-migrate-source-code-events-redishll' into 'master'

Update source_code category metrics to include instrumentation_class

See merge request gitlab-org/gitlab!67196

config/metrics/counts_28d/20210216175113_merge_request_action_monthly.yml

@@ -10,6 +10,10 @@ value_type: number
 status: data_available
 time_frame: 28d
 data_source: redis_hll
+instrumentation_class: RedisHLLMetric
+options:
+  events:
+    - merge_request_action
 distribution:
 - ce
 - ee

config/metrics/counts_28d/20210216175117_i_source_code_code_intelligence_monthly.yml

@@ -10,6 +10,10 @@ value_type: number
 status: data_available
 time_frame: 28d
 data_source: redis_hll
+instrumentation_class: RedisHLLMetric
+options:
+  events:
+    - i_source_code_code_intelligence
 distribution:
 - ce
 - ee

config/metrics/counts_28d/20210216182102_wiki_action_monthly.yml

@@ -10,6 +10,10 @@ value_type: number
 status: data_available
 time_frame: 28d
 data_source: redis_hll
+instrumentation_class: RedisHLLMetric
+options:
+  events:
+    - wiki_action
 distribution:
 - ce
 - ee

config/metrics/counts_28d/20210216182106_design_action_monthly.yml

@@ -10,6 +10,10 @@ value_type: number
 status: data_available
 time_frame: 28d
 data_source: redis_hll
+instrumentation_class: RedisHLLMetric
+options:
+  events:
+    - design_action
 distribution:
 - ce
 - ee

config/metrics/counts_28d/20210216182109_project_action_monthly.yml

@@ -10,6 +10,10 @@ value_type: number
 status: data_available
 time_frame: 28d
 data_source: redis_hll
+instrumentation_class: RedisHLLMetric
+options:
+  events:
+    - project_action
 distribution:
 - ce
 - ee

config/metrics/counts_28d/20210216184047_git_write_action_monthly.yml

@@ -10,6 +10,10 @@ value_type: number
 status: data_available
 time_frame: 28d
 data_source: redis_hll
+instrumentation_class: RedisHLLMetric
+options:
+  events:
+    - git_write_action
 distribution:
 - ce
 - ee

config/metrics/counts_7d/20210216175111_merge_request_action_weekly.yml

@@ -10,6 +10,10 @@ value_type: number
 status: data_available
 time_frame: 7d
 data_source: redis_hll
+instrumentation_class: RedisHLLMetric
+options:
+  events:
+    - merge_request_action
 distribution:
 - ce
 - ee

config/metrics/counts_7d/20210216175114_i_source_code_code_intelligence_weekly.yml

@@ -10,6 +10,10 @@ value_type: number
 status: data_available
 time_frame: 7d
 data_source: redis_hll
+instrumentation_class: RedisHLLMetric
+options:
+  events:
+    - i_source_code_code_intelligence
 distribution:
 - ce
 - ee

config/metrics/counts_7d/20210216182100_wiki_action_weekly.yml

@@ -10,8 +10,12 @@ value_type: number
 status: data_available
 time_frame: 7d
 data_source: redis_hll
+instrumentation_class: RedisHLLMetric
+options:
+  events:
+    - wiki_action
 distribution:
-- ee
+- ce
 - ee
 tier:
 - free

config/metrics/counts_7d/20210216182104_design_action_weekly.yml

@@ -10,8 +10,12 @@ value_type: number
 status: data_available
 time_frame: 7d
 data_source: redis_hll
+instrumentation_class: RedisHLLMetric
+options:
+  events:
+    - design_action
 distribution:
-- ee
+- ce
 - ee
 tier:
 - free

config/metrics/counts_7d/20210216182107_project_action_weekly.yml

@@ -10,6 +10,10 @@ value_type: number
 status: data_available
 time_frame: 7d
 data_source: redis_hll
+instrumentation_class: RedisHLLMetric
+options:
+  events:
+    - project_action
 distribution:
 - ce
 - ee

config/metrics/counts_7d/20210216184045_git_write_action_weekly.yml

@@ -10,6 +10,10 @@ value_type: number
 status: data_available
 time_frame: 7d
 data_source: redis_hll
+instrumentation_class: RedisHLLMetric
+options:
+  events:
+    - git_write_action
 distribution:
 - ce
 - ee

spec/lib/gitlab/usage_data_metrics_spec.rb

@@ -41,6 +41,17 @@ RSpec.describe Gitlab::UsageDataMetrics do
         ])
       end
 
+      it 'includes source_code monthly and weekly keys' do
+        expect(subject[:redis_hll_counters][:source_code].keys).to contain_exactly(*[
+          :wiki_action_monthly, :wiki_action_weekly,
+          :design_action_monthly, :design_action_weekly,
+          :project_action_monthly, :project_action_weekly,
+          :git_write_action_monthly, :git_write_action_weekly,
+          :merge_request_action_monthly, :merge_request_action_weekly,
+          :i_source_code_code_intelligence_monthly, :i_source_code_code_intelligence_weekly
+        ])
+      end
+
       it 'includes counts keys' do
         expect(subject[:counts]).to include(:issues)
       end