1 files changed, 24 insertions, 0 deletions
diff --git a/spec/requests/api/api_spec.rb b/spec/requests/api/api_spec.rb
index 8bd6049e6fa..522030652bd 100644
--- a/spec/requests/api/api_spec.rb
+++ b/spec/requests/api/api_spec.rb
@@ -112,6 +112,7 @@ RSpec.describe API::API do
                                        'meta.project' => project.full_path,
                                        'meta.root_namespace' => project.namespace.full_path,
                                        'meta.user' => user.username,
+                                       'meta.client_id' => an_instance_of(String),
                                        'meta.feature_category' => 'issue_tracking')
         end
       end
@@ -125,6 +126,7 @@ RSpec.describe API::API do
           expect(log_context).to match('correlation_id' => an_instance_of(String),
                                        'meta.caller_id' => '/api/:version/users',
                                        'meta.remote_ip' => an_instance_of(String),
+                                       'meta.client_id' => an_instance_of(String),
                                        'meta.feature_category' => 'users')
         end
       end
@@ -133,6 +135,28 @@ RSpec.describe API::API do
     end
   end
 
+  describe 'Marginalia comments' do
+    context 'GET /user/:id' do
+      let_it_be(:user) { create(:user) }
+      let(:component_map) do
+        {
+          "application" => "test",
+          "endpoint_id" => "/api/:version/users/:id"
+        }
+      end
+
+      subject { ActiveRecord::QueryRecorder.new { get api("/users/#{user.id}", user) } }
+
+      it 'generates a query that includes the expected annotations' do
+        expect(subject.log.last).to match(/correlation_id:.*/)
+
+        component_map.each do |component, value|
+          expect(subject.log.last).to include("#{component}:#{value}")
+        end
+      end
+    end
+  end
+
   describe 'supported content-types' do
     context 'GET /user/:id.txt' do
       let_it_be(:user) { create(:user) }