Merge branch 'master' of gitlab_gitlab:gitlab-org/gitlab-cerunner-metrics-extractor

1 files changed, 20 insertions, 0 deletions

diff --git a/lib/gitlab/sidekiq_middleware/monitor.rb b/lib/gitlab/sidekiq_middleware/monitor.rb
new file mode 100644
index 00000000000..53a6132edac
--- /dev/null
+++ b/lib/gitlab/sidekiq_middleware/monitor.rb
@@ -0,0 +1,20 @@
+# frozen_string_literal: true
+
+module Gitlab
+  module SidekiqMiddleware
+    class Monitor
+      def call(worker, job, queue)
+        Gitlab::SidekiqMonitor.instance.within_job(job['jid'], queue) do
+          yield
+        end
+      rescue Gitlab::SidekiqMonitor::CancelledError
+        # push job to DeadSet
+        payload = ::Sidekiq.dump_json(job)
+        ::Sidekiq::DeadSet.new.kill(payload, notify_failure: false)
+
+        # ignore retries
+        raise ::Sidekiq::JobRetry::Skip
+      end
+    end
+  end
+end