1 files changed, 15 insertions, 1 deletions
diff --git a/lib/gitlab/application_context.rb b/lib/gitlab/application_context.rb
index c3415c45b28..d93067c7e2f 100644
--- a/lib/gitlab/application_context.rb
+++ b/lib/gitlab/application_context.rb
@@ -9,7 +9,17 @@ module Gitlab
     Attribute = Struct.new(:name, :type)
 
     LOG_KEY = Labkit::Context::LOG_KEY
-    KNOWN_KEYS = Labkit::Context::KNOWN_KEYS
+    KNOWN_KEYS = [
+      :user,
+      :project,
+      :root_namespace,
+      :client_id,
+      :caller_id,
+      :remote_ip,
+      :related_class,
+      :feature_category
+    ].freeze
+    private_constant :KNOWN_KEYS
 
     APPLICATION_ATTRIBUTES = [
       Attribute.new(:project, Project),
@@ -22,6 +32,10 @@ module Gitlab
       Attribute.new(:feature_category, String)
     ].freeze
 
+    def self.known_keys
+      KNOWN_KEYS
+    end
+
     def self.with_context(args, &block)
       application_context = new(**args)
       application_context.use(&block)