Standardize remote_ip and path keys for auth.log and api_json.log

Current `auth.log` uses `fullpath` and `ip`, while `api_json.log` uses
`remote_ip` and `path` for the same fields. Let's standardize these
namings to make it easier for people working with the data.

Closes https://gitlab.com/gitlab-org/gitlab-ce/issues/66167

4 files changed, 12 insertions, 12 deletions

diff --git a/spec/controllers/projects/raw_controller_spec.rb b/spec/controllers/projects/raw_controller_spec.rb
index b958f419a19..8b43d1264b2 100644
--- a/spec/controllers/projects/raw_controller_spec.rb
+++ b/spec/controllers/projects/raw_controller_spec.rb
@@ -67,9 +67,9 @@ describe Projects::RawController do
         attributes = {
           message: 'Action_Rate_Limiter_Request',
           env: :raw_blob_request_limit,
-          ip: '0.0.0.0',
+          remote_ip: '0.0.0.0',
           request_method: 'GET',
-          fullpath: "/#{project.full_path}/raw/#{file_path}"
+          path: "/#{project.full_path}/raw/#{file_path}"
         }
 
         expect(Gitlab::AuthLogger).to receive(:error).with(attributes).once
diff --git a/spec/controllers/registrations_controller_spec.rb b/spec/controllers/registrations_controller_spec.rb
index fed4fc810f2..35487682462 100644
--- a/spec/controllers/registrations_controller_spec.rb
+++ b/spec/controllers/registrations_controller_spec.rb
@@ -129,9 +129,9 @@ describe RegistrationsController do
         {
           message: auth_log_message,
           env: :invisible_captcha_signup_bot_detected,
-          ip: '0.0.0.0',
+          remote_ip: '0.0.0.0',
           request_method: 'POST',
-          fullpath: '/users'
+          path: '/users'
         }
       end
 
diff --git a/spec/lib/gitlab/action_rate_limiter_spec.rb b/spec/lib/gitlab/action_rate_limiter_spec.rb
index 8dbad32dfb4..8b510a475d2 100644
--- a/spec/lib/gitlab/action_rate_limiter_spec.rb
+++ b/spec/lib/gitlab/action_rate_limiter_spec.rb
@@ -74,9 +74,9 @@ describe Gitlab::ActionRateLimiter, :clean_gitlab_redis_cache do
       {
         message: 'Action_Rate_Limiter_Request',
         env: type,
-        ip: '127.0.0.1',
+        remote_ip: '127.0.0.1',
         request_method: 'GET',
-        fullpath: fullpath
+        path: fullpath
       }
     end
 
diff --git a/spec/requests/rack_attack_global_spec.rb b/spec/requests/rack_attack_global_spec.rb
index d832963292c..478f09a7881 100644
--- a/spec/requests/rack_attack_global_spec.rb
+++ b/spec/requests/rack_attack_global_spec.rb
@@ -112,9 +112,9 @@ describe 'Rack Attack global throttles' do
         arguments = {
           message: 'Rack_Attack',
           env: :throttle,
-          ip: '127.0.0.1',
+          remote_ip: '127.0.0.1',
           request_method: 'GET',
-          fullpath: get_args.first,
+          path: get_args.first,
           user_id: user.id,
           username: user.username
         }
@@ -213,9 +213,9 @@ describe 'Rack Attack global throttles' do
         arguments = {
           message: 'Rack_Attack',
           env: :throttle,
-          ip: '127.0.0.1',
+          remote_ip: '127.0.0.1',
           request_method: 'GET',
-          fullpath: '/users/sign_in'
+          path: '/users/sign_in'
         }
 
         expect(Gitlab::AuthLogger).to receive(:error).with(arguments)
@@ -377,9 +377,9 @@ describe 'Rack Attack global throttles' do
         arguments = {
           message: 'Rack_Attack',
           env: :throttle,
-          ip: '127.0.0.1',
+          remote_ip: '127.0.0.1',
           request_method: 'GET',
-          fullpath: '/dashboard/snippets',
+          path: '/dashboard/snippets',
           user_id: user.id,
           username: user.username
         }