+ statsd: report trace metrics to StatsD

4 files changed, 16 insertions, 9 deletions

diff --git a/kamon-statsd/src/main/resources/reference.conf b/kamon-statsd/src/main/resources/reference.conf
index 4f70409c..e9e9f363 100644
--- a/kamon-statsd/src/main/resources/reference.conf
+++ b/kamon-statsd/src/main/resources/reference.conf
@@ -20,6 +20,7 @@ kamon {
     # collection for your desired entities must be activated under the kamon.metrics.filters settings.
     includes {
       actor = [ "*" ]
+      trace = [ "*" ]
     }
 
     simple-metric-key-generator {
diff --git a/kamon-statsd/src/main/scala/kamon/statsd/StatsD.scala b/kamon-statsd/src/main/scala/kamon/statsd/StatsD.scala
index 8b7b86db..0f1d2562 100644
--- a/kamon-statsd/src/main/scala/kamon/statsd/StatsD.scala
+++ b/kamon-statsd/src/main/scala/kamon/statsd/StatsD.scala
@@ -24,6 +24,7 @@ import scala.collection.JavaConverters._
 import com.typesafe.config.Config
 import java.lang.management.ManagementFactory
 import akka.event.Logging
+import java.net.InetSocketAddress
 
 object StatsD extends ExtensionId[StatsDExtension] with ExtensionIdProvider {
   override def lookup(): ExtensionId[_ <: Extension] = StatsD
@@ -40,23 +41,29 @@ class StatsDExtension(system: ExtendedActorSystem) extends Kamon.Extension {
 
   private val statsDConfig = system.settings.config.getConfig("kamon.statsd")
 
-  val hostname = statsDConfig.getString("hostname")
-  val port = statsDConfig.getInt("port")
+  val statsDHost = new InetSocketAddress(statsDConfig.getString("hostname"), statsDConfig.getInt("port"))
   val flushInterval = statsDConfig.getMilliseconds("flush-interval")
   val maxPacketSize = statsDConfig.getInt("max-packet-size")
   val tickInterval = system.settings.config.getMilliseconds("kamon.metrics.tick-interval")
 
   val statsDMetricsListener = buildMetricsListener(tickInterval, flushInterval)
 
+  // Subscribe to Actors
   val includedActors = statsDConfig.getStringList("includes.actor").asScala
   for (actorPathPattern ← includedActors) {
     Kamon(Metrics)(system).subscribe(ActorMetrics, actorPathPattern, statsDMetricsListener, permanently = true)
   }
 
+  // Subscribe to Traces
+  val includedTraces = statsDConfig.getStringList("includes.trace").asScala
+  for (tracePathPattern ← includedTraces) {
+    Kamon(Metrics)(system).subscribe(TraceMetrics, tracePathPattern, statsDMetricsListener, permanently = true)
+  }
+
   def buildMetricsListener(tickInterval: Long, flushInterval: Long): ActorRef = {
     assert(flushInterval >= tickInterval, "StatsD flush-interval needs to be equal or greater to the tick-interval")
 
-    val metricsTranslator = system.actorOf(StatsDMetricsSender.props, "statsd-metrics-sender")
+    val metricsTranslator = system.actorOf(StatsDMetricsSender.props(statsDHost, maxPacketSize), "statsd-metrics-sender")
     if (flushInterval == tickInterval) {
       // No need to buffer the metrics, let's go straight to the metrics sender.
       metricsTranslator
diff --git a/kamon-statsd/src/main/scala/kamon/statsd/StatsDMetricsSender.scala b/kamon-statsd/src/main/scala/kamon/statsd/StatsDMetricsSender.scala
index 0520b621..cff970b4 100644
--- a/kamon-statsd/src/main/scala/kamon/statsd/StatsDMetricsSender.scala
+++ b/kamon-statsd/src/main/scala/kamon/statsd/StatsDMetricsSender.scala
@@ -26,11 +26,9 @@ import kamon.metrics.MetricSnapshot.Measurement
 import kamon.metrics.InstrumentTypes.{ Counter, Gauge, Histogram, InstrumentType }
 import java.text.DecimalFormat
 
-class StatsDMetricsSender extends Actor with UdpExtensionProvider {
+class StatsDMetricsSender(remote: InetSocketAddress, maxPacketSize: Int) extends Actor with UdpExtensionProvider {
   import context.system
 
-  val statsDExtension = Kamon(StatsD)
-  val remote = new InetSocketAddress(statsDExtension.hostname, statsDExtension.port)
   val metricKeyGenerator = new SimpleMetricKeyGenerator(context.system.settings.config)
   val samplingRateFormat = new DecimalFormat()
   samplingRateFormat.setMaximumFractionDigits(128) // Absurdly high, let the other end loss precision if it needs to.
@@ -47,7 +45,7 @@ class StatsDMetricsSender extends Actor with UdpExtensionProvider {
   }
 
   def writeMetricsToRemote(tick: TickMetricSnapshot, udpSender: ActorRef): Unit = {
-    val dataBuilder = new MetricDataPacketBuilder(statsDExtension.maxPacketSize, udpSender, remote)
+    val dataBuilder = new MetricDataPacketBuilder(maxPacketSize, udpSender, remote)
 
     for (
       (groupIdentity, groupSnapshot) ← tick.metrics;
@@ -78,7 +76,7 @@ class StatsDMetricsSender extends Actor with UdpExtensionProvider {
 }
 
 object StatsDMetricsSender {
-  def props: Props = Props[StatsDMetricsSender]
+  def props(remote: InetSocketAddress, maxPacketSize: Int): Props = Props(new StatsDMetricsSender(remote, maxPacketSize))
 }
 
 trait UdpExtensionProvider {
diff --git a/kamon-statsd/src/test/scala/kamon/statsd/StatsDMetricSenderSpec.scala b/kamon-statsd/src/test/scala/kamon/statsd/StatsDMetricSenderSpec.scala
index 94af4645..5f03f56b 100644
--- a/kamon-statsd/src/test/scala/kamon/statsd/StatsDMetricSenderSpec.scala
+++ b/kamon-statsd/src/test/scala/kamon/statsd/StatsDMetricSenderSpec.scala
@@ -26,6 +26,7 @@ import kamon.metrics.Subscriptions.TickMetricSnapshot
 import java.lang.management.ManagementFactory
 import com.typesafe.config.ConfigFactory
 import kamon.Kamon
+import java.net.InetSocketAddress
 
 class StatsDMetricSenderSpec extends TestKitBase with WordSpecLike with Matchers {
 
@@ -130,7 +131,7 @@ class StatsDMetricSenderSpec extends TestKitBase with WordSpecLike with Matchers
 
     def setup(metrics: Map[String, MetricSnapshotLike]): TestProbe = {
       val udp = TestProbe()
-      val metricsSender = system.actorOf(Props(new StatsDMetricsSender {
+      val metricsSender = system.actorOf(Props(new StatsDMetricsSender(new InetSocketAddress(localhostName, 0), 512) {
         override def udpExtension(implicit system: ActorSystem): ActorRef = udp.ref
       }))