Commit 758c2fd6 authored by James Fargher's avatar James Fargher

Merge branch '346321-remove-redis-hll-tracking-from-usage-data' into 'master'

Remove redis_hll_tracking validation from usage_data

See merge request gitlab-org/gitlab!75151
parents fc23ee11 2a12a250
......@@ -663,8 +663,6 @@ module Gitlab
end
def redis_hll_counters
return {} unless Feature.enabled?(:redis_hll_tracking, type: :ops, default_enabled: :yaml)
{ redis_hll_counters: ::Gitlab::UsageDataCounters::HLLRedisCounter.unique_events_data }
end
......
......@@ -1402,10 +1402,7 @@ RSpec.describe Gitlab::UsageData, :aggregate_failures do
let(:categories) { ::Gitlab::UsageDataCounters::HLLRedisCounter.categories }
context 'with redis_hll_tracking feature enabled' do
it 'has all known_events' do
stub_feature_flags(redis_hll_tracking: true)
expect(subject).to have_key(:redis_hll_counters)
expect(subject[:redis_hll_counters].keys).to match_array(categories)
......@@ -1424,15 +1421,6 @@ RSpec.describe Gitlab::UsageData, :aggregate_failures do
end
end
context 'with redis_hll_tracking disabled' do
it 'does not have redis_hll_tracking key' do
stub_feature_flags(redis_hll_tracking: false)
expect(subject).not_to have_key(:redis_hll_counters)
end
end
end
describe '.aggregated_metrics_data' do
it 'uses ::Gitlab::Usage::Metrics::Aggregates::Aggregate methods', :aggregate_failures do
expected_payload = {
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment