diff options
author | GitLab Bot <gitlab-bot@gitlab.com> | 2021-08-19 12:08:42 +0300 |
---|---|---|
committer | GitLab Bot <gitlab-bot@gitlab.com> | 2021-08-19 12:08:42 +0300 |
commit | b76ae638462ab0f673e5915986070518dd3f9ad3 (patch) | |
tree | bdab0533383b52873be0ec0eb4d3c66598ff8b91 /lib/gitlab/usage_data_queries.rb | |
parent | 434373eabe7b4be9593d18a585fb763f1e5f1a6f (diff) |
Add latest changes from gitlab-org/gitlab@14-2-stable-eev14.2.0-rc42
Diffstat (limited to 'lib/gitlab/usage_data_queries.rb')
-rw-r--r-- | lib/gitlab/usage_data_queries.rb | 16 |
1 files changed, 16 insertions, 0 deletions
diff --git a/lib/gitlab/usage_data_queries.rb b/lib/gitlab/usage_data_queries.rb index 63e6cf03d1f..f64da2fbf13 100644 --- a/lib/gitlab/usage_data_queries.rb +++ b/lib/gitlab/usage_data_queries.rb @@ -5,6 +5,16 @@ module Gitlab # See https://gitlab.com/gitlab-org/gitlab/-/merge_requests/41091 class UsageDataQueries < UsageData class << self + def uncached_data + super.with_indifferent_access.deep_merge(instrumentation_metrics_queries.with_indifferent_access) + end + + def add_metric(metric, time_frame: 'none') + metric_class = "Gitlab::Usage::Metrics::Instrumentations::#{metric}".constantize + + metric_class.new(time_frame: time_frame).instrumentation + end + def count(relation, column = nil, *args, **kwargs) Gitlab::Usage::Metrics::Query.for(:count, relation, column) end @@ -58,6 +68,12 @@ module Gitlab def epics_deepest_relationship_level { epics_deepest_relationship_level: 0 } end + + private + + def instrumentation_metrics_queries + ::Gitlab::Usage::Metric.all.map(&:with_instrumentation).reduce({}, :deep_merge) + end end end end |