berater 0.14.0 → 0.15.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 3780da104c79084b2c3b348363a5f763c42d9d936dc218e68df90cdbbc223cfe
-  data.tar.gz: a3b7e7af7b3a764f97c013cb642eccf6d71ad825df459d32722a4e312ca2cdd8
+  metadata.gz: dcfe29f7b98bcd132e05ba7cadbc05a128da9f4737eaa383e330bfd4d72832fb
+  data.tar.gz: 7750d96b8df130de0e9dd11c81f69b021543567c6e7f63087839dc17bbaf309c
 SHA512:
-  metadata.gz: 364a70d42009b4c80b7235cbbc736f8c074f309abfa529f494f2fd01959e9b5ffb2bbd08ad3a39b12b0565abb8435bf86cd59b774055c4fbd845ba7d2f0c798b
-  data.tar.gz: 92271042126ccc8b70a3a95f6fa530a8f36dceddaf7cc8de3ef9eb1ac861fcd9f7d10e066d27ac4d7bb807d5f43741f78aaf4b9b43a970bc159a5b2a3142f73a
+  metadata.gz: d17e3d67ebdc5644348011b1d03b5850bceeeae4533d25a6a67f1cdadf8071312c0a397ae15560f01ad7ef123f68dfd7a19c55040ff5af5b7c17883f0c33f265
+  data.tar.gz: 95d37d05e057c5b536ce724308a91f1be09211a3e3687dced98618f5836d9d992b4dfb51f00b074a65dd36e9664344b032703f02c9883600db348b411b2f18e2

data/lib/berater/limiter.rb

@@ -52,22 +52,24 @@ module Berater
 
       acquire_lock(capacity: capacity, cost: cost, **opts)
     rescue NoMethodError => e
-      raise unless e.message.include?("undefined method `evalsha' for")
+      if e.message.include?("undefined method `evalsha' for")
+        # repackage error so it's easier to understand
+        raise RuntimeError, "invalid redis connection: #{redis}"
+      end
 
-      # repackage error so it's easier to understand
-      raise RuntimeError, "invalid redis connection: #{redis}"
+      raise
     end
 
     def utilization
       lock = limit(cost: 0)
 
       if lock.capacity == 0
-        1.0
+        100.0
       else
-        lock.contention.to_f / lock.capacity
+        lock.contention.to_f / lock.capacity * 100
       end
     rescue Berater::Overloaded
-      1.0
+      100.0
     end
 
     def ==(other)
@@ -111,7 +113,7 @@ module Berater
       @capacity = capacity
     end
 
-    def acquire_lock(capacity:, cost:)
+    def acquire_lock(**options)
       raise NotImplementedError
     end
 
@@ -124,12 +126,7 @@ module Berater
         # can only call via subclass
         raise NoMethodError if self == Berater::Limiter
 
-        if RUBY_VERSION < '3' && kwargs.empty?
-          # avoid ruby 2 problems with empty hashes
-          super(*args)
-        else
-          super
-        end
+        super
       end
 
       def cache_key(key)

data/lib/berater/middleware/fail_open.rb

@@ -3,9 +3,12 @@ require 'set'
 module Berater
   module Middleware
     class FailOpen
-      ERRORS = Set[
+      ERRORS = Set.new [
         Redis::BaseConnectionError,
-      ]
+        SystemCallError, # openssl
+        Timeout::Error, # connection pool
+        (OpenSSL::OpenSSLError if defined?(OpenSSL)),
+      ].compact
 
       def initialize(errors: nil, on_fail: nil)
         @errors = errors || ERRORS

data/lib/berater/middleware/trace.rb

@@ -6,10 +6,12 @@ module Berater
       end
 
       def call(limiter, **)
-        tracer&.trace('Berater') do |span|
+        return yield unless tracer
+
+        tracer.trace('Berater') do |span|
           begin
             lock = yield
-          rescue Exception => error
+          rescue StandardError => error
             # capture exception for reporting, then propagate
             raise
           ensure
@@ -32,7 +34,7 @@ module Berater
       private
 
       def tracer
-        @tracer || (defined?(Datadog::Tracing) && Datadog::Tracing) || (defined?(Datadog) && Datadog.tracer)
+        @tracer || (defined?(Datadog) && Datadog::Tracing)
       end
     end
   end

data/lib/berater/rspec/matchers.rb

@@ -14,7 +14,7 @@ module Berater
           if res.is_a? Berater::Limiter
             # eg. expect { Berater.new(...) }.to be_overloaded
             @limiter = res
-            @limiter.utilization >= 1
+            @limiter.utilization >= 100
           else
             # eg. expect { Berater(...)  }.to be_overloaded
             # eg. expect { limiter.limit }.to be_overloaded
@@ -23,7 +23,7 @@ module Berater
         when Berater::Limiter
           # eg. expect(Berater.new(...)).to be_overloaded
           @limiter = obj
-          @limiter.utilization >= 1
+          @limiter.utilization >= 100
         end
       rescue Berater::Overloaded
         true

data/lib/berater/version.rb

@@ -1,3 +1,3 @@
 module Berater
-  VERSION = "0.14.0"
+  VERSION = "0.15.1"
 end

data/spec/concurrency_limiter_spec.rb

@@ -255,19 +255,19 @@ describe Berater::ConcurrencyLimiter do
     let(:limiter) { described_class.new(:key, 10, timeout: 30) }
 
     it 'works' do
-      expect(limiter.utilization).to be 0.0
+      expect(limiter.utilization).to eq 0
 
       2.times { limiter.limit }
-      expect(limiter.utilization).to be 0.2
+      expect(limiter.utilization).to eq 20
 
       Timecop.freeze(15)
 
       8.times { limiter.limit }
-      expect(limiter.utilization).to be 1.0
+      expect(limiter.utilization).to eq 100
 
       Timecop.freeze(15)
 
-      expect(limiter.utilization).to be 0.8
+      expect(limiter.utilization).to eq 80
     end
   end
 

data/spec/middleware/trace_spec.rb

@@ -65,6 +65,16 @@ describe Berater::Middleware::Trace do
         }.to raise_error(IOError)
       end
     end
+
+    context 'when tracer is not defined' do
+      before do
+        allow(instance).to receive(:tracer).and_return(nil)
+      end
+
+      it 'still yields' do
+        expect {|b| instance.call(limiter, &b) }.to yield_control
+      end
+    end
   end
 
   context 'when used as middleware' do

data/spec/mutex_spec.rb

@@ -107,4 +107,39 @@ describe Berater::Mutex do
     it { expect(klass.new).not_to respond_to(:synchronize) }
     it { expect(klass.new).not_to respond_to(:mutex_options) }
   end
+
+  describe 'when used in a counter' do
+    subject(:counter) { klass.new }
+
+    let(:klass) do
+      class Counter
+        include Berater::Mutex
+
+        @@count = 0
+        @@counts = {}
+
+        def incr
+          synchronize { @@count += 1 }
+        end
+
+        def incr_key(key)
+          synchronize(key) do
+            @@counts[key] ||= 0
+            @@counts[key] += 1
+          end
+        end
+      end
+      Counter
+    end
+
+    it { expect(counter.incr).to eq 1 }
+    it { expect(counter.incr_key(:a)).to eq 1 }
+
+    it 'separates keys' do
+      res = 3.times.map { counter.incr_key(:a) }
+      expect(res).to eq [ 1, 2, 3 ]
+
+      expect(counter.incr_key(:b)).to eq 1
+    end
+  end
 end

data/spec/rate_limiter_spec.rb

@@ -237,17 +237,17 @@ describe Berater::RateLimiter do
     let(:limiter) { described_class.new(:key, 10, :minute) }
 
     it do
-      expect(limiter.utilization).to be 0.0
+      expect(limiter.utilization).to eq 0
 
       2.times { limiter.limit }
-      expect(limiter.utilization).to be 0.2
+      expect(limiter.utilization).to eq 20
 
       8.times { limiter.limit }
-      expect(limiter.utilization).to be 1.0
+      expect(limiter.utilization).to eq 100
 
       Timecop.freeze(30)
 
-      expect(limiter.utilization).to be 0.5
+      expect(limiter.utilization).to eq 50
     end
   end
 

data/spec/static_limiter_spec.rb

@@ -60,13 +60,13 @@ describe Berater::StaticLimiter do
     let(:limiter) { described_class.new(:key, 10) }
 
     it do
-      expect(limiter.utilization).to be 0.0
+      expect(limiter.utilization).to eq 0
 
       2.times { limiter.limit }
-      expect(limiter.utilization).to be 0.2
+      expect(limiter.utilization).to eq 20
 
       8.times { limiter.limit }
-      expect(limiter.utilization).to be 1.0
+      expect(limiter.utilization).to eq 100
     end
   end
 

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: berater
 version: !ruby/object:Gem::Version
-  version: 0.14.0
+  version: 0.15.1
 platform: ruby
 authors:
 - Daniel Pepper
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2022-10-11 00:00:00.000000000 Z
+date: 2024-02-06 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: meddleware
@@ -66,34 +66,20 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
-- !ruby/object:Gem::Dependency
-  name: codecov
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '0'
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '0'
 - !ruby/object:Gem::Dependency
   name: ddtrace
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '1'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '1'
 - !ruby/object:Gem::Dependency
   name: dogstatsd-ruby
   requirement: !ruby/object:Gem::Requirement
@@ -108,20 +94,6 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '4.3'
-- !ruby/object:Gem::Dependency
-  name: rake
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '0'
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '0'
 - !ruby/object:Gem::Dependency
   name: rspec
   requirement: !ruby/object:Gem::Requirement
@@ -225,14 +197,14 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
-      version: '0'
+      version: '3'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.3.7
+rubygems_version: 3.2.33
 signing_key:
 specification_version: 4
 summary: Berater