collective-metrics 0.0.2 → 0.1.0

data/Collectfile

@@ -1 +1,2 @@
-require 'collective/services/sidekiq'
+use Collective::Collectors::Sidekiq
+use Collective::Collectors::Redis

data/collective.gemspec

@@ -6,21 +6,21 @@ require 'collective/version'
 Gem::Specification.new do |spec|
   spec.name          = 'collective-metrics'
   spec.version       = Collective::VERSION
-  spec.authors       = ["Eric J. Holmes"]
-  spec.email         = ["eric@ejholmes.net"]
+  spec.authors       = ['Eric J. Holmes']
+  spec.email         = ['eric@ejholmes.net']
   spec.description   = %q{Collect and output metrics}
   spec.summary       = %q{Collect and output metrics}
-  spec.homepage      = "https://github.com/remind101/collective-metrics"
-  spec.license       = "MIT"
+  spec.homepage      = 'https://github.com/remind101/collective-metrics'
+  spec.license       = 'MIT'
 
   spec.files         = `git ls-files`.split($/)
   spec.executables   = spec.files.grep(%r{^bin/}) { |f| File.basename(f) }
   spec.test_files    = spec.files.grep(%r{^(test|spec|features)/})
   spec.require_paths = ['lib']
 
-  spec.add_dependency 'rufus-scheduler'
-  spec.add_dependency 'thor'
-  spec.add_dependency 'formatted-metrics'
+  spec.add_dependency 'rufus-scheduler',   '~> 2.0'
+  spec.add_dependency 'thor',              '~> 0.18'
+  spec.add_dependency 'formatted-metrics', '~> 0.1'
 
   spec.add_development_dependency 'bundler', '~> 1.3'
   spec.add_development_dependency 'rake'

data/lib/collective/builder.rb

@@ -0,0 +1,30 @@
+module Collective
+  class Builder
+    DEFAULT_RESOLUTION = '5s'.freeze
+
+    def use(klass, *args)
+      collectors << [klass, args]
+    end
+
+    def run
+      collectors.each do |(klass, args)|
+        collector = klass.new(*args)
+        scheduler.every klass.resolution || DEFAULT_RESOLUTION do
+          collector.collect
+        end
+      end
+
+      scheduler.join
+    end
+
+  private
+
+    def collectors
+      @collectors ||= []
+    end
+
+    def scheduler
+      @scheduler ||= Rufus::Scheduler.new
+    end
+  end
+end

data/lib/collective/cli.rb

@@ -7,7 +7,6 @@ module Collective
     desc 'start', 'Run the collector'
 
     def start
-      load 'Collectfile'
       Collective.run
     end
   end

data/lib/collective/collector/dsl.rb

@@ -0,0 +1,18 @@
+module Collective
+  class Collector
+    module DSL
+      def requires(libs)
+        Array(libs).each { |lib| require lib.to_s }
+      end
+
+      def collect(&block)
+        define_method :collect, &block
+      end
+
+      def resolution(resolution = nil)
+        @resolution = resolution if resolution
+        @resolution
+      end
+    end
+  end
+end

data/lib/collective/{service.rb → collector.rb}

@@ -1,6 +1,6 @@
 module Collective
-  class Service
-    autoload :DSL, 'collective/service/dsl'
+  class Collector
+    autoload :DSL, 'collective/collector/dsl'
     extend DSL
 
     attr_reader :options
@@ -9,8 +9,8 @@ module Collective
       @options = options
     end
 
-    def collect
-      _instrument
+    def collect!
+      collect
     end
 
     def instrument(*args, &block)

data/lib/collective/collectors/redis.rb

@@ -0,0 +1,28 @@
+module Collective::Collectors
+  class Redis < Collective::Collector
+    MEGABYTE = 1024 * 1024
+
+    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']
+    end
+
+  private
+
+    def info
+      redis.info
+    end
+
+    def redis
+      @redis ||= url ? ::Redis.new(url: url) : ::Redis.new
+    end
+
+    def url
+      options[:url]
+    end
+  end
+end

data/lib/collective/collectors/sidekiq.rb

@@ -0,0 +1,35 @@
+module Collective::Collectors
+  class Sidekiq < Collective::Collector
+    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
+
+      queues.each do |queue, depth|
+        instrument 'sidekiq.queue.enqueued', depth, source: queue
+      end
+    end
+
+  private
+
+    def stats
+      ::Sidekiq::Stats.new
+    end
+
+    def queues
+      stats.queues
+    end
+
+    def workers
+      ::Sidekiq.redis { |conn|
+        conn
+        .smembers('workers')
+        .map { |w| conn.get("worker:#{w}") }
+        .compact
+      }.length
+    end
+  end
+end

data/lib/collective/version.rb

@@ -1,3 +1,3 @@
 module Collective
-  VERSION = "0.0.2"
+  VERSION = '0.1.0'
 end

data/lib/collective.rb

@@ -4,35 +4,21 @@ require 'formatted-metrics'
 require 'collective/version'
 
 module Collective
-  autoload :Service, 'collective/service'
+  autoload :Collector, 'collective/collector'
+  autoload :Builder,   'collective/builder'
 
-  module Services
-    autoload :Sidekiq, 'collective/services/sidekiq'
+  module Collectors
+    autoload :Sidekiq, 'collective/collectors/sidekiq'
+    autoload :Redis,   'collective/collectors/redis'
   end
 
   class << self
-    def services
-      @services ||= []
-    end
-
-    def register(service)
-      services << service
-    end
-
     def run
       Metrics.subscribe
 
-      services.map(&:new).each do |service|
-        scheduler.every '1s' do
-          service.collect
-        end
-      end
-
-      scheduler.join
-    end
-
-    def scheduler
-      @scheduler ||= Rufus::Scheduler.new
+      builder = Builder.new
+      builder.instance_eval File.read('Collectfile')
+      builder.run
     end
   end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: collective-metrics
 version: !ruby/object:Gem::Version
-  version: 0.0.2
+  version: 0.1.0
   prerelease: 
 platform: ruby
 authors:
@@ -9,56 +9,56 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-08-02 00:00:00.000000000 Z
+date: 2013-08-03 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rufus-scheduler
   requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
-    - - ! '>='
+    - - ~>
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '2.0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     none: false
     requirements:
-    - - ! '>='
+    - - ~>
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '2.0'
 - !ruby/object:Gem::Dependency
   name: thor
   requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
-    - - ! '>='
+    - - ~>
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '0.18'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     none: false
     requirements:
-    - - ! '>='
+    - - ~>
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '0.18'
 - !ruby/object:Gem::Dependency
   name: formatted-metrics
   requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
-    - - ! '>='
+    - - ~>
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '0.1'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     none: false
     requirements:
-    - - ! '>='
+    - - ~>
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '0.1'
 - !ruby/object:Gem::Dependency
   name: bundler
   requirement: !ruby/object:Gem::Requirement
@@ -125,10 +125,12 @@ files:
 - collective.gemspec
 - lib/collective-metrics.rb
 - lib/collective.rb
+- lib/collective/builder.rb
 - lib/collective/cli.rb
-- lib/collective/service.rb
-- lib/collective/service/dsl.rb
-- lib/collective/services/sidekiq.rb
+- lib/collective/collector.rb
+- lib/collective/collector/dsl.rb
+- lib/collective/collectors/redis.rb
+- lib/collective/collectors/sidekiq.rb
 - lib/collective/version.rb
 homepage: https://github.com/remind101/collective-metrics
 licenses:
@@ -145,7 +147,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: -603082660073454949
+      hash: 386385479699394327
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements:
@@ -154,7 +156,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: -603082660073454949
+      hash: 386385479699394327
 requirements: []
 rubyforge_project: 
 rubygems_version: 1.8.23

data/lib/collective/service/dsl.rb

@@ -1,17 +0,0 @@
-module Collective
-  class Service
-    module DSL
-      def inherited(base)
-        Collective.register(base)
-      end
-
-      def requires(libs)
-        Array(libs).each { |lib| require lib.to_s }
-      end
-
-      def instrument(&block)
-        define_method :_instrument, &block
-      end
-    end
-  end
-end

data/lib/collective/services/sidekiq.rb

@@ -1,39 +0,0 @@
-module Collective::Services
-  class Sidekiq < Collective::Service
-    MEGABYTE = 1024 * 1024
-
-    requires :sidekiq
-
-    instrument do
-      instrument 'queues.processed', stats.processed
-      instrument 'queues.failed',    stats.failed
-      instrument 'queues.enqueued',  stats.enqueued
-      instrument 'workers.busy',     workers
-
-      stats.queues.each do |queue, depth|
-        instrument 'queue.enqueued', depth, queue
-      end
-
-      # General redis metrics
-      info = ::Sidekiq.redis { |conn| conn.info }
-      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']
-      instrument 'redis.ops_per_sec', info['instantaneous_ops_per_sec']
-    end
-
-    def stats
-      ::Sidekiq::Stats.new
-    end
-
-    def workers
-      ::Sidekiq.redis { |conn|
-        conn
-        .smembers('workers')
-        .map { |w| conn.get("worker:#{w}") }
-        .compact
-      }.length
-    end
-  end
-end