Skip to content

Commit 7549102

Browse files
author
Yorick Peterse
committed
Store SQL/view timings in milliseconds
Transaction timings are also already stored in milliseconds, this keeps things consistent.
1 parent 8b39b8c commit 7549102

File tree

4 files changed

+14
-6
lines changed

4 files changed

+14
-6
lines changed

lib/gitlab/metrics/subscribers/action_view.rb

+6-2
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@ def track(event)
1919
values = values_for(event)
2020
tags = tags_for(event)
2121

22-
current_transaction.increment(:view_duration, event.duration)
22+
current_transaction.increment(:view_duration, duration(event))
2323
current_transaction.add_metric(SERIES, values, tags)
2424
end
2525

@@ -28,7 +28,7 @@ def relative_path(path)
2828
end
2929

3030
def values_for(event)
31-
{ duration: event.duration }
31+
{ duration: duration(event) }
3232
end
3333

3434
def tags_for(event)
@@ -48,6 +48,10 @@ def tags_for(event)
4848
def current_transaction
4949
Transaction.current
5050
end
51+
52+
def duration(event)
53+
event.duration * 1000.0
54+
end
5155
end
5256
end
5357
end

lib/gitlab/metrics/subscribers/active_record.rb

+5-1
Original file line numberDiff line numberDiff line change
@@ -8,14 +8,18 @@ class ActiveRecord < ActiveSupport::Subscriber
88
def sql(event)
99
return unless current_transaction
1010

11-
current_transaction.increment(:sql_duration, event.duration)
11+
current_transaction.increment(:sql_duration, duration(event))
1212
end
1313

1414
private
1515

1616
def current_transaction
1717
Transaction.current
1818
end
19+
20+
def duration(event)
21+
event.duration * 1000.0
22+
end
1923
end
2024
end
2125
end

spec/lib/gitlab/metrics/subscribers/action_view_spec.rb

+2-2
Original file line numberDiff line numberDiff line change
@@ -21,15 +21,15 @@
2121

2222
describe '#render_template' do
2323
it 'tracks rendering of a template' do
24-
values = { duration: 2.1 }
24+
values = { duration: 2100 }
2525
tags = {
2626
view: 'app/views/x.html.haml',
2727
file: 'app/views/x.html.haml',
2828
line: 4
2929
}
3030

3131
expect(transaction).to receive(:increment).
32-
with(:view_duration, 2.1)
32+
with(:view_duration, 2100)
3333

3434
expect(transaction).to receive(:add_metric).
3535
with(described_class::SERIES, values, tags)

spec/lib/gitlab/metrics/subscribers/active_record_spec.rb

+1-1
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,7 @@
2626
and_return(transaction)
2727

2828
expect(transaction).to receive(:increment).
29-
with(:sql_duration, 0.2)
29+
with(:sql_duration, 200)
3030

3131
subscriber.sql(event)
3232
end

0 commit comments

Comments
 (0)