puma-newrelic 0.1.3 → 0.1.6

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 903264ea9c94ce2fa615c8c6f3913027e1c4dbe6dc52f25813fb6162c5c262cd
-  data.tar.gz: 17c687c789f5959d4979fc069a6a83b37693bd6bebe281f4aaabee0ef15a5a42
+  metadata.gz: b99194e339cf6b42d2caaebbff6c75e08bb7b91fec7c3853cf2072fcaf11339b
+  data.tar.gz: eee5af064f8583e65808b6f07cbb789b5329a904a1910dad6d25e7db4f86db61
 SHA512:
-  metadata.gz: 4c215d14f1ae18f878d92fad82a6419ae9207c9c5957b7f1c5ef63e711043ae92ca048669d7ebc7338a4d21a0ff0173b0e6d992f169db0cb6e24f2b77918a898
-  data.tar.gz: 3a660cf1ccd10c6e2ae808d8808fc58a7fa44bc7dd569be9ef683221015e45f666f15a5a352ff45459fa411eada96274a615fde996511983f46996f1d6bd38de
+  metadata.gz: fde05215131664dfe852260cb06c85e96e9c8e2b5a27f3b41e9795945ddb49093b75fa5fceff0db7fb11ffe200f0c61f6970797fd0b7fa2185ac5ed24b2c3e9b
+  data.tar.gz: 503f2204ee3545409e39226f2063d4a896c2d19efbe453dd820066a28536eceaf9a374f586d49c7de5f22e1f0ef0a526ebf1d8e81197d1f2aee20ca21a7e7ab7

data/.gitignore

@@ -1,4 +1,5 @@
 /.bundle/
+/.idea/
 /.yardoc
 /_yardoc/
 /coverage/

data/.ruby-version

@@ -0,0 +1 @@
+3.1.1

data/Gemfile.lock

@@ -1,15 +1,17 @@
 PATH
   remote: .
   specs:
-    puma-newrelic (0.1.3)
+    puma-newrelic (0.1.5)
+      newrelic_rpm
       puma (>= 3.0)
 
 GEM
   remote: https://rubygems.org/
   specs:
     diff-lcs (1.4.4)
-    nio4r (2.5.7)
-    puma (5.2.2)
+    newrelic_rpm (8.6.0)
+    nio4r (2.5.8)
+    puma (5.6.4)
       nio4r (~> 2.0)
     rake (12.3.3)
     rspec (3.10.0)

data/config.ru

@@ -0,0 +1,4 @@
+# config.ru
+run ->(env) do
+
+end

data/lib/puma/new_relic/sampler.rb

@@ -2,10 +2,10 @@ module Puma
   module NewRelic
     class Sampler
       def initialize(launcher)
-        config          = ::NewRelic::Agent.config[:puma]
+        config          = ::NewRelic::Agent.config[:puma] || {}
         @launcher       = launcher
         @sample_rate    = config.fetch("sample_rate", 15)
-        @keys           = config.fetch("keys", %w(backlog running pool_capacity max_threads)).map(&:to_sym)
+        @keys           = config.fetch("keys", %w(backlog running pool_capacity max_threads)).map(&:to_s)
         @last_sample_at = Time.now
       end
 
@@ -39,15 +39,14 @@ module Puma
 
       def parse(stats)
         metrics = Hash.new { |h, k| h[k] = 0 }
-        sum     = ->(key, value) { metrics[key] += value if @keys.include?(key) }
 
         if stats[:workers]
           metrics[:workers] = stats[:workers]
           stats[:worker_status].each do |worker|
-            worker[:last_status].each(&sum)
+            worker[:last_status].each { |key, value| metrics[key.to_s] += value if @keys.include?(key.to_s) }
           end
         else
-          stats.each(&sum)
+          stats.each { |key, value| metrics[key.to_s] += value if @keys.include?(key.to_s) }
         end
         report_metrics(metrics)
       end

data/lib/puma/new_relic/version.rb

@@ -1,5 +1,5 @@
 module Puma
   module NewRelic
-    VERSION = "0.1.3"
+    VERSION = "0.1.6"
   end
 end

data/puma-newrelic.gemspec

@@ -11,6 +11,7 @@ Gem::Specification.new do |spec|
   spec.homepage              = "https://github.com/benoist/puma-newrelic"
   spec.required_ruby_version = Gem::Requirement.new(">= 2.3.0")
   spec.add_runtime_dependency 'puma', '>= 3.0'
+  spec.add_runtime_dependency 'newrelic_rpm'
 
   # Specify which files should be added to the gem when it is released.
   # The `git ls-files -z` loads the files in the RubyGem that have been added into git.

data/puma.rb

@@ -0,0 +1,3 @@
+require  "newrelic_rpm"
+require_relative "./lib/puma/plugin/new_relic_stats"
+plugin 'new_relic_stats'

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: puma-newrelic
 version: !ruby/object:Gem::Version
-  version: 0.1.3
+  version: 0.1.6
 platform: ruby
 authors:
 - Benoist Claassen
 autorequire:
 bindir: exe
 cert_chain: []
-date: 2021-03-09 00:00:00.000000000 Z
+date: 2022-05-01 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: puma
@@ -24,6 +24,20 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '3.0'
+- !ruby/object:Gem::Dependency
+  name: newrelic_rpm
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
 description: Samples the puma stats and creates a custom metric for NewRelic
 email:
 - benoist.claassen@gmail.com
@@ -33,6 +47,7 @@ extra_rdoc_files: []
 files:
 - ".gitignore"
 - ".rspec"
+- ".ruby-version"
 - ".travis.yml"
 - CODE_OF_CONDUCT.md
 - Gemfile
@@ -42,10 +57,12 @@ files:
 - Rakefile
 - bin/console
 - bin/setup
+- config.ru
 - lib/puma/new_relic/sampler.rb
 - lib/puma/new_relic/version.rb
 - lib/puma/plugin/new_relic_stats.rb
 - puma-newrelic.gemspec
+- puma.rb
 homepage: https://github.com/benoist/puma-newrelic
 licenses: []
 metadata: {}
@@ -64,7 +81,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.0.3
+rubygems_version: 3.3.7
 signing_key:
 specification_version: 4
 summary: New Relic Puma Stats sampler