diff options
Diffstat (limited to 'lib/gitlab/lograge/custom_options.rb')
-rw-r--r-- | lib/gitlab/lograge/custom_options.rb | 17 |
1 files changed, 6 insertions, 11 deletions
diff --git a/lib/gitlab/lograge/custom_options.rb b/lib/gitlab/lograge/custom_options.rb index 83fd74310d0..e6c9ba0773c 100644 --- a/lib/gitlab/lograge/custom_options.rb +++ b/lib/gitlab/lograge/custom_options.rb @@ -7,6 +7,8 @@ module Gitlab LIMITED_ARRAY_SENTINEL = { key: 'truncated', value: '...' }.freeze IGNORE_PARAMS = Set.new(%w(controller action format)).freeze + KNOWN_PAYLOAD_PARAMS = [:remote_ip, :user_id, :username, :ua, :queue_duration_s, + :etag_route, :request_urgency, :target_duration_s] + CLOUDFLARE_CUSTOM_HEADERS.values def self.call(event) params = event @@ -14,24 +16,17 @@ module Gitlab .each_with_object([]) { |(k, v), array| array << { key: k, value: v } unless IGNORE_PARAMS.include?(k) } payload = { time: Time.now.utc.iso8601(3), - params: Gitlab::Utils::LogLimitedArray.log_limited_array(params, sentinel: LIMITED_ARRAY_SENTINEL), - remote_ip: event.payload[:remote_ip], - user_id: event.payload[:user_id], - username: event.payload[:username], - ua: event.payload[:ua] + params: Gitlab::Utils::LogLimitedArray.log_limited_array(params, sentinel: LIMITED_ARRAY_SENTINEL) } + payload.merge!(event.payload[:metadata]) if event.payload[:metadata] + optional_payload_params = event.payload.slice(*KNOWN_PAYLOAD_PARAMS).compact + payload.merge!(optional_payload_params) ::Gitlab::InstrumentationHelper.add_instrumentation_data(payload) - payload[:queue_duration_s] = event.payload[:queue_duration_s] if event.payload[:queue_duration_s] - payload[:etag_route] = event.payload[:etag_route] if event.payload[:etag_route] payload[Labkit::Correlation::CorrelationId::LOG_KEY] = event.payload[Labkit::Correlation::CorrelationId::LOG_KEY] || Labkit::Correlation::CorrelationId.current_id - CLOUDFLARE_CUSTOM_HEADERS.each do |_, value| - payload[value] = event.payload[value] if event.payload[value] - end - # https://github.com/roidrage/lograge#logging-errors--exceptions exception = event.payload[:exception_object] |