Add latest changes from gitlab-org/gitlab@master

2 files changed, 10 insertions, 6 deletions

diff --git a/lib/gitlab/usage/metrics/instrumentations/database_metric.rb b/lib/gitlab/usage/metrics/instrumentations/database_metric.rb
index 6dec0349a38..f0d5298870c 100644
--- a/lib/gitlab/usage/metrics/instrumentations/database_metric.rb
+++ b/lib/gitlab/usage/metrics/instrumentations/database_metric.rb
@@ -34,10 +34,10 @@ module Gitlab
               @metric_finish = block
             end
 
-            def relation(&block)
-              return @metric_relation&.call unless block
+            def relation(relation_proc = nil, &block)
+              return unless relation_proc || block
 
-              @metric_relation = block
+              @metric_relation = (relation_proc || block)
             end
 
             def metric_options(&block)
@@ -106,7 +106,11 @@ module Gitlab
           end
 
           def relation
-            self.class.metric_relation.call.where(time_constraints)
+            if self.class.metric_relation.arity == 1
+              self.class.metric_relation.call(options)
+            else
+              self.class.metric_relation.call
+            end.where(time_constraints)
           end
 
           def time_constraints
diff --git a/lib/gitlab/usage/metrics/instrumentations/distinct_count_projects_with_expiration_policy_disabled_metric.rb b/lib/gitlab/usage/metrics/instrumentations/distinct_count_projects_with_expiration_policy_metric.rb
index 0c421dc3311..8811dec49d8 100644
--- a/lib/gitlab/usage/metrics/instrumentations/distinct_count_projects_with_expiration_policy_disabled_metric.rb
+++ b/lib/gitlab/usage/metrics/instrumentations/distinct_count_projects_with_expiration_policy_metric.rb
@@ -4,7 +4,7 @@ module Gitlab
   module Usage
     module Metrics
       module Instrumentations
-        class DistinctCountProjectsWithExpirationPolicyDisabledMetric < DatabaseMetric
+        class DistinctCountProjectsWithExpirationPolicyMetric < DatabaseMetric
           operation :distinct_count, column: :project_id
 
           start { Project.minimum(:id) }
@@ -12,7 +12,7 @@ module Gitlab
 
           cache_start_and_finish_as :project_id
 
-          relation { ::ContainerExpirationPolicy.where(enabled: false) }
+          relation ->(options) { ::ContainerExpirationPolicy.where(enabled: options[:enabled]) }
         end
       end
     end