diff options
Diffstat (limited to 'kamon-core/src/main/scala/kamon')
-rw-r--r-- | kamon-core/src/main/scala/kamon/metric/MetricsExtension.scala | 4 | ||||
-rw-r--r-- | kamon-core/src/main/scala/kamon/util/GlobPathFilter.scala | 44 |
2 files changed, 2 insertions, 46 deletions
diff --git a/kamon-core/src/main/scala/kamon/metric/MetricsExtension.scala b/kamon-core/src/main/scala/kamon/metric/MetricsExtension.scala index 88802d52..ed55ab06 100644 --- a/kamon-core/src/main/scala/kamon/metric/MetricsExtension.scala +++ b/kamon-core/src/main/scala/kamon/metric/MetricsExtension.scala @@ -88,8 +88,8 @@ class MetricsExtension(system: ExtendedActorSystem) extends Kamon.Extension { val key = entry.getKey val keyBasedConfig = entry.getValue.atKey(key) - val includes = keyBasedConfig.getStringList(s"$key.includes").asScala.map(inc ⇒ GlobPathFilter(inc)).toList - val excludes = keyBasedConfig.getStringList(s"$key.excludes").asScala.map(exc ⇒ GlobPathFilter(exc)).toList + val includes = keyBasedConfig.getStringList(s"$key.includes").asScala.map(inc ⇒ new GlobPathFilter(inc)).toList + val excludes = keyBasedConfig.getStringList(s"$key.excludes").asScala.map(exc ⇒ new GlobPathFilter(exc)).toList (key, MetricGroupFilter(includes, excludes)) } diff --git a/kamon-core/src/main/scala/kamon/util/GlobPathFilter.scala b/kamon-core/src/main/scala/kamon/util/GlobPathFilter.scala deleted file mode 100644 index a980773f..00000000 --- a/kamon-core/src/main/scala/kamon/util/GlobPathFilter.scala +++ /dev/null @@ -1,44 +0,0 @@ -/* - * ========================================================================================= - * Copyright © 2013-2014 the kamon project <http://kamon.io/> - * - * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file - * except in compliance with the License. You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software distributed under the - * License is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, - * either express or implied. See the License for the specific language governing permissions - * and limitations under the License. - * ========================================================================================= - */ - -package kamon.util - -import scala.util.matching.Regex - -class GlobPathFilter(glob: String) { - - val regex = globAsRegex(glob) - - def accept(path: String): Boolean = path.matches(regex.toString()) - - private def globAsRegex(glob: String): Regex = { - val regexStr = new StringBuilder('^') - - glob.foreach { - case '.' ⇒ regexStr append """\.""" - case '*' ⇒ regexStr append """[^/]*""" - case '?' ⇒ regexStr append """.""" - case ch ⇒ regexStr append ch - } - regexStr append """/?$""" - - new Regex(regexStr.toString()) - } -} - -object GlobPathFilter { - def apply(glob: String): GlobPathFilter = new GlobPathFilter(glob) -} |