metricsd 0.2.4 → 0.2.5

data/CHANGELOG.md

@@ -1,3 +1,9 @@
+## 0.2.5 (November 16, 2011)
+
+Bugfixes:
+
+  - Do not fail when MetricsD host could not be resolved
+
 ## 0.2.4 (August 11, 2011)
 
 Features:

data/lib/metricsd/client.rb

@@ -70,6 +70,7 @@ module Metricsd
           }, opts
         )
       end
+      alias :hit :record_hit
 
       # Record succeded boolean event.
       #
@@ -84,6 +85,7 @@ module Metricsd
       def record_success(metric, opts = {})
         record_internal({"#{metric}.status" => 1}, opts)
       end
+      alias :success :record_success
 
       # Record failed boolean event.
       #
@@ -98,6 +100,7 @@ module Metricsd
       def record_failure(metric, opts = {})
         record_internal({"#{metric}.status" => -1}, opts)
       end
+      alias :failure :record_failure
 
       # Record timing info. Time should be a floating point
       # number of seconds.
@@ -113,12 +116,17 @@ module Metricsd
       #
       def record_time(metric, time = nil, opts = {}, &block)
         opts, time = time, nil if Hash === time
+        result = nil
         if time.nil?
           raise ArgumentError, "You should pass a block if time is not given" unless block_given?
-          time = Benchmark.measure(&block).real
+          time = Benchmark.measure do
+            result = block.call
+          end.real
         end
         record_internal({"#{metric}.time" => (time * 1000).round}, opts)
+        result
       end
+      alias :time :record_time
 
       # Record an integer value.
       #
@@ -135,6 +143,7 @@ module Metricsd
         record_internal({metric => value.round}, opts)
       end
       alias :record :record_value
+      alias :value :record_value
 
       # Record multiple integer values.
       #
@@ -156,6 +165,7 @@ module Metricsd
       def record_values(metrics, opts = {})
         record_internal(metrics, opts)
       end
+      alias :values :record_values
 
       # Reset and re-establish connection.
       def reset_connection!
@@ -166,9 +176,14 @@ module Metricsd
 
       # Returns a UDP socket used to send metrics to MetricsD.
       def collector_socket
-        @@socket ||= UDPSocket.new.tap do |sock|
-          sock.connect(Metricsd.server_host, Metricsd.server_port)
+        @@lock.synchronize do
+          @@socket ||= UDPSocket.new.tap do |sock|
+            sock.connect(Metricsd.server_host, Metricsd.server_port)
+          end
         end
+      rescue SocketError => e
+        Metricsd.logger.error("Exception occurred while trying to connect to MetricsD (#{Metricsd.server_host}:#{Metricsd.server_port}): #{e.inspect}")
+        nil
       end
 
       # Send informating to the RRD collector daemon using UDP protocol.
@@ -204,11 +219,10 @@ module Metricsd
       # Sends a string to the MetricsD. Should never raise any network-specific
       # exceptions, but log them instead, and silently return.
       def safe_send(msg)
-        collector_socket.send(msg, 0)
+        collector_socket.send(msg, 0) if collector_socket
         true
       rescue Errno::ECONNREFUSED => e
-        Metricsd.logger.error("Exception occurred while trying to send data to metricsd: #{e.inspect}")
-        e.backtrace.each { |line| Metricsd.logger.error(line) }
+        Metricsd.logger.error("Exception occurred while trying to send data to MetricsD (#{Metricsd.server_host}:#{Metricsd.server_port}): #{e.inspect}")
         false
       end
 
@@ -220,5 +234,6 @@ module Metricsd
         opts[:source].empty? ? "#{key}:#{value}" : "#{opts[:source]}@#{key}:#{value}"
       end
     end
+    @@lock = Monitor.new
   end
 end

data/lib/metricsd/version.rb

@@ -1,3 +1,3 @@
 module Metricsd
-  VERSION = "0.2.4"
+  VERSION = "0.2.5"
 end

data/spec/client_spec.rb

@@ -14,7 +14,6 @@ describe Metricsd::Client do
     it 'should not throw, but log exceptions on failure' do
       @socket.should_receive(:send).and_raise(Errno::ECONNREFUSED.new('exception from test'))
       Metricsd.logger.should_receive(:error).once.with(match(/exception from test/))
-      Metricsd.logger.should_receive(:error).at_least(1) # stacktrace
       Metricsd::Client.record_value('custom.metric', 5)
     end
 
@@ -119,6 +118,13 @@ describe Metricsd::Client do
       yielded.should be_true
     end
 
+    it 'should return block value' do
+      @socket.should_receive(:send).with(match(/all@custom.metric.time:\d+/), 0)
+      Metricsd::Client.record_time('custom.metric') do
+        'hello'
+      end.should eq('hello')
+    end
+
     it 'should use options if time is not specified' do
       @socket.should_receive(:send).with(match(/all@custom.metric.time:\d+/), 0)
       yielded = false

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: metricsd
 version: !ruby/object:Gem::Version 
-  hash: 31
-  prerelease: 
+  hash: 29
+  prerelease: false
   segments: 
   - 0
   - 2
-  - 4
-  version: 0.2.4
+  - 5
+  version: 0.2.5
 platform: ruby
 authors: 
 - Dmytro Shteflyuk
@@ -15,7 +15,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-08-11 00:00:00 -04:00
+date: 2011-11-16 00:00:00 -05:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -142,7 +142,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
 requirements: []
 
 rubyforge_project: 
-rubygems_version: 1.6.2
+rubygems_version: 1.3.7
 signing_key: 
 specification_version: 3
 summary: Client library for MetricsD server