diff options
| author | Diego <diegolparra@gmail.com> | 2016-12-21 20:31:00 -0300 |
|---|---|---|
| committer | Diego <diegolparra@gmail.com> | 2016-12-21 20:31:00 -0300 |
| commit | 1f788b74735282dfb7938caa00f93424ca0ad821 (patch) | |
| tree | ec58bb2703f28c6e404fff468adcc5affae75013 /kamon-core | |
| parent | 72b9071e57a87478446c48513dcb491426eb9920 (diff) | |
| download | Kamon-1f788b74735282dfb7938caa00f93424ca0ad821.tar.gz Kamon-1f788b74735282dfb7938caa00f93424ca0ad821.tar.bz2 Kamon-1f788b74735282dfb7938caa00f93424ca0ad821.zip | |
preparing release 0.6.4
Diffstat (limited to 'kamon-core')
| -rw-r--r-- | kamon-core/src/main/scala/kamon/Kamon.scala | 2 | ||||
| -rw-r--r-- | kamon-core/src/test/scala/kamon/testkit/BaseKamonSpec.scala | 6 |
2 files changed, 4 insertions, 4 deletions
diff --git a/kamon-core/src/main/scala/kamon/Kamon.scala b/kamon-core/src/main/scala/kamon/Kamon.scala index 24b7c07c..a3a59b05 100644 --- a/kamon-core/src/main/scala/kamon/Kamon.scala +++ b/kamon-core/src/main/scala/kamon/Kamon.scala @@ -120,7 +120,7 @@ object Kamon { case Success(_) ⇒ val color = (msg: String) ⇒ s"""\u001B[32m${msg}\u001B[0m""" log.info(color("Kamon-autoweave has been successfully loaded.")) - log.info(color("The AspectJ loadtime weaving agent is now attached to the JVM (you don't need to use -javaagent).")) + log.info(color("The AspectJ load time weaving agent is now attached to the JVM (you don't need to use -javaagent).")) log.info(color("This offers extra flexibility but obviously any classes loaded before attachment will not be woven.")) case Failure(NonFatal(reason)) ⇒ log.debug(s"Kamon-autoweave failed to load. Reason: ${reason.getMessage}.") } diff --git a/kamon-core/src/test/scala/kamon/testkit/BaseKamonSpec.scala b/kamon-core/src/test/scala/kamon/testkit/BaseKamonSpec.scala index b11acbb3..a869149b 100644 --- a/kamon-core/src/test/scala/kamon/testkit/BaseKamonSpec.scala +++ b/kamon-core/src/test/scala/kamon/testkit/BaseKamonSpec.scala @@ -17,13 +17,13 @@ package kamon.testkit import akka.actor.ActorSystem -import akka.testkit.{ ImplicitSender, TestKitBase } +import akka.testkit.{ImplicitSender, TestKitBase} import com.typesafe.config.Config import kamon.Kamon -import kamon.metric.{ Entity, EntitySnapshot, SubscriptionsDispatcher } +import kamon.metric.{Entity, EntitySnapshot, SubscriptionsDispatcher} import kamon.trace.TraceContext import kamon.util.LazyActorRef -import org.scalatest.{ BeforeAndAfterAll, Matchers, WordSpecLike } +import org.scalatest.{BeforeAndAfterAll, Matchers, WordSpecLike} abstract class BaseKamonSpec(actorSystemName: String) extends TestKitBase with WordSpecLike with Matchers with ImplicitSender with BeforeAndAfterAll { lazy val collectionContext = Kamon.metrics.buildDefaultCollectionContext |