Merge branch '343695-upgrade-sidekiq-cron' into 'master'

Upgrade sidekiq-cron gem

See merge request gitlab-org/gitlab!73356

Gemfile

@@ -196,7 +196,7 @@ gem 'acts-as-taggable-on', '~> 9.0'
 
 # Background jobs
 gem 'sidekiq', '~> 6.3'
-gem 'sidekiq-cron', '~> 1.0'
+gem 'sidekiq-cron', '~> 1.2'
 gem 'redis-namespace', '~> 1.8.1'
 gem 'gitlab-sidekiq-fetcher', '0.8.0', require: 'sidekiq-reliable-fetch'
 

Gemfile.lock

@@ -1183,7 +1183,7 @@ GEM
       connection_pool (>= 2.2.2)
       rack (~> 2.0)
       redis (>= 4.2.0)
-    sidekiq-cron (1.0.4)
+    sidekiq-cron (1.2.0)
       fugit (~> 1.1)
       sidekiq (>= 4.2.1)
     signet (0.14.0)
@@ -1630,7 +1630,7 @@ DEPENDENCIES
   settingslogic (~> 2.0.9)
   shoulda-matchers (~> 4.0.1)
   sidekiq (~> 6.3)
-  sidekiq-cron (~> 1.0)
+  sidekiq-cron (~> 1.2)
   simple_po_parser (~> 1.1.2)
   simplecov (~> 0.18.5)
   simplecov-cobertura (~> 1.3.1)

lib/gitlab/sidekiq_logging/json_formatter.rb

@@ -2,6 +2,7 @@
 
 # This is needed for sidekiq-cluster
 require 'json'
+require 'sidekiq/job_retry'
 
 module Gitlab
   module SidekiqLogging

lib/gitlab/sidekiq_logging/structured_logger.rb

@@ -2,6 +2,8 @@
 
 require 'active_record'
 require 'active_record/log_subscriber'
+require 'sidekiq/job_logger'
+require 'sidekiq/job_retry'
 
 module Gitlab
   module SidekiqLogging

lib/gitlab/sidekiq_middleware/monitor.rb

 # frozen_string_literal: true
 
+require 'sidekiq/job_retry'
+
 module Gitlab
   module SidekiqMiddleware
     class Monitor