prometheus_exporter 0.4.12 → 0.4.13

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 675e7d70e60c829a7b7d1a062300f23f37ae4b7ec9c413a59e172c0c244abbbc
-  data.tar.gz: bdf19d92ec159ede770f0166b658b397f21a63c4b946ec0cdf91af902db1dd1b
+  metadata.gz: 2ab1a1e0efbea1b4fd2613ae1f733bb693fbfba91373a9687f4e66e1f9d70361
+  data.tar.gz: 0a798a9908fe29500b06fb153270ab413631e781a29e6fc490d40d682b40bcc4
 SHA512:
-  metadata.gz: e8072bc72646c5c06e8029605d76fca0e075ec99651ae0c158b4a9989d6d4a43366ca0ef5e4398168718e07f1fde9888d7b8050499ca24da44255d9ca5fccf72
-  data.tar.gz: 4aba5c0791a2aaed035cf42bc091b58fc4d54619ce4e815c3511e332fbda99779c6e1ee2624e78d0bae10f1e0ce6d911f859f0fe7782b9b46fa726742aa80457
+  metadata.gz: 1034d8636dd53f4bd801f957b550a34b03e8179a74341f194b45bc7ec3fddd00ae55817b1668d87d9147ba60d03ad7b401c3f49acb1d03013f9944f60c84c5a4
+  data.tar.gz: 20bf37da5d593f206391f741025b1c010a5cf036f468d391c22feb5e2e998b8ffb55213b948df5491fc3c81bc78398feb66749432fb63283b468aafade1ccb7a

data/CHANGELOG

@@ -1,3 +1,7 @@
+0.4.13 - 09-07-2019
+
+- Fix: Memory leak in unicorn and puma collectors
+
 0.4.12 - 30-05-2019
 
 - Fix: unicorn collector reporting incorrect number of unicorn workers

data/README.md

@@ -16,7 +16,7 @@ To learn more see [Instrumenting Rails with Prometheus](https://samsaffron.com/a
     * [Delayed Job plugin](#delayed-job-plugin)
     * [Hutch metrics](#hutch-message-processing-tracer)
   * [Puma metrics](#puma-metrics)
-  * [Unicorn metrics](#unicorn-metrics)
+  * [Unicorn metrics](#unicorn-process-metrics)
   * [Custom type collectors](#custom-type-collectors)
   * [Multi process mode with custom collector](#multi-process-mode-with-custom-collector)
   * [GraphQL support](#graphql-support)

data/lib/prometheus_exporter/instrumentation/sidekiq.rb

@@ -4,11 +4,15 @@ module PrometheusExporter::Instrumentation
   class Sidekiq
     def self.death_handler
       -> (job, ex) do
-        PrometheusExporter::Client.default.send_json(
-          type: "sidekiq",
-          name: job["class"],
-          dead: true,
-        )
+        job_is_fire_and_forget = job["retry"] == false
+
+        unless job_is_fire_and_forget
+          PrometheusExporter::Client.default.send_json(
+            type: "sidekiq",
+            name: job["class"],
+            dead: true,
+          )
+        end
       end
     end
 

data/lib/prometheus_exporter/server/puma_collector.rb

@@ -2,6 +2,7 @@
 
 module PrometheusExporter::Server
   class PumaCollector < TypeCollector
+    MAX_PUMA_METRIC_AGE = 30
     PUMA_GAUGES = {
       workers_total: "Number of puma workers.",
       booted_workers_total: "Number of puma workers booted.",
@@ -47,6 +48,10 @@ module PrometheusExporter::Server
     end
 
     def collect(obj)
+      now = ::Process.clock_gettime(::Process::CLOCK_MONOTONIC)
+
+      obj["created_at"] = now
+      @puma_metrics.delete_if { |m| m["created_at"] + MAX_PUMA_METRIC_AGE < now }
       @puma_metrics << obj
     end
   end

data/lib/prometheus_exporter/server/unicorn_collector.rb

@@ -3,6 +3,8 @@
 # custom type collector for prometheus_exporter for handling the metrics sent from
 # PrometheusExporter::Instrumentation::Unicorn
 class PrometheusExporter::Server::UnicornCollector < PrometheusExporter::Server::TypeCollector
+  MAX_UNICORN_METRIC_AGE = 60
+
   UNICORN_GAUGES = {
     workers_total: 'Number of unicorn workers.',
     active_workers_total: 'Number of active unicorn workers',
@@ -36,6 +38,9 @@ class PrometheusExporter::Server::UnicornCollector < PrometheusExporter::Server:
   end
 
   def collect(obj)
+    now = ::Process.clock_gettime(::Process::CLOCK_MONOTONIC)
+    obj["created_at"] = now
+    @unicorn_metrics.delete_if { |m| m['created_at'] + MAX_UNICORN_METRIC_AGE < now }
     @unicorn_metrics << obj
   end
 end

data/lib/prometheus_exporter/version.rb

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

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: prometheus_exporter
 version: !ruby/object:Gem::Version
-  version: 0.4.12
+  version: 0.4.13
 platform: ruby
 authors:
 - Sam Saffron
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2019-05-30 00:00:00.000000000 Z
+date: 2019-07-09 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rubocop