collective-metrics 0.1.1 → 0.1.2

data/collective.gemspec

@@ -20,7 +20,7 @@ Gem::Specification.new do |spec|
 
   spec.add_dependency 'rufus-scheduler',   '~> 2.0'
   spec.add_dependency 'thor',              '~> 0.18'
-  spec.add_dependency 'formatted-metrics', '~> 0.1'
+  spec.add_dependency 'formatted-metrics', ['>= 0.2.1', '< 1.0']
 
   spec.add_development_dependency 'bundler', '~> 1.3'
   spec.add_development_dependency 'rake'

data/lib/collective/collector.rb

@@ -16,5 +16,9 @@ module Collective
     def instrument(*args, &block)
       Metrics.instrument(*args, &block)
     end
+
+    def group(*args, &block)
+      Metrics.group(*args, &block)
+    end
   end
 end

data/lib/collective/collectors/memcached.rb

@@ -3,9 +3,11 @@ module Collective::Collectors
     requires :dalli
 
     collect do
-      client.stats.each do |server, stats|
-        stats.each do |metric, value|
-          instrument "memcached.#{metric}", value, source: server
+      Metrics.group 'memcached' do |group|
+        client.stats.each do |server, stats|
+          stats.each do |metric, value|
+            group.instrument metric, value, source: server
+          end
         end
       end
     end

data/lib/collective/collectors/redis.rb

@@ -5,10 +5,12 @@ module Collective::Collectors
     requires :redis
 
     collect do
-      instrument 'redis.used_memory',       (info['used_memory'].to_f / MEGABYTE).round(2)
-      instrument 'redis.connected_clients', info['connected_clients']
-      instrument 'redis.blocked_clients',   info['blocked_clients']
-      instrument 'redis.connected_slaves',  info['connected_slaves']
+      group 'redis' do |group|
+        group.instrument 'used_memory',       (info['used_memory'].to_f / MEGABYTE).round(2)
+        group.instrument 'connected_clients', info['connected_clients']
+        group.instrument 'blocked_clients',   info['blocked_clients']
+        group.instrument 'connected_slaves',  info['connected_slaves']
+      end
     end
 
   private

data/lib/collective/collectors/sidekiq.rb

@@ -3,13 +3,16 @@ module Collective::Collectors
     requires :sidekiq
 
     collect do
-      instrument 'sidekiq.queues.processed', stats.processed
-      instrument 'sidekiq.queues.failed',    stats.failed
-      instrument 'sidekiq.queues.enqueued',  stats.enqueued
-      instrument 'sidekiq.workers.busy',     workers
+      group 'sidekiq' do |group|
+        group.instrument 'queues.processed', stats.processed
+        group.instrument 'queues.failed',    stats.failed
+        group.instrument 'queues.enqueued',  stats.enqueued
+        group.instrument 'workers.busy',     workers
 
-      queues.each do |queue, depth|
-        instrument 'sidekiq.queue.enqueued', depth, source: queue
+        queues.each do |queue, depth|
+          group.instrument 'queue.latency', queue_latency(queue), source: queue
+          group.instrument 'queue.enqueued', depth, source: queue
+        end
       end
     end
 
@@ -23,6 +26,10 @@ module Collective::Collectors
       stats.queues
     end
 
+    def queue_latency(name)
+      ::Sidekiq::Queue.new(name).latency rescue 0
+    end
+
     def workers
       ::Sidekiq.redis { |conn|
         conn

data/lib/collective/version.rb

@@ -1,3 +1,3 @@
 module Collective
-  VERSION = '0.1.1'
+  VERSION = '0.1.2'
 end

data/lib/collective.rb

@@ -15,7 +15,6 @@ module Collective
 
   class << self
     def run
-      Metrics.subscribe
       STDOUT.sync = true
 
       builder = Builder.new

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: collective-metrics
 version: !ruby/object:Gem::Version
-  version: 0.1.1
+  version: 0.1.2
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-08-06 00:00:00.000000000 Z
+date: 2013-09-11 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rufus-scheduler
@@ -48,17 +48,23 @@ dependencies:
   requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
-    - - ~>
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: 0.2.1
+    - - <
       - !ruby/object:Gem::Version
-        version: '0.1'
+        version: '1.0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     none: false
     requirements:
-    - - ~>
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: 0.2.1
+    - - <
       - !ruby/object:Gem::Version
-        version: '0.1'
+        version: '1.0'
 - !ruby/object:Gem::Dependency
   name: bundler
   requirement: !ruby/object:Gem::Requirement
@@ -148,7 +154,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: -1688140956597634074
+      hash: -129850521152093868
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements:
@@ -157,7 +163,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: -1688140956597634074
+      hash: -129850521152093868
 requirements: []
 rubyforge_project: 
 rubygems_version: 1.8.23