aboutsummaryrefslogtreecommitdiff
path: root/kamon-core/src/main/scala/kamon/trace
diff options
context:
space:
mode:
authorMartin Grotzke <martin.grotzke@googlemail.com>2014-12-08 10:26:43 +0100
committerMartin Grotzke <martin.grotzke@googlemail.com>2014-12-08 10:41:02 +0100
commit9a30f930e8d76ac4c858f73f33ab367680c2308b (patch)
tree54dbf82c2c58196be8d90adee8a0df5710f792b3 /kamon-core/src/main/scala/kamon/trace
parent0ff626775a45d51f563f0a5d39c44a7e7017ea4e (diff)
downloadKamon-9a30f930e8d76ac4c858f73f33ab367680c2308b.tar.gz
Kamon-9a30f930e8d76ac4c858f73f33ab367680c2308b.tar.bz2
Kamon-9a30f930e8d76ac4c858f73f33ab367680c2308b.zip
= core: Fix ThresholdSampler to use minimum-elapsed-time setting
Also fixes usage of ThresholdSampler if "threshold" is configured as sampling strategy.
Diffstat (limited to 'kamon-core/src/main/scala/kamon/trace')
-rw-r--r--kamon-core/src/main/scala/kamon/trace/TraceExtension.scala4
1 files changed, 3 insertions, 1 deletions
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")