Skip to content
代码片段 群组 项目
提交 dd3c09c1 编辑于 作者: Stan Hu's avatar Stan Hu
浏览文件

Merge branch 'fix-hll-events-path' into 'master'

Refactor hll event yml paths

See merge request gitlab-org/gitlab!47119
No related branches found
No related tags found
无相关合并请求
......@@ -15,9 +15,9 @@ module HLLRedisCounter
CategoryMismatch = Class.new(EventError)
UnknownAggregationOperator = Class.new(EventError)
KNOWN_EVENTS_PATH = 'lib/gitlab/usage_data_counters/known_events/*.yml'
KNOWN_EVENTS_PATH = File.expand_path('known_events/*.yml', __dir__)
ALLOWED_AGGREGATIONS = %i(daily weekly).freeze
AGGREGATED_METRICS_PATH = 'lib/gitlab/usage_data_counters/aggregated_metrics/*.yml'
AGGREGATED_METRICS_PATH = File.expand_path('aggregated_metrics/*.yml', __dir__)
ALLOWED_METRICS_AGGREGATIONS = %w[ANY].freeze
# Track event on entity_id
......@@ -156,7 +156,7 @@ def load_events(wildcard)
end
def load_yaml_from_path(path)
YAML.safe_load(File.read(Rails.root.join(path)))&.map(&:with_indifferent_access)
YAML.safe_load(File.read(path))&.map(&:with_indifferent_access)
end
def known_events_names
......
0% 加载中 .
You are about to add 0 people to the discussion. Proceed with caution.
先完成此消息的编辑!
想要评论请 注册