Merge "Add txBytes and rxBytes to RecordUpstreamEvent" into main