berater 0.13.0 → 0.13.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: defd1ba585ef0f8b5ff8f2f388604c344571fe4fe887f7ca44d03d57c7ce20f8
-  data.tar.gz: 729865914aa2f72c4b61a16cbcd29f12d86d034a04f9c15f3c48c53a7611c5cf
+  metadata.gz: 1270edae5d2c019ae92b623ff4c26e588cf8d5413c8f7b6c549d3d3ec4e16766
+  data.tar.gz: a9a659acde5a04263b1ca516a2fb1ecdd760d9133f3603b4fa7ec336c06f59df
 SHA512:
-  metadata.gz: 864cc51b0eaf4c1767a36580331a27dfb20a2e0eeaaff805d2d188078cf9500ccfbf0d08e331cd06efb238b0c58dca9f67cde27025d1e87ebec8ef4ae234c683
-  data.tar.gz: aa303e6a58f1d79b0471d9d31bb5aa8835bd7f253c26f7930c6253e7801e154b9c26ce977529e70a7de647d9967caa6753963608828e721f7d1cfe5523805f41
+  metadata.gz: 07fc3784c2e6d41648f97878e3a0c62e3a089c1ef69315e88141642350180634c65a89deda082ed5933a90666c620111329756d0699d3fde5238b97d0ad37e82
+  data.tar.gz: 6f8dc42b5b694a45c286b1d66a0b8efbf17371b3fd6bfd8936098b4155b85ae6523146fecfc6b7c46e3b0a8df1ddb03158f1fd181c9e6a1e13042232089e1a41

data/lib/berater/middleware/load_shedder.rb

@@ -23,13 +23,14 @@ module Berater
           priority = Float(priority) rescue nil
         end
 
-        unless PRIORITY_RANGE.include?(priority)
-          return capacity
-        end
+        if PRIORITY_RANGE.include?(priority)
+          # priority 1 stays at 100%, 2 scales down to 90%, 5 to 60%
+          factor = 1 - (priority - 1) * 0.1
 
-        # priority 1 stays at 100%, 2 scales down to 90%, 5 to 60%
-        factor = 1 - (priority - 1) * 0.1
-        (capacity * factor).floor
+          (capacity * factor).floor
+        else
+          capacity
+        end
       end
     end
   end

data/lib/berater/middleware/trace.rb

@@ -1,5 +1,3 @@
-require 'ddtrace'
-
 module Berater
   module Middleware
     class Trace
@@ -8,7 +6,7 @@ module Berater
       end
 
       def call(limiter, **)
-        tracer.trace('Berater.limit') do |span|
+        tracer&.trace('Berater') do |span|
           begin
             lock = yield
           rescue Exception => error
@@ -34,7 +32,7 @@ module Berater
       private
 
       def tracer
-        @tracer || Datadog.tracer
+        @tracer || (defined?(Datadog::Tracing) && Datadog::Tracing) || (defined?(Datadog) && Datadog.tracer)
       end
     end
   end

data/lib/berater/version.rb

@@ -1,3 +1,3 @@
 module Berater
-  VERSION = "0.13.0"
+  VERSION = "0.13.1"
 end

data/spec/limiter_spec.rb

@@ -220,9 +220,7 @@ describe Berater::Limiter do
     end
 
     context 'with custom limiter' do
-      MyLimiter = Class.new(Berater::Unlimiter)
-
-      let(:klass) { MyLimiter }
+      let(:klass) { MyLimiter = Class.new(Berater::Unlimiter) }
 
       it 'adds Berater prefix' do
         is_expected.to eq 'Berater:MyLimiter:key'
@@ -242,12 +240,10 @@ describe Berater::Limiter do
     end
 
     context 'with custom limiter' do
-      MyLimiter = Class.new(Berater::Unlimiter)
-
-      let(:klass) { MyLimiter }
+      let(:klass) { MyOtherLimiter = Class.new(Berater::Unlimiter) }
 
       it 'adds Berater prefix' do
-        is_expected.to eq 'Berater:MyLimiter:key'
+        is_expected.to eq 'Berater:MyOtherLimiter:key'
       end
     end
   end

data/spec/middleware/trace_spec.rb

@@ -1,30 +1,61 @@
+require 'ddtrace'
+
 describe Berater::Middleware::Trace do
-  before { Datadog.tracer.enabled = false }
+  before do
+    allow(tracer).to receive(:trace).and_yield(span)
+  end
 
   it_behaves_like 'a limiter middleware'
 
   let(:limiter) { Berater::Unlimiter.new }
-  let(:span) { double(Datadog::Span, set_tag: nil) }
-  let(:tracer) { double(Datadog::Tracer) }
 
-  before do
-    allow(tracer).to receive(:trace) {|&b| b.call(span) }
+  if defined?(Datadog::Tracing)
+    before { Datadog.configure { |c| c.tracing.enabled = false } }
+
+    let(:span) { double(Datadog::Tracing::SpanOperation, set_tag: nil) }
+    let(:tracer) { double(Datadog::Tracing::Tracer) }
+    let(:ddtracer) { Datadog::Tracing }
+  else
+    before { Datadog.tracer.enabled = false }
+
+    let(:span) { double(Datadog::Span, set_tag: nil) }
+    let(:tracer) { double(Datadog::Tracer) }
+    let(:ddtracer) { Datadog.tracer }
   end
 
-  context 'with a provided tracer' do
-    let(:instance) { described_class.new(tracer: tracer) }
+  describe '#tracer' do
+    subject { instance.send(:tracer) }
 
-    it 'traces' do
-      expect(tracer).to receive(:trace).with(/Berater/)
-      expect(span).to receive(:set_tag).with(/capacity/, Numeric)
+    let(:instance) { described_class.new }
+
+    it 'defaults to Datadog.tracer' do
+      is_expected.to be ddtracer
+    end
+
+    context 'when provided a tracer' do
+      let(:instance) { described_class.new(tracer: tracer) }
 
-      instance.call(limiter) {}
+      it { is_expected.to be tracer }
     end
+  end
+
+  describe '#call' do
+    let(:instance) { described_class.new(tracer: tracer) }
 
     it 'yields' do
       expect {|b| instance.call(limiter, &b) }.to yield_control
     end
 
+    context 'when a Berater::Overloaded exception is raised' do
+      it 'tags the span as overloaded and raises' do
+        expect(span).to receive(:set_tag).with('overloaded', true)
+
+        expect {
+          instance.call(limiter) { raise Berater::Overloaded }
+        }.to be_overloaded
+      end
+    end
+
     context 'when an exception is raised' do
       it 'tags the span and raises' do
         expect(span).to receive(:set_tag).with('error', 'IOError')
@@ -34,25 +65,32 @@ describe Berater::Middleware::Trace do
         }.to raise_error(IOError)
       end
     end
+  end
+
+  context 'when used as middleware' do
+    before do
+      Berater.middleware.use described_class, tracer: tracer
+    end
 
-    context 'when an Overloaded exception is raised' do
+    it 'traces' do
+      expect(tracer).to receive(:trace).with('Berater')
+      expect(span).to receive(:set_tag).with('key', limiter.key)
+      expect(span).to receive(:set_tag).with('capacity', Numeric)
+      expect(span).to receive(:set_tag).with('contention', Numeric)
+
+      limiter.limit
+    end
+
+    context 'when limiter is overloaded' do
       let(:limiter) { Berater::Inhibitor.new }
 
       it 'tags the span as overloaded and raises' do
         expect(span).to receive(:set_tag).with('overloaded', true)
 
         expect {
-          instance.call(limiter) { raise Berater::Overloaded }
+          limiter.limit
         }.to be_overloaded
       end
     end
   end
-
-  context 'with the default tracer' do
-    it 'uses Datadog.tracer' do
-      expect(Datadog).to receive(:tracer).and_return(tracer)
-
-      described_class.new.call(limiter) {}
-    end
-  end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: berater
 version: !ruby/object:Gem::Version
-  version: 0.13.0
+  version: 0.13.1
 platform: ruby
 authors:
 - Daniel Pepper
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2022-03-04 00:00:00.000000000 Z
+date: 2022-07-13 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: meddleware