Add latest changes from gitlab-org/gitlab@master

3 files changed, 42 insertions, 63 deletions

diff --git a/spec/requests/api/api_spec.rb b/spec/requests/api/api_spec.rb
index 8bd6049e6fa..e1050d0b5f7 100644
--- a/spec/requests/api/api_spec.rb
+++ b/spec/requests/api/api_spec.rb
@@ -133,6 +133,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) }
diff --git a/spec/requests/api/graphql/project/merge_requests_spec.rb b/spec/requests/api/graphql/project/merge_requests_spec.rb
index 12060eb51e9..ba40eec9b69 100644
--- a/spec/requests/api/graphql/project/merge_requests_spec.rb
+++ b/spec/requests/api/graphql/project/merge_requests_spec.rb
@@ -427,63 +427,37 @@ RSpec.describe 'getting merge request listings nested in a project' do
         QUERY
       end
 
-      shared_examples 'count examples' do
-        it 'returns the correct count' do
-          post_graphql(query, current_user: current_user)
+      it 'does not query the merge requests table for the count' do
+        query_recorder = ActiveRecord::QueryRecorder.new { post_graphql(query, current_user: current_user) }
 
-          count = graphql_data.dig('project', 'mergeRequests', 'count')
-          expect(count).to eq(1)
-        end
+        queries = query_recorder.data.each_value.first[:occurrences]
+        expect(queries).not_to include(match(/SELECT COUNT\(\*\) FROM "merge_requests"/))
+        expect(queries).to include(match(/SELECT COUNT\(\*\) FROM "merge_request_metrics"/))
       end
 
-      context 'when "optimized_merge_request_count_with_merged_at_filter" feature flag is enabled' do
-        before do
-          stub_feature_flags(optimized_merge_request_count_with_merged_at_filter: true)
+      context 'when total_time_to_merge and count is queried' do
+        let(:query) do
+          graphql_query_for(:project, { full_path: project.full_path }, <<~QUERY)
+          mergeRequests(mergedAfter: "2020-01-01", mergedBefore: "2020-01-05", first: 0) {
+            totalTimeToMerge
+            count
+          }
+          QUERY
         end
 
-        it 'does not query the merge requests table for the count' do
+        it 'does not query the merge requests table for the total_time_to_merge' do
           query_recorder = ActiveRecord::QueryRecorder.new { post_graphql(query, current_user: current_user) }
 
           queries = query_recorder.data.each_value.first[:occurrences]
-          expect(queries).not_to include(match(/SELECT COUNT\(\*\) FROM "merge_requests"/))
-          expect(queries).to include(match(/SELECT COUNT\(\*\) FROM "merge_request_metrics"/))
-        end
-
-        context 'when total_time_to_merge and count is queried' do
-          let(:query) do
-            graphql_query_for(:project, { full_path: project.full_path }, <<~QUERY)
-            mergeRequests(mergedAfter: "2020-01-01", mergedBefore: "2020-01-05", first: 0) {
-              totalTimeToMerge
-              count
-            }
-            QUERY
-          end
-
-          it 'does not query the merge requests table for the total_time_to_merge' do
-            query_recorder = ActiveRecord::QueryRecorder.new { post_graphql(query, current_user: current_user) }
-
-            queries = query_recorder.data.each_value.first[:occurrences]
-            expect(queries).to include(match(/SELECT.+SUM.+FROM "merge_request_metrics" WHERE/))
-          end
+          expect(queries).to include(match(/SELECT.+SUM.+FROM "merge_request_metrics" WHERE/))
         end
+      end
 
-        it_behaves_like 'count examples'
-
-        context 'when "optimized_merge_request_count_with_merged_at_filter" feature flag is disabled' do
-          before do
-            stub_feature_flags(optimized_merge_request_count_with_merged_at_filter: false)
-          end
-
-          it 'queries the merge requests table for the count' do
-            query_recorder = ActiveRecord::QueryRecorder.new { post_graphql(query, current_user: current_user) }
-
-            queries = query_recorder.data.each_value.first[:occurrences]
-            expect(queries).to include(match(/SELECT COUNT\(\*\) FROM "merge_requests"/))
-            expect(queries).not_to include(match(/SELECT COUNT\(\*\) FROM "merge_request_metrics"/))
-          end
+      it 'returns the correct count' do
+        post_graphql(query, current_user: current_user)
 
-          it_behaves_like 'count examples'
-        end
+        count = graphql_data.dig('project', 'mergeRequests', 'count')
+        expect(count).to eq(1)
       end
     end
   end
diff --git a/spec/requests/api/v3/github_spec.rb b/spec/requests/api/v3/github_spec.rb
index bcfd97d5cfc..197c6cbb0eb 100644
--- a/spec/requests/api/v3/github_spec.rb
+++ b/spec/requests/api/v3/github_spec.rb
@@ -187,23 +187,6 @@ RSpec.describe API::V3::Github do
         expect { jira_get v3_api(events_path, user) }.not_to exceed_all_query_limit(control_count)
       end
 
-      context 'with `api_v3_repos_events_optimization` feature flag disabled' do
-        before do
-          stub_feature_flags(api_v3_repos_events_optimization: false)
-        end
-
-        it 'falls back to less optimal query performance' do
-          create(:merge_request, source_project: project)
-          source_project = fork_project(project, nil, repository: true)
-
-          control_count = ActiveRecord::QueryRecorder.new(skip_cached: false) { jira_get v3_api(events_path, user) }.count
-
-          create_list(:merge_request, 2, :unique_branches, source_project: source_project, target_project: project)
-
-          expect { jira_get v3_api(events_path, user) }.to exceed_all_query_limit(control_count)
-        end
-      end
-
       context 'if there are more merge requests' do
         let!(:merge_request) { create(:merge_request, id: 10000, source_project: project, target_project: project, author: user) }
         let!(:merge_request2) { create(:merge_request, id: 10001, source_project: project, source_branch: generate(:branch), target_project: project, author: user) }