diff options
Diffstat (limited to 'kamon-core/src/test/scala')
7 files changed, 21 insertions, 17 deletions
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 { |