Merge pull request #489 from kamon-io/refineWithJMap

Metric::refine with java.util.Map

2 files changed, 25 insertions, 12 deletions

diff --git a/kamon-core-tests/src/test/scala/kamon/metric/MetricLookupSpec.scala b/kamon-core-tests/src/test/scala/kamon/metric/MetricLookupSpec.scala
index 64ae1514..4df2397b 100644
--- a/kamon-core-tests/src/test/scala/kamon/metric/MetricLookupSpec.scala
+++ b/kamon-core-tests/src/test/scala/kamon/metric/MetricLookupSpec.scala
@@ -15,6 +15,8 @@
 
 package kamon.metric
 
+import java.util.Collections.{singletonMap => javaMap}
+
 import kamon.Kamon
 import org.scalatest.{Matchers, WordSpec}
 
@@ -51,27 +53,38 @@ class MetricLookupSpec extends WordSpec with Matchers {
       "always return the same histogram for a set of tags" in {
         val histogramOne = Kamon.histogram("histogram-lookup").refine("tag" -> "value")
         val histogramTwo = Kamon.histogram("histogram-lookup").refine("tag" -> "value")
+        val histogramThree = Kamon.histogram("histogram-lookup").refine(javaMap("tag", "value"))
+
         histogramOne shouldBe theSameInstanceAs(histogramTwo)
+        histogramOne shouldBe theSameInstanceAs(histogramThree)
       }
 
       "always return the same counter for a set of tags" in {
         val counterOne = Kamon.counter("counter-lookup").refine("tag" -> "value")
         val counterTwo = Kamon.counter("counter-lookup").refine("tag" -> "value")
+        val counterThree = Kamon.counter("counter-lookup").refine(javaMap("tag", "value"))
+
         counterOne shouldBe theSameInstanceAs(counterTwo)
+        counterOne shouldBe theSameInstanceAs(counterThree)
       }
 
       "always return the same gauge for a set of tags" in {
         val gaugeOne = Kamon.gauge("gauge-lookup").refine("tag" -> "value")
         val gaugeTwo = Kamon.gauge("gauge-lookup").refine("tag" -> "value")
+        val gaugeThree = Kamon.gauge("gauge-lookup").refine(javaMap("tag", "value"))
+
         gaugeOne shouldBe theSameInstanceAs(gaugeTwo)
+        gaugeOne shouldBe theSameInstanceAs(gaugeThree)
       }
 
       "always return the same min-max-counter for a set of tags" in {
         val minMaxCounterOne = Kamon.minMaxCounter("min-max-counter-lookup").refine("tag" -> "value")
         val minMaxCounterTwo = Kamon.minMaxCounter("min-max-counter-lookup").refine("tag" -> "value")
+        val minMaxCounterThree = Kamon.minMaxCounter("min-max-counter-lookup").refine(javaMap("tag", "value"))
+
         minMaxCounterOne shouldBe theSameInstanceAs(minMaxCounterTwo)
+        minMaxCounterOne shouldBe theSameInstanceAs(minMaxCounterThree)
       }
     }
   }
-
 }
diff --git a/kamon-core-tests/src/test/scala/kamon/metric/TimerSpec.scala b/kamon-core-tests/src/test/scala/kamon/metric/TimerSpec.scala
index 1d439b3a..834c38e5 100644
--- a/kamon-core-tests/src/test/scala/kamon/metric/TimerSpec.scala
+++ b/kamon-core-tests/src/test/scala/kamon/metric/TimerSpec.scala
@@ -29,7 +29,7 @@ class TimerSpec extends WordSpec with Matchers {
       timer.start().stop()
       timer.start().stop()
 
-      timer.distribution().count shouldBe(3)
+      timer.distribution().count shouldBe 3
     }
 
     "ensure that a started timer can only be stopped once" in {
@@ -39,7 +39,7 @@ class TimerSpec extends WordSpec with Matchers {
       startedTimer.stop()
       startedTimer.stop()
 
-      timer.distribution().count shouldBe(1)
+      timer.distribution().count shouldBe 1
     }
 
 
@@ -50,20 +50,20 @@ class TimerSpec extends WordSpec with Matchers {
       timer.record(200)
 
       val distribution = timer.distribution()
-      distribution.min shouldBe(100)
-      distribution.max shouldBe(200)
-      distribution.count shouldBe(1000)
+      distribution.min shouldBe 100
+      distribution.max shouldBe 200
+      distribution.count shouldBe 1000
       distribution.buckets.length shouldBe 3
       distribution.buckets.map(b => (b.value, b.frequency)) should contain.allOf(
-        (100 -> 1),
-        (150 -> 998),
-        (200 -> 1)
+        100 -> 1,
+        150 -> 998,
+        200 -> 1
       )
 
       val emptyDistribution = timer.distribution()
-      emptyDistribution.min shouldBe(0)
-      emptyDistribution.max shouldBe(0)
-      emptyDistribution.count shouldBe(0)
+      emptyDistribution.min shouldBe 0
+      emptyDistribution.max shouldBe 0
+      emptyDistribution.count shouldBe 0
       emptyDistribution.buckets.length shouldBe 0
     }
   }