Merge branch '333117-migrate-redishll-ide-edit-events' into 'master'

Add web_edit instrumentation class

See merge request gitlab-org/gitlab!66789

config/metrics/counts_28d/20210216180330_g_edit_by_web_ide_monthly.yml

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

config/metrics/counts_28d/20210216180334_g_edit_by_sfe_monthly.yml

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

config/metrics/counts_28d/20210216180338_g_edit_by_snippet_ide_monthly.yml

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

config/metrics/counts_28d/20210216180341_ide_edit_total_unique_counts_monthly.yml

@@ -10,6 +10,13 @@ value_type: number
 status: data_available
 time_frame: 28d
 data_source: redis_hll
+instrumentation_class: RedisHLLMetric
+options:
+  events:
+    - g_edit_by_web_ide
+    - g_edit_by_sfe
+    - g_edit_by_snippet_ide
+    - g_edit_by_sse
 distribution:
 - ce
 - ee

config/metrics/counts_28d/20210216184024_g_edit_by_sse_monthly.yml

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

config/metrics/counts_7d/20210216180328_g_edit_by_web_ide_weekly.yml

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

config/metrics/counts_7d/20210216180332_g_edit_by_sfe_weekly.yml

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

config/metrics/counts_7d/20210216180336_g_edit_by_snippet_ide_weekly.yml

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

config/metrics/counts_7d/20210216180339_ide_edit_total_unique_counts_weekly.yml

@@ -10,6 +10,13 @@ value_type: number
 status: data_available
 time_frame: 7d
 data_source: redis_hll
+instrumentation_class: RedisHLLMetric
+options:
+  events:
+    - g_edit_by_web_ide
+    - g_edit_by_sfe
+    - g_edit_by_snippet_ide
+    - g_edit_by_sse
 distribution:
 - ce
 - ee

config/metrics/counts_7d/20210216184022_g_edit_by_sse_weekly.yml

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

spec/lib/gitlab/usage_data_metrics_spec.rb

@@ -16,7 +16,7 @@ RSpec.describe Gitlab::UsageDataMetrics do
       allow(ActiveRecord::Base.connection).to receive(:transaction_open?).and_return(false)
     end
 
-    context 'whith instrumentation_class' do
+    context 'with instrumentation_class' do
       it 'includes top level keys' do
         expect(subject).to include(:uuid)
         expect(subject).to include(:hostname)
@@ -31,6 +31,16 @@ RSpec.describe Gitlab::UsageDataMetrics do
         expect(subject[:redis_hll_counters][:quickactions]).to include(:i_quickactions_approve_weekly)
       end
 
+      it 'includes ide_edit monthly and weekly keys' do
+        expect(subject[:redis_hll_counters][:ide_edit].keys).to contain_exactly(*[
+          :g_edit_by_web_ide_monthly, :g_edit_by_web_ide_weekly,
+          :g_edit_by_sfe_monthly, :g_edit_by_sfe_weekly,
+          :g_edit_by_sse_monthly, :g_edit_by_sse_weekly,
+          :g_edit_by_snippet_ide_monthly, :g_edit_by_snippet_ide_weekly,
+          :ide_edit_total_unique_counts_monthly, :ide_edit_total_unique_counts_weekly
+        ])
+      end
+
       it 'includes counts keys' do
         expect(subject[:counts]).to include(:issues)
       end