Tracing custom annotations for PHOENIX-1196

First pass at PHOENIX-1196