librato-metrics 1.0.2 → 1.0.3

data/CHANGELOG.md

@@ -1,5 +1,9 @@
 ## Changelog
 
+### Version 1.0.3
+* Fix bug where retries of POST requests could 400
+* Network related exceptions capture response state better
+
 ### Version 1.0.2
 * Fix bug with some versions of MultiJson (Thomas Dippel)
 * Use delegation for JSON handling

data/lib/librato/metrics/connection.rb

@@ -30,13 +30,10 @@ module Librato
       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::ExpectsStatus
-          #f.use FaradayMiddleware::ParseJson, :content_type => /\bjson$/
 
           f.adapter @adapter || Metrics.faraday_adapter
         end.tap do |transport|

data/lib/librato/metrics/errors.rb

@@ -10,7 +10,14 @@ module Librato
     class InvalidMeasureTime < MetricsError; end
     class NotMergeable < MetricsError; end
 
-    class NetworkError < StandardError; end
+    class NetworkError < StandardError
+      attr_reader :response
+
+      def initialize(msg, response = nil)
+        super(msg)
+        @response = response
+      end
+    end
 
     class ClientError < NetworkError; end
     class Unauthorized < ClientError; end

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

@@ -8,17 +8,17 @@ module Librato
           # TODO: make exception output prettier
           case env[:status]
           when 401
-            raise Unauthorized, env.to_s
+            raise Unauthorized.new(env.to_s, env)
           when 403
-            raise Forbidden, env.to_s
+            raise Forbidden.new(env.to_s, env)
           when 404
-            raise NotFound, env.to_s
+            raise NotFound.new(env.to_s, env)
           when 422
-            raise EntityAlreadyExists, env.to_s
+            raise EntityAlreadyExists.new(env.to_s, env)
           when 400..499
-            raise ClientError, env.to_s
+            raise ClientError.new(env.to_s, env)
           when 500..599
-            raise ServerError, env.to_s
+            raise ServerError.new(env.to_s, env)
           end
         end
 

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

@@ -11,9 +11,11 @@ module Librato
 
         def call(env)
           retries = @retries
+          request_body = env[:body]
           begin
+            env[:body] = request_body # after failure is set to response body
             @app.call(env)
-          rescue Librato::Metrics::ServerError, Timeout::Error, 
+          rescue Librato::Metrics::ServerError, Timeout::Error,
                  Faraday::Error::ConnectionFailed
             if retries > 0
               retries -= 1 and retry

data/lib/librato/metrics/version.rb

@@ -1,5 +1,5 @@
 module Librato
   module Metrics
-    VERSION = "1.0.2"
+    VERSION = "1.0.3"
   end
 end

data/spec/integration/metrics/annotator_spec.rb

@@ -60,8 +60,9 @@ module Librato
           subject.add :deployment, 'deployed v47'
           events = subject.fetch(:deployment, :start_time => Time.now.to_i-60)
           events = events['events']['unassigned']
-          ids = events.each_with_object({}) do |event, hash|
+          ids = events.reduce({}) do |hash, event|
             hash[event['title']] = event['id']
+            hash
           end
           subject.delete_event :deployment, ids['deployed v47']
           events = subject.fetch(:deployment, :start_time => Time.now.to_i-60)

data/spec/integration/metrics_spec.rb

@@ -228,7 +228,7 @@ module Librato
         it "should create the metric if type specified" do
           delete_all_metrics
           Metrics.update :foo, :display_name => "Foo Metric",
-                               :type => :gauge,
+                               :type => 'gauge',
                                :period => 15,
                                :attributes => {
                                  :display_max => 1000

data/spec/rackups/status.ru

@@ -16,6 +16,15 @@ class App < Sinatra::Base
   post('/v1/service_unavailable')  do
     status 503
   end
+
+  post('/v1/retry_body') do
+    body = request.env["rack.input"].read
+    if body.empty?
+      status 504 # body not sent
+    else
+      status 502 # body sent
+    end
+  end
 end
 
 run App

data/spec/unit/metrics/connection_spec.rb

@@ -56,12 +56,16 @@ module Librato
           end
         end
 
+        let(:client) do
+          client = Client.new
+          client.api_endpoint = 'http://127.0.0.1:9296'
+          client.authenticate 'foo', 'bar'
+          client
+        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'
@@ -70,26 +74,39 @@ module Librato
                 client.connection.transport.post 'forbidden'
               }.should raise_error(ClientError)
             end
-            Middleware::CountRequests.total_requests.should == 2
+            Middleware::CountRequests.total_requests.should == 2 # no retries
           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
+            Middleware::CountRequests.total_requests.should == 4 # did retries
+          end
+
+          it "should send consistent body with retries" do
+            Middleware::CountRequests.reset
+            status = 0
+            begin
+              with_rackup('status.ru') do
+                response = client.connection.transport.post do |req|
+                  req.url 'retry_body'
+                  req.body = '{"foo": "bar", "baz": "kaboom"}'
+                end
+              end
+            rescue Exception => error
+              status = error.response[:status].to_i
+            end
+            Middleware::CountRequests.total_requests.should == 4 # did retries
+            status.should be(502)#, 'body should be sent for retries'
           end
         end
       end
-
     end
 
   end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: librato-metrics
 version: !ruby/object:Gem::Version
-  version: 1.0.2
+  version: 1.0.3
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-12-23 00:00:00.000000000 Z
+date: 2013-01-28 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: faraday
@@ -218,7 +218,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: 2478461788804600344
+      hash: 3023872404930290893
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements: