diff options
Diffstat (limited to 'kamon-core/src/legacy-main/scala/kamon')
3 files changed, 6 insertions, 5 deletions
diff --git a/kamon-core/src/legacy-main/scala/kamon/metric/MetricsSettings.scala b/kamon-core/src/legacy-main/scala/kamon/metric/MetricsSettings.scala index 592e8f67..86968597 100644 --- a/kamon-core/src/legacy-main/scala/kamon/metric/MetricsSettings.scala +++ b/kamon-core/src/legacy-main/scala/kamon/metric/MetricsSettings.scala @@ -18,9 +18,8 @@ package kamon.metric import com.typesafe.config.Config import kamon.metric.instrument._ -import kamon.util.PathFilter import kamon.util.GlobPathFilter -import kamon.util.RegexPathFilter +import kamon.util.RegexNameFilter import scala.concurrent.duration.FiniteDuration @@ -46,7 +45,7 @@ case class MetricsSettings( /** * */ -case class EntityFilter(includes: List[PathFilter], excludes: List[PathFilter]) { +case class EntityFilter(includes: List[NameFilter], excludes: List[NameFilter]) { def accept(name: String): Boolean = includes.exists(_.accept(name)) && !excludes.exists(_.accept(name)) } diff --git a/kamon-core/src/legacy-main/scala/kamon/metric/SubscriptionsDispatcher.scala b/kamon-core/src/legacy-main/scala/kamon/metric/SubscriptionsDispatcher.scala index 09bf58ad..28bf77db 100644 --- a/kamon-core/src/legacy-main/scala/kamon/metric/SubscriptionsDispatcher.scala +++ b/kamon-core/src/legacy-main/scala/kamon/metric/SubscriptionsDispatcher.scala @@ -18,7 +18,7 @@ package kamon.metric import akka.actor._ import kamon.metric.SubscriptionsDispatcher._ -import kamon.util.{MilliTimestamp, GlobPathFilter} +import kamon.util.MilliTimestamp import scala.concurrent.duration.FiniteDuration /** diff --git a/kamon-core/src/legacy-main/scala/kamon/util/RegexPathFilter.scala b/kamon-core/src/legacy-main/scala/kamon/util/RegexPathFilter.scala index 848fca87..24e66a08 100644 --- a/kamon-core/src/legacy-main/scala/kamon/util/RegexPathFilter.scala +++ b/kamon-core/src/legacy-main/scala/kamon/util/RegexPathFilter.scala @@ -16,7 +16,9 @@ package kamon.util -case class RegexPathFilter(path: String) extends PathFilter { +import kamon.metric.NameFilter + +case class RegexPathFilter(path: String) extends NameFilter { private val pathRegex = path.r override def accept(path: String): Boolean = { path match { |