Skip to content

Commit

Permalink
fix job name usage in ignore
Browse files Browse the repository at this point in the history
  • Loading branch information
Mitch Hartweg committed Jan 6, 2025
1 parent c66dcd5 commit 5cd29e3
Showing 1 changed file with 9 additions and 7 deletions.
16 changes: 9 additions & 7 deletions lib/scout_apm/sampling.rb
Original file line number Diff line number Diff line change
Expand Up @@ -25,9 +25,9 @@ def ignore?(transaction)
# check if ignored _then_ sampled
if transaction.job?
job_name = transaction.layer_finder.job.name
return true if ignore_job?(transaction.job_name)
if sample_jobs.has_key?(transaction.job_name)
return true if sample?(sample_jobs[transaction.job_name])
return true if ignore_job?(job_name)
if sample_job?(job_name)
return true if sample?(sample_jobs[job_name])
end
elsif transaction.web?
uri = transaction.annotations[:uri]
Expand All @@ -41,7 +41,7 @@ def ignore?(transaction)
end

def individual_sample_to_hash(sampling_config)
return nil if sampling_config.empty?
return nil if sampling_config.blank?
# config looks like ['/foo:50','/bar:100']. parse it into hash of string: integer
sample_hash = {}
sampling_config.each do |sample|
Expand All @@ -53,28 +53,30 @@ def individual_sample_to_hash(sampling_config)
end

def create_uri_regex(prefixes)
return nil if prefixes.empty?
return nil if prefixes.blank?
regexes = Array(prefixes).
reject{|prefix| prefix == ""}.
map {|prefix| %r{\A#{prefix}} }
Regexp.union(*regexes)
end

def ignore_uri?(uri)
return false if ignore_uri_regex.nil?
!! ignore_uri_regex.match(uri)
end

def sample_uri?(uri)
return false if sample_uri_regex.nil?
!! sample_uri_regex.match(uri)
end

def ignore_job?(job_name)
return false if ignore_jobs.nil?
return false if ignore_jobs.blank?
ignore_jobs.include?(job_name)
end

def sample_job?(job_name)
return false if sample_jobs.nil?
return false if sample_jobs.blank?
sample_jobs.has_key?(job_name)
end

Expand Down

0 comments on commit 5cd29e3

Please sign in to comment.