simple_metrics 0.2.3 → 0.3.2

data/lib/simple_metrics/views/show.erb

@@ -0,0 +1,31 @@
+
+<ul class="breadcrumb">
+  <li>
+    <a href="/">Available Metrics</a> <span class="divider">/</span>
+  </li>
+  <li class="active"><%= params[:target].join(', ') %></li>
+</ul>
+
+<div class="row-fluid">
+  <div class="span12">
+    <div style="margin-bottom:2em" class="row-fluid">
+      <div id="graph-container-minute" class="span6"></div>
+      <div id="graph-container-hour" class="span6"></div>
+    </div>
+    <div class="row-fluid">
+      <div id="graph-container-day" class="span6"></div>
+      <div id="graph-container-week" class="span6"></div>
+    </div>
+  </div>
+</div>
+
+<script>
+
+  $(function() {
+    $("#graph-container-minute").load("/graph?target[]=<%= params[:target].first %>&time=minute");
+    $("#graph-container-hour").load("/graph?target[]=<%= params[:target].first %>&time=hour");
+    $("#graph-container-day").load("/graph?target[]=<%= params[:target].first %>&time=day");
+    $("#graph-container-week").load("/graph?target[]=<%= params[:target].first %>&time=week");
+  });
+
+</script>

data/lib/simple_metrics.rb

@@ -2,13 +2,25 @@
 require "logger"
 
 require "simple_metrics/version"
-require "simple_metrics/client"
-require "simple_metrics/server"
+require "simple_metrics/configuration"
+require "simple_metrics/udp_server"
+require "simple_metrics/repository"
+require "simple_metrics/data_point_repository"
 require "simple_metrics/data_point"
+require "simple_metrics/data_point/base"
+require "simple_metrics/data_point/counter"
+require "simple_metrics/data_point/event"
+require "simple_metrics/data_point/gauge"
+require "simple_metrics/data_point/timing"
+require "simple_metrics/value_aggregation"
+require "simple_metrics/array_aggregation"
+require "simple_metrics/update_aggregation"
 require "simple_metrics/bucket"
 require "simple_metrics/graph"
 require "simple_metrics/functions"
-require "simple_metrics/mongo"
+require "simple_metrics/metric"
+require "simple_metrics/metric_repository"
+require "simple_metrics/app"
 
 module SimpleMetrics
   extend self
@@ -21,81 +33,12 @@ module SimpleMetrics
     @@logger = logger
   end
 
-  CONFIG_DEFAULTS = {
-    :host           => 'localhost',
-    :port           => 8125,
-    :flush_interval => 10
-  }.freeze
-
   def config
-    @@config ||= CONFIG_DEFAULTS
-  end
-
-  def config=(options)
-    @@config = CONFIG_DEFAULTS.merge(options)
-  end
-
-  BUCKETS_DEFAULTS = [
-    { 
-      :name    => 'stats_per_10s',
-      :seconds => 10,
-      :capped  => true,
-      :size    => 100_100_100
-    },
-    {
-      :name    => 'stats_per_1min',
-      :seconds => 60,
-      :capped  => true,
-      :size    => 1_100_100_100
-    },
-    {
-      :name    => 'stats_per_10min',
-      :seconds => 600,
-      :size    => 0 ,
-      :capped  => false
-    },
-    {
-      :name    => 'stats_per_day',
-      :seconds => 86400,
-      :size    => 0,
-      :capped  => false
-    }
-  ].freeze
-
-  def buckets_config
-    @@buckets ||= BUCKETS_DEFAULTS
-  end
-
-  def buckets_config=(buckets)
-    @@buckets = buckets
-  end
-
-  MONGODB_DEFAULTS = {
-    :pool_size => 5, 
-    :timeout   => 5,
-    :strict    => true
-  }.freeze
-
-  DB_CONFIG_DEFAULTS = {
-    :host      => 'localhost',
-    :port      => 27017,
-    :prefix    => 'development'
-  }.freeze
-
-  def db_config=(options)
-    @@db_config = {
-      :host    => options.delete(:host) || 'localhost',
-      :port    => options.delete(:port) || 27017,
-      :db_name => "simple_metrics_#{options.delete(:prefix)}",
-      :options => MONGODB_DEFAULTS.merge(options)
-    }
+    @@config ||= Configuration.new
   end
 
-  def db_config
-    @@db_config ||= DB_CONFIG_DEFAULTS.merge(
-      :db_name => "simple_metrics_#{DB_CONFIG_DEFAULTS[:prefix]}",
-      :options => MONGODB_DEFAULTS
-    )
+  def configure(hash = {}, &block)
+    config.configure(hash, &block)
   end
 
-end
+end

data/simple_metrics.gemspec

@@ -19,9 +19,15 @@ Gem::Specification.new do |s|
   s.add_development_dependency "rake"
   s.add_development_dependency "rspec"
   s.add_development_dependency "rr"
+  s.add_development_dependency "shotgun"
 
   s.add_dependency "eventmachine"
   s.add_dependency "daemons"
   s.add_dependency "mongo", '~> 1.6'
   s.add_dependency "bson", '~> 1.6'
+  s.add_dependency "bson_ext", '~> 1.6'
+  s.add_dependency "sinatra"
+  s.add_dependency "erubis"
+  s.add_dependency "vegas", '~> 0.1.2'
+  s.add_dependency "json"
 end

data/spec/array_aggregation_spec.rb

@@ -0,0 +1,51 @@
+# encoding: utf-8
+require "spec_helper"
+
+module SimpleMetrics
+
+  describe ArrayAggregation do
+
+    before do
+      DataPointRepository.truncate_collections
+      DataPointRepository.ensure_collections_exist
+    end
+
+    let(:ts) do
+      Time.now.utc.to_i
+    end
+    
+    describe "#aggregate" do
+      it "aggregates counter data points" do
+        stats1  =  DataPoint.create_counter(:name => "com.test.key1", :value => 5, :ts => ts)
+        stats2  =  DataPoint.create_counter(:name => "com.test.key1", :value => 7, :ts => ts)
+        stats3  =  DataPoint.create_counter(:name => "com.test.key1", :value => 9, :ts => (ts + 60) )
+
+        results = ArrayAggregation.aggregate([stats1, stats2, stats3], "com.test.*")
+        results.should have(2).data_points
+        results.first.name.should == "com.test.*"
+        results.last.name.should  == "com.test.*"
+        results.first.value.should == 12
+        results.last.value.should == 9
+      end
+
+      it "aggregates gauge data points" do
+        stats1  =  DataPoint.create_gauge(:name => "com.test.key1", :value => 5, :ts => ts)
+        stats2  =  DataPoint.create_gauge(:name => "com.test.key1", :value => 7, :ts => ts)
+        stats3  =  DataPoint.create_gauge(:name => "com.test.key1", :value => 9, :ts => (ts + 60) )
+
+        results = ArrayAggregation.aggregate([stats1, stats2, stats3], "com.test.*")
+        results.should have(2).data_points
+        results.first.name.should == "com.test.*"
+        results.last.name.should  == "com.test.*"
+        results.first.value.should == 6
+        results.last.value.should == 9
+      end
+      
+      it "raises NonMatchingTypesError if types are different" do
+        stats1  =  DataPoint.create_counter(:name => "com.test.key1", :value => 5, :ts => ts)
+        stats2  =  DataPoint.create_gauge(:name => "com.test.key1", :value => 5, :ts => ts)
+        expect { ArrayAggregation.aggregate([stats1, stats2], "com.test.*") }.to raise_error(SimpleMetrics::DataPoint::NonMatchingTypesError)
+      end
+    end
+  end
+end

data/spec/bucket_spec.rb

@@ -37,8 +37,8 @@ module SimpleMetrics
 
     describe "#save" do
       before do
-        Mongo.truncate_collections
-        Mongo.ensure_collections_exist
+        DataPointRepository.truncate_collections
+        DataPointRepository.ensure_collections_exist
         bucket.save(stats, ts)
       end
 
@@ -47,7 +47,7 @@ module SimpleMetrics
       end
 
       it "saves given data in bucket" do
-        results = bucket.find_all_by_name("key1")
+        results = bucket.find_all_at_ts(ts)
         results.should have(1).item
         result = results.first
         result.name.should  == stats.name
@@ -56,7 +56,7 @@ module SimpleMetrics
       end
 
       it "saves data in correct timestamp" do
-        result = bucket.find_all_by_name("key1").first
+        result = bucket.find_all_at_ts(ts).first
         result.ts.should == ts/sec*sec
       end
 
@@ -65,27 +65,11 @@ module SimpleMetrics
     describe "finder methods" do
 
       before do
-        Mongo.truncate_collections
-        Mongo.ensure_collections_exist
+        DataPointRepository.truncate_collections
+        DataPointRepository.ensure_collections_exist
       end
 
-      describe "#find_all_by_name" do
-        it "returns all stats for given name" do
-          stats_same1 =  DataPoint.create_counter(:name => "key1", :value => 5)
-          stats_same2 =  DataPoint.create_counter(:name => "key1", :value => 3)
-          stats_different = DataPoint.create_counter(:name => "key2", :value => 3)
-
-          bucket.save(stats_same1, ts)
-          bucket.save(stats_same2, ts)
-          bucket.save(stats_different, ts)
-
-          results = bucket.find_all_by_name("key1")
-          results.should have(2).items
-          results.first.name.should == stats_same1.name
-        end
-      end
-
-      describe "#find_all_in_ts" do
+      describe "#find_all_at_ts" do
         it "returns all stats in given timestamp" do
           stats1  =  DataPoint.create_counter(:name => "key1", :value => 5)
           stats2  =  DataPoint.create_counter(:name => "key2", :value => 3)
@@ -93,36 +77,17 @@ module SimpleMetrics
           bucket.save(stats1, ts)
           bucket.save(stats2, bucket.next_ts_bucket(ts))
 
-          result1 = bucket.find_all_in_ts(ts).first
+          result1 = bucket.find_all_at_ts(ts).first
           result1.name.should == stats1.name
           result1.value.should == stats1.value
 
-          result2 = bucket.find_all_in_ts(bucket.next_ts_bucket(ts)).first
+          result2 = bucket.find_all_at_ts(bucket.next_ts_bucket(ts)).first
           result2.name.should == stats2.name
           result2.value.should == stats2.value
         end
       end
 
-      describe "#find_all_in_ts_by_name" do
-        it "returns all stats for given name and timestamp" do
-          stats1a  =  DataPoint.create_counter(:name => "key1", :value => 5)
-          stats1b  =  DataPoint.create_counter(:name => "key1", :value => 7)
-          stats2   =  DataPoint.create_counter(:name => "key2", :value => 7)
-          stats1_different_ts   =  DataPoint.create_counter(:name => "key1", :value => 3)
-
-          bucket.save(stats1a, ts)
-          bucket.save(stats1b, ts)
-          bucket.save(stats2, ts)
-          bucket.save(stats1_different_ts, bucket.next_ts_bucket(ts))
-
-          results = bucket.find_all_in_ts_by_name(ts, "key1")
-          results.should have(2).items
-          results.first.name.should == "key1"
-          results.last.name.should == "key1"
-        end
-      end
-
-      describe "#find_all_in_ts_by_wildcard" do
+      describe "#find_all_in_ts_range_by_wildcard" do
         it "returns all stats for given name and timestamp" do
           stats1  =  DataPoint.create_counter(:name => "com.test.key1", :value => 5)
           stats2  =  DataPoint.create_counter(:name => "com.test.key2", :value => 7)
@@ -171,8 +136,8 @@ module SimpleMetrics
 
     describe "#aggregate_all" do
       before do
-        Mongo.truncate_collections
-        Mongo.ensure_collections_exist
+        DataPointRepository.truncate_collections
+        DataPointRepository.ensure_collections_exist
       end
 
       it "aggregates all counter data points" do
@@ -183,12 +148,13 @@ module SimpleMetrics
         bucket2 = Bucket[1]
         ts_at_insert = bucket2.previous_ts_bucket(ts)
         bucket.save(stats1a, ts_at_insert)
+        Bucket.aggregate(stats1a)
         bucket.save(stats1b, ts_at_insert)
+        Bucket.aggregate(stats1b)
         bucket.save(stats2, ts_at_insert)
+        Bucket.aggregate(stats2)
 
-        Bucket.aggregate_all(ts)
-
-        results = bucket2.find_all_in_ts(ts_at_insert)
+        results = bucket2.find_all_at_ts(ts_at_insert)
         results.should have(2).items
 
         key1_result = results.find {|stat| stat.name == "key1"}
@@ -208,12 +174,13 @@ module SimpleMetrics
         bucket2 = Bucket[1]
         ts_at_insert = bucket2.previous_ts_bucket(ts)
         bucket.save(stats1a, ts_at_insert)
+        Bucket.aggregate(stats1a)
         bucket.save(stats1b, ts_at_insert)
+        Bucket.aggregate(stats1b)
         bucket.save(stats2, ts_at_insert)
+        Bucket.aggregate(stats2)
 
-        Bucket.aggregate_all(ts)
-
-        results = bucket2.find_all_in_ts(ts_at_insert)
+        results = bucket2.find_all_at_ts(ts_at_insert)
         results.should have(2).items
 
         key1_result = results.find {|stat| stat.name == "key1"}
@@ -229,8 +196,8 @@ module SimpleMetrics
 
     describe "#flush_data_points" do
       before do
-        Mongo.truncate_collections
-        Mongo.ensure_collections_exist
+        DataPointRepository.truncate_collections
+        DataPointRepository.ensure_collections_exist
         
         stats1 = DataPoint.create_counter(:name => "key1", :value => 5)
         stats2 = DataPoint.create_counter(:name => "key1", :value => 7)
@@ -241,19 +208,14 @@ module SimpleMetrics
       it "saves all stats in finest/first bucket" do
         Bucket.flush_data_points(@stats)
 
-        results = bucket.find_all_in_ts(ts)
+        results = bucket.find_all_at_ts(ts)
         results.should have(2).items
       end
 
-      it "calls aggregate_all afterwards" do
-        mock(Bucket).aggregate_all(ts)
-        Bucket.flush_data_points(@stats)
-      end
-
       it "saves all stats and aggregate if duplicates found" do
         Bucket.flush_data_points(@stats)
 
-        results = bucket.find_all_in_ts(ts)
+        results = bucket.find_all_at_ts(ts)
         results.should have(2).items
         results.first.name.should == "key1"
         results.last.name.should == "key2"

data/spec/data_point_repository_spec.rb

@@ -0,0 +1,114 @@
+# encoding: utf-8
+require "spec_helper"
+
+module SimpleMetrics
+
+  describe DataPointRepository do
+
+    before do
+      DataPointRepository.truncate_collections
+      DataPointRepository.ensure_collections_exist
+    end
+
+    let(:ts) do
+      Time.now.utc.to_i
+    end
+
+    let(:repository) do
+      DataPointRepository.for_retention('stats_per_10s')
+    end
+
+    describe "#save" do
+      it "saves data point correctly" do
+        dp = DataPoint.create_counter(:name => "key", :ts => ts)
+        repository.save(dp)
+
+        results = repository.find_all_at_ts(ts)
+        results.should have(1).data_point
+      end
+    end    
+
+    describe "#find_all_at_ts" do
+      it "returns all data points at given time stamp" do
+        dp1 = DataPoint.create_counter(:name => "key1", :ts => ts)
+        dp2 = DataPoint.create_counter(:name => "key1", :ts => ts + 10)
+        repository.save(dp1)
+        repository.save(dp2)
+
+        results = repository.find_all_at_ts(ts)
+        results.should have(1).data_point
+        results.first.name.should == "key1"
+      end
+    end    
+
+    describe "#find_all_in_ts_range" do
+      it "returns all data points in given time stamp range" do
+        dp1 = DataPoint.create_counter(:name => "key1", :ts => ts)
+        dp2 = DataPoint.create_counter(:name => "key2", :ts => ts + 10)
+        dp3 = DataPoint.create_counter(:name => "key3", :ts => ts + 20)
+        repository.save(dp1)
+        repository.save(dp2)
+        repository.save(dp3)
+
+        results = repository.find_all_in_ts_range(ts, ts+10)
+        results.should have(2).data_points
+        results.first.name.should == "key1"
+        results.last.name.should == "key2"
+      end
+    end
+
+    describe "#find_all_in_ts_range_by_name" do
+      it "returns all data points in given time stamp range by name" do
+        dp1 = DataPoint.create_counter(:name => "key1", :ts => ts)
+        dp2 = DataPoint.create_counter(:name => "key2", :ts => ts + 10)
+        dp3 = DataPoint.create_counter(:name => "key3", :ts => ts + 20)
+        repository.save(dp1)
+        repository.save(dp2)
+        repository.save(dp3)
+
+        results = repository.find_all_in_ts_range_by_name(ts, ts+10, "key1")
+        results.should have(1).data_point
+        results.first.name.should == "key1"
+      end
+    end
+
+    describe "#find_all_in_ts_range_by_wildcard" do
+      it "returns all data points in given time stamp range by wildcard" do
+        dp1 = DataPoint.create_counter(:name => "test.key1", :ts => ts)
+        dp2 = DataPoint.create_counter(:name => "test.key2", :ts => ts + 10)
+        dp3 = DataPoint.create_counter(:name => "test.key3", :ts => ts + 20)
+        repository.save(dp1)
+        repository.save(dp2)
+        repository.save(dp3)
+
+        results = repository.find_all_in_ts_range_by_wildcard(ts, ts+10, "test.*")
+        results.should have(2).data_point2
+        results.first.name.should == "test.key1"
+        results.last.name.should == "test.key2"
+      end
+    end
+
+    describe "#count_at" do
+      it "returns the total count of entries for given time stamp" do
+        dp1 = DataPoint.create_counter(:name => "test.key1", :ts => ts)
+        dp2 = DataPoint.create_counter(:name => "test.key2", :ts => ts + 10)
+        repository.save(dp1)
+        repository.save(dp2)
+        repository.count_at(ts).should == 1
+      end
+    end
+
+    describe "#find_all_distinct_names" do
+      it "returns all distinct names of data points" do
+        dp1 = DataPoint.create_counter(:name => "test.key1", :ts => ts)
+        dp2 = DataPoint.create_counter(:name => "test.key2", :ts => ts + 10)
+        repository.save(dp1)
+        repository.save(dp2)
+        results = repository.find_all_distinct_names
+        results.should include("test.key1")
+        results.should include("test.key2")
+      end
+    end    
+  end
+
+end