diff options
| author | Diego <diegolparra@gmail.com> | 2014-08-06 23:39:55 -0300 |
|---|---|---|
| committer | Diego <diegolparra@gmail.com> | 2014-08-06 23:39:55 -0300 |
| commit | 77a88b7a94f4aa2641a821d59a75aa6163267803 (patch) | |
| tree | 5a26008f161409d8495578630b1f1743cf6ea525 | |
| parent | aa4cd4da8bd5d218fafbe926f1e76dce5db44c94 (diff) | |
| download | Kamon-77a88b7a94f4aa2641a821d59a75aa6163267803.tar.gz Kamon-77a88b7a94f4aa2641a821d59a75aa6163267803.tar.bz2 Kamon-77a88b7a94f4aa2641a821d59a75aa6163267803.zip | |
= spray: include macros in kamon-spray
| -rw-r--r-- | kamon-testkit/src/main/scala/testkit/TestProbeInstrumentation.scala | 2 | ||||
| -rw-r--r-- | project/Projects.scala | 6 |
2 files changed, 6 insertions, 2 deletions
diff --git a/kamon-testkit/src/main/scala/testkit/TestProbeInstrumentation.scala b/kamon-testkit/src/main/scala/testkit/TestProbeInstrumentation.scala index 5bfb85be..de867035 100644 --- a/kamon-testkit/src/main/scala/testkit/TestProbeInstrumentation.scala +++ b/kamon-testkit/src/main/scala/testkit/TestProbeInstrumentation.scala @@ -46,7 +46,7 @@ class TestProbeInstrumentation { case _ ⇒ None } - TraceRecorder.withInlineTraceContextReplacement(traceContext) { + TraceRecorder.withTraceContext(traceContext) { pjp.proceed } } diff --git a/project/Projects.scala b/project/Projects.scala index 8259f2aa..9f6a436e 100644 --- a/project/Projects.scala +++ b/project/Projects.scala @@ -29,10 +29,13 @@ object Projects extends Build { lazy val kamonSpray = Project("kamon-spray", file("kamon-spray")) + .dependsOn(kamonMacros % "compile-internal, test-internal") .settings(basicSettings: _*) .settings(formatSettings: _*) .settings(aspectJSettings: _*) .settings( + mappings in (Compile, packageBin) ++= mappings.in(kamonMacros, Compile, packageBin).value, + mappings in (Compile, packageSrc) ++= mappings.in(kamonMacros, Compile, packageSrc).value, libraryDependencies ++= compile(akkaActor, aspectJ, sprayCan, sprayClient, sprayRouting) ++ test(scalatest, akkaTestKit, sprayTestkit, slf4Api, slf4nop)) @@ -71,7 +74,8 @@ object Projects extends Build { lazy val kamonTestkit = Project("kamon-testkit", file("kamon-testkit")) .settings(basicSettings: _*) .settings(formatSettings: _*) - .settings(libraryDependencies ++= compile(akkaActor, akkaTestKit) ++ test(slf4Api, slf4nop)) + .settings( + libraryDependencies ++= compile(akkaActor, akkaTestKit) ++ test(slf4Api, slf4nop)) .dependsOn(kamonCore) lazy val kamonPlay = Project("kamon-play", file("kamon-play")) |