puma-newrelic-codeur 0.1.8 → 0.1.9

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 1eb6e7d4286a16336d5544cb3f7094390788b71cc1f3f4ab323882ff6611e9d9
-  data.tar.gz: faff0b2196bd2aabf06246976f14a0595994b7216b538e0a36713bff1bc524b1
+  metadata.gz: 86e38d20e90900400c14892d926996fc6aa4855a8c39873eb9e981cc2e6c8dba
+  data.tar.gz: a60b4374d783ad880dfa012d4745df4407ce0345fc3fdedc6677ca874fddc79b
 SHA512:
-  metadata.gz: 958c09beaedc91bbd6a1b6f6f0f2ddee4224146a387b3ffdcfcb839da472223904eb7442c8dcb461c3389f99417d2e3cfc57aa582b692d9d7d789dfda313b14e
-  data.tar.gz: 10a81c3fbb6e961af001895d2cc579ab51ca4b8cbcce0b1ec3b522555719d4e3650541775c03a4913eea496f538efb0c0824df2a94dcb4f8d64f8e39858fe954
+  metadata.gz: 6a96d262daf04a941d94b01d768015c257d63e54deacd387a88cf8a18cedd4563485ebb5af69f64a419a18c99eccea4cb637a411a9fb1895ac2817b89f87084d
+  data.tar.gz: 15f0686657a50b46794fe6dafbf991a344a6d6f7a46f796325aee511ecede1e419276b8da8623e8cd12c30cf6dfaa872c7cefbaa1437ff4d7b9b6e391b1f9051

data/README.md

@@ -9,7 +9,7 @@ You can view the information in the NewRelic insights or in NewRelic One.
 Add this line to your application's Gemfile:
 
 ```ruby
-gem 'puma-newrelic'
+gem 'puma-newrelic-codeur'
 ```
 
 And then execute:

data/lib/puma/newrelic/plugin.rb

@@ -12,7 +12,7 @@ module Puma
         end
 
         in_background do
-          sampler.start
+          sampler.collect
         end
       end
     end

data/lib/puma/newrelic/sampler.rb

@@ -6,12 +6,12 @@ module Puma
       def initialize(launcher)
         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_s)
+        @sample_rate = config.fetch("sample_rate", 23)
+        @keys = config.fetch("keys", %i[backlog running pool_capacity max_threads requests_count]).map(&:to_sym)
         @last_sample_at = Time.now
       end
 
-      def start
+      def collect
         @running = true
         while @running
           sleep 1
@@ -19,11 +19,7 @@ module Puma
             if should_sample?
               @last_sample_at = Time.now
               puma_stats = @launcher.stats
-              if puma_stats.is_a?(Hash)
-                parse puma_stats
-              else
-                parse JSON.parse(puma_stats, symbolize_names: true)
-              end
+              record_metrics(puma_stats)
             end
           rescue Exception => e # rubocop:disable Lint/RescueException
             ::NewRelic::Agent.logger.error(e.message)
@@ -39,21 +35,19 @@ module Puma
         @running = false
       end
 
-      def parse(stats)
+      def record_metrics(stats)
         metrics = Hash.new { |h, k| h[k] = 0 }
 
-        if stats[:workers]
-          metrics[:workers] = stats[:workers]
+        if stats[:worker_status] # Cluster mode
+          metrics[:workers_count] = stats[:workers]
           stats[:worker_status].each do |worker|
-            worker[:last_status].each { |key, value| metrics[key.to_s] += value if @keys.include?(key.to_s) }
+            worker[:last_status].each { |key, value| metrics[key] += value if @keys.include?(key) }
           end
-        else
-          stats.each { |key, value| metrics[key.to_s] += value if @keys.include?(key.to_s) }
+        else # Single mode
+          metrics[:workers_count] = 1
+          stats.each { |key, value| metrics[key] += value if @keys.include?(key) }
         end
-        report_metrics(metrics)
-      end
 
-      def report_metrics(metrics)
         metrics.each do |key, value|
           ::NewRelic::Agent.logger.debug("Recorded metric: Custom/Puma/#{key}=#{value}")
           ::NewRelic::Agent.record_metric("Custom/Puma/#{key}", value)

data/lib/puma/newrelic/version.rb

@@ -2,6 +2,6 @@
 
 module Puma
   module NewRelic
-    VERSION = "0.1.8"
+    VERSION = "0.1.9"
   end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: puma-newrelic-codeur
 version: !ruby/object:Gem::Version
-  version: 0.1.8
+  version: 0.1.9
 platform: ruby
 authors:
 - Benoist Claassen