instrumental_agent 0.1.6 → 0.2.0

data/Rakefile

@@ -1 +1,9 @@
 require 'bundler/gem_tasks'
+require "rspec/core/rake_task"
+
+task :default => 'spec'
+
+RSpec::Core::RakeTask.new(:spec) do |spec|
+  spec.pattern = 'spec/*_spec.rb'
+  spec.rspec_opts = ['--backtrace']
+end

data/instrumental_agent.gemspec

@@ -14,8 +14,7 @@ Gem::Specification.new do |s|
   s.test_files    = `git ls-files -- {test,spec,features}/*`.split("\n")
   s.executables   = `git ls-files -- bin/*`.split("\n").map{ |f| File.basename(f) }
   s.require_paths = ["lib"]
-
-  s.add_runtime_dependency(%q<eventmachine>, [">= 0"])
+  s.add_development_dependency(%q<rake>, [">= 0"])
   s.add_development_dependency(%q<rspec>, ["~> 2.0"])
   s.add_development_dependency(%q<guard>, [">= 0"])
   s.add_development_dependency(%q<guard-rspec>, [">= 0"])

data/lib/instrumental/agent.rb

@@ -1,23 +1,21 @@
 require 'instrumental/rack/middleware'
 require 'instrumental/version'
-require 'eventmachine'
 require 'logger'
+require 'thread'
+require 'socket'
 
 # Sets up a connection to the collector.
 #
 #  Instrumental::Agent.new(API_KEY)
 module Instrumental
   class Agent
+    BACKOFF = 2.0
+    MAX_RECONNECT_DELAY = 15
+    MAX_BUFFER = 100
+
     attr_accessor :host, :port
     attr_reader :connection, :enabled
     
-    def self.start_reactor
-      unless EM.reactor_running?
-        logger.debug 'Starting EventMachine reactor'
-        Thread.new { EM.run }
-      end
-    end
-
     def self.logger=(l)
       @logger = l
     end
@@ -36,69 +34,12 @@ module Instrumental
       inst
     end
 
-    module ServerConnection
-      BACKOFF = 2
-      MAX_RECONNECT_DELAY = 5
-      MAX_BUFFER = 10
-
-      attr_accessor :agent
-      attr_reader :connected, :failures, :buffer
-
-      def initialize(agent, api_key)
-        @agent = agent
-        @buffer = []
-        @api_key = api_key
-      end
-
-      def logger
-        agent.logger
-      end
-
-      def connection_completed
-        logger.info "connected to collector"
-        @connected = true
-        @failures = 0
-        send_data("hello version #{Instrumental::VERSION}\n")
-        send_data("authenticate #{@api_key}\n") if @api_key
-        dropped = @buffer.dup
-        @buffer = []
-        dropped.each do |msg|
-          send_data(msg)
-        end
-      end
-
-      def receive_data(data)
-        logger.debug "Received: #{data.chomp}"
-      end
-
-      def send_data(data)
-        if @connected
-          super
-        else
-          if @buffer.size < MAX_BUFFER
-            @buffer << data
-          end
-        end
-      end
-
-      def unbind
-        @connected = false
-        @failures = @failures.to_i + 1
-        delay = [@failures ** BACKOFF / 10.to_f, MAX_RECONNECT_DELAY].min
-        logger.info "disconnected, reconnect in #{delay}..."
-        EM::Timer.new(delay) do
-          reconnect(agent.host, agent.port)
-        end
-      end
-
-    end
-
     # Sets up a connection to the collector.
     #
     #  Instrumental::Agent.new(API_KEY)
     #  Instrumental::Agent.new(API_KEY, :collector => 'hostname:port')
     def initialize(api_key, options = {})
-      default_options = { :start_reactor => true, :enabled => true }
+      default_options = { :enabled => true }
       options = default_options.merge(options)
       @api_key = api_key
       if options[:collector]
@@ -110,15 +51,10 @@ module Instrumental
       end
 
       @enabled = options[:enabled]
-
       if @enabled
-        if options[:start_reactor]
-          self.class.start_reactor
-        end
-
-        EM.next_tick do
-          @connection = EM.connect host, port, ServerConnection, self, api_key
-        end
+        @failures = 0
+        @queue = Queue.new
+        start_connection_thread
       end
     end
 
@@ -170,13 +106,71 @@ module Instrumental
     def send_command(cmd, *args)
       if enabled?
         cmd = "%s %s\n" % [cmd, args.collect(&:to_s).join(" ")]
-        logger.debug "Sending: #{cmd.chomp}"
-        EM.next_tick do
-          connection.send_data(cmd)
+        if @queue.size < MAX_BUFFER
+          logger.debug "Queueing: #{cmd.chomp}"
+          @queue << cmd
+        else
+          logger.warn "Dropping command, queue full(#{@queue.size}): #{cmd.chomp}"
         end
       end
     end
 
+    def test_server_connection
+      # FIXME: Test connection state hack
+      begin
+        @socket.read_nonblock(1) # TODO: put data back?
+      rescue Errno::EAGAIN
+        # nop
+      end
+    end
 
+    def start_connection_thread
+      @thread = Thread.new do
+        begin
+          @socket = TCPSocket.new(host, port)
+          @failures = 0
+          logger.info "connected to collector"
+          @socket.puts "hello version 0.0"
+          @socket.puts "authenticate #{@api_key}"
+          loop do
+            command_and_args = @queue.pop
+            begin
+              test_server_connection
+            rescue Exception => err
+              @queue << command_and_args # connection dead, requeue
+              raise err
+            end
+
+            if command_and_args == 'exit'
+              logger.info "exiting, #{@queue.size} commands remain"
+              Thread.exit
+            else
+              logger.debug "Sending: #{command_and_args.chomp}"
+              @socket.puts command_and_args
+            end
+          end
+        rescue Exception => err
+          logger.error err.to_s
+          # FIXME: not always a disconnect
+          @failures += 1
+          delay = [(@failures - 1) ** BACKOFF, MAX_RECONNECT_DELAY].min
+          logger.info "disconnected, reconnect in #{delay}..."
+          sleep delay
+          retry
+        end
+      end
+      at_exit do
+        if !@queue.empty? && @thread.alive?
+          if @failures > 0
+            logger.info "exit received but disconnected, dropping #{@queue.size} commands"
+            @thread.kill
+          else
+            logger.info "exit received, #{@queue.size} commands to be sent"
+            @queue << 'exit'
+            @thread.join
+          end
+        end
+      end
+    end
   end
 end

data/lib/instrumental/version.rb

@@ -1,3 +1,3 @@
 module Instrumental
-  VERSION = "0.1.6"
+  VERSION = "0.2.0"
 end

data/spec/agent_spec.rb

@@ -1,84 +1,97 @@
 require 'spec_helper'
 
+def wait
+  sleep 0.2 # FIXME: hack
+end
+
 describe Instrumental::Agent, "disabled" do
   before do
-    random_port = Time.now.to_i % rand(2000)
-    base_port = 4000
-    @port = base_port + random_port
-    TestServer.start(@port)
+    @server = TestServer.new
+    @agent = Instrumental::Agent.new('test_token', :collector => @server.host_and_port, :enabled => false)
   end
 
   after do
-    TestServer.stop
+    @server.stop
   end
 
-  subject { Instrumental::Agent.new('test_token', :collector => "127.0.0.1:#{@port}", :enabled => false) }
+  it "should not connect to the server" do
+    wait
+    @server.connect_count.should == 0
+  end
 
-  it 'should not connect to the server' do
-    subject.gauge('gauge_test', 123)
-    EM.next do
-      TestServer.last.should be_nil
-    end
+  it "should not connect to the server" do
+    wait
+    @agent.gauge('disabled_test', 1)
+    wait
+    @server.connect_count.should == 0
   end
 
 end
 
-describe Instrumental::Agent do
+describe Instrumental::Agent, "enabled" do
   before do
-    random_port = Time.now.to_i % rand(2000)
-    base_port = 4000
-    @port = base_port + random_port
-    TestServer.start(@port)
+    @server = TestServer.new
+    @agent = Instrumental::Agent.new('test_token', :collector => @server.host_and_port)
   end
 
   after do
-    TestServer.stop
+    @server.stop
   end
 
-  subject { Instrumental::Agent.new('test_token', :collector => "127.0.0.1:#{@port}") }
+  it "should connect to the server" do
+    wait
+    @server.connect_count.should == 1
+  end
 
-  it 'should announce itself including version' do
-    subject.gauge('gauge_test', 123)
-    EM.next do
-      TestServer.last.buffer.first.should match(/hello.*version/)
-    end
+  it "should announce itself, and include version" do
+    wait
+    @server.commands[0].should =~ /hello .*version /
   end
 
-  it 'should authenticate using the token' do
-    subject.gauge('gauge_test', 123)
-    EM.next do
-      TestServer.last.buffer[1].should == "authenticate test_token"
-    end
+  it "should authenticate using the token" do
+    wait
+    @server.commands[1].should == "authenticate test_token"
   end
 
-  it 'should report a gauge to the collector' do
+  it "should report a gauge" do
     now = Time.now
-    subject.gauge('gauge_test', 123)
-    EM.next do
-      TestServer.last.buffer.last.should == "gauge gauge_test 123 #{now.to_i}"
-    end
+    @agent.gauge('gauge_test', 123)
+    wait
+    @server.commands.last.should == "gauge gauge_test 123 #{now.to_i}"
   end
 
-  it 'should report a gauge to the collector with a set time' do
-    subject.gauge('gauge_test', 123, 555)
-    EM.next do
-      TestServer.last.buffer.last.should == 'gauge gauge_test 123 555'
-    end
+  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"
   end
 
-  it "should automatically reconnect" do
-    EM.next do
-      subject.gauge('gauge_test', 123, 555)
-    end
-    EM.next do
-      subject.connection.close_connection(false)
-    end
-    EM.next do
-      subject.gauge('gauge_test', 444, 555)
-    end
-    EM.next do
-      TestServer.last.buffer.last.should == 'gauge gauge_test 444 555'
-    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}"
   end
 
+  it "should report an increment a value" do
+    now = Time.now
+    @agent.increment("increment_test", 2)
+    wait
+    @server.commands.last.should == "increment increment_test 2 #{now.to_i}"
+  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"
+  end
+
+  it "should automatically reconnect" do
+    wait
+    @server.disconnect_all
+    @agent.increment('reconnect_test', 1, 1234) # triggers reconnect
+    wait
+    @server.connect_count.should == 2
+    @server.commands.last.should == "increment reconnect_test 1 1234"
+  end
 end

data/spec/spec_helper.rb

@@ -6,57 +6,9 @@ require 'test_server'
 RSpec.configure do |config|
 
   config.before(:all) do
-    unless EM.reactor_running?
-      EM.error_handler { |*args| 
-        puts "\n"
-        puts "*" * 80
-        puts "EVENTMACHINE ERROR: #{args.inspect}\n" 
-        puts args.first.backtrace.join("\n")
-        puts "*" * 80
-        puts "\n"
-      }
-      Thread.new { EM.run }
-      sleep(0.001) while !EM.reactor_running?
-    end
   end
 
   config.after(:all) do
   end
 
 end
-
-
-module EM
-
-  def self.next(&block)
-    EM.wait_for_events
-    mtx = Mutex.new
-    exc = nil
-    EM.next_tick do
-      mtx.synchronize {
-        begin
-          yield
-        rescue Exception => e
-          exc = e
-        end
-      }
-    end
-    EM.wait_for_events
-    mtx.lock
-    raise exc if exc
-    true
-  end
-
-  def self.wait_for_events
-    raise "Reactor is not running" unless EM.reactor_running?
-    while EM.reactor_running? && !(@next_tick_queue && @next_tick_queue.empty? && @timers && @timers.empty?)
-      sleep(0.01) # This value is REALLY important
-                  # Too low and it doesn't allow 
-                  # local socket events to finish 
-                  # processing
-                  # Too high and it makes the tests 
-                  # slow.  
-    end
-    raise @wrapped_exception if @wrapped_exception
-  end
-end

data/spec/test_server.rb

@@ -1,85 +1,54 @@
-module TestServer
-  CMUTEX = Mutex.new
-
-  def self.start_reactor
-    Thread.new { EM.run } unless EM.reactor_running?
-  end
-
-  def self.start(port)
-    start_reactor
-    unless @sig
-      EM.next_tick {
-        @sig = EventMachine.start_server "127.0.0.1", port, TestServer
-      }
-    end
-  end
-
-  def self.stop
-    if (sig=@sig)
-      EM.next_tick {
-        EventMachine.stop_server sig
-      }
-      @sig = nil
-    end
-  end
-
-  def self.connections
-    CMUTEX.synchronize do 
-      @connections ||= []
-      @connections.dup
-    end
-  end
-
-  def self.add_connection(conn)
-    CMUTEX.synchronize do
-      @connections ||= []
-      @connections << conn
-    end
-  end
-
-  def self.remove_connection(conn)
-    CMUTEX.synchronize do
-      @connections ||= []
-      @connections.delete(conn)
+class TestServer
+  attr_accessor :host, :port, :connect_count, :commands
+
+  def initialize
+    @connect_count = 0
+    @connections = []
+    @commands = []
+    listen
+  end
+
+  def listen
+    @port ||= 10001
+    @server = TCPServer.new(port)
+    Thread.new do
+      begin
+        # puts "listening"
+        socket = @server.accept
+        @connect_count += 1
+        @connections << socket
+        # puts "connection received"
+        loop do
+          command = socket.gets.strip
+          # puts "got: #{command}"
+          commands << command
+        end
+      rescue Exception => err
+        unless @stopping
+          # puts "EXCEPTION:", err unless @stopping
+          retry
+        end
+      end
     end
+    # puts "server up"
+  rescue Exception => err
+    # FIXME: doesn't seem to be detecting failures of listen
+    puts "failed to get port"
+    @port += 1
+    retry
   end
 
-  def self.last
-    connections.last
-  end
-
-  def post_init
-    TestServer.add_connection(self)
-  end
-
-  def receive_data data
-    buffer_response(data)
-  end
-
-  def unbind
-    TestServer.remove_connection(self)
+  def host_and_port
+    "#{host}:#{port}"
   end
 
-  def last_message
-    buffer.last
+  def stop
+    @stopping = true
+    disconnect_all
+    @server.close # FIXME: necessary?
   end
 
-  def buffer
-    @buffer ||= []
-    @buffer.dup
-  end
-
-  def clear_buffer!
-    @buffer = []
-  end
-
-  def buffer_response(dt)
-    @buffer ||= []
-    dt.split(/\n/).each do |measurement|
-      @buffer << measurement
-    end
-    dt
+  def disconnect_all
+    @connections.each { |c| c.close rescue false }
   end
 end
-
-

metadata

@@ -1,92 +1,120 @@
---- !ruby/object:Gem::Specification
+--- !ruby/object:Gem::Specification 
 name: instrumental_agent
-version: !ruby/object:Gem::Version
-  version: 0.1.6
+version: !ruby/object:Gem::Version 
+  hash: 23
   prerelease: 
+  segments: 
+  - 0
+  - 2
+  - 0
+  version: 0.2.0
 platform: ruby
-authors:
+authors: 
 - Elijah Miller
 - Christopher Zelenak
 - Kristopher Chambers
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2011-11-14 00:00:00.000000000Z
-dependencies:
-- !ruby/object:Gem::Dependency
-  name: eventmachine
-  requirement: &70095834702400 !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - ! '>='
-      - !ruby/object:Gem::Version
-        version: '0'
-  type: :runtime
+
+date: 2011-11-15 00:00:00 -05:00
+default_executable: 
+dependencies: 
+- !ruby/object:Gem::Dependency 
+  name: rake
   prerelease: false
-  version_requirements: *70095834702400
-- !ruby/object:Gem::Dependency
+  requirement: &id001 !ruby/object:Gem::Requirement 
+    none: false
+    requirements: 
+    - - ">="
+      - !ruby/object:Gem::Version 
+        hash: 3
+        segments: 
+        - 0
+        version: "0"
+  type: :development
+  version_requirements: *id001
+- !ruby/object:Gem::Dependency 
   name: rspec
-  requirement: &70095834701400 !ruby/object:Gem::Requirement
+  prerelease: false
+  requirement: &id002 !ruby/object:Gem::Requirement 
     none: false
-    requirements:
+    requirements: 
     - - ~>
-      - !ruby/object:Gem::Version
-        version: '2.0'
+      - !ruby/object:Gem::Version 
+        hash: 3
+        segments: 
+        - 2
+        - 0
+        version: "2.0"
   type: :development
-  prerelease: false
-  version_requirements: *70095834701400
-- !ruby/object:Gem::Dependency
+  version_requirements: *id002
+- !ruby/object:Gem::Dependency 
   name: guard
-  requirement: &70095834700420 !ruby/object:Gem::Requirement
+  prerelease: false
+  requirement: &id003 !ruby/object:Gem::Requirement 
     none: false
-    requirements:
-    - - ! '>='
-      - !ruby/object:Gem::Version
-        version: '0'
+    requirements: 
+    - - ">="
+      - !ruby/object:Gem::Version 
+        hash: 3
+        segments: 
+        - 0
+        version: "0"
   type: :development
-  prerelease: false
-  version_requirements: *70095834700420
-- !ruby/object:Gem::Dependency
+  version_requirements: *id003
+- !ruby/object:Gem::Dependency 
   name: guard-rspec
-  requirement: &70095834699460 !ruby/object:Gem::Requirement
+  prerelease: false
+  requirement: &id004 !ruby/object:Gem::Requirement 
     none: false
-    requirements:
-    - - ! '>='
-      - !ruby/object:Gem::Version
-        version: '0'
+    requirements: 
+    - - ">="
+      - !ruby/object:Gem::Version 
+        hash: 3
+        segments: 
+        - 0
+        version: "0"
   type: :development
-  prerelease: false
-  version_requirements: *70095834699460
-- !ruby/object:Gem::Dependency
+  version_requirements: *id004
+- !ruby/object:Gem::Dependency 
   name: growl_notify
-  requirement: &70095834698100 !ruby/object:Gem::Requirement
+  prerelease: false
+  requirement: &id005 !ruby/object:Gem::Requirement 
     none: false
-    requirements:
-    - - ! '>='
-      - !ruby/object:Gem::Version
-        version: '0'
+    requirements: 
+    - - ">="
+      - !ruby/object:Gem::Version 
+        hash: 3
+        segments: 
+        - 0
+        version: "0"
   type: :development
-  prerelease: false
-  version_requirements: *70095834698100
-- !ruby/object:Gem::Dependency
+  version_requirements: *id005
+- !ruby/object:Gem::Dependency 
   name: rb-fsevent
-  requirement: &70095834697380 !ruby/object:Gem::Requirement
+  prerelease: false
+  requirement: &id006 !ruby/object:Gem::Requirement 
     none: false
-    requirements:
-    - - ! '>='
-      - !ruby/object:Gem::Version
-        version: '0'
+    requirements: 
+    - - ">="
+      - !ruby/object:Gem::Version 
+        hash: 3
+        segments: 
+        - 0
+        version: "0"
   type: :development
-  prerelease: false
-  version_requirements: *70095834697380
+  version_requirements: *id006
 description: Keep track of anything.
-email:
+email: 
 - support@instrumentalapp.com
-executables:
+executables: 
 - instrument_server
 extensions: []
+
 extra_rdoc_files: []
-files:
+
+files: 
 - .gitignore
 - Gemfile
 - Guardfile
@@ -104,31 +132,41 @@ files:
 - spec/agent_spec.rb
 - spec/spec_helper.rb
 - spec/test_server.rb
+has_rdoc: true
 homepage: http://github.com/fastestforward/instrumental_agent
 licenses: []
+
 post_install_message: 
 rdoc_options: []
-require_paths:
+
+require_paths: 
 - lib
-required_ruby_version: !ruby/object:Gem::Requirement
+required_ruby_version: !ruby/object:Gem::Requirement 
   none: false
-  requirements:
-  - - ! '>='
-    - !ruby/object:Gem::Version
-      version: '0'
-required_rubygems_version: !ruby/object:Gem::Requirement
+  requirements: 
+  - - ">="
+    - !ruby/object:Gem::Version 
+      hash: 3
+      segments: 
+      - 0
+      version: "0"
+required_rubygems_version: !ruby/object:Gem::Requirement 
   none: false
-  requirements:
-  - - ! '>='
-    - !ruby/object:Gem::Version
-      version: '0'
+  requirements: 
+  - - ">="
+    - !ruby/object:Gem::Version 
+      hash: 3
+      segments: 
+      - 0
+      version: "0"
 requirements: []
+
 rubyforge_project: 
-rubygems_version: 1.8.10
+rubygems_version: 1.6.1
 signing_key: 
 specification_version: 3
 summary: Agent for reporting data to instrumentalapp.com
-test_files:
+test_files: 
 - spec/agent_spec.rb
 - spec/spec_helper.rb
 - spec/test_server.rb