From 5d296a16270b1ec66d206ef1195208ea864f49c1 Mon Sep 17 00:00:00 2001 From: Ivan Topolnak Date: Mon, 3 Feb 2014 18:10:08 -0300 Subject: create the notion of a metric group category for easier filtering when subscribing --- kamon-core/src/main/scala/kamon/metrics/Subscriptions.scala | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) (limited to 'kamon-core/src/main/scala/kamon/metrics/Subscriptions.scala') diff --git a/kamon-core/src/main/scala/kamon/metrics/Subscriptions.scala b/kamon-core/src/main/scala/kamon/metrics/Subscriptions.scala index 3151bdc1..654c37b0 100644 --- a/kamon-core/src/main/scala/kamon/metrics/Subscriptions.scala +++ b/kamon-core/src/main/scala/kamon/metrics/Subscriptions.scala @@ -21,7 +21,6 @@ import kamon.metrics.Subscriptions.{ MetricGroupFilter, FlushMetrics, TickMetric import kamon.util.GlobPathFilter import scala.concurrent.duration.Duration import java.util.concurrent.TimeUnit -import kamon.metrics.MetricGroupIdentity.Category import kamon.Kamon class Subscriptions extends Actor { @@ -40,7 +39,7 @@ class Subscriptions extends Actor { case FlushMetrics ⇒ flush() } - def subscribe(category: Category, selection: String, permanent: Boolean): Unit = { + def subscribe(category: MetricGroupCategory, selection: String, permanent: Boolean): Unit = { val filter = MetricGroupFilter(category, new GlobPathFilter(selection)) if (permanent) { val receivers = subscribedPermanently.get(filter).getOrElse(Nil) @@ -78,10 +77,10 @@ class Subscriptions extends Actor { object Subscriptions { case object FlushMetrics - case class Subscribe(category: Category, selection: String, permanently: Boolean = false) + case class Subscribe(category: MetricGroupCategory, selection: String, permanently: Boolean = false) case class TickMetricSnapshot(from: Long, to: Long, metrics: Map[MetricGroupIdentity, MetricGroupSnapshot]) - case class MetricGroupFilter(category: Category, globFilter: GlobPathFilter) { + case class MetricGroupFilter(category: MetricGroupCategory, globFilter: GlobPathFilter) { def accept(identity: MetricGroupIdentity): Boolean = { category.equals(identity.category) && globFilter.accept(identity.name) } -- cgit v1.2.3