From a3d78ef61a277b0b62dc93daf84756dfa7625d3d Mon Sep 17 00:00:00 2001
From: Ivan Topolnjak <ivantopo@gmail.com>
Date: Thu, 25 May 2017 16:52:52 +0200
Subject: trying to flatten out the structure and eliminate the notion of
 entitites

---
 kamon-core/src/legacy-main/scala/kamon/metric/MetricsSettings.scala | 6 +++---
 .../scala/kamon/util/executors/ExecutorServiceMetrics.scala         | 1 -
 2 files changed, 3 insertions(+), 4 deletions(-)

(limited to 'kamon-core/src/legacy-main')

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 86968597..f75c6d4d 100644
--- a/kamon-core/src/legacy-main/scala/kamon/metric/MetricsSettings.scala
+++ b/kamon-core/src/legacy-main/scala/kamon/metric/MetricsSettings.scala
@@ -30,7 +30,7 @@ case class MetricsSettings(
     tickInterval: FiniteDuration,
     defaultCollectionContextBufferSize: Int,
     trackUnmatchedEntities: Boolean,
-    entityFilters: Map[String, EntityFilter],
+    entityFilters: Map[String, Filter],
     instrumentFactories: Map[String, InstrumentFactory],
     defaultInstrumentFactory: InstrumentFactory,
     refreshScheduler: RefreshScheduler
@@ -89,7 +89,7 @@ object MetricsSettings {
    *
    *  @return a Map from category name to corresponding entity filter.
    */
-  def loadFilters(filtersConfig: Config): Map[String, EntityFilter] = {
+  def loadFilters(filtersConfig: Config): Map[String, Filter] = {
     import scala.collection.JavaConverters._
 
     filtersConfig.firstLevelKeys map { category: String ⇒
@@ -99,7 +99,7 @@ object MetricsSettings {
       val excludes = filtersConfig.getStringList(s"$category.excludes").asScala.map(exc ⇒
         if (asRegex) RegexPathFilter(exc) else new GlobPathFilter(exc)).toList
 
-      (category, EntityFilter(includes, excludes))
+      (category, Filter(includes, excludes))
     } toMap
   }
 
diff --git a/kamon-core/src/legacy-main/scala/kamon/util/executors/ExecutorServiceMetrics.scala b/kamon-core/src/legacy-main/scala/kamon/util/executors/ExecutorServiceMetrics.scala
index 60612beb..482a73c9 100644
--- a/kamon-core/src/legacy-main/scala/kamon/util/executors/ExecutorServiceMetrics.scala
+++ b/kamon-core/src/legacy-main/scala/kamon/util/executors/ExecutorServiceMetrics.scala
@@ -19,7 +19,6 @@ package kamon.util.executors
 import java.util.concurrent.{ExecutorService, ForkJoinPool ⇒ JavaForkJoinPool, ThreadPoolExecutor}
 
 import kamon.Kamon
-import kamon.metric.Entity
 
 import scala.concurrent.forkjoin.ForkJoinPool
 import scala.util.control.NoStackTrace
-- 
cgit v1.2.3