Merge pull request #4 from Colisweb/update_to_agent_0.10

Update to agent 0.10

Author: guizmaii

README.md

@@ -4,7 +4,7 @@
 
 This project is highly inspired by the fantastic [sbt-newrelic](https://github.com/gilt/sbt-newrelic) project.
 
-We want to thanks [Gilt](http://tech.gilt.com) for their work on `sbt-newrelic` that allows us to create this project really quickly.
+We want to thanks [Gilt](http://tech.gilt.com) for their work on `sbt-newrelic` that allowed us to create this project really quickly.
 
 Prerequisites
 -------------
@@ -39,7 +39,7 @@ Configuration
 To use a specific Datadog Java APM Agent version, add the following to your `build.sbt` file:
 
 ```scala
-datadogVersion := "0.9.0"
+datadogVersion := "0.10.0"
 ```
 
 #### `datadogServiceName`
@@ -74,6 +74,53 @@ You can use your **host** (where you code run) enviroment variables in the value
 datadogServiceName := "${MY_DD_HOST_IP}"
 ```
 
+#### `datadogEnv`
+
+By default, the `env` is not set.
+
+To set the `env`, add the following to your `build.sbt` file:
+
+```scala
+datadogEnv := "staging"
+```
+
+You can use your **host** (where you code run) enviroment variables in the value:  
+
+```scala
+datadogEnv := "${MY_ENV}"
+```
+
+#### `datadogEnableNetty`
+
+Netty Http Server and Client Instrumentation. Default value is `false`.
+
+To use another value, add the following to your `build.sbt` file:
+
+```scala
+datadogEnableNetty := true
+```
+
+#### `datadogEnableAkkaHttp`
+
+Akka-Http Server and Lagom Framework Instrumentation. Default value is `false`.
+
+To use another value, add the following to your `build.sbt` file:
+
+```scala
+datadogEnableAkkaHttp := true
+```
+
+#### `datadogEnableDebug`
+
+To return debug level application logs, enable debug mode with this flag. Default value is `false`.
+
+To use another value, add the following to your `build.sbt` file:
+
+```scala
+datadogEnableDebug := true
+```
+
+
 #### Other possible settings
 
 For more configuration option, look at the Datadog Java APM agent documentation: https://docs.datadoghq.com/tracing/setup/java/

src/main/scala/com/colisweb/sbt/DatadogAPM.scala

@@ -4,8 +4,8 @@ import com.typesafe.sbt.SbtNativePackager._
 import com.typesafe.sbt.packager.archetypes.scripts.BashStartScriptPlugin.autoImport.bashScriptExtraDefines
 import com.typesafe.sbt.packager.archetypes.scripts.{BashStartScriptPlugin, BatStartScriptPlugin}
 import sbt.Keys._
-import sbt._
 import sbt.librarymanagement.DependencyFilter
+import sbt.{Def, _}
 
 /**
   * Eagerly inspired by https://github.com/gilt/sbt-newrelic
@@ -19,6 +19,11 @@ object DatadogAPM extends AutoPlugin {
       "The name of a set of processes that do the same job. Used for grouping stats for your application. Default value is the sbt project name")
     lazy val datadogAgentHost = taskKey[String](
       """Hostname for where to send traces to. If using a containerized environment, configure this to be the host ip. See our docker docs for additional detail. Default value: "localhost"""")
+    lazy val datadogEnv = taskKey[String]("Environment. https://docs.datadoghq.com/tracing/setup/first_class_dimensions/. By default, this settings is not set")
+    lazy val datadogEnableNetty = taskKey[Boolean]("Netty Http Server and Client Instrumentation. Default value: false")
+    lazy val datadogEnableAkkaHttp =
+      taskKey[Boolean]("Akka-Http Server and Lagom Framework Instrumentation. Default value: false")
+    lazy val datadogEnableDebug = taskKey[Boolean]("To return debug level application logs, enable debug mode. Default value: false")
   }
   import autoImport._
 
@@ -28,15 +33,29 @@ object DatadogAPM extends AutoPlugin {
 
   override lazy val projectSettings = Seq(
     ivyConfigurations += DatadogConfig,
-    datadogVersion := "0.9.0",
+    datadogVersion := "0.10.0",
     datagodJavaAgent := findDatadogJavaAgent(update.value),
     datadogServiceName := name.value,
     datadogAgentHost := "localhost",
+    datadogEnv := "",
+    datadogEnableNetty := false,
+    datadogEnableAkkaHttp := false,
+    datadogEnableDebug := false,
     libraryDependencies += "com.datadoghq"          % "dd-java-agent" % datadogVersion.value % DatadogConfig,
     mappings in Universal += datagodJavaAgent.value -> "datadog/dd-java-agent.jar",
     bashScriptExtraDefines += """addJava "-javaagent:${app_home}/../datadog/dd-java-agent.jar"""",
     bashScriptExtraDefines += s"""addJava "-Ddd.service.name=${datadogServiceName.value}"""",
     bashScriptExtraDefines += s"""addJava "-Ddd.agent.host=${datadogAgentHost.value}"""",
+    bashScriptExtraDefines += s"""addJava "-Ddd.integration.netty.enabled=${datadogEnableNetty.value}"""",
+    bashScriptExtraDefines += s"""addJava "-Ddd.integration.akka-http.enabled=${datadogEnableAkkaHttp.value}"""",
+    bashScriptExtraDefines += {
+      val env = datadogEnv.value
+      if (env.nonEmpty) s"""addJava "-Ddd.trace.span.tags="env:$env""""" else """echo "Datadog env is not set""""
+    },
+    bashScriptExtraDefines += {
+      val debugEnabled = datadogEnableDebug.value
+      if (debugEnabled) s"""addJava "-Ddatadog.slf4j.simpleLogger.defaultLogLevel=debug"""" else """echo "Datadog debug mode disabled""""
+    }
   )
 
   private[this] def findDatadogJavaAgent(report: UpdateReport) = report.matching(datadogFilter).head