kotovalexarian-likes-gitlab/gitlab-org--gitlab-foss
1
0
Fork 0
Code Releases Activity

Merge branch 'bjk/routable_counter' into 'master'

Browse source 
Adjust routable metric

See merge request gitlab-org/gitlab-ce!32591
This commit is contained in:
Andreas Brandl 2019-09-05 10:00:30 +00:00
commit c099fa810f
1 changed files with 4 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

12
app/models/concerns/routable.rb
View file

@ -33,7 +33,7 @@ module Routable
# #
# Returns a single object, or nil. # Returns a single object, or nil.
def find_by_full_path(path, follow_redirects: false) def find_by_full_path(path, follow_redirects: false)
increment_counter(:routable_find_by_full_path, 'Number of calls to Routable.find_by_full_path') routable_calls_counter.increment(method: 'find_by_full_path')
if Feature.enabled?(:routable_two_step_lookup) if Feature.enabled?(:routable_two_step_lookup)
# Case sensitive match first (it's cheaper and the usual case) # Case sensitive match first (it's cheaper and the usual case)
@ -61,7 +61,7 @@ module Routable
def where_full_path_in(paths) def where_full_path_in(paths)
return none if paths.empty? return none if paths.empty?
increment_counter(:routable_where_full_path_in, 'Number of calls to Routable.where_full_path_in') routable_calls_counter.increment(method: 'where_full_path_in')
wheres = paths.map do |path| wheres = paths.map do |path|
"(LOWER(routes.path) = LOWER(#{connection.quote(path)}))" "(LOWER(routes.path) = LOWER(#{connection.quote(path)}))"
@ -71,12 +71,8 @@ module Routable
end end
# Temporary instrumentation of method calls # Temporary instrumentation of method calls
def increment_counter(counter, description) def routable_calls_counter
@counters[counter] ||= Gitlab::Metrics.counter(counter, description) @routable_calls_counter ||= Gitlab::Metrics.counter(:gitlab_routable_calls_total, 'Number of calls to Routable by method')
@counters[counter].increment
rescue
# ignore the error
end end
end end