Add latest changes from gitlab-org/gitlab@14-8-stable-eev14.8.0-rc42

2 files changed, 21 insertions, 5 deletions

diff --git a/app/services/service_ping/build_payload_service.rb b/app/services/service_ping/build_payload_service.rb
index 2bef3d32103..f4ae939fd07 100644
--- a/app/services/service_ping/build_payload_service.rb
+++ b/app/services/service_ping/build_payload_service.rb
@@ -19,7 +19,7 @@ module ServicePing
     end
 
     def raw_payload
-      @raw_payload ||= ::Gitlab::UsageData.data(force_refresh: true)
+      @raw_payload ||= ::Gitlab::Usage::ServicePingReport.for(output: :all_metrics_values)
     end
   end
 end
diff --git a/app/services/service_ping/submit_service.rb b/app/services/service_ping/submit_service.rb
index d3d9dcecb2b..c8733bc2f11 100644
--- a/app/services/service_ping/submit_service.rb
+++ b/app/services/service_ping/submit_service.rb
@@ -5,6 +5,7 @@ module ServicePing
     PRODUCTION_BASE_URL = 'https://version.gitlab.com'
     STAGING_BASE_URL = 'https://gitlab-services-version-gitlab-com-staging.gs-staging.gitlab.org'
     USAGE_DATA_PATH = 'usage_data'
+    ERROR_PATH = 'usage_ping_errors'
 
     SubmissionError = Class.new(StandardError)
 
@@ -15,13 +16,24 @@ module ServicePing
     def execute
       return unless ServicePing::ServicePingSettings.product_intelligence_enabled?
 
+      start = Time.current
       begin
         usage_data = BuildPayloadService.new.execute
         response = submit_usage_data_payload(usage_data)
-      rescue StandardError
+      rescue StandardError => e
         return unless Gitlab::CurrentSettings.usage_ping_enabled?
 
-        usage_data = Gitlab::UsageData.data(force_refresh: true)
+        error_payload = {
+          time: Time.current,
+          uuid: Gitlab::UsageData.add_metric('UuidMetric'),
+          hostname: Gitlab::UsageData.add_metric('HostnameMetric'),
+          version: Gitlab::UsageData.alt_usage_data { Gitlab::VERSION },
+          message: e.message,
+          elapsed: (Time.current - start).round(1)
+        }
+        submit_payload({ error: error_payload }, url: error_url)
+
+        usage_data = Gitlab::Usage::ServicePingReport.for(output: :all_metrics_values)
         response = submit_usage_data_payload(usage_data)
       end
 
@@ -42,12 +54,16 @@ module ServicePing
       URI.join(base_url, USAGE_DATA_PATH)
     end
 
+    def error_url
+      URI.join(base_url, ERROR_PATH)
+    end
+
     private
 
-    def submit_payload(usage_data)
+    def submit_payload(payload, url: self.url)
       Gitlab::HTTP.post(
         url,
-        body: usage_data.to_json,
+        body: payload.to_json,
         allow_local_requests: true,
         headers: { 'Content-type' => 'application/json' }
       )