Add latest changes from gitlab-org/gitlab@master

2 files changed, 27 insertions, 5 deletions

diff --git a/lib/gitlab/usage/metric.rb b/lib/gitlab/usage/metric.rb
index 24e044c5740..cf48aa49938 100644
--- a/lib/gitlab/usage/metric.rb
+++ b/lib/gitlab/usage/metric.rb
@@ -18,19 +18,25 @@ module Gitlab
       end
 
       def with_value
-        unflatten_key_path(intrumentation_object.value)
+        with_availability(proc { instrumentation_object.value })
       end
 
       def with_instrumentation
-        unflatten_key_path(intrumentation_object.instrumentation)
+        with_availability(proc { instrumentation_object.instrumentation })
       end
 
       def with_suggested_name
-        unflatten_key_path(intrumentation_object.suggested_name)
+        with_availability(proc { instrumentation_object.suggested_name })
       end
 
       private
 
+      def with_availability(value_proc)
+        return {} unless instrumentation_object.available?
+
+        unflatten_key_path(value_proc.call)
+      end
+
       def unflatten_key_path(value)
         ::Gitlab::Usage::Metrics::KeyPathProcessor.process(definition.key_path, value)
       end
@@ -39,8 +45,8 @@ module Gitlab
         "Gitlab::Usage::Metrics::Instrumentations::#{definition.instrumentation_class}"
       end
 
-      def intrumentation_object
-        instrumentation_class.constantize.new(
+      def instrumentation_object
+        @instrumentation_object ||= instrumentation_class.constantize.new(
           time_frame: definition.time_frame,
           options: definition.attributes[:options]
         )
diff --git a/lib/gitlab/usage/metrics/instrumentations/base_metric.rb b/lib/gitlab/usage/metrics/instrumentations/base_metric.rb
index a264f9484f3..f76ed1753b2 100644
--- a/lib/gitlab/usage/metrics/instrumentations/base_metric.rb
+++ b/lib/gitlab/usage/metrics/instrumentations/base_metric.rb
@@ -11,6 +11,18 @@ module Gitlab
           attr_reader :time_frame
           attr_reader :options
 
+          class << self
+            def available?(&block)
+              return @metric_available = block if block_given?
+
+              return @metric_available.call if instance_variable_defined?('@metric_available')
+
+              true
+            end
+
+            attr_reader :metric_available
+          end
+
           def initialize(time_frame:, options: {})
             @time_frame = time_frame
             @options = options
@@ -19,6 +31,10 @@ module Gitlab
           def instrumentation
             value
           end
+
+          def available?
+            self.class.available?
+          end
         end
       end
     end