1 files changed, 13 insertions, 1 deletions
diff --git a/app/controllers/search_controller.rb b/app/controllers/search_controller.rb
index ff6d9350a5c..56b6a5201e7 100644
--- a/app/controllers/search_controller.rb
+++ b/app/controllers/search_controller.rb
@@ -6,7 +6,8 @@ class SearchController < ApplicationController
   include RendersCommits
 
   SCOPE_PRELOAD_METHOD = {
-    projects: :with_web_entity_associations
+    projects: :with_web_entity_associations,
+    issues: :with_web_entity_associations
   }.freeze
 
   around_action :allow_gitaly_ref_name_caching
@@ -113,4 +114,15 @@ class SearchController < ApplicationController
 
     Gitlab::UsageDataCounters::SearchCounter.count(:navbar_searches)
   end
+
+  def append_info_to_payload(payload)
+    super
+
+    # Merging to :metadata will ensure these are logged as top level keys
+    payload[:metadata] || {}
+    payload[:metadata]['meta.search.group_id'] = params[:group_id]
+    payload[:metadata]['meta.search.project_id'] = params[:project_id]
+    payload[:metadata]['meta.search.search'] = params[:search]
+    payload[:metadata]['meta.search.scope'] = params[:scope]
+  end
 end