summaryrefslogtreecommitdiff
path: root/app/services/service_ping
diff options
context:
space:
mode:
authorGitLab Bot <gitlab-bot@gitlab.com>2022-04-27 09:10:46 +0000
committerGitLab Bot <gitlab-bot@gitlab.com>2022-04-27 09:10:46 +0000
commit359bc6940b1205035e14f028b75d0c9c80a1fd5e (patch)
treec98c5db8976bfe1cb3d837a0f2af065fb0986e6d /app/services/service_ping
parentb2382918e433a0ba0e1b4e0d2835abd562cbd103 (diff)
downloadgitlab-ce-359bc6940b1205035e14f028b75d0c9c80a1fd5e.tar.gz
Add latest changes from gitlab-org/gitlab@master
Diffstat (limited to 'app/services/service_ping')
-rw-r--r--app/services/service_ping/submit_service.rb8
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 ed6eb071f32..58b46207b8b 100644
--- a/app/services/service_ping/submit_service.rb
+++ b/app/services/service_ping/submit_service.rb
@@ -26,10 +26,10 @@ module ServicePing
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,
+ uuid: Gitlab::CurrentSettings.uuid,
+ hostname: Gitlab.config.gitlab.host,
+ version: Gitlab.version_info.to_s,
+ message: "#{e.message.presence || e.class} at #{e.backtrace[0]}",
elapsed: (Time.current - start).round(1)
}
submit_payload({ error: error_payload }, path: ERROR_PATH)