diff --git a/config/initializers/7_gitlab_http.rb b/config/initializers/7_gitlab_http.rb index 567f0b726dbbd013f46b6d6038a1d554db39a3ba..2b2c1b8030493607bee1dfd4f351573af8eec3e7 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 91d9b445719a22a7a83199f39cabd99274c46fa2..5627e064e290b9891a9cc484dad8a1492d74a4f9 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