simple_metrics 0.4.0 → 0.4.2

data/spec/instrument_repository_spec.rb

@@ -0,0 +1,52 @@
+# encoding: utf-8
+require "spec_helper"
+
+module SimpleMetrics
+
+  describe InstrumentRepository do
+
+    before do
+      InstrumentRepository.truncate_collections
+    end
+
+    let(:ts) do
+      Time.now.utc.to_i
+    end
+
+    describe "#save" do
+      it "saves instrument correctly" do
+        instrument = Instrument.new(:name => "test")
+        InstrumentRepository.save(instrument)
+
+        results = InstrumentRepository.find_all
+        results.should have(1).instrument
+        results.first.name.should == "test"
+      end
+    end    
+
+    describe "#find_all" do
+      it "returns all instruments" do
+        instrument1 = Instrument.new(:name => "test")
+        instrument2 = Instrument.new(:name => "test2")
+        InstrumentRepository.save(instrument1)
+        InstrumentRepository.save(instrument2)
+
+        results = InstrumentRepository.find_all
+        results.should have(2).instruments
+      end
+    end   
+
+    describe "#find_one_by_name" do
+      it "returns all instruments" do
+        instrument1 = Instrument.new(:name => "test")
+        instrument2 = Instrument.new(:name => "test2")
+        InstrumentRepository.save(instrument1)
+        InstrumentRepository.save(instrument2)
+
+        result = InstrumentRepository.find_one_by_name("test")
+        result.name.should == "test"
+      end
+    end   
+  end # describe InstrumentRepository
+
+end

data/spec/metric_repository_spec.rb

@@ -0,0 +1,53 @@
+# encoding: utf-8
+require "spec_helper"
+
+module SimpleMetrics
+
+  describe MetricRepository do
+
+    before do
+      MetricRepository.truncate_collections
+    end
+
+    let(:ts) do
+      Time.now.utc.to_i
+    end
+
+    describe "#save" do
+      it "saves metric correctly" do
+        metric = Metric.new(:name => "test", :total => 1)
+        MetricRepository.save(metric)
+
+        results = MetricRepository.find_all
+        results.should have(1).metric
+        results.first.name.should == "test"
+        results.first.total.should == 1
+      end
+    end    
+
+    describe "#find_all" do
+      it "returns all metrics" do
+        metric1 = Metric.new(:name => "test", :total => 1)
+        metric2 = Metric.new(:name => "test2", :total => 1)
+        MetricRepository.save(metric1)
+        MetricRepository.save(metric2)
+
+        results = MetricRepository.find_all
+        results.should have(2).metrics
+      end
+    end   
+
+    describe "#find_one_by_name" do
+      it "returns all metrics" do
+        metric1 = Metric.new(:name => "test", :total => 1)
+        metric2 = Metric.new(:name => "test2", :total => 1)
+        MetricRepository.save(metric1)
+        MetricRepository.save(metric2)
+
+        result = MetricRepository.find_one_by_name("test")
+        result.name.should == "test"
+      end
+    end   
+  end # describe MetricRepository
+
+end

data/spec/spec_helper.rb

@@ -1,10 +1,11 @@
 require "simple_metrics"
+require "rspec"
 
 RSpec.configure do |config|
   config.mock_with :rr
 end
 
 SimpleMetrics.logger = Logger.new('/dev/null')
-SimpleMetrics.db_config = { :host => 'localhost', :prefix => 'test' }
-
-
+SimpleMetrics.configure do |config|
+  config.db = { :host => 'localhost', :prefix => 'test', :options => {} }
+end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: simple_metrics
 version: !ruby/object:Gem::Version
-  version: 0.4.0
+  version: 0.4.2
   prerelease: 
 platform: ruby
 authors:
@@ -9,11 +9,11 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-04-10 00:00:00.000000000 Z
+date: 2012-05-08 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rake
-  requirement: &70302462447680 !ruby/object:Gem::Requirement
+  requirement: &70306351217460 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -21,10 +21,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70302462447680
+  version_requirements: *70306351217460
 - !ruby/object:Gem::Dependency
   name: rspec
-  requirement: &70302462446940 !ruby/object:Gem::Requirement
+  requirement: &70306351212560 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -32,10 +32,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70302462446940
+  version_requirements: *70306351212560
 - !ruby/object:Gem::Dependency
   name: rr
-  requirement: &70302462446200 !ruby/object:Gem::Requirement
+  requirement: &70306351212060 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -43,10 +43,32 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70302462446200
+  version_requirements: *70306351212060
+- !ruby/object:Gem::Dependency
+  name: shotgun
+  requirement: &70306351211560 !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :development
+  prerelease: false
+  version_requirements: *70306351211560
+- !ruby/object:Gem::Dependency
+  name: rack-test
+  requirement: &70306351211140 !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :development
+  prerelease: false
+  version_requirements: *70306351211140
 - !ruby/object:Gem::Dependency
   name: eventmachine
-  requirement: &70302462445460 !ruby/object:Gem::Requirement
+  requirement: &70306351210700 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -54,10 +76,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *70302462445460
+  version_requirements: *70306351210700
 - !ruby/object:Gem::Dependency
   name: daemons
-  requirement: &70302462444740 !ruby/object:Gem::Requirement
+  requirement: &70306351210260 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -65,10 +87,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *70302462444740
+  version_requirements: *70306351210260
 - !ruby/object:Gem::Dependency
   name: mongo
-  requirement: &70302462444200 !ruby/object:Gem::Requirement
+  requirement: &70306351209720 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -76,10 +98,10 @@ dependencies:
         version: '1.6'
   type: :runtime
   prerelease: false
-  version_requirements: *70302462444200
+  version_requirements: *70306351209720
 - !ruby/object:Gem::Dependency
   name: bson
-  requirement: &70302462443660 !ruby/object:Gem::Requirement
+  requirement: &70306351209080 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -87,39 +109,82 @@ dependencies:
         version: '1.6'
   type: :runtime
   prerelease: false
-  version_requirements: *70302462443660
+  version_requirements: *70306351209080
+- !ruby/object:Gem::Dependency
+  name: bson_ext
+  requirement: &70306351207600 !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: '1.6'
+  type: :runtime
+  prerelease: false
+  version_requirements: *70306351207600
+- !ruby/object:Gem::Dependency
+  name: activesupport
+  requirement: &70306351206920 !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :runtime
+  prerelease: false
+  version_requirements: *70306351206920
 description: SimpleMetrics
 email:
 - fdietz@gmail.com
 executables:
 - populate
-- simple_metrics_client
+- populate_for_demo
 - simple_metrics_server
 extensions: []
 extra_rdoc_files: []
 files:
 - .gitignore
 - .rvmrc
+- .travis.yml
 - Gemfile
 - README.markdown
 - Rakefile
 - bin/populate
-- bin/simple_metrics_client
+- bin/populate_for_demo
 - bin/simple_metrics_server
+- config.ru
+- default_config.yml
 - example/increment.rb
 - lib/simple_metrics.rb
 - lib/simple_metrics/bucket.rb
-- lib/simple_metrics/client.rb
+- lib/simple_metrics/configuration.rb
+- lib/simple_metrics/dashboard.rb
+- lib/simple_metrics/dashboard_repository.rb
 - lib/simple_metrics/data_point.rb
+- lib/simple_metrics/data_point/base.rb
+- lib/simple_metrics/data_point/counter.rb
+- lib/simple_metrics/data_point/event.rb
+- lib/simple_metrics/data_point/gauge.rb
+- lib/simple_metrics/data_point/timing.rb
+- lib/simple_metrics/data_point_repository.rb
 - lib/simple_metrics/functions.rb
 - lib/simple_metrics/graph.rb
-- lib/simple_metrics/mongo.rb
-- lib/simple_metrics/server.rb
+- lib/simple_metrics/importer.rb
+- lib/simple_metrics/instrument.rb
+- lib/simple_metrics/instrument_repository.rb
+- lib/simple_metrics/metric.rb
+- lib/simple_metrics/metric_repository.rb
+- lib/simple_metrics/repository.rb
+- lib/simple_metrics/udp_server.rb
 - lib/simple_metrics/version.rb
 - simple_metrics.gemspec
 - spec/bucket_spec.rb
+- spec/dashboard_repository_spec.rb
+- spec/data_point_repository_spec.rb
 - spec/data_point_spec.rb
 - spec/graph_spec.rb
+- spec/importer_spec.rb
+- spec/instrument_repository_spec.rb
+- spec/metric_repository_spec.rb
 - spec/spec_helper.rb
 homepage: ''
 licenses: []
@@ -135,7 +200,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: -520904601544402240
+      hash: -4426928815847505405
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements:
@@ -144,7 +209,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: -520904601544402240
+      hash: -4426928815847505405
 requirements: []
 rubyforge_project: 
 rubygems_version: 1.8.17
@@ -153,6 +218,11 @@ specification_version: 3
 summary: SimpleMetrics
 test_files:
 - spec/bucket_spec.rb
+- spec/dashboard_repository_spec.rb
+- spec/data_point_repository_spec.rb
 - spec/data_point_spec.rb
 - spec/graph_spec.rb
+- spec/importer_spec.rb
+- spec/instrument_repository_spec.rb
+- spec/metric_repository_spec.rb
 - spec/spec_helper.rb

data/bin/simple_metrics_client

@@ -1,64 +0,0 @@
-#!/usr/bin/env ruby
-
-require "rubygems"
-require "bundler/setup"
-
-require 'optparse'
-require "simple_metrics"
-
-options = {
-	:host        => 'localhost',
-	:port        => 8125,
-	:sample_rate => 1
-}
-
-parser ||= OptionParser.new do |opts|
-  opts.banner = "Usage Example: simple_metrics_send com.test.mymetric -c5"
-
-  opts.separator ""
-  opts.separator "Client options:"
-
-  opts.on("-c", "--counter VALUE", "Counter, a relative value") do |value|
-  	options[:type] = 'c'
-  	options[:stat] = value.to_i
-  end
-  opts.on("-g", "--gauge VALUE", "Gauge, an absolute value ") do |value|
-  	options[:type] = 'g'
-  	options[:stat] = value.to_i
-  end
-  opts.on("-t", "--timing VALUE", "A timing in ms") do |value|
-  	options[:type] = 'ms'
-  	options[:stat] = value.to_i
-  end
-  opts.on("-s", "--sample_rate VALUE", "An optional sample rate between 0 and 1 (example: 0.2)") do |value|
-  	options[:sample_rate] = value.to_f || 1
-  end
-
-  opts.separator ""
-
-  opts.on("-a", "--address HOST", "bind to HOST address (default: #{options[:host]})") do |host| 
-  	options[:host] = host
-  end
-
-  opts.on("-p", "--port PORT", "use PORT (default: #{options[:port]})") do |port|
-  	options[:port] = port.to_i
-  end
-
-  opts.separator ""
-  opts.on_tail("-h", "--help", "Show this message") { puts opts; exit }
-  opts.on_tail('-v', '--version', "Show version") { puts SimpleMetrics::VERSION; exit }
-
-end.parse!(ARGV)
-
-command    = ARGV.shift
-arguments  = ARGV
-client = SimpleMetrics::Client.new(options[:host])
-
-case options[:type]
-when'c' 
-	client.count(command, options[:stat], options[:sample_rate])
-when 'g'
-	client.gauge(command, options[:stat], options[:sample_rate])
-when 'ms'
-	client.timing(command, options[:stat], options[:sample_rate])
-end

data/lib/simple_metrics/client.rb

@@ -1,83 +0,0 @@
-# encoding: utf-8
-require "socket"
-
-module SimpleMetrics
-
-  class Client
-    VERSION = "0.0.1"
-    
-    def initialize(host, port = 8125)
-      @host, @port = host, port
-    end
-
-    # send relative value
-    def increment(stat, sample_rate = 1)
-      count(stat, 1, sample_rate)
-    end
-
-    # send relative value
-    def decrement(stat, sample_rate = 1)
-      count(stat, -1, sample_rate)
-    end
-
-    # send relative value
-    def count(stat, count, sample_rate = 1)
-      send_data( stat, count, 'c', sample_rate)
-    end
-
-    # send absolute value
-    # TODO: check if this is actually supported by Statsd server
-    def gauge(stat, value)
-      send_data(stat, value, 'g')
-    end
-
-    # Sends a timing (in ms) (glork)
-    def timing(stat, ms, sample_rate = 1)
-      send_data(stat, ms, 'ms', sample_rate)
-    end
-
-    # Sends a timing (in ms) block based
-    def time(stat, sample_rate = 1, &block)
-      start = Time.now
-      result = block.call
-      timing(stat, ((Time.now - start) * 1000).round, sample_rate)
-      result
-    end
-
-    private
-
-    def sampled(sample_rate, &block)
-      if sample_rate < 1
-        block.call if rand <= sample_rate
-      else
-        block.call
-      end
-    end
-
-    def send_data(stat, delta, type, sample_rate = 1)
-      sampled(sample_rate) do
-        data = "#{stat}:#{delta}|#{type}" # TODO: check stat is valid
-        data << "|@#{sample_rate}" if sample_rate < 1
-        send_to_socket(data)
-      end
-    end
-
-    def send_to_socket(data)
-      logger.debug "SimpleMetrics Client send: #{data}"
-      socket.send(data, 0, @host, @port)
-    rescue Exception => e
-      puts e.backtrace
-      logger.error "SimpleMetrics Client error: #{e}"
-    end
-
-    def socket
-      @socket ||= UDPSocket.new 
-    end
-
-    def logger
-      @logger ||= SimpleMetrics.logger
-    end
-
-  end
-
-end

data/lib/simple_metrics/mongo.rb

@@ -1,48 +0,0 @@
-# encoding: utf-8
-require "mongo"
-
-module SimpleMetrics
-  module Mongo
-    extend self
-
-    def ensure_collections_exist
-      SimpleMetrics.logger.debug "SERVER: MongoDB - found following collections: #{db.collection_names.inspect}"
-      Bucket.all.each do |bucket|
-        unless db.collection_names.include?(bucket.name)
-          db.create_collection(bucket.name, :capped => bucket.capped, :size => bucket.size) 
-          SimpleMetrics.logger.debug "SERVER: MongoDB - created collection #{bucket.name}, capped: #{bucket.capped}, size: #{bucket.size}"
-        end
-        
-        db.collection(bucket.name).ensure_index([['ts', ::Mongo::ASCENDING]])
-        SimpleMetrics.logger.debug "SERVER: MongoDB - ensure index on column ts for collection #{bucket.name}"
-      end 
-    end
-
-    def truncate_collections
-      Bucket.all.each do |bucket|
-        if db.collection_names.include?(bucket.name)
-          if bucket.capped?
-            collection(bucket.name).drop # capped collections can't remove elements, drop it instead
-          else
-            collection(bucket.name).remove
-          end
-          SimpleMetrics.logger.debug "SERVER: MongoDB - truncated collection #{bucket.name}"
-        end
-      end
-    end
-
-    @@collection = {}
-    def collection(name)
-      @@collection[name] ||= db.collection(name)
-    end
-
-    def connection
-      @@connection ||= ::Mongo::Connection.new(SimpleMetrics.db_config[:host], SimpleMetrics.db_config[:port])
-    end
-
-    def db
-      @@db ||= connection.db(SimpleMetrics.db_config[:db_name], SimpleMetrics.db_config[:options])
-    end
-
-  end
-end

data/lib/simple_metrics/server.rb

@@ -1,66 +0,0 @@
-# encoding: utf-8
-require "eventmachine"
-
-module SimpleMetrics
-
-  module ClientHandler
-
-    @@data_points = []
-
-    class << self
-      def get_and_clear_data_points
-        data_points = @@data_points.dup
-        @@data_points = []
-        data_points
-      end
-    end
-
-    def data_points
-      @@data_points
-    end
-
-    def post_init
-      SimpleMetrics.logger.info "ClientHandler entering post_init"
-    end
-
-    def receive_data(data)
-      SimpleMetrics.logger.debug "received_data: #{data.inspect}"
-
-      @@data_points ||= []
-      @@data_points << DataPoint.parse(data)
-    rescue DataPoint::ParserError => e
-      SimpleMetrics.logger.debug "Invalid Data skipped: #{data}"
-    end
-  end
-
-  class Server
-
-    attr_reader :db, :connection
-
-    def start
-      SimpleMetrics.logger.info "SERVER: starting up on #{SimpleMetrics.config[:host]}:#{SimpleMetrics.config[:port]}..."
-
-      Mongo.ensure_collections_exist
-
-      EM.run do
-        EM.open_datagram_socket(SimpleMetrics.config[:host], SimpleMetrics.config[:port], SimpleMetrics::ClientHandler) do |con|
-          EventMachine::add_periodic_timer(SimpleMetrics.config[:flush_interval]) do
-            SimpleMetrics.logger.debug "SERVER: period timer triggered after #{SimpleMetrics.config[:flush_interval]} seconds"
-
-            EM.defer { Bucket.flush_data_points(ClientHandler.get_and_clear_data_points) } 
-          end
-        end
-      end
-    end
-
-    def stop
-      SimpleMetrics.logger.info "EventMachine stop"
-      EM.stop
-    end
-    
-    def to_s
-      "#{SimpleMetrics.config[:host]}:#{SimpleMetrics.config[:port]}"
-    end
-
-  end
-end