prom_multi_proc_rb 0.1.2 → 0.1.7

checksums.yaml

@@ -1,7 +1,7 @@
 ---
-SHA1:
-  metadata.gz: 8e9beb87a1474db97aa420d8d128b33fb06d0f5a
-  data.tar.gz: b65f006fbfce11d43204ef85535fc276f4a7a0d6
+SHA256:
+  metadata.gz: '0208f9f3b13f1d85eb96973791697f077ffa3f560bd843f863e1abbd440e2138'
+  data.tar.gz: '06955b253c46199a3ae8c39bbfd0a655bb790a0e4c50ae69ae46320d5022187d'
 SHA512:
-  metadata.gz: 862350605d17009825e158f5ebc2ef34422e29f2e2c394e0abdbea1f668edda0577d228bf2577207dc4e674fb52791a4dd473b5b144fb4119b2818c09f5aebc0
-  data.tar.gz: c60416e2cd9acbcd6477ab420e566b6a189832157d54592ea4e5bfd53564456e5e51ff755effde88285f81577994a9db1b07c4cf81f73fa7aecc3bc93de7010b
+  metadata.gz: 7a592243fc1fff0b882d7c97011c86f794f074526260c7854980b92d86f2742478f1e35ffa220ebf56dc44442f9a5ed4b4c65b29a8ca4651b9ff73ddd6c0ca52
+  data.tar.gz: fdd1ef7cbc98d639aabdedf249ab32224f55a6f253fd6c11958bead30ab6fcdcf4b639af0d17768193e3b69fddd42e54fffd82f0ad74737ab2f19d1259fc6793

data/.gitignore

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

data/.travis.yml

@@ -1,5 +1,5 @@
 sudo: false
 language: ruby
 rvm:
-  - 2.3.4
-before_install: gem install bundler -v 1.15.1
+  - 2.6.5
+  - 2.7.2

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)
@@ -80,6 +80,10 @@ module PromMultiProc
       end
       name = spec["name"].sub(/\A#{prefix}/, "").to_sym
 
+      unless spec["help"] && !spec["help"].strip.empty?
+        raise PromMultiProcError.new("Metric '#{spec['name']}' is missing help")
+      end
+
       labels = (spec["labels"] || []).map(&:to_sym)
       unless labels.all? { |l| valid_metric?(l)  }
         raise PromMultiProcError.new("Invalid label: #{spec.inspect}")

data/lib/prom_multi_proc/collector.rb

@@ -21,7 +21,7 @@ module PromMultiProc
         raise PromMultiProcError.new("Invalid label cardinality (#{name}): #{labels.keys.inspect}, need keys: #{@label_keys.inspect}")
       end
       unless valid_label_values?(labels)
-        raise PromMultiProcError.new("Invalid label values (#{name}): #{labels.values.inspect}")
+        raise PromMultiProcError.new("Invalid label values (#{name}): #{labels.values.inspect} (all values must be string or symbol)")
       end
       unless valid_value?(value)
         raise PromMultiProcError.new("Invalid value (#{name}): #{value.inspect} (must be numeric)")

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.info("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.2"
+  VERSION = "0.1.7"
 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)
-      if !batch_size.is_a?(Fixnum) || batch_size <= 0
+    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

data/prom_multi_proc_rb.gemspec

@@ -30,10 +30,10 @@ Gem::Specification.new do |spec|
   spec.executables   = spec.files.grep(%r{^bin/}) { |f| File.basename(f) }
   spec.require_paths = ["lib"]
 
-  spec.add_development_dependency "bundler", "~> 1.15"
-  spec.add_development_dependency "rake", "~> 10.0"
-  spec.add_development_dependency "rspec", "~> 3.0"
-  spec.add_development_dependency "rspec-collection_matchers", "~> 1.0"
+  spec.add_development_dependency "bundler", ">= 1.15"
+  spec.add_development_dependency "rake", ">= 12.3.3"
+  spec.add_development_dependency "rspec", "~> 3.9"
+  spec.add_development_dependency "rspec-collection_matchers", "~> 1.2"
 
-  spec.add_dependency "concurrent-ruby", "~> 1.0", ">= 1.0.2"
+  spec.add_dependency "concurrent-ruby", "~> 1.1"
 end

metadata

@@ -1,91 +1,85 @@
 --- !ruby/object:Gem::Specification
 name: prom_multi_proc_rb
 version: !ruby/object:Gem::Version
-  version: 0.1.2
+  version: 0.1.7
 platform: ruby
 authors:
 - Andrew Tongen
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-08-17 00:00:00.000000000 Z
+date: 2020-12-03 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
         version: '1.15'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
         version: '1.15'
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '10.0'
+        version: 12.3.3
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '10.0'
+        version: 12.3.3
 - !ruby/object:Gem::Dependency
   name: rspec
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '3.0'
+        version: '3.9'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '3.0'
+        version: '3.9'
 - !ruby/object:Gem::Dependency
   name: rspec-collection_matchers
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.0'
+        version: '1.2'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.0'
+        version: '1.2'
 - !ruby/object:Gem::Dependency
   name: concurrent-ruby
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.0'
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: 1.0.2
+        version: '1.1'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.0'
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: 1.0.2
+        version: '1.1'
 description: A ruby library for collecting prometheus metrics within forking servers
 email:
 - atongen@gmail.com
@@ -137,8 +131,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubyforge_project: 
-rubygems_version: 2.5.2
+rubygems_version: 3.1.2
 signing_key: 
 specification_version: 4
 summary: A ruby library for collecting prometheus metrics within forking servers