diff options
author | Ivan Topolnjak <ivantopo@gmail.com> | 2015-02-15 02:01:00 +0100 |
---|---|---|
committer | Ivan Topolnjak <ivantopo@gmail.com> | 2015-02-15 02:01:00 +0100 |
commit | 97536d1ccc4444d67334a7137d386c4c308836ad (patch) | |
tree | 9858dae1c7e5c59d694672f3d1e9b3841000ad01 /kamon-newrelic/src | |
parent | cbe74e89112cfba113a1bba4184b417406e02b98 (diff) | |
parent | 81c52c27d2b4784d561ae63b884b6e8c9e03db58 (diff) | |
download | Kamon-97536d1ccc4444d67334a7137d386c4c308836ad.tar.gz Kamon-97536d1ccc4444d67334a7137d386c4c308836ad.tar.bz2 Kamon-97536d1ccc4444d67334a7137d386c4c308836ad.zip |
Merge branch 'master' into release-legacy-akka-2.2
Conflicts:
kamon-core/src/main/scala/kamon/metric/instrument/InstrumentSettings.scala
kamon-core/src/main/scala/kamon/trace/TracerExtensionSettings.scala
kamon-jdbc/src/main/scala/kamon/jdbc/Jdbc.scala
kamon-newrelic/src/main/scala/kamon/newrelic/MetricReporter.scala
project/Dependencies.scala
project/Projects.scala
project/Settings.scala
Diffstat (limited to 'kamon-newrelic/src')
-rw-r--r-- | kamon-newrelic/src/main/scala/kamon/newrelic/Agent.scala | 6 | ||||
-rw-r--r-- | kamon-newrelic/src/main/scala/kamon/newrelic/MetricReporter.scala | 4 |
2 files changed, 5 insertions, 5 deletions
diff --git a/kamon-newrelic/src/main/scala/kamon/newrelic/Agent.scala b/kamon-newrelic/src/main/scala/kamon/newrelic/Agent.scala index 5f6383f8..91ccd547 100644 --- a/kamon-newrelic/src/main/scala/kamon/newrelic/Agent.scala +++ b/kamon-newrelic/src/main/scala/kamon/newrelic/Agent.scala @@ -16,8 +16,6 @@ package kamon.newrelic -import java.util.concurrent.TimeUnit.{ MILLISECONDS ⇒ milliseconds } - import akka.actor.{ ActorLogging, Actor } import akka.io.IO import akka.util.Timeout @@ -28,11 +26,13 @@ import scala.concurrent.Future import spray.httpx.SprayJsonSupport import spray.json.lenses.JsonLenses._ import java.lang.management.ManagementFactory -import scala.concurrent.duration._ +import kamon.util.ConfigTools.Syntax import Agent._ import JsonProtocol._ import akka.pattern.pipe +import scala.concurrent.duration.FiniteDuration + class Agent extends Actor with SprayJsonSupport with ActorLogging { import context.dispatcher diff --git a/kamon-newrelic/src/main/scala/kamon/newrelic/MetricReporter.scala b/kamon-newrelic/src/main/scala/kamon/newrelic/MetricReporter.scala index 842fbdc6..7ee7d1e6 100644 --- a/kamon-newrelic/src/main/scala/kamon/newrelic/MetricReporter.scala +++ b/kamon-newrelic/src/main/scala/kamon/newrelic/MetricReporter.scala @@ -20,10 +20,10 @@ class MetricReporter(settings: AgentSettings) extends Actor with ActorLogging wi val metricsExtension = Kamon.metrics val collectionContext = metricsExtension.buildDefaultCollectionContext val metricsSubscriber = { - val tickInterval = Kamon.metrics.settings.tickInterval.toMillis + val tickInterval = Kamon.metrics.settings.tickInterval // Metrics are always sent to New Relic in 60 seconds intervals. - if (tickInterval == 60000) self + if (tickInterval == 60.seconds) self else context.actorOf(TickMetricSnapshotBuffer.props(1 minute, self), "metric-buffer") } |