Add latest changes from gitlab-org/gitlab@master

5 files changed, 78 insertions, 0 deletions

diff --git a/lib/gitlab/usage/metrics/instrumentations/count_ml_candidates_metric.rb b/lib/gitlab/usage/metrics/instrumentations/count_ml_candidates_metric.rb
new file mode 100644
index 00000000000..e6e547c155c
--- /dev/null
+++ b/lib/gitlab/usage/metrics/instrumentations/count_ml_candidates_metric.rb
@@ -0,0 +1,15 @@
+# frozen_string_literal: true
+
+module Gitlab
+  module Usage
+    module Metrics
+      module Instrumentations
+        class CountMlCandidatesMetric < DatabaseMetric
+          operation :count
+
+          relation { Ml::Candidate }
+        end
+      end
+    end
+  end
+end
diff --git a/lib/gitlab/usage/metrics/instrumentations/count_ml_experiments_metric.rb b/lib/gitlab/usage/metrics/instrumentations/count_ml_experiments_metric.rb
new file mode 100644
index 00000000000..3e589f28df1
--- /dev/null
+++ b/lib/gitlab/usage/metrics/instrumentations/count_ml_experiments_metric.rb
@@ -0,0 +1,15 @@
+# frozen_string_literal: true
+
+module Gitlab
+  module Usage
+    module Metrics
+      module Instrumentations
+        class CountMlExperimentsMetric < DatabaseMetric
+          operation :count
+
+          relation { Ml::Experiment }
+        end
+      end
+    end
+  end
+end
diff --git a/lib/gitlab/usage/metrics/instrumentations/count_projects_with_ml_candidates_metric.rb b/lib/gitlab/usage/metrics/instrumentations/count_projects_with_ml_candidates_metric.rb
new file mode 100644
index 00000000000..bf1f5534a70
--- /dev/null
+++ b/lib/gitlab/usage/metrics/instrumentations/count_projects_with_ml_candidates_metric.rb
@@ -0,0 +1,18 @@
+# frozen_string_literal: true
+
+module Gitlab
+  module Usage
+    module Metrics
+      module Instrumentations
+        class CountProjectsWithMlCandidatesMetric < DatabaseMetric
+          operation :distinct_count, column: 'ml_experiments.project_id'
+
+          relation do
+            Ml::Experiment.where('EXISTS (?)',
+              Ml::Candidate.where("\"ml_experiments\".\"id\" = \"ml_candidates\".\"experiment_id\"").select(1))
+          end
+        end
+      end
+    end
+  end
+end
diff --git a/lib/gitlab/usage/metrics/instrumentations/count_projects_with_ml_experiments_metric.rb b/lib/gitlab/usage/metrics/instrumentations/count_projects_with_ml_experiments_metric.rb
new file mode 100644
index 00000000000..d575163b6b5
--- /dev/null
+++ b/lib/gitlab/usage/metrics/instrumentations/count_projects_with_ml_experiments_metric.rb
@@ -0,0 +1,15 @@
+# frozen_string_literal: true
+
+module Gitlab
+  module Usage
+    module Metrics
+      module Instrumentations
+        class CountProjectsWithMlExperimentsMetric < DatabaseMetric
+          operation :distinct_count, column: :project_id
+
+          relation { Ml::Experiment }
+        end
+      end
+    end
+  end
+end
diff --git a/lib/gitlab/usage/metrics/instrumentations/count_users_with_ml_candidates_metric.rb b/lib/gitlab/usage/metrics/instrumentations/count_users_with_ml_candidates_metric.rb
new file mode 100644
index 00000000000..0ec7173e096
--- /dev/null
+++ b/lib/gitlab/usage/metrics/instrumentations/count_users_with_ml_candidates_metric.rb
@@ -0,0 +1,15 @@
+# frozen_string_literal: true
+
+module Gitlab
+  module Usage
+    module Metrics
+      module Instrumentations
+        class CountUsersWithMlCandidatesMetric < DatabaseMetric
+          operation :distinct_count, column: :user_id
+
+          relation { Ml::Candidate }
+        end
+      end
+    end
+  end
+end