Add latest changes from gitlab-org/gitlab@master

1 files changed, 23 insertions, 0 deletions

diff --git a/spec/lib/gitlab/usage_data_counters/code_review_events_spec.rb b/spec/lib/gitlab/usage_data_counters/code_review_events_spec.rb
new file mode 100644
index 00000000000..664e7938a7e
--- /dev/null
+++ b/spec/lib/gitlab/usage_data_counters/code_review_events_spec.rb
@@ -0,0 +1,23 @@
+# frozen_string_literal: true
+
+require 'spec_helper'
+
+# If this spec fails, we need to add the new code review event to the correct aggregated metric
+RSpec.describe 'Code review events' do
+  it 'the aggregated metrics contain all the code review metrics' do
+    path = Rails.root.join('lib/gitlab/usage_data_counters/aggregated_metrics/code_review.yml')
+    aggregated_events = YAML.safe_load(File.read(path), aliases: true)&.map(&:with_indifferent_access)
+
+    code_review_aggregated_events = aggregated_events
+      .map { |event| event['events'] }
+      .flatten
+      .uniq
+
+    code_review_events = Gitlab::UsageDataCounters::HLLRedisCounter.events_for_category("code_review")
+
+    exceptions = %w[i_code_review_mr_diffs i_code_review_mr_single_file_diffs]
+    code_review_aggregated_events += exceptions
+
+    expect(code_review_events - code_review_aggregated_events).to be_empty
+  end
+end