prometheus_exporter 0.1.13 → 0.1.14

checksums.yaml

@@ -1,7 +1,7 @@
 ---
-SHA1:
-  metadata.gz: 405a56b4f80812423e624398bc135af0ba955af9
-  data.tar.gz: 597a3f4587b851f436dafc8687a85c97373e5e06
+SHA256:
+  metadata.gz: fd8e78f5b3845845709c7479c94326c24f24b8a6e46b124b88c8f3d1a433f66e
+  data.tar.gz: 8813dc2dede6682afa0cf0ffa148bdd482f2a2affc6d5c719b825f1f1f8b8612
 SHA512:
-  metadata.gz: d2a19111517b005751654f0084e66300cc6e2c70207c1529ced65d84031b19aa90f218daf71e10624653c976213833e4bc88551371f21e627410fef6b8e9355e
-  data.tar.gz: 1c94b5f7d8606c0384211faeaf91e2595e154cbef85013764e7de3d0bda39c966527bd153696b8aa48418ade3c7507dccdb2104156a399638d706da9457bdadf
+  metadata.gz: de2d4650f99c955d1bc22a0f364504d17670628d03130f47aa50c835c2933e57547a093d0c6807dd9763255b3bdcc6f8ba469bbe1b8c2094419f55907ad1f893
+  data.tar.gz: 04e43b29d74c7f938d667c70dde47b94330482344edcb1134a39f9d9d70a7187b02c6e4a746452cdc6c236574b7fdb7d0d38986bd057daa5f1c1009fe8a31f85

data/bin/prometheus_exporter

@@ -6,76 +6,69 @@ require_relative "./../lib/prometheus_exporter"
 require_relative "./../lib/prometheus_exporter/server"
 
 def run
-  port = PrometheusExporter::DEFAULT_PORT
-  prefix = "ruby_"
-  collector_filename = nil
-  verbose = false
-  type_collectors = []
-  collector_class = PrometheusExporter::Server::Collector
+  options = {}
+  custom_collector_filename = nil
+  custom_type_collectors_filenames = []
 
   OptionParser.new do |opt|
+    opt.banner = "Usage: prometheus_exporter [options]"
     opt.on('-p',
            '--port INTEGER',
            Integer,
-           "Port exporter should listen on (default: #{port})") do |o|
-      port = o.to_i
+           "Port exporter should listen on (default: #{PrometheusExporter::DEFAULT_PORT})") do |o|
+      options[:port] = o.to_i
     end
-    opt.on('--prefix METRIC_PREFIX', String, "Prefix to apply to all metrics (default: #{prefix})") do |o|
-      prefix = o.to_s
+    opt.on('--prefix METRIC_PREFIX', String, "Prefix to apply to all metrics (default: #{PrometheusExporter::DEFAULT_PREFIX})") do |o|
+      options[:prefix] = o.to_s
     end
     opt.on('-c', '--collector FILE', String, "(optional) Custom collector to run") do |o|
-      collector_filename = o.to_s
+      custom_collector_filename = o.to_s
     end
     opt.on('-a', '--type-collector FILE', String, "(optional) Custom type collectors to run in main collector") do |o|
-      type_collectors << o
+      custom_type_collectors_filenames << o
     end
     opt.on('-v', '--verbose') do |o|
-      verbose = true
+      options[:verbose] = true
     end
 
   end.parse!
 
-  PrometheusExporter::Metric::Base.default_prefix = prefix
-
-  if collector_filename
-    eval File.read(collector_filename), nil, File.expand_path(collector_filename)
-
+  if custom_collector_filename
+    eval File.read(custom_collector_filename), nil, File.expand_path(custom_collector_filename)
     found = false
 
+    base_klass = PrometheusExporter::Server::CollectorBase
+
     ObjectSpace.each_object(Class) do |klass|
-      if klass < PrometheusExporter::Server::CollectorBase
-        collector_class = klass
-        found = true
+      if klass < base_klass && klass != base_klass
+        options[:collector_class] = klass
       end
     end
 
     if !found
-      STDERR.puts "Can not find a class inheriting off PrometheusExporter::Server::CollectorBase"
-      usage
+      STDERR.puts "[Error] Can not find a class inheriting off PrometheusExporter::Server::CollectorBase"
       exit 1
     end
   end
 
-  collector = collector_class.new
-
-  if type_collectors.length > 0
-    type_collectors.each do |t|
+  if custom_type_collectors_filenames.length > 0
+    custom_type_collectors_filenames.each do |t|
       eval File.read(t), nil, File.expand_path(t)
     end
 
     ObjectSpace.each_object(Class) do |klass|
       if klass < PrometheusExporter::Server::TypeCollector
-        collector.register_collector klass.new
-        STDERR.puts "Registered TypeCollector: #{klass}" if verbose
+        options[:type_collectors] ||= []
+        options[:type_collectors] << klass
       end
     end
   end
 
-  puts "#{Time.now} Starting prometheus exporter on port #{port}"
-  server = PrometheusExporter::Server::WebServer.new port: port, collector: collector, verbose: verbose
-  server.start
-  sleep
+  runner = PrometheusExporter::Server::Runner.new(options)
 
+  puts "#{Time.now} Starting prometheus exporter on port #{runner.port}"
+  runner.start
+  sleep
 end
 
 run

data/lib/prometheus_exporter/metric/summary.rb

@@ -83,7 +83,8 @@ module PrometheusExporter::Metric
       nil
     end
 
-    def observe(value, labels = {})
+    def observe(value, labels = nil)
+      labels ||= {}
       ensure_summary(labels)
       rotate_if_needed
 

data/lib/prometheus_exporter/server/runner.rb

@@ -0,0 +1,89 @@
+# frozen_string_literal: true
+
+module PrometheusExporter::Server
+  class RunnerException < StandardError; end;
+  class WrongInheritance < RunnerException; end;
+
+  class Runner
+    def initialize(options = {})
+      options.each do |k, v|
+        send("#{k}=", v) if self.class.method_defined?("#{k}=")
+      end
+    end
+
+    def start
+      PrometheusExporter::Metric::Base.default_prefix = prefix
+
+      register_type_collectors
+
+      unless collector.is_a?(PrometheusExporter::Server::CollectorBase)
+        raise WrongInheritance, 'Collector class must be inherited from PrometheusExporter::Server::CollectorBase'
+      end
+
+      server = server_class.new port: port, collector: collector, verbose: verbose
+      server.start
+    end
+
+    def prefix=(prefix)
+      @prefix = prefix
+    end
+
+    def prefix
+      @prefix || PrometheusExporter::DEFAULT_PREFIX
+    end
+
+    def port=(port)
+      @port = port
+    end
+
+    def port
+      @port || PrometheusExporter::DEFAULT_PORT
+    end
+
+    def collector_class=(collector_class)
+      @collector_class = collector_class
+    end
+
+    def collector_class
+      @collector_class || PrometheusExporter::Server::Collector
+    end
+
+    def type_collectors=(type_collectors)
+      @type_collectors = type_collectors
+    end
+
+    def type_collectors
+      @type_collectors || []
+    end
+
+    def verbose=(verbose)
+      @verbose = verbose
+    end
+
+    def verbose
+      return @verbose if defined? @verbose
+      false
+    end
+
+    def server_class=(server_class)
+      @server_class = server_class
+    end
+
+    def server_class
+      @server_class || PrometheusExporter::Server::WebServer
+    end
+
+    def collector
+      @_collector ||= collector_class.new
+    end
+
+    private
+
+    def register_type_collectors
+      type_collectors.each do |klass|
+        collector.register_collector klass.new
+        STDERR.puts "Registered TypeCollector: #{klass}" if verbose
+      end
+    end
+  end
+end

data/lib/prometheus_exporter/server.rb

@@ -1,3 +1,4 @@
+require_relative "metric"
 require_relative "server/type_collector"
 require_relative "server/web_collector"
 require_relative "server/process_collector"
@@ -5,4 +6,4 @@ require_relative "server/sidekiq_collector"
 require_relative "server/collector_base"
 require_relative "server/collector"
 require_relative "server/web_server"
-require_relative "metric"
+require_relative "server/runner"

data/lib/prometheus_exporter/version.rb

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

data/lib/prometheus_exporter.rb

@@ -5,4 +5,5 @@ require "thread"
 module PrometheusExporter
   # per: https://github.com/prometheus/prometheus/wiki/Default-port-allocations
   DEFAULT_PORT = 9394
+  DEFAULT_PREFIX = 'ruby_'
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: prometheus_exporter
 version: !ruby/object:Gem::Version
-  version: 0.1.13
+  version: 0.1.14
 platform: ruby
 authors:
 - Sam Saffron
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2018-02-08 00:00:00.000000000 Z
+date: 2018-02-16 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -131,6 +131,7 @@ files:
 - lib/prometheus_exporter/server/collector.rb
 - lib/prometheus_exporter/server/collector_base.rb
 - lib/prometheus_exporter/server/process_collector.rb
+- lib/prometheus_exporter/server/runner.rb
 - lib/prometheus_exporter/server/sidekiq_collector.rb
 - lib/prometheus_exporter/server/type_collector.rb
 - lib/prometheus_exporter/server/web_collector.rb
@@ -157,7 +158,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.5.2
+rubygems_version: 2.7.3
 signing_key: 
 specification_version: 4
 summary: Prometheus Exporter