From 354f368054b0e21142d23b9a631d13fde362303c Mon Sep 17 00:00:00 2001
From: Mike Perham <mperham@gmail.com>
Date: Thu, 22 Sep 2022 11:19:12 -0700
Subject: [PATCH] Minimize metrics overhead, disable hourly/daily aggregates
 for now since we dont use them, expire histograms quicker

---
 lib/sidekiq/metrics/shared.rb   |  3 ++-
 lib/sidekiq/metrics/tracking.rb | 20 +++++++++++---------
 test/metrics.rb                 |  2 +-
 3 files changed, 14 insertions(+), 11 deletions(-)

diff --git a/lib/sidekiq/metrics/shared.rb b/lib/sidekiq/metrics/shared.rb
index 32d2e0cd..7f50af8d 100644
--- a/lib/sidekiq/metrics/shared.rb
+++ b/lib/sidekiq/metrics/shared.rb
@@ -46,6 +46,7 @@ module Sidekiq
         GET u16 #16 GET u16 #17 GET u16 #18 GET u16 #19 \
         GET u16 #20 GET u16 #21 GET u16 #22 GET u16 #23 \
         GET u16 #24 GET u16 #25".split
+      HISTOGRAM_TTL = 8 * 60 * 60
 
       def each
         buckets.each { |counter| yield counter.value }
@@ -86,7 +87,7 @@ module Sidekiq
         end
 
         conn.bitfield(*cmd) if cmd.size > 3
-        conn.expire(key, 86400)
+        conn.expire(key, HISTOGRAM_TTL)
         key
       end
     end
diff --git a/lib/sidekiq/metrics/tracking.rb b/lib/sidekiq/metrics/tracking.rb
index 16bb8719..0ebca7eb 100644
--- a/lib/sidekiq/metrics/tracking.rb
+++ b/lib/sidekiq/metrics/tracking.rb
@@ -48,8 +48,8 @@ module Sidekiq
         end
       end
 
-      LONG_TERM = 90 * 24 * 60 * 60
-      MID_TERM = 7 * 24 * 60 * 60
+      # LONG_TERM = 90 * 24 * 60 * 60
+      # MID_TERM = 7 * 24 * 60 * 60
       SHORT_TERM = 8 * 60 * 60
 
       def flush(time = Time.now)
@@ -59,12 +59,13 @@ module Sidekiq
         return if procd == 0 && fails == 0
 
         now = time.utc
-        nowdate = now.strftime("%Y%m%d")
-        nowhour = now.strftime("%Y%m%d|%-H")
+        # nowdate = now.strftime("%Y%m%d")
+        # nowhour = now.strftime("%Y%m%d|%-H")
         nowmin = now.strftime("%Y%m%d|%-H:%-M")
         count = 0
 
         redis do |conn|
+          # persist fine-grained histogram data
           if grams.size > 0
             conn.pipelined do |pipe|
               grams.each do |_, gram|
@@ -73,15 +74,16 @@ module Sidekiq
             end
           end
 
+          # persist coarse grained execution count + execution millis.
+          # note as of today we don't use or do anything with the
+          # daily or hourly rollups.
           [
-            ["j", jobs, nowdate, LONG_TERM],
-            ["j", jobs, nowhour, MID_TERM],
+            # ["j", jobs, nowdate, LONG_TERM],
+            # ["j", jobs, nowhour, MID_TERM],
             ["j", jobs, nowmin, SHORT_TERM]
           ].each do |prefix, data, bucket, ttl|
-            # Quietly seed the new 7.0 stats format so migration is painless.
             conn.pipelined do |xa|
               stats = "#{prefix}|#{bucket}"
-              # logger.debug "Flushing metrics #{stats}"
               data.each_pair do |key, value|
                 xa.hincrby stats, key, value
                 count += 1
@@ -89,7 +91,7 @@ module Sidekiq
               xa.expire(stats, ttl)
             end
           end
-          logger.info "Flushed #{count} metrics"
+          logger.debug "Flushed #{count} metrics"
           count
         end
       end
diff --git a/test/metrics.rb b/test/metrics.rb
index 85439e34..112d2b85 100644
--- a/test/metrics.rb
+++ b/test/metrics.rb
@@ -35,7 +35,7 @@ describe Sidekiq::Metrics do
 
   it "tracks metrics" do
     count = create_known_metrics
-    assert_equal 12, count
+    assert_equal 4, count
   end
 
   describe "marx" do