Skip to content

[#1444] Pass parent trace to sidekiq job #1570

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Closed
wants to merge 2 commits into from
Closed

[#1444] Pass parent trace to sidekiq job #1570

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
f7cf846
[#1444] Pass parent trace to sidekiq job
sivag-csod Jul 7, 2025
2c944d0
Merge branch 'main' into pass-parent-trace-to-sidekiq
sivagollapalli Jul 10, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
24 changes: 23 additions & 1 deletion lib/elastic_apm/spies/sidekiq.rb
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -30,7 +30,15 @@ class SidekiqSpy
class Middleware
def call(_worker, job, queue)
name = SidekiqSpy.name_for(job)
transaction = ElasticAPM.start_transaction(name, 'Sidekiq')

transaction = if job['trace_id']
ElasticAPM.start_transaction(name, 'Sidekiq', trace_context: ElasticAPM::TraceContext.new(
traceparent: ElasticAPM::TraceContext::Traceparent.new(trace_id: job['trace_id'])
))
else
ElasticAPM.start_transaction(name, 'Sidekiq')
end

ElasticAPM.set_label(:queue, queue)

yield
Expand All @@ -47,6 +55,14 @@ def call(_worker, job, queue)
end
end

class ParentTraceMiddleware
def call(job_class_or_string, job, queue, redis_pool)
job.merge!(
'trace_id' => ElasticAPM.current_transaction&.trace_id
)
end
end

def self.name_for(job)
klass = job['class']

Expand All @@ -64,6 +80,12 @@ def install_middleware
chain.add Middleware
end
end

Sidekiq.configure_client do |config|
config.client_middleware do |chain|
chain.add ParentTraceMiddleware
end
end
end

# @api private
Expand Down