From 1ce6af4aad0107b6d604f89a3c0b530476a10165 Mon Sep 17 00:00:00 2001 From: GitLab Bot Date: Fri, 24 Jan 2020 00:08:51 +0000 Subject: Add latest changes from gitlab-org/gitlab@master --- config/initializers/lograge.rb | 1 + 1 file changed, 1 insertion(+) (limited to 'config') 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) -- cgit v1.2.1