From 105ed9cb264eb3569b5ae0d65ac2fd8cb636f8e8 Mon Sep 17 00:00:00 2001 From: Ivan Topolnjak Date: Sun, 21 May 2017 14:05:05 +0200 Subject: wip, trying to get something that could be tested --- kamon-core/src/main/scala/kamon/metric/EntityFilter.scala | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) (limited to 'kamon-core/src/main/scala/kamon/metric/EntityFilter.scala') diff --git a/kamon-core/src/main/scala/kamon/metric/EntityFilter.scala b/kamon-core/src/main/scala/kamon/metric/EntityFilter.scala index cf203609..77fbfc4b 100644 --- a/kamon-core/src/main/scala/kamon/metric/EntityFilter.scala +++ b/kamon-core/src/main/scala/kamon/metric/EntityFilter.scala @@ -7,13 +7,13 @@ import com.typesafe.config.Config object EntityFilter { def fromConfig(config: Config): EntityFilter = { val filtersConfig = config.getConfig("kamon.metric.filters") - val acceptUnmatched = filtersConfig.getBoolean("accept-unmatched") + val acceptUnmatched = filtersConfig.getBoolean("accept-unmatched-categories") - val perCategoryFilters = filtersConfig.firstLevelKeys.filter(_ != "accept-unmatched") map { category: String ⇒ + val perCategoryFilters = filtersConfig.firstLevelKeys.filter(_ != "accept-unmatched-categories") map { category: String ⇒ val includes = readFilters(filtersConfig, s"$category.includes") val excludes = readFilters(filtersConfig, s"$category.excludes") - (category, new IncludeExcludeNameFilter(includes, excludes, acceptUnmatched)) + (category, new IncludeExcludeNameFilter(includes, excludes)) } toMap new EntityFilter(perCategoryFilters, acceptUnmatched) @@ -49,9 +49,9 @@ trait NameFilter { def accept(name: String): Boolean } -class IncludeExcludeNameFilter(includes: Seq[NameFilter], excludes: Seq[NameFilter], acceptUnmatched: Boolean) extends NameFilter { +class IncludeExcludeNameFilter(includes: Seq[NameFilter], excludes: Seq[NameFilter]) extends NameFilter { override def accept(name: String): Boolean = - (includes.exists(_.accept(name)) || acceptUnmatched) && !excludes.exists(_.accept(name)) + includes.exists(_.accept(name)) && !excludes.exists(_.accept(name)) } class RegexNameFilter(path: String) extends NameFilter { -- cgit v1.2.3