Merge branch '249521-harden-redis_hll_counters' into 'master'

Use redis_usage_data on Redis HLL counters

Closes #249521

See merge request gitlab-org/gitlab!42319

lib/gitlab/usage_data_counters/hll_redis_counter.rb

@@ -3,8 +3,6 @@
 module Gitlab
   module UsageDataCounters
     module HLLRedisCounter
-      include Gitlab::Utils::UsageData
-
       DEFAULT_WEEKLY_KEY_EXPIRY_LENGTH = 6.weeks
       DEFAULT_DAILY_KEY_EXPIRY_LENGTH = 29.days
       DEFAULT_REDIS_SLOT = ''.freeze
@@ -33,6 +31,8 @@ module Gitlab
       # * Track event: Gitlab::UsageDataCounters::HLLRedisCounter.track_event(user_id, 'g_compliance_dashboard')
       # * Get unique counts per user: Gitlab::UsageDataCounters::HLLRedisCounter.unique_events(event_names: 'g_compliance_dashboard', start_date: 28.days.ago, end_date: Date.current)
       class << self
+        include Gitlab::Utils::UsageData
+
         def track_event(entity_id, event_name, time = Time.zone.now)
           return unless Gitlab::CurrentSettings.usage_ping_enabled?
 
@@ -54,7 +54,7 @@ module Gitlab
 
           keys = keys_for_aggregation(aggregation, events: events, start_date: start_date, end_date: end_date)
 
-          Gitlab::Redis::HLL.count(keys: keys)
+          redis_usage_data { Gitlab::Redis::HLL.count(keys: keys) }
         end
 
         def categories