From 4e0f7d1c843d555b7b6350443663e493fbd422b6 Mon Sep 17 00:00:00 2001 From: Peter Solnica Date: Wed, 10 Dec 2025 11:56:56 +0000 Subject: [PATCH 1/2] fix(sidekiq): fix failing integration spec --- sentry-sidekiq/spec/isolated/rails_spec.rb | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/sentry-sidekiq/spec/isolated/rails_spec.rb b/sentry-sidekiq/spec/isolated/rails_spec.rb index 1a64c376b..529655315 100644 --- a/sentry-sidekiq/spec/isolated/rails_spec.rb +++ b/sentry-sidekiq/spec/isolated/rails_spec.rb @@ -12,6 +12,14 @@ # which checks if Railtie is defined to properly set things up require_relative "../spec_helper" +# This is needed to prevent Sidekiq 6.5 crash +if Sidekiq::VERSION >= Gem::Version.new("6.5") && Sidekiq::VERSION < Gem::Version.new("7.0") + # NoMethodError: + # undefined method 'broadcast' for class ActiveSupport::Logger + # /workspace/sentry/vendor/gems/3.4.5/gems/sidekiq-6.5.7/lib/sidekiq/rails.rb:46:in 'block (2 levels) in ' + Rails.logger = Logger.new($stdout) +end + class TestApp < Rails::Application end From 48f223abb9493875123491af67de0eb0a600af6e Mon Sep 17 00:00:00 2001 From: Peter Solnica Date: Wed, 10 Dec 2025 12:02:46 +0000 Subject: [PATCH 2/2] chore(sidekiq): establish SIDEKIQ_VERSION const --- sentry-sidekiq/spec/isolated/rails_spec.rb | 2 +- sentry-sidekiq/spec/spec_helper.rb | 8 +++++--- 2 files changed, 6 insertions(+), 4 deletions(-) diff --git a/sentry-sidekiq/spec/isolated/rails_spec.rb b/sentry-sidekiq/spec/isolated/rails_spec.rb index 529655315..7fad22de8 100644 --- a/sentry-sidekiq/spec/isolated/rails_spec.rb +++ b/sentry-sidekiq/spec/isolated/rails_spec.rb @@ -13,7 +13,7 @@ require_relative "../spec_helper" # This is needed to prevent Sidekiq 6.5 crash -if Sidekiq::VERSION >= Gem::Version.new("6.5") && Sidekiq::VERSION < Gem::Version.new("7.0") +if SIDEKIQ_VERSION >= Gem::Version.new("6.5") && SIDEKIQ_VERSION < Gem::Version.new("7.0") # NoMethodError: # undefined method 'broadcast' for class ActiveSupport::Logger # /workspace/sentry/vendor/gems/3.4.5/gems/sidekiq-6.5.7/lib/sidekiq/rails.rb:46:in 'block (2 levels) in ' diff --git a/sentry-sidekiq/spec/spec_helper.rb b/sentry-sidekiq/spec/spec_helper.rb index 35454aac9..5ac2349ac 100644 --- a/sentry-sidekiq/spec/spec_helper.rb +++ b/sentry-sidekiq/spec/spec_helper.rb @@ -9,9 +9,11 @@ # this enables sidekiq's server mode require "sidekiq/cli" -MIN_SIDEKIQ_6 = Gem::Version.new(Sidekiq::VERSION) >= Gem::Version.new("6.0") -WITH_SIDEKIQ_7 = Gem::Version.new(Sidekiq::VERSION) >= Gem::Version.new("7.0") -WITH_SIDEKIQ_8 = Gem::Version.new(Sidekiq::VERSION) >= Gem::Version.new("8.0.0") +SIDEKIQ_VERSION = Gem::Version.new(Sidekiq::VERSION) + +MIN_SIDEKIQ_6 = SIDEKIQ_VERSION >= Gem::Version.new("6.0") +WITH_SIDEKIQ_7 = SIDEKIQ_VERSION >= Gem::Version.new("7.0") +WITH_SIDEKIQ_8 = SIDEKIQ_VERSION >= Gem::Version.new("8.0.0") WITH_SIDEKIQ_6 = MIN_SIDEKIQ_6 && !WITH_SIDEKIQ_7 require "sidekiq/embedded" if WITH_SIDEKIQ_7