Skip to content
Snippets Groups Projects

Change Sidekiq testing mode to `fake` instead of `inline`

Merged Rémy Coutable requested to merge ee-22992-default-sidekiq-to-fake-mode-in-test-env into master
All threads resolved!
Compare and Show latest version
12 files
+ 81
24
Compare changes
  • Side-by-side
  • Inline
Files
12
@@ -33,7 +33,7 @@ module Routable
#
# Returns a single object, or nil.
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)
# Case sensitive match first (it's cheaper and the usual case)
@@ -61,7 +61,7 @@ def find_by_full_path(path, follow_redirects: false)
def where_full_path_in(paths)
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|
"(LOWER(routes.path) = LOWER(#{connection.quote(path)}))"
@@ -71,12 +71,8 @@ def where_full_path_in(paths)
end
# Temporary instrumentation of method calls
def increment_counter(counter, description)
@counters[counter] ||= Gitlab::Metrics.counter(counter, description)
@counters[counter].increment
rescue
# ignore the error
def routable_calls_counter
@routable_calls_counter ||= Gitlab::Metrics.counter(:gitlab_routable_calls_total, 'Number of calls to Routable by method')
end
end
Loading