diff options
author | GitLab Bot <gitlab-bot@gitlab.com> | 2022-06-20 14:10:13 +0300 |
---|---|---|
committer | GitLab Bot <gitlab-bot@gitlab.com> | 2022-06-20 14:10:13 +0300 |
commit | 0ea3fcec397b69815975647f5e2aa5fe944a8486 (patch) | |
tree | 7979381b89d26011bcf9bdc989a40fcc2f1ed4ff /spec/lib/gitlab/grape_logging/loggers/queue_duration_logger_spec.rb | |
parent | 72123183a20411a36d607d70b12d57c484394c8e (diff) |
Add latest changes from gitlab-org/gitlab@15-1-stable-eev15.1.0-rc42
Diffstat (limited to 'spec/lib/gitlab/grape_logging/loggers/queue_duration_logger_spec.rb')
-rw-r--r-- | spec/lib/gitlab/grape_logging/loggers/queue_duration_logger_spec.rb | 12 |
1 files changed, 5 insertions, 7 deletions
diff --git a/spec/lib/gitlab/grape_logging/loggers/queue_duration_logger_spec.rb b/spec/lib/gitlab/grape_logging/loggers/queue_duration_logger_spec.rb index 4cd9f9dfad0..1924cd687e4 100644 --- a/spec/lib/gitlab/grape_logging/loggers/queue_duration_logger_spec.rb +++ b/spec/lib/gitlab/grape_logging/loggers/queue_duration_logger_spec.rb @@ -8,7 +8,7 @@ RSpec.describe Gitlab::GrapeLogging::Loggers::QueueDurationLogger do describe ".parameters" do let(:start_time) { Time.new(2018, 01, 01) } - describe 'when no proxy time is available' do + describe 'when no proxy duration is available' do let(:mock_request) { double('env', env: {}) } it 'returns an empty hash' do @@ -16,20 +16,18 @@ RSpec.describe Gitlab::GrapeLogging::Loggers::QueueDurationLogger do end end - describe 'when a proxy time is available' do + describe 'when a proxy duration is available' do let(:mock_request) do double('env', env: { - 'HTTP_GITLAB_WORKHORSE_PROXY_START' => (start_time - 1.hour).to_i * (10**9) + 'GITLAB_RAILS_QUEUE_DURATION' => 2.seconds } ) end - it 'returns the correct duration in seconds' do + it 'adds the duration to log parameters' do travel_to(start_time) do - subject.before - - expect(subject.parameters(mock_request, nil)).to eq( { 'queue_duration_s': 1.hour.to_f }) + expect(subject.parameters(mock_request, nil)).to eq( { 'queue_duration_s': 2.seconds.to_f }) end end end |