Add latest changes from gitlab-org/gitlab@14-4-stable-eev14.4.0-rc42

2 files changed, 48 insertions, 11 deletions

diff --git a/lib/gitlab/import/import_failure_service.rb b/lib/gitlab/import/import_failure_service.rb
index f808ed1b6e2..142c00f7a6b 100644
--- a/lib/gitlab/import/import_failure_service.rb
+++ b/lib/gitlab/import/import_failure_service.rb
@@ -8,14 +8,15 @@ module Gitlab
         import_state: nil,
         project_id: nil,
         error_source: nil,
-        fail_import: false
+        fail_import: false,
+        metrics: false
       )
         new(
           exception: exception,
           import_state: import_state,
           project_id: project_id,
           error_source: error_source
-        ).execute(fail_import: fail_import)
+        ).execute(fail_import: fail_import, metrics: metrics)
       end
 
       def initialize(exception:, import_state: nil, project_id: nil, error_source: nil)
@@ -35,10 +36,11 @@ module Gitlab
         @error_source = error_source
       end
 
-      def execute(fail_import:)
+      def execute(fail_import:, metrics:)
         track_exception
         persist_failure
 
+        track_metrics if metrics
         import_state.mark_as_failed(exception.message) if fail_import
       end
 
@@ -71,6 +73,10 @@ module Gitlab
           correlation_id_value: Labkit::Correlation::CorrelationId.current_or_new_id
         )
       end
+
+      def track_metrics
+        Gitlab::Import::Metrics.new("#{project.import_type}_importer", project).track_failed_import
+      end
     end
   end
 end
diff --git a/lib/gitlab/import/metrics.rb b/lib/gitlab/import/metrics.rb
index 2692ab2fa12..5f27d0ab965 100644
--- a/lib/gitlab/import/metrics.rb
+++ b/lib/gitlab/import/metrics.rb
@@ -3,27 +3,35 @@
 module Gitlab
   module Import
     class Metrics
+      include Gitlab::Utils::UsageData
+
       IMPORT_DURATION_BUCKETS = [0.5, 1, 3, 5, 10, 60, 120, 240, 360, 720, 1440].freeze
 
-      attr_reader :importer
+      attr_reader :importer, :duration
 
       def initialize(importer, project)
         @importer = importer
         @project = project
       end
 
+      def track_start_import
+        return unless project.github_import?
+
+        track_usage_event(:github_import_project_start, project.id)
+      end
+
       def track_finished_import
-        duration = Time.zone.now - @project.created_at
+        @duration = Time.zone.now - project.created_at
 
-        duration_histogram.observe({ importer: importer }, duration)
+        observe_histogram
         projects_counter.increment
+        track_finish_metric
       end
 
-      def projects_counter
-        @projects_counter ||= Gitlab::Metrics.counter(
-          :"#{importer}_imported_projects_total",
-          'The number of imported projects'
-        )
+      def track_failed_import
+        return unless project.github_import?
+
+        track_usage_event(:github_import_project_failure, project.id)
       end
 
       def issues_counter
@@ -42,6 +50,8 @@ module Gitlab
 
       private
 
+      attr_reader :project
+
       def duration_histogram
         @duration_histogram ||= Gitlab::Metrics.histogram(
           :"#{importer}_total_duration_seconds",
@@ -50,6 +60,27 @@ module Gitlab
           IMPORT_DURATION_BUCKETS
         )
       end
+
+      def projects_counter
+        @projects_counter ||= Gitlab::Metrics.counter(
+          :"#{importer}_imported_projects_total",
+          'The number of imported projects'
+        )
+      end
+
+      def observe_histogram
+        if project.github_import?
+          duration_histogram.observe({ project: project.full_path }, duration)
+        else
+          duration_histogram.observe({ importer: importer }, duration)
+        end
+      end
+
+      def track_finish_metric
+        return unless project.github_import?
+
+        track_usage_event(:github_import_project_success, project.id)
+      end
     end
   end
 end