Commit 845cae6d authored by Rajendra Kadam's avatar Rajendra Kadam

Use shorter folder name to match exclusion regex

Fix spec
parent 7d843f52
...@@ -11,7 +11,7 @@ module EE ...@@ -11,7 +11,7 @@ module EE
override :paths override :paths
def paths def paths
@ee_paths ||= [Rails.root.join('ee', 'config', 'metrics', '[^aggregates]*', '*.yml')] + super @ee_paths ||= [Rails.root.join('ee', 'config', 'metrics', '[^agg]*', '*.yml')] + super
end end
end end
end end
......
...@@ -56,7 +56,7 @@ module Gitlab ...@@ -56,7 +56,7 @@ module Gitlab
class << self class << self
def paths def paths
@paths ||= [Rails.root.join('config', 'metrics', '[^aggregates]*', '*.yml')] @paths ||= [Rails.root.join('config', 'metrics', '[^agg]*', '*.yml')]
end end
def definitions(skip_validation: false) def definitions(skip_validation: false)
......
...@@ -5,7 +5,7 @@ require 'spec_helper' ...@@ -5,7 +5,7 @@ require 'spec_helper'
# If this spec fails, we need to add the new code review event to the correct aggregated metric # If this spec fails, we need to add the new code review event to the correct aggregated metric
RSpec.describe 'Code review events' do RSpec.describe 'Code review events' do
it 'the aggregated metrics contain all the code review metrics' do it 'the aggregated metrics contain all the code review metrics' do
path = Rails.root.join('lib/gitlab/usage_data_counters/aggregated_metrics/code_review.yml') path = Rails.root.join('config/metrics/aggregates/code_review.yml')
aggregated_events = YAML.safe_load(File.read(path), aliases: true)&.map(&:with_indifferent_access) aggregated_events = YAML.safe_load(File.read(path), aliases: true)&.map(&:with_indifferent_access)
code_review_aggregated_events = aggregated_events code_review_aggregated_events = aggregated_events
......
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