barnes 0.0.6 → 0.0.7

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 97d3166a629fda777aec68bbbd69e7dbe1c1581c248a2f3c27a1b5922c63855a
-  data.tar.gz: cf23e7b64ea04b8d25122af694c58abf4abe3b9eefb6f8bbaf577ed5501bba2b
+  metadata.gz: 5820735340defe1a371f183f8e27c8e76bc786752f32d885a9baf0736934d9c2
+  data.tar.gz: 64e44eb27bc4c0a9f47995381a7650243dda46ad0e55e7716dc277ff559167bc
 SHA512:
-  metadata.gz: cefef5780b12f194ac337af6bee8d0311cd421329dc4e87cef21dc9676505db9aaed83c72d8fde2f7c98efb54a4587c8ab6accf155d4f9aadf88e4d4c8fb1627
-  data.tar.gz: c561c88b5a6a88b2c64ae1240ac1e93918097c58f3f831aa001d26cb1c5843114ccb900028ecf425c5dea306f9e5d408a80ba37a8a6a2cdeb072e5bc5e25745d
+  metadata.gz: a9c3188e1d211ad6354c6ae859bcaa84b80fd1e762a7ea7f1306687d55e445dea3cb5294302e10b266b07091f7cb1d63792a0f7f910fb390cd9dc7e486d23bc3
+  data.tar.gz: 34ba9586503d1741adde49361dcbb9f2acd02358aca4e1ca67b1c5d7f1d627047d5f880e15b3d5cd4391873978d02a20d734db1b36b50fb7d38b3cb0110620b9

data/CHANGELOG.md

@@ -1,3 +1,7 @@
+## 0.0.7
+
+- Report when an app is using Puma
+
 ## 0.0.6
 
 - Support Puma max threads, support Puma spawned threads

data/barnes.gemspec

@@ -26,6 +26,7 @@ Gem::Specification.new do |spec|
 
   spec.add_runtime_dependency 'multi_json', '~> 1'
 
+  spec.add_development_dependency 'rack',     '~> 2'
   spec.add_development_dependency 'rake',     '~> 10'
   spec.add_development_dependency 'minitest', '~> 5.3'
   spec.add_development_dependency "bundler",  '~> 1.15'

data/lib/barnes/instruments/puma_instrument.rb

@@ -0,0 +1,51 @@
+# frozen_string_literal: true
+
+require 'barnes/instruments/puma_stats_value'
+module Barnes
+  module Instruments
+    class PumaInstrument
+      def initialize(sample_rate=nil)
+        @debug = ENV["BARNES_DEBUG_PUMA_STATS"]
+        @puma_has_stats = (defined?(::Puma) && ::Puma.respond_to?(:stats))
+      end
+
+      def valid?
+        return false unless defined?(Puma)
+        return false unless ENV["DYNO"] && ENV["DYNO"].start_with?("web")
+        true
+      end
+
+      def start!(state)
+        require 'multi_json'
+      end
+
+      def json_stats
+        return {} unless @puma_has_stats
+        MultiJson.load(::Puma.stats || "{}")
+
+      # Puma loader has not been initialized yet
+      rescue NoMethodError => e
+        raise e unless e.message =~ /nil/
+        raise e unless e.message =~ /stats/
+        return {}
+      end
+
+      def instrument!(state, counters, gauges)
+        gauges['using.puma'] = 1
+
+        stats = json_stats
+        return if stats.empty?
+
+        puts "Puma debug stats from barnes: #{stats}" if @debug
+
+        pool_capacity = StatValue.new(stats, "pool_capacity").value
+        max_threads   = StatValue.new(stats, "max_threads").value
+        spawned       = StatValue.new(stats, "running").value
+
+        gauges[:'pool.capacity']    = pool_capacity if pool_capacity
+        gauges[:'threads.max']      = max_threads   if max_threads
+        gauges[:'threads.spawned']  = spawned       if spawned
+      end
+    end
+  end
+end

data/lib/barnes/instruments/{puma_backlog.rb → puma_stats_value.rb}

@@ -1,8 +1,6 @@
-# frozen_string_literal: true
-
 module Barnes
   module Instruments
-    class PumaBacklog
+    class PumaInstrument
       # 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:
@@ -46,45 +44,6 @@ module Barnes
           return value
         end
       end
-
-      def initialize(sample_rate=nil)
-        @debug = ENV["BARNES_DEBUG_PUMA_STATS"]
-      end
-
-      def valid?
-        defined?(Puma) &&
-          Puma.respond_to?(:stats) &&
-          ENV["DYNO"] && ENV["DYNO"].start_with?("web")
-      end
-
-      def start!(state)
-        require 'multi_json'
-      end
-
-      def json_stats
-        MultiJson.load(Puma.stats || "{}")
-
-      # Puma loader has not been initialized yet
-      rescue NoMethodError => e
-        raise e unless e.message =~ /nil/
-        raise e unless e.message =~ /stats/
-        return {}
-      end
-
-      def instrument!(state, counters, gauges)
-        stats = json_stats
-        return if stats.empty?
-
-        puts "Puma debug stats from barnes: #{stats}" if @debug
-
-        pool_capacity = StatValue.new(stats, "pool_capacity").value
-        max_threads   = StatValue.new(stats, "max_threads").value
-        spawned       = StatValue.new(stats, "running").value
-
-        gauges[:'pool.capacity']    = pool_capacity if pool_capacity
-        gauges[:'threads.max']      = max_threads   if max_threads
-        gauges[:'threads.spawned']  = spawned       if spawned
-      end
     end
   end
-end
+end

data/lib/barnes/resource_usage.rb

@@ -28,11 +28,11 @@ module Barnes
     def initialize(sample_rate)
       super()
 
-      require 'barnes/instruments/puma_backlog'
-      backlog_reporter = Barnes::Instruments::PumaBacklog.new
+      require 'barnes/instruments/puma_instrument'
+      puma_instrument = Barnes::Instruments::PumaInstrument.new
 
-      if backlog_reporter.valid?
-        instrument backlog_reporter
+      if puma_instrument.valid?
+        instrument puma_instrument
       end
 
       require 'barnes/instruments/stopwatch'

data/lib/barnes/version.rb

@@ -22,5 +22,5 @@
 #
 
 module Barnes
-  VERSION = "0.0.6"
+  VERSION = "0.0.7"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: barnes
 version: !ruby/object:Gem::Version
-  version: 0.0.6
+  version: 0.0.7
 platform: ruby
 authors:
 - schneems
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2018-07-03 00:00:00.000000000 Z
+date: 2018-07-24 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: statsd-ruby
@@ -38,6 +38,20 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '1'
+- !ruby/object:Gem::Dependency
+  name: rack
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '2'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '2'
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement
@@ -133,7 +147,8 @@ files:
 - lib/barnes/consts.rb
 - lib/barnes/instruments/gctools_oobgc.rb
 - lib/barnes/instruments/object_space_counter.rb
-- lib/barnes/instruments/puma_backlog.rb
+- lib/barnes/instruments/puma_instrument.rb
+- lib/barnes/instruments/puma_stats_value.rb
 - lib/barnes/instruments/ree_gc.rb
 - lib/barnes/instruments/ruby_gc.rb
 - lib/barnes/instruments/stopwatch.rb