kubernetes-health 3.4.2 → 3.5.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 9d7d7ca3715c624f28575a1af905a79df3b2c3ce4b6d7370ecca88450a98e58e
-  data.tar.gz: ec8c4cb288f68ac86904f15135308a49b801b814b14313ddb5d611e02243600e
+  metadata.gz: b35fdf1eae585364a30777a0f0c8d67210ab99d97c492c33ea7e9c5a71b7d01c
+  data.tar.gz: a4b4f532380c9295e6077d4aba889abb9a17c36889a713d7e84d864b8f9c8e6d
 SHA512:
-  metadata.gz: b73ef9ee17ab78d1ec044a75ac71787fedb9d86e292bcccbf21a3ae55693db7b65cc4634204596ae815500f8cb040cf72e026352faaeed7b2e3e5251c09fc084
-  data.tar.gz: 3663742f867ab3a01c97eb5c8ed93f6a2904f3e7d68540e1a3caf478f0c585e64d289e6a8523a4b64e2becd67a35da6d34b9d921808c3e14deb9289798ea6845
+  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.4'
+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.4.2"
+    VERSION = "3.5.0"
   end
 end

data/lib/puma/kubernetes/app.rb

@@ -28,17 +28,17 @@ module Puma
           when ::Kubernetes::Health::Config.route_metrics
             http_code = 200
             if ::Kubernetes::Health::Config.response_format == 'json'
-              content = include_puma_key_prefix(include_usage(@launcher.stats)).to_json
+              content = include_puma_key_prefix(include_usage(merge_worker_status_if_needed(@launcher.stats))).to_json
             else
-              @parser.parse include_usage(@launcher.stats)
+              @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 => e
-          Rails.logger.error e.message
-          Rails.logger.error e.backtrace.join("\n")
+          puts e.message
+          puts e.backtrace.join("\n")
           http_code = 500
           content = ''
         end
@@ -46,6 +46,15 @@ module Puma
         [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.

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: kubernetes-health
 version: !ruby/object:Gem::Version
-  version: 3.4.2
+  version: 3.5.0
 platform: ruby
 authors:
 - Wagner Caixeta
-autorequire:
+autorequire: 
 bindir: exe
 cert_chain: []
-date: 2021-08-26 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
@@ -161,7 +161,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubygems_version: 3.1.4
-signing_key:
+signing_key: 
 specification_version: 4
 summary: This gem allows kubernetes monitoring your app while it is running migrates
   and after it started.