From a841df870f11fab55c388212226d3e3fd83c8bdf Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Mon, 7 Oct 2024 21:51:07 +0000 Subject: [PATCH 1/2] Bump govuk_sidekiq from 8.0.1 to 9.0.1 Bumps [govuk_sidekiq](https://github.com/alphagov/govuk_sidekiq) from 8.0.1 to 9.0.1. - [Changelog](https://github.com/alphagov/govuk_sidekiq/blob/main/CHANGELOG.md) - [Commits](https://github.com/alphagov/govuk_sidekiq/compare/v8.0.1...v9.0.1) --- updated-dependencies: - dependency-name: govuk_sidekiq dependency-type: direct:production update-type: version-update:semver-major ... Signed-off-by: dependabot[bot] --- Gemfile.lock | 27 ++++++++++++++------------- 1 file changed, 14 insertions(+), 13 deletions(-) diff --git a/Gemfile.lock b/Gemfile.lock index c7df7b50..686ee002 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -201,12 +201,11 @@ GEM rouge sprockets (>= 3) sprockets-rails - govuk_sidekiq (8.0.1) + govuk_sidekiq (9.0.1) gds-api-adapters (>= 19.1.0) govuk_app_config (>= 1.1) - redis (< 5) - redis-namespace (~> 1.6) - sidekiq (~> 6.5, >= 6.5.12) + redis-client (>= 0.22.2) + sidekiq (~> 7.0, < 8) govuk_test (4.1.0) brakeman (>= 5.0.2) capybara (>= 3.36) @@ -266,9 +265,10 @@ GEM marcel (1.0.4) matrix (0.4.2) method_source (1.0.0) - mime-types (3.5.2) + mime-types (3.6.0) + logger mime-types-data (~> 3.2015) - mime-types-data (3.2024.0820) + mime-types-data (3.2024.1001) mini_mime (1.1.5) mini_portile2 (2.8.7) minitest (5.25.1) @@ -573,9 +573,8 @@ GEM rake (13.2.1) rdoc (6.7.0) psych (>= 4.0.0) - redis (4.8.1) - redis-namespace (1.11.0) - redis (>= 4) + redis-client (0.22.2) + connection_pool regexp_parser (2.9.2) reline (0.5.10) io-console (~> 0.5) @@ -662,10 +661,12 @@ GEM sentry-sidekiq (5.20.1) sentry-ruby (~> 5.20.1) sidekiq (>= 3.0) - sidekiq (6.5.12) - connection_pool (>= 2.2.5, < 3) - rack (~> 2.0) - redis (>= 4.5.0, < 5) + sidekiq (7.3.2) + concurrent-ruby (< 2) + connection_pool (>= 2.3.0) + logger + rack (>= 2.2.4) + redis-client (>= 0.22.2) simplecov (0.22.0) docile (~> 1.1) simplecov-html (~> 0.11) From a690c1a3da8e9e118485f99a204b0cef68c0d0f4 Mon Sep 17 00:00:00 2001 From: Aga Dufrat Date: Fri, 18 Oct 2024 11:58:52 +0100 Subject: [PATCH 2/2] Rename `CsvExportWorker` -> `CsvExportJob` Sidekiq::Worker has been deprecated in Sidekiq 7. This replaces all instances of Sidekiq::Worker with Sidekiq::Job and renames/moves workers to app/sidekiq/MyJob.rb. --- app/controllers/content_controller.rb | 2 +- .../csv_export_worker.rb => sidekiq/csv_export_job.rb} | 6 ++++-- spec/{workers => sidekiq}/concerns/file_storage_spec.rb | 0 .../csv_export_job_spec.rb} | 4 ++-- 4 files changed, 7 insertions(+), 5 deletions(-) rename app/{workers/csv_export_worker.rb => sidekiq/csv_export_job.rb} (93%) rename spec/{workers => sidekiq}/concerns/file_storage_spec.rb (100%) rename spec/{workers/csv_export_worker_spec.rb => sidekiq/csv_export_job_spec.rb} (98%) diff --git a/app/controllers/content_controller.rb b/app/controllers/content_controller.rb index 8719a65b..a951998a 100644 --- a/app/controllers/content_controller.rb +++ b/app/controllers/content_controller.rb @@ -21,7 +21,7 @@ def export_csv @recipient = current_user.email start_time_string = Time.zone.now.to_s - CsvExportWorker.perform_async(search_params.stringify_keys, @recipient, start_time_string) + CsvExportJob.perform_async(search_params.stringify_keys, @recipient, start_time_string) end private diff --git a/app/workers/csv_export_worker.rb b/app/sidekiq/csv_export_job.rb similarity index 93% rename from app/workers/csv_export_worker.rb rename to app/sidekiq/csv_export_job.rb index 6c5a7d8b..a0cf688a 100644 --- a/app/workers/csv_export_worker.rb +++ b/app/sidekiq/csv_export_job.rb @@ -1,9 +1,9 @@ require "prometheus/client" require "prometheus/client/push" -class CsvExportWorker +class CsvExportJob include FileStorage - include Sidekiq::Worker + include Sidekiq::Job sidekiq_options retry: 0 sidekiq_options queue: "export_csv" @@ -61,3 +61,5 @@ def push_metrics_to_pushgateway(elapsed_time_seconds) ).add(prometheus_registry) end end + +CsvExportWorker = CsvExportJob ## TODO: Remove once queued jobs at the time of the upgrade are complete diff --git a/spec/workers/concerns/file_storage_spec.rb b/spec/sidekiq/concerns/file_storage_spec.rb similarity index 100% rename from spec/workers/concerns/file_storage_spec.rb rename to spec/sidekiq/concerns/file_storage_spec.rb diff --git a/spec/workers/csv_export_worker_spec.rb b/spec/sidekiq/csv_export_job_spec.rb similarity index 98% rename from spec/workers/csv_export_worker_spec.rb rename to spec/sidekiq/csv_export_job_spec.rb index 58e57426..ac284db1 100644 --- a/spec/workers/csv_export_worker_spec.rb +++ b/spec/sidekiq/csv_export_job_spec.rb @@ -1,6 +1,6 @@ require "govuk_sidekiq/testing" -RSpec.describe CsvExportWorker do +RSpec.describe CsvExportJob do let(:search_params) do { date_range: "past-30-days", @@ -68,7 +68,7 @@ let(:csv_export_histogram) { instance_spy(Prometheus::Client::Histogram) } before do - Sidekiq::Worker.clear_all + Sidekiq::Job.clear_all ENV["AWS_CSV_EXPORT_BUCKET_NAME"] = "test-bucket" ENV["PROMETHEUS_PUSHGATEWAY_URL"] = "http://prometheus-pushgateway.local"