prom_multi_proc_rb 0.1.3 → 0.1.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
-SHA1:
-  metadata.gz: 0a41c271141c863a9848cf0319e773e746ca32e7
-  data.tar.gz: 421d3594be73c118e99bbf008cf68590ff6fc147
+SHA256:
+  metadata.gz: fcb169453e4a402bbedb209e69f838be6292d2e37be4c66caa5525448b0bd801
+  data.tar.gz: 2844cc2b0241ef943bef5c07c2cca9410b74e37ab77fa5fd4b9d0fe7add85bf1
 SHA512:
-  metadata.gz: d5050dfdb4de5614dc29051dd82e4415ab2f50ba1b559e5bb9645f7b749ccddc37f03d99db88dc7ad5db62058507f8bdd24805af7601e90edda81255260fc6c2
-  data.tar.gz: cd50abf0e8fca5fa03c2af9d1360b2089bf03d2b7b7b2c1d488e888b793a0e9123e962cb02b381aaa4de511a7f8a9a1c299e6466b02654193c790f3a108d23fe
+  metadata.gz: 74244a6accefada48bc0e1b709daeafa84c1a9667c322b19a4448fc5319cf39e5cf253b6e9995c760546b15df4e4ff226b3f1a48a3461467d01ff06a4878c15f
+  data.tar.gz: 4b6bc06e65fcb11aef76c643561aa7073db3d98650b92fa2457f490e6d8cf23477cb6b52773740467c18c091c7d551709d51594d2cd968f4c6324678c1abb1be

data/.gitignore

@@ -7,6 +7,7 @@
 /pkg/
 /spec/reports/
 /tmp/
+/vendor/
 
 # rspec failure tracking
 .rspec_status

data/lib/prom_multi_proc/base.rb

@@ -5,7 +5,7 @@ module PromMultiProc
   class Base
     attr_reader :logger, :prefix, :writer
 
-    def initialize(socket:, metrics:, batch_size: 1, logger: nil, validate: false, prefix: "")
+    def initialize(socket:, metrics:, batch_size: 1, batch_timeout: 3, logger: nil, validate: false, prefix: "")
       @prefix = prefix
       @logger = logger || ::Logger.new(STDOUT)
 
@@ -14,7 +14,7 @@ module PromMultiProc
       end
 
       @metric_objects = Concurrent::Map.new
-      @writer = Writer.new(socket: socket, batch_size: batch_size, validate: validate)
+      @writer = Writer.new(socket: socket, batch_size: batch_size, batch_timeout: batch_timeout, validate: validate)
       @multi_lock = Mutex.new
 
       specs = get_specs(metrics)

data/lib/prom_multi_proc/rails.rb

@@ -20,6 +20,12 @@ module PromMultiProc
         batch_size = 5
       end
 
+      if ENV.key?("PROM_MULTI_PROC_BATCH_TIMEOUT")
+        batch_timeout = ENV["PROM_MULTI_PROC_BATCH_TIMEOUT"].to_i
+      else
+        batch_timeout = 3
+      end
+
       if ::Rails.env.development? || ::Rails.env.test?
         validate = true
       else
@@ -32,13 +38,14 @@ module PromMultiProc
         logger = ::Logger.new(STDOUT)
       end
 
-      logger.error("Setting up prom_multi_proc for #{app_name}-#{program_name}, batch size: #{batch_size}, validate: #{validate}")
+      logger.error("Setting up prom_multi_proc for #{app_name}-#{program_name}, batch size: #{batch_size}, batch timeout: #{batch_timeout} validate: #{validate}")
 
       Base.new(
         prefix: prefix,
         socket: socket,
         metrics: metrics,
         batch_size: batch_size,
+        batch_timeout: batch_timeout,
         validate: validate,
         logger: logger
       )

data/lib/prom_multi_proc/version.rb

@@ -1,3 +1,3 @@
 module PromMultiProc
-  VERSION = "0.1.3"
+  VERSION = "0.1.4"
 end

data/lib/prom_multi_proc/writer.rb

@@ -1,15 +1,25 @@
 module PromMultiProc
   class Writer
-    attr_reader :socket, :batch_size
+    attr_reader :socket, :batch_size, :batch_timeout
 
-    def initialize(socket:, batch_size: 1, validate: false)
+    def initialize(socket:, batch_size: 1, batch_timeout: 3, validate: false)
       if !batch_size.is_a?(Integer) || batch_size <= 0
         raise PromMultiProcError.new("Invalid batch size: #{batch_size}")
       end
+      if !batch_timeout.is_a?(Integer) || batch_timeout <= 0
+        raise PromMultiProcError.new("Invalid batch timeout: #{batch_timeout}")
+      end
       @batch_size = batch_size
+      @batch_timeout = batch_timeout
       @validate = !!validate
 
       @lock = Mutex.new
+      @thread = Thread.new {
+        loop do
+          sleep(batch_timeout)
+          flush(force: true)
+        end
+      }
       @messages = []
 
       @socket = socket
@@ -46,9 +56,9 @@ module PromMultiProc
       flush
     end
 
-    def flush
+    def flush(force: false)
       @lock.synchronize do
-        if @messages.length >= batch_size
+        if force && @messages.length > 0 || @messages.length >= batch_size
           begin
             write_socket(JSON.generate(@messages))
           ensure

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: prom_multi_proc_rb
 version: !ruby/object:Gem::Version
-  version: 0.1.3
+  version: 0.1.4
 platform: ruby
 authors:
 - Andrew Tongen
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-08-19 00:00:00.000000000 Z
+date: 2019-02-05 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -138,7 +138,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.5.2
+rubygems_version: 2.7.6
 signing_key: 
 specification_version: 4
 summary: A ruby library for collecting prometheus metrics within forking servers