Merge pull request #52 from sj26/sidekiq-8

Sidekiq 8

Author: sj26

.github/workflows/ci.yml

@@ -15,7 +15,13 @@ jobs:
       fail-fast: false
       matrix:
         ruby-version: ['2.7', '3.0', '3.1', '3.2']
-        bundle-gemfile: ['Gemfile', 'Gemfile.sidekiq-5', 'Gemfile.sidekiq-6', 'Gemfile.sidekiq-6-0', 'Gemfile.sidekiq-7']
+        bundle-gemfile: ['Gemfile', 'Gemfile.sidekiq-5', 'Gemfile.sidekiq-6', 'Gemfile.sidekiq-6-0', 'Gemfile.sidekiq-7', 'Gemfile.sidekiq-8']
+        exclude:
+          # Sidekiq 8 requires ruby >= 3.2
+          - { bundle-gemfile: 'Gemfile.sidekiq-8', ruby-version: '2.7' }
+          - { bundle-gemfile: 'Gemfile.sidekiq-8', ruby-version: '3.0' }
+          - { bundle-gemfile: 'Gemfile.sidekiq-8', ruby-version: '3.1' }
+
 
     steps:
     - uses: actions/checkout@v2

Gemfile.sidekiq-8

@@ -0,0 +1,6 @@
+source "https://rubygems.org"
+
+# Specify your gem's dependencies in sidekiq-cloudwatch.gemspec
+gemspec
+
+gem "sidekiq", "~> 8.0"

lib/sidekiq/cloudwatchmetrics.rb

@@ -8,7 +8,7 @@
 module Sidekiq::CloudWatchMetrics
   def self.enable!(**kwargs)
     Sidekiq.configure_server do |config|
-      publisher = Publisher.new(**kwargs)
+      publisher = Publisher.new(config: config, **kwargs)
 
       # Sidekiq enterprise has a globally unique leader thread, making it
       # easier to publish the cluster-wide metrics from one place.
@@ -45,10 +45,20 @@ class Publisher
 
     DEFAULT_INTERVAL = 60 # seconds
 
-    def initialize(config: Sidekiq, client: Aws::CloudWatch::Client.new, namespace: "Sidekiq", process_metrics: true, additional_dimensions: {}, interval: DEFAULT_INTERVAL)
-      # Sidekiq 6.5+ requires @config, which defaults to the top-level
-      # `Sidekiq` module, but can be overridden when running multiple Sidekiqs.
+    private def default_config
+      # Sidekiq::Config was introduced in sidekiq 7 and has a default
+      if Sidekiq.respond_to?(:default_configuration)
+        Sidekiq.default_configuration
+      else
+        # in older versions, it's just the `Sidekiq` module
+        Sidekiq
+      end
+    end
+
+    def initialize(config: default_config, client: Aws::CloudWatch::Client.new, namespace: "Sidekiq", process_metrics: true, additional_dimensions: {}, interval: DEFAULT_INTERVAL)
+      # Required by Sidekiq::Component (in sidekiq 6.5+)
       @config = config
+
       @client = client
       @interval = interval
       @namespace = namespace

sidekiq-cloudwatchmetrics.gemspec

@@ -19,7 +19,7 @@ Gem::Specification.new do |spec|
 
   spec.required_ruby_version = ">= 2.7"
 
-  spec.add_runtime_dependency "sidekiq", ">= 5.0", "< 8.0"
+  spec.add_runtime_dependency "sidekiq", ">= 5.0", "< 9.0"
   spec.add_runtime_dependency "aws-sdk-cloudwatch", "~> 1.6"
 
   spec.add_development_dependency "bundler", "~> 2.2"