Merge branch 'dm-remove-prune-web-hook-logs-worker' into 'master'

Remove RemoveOldWebHookLogsWorker

Closes #52592

See merge request gitlab-org/gitlab-ce!23628

6 files changed, 14 insertions, 44 deletions

diff --git a/app/workers/all_queues.yml b/app/workers/all_queues.yml
index d9fd395c5ec..672c77539af 100644
--- a/app/workers/all_queues.yml
+++ b/app/workers/all_queues.yml
@@ -10,7 +10,6 @@
 - cronjob:prune_old_events
 - cronjob:remove_expired_group_links
 - cronjob:remove_expired_members
-- cronjob:remove_old_web_hook_logs
 - cronjob:remove_unreferenced_lfs_objects
 - cronjob:repository_archive_cache
 - cronjob:repository_check_dispatch
diff --git a/app/workers/remove_old_web_hook_logs_worker.rb b/app/workers/remove_old_web_hook_logs_worker.rb
deleted file mode 100644
index 0f486f8991d..00000000000
--- a/app/workers/remove_old_web_hook_logs_worker.rb
+++ /dev/null
@@ -1,14 +0,0 @@
-# frozen_string_literal: true
-
-class RemoveOldWebHookLogsWorker
-  include ApplicationWorker
-  include CronjobQueue
-
-  WEB_HOOK_LOG_LIFETIME = 2.days
-
-  # rubocop: disable DestroyAll
-  def perform
-    WebHookLog.destroy_all(['created_at < ?', Time.now - WEB_HOOK_LOG_LIFETIME])
-  end
-  # rubocop: enable DestroyAll
-end
diff --git a/changelogs/unreleased/dm-remove-prune-web-hook-logs-worker.yml b/changelogs/unreleased/dm-remove-prune-web-hook-logs-worker.yml
new file mode 100644
index 00000000000..fb0c508400c
--- /dev/null
+++ b/changelogs/unreleased/dm-remove-prune-web-hook-logs-worker.yml
@@ -0,0 +1,5 @@
+---
+title: Remove old webhook logs after 90 days, as documented, instead of after 2
+merge_request:
+author:
+type: fixed
diff --git a/config/initializers/1_settings.rb b/config/initializers/1_settings.rb
index 82e3b490378..db35fa96ea2 100644
--- a/config/initializers/1_settings.rb
+++ b/config/initializers/1_settings.rb
@@ -302,10 +302,6 @@ Settings.cron_jobs['gitlab_usage_ping_worker'] ||= Settingslogic.new({})
 Settings.cron_jobs['gitlab_usage_ping_worker']['cron'] ||= Settings.__send__(:cron_for_usage_ping)
 Settings.cron_jobs['gitlab_usage_ping_worker']['job_class'] = 'GitlabUsagePingWorker'
 
-Settings.cron_jobs['remove_old_web_hook_logs_worker'] ||= Settingslogic.new({})
-Settings.cron_jobs['remove_old_web_hook_logs_worker']['cron'] ||= '40 0 * * *'
-Settings.cron_jobs['remove_old_web_hook_logs_worker']['job_class'] = 'RemoveOldWebHookLogsWorker'
-
 Settings.cron_jobs['stuck_merge_jobs_worker'] ||= Settingslogic.new({})
 Settings.cron_jobs['stuck_merge_jobs_worker']['cron'] ||= '0 */2 * * *'
 Settings.cron_jobs['stuck_merge_jobs_worker']['job_class'] = 'StuckMergeJobsWorker'
diff --git a/spec/workers/prune_web_hook_logs_worker_spec.rb b/spec/workers/prune_web_hook_logs_worker_spec.rb
index d7d64a1f641..b3ec71d4a00 100644
--- a/spec/workers/prune_web_hook_logs_worker_spec.rb
+++ b/spec/workers/prune_web_hook_logs_worker_spec.rb
@@ -5,18 +5,20 @@ describe PruneWebHookLogsWorker do
     before do
       hook = create(:project_hook)
 
-      5.times do
-        create(:web_hook_log, web_hook: hook, created_at: 5.months.ago)
-      end
-
+      create(:web_hook_log, web_hook: hook, created_at: 5.months.ago)
+      create(:web_hook_log, web_hook: hook, created_at: 4.months.ago)
+      create(:web_hook_log, web_hook: hook, created_at: 91.days.ago)
+      create(:web_hook_log, web_hook: hook, created_at: 89.days.ago)
+      create(:web_hook_log, web_hook: hook, created_at: 2.months.ago)
+      create(:web_hook_log, web_hook: hook, created_at: 1.month.ago)
       create(:web_hook_log, web_hook: hook, response_status: '404')
     end
 
-    it 'removes all web hook logs older than one month' do
+    it 'removes all web hook logs older than 90 days' do
       described_class.new.perform
 
-      expect(WebHookLog.count).to eq(1)
-      expect(WebHookLog.first.response_status).to eq('404')
+      expect(WebHookLog.count).to eq(4)
+      expect(WebHookLog.last.response_status).to eq('404')
     end
   end
 end
diff --git a/spec/workers/remove_old_web_hook_logs_worker_spec.rb b/spec/workers/remove_old_web_hook_logs_worker_spec.rb
deleted file mode 100644
index 6d26ba5dfa0..00000000000
--- a/spec/workers/remove_old_web_hook_logs_worker_spec.rb
+++ /dev/null
@@ -1,18 +0,0 @@
-require 'spec_helper'
-
-describe RemoveOldWebHookLogsWorker do
-  subject { described_class.new }
-
-  describe '#perform' do
-    let!(:week_old_record) { create(:web_hook_log, created_at: Time.now - 1.week) }
-    let!(:three_days_old_record) { create(:web_hook_log, created_at: Time.now - 3.days) }
-    let!(:one_day_old_record) { create(:web_hook_log, created_at: Time.now - 1.day) }
-
-    it 'removes web hook logs older than 2 days' do
-      subject.perform
-
-      expect(WebHookLog.all).to include(one_day_old_record)
-      expect(WebHookLog.all).not_to include(week_old_record, three_days_old_record)
-    end
-  end
-end