diff options
| author | Martin Grotzke <martin.grotzke@googlemail.com> | 2015-02-25 23:46:44 +0100 |
|---|---|---|
| committer | Martin Grotzke <martin.grotzke@googlemail.com> | 2015-02-25 23:46:44 +0100 |
| commit | bf54ca0e8fdb3c3e54bafb87ac716ee95b8fbe78 (patch) | |
| tree | 345450d58f530b2daddbc5d76b123b484a4d8fa6 | |
| parent | 0f2f2be4e4fc44a512ed79ab09f0d83d3fd0e871 (diff) | |
| download | Kamon-bf54ca0e8fdb3c3e54bafb87ac716ee95b8fbe78.tar.gz Kamon-bf54ca0e8fdb3c3e54bafb87ac716ee95b8fbe78.tar.bz2 Kamon-bf54ca0e8fdb3c3e54bafb87ac716ee95b8fbe78.zip | |
Compile pattern for path normalization only once
| -rw-r--r-- | kamon-play/src/main/scala/kamon/play/instrumentation/RequestInstrumentation.scala | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/kamon-play/src/main/scala/kamon/play/instrumentation/RequestInstrumentation.scala b/kamon-play/src/main/scala/kamon/play/instrumentation/RequestInstrumentation.scala index 9079b391..5214f420 100644 --- a/kamon-play/src/main/scala/kamon/play/instrumentation/RequestInstrumentation.scala +++ b/kamon-play/src/main/scala/kamon/play/instrumentation/RequestInstrumentation.scala @@ -106,12 +106,14 @@ object RequestInstrumentation { private val cache = TrieMap.empty[String, String] + private val normalizePattern = """\$([^<]+)<[^>]+>""".r + def normaliseTraceName(requestHeader: RequestHeader): Option[String] = requestHeader.tags.get(Routes.ROUTE_VERB).map({ verb ⇒ val path = requestHeader.tags(Routes.ROUTE_PATTERN) cache.atomicGetOrElseUpdate(s"$verb$path", { val traceName = { // Convert paths of form GET /foo/bar/$paramname<regexp>/blah to foo.bar.paramname.blah.get - val p = path.replaceAll("""\$([^<]+)<[^>]+>""", "$1").replace('/', '.').dropWhile(_ == '.') + val p = normalizePattern.replaceAllIn(path, "$1").replace('/', '.').dropWhile(_ == '.') val normalisedPath = { if (p.lastOption.filter(_ != '.').isDefined) s"$p." else p |