http_statsd 0.0.1 → 0.0.2

data/README.md

@@ -62,6 +62,10 @@ c.decrement("metric.counter", sample_rate)
 c.count("metric.counter", 121, sample_rate)
 c.gauge("metric.gauge", 123)
 c.timing("metric.timing", 15.52, sample_rate)
+c.batch do |b| # this will send the metrics as one http request
+  b.increment("metric.counter")
+  b.gauge("metric.gauge", 120)
+end
 ```
 
 ## Contributing

data/lib/http_statsd/client.rb

@@ -12,36 +12,75 @@ module HttpStatsd
     def increment(name, sample_rate = nil)
       query = {:name => name}
       query.merge!({:sample_rate => sample_rate}) if sample_rate
-      request(:increment, query)
+      get(:increment, query)
     end
 
     def decrement(name, sample_rate = nil)
       query = {:name => name}
       query.merge!({:sample_rate => sample_rate}) if sample_rate
-      request(:decrement, query)
+      get(:decrement, query)
     end
 
     def count(name, value, sample_rate = nil)
       query = {:name => name, :value => value}
       query.merge!({:sample_rate => sample_rate}) if sample_rate
-      request(:count, query)
+      get(:count, query)
     end
 
     def gauge(name, value)
       query = {:name => name, :value => value}
-      request(:gauge, query)
+      get(:gauge, query)
     end
 
     def timing(name, value, sample_rate = nil)
       query = {:name => name, :value => value}
       query.merge!({:sample_rate => sample_rate}) if sample_rate
-      request(:timing, query)
+      get(:timing, query)
+    end
+
+    def batch
+      batch_operation = BatchOperation.new
+      yield batch_operation
+      post(:batch, {:metrics => batch_operation.metrics.join("\n")})
     end
 
     private
-    def request(action, query = {})
+    def get(action, query = {})
       options = {:basic_auth => @auth, :query => query}
       self.class.get("#{@base_uri}/#{action}", options)
     end
+
+    def post(action, body = {})
+      options = {:basic_auth => @auth, :body => body}
+      self.class.post("#{@base_uri}/#{action}", options)
+    end
+
+    class BatchOperation
+      attr_accessor :metrics
+
+      def initialize
+        @metrics = []
+      end
+
+      def increment(name, sample_rate = nil)
+        @metrics << "count #{name} 1 #{sample_rate}".strip
+      end
+
+      def decrement(name, sample_rate = nil)
+        @metrics << "count #{name} -1 #{sample_rate}".strip
+      end
+
+      def count(name, value, sample_rate = nil)
+        @metrics << "count #{name} #{value} #{sample_rate}".strip
+      end
+
+      def gauge(name, value)
+        @metrics << "gauge #{name} #{value}".strip
+      end
+
+      def timing(name, value, sample_rate = nil)
+        @metrics << "timing #{name} #{value} #{sample_rate}".strip
+      end
+    end
   end
 end

data/lib/http_statsd/server.rb

@@ -49,6 +49,17 @@ module HttpStatsd
       204
     end
 
+    post '/batch' do
+      metrics = params["metrics"]
+      metrics.split("\n").each do |metric|
+        metric = metric.split
+        args = [metric[0], metric[1], metric[2]]
+        args << metric[3].to_f if metric[3]
+        statsd.send(*args)
+      end
+      201
+    end
+
     get '/' do
       200
     end

data/lib/http_statsd/version.rb

@@ -1,3 +1,3 @@
 module HttpStatsd
-  VERSION = "0.0.1"
+  VERSION = "0.0.2"
 end

data/spec/client_spec.rb

@@ -48,4 +48,61 @@ describe HttpStatsd::Client do
       client.timing("metric.one", 11.1, 0.1)
     end
   end
+
+  describe "batch" do
+    it "should make a single request with multiple metrics" do
+      stub_request(:post, "api1:pass1@localhost/batch").
+        with(:body => {:metrics => "count metric.one 1 0.2\ngauge metric.two 2"})
+      client.batch do |b|
+        b.count("metric.one", 1, 0.2)
+        b.gauge("metric.two", 2)
+      end
+    end
+  end
+
+  describe HttpStatsd::Client::BatchOperation do
+    let(:batch) { HttpStatsd::Client::BatchOperation.new }
+
+    describe "#metrics" do
+      it "is initially an empty array" do
+        batch.metrics.should eql([])
+      end
+    end
+
+    describe "#increment" do
+      it "should add an increment metric to the batch" do
+        batch.increment("metric.one", 0.2)
+        batch.metrics.should eql(["count metric.one 1 0.2"])
+      end
+    end
+
+    describe "#decrement" do
+      it "should add an decrement metric to the batch" do
+        batch.decrement("metric.one", 0.2)
+        batch.metrics.should eql(["count metric.one -1 0.2"])
+      end
+    end
+
+    describe "#count" do
+      it "should add a count metric to the batch" do
+        batch.count("metric.one", 12, 0.2)
+        batch.metrics.should eql(["count metric.one 12 0.2"])
+      end
+    end
+
+    describe "#gauge" do
+      it "should add a gauge metric to the batch" do
+        batch.gauge("metric.one", 12)
+        batch.metrics.should eql(["gauge metric.one 12"])
+      end
+    end
+
+    describe "#timing" do
+      it "should add a timing metric to the batch" do
+        batch.timing("metric.one", 12, 0.2)
+        batch.metrics.should eql(["timing metric.one 12 0.2"])
+      end
+    end
+
+  end
 end

data/spec/server_spec.rb

@@ -67,4 +67,14 @@ describe HttpStatsd::Server do
         :sample_rate => "0.1"
     end
   end
+
+  describe "/batch" do
+    it "should process batch metrics" do
+      statsd.should_receive(:timing).with("metric.one", "11.1", 0.1)
+      statsd.should_receive(:gauge).with("metric.two", "12.2", 0.2)
+      statsd.should_receive(:count).with("metric.three", "13.3", 0.3)
+      post "/batch", :metrics =>
+        "timing metric.one 11.1 0.1\ngauge metric.two 12.2 0.2\n count metric.three 13.3 0.3"
+    end
+  end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: http_statsd
 version: !ruby/object:Gem::Version
-  version: 0.0.1
+  version: 0.0.2
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-09-26 00:00:00.000000000 Z
+date: 2012-10-06 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: sinatra
@@ -160,7 +160,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: 1477210855689509257
+      hash: 3862746067465240188
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements:
@@ -169,7 +169,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: 1477210855689509257
+      hash: 3862746067465240188
 requirements: []
 rubyforge_project: 
 rubygems_version: 1.8.24