Add latest changes from gitlab-org/gitlab@13-8-stable-eev13.8.0-rc42

4 files changed, 11 insertions, 8 deletions

diff --git a/lib/gitlab/analytics/cycle_analytics/default_stages.rb b/lib/gitlab/analytics/cycle_analytics/default_stages.rb
index 22aa680cbc1..43683ae174e 100644
--- a/lib/gitlab/analytics/cycle_analytics/default_stages.rb
+++ b/lib/gitlab/analytics/cycle_analytics/default_stages.rb
@@ -30,6 +30,10 @@ module Gitlab
           all.map { |stage| stage[:name] }
         end
 
+        def self.symbolized_stage_names
+          names.map(&:to_sym)
+        end
+
         def self.params_for_issue_stage
           {
             name: 'issue',
diff --git a/lib/gitlab/analytics/cycle_analytics/stage_events.rb b/lib/gitlab/analytics/cycle_analytics/stage_events.rb
index 39dc706dff5..27fc8bd9a1a 100644
--- a/lib/gitlab/analytics/cycle_analytics/stage_events.rb
+++ b/lib/gitlab/analytics/cycle_analytics/stage_events.rb
@@ -11,6 +11,7 @@ module Gitlab
         ENUM_MAPPING = {
           StageEvents::IssueCreated => 1,
           StageEvents::IssueFirstMentionedInCommit => 2,
+          StageEvents::IssueDeployedToProduction => 3,
           StageEvents::MergeRequestCreated => 100,
           StageEvents::MergeRequestFirstDeployedToProduction => 101,
           StageEvents::MergeRequestLastBuildFinished => 102,
@@ -18,8 +19,7 @@ module Gitlab
           StageEvents::MergeRequestMerged => 104,
           StageEvents::CodeStageStart => 1_000,
           StageEvents::IssueStageEnd => 1_001,
-          StageEvents::PlanStageStart => 1_002,
-          StageEvents::ProductionStageEnd => 1_003
+          StageEvents::PlanStageStart => 1_002
         }.freeze
 
         EVENTS = ENUM_MAPPING.keys.freeze
@@ -27,8 +27,7 @@ module Gitlab
         INTERNAL_EVENTS = [
           StageEvents::CodeStageStart,
           StageEvents::IssueStageEnd,
-          StageEvents::PlanStageStart,
-          StageEvents::ProductionStageEnd
+          StageEvents::PlanStageStart
         ].freeze
 
         # Defines which start_event and end_event pairs are allowed
@@ -41,7 +40,7 @@ module Gitlab
           ],
           StageEvents::IssueCreated => [
             StageEvents::IssueStageEnd,
-            StageEvents::ProductionStageEnd
+            StageEvents::IssueDeployedToProduction
           ],
           StageEvents::MergeRequestCreated => [
             StageEvents::MergeRequestMerged
diff --git a/lib/gitlab/analytics/cycle_analytics/stage_events/production_stage_end.rb b/lib/gitlab/analytics/cycle_analytics/stage_events/issue_deployed_to_production.rb
index b778364a917..3e93e60e686 100644
--- a/lib/gitlab/analytics/cycle_analytics/stage_events/production_stage_end.rb
+++ b/lib/gitlab/analytics/cycle_analytics/stage_events/issue_deployed_to_production.rb
@@ -4,13 +4,13 @@ module Gitlab
   module Analytics
     module CycleAnalytics
       module StageEvents
-        class ProductionStageEnd < StageEvent
+        class IssueDeployedToProduction < StageEvent
           def self.name
             _("Issue first deployed to production")
           end
 
           def self.identifier
-            :production_stage_end
+            :issue_deployed_to_production
           end
 
           def object_type
diff --git a/lib/gitlab/analytics/unique_visits.rb b/lib/gitlab/analytics/unique_visits.rb
index 292048dcad9..e367d33d743 100644
--- a/lib/gitlab/analytics/unique_visits.rb
+++ b/lib/gitlab/analytics/unique_visits.rb
@@ -4,7 +4,7 @@ module Gitlab
   module Analytics
     class UniqueVisits
       def track_visit(visitor_id, target_id, time = Time.zone.now)
-        Gitlab::UsageDataCounters::HLLRedisCounter.track_event(visitor_id, target_id, time)
+        Gitlab::UsageDataCounters::HLLRedisCounter.track_event(target_id, values: visitor_id, time: time)
       end
 
       # Returns number of unique visitors for given targets in given time frame