= core: fix errors in last commit

2 files changed, 15 insertions, 54 deletions

diff --git a/kamon-playground/src/main/resources/application.conf b/kamon-playground/src/main/resources/application.conf
index a870dc6b..1bcf6708 100644
--- a/kamon-playground/src/main/resources/application.conf
+++ b/kamon-playground/src/main/resources/application.conf
@@ -1,11 +1,6 @@
 akka {
   loglevel = INFO
 
-<<<<<<< Updated upstream
-=======
-  extensions = ["kamon.logreporter.LogReporter"]
-
->>>>>>> Stashed changes
   actor {
     debug {
       unhandled = on
diff --git a/kamon-playground/src/main/scala/test/SimpleRequestProcessor.scala b/kamon-playground/src/main/scala/test/SimpleRequestProcessor.scala
index 58a1478c..1db2db67 100644
--- a/kamon-playground/src/main/scala/test/SimpleRequestProcessor.scala
+++ b/kamon-playground/src/main/scala/test/SimpleRequestProcessor.scala
@@ -17,30 +17,28 @@
 package test
 
 import akka.actor._
-import spray.routing.SimpleRoutingApp
+import akka.routing.RoundRobinPool
 import akka.util.Timeout
-import spray.httpx.RequestBuilding
-import scala.concurrent.{ Await, Future }
-import kamon.spray.KamonTraceDirectives
-import scala.util.Random
-<<<<<<< Updated upstream
-import akka.routing.{ RoundRobinRoutingLogic, Router, ActorRefRoutee, RoundRobinPool }
-=======
-import akka.routing.{RoundRobinRoutingLogic, Router, ActorRefRoutee, RoundRobinPool}
->>>>>>> Stashed changes
-import kamon.trace.TraceRecorder
 import kamon.Kamon
+import kamon.metric.Subscriptions.TickMetricSnapshot
 import kamon.metric._
+import kamon.spray.KamonTraceDirectives
+import kamon.trace.TraceRecorder
 import spray.http.{ StatusCodes, Uri }
-import kamon.metric.Subscriptions.TickMetricSnapshot
+import spray.httpx.RequestBuilding
+import spray.routing.SimpleRoutingApp
+
+import scala.concurrent.{ Await, Future }
+import scala.util.Random
 
 object SimpleRequestProcessor extends App with SimpleRoutingApp with RequestBuilding with KamonTraceDirectives {
-  import scala.concurrent.duration._
-  import spray.client.pipelining._
   import akka.pattern.ask
+  import spray.client.pipelining._
+
+  import scala.concurrent.duration._
 
   implicit val system = ActorSystem("test")
-  import system.dispatcher
+  import test.SimpleRequestProcessor.system.dispatcher
 
   val printer = system.actorOf(Props[PrintWhatever])
 
@@ -69,15 +67,8 @@ object SimpleRequestProcessor extends App with SimpleRoutingApp with RequestBuil
   //Kamon(UserMetrics).registerGauge("test-gauge")(() => 10L)
 
   val pipeline = sendReceive
-<<<<<<< Updated upstream
   val replier = system.actorOf(Props[Replier].withRouter(RoundRobinPool(nrOfInstances = 4)), "replier")
-  val master = system.actorOf(Props[Replier].withRouter(RoundRobinPool(nrOfInstances = 7)), "master")
 
-=======
-  val replier = system.actorOf(Props[Replier].withRouter(RoundRobinPool(nrOfInstances = 2)), "replier")
-  val master = system.actorOf(Props[Master], "Master")
-  master ! Work()
->>>>>>> Stashed changes
   val random = new Random()
 
   startServer(interface = "localhost", port = 9090) {
@@ -110,12 +101,7 @@ object SimpleRequestProcessor extends App with SimpleRoutingApp with RequestBuil
         path("ok") {
           traceName("OK") {
             complete {
-<<<<<<< Updated upstream
-              (master ? "Ok").mapTo[String]
-=======
-              master ! Work()
               "ok"
->>>>>>> Stashed changes
             }
           }
         } ~
@@ -144,27 +130,6 @@ object SimpleRequestProcessor extends App with SimpleRoutingApp with RequestBuil
 
 }
 
-case class Work()
-class Master extends Actor {
-  var router = {
-    val routees = Vector.fill(5) {
-      val r = context.actorOf(Props[PrintWhatever])
-      context.watch(r)
-      ActorRefRoutee(r)
-    }
-    Router(RoundRobinRoutingLogic(), routees)
-  }
-  def receive = {
-    case w: Work =>
-      router.route(w, sender())
-    case Terminated(a) =>
-      router = router.removeRoutee(a)
-      val r = context.actorOf(Props[PrintWhatever])
-      context watch r
-      router = router.addRoutee(r)
-  }
-}
-
 class PrintWhatever extends Actor {
   def receive = {
     case TickMetricSnapshot(from, to, metrics) ⇒
@@ -176,9 +141,10 @@ class PrintWhatever extends Actor {
 object Verifier extends App {
 
   def go: Unit = {
-    import scala.concurrent.duration._
     import spray.client.pipelining._
 
+    import scala.concurrent.duration._
+
     implicit val system = ActorSystem("test")
     import system.dispatcher