Merge branch '30469-convdev-index' into 'master'

ConvDev Index

Closes #30469

See merge request !11377

1 files changed, 3 insertions, 15 deletions

diff --git a/app/workers/gitlab_usage_ping_worker.rb b/app/workers/gitlab_usage_ping_worker.rb
index 2f02235b0ac..0a55aab63fd 100644
--- a/app/workers/gitlab_usage_ping_worker.rb
+++ b/app/workers/gitlab_usage_ping_worker.rb
@@ -3,29 +3,17 @@ class GitlabUsagePingWorker
 
   include Sidekiq::Worker
   include CronjobQueue
-  include HTTParty
 
   def perform
-    return unless current_application_settings.usage_ping_enabled
-
     # Multiple Sidekiq workers could run this. We should only do this at most once a day.
     return unless try_obtain_lease
 
-    begin
-      HTTParty.post(url,
-                    body: Gitlab::UsageData.to_json(force_refresh: true),
-                    headers: { 'Content-type' => 'application/json' }
-                   )
-    rescue HTTParty::Error => e
-      Rails.logger.info "Unable to contact GitLab, Inc.: #{e}"
-    end
+    SubmitUsagePingService.new.execute
   end
 
+  private
+
   def try_obtain_lease
     Gitlab::ExclusiveLease.new('gitlab_usage_ping_worker:ping', timeout: LEASE_TIMEOUT).try_obtain
   end
-
-  def url
-    'https://version.gitlab.com/usage_data'
-  end
 end