diff options
| author | GitLab Bot <gitlab-bot@gitlab.com> | 2020-01-24 00:08:51 +0000 |
|---|---|---|
| committer | GitLab Bot <gitlab-bot@gitlab.com> | 2020-01-24 00:08:51 +0000 |
| commit | 1ce6af4aad0107b6d604f89a3c0b530476a10165 (patch) | |
| tree | 4956b0d395cd9232bca14f83daca3cd8616cc842 /config/initializers | |
| parent | 24256212ea84e6fb6509f6fb317a2d2bac3d0d06 (diff) | |
| download | gitlab-ce-1ce6af4aad0107b6d604f89a3c0b530476a10165.tar.gz | |
Add latest changes from gitlab-org/gitlab@master
Diffstat (limited to 'config/initializers')
| -rw-r--r-- | config/initializers/lograge.rb | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/config/initializers/lograge.rb b/config/initializers/lograge.rb index dc064a76033..9135073eaea 100644 --- a/config/initializers/lograge.rb +++ b/config/initializers/lograge.rb @@ -35,6 +35,7 @@ unless Gitlab::Runtime.sidekiq? ::Gitlab::InstrumentationHelper.add_instrumentation_data(payload) payload[:response] = event.payload[:response] if event.payload[:response] + payload[:etag_route] = event.payload[:etag_route] if event.payload[:etag_route] payload[Labkit::Correlation::CorrelationId::LOG_KEY] = Labkit::Correlation::CorrelationId.current_id if cpu_s = Gitlab::Metrics::System.thread_cpu_duration(::Gitlab::RequestContext.instance.start_thread_cpu_time) |