Add latest changes from gitlab-org/gitlab@master

1 files changed, 33 insertions, 0 deletions

diff --git a/spec/initializers/lograge_spec.rb b/spec/initializers/lograge_spec.rb
index 24d366731a2..c2c1960eeab 100644
--- a/spec/initializers/lograge_spec.rb
+++ b/spec/initializers/lograge_spec.rb
@@ -34,5 +34,38 @@ describe 'lograge', type: :request do
 
       subject
     end
+
+    it 'logs cpu_s on supported platform' do
+      allow(Gitlab::Metrics::System).to receive(:thread_cpu_time)
+        .and_return(
+          0.111222333,
+          0.222333833
+        )
+
+      expect(Lograge.formatter).to receive(:call)
+        .with(a_hash_including(cpu_s: 0.1111115))
+        .and_call_original
+
+      expect(Lograge.logger).to receive(:send)
+        .with(anything, include('"cpu_s":0.1111115'))
+        .and_call_original
+
+      subject
+    end
+
+    it 'does not log cpu_s on unsupported platform' do
+      allow(Gitlab::Metrics::System).to receive(:thread_cpu_time)
+        .and_return(nil)
+
+      expect(Lograge.formatter).to receive(:call)
+        .with(hash_not_including(:cpu_s))
+        .and_call_original
+
+      expect(Lograge.logger).not_to receive(:send)
+        .with(anything, include('"cpu_s":'))
+        .and_call_original
+
+      subject
+    end
   end
 end