aboutsummaryrefslogtreecommitdiff
path: root/kamon-play/src/main/scala/kamon/play/Play.scala
diff options
context:
space:
mode:
authorIvan Topolnjak <ivantopo@gmail.com>2014-11-10 16:35:32 +0100
committerIvan Topolnjak <ivantopo@gmail.com>2014-11-10 16:35:32 +0100
commit007157a3ec7e9886a60f57b2eb9fbd8072ce2320 (patch)
treebcb3a3f2213c102550bdc8d59aca9ba9d6bf774c /kamon-play/src/main/scala/kamon/play/Play.scala
parent63b31056da21238188931552102f963982c96543 (diff)
parent5b9bbb196734c47e67d69d48e378e196b205fd57 (diff)
downloadKamon-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/Play.scala')
-rw-r--r--kamon-play/src/main/scala/kamon/play/Play.scala2
1 files changed, 2 insertions, 0 deletions
diff --git a/kamon-play/src/main/scala/kamon/play/Play.scala b/kamon-play/src/main/scala/kamon/play/Play.scala
index 0f23baf5..2184fa84 100644
--- a/kamon-play/src/main/scala/kamon/play/Play.scala
+++ b/kamon-play/src/main/scala/kamon/play/Play.scala
@@ -27,6 +27,8 @@ import play.api.mvc.RequestHeader
object Play extends ExtensionId[PlayExtension] with ExtensionIdProvider {
override def lookup(): ExtensionId[_ <: Extension] = Play
override def createExtension(system: ExtendedActorSystem): PlayExtension = new PlayExtension(system)
+
+ val SegmentLibraryName = "WS-client"
}
class PlayExtension(private val system: ExtendedActorSystem) extends Kamon.Extension {