Add latest changes from gitlab-org/gitlab@15-2-stable-eev15.2.0-rc42

1 files changed, 10 insertions, 3 deletions

diff --git a/app/services/service_ping/submit_service.rb b/app/services/service_ping/submit_service.rb
index b850592f7ba..89cb14e6fff 100644
--- a/app/services/service_ping/submit_service.rb
+++ b/app/services/service_ping/submit_service.rb
@@ -52,15 +52,22 @@ module ServicePing
         ServicePing::DevopsReport.new(response).execute
       end
 
-      return unless Feature.enabled?(:measure_service_ping_metric_collection)
-
-      submit_payload({ metadata: { metrics: metrics_collection_time(usage_data) } }, path: METADATA_PATH)
+      submit_payload(metadata(usage_data), path: METADATA_PATH)
     end
 
     private
 
     attr_reader :payload, :skip_db_write
 
+    def metadata(service_ping_payload)
+      {
+        metadata: {
+          uuid: service_ping_payload[:uuid],
+          metrics: metrics_collection_time(service_ping_payload)
+        }
+      }
+    end
+
     def metrics_collection_time(payload, parents = [])
       return [] unless payload.is_a?(Hash)