From a93420b4a5d73c6bb1cb5ff0b5e40de92dd9e639 Mon Sep 17 00:00:00 2001
From: Rodrigo Tomonari <rtomonari@gitlab.com>
Date: Thu, 6 Feb 2025 14:42:23 -0300
Subject: [PATCH] Include application context in response size logs
---
config/initializers/7_gitlab_http.rb | 2 +-
spec/initializers/gitlab_http_spec.rb | 2 +-
2 files changed, 2 insertions(+), 2 deletions(-)
diff --git a/config/initializers/7_gitlab_http.rb b/config/initializers/7_gitlab_http.rb
index 567f0b726dbbd..2b2c1b8030493 100644
--- a/config/initializers/7_gitlab_http.rb
+++ b/config/initializers/7_gitlab_http.rb
@@ -23,7 +23,7 @@
Gitlab::SilentMode.log_info(message: message, outbound_http_request_method: http_method)
end
config.log_with_level_proc = ->(log_level, message_params) do
- Gitlab::AppJsonLogger.public_send(log_level, message_params)
+ Gitlab::AppJsonLogger.public_send(log_level, Gitlab::ApplicationContext.current.merge(message_params))
end
end
diff --git a/spec/initializers/gitlab_http_spec.rb b/spec/initializers/gitlab_http_spec.rb
index 91d9b445719a2..5627e064e290b 100644
--- a/spec/initializers/gitlab_http_spec.rb
+++ b/spec/initializers/gitlab_http_spec.rb
@@ -19,7 +19,7 @@ def load_initializer
describe 'log_with_level_proc' do
it 'calls AppJsonLogger with the correct log level and parameters' do
- expect(::Gitlab::AppJsonLogger).to receive(:debug).with({ message: 'Test' })
+ expect(::Gitlab::AppJsonLogger).to receive(:debug).with({ message: 'Test', "correlation_id" => anything })
described_class.configuration.log_with_level(:debug, message: 'Test')
end
--
GitLab