summaryrefslogtreecommitdiff
path: root/spec
diff options
context:
space:
mode:
authorYorick Peterse <yorickpeterse@gmail.com>2015-12-10 15:16:56 +0100
committerYorick Peterse <yorickpeterse@gmail.com>2015-12-17 17:25:48 +0100
commit1b077d2d81bd25fe37492ea56c8bd884f944ce52 (patch)
tree0f04a2f411f6d20bcbd8ed2975ff2d1a1409ec9f /spec
parentb66a16c8384b64eabeb04f3f32017581e4711eb8 (diff)
downloadgitlab-ce-1b077d2d81bd25fe37492ea56c8bd884f944ce52.tar.gz
Use custom code for instrumenting method calls
The use of ActiveSupport would slow down instrumented method calls by about 180x due to: 1. ActiveSupport itself not being the fastest thing on the planet 2. caller_locations() having quite some overhead The use of caller_locations() has been removed because it's not _that_ useful since we already know the full namespace of receivers and the names of the called methods. The use of ActiveSupport has been replaced with some custom code that's generated using eval() (which can be quite a bit faster than using define_method). This new setup results in instrumented methods only being about 35-40x slower (compared to non instrumented methods).
Diffstat (limited to 'spec')
-rw-r--r--spec/lib/gitlab/metrics/instrumentation_spec.rb22
-rw-r--r--spec/lib/gitlab/metrics/subscribers/method_call_spec.rb40
2 files changed, 16 insertions, 46 deletions
diff --git a/spec/lib/gitlab/metrics/instrumentation_spec.rb b/spec/lib/gitlab/metrics/instrumentation_spec.rb
index 3e7e9869e30..9308fb157d8 100644
--- a/spec/lib/gitlab/metrics/instrumentation_spec.rb
+++ b/spec/lib/gitlab/metrics/instrumentation_spec.rb
@@ -1,6 +1,8 @@
require 'spec_helper'
describe Gitlab::Metrics::Instrumentation do
+ let(:transaction) { Gitlab::Metrics::Transaction.new }
+
before do
@dummy = Class.new do
def self.foo(text = 'foo')
@@ -31,9 +33,13 @@ describe Gitlab::Metrics::Instrumentation do
expect(@dummy.foo).to eq('foo')
end
- it 'fires an ActiveSupport notification upon calling the method' do
- expect(ActiveSupport::Notifications).to receive(:instrument).
- with('class_method.method_call', module: 'Dummy', name: :foo)
+ it 'tracks the call duration upon calling the method' do
+ allow(Gitlab::Metrics::Instrumentation).to receive(:transaction).
+ and_return(transaction)
+
+ expect(transaction).to receive(:add_metric).
+ with(described_class::SERIES, an_instance_of(Hash),
+ method: 'Dummy.foo')
@dummy.foo
end
@@ -69,9 +75,13 @@ describe Gitlab::Metrics::Instrumentation do
expect(@dummy.new.bar).to eq('bar')
end
- it 'fires an ActiveSupport notification upon calling the method' do
- expect(ActiveSupport::Notifications).to receive(:instrument).
- with('instance_method.method_call', module: 'Dummy', name: :bar)
+ it 'tracks the call duration upon calling the method' do
+ allow(Gitlab::Metrics::Instrumentation).to receive(:transaction).
+ and_return(transaction)
+
+ expect(transaction).to receive(:add_metric).
+ with(described_class::SERIES, an_instance_of(Hash),
+ method: 'Dummy#bar')
@dummy.new.bar
end
diff --git a/spec/lib/gitlab/metrics/subscribers/method_call_spec.rb b/spec/lib/gitlab/metrics/subscribers/method_call_spec.rb
deleted file mode 100644
index 5c76eb3ba50..00000000000
--- a/spec/lib/gitlab/metrics/subscribers/method_call_spec.rb
+++ /dev/null
@@ -1,40 +0,0 @@
-require 'spec_helper'
-
-describe Gitlab::Metrics::Subscribers::MethodCall do
- let(:transaction) { Gitlab::Metrics::Transaction.new }
-
- let(:subscriber) { described_class.new }
-
- let(:event) do
- double(:event, duration: 0.2, payload: { module: 'Foo', name: :foo })
- end
-
- before do
- allow(subscriber).to receive(:current_transaction).and_return(transaction)
-
- allow(Gitlab::Metrics).to receive(:last_relative_application_frame).
- and_return(['app/models/foo.rb', 4])
- end
-
- describe '#instance_method' do
- it 'tracks the execution of an instance method' do
- values = { duration: 0.2, file: 'app/models/foo.rb', line: 4 }
-
- expect(transaction).to receive(:add_metric).
- with(described_class::SERIES, values, method: 'Foo#foo')
-
- subscriber.instance_method(event)
- end
- end
-
- describe '#class_method' do
- it 'tracks the execution of a class method' do
- values = { duration: 0.2, file: 'app/models/foo.rb', line: 4 }
-
- expect(transaction).to receive(:add_metric).
- with(described_class::SERIES, values, method: 'Foo.foo')
-
- subscriber.class_method(event)
- end
- end
-end