fix bug and add support for datadog
add missed files