http_health_check 0.4.0 → 0.5.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 1ae08f694494aa01e0667a635ae85163e9d675da9a8e97bb1ad9194296c113d0
-  data.tar.gz: 44b3ae8a18369eaf1da10c9ba7283272a395f2afda8fe6e964cc2fc1643e2bc5
+  metadata.gz: fe6031466ea56c2d002940f78153ae48ace1db21fdca05deac22a0db3ce94b1f
+  data.tar.gz: 6fc203cedf7f1a230651dca1fb6843fb96c5faeb4c1c3fa7d6a3225ea74215bf
 SHA512:
-  metadata.gz: '069a950fe9727f24980ad7b38014d73369a7963796606c2d3fddfdfa13da3e710776ba24174dfc9d511175a65d05aa40b6b3f5d15aba3c53380f84a088af3309'
-  data.tar.gz: b149e9ae46abbcc0131f652135e19aca4e747adaa3f39913457a0e768f38b1b697fd470ffc1bc6e2eee952b847bf8359a1653d699a34f41cf8f0e44c9a76a6fb
+  metadata.gz: d03662d8504a522417506da75186369e283eabb8a530a7ca7d57c0e89f15e5904ff78c92b19f34f6744d0d8b9c66977f5716e639b1a68358af07afd6f9f9e99f
+  data.tar.gz: 516019244efc6596266b887382bfb72e2a047674c30386fae8a15969a11673249f2dfd9673e0cfbcecfbc6dc93a8bc7f3823b8a4b1662e4c92619aadd6a02d14

data/.bumpversion.cfg

@@ -1,5 +1,5 @@
 [bumpversion]
-current_version = 0.4.0
+current_version = 0.4.1
 commit = True
 tag = True
 tag_name = {new_version}

data/.tool-versions

@@ -1 +1 @@
-ruby 2.5.8
+ruby 3.2.0

data/CHANGELOG.md

@@ -1,5 +1,17 @@
 # CHANGELOG.md
 
+## 0.5.0 (2023-08-16)
+
+Features:
+
+- Add Sidekiq 6+ support [PR#4](https://github.com/SberMarket-Tech/http_health_check/pull/4)
+
+## 0.4.1 (2022-08-05)
+
+Fix:
+
+- Fix DelayedJob probe [PR#2](https://github.com/SberMarket-Tech/http_health_check/pull/2)
+
 ## 0.4.0 (2022-07-20)
 
 Features:

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    http_health_check (0.4.0)
+    http_health_check (0.4.1)
       rack (~> 2.0)
       webrick
 
@@ -15,6 +15,7 @@ GEM
       tzinfo (~> 1.1)
     ast (2.4.2)
     concurrent-ruby (1.1.10)
+    connection_pool (2.4.1)
     diff-lcs (1.5.0)
     docile (1.4.0)
     dotenv (2.7.6)
@@ -28,6 +29,8 @@ GEM
     rainbow (3.1.1)
     rake (13.0.6)
     redis (4.2.5)
+    redis-client (0.15.0)
+      connection_pool
     regexp_parser (2.5.0)
     rexml (3.2.5)
     rspec (3.11.0)
@@ -84,6 +87,7 @@ DEPENDENCIES
   http_health_check!
   rake (~> 13.0)
   redis (~> 4.2.5)
+  redis-client (~> 0.15.0)
   rspec (~> 3.2)
   rspec_junit_formatter
   rubocop (~> 0.81)

data/README.md

@@ -11,7 +11,7 @@ HttpHealthCheck is built with kubernetes health probes in mind, but it can be us
 Add this line to your application's Gemfile:
 
 ```ruby
-gem 'http_health_check', '~> 0.4.0'
+gem 'http_health_check', '~> 0.4.1'
 ```
 
 And then execute:
@@ -203,7 +203,7 @@ Be aware that this approach does not cover issues with sidekiq being stuck proce
 
 ```ruby
 HttpHealthCheck.configure do |config|
-  config.probe '/readiness/delayed_job', HttpHealthCheck::Probes::Sidekiq.new
+  config.probe '/readiness/sidekiq', HttpHealthCheck::Probes::Sidekiq.new
 end
 ```
 

data/http_health_check.gemspec

@@ -33,6 +33,7 @@ Gem::Specification.new do |spec|
   spec.add_development_dependency 'activesupport', '~> 5.0'
   spec.add_development_dependency 'dotenv', '~> 2.7.6'
   spec.add_development_dependency 'redis', '~> 4.2.5'
+  spec.add_development_dependency 'redis-client', '~> 0.15.0'
   spec.add_development_dependency 'rspec', '~> 3.2'
   spec.add_development_dependency 'rubocop', '~> 0.81'
   spec.add_development_dependency 'thor', '>= 0.20'

data/lib/http_health_check/probes/delayed_job.rb

@@ -17,6 +17,7 @@ module HttpHealthCheck
       end
 
       def probe(_env)
+        @delayed_job.where(queue: HealthCheckJob.queue_name).each(&:destroy!)
         @delayed_job.enqueue(HealthCheckJob).destroy!
         probe_ok
       end

data/lib/http_health_check/probes/sidekiq.rb

@@ -14,7 +14,7 @@ module HttpHealthCheck
 
       def probe(_env)
         @sidekiq_module.redis do |conn|
-          conn.setex(meta[:redis_key], TTL_SEC, MAGIC_NUMBER)
+          conn.call('SET', meta[:redis_key], MAGIC_NUMBER, 'EX', TTL_SEC)
           probe_ok
         end
       end

data/lib/http_health_check/utils/karafka.rb

@@ -10,7 +10,7 @@ module HttpHealthCheck
       # @param karafka_app descendant of Karafka::App
       def self.consumer_groups(karafka_app, program_name: $PROGRAM_NAME, argv: ARGV) # rubocop:disable Metrics/AbcSize
         all_groups = karafka_app.consumer_groups.map(&:id)
-        client_id_prefix = karafka_app.config.client_id.gsub('-', '_') + '_'
+        client_id_prefix = "#{karafka_app.config.client_id.gsub('-', '_')}_"
 
         return all_groups if program_name.split('/').last != 'karafka'
         return all_groups if argv[0] != 'server'

data/lib/http_health_check/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module HttpHealthCheck
-  VERSION = '0.4.0'
+  VERSION = '0.5.0'
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: http_health_check
 version: !ruby/object:Gem::Version
-  version: 0.4.0
+  version: 0.5.0
 platform: ruby
 authors:
 - SberMarket team
 autorequire:
 bindir: exe
 cert_chain: []
-date: 2022-07-20 00:00:00.000000000 Z
+date: 2023-08-16 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rack
@@ -80,6 +80,20 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: 4.2.5
+- !ruby/object:Gem::Dependency
+  name: redis-client
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: 0.15.0
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: 0.15.0
 - !ruby/object:Gem::Dependency
   name: rspec
   requirement: !ruby/object:Gem::Requirement
@@ -181,7 +195,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.2.3
+rubygems_version: 3.4.1
 signing_key:
 specification_version: 4
 summary: Simple and extensible HTTP health checks server.