diff options
| author | Stan Hu <stanhu@gmail.com> | 2019-08-09 10:22:22 -0700 |
|---|---|---|
| committer | Stan Hu <stanhu@gmail.com> | 2019-08-09 10:22:22 -0700 |
| commit | 916f255bed04cc7ec68d2df26527b862f0ea73e8 (patch) | |
| tree | bf0a2839600b927b42f9585b37b66fbce67f2cef /config/initializers | |
| parent | f77ffdafad0a94c8a2af7070710fbfbe88994040 (diff) | |
| parent | fe214a217ca95c2c4a53c501f372367fecaf7f99 (diff) | |
| download | gitlab-ce-916f255bed04cc7ec68d2df26527b862f0ea73e8.tar.gz | |
Merge branch 'master' into sh-break-out-invited-group-members
Diffstat (limited to 'config/initializers')
| -rw-r--r-- | config/initializers/lograge.rb | 14 | ||||
| -rw-r--r-- | config/initializers/sidekiq.rb | 1 |
2 files changed, 2 insertions, 13 deletions
diff --git a/config/initializers/lograge.rb b/config/initializers/lograge.rb index 3d84b4e44ce..346725e4080 100644 --- a/config/initializers/lograge.rb +++ b/config/initializers/lograge.rb @@ -27,19 +27,7 @@ unless Sidekiq.server? queue_duration: event.payload[:queue_duration] } - gitaly_calls = Gitlab::GitalyClient.get_request_count - - if gitaly_calls > 0 - payload[:gitaly_calls] = gitaly_calls - payload[:gitaly_duration] = Gitlab::GitalyClient.query_time_ms - end - - rugged_calls = Gitlab::RuggedInstrumentation.query_count - - if rugged_calls > 0 - payload[:rugged_calls] = rugged_calls - payload[:rugged_duration_ms] = Gitlab::RuggedInstrumentation.query_time_ms - end + ::Gitlab::InstrumentationHelper.add_instrumentation_data(payload) payload[:response] = event.payload[:response] if event.payload[:response] payload[Labkit::Correlation::CorrelationId::LOG_KEY] = Labkit::Correlation::CorrelationId.current_id diff --git a/config/initializers/sidekiq.rb b/config/initializers/sidekiq.rb index 9f88fb9895b..7217f098fd9 100644 --- a/config/initializers/sidekiq.rb +++ b/config/initializers/sidekiq.rb @@ -39,6 +39,7 @@ Sidekiq.configure_server do |config| chain.add Gitlab::SidekiqMiddleware::RequestStoreMiddleware unless ENV['SIDEKIQ_REQUEST_STORE'] == '0' chain.add Gitlab::SidekiqMiddleware::BatchLoader chain.add Gitlab::SidekiqMiddleware::CorrelationLogger + chain.add Gitlab::SidekiqMiddleware::InstrumentationLogger chain.add Gitlab::SidekiqStatus::ServerMiddleware end |