diff --git a/app/services/clusters/applications/base_helm_service.rb b/app/services/clusters/applications/base_helm_service.rb index 0e3991b47b7b16806de7884852b297c63122cdaf..adaa68b1efbdca999af568a57c24d4d4bbb4a9a3 100644 --- a/app/services/clusters/applications/base_helm_service.rb +++ b/app/services/clusters/applications/base_helm_service.rb @@ -13,16 +13,16 @@ def initialize(app) 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 e2f1a18e9f6d03892915caaf31169018d7cbd6c5..78a8e49fd76b3c7412c67613294714ad11917782 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 @@ let(:logger_hash) do error_hash.merge( + exception: error_name, + message: error_message, backtrace: instance_of(Array) ) end