Summary: This is a forked version with some enhancements to produce better traces.

Test Plan: None yet.

Reviewers: michelle, oazizi, #engineering

Reviewed By: oazizi, #engineering

JIRA Issues: PL-795

Differential Revision: https://phab.corp.pixielabs.ai/D2568

GitOrigin-RevId: 823a820fc85aabf29b7d46c1d1d5b28007d158ce