diff options
author | Ivan Topolnjak <ivantopo@gmail.com> | 2017-06-14 15:01:35 +0200 |
---|---|---|
committer | Ivan Topolnjak <ivantopo@gmail.com> | 2017-06-14 15:01:35 +0200 |
commit | 856993f1adbab9a413e2c66b468699257557903f (patch) | |
tree | 9532f5dda9cc2fc899f88318ad4b9554b3a15627 /kamon-core/src/main/scala | |
parent | 8e6c6737f97314d1cacf6d6ad50a984ad21438ca (diff) | |
download | Kamon-856993f1adbab9a413e2c66b468699257557903f.tar.gz Kamon-856993f1adbab9a413e2c66b468699257557903f.tar.bz2 Kamon-856993f1adbab9a413e2c66b468699257557903f.zip |
move filters to util package, expose them from Kamon
Diffstat (limited to 'kamon-core/src/main/scala')
-rw-r--r-- | kamon-core/src/main/scala/kamon/Kamon.scala | 6 | ||||
-rw-r--r-- | kamon-core/src/main/scala/kamon/util/Filters.scala | 26 |
2 files changed, 18 insertions, 14 deletions
diff --git a/kamon-core/src/main/scala/kamon/Kamon.scala b/kamon-core/src/main/scala/kamon/Kamon.scala index 892d1c12..d7864de5 100644 --- a/kamon-core/src/main/scala/kamon/Kamon.scala +++ b/kamon-core/src/main/scala/kamon/Kamon.scala @@ -20,7 +20,7 @@ import io.opentracing.propagation.Format import io.opentracing.{ActiveSpan, Span, SpanContext} import kamon.metric._ import kamon.trace.Tracer -import kamon.util.MeasurementUnit +import kamon.util.{Filters, MeasurementUnit} import scala.concurrent.Future import java.time.Duration @@ -31,6 +31,7 @@ import io.opentracing.ActiveSpan.Continuation object Kamon extends MetricLookup with ReporterRegistry with io.opentracing.Tracer { @volatile private var _config = ConfigFactory.load() @volatile private var _environment = Environment.fromConfig(_config) + @volatile private var _filters = Filters.fromConfig(_config) private val _metrics = new MetricRegistry(_config) private val _reporters = new ReporterRegistryImpl(_metrics, _config) @@ -45,6 +46,7 @@ object Kamon extends MetricLookup with ReporterRegistry with io.opentracing.Trac def reconfigure(config: Config): Unit = synchronized { _config = config _environment = Environment.fromConfig(config) + _filters = Filters.fromConfig(config) _metrics.reconfigure(config) _reporters.reconfigure(config) } @@ -153,4 +155,6 @@ object Kamon extends MetricLookup with ReporterRegistry with io.opentracing.Trac override def stopAllReporters(): Future[Unit] = _reporters.stopAllReporters() + def filter(filterName: String, pattern: String): Boolean = + _filters.accept(filterName, pattern) } diff --git a/kamon-core/src/main/scala/kamon/util/Filters.scala b/kamon-core/src/main/scala/kamon/util/Filters.scala index 3dbdc14d..78553309 100644 --- a/kamon-core/src/main/scala/kamon/util/Filters.scala +++ b/kamon-core/src/main/scala/kamon/util/Filters.scala @@ -20,8 +20,8 @@ import java.util.regex.Pattern import com.typesafe.config.Config -object Filter { - def fromConfig(config: Config): Filter = { +object Filters { + def fromConfig(config: Config): Filters = { val filtersConfig = config.getConfig("kamon.util.filters") val acceptUnmatched = filtersConfig.getBoolean("accept-unmatched") @@ -29,23 +29,23 @@ object Filter { val includes = readFilters(filtersConfig, s"$filterName.includes") val excludes = readFilters(filtersConfig, s"$filterName.excludes") - (filterName, new IncludeExcludeNameFilter(includes, excludes)) + (filterName, new IncludeExcludeMatcher(includes, excludes)) } toMap - new Filter(perMetricFilter, acceptUnmatched) + new Filters(perMetricFilter, acceptUnmatched) } - private def readFilters(filtersConfig: Config, name: String): Seq[NameFilter] = { + private def readFilters(filtersConfig: Config, name: String): Seq[Matcher] = { import scala.collection.JavaConverters._ if(filtersConfig.hasPath(name)) - filtersConfig.getStringList(name).asScala.map(readNameFilter) + filtersConfig.getStringList(name).asScala.map(readMatcher) else Seq.empty } - private def readNameFilter(pattern: String): NameFilter = { + private def readMatcher(pattern: String): Matcher = { if(pattern.startsWith("regex:")) - new RegexNameFilter(pattern.drop(6)) + new RegexMatcher(pattern.drop(6)) else if(pattern.startsWith("glob:")) new GlobPathFilter(pattern.drop(5)) else @@ -53,7 +53,7 @@ object Filter { } } -class Filter(filters: Map[String, NameFilter], acceptUnmatched: Boolean) { +class Filters(filters: Map[String, Matcher], acceptUnmatched: Boolean) { def accept(filterName: String, pattern: String): Boolean = filters .get(filterName) @@ -61,16 +61,16 @@ class Filter(filters: Map[String, NameFilter], acceptUnmatched: Boolean) { .getOrElse(acceptUnmatched) } -trait NameFilter { +trait Matcher { def accept(name: String): Boolean } -class IncludeExcludeNameFilter(includes: Seq[NameFilter], excludes: Seq[NameFilter]) extends NameFilter { +class IncludeExcludeMatcher(includes: Seq[Matcher], excludes: Seq[Matcher]) extends Matcher { override def accept(name: String): Boolean = includes.exists(_.accept(name)) && !excludes.exists(_.accept(name)) } -class RegexNameFilter(pattern: String) extends NameFilter { +class RegexMatcher(pattern: String) extends Matcher { private val pathRegex = pattern.r override def accept(name: String): Boolean = name match { @@ -79,7 +79,7 @@ class RegexNameFilter(pattern: String) extends NameFilter { } } -class GlobPathFilter(glob: String) extends NameFilter { +class GlobPathFilter(glob: String) extends Matcher { private val globPattern = Pattern.compile("(\\*\\*?)|(\\?)|(\\\\.)|(/+)|([^*?]+)") private val compiledPattern = getGlobPattern(glob) |