separate the build into core, testkit and core-tests projects

27 files changed, 34 insertions, 75 deletions

diff --git a/build.sbt b/build.sbt
index 37b3abe3..ccd74cd6 100644
--- a/build.sbt
+++ b/build.sbt
@@ -1,5 +1,5 @@
 /* =========================================================================================
- * Copyright © 2013-2016 the kamon project <http://kamon.io/>
+ * Copyright © 2013-2017 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
@@ -14,51 +14,49 @@
  */
 
 
-scalaVersion := "2.11.8"
-crossScalaVersions := Seq("2.12.2", "2.11.8", "2.10.6")
-concurrentRestrictions in Global += Tags.limit(Tags.Test, 1)
-
 lazy val kamon = (project in file("."))
   .settings(moduleName := "kamon")
   .settings(noPublishing: _*)
-  .aggregate(core)
+  .aggregate(core, testkit, coreTests)
 
+val commonSettings = Seq(
+  isSnapshot := true,
+  scalaVersion := "2.11.8",
+  javacOptions += "-XDignore.symbol.file",
+  resolvers += Resolver.mavenLocal,
+  crossScalaVersions := Seq("2.12.2", "2.11.8", "2.10.6"),
+  concurrentRestrictions in Global += Tags.limit(Tags.Test, 1)
+)
 
 lazy val core = (project in file("kamon-core"))
   .settings(moduleName := "kamon-core")
+  .settings(commonSettings: _*)
   .settings(
-    isSnapshot := true,
-    scalaVersion := "2.11.8",
-    javacOptions += "-XDignore.symbol.file",
-    resolvers += Resolver.mavenLocal,
     libraryDependencies ++= Seq(
-      "com.typesafe"     % "config"          % "1.3.1",
-      "org.slf4j"        % "slf4j-api"       % "1.7.7",
-      "org.hdrhistogram" % "HdrHistogram"    % "2.1.9",
-
-      "com.lihaoyi" %% "fansi" % "0.2.4",
-      "org.scalatest" %% "scalatest" % "3.0.1" % "test",
-      "ch.qos.logback" % "logback-classic" % "1.2.2" % "test"
+      "com.typesafe"     %  "config"          % "1.3.1",
+      "org.slf4j"        %  "slf4j-api"       % "1.7.25",
+      "org.hdrhistogram" %  "HdrHistogram"    % "2.1.9",
+      "com.lihaoyi"      %% "fansi"           % "0.2.4"
     )
   )
 
-//
-//lazy val testkit = (project in file("kamon-testkit"))
-//  .settings(moduleName := "kamon-testkit", resolvers += Resolver.mavenLocal)
-//  .settings(
-//    libraryDependencies ++=
-//      compileScope(akkaDependency("actor").value, akkaDependency("testkit").value) ++
-//      providedScope(aspectJ) ++
-//      testScope(slf4jApi, slf4jnop)
-//  ).dependsOn(core)
+lazy val testkit = (project in file("kamon-testkit"))
+  .settings(moduleName := "kamon-testkit")
+  .settings(commonSettings: _*)
+  .settings(
+    libraryDependencies ++= Seq(
+      "org.scalatest" %% "scalatest" % "3.0.1"
+    )
+  ).dependsOn(core)
+
 
-//
-//lazy val coreTests = (project in file("kamon-core-tests"))
-//  .settings(moduleName := "kamon-core-tests", resolvers += Resolver.mavenLocal)
-//  .settings(noPublishing: _*)
-//  .settings(
-//   libraryDependencies ++=
-//     compileScope(akkaDependency("actor").value, akkaDependency("testkit").value) ++
-//       providedScope(aspectJ) ++
-//       testScope(slf4jApi, slf4jnop)
-//  ).dependsOn(testkit )
+lazy val coreTests = (project in file("kamon-core-tests"))
+  .settings(moduleName := "kamon-core-tests", resolvers += Resolver.mavenLocal)
+  .settings(noPublishing: _*)
+  .settings(commonSettings: _*)
+  .settings(
+    libraryDependencies ++= Seq(
+      "org.scalatest" %% "scalatest" % "3.0.1" % "test",
+      "ch.qos.logback" % "logback-classic" % "1.2.2" % "test"
+    )
+  ).dependsOn(testkit)
diff --git a/kamon-core/src/test/scala/kamon/EnvironmentSpec.scala b/kamon-core-tests/src/test/scala/kamon/EnvironmentSpec.scala
index 2dee46ab..2dee46ab 100644
--- a/kamon-core/src/test/scala/kamon/EnvironmentSpec.scala
+++ b/kamon-core-tests/src/test/scala/kamon/EnvironmentSpec.scala
diff --git a/kamon-core/src/test/scala/kamon/UtilsOnConfigSpec.scala b/kamon-core-tests/src/test/scala/kamon/UtilsOnConfigSpec.scala
index 8b0e0790..8b0e0790 100644
--- a/kamon-core/src/test/scala/kamon/UtilsOnConfigSpec.scala
+++ b/kamon-core-tests/src/test/scala/kamon/UtilsOnConfigSpec.scala
diff --git a/kamon-core/src/test/scala/kamon/context/ContextCodecSpec.scala b/kamon-core-tests/src/test/scala/kamon/context/ContextCodecSpec.scala
index 11be85a7..11be85a7 100644
--- a/kamon-core/src/test/scala/kamon/context/ContextCodecSpec.scala
+++ b/kamon-core-tests/src/test/scala/kamon/context/ContextCodecSpec.scala
diff --git a/kamon-core/src/test/scala/kamon/context/ThreadLocalStorageSpec.scala b/kamon-core-tests/src/test/scala/kamon/context/ThreadLocalStorageSpec.scala
index 39f316ba..39f316ba 100644
--- a/kamon-core/src/test/scala/kamon/context/ThreadLocalStorageSpec.scala
+++ b/kamon-core-tests/src/test/scala/kamon/context/ThreadLocalStorageSpec.scala
diff --git a/kamon-core/src/test/scala/kamon/metric/FilterSpec.scala b/kamon-core-tests/src/test/scala/kamon/metric/FilterSpec.scala
index cda76dc2..cda76dc2 100644
--- a/kamon-core/src/test/scala/kamon/metric/FilterSpec.scala
+++ b/kamon-core-tests/src/test/scala/kamon/metric/FilterSpec.scala
diff --git a/kamon-core/src/test/scala/kamon/metric/GlobPathFilterSpec.scala b/kamon-core-tests/src/test/scala/kamon/metric/GlobPathFilterSpec.scala
index c21b1256..c21b1256 100644
--- a/kamon-core/src/test/scala/kamon/metric/GlobPathFilterSpec.scala
+++ b/kamon-core-tests/src/test/scala/kamon/metric/GlobPathFilterSpec.scala
diff --git a/kamon-core/src/test/scala/kamon/metric/HistogramSpec.scala b/kamon-core-tests/src/test/scala/kamon/metric/HistogramSpec.scala
index f0ea1292..f0ea1292 100644
--- a/kamon-core/src/test/scala/kamon/metric/HistogramSpec.scala
+++ b/kamon-core-tests/src/test/scala/kamon/metric/HistogramSpec.scala
diff --git a/kamon-core/src/test/scala/kamon/metric/LongAdderCounterSpec.scala b/kamon-core-tests/src/test/scala/kamon/metric/LongAdderCounterSpec.scala
index 4014d6df..4014d6df 100644
--- a/kamon-core/src/test/scala/kamon/metric/LongAdderCounterSpec.scala
+++ b/kamon-core-tests/src/test/scala/kamon/metric/LongAdderCounterSpec.scala
diff --git a/kamon-core/src/test/scala/kamon/metric/MetricLookupSpec.scala b/kamon-core-tests/src/test/scala/kamon/metric/MetricLookupSpec.scala
index 1d60a28f..1d60a28f 100644
--- a/kamon-core/src/test/scala/kamon/metric/MetricLookupSpec.scala
+++ b/kamon-core-tests/src/test/scala/kamon/metric/MetricLookupSpec.scala
diff --git a/kamon-core/src/test/scala/kamon/metric/MinMaxCounterSpec.scala b/kamon-core-tests/src/test/scala/kamon/metric/MinMaxCounterSpec.scala
index 0ad3c45c..0ad3c45c 100644
--- a/kamon-core/src/test/scala/kamon/metric/MinMaxCounterSpec.scala
+++ b/kamon-core-tests/src/test/scala/kamon/metric/MinMaxCounterSpec.scala
diff --git a/kamon-core/src/test/scala/kamon/metric/RecorderRegistrySpec.scala b/kamon-core-tests/src/test/scala/kamon/metric/RecorderRegistrySpec.scala
index 1053aa5f..1053aa5f 100644
--- a/kamon-core/src/test/scala/kamon/metric/RecorderRegistrySpec.scala
+++ b/kamon-core-tests/src/test/scala/kamon/metric/RecorderRegistrySpec.scala
diff --git a/kamon-core/src/test/scala/kamon/metric/RegexPathFilterSpec.scala b/kamon-core-tests/src/test/scala/kamon/metric/RegexPathFilterSpec.scala
index f742df1d..f742df1d 100644
--- a/kamon-core/src/test/scala/kamon/metric/RegexPathFilterSpec.scala
+++ b/kamon-core-tests/src/test/scala/kamon/metric/RegexPathFilterSpec.scala
diff --git a/kamon-core/src/test/scala/kamon/metric/TimerSpec.scala b/kamon-core-tests/src/test/scala/kamon/metric/TimerSpec.scala
index 3fc1e169..3fc1e169 100644
--- a/kamon-core/src/test/scala/kamon/metric/TimerSpec.scala
+++ b/kamon-core-tests/src/test/scala/kamon/metric/TimerSpec.scala
diff --git a/kamon-core/src/test/scala/kamon/metric/instrument/InstrumentFactorySpec.scala b/kamon-core-tests/src/test/scala/kamon/metric/instrument/InstrumentFactorySpec.scala
index 21fe2b4d..21fe2b4d 100644
--- a/kamon-core/src/test/scala/kamon/metric/instrument/InstrumentFactorySpec.scala
+++ b/kamon-core-tests/src/test/scala/kamon/metric/instrument/InstrumentFactorySpec.scala
diff --git a/kamon-core/src/test/scala/kamon/trace/B3SpanCodecSpec.scala b/kamon-core-tests/src/test/scala/kamon/trace/B3SpanCodecSpec.scala
index e6fa283e..e6fa283e 100644
--- a/kamon-core/src/test/scala/kamon/trace/B3SpanCodecSpec.scala
+++ b/kamon-core-tests/src/test/scala/kamon/trace/B3SpanCodecSpec.scala
diff --git a/kamon-core/src/test/scala/kamon/trace/DefaultIdentityGeneratorSpec.scala b/kamon-core-tests/src/test/scala/kamon/trace/DefaultIdentityGeneratorSpec.scala
index 8f9af7b0..8f9af7b0 100644
--- a/kamon-core/src/test/scala/kamon/trace/DefaultIdentityGeneratorSpec.scala
+++ b/kamon-core-tests/src/test/scala/kamon/trace/DefaultIdentityGeneratorSpec.scala
diff --git a/kamon-core/src/test/scala/kamon/trace/DoubleLengthTraceIdentityGeneratorSpec.scala b/kamon-core-tests/src/test/scala/kamon/trace/DoubleLengthTraceIdentityGeneratorSpec.scala
index b22f17e1..b22f17e1 100644
--- a/kamon-core/src/test/scala/kamon/trace/DoubleLengthTraceIdentityGeneratorSpec.scala
+++ b/kamon-core-tests/src/test/scala/kamon/trace/DoubleLengthTraceIdentityGeneratorSpec.scala
diff --git a/kamon-core/src/test/scala/kamon/trace/LocalSpanSpec.scala b/kamon-core-tests/src/test/scala/kamon/trace/LocalSpanSpec.scala
index e24f8727..e24f8727 100644
--- a/kamon-core/src/test/scala/kamon/trace/LocalSpanSpec.scala
+++ b/kamon-core-tests/src/test/scala/kamon/trace/LocalSpanSpec.scala
diff --git a/kamon-core/src/test/scala/kamon/trace/SpanMetrics.scala b/kamon-core-tests/src/test/scala/kamon/trace/SpanMetrics.scala
index 9ecffb24..9ecffb24 100644
--- a/kamon-core/src/test/scala/kamon/trace/SpanMetrics.scala
+++ b/kamon-core-tests/src/test/scala/kamon/trace/SpanMetrics.scala
diff --git a/kamon-core/src/test/scala/kamon/trace/TracerSpec.scala b/kamon-core-tests/src/test/scala/kamon/trace/TracerSpec.scala
index fb5bb313..fb5bb313 100644
--- a/kamon-core/src/test/scala/kamon/trace/TracerSpec.scala
+++ b/kamon-core-tests/src/test/scala/kamon/trace/TracerSpec.scala
diff --git a/kamon-core/src/test/scala/kamon/util/BaggageOnMDCSpec.scala b/kamon-core/src/test/scala/kamon/util/BaggageOnMDCSpec.scala
deleted file mode 100644
index bed6b21b..00000000
--- a/kamon-core/src/test/scala/kamon/util/BaggageOnMDCSpec.scala
+++ /dev/null
@@ -1,39 +0,0 @@
-package kamon.util
-
-import kamon.Kamon
-import kamon.Kamon.buildSpan
-import kamon.trace.SpanContext
-import org.scalatest.{Matchers, WordSpec}
-import org.slf4j.MDC
-
-class BaggageOnMDCSpec extends WordSpec with Matchers {
-
-  "the BaggageOnMDC utility" should {
-    "copy all baggage items and the trace ID to MDC and clear them after evaluating the supplied code" in {
-//      val parent = new SpanContext(1, 1, 0, true, Map.empty)
-//      Kamon.withSpan(buildSpan("propagate-mdc").asChildOf(parent).startManual().setBaggageItem("key-to-mdc", "value")) {
-//
-//        BaggageOnMDC.withBaggageOnMDC {
-//          MDC.get("key-to-mdc") should be("value")
-//          MDC.get("trace_id") should be(HexCodec.toLowerHex(1))
-//        }
-//
-//        MDC.get("key-to-mdc") should be(null)
-//        MDC.get("trace_id") should be(null)
-//      }
-    }
-
-    "don't copy the trace ID to MDC if not required" in {
-//      Kamon.withSpan(buildSpan("propagate-mdc").startManual().setBaggageItem("key-to-mdc", "value")) {
-//        BaggageOnMDC.withBaggageOnMDC(false, {
-//          MDC.get("key-to-mdc") should be("value")
-//          MDC.get("trace_id") should be(null)
-//        })
-//
-//        MDC.get("key-to-mdc") should be(null)
-//        MDC.get("trace_id") should be(null)
-//      }
-    }
-  }
-
-}
diff --git a/kamon-core/src/test/scala/kamon/testkit/MetricInspection.scala b/kamon-testkit/src/main/scala/kamon/testkit/MetricInspection.scala
index d0681fb5..d0681fb5 100644
--- a/kamon-core/src/test/scala/kamon/testkit/MetricInspection.scala
+++ b/kamon-testkit/src/main/scala/kamon/testkit/MetricInspection.scala
diff --git a/kamon-core/src/test/scala/kamon/testkit/Reconfigure.scala b/kamon-testkit/src/main/scala/kamon/testkit/Reconfigure.scala
index 4b3b2cdb..4b3b2cdb 100644
--- a/kamon-core/src/test/scala/kamon/testkit/Reconfigure.scala
+++ b/kamon-testkit/src/main/scala/kamon/testkit/Reconfigure.scala
diff --git a/kamon-core/src/test/scala/kamon/testkit/SpanBuilding.scala b/kamon-testkit/src/main/scala/kamon/testkit/SpanBuilding.scala
index 7a216ecc..7a216ecc 100644
--- a/kamon-core/src/test/scala/kamon/testkit/SpanBuilding.scala
+++ b/kamon-testkit/src/main/scala/kamon/testkit/SpanBuilding.scala
diff --git a/kamon-core/src/test/scala/kamon/testkit/SpanInspector.scala b/kamon-testkit/src/main/scala/kamon/testkit/SpanInspector.scala
index f23fba98..f23fba98 100644
--- a/kamon-core/src/test/scala/kamon/testkit/SpanInspector.scala
+++ b/kamon-testkit/src/main/scala/kamon/testkit/SpanInspector.scala
diff --git a/kamon-core/src/test/scala/kamon/testkit/TestSpanReporter.scala b/kamon-testkit/src/main/scala/kamon/testkit/TestSpanReporter.scala
index 8ea2d433..8ea2d433 100644
--- a/kamon-core/src/test/scala/kamon/testkit/TestSpanReporter.scala
+++ b/kamon-testkit/src/main/scala/kamon/testkit/TestSpanReporter.scala