diff --git a/app/services/clusters/applications/base_helm_service.rb b/app/services/clusters/applications/base_helm_service.rb index 9619cba533c..0e3991b47b7 100644 --- a/app/services/clusters/applications/base_helm_service.rb +++ b/app/services/clusters/applications/base_helm_service.rb @@ -19,11 +19,14 @@ module Clusters app_id: app.id, project_ids: app.cluster.project_ids, group_ids: app.cluster.group_ids, - message: error.message, - backtrace: Gitlab::Profiler.clean_backtrace(error.backtrace) + message: error.message } - logger.error(meta) + logger_meta = meta.merge( + backtrace: Gitlab::Profiler.clean_backtrace(error.backtrace) + ) + + logger.error(logger_meta) Gitlab::Sentry.track_acceptable_exception(error, extra: meta) end 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 c38baa76b25..e2f1a18e9f6 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 @@ -5,7 +5,6 @@ shared_examples 'logs kubernetes errors' do { exception: error_name, message: error_message, - backtrace: instance_of(Array), service: service.class.name, app_id: application.id, project_ids: application.cluster.project_ids, @@ -14,8 +13,14 @@ shared_examples 'logs kubernetes errors' do } end + let(:logger_hash) do + error_hash.merge( + backtrace: instance_of(Array) + ) + end + it 'logs into kubernetes.log and Sentry' do - expect(service.send(:logger)).to receive(:error).with(error_hash) + expect(service.send(:logger)).to receive(:error).with(logger_hash) expect(Gitlab::Sentry).to receive(:track_acceptable_exception).with( error,