Added custom annotations to logs in query-related functionality in client- and server-side code for PHOENIX-1198