prometheus_exporter 0.1.3 → 0.1.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 6d3374059942d70d2bbebe1de9cb3769dc8ff562bef3c4c79aff97023d2a1b45
-  data.tar.gz: 9903e75d79d6f92b014835e99793dd8979d464acef9ff1d82b91c0fe056ec1a7
+  metadata.gz: 5ce91417f88ed90178a27b9afabbd205375083260dae5eeaa07241dd03d71982
+  data.tar.gz: 95bcbb41f28bdf3c6ed0708c208d979f36728aa7ec339c0db69470789a4afb13
 SHA512:
-  metadata.gz: c93a68aaf72d3ece28914b93c097ad3659397a5cd147d6917cd9c9cc72cea2f939e836b696f24dd30963c1deed0234a4e088a8cdfdb62df50f0a768c06e8cb4a
-  data.tar.gz: f88f72c5ed0d34f26deeac798ea3d5397379d3e6f4ffdf2205f5b7cf1f44a84a346c07ed4bfb059a12ca3a92fcc96c3b816b63c090b949f1ec203e97615008f8
+  metadata.gz: 53f83e8fee67c6d3ad13508b0785ff83d96117ae0dc1e560e12643e8983c19ed81a7f34a5951f2de707ad7c9b96fb921ba3ff7d7d8b45684175ecbf0c4818140
+  data.tar.gz: f5c4c83a44bdf8a1cf09c449af256426d1596f33c9dd94571bfca426f5cb0a94acae7031d983e8a63f49744b1c93b32e2605a88c99d720e4eadf73a6b0d79bcd

data/bench/bench.rb

@@ -0,0 +1,37 @@
+require_relative '../lib/prometheus_exporter'
+require_relative '../lib/prometheus_exporter/client'
+require_relative '../lib/prometheus_exporter/server'
+require 'oj'
+
+# test how long it takes a custom collector to process 10k messages
+
+class Collector
+  def initialize(done)
+    @i = 0
+    @done = done
+  end
+
+  def process(message)
+    _parsed = JSON.parse(message)
+    p @i if @i % 100 == 0
+    @done.call if (@i += 1) == 10_000
+  end
+
+  def prometheus_metrics_text
+  end
+end
+
+@start = nil
+done = lambda do
+  puts "Elapsed for 10k messages is #{Time.now - @start}"
+end
+
+collector = Collector.new(done)
+server = PrometheusExporter::Server::WebServer.new port: 12349, collector: collector
+server.start
+client = PrometheusExporter::Client.new port: 12349, max_queue_size: 20_000
+
+@start = Time.now
+10_000.times { client.send_json(hello: "world") }
+
+sleep

data/lib/prometheus_exporter/client.rb

@@ -1,6 +1,5 @@
 # frozen_string_literal: true
 
-require 'json'
 require 'socket'
 require 'thread'
 
@@ -15,7 +14,7 @@ class PrometheusExporter::Client
     end
 
     def observe(value = 1, keys = nil)
-      @client.send(
+      @client.send_json(
         type: @type,
         help: @help,
         name: @name,
@@ -28,7 +27,7 @@ class PrometheusExporter::Client
   MAX_SOCKET_AGE = 25
   MAX_QUEUE_SIZE = 10_000
 
-  def initialize(host:, port:, max_queue_size: nil, thread_sleep: 0.5)
+  def initialize(host: 'localhost', port:, max_queue_size: nil, thread_sleep: 0.5)
     @metrics = []
 
     @queue = Queue.new
@@ -56,8 +55,12 @@ class PrometheusExporter::Client
     metric
   end
 
-  def send(obj)
-    @queue << obj.to_json
+  def send_json(obj)
+    send(obj.to_json)
+  end
+
+  def send(str)
+    @queue << str
     if @queue.length > @max_queue_size
       STDERR.puts "Prometheus Exporter client is dropping message cause queue is full"
       @queue.pop
@@ -136,23 +139,23 @@ class PrometheusExporter::Client
   end
 
   def close_socket_if_old!
-    if @socket && ((@socket_started + MAX_SOCKET_AGE) > Time.now.to_f)
+    if @socket && ((@socket_started + MAX_SOCKET_AGE) < Time.now.to_f)
+      p "CLOSE OLD"
       close_socket!
     end
   end
 
   def ensure_socket!
     close_socket_if_old!
-
-    @socket = TCPSocket.new @host, @port
-
-    @socket.write("POST /send-metrics HTTP/1.1\r\n")
-    @socket.write("Transfer-Encoding: chunked\r\n")
-    @socket.write("Connection: Close\r\n")
-    @socket.write("Content-Type: application/octet-stream\r\n")
-    @socket.write("\r\n")
-
-    @socket_started = Time.now.to_f
+    if !@socket
+      @socket = TCPSocket.new @host, @port
+      @socket.write("POST /send-metrics HTTP/1.1\r\n")
+      @socket.write("Transfer-Encoding: chunked\r\n")
+      @socket.write("Connection: Close\r\n")
+      @socket.write("Content-Type: application/octet-stream\r\n")
+      @socket.write("\r\n")
+      @socket_started = Time.now.to_f
+    end
 
     nil
   rescue

data/lib/prometheus_exporter/server/collector.rb

@@ -10,7 +10,8 @@ module PrometheusExporter::Server
       @mutex = Mutex.new
     end
 
-    def process(obj)
+    def process(str)
+      obj = JSON.parse(str)
       @mutex.synchronize do
         metric = @metrics[obj["name"]]
         if !metric

data/lib/prometheus_exporter/server/web_server.rb

@@ -11,6 +11,12 @@ module PrometheusExporter::Server
 
     def initialize(port: , collector: nil)
 
+      @total_metrics = PrometheusExporter::Metric::Counter.new("total_collector_metrics", "total metrics processed by exporter web")
+
+      @total_sessions = PrometheusExporter::Metric::Counter.new("total_collector_sessions", "total send_metric sessions processed by exporter web")
+
+      @total_bad_metrics = PrometheusExporter::Metric::Counter.new("total_collector_bad_metrics", "total mis-handled metrics by collector")
+
       @server = WEBrick::HTTPServer.new(
         Port: port,
         AccessLog: [],
@@ -48,10 +54,13 @@ module PrometheusExporter::Server
     end
 
     def handle_metrics(req, res)
+      @total_sessions.observe
       req.body do |block|
         begin
-          @collector.process(JSON.parse(block))
+          @total_metrics.observe
+          @collector.process(block)
         rescue => e
+          @total_bad_metrics.observe
           res.body = "Bad Metrics #{e}"
           res.status = e.respond_to?(:status_code) ? e.status_code : 500
           return
@@ -87,22 +96,26 @@ module PrometheusExporter::Server
         STDERR.puts "Generating Prometheus metrics text timed out"
       end
 
-      @metrics = []
+      metrics = []
 
-      add_gauge(
+      metrics << add_gauge(
         "collector_working",
         "Is the master process collector able to collect metrics",
         metric_text && metric_text.length > 0 ? 1 : 0
       )
 
-      add_gauge(
+      metrics << add_gauge(
         "collector_rss",
         "total memory used by collector process",
         get_rss
       )
 
+      metrics << @total_metrics
+      metrics << @total_sessions
+      metrics << @total_bad_metrics
+
       <<~TEXT
-      #{@metrics.map(&:to_prometheus_text).join("\n\n")}
+      #{metrics.map(&:to_prometheus_text).join("\n\n")}
       #{metric_text}
       TEXT
     end
@@ -116,7 +129,7 @@ module PrometheusExporter::Server
     def add_gauge(name, help, value)
       gauge = PrometheusExporter::Metric::Gauge.new(name, help)
       gauge.observe(value)
-      @metrics << gauge
+      gauge
     end
 
   end

data/lib/prometheus_exporter/version.rb

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

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: prometheus_exporter
 version: !ruby/object:Gem::Version
-  version: 0.1.3
+  version: 0.1.4
 platform: ruby
 authors:
 - Sam Saffron
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2018-01-11 00:00:00.000000000 Z
+date: 2018-01-12 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -96,6 +96,7 @@ files:
 - LICENSE.txt
 - README.md
 - Rakefile
+- bench/bench.rb
 - examples/custom_collector.rb
 - lib/prometheus_exporter.rb
 - lib/prometheus_exporter/client.rb