fixup samples and add support for prefixing tracing.