kubernetes-health 3.3.0 → 3.4.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 5df4e073ae78f559a70c2664c4d208b8966ddfd26eca774c4dd4b8d51e22088c
-  data.tar.gz: 3d1af211d98f43af48d47274cd8b0ea168d6f8f177c0db46352ff8d2e07678f9
+  metadata.gz: 9d7d7ca3715c624f28575a1af905a79df3b2c3ce4b6d7370ecca88450a98e58e
+  data.tar.gz: ec8c4cb288f68ac86904f15135308a49b801b814b14313ddb5d611e02243600e
 SHA512:
-  metadata.gz: 63aa2dbfa961f84b042530fdeeb4a8950c9f71c769b18f451b0fbffc53348174a8ac2eef0c395ddec0370d3d3e2b975f624f39d39b88ea300df7b1b615d60d93
-  data.tar.gz: b41b0cd16d76ac02257525c75af8c65e5891f5607005c8c29f2501d5e5e217096364479fc29b6604e977df071c7a0be7baa50be6549f51988bcdc4c158a74ca8
+  metadata.gz: b73ef9ee17ab78d1ec044a75ac71787fedb9d86e292bcccbf21a3ae55693db7b65cc4634204596ae815500f8cb040cf72e026352faaeed7b2e3e5251c09fc084
+  data.tar.gz: 3663742f867ab3a01c97eb5c8ed93f6a2904f3e7d68540e1a3caf478f0c585e64d289e6a8523a4b64e2becd67a35da6d34b9d921808c3e14deb9289798ea6845

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.4'
 ```
 
 ## Enabling puma plugin

data/kubernetes-health.gemspec

@@ -31,6 +31,6 @@ Gem::Specification.new do |spec|
   spec.add_development_dependency "rspec"
   spec.add_dependency "rack"
   spec.add_dependency "rails"
-  spec.add_runtime_dependency 'prometheus-client'
+  spec.add_runtime_dependency 'prometheus-client', '~> 0.9.0'
   spec.add_runtime_dependency 'puma'
 end

data/lib/kubernetes/health/version.rb

@@ -1,5 +1,5 @@
 module Kubernetes
   module Health
-    VERSION = "3.3.0"
+    VERSION = "3.4.2"
   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,43 @@ 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(@launcher.stats)).to_json
+            else
+              @parser.parse include_usage(@launcher.stats)
+              content = Prometheus::Client::Formats::Text.marshal(Prometheus::Client.registry)
+            end
           else
             http_code = 404
           end
-        rescue
+        rescue => e
+          Rails.logger.error e.message
+          Rails.logger.error 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 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.0
+  version: 3.4.2
 platform: ruby
 authors:
 - Wagner Caixeta
 autorequire:
 bindir: exe
 cert_chain: []
-date: 2021-07-29 00:00:00.000000000 Z
+date: 2021-08-26 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -84,16 +84,16 @@ dependencies:
   name: prometheus-client
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 0.9.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 0.9.0
 - !ruby/object:Gem::Dependency
   name: puma
   requirement: !ruby/object:Gem::Requirement
@@ -160,7 +160,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.2.17
+rubygems_version: 3.1.4
 signing_key:
 specification_version: 4
 summary: This gem allows kubernetes monitoring your app while it is running migrates