Added sql tracing
Added RPC trace

Change-Id: I4b602abdf766df57217da2c705f05ff0cb6afe55