aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorIvan Topolnjak <ivantopo@gmail.com>2014-08-04 23:44:17 -0300
committerIvan Topolnjak <ivantopo@gmail.com>2014-08-04 23:44:17 -0300
commit1256ed00ebb9496bfc67637526cf269acd4ea6fa (patch)
treeb2dbbec8533092fabbd59ce8dbdfc1ecd7c1645b
parent699917cfdb6978d5682cb4427635f29d01fa79d7 (diff)
downloadKamon-1256ed00ebb9496bfc67637526cf269acd4ea6fa.tar.gz
Kamon-1256ed00ebb9496bfc67637526cf269acd4ea6fa.tar.bz2
Kamon-1256ed00ebb9496bfc67637526cf269acd4ea6fa.zip
= datadog,sysmetrics: minor formatting changes
-rw-r--r--kamon-datadog/src/main/scala/kamon/datadog/Datadog.scala3
-rw-r--r--kamon-datadog/src/main/scala/kamon/datadog/DatadogMetricsSender.scala4
-rw-r--r--kamon-system-metrics/src/test/scala/kamon/metrics/SystemMetricsSpec.scala4
3 files changed, 5 insertions, 6 deletions
diff --git a/kamon-datadog/src/main/scala/kamon/datadog/Datadog.scala b/kamon-datadog/src/main/scala/kamon/datadog/Datadog.scala
index 65b4cd37..b0116d00 100644
--- a/kamon-datadog/src/main/scala/kamon/datadog/Datadog.scala
+++ b/kamon-datadog/src/main/scala/kamon/datadog/Datadog.scala
@@ -22,7 +22,7 @@ import java.util.concurrent.TimeUnit.MILLISECONDS
import akka.actor._
import akka.event.Logging
import kamon.Kamon
-import kamon.metric.UserMetrics.{UserGauges, UserMinMaxCounters, UserCounters, UserHistograms}
+import kamon.metric.UserMetrics.{ UserGauges, UserMinMaxCounters, UserCounters, UserHistograms }
import kamon.metric._
import kamon.metrics._
@@ -51,7 +51,6 @@ class DatadogExtension(system: ExtendedActorSystem) extends Kamon.Extension {
val datadogMetricsListener = buildMetricsListener(tickInterval, flushInterval)
-
// Subscribe to all user metrics
Kamon(Metrics)(system).subscribe(UserHistograms, "*", datadogMetricsListener, permanently = true)
Kamon(Metrics)(system).subscribe(UserCounters, "*", datadogMetricsListener, permanently = true)
diff --git a/kamon-datadog/src/main/scala/kamon/datadog/DatadogMetricsSender.scala b/kamon-datadog/src/main/scala/kamon/datadog/DatadogMetricsSender.scala
index 3db3cbfb..5ab0589c 100644
--- a/kamon-datadog/src/main/scala/kamon/datadog/DatadogMetricsSender.scala
+++ b/kamon-datadog/src/main/scala/kamon/datadog/DatadogMetricsSender.scala
@@ -89,13 +89,13 @@ class DatadogMetricsSender(remote: InetSocketAddress, maxPacketSizeInBytes: Long
def encodeStatsDCounter(count: Long): String = count.toString + "|c"
def buildMetricName(groupIdentity: MetricGroupIdentity, metricIdentity: MetricIdentity): String =
- if(isUserMetric(groupIdentity))
+ if (isUserMetric(groupIdentity))
s"$appName.${groupIdentity.category.name}.${groupIdentity.name}"
else
s"$appName.${groupIdentity.category.name}.${metricIdentity.name}"
def buildIdentificationTag(groupIdentity: MetricGroupIdentity, metricIdentity: MetricIdentity): String = {
- if(isUserMetric(groupIdentity)) "" else {
+ if (isUserMetric(groupIdentity)) "" else {
// Make the automatic HTTP trace names a bit more friendly
val normalizedEntityName = groupIdentity.name.replace(": ", ":")
s"|#${groupIdentity.category.name}:${normalizedEntityName}"
diff --git a/kamon-system-metrics/src/test/scala/kamon/metrics/SystemMetricsSpec.scala b/kamon-system-metrics/src/test/scala/kamon/metrics/SystemMetricsSpec.scala
index b4830ae5..cda820fc 100644
--- a/kamon-system-metrics/src/test/scala/kamon/metrics/SystemMetricsSpec.scala
+++ b/kamon-system-metrics/src/test/scala/kamon/metrics/SystemMetricsSpec.scala
@@ -16,7 +16,7 @@
package kamon.metric
import akka.actor.ActorSystem
-import akka.testkit.{TestKitBase, TestProbe}
+import akka.testkit.{ TestKitBase, TestProbe }
import com.typesafe.config.ConfigFactory
import kamon.Kamon
import kamon.metric.Subscriptions.TickMetricSnapshot
@@ -28,7 +28,7 @@ import kamon.metrics.NetworkMetrics.NetworkMetricSnapshot
import kamon.metrics.ProcessCPUMetrics.ProcessCPUMetricsSnapshot
import kamon.metrics._
import kamon.system.SystemMetricsExtension
-import org.scalatest.{Matchers, WordSpecLike}
+import org.scalatest.{ Matchers, WordSpecLike }
import scala.concurrent.duration._