diff options
author | Carlos Ferreyra <cferreyra@despegar.com> | 2013-12-26 15:20:36 -0300 |
---|---|---|
committer | Carlos Ferreyra <cferreyra@despegar.com> | 2013-12-26 15:20:36 -0300 |
commit | 9fd83d6a2d53e93e8d5042eeea722e1992e760b5 (patch) | |
tree | 4fb187bc073f04c733e0e0b3949722ee50ef5a03 /kamon-trace | |
parent | 5606d35cb9f06ac655ea2abc4f0aa2e53c892b0f (diff) | |
download | Kamon-9fd83d6a2d53e93e8d5042eeea722e1992e760b5.tar.gz Kamon-9fd83d6a2d53e93e8d5042eeea722e1992e760b5.tar.bz2 Kamon-9fd83d6a2d53e93e8d5042eeea722e1992e760b5.zip |
Changed logback dependency to provided.
Promoted the logback converter to its own file.
Diffstat (limited to 'kamon-trace')
-rw-r--r-- | kamon-trace/src/main/scala/kamon/trace/UowTracing.scala | 8 | ||||
-rw-r--r-- | kamon-trace/src/main/scala/kamon/trace/logging/LogbackUowConverter.scala | 24 |
2 files changed, 24 insertions, 8 deletions
diff --git a/kamon-trace/src/main/scala/kamon/trace/UowTracing.scala b/kamon-trace/src/main/scala/kamon/trace/UowTracing.scala index fcddcf90..20cce830 100644 --- a/kamon-trace/src/main/scala/kamon/trace/UowTracing.scala +++ b/kamon-trace/src/main/scala/kamon/trace/UowTracing.scala @@ -80,11 +80,3 @@ class UowTraceAggregator(reporting: ActorRef, aggregationTimeout: Duration) exte object UowTraceAggregator { def props(reporting: ActorRef, aggregationTimeout: Duration) = Props(classOf[UowTraceAggregator], reporting, aggregationTimeout) } - -package logback { - import ch.qos.logback.classic.pattern.ClassicConverter - import ch.qos.logback.classic.spi.ILoggingEvent - class UowConverter extends ClassicConverter { - def convert(event: ILoggingEvent): String = Trace.context().map(_.uow).getOrElse("undefined") - } -} diff --git a/kamon-trace/src/main/scala/kamon/trace/logging/LogbackUowConverter.scala b/kamon-trace/src/main/scala/kamon/trace/logging/LogbackUowConverter.scala new file mode 100644 index 00000000..add47fdf --- /dev/null +++ b/kamon-trace/src/main/scala/kamon/trace/logging/LogbackUowConverter.scala @@ -0,0 +1,24 @@ +/* =================================================== + * Copyright © 2013 the kamon project <http://kamon.io/> + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + * ========================================================== */ +package kamon.trace.logging + +import ch.qos.logback.classic.pattern.ClassicConverter +import ch.qos.logback.classic.spi.ILoggingEvent +import kamon.trace.Trace + +class LogbackUowConverter extends ClassicConverter { + def convert(event: ILoggingEvent): String = Trace.context().map(_.uow).getOrElse("undefined") +} |