Merge branch 'master' into 38464-k8s-apps

Conflicts:
	db/schema.rb

1 files changed, 16 insertions, 0 deletions

diff --git a/lib/gitlab/metrics/background_transaction.rb b/lib/gitlab/metrics/background_transaction.rb
new file mode 100644
index 00000000000..d01de5eef0a
--- /dev/null
+++ b/lib/gitlab/metrics/background_transaction.rb
@@ -0,0 +1,16 @@
+module Gitlab
+  module Metrics
+    class BackgroundTransaction < Transaction
+      def initialize(worker_class)
+        super()
+        @worker_class = worker_class
+      end
+
+      protected
+
+      def labels
+        { controller: @worker_class.name, action: 'perform' }
+      end
+    end
+  end
+end