diff options
author | GitLab Bot <gitlab-bot@gitlab.com> | 2020-04-07 12:09:13 +0300 |
---|---|---|
committer | GitLab Bot <gitlab-bot@gitlab.com> | 2020-04-07 12:09:13 +0300 |
commit | 41cb558299b483b44b45351730ee4c0e9fe4ca2c (patch) | |
tree | 00688a9e40021c66195ad826ceddd9c19385cdcf /spec/lib/gitlab/sidekiq_logging/structured_logger_spec.rb | |
parent | 3d064c737e8448880e6180aeddc59000a01aa6a8 (diff) |
Add latest changes from gitlab-org/gitlab@master
Diffstat (limited to 'spec/lib/gitlab/sidekiq_logging/structured_logger_spec.rb')
-rw-r--r-- | spec/lib/gitlab/sidekiq_logging/structured_logger_spec.rb | 19 |
1 files changed, 0 insertions, 19 deletions
diff --git a/spec/lib/gitlab/sidekiq_logging/structured_logger_spec.rb b/spec/lib/gitlab/sidekiq_logging/structured_logger_spec.rb index aab63ba88ad..db7c5f771b7 100644 --- a/spec/lib/gitlab/sidekiq_logging/structured_logger_spec.rb +++ b/spec/lib/gitlab/sidekiq_logging/structured_logger_spec.rb @@ -30,7 +30,6 @@ describe Gitlab::SidekiqLogging::StructuredLogger do let(:clock_thread_cputime_end) { 1.333333799 } let(:start_payload) do job.except('error_backtrace', 'error_class', 'error_message').merge( - 'args' => %w(1234 hello {"key"=>"value"}), 'message' => 'TestWorker JID-da883554ee4fe414012f5f42: start', 'job_status' => 'start', 'pid' => Process.pid, @@ -113,24 +112,6 @@ describe Gitlab::SidekiqLogging::StructuredLogger do end end end - - context 'when the job args are bigger than the maximum allowed' do - it 'keeps args from the front until they exceed the limit' do - Timecop.freeze(timestamp) do - half_limit = Gitlab::Utils::LogLimitedArray::MAXIMUM_ARRAY_LENGTH / 2 - job['args'] = [1, 2, 'a' * half_limit, 'b' * half_limit, 3] - - expected_args = job['args'].take(3).map(&:to_s) + ['...'] - - expect(logger).to receive(:info).with(start_payload.merge('args' => expected_args)).ordered - expect(logger).to receive(:info).with(end_payload.merge('args' => expected_args)).ordered - expect(subject).to receive(:log_job_start).and_call_original - expect(subject).to receive(:log_job_done).and_call_original - - subject.call(job, 'test_queue') { } - end - end - end end context 'with SIDEKIQ_LOG_ARGUMENTS disabled' do |