sidekiq-amigo 1.12.0 → 1.12.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 8f2d4776669bc7327b064ae2f0b2f22a83e35cd351da05a145d1b3b7bf086334
-  data.tar.gz: b3122b4fa37a8c6c93afbd485ce4b813536a2c1b91d96c266b2c2bb04be15d98
+  metadata.gz: ab4f66f8d1d73bf0c9d9569ba86b4041d7642f86b8d10c246aa2eb155b3b6376
+  data.tar.gz: 6f5726a5708706dcbff900c5dcfde0656ab797a67a698608249abb96b2e1d93f
 SHA512:
-  metadata.gz: c24ff6b6af38bb638be36dfa18aaca7500df9bf0126a4adf814e179fc05f3784b27004286e4ef796285cd047388d88486ee7da5fe9050454e33fc9b52d8f4698
-  data.tar.gz: 52b8edc30efe323786963559a7330058bd6b70552eedbdb4f7d3f3a8727373de6d033f2c0dd0113f9303f80e312d957df1e50c1f0fb5aec3e7bdcd9918b3a3bf
+  metadata.gz: 9ef0b460702cafafd2c25119434ef11fda3dc958de6ad575c2a3faae18ba5bd97de64302aa8facf27a97a87476be2ca3947faa9f5f65f68df0c078610e1d6239
+  data.tar.gz: cf55e3a4308cb10cd81c4f4831cc1ab967ebd2614adaf62889c192c1b439cbea694928a57b525beb4fafe992fb5a5242ab6cecad2e79ee7888341f9c9c104057

data/lib/amigo/autoscaler/checkers/web_latency.rb

@@ -7,7 +7,12 @@ module Amigo
     module Checkers
       class WebLatency < Amigo::Autoscaler::Checker
         NAMESPACE = "amigo/autoscaler/web_latency"
+        # The number of seconds requests are we averaging across.
         WINDOW = 60
+        # The number of seconds above which we have confidence in latency measurements.
+        # Without this window, a single request (without any other requests) could create a latency event.
+        # We need to see requests from this many seconds before feeling confident.
+        MINIMUM_CONFIDENCE_WINDOW = 30
 
         # Set the latency.
         # @param redis [RedisClient::Common] Redis connection.
@@ -31,19 +36,26 @@ module Amigo
 
         def get_latencies
           now = Time.now.to_i
-          keys = (now - 59..now).map { |t| "#{@namespace}/latencies:#{t}" }
-          counts = 0
-          sums = 0
+          window = (now - (WINDOW - 1))..now
+          keys = window.map { |bucket| "#{@namespace}/latencies:#{bucket}" }
           results = @redis.pipelined do |pipeline|
             keys.each do |k|
               pipeline.call("HMGET", k, "count", "sum")
             end
           end
-          results.each do |count, sum|
+          counts = 0
+          sums = 0
+          first_seen_bucket = nil
+          last_seen_bucket = nil
+          results.zip(window).each do |(count, sum), bucket|
+            next unless count # No results for this bucket
             counts += count.to_i
-            sums   += sum.to_i
+            sums += sum.to_i
+            first_seen_bucket ||= bucket
+            last_seen_bucket = bucket
           end
-          return {} if counts.zero?
+          return {} if first_seen_bucket.nil? || counts.zero?
+          return {} if (last_seen_bucket - first_seen_bucket) < MINIMUM_CONFIDENCE_WINDOW
           latency = sums.to_f / counts
           return {"web" => latency.to_f / 1000}
         end

data/lib/amigo/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module Amigo
-  VERSION = "1.12.0"
+  VERSION = "1.12.1"
 end

data/lib/amigo.rb

@@ -164,7 +164,12 @@ module Amigo
       self.subscribers.to_a.each do |hook|
         hook.call(ev)
       rescue StandardError => e
-        self.log(nil, :error, "amigo_subscriber_hook_error", error: e, hook: hook, event: ev&.as_json)
+        self.log(
+          nil,
+          :error,
+          "amigo_subscriber_hook_error",
+          error: e, hook: _block_repr(hook), event: ev&.as_json,
+        )
         raise e if self.on_publish_error.nil?
         if self.on_publish_error.respond_to?(:arity) && self.on_publish_error.arity == 1
           self.on_publish_error.call(e)
@@ -178,11 +183,18 @@ module Amigo
     # If a subscriber errors, on_publish_error is called with the exception, event, and subscriber.
     def register_subscriber(&block)
       raise LocalJumpError, "no block given" unless block
-      self.log nil, :info, "amigo_installed_subscriber", block: block
+      self.log nil, :info, "amigo_installed_subscriber", block: _block_repr(block)
       self.subscribers << block
       return block
     end
 
+    private def _block_repr(block)
+      return block.to_s unless block.respond_to?(:source_location)
+      loc = block.source_location
+      return block.to_s unless loc
+      return loc.join(":")
+    end
+
     def unregister_subscriber(block_ref)
       self.subscribers.delete(block_ref)
     end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: sidekiq-amigo
 version: !ruby/object:Gem::Version
-  version: 1.12.0
+  version: 1.12.1
 platform: ruby
 authors:
 - Lithic Technology