Add latest changes from gitlab-org/gitlab@master

1 files changed, 6 insertions, 0 deletions

diff --git a/lib/gitlab/sidekiq_daemon/monitor.rb b/lib/gitlab/sidekiq_daemon/monitor.rb
index a3d61c69ae1..0723b514c90 100644
--- a/lib/gitlab/sidekiq_daemon/monitor.rb
+++ b/lib/gitlab/sidekiq_daemon/monitor.rb
@@ -4,6 +4,7 @@ module Gitlab
   module SidekiqDaemon
     class Monitor < Daemon
       include ::Gitlab::Utils::StrongMemoize
+      extend ::Gitlab::Utils::Override
 
       NOTIFICATION_CHANNEL = 'sidekiq:cancel:notifications'
       CANCEL_DEADLINE = 24.hours.seconds
@@ -24,6 +25,11 @@ module Gitlab
         @jobs_mutex = Mutex.new
       end
 
+      override :thread_name
+      def thread_name
+        "job_monitor"
+      end
+
       def within_job(worker_class, jid, queue)
         jobs_mutex.synchronize do
           jobs[jid] = { worker_class: worker_class, thread: Thread.current, started_at: Gitlab::Metrics::System.monotonic_time }