Add xtrace field to protobuf headers.  Save and restore headers in client.  Add AspectJ as dependency to main pom