instrumental_agent 0.10.1 → 0.11.0

data/CHANGELOG.md

@@ -1,4 +1,7 @@
-### 0.10.14 [July 16th, 2012]
+### 0.11.0 [July 18th, 2012]
+* Allow passing count to increment and gauge calls for pre-aggregated values
+
+### 0.10.1 [July 16th, 2012]
 * Fix issue with Etc not being required
 
 ### 0.10.0 [July 6th, 2012]

data/lib/instrumental/agent.rb

@@ -104,9 +104,9 @@ module Instrumental
     # Store a gauge for a metric, optionally at a specific time.
     #
     #  agent.gauge('load', 1.23)
-    def gauge(metric, value, time = Time.now)
-      if valid?(metric, value, time) &&
-          send_command("gauge", metric, value, time.to_i)
+    def gauge(metric, value, time = Time.now, count = 1)
+      if valid?(metric, value, time, count) &&
+          send_command("gauge", metric, value, time.to_i, count.to_i)
         value
       else
         nil
@@ -152,9 +152,9 @@ module Instrumental
     # Increment a metric, optionally more than one or at a specific time.
     #
     #  agent.increment('users')
-    def increment(metric, value = 1, time = Time.now)
-      if valid?(metric, value, time) &&
-          send_command("increment", metric, value, time.to_i)
+    def increment(metric, value = 1, time = Time.now, count = 1)
+      if valid?(metric, value, time, count) &&
+          send_command("increment", metric, value, time.to_i, count.to_i)
         value
       else
         nil
@@ -258,7 +258,7 @@ module Instrumental
       note !~ /[\n\r]/
     end
 
-    def valid?(metric, value, time)
+    def valid?(metric, value, time, count)
       valid_metric = metric =~ /^([\d\w\-_]+\.)*[\d\w\-_]+$/i
       valid_value  = value.to_s =~ /^-?\d+(\.\d+)?(e-\d+)?$/
 

data/lib/instrumental/version.rb

@@ -1,3 +1,3 @@
 module Instrumental
-  VERSION = '0.10.1'
+  VERSION = '0.11.0'
 end

data/spec/agent_spec.rb

@@ -89,7 +89,7 @@ describe Instrumental::Agent, "enabled" do
     now = Time.now
     @agent.gauge('gauge_test', 123)
     wait
-    @server.commands.last.should == "gauge gauge_test 123 #{now.to_i}"
+    @server.commands.last.should == "gauge gauge_test 123 #{now.to_i} 1"
   end
 
   it "should report a time as gauge and return the block result" do
@@ -111,14 +111,20 @@ describe Instrumental::Agent, "enabled" do
   it "should report a gauge with a set time" do
     @agent.gauge('gauge_test', 123, 555)
     wait
-    @server.commands.last.should == "gauge gauge_test 123 555"
+    @server.commands.last.should == "gauge gauge_test 123 555 1"
+  end
+
+  it "should report a gauge with a set time and count" do
+    @agent.gauge('gauge_test', 123, 555, 111)
+    wait
+    @server.commands.last.should == "gauge gauge_test 123 555 111"
   end
 
   it "should report an increment" do
     now = Time.now
     @agent.increment("increment_test")
     wait
-    @server.commands.last.should == "increment increment_test 1 #{now.to_i}"
+    @server.commands.last.should == "increment increment_test 1 #{now.to_i} 1"
   end
 
   it "should return the value incremented by" do
@@ -132,13 +138,19 @@ describe Instrumental::Agent, "enabled" do
     now = Time.now
     @agent.increment("increment_test", 2)
     wait
-    @server.commands.last.should == "increment increment_test 2 #{now.to_i}"
+    @server.commands.last.should == "increment increment_test 2 #{now.to_i} 1"
   end
 
   it "should report an increment with a set time" do
     @agent.increment('increment_test', 1, 555)
     wait
-    @server.commands.last.should == "increment increment_test 1 555"
+    @server.commands.last.should == "increment increment_test 1 555 1"
+  end
+
+  it "should report an increment with a set time and count" do
+    @agent.increment('increment_test', 1, 555, 111)
+    wait
+    @server.commands.last.should == "increment increment_test 1 555 111"
   end
 
   it "should discard data that overflows the buffer" do
@@ -147,11 +159,11 @@ describe Instrumental::Agent, "enabled" do
         @agent.increment('overflow_test', i + 1, 300)
       end
       wait
-      @server.commands.should     include("increment overflow_test 1 300")
-      @server.commands.should     include("increment overflow_test 2 300")
-      @server.commands.should     include("increment overflow_test 3 300")
-      @server.commands.should_not include("increment overflow_test 4 300")
-      @server.commands.should_not include("increment overflow_test 5 300")
+      @server.commands.should     include("increment overflow_test 1 300 1")
+      @server.commands.should     include("increment overflow_test 2 300 1")
+      @server.commands.should     include("increment overflow_test 3 300 1")
+      @server.commands.should_not include("increment overflow_test 4 300 1")
+      @server.commands.should_not include("increment overflow_test 5 300 1")
     end
   end
 
@@ -163,11 +175,11 @@ describe Instrumental::Agent, "enabled" do
       end
       @agent.instance_variable_get(:@queue).size.should == 0
       wait # let the server receive the commands
-      @server.commands.should include("increment overflow_test 1 300")
-      @server.commands.should include("increment overflow_test 2 300")
-      @server.commands.should include("increment overflow_test 3 300")
-      @server.commands.should include("increment overflow_test 4 300")
-      @server.commands.should include("increment overflow_test 5 300")
+      @server.commands.should include("increment overflow_test 1 300 1")
+      @server.commands.should include("increment overflow_test 2 300 1")
+      @server.commands.should include("increment overflow_test 3 300 1")
+      @server.commands.should include("increment overflow_test 4 300 1")
+      @server.commands.should include("increment overflow_test 5 300 1")
     end
   end
 
@@ -181,9 +193,9 @@ describe Instrumental::Agent, "enabled" do
     @agent.increment('fork_reconnect_test', 1, 4) # triggers reconnect
     wait
     @server.connect_count.should == 2
-    @server.commands.should include("increment fork_reconnect_test 1 2")
-    @server.commands.should include("increment fork_reconnect_test 1 3")
-    @server.commands.should include("increment fork_reconnect_test 1 4")
+    @server.commands.should include("increment fork_reconnect_test 1 2 1")
+    @server.commands.should include("increment fork_reconnect_test 1 3 1")
+    @server.commands.should include("increment fork_reconnect_test 1 4 1")
   end
 
   it "should never let an exception reach the user" do
@@ -298,7 +310,7 @@ describe Instrumental::Agent, "connection problems" do
     @agent.increment('reconnect_test', 1, 5678) # triggers reconnect
     wait
     @server.connect_count.should == 2
-    @server.commands.last.should == "increment reconnect_test 1 5678"
+    @server.commands.last.should == "increment reconnect_test 1 5678 1"
   end
 
   it "should buffer commands when server is down" do
@@ -307,7 +319,7 @@ describe Instrumental::Agent, "connection problems" do
     wait
     @agent.increment('reconnect_test', 1, 1234)
     wait
-    @agent.queue.pop(true).should include("increment reconnect_test 1 1234\n")
+    @agent.queue.pop(true).should include("increment reconnect_test 1 1234 1\n")
   end
 
   it "should buffer commands when server is not responsive" do
@@ -316,7 +328,7 @@ describe Instrumental::Agent, "connection problems" do
     wait
     @agent.increment('reconnect_test', 1, 1234)
     wait
-    @agent.queue.pop(true).should include("increment reconnect_test 1 1234\n")
+    @agent.queue.pop(true).should include("increment reconnect_test 1 1234 1\n")
   end
 
   it "should buffer commands when authentication fails" do
@@ -325,7 +337,7 @@ describe Instrumental::Agent, "connection problems" do
     wait
     @agent.increment('reconnect_test', 1, 1234)
     wait
-    @agent.queue.pop(true).should include("increment reconnect_test 1 1234\n")
+    @agent.queue.pop(true).should include("increment reconnect_test 1 1234 1\n")
   end
 
   it "should send commands in a short-lived process" do
@@ -333,7 +345,7 @@ describe Instrumental::Agent, "connection problems" do
     @agent = Instrumental::Agent.new('test_token', :collector => @server.host_and_port, :synchronous => false)
     if pid = fork { @agent.increment('foo', 1, 1234) }
       Process.wait(pid)
-      @server.commands.last.should == "increment foo 1 1234"
+      @server.commands.last.should == "increment foo 1 1234 1"
     end
   end
 
@@ -342,7 +354,7 @@ describe Instrumental::Agent, "connection problems" do
     @agent = Instrumental::Agent.new('test_token', :collector => @server.host_and_port, :synchronous => false)
     if pid = fork { @agent.increment('foo', 1, 1234); @agent.cleanup; exit! }
       Process.wait(pid)
-      @server.commands.last.should == "increment foo 1 1234"
+      @server.commands.last.should == "increment foo 1 1234 1"
     end
   end
 
@@ -393,11 +405,11 @@ describe Instrumental::Agent, "enabled with sync option" do
         @agent.increment('overflow_test', i + 1, 300)
       end
       wait # let the server receive the commands
-      @server.commands.should include("increment overflow_test 1 300")
-      @server.commands.should include("increment overflow_test 2 300")
-      @server.commands.should include("increment overflow_test 3 300")
-      @server.commands.should include("increment overflow_test 4 300")
-      @server.commands.should include("increment overflow_test 5 300")
+      @server.commands.should include("increment overflow_test 1 300 1")
+      @server.commands.should include("increment overflow_test 2 300 1")
+      @server.commands.should include("increment overflow_test 3 300 1")
+      @server.commands.should include("increment overflow_test 4 300 1")
+      @server.commands.should include("increment overflow_test 5 300 1")
     end
   end
 

data/spec/test_server.rb

@@ -22,7 +22,7 @@ class TestServer
 
   def listen
     @port ||= 10001
-    @server = TCPServer.new(port)
+    @server = TCPServer.new(@port)
     @main_thread = Thread.new do
       begin
         # puts "listening"
@@ -66,9 +66,8 @@ class TestServer
       end
     end
     # puts "server up"
-  rescue Exception => err
-    # FIXME: doesn't seem to be detecting failures of listen
-    puts "failed to get port"
+  rescue Errno::EADDRINUSE => err
+    puts "#{err.inspect} failed to get port #{@port}"
     puts err.message
     @port += 1
     retry

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: instrumental_agent
 version: !ruby/object:Gem::Version
-  version: 0.10.1
+  version: 0.11.0
   prerelease: 
 platform: ruby
 authors:
@@ -12,7 +12,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-07-17 00:00:00.000000000 Z
+date: 2012-07-18 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rake
@@ -163,7 +163,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: 726264151342751861
+      hash: 3962445829990245099
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements:
@@ -172,7 +172,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: 726264151342751861
+      hash: 3962445829990245099
 requirements: []
 rubyforge_project: 
 rubygems_version: 1.8.24