diff options
author | GitLab Bot <gitlab-bot@gitlab.com> | 2023-06-12 12:14:45 +0300 |
---|---|---|
committer | GitLab Bot <gitlab-bot@gitlab.com> | 2023-06-12 12:14:45 +0300 |
commit | dc8043d6ac3308f6d261b436b524a86f251ef188 (patch) | |
tree | 3eaf805d73a758661ff27f86acc738aac796021f /lib/gitlab | |
parent | fefc7abcfc24e13136cceb3e1b965c116fc7f493 (diff) |
Add latest changes from gitlab-org/gitlab@16-0-stable-ee
Diffstat (limited to 'lib/gitlab')
-rw-r--r-- | lib/gitlab/usage_data_counters/hll_redis_counter.rb | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/lib/gitlab/usage_data_counters/hll_redis_counter.rb b/lib/gitlab/usage_data_counters/hll_redis_counter.rb index 7ddd496cd85..badcda1def0 100644 --- a/lib/gitlab/usage_data_counters/hll_redis_counter.rb +++ b/lib/gitlab/usage_data_counters/hll_redis_counter.rb @@ -120,12 +120,11 @@ module Gitlab aggregation = events.first[:aggregation] if Feature.disabled?(:revert_daily_hll_events_to_weekly_aggregation) - aggregation = :weekly - events.each { |e| e[:aggregation] = :weekly } + aggregation = 'weekly' + events = events.map { |e| e.merge(aggregation: 'weekly') } end keys = keys_for_aggregation(aggregation, events: events, start_date: start_date, end_date: end_date, context: context) - return FALLBACK unless keys.any? redis_usage_data { Gitlab::Redis::HLL.count(keys: keys) } |