metricsd 0.2.2 → 0.2.3

data/CHANGELOG.md

@@ -1,3 +1,9 @@
+## 0.2.3 (July 27, 2011)
+
+Features:
+
+  - Added ability to specify default group
+
 ## 0.2.2 (July 27, 2011)
 
 Bugfixes:

data/lib/metricsd/client.rb

@@ -224,7 +224,8 @@ module Metricsd
       # Packs metric into a string representation according to the MetricsD
       # protocol.
       def pack(key, value, opts)
-        key = "#{opts[:group]}$#{key}" unless opts[:group].nil? || opts[:group].empty?
+        group = opts[:group] || Metricsd.default_group || ''
+        key = "#{group}$#{key}" unless group.empty?
         opts[:source].empty? ? "#{key}:#{value}" : "#{opts[:source]}@#{key}:#{value}"
       end
     end

data/lib/metricsd/version.rb

@@ -1,3 +1,3 @@
 module Metricsd
-  VERSION = "0.2.2"
+  VERSION = "0.2.3"
 end

data/lib/metricsd.rb

@@ -72,6 +72,16 @@ module Metricsd
       @@default_source = source
     end
 
+    # Gets the default group for all metrics.
+    def default_group
+      @@default_group
+    end
+
+    # Sets the default group for all metrics.
+    def default_group=(group)
+      @@default_group = group
+    end
+
     # Gets the logger used to output errors or warnings.
     def logger
       @@logger ||= if defined?(Rails)
@@ -95,6 +105,7 @@ module Metricsd
       @@enabled        = true
       @@source         = Socket.gethostname[/^([^.]+)/, 1]
       @@default_source = 'all'
+      @@default_group  = nil
       @@logger         = nil
     end
   end

data/spec/client_spec.rb

@@ -184,6 +184,24 @@ describe Metricsd::Client do
       @socket.should_receive(:send).with('test2@custom.metric:23', 0)
       Metricsd::Client.record_value('custom.metric', 23, :source => 'test2')
     end
+
+    it 'should apply default group if specified' do
+      Metricsd.default_group = 'grp'
+      @socket.should_receive(:send).with('all@grp$custom.metric:23', 0)
+      Metricsd::Client.record_value('custom.metric', 23)
+    end
+
+    it 'should override default group with the specified one' do
+      Metricsd.default_group = 'grp'
+      @socket.should_receive(:send).with('all@group$custom.metric:23', 0)
+      Metricsd::Client.record_value('custom.metric', 23, :group => 'group')
+    end
+
+    it 'should clear group, if there is a default one, and empty string specified' do
+      Metricsd.default_group = 'grp'
+      @socket.should_receive(:send).with('all@custom.metric:23', 0)
+      Metricsd::Client.record_value('custom.metric', 23, :group => '')
+    end
   end
 
   describe '.record_values' do

data/spec/metricsd_spec.rb

@@ -25,6 +25,10 @@ describe Metricsd do
       Metricsd.default_source.should == 'all'
     end
 
+    it 'should have default_group = nil' do
+      Metricsd.default_group.should be_nil
+    end
+
     it 'should create logger' do
       Metricsd.logger.should be_a(Logger)
     end
@@ -76,6 +80,11 @@ describe Metricsd do
       Metricsd.default_source.should == 'nothing'
     end
 
+    it 'should allow to change default_group' do
+      Metricsd.default_group = 'mygroup'
+      Metricsd.default_group.should == 'mygroup'
+    end
+
     it 'should allow to change logger' do
       mock = Metricsd.logger = mock('Logger')
       Metricsd.logger.should be(mock)

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: metricsd
 version: !ruby/object:Gem::Version 
-  hash: 19
+  hash: 17
   prerelease: 
   segments: 
   - 0
   - 2
-  - 2
-  version: 0.2.2
+  - 3
+  version: 0.2.3
 platform: ruby
 authors: 
 - Dmytro Shteflyuk