diff options
| author | Ivan Topolnak <itopolnak@despegar.com> | 2014-01-13 17:56:51 -0300 |
|---|---|---|
| committer | Ivan Topolnak <itopolnak@despegar.com> | 2014-01-13 17:56:51 -0300 |
| commit | 111ea55690351d0903e9902c525c781ef2d743a8 (patch) | |
| tree | 003b0e1cf95f1d3cba55927422ff063c049a5cf9 /kamon-core/src/main/scala/kamon/Kamon.scala | |
| parent | 571e96665bb3cb3f20fb59209be63dabbb3148f4 (diff) | |
| parent | 7a10c0ef2a6566229e8571f6d385ca2ff794cc20 (diff) | |
| download | Kamon-111ea55690351d0903e9902c525c781ef2d743a8.tar.gz Kamon-111ea55690351d0903e9902c525c781ef2d743a8.tar.bz2 Kamon-111ea55690351d0903e9902c525c781ef2d743a8.zip | |
Merge branch 'wip/trace-and-metrics-integration'
Conflicts:
kamon-newrelic/src/main/scala/kamon/newrelic/NewRelicErrorLogger.scala
Diffstat (limited to 'kamon-core/src/main/scala/kamon/Kamon.scala')
| -rw-r--r-- | kamon-core/src/main/scala/kamon/Kamon.scala | 6 |
1 files changed, 2 insertions, 4 deletions
diff --git a/kamon-core/src/main/scala/kamon/Kamon.scala b/kamon-core/src/main/scala/kamon/Kamon.scala index b5c3d552..b72e8fea 100644 --- a/kamon-core/src/main/scala/kamon/Kamon.scala +++ b/kamon-core/src/main/scala/kamon/Kamon.scala @@ -18,10 +18,8 @@ package kamon import akka.actor._ object Kamon { - trait Extension extends akka.actor.Extension { - def manager: ActorRef - } + trait Extension extends akka.actor.Extension - def apply[T <: Extension](key: ExtensionId[T])(implicit system: ActorSystem): ActorRef = key(system).manager + def apply[T <: Extension](key: ExtensionId[T])(implicit system: ActorSystem): T = key(system) } |