Merge branch '332565-remove-usage-ping-sidekiq-queue' into 'master'

Remove GitlabUsagePingWorker

See merge request gitlab-org/gitlab!65868

app/workers/all_queues.yml

@@ -274,15 +274,6 @@
   :weight: 1
   :idempotent:
   :tags: []
-- :name: cronjob:gitlab_usage_ping
-  :worker_name: GitlabUsagePingWorker
-  :feature_category: :service_ping
-  :has_external_dependencies:
-  :urgency: :low
-  :resource_boundary: :unknown
-  :weight: 1
-  :idempotent:
-  :tags: []
 - :name: cronjob:import_export_project_cleanup
   :worker_name: ImportExportProjectCleanupWorker
   :feature_category: :importers

app/workers/gitlab_usage_ping_worker.rb

-# frozen_string_literal: true
-
-class GitlabUsagePingWorker < GitlabServicePingWorker # rubocop:disable Scalability/IdempotentWorker
-end

config/initializers/1_settings.rb

@@ -498,9 +498,6 @@ Settings.cron_jobs['jira_import_stuck_jira_import_jobs']['job_class'] = 'Gitlab:
 Settings.cron_jobs['stuck_export_jobs_worker'] ||= Settingslogic.new({})
 Settings.cron_jobs['stuck_export_jobs_worker']['cron'] ||= '30 * * * *'
 Settings.cron_jobs['stuck_export_jobs_worker']['job_class'] = 'StuckExportJobsWorker'
-Settings.cron_jobs['gitlab_usage_ping_worker'] ||= Settingslogic.new({})
-Settings.cron_jobs['gitlab_usage_ping_worker']['cron'] ||= nil # This is dynamically loaded in the sidekiq initializer
-Settings.cron_jobs['gitlab_usage_ping_worker']['job_class'] = 'GitlabUsagePingWorker'
 Settings.cron_jobs['gitlab_service_ping_worker'] ||= Settingslogic.new({})
 Settings.cron_jobs['gitlab_service_ping_worker']['cron'] ||= nil # This is dynamically loaded in the sidekiq initializer
 Settings.cron_jobs['gitlab_service_ping_worker']['job_class'] = 'GitlabServicePingWorker'

spec/workers/every_sidekiq_worker_spec.rb

@@ -288,7 +288,6 @@ RSpec.describe 'Every Sidekiq worker' do
         'GitlabPerformanceBarStatsWorker' => 3,
         'GitlabShellWorker' => 3,
         'GitlabServicePingWorker' => 3,
-        'GitlabUsagePingWorker' => 3,
         'GroupDestroyWorker' => 3,
         'GroupExportWorker' => false,
         'GroupImportWorker' => false,

spec/workers/gitlab_usage_ping_worker_spec.rb

-# frozen_string_literal: true
-
-require 'spec_helper'
-
-RSpec.describe GitlabUsagePingWorker, :clean_gitlab_redis_shared_state do
-  before do
-    allow_next_instance_of(ServicePing::SubmitService) { |service| allow(service).to receive(:execute) }
-    allow(subject).to receive(:sleep)
-  end
-
-  it 'does not run for GitLab.com' do
-    allow(Gitlab).to receive(:com?).and_return(true)
-    expect(ServicePing::SubmitService).not_to receive(:new)
-
-    subject.perform
-  end
-
-  it 'delegates to ServicePing::SubmitService' do
-    expect_next_instance_of(ServicePing::SubmitService) { |service| expect(service).to receive(:execute) }
-
-    subject.perform
-  end
-
-  it "obtains a #{described_class::LEASE_TIMEOUT} second exclusive lease" do
-    expect(Gitlab::ExclusiveLeaseHelpers::SleepingLock)
-      .to receive(:new)
-      .with(described_class::LEASE_KEY, hash_including(timeout: described_class::LEASE_TIMEOUT))
-      .and_call_original
-
-    subject.perform
-  end
-
-  it 'sleeps for between 0 and 60 seconds' do
-    expect(subject).to receive(:sleep).with(0..60)
-
-    subject.perform
-  end
-
-  context 'when lease is not obtained' do
-    before do
-      Gitlab::ExclusiveLease.new(described_class::LEASE_KEY, timeout: described_class::LEASE_TIMEOUT).try_obtain
-    end
-
-    it 'does not invoke ServicePing::SubmitService' do
-      allow_next_instance_of(ServicePing::SubmitService) { |service| expect(service).not_to receive(:execute) }
-
-      expect { subject.perform }.to raise_error(Gitlab::ExclusiveLeaseHelpers::FailedToObtainLockError)
-    end
-  end
-end