diff options
| author | GitLab Bot <gitlab-bot@gitlab.com> | 2021-06-16 21:25:58 +0300 |
|---|---|---|
| committer | GitLab Bot <gitlab-bot@gitlab.com> | 2021-06-16 21:25:58 +0300 |
| commit | a5f4bba440d7f9ea47046a0a561d49adf0a1e6d4 (patch) | |
| tree | fb69158581673816a8cd895f9d352dcb3c678b1e /lib/gitlab/sidekiq_logging | |
| parent | d16b2e8639e99961de6ddc93909f3bb5c1445ba1 (diff) | |
Add latest changes from gitlab-org/gitlab@14-0-stable-eev14.0.0-rc42
Diffstat (limited to 'lib/gitlab/sidekiq_logging')
| -rw-r--r-- | lib/gitlab/sidekiq_logging/logs_jobs.rb | 3 | ||||
| -rw-r--r-- | lib/gitlab/sidekiq_logging/structured_logger.rb | 2 |
2 files changed, 3 insertions, 2 deletions
diff --git a/lib/gitlab/sidekiq_logging/logs_jobs.rb b/lib/gitlab/sidekiq_logging/logs_jobs.rb index 6f8cc1c60e9..cfe91b9a266 100644 --- a/lib/gitlab/sidekiq_logging/logs_jobs.rb +++ b/lib/gitlab/sidekiq_logging/logs_jobs.rb @@ -14,6 +14,9 @@ module Gitlab job = job.except('error_backtrace', 'error_class', 'error_message') job['class'] = job.delete('wrapped') if job['wrapped'].present? + job['job_size_bytes'] = Sidekiq.dump_json(job['args']).bytesize + job['args'] = ['[COMPRESSED]'] if ::Gitlab::SidekiqMiddleware::SizeLimiter::Compressor.compressed?(job) + # Add process id params job['pid'] = ::Process.pid diff --git a/lib/gitlab/sidekiq_logging/structured_logger.rb b/lib/gitlab/sidekiq_logging/structured_logger.rb index 87fb36d04e9..32194c4926e 100644 --- a/lib/gitlab/sidekiq_logging/structured_logger.rb +++ b/lib/gitlab/sidekiq_logging/structured_logger.rb @@ -55,8 +55,6 @@ module Gitlab scheduling_latency_s = ::Gitlab::InstrumentationHelper.queue_duration_for_job(payload) payload['scheduling_latency_s'] = scheduling_latency_s if scheduling_latency_s - payload['job_size_bytes'] = Sidekiq.dump_json(job).bytesize - payload end |