Fix tracibility wrapper to ensure traceid/spanid are captured on subsequent invocations Resolves #1198