diff options
25 files changed, 55 insertions, 58 deletions
diff --git a/kamon-core/src/main/scala/kamon/instrumentation/akka/AskPatternInstrumentation.scala b/kamon-core/src/main/scala/kamon/instrumentation/akka/AskPatternInstrumentation.scala index 3bf13ce2..5e8175fa 100644 --- a/kamon-core/src/main/scala/kamon/instrumentation/akka/AskPatternInstrumentation.scala +++ b/kamon-core/src/main/scala/kamon/instrumentation/akka/AskPatternInstrumentation.scala @@ -30,7 +30,7 @@ class AskPatternInstrumentation { class StackTraceCaptureException extends Throwable - @Pointcut(value = "execution(* akka.pattern.PromiseActorRef$.apply(..)) && args(provider, *, *)", argNames = "provider") + @Pointcut(value = "execution(* akka.pattern.PromiseActorRef$.apply(..)) && args(provider, *)", argNames = "provider") def promiseActorRefApply(provider: ActorRefProvider): Unit = {} @AfterReturning(pointcut = "promiseActorRefApply(provider)", returning = "promiseActor") diff --git a/kamon-core/src/main/scala/kamon/metric/MetricsExtension.scala b/kamon-core/src/main/scala/kamon/metric/MetricsExtension.scala index 51cda6b2..05bab175 100644 --- a/kamon-core/src/main/scala/kamon/metric/MetricsExtension.scala +++ b/kamon-core/src/main/scala/kamon/metric/MetricsExtension.scala @@ -38,7 +38,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-core/src/main/scala/kamon/metric/Subscriptions.scala b/kamon-core/src/main/scala/kamon/metric/Subscriptions.scala index c6571507..1ba9f312 100644 --- a/kamon-core/src/main/scala/kamon/metric/Subscriptions.scala +++ b/kamon-core/src/main/scala/kamon/metric/Subscriptions.scala @@ -99,7 +99,7 @@ class Subscriptions extends Actor { def scheduleFlushMessage(): Cancellable = { val config = context.system.settings.config - val tickInterval = Duration(config.getDuration("kamon.metrics.tick-interval", TimeUnit.NANOSECONDS), TimeUnit.NANOSECONDS) + val tickInterval = Duration(config.getMilliseconds("kamon.metrics.tick-interval"), TimeUnit.MILLISECONDS) context.system.scheduler.schedule(tickInterval, tickInterval, self, FlushMetrics)(context.dispatcher) } } diff --git a/kamon-core/src/main/scala/kamon/metric/instrument/Gauge.scala b/kamon-core/src/main/scala/kamon/metric/instrument/Gauge.scala index efd7d78f..0c1815c3 100644 --- a/kamon-core/src/main/scala/kamon/metric/instrument/Gauge.scala +++ b/kamon-core/src/main/scala/kamon/metric/instrument/Gauge.scala @@ -49,7 +49,7 @@ object Gauge { val highest = config.getLong("highest-trackable-value") val significantDigits = config.getInt("significant-value-digits") - val refreshInterval = config.getDuration("refresh-interval", TimeUnit.MILLISECONDS) + val refreshInterval = config.getMilliseconds("refresh-interval").toInt Gauge(Histogram.Precision(significantDigits), highest, scale, refreshInterval.millis, system)(currentValueCollector) } diff --git a/kamon-core/src/main/scala/kamon/metric/instrument/MinMaxCounter.scala b/kamon-core/src/main/scala/kamon/metric/instrument/MinMaxCounter.scala index 471e7bd4..b8d163cc 100644 --- a/kamon-core/src/main/scala/kamon/metric/instrument/MinMaxCounter.scala +++ b/kamon-core/src/main/scala/kamon/metric/instrument/MinMaxCounter.scala @@ -56,7 +56,7 @@ object MinMaxCounter { val highest = config.getLong("highest-trackable-value") val significantDigits = config.getInt("significant-value-digits") - val refreshInterval = config.getDuration("refresh-interval", TimeUnit.MILLISECONDS) + val refreshInterval = config.getMilliseconds("refresh-interval").toInt apply(highest, Histogram.Precision(significantDigits), Scale.Unit, refreshInterval.millis, system) } diff --git a/kamon-core/src/test/scala/kamon/instrumentation/akka/ActorCellInstrumentationSpec.scala b/kamon-core/src/test/scala/kamon/instrumentation/akka/ActorCellInstrumentationSpec.scala index 0f682500..ee3857c3 100644 --- a/kamon-core/src/test/scala/kamon/instrumentation/akka/ActorCellInstrumentationSpec.scala +++ b/kamon-core/src/test/scala/kamon/instrumentation/akka/ActorCellInstrumentationSpec.scala @@ -13,17 +13,17 @@ * See the License for the specific language governing permissions and * limitations under the License. * ========================================================== */ -package kamon.instrumentation.akka +package kamon.trace.instrumentation -import akka.actor.{ Actor, ActorSystem, Props } -import akka.pattern.{ ask, pipe } -import akka.routing.RoundRobinPool -import akka.testkit.{ ImplicitSender, TestKit } -import akka.util.Timeout -import kamon.trace.TraceRecorder import org.scalatest.WordSpecLike +import akka.actor.{ Actor, Props, ActorSystem } +import akka.testkit.{ ImplicitSender, TestKit } +import kamon.trace.TraceRecorder +import akka.pattern.{ pipe, ask } +import akka.util.Timeout import scala.concurrent.duration._ +import akka.routing.{ RoundRobinRouter } class ActorCellInstrumentationSpec extends TestKit(ActorSystem("actor-cell-instrumentation-spec")) with WordSpecLike with ImplicitSender { @@ -75,7 +75,7 @@ class ActorCellInstrumentationSpec extends TestKit(ActorSystem("actor-cell-instr } trait RoutedEchoActorFixture extends EchoActorFixture { - override val ctxEchoActor = system.actorOf(Props[TraceContextEcho].withRouter(RoundRobinPool(nrOfInstances = 1))) + override val ctxEchoActor = system.actorOf(Props[TraceContextEcho].withRouter(RoundRobinRouter(nrOfInstances = 1))) } } diff --git a/kamon-core/src/test/scala/kamon/metric/ActorMetricsSpec.scala b/kamon-core/src/test/scala/kamon/metric/ActorMetricsSpec.scala index 3160719d..21e0bbba 100644 --- a/kamon-core/src/test/scala/kamon/metric/ActorMetricsSpec.scala +++ b/kamon-core/src/test/scala/kamon/metric/ActorMetricsSpec.scala @@ -20,16 +20,15 @@ import java.nio.LongBuffer import akka.instrumentation.ActorCellMetrics import kamon.Kamon import kamon.metric.ActorMetricsTestActor._ -import kamon.metric.instrument.Histogram.MutableRecord import org.scalatest.{ WordSpecLike, Matchers } import akka.testkit.{ ImplicitSender, TestProbe, TestKitBase } import akka.actor._ import com.typesafe.config.ConfigFactory import scala.concurrent.duration._ -import kamon.metric.Subscriptions.TickMetricSnapshot import kamon.metric.ActorMetrics.{ ActorMetricsRecorder, ActorMetricSnapshot } -class ActorMetricsSpec extends TestKitBase with WordSpecLike with Matchers with ImplicitSender { +class ActorMetricsSpec extends TestKitBase with WordSpecLike with Matchers { + implicit def self = testActor implicit lazy val system: ActorSystem = ActorSystem("actor-metrics-spec", ConfigFactory.parseString( """ |kamon.metrics { diff --git a/kamon-core/src/test/scala/kamon/metric/SubscriptionsProtocolSpec.scala b/kamon-core/src/test/scala/kamon/metric/SubscriptionsProtocolSpec.scala index 9144725e..60923a2b 100644 --- a/kamon-core/src/test/scala/kamon/metric/SubscriptionsProtocolSpec.scala +++ b/kamon-core/src/test/scala/kamon/metric/SubscriptionsProtocolSpec.scala @@ -8,7 +8,8 @@ import kamon.metric.Subscriptions.TickMetricSnapshot import org.scalatest.{ Matchers, WordSpecLike } import scala.concurrent.duration._ -class SubscriptionsProtocolSpec extends TestKitBase with WordSpecLike with Matchers with ImplicitSender { +class SubscriptionsProtocolSpec extends TestKitBase with WordSpecLike with Matchers { + implicit def self = testActor implicit lazy val system: ActorSystem = ActorSystem("subscriptions-protocol-spec", ConfigFactory.parseString( """ |kamon.metrics { diff --git a/kamon-core/src/test/scala/kamon/metric/TickMetricSnapshotBufferSpec.scala b/kamon-core/src/test/scala/kamon/metric/TickMetricSnapshotBufferSpec.scala index 79c9c63b..27eb64e2 100644 --- a/kamon-core/src/test/scala/kamon/metric/TickMetricSnapshotBufferSpec.scala +++ b/kamon-core/src/test/scala/kamon/metric/TickMetricSnapshotBufferSpec.scala @@ -26,7 +26,8 @@ import akka.actor.ActorSystem import scala.concurrent.duration._ import kamon.metric.Subscriptions.TickMetricSnapshot -class TickMetricSnapshotBufferSpec extends TestKitBase with WordSpecLike with Matchers with ImplicitSender { +class TickMetricSnapshotBufferSpec extends TestKitBase with WordSpecLike with Matchers { + implicit def self = testActor implicit lazy val system: ActorSystem = ActorSystem("trace-metrics-spec", ConfigFactory.parseString( """ |kamon.metrics { diff --git a/kamon-core/src/test/scala/kamon/metric/TraceMetricsSpec.scala b/kamon-core/src/test/scala/kamon/metric/TraceMetricsSpec.scala index 8a87408d..23977971 100644 --- a/kamon-core/src/test/scala/kamon/metric/TraceMetricsSpec.scala +++ b/kamon-core/src/test/scala/kamon/metric/TraceMetricsSpec.scala @@ -9,7 +9,8 @@ import kamon.trace.TraceContext.SegmentIdentity import kamon.trace.TraceRecorder import org.scalatest.{ Matchers, WordSpecLike } -class TraceMetricsSpec extends TestKitBase with WordSpecLike with Matchers with ImplicitSender { +class TraceMetricsSpec extends TestKitBase with WordSpecLike with Matchers { + implicit def self = testActor implicit lazy val system: ActorSystem = ActorSystem("trace-metrics-spec", ConfigFactory.parseString( """ |kamon.metrics { diff --git a/kamon-core/src/test/scala/kamon/metric/UserMetricsSpec.scala b/kamon-core/src/test/scala/kamon/metric/UserMetricsSpec.scala index 6c4fe3fb..e072d3ef 100644 --- a/kamon-core/src/test/scala/kamon/metric/UserMetricsSpec.scala +++ b/kamon-core/src/test/scala/kamon/metric/UserMetricsSpec.scala @@ -11,7 +11,8 @@ import kamon.metric.instrument.Histogram.MutableRecord import org.scalatest.{ Matchers, WordSpecLike } import scala.concurrent.duration._ -class UserMetricsSpec extends TestKitBase with WordSpecLike with Matchers with ImplicitSender { +class UserMetricsSpec extends TestKitBase with WordSpecLike with Matchers { + implicit def self = testActor implicit lazy val system: ActorSystem = ActorSystem("actor-metrics-spec", ConfigFactory.parseString( """ |kamon.metrics { diff --git a/kamon-core/src/test/scala/kamon/trace/TraceContextManipulationSpec.scala b/kamon-core/src/test/scala/kamon/trace/TraceContextManipulationSpec.scala index 4d0049f1..d073f68e 100644 --- a/kamon-core/src/test/scala/kamon/trace/TraceContextManipulationSpec.scala +++ b/kamon-core/src/test/scala/kamon/trace/TraceContextManipulationSpec.scala @@ -1,12 +1,13 @@ package kamon.trace import akka.actor.ActorSystem -import akka.testkit.{ ImplicitSender, TestKitBase } +import akka.testkit.TestKitBase import com.typesafe.config.ConfigFactory import kamon.trace.TraceContext.SegmentIdentity import org.scalatest.{ Matchers, WordSpecLike } -class TraceContextManipulationSpec extends TestKitBase with WordSpecLike with Matchers with ImplicitSender { +class TraceContextManipulationSpec extends TestKitBase with WordSpecLike with Matchers { + implicit def self = testActor implicit lazy val system: ActorSystem = ActorSystem("trace-metrics-spec", ConfigFactory.parseString( """ |kamon.metrics { diff --git a/kamon-datadog/src/main/scala/kamon/datadog/Datadog.scala b/kamon-datadog/src/main/scala/kamon/datadog/Datadog.scala index b0116d00..0f105721 100644 --- a/kamon-datadog/src/main/scala/kamon/datadog/Datadog.scala +++ b/kamon-datadog/src/main/scala/kamon/datadog/Datadog.scala @@ -16,18 +16,16 @@ package kamon.datadog -import java.net.InetSocketAddress -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._ import kamon.metrics._ - -import scala.collection.JavaConverters._ +import kamon.metrics.CPUMetrics import scala.concurrent.duration._ +import scala.collection.JavaConverters._ +import akka.event.Logging +import java.net.InetSocketAddress object Datadog extends ExtensionId[DatadogExtension] with ExtensionIdProvider { override def lookup(): ExtensionId[_ <: Extension] = Datadog @@ -45,9 +43,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/kamon-newrelic/src/main/scala/kamon/newrelic/Agent.scala b/kamon-newrelic/src/main/scala/kamon/newrelic/Agent.scala index 9c4075eb..299773e4 100644 --- a/kamon-newrelic/src/main/scala/kamon/newrelic/Agent.scala +++ b/kamon-newrelic/src/main/scala/kamon/newrelic/Agent.scala @@ -79,7 +79,7 @@ class Agent extends Actor with RequestBuilding with ResponseTransformation with val compressedPipeline: HttpRequest ⇒ Future[HttpResponse] = encode(Deflate) ~> sendReceive val compressedToJsonPipeline: HttpRequest ⇒ Future[JsValue] = compressedPipeline ~> toJson - def toJson(response: HttpResponse): JsValue = response.entity.asString.parseJson + def toJson(response: HttpResponse): JsValue = response.entity.asString.asJson def selectCollector: Future[String] = { val query = ("method" -> "get_redirect_host") +: baseQuery diff --git a/kamon-newrelic/src/main/scala/kamon/newrelic/NewRelic.scala b/kamon-newrelic/src/main/scala/kamon/newrelic/NewRelic.scala index fd97b2c0..bdac5298 100644 --- a/kamon-newrelic/src/main/scala/kamon/newrelic/NewRelic.scala +++ b/kamon-newrelic/src/main/scala/kamon/newrelic/NewRelic.scala @@ -22,14 +22,13 @@ import kamon.Kamon import kamon.metric.{ UserMetrics, TickMetricSnapshotBuffer, TraceMetrics, Metrics } import kamon.metric.Subscriptions.TickMetricSnapshot import akka.actor -import java.util.concurrent.TimeUnit.MILLISECONDS class NewRelicExtension(system: ExtendedActorSystem) extends Kamon.Extension { val config = system.settings.config.getConfig("kamon.newrelic") val collectionContext = Kamon(Metrics)(system).buildDefaultCollectionContext val metricsListener = system.actorOf(Props[NewRelicMetricsListener], "kamon-newrelic") - val apdexT: Double = config.getDuration("apdexT", MILLISECONDS) / 1E3 // scale to seconds. + val apdexT: Double = config.getMilliseconds("apdexT") / 1E3 // scale to seconds. Kamon(Metrics)(system).subscribe(TraceMetrics, "*", metricsListener, permanently = true) diff --git a/kamon-play/src/main/scala/kamon/play/action/KamonTraceActions.scala b/kamon-play/src/main/scala/kamon/play/action/KamonTraceActions.scala index 36eabf8e..0e777fd5 100644 --- a/kamon-play/src/main/scala/kamon/play/action/KamonTraceActions.scala +++ b/kamon-play/src/main/scala/kamon/play/action/KamonTraceActions.scala @@ -21,7 +21,7 @@ import play.api.mvc._ import scala.concurrent.Future case class TraceName[A](name: String)(action: Action[A]) extends Action[A] { - def apply(request: Request[A]): Future[Result] = { + def apply(request: Request[A]): Future[SimpleResult] = { TraceRecorder.rename(name) action(request) } diff --git a/kamon-play/src/main/scala/kamon/play/instrumentation/RequestInstrumentation.scala b/kamon-play/src/main/scala/kamon/play/instrumentation/RequestInstrumentation.scala index 975510e9..3247fcc9 100644 --- a/kamon-play/src/main/scala/kamon/play/instrumentation/RequestInstrumentation.scala +++ b/kamon-play/src/main/scala/kamon/play/instrumentation/RequestInstrumentation.scala @@ -76,7 +76,7 @@ class RequestInstrumentation { pjp.proceed(Array(EssentialAction(essentialAction))) } - def recordHttpServerMetrics(result: Result, traceName: String, playExtension: PlayExtension): Unit = + def recordHttpServerMetrics(result: SimpleResult, traceName: String, playExtension: PlayExtension): Unit = playExtension.httpServerMetrics.recordResponse(traceName, result.header.status.toString, 1L) @Around("execution(* play.api.GlobalSettings+.onError(..)) && args(request, ex)") diff --git a/kamon-play/src/main/scala/kamon/play/instrumentation/WSInstrumentation.scala b/kamon-play/src/main/scala/kamon/play/instrumentation/WSInstrumentation.scala index 2862ba19..b9f09111 100644 --- a/kamon-play/src/main/scala/kamon/play/instrumentation/WSInstrumentation.scala +++ b/kamon-play/src/main/scala/kamon/play/instrumentation/WSInstrumentation.scala @@ -20,16 +20,16 @@ import org.aspectj.lang.annotation.{ Around, Pointcut, Aspect } import org.aspectj.lang.ProceedingJoinPoint import kamon.trace.TraceRecorder import kamon.metric.TraceMetrics.HttpClientRequest -import play.api.libs.ws.WSRequest +import play.api.libs.ws.WS.WSRequest import scala.concurrent.Future -import play.api.libs.ws.WSResponse +import play.api.libs.ws.Response import scala.util.{ Failure, Success } import scala.concurrent.ExecutionContext.Implicits.global @Aspect class WSInstrumentation { - @Pointcut("execution(* play.api.libs.ws.ning.NingWSRequest.execute()) && this(request)") + @Pointcut("execution(* play.api.libs.ws.WS$WSRequest.execute()) && this(request)") def onExecuteRequest(request: WSRequest): Unit = {} @Around("onExecuteRequest(request)") @@ -38,7 +38,7 @@ class WSInstrumentation { val completionHandle = TraceRecorder.startSegment(HttpClientRequest(request.url), basicRequestAttributes(request)) - val response = pjp.proceed().asInstanceOf[Future[WSResponse]] + val response = pjp.proceed().asInstanceOf[Future[Response]] response.onComplete { case Failure(t) ⇒ completionHandle.map(_.finish(Map("completed-with-error" -> t.getMessage))) diff --git a/kamon-play/src/test/scala/kamon/play/RequestInstrumentationSpec.scala b/kamon-play/src/test/scala/kamon/play/RequestInstrumentationSpec.scala index fc195580..eff6f280 100644 --- a/kamon-play/src/test/scala/kamon/play/RequestInstrumentationSpec.scala +++ b/kamon-play/src/test/scala/kamon/play/RequestInstrumentationSpec.scala @@ -140,7 +140,7 @@ class RequestInstrumentationSpec extends PlaySpec with OneServerPerSuite { } object TraceLocalFilter extends Filter { - override def apply(next: (RequestHeader) ⇒ Future[Result])(header: RequestHeader): Future[Result] = { + override def apply(next: (RequestHeader) ⇒ Future[SimpleResult])(header: RequestHeader): Future[SimpleResult] = { TraceRecorder.withTraceContext(TraceRecorder.currentContext) { TraceLocal.store(TraceLocalKey)(header.headers.get(traceLocalStorageKey).getOrElse("unknown")) diff --git a/kamon-play/src/test/scala/kamon/play/WSInstrumentationSpec.scala b/kamon-play/src/test/scala/kamon/play/WSInstrumentationSpec.scala index 775d3e26..a9a2d5fa 100644 --- a/kamon-play/src/test/scala/kamon/play/WSInstrumentationSpec.scala +++ b/kamon-play/src/test/scala/kamon/play/WSInstrumentationSpec.scala @@ -36,7 +36,6 @@ class WSInstrumentationSpec extends TestKitBase with WordSpecLike with Matchers System.setProperty("config.file", "./kamon-play/src/test/resources/conf/application.conf") - import scala.collection.immutable.StringLike._ implicit lazy val system: ActorSystem = ActorSystem("play-ws-instrumentation-spec", ConfigFactory.parseString( """ |akka { diff --git a/kamon-playground/src/main/scala/test/SimpleRequestProcessor.scala b/kamon-playground/src/main/scala/test/SimpleRequestProcessor.scala index 301a9bbd..e60a4b2a 100644 --- a/kamon-playground/src/main/scala/test/SimpleRequestProcessor.scala +++ b/kamon-playground/src/main/scala/test/SimpleRequestProcessor.scala @@ -23,7 +23,7 @@ import spray.httpx.RequestBuilding import scala.concurrent.{ Await, Future } import kamon.spray.KamonTraceDirectives import scala.util.Random -import akka.routing.RoundRobinPool +import akka.routing.RoundRobinRouter import kamon.trace.TraceRecorder import kamon.Kamon import kamon.metric._ @@ -65,7 +65,7 @@ object SimpleRequestProcessor extends App with SimpleRoutingApp with RequestBuil //Kamon(UserMetrics).registerGauge("test-gauge")(() => 10L) val pipeline = sendReceive - val replier = system.actorOf(Props[Replier].withRouter(RoundRobinPool(nrOfInstances = 2)), "replier") + val replier = system.actorOf(Props[Replier].withRouter(RoundRobinRouter(nrOfInstances = 2)), "replier") val random = new Random() startServer(interface = "localhost", port = 9090) { diff --git a/kamon-statsd/src/main/scala/kamon/statsd/StatsD.scala b/kamon-statsd/src/main/scala/kamon/statsd/StatsD.scala index ff273d9f..c37be23b 100644 --- a/kamon-statsd/src/main/scala/kamon/statsd/StatsD.scala +++ b/kamon-statsd/src/main/scala/kamon/statsd/StatsD.scala @@ -27,7 +27,6 @@ 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 StatsD extends ExtensionId[StatsDExtension] with ExtensionIdProvider { override def lookup(): ExtensionId[_ <: Extension] = StatsD @@ -47,9 +46,9 @@ class StatsDExtension(system: ExtendedActorSystem) extends Kamon.Extension { private val statsDConfig = system.settings.config.getConfig("kamon.statsd") val statsDHost = new InetSocketAddress(statsDConfig.getString("hostname"), statsDConfig.getInt("port")) - val flushInterval = statsDConfig.getDuration("flush-interval", MILLISECONDS) + val flushInterval = statsDConfig.getMilliseconds("flush-interval") val maxPacketSizeInBytes = statsDConfig.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 statsDMetricsListener = buildMetricsListener(tickInterval, flushInterval) diff --git a/project/Dependencies.scala b/project/Dependencies.scala index 1b67d214..88be670c 100644 --- a/project/Dependencies.scala +++ b/project/Dependencies.scala @@ -3,19 +3,19 @@ import sbt._ object Dependencies { val resolutionRepos = Seq( - "spray repo" at "http://repo.spray.io/", + "spray repo" at "http://repo.spray.io/", "typesafe repo" at "http://repo.typesafe.com/typesafe/releases/" ) - val sprayVersion = "1.3.1" - val akkaVersion = "2.3.2" + val sprayVersion = "1.2.1" + val akkaVersion = "2.2.4" + val playVersion = "2.2.2" val aspectjVersion = "1.7.4" val slf4jVersion = "1.7.6" - val playVersion = "2.3.0" - val sprayJson = "io.spray" %% "spray-json" % "1.2.6" + val sprayJson = "io.spray" %% "spray-json" % "1.2.5" val sprayJsonLenses = "net.virtual-void" %% "json-lenses" % "0.5.3" - val scalatest = "org.scalatest" % "scalatest_2.10" % "2.0" + val scalatest = "org.scalatest" % "scalatest_2.10" % "2.1.6" val logback = "ch.qos.logback" % "logback-classic" % "1.0.13" val aspectJ = "org.aspectj" % "aspectjrt" % aspectjVersion val aspectjWeaver = "org.aspectj" % "aspectjweaver" % aspectjVersion @@ -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.1.0" + val playTest = "org.scalatestplus" %% "play" % "1.0.1" 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 8259f2aa..815b3a2d 100644 --- a/project/Projects.scala +++ b/project/Projects.scala @@ -78,7 +78,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, akkaTestKit, slf4Api)) .dependsOn(kamonCore) lazy val kamonStatsD = Project("kamon-statsd", file("kamon-statsd")) @@ -87,7 +87,7 @@ object Projects extends Build { .settings(libraryDependencies ++= compile(akkaActor) ++ test(scalatest, akkaTestKit, slf4Api, slf4nop)) .dependsOn(kamonCore) .dependsOn(kamonSystemMetrics % "provided") - + lazy val kamonDatadog = Project("kamon-datadog", file("kamon-datadog")) .settings(basicSettings: _*) .settings(formatSettings: _*) diff --git a/version.sbt b/version.sbt index 8811f264..d18f0388 100644 --- a/version.sbt +++ b/version.sbt @@ -1 +1 @@ -version in ThisBuild := "0.3.3-SNAPSHOT"
\ No newline at end of file +version in ThisBuild := "0.2.3-SNAPSHOT"
\ No newline at end of file |