Merge branch '333117-migrate-testing-events-redishll' into 'master'

Add instrumentation_class to Testing event metrics [RUN ALL RSPEC] [RUN AS-IF-FOSS]

See merge request gitlab-org/gitlab!67619

config/metrics/counts_28d/20210216182136_i_testing_test_case_parsed_monthly.yml

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

config/metrics/counts_28d/20210216184140_testing_total_unique_counts_monthly.yml

@@ -10,6 +10,20 @@ value_type: number
 status: removed
 time_frame: 28d
 data_source: redis_hll
+instrumentation_class: RedisHLLMetric
+options:
+  events:
+    - i_testing_test_case_parsed
+    - i_testing_metrics_report_widget_total
+    - i_testing_group_code_coverage_visit_total
+    - i_testing_full_code_quality_report_total
+    - i_testing_web_performance_widget_total
+    - i_testing_group_code_coverage_project_click_total
+    - i_testing_load_performance_widget_total
+    - i_testing_metrics_report_artifact_uploaders
+    - i_testing_summary_widget_total
+    - users_expanding_testing_code_quality_report
+    - users_expanding_testing_accessibility_report
 distribution:
 - ce
 tier:

config/metrics/counts_28d/20210409100451_users_expanding_testing_code_quality_report_monthly.yml

@@ -12,6 +12,10 @@ milestone: '13.11'
 introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/57133
 time_frame: 28d
 data_source: redis_hll
+instrumentation_class: RedisHLLMetric
+options:
+  events:
+    - users_expanding_testing_code_quality_report
 distribution:
   - ce
   - ee

config/metrics/counts_28d/20210409100628_users_expanding_testing_accessibility_report_monthly.yml

@@ -12,6 +12,10 @@ milestone: '13.11'
 introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/57133
 time_frame: 28d
 data_source: redis_hll
+instrumentation_class: RedisHLLMetric
+options:
+  events:
+    - users_expanding_testing_accessibility_report
 distribution:
   - ce
   - ee

config/metrics/counts_28d/20210413205507_i_testing_summary_widget_total_monthly.yml

@@ -12,6 +12,10 @@ milestone: "13.11"
 introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/59316
 time_frame: 28d
 data_source: redis_hll
+instrumentation_class: RedisHLLMetric
+options:
+  events:
+    - i_testing_summary_widget_total
 distribution:
 - ee
 - ce

config/metrics/counts_7d/20210216182134_i_testing_test_case_parsed_weekly.yml

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

config/metrics/counts_7d/20210409100451_users_expanding_testing_code_quality_report_weekly.yml

@@ -12,6 +12,10 @@ milestone: '13.11'
 introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/57133
 time_frame: 7d
 data_source: redis_hll
+instrumentation_class: RedisHLLMetric
+options:
+  events:
+    - users_expanding_testing_code_quality_report
 distribution:
   - ce
   - ee

config/metrics/counts_7d/20210409100628_users_expanding_testing_accessibility_report_weekly.yml

@@ -12,6 +12,10 @@ milestone: '13.11'
 introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/57133
 time_frame: 7d
 data_source: redis_hll
+instrumentation_class: RedisHLLMetric
+options:
+  events:
+    - users_expanding_testing_accessibility_report
 distribution:
   - ce
   - ee

config/metrics/counts_7d/20210413205507_i_testing_summary_widget_total_weekly.yml

@@ -12,6 +12,10 @@ milestone: "13.11"
 introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/59316
 time_frame: 7d
 data_source: redis_hll
+instrumentation_class: RedisHLLMetric
+options:
+  events:
+    - i_testing_summary_widget_total
 distribution:
 - ee
 - ce

ee/config/metrics/counts_28d/20210216182139_i_testing_metrics_report_widget_total_monthly.yml

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

ee/config/metrics/counts_28d/20210216182143_i_testing_group_code_coverage_visit_total_monthly.yml

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

ee/config/metrics/counts_28d/20210216182147_i_testing_full_code_quality_report_total_monthly.yml

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

ee/config/metrics/counts_28d/20210216182151_i_testing_web_performance_widget_total_monthly.yml

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

ee/config/metrics/counts_28d/20210216182153_i_testing_group_code_coverage_project_click_total_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_testing_group_code_coverage_project_click_total
 distribution:
 - ee
 tier:

ee/config/metrics/counts_28d/20210216182156_i_testing_load_performance_widget_total_monthly.yml

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

ee/config/metrics/counts_28d/20210216182200_i_testing_metrics_report_artifact_uploaders_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_testing_metrics_report_artifact_uploaders
 distribution:
 - ee
 tier:

ee/config/metrics/counts_7d/20210216182138_i_testing_metrics_report_widget_total_weekly.yml

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

ee/config/metrics/counts_7d/20210216182141_i_testing_group_code_coverage_visit_total_weekly.yml

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

ee/config/metrics/counts_7d/20210216182145_i_testing_full_code_quality_report_total_weekly.yml

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

ee/config/metrics/counts_7d/20210216182149_i_testing_web_performance_widget_total_weekly.yml

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

ee/config/metrics/counts_7d/20210216182154_i_testing_load_performance_widget_total_weekly.yml

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

ee/config/metrics/counts_7d/20210216182158_i_testing_metrics_report_artifact_uploaders_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_testing_metrics_report_artifact_uploaders
 distribution:
 - ee
 tier:

ee/config/metrics/counts_7d/20210216184132_i_testing_group_code_coverage_project_click_total_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_testing_group_code_coverage_project_click_total
 distribution:
 - ee
 tier:

ee/config/metrics/counts_7d/20210216184138_testing_total_unique_counts_weekly.yml

@@ -10,6 +10,20 @@ value_type: number
 status: removed
 time_frame: 7d
 data_source: redis_hll
+instrumentation_class: RedisHLLMetric
+options:
+  events:
+    - i_testing_test_case_parsed
+    - i_testing_metrics_report_widget_total
+    - i_testing_group_code_coverage_visit_total
+    - i_testing_full_code_quality_report_total
+    - i_testing_web_performance_widget_total
+    - i_testing_group_code_coverage_project_click_total
+    - i_testing_load_performance_widget_total
+    - i_testing_metrics_report_artifact_uploaders
+    - i_testing_summary_widget_total
+    - users_expanding_testing_code_quality_report
+    - users_expanding_testing_accessibility_report
 distribution:
 - ee
 tier:

ee/spec/lib/gitlab/usage_data_metrics_spec.rb

@@ -53,6 +53,19 @@ RSpec.describe Gitlab::UsageDataMetrics do
           :search_total_unique_counts_monthly, :search_total_unique_counts_weekly
         ])
       end
+
+      it 'includes testing monthly and weekly keys' do
+        expect(subject[:redis_hll_counters][:testing]).to include(
+          :i_testing_metrics_report_widget_total_monthly, :i_testing_metrics_report_widget_total_weekly,
+          :i_testing_group_code_coverage_visit_total_monthly, :i_testing_group_code_coverage_visit_total_weekly,
+          :i_testing_full_code_quality_report_total_monthly, :i_testing_full_code_quality_report_total_weekly,
+          :i_testing_web_performance_widget_total_monthly, :i_testing_web_performance_widget_total_weekly,
+          :i_testing_group_code_coverage_project_click_total_monthly, :i_testing_group_code_coverage_project_click_total_weekly,
+          :i_testing_load_performance_widget_total_monthly, :i_testing_load_performance_widget_total_weekly,
+          :i_testing_metrics_report_artifact_uploaders_monthly, :i_testing_metrics_report_artifact_uploaders_weekly,
+          :testing_total_unique_counts_weekly
+        )
+      end
     end
   end
 end

spec/lib/gitlab/usage_data_metrics_spec.rb

@@ -66,6 +66,16 @@ RSpec.describe Gitlab::UsageDataMetrics do
         )
       end
 
+      it 'includes testing monthly and weekly keys' do
+        expect(subject[:redis_hll_counters][:testing]).to include(
+          :i_testing_test_case_parsed_monthly, :i_testing_test_case_parsed_weekly,
+          :users_expanding_testing_code_quality_report_monthly, :users_expanding_testing_code_quality_report_weekly,
+          :users_expanding_testing_accessibility_report_monthly, :users_expanding_testing_accessibility_report_weekly,
+          :i_testing_summary_widget_total_monthly, :i_testing_summary_widget_total_weekly,
+          :testing_total_unique_counts_monthly
+        )
+      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,