puma-newrelic-codeur 0.1.8 → 0.1.10

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 1eb6e7d4286a16336d5544cb3f7094390788b71cc1f3f4ab323882ff6611e9d9
-  data.tar.gz: faff0b2196bd2aabf06246976f14a0595994b7216b538e0a36713bff1bc524b1
+  metadata.gz: 4cdfae9d5d6d6cf2b3815c9f5a29eb6fed99a2281e3b82892124c18d42bb4ea9
+  data.tar.gz: afc6ed3b9a9d4f5d36549759f02044e76a837e3c1d4ed4a184c5e27c43ab1370
 SHA512:
-  metadata.gz: 958c09beaedc91bbd6a1b6f6f0f2ddee4224146a387b3ffdcfcb839da472223904eb7442c8dcb461c3389f99417d2e3cfc57aa582b692d9d7d789dfda313b14e
-  data.tar.gz: 10a81c3fbb6e961af001895d2cc579ab51ca4b8cbcce0b1ec3b522555719d4e3650541775c03a4913eea496f538efb0c0824df2a94dcb4f8d64f8e39858fe954
+  metadata.gz: 6b28d5e8296a5588db4a7abd4f5d5072283a0cd44770043566e4a14c0675aabc0adcf1d71a0c11178d4ab0ec1af53076091389b1ea6e9133b21c9530c6d2b2b5
+  data.tar.gz: 6ad9f1b689e46d269249e8f8beea0d1477da24b702931a856011f8774291fcde5918670b3c3576b681c27a4f092d176908f07e72736f4df1cfa94929b206970e

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,27 +6,19 @@ 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
-          begin
-            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
-            end
-          rescue Exception => e # rubocop:disable Lint/RescueException
-            ::NewRelic::Agent.logger.error(e.message)
+
+          if should_sample?
+            record_metrics(@launcher.stats)
+            @last_sample_at = Time.now
           end
         end
       end
@@ -39,23 +31,21 @@ 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.logger.info("Recorded metric: Custom/Puma/#{key}=#{value}")
           ::NewRelic::Agent.record_metric("Custom/Puma/#{key}", value)
         end
       end

data/lib/puma/newrelic/version.rb

@@ -2,6 +2,6 @@
 
 module Puma
   module NewRelic
-    VERSION = "0.1.8"
+    VERSION = "0.1.10"
   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.10
 platform: ruby
 authors:
 - Benoist Claassen