diff options
author | GitLab Bot <gitlab-bot@gitlab.com> | 2021-06-16 21:25:58 +0300 |
---|---|---|
committer | GitLab Bot <gitlab-bot@gitlab.com> | 2021-06-16 21:25:58 +0300 |
commit | a5f4bba440d7f9ea47046a0a561d49adf0a1e6d4 (patch) | |
tree | fb69158581673816a8cd895f9d352dcb3c678b1e /config/initializers/tracing.rb | |
parent | d16b2e8639e99961de6ddc93909f3bb5c1445ba1 (diff) |
Add latest changes from gitlab-org/gitlab@14-0-stable-eev14.0.0-rc42
Diffstat (limited to 'config/initializers/tracing.rb')
-rw-r--r-- | config/initializers/tracing.rb | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/config/initializers/tracing.rb b/config/initializers/tracing.rb index 3f066953c23..10b59a9e3d8 100644 --- a/config/initializers/tracing.rb +++ b/config/initializers/tracing.rb @@ -15,7 +15,7 @@ if Labkit::Tracing.enabled? Labkit::Tracing::Rails::ActionViewSubscriber.instrument Labkit::Tracing::Rails::ActiveSupportSubscriber.instrument - # In multi-processed clustered architectures (puma, unicorn) don't + # In multi-processed clustered architectures (e.g. Puma cluster) don't # start tracing until the worker processes are spawned. This works # around issues when the opentracing implementation spawns threads Gitlab::Cluster::LifecycleEvents.on_worker_start do |