Add latest changes from gitlab-org/gitlab@master

1 files changed, 6 insertions, 2 deletions

diff --git a/lib/gitlab/database/query_analyzers/base.rb b/lib/gitlab/database/query_analyzers/base.rb
index 0802d3c8013..5f321ece962 100644
--- a/lib/gitlab/database/query_analyzers/base.rb
+++ b/lib/gitlab/database/query_analyzers/base.rb
@@ -48,11 +48,15 @@ module Gitlab
         end
 
         def self.context_key
-          "#{self.class.name}_context"
+          @context_key ||= "analyzer_#{self.analyzer_key}_context".to_sym
         end
 
         def self.suppress_key
-          "#{self.class.name}_suppressed"
+          @suppress_key ||= "analyzer_#{self.analyzer_key}_suppressed".to_sym
+        end
+
+        def self.analyzer_key
+          @analyzer_key ||= self.name.demodulize.underscore.to_sym
         end
       end
     end