RubyGems - delayed - Versions diffs - 2.0.3 → 2.2.0 - Mend

delayed 2.0.3 → 2.2.0

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.

Files changed (13) hide show

checksums.yaml +4 -4
data/app/models/delayed/job.rb +26 -10
data/lib/delayed/backend/job_preparer.rb +13 -0
data/lib/delayed/exceptions.rb +2 -0
data/lib/delayed/monitor.rb +103 -30
data/lib/delayed/tasks.rb +31 -11
data/lib/delayed/version.rb +1 -1
data/lib/delayed/worker.rb +2 -0
data/spec/delayed/__snapshots__/monitor_spec.rb.snap +447 -1170
data/spec/delayed/job_spec.rb +37 -6
data/spec/delayed/monitor_spec.rb +309 -240
data/spec/helper.rb +24 -13
metadata +2 -2

data/spec/delayed/monitor_spec.rb CHANGED Viewed

@@ -14,267 +14,338 @@ RSpec.describe Delayed::Monitor do
     }
   end
-  it 'emits empty metrics for all default priorities' do
-    expect { subject.run! }
-      .to emit_notification("delayed.monitor.run").with_payload(default_payload.except(:queue))
-      .and emit_notification("delayed.job.count").with_payload(default_payload.merge(priority: 'interactive')).with_value(0)
-      .and emit_notification("delayed.job.count").with_payload(default_payload.merge(priority: 'user_visible')).with_value(0)
-      .and emit_notification("delayed.job.count").with_payload(default_payload.merge(priority: 'eventual')).with_value(0)
-      .and emit_notification("delayed.job.count").with_payload(default_payload.merge(priority: 'reporting')).with_value(0)
-      .and emit_notification("delayed.job.future_count").with_payload(default_payload.merge(priority: 'interactive')).with_value(0)
-      .and emit_notification("delayed.job.future_count").with_payload(default_payload.merge(priority: 'user_visible')).with_value(0)
-      .and emit_notification("delayed.job.future_count").with_payload(default_payload.merge(priority: 'eventual')).with_value(0)
-      .and emit_notification("delayed.job.future_count").with_payload(default_payload.merge(priority: 'reporting')).with_value(0)
-      .and emit_notification("delayed.job.locked_count").with_payload(default_payload.merge(priority: 'interactive')).with_value(0)
-      .and emit_notification("delayed.job.locked_count").with_payload(default_payload.merge(priority: 'user_visible')).with_value(0)
-      .and emit_notification("delayed.job.locked_count").with_payload(default_payload.merge(priority: 'eventual')).with_value(0)
-      .and emit_notification("delayed.job.locked_count").with_payload(default_payload.merge(priority: 'reporting')).with_value(0)
-      .and emit_notification("delayed.job.erroring_count").with_payload(default_payload.merge(priority: 'interactive')).with_value(0)
-      .and emit_notification("delayed.job.erroring_count").with_payload(default_payload.merge(priority: 'user_visible')).with_value(0)
-      .and emit_notification("delayed.job.erroring_count").with_payload(default_payload.merge(priority: 'eventual')).with_value(0)
-      .and emit_notification("delayed.job.erroring_count").with_payload(default_payload.merge(priority: 'reporting')).with_value(0)
-      .and emit_notification("delayed.job.failed_count").with_payload(default_payload.merge(priority: 'interactive')).with_value(0)
-      .and emit_notification("delayed.job.failed_count").with_payload(default_payload.merge(priority: 'user_visible')).with_value(0)
-      .and emit_notification("delayed.job.failed_count").with_payload(default_payload.merge(priority: 'eventual')).with_value(0)
-      .and emit_notification("delayed.job.failed_count").with_payload(default_payload.merge(priority: 'reporting')).with_value(0)
-      .and emit_notification("delayed.job.working_count").with_payload(default_payload.merge(priority: 'interactive')).with_value(0)
-      .and emit_notification("delayed.job.working_count").with_payload(default_payload.merge(priority: 'user_visible')).with_value(0)
-      .and emit_notification("delayed.job.working_count").with_payload(default_payload.merge(priority: 'eventual')).with_value(0)
-      .and emit_notification("delayed.job.working_count").with_payload(default_payload.merge(priority: 'reporting')).with_value(0)
-      .and emit_notification("delayed.job.workable_count").with_payload(default_payload.merge(priority: 'interactive')).with_value(0)
-      .and emit_notification("delayed.job.workable_count").with_payload(default_payload.merge(priority: 'user_visible')).with_value(0)
-      .and emit_notification("delayed.job.workable_count").with_payload(default_payload.merge(priority: 'eventual')).with_value(0)
-      .and emit_notification("delayed.job.workable_count").with_payload(default_payload.merge(priority: 'reporting')).with_value(0)
-      .and emit_notification("delayed.job.max_age").with_payload(default_payload.merge(priority: 'interactive')).with_value(0)
-      .and emit_notification("delayed.job.max_age").with_payload(default_payload.merge(priority: 'user_visible')).with_value(0)
-      .and emit_notification("delayed.job.max_age").with_payload(default_payload.merge(priority: 'eventual')).with_value(0)
-      .and emit_notification("delayed.job.max_age").with_payload(default_payload.merge(priority: 'reporting')).with_value(0)
-      .and emit_notification("delayed.job.max_lock_age").with_payload(default_payload.merge(priority: 'interactive')).with_value(0)
-      .and emit_notification("delayed.job.max_lock_age").with_payload(default_payload.merge(priority: 'user_visible')).with_value(0)
-      .and emit_notification("delayed.job.max_lock_age").with_payload(default_payload.merge(priority: 'eventual')).with_value(0)
-      .and emit_notification("delayed.job.max_lock_age").with_payload(default_payload.merge(priority: 'reporting')).with_value(0)
-      .and emit_notification("delayed.job.alert_age_percent").with_payload(default_payload.merge(priority: 'interactive')).with_value(0)
-      .and emit_notification("delayed.job.alert_age_percent").with_payload(default_payload.merge(priority: 'user_visible')).with_value(0)
-      .and emit_notification("delayed.job.alert_age_percent").with_payload(default_payload.merge(priority: 'eventual')).with_value(0)
-      .and emit_notification("delayed.job.alert_age_percent").with_payload(default_payload.merge(priority: 'reporting')).with_value(0)
-  end
+  describe '#run!' do
+    let(:app_local_db_time) { false }
-  context 'when named priorities are customized' do
     around do |example|
-      Delayed::Priority.names = { high: 0, low: 7 }
-      example.run
-    ensure
-      Delayed::Priority.names = nil
-    end
-    it 'emits empty metrics for all custom priorities' do
-      expect { subject.run! }
-        .to emit_notification("delayed.monitor.run").with_payload(default_payload.except(:queue))
-        .and emit_notification("delayed.job.count").with_payload(default_payload.merge(priority: 'high')).with_value(0)
-        .and emit_notification("delayed.job.count").with_payload(default_payload.merge(priority: 'low')).with_value(0)
-        .and emit_notification("delayed.job.future_count").with_payload(default_payload.merge(priority: 'high')).with_value(0)
-        .and emit_notification("delayed.job.future_count").with_payload(default_payload.merge(priority: 'low')).with_value(0)
-        .and emit_notification("delayed.job.locked_count").with_payload(default_payload.merge(priority: 'high')).with_value(0)
-        .and emit_notification("delayed.job.locked_count").with_payload(default_payload.merge(priority: 'low')).with_value(0)
-        .and emit_notification("delayed.job.erroring_count").with_payload(default_payload.merge(priority: 'high')).with_value(0)
-        .and emit_notification("delayed.job.erroring_count").with_payload(default_payload.merge(priority: 'low')).with_value(0)
-        .and emit_notification("delayed.job.failed_count").with_payload(default_payload.merge(priority: 'high')).with_value(0)
-        .and emit_notification("delayed.job.failed_count").with_payload(default_payload.merge(priority: 'low')).with_value(0)
-        .and emit_notification("delayed.job.working_count").with_payload(default_payload.merge(priority: 'high')).with_value(0)
-        .and emit_notification("delayed.job.working_count").with_payload(default_payload.merge(priority: 'low')).with_value(0)
-        .and emit_notification("delayed.job.workable_count").with_payload(default_payload.merge(priority: 'high')).with_value(0)
-        .and emit_notification("delayed.job.workable_count").with_payload(default_payload.merge(priority: 'low')).with_value(0)
-        .and emit_notification("delayed.job.max_age").with_payload(default_payload.merge(priority: 'high')).with_value(0)
-        .and emit_notification("delayed.job.max_age").with_payload(default_payload.merge(priority: 'low')).with_value(0)
-        .and emit_notification("delayed.job.max_lock_age").with_payload(default_payload.merge(priority: 'high')).with_value(0)
-        .and emit_notification("delayed.job.max_lock_age").with_payload(default_payload.merge(priority: 'low')).with_value(0)
-        .and emit_notification("delayed.job.alert_age_percent").with_payload(default_payload.merge(priority: 'high')).with_value(0)
-        .and emit_notification("delayed.job.alert_age_percent").with_payload(default_payload.merge(priority: 'low')).with_value(0)
-    end
-  end
+      if app_local_db_time
+        Time.zone = 'US/Central'
+        self.default_timezone = :local
+      end
-  context 'when there are jobs in the queue' do
-    let(:now) { Delayed::Job.db_time_now.change(nsec: 0) }
-    let(:job_attributes) do
-      {
-        run_at: now,
-        queue: 'default',
-        handler: "--- !ruby/object:SimpleJob\n",
-        attempts: 0,
-      }
+      # On PostgreSQL, running examples in a transaction allows CURRENT_TIMESTAMP to remain stable.
+      # We can in turn use this to set Timecop to the same time as the DB for deterministic time math.
+      Delayed::Job.transaction do
+        now = described_class.parse_utc_time(
+          Delayed::Job.connection.select_value("SELECT #{described_class.sql_now_in_utc}"),
+        )
+        Timecop.freeze(now) { example.run }
+      end
+    ensure
+      Time.zone = nil
+      self.default_timezone = :utc
     end
-    let(:failed_attributes) { { run_at: now - 1.week, attempts: 1, failed_at: now - 1.day, locked_at: now - 1.day } }
-    let(:p0_attributes) { job_attributes.merge(priority: 1, attempts: 1) }
-    let(:p10_attributes) { job_attributes.merge(priority: 13, locked_at: now - 1.day) }
-    let(:p20_attributes) { job_attributes.merge(priority: 23, attempts: 1) }
-    let(:p30_attributes) { job_attributes.merge(priority: 999, locked_at: now - 1.day) }
-    let(:p0_payload) { default_payload.merge(priority: 'interactive') }
-    let(:p10_payload) { default_payload.merge(priority: 'user_visible') }
-    let(:p20_payload) { default_payload.merge(priority: 'eventual') }
-    let(:p30_payload) { default_payload.merge(priority: 'reporting') }
-    let!(:p0_workable_job) { Delayed::Job.create! p0_attributes.merge(run_at: now - 30.seconds) }
-    let!(:p0_failed_job) { Delayed::Job.create! p0_attributes.merge(failed_attributes) }
-    let!(:p0_future_job) { Delayed::Job.create! p0_attributes.merge(run_at: now + 1.hour) }
-    let!(:p0_working_job) { Delayed::Job.create! p0_attributes.merge(locked_at: now - 3.minutes) }
-    let!(:p10_workable_job) { Delayed::Job.create! p10_attributes.merge(run_at: now - 2.minutes) }
-    let!(:p10_failed_job) { Delayed::Job.create! p10_attributes.merge(failed_attributes) }
-    let!(:p10_future_job) { Delayed::Job.create! p10_attributes.merge(run_at: now + 1.hour) }
-    let!(:p10_working_job) { Delayed::Job.create! p10_attributes.merge(locked_at: now - 7.minutes) }
-    let!(:p20_workable_job) { Delayed::Job.create! p20_attributes.merge(run_at: now - 1.hour) }
-    let!(:p20_failed_job) { Delayed::Job.create! p20_attributes.merge(failed_attributes) }
-    let!(:p20_future_job) { Delayed::Job.create! p20_attributes.merge(run_at: now + 1.hour) }
-    let!(:p20_working_job) { Delayed::Job.create! p20_attributes.merge(locked_at: now - 9.minutes) }
-    let!(:p30_workable_job) { Delayed::Job.create! p30_attributes.merge(run_at: now - 6.hours) }
-    let!(:p30_failed_job) { Delayed::Job.create! p30_attributes.merge(failed_attributes) }
-    let!(:p30_future_job) { Delayed::Job.create! p30_attributes.merge(run_at: now + 1.hour) }
-    let!(:p30_working_job) { Delayed::Job.create! p30_attributes.merge(locked_at: now - 11.minutes) }
-    let!(:p30_workable_job_in_other_queue) { Delayed::Job.create! p30_attributes.merge(run_at: now - 4.hours, queue: 'banana') }
-    around do |example|
-      Timecop.freeze(now) { example.run }
-    end
+    let(:now) { Delayed::Job.db_time_now }
-    it 'emits the expected results for each metric' do
+    it 'emits empty metrics for all default priorities' do
       expect { subject.run! }
         .to emit_notification("delayed.monitor.run").with_payload(default_payload.except(:queue))
-        .and emit_notification("delayed.job.count").with_payload(p0_payload).with_value(4)
-        .and emit_notification("delayed.job.future_count").with_payload(p0_payload).with_value(1)
-        .and emit_notification("delayed.job.locked_count").with_payload(p0_payload).with_value(1)
-        .and emit_notification("delayed.job.erroring_count").with_payload(p0_payload).with_value(3)
-        .and emit_notification("delayed.job.failed_count").with_payload(p0_payload).with_value(1)
-        .and emit_notification("delayed.job.working_count").with_payload(p0_payload).with_value(1)
-        .and emit_notification("delayed.job.workable_count").with_payload(p0_payload).with_value(1)
-        .and emit_notification("delayed.job.max_age").with_payload(p0_payload).with_value(30.seconds)
-        .and emit_notification("delayed.job.max_lock_age").with_payload(p0_payload).with_value(3.minutes)
-        .and emit_notification("delayed.job.alert_age_percent").with_payload(p0_payload).with_value(30.0.seconds / 1.minute * 100)
-        .and emit_notification("delayed.job.count").with_payload(p10_payload).with_value(4)
-        .and emit_notification("delayed.job.future_count").with_payload(p10_payload).with_value(1)
-        .and emit_notification("delayed.job.locked_count").with_payload(p10_payload).with_value(1)
-        .and emit_notification("delayed.job.erroring_count").with_payload(p10_payload).with_value(0)
-        .and emit_notification("delayed.job.failed_count").with_payload(p10_payload).with_value(1)
-        .and emit_notification("delayed.job.working_count").with_payload(p10_payload).with_value(1)
-        .and emit_notification("delayed.job.workable_count").with_payload(p10_payload).with_value(1)
-        .and emit_notification("delayed.job.max_age").with_payload(p10_payload).with_value(2.minutes)
-        .and emit_notification("delayed.job.max_lock_age").with_payload(p10_payload).with_value(7.minutes)
-        .and emit_notification("delayed.job.alert_age_percent").with_payload(p10_payload).with_value(2.0.minutes / 3.minutes * 100)
-        .and emit_notification("delayed.job.count").with_payload(p20_payload).with_value(4)
-        .and emit_notification("delayed.job.future_count").with_payload(p20_payload).with_value(1)
-        .and emit_notification("delayed.job.locked_count").with_payload(p20_payload).with_value(1)
-        .and emit_notification("delayed.job.erroring_count").with_payload(p20_payload).with_value(3)
-        .and emit_notification("delayed.job.failed_count").with_payload(p20_payload).with_value(1)
-        .and emit_notification("delayed.job.working_count").with_payload(p20_payload).with_value(1)
-        .and emit_notification("delayed.job.workable_count").with_payload(p20_payload).with_value(1)
-        .and emit_notification("delayed.job.max_age").with_payload(p20_payload).with_value(1.hour)
-        .and emit_notification("delayed.job.max_lock_age").with_payload(p20_payload).with_value(9.minutes)
-        .and emit_notification("delayed.job.alert_age_percent").with_payload(p20_payload).with_value(1.hour / 1.5.hours * 100)
-        .and emit_notification("delayed.job.count").with_payload(p30_payload).with_value(4)
-        .and emit_notification("delayed.job.future_count").with_payload(p30_payload).with_value(1)
-        .and emit_notification("delayed.job.locked_count").with_payload(p30_payload).with_value(1)
-        .and emit_notification("delayed.job.erroring_count").with_payload(p30_payload).with_value(0)
-        .and emit_notification("delayed.job.failed_count").with_payload(p30_payload).with_value(1)
-        .and emit_notification("delayed.job.working_count").with_payload(p30_payload).with_value(1)
-        .and emit_notification("delayed.job.workable_count").with_payload(p30_payload).with_value(1)
-        .and emit_notification("delayed.job.max_age").with_payload(p30_payload).with_value(6.hours)
-        .and emit_notification("delayed.job.max_lock_age").with_payload(p30_payload).with_value(11.minutes)
-        .and emit_notification("delayed.job.alert_age_percent").with_payload(p30_payload).with_value(100) # 6 hours / 4 hours (overflow)
-        .and emit_notification("delayed.job.workable_count").with_payload(p30_payload.merge(queue: 'banana')).with_value(1)
-        .and emit_notification("delayed.job.max_age").with_payload(p30_payload.merge(queue: 'banana')).with_value(4.hours)
+        .and emit_notification("delayed.job.count").with_payload(default_payload.merge(priority: 'interactive')).with_value(0)
+        .and emit_notification("delayed.job.count").with_payload(default_payload.merge(priority: 'user_visible')).with_value(0)
+        .and emit_notification("delayed.job.count").with_payload(default_payload.merge(priority: 'eventual')).with_value(0)
+        .and emit_notification("delayed.job.count").with_payload(default_payload.merge(priority: 'reporting')).with_value(0)
+        .and emit_notification("delayed.job.future_count").with_payload(default_payload.merge(priority: 'interactive')).with_value(0)
+        .and emit_notification("delayed.job.future_count").with_payload(default_payload.merge(priority: 'user_visible')).with_value(0)
+        .and emit_notification("delayed.job.future_count").with_payload(default_payload.merge(priority: 'eventual')).with_value(0)
+        .and emit_notification("delayed.job.future_count").with_payload(default_payload.merge(priority: 'reporting')).with_value(0)
+        .and emit_notification("delayed.job.locked_count").with_payload(default_payload.merge(priority: 'interactive')).with_value(0)
+        .and emit_notification("delayed.job.locked_count").with_payload(default_payload.merge(priority: 'user_visible')).with_value(0)
+        .and emit_notification("delayed.job.locked_count").with_payload(default_payload.merge(priority: 'eventual')).with_value(0)
+        .and emit_notification("delayed.job.locked_count").with_payload(default_payload.merge(priority: 'reporting')).with_value(0)
+        .and emit_notification("delayed.job.erroring_count").with_payload(default_payload.merge(priority: 'interactive')).with_value(0)
+        .and emit_notification("delayed.job.erroring_count").with_payload(default_payload.merge(priority: 'user_visible')).with_value(0)
+        .and emit_notification("delayed.job.erroring_count").with_payload(default_payload.merge(priority: 'eventual')).with_value(0)
+        .and emit_notification("delayed.job.erroring_count").with_payload(default_payload.merge(priority: 'reporting')).with_value(0)
+        .and emit_notification("delayed.job.failed_count").with_payload(default_payload.merge(priority: 'interactive')).with_value(0)
+        .and emit_notification("delayed.job.failed_count").with_payload(default_payload.merge(priority: 'user_visible')).with_value(0)
+        .and emit_notification("delayed.job.failed_count").with_payload(default_payload.merge(priority: 'eventual')).with_value(0)
+        .and emit_notification("delayed.job.failed_count").with_payload(default_payload.merge(priority: 'reporting')).with_value(0)
+        .and emit_notification("delayed.job.working_count").with_payload(default_payload.merge(priority: 'interactive')).with_value(0)
+        .and emit_notification("delayed.job.working_count").with_payload(default_payload.merge(priority: 'user_visible')).with_value(0)
+        .and emit_notification("delayed.job.working_count").with_payload(default_payload.merge(priority: 'eventual')).with_value(0)
+        .and emit_notification("delayed.job.working_count").with_payload(default_payload.merge(priority: 'reporting')).with_value(0)
+        .and emit_notification("delayed.job.workable_count").with_payload(default_payload.merge(priority: 'interactive')).with_value(0)
+        .and emit_notification("delayed.job.workable_count").with_payload(default_payload.merge(priority: 'user_visible')).with_value(0)
+        .and emit_notification("delayed.job.workable_count").with_payload(default_payload.merge(priority: 'eventual')).with_value(0)
+        .and emit_notification("delayed.job.workable_count").with_payload(default_payload.merge(priority: 'reporting')).with_value(0)
+        .and emit_notification("delayed.job.max_age").with_payload(default_payload.merge(priority: 'interactive')).approximately.with_value(0)
+        .and emit_notification("delayed.job.max_age").with_payload(default_payload.merge(priority: 'user_visible')).approximately.with_value(0)
+        .and emit_notification("delayed.job.max_age").with_payload(default_payload.merge(priority: 'eventual')).approximately.with_value(0)
+        .and emit_notification("delayed.job.max_age").with_payload(default_payload.merge(priority: 'reporting')).approximately.with_value(0)
+        .and emit_notification("delayed.job.max_lock_age").with_payload(default_payload.merge(priority: 'interactive')).approximately.with_value(0)
+        .and emit_notification("delayed.job.max_lock_age").with_payload(default_payload.merge(priority: 'user_visible')).approximately.with_value(0)
+        .and emit_notification("delayed.job.max_lock_age").with_payload(default_payload.merge(priority: 'eventual')).approximately.with_value(0)
+        .and emit_notification("delayed.job.max_lock_age").with_payload(default_payload.merge(priority: 'reporting')).approximately.with_value(0)
+        .and emit_notification("delayed.job.alert_age_percent").with_payload(default_payload.merge(priority: 'interactive')).approximately.with_value(0)
+        .and emit_notification("delayed.job.alert_age_percent").with_payload(default_payload.merge(priority: 'user_visible')).approximately.with_value(0)
+        .and emit_notification("delayed.job.alert_age_percent").with_payload(default_payload.merge(priority: 'eventual')).approximately.with_value(0)
+        .and emit_notification("delayed.job.alert_age_percent").with_payload(default_payload.merge(priority: 'reporting')).approximately.with_value(0)
     end
     context 'when named priorities are customized' do
       around do |example|
-        Delayed::Priority.names = { high: 0, low: 20 }
+        Delayed::Priority.names = { high: 0, low: 7 }
         example.run
       ensure
         Delayed::Priority.names = nil
       end
-      let(:p0_payload) { default_payload.merge(priority: 'high') }
-      let(:p20_payload) { default_payload.merge(priority: 'low') }
+      it 'emits empty metrics for all custom priorities' do
+        expect { subject.run! }
+          .to emit_notification("delayed.monitor.run").with_payload(default_payload.except(:queue))
+          .and emit_notification("delayed.job.count").with_payload(default_payload.merge(priority: 'high')).with_value(0)
+          .and emit_notification("delayed.job.count").with_payload(default_payload.merge(priority: 'low')).with_value(0)
+          .and emit_notification("delayed.job.future_count").with_payload(default_payload.merge(priority: 'high')).with_value(0)
+          .and emit_notification("delayed.job.future_count").with_payload(default_payload.merge(priority: 'low')).with_value(0)
+          .and emit_notification("delayed.job.locked_count").with_payload(default_payload.merge(priority: 'high')).with_value(0)
+          .and emit_notification("delayed.job.locked_count").with_payload(default_payload.merge(priority: 'low')).with_value(0)
+          .and emit_notification("delayed.job.erroring_count").with_payload(default_payload.merge(priority: 'high')).with_value(0)
+          .and emit_notification("delayed.job.erroring_count").with_payload(default_payload.merge(priority: 'low')).with_value(0)
+          .and emit_notification("delayed.job.failed_count").with_payload(default_payload.merge(priority: 'high')).with_value(0)
+          .and emit_notification("delayed.job.failed_count").with_payload(default_payload.merge(priority: 'low')).with_value(0)
+          .and emit_notification("delayed.job.working_count").with_payload(default_payload.merge(priority: 'high')).with_value(0)
+          .and emit_notification("delayed.job.working_count").with_payload(default_payload.merge(priority: 'low')).with_value(0)
+          .and emit_notification("delayed.job.workable_count").with_payload(default_payload.merge(priority: 'high')).with_value(0)
+          .and emit_notification("delayed.job.workable_count").with_payload(default_payload.merge(priority: 'low')).with_value(0)
+          .and emit_notification("delayed.job.max_age").with_payload(default_payload.merge(priority: 'high')).approximately.with_value(0)
+          .and emit_notification("delayed.job.max_age").with_payload(default_payload.merge(priority: 'low')).approximately.with_value(0)
+          .and emit_notification("delayed.job.max_lock_age").with_payload(default_payload.merge(priority: 'high')).approximately.with_value(0)
+          .and emit_notification("delayed.job.max_lock_age").with_payload(default_payload.merge(priority: 'low')).approximately.with_value(0)
+          .and emit_notification("delayed.job.alert_age_percent").with_payload(default_payload.merge(priority: 'high')).with_value(0)
+          .and emit_notification("delayed.job.alert_age_percent").with_payload(default_payload.merge(priority: 'low')).with_value(0)
+      end
+    end
+    context 'when there are jobs in the queue' do
+      let(:job_attributes) do
+        {
+          run_at: now,
+          queue: 'default',
+          handler: "--- !ruby/object:SimpleJob\n",
+          attempts: 0,
+        }
+      end
+      let(:failed_attributes) { { run_at: now - 1.week, attempts: 1, failed_at: now - 1.day, locked_at: now - 1.day } }
+      let(:p0_attributes) { job_attributes.merge(priority: 1, attempts: 1) }
+      let(:p10_attributes) { job_attributes.merge(priority: 13, locked_at: now - 1.day) }
+      let(:p20_attributes) { job_attributes.merge(priority: 23, attempts: 1) }
+      let(:p30_attributes) { job_attributes.merge(priority: 999, locked_at: now - 1.day) }
+      let(:p0_payload) { default_payload.merge(priority: 'interactive') }
+      let(:p10_payload) { default_payload.merge(priority: 'user_visible') }
+      let(:p20_payload) { default_payload.merge(priority: 'eventual') }
+      let(:p30_payload) { default_payload.merge(priority: 'reporting') }
+      let!(:p0_workable_job) { Delayed::Job.create! p0_attributes.merge(run_at: now - 30.seconds) }
+      let!(:p0_failed_job) { Delayed::Job.create! p0_attributes.merge(failed_attributes) }
+      let!(:p0_future_job) { Delayed::Job.create! p0_attributes.merge(run_at: now + 1.hour) }
+      let!(:p0_working_job) { Delayed::Job.create! p0_attributes.merge(locked_at: now - 3.minutes) }
+      let!(:p10_workable_job) { Delayed::Job.create! p10_attributes.merge(run_at: now - 2.minutes) }
+      let!(:p10_failed_job) { Delayed::Job.create! p10_attributes.merge(failed_attributes) }
+      let!(:p10_future_job) { Delayed::Job.create! p10_attributes.merge(run_at: now + 1.hour) }
+      let!(:p10_working_job) { Delayed::Job.create! p10_attributes.merge(locked_at: now - 7.minutes) }
+      let!(:p20_workable_job) { Delayed::Job.create! p20_attributes.merge(run_at: now - 1.hour) }
+      let!(:p20_failed_job) { Delayed::Job.create! p20_attributes.merge(failed_attributes) }
+      let!(:p20_future_job) { Delayed::Job.create! p20_attributes.merge(run_at: now + 1.hour) }
+      let!(:p20_working_job) { Delayed::Job.create! p20_attributes.merge(locked_at: now - 9.minutes) }
+      let!(:p30_workable_job) { Delayed::Job.create! p30_attributes.merge(run_at: now - 6.hours) }
+      let!(:p30_failed_job) { Delayed::Job.create! p30_attributes.merge(failed_attributes) }
+      let!(:p30_future_job) { Delayed::Job.create! p30_attributes.merge(run_at: now + 1.hour) }
+      let!(:p30_working_job) { Delayed::Job.create! p30_attributes.merge(locked_at: now - 11.minutes) }
+      let!(:p30_workable_job_in_other_queue) { Delayed::Job.create! p30_attributes.merge(run_at: now - 4.hours, queue: 'banana') }
       it 'emits the expected results for each metric' do
         expect { subject.run! }
           .to emit_notification("delayed.monitor.run").with_payload(default_payload.except(:queue))
-          .and emit_notification("delayed.job.count").with_payload(p0_payload).with_value(8)
-          .and emit_notification("delayed.job.future_count").with_payload(p0_payload).with_value(2)
-          .and emit_notification("delayed.job.locked_count").with_payload(p0_payload).with_value(2)
+          .and emit_notification("delayed.job.count").with_payload(p0_payload).with_value(4)
+          .and emit_notification("delayed.job.future_count").with_payload(p0_payload).with_value(1)
+          .and emit_notification("delayed.job.locked_count").with_payload(p0_payload).with_value(1)
           .and emit_notification("delayed.job.erroring_count").with_payload(p0_payload).with_value(3)
-          .and emit_notification("delayed.job.failed_count").with_payload(p0_payload).with_value(2)
-          .and emit_notification("delayed.job.working_count").with_payload(p0_payload).with_value(2)
-          .and emit_notification("delayed.job.workable_count").with_payload(p0_payload).with_value(2)
-          .and emit_notification("delayed.job.max_age").with_payload(p0_payload).with_value(2.minutes)
-          .and emit_notification("delayed.job.max_lock_age").with_payload(p0_payload).with_value(7.minutes)
-          .and emit_notification("delayed.job.alert_age_percent").with_payload(p0_payload).with_value(0)
-          .and emit_notification("delayed.job.count").with_payload(p20_payload).with_value(8)
-          .and emit_notification("delayed.job.future_count").with_payload(p20_payload).with_value(2)
-          .and emit_notification("delayed.job.locked_count").with_payload(p20_payload).with_value(2)
+          .and emit_notification("delayed.job.failed_count").with_payload(p0_payload).with_value(1)
+          .and emit_notification("delayed.job.working_count").with_payload(p0_payload).with_value(1)
+          .and emit_notification("delayed.job.workable_count").with_payload(p0_payload).with_value(1)
+          .and emit_notification("delayed.job.max_age").with_payload(p0_payload).approximately.with_value(30.seconds)
+          .and emit_notification("delayed.job.max_lock_age").with_payload(p0_payload).approximately.with_value(3.minutes)
+          .and emit_notification("delayed.job.alert_age_percent").with_payload(p0_payload).approximately.with_value(30.0.seconds / 1.minute * 100)
+          .and emit_notification("delayed.job.count").with_payload(p10_payload).with_value(4)
+          .and emit_notification("delayed.job.future_count").with_payload(p10_payload).with_value(1)
+          .and emit_notification("delayed.job.locked_count").with_payload(p10_payload).with_value(1)
+          .and emit_notification("delayed.job.erroring_count").with_payload(p10_payload).with_value(0)
+          .and emit_notification("delayed.job.failed_count").with_payload(p10_payload).with_value(1)
+          .and emit_notification("delayed.job.working_count").with_payload(p10_payload).with_value(1)
+          .and emit_notification("delayed.job.workable_count").with_payload(p10_payload).with_value(1)
+          .and emit_notification("delayed.job.max_age").with_payload(p10_payload).approximately.with_value(2.minutes)
+          .and emit_notification("delayed.job.max_lock_age").with_payload(p10_payload).approximately.with_value(7.minutes)
+          .and emit_notification("delayed.job.alert_age_percent").with_payload(p10_payload).approximately.with_value(2.0.minutes / 3.minutes * 100)
+          .and emit_notification("delayed.job.count").with_payload(p20_payload).with_value(4)
+          .and emit_notification("delayed.job.future_count").with_payload(p20_payload).with_value(1)
+          .and emit_notification("delayed.job.locked_count").with_payload(p20_payload).with_value(1)
           .and emit_notification("delayed.job.erroring_count").with_payload(p20_payload).with_value(3)
-          .and emit_notification("delayed.job.failed_count").with_payload(p20_payload).with_value(2)
-          .and emit_notification("delayed.job.working_count").with_payload(p20_payload).with_value(2)
-          .and emit_notification("delayed.job.workable_count").with_payload(p20_payload).with_value(2)
-          .and emit_notification("delayed.job.max_age").with_payload(p20_payload).with_value(6.hours)
-          .and emit_notification("delayed.job.max_lock_age").with_payload(p20_payload).with_value(11.minutes)
-          .and emit_notification("delayed.job.alert_age_percent").with_payload(p20_payload).with_value(0)
-          .and emit_notification("delayed.job.workable_count").with_payload(p20_payload.merge(queue: 'banana')).with_value(1)
-          .and emit_notification("delayed.job.max_age").with_payload(p20_payload.merge(queue: 'banana')).with_value(4.hours)
+          .and emit_notification("delayed.job.failed_count").with_payload(p20_payload).with_value(1)
+          .and emit_notification("delayed.job.working_count").with_payload(p20_payload).with_value(1)
+          .and emit_notification("delayed.job.workable_count").with_payload(p20_payload).with_value(1)
+          .and emit_notification("delayed.job.max_age").with_payload(p20_payload).approximately.with_value(1.hour)
+          .and emit_notification("delayed.job.max_lock_age").with_payload(p20_payload).approximately.with_value(9.minutes)
+          .and emit_notification("delayed.job.alert_age_percent").with_payload(p20_payload).approximately.with_value(1.hour / 1.5.hours * 100)
+          .and emit_notification("delayed.job.count").with_payload(p30_payload).with_value(4)
+          .and emit_notification("delayed.job.future_count").with_payload(p30_payload).with_value(1)
+          .and emit_notification("delayed.job.locked_count").with_payload(p30_payload).with_value(1)
+          .and emit_notification("delayed.job.erroring_count").with_payload(p30_payload).with_value(0)
+          .and emit_notification("delayed.job.failed_count").with_payload(p30_payload).with_value(1)
+          .and emit_notification("delayed.job.working_count").with_payload(p30_payload).with_value(1)
+          .and emit_notification("delayed.job.workable_count").with_payload(p30_payload).with_value(1)
+          .and emit_notification("delayed.job.max_age").with_payload(p30_payload).approximately.with_value(6.hours)
+          .and emit_notification("delayed.job.max_lock_age").with_payload(p30_payload).approximately.with_value(11.minutes)
+          .and emit_notification("delayed.job.alert_age_percent").with_payload(p30_payload).approximately.with_value(100) # 6 hours / 4 hours (overflow)
+          .and emit_notification("delayed.job.workable_count").with_payload(p30_payload.merge(queue: 'banana')).with_value(1)
+          .and emit_notification("delayed.job.max_age").with_payload(p30_payload.merge(queue: 'banana')).approximately.with_value(4.hours)
       end
-      context 'when alert thresholds are specified' do
+      context 'when named priorities are customized' do
         around do |example|
-          Delayed::Priority.alerts = { high: { age: 3.hours }, low: { age: 1.year } }
+          Delayed::Priority.names = { high: 0, low: 20 }
           example.run
         ensure
-          Delayed::Priority.alerts = nil
+          Delayed::Priority.names = nil
         end
+        let(:p0_payload) { default_payload.merge(priority: 'high') }
+        let(:p20_payload) { default_payload.merge(priority: 'low') }
-        it 'emits the expected alert_age_percent results' do
+        it 'emits the expected results for each metric' do
           expect { subject.run! }
-            .to emit_notification("delayed.job.alert_age_percent").with_payload(p0_payload).with_value(2.0.minutes / 3.hours * 100)
-            .and emit_notification("delayed.job.alert_age_percent").with_payload(p20_payload).with_value(6.0.hours / 1.year * 100)
+            .to emit_notification("delayed.monitor.run").with_payload(default_payload.except(:queue))
+            .and emit_notification("delayed.job.count").with_payload(p0_payload).with_value(8)
+            .and emit_notification("delayed.job.future_count").with_payload(p0_payload).with_value(2)
+            .and emit_notification("delayed.job.locked_count").with_payload(p0_payload).with_value(2)
+            .and emit_notification("delayed.job.erroring_count").with_payload(p0_payload).with_value(3)
+            .and emit_notification("delayed.job.failed_count").with_payload(p0_payload).with_value(2)
+            .and emit_notification("delayed.job.working_count").with_payload(p0_payload).with_value(2)
+            .and emit_notification("delayed.job.workable_count").with_payload(p0_payload).with_value(2)
+            .and emit_notification("delayed.job.max_age").with_payload(p0_payload).approximately.with_value(2.minutes)
+            .and emit_notification("delayed.job.max_lock_age").with_payload(p0_payload).approximately.with_value(7.minutes)
+            .and emit_notification("delayed.job.alert_age_percent").with_payload(p0_payload).approximately.with_value(0)
+            .and emit_notification("delayed.job.count").with_payload(p20_payload).with_value(8)
+            .and emit_notification("delayed.job.future_count").with_payload(p20_payload).with_value(2)
+            .and emit_notification("delayed.job.locked_count").with_payload(p20_payload).with_value(2)
+            .and emit_notification("delayed.job.erroring_count").with_payload(p20_payload).with_value(3)
+            .and emit_notification("delayed.job.failed_count").with_payload(p20_payload).with_value(2)
+            .and emit_notification("delayed.job.working_count").with_payload(p20_payload).with_value(2)
+            .and emit_notification("delayed.job.workable_count").with_payload(p20_payload).with_value(2)
+            .and emit_notification("delayed.job.max_age").with_payload(p20_payload).approximately.with_value(6.hours)
+            .and emit_notification("delayed.job.max_lock_age").with_payload(p20_payload).approximately.with_value(11.minutes)
+            .and emit_notification("delayed.job.alert_age_percent").with_payload(p20_payload).approximately.with_value(0)
+            .and emit_notification("delayed.job.workable_count").with_payload(p20_payload.merge(queue: 'banana')).with_value(1)
+            .and emit_notification("delayed.job.max_age").with_payload(p20_payload.merge(queue: 'banana')).approximately.with_value(4.hours)
+        end
+        context 'when alert thresholds are specified' do
+          around do |example|
+            Delayed::Priority.alerts = { high: { age: 3.hours }, low: { age: 1.year } }
+            example.run
+          ensure
+            Delayed::Priority.alerts = nil
+          end
+          it 'emits the expected alert_age_percent results' do
+            expect { subject.run! }
+              .to emit_notification("delayed.job.alert_age_percent").with_payload(p0_payload).approximately.with_value(2.0.minutes / 3.hours * 100)
+              .and emit_notification("delayed.job.alert_age_percent").with_payload(p20_payload).approximately.with_value(6.0.hours / 1.year * 100)
+          end
         end
       end
-    end
-    context 'when worker queues are specified' do
-      around do |example|
-        Delayed::Worker.queues = %w(banana gram)
-        Delayed::Priority.names = { interactive: 0 } # avoid splitting by priority for simplicity
-        Delayed::Priority.alerts = { interactive: { age: 8.hours } }
-        example.run
-      ensure
-        Delayed::Priority.names = nil
-        Delayed::Worker.queues = []
+      context 'when worker queues are specified' do
+        around do |example|
+          Delayed::Worker.queues = %w(banana gram)
+          Delayed::Priority.names = { interactive: 0 } # avoid splitting by priority for simplicity
+          Delayed::Priority.alerts = { interactive: { age: 8.hours } }
+          example.run
+        ensure
+          Delayed::Priority.names = nil
+          Delayed::Worker.queues = []
+        end
+        let(:banana_payload) { default_payload.merge(queue: 'banana', priority: 'interactive') }
+        let(:gram_payload) { default_payload.merge(queue: 'gram', priority: 'interactive') }
+        it 'emits the expected results for each queue' do
+          expect { subject.run! }
+            .to emit_notification("delayed.monitor.run").with_payload(default_payload.except(:queue))
+            .and emit_notification("delayed.job.count").with_payload(banana_payload).with_value(1)
+            .and emit_notification("delayed.job.future_count").with_payload(banana_payload).with_value(0)
+            .and emit_notification("delayed.job.locked_count").with_payload(banana_payload).with_value(0)
+            .and emit_notification("delayed.job.erroring_count").with_payload(banana_payload).with_value(0)
+            .and emit_notification("delayed.job.failed_count").with_payload(banana_payload).with_value(0)
+            .and emit_notification("delayed.job.working_count").with_payload(banana_payload).with_value(0)
+            .and emit_notification("delayed.job.workable_count").with_payload(banana_payload).with_value(1)
+            .and emit_notification("delayed.job.max_age").with_payload(banana_payload).approximately.with_value(4.hours)
+            .and emit_notification("delayed.job.max_lock_age").with_payload(banana_payload).approximately.with_value(0)
+            .and emit_notification("delayed.job.alert_age_percent").with_payload(banana_payload).approximately.with_value(4.0.hours / 8.hours * 100)
+            .and emit_notification("delayed.job.count").with_payload(gram_payload).with_value(0)
+            .and emit_notification("delayed.job.future_count").with_payload(gram_payload).with_value(0)
+            .and emit_notification("delayed.job.locked_count").with_payload(gram_payload).with_value(0)
+            .and emit_notification("delayed.job.erroring_count").with_payload(gram_payload).with_value(0)
+            .and emit_notification("delayed.job.failed_count").with_payload(gram_payload).with_value(0)
+            .and emit_notification("delayed.job.working_count").with_payload(gram_payload).with_value(0)
+            .and emit_notification("delayed.job.workable_count").with_payload(gram_payload).with_value(0)
+            .and emit_notification("delayed.job.max_age").with_payload(gram_payload).approximately.with_value(0)
+            .and emit_notification("delayed.job.max_lock_age").with_payload(gram_payload).approximately.with_value(0)
+            .and emit_notification("delayed.job.alert_age_percent").with_payload(gram_payload).approximately.with_value(0)
+        end
       end
-      let(:banana_payload) { default_payload.merge(queue: 'banana', priority: 'interactive') }
-      let(:gram_payload) { default_payload.merge(queue: 'gram', priority: 'interactive') }
-      it 'emits the expected results for each queue' do
-        expect { subject.run! }
-          .to emit_notification("delayed.monitor.run").with_payload(default_payload.except(:queue))
-          .and emit_notification("delayed.job.count").with_payload(banana_payload).with_value(1)
-          .and emit_notification("delayed.job.future_count").with_payload(banana_payload).with_value(0)
-          .and emit_notification("delayed.job.locked_count").with_payload(banana_payload).with_value(0)
-          .and emit_notification("delayed.job.erroring_count").with_payload(banana_payload).with_value(0)
-          .and emit_notification("delayed.job.failed_count").with_payload(banana_payload).with_value(0)
-          .and emit_notification("delayed.job.working_count").with_payload(banana_payload).with_value(0)
-          .and emit_notification("delayed.job.workable_count").with_payload(banana_payload).with_value(1)
-          .and emit_notification("delayed.job.max_age").with_payload(banana_payload).with_value(4.hours)
-          .and emit_notification("delayed.job.max_lock_age").with_payload(banana_payload).with_value(0)
-          .and emit_notification("delayed.job.alert_age_percent").with_payload(banana_payload).with_value(4.0.hours / 8.hours * 100)
-          .and emit_notification("delayed.job.count").with_payload(gram_payload).with_value(0)
-          .and emit_notification("delayed.job.future_count").with_payload(gram_payload).with_value(0)
-          .and emit_notification("delayed.job.locked_count").with_payload(gram_payload).with_value(0)
-          .and emit_notification("delayed.job.erroring_count").with_payload(gram_payload).with_value(0)
-          .and emit_notification("delayed.job.failed_count").with_payload(gram_payload).with_value(0)
-          .and emit_notification("delayed.job.working_count").with_payload(gram_payload).with_value(0)
-          .and emit_notification("delayed.job.workable_count").with_payload(gram_payload).with_value(0)
-          .and emit_notification("delayed.job.max_age").with_payload(gram_payload).with_value(0)
-          .and emit_notification("delayed.job.max_lock_age").with_payload(gram_payload).with_value(0)
-          .and emit_notification("delayed.job.alert_age_percent").with_payload(gram_payload).with_value(0)
+      context 'when using app-local timezone for DB timestamps' do
+        let(:app_local_db_time) { true }
+        it 'emits the expected results for each metric' do
+          expect { subject.run! }
+            .to emit_notification("delayed.monitor.run").with_payload(default_payload.except(:queue))
+            .and emit_notification("delayed.job.count").with_payload(p0_payload).with_value(4)
+            .and emit_notification("delayed.job.future_count").with_payload(p0_payload).with_value(1)
+            .and emit_notification("delayed.job.locked_count").with_payload(p0_payload).with_value(1)
+            .and emit_notification("delayed.job.erroring_count").with_payload(p0_payload).with_value(3)
+            .and emit_notification("delayed.job.failed_count").with_payload(p0_payload).with_value(1)
+            .and emit_notification("delayed.job.working_count").with_payload(p0_payload).with_value(1)
+            .and emit_notification("delayed.job.workable_count").with_payload(p0_payload).with_value(1)
+            .and emit_notification("delayed.job.max_age").with_payload(p0_payload).approximately.with_value(30.seconds)
+            .and emit_notification("delayed.job.max_lock_age").with_payload(p0_payload).approximately.with_value(3.minutes)
+            .and emit_notification("delayed.job.alert_age_percent").with_payload(p0_payload).approximately.with_value(30.0.seconds / 1.minute * 100)
+            .and emit_notification("delayed.job.count").with_payload(p10_payload).with_value(4)
+            .and emit_notification("delayed.job.future_count").with_payload(p10_payload).with_value(1)
+            .and emit_notification("delayed.job.locked_count").with_payload(p10_payload).with_value(1)
+            .and emit_notification("delayed.job.erroring_count").with_payload(p10_payload).with_value(0)
+            .and emit_notification("delayed.job.failed_count").with_payload(p10_payload).with_value(1)
+            .and emit_notification("delayed.job.working_count").with_payload(p10_payload).with_value(1)
+            .and emit_notification("delayed.job.workable_count").with_payload(p10_payload).with_value(1)
+            .and emit_notification("delayed.job.max_age").with_payload(p10_payload).approximately.with_value(2.minutes)
+            .and emit_notification("delayed.job.max_lock_age").with_payload(p10_payload).approximately.with_value(7.minutes)
+            .and emit_notification("delayed.job.alert_age_percent").with_payload(p10_payload).approximately.with_value(2.0.minutes / 3.minutes * 100)
+            .and emit_notification("delayed.job.count").with_payload(p20_payload).with_value(4)
+            .and emit_notification("delayed.job.future_count").with_payload(p20_payload).with_value(1)
+            .and emit_notification("delayed.job.locked_count").with_payload(p20_payload).with_value(1)
+            .and emit_notification("delayed.job.erroring_count").with_payload(p20_payload).with_value(3)
+            .and emit_notification("delayed.job.failed_count").with_payload(p20_payload).with_value(1)
+            .and emit_notification("delayed.job.working_count").with_payload(p20_payload).with_value(1)
+            .and emit_notification("delayed.job.workable_count").with_payload(p20_payload).with_value(1)
+            .and emit_notification("delayed.job.max_age").with_payload(p20_payload).approximately.with_value(1.hour)
+            .and emit_notification("delayed.job.max_lock_age").with_payload(p20_payload).approximately.with_value(9.minutes)
+            .and emit_notification("delayed.job.alert_age_percent").with_payload(p20_payload).approximately.with_value(1.hour / 1.5.hours * 100)
+            .and emit_notification("delayed.job.count").with_payload(p30_payload).with_value(4)
+            .and emit_notification("delayed.job.future_count").with_payload(p30_payload).with_value(1)
+            .and emit_notification("delayed.job.locked_count").with_payload(p30_payload).with_value(1)
+            .and emit_notification("delayed.job.erroring_count").with_payload(p30_payload).with_value(0)
+            .and emit_notification("delayed.job.failed_count").with_payload(p30_payload).with_value(1)
+            .and emit_notification("delayed.job.working_count").with_payload(p30_payload).with_value(1)
+            .and emit_notification("delayed.job.workable_count").with_payload(p30_payload).with_value(1)
+            .and emit_notification("delayed.job.max_age").with_payload(p30_payload).approximately.with_value(6.hours)
+            .and emit_notification("delayed.job.max_lock_age").with_payload(p30_payload).approximately.with_value(11.minutes)
+            .and emit_notification("delayed.job.alert_age_percent").with_payload(p30_payload).approximately.with_value(100) # 6 hours / 4 hours (overflow)
+            .and emit_notification("delayed.job.workable_count").with_payload(p30_payload.merge(queue: 'banana')).with_value(1)
+            .and emit_notification("delayed.job.max_age").with_payload(p30_payload.merge(queue: 'banana')).approximately.with_value(4.hours)
+        end
       end
     end
   end
-  describe '#query_for' do
+  describe 'SQL' do
     let(:monitor) { described_class.new }
     let(:queries) { [] }
     let(:now) { '2025-11-10 17:20:13 UTC' }
@@ -289,30 +360,28 @@ RSpec.describe Delayed::Monitor do
           value = value.value if value.is_a?(ActiveModel::Attribute)
           sql = sql.sub(/(\?|\$\d)/, ActiveRecord::Base.connection.quote(value))
         end
-        queries << sql
+        queries << QueryUnderTest.for(sql)
+        queries << "---"
       end
     end
-    def queries_for(metric)
-      monitor.query_for(metric)
-      queries.map { |q| QueryUnderTest.for(q) }
+    def query_descriptions
+      described_class::METRICS.each do |metric|
+        queries << "-- QUERIES FOR `#{metric}`:"
+        queries << "---------------------------------"
+        monitor.query_for(metric)
+        queries << "-- (no new queries)" unless queries.last == '---'
+      end
+      queries.dup.map { |query| query.try(:full_description) || query }
     end
-    described_class::METRICS.each do |metric|
-      context "('#{metric}')" do
-        it "runs the expected #{current_adapter} query for #{metric}" do
-          expect(queries_for(metric).map(&:formatted).join("\n")).to match_snapshot
-        end
-        it "produces the expected #{current_adapter} query plan for #{metric}" do
-          expect(queries_for(metric).map(&:explain).join("\n")).to match_snapshot
-        end
+    it "runs the expected #{current_adapter} queries with the expected plans" do
+      expect(query_descriptions.join("\n")).to match_snapshot
+    end
-        context 'when using the legacy index', :with_legacy_table_index do
-          it "[legacy index] produces the expected #{current_adapter} query plan for #{metric}" do
-            expect(queries_for(metric).map(&:explain).join("\n")).to match_snapshot
-          end
-        end
+    context 'when using the legacy index', :with_legacy_table_index do
+      it "[legacy index] runs the expected #{current_adapter} queries with the expected plans" do
+        expect(query_descriptions.join("\n")).to match_snapshot
       end
     end
   end