mission_control-jobs 0.3.2 → 0.4.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: d7d0d51d0662e0351ff33ed1b2a480a7f1d11c593eefbe89a630a980de5a1b24
-  data.tar.gz: a9c05be3a1b2b0975c3d7095ac3d3433c502b5afd87a942996ced2aa01485b6c
+  metadata.gz: 4f46c22e66d7fc57d1543dd2fa8863b8b7284019ea4eb47b879a06702c0d89b9
+  data.tar.gz: b891c7389226107a06ce9c5e53b824b91bf3be55e1d3ffe49a2e6419887f5553
 SHA512:
-  metadata.gz: de6116de1a5b4fd7b87d4aba9e245953147edaa3cf8dd9e5e464be815dec79d74977dbe60b638246a6fe3625f9cb050aaceb9cd09c73eda857b1756006700328
-  data.tar.gz: 4e133652b36ec90c22fc9e77170e985d6b18c1a68ae73ce43361a1ea5be9c14820f8db594ce713bbcf7a8a6540766f9f6d4a5974dd51a9510fb94040f57fde76
+  metadata.gz: bfc58d081a8dacd1f1c680284a342d6d078f60992dafb0bc2ba5b90cf80e17fe86a240d2fdc5d987adb15231474542f2fe4a067db77884ce2fe523e598ba6b2a
+  data.tar.gz: c8dcc5e285e09c4a1b9607633c82565329496fe9d8adab7288a0d39895ac0dc0cb7ffe90ed31d30320c172224659c7a67441bd70c4e4d957c4d643862e955367

data/README.md

@@ -57,6 +57,7 @@ Besides `base_controller_class`, you can also set the following for `MissionCont
 - `internal_query_count_limit`: in count queries, the maximum number of records that will be counted if the adapter needs to limit these queries. True counts above this number will be returned as `INFINITY`. This keeps count queries fast—defaults to `500,000`
 - `scheduled_job_delay_threshold`: the time duration before a scheduled job is considered delayed. Defaults to `1.minute` (a job is considered delayed if it hasn't transitioned from the `scheduled` status 1 minute after the scheduled time).
 - `show_console_help`: whether to show the console help. If you don't want the console help message, set this to `false`—defaults to `true`.
+- `backtrace_cleaner`: a backtrace cleaner used for optionally filtering backtraces on the Failed Jobs detail page. Defaults to `Rails::BacktraceCleaner.new`. See the [Advanced configuration](#advanced-configuration) section for how to configure/override this setting on a per application/server basis.
 
 This library extends Active Job with a querying interface and the following setting:
 - `config.active_job.default_page_size`: the internal batch size that Active Job will use when sending queries to the underlying adapter and the batch size for the bulk operations defined above—defaults to `1000`.
@@ -107,7 +108,24 @@ SERVERS_BY_APP.each do |app, servers|
       ActiveJob::QueueAdapters::SolidQueueAdapter.new
     end
 
-    [ server, queue_adapter ]
+    # Default:
+    # 
+    # @return Array<String, ActiveJob::QueueAdapters::Base)
+    # An array where:
+    # * the String represents the symbolic name for this server within the UI
+    # * ActiveJob::QueueAdapters::Base adapter instance used to access this Application Server/Service
+    [ server, queue_adapter ] 
+    
+    # Optional return formats:
+    # 
+    # @return Array<String, Array<ActiveJob::QueueAdapters::Base>>
+    # * This is equivalent, and behaves identically to, the format the default format above. 
+    # [ server, [ queue_adapter ]]  # without optional backtrace cleaner
+    # 
+    # @return Array<String, Array<ActiveJob::QueueAdapters::Base, ActiveSupport::BacktraceCleaner>>
+    # * This format adds an optional ActiveSupport::BacktraceCleaner to override the system wide
+    #   backtrace cleaner for *this* Application Server/Service.
+    # [ server, [ queue_adapter, BacktraceCleaner.new ]]  # with optional backtrace cleaner
   end.to_h
 
   MissionControl::Jobs.applications.add(app, queue_adapters_by_name)

data/app/assets/config/mission_control_jobs_manifest.js

@@ -0,0 +1,4 @@
+//= link_directory ../stylesheets/mission_control/jobs .css
+//= link_directory ../../javascript/mission_control/jobs .js
+//= link_directory ../../javascript/mission_control/jobs/controllers .js
+//= link_directory ../../javascript/mission_control/jobs/helpers .js

data/app/assets/stylesheets/mission_control/jobs/application.css

@@ -1,2 +1,16 @@
-@import url("./forms.css");
-@import url("./jobs.css");
+/*
+ * This is a manifest file that'll be compiled into application.css, which will include all the files
+ * listed below.
+ *
+ * Any CSS and SCSS file within this directory, lib/assets/stylesheets, vendor/assets/stylesheets,
+ * or any plugin's vendor/assets/stylesheets directory can be referenced here using a relative path.
+ *
+ * You're free to add application-wide styles to this file and they'll appear at the bottom of the
+ * compiled file so the styles you add here take precedence over styles defined in any other CSS/SCSS
+ * files in this directory. Styles in this file should be added after the last require_* statement.
+ * It is generally better to create a new file per style scope.
+ *
+ *= require_tree .
+ *= require_self
+ */
+

data/app/assets/stylesheets/mission_control/jobs/jobs.css

@@ -2,6 +2,35 @@
     width: 15rem;
 }
 
-.jobs td {
-    word-break: break-all;
+table.jobs {
+    td {
+        word-break: break-all;
+    }
+    th.job-header{
+        width: 30%;
+    }
+    th.duration-header {
+        width: 20%;
+    }
+    &.queues th.job-header {
+        width: 30%;
+    }
+    &.failed th.job-header {
+        width: 35%;
+    }
+    &.in_progress th.job-header {
+        width: 50%;
+    }
+    &.blocked th.job-header {
+        width: 45%;
+    }
+    &.scheduled th.job-header {
+        width: 60%;
+    }
+    &.finished th.job-header {
+        width: 65%;
+    }
+    &.workers th.job-header {
+        width: 40%;
+    }
 }

data/app/controllers/mission_control/jobs/application_controller.rb

@@ -1,25 +1,11 @@
 class MissionControl::Jobs::ApplicationController < MissionControl::Jobs.base_controller_class.constantize
-  ActionController::Base::MODULES.each do |mod|
-    include mod unless self < mod
-  end
-
   layout "mission_control/jobs/application"
 
-  # Include helpers if not already included
-  helper MissionControl::Jobs::ApplicationHelper unless self < MissionControl::Jobs::ApplicationHelper
-  helper Importmap::ImportmapTagsHelper unless self < Importmap::ImportmapTagsHelper
-
   include MissionControl::Jobs::ApplicationScoped, MissionControl::Jobs::NotFoundRedirections
   include MissionControl::Jobs::AdapterFeatures
 
-  around_action :set_current_locale
-
   private
     def default_url_options
       { server_id: MissionControl::Jobs::Current.server }
     end
-
-    def set_current_locale(&block)
-      I18n.with_locale(:en, &block)
-    end
 end

data/app/controllers/mission_control/jobs/discards_controller.rb

@@ -3,11 +3,16 @@ class MissionControl::Jobs::DiscardsController < MissionControl::Jobs::Applicati
 
   def create
     @job.discard
-    redirect_to application_jobs_url(@application, :failed), notice: "Discarded job with id #{@job.job_id}"
+    redirect_to redirect_location, notice: "Discarded job with id #{@job.job_id}"
   end
 
   private
     def jobs_relation
       ActiveJob.jobs.failed
     end
+
+    def redirect_location
+      status = @job.status.presence_in(supported_job_statuses) || :failed
+      application_jobs_url(@application, status)
+    end
 end

data/app/controllers/mission_control/jobs/jobs_controller.rb

@@ -15,6 +15,7 @@ class MissionControl::Jobs::JobsController < MissionControl::Jobs::ApplicationCo
   end
 
   private
+
     def jobs_relation
       filtered_jobs
     end

data/app/helpers/mission_control/jobs/dates_helper.rb

@@ -1,19 +1,5 @@
 module MissionControl::Jobs::DatesHelper
-  def time_ago_in_words_with_title(time)
-    tag.span time_ago_in_words(time), title: time.to_fs(:long)
-  end
-
-  def time_distance_in_words_with_title(time)
-    tag.span distance_of_time_in_words_to_now(time, include_seconds: true), title: "Since #{time.to_fs(:long)}"
-  end
-
-  def bidirectional_time_distance_in_words_with_title(time)
-    time_distance = if time.past?
-      "#{distance_of_time_in_words_to_now(time, include_seconds: true)} ago"
-    else
-      "in #{distance_of_time_in_words_to_now(time, include_seconds: true)}"
-    end
-
-    tag.span time_distance, title: time.to_fs(:long)
+  def formatted_time(time)
+    time.in_time_zone.strftime("%Y-%m-%d %H:%M:%S.%3N %Z")
   end
 end

data/app/helpers/mission_control/jobs/jobs_helper.rb

@@ -11,8 +11,16 @@ module MissionControl::Jobs::JobsHelper
     "#{job.last_execution_error.error_class}: #{job.last_execution_error.message}"
   end
 
-  def failed_job_backtrace(job)
-    job.last_execution_error.backtrace.join("\n")
+  def clean_backtrace?
+    params["clean_backtrace"] == "true"
+  end
+
+  def failed_job_backtrace(job, server)
+    if clean_backtrace? && server&.backtrace_cleaner
+      server.backtrace_cleaner.clean(job.last_execution_error.backtrace).join("\n")
+    else
+      job.last_execution_error.backtrace.join("\n")
+    end
   end
 
   def attribute_names_for_job_status(status)
@@ -21,7 +29,7 @@ module MissionControl::Jobs::JobsHelper
     when "blocked"     then [ "Queue", "Blocked by", "Block expiry", "" ]
     when "finished"    then [ "Queue", "Finished" ]
     when "scheduled"   then [ "Queue", "Scheduled", "" ]
-    when "in_progress" then [ "Queue", "Run by", "Running for" ]
+    when "in_progress" then [ "Queue", "Run by", "Running since" ]
     else               []
     end
   end
@@ -31,6 +39,7 @@ module MissionControl::Jobs::JobsHelper
   end
 
   private
+
     def renderable_job_arguments_for(job)
       job.serialized_arguments.collect do |argument|
         as_renderable_argument(argument)

data/app/helpers/mission_control/jobs/navigation_helper.rb

@@ -47,6 +47,18 @@ module MissionControl::Jobs::NavigationHelper
 
   def jobs_count_with_status(status)
     count = ActiveJob.jobs.with_status(status).count
-    count.infinite? ? "..." : number_to_human(count)
+    if count.infinite?
+      "..."
+    else
+      number_to_human(count,
+        format: "%n%u",
+        units: {
+          thousand: "K",
+          million: "M",
+          billion: "B",
+          trillion: "T",
+          quadrillion: "Q"
+        })
+    end
   end
 end

data/app/models/mission_control/jobs/recurring_task.rb

@@ -1,7 +1,7 @@
 class MissionControl::Jobs::RecurringTask
   include ActiveModel::Model
 
-  attr_accessor :id, :job_class_name, :command, :arguments, :schedule, :last_enqueued_at, :queue_name, :priority
+  attr_accessor :id, :job_class_name, :command, :arguments, :schedule, :last_enqueued_at, :next_time, :queue_name, :priority
 
   def initialize(queue_adapter: ActiveJob::Base.queue_adapter, **kwargs)
     @queue_adapter = queue_adapter

data/app/views/layouts/mission_control/jobs/application.html.erb

@@ -7,9 +7,9 @@
 
   <meta name="viewport" content="width=device-width,initial-scale=1">
   <meta name="turbo-cache-control" content="no-cache">
-  <link rel="stylesheet" href="https://cdn.jsdelivr.net/npm/bulma@0.9.4/css/bulma.min.css">
+  <link rel="stylesheet" href="https://cdn.jsdelivr.net/npm/bulma@1.0.1/css/bulma.min.css">
   <%= stylesheet_link_tag "mission_control/jobs/application", "data-turbo-track": "reload" %>
-  <%= javascript_importmap_tags "application-mcj" %>
+  <%= javascript_importmap_tags "application", importmap: MissionControl::Jobs.importmap  %>
 </head>
 <body>
 

data/app/views/mission_control/jobs/jobs/_error_information.html.erb

@@ -14,5 +14,9 @@
     </tbody>
   </table>
 
-  <pre class="is-family-monospace mb-4"><%= failed_job_backtrace(job) %></pre>
+  <% if @server.backtrace_cleaner %>
+    <%= render "mission_control/jobs/jobs/failed/backtrace_toggle", application: @application, job: job %>
+  <% end %>
+
+  <pre class="is-family-monospace mb-4 backtrace-content"><%= failed_job_backtrace(job, @server) %></pre>
 <% end %>

data/app/views/mission_control/jobs/jobs/_filters.html.erb

@@ -14,15 +14,15 @@
 
         <%= hidden_field_tag :server_id, MissionControl::Jobs::Current.server.id %>
 
-        <datalist id="job-classes" style="display: none;">
+        <datalist id="job-classes" class="is-hidden">
           <% job_class_names.each do |job_class_name| %>
-            <option value="<%= job_class_name %>" />
+            <option value="<%= job_class_name %>"></option>
           <% end %>
         </datalist>
 
-        <datalist id="queue-names" style="display: none;">
+        <datalist id="queue-names" class="is-hidden">
           <% queue_names.each do |queue_name| %>
-            <option value="<%= queue_name %>" />
+            <option value="<%= queue_name %>"></option>
           <% end %>
         </datalist>
       <% end %>

data/app/views/mission_control/jobs/jobs/_general_information.html.erb

@@ -23,14 +23,14 @@
   <tr>
     <th>Enqueued</th>
     <td>
-      <%= time_ago_in_words_with_title(job.enqueued_at.to_datetime) %> ago
+      <%= formatted_time(job.enqueued_at.to_datetime) %>
     </td>
   </tr>
   <% if job.failed? %>
     <tr>
       <th>Failed</th>
       <td>
-        <%= time_ago_in_words_with_title(job.failed_at) %> ago
+        <%= formatted_time(job.failed_at) %>
       </td>
     </tr>
   <% end %>
@@ -38,7 +38,7 @@
     <tr>
       <th>Finished at</th>
       <td>
-        <%= time_ago_in_words_with_title(job.finished_at) %> ago
+        <%= formatted_time(job.finished_at) %>
       </td>
     </tr>
   <% end %>

data/app/views/mission_control/jobs/jobs/_job.html.erb

@@ -6,7 +6,7 @@
       <div class="is-family-monospace"><%= job_arguments(job) %></div>
     <% end %>
 
-    <div class="has-text-grey is-size-7">Enqueued <%= time_ago_in_words_with_title(job.enqueued_at.to_datetime) %> ago</div>
+    <div class="has-text-grey is-size-7">Enqueued <%= formatted_time(job.enqueued_at.to_datetime) %></div>
   </td>
 
   <%= render "mission_control/jobs/jobs/#{jobs_status}/job", job: job %>

data/app/views/mission_control/jobs/jobs/_jobs_page.html.erb

@@ -1,7 +1,7 @@
 <table class="jobs <%= jobs_status %> table queues is-hoverable is-fullwidth">
   <thead>
     <tr>
-      <th style="width: 35%;">Job</th>
+      <th class="job-header">Job</th>
       <% attribute_names_for_job_status(jobs_status).each do |attribute| %>
         <th><%= attribute %></th>
       <% end %>

data/app/views/mission_control/jobs/jobs/_title.html.erb

@@ -11,6 +11,9 @@
       <% if job.blocked? %>
         <%= render "mission_control/jobs/jobs/blocked/actions", job: job %>
       <% end %>
+      <% if job.scheduled? %>
+        <%= render "mission_control/jobs/jobs/scheduled/actions", job: job %>
+      <% end %>
     </div>
   </div>
 </h1>

data/app/views/mission_control/jobs/jobs/blocked/_job.html.erb

@@ -1,6 +1,6 @@
 <td><%= link_to job.queue_name, application_queue_path(@application, job.queue) %></td>
 <td><div class="is-family-monospace is-size-7"><%= job.blocked_by %></div></td>
-<td><%= bidirectional_time_distance_in_words_with_title(job.blocked_until) %></td>
+<td><%= formatted_time(job.blocked_until) %></td>
 <td class="pr-0">
   <%= render "mission_control/jobs/jobs/blocked/actions", job: job %>
 </td>

data/app/views/mission_control/jobs/jobs/failed/_backtrace_toggle.html.erb

@@ -0,0 +1,14 @@
+<%# locals: (application:, job:) %>
+
+<div class="is-flex is-justify-content-flex-end mb-2 mr-2 backtrace-toggle-selector">
+  <div class="tabs is-toggle is-toggle-rounded is-small">
+    <ul>
+      <li class="<%= class_names('backtrace-clean-link', 'is-active' => clean_backtrace?) %>">
+        <%= link_to "Clean", application_job_path(application, job.job_id, clean_backtrace: true) %>
+      </li>
+      <li class="<%= class_names('backtrace-full-link', 'is-active' => !clean_backtrace?) %>">
+        <%= link_to "Full", application_job_path(application, job.job_id, clean_backtrace: false) %>
+      </li>
+    </ul>
+  </div>
+</div>

data/app/views/mission_control/jobs/jobs/failed/_job.html.erb

@@ -1,6 +1,6 @@
 <td>
   <%= link_to failed_job_error(job), application_job_path(@application, job.job_id, anchor: "error") %>
-  <div class="has-text-grey"><%= time_ago_in_words_with_title(job.failed_at) %> ago</div>
+  <div class="has-text-grey"><%= formatted_time(job.failed_at) %></div>
 </td>
 <td class="pr-0">
   <%= render "mission_control/jobs/jobs/failed/actions", job: job %>

data/app/views/mission_control/jobs/jobs/finished/_job.html.erb

@@ -1,2 +1,2 @@
 <td><%= link_to job.queue_name, application_queue_path(@application, job.queue) %></td>
-<td><div class="has-text-grey"><%= time_ago_in_words_with_title(job.finished_at) %> ago</div></td>
+<td><div class="has-text-grey"><%= formatted_time(job.finished_at) %></div></td>

data/app/views/mission_control/jobs/jobs/in_progress/_job.html.erb

@@ -6,4 +6,4 @@
     —
   <% end %>
 </td>
-<td><div class="has-text-grey"><%= job.started_at ? time_distance_in_words_with_title(job.started_at) : "(Finished)" %></div></td>
+<td><div class="has-text-grey"><%= job.started_at ? formatted_time(job.started_at) : "(Finished)" %></div></td>

data/app/views/mission_control/jobs/jobs/scheduled/_job.html.erb

@@ -1,6 +1,6 @@
 <td><%= link_to job.queue_name, application_queue_path(@application, job.queue) %></td>
 <td>
-  <%= bidirectional_time_distance_in_words_with_title(job.scheduled_at) %>
+  <%= formatted_time(job.scheduled_at) %>
   <% if job_delayed?(job) %>
     <div class="is-danger tag ml-4">delayed</div>
   <% end %>

data/app/views/mission_control/jobs/queues/_job.html.erb

@@ -3,7 +3,7 @@
     <%= link_to application_job_path(@application, job.job_id, filter: { queue_name: job.queue }) do %>
       <%= job_title(job) %>
     <% end %>
-    <div class="has-text-grey">Enqueued <%= time_ago_in_words_with_title(job.enqueued_at.to_datetime) %> ago</div>
+    <div class="has-text-grey">Enqueued on <%= formatted_time(job.enqueued_at.to_datetime) %></div>
   </td>
   <td>
     <% if job.serialized_arguments.present? %>

data/app/views/mission_control/jobs/queues/index.html.erb

@@ -4,8 +4,8 @@
   <tbody>
   <thead>
   <tr>
-    <th style="width: 50%;">Queue</th>
-    <th style="width: 30%;">Pending jobs</th>
+    <th>Queue</th>
+    <th>Pending jobs</th>
     <th></th>
   </tr>
   </thead>

data/app/views/mission_control/jobs/queues/show.html.erb

@@ -9,7 +9,7 @@
     <tbody>
     <thead>
     <tr>
-      <th style="width: 30%;">Job</th>
+      <th class="job-header">Job</th>
       <th></th>
     </tr>
     </thead>

data/app/views/mission_control/jobs/recurring_tasks/_recurring_task.html.erb

@@ -14,5 +14,6 @@
     <% end %>
   </td>
   <td> <%= recurring_task.schedule %> </td>
-  <td><div class="has-text-grey"><%= recurring_task.last_enqueued_at ? bidirectional_time_distance_in_words_with_title(recurring_task.last_enqueued_at) : "Never" %></div></td>
+  <td><div class="has-text-grey"><%= recurring_task.last_enqueued_at ? formatted_time(recurring_task.last_enqueued_at) : "Never" %></div></td>
+  <td class="next_time"><div class="has-text-grey"><%= formatted_time(recurring_task.next_time) %></div></td>
 </tr>

data/app/views/mission_control/jobs/recurring_tasks/index.html.erb

@@ -8,6 +8,7 @@
     <th>Job</th>
     <th>Schedule</th>
     <th>Last enqueued at</th>
+    <th>Next run</th>
   </tr>
   </thead>
 

data/app/views/mission_control/jobs/shared/_job.html.erb

@@ -3,7 +3,7 @@
     <%= link_to application_job_path(@application, job.job_id, filter: { queue_name: job.queue }) do %>
       <%= job_title(job) %>
     <% end %>
-    <div class="has-text-grey">Enqueued <%= time_ago_in_words_with_title(job.enqueued_at.to_datetime) %> ago</div>
+    <div class="has-text-grey">Enqueued on <%= formatted_time(job.enqueued_at.to_datetime) %></div>
   </td>
   <td>
     <% if job.serialized_arguments.present? %>
@@ -16,9 +16,9 @@
   <td>
     <div class="has-text-grey">
       <% if job.started_at %>
-        Running for <%= time_distance_in_words_with_title(job.started_at) %>
+        Running since <%= formatted_time(job.started_at) %>
       <% elsif job.finished_at %>
-        Finished <%= time_ago_in_words_with_title(job.finished_at) %> ago
+        Finished on <%= formatted_time(job.finished_at) %>
       <% else %>
         Pending
       <% end %>

data/app/views/mission_control/jobs/shared/_jobs.html.erb

@@ -2,9 +2,9 @@
   <tbody>
   <thead>
   <tr>
-    <th style="width: 30%;">Job</th>
+    <th class="job-header">Job</th>
     <th></th>
-    <th style="width: 20%;"></th>
+    <th class="duration-header"></th>
   </tr>
   </thead>
 

data/app/views/mission_control/jobs/workers/_worker.html.erb

@@ -17,5 +17,5 @@
     <% end %>
   </td>
 
-  <td><div class="has-text-grey"><%= time_ago_in_words_with_title(worker.last_heartbeat_at) %> ago</div></td>
+  <td><div class="has-text-grey"><%= formatted_time(worker.last_heartbeat_at) %></div></td>
 </tr>

data/app/views/mission_control/jobs/workers/_workers_page.html.erb

@@ -4,7 +4,7 @@
   <tr>
     <th>Worker</th>
     <th>Hostname</th>
-    <th style="width: 35%;">Jobs</th>
+    <th class="job-header">Jobs</th>
     <th>Last heartbeat</th>
   </tr>
   </thead>

data/config/importmap.rb

@@ -1,4 +1,4 @@
-pin "application-mcj", to: "mission_control/jobs/application.js", preload: true
+pin "application", to: "mission_control/jobs/application.js", preload: true
 pin "@hotwired/turbo-rails", to: "turbo.min.js", preload: true
 pin "@hotwired/stimulus", to: "stimulus.min.js", preload: true
 pin "@hotwired/stimulus-loading", to: "stimulus-loading.js", preload: true

data/lib/active_job/queue_adapters/async_ext.rb

@@ -0,0 +1,49 @@
+module ActiveJob::QueueAdapters::AsyncExt
+  include MissionControl::Jobs::Adapter
+
+  # List of filters supported natively. Non-supported filters are done in memory.
+  def supported_job_filters(jobs_relation)
+    []
+  end
+
+  def supports_queue_pausing?
+    false
+  end
+
+  def queues
+    []
+  end
+
+  def queue_size(*)
+    0
+  end
+
+  def clear_queue(*)
+  end
+
+  def jobs_count(*)
+    0
+  end
+
+  def fetch_jobs(*)
+    []
+  end
+
+  def retry_all_jobs(*)
+  end
+
+  def retry_job(job, *)
+  end
+
+  def discard_all_jobs(*)
+  end
+
+  def discard_job(*)
+  end
+
+  def dispatch_job(*)
+  end
+
+  def find_job(*)
+  end
+end

data/lib/active_job/queue_adapters/resque_ext.rb

@@ -190,7 +190,7 @@ module ActiveJob::QueueAdapters::ResqueExt
             job.last_execution_error = execution_error_from_resque_job(resque_job_hash)
             job.raw_data = resque_job_hash
             job.position = jobs_relation.offset_value + index
-            job.failed_at = resque_job_hash["failed_at"]&.to_datetime
+            job.failed_at = resque_job_hash["failed_at"]&.to_datetime&.utc
             job.status = job.failed_at.present? ? :failed : :pending
           end
         end
@@ -263,7 +263,7 @@ module ActiveJob::QueueAdapters::ResqueExt
 
         def requeue(job)
           resque_job = job.raw_data
-          resque_job["retried_at"] = Time.now.strftime("%Y/%m/%d %H:%M:%S")
+          resque_job["retried_at"] = Time.now.utc.strftime("%Y/%m/%d %H:%M:%S")
 
           redis.lset(queue_redis_key, job.position, Resque.encode(resque_job))
           Resque::Job.create(resque_job["queue"], resque_job["payload"]["class"], *resque_job["payload"]["args"])

data/lib/active_job/queue_adapters/solid_queue_ext/recurring_tasks.rb

@@ -28,6 +28,7 @@ module ActiveJob::QueueAdapters::SolidQueueExt::RecurringTasks
         command: task.command,
         arguments: task.arguments,
         schedule: task.schedule,
+        next_time: task.next_time,
         queue_name: task.queue_name,
         priority: task.priority
       }

data/lib/mission_control/jobs/application.rb

@@ -11,7 +11,10 @@ class MissionControl::Jobs::Application
 
   def add_servers(queue_adapters_by_name)
     queue_adapters_by_name.each do |name, queue_adapter|
-      servers << MissionControl::Jobs::Server.new(name: name.to_s, queue_adapter: queue_adapter, application: self)
+      adapter, cleaner = queue_adapter
+
+      servers << MissionControl::Jobs::Server.new(name: name.to_s, queue_adapter: adapter,
+        backtrace_cleaner: cleaner, application: self)
     end
   end
 end

data/lib/mission_control/jobs/engine.rb

@@ -1,23 +1,18 @@
-require "mission_control/jobs/version"
-require "mission_control/jobs/engine"
-
 require "importmap-rails"
 require "turbo-rails"
 require "stimulus-rails"
-require "propshaft"
 
 module MissionControl
   module Jobs
     class Engine < ::Rails::Engine
       isolate_namespace MissionControl::Jobs
 
-      config.middleware.use ActionDispatch::Flash unless config.action_dispatch.flash
-
       config.mission_control = ActiveSupport::OrderedOptions.new unless config.try(:mission_control)
       config.mission_control.jobs = ActiveSupport::OrderedOptions.new
 
       config.before_initialize do
         config.mission_control.jobs.applications = MissionControl::Jobs::Applications.new
+        config.mission_control.jobs.backtrace_cleaner ||= Rails::BacktraceCleaner.new
 
         config.mission_control.jobs.each do |key, value|
           MissionControl::Jobs.public_send("#{key}=", value)
@@ -48,7 +43,7 @@ module MissionControl
           ActiveJob::QueueAdapters::SolidQueueAdapter.prepend ActiveJob::QueueAdapters::SolidQueueExt
         end
 
-        ActiveJob::QueueAdapters::AsyncAdapter.include MissionControl::Jobs::Adapter
+        ActiveJob::QueueAdapters::AsyncAdapter.include ActiveJob::QueueAdapters::AsyncExt
       end
 
       config.after_initialize do |app|
@@ -79,25 +74,23 @@ module MissionControl
         MissionControl::Jobs.delay_between_bulk_operation_batches = 2
         MissionControl::Jobs.logger = ActiveSupport::Logger.new(STDOUT)
 
-        if MissionControl::Jobs.applications.one? && (application = MissionControl::Jobs.applications.first) && application.servers.one?
-          MissionControl::Jobs::Current.application = application
-          MissionControl::Jobs::Current.server = application.servers.first
-        end
-
         if MissionControl::Jobs.show_console_help
           puts "\n\nType 'jobs_help' to see how to connect to the available job servers to manage jobs\n\n"
         end
       end
 
       initializer "mission_control-jobs.assets" do |app|
-        app.config.assets.paths << root.join("app/assets/stylesheets")
         app.config.assets.paths << root.join("app/javascript")
         app.config.assets.precompile += %w[ mission_control_jobs_manifest ]
       end
 
-      initializer "mission_control-jobs.importmap", before: "importmap" do |app|
-        app.config.importmap.paths << root.join("config/importmap.rb")
-        app.config.importmap.cache_sweepers << root.join("app/javascript")
+      initializer "mission_control-jobs.importmap", after: "importmap" do |app|
+        MissionControl::Jobs.importmap.draw(root.join("config/importmap.rb"))
+        MissionControl::Jobs.importmap.cache_sweeper(watches: root.join("app/javascript"))
+
+        ActiveSupport.on_load(:action_controller_base) do
+          before_action { MissionControl::Jobs.importmap.cache_sweeper.execute_if_updated }
+        end
       end
     end
   end

data/lib/mission_control/jobs/server.rb

@@ -4,12 +4,13 @@ class MissionControl::Jobs::Server
   include MissionControl::Jobs::IdentifiedByName
   include Serializable, RecurringTasks, Workers
 
-  attr_reader :name, :queue_adapter, :application
+  attr_reader :name, :queue_adapter, :application, :backtrace_cleaner
 
-  def initialize(name:, queue_adapter:, application:)
+  def initialize(name:, queue_adapter:, application:, backtrace_cleaner: nil)
     super(name: name)
     @queue_adapter = queue_adapter
     @application = application
+    @backtrace_cleaner = backtrace_cleaner || MissionControl::Jobs.backtrace_cleaner
   end
 
   def activating(&block)

data/lib/mission_control/jobs/version.rb

@@ -1,5 +1,5 @@
 module MissionControl
   module Jobs
-    VERSION = "0.3.2"
+    VERSION = "0.4.0"
   end
 end

data/lib/mission_control/jobs.rb

@@ -19,5 +19,7 @@ module MissionControl
     mattr_accessor :internal_query_count_limit, default: 500_000 # Hard limit to keep unlimited count queries fast enough
     mattr_accessor :show_console_help, default: true
     mattr_accessor :scheduled_job_delay_threshold, default: 1.minute
+    mattr_accessor :importmap, default: Importmap::Map.new
+    mattr_accessor :backtrace_cleaner
   end
 end

metadata

@@ -1,17 +1,17 @@
 --- !ruby/object:Gem::Specification
 name: mission_control-jobs
 version: !ruby/object:Gem::Version
-  version: 0.3.2
+  version: 0.4.0
 platform: ruby
 authors:
 - Jorge Manrubia
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2024-10-05 00:00:00.000000000 Z
+date: 2024-11-06 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
-  name: rails
+  name: activerecord
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
@@ -25,33 +25,75 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '7.1'
 - !ruby/object:Gem::Dependency
-  name: propshaft
+  name: activejob
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '7.1'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '7.1'
+- !ruby/object:Gem::Dependency
+  name: actionpack
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '7.1'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '7.1'
+- !ruby/object:Gem::Dependency
+  name: actioncable
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '7.1'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '7.1'
+- !ruby/object:Gem::Dependency
+  name: railties
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '7.1'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '7.1'
 - !ruby/object:Gem::Dependency
   name: importmap-rails
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 1.2.1
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 1.2.1
 - !ruby/object:Gem::Dependency
   name: turbo-rails
   requirement: !ruby/object:Gem::Requirement
@@ -112,16 +154,16 @@ dependencies:
   name: solid_queue
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.9'
+        version: '1.0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.9'
+        version: '1.0'
 - !ruby/object:Gem::Dependency
   name: selenium-webdriver
   requirement: !ruby/object:Gem::Requirement
@@ -248,6 +290,20 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
+- !ruby/object:Gem::Dependency
+  name: better_html
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: sprockets-rails
   requirement: !ruby/object:Gem::Requirement
@@ -300,6 +356,7 @@ files:
 - MIT-LICENSE
 - README.md
 - Rakefile
+- app/assets/config/mission_control_jobs_manifest.js
 - app/assets/stylesheets/mission_control/jobs/application.css
 - app/assets/stylesheets/mission_control/jobs/forms.css
 - app/assets/stylesheets/mission_control/jobs/jobs.css
@@ -354,6 +411,7 @@ files:
 - app/views/mission_control/jobs/jobs/blocked/_actions.html.erb
 - app/views/mission_control/jobs/jobs/blocked/_job.html.erb
 - app/views/mission_control/jobs/jobs/failed/_actions.html.erb
+- app/views/mission_control/jobs/jobs/failed/_backtrace_toggle.html.erb
 - app/views/mission_control/jobs/jobs/failed/_job.html.erb
 - app/views/mission_control/jobs/jobs/finished/_job.html.erb
 - app/views/mission_control/jobs/jobs/in_progress/_job.html.erb
@@ -394,6 +452,7 @@ files:
 - lib/active_job/jobs_relation.rb
 - lib/active_job/querying.rb
 - lib/active_job/queue.rb
+- lib/active_job/queue_adapters/async_ext.rb
 - lib/active_job/queue_adapters/resque_ext.rb
 - lib/active_job/queue_adapters/solid_queue_ext.rb
 - lib/active_job/queue_adapters/solid_queue_ext/recurring_tasks.rb