diff options
author | Thong Kuah <tkuah@gitlab.com> | 2019-04-04 14:50:43 +1300 |
---|---|---|
committer | Thong Kuah <tkuah@gitlab.com> | 2019-04-04 17:40:52 +1300 |
commit | b8ad7f94d50e805454c64bbdc39d5e5008ca78e7 (patch) | |
tree | 3beb716a994f4237dc77ad5787fc9e5ba31704e2 | |
parent | 6655e997253c3cfdffee86c01157b6129bcb83c5 (diff) | |
download | gitlab-ce-add_backtrace_to_kubernetes_log.tar.gz |
Do not send error name and message to Sentryadd_backtrace_to_kubernetes_log
It's duplication information as we already send the full error object to
Sentry.
-rw-r--r-- | app/services/clusters/applications/base_helm_service.rb | 6 | ||||
-rw-r--r-- | spec/support/shared_examples/services/base_helm_service_shared_examples.rb | 4 |
2 files changed, 5 insertions, 5 deletions
diff --git a/app/services/clusters/applications/base_helm_service.rb b/app/services/clusters/applications/base_helm_service.rb index 0e3991b47b7..adaa68b1efb 100644 --- a/app/services/clusters/applications/base_helm_service.rb +++ b/app/services/clusters/applications/base_helm_service.rb @@ -13,16 +13,16 @@ module Clusters def log_error(error) meta = { - exception: error.class.name, error_code: error.respond_to?(:error_code) ? error.error_code : nil, service: self.class.name, app_id: app.id, project_ids: app.cluster.project_ids, - group_ids: app.cluster.group_ids, - message: error.message + group_ids: app.cluster.group_ids } logger_meta = meta.merge( + exception: error.class.name, + message: error.message, backtrace: Gitlab::Profiler.clean_backtrace(error.backtrace) ) diff --git a/spec/support/shared_examples/services/base_helm_service_shared_examples.rb b/spec/support/shared_examples/services/base_helm_service_shared_examples.rb index e2f1a18e9f6..78a8e49fd76 100644 --- a/spec/support/shared_examples/services/base_helm_service_shared_examples.rb +++ b/spec/support/shared_examples/services/base_helm_service_shared_examples.rb @@ -3,8 +3,6 @@ shared_examples 'logs kubernetes errors' do let(:error_hash) do { - exception: error_name, - message: error_message, service: service.class.name, app_id: application.id, project_ids: application.cluster.project_ids, @@ -15,6 +13,8 @@ shared_examples 'logs kubernetes errors' do let(:logger_hash) do error_hash.merge( + exception: error_name, + message: error_message, backtrace: instance_of(Array) ) end |