diff options
| author | Ivan Topolnjak <ivantopo@gmail.com> | 2015-08-30 13:36:27 +0200 |
|---|---|---|
| committer | Ivan Topolnjak <ivantopo@gmail.com> | 2015-08-30 13:36:27 +0200 |
| commit | 539b54c3b43c68ad418ca77032f557a4da3e3a59 (patch) | |
| tree | 8f7a5f7528bc6fc16afb0351661e1d4b5687f41a /kamon-spray | |
| parent | 110fff9745a0c1f154ee3d7a5149cd9f162a879f (diff) | |
| download | Kamon-539b54c3b43c68ad418ca77032f557a4da3e3a59.tar.gz Kamon-539b54c3b43c68ad418ca77032f557a4da3e3a59.tar.bz2 Kamon-539b54c3b43c68ad418ca77032f557a4da3e3a59.zip | |
wip: only the modules that actually require an actor system are getting one.
Diffstat (limited to 'kamon-spray')
| -rw-r--r-- | kamon-spray/src/main/resources/reference.conf | 2 | ||||
| -rw-r--r-- | kamon-spray/src/main/scala/kamon/spray/instrumentation/ServerRequestInstrumentation.scala | 7 |
2 files changed, 2 insertions, 7 deletions
diff --git a/kamon-spray/src/main/resources/reference.conf b/kamon-spray/src/main/resources/reference.conf index 1a900fea..1c51d419 100644 --- a/kamon-spray/src/main/resources/reference.conf +++ b/kamon-spray/src/main/resources/reference.conf @@ -39,9 +39,7 @@ kamon { modules { kamon-spray { - auto-start = yes requires-aspectj = yes - extension-id = "kamon.spray.Spray" } } }
\ No newline at end of file diff --git a/kamon-spray/src/main/scala/kamon/spray/instrumentation/ServerRequestInstrumentation.scala b/kamon-spray/src/main/scala/kamon/spray/instrumentation/ServerRequestInstrumentation.scala index d1031962..82d3ceb1 100644 --- a/kamon-spray/src/main/scala/kamon/spray/instrumentation/ServerRequestInstrumentation.scala +++ b/kamon-spray/src/main/scala/kamon/spray/instrumentation/ServerRequestInstrumentation.scala @@ -85,14 +85,11 @@ class ServerRequestInstrumentation { } def verifyTraceContextConsistency(incomingTraceContext: TraceContext, storedTraceContext: TraceContext): Unit = { - def publishWarning(text: String): Unit = - SprayExtension.log.warn(text) - if (incomingTraceContext.nonEmpty) { if (incomingTraceContext.token != storedTraceContext.token) - publishWarning(s"Different trace token found when trying to close a trace, original: [${storedTraceContext.token}] - incoming: [${incomingTraceContext.token}]") + SprayExtension.log.warn(s"Different trace token found when trying to close a trace, original: [${storedTraceContext.token}] - incoming: [${incomingTraceContext.token}]") } else - publishWarning(s"EmptyTraceContext present while closing the trace with token [${storedTraceContext.token}]") + SprayExtension.log.warn(s"EmptyTraceContext present while closing the trace with token [${storedTraceContext.token}]") } def recordHttpServerMetrics(response: HttpMessagePartWrapper, traceName: String): Unit = |