Merge branch '299289-improve-metrics-generator-to-pre-fill-value_type-attribute' into 'master'

Improve metrics generator to pre-fill value_type attribute

See merge request gitlab-org/gitlab!53870

generator_templates/usage_metric_definition/metric_definition.yml

 # See Usage Ping metrics dictionary docs https://docs.gitlab.com/ee/development/usage_ping/metrics_dictionary.html
 key_path: <%= key_path %>
-value_type:
+description:
+product_section:
+product_stage:
+product_group:
 product_category:
-stage:
-status:
+value_type: <%= value_type %>
+status: implemented
 milestone:
 introduced_by_url:
-group:
 time_frame: <%= time_frame %>
 data_source:
 distribution: <%= distribution %>
-# tier: ['free', 'starter', 'premium', 'ultimate', 'bronze', 'silver', 'gold']
+# tier: ['free', 'premium', 'ultimate']
 tier:

lib/generators/gitlab/usage_metric_definition_generator.rb

@@ -4,18 +4,18 @@ require 'rails/generators'
 
 module Gitlab
   class UsageMetricDefinitionGenerator < Rails::Generators::Base
-    Directory = Struct.new(:name, :time_frame) do
+    Directory = Struct.new(:name, :time_frame, :value_type) do
       def match?(str)
         (name == str || time_frame == str) && str != 'none'
       end
     end
 
     TIME_FRAME_DIRS = [
-      Directory.new('counts_7d',  '7d'),
-      Directory.new('counts_28d', '28d'),
-      Directory.new('counts_all', 'all'),
-      Directory.new('settings',   'none'),
-      Directory.new('license',    'none')
+      Directory.new('counts_7d',  '7d',   'number'),
+      Directory.new('counts_28d', '28d',  'number'),
+      Directory.new('counts_all', 'all',  'number'),
+      Directory.new('settings',   'none', 'boolean'),
+      Directory.new('license',    'none', 'string')
     ].freeze
 
     VALID_INPUT_DIRS = (TIME_FRAME_DIRS.flat_map { |d| [d.name, d.time_frame] } - %w(none)).freeze
@@ -40,6 +40,10 @@ module Gitlab
       directory&.time_frame
     end
 
+    def value_type
+      directory&.value_type
+    end
+
     def distribution
       value = ['ce']
       value << 'ee' if ee?