Add latest changes from gitlab-org/gitlab@14-6-stable-eev14.6.0-rc42

3 files changed, 9 insertions, 4 deletions

diff --git a/lib/generators/gitlab/usage_metric_definition/redis_hll_generator.rb b/lib/generators/gitlab/usage_metric_definition/redis_hll_generator.rb
index e343e2dcf91..58d3257d07e 100644
--- a/lib/generators/gitlab/usage_metric_definition/redis_hll_generator.rb
+++ b/lib/generators/gitlab/usage_metric_definition/redis_hll_generator.rb
@@ -12,11 +12,11 @@ module Gitlab
       class_option :ee, type: :boolean, optional: true, default: false, desc: 'Indicates if metric is for ee'
 
       def create_metrics
-        weekly_params = ["#{key_path}_weekly", '--dir', '7d']
+        weekly_params = ["#{key_path}_weekly", '--dir', '7d', '--class_name', 'RedisHLLMetric']
         weekly_params << '--ee' if ee?
         Gitlab::UsageMetricDefinitionGenerator.start(weekly_params)
 
-        monthly_params = ["#{key_path}_monthly", '--dir', '28d']
+        monthly_params = ["#{key_path}_monthly", '--dir', '28d', '--class_name', 'RedisHLLMetric']
         monthly_params << '--ee' if ee?
         Gitlab::UsageMetricDefinitionGenerator.start(monthly_params)
       end
diff --git a/lib/generators/gitlab/usage_metric_definition_generator.rb b/lib/generators/gitlab/usage_metric_definition_generator.rb
index bd34ab0a16f..4ddbe8b9f09 100644
--- a/lib/generators/gitlab/usage_metric_definition_generator.rb
+++ b/lib/generators/gitlab/usage_metric_definition_generator.rb
@@ -35,6 +35,7 @@ module Gitlab
     class_option :ee, type: :boolean, optional: true, default: false, desc: 'Indicates if metric is for ee'
     class_option :dir,
       type: :string, desc: "Indicates the metric location. It must be one of: #{VALID_INPUT_DIRS.join(', ')}"
+    class_option :class_name, type: :string, optional: true, desc: 'Instrumentation class name, e.g.: CountIssues'
 
     argument :key_paths, type: :array, desc: 'Unique JSON key paths for the metrics'
 
@@ -66,6 +67,10 @@ module Gitlab
       Gitlab::VERSION.match('(\d+\.\d+)').captures.first
     end
 
+    def class_name
+      options[:class_name]
+    end
+
     private
 
     def metric_name_suggestion(key_path)
diff --git a/lib/generators/gitlab/usage_metric_generator.rb b/lib/generators/gitlab/usage_metric_generator.rb
index c0fdcf21f20..0656dfbc312 100644
--- a/lib/generators/gitlab/usage_metric_generator.rb
+++ b/lib/generators/gitlab/usage_metric_generator.rb
@@ -5,9 +5,9 @@ require 'rails/generators'
 module Gitlab
   class UsageMetricGenerator < Rails::Generators::Base
     CE_DIR = 'lib/gitlab/usage/metrics/instrumentations'
-    EE_DIR = 'ee/lib/ee/gitlab/usage/metrics/instrumentations'
+    EE_DIR = 'ee/lib/gitlab/usage/metrics/instrumentations'
     SPEC_CE_DIR = 'spec/lib/gitlab/usage/metrics/instrumentations'
-    SPEC_EE_DIR = 'ee/spec/lib/ee/gitlab/usage/metrics/instrumentations'
+    SPEC_EE_DIR = 'ee/spec/lib/gitlab/usage/metrics/instrumentations'
 
     ALLOWED_SUPERCLASSES = {
       generic: 'Generic',