sidekiq_status_monitor 1.0.1 → 1.3.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 1fb83885ad80397022235ff27e46d85eac13daf7b099c1a1c4b0eb1774b19163
-  data.tar.gz: 125eebb6cd0f9ab6b62098c9e1dd5b813e93167b98e3971e2fbca4b45d73548b
+  metadata.gz: 43f743fdd2f2a6715c72c09ab7e6a2c2635eb86c831834e93186fdf8bb93d7cb
+  data.tar.gz: 872cc70e64be7482f1861295d0f6d42f8f0aa0585243ef5be96d058afbad675e
 SHA512:
-  metadata.gz: 800faf00a933fe75c179a97f418268c3c108529eba8d62b9fa892b94d0a0cd6388778afd59f35b0220b530ce7d666a3ecb6d4b4744b4c3dcbe3bc53d6b2cb0a9
-  data.tar.gz: dceef546daac35a56fa9a386d902b81573a69b5f62143798fab82777c08e2b899e1412ea6fde07e82391faee8e73134cd7d955b1fe0c21ff206288ca90d31488
+  metadata.gz: 0bc646670c6033a0323b6e460ff8efdd9fb1f07ef527d623a5811da2ac981489a831528f190fe49ee401734487920bbdb419193665d2615414b0b37bb8c637cd
+  data.tar.gz: 1d1864b8d2a9c5b91df6307b50a734f3de2500692ae4e9f3dfa89686e0024db4cb9a7de40f12c6050ecaf50d64d695e56e9988953526b1d82e3fa547aa45acd7

data/README.md

@@ -10,32 +10,9 @@ This library can be used to check sidekiq health outside kubernetes.
 
 **How?**
 
-A http server is started and on each requests validates that a liveness key is stored in Redis. If it is there means is working.
+An additional HTTP server is started during Sidekiq worker initialisation and on each request validates that the Sidekiq worker metrics look healthy.
 
-A Sidekiq worker is the responsible to storing this key. If Sidekiq stops processing workers
-this key gets expired by Redis an consequently the http server will return a 500 error.
-
-This worker is responsible to requeue itself for the next liveness probe.
-
-Each instance in kubernetes will be checked based on `ENV` variable `HOSTNAME` (kubernetes sets this for each replica/pod).
-
-On initialization SidekiqStatusMonitor will asign to Sidekiq::Worker a queue with the current host and add this queue to the current instance queues to process.
-
-example:
-
-```
-hostname: foo
-  Worker queue: sidekiq_status_monitor-foo
-  instance queues:
-   - sidekiq_status_monitor-foo
-   *- your queues
-
-hostname: bar
-  Worker queue: sidekiq_status_monitor-bar
-  instance queues:
-   - sidekiq_status_monitor-bar
-   *- your queues
-```
+It reports either 200 or 500 HTTP code with additional JSON payload which includes metrics values.
 
 ## Installation
 

data/lib/sidekiq_status_monitor/config.rb

@@ -5,16 +5,16 @@ module SidekiqStatusMonitor
     include Singleton
 
     attr_accessor :host,
-                  :port,
-                  :path,
-                  :server,
-                  :logger,
-                  :shutdown_callback,
-                  :workers_size_threshold,
-                  :process_set_size_threshold,
-                  :queues_size_threshold,
-                  :queue_latency_threshold,
-                  :queue_size_threshold
+      :port,
+      :path,
+      :server,
+      :logger,
+      :shutdown_callback,
+      :workers_size_threshold,
+      :process_set_size_threshold,
+      :queues_size_threshold,
+      :queue_latency_threshold,
+      :queue_size_threshold
 
     def initialize
       set_defaults

data/lib/sidekiq_status_monitor/redis/redis_client_gem.rb

@@ -43,9 +43,9 @@ module SidekiqStatusMonitor
 
       private
 
-      def redis(&block)
+      def redis(&)
         # Default to Sidekiq.redis if capsule is not configured yet but redis adapter is accessed
-        (@capsule || Sidekiq).redis(&block)
+        (@capsule || Sidekiq).redis(&)
       end
     end
   end

data/lib/sidekiq_status_monitor/redis/redis_gem.rb

@@ -37,8 +37,8 @@ module SidekiqStatusMonitor
 
       private
 
-      def redis(&block)
-        Sidekiq.redis(&block)
+      def redis(&)
+        Sidekiq.redis(&)
       end
     end
   end

data/lib/sidekiq_status_monitor/server.rb

@@ -1,6 +1,6 @@
 # frozen_string_literal: true
 
-require "rack"
+require "rackup"
 
 module SidekiqStatusMonitor
   class Server
@@ -14,7 +14,7 @@ module SidekiqStatusMonitor
     end
 
     def run!
-      handler = Rack::Handler.get(@engine)
+      handler = Rackup::Handler.get(@engine)
       Signal.trap("TERM") { handler.shutdown }
       handler.run(
         self,
@@ -36,7 +36,7 @@ module SidekiqStatusMonitor
     def call(_env)
       [
         alive? ? 200 : 500,
-        { "Content-Type" => "application/json" },
+        {"Content-Type" => "application/json"},
         [payload.to_json]
       ]
     end

data/lib/sidekiq_status_monitor/version.rb

@@ -1,3 +1,3 @@
 module SidekiqStatusMonitor
-  VERSION = '1.0.1'
+  VERSION = "1.3.0"
 end

data/lib/sidekiq_status_monitor.rb

@@ -101,8 +101,8 @@ module SidekiqStatusMonitor
       queues.map(&:name).uniq.sort
     end
 
-    def self.new_probe(name, &block)
-      define_method("#{PROBE_METHOD_PREFIX}#{name}", &block)
+    def self.new_probe(name, &)
+      define_method(:"#{PROBE_METHOD_PREFIX}#{name}", &)
     end
 
     new_probe :workers_size do
@@ -126,7 +126,7 @@ module SidekiqStatusMonitor
     end
 
     def probes
-      methods.grep(/^#{PROBE_METHOD_PREFIX}/).map { |m| [m, send(m)] }.to_h
+      methods.grep(/^#{PROBE_METHOD_PREFIX}/o).map { |m| [m, send(m)] }.to_h
     end
 
     def alive?

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: sidekiq_status_monitor
 version: !ruby/object:Gem::Version
-  version: 1.0.1
+  version: 1.3.0
 platform: ruby
 authors:
 - Andrei Makarov
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2023-10-12 00:00:00.000000000 Z
+date: 2024-06-12 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -95,47 +95,61 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '4.0'
 - !ruby/object:Gem::Dependency
-  name: rubocop-shopify
+  name: solargraph
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '2.10'
+        version: 0.49.0
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '2.10'
+        version: 0.49.0
 - !ruby/object:Gem::Dependency
-  name: solargraph
+  name: standard
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.49.0
+        version: '1'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.49.0
+        version: '1'
 - !ruby/object:Gem::Dependency
-  name: rack
+  name: standard-performance
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "<"
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '3'
-  type: :runtime
+        version: '1'
+  type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "<"
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '3'
+        version: '1'
+- !ruby/object:Gem::Dependency
+  name: standard-rspec
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '0.2'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '0.2'
 - !ruby/object:Gem::Dependency
   name: sidekiq
   requirement: !ruby/object:Gem::Requirement
@@ -176,6 +190,26 @@ dependencies:
     - - "<"
       - !ruby/object:Gem::Version
         version: '2'
+- !ruby/object:Gem::Dependency
+  name: rackup
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '2'
+    - - "<"
+      - !ruby/object:Gem::Version
+        version: '3'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '2'
+    - - "<"
+      - !ruby/object:Gem::Version
+        version: '3'
 description: |
   SidekiqStatusMonitor offers a solution to add HTTP server for the sidekiq instance.
 
@@ -206,7 +240,7 @@ metadata:
   homepage_uri: https://github.com/amkisko/sidekiq_status_monitor
   source_code_uri: https://github.com/amkisko/sidekiq_status_monitor
   changelog_uri: https://github.com/amkisko/sidekiq_status_monitor/releases
-  documentation_uri: https://github.com/amkisko/sidekiq_status_monitor/blob/v1.0.1/README.md
+  documentation_uri: https://github.com/amkisko/sidekiq_status_monitor/blob/v1.3.0/README.md
   bug_tracker_uri: https://github.com/amkisko/sidekiq_status_monitor/issues
 post_install_message:
 rdoc_options: []
@@ -223,7 +257,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.4.19
+rubygems_version: 3.5.9
 signing_key:
 specification_version: 4
 summary: Rack server that outputs HTTP JSON status of sidekiq instance for alive/liveness