puma-metrics 1.2.2 → 1.2.5

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 228a88de3862f938b3dc0c4e0c63ee42d88ab61a2fee230c5071824750a830a6
-  data.tar.gz: e35f415d1e4117f9258d185b112262dbf804da50f0b5f889aa754a2440e032c8
+  metadata.gz: 2d94599f1e1f6122a9c32299fbd2de2fd78ae83a8c18dbb829dad0d7f218accc
+  data.tar.gz: 52225951970b80e56d434618aa2485271c8338647e6365406b0997a0f7af8f28
 SHA512:
-  metadata.gz: 7d6391b87304cd0c7983e6b4dacbd9b7e6360e2781435aaa7b81bf5af64349400c2f5b653da2b655f77c8e4184943b44e72293ebf3abbdb81a0f39d21f237fdf
-  data.tar.gz: 91553b2e9c235ffce3931f0bd633a07ed7e825d340e28c0413db099147868ab558d57676c49cf8d26c5ba17858ee6cdeb35bb87880499e9902113196787dce3d
+  metadata.gz: 9988478439070835936df32285974dcbc220f3ae66ef6806e19a225e4a768612c89064386db463ac054b592f16362055737cd5cf6c9ec4a1620120064fbf0b55
+  data.tar.gz: a20b275c9eea062d0a4a06b22fc0569c23a9a32ce5c6a754873d8d611e79839d9cbc41a73b11e22e0dd493c33660b0201440dd6676083952476725fab1dd018c

data/.github/workflows/workflow.yml

@@ -1,12 +1,16 @@
 name: steps
-on: [push]
+on:
+  push:
+    branches: [main, master]
+  pull_request:
+    branches: [main, master]
 jobs:
   test:
     name: test on ruby ${{ matrix.ruby }}
     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,17 +23,17 @@ 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'
+    if: github.ref == 'refs/heads/main'
     name: to rubygems
     needs: test
     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

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

data/CHANGELOG.md

@@ -2,6 +2,29 @@
 
 ## Unreleased
 
+## 1.2.5
+
+Changes:
+- Require puma 5.0 or newer as older versions don't support the `on_stopped` introduced in version puma-metrics 1.2.4.
+
+Housekeeping:
+- Update dependencies
+
+## 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:

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    puma-metrics (1.2.2)
+    puma-metrics (1.2.5)
       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.59.1)
       childprocess (>= 0.6.3, < 5)
       iniparse (~> 1.4)
-    parallel (1.20.1)
-    parser (3.0.0.0)
+      rexml (~> 3.2)
+    parallel (1.22.1)
+    parser (3.1.2.0)
       ast (~> 2.4.1)
-    prometheus-client (2.1.0)
-    puma (5.2.1)
+    prometheus-client (4.0.0)
+    puma (5.6.4)
       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.5.0)
+    rexml (3.2.5)
+    rubocop (1.30.0)
       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)
+      rexml (>= 3.2.5, < 4.0)
+      rubocop-ast (>= 1.18.0, < 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.18.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/version.rb

@@ -2,6 +2,6 @@
 
 module Puma
   module Metrics
-    VERSION = '1.2.2'
+    VERSION = '1.2.5'
   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,10 +17,12 @@ 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'
-  spec.add_runtime_dependency 'puma', '>= 3.0'
+  spec.add_runtime_dependency 'puma', '>= 5.0'
 
   spec.add_development_dependency 'bundler'
   spec.add_development_dependency 'minitest'

data/renovate.json

@@ -0,0 +1,5 @@
+{
+  "extends": [
+    "config:base"
+  ]
+}

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: puma-metrics
 version: !ruby/object:Gem::Version
-  version: 1.2.2
+  version: 1.2.5
 platform: ruby
 authors:
 - Harm-Jan Blok
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2021-02-17 00:00:00.000000000 Z
+date: 2022-05-31 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: prometheus-client
@@ -30,14 +30,14 @@ dependencies:
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: '3.0'
+        version: '5.0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: '3.0'
+        version: '5.0'
 - !ruby/object:Gem::Dependency
   name: bundler
   requirement: !ruby/object:Gem::Requirement
@@ -130,10 +130,12 @@ files:
 - lib/puma/metrics/version.rb
 - lib/puma/plugin/metrics.rb
 - puma-metrics.gemspec
+- renovate.json
 homepage: https://github.com/harmjanblok/puma-metrics
 licenses:
 - MIT
-metadata: {}
+metadata:
+  rubygems_mfa_required: 'false'
 post_install_message: 
 rdoc_options: []
 require_paths:
@@ -149,7 +151,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.2.3
+rubygems_version: 3.3.7
 signing_key: 
 specification_version: 4
 summary: Puma plugin to export puma stats as prometheus metrics