SONAR-4898 improve logging