WIP:Metrics 3

1 files changed, 5 insertions, 5 deletions

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)
+
   }
 }