diff options
| author | Ivan Topolnjak <ivantopo@gmail.com> | 2014-11-10 16:35:32 +0100 |
|---|---|---|
| committer | Ivan Topolnjak <ivantopo@gmail.com> | 2014-11-10 16:35:32 +0100 |
| commit | 007157a3ec7e9886a60f57b2eb9fbd8072ce2320 (patch) | |
| tree | bcb3a3f2213c102550bdc8d59aca9ba9d6bf774c /kamon-play/src/main/scala/kamon/play/instrumentation/RequestInstrumentation.scala | |
| parent | 63b31056da21238188931552102f963982c96543 (diff) | |
| parent | 5b9bbb196734c47e67d69d48e378e196b205fd57 (diff) | |
| download | Kamon-007157a3ec7e9886a60f57b2eb9fbd8072ce2320.tar.gz Kamon-007157a3ec7e9886a60f57b2eb9fbd8072ce2320.tar.bz2 Kamon-007157a3ec7e9886a60f57b2eb9fbd8072ce2320.zip | |
Merge branch 'master' into release-0.2
Conflicts:
kamon-newrelic/src/main/scala/kamon/newrelic/Agent.scala
kamon-newrelic/src/main/scala/kamon/newrelic/NewRelic.scala
kamon-play/src/main/scala/kamon/play/instrumentation/WSInstrumentation.scala
project/Dependencies.scala
project/Projects.scala
Diffstat (limited to 'kamon-play/src/main/scala/kamon/play/instrumentation/RequestInstrumentation.scala')
| -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 897acce6..b44e45a3 100644 --- a/kamon-play/src/main/scala/kamon/play/instrumentation/RequestInstrumentation.scala +++ b/kamon-play/src/main/scala/kamon/play/instrumentation/RequestInstrumentation.scala @@ -86,7 +86,7 @@ class RequestInstrumentation { } object RequestInstrumentation { - + import kamon.metric.Metrics.AtomicGetOrElseUpdateForTriemap import java.util.Locale import scala.collection.concurrent.TrieMap @@ -94,7 +94,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(_ == '.') |