Merge branch 'fix-peek-on-puma' into 'master'

Fix Peek on Puma

Closes #66528

See merge request gitlab-org/gitlab-ce!32213

3 files changed, 15 insertions, 15 deletions

diff --git a/spec/lib/gitlab/git/rugged_impl/use_rugged_spec.rb b/spec/lib/gitlab/git/rugged_impl/use_rugged_spec.rb
index 1a4168f7317..474240cf620 100644
--- a/spec/lib/gitlab/git/rugged_impl/use_rugged_spec.rb
+++ b/spec/lib/gitlab/git/rugged_impl/use_rugged_spec.rb
@@ -35,7 +35,7 @@ describe Gitlab::Git::RuggedImpl::UseRugged, :seed_helper do
     let(:args) { ['refs/heads/master', 1] }
 
     before do
-      allow(Gitlab::RuggedInstrumentation).to receive(:peek_enabled?).and_return(true)
+      allow(Gitlab::PerformanceBar).to receive(:enabled_for_request?).and_return(true)
     end
 
     it 'instruments Rugged call' do
diff --git a/spec/lib/gitlab/performance_bar_spec.rb b/spec/lib/gitlab/performance_bar_spec.rb
index 8d8ac2aebbe..816db49d94a 100644
--- a/spec/lib/gitlab/performance_bar_spec.rb
+++ b/spec/lib/gitlab/performance_bar_spec.rb
@@ -6,14 +6,14 @@ describe Gitlab::PerformanceBar do
   shared_examples 'allowed user IDs are cached' do
     before do
       # Warm the caches
-      described_class.enabled?(user)
+      described_class.enabled_for_user?(user)
     end
 
     it 'caches the allowed user IDs in cache', :use_clean_rails_memory_store_caching do
       expect do
         expect(described_class.l1_cache_backend).to receive(:fetch).and_call_original
         expect(described_class.l2_cache_backend).not_to receive(:fetch)
-        expect(described_class.enabled?(user)).to be_truthy
+        expect(described_class.enabled_for_user?(user)).to be_truthy
       end.not_to exceed_query_limit(0)
     end
 
@@ -22,7 +22,7 @@ describe Gitlab::PerformanceBar do
         expect do
           expect(described_class.l1_cache_backend).to receive(:fetch).and_call_original
           expect(described_class.l2_cache_backend).to receive(:fetch).and_call_original
-          expect(described_class.enabled?(user)).to be_truthy
+          expect(described_class.enabled_for_user?(user)).to be_truthy
         end.not_to exceed_query_limit(0)
       end
     end
@@ -32,7 +32,7 @@ describe Gitlab::PerformanceBar do
         expect do
           expect(described_class.l1_cache_backend).to receive(:fetch).and_call_original
           expect(described_class.l2_cache_backend).to receive(:fetch).and_call_original
-          expect(described_class.enabled?(user)).to be_truthy
+          expect(described_class.enabled_for_user?(user)).to be_truthy
         end.not_to exceed_query_limit(2)
       end
     end
@@ -41,7 +41,7 @@ describe Gitlab::PerformanceBar do
   it { expect(described_class.l1_cache_backend).to eq(Gitlab::ThreadMemoryCache.cache_backend) }
   it { expect(described_class.l2_cache_backend).to eq(Rails.cache) }
 
-  describe '.enabled?' do
+  describe '.enabled_for_user?' do
     let(:user) { create(:user) }
 
     before do
@@ -49,24 +49,24 @@ describe Gitlab::PerformanceBar do
     end
 
     it 'returns false when given user is nil' do
-      expect(described_class.enabled?(nil)).to be_falsy
+      expect(described_class.enabled_for_user?(nil)).to be_falsy
     end
 
     it 'returns true when given user is an admin' do
       user = build_stubbed(:user, :admin)
 
-      expect(described_class.enabled?(user)).to be_truthy
+      expect(described_class.enabled_for_user?(user)).to be_truthy
     end
 
     it 'returns false when allowed_group_id is nil' do
       expect(described_class).to receive(:allowed_group_id).and_return(nil)
 
-      expect(described_class.enabled?(user)).to be_falsy
+      expect(described_class.enabled_for_user?(user)).to be_falsy
     end
 
     context 'when allowed group ID does not exist' do
       it 'returns false' do
-        expect(described_class.enabled?(user)).to be_falsy
+        expect(described_class.enabled_for_user?(user)).to be_falsy
       end
     end
 
@@ -79,7 +79,7 @@ describe Gitlab::PerformanceBar do
 
       context 'when user is not a member of the allowed group' do
         it 'returns false' do
-          expect(described_class.enabled?(user)).to be_falsy
+          expect(described_class.enabled_for_user?(user)).to be_falsy
         end
 
         it_behaves_like 'allowed user IDs are cached'
@@ -91,7 +91,7 @@ describe Gitlab::PerformanceBar do
         end
 
         it 'returns true' do
-          expect(described_class.enabled?(user)).to be_truthy
+          expect(described_class.enabled_for_user?(user)).to be_truthy
         end
 
         it_behaves_like 'allowed user IDs are cached'
@@ -108,7 +108,7 @@ describe Gitlab::PerformanceBar do
       end
 
       it 'returns the nested group' do
-        expect(described_class.enabled?(user)).to be_truthy
+        expect(described_class.enabled_for_user?(user)).to be_truthy
       end
     end
 
@@ -118,7 +118,7 @@ describe Gitlab::PerformanceBar do
       end
 
       it 'returns false' do
-        expect(described_class.enabled?(user)).to be_falsy
+        expect(described_class.enabled_for_user?(user)).to be_falsy
       end
     end
   end
diff --git a/spec/lib/peek/views/rugged_spec.rb b/spec/lib/peek/views/rugged_spec.rb
index d07d6b51a1f..b9507f772d2 100644
--- a/spec/lib/peek/views/rugged_spec.rb
+++ b/spec/lib/peek/views/rugged_spec.rb
@@ -8,7 +8,7 @@ describe Peek::Views::Rugged, :request_store do
   let(:project) { create(:project) }
 
   before do
-    allow(Gitlab::RuggedInstrumentation).to receive(:peek_enabled?).and_return(true)
+    allow(Gitlab::PerformanceBar).to receive(:enabled_for_request?).and_return(true)
   end
 
   it 'returns no results' do