puma-plugin-telemetry 1.1.0 → 1.1.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: fe506b3cee809f3647bdbd9215b7ed150e8efaadc0d3ce6971c76cbca375dde8
-  data.tar.gz: 0c7a16268af68cd404297699db57a0f253c95e341e78b25555f114debeb6c86b
+  metadata.gz: b3992737163fb68bb64e961ac4012e8d00b43e4464cd37b945a62495d8acdef8
+  data.tar.gz: bc723cd155b0104b563c9795e3598a14ba4c24c53990b87050ba5aacce7fb831
 SHA512:
-  metadata.gz: c3f48102a6b14d5ba37135788d63b7c489e18a06640217d9df6080a98c9f62efdfdc5f9cf563e192225496d04e342a5829e192ce88b926d9c90e4cf4b68153db
-  data.tar.gz: 36f0d6c18542b52f9c77764bd6a84b7693af50e84a1e398333cf1d6207d76297fbf5dbcf2b906b8ef855bb9de42764a11b7877467ae3e4872a1dd01044b145e7
+  metadata.gz: 111bbc32976f4fbb619b2240a1229ae376e56a5c9269f138507528b851e2824048730660719da512b85069a93c05fe24d9419a4a70ac0c3c95ba64752f69725a
+  data.tar.gz: 7c57a55fd2701507f9eeb23d4231041ab41321b3a365f11af42ca70cdb768abc6c5421ace812c868277fdd3234c1997b453b3aca62f6bd82380b03679a82100f

data/.github/CODEOWNERS

@@ -3,3 +3,4 @@
 # Read more at https://help.github.com/en/articles/about-code-owners
 
 *   @babbel/tnt
+*   @driv3r

data/.github/workflows/build.yml

@@ -37,10 +37,27 @@ jobs:
           echo "build complete"
 
   release:
-    needs: build
-    if: contains(github.ref, 'tags') && github.event_name == 'create'
     runs-on: ubuntu-20.04
+
+    needs:
+      - build
+
+    if: github.event_name == 'create' && startsWith(github.ref, 'refs/tags/v')
+
     steps:
       - uses: actions/checkout@v3
       - uses: ruby/setup-ruby@v1
-      - uses: babbel/publish-gem@v1
+
+      - name: Create credentials
+        run: |
+          mkdir -p ~/.gem
+          cat << EOF > ~/.gem/credentials
+          ---
+          :rubygems_api_key: ${{ secrets.RUBYGEMS_TOKEN }}
+          EOF
+          chmod 0600 /home/runner/.gem/credentials
+
+      - name: Publish gem
+        run: |
+          gem build puma-plugin-telemetry.gemspec
+          gem push puma-plugin-telemetry-*.gem

data/CHANGELOG.md

@@ -7,6 +7,13 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 
 ## [Unreleased]
 
+## [1.1.2]
+
+- Add Puma 6 compatibility
+## [1.1.1]
+
+Public release.
+
 ## [1.1.0]
 
 Out of beta testing, reading for usage. Following is a recap from Alpha & Beta releases.

data/Gemfile.lock

@@ -1,8 +1,8 @@
 PATH
   remote: .
   specs:
-    puma-plugin-telemetry (1.1.0)
-      puma (>= 5.0)
+    puma-plugin-telemetry (1.1.2)
+      puma (< 7)
 
 GEM
   remote: https://rubygems.org/
@@ -14,7 +14,7 @@ GEM
     parallel (1.22.1)
     parser (3.1.2.0)
       ast (~> 2.4.1)
-    puma (5.6.4)
+    puma (6.0.1)
       nio4r (~> 2.0)
     rack (2.2.3.1)
     rainbow (3.1.1)
@@ -64,4 +64,4 @@ DEPENDENCIES
   rubocop-performance (~> 1.9)
 
 BUNDLED WITH
-   2.1.4
+   2.3.12

data/README.md

@@ -1,6 +1,11 @@
 # Puma::Plugin::Telemetry
 
-Puma plugin adding ability to publish various metrics to your prefered targets.
+Puma plugin which should be able to handle all your metric needs regarding your webserver:
+
+- ability to publish basic puma statistics (like queue backlog) to both logs and datadog
+- ability to add custom target whenever you need it
+- ability to monitor puma socket listen queue (!)
+- ability to report requests queue time via custom rack middleware - the time request spent between being accepted by Load Balancer and start of its processing by Puma worker
 
 ## Install
 

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

@@ -3,7 +3,7 @@
 module Puma
   class Plugin
     module Telemetry
-      VERSION = '1.1.0'
+      VERSION = '1.1.2'
     end
   end
 end

data/lib/puma/plugin/telemetry.rb

@@ -63,13 +63,14 @@ module Puma
       #
       module PluginInstanceMethods
         def start(launcher)
+          @launcher = launcher
+
           unless Puma::Plugin::Telemetry.config.enabled?
-            launcher.events.log 'plugin=telemetry msg="disabled, exiting..."'
+            log_writer.log 'plugin=telemetry msg="disabled, exiting..."'
             return
           end
 
-          @launcher = launcher
-          @launcher.events.log 'plugin=telemetry msg="enabled, setting up runner..."'
+          log_writer.log 'plugin=telemetry msg="enabled, setting up runner..."'
 
           in_background do
             sleep Puma::Plugin::Telemetry.config.initial_delay
@@ -79,13 +80,13 @@ module Puma
 
         def run!
           loop do
-            @launcher.events.debug 'plugin=telemetry msg="publish"'
+            log_writer.debug 'plugin=telemetry msg="publish"'
 
             call(Puma::Plugin::Telemetry.build(@launcher))
           rescue Errno::EPIPE
             # Occurs when trying to output to STDOUT while puma is shutting down
           rescue StandardError => e
-            @launcher.events.error "plugin=telemetry err=#{e.class} msg=#{e.message.inspect}"
+            log_writer.error "plugin=telemetry err=#{e.class} msg=#{e.message.inspect}"
           ensure
             sleep Puma::Plugin::Telemetry.config.frequency
           end
@@ -96,6 +97,16 @@ module Puma
             target.call(telemetry)
           end
         end
+
+        private
+
+        def log_writer
+          if Puma::Const::PUMA_VERSION.to_i < 6
+            @launcher.events
+          else
+            @launcher.log_writer
+          end
+        end
       end
     end
   end

data/puma-plugin-telemetry.gemspec

@@ -2,16 +2,25 @@
 
 require_relative 'lib/puma/plugin/telemetry/version'
 
-Gem::Specification.new do |spec|
-  spec.name          = 'puma-plugin-telemetry'
-  spec.version       = Puma::Plugin::Telemetry::VERSION
-  spec.authors       = ['Leszek Zalewski']
-  spec.email         = ['tnt@babbel.com']
+Gem::Specification.new do |spec| # rubocop:disable Metrics/BlockLength
+  spec.name    = 'puma-plugin-telemetry'
+  spec.version = Puma::Plugin::Telemetry::VERSION
+  spec.authors = ['Leszek Zalewski']
+  spec.email   = ['tnt@babbel.com']
 
-  spec.license       = 'MIT'
+  spec.license = 'MIT'
 
   spec.summary     = 'Puma plugin, adding ability to publish various metrics to your prefered targets.'
-  spec.homepage    = 'https://github.com/babbel/puma-plugin-telemetry'
+  spec.description = <<~TXT
+    Puma plugin which should be able to handle all your metric needs regarding your webserver:
+
+    - ability to publish basic puma statistics (like queue backlog) to both logs and datadog
+    - ability to add custom target whenever you need it
+    - ability to monitor puma socket listen queue (!)
+    - ability to report requests queue time via custom rack middleware - the time request spent between being accepted by Load Balancer and start of its processing by Puma worker
+  TXT
+
+  spec.homepage = 'https://github.com/babbel/puma-plugin-telemetry'
 
   spec.required_ruby_version = Gem::Requirement.new('>= 2.6.0')
 
@@ -30,5 +39,5 @@ Gem::Specification.new do |spec|
   spec.executables   = spec.files.grep(%r{^exe/}) { |f| File.basename(f) }
   spec.require_paths = ['lib']
 
-  spec.add_dependency 'puma', '>= 5.0'
+  spec.add_dependency 'puma', '< 7'
 end

metadata

@@ -1,30 +1,36 @@
 --- !ruby/object:Gem::Specification
 name: puma-plugin-telemetry
 version: !ruby/object:Gem::Version
-  version: 1.1.0
+  version: 1.1.2
 platform: ruby
 authors:
 - Leszek Zalewski
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2022-06-22 00:00:00.000000000 Z
+date: 2022-12-28 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: puma
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "<"
       - !ruby/object:Gem::Version
-        version: '5.0'
+        version: '7'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "<"
       - !ruby/object:Gem::Version
-        version: '5.0'
-description: 
+        version: '7'
+description: |
+  Puma plugin which should be able to handle all your metric needs regarding your webserver:
+
+  - ability to publish basic puma statistics (like queue backlog) to both logs and datadog
+  - ability to add custom target whenever you need it
+  - ability to monitor puma socket listen queue (!)
+  - ability to report requests queue time via custom rack middleware - the time request spent between being accepted by Load Balancer and start of its processing by Puma worker
 email:
 - tnt@babbel.com
 executables: []
@@ -81,7 +87,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.2.27
+rubygems_version: 3.0.3
 signing_key: 
 specification_version: 4
 summary: Puma plugin, adding ability to publish various metrics to your prefered targets.