barnes 0.0.4 → 0.0.5

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 19c9b546f067ae2704fa77ae6d9427ec127066297e5b764946eee6182ecbee10
-  data.tar.gz: '01368678dd52fde279caaa874e961fbd804083818d77f0d35ceb1c0a7fe3a676'
+  metadata.gz: 6bd0eb8994398ca8d7e23bed22c364de8a37d55d4d2b4ee2208303a1f7133c3b
+  data.tar.gz: f5e7e42b14b1a408840b1be9982113016c97bad1a18a84c2d3d4d6c7ca45dd7d
 SHA512:
-  metadata.gz: ca830409f6dc45d30e14bb69c1593724ed9a563eaf2082588225f46fffe189c0a1363d445cc499b7b96cf648a1ffaf80267a668ec5a4b15fef2af915bd7765b8
-  data.tar.gz: e73a76762d62b85007edce9bd6fdc7a21ffff41115dcf284587f74787b740de303c44592be65ff720cbda9310ac7dfec43db7f6d349dc4fc085eef3daca0a8c0
+  metadata.gz: 706f4a6711a6acc7e5afdc6c327a3056aece3a729d1b15dd2bbc359d2e1784e47a56a3ac7dd8deb05776be74e749bb1972b072b4f317eab04a9b2274da5fa922
+  data.tar.gz: 8e9721b3cf2fdc10a0c70a04fadbe961a481804b16a76d6e769ed514a47960dd8dd39859e709240cefa38be9bbc4016b31586fa144d81ca730253689ec9adf06

data/CHANGELOG.md

@@ -1,3 +1,7 @@
+## 0.0.5
+
+- Support Puma pool capacity value #15
+
 ## 0.0.4
 
 - Support Puma backlog #14

data/Rakefile

@@ -29,7 +29,8 @@ task :default => :test
 
 desc 'Run tests'
 Rake::TestTask.new :test do |t|
-  t.libs << 'test/lib'
-  t.pattern = 'test/*_test.rb'
+  t.libs << 'test'
+  t.libs << 'lib'
+  t.pattern = 'test/**/*_test.rb'
   t.verbose = true
 end

data/lib/barnes/instruments/puma_backlog.rb

@@ -3,7 +3,52 @@
 module Barnes
   module Instruments
     class PumaBacklog
+      # This class is responsible for consuming a puma
+      # generated stats hash that can come in two "flavors"
+      # one is a "single process" server which will look like this:
+      #
+      #    { "backlog": 0, "running": 0, "pool_capacity": 16 }
+      #
+      # The other is a multiple cluster server that will look like this:
+      #
+      #    {"workers"=>2, "phase"=>0, "booted_workers"=>2, "old_workers"=>0, "worker_status"=>[{"pid"=>35020, "index"=>0, "phase"=>0, "booted"=>true, "last_checkin"=>"2018-05-21T19:53:18Z", "last_status"=>{"backlog"=>0, "running"=>5, "pool_capacity"=>5}}, {"pid"=>35021, "index"=>1, "phase"=>0, "booted"=>true, "last_checkin"=>"2018-05-21T19:53:18Z", "last_status"=>{"backlog"=>0, "running"=>5, "pool_capacity"=>5}}]}
+      #
+      class StatValue
+        attr_reader :stats, :key
+
+        def initialize(stats, key)
+          @stats   = stats
+          @key     = key
+          @cluster = stats.key?("worker_status")
+        end
+
+        def single?
+          !cluster?
+        end
+
+        def cluster?
+          @cluster
+        end
+
+        # For single worker process use value directly
+        # for multiple workers use the sum.
+        #
+        # https://github.com/puma/puma/pull/1532
+        def value
+          return stats[key] if single?
+          first_worker = stats["worker_status"].first
+          return nil unless first_worker && first_worker["last_status"].key?(key)
+
+          value = 0
+          stats["worker_status"].each do |worker_status|
+            value += worker_status["last_status"][key] || 0
+          end
+          return value
+        end
+      end
+
       def initialize(sample_rate=nil)
+        @debug = ENV["BARNES_DEBUG_PUMA_STATS"]
       end
 
       def valid?
@@ -26,22 +71,17 @@ module Barnes
         return {}
       end
 
-      # For single worker process use backlog directly
-      # for multiple workers sum backlog.
-      #
-      # https://github.com/puma/puma/pull/1532
       def instrument!(state, counters, gauges)
-        stats = self.json_stats
+        stats = json_stats
         return if stats.empty?
 
-        backlog = stats["backlog"]
-        if backlog.nil?
-          backlog = stats["worker_status"].map do |worker_status|
-            worker_status["last_status"]["backlog"]
-          end.reduce(0, :+)
-        end
+        puts "Puma debug stats from barnes: #{stats}" if @debug
+
+        pool_capacity = StatValue.new(stats, "pool_capacity").value
+        backlog       = StatValue.new(stats, "backlog").value
 
-        gauges[:'backlog.requests'] = backlog
+        gauges[:'pool.capacity']    = pool_capacity if pool_capacity
+        gauges[:'backlog.requests'] = backlog       if backlog
       end
     end
   end

data/lib/barnes/version.rb

@@ -22,5 +22,5 @@
 #
 
 module Barnes
-  VERSION = "0.0.4"
+  VERSION = "0.0.5"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: barnes
 version: !ruby/object:Gem::Version
-  version: 0.0.4
+  version: 0.0.5
 platform: ruby
 authors:
 - schneems
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2018-04-12 00:00:00.000000000 Z
+date: 2018-06-05 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: statsd-ruby