bc-prometheus-ruby 0.8.1 → 0.8.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: a7a2ca2f975be9d346e217c4a13e4ca702a573889383c43292094f66aa82c562
-  data.tar.gz: 2724f8826c1ee9d668357676834f15dc24836ed1d05337f7b217133119fb4e26
+  metadata.gz: d996c929cb82a48d50a36f4bbd942a5cc7dd41d6ec7d10864808619a6ab08630
+  data.tar.gz: 10a28c621098fa9ecb0a06734d66c840663276dd3a3e84f5cdf5bb8bb21760b8
 SHA512:
-  metadata.gz: c1e174d621f686a1d32b4db922d4409f1cdffa1f0afd2c6f6b853f51978150b53be7ae3237fc0a1b8daf139423c98f0186ad317345b16a070eb0824f00249ef3
-  data.tar.gz: 8c215d4cb4349041e082bedaee24580afbc4f567bf6e8af848c0e00afa42b228a982790f6d21acfdbf6023de82aaa9cfecc2e55b625730e75102443c1e946ef1
+  metadata.gz: 1400c730adf70a8f4f1d836e8a1b78ae5d34c5f11c66848a7cb47001e8e0502d2981b898c52953f2e549945c5c82e0cd1ceaad7aa5901a909241af4a829c85cd
+  data.tar.gz: 03dc5e33614b1f4bb27bb1636d91a37704727b2279a981abaa2d1355c3fc679936df78633df774ee2ec240d0c3614ce370f237b10a4a417be7db2ed19f6a8685

data/CHANGELOG.md

@@ -2,6 +2,16 @@ Changelog for the bc-prometheus-ruby gem.
 
 ### Pending Release
 
+## 0.8.2
+
+- Add `version=0.0.4` to `Content-Type` header for Prometheus exposition format 0.0.4 compliance
+
+## 0.8.1
+
+- Prometheus client respects the enabled setting
+- Upgrade prometheus_exporter
+- Expose SQL metrics for different dashboards
+
 ## 0.8.0
 
 - Add support for Ruby 3.4

data/bc-prometheus-ruby.gemspec

@@ -31,7 +31,7 @@ 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.2'
+  spec.required_ruby_version = '>= 3.3'
 
   spec.add_runtime_dependency 'bigcommerce-multitrap', '~> 0.1'
   spec.add_runtime_dependency 'prometheus_exporter', '~> 0.7'

data/lib/bigcommerce/prometheus/collectors/base.rb

@@ -72,6 +72,8 @@ module Bigcommerce
           metrics = {}
           metrics = collect(metrics)
           push(metrics)
+        rescue StandardError => e
+          @logger.error("[bigcommerce-prometheus] Collector error (#{self.class}), continuing: #{e.message}")
         ensure
           sleep @frequency
         end

data/lib/bigcommerce/prometheus/configuration.rb

@@ -34,7 +34,7 @@ module Bigcommerce
         puma_collection_frequency: ENV.fetch('PROMETHEUS_PUMA_COLLECTION_FREQUENCY', 30).to_i,
         puma_process_label: ENV.fetch('PROMETHEUS_PUMA_PROCESS_LABEL', 'web').to_s,
         resque_collection_frequency: ENV.fetch('PROMETHEUS_RESQUE_COLLECTION_FREQUENCY', 30).to_i,
-        resque_process_label: ENV.fetch('PROMETHEUS_REQUEST_PROCESS_LABEL', 'resque').to_s,
+        resque_process_label: ENV.fetch('PROMETHEUS_RESQUE_PROCESS_LABEL', 'resque').to_s,
 
         # Server configuration
         not_found_body: ENV.fetch('PROMETHEUS_SERVER_NOT_FOUND_BODY', 'Not Found! The Prometheus Ruby Exporter only listens on /metrics and /send-metrics').to_s,

data/lib/bigcommerce/prometheus/server.rb

@@ -80,11 +80,12 @@ module Bigcommerce
       #
       def stop
         @server.stop
-        @run_thread.kill
-        @running = false
+        @run_thread&.kill
         $stdout.puts "[bigcommerce-prometheus][#{@process_name}] Prometheus exporter cleanly shut down"
       rescue ::StandardError => e
         warn "[bigcommerce-prometheus][#{@process_name}] Failed to stop exporter: #{e.message}"
+      ensure
+        @running = false
       end
 
       ##

data/lib/bigcommerce/prometheus/servers/puma/controllers/base_controller.rb

@@ -30,13 +30,15 @@ module Bigcommerce
             # @param [Bigcommerce::Prometheus::Servers::Puma::ServerMetrics]
             # @param [PrometheusExporter::Server::Collector] collector
             # @param [Logger] logger
+            # @param [Integer, nil] timeout scrape timeout in seconds; nil means no limit
             #
-            def initialize(request:, response:, server_metrics:, collector:, logger:)
+            def initialize(request:, response:, server_metrics:, collector:, logger:, timeout: nil)
               @request = request
               @response = response
               @collector = collector
               @server_metrics = server_metrics
               @logger = logger
+              @timeout = timeout
             end
 
             def handle

data/lib/bigcommerce/prometheus/servers/puma/controllers/metrics_controller.rb

@@ -34,12 +34,12 @@ module Bigcommerce
             def call
               collected_metrics = metrics
               if @request.accept_encoding.to_s.include?('gzip')
-                write_gzip(metrics)
+                write_gzip(collected_metrics)
               else
                 @response.write(collected_metrics)
               end
 
-              set_header('Content-Type', 'text/plain; charset=utf-8')
+              set_header('Content-Type', 'text/plain; version=0.0.4; charset=utf-8')
               @response
             end
 

data/lib/bigcommerce/prometheus/servers/puma/rack_app.rb

@@ -77,7 +77,8 @@ module Bigcommerce
               response: response,
               server_metrics: @server_metrics,
               collector: @collector,
-              logger: @logger
+              logger: @logger,
+              timeout: @timeout
             )
             con.handle
           end

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

@@ -48,7 +48,7 @@ module Bigcommerce
           metric(:jobs_processed_total).observe(data['jobs_processed_total'], labels)
           metric(:queues_total).observe(data['queues_total'], labels)
 
-          data['queues'].each do |name, size|
+          (data['queues'] || {}).each do |name, size|
             metric(:queue_sizes).observe(size, labels.merge(queue: name))
           end
         end

data/lib/bigcommerce/prometheus/version.rb

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

metadata

@@ -1,14 +1,13 @@
 --- !ruby/object:Gem::Specification
 name: bc-prometheus-ruby
 version: !ruby/object:Gem::Version
-  version: 0.8.1
+  version: 0.8.2
 platform: ruby
 authors:
 - Shaun McCormick
-autorequire:
 bindir: bin
 cert_chain: []
-date: 2026-05-19 00:00:00.000000000 Z
+date: 1980-01-02 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bigcommerce-multitrap
@@ -135,7 +134,6 @@ homepage: https://github.com/bigcommerce/bc-prometheus-ruby
 licenses:
 - MIT
 metadata: {}
-post_install_message:
 rdoc_options: []
 require_paths:
 - lib
@@ -143,15 +141,14 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
-      version: '3.2'
+      version: '3.3'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.5.7
-signing_key:
+rubygems_version: 3.6.9
 specification_version: 4
 summary: Simple integration of ruby and puma servers with prometheus
 test_files: []