diff options
| author | GitLab Bot <gitlab-bot@gitlab.com> | 2021-04-21 02:50:22 +0300 |
|---|---|---|
| committer | GitLab Bot <gitlab-bot@gitlab.com> | 2021-04-21 02:50:22 +0300 |
| commit | 9dc93a4519d9d5d7be48ff274127136236a3adb3 (patch) | |
| tree | 70467ae3692a0e35e5ea56bcb803eb512a10bedb /lib/gitlab/sidekiq_logging | |
| parent | 4b0f34b6d759d6299322b3a54453e930c6121ff0 (diff) | |
Add latest changes from gitlab-org/gitlab@13-11-stable-eev13.11.0-rc43
Diffstat (limited to 'lib/gitlab/sidekiq_logging')
| -rw-r--r-- | lib/gitlab/sidekiq_logging/structured_logger.rb | 4 |
1 files changed, 1 insertions, 3 deletions
diff --git a/lib/gitlab/sidekiq_logging/structured_logger.rb b/lib/gitlab/sidekiq_logging/structured_logger.rb index 654b17c5740..b1fb3771c78 100644 --- a/lib/gitlab/sidekiq_logging/structured_logger.rb +++ b/lib/gitlab/sidekiq_logging/structured_logger.rb @@ -39,9 +39,7 @@ module Gitlab private def add_instrumentation_keys!(job, output_payload) - instrumentation_values = job.slice(*::Gitlab::InstrumentationHelper.keys).stringify_keys - - output_payload.merge!(instrumentation_values) + output_payload.merge!(job[:instrumentation].stringify_keys) end def add_logging_extras!(job, output_payload) |