fozzie 1.0.3 → 1.1.0

data/lib/fozzie/version.rb

@@ -1,3 +1,3 @@
-module Fozzie
-  VERSION = "1.0.3"
-end
+module Fozzie
+  VERSION = "1.1.0"
+end

data/spec/lib/fozzie/adapter/datadog_spec.rb

@@ -0,0 +1,31 @@
+require 'spec_helper'
+require 'fozzie/adapter/datadog'
+
+module Fozzie::Adapter
+  describe Datadog do
+    it_behaves_like "fozzie adapter"
+
+    # Switch to Statsd adapter for the duration of this test
+    before(:all) do
+      Fozzie.c.adapter = :Datadog
+    end
+
+    after(:all) do
+      Fozzie.c.adapter = :TestAdapter
+    end
+
+    describe "#register" do
+      it "appends tags to the metrics" do
+        subject.should_receive(:send_to_socket).with(%r{\|#country:usa,testing$})
+
+        subject.register(:bucket => "foo", :value => 1, :type => :gauge, :sample_rate => 1, tags: ['country:usa','testing'])
+      end
+
+      it "does not append tags when none are specified" do
+        subject.should_receive(:send_to_socket).with(%r{foo:1\|g$})
+
+        subject.register(:bucket => "foo", :value => 1, :type => :gauge, :sample_rate => 1)
+      end
+    end
+  end
+end

data/spec/lib/fozzie/adapter/statsd_spec.rb

@@ -1,82 +1,82 @@
-require 'spec_helper'
-require 'fozzie/adapter/statsd'
-
-module Fozzie::Adapter
-  describe Statsd do
-    it_behaves_like "fozzie adapter"
-
-    # Switch to Statsd adapter for the duration of this test
-    before(:all) do
-      Fozzie.c.adapter = :Statsd
-    end
-
-    after(:all) do
-      Fozzie.c.adapter = :TestAdapter
-    end
-    
-    it "downcases any stat value" do
-      subject.should_receive(:send_to_socket).with {|bin| bin.match /\.foo/ }
-
-      subject.register(:bin => "FOO", :value => 1, :type => :gauge, :sample_rate => 1)
-    end
-
-    describe "#format_bucket" do
-      it "accepts arrays" do
-        subject.format_bucket([:foo, '2']).should match /foo.2$/
-        subject.format_bucket([:foo, '2']).should match /foo.2$/
-        subject.format_bucket(%w{foo bar}).should match /foo.bar$/
-      end
-
-      it "converts any values to strings for stat value, ignoring nil" do
-        subject.format_bucket([:foo, 1, nil, "@", "BAR"]).should =~ /foo.1._.bar/
-      end
-
-      it "replaces invalid chracters" do
-        subject.format_bucket([:foo, ':']).should match /foo.#{subject.class::RESERVED_CHARS_REPLACEMENT}$/
-        subject.format_bucket([:foo, '@']).should match /foo.#{subject.class::RESERVED_CHARS_REPLACEMENT}$/
-        subject.format_bucket('foo.bar.|').should match /foo.bar.#{subject.class::RESERVED_CHARS_REPLACEMENT}$/
-      end
-    end
-
-    describe "#format_value" do
-      it "defaults type to gauge when type is not mapped" do
-        subject.format_value(1, :foo, 1).should eq '1|g'
-      end
-
-      it "converts basic values to string" do
-        subject.format_value(1, :count, 1).should eq '1|c'
-      end
-    end
-
-    it "ensures block is called on socket error" do
-      subject.socket.stub(:send) { raise SocketError }
-
-      proc { subject.register(:bin => 'data.bin', :value => 1, :type => :gauge, :sample_rate => 1) { sleep 0.01 } }.should_not raise_error
-      proc { subject.register(:bin => 'data.bin', :value => 1, :type => :gauge, :sample_rate => 1) { sleep 0.01 } }.should_not raise_error
-    end
-
-    it "raises Timeout on slow lookup" do
-      Fozzie.c.timeout = 0.01
-      subject.socket.stub(:send).with(any_args) { sleep 0.4 }
-
-      subject.register(:bin => 'data.bin', :value => 1, :type => :gauge, :sample_rate => 1).should eq false
-    end
-
-    describe "multiple stats in a single call" do
-
-      it "collects stats together with delimeter" do
-        Fozzie.c.disable_prefix
-
-        stats = [
-          { :bin => 'foo', :value => 1, :type => :count, :sample_rate => 1 },
-          { :bin => 'bar', :value => 1, :type => :gauge, :sample_rate => 1 },
-          { :bin => %w{foo bar}, :value => 100, :type => :timing, :sample_rate => 1 }
-        ]
-
-        subject.should_receive(:send_to_socket).with "foo:1|c\nbar:1|g\nfoo.bar:100|ms"
-
-        subject.register(stats)
-      end
-    end
-  end
-end
+require 'spec_helper'
+require 'fozzie/adapter/statsd'
+
+module Fozzie::Adapter
+  describe Statsd do
+    it_behaves_like "fozzie adapter"
+
+    # Switch to Statsd adapter for the duration of this test
+    before(:all) do
+      Fozzie.c.adapter = :Statsd
+    end
+
+    after(:all) do
+      Fozzie.c.adapter = :TestAdapter
+    end
+    
+    it "downcases any stat value" do
+      subject.should_receive(:send_to_socket).with(/\.foo/)
+
+      subject.register(:bucket => "FOO", :value => 1, :type => :gauge, :sample_rate => 1)
+    end
+
+    describe "#format_bucket" do
+      it "accepts arrays" do
+        subject.format_bucket([:foo, '2']).should match(/foo.2$/)
+        subject.format_bucket([:foo, '2']).should match(/foo.2$/)
+        subject.format_bucket(%w{foo bar}).should match(/foo.bar$/)
+      end
+
+      it "converts any values to strings for stat value, ignoring nil" do
+        subject.format_bucket([:foo, 1, nil, "@", "BAR"]).should =~ /foo.1._.bar/
+      end
+
+      it "replaces invalid chracters" do
+        subject.format_bucket([:foo, ':']).should match(/foo.#{subject.class::RESERVED_CHARS_REPLACEMENT}$/)
+        subject.format_bucket([:foo, '@']).should match(/foo.#{subject.class::RESERVED_CHARS_REPLACEMENT}$/)
+        subject.format_bucket('foo.bar.|').should match(/foo.bar.#{subject.class::RESERVED_CHARS_REPLACEMENT}$/)
+      end
+    end
+
+    describe "#format_value" do
+      it "defaults type to gauge when type is not mapped" do
+        subject.format_value(1, :foo, 1).should eq '1|g'
+      end
+
+      it "converts basic values to string" do
+        subject.format_value(1, :count, 1).should eq '1|c'
+      end
+    end
+
+    it "ensures block is called on socket error" do
+      subject.socket.stub(:send) { raise SocketError }
+
+      proc { subject.register(:bucket => 'data.bin', :value => 1, :type => :gauge, :sample_rate => 1) { sleep 0.01 } }.should_not raise_error
+      proc { subject.register(:bucket => 'data.bin', :value => 1, :type => :gauge, :sample_rate => 1) { sleep 0.01 } }.should_not raise_error
+    end
+
+    it "raises Timeout on slow lookup" do
+      Fozzie.c.timeout = 0.01
+      subject.socket.stub(:send).with(any_args) { sleep 0.4 }
+
+      subject.register(:bucket => 'data.bin', :value => 1, :type => :gauge, :sample_rate => 1).should eq false
+    end
+
+    describe "multiple stats in a single call" do
+
+      it "collects stats together with delimeter" do
+        Fozzie.c.disable_prefix
+
+        stats = [
+          { :bucket => 'foo', :value => 1, :type => :count, :sample_rate => 1 },
+          { :bucket => 'bar', :value => 1, :type => :gauge, :sample_rate => 1 },
+          { :bucket => %w{foo bar}, :value => 100, :type => :timing, :sample_rate => 1 }
+        ]
+
+        subject.should_receive(:send_to_socket).with "foo:1|c\nbar:1|g\nfoo.bar:100|ms"
+
+        subject.register(stats)
+      end
+    end
+  end
+end

data/spec/lib/fozzie/configuration_spec.rb

@@ -1,125 +1,125 @@
-require 'spec_helper'
-require 'resolv'
-
-describe Fozzie::Configuration do
-  it "#host" do
-    subject.host.should be_kind_of(String)
-  end
-
-  it "#port" do
-    subject.port.should be_kind_of(Fixnum)
-  end
-
-  it "attempts to load configuration from yaml" do
-    c = Fozzie::Configuration.new({
-                                    env:         'test',
-                                    config_path: 'spec/',
-                                    adapter:     :TestAdapter
-                                  })
-    c.stub(:origin_name => "")
-    c.host.should eq '1.1.1.1'
-    c.port.should eq 9876
-    c.appname.should eq 'fozzie'
-    c.data_prefix.should eq "fozzie#{c.safe_separator}test"
-  end
-
-  it "defaults env" do
-    subject.env.should eq 'test'
-  end
-
-  describe "#adapter" do
-    it "throw error on incorrect assignment" do
-      -> { Fozzie::Configuration.new({:env => 'test', :adapter => 'foo'}) }.should raise_error(Fozzie::AdapterMissing)
-    end
-
-    it "defaults adapter to Statsd" do
-      subject.adapter.should be_kind_of(Fozzie::Adapter::Statsd)
-    end
-  end
-
-  describe "#disable_prefix" do
-    it "sets the data_prefix to nil" do
-      subject.disable_prefix
-      subject.data_prefix.should be_nil
-    end
-  end
-
-  describe "#prefix and #data_prefix" do
-    it "creates a #data_prefix" do
-      subject.stub(:origin_name => "")
-      subject.data_prefix.should eq 'test'
-    end
-
-    it "creates a #data_prefix with appname when set" do
-      subject.stub(:origin_name => "")
-      subject.appname = 'astoria'
-      subject.data_prefix.should eq 'astoria.test'
-    end
-
-    it "creates a #data_prefix with origin" do
-      subject.appname = 'astoria'
-      subject.data_prefix.should match /^astoria\.(\S+)\.test$/
-    end
-
-    it "allows dynamic assignment of #prefix to derive #data_prefix" do
-      subject.prefix = [:foo, :bar, :car]
-      subject.data_prefix.should eq 'foo.bar.car'
-    end
-
-    it "allows dynamic injection of value to prefix" do
-      subject.stub(:origin_name => "")
-      subject.prefix << 'git-sha-1234'
-      subject.data_prefix.should eq 'test.git-sha-1234'
-    end
-  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 "#sniff?" do
-    it "defaults to false for testing" do
-      subject.stub(:env => "test")
-      subject.sniff?.should be_false
-    end
-
-    it "defaults true when in development" do
-      subject.stub(:env => "development")
-      subject.sniff?.should be_true
-    end
-
-    it "defaults true when in production" do
-      subject.stub(:env => "production")
-      subject.sniff?.should be_true
-    end
-  end
-
-  describe "#sniff_envs allows configuration for #sniff?" do
-    let!(:sniff_envs) { subject.stub(:sniff_envs => ['test']) }
-
-    it "scopes to return false" do
-      subject.stub(:env => "development")
-      subject.sniff?.should be_false
-    end
-
-    it "scopes to return true" do
-      subject.stub(:env => "test")
-      subject.sniff?.should be_true
-    end
-
-  end
-
-  describe "ignoring prefix" do
-    it "does not use prefix when set to ignore" do
-      subject.disable_prefix
-      subject.ignore_prefix.should eq(true)
-    end
-  end
-
-end
+require 'spec_helper'
+require 'resolv'
+
+describe Fozzie::Configuration do
+  it "#host" do
+    subject.host.should be_kind_of(String)
+  end
+
+  it "#port" do
+    subject.port.should be_kind_of(Fixnum)
+  end
+
+  it "attempts to load configuration from yaml" do
+    c = Fozzie::Configuration.new({
+                                    env:         'test',
+                                    config_path: 'spec/',
+                                    adapter:     :TestAdapter
+                                  })
+    c.stub(:origin_name => "")
+    c.host.should eq '1.1.1.1'
+    c.port.should eq 9876
+    c.appname.should eq 'fozzie'
+    c.data_prefix.should eq "fozzie#{c.safe_separator}test"
+  end
+
+  it "defaults env" do
+    subject.env.should eq 'test'
+  end
+
+  describe "#adapter" do
+    it "throw error on incorrect assignment" do
+      -> { Fozzie::Configuration.new({:env => 'test', :adapter => 'foo'}) }.should raise_error(Fozzie::AdapterMissing)
+    end
+
+    it "defaults adapter to Statsd" do
+      subject.adapter.should be_kind_of(Fozzie::Adapter::Statsd)
+    end
+  end
+
+  describe "#disable_prefix" do
+    it "sets the data_prefix to nil" do
+      subject.disable_prefix
+      subject.data_prefix.should be_nil
+    end
+  end
+
+  describe "#prefix and #data_prefix" do
+    it "creates a #data_prefix" do
+      subject.stub(:origin_name => "")
+      subject.data_prefix.should eq 'test'
+    end
+
+    it "creates a #data_prefix with appname when set" do
+      subject.stub(:origin_name => "")
+      subject.appname = 'astoria'
+      subject.data_prefix.should eq 'astoria.test'
+    end
+
+    it "creates a #data_prefix with origin" do
+      subject.appname = 'astoria'
+      subject.data_prefix.should match /^astoria\.(\S+)\.test$/
+    end
+
+    it "allows dynamic assignment of #prefix to derive #data_prefix" do
+      subject.prefix = [:foo, :bar, :car]
+      subject.data_prefix.should eq 'foo.bar.car'
+    end
+
+    it "allows dynamic injection of value to prefix" do
+      subject.stub(:origin_name => "")
+      subject.prefix << 'git-sha-1234'
+      subject.data_prefix.should eq 'test.git-sha-1234'
+    end
+  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 "#sniff?" do
+    it "defaults to false for testing" do
+      subject.stub(:env => "test")
+      subject.sniff?.should be false
+    end
+
+    it "defaults true when in development" do
+      subject.stub(:env => "development")
+      subject.sniff?.should be true
+    end
+
+    it "defaults true when in production" do
+      subject.stub(:env => "production")
+      subject.sniff?.should be true
+    end
+  end
+
+  describe "#sniff_envs allows configuration for #sniff?" do
+    let!(:sniff_envs) { subject.stub(:sniff_envs => ['test']) }
+
+    it "scopes to return false" do
+      subject.stub(:env => "development")
+      subject.sniff?.should be false
+    end
+
+    it "scopes to return true" do
+      subject.stub(:env => "test")
+      subject.sniff?.should be true
+    end
+
+  end
+
+  describe "ignoring prefix" do
+    it "does not use prefix when set to ignore" do
+      subject.disable_prefix
+      subject.ignore_prefix.should eq(true)
+    end
+  end
+
+end