sidekiq-cloudwatchmetrics 2.7.0 → 2.9.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 894ace11258aeb70fd06f4201fb84f493406199eb4bce1c97cd0c2627e69c9fa
-  data.tar.gz: c88fde8c0c0564f6036c1bc0e08ea14b0b02a89fb20026adca88c400b3bc08a8
+  metadata.gz: 0a257f5be8a0e18cc15b67845764e4432e61d435fd49cac5756fa91fd7176a4c
+  data.tar.gz: a1ff163a5e499a66734616120d015dc0187e3319bbe41d158b8ef720811bdbb3
 SHA512:
-  metadata.gz: d82aecd5e61a8bcae2ab4873d47e9a3377325a8862b16dccff194cd80927c480007a4d20b966dc3c9fa60bace2ffd4db63fb5451288c7047eac1b586e0c51a62
-  data.tar.gz: dff2fa7ae30e790c5a4174597a5999852d30a0ddccba8ca2360872ee9389e8c41d6cd44109a1b8f74b940ffe87253776e6a01981e367927a8f43a0b2e6396014
+  metadata.gz: e3fe60e517ba5212f9852c5f369a003771d303072b63ca44cae37e4dafbf9bab6a0dd6c75af93caf407617029c313da81138a37b9e15741049f16cb3cbba8fff
+  data.tar.gz: 7200ad0a0139ff32aa27b25b717857354e26e9b7f5e45d252f3f3df27fdd99e1b59785b70e0b683ef0b5ab8b22b1be06c3451e98cf1507e03c0905b0667c5d89

data/lib/sidekiq/cloudwatchmetrics.rb

@@ -8,7 +8,7 @@ require "aws-sdk-cloudwatch"
 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,12 +45,22 @@ module Sidekiq::CloudWatchMetrics
 
     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
+      @interval_s = interval
       @namespace = namespace
       @process_metrics = process_metrics
       @additional_dimensions = additional_dimensions.map { |k, v| {name: k.to_s, value: v.to_s} }
@@ -70,7 +80,7 @@ module Sidekiq::CloudWatchMetrics
     def run
       logger.info { "Started Sidekiq CloudWatch Metrics Publisher" }
 
-      # Publish stats every @interval seconds, sleeping as required between runs
+      # Publish stats every @interval_s seconds, sleeping as required between runs
       now = Time.now.to_f
       tick = now
       until @stop
@@ -83,7 +93,7 @@ module Sidekiq::CloudWatchMetrics
         end
 
         now = Time.now.to_f
-        tick = [tick + @interval, now].max
+        tick = [tick + @interval_s, now].max
         sleep(tick - now) if tick > now
       end
 
@@ -248,6 +258,9 @@ module Sidekiq::CloudWatchMetrics
 
       # We can only put 20 metrics at a time
       metrics.each_slice(20) do |some_metrics|
+        if @interval_s < 60
+          metrics.each { |metric| metric.merge!(storage_resolution: 1) }
+        end
         @client.put_metric_data(
           namespace: @namespace,
           metric_data: some_metrics,

metadata

@@ -1,11 +1,10 @@
 --- !ruby/object:Gem::Specification
 name: sidekiq-cloudwatchmetrics
 version: !ruby/object:Gem::Version
-  version: 2.7.0
+  version: 2.9.0
 platform: ruby
 authors:
 - Samuel Cochran
-autorequire:
 bindir: bin
 cert_chain:
 - |
@@ -28,7 +27,7 @@ cert_chain:
   G8WXc9zUMVewWkEjS9s++xFNb/7f4dFNXCoE3pgHjzctt7gYcJVacprsg925LYHO
   WsbnbEow7BPlYOZm3rDIsEYpWqxN0lR8BakO2ToJ5RAHXahFu4K4eJtAsLk=
   -----END CERTIFICATE-----
-date: 2025-02-24 00:00:00.000000000 Z
+date: 1980-01-02 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: sidekiq
@@ -39,7 +38,7 @@ dependencies:
         version: '5.0'
     - - "<"
       - !ruby/object:Gem::Version
-        version: '8.0'
+        version: '9.0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
@@ -49,7 +48,7 @@ dependencies:
         version: '5.0'
     - - "<"
       - !ruby/object:Gem::Version
-        version: '8.0'
+        version: '9.0'
 - !ruby/object:Gem::Dependency
   name: aws-sdk-cloudwatch
   requirement: !ruby/object:Gem::Requirement
@@ -151,7 +150,6 @@ homepage: https://github.com/sj26/sidekiq-cloudwatchmetrics
 licenses:
 - MIT
 metadata: {}
-post_install_message:
 rdoc_options: []
 require_paths:
 - lib
@@ -166,8 +164,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.5.16
-signing_key:
+rubygems_version: 3.6.7
 specification_version: 4
 summary: Publish Sidekiq metrics to AWS CloudWatch
 test_files: []

metadata.gz.sig

@@ -1,3 +1 @@
-1�Ȃ���n�A
-��G(蘑�������~zy�G�8�A����������K||��+�2GR6LTxG�����I5V��e֠�(�Z(=K׆�M�
-=��s�]�›'��!�\!>j��*�I���J~ߊ��GGhG���h�ݡږB���3���ǥ��5eH�tP�/
B�&t�.��/^��H
+�i���ؔJ������������=�G���z6�'�Ю�@&�űpu�;�{�q鏿p�׮�z_�J@ �_84�h<K������1�U�- ���!ϰ����5�wG����W�I��'3���#�d^��M���f�61>�:�x�S��k���ī����07m���==�%��yp[+D��>=�����L�N�"���O�[F���W�~�`:�u+k��� �׸�}��>����1h4fϖ��a��˶4B