berater 0.12.0 → 0.12.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 72cc5fcf9c68fff6dd3988ff85897b38d6fdcff21c0e6f94d3ec098ca8b35fc7
-  data.tar.gz: 49144f0dee2d7197740d39b9da365f9d959c730b7ece1ae761948ec9263ada75
+  metadata.gz: 5d3ef54656151bf378670caca07686db842a007e87e51d14195cc3f2b8d34d34
+  data.tar.gz: 22c6b65158ba926e78cd013c54913024c617eb5c2932297f7e4e424a72f66a14
 SHA512:
-  metadata.gz: 401a193c358a80098f1250053983d8f1a362cd14649156a036deedeb461fd70202743764d375b04a2b6b4fb08c795ec61d013e1be342626a2c8aad7dab2cb259
-  data.tar.gz: 55498f8b1a6bd70a64ed9053b80bc9c95b0d60043f073c302d48bb79b51677d7a3c235c07f35cc51dacec067d0c2cc8dcf972e37fb9e9baae126f69fa8aacb4f
+  metadata.gz: 2743af38d4daf9cd5d18a06368834545add59fb6d192fdf17c7f503ab059961177c444e5b09efde6a8ed6739b4cca04d83e7e88f8d904d0bd3e2b1bc94220cfb
+  data.tar.gz: a6750a44bcd05a1d0b25ff770d3c1d0f6fd3fd331cfebebbecdebd4ef06bc4f5a34d350cc36414cce7b212e7e63f8bb1d10cc4d25788ae50e1b973dfd280be4e

data/lib/berater/middleware/statsd.rb

@@ -21,7 +21,7 @@ module Berater
         @client.timing(
           'berater.limiter.limit',
           duration,
-          tags: tags.merge(overloaded: !lock),
+          tags: tags,
         )
 
         @client.gauge(
@@ -30,21 +30,33 @@ module Berater
           tags: tags,
         )
 
-        if lock && lock.contention > 0 # not a failsafe lock
-          @client.gauge(
-            'berater.lock.capacity',
-            lock.capacity,
-            tags: tags,
-          )
-          @client.gauge(
-            'berater.limiter.contention',
-            lock.contention,
+        if lock
+          @client.increment(
+            'berater.lock.acquired',
             tags: tags,
           )
+
+          if lock.contention > 0 # not a failsafe lock
+            @client.gauge(
+              'berater.lock.capacity',
+              lock.capacity,
+              tags: tags,
+            )
+            @client.gauge(
+              'berater.limiter.contention',
+              lock.contention,
+              tags: tags,
+            )
+          end
         end
 
         if error
           if error.is_a?(Berater::Overloaded)
+            @client.increment(
+              'berater.limiter.overloaded',
+              tags: tags,
+            )
+
             # overloaded, so contention >= capacity
             @client.gauge(
               'berater.limiter.contention',
@@ -54,7 +66,7 @@ module Berater
           else
             @client.increment(
               'berater.limiter.error',
-              tags: tags.merge(type: error.class.to_s)
+              tags: tags.merge(type: error.class.to_s.gsub('::', '_'))
             )
           end
         end

data/lib/berater/version.rb

@@ -1,3 +1,3 @@
 module Berater
-  VERSION = "0.12.0"
+  VERSION = "0.12.1"
 end

data/lib/berater.rb

@@ -52,8 +52,8 @@ module Berater
   end
 
   def expunge
-    redis.scan_each(match: "#{self.name}*") do |key|
-      redis.del key
+    redis.scan_each(match: "#{name}*") do |key|
+      redis.del(key)
     end
   end
 

data/spec/middleware/statsd_spec.rb

@@ -31,7 +31,6 @@ describe Berater::Middleware::Statsd do
         tags: {
           key: limiter.key,
           limiter: String,
-          overloaded: false,
         },
       )
     end
@@ -44,6 +43,13 @@ describe Berater::Middleware::Statsd do
       )
     end
 
+    it 'tracks lock acquisition' do
+      expect(client).to receive(:increment).with(
+        'berater.lock.acquired',
+        Hash
+      )
+    end
+
     context 'when custom tags are passed in' do
       let(:opts) { { tags: { abc: 123 } } }
 
@@ -135,7 +141,7 @@ describe Berater::Middleware::Statsd do
       it 'tracks limiter exceptions' do
         expect(client).to receive(:increment).with(
           'berater.limiter.error',
-          tags: hash_including(type: error.to_s),
+          tags: hash_including(type: 'Redis_TimeoutError'),
         )
 
         expect { limiter.limit }.to raise_error(error)
@@ -175,7 +181,7 @@ describe Berater::Middleware::Statsd do
         it 'tracks the exception' do
           expect(client).to receive(:increment).with(
             'berater.limiter.error',
-            Hash,
+            anything,
           )
 
           limiter.limit
@@ -202,11 +208,10 @@ describe Berater::Middleware::Statsd do
         expect { limiter.limit }.to be_overloaded
       end
 
-      it 'tracks the limit call' do
-        expect(client).to receive(:timing).with(
-          'berater.limiter.limit',
-          Float,
-          tags: hash_including(overloaded: true),
+      it 'tracks the overloaded count' do
+        expect(client).to receive(:increment).with(
+          'berater.limiter.overloaded',
+          Hash
         )
       end
 

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: berater
 version: !ruby/object:Gem::Version
-  version: 0.12.0
+  version: 0.12.1
 platform: ruby
 authors:
 - Daniel Pepper
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2021-11-03 00:00:00.000000000 Z
+date: 2021-11-05 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: meddleware