puma-newrelic-codeur 0.1.11 → 0.1.13

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: deae6f29617e1568a8f6e22d40d6099453bd9d72a2884ea88383ac88834e6134
-  data.tar.gz: 4e2160ed9247856d16ac27c3031dee6d1478d6b9f37fde98493375d4d0e3b7ec
+  metadata.gz: '0195325b801d6caeb6d91cb7f4bed411816254c595e409946f2b9213722082d0'
+  data.tar.gz: 3593843db70aae24a4471b5b17b806bf13e7fbc5a99636438c119f619efbe8b5
 SHA512:
-  metadata.gz: a0a190611626d14f6128cac61e75715a20952623749a378c4738b4326766bbe019f90805a3d3c9501a093bee1bb3f4d15d0272caa894dbfd2e82f93e5fd5105a
-  data.tar.gz: da685073885aeed72e37375073aa9d6bb7b2503ca60eaced218a69e88627177ea0a4d4cba2fca168ab5a09bad5e81dc1325b01fbd7b111ad9f6487bc805fb97f
+  metadata.gz: 7ac929fb8eec76aa714264a8c77e169a940c108c75ea795fe5c8e9cc9a5ea386a045c2aabbf4feac1ba7ea81ab8f67bb670c3a52dea07b553efbfdf325177d43
+  data.tar.gz: e29a3722c3ff9c5d10af3dc28be114ee87cb268294048dd255ddcaebeeaaaecbb5f6c9724c5fdca19766c8d02a8d079b4047a259c700e4f2ee96d7bf9b9a5afa

data/lib/puma/newrelic/plugin.rb

@@ -11,7 +11,7 @@ module Puma
           end
         end
 
-        launcher.events.on_booted do
+        in_background do
           sampler.collect
         end
       end

data/lib/puma/newrelic/sampler.rb

@@ -1,28 +1,41 @@
-require "newrelic_rpm"
+require "yaml"
+require "faraday"
 
 module Puma
   module NewRelic
     class Sampler
       def initialize(launcher)
-        config = ::NewRelic::Agent.config[:puma] || {}
+        @newrelic_config = YAML.load_file("config/newrelic.yml", aliases: true)[ENV["RAILS_ENV"]] || {}
+        config = @newrelic_config['puma'] || {}
         @launcher = launcher
         @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
+        @conn = Faraday.new(url: "https://metric-api.eu.newrelic.com/metric/v1") do |faraday|
+          faraday.headers["Content-Type"] = "application/json"
+          faraday.headers["Api-Key"] = @newrelic_config["license_key"]
+          faraday.adapter Faraday.default_adapter
+        end
       end
 
       def collect
+        return unless agent_enabled?
+
         @running = true
         while @running
           sleep 1
 
           if should_sample?
-            record_metrics(@launcher.stats)
             @last_sample_at = Time.now
+            record_metrics(@launcher.stats)
           end
         end
       end
 
+      def agent_enabled?
+        @newrelic_config["agent_enabled"]
+      end
+
       def should_sample?
         Time.now - @last_sample_at > @sample_rate
       end
@@ -44,10 +57,38 @@ module Puma
           stats.each { |key, value| metrics[key] += value if @keys.include?(key) }
         end
 
+        payload = [
+          {
+            common: {
+              timestamp: Time.now.to_i,
+              "interval.ms": @sample_rate * 1000,
+              attributes: {
+                "app.name": @newrelic_config["app_name"]
+              }
+            },
+            metrics: []
+          }
+        ]
         metrics.each do |key, value|
-          ::NewRelic::Agent.logger.info("Recorded metric: Custom/Puma/#{key}=#{value}")
-          ::NewRelic::Agent.record_metric("Custom/Puma/#{key}", value)
+          payload[0]["metrics"] << {
+            name: "Custom/Puma/#{key}",
+            type: "count",
+            value: value
+          }
         end
+
+        response = @conn.post do |req|
+          req.body = payload.to_json
+        end
+
+        if response.status != 202
+          @launcher.log_writer.write("Failed to send metrics to New Relic: #{response.status} - #{response.body}")
+        end
+
+        # metrics.each do |key, value|
+        #   ::NewRelic::Agent.logger.info("Recorded metric: Custom/Puma/#{key}=#{value}")
+        #   ::NewRelic::Agent.record_metric("Custom/Puma/#{key}", value)
+        # end
       end
     end
   end

data/lib/puma/newrelic/version.rb

@@ -2,6 +2,6 @@
 
 module Puma
   module NewRelic
-    VERSION = "0.1.11"
+    VERSION = "0.1.13"
   end
 end

metadata

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