! all: improve the metric recorders infrastructure

2 files changed, 30 insertions, 12 deletions

diff --git a/project/Dependencies.scala b/project/Dependencies.scala
index 6b085067..71054506 100644
--- a/project/Dependencies.scala
+++ b/project/Dependencies.scala
@@ -35,7 +35,7 @@ object Dependencies {
   val logback         = "ch.qos.logback"            %   "logback-classic"       % "1.0.13"
   val aspectJ         = "org.aspectj"               %   "aspectjweaver"         % aspectjVersion
   val newrelic        = "com.newrelic.agent.java"   %   "newrelic-api"          % "3.11.0"
-  val hdrHistogram    = "org.hdrhistogram"          %   "HdrHistogram"          % "2.0.3"
+  val hdrHistogram    = "org.hdrhistogram"          %   "HdrHistogram"          % "2.1.3"
   val sprayCan        = "io.spray"                  %%  "spray-can"             % sprayVersion
   val sprayRouting    = "io.spray"                  %%  "spray-routing"         % sprayVersion
   val sprayTestkit    = "io.spray"                  %%  "spray-testkit"         % sprayVersion
diff --git a/project/Projects.scala b/project/Projects.scala
index a8d4b526..2004ac07 100644
--- a/project/Projects.scala
+++ b/project/Projects.scala
@@ -29,7 +29,7 @@ object Projects extends Build {
     .settings(noPublishing: _*)
 
 
-  lazy val kamonCore = Project("kamon-core", file("kamon-core"))
+  lazy val kamonCore: Project = Project("kamon-core", file("kamon-core"))
     .dependsOn(kamonMacros % "compile-internal, test-internal")
     .settings(basicSettings: _*)
     .settings(formatSettings: _*)
@@ -41,21 +41,36 @@ object Projects extends Build {
       libraryDependencies ++=
         compile(akkaActor, hdrHistogram) ++
         provided(aspectJ) ++
-        optional(logback, scalazConcurrent) ++
+        optional(logback) ++
         test(scalatest, akkaTestKit, akkaSlf4j, slf4Jul, slf4Log4j, logback))
 
 
   lazy val kamonAkka = Project("kamon-akka", file("kamon-akka"))
-    .dependsOn(kamonCore)
+    .dependsOn(kamonCore % "compile->compile;test->test")
     .dependsOn(kamonMacros % "compile-internal, test-internal")
+    .dependsOn(kamonScala)
     .settings(basicSettings: _* )
     .settings(formatSettings: _*)
     .settings(aspectJSettings: _*)
     .settings(
       libraryDependencies ++=
         compile(akkaActor) ++
+          provided(aspectJ) ++
+          optional(logback) ++
+          test(scalatest, akkaTestKit, akkaSlf4j, slf4Jul, slf4Log4j, logback))
+
+
+  lazy val kamonScala = Project("kamon-scala", file("kamon-scala"))
+    .dependsOn(kamonCore % "compile->compile;test->test")
+    .dependsOn(kamonMacros % "compile-internal, test-internal")
+    .settings(basicSettings: _* )
+    .settings(formatSettings: _*)
+    .settings(aspectJSettings: _*)
+    .settings(
+      libraryDependencies ++=
+        compile() ++
         provided(aspectJ) ++
-        optional(logback) ++
+        optional(scalazConcurrent) ++
         test(scalatest, akkaTestKit, akkaSlf4j, slf4Jul, slf4Log4j, logback))
 
   lazy val kamonAkkaRemote = Project("kamon-akka-remote", file("kamon-akka-remote"))
@@ -67,7 +82,7 @@ object Projects extends Build {
       libraryDependencies ++=
         compile(akkaRemote, akkaCluster) ++
         provided(aspectJ) ++
-        test(scalatest, akkaTestKit))
+        test(scalatest, akkaTestKit, akkaSlf4j, slf4Jul, slf4Log4j, logback))
 
 
   lazy val kamonSpray = Project("kamon-spray", file("kamon-spray"))
@@ -81,8 +96,9 @@ object Projects extends Build {
       libraryDependencies ++=
         compile(akkaActor, sprayCan, sprayClient, sprayRouting) ++
         provided(aspectJ) ++
-        test(scalatest, akkaTestKit, sprayTestkit, slf4Api, slf4nop))
-    .dependsOn(kamonCore)
+        test(scalatest, akkaTestKit, sprayTestkit, akkaSlf4j, slf4Jul, slf4Log4j, logback))
+    .dependsOn(kamonCore % "compile->compile;test->test")
+    .dependsOn(kamonAkka)
     .dependsOn(kamonTestkit % "test")
 
 
@@ -96,6 +112,7 @@ object Projects extends Build {
         provided(aspectJ) ++
         test(scalatest, akkaTestKit, sprayTestkit, slf4Api, akkaSlf4j))
     .dependsOn(kamonCore)
+    .dependsOn(kamonTestkit % "compile->compile;test->test")
 
 
   lazy val kamonPlayground = Project("kamon-playground", file("kamon-playground"))
@@ -137,7 +154,9 @@ object Projects extends Build {
         compile(play, playWS) ++
         provided(aspectJ) ++
         test(playTest, akkaTestKit, slf4Api))
-    .dependsOn(kamonCore)
+    .dependsOn(kamonCore % "compile->compile;test->test")
+    .dependsOn(kamonScala)
+    .dependsOn(kamonAkka)
 
   lazy val kamonStatsD = Project("kamon-statsd", file("kamon-statsd"))
     .settings(basicSettings: _*)
@@ -167,7 +186,6 @@ object Projects extends Build {
         compile(akkaActor) ++
         test(scalatest, akkaTestKit, slf4Api, slf4nop))
     .dependsOn(kamonCore)
-    .dependsOn(kamonSystemMetrics % "provided")
 
   lazy val kamonMacros = Project("kamon-macros", file("kamon-macros"))
     .settings(basicSettings: _*)
@@ -183,7 +201,7 @@ object Projects extends Build {
         libraryDependencies ++=
           compile(sigarLoader) ++
           test(scalatest, akkaTestKit, slf4Api, slf4Jul, slf4Log4j, logback))
-      .dependsOn(kamonCore)
+      .dependsOn(kamonCore % "compile->compile;test->test")
   
   lazy val kamonJdbc = Project("kamon-jdbc", file("kamon-jdbc"))
       .settings(basicSettings: _*)
@@ -193,7 +211,7 @@ object Projects extends Build {
         libraryDependencies ++=
           test(h2,scalatest, akkaTestKit, slf4Api) ++
           provided(aspectJ))
-      .dependsOn(kamonCore)
+      .dependsOn(kamonCore % "compile->compile;test->test")
 
   val noPublishing = Seq(publish := (), publishLocal := (), publishArtifact := false)
 }