+ datadog: include identification tags and clean up all irrelevant code from StatsD

1 files changed, 1 insertions, 10 deletions

diff --git a/kamon-datadog/src/main/scala/kamon/datadog/Datadog.scala b/kamon-datadog/src/main/scala/kamon/datadog/Datadog.scala
index b492b9fd..c6981fd7 100644
--- a/kamon-datadog/src/main/scala/kamon/datadog/Datadog.scala
+++ b/kamon-datadog/src/main/scala/kamon/datadog/Datadog.scala
@@ -44,7 +44,6 @@ class DatadogExtension(system: ExtendedActorSystem) extends Kamon.Extension {
 
   val datadogHost = new InetSocketAddress(datadogConfig.getString("hostname"), datadogConfig.getInt("port"))
   val flushInterval = datadogConfig.getDuration("flush-interval", MILLISECONDS)
-  val maxPacketSizeInBytes = datadogConfig.getBytes("max-packet-size")
   val tickInterval = system.settings.config.getDuration("kamon.metrics.tick-interval", MILLISECONDS)
 
   val datadogMetricsListener = buildMetricsListener(tickInterval, flushInterval)
@@ -64,7 +63,7 @@ class DatadogExtension(system: ExtendedActorSystem) extends Kamon.Extension {
   def buildMetricsListener(tickInterval: Long, flushInterval: Long): ActorRef = {
     assert(flushInterval >= tickInterval, "Datadog flush-interval needs to be equal or greater to the tick-interval")
 
-    val metricsTranslator = system.actorOf(DatadogMetricsSender.props(datadogHost, maxPacketSizeInBytes), "datadog-metrics-sender")
+    val metricsTranslator = system.actorOf(DatadogMetricsSender.props(datadogHost), "datadog-metrics-sender")
     if (flushInterval == tickInterval) {
       // No need to buffer the metrics, let's go straight to the metrics sender.
       metricsTranslator
@@ -74,11 +73,3 @@ class DatadogExtension(system: ExtendedActorSystem) extends Kamon.Extension {
   }
 }
 
-class SimpleMetricKeyGenerator(config: Config) extends Datadog.MetricKeyGenerator {
-  val application = config.getString("kamon.datadog.simple-metric-key-generator.application")
-  val localhostName = ManagementFactory.getRuntimeMXBean.getName.split('@')(1)
-
-  def generateKey(groupIdentity: MetricGroupIdentity, metricIdentity: MetricIdentity): String =
-    s"${application}.${localhostName}.${groupIdentity.category.name}.${groupIdentity.name}.${metricIdentity.name}"
-}
-