wurk 1.1.1 → 1.1.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 8911da9e550c5d8078c4293ebb69f3b8620a4285692f6e3a6b37d41b711c9219
-  data.tar.gz: 9cc0cf226409e7fb5f9ffce6749b2a7328324e9319350d7752c8bdf8d33e7437
+  metadata.gz: 4ed68ef2a8264d31364b725a97e468e55f2dcd823b00ed3a1104cc5ea39dddba
+  data.tar.gz: '03281f4525a7a9b8892f04acafa464a8b8eb28d51bd82c6cc6a3a0241e8b7dfe'
 SHA512:
-  metadata.gz: '093767442c103fc2a99fc8b8d0b5fa21c16d50a46cd90be6826b948c82c871217e725c07af71b6df3c98d501788199104601262081cfe8810b7bbd510c099191'
-  data.tar.gz: fe4977ee515f59cbb6758fe4f42a5d6a8a198c863efc5bebccd211e1c47a2f1ff3f11d90ce85ad1e7faa8f335e1b865ff0bb8efbc0a827773c4d977c968e149b
+  metadata.gz: dbc0fcc7b8aa362b63792352d9e0099df9d45a5d6b03f5ef53997ba55d70b973ccbcd59aa8bbef4404a5a7c09dc6890dbac935cb413a5c3e463a3e7799e4c986
+  data.tar.gz: 2a60efb7fa8697421f01d0d426ca348da2d191be707f8806444fbaaad1494643443432dca62e255b3645421f9e646a3dfa7d5c64859b39143ee996f7474ec3c0

data/lib/wurk/metrics/history.rb

@@ -6,42 +6,42 @@ module Wurk
   module Metrics
     # Ent feature parity (§5): server middleware that records per-job-class
     # execution metrics into Redis time-buckets. The on-the-wire schema is
-    # wire-compat with Sidekiq 8.x's history pane so dashboards built against
-    # `j|YYMMDD|H:M` HASH keys keep working unchanged.
+    # wire-compat with Sidekiq's history pane — Sidekiq keys the per-minute
+    # HASH as `j|<YYYYMMDD>|<H>:<M>`, so dashboards (and Sidekiq data migrated
+    # in place) keep resolving against the same key after a drop-in swap.
     #
     # Bucket layout (spec: docs/target/sidekiq-free.md §1.6):
     #
-    #   j|YYMMDD|H:M    HASH   per-minute bucket, TTL = MID_TERM (3 days)
-    #     <klass>|p     INT    processed count
-    #     <klass>|f     INT    failed count
-    #     <klass>|ms    INT    total ms spent
+    #   j|YYYYMMDD|H:M    HASH   per-minute bucket, TTL = MID_TERM (3 days)
+    #     <klass>|p       INT    processed count
+    #     <klass>|f       INT    failed count
+    #     <klass>|ms      INT    total ms spent
     #
-    #   j|YYMMDD|H:m0   HASH   10-minute rollup (last digit zeroed),
-    #                          TTL = SHORT_TERM (8 hours) — short window for
-    #                          quick aggregate queries without scanning 600 minute keys.
+    #   <klass>-YYYYMMDD-H  HASH per-class hourly histogram, TTL = MID_TERM
     #
-    #   <klass>-YYMMDD-H  HASH per-class hourly histogram, TTL = MID_TERM
+    # We deliberately do NOT write a `H:m0` 10-minute rollup. Its key format
+    # collides with the real minute-0 bucket, so rolling x1..x9 into it turns
+    # that minute's value into a decade total — and the read side (Query) then
+    # sums the minute-0 bucket alongside x1..x9 and double-counts. Sidekiq
+    # itself doesn't keep that rollup (the daily/hourly rollups are commented
+    # out in its ExecutionTracker); Query reads the last N per-minute keys.
     #
-    # Every bucket TTL is set on first write (EXPIRE NX-equivalent: only when
-    # the HASH was newly created in this call) — re-asserting TTL on every
-    # write would keep the bucket alive indefinitely while traffic continues,
-    # but that's the desired behavior here: as long as a class keeps running,
-    # we keep the minute bucket around for the retention window measured from
+    # Every bucket TTL is set on every write (not NX): as long as a class keeps
+    # running we keep its bucket around for the retention window measured from
     # *last write*, not from first write. So we EXPIRE unconditionally.
     #
-    # The middleware is hot-path — every successful job pays for it. Writes
-    # are pipelined in a single round-trip per job (1 HINCRBY × 3 + 1 EXPIRE
-    # per bucket × 3 buckets = 12 commands, batched).
+    # The middleware is hot-path — every successful job pays for it. Writes are
+    # pipelined in a single round-trip per job (1 HINCRBY × 2 + 1 EXPIRE per
+    # bucket × 2 buckets = 6 commands, batched).
     class History
       include Wurk::Middleware::ServerMiddleware
 
       # Per spec §1.6 — naming mirrors the upstream constants so anyone
       # grepping the Sidekiq source for `MID_TERM` lands here.
       MID_TERM = 3 * 24 * 60 * 60      # 3 days, in seconds
-      SHORT_TERM = 8 * 60 * 60         # 8 hours, in seconds
 
       MINUTE_KEY_PREFIX = 'j|'
-      DATE_FORMAT = '%y%m%d'           # YYMMDD — two-digit year per spec
+      DATE_FORMAT = '%Y%m%d'           # YYYYMMDD — matches Sidekiq's j| key
 
       def call(_worker, job, _queue)
         klass = job['class']
@@ -74,28 +74,20 @@ module Wurk
 
           ms = duration_ms.to_i
           ms = 0 if ms.negative?
-          buckets = { minute: minute_key(at), rollup: rollup_key(at), hour: hour_key(klass, at) }
+          buckets = { minute: minute_key(at), hour: hour_key(klass, at) }
           with_pool(redis_pool) { |conn| pipeline_write(conn, klass, ms, success, buckets) }
           nil
         end
 
-        # Minute + 10-min rollup share a per-class `|p|f|ms` field layout;
-        # the hourly bucket is already class-scoped so its fields are bare
-        # `p|f|ms`. Pipeline all 9 commands in one round-trip.
+        # The minute bucket carries per-class `<klass>|p|f|ms` fields; the
+        # hourly bucket is already class-scoped so its fields are bare
+        # `p|f|ms`. Pipeline all 6 commands in one round-trip.
         def pipeline_write(conn, klass, ms, success, buckets)
           outcome = success ? 'p' : 'f'
           class_outcome = "#{klass}|#{outcome}"
           class_ms = "#{klass}|ms"
           conn.pipelined do |pipe|
             incr_bucket(pipe, buckets[:minute], [class_outcome, class_ms, ms, MID_TERM])
-            # The minute key and the 10-min rollup key coincide whenever the
-            # minute ends in 0 (rollup zeroes the last digit). Writing both
-            # would double-count the shared field — the minute write above
-            # already lands on it — so skip the rollup write then. Minutes
-            # x1..x9 still accumulate into the x0 rollup key as normal.
-            unless buckets[:rollup] == buckets[:minute]
-              incr_bucket(pipe, buckets[:rollup], [class_outcome, class_ms, ms, SHORT_TERM])
-            end
             incr_bucket(pipe, buckets[:hour], [outcome, 'ms', ms, MID_TERM])
           end
         end
@@ -115,12 +107,6 @@ module Wurk
                  date: t.strftime(DATE_FORMAT), hr: t.hour, min: t.min)
         end
 
-        def rollup_key(time)
-          t = time.utc
-          format("#{MINUTE_KEY_PREFIX}%<date>s|%<hr>d:%<min>d",
-                 date: t.strftime(DATE_FORMAT), hr: t.hour, min: (t.min / 10) * 10)
-        end
-
         def hour_key(klass, time)
           t = time.utc
           "#{klass}-#{t.strftime(DATE_FORMAT)}-#{t.hour}"

data/lib/wurk/profiler.rb

@@ -50,11 +50,13 @@ module Wurk
         key = profile_key(token, jid)
         gz = gzip(gecko_json)
         with_pool(pool) do |conn|
-          conn.call('HSET', key, 'jid', jid, 'type', type, 'token', token,
-                    'started_at', started_at.to_i, 'elapsed', elapsed_ms.to_i,
-                    'size', gz.bytesize, 'sid', sid.to_s, 'data', gz)
-          conn.call('EXPIRE', key, TTL)
-          conn.call('ZADD', Keys::PROFILES, (now + TTL).to_i, key)
+          conn.pipelined do |pipe|
+            pipe.call('HSET', key, 'jid', jid, 'type', type, 'token', token,
+                      'started_at', started_at.to_i, 'elapsed', elapsed_ms.to_i,
+                      'size', gz.bytesize, 'sid', sid.to_s, 'data', gz)
+            pipe.call('EXPIRE', key, TTL)
+            pipe.call('ZADD', Keys::PROFILES, (now + TTL).to_i, key)
+          end
         end
         key
       end

data/lib/wurk/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module Wurk
-  VERSION = "1.1.1"
+  VERSION = "1.1.2"
 end

data/vendor/assets/dashboard/wurk-manifest.json

@@ -1,4 +1,4 @@
 {
-  "version": "1.1.1",
-  "timestamp": "2026-07-18T13:06:31.576Z"
+  "version": "1.1.2",
+  "timestamp": "2026-07-18T13:58:36.548Z"
 }

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: wurk
 version: !ruby/object:Gem::Version
-  version: 1.1.1
+  version: 1.1.2
 platform: ruby
 authors:
 - developerz.ai