aboutsummaryrefslogtreecommitdiff
path: root/kamon-core/src/main/scala/kamon/trace/logging
diff options
context:
space:
mode:
authorIvan Topolnjak <ivantopo@gmail.com>2014-10-25 04:45:21 +0200
committerIvan Topolnjak <ivantopo@gmail.com>2014-10-25 04:46:59 +0200
commit096b35f93a0bafb3b0b6932d75e8d5f087cd4b2e (patch)
tree156f73c7b2145b21930d52275e47cb8b674bb27a /kamon-core/src/main/scala/kamon/trace/logging
parent30940181424be69e0fd64e945fe5a64b4523457b (diff)
downloadKamon-096b35f93a0bafb3b0b6932d75e8d5f087cd4b2e.tar.gz
Kamon-096b35f93a0bafb3b0b6932d75e8d5f087cd4b2e.tar.bz2
Kamon-096b35f93a0bafb3b0b6932d75e8d5f087cd4b2e.zip
! core: replace Option[TraceContext] by empty object pattern and implement basic segments with renaming.
Diffstat (limited to 'kamon-core/src/main/scala/kamon/trace/logging')
-rw-r--r--kamon-core/src/main/scala/kamon/trace/logging/LogbackTraceTokenConverter.scala8
1 files changed, 7 insertions, 1 deletions
diff --git a/kamon-core/src/main/scala/kamon/trace/logging/LogbackTraceTokenConverter.scala b/kamon-core/src/main/scala/kamon/trace/logging/LogbackTraceTokenConverter.scala
index 4b7dbb28..f052f009 100644
--- a/kamon-core/src/main/scala/kamon/trace/logging/LogbackTraceTokenConverter.scala
+++ b/kamon-core/src/main/scala/kamon/trace/logging/LogbackTraceTokenConverter.scala
@@ -20,5 +20,11 @@ import ch.qos.logback.classic.spi.ILoggingEvent
import kamon.trace.TraceRecorder
class LogbackTraceTokenConverter extends ClassicConverter {
- def convert(event: ILoggingEvent): String = TraceRecorder.currentContext.map(_.token).getOrElse("undefined")
+ def convert(event: ILoggingEvent): String = {
+ val ctx = TraceRecorder.currentContext
+ if (ctx.isEmpty)
+ "undefined"
+ else
+ ctx.token
+ }
}