Improve method description, typo

lib/gitlab/analytics/unique_visits.rb

@@ -10,8 +10,8 @@ module Gitlab
       # Returns number of unique visitors for given targets in given time frame
       #
       # @param [String, Array[<String>]] targets ids of targets to count visits on. Special case for :any
-      # @param [ActiveSupport::TimeWithZone] start_week start of time frame
-      # @param [Integer] weeks time frame length in weeks
+      # @param [ActiveSupport::TimeWithZone] start_date start of time frame
+      # @param [ActiveSupport::TimeWithZone] end_date end of time frame
       # @return [Integer] number of unique visitors
       def unique_visits_for(targets:, start_date: 7.days.ago, end_date: start_date + 1.week)
         target_ids = if targets == :analytics

lib/gitlab/usage_data_counters/hll_redis_counter.rb

@@ -23,7 +23,7 @@ module Gitlab
       # - name: g_compliance_dashboard # Unique event name
       #   redis_slot: compliance       # Optional slot name, if not defined it will use name as a slot, used for totals
       #   category: compliance         # Group events in categories
-      #   expiry: 29                   # Optional expiration time in days, defalut value 29 days for daily and 6.weeks for weekly
+      #   expiry: 29                   # Optional expiration time in days, default value 29 days for daily and 6.weeks for weekly
       #   aggregation: daily           # Aggregation level, keys are stored daily or weekly
       #
       # Usage:
@@ -36,9 +36,7 @@ module Gitlab
 
           raise UnknownEvent.new("Unknown event #{event_name}") unless event.present?
 
-          key = redis_key(event, time)
-
-          Gitlab::Redis::HLL.add(key: key, value: entity_id, expiry: expiry(event))
+          Gitlab::Redis::HLL.add(key: redis_key(event, time), value: entity_id, expiry: expiry(event))
         end
 
         def unique_events(event_names:, start_date:, end_date:)
@@ -70,7 +68,7 @@ module Gitlab
         end
 
         def known_events
-          @known_events ||= YAML.load_file( Rails.root.join(KNOWN_EVENTS_PATH)).map(&:with_indifferent_access)
+          @known_events ||= YAML.load_file(Rails.root.join(KNOWN_EVENTS_PATH)).map(&:with_indifferent_access)
         end
 
         def known_events_names
@@ -93,11 +91,9 @@ module Gitlab
         end
 
         def expiry(event)
-          if event[:expiry].present?
-            event[:expiry]
-          else
-            event[:aggregation].to_sym == :daily ? DEFAULT_DAILY_KEY_EXPIRY_LENGTH : DEFAULT_WEEKLY_KEY_EXPIRY_LENGTH
-          end
+          return event[:expiry] if event[:expiry].present?
+
+          event[:aggregation].to_sym == :daily ? DEFAULT_DAILY_KEY_EXPIRY_LENGTH : DEFAULT_WEEKLY_KEY_EXPIRY_LENGTH
         end
 
         def event_for(event_name)

spec/lib/gitlab/usage_data_counters/hll_redis_counter_spec.rb

@@ -6,7 +6,7 @@ RSpec.describe Gitlab::UsageDataCounters::HLLRedisCounter, :clean_gitlab_redis_s
   let(:entity1) { 'dfb9d2d2-f56c-4c77-8aeb-6cddc4a1f857' }
   let(:entity2) { '1dd9afb2-a3ee-4de1-8ae3-a405579c8584' }
   let(:entity3) { '34rfjuuy-ce56-sa35-ds34-dfer567dfrf2' }
-  let(:entity4) { '34rfjuuy-ce56-sa35-ds34-dferddddfrf2' }
+  let(:entity4) { '8b9a2671-2abf-4bec-a682-22f6a8f7bf31' }
 
   let(:weekly_event) { 'g_analytics_contribution' }
   let(:daily_event) { 'g_search' }