sidekiq_prometheus 1.6.0 → 1.8.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: a6dc43957020461f1b740cee64cdfff9b40f624d4bfe41d57eab772a27fd2b21
-  data.tar.gz: adb0cb635975340d514fbea0c798e5269238eb990700a7eeae8c9a2d8d32e6e7
+  metadata.gz: 564b12c7284161a3350d677f809da15ca5d70b0b2a9eb5303970639cb85aeedb
+  data.tar.gz: 99c3995589218b36b0016d7585bedf17a4ac783fdfa4efb306b5bffbd8c6e766
 SHA512:
-  metadata.gz: 48f466c9d2904644ce161665b5f06092dff197e4b2550d9355d6c6e57832fc779d4ef3f5c0abaa63013c91fd249bb134234f201aafe9a9271f3bb121123b25ec
-  data.tar.gz: c2c181822b1a9d1e2ace0084301ac4517966a8bf4672884dd48c352d7af18374e7b2cb94d5f628a799dce8e12a372dadbc814d9d0cd91be211da097b0584e765
+  metadata.gz: 261e2cc263e08cf1d5784c63a2af38855db615f995f5d66f5b8c8c837e80fe22c0a5f2c6a85671c7bc1c4144a5b5ca816916088a77281ffd5e099ebf1da07a23
+  data.tar.gz: 6bccef33e7d74236fdad77eb93072f02804e838c5dc6760b26e7ed624667b1a73d0ebce1170469ce60345d2fed43bb1c2fab615e202c6fe4a76388b11d8e6054

data/CHANGELOG.md

@@ -1,5 +1,32 @@
 CHANGELOG
 
+<a name="v1.7.0"></a>
+## [v1.7.0](https://github.com/fastly/sidekiq-prometheus/compare/v1.6.0...v1.7.0) (2022-09-29)
+
+### Bug Fixes
+
+* s/metrics_server_logging_enabled/metrics_server_logger_enabled/
+
+### Features
+
+* add Sidekiq::Stats processes_size to the periodic metrics
+
+### Pull Requests
+
+* Merge pull request [#30](https://github.com/fastly/sidekiq-prometheus/issues/30) from fastly/add_processes_size
+
+
+<a name="v1.6.0"></a>
+## [v1.6.0](https://github.com/fastly/sidekiq-prometheus/compare/v1.5.0...v1.6.0) (2021-08-03)
+
+### Features
+
+* add option for silencing the WEBrick access logging of /metrics
+
+### Pull Requests
+
+* Merge pull request [#25](https://github.com/fastly/sidekiq-prometheus/issues/25) from fastly/option_for_silencing_webrick
+
 
 <a name="v1.5.0"></a>
 ## [v1.5.0](https://github.com/fastly/sidekiq-prometheus/compare/v1.4.0...v1.5.0) (2021-08-02)
@@ -35,8 +62,9 @@ CHANGELOG
 
 ### Pull Requests
 
-* Merge pull request [#17](https://github.com/fastly/sidekiq-prometheus/issues/17) from jetpks/add-option-to-disable-metrics-server
+* Merge pull request [#18](https://github.com/fastly/sidekiq-prometheus/issues/18) from jetpks/release-120
 * Merge pull request [#15](https://github.com/fastly/sidekiq-prometheus/issues/15) from silicakes/master
+* Merge pull request [#17](https://github.com/fastly/sidekiq-prometheus/issues/17) from jetpks/add-option-to-disable-metrics-server
 
 <a name="v1.1.0"></a>
 ## [v1.1.0](https://github.com/fastly/sidekiq-prometheus/compare/v1.0.1...v1.1.0) (2020-02-12)
@@ -52,6 +80,14 @@ CHANGELOG
 * Merge pull request [#11](https://github.com/fastly/sidekiq-prometheus/issues/11) from rossjones/patch-1
 * Merge pull request [#12](https://github.com/fastly/sidekiq-prometheus/issues/12) from fastly/hr
 
+<a name="v1.0.1"></a>
+## [v1.0.1](https://github.com/fastly/sidekiq-prometheus/compare/v0.9.2...v1.0.1) (2019-10-30)
+
+### Pull Requests
+
+* Merge pull request [#9](https://github.com/fastly/sidekiq-prometheus/issues/9) from we4tech/features/update-prometheus-client
+
+
 <a name="v1.0.0"></a>
 ## [v1.0.0](https://github.com/fastly/sidekiq-prometheus/compare/v0.9.1...v1.0.0) (2019-10-24)
 
@@ -60,6 +96,10 @@ CHANGELOG
 * Merge pull request [#9](https://github.com/fastly/sidekiq-prometheus/issues/9) from we4tech/features/update-prometheus-client
 
 
+<a name="v0.9.2"></a>
+## [v0.9.2](https://github.com/fastly/sidekiq-prometheus/compare/v1.0.0...v0.9.2) (2019-10-30)
+
+
 <a name="v0.9.1"></a>
 ## [v0.9.1](https://github.com/fastly/sidekiq-prometheus/compare/v0.9.0...v0.9.1) (2019-07-08)
 

data/README.md

@@ -82,7 +82,7 @@ end
 * `periodic_metrics_enabled`: Boolean that determines whether to run the periodic metrics reporter. `PeriodicMetrics` runs a separate thread that reports on global metrics (if enabled) as well worker GC stats (if enabled). It reports metrics on the interval defined by `periodic_reporting_interval`. Defaults to `true`.
 * `periodic_reporting_interval`: interval in seconds for reporting periodic metrics. Default: `30`
 * `metrics_server_enabled`: Boolean that determines whether to run the rack server. Defaults to `true`
-* `metrics_server_logging_enabled`: Boolean that determines if the metrics server will log access logs. Defaults to `true`
+* `metrics_server_logger_enabled`: Boolean that determines if the metrics server will log access logs. Defaults to `true`
 * `metrics_host`: Host on which the rack server will listen. Defaults to
   `localhost`
 * `metrics_port`: Port on which the rack server will listen. Defaults to `9359`

data/lib/sidekiq_prometheus/job_metrics.rb

@@ -30,8 +30,13 @@ class SidekiqPrometheus::JobMetrics
 
       result
     rescue StandardError => e
-      err_label = { :error_class => e.class.to_s }
-      registry[:sidekiq_job_failed].increment(labels: err_label.merge(labels))
+      if e.class.to_s == 'Sidekiq::Limiter::OverLimit'
+        registry[:sidekiq_job_over_limit].increment(labels: labels)
+      else
+        err_label = { :error_class => e.class.to_s }
+        registry[:sidekiq_job_failed].increment(labels: err_label.merge(labels))
+      end
+
       raise e
     ensure
       registry[:sidekiq_job_count].increment(labels: labels)

data/lib/sidekiq_prometheus/metrics.rb

@@ -11,6 +11,9 @@ module SidekiqPrometheus::Metrics
     { name:      :sidekiq_workers_size,
       type:      :gauge,
       docstring: 'Total number of workers processing jobs', },
+    { name:      :sidekiq_processes_size,
+      type:      :gauge,
+      docstring: 'Total number of running sidekiq processes', },
     { name:      :sidekiq_dead_size,
       type:      :gauge,
       docstring: 'Total Dead Size', },
@@ -69,6 +72,10 @@ module SidekiqPrometheus::Metrics
       type:      :counter,
       docstring: 'Count of successful Sidekiq jobs',
       labels:    JOB_LABELS, },
+    { name:      :sidekiq_job_over_limit,
+      type:      :counter,
+      docstring: 'Count of over limit Sidekiq jobs',
+      labels:    JOB_LABELS, },
   ].freeze
   SIDEKIQ_GC_METRIC = {
     name:      :sidekiq_job_allocated_objects,

data/lib/sidekiq_prometheus/periodic_metrics.rb

@@ -18,7 +18,7 @@ class SidekiqPrometheus::PeriodicMetrics
   attr_reader :interval
   attr_reader :senate, :sidekiq_stats, :sidekiq_queue
 
-  GLOBAL_STATS = %i[failed processed retry_size dead_size scheduled_size workers_size].freeze
+  GLOBAL_STATS = %i[failed processed retry_size dead_size scheduled_size workers_size processes_size].freeze
   GC_STATS = {
     counters: %i[major_gc_count minor_gc_count total_allocated_objects],
     gauges: %i[heap_live_slots heap_free_slots],

data/lib/sidekiq_prometheus/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module SidekiqPrometheus
-  VERSION = '1.6.0'
+  VERSION = '1.8.0'
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: sidekiq_prometheus
 version: !ruby/object:Gem::Version
-  version: 1.6.0
+  version: 1.8.0
 platform: ruby
 authors:
 - Lukas Eklund
@@ -9,7 +9,7 @@ authors:
 autorequire:
 bindir: exe
 cert_chain: []
-date: 2021-08-03 00:00:00.000000000 Z
+date: 2022-10-04 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler