kubernetes-health 3.3.1 → 3.5.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 59bbdf0e963539df25aa7a994a4fcc54a653506d76df2fa5aa6bbae70994ee98
-  data.tar.gz: b783c8b8df00a8304b5f853b0c13ce9fe09bf8972b55c906d15f42a23c23c5b0
+  metadata.gz: b35fdf1eae585364a30777a0f0c8d67210ab99d97c492c33ea7e9c5a71b7d01c
+  data.tar.gz: a4b4f532380c9295e6077d4aba889abb9a17c36889a713d7e84d864b8f9c8e6d
 SHA512:
-  metadata.gz: 103a26a9a2224f13e246fe1dcc2544990f39a1944f2c989626e0cf44a903a84b2a2fc88b293e1a6ce4269498ccf9abd988a55c4a2ebe7282cbd209371bebd5a2
-  data.tar.gz: 3cd7707bd895b10acb41c68f9d574320599fe5ac1e01fb29f30e9afe2c2a26b382443e2f1db9f0ef4b9dabe54a8641f32920b38075a8151e0405a67ed815e310
+  metadata.gz: 67cd817d32945e1f17f0b9363c393a408df9aec7352af14567d52a7562eab4969719b637f3c7acf3870595951f33a292ba9855c863b70bc125705f2b9f813ef1
+  data.tar.gz: ca42a6d7350435fb33c40521e4e2c72f2046af6fda5c634b3b4994960b8dea4af93d0015b037e80344559149ce329673dccdee6156baf9cabb98607f87519a6a

data/README.md

@@ -15,7 +15,7 @@ This gem allows kubernetes monitoring your app while it is running migrates and
 Add this line to your application's Gemfile:
 
 ```ruby
-gem 'kubernetes-health', '~> 3.3'
+gem 'kubernetes-health', '~> 3.5'
 ```
 
 ## Enabling puma plugin
@@ -128,7 +128,7 @@ Kubernetes::Health::Config.response_format = 'json'
 ## Customizing requests logs
 
 ```
-Kubernetes::Health::Config.request_log_callback = lambda { |req, http_code|
-  Rails.logger.debug "Kubernetes Health: Rack on Migrate - Request: Path: #{req.path_info} / Params: #{req.params} /  HTTP Code: #{http_code}"  rescue nil
+Kubernetes::Health::Config.request_log_callback = lambda { |req, http_code, content|
+  Rails.logger.debug "Kubernetes Health: Rack on Migrate - Request: Path: #{req.path_info} / Params: #{req.params} /  HTTP Code: #{http_code}\n#{content}"  rescue nil
 }
 ```

data/lib/kubernetes/health/version.rb

@@ -1,5 +1,5 @@
 module Kubernetes
   module Health
-    VERSION = "3.3.1"
+    VERSION = "3.5.0"
   end
 end

data/lib/puma/kubernetes/app.rb

@@ -16,7 +16,7 @@ module Puma
         begin
           req = ::Rack::Request.new(_env)
           type = {}
-          content = []
+          content = ''
           type = ::Kubernetes::Health::Config.response_format == 'json' ? { 'Content-Type' => 'application/json' } : { 'Content-Type' => 'text/plain' }
           case req.path_info
           when ::Kubernetes::Health::Config.route_liveness
@@ -27,18 +27,52 @@ module Puma
             http_code = i_am_ready ? 200 : 503
           when ::Kubernetes::Health::Config.route_metrics
             http_code = 200
-            @parser.parse JSON.parse(@launcher.stats)
-            content = ::Kubernetes::Health::Config.response_format == 'json' ? @launcher.stats : Prometheus::Client::Formats::Text.marshal(Prometheus::Client.registry)
+            if ::Kubernetes::Health::Config.response_format == 'json'
+              content = include_puma_key_prefix(include_usage(merge_worker_status_if_needed(@launcher.stats))).to_json
+            else
+              @parser.parse include_usage(merge_worker_status_if_needed(@launcher.stats))
+              content = Prometheus::Client::Formats::Text.marshal(Prometheus::Client.registry)
+            end
           else
             http_code = 404
           end
-        rescue
+        rescue => e
+          puts e.message
+          puts e.backtrace.join("\n")
           http_code = 500
-          content = []
+          content = ''
         end
         ::Kubernetes::Health::Config.request_log_callback.call(req, http_code, content)
         [http_code, type, [content]]
       end
+
+      def merge_worker_status_if_needed(stats)
+        return stats unless stats[:worker_status]
+
+        merded_stats = stats[:worker_status].map { |ws| ws[:last_status] }.inject({}) { |sum, hash| sum.merge(hash) { |_key, val1, val2| val1+val2 } }
+        merded_stats[:puma_started_at] = stats[:puma_started_at]
+        merded_stats[:worker_status] = stats[:worker_status]
+        merded_stats
+      end
+
+      def include_usage(stats)
+        if stats.is_a?(String)
+          # puma <= 4.
+          stats = JSON.parse(stats)
+        else
+          # Puma >=5 uses symbol.
+          stats = JSON.parse(stats.to_json)
+        end
+        stats['usage'] = (1 - stats['pool_capacity'].to_f / stats['max_threads']).round(2)
+        stats
+      end
+      def include_puma_key_prefix(stats)
+        result = {}
+        stats.each do |k,v|
+          result["puma_#{k}"] = v
+        end
+        result
+      end
     end
   end
 end

data/lib/puma/kubernetes/parser.rb

@@ -29,6 +29,7 @@ module Puma
         registry.gauge(:puma_pool_capacity, 'Number of allocatable worker threads', index: 0)
         registry.gauge(:puma_max_threads, 'Maximum number of worker threads', index: 0)
         registry.gauge(:puma_workers, 'Number of configured workers').set({}, 1)
+        registry.gauge(:puma_usage, 'Result of (1 - puma_pool_capacity/puma_max_threads)', index: 0)
       end
 
       def registry

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: kubernetes-health
 version: !ruby/object:Gem::Version
-  version: 3.3.1
+  version: 3.5.0
 platform: ruby
 authors:
 - Wagner Caixeta
-autorequire:
+autorequire: 
 bindir: exe
 cert_chain: []
-date: 2021-07-29 00:00:00.000000000 Z
+date: 2022-01-08 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -145,7 +145,7 @@ files:
 homepage: https://github.com/platbr/kubernetes-health
 licenses: []
 metadata: {}
-post_install_message:
+post_install_message: 
 rdoc_options: []
 require_paths:
 - lib
@@ -160,8 +160,8 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.2.17
-signing_key:
+rubygems_version: 3.1.4
+signing_key: 
 specification_version: 4
 summary: This gem allows kubernetes monitoring your app while it is running migrates
   and after it started.