wip, core/akka/spray are kind of migrated.

4 files changed, 16 insertions, 33 deletions

diff --git a/kamon-spray/src/test/resources/application.conf b/kamon-spray/src/test/resources/application.conf
index 8b137891..88b0de3d 100644
--- a/kamon-spray/src/test/resources/application.conf
+++ b/kamon-spray/src/test/resources/application.conf
@@ -1 +1,6 @@
+kamon {
+  metric.tick-interval = 1 hour
+  spray.name-generator = kamon.spray.TestNameGenerator
+}
 
+akka.loggers = ["akka.event.slf4j.Slf4jLogger"]
diff --git a/kamon-spray/src/test/scala/kamon/spray/ClientRequestInstrumentationSpec.scala b/kamon-spray/src/test/scala/kamon/spray/ClientRequestInstrumentationSpec.scala
index 2279469c..61ad2836 100644
--- a/kamon-spray/src/test/scala/kamon/spray/ClientRequestInstrumentationSpec.scala
+++ b/kamon-spray/src/test/scala/kamon/spray/ClientRequestInstrumentationSpec.scala
@@ -35,17 +35,6 @@ import scala.concurrent.duration._
 class ClientRequestInstrumentationSpec extends BaseKamonSpec("client-request-instrumentation-spec") with ScalaFutures
     with RequestBuilding with TestServer {
 
-  override lazy val config =
-    ConfigFactory.parseString(
-      """
-        |kamon {
-        |  metric.tick-interval = 1 hour
-        |  spray.name-generator = kamon.spray.TestNameGenerator
-        |}
-        |
-        |akka.loggers = ["akka.event.slf4j.Slf4jLogger"]
-      """.stripMargin)
-
   implicit def ec = system.dispatcher
   implicit val defaultPatience = PatienceConfig(timeout = Span(10, Seconds), interval = Span(5, Millis))
 
@@ -134,7 +123,7 @@ class ClientRequestInstrumentationSpec extends BaseKamonSpec("client-request-ins
           tags = Map(
             "trace" -> "assign-name-to-segment-with-request-level-api",
             "category" -> SegmentCategory.HttpClient,
-            "library" -> Spray.SegmentLibraryName))
+            "library" -> SprayExtension.SegmentLibraryName))
 
         segmentMetricsSnapshot.histogram("elapsed-time").get.numberOfMeasurements should be(1)
       }
@@ -169,7 +158,7 @@ class ClientRequestInstrumentationSpec extends BaseKamonSpec("client-request-ins
           tags = Map(
             "trace" -> "assign-name-to-segment-with-request-level-api",
             "category" -> SegmentCategory.HttpClient,
-            "library" -> Spray.SegmentLibraryName))
+            "library" -> SprayExtension.SegmentLibraryName))
 
         segmentMetricsSnapshot.histogram("elapsed-time").get.numberOfMeasurements should be(1)
       }
@@ -206,7 +195,7 @@ class ClientRequestInstrumentationSpec extends BaseKamonSpec("client-request-ins
           tags = Map(
             "trace" -> "rename-segment-with-request-level-api",
             "category" -> SegmentCategory.HttpClient,
-            "library" -> Spray.SegmentLibraryName))
+            "library" -> SprayExtension.SegmentLibraryName))
 
         segmentMetricsSnapshot.histogram("elapsed-time").get.numberOfMeasurements should be(1)
       }
@@ -300,7 +289,7 @@ class ClientRequestInstrumentationSpec extends BaseKamonSpec("client-request-ins
           tags = Map(
             "trace" -> "create-segment-with-host-level-api",
             "category" -> SegmentCategory.HttpClient,
-            "library" -> Spray.SegmentLibraryName))
+            "library" -> SprayExtension.SegmentLibraryName))
 
         segmentMetricsSnapshot.histogram("elapsed-time").get.numberOfMeasurements should be(1)
       }
@@ -308,7 +297,7 @@ class ClientRequestInstrumentationSpec extends BaseKamonSpec("client-request-ins
   }
 
   def traceTokenHeader(token: String): RawHeader =
-    RawHeader(Kamon(Spray).settings.traceTokenHeaderName, token)
+    RawHeader(SprayExtension.settings.traceTokenHeaderName, token)
 
   def enableInternalSegmentCollectionStrategy(): Unit = setSegmentCollectionStrategy(ClientInstrumentationLevel.HostLevelAPI)
   def enablePipeliningSegmentCollectionStrategy(): Unit = setSegmentCollectionStrategy(ClientInstrumentationLevel.RequestLevelAPI)
@@ -316,14 +305,14 @@ class ClientRequestInstrumentationSpec extends BaseKamonSpec("client-request-ins
   def disableAutomaticTraceTokenPropagation(): Unit = setIncludeTraceToken(false)
 
   def setSegmentCollectionStrategy(strategy: ClientInstrumentationLevel.Level): Unit = {
-    val target = Kamon(Spray).settings
+    val target = SprayExtension.settings
     val field = target.getClass.getDeclaredField("clientInstrumentationLevel")
     field.setAccessible(true)
     field.set(target, strategy)
   }
 
   def setIncludeTraceToken(include: Boolean): Unit = {
-    val target = Kamon(Spray).settings
+    val target = SprayExtension.settings
     val field = target.getClass.getDeclaredField("includeTraceTokenHeader")
     field.setAccessible(true)
     field.set(target, include)
@@ -331,7 +320,7 @@ class ClientRequestInstrumentationSpec extends BaseKamonSpec("client-request-ins
 }
 
 class TestNameGenerator extends NameGenerator {
-  def generateTraceName(request: HttpRequest): String = request.uri.path.toString()
+  def generateTraceName(request: HttpRequest): String = "UnnamedTrace"
   def generateRequestLevelApiSegmentName(request: HttpRequest): String = "request-level " + request.uri.path.toString()
   def generateHostLevelApiSegmentName(request: HttpRequest): String = "host-level " + request.uri.path.toString()
 }
diff --git a/kamon-spray/src/test/scala/kamon/spray/SprayServerMetricsSpec.scala b/kamon-spray/src/test/scala/kamon/spray/SprayServerMetricsSpec.scala
index 69f8d2bd..ed0f208f 100644
--- a/kamon-spray/src/test/scala/kamon/spray/SprayServerMetricsSpec.scala
+++ b/kamon-spray/src/test/scala/kamon/spray/SprayServerMetricsSpec.scala
@@ -10,16 +10,6 @@ import spray.httpx.RequestBuilding
 class SprayServerMetricsSpec extends BaseKamonSpec("spray-server-metrics-spec") with RequestBuilding with ScalaFutures
     with PatienceConfiguration with TestServer {
 
-  override lazy val config =
-    ConfigFactory.parseString(
-      """
-        |kamon.metric {
-        |  tick-interval = 1 hour
-        |}
-        |
-        |akka.loggers = ["akka.event.slf4j.Slf4jLogger"]
-      """.stripMargin)
-
   "the Spray Server metrics instrumentation" should {
     "record trace metrics for processed requests" in {
       val (connection, server) = buildClientConnectionAndServer
diff --git a/kamon-spray/src/test/scala/kamon/spray/SprayServerTracingSpec.scala b/kamon-spray/src/test/scala/kamon/spray/SprayServerTracingSpec.scala
index bfd88ac8..45a704db 100644
--- a/kamon-spray/src/test/scala/kamon/spray/SprayServerTracingSpec.scala
+++ b/kamon-spray/src/test/scala/kamon/spray/SprayServerTracingSpec.scala
@@ -19,7 +19,6 @@ package kamon.spray
 import _root_.spray.httpx.RequestBuilding
 import akka.testkit.TestProbe
 import kamon.testkit.BaseKamonSpec
-import kamon.Kamon
 import org.scalatest.concurrent.{ PatienceConfiguration, ScalaFutures }
 import spray.http.HttpHeaders.RawHeader
 import spray.http.{ HttpResponse, HttpRequest }
@@ -53,7 +52,7 @@ class SprayServerTracingSpec extends BaseKamonSpec("spray-server-tracing-spec")
       server.reply(HttpResponse(entity = "ok"))
       val response = client.expectMsgType[HttpResponse]
 
-      response.headers.count(_.name == Kamon(Spray).settings.traceTokenHeaderName) should be(1)
+      response.headers.count(_.name == SprayExtension.settings.traceTokenHeaderName) should be(1)
 
     }
 
@@ -73,13 +72,13 @@ class SprayServerTracingSpec extends BaseKamonSpec("spray-server-tracing-spec")
   }
 
   def traceTokenHeader(token: String): RawHeader =
-    RawHeader(Kamon(Spray).settings.traceTokenHeaderName, token)
+    RawHeader(SprayExtension.settings.traceTokenHeaderName, token)
 
   def enableAutomaticTraceTokenPropagation(): Unit = setIncludeTraceToken(true)
   def disableAutomaticTraceTokenPropagation(): Unit = setIncludeTraceToken(false)
 
   def setIncludeTraceToken(include: Boolean): Unit = {
-    val target = Kamon(Spray).settings
+    val target = SprayExtension.settings
     val field = target.getClass.getDeclaredField("includeTraceTokenHeader")
     field.setAccessible(true)
     field.set(target, include)