Merge branch...

Merge branch '241686-add-automatically-counters-for-events-in-know_events-yml-to-usage-data' into 'master'

Add automatically counters for events in know_events.yml to usage data

See merge request gitlab-org/gitlab!40714

lib/gitlab/usage_data.rb

@@ -39,6 +39,7 @@ module Gitlab
             .merge(analytics_unique_visits_data)
             .merge(compliance_unique_visits_data)
             .merge(search_unique_visits_data)
+            .merge(redis_hll_counters)
         end
       end
 
@@ -618,6 +619,10 @@ module Gitlab
         {}
       end
 
+      def redis_hll_counters
+        { redis_hll_counters: ::Gitlab::UsageDataCounters::HLLRedisCounter.unique_events_data }
+      end
+
       def analytics_unique_visits_data
         results = ::Gitlab::Analytics::UniqueVisits.analytics_events.each_with_object({}) do |target, hash|
           hash[target] = redis_usage_data { unique_visit_service.unique_visits_for(targets: target) }

lib/gitlab/usage_data_counters/hll_redis_counter.rb

@@ -3,6 +3,8 @@
 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
@@ -53,14 +55,44 @@ module Gitlab
           Gitlab::Redis::HLL.count(keys: keys)
         end
 
+        def categories
+          @categories ||= known_events.map { |event| event[:category] }.uniq
+        end
+
         # @param category [String] the category name
         # @return [Array<String>] list of event names for given category
         def events_for_category(category)
           known_events.select { |event| event[:category] == category.to_s }.map { |event| event[:name] }
         end
 
+        def unique_events_data
+          categories.each_with_object({}) do |category, category_results|
+            events_names = events_for_category(category)
+
+            event_results = events_names.each_with_object({}) do |event, hash|
+              hash[event] = unique_events(event_names: event, start_date: 7.days.ago.to_date, end_date: Date.current)
+            end
+
+            if eligible_for_totals?(events_names)
+              event_results["#{category}_total_unique_counts_weekly"] = unique_events(event_names: events_names, start_date: 7.days.ago.to_date, end_date: Date.current)
+              event_results["#{category}_total_unique_counts_monthly"] = unique_events(event_names: events_names, start_date: 4.weeks.ago.to_date, end_date: Date.current)
+            end
+
+            category_results["#{category}"] = event_results
+          end
+        end
+
         private
 
+        # Allow to add totals for events that are in the same redis slot, category and have the same aggregation level
+        # and if there are more than 1 event
+        def eligible_for_totals?(events_names)
+          return false if events_names.size <= 1
+
+          events = events_for(events_names)
+          events_in_same_slot?(events) && events_in_same_category?(events) && events_same_aggregation?(events)
+        end
+
         def keys_for_aggregation(aggregation, events:, start_date:, end_date:)
           if aggregation.to_sym == :daily
             daily_redis_keys(events: events, start_date: start_date, end_date: end_date)
@@ -78,8 +110,11 @@ module Gitlab
         end
 
         def events_in_same_slot?(events)
+          # if we check one event then redis_slot is only one to check
+          return true if events.size == 1
+
           slot = events.first[:redis_slot]
-          events.all? { |event| event[:redis_slot] == slot }
+          events.all? { |event| event[:redis_slot].present? && event[:redis_slot] == slot }
         end
 
         def events_in_same_category?(events)

spec/lib/gitlab/usage_data_spec.rb

@@ -1141,6 +1141,24 @@ RSpec.describe Gitlab::UsageData, :aggregate_failures do
     end
   end
 
+  describe 'redis_hll_counters' do
+    subject { described_class.redis_hll_counters }
+
+    let(:categories) { ::Gitlab::UsageDataCounters::HLLRedisCounter.categories }
+
+    it 'has all know_events' do
+      expect(subject).to have_key(:redis_hll_counters)
+
+      expect(subject[:redis_hll_counters].keys).to match_array(categories)
+
+      categories.each do |category|
+        keys = ::Gitlab::UsageDataCounters::HLLRedisCounter.events_for_category(category) + ["#{category}_total_unique_counts_weekly", "#{category}_total_unique_counts_monthly"]
+
+        expect(subject[:redis_hll_counters][category].keys).to match_array(keys)
+      end
+    end
+  end
+
   describe '.service_desk_counts' do
     subject { described_class.send(:service_desk_counts) }