prometheus_exporter 0.1.14 → 0.1.15

checksums.yaml

@@ -1,7 +1,7 @@
 ---
-SHA256:
-  metadata.gz: fd8e78f5b3845845709c7479c94326c24f24b8a6e46b124b88c8f3d1a433f66e
-  data.tar.gz: 8813dc2dede6682afa0cf0ffa148bdd482f2a2affc6d5c719b825f1f1f8b8612
+SHA1:
+  metadata.gz: d2f98b4a43ff42569d5b63f603fca9dbc011aba6
+  data.tar.gz: 80f468ac5abf12049e4d58bd981186b7134b5059
 SHA512:
-  metadata.gz: de2d4650f99c955d1bc22a0f364504d17670628d03130f47aa50c835c2933e57547a093d0c6807dd9763255b3bdcc6f8ba469bbe1b8c2094419f55907ad1f893
-  data.tar.gz: 04e43b29d74c7f938d667c70dde47b94330482344edcb1134a39f9d9d70a7187b02c6e4a746452cdc6c236574b7fdb7d0d38986bd057daa5f1c1009fe8a31f85
+  metadata.gz: 1d77695ef60e34eafd2dcbec8d7247eba6610568305a6d0a5a146300ff59f2f7c5776756bcd20562d14743d5354d493dc50e95a9e8f72d4bcdfaac55283bb100
+  data.tar.gz: e8e4c0b5a0ea42b97c2fdd9dd75ba6894a9063a22764c8817488eaa31c6cc0fd627194a3664af067e9de0a5019bfabfe73a9031f81b16742fdceb7ba40f8df27

data/.travis

@@ -0,0 +1,9 @@
+sudo: false
+dist: trusty
+language: ruby
+rvm:
+ - 2.2
+ - 2.3
+ - 2.4
+ - 2.5
+ - jruby

data/CHANGELOG

@@ -0,0 +1,8 @@
+0.1.15 - 2018-02-19
+
+- Feature: Prefer to use oj if it is loadable
+
+0.1.14 - 2018-02-17
+
+- Fix: error when shipping summary metric with no labels
+- Feature: runner was extracted so it can be reused @304

data/lib/prometheus_exporter/client.rb

@@ -35,7 +35,7 @@ class PrometheusExporter::Client
   MAX_SOCKET_AGE = 25
   MAX_QUEUE_SIZE = 10_000
 
-  def initialize(host: 'localhost', port: PrometheusExporter::DEFAULT_PORT, max_queue_size: nil, thread_sleep: 0.5)
+  def initialize(host: 'localhost', port: PrometheusExporter::DEFAULT_PORT, max_queue_size: nil, thread_sleep: 0.5, json_serializer: nil)
     @metrics = []
 
     @queue = Queue.new
@@ -55,6 +55,8 @@ class PrometheusExporter::Client
     @worker_thread = nil
     @mutex = Mutex.new
     @thread_sleep = thread_sleep
+
+    @json_serializer = PrometheusExporter.detect_json_serializer(@json_serializer)
   end
 
   def register(type, name, help)
@@ -64,7 +66,7 @@ class PrometheusExporter::Client
   end
 
   def send_json(obj)
-    send(obj.to_json)
+    send(@json_serializer.dump(obj))
   end
 
   def send(str)

data/lib/prometheus_exporter/server/collector.rb

@@ -20,11 +20,12 @@ module PrometheusExporter::Server
       total_allocated_objects: "Total number of allocateds objects by process",
     }
 
-    def initialize
+    def initialize(json_serializer: nil)
       @process_metrics = []
       @metrics = {}
       @mutex = Mutex.new
       @collectors = {}
+      @json_serializer = PrometheusExporter.detect_json_serializer(json_serializer)
       register_collector(WebCollector.new)
       register_collector(ProcessCollector.new)
       register_collector(SidekiqCollector.new)
@@ -35,7 +36,7 @@ module PrometheusExporter::Server
     end
 
     def process(str)
-      obj = JSON.parse(str)
+      obj = @json_serializer.parse(str)
       @mutex.synchronize do
         if collector = @collectors[obj["type"]]
           collector.collect(obj)

data/lib/prometheus_exporter/version.rb

@@ -1,3 +1,3 @@
 module PrometheusExporter
-  VERSION = "0.1.14"
+  VERSION = "0.1.15"
 end

data/lib/prometheus_exporter.rb

@@ -6,4 +6,35 @@ module PrometheusExporter
   # per: https://github.com/prometheus/prometheus/wiki/Default-port-allocations
   DEFAULT_PORT = 9394
   DEFAULT_PREFIX = 'ruby_'
+
+  class OjCompat
+    def self.parse(obj)
+      Oj.compat_load(obj)
+    end
+    def self.dump(obj)
+      Oj.dump(obj, mode: :compat)
+    end
+  end
+
+  def self.detect_json_serializer(preferred)
+    if preferred.nil?
+      preferred = :oj if has_oj?
+    end
+
+    preferred == :oj ? OjCompat : JSON
+  end
+
+  @@has_oj = nil
+  def self.has_oj?
+    (
+      @@has_oj ||=
+       begin
+         require 'oj'
+         :true
+       rescue LoadError
+         :false
+       end
+    ) == :true
+  end
+
 end

data/prometheus_exporter.gemspec

@@ -27,4 +27,5 @@ Gem::Specification.new do |spec|
   spec.add_development_dependency "guard", "~> 2.0"
   spec.add_development_dependency "mini_racer", "~> 0.1"
   spec.add_development_dependency "guard-minitest", "~> 2.0"
+  spec.add_development_dependency "oj", "~> 3.0"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: prometheus_exporter
 version: !ruby/object:Gem::Version
-  version: 0.1.14
+  version: 0.1.15
 platform: ruby
 authors:
 - Sam Saffron
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2018-02-16 00:00:00.000000000 Z
+date: 2018-02-18 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -94,6 +94,20 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '2.0'
+- !ruby/object:Gem::Dependency
+  name: oj
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '3.0'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '3.0'
 description: Prometheus metric collector and exporter for Ruby
 email:
 - sam.saffron@gmail.com
@@ -104,7 +118,9 @@ extra_rdoc_files: []
 files:
 - ".gitignore"
 - ".rubocop.yml"
+- ".travis"
 - ".travis.yml"
+- CHANGELOG
 - CODE_OF_CONDUCT.md
 - Gemfile
 - Guardfile
@@ -158,7 +174,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.7.3
+rubygems_version: 2.5.2
 signing_key: 
 specification_version: 4
 summary: Prometheus Exporter