From a1ea9c05fe42cfcd8fa371287f704bcc32ad33e3 Mon Sep 17 00:00:00 2001 From: Eric Mustin Date: Mon, 8 Nov 2021 18:07:56 -0500 Subject: [PATCH 1/2] chore: fix tests for sidekiq to support inline lua changes to redis calls --- .../instrumentation/sidekiq/patches/poller_test.rb | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/instrumentation/sidekiq/test/opentelemetry/instrumentation/sidekiq/patches/poller_test.rb b/instrumentation/sidekiq/test/opentelemetry/instrumentation/sidekiq/patches/poller_test.rb index e6124389d3..31357dbda9 100644 --- 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 From 1b0a7f9fd6dc3bebad7ba862675eaac4620a8df7 Mon Sep 17 00:00:00 2001 From: Eric Mustin Date: Mon, 8 Nov 2021 18:52:40 -0500 Subject: [PATCH 2/2] chore: add additional sidekiq appraisal --- instrumentation/sidekiq/Appraisals | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/instrumentation/sidekiq/Appraisals b/instrumentation/sidekiq/Appraisals index 6cb0f10e7a..008b9c89e5 100644 --- 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