diff options
author | GitLab Bot <gitlab-bot@gitlab.com> | 2020-02-29 12:07:42 +0300 |
---|---|---|
committer | GitLab Bot <gitlab-bot@gitlab.com> | 2020-02-29 12:07:42 +0300 |
commit | bfa061f3ae2ace72f7929973eaa0286574265a96 (patch) | |
tree | 8de29e3a2a0a30adc58bb23f660eda4d55e6e27d | |
parent | 1ab1a6eefa84e1530663edf3b711f34c0d4e535e (diff) |
Add latest changes from gitlab-org/gitlab@master
-rw-r--r-- | lib/gitlab/sidekiq_logging/structured_logger.rb | 6 | ||||
-rw-r--r-- | spec/lib/gitlab/sidekiq_logging/structured_logger_spec.rb | 19 |
2 files changed, 2 insertions, 23 deletions
diff --git a/lib/gitlab/sidekiq_logging/structured_logger.rb b/lib/gitlab/sidekiq_logging/structured_logger.rb index 72820d0a25e..b45014d283f 100644 --- a/lib/gitlab/sidekiq_logging/structured_logger.rb +++ b/lib/gitlab/sidekiq_logging/structured_logger.rb @@ -85,11 +85,7 @@ module Gitlab job['pid'] = ::Process.pid job.delete('args') unless ENV['SIDEKIQ_LOG_ARGUMENTS'] - - if job['args'] - job['args'].map!(&:to_s) - job['args'] = Gitlab::Utils::LogLimitedArray.log_limited_array(job['args']) - end + job['args'] = Gitlab::Utils::LogLimitedArray.log_limited_array(job['args']) if job['args'] job end diff --git a/spec/lib/gitlab/sidekiq_logging/structured_logger_spec.rb b/spec/lib/gitlab/sidekiq_logging/structured_logger_spec.rb index 4b012f4f83d..f294d7f7fcd 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' => job['args'].map(&:to_s), 'message' => 'TestWorker JID-da883554ee4fe414012f5f42: start', 'job_status' => 'start', 'pid' => Process.pid, @@ -100,29 +99,13 @@ describe Gitlab::SidekiqLogging::StructuredLogger do end end - context 'when the job args contain non-string objects' do - it 'converts them to strings' do - Timecop.freeze(timestamp) do - job['args'] = [2, true, 'foo', { "foo" => "bar" }] - expected_args = ['2', 'true', 'foo', '{"foo"=>"bar"}'] - - 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 - 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'].map(&:to_s).take(3) + ['...'] + expected_args = job['args'].take(3) + ['...'] 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 |