sidekiq 7.0.7 → 7.0.9

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 23b4f6ae3bb1b64fbc6bb359c6d10b52596e3d9c6bae08129907adbaa77f9dd6
-  data.tar.gz: '08590b7d942b48cf050f80236d56957c1ab2b26c37bc94ab07606e5b2be5b4bb'
+  metadata.gz: 8bdff48fe97b8b29f77dcd24b8807541fb5ddee0562efc6a836d0888a07f7429
+  data.tar.gz: a106c157bbe402f5ebc1ce15ffea50a1a82e5aefed49943f7dfdafa412fb4961
 SHA512:
-  metadata.gz: 1819631e039de53bc7b1285d6955e89bc8723af0fd6ee64faf3c0d84cd69bc51a6d31ef3f7c6993cd7c937c59993c913c4bba7e3f7a936198081ab2c0af6a499
-  data.tar.gz: a08b785013202849bca3fa61b51757ae413efb5dd459606925107843185881b8b62c8255e1aa7b1e9e3ac44bef69dfc6f1f07d93ffed0029906750850d003061
+  metadata.gz: 7e63f9d1bbb4f685f59a6c65c1dc820ddc3d31f1dea8c87828072f5eb89dc8a99491d43517d60d917feb8f912822fefd38f694199f31fccb36da8cab0e931ea0
+  data.tar.gz: e43c57aae746ae4e77b64f34bd9927e5b3b8fb2c9e5f257784a1aa767fca7aff2a978d6a7924fd5d3b659a401fc90d6ee3b9971acee547c358cc4066ac1c2a7d

data/Changes.md

@@ -2,6 +2,22 @@
 
 [Sidekiq Changes](https://github.com/sidekiq/sidekiq/blob/main/Changes.md) | [Sidekiq Pro Changes](https://github.com/sidekiq/sidekiq/blob/main/Pro-Changes.md) | [Sidekiq Enterprise Changes](https://github.com/sidekiq/sidekiq/blob/main/Ent-Changes.md)
 
+7.0.9
+----------
+
+- Restore confirmation dialogs in Web UI [#5881, shevaun]
+- Increase fetch timeout to minimize ReadTimeoutError [#5874]
+- Reverse histogram tooltip ordering [#5868]
+- Add Scottish Gaelic (gd) locale [#5867, GunChleoc]
+
+7.0.8
+----------
+
+- **SECURITY** Sanitize `period` input parameter on Metrics pages.
+  Specially crafted values can lead to XSS. This functionality
+  was introduced in 7.0.4. Thank you to spercex @ huntr.dev [#5694]
+- Add job hash as 3rd parameter to the `sidekiq_retry_in` block.
+
 7.0.7
 ----------
 

data/lib/sidekiq/fetch.rb

@@ -44,7 +44,7 @@ module Sidekiq # :nodoc:
         return nil
       end
 
-      queue, job = redis { |conn| conn.blocking_call(TIMEOUT + 1, "brpop", *qs, TIMEOUT) }
+      queue, job = redis { |conn| conn.blocking_call(conn.read_timeout + TIMEOUT, "brpop", *qs, TIMEOUT) }
       UnitOfWork.new(queue, job, config) if queue
     end
 

data/lib/sidekiq/job_retry.rb

@@ -171,7 +171,7 @@ module Sidekiq
       # Goodbye dear message, you (re)tried your best I'm sure.
       return retries_exhausted(jobinst, msg, exception) if count >= max_retry_attempts
 
-      strategy, delay = delay_for(jobinst, count, exception)
+      strategy, delay = delay_for(jobinst, count, exception, msg)
       case strategy
       when :discard
         return # poof!
@@ -190,12 +190,12 @@ module Sidekiq
     end
 
     # returns (strategy, seconds)
-    def delay_for(jobinst, count, exception)
+    def delay_for(jobinst, count, exception, msg)
       rv = begin
         # sidekiq_retry_in can return two different things:
         # 1. When to retry next, as an integer of seconds
         # 2. A symbol which re-routes the job elsewhere, e.g. :discard, :kill, :default
-        jobinst&.sidekiq_retry_in_block&.call(count, exception)
+        jobinst&.sidekiq_retry_in_block&.call(count, exception, msg)
       rescue Exception => e
         handle_exception(e, {context: "Failure scheduling retry using the defined `sidekiq_retry_in` in #{jobinst.class.name}, falling back to default"})
         nil

data/lib/sidekiq/metrics/query.rb

@@ -70,7 +70,7 @@ module Sidekiq
             result.job_results[klass].add_metric "ms", time, ms.to_i if ms
             result.job_results[klass].add_metric "p", time, p.to_i if p
             result.job_results[klass].add_metric "f", time, f.to_i if f
-            result.job_results[klass].add_hist time, Histogram.new(klass).fetch(conn, time)
+            result.job_results[klass].add_hist time, Histogram.new(klass).fetch(conn, time).reverse
             time -= 60
           end
         end

data/lib/sidekiq/metrics/shared.rb

@@ -29,8 +29,8 @@ module Sidekiq
         1100, 1700, 2500, 3800, 5750,
         8500, 13000, 20000, 30000, 45000,
         65000, 100000, 150000, 225000, 335000,
-        Float::INFINITY # the "maybe your job is too long" bucket
-      ]
+        1e20 # the "maybe your job is too long" bucket
+      ].freeze
       LABELS = [
         "20ms", "30ms", "45ms", "65ms", "100ms",
         "150ms", "225ms", "335ms", "500ms", "750ms",
@@ -38,7 +38,7 @@ module Sidekiq
         "8.5s", "13s", "20s", "30s", "45s",
         "65s", "100s", "150s", "225s", "335s",
         "Slow"
-      ]
+      ].freeze
       FETCH = "GET u16 #0 GET u16 #1 GET u16 #2 GET u16 #3 \
         GET u16 #4 GET u16 #5 GET u16 #6 GET u16 #7 \
         GET u16 #8 GET u16 #9 GET u16 #10 GET u16 #11 \

data/lib/sidekiq/version.rb

@@ -1,6 +1,6 @@
 # frozen_string_literal: true
 
 module Sidekiq
-  VERSION = "7.0.7"
+  VERSION = "7.0.9"
   MAJOR = 7
 end

data/lib/sidekiq/web/application.rb

@@ -68,7 +68,7 @@ module Sidekiq
 
     get "/metrics" do
       q = Sidekiq::Metrics::Query.new
-      @period = params[:period]
+      @period = h((params[:period] || "")[0..1])
       @periods = METRICS_PERIODS
       minutes = @periods.fetch(@period, @periods.values.first)
       @query_result = q.top_jobs(minutes: minutes)
@@ -77,7 +77,7 @@ module Sidekiq
 
     get "/metrics/:name" do
       @name = route_params[:name]
-      @period = params[:period]
+      @period = h((params[:period] || "")[0..1])
       q = Sidekiq::Metrics::Query.new
       @periods = METRICS_PERIODS
       minutes = @periods.fetch(@period, @periods.values.first)

data/sidekiq.gemspec

@@ -19,7 +19,8 @@ Gem::Specification.new do |gem|
     "bug_tracker_uri" => "https://github.com/sidekiq/sidekiq/issues",
     "documentation_uri" => "https://github.com/sidekiq/sidekiq/wiki",
     "changelog_uri" => "https://github.com/sidekiq/sidekiq/blob/main/Changes.md",
-    "source_code_uri" => "https://github.com/sidekiq/sidekiq"
+    "source_code_uri" => "https://github.com/sidekiq/sidekiq",
+    "rubygems_mfa_required" => "true"
   }
 
   gem.add_dependency "redis-client", ">= 0.11.0"

data/web/locales/gd.yml

@@ -0,0 +1,99 @@
+# elements like %{queue} are variables and should not be translated
+gd:
+  Actions: Gnìomhan
+  AddToQueue: Cuir ris a’ chiutha
+  AreYouSure: A bheil thu cinnteach?
+  AreYouSureDeleteJob: A bheil thu cinnteach gu bheil thu airson an obair seo a sguabadh às?
+  AreYouSureDeleteQueue: A bheil thu cinnteach gu bheil thu airson ciutha %{queue} a sguabadh às? Sguabaidh seo às gach obair sa chiutha seo, nochdaidh e a-rithist nuair a phutas tu barrachd obraichean dha an uairsin.
+  Arguments: Argamaidean
+  BackToApp: Till dhan aplacaid
+  Busy: Trang
+  Class: Clas
+  Connections: Ceanglaichean
+  CreatedAt: Air a chruthachadh
+  CurrentMessagesInQueue: Obraichean làithreach am broinn <span class='title'>%{queue}</span>
+  Dashboard: Deas-bhòrd
+  Dead: Marbh
+  DeadJobs: Obraichean marbh
+  Delete: Sguab às
+  DeleteAll: Sguab às na h-uile
+  Deploy: Cuir an gnìomh
+  Enqueued: Sa chiutha
+  Error: Mearachd
+  ErrorBacktrace: Backtrace na mearachd
+  ErrorClass: Clas na mearachd
+  ErrorMessage: Teachdaireachd na mearachd
+  ExecutionTime: Àm a’ ghnìomha
+  Extras: Nithean a bharrachd
+  Failed: Air fàilligeadh
+  Failures: Fàilligidhean
+  Failure: Fàilligeadh
+  GoBack: ← Air ais
+  History: Eachdraidh
+  Job: Obair
+  Jobs: Obraichean
+  Kill: Marbh
+  KillAll: Marbh na h-uile
+  LastRetry: An oidhirp mu dheireadh
+  Latency: Foillidheachd
+  LivePoll: Ath-nuadhachadh beò
+  MemoryUsage: Cleachdadh a’ chuimhne
+  Name: Ainm
+  Namespace: Ainm-spàs
+  NextRetry: An ath-oidhirp
+  NoDeadJobsFound: Cha deach obair mharbh a lorg
+  NoRetriesFound: Cha deach ath-oidhirp a lorg
+  NoScheduledFound: Cha deach obair air an sgeideal a lorg
+  NotYetEnqueued: Chan eil seo sa chiutha fhathast
+  OneMonth: Mìos
+  OneWeek: Seachdain
+  OriginallyFailed: Dh’fhàillig e o thùs
+  Pause: Cuir ’na stad
+  Paused: ’Na stad
+  PeakMemoryUsage: Bàrr cleachdadh a’ chuimhne
+  Plugins: Plugain
+  PollingInterval: Eadaramh an ath-nuadhachaidh
+  Process: Pròiseas
+  Processed: Air pròiseasadh
+  Processes: Pròiseasan
+  Queue: Ciutha
+  Queues: Ciuthan
+  Quiet: Mùch
+  QuietAll: Mùch na h-uile
+  Realtime: Fìor-àm
+  Retries: Oidhirpean
+  RetryAll: Feuch ris na h-uile a-rithist
+  RetryCount: Cunntas nan oidhirpean
+  RetryNow: Feuch ris a-rithist an-dràsta
+  Scheduled: Air an sgeideal
+  ScheduledJobs: Obraichean air an sgeideal
+  Seconds: Diogan
+  ShowAll: Seall na h-uile
+  SixMonths: Leth-bhliadhna
+  Size: Meud
+  Started: Air a thòiseachadh
+  Status: Staid
+  Stop: Cuir stad air
+  StopAll: Cuir stad air na h-uile
+  StopPolling: Sguir dhen ath-nuadhachadh
+  Success: Chaidh leis
+  Summary: Geàrr-chunntas
+  Thread: Snàithlean
+  Threads: Snàithleanan
+  ThreeMonths: 3 mìosan
+  Time: Àm
+  Unpause: Lean air
+  Uptime: Beò fad (làithean)
+  Utilization: Cleachdadh
+  Version: Tionndadh
+  When: Cuin
+  Worker: Obraiche
+  active: gnìomhach
+  idle: ’na thàmh
+  Metrics: Meatraigeachd
+  NoDataFound: Cha deach dàta a lorg
+  TotalExecutionTime: Ùine iomlan nan gnìomhan
+  AvgExecutionTime: Ùine cuibheasach nan gnìomhan
+  Context: Co-theacsa
+  Bucket: Bucaid
+  NoJobMetricsFound: Cha deach meatraigeachd o chionn goirid air obair a lorg

data/web/views/busy.erb

@@ -33,8 +33,8 @@
     <form method="POST" class="warning-messages">
       <%= csrf_tag %>
       <div class="btn-group pull-right flip">
-        <button class="btn btn-warn" type="submit" name="quiet" value="1" data-confirm="<%= t('AreYouSure') %>"><%= t('QuietAll') %></button>
-        <button class="btn btn-danger" type="submit" name="stop" value="1" data-confirm="<%= t('AreYouSure') %>"><%= t('StopAll') %></button>
+        <input class="btn btn-warn" type="submit" name="quiet" value="<%= t('QuietAll') %>" data-confirm="<%= t('AreYouSure') %>"/>
+        <input class="btn btn-danger" type="submit" name="stop" value="<%= t('StopAll') %>" data-confirm="<%= t('AreYouSure') %>"/>
       </div>
     </form>
   </div>

data/web/views/metrics_for_job.erb

@@ -6,11 +6,8 @@
 <%
   job_result = @query_result.job_results[@name]
   hist_totals = job_result.hist.values.first.zip(*job_result.hist.values[1..-1]).map(&:sum)
-  bucket_labels =Sidekiq::Metrics::Histogram::LABELS
-  bucket_intervals =Sidekiq::Metrics::Histogram::BUCKET_INTERVALS.reverse
-
-  # Replace INFINITY since it can't be represented as JSON
-  bucket_intervals[0] = bucket_intervals[1] * 2
+  bucket_labels = Sidekiq::Metrics::Histogram::LABELS
+  bucket_intervals = Sidekiq::Metrics::Histogram::BUCKET_INTERVALS
 %>
 
 <% if job_result.totals["s"] > 0 %>

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: sidekiq
 version: !ruby/object:Gem::Version
-  version: 7.0.7
+  version: 7.0.9
 platform: ruby
 authors:
 - Mike Perham
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2023-03-14 00:00:00.000000000 Z
+date: 2023-04-18 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: redis-client
@@ -156,6 +156,7 @@ files:
 - web/locales/es.yml
 - web/locales/fa.yml
 - web/locales/fr.yml
+- web/locales/gd.yml
 - web/locales/he.yml
 - web/locales/hi.yml
 - web/locales/it.yml
@@ -205,6 +206,7 @@ metadata:
   documentation_uri: https://github.com/sidekiq/sidekiq/wiki
   changelog_uri: https://github.com/sidekiq/sidekiq/blob/main/Changes.md
   source_code_uri: https://github.com/sidekiq/sidekiq
+  rubygems_mfa_required: 'true'
 post_install_message: |2+
 
   Welcome to Sidekiq 7.0!