chore: fix tests for sidekiq to support inline lua changes (#1011)

* chore: fix tests for sidekiq to support inline lua changes to redis calls * chore: add additional sidekiq appraisal
open-telemetry · Nov 9, 2021 · a8082e6 · a8082e6
1 parent e099eca
commit a8082e6
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 1 deletion.
diff --git a/instrumentation/sidekiq/Appraisals b/instrumentation/sidekiq/Appraisals
@@ -1,5 +1,9 @@
 # frozen_string_literal: true
 
+appraise 'sidekiq-6.3' do
+  gem 'sidekiq', '~> 6.3'
+end
+
 appraise 'sidekiq-6.1' do
   gem 'sidekiq', '~> 6.1'
 end

diff --git a/instrumentation/sidekiq/test/opentelemetry/instrumentation/sidekiq/patches/poller_test.rb b/instrumentation/sidekiq/test/opentelemetry/instrumentation/sidekiq/patches/poller_test.rb
@@ -46,7 +46,8 @@
         poller.enqueue
         span_names = spans.map(&:name)
         _(span_names).must_include('Sidekiq::Scheduled::Poller#enqueue')
-        _(span_names).must_include('ZRANGEBYSCORE')
+        # Inline Lua uses a different redis client method in 6.3+ https://github.com/mperham/sidekiq/pull/5044
+        _(span_names).must_include('ZRANGEBYSCORE') if Gem.loaded_specs['sidekiq'].version < Gem::Version.new('6.3')
       end
 
       describe 'when peer_service config is set' do