fixed some code level issues
added support for tracing pubsub as well