Ensure Sidekiq client middleware is same for clients & servers

DataDog · Jun 29, 2020 · 2b5e400 · 2b5e400
1 parent f5733c8
commit 2b5e400
Showing 1 changed file with 8 additions and 1 deletion.
diff --git a/lib/ddtrace/contrib/sidekiq/patcher.rb b/lib/ddtrace/contrib/sidekiq/patcher.rb
@@ -15,14 +15,21 @@ def target_version
 
         def patch
           require 'ddtrace/contrib/sidekiq/client_tracer'
+          require 'ddtrace/contrib/sidekiq/server_tracer'
+
           ::Sidekiq.configure_client do |config|
             config.client_middleware do |chain|
               chain.add(Sidekiq::ClientTracer)
             end
           end
 
-          require 'ddtrace/contrib/sidekiq/server_tracer'
           ::Sidekiq.configure_server do |config|
+            # If a job enqueues another job, make sure it has the same client
+            # middleware.
+            config.client_middleware do |chain|
+              chain.add(Sidekiq::ClientTracer)
+            end
+
             config.server_middleware do |chain|
               chain.add(Sidekiq::ServerTracer)
             end