9 files changed, 62 insertions, 43 deletions

diff --git a/app/services/concerns/exclusive_lease_guard.rb b/app/services/concerns/exclusive_lease_guard.rb
index 76d59cf2159..74acaa0522a 100644
--- a/app/services/concerns/exclusive_lease_guard.rb
+++ b/app/services/concerns/exclusive_lease_guard.rb
@@ -21,7 +21,7 @@ module ExclusiveLeaseGuard
     lease = exclusive_lease.try_obtain
 
     unless lease
-      log_error("Cannot obtain an exclusive lease for #{lease_key}. There must be another instance already in execution.")
+      log_lease_taken
       return
     end
 
@@ -57,7 +57,23 @@ module ExclusiveLeaseGuard
     exclusive_lease.renew
   end
 
-  def log_error(message, extra_args = {})
-    Gitlab::AppLogger.error(message)
+  def log_lease_taken
+    logger = Gitlab::AppJsonLogger
+    args = { message: lease_taken_message, lease_key: lease_key, class_name: self.class.name, lease_timeout: lease_timeout }
+
+    case lease_taken_log_level
+    when :debug then logger.debug(args)
+    when :info  then logger.info(args)
+    when :warn  then logger.warn(args)
+    else             logger.error(args)
+    end
+  end
+
+  def lease_taken_message
+    "Cannot obtain an exclusive lease. There must be another instance already in execution."
+  end
+
+  def lease_taken_log_level
+    :error
   end
 end
diff --git a/app/services/merge_requests/build_service.rb b/app/services/merge_requests/build_service.rb
index d5b109a764d..3a7b577d59a 100644
--- a/app/services/merge_requests/build_service.rb
+++ b/app/services/merge_requests/build_service.rb
@@ -42,17 +42,17 @@ module MergeRequests
     attr_accessor :merge_request
 
     delegate :target_branch,
-             :target_branch_ref,
-             :target_project,
-             :source_branch,
-             :source_branch_ref,
-             :source_project,
-             :compare_commits,
-             :draft_title,
-             :description,
-             :first_multiline_commit,
-             :errors,
-             to: :merge_request
+      :target_branch_ref,
+      :target_project,
+      :source_branch,
+      :source_branch_ref,
+      :source_project,
+      :compare_commits,
+      :draft_title,
+      :description,
+      :first_multiline_commit,
+      :errors,
+      to: :merge_request
 
     def force_remove_source_branch
       if params.key?(:force_remove_source_branch)
diff --git a/app/services/merge_requests/ff_merge_service.rb b/app/services/merge_requests/ff_merge_service.rb
index 6e1d1b6ad23..1a83bbf9de6 100644
--- a/app/services/merge_requests/ff_merge_service.rb
+++ b/app/services/merge_requests/ff_merge_service.rb
@@ -14,10 +14,12 @@ module MergeRequests
 
     override :execute_git_merge
     def execute_git_merge
-      repository.ff_merge(current_user,
-                          source,
-                          merge_request.target_branch,
-                          merge_request: merge_request)
+      repository.ff_merge(
+        current_user,
+        source,
+        merge_request.target_branch,
+        merge_request: merge_request
+      )
     end
 
     override :merge_success_data
diff --git a/app/services/merge_requests/merge_service.rb b/app/services/merge_requests/merge_service.rb
index e6b0ffbf716..10301774f96 100644
--- a/app/services/merge_requests/merge_service.rb
+++ b/app/services/merge_requests/merge_service.rb
@@ -115,8 +115,7 @@ module MergeRequests
     def try_merge
       execute_git_merge
     rescue Gitlab::Git::PreReceiveError => e
-      raise MergeError,
-            "Something went wrong during merge pre-receive hook. #{e.message}".strip
+      raise MergeError, "Something went wrong during merge pre-receive hook. #{e.message}".strip
     rescue StandardError => e
       handle_merge_error(log_message: e.message)
       raise_error(GENERIC_ERROR_MESSAGE)
@@ -180,9 +179,7 @@ module MergeRequests
     end
 
     def log_payload(message)
-      Gitlab::ApplicationContext.current
-        .merge(merge_request_info: merge_request_info,
-               message: message)
+      Gitlab::ApplicationContext.current.merge(merge_request_info: merge_request_info, message: message)
     end
 
     def merge_request_info
diff --git a/app/services/merge_requests/merge_to_ref_service.rb b/app/services/merge_requests/merge_to_ref_service.rb
index 8519cbac3cb..1bd26f06e41 100644
--- a/app/services/merge_requests/merge_to_ref_service.rb
+++ b/app/services/merge_requests/merge_to_ref_service.rb
@@ -25,9 +25,7 @@ module MergeRequests
       commit = project.commit(commit_id)
       target_id, source_id = commit.parent_ids
 
-      success(commit_id: commit.id,
-              target_id: target_id,
-              source_id: source_id)
+      success(commit_id: commit.id, target_id: target_id, source_id: source_id)
     rescue MergeError, ArgumentError => error
       error(error.message)
     end
diff --git a/app/services/merge_requests/push_options_handler_service.rb b/app/services/merge_requests/push_options_handler_service.rb
index e9abafceb13..1890addf692 100644
--- a/app/services/merge_requests/push_options_handler_service.rb
+++ b/app/services/merge_requests/push_options_handler_service.rb
@@ -4,8 +4,7 @@ module MergeRequests
   class PushOptionsHandlerService < ::BaseProjectService
     LIMIT = 10
 
-    attr_reader :errors, :changes,
-                :push_options, :target_project
+    attr_reader :errors, :changes, :push_options, :target_project
 
     def initialize(project:, current_user:, changes:, push_options:, params: {})
       super(project: project, current_user: current_user, params: params)
@@ -112,8 +111,10 @@ module MergeRequests
         merge_request = ::MergeRequests::CreateService.new(
           project: project,
           current_user: current_user,
-          params: merge_request.attributes.merge(assignee_ids: merge_request.assignee_ids,
-                                                 label_ids: merge_request.label_ids)
+          params: merge_request.attributes.merge(
+            assignee_ids: merge_request.assignee_ids,
+            label_ids: merge_request.label_ids
+          )
         ).execute
       end
 
diff --git a/app/services/merge_requests/refresh_service.rb b/app/services/merge_requests/refresh_service.rb
index 21e0d9a6e6b..d6740cdf1ac 100644
--- a/app/services/merge_requests/refresh_service.rb
+++ b/app/services/merge_requests/refresh_service.rb
@@ -247,9 +247,11 @@ module MergeRequests
         mr_commit_ids.include?(commit.id)
       end
 
-      SystemNoteService.add_commits(merge_request, merge_request.project,
-                                    @current_user, new_commits,
-                                    existing_commits, @push.oldrev)
+      SystemNoteService.add_commits(
+        merge_request, merge_request.project,
+        @current_user, new_commits,
+        existing_commits, @push.oldrev
+      )
 
       notification_service.push_to_merge_request(merge_request, @current_user, new_commits: new_commits, existing_commits: existing_commits)
     end
diff --git a/app/services/merge_requests/reload_diffs_service.rb b/app/services/merge_requests/reload_diffs_service.rb
index c64b2e99b52..2c6ec9333b2 100644
--- a/app/services/merge_requests/reload_diffs_service.rb
+++ b/app/services/merge_requests/reload_diffs_service.rb
@@ -22,9 +22,11 @@ module MergeRequests
     def update_diff_discussion_positions(old_diff_refs)
       new_diff_refs = merge_request.diff_refs
 
-      merge_request.update_diff_discussion_positions(old_diff_refs: old_diff_refs,
-                                                     new_diff_refs: new_diff_refs,
-                                                     current_user: current_user)
+      merge_request.update_diff_discussion_positions(
+        old_diff_refs: old_diff_refs,
+        new_diff_refs: new_diff_refs,
+        current_user: current_user
+      )
     end
 
     # rubocop: disable CodeReuse/ActiveRecord
diff --git a/app/services/merge_requests/retarget_chain_service.rb b/app/services/merge_requests/retarget_chain_service.rb
index 33aae4184ae..b4b05ffb08c 100644
--- a/app/services/merge_requests/retarget_chain_service.rb
+++ b/app/services/merge_requests/retarget_chain_service.rb
@@ -21,13 +21,14 @@ module MergeRequests
         # Update only MRs on projects that we have access to
         next unless can?(current_user, :update_merge_request, other_merge_request.source_project)
 
-        ::MergeRequests::UpdateService
-          .new(project: other_merge_request.source_project, current_user: current_user,
-               params: {
-                 target_branch: merge_request.target_branch,
-                 target_branch_was_deleted: true
-               })
-          .execute(other_merge_request)
+        ::MergeRequests::UpdateService.new(
+          project: other_merge_request.source_project,
+          current_user: current_user,
+          params: {
+            target_branch: merge_request.target_branch,
+            target_branch_was_deleted: true
+          }
+        ).execute(other_merge_request)
       end
     end
   end