From 725acd029203d95beb1c5564cc8655d28aecb8a5 Mon Sep 17 00:00:00 2001
From: Steven Harman <steven@harmanly.com>
Date: Fri, 7 Jul 2023 17:05:40 -0400
Subject: [PATCH 1/6] Add support for Sidekiq 7

Sidekiq 7 has a new internal structure and middleware is now expected to
include a module, depending on client vs server middleware. See:
https://github.com/sidekiq/sidekiq/blob/main/docs/middleware.md
---
 .github/workflows/maze-runner.yml   | 2 +-
 lib/bugsnag/integrations/sidekiq.rb | 1 +
 2 files changed, 2 insertions(+), 1 deletion(-)

diff --git a/.github/workflows/maze-runner.yml b/.github/workflows/maze-runner.yml
index c4fd4f048..da3e789f1 100644
--- a/.github/workflows/maze-runner.yml
+++ b/.github/workflows/maze-runner.yml
@@ -74,7 +74,7 @@ jobs:
       fail-fast: false
       matrix:
         ruby-version: ['2.5']
-        sidekiq-version: ['2', '3', '4', '5', '6']
+        sidekiq-version: ['2', '3', '4', '5', '6', '7']
 
     uses: ./.github/workflows/run-maze-runner.yml
     with:
diff --git a/lib/bugsnag/integrations/sidekiq.rb b/lib/bugsnag/integrations/sidekiq.rb
index 3fcb4c2bc..36dfab15e 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 = {

From 013c89cd58cbc0c9605d5b6840ad4b9d460910aa Mon Sep 17 00:00:00 2001
From: Steven Harman <steven@harmanly.com>
Date: Fri, 7 Jul 2023 17:14:20 -0400
Subject: [PATCH 2/6] Add currently supported Rubies for Sidekiq matrix

---
 .github/workflows/maze-runner.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.github/workflows/maze-runner.yml b/.github/workflows/maze-runner.yml
index da3e789f1..b7368cac4 100644
--- a/.github/workflows/maze-runner.yml
+++ b/.github/workflows/maze-runner.yml
@@ -73,7 +73,7 @@ jobs:
     strategy:
       fail-fast: false
       matrix:
-        ruby-version: ['2.5']
+        ruby-version: ['2.5', '3.0', '3.1', '3.2']
         sidekiq-version: ['2', '3', '4', '5', '6', '7']
 
     uses: ./.github/workflows/run-maze-runner.yml

From a9de6e4b983b39f0c22ece4d2785524d1a62b2f6 Mon Sep 17 00:00:00 2001
From: Joe Haines <hello@joehaines.co.uk>
Date: Fri, 14 Jul 2023 11:43:13 +0100
Subject: [PATCH 3/6] Limit number of Sidekiq jobs run on CI

---
 .github/workflows/maze-runner.yml | 9 ++++++++-
 1 file changed, 8 insertions(+), 1 deletion(-)

diff --git a/.github/workflows/maze-runner.yml b/.github/workflows/maze-runner.yml
index b7368cac4..2adfe2ae4 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', '3.0', '3.1', '3.2']
+        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:

From 63048a5ce924e42cbed8b545748013040844cc8a Mon Sep 17 00:00:00 2001
From: Joe Haines <hello@joehaines.co.uk>
Date: Fri, 14 Jul 2023 11:44:10 +0100
Subject: [PATCH 4/6] Update changelog

---
 CHANGELOG.md | 8 ++++++++
 1 file changed, 8 insertions(+)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 73bf3e488..5a13c27f1 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,6 +1,14 @@
 Changelog
 =========
 
+## TBD
+
+### 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

From 11a4c5f446b000ad20af1899b7c0ceed66c09952 Mon Sep 17 00:00:00 2001
From: Joe Haines <hello@joehaines.co.uk>
Date: Wed, 19 Jul 2023 11:27:59 +0100
Subject: [PATCH 5/6] Bump version

---
 VERSION | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/VERSION b/VERSION
index aec9b1056..4c6a35fb6 100644
--- a/VERSION
+++ b/VERSION
@@ -1 +1 @@
-6.25.2
+6.26.0

From 9b7bc0d6ad6501e472c665b921d373a5ffec9f91 Mon Sep 17 00:00:00 2001
From: Joe Haines <hello@joehaines.co.uk>
Date: Wed, 19 Jul 2023 11:28:04 +0100
Subject: [PATCH 6/6] Update changelog

---
 CHANGELOG.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 5a13c27f1..dfe723de5 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,7 +1,7 @@
 Changelog
 =========
 
-## TBD
+## v6.26.0 (19 July 2023)
 
 ### Enhancements