puma-metrics 1.2.1 → 1.2.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 7c27f15c1dd3aff32b53bfa540b7ba9b8f8f2d019e3142caf1eac4e80c451f69
-  data.tar.gz: 5cd3ea68ac8bf3c641c7d235a75425b9fa7c701c4b65f6b39a68a5a4dc71c293
+  metadata.gz: ca04f9fbdb4d46c6d48039194b6df316412399347e295baa0b7ffa6d58fbf70e
+  data.tar.gz: 169662435570a490c711292deff5f9ae6d475a5a9cb6fd90945949e47ace16b9
 SHA512:
-  metadata.gz: b413c77b97c65017fe216e5b55d73671c13b8fa5b8d94a11e9d7514d0828b0d3f61c489f7d185d225e44048d1001ed0cf58f0e108b86bef7f3ff5c0ec0064a62
-  data.tar.gz: 2c496212669c58fbcdc90688e8c852dba1375bd89a956466ca8c882addffaaa1613fadc3632dd2e42b3cf7ce9240a6147366482774fe8a7a1fdfda41b10844c2
+  metadata.gz: e1f361d5271ae1906dcf4c9235522b2059716ccce8317bece35de23c7ca41aa68eac9cfeb1af2c0148a386d09e8841b02a0b3f93a9837138cea6d77b62404b38
+  data.tar.gz: 0ee3cce82e4482b9ab79cef06ecec083314e50456138949afb7faa464735a68968943f281d45c38a585f7cbda3ff9612aa10c31e0f1b4e3dc434f4eefecc86fe

data/.github/workflows/workflow.yml

@@ -6,7 +6,7 @@ jobs:
     runs-on: ubuntu-latest
     steps:
     - uses: actions/checkout@master
-    - uses: actions/setup-ruby@master
+    - uses: ruby/setup-ruby@master
       with:
         ruby-version: ${{ matrix.ruby }}
     - run: gem install bundler
@@ -19,7 +19,7 @@ jobs:
       run: bundle exec overcommit --run
     strategy:
       matrix:
-        ruby: ['2.6', '2.7', '3.0']
+        ruby: ['2.6', '2.7', '3.0', '3.1']
   deploy:
     if: github.ref == 'refs/heads/master'
     name: to rubygems
@@ -27,9 +27,9 @@ jobs:
     runs-on: ubuntu-latest
     steps:
     - uses: actions/checkout@master
-    - uses: actions/setup-ruby@master
+    - uses: ruby/setup-ruby@master
       with:
-        ruby-version: 3.0
+        ruby-version: 3.1
     - env:
         RUBYGEMS_API_KEY: ${{ secrets.RUBYGEMS_API_KEY }}
       run: |

data/.rubocop.yml

@@ -1,6 +1,10 @@
 AllCops:
+  NewCops: enable
   TargetRubyVersion: 2.6
 
+Gemspec/RequireMFA:
+  Enabled: false
+
 Naming/FileName:
   Exclude:
     - puma-metrics.gemspec

data/CHANGELOG.md

@@ -2,6 +2,26 @@
 
 ## Unreleased
 
+## 1.2.4
+
+Changes:
+- Shut down metrics server in `on_stopped` so it only stops when main puma process stops and ignores when workers are
+  stopped. This allows us to maintain a running metrics server when workers restart or crash.
+
+Housekeeping:
+- Update dependencies
+- Test on ruby 3.1
+
+## 1.2.3
+
+Housekeeping:
+- Update dependencies
+
+## 1.2.2
+
+Changes:
+- Expose new metric `puma_requests_count` when using Puma 5
+
 ## 1.2.1
 
 Changes:

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    puma-metrics (1.2.0)
+    puma-metrics (1.2.3)
       prometheus-client (>= 0.10)
       puma (>= 3.0)
 
@@ -9,36 +9,37 @@ GEM
   remote: https://rubygems.org/
   specs:
     ast (2.4.2)
-    childprocess (4.0.0)
+    childprocess (4.1.0)
     iniparse (1.5.0)
-    minitest (5.14.3)
-    nio4r (2.5.5)
-    overcommit (0.57.0)
+    minitest (5.15.0)
+    nio4r (2.5.8)
+    overcommit (0.58.0)
       childprocess (>= 0.6.3, < 5)
       iniparse (~> 1.4)
-    parallel (1.20.1)
-    parser (3.0.0.0)
+      rexml (~> 3.2)
+    parallel (1.21.0)
+    parser (3.1.1.0)
       ast (~> 2.4.1)
-    prometheus-client (2.1.0)
-    puma (5.2.1)
+    prometheus-client (3.0.0)
+    puma (5.6.2)
       nio4r (~> 2.0)
-    rainbow (3.0.0)
-    rake (13.0.3)
-    regexp_parser (2.0.3)
-    rexml (3.2.4)
-    rubocop (1.10.0)
+    rainbow (3.1.1)
+    rake (13.0.6)
+    regexp_parser (2.2.1)
+    rexml (3.2.5)
+    rubocop (1.25.1)
       parallel (~> 1.10)
-      parser (>= 3.0.0.0)
+      parser (>= 3.1.0.0)
       rainbow (>= 2.2.2, < 4.0)
       regexp_parser (>= 1.8, < 3.0)
       rexml
-      rubocop-ast (>= 1.2.0, < 2.0)
+      rubocop-ast (>= 1.15.1, < 2.0)
       ruby-progressbar (~> 1.7)
       unicode-display_width (>= 1.4.0, < 3.0)
-    rubocop-ast (1.4.1)
-      parser (>= 2.7.1.5)
+    rubocop-ast (1.16.0)
+      parser (>= 3.1.1.0)
     ruby-progressbar (1.11.0)
-    unicode-display_width (2.0.0)
+    unicode-display_width (2.1.0)
 
 PLATFORMS
   ruby
@@ -52,4 +53,4 @@ DEPENDENCIES
   rubocop
 
 BUNDLED WITH
-   2.2.3
+   2.2.15

data/lib/puma/metrics/parser.rb

@@ -46,6 +46,10 @@ module Puma
                        docstring: 'Maximum number of worker threads',
                        labels: [:index],
                        preset_labels: { index: 0 })
+        registry.gauge(:puma_requests_count,
+                       docstring: 'Number of processed requests',
+                       labels: [:index],
+                       preset_labels: { index: 0 })
         registry.gauge(:puma_workers,
                        docstring: 'Number of configured workers')
                 .set(1)

data/lib/puma/metrics/version.rb

@@ -2,6 +2,6 @@
 
 module Puma
   module Metrics
-    VERSION = '1.2.1'
+    VERSION = '1.2.4'
   end
 end

data/lib/puma/plugin/metrics.rb

@@ -24,12 +24,8 @@ Puma::Plugin.create do
       launcher.events.error "Invalid control URI: #{str}"
     end
 
-    launcher.events.register(:state) do |state|
-      if %i[halt restart stop].include?(state)
-        # rubocop:disable Style/SoleNestedConditional
-        metrics.stop(true) unless metrics.shutting_down?
-        # rubocop:enable Style/SoleNestedConditional
-      end
+    launcher.events.on_stopped do
+      metrics.stop(true) unless metrics.shutting_down?
     end
 
     metrics.run

data/puma-metrics.gemspec

@@ -17,6 +17,8 @@ Gem::Specification.new do |spec|
 
   spec.files         = `git ls-files -z`.split("\x0").reject { |f| f.match(%r{^(test|spec|features)/}) }
 
+  spec.metadata['rubygems_mfa_required'] = 'false'
+
   spec.required_ruby_version = '>= 2.6'
 
   spec.add_runtime_dependency 'prometheus-client', '>= 0.10'

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: puma-metrics
 version: !ruby/object:Gem::Version
-  version: 1.2.1
+  version: 1.2.4
 platform: ruby
 authors:
 - Harm-Jan Blok
-autorequire: 
+autorequire:
 bindir: bin
 cert_chain: []
-date: 2021-02-17 00:00:00.000000000 Z
+date: 2022-03-01 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: prometheus-client
@@ -109,7 +109,7 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '0'
 description: Puma plugin to export puma stats as prometheus metrics
-email: 
+email:
 executables: []
 extensions: []
 extra_rdoc_files: []
@@ -133,8 +133,9 @@ files:
 homepage: https://github.com/harmjanblok/puma-metrics
 licenses:
 - MIT
-metadata: {}
-post_install_message: 
+metadata:
+  rubygems_mfa_required: 'false'
+post_install_message:
 rdoc_options: []
 require_paths:
 - lib
@@ -149,8 +150,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.3.3
+signing_key:
 specification_version: 4
 summary: Puma plugin to export puma stats as prometheus metrics
 test_files: []