kubernetes-health 3.10.1 → 3.11.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 4b3784236c03b3d08c9509f94da9e16cb0fb29f642f678684b20ef03d0b56a23
-  data.tar.gz: 3dd137f774090002773184febbd91ee0a520e4cd76cb414f74b113f96fe19473
+  metadata.gz: 588adb5d1b5a937a87c4c71f9b98902faee308d64b679df40784bbf66a7a8cc1
+  data.tar.gz: ebecbf287f66d584e48b22cbf038dd042cb32bfc7dde3be298c9cc87766ed0fe
 SHA512:
-  metadata.gz: b49429f971fad38a11dc3a65cca1553b8e7bc7463f2ca24b3a85d31d59e95506fcf79f6fbbe17cf2efade3e234b29556839171b0a5fec0791adb0456fcb313bc
-  data.tar.gz: 5d1f22d376003de55156937fb7449ae2f233a5c8f4a0ff1956c72f0f41cd773101ffb1b335d1ba1c33c1ea4d88186e7089c5589428a2ee3c0ebfc3345bee14ef
+  metadata.gz: cd730152d639adbf4402234873b77c00573a61c4c56c8d8ccfd2868518bba40fb3fa0fd7245e38543b52bed32c92647ce4d875af16d9af08bd2f93ae2ee92a4a
+  data.tar.gz: 9862d03e7c574cdb148473f47ce872f8a83c072fd28f49e7e0fec1c8e4ccd073edfaf1eb4d0b77077299e79ed2f6a56105c7189cc6fdea1f99543062b5886dc5

data/README.md

@@ -16,7 +16,7 @@ This gem open a HTTP port for monitoring your rails app while it is running Migr
 Add this line to your application's Gemfile:
 
 ```ruby
-gem 'kubernetes-health', '~> 3.6'
+gem 'kubernetes-health', '~> 3.7'
 ```
 
 ## Enabling puma plugin
@@ -62,7 +62,7 @@ or add in your `application.rb`.
 # default: false
 Kubernetes::Health::Config.enable_rack_on_migrate = true
 ```
-The defined port at `config/puma.rb` will be used.
+The defined port at `config/puma.rb` will be used but can be overrided by `KUBERNETES_HEALTH_METRICS_PORT` env var.
 
 ## Enabling monitoring for `sidekiq`
 
@@ -74,7 +74,7 @@ or add in your `application.rb`.
 # default: false
 Kubernetes::Health::Config.enable_rack_on_sidekiq = true
 ```
-The defined port at `config/puma.rb` will be used.
+The defined port at `config/puma.rb` will be used but can be overrided by `KUBERNETES_HEALTH_METRICS_PORT` env var.
 
 ### How `rake db:migrate` and `sidekiq` monitoring works
 It will run a RACK server for `/_readiness`, `/_liveness` and `/_metrics`.

data/config/initializers/enable_rack_on_sidekiq.rb

@@ -2,6 +2,6 @@ require 'kubernetes/health/rack_on_sidekiq'
 
 if Kubernetes::Health::Config.enable_rack_on_sidekiq && Kubernetes::Health::SidekiqOptionsResolver[:concurrency].positive?
   Thread.new do
-    Rack::Handler.default.run Kubernetes::Health::RackOnSidekiq.new
+    Rack::Handler::WEBrick.run Kubernetes::Health::RackOnSidekiq.new, { Port:  Kubernetes::Health::Config.metrics_port }
   end
 end

data/lib/kubernetes/health/config.rb

@@ -1,8 +1,10 @@
 module Kubernetes
   module Health
     class Config
+      METRICS_PORT_FROM_PUMA_CONFIG = File.read(File.join(Rails.root, 'config', 'puma.rb')).match(/kubernetes_url\s.+:(?<metrics_port>\d+)/)['metrics_port'] rescue nil
       @@live_if = lambda { true }
       @@ready_if = lambda { true }
+      @@metrics_port = ENV['KUBERNETES_HEALTH_METRICS_PORT'] || METRICS_PORT_FROM_PUMA_CONFIG || 9393
       @@enable_lock_on_migrate = [true, 'true'].include? ENV['KUBERNETES_HEALTH_ENABLE_LOCK_ON_MIGRATE']
       @@enable_rack_on_migrate = [true, 'true'].include? ENV['KUBERNETES_HEALTH_ENABLE_RACK_ON_MIGRATE']
       @@enable_rack_on_sidekiq = [true, 'true'].include? ENV['KUBERNETES_HEALTH_ENABLE_RACK_ON_SIDEKIQ']
@@ -113,6 +115,14 @@ module Kubernetes
       def self.response_format=(value)
         @@response_format = value
       end
+
+      def self.metrics_port
+        @@metrics_port
+      end
+
+      def self.metrics_port=(value)
+        @@metrics_port = value
+      end
     end
   end
 end

data/lib/kubernetes/health/rack_on_migrate.rake

@@ -4,7 +4,7 @@ require "kubernetes/health/rack_on_migrate"
 namespace :kubernetes_health do
   task :rack_on_migrate do
     Thread.new do
-      Rack::Handler.default.run Kubernetes::Health::RackOnMigrate.new
+      Rack::Handler::WEBrick.run Kubernetes::Health::RackOnMigrate.new, { Port: Kubernetes::Health::Config.metrics_port }
     end
   end
 end

data/lib/kubernetes/health/rack_on_migrate.rb

@@ -11,7 +11,7 @@ module Kubernetes
         else
           http_code = 404
         end
-        ::Kubernetes::Health::Config.request_log_callback.call(req, http_code)
+        ::Kubernetes::Health::Config.request_log_callback.call(req, http_code, '')
         [http_code, {}, []]
       end
     end

data/lib/kubernetes/health/version.rb

@@ -1,5 +1,5 @@
 module Kubernetes
   module Health
-    VERSION = '3.10.1'.freeze
+    VERSION = '3.11.0'.freeze
   end
 end

data/lib/puma/kubernetes/app.rb

@@ -54,7 +54,9 @@ module Puma
       end
 
       def generate_extended_puma_stats
-        puma_stats = @launcher&.stats || {}
+        return {} if @launcher.nil?
+
+        puma_stats = @launcher.stats
         # On puma <= 4 puma_stats is a String
         puma_stats = JSON.parse(puma_stats, symbolize_names: true) unless puma_stats.is_a?(Hash)
         # Including usage stats.

data/lib/puma/plugin/kubernetes.rb

@@ -3,7 +3,7 @@ require 'puma/kubernetes/dsl'
 Puma::Plugin.create do
   # rubocop:disable Kubernetes/MethodLength, Kubernetes/AbcSize
   def start(launcher)
-    str = launcher.options[:kubernetes_url] || 'tcp://0.0.0.0:9393'
+    str = launcher.options[:kubernetes_url] || "tcp://0.0.0.0:#{Kubernetes::Health::Config.metrics_port}"
 
     require 'puma/kubernetes/app'
 

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: kubernetes-health
 version: !ruby/object:Gem::Version
-  version: 3.10.1
+  version: 3.11.0
 platform: ruby
 authors:
 - Wagner Caixeta
 autorequire:
 bindir: exe
 cert_chain: []
-date: 2024-02-19 00:00:00.000000000 Z
+date: 2024-02-21 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler