statsd 0.5.0 → 0.5.2

data/README.md

@@ -10,7 +10,7 @@ A network daemon for aggregating statistics (counters and timers), rolling them
 
 ### Configuration
 
-Create config.yml to your liking. There are 2 flush protocols: graphite and mongo. The former simple sends to carbon every flush interval. The latter flushes to MongoDB capped collections for 10s and 1min intervals.
+Create config.yml to your liking. There are 2 flush protocols: graphite and mongo. The former simply sends to carbon every flush interval. The latter flushes to MongoDB capped collections for 10s and 1min intervals.
 
 Example config.yml
     ---
@@ -30,7 +30,7 @@ Example config.yml
 
     # If you change these, you need to delete the capped collections yourself!
     # Average mongo record size is 152 bytes
-    # 10s or 1min data is transient so we'll use MongoDB's capped collections. These collections are fixed in size.
+    # 10s and 1min data is transient so we'll use MongoDB's capped collections. These collections are fixed in size.
     # 5min and 1d data is interesting to preserve long-term. These collections are not capped.
     retentions: 
         - name: stats_per_10s
@@ -141,12 +141,18 @@ That translates to:
 This has been a good tradeoff so far between size-of-file (round robin databases are fixed size) and data we care about. Each "stats" database is about 3.2 megs with these retentions.
 
 
+MongoDB
+-------------
+
+Statd::Mongo will flush and aggregate data to a MongoDB. The average record size is 152 bytes. We use capped collections for the transient data and regular collections for long-term storage. 
+
 Inspiration
 -----------
+[Etsy's][etsy] [blog post][blog post].
 
 StatsD was inspired (heavily) by the project (of the same name) at Flickr. Here's a post where Cal Henderson described it in depth:
 [Counting and timing](http://code.flickr.com/blog/2008/10/27/counting-timing/). Cal re-released the code recently: [Perl StatsD](https://github.com/iamcal/Flickr-StatsD)
-Inspired by [Etsy's][etsy] [blog post][blog post].
+
 
 [graphite]: http://graphite.wikidot.com
 [etsy]: http://www.etsy.com

data/lib/statsd/mongo.rb

@@ -92,9 +92,11 @@ module Statsd
       retentions[1..-1].each_with_index do |retention,index|
         # fine_stats_collection = db.collection(retentions[index]['name'])
         coarse_stats_collection = db.collection(retention['name'])
+        puts "Aggregating #{retention['name']}"
         step = retention['seconds']
         current_coarse_bucket = current_bucket / step * step - step
         previous_coarse_bucket = current_coarse_bucket - step
+        puts "#{Time.at(previous_coarse_bucket)}..#{Time.at(current_coarse_bucket)}"
         # Look up previous bucket
         if coarse_stats_collection.find({:ts => previous_coarse_bucket}).count == 0
           # Aggregate
@@ -102,7 +104,7 @@ module Statsd
           stats_to_aggregate = fine_stats_collection.find(
             {:ts => {"$gte" => previous_coarse_bucket, "$lt" => current_coarse_bucket}})
           rows = stats_to_aggregate.to_a
-          count = stats_to_aggregate.count
+          count = rows.count
           rows.group_by {|r| r["stat"] }.each_pair do |name,stats|
             case stats.first['type']
             when 'timer' 
@@ -132,9 +134,9 @@ module Statsd
             else
               raise "unknown type #{stats.first['type']}"
             end
-            docs.push(doc)
+            docs.push(doc) 
           end
-          coarse_stats_collection.insert(docs)          
+          coarse_stats_collection.insert(docs) unless docs.empty?
         end
       end
       

data/lib/statsd/server.rb

@@ -3,7 +3,7 @@ require 'yaml'
 require 'erb'
 module Statsd
   module Server #< EM::Connection  
-    Version = '0.5.0'  
+    Version = '0.5.2'  
     
     FLUSH_INTERVAL = 10
     COUNTERS = {}

data/lib/statsd.rb

@@ -62,9 +62,10 @@ module Statsd
         data.each do |d|
           sock.send(d, 0, host, port)
         end
-      rescue # silent but deadly
+      rescue Exception => e # silent but deadly
+        puts e.message
       ensure
-        sock.close
+        sock.try(:close)
       end
       true
     end

data/statsd.gemspec

@@ -14,9 +14,9 @@ Gem::Specification.new do |s|
   
   s.required_rubygems_version = ">= 1.3.6"
 
-  s.add_dependency "eventmachine",  "~> 0.12.10"
-  s.add_dependency "mongo",         "~> 1.2.4"
-  s.add_dependency "erubis",        "~> 2.6.6"
+  s.add_dependency "eventmachine",  ">= 0.12.10"
+  s.add_dependency "mongo",         ">= 1.2.4"
+  s.add_dependency "erubis",        ">= 2.6.6"
 
   s.files        = `git ls-files`.split("\n")
   s.executables  = `git ls-files`.split("\n").map{|f| f =~ /^bin\/(.*)/ ? $1 : nil}.compact

metadata

@@ -2,7 +2,7 @@
 name: statsd
 version: !ruby/object:Gem::Version 
   prerelease: 
-  version: 0.5.0
+  version: 0.5.2
 platform: ruby
 authors: 
 - Andrew Coldham
@@ -11,7 +11,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-02-25 00:00:00 -08:00
+date: 2011-05-15 00:00:00 -07:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -20,7 +20,7 @@ dependencies:
   requirement: &id001 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
-    - - ~>
+    - - ">="
       - !ruby/object:Gem::Version 
         version: 0.12.10
   type: :runtime
@@ -31,7 +31,7 @@ dependencies:
   requirement: &id002 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
-    - - ~>
+    - - ">="
       - !ruby/object:Gem::Version 
         version: 1.2.4
   type: :runtime
@@ -42,7 +42,7 @@ dependencies:
   requirement: &id003 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
-    - - ~>
+    - - ">="
       - !ruby/object:Gem::Version 
         version: 2.6.6
   type: :runtime
@@ -93,7 +93,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
 requirements: []
 
 rubyforge_project: 
-rubygems_version: 1.5.2
+rubygems_version: 1.6.2
 signing_key: 
 specification_version: 3
 summary: Ruby version of statsd.