Merge branch '263410-follow-up-from-track-unique-wiki-page-views-in-usage-ping' into 'master'

Convert event name to string when comparing

See merge request gitlab-org/gitlab!44697

lib/gitlab/usage_data_counters/hll_redis_counter.rb

@@ -44,7 +44,7 @@ module Gitlab
         end
 
         def unique_events(event_names:, start_date:, end_date:)
-          events = events_for(Array(event_names))
+          events = events_for(Array(event_names).map(&:to_s))
 
           raise 'Events should be in same slot' unless events_in_same_slot?(events)
           raise 'Events should be in same category' unless events_in_same_category?(events)
@@ -141,7 +141,7 @@ module Gitlab
         end
 
         def event_for(event_name)
-          known_events.find { |event| event[:name] == event_name }
+          known_events.find { |event| event[:name] == event_name.to_s }
         end
 
         def events_for(event_names)

spec/lib/gitlab/usage_data_counters/hll_redis_counter_spec.rb

@@ -77,6 +77,12 @@ RSpec.describe Gitlab::UsageDataCounters::HLLRedisCounter, :clean_gitlab_redis_s
           stub_application_setting(usage_ping_enabled: true)
         end
 
+        it 'tracks event when using symbol' do
+          expect(Gitlab::Redis::HLL).to receive(:add)
+
+          described_class.track_event(entity1, :g_analytics_contribution)
+        end
+
         it "raise error if metrics don't have same aggregation" do
           expect { described_class.track_event(entity1, different_aggregation, Date.current) } .to raise_error(Gitlab::UsageDataCounters::HLLRedisCounter::UnknownAggregation)
         end
@@ -201,6 +207,10 @@ RSpec.describe Gitlab::UsageDataCounters::HLLRedisCounter, :clean_gitlab_redis_s
         it { expect(described_class.unique_events(event_names: weekly_event, start_date: 4.weeks.ago, end_date: 3.weeks.ago)).to eq(1) }
       end
 
+      context 'when using symbol as parameter' do
+        it { expect(described_class.unique_events(event_names: weekly_event.to_sym, start_date: 4.weeks.ago, end_date: 3.weeks.ago)).to eq(1) }
+      end
+
       context 'when using daily aggregation' do
         it { expect(described_class.unique_events(event_names: daily_event, start_date: 7.days.ago, end_date: Date.current)).to eq(2) }
         it { expect(described_class.unique_events(event_names: daily_event, start_date: 28.days.ago, end_date: Date.current)).to eq(3) }