fozzie 0.0.13 → 0.0.14

data/Guardfile

@@ -0,0 +1,9 @@
+# A sample Guardfile
+# More info at https://github.com/guard/guard#readme
+
+guard 'rspec', :version => 2 do
+  watch(%r{^spec/.+_spec\.rb$})
+  watch(%r{^lib/(.+)\.rb$})     { |m| "spec/lib/#{m[1]}_spec.rb" }
+  watch('spec/spec_helper.rb')  { "spec" }
+end
+

data/fozzie.gemspec

@@ -17,7 +17,6 @@ Gem::Specification.new do |s|
   s.executables   = `git ls-files -- bin/*`.split("\n").map{ |f| File.basename(f) }
   s.require_paths = ["lib"]
 
-  s.add_dependency 'statsd-ruby'
   s.add_development_dependency 'rake'
   s.add_development_dependency 'rspec'
   s.add_development_dependency 'mocha'
@@ -26,4 +25,6 @@ Gem::Specification.new do |s|
   s.add_development_dependency 'simplecov'
   s.add_development_dependency 'sinatra'
   s.add_development_dependency 'actionpack'
+  s.add_development_dependency 'guard'
+  s.add_development_dependency 'guard-rspec'
 end

data/lib/fozzie/classes.rb

@@ -1,39 +1,89 @@
-require 'statsd'
-
 module Fozzie
   module Classes
 
-    class AbstractFozzie < Statsd
+    class AbstractFozzie
+
+      RESERVED_CHARS_REGEX = /[\:\|\@]/
 
       attr_reader :prefix, :configuration
 
-      def initialize
-        @namespace = Fozzie.c.data_prefix
-        super Fozzie.c.host, Fozzie.c.port
+      # Sends an increment (count = 1) for the given stat to the statsd server.
+      #
+      # @param stat (see #count)
+      # @param sample_rate (see #count)
+      # @see #count
+      def increment(stat, sample_rate=1)
+        count(stat, 1, sample_rate)
+      end
+
+      # Sends a decrement (count = -1) for the given stat to the statsd server.
+      #
+      # @param stat (see #count)
+      # @param sample_rate (see #count)
+      # @see #count
+      def decrement(stat, sample_rate=1)
+        count(stat, -1, sample_rate)
+      end
+
+      # Sends an arbitrary count for the given stat to the statsd server.
+      #
+      # @param [String] stat stat name
+      # @param [Integer] count count
+      # @param [Integer] sample_rate sample rate, 1 for always
+      def count(stat, count, sample_rate=1)
+        send(stat, count, 'c', sample_rate)
+      end
+
+      # Sends a timing (in ms) for the given stat to the statsd server. The
+      # sample_rate determines what percentage of the time this report is sent. The
+      # statsd server then uses the sample_rate to correctly track the average
+      # timing for the stat.
+      #
+      # @param stat stat name
+      # @param [Integer] ms timing in milliseconds
+      # @param [Integer] sample_rate sample rate, 1 for always
+      def timing(stat, ms, sample_rate=1)
+        send(stat, ms, 'ms', sample_rate)
+      end
+
+      # Reports execution time of the provided block using {#timing}.
+      #
+      # @param stat (see #timing)
+      # @param sample_rate (see #timing)
+      # @yield The operation to be timed
+      # @see #timing
+      # @example Report the time (in ms) taken to activate an account
+      #   $statsd.time('account.activate') { @account.activate! }
+      def time(stat, sample_rate=1)
+        stat   = stat.flatten.join('.') if stat.kind_of?(Array)
+        start  = Time.now
+        result = yield
+        timing(stat, ((Time.now - start) * 1000).round, sample_rate)
+        result
+      end
 
-        self
+      def time_to_do(stat, sample_rate=1, &block)
+        time_for(stat, sample_rate, &block)
       end
 
-      def time_to_do(stat, sample_rate=1, &block); time_for(stat, sample_rate, &block); end
       def time_for(stat, sample_rate=1, &block)
-        stat = stat.flatten.join('.') if stat.kind_of?(Array)
         time(stat, sample_rate, &block)
       end
 
-      def committed; commit; end
       def commit
         event :commit
       end
+      def committed; commit; end
 
-      def build; built; end
       def built
         event :build
       end
+      def build; built; end
 
-      def deploy(app = nil); deployed(app); end
       def deployed(app = nil)
         event :deploy, app
       end
+      def deploy(app = nil); deployed(app); end
 
       def increment_on(stat, perf, sample_rate=1)
         key = "#{stat}.%s" % (perf ? "success" : "fail")
@@ -41,6 +91,14 @@ module Fozzie
         perf
       end
 
+      def logger
+        self.class.logger
+      end
+
+      def self.logger
+        @logger
+      end
+
       private
 
       def event(type, app = nil)
@@ -50,18 +108,30 @@ module Fozzie
       end
 
       def send_to_socket(message)
+        return false if Fozzie.c.ip_from_host.blank?
         begin
-          ip = Fozzie.c.ip_from_host
-          raise RuntimeError, "Could not locate IP" unless ip
-
           self.class.logger.debug {"Statsd: #{message}"} if self.class.logger
-          socket.send(message, 0, ip, Fozzie.c.port)
-        rescue SocketError, RuntimeError => exc
+          socket.send(message, 0, Fozzie.c.ip_from_host, Fozzie.c.port)
+        rescue SocketError, RuntimeError, Errno::EADDRNOTAVAIL, Timeout::Error => exc
           self.class.logger.debug {"Statsd Failure: #{exc.message}"} if self.class.logger
           nil
         end
       end
 
+      def sampled(sample_rate)
+        yield unless sample_rate < 1 and rand > sample_rate
+      end
+
+      def send(stat, delta, type, sample_rate)
+        prefix = "#{Fozzie.c.data_prefix}." unless Fozzie.c.data_prefix.nil?
+        stat = stat.to_s.gsub('::', '.').gsub(RESERVED_CHARS_REGEX, '_')
+        sampled(sample_rate) { send_to_socket("#{prefix}#{stat}:#{delta}|#{type}#{'|@' << sample_rate.to_s if sample_rate < 1}") }
+      end
+
+      def socket
+        @socket ||= UDPSocket.new
+      end
+
     end
 
     def self.included(klass)

data/lib/fozzie/configuration.rb

@@ -1,5 +1,6 @@
 require 'core_ext/hash'
 require 'resolv'
+require 'timeout'
 
 module Fozzie
 
@@ -7,11 +8,12 @@ module Fozzie
   # that will be used within the Fozzie codebase.
   class Configuration
 
-    attr_accessor :env, :config_path, :host, :port, :appname, :namespaces
+    attr_accessor :env, :config_path, :host, :port, :appname, :namespaces, :timeout
 
     def initialize(args = {})
       merge_and_assign_config(args)
-
+      self.ip_from_host
+      self.origin_name
       self
     end
 
@@ -50,14 +52,19 @@ module Fozzie
         :config_path => '',
         :env         => (ENV['RACK_ENV'] || ENV['RAILS_ENV'] || 'development'),
         :appname     => '',
-        :namespaces  => %w{Stats S Statistics Warehouse}
+        :namespaces  => %w{Stats S Statistics Warehouse},
+        :timeout     => 5
       }.dup
     end
 
     def host_to_ip
       return self.host unless self.host.match(ip_address_regex).nil?
-      ips = Resolv.getaddresses(self.host)
-      ips.compact.reject {|ip| ip.to_s.match(ip_address_regex).nil? }.first unless ips.nil?
+      ips = begin 
+        Timeout.timeout(self.timeout) { Resolv.getaddresses(self.host) }
+      rescue Timeout::Error => exc
+        []
+      end
+      (ips.empty? ? "" : ips.compact.reject {|ip| ip.to_s.match(ip_address_regex).nil? }.first || "")
     end
 
     def ip_address_regex

data/lib/fozzie/rails/middleware.rb

@@ -11,8 +11,8 @@ module Fozzie
         begin
           routing = (rails_version == 3 ? ::Rails.application.routes : ::ActionController::Routing::Routes)
           path    = routing.recognize_path(path_str)
-
-          [path[:controller], path[:action], "render"].join('.')
+          stat    = [path[:controller], path[:action], "render"].join('.')
+          stat
         rescue ActionController::RoutingError => exc
           S.increment "routing.error"
           nil

data/lib/fozzie/version.rb

@@ -1,3 +1,3 @@
 module Fozzie
-  VERSION = "0.0.13"
+  VERSION = "0.0.14"
 end

data/spec/lib/fozzie/configuration_spec.rb

@@ -59,11 +59,10 @@ describe Fozzie::Configuration do
     end
 
     it "assigns nil on miss" do
-      Resolv.expects(:getaddresses).with('some.awesome.log.server').returns([]).twice
-
+      Resolv.expects(:getaddresses).with('some.awesome.log.server').returns([])
       c = Fozzie::Configuration.new({:env => 'test', :config_path => nil, :host => 'some.awesome.log.server'})
-      c.ip_from_host.should == nil
-      c.ip_from_host.should == nil
+      c.ip_from_host.should == ""
+      c.ip_from_host.should == ""
     end
 
     it "looks up ip from host" do
@@ -74,7 +73,13 @@ describe Fozzie::Configuration do
     it "caches the ip once it is retrieved" do
       Resolv.expects(:getaddresses).with('lonelyplanet.com').returns(["1.1.1.1"])
       c = Fozzie::Configuration.new({:env => 'test', :config_path => nil, :host => 'lonelyplanet.com'})
-      c.ip_from_host.should == c.ip_from_host
+      c.ip_from_host.should == "1.1.1.1"
+    end
+
+    it "raises Timeout on slow lookup" do
+      Resolv.stubs(:getaddresses).with('lonelyplanet.com') {|val| sleep 0.6; [] }
+      c = Fozzie::Configuration.new(:env => 'test', :config_path => nil, :host => 'lonelyplanet.com', :timeout => 0.5)
+      c.ip_from_host.should == ""
     end
 
   end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: fozzie
 version: !ruby/object:Gem::Version
-  version: 0.0.13
+  version: 0.0.14
   prerelease: 
 platform: ruby
 authors:
@@ -9,22 +9,11 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-02-14 00:00:00.000000000 Z
+date: 2012-03-02 00:00:00.000000000 Z
 dependencies:
-- !ruby/object:Gem::Dependency
-  name: statsd-ruby
-  requirement: &70101336334120 !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - ! '>='
-      - !ruby/object:Gem::Version
-        version: '0'
-  type: :runtime
-  prerelease: false
-  version_requirements: *70101336334120
 - !ruby/object:Gem::Dependency
   name: rake
-  requirement: &70101336333380 !ruby/object:Gem::Requirement
+  requirement: &70330128630360 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -32,10 +21,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70101336333380
+  version_requirements: *70330128630360
 - !ruby/object:Gem::Dependency
   name: rspec
-  requirement: &70101336332560 !ruby/object:Gem::Requirement
+  requirement: &70330128629920 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -43,10 +32,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70101336332560
+  version_requirements: *70330128629920
 - !ruby/object:Gem::Dependency
   name: mocha
-  requirement: &70101336331840 !ruby/object:Gem::Requirement
+  requirement: &70330128629460 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -54,10 +43,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70101336331840
+  version_requirements: *70330128629460
 - !ruby/object:Gem::Dependency
   name: syntax
-  requirement: &70101336496260 !ruby/object:Gem::Requirement
+  requirement: &70330128629020 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -65,10 +54,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70101336496260
+  version_requirements: *70330128629020
 - !ruby/object:Gem::Dependency
   name: rack-test
-  requirement: &70101336495340 !ruby/object:Gem::Requirement
+  requirement: &70330128628580 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -76,10 +65,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70101336495340
+  version_requirements: *70330128628580
 - !ruby/object:Gem::Dependency
   name: simplecov
-  requirement: &70101336494540 !ruby/object:Gem::Requirement
+  requirement: &70330128628160 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -87,10 +76,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70101336494540
+  version_requirements: *70330128628160
 - !ruby/object:Gem::Dependency
   name: sinatra
-  requirement: &70101336493560 !ruby/object:Gem::Requirement
+  requirement: &70330128627720 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -98,10 +87,32 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70101336493560
+  version_requirements: *70330128627720
 - !ruby/object:Gem::Dependency
   name: actionpack
-  requirement: &70101336492460 !ruby/object:Gem::Requirement
+  requirement: &70330128627260 !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :development
+  prerelease: false
+  version_requirements: *70330128627260
+- !ruby/object:Gem::Dependency
+  name: guard
+  requirement: &70330128626840 !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :development
+  prerelease: false
+  version_requirements: *70330128626840
+- !ruby/object:Gem::Dependency
+  name: guard-rspec
+  requirement: &70330128626400 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -109,7 +120,7 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70101336492460
+  version_requirements: *70330128626400
 description: Gem allows statistics gathering from Ruby and Ruby on Rails applications
   to Statsd
 email:
@@ -121,6 +132,7 @@ files:
 - .gitignore
 - .rvmrc
 - Gemfile
+- Guardfile
 - README.md
 - Rakefile
 - fozzie.gemspec
@@ -156,7 +168,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: 2372667692060957828
+      hash: -2167407767466603242
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements:
@@ -165,7 +177,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: 2372667692060957828
+      hash: -2167407767466603242
 requirements: []
 rubyforge_project: fozzie
 rubygems_version: 1.8.10