Changed logback dependency to provided.

Promoted the logback converter to its own file.

3 files changed, 26 insertions, 9 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")
+}
diff --git a/project/Build.scala b/project/Build.scala
index 3faf7adc..2b022ba6 100644
--- a/project/Build.scala
+++ b/project/Build.scala
@@ -31,7 +31,8 @@ object Build extends Build {
     .settings(aspectJSettings: _*)
     .settings(
       libraryDependencies ++=
-        compile(akkaActor, aspectJ, logback) ++
+        compile(akkaActor, aspectJ) ++
+        provided(logback) ++
         test(scalatest, akkaTestKit, sprayTestkit, akkaSlf4j, logback))
     .dependsOn(kamonCore)