summaryrefslogtreecommitdiff
path: root/lib/gitlab/usage
diff options
context:
space:
mode:
Diffstat (limited to 'lib/gitlab/usage')
-rw-r--r--lib/gitlab/usage/metrics/instrumentations/distinct_count_projects_with_expiration_policy_metric.rb6
1 files changed, 5 insertions, 1 deletions
diff --git a/lib/gitlab/usage/metrics/instrumentations/distinct_count_projects_with_expiration_policy_metric.rb b/lib/gitlab/usage/metrics/instrumentations/distinct_count_projects_with_expiration_policy_metric.rb
index 8811dec49d8..c7cf6c57059 100644
--- a/lib/gitlab/usage/metrics/instrumentations/distinct_count_projects_with_expiration_policy_metric.rb
+++ b/lib/gitlab/usage/metrics/instrumentations/distinct_count_projects_with_expiration_policy_metric.rb
@@ -12,7 +12,11 @@ module Gitlab
cache_start_and_finish_as :project_id
- relation ->(options) { ::ContainerExpirationPolicy.where(enabled: options[:enabled]) }
+ relation ->(options) do
+ options.each_with_object(::ContainerExpirationPolicy.all) do |(key, value), ar_relation|
+ ar_relation.where!(key => value)
+ end
+ end
end
end
end