As discussed this morning, this is what I think we should do: https://github.com/DataDog/dd-agent/issues/620