librato-metrics 0.7.4 → 0.7.5

data/CHANGELOG.md

@@ -1,8 +1,12 @@
 ## Changelog
 
+### Version 0.7.5
+* Catch a broader range of connection failures for retrying
+* Add Metrics.faraday_adapter config option (Mathieu Ravaux)_
+
 ### Version 0.7.4
 * Support global measure_time option for Queues/Aggregators
-* Support all versions of multi_json so we can relax version constraint_
+* 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/lib/librato/metrics.rb

@@ -71,8 +71,9 @@ module Librato
     #
     def_delegators :client, :agent_identifier, :api_endpoint,
                    :api_endpoint=, :authenticate, :connection, :delete,
-                   :fetch, :list, :persistence, :persistence=, :persister,
-                   :submit, :update
+                   :faraday_adapter, :faraday_adapter=, :fetch, :list, 
+                   :persistence, :persistence=, :persister, :submit, 
+                   :update
 
     # The Librato::Metrics::Client being used by module-level
     # access.

data/lib/librato/metrics/client.rb

@@ -57,7 +57,8 @@ module Librato
       def connection
         # prevent successful creation if no credentials set
         raise CredentialsMissing unless (self.email and self.api_key)
-        @connection ||= Connection.new(:client => self, :api_endpoint => api_endpoint)
+        @connection ||= Connection.new(:client => self, :api_endpoint => api_endpoint, 
+                                       :adapter => faraday_adapter)
       end
 
       # Overrride user agent for this client's connections. If you
@@ -93,6 +94,18 @@ module Librato
         # otherwise.
         true
       end
+      
+      # Return current adapter this client will use.
+      # Defaults to Metrics.faraday_adapter if set, otherwise
+      # Faraday.default_adapter
+      def faraday_adapter
+        @faraday_adapter ||= default_faraday_adapter
+      end
+      
+      # Set faraday adapter this client will use
+      def faraday_adapter=(adapter)
+        @faraday_adapter = adapter
+      end
 
       # Query metric data
       #
@@ -221,6 +234,14 @@ module Librato
       end
 
     private
+    
+      def default_faraday_adapter
+        if Metrics.client == self
+          Faraday.default_adapter
+        else
+          Metrics.faraday_adapter
+        end
+      end
 
       def flush_persistence
         @persistence = nil

data/lib/librato/metrics/connection.rb

@@ -18,6 +18,7 @@ module Librato
       def initialize(options={})
         @client = options[:client]
         @api_endpoint = options[:api_endpoint]
+        @adapter = options[:adapter]
       end
 
       # API endpoint that will be used for requests.
@@ -37,7 +38,7 @@ module Librato
           f.use Librato::Metrics::Middleware::ExpectsStatus
           #f.use FaradayMiddleware::ParseJson, :content_type => /\bjson$/
 
-          f.adapter Faraday.default_adapter
+          f.adapter @adapter || Metrics.faraday_adapter
         end.tap do |transport|
           transport.headers[:user_agent] = user_agent
           transport.headers[:content_type] = 'application/json'

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

@@ -1,4 +1,3 @@
-# borrowed from faraday 0.8, will use official once final
 module Librato
   module Metrics
     module Middleware
@@ -14,7 +13,8 @@ module Librato
           retries = @retries
           begin
             @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
             end

data/lib/librato/metrics/version.rb

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

data/spec/unit/metrics/client_spec.rb

@@ -67,6 +67,23 @@ module Librato
           lambda{ subject.connection }.should raise_error(Librato::Metrics::CredentialsMissing)
         end
       end
+      
+      describe "#faraday_adapter" do
+        it "should default to Metrics default adapter" do
+          Metrics.faraday_adapter = :typhoeus
+          Client.new.faraday_adapter.should == Metrics.faraday_adapter
+          Metrics.faraday_adapter = nil
+        end
+      end
+   
+      describe "#faraday_adapter=" do
+        it "should allow setting of faraday adapter" do
+          subject.faraday_adapter = :excon
+          subject.faraday_adapter.should == :excon
+          subject.faraday_adapter = :patron
+          subject.faraday_adapter.should == :patron
+        end
+      end
 
       describe "#new_queue" do
         it "should return a new queue with client set" do

data/spec/unit/metrics/queue_spec.rb

@@ -7,7 +7,7 @@ module Librato
 
       before(:each) do
         @time = Time.now.to_i
-        Queue.stub(:epoch_time).and_return(@time)
+        Processor.stub(:epoch_time).and_return(@time)
       end
 
       describe "initialization" do

data/spec/unit/metrics_spec.rb

@@ -5,7 +5,6 @@ module Librato
   describe Metrics do
 
    describe "#authorize" do
-
      context "when given two arguments" do
        it "should store them on simple" do
          Metrics.authenticate 'tester@librato.com', 'api_key'
@@ -13,16 +12,31 @@ module Librato
          Metrics.client.api_key.should == 'api_key'
        end
      end
-
+   end
+   
+   describe "#faraday_adapter" do
+     it "should return current default adapter" do
+       Metrics.faraday_adapter.should_not be nil
+     end
+   end
+   
+   describe "#faraday_adapter=" do
+     before(:all) { @current_adapter = Metrics.faraday_adapter }
+     after(:all) { Metrics.faraday_adapter = @current_adapter }
+     
+     it "should allow setting of faraday adapter" do
+       Metrics.faraday_adapter = :excon
+       Metrics.faraday_adapter.should == :excon
+       Metrics.faraday_adapter = :patron
+       Metrics.faraday_adapter.should == :patron
+     end
    end
 
    describe "#persistence" do
-
      it "should allow configuration of persistence method" do
        Metrics.persistence = :test
        Metrics.persistence.should == :test
      end
-
    end
 
    describe "#submit" do
@@ -43,7 +57,6 @@ module Librato
        expected = {:gauges => [{:name => 'foo', :value => 123}, {:name => 'bar', :value => 456}]}
        Librato::Metrics.persister.persisted.should equal_unordered(expected)
      end
-
    end
 
   end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: librato-metrics
 version: !ruby/object:Gem::Version
-  version: 0.7.4
+  version: 0.7.5
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-11-06 00:00:00.000000000 Z
+date: 2012-11-27 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: faraday
@@ -216,7 +216,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: -3428658007385951534
+      hash: -366569108077334223
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements: