Revert "Store SQL/view timings in milliseconds"
This reverts commit 7549102bb7
.
Apparently I was wrong about
ActiveSupport::Notifications::Event#duration returning the duration in
seconds, instead it returns it in milliseconds already.
This commit is contained in:
parent
0deeebc175
commit
7ed3a5a240
4 changed files with 6 additions and 14 deletions
|
@ -19,7 +19,7 @@ module Gitlab
|
|||
values = values_for(event)
|
||||
tags = tags_for(event)
|
||||
|
||||
current_transaction.increment(:view_duration, duration(event))
|
||||
current_transaction.increment(:view_duration, event.duration)
|
||||
current_transaction.add_metric(SERIES, values, tags)
|
||||
end
|
||||
|
||||
|
@ -28,7 +28,7 @@ module Gitlab
|
|||
end
|
||||
|
||||
def values_for(event)
|
||||
{ duration: duration(event) }
|
||||
{ duration: event.duration }
|
||||
end
|
||||
|
||||
def tags_for(event)
|
||||
|
@ -48,10 +48,6 @@ module Gitlab
|
|||
def current_transaction
|
||||
Transaction.current
|
||||
end
|
||||
|
||||
def duration(event)
|
||||
event.duration * 1000.0
|
||||
end
|
||||
end
|
||||
end
|
||||
end
|
||||
|
|
|
@ -8,7 +8,7 @@ module Gitlab
|
|||
def sql(event)
|
||||
return unless current_transaction
|
||||
|
||||
current_transaction.increment(:sql_duration, duration(event))
|
||||
current_transaction.increment(:sql_duration, event.duration)
|
||||
end
|
||||
|
||||
private
|
||||
|
@ -16,10 +16,6 @@ module Gitlab
|
|||
def current_transaction
|
||||
Transaction.current
|
||||
end
|
||||
|
||||
def duration(event)
|
||||
event.duration * 1000.0
|
||||
end
|
||||
end
|
||||
end
|
||||
end
|
||||
|
|
|
@ -21,7 +21,7 @@ describe Gitlab::Metrics::Subscribers::ActionView do
|
|||
|
||||
describe '#render_template' do
|
||||
it 'tracks rendering of a template' do
|
||||
values = { duration: 2100 }
|
||||
values = { duration: 2.1 }
|
||||
tags = {
|
||||
view: 'app/views/x.html.haml',
|
||||
file: 'app/views/x.html.haml',
|
||||
|
@ -29,7 +29,7 @@ describe Gitlab::Metrics::Subscribers::ActionView do
|
|||
}
|
||||
|
||||
expect(transaction).to receive(:increment).
|
||||
with(:view_duration, 2100)
|
||||
with(:view_duration, 2.1)
|
||||
|
||||
expect(transaction).to receive(:add_metric).
|
||||
with(described_class::SERIES, values, tags)
|
||||
|
|
|
@ -26,7 +26,7 @@ describe Gitlab::Metrics::Subscribers::ActiveRecord do
|
|||
and_return(transaction)
|
||||
|
||||
expect(transaction).to receive(:increment).
|
||||
with(:sql_duration, 200)
|
||||
with(:sql_duration, 0.2)
|
||||
|
||||
subscriber.sql(event)
|
||||
end
|
||||
|
|
Loading…
Reference in a new issue