multiple fixes to the custom metrics collection facilities

1 files changed, 6 insertions, 5 deletions

diff --git a/kamon-newrelic/src/main/scala/kamon/newrelic/MetricTranslator.scala b/kamon-newrelic/src/main/scala/kamon/newrelic/MetricTranslator.scala
index 0162dd9c..46e22571 100644
--- a/kamon-newrelic/src/main/scala/kamon/newrelic/MetricTranslator.scala
+++ b/kamon-newrelic/src/main/scala/kamon/newrelic/MetricTranslator.scala
@@ -20,15 +20,16 @@ import akka.actor.{ Props, ActorRef, Actor }
 import kamon.metrics.Subscriptions.TickMetricSnapshot
 import kamon.newrelic.MetricTranslator.TimeSliceMetrics
 
-class MetricTranslator(receiver: ActorRef) extends Actor with WebTransactionMetrics {
+class MetricTranslator(receiver: ActorRef) extends Actor
+    with WebTransactionMetrics with CustomMetrics {
 
   def receive = {
     case TickMetricSnapshot(from, to, metrics) ⇒
-      val scaledFrom = (from / 1E3).toInt
-      val scaledTo = (to / 1E3).toInt
-      val allMetrics = collectWebTransactionMetrics(metrics)
+      val fromInSeconds = (from / 1E3).toInt
+      val toInSeconds = (to / 1E3).toInt
+      val allMetrics = collectWebTransactionMetrics(metrics) ++ collectCustomMetrics(metrics)
 
-      receiver ! TimeSliceMetrics(scaledFrom, scaledTo, allMetrics)
+      receiver ! TimeSliceMetrics(fromInSeconds, toInSeconds, allMetrics)
   }
 
 }