http_health_check 0.3.0 → 0.4.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 575cd5eaa80f9a89c3610213e7722f49d8dd05c09a239000129adc3e9eda6977
-  data.tar.gz: 97867356d935197b51be6ac31f4a6f9bf5b523dea9af82b4fa1915363d0f0dbc
+  metadata.gz: dbcda1b1c0dfb9f27c203567ceb3e903904200cf08b6b52cc89af26e34be8ab9
+  data.tar.gz: 026fe60fa05456d2cc14551964a2ff4057b010712bfbec84b67c0d171972eb9c
 SHA512:
-  metadata.gz: 248742f7916d9a854895b45f761dac4cd6a8f7a47c6419afe844b68ce79e8488cb8ae4beb2f62a711c9b76d723981f1bc33bab46dcecf4e775aa73fa96f33445
-  data.tar.gz: c5dac68feccacd62728cc5252ac7c8d3dad9ba65cbb064f37e9db4cbce67047a76652d4c479fdeb476e2cedc1230f74fef05345f04c9ad534c9e46c9bba8816c
+  metadata.gz: 1f3565af25d600fa7185f2d57d03132f81bc3b80e84f652fcb5c431bdba41eab42df4c1b6912ecacacafcf9d83c8551a67a0f3ab3191ec916563d98ae18e6e88
+  data.tar.gz: 49eec7ce633f4f3ef235acc8a23fb71d7029df2212fb9ab6fb4fdf505fa4e9265438089f74d16f22d0dbb88ea70625c771f2bb0929326994c4d337fa25da58fc

data/.bumpversion.cfg

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

data/CHANGELOG.md

@@ -1,5 +1,17 @@
 # CHANGELOG.md
 
+## 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:
+
+- add karafka consumer groups utility function
+
 ## 0.3.0 (2022-07-19)
 
 Features:

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    http_health_check (0.3.0)
+    http_health_check (0.4.1)
       rack (~> 2.0)
       webrick
 
@@ -66,6 +66,7 @@ GEM
       simplecov (~> 0.19)
     simplecov-html (0.12.3)
     simplecov_json_formatter (0.1.4)
+    thor (1.1.0)
     thread_safe (0.3.6)
     tzinfo (1.2.9)
       thread_safe (~> 0.1)
@@ -88,6 +89,7 @@ DEPENDENCIES
   rubocop (~> 0.81)
   simplecov
   simplecov-cobertura
+  thor (>= 0.20)
 
 BUNDLED WITH
    2.3.15

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.3.0'
+gem 'http_health_check', '~> 0.4.1'
 ```
 
 And then execute:
@@ -68,7 +68,7 @@ HttpHealthCheck.run_server_async(
   port: 5555,
   rack_app: HttpHealthCheck::RackApp.configure do |c|
     c.probe '/readiness/karafka', HttpHealthCheck::Probes::RubyKafka.new(
-      consumer_groups: KarafkaApp.consumer_groups.map(&:id),
+      consumer_groups: HttpHealthCheck::Utils::Karafka.consumer_groups(KarafkaApp),
       # default heartbeat interval is 3 seconds, but we want to give it
       # an ability to skip a few before failing the probe
       heartbeat_interval_sec: 10,
@@ -96,7 +96,7 @@ class KarafkaApp < Karafka::App
   end
 end
 
-KarafkaApp.consumer_groups.map(&:id)
+HttpHealthCheck::Utils::Karafka.consumer_groups(KarafkaApp)
 # => ['foo', 'foo']
 ```
 

data/http_health_check.gemspec

@@ -35,4 +35,5 @@ Gem::Specification.new do |spec|
   spec.add_development_dependency 'redis', '~> 4.2.5'
   spec.add_development_dependency 'rspec', '~> 3.2'
   spec.add_development_dependency 'rubocop', '~> 0.81'
+  spec.add_development_dependency 'thor', '>= 0.20'
 end

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/utils/karafka.rb

@@ -0,0 +1,28 @@
+# frozen_string_literal: true
+
+require 'thor'
+
+module HttpHealthCheck
+  module Utils
+    module Karafka
+      # returns a list of consumer groups configured for current process
+      #
+      # @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('-', '_') + '_'
+
+        return all_groups if program_name.split('/').last != 'karafka'
+        return all_groups if argv[0] != 'server'
+
+        parsed_option = Thor::Options.new(
+          consumer_groups: Thor::Option.new(:consumer_groups, type: :array, default: nil, aliases: :g)
+        ).parse(argv).fetch('consumer_groups', []).first.to_s
+        return all_groups if parsed_option == ''
+
+        groups_from_option = parsed_option.split(' ').map { |g| client_id_prefix + g } & all_groups
+        groups_from_option.empty? ? all_groups : groups_from_option
+      end
+    end
+  end
+end

data/lib/http_health_check/utils.rb

@@ -0,0 +1,7 @@
+# frozen_string_literal: true
+
+require_relative 'utils/karafka' if defined?(::Karafka::App)
+
+module HttpHealthCheck
+  module Utils; end
+end

data/lib/http_health_check/version.rb

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

data/lib/http_health_check.rb

@@ -7,6 +7,7 @@ require_relative 'http_health_check/config/dsl'
 require_relative 'http_health_check/probe'
 require_relative 'http_health_check/rack_app'
 require_relative 'http_health_check/probes'
+require_relative 'http_health_check/utils'
 
 module HttpHealthCheck
   class Error < StandardError; end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: http_health_check
 version: !ruby/object:Gem::Version
-  version: 0.3.0
+  version: 0.4.1
 platform: ruby
 authors:
 - SberMarket team
 autorequire:
 bindir: exe
 cert_chain: []
-date: 2022-07-19 00:00:00.000000000 Z
+date: 2022-08-05 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rack
@@ -108,6 +108,20 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '0.81'
+- !ruby/object:Gem::Dependency
+  name: thor
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0.20'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0.20'
 description: Simple and extensible HTTP health checks server.
 email:
 - pochi.73@gmail.com
@@ -141,6 +155,8 @@ files:
 - lib/http_health_check/probes/ruby_kafka.rb
 - lib/http_health_check/probes/sidekiq.rb
 - lib/http_health_check/rack_app.rb
+- lib/http_health_check/utils.rb
+- lib/http_health_check/utils/karafka.rb
 - lib/http_health_check/version.rb
 homepage: https://github.com/SberMarket-Tech/http_health_check
 licenses: