1 files changed, 9 insertions, 4 deletions
diff --git a/lib/gitlab/usage/metric_definition.rb b/lib/gitlab/usage/metric_definition.rb
index 96e572bb3db..01d202e4d45 100644
--- a/lib/gitlab/usage/metric_definition.rb
+++ b/lib/gitlab/usage/metric_definition.rb
@@ -13,9 +13,8 @@ module Gitlab
         @attributes = opts
       end
 
-      # The key is defined by default_generation and full_path
       def key
-        full_path[default_generation.to_sym]
+        key_path
       end
 
       def to_h
@@ -23,8 +22,10 @@ module Gitlab
       end
 
       def validate!
-        self.class.schemer.validate(attributes.stringify_keys).map do |error|
-          Gitlab::ErrorTracking.track_and_raise_for_dev_exception(Metric::InvalidMetricError.new("#{error["details"] || error['data_pointer']} for `#{path}`"))
+        unless skip_validation?
+          self.class.schemer.validate(attributes.stringify_keys).each do |error|
+            Gitlab::ErrorTracking.track_and_raise_for_dev_exception(Metric::InvalidMetricError.new("#{error["details"] || error['data_pointer']} for `#{path}`"))
+          end
         end
       end
 
@@ -79,6 +80,10 @@ module Gitlab
       def method_missing(method, *args)
         attributes[method] || super
       end
+
+      def skip_validation?
+        !!attributes[:skip_validation]
+      end
     end
   end
 end