sidekiq 7.3.7 → 8.0.0.beta1

data/web/views/metrics.erb

@@ -2,89 +2,92 @@
 <script type="text/javascript" src="<%= root_path %>javascripts/chartjs-plugin-annotation.min.js" nonce="<%= csp_nonce %>"></script>
 <script type="text/javascript" src="<%= root_path %>javascripts/base-charts.js" nonce="<%= csp_nonce %>"></script>
 
-<div class="header-container">
-  <div class="page-title-container">
-    <h1><%= t('Metrics') %></h1>
-    <a target="blank" href="https://github.com/sidekiq/sidekiq/wiki/Metrics"><span class="info-circle" title="Click to learn more about metrics">?</span></a>
-  </div>
-
-  <div>
-    <form id="metrics-form" class="form-inline" action="<%= root_path %>metrics" method="get">
-      <label for="substr"><%= t('Filter') %></label>
-      <input id="class-filter" class="form-control" type="text" name="substr" placeholder="<%= t('Name') %>" value="<%= h params[:substr] %>">
-      <select id="period-selector" class="form-control" name="period">
-        <% @periods.each_key do |code| %>
-          <% if code == @period %>
-            <option selected value="<%= code %>"><%= code %></option>
-          <% else %>
-            <option value="<%= code %>"><%= code %></option>
+<section>
+  <header>
+    <h1>
+      <%= t('Metrics') %>
+      <a target="blank" href="https://github.com/sidekiq/sidekiq/wiki/Metrics"><span class="info-circle" title="Click to learn more about metrics">?</span></a>
+    </h1>
+      
+    <div class="filter">
+      <form id="metrics-form" class="form-inline" action="<%= root_path %>metrics" method="get">
+        <label for="substr"><%= t('Filter') %></label>
+        <input id="class-filter" class="form-control" type="text" name="substr" placeholder="<%= t('Name') %>" value="<%= h url_params("substr") %>">
+        <select id="period-selector" class="form-control" name="period">
+          <% @periods.each_key do |code| %>
+            <% if code == @period %>
+              <option selected value="<%= code %>"><%= code %></option>
+            <% else %>
+              <option value="<%= code %>"><%= code %></option>
+            <% end %>
           <% end %>
-        <% end %>
-      </select>
-    </form>
-  </div>
-</div>
+        </select>
+      </form>
+    </div>
+  </header>
 
-<%
-  table_limit = 20
-  chart_limit = 5
-  job_results = @query_result.job_results.sort_by { |(kls, jr)| jr.totals["s"] }.reverse.first(table_limit)
-  visible_kls = job_results.first(chart_limit).map(&:first)
-%>
+  <%
+    table_limit = 20
+    chart_limit = 5
+    job_results = @query_result.job_results.sort_by { |(kls, jr)| jr.totals["s"] }.reverse.first(table_limit)
+    visible_kls = job_results.first(chart_limit).map(&:first)
+  %>
 
-<% if job_results.any? %>
-  <canvas id="job-metrics-overview-chart">
-    <%= to_json({
-      series: job_results.map { |(kls, jr)| [kls, jr.dig("series", "s")] }.to_h,
-      marks: @query_result.marks.map { |m| [m.bucket, m.label] },
-      labels: @query_result.buckets,
-      visibleKls: visible_kls,
-      yLabel: t('TotalExecutionTime'),
-      units: t('Seconds').downcase,
-      markLabel: t('Deploy'),
-    }) %>
-  </canvas>
-<% end %>
+  <% if job_results.any? %>
+    <canvas id="job-metrics-overview-chart">
+      <%= to_json({
+        series: job_results.map { |(kls, jr)| [kls, jr.dig("series", "s")] }.to_h,
+        marks: @query_result.marks.map { |m| [m.bucket, m.label] },
+        labels: @query_result.buckets,
+        visibleKls: visible_kls,
+        yLabel: t('TotalExecutionTime'),
+        units: t('Seconds').downcase,
+        markLabel: t('Deploy'),
+      }) %>
+    </canvas>
+  <% end %>
 
-<div class="table_container">
-  <table class="table table-bordered table-striped table-hover">
-    <tbody>
-      <tr>
-        <th><%= t('Name') %></th>
-        <th><%= t('Success') %></th>
-        <th><%= t('Failure') %></th>
-        <th><%= t('TotalExecutionTime') %> (<%= t('Seconds') %>)</th>
-        <th><%= t('AvgExecutionTime') %> (<%= t('Seconds') %>)</th>
-      </tr>
-      <% if job_results.any? %>
-        <% job_results.each_with_index do |(kls, jr), i| %>
-          <tr>
-            <td>
-              <div class="metrics-swatch-wrapper">
-                <% id = "metrics-swatch-#{kls}" %>
-                <input
-                  type="checkbox"
-                  id="<%= id %>"
-                  class="metrics-swatch"
-                  value="<%= kls %>"
-                  <%= visible_kls.include?(kls) ? 'checked' : '' %>
-                />
-                <code><a href="<%= root_path %>metrics/<%= kls %>?period=<%= @period %>"><%= kls %></a></code>
-              </div>
-            </td>
-            <td class="num"><%= number_with_delimiter(jr.dig("totals", "p") - jr.dig("totals", "f")) %></td>
-            <td class="num"><%= number_with_delimiter(jr.dig("totals", "f")) %></td>
-            <td class="num"><%= number_with_delimiter(jr.dig("totals", "s"), precision: 2) %></td>
-            <td class="num"><%= number_with_delimiter(jr.total_avg("s"), precision: 2) %></td>
-          </tr>
+  <div class="table_container">
+    <table>
+      <thead>
+        <tr>
+          <th><%= t('Name') %></th>
+          <th><%= t('Success') %></th>
+          <th><%= t('Failure') %></th>
+          <th><%= t('TotalExecutionTime') %> (<%= t('Seconds') %>)</th>
+          <th><%= t('AvgExecutionTime') %> (<%= t('Seconds') %>)</th>
+        </tr>
+      </thead>
+      <tbody>
+        <% if job_results.any? %>
+          <% job_results.each_with_index do |(kls, jr), i| %>
+            <tr>
+              <td>
+                <div class="metrics-swatch-wrapper">
+                  <% id = "metrics-swatch-#{kls}" %>
+                  <input
+                    type="checkbox"
+                    id="<%= id %>"
+                    class="metrics-swatch"
+                    value="<%= kls %>"
+                    <%= visible_kls.include?(kls) ? 'checked' : '' %>
+                  />
+                  <code><a href="<%= root_path %>metrics/<%= kls %>?period=<%= @period %>"><%= kls %></a></code>
+                </div>
+              </td>
+              <td class="num"><%= number_with_delimiter(jr.dig("totals", "p") - jr.dig("totals", "f")) %></td>
+              <td class="num"><%= number_with_delimiter(jr.dig("totals", "f")) %></td>
+              <td class="num"><%= number_with_delimiter(jr.dig("totals", "s"), precision: 2) %></td>
+              <td class="num"><%= number_with_delimiter(jr.total_avg("s"), precision: 2) %></td>
+            </tr>
+          <% end %>
+        <% else %>
+            <tr><td colspan=5><%= t("NoDataFound") %></td></tr>
         <% end %>
-      <% else %>
-          <tr><td colspan=5><%= t("NoDataFound") %></td></tr>
-      <% end %>
-    </tbody>
-  </table>
-</div>
-
-<!--p><small>Data from <%= @query_result.starts_at %> to <%= @query_result.ends_at %></small></p-->
+      </tbody>
+    </table>
+  </div>
 
-<script type="text/javascript" src="<%= root_path %>javascripts/metrics.js" nonce="<%= csp_nonce %>"></script>
+  <!--p><small>Data from <%= @query_result.starts_at %> to <%= @query_result.ends_at %></small></p-->
+</section>
+<script type="text/javascript" src="<%= root_path %>javascripts/metrics.js" nonce="<%= csp_nonce %>"></script>

data/web/views/metrics_for_job.erb

@@ -8,52 +8,49 @@
   bucket_labels = Sidekiq::Metrics::Histogram::LABELS
   bucket_intervals = Sidekiq::Metrics::Histogram::BUCKET_INTERVALS
 %>
-
-<% if job_result.totals["s"] > 0 %>
-  <div class="header-container">
-    <div class="page-title-container">
+<section>
+  <% if job_result.totals["s"] > 0 %>
+    <header>
       <h1>
         <a href="<%= root_path %>metrics?period=<%= @period %>"><%= t('Metrics') %></a> /
         <%= h @name %>
+        <a target="blank" href="https://github.com/sidekiq/sidekiq/wiki/Metrics"><span class="info-circle" title="Click to learn more about metrics">?</span></a>
       </h1>
-
-      <a target="blank" href="https://github.com/sidekiq/sidekiq/wiki/Metrics"><span class="info-circle" title="Click to learn more about metrics">?</span></a>
-    </div>
-
-    <%= erb :_metrics_period_select, locals: { periods: @periods, period: @period, path: "#{root_path}metrics/#{@name}" } %>
-  </div>
-
-  <canvas id="hist-totals-chart">
-    <%= to_json({
-      series: hist_totals,
-      labels: bucket_labels,
-      xLabel: t('ExecutionTime'),
-      yLabel: t('Jobs'),
-      units: t('Jobs').downcase,
-    }) %>
-  </canvas>
-
-  <canvas id="hist-bubble-chart">
-    <%= to_json({
-      hist: job_result.hist,
-      marks: @query_result.marks.map { |m| [m.bucket, m.label] },
-      labels: @query_result.buckets,
-      histIntervals: bucket_intervals,
-      yLabel: t('ExecutionTime'),
-      markLabel: t('Deploy'),
-      yUnits: t('Seconds').downcase,
-      zUnits: t('Jobs').downcase,
-    }) %>
-  </canvas>
+      <%= erb :_metrics_period_select, locals: { periods: @periods, period: @period, path: "#{root_path}metrics/#{@name}" } %>
+    </header>
+
+    <canvas id="hist-totals-chart">
+      <%= to_json({
+        series: hist_totals,
+        labels: bucket_labels,
+        xLabel: t('ExecutionTime'),
+        yLabel: t('Jobs'),
+        units: t('Jobs').downcase,
+      }) %>
+    </canvas>
+
+    <canvas id="hist-bubble-chart">
+      <%= to_json({
+        hist: job_result.hist,
+        marks: @query_result.marks.map { |m| [m.bucket, m.label] },
+        labels: @query_result.buckets,
+        histIntervals: bucket_intervals,
+        yLabel: t('ExecutionTime'),
+        markLabel: t('Deploy'),
+        yUnits: t('Seconds').downcase,
+        zUnits: t('Jobs').downcase,
+      }) %>
+    </canvas>
 
   <!--p><small>Data from <%= @query_result.starts_at %> to <%= @query_result.ends_at %></small></p-->
-<% else %>
-  <h1>
-    <a href="<%= root_path %>/metrics"><%= t('Metrics') %></a> /
-    <%= h @name %>
-  </h1>
-
-  <div class="alert alert-success"><%= t('NoJobMetricsFound') %></div>
-<% end %>
-
+  <% else %>
+    <header>
+      <h1>
+        <a href="<%= root_path %>/metrics"><%= t('Metrics') %></a> /
+        <%= h @name %>
+      </h1>
+    </header>
+    <div class="alert alert-success"><%= t('NoJobMetricsFound') %></div>
+  <% end %>
+</section>
 <script type="text/javascript" src="<%= root_path %>javascripts/metrics.js" nonce="<%= csp_nonce %>"></script>

data/web/views/morgue.erb

@@ -1,74 +1,65 @@
-<div class="header-container">
-  <h1><%= t('DeadJobs') %></h1>
-  <% if @dead.size > 0 && @total_size > @count %>
-    <%= erb :_paging, locals: { url: "#{root_path}morgue" } %>
-  <% end %>
-  <%= filtering('morgue') %>
-</div>
-
-<% if @dead.size > 0 %>
-  <form action="<%= root_path %>morgue" 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('LastRetry') %></th>
-            <th><%= t('Queue') %></th>
-            <th><%= t('Job') %></th>
-            <th><%= t('Arguments') %></th>
-            <th><%= t('Error') %></th>
-          </tr>
-        </thead>
-        <% @dead.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 %>morgue/<%= 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, "dead") %>
-            </td>
-            <td>
-              <div class="args"><%= display_args(entry.display_args) %></div>
-            </td>
-            <td>
-              <% if entry.error? %>
-              <div><%= h truncate("#{entry['error_class']}: #{entry['error_message']}", 200) %></div>
-              <% end %>
-            </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') %>" />
-  </form>
+<section>
+  <header>
+    <h1><%= t('DeadJobs') %></h1>
+    <% if @dead.size > 0 && @total_size > @count %>
+      <%= erb :_paging, locals: { url: "#{root_path}morgue" } %>
+    <% end %>
+    <%= filtering('morgue') %>
+  </header>
 
-  <% unfiltered? do %>
-    <form action="<%= root_path %>morgue/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 %>morgue/all/retry" method="post">
+  <% if @dead.size > 0 %>
+    <form action="<%= root_path %>morgue" method="post">
       <%= csrf_tag %>
-      <input class="btn btn-danger pull-right flip" type="submit" name="retry" value="<%= t('RetryAll') %>" data-confirm="<%= t('AreYouSure') %>" />
+      <div class="table_container">
+        <table>
+          <thead>
+            <tr>
+              <th>
+                <label>
+                  <input type="checkbox" class="check_all" />
+                </label>
+              </th>
+              <th><%= t('LastRetry') %></th>
+              <th><%= t('Queue') %></th>
+              <th><%= t('Job') %></th>
+              <th><%= t('Arguments') %></th>
+              <th><%= t('Error') %></th>
+            </tr>
+          </thead>
+          <% @dead.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 %>morgue/<%= 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, "morgue") %>
+              </td>
+              <td>
+                <div class="args"><%= display_args(entry.display_args) %></div>
+              </td>
+              <td>
+                <% if entry.error? %>
+                  <div><a href="<%= root_path %>morgue/<%= job_params(entry.item, entry.score) %>"><%= h truncate("#{entry['error_class']}: #{entry['error_message']}", 200) %></a></div>
+                <% end %>
+              </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') %>" />
     </form>
-  <% end %>
 
-<% else %>
-  <div class="alert alert-success"><%= t('NoDeadJobsFound') %></div>
-<% end %>
+  <% else %>
+    <div class="alert alert-success"><%= t('NoDeadJobsFound') %></div>
+  <% end %>
+</section>

data/web/views/profiles.erb

@@ -0,0 +1,43 @@
+<section>
+  <header>
+    <h1>
+      <%= t('Profiles') %>
+      <a target="blank" href="https://github.com/sidekiq/sidekiq/wiki/Profiling"><span class="info-circle" title="Click to learn more about profiling">?</span></a>
+    </h1>
+  </header>
+
+  <% @profiles = Sidekiq::ProfileSet.new %>
+  <% if @profiles.size > 0 %>
+  <div class="table_container">
+    <table>
+      <thead>
+        <th><%= t('CreatedAt') %></th>
+        <th><%= t('Type') %></th>
+        <th><%= t('JID') %></th>
+        <th><%= t('Token') %></th>
+        <th><%= t('Size') %></th>
+        <th><%= t('ElapsedTime') %></th>
+        <th>&nbsp</th>
+      </thead>
+      <% @profiles.each do |record| %>
+        <tr>
+          <td><%= relative_time(record.started_at) %></td>
+          <td><%= record.type %> </td>
+          <td><%= record.jid %> </td>
+          <td><%= record.token %> </td>
+          <td><%= format_memory(record.size / 1024) %> </td>
+          <td><%= number_with_delimiter(record.elapsed, precision: 2) %> </td>
+          <td>
+            <% if config[:profile_store_url] %>
+              <a target="_blank" class="btn" href="<%= root_path %>profiles/<%= CGI.escape(record.key) %>"><%= t("View") %></a>
+            <% end %>
+            <a class="btn" href="<%= root_path %>profiles/<%= CGI.escape(record.key) %>/data"><%= t("Data") %></a>
+          </td>
+        </tr>
+      <% end %>
+    </table>
+  </div>
+  <% else %>
+    <div class="alert alert-success"><%= t('NoDataFound') %></div>
+  <% end %>
+</section>

data/web/views/queue.erb

@@ -1,55 +1,57 @@
-<div class="header-container">
-  <h1><%= t('CurrentMessagesInQueue', :queue => h(@name)) %>
-    <% if @queue.paused? %>
-      <span class="label label-danger"><%= t('Paused') %></span>
-    <% end %>
-    <span class="badge badge-secondary"><%= number_with_delimiter(@total_size) %></span>
-  </h1>
-  <%= erb :_paging, locals: { url: "#{root_path}queues/#{CGI.escape(@name)}" } %>
-</div>
+<section>
+  <header>
+    <h1><%= t('CurrentMessagesInQueue', :queue => h(@name)) %>
+      <% if @queue.paused? %>
+        <span class="label label-danger"><%= t('Paused') %></span>
+      <% end %>
+      <span class="badge badge-secondary"><%= number_with_delimiter(@total_size) %></span>
+    </h1>
+    <%= erb :_paging, locals: { url: "#{root_path}queues/#{CGI.escape(@name)}" } %>
+  </header>
 
-<div class="table_container">
-  <table class="queue table table-hover table-bordered table-striped">
-    <thead>
-      <th><a href="<%= url %>?direction=<%= params[:direction] == 'asc' ? 'desc' : 'asc' %>"># <%= sort_direction_label %></a></th>
-      <th><%= t('Job') %></th>
-      <th><%= t('Arguments') %></th>
-      <th><%= t('Context') %></th>
-      <th></th>
-    </thead>
-    <% @jobs.each_with_index do |job, index| %>
-      <tr title="<%= job.jid %>">
-        <% if params[:direction] == 'asc' %>
-          <td><%= @count * (@current_page - 1) + index + 1 %></td>
-        <% else %>
-          <td><%= @total_size - (@count * (@current_page - 1) + index) %></td>
-        <% end %>
-        <td>
-          <%= h(job.display_class) %>
-          <%= display_tags(job, nil) %>
-        </td>
-        <td>
-          <% a = job.display_args %>
-          <% if a.inspect.size > 100 %>
-            <span id="job_<%= index %>"><%= h(a.inspect[0..100]) + "... " %></span>
-            <button data-toggle="job_<%= index %>_full" class="btn btn-default btn-xs"><%= t('ShowAll') %></button>
-            <div class="toggle" id="job_<%= index %>_full"><%= display_args(a) %></div>
+  <div class="table_container">
+    <table>
+      <thead>
+        <th><a href="<%= url %>?direction=<%= url_params("direction") == 'asc' ? 'desc' : 'asc' %>"># <%= sort_direction_label %></a></th>
+        <th><%= t('Job') %></th>
+        <th><%= t('Arguments') %></th>
+        <th><%= t('Context') %></th>
+        <th><%= t('Actions') %></th>
+      </thead>
+      <% @jobs.each_with_index do |job, index| %>
+        <tr title="<%= job.jid %>">
+          <% if url_params("direction") == 'asc' %>
+            <td><%= @count * (@current_page - 1) + index + 1 %></td>
           <% else %>
-            <%= display_args(job.display_args) %>
+            <td><%= @total_size - (@count * (@current_page - 1) + index) %></td>
           <% end %>
-        </td>
-        <td>
-          <%= h(job["cattr"].inspect) if job["cattr"]&.any? %>
-        </td>
-        <td>
-          <form action="<%= root_path %>queues/<%= CGI.escape(@name) %>/delete" method="post">
-            <%= csrf_tag %>
-            <input name="key_val" value="<%= h job.value %>" type="hidden" />
-            <input class="btn btn-danger btn-xs" type="submit" name="delete" value="<%= t('Delete') %>" data-confirm="<%= t('AreYouSure') %>" />
-          </form>
-        </td>
-      </tr>
-    <% end %>
-  </table>
-</div>
-<%= erb :_paging, locals: { url: "#{root_path}queues/#{CGI.escape(@name)}" } %>
+          <td>
+            <%= h(job.display_class) %>
+            <%= display_tags(job, nil) %>
+          </td>
+          <td>
+            <% a = job.display_args %>
+            <% if a.inspect.size > 100 %>
+              <span id="job_<%= index %>"><%= h(a.inspect[0..100]) + "... " %></span>
+              <button data-toggle="job_<%= index %>_full" class="btn btn-default btn-xs"><%= t('ShowAll') %></button>
+              <div class="toggle" id="job_<%= index %>_full"><%= display_args(a) %></div>
+            <% else %>
+              <code><%= display_args(job.display_args) %></code>
+            <% end %>
+          </td>
+          <td>
+            <%= h(job["cattr"].inspect) if job["cattr"]&.any? %>
+          </td>
+          <td>
+            <form action="<%= root_path %>queues/<%= CGI.escape(@name) %>/delete" method="post">
+              <%= csrf_tag %>
+              <input name="key_val" value="<%= h job.value %>" type="hidden" />
+              <input class="btn btn-danger" type="submit" name="delete" value="<%= t('Delete') %>" data-confirm="<%= t('AreYouSure') %>" />
+            </form>
+          </td>
+        </tr>
+      <% end %>
+    </table>
+  </div>
+  <%= erb :_paging, locals: { url: "#{root_path}queues/#{CGI.escape(@name)}" } %>
+</section>