Skip to content

G
gitlab-ce
Commit bff9e896 authored by Grzegorz Bizon's avatar Grzegorz Bizon
Browse files
Options

Merge branch 'pawel/ee-metrics-to-prometheus-33643' into 'master' 

Add all InfluxDB metrics to Prometheus

Closes gitlab-ce#33643

See merge request gitlab-org/gitlab-ee!3270
parents 937b7da8 4419cbca
Show whitespace changes
Inline Side-by-side
Showing with 1051 additions and 557 deletions
app/workers/repository_update_mirror_worker.rb
View file @ bff9e896
...@@ -48,6 +48,8 @@ class RepositoryUpdateMirrorWorker ...@@ -48,6 +48,8 @@ class RepositoryUpdateMirrorWorker
def start_mirror(project) def start_mirror(project)
if start(project) if start(project)
Rails.logger.info("Mirror update for #{project.full_path} started. Waiting duration: #{project.mirror_waiting_duration}") Rails.logger.info("Mirror update for #{project.full_path} started. Waiting duration: #{project.mirror_waiting_duration}")
metric_mirror_waiting_duration_seconds.observe({}, project.mirror_waiting_duration)
Gitlab::Metrics.add_event_with_values( Gitlab::Metrics.add_event_with_values(
:mirrors_running, :mirrors_running,
{ duration: project.mirror_waiting_duration }, { duration: project.mirror_waiting_duration },
...@@ -76,5 +78,25 @@ class RepositoryUpdateMirrorWorker ...@@ -76,5 +78,25 @@ class RepositoryUpdateMirrorWorker
:mirrors_finished, :mirrors_finished,
{ duration: project.mirror_update_duration }, { duration: project.mirror_update_duration },
{ path: project.full_path }) { path: project.full_path })
metric_mirror_update_duration_seconds.observe({}, project.mirror_update_duration)
end
def metric_mirror_update_duration_seconds
@metric_mirror_update_duration_seconds ||= Gitlab::Metrics.histogram(
:gitlab_repository_mirror_update_duration_seconds,
'Mirror update duration',
{},
[0.1, 0.2, 0.5, 1.0, 2.0, 5.0, 10.0, 50.0, 100.0]
)
end
def metric_mirror_waiting_duration_seconds
@metric_mirror_waiting_duration_seconds ||= Gitlab::Metrics.histogram(
:gitlab_repository_mirror_waiting_duration_seconds,
'Waiting length for repository mirror',
{},
[0.001, 0.002, 0.005, 0.01, 0.02, 0.05, 0.1, 0.500, 2.0, 10.0]
)
end end
end end
app/workers/stuck_import_jobs_worker.rb
View file @ bff9e896
...@@ -5,12 +5,19 @@ class StuckImportJobsWorker ...@@ -5,12 +5,19 @@ class StuckImportJobsWorker
IMPORT_JOBS_EXPIRATION = 15.hours.to_i IMPORT_JOBS_EXPIRATION = 15.hours.to_i
def perform def perform
projects_without_jid_count = mark_projects_without_jid_as_failed!
projects_with_jid_count = mark_projects_with_jid_as_failed!
values = { values = {
projects_without_jid_count: mark_projects_without_jid_as_failed!, projects_without_jid_count: projects_without_jid_count,
projects_with_jid_count: mark_projects_with_jid_as_failed! projects_with_jid_count: projects_with_jid_count
} }
Gitlab::Metrics.add_event_with_values(:stuck_import_jobs, values) Gitlab::Metrics.add_event_with_values(:stuck_import_jobs, values)
stuck_import_jobs_worker_runs_counter.increment
projects_without_jid_metric.set({}, projects_without_jid_count)
projects_with_jid_metric.set({}, projects_with_jid_count)
end end
private private
...@@ -58,4 +65,17 @@ class StuckImportJobsWorker ...@@ -58,4 +65,17 @@ class StuckImportJobsWorker
def error_message def error_message
"Import timed out. Import took longer than #{IMPORT_JOBS_EXPIRATION} seconds" "Import timed out. Import took longer than #{IMPORT_JOBS_EXPIRATION} seconds"
end end
def stuck_import_jobs_worker_runs_counter
@stuck_import_jobs_worker_runs_counter ||= Gitlab::Metrics.counter(:gitlab_stuck_import_jobs_worker_runs_total,
'Stuck import jobs worker runs count')
end
def projects_without_jid_metric
@projects_without_jid_metric ||= Gitlab::Metrics.gauge(:gitlab_projects_without_jid, 'Projects without Job ids')
end
def projects_with_jid_metric
@projects_with_jid_metric ||= Gitlab::Metrics.gauge(:gitlab_projects_with_jid, 'Projects with Job ids')
end
end end
changelogs/unreleased/pawel-metrics-to-prometheus-33643.yml 0 → 100644
View file @ bff9e896
---
title: Add Prometheus equivalent of all InfluxDB metrics
merge_request: 13891
author:
type: changed
config/initializers/1_settings.rb
View file @ bff9e896
...@@ -635,6 +635,7 @@ Settings.webpack.dev_server['port'] ||= 3808 ...@@ -635,6 +635,7 @@ Settings.webpack.dev_server['port'] ||= 3808
Settings['monitoring'] ||= Settingslogic.new({}) Settings['monitoring'] ||= Settingslogic.new({})
Settings.monitoring['ip_whitelist'] ||= ['127.0.0.1/8'] Settings.monitoring['ip_whitelist'] ||= ['127.0.0.1/8']
Settings.monitoring['unicorn_sampler_interval'] ||= 10 Settings.monitoring['unicorn_sampler_interval'] ||= 10
Settings.monitoring['ruby_sampler_interval'] ||= 60
Settings.monitoring['sidekiq_exporter'] ||= Settingslogic.new({}) Settings.monitoring['sidekiq_exporter'] ||= Settingslogic.new({})
Settings.monitoring.sidekiq_exporter['enabled'] ||= false Settings.monitoring.sidekiq_exporter['enabled'] ||= false
Settings.monitoring.sidekiq_exporter['address'] ||= 'localhost' Settings.monitoring.sidekiq_exporter['address'] ||= 'localhost'
......
config/initializers/7_prometheus_metrics.rb
View file @ bff9e896
...@@ -11,7 +11,15 @@ Prometheus::Client.configure do |config| ...@@ -11,7 +11,15 @@ Prometheus::Client.configure do |config|
config.multiprocess_files_dir ||= Rails.root.join('tmp/prometheus_multiproc_dir') config.multiprocess_files_dir ||= Rails.root.join('tmp/prometheus_multiproc_dir')
end end
config.pid_provider = Prometheus::Client::Support::Unicorn.method(:worker_pid_provider) config.pid_provider = -> do
wid = Prometheus::Client::Support::Unicorn.worker_id
wid = Process.pid if wid.nil?
if wid.nil?
"process_pid_#{Process.pid}"
else
"worker_id_#{wid}"
end
end
end end
Sidekiq.configure_server do |config| Sidekiq.configure_server do |config|
...@@ -19,3 +27,11 @@ Sidekiq.configure_server do |config| ...@@ -19,3 +27,11 @@ Sidekiq.configure_server do |config|
Gitlab::Metrics::SidekiqMetricsExporter.instance.start Gitlab::Metrics::SidekiqMetricsExporter.instance.start
end end
end end
if Gitlab::Metrics.prometheus_metrics_enabled?
unless Sidekiq.server?
Gitlab::Metrics::Samplers::UnicornSampler.initialize_instance(Settings.monitoring.unicorn_sampler_interval).start
end
Gitlab::Metrics::Samplers::RubySampler.initialize_instance(Settings.monitoring.ruby_sampler_interval).start
end
config/initializers/8_metrics.rb
View file @ bff9e896
...@@ -151,10 +151,6 @@ def instrument_classes(instrumentation) ...@@ -151,10 +151,6 @@ def instrument_classes(instrumentation)
end end
# rubocop:enable Metrics/AbcSize # rubocop:enable Metrics/AbcSize
unless Sidekiq.server?
Gitlab::Metrics::UnicornSampler.initialize_instance(Settings.monitoring.unicorn_sampler_interval).start
end
Gitlab::Application.configure do |config| Gitlab::Application.configure do |config|
# 0 should be Sentry to catch errors in this middleware # 0 should be Sentry to catch errors in this middleware
config.middleware.insert(1, Gitlab::Metrics::RequestsRackMiddleware) config.middleware.insert(1, Gitlab::Metrics::RequestsRackMiddleware)
...@@ -220,7 +216,7 @@ if Gitlab::Metrics.enabled? ...@@ -220,7 +216,7 @@ if Gitlab::Metrics.enabled?
GC::Profiler.enable GC::Profiler.enable
Gitlab::Metrics::InfluxSampler.initialize_instance.start Gitlab::Metrics::Samplers::InfluxSampler.initialize_instance.start
Gitlab::Metrics::Instrumentation.configure do |config| Gitlab::Metrics::Instrumentation.configure do |config|
config.instrument_instance_methods(Gitlab::InsecureKeyFingerprint) config.instrument_instance_methods(Gitlab::InsecureKeyFingerprint)
......
lib/gitlab/daemon.rb
View file @ bff9e896
...@@ -43,7 +43,7 @@ module Gitlab ...@@ -43,7 +43,7 @@ module Gitlab
if thread if thread
thread.wakeup if thread.alive? thread.wakeup if thread.alive?
thread.join thread.join unless Thread.current == thread
@thread = nil @thread = nil
end end
end end
......
lib/gitlab/metrics/background_transaction.rb 0 → 100644
View file @ bff9e896
module Gitlab
module Metrics
class BackgroundTransaction < Transaction
def initialize(worker_class)
super()
@worker_class = worker_class
end
protected
def labels
{ controller: @worker_class.name, action: 'perform' }
end
end
end
end
lib/gitlab/metrics/base_sampler.rb deleted 100644 → 0
View file @ 937b7da8
require 'logger'
module Gitlab
module Metrics
class BaseSampler < Daemon
# interval - The sampling interval in seconds.
def initialize(interval)
interval_half = interval.to_f / 2
@interval = interval
@interval_steps = (-interval_half..interval_half).step(0.1).to_a
super()
end
def safe_sample
sample
rescue => e
Rails.logger.warn("#{self.class}: #{e}, stopping")
stop
end
def sample
raise NotImplementedError
end
# Returns the sleep interval with a random adjustment.
#
# The random adjustment is put in place to ensure we:
#
# 1. Don't generate samples at the exact same interval every time (thus
# potentially missing anything that happens in between samples).
# 2. Don't sample data at the same interval two times in a row.
def sleep_interval
while (step = @interval_steps.sample)
if step != @last_step
@last_step = step
return @interval + @last_step
end
end
end
private
attr_reader :running
def start_working
@running = true
sleep(sleep_interval)
while running
safe_sample
sleep(sleep_interval)
end
end
def stop_working
@running = false
end
end
end
end
lib/gitlab/metrics/influx_db.rb
View file @ bff9e896
...@@ -11,6 +11,8 @@ module Gitlab ...@@ -11,6 +11,8 @@ module Gitlab
settings[:enabled] || false settings[:enabled] || false
end end
# Prometheus histogram buckets used for arbitrary code measurements
EXECUTION_MEASUREMENT_BUCKETS = [0.001, 0.002, 0.005, 0.01, 0.025, 0.05, 0.1, 0.25, 0.5, 1].freeze
RAILS_ROOT = Rails.root.to_s RAILS_ROOT = Rails.root.to_s
METRICS_ROOT = Rails.root.join('lib', 'gitlab', 'metrics').to_s METRICS_ROOT = Rails.root.join('lib', 'gitlab', 'metrics').to_s
PATH_REGEX = /^#{RAILS_ROOT}\/?/ PATH_REGEX = /^#{RAILS_ROOT}\/?/
...@@ -99,24 +101,27 @@ module Gitlab ...@@ -99,24 +101,27 @@ module Gitlab
cpu_stop = System.cpu_time cpu_stop = System.cpu_time
real_stop = Time.now.to_f real_stop = Time.now.to_f
real_time = (real_stop - real_start) * 1000.0 real_time = (real_stop - real_start)
cpu_time = cpu_stop - cpu_start cpu_time = cpu_stop - cpu_start
trans.increment("#{name}_real_time", real_time) Gitlab::Metrics.histogram("gitlab_#{name}_real_duration_seconds".to_sym,
trans.increment("#{name}_cpu_time", cpu_time) "Measure #{name}",
trans.increment("#{name}_call_count", 1) Transaction::BASE_LABELS,
EXECUTION_MEASUREMENT_BUCKETS)
.observe(trans.labels, real_time)
retval Gitlab::Metrics.histogram("gitlab_#{name}_cpu_duration_seconds".to_sym,
end "Measure #{name}",
Transaction::BASE_LABELS,
EXECUTION_MEASUREMENT_BUCKETS)
.observe(trans.labels, cpu_time / 1000.0)
# Adds a tag to the current transaction (if any) # InfluxDB stores the _real_time time values as milliseconds
# trans.increment("#{name}_real_time", real_time * 1000, false)
# name - The name of the tag to add. trans.increment("#{name}_cpu_time", cpu_time, false)
# value - The value of the tag. trans.increment("#{name}_call_count", 1, false)
def tag_transaction(name, value)
trans = current_transaction
trans&.add_tag(name, value) retval
end end
# Sets the action of the current transaction (if any) # Sets the action of the current transaction (if any)
......
lib/gitlab/metrics/influx_sampler.rb deleted 100644 → 0
View file @ 937b7da8
module Gitlab
module Metrics
# Class that sends certain metrics to InfluxDB at a specific interval.
#
# This class is used to gather statistics that can't be directly associated
# with a transaction such as system memory usage, garbage collection
# statistics, etc.
class InfluxSampler < BaseSampler
# interval - The sampling interval in seconds.
def initialize(interval = Metrics.settings[:sample_interval])
super(interval)
@last_step = nil
@metrics = []
@last_minor_gc = Delta.new(GC.stat[:minor_gc_count])
@last_major_gc = Delta.new(GC.stat[:major_gc_count])
if Gitlab::Metrics.mri?
require 'allocations'
Allocations.start
end
end
def sample
sample_memory_usage
sample_file_descriptors
sample_objects
sample_gc
flush
ensure
GC::Profiler.clear
@metrics.clear
end
def flush
Metrics.submit_metrics(@metrics.map(&:to_hash))
end
def sample_memory_usage
add_metric('memory_usage', value: System.memory_usage)
end
def sample_file_descriptors
add_metric('file_descriptors', value: System.file_descriptor_count)
end
if Metrics.mri?
def sample_objects
sample = Allocations.to_hash
counts = sample.each_with_object({}) do |(klass, count), hash|
name = klass.name
next unless name
hash[name] = count
end
# Symbols aren't allocated so we'll need to add those manually.
counts['Symbol'] = Symbol.all_symbols.length
counts.each do |name, count|
add_metric('object_counts', { count: count }, type: name)
end
end
else
def sample_objects
end
end
def sample_gc
time = GC::Profiler.total_time * 1000.0
stats = GC.stat.merge(total_time: time)
# We want the difference of GC runs compared to the last sample, not the
# total amount since the process started.
stats[:minor_gc_count] =
@last_minor_gc.compared_with(stats[:minor_gc_count])
stats[:major_gc_count] =
@last_major_gc.compared_with(stats[:major_gc_count])
stats[:count] = stats[:minor_gc_count] + stats[:major_gc_count]
add_metric('gc_statistics', stats)
end
def add_metric(series, values, tags = {})
prefix = sidekiq? ? 'sidekiq_' : 'rails_'
@metrics << Metric.new("#{prefix}#{series}", values, tags)
end
def sidekiq?
Sidekiq.server?
end
end
end
end
lib/gitlab/metrics/instrumentation.rb
View file @ bff9e896
...@@ -123,14 +123,16 @@ module Gitlab ...@@ -123,14 +123,16 @@ module Gitlab
if type == :instance if type == :instance
target = mod target = mod
label = "#{mod.name}##{name}" method_name = "##{name}"
method = mod.instance_method(name) method = mod.instance_method(name)
else else
target = mod.singleton_class target = mod.singleton_class
label = "#{mod.name}.#{name}" method_name = ".#{name}"
method = mod.method(name) method = mod.method(name)
end end
label = "#{mod.name}#{method_name}"
unless instrumented?(target) unless instrumented?(target)
target.instance_variable_set(PROXY_IVAR, Module.new) target.instance_variable_set(PROXY_IVAR, Module.new)
end end
...@@ -153,7 +155,8 @@ module Gitlab ...@@ -153,7 +155,8 @@ module Gitlab
proxy_module.class_eval <<-EOF, __FILE__, __LINE__ + 1 proxy_module.class_eval <<-EOF, __FILE__, __LINE__ + 1
def #{name}(#{args_signature}) def #{name}(#{args_signature})
if trans = Gitlab::Metrics::Instrumentation.transaction if trans = Gitlab::Metrics::Instrumentation.transaction
trans.method_call_for(#{label.to_sym.inspect}).measure { super } trans.method_call_for(#{label.to_sym.inspect}, #{mod.name.inspect}, "#{method_name}")
.measure { super }
else else
super super
end end
......
lib/gitlab/metrics/method_call.rb
View file @ bff9e896
...@@ -2,15 +2,45 @@ module Gitlab ...@@ -2,15 +2,45 @@ module Gitlab
module Metrics module Metrics
# Class for tracking timing information about method calls # Class for tracking timing information about method calls
class MethodCall class MethodCall
attr_reader :real_time, :cpu_time, :call_count MUTEX = Mutex.new
BASE_LABELS = { module: nil, method: nil }.freeze
attr_reader :real_time, :cpu_time, :call_count, :labels
def self.call_real_duration_histogram
return @call_real_duration_histogram if @call_real_duration_histogram
MUTEX.synchronize do
@call_real_duration_histogram ||= Gitlab::Metrics.histogram(
:gitlab_method_call_real_duration_seconds,
'Method calls real duration',
Transaction::BASE_LABELS.merge(BASE_LABELS),
[0.1, 0.2, 0.5, 1, 2, 5, 10]
)
end
end
def self.call_cpu_duration_histogram
return @call_cpu_duration_histogram if @call_cpu_duration_histogram
MUTEX.synchronize do
@call_duration_histogram ||= Gitlab::Metrics.histogram(
:gitlab_method_call_cpu_duration_seconds,
'Method calls cpu duration',
Transaction::BASE_LABELS.merge(BASE_LABELS),
[0.1, 0.2, 0.5, 1, 2, 5, 10]
)
end
end
# name - The full name of the method (including namespace) such as # name - The full name of the method (including namespace) such as
# `User#sign_in`. # `User#sign_in`.
# #
# series - The series to use for storing the data. def initialize(name, module_name, method_name, transaction)
def initialize(name, series) @module_name = module_name
@method_name = method_name
@transaction = transaction
@name = name @name = name
@series = series @labels = { module: @module_name, method: @method_name }
@real_time = 0 @real_time = 0
@cpu_time = 0 @cpu_time = 0
@call_count = 0 @call_count = 0
...@@ -22,17 +52,23 @@ module Gitlab ...@@ -22,17 +52,23 @@ module Gitlab
start_cpu = System.cpu_time start_cpu = System.cpu_time
retval = yield retval = yield
@real_time += System.monotonic_time - start_real real_time = System.monotonic_time - start_real
@cpu_time += System.cpu_time - start_cpu cpu_time = System.cpu_time - start_cpu
@real_time += real_time
@cpu_time += cpu_time
@call_count += 1 @call_count += 1
self.class.call_real_duration_histogram.observe(@transaction.labels.merge(labels), real_time / 1000.0)
self.class.call_cpu_duration_histogram.observe(@transaction.labels.merge(labels), cpu_time / 1000.0)
retval retval
end end
# Returns a Metric instance of the current method call. # Returns a Metric instance of the current method call.
def to_metric def to_metric
Metric.new( Metric.new(
@series, Instrumentation.series,
{ {
duration: real_time, duration: real_time,
cpu_duration: cpu_time, cpu_duration: cpu_time,
......
lib/gitlab/metrics/prometheus.rb
View file @ bff9e896
...@@ -5,6 +5,9 @@ module Gitlab ...@@ -5,6 +5,9 @@ module Gitlab
module Prometheus module Prometheus
include Gitlab::CurrentSettings include Gitlab::CurrentSettings
REGISTRY_MUTEX = Mutex.new
PROVIDER_MUTEX = Mutex.new
def metrics_folder_present? def metrics_folder_present?
multiprocess_files_dir = ::Prometheus::Client.configuration.multiprocess_files_dir multiprocess_files_dir = ::Prometheus::Client.configuration.multiprocess_files_dir
...@@ -20,23 +23,38 @@ module Gitlab ...@@ -20,23 +23,38 @@ module Gitlab
end end
def registry def registry
return @registry if @registry
REGISTRY_MUTEX.synchronize do
@registry ||= ::Prometheus::Client.registry @registry ||= ::Prometheus::Client.registry
end end
end
def counter(name, docstring, base_labels = {}) def counter(name, docstring, base_labels = {})
provide_metric(name) || registry.counter(name, docstring, base_labels) safe_provide_metric(:counter, name, docstring, base_labels)
end end
def summary(name, docstring, base_labels = {}) def summary(name, docstring, base_labels = {})
provide_metric(name) || registry.summary(name, docstring, base_labels) safe_provide_metric(:summary, name, docstring, base_labels)
end end
def gauge(name, docstring, base_labels = {}, multiprocess_mode = :all) def gauge(name, docstring, base_labels = {}, multiprocess_mode = :all)
provide_metric(name) || registry.gauge(name, docstring, base_labels, multiprocess_mode) safe_provide_metric(:gauge, name, docstring, base_labels, multiprocess_mode)
end end
def histogram(name, docstring, base_labels = {}, buckets = ::Prometheus::Client::Histogram::DEFAULT_BUCKETS) def histogram(name, docstring, base_labels = {}, buckets = ::Prometheus::Client::Histogram::DEFAULT_BUCKETS)
provide_metric(name) || registry.histogram(name, docstring, base_labels, buckets) safe_provide_metric(:histogram, name, docstring, base_labels, buckets)
end
private
def safe_provide_metric(method, name, *args)
metric = provide_metric(name)
return metric if metric
PROVIDER_MUTEX.synchronize do
provide_metric(name) || registry.method(method).call(name, *args)
end
end end
def provide_metric(name) def provide_metric(name)
...@@ -47,8 +65,6 @@ module Gitlab ...@@ -47,8 +65,6 @@ module Gitlab
end end
end end
private
def prometheus_metrics_enabled_unmemoized def prometheus_metrics_enabled_unmemoized
metrics_folder_present? && current_application_settings[:prometheus_metrics_enabled] || false metrics_folder_present? && current_application_settings[:prometheus_metrics_enabled] || false
end end
......
lib/gitlab/metrics/rack_middleware.rb
View file @ bff9e896
...@@ -2,20 +2,6 @@ module Gitlab ...@@ -2,20 +2,6 @@ module Gitlab
module Metrics module Metrics
# Rack middleware for tracking Rails and Grape requests. # Rack middleware for tracking Rails and Grape requests.
class RackMiddleware class RackMiddleware
CONTROLLER_KEY = 'action_controller.instance'.freeze
ENDPOINT_KEY = 'api.endpoint'.freeze
CONTENT_TYPES = {
'text/html' => :html,
'text/plain' => :txt,
'application/json' => :json,
'text/js' => :js,
'application/atom+xml' => :atom,
'image/png' => :png,
'image/jpeg' => :jpeg,
'image/gif' => :gif,
'image/svg+xml' => :svg
}.freeze
def initialize(app) def initialize(app)
@app = app @app = app
end end
...@@ -35,12 +21,6 @@ module Gitlab ...@@ -35,12 +21,6 @@ module Gitlab
# Even in the event of an error we want to submit any metrics we # Even in the event of an error we want to submit any metrics we
# might've gathered up to this point. # might've gathered up to this point.
ensure ensure
if env[CONTROLLER_KEY]
tag_controller(trans, env)
elsif env[ENDPOINT_KEY]
tag_endpoint(trans, env)
end
trans.finish trans.finish
end end
...@@ -48,60 +28,19 @@ module Gitlab ...@@ -48,60 +28,19 @@ module Gitlab
end end
def transaction_from_env(env) def transaction_from_env(env)
trans = Transaction.new trans = WebTransaction.new(env)
trans.set(:request_uri, filtered_path(env)) trans.set(:request_uri, filtered_path(env), false)
trans.set(:request_method, env['REQUEST_METHOD']) trans.set(:request_method, env['REQUEST_METHOD'], false)
trans trans
end end
def tag_controller(trans, env)
controller = env[CONTROLLER_KEY]
action = "#{controller.class.name}##{controller.action_name}"
suffix = CONTENT_TYPES[controller.content_type]
if suffix && suffix != :html
action += ".#{suffix}"
end
trans.action = action
end
def tag_endpoint(trans, env)
endpoint = env[ENDPOINT_KEY]
begin
route = endpoint.route
rescue
# endpoint.route is calling env[Grape::Env::GRAPE_ROUTING_ARGS][:route_info]
# but env[Grape::Env::GRAPE_ROUTING_ARGS] is nil in the case of a 405 response
# so we're rescuing exceptions and bailing out
end
if route
path = endpoint_paths_cache[route.request_method][route.path]
trans.action = "Grape##{route.request_method} #{path}"
end
end
private private
def filtered_path(env) def filtered_path(env)
ActionDispatch::Request.new(env).filtered_path.presence || env['REQUEST_URI'] ActionDispatch::Request.new(env).filtered_path.presence || env['REQUEST_URI']
end end
def endpoint_paths_cache
@endpoint_paths_cache ||= Hash.new do |hash, http_method|
hash[http_method] = Hash.new do |inner_hash, raw_path|
inner_hash[raw_path] = endpoint_instrumentable_path(raw_path)
end
end
end
def endpoint_instrumentable_path(raw_path)
raw_path.sub('(.:format)', '').sub('/:version', '')
end
end end
end end
end end
lib/gitlab/metrics/samplers/base_sampler.rb 0 → 100644
View file @ bff9e896
require 'logger'
module Gitlab
module Metrics
module Samplers
class BaseSampler < Daemon
# interval - The sampling interval in seconds.
def initialize(interval)
interval_half = interval.to_f / 2
@interval = interval
@interval_steps = (-interval_half..interval_half).step(0.1).to_a
super()
end
def safe_sample
sample
rescue => e
Rails.logger.warn("#{self.class}: #{e}, stopping")
stop
end
def sample
raise NotImplementedError
end
# Returns the sleep interval with a random adjustment.
#
# The random adjustment is put in place to ensure we:
#
# 1. Don't generate samples at the exact same interval every time (thus
# potentially missing anything that happens in between samples).
# 2. Don't sample data at the same interval two times in a row.
def sleep_interval
while step = @interval_steps.sample
if step != @last_step
@last_step = step
return @interval + @last_step
end
end
end
private
attr_reader :running
def start_working
@running = true
sleep(sleep_interval)
while running
safe_sample
sleep(sleep_interval)
end
end
def stop_working
@running = false
end
end
end
end
end
lib/gitlab/metrics/samplers/influx_sampler.rb 0 → 100644
View file @ bff9e896
module Gitlab
module Metrics
module Samplers
# Class that sends certain metrics to InfluxDB at a specific interval.
#
# This class is used to gather statistics that can't be directly associated
# with a transaction such as system memory usage, garbage collection
# statistics, etc.
class InfluxSampler < BaseSampler
# interval - The sampling interval in seconds.
def initialize(interval = Metrics.settings[:sample_interval])
super(interval)
@last_step = nil
@metrics = []
@last_minor_gc = Delta.new(GC.stat[:minor_gc_count])
@last_major_gc = Delta.new(GC.stat[:major_gc_count])
if Gitlab::Metrics.mri?
require 'allocations'
Allocations.start
end
end
def sample
sample_memory_usage
sample_file_descriptors
sample_objects
sample_gc
flush
ensure
GC::Profiler.clear
@metrics.clear
end
def flush
Metrics.submit_metrics(@metrics.map(&:to_hash))
end
def sample_memory_usage
add_metric('memory_usage', value: System.memory_usage)
end
def sample_file_descriptors
add_metric('file_descriptors', value: System.file_descriptor_count)
end
if Metrics.mri?
def sample_objects
sample = Allocations.to_hash
counts = sample.each_with_object({}) do |(klass, count), hash|
name = klass.name
next unless name
hash[name] = count
end
# Symbols aren't allocated so we'll need to add those manually.
counts['Symbol'] = Symbol.all_symbols.length
counts.each do |name, count|
add_metric('object_counts', { count: count }, type: name)
end
end
else
def sample_objects
end
end
def sample_gc
time = GC::Profiler.total_time * 1000.0
stats = GC.stat.merge(total_time: time)
# We want the difference of GC runs compared to the last sample, not the
# total amount since the process started.
stats[:minor_gc_count] =
@last_minor_gc.compared_with(stats[:minor_gc_count])
stats[:major_gc_count] =
@last_major_gc.compared_with(stats[:major_gc_count])
stats[:count] = stats[:minor_gc_count] + stats[:major_gc_count]
add_metric('gc_statistics', stats)
end
def add_metric(series, values, tags = {})
prefix = sidekiq? ? 'sidekiq_' : 'rails_'
@metrics << Metric.new("#{prefix}#{series}", values, tags)
end
def sidekiq?
Sidekiq.server?
end
end
end
end
end
lib/gitlab/metrics/samplers/ruby_sampler.rb 0 → 100644
View file @ bff9e896
require 'prometheus/client/support/unicorn'
module Gitlab
module Metrics
module Samplers
class RubySampler < BaseSampler
def metrics
@metrics ||= init_metrics
end
def with_prefix(prefix, name)
"ruby_#{prefix}_#{name}".to_sym
end
def to_doc_string(name)
name.to_s.humanize
end
def labels
{}
end
def initialize(interval)
super(interval)
if Metrics.mri?
require 'allocations'
Allocations.start
end
end
def init_metrics
metrics = {}
metrics[:sampler_duration] = Metrics.histogram(with_prefix(:sampler_duration, :seconds), 'Sampler time', {})
metrics[:total_time] = Metrics.gauge(with_prefix(:gc, :time_total), 'Total GC time', labels, :livesum)
GC.stat.keys.each do |key|
metrics[key] = Metrics.gauge(with_prefix(:gc, key), to_doc_string(key), labels, :livesum)
end
metrics[:objects_total] = Metrics.gauge(with_prefix(:objects, :total), 'Objects total', labels.merge(class: nil), :livesum)
metrics[:memory_usage] = Metrics.gauge(with_prefix(:memory, :usage_total), 'Memory used total', labels, :livesum)
metrics[:file_descriptors] = Metrics.gauge(with_prefix(:file, :descriptors_total), 'File descriptors total', labels, :livesum)
metrics
end
def sample
start_time = System.monotonic_time
sample_gc
sample_objects
metrics[:memory_usage].set(labels, System.memory_usage)
metrics[:file_descriptors].set(labels, System.file_descriptor_count)
metrics[:sampler_duration].observe(labels.merge(worker_label), (System.monotonic_time - start_time) / 1000.0)
ensure
GC::Profiler.clear
end
private
def sample_gc
metrics[:total_time].set(labels, GC::Profiler.total_time * 1000)
GC.stat.each do |key, value|
metrics[key].set(labels, value)
end
end
def sample_objects
list_objects.each do |name, count|
metrics[:objects_total].set(labels.merge(class: name), count)
end
end
if Metrics.mri?
def list_objects
sample = Allocations.to_hash
counts = sample.each_with_object({}) do |(klass, count), hash|
name = klass.name
next unless name
hash[name] = count
end
# Symbols aren't allocated so we'll need to add those manually.
counts['Symbol'] = Symbol.all_symbols.length
counts
end
else
def list_objects
end
end
def worker_label
return {} unless defined?(Unicorn::Worker)
worker_no = ::Prometheus::Client::Support::Unicorn.worker_id
if worker_no
{ unicorn: worker_no }
else
{ unicorn: 'master' }
end
end
end
end
end
end
lib/gitlab/metrics/samplers/unicorn_sampler.rb 0 → 100644
View file @ bff9e896
module Gitlab
module Metrics
module Samplers
class UnicornSampler < BaseSampler
def initialize(interval)
super(interval)
end
def unicorn_active_connections
@unicorn_active_connections ||= Gitlab::Metrics.gauge(:unicorn_active_connections, 'Unicorn active connections', {}, :max)
end
def unicorn_queued_connections
@unicorn_queued_connections ||= Gitlab::Metrics.gauge(:unicorn_queued_connections, 'Unicorn queued connections', {}, :max)
end
def enabled?
# Raindrops::Linux.tcp_listener_stats is only present on Linux
unicorn_with_listeners? && Raindrops::Linux.respond_to?(:tcp_listener_stats)
end
def sample
Raindrops::Linux.tcp_listener_stats(tcp_listeners).each do |addr, stats|
unicorn_active_connections.set({ type: 'tcp', address: addr }, stats.active)
unicorn_queued_connections.set({ type: 'tcp', address: addr }, stats.queued)
end
Raindrops::Linux.unix_listener_stats(unix_listeners).each do |addr, stats|
unicorn_active_connections.set({ type: 'unix', address: addr }, stats.active)
unicorn_queued_connections.set({ type: 'unix', address: addr }, stats.queued)
end
end
private
def tcp_listeners
@tcp_listeners ||= Unicorn.listener_names.grep(%r{\A[^/]+:\d+\z})
end
def unix_listeners
@unix_listeners ||= Unicorn.listener_names - tcp_listeners
end
def unicorn_with_listeners?
defined?(Unicorn) && Unicorn.listener_names.any?
end
end
end
end
end
lib/gitlab/metrics/sidekiq_middleware.rb
View file @ bff9e896
...@@ -5,7 +5,7 @@ module Gitlab ...@@ -5,7 +5,7 @@ module Gitlab
# This middleware is intended to be used as a server-side middleware. # This middleware is intended to be used as a server-side middleware.
class SidekiqMiddleware class SidekiqMiddleware
def call(worker, message, queue) def call(worker, message, queue)
trans = Transaction.new("#{worker.class.name}#perform") trans = BackgroundTransaction.new(worker.class)
begin begin
# Old gitlad-shell messages don't provide enqueued_at/created_at attributes # Old gitlad-shell messages don't provide enqueued_at/created_at attributes
......
lib/gitlab/metrics/subscribers/action_view.rb
View file @ bff9e896
...@@ -15,10 +15,24 @@ module Gitlab ...@@ -15,10 +15,24 @@ module Gitlab
private private
def metric_view_rendering_duration_seconds
@metric_view_rendering_duration_seconds ||= Gitlab::Metrics.histogram(
:gitlab_view_rendering_duration_seconds,
'View rendering time',
Transaction::BASE_LABELS.merge({ path: nil }),
[0.001, 0.002, 0.005, 0.01, 0.02, 0.05, 0.1, 0.500, 2.0, 10.0]
)
end
def track(event) def track(event)
values = values_for(event) values = values_for(event)
tags = tags_for(event) tags = tags_for(event)
metric_view_rendering_duration_seconds.observe(
current_transaction.labels.merge(tags),
event.duration
)
current_transaction.increment(:view_duration, event.duration) current_transaction.increment(:view_duration, event.duration)
current_transaction.add_metric(SERIES, values, tags) current_transaction.add_metric(SERIES, values, tags)
end end
......
lib/gitlab/metrics/subscribers/active_record.rb
View file @ bff9e896
...@@ -7,9 +7,10 @@ module Gitlab ...@@ -7,9 +7,10 @@ module Gitlab
def sql(event) def sql(event)
return unless current_transaction return unless current_transaction
metric_sql_duration_seconds.observe(current_transaction.labels, event.duration / 1000.0)
current_transaction.increment(:sql_duration, event.duration) current_transaction.increment(:sql_duration, event.duration, false)
current_transaction.increment(:sql_count, 1) current_transaction.increment(:sql_count, 1, false)
end end
private private
...@@ -17,6 +18,15 @@ module Gitlab ...@@ -17,6 +18,15 @@ module Gitlab
def current_transaction def current_transaction
Transaction.current Transaction.current
end end
def metric_sql_duration_seconds
@metric_sql_duration_seconds ||= Gitlab::Metrics.histogram(
:gitlab_sql_duration_seconds,
'SQL time',
Transaction::BASE_LABELS,
[0.001, 0.002, 0.005, 0.01, 0.02, 0.05, 0.1, 0.500, 2.0, 10.0]
)
end
end end
end end
end end
......
lib/gitlab/metrics/subscribers/rails_cache.rb
View file @ bff9e896
...@@ -7,28 +7,29 @@ module Gitlab ...@@ -7,28 +7,29 @@ module Gitlab
attach_to :active_support attach_to :active_support
def cache_read(event) def cache_read(event)
increment(:cache_read, event.duration) observe(:read, event.duration)
return unless current_transaction return unless current_transaction
return if event.payload[:super_operation] == :fetch return if event.payload[:super_operation] == :fetch
if event.payload[:hit] if event.payload[:hit]
current_transaction.increment(:cache_read_hit_count, 1) current_transaction.increment(:cache_read_hit_count, 1, false)
else else
current_transaction.increment(:cache_read_miss_count, 1) metric_cache_misses_total.increment(current_transaction.labels)
current_transaction.increment(:cache_read_miss_count, 1, false)
end end
end end
def cache_write(event) def cache_write(event)
increment(:cache_write, event.duration) observe(:write, event.duration)
end end
def cache_delete(event) def cache_delete(event)
increment(:cache_delete, event.duration) observe(:delete, event.duration)
end end
def cache_exist?(event) def cache_exist?(event)
increment(:cache_exists, event.duration) observe(:exists, event.duration)
end end
def cache_fetch_hit(event) def cache_fetch_hit(event)
...@@ -40,16 +41,18 @@ module Gitlab ...@@ -40,16 +41,18 @@ module Gitlab
def cache_generate(event) def cache_generate(event)
return unless current_transaction return unless current_transaction
metric_cache_misses_total.increment(current_transaction.labels)
current_transaction.increment(:cache_read_miss_count, 1) current_transaction.increment(:cache_read_miss_count, 1)
end end
def increment(key, duration) def observe(key, duration)
return unless current_transaction return unless current_transaction
current_transaction.increment(:cache_duration, duration) metric_cache_operation_duration_seconds.observe(current_transaction.labels.merge({ operation: key }), duration / 1000.0)
current_transaction.increment(:cache_count, 1) current_transaction.increment(:cache_duration, duration, false)
current_transaction.increment("#{key}_duration".to_sym, duration) current_transaction.increment(:cache_count, 1, false)
current_transaction.increment("#{key}_count".to_sym, 1) current_transaction.increment("cache_#{key}_duration".to_sym, duration, false)
current_transaction.increment("cache_#{key}_count".to_sym, 1, false)
end end
private private
...@@ -57,6 +60,23 @@ module Gitlab ...@@ -57,6 +60,23 @@ module Gitlab
def current_transaction def current_transaction
Transaction.current Transaction.current
end end
def metric_cache_operation_duration_seconds
@metric_cache_operation_duration_seconds ||= Gitlab::Metrics.histogram(
:gitlab_cache_operation_duration_seconds,
'Cache access time',
Transaction::BASE_LABELS.merge({ action: nil }),
[0.001, 0.002, 0.005, 0.01, 0.02, 0.05, 0.1, 0.500, 2.0, 10.0]
)
end
def metric_cache_misses_total
@metric_cache_misses_total ||= Gitlab::Metrics.counter(
:gitlab_cache_misses_total,
'Cache read miss',
Transaction::BASE_LABELS
)
end
end end
end end
end end
......
lib/gitlab/metrics/transaction.rb
View file @ bff9e896
...@@ -2,22 +2,22 @@ module Gitlab ...@@ -2,22 +2,22 @@ module Gitlab
module Metrics module Metrics
# Class for storing metrics information of a single transaction. # Class for storing metrics information of a single transaction.
class Transaction class Transaction
# base labels shared among all transactions
BASE_LABELS = { controller: nil, action: nil }.freeze
THREAD_KEY = :_gitlab_metrics_transaction THREAD_KEY = :_gitlab_metrics_transaction
METRICS_MUTEX = Mutex.new
# The series to store events (e.g. Git pushes) in. # The series to store events (e.g. Git pushes) in.
EVENT_SERIES = 'events'.freeze EVENT_SERIES = 'events'.freeze
attr_reader :tags, :values, :method, :metrics attr_reader :tags, :values, :method, :metrics
attr_accessor :action
def self.current def self.current
Thread.current[THREAD_KEY] Thread.current[THREAD_KEY]
end end
# action - A String describing the action performed, usually the class def initialize
# plus method name.
def initialize(action = nil)
@metrics = [] @metrics = []
@methods = {} @methods = {}
...@@ -26,7 +26,6 @@ module Gitlab ...@@ -26,7 +26,6 @@ module Gitlab
@values = Hash.new(0) @values = Hash.new(0)
@tags = {} @tags = {}
@action = action
@memory_before = 0 @memory_before = 0
@memory_after = 0 @memory_after = 0
...@@ -51,6 +50,9 @@ module Gitlab ...@@ -51,6 +50,9 @@ module Gitlab
@memory_after = System.memory_usage @memory_after = System.memory_usage
@finished_at = System.monotonic_time @finished_at = System.monotonic_time
self.class.metric_transaction_duration_seconds.observe(labels, duration * 1000)
self.class.metric_transaction_allocated_memory_bytes.observe(labels, allocated_memory * 1024.0)
Thread.current[THREAD_KEY] = nil Thread.current[THREAD_KEY] = nil
end end
...@@ -66,9 +68,12 @@ module Gitlab ...@@ -66,9 +68,12 @@ module Gitlab
# event_name - The name of the event (e.g. "git_push"). # event_name - The name of the event (e.g. "git_push").
# tags - A set of tags to attach to the event. # tags - A set of tags to attach to the event.
def add_event(event_name, tags = {}) def add_event(event_name, tags = {})
add_event_with_values(event_name, {}, tags) self.class.metric_event_counter(event_name, tags).increment(tags.merge(labels))
@metrics << Metric.new(EVENT_SERIES, { count: 1 }, tags.merge(event: event_name), :event)
end end
#
# Deprecated
def add_event_with_values(event_name, values, tags = {}) def add_event_with_values(event_name, values, tags = {})
@metrics << Metric.new(EVENT_SERIES, @metrics << Metric.new(EVENT_SERIES,
{ count: 1 }.merge(values), { count: 1 }.merge(values),
...@@ -77,26 +82,24 @@ module Gitlab ...@@ -77,26 +82,24 @@ module Gitlab
end end
# Returns a MethodCall object for the given name. # Returns a MethodCall object for the given name.
def method_call_for(name) def method_call_for(name, module_name, method_name)
unless method = @methods[name] unless method = @methods[name]
@methods[name] = method = MethodCall.new(name, Instrumentation.series) @methods[name] = method = MethodCall.new(name, module_name, method_name, self)
end end
method method
end end
def increment(name, value) def increment(name, value, use_prometheus = true)
self.class.metric_transaction_counter(name).increment(labels, value) if use_prometheus
@values[name] += value @values[name] += value
end end
def set(name, value) def set(name, value, use_prometheus = true)
self.class.metric_transaction_gauge(name).set(labels, value) if use_prometheus
@values[name] = value @values[name] = value
end end
def add_tag(key, value)
@tags[key] = value
end
def finish def finish
track_self track_self
submit submit
...@@ -121,14 +124,83 @@ module Gitlab ...@@ -121,14 +124,83 @@ module Gitlab
submit_hashes = submit.map do |metric| submit_hashes = submit.map do |metric|
hash = metric.to_hash hash = metric.to_hash
hash[:tags][:action] ||= action if action && !metric.event?
hash[:tags][:action] ||= @action if @action && !metric.event?
hash hash
end end
Metrics.submit_metrics(submit_hashes) Metrics.submit_metrics(submit_hashes)
end end
def labels
BASE_LABELS
end
# returns string describing the action performed, usually the class plus method name.
def action
"#{labels[:controller]}##{labels[:action]}" if labels && !labels.empty?
end
def self.metric_transaction_duration_seconds
return @metric_transaction_duration_seconds if @metric_transaction_duration_seconds
METRICS_MUTEX.synchronize do
@metric_transaction_duration_seconds ||= Gitlab::Metrics.histogram(
:gitlab_transaction_duration_seconds,
'Transaction duration',
BASE_LABELS,
[0.001, 0.002, 0.005, 0.01, 0.02, 0.05, 0.1, 0.500, 2.0, 10.0]
)
end
end
def self.metric_transaction_allocated_memory_bytes
return @metric_transaction_allocated_memory_bytes if @metric_transaction_allocated_memory_bytes
METRICS_MUTEX.synchronize do
@metric_transaction_allocated_memory_bytes ||= Gitlab::Metrics.histogram(
:gitlab_transaction_allocated_memory_bytes,
'Transaction allocated memory bytes',
BASE_LABELS,
[1000, 10000, 20000, 500000, 1000000, 2000000, 5000000, 10000000, 20000000, 100000000]
)
end
end
def self.metric_event_counter(event_name, tags)
return @metric_event_counters[event_name] if @metric_event_counters&.has_key?(event_name)
METRICS_MUTEX.synchronize do
@metric_event_counters ||= {}
@metric_event_counters[event_name] ||= Gitlab::Metrics.counter(
"gitlab_transaction_event_#{event_name}_total".to_sym,
"Transaction event #{event_name} counter",
tags.merge(BASE_LABELS)
)
end
end
def self.metric_transaction_counter(name)
return @metric_transaction_counters[name] if @metric_transaction_counters&.has_key?(name)
METRICS_MUTEX.synchronize do
@metric_transaction_counters ||= {}
@metric_transaction_counters[name] ||= Gitlab::Metrics.counter(
"gitlab_transaction_#{name}_total".to_sym, "Transaction #{name} counter", BASE_LABELS
)
end
end
def self.metric_transaction_gauge(name)
return @metric_transaction_gauges[name] if @metric_transaction_gauges&.has_key?(name)
METRICS_MUTEX.synchronize do
@metric_transaction_gauges ||= {}
@metric_transaction_gauges[name] ||= Gitlab::Metrics.gauge(
"gitlab_transaction_#{name}".to_sym, "Transaction gauge #{name}", BASE_LABELS, :livesum
)
end
end
end end
end end
end end
lib/gitlab/metrics/unicorn_sampler.rb deleted 100644 → 0
View file @ 937b7da8
module Gitlab
module Metrics
class UnicornSampler < BaseSampler
def initialize(interval)
super(interval)
end
def unicorn_active_connections
@unicorn_active_connections ||= Gitlab::Metrics.gauge(:unicorn_active_connections, 'Unicorn active connections', {}, :max)
end
def unicorn_queued_connections
@unicorn_queued_connections ||= Gitlab::Metrics.gauge(:unicorn_queued_connections, 'Unicorn queued connections', {}, :max)
end
def enabled?
# Raindrops::Linux.tcp_listener_stats is only present on Linux
unicorn_with_listeners? && Raindrops::Linux.respond_to?(:tcp_listener_stats)
end
def sample
Raindrops::Linux.tcp_listener_stats(tcp_listeners).each do |addr, stats|
unicorn_active_connections.set({ type: 'tcp', address: addr }, stats.active)
unicorn_queued_connections.set({ type: 'tcp', address: addr }, stats.queued)
end
Raindrops::Linux.unix_listener_stats(unix_listeners).each do |addr, stats|
unicorn_active_connections.set({ type: 'unix', address: addr }, stats.active)
unicorn_queued_connections.set({ type: 'unix', address: addr }, stats.queued)
end
end
private
def tcp_listeners
@tcp_listeners ||= Unicorn.listener_names.grep(%r{\A[^/]+:\d+\z})
end
def unix_listeners
@unix_listeners ||= Unicorn.listener_names - tcp_listeners
end
def unicorn_with_listeners?
defined?(Unicorn) && Unicorn.listener_names.any?
end
end
end
end
lib/gitlab/metrics/web_transaction.rb 0 → 100644
View file @ bff9e896
module Gitlab
module Metrics
class WebTransaction < Transaction
CONTROLLER_KEY = 'action_controller.instance'.freeze
ENDPOINT_KEY = 'api.endpoint'.freeze
CONTENT_TYPES = {
'text/html' => :html,
'text/plain' => :txt,
'application/json' => :json,
'text/js' => :js,
'application/atom+xml' => :atom,
'image/png' => :png,
'image/jpeg' => :jpeg,
'image/gif' => :gif,
'image/svg+xml' => :svg
}.freeze
def initialize(env)
super()
@env = env
end
def labels
return @labels if @labels
# memoize transaction labels only source env variables were present
@labels = if @env[CONTROLLER_KEY]
labels_from_controller || {}
elsif @env[ENDPOINT_KEY]
labels_from_endpoint || {}
end
@labels || {}
end
private
def labels_from_controller
controller = @env[CONTROLLER_KEY]
action = "#{controller.action_name}"
suffix = CONTENT_TYPES[controller.content_type]
if suffix && suffix != :html
action += ".#{suffix}"
end
{ controller: controller.class.name, action: action }
end
def labels_from_endpoint
endpoint = @env[ENDPOINT_KEY]
begin
route = endpoint.route
rescue
# endpoint.route is calling env[Grape::Env::GRAPE_ROUTING_ARGS][:route_info]
# but env[Grape::Env::GRAPE_ROUTING_ARGS] is nil in the case of a 405 response
# so we're rescuing exceptions and bailing out
end
if route
path = endpoint_paths_cache[route.request_method][route.path]
{ controller: 'Grape', action: "#{route.request_method} #{path}" }
end
end
def endpoint_paths_cache
@endpoint_paths_cache ||= Hash.new do |hash, http_method|
hash[http_method] = Hash.new do |inner_hash, raw_path|
inner_hash[raw_path] = endpoint_instrumentable_path(raw_path)
end
end
end
def endpoint_instrumentable_path(raw_path)
raw_path.sub('(.:format)', '').sub('/:version', '')
end
end
end
end
lib/gitlab/middleware/rails_queue_duration.rb
View file @ bff9e896
...@@ -14,11 +14,22 @@ module Gitlab ...@@ -14,11 +14,22 @@ module Gitlab
proxy_start = env['HTTP_GITLAB_WORKHORSE_PROXY_START'].presence proxy_start = env['HTTP_GITLAB_WORKHORSE_PROXY_START'].presence
if trans && proxy_start if trans && proxy_start
# Time in milliseconds since gitlab-workhorse started the request # Time in milliseconds since gitlab-workhorse started the request
trans.set(:rails_queue_duration, Time.now.to_f * 1_000 - proxy_start.to_f / 1_000_000) duration = Time.now.to_f * 1_000 - proxy_start.to_f / 1_000_000
trans.set(:rails_queue_duration, duration)
metric_rails_queue_duration_seconds.observe(trans.labels, duration / 1_000)
end end
@app.call(env) @app.call(env)
end end
private
def metric_rails_queue_duration_seconds
@metric_rails_queue_duration_seconds ||= Gitlab::Metrics.histogram(
:gitlab_rails_queue_duration_seconds,
Gitlab::Metrics::Transaction::BASE_LABELS
)
end
end end
end end
end end
spec/initializers/8_metrics_spec.rb
View file @ bff9e896
...@@ -3,7 +3,6 @@ require 'spec_helper' ...@@ -3,7 +3,6 @@ require 'spec_helper'
describe 'instrument_classes' do describe 'instrument_classes' do
let(:config) { double(:config) } let(:config) { double(:config) }
let(:unicorn_sampler) { double(:unicorn_sampler) }
let(:influx_sampler) { double(:influx_sampler) } let(:influx_sampler) { double(:influx_sampler) }
before do before do
...@@ -11,9 +10,7 @@ describe 'instrument_classes' do ...@@ -11,9 +10,7 @@ describe 'instrument_classes' do
allow(config).to receive(:instrument_methods) allow(config).to receive(:instrument_methods)
allow(config).to receive(:instrument_instance_method) allow(config).to receive(:instrument_instance_method)
allow(config).to receive(:instrument_instance_methods) allow(config).to receive(:instrument_instance_methods)
allow(Gitlab::Metrics::UnicornSampler).to receive(:initialize_instance).and_return(unicorn_sampler) allow(Gitlab::Metrics::Samplers::InfluxSampler).to receive(:initialize_instance).and_return(influx_sampler)
allow(Gitlab::Metrics::InfluxSampler).to receive(:initialize_instance).and_return(influx_sampler)
allow(unicorn_sampler).to receive(:start)
allow(influx_sampler).to receive(:start) allow(influx_sampler).to receive(:start)
allow(Gitlab::Application).to receive(:configure) allow(Gitlab::Application).to receive(:configure)
end end
......
spec/lib/gitlab/metrics/background_transaction_spec.rb 0 → 100644
View file @ bff9e896
require 'spec_helper'
describe Gitlab::Metrics::BackgroundTransaction do
let(:test_worker_class) { double(:class, name: 'TestWorker') }
subject { described_class.new(test_worker_class) }
describe '#action' do
it 'returns transaction action name' do
expect(subject.action).to eq('TestWorker#perform')
end
end
end
spec/lib/gitlab/metrics/instrumentation_spec.rb
View file @ bff9e896
require 'spec_helper' require 'spec_helper'
describe Gitlab::Metrics::Instrumentation do describe Gitlab::Metrics::Instrumentation do
let(:transaction) { Gitlab::Metrics::Transaction.new } let(:env) { {} }
let(:transaction) { Gitlab::Metrics::WebTransaction.new(env) }
before do before do
@dummy = Class.new do @dummy = Class.new do
......
spec/lib/gitlab/metrics/method_call_spec.rb
View file @ bff9e896
require 'spec_helper' require 'spec_helper'
describe Gitlab::Metrics::MethodCall do describe Gitlab::Metrics::MethodCall do
let(:method_call) { described_class.new('Foo#bar', 'foo') } let(:transaction) { double(:transaction, labels: {}) }
let(:method_call) { described_class.new('Foo#bar', :Foo, '#bar', transaction) }
describe '#measure' do describe '#measure' do
it 'measures the performance of the supplied block' do it 'measures the performance of the supplied block' do
...@@ -11,6 +12,18 @@ describe Gitlab::Metrics::MethodCall do ...@@ -11,6 +12,18 @@ describe Gitlab::Metrics::MethodCall do
expect(method_call.cpu_time).to be_a_kind_of(Numeric) expect(method_call.cpu_time).to be_a_kind_of(Numeric)
expect(method_call.call_count).to eq(1) expect(method_call.call_count).to eq(1)
end end
it 'observes the performance of the supplied block' do
expect(described_class.call_real_duration_histogram)
.to receive(:observe)
.with({ module: :Foo, method: '#bar' }, be_a_kind_of(Numeric))
expect(described_class.call_cpu_duration_histogram)
.to receive(:observe)
.with({ module: :Foo, method: '#bar' }, be_a_kind_of(Numeric))
method_call.measure { 'foo' }
end
end end
describe '#to_metric' do describe '#to_metric' do
...@@ -19,7 +32,7 @@ describe Gitlab::Metrics::MethodCall do ...@@ -19,7 +32,7 @@ describe Gitlab::Metrics::MethodCall do
metric = method_call.to_metric metric = method_call.to_metric
expect(metric).to be_an_instance_of(Gitlab::Metrics::Metric) expect(metric).to be_an_instance_of(Gitlab::Metrics::Metric)
expect(metric.series).to eq('foo') expect(metric.series).to eq('rails_method_calls')
expect(metric.values[:duration]).to be_a_kind_of(Numeric) expect(metric.values[:duration]).to be_a_kind_of(Numeric)
expect(metric.values[:cpu_duration]).to be_a_kind_of(Numeric) expect(metric.values[:cpu_duration]).to be_a_kind_of(Numeric)
......
spec/lib/gitlab/metrics/rack_middleware_spec.rb
View file @ bff9e896
...@@ -18,34 +18,6 @@ describe Gitlab::Metrics::RackMiddleware do ...@@ -18,34 +18,6 @@ describe Gitlab::Metrics::RackMiddleware do
expect(middleware.call(env)).to eq('yay') expect(middleware.call(env)).to eq('yay')
end end
it 'tags a transaction with the name and action of a controller' do
klass = double(:klass, name: 'TestController', content_type: 'text/html')
controller = double(:controller, class: klass, action_name: 'show')
env['action_controller.instance'] = controller
allow(app).to receive(:call).with(env)
expect(middleware).to receive(:tag_controller)
.with(an_instance_of(Gitlab::Metrics::Transaction), env)
middleware.call(env)
end
it 'tags a transaction with the method and path of the route in the grape endpoint' do
route = double(:route, request_method: "GET", path: "/:version/projects/:id/archive(.:format)")
endpoint = double(:endpoint, route: route)
env['api.endpoint'] = endpoint
allow(app).to receive(:call).with(env)
expect(middleware).to receive(:tag_endpoint)
.with(an_instance_of(Gitlab::Metrics::Transaction), env)
middleware.call(env)
end
it 'tracks any raised exceptions' do it 'tracks any raised exceptions' do
expect(app).to receive(:call).with(env).and_raise(RuntimeError) expect(app).to receive(:call).with(env).and_raise(RuntimeError)
...@@ -60,7 +32,7 @@ describe Gitlab::Metrics::RackMiddleware do ...@@ -60,7 +32,7 @@ describe Gitlab::Metrics::RackMiddleware do
let(:transaction) { middleware.transaction_from_env(env) } let(:transaction) { middleware.transaction_from_env(env) }
it 'returns a Transaction' do it 'returns a Transaction' do
expect(transaction).to be_an_instance_of(Gitlab::Metrics::Transaction) expect(transaction).to be_an_instance_of(Gitlab::Metrics::WebTransaction)
end end
it 'stores the request method and URI in the transaction as values' do it 'stores the request method and URI in the transaction as values' do
...@@ -84,58 +56,4 @@ describe Gitlab::Metrics::RackMiddleware do ...@@ -84,58 +56,4 @@ describe Gitlab::Metrics::RackMiddleware do
end end
end end
end end
describe '#tag_controller' do
let(:transaction) { middleware.transaction_from_env(env) }
let(:content_type) { 'text/html' }
before do
klass = double(:klass, name: 'TestController')
controller = double(:controller, class: klass, action_name: 'show', content_type: content_type)
env['action_controller.instance'] = controller
end
it 'tags a transaction with the name and action of a controller' do
middleware.tag_controller(transaction, env)
expect(transaction.action).to eq('TestController#show')
end
context 'when the response content type is not :html' do
let(:content_type) { 'application/json' }
it 'appends the mime type to the transaction action' do
middleware.tag_controller(transaction, env)
expect(transaction.action).to eq('TestController#show.json')
end
end
end
describe '#tag_endpoint' do
let(:transaction) { middleware.transaction_from_env(env) }
it 'tags a transaction with the method and path of the route in the grape endpount' do
route = double(:route, request_method: "GET", path: "/:version/projects/:id/archive(.:format)")
endpoint = double(:endpoint, route: route)
env['api.endpoint'] = endpoint
middleware.tag_endpoint(transaction, env)
expect(transaction.action).to eq('Grape#GET /projects/:id/archive')
end
it 'does not tag a transaction if route infos are missing' do
endpoint = double(:endpoint)
allow(endpoint).to receive(:route).and_raise
env['api.endpoint'] = endpoint
middleware.tag_endpoint(transaction, env)
expect(transaction.action).to be_nil
end
end
end end
spec/lib/gitlab/metrics/influx_sampler_spec.rb → spec/lib/gitlab/metrics/samplers/influx_sampler_spec.rb
View file @ bff9e896
require 'spec_helper' require 'spec_helper'
describe Gitlab::Metrics::InfluxSampler do describe Gitlab::Metrics::Samplers::InfluxSampler do
let(:sampler) { described_class.new(5) } let(:sampler) { described_class.new(5) }
after do after do
......
spec/lib/gitlab/metrics/samplers/ruby_sampler_spec.rb 0 → 100644
View file @ bff9e896
require 'spec_helper'
describe Gitlab::Metrics::Samplers::RubySampler do
let(:sampler) { described_class.new(5) }
after do
Allocations.stop if Gitlab::Metrics.mri?
end
describe '#sample' do
it 'samples various statistics' do
expect(Gitlab::Metrics::System).to receive(:memory_usage)
expect(Gitlab::Metrics::System).to receive(:file_descriptor_count)
expect(sampler).to receive(:sample_objects)
expect(sampler).to receive(:sample_gc)
sampler.sample
end
it 'adds a metric containing the memory usage' do
expect(Gitlab::Metrics::System).to receive(:memory_usage)
.and_return(9000)
expect(sampler.metrics[:memory_usage]).to receive(:set)
.with({}, 9000)
.and_call_original
sampler.sample
end
it 'adds a metric containing the amount of open file descriptors' do
expect(Gitlab::Metrics::System).to receive(:file_descriptor_count)
.and_return(4)
expect(sampler.metrics[:file_descriptors]).to receive(:set)
.with({}, 4)
.and_call_original
sampler.sample
end
it 'clears any GC profiles' do
expect(GC::Profiler).to receive(:clear)
sampler.sample
end
end
describe '#sample_gc' do
it 'adds a metric containing garbage collection time statistics' do
expect(GC::Profiler).to receive(:total_time).and_return(0.24)
expect(sampler.metrics[:total_time]).to receive(:set)
.with({}, 240)
.and_call_original
sampler.sample
end
it 'adds a metric containing garbage collection statistics' do
GC.stat.keys.each do |key|
expect(sampler.metrics[key]).to receive(:set).with({}, anything).and_call_original
end
sampler.sample
end
end
if Gitlab::Metrics.mri?
describe '#sample_objects' do
it 'adds a metric containing the amount of allocated objects' do
expect(sampler.metrics[:objects_total]).to receive(:set)
.with(include(class: anything), be > 0)
.at_least(:once)
.and_call_original
sampler.sample
end
it 'ignores classes without a name' do
expect(Allocations).to receive(:to_hash).and_return({ Class.new => 4 })
expect(sampler.metrics[:objects_total]).not_to receive(:set)
.with(include(class: 'object_counts'), anything)
sampler.sample
end
end
end
end
spec/lib/gitlab/metrics/unicorn_sampler_spec.rb → spec/lib/gitlab/metrics/samplers/unicorn_sampler_spec.rb
View file @ bff9e896
require 'spec_helper' require 'spec_helper'
describe Gitlab::Metrics::UnicornSampler do describe Gitlab::Metrics::Samplers::UnicornSampler do
subject { described_class.new(1.second) } subject { described_class.new(1.second) }
describe '#sample' do describe '#sample' do
......
spec/lib/gitlab/metrics/sidekiq_middleware_spec.rb
View file @ bff9e896
...@@ -5,8 +5,8 @@ describe Gitlab::Metrics::SidekiqMiddleware do ...@@ -5,8 +5,8 @@ describe Gitlab::Metrics::SidekiqMiddleware do
let(:message) { { 'args' => ['test'], 'enqueued_at' => Time.new(2016, 6, 23, 6, 59).to_f } } let(:message) { { 'args' => ['test'], 'enqueued_at' => Time.new(2016, 6, 23, 6, 59).to_f } }
def run(worker, message) def run(worker, message)
expect(Gitlab::Metrics::Transaction).to receive(:new) expect(Gitlab::Metrics::BackgroundTransaction).to receive(:new)
.with('TestWorker#perform') .with(worker.class)
.and_call_original .and_call_original
expect_any_instance_of(Gitlab::Metrics::Transaction).to receive(:set) expect_any_instance_of(Gitlab::Metrics::Transaction).to receive(:set)
...@@ -18,21 +18,18 @@ describe Gitlab::Metrics::SidekiqMiddleware do ...@@ -18,21 +18,18 @@ describe Gitlab::Metrics::SidekiqMiddleware do
end end
describe '#call' do describe '#call' do
it 'tracks the transaction' do let(:test_worker_class) { double(:class, name: 'TestWorker') }
worker = double(:worker, class: double(:class, name: 'TestWorker')) let(:worker) { double(:worker, class: test_worker_class) }
it 'tracks the transaction' do
run(worker, message) run(worker, message)
end end
it 'tracks the transaction (for messages without `enqueued_at`)' do it 'tracks the transaction (for messages without `enqueued_at`)' do
worker = double(:worker, class: double(:class, name: 'TestWorker'))
run(worker, {}) run(worker, {})
end end
it 'tracks any raised exceptions' do it 'tracks any raised exceptions' do
worker = double(:worker, class: double(:class, name: 'TestWorker'))
expect_any_instance_of(Gitlab::Metrics::Transaction) expect_any_instance_of(Gitlab::Metrics::Transaction)
.to receive(:run).and_raise(RuntimeError) .to receive(:run).and_raise(RuntimeError)
...@@ -45,18 +42,5 @@ describe Gitlab::Metrics::SidekiqMiddleware do ...@@ -45,18 +42,5 @@ describe Gitlab::Metrics::SidekiqMiddleware do
expect { middleware.call(worker, message, :test) } expect { middleware.call(worker, message, :test) }
.to raise_error(RuntimeError) .to raise_error(RuntimeError)
end end
it 'tags the metrics accordingly' do
tags = { one: 1, two: 2 }
worker = double(:worker, class: double(:class, name: 'TestWorker'))
allow(worker).to receive(:metrics_tags).and_return(tags)
tags.each do |tag, value|
expect_any_instance_of(Gitlab::Metrics::Transaction).to receive(:add_tag)
.with(tag, value)
end
run(worker, message)
end
end end
end end
spec/lib/gitlab/metrics/subscribers/action_view_spec.rb
View file @ bff9e896
require 'spec_helper' require 'spec_helper'
describe Gitlab::Metrics::Subscribers::ActionView do describe Gitlab::Metrics::Subscribers::ActionView do
let(:transaction) { Gitlab::Metrics::Transaction.new } let(:env) { {} }
let(:transaction) { Gitlab::Metrics::WebTransaction.new(env) }
let(:subscriber) { described_class.new } let(:subscriber) { described_class.new }
...@@ -29,5 +30,13 @@ describe Gitlab::Metrics::Subscribers::ActionView do ...@@ -29,5 +30,13 @@ describe Gitlab::Metrics::Subscribers::ActionView do
subscriber.render_template(event) subscriber.render_template(event)
end end
it 'observes view rendering time' do
expect(subscriber.send(:metric_view_rendering_duration_seconds))
.to receive(:observe)
.with({ view: 'app/views/x.html.haml' }, 2.1)
subscriber.render_template(event)
end
end end
end end
spec/lib/gitlab/metrics/subscribers/active_record_spec.rb
View file @ bff9e896
require 'spec_helper' require 'spec_helper'
describe Gitlab::Metrics::Subscribers::ActiveRecord do describe Gitlab::Metrics::Subscribers::ActiveRecord do
let(:transaction) { Gitlab::Metrics::Transaction.new } let(:env) { {} }
let(:transaction) { Gitlab::Metrics::WebTransaction.new(env) }
let(:subscriber) { described_class.new } let(:subscriber) { described_class.new }
let(:event) do let(:event) do
double(:event, duration: 0.2, double(:event, duration: 2,
payload: { sql: 'SELECT * FROM users WHERE id = 10' }) payload: { sql: 'SELECT * FROM users WHERE id = 10' })
end end
...@@ -20,16 +21,24 @@ describe Gitlab::Metrics::Subscribers::ActiveRecord do ...@@ -20,16 +21,24 @@ describe Gitlab::Metrics::Subscribers::ActiveRecord do
end end
describe 'with a current transaction' do describe 'with a current transaction' do
it 'observes sql_duration metric' do
expect(subscriber).to receive(:current_transaction)
.at_least(:once)
.and_return(transaction)
expect(subscriber.send(:metric_sql_duration_seconds)).to receive(:observe).with({}, 0.002)
subscriber.sql(event)
end
it 'increments the :sql_duration value' do it 'increments the :sql_duration value' do
expect(subscriber).to receive(:current_transaction) expect(subscriber).to receive(:current_transaction)
.at_least(:once) .at_least(:once)
.and_return(transaction) .and_return(transaction)
expect(transaction).to receive(:increment) expect(transaction).to receive(:increment)
.with(:sql_duration, 0.2) .with(:sql_duration, 2, false)
expect(transaction).to receive(:increment) expect(transaction).to receive(:increment)
.with(:sql_count, 1) .with(:sql_count, 1, false)
subscriber.sql(event) subscriber.sql(event)
end end
......
spec/lib/gitlab/metrics/subscribers/rails_cache_spec.rb
View file @ bff9e896
require 'spec_helper' require 'spec_helper'
describe Gitlab::Metrics::Subscribers::RailsCache do describe Gitlab::Metrics::Subscribers::RailsCache do
let(:transaction) { Gitlab::Metrics::Transaction.new } let(:env) { {} }
let(:transaction) { Gitlab::Metrics::WebTransaction.new(env) }
let(:subscriber) { described_class.new } let(:subscriber) { described_class.new }
let(:event) { double(:event, duration: 15.2) } let(:event) { double(:event, duration: 15.2) }
describe '#cache_read' do describe '#cache_read' do
it 'increments the cache_read duration' do it 'increments the cache_read duration' do
expect(subscriber).to receive(:increment) expect(subscriber).to receive(:observe)
.with(:cache_read, event.duration) .with(:read, event.duration)
subscriber.cache_read(event) subscriber.cache_read(event)
end end
...@@ -25,7 +26,7 @@ describe Gitlab::Metrics::Subscribers::RailsCache do ...@@ -25,7 +26,7 @@ describe Gitlab::Metrics::Subscribers::RailsCache do
it 'increments the cache_read_hit count' do it 'increments the cache_read_hit count' do
expect(transaction).to receive(:increment) expect(transaction).to receive(:increment)
.with(:cache_read_hit_count, 1) .with(:cache_read_hit_count, 1, false)
expect(transaction).to receive(:increment) expect(transaction).to receive(:increment)
.with(any_args).at_least(1) # Other calls .with(any_args).at_least(1) # Other calls
...@@ -49,13 +50,19 @@ describe Gitlab::Metrics::Subscribers::RailsCache do ...@@ -49,13 +50,19 @@ describe Gitlab::Metrics::Subscribers::RailsCache do
it 'increments the cache_read_miss count' do it 'increments the cache_read_miss count' do
expect(transaction).to receive(:increment) expect(transaction).to receive(:increment)
.with(:cache_read_miss_count, 1) .with(:cache_read_miss_count, 1, false)
expect(transaction).to receive(:increment) expect(transaction).to receive(:increment)
.with(any_args).at_least(1) # Other calls .with(any_args).at_least(1) # Other calls
subscriber.cache_read(event) subscriber.cache_read(event)
end end
it 'increments the cache_read_miss total' do
expect(subscriber.send(:metric_cache_misses_total)).to receive(:increment).with({})
subscriber.cache_read(event)
end
context 'when super operation is fetch' do context 'when super operation is fetch' do
let(:event) { double(:event, duration: 15.2, payload: { hit: false, super_operation: :fetch }) } let(:event) { double(:event, duration: 15.2, payload: { hit: false, super_operation: :fetch }) }
...@@ -65,33 +72,39 @@ describe Gitlab::Metrics::Subscribers::RailsCache do ...@@ -65,33 +72,39 @@ describe Gitlab::Metrics::Subscribers::RailsCache do
subscriber.cache_read(event) subscriber.cache_read(event)
end end
it 'does not increment cache_read_miss total' do
expect(subscriber.send(:metric_cache_misses_total)).not_to receive(:increment).with({})
subscriber.cache_read(event)
end
end end
end end
end end
end end
describe '#cache_write' do describe '#cache_write' do
it 'increments the cache_write duration' do it 'observes write duration' do
expect(subscriber).to receive(:increment) expect(subscriber).to receive(:observe)
.with(:cache_write, event.duration) .with(:write, event.duration)
subscriber.cache_write(event) subscriber.cache_write(event)
end end
end end
describe '#cache_delete' do describe '#cache_delete' do
it 'increments the cache_delete duration' do it 'observes delete duration' do
expect(subscriber).to receive(:increment) expect(subscriber).to receive(:observe)
.with(:cache_delete, event.duration) .with(:delete, event.duration)
subscriber.cache_delete(event) subscriber.cache_delete(event)
end end
end end
describe '#cache_exist?' do describe '#cache_exist?' do
it 'increments the cache_exists duration' do it 'observes the exists duration' do
expect(subscriber).to receive(:increment) expect(subscriber).to receive(:observe)
.with(:cache_exists, event.duration) .with(:exists, event.duration)
subscriber.cache_exist?(event) subscriber.cache_exist?(event)
end end
...@@ -142,15 +155,21 @@ describe Gitlab::Metrics::Subscribers::RailsCache do ...@@ -142,15 +155,21 @@ describe Gitlab::Metrics::Subscribers::RailsCache do
subscriber.cache_generate(event) subscriber.cache_generate(event)
end end
it 'increments the cache_read_miss total' do
expect(subscriber.send(:metric_cache_misses_total)).to receive(:increment).with({})
subscriber.cache_generate(event)
end
end end
end end
describe '#increment' do describe '#observe' do
context 'without a transaction' do context 'without a transaction' do
it 'returns' do it 'returns' do
expect(transaction).not_to receive(:increment) expect(transaction).not_to receive(:increment)
subscriber.increment(:foo, 15.2) subscriber.observe(:foo, 15.2)
end end
end end
...@@ -162,18 +181,26 @@ describe Gitlab::Metrics::Subscribers::RailsCache do ...@@ -162,18 +181,26 @@ describe Gitlab::Metrics::Subscribers::RailsCache do
it 'increments the total and specific cache duration' do it 'increments the total and specific cache duration' do
expect(transaction).to receive(:increment) expect(transaction).to receive(:increment)
.with(:cache_duration, event.duration) .with(:cache_duration, event.duration, false)
expect(transaction).to receive(:increment) expect(transaction).to receive(:increment)
.with(:cache_count, 1) .with(:cache_count, 1, false)
expect(transaction).to receive(:increment) expect(transaction).to receive(:increment)
.with(:cache_delete_duration, event.duration) .with(:cache_delete_duration, event.duration, false)
expect(transaction).to receive(:increment) expect(transaction).to receive(:increment)
.with(:cache_delete_count, 1) .with(:cache_delete_count, 1, false)
subscriber.observe(:delete, event.duration)
end
it 'observes cache metric' do
expect(subscriber.send(:metric_cache_operation_duration_seconds))
.to receive(:observe)
.with(transaction.labels.merge(operation: :delete), event.duration / 1000.0)
subscriber.increment(:cache_delete, event.duration) subscriber.observe(:delete, event.duration)
end end
end end
end end
......
spec/lib/gitlab/metrics/transaction_spec.rb → spec/lib/gitlab/metrics/web_transaction_spec.rb
View file @ bff9e896
require 'spec_helper' require 'spec_helper'
describe Gitlab::Metrics::Transaction do describe Gitlab::Metrics::WebTransaction do
let(:transaction) { described_class.new } let(:env) { {} }
let(:transaction) { described_class.new(env) }
describe '#duration' do describe '#duration' do
it 'returns the duration of a transaction in seconds' do it 'returns the duration of a transaction in seconds' do
...@@ -48,7 +49,7 @@ describe Gitlab::Metrics::Transaction do ...@@ -48,7 +49,7 @@ describe Gitlab::Metrics::Transaction do
describe '#method_call_for' do describe '#method_call_for' do
it 'returns a MethodCall' do it 'returns a MethodCall' do
method = transaction.method_call_for('Foo#bar') method = transaction.method_call_for('Foo#bar', :Foo, '#bar')
expect(method).to be_an_instance_of(Gitlab::Metrics::MethodCall) expect(method).to be_an_instance_of(Gitlab::Metrics::MethodCall)
end end
...@@ -85,14 +86,6 @@ describe Gitlab::Metrics::Transaction do ...@@ -85,14 +86,6 @@ describe Gitlab::Metrics::Transaction do
end end
end end
describe '#add_tag' do
it 'adds a tag' do
transaction.add_tag(:foo, 'bar')
expect(transaction.tags).to eq({ foo: 'bar' })
end
end
describe '#finish' do describe '#finish' do
it 'tracks the transaction details and submits them to Sidekiq' do it 'tracks the transaction details and submits them to Sidekiq' do
expect(transaction).to receive(:track_self) expect(transaction).to receive(:track_self)
...@@ -127,7 +120,7 @@ describe Gitlab::Metrics::Transaction do ...@@ -127,7 +120,7 @@ describe Gitlab::Metrics::Transaction do
end end
it 'adds the action as a tag for every metric' do it 'adds the action as a tag for every metric' do
transaction.action = 'Foo#bar' allow(transaction).to receive(:labels).and_return(controller: 'Foo', action: 'bar')
transaction.track_self transaction.track_self
hash = { hash = {
...@@ -144,7 +137,8 @@ describe Gitlab::Metrics::Transaction do ...@@ -144,7 +137,8 @@ describe Gitlab::Metrics::Transaction do
end end
it 'does not add an action tag for events' do it 'does not add an action tag for events' do
transaction.action = 'Foo#bar' allow(transaction).to receive(:labels).and_return(controller: 'Foo', action: 'bar')
transaction.add_event(:meow) transaction.add_event(:meow)
hash = { hash = {
...@@ -185,6 +179,61 @@ describe Gitlab::Metrics::Transaction do ...@@ -185,6 +179,61 @@ describe Gitlab::Metrics::Transaction do
end end
end end
describe '#labels' do
context 'when request goes to Grape endpoint' do
before do
route = double(:route, request_method: 'GET', path: '/:version/projects/:id/archive(.:format)')
endpoint = double(:endpoint, route: route)
env['api.endpoint'] = endpoint
end
it 'provides labels with the method and path of the route in the grape endpoint' do
expect(transaction.labels).to eq({ controller: 'Grape', action: 'GET /projects/:id/archive' })
expect(transaction.action).to eq('Grape#GET /projects/:id/archive')
end
it 'does not provide labels if route infos are missing' do
endpoint = double(:endpoint)
allow(endpoint).to receive(:route).and_raise
env['api.endpoint'] = endpoint
expect(transaction.labels).to eq({})
expect(transaction.action).to be_nil
end
end
context 'when request goes to ActionController' do
let(:content_type) { 'text/html' }
before do
klass = double(:klass, name: 'TestController')
controller = double(:controller, class: klass, action_name: 'show', content_type: content_type)
env['action_controller.instance'] = controller
end
it 'tags a transaction with the name and action of a controller' do
expect(transaction.labels).to eq({ controller: 'TestController', action: 'show' })
expect(transaction.action).to eq('TestController#show')
end
context 'when the response content type is not :html' do
let(:content_type) { 'application/json' }
it 'appends the mime type to the transaction action' do
expect(transaction.labels).to eq({ controller: 'TestController', action: 'show.json' })
expect(transaction.action).to eq('TestController#show.json')
end
end
end
it 'returns no labels when no route information is present in env' do
expect(transaction.labels).to eq({})
expect(transaction.action).to eq(nil)
end
end
describe '#add_event' do describe '#add_event' do
it 'adds a metric' do it 'adds a metric' do
transaction.add_event(:meow) transaction.add_event(:meow)
......
spec/lib/gitlab/metrics_spec.rb
View file @ bff9e896
...@@ -115,7 +115,7 @@ describe Gitlab::Metrics do ...@@ -115,7 +115,7 @@ describe Gitlab::Metrics do
end end
context 'with a transaction' do context 'with a transaction' do
let(:transaction) { Gitlab::Metrics::Transaction.new } let(:transaction) { Gitlab::Metrics::WebTransaction.new({}) }
before do before do
allow(described_class).to receive(:current_transaction) allow(described_class).to receive(:current_transaction)
...@@ -124,13 +124,13 @@ describe Gitlab::Metrics do ...@@ -124,13 +124,13 @@ describe Gitlab::Metrics do
it 'adds a metric to the current transaction' do it 'adds a metric to the current transaction' do
expect(transaction).to receive(:increment) expect(transaction).to receive(:increment)
.with('foo_real_time', a_kind_of(Numeric)) .with('foo_real_time', a_kind_of(Numeric), false)
expect(transaction).to receive(:increment) expect(transaction).to receive(:increment)
.with('foo_cpu_time', a_kind_of(Numeric)) .with('foo_cpu_time', a_kind_of(Numeric), false)
expect(transaction).to receive(:increment) expect(transaction).to receive(:increment)
.with('foo_call_count', 1) .with('foo_call_count', 1, false)
described_class.measure(:foo) { 10 } described_class.measure(:foo) { 10 }
end end
...@@ -143,31 +143,6 @@ describe Gitlab::Metrics do ...@@ -143,31 +143,6 @@ describe Gitlab::Metrics do
end end
end end
describe '.tag_transaction' do
context 'without a transaction' do
it 'does nothing' do
expect_any_instance_of(Gitlab::Metrics::Transaction)
.not_to receive(:add_tag)
described_class.tag_transaction(:foo, 'bar')
end
end
context 'with a transaction' do
let(:transaction) { Gitlab::Metrics::Transaction.new }
it 'adds the tag to the transaction' do
expect(described_class).to receive(:current_transaction)
.and_return(transaction)
expect(transaction).to receive(:add_tag)
.with(:foo, 'bar')
described_class.tag_transaction(:foo, 'bar')
end
end
end
describe '.action=' do describe '.action=' do
context 'without a transaction' do context 'without a transaction' do
it 'does nothing' do it 'does nothing' do
...@@ -180,7 +155,7 @@ describe Gitlab::Metrics do ...@@ -180,7 +155,7 @@ describe Gitlab::Metrics do
context 'with a transaction' do context 'with a transaction' do
it 'sets the action of a transaction' do it 'sets the action of a transaction' do
trans = Gitlab::Metrics::Transaction.new trans = Gitlab::Metrics::WebTransaction.new({})
expect(described_class).to receive(:current_transaction) expect(described_class).to receive(:current_transaction)
.and_return(trans) .and_return(trans)
...@@ -210,7 +185,7 @@ describe Gitlab::Metrics do ...@@ -210,7 +185,7 @@ describe Gitlab::Metrics do
context 'with a transaction' do context 'with a transaction' do
it 'adds an event' do it 'adds an event' do
transaction = Gitlab::Metrics::Transaction.new transaction = Gitlab::Metrics::WebTransaction.new({})
expect(transaction).to receive(:add_event).with(:meow) expect(transaction).to receive(:add_event).with(:meow)
...@@ -224,7 +199,7 @@ describe Gitlab::Metrics do ...@@ -224,7 +199,7 @@ describe Gitlab::Metrics do
shared_examples 'prometheus metrics API' do shared_examples 'prometheus metrics API' do
describe '#counter' do describe '#counter' do
subject { described_class.counter(:couter, 'doc') } subject { described_class.counter(:counter, 'doc') }
describe '#increment' do describe '#increment' do
it 'successfully calls #increment without arguments' do it 'successfully calls #increment without arguments' do
...@@ -280,7 +255,7 @@ describe Gitlab::Metrics do ...@@ -280,7 +255,7 @@ describe Gitlab::Metrics do
it_behaves_like 'prometheus metrics API' it_behaves_like 'prometheus metrics API'
describe '#null_metric' do describe '#null_metric' do
subject { described_class.provide_metric(:test) } subject { described_class.send(:provide_metric, :test) }
it { is_expected.to be_a(Gitlab::Metrics::NullMetric) } it { is_expected.to be_a(Gitlab::Metrics::NullMetric) }
end end
...@@ -321,7 +296,7 @@ describe Gitlab::Metrics do ...@@ -321,7 +296,7 @@ describe Gitlab::Metrics do
it_behaves_like 'prometheus metrics API' it_behaves_like 'prometheus metrics API'
describe '#null_metric' do describe '#null_metric' do
subject { described_class.provide_metric(:test) } subject { described_class.send(:provide_metric, :test) }
it { is_expected.to be_nil } it { is_expected.to be_nil }
end end
......
spec/lib/gitlab/middleware/rails_queue_duration_spec.rb
View file @ bff9e896
...@@ -4,7 +4,7 @@ describe Gitlab::Middleware::RailsQueueDuration do ...@@ -4,7 +4,7 @@ describe Gitlab::Middleware::RailsQueueDuration do
let(:app) { double(:app) } let(:app) { double(:app) }
let(:middleware) { described_class.new(app) } let(:middleware) { described_class.new(app) }
let(:env) { {} } let(:env) { {} }
let(:transaction) { double(:transaction) } let(:transaction) { Gitlab::Metrics::WebTransaction.new(env) }
before do before do
expect(app).to receive(:call).with(env).and_return('yay') expect(app).to receive(:call).with(env).and_return('yay')
...@@ -30,6 +30,16 @@ describe Gitlab::Middleware::RailsQueueDuration do ...@@ -30,6 +30,16 @@ describe Gitlab::Middleware::RailsQueueDuration do
expect(transaction).to receive(:set).with(:rails_queue_duration, an_instance_of(Float)) expect(transaction).to receive(:set).with(:rails_queue_duration, an_instance_of(Float))
expect(middleware.call(env)).to eq('yay') expect(middleware.call(env)).to eq('yay')
end end
it 'observes rails queue duration metrics and calls the app when the header is present' do
env['HTTP_GITLAB_WORKHORSE_PROXY_START'] = '2000000000'
expect(middleware.send(:metric_rails_queue_duration_seconds)).to receive(:observe).with(transaction.labels, 1)
Timecop.freeze(Time.at(3)) do
expect(middleware.call(env)).to eq('yay')
end
end
end end
end end
end end
spec/services/geo/metrics_update_service_spec.rb
View file @ bff9e896
...@@ -46,10 +46,10 @@ describe Geo::MetricsUpdateService, :geo do ...@@ -46,10 +46,10 @@ describe Geo::MetricsUpdateService, :geo do
it 'attempts to retrieve metrics from all nodes' do it 'attempts to retrieve metrics from all nodes' do
subject.execute subject.execute
expect(Gitlab::Metrics.provide_metric(:geo_db_replication_lag_seconds).values.count).to eq(2) expect(Gitlab::Metrics.registry.get(:geo_db_replication_lag_seconds).values.count).to eq(2)
expect(Gitlab::Metrics.provide_metric(:geo_repositories).values.count).to eq(2) expect(Gitlab::Metrics.registry.get(:geo_repositories).values.count).to eq(2)
expect(Gitlab::Metrics.provide_metric(:geo_repositories).get({ url: secondary.url })).to eq(10) expect(Gitlab::Metrics.registry.get(:geo_repositories).get({ url: secondary.url })).to eq(10)
expect(Gitlab::Metrics.provide_metric(:geo_repositories).get({ url: secondary.url })).to eq(10) expect(Gitlab::Metrics.registry.get(:geo_repositories).get({ url: secondary.url })).to eq(10)
end end
end end
...@@ -92,7 +92,7 @@ describe Geo::MetricsUpdateService, :geo do ...@@ -92,7 +92,7 @@ describe Geo::MetricsUpdateService, :geo do
end end
def metric_value(metric_name) def metric_value(metric_name)
Gitlab::Metrics.provide_metric(metric_name).get({ url: secondary.url }) Gitlab::Metrics.registry.get(metric_name).get({ url: secondary.url })
end end
end end
end end
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment
GitLab Nexedi Edition | About GitLab | About Nexedi | 沪ICP备2021021310号-2 | 沪ICP备2021021310号-7