From 88bc1b94b2d737e01074a8f41391367f59796157 Mon Sep 17 00:00:00 2001 From: Ivan Topolnjak Date: Sun, 9 Nov 2014 17:20:36 +0100 Subject: = core,play: workaround the non thread safe calls to TrieMap.getOrElseUpdate --- .../scala/kamon/play/instrumentation/RequestInstrumentation.scala | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'kamon-play/src/main/scala/kamon') 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/blah to foo.bar.paramname.blah.get val p = path.replaceAll("""\$([^<]+)<[^>]+>""", "$1").replace('/', '.').dropWhile(_ == '.') -- cgit v1.2.3