SONAR-5793 Enhance logs