Add latest changes from gitlab-org/gitlab@15-1-stable-eev15.1.0-rc42

2 files changed, 4 insertions, 37 deletions

diff --git a/lib/gitlab/analytics/cycle_analytics/aggregated/records_fetcher.rb b/lib/gitlab/analytics/cycle_analytics/aggregated/records_fetcher.rb
index 55e421173d7..07dc4c02ba8 100644
--- a/lib/gitlab/analytics/cycle_analytics/aggregated/records_fetcher.rb
+++ b/lib/gitlab/analytics/cycle_analytics/aggregated/records_fetcher.rb
@@ -38,7 +38,7 @@ module Gitlab
             strong_memoize(:serialized_records) do
               # When RecordsFetcher is used with query sourced from
               # InOperatorOptimization::QueryBuilder only columns
-              # used in ORDER BY statement would be selected by Arel.start operation
+              # used in ORDER BY statement would be selected by Arel.star operation
               selections = [stage_event_model.arel_table[Arel.star]]
               selections << duration_in_seconds.as('total_time') if params[:sort] != :duration # duration sorting already exposes this data
 
@@ -55,7 +55,9 @@ module Gitlab
                   project_path: project.path,
                   namespace_path: project.namespace.route.path,
                   author: issuable.author,
-                  total_time: record.total_time
+                  total_time: record.total_time,
+                  start_event_timestamp: record.start_event_timestamp,
+                  end_event_timestamp: record.end_event_timestamp
                 })
                 serializer.represent(attributes)
               end
diff --git a/lib/gitlab/analytics/unique_visits.rb b/lib/gitlab/analytics/unique_visits.rb
deleted file mode 100644
index 3546a7e3ddb..00000000000
--- a/lib/gitlab/analytics/unique_visits.rb
+++ /dev/null
@@ -1,35 +0,0 @@
-# frozen_string_literal: true
-
-module Gitlab
-  module Analytics
-    class UniqueVisits
-      # 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_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)
-        events = if targets == :analytics
-                   self.class.analytics_events
-                 elsif targets == :compliance
-                   self.class.compliance_events
-                 else
-                   Array(targets)
-                 end
-
-        Gitlab::UsageDataCounters::HLLRedisCounter.unique_events(event_names: events, start_date: start_date, end_date: end_date)
-      end
-
-      class << self
-        def analytics_events
-          Gitlab::UsageDataCounters::HLLRedisCounter.events_for_category('analytics')
-        end
-
-        def compliance_events
-          Gitlab::UsageDataCounters::HLLRedisCounter.events_for_category('compliance')
-        end
-      end
-    end
-  end
-end