diff options
author | Ivan Topolnjak <ivantopo@gmail.com> | 2014-06-19 00:47:36 -0300 |
---|---|---|
committer | Ivan Topolnjak <ivantopo@gmail.com> | 2014-06-19 00:50:27 -0300 |
commit | e4552121e07d48afb4f27859d7edde72c1e3a217 (patch) | |
tree | 5e9b2afe4138fdfa9f9a9fe380e930814dad3fcc | |
parent | 1150d528eb5231993e542c086e2df90cf760d8a7 (diff) | |
download | Kamon-e4552121e07d48afb4f27859d7edde72c1e3a217.tar.gz Kamon-e4552121e07d48afb4f27859d7edde72c1e3a217.tar.bz2 Kamon-e4552121e07d48afb4f27859d7edde72c1e3a217.zip |
= core,datadog: make code compile again
-rw-r--r-- | kamon-core/src/main/scala/kamon/metrics/MetricsExtension.scala | 2 | ||||
-rw-r--r-- | kamon-datadog/src/main/scala/kamon/datadog/Datadog.scala | 7 | ||||
-rw-r--r-- | project/Dependencies.scala | 4 | ||||
-rw-r--r-- | project/Projects.scala | 2 |
4 files changed, 5 insertions, 10 deletions
diff --git a/kamon-core/src/main/scala/kamon/metrics/MetricsExtension.scala b/kamon-core/src/main/scala/kamon/metrics/MetricsExtension.scala index c60babb2..88475dea 100644 --- a/kamon-core/src/main/scala/kamon/metrics/MetricsExtension.scala +++ b/kamon-core/src/main/scala/kamon/metrics/MetricsExtension.scala @@ -34,7 +34,7 @@ class MetricsExtension(system: ExtendedActorSystem) extends Kamon.Extension { val gaugeRecordingsDispatcher = system.dispatchers.lookup(metricsExtConfig.getString("dispatchers.gauge-recordings")) /** Configuration Settings */ - val gaugeRecordingInterval = metricsExtConfig.getDuration("gauge-recording-interval", TimeUnit.MILLISECONDS) + val gaugeRecordingInterval: Long = metricsExtConfig.getMilliseconds("gauge-recording-interval") val storage = TrieMap[MetricGroupIdentity, MetricGroupRecorder]() val filters = loadFilters(metricsExtConfig) diff --git a/kamon-datadog/src/main/scala/kamon/datadog/Datadog.scala b/kamon-datadog/src/main/scala/kamon/datadog/Datadog.scala index 15d5d3fe..1eb2e8a6 100644 --- a/kamon-datadog/src/main/scala/kamon/datadog/Datadog.scala +++ b/kamon-datadog/src/main/scala/kamon/datadog/Datadog.scala @@ -21,11 +21,8 @@ import kamon.Kamon import kamon.metrics._ import scala.concurrent.duration._ import scala.collection.JavaConverters._ -import com.typesafe.config.Config -import java.lang.management.ManagementFactory import akka.event.Logging import java.net.InetSocketAddress -import java.util.concurrent.TimeUnit.MILLISECONDS object Datadog extends ExtensionId[DatadogExtension] with ExtensionIdProvider { override def lookup(): ExtensionId[_ <: Extension] = Datadog @@ -43,9 +40,9 @@ class DatadogExtension(system: ExtendedActorSystem) extends Kamon.Extension { private val datadogConfig = system.settings.config.getConfig("kamon.datadog") val datadogHost = new InetSocketAddress(datadogConfig.getString("hostname"), datadogConfig.getInt("port")) - val flushInterval = datadogConfig.getDuration("flush-interval", MILLISECONDS) + val flushInterval = datadogConfig.getMilliseconds("flush-interval") val maxPacketSizeInBytes = datadogConfig.getBytes("max-packet-size") - val tickInterval = system.settings.config.getDuration("kamon.metrics.tick-interval", MILLISECONDS) + val tickInterval = system.settings.config.getMilliseconds("kamon.metrics.tick-interval") val datadogMetricsListener = buildMetricsListener(tickInterval, flushInterval) diff --git a/project/Dependencies.scala b/project/Dependencies.scala index b0b72cbd..0cc847f7 100644 --- a/project/Dependencies.scala +++ b/project/Dependencies.scala @@ -29,9 +29,7 @@ object Dependencies { val akkaActor = "com.typesafe.akka" %% "akka-actor" % akkaVersion val akkaSlf4j = "com.typesafe.akka" %% "akka-slf4j" % akkaVersion val akkaTestKit = "com.typesafe.akka" %% "akka-testkit" % akkaVersion - val play = "com.typesafe.play" %% "play" % playVersion - val playWS = "com.typesafe.play" %% "play-ws" % playVersion - val playTest = "org.scalatestplus" %% "play" % "1.0.1" + val playTest = "com.typesafe.play" %% "play-test" % playVersion val slf4Api = "org.slf4j" % "slf4j-api" % slf4jVersion val slf4nop = "org.slf4j" % "slf4j-nop" % slf4jVersion val jsr166 = "io.gatling" % "jsr166e" % "1.0" diff --git a/project/Projects.scala b/project/Projects.scala index 0b893458..5d4a89f6 100644 --- a/project/Projects.scala +++ b/project/Projects.scala @@ -73,7 +73,7 @@ object Projects extends Build { .settings(basicSettings: _*) .settings(formatSettings: _*) .settings(aspectJSettings: _*) - .settings(libraryDependencies ++= compile(play, playWS, aspectJ) ++ test(playTest, akkaTestKit, slf4Api)) + .settings(libraryDependencies ++= compile(playTest, aspectJ) ++ test(playTest, slf4Api)) .dependsOn(kamonCore) lazy val kamonStatsd = Project("kamon-statsd", file("kamon-statsd")) |