sidekiq_queue_status 0.0.2 → 0.0.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: cc5fd855d926709a368cc99a1da6e19b2e7979f9
-  data.tar.gz: da788b27a27e1fd9572dfe06cdb50a99aa08329f
+  metadata.gz: 983038f3f4671d60805223bdb2490356060e61a5
+  data.tar.gz: 3db19c930aa5afa3c5dea0001c876ce81aa8f02d
 SHA512:
-  metadata.gz: f6f4775f9183af9637b917b8f0fe843473f40af3a6d1b43edecf60858c25ea4f961973b9b76b60d070cce45e94c560637de945d4d17642b88cfc98e69b57dbbc
-  data.tar.gz: c9244adf2de5e48c57da03f6bf5d75a4436e352681068edd9f3c4ef76a11df557b5f32f23535460b93398bd35b244a4ced098d0e40dcbf5196e567bf4ff8d588
+  metadata.gz: f2d4563c2520de2c560e1691004bea63985b5fedce16f5d42ab76d63cf629d1b0b4fa425ca7179580a568a1d3a8fe6fd71ce6540e6b123802ed410bc638ae81d
+  data.tar.gz: 1407ab64ea2393f3630275a37befe7d5a41e16b15f8c3fe88c0b0e9b672b73d0ffd642db9b04986b4654f81b77c18601740c022a1980f4ce9c7dcda6c78184d5

data/lib/sidekiq_queue_status/failure_rate.rb

@@ -0,0 +1,21 @@
+module SidekiqQueueStatus
+  class FailureRate < Metric
+    DEFAULT_FAILURE_RATE_PERC = 10
+    def monitor
+      calculate_failure_rate.tap do |failure_rate|
+        error("Failure rate above #{max_failure_rate}%") if failure_rate > max_failure_rate
+      end
+    end
+
+    def calculate_failure_rate
+      stats = Sidekiq::Stats::History.new(1)
+      processed, failed = [stats.processed, stats.failed].map { |h| h.values.last }
+      val = (failed.to_f / processed.to_f) * 100.0
+      val > 0 ? val.to_i : 0
+    end
+
+    def max_failure_rate
+      Metric.config['queue_failure_rate'] || DEFAULT_FAILURE_RATE_PERC
+    end
+  end
+end

data/lib/sidekiq_queue_status/metric.rb

@@ -0,0 +1,24 @@
+module SidekiqQueueStatus
+  class Metric
+    Result = Struct.new :latencies, :failure_rate, :errors
+
+    class << self
+      attr_accessor :config
+      def all
+        metrics = QueueLatency.new, FailureRate.new
+        errors = metrics.map(&:errors).flatten
+        Result.new(*metrics.map(&:result), errors)
+      end
+    end
+
+    attr_reader :errors, :result
+    def initialize
+      @errors = []
+      @result = monitor
+    end
+
+    def error(message)
+      @errors << message
+    end
+  end
+end

data/lib/sidekiq_queue_status/middleware.rb

@@ -2,45 +2,25 @@ require 'sidekiq/api'
 
 module SidekiqQueueStatus
   class Middleware
-    DEFAULT_TRESHOLD = 30
-    DEFAULT_FAILURE_RATE_PERC = 10
     HEADERS = {
       'Content-Type' => 'application/json',
       'Cache-Control' => 'no-cache'
     }
 
-    def initialize(app, configured_tresholds, failure_rate)
+    def initialize(app)
       @app = app
-      @latency_treshold = Hash.new(DEFAULT_TRESHOLD).merge(configured_tresholds)
-      @max_failure_rate = failure_rate || DEFAULT_FAILURE_RATE_PERC
     end
 
     def call(env)
       if env["PATH_INFO"] =~ %r{\A/queue-status\Z}
-        errors = []
-        queues.each do |name, latency|
-          max_latency = @latency_treshold[name]
-          errors << "Queue #{name} above threshold of #{max_latency}s" if latency > max_latency
-        end
-        failure_rate = calculate_failure_rate
-        errors << "Failure rate above #{@max_failure_rate}%" if failure_rate > @max_failure_rate
-        body = { latencies: queues, failure_percentage: failure_rate, errors: errors }.to_json
-        status = errors.any? ? 503 : 200
+        metrics = Metric.all
+        body = { latencies: metrics.latencies, failure_percentage: metrics.failure_rate, errors: metrics.errors }.to_json
+        status = metrics.errors.any? ? 503 : 200
         [status, HEADERS, [body]]
       else
         @app.call(env)
       end
     end
 
-    def queues
-      Sidekiq::Queue.all.map { |q| [q.name, q.latency.to_i] }.to_h
-    end
-
-    def calculate_failure_rate
-      stats = Sidekiq::Stats::History.new(1)
-      processed, failed = [stats.processed, stats.failed].map { |h| h.values.last }
-      val = (failed.to_f / processed.to_f) * 100.0
-      val > 0 ? val.to_i : 0
-    end
   end
 end

data/lib/sidekiq_queue_status/queue_latency.rb

@@ -0,0 +1,18 @@
+module SidekiqQueueStatus
+  class QueueLatency < Metric
+    DEFAULT_TRESHOLD = 30
+    def monitor
+      queues_with_latency.each do |name, latency|
+        error("Queue #{name} above threshold of #{max_latency(name)}s") if latency > max_latency(name)
+      end
+    end
+
+    def queues_with_latency
+      Sidekiq::Queue.all.map { |q| [q.name, q.latency.to_i] }.to_h
+    end
+
+    def max_latency(name)
+      Hash.new(DEFAULT_TRESHOLD).merge(Metric.config['queue_tresholds'])[name]
+    end
+  end
+end

data/lib/sidekiq_queue_status/railtie.rb

@@ -5,7 +5,10 @@ module SidekiqQueueStatus
     config.queue_tresholds = {}
     config.queue_failure_rate = nil
     initializer "sidekiq_queue_status.configure_rails_initialization" do |app|
-      app.middleware.use SidekiqQueueStatus::Middleware, app.config.queue_tresholds, app.config.queue_failure_rate
+      Metric.config = {}
+      Metric.config['queue_tresholds'] = app.config.queue_tresholds
+      Metric.config['queue_failure_rate'] = app.config.queue_failure_rate
+      app.middleware.use SidekiqQueueStatus::Middleware
     end
   end
 end

data/lib/sidekiq_queue_status/version.rb

@@ -1,3 +1,3 @@
 module SidekiqQueueStatus
-  VERSION = "0.0.2"
+  VERSION = "0.0.3"
 end

data/lib/sidekiq_queue_status.rb

@@ -1,3 +1,6 @@
 require 'sidekiq_queue_status/version'
+require 'sidekiq_queue_status/metric'
+require 'sidekiq_queue_status/queue_latency'
+require 'sidekiq_queue_status/failure_rate'
 require 'sidekiq_queue_status/middleware'
 require 'sidekiq_queue_status/railtie'

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: sidekiq_queue_status
 version: !ruby/object:Gem::Version
-  version: 0.0.2
+  version: 0.0.3
 platform: ruby
 authors:
 - Matthijs Langenberg
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-05-02 00:00:00.000000000 Z
+date: 2014-05-07 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: railties
@@ -83,7 +83,10 @@ files:
 - README.md
 - Rakefile
 - lib/sidekiq_queue_status.rb
+- lib/sidekiq_queue_status/failure_rate.rb
+- lib/sidekiq_queue_status/metric.rb
 - lib/sidekiq_queue_status/middleware.rb
+- lib/sidekiq_queue_status/queue_latency.rb
 - lib/sidekiq_queue_status/railtie.rb
 - lib/sidekiq_queue_status/version.rb
 - sidekiq_queue_status.gemspec