diff options
| author | Diego Parra <dparra@despegar.com> | 2013-06-03 10:15:32 -0300 |
|---|---|---|
| committer | Diego Parra <dparra@despegar.com> | 2013-06-03 10:15:32 -0300 |
| commit | cad83e95166d91225e126aa6a0fab493b3baca59 (patch) | |
| tree | 5bdaeff4559aeba7defd888cf4c97bea31c829ef | |
| parent | 8f4c649e6082671c416b250589540005d9fe1bf8 (diff) | |
| download | Kamon-cad83e95166d91225e126aa6a0fab493b3baca59.tar.gz Kamon-cad83e95166d91225e126aa6a0fab493b3baca59.tar.bz2 Kamon-cad83e95166d91225e126aa6a0fab493b3baca59.zip | |
WIP:Metrics 3
| -rw-r--r-- | src/main/resources/META-INF/aop.xml | 4 | ||||
| -rw-r--r-- | src/main/scala/akka/PoolMonitorInstrumentation.scala (renamed from src/main/scala/akka/PoolMonitorAspect.scala) | 10 |
2 files changed, 7 insertions, 7 deletions
diff --git a/src/main/resources/META-INF/aop.xml b/src/main/resources/META-INF/aop.xml index 09f60a8f..61bc837e 100644 --- a/src/main/resources/META-INF/aop.xml +++ b/src/main/resources/META-INF/aop.xml @@ -8,8 +8,8 @@ <aspects> <!--<aspect name="akka.ActorSystemAspect"/> - <!–<aspect name="akka.MailboxAspect"/>–> - <aspect name="akka.PoolMonitorAspect"/>--> + <!–<aspect name="akka.MailboxAspect"/>–>--> + <!--<aspect name="akka.PoolMonitorInstrumentation"/>--> <aspect name="akka.ActorInstrumentation" /> <aspect name="akka.instrumentation.ActorRefTellInstrumentation"/> <aspect name="akka.instrumentation.ActorCellInvokeInstrumentation"/> diff --git a/src/main/scala/akka/PoolMonitorAspect.scala b/src/main/scala/akka/PoolMonitorInstrumentation.scala index c83defa9..167083e8 100644 --- a/src/main/scala/akka/PoolMonitorAspect.scala +++ b/src/main/scala/akka/PoolMonitorInstrumentation.scala @@ -2,15 +2,15 @@ package akka import org.aspectj.lang.annotation._ -@Aspect("perthis(poolMonitor())") +@Aspect("perthis(poolMonitor(*))") class PoolMonitorAspect { println("Created PoolMonitorAspect") - @Pointcut("execution(scala.concurrent.forkjoin.ForkJoinPool.new(..)) && !within(PoolMonitorAspect)") - protected def poolMonitor:Unit = {} + @Pointcut("execution(scala.concurrent.forkjoin.ForkJoinPool.new(..)) && this(pool)") + protected def poolMonitor(pool:scala.concurrent.forkjoin.ForkJoinPool):Unit = {} - @Before("poolMonitor() && this(pool)") + @After("poolMonitor(pool)") def beforePoolInstantiation(pool: scala.concurrent.forkjoin.ForkJoinPool):Unit = { - Tracer.collectPool(pool) + } } |