Merge "Add support for customizing the ProtoLogDataSource name for testing" into main