yabeda-puma-plugin 0.7.1 → 0.8.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: f9b1df64591444d1f95959e4a18a2f84ddc0422da1a8aa7762b6da41cf0090ab
-  data.tar.gz: b0b6fd8696a7c35db5a2b31ddf462463a64038581dd9e414ed26d46a27eedbd0
+  metadata.gz: 7f149b6a7ae1795abd350b4c37918bb542db554f1f5c6fa6d311815cfa8bc5b5
+  data.tar.gz: 882e94b06e33ba04349f249ca7a6ae08e5c3f542f07609308a7ea8b5767ea6af
 SHA512:
-  metadata.gz: 474080f9c29212326062d91f968cde58fdfb573edf571194d786dbd895ba6e8400e81d05a77ff50aa9847c8681c6af6852a1c3bbc40032ad8b9b70b10d70d0ba
-  data.tar.gz: d89bac196177c49be5ef55df912bf29fe2eb3c487c7495d6e36020ad071fba53b3aeac38d22b89ad0e6870f3aa10b866face96a40c3bcae09d9a1501ab3c607e
+  metadata.gz: c5cd81095a3d35cfc0c7c7bf2d479a5718aac70827ebe5f4815ab5bbd64e9ffa33a83df1c73d70beed0d9a1120ddad462fd6c6e380c67baddb16717ab57b43c2
+  data.tar.gz: '006079d4b467fa30b9dd8541c5ea02f3c9557c69011f4a059681674973799fddf0efc07bd2a40b54b477226013416c74ec729600492bd22ed81a2e6c92d4d13e'

data/.github/workflows/build-release.yml

@@ -1,4 +1,4 @@
-name: Build and release gem to RubyGems
+name: Build and release gem
 
 on:
   push:
@@ -8,13 +8,17 @@ on:
 jobs:
   release:
     runs-on: ubuntu-latest
+    permissions:
+      contents: write
+      id-token: write
+      packages: write
     steps:
-      - uses: actions/checkout@v2
+      - uses: actions/checkout@v4
         with:
           fetch-depth: 0 # Fetch current tag as annotated. See https://github.com/actions/checkout/issues/290
       - uses: ruby/setup-ruby@v1
         with:
-          ruby-version: 2.7
+          ruby-version: "3.3"
       - name: "Extract data from tag: version, message, body"
         id: tag
         run: |
@@ -75,8 +79,8 @@ jobs:
           GEM_HOST_API_KEY: Bearer ${{ secrets.GITHUB_TOKEN }}
         run: |
           gem push yabeda-puma-plugin-${{ steps.tag.outputs.version }}.gem --host https://rubygems.pkg.github.com/${{ github.repository_owner }}
+      - name: Configure RubyGems Credentials
+        uses: rubygems/configure-rubygems-credentials@main
       - name: Publish to RubyGems
-        env:
-          GEM_HOST_API_KEY: "${{ secrets.RUBYGEMS_API_KEY }}"
         run: |
           gem push yabeda-puma-plugin-${{ steps.tag.outputs.version }}.gem

data/.github/workflows/test.yml

@@ -14,40 +14,33 @@ jobs:
     # Skip running tests for local pull requests (use push event instead), run only for foreign ones
     if: github.event_name != 'pull_request' || github.event.pull_request.head.repo.owner.login != github.event.pull_request.base.repo.owner.login
     runs-on: ubuntu-latest
+    continue-on-error: ${{ matrix.optional || false }}
     strategy:
       fail-fast: false
       matrix:
         include:
+          - ruby: head
+            puma: "7"
+            optional: true
+          - ruby: "3.4"
+            puma: "7"
+          - ruby: "3.3"
+            puma: "6"
+          - ruby: "3.2"
+            puma: "6"
           - ruby: "3.1"
             puma: "6"
           - ruby: "3.0"
             puma: "5"
           - ruby: "2.7"
-            puma: "5"
-          - ruby: "2.6"
-            puma: "4"
-          - ruby: "2.5"
             puma: "4"
-    container:
-      image: ruby:${{ matrix.ruby }}
-      env:
-        CI: true
-        PUMA_VERSION: ${{ matrix.puma }}
+    env:
+      PUMA_VERSION: ${{ matrix.puma }}
     steps:
-      - uses: actions/checkout@v3
-      - uses: actions/cache@v3
+      - uses: actions/checkout@v4
+      - uses: ruby/setup-ruby@v1
         with:
-          path: vendor/bundle
-          key: bundle-${{ matrix.ruby }}-${{ hashFiles('**/*.gemspec') }}-${{ hashFiles('**/Gemfile') }}
-          restore-keys: |
-            bundle-${{ matrix.ruby }}-${{ hashFiles('**/*.gemspec') }}-${{ hashFiles('**/Gemfile') }}
-            bundle-${{ matrix.ruby }}-
-      - name: Upgrade Bundler to 2.0 (for older Rubies)
-        run: gem install bundler -v '~> 2.0'
-      - name: Bundle install
-        run: |
-          bundle config path vendor/bundle
-          bundle install
-          bundle update
+          ruby-version: ${{ matrix.ruby }}
+          bundler-cache: true
       - name: Run RSpec
         run: bundle exec rspec

data/CHANGELOG.md

@@ -5,6 +5,14 @@ All notable changes to this project will be documented in this file.
 The format is based on [Keep a Changelog](http://keepachangelog.com/en/1.0.0/)
 and this project adheres to [Semantic Versioning](http://semver.org/spec/v2.0.0.html).
 
+## 0.8.0 - 2025-09-16
+
+### Added
+
+ - Puma 7.x support. [@phallstrom][] in [#36](https://github.com/yabeda-rb/yabeda-puma-plugin/pull/36)
+ - `requests_count` metric [@indiebrain][] in [#31](https://github.com/yabeda-rb/yabeda-puma-plugin/pull/31)
+ - `busy_threads` metric [@jbockler][] in [#35](https://github.com/yabeda-rb/yabeda-puma-plugin/pull/35)
+
 ## 0.7.1 - 2022-11-28
 
 ### Fixed
@@ -65,3 +73,6 @@ Initial release with basic metrics collection. [@dsalahutdinov]
 [@Neznauy]: https://github.com/Neznauy "Aleksandr Shlyakov"
 [@Envek]: https://github.com/Envek "Andrey Novikov"
 [@dsalahutdinov]: https://github.com/dsalahutdinov "Dmitry Salahutdinov"
+[@indiebrain]: https://github.com/indiebrain "Aaron Kuehler"
+[@jbockler]: https://github.com/jbockler "Josch Bockler"
+[@phallstrom]: https://github.com/phallstrom "Philip Hallstrom"

data/README.md

@@ -17,8 +17,10 @@ Works as the Puma plugin and provides following metrics:
 Segmented by the worker (index of the worker):
  - `puma_pool_capacity` - the capacity of each worker: the number of requests that the server is capable of taking right now. More details are [here](https://github.com/puma/puma/blob/0f8b10737e36fc24cdd572f76a739659b5fad9cb/lib/puma/server.rb#L167).
  - `puma_running` - the number of running threads (spawned threads) for any puma worker
+ - `puma_busy_threads` - the number of busy threads (`running threads` - `how many threads are waiting to receive work` + `how many requests are waiting for a thread to pick them up`)
  - `puma_max_threads` - preconfigured maximum number of worker threads
  - `puma_backlog` - the number of backlog threads, the number of connections in that worker's "todo" set waiting for a worker thread.
+ - `puma_requests_count` - the number of requests a worker has served since starting.
 
 ## Installation
 

data/lib/puma/plugin/yabeda.rb

@@ -17,8 +17,10 @@ Puma::Plugin.create do
 
       gauge :backlog, tags: %i[index], comment: 'Number of established but unaccepted connections in the backlog', aggregation: :most_recent
       gauge :running, tags: %i[index], comment: 'Number of running worker threads', aggregation: :most_recent
+      gauge :busy_threads, tags: %i[index], comment: 'Number of busy worker threads', aggregation: :most_recent
       gauge :pool_capacity, tags: %i[index], comment: 'Number of allocatable worker threads', aggregation: :most_recent
       gauge :max_threads, tags: %i[index], comment: 'Maximum number of worker threads', aggregation: :most_recent
+      gauge :requests_count, tags: %i[index], comment: 'Number of requests this worker has served since starting', aggregation: :most_recent
 
       if clustered
         gauge :workers, comment: 'Number of configured workers', aggregation: :most_recent
@@ -37,4 +39,3 @@ Puma::Plugin.create do
     end
   end
 end
-

data/lib/puma/plugin/yabeda_prometheus.rb

@@ -8,6 +8,7 @@ end
 
 require 'uri'
 require 'rack'
+require 'logger'
 
 module Puma
   class DSL
@@ -57,7 +58,9 @@ Puma::Plugin.create do
       [server, logger]
     }
 
-    events.on_booted do
+    # after_booted replaces on_booted in Puma 7.0.0
+    after_booted = events.respond_to?(:after_booted) ? :after_booted : :on_booted
+    events.public_send(after_booted) do
       unless server&.running
         server, logger = create_server.call
         logger.log "* Starting #{banner}"
@@ -66,16 +69,21 @@ Puma::Plugin.create do
     end
 
     # on_stopped and on_restart hooks were added in Puma 5.1 in https://github.com/puma/puma/commit/288a4cf756852a4837c77ee70d7fdcca1edb8e82
-    if events.respond_to?(:on_stopped) && events.respond_to?(:on_restart)
+    # after_stopped and before_restart were added in Puma 7.0.0
+    if (events.respond_to?(:after_stopped) && events.respond_to?(:before_restart)) ||
+      events.respond_to?(:on_stopped) && events.respond_to?(:on_restart)
 
-      events.on_stopped do
+      after_stopped = events.respond_to?(:after_stopped) ? :after_stopped : :on_stopped
+      before_restart = events.respond_to?(:before_restart) ? :before_restart : :on_restart
+
+      events.public_send(after_stopped) do
         if server && !server.shutting_down?
           logger.log "* Stopping #{banner}"
           server.stop(true)
         end
       end
 
-      events.on_restart do
+      events.public_send(before_restart) do
         logger.log "* Restarting #{banner}"
         server.stop(true)
         server, logger = create_server.call

data/lib/yabeda/puma/plugin/statistics.rb

@@ -2,7 +2,7 @@ module Yabeda
   module Puma
     module Plugin
       module Statistics
-        METRICS = [:backlog, :running, :pool_capacity, :max_threads]
+        METRICS = [:backlog, :running, :pool_capacity, :max_threads, :busy_threads, :requests_count]
         CLUSTERED_METRICS = [:booted_workers, :old_workers, :workers]
       end
     end

data/lib/yabeda/puma/plugin/version.rb

@@ -1,7 +1,7 @@
 module Yabeda
   module Puma
     module Plugin
-      VERSION = "0.7.1"
+      VERSION = "0.8.0"
     end
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: yabeda-puma-plugin
 version: !ruby/object:Gem::Version
-  version: 0.7.1
+  version: 0.8.0
 platform: ruby
 authors:
 - Salahutdinov Dmitry
-autorequire: 
+autorequire:
 bindir: exe
 cert_chain: []
-date: 2022-11-28 00:00:00.000000000 Z
+date: 2025-09-16 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: yabeda
@@ -157,7 +157,7 @@ homepage: http://github.com/yabeda-rb/yabeda-puma-plugin
 licenses:
 - MIT
 metadata: {}
-post_install_message: 
+post_install_message:
 rdoc_options: []
 require_paths:
 - lib
@@ -172,8 +172,8 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.1.6
-signing_key: 
+rubygems_version: 3.5.22
+signing_key:
 specification_version: 4
 summary: Puma web server plugin for collecting puma metrics with Yabeda framework.
 test_files: []