librato-metrics 0.5.0.pre1 → 0.5.0

data/.travis.yml

@@ -1,5 +1,4 @@
 rvm:
-  - 1.8.6
   - 1.8.7
   - ree
   - 1.9.2

data/CHANGELOG.md

@@ -3,6 +3,7 @@
 ### Version 0.5.0
 * Support using multiple accounts simultaneously via Client
 * Switch network library to faraday for broader platform support and flexibility
+* Automatically break large submissions into multiple requests for better performance
 * Automatic retry support
 * Consolidate connection functions in Connection
 * Documentation improvements

data/README.md

@@ -1,6 +1,8 @@
 Librato Metrics
 =======
 
+[![Build Status](https://secure.travis-ci.org/librato/librato-metrics.png?branch=master)](http://travis-ci.org/librato/librato-metrics)
+
 A convenient Ruby wrapper for the Librato Metrics API.
 
 ## Installation
@@ -140,19 +142,21 @@ 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.
 
-## Known Issues & Coming Improvements
+## Feature Roadmap
 
-This is an early release and as such is lacking some capabilities slated for future releases.
+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.
 
-* Query actions currently do not auto-paginate with large result sets
-* Very large metric POSTs are not automatically chunked for performance
-* Some error conditions currently lack gem-specific exceptions
+* Queue objects support a single default measure_time to use for any measurements which don't have it set
+* Queues auto-submit when they hit a set number of records
+* Queues auto-submit when they hit a max time interval
+* 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.
 * Check out the issue tracker to make sure someone already hasn't requested it and/or contributed it.
 * Fork the project and submit a pull request from a feature or bugfix branch.
+* Please review our [code conventions](https://github.com/librato/librato-metrics/wiki/Code-Conventions).
 * Please include specs. This is important so we don't break your changes unintentionally in a future version.
 * Please don't modify the gemspec, Rakefile, version, or changelog. If you do change these files, please isolate a separate commit so we can cherry-pick around it.
 

data/lib/librato/metrics/connection.rb

@@ -1,4 +1,5 @@
 require 'faraday'
+require 'metrics/middleware/count_requests'
 require 'metrics/middleware/expects_status'
 require 'metrics/middleware/retry'
 
@@ -29,6 +30,7 @@ module Librato
         @transport ||= Faraday::Connection.new(:url => api_endpoint + "/v1/") do |f|
           #f.use FaradayMiddleware::EncodeJson
           f.use Librato::Metrics::Middleware::Retry
+          f.use Librato::Metrics::Middleware::CountRequests
           f.use Librato::Metrics::Middleware::ExpectsStatus
           #f.use FaradayMiddleware::ParseJson, :content_type => /\bjson$/
           f.adapter Faraday.default_adapter

data/lib/librato/metrics/errors.rb

@@ -8,6 +8,16 @@ module Librato
     class AgentInfoMissing < MetricsError; end
     class NoMetricsQueued < MetricsError; end
     class NoClientProvided < 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
 end

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

@@ -0,0 +1,29 @@
+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
+        end
+
+        def call(env)
+          self.class.increment
+          @app.call(env)
+        end
+      end
+      
+    end
+  end
+end
+   

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

@@ -8,10 +8,18 @@ module Librato
           # TODO: clean up exception output
           # TODO: catch specific status codes by request
           case env[:status]
+          when 401
+            raise Unauthorized, env.to_s
+          when 403
+            raise Forbidden, env.to_s
           when 404
-            raise Faraday::Error::ResourceNotFound, env.to_s
-          when 400..600
-            raise Faraday::Error::ClientError, env.to_s
+            raise NotFound, env.to_s
+          when 422
+            raise EntityAlreadyExists, env.to_s
+          when 400..499
+            raise ClientError, env.to_s
+          when 500..599
+            raise ServerError, env.to_s
           end
         end
         

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

@@ -12,13 +12,14 @@ module Librato
 
         def call(env)
           retries = @retries
-          @app.call(env)
-        rescue StandardError, Timeout::Error
-          if retries > 0
-            retries -= 1
-            retry
+          begin
+            @app.call(env)
+          rescue Librato::Metrics::ServerError, Timeout::Error
+            if retries > 0
+              retries -= 1 and retry
+            end
+            raise
           end
-          raise
         end
         
       end

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

@@ -9,10 +9,42 @@ module Librato
         # Persist the queued metrics directly to the
         # Metrics web API.
         #
-        def persist(client, queued)
-          payload = MultiJson.encode(queued)
-          # expects 200
-          client.connection.post('metrics', payload)
+        def persist(client, queued, options={})
+          per_request = options[:per_request]
+          if per_request
+            requests = chunk_queued(queued, per_request)
+          else
+            requests = [queued]
+          end
+          requests.each do |request|
+            payload = MultiJson.encode(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 = []
+          queued.each do |metric_type, measurements|
+            if measurements.size <= per_request
+              # we can fit all of this metric type in a single
+              # request, so do so
+              reqs << {metric_type => measurements}
+            else
+              # going to have to split things up
+              measurements.each_slice(per_request) do |elements|
+                reqs << {metric_type => elements}
+              end
+            end
+          end
+          reqs
+        end
+        
+        def queue_count(queued)
+          queued.inject(0) { |result, data| result + data.last.size }
         end
 
       end

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

@@ -6,7 +6,7 @@ module Librato
       class Test
 
         # persist the given metrics
-        def persist(client, metrics)
+        def persist(client, metrics, options={})
           @persisted = metrics
           return !@return_value.nil? ? @return_value : true
         end

data/lib/librato/metrics/queue.rb

@@ -1,13 +1,16 @@
 module Librato
   module Metrics
     class Queue
+      MEASUREMENTS_PER_REQUEST = 500
 
+      attr_reader :per_request
       attr_accessor :skip_measurement_times
 
       def initialize(options={})
-        @queued ||= {}
-        @skip_measurement_times = options.delete(:skip_measurement_times)
-        @client = options.delete(:client) || Librato::Metrics.client
+        @queued = {}
+        @per_request = options[:per_request] || MEASUREMENTS_PER_REQUEST
+        @skip_measurement_times = options[:skip_measurement_times]
+        @client = options[:client] || Librato::Metrics.client
       end
 
       # Add a metric entry to the metric set:
@@ -99,7 +102,8 @@ module Librato
       # @return Boolean
       def submit
         raise NoMetricsQueued if self.queued.empty?
-        if persister.persist(self.client, self.queued)
+        options = {:per_request => @per_request}
+        if persister.persist(self.client, self.queued, options)
           flush and return true
         end
         false

data/lib/librato/metrics/version.rb

@@ -1,5 +1,5 @@
 module Librato
   module Metrics
-    VERSION = "0.5.0.pre1"
+    VERSION = "0.5.0"
   end
 end

data/librato-metrics.gemspec

@@ -33,6 +33,8 @@ Gem::Specification.new do |s|
   s.add_development_dependency 'pry'
   s.add_development_dependency 'yard'
   s.add_development_dependency 'rdiscount' # for yard
+  s.add_development_dependency 'sinatra'
+  s.add_development_dependency 'popen4'
 
   s.files = `git ls-files`.split("\n")
   s.test_files = `git ls-files -- {test,spec,features}/*`.split("\n")

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

@@ -0,0 +1,28 @@
+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        
+        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

@@ -0,0 +1,43 @@
+require 'spec_helper'
+
+module Librato
+  module Metrics
+   
+    describe Queue do
+      before(:all) { prep_integration_tests }
+      
+      context "with a large number of metrics" do
+        it "should submit them in multiple requests" do
+          Middleware::CountRequests.reset
+          queue = Queue.new(:per_request => 3)
+          (1..10).each do |i|
+            queue.add "gauge_#{i}" => 1
+          end
+          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|
+            queue.add "gauge_#{i}" => i
+          end
+          (1..3).each do |i|
+            queue.add "counter_#{i}" => {:type => :counter, :value => i}
+          end
+          
+          delete_all_metrics
+          queue.submit
+          
+          metrics = Metrics.list
+          metrics.length.should == 8
+          counter = Metrics.fetch :counter_3, :count => 1
+          counter['unassigned'][0]['value'].should == 3
+          gauge = Metrics.fetch :gauge_5, :count => 1
+          gauge['unassigned'][0]['value'].should == 5
+        end
+      end
+    end
+    
+  end
+end

data/spec/integration/metrics_spec.rb

@@ -7,11 +7,12 @@ module Librato
     describe "#fetch" do
       before(:all) do
         delete_all_metrics
-        Metrics.submit :my_counter => {:type => :counter, :value => 0}
+        Metrics.submit :my_counter => {:type => :counter, :value => 0, :measure_time => Time.now.to_i-60}
         1.upto(2).each do |i|
-          sleep 1
-          Metrics.submit :my_counter => {:type => :counter, :value => i}
-          Metrics.submit :my_counter => {:source => 'baz', :type => :counter, :value => i+1}
+          measure_time = Time.now.to_i - (5+i)
+          opts = {:measure_time => measure_time, :type => :counter}
+          Metrics.submit :my_counter => opts.merge(:value => i)
+          Metrics.submit :my_counter => opts.merge(:source => 'baz', :value => i+1)
         end
       end
 

data/spec/rackups/status.ru

@@ -0,0 +1,21 @@
+require 'sinatra'
+
+class App < Sinatra::Base
+  get('/v1/success') do
+    status 200
+  end
+
+  post('/v1/forbidden') do
+    status 403
+  end
+
+  get('/v1/not_found') do
+    status 404
+  end
+  
+  post('/v1/service_unavailable')  do
+    status 503
+  end
+end
+
+run App

data/spec/spec_helper.rb

@@ -1,13 +1,26 @@
 $LOAD_PATH.unshift(File.join(File.dirname(__FILE__), '..', 'lib'))
 
-require 'pry'
+# only load pry for MRI > 1.8
+require 'pry' if RUBY_ENGINE == 'ruby' rescue nil
+require 'popen4'
 require 'rspec'
 require 'rspec/mocks/standalone'
+require 'set'
 
 require 'librato/metrics'
 
 RSpec.configure do |config|
-
+  
+  # purge all metrics from test account
+  def delete_all_metrics
+    connection = Librato::Metrics.client.connection
+    Librato::Metrics.list.each do |metric|
+      #puts "deleting #{metric['name']}..."
+      # expects 204
+      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']
@@ -17,14 +30,26 @@ RSpec.configure do |config|
     end
     Librato::Metrics.authenticate ENV['TEST_API_USER'], ENV['TEST_API_KEY']
   end
-
-  # purge all metrics from test account
-  def delete_all_metrics
-    connection = Librato::Metrics.client.connection
-    Librato::Metrics.list.each do |metric|
-      #puts "deleting #{metric['name']}..."
-      # expects 204
-      connection.delete("metrics/#{metric['name']}")
+  
+  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'
+      pid, w, r, e = IO.popen4("rackup", rackup_path(name), '-p 9296')
+    else
+      GC.disable
+      pid, w, r, e = Open4.popen4("rackup", rackup_path(name), '-p 9296')
+    end
+    until e.gets =~ /HTTPServer#start:/; end
+    yield
+  ensure
+    Process.kill(9, pid)
+    if RUBY_PLATFORM != 'java'
+      GC.enable
+      Process.wait(pid)
     end
   end
 
@@ -37,4 +62,17 @@ RSpec::Matchers.define :start_with do |start_string|
     start_length = start_string.length
     string[0..start_length-1] == start_string
   end
+end
+
+# 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|
+  result.each { |key, value| result[key] = value.to_set }
+  match do |target|
+    target.each { |key, value| target[key] = value.to_set }
+    target == result
+  end
 end

data/spec/unit/metrics/client_spec.rb

@@ -92,7 +92,7 @@ module Librato
           subject.authenticate 'me@librato.com', 'foo'
           subject.persistence = :test
           subject.submit(:foo => 123).should eql true
-          subject.persister.persisted.should eql({:gauges => [{:name => 'foo', :value => 123}]})
+          subject.persister.persisted.should == {:gauges => [{:name => 'foo', :value => 123}]}
         end
 
         it "should tolerate muliple metrics" do
@@ -100,7 +100,7 @@ module Librato
           subject.persistence = :test
           lambda{ subject.submit :foo => 123, :bar => 456 }.should_not raise_error
           expected = {:gauges => [{:name => 'foo', :value => 123}, {:name => 'bar', :value => 456}]}
-          subject.persister.persisted.should eql expected
+          subject.persister.persisted.should equal_unordered(expected)
         end
       end
 

data/spec/unit/metrics/connection_spec.rb

@@ -5,14 +5,6 @@ module Librato
 
     describe Connection do
       
-      describe "network operations" do
-        context "when missing client" do
-          it "should raise exception" do
-            lambda { subject.get 'metrics' }#.should raise(NoClientProvided)
-          end
-        end
-      end
-      
       describe "#api_endpoint" do
         context "when not provided" do
           it "should be default" do
@@ -48,6 +40,46 @@ module Librato
         # 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
+            client = Client.new
+            client.api_endpoint = 'http://127.0.0.1:9296'
+            client.authenticate 'foo', 'bar'
+            with_rackup('status.ru') do
+              lambda {
+                client.connection.transport.post 'not_found'
+              }.should raise_error(NotFound)
+              lambda {
+                client.connection.transport.post 'forbidden'
+              }.should raise_error(ClientError)
+            end
+            Middleware::CountRequests.total_requests.should == 2
+          end
+        end
+        
+        context "with 500 class errors" do
+          it "should retry" do
+            Middleware::CountRequests.reset
+            client = Client.new
+            client.api_endpoint = 'http://127.0.0.1:9296'
+            client.authenticate 'foo', 'bar'
+            with_rackup('status.ru') do
+              lambda {
+                client.connection.transport.post 'service_unavailable'
+              }.should raise_error(ServerError)
+            end
+            Middleware::CountRequests.total_requests.should == 4
+          end
+        end
+      end
       
     end
     

data/spec/unit/metrics/queue_spec.rb

@@ -1,11 +1,11 @@
-require "spec_helper.rb"
+require "spec_helper"
 
 module Librato
   module Metrics
 
     describe Queue do
 
-      before(:all) do
+      before(:each) do
         @time = Time.now.to_i
         Queue.stub(:epoch_time).and_return(@time)
       end
@@ -30,8 +30,9 @@ module Librato
       describe "#add" do
         context "with single hash argument" do
           it "should record a key-value gauge" do
+            expected = {:gauges => [{:name => 'foo', :value => 3000, :measure_time => @time}]}
             subject.add :foo => 3000
-            subject.queued.should eql({:gauges => [{:name => 'foo', :value => 3000, :measure_time => @time}]})
+            subject.queued.should equal_unordered(expected)
           end
         end
 
@@ -39,19 +40,19 @@ module Librato
           it "should record counters" do
             subject.add :total_visits => {:type => :counter, :value => 4000}
             expected = {:counters => [{:name => 'total_visits', :value => 4000, :measure_time => @time}]}
-            subject.queued.should eql expected
+            subject.queued.should equal_unordered(expected)
           end
 
           it "should record gauges" do
             subject.add :temperature => {:type => :gauge, :value => 34}
             expected = {:gauges => [{:name => 'temperature', :value => 34, :measure_time => @time}]}
-            subject.queued.should eql expected
+            subject.queued.should equal_unordered(expected)
           end
 
           it "should accept type key as string or a symbol" do
             subject.add :total_visits => {"type" => "counter", :value => 4000}
             expected = {:counters => [{:name => 'total_visits', :value => 4000, :measure_time => @time}]}
-            subject.queued.should eql expected
+            subject.queued.should equal_unordered(expected)
           end
         end
 
@@ -64,7 +65,7 @@ module Librato
             expected = {:gauges => [{:value => 35.4, :name => 'disk_use', :period => 2,
               :description => 'current disk utilization', :measure_time => measure_time,
               :source => 'db2'}]}
-            subject.queued.should eql expected
+            subject.queued.should equal_unordered(expected)
           end
         end
 
@@ -74,7 +75,7 @@ module Librato
             expected = {:gauges=>[{:name=>"foo", :value=>123, :measure_time => @time},
                                   {:name=>"bar", :value=>345, :measure_time => @time},
                                   {:name=>"baz", :value=>567, :measure_time => @time}]}
-            subject.queued.should eql expected
+            subject.queued.should equal_unordered(expected)
           end
         end
       end
@@ -113,6 +114,12 @@ module Librato
           subject.gauges.should eql []
         end
       end
+      
+      describe "#per_request" do
+        it "should default to 500" do
+          subject.per_request.should == 500
+        end
+      end
 
       describe "#size" do
         it "should return empty if gauges and counters are emtpy" do
@@ -159,7 +166,7 @@ module Librato
             end
             queued = subject.queued[:gauges][0]
             queued[:name].should == 'sleeping'
-            queued[:value].should be > 100
+            queued[:value].should be >= 100
             queued[:value].should be_within(30).of(100)
           end
         end
@@ -173,7 +180,7 @@ module Librato
             queued[:name].should == 'sleep_two'
             queued[:period].should == 2
             queued[:source].should == 'app1'
-            queued[:value].should be > 50
+            queued[:value].should be >= 50
             queued[:value].should be_within(30).of(50)
           end
         end

data/spec/unit/metrics_spec.rb

@@ -35,13 +35,13 @@ module Librato
      it "should persist metrics immediately" do
        Metrics.persistence = :test
        Metrics.submit(:foo => 123).should eql true
-       Metrics.persister.persisted.should eql({:gauges => [{:name => 'foo', :value => 123}]})
+       Metrics.persister.persisted.should == {:gauges => [{:name => 'foo', :value => 123}]}
      end
 
      it "should tolerate multiple metrics" do
        lambda{ Librato::Metrics.submit :foo => 123, :bar => 456 }.should_not raise_error
        expected = {:gauges => [{:name => 'foo', :value => 123}, {:name => 'bar', :value => 456}]}
-       Librato::Metrics.persister.persisted.should eql expected
+       Librato::Metrics.persister.persisted.should equal_unordered(expected)
      end
 
    end

metadata

@@ -1,19 +1,19 @@
 --- !ruby/object:Gem::Specification
 name: librato-metrics
 version: !ruby/object:Gem::Version
-  version: 0.5.0.pre1
-  prerelease: 6
+  version: 0.5.0
+  prerelease: 
 platform: ruby
 authors:
 - Matt Sanders
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-03-26 00:00:00.000000000Z
+date: 2012-04-02 00:00:00.000000000Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: faraday
-  requirement: &70341863470180 !ruby/object:Gem::Requirement
+  requirement: &70301317338000 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -21,10 +21,10 @@ dependencies:
         version: 0.7.6
   type: :runtime
   prerelease: false
-  version_requirements: *70341863470180
+  version_requirements: *70301317338000
 - !ruby/object:Gem::Dependency
   name: multi_json
-  requirement: &70341863469760 !ruby/object:Gem::Requirement
+  requirement: &70301317369580 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -32,10 +32,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *70341863469760
+  version_requirements: *70301317369580
 - !ruby/object:Gem::Dependency
   name: rake
-  requirement: &70341863469300 !ruby/object:Gem::Requirement
+  requirement: &70301317369120 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -43,10 +43,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70341863469300
+  version_requirements: *70301317369120
 - !ruby/object:Gem::Dependency
   name: rspec
-  requirement: &70341863468800 !ruby/object:Gem::Requirement
+  requirement: &70301317368620 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -54,10 +54,10 @@ dependencies:
         version: 2.6.0
   type: :development
   prerelease: false
-  version_requirements: *70341863468800
+  version_requirements: *70301317368620
 - !ruby/object:Gem::Dependency
   name: pry
-  requirement: &70341863468380 !ruby/object:Gem::Requirement
+  requirement: &70301317368200 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -65,10 +65,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70341863468380
+  version_requirements: *70301317368200
 - !ruby/object:Gem::Dependency
   name: yard
-  requirement: &70341863467920 !ruby/object:Gem::Requirement
+  requirement: &70301317367740 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -76,10 +76,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70341863467920
+  version_requirements: *70301317367740
 - !ruby/object:Gem::Dependency
   name: rdiscount
-  requirement: &70341863467500 !ruby/object:Gem::Requirement
+  requirement: &70301317367320 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -87,7 +87,29 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70341863467500
+  version_requirements: *70301317367320
+- !ruby/object:Gem::Dependency
+  name: sinatra
+  requirement: &70301317366900 !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :development
+  prerelease: false
+  version_requirements: *70301317366900
+- !ruby/object:Gem::Dependency
+  name: popen4
+  requirement: &70301317366480 !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :development
+  prerelease: false
+  version_requirements: *70301317366480
 description: An easy to use ruby wrapper for Librato's Metrics API
 email: matt@librato.com
 executables: []
@@ -107,6 +129,7 @@ files:
 - lib/librato/metrics/collection.rb
 - lib/librato/metrics/connection.rb
 - lib/librato/metrics/errors.rb
+- lib/librato/metrics/middleware/count_requests.rb
 - lib/librato/metrics/middleware/expects_status.rb
 - lib/librato/metrics/middleware/retry.rb
 - lib/librato/metrics/persistence.rb
@@ -116,7 +139,10 @@ files:
 - lib/librato/metrics/version.rb
 - librato-metrics.gemspec
 - spec/integration/metrics/connection_spec.rb
+- spec/integration/metrics/middleware/count_requests_spec.rb
+- spec/integration/metrics/queue_spec.rb
 - spec/integration/metrics_spec.rb
+- spec/rackups/status.ru
 - spec/spec_helper.rb
 - spec/unit/metrics/client_spec.rb
 - spec/unit/metrics/connection_spec.rb
@@ -138,9 +164,9 @@ required_ruby_version: !ruby/object:Gem::Requirement
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements:
-  - - ! '>'
+  - - ! '>='
     - !ruby/object:Gem::Version
-      version: 1.3.1
+      version: '0'
 requirements: []
 rubyforge_project: 
 rubygems_version: 1.8.16
@@ -149,7 +175,10 @@ specification_version: 2
 summary: Ruby wrapper for Librato's Metrics API
 test_files:
 - spec/integration/metrics/connection_spec.rb
+- spec/integration/metrics/middleware/count_requests_spec.rb
+- spec/integration/metrics/queue_spec.rb
 - spec/integration/metrics_spec.rb
+- spec/rackups/status.ru
 - spec/spec_helper.rb
 - spec/unit/metrics/client_spec.rb
 - spec/unit/metrics/connection_spec.rb