Merge branch 'master' into release-0.2

Conflicts:
	kamon-play/src/test/scala/kamon/play/WSInstrumentationSpec.scala
	kamon-statsd/src/main/scala/kamon/statsd/StatsD.scala
	project/Dependencies.scala
	project/Projects.scala
	version.sbt

3 files changed, 12 insertions, 34 deletions

diff --git a/project/Dependencies.scala b/project/Dependencies.scala
index 1aefcf4b..b0b72cbd 100644
--- a/project/Dependencies.scala
+++ b/project/Dependencies.scala
@@ -21,7 +21,7 @@ object Dependencies {
   val aspectjWeaver   = "org.aspectj"               %   "aspectjweaver"         % aspectjVersion
   val newrelic        = "com.newrelic.agent.java"   %   "newrelic-api"          % "3.1.0"
   val snakeYaml       = "org.yaml"                  %   "snakeyaml"             % "1.13"
-  val hdrHistogram    = "org.hdrhistogram"          %   "HdrHistogram"          % "1.0.8"
+  val hdrHistogram    = "org.hdrhistogram"          %   "HdrHistogram"          % "1.2.1"
   val sprayCan        = "io.spray"                  %   "spray-can"             % sprayVersion
   val sprayRouting    = "io.spray"                  %   "spray-routing"         % sprayVersion
   val sprayTestkit    = "io.spray"                  %   "spray-testkit"         % sprayVersion
@@ -29,10 +29,12 @@ object Dependencies {
   val akkaActor       = "com.typesafe.akka"         %%  "akka-actor"            % akkaVersion
   val akkaSlf4j       = "com.typesafe.akka"         %%  "akka-slf4j"            % akkaVersion
   val akkaTestKit     = "com.typesafe.akka"         %%  "akka-testkit"          % akkaVersion
-  val playTest        = "com.typesafe.play"         %%  "play-test"             % playVersion
+  val play            = "com.typesafe.play"         %%  "play"                  % playVersion
+  val playWS          = "com.typesafe.play"         %%  "play-ws"               % playVersion
+  val playTest        = "org.scalatestplus"         %%  "play"                  % "1.0.1"
   val slf4Api         = "org.slf4j"                 %   "slf4j-api"             % slf4jVersion
   val slf4nop         = "org.slf4j"                 %   "slf4j-nop"             % slf4jVersion
-
+  val jsr166          = "io.gatling"                %   "jsr166e"               % "1.0"
 
 
   def compile   (deps: ModuleID*): Seq[ModuleID] = deps map (_ % "compile")
diff --git a/project/Projects.scala b/project/Projects.scala
index 3be81e84..0b893458 100644
--- a/project/Projects.scala
+++ b/project/Projects.scala
@@ -4,11 +4,10 @@ import Keys._
 object Projects extends Build {
   import AspectJ._
   import Settings._
-  import Site._
   import Dependencies._
 
   lazy val root = Project("root", file("."))
-    .aggregate(kamonCore, kamonSpray, kamonNewrelic, kamonPlayground, kamonDashboard, kamonTestkit, kamonPlay, kamonStatsd, site)
+    .aggregate(kamonCore, kamonSpray, kamonNewrelic, kamonPlayground, kamonDashboard, kamonTestkit, kamonPlay, kamonStatsd)
     .settings(basicSettings: _*)
     .settings(formatSettings: _*)
     .settings(noPublishing: _*)
@@ -20,7 +19,7 @@ object Projects extends Build {
     .settings(aspectJSettings: _*)
     .settings(
       libraryDependencies ++=
-        compile(akkaActor, aspectJ, aspectjWeaver, hdrHistogram) ++
+        compile(akkaActor, aspectJ, aspectjWeaver, hdrHistogram, jsr166) ++
         provided(logback) ++
         test(scalatest, akkaTestKit, sprayTestkit, akkaSlf4j, logback))
 
@@ -54,7 +53,7 @@ object Projects extends Build {
     .settings(
       libraryDependencies ++=
         compile(akkaActor, akkaSlf4j, sprayCan, sprayClient, sprayRouting, logback))
-    .dependsOn(kamonSpray, kamonNewrelic, kamonStatsd)
+    .dependsOn(kamonSpray, kamonNewrelic, kamonStatsd, kamonDatadog)
 
 
   lazy val kamonDashboard = Project("kamon-dashboard", file("kamon-dashboard"))
@@ -74,7 +73,7 @@ object Projects extends Build {
     .settings(basicSettings: _*)
     .settings(formatSettings: _*)
     .settings(aspectJSettings: _*)
-    .settings(libraryDependencies ++= compile(playTest, aspectJ) ++ test(playTest, slf4Api))
+    .settings(libraryDependencies ++= compile(play, playWS, aspectJ) ++ test(playTest, akkaTestKit, slf4Api))
     .dependsOn(kamonCore)
 
   lazy val kamonStatsd = Project("kamon-statsd", file("kamon-statsd"))
@@ -83,16 +82,11 @@ object Projects extends Build {
     .settings(libraryDependencies ++= compile(akkaActor) ++  test(scalatest, akkaTestKit, slf4Api, slf4nop))
     .dependsOn(kamonCore)
 
-  lazy val site = Project("site", file("site"))
+  lazy val kamonDatadog = Project("kamon-datadog", file("kamon-datadog"))
     .settings(basicSettings: _*)
-    .settings(siteSettings: _*)
-    .settings(aspectJSettings: _*)
-    .settings(noPublishing: _*)
+    .settings(formatSettings: _*)
+    .settings(libraryDependencies ++= compile(akkaActor) ++  test(scalatest, akkaTestKit, slf4Api, slf4nop))
     .dependsOn(kamonCore)
-    .settings(
-      libraryDependencies ++=
-        compile(akkaSlf4j, logback) ++
-        test(scalatest, akkaTestKit))
 
 
   val noPublishing = Seq(publish := (), publishLocal := (), publishArtifact := false)
diff --git a/project/Site.scala b/project/Site.scala
deleted file mode 100644
index cf34353b..00000000
--- a/project/Site.scala
+++ /dev/null
@@ -1,18 +0,0 @@
-import sbt._
-import sbt.Keys._
-
-object Site {
-  val serveSite = taskKey[Unit]("Start a embedded web server with access to the site.")
-  val jekyllSource = settingKey[File]("Location of jekyll sources.")
-
-  val siteSettings = Seq(
-    jekyllSource := sourceDirectory.value / "main" / "jekyll",
-    serveSite    := {
-      val command = "jekyll serve --watch --trace --detach" +
-        " --source " + jekyllSource.value.absolutePath +
-        " --destination " + (target.value / "_site").absolutePath
-
-      sbt.Process(command, jekyllSource.value, ("LC_ALL", "en_US.UTF-8")).run
-    }
-  )
-}
\ No newline at end of file