puma-metrics 1.4.1 → 1.5.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: b752774b701f341f325b8d5535520944fd0a7fbc1e474ed64cc2c189b374a3b5
-  data.tar.gz: 96e9922670abdc1305a6629d7aacc8c54df34acd3872981903481938889be425
+  metadata.gz: 22bee3aa4c7f95a7449d1486ce57455f1327120f943242534667e100405b777c
+  data.tar.gz: 24f7413bc4659cca27efcaf0ef6caa28bc10dda701e5827abae519daa744025a
 SHA512:
-  metadata.gz: 228efa0bf952f77fb530673fbbf00dd8b20ed3f0cff9bfd5dc9d921e3ded3d8d16a60869e25d7da9c3c14d27963d70d7760a5bc6e92100d714a86d7568c81421
-  data.tar.gz: 8ce2b97bcf2d9ac27b75acf7e1440bcaf40f47a1ca8188fa267b66fe2fbe75743ee58bafc3072a84cf67bae628e43db593909766269739e5101d1be14515ed00
+  metadata.gz: 78ca8ec54469aa6fea47e08ccc01c8582573a13718d5e11d7ea4ee473a3045f06db30c1468b131e885ae5ab5a1638ca3b016fac04fbc6533c825959ff32361bc
+  data.tar.gz: c0c29c150d7e04fd3ba648e4d5ff0e4ad0dba2bbaede0d099a10ee302f5d55f890dbe6a7b9672306331d3f282fa6a9e27d18b173b224e32059e8c7b1256e137c

data/.github/workflows/release.yml

@@ -0,0 +1,30 @@
+name: release
+on:
+  workflow_run:
+    branches: [main]
+    types:
+      - completed
+    workflows: ['test']
+jobs:
+  release:
+    if: github.repository == 'harmjanblok/puma-metrics'
+    name: Push gem to RubyGems.org
+    runs-on: ubuntu-latest
+
+    permissions:
+      id-token: write # IMPORTANT: this permission is mandatory for trusted publishing
+      contents: write # IMPORTANT: this permission is required for `rake release` to push the release tag
+
+    steps:
+      # Set up
+      - uses: actions/checkout@v5
+        with:
+          persist-credentials: false
+      - name: Set up Ruby
+        uses: ruby/setup-ruby@v1
+        with:
+          bundler-cache: true
+          ruby-version: ruby
+
+      # Release
+      - uses: rubygems/release-gem@v1

data/.github/workflows/{workflow.yml → test.yml}

@@ -1,4 +1,4 @@
-name: steps
+name: test
 on:
   push:
     branches: [main]
@@ -24,22 +24,3 @@ jobs:
     strategy:
       matrix:
         ruby: ['3.2', '3.3', '3.4']
-  deploy:
-    if: github.ref == 'refs/heads/main'
-    name: to rubygems
-    needs: test
-    runs-on: ubuntu-latest
-    steps:
-    - uses: actions/checkout@master
-    - uses: ruby/setup-ruby@master
-      with:
-        ruby-version: 3.4
-    - env:
-        RUBYGEMS_API_KEY: ${{ secrets.RUBYGEMS_API_KEY }}
-      run: |
-        mkdir -p $HOME/.gem
-        touch $HOME/.gem/credentials
-        chmod 0600 $HOME/.gem/credentials
-        printf -- "---\n:rubygems_api_key: ${RUBYGEMS_API_KEY}\n" > $HOME/.gem/credentials
-        gem build *.gemspec
-        gem push *.gem

data/CHANGELOG.md

@@ -2,6 +2,23 @@
 
 ## Unreleased
 
+## 1.5.0
+
+Changes:
+
+- Added support for puma 6.6.0 busy_threads stat
+- Require puma 6.6.0 or newer
+
+Housekeeping:
+
+- Update dependencies
+
+## 1.4.2
+
+Housekeeping:
+
+- Relax constraint limit to puma 6, exclude 7.0.0
+
 ## 1.4.1
 
 Housekeeping:

data/Gemfile.lock

@@ -1,9 +1,9 @@
 PATH
   remote: .
   specs:
-    puma-metrics (1.4.0)
+    puma-metrics (1.5.0)
       prometheus-client (>= 0.10)
-      puma (~> 6)
+      puma (>= 6.6.0, != 7.0.0)
 
 GEM
   remote: https://rubygems.org/
@@ -13,31 +13,31 @@ GEM
     childprocess (5.1.0)
       logger (~> 1.5)
     iniparse (1.5.0)
-    json (2.13.2)
+    json (2.16.0)
     language_server-protocol (3.17.0.5)
     lint_roller (1.1.0)
     logger (1.7.0)
-    minitest (5.25.5)
-    nio4r (2.7.4)
+    minitest (5.26.2)
+    nio4r (2.7.5)
     overcommit (0.68.0)
       childprocess (>= 0.6.3, < 6)
       iniparse (~> 1.4)
       rexml (>= 3.3.9)
     parallel (1.27.0)
-    parser (3.3.9.0)
+    parser (3.3.10.0)
       ast (~> 2.4.1)
       racc
-    prism (1.4.0)
+    prism (1.6.0)
     prometheus-client (4.2.5)
       base64
-    puma (6.6.1)
+    puma (7.1.0)
       nio4r (~> 2.0)
     racc (1.8.1)
     rainbow (3.1.1)
-    rake (13.3.0)
-    regexp_parser (2.11.2)
-    rexml (3.4.2)
-    rubocop (1.80.2)
+    rake (13.3.1)
+    regexp_parser (2.11.3)
+    rexml (3.4.4)
+    rubocop (1.81.7)
       json (~> 2.3)
       language_server-protocol (~> 3.17.0.2)
       lint_roller (~> 1.1.0)
@@ -45,16 +45,16 @@ GEM
       parser (>= 3.3.0.2)
       rainbow (>= 2.2.2, < 4.0)
       regexp_parser (>= 2.9.3, < 3.0)
-      rubocop-ast (>= 1.46.0, < 2.0)
+      rubocop-ast (>= 1.47.1, < 2.0)
       ruby-progressbar (~> 1.7)
       unicode-display_width (>= 2.4.0, < 4.0)
-    rubocop-ast (1.46.0)
+    rubocop-ast (1.48.0)
       parser (>= 3.3.7.2)
       prism (~> 1.4)
     ruby-progressbar (1.13.0)
-    unicode-display_width (3.1.5)
-      unicode-emoji (~> 4.0, >= 4.0.4)
-    unicode-emoji (4.0.4)
+    unicode-display_width (3.2.0)
+      unicode-emoji (~> 4.1)
+    unicode-emoji (4.1.0)
 
 PLATFORMS
   ruby
@@ -68,4 +68,4 @@ DEPENDENCIES
   rubocop
 
 BUNDLED WITH
-   2.5.6
+   2.7.2

data/lib/puma/metrics/parser.rb

@@ -34,6 +34,10 @@ module Puma
                        docstring: 'Number of established but unaccepted connections in the backlog',
                        labels: [:index],
                        preset_labels: { index: 0 })
+        registry.gauge(:puma_busy_threads,
+                       docstring: 'How saturated the worker threads are with requests',
+                       labels: [:index],
+                       preset_labels: { index: 0 })
         registry.gauge(:puma_running,
                        docstring: 'Number of running worker threads',
                        labels: [:index],

data/lib/puma/metrics/version.rb

@@ -2,6 +2,6 @@
 
 module Puma
   module Metrics
-    VERSION = '1.4.1'
+    VERSION = '1.5.0'
   end
 end

data/puma-metrics.gemspec

@@ -17,10 +17,10 @@ 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.metadata['rubygems_mfa_required'] = 'true'
 
   spec.required_ruby_version = '>= 3.0'
 
   spec.add_dependency 'prometheus-client', '>= 0.10'
-  spec.add_dependency 'puma', '~> 6'
+  spec.add_dependency 'puma', '>= 6.6.0', '!= 7.0.0'
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: puma-metrics
 version: !ruby/object:Gem::Version
-  version: 1.4.1
+  version: 1.5.0
 platform: ruby
 authors:
 - Harm-Jan Blok
@@ -27,23 +27,30 @@ dependencies:
   name: puma
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: 6.6.0
+    - - "!="
       - !ruby/object:Gem::Version
-        version: '6'
+        version: 7.0.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: 6.6.0
+    - - "!="
       - !ruby/object:Gem::Version
-        version: '6'
+        version: 7.0.0
 description: Puma plugin to export puma stats as prometheus metrics
 executables: []
 extensions: []
 extra_rdoc_files: []
 files:
 - ".editorconfig"
-- ".github/workflows/workflow.yml"
+- ".github/workflows/release.yml"
+- ".github/workflows/test.yml"
 - ".overcommit.yml"
 - ".rubocop.yml"
 - CHANGELOG.md
@@ -63,7 +70,7 @@ homepage: https://github.com/harmjanblok/puma-metrics
 licenses:
 - MIT
 metadata:
-  rubygems_mfa_required: 'false'
+  rubygems_mfa_required: 'true'
 rdoc_options: []
 require_paths:
 - lib