Add latest changes from gitlab-org/gitlab@master

2 files changed, 47 insertions, 0 deletions

diff --git a/lib/gitlab/usage/metrics/instrumentations/merge_request_widget_extension_metric.rb b/lib/gitlab/usage/metrics/instrumentations/merge_request_widget_extension_metric.rb
new file mode 100644
index 00000000000..e2fdb3462c5
--- /dev/null
+++ b/lib/gitlab/usage/metrics/instrumentations/merge_request_widget_extension_metric.rb
@@ -0,0 +1,43 @@
+# frozen_string_literal: true
+
+module Gitlab
+  module Usage
+    module Metrics
+      module Instrumentations
+        # Usage example
+        #
+        # In metric YAML definition:
+        #
+        # instrumentation_class: MergeRequestWidgetExtensionMetric
+        # options:
+        #   event: expand
+        #   widget: terraform
+        #
+        class MergeRequestWidgetExtensionMetric < RedisMetric
+          extend ::Gitlab::Utils::Override
+
+          def validate_options!
+            raise ArgumentError, "'event' option is required" unless metric_event.present?
+            raise ArgumentError, "'widget' option is required" unless widget_name.present?
+          end
+
+          def widget_name
+            options[:widget]
+          end
+
+          override :prefix
+          def prefix
+            'i_code_review_merge_request_widget'
+          end
+
+          private
+
+          override :redis_key
+          def redis_key
+            "#{USAGE_PREFIX}#{prefix}_#{widget_name}_count_#{metric_event}".upcase
+          end
+        end
+      end
+    end
+  end
+end
diff --git a/lib/gitlab/usage/metrics/instrumentations/redis_metric.rb b/lib/gitlab/usage/metrics/instrumentations/redis_metric.rb
index 9cb91676b77..ae3326fa845 100644
--- a/lib/gitlab/usage/metrics/instrumentations/redis_metric.rb
+++ b/lib/gitlab/usage/metrics/instrumentations/redis_metric.rb
@@ -22,6 +22,10 @@ module Gitlab
           def initialize(metric_definition)
             super
 
+            validate_options!
+          end
+
+          def validate_options!
             raise ArgumentError, "'event' option is required" unless metric_event.present?
             raise ArgumentError, "'prefix' option is required" unless options.has_key?(OPTIONS_PREFIX_KEY)
           end