Add latest changes from gitlab-org/gitlab@15-8-stable-eev15.8.0-rc42

1 files changed, 4 insertions, 4 deletions

diff --git a/app/services/service_ping/submit_service.rb b/app/services/service_ping/submit_service.rb
index da2a51562f8..6d39174b6c7 100644
--- a/app/services/service_ping/submit_service.rb
+++ b/app/services/service_ping/submit_service.rb
@@ -42,20 +42,20 @@ module ServicePing
       {
         metadata: {
           uuid: service_ping_payload[:uuid],
-          metrics: metrics_collection_time(service_ping_payload)
+          metrics: metrics_collection_metadata(service_ping_payload)
         }
       }
     end
 
-    def metrics_collection_time(payload, parents = [])
+    def metrics_collection_metadata(payload, parents = [])
       return [] unless payload.is_a?(Hash)
 
       payload.flat_map do |key, metric_value|
         key_path = parents.dup.append(key)
         if metric_value.respond_to?(:duration)
-          { name: key_path.join('.'), time_elapsed: metric_value.duration }
+          { name: key_path.join('.'), time_elapsed: metric_value.duration, error: metric_value.error }.compact
         else
-          metrics_collection_time(metric_value, key_path)
+          metrics_collection_metadata(metric_value, key_path)
         end
       end
     end