Merge branch '333036-eurie-add-correlation-id-to-spamcheck-requests' into 'master'

Add correlation ID for requests to Anti-spam engine.

See merge request gitlab-org/gitlab!63917

lib/gitlab/spamcheck/client.rb

@@ -27,21 +27,18 @@ module Gitlab
         # connect with Spamcheck
         @endpoint_url = @endpoint_url.gsub(%r(^grpc:\/\/), '')
 
-        creds =
+        @creds =
           if Rails.env.development? || Rails.env.test?
             :this_channel_is_insecure
           else
             GRPC::Core::ChannelCredentials.new
           end
-
-        @stub = ::Spamcheck::SpamcheckService::Stub.new(@endpoint_url, creds,
-                                                        timeout: DEFAULT_TIMEOUT_SECS)
       end
 
       def issue_spam?(spam_issue:, user:, context: {})
         issue = build_issue_protobuf(issue: spam_issue, user: user, context: context)
 
-        response = @stub.check_for_spam_issue(issue,
+        response = grpc_client.check_for_spam_issue(issue,
                                               metadata: { 'authorization' =>
                                                            Gitlab::CurrentSettings.spam_check_api_key })
         verdict = convert_verdict_to_gitlab_constant(response.verdict)
@@ -100,6 +97,16 @@ module Gitlab
         Google::Protobuf::Timestamp.new(seconds: ar_timestamp.to_time.to_i,
                                         nanos: ar_timestamp.to_time.nsec)
       end
+
+      def grpc_client
+        @grpc_client ||= ::Spamcheck::SpamcheckService::Stub.new(@endpoint_url, @creds,
+                                                        interceptors: interceptors,
+                                                        timeout: DEFAULT_TIMEOUT_SECS)
+      end
+
+      def interceptors
+        [Labkit::Correlation::GRPC::ClientInterceptor.instance]
+      end
     end
   end
 end

spec/deprecation_toolkit_env.rb

@@ -60,6 +60,7 @@ module DeprecationToolkitEnv
       activerecord-6.0.3.7/lib/active_record/relation.rb
       asciidoctor-2.0.12/lib/asciidoctor/extensions.rb
       attr_encrypted-3.1.0/lib/attr_encrypted/adapters/active_record.rb
+      gitlab-labkit-0.18.0/lib/labkit/correlation/grpc/client_interceptor.rb
     ]
   end
 

spec/lib/gitlab/spamcheck/client_spec.rb

@@ -7,7 +7,7 @@ RSpec.describe Gitlab::Spamcheck::Client do
 
   let(:endpoint) { 'grpc://grpc.test.url' }
   let_it_be(:user) { create(:user, organization: 'GitLab') }
-  let(:verdict_value) { nil }
+  let(:verdict_value) { ::Spamcheck::SpamVerdict::Verdict::ALLOW }
   let(:error_value) { "" }
 
   let(:attribs_value) do
@@ -56,6 +56,13 @@ RSpec.describe Gitlab::Spamcheck::Client do
         expect(subject).to eq([expected, { "monitorMode" => "false" }, ""])
       end
     end
+
+    it 'includes interceptors' do
+      expect_next_instance_of(::Gitlab::Spamcheck::Client) do |client|
+        expect(client).to receive(:interceptors).and_call_original
+      end
+      subject
+    end
   end
 
   describe "#build_issue_protobuf", :aggregate_failures do