diff options
| author | Ivan Topolnjak <ivantopo@gmail.com> | 2014-11-09 18:44:39 +0100 |
|---|---|---|
| committer | Ivan Topolnjak <ivantopo@gmail.com> | 2014-11-09 18:44:39 +0100 |
| commit | 6adfad4127d8fad73000d3c47e6a0f89d1e58fa5 (patch) | |
| tree | 1e10d93c760542e9c95333c03e9756ee291eb7d1 /kamon-play | |
| parent | 5681a09bdd1fdbc6a7e0a42bb51f18406b70eaff (diff) | |
| parent | 01117944af0363e37807a071f8f22ecaca0931f6 (diff) | |
| download | Kamon-6adfad4127d8fad73000d3c47e6a0f89d1e58fa5.tar.gz Kamon-6adfad4127d8fad73000d3c47e6a0f89d1e58fa5.tar.bz2 Kamon-6adfad4127d8fad73000d3c47e6a0f89d1e58fa5.zip | |
Merge branch 'wip/newrelic-agent-rewrite'
Diffstat (limited to 'kamon-play')
| -rw-r--r-- | kamon-play/src/main/scala/kamon/play/instrumentation/RequestInstrumentation.scala | 4 |
1 files changed, 2 insertions, 2 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 ca95781e..989ef43e 100644 --- a/kamon-play/src/main/scala/kamon/play/instrumentation/RequestInstrumentation.scala +++ b/kamon-play/src/main/scala/kamon/play/instrumentation/RequestInstrumentation.scala @@ -92,7 +92,7 @@ class RequestInstrumentation { } object RequestInstrumentation { - + import kamon.metric.Metrics.AtomicGetOrElseUpdateForTriemap import java.util.Locale import scala.collection.concurrent.TrieMap @@ -100,7 +100,7 @@ object RequestInstrumentation { def normaliseTraceName(requestHeader: RequestHeader): Option[String] = requestHeader.tags.get(Routes.ROUTE_VERB).map({ verb ⇒ val path = requestHeader.tags(Routes.ROUTE_PATTERN) - cache.getOrElseUpdate(s"$verb$path", { + 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(_ == '.') |