Merge branch '300535-add-redishll-error-into-usage-ping-redis-hardening' into 'master'

Add RedisHLL errors into Usage Ping Redis hardening

See merge request gitlab-org/gitlab!54600

lib/gitlab/utils/usage_data.rb

@@ -24,7 +24,8 @@
 #     alt_usage_data(fallback: nil) { Gitlab.config.registry.enabled }
 #
 #   * redis_usage_data method
-#     handles ::Redis::CommandError, Gitlab::UsageDataCounters::BaseCounter::UnknownEvent
+#     handles ::Redis::CommandError, Gitlab::UsageDataCounters::BaseCounter::UnknownEvent,
+#     Gitlab::UsageDataCounters::HLLRedisCounter::EventError
 #     returns -1 when a block is sent or hash with all values -1 when a counter is sent
 #     different behaviour due to 2 different implementations of redis counter
 #
@@ -160,7 +161,7 @@ module Gitlab
 
       def redis_usage_counter
         yield
-      rescue ::Redis::CommandError, Gitlab::UsageDataCounters::BaseCounter::UnknownEvent
+      rescue ::Redis::CommandError, Gitlab::UsageDataCounters::BaseCounter::UnknownEvent, Gitlab::UsageDataCounters::HLLRedisCounter::EventError
         FALLBACK
       end
 

spec/lib/gitlab/utils/usage_data_spec.rb

@@ -203,6 +203,12 @@ RSpec.describe Gitlab::Utils::UsageData do
         expect(described_class.redis_usage_data { raise ::Redis::CommandError } ).to eq(-1)
       end
 
+      it 'returns the fallback when Redis HLL raises any error' do
+        stub_const("Gitlab::Utils::UsageData::FALLBACK", 15)
+
+        expect(described_class.redis_usage_data { raise Gitlab::UsageDataCounters::HLLRedisCounter::CategoryMismatch } ).to eq(15)
+      end
+
       it 'returns the evaluated block when given' do
         expect(described_class.redis_usage_data { 1 }).to eq(1)
       end