wip: merge from master and fix some test

3 files changed, 11 insertions, 7 deletions

diff --git a/kamon-spm/src/main/resources/reference.conf b/kamon-spm/src/main/resources/reference.conf
index 397f14a7..1b2f3cf5 100644
--- a/kamon-spm/src/main/resources/reference.conf
+++ b/kamon-spm/src/main/resources/reference.conf
@@ -1,3 +1,7 @@
+# ==================================#
+# Kamon-SPM Reference Configuration #
+# ==================================#
+
 kamon {
   spm {
     receiver-url = "https://spm-receiver.sematext.com/receiver/v1/_bulk"
@@ -8,10 +12,10 @@ kamon {
     # hostname-alias = "custom hostname"
 
     subscriptions {
-      akka-actor = [ "**" ]
+      akka-actor      = [ "**" ]
       akka-dispatcher = [ "**" ]
-      akka-router = [ "**" ]
-      system-metric = [ "**" ]
+      akka-router     = [ "**" ]
+      system-metric   = [ "**" ]
     }
   }
 
diff --git a/kamon-spm/src/main/scala/kamon/spm/SPM.scala b/kamon-spm/src/main/scala/kamon/spm/SPM.scala
index b8bb4eab..d15c995b 100644
--- a/kamon-spm/src/main/scala/kamon/spm/SPM.scala
+++ b/kamon-spm/src/main/scala/kamon/spm/SPM.scala
@@ -44,8 +44,8 @@ class SPMExtension(system: ExtendedActorSystem) extends Kamon.Extension {
 
   val config = system.settings.config.getConfig("kamon.spm")
   val maxQueueSize = config.getInt("max-queue-size")
-  val retryInterval: FiniteDuration = config.getDuration("retry-interval", TimeUnit.MILLISECONDS) millis
-  val sendTimeout: FiniteDuration = config.getDuration("send-timeout", TimeUnit.MILLISECONDS) millis
+  val retryInterval: FiniteDuration = config.getFiniteDuration("retry-interval")
+  val sendTimeout: FiniteDuration = config.getFiniteDuration("send-timeout")
   val url = config.getString("receiver-url")
   val token = config.getString("token")
   val hostname = if (config.hasPath("hostname-alias")) {
diff --git a/kamon-spm/src/main/scala/kamon/spm/SPMMetricsSender.scala b/kamon-spm/src/main/scala/kamon/spm/SPMMetricsSender.scala
index 80d50c41..4182947b 100644
--- a/kamon-spm/src/main/scala/kamon/spm/SPMMetricsSender.scala
+++ b/kamon-spm/src/main/scala/kamon/spm/SPMMetricsSender.scala
@@ -22,7 +22,7 @@ import akka.util.Timeout
 import spray.http.Uri.Query
 import spray.http.{ HttpEntity, HttpResponse, Uri }
 import spray.httpx.RequestBuilding._
-import spray.json.{ DefaultJsonProtocol, _ }
+import spray.json._
 
 import scala.annotation.tailrec
 import scala.collection.immutable.{ Map, Queue }
@@ -103,7 +103,7 @@ class SPMMetricsSender(io: ActorRef, retryInterval: FiniteDuration, sendTimeout:
       post(metrics)
     }
     case resp: HttpResponse if resp.status.isFailure ⇒ {
-      log.warning("Metrics can't be sent. Response status: ${resp.status}. Scheduling retry.")
+      log.warning(s"Metrics can't be sent. Response status: ${resp.status}. Scheduling retry.")
       context.system.scheduler.scheduleOnce(retryInterval, self, Retry)
     }
     case ScheduleRetry ⇒ {