diff options
| author | Kamil Trzciński <ayufan@ayufan.eu> | 2019-01-25 10:48:50 +0000 |
|---|---|---|
| committer | Kamil Trzciński <ayufan@ayufan.eu> | 2019-01-25 10:48:50 +0000 |
| commit | ca52a1254edc89fdb195f5d10fbf7cbd233644a9 (patch) | |
| tree | 7cb982258c5fefba5573c4ee0738452dff66b943 /config | |
| parent | 15a7f3c6af5286dee5188af045d3e80f95323472 (diff) | |
| parent | 1b90ffc57336a74ba3417e8f7c0f75718d930dda (diff) | |
| download | gitlab-ce-ca52a1254edc89fdb195f5d10fbf7cbd233644a9.tar.gz | |
Merge branch 'an-opentracing-active-record-tracing' into 'master'
Adds tracing support for ActiveRecord notifications
See merge request gitlab-org/gitlab-ce!24604
Diffstat (limited to 'config')
| -rw-r--r-- | config/initializers/tracing.rb | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/config/initializers/tracing.rb b/config/initializers/tracing.rb index 46e8125daf8..d5bef8edb43 100644 --- a/config/initializers/tracing.rb +++ b/config/initializers/tracing.rb @@ -23,6 +23,9 @@ if Gitlab::Tracing.enabled? end end + # Instrument Rails + Gitlab::Tracing::Rails::ActiveRecordSubscriber.instrument + # In multi-processed clustered architectures (puma, unicorn) don't # start tracing until the worker processes are spawned. This works # around issues when the opentracing implementation spawns threads |