yabeda-puma-plugin 0.2.1 → 0.3.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: d0254def10fec3276511c89a605d243a7876631ab06ffc4131adc135e4011939
-  data.tar.gz: f059a562c744164c2549b8e826ea793803eff702565d564df1599669695ffa9b
+  metadata.gz: f94f38e97079338e19849ddc164b859f9ea221d1842347f86d25e4809b507615
+  data.tar.gz: 5fec9afef71af361875885ad5dd6006d49518d5fb9d5582f89883453a6539752
 SHA512:
-  metadata.gz: 65fda3c0f40ef45b97c30463ec976735c134773b3da2177bf38e392867551ea1e3c057d710281fdb91e9effa1dc74d958e1d391464670100996c698e6f49aaf3
-  data.tar.gz: 439624ba8ec4c869a96781370d17be8ec22441d66b31b51b6b3bc42af0ba6ca0b27cb65e2496ba6b2b91bb55a2ef4d40547fce0b99a4b6bde4bbbf7dc0f425e7
+  metadata.gz: 5c554a0d7a13f92c6e1d64741e1a03295901f0562d8f49e3f3dedf5d828eac484e1f23083842a21f40f5002d11357d7bf52f3efada435a21e7d676fd5a02e5b5
+  data.tar.gz: f468a304b54fefbe4f2b5585259ddcf15088c4f0a993a8da9ff9a0b0f5646e25da67ea9b8aae861c93546b65e147101682d7bc60d02f97829a796e1ae73bdc1c

data/lib/puma/plugin/yabeda.rb

@@ -14,14 +14,14 @@ Puma::Plugin.create do
 
     Yabeda.configure do
       group :puma
-      
-      gauge :backlog, comment: 'Number of established but unaccepted connections in the backlog'
-      gauge :running, comment: 'Number of running worker threads'
-      gauge :pool_capacity, comment: 'Number of allocatable worker threads'
-      gauge :max_threads, comment: 'Maximum number of worker threads'
-      gauge :workers, comment: 'Number of configured workers'
+
+      gauge :backlog, tags: %i[index], comment: 'Number of established but unaccepted connections in the backlog'
+      gauge :running, tags: %i[index], comment: 'Number of running worker threads'
+      gauge :pool_capacity, tags: %i[index], comment: 'Number of allocatable worker threads'
+      gauge :max_threads, tags: %i[index], comment: 'Maximum number of worker threads'
 
       if clustered
+        gauge :workers, comment: 'Number of configured workers'
         gauge :booted_workers, comment: 'Number of booted workers'
         gauge :old_workers, comment: 'Number of old workers'
       end

data/lib/yabeda/puma/plugin/statistics/parser.rb

@@ -13,21 +13,33 @@ module Yabeda
           end
 
           def call
-            Array.new.tap { |result| parse(data, result) }
+            [].tap { |result| parse(data, {}, result) }
           end
 
           private
 
-          def parse(stats, labels = {}, result)
+          def parse(stats, labels, result)
             stats.each do |key, value|
-              value.each { |s| parse(s, labels.merge(index: s['index']), result) } if key == 'worker_status'
-              parse(value, labels, result) if key == 'last_status'
-              result << {name: key, value: value, labels: labels} if metric?(key)
+              case key
+              when 'worker_status'
+                value.each { |s| parse(s, labels.merge(index: s['index']), result) }
+              when 'last_status'
+                parse(value, labels, result)
+              else
+                next unless metric?(key)
+
+                l = clustered_metric?(key) ? labels : { index: 0 }.merge(labels)
+                result << { name: key, value: value, labels: l }
+              end
             end
           end
 
           def metric?(name)
-            Statistics::METRICS.include?(name.to_sym) || (Statistics::CLUSTERED_METRICS.include?(name.to_sym) && clustered)
+            Statistics::METRICS.include?(name.to_sym) || clustered_metric?(name)
+          end
+
+          def clustered_metric?(name)
+            clustered && Statistics::CLUSTERED_METRICS.include?(name.to_sym)
           end
         end
       end

data/lib/yabeda/puma/plugin/statistics.rb

@@ -2,8 +2,8 @@ module Yabeda
   module Puma
     module Plugin
       module Statistics
-        METRICS = [:backlog, :running, :pool_capacity, :max_threads, :workers]
-        CLUSTERED_METRICS = [:booted_workers, :old_workers]
+        METRICS = [:backlog, :running, :pool_capacity, :max_threads]
+        CLUSTERED_METRICS = [:booted_workers, :old_workers, :workers]
       end
     end
   end

data/lib/yabeda/puma/plugin/version.rb

@@ -1,7 +1,7 @@
 module Yabeda
   module Puma
     module Plugin
-      VERSION = "0.2.1"
+      VERSION = "0.3.0"
     end
   end
 end

data/yabeda-puma-plugin.gemspec

@@ -21,7 +21,7 @@ Gem::Specification.new do |spec|
   spec.executables   = spec.files.grep(%r{^exe/}) { |f| File.basename(f) }
   spec.require_paths = ["lib"]
 
-  spec.add_runtime_dependency "yabeda"
+  spec.add_runtime_dependency "yabeda", "~> 0.2"
   spec.add_runtime_dependency "puma"
   spec.add_runtime_dependency "json"
 

metadata

@@ -1,29 +1,29 @@
 --- !ruby/object:Gem::Specification
 name: yabeda-puma-plugin
 version: !ruby/object:Gem::Version
-  version: 0.2.1
+  version: 0.3.0
 platform: ruby
 authors:
 - Salahutdinov Dmitry
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2019-12-16 00:00:00.000000000 Z
+date: 2020-01-27 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: yabeda
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '0.2'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '0.2'
 - !ruby/object:Gem::Dependency
   name: puma
   requirement: !ruby/object:Gem::Requirement