puma-plugin-statsd 1.1.0 → 1.2.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 0b3cd5c0412cc60e11ea2d99dbf080b9ffe81054b8a4d8c8bfa2c7279d8e921b
-  data.tar.gz: 7d9345141eab89e4c2b0b6a0ed66fecabaaa1fea80e039d050593cbba42bd695
+  metadata.gz: d0b1cd40cd7e6d081b35483c8319f4b1eb3463ded57a1f015e5f78db3771f5a8
+  data.tar.gz: 8df635d04448770b411364182f7d6466f736065ce2b4f396b6daec14c2abf364
 SHA512:
-  metadata.gz: 86bb26d1b1af5b213380b4e7be6ec51f5fb216175304d3d78f36010afd4bfd3b7c37aaed877d84277ef88c9f504792f408ec6d287a0d8a06671154398965231f
-  data.tar.gz: 2b8b0b0d0b1d4902b0ef7114b19adb8f31dd1206dc9185248f3008edb074f118976f56554f5b34689c43f3b12ef069ec2c5a773c9a50b1b16e84bffc4e00b3e3
+  metadata.gz: 892042e3683ca475e062e2439189dd9a17c3fd595eae0e86bb1f687111e6d8f158ff9d8fba034f5fabc8dd066f55289bf0dc0013e2330be59f9bcb764eacfeaa
+  data.tar.gz: e2a05da7f70a78c584f34b1b45ca3a8655f20437828be9462d0e83b87c73cb7389ad72081136929c989a34e572601d1bf0208208aa571e29794a7a4f503aab88

data/CHANGELOG.md

@@ -1,5 +1,10 @@
 # CHANGELOG
 
+## 1.2.0 2021-01-07
+
+* New metrics: old_workers (PR #[21](https://github.com/yob/puma-plugin-statsd/pull/21)) and requsts_count (PR #[28](https://github.com/yob/puma-plugin-statsd/pull/28))
+* Require json at runtime to be extra sure we don't load the wrong version before bundler has initialised the LOAD_PATH
+
 ## 1.1.0 2021-01-03
 
 * Assume localhost for statsd host (PR #[20](https://github.com/yob/puma-plugin-statsd/pull/20))

data/lib/puma/plugin/statsd.rb

@@ -1,5 +1,4 @@
 # coding: utf-8, frozen_string_literal: true
-require "json"
 require "puma"
 require "puma/plugin"
 require 'socket'
@@ -16,10 +15,6 @@ class StatsdConnector
     @port = ENV.fetch("STATSD_PORT", 8125)
   end
 
-  def enabled?
-    !!host
-  end
-
   def send(metric_name:, value:, type:, tags: nil)
     data = "#{metric_name}:#{value}|#{STATSD_TYPES.fetch(type)}"
     data = "#{data}|##{tags}" unless tags.nil?
@@ -49,6 +44,10 @@ class PumaStats
     @stats.fetch(:booted_workers, 1)
   end
 
+  def old_workers
+    @stats.fetch(:old_workers, 0)
+  end
+
   def running
     if clustered?
       @stats[:worker_status].map { |s| s[:last_status].fetch(:running, 0) }.inject(0, &:+)
@@ -80,6 +79,14 @@ class PumaStats
       @stats.fetch(:max_threads, 0)
     end
   end
+
+  def requests_count
+    if clustered?
+      @stats[:worker_status].map { |s| s[:last_status].fetch(:requests_count, 0) }.inject(0, &:+)
+    else
+      @stats.fetch(:requests_count, 0)
+    end
+  end
 end
 
 Puma::Plugin.create do
@@ -88,19 +95,15 @@ Puma::Plugin.create do
     @launcher = launcher
 
     @statsd = ::StatsdConnector.new
-    if @statsd.enabled?
-      @launcher.events.debug "statsd: enabled (host: #{@statsd.host})"
-
-      # Fetch global metric prefix from env variable
-      @metric_prefix = ENV.fetch("STATSD_METRIC_PREFIX", nil)
-      if @metric_prefix && !@metric_prefix.end_with?(::StatsdConnector::METRIC_DELIMETER)
-        @metric_prefix += ::StatsdConnector::METRIC_DELIMETER
-      end
+    @launcher.events.debug "statsd: enabled (host: #{@statsd.host})"
 
-      register_hooks
-    else
-      @launcher.events.debug "statsd: not enabled (no #{StatsdConnector::ENV_NAME} env var found)"
+    # Fetch global metric prefix from env variable
+    @metric_prefix = ENV.fetch("STATSD_METRIC_PREFIX", nil)
+    if @metric_prefix && !@metric_prefix.end_with?(::StatsdConnector::METRIC_DELIMETER)
+      @metric_prefix += ::StatsdConnector::METRIC_DELIMETER
     end
+
+    register_hooks
   end
 
   private
@@ -115,6 +118,7 @@ Puma::Plugin.create do
     end
   else
     def fetch_stats
+      require "json"
       stats = Puma.stats
       JSON.parse(stats, symbolize_names: true)
     end
@@ -170,10 +174,12 @@ Puma::Plugin.create do
         stats = ::PumaStats.new(fetch_stats)
         @statsd.send(metric_name: prefixed_metric_name("puma.workers"), value: stats.workers, type: :gauge, tags: tags)
         @statsd.send(metric_name: prefixed_metric_name("puma.booted_workers"), value: stats.booted_workers, type: :gauge, tags: tags)
+        @statsd.send(metric_name: prefixed_metric_name("puma.old_workers"), value: stats.old_workers, type: :gauge, tags: tags)
         @statsd.send(metric_name: prefixed_metric_name("puma.running"), value: stats.running, type: :gauge, tags: tags)
         @statsd.send(metric_name: prefixed_metric_name("puma.backlog"), value: stats.backlog, type: :gauge, tags: tags)
         @statsd.send(metric_name: prefixed_metric_name("puma.pool_capacity"), value: stats.pool_capacity, type: :gauge, tags: tags)
         @statsd.send(metric_name: prefixed_metric_name("puma.max_threads"), value: stats.max_threads, type: :gauge, tags: tags)
+        @statsd.send(metric_name: prefixed_metric_name("puma.requests_count"), value: stats.requests_count, type: :gauge, tags: tags)
       rescue StandardError => e
         @launcher.events.error "! statsd: notify stats failed:\n  #{e.to_s}\n  #{e.backtrace.join("\n    ")}"
       ensure

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: puma-plugin-statsd
 version: !ruby/object:Gem::Version
-  version: 1.1.0
+  version: 1.2.0
 platform: ruby
 authors:
 - James Healy
-autorequire:
+autorequire: 
 bindir: bin
 cert_chain: []
-date: 2021-01-03 00:00:00.000000000 Z
+date: 2021-01-06 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: puma
@@ -114,7 +114,7 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
-description:
+description: 
 email: james@yob.id.au
 executables: []
 extensions: []
@@ -128,7 +128,7 @@ homepage: https://github.com/yob/puma-plugin-statsd
 licenses:
 - MIT
 metadata: {}
-post_install_message:
+post_install_message: 
 rdoc_options: []
 require_paths:
 - lib
@@ -143,8 +143,8 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.2.3
-signing_key:
+rubygems_version: 3.0.3
+signing_key: 
 specification_version: 4
 summary: Send puma metrics to statsd via a background thread
 test_files: []