diff options
author | GitLab Bot <gitlab-bot@gitlab.com> | 2021-08-19 12:08:42 +0300 |
---|---|---|
committer | GitLab Bot <gitlab-bot@gitlab.com> | 2021-08-19 12:08:42 +0300 |
commit | b76ae638462ab0f673e5915986070518dd3f9ad3 (patch) | |
tree | bdab0533383b52873be0ec0eb4d3c66598ff8b91 /spec/lib/gitlab/instrumentation_helper_spec.rb | |
parent | 434373eabe7b4be9593d18a585fb763f1e5f1a6f (diff) |
Add latest changes from gitlab-org/gitlab@14-2-stable-eev14.2.0-rc42
Diffstat (limited to 'spec/lib/gitlab/instrumentation_helper_spec.rb')
-rw-r--r-- | spec/lib/gitlab/instrumentation_helper_spec.rb | 8 |
1 files changed, 6 insertions, 2 deletions
diff --git a/spec/lib/gitlab/instrumentation_helper_spec.rb b/spec/lib/gitlab/instrumentation_helper_spec.rb index 48fcc9f93db..85daf50717c 100644 --- a/spec/lib/gitlab/instrumentation_helper_spec.rb +++ b/spec/lib/gitlab/instrumentation_helper_spec.rb @@ -83,6 +83,12 @@ RSpec.describe Gitlab::InstrumentationHelper do expect(payload).to include(:cpu_s) end + it 'logs the process ID' do + subject + + expect(payload).to include(:pid) + end + context 'when logging memory allocations' do include MemoryInstrumentationHelper @@ -102,8 +108,6 @@ RSpec.describe Gitlab::InstrumentationHelper do end context 'when load balancing is enabled' do - include_context 'clear DB Load Balancing configuration' - before do allow(Gitlab::Database::LoadBalancing).to receive(:enable?).and_return(true) end |