Add latest changes from gitlab-org/gitlab@master

2 files changed, 9 insertions, 43 deletions

diff --git a/lib/gitlab/bitbucket_import/importer.rb b/lib/gitlab/bitbucket_import/importer.rb
index 5a9fad3be56..e59494c9d9c 100644
--- a/lib/gitlab/bitbucket_import/importer.rb
+++ b/lib/gitlab/bitbucket_import/importer.rb
@@ -3,8 +3,6 @@
 module Gitlab
   module BitbucketImport
     class Importer
-      include Gitlab::BitbucketImport::Metrics
-
       LABELS = [{ title: 'bug', color: '#FF0000' },
                 { title: 'enhancement', color: '#428BCA' },
                 { title: 'proposal', color: '#69D100' },
@@ -26,6 +24,7 @@ module Gitlab
         import_issues
         import_pull_requests
         handle_errors
+        metrics.track_finished_import
 
         true
       end
@@ -115,6 +114,8 @@ module Gitlab
           updated_at: issue.updated_at
         )
 
+        metrics.issues_counter.increment
+
         gitlab_issue.labels << @labels[label_name]
 
         import_issue_comments(issue, gitlab_issue) if gitlab_issue.persisted?
@@ -195,6 +196,8 @@ module Gitlab
           updated_at: pull_request.updated_at
         )
 
+        metrics.merge_requests_counter.increment
+
         import_pull_request_comments(pull_request, merge_request) if merge_request.persisted?
       rescue StandardError => e
         store_pull_request_error(pull_request, e)
@@ -288,6 +291,10 @@ module Gitlab
           project_path: project.full_path
         }
       end
+
+      def metrics
+        @metrics ||= Gitlab::Import::Metrics.new(:bitbucket_importer, @project)
+      end
     end
   end
 end
diff --git a/lib/gitlab/bitbucket_import/metrics.rb b/lib/gitlab/bitbucket_import/metrics.rb
deleted file mode 100644
index 25e2d9b211e..00000000000
--- a/lib/gitlab/bitbucket_import/metrics.rb
+++ /dev/null
@@ -1,41 +0,0 @@
-# frozen_string_literal: true
-
-module Gitlab
-  module BitbucketImport
-    module Metrics
-      extend ActiveSupport::Concern
-
-      IMPORTER = :bitbucket_importer
-
-      included do
-        prepend Gitlab::Import::Metrics
-
-        Gitlab::Import::Metrics.measure(:execute, metrics: {
-          "#{IMPORTER}_imported_projects": {
-            type: :counter,
-            description: 'The number of imported Bitbucket projects'
-          },
-          "#{IMPORTER}_total_duration_seconds": {
-            type: :histogram,
-            labels: { importer: IMPORTER },
-            description: 'Total time spent importing Bitbucket projects, in seconds'
-          }
-        })
-
-        Gitlab::Import::Metrics.measure(:import_issue, metrics: {
-          "#{IMPORTER}_imported_issues": {
-            type: :counter,
-            description: 'The number of imported Bitbucket issues'
-          }
-        })
-
-        Gitlab::Import::Metrics.measure(:import_pull_request, metrics: {
-          "#{IMPORTER}_imported_pull_requests": {
-            type: :counter,
-            description: 'The number of imported Bitbucket pull requests'
-          }
-        })
-      end
-    end
-  end
-end