puma-metrics 1.1.0 → 1.2.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: db435968b3e4ec0d3a113f4114dad7d8d54214fa91d6b46bd2a17def4dc43791
-  data.tar.gz: 4c80158b91cf98faeed9945d6a4c16490b62dbfe4d5be9230874a6602997f596
+  metadata.gz: e6bfb3829a8b3f020867676ad2d06696602f9b3e9cdba9677c9d0cd96516d952
+  data.tar.gz: 9b22b853444c9f8eb9945582e6debd9676c0ac83487178fe056840c8cb438b96
 SHA512:
-  metadata.gz: 9dc507c3415301df0e3324c7aba236ed96dc3b1d46e3cfeab66a1c646854052909544ab85bb637e5daa4693301d4c92cba47753d07ca2e6b30a6b6960c6ee4f3
-  data.tar.gz: c0ccd94196ae42672a1a141690b3f54f70c2a4332853bfcb301d1c146d110ab4977fe5719e2fc5a03e003cf637501a9538bbea6a3d82300afba9d81f5ae37f40
+  metadata.gz: 79d9e90b3dc95a9508622a6142a044dd682b072dcfd3971a2bfa06b5651ba414b2dd1667be0896779ae9a08be677d9607db2e0f6e3ba2f7417581c59e4be0b37
+  data.tar.gz: 38a134598cb7f50faded591f745832423aedcc9b4c7589a796ff25a67479104348675bc2e6dea82e2f08b440ba54616fc1d81951038aa6a6195cd922d84313e7

data/.github/workflows/workflow.yml

@@ -19,7 +19,7 @@ jobs:
       run: bundle exec overcommit --run
     strategy:
       matrix:
-        ruby: ['2.4', '2.5', '2.6']
+        ruby: ['2.5', '2.5', '2.7']
   deploy:
     if: github.ref == 'refs/heads/master'
     name: to rubygems
@@ -29,7 +29,7 @@ jobs:
     - uses: actions/checkout@master
     - uses: actions/setup-ruby@master
       with:
-        ruby-version: 2.6
+        ruby-version: 2.7
     - env:
         RUBYGEMS_API_KEY: ${{ secrets.RUBYGEMS_API_KEY }}
       run: |

data/CHANGELOG.md

@@ -1,5 +1,16 @@
 # Changelog
 
+## Unreleased
+
+## 1.2.0
+
+Changes:
+- Drop support for ruby 2.4
+- Relax prometheus-client to '>= 0.10'
+
+Housekeeping:
+- Update development dependencies
+
 ## 1.1.0
 
 Changes:

data/Gemfile.lock

@@ -1,39 +1,44 @@
 PATH
   remote: .
   specs:
-    puma-metrics (1.1.0)
-      prometheus-client (~> 0.10)
+    puma-metrics (1.2.0)
+      prometheus-client (>= 0.10)
       puma (>= 3.0)
 
 GEM
   remote: https://rubygems.org/
   specs:
-    ast (2.4.0)
+    ast (2.4.1)
     childprocess (3.0.0)
-    iniparse (1.4.4)
-    jaro_winkler (1.5.4)
-    minitest (5.13.0)
+    iniparse (1.5.0)
+    minitest (5.14.1)
     nio4r (2.5.2)
-    overcommit (0.51.0)
+    overcommit (0.53.0)
       childprocess (>= 0.6.3, < 4)
       iniparse (~> 1.4)
-    parallel (1.18.0)
-    parser (2.6.5.0)
+    parallel (1.19.1)
+    parser (2.7.1.3)
       ast (~> 2.4.0)
-    prometheus-client (0.10.0)
-    puma (4.2.1)
+    prometheus-client (2.0.0)
+    puma (4.3.5)
       nio4r (~> 2.0)
     rainbow (3.0.0)
-    rake (13.0.0)
-    rubocop (0.76.0)
-      jaro_winkler (~> 1.5.1)
+    rake (13.0.1)
+    regexp_parser (1.7.1)
+    rexml (3.2.4)
+    rubocop (0.85.1)
       parallel (~> 1.10)
-      parser (>= 2.6)
+      parser (>= 2.7.0.1)
       rainbow (>= 2.2.2, < 4.0)
+      regexp_parser (>= 1.7)
+      rexml
+      rubocop-ast (>= 0.0.3)
       ruby-progressbar (~> 1.7)
-      unicode-display_width (>= 1.4.0, < 1.7)
+      unicode-display_width (>= 1.4.0, < 2.0)
+    rubocop-ast (0.0.3)
+      parser (>= 2.7.0.1)
     ruby-progressbar (1.10.1)
-    unicode-display_width (1.6.0)
+    unicode-display_width (1.7.0)
 
 PLATFORMS
   ruby
@@ -47,4 +52,4 @@ DEPENDENCIES
   rubocop
 
 BUNDLED WITH
-   2.0.2
+   2.1.2

data/lib/puma/metrics/app.rb

@@ -14,13 +14,22 @@ module Puma
       end
 
       def call(_env)
-        @parser.parse JSON.parse(@launcher.stats)
+        retrieve_and_parse_stats!
         [
           200,
           { 'Content-Type' => 'text/plain' },
           [Prometheus::Client::Formats::Text.marshal(Prometheus::Client.registry)]
         ]
       end
+
+      def retrieve_and_parse_stats!
+        puma_stats = @launcher.stats
+        if puma_stats.is_a?(Hash) # Modern Puma outputs stats as a Symbol-keyed Hash
+          @parser.parse(puma_stats)
+        else
+          @parser.parse(JSON.parse(puma_stats, symbolize_names: true))
+        end
+      end
     end
   end
 end

data/lib/puma/metrics/parser.rb

@@ -10,10 +10,10 @@ module Puma
         register_clustered_metrics if clustered
       end
 
-      def parse(stats, labels = {})
-        stats.each do |key, value|
-          value.each { |s| parse(s, labels.merge(index: s['index'])) } if key == 'worker_status'
-          parse(value, labels) if key == 'last_status'
+      def parse(symbol_keyed_stats, labels = {})
+        symbol_keyed_stats.each do |key, value|
+          value.each { |s| parse(s, labels.merge(index: s[:index])) } if key == :worker_status
+          parse(value, labels) if key == :last_status
           update_metric(key, value, labels)
         end
       end

data/lib/puma/metrics/version.rb

@@ -2,6 +2,6 @@
 
 module Puma
   module Metrics
-    VERSION = '1.1.0'
+    VERSION = '1.2.0'
   end
 end

data/puma-metrics.gemspec

@@ -17,7 +17,7 @@ Gem::Specification.new do |spec|
 
   spec.files         = `git ls-files -z`.split("\x0").reject { |f| f.match(%r{^(test|spec|features)/}) }
 
-  spec.add_runtime_dependency 'prometheus-client', '~> 0.10'
+  spec.add_runtime_dependency 'prometheus-client', '>= 0.10'
   spec.add_runtime_dependency 'puma', '>= 3.0'
 
   spec.add_development_dependency 'bundler'

metadata

@@ -1,27 +1,27 @@
 --- !ruby/object:Gem::Specification
 name: puma-metrics
 version: !ruby/object:Gem::Version
-  version: 1.1.0
+  version: 1.2.0
 platform: ruby
 authors:
 - Harm-Jan Blok
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2019-10-30 00:00:00.000000000 Z
+date: 2020-06-15 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: prometheus-client
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0.10'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0.10'
 - !ruby/object:Gem::Dependency
@@ -149,7 +149,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.0.3
+rubygems_version: 3.1.2
 signing_key: 
 specification_version: 4
 summary: Puma plugin to export puma stats as prometheus metrics