diff options
author | Ivan Topolnjak <ivantopo@gmail.com> | 2017-06-14 15:01:23 +0200 |
---|---|---|
committer | Ivan Topolnjak <ivantopo@gmail.com> | 2017-06-14 15:01:23 +0200 |
commit | 8e6c6737f97314d1cacf6d6ad50a984ad21438ca (patch) | |
tree | 66d2492e3c95fba4523797c90d9bdadfd1afbbe2 | |
parent | 148d2de7157244332314e8d5c29e5e84dff57dd2 (diff) | |
download | Kamon-8e6c6737f97314d1cacf6d6ad50a984ad21438ca.tar.gz Kamon-8e6c6737f97314d1cacf6d6ad50a984ad21438ca.tar.bz2 Kamon-8e6c6737f97314d1cacf6d6ad50a984ad21438ca.zip |
move filters to util package, expose them from Kamon
-rw-r--r-- | kamon-core/src/main/scala/kamon/util/Filters.scala (renamed from kamon-core/src/main/scala/kamon/metric/Filter.scala) | 21 |
1 files changed, 11 insertions, 10 deletions
diff --git a/kamon-core/src/main/scala/kamon/metric/Filter.scala b/kamon-core/src/main/scala/kamon/util/Filters.scala index ee9a15b9..3dbdc14d 100644 --- a/kamon-core/src/main/scala/kamon/metric/Filter.scala +++ b/kamon-core/src/main/scala/kamon/util/Filters.scala @@ -14,21 +14,22 @@ */ package kamon -package metric +package util import java.util.regex.Pattern + import com.typesafe.config.Config object Filter { def fromConfig(config: Config): Filter = { - val filtersConfig = config.getConfig("kamon.metric.filters") + val filtersConfig = config.getConfig("kamon.util.filters") val acceptUnmatched = filtersConfig.getBoolean("accept-unmatched") - val perMetricFilter = filtersConfig.firstLevelKeys.filter(_ != "accept-unmatched") map { metricName: String ⇒ - val includes = readFilters(filtersConfig, s"$metricName.includes") - val excludes = readFilters(filtersConfig, s"$metricName.excludes") + val perMetricFilter = filtersConfig.firstLevelKeys.filter(_ != "accept-unmatched") map { filterName: String ⇒ + val includes = readFilters(filtersConfig, s"$filterName.includes") + val excludes = readFilters(filtersConfig, s"$filterName.excludes") - (metricName, new IncludeExcludeNameFilter(includes, excludes)) + (filterName, new IncludeExcludeNameFilter(includes, excludes)) } toMap new Filter(perMetricFilter, acceptUnmatched) @@ -52,10 +53,10 @@ object Filter { } } -class Filter(perMetricFilter: Map[String, NameFilter], acceptUnmatched: Boolean) { - def accept(metricName: String, pattern: String): Boolean = - perMetricFilter - .get(metricName) +class Filter(filters: Map[String, NameFilter], acceptUnmatched: Boolean) { + def accept(filterName: String, pattern: String): Boolean = + filters + .get(filterName) .map(_.accept(pattern)) .getOrElse(acceptUnmatched) } |