1 files changed, 7 insertions, 6 deletions
diff --git a/app/services/user_agent_detail_service.rb b/app/services/user_agent_detail_service.rb
index 01a98a15869..ccb5cec2df8 100644
--- a/app/services/user_agent_detail_service.rb
+++ b/app/services/user_agent_detail_service.rb
@@ -1,15 +1,16 @@
 # frozen_string_literal: true
 
 class UserAgentDetailService
-  def initialize(spammable:, spam_params:)
+  def initialize(spammable:, perform_spam_check:)
     @spammable = spammable
-    @spam_params = spam_params
+    @perform_spam_check = perform_spam_check
   end
 
   def create
-    unless spam_params&.user_agent && spam_params&.ip_address
-      messasge = 'Skipped UserAgentDetail creation because necessary spam_params were not provided'
-      return ServiceResponse.success(message: messasge)
+    spam_params = Gitlab::RequestContext.instance.spam_params
+    if !perform_spam_check || spam_params&.user_agent.blank? || spam_params&.ip_address.blank?
+      message = 'Skipped UserAgentDetail creation because necessary spam_params were not provided'
+      return ServiceResponse.success(message: message)
     end
 
     spammable.create_user_agent_detail(user_agent: spam_params.user_agent, ip_address: spam_params.ip_address)
@@ -17,5 +18,5 @@ class UserAgentDetailService
 
   private
 
-  attr_reader :spammable, :spam_params
+  attr_reader :spammable, :perform_spam_check
 end