From 9f95ff0d90802467a04816f1d38e30770a026820 Mon Sep 17 00:00:00 2001
From: Yorick Peterse <yorickpeterse@gmail.com>
Date: Mon, 14 Dec 2015 16:51:38 +0100
Subject: [PATCH] Track location information as tags
This allows the information to be displayed when using certain functions
(e.g. top()) as well as making it easier to aggregate on a per file
basis.
---
lib/gitlab/metrics/subscribers/action_view.rb | 17 +++++++++++------
lib/gitlab/metrics/subscribers/active_record.rb | 17 +++++++++++------
.../metrics/subscribers/action_view_spec.rb | 9 +++++++--
.../metrics/subscribers/active_record_spec.rb | 5 +++--
4 files changed, 32 insertions(+), 16 deletions(-)
diff --git a/lib/gitlab/metrics/subscribers/action_view.rb b/lib/gitlab/metrics/subscribers/action_view.rb
index 2e88e4bea6a..7e0dcf99d92 100644
--- a/lib/gitlab/metrics/subscribers/action_view.rb
+++ b/lib/gitlab/metrics/subscribers/action_view.rb
@@ -16,10 +16,10 @@ module Gitlab
private
def track(event)
- path = relative_path(event.payload[:identifier])
values = values_for(event)
+ tags = tags_for(event)
- current_transaction.add_metric(SERIES, values, path: path)
+ current_transaction.add_metric(SERIES, values, tags)
end
def relative_path(path)
@@ -27,16 +27,21 @@ module Gitlab
end
def values_for(event)
- values = { duration: event.duration }
+ { duration: event.duration }
+ end
+
+ def tags_for(event)
+ path = relative_path(event.payload[:identifier])
+ tags = { view: path }
file, line = Metrics.last_relative_application_frame
if file and line
- values[:file] = file
- values[:line] = line
+ tags[:file] = file
+ tags[:line] = line
end
- values
+ tags
end
def current_transaction
diff --git a/lib/gitlab/metrics/subscribers/active_record.rb b/lib/gitlab/metrics/subscribers/active_record.rb
index 3cc9b1addf6..d947c128ce2 100644
--- a/lib/gitlab/metrics/subscribers/active_record.rb
+++ b/lib/gitlab/metrics/subscribers/active_record.rb
@@ -13,25 +13,30 @@ module Gitlab
def sql(event)
return unless current_transaction
- sql = ObfuscatedSQL.new(event.payload[:sql]).to_s
values = values_for(event)
+ tags = tags_for(event)
- current_transaction.add_metric(SERIES, values, sql: sql)
+ current_transaction.add_metric(SERIES, values, tags)
end
private
def values_for(event)
- values = { duration: event.duration }
+ { duration: event.duration }
+ end
+
+ def tags_for(event)
+ sql = ObfuscatedSQL.new(event.payload[:sql]).to_s
+ tags = { sql: sql }
file, line = Metrics.last_relative_application_frame
if file and line
- values[:file] = file
- values[:line] = line
+ tags[:file] = file
+ tags[:line] = line
end
- values
+ tags
end
def current_transaction
diff --git a/spec/lib/gitlab/metrics/subscribers/action_view_spec.rb b/spec/lib/gitlab/metrics/subscribers/action_view_spec.rb
index 77f3e69d523..c6cd584663f 100644
--- a/spec/lib/gitlab/metrics/subscribers/action_view_spec.rb
+++ b/spec/lib/gitlab/metrics/subscribers/action_view_spec.rb
@@ -21,10 +21,15 @@ describe Gitlab::Metrics::Subscribers::ActionView do
describe '#render_template' do
it 'tracks rendering of a template' do
- values = { duration: 2.1, file: 'app/views/x.html.haml', line: 4 }
+ values = { duration: 2.1 }
+ tags = {
+ view: 'app/views/x.html.haml',
+ file: 'app/views/x.html.haml',
+ line: 4
+ }
expect(transaction).to receive(:add_metric).
- with(described_class::SERIES, values, path: 'app/views/x.html.haml')
+ with(described_class::SERIES, values, tags)
subscriber.render_template(event)
end
diff --git a/spec/lib/gitlab/metrics/subscribers/active_record_spec.rb b/spec/lib/gitlab/metrics/subscribers/active_record_spec.rb
index 58e8e84df9b..05b6cc14716 100644
--- a/spec/lib/gitlab/metrics/subscribers/active_record_spec.rb
+++ b/spec/lib/gitlab/metrics/subscribers/active_record_spec.rb
@@ -19,11 +19,12 @@ describe Gitlab::Metrics::Subscribers::ActiveRecord do
describe '#sql' do
it 'tracks the execution of a SQL query' do
- values = { duration: 0.2, file: 'app/models/foo.rb', line: 4 }
sql = 'SELECT * FROM users WHERE id = ?'
+ values = { duration: 0.2 }
+ tags = { sql: sql, file: 'app/models/foo.rb', line: 4 }
expect(transaction).to receive(:add_metric).
- with(described_class::SERIES, values, sql: sql)
+ with(described_class::SERIES, values, tags)
subscriber.sql(event)
end
--
GitLab