freno-client 0.8.1 → 0.8.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 3f680a8adbf86c47eff50bcc58ae7b79993ef3f2f3c57ad99c9512937f92ba80
-  data.tar.gz: 50cf87848d1284d171457112ed5a297fd063532f78ef0399e5d669b1bc3ded33
+  metadata.gz: 808823b23d76b3a540d9d17d2c6e28b428fd3cb387c941f79c749779393ac462
+  data.tar.gz: cf58a8db9c3d7fa2bea92727b3336a62fded79081723ee5e13555a72e6d68c62
 SHA512:
-  metadata.gz: 6037e296652844e51cb469d3d6ca6dbb55e2baaa08c8c726b2885ad1b3ba6dd21857a85562d5b1491fb6b6cb86859ddc5fec0420f05089bb0c871c6ac69713cb
-  data.tar.gz: 352a0abcea1e4fb28d2e920812a1d95a8051b62e52ff8a1cbaf05340aff3409150ad74d6292461908e4c7a9408dce7507910ff6ae4448f7cf62a9f1c048cd0f9
+  metadata.gz: 1fb13835bd9d2c9dd64c8bc3ae6e9931e0bd16a82cfa0ffbc4ed276505e453d4cf8a371cd66e6a0da19c2755e1174ce2812c55d0b12ce781b7a52f08add3f838
+  data.tar.gz: 540f2de04000141a1c636ab169e178a99a48dc19fe53557f7afba59dd2ddd2e2c407178e8a4f5e2daeb82b54871eac21f7d369854f1e9d7b87bbde1226289ffc

data/.github/workflows/ruby.yml

@@ -0,0 +1,35 @@
+name: Ruby
+on:
+  push:
+    branches:
+    - main
+  pull_request:
+    branches:
+    - main
+permissions:
+  contents: read
+jobs:
+  test:
+    runs-on: ubuntu-latest
+    strategy:
+      matrix:
+        ruby-version:
+        - '2.7'
+        - '3.0'
+        - '3.1'
+        gemfile-path:
+        - Gemfile
+        - gemfiles/faraday_0.gemfile
+        - gemfiles/faraday_1.gemfile
+        - gemfiles/faraday_2.gemfile
+    env:
+      BUNDLE_GEMFILE: ${{ github.workspace }}/${{ matrix.gemfile-path }}
+    steps:
+    - uses: actions/checkout@v3
+    - name: Set up Ruby
+      uses: ruby/setup-ruby@v1
+      with:
+        ruby-version: ${{ matrix.ruby-version }}
+        bundler-cache: true
+    - name: Run tests
+      run: bundle exec rake

data/.gitignore

@@ -2,6 +2,7 @@
 /.bundle/
 /.yardoc
 /Gemfile.lock
+/gemfiles/*.lock
 /_yardoc/
 /coverage/
 /doc/

data/.rubocop.yml

@@ -1,179 +1,44 @@
-require: rubocop-performance
+require:
+- rubocop-minitest
+- rubocop-performance
+- rubocop-rake
 
 AllCops:
-  DisabledByDefault: true
-  TargetRubyVersion: 2.5
+  NewCops: enable
+  TargetRubyVersion: 2.7
 
-Bundler/DuplicatedGem:
-  Enabled: true
-Bundler/OrderedGems:
-  Enabled: true
-
-Layout/BlockAlignment:
-  Enabled: true
-Layout/BlockEndNewline:
-  Enabled: true
-Layout/ConditionPosition:
-  Enabled: true
-Layout/DefEndAlignment:
-  Enabled: true
-Layout/EndOfLine:
-  Enabled: true
-Layout/IndentationStyle:
-  Enabled: true
-Layout/InitialIndentation:
-  Enabled: true
-Layout/SpaceAfterColon:
-  Enabled: true
-Layout/SpaceAfterComma:
-  Enabled: true
-Layout/SpaceAfterMethodName:
-  Enabled: true
-Layout/SpaceAfterNot:
-  Enabled: true
-Layout/SpaceAfterSemicolon:
-  Enabled: true
-Layout/SpaceAroundBlockParameters:
-  Enabled: true
-Layout/SpaceAroundEqualsInParameterDefault:
-  Enabled: true
-Layout/SpaceInsideArrayPercentLiteral:
-  Enabled: true
-Layout/SpaceInsideParens:
-  Enabled: true
-Layout/SpaceInsideRangeLiteral:
-  Enabled: true
-Layout/TrailingEmptyLines:
-  Enabled: true
-Layout/TrailingWhitespace:
-  Enabled: true
-
-Lint/CircularArgumentReference:
-  Enabled: true
-Lint/Debugger:
-  Enabled: true
-Lint/DeprecatedClassMethods:
-  Enabled: true
-Lint/DuplicateHashKey:
-  Enabled: true
-Lint/DuplicateMethods:
-  Enabled: true
-Lint/EachWithObjectArgument:
-  Enabled: true
-Lint/ElseLayout:
-  Enabled: true
-Lint/EmptyEnsure:
-  Enabled: true
-Lint/EmptyInterpolation:
-  Enabled: true
-Lint/EnsureReturn:
-  Enabled: true
-Lint/FlipFlop:
-  Enabled: true
-Lint/FloatOutOfRange:
-  Enabled: true
-Lint/FormatParameterMismatch:
-  Enabled: true
-Lint/LiteralInInterpolation:
-  Enabled: true
-Lint/Loop:
-  Enabled: true
-Lint/NextWithoutAccumulator:
-  Enabled: true
-Lint/RandOne:
-  Enabled: true
-Lint/RedundantSplatExpansion:
-  Enabled: true
-Lint/RedundantStringCoercion:
-  Enabled: true
-Lint/RequireParentheses:
-  Enabled: true
-Lint/RescueException:
-  Enabled: true
-Lint/UnderscorePrefixedVariableName:
-  Enabled: true
-Lint/UnreachableCode:
-  Enabled: true
-Lint/UselessComparison:
-  Enabled: true
-Lint/UselessSetterCall:
-  Enabled: true
-Lint/Void:
+Layout/MultilineMethodCallIndentation:
   Enabled: true
+  EnforcedStyle: indented_relative_to_receiver
 
-Naming/AsciiIdentifiers:
-  Enabled: true
-Naming/ClassAndModuleCamelCase:
-  Enabled: true
-Naming/FileName:
-  Enabled: true
-Naming/MethodName:
-  Enabled: true
+Metrics:
+  Enabled: false
 
-Performance/Count:
-  Enabled: true
-Performance/Detect:
-  Enabled: true
-Performance/DoubleStartEndWith:
-  Enabled: true
-Performance/EndWith:
-  Enabled: true
-Performance/FlatMap:
-  Enabled: true
-Performance/RedundantMerge:
-  Enabled: true
-  MaxKeyValuePairs: 1
-Performance/ReverseEach:
-  Enabled: true
-Performance/Size:
-  Enabled: true
-Performance/StartWith:
-  Enabled: true
+Minitest/AssertEmptyLiteral:
+  Enabled: false
+Minitest/AssertEqual:
+  Enabled: false
+Minitest/AssertPredicate:
+  Enabled: false
+Minitest/MultipleAssertions:
+  Enabled: false
+Minitest/RefutePredicate:
+  Enabled: false
 
-Security/Eval:
+Naming/RescuedExceptionsVariableName:
   Enabled: true
+  PreferredName: error
 
-Style/ArrayJoin:
-  Enabled: true
-Style/BeginBlock:
-  Enabled: true
-Style/BlockComments:
-  Enabled: true
-Style/CaseEquality:
-  Enabled: true
-Style/CharacterLiteral:
-  Enabled: true
-Style/ClassMethods:
-  Enabled: true
-Style/DefWithParentheses:
-  Enabled: true
-Style/EndBlock:
-  Enabled: true
-Style/For:
-  Enabled: true
-Style/HashSyntax:
-  Enabled: true
-  EnforcedStyle: ruby19
-Style/LambdaCall:
-  Enabled: true
-Style/MethodCallWithoutArgsParentheses:
-  Enabled: true
-Style/MethodDefParentheses:
-  Enabled: true
-Style/MultilineIfThen:
-  Enabled: true
-Style/NilComparison:
-  Enabled: true
-Style/Not:
-  Enabled: true
-Style/OneLineConditional:
-  Enabled: true
-Style/RedundantSortBy:
-  Enabled: true
-Style/Sample:
-  Enabled: true
-Style/StabbyLambdaParentheses:
+Style/ClassAndModuleChildren:
   Enabled: true
+  Exclude:
+  - test/**/*
+Style/Documentation:
+  Enabled: false
+Style/IfUnlessModifier:
+  Enabled: false
 Style/StringLiterals:
   Enabled: true
   EnforcedStyle: double_quotes
+Style/SymbolArray:
+  Enabled: false

data/Gemfile

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 source "https://rubygems.org"
 
 gemspec
@@ -9,6 +11,8 @@ end
 group :test do
   gem "minitest", ">= 5"
   gem "mocha"
-  gem "rubocop", "~> 0.85.1", require: false
+  gem "rubocop", "~> 1.37", require: false
+  gem "rubocop-minitest", require: false
   gem "rubocop-performance", require: false
+  gem "rubocop-rake", require: false
 end

data/README.md

@@ -1,6 +1,4 @@
-# Freno Client [![Build Status](https://travis-ci.org/github/freno-client.svg?branch=master)](https://travis-ci.org/github/github/freno-client)
-
-A ruby client and throttling library for [Freno](https://github.com/github/freno): the cooperative, highly available throttler service.
+A Ruby client and throttling library for [Freno](https://github.com/github/freno): the cooperative, highly available throttler service.
 
 ## Current status
 
@@ -177,7 +175,7 @@ end
 
 ### Throttler objects
 
-Apart from the operations above, freno-client comes with `Freno::Throttler`, a ruby library for throttling. You can use it in the following way:
+Apart from the operations above, freno-client comes with `Freno::Throttler`, a Ruby library for throttling. You can use it in the following way:
 
 ```ruby
 require "freno/throttler"

data/Rakefile

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require "bundler/gem_tasks"
 require "rake/testtask"
 require "rubocop/rake_task"

data/freno-client.gemspec

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require_relative "lib/freno/client/version"
 
 Gem::Specification.new do |spec|
@@ -11,14 +13,16 @@ Gem::Specification.new do |spec|
     freno-client is a Ruby library that interacts with Freno using HTTP.
     Freno is a throttling service and its source code is available at
     https://github.com/github/freno
-    DESC
+  DESC
 
   spec.homepage = "https://github.com/github/freno-client"
   spec.license  = "MIT"
 
-  spec.required_ruby_version = ">= 2.5.0"
+  spec.required_ruby_version = ">= 2.7.0"
 
   spec.files = `git ls-files -z`.split("\x0").grep_v(/^(bin|test)/)
 
-  spec.add_dependency "faraday", "~> 0"
+  spec.add_dependency "faraday", "< 3"
+
+  spec.metadata["rubygems_mfa_required"] = "true"
 end

data/gemfiles/faraday_0.gemfile

@@ -0,0 +1,22 @@
+# frozen_string_literal: true
+
+source "https://rubygems.org"
+
+gemspec path: ".."
+
+gem "faraday", "~> 0.0"
+
+# Content below copied from Gemfile
+
+group :development do
+  gem "rake"
+end
+
+group :test do
+  gem "minitest", ">= 5"
+  gem "mocha"
+  gem "rubocop", "~> 1.37", require: false
+  gem "rubocop-minitest", require: false
+  gem "rubocop-performance", require: false
+  gem "rubocop-rake", require: false
+end

data/gemfiles/faraday_1.gemfile

@@ -0,0 +1,22 @@
+# frozen_string_literal: true
+
+source "https://rubygems.org"
+
+gemspec path: ".."
+
+gem "faraday", "~> 1.0"
+
+# Content below copied from Gemfile
+
+group :development do
+  gem "rake"
+end
+
+group :test do
+  gem "minitest", ">= 5"
+  gem "mocha"
+  gem "rubocop", "~> 1.37", require: false
+  gem "rubocop-minitest", require: false
+  gem "rubocop-performance", require: false
+  gem "rubocop-rake", require: false
+end

data/gemfiles/faraday_2.gemfile

@@ -0,0 +1,22 @@
+# frozen_string_literal: true
+
+source "https://rubygems.org"
+
+gemspec path: ".."
+
+gem "faraday", "~> 2.0"
+
+# Content below copied from Gemfile
+
+group :development do
+  gem "rake"
+end
+
+group :test do
+  gem "minitest", ">= 5"
+  gem "mocha"
+  gem "rubocop", "~> 1.37", require: false
+  gem "rubocop-minitest", require: false
+  gem "rubocop-performance", require: false
+  gem "rubocop-rake", require: false
+end

data/lib/freno/client/errors.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module Freno
   Error = Class.new(StandardError)
 end

data/lib/freno/client/preconditions.rb

@@ -1,7 +1,9 @@
+# frozen_string_literal: true
+
 module Freno
   class Client
     module Preconditions
-      extend self
+      module_function
 
       PreconditionNotMet = Class.new(ArgumentError)
 
@@ -21,7 +23,7 @@ module Freno
         end
 
         def report
-          raise PreconditionNotMet.new(errors.join("\n")) unless errors.empty?
+          raise PreconditionNotMet, errors.join("\n") unless errors.empty?
         end
       end
 

data/lib/freno/client/request.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require_relative "preconditions"
 require_relative "result"
 require_relative "errors"
@@ -5,11 +7,9 @@ require_relative "errors"
 module Freno
   class Client
     class Request
-
       include Freno::Client::Preconditions
 
-      attr_reader :faraday, :args, :options
-      attr_reader :raise_on_timeout
+      attr_reader :faraday, :args, :options, :raise_on_timeout
 
       def self.perform(**kwargs)
         new(**kwargs).perform
@@ -18,7 +18,7 @@ module Freno
       def initialize(**kwargs)
         @args    = kwargs
         @faraday = kwargs.delete(:faraday) || nil
-        @options = kwargs.delete(:options) || Hash.new
+        @options = kwargs.delete(:options) || {}
 
         @raise_on_timeout = options.fetch(:raise_on_timeout, true)
         @verb = options.fetch(:verb, :head)
@@ -27,11 +27,12 @@ module Freno
       def perform
         response = request(verb, path, params)
         process_response(response)
-      rescue Faraday::TimeoutError => ex
-        raise Freno::Error.new(ex) if raise_on_timeout
+      rescue Faraday::TimeoutError => error
+        raise Freno::Error, error if raise_on_timeout
+
         Result.from_meaning(:request_timeout)
-      rescue => ex
-        raise Freno::Error.new(ex)
+      rescue StandardError => error
+        raise Freno::Error, error
       end
 
       protected

data/lib/freno/client/requests/check.rb

@@ -1,10 +1,11 @@
+# frozen_string_literal: true
+
 require_relative "../request"
 
 module Freno
   class Client
     module Requests
       class Check < Request
-
         def initialize(**kwargs)
           super
 

data/lib/freno/client/requests/check_read.rb

@@ -1,10 +1,11 @@
+# frozen_string_literal: true
+
 require_relative "../request"
 
 module Freno
   class Client
     module Requests
       class CheckRead < Request
-
         def initialize(**kwargs)
           super
 

data/lib/freno/client/requests/replication_delay.rb

@@ -1,10 +1,11 @@
+# frozen_string_literal: true
+
 require_relative "../request"
 
 module Freno
   class Client
     module Requests
       class ReplicationDelay < Check
-
         protected
 
         def process_response(*)

data/lib/freno/client/result.rb

@@ -1,9 +1,10 @@
+# frozen_string_literal: true
+
 require "json"
 
 module Freno
   class Client
     class Result
-
       # https://github.com/github/freno/blob/master/doc/http.md#status-codes
       FRENO_STATUS_CODE_MEANINGS = {
         200 => :ok,
@@ -55,6 +56,7 @@ module Freno
 
       def ==(other)
         return meaning == other if other.is_a? Symbol
+
         code == other
       end
     end

data/lib/freno/client/version.rb

@@ -1,5 +1,7 @@
+# frozen_string_literal: true
+
 module Freno
   class Client
-    VERSION = "0.8.1"
+    VERSION = "0.8.2"
   end
 end

data/lib/freno/client.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require "freno/client/version"
 require "freno/client/requests/check_read"
 require "freno/client/requests/check"
@@ -8,10 +10,10 @@ module Freno
     class DecorationError < ArgumentError; end
 
     REQUESTS = {
-      check:             Requests::Check,
-      check_read:        Requests::CheckRead,
-      replication_delay: Requests::ReplicationDelay,
-    }
+      check: Requests::Check,
+      check_read: Requests::CheckRead,
+      replication_delay: Requests::ReplicationDelay
+    }.freeze
 
     attr_reader   :faraday, :decorators, :decorated_requests
     attr_accessor :default_app, :default_store_name, :default_store_type, :options
@@ -78,8 +80,21 @@ module Freno
     #
     # Returns Result
     #
-    def check_read(threshold:, app: default_app, store_type: default_store_type, store_name: default_store_name, options: {})
-      perform :check_read, app: app, store_type: store_type, store_name: store_name, threshold: threshold, options: self.options.merge(options)
+    def check_read(
+      threshold:,
+      app: default_app,
+      store_type: default_store_type,
+      store_name: default_store_name,
+      options: {}
+    )
+      perform(
+        :check_read,
+        threshold: threshold,
+        app: app,
+        store_type: store_type,
+        store_name: store_name,
+        options: self.options.merge(options)
+      )
     end
 
     # Implements a specific check request to retrieve the consolidated replication
@@ -89,11 +104,21 @@ module Freno
     #
     # Returns Float indicating the replication delay in seconds as reported by Freno.
     #
-    def replication_delay(app: default_app, store_type: default_store_type, store_name: default_store_name, options: {})
-      perform :replication_delay, app: app, store_type: store_type, store_name: store_name, options: self.options.merge(options)
+    def replication_delay(
+      app: default_app,
+      store_type: default_store_type,
+      store_name: default_store_name,
+      options: {}
+    )
+      perform(
+        :replication_delay,
+        app: app,
+        store_type: store_type,
+        store_name: store_name,
+        options: self.options.merge(options)
+      )
     end
 
-
     # Determines whether Freno considers it"s OK to write to masters
     #
     # Returns true or false.
@@ -107,8 +132,20 @@ module Freno
     #
     # Returns true or false.
     #
-    def check_read?(threshold:, app: default_app, store_type: default_store_type, store_name: default_store_name, options: {})
-      check_read(threshold: threshold, app: app, store_type: store_type, store_name: store_name, options: self.options.merge(options)).ok?
+    def check_read?(
+      threshold:,
+      app: default_app,
+      store_type: default_store_type,
+      store_name: default_store_name,
+      options: {}
+    )
+      check_read(
+        threshold: threshold,
+        app: app,
+        store_type: store_type,
+        store_name: store_name,
+        options: self.options.merge(options)
+      ).ok?
     end
 
     # Configures the client to extend the functionality of part or all the API
@@ -165,12 +202,13 @@ module Freno
     # end
     # ```
     #
-    def decorate(request, with:)
-      if request == :all
-        requests = REQUESTS.keys
-      else
-        requests = Array(request)
-      end
+    def decorate(request_or_all, with:)
+      requests =
+        if request_or_all == :all
+          REQUESTS.keys
+        else
+          Array(request_or_all)
+        end
 
       with = Array(with)
       validate!(with)
@@ -195,7 +233,7 @@ module Freno
         outermost = to_decorate[0]
         current = outermost
 
-        (to_decorate[1..-1]).each do |decorator|
+        (to_decorate[1..]).each do |decorator|
           current.request = decorator
           current = current.request
         end
@@ -207,6 +245,7 @@ module Freno
     def validate!(decorators)
       decorators.each do |decorator|
         raise DecorationError, "Cannot reuse decorator instance: #{decorator}" if already_registered?(decorator)
+
         registered_decorators << decorator
       end
     end

data/lib/freno/throttler/circuit_breaker.rb

@@ -1,6 +1,7 @@
+# frozen_string_literal: true
+
 module Freno
   class Throttler
-
     # A CircuitBreaker is the entry point of the pattern with same name.
     # (see https://martinfowler.com/bliki/CircuitBreaker.html)
     #
@@ -14,7 +15,6 @@ module Freno
     # next request is allowed.
     #
     module CircuitBreaker
-
       # The Noop circuit breaker is the `:circuit_breaker` used by default in
       # the Throttler
       #

data/lib/freno/throttler/errors.rb

@@ -1,8 +1,9 @@
+# frozen_string_literal: true
+
 require "freno/client"
 
 module Freno
   class Throttler
-
     # Any throttler-related error.
     class Error < Freno::Error; end
 

data/lib/freno/throttler/instrumenter.rb

@@ -1,6 +1,7 @@
+# frozen_string_literal: true
+
 module Freno
   class Throttler
-
     # An Instrumenter is an object that responds to
     # `instrument(event_name, payload = {})` to receive events from the
     # throttler.
@@ -10,7 +11,6 @@ module Freno
     # the application.
     #
     module Instrumenter
-
       # The Noop instrumenter is the `:instrumenter` used by default in the
       # Throttler
       #
@@ -18,7 +18,7 @@ module Freno
       # provided.
       #
       class Noop
-        def self.instrument(event_name, payload = {})
+        def self.instrument(_event_name, payload = {})
           yield payload if block_given?
         end
       end

data/lib/freno/throttler/mapper.rb

@@ -1,6 +1,7 @@
+# frozen_string_literal: true
+
 module Freno
   class Throttler
-
     # A Mapper is any object that responds to `call`, by receiving a context
     # object and returning a list of strings, each of which corresponds to the
     # store_name that will be checked in freno.
@@ -13,7 +14,6 @@ module Freno
     # where that shards exist.
     #
     module Mapper
-
       # The Identity mapper is the one used by default in the Throttler.
       #
       # It works by informing the throttler to check exact same stores that it

data/lib/freno/throttler.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require "freno/client"
 require "freno/throttler/errors"
 require "freno/throttler/mapper"
@@ -5,7 +7,6 @@ require "freno/throttler/instrumenter"
 require "freno/throttler/circuit_breaker"
 
 module Freno
-
   # Freno::Throttler is the class responsible for throttling writes to a cluster
   # or a set of clusters. Throttling means to slow down the pace at which write
   # operations occur by checking with freno whether all the clusters affected by
@@ -32,9 +33,17 @@ module Freno
   # and sleep if any of the stores is not ok.
   #
   class Throttler
-
     DEFAULT_WAIT_SECONDS = 0.5
     DEFAULT_MAX_WAIT_SECONDS = 10
+    REQUIRED_ARGS = %i[
+      client
+      app
+      mapper
+      instrumenter
+      circuit_breaker
+      wait_seconds
+      max_wait_seconds
+    ].freeze
 
     attr_accessor :client,
                   :app,
@@ -90,14 +99,15 @@ module Freno
     #     seconds the throttler will wait in total for replicas to catch-up
     #     before raising a `WaitedTooLong` error.
     #
-    def initialize(client: nil,
-                    app: nil,
-                    mapper: Mapper::Identity,
-                    instrumenter: Instrumenter::Noop,
-                    circuit_breaker: CircuitBreaker::Noop,
-                    wait_seconds: DEFAULT_WAIT_SECONDS,
-                    max_wait_seconds: DEFAULT_MAX_WAIT_SECONDS)
-
+    def initialize(
+      client: nil,
+      app: nil,
+      mapper: Mapper::Identity,
+      instrumenter: Instrumenter::Noop,
+      circuit_breaker: CircuitBreaker::Noop,
+      wait_seconds: DEFAULT_WAIT_SECONDS,
+      max_wait_seconds: DEFAULT_MAX_WAIT_SECONDS
+    )
       @client           = client
       @app              = app
       @mapper           = mapper
@@ -156,7 +166,7 @@ module Freno
       instrument(:called, store_names: store_names)
       waited = 0
 
-      while true do # rubocop:disable Lint/LiteralInCondition
+      loop do
         unless circuit_breaker.allow_request?
           instrument(:circuit_open, store_names: store_names, waited: waited)
           raise CircuitOpen
@@ -172,11 +182,11 @@ module Freno
         waited += wait_seconds
         instrument(:waited, store_names: store_names, waited: waited, max: max_wait_seconds)
 
-        if waited > max_wait_seconds
-          instrument(:waited_too_long, store_names: store_names, waited: waited, max: max_wait_seconds)
-          circuit_breaker.failure
-          raise WaitedTooLong.new(waited_seconds: waited, max_wait_seconds: max_wait_seconds)
-        end
+        next unless waited > max_wait_seconds
+
+        instrument(:waited_too_long, store_names: store_names, waited: waited, max: max_wait_seconds)
+        circuit_breaker.failure
+        raise WaitedTooLong.new(waited_seconds: waited, max_wait_seconds: max_wait_seconds)
       end
     end
 
@@ -185,8 +195,7 @@ module Freno
     def validate_args
       errors = []
 
-      %i(client app mapper instrumenter circuit_breaker
-        wait_seconds max_wait_seconds).each do |argument|
+      REQUIRED_ARGS.each do |argument|
         errors << "#{argument} must be provided" unless send(argument)
       end
 
@@ -194,17 +203,17 @@ module Freno
         errors << "max_wait_seconds (#{max_wait_seconds}) has to be greather than wait_seconds (#{wait_seconds})"
       end
 
-      raise ArgumentError.new(errors.join("\n")) if errors.any?
+      raise ArgumentError, errors.join("\n") if errors.any?
     end
 
     def all_stores_ok?(store_names, **options)
       store_names.all? do |store_name|
         client.check?(app: app, store_name: store_name, options: options)
       end
-    rescue Freno::Error => e
-      instrument(:freno_errored, store_names: store_names, error: e)
+    rescue Freno::Error => error
+      instrument(:freno_errored, store_names: store_names, error: error)
       circuit_breaker.failure
-      raise ClientError.new(e)
+      raise ClientError, error
     end
 
     def wait

metadata

@@ -1,29 +1,29 @@
 --- !ruby/object:Gem::Specification
 name: freno-client
 version: !ruby/object:Gem::Version
-  version: 0.8.1
+  version: 0.8.2
 platform: ruby
 authors:
 - GitHub
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2020-06-09 00:00:00.000000000 Z
+date: 2022-10-20 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: faraday
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - "<"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '3'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - "<"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '3'
 description: 'freno-client is a Ruby library that interacts with Freno using HTTP.
   Freno is a throttling service and its source code is available at https://github.com/github/freno '
 email: opensource+freno-client@github.com
@@ -31,9 +31,9 @@ executables: []
 extensions: []
 extra_rdoc_files: []
 files:
+- ".github/workflows/ruby.yml"
 - ".gitignore"
 - ".rubocop.yml"
-- ".travis.yml"
 - CODE_OF_CONDUCT.md
 - CONTRIBUTING.md
 - Gemfile
@@ -41,6 +41,9 @@ files:
 - README.md
 - Rakefile
 - freno-client.gemspec
+- gemfiles/faraday_0.gemfile
+- gemfiles/faraday_1.gemfile
+- gemfiles/faraday_2.gemfile
 - lib/freno/client.rb
 - lib/freno/client/errors.rb
 - lib/freno/client/preconditions.rb
@@ -58,7 +61,8 @@ files:
 homepage: https://github.com/github/freno-client
 licenses:
 - MIT
-metadata: {}
+metadata:
+  rubygems_mfa_required: 'true'
 post_install_message: 
 rdoc_options: []
 require_paths:
@@ -67,14 +71,14 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
-      version: 2.5.0
+      version: 2.7.0
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.1.2
+rubygems_version: 3.3.7
 signing_key: 
 specification_version: 4
 summary: A library for interacting with Freno, the throttler service

data/.travis.yml

@@ -1,10 +0,0 @@
-language: ruby
-rvm:
-  - 2.5
-  - 2.6
-  - 2.7
-  - ruby-head
-matrix:
-  allow_failures:
-    - rvm: ruby-head
-script: bin/test