Merge branch 'am-add-count-users-visiting-valuestream-metric' into 'master'

Add CountUsersUsingApproveQuickActionMetric

See merge request gitlab-org/gitlab!60089

config/metrics/counts_28d/20210216181508_i_quickactions_approve_monthly.yml

@@ -9,9 +9,10 @@ value_type: number
 status: data_available
 time_frame: 28d
 data_source: redis_hll
+instrumentation_class: 'Gitlab::Usage::Metrics::Instrumentations::CountUsersUsingApproveQuickActionMetric'
 distribution:
 - ce
-- ee 
+- ee
 tier:
 - free
 - premium

config/metrics/counts_7d/20210216181506_i_quickactions_approve_weekly.yml

@@ -9,10 +9,11 @@ value_type: number
 status: data_available
 time_frame: 7d
 data_source: redis_hll
+instrumentation_class: 'Gitlab::Usage::Metrics::Instrumentations::CountUsersUsingApproveQuickActionMetric'
 distribution:
 - ce
-- ee 
+- ee
 tier:
 - free
 - premium
-- ultimate
\ No newline at end of file
+- ultimate

lib/gitlab/usage/metrics/instrumentations/count_users_using_approve_quick_action_metric.rb

+# frozen_string_literal: true
+
+module Gitlab
+  module Usage
+    module Metrics
+      module Instrumentations
+        class CountUsersUsingApproveQuickActionMetric < RedisHLLMetric
+          event_names :i_quickactions_approve
+        end
+      end
+    end
+  end
+end

lib/gitlab/usage/metrics/instrumentations/redis_hll_metric.rb

@@ -12,7 +12,7 @@ module Gitlab
           # end
           class << self
             def event_names(events = nil)
-              @mentric_events = events
+              @metric_events = events
             end
 
             attr_reader :metric_events

spec/lib/gitlab/usage/metrics/instrumentations/count_users_using_approve_quick_action_metric_spec.rb

+# frozen_string_literal: true
+
+require 'spec_helper'
+
+RSpec.describe Gitlab::Usage::Metrics::Instrumentations::CountUsersUsingApproveQuickActionMetric, :clean_gitlab_redis_shared_state do
+  before do
+    Gitlab::UsageDataCounters::HLLRedisCounter.track_event(:i_quickactions_approve, values: 1, time: 1.week.ago)
+    Gitlab::UsageDataCounters::HLLRedisCounter.track_event(:i_quickactions_approve, values: 1, time: 2.weeks.ago)
+    Gitlab::UsageDataCounters::HLLRedisCounter.track_event(:i_quickactions_approve, values: 2, time: 2.weeks.ago)
+    Gitlab::UsageDataCounters::HLLRedisCounter.track_event(:i_quickactions_approve, values: 2, time: 2.months.ago)
+  end
+
+  it_behaves_like 'a correct instrumented metric value', { time_frame: '28d', data_source: 'redis_hll' }, 2
+  it_behaves_like 'a correct instrumented metric value', { time_frame: '7d', data_source: 'redis_hll' }, 1
+end

spec/lib/gitlab/usage_data_metrics_spec.rb

@@ -25,6 +25,11 @@ RSpec.describe Gitlab::UsageDataMetrics do
       it 'includes counts keys' do
         expect(subject[:counts]).to include(:boards)
       end
+
+      it 'includes i_quickactions_approve monthly and weekly key' do
+        expect(subject[:redis_hll_counters][:quickactions]).to include(:i_quickactions_approve_monthly)
+        expect(subject[:redis_hll_counters][:quickactions]).to include(:i_quickactions_approve_weekly)
+      end
     end
   end
 end