prometheus_exporter 2.2.0 → 2.3.0

data/lib/prometheus_exporter/server/web_server.rb

@@ -12,7 +12,6 @@ module PrometheusExporter::Server
     def initialize(opts)
       @port = opts[:port] || PrometheusExporter::DEFAULT_PORT
       @bind = opts[:bind] || PrometheusExporter::DEFAULT_BIND_ADDRESS
-      @collector = opts[:collector] || Collector.new
       @timeout = opts[:timeout] || PrometheusExporter::DEFAULT_TIMEOUT
       @verbose = opts[:verbose] || false
       @auth = opts[:auth]
@@ -61,6 +60,8 @@ module PrometheusExporter::Server
         @bind = nil
       end
 
+      @collector = opts[:collector] || Collector.new(logger: @logger)
+
       @server =
         WEBrick::HTTPServer.new(
           Port: @port,

data/lib/prometheus_exporter/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module PrometheusExporter
-  VERSION = "2.2.0"
+  VERSION = "2.3.0"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: prometheus_exporter
 version: !ruby/object:Gem::Version
-  version: 2.2.0
+  version: 2.3.0
 platform: ruby
 authors:
 - Sam Saffron
 autorequire: 
-bindir: bin
+bindir: exe
 cert_chain: []
-date: 2024-12-05 00:00:00.000000000 Z
+date: 2025-08-15 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: webrick
@@ -24,244 +24,6 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
-- !ruby/object:Gem::Dependency
-  name: rubocop
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '0.69'
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '0.69'
-- !ruby/object:Gem::Dependency
-  name: bundler
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: 2.1.4
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: 2.1.4
-- !ruby/object:Gem::Dependency
-  name: rake
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '13.0'
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '13.0'
-- !ruby/object:Gem::Dependency
-  name: minitest
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: 5.23.0
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: 5.23.0
-- !ruby/object:Gem::Dependency
-  name: guard
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '2.0'
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '2.0'
-- !ruby/object:Gem::Dependency
-  name: mini_racer
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: 0.12.0
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: 0.12.0
-- !ruby/object:Gem::Dependency
-  name: guard-minitest
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '2.0'
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '2.0'
-- !ruby/object:Gem::Dependency
-  name: oj
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '3.0'
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '3.0'
-- !ruby/object:Gem::Dependency
-  name: rack-test
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: 2.1.0
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: 2.1.0
-- !ruby/object:Gem::Dependency
-  name: minitest-stub-const
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '0.6'
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '0.6'
-- !ruby/object:Gem::Dependency
-  name: rubocop-discourse
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '3'
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '3'
-- !ruby/object:Gem::Dependency
-  name: appraisal
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '2.3'
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '2.3'
-- !ruby/object:Gem::Dependency
-  name: activerecord
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: 6.0.0
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: 6.0.0
-- !ruby/object:Gem::Dependency
-  name: redis
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">"
-      - !ruby/object:Gem::Version
-        version: '5'
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">"
-      - !ruby/object:Gem::Version
-        version: '5'
-- !ruby/object:Gem::Dependency
-  name: m
-  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: syntax_tree
-  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: syntax_tree-disable_ternary
-  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'
 description: Prometheus metric collector and exporter for Ruby
 email:
 - sam.saffron@gmail.com
@@ -270,28 +32,10 @@ executables:
 extensions: []
 extra_rdoc_files: []
 files:
-- ".github/workflows/ci.yml"
-- ".gitignore"
-- ".rubocop"
-- ".rubocop.yml"
-- ".streerc"
-- Appraisals
 - CHANGELOG
-- CODE_OF_CONDUCT.md
-- Dockerfile
-- Gemfile
-- Guardfile
 - LICENSE.txt
 - README.md
-- Rakefile
-- bench/bench.rb
-- bin/prometheus_exporter
-- examples/custom_collector.rb
-- gemfiles/.bundle/config
-- gemfiles/ar_60.gemfile
-- gemfiles/ar_61.gemfile
-- gemfiles/ar_70.gemfile
-- gemfiles/ar_71.gemfile
+- exe/prometheus_exporter
 - lib/prometheus_exporter.rb
 - lib/prometheus_exporter/client.rb
 - lib/prometheus_exporter/instrumentation.rb
@@ -339,7 +83,6 @@ files:
 - lib/prometheus_exporter/server/web_collector.rb
 - lib/prometheus_exporter/server/web_server.rb
 - lib/prometheus_exporter/version.rb
-- prometheus_exporter.gemspec
 homepage: https://github.com/discourse/prometheus_exporter
 licenses:
 - MIT
@@ -352,7 +95,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
-      version: 3.0.0
+      version: 3.2.0
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="

data/.github/workflows/ci.yml

@@ -1,103 +0,0 @@
-name: CI
-
-on:
-  push:
-    branches:
-      - main
-  pull_request:
-  schedule:
-    - cron: "0 0 * * 0" # weekly
-
-permissions:
-  contents: write
-  packages: write
-
-env:
-  DOCKER_REPO: ghcr.io/discourse/prometheus_exporter
-
-jobs:
-  build:
-    runs-on: ubuntu-latest
-    name: Ruby ${{ matrix.ruby }} AR ${{ matrix.activerecord }}
-    timeout-minutes: 10
-
-    env:
-      BUNDLE_GEMFILE: ${{ github.workspace }}/gemfiles/ar_${{ matrix.activerecord }}.gemfile
-
-    strategy:
-      fail-fast: false
-      matrix:
-        ruby: ["3.1", "3.2", "3.3"]
-        activerecord: [61, 70, 71]
-
-    steps:
-      - uses: actions/checkout@v4
-
-      - uses: ruby/setup-ruby@v1
-        with:
-          ruby-version: ${{ matrix.ruby }}
-          bundler: latest
-          bundler-cache: true
-
-      - name: Rubocop
-        run: bundle exec rubocop
-
-      - name: Syntax tree
-        run: bundle exec stree check Gemfile $(git ls-files '*.rb') $(git ls-files '*.rake') $(git ls-files '*.thor')
-
-      - name: Run tests
-        run: bundle exec rake
-
-  publish:
-    if: github.event_name == 'push' && github.ref == 'refs/heads/main'
-    needs: build
-    runs-on: ubuntu-latest
-
-    outputs:
-      new_version_published: ${{ steps.release.outputs.new_version }}
-
-    steps:
-      - uses: actions/checkout@v4
-
-      - name: Release gem
-        id: release
-        uses: discourse/publish-rubygems-action@v2
-        env:
-          RUBYGEMS_API_KEY: ${{ secrets.RUBYGEMS_API_KEY }}
-          GIT_EMAIL: team@discourse.org
-          GIT_NAME: discoursebot
-
-  publish_docker:
-    needs: publish
-    if: needs.publish.outputs.new_version_published == 'true'
-    runs-on: ubuntu-latest
-    timeout-minutes: 20
-
-    steps:
-      - uses: actions/checkout@v4
-      - uses: docker/setup-qemu-action@v2
-      - uses: docker/setup-buildx-action@v2
-
-      - name: Set vars
-        id: vars
-        run: |
-          ruby -r ./lib/prometheus_exporter/version.rb -e 'print "version=#{PrometheusExporter::VERSION}"' >> $GITHUB_OUTPUT
-
-      - name: Login to Github Container Registry
-        uses: docker/login-action@v2
-        with:
-          registry: ghcr.io
-          username: ${{ github.actor }}
-          password: ${{ secrets.GITHUB_TOKEN }}
-
-      - name: Build and push images
-        uses: docker/build-push-action@v3
-        with:
-          context: .
-          push: true
-          platforms: linux/amd64,linux/arm64
-          build-args: |
-            GEM_VERSION=${{ steps.vars.outputs.version }}
-          tags: |
-            ${{ env.DOCKER_REPO }}:${{ steps.vars.outputs.version }}
-            ${{ env.DOCKER_REPO }}:latest

data/.gitignore

@@ -1,13 +0,0 @@
-/.bundle/
-/.yardoc
-/_yardoc/
-/coverage/
-/doc/
-/pkg/
-/spec/reports/
-/tmp/
-Gemfile.lock
-/gemfiles/*.gemfile.lock
-
-
-.rubocop-https---raw-githubusercontent-com-discourse-discourse-master--rubocop-yml

data/.rubocop

@@ -1 +0,0 @@
---ignore-unrecognized-cops

data/.rubocop.yml

@@ -1,18 +0,0 @@
-inherit_gem:
-  rubocop-discourse: default.yml
-
-AllCops:
-  Exclude:
-    - 'gemfiles/**/*'
-    - 'vendor/**/*'
-
-Discourse/Plugins/NoMonkeyPatching:
-  Enabled: false
-
-Discourse/Plugins/NamespaceMethods:
-  Exclude:
-    - bin/prometheus_exporter
-
-Style/InvertibleUnlessCondition:
-  Exclude:
-    - '*.gemspec' 

data/.streerc

@@ -1,2 +0,0 @@
---print-width=100
---plugins=plugin/trailing_comma,disable_ternary

data/Appraisals

@@ -1,14 +0,0 @@
-# frozen_string_literal: true
-
-appraise "ar-60" do
-  gem "activerecord", "~> 6.0.0"
-end
-
-appraise "ar-61" do
-  gem "activerecord", "~> 6.1.1"
-end
-
-appraise "ar-70" do
-  # latest version
-  gem "activerecord", "~> 7.1.2"
-end

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 sam.saffron@gmail.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/Dockerfile

@@ -1,9 +0,0 @@
-ARG RUBY_VERSION=3.1
-ARG GEM_VERSION=
-
-FROM ruby:${RUBY_VERSION}-slim
-
-RUN gem install --no-doc --version=${GEM_VERSION} prometheus_exporter
-
-EXPOSE 9394
-ENTRYPOINT ["prometheus_exporter", "-b", "ANY"]

data/Gemfile

@@ -1,8 +0,0 @@
-# frozen_string_literal: true
-
-source "https://rubygems.org"
-
-git_source(:github) { |repo_name| "https://github.com/#{repo_name}" }
-
-# Specify your gem's dependencies in prometheus_exporter.gemspec
-gemspec

data/Guardfile

@@ -1,8 +0,0 @@
-# frozen_string_literal: true
-
-guard :minitest do
-  # with Minitest::Unit
-  watch(%r{^test/(.*)\/?(.*)_test\.rb$})
-  watch(%r{^lib/prometheus_exporter/(.*/)?([^/]+)\.rb$})     { |m| "test/#{m[1]}#{m[2]}_test.rb" }
-  watch(%r{^test/test_helper\.rb$})      { 'test' }
-end

data/Rakefile

@@ -1,12 +0,0 @@
-# frozen_string_literal: true
-
-require "bundler/gem_tasks"
-require "rake/testtask"
-
-Rake::TestTask.new(:test) do |t|
-  t.libs << "test"
-  t.libs << "lib"
-  t.test_files = FileList["test/**/*_test.rb"]
-end
-
-task default: :test

data/bench/bench.rb

@@ -1,46 +0,0 @@
-# frozen_string_literal: true
-
-require_relative "../lib/prometheus_exporter"
-require_relative "../lib/prometheus_exporter/client"
-require_relative "../lib/prometheus_exporter/server"
-
-# test how long it takes a custom collector to process 10k messages
-
-class Collector
-  def initialize(done)
-    @i = 0
-    @done = done
-  end
-
-  def process(message)
-    _parsed = JSON.parse(message)
-    @i += 1
-    @done.call if @i % 10_000 == 0
-  end
-
-  def prometheus_metrics_text
-  end
-end
-
-@start = nil
-@client = nil
-@runs = 1000
-
-done =
-  lambda do
-    puts "Elapsed for 10k messages is #{Time.now - @start}"
-    if (@runs -= 1) > 0
-      @start = Time.now
-      10_000.times { @client.send_json(hello: "world") }
-    end
-  end
-
-collector = Collector.new(done)
-server = PrometheusExporter::Server::WebServer.new port: 12_349, collector: collector
-server.start
-@client = PrometheusExporter::Client.new port: 12_349, max_queue_size: 100_000
-
-@start = Time.now
-10_000.times { @client.send_json(hello: "world") }
-
-sleep

data/examples/custom_collector.rb

@@ -1,25 +0,0 @@
-# frozen_string_literal: true
-
-class MyCustomCollector < PrometheusExporter::Server::BaseCollector
-  def initialize
-    @gauge1 = PrometheusExporter::Metric::Gauge.new("thing1", "I am thing 1")
-    @gauge2 = PrometheusExporter::Metric::Gauge.new("thing2", "I am thing 2")
-    @mutex = Mutex.new
-  end
-
-  def process(obj)
-    @mutex.synchronize do
-      if thing1 = obj["thing1"]
-        @gauge1.observe(thing1)
-      end
-
-      if thing2 = obj["thing2"]
-        @gauge2.observe(thing2)
-      end
-    end
-  end
-
-  def prometheus_metrics_text
-    @mutex.synchronize { "#{@gauge1.to_prometheus_text}\n#{@gauge2.to_prometheus_text}" }
-  end
-end

data/gemfiles/.bundle/config

@@ -1,2 +0,0 @@
----
-BUNDLE_RETRY: "1"

data/gemfiles/ar_60.gemfile

@@ -1,5 +0,0 @@
-# This file was generated by Appraisal
-
-source "https://rubygems.org"
-
-gemspec path: "../"