Merge branch 'pawel/fix_backend_transaction_protected_labels_method' into 'master'

Make BackgroundTransaction#labels public

See merge request gitlab-org/gitlab-ce!15257

2 files changed, 6 insertions, 2 deletions

diff --git a/lib/gitlab/metrics/background_transaction.rb b/lib/gitlab/metrics/background_transaction.rb
index d01de5eef0a..5919ebb1493 100644
--- a/lib/gitlab/metrics/background_transaction.rb
+++ b/lib/gitlab/metrics/background_transaction.rb
@@ -6,8 +6,6 @@ module Gitlab
         @worker_class = worker_class
       end
 
-      protected
-
       def labels
         { controller: @worker_class.name, action: 'perform' }
       end
diff --git a/spec/lib/gitlab/metrics/background_transaction_spec.rb b/spec/lib/gitlab/metrics/background_transaction_spec.rb
index 96052b8dc2f..17445fe6de5 100644
--- a/spec/lib/gitlab/metrics/background_transaction_spec.rb
+++ b/spec/lib/gitlab/metrics/background_transaction_spec.rb
@@ -10,4 +10,10 @@ describe Gitlab::Metrics::BackgroundTransaction do
       expect(subject.action).to eq('TestWorker#perform')
     end
   end
+
+  describe '#label' do
+    it 'returns labels based on class name' do
+      expect(subject.labels).to eq(controller: 'TestWorker', action: 'perform')
+    end
+  end
 end