aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDiego <diegolparra@gmail.com>2014-11-19 22:54:38 -0300
committerDiego <diegolparra@gmail.com>2014-11-19 22:54:38 -0300
commit7a02ee891535e18cb48fad67127ddf544749d060 (patch)
tree789561026510d88a4bcb5e0f160fa8268120d899
parentc03a0c5dd2a490d4b4ccbde58d18ceccc1867b44 (diff)
downloadKamon-7a02ee891535e18cb48fad67127ddf544749d060.tar.gz
Kamon-7a02ee891535e18cb48fad67127ddf544749d060.tar.bz2
Kamon-7a02ee891535e18cb48fad67127ddf544749d060.zip
! core: update HdrHistogram to 2.0.3
-rw-r--r--kamon-core/src/test/scala/kamon/instrumentation/akka/ActorLoggingInstrumentationSpec.scala2
-rw-r--r--kamon-core/src/test/scala/kamon/trace/TraceLocalSpec.scala2
-rw-r--r--kamon-play/src/test/scala/kamon/play/LoggerLikeInstrumentationSpec.scala4
-rw-r--r--project/Dependencies.scala2
4 files changed, 5 insertions, 5 deletions
diff --git a/kamon-core/src/test/scala/kamon/instrumentation/akka/ActorLoggingInstrumentationSpec.scala b/kamon-core/src/test/scala/kamon/instrumentation/akka/ActorLoggingInstrumentationSpec.scala
index cef335e0..4b114d4f 100644
--- a/kamon-core/src/test/scala/kamon/instrumentation/akka/ActorLoggingInstrumentationSpec.scala
+++ b/kamon-core/src/test/scala/kamon/instrumentation/akka/ActorLoggingInstrumentationSpec.scala
@@ -20,7 +20,7 @@ import akka.event.Logging.LogEvent
import akka.testkit.TestKit
import kamon.trace.TraceLocal.AvailableToMdc
import kamon.trace.logging.MdcKeysSupport
-import kamon.trace.{TraceLocal, TraceContextAware, TraceRecorder}
+import kamon.trace.{ TraceLocal, TraceContextAware, TraceRecorder }
import org.scalatest.{ Inspectors, Matchers, WordSpecLike }
import org.slf4j.MDC
diff --git a/kamon-core/src/test/scala/kamon/trace/TraceLocalSpec.scala b/kamon-core/src/test/scala/kamon/trace/TraceLocalSpec.scala
index b23c1c03..f2b25820 100644
--- a/kamon-core/src/test/scala/kamon/trace/TraceLocalSpec.scala
+++ b/kamon-core/src/test/scala/kamon/trace/TraceLocalSpec.scala
@@ -21,7 +21,7 @@ import akka.testkit.TestKit
import kamon.trace.TraceLocal.AvailableToMdc
import kamon.trace.logging.MdcKeysSupport
import org.scalatest.concurrent.PatienceConfiguration
-import org.scalatest.{Matchers, OptionValues, WordSpecLike}
+import org.scalatest.{ Matchers, OptionValues, WordSpecLike }
import org.slf4j.MDC
class TraceLocalSpec extends TestKit(ActorSystem("trace-local-spec")) with WordSpecLike with Matchers
diff --git a/kamon-play/src/test/scala/kamon/play/LoggerLikeInstrumentationSpec.scala b/kamon-play/src/test/scala/kamon/play/LoggerLikeInstrumentationSpec.scala
index 04ae9729..622c2501 100644
--- a/kamon-play/src/test/scala/kamon/play/LoggerLikeInstrumentationSpec.scala
+++ b/kamon-play/src/test/scala/kamon/play/LoggerLikeInstrumentationSpec.scala
@@ -16,7 +16,7 @@
package kamon.play
import ch.qos.logback.classic.spi.ILoggingEvent
-import ch.qos.logback.classic.{AsyncAppender, LoggerContext}
+import ch.qos.logback.classic.{ AsyncAppender, LoggerContext }
import ch.qos.logback.core.read.ListAppender
import ch.qos.logback.core.status.NopStatusListener
import kamon.trace.TraceLocal
@@ -31,7 +31,7 @@ import play.api.test.Helpers._
import play.api.test._
import scala.concurrent.duration._
-import scala.concurrent.{Await, Future}
+import scala.concurrent.{ Await, Future }
class LoggerLikeInstrumentationSpec extends PlaySpec with OneServerPerSuite with BeforeAndAfter {
diff --git a/project/Dependencies.scala b/project/Dependencies.scala
index 09f16043..b545d2cb 100644
--- a/project/Dependencies.scala
+++ b/project/Dependencies.scala
@@ -20,7 +20,7 @@ object Dependencies {
val logback = "ch.qos.logback" % "logback-classic" % "1.0.13"
val aspectJ = "org.aspectj" % "aspectjweaver" % aspectjVersion
val newrelic = "com.newrelic.agent.java" % "newrelic-api" % "3.11.0"
- val hdrHistogram = "org.hdrhistogram" % "HdrHistogram" % "1.2.1"
+ val hdrHistogram = "org.hdrhistogram" % "HdrHistogram" % "2.0.3"
val sprayCan = "io.spray" %% "spray-can" % sprayVersion
val sprayRouting = "io.spray" %% "spray-routing" % sprayVersion
val sprayTestkit = "io.spray" %% "spray-testkit" % sprayVersion