puma-newrelic-codeur 0.1.7 → 0.1.9

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 6e195287b18055147b79b50cc78d44befa3c7b40ea72cc24cde2c69b9a67d546
-  data.tar.gz: ccdcf8d5f9f7cadd582cf8890240ed9d4d6898847bcd7287f99161646f5b6fb8
+  metadata.gz: 86e38d20e90900400c14892d926996fc6aa4855a8c39873eb9e981cc2e6c8dba
+  data.tar.gz: a60b4374d783ad880dfa012d4745df4407ce0345fc3fdedc6677ca874fddc79b
 SHA512:
-  metadata.gz: dfe22844effa9205d4e819d9b450cd35abdb57f7af1ee88a42fb04c1781f6b2b1554e19fc91b2019c192c439a1eae6bba056c69db20db6f19fc70a3fd18a6781
-  data.tar.gz: 385b990229ef0eeb227fc0f32154af04a325c34dfff661ac94494306232c9ec8fbc2c8bfd9a5c989dcff6cefce9159627079f68f70ddb610d1c1c1ed1a0b4bdf
+  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:
@@ -18,12 +18,12 @@ And then execute:
 
 Or install it yourself as:
 
-    $ gem install puma-newrelic
+    $ gem install puma-newrelic-codeur
 
 ## Usage
 
 - Install the gem
-- Add `plugin 'newrelic'` to your puma.rb
+- Add `plugin :newrelic` to your puma.rb
 - Create a dashboard on the NewRelic insights or NewRelic One
 
 NQRL example:

data/lib/puma/newrelic/plugin.rb

@@ -1,9 +1,8 @@
 require_relative "sampler"
-require "puma/plugin"
 
 module Puma
   module NewRelic
-    class Plugin < Puma::Plugin
+    module Plugin
       def start(launcher)
         sampler = Puma::NewRelic::Sampler.new(launcher)
         launcher.events.register(:state) do |state|
@@ -13,11 +12,9 @@ module Puma
         end
 
         in_background do
-          sampler.start
+          sampler.collect
         end
       end
     end
-
-    Puma::Plugins.register "newrelic", Plugin
   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.7"
+    VERSION = "0.1.9"
   end
 end

data/lib/puma/newrelic.rb

@@ -1,12 +1,3 @@
 # frozen_string_literal: true
 
 require_relative "newrelic/version"
-
-module Puma
-  module NewRelic
-    class Error < StandardError; end
-    # Your code goes here...
-  end
-end
-
-require_relative "newrelic/plugin"

data/lib/puma/plugin/newrelic.rb

@@ -0,0 +1,5 @@
+require_relative "../newrelic/plugin"
+
+Puma::Plugin.create do
+  include Puma::NewRelic::Plugin
+end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: puma-newrelic-codeur
 version: !ruby/object:Gem::Version
-  version: 0.1.7
+  version: 0.1.9
 platform: ruby
 authors:
 - Benoist Claassen
@@ -57,6 +57,7 @@ files:
 - lib/puma/newrelic/plugin.rb
 - lib/puma/newrelic/sampler.rb
 - lib/puma/newrelic/version.rb
+- lib/puma/plugin/newrelic.rb
 homepage: https://github.com/codeur/puma-newrelic
 licenses:
 - MIT