diff options
2 files changed, 7 insertions, 6 deletions
diff --git a/java/sca/modules/tracing-aspectj/src/main/java/org/apache/tuscany/sca/aspectj/SimpleTracingAspect.java b/java/sca/modules/tracing-aspectj/src/main/java/org/apache/tuscany/sca/aspectj/SimpleTracingAspect.java index 67fe54f396..d8feefe079 100644 --- a/java/sca/modules/tracing-aspectj/src/main/java/org/apache/tuscany/sca/aspectj/SimpleTracingAspect.java +++ b/java/sca/modules/tracing-aspectj/src/main/java/org/apache/tuscany/sca/aspectj/SimpleTracingAspect.java @@ -37,10 +37,10 @@ public class SimpleTracingAspect extends TracingAspect { @Override protected void completeLog() { - System.out.println("completeLog()"); + System.out.println("<<< ----------------------------------------------------"); } - @Pointcut("execution(public * org.apache.tuscany.sca..*.*(..)) &&!within(java..*)") + @Pointcut("execution(public * org.apache.tuscany.sca..*.*(..))") protected void entry() { } @@ -76,7 +76,7 @@ public class SimpleTracingAspect extends TracingAspect { @Override protected void startLog() { - System.out.println("startLog()"); + System.out.println(">>> ----------------------------------------------------"); } } diff --git a/java/sca/modules/tracing-aspectj/src/main/java/org/apache/tuscany/sca/aspectj/TracingAspect.java b/java/sca/modules/tracing-aspectj/src/main/java/org/apache/tuscany/sca/aspectj/TracingAspect.java index 53ef73573b..ae3f8f93d5 100644 --- a/java/sca/modules/tracing-aspectj/src/main/java/org/apache/tuscany/sca/aspectj/TracingAspect.java +++ b/java/sca/modules/tracing-aspectj/src/main/java/org/apache/tuscany/sca/aspectj/TracingAspect.java @@ -41,15 +41,16 @@ public abstract class TracingAspect { @Pointcut("") protected abstract void withinScope(); - @Pointcut("withinScope() && call(* java..*.*(..))") + @Pointcut("call(* java..*.*(..))") protected void exit() { } - @Pointcut("withinScope() && entry() && !cflowbelow(entry())") + @Pointcut("entry() && !cflowbelow(entry())") void start() { } - @Pointcut("withinScope() && cflow(entry()) && !cflowbelow(exit()) && !within(org.apache.tuscany.sca.aspectj.*Aspect)") + // @Pointcut("withinScope() && cflow(entry()) && !cflow(exit()) && !within(org.apache.tuscany.sca.aspectj.*Aspect)") + @Pointcut("withinScope() && entry() && !within(org.apache.tuscany.sca.aspectj.*Aspect)") void trace() { } |