1 files changed, 8 insertions, 2 deletions
diff --git a/app/workers/merge_request_mergeability_check_worker.rb b/app/workers/merge_request_mergeability_check_worker.rb
index 13961de1f59..0e1ab505644 100644
--- a/app/workers/merge_request_mergeability_check_worker.rb
+++ b/app/workers/merge_request_mergeability_check_worker.rb
@@ -3,16 +3,22 @@
 class MergeRequestMergeabilityCheckWorker
   include ApplicationWorker
 
+  data_consistency :always
+
   sidekiq_options retry: 3
 
   feature_category :code_review
   idempotent!
 
+  def logger
+    @logger ||= Sidekiq.logger
+  end
+
   def perform(merge_request_id)
     merge_request = MergeRequest.find_by_id(merge_request_id)
 
     unless merge_request
-      logger.error("Failed to find merge request with ID: #{merge_request_id}")
+      logger.error(worker: self.class.name, message: "Failed to find merge request", merge_request_id: merge_request_id)
       return
     end
 
@@ -21,6 +27,6 @@ class MergeRequestMergeabilityCheckWorker
         .new(merge_request)
         .execute(recheck: false, retry_lease: false)
 
-    logger.error("Failed to check mergeability of merge request (#{merge_request_id}): #{result.message}") if result.error?
+    logger.error(worker: self.class.name, message: "Failed to check mergeability of merge request: #{result.message}", merge_request_id: merge_request_id) if result.error?
   end
 end