Welcome to mirror list, hosted at ThFree Co, Russian Federation.

gitlab.com/gitlab-org/gitlab-foss.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorYorick Peterse <yorickpeterse@gmail.com>2016-01-07 13:47:06 +0300
committerYorick Peterse <yorickpeterse@gmail.com>2016-01-07 13:47:06 +0300
commit7ed3a5a240e4997b24d11b96e27126dfaa575abe (patch)
tree3e818411df08c081eb07eab80c3d53386ddbe178 /spec/lib/gitlab/metrics
parent0deeebc175d5b970cb53f8fc455a4b8faf5f5d2d (diff)
Revert "Store SQL/view timings in milliseconds"
This reverts commit 7549102bb727daecc51da84af39956b32fc41537. Apparently I was wrong about ActiveSupport::Notifications::Event#duration returning the duration in seconds, instead it returns it in milliseconds already.
Diffstat (limited to 'spec/lib/gitlab/metrics')
-rw-r--r--spec/lib/gitlab/metrics/subscribers/action_view_spec.rb4
-rw-r--r--spec/lib/gitlab/metrics/subscribers/active_record_spec.rb2
2 files changed, 3 insertions, 3 deletions
diff --git a/spec/lib/gitlab/metrics/subscribers/action_view_spec.rb b/spec/lib/gitlab/metrics/subscribers/action_view_spec.rb
index 0a4cc5e929b..05e4fbbeb51 100644
--- a/spec/lib/gitlab/metrics/subscribers/action_view_spec.rb
+++ b/spec/lib/gitlab/metrics/subscribers/action_view_spec.rb
@@ -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)
diff --git a/spec/lib/gitlab/metrics/subscribers/active_record_spec.rb b/spec/lib/gitlab/metrics/subscribers/active_record_spec.rb
index ca86142a2f4..7bc070a4d09 100644
--- a/spec/lib/gitlab/metrics/subscribers/active_record_spec.rb
+++ b/spec/lib/gitlab/metrics/subscribers/active_record_spec.rb
@@ -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