Slightly modify server to extend the boundary of where the xtrace
context is cleared.
Removed all resource tracing stuff,  which will be moved to a new
branch.