[fix bug 1115669] Tag events with new metrics.
Merge pull request #895 from akatsoulas/1115669-new-metrics

[fix bug 1115669] Tag events with new metrics.