librato-metrics 0.7.3 → 0.7.4

data/CHANGELOG.md

@@ -1,5 +1,9 @@
 ## Changelog
 
+### Version 0.7.4
+* Support global measure_time option for Queues/Aggregators
+* Support all versions of multi_json so we can relax version constraint_
+
 ### Version 0.7.3
 * Allow prefixes to be changed after instantiation on Queues/Aggregators
 

data/README.md

@@ -217,13 +217,6 @@ Once the queue is associated you can use it normally:
 
 The `librato-metrics` gem currently does not do internal locking for thread safety. When used in multi-threaded applications, please add your own mutexes for sensitive operations.
 
-## Feature Roadmap
-
-These are features we expect to add in future versions, roughly in the order of current priority. If you feel strongly about a feature, feel free to [create an issue](https://github.com/librato/librato-metrics/issues) or [join us in live chat](https://librato.campfirenow.com/269d3) and talk to us about it.
-
-* Queue objects support a single default measure_time to use for any measurements which don't have it set
-* Query actions return a collection object which auto-paginates large result sets
-
 ## Contribution
 
 * Check out the latest master to make sure the feature hasn't been implemented or the bug hasn't been fixed yet.

data/lib/librato/metrics.rb

@@ -11,6 +11,7 @@ require 'metrics/connection'
 require 'metrics/errors'
 require 'metrics/persistence'
 require 'metrics/queue'
+require 'metrics/smart_json'
 require 'metrics/version'
 
 module Librato
@@ -69,8 +70,8 @@ module Librato
     # Expose class methods of Simple via Metrics itself.
     #
     def_delegators :client, :agent_identifier, :api_endpoint,
-                   :api_endpoint=, :authenticate, :connection, :delete, 
-                   :fetch, :list, :persistence, :persistence=, :persister, 
+                   :api_endpoint=, :authenticate, :connection, :delete,
+                   :fetch, :list, :persistence, :persistence=, :persister,
                    :submit, :update
 
     # The Librato::Metrics::Client being used by module-level

data/lib/librato/metrics/aggregator.rb

@@ -6,7 +6,7 @@ module Librato
 
     class Aggregator
       SOURCE_SEPARATOR = '%%' # must not be in valid source name criteria
-      
+
       include Processor
 
       attr_reader :source
@@ -40,7 +40,7 @@ module Librato
         autosubmit_check
         self
       end
-      
+
       # Returns true if aggregate contains no measurements
       #
       # @return Boolean
@@ -80,6 +80,7 @@ module Librato
 
         req = { :gauges => gauges }
         req[:source] = @source if @source
+        req[:measure_time] = @measure_time if @measure_time
 
         req
       end

data/lib/librato/metrics/client.rb

@@ -59,7 +59,7 @@ module Librato
         raise CredentialsMissing unless (self.email and self.api_key)
         @connection ||= Connection.new(:client => self, :api_endpoint => api_endpoint)
       end
-      
+
       # Overrride user agent for this client's connections. If you
       # are trying to specify an agent identifier for developer
       # program, see #agent_identifier.
@@ -68,17 +68,17 @@ module Librato
         @user_agent = agent
         @connection = nil
       end
-      
+
       def custom_user_agent
         @user_agent
       end
-      
+
       # Completely delete metrics with the given names. Be
       # careful with this, this is instant and permanent.
       #
       # @example Delete metric 'temperature'
       #   Librato::Metrics.delete :temperature
-      # 
+      #
       # @example Delete metrics 'foo' and 'bar'
       #   Librato::Metrics.delete :foo, :bar
       def delete(*metric_names)
@@ -87,7 +87,7 @@ module Librato
         params = {:names => metric_names }
         connection.delete do |request|
           request.url connection.build_url("metrics")
-          request.body = MultiJson.dump(params)
+          request.body = SmartJSON.write(params)
         end
         # expects 204, middleware will raise exception
         # otherwise.
@@ -137,7 +137,7 @@ module Librato
         # expects 200
         url = connection.build_url("metrics/#{metric}", query)
         response = connection.get(url)
-        parsed = MultiJson.load(response.body)
+        parsed = SmartJSON.read(response.body)
         # TODO: pagination support
         query.empty? ? parsed : parsed["measurements"]
       end
@@ -198,13 +198,13 @@ module Librato
       # Submit all queued metrics.
       #
       def submit(args)
-        @queue ||= Queue.new(:client => self, 
-                             :skip_measurement_times => true, 
+        @queue ||= Queue.new(:client => self,
+                             :skip_measurement_times => true,
                              :clear_failures => true)
         @queue.add args
         @queue.submit
       end
-      
+
       # Update metric with the given name.
       #
       # @example Update metric 'temperature'
@@ -216,7 +216,7 @@ module Librato
       def update(metric, options = {})
         connection.put do |request|
           request.url connection.build_url("metrics/#{metric}")
-          request.body = MultiJson.dump(options)
+          request.body = SmartJSON.write(options)
         end
       end
 

data/lib/librato/metrics/collection.rb

@@ -14,7 +14,7 @@ module Librato
         # expects 200
         url = connection.build_url(path, query)
         response = connection.get(url)
-        parsed = MultiJson.load(response.body)
+        parsed = SmartJSON.read(response.body)
         results = parsed["metrics"]
         return results if parsed["query"]["found"] <= MAX_RESULTS
         query[:offset] = MAX_RESULTS
@@ -22,7 +22,7 @@ module Librato
           # expects 200
           url = connection.build_url(path, query)
           response = connection.get(url)
-          parsed = MultiJson.load(response.body)
+          parsed = SmartJSON.read(response.body)
           results.push(*parsed["metrics"])
           query[:offset] += MAX_RESULTS
         end while query[:offset] < parsed["query"]["found"]

data/lib/librato/metrics/connection.rb

@@ -6,37 +6,37 @@ require 'metrics/middleware/retry'
 
 module Librato
   module Metrics
-    
+
     class Connection
       extend Forwardable
-      
-      DEFAULT_API_ENDPOINT = 'https://metrics-api.librato.com'      
-      
+
+      DEFAULT_API_ENDPOINT = 'https://metrics-api.librato.com'
+
       def_delegators :transport, :get, :post, :head, :put, :delete,
                                  :build_url
-            
+
       def initialize(options={})
         @client = options[:client]
         @api_endpoint = options[:api_endpoint]
       end
-      
+
       # API endpoint that will be used for requests.
       #
       def api_endpoint
         @api_endpoint || DEFAULT_API_ENDPOINT
       end
-      
+
       def transport
         raise(NoClientProvided, "No client provided.") unless @client
         @transport ||= Faraday::Connection.new(:url => api_endpoint + "/v1/") do |f|
           #f.use FaradayMiddleware::EncodeJson
           f.use Librato::Metrics::Middleware::RequestBody
           f.use Librato::Metrics::Middleware::Retry
-          f.use Librato::Metrics::Middleware::CountRequests 
-          
+          f.use Librato::Metrics::Middleware::CountRequests
+
           f.use Librato::Metrics::Middleware::ExpectsStatus
           #f.use FaradayMiddleware::ParseJson, :content_type => /\bjson$/
-          
+
           f.adapter Faraday.default_adapter
         end.tap do |transport|
           transport.headers[:user_agent] = user_agent
@@ -44,7 +44,7 @@ module Librato
           transport.basic_auth @client.email, @client.api_key
         end
       end
-      
+
       # User-agent used when making requests.
       #
       def user_agent
@@ -61,7 +61,7 @@ module Librato
         #ua_chunks << "(#{transport_adapter})"
         ua_chunks.join(' ')
       end
-      
+
     private
 
       def adapter_version
@@ -82,17 +82,17 @@ module Librato
         return RUBY_ENGINE if Object.constants.include?(:RUBY_ENGINE)
         RUBY_DESCRIPTION.split[0]
       end
-      
+
       # figure out which adapter faraday is using
       def transport_adapter
         transport.builder.handlers.each do |handler|
           if handler.name[0,16] == "Faraday::Adapter"
             return handler.name[18..-1]
-          end 
+          end
         end
       end
-      
+
     end
-    
+
   end
 end

data/lib/librato/metrics/errors.rb

@@ -10,15 +10,15 @@ module Librato
     class NoClientProvided < MetricsError; end
     class InvalidMeasureTime < MetricsError; end
     class NotMergeable < MetricsError; end
-    
+
     class NetworkError < StandardError; end
-    
+
     class ClientError < NetworkError; end
     class Unauthorized < ClientError; end
     class Forbidden < ClientError; end
     class NotFound < ClientError; end
     class EntityAlreadyExists < ClientError; end
-    
+
     class ServerError < NetworkError; end
 
   end

data/lib/librato/metrics/middleware/count_requests.rb

@@ -1,17 +1,17 @@
 module Librato
   module Metrics
     module Middleware
-      
+
       class CountRequests < Faraday::Response::Middleware
         @total_requests = 0
-        
+
         class << self
           attr_reader :total_requests
-          
+
           def increment
             @total_requests += 1
           end
-          
+
           def reset
             @total_requests = 0
           end
@@ -22,8 +22,7 @@ module Librato
           @app.call(env)
         end
       end
-      
+
     end
   end
 end
-   

data/lib/librato/metrics/middleware/expects_status.rb

@@ -1,9 +1,9 @@
 module Librato
   module Metrics
     module Middleware
-      
+
       class ExpectsStatus < Faraday::Response::Middleware
-        
+
         def on_complete(env)
           # TODO: make exception output prettier
           case env[:status]
@@ -21,9 +21,9 @@ module Librato
             raise ServerError, env.to_s
           end
         end
-        
+
       end
-      
+
     end
   end
 end

data/lib/librato/metrics/middleware/retry.rb

@@ -2,9 +2,9 @@
 module Librato
   module Metrics
     module Middleware
-      
+
       class Retry < Faraday::Middleware
-        
+
         def initialize(app, retries = 3)
           @retries = retries
           super(app)
@@ -21,9 +21,9 @@ module Librato
             raise
           end
         end
-        
+
       end
-    
+
     end
   end
 end

data/lib/librato/metrics/persistence/direct.rb

@@ -17,14 +17,14 @@ module Librato
             requests = [queued]
           end
           requests.each do |request|
-            payload = MultiJson.dump(request)
+            payload = SmartJSON.write(request)
             # expects 200
             client.connection.post('metrics', payload)
           end
         end
-        
+
       private
-        
+
         def chunk_queued(queued, per_request)
           return [queued] if queue_count(queued) <= per_request
           reqs = []
@@ -42,7 +42,7 @@ module Librato
           end
           reqs
         end
-        
+
         def queue_count(queued)
           queued.inject(0) { |result, data| result + data.last.size }
         end

data/lib/librato/metrics/processor.rb

@@ -1,12 +1,12 @@
 module Librato
   module Metrics
-    
+
     module Processor
       MEASUREMENTS_PER_REQUEST = 500
-      
+
       attr_reader :per_request, :last_submit_time
       attr_accessor :prefix
-      
+
       # The current Client instance this queue is using to authenticate
       # and connect to Librato Metrics. This will default to the primary
       # client used by the Librato::Metrics module unless it has been
@@ -39,7 +39,7 @@ module Librato
         clear if @clear_on_failure
         raise
       end
-      
+
       # Capture execution time for a block and queue
       # it as the value for a metric. Times are recorded
       # in milliseconds.
@@ -67,7 +67,7 @@ module Librato
         end
       end
       alias :benchmark :time
-      
+
     private
 
       def create_persister
@@ -78,25 +78,26 @@ module Librato
       def epoch_time
         Time.now.to_i
       end
-      
+
       def setup_common_options(options)
         @autosubmit_interval = options[:autosubmit_interval]
         @client = options[:client] || Librato::Metrics.client
         @per_request = options[:per_request] || MEASUREMENTS_PER_REQUEST
         @source = options[:source]
+        @measure_time = options[:measure_time]
         @create_time = Time.now
         @clear_on_failure = options[:clear_failures] || false
         @prefix = options[:prefix]
       end
-      
+
       def autosubmit_check
         if @autosubmit_interval
           last = @last_submit_time || @create_time
           self.submit if (Time.now - last).to_i >= @autosubmit_interval
         end
       end
-      
+
     end
-    
+
   end
 end

data/lib/librato/metrics/queue.rb

@@ -71,7 +71,7 @@ module Librato
       def gauges
         @queued[:gauges] || []
       end
-      
+
       # Combines queueable measures from the given object
       # into this queue.
       #
@@ -108,6 +108,7 @@ module Librato
         return {} if @queued.empty?
         globals = {}
         globals[:source] = @source if @source
+        globals[:measure_time] = @measure_time if @measure_time
         @queued.merge(globals)
       end
 
@@ -118,15 +119,15 @@ module Librato
         self.queued.inject(0) { |result, data| result + data.last.size }
       end
       alias :length :size
-      
+
     private
-    
+
       def check_measure_time(data)
         if data[:measure_time].to_i < Metrics::MIN_MEASURE_TIME
           raise InvalidMeasureTime, "Measure time for submitted metric (#{data}) is invalid."
         end
       end
-    
+
       def reconcile_source(measurements, source)
         return measurements if !source || source == @source
         measurements.map! do |measurement|
@@ -137,7 +138,7 @@ module Librato
         end
         measurements
       end
-    
+
       def submit_check
         autosubmit_check # in Processor
         if @autosubmit_count && self.length >= @autosubmit_count

data/lib/librato/metrics/smart_json.rb

@@ -0,0 +1,31 @@
+# wrap MultiJSON's implementation so we can use any version
+module Librato
+  module Metrics
+    class SmartJSON
+
+      class << self
+
+        # prefer modern syntax; def once at startup
+        if MultiJson.respond_to?(:load)
+          def read(json)
+            MultiJson.load(json)
+          end
+
+          def write(data)
+            MultiJson.dump(data)
+          end
+        else
+          def read(json)
+            MultiJson.decode(json)
+          end
+
+          def write(data)
+            MultiJson.encode(data)
+          end
+        end
+
+      end
+
+    end
+  end
+end

data/lib/librato/metrics/version.rb

@@ -1,5 +1,5 @@
 module Librato
   module Metrics
-    VERSION = "0.7.3"
+    VERSION = "0.7.4"
   end
 end

data/librato-metrics.gemspec

@@ -25,7 +25,7 @@ Gem::Specification.new do |s|
 
   ## runtime dependencies
   s.add_dependency 'faraday', '~> 0.7'
-  s.add_dependency 'multi_json', '~> 1.3'
+  s.add_dependency 'multi_json'
   s.add_dependency 'aggregate', '~> 0.2.2'
 
   ## development dependencies
@@ -35,7 +35,7 @@ Gem::Specification.new do |s|
   s.add_development_dependency 'yard'
   s.add_development_dependency 'sinatra'
   s.add_development_dependency 'popen4'
-  
+
   # omitting for now because jruby-19mode can't handle
   #s.add_development_dependency 'rdiscount' # for yard
 

data/spec/integration/metrics/connection_spec.rb

@@ -2,13 +2,13 @@ require 'spec_helper'
 
 module Librato
   module Metrics
-   
+
     describe Connection do
-      
+
       # TODO: test retry support
       # TODO: test status code support
-      
+
     end
-    
+
   end
 end

data/spec/integration/metrics/middleware/count_requests_spec.rb

@@ -3,26 +3,26 @@ require 'spec_helper'
 module Librato
   module Metrics
     module Middleware
-      
+
       describe CountRequests do
         before(:all) { prep_integration_tests }
-      
+
         it "should count requests" do
           CountRequests.reset
           Metrics.submit :foo => 123
           Metrics.submit :foo => 135
-          CountRequests.total_requests.should == 2        
+          CountRequests.total_requests.should == 2
         end
-        
+
         it "should be resettable" do
           Metrics.submit :foo => 123
           CountRequests.total_requests.should > 0
           CountRequests.reset
           CountRequests.total_requests.should == 0
         end
-      
+
       end
-      
+
     end
   end
 end

data/spec/integration/metrics/queue_spec.rb

@@ -2,11 +2,11 @@ require 'spec_helper'
 
 module Librato
   module Metrics
-   
+
     describe Queue do
       before(:all) { prep_integration_tests }
       before(:each) { delete_all_metrics }
-      
+
       context "with a large number of metrics" do
         it "should submit them in multiple requests" do
           Middleware::CountRequests.reset
@@ -17,7 +17,7 @@ module Librato
           queue.submit
           Middleware::CountRequests.total_requests.should == 4
         end
-        
+
         it "should persist all metrics" do
           queue = Queue.new(:per_request => 2)
           (1..5).each do |i|
@@ -27,7 +27,7 @@ module Librato
             queue.add "counter_#{i}" => {:type => :counter, :value => i}
           end
           queue.submit
-          
+
           metrics = Metrics.list
           metrics.length.should == 8
           counter = Metrics.fetch :counter_3, :count => 1
@@ -36,21 +36,21 @@ module Librato
           gauge['unassigned'][0]['value'].should == 5
         end
       end
-      
+
       it "should respect default and individual sources" do
         queue = Queue.new(:source => 'default')
         queue.add :foo => 123
         queue.add :bar => {:value => 456, :source => 'barsource'}
         queue.submit
-        
+
         foo = Metrics.fetch :foo, :count => 2
         foo['default'][0]['value'].should == 123
-        
+
         bar = Metrics.fetch :bar, :count => 2
         bar['barsource'][0]['value'].should == 456
       end
-    
+
     end
-    
+
   end
 end

data/spec/integration/metrics_spec.rb

@@ -6,7 +6,7 @@ module Librato
 
     describe "#delete" do
       before(:each) { delete_all_metrics }
-      
+
       context "with a single argument" do
         it "should delete named metric" do
           Metrics.submit :foo => 123
@@ -15,7 +15,7 @@ module Librato
           Metrics.list(:name => :foo).should be_empty
         end
       end
-      
+
       context "with multiple arguments" do
         it "should delete named metrics" do
           Metrics.submit :foo => 123, :bar => 345, :baz => 567
@@ -25,7 +25,7 @@ module Librato
           Metrics.list(:name => :baz).should_not be_empty
         end
       end
-      
+
       context "with missing metric" do
         it "should run cleanly" do
           # the API currently returns success even if
@@ -33,7 +33,7 @@ module Librato
           Metrics.delete :missing
         end
       end
-      
+
       context "with no arguments" do
         it "should not make request" do
           lambda {
@@ -150,7 +150,7 @@ module Librato
           data['baz'][0]['value'] == 456.0
         end
       end
-      
+
       it "should not retain errors" do
         delete_all_metrics
         Metrics.submit :foo => {:type => :counter, :value => 12}
@@ -163,15 +163,15 @@ module Librato
       end
 
     end
-    
+
     describe "#update" do
-      
+
       context "with existing metric" do
         before do
           delete_all_metrics
           Metrics.submit :foo => 123
         end
-        
+
         it "should upate the metric" do
           Metrics.update :foo, :display_name => "Foo Metric",
                                :period => 15,
@@ -184,7 +184,7 @@ module Librato
           foo['attributes'].should == {'display_max' => 1000}
         end
       end
-      
+
       context "without an existing metric" do
         it "should create the metric if type specified" do
           delete_all_metrics
@@ -199,7 +199,7 @@ module Librato
           foo['period'].should == 15
           foo['attributes'].should == {'display_max' => 1000}
         end
-        
+
         it "should raise error if no type specified" do
           delete_all_metrics
           lambda {
@@ -211,7 +211,7 @@ module Librato
           }.should raise_error
         end
       end
-      
+
     end
 
   end

data/spec/rackups/status.ru

@@ -12,7 +12,7 @@ class App < Sinatra::Base
   get('/v1/not_found') do
     status 404
   end
-  
+
   post('/v1/service_unavailable')  do
     status 503
   end

data/spec/spec_helper.rb

@@ -10,7 +10,7 @@ require 'set'
 require 'librato/metrics'
 
 RSpec.configure do |config|
-  
+
   # purge all metrics from test account
   def delete_all_metrics
     connection = Librato::Metrics.client.connection
@@ -20,7 +20,7 @@ RSpec.configure do |config|
       connection.delete("metrics/#{metric['name']}")
     end
   end
-  
+
   # set up test account credentials for integration tests
   def prep_integration_tests
     raise 'no TEST_API_USER specified in environment' unless ENV['TEST_API_USER']
@@ -30,11 +30,11 @@ RSpec.configure do |config|
     end
     Librato::Metrics.authenticate ENV['TEST_API_USER'], ENV['TEST_API_KEY']
   end
-  
+
   def rackup_path(*parts)
     File.expand_path(File.join(File.dirname(__FILE__), 'rackups', *parts))
   end
-  
+
   # fire up a given rackup file for the enclosed tests
   def with_rackup(name)
     if RUBY_PLATFORM == 'java'
@@ -64,9 +64,9 @@ RSpec::Matchers.define :start_with do |start_string|
   end
 end
 
-# Compares hashes of arrays by converting the arrays to 
+# Compares hashes of arrays by converting the arrays to
 # sets before comparision
-# 
+#
 # @example
 #   {:foo => [1,3,2]}.should equal_unordered({:foo => [1,2,3]})
 RSpec::Matchers.define :equal_unordered do |result|

data/spec/unit/metrics/aggregator_spec.rb

@@ -44,7 +44,7 @@ module Librato
         it "should allow chaining" do
           subject.add(:foo => 1234).should == subject
         end
-        
+
         context "with single hash argument" do
           it "should record a single aggregate" do
             subject.add :foo => 3000
@@ -76,7 +76,7 @@ module Librato
             }
             subject.queued.should equal_unordered(expected)
           end
-          
+
           it "should respect source argument" do
             subject.add :foo => {:source => 'alpha', :value => 1}
             subject.add :foo => 5
@@ -85,19 +85,19 @@ module Librato
             expected = { :gauges => [
               { :name => 'foo', :source => 'alpha', :count => 2,
                 :sum => 7.0, :min => 1.0, :max => 6.0 },
-              { :name => 'foo', :count => 2, 
+              { :name => 'foo', :count => 2,
                 :sum => 15.0, :min => 5.0, :max => 10.0 }
             ]}
             subject.queued.should equal_unordered(expected)
           end
-          
+
           context "with a prefix set" do
             it "should auto-prepend names" do
               subject = Aggregator.new(:prefix => 'foo')
               subject.add :bar => 1
               subject.add :bar => 12
               expected = {:gauges => [
-                { :name =>'foo.bar', 
+                { :name =>'foo.bar',
                   :count => 2,
                   :sum => 13.0,
                   :min => 1.0,
@@ -114,7 +114,7 @@ module Librato
           it "should record a single aggregate" do
             subject.add :foo => 3000
             subject.add :bar => 30
-            expected = { 
+            expected = {
               #:measure_time => @time, TODO: support specific time
               :gauges => [
                 { :name => 'foo',
@@ -162,6 +162,21 @@ module Librato
         end
       end
 
+      describe "#queued" do
+        it "should include global source if set" do
+          a = Aggregator.new(:source => 'blah')
+          a.add :foo => 12
+          a.queued[:source].should == 'blah'
+        end
+
+        it "should include global measure_time if set" do
+          measure_time = (Time.now-1000).to_i
+          a = Aggregator.new(:measure_time => measure_time)
+          a.add :foo => 12
+          a.queued[:measure_time].should == measure_time
+        end
+      end
+
       describe "#submit" do
         before(:all) do
           Librato::Metrics.authenticate 'me@librato.com', 'foo'
@@ -210,20 +225,20 @@ module Librato
           end
         end
       end
-      
+
       context "with an autosubmit interval" do
         let(:client) do
           client = Client.new
           client.persistence = :test
           client
         end
-        
+
         it "should not submit immediately" do
           timed_agg = Aggregator.new(:client => client, :autosubmit_interval => 1)
           timed_agg.add :foo => 1
           timed_agg.persister.persisted.should be_nil # nothing sent
         end
-        
+
         it "should submit after interval" do
           timed_agg = Aggregator.new(:client => client, :autosubmit_interval => 1)
           timed_agg.add :foo => 1

data/spec/unit/metrics/connection_spec.rb

@@ -4,21 +4,21 @@ module Librato
   module Metrics
 
     describe Connection do
-      
+
       describe "#api_endpoint" do
         context "when not provided" do
           it "should be default" do
             subject.api_endpoint.should == 'https://metrics-api.librato.com'
           end
         end
-        
+
         context "when provided" do
           it "should be respected" do
             connection = Connection.new(:api_endpoint => 'http://test.com/')
             connection.api_endpoint.should == 'http://test.com/'
           end
         end
-      end  
+      end
 
       describe "#user_agent" do
         context "without an agent_identifier" do
@@ -36,7 +36,7 @@ module Librato
             connection.user_agent.should start_with('foo/0.5')
           end
         end
-        
+
         context "with a custom user agent set" do
           it "should use custom user agent" do
             client = Client.new
@@ -45,17 +45,17 @@ module Librato
             connection.user_agent.should == 'foo agent'
           end
         end
-        
+
         # TODO: verify user agent is being sent with rackup test
       end
-      
+
       describe "network operations" do
         context "when missing client" do
           it "should raise exception" do
             lambda { subject.get 'metrics' }.should raise_error(NoClientProvided)
           end
         end
-        
+
         context "with 400 class errors" do
           it "should not retry" do
             Middleware::CountRequests.reset
@@ -73,7 +73,7 @@ module Librato
             Middleware::CountRequests.total_requests.should == 2
           end
         end
-        
+
         context "with 500 class errors" do
           it "should retry" do
             Middleware::CountRequests.reset
@@ -89,8 +89,8 @@ module Librato
           end
         end
       end
-      
+
     end
-    
+
   end
 end

data/spec/unit/metrics/queue/autosubmission_spec.rb

@@ -4,7 +4,7 @@ module Librato
   module Metrics
 
     describe Queue do
-      
+
       let(:client) {
         client = Client.new
         client.persistence = :test
@@ -18,7 +18,7 @@ module Librato
           vol_queue.add :bar => 2
           vol_queue.persister.persisted.should_not be_nil # sent
         end
-        
+
         it "should not submit if the max has not been reached" do
           vol_queue = Queue.new(:client => client, :autosubmit_count => 5)
           vol_queue.add :foo => 1
@@ -26,14 +26,14 @@ module Librato
           vol_queue.persister.persisted.should be_nil # nothing sent
         end
       end
-      
+
       context "with an autosubmit interval" do
         it "should not submit immediately" do
           vol_queue = Queue.new(:client => client, :autosubmit_interval => 1)
           vol_queue.add :foo => 1
           vol_queue.persister.persisted.should be_nil # nothing sent
         end
-        
+
         it "should submit after interval" do
           vol_queue = Queue.new(:client => client, :autosubmit_interval => 1)
           vol_queue.add :foo => 1

data/spec/unit/metrics/queue_spec.rb

@@ -31,7 +31,7 @@ module Librato
         it "should allow chaining" do
           subject.add(:foo => 123).should == subject
         end
-        
+
         context "with single hash argument" do
           it "should record a key-value gauge" do
             expected = {:gauges => [{:name => 'foo', :value => 3000, :measure_time => @time}]}
@@ -71,18 +71,18 @@ 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}, 
+              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
-          
+
           context "when dynamically changing prefix" do
             it "should auto-append names" do
               subject.add :bar => 12
@@ -94,7 +94,7 @@ module Librato
               subject.add :bar => 45
               expected = {:gauges => [
                 {:name => 'bar', :value => 12, :measure_time => @time},
-                {:name => 'foo.bar', :value => 23, :measure_time => @time}, 
+                {:name => 'foo.bar', :value => 23, :measure_time => @time},
                 {:name => 'foo.bar', :value => 34, :measure_time => @time},
                 {:name => 'bar', :value => 45, :measure_time => @time}]}
               subject.queued.should equal_unordered(expected)
@@ -111,26 +111,26 @@ module Librato
             subject.queued.should equal_unordered(expected)
           end
         end
-        
+
         context "with a measure_time" do
           it "should accept time objects" do
             time = Time.now-5
             subject.add :foo => {:measure_time => time, :value => 123}
             subject.queued[:gauges][0][:measure_time].should == time
           end
-          
+
           it "should accept integers" do
             time = 1336574713
             subject.add :foo => {:measure_time => time, :value => 123}
             subject.queued[:gauges][0][:measure_time].should == time
           end
-          
+
           it "should accept strings" do
             time = '1336574713'
             subject.add :foo => {:measure_time => time, :value => 123}
             subject.queued[:gauges][0][:measure_time].should == time
           end
-          
+
           it "should raise exception in invalid time" do
             lambda {
               subject.add :foo => {:measure_time => '12', :value => 123}
@@ -173,17 +173,17 @@ module Librato
           subject.gauges.should eql []
         end
       end
-      
+
       describe "#last_submit_time" do
         before(:all) do
           Librato::Metrics.authenticate 'me@librato.com', 'foo'
           Librato::Metrics.persistence = :test
         end
-        
+
         it "should default to nil" do
           subject.last_submit_time.should be_nil
         end
-        
+
         it "should store last submission time" do
           prior = Time.now
           subject.add :foo => 123
@@ -191,7 +191,7 @@ module Librato
           subject.last_submit_time.should >= prior
         end
       end
-      
+
       describe "#merge!" do
         context "with another queue" do
           it "should merge gauges" do
@@ -205,7 +205,7 @@ module Librato
                                   {:name=>"baz", :value=>678, :measure_time => @time}]}
             q2.queued.should equal_unordered(expected)
           end
-          
+
           it "should merge counters" do
             q1 = Queue.new
             q1.add :users => {:type => :counter, :value => 1000}
@@ -218,7 +218,7 @@ module Librato
                                     {:name=>"signups", :value=>500, :measure_time => @time}]}
             q2.queued.should equal_unordered(expected)
           end
-          
+
           it "should maintain specified sources" do
             q1 = Queue.new
             q1.add :neo => {:source => 'matrix', :value => 123}
@@ -226,7 +226,7 @@ module Librato
             q2.merge!(q1)
             q2.queued[:gauges][0][:source].should == 'matrix'
           end
-          
+
           it "should not change default source" do
             q1 = Queue.new(:source => 'matrix')
             q1.add :neo => 456
@@ -234,7 +234,7 @@ module Librato
             q2.merge!(q1)
             q2.queued[:source].should == 'red_pill'
           end
-          
+
           it "should track previous default source" do
             q1 = Queue.new(:source => 'matrix')
             q1.add :neo => 456
@@ -247,7 +247,7 @@ module Librato
               end
             end
           end
-          
+
           it "should handle empty cases" do
             q1 = Queue.new
             q1.add :foo => 123, :users => {:type => :counter, :value => 1000}
@@ -258,7 +258,7 @@ module Librato
             q2.queued.should == expected
           end
         end
-        
+
         context "with an aggregator" do
           it "should merge" do
             aggregator = Aggregator.new(:source => 'aggregator')
@@ -267,14 +267,14 @@ module Librato
             queue = Queue.new(:source => 'queue')
             queue.add :gauge => 42
             queue.merge!(aggregator)
-            expected = {:gauges=>[{:name=>"gauge", :value=>42, :measure_time=>@time}, 
+            expected = {:gauges=>[{:name=>"gauge", :value=>42, :measure_time=>@time},
                                   {:name=>"timing", :count=>2, :sum=>305.0, :min=>102.0, :max=>203.0, :source=>"aggregator"}],
                         :source=>'queue'}
             queue.queued.should equal_unordered(expected)
-            
+
           end
         end
-        
+
         context "with a hash" do
           it "should merge" do
             to_merge = {:gauges=>[{:name => 'foo', :value => 123}],
@@ -286,13 +286,28 @@ module Librato
           end
         end
       end
-      
+
       describe "#per_request" do
         it "should default to 500" do
           subject.per_request.should == 500
         end
       end
 
+      describe "#queued" do
+        it "should include global source if set" do
+          q = Queue.new(:source => 'blah')
+          q.add :foo => 12
+          q.queued[:source].should == 'blah'
+        end
+
+        it "should include global measure_time if set" do
+          measure_time = (Time.now-1000).to_i
+          q = Queue.new(:measure_time => measure_time)
+          q.add :foo => 12
+          q.queued[:measure_time].should == measure_time
+        end
+      end
+
       describe "#size" do
         it "should return empty if gauges and counters are emtpy" do
           subject.size.should eq 0

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: librato-metrics
 version: !ruby/object:Gem::Version
-  version: 0.7.3
+  version: 0.7.4
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-10-16 00:00:00.000000000 Z
+date: 2012-11-06 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: faraday
@@ -32,17 +32,17 @@ dependencies:
   requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
-    - - ~>
+    - - ! '>='
       - !ruby/object:Gem::Version
-        version: '1.3'
+        version: '0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     none: false
     requirements:
-    - - ~>
+    - - ! '>='
       - !ruby/object:Gem::Version
-        version: '1.3'
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: aggregate
   requirement: !ruby/object:Gem::Requirement
@@ -186,6 +186,7 @@ files:
 - lib/librato/metrics/persistence/test.rb
 - lib/librato/metrics/processor.rb
 - lib/librato/metrics/queue.rb
+- lib/librato/metrics/smart_json.rb
 - lib/librato/metrics/version.rb
 - librato-metrics.gemspec
 - spec/integration/metrics/connection_spec.rb
@@ -215,7 +216,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: -3606609391443233543
+      hash: -3428658007385951534
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements: