Skip to content

Commit 3269963

Browse files
committed
CAPI logs should for request complete should include the response time
Convert time taken to ms. Fix Robocop errors.
1 parent 5e7d425 commit 3269963

File tree

3 files changed

+12
-5
lines changed

3 files changed

+12
-5
lines changed

lib/cloud_controller/logs/request_logs.rb

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -28,10 +28,11 @@ def start_request(request_id, env)
2828

2929
def complete_request(request_id, status, env, time_taken)
3030
return if @incomplete_requests.delete(request_id).nil?
31+
3132
request = ActionDispatch::Request.new(env)
32-
@logger.info("Completed #{status} vcap-request-id: #{request_id}",
33+
@logger.info("Completed #{status} vcap-request-id: #{request_id}",
3334
{ status_code: status,
34-
time_taken: time_taken,
35+
time_taken_in_ms: time_taken,
3536
request_method: request.request_method,
3637
request_fullpath: request.filtered_path })
3738
end

middleware/request_logs.rb

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -12,8 +12,8 @@ def call(env)
1212
start_time = Time.now
1313

1414
status, headers, body = @app.call(env)
15-
16-
time_taken = Time.now - start_time
15+
# convert to milliseconds
16+
time_taken = (Time.now - start_time) * 1000
1717
@request_logs.complete_request(request_id, status, env, time_taken)
1818

1919
[status, headers, body]

spec/unit/lib/cloud_controller/logs/request_logs_spec.rb

Lines changed: 7 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -47,7 +47,13 @@ module VCAP::CloudController::Logs
4747

4848
it 'logs the completion of the request' do
4949
request_logs.complete_request(request_id, status, env, time_taken)
50-
expect(logger).to have_received(:info).with(/Completed 200 vcap-request-id: ID/, { time_taken: 30, request_method: "request_method", request_fullpath: "filtered_path", status_code: 200 })
50+
expect(logger).to have_received(:info).with(
51+
/\ACompleted 200 vcap-request-id: ID/,
52+
time_taken_in_ms: 30,
53+
request_method: 'request_method',
54+
request_fullpath: 'filtered_path',
55+
status_code: 200
56+
)
5157
end
5258
end
5359

0 commit comments

Comments
 (0)