sidekiq 7.3.9 → 8.0.0.beta2

data/web/views/queues.erb

@@ -1,44 +1,46 @@
-<div class="header-container">
-  <h1><%= t('Queues') %></h1>
-</div>
+<section>
+  <header>
+    <h1><%= t('Queues') %></h1>
+  </header>
 
-<div class="table_container">
-  <table class="queues table table-hover table-bordered table-striped">
-    <thead>
-      <th><%= t('Queue') %></th>
-      <th><%= t('Size') %></th>
-      <th><%= t('Latency') %></th>
-      <th><%= t('Actions') %></th>
-    </thead>
-    <% @queues.each do |queue| %>
-      <tr>
-        <td>
-          <a href="<%= root_path %>queues/<%= CGI.escape(queue.name) %>"><%= h queue.name %></a>
-          <% if queue.paused? %>
-            <span class="label label-danger"><%= t('Paused') %></span>
-          <% end %>
-        </td>
-        <td class="num"><%= number_with_delimiter(queue.size) %> </td>
-        <td class="num">
-          <% queue_latency = queue.latency %>
-          <%= (queue_latency < 60) ? '' : " (#{relative_time(Time.at(Time.now.to_f - queue_latency))})" %>
-          <%= number_with_delimiter(queue_latency, precision: 2) %>
-        </td>
-        <td class="delete-confirm">
-          <form action="<%=root_path %>queues/<%= CGI.escape(queue.name) %>" method="post">
-            <%= csrf_tag %>
-            <input class="btn btn-danger" type="submit" name="delete" title="This will delete all jobs within the queue, it will reappear if you push more jobs to it in the future." value="<%= t('Delete') %>" data-confirm="<%= t('AreYouSureDeleteQueue', :queue => h(queue.name)) %>" />
+  <div class="table_container">
+    <table>
+      <thead>
+        <th><%= t('Queue') %></th>
+        <th><%= t('Size') %></th>
+        <th><%= t('Latency') %></th>
+        <th><%= t('Actions') %></th>
+      </thead>
+      <% @queues.each do |queue| %>
+        <tr>
+          <td>
+            <a href="<%= root_path %>queues/<%= CGI.escape(queue.name) %>"><%= h queue.name %></a>
+            <% if queue.paused? %>
+              <span class="label label-danger"><%= t('Paused') %></span>
+            <% end %>
+          </td>
+          <td class="num"><%= number_with_delimiter(queue.size) %> </td>
+          <td class="num">
+            <% queue_latency = queue.latency %>
+            <%= (queue_latency < 60) ? '' : " (#{relative_time(Time.at(Time.now.to_f - queue_latency))})" %>
+            <%= number_with_delimiter(queue_latency, precision: 2) %>
+          </td>
+          <td class="delete-confirm">
+            <form action="<%=root_path %>queues/<%= CGI.escape(queue.name) %>" method="post">
+              <%= csrf_tag %>
+              <input class="btn btn-danger" type="submit" name="delete" title="This will delete all jobs within the queue, it will reappear if you push more jobs to it in the future." value="<%= t('Delete') %>" data-confirm="<%= t('AreYouSureDeleteQueue', :queue => h(queue.name)) %>" />
 
-            <% if Sidekiq.pro? %>
-              <% if queue.paused? %>
-                <input class="btn btn-danger" type="submit" name="unpause" value="<%= t('Unpause') %>" />
-              <% else %>
-                <input class="btn btn-danger" type="submit" name="pause" value="<%= t('Pause') %>" />
+              <% if Sidekiq.pro? %>
+                <% if queue.paused? %>
+                  <input class="btn btn-danger" type="submit" name="unpause" value="<%= t('Unpause') %>" />
+                <% else %>
+                  <input class="btn btn-danger" type="submit" name="pause" value="<%= t('Pause') %>" />
+                <% end %>
               <% end %>
-            <% end %>
-          </form>
-        </td>
-      </tr>
-    <% end %>
-  </table>
-</div>
+            </form>
+          </td>
+        </tr>
+      <% end %>
+    </table>
+  </div>
+</section>

data/web/views/retries.erb

@@ -1,79 +1,70 @@
-<div class="header-container">
-  <h1><%= t('Retries') %></h1>
-  <% if @retries.size > 0 && @total_size > @count %>
-    <%= erb :_paging, locals: { url: "#{root_path}retries" } %>
-  <% end %>
-  <%= filtering('retries') %>
-</div>
-
-<% if @retries.size > 0 %>
-  <form action="<%= root_path %>retries" method="post">
-    <%= csrf_tag %>
-    <div class="table_container">
-      <table class="table table-striped table-bordered table-hover">
-        <thead>
-          <tr>
-            <th class="table-checkbox checkbox-column">
-              <label>
-                <input type="checkbox" class="check_all" />
-              </label>
-            </th>
-            <th><%= t('NextRetry') %></th>
-            <th><%= t('RetryCount') %></th>
-            <th><%= t('Queue') %></th>
-            <th><%= t('Job') %></th>
-            <th><%= t('Arguments') %></th>
-            <th><%= t('Error') %></th>
-          </tr>
-        </thead>
-        <% @retries.each do |entry| %>
-          <tr>
-            <td class="table-checkbox">
-              <label>
-                <input type='checkbox' name='key[]' value='<%= job_params(entry.item, entry.score) %>' class='shift_clickable' />
-              </label>
-            </td>
-            <td>
-              <a href="<%= root_path %>retries/<%= job_params(entry.item, entry.score) %>"><%= relative_time(entry.at) %></a>
-            </td>
-            <td><%= entry['retry_count'] %></td>
-            <td>
-              <a href="<%= root_path %>queues/<%= entry.queue %>"><%= entry.queue %></a>
-            </td>
-            <td>
-              <%= entry.display_class %>
-              <%= display_tags(entry, "retries") %>
-            </td>
-            <td>
-              <div class="args"><%= display_args(entry.display_args) %></div>
-            </td>
-            <td>
-              <div><%= h truncate("#{entry['error_class']}: #{entry['error_message']}", 200) %></div>
-            </td>
-          </tr>
-        <% end %>
-      </table>
-    </div>
-    <input class="btn btn-primary pull-left flip" type="submit" name="retry" value="<%= t('RetryNow') %>" />
-    <input class="btn btn-danger pull-left flip" type="submit" name="delete" value="<%= t('Delete') %>" />
-    <input class="btn btn-danger pull-left flip" type="submit" name="kill" value="<%= t('Kill') %>" />
-  </form>
+<section>
+  <header>
+    <h1><%= t('Retries') %></h1>
+    <% if @retries.size > 0 && @total_size > @count %>
+      <%= erb :_paging, locals: { url: "#{root_path}retries" } %>
+    <% end %>
+    <%= filtering('retries') %>
+  </header>
 
-  <% unfiltered? do %>
-    <form action="<%= root_path %>retries/all/delete" method="post">
-      <%= csrf_tag %>
-      <input class="btn btn-danger pull-right flip" type="submit" name="delete" value="<%= t('DeleteAll') %>" data-confirm="<%= t('AreYouSure') %>" />
-    </form>
-    <form action="<%= root_path %>retries/all/retry" method="post">
+  <% if @retries.size > 0 %>
+    <form action="<%= root_path %>retries" method="post">
       <%= csrf_tag %>
-      <input class="btn btn-danger pull-right flip" type="submit" name="retry" value="<%= t('RetryAll') %>" data-confirm="<%= t('AreYouSure') %>" />
-    </form>
-    <form action="<%= root_path %>retries/all/kill" method="post">
-      <%= csrf_tag %>
-      <input class="btn btn-danger pull-right flip" type="submit" name="kill" value="<%= t('KillAll') %>" data-confirm="<%= t('AreYouSure') %>" />
+      <div class="table_container">
+        <table>
+          <thead>
+            <tr>
+              <th>
+                <label>
+                  <input type="checkbox" class="check_all" />
+                </label>
+              </th>
+              <th><%= t('NextRetry') %></th>
+              <th><%= t('RetryCount') %></th>
+              <th><%= t('Queue') %></th>
+              <th><%= t('Job') %></th>
+              <th><%= t('Arguments') %></th>
+              <th><%= t('Error') %></th>
+            </tr>
+          </thead>
+          <% @retries.each do |entry| %>
+            <tr>
+              <td>
+                <label>
+                  <input type='checkbox' name='key[]' value='<%= job_params(entry.item, entry.score) %>' class='shift_clickable' />
+                </label>
+              </td>
+              <td>
+                <a href="<%= root_path %>retries/<%= job_params(entry.item, entry.score) %>"><%= relative_time(entry.at) %></a>
+              </td>
+              <td><%= entry['retry_count'] %></td>
+              <td>
+                <a href="<%= root_path %>queues/<%= entry.queue %>"><%= entry.queue %></a>
+              </td>
+              <td>
+                <%= entry.display_class %>
+                <%= display_tags(entry, "retries") %>
+              </td>
+              <td>
+                <code>
+                  <div class="args"><%= display_args(entry.display_args) %></div>
+                </code>
+              </td>
+              <td>
+                <div><a href="<%= root_path %>retries/<%= job_params(entry.item, entry.score) %>"><%= h truncate("#{entry['error_class']}: #{entry['error_message']}", 200) %></a></div>
+              </td>
+            </tr>
+          <% end %>
+        </table>
+      </div>
+      <div class="buttons-row">
+        <input class="btn btn-primary" type="submit" name="retry" value="<%= t('RetryNow') %>" />
+        <input class="btn btn-danger" type="submit" name="delete" value="<%= t('Delete') %>" />
+        <input class="btn btn-danger" type="submit" name="kill" value="<%= t('Kill') %>" />
+      </div>
     </form>
+    
+  <% else %>
+    <div class="alert alert-success"><%= t('NoRetriesFound') %></div>
   <% end %>
-
-<% else %>
-  <div class="alert alert-success"><%= t('NoRetriesFound') %></div>
-<% end %>
+</section>

data/web/views/retry.erb

@@ -1,34 +1,39 @@
 <%= erb :_job_info, locals: { job: @retry, type: :retry } %>
 
-<h3><%= t('Error') %></h3>
-<div class="table_container">
-  <table class="error table table-bordered table-striped table-hover">
-    <tbody>
-      <tr>
-        <th><%= t('ErrorClass') %></th>
-        <td>
-          <code><%= h @retry['error_class'] %></code>
-        </td>
-      </tr>
-      <tr>
-        <th><%= t('ErrorMessage') %></th>
-        <td><%= h(@retry['error_message']) %></td>
-      </tr>
-      <% if @retry.error_backtrace %>
+<section>
+  <header>
+    <h2><%= t('Error') %></h2>
+  </header>
+
+  <div class="table_container">
+    <table>
+      <tbody>
         <tr>
-          <th><%= t('ErrorBacktrace') %></th>
+          <th><%= t('ErrorClass') %></th>
           <td>
-            <code><%= @retry.error_backtrace.join("<br/>") %></code>
+            <code><%= h @retry['error_class'] %></code>
           </td>
         </tr>
-      <% end %>
-    </tbody>
-  </table>
-</div>
+        <tr>
+          <th><%= t('ErrorMessage') %></th>
+          <td><%= h(@retry['error_message']) %></td>
+        </tr>
+        <% if @retry.error_backtrace %>
+          <tr>
+            <th><%= t('ErrorBacktrace') %></th>
+            <td>
+              <code><%= @retry.error_backtrace.join("<br/>") %></code>
+            </td>
+          </tr>
+        <% end %>
+      </tbody>
+    </table>
+  </div>
 
-<form class="form-horizontal" action="<%= root_path %>retries/<%= job_params(@retry, @retry.score) %>" method="post">
-  <%= csrf_tag %>
-  <a class="btn btn-default" href="<%= root_path %>retries"><%= t('GoBack') %></a>
-  <input class="btn btn-primary" type="submit" name="retry" value="<%= t('RetryNow') %>" />
-  <input class="btn btn-danger" type="submit" name="delete" value="<%= t('Delete') %>" />
-</form>
+  <form action="<%= root_path %>retries/<%= job_params(@retry, @retry.score) %>" method="post">
+    <%= csrf_tag %>
+    <a class="btn btn-default" href="<%= root_path %>retries"><%= t('GoBack') %></a>
+    <input class="btn btn-primary" type="submit" name="retry" value="<%= t('RetryNow') %>" />
+    <input class="btn btn-danger" type="submit" name="delete" value="<%= t('Delete') %>" />
+  </form>
+</section>

data/web/views/scheduled.erb

@@ -1,56 +1,60 @@
-<div class="header-container">
-  <h1><%= t('ScheduledJobs') %></h1>
-  <% if @scheduled.size > 0 && @total_size > @count %>
-    <%= erb :_paging, locals: { url: "#{root_path}scheduled" } %>
+<section>
+  <header>
+    <h1><%= t('ScheduledJobs') %></h1>
+    <% if @scheduled.size > 0 && @total_size > @count %>
+      <%= erb :_paging, locals: { url: "#{root_path}scheduled" } %>
+    <% end %>
+    <%= filtering('scheduled') %>
+  </header>
+
+  <% if @scheduled.size > 0 %>
+    <form action="<%= root_path %>scheduled" method="post">
+      <%= csrf_tag %>
+      <div class="table_container">
+        <table>
+          <thead>
+            <tr>
+              <th>
+                <label>
+                  <input type="checkbox" class="check_all" />
+                </label>
+              </th>
+              <th><%= t('When') %></th>
+              <th><%= t('Queue') %></th>
+              <th><%= t('Job') %></th>
+              <th><%= t('Arguments') %></th>
+            </tr>
+          </thead>
+          <% @scheduled.each do |entry| %>
+            <tr>
+              <td>
+                <label>
+                  <input type='checkbox' name='key[]' value='<%= job_params(entry.item, entry.score) %>' class='shift_clickable' />
+                </label>
+              </td>
+              <td>
+                <a href="<%= root_path %>scheduled/<%= job_params(entry.item, entry.score) %>"><%= relative_time(entry.at) %></a>
+              </td>
+              <td>
+                <a href="<%= root_path %>queues/<%= entry.queue %>"><%= entry.queue %></a>
+              </td>
+              <td>
+                <%= entry.display_class %>
+                <%= display_tags(entry, "scheduled") %>
+              </td>
+              <td>
+                <code>
+                  <div class="args"><%= display_args(entry.display_args) %></div>
+                </code>
+              </td>
+            </tr>
+          <% end %>
+        </table>
+      </div>
+      <input class="btn btn-danger" type="submit" name="delete" value="<%= t('Delete') %>" />
+      <input class="btn btn-danger" type="submit" name="add_to_queue" value="<%= t('AddToQueue') %>" />
+    </form>
+  <% else %>
+    <div class="alert alert-success"><%= t('NoScheduledFound') %></div>
   <% end %>
-  <%= filtering('scheduled') %>
 </div>
-
-<% if @scheduled.size > 0 %>
-  <form action="<%= root_path %>scheduled" method="post">
-    <%= csrf_tag %>
-    <div class="table_container">
-      <table class="table table-striped table-bordered table-hover">
-        <thead>
-          <tr>
-            <th class="table-checkbox checkbox-column">
-              <label>
-                <input type="checkbox" class="check_all" />
-              </label>
-            </th>
-            <th><%= t('When') %></th>
-            <th><%= t('Queue') %></th>
-            <th><%= t('Job') %></th>
-            <th><%= t('Arguments') %></th>
-          </tr>
-        </thead>
-        <% @scheduled.each do |entry| %>
-          <tr>
-            <td class="table-checkbox">
-              <label>
-                <input type='checkbox' name='key[]' value='<%= job_params(entry.item, entry.score) %>' class='shift_clickable' />
-              </label>
-            </td>
-            <td>
-               <a href="<%= root_path %>scheduled/<%= job_params(entry.item, entry.score) %>"><%= relative_time(entry.at) %></a>
-            </td>
-            <td>
-              <a href="<%= root_path %>queues/<%= entry.queue %>"><%= entry.queue %></a>
-            </td>
-            <td>
-              <%= entry.display_class %>
-              <%= display_tags(entry, "scheduled") %>
-            </td>
-            <td>
-               <div class="args"><%= display_args(entry.display_args) %></div>
-            </td>
-          </tr>
-        <% end %>
-      </table>
-    </div>
-    <input class="btn btn-danger pull-right flip" type="submit" name="delete" value="<%= t('Delete') %>" />
-    <input class="btn btn-danger pull-right flip" type="submit" name="add_to_queue" value="<%= t('AddToQueue') %>" />
-  </form>
-<% else %>
-  <div class="alert alert-success"><%= t('NoScheduledFound') %></div>
-<% end %>

data/web/views/scheduled_job_info.erb

@@ -1,6 +1,6 @@
 <%= erb :_job_info, locals: { job: @job, type: :scheduled } %>
 
-<form class="form-horizontal" action="<%= root_path %>scheduled/<%= job_params(@job, @job.score) %>" method="post">
+<form action="<%= root_path %>scheduled/<%= job_params(@job, @job.score) %>" method="post">
   <%= csrf_tag %>
   <a class="btn btn-default" href="<%= root_path %>scheduled"><%= t('GoBack') %></a>
   <input class="btn btn-primary" type="submit" name="add_to_queue" value="<%= t('AddToQueue') %>" />

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification
 name: sidekiq
 version: !ruby/object:Gem::Version
-  version: 7.3.9
+  version: 8.0.0.beta2
 platform: ruby
 authors:
 - Mike Perham
 bindir: bin
 cert_chain: []
-date: 2025-02-14 00:00:00.000000000 Z
+date: 2025-02-26 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: redis-client
@@ -15,42 +15,56 @@ dependencies:
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 0.22.2
+        version: 0.23.2
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 0.22.2
+        version: 0.23.2
 - !ruby/object:Gem::Dependency
   name: connection_pool
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 2.3.0
+        version: 2.5.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 2.3.0
+        version: 2.5.0
 - !ruby/object:Gem::Dependency
   name: rack
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 2.2.4
+        version: 3.1.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 2.2.4
+        version: 3.1.0
+- !ruby/object:Gem::Dependency
+  name: json
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: 2.9.0
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: 2.9.0
 - !ruby/object:Gem::Dependency
   name: logger
   requirement: !ruby/object:Gem::Requirement
@@ -95,6 +109,7 @@ files:
 - bin/sidekiq
 - bin/sidekiqload
 - bin/sidekiqmon
+- bin/webload
 - lib/active_job/queue_adapters/sidekiq_adapter.rb
 - lib/generators/sidekiq/job_generator.rb
 - lib/generators/sidekiq/templates/job.rb.erb
@@ -133,6 +148,7 @@ files:
 - lib/sidekiq/monitor.rb
 - lib/sidekiq/paginator.rb
 - lib/sidekiq/processor.rb
+- lib/sidekiq/profiler.rb
 - lib/sidekiq/rails.rb
 - lib/sidekiq/redis_client_adapter.rb
 - lib/sidekiq/redis_connection.rb
@@ -147,6 +163,7 @@ files:
 - lib/sidekiq/web.rb
 - lib/sidekiq/web/action.rb
 - lib/sidekiq/web/application.rb
+- lib/sidekiq/web/config.rb
 - lib/sidekiq/web/csrf_protection.rb
 - lib/sidekiq/web/helpers.rb
 - lib/sidekiq/web/router.rb
@@ -159,15 +176,12 @@ files:
 - web/assets/javascripts/application.js
 - web/assets/javascripts/base-charts.js
 - web/assets/javascripts/chart.min.js
+- web/assets/javascripts/chartjs-adapter-date-fns.min.js
 - web/assets/javascripts/chartjs-plugin-annotation.min.js
 - web/assets/javascripts/dashboard-charts.js
 - web/assets/javascripts/dashboard.js
 - web/assets/javascripts/metrics.js
-- web/assets/stylesheets/application-dark.css
-- web/assets/stylesheets/application-rtl.css
-- web/assets/stylesheets/application.css
-- web/assets/stylesheets/bootstrap-rtl.min.css
-- web/assets/stylesheets/bootstrap.css
+- web/assets/stylesheets/style.css
 - web/locales/ar.yml
 - web/locales/cs.yml
 - web/locales/da.yml
@@ -187,7 +201,7 @@ files:
 - web/locales/nb.yml
 - web/locales/nl.yml
 - web/locales/pl.yml
-- web/locales/pt-br.yml
+- web/locales/pt-BR.yml
 - web/locales/pt.yml
 - web/locales/ru.yml
 - web/locales/sv.yml
@@ -196,15 +210,14 @@ files:
 - web/locales/uk.yml
 - web/locales/ur.yml
 - web/locales/vi.yml
-- web/locales/zh-cn.yml
-- web/locales/zh-tw.yml
+- web/locales/zh-CN.yml
+- web/locales/zh-TW.yml
 - web/views/_footer.erb
 - web/views/_job_info.erb
 - web/views/_metrics_period_select.erb
 - web/views/_nav.erb
 - web/views/_paging.erb
 - web/views/_poll_link.erb
-- web/views/_status.erb
 - web/views/_summary.erb
 - web/views/busy.erb
 - web/views/dashboard.erb
@@ -214,6 +227,7 @@ files:
 - web/views/metrics.erb
 - web/views/metrics_for_job.erb
 - web/views/morgue.erb
+- web/views/profiles.erb
 - web/views/queue.erb
 - web/views/queues.erb
 - web/views/retries.erb
@@ -237,7 +251,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
-      version: 2.7.0
+      version: 3.2.0
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="