diff options
author | Ivan Topolnjak <ivantopo@gmail.com> | 2014-12-08 16:01:46 +0100 |
---|---|---|
committer | Ivan Topolnjak <ivantopo@gmail.com> | 2014-12-08 16:01:46 +0100 |
commit | 7671d4cf77c64db47e4e6cf59f6337d6d483eee3 (patch) | |
tree | 54dbf82c2c58196be8d90adee8a0df5710f792b3 | |
parent | 0ff626775a45d51f563f0a5d39c44a7e7017ea4e (diff) | |
parent | 78da2635e27c7dea7c1f1b5e21b9fa99834c9768 (diff) | |
download | Kamon-7671d4cf77c64db47e4e6cf59f6337d6d483eee3.tar.gz Kamon-7671d4cf77c64db47e4e6cf59f6337d6d483eee3.tar.bz2 Kamon-7671d4cf77c64db47e4e6cf59f6337d6d483eee3.zip |
Merge branch 'master' of github.com:kamon-io/Kamon
-rw-r--r-- | kamon-core/src/main/resources/reference.conf | 2 | ||||
-rw-r--r-- | kamon-core/src/main/scala/kamon/trace/TraceExtension.scala | 4 |
2 files changed, 4 insertions, 2 deletions
diff --git a/kamon-core/src/main/resources/reference.conf b/kamon-core/src/main/resources/reference.conf index d7276b53..b9039b73 100644 --- a/kamon-core/src/main/resources/reference.conf +++ b/kamon-core/src/main/resources/reference.conf @@ -154,7 +154,7 @@ kamon { # Gather tracing information for all traces but only report those whose elapsed-time is equal or greated to the # .minimum-elapsed-time setting. threshold-sampler { - threshold = 1 second + minimum-elapsed-time = 1 second } incubator { diff --git a/kamon-core/src/main/scala/kamon/trace/TraceExtension.scala b/kamon-core/src/main/scala/kamon/trace/TraceExtension.scala index 8bd9384a..7d734b8c 100644 --- a/kamon-core/src/main/scala/kamon/trace/TraceExtension.scala +++ b/kamon-core/src/main/scala/kamon/trace/TraceExtension.scala @@ -16,6 +16,8 @@ package kamon.trace +import java.util.concurrent.TimeUnit + import akka.actor._ import akka.actor import akka.event.Logging @@ -39,7 +41,7 @@ class TraceExtension(system: ExtendedActorSystem) extends Kamon.Extension { case "all" ⇒ SampleAll case "random" ⇒ new RandomSampler(config.getInt("random-sampler.chance")) case "ordered" ⇒ new OrderedSampler(config.getInt("ordered-sampler.interval")) - case "threshold" ⇒ new RandomSampler(config.getInt("threshold-sampler.threshold")) + case "threshold" ⇒ new ThresholdSampler(config.getDuration("threshold-sampler.minimum-elapsed-time", TimeUnit.NANOSECONDS)) } val log = Logging(system, "TraceExtension") |