+ statsd: fix akka and segments subscriptions and subscribe to simple metrics as well, fixes #166.

2 files changed, 15 insertions, 7 deletions

diff --git a/kamon-statsd/src/main/resources/reference.conf b/kamon-statsd/src/main/resources/reference.conf
index f26ce98b..63a784a4 100644
--- a/kamon-statsd/src/main/resources/reference.conf
+++ b/kamon-statsd/src/main/resources/reference.conf
@@ -20,11 +20,16 @@ kamon {
     # Subscription patterns used to select which metrics will be pushed to StatsD. Note that first, metrics
     # collection for your desired entities must be activated under the kamon.metrics.filters settings.
     subscriptions {
-      trace         = [ "**" ]
-      actor         = [ "**" ]
-      dispatcher    = [ "**" ]
-      user-metric   = [ "**" ]
-      system-metric = [ "**" ]
+      histogram       = [ "**" ]
+      min-max-counter = [ "**" ]
+      gauge           = [ "**" ]
+      counter         = [ "**" ]
+      trace           = [ "**" ]
+      trace-segment   = [ "**" ]
+      akka-actor      = [ "**" ]
+      akka-dispatcher = [ "**" ]
+      akka-router     = [ "**" ]
+      system-metric   = [ "**" ]
     }
 
     # Enable system metrics
diff --git a/kamon-statsd/src/main/scala/kamon/statsd/SimpleMetricKeyGenerator.scala b/kamon-statsd/src/main/scala/kamon/statsd/SimpleMetricKeyGenerator.scala
index 0fce855c..fc72e837 100644
--- a/kamon-statsd/src/main/scala/kamon/statsd/SimpleMetricKeyGenerator.scala
+++ b/kamon-statsd/src/main/scala/kamon/statsd/SimpleMetricKeyGenerator.scala
@@ -3,7 +3,7 @@ package kamon.statsd
 import java.lang.management.ManagementFactory
 
 import com.typesafe.config.Config
-import kamon.metric.{ MetricKey, Entity }
+import kamon.metric.{ SingleInstrumentEntityRecorder, MetricKey, Entity }
 
 trait MetricKeyGenerator {
   def generateKey(entity: Entity, metricKey: MetricKey): String
@@ -28,7 +28,10 @@ class SimpleMetricKeyGenerator(config: Config) extends MetricKeyGenerator {
 
   def generateKey(entity: Entity, metricKey: MetricKey): String = {
     val normalizedGroupName = normalizer(entity.name)
-    s"${baseName}.${entity.category}.${normalizedGroupName}.${metricKey.name}"
+    if (SingleInstrumentEntityRecorder.AllCategories.contains(entity.category))
+      s"${baseName}.${entity.category}.${normalizedGroupName}"
+    else
+      s"${baseName}.${entity.category}.${normalizedGroupName}.${metricKey.name}"
   }
 
   def hostName: String = ManagementFactory.getRuntimeMXBean.getName.split('@')(1)