vinted-resque-metrics 0.0.8 → 0.0.9

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 831cac5b7a1ccf7e90b5e7664b64d59420cb5886
-  data.tar.gz: fdda7947e280f0bb69a7caf9a51cc6a3ab754820
+  metadata.gz: 73195eb6742bfda14f028c14bd649ba39d655b6e
+  data.tar.gz: 9d62fd17a960a456328cc8d314bbd06d8e6549c9
 SHA512:
-  metadata.gz: 48fdc505e6696e9e9b4c898cbeca615d6787e147916435c0ca5dbef1252cae6e093ced3814117f1491d47c878327109230c836eccf26fe62a68bd4682212d0de
-  data.tar.gz: 47d3babeffb92bad83f078b84e99a2689a3ed73a5d030f67f6d43cc4e833456d53875eafea55b7b21fa45073542ae9df85d96d46029bd47b38a6960e64e1ed42
+  metadata.gz: 8316ad9a9120cda254d0a016eb1586f8169f87c8d65e82c60d0176e83b80fdacd4722df893411c50a3be454f5f072febb399ca9024dc3a165239fee36fca4505
+  data.tar.gz: 7c265c7c692e6a45a645f6dc58ebce7a3e788864a6bbaaafbe7de3db1b66364268e68f2792d9396fedf609b7c760c9009af30f5bbd27883925ecd294f771e897

data/README.rdoc

@@ -14,7 +14,7 @@ If you are using bundler add this to your Gemfile
 
 And if you want the web-ui extensions
 
-    gem "resque-metrics", :require => "resque-metrics/server"
+    gem "resque-metrics", :require => "resque/metrics/server"
 
 == Usage
 
@@ -31,7 +31,7 @@ Given a job, extend the job class with Resque::Metrics.
 
     end
 
-By default this will record the total job count, the total count of jobs enqueued, the total time the jobs took, the avg time the jobs took. It will also record the total number of job failures. 
+By default this will record the total job count, the total count of jobs enqueued, the total time the jobs took, the avg time the jobs took. It will also record the total number of job failures.
 These metrics are also tracked by queue and job class. So for the job above, it will record values and you will be able to fetch them
 with module methods:
 
@@ -52,7 +52,7 @@ All values are recorded and returned as integers. For times, values are in milli
 
 === Forking Metrics
 
-Resque::Metrics can also record forking metrics but these are not on by default as `before_fork` and `after_fork` are singluar hooks. 
+Resque::Metrics can also record forking metrics but these are not on by default as `before_fork` and `after_fork` are singluar hooks.
 If you don't need to define your own fork hooks you can simply add a line to an initializer:
 
     Resque::Metrics.watch_fork
@@ -63,11 +63,11 @@ If you do define you're own fork hooks:
       # my own fork code
       Resque::Metrics.before_fork.call(job)
     end
-    
+
     # Resque::Metrics.(before/after)_fork just returns a lambda so just assign it if you like
     Resque.after_fork = Resque::Metrics.after_fork
 
-Once enabled this will add `.*_fork_*` methods like `avg_fork_time`, etc. 
+Once enabled this will add `.*_fork_*` methods like `avg_fork_time`, etc.
 Latest Resque is required for fork recording to work.
 
 === Queue Depth Metrics
@@ -146,7 +146,7 @@ the first backend that responds_to? it.
 === Callbacks/Hooks
 
 Resque::Metrics also has a simple callback/hook system so you can send data to your favorite agent. All hooks are passed the job class,
-the queue, and the time of the metric. 
+the queue, and the time of the metric.
 
     # Also `on_job_fork`, `on_job_enqueue`, and `on_job_failure` (`on_job_failure does not include `time`)
     Resque::Metrics.on_job_complete do |job_class, queue, time|
@@ -155,9 +155,9 @@ the queue, and the time of the metric.
       Statsd.increment "resque.#{job_class}.complete"
       # etc
     end
-    
+
 == Contributing to resque-metrics
- 
+
 * Check out the latest master to make sure the feature hasn't been implemented or the bug hasn't been fixed yet
 * Check out the issue tracker to make sure someone already hasn't requested it and/or contributed it
 * Fork the project

data/lib/resque/metrics/server/views/metrics.erb

@@ -0,0 +1,64 @@
+<h1>All your metrics are belong to Resque</h1>
+
+<table class="queues">
+  <tbody>
+    <tr>
+      <th>Queue</th>
+      <th>Jobs completed</th>
+    </tr>
+
+    <% resque.queues.each do |queue| %>
+      <tr>
+        <td class="queue"><a href="<%=u "queues/#{queue}" %>"><%= queue %></a></td>
+        <td class="size"><%= Resque::Metrics.total_job_count_by_queue(queue) %></td>
+      </tr>
+    <% end %>
+
+    <tr class="failed">
+      <td class="queue failed"></td>
+      <td class="size"><%= Resque::Metrics.total_job_count %></td>
+    </tr>
+  </tbody>
+</table>
+
+<table class="queues">
+  <tbody>
+    <tr>
+      <th>Queue</th>
+      <th>Average job time</th>
+    </tr>
+
+    <% resque.queues.each do |queue| %>
+      <tr>
+        <td class="queue"><a href="<%=u "queues/#{queue}" %>"><%= queue %></a></td>
+        <td class="size"><%= metrics_formatted_ms(Resque::Metrics.avg_job_time_by_queue(queue)) %></td>
+      </tr>
+    <% end %>
+
+    <tr class="failed">
+      <td class="queue failed"></td>
+      <td class="size"><%= metrics_formatted_ms(Resque::Metrics.avg_job_time) %></td>
+    </tr>
+  </tbody>
+</table>
+
+<table class="queues">
+  <tbody>
+    <tr>
+      <th>Queue</th>
+      <th>Total job time</th>
+    </tr>
+
+    <% resque.queues.each do |queue| %>
+      <tr>
+        <td class="queue"><a href="<%=u "queues/#{queue}" %>"><%= queue %></a></td>
+        <td class="size"><%= metrics_formatted_ms(Resque::Metrics.total_job_time_by_queue(queue)) %></td>
+      </tr>
+    <% end %>
+
+    <tr class="failed">
+      <td class="queue failed"></td>
+      <td class="size"><%= metrics_formatted_ms(Resque::Metrics.total_job_time) %></td>
+    </tr>
+  </tbody>
+</table>

data/lib/resque/metrics/server.rb

@@ -0,0 +1,46 @@
+require 'resque/server'
+require 'resque/metrics'
+
+# Extend Resque::Server to add tabs
+module Resque
+  module Metrics
+    module Server
+      def self.included(base)
+        base.class_eval do
+          helpers do
+            # reads a 'local' template file.
+            def local_template(path)
+              # Is there a better way to specify alternate template locations with sinatra?
+              File.read(File.join(File.dirname(__FILE__), "server/views/#{path}"))
+            end
+
+            def metrics_formatted_ms(milliseconds)
+              seconds = milliseconds / 1000
+              hours = (seconds / 3600).floor
+              minutes = (seconds % 3600) / 60
+              seconds = seconds % 60
+
+              str = []
+              str << "#{hours} hours" if hours > 0
+              str << "#{minutes} minutes" if minutes > 0
+              str << "#{seconds} seconds" if seconds > 0
+              str << "Less than a second" if milliseconds < 1000
+
+              str.join(" ")
+            end
+          end
+
+          get "/metrics" do
+            erb local_template("metrics.erb")
+          end
+        end
+      end
+
+      Resque::Server.tabs << 'Metrics'
+    end
+  end
+end
+
+Resque::Server.class_eval do
+  include Resque::Metrics::Server
+end

data/resque-metrics.gemspec

@@ -6,7 +6,7 @@
 
 Gem::Specification.new do |s|
   s.name = "vinted-resque-metrics"
-  s.version = "0.0.8"
+  s.version = "0.0.9"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.require_paths = ["lib"]
@@ -28,9 +28,11 @@ Gem::Specification.new do |s|
     "VERSION",
     "lib/resque-metrics.rb",
     "lib/resque/metrics.rb",
+    "lib/resque/metrics/server.rb",
     "lib/resque/metrics/backends.rb",
     "lib/resque/metrics/backends/redis.rb",
     "lib/resque/metrics/backends/statsd.rb",
+    "lib/resque/metrics/server/views/metrics.erb",
     "resque-metrics.gemspec",
     "test/helper.rb",
     "test/redis-test.conf",

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: vinted-resque-metrics
 version: !ruby/object:Gem::Version
-  version: 0.0.8
+  version: 0.0.9
 platform: ruby
 authors:
 - Aaron Quint
@@ -104,6 +104,8 @@ files:
 - lib/resque/metrics/backends.rb
 - lib/resque/metrics/backends/redis.rb
 - lib/resque/metrics/backends/statsd.rb
+- lib/resque/metrics/server.rb
+- lib/resque/metrics/server/views/metrics.erb
 - resque-metrics.gemspec
 - test/helper.rb
 - test/redis-test.conf