Skip to content

Commit 3e304c2

Browse files
test: Fix Sidekiq NameError ActiveJob (#1425)
Sidekiq v7.3.9 fixed a load ordering problem where it was requiring its ActiveJob Adapter too early: sidekiq/sidekiq@886e434 Our tests relied on this load ordering bug so the suite started failing: https://github.com/open-telemetry/opentelemetry-ruby-contrib/actions/runs/13447267345/job/37575230194 ```console /opt/hostedtoolcache/Ruby/3.4.1/x64/lib/ruby/gems/3.4.0/gems/sidekiq-7.3.9/lib/active_job/queue_adapters/sidekiq_adapter.rb:71:in '<class:SidekiqAdapter>': uninitialized constant Sidekiq::ActiveJob (NameError) class JobWrapper < Sidekiq::ActiveJob::Wrapper ``` This change borrows from Sidekiq's test suite to ensure the Rails integration is loaded: https://github.com/sidekiq/sidekiq/blob/main/test/helper.rb#L75
1 parent 7c04e40 commit 3e304c2

File tree

2 files changed

+4
-3
lines changed

2 files changed

+4
-3
lines changed

instrumentation/sidekiq/opentelemetry-instrumentation-sidekiq.gemspec

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -28,12 +28,12 @@ Gem::Specification.new do |spec|
2828
spec.add_dependency 'opentelemetry-api', '~> 1.0'
2929
spec.add_dependency 'opentelemetry-instrumentation-base', '~> 0.23.0'
3030

31-
spec.add_development_dependency 'activejob', '>= 6.0'
3231
spec.add_development_dependency 'appraisal', '~> 2.5'
3332
spec.add_development_dependency 'bundler', '~> 2.4'
3433
spec.add_development_dependency 'minitest', '~> 5.0'
3534
spec.add_development_dependency 'opentelemetry-sdk', '~> 1.1'
3635
spec.add_development_dependency 'opentelemetry-test-helpers', '~> 0.3'
36+
spec.add_development_dependency 'rails', '>= 7.0'
3737
spec.add_development_dependency 'rspec-mocks'
3838
spec.add_development_dependency 'rubocop', '~> 1.71.0'
3939
spec.add_development_dependency 'rubocop-performance', '~> 1.23.0'

instrumentation/sidekiq/test/test_helper.rb

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -8,10 +8,11 @@
88
require 'bundler/setup'
99
Bundler.require(:default, :development, :test)
1010

11-
require 'active_job'
12-
1311
require 'minitest/autorun'
1412
require 'rspec/mocks/minitest_integration'
13+
require 'rails'
14+
require 'active_job'
15+
require 'sidekiq/rails'
1516
require 'sidekiq/testing'
1617

1718
if Gem::Version.new(Sidekiq::VERSION) >= Gem::Version.new('7.0.0')

0 commit comments

Comments
 (0)