Merge pull request #34 from kenshoo/prefix-jvm-metrics

standardize jvm metric names with dropwizard fixes #31

README.md

@@ -112,6 +112,8 @@ created metrics, and to specify which HTTP Status codes should have individual m
 2.3.0_0.1.8 - Support default registry in play java. Replace MetricsRegistry.default with MetricsRegistry.defaultRegistry (to support java where default is a reserved keyword)
 2.3.0_0.1.9 - Add extra http codes, support configurable metrics names for requests filter
 2.3.0_0.2.0 - Meter uncaught exceptions as 500 Internal Server Error
+2.3.0_0.2.1 - Breaking Change! prefix jvm metric names to standardize with dropwizard
+
 
 ## License
 This code is released under the Apache Public License 2.0.

build.sbt

@@ -2,7 +2,7 @@ organization:= "com.kenshoo"
 
 name := "metrics-play"
 
-version := "2.3.0_0.2.0"
+version := "2.3.0_0.2.1"
 
 scalaVersion := "2.11.2"
 

src/main/scala/com/kenshoo/play/metrics/MetricsPlugin.scala

@@ -21,7 +21,7 @@ import ch.qos.logback.classic
 import com.codahale.metrics.logback.InstrumentedAppender
 import play.api.{Logger, Application, Play, Plugin}
 
-import com.codahale.metrics.{MetricRegistry, SharedMetricRegistries}
+import com.codahale.metrics.{JvmAttributeGaugeSet, MetricRegistry, SharedMetricRegistries}
 import com.codahale.metrics.json.MetricsModule
 import com.codahale.metrics.jvm.{ThreadStatesGaugeSet, GarbageCollectorMetricSet, MemoryUsageGaugeSet}
 
@@ -53,9 +53,10 @@ class MetricsPlugin(val app: Application) extends Plugin {
     def setupJvmMetrics(registry: MetricRegistry) {
       val jvmMetricsEnabled = app.configuration.getBoolean("metrics.jvm").getOrElse(true)
       if (jvmMetricsEnabled) {
-        registry.registerAll(new GarbageCollectorMetricSet())
-        registry.registerAll(new MemoryUsageGaugeSet())
-        registry.registerAll(new ThreadStatesGaugeSet())
+        registry.register("jvm.attribute", new JvmAttributeGaugeSet())
+        registry.register("jvm.gc", new GarbageCollectorMetricSet())
+        registry.register("jvm.memory", new MemoryUsageGaugeSet())
+        registry.register("jvm.threads", new ThreadStatesGaugeSet())
       }
     }
 

src/test/scala/com/kenshoo/play/metrics/MetricsPluginTest.scala

@@ -59,7 +59,7 @@ class MetricsPluginSpec extends Specification with Mockito with BeforeAfterExamp
       val plugin = config()
       plugin.onStart()
       val metrics: Map[String, Metric] = SharedMetricRegistries.getOrCreate("default").getMetrics
-      metrics must haveKey("heap.usage")
+      metrics must haveKey("jvm.memory.heap.usage")
     }
 
     "registers logback metrics" in {