fozzie 0.0.12 → 0.0.13

data/lib/fozzie/classes.rb

@@ -4,11 +4,14 @@ module Fozzie
   module Classes
 
     class AbstractFozzie < Statsd
-      attr_reader :prefix
 
-      def initialize(host, port, prefix = nil)
-        @namespace = prefix unless prefix.nil?
-        super host, port
+      attr_reader :prefix, :configuration
+
+      def initialize
+        @namespace = Fozzie.c.data_prefix
+        super Fozzie.c.host, Fozzie.c.port
+
+        self
       end
 
       def time_to_do(stat, sample_rate=1, &block); time_for(stat, sample_rate, &block); end
@@ -48,21 +51,23 @@ module Fozzie
 
       def send_to_socket(message)
         begin
-          super(message)
-        rescue SocketError => exc
+          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
+          self.class.logger.debug {"Statsd Failure: #{exc.message}"} if self.class.logger
           nil
         end
       end
 
     end
 
-    NAMESPACES = %w{Stats S Statistics Warehouse}
-
     def self.included(klass)
-      host, port, prefix = Fozzie.c.host, Fozzie.c.port, Fozzie.c.data_prefix
-      NAMESPACES.each do |klas|
+      Fozzie.c.namespaces.each do |klas|
         # set a constant
-        Kernel.const_set(klas, AbstractFozzie.new(host, port, prefix)) unless const_defined?(klas)
+        Kernel.const_set(klas, AbstractFozzie.new) unless const_defined?(klas)
       end
     end
 

data/lib/fozzie/configuration.rb

@@ -1,4 +1,5 @@
 require 'core_ext/hash'
+require 'resolv'
 
 module Fozzie
 
@@ -6,7 +7,7 @@ module Fozzie
   # that will be used within the Fozzie codebase.
   class Configuration
 
-    attr_accessor :env, :config_path, :host, :port, :appname
+    attr_accessor :env, :config_path, :host, :port, :appname, :namespaces
 
     def initialize(args = {})
       merge_and_assign_config(args)
@@ -15,10 +16,18 @@ module Fozzie
     end
 
     def data_prefix
-      s = [appname, env].collect {|s| s.empty? ? nil : s }.compact.join('.').strip
+      s = [appname, origin_name, env].collect {|s| s.empty? ? nil : s.gsub('.', '-') }.compact.join('.').strip
       (s.empty? ? nil : s)
     end
 
+    def ip_from_host
+      @ip_from_host ||= host_to_ip
+    end
+
+    def origin_name
+      @origin_name ||= %x{uname -n}.strip
+    end
+
     private
 
     # Handle the merging of the given configuaration, and the default config.
@@ -40,10 +49,21 @@ module Fozzie
         :port        => 8125,
         :config_path => '',
         :env         => (ENV['RACK_ENV'] || ENV['RAILS_ENV'] || 'development'),
-        :appname     => ''
+        :appname     => '',
+        :namespaces  => %w{Stats S Statistics Warehouse}
       }.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?
+    end
+
+    def ip_address_regex
+      /^(?:\d{1,3}\.){3}\d{1,3}$/
+    end
+
     def full_config_path(path)
       File.expand_path('config/fozzie.yml', path)
     end

data/lib/fozzie/version.rb

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

data/spec/lib/fozzie/configuration_spec.rb

@@ -1,4 +1,5 @@
 require 'spec_helper'
+require 'resolv'
 
 describe Fozzie::Configuration do
 
@@ -12,6 +13,7 @@ describe Fozzie::Configuration do
 
   it "attempts to load configuration from yaml" do
     c = Fozzie::Configuration.new({:env => 'test', :config_path => 'spec/'})
+    c.stubs(:origin_name).returns("")
     c.host.should == '1.1.1.1'
     c.port.should == 9876
     c.appname.should == 'fozzie'
@@ -23,16 +25,58 @@ describe Fozzie::Configuration do
   end
 
   it "creates a data prefix" do
+    subject.stubs(:origin_name).returns("")
     subject.data_prefix.should == 'development'
   end
 
   it "creates a data prefix with appname when set" do
+    subject.stubs(:origin_name).returns("")
     subject.appname = 'astoria'
     subject.data_prefix.should == 'astoria.development'
   end
 
+  it "creates a prefix with origin" do
+    subject.stubs(:origin_name).returns("app.server.local")
+    subject.appname = 'astoria'
+    subject.data_prefix.should == 'astoria.app-server-local.development'
+  end
+
   it "handles missing configuration namespace" do
     proc { Fozzie::Configuration.new({:env => 'blbala', :config_path => 'spec/'}) }.should_not raise_error
   end
 
+  it "#namespaces" do
+    subject.namespaces.should be_kind_of(Array)
+    subject.namespaces.should include("Stats")
+    subject.namespaces.should include("S")
+  end
+
+  describe "#ip_from_host" do
+
+    it "returns host if host an ip" do
+      c = Fozzie::Configuration.new({:env => 'test', :config_path => nil, :host => '127.0.0.1'})
+      c.ip_from_host.should == '127.0.0.1'
+    end
+
+    it "assigns nil on miss" do
+      Resolv.expects(:getaddresses).with('some.awesome.log.server').returns([]).twice
+
+      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
+    end
+
+    it "looks up ip from host" do
+      c = Fozzie::Configuration.new({:env => 'test', :config_path => nil, :host => 'lonelyplanet.com'})
+      c.ip_from_host.should match(/^(?:\d{1,3}\.){3}\d{1,3}$/)
+    end
+
+    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
+    end
+
+  end
+
 end

data/spec/lib/fozzie_spec.rb

@@ -12,13 +12,13 @@ describe Fozzie do
   end
 
   it "creates new classes for statistics gathering" do
-    Fozzie::Classes::NAMESPACES.each do |k|
+    Fozzie.c.namespaces.each do |k|
       Kernel.const_defined?(k).should == true
     end
   end
 
   it "acts like its inherited parent" do
-    Fozzie::Classes::NAMESPACES.each do |k|
+    Fozzie.c.namespaces.each do |k|
       kl = Kernel.const_get(k)
       kl.should respond_to(:increment)
       kl.should respond_to(:decrement)
@@ -29,16 +29,12 @@ describe Fozzie do
   end
 
   it "acts an a singleton" do
-    Fozzie::Classes::NAMESPACES.each do |k|
+    Fozzie.c.namespaces.each do |k|
       kl1, kl2 = Kernel.const_get(k), Kernel.const_get(k)
       kl1.should == kl2
     end
   end
 
-  it "assigns namespace when passed" do
-    Fozzie::AbstractFozzie.new(1,2, 'a').namespace.should == 'a'
-  end
-
   it "times a given block" do
     Stats.expects(:timing).with() {|b, val, timing| b == 'data.bin' && (1000..1200).include?(val) }.twice
     Stats.time_for('data.bin') { sleep 1 }

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: fozzie
 version: !ruby/object:Gem::Version
-  version: 0.0.12
+  version: 0.0.13
   prerelease: 
 platform: ruby
 authors:
@@ -9,11 +9,11 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-02-01 00:00:00.000000000 Z
+date: 2012-02-14 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: statsd-ruby
-  requirement: &70337639228680 !ruby/object:Gem::Requirement
+  requirement: &70101336334120 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -21,10 +21,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *70337639228680
+  version_requirements: *70101336334120
 - !ruby/object:Gem::Dependency
   name: rake
-  requirement: &70337639226940 !ruby/object:Gem::Requirement
+  requirement: &70101336333380 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -32,10 +32,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70337639226940
+  version_requirements: *70101336333380
 - !ruby/object:Gem::Dependency
   name: rspec
-  requirement: &70337639226160 !ruby/object:Gem::Requirement
+  requirement: &70101336332560 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -43,10 +43,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70337639226160
+  version_requirements: *70101336332560
 - !ruby/object:Gem::Dependency
   name: mocha
-  requirement: &70337639225340 !ruby/object:Gem::Requirement
+  requirement: &70101336331840 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -54,10 +54,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70337639225340
+  version_requirements: *70101336331840
 - !ruby/object:Gem::Dependency
   name: syntax
-  requirement: &70337639224480 !ruby/object:Gem::Requirement
+  requirement: &70101336496260 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -65,10 +65,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70337639224480
+  version_requirements: *70101336496260
 - !ruby/object:Gem::Dependency
   name: rack-test
-  requirement: &70337639388800 !ruby/object:Gem::Requirement
+  requirement: &70101336495340 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -76,10 +76,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70337639388800
+  version_requirements: *70101336495340
 - !ruby/object:Gem::Dependency
   name: simplecov
-  requirement: &70337639387980 !ruby/object:Gem::Requirement
+  requirement: &70101336494540 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -87,10 +87,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70337639387980
+  version_requirements: *70101336494540
 - !ruby/object:Gem::Dependency
   name: sinatra
-  requirement: &70337639387300 !ruby/object:Gem::Requirement
+  requirement: &70101336493560 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -98,10 +98,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70337639387300
+  version_requirements: *70101336493560
 - !ruby/object:Gem::Dependency
   name: actionpack
-  requirement: &70337639386420 !ruby/object:Gem::Requirement
+  requirement: &70101336492460 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -109,7 +109,7 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70337639386420
+  version_requirements: *70101336492460
 description: Gem allows statistics gathering from Ruby and Ruby on Rails applications
   to Statsd
 email:
@@ -156,7 +156,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: 2007942270524429698
+      hash: 2372667692060957828
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements:
@@ -165,7 +165,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: 2007942270524429698
+      hash: 2372667692060957828
 requirements: []
 rubyforge_project: fozzie
 rubygems_version: 1.8.10