aboutsummaryrefslogtreecommitdiff
path: root/kamon-core/src/main/scala/kamon/metric/InstrumentFactory.scala
diff options
context:
space:
mode:
authorIvan Topolnjak <ivantopo@gmail.com>2017-06-11 16:03:53 +0200
committerIvan Topolnjak <ivantopo@gmail.com>2017-06-11 16:03:53 +0200
commit2fdd0125c48a703bd44ff93072c859b4fc65b766 (patch)
treeaa6a9022a9b093a8120213c152252b75e25e3b80 /kamon-core/src/main/scala/kamon/metric/InstrumentFactory.scala
parent942562d452bc1aa64ea6787702c47286c597a186 (diff)
downloadKamon-2fdd0125c48a703bd44ff93072c859b4fc65b766.tar.gz
Kamon-2fdd0125c48a703bd44ff93072c859b4fc65b766.tar.bz2
Kamon-2fdd0125c48a703bd44ff93072c859b4fc65b766.zip
use java.util.Duration
Diffstat (limited to 'kamon-core/src/main/scala/kamon/metric/InstrumentFactory.scala')
-rw-r--r--kamon-core/src/main/scala/kamon/metric/InstrumentFactory.scala8
1 files changed, 4 insertions, 4 deletions
diff --git a/kamon-core/src/main/scala/kamon/metric/InstrumentFactory.scala b/kamon-core/src/main/scala/kamon/metric/InstrumentFactory.scala
index 2869595a..d6aa9fb9 100644
--- a/kamon-core/src/main/scala/kamon/metric/InstrumentFactory.scala
+++ b/kamon-core/src/main/scala/kamon/metric/InstrumentFactory.scala
@@ -23,7 +23,7 @@ import com.typesafe.config.Config
import kamon.metric.InstrumentFactory.CustomInstrumentSettings
import kamon.util.MeasurementUnit
-import scala.concurrent.duration._
+import java.time.Duration
private[kamon] class InstrumentFactory private (defaultHistogramDynamicRange: DynamicRange, defaultMMCounterDynamicRange: DynamicRange,
@@ -80,14 +80,14 @@ object InstrumentFactory {
val factoryConfig = config.getConfig("kamon.metric.instrument-factory")
val histogramDynamicRange = readDynamicRange(factoryConfig.getConfig("default-settings.histogram"))
val mmCounterDynamicRange = readDynamicRange(factoryConfig.getConfig("default-settings.min-max-counter"))
- val mmCounterSampleInterval = factoryConfig.getDuration("default-settings.min-max-counter.sample-interval", TimeUnit.MILLISECONDS)
+ val mmCounterSampleInterval = factoryConfig.getDuration("default-settings.min-max-counter.sample-interval")
val customSettings = factoryConfig.getConfig("custom-settings")
.configurations
.filter(nonEmptySection)
.map(readCustomInstrumentSettings)
- new InstrumentFactory(histogramDynamicRange, mmCounterDynamicRange, mmCounterSampleInterval.millis, customSettings)
+ new InstrumentFactory(histogramDynamicRange, mmCounterDynamicRange, mmCounterSampleInterval, customSettings)
}
private def nonEmptySection(entry: (String, Config)): Boolean = entry match {
@@ -100,7 +100,7 @@ object InstrumentFactory {
if (metricConfig.hasPath("lowest-discernible-value")) Some(metricConfig.getLong("lowest-discernible-value")) else None,
if (metricConfig.hasPath("highest-trackable-value")) Some(metricConfig.getLong("highest-trackable-value")) else None,
if (metricConfig.hasPath("significant-value-digits")) Some(metricConfig.getInt("significant-value-digits")) else None,
- if (metricConfig.hasPath("sample-interval")) Some(metricConfig.getDuration("sample-interval", TimeUnit.MILLISECONDS).millis) else None
+ if (metricConfig.hasPath("sample-interval")) Some(metricConfig.getDuration("sample-interval")) else None
)
metricName -> customSettings
}