librato-metrics 0.7.0 → 0.7.1

data/CHANGELOG.md

@@ -1,5 +1,8 @@
 ## Changelog
 
+### Version 0.7.1
+* Add prefix option to Queues
+
 ### Version 0.7.0
 * Add ability to update metric properties (Christoph Bünte)
 * Add ability to merge queue and aggregator data into a queue

data/lib/librato/metrics/processor.rb

@@ -59,10 +59,11 @@ module Librato
       # @param [Hash] options Metric options
       def time(name, options={})
         start = Time.now
-        yield
-        duration = (Time.now - start) * 1000.0 # milliseconds
-        metric = {name => options.merge({:value => duration})}
-        add metric
+        yield.tap do
+          duration = (Time.now - start) * 1000.0 # milliseconds
+          metric = {name => options.merge({:value => duration})}
+          add metric
+        end
       end
       alias :benchmark :time
       
@@ -84,6 +85,7 @@ module Librato
         @source = options[:source]
         @create_time = Time.now
         @clear_on_failure = options[:clear_failures] || false
+        @prefix = options[:prefix]
       end
       
       def autosubmit_check
@@ -96,4 +98,4 @@ module Librato
     end
     
   end
-end
+end

data/lib/librato/metrics/queue.rb

@@ -28,6 +28,9 @@ module Librato
             metric = {:name => key.to_s, :value => value}
             type = :gauge
           end
+          if @prefix
+            metric[:name] = "#{@prefix}.#{metric[:name]}"
+          end
           type = ("#{type}s").to_sym
           if metric[:measure_time]
             check_measure_time(metric)

data/lib/librato/metrics/version.rb

@@ -1,5 +1,5 @@
 module Librato
   module Metrics
-    VERSION = "0.7.0"
+    VERSION = "0.7.1"
   end
 end

data/spec/unit/metrics/aggregator_spec.rb

@@ -182,6 +182,14 @@ module Librato
             queued[:sum].should be >= 500.0
             queued[:sum].should be_within(150).of(500)
           end
+
+          it "should return the result of the block" do
+            result = subject.time :returning do
+              :hi_there
+            end
+
+            result.should == :hi_there
+          end
         end
       end
       

data/spec/unit/metrics/queue_spec.rb

@@ -71,6 +71,17 @@ module Librato
               :source => 'db2'}]}
             subject.queued.should equal_unordered(expected)
           end
+          
+          context "with a prefix set" do
+            it "should auto-prepend names" do
+              subject = Queue.new(:prefix => 'foo')
+              subject.add :bar => 1
+              subject.add :baz => {:value => 23}
+              expected = {:gauges => [{:name =>'foo.bar', :value => 1, :measure_time => @time}, 
+                                      {:name => 'foo.baz', :value => 23, :measure_time => @time}]}
+              subject.queued.should equal_unordered(expected)
+            end
+          end
         end
 
         context "with multiple metrics" do

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: librato-metrics
 version: !ruby/object:Gem::Version
-  version: 0.7.0
+  version: 0.7.1
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-07-25 00:00:00.000000000 Z
+date: 2012-10-01 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: faraday
@@ -215,7 +215,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: -1999246465148166572
+      hash: -2663483251500342035
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements: