diff options
| author | Ivan Topolnjak <ivantopo@gmail.com> | 2015-11-05 16:54:19 +0100 |
|---|---|---|
| committer | Ivan Topolnjak <ivantopo@gmail.com> | 2015-11-05 16:54:19 +0100 |
| commit | ecf051478e80ba4ce6e7c8a169feefa771cc8e17 (patch) | |
| tree | a6b440fe6acd2335d5e3aa4a83b5db4e8d701462 | |
| parent | 8e286ba903eceaf6810e9998acad099f83692067 (diff) | |
| parent | 5609a5cff8473c339063def523eb1a0338fe0e79 (diff) | |
| download | Kamon-ecf051478e80ba4ce6e7c8a169feefa771cc8e17.tar.gz Kamon-ecf051478e80ba4ce6e7c8a169feefa771cc8e17.tar.bz2 Kamon-ecf051478e80ba4ce6e7c8a169feefa771cc8e17.zip | |
Merge pull request #280 from jozic/spm-f
= spm: fix sending metrics failure message
| -rw-r--r-- | kamon-spm/src/main/scala/kamon/spm/SPM.scala | 4 | ||||
| -rw-r--r-- | kamon-spm/src/main/scala/kamon/spm/SPMMetricsSender.scala | 4 |
2 files changed, 4 insertions, 4 deletions
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 ⇒ { |