simple_metrics 0.3.3 → 0.3.4

data/lib/simple_metrics/data_point.rb

@@ -38,5 +38,33 @@ module SimpleMetrics
       end
     end
     
+    def aggregate_values(dps)
+      raise SimpleMetrics::DataPoint::NonMatchingTypesError if has_non_matching_types?(dps)
+
+      dp       = dps.first.dup
+      dp.value = if dp.counter?
+        sum(dps)
+      elsif dp.gauge?
+        sum(dps) / dps.size
+      elsif dp.event?
+        raise "Implement me!"
+      elsif dp.timing?
+        raise "Implement me!"
+      else
+        raise ArgumentError("Unknown data point type: #{dp}")
+      end
+      dp
+    end
+
+    private
+
+    def sum(dps)
+      dps.map { |dp| dp.value }.inject(0) { |result, value| result += value }
+    end
+
+    def has_non_matching_types?(dps)
+      dps.group_by { |dp| dp.type }.size != 1
+    end
+
   end
 end

data/lib/simple_metrics/graph.rb

@@ -34,7 +34,7 @@ module SimpleMetrics
     def query(bucket, from, to, target)
       if wild_card_query?(target)
         result = bucket.find_all_in_ts_range_by_wildcard(from, to, target)
-        result = ArrayAggregation.aggregate(result, target)
+        result = aggregate(result, target)
         bucket.fill_gaps(from, to, result)
       elsif target.is_a?(String)
         result = bucket.find_all_in_ts_range_by_name(from, to, target)
@@ -46,6 +46,31 @@ module SimpleMetrics
 
     private 
 
+    def aggregate(dps, target)
+      raise SimpleMetrics::DataPoint::NonMatchingTypesError if has_non_matching_types?(dps)
+
+      tmp = {}
+      dps.each do |dp|
+        dp.name = target
+        if tmp.key?(dp.ts)
+          tmp[dp.ts] << dp
+        else
+          tmp[dp.ts] = [dp]
+        end
+      end
+      tmp
+
+      result = []
+      tmp.each_pair do |ts, dps|
+        result << DataPoint.aggregate_values(dps)
+      end
+      result
+    end
+
+    def has_non_matching_types?(dps)
+      dps.group_by { |dp| dp.type }.size != 1
+    end
+
     def one_minute
       60
     end

data/lib/simple_metrics/importer.rb

@@ -22,7 +22,7 @@ module SimpleMetrics
       bucket = Bucket.first
 
       group_by_name(data_points) do |name, dps|
-        dp = aggregate_values(dps)
+        dp = DataPoint.aggregate_values(dps)
         bucket.save(dp, ts)
         update_metric(dp, dps.size)
         aggregate_coarse_buckets(dp)  
@@ -47,32 +47,6 @@ module SimpleMetrics
       end
     end
 
-    def aggregate_values(dps)
-      raise SimpleMetrics::DataPoint::NonMatchingTypesError if has_non_matching_types?(dps)
-
-      dp       = dps.first.dup
-      dp.value = if dp.counter?
-        sum(dps) / dps.size
-      elsif dp.gauge?
-        sum(dps)
-      elsif dp.event?
-        raise "Implement me!"
-      elsif dp.timing?
-        raise "Implement me!"
-      else
-        raise ArgumentError("Unknown data point type: #{dp}")
-      end
-      dp
-    end
-
-    def sum(dps)
-      dps.map { |dp| dp.value }.inject(0) { |result, value| result += value }
-    end
-
-    def has_non_matching_types?(dps)
-      dps.group_by { |dp| dp.type }.size != 1
-    end
-
     def update_metric(dp, total)
       if metric = MetricRepository.find_one_by_name(dp.name)
         metric.total += total

data/lib/simple_metrics/version.rb

@@ -1,4 +1,4 @@
 # encoding: utf-8
 module SimpleMetrics
-  VERSION = "0.3.3"
+  VERSION = "0.3.4"
 end

data/lib/simple_metrics.rb

@@ -12,7 +12,6 @@ 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/array_aggregation"
 require "simple_metrics/importer"
 require "simple_metrics/bucket"
 require "simple_metrics/graph"

data/spec/data_point_spec.rb

@@ -56,7 +56,26 @@ module SimpleMetrics
       it "parses increment timing with sample rate" do
         # TODO
       end
-    end
+    end # describe
+
+    describe "#aggregate" do
+
+      it "aggregate counters" do
+        key1 = DataPoint::Counter.new(:name => "key1", :value => 1)
+        key2 = DataPoint::Counter.new(:name => "key1", :value => 3)
+        result = DataPoint.aggregate_values([key1, key2])
+        result.name.should == "key1"
+        result.value.should == 4
+      end
+
+      it "aggregate gauges" do
+        key1 = DataPoint::Gauge.new(:name => "key1", :value => 1)
+        key2 = DataPoint::Gauge.new(:name => "key1", :value => 3)
+        result = DataPoint.aggregate_values([key1, key2])
+        result.name.should == "key1"
+        result.value.should == 2
+      end
 
+    end # describe
   end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: simple_metrics
 version: !ruby/object:Gem::Version
-  version: 0.3.3
+  version: 0.3.4
   prerelease: 
 platform: ruby
 authors:
@@ -13,7 +13,7 @@ date: 2012-04-13 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rake
-  requirement: &70191513973620 !ruby/object:Gem::Requirement
+  requirement: &70274892543080 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -21,10 +21,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70191513973620
+  version_requirements: *70274892543080
 - !ruby/object:Gem::Dependency
   name: rspec
-  requirement: &70191513972880 !ruby/object:Gem::Requirement
+  requirement: &70274892542460 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -32,10 +32,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70191513972880
+  version_requirements: *70274892542460
 - !ruby/object:Gem::Dependency
   name: rr
-  requirement: &70191513972300 !ruby/object:Gem::Requirement
+  requirement: &70274892541780 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -43,10 +43,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70191513972300
+  version_requirements: *70274892541780
 - !ruby/object:Gem::Dependency
   name: shotgun
-  requirement: &70191513971780 !ruby/object:Gem::Requirement
+  requirement: &70274892541240 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -54,10 +54,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70191513971780
+  version_requirements: *70274892541240
 - !ruby/object:Gem::Dependency
   name: eventmachine
-  requirement: &70191513971140 !ruby/object:Gem::Requirement
+  requirement: &70274892540640 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -65,10 +65,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *70191513971140
+  version_requirements: *70274892540640
 - !ruby/object:Gem::Dependency
   name: daemons
-  requirement: &70191513970580 !ruby/object:Gem::Requirement
+  requirement: &70274892540080 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -76,10 +76,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *70191513970580
+  version_requirements: *70274892540080
 - !ruby/object:Gem::Dependency
   name: mongo
-  requirement: &70191513969960 !ruby/object:Gem::Requirement
+  requirement: &70274892539440 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -87,10 +87,10 @@ dependencies:
         version: '1.6'
   type: :runtime
   prerelease: false
-  version_requirements: *70191513969960
+  version_requirements: *70274892539440
 - !ruby/object:Gem::Dependency
   name: bson
-  requirement: &70191513985680 !ruby/object:Gem::Requirement
+  requirement: &70274892555180 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -98,10 +98,10 @@ dependencies:
         version: '1.6'
   type: :runtime
   prerelease: false
-  version_requirements: *70191513985680
+  version_requirements: *70274892555180
 - !ruby/object:Gem::Dependency
   name: bson_ext
-  requirement: &70191513985040 !ruby/object:Gem::Requirement
+  requirement: &70274892554540 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -109,10 +109,10 @@ dependencies:
         version: '1.6'
   type: :runtime
   prerelease: false
-  version_requirements: *70191513985040
+  version_requirements: *70274892554540
 - !ruby/object:Gem::Dependency
   name: sinatra
-  requirement: &70191513984480 !ruby/object:Gem::Requirement
+  requirement: &70274892553960 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -120,10 +120,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *70191513984480
+  version_requirements: *70274892553960
 - !ruby/object:Gem::Dependency
   name: erubis
-  requirement: &70191513983800 !ruby/object:Gem::Requirement
+  requirement: &70274892553260 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -131,10 +131,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *70191513983800
+  version_requirements: *70274892553260
 - !ruby/object:Gem::Dependency
   name: vegas
-  requirement: &70191513983000 !ruby/object:Gem::Requirement
+  requirement: &70274892552580 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -142,10 +142,10 @@ dependencies:
         version: 0.1.2
   type: :runtime
   prerelease: false
-  version_requirements: *70191513983000
+  version_requirements: *70274892552580
 - !ruby/object:Gem::Dependency
   name: json
-  requirement: &70191513982480 !ruby/object:Gem::Requirement
+  requirement: &70274892551940 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -153,7 +153,7 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *70191513982480
+  version_requirements: *70274892551940
 description: SimpleMetrics
 email:
 - fdietz@gmail.com
@@ -178,7 +178,6 @@ files:
 - example/increment.rb
 - lib/simple_metrics.rb
 - lib/simple_metrics/app.rb
-- lib/simple_metrics/array_aggregation.rb
 - lib/simple_metrics/bucket.rb
 - lib/simple_metrics/configuration.rb
 - lib/simple_metrics/data_point.rb
@@ -215,7 +214,6 @@ files:
 - lib/simple_metrics/views/layout.erb
 - lib/simple_metrics/views/show.erb
 - simple_metrics.gemspec
-- spec/array_aggregation_spec.rb
 - spec/bucket_spec.rb
 - spec/data_point_repository_spec.rb
 - spec/data_point_spec.rb
@@ -237,7 +235,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: 878091864515966970
+      hash: -3260041322875483001
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements:
@@ -246,7 +244,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: 878091864515966970
+      hash: -3260041322875483001
 requirements: []
 rubyforge_project: 
 rubygems_version: 1.8.15
@@ -254,7 +252,6 @@ signing_key:
 specification_version: 3
 summary: SimpleMetrics
 test_files:
-- spec/array_aggregation_spec.rb
 - spec/bucket_spec.rb
 - spec/data_point_repository_spec.rb
 - spec/data_point_spec.rb

data/lib/simple_metrics/array_aggregation.rb

@@ -1,84 +0,0 @@
-module SimpleMetrics
-  module ArrayAggregation
-    extend self
-
-    class Base
-      def aggregate(dps, name = nil)
-        raise "subclass must implement me!"
-      end
-
-      private
-
-      def ts_hash_aggregated(data_points, &block)
-        tmp = {}
-        data_points.each do |dp|
-          if tmp.key?(dp.ts)
-            tmp[dp.ts] = block.call(tmp[dp.ts], dp.value)
-          else
-            tmp[dp.ts] = dp.value
-          end
-        end
-        tmp
-      end
-    end
-
-    class Counter < Base
-      def aggregate(dps, name = nil)
-        tmp_hash = ts_hash_aggregated(dps) do |value1, value2|
-          value1 + value2
-        end
-
-        result = []
-        tmp_hash.each_pair do |key, value|
-          result << SimpleMetrics::DataPoint::Counter.new(:name => name, :ts => key, :value => value)
-        end
-        result
-      end
-    end
-
-    class Gauge < Base
-      def aggregate(dps, name = nil)
-        tmp_hash = ts_hash_aggregated(dps) do |value1, value2|
-          (value1 + value2)/2
-        end
-
-        result = []
-        tmp_hash.each_pair do |key, value|
-          result << SimpleMetrics::DataPoint::Gauge.new(:name => name, :ts => key, :value => value)
-        end
-        result
-      end
-    end
-
-    class Timing < Base
-    end
-
-    class Event < Base
-    end
-
-    def aggregate(dps, name = nil)
-      raise SimpleMetrics::DataPoint::NonMatchingTypesError if has_non_matching_types?(dps)
-
-      dp = dps.first
-      strategy(dp).aggregate(dps, name)
-    end
-
-    private
-
-    def strategy(dp)
-      if dp.counter?
-        Counter.new
-      elsif dp.gauge?
-        Gauge.new
-      elsif dp.timing?
-        Timing.new
-      elsif dp.event?
-        Event.new
-      end
-    end
-
-    def has_non_matching_types?(dps)
-      dps.group_by { |dp| dp.type }.size != 1
-    end
-  end
-end

data/spec/array_aggregation_spec.rb

@@ -1,51 +0,0 @@
-# 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::Counter.new(:name => "com.test.key1", :value => 5, :ts => ts)
-        stats2  =  DataPoint::Counter.new(:name => "com.test.key1", :value => 7, :ts => ts)
-        stats3  =  DataPoint::Counter.new(: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::Gauge.new(:name => "com.test.key1", :value => 5, :ts => ts)
-        stats2  =  DataPoint::Gauge.new(:name => "com.test.key1", :value => 7, :ts => ts)
-        stats3  =  DataPoint::Gauge.new(: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::Counter.new(:name => "com.test.key1", :value => 5, :ts => ts)
-        stats2  =  DataPoint::Gauge.new(: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