bc-prometheus-ruby 0.6.0 → 0.8.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: a698cc0ac06efacbba9d2448adf0cac2c1f1f54468ee3ba4c14fab8e5c25e012
-  data.tar.gz: f8c629aa6c16174692bf804271af7edbf1f087d9abb7bc2ff32400a01d00a001
+  metadata.gz: a7a2ca2f975be9d346e217c4a13e4ca702a573889383c43292094f66aa82c562
+  data.tar.gz: 2724f8826c1ee9d668357676834f15dc24836ed1d05337f7b217133119fb4e26
 SHA512:
-  metadata.gz: e7b37136f17cc98bd2f8c88adc4668f4685965602453261a27ff90516788c86d6571ceb15158e7fd0a3fb78f42e31c6cafbd4beacf4b590f6e82395682c33174
-  data.tar.gz: 5879abda273f9d1b127483f7ee0f6083bc013fe4376033e15f917a62113d1727b4d32e34381e98dbbab90981fd7e7e124242775cd3c18e6e792b4a451ecd7aa2
+  metadata.gz: c1e174d621f686a1d32b4db922d4409f1cdffa1f0afd2c6f6b853f51978150b53be7ae3237fc0a1b8daf139423c98f0186ad317345b16a070eb0824f00249ef3
+  data.tar.gz: 8c215d4cb4349041e082bedaee24580afbc4f567bf6e8af848c0e00afa42b228a982790f6d21acfdbf6023de82aaa9cfecc2e55b625730e75102443c1e946ef1

data/CHANGELOG.md

@@ -2,6 +2,18 @@ Changelog for the bc-prometheus-ruby gem.
 
 ### Pending Release
 
+## 0.8.0
+
+- Add support for Ruby 3.4
+- Drop support for Ruby 3.0, 3.1
+
+## 0.7.0
+
+- Add CI suite for Ruby 3.3
+- Update README for starting prometheus with Puma
+- Add logging with prometheus server starts
+- Migrate from thin to puma as the web server
+
 ## 0.6.0
 
 - Add support for Ruby 3.1/3.2
@@ -40,13 +52,13 @@ Changelog for the bc-prometheus-ruby gem.
 - Add ability to pass custom resque and hutch Collectors/TypeCollectors
 - Add ENV support for all configuration elements
 - Fix issue where base collector did not use Bigcommerce::Prometheus.client
-- Expose new `push` method for Collectors::Base to ease use of custom ad hoc metrics 
+- Expose new `push` method for Collectors::Base to ease use of custom ad hoc metrics
 
 ### 0.2.4
 
-- Fix cant modify frozen array error when using bc-prometheus-ruby outside a web process 
+- Fix cant modify frozen array error when using bc-prometheus-ruby outside a web process
   but within rails
-  
+
 ### 0.2.3
 
 - Set default STDOUT logger to INFO level
@@ -55,7 +67,7 @@ Changelog for the bc-prometheus-ruby gem.
 ### 0.2.2
 
 - Fix missing inheritance for resque collector
- 
+
 ### 0.2.1
 
 - Prevent starting of Puma integration if Puma is not loaded

data/README.md

@@ -14,6 +14,14 @@ Then in your `application.rb`, prior to extending `Rails::Application` or any in
 require 'bigcommerce/prometheus'
 ```
 
+Then in your web server config file (e.g. `puma.rb`)
+
+```ruby
+before_fork do
+  Rails.application.config.before_fork_callbacks.each(&:call)
+end
+```
+
 You can then view your metrics at: http://0.0.0.0:9394/metrics
 
 ## Puma

data/bc-prometheus-ruby.gemspec

@@ -31,17 +31,13 @@ Gem::Specification.new do |spec|
 
   spec.files         = Dir['README.md', 'CHANGELOG.md', 'CODE_OF_CONDUCT.md', 'lib/**/*', 'bc-prometheus-ruby.gemspec']
   spec.require_paths = ['lib']
-  spec.required_ruby_version = '>= 3.0'
-
-  spec.add_development_dependency 'bundler-audit', '>= 0.6'
-  spec.add_development_dependency 'pry', '>= 0.12'
-  spec.add_development_dependency 'rake', '>= 10.0'
-  spec.add_development_dependency 'rspec', '>= 3.8'
-  spec.add_development_dependency 'rspec_junit_formatter', '>= 0.4'
-  spec.add_development_dependency 'rubocop', '>= 1.0'
-  spec.add_development_dependency 'simplecov', '>= 0.16'
+  spec.required_ruby_version = '>= 3.2'
 
   spec.add_runtime_dependency 'bigcommerce-multitrap', '~> 0.1'
   spec.add_runtime_dependency 'prometheus_exporter', '~> 0.7'
-  spec.add_runtime_dependency 'thin', '~> 1.7'
+  spec.add_runtime_dependency 'puma', '> 5'
+  spec.add_runtime_dependency 'rack', '>= 3.0'
+  spec.add_runtime_dependency 'rake', '>= 10.0'
+
+  spec.add_development_dependency 'activesupport', '>= 6.0'
 end

data/lib/bigcommerce/prometheus/client.rb

@@ -69,6 +69,14 @@ module Bigcommerce
         URI("http://#{@host}:#{@port}#{path}")
       end
 
+      ##
+      # @param [String] str
+      def send(str)
+        return unless Bigcommerce::Prometheus.enabled
+
+        super
+      end
+
       ##
       # Process the current queue and flush to the collector
       #

data/lib/bigcommerce/prometheus/configuration.rb

@@ -54,7 +54,8 @@ module Bigcommerce
         web_type_collectors: [],
 
         # Additional configuration
-        railtie_disabled: ENV.fetch('PROMETHEUS_DISABLE_RAILTIE', 0).to_i.positive?
+        railtie_disabled: ENV.fetch('PROMETHEUS_DISABLE_RAILTIE', 0).to_i.positive?,
+        active_record_enabled: ENV.fetch('PROMETHEUS_ACTIVE_RECORD_ENABLED', 1).to_i.positive?
       }.freeze
 
       attr_accessor *VALID_CONFIG_KEYS.keys

data/lib/bigcommerce/prometheus/instrumentors/hutch.rb

@@ -46,10 +46,12 @@ module Bigcommerce
 
           server.add_type_collector(PrometheusExporter::Server::ActiveRecordCollector.new)
           server.add_type_collector(PrometheusExporter::Server::HutchCollector.new)
+          ::Bigcommerce::Prometheus::Integrations::ActiveRecordSql.register_type_collector(server, process_name: @process_name)
           @type_collectors.each do |tc|
             server.add_type_collector(tc)
           end
           server.start
+          ::Bigcommerce::Prometheus::Integrations::ActiveRecordSql.start_safe(client: Bigcommerce::Prometheus.client, process_name: @process_name)
           setup_middleware
         rescue StandardError => e
           logger.error "[bigcommerce-prometheus][#{@process_name}] Failed to start hutch instrumentation - #{e.message} - #{e.backtrace[0..4].join("\n")}"

data/lib/bigcommerce/prometheus/instrumentors/web.rb

@@ -67,6 +67,7 @@ module Bigcommerce
             server.add_type_collector(PrometheusExporter::Server::ActiveRecordCollector.new)
             server.add_type_collector(PrometheusExporter::Server::WebCollector.new)
             server.add_type_collector(PrometheusExporter::Server::PumaCollector.new)
+            ::Bigcommerce::Prometheus::Integrations::ActiveRecordSql.register_type_collector(server, process_name: @process_name)
             @type_collectors.each do |tc|
               server.add_type_collector(tc)
             end
@@ -78,6 +79,7 @@ module Bigcommerce
           @app.config.after_fork_callbacks = [] unless @app.config.after_fork_callbacks
           @app.config.after_fork_callbacks << lambda do
             ::Bigcommerce::Prometheus::Integrations::Puma.start(client: Bigcommerce::Prometheus.client)
+            ::Bigcommerce::Prometheus::Integrations::ActiveRecordSql.start_safe(client: Bigcommerce::Prometheus.client, process_name: @process_name)
             @collectors.each(&:start)
           rescue StandardError => e
             logger.error "[bigcommerce-prometheus][#{@process_name}] Failed to start web prometheus middleware after fork: #{e.message}"

data/lib/bigcommerce/prometheus/integrations/active_record.rb

@@ -0,0 +1,115 @@
+# frozen_string_literal: true
+
+# Copyright (c) 2019-present, BigCommerce Pty. Ltd. All rights reserved
+#
+# Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated
+# documentation files (the "Software"), to deal in the Software without restriction, including without limitation the
+# rights to use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of the Software, and to permit
+# persons to whom the Software is furnished to do so, subject to the following conditions:
+#
+# The above copyright notice and this permission notice shall be included in all copies or substantial portions of the
+# Software.
+#
+# THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE
+# WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR
+# COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR
+# OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
+#
+module Bigcommerce
+  module Prometheus
+    module Integrations
+      ##
+      # Subscribes to ActiveSupport sql.active_record notifications and pushes a per-operation
+      # SQL query duration histogram to the Prometheus exporter.
+      #
+      class ActiveRecordSql
+        IGNORED_NAMES = %w[SCHEMA CACHE].freeze
+        TYPE = 'active_record_sql'
+
+        # Idempotent: returns the same instance on repeated calls within a process,
+        # so calling .start more than once (e.g. from both the gem's instrumentor and a
+        # consuming app's initializer) does not register duplicate subscribers and
+        # double-count every SQL query.
+        #
+        # Noop when ActiveRecord is not loaded so non-Rails consumers (or any process that
+        # never loads ActiveRecord) can call this safely.
+        def self.start(client: nil)
+          return unless active_record_loaded?
+
+          @start ||= new(client: client || ::Bigcommerce::Prometheus.client).tap(&:subscribe!)
+        end
+
+        # @return [Boolean] whether ActiveRecord is loaded in the current process.
+        def self.active_record_loaded?
+          defined?(::ActiveRecord) ? true : false
+        end
+
+        # Wrapper for instrumentor wiring: registers the AR SQL type collector on the given server,
+        # gated on the active_record_enabled config flag, and swallows errors so an additive
+        # feature failure cannot take down core instrumentation.
+        def self.register_type_collector(server, process_name: nil)
+          return unless ::Bigcommerce::Prometheus.active_record_enabled
+
+          server.add_type_collector(::Bigcommerce::Prometheus::TypeCollectors::ActiveRecordSql.new)
+        rescue StandardError => e
+          log_warn(process_name, "Failed to register ActiveRecord type collector: #{e.message}")
+        end
+
+        # Wrapper for instrumentor wiring: starts the AR integration, gated on the
+        # active_record_enabled config flag, and swallows errors so an additive feature
+        # failure cannot take down core instrumentation.
+        def self.start_safe(client: nil, process_name: nil)
+          return unless ::Bigcommerce::Prometheus.active_record_enabled
+
+          start(client: client)
+        rescue StandardError => e
+          log_warn(process_name, "Failed to start ActiveRecord integration: #{e.message}")
+        end
+
+        def self.log_warn(process_name, message)
+          process_name ||= ::Bigcommerce::Prometheus.process_name
+          ::Bigcommerce::Prometheus.logger&.warn("[bigcommerce-prometheus][#{process_name}] #{message}")
+        end
+        private_class_method :log_warn
+
+        def initialize(client:)
+          @client = client
+        end
+
+        def subscribe!
+          ActiveSupport::Notifications.subscribe('sql.active_record') do |*args|
+            call(ActiveSupport::Notifications::Event.new(*args))
+          end
+        end
+
+        def call(event)
+          return if IGNORED_NAMES.include?(event.payload[:name])
+
+          @client.send_json(
+            type: TYPE,
+            duration_seconds: event.duration / 1000.0,
+            custom_labels: { operation: classify(event.payload[:sql]) }
+          )
+        rescue StandardError
+          # Never let metric instrumentation propagate into the request path.
+          nil
+        end
+
+        private
+
+        def classify(sql)
+          return 'other' if sql.nil?
+
+          first_token = sql.lstrip.split(/\s+/, 2).first&.upcase
+          case first_token
+          when 'SELECT' then 'select'
+          when 'INSERT' then 'insert'
+          when 'UPDATE' then 'update'
+          when 'DELETE' then 'delete'
+          else 'other'
+          end
+        end
+      end
+    end
+  end
+end

data/lib/bigcommerce/prometheus/integrations/puma.rb

@@ -51,7 +51,7 @@ module Bigcommerce
         # @return [Boolean]
         #
         def self.active_record_enabled?
-          defined?(ActiveRecord) && ::ActiveRecord::Base.connection_pool.respond_to?(:stat)
+          defined?(::ActiveRecord) && ::ActiveRecord::Base.connection_pool.respond_to?(:stat)
         end
 
         ##

data/lib/bigcommerce/prometheus/server.rb

@@ -35,7 +35,7 @@ module Bigcommerce
         @prefix = (prefix || ::PrometheusExporter::DEFAULT_PREFIX).to_s
         @process_name = ::Bigcommerce::Prometheus.process_name
         @logger = logger || ::Bigcommerce::Prometheus.logger
-        @server = ::Bigcommerce::Prometheus::Servers::Thin::Server.new(
+        @server = ::Bigcommerce::Prometheus::Servers::Puma::Server.new(
           port: @port,
           timeout: @timeout,
           logger: @logger,
@@ -52,12 +52,10 @@ module Bigcommerce
       def start
         @logger.info "[bigcommerce-prometheus][#{@process_name}] Starting prometheus exporter on port #{@host}:#{@port}"
 
-        @run_thread = ::Thread.start do
-          @server.start
-        end
+        @run_thread = @server.run
         @running = true
 
-        @logger.info "[bigcommerce-prometheus][#{@process_name}] Prometheus exporter started on #{@host}:#{@port} with #{@server.threadpool_size} threads"
+        @logger.info "[bigcommerce-prometheus][#{@process_name}] Prometheus exporter started on #{@host}:#{@port} with #{@server.max_threads} threads"
 
         @server
       rescue ::StandardError => e
@@ -81,7 +79,7 @@ module Bigcommerce
       # Stop the server
       #
       def stop
-        @server.stop!
+        @server.stop
         @run_thread.kill
         @running = false
         $stdout.puts "[bigcommerce-prometheus][#{@process_name}] Prometheus exporter cleanly shut down"

data/lib/bigcommerce/prometheus/servers/{thin → puma}/controllers/base_controller.rb

@@ -18,16 +18,16 @@
 module Bigcommerce
   module Prometheus
     module Servers
-      module Thin
+      module Puma
         module Controllers
           ##
-          # Base thin controller for prometheus metrics
+          # Base puma controller for prometheus metrics
           #
           class BaseController
             ##
             # @param [Rack::Request] request
             # @param [Rack::Response] response
-            # @param [Bigcommerce::Prometheus::Servers::Thin::ServerMetrics]
+            # @param [Bigcommerce::Prometheus::Servers::Puma::ServerMetrics]
             # @param [PrometheusExporter::Server::Collector] collector
             # @param [Logger] logger
             #

data/lib/bigcommerce/prometheus/servers/{thin → puma}/controllers/error_controller.rb

@@ -18,7 +18,7 @@
 module Bigcommerce
   module Prometheus
     module Servers
-      module Thin
+      module Puma
         module Controllers
           ##
           # Handle 500s

data/lib/bigcommerce/prometheus/servers/{thin → puma}/controllers/metrics_controller.rb

@@ -22,7 +22,7 @@ require 'stringio'
 module Bigcommerce
   module Prometheus
     module Servers
-      module Thin
+      module Puma
         module Controllers
           ##
           # GET /metrics
@@ -38,6 +38,8 @@ module Bigcommerce
               else
                 @response.write(collected_metrics)
               end
+
+              set_header('Content-Type', 'text/plain; charset=utf-8')
               @response
             end
 

data/lib/bigcommerce/prometheus/servers/{thin → puma}/controllers/not_found_controller.rb

@@ -18,7 +18,7 @@
 module Bigcommerce
   module Prometheus
     module Servers
-      module Thin
+      module Puma
         module Controllers
           ##
           # Handle invalid requests to server

data/lib/bigcommerce/prometheus/servers/{thin → puma}/controllers/send_metrics_controller.rb

@@ -18,7 +18,7 @@
 module Bigcommerce
   module Prometheus
     module Servers
-      module Thin
+      module Puma
         module Controllers
           ##
           # POST /send-metrics

data/lib/bigcommerce/prometheus/servers/{thin → puma}/rack_app.rb

@@ -18,9 +18,9 @@
 module Bigcommerce
   module Prometheus
     module Servers
-      module Thin
+      module Puma
         ##
-        # Handles metrics requests as a Rack App on the Thin server
+        # Handles metrics requests as a Rack App on the Puma server
         #
         class RackApp
           ##
@@ -29,7 +29,7 @@ module Bigcommerce
             @timeout = timeout || ::Bigcommerce::Prometheus.server_timeout
             @collector = collector || ::PrometheusExporter::Server::Collector.new
             @logger = logger || ::Bigcommerce::Prometheus.logger
-            @server_metrics = ::Bigcommerce::Prometheus::Servers::Thin::ServerMetrics.new(logger: @logger)
+            @server_metrics = ::Bigcommerce::Prometheus::Servers::Puma::ServerMetrics.new(logger: @logger)
           end
 
           def call(env)
@@ -39,7 +39,7 @@ module Bigcommerce
             handle(controller: controller, request: request, response: response)
           rescue StandardError => e
             @logger.error "Error: #{e.message}"
-            handle(controller: ::Bigcommerce::Prometheus::Servers::Thin::Controllers::ErrorController, request: request, response: response)
+            handle(controller: ::Bigcommerce::Prometheus::Servers::Puma::Controllers::ErrorController, request: request, response: response)
           end
 
           ##
@@ -60,11 +60,11 @@ module Bigcommerce
           #
           def route(request)
             if request.fullpath == '/metrics' && request.request_method.to_s.downcase == 'get'
-              Bigcommerce::Prometheus::Servers::Thin::Controllers::MetricsController
+              Bigcommerce::Prometheus::Servers::Puma::Controllers::MetricsController
             elsif request.fullpath == '/send-metrics' && request.request_method.to_s.downcase == 'post'
-              Bigcommerce::Prometheus::Servers::Thin::Controllers::SendMetricsController
+              Bigcommerce::Prometheus::Servers::Puma::Controllers::SendMetricsController
             else
-              Bigcommerce::Prometheus::Servers::Thin::Controllers::NotFoundController
+              Bigcommerce::Prometheus::Servers::Puma::Controllers::NotFoundController
             end
           end
 

data/lib/bigcommerce/prometheus/servers/{thin → puma}/server.rb

@@ -18,20 +18,21 @@
 module Bigcommerce
   module Prometheus
     module Servers
-      module Thin
+      module Puma
         ##
-        # Thin adapter for server
+        # Puma adapter for server
         #
-        class Server < ::Thin::Server
+        class Server < ::Puma::Server
           def initialize(port: nil, host: nil, timeout: nil, logger: nil, thread_pool_size: nil)
             @port = port || ::Bigcommerce::Prometheus.server_port
             @host = host || ::Bigcommerce::Prometheus.server_host
             @timeout = timeout || ::Bigcommerce::Prometheus.server_timeout
             @logger = logger || ::Bigcommerce::Prometheus.logger
-            @rack_app = ::Bigcommerce::Prometheus::Servers::Thin::RackApp.new(timeout: timeout, logger: logger)
-            super(@host, @port, @rack_app)
-            ::Thin::Logging.logger = @logger
-            self.threadpool_size = (thread_pool_size || ::Bigcommerce::Prometheus.server_thread_pool_size).to_i
+            @rack_app = ::Bigcommerce::Prometheus::Servers::Puma::RackApp.new(timeout: timeout, logger: logger)
+            thread_pool_size = (thread_pool_size || ::Bigcommerce::Prometheus.server_thread_pool_size).to_i
+            super(@rack_app, nil, max_threads: thread_pool_size)
+            add_tcp_listener(@host, @port)
+            @logger.info "[bigcommerce-prometheus] Prometheus server started on #{@host}:#{@port}"
           end
 
           ##

data/lib/bigcommerce/prometheus/servers/{thin → puma}/server_metrics.rb

@@ -22,7 +22,7 @@ require 'stringio'
 module Bigcommerce
   module Prometheus
     module Servers
-      module Thin
+      module Puma
         ##
         # Server metrics for the collector
         #

data/lib/bigcommerce/prometheus/type_collectors/active_record.rb

@@ -0,0 +1,53 @@
+# frozen_string_literal: true
+
+# Copyright (c) 2019-present, BigCommerce Pty. Ltd. All rights reserved
+#
+# Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated
+# documentation files (the "Software"), to deal in the Software without restriction, including without limitation the
+# rights to use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of the Software, and to permit
+# persons to whom the Software is furnished to do so, subject to the following conditions:
+#
+# The above copyright notice and this permission notice shall be included in all copies or substantial portions of the
+# Software.
+#
+# THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE
+# WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR
+# COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR
+# OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
+#
+module Bigcommerce
+  module Prometheus
+    module TypeCollectors
+      ##
+      # Render-side counterpart to Integrations::ActiveRecordSql. Aggregates per-operation
+      # SQL query duration into a Prometheus Histogram exposed at /metrics.
+      #
+      class ActiveRecordSql < Bigcommerce::Prometheus::TypeCollectors::Base
+        def initialize(
+          default_labels: {},
+          buckets: [0.001, 0.005, 0.01, 0.025, 0.05, 0.1, 0.25, 0.5, 1, 2.5, 5, 10, 20, 30, 60]
+        )
+          @buckets = buckets
+          super(type: Bigcommerce::Prometheus::Integrations::ActiveRecordSql::TYPE, default_labels: default_labels)
+        end
+
+        def build_metrics
+          {
+            sql_query_duration_seconds: PrometheusExporter::Metric::Histogram.new(
+              'sql_query_duration_seconds',
+              'ActiveRecord SQL query duration in seconds, labeled by operation.',
+              buckets: @buckets
+            )
+          }
+        end
+
+        def collect_metrics(data:, labels: {})
+          duration = data['duration_seconds']
+          return if duration.nil?
+
+          metric(:sql_query_duration_seconds).observe(duration.to_f, labels)
+        end
+      end
+    end
+  end
+end

data/lib/bigcommerce/prometheus/version.rb

@@ -17,6 +17,6 @@
 #
 module Bigcommerce
   module Prometheus
-    VERSION = '0.6.0'
+    VERSION = '0.8.1'
   end
 end

data/lib/bigcommerce/prometheus.rb

@@ -22,7 +22,8 @@ require 'prometheus_exporter/server'
 require 'prometheus_exporter/client'
 require 'prometheus_exporter/middleware'
 require 'prometheus_exporter/instrumentation'
-require 'thin'
+require 'puma'
+require 'rack'
 
 require_relative 'prometheus/version'
 require_relative 'prometheus/loggable'
@@ -34,6 +35,8 @@ require_relative 'prometheus/collectors/base'
 require_relative 'prometheus/collectors/resque'
 require_relative 'prometheus/type_collectors/base'
 require_relative 'prometheus/type_collectors/resque'
+require_relative 'prometheus/integrations/active_record'
+require_relative 'prometheus/type_collectors/active_record'
 
 require_relative 'prometheus/instrumentors/web'
 require_relative 'prometheus/instrumentors/hutch'
@@ -42,14 +45,14 @@ require_relative 'prometheus/integrations/railtie' if defined?(Rails)
 require_relative 'prometheus/integrations/puma'
 require_relative 'prometheus/integrations/resque'
 
-require_relative 'prometheus/servers/thin/server'
-require_relative 'prometheus/servers/thin/rack_app'
-require_relative 'prometheus/servers/thin/server_metrics'
-require_relative 'prometheus/servers/thin/controllers/base_controller'
-require_relative 'prometheus/servers/thin/controllers/error_controller'
-require_relative 'prometheus/servers/thin/controllers/metrics_controller'
-require_relative 'prometheus/servers/thin/controllers/not_found_controller'
-require_relative 'prometheus/servers/thin/controllers/send_metrics_controller'
+require_relative 'prometheus/servers/puma/server'
+require_relative 'prometheus/servers/puma/rack_app'
+require_relative 'prometheus/servers/puma/server_metrics'
+require_relative 'prometheus/servers/puma/controllers/base_controller'
+require_relative 'prometheus/servers/puma/controllers/error_controller'
+require_relative 'prometheus/servers/puma/controllers/metrics_controller'
+require_relative 'prometheus/servers/puma/controllers/not_found_controller'
+require_relative 'prometheus/servers/puma/controllers/send_metrics_controller'
 
 module Bigcommerce
   ##

metadata

@@ -1,155 +1,99 @@
 --- !ruby/object:Gem::Specification
 name: bc-prometheus-ruby
 version: !ruby/object:Gem::Version
-  version: 0.6.0
+  version: 0.8.1
 platform: ruby
 authors:
 - Shaun McCormick
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2023-02-06 00:00:00.000000000 Z
+date: 2026-05-19 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
-  name: bundler-audit
-  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: pry
+  name: bigcommerce-multitrap
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.12'
-  type: :development
+        version: '0.1'
+  type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.12'
+        version: '0.1'
 - !ruby/object:Gem::Dependency
-  name: rake
+  name: prometheus_exporter
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '10.0'
-  type: :development
+        version: '0.7'
+  type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '10.0'
+        version: '0.7'
 - !ruby/object:Gem::Dependency
-  name: rspec
+  name: puma
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - ">"
       - !ruby/object:Gem::Version
-        version: '3.8'
-  type: :development
+        version: '5'
+  type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - ">"
       - !ruby/object:Gem::Version
-        version: '3.8'
+        version: '5'
 - !ruby/object:Gem::Dependency
-  name: rspec_junit_formatter
+  name: rack
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: '0.4'
-  type: :development
+        version: '3.0'
+  type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: '0.4'
+        version: '3.0'
 - !ruby/object:Gem::Dependency
-  name: rubocop
+  name: rake
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: '1.0'
-  type: :development
+        version: '10.0'
+  type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: '1.0'
+        version: '10.0'
 - !ruby/object:Gem::Dependency
-  name: simplecov
+  name: activesupport
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: '0.16'
+        version: '6.0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: '0.16'
-- !ruby/object:Gem::Dependency
-  name: bigcommerce-multitrap
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '0.1'
-  type: :runtime
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '0.1'
-- !ruby/object:Gem::Dependency
-  name: prometheus_exporter
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '0.7'
-  type: :runtime
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '0.7'
-- !ruby/object:Gem::Dependency
-  name: thin
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '1.7'
-  type: :runtime
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '1.7'
+        version: '6.0'
 description: Simple integration of ruby and puma servers with prometheus
 email:
 - shaun.mccormick@bigcommerce.com
@@ -169,19 +113,21 @@ files:
 - lib/bigcommerce/prometheus/instrumentors/hutch.rb
 - lib/bigcommerce/prometheus/instrumentors/resque.rb
 - lib/bigcommerce/prometheus/instrumentors/web.rb
+- lib/bigcommerce/prometheus/integrations/active_record.rb
 - lib/bigcommerce/prometheus/integrations/puma.rb
 - lib/bigcommerce/prometheus/integrations/railtie.rb
 - lib/bigcommerce/prometheus/integrations/resque.rb
 - lib/bigcommerce/prometheus/loggable.rb
 - lib/bigcommerce/prometheus/server.rb
-- lib/bigcommerce/prometheus/servers/thin/controllers/base_controller.rb
-- lib/bigcommerce/prometheus/servers/thin/controllers/error_controller.rb
-- lib/bigcommerce/prometheus/servers/thin/controllers/metrics_controller.rb
-- lib/bigcommerce/prometheus/servers/thin/controllers/not_found_controller.rb
-- lib/bigcommerce/prometheus/servers/thin/controllers/send_metrics_controller.rb
-- lib/bigcommerce/prometheus/servers/thin/rack_app.rb
-- lib/bigcommerce/prometheus/servers/thin/server.rb
-- lib/bigcommerce/prometheus/servers/thin/server_metrics.rb
+- lib/bigcommerce/prometheus/servers/puma/controllers/base_controller.rb
+- lib/bigcommerce/prometheus/servers/puma/controllers/error_controller.rb
+- lib/bigcommerce/prometheus/servers/puma/controllers/metrics_controller.rb
+- lib/bigcommerce/prometheus/servers/puma/controllers/not_found_controller.rb
+- lib/bigcommerce/prometheus/servers/puma/controllers/send_metrics_controller.rb
+- lib/bigcommerce/prometheus/servers/puma/rack_app.rb
+- lib/bigcommerce/prometheus/servers/puma/server.rb
+- lib/bigcommerce/prometheus/servers/puma/server_metrics.rb
+- lib/bigcommerce/prometheus/type_collectors/active_record.rb
 - lib/bigcommerce/prometheus/type_collectors/base.rb
 - lib/bigcommerce/prometheus/type_collectors/resque.rb
 - lib/bigcommerce/prometheus/version.rb
@@ -197,14 +143,14 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
-      version: '3.0'
+      version: '3.2'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.4.1
+rubygems_version: 3.5.7
 signing_key:
 specification_version: 4
 summary: Simple integration of ruby and puma servers with prometheus