promenade 0.12.6 → 0.12.8

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 58627a85538ca904c6b25090fb615ae2585ab61c1699f25339397c25dcf1388a
-  data.tar.gz: 91768cb3278f5519e8b6d34bd972969a12bb8880755ddef0baf88d41dcc0f91a
+  metadata.gz: 63e143fdb9c87d5bd17e3548528b167b10112878c9bc10161fd05ab94e23b3d2
+  data.tar.gz: b6951e354c8c470523d4fc35a860d97008a3189710d46406846e0dedeb18af0f
 SHA512:
-  metadata.gz: a5dc4a8c6e32d21dbf1b661eb5884608814fc69f1fafba6fffdcd2cd566828f6c0046f88eefee49a2fdbb7ae8265c0ae4a345e7e28eaafe45517132f7bc2278f
-  data.tar.gz: c688ecd3878042365723b3c187d5091c94b40cf594e29263b3f671d75ccef7851edac340246fcda9c115fb524b4c298da1d2dd7a94c694976ec46da6fdcd216b
+  metadata.gz: 1ae527b66e8973133c0478ad0e3bd0a7b256b56c3f13f68a635ceda84eba6fb1882ebda1055f84b5378f6c6fee8768c6e6faa03df47c34a5680f71843bfe60f3
+  data.tar.gz: a26e8e2633cd14b4ddcd29ef7cb303dd92ce15e51647033baeff98cbe37cb6386c74d9e37e359d325f4d5f991085d877b9ed8114c4521bbfb816321304b0daaa

data/lib/promenade/pitchfork/stats.rb

@@ -1,41 +1,19 @@
-require "promenade/raindrops/stats"
-
 module Promenade
   module Pitchfork
     class Stats
-      Promenade.gauge :pitchfork_workers_count do
+      Promenade.gauge :pitchfork_workers do
         doc "Number of workers configured"
+        multiprocess_mode :max
       end
 
-      Promenade.gauge :pitchfork_live_workers_count do
+      Promenade.gauge :pitchfork_live_workers do
         doc "Number of live / booted workers"
-      end
-
-      Promenade.gauge :pitchfork_capacity do
-        doc "Number of workers that are currently idle"
-      end
-
-      Promenade.gauge :pitchfork_busy_percent do
-        doc "Percentage of workers that are currently busy"
-      end
-
-      def initialize
-        return unless defined?(::Pitchfork::Info)
-
-        @workers_count = ::Pitchfork::Info.workers_count
-        @live_workers_count = ::Pitchfork::Info.live_workers_count
-
-        raindrops_stats = Raindrops::Stats.new
-
-        @active_workers = raindrops_stats.active_workers || 0
-        @queued_requests = raindrops_stats.queued_requests || 0
+        multiprocess_mode :max
       end
 
       def instrument
-        Promenade.metric(:pitchfork_workers_count).set({}, workers_count)
-        Promenade.metric(:pitchfork_live_workers_count).set({}, live_workers_count)
-        Promenade.metric(:pitchfork_capacity).set({}, capacity)
-        Promenade.metric(:pitchfork_busy_percent).set({}, busy_percent)
+        Promenade.metric(:pitchfork_workers).set({}, workers_count)
+        Promenade.metric(:pitchfork_live_workers).set({}, live_workers_count)
       end
 
       def self.instrument
@@ -44,18 +22,16 @@ module Promenade
 
       private
 
-        attr_reader :workers_count, :live_workers_count, :active_workers, :queued_requests
-
-        def capacity
-          return 0 if live_workers_count.nil? || live_workers_count == 0
+        def workers_count
+          return unless defined?(::Pitchfork::Info)
 
-          live_workers_count - active_workers
+          ::Pitchfork::Info.workers_count
         end
 
-        def busy_percent
-          return 0 if live_workers_count == 0
+        def live_workers_count
+          return unless defined?(::Pitchfork::Info)
 
-          (active_workers.to_f / live_workers_count) * 100
+          ::Pitchfork::Info.live_workers_count
         end
     end
   end

data/lib/promenade/version.rb

@@ -1,3 +1,3 @@
 module Promenade
-  VERSION = "0.12.6".freeze
+  VERSION = "0.12.8".freeze
 end

data/promenade.gemspec

@@ -13,13 +13,10 @@ Gem::Specification.new do |spec|
   spec.license       = "MIT"
 
   # Specify which files should be added to the gem when it is released.
-  # The `git ls-files -z` loads the files in the RubyGem that have been added into git.
   spec.files         = Dir.chdir(File.expand_path(__dir__)) do
-    `git ls-files -z`.split("\x0").reject { |f| f.match(%r{^(test|spec|features)/}) }
+    Dir.glob("**/*").select { |f| f.match(%r{^(lib|README|LICENSE|promenade.gemspec)}) && File.file?(f) }
   end
 
-  spec.bindir        = "exe"
-  spec.executables   = spec.files.grep(%r{^exe/}) { |f| File.basename(f) }
   spec.require_paths = ["lib"]
 
   spec.required_ruby_version = ">= 3.2"
@@ -27,13 +24,10 @@ Gem::Specification.new do |spec|
   spec.add_dependency "actionpack"
   spec.add_dependency "activesupport", "> 6.0", "< 9.0"
   spec.add_dependency "prometheus-client-mmap", "~> 1.5"
-  spec.add_dependency "rack"
-  spec.add_dependency "rackup"
-  spec.add_development_dependency "bundler", "~> 2.0"
+  spec.add_development_dependency "bundler", "~> 4.0"
   spec.add_development_dependency "byebug"
   spec.add_development_dependency "climate_control"
   spec.add_development_dependency "rails", "> 3.0", "< 9.0"
-  spec.add_development_dependency "raindrops"
   spec.add_development_dependency "rake"
   spec.add_development_dependency "rspec", "~> 3.13"
   spec.add_development_dependency "rspec-rails", "~> 8.0"

metadata

@@ -1,11 +1,11 @@
 --- !ruby/object:Gem::Specification
 name: promenade
 version: !ruby/object:Gem::Version
-  version: 0.12.6
+  version: 0.12.8
 platform: ruby
 authors:
 - Ed Robinson
-bindir: exe
+bindir: bin
 cert_chain: []
 date: 1980-01-02 00:00:00.000000000 Z
 dependencies:
@@ -57,48 +57,20 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '1.5'
-- !ruby/object:Gem::Dependency
-  name: rack
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '0'
-  type: :runtime
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '0'
-- !ruby/object:Gem::Dependency
-  name: rackup
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '0'
-  type: :runtime
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '0'
 - !ruby/object:Gem::Dependency
   name: bundler
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '2.0'
+        version: '4.0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '2.0'
+        version: '4.0'
 - !ruby/object:Gem::Dependency
   name: byebug
   requirement: !ruby/object:Gem::Requirement
@@ -147,20 +119,6 @@ dependencies:
     - - "<"
       - !ruby/object:Gem::Version
         version: '9.0'
-- !ruby/object:Gem::Dependency
-  name: raindrops
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '0'
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '0'
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement
@@ -289,35 +247,12 @@ dependencies:
         version: '0'
 email:
 - edward-robinson@cookpad.com
-executables:
-- promenade
+executables: []
 extensions: []
 extra_rdoc_files: []
 files:
-- ".github/workflows/ci.yaml"
-- ".gitignore"
-- ".rspec"
-- ".rubocop.yml"
-- CODE_OF_CONDUCT.md
-- Gemfile
-- Gemfile.lock
 - LICENSE
-- LICENSE.txt
 - README.md
-- Rakefile
-- bin/console
-- bin/integration_test
-- bin/rails
-- bin/setup
-- bin/yjit_intergration_test
-- codecove.yml
-- exe/promenade
-- gemfiles/7.2.3.gemfile
-- gemfiles/7.2.3.gemfile.lock
-- gemfiles/8.0.4.gemfile
-- gemfiles/8.0.4.gemfile.lock
-- gemfiles/8.1.2.gemfile
-- gemfiles/8.1.2.gemfile.lock
 - lib/promenade.rb
 - lib/promenade/client/rack/exception_handler.rb
 - lib/promenade/client/rack/http_request_duration_collector.rb
@@ -347,8 +282,6 @@ files:
 - lib/promenade/pitchfork/worker_pid_provider.rb
 - lib/promenade/prometheus.rb
 - lib/promenade/railtie.rb
-- lib/promenade/raindrops/middleware.rb
-- lib/promenade/raindrops/stats.rb
 - lib/promenade/setup.rb
 - lib/promenade/version.rb
 - lib/promenade/waterdrop.rb
@@ -378,7 +311,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.6.9
+rubygems_version: 4.0.3
 specification_version: 4
 summary: Promenade makes it simple to instrument Ruby apps for prometheus scraping
 test_files: []

data/.github/workflows/ci.yaml

@@ -1,27 +0,0 @@
-name: CI
-on:
-  push:
-    branches:
-      - master
-  pull_request:
-jobs:
-  test:
-    strategy:
-      fail-fast: false
-      matrix:
-        ruby: ["3.2", "3.3", "3.4", "4.0"]
-        rails: ["7.2.3", "8.0.4", "8.1.2"]
-    runs-on: ubuntu-latest
-    env:
-      BUNDLE_GEMFILE: ${{ github.workspace }}/gemfiles/${{ matrix.rails }}.gemfile
-    steps:
-    - uses: actions/checkout@v4
-    - uses: ruby/setup-ruby@v1
-      with:
-        ruby-version: ${{ matrix.ruby }}
-        bundler-cache: true
-    - run: bundle exec rake
-    - name: Upload test results to Codecov
-      uses: codecov/codecov-action@v4
-      with:
-        token: ${{ secrets.CODECOV_TOKEN }}

data/.gitignore

@@ -1,16 +0,0 @@
-.rspec_status
-.byebug_history
-.rubocop-https*yml
-/.bundle/
-/coverage/
-/doc/
-/log/
-/pkg/
-/.sass-cache/
-/spec/reports/
-/spec/dummy/log
-/spec/dummy/tmp
-/tmp/
-/vendor/
-/.yardoc
-/_yardoc/

data/.rspec

@@ -1,3 +0,0 @@
---format documentation
---color
---require spec_helper

data/.rubocop.yml

@@ -1,22 +0,0 @@
-inherit_from:
-  - https://raw.githubusercontent.com/cookpad/guides/master/.rubocop.yml
-
-AllCops:
-  TargetRubyVersion: 3.2
-  NewCops: enable
-  Exclude:
-    - vendor/**/*
-    - vendor/**/.*
-
-Style/TrailingCommaInHashLiteral:
-  EnforcedStyleForMultiline: comma
-Style/TrailingCommaInArguments:
-  EnforcedStyleForMultiline: comma
-Rails/RakeEnvironment:
-  Enabled: false
-Rails/EnvironmentVariableAccess:
-  Enabled: false
-RSpec/DescribedClass:
-  Enabled: false
-Gemspec/DevelopmentDependencies:
-  Enabled: false

data/CODE_OF_CONDUCT.md

@@ -1,74 +0,0 @@
-# Contributor Covenant Code of Conduct
-
-## Our Pledge
-
-In the interest of fostering an open and welcoming environment, we as
-contributors and maintainers pledge to making participation in our project and
-our community a harassment-free experience for everyone, regardless of age, body
-size, disability, ethnicity, gender identity and expression, level of experience,
-nationality, personal appearance, race, religion, or sexual identity and
-orientation.
-
-## Our Standards
-
-Examples of behavior that contributes to creating a positive environment
-include:
-
-* Using welcoming and inclusive language
-* Being respectful of differing viewpoints and experiences
-* Gracefully accepting constructive criticism
-* Focusing on what is best for the community
-* Showing empathy towards other community members
-
-Examples of unacceptable behavior by participants include:
-
-* The use of sexualized language or imagery and unwelcome sexual attention or
-advances
-* Trolling, insulting/derogatory comments, and personal or political attacks
-* Public or private harassment
-* Publishing others' private information, such as a physical or electronic
-  address, without explicit permission
-* Other conduct which could reasonably be considered inappropriate in a
-  professional setting
-
-## Our Responsibilities
-
-Project maintainers are responsible for clarifying the standards of acceptable
-behavior and are expected to take appropriate and fair corrective action in
-response to any instances of unacceptable behavior.
-
-Project maintainers have the right and responsibility to remove, edit, or
-reject comments, commits, code, wiki edits, issues, and other contributions
-that are not aligned to this Code of Conduct, or to ban temporarily or
-permanently any contributor for other behaviors that they deem inappropriate,
-threatening, offensive, or harmful.
-
-## Scope
-
-This Code of Conduct applies both within project spaces and in public spaces
-when an individual is representing the project or its community. Examples of
-representing a project or community include using an official project e-mail
-address, posting via an official social media account, or acting as an appointed
-representative at an online or offline event. Representation of a project may be
-further defined and clarified by project maintainers.
-
-## Enforcement
-
-Instances of abusive, harassing, or otherwise unacceptable behavior may be
-reported by contacting the project team at edward-robinson@cookpad.com. All
-complaints will be reviewed and investigated and will result in a response that
-is deemed necessary and appropriate to the circumstances. The project team is
-obligated to maintain confidentiality with regard to the reporter of an incident.
-Further details of specific enforcement policies may be posted separately.
-
-Project maintainers who do not follow or enforce the Code of Conduct in good
-faith may face temporary or permanent repercussions as determined by other
-members of the project's leadership.
-
-## Attribution
-
-This Code of Conduct is adapted from the [Contributor Covenant][homepage], version 1.4,
-available at [http://contributor-covenant.org/version/1/4][version]
-
-[homepage]: http://contributor-covenant.org
-[version]: http://contributor-covenant.org/version/1/4/

data/Gemfile

@@ -1,6 +0,0 @@
-source "https://rubygems.org"
-
-# Specify your gem's dependencies in promenade.gemspec
-gemspec
-
-gem "webrick"