Merge branch 'master' into release-legacy-akka-2.2

Conflicts:
	kamon-core/src/main/scala/kamon/metric/instrument/InstrumentSettings.scala
	kamon-core/src/main/scala/kamon/trace/TracerExtensionSettings.scala
	kamon-jdbc/src/main/scala/kamon/jdbc/Jdbc.scala
	kamon-newrelic/src/main/scala/kamon/newrelic/MetricReporter.scala
	project/Dependencies.scala
	project/Projects.scala
	project/Settings.scala

4 files changed, 6 insertions, 7 deletions

diff --git a/kamon-core/src/main/scala/kamon/metric/instrument/InstrumentSettings.scala b/kamon-core/src/main/scala/kamon/metric/instrument/InstrumentSettings.scala
index 29f8f46b..4423964a 100644
--- a/kamon-core/src/main/scala/kamon/metric/instrument/InstrumentSettings.scala
+++ b/kamon-core/src/main/scala/kamon/metric/instrument/InstrumentSettings.scala
@@ -4,7 +4,6 @@ import java.util.concurrent.TimeUnit
 
 import com.typesafe.config.Config
 import kamon.metric.instrument.Histogram.DynamicRange
-import kamon.util.ConfigTools.Syntax
 
 import scala.concurrent.duration.FiniteDuration
 
@@ -21,6 +20,7 @@ case class InstrumentCustomSettings(lowestDiscernibleValue: Option[Long], highes
 }
 
 object InstrumentCustomSettings {
+  import kamon.util.ConfigTools.Syntax
 
   def fromConfig(config: Config): InstrumentCustomSettings =
     InstrumentCustomSettings(
@@ -54,6 +54,8 @@ case class DefaultInstrumentSettings(histogram: InstrumentSettings, minMaxCounte
 object DefaultInstrumentSettings {
 
   def fromConfig(config: Config): DefaultInstrumentSettings = {
+    import kamon.util.ConfigTools.Syntax
+
     val histogramSettings = InstrumentSettings(InstrumentSettings.readDynamicRange(config.getConfig("histogram")), None)
     val minMaxCounterSettings = InstrumentSettings(InstrumentSettings.readDynamicRange(config.getConfig("min-max-counter")),
       Some(config.getFiniteDuration("min-max-counter.refresh-interval")))
diff --git a/kamon-core/src/main/scala/kamon/trace/Incubator.scala b/kamon-core/src/main/scala/kamon/trace/Incubator.scala
index 19ea4f39..5ee91a4b 100644
--- a/kamon-core/src/main/scala/kamon/trace/Incubator.scala
+++ b/kamon-core/src/main/scala/kamon/trace/Incubator.scala
@@ -16,14 +16,12 @@
 
 package kamon.trace
 
-import java.util.concurrent.TimeUnit
-
 import akka.actor.{ ActorLogging, Props, Actor, ActorRef }
 import kamon.trace.Incubator.{ CheckForCompletedTraces, IncubatingTrace }
 import kamon.util.{ NanoInterval, RelativeNanoTimestamp }
 import scala.annotation.tailrec
 import scala.collection.immutable.Queue
-import scala.concurrent.duration._
+import kamon.util.ConfigTools.Syntax
 
 class Incubator(subscriptions: ActorRef) extends Actor with ActorLogging {
   import kamon.util.ConfigTools.Syntax
diff --git a/kamon-core/src/main/scala/kamon/trace/TracerExtensionSettings.scala b/kamon-core/src/main/scala/kamon/trace/TracerExtensionSettings.scala
index 79f30f23..739bbefc 100644
--- a/kamon-core/src/main/scala/kamon/trace/TracerExtensionSettings.scala
+++ b/kamon-core/src/main/scala/kamon/trace/TracerExtensionSettings.scala
@@ -16,13 +16,12 @@
 
 package kamon.trace
 
+import kamon.util.ConfigTools.Syntax
 import com.typesafe.config.Config
 
 case class TraceSettings(levelOfDetail: LevelOfDetail, sampler: Sampler)
 
 object TraceSettings {
-  import kamon.util.ConfigTools.Syntax
-
   def apply(config: Config): TraceSettings = {
     val tracerConfig = config.getConfig("kamon.trace")
 
diff --git a/kamon-core/src/main/scala/kamon/util/ConfigTools.scala b/kamon-core/src/main/scala/kamon/util/ConfigTools.scala
index 483278bf..bcec22c3 100644
--- a/kamon-core/src/main/scala/kamon/util/ConfigTools.scala
+++ b/kamon-core/src/main/scala/kamon/util/ConfigTools.scala
@@ -28,7 +28,7 @@ object ConfigTools {
     // versions of Akka using older typesafe-config versions.
 
     def getFiniteDuration(path: String): FiniteDuration =
-      FiniteDuration(config.getNanoseconds(path), TimeUnit.NANOSECONDS)
+      FiniteDuration(config.getDuration(path, TimeUnit.NANOSECONDS), TimeUnit.NANOSECONDS)
 
     def firstLevelKeys: Set[String] = {
       import scala.collection.JavaConverters._