diff --git a/.github/workflows/maze-runner.yml b/.github/workflows/maze-runner.yml index c4fd4f04..2adfe2ae 100644 --- a/.github/workflows/maze-runner.yml +++ b/.github/workflows/maze-runner.yml @@ -73,8 +73,15 @@ jobs: strategy: fail-fast: false matrix: - ruby-version: ['2.5'] - sidekiq-version: ['2', '3', '4', '5', '6'] + ruby-version: ['2.5', '2.7'] + sidekiq-version: ['2', '3', '4', '5', '6', '7'] + include: + - ruby-version: '3.2' + sidekiq-version: '7' + exclude: + # 2.7 is the minimum ruby version that sidekiq 7 supports + - ruby-version: '2.5' + sidekiq-version: '7' uses: ./.github/workflows/run-maze-runner.yml with: diff --git a/CHANGELOG.md b/CHANGELOG.md index 73bf3e48..dfe723de 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,6 +1,14 @@ Changelog ========= +## v6.26.0 (19 July 2023) + +### Enhancements + +* Support Sidekiq v7 + | [#785](https://github.com/bugsnag/bugsnag-ruby/pull/785) + | [stevenharman](https://github.com/stevenharman) + ## v6.25.2 (7 February 2023) ### Enhancements diff --git a/VERSION b/VERSION index aec9b105..4c6a35fb 100644 --- a/VERSION +++ b/VERSION @@ -1 +1 @@ -6.25.2 +6.26.0 diff --git a/lib/bugsnag/integrations/sidekiq.rb b/lib/bugsnag/integrations/sidekiq.rb index 3fcb4c2b..36dfab15 100644 --- a/lib/bugsnag/integrations/sidekiq.rb +++ b/lib/bugsnag/integrations/sidekiq.rb @@ -4,6 +4,7 @@ module Bugsnag ## # Extracts and attaches Sidekiq job and queue information to an error report class Sidekiq + include ::Sidekiq::ServerMiddleware if defined?(::Sidekiq::ServerMiddleware) unless const_defined?(:FRAMEWORK_ATTRIBUTES) FRAMEWORK_ATTRIBUTES = {