Merge pull request #35 from oridag/issue-#34

Fix API reporter to report timer metrics

Author: ivantopo

src/main/scala/kamon/datadog/DatadogAPIReporter.scala

@@ -124,7 +124,7 @@ class DatadogAPIReporter(@volatile private var configuration: Configuration, @vo
       }
     }
 
-    (snapshot.histograms ++ snapshot.rangeSamplers).foreach(addDistribution)
+    (snapshot.histograms ++ snapshot.rangeSamplers ++ snapshot.timers).foreach(addDistribution)
 
     seriesBuilder
       .insert(0, "{\"series\":[")

src/test/scala/kamon/datadog/DatadogAPIReporterSpec.scala

@@ -3,7 +3,8 @@ package kamon.datadog
 import java.time.Instant
 
 import kamon.Kamon
-import kamon.metric.{ Instrument, MeasurementUnit, Metric, MetricSnapshot, PeriodSnapshot }
+import kamon.metric.Distribution.Percentile
+import kamon.metric._
 import kamon.module.ModuleFactory
 import kamon.tag.TagSet
 import kamon.testkit.Reconfigure
@@ -23,7 +24,6 @@ class DatadogAPIReporterSpec extends AbstractHttpReporter with Matchers with Rec
       val baseUrl = mockResponse("/test", new MockResponse().setStatus("HTTP/1.1 200 OK"))
       applyConfig("kamon.datadog.api.api-url = \"" + baseUrl + "\"")
       applyConfig("kamon.datadog.api.api-key = \"dummy\"")
-
       reporter.reconfigure(Kamon.config())
 
       reporter.reportPeriodSnapshot(
@@ -45,13 +45,67 @@ class DatadogAPIReporterSpec extends AbstractHttpReporter with Matchers with Rec
       val request = server.takeRequest()
       request.getRequestUrl.toString shouldEqual baseUrl + "?api_key=dummy"
       request.getMethod shouldEqual "POST"
-      Json.parse(request.getBody().readUtf8()) shouldEqual Json
+      Json.parse(request.getBody.readUtf8()) shouldEqual Json
         .parse(
           """{"series":[{"metric":"test.counter","interval":1,"points":[[1523394,0]],"type":"count","host":"test","tags":["env:staging","service:kamon-application","tag1:value1"]}]}"""
         )
 
     }
 
+    "send timer metrics" in {
+      val baseUrl = mockResponse("/test", new MockResponse().setStatus("HTTP/1.1 200 OK"))
+      applyConfig("kamon.datadog.api.api-url = \"" + baseUrl + "\"")
+      applyConfig("kamon.datadog.api.api-key = \"dummy\"")
+      reporter.reconfigure(Kamon.config())
+
+      val distribution = new Distribution {
+        override def dynamicRange: DynamicRange = ???
+        override def min: Long = 0
+        override def max: Long = 10
+        override def sum: Long = 100
+        override def count: Long = 5
+        override def percentile(rank: Double): Distribution.Percentile = new Percentile {
+          override def rank: Double = 0
+          override def value: Long = 0
+          override def countAtRank: Long = 0
+        }
+        override def percentiles: Seq[Distribution.Percentile] = ???
+        override def percentilesIterator: Iterator[Distribution.Percentile] = ???
+        override def buckets: Seq[Distribution.Bucket] = ???
+        override def bucketsIterator: Iterator[Distribution.Bucket] = ???
+      }
+
+      reporter.reportPeriodSnapshot(
+        PeriodSnapshot.apply(
+          now.minusMillis(1000),
+          now,
+          Nil,
+          Nil,
+          Nil,
+          MetricSnapshot.ofDistributions(
+            "test.timer",
+            "test",
+            Metric.Settings.ForDistributionInstrument(MeasurementUnit.none, java.time.Duration.ZERO, DynamicRange.Default),
+            Instrument.Snapshot.apply(TagSet.Empty, distribution) :: Nil
+          ) :: Nil,
+          Nil
+        )
+      )
+      val request = server.takeRequest()
+      request.getRequestUrl.toString shouldEqual baseUrl + "?api_key=dummy"
+      request.getMethod shouldEqual "POST"
+      Json.parse(request.getBody.readUtf8()) shouldEqual Json
+        .parse(
+          """{"series":[
+            |{"metric":"test.timer.avg","interval":1,"points":[[1523394,20]],"type":"gauge","host":"test","tags":["env:staging","service:kamon-application"]},
+            |{"metric":"test.timer.count","interval":1,"points":[[1523394,5]],"type":"count","host":"test","tags":["env:staging","service:kamon-application"]},
+            |{"metric":"test.timer.median","interval":1,"points":[[1523394,0]],"type":"gauge","host":"test","tags":["env:staging","service:kamon-application"]},
+            |{"metric":"test.timer.95percentile","interval":1,"points":[[1523394,0]],"type":"gauge","host":"test","tags":["env:staging","service:kamon-application"]},
+            |{"metric":"test.timer.max","interval":1,"points":[[1523394,10]],"type":"gauge","host":"test","tags":["env:staging","service:kamon-application"]},
+            |{"metric":"test.timer.min","interval":1,"points":[[1523394,0]],"type":"gauge","host":"test","tags":["env:staging","service:kamon-application"]}]}""".stripMargin
+        )
+    }
+
     reporter.stop()
 
   }