+ def set_current_request_id
+ req_id = request.headers['X-Request-Id']
+ if !req_id || req_id.length < 1 || req_id.length > 1024
+ # Client-supplied ID is either missing or too long to be
+ # considered friendly.
+ req_id = "req-" + Random::DEFAULT.rand(2**128).to_s(36)[0..19]
+ end
+ response.headers['X-Request-Id'] = Thread.current[:request_id] = req_id
+ Rails.logger.tagged(req_id) do
+ yield
+ end
+ Thread.current[:request_id] = nil
+ end
+
+ def append_info_to_payload(payload)
+ super
+ payload[:request_id] = response.headers['X-Request-Id']
+ payload[:client_ipaddr] = @remote_ip
+ payload[:client_auth] = current_api_client_authorization.andand.uuid || nil
+ end
+