From b2c7f7a5a3749e0d4826652b27bef6daaf613c7e Mon Sep 17 00:00:00 2001
From: Daniel Uber <dan@forem.com>
Date: Mon, 2 May 2022 11:12:58 -0500
Subject: [PATCH] Use Sidekiq::Job module alias for Sidekiq::Worker (#17526)

---
 app/workers/articles/bust_multiple_caches_worker.rb         | 2 +-
 app/workers/articles/enrich_image_attributes_worker.rb      | 2 +-
 app/workers/articles/score_calc_worker.rb                   | 2 +-
 app/workers/articles/update_organic_page_views_worker.rb    | 2 +-
 app/workers/articles/update_page_views_worker.rb            | 2 +-
 app/workers/badge_achievements/badge_award_worker.rb        | 2 +-
 .../badge_achievements/send_email_notification_worker.rb    | 2 +-
 app/workers/broadcasts/send_welcome_notifications_worker.rb | 2 +-
 app/workers/bust_cache_base_worker.rb                       | 2 +-
 app/workers/capture_query_stats_worker.rb                   | 2 +-
 app/workers/comments/calculate_score_worker.rb              | 2 +-
 app/workers/comments/create_first_reaction_worker.rb        | 2 +-
 app/workers/comments/send_email_notification_worker.rb      | 2 +-
 app/workers/credits/sync_counter_cache.rb                   | 2 +-
 app/workers/data_update_worker.rb                           | 2 +-
 app/workers/discover/register_worker.rb                     | 2 +-
 app/workers/emails/enqueue_digest_worker.rb                 | 2 +-
 app/workers/emails/remove_old_emails_worker.rb              | 2 +-
 app/workers/emails/send_user_digest_worker.rb               | 2 +-
 app/workers/export_content_worker.rb                        | 2 +-
 app/workers/feeds/import_articles_worker.rb                 | 4 ++--
 app/workers/follows/send_email_notification_worker.rb       | 2 +-
 app/workers/follows/update_points_worker.rb                 | 2 +-
 app/workers/github_repos/repo_sync_worker.rb                | 2 +-
 app/workers/github_repos/update_latest_worker.rb            | 2 +-
 app/workers/html_variants/remove_old_data_worker.rb         | 2 +-
 app/workers/listings/expire_old_listings_worker.rb          | 2 +-
 app/workers/mentions/create_all_worker.rb                   | 2 +-
 app/workers/mentions/send_email_notification_worker.rb      | 2 +-
 app/workers/metrics/check_data_update_script_statuses.rb    | 2 +-
 app/workers/metrics/record_background_queue_stats_worker.rb | 2 +-
 app/workers/metrics/record_daily_notifications_worker.rb    | 2 +-
 app/workers/metrics/record_daily_usage_worker.rb            | 2 +-
 app/workers/metrics/record_data_counts_worker.rb            | 2 +-
 app/workers/migrate_data_to_work_field_worker.rb            | 2 +-
 app/workers/moderator/banish_user_worker.rb                 | 2 +-
 app/workers/moderator/sink_articles_worker.rb               | 2 +-
 app/workers/moderator/unpublish_all_articles_worker.rb      | 2 +-
 app/workers/notification_subscriptions/update_worker.rb     | 2 +-
 app/workers/notifications/mention_worker.rb                 | 2 +-
 app/workers/notifications/milestone_worker.rb               | 2 +-
 app/workers/notifications/moderation_notification_worker.rb | 2 +-
 app/workers/notifications/new_badge_achievement_worker.rb   | 2 +-
 app/workers/notifications/new_follower_worker.rb            | 2 +-
 app/workers/notifications/new_reaction_worker.rb            | 2 +-
 app/workers/notifications/notifiable_action_worker.rb       | 2 +-
 app/workers/notifications/remove_all_worker.rb              | 2 +-
 .../notifications/remove_old_notifications_worker.rb        | 2 +-
 .../notifications/tag_adjustment_notification_worker.rb     | 2 +-
 app/workers/notifications/update_worker.rb                  | 2 +-
 app/workers/notifications/welcome_notification_worker.rb    | 2 +-
 app/workers/organizations/delete_worker.rb                  | 2 +-
 .../update_organization_articles_paths_worker.rb            | 2 +-
 app/workers/podcast_episodes/create_worker.rb               | 2 +-
 app/workers/podcast_episodes/update_media_url_worker.rb     | 2 +-
 app/workers/podcasts/enqueue_get_episodes_worker.rb         | 2 +-
 app/workers/podcasts/get_episodes_worker.rb                 | 2 +-
 app/workers/push_notifications/cleanup_worker.rb            | 2 +-
 app/workers/push_notifications/deliver_worker.rb            | 2 +-
 app/workers/rating_votes/assign_rating_worker.rb            | 2 +-
 app/workers/reactions/bust_homepage_cache_worker.rb         | 2 +-
 app/workers/reactions/bust_reactable_cache_worker.rb        | 2 +-
 app/workers/reactions/update_relevant_scores_worker.rb      | 2 +-
 app/workers/slack/messengers/worker.rb                      | 2 +-
 app/workers/tags/alias_retag_worker.rb                      | 2 +-
 app/workers/tags/resave_supported_tags_worker.rb            | 2 +-
 app/workers/users/delete_worker.rb                          | 2 +-
 app/workers/users/follow_worker.rb                          | 2 +-
 app/workers/users/merge_sync_worker.rb                      | 2 +-
 app/workers/users/record_field_test_event_worker.rb         | 2 +-
 app/workers/users/resave_articles_worker.rb                 | 2 +-
 .../users/subscribe_to_mailchimp_newsletter_worker.rb       | 2 +-
 spec/lib/sidekiq/honeycomb_middleware_spec.rb               | 2 +-
 spec/rails_helper.rb                                        | 2 +-
 spec/services/mentions/create_all_spec.rb                   | 2 +-
 spec/support/sidekiq_test_helpers.rb                        | 6 +++---
 76 files changed, 79 insertions(+), 79 deletions(-)

diff --git a/app/workers/articles/bust_multiple_caches_worker.rb b/app/workers/articles/bust_multiple_caches_worker.rb
index 9c6d5cf65..801475ae1 100644
--- a/app/workers/articles/bust_multiple_caches_worker.rb
+++ b/app/workers/articles/bust_multiple_caches_worker.rb
@@ -1,6 +1,6 @@
 module Articles
   class BustMultipleCachesWorker
-    include Sidekiq::Worker
+    include Sidekiq::Job
     sidekiq_options queue: :low_priority, retry: 10
 
     def perform(article_ids)
diff --git a/app/workers/articles/enrich_image_attributes_worker.rb b/app/workers/articles/enrich_image_attributes_worker.rb
index a0ffb5fc0..917ec6d20 100644
--- a/app/workers/articles/enrich_image_attributes_worker.rb
+++ b/app/workers/articles/enrich_image_attributes_worker.rb
@@ -1,6 +1,6 @@
 module Articles
   class EnrichImageAttributesWorker
-    include Sidekiq::Worker
+    include Sidekiq::Job
 
     sidekiq_options queue: :medium_priority, retry: 5, lock: :until_executing
 
diff --git a/app/workers/articles/score_calc_worker.rb b/app/workers/articles/score_calc_worker.rb
index dddf0cce3..24c8d6ab9 100644
--- a/app/workers/articles/score_calc_worker.rb
+++ b/app/workers/articles/score_calc_worker.rb
@@ -1,6 +1,6 @@
 module Articles
   class ScoreCalcWorker
-    include Sidekiq::Worker
+    include Sidekiq::Job
 
     sidekiq_options queue: :medium_priority, lock: :until_executing
 
diff --git a/app/workers/articles/update_organic_page_views_worker.rb b/app/workers/articles/update_organic_page_views_worker.rb
index be58c14df..005096839 100644
--- a/app/workers/articles/update_organic_page_views_worker.rb
+++ b/app/workers/articles/update_organic_page_views_worker.rb
@@ -1,6 +1,6 @@
 module Articles
   class UpdateOrganicPageViewsWorker
-    include Sidekiq::Worker
+    include Sidekiq::Job
 
     sidekiq_options queue: :medium_priority,
                     lock: :until_executing,
diff --git a/app/workers/articles/update_page_views_worker.rb b/app/workers/articles/update_page_views_worker.rb
index 098bb8ea8..41aabd9fb 100644
--- a/app/workers/articles/update_page_views_worker.rb
+++ b/app/workers/articles/update_page_views_worker.rb
@@ -1,6 +1,6 @@
 module Articles
   class UpdatePageViewsWorker
-    include Sidekiq::Worker
+    include Sidekiq::Job
 
     sidekiq_options queue: :medium_priority,
                     lock: :until_executing,
diff --git a/app/workers/badge_achievements/badge_award_worker.rb b/app/workers/badge_achievements/badge_award_worker.rb
index 9680411b5..fc97e338b 100644
--- a/app/workers/badge_achievements/badge_award_worker.rb
+++ b/app/workers/badge_achievements/badge_award_worker.rb
@@ -1,6 +1,6 @@
 module BadgeAchievements
   class BadgeAwardWorker
-    include Sidekiq::Worker
+    include Sidekiq::Job
 
     sidekiq_options queue: :high_priority, retry: 10
 
diff --git a/app/workers/badge_achievements/send_email_notification_worker.rb b/app/workers/badge_achievements/send_email_notification_worker.rb
index 1ce3ddb2d..d9a769988 100644
--- a/app/workers/badge_achievements/send_email_notification_worker.rb
+++ b/app/workers/badge_achievements/send_email_notification_worker.rb
@@ -1,6 +1,6 @@
 module BadgeAchievements
   class SendEmailNotificationWorker
-    include Sidekiq::Worker
+    include Sidekiq::Job
 
     sidekiq_options queue: :low_priority, retry: 10
 
diff --git a/app/workers/broadcasts/send_welcome_notifications_worker.rb b/app/workers/broadcasts/send_welcome_notifications_worker.rb
index b1855a6ed..ecef85625 100644
--- a/app/workers/broadcasts/send_welcome_notifications_worker.rb
+++ b/app/workers/broadcasts/send_welcome_notifications_worker.rb
@@ -1,6 +1,6 @@
 module Broadcasts
   class SendWelcomeNotificationsWorker
-    include Sidekiq::Worker
+    include Sidekiq::Job
 
     sidekiq_options queue: :medium_priority, retry: 15
 
diff --git a/app/workers/bust_cache_base_worker.rb b/app/workers/bust_cache_base_worker.rb
index 650fe85c6..ca452fb67 100644
--- a/app/workers/bust_cache_base_worker.rb
+++ b/app/workers/bust_cache_base_worker.rb
@@ -1,5 +1,5 @@
 class BustCacheBaseWorker
-  include Sidekiq::Worker
+  include Sidekiq::Job
 
   sidekiq_options queue: :high_priority, retry: 15, lock: :until_executing
 end
diff --git a/app/workers/capture_query_stats_worker.rb b/app/workers/capture_query_stats_worker.rb
index c3b7cb954..a2b919e45 100644
--- a/app/workers/capture_query_stats_worker.rb
+++ b/app/workers/capture_query_stats_worker.rb
@@ -1,5 +1,5 @@
 class CaptureQueryStatsWorker
-  include Sidekiq::Worker
+  include Sidekiq::Job
 
   def perform
     return unless ENV["PG_HERO_CAPTURE_QUERY_STATS"] == "true"
diff --git a/app/workers/comments/calculate_score_worker.rb b/app/workers/comments/calculate_score_worker.rb
index 40e2447b6..056bb5922 100644
--- a/app/workers/comments/calculate_score_worker.rb
+++ b/app/workers/comments/calculate_score_worker.rb
@@ -1,6 +1,6 @@
 module Comments
   class CalculateScoreWorker
-    include Sidekiq::Worker
+    include Sidekiq::Job
 
     sidekiq_options queue: :medium_priority, lock: :until_executing
 
diff --git a/app/workers/comments/create_first_reaction_worker.rb b/app/workers/comments/create_first_reaction_worker.rb
index bc50ff876..acc3a4784 100644
--- a/app/workers/comments/create_first_reaction_worker.rb
+++ b/app/workers/comments/create_first_reaction_worker.rb
@@ -1,6 +1,6 @@
 module Comments
   class CreateFirstReactionWorker
-    include Sidekiq::Worker
+    include Sidekiq::Job
 
     sidekiq_options queue: :high_priority, retry: 10
 
diff --git a/app/workers/comments/send_email_notification_worker.rb b/app/workers/comments/send_email_notification_worker.rb
index 1ec0e214d..f2df8ec98 100644
--- a/app/workers/comments/send_email_notification_worker.rb
+++ b/app/workers/comments/send_email_notification_worker.rb
@@ -1,6 +1,6 @@
 module Comments
   class SendEmailNotificationWorker
-    include Sidekiq::Worker
+    include Sidekiq::Job
 
     sidekiq_options queue: :mailers
 
diff --git a/app/workers/credits/sync_counter_cache.rb b/app/workers/credits/sync_counter_cache.rb
index 224283e23..b064714f1 100644
--- a/app/workers/credits/sync_counter_cache.rb
+++ b/app/workers/credits/sync_counter_cache.rb
@@ -1,6 +1,6 @@
 module Credits
   class SyncCounterCache
-    include Sidekiq::Worker
+    include Sidekiq::Job
 
     sidekiq_options queue: :low_priority, retry: 10
 
diff --git a/app/workers/data_update_worker.rb b/app/workers/data_update_worker.rb
index 7ac7938d7..e33b9f283 100644
--- a/app/workers/data_update_worker.rb
+++ b/app/workers/data_update_worker.rb
@@ -1,5 +1,5 @@
 class DataUpdateWorker
-  include Sidekiq::Worker
+  include Sidekiq::Job
   sidekiq_options queue: :high_priority, retry: 5
 
   def perform(id = nil)
diff --git a/app/workers/discover/register_worker.rb b/app/workers/discover/register_worker.rb
index ce0db6f6e..3ca393879 100644
--- a/app/workers/discover/register_worker.rb
+++ b/app/workers/discover/register_worker.rb
@@ -1,6 +1,6 @@
 module Discover
   class RegisterWorker
-    include Sidekiq::Worker
+    include Sidekiq::Job
 
     sidekiq_options queue: :low_priority, retry: 3
 
diff --git a/app/workers/emails/enqueue_digest_worker.rb b/app/workers/emails/enqueue_digest_worker.rb
index 1444c1d91..a18953451 100644
--- a/app/workers/emails/enqueue_digest_worker.rb
+++ b/app/workers/emails/enqueue_digest_worker.rb
@@ -1,6 +1,6 @@
 module Emails
   class EnqueueDigestWorker
-    include Sidekiq::Worker
+    include Sidekiq::Job
 
     sidekiq_options queue: :medium_priority, retry: 15
 
diff --git a/app/workers/emails/remove_old_emails_worker.rb b/app/workers/emails/remove_old_emails_worker.rb
index 04b8e8b36..28ec418f2 100644
--- a/app/workers/emails/remove_old_emails_worker.rb
+++ b/app/workers/emails/remove_old_emails_worker.rb
@@ -1,6 +1,6 @@
 module Emails
   class RemoveOldEmailsWorker
-    include Sidekiq::Worker
+    include Sidekiq::Job
 
     sidekiq_options queue: :low_priority, retry: 10
 
diff --git a/app/workers/emails/send_user_digest_worker.rb b/app/workers/emails/send_user_digest_worker.rb
index 8c50c9612..3ddf5d661 100644
--- a/app/workers/emails/send_user_digest_worker.rb
+++ b/app/workers/emails/send_user_digest_worker.rb
@@ -1,6 +1,6 @@
 module Emails
   class SendUserDigestWorker
-    include Sidekiq::Worker
+    include Sidekiq::Job
 
     sidekiq_options queue: :low_priority, retry: 15, lock: :until_executing
 
diff --git a/app/workers/export_content_worker.rb b/app/workers/export_content_worker.rb
index 5cf385f5f..b81ba947e 100644
--- a/app/workers/export_content_worker.rb
+++ b/app/workers/export_content_worker.rb
@@ -1,5 +1,5 @@
 class ExportContentWorker
-  include Sidekiq::Worker
+  include Sidekiq::Job
 
   sidekiq_options queue: :medium_priority, retry: 10, lock: :until_executed
 
diff --git a/app/workers/feeds/import_articles_worker.rb b/app/workers/feeds/import_articles_worker.rb
index f027043a7..f53908fee 100644
--- a/app/workers/feeds/import_articles_worker.rb
+++ b/app/workers/feeds/import_articles_worker.rb
@@ -1,6 +1,6 @@
 module Feeds
   class ImportArticlesWorker
-    include Sidekiq::Worker
+    include Sidekiq::Job
 
     sidekiq_options queue: :medium_priority, retry: 10, lock: :until_and_while_executing
 
@@ -34,7 +34,7 @@ module Feeds
     end
 
     class ForUser
-      include Sidekiq::Worker
+      include Sidekiq::Job
 
       def perform(user_ids, earlier_than)
         users_scope = User.where(id: user_ids)
diff --git a/app/workers/follows/send_email_notification_worker.rb b/app/workers/follows/send_email_notification_worker.rb
index 7eaa88e6f..b6719810f 100644
--- a/app/workers/follows/send_email_notification_worker.rb
+++ b/app/workers/follows/send_email_notification_worker.rb
@@ -1,6 +1,6 @@
 module Follows
   class SendEmailNotificationWorker
-    include Sidekiq::Worker
+    include Sidekiq::Job
     sidekiq_options queue: :mailers, retry: 10
 
     def perform(follow_id, mailer = NotifyMailer.name)
diff --git a/app/workers/follows/update_points_worker.rb b/app/workers/follows/update_points_worker.rb
index 3697886cc..edd04f06d 100644
--- a/app/workers/follows/update_points_worker.rb
+++ b/app/workers/follows/update_points_worker.rb
@@ -1,6 +1,6 @@
 module Follows
   class UpdatePointsWorker
-    include Sidekiq::Worker
+    include Sidekiq::Job
     sidekiq_options queue: :low_priority, retry: 10, lock: :until_executing
 
     def perform(article_id, user_id)
diff --git a/app/workers/github_repos/repo_sync_worker.rb b/app/workers/github_repos/repo_sync_worker.rb
index 22c091400..f35017801 100644
--- a/app/workers/github_repos/repo_sync_worker.rb
+++ b/app/workers/github_repos/repo_sync_worker.rb
@@ -1,6 +1,6 @@
 module GithubRepos
   class RepoSyncWorker
-    include Sidekiq::Worker
+    include Sidekiq::Job
 
     sidekiq_options queue: :low_priority, retry: 10, lock: :until_executing
 
diff --git a/app/workers/github_repos/update_latest_worker.rb b/app/workers/github_repos/update_latest_worker.rb
index f3dc049a4..101623033 100644
--- a/app/workers/github_repos/update_latest_worker.rb
+++ b/app/workers/github_repos/update_latest_worker.rb
@@ -1,6 +1,6 @@
 module GithubRepos
   class UpdateLatestWorker
-    include Sidekiq::Worker
+    include Sidekiq::Job
 
     sidekiq_options queue: :medium_priority, retry: 10
 
diff --git a/app/workers/html_variants/remove_old_data_worker.rb b/app/workers/html_variants/remove_old_data_worker.rb
index 70089b5f4..a7adcfb49 100644
--- a/app/workers/html_variants/remove_old_data_worker.rb
+++ b/app/workers/html_variants/remove_old_data_worker.rb
@@ -1,6 +1,6 @@
 module HtmlVariants
   class RemoveOldDataWorker
-    include Sidekiq::Worker
+    include Sidekiq::Job
 
     sidekiq_options queue: :low_priority, retry: 15
 
diff --git a/app/workers/listings/expire_old_listings_worker.rb b/app/workers/listings/expire_old_listings_worker.rb
index 227649b17..94ee44021 100644
--- a/app/workers/listings/expire_old_listings_worker.rb
+++ b/app/workers/listings/expire_old_listings_worker.rb
@@ -1,6 +1,6 @@
 module Listings
   class ExpireOldListingsWorker
-    include Sidekiq::Worker
+    include Sidekiq::Job
 
     sidekiq_options queue: :low_priority, retry: 5
 
diff --git a/app/workers/mentions/create_all_worker.rb b/app/workers/mentions/create_all_worker.rb
index 784059d71..65011f305 100644
--- a/app/workers/mentions/create_all_worker.rb
+++ b/app/workers/mentions/create_all_worker.rb
@@ -1,7 +1,7 @@
 module Mentions
   # This worker is currently only used to create mentions on comments.
   class CreateAllWorker
-    include Sidekiq::Worker
+    include Sidekiq::Job
     sidekiq_options queue: :default, retry: 10
 
     def perform(notifiable_id, notifiable_type)
diff --git a/app/workers/mentions/send_email_notification_worker.rb b/app/workers/mentions/send_email_notification_worker.rb
index 037c0308b..53d2d14d2 100644
--- a/app/workers/mentions/send_email_notification_worker.rb
+++ b/app/workers/mentions/send_email_notification_worker.rb
@@ -1,6 +1,6 @@
 module Mentions
   class SendEmailNotificationWorker
-    include Sidekiq::Worker
+    include Sidekiq::Job
     sidekiq_options queue: :default, retry: 10
 
     def perform(mention_id)
diff --git a/app/workers/metrics/check_data_update_script_statuses.rb b/app/workers/metrics/check_data_update_script_statuses.rb
index 7b87178e3..05f773da8 100644
--- a/app/workers/metrics/check_data_update_script_statuses.rb
+++ b/app/workers/metrics/check_data_update_script_statuses.rb
@@ -1,6 +1,6 @@
 module Metrics
   class CheckDataUpdateScriptStatuses
-    include Sidekiq::Worker
+    include Sidekiq::Job
     sidekiq_options queue: :low_priority, retry: 10
 
     def perform
diff --git a/app/workers/metrics/record_background_queue_stats_worker.rb b/app/workers/metrics/record_background_queue_stats_worker.rb
index 060b6a710..5da08e80e 100644
--- a/app/workers/metrics/record_background_queue_stats_worker.rb
+++ b/app/workers/metrics/record_background_queue_stats_worker.rb
@@ -1,6 +1,6 @@
 module Metrics
   class RecordBackgroundQueueStatsWorker
-    include Sidekiq::Worker
+    include Sidekiq::Job
     sidekiq_options queue: :high_priority, retry: 10
 
     def perform
diff --git a/app/workers/metrics/record_daily_notifications_worker.rb b/app/workers/metrics/record_daily_notifications_worker.rb
index 4fa1e0b2a..2a49e3660 100644
--- a/app/workers/metrics/record_daily_notifications_worker.rb
+++ b/app/workers/metrics/record_daily_notifications_worker.rb
@@ -1,6 +1,6 @@
 module Metrics
   class RecordDailyNotificationsWorker
-    include Sidekiq::Worker
+    include Sidekiq::Job
     sidekiq_options queue: :low_priority, retry: 10
 
     EVENT_TITLES = %w[
diff --git a/app/workers/metrics/record_daily_usage_worker.rb b/app/workers/metrics/record_daily_usage_worker.rb
index 10f65dd27..9d6e617ad 100644
--- a/app/workers/metrics/record_daily_usage_worker.rb
+++ b/app/workers/metrics/record_daily_usage_worker.rb
@@ -1,6 +1,6 @@
 module Metrics
   class RecordDailyUsageWorker
-    include Sidekiq::Worker
+    include Sidekiq::Job
     sidekiq_options queue: :low_priority, retry: 10
 
     def perform
diff --git a/app/workers/metrics/record_data_counts_worker.rb b/app/workers/metrics/record_data_counts_worker.rb
index 677fec8c6..fb413cbab 100644
--- a/app/workers/metrics/record_data_counts_worker.rb
+++ b/app/workers/metrics/record_data_counts_worker.rb
@@ -1,6 +1,6 @@
 module Metrics
   class RecordDataCountsWorker
-    include Sidekiq::Worker
+    include Sidekiq::Job
     sidekiq_options queue: :low_priority, retry: 10
 
     def perform
diff --git a/app/workers/migrate_data_to_work_field_worker.rb b/app/workers/migrate_data_to_work_field_worker.rb
index 9dd03fa16..21391929a 100644
--- a/app/workers/migrate_data_to_work_field_worker.rb
+++ b/app/workers/migrate_data_to_work_field_worker.rb
@@ -2,7 +2,7 @@
 # and we gave self-hosters some time to run it to we should be able to remove
 # this.
 class MigrateDataToWorkFieldWorker
-  include Sidekiq::Worker
+  include Sidekiq::Job
 
   def perform(profile_id)
     profile = Profile.find_by(id: profile_id)
diff --git a/app/workers/moderator/banish_user_worker.rb b/app/workers/moderator/banish_user_worker.rb
index 7a0a6251e..338da2323 100644
--- a/app/workers/moderator/banish_user_worker.rb
+++ b/app/workers/moderator/banish_user_worker.rb
@@ -1,6 +1,6 @@
 module Moderator
   class BanishUserWorker
-    include Sidekiq::Worker
+    include Sidekiq::Job
 
     sidekiq_options queue: :high_priority, retry: 10
 
diff --git a/app/workers/moderator/sink_articles_worker.rb b/app/workers/moderator/sink_articles_worker.rb
index ca885755a..db74f0fdc 100644
--- a/app/workers/moderator/sink_articles_worker.rb
+++ b/app/workers/moderator/sink_articles_worker.rb
@@ -1,6 +1,6 @@
 module Moderator
   class SinkArticlesWorker
-    include Sidekiq::Worker
+    include Sidekiq::Job
 
     sidekiq_options queue: :medium_priority, retry: 10
 
diff --git a/app/workers/moderator/unpublish_all_articles_worker.rb b/app/workers/moderator/unpublish_all_articles_worker.rb
index f45099241..723c6adaf 100644
--- a/app/workers/moderator/unpublish_all_articles_worker.rb
+++ b/app/workers/moderator/unpublish_all_articles_worker.rb
@@ -1,6 +1,6 @@
 module Moderator
   class UnpublishAllArticlesWorker
-    include Sidekiq::Worker
+    include Sidekiq::Job
 
     sidekiq_options queue: :medium_priority, retry: 10
 
diff --git a/app/workers/notification_subscriptions/update_worker.rb b/app/workers/notification_subscriptions/update_worker.rb
index 569a9e775..2591b0da1 100644
--- a/app/workers/notification_subscriptions/update_worker.rb
+++ b/app/workers/notification_subscriptions/update_worker.rb
@@ -1,6 +1,6 @@
 module NotificationSubscriptions
   class UpdateWorker
-    include Sidekiq::Worker
+    include Sidekiq::Job
 
     sidekiq_options queue: :medium_priority, retry: 10, lock: :until_executing
 
diff --git a/app/workers/notifications/mention_worker.rb b/app/workers/notifications/mention_worker.rb
index b6a7ba2dc..9f0088094 100644
--- a/app/workers/notifications/mention_worker.rb
+++ b/app/workers/notifications/mention_worker.rb
@@ -1,6 +1,6 @@
 module Notifications
   class MentionWorker
-    include Sidekiq::Worker
+    include Sidekiq::Job
     sidekiq_options queue: :low_priority, retry: 10
 
     def perform(mention_id)
diff --git a/app/workers/notifications/milestone_worker.rb b/app/workers/notifications/milestone_worker.rb
index b9287fe2d..5be11e27d 100644
--- a/app/workers/notifications/milestone_worker.rb
+++ b/app/workers/notifications/milestone_worker.rb
@@ -1,6 +1,6 @@
 module Notifications
   class MilestoneWorker
-    include Sidekiq::Worker
+    include Sidekiq::Job
 
     sidekiq_options queue: :low_priority, retry: 10
 
diff --git a/app/workers/notifications/moderation_notification_worker.rb b/app/workers/notifications/moderation_notification_worker.rb
index 13afe01c5..edbda8808 100644
--- a/app/workers/notifications/moderation_notification_worker.rb
+++ b/app/workers/notifications/moderation_notification_worker.rb
@@ -1,6 +1,6 @@
 module Notifications
   class ModerationNotificationWorker
-    include Sidekiq::Worker
+    include Sidekiq::Job
 
     sidekiq_options queue: :medium_priority, retry: 10
 
diff --git a/app/workers/notifications/new_badge_achievement_worker.rb b/app/workers/notifications/new_badge_achievement_worker.rb
index a78d2e499..22ef6d9bb 100644
--- a/app/workers/notifications/new_badge_achievement_worker.rb
+++ b/app/workers/notifications/new_badge_achievement_worker.rb
@@ -1,6 +1,6 @@
 module Notifications
   class NewBadgeAchievementWorker
-    include Sidekiq::Worker
+    include Sidekiq::Job
     sidekiq_options queue: :low_priority, retry: 10
 
     def perform(badge_achievement_id)
diff --git a/app/workers/notifications/new_follower_worker.rb b/app/workers/notifications/new_follower_worker.rb
index 67c58ec5c..ec6ad2202 100644
--- a/app/workers/notifications/new_follower_worker.rb
+++ b/app/workers/notifications/new_follower_worker.rb
@@ -1,6 +1,6 @@
 module Notifications
   class NewFollowerWorker
-    include Sidekiq::Worker
+    include Sidekiq::Job
 
     sidekiq_options queue: :medium_priority, retry: 10
 
diff --git a/app/workers/notifications/new_reaction_worker.rb b/app/workers/notifications/new_reaction_worker.rb
index d265864a2..cc39bf4ff 100644
--- a/app/workers/notifications/new_reaction_worker.rb
+++ b/app/workers/notifications/new_reaction_worker.rb
@@ -1,6 +1,6 @@
 module Notifications
   class NewReactionWorker
-    include Sidekiq::Worker
+    include Sidekiq::Job
 
     sidekiq_options queue: :medium_priority, retry: 10
 
diff --git a/app/workers/notifications/notifiable_action_worker.rb b/app/workers/notifications/notifiable_action_worker.rb
index 3a4a914f0..54edc6525 100644
--- a/app/workers/notifications/notifiable_action_worker.rb
+++ b/app/workers/notifications/notifiable_action_worker.rb
@@ -1,6 +1,6 @@
 module Notifications
   class NotifiableActionWorker
-    include Sidekiq::Worker
+    include Sidekiq::Job
 
     sidekiq_options queue: :low_priority, retry: 10
     def perform(notifiable_id, notifiable_type, action)
diff --git a/app/workers/notifications/remove_all_worker.rb b/app/workers/notifications/remove_all_worker.rb
index 8362ed2ae..1ff06c1cb 100644
--- a/app/workers/notifications/remove_all_worker.rb
+++ b/app/workers/notifications/remove_all_worker.rb
@@ -1,6 +1,6 @@
 module Notifications
   class RemoveAllWorker
-    include Sidekiq::Worker
+    include Sidekiq::Job
 
     sidekiq_options queue: :low_priority, retry: 10
 
diff --git a/app/workers/notifications/remove_old_notifications_worker.rb b/app/workers/notifications/remove_old_notifications_worker.rb
index d94ebe8ac..27b2ce524 100644
--- a/app/workers/notifications/remove_old_notifications_worker.rb
+++ b/app/workers/notifications/remove_old_notifications_worker.rb
@@ -1,6 +1,6 @@
 module Notifications
   class RemoveOldNotificationsWorker
-    include Sidekiq::Worker
+    include Sidekiq::Job
 
     sidekiq_options queue: :low_priority, retry: 10
 
diff --git a/app/workers/notifications/tag_adjustment_notification_worker.rb b/app/workers/notifications/tag_adjustment_notification_worker.rb
index 6ceb783d6..56fba8c8f 100644
--- a/app/workers/notifications/tag_adjustment_notification_worker.rb
+++ b/app/workers/notifications/tag_adjustment_notification_worker.rb
@@ -1,6 +1,6 @@
 module Notifications
   class TagAdjustmentNotificationWorker
-    include Sidekiq::Worker
+    include Sidekiq::Job
 
     sidekiq_options queue: :medium_priority, retry: 10
 
diff --git a/app/workers/notifications/update_worker.rb b/app/workers/notifications/update_worker.rb
index 1e2867ae6..16fad75f3 100644
--- a/app/workers/notifications/update_worker.rb
+++ b/app/workers/notifications/update_worker.rb
@@ -1,6 +1,6 @@
 module Notifications
   class UpdateWorker
-    include Sidekiq::Worker
+    include Sidekiq::Job
 
     sidekiq_options queue: :medium_priority, retry: 10, lock: :until_executing
 
diff --git a/app/workers/notifications/welcome_notification_worker.rb b/app/workers/notifications/welcome_notification_worker.rb
index 0c42fbfff..a71238e24 100644
--- a/app/workers/notifications/welcome_notification_worker.rb
+++ b/app/workers/notifications/welcome_notification_worker.rb
@@ -1,6 +1,6 @@
 module Notifications
   class WelcomeNotificationWorker
-    include Sidekiq::Worker
+    include Sidekiq::Job
     sidekiq_options queue: :low_priority, retry: 10
 
     def perform(receiver_id, broadcast_id)
diff --git a/app/workers/organizations/delete_worker.rb b/app/workers/organizations/delete_worker.rb
index dba4cf6ec..b248aa7eb 100644
--- a/app/workers/organizations/delete_worker.rb
+++ b/app/workers/organizations/delete_worker.rb
@@ -1,6 +1,6 @@
 module Organizations
   class DeleteWorker
-    include Sidekiq::Worker
+    include Sidekiq::Job
 
     sidekiq_options queue: :high_priority, retry: 10
 
diff --git a/app/workers/organizations/update_organization_articles_paths_worker.rb b/app/workers/organizations/update_organization_articles_paths_worker.rb
index f19285977..d611a719e 100644
--- a/app/workers/organizations/update_organization_articles_paths_worker.rb
+++ b/app/workers/organizations/update_organization_articles_paths_worker.rb
@@ -1,6 +1,6 @@
 module Organizations
   class UpdateOrganizationArticlesPathsWorker
-    include Sidekiq::Worker
+    include Sidekiq::Job
 
     sidekiq_options queue: :high_priority
 
diff --git a/app/workers/podcast_episodes/create_worker.rb b/app/workers/podcast_episodes/create_worker.rb
index 103aacf16..d539a1398 100644
--- a/app/workers/podcast_episodes/create_worker.rb
+++ b/app/workers/podcast_episodes/create_worker.rb
@@ -1,6 +1,6 @@
 module PodcastEpisodes
   class CreateWorker
-    include Sidekiq::Worker
+    include Sidekiq::Job
 
     sidekiq_options queue: :high_priority
 
diff --git a/app/workers/podcast_episodes/update_media_url_worker.rb b/app/workers/podcast_episodes/update_media_url_worker.rb
index 9331b6939..f5869d017 100644
--- a/app/workers/podcast_episodes/update_media_url_worker.rb
+++ b/app/workers/podcast_episodes/update_media_url_worker.rb
@@ -1,6 +1,6 @@
 module PodcastEpisodes
   class UpdateMediaUrlWorker
-    include Sidekiq::Worker
+    include Sidekiq::Job
 
     sidekiq_options queue: :medium_priority
 
diff --git a/app/workers/podcasts/enqueue_get_episodes_worker.rb b/app/workers/podcasts/enqueue_get_episodes_worker.rb
index 2042e006d..a4dbc63c7 100644
--- a/app/workers/podcasts/enqueue_get_episodes_worker.rb
+++ b/app/workers/podcasts/enqueue_get_episodes_worker.rb
@@ -1,6 +1,6 @@
 module Podcasts
   class EnqueueGetEpisodesWorker
-    include Sidekiq::Worker
+    include Sidekiq::Job
 
     sidekiq_options queue: :medium_priority, retry: 10
 
diff --git a/app/workers/podcasts/get_episodes_worker.rb b/app/workers/podcasts/get_episodes_worker.rb
index 47833e68b..d758ab040 100644
--- a/app/workers/podcasts/get_episodes_worker.rb
+++ b/app/workers/podcasts/get_episodes_worker.rb
@@ -1,6 +1,6 @@
 module Podcasts
   class GetEpisodesWorker
-    include Sidekiq::Worker
+    include Sidekiq::Job
 
     sidekiq_options queue: :high_priority, retry: 10
 
diff --git a/app/workers/push_notifications/cleanup_worker.rb b/app/workers/push_notifications/cleanup_worker.rb
index 702e679fb..2d781b61e 100644
--- a/app/workers/push_notifications/cleanup_worker.rb
+++ b/app/workers/push_notifications/cleanup_worker.rb
@@ -1,6 +1,6 @@
 module PushNotifications
   class CleanupWorker
-    include Sidekiq::Worker
+    include Sidekiq::Job
 
     sidekiq_options queue: :low_priority, retry: 10, lock: :until_and_while_executing
 
diff --git a/app/workers/push_notifications/deliver_worker.rb b/app/workers/push_notifications/deliver_worker.rb
index 7ffcf4187..f830d4e17 100644
--- a/app/workers/push_notifications/deliver_worker.rb
+++ b/app/workers/push_notifications/deliver_worker.rb
@@ -1,6 +1,6 @@
 module PushNotifications
   class DeliverWorker
-    include Sidekiq::Worker
+    include Sidekiq::Job
 
     sidekiq_options queue: :medium_priority,
                     retry: 10,
diff --git a/app/workers/rating_votes/assign_rating_worker.rb b/app/workers/rating_votes/assign_rating_worker.rb
index 9a13a54e0..567032ef9 100644
--- a/app/workers/rating_votes/assign_rating_worker.rb
+++ b/app/workers/rating_votes/assign_rating_worker.rb
@@ -1,6 +1,6 @@
 module RatingVotes
   class AssignRatingWorker
-    include Sidekiq::Worker
+    include Sidekiq::Job
 
     sidekiq_options queue: :low_priority, retry: 10, lock: :until_executing
 
diff --git a/app/workers/reactions/bust_homepage_cache_worker.rb b/app/workers/reactions/bust_homepage_cache_worker.rb
index d4869a91f..f5e0da8c2 100644
--- a/app/workers/reactions/bust_homepage_cache_worker.rb
+++ b/app/workers/reactions/bust_homepage_cache_worker.rb
@@ -1,6 +1,6 @@
 module Reactions
   class BustHomepageCacheWorker
-    include Sidekiq::Worker
+    include Sidekiq::Job
 
     sidekiq_options queue: :high_priority, retry: 10
 
diff --git a/app/workers/reactions/bust_reactable_cache_worker.rb b/app/workers/reactions/bust_reactable_cache_worker.rb
index e3abe6051..3962702a3 100644
--- a/app/workers/reactions/bust_reactable_cache_worker.rb
+++ b/app/workers/reactions/bust_reactable_cache_worker.rb
@@ -1,6 +1,6 @@
 module Reactions
   class BustReactableCacheWorker
-    include Sidekiq::Worker
+    include Sidekiq::Job
 
     sidekiq_options queue: :high_priority, retry: 10
 
diff --git a/app/workers/reactions/update_relevant_scores_worker.rb b/app/workers/reactions/update_relevant_scores_worker.rb
index b1b6a3cbf..c56bb82bc 100644
--- a/app/workers/reactions/update_relevant_scores_worker.rb
+++ b/app/workers/reactions/update_relevant_scores_worker.rb
@@ -1,6 +1,6 @@
 module Reactions
   class UpdateRelevantScoresWorker
-    include Sidekiq::Worker
+    include Sidekiq::Job
 
     sidekiq_options queue: :high_priority, retry: 10
 
diff --git a/app/workers/slack/messengers/worker.rb b/app/workers/slack/messengers/worker.rb
index 1360fc9fc..a2749deb6 100644
--- a/app/workers/slack/messengers/worker.rb
+++ b/app/workers/slack/messengers/worker.rb
@@ -1,7 +1,7 @@
 module Slack
   module Messengers
     class Worker
-      include Sidekiq::Worker
+      include Sidekiq::Job
 
       sidekiq_options queue: :default, retry: 10
 
diff --git a/app/workers/tags/alias_retag_worker.rb b/app/workers/tags/alias_retag_worker.rb
index cd39d467b..e22b14c75 100644
--- a/app/workers/tags/alias_retag_worker.rb
+++ b/app/workers/tags/alias_retag_worker.rb
@@ -1,6 +1,6 @@
 module Tags
   class AliasRetagWorker
-    include Sidekiq::Worker
+    include Sidekiq::Job
 
     sidekiq_options queue: :low_priority, retry: 5
 
diff --git a/app/workers/tags/resave_supported_tags_worker.rb b/app/workers/tags/resave_supported_tags_worker.rb
index 5b89248d8..bd700dd3e 100644
--- a/app/workers/tags/resave_supported_tags_worker.rb
+++ b/app/workers/tags/resave_supported_tags_worker.rb
@@ -1,6 +1,6 @@
 module Tags
   class ResaveSupportedTagsWorker
-    include Sidekiq::Worker
+    include Sidekiq::Job
 
     sidekiq_options queue: :low_priority, retry: 5
 
diff --git a/app/workers/users/delete_worker.rb b/app/workers/users/delete_worker.rb
index 02fdc45ee..73bdd2fab 100644
--- a/app/workers/users/delete_worker.rb
+++ b/app/workers/users/delete_worker.rb
@@ -1,6 +1,6 @@
 module Users
   class DeleteWorker
-    include Sidekiq::Worker
+    include Sidekiq::Job
 
     sidekiq_options queue: :high_priority, retry: 10
 
diff --git a/app/workers/users/follow_worker.rb b/app/workers/users/follow_worker.rb
index 13e0ec4a1..7db590d53 100644
--- a/app/workers/users/follow_worker.rb
+++ b/app/workers/users/follow_worker.rb
@@ -1,6 +1,6 @@
 module Users
   class FollowWorker
-    include Sidekiq::Worker
+    include Sidekiq::Job
     sidekiq_options queue: :high_priority, retry: 10, lock: :until_executed
 
     def perform(user_id, followable_id, followable_type)
diff --git a/app/workers/users/merge_sync_worker.rb b/app/workers/users/merge_sync_worker.rb
index 2a2615f45..9e247602e 100644
--- a/app/workers/users/merge_sync_worker.rb
+++ b/app/workers/users/merge_sync_worker.rb
@@ -1,6 +1,6 @@
 module Users
   class MergeSyncWorker
-    include Sidekiq::Worker
+    include Sidekiq::Job
 
     sidekiq_options queue: :high_priority, retry: 10
 
diff --git a/app/workers/users/record_field_test_event_worker.rb b/app/workers/users/record_field_test_event_worker.rb
index c90ea66c9..9eb8a5b95 100644
--- a/app/workers/users/record_field_test_event_worker.rb
+++ b/app/workers/users/record_field_test_event_worker.rb
@@ -1,6 +1,6 @@
 module Users
   class RecordFieldTestEventWorker
-    include Sidekiq::Worker
+    include Sidekiq::Job
     include FieldTest::Helpers
 
     sidekiq_options queue: :low_priority, retry: 10
diff --git a/app/workers/users/resave_articles_worker.rb b/app/workers/users/resave_articles_worker.rb
index 2b7f3daad..a1505b1ee 100644
--- a/app/workers/users/resave_articles_worker.rb
+++ b/app/workers/users/resave_articles_worker.rb
@@ -1,6 +1,6 @@
 module Users
   class ResaveArticlesWorker
-    include Sidekiq::Worker
+    include Sidekiq::Job
 
     sidekiq_options queue: :medium_priority, retry: 10, lock: :until_executing
 
diff --git a/app/workers/users/subscribe_to_mailchimp_newsletter_worker.rb b/app/workers/users/subscribe_to_mailchimp_newsletter_worker.rb
index 27f20daff..8e53b8995 100644
--- a/app/workers/users/subscribe_to_mailchimp_newsletter_worker.rb
+++ b/app/workers/users/subscribe_to_mailchimp_newsletter_worker.rb
@@ -1,6 +1,6 @@
 module Users
   class SubscribeToMailchimpNewsletterWorker
-    include Sidekiq::Worker
+    include Sidekiq::Job
     sidekiq_options queue: :low_priority, retry: 10, lock: :until_executed
 
     def perform(user_id)
diff --git a/spec/lib/sidekiq/honeycomb_middleware_spec.rb b/spec/lib/sidekiq/honeycomb_middleware_spec.rb
index 80d056054..1fdbf504e 100644
--- a/spec/lib/sidekiq/honeycomb_middleware_spec.rb
+++ b/spec/lib/sidekiq/honeycomb_middleware_spec.rb
@@ -1,7 +1,7 @@
 require "rails_helper"
 
 class TestSidekiqWorker
-  include Sidekiq::Worker
+  include Sidekiq::Job
   sidekiq_options queue: :low_priority
 
   def perform(arg = nil)
diff --git a/spec/rails_helper.rb b/spec/rails_helper.rb
index c25183660..0d1e0e63c 100644
--- a/spec/rails_helper.rb
+++ b/spec/rails_helper.rb
@@ -112,7 +112,7 @@ RSpec.configure do |config|
 
   config.before do
     # Worker jobs shouldn't linger around between tests
-    Sidekiq::Worker.clear_all
+    Sidekiq::Job.clear_all
     # Disable SSRF protection for CarrierWave specs
     # See: https://github.com/carrierwaveuploader/carrierwave/issues/2531
     # rubocop:disable RSpec/AnyInstance
diff --git a/spec/services/mentions/create_all_spec.rb b/spec/services/mentions/create_all_spec.rb
index 0da35c338..bfb9f0e8b 100644
--- a/spec/services/mentions/create_all_spec.rb
+++ b/spec/services/mentions/create_all_spec.rb
@@ -72,7 +72,7 @@ RSpec.shared_examples "valid notifiable and has mentions" do
     expect do
       set_markdown_and_save(notifiable, "Hello, you are cool.")
       described_class.call(notifiable)
-      Sidekiq::Worker.drain_all
+      Sidekiq::Job.drain_all
     end
       .to change { Mention.all.size }.by(-1)
       .and change { Notification.all.size }.by(-1)
diff --git a/spec/support/sidekiq_test_helpers.rb b/spec/support/sidekiq_test_helpers.rb
index a6f753177..8057abd91 100644
--- a/spec/support/sidekiq_test_helpers.rb
+++ b/spec/support/sidekiq_test_helpers.rb
@@ -10,7 +10,7 @@ module SidekiqTestHelpers
     return Sidekiq::Queues.jobs_by_queue[queue.to_s] if queue
     return Sidekiq::Queues.jobs_by_worker[worker.to_s] if worker
 
-    Sidekiq::Worker.jobs
+    Sidekiq::Job.jobs
   end
 
   # Asserts that the number of enqueued jobs matches the given number.
@@ -89,7 +89,7 @@ module SidekiqTestHelpers
 
   # Perform all Sidekiq jobs until there are no longer any in the queues
   def drain_all_sidekiq_jobs
-    sidekiq_perform_enqueued_jobs while Sidekiq::Worker.jobs.any?
+    sidekiq_perform_enqueued_jobs while Sidekiq::Job.jobs.any?
   end
 
   class Utils
@@ -108,7 +108,7 @@ module SidekiqTestHelpers
       def enqueued_jobs_size(only: nil, except: nil, queue: nil)
         validate_option(only: only, except: except)
 
-        Sidekiq::Worker.jobs.count do |job|
+        Sidekiq::Job.jobs.count do |job|
           job_class = job.fetch("class")
           if only
             next false unless Array(only).include?(job_class.constantize)